/* SPDX-License-Identifier: GPL-2.0
 *
 * Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com/
 */

#ifndef __LINUX_MTD_HYPERBUS_H__
#define __LINUX_MTD_HYPERBUS_H__

#include <linux/mtd/map.h>

/* HyperBus command bits */
#define HYPERBUS_RW	0x80	/* R/W# */
#define HYPERBUS_RW_WRITE 0
#define HYPERBUS_RW_READ 0x80
#define HYPERBUS_AS	0x40	/* Address Space */
#define HYPERBUS_AS_MEM	0
#define HYPERBUS_AS_REG	0x40
#define HYPERBUS_BT	0x20	/* Burst Type */
#define HYPERBUS_BT_WRAPPED 0
#define HYPERBUS_BT_LINEAR 0x20

enum hyperbus_memtype {
	HYPERFLASH,
	HYPERRAM,
};

/**
 * struct hyperbus_device - struct representing HyperBus slave device
 * @map: map_info struct for accessing MMIO HyperBus flash memory
 * @np: pointer to HyperBus slave device node
 * @mtd: pointer to MTD struct
 * @ctlr: pointer to HyperBus controller struct
 * @memtype: type of memory device: HyperFlash or HyperRAM
 * @priv: pointer to controller specific per device private data
 */

struct hyperbus_device {
	struct map_info map;
	struct device_node *np;
	struct mtd_info *mtd;
	struct hyperbus_ctlr *ctlr;
	enum hyperbus_memtype memtype;
	void *priv;
};

/**
 * struct hyperbus_ops - struct representing custom HyperBus operations
 * @read16: read 16 bit of data from flash in a single burst. Used to read
 *          from non default address space, such as ID/CFI space
 * @write16: write 16 bit of data to flash in a single burst. Used to
 *           send cmd to flash or write single 16 bit word at a time.
 * @copy_from: copy data from flash memory
 * @copy_to: copy data to flash memory
 * @calibrate: calibrate HyperBus controller
 */

struct hyperbus_ops {
	u16 (*read16)(struct hyperbus_device *hbdev, unsigned long addr);
	void (*write16)(struct hyperbus_device *hbdev,
			unsigned long addr, u16 val);
	void (*copy_from)(struct hyperbus_device *hbdev, void *to,
			  unsigned long from, ssize_t len);
	void (*copy_to)(struct hyperbus_device *dev, unsigned long to,
			const void *from, ssize_t len);
	int (*calibrate)(struct hyperbus_device *dev);
};

/**
 * struct hyperbus_ctlr - struct representing HyperBus controller
 * @dev: pointer to HyperBus controller device
 * @calibrated: flag to indicate ctlr calibration sequence is complete
 * @ops: HyperBus controller ops
 */
struct hyperbus_ctlr {
	struct device *dev;
	bool calibrated;

	const struct hyperbus_ops *ops;
};

/**
 * hyperbus_register_device - probe and register a HyperBus slave memory device
 * @hbdev: hyperbus_device struct with dev, np and ctlr field populated
 *
 * Return: 0 for success, others for failure.
 */
int hyperbus_register_device(struct hyperbus_device *hbdev);

/**
 * hyperbus_unregister_device - deregister HyperBus slave memory device
 * @hbdev: hyperbus_device to be unregistered
 */
void hyperbus_unregister_device(struct hyperbus_device *hbdev);

#endif /* __LINUX_MTD_HYPERBUS_H__ */
option value='drm-armada-fixes-4.15'>drm-armada-fixes-4.15</option>
<option value='drm-dwhdmi-devel'>drm-dwhdmi-devel</option>
<option value='drm-etnaviv-devel'>drm-etnaviv-devel</option>
<option value='drm-tda9950-fixes'>drm-tda9950-fixes</option>
<option value='drm-tda998x-devel'>drm-tda998x-devel</option>
<option value='drm-tda998x-fixes'>drm-tda998x-fixes</option>
<option value='fec-testing'>fec-testing</option>
<option value='fiq'>fiq</option>
<option value='fixes'>fixes</option>
<option value='fixes-sa1111'>fixes-sa1111</option>
<option value='for-arm-soc'>for-arm-soc</option>
<option value='for-next'>for-next</option>
<option value='hb2'>hb2</option>
<option value='ktext'>ktext</option>
<option value='ktext-current'>ktext-current</option>
<option value='master' selected='selected'>master</option>
<option value='mcbin'>mcbin</option>
<option value='mvneta'>mvneta</option>
<option value='mvpp2'>mvpp2</option>
<option value='net-merged'>net-merged</option>
<option value='net-next'>net-next</option>
<option value='net-queue'>net-queue</option>
<option value='nmi'>nmi</option>
<option value='phy'>phy</option>
<option value='rtc'>rtc</option>
<option value='sa1100'>sa1100</option>
<option value='spectre'>spectre</option>
<option value='to-build'>to-build</option>
<option value='uaccess'>uaccess</option>
<option value='vcpu-rmk'>vcpu-rmk</option>
<option value='wl18xx'>wl18xx</option>
<option value='zii'>zii</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Russell King's ARM Linux kernel tree</td><td class='sub right'>Russell King</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/linux-arm.git/'>summary</a><a href='/cgit/linux-arm.git/refs/'>refs</a><a href='/cgit/linux-arm.git/log/include'>log</a><a href='/cgit/linux-arm.git/tree/include'>tree</a><a href='/cgit/linux-arm.git/commit/include'>commit</a><a class='active' href='/cgit/linux-arm.git/diff/include?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/linux-arm.git/log/include'>
<input type='hidden' name='id2' value='70ef654469b371d0a71bcf967fa3dcbca05d4b25'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/linux-arm.git/diff/?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>root</a>/<a href='/cgit/linux-arm.git/diff/include?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id2' value='70ef654469b371d0a71bcf967fa3dcbca05d4b25'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/cgit/linux-arm.git/diff/?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>Diffstat</a> (limited to 'include')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/Kbuild?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acbuffer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acbuffer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acconfig.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acconfig.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acexcep.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acexcep.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acnames.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acnames.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acoutput.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acoutput.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acpi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acpi_bus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpi_bus.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acpi_numa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpi_numa.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acpiosxf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpiosxf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acpixf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpixf.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acrestyp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acrestyp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/actbl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actbl.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/actbl1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actbl1.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/actbl2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actbl2.h</a></td><td class='right'>880</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/actbl3.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actbl3.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/actypes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actypes.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/acuuid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acuuid.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/battery.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/battery.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/cppc_acpi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/cppc_acpi.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/ghes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/ghes.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/acpi/nhlt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/nhlt.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/pcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/pcc.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/platform/acenv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/acenv.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/platform/acenvex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/acenvex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/platform/acgcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/acgcc.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/platform/acgccex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/acgccex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/platform/aclinux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/aclinux.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/platform/aclinuxex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/aclinuxex.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/platform/aczephyr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/aczephyr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/processor.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/processor.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/acpi/video.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/video.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/Kbuild?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/Kbuild</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/audit_change_attr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/audit_change_attr.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/barrier.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/barrier.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bitops/__ffs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/__ffs.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bitops/__fls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/__fls.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bitops/builtin-__ffs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/builtin-__ffs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bitops/builtin-__fls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/builtin-__fls.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bitops/builtin-fls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/builtin-fls.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bitops/ffs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/ffs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bitops/fls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/fls.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bitops/fls64.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/fls64.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/bug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bug.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/codetag.lds.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/codetag.lds.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/delay.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/delay.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/div64.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/div64.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/early_ioremap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/early_ioremap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/asm-generic/export.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/export.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/fixmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/fixmap.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/fprobe.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/fprobe.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/hugetlb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/hugetlb.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/asm-generic/hyperv-tlfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/hyperv-tlfs.h</a></td><td class='right'>826</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/io.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/io.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/iomap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/iomap.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/mcs_spinlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/mcs_spinlock.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/memory_model.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/memory_model.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/mm_hooks.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/mm_hooks.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/mmzone.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/mmzone.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/module.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/module.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/mshyperv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/mshyperv.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/msi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/msi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/numa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/numa.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/asm-generic/page.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/page.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/param.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/param.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/percpu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/percpu.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/pgalloc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/pgalloc.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/pgtable_uffd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/pgtable_uffd.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/qspinlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/qspinlock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/rqspinlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/rqspinlock.h</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/runtime-const.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/runtime-const.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/rwonce.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/rwonce.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/sections.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/sections.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/simd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/simd.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/spinlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/spinlock.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/spinlock_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/spinlock_types.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/syscall.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/syscall.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/syscalls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/syscalls.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/text-patching.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/text-patching.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/thread_info_tif.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/thread_info_tif.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/ticket_spinlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/ticket_spinlock.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/tlb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/tlb.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/uaccess.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/uaccess.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/asm-generic/unwind_user.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/unwind_user.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/vdso/vsyscall.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/vdso/vsyscall.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/vga.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/vga.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/asm-generic/video.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/video.h</a> (renamed from include/asm-generic/fb.h)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/asm-generic/vmlinux.lds.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/vmlinux.lds.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/asm-generic/vtime.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/vtime.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/clocksource/arm_arch_timer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/clocksource/arm_arch_timer.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/clocksource/hyperv_timer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/clocksource/hyperv_timer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/clocksource/timer-xilinx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/clocksource/timer-xilinx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/acompress.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/acompress.h</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/aead.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/aead.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/aes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/aes.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/akcipher.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/akcipher.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/algapi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/algapi.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/authenc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/authenc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/blake2b.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/blake2b.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/blake2s.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/blake2s.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/chacha.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/chacha.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/chacha20poly1305.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/chacha20poly1305.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/ctr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/ctr.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/curve25519.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/curve25519.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/crypto/df_sp80090a.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/df_sp80090a.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/drbg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/drbg.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/ecc_curve.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/ecc_curve.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/ecdh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/ecdh.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/engine.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/engine.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/gf128mul.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/gf128mul.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/ghash.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/ghash.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/hash.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/hash.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/crypto/hkdf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/hkdf.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/if_alg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/if_alg.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/acompress.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/acompress.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/akcipher.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/akcipher.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/blake2b.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/blake2b.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/blake2s.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/blake2s.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/blockhash.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/blockhash.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/chacha.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/chacha.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/cryptouser.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/cryptouser.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/drbg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/drbg.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/ecc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/ecc.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/engine.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/engine.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/geniv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/geniv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/hash.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/hash.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/poly1305.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/poly1305.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/rsa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/rsa.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/scompress.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/scompress.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/sig.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/sig.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/simd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/simd.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/internal/skcipher.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/skcipher.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/kpp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/kpp.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/crypto/krb5.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/krb5.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/md5.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/md5.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/null.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/null.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/poly1305.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/poly1305.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/polyval.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/polyval.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/public_key.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/public_key.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/rng.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/rng.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/scatterwalk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/scatterwalk.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/sha1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha1.h</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/crypto/sha1_base.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha1_base.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/sha2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha2.h</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/crypto/sha256_base.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha256_base.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/sha3.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha3.h</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/crypto/sha512_base.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha512_base.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/sig.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sig.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/skcipher.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/skcipher.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/crypto/sm2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sm2.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/sm3.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sm3.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/sm3_base.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sm3_base.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/streebog.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/streebog.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/crypto/utils.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/utils.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/cxl/einj.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/cxl/einj.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/cxl/event.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/cxl/event.h</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/cxl/features.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/cxl/features.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/cxl/mailbox.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/cxl/mailbox.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/Makefile?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/amd/isp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/amd/isp.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/amd_asic_type.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/amd_asic_type.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/bridge/analogix_dp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/analogix_dp.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/bridge/aux-bridge.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/aux-bridge.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/bridge/dw_dp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/dw_dp.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/bridge/dw_hdmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/dw_hdmi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/bridge/dw_hdmi_qp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/dw_hdmi_qp.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/bridge/dw_mipi_dsi2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/dw_mipi_dsi2.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/bridge/imx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/imx.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/bridge/samsung-dsim.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/samsung-dsim.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/clients/drm_client_setup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/clients/drm_client_setup.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_dp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_dp_dual_mode_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp_dual_mode_helper.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_dp_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp_helper.h</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_dp_mst_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp_mst_helper.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_dp_tunnel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp_tunnel.h</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_dsc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dsc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_dsc_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dsc_helper.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_hdmi_audio_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_hdmi_audio_helper.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_hdmi_cec_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_hdmi_cec_helper.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_hdmi_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_hdmi_helper.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/display/drm_hdmi_state_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_hdmi_state_helper.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_accel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_accel.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/drm_aperture.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_aperture.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_atomic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_atomic.h</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_atomic_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_atomic_helper.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_atomic_uapi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_atomic_uapi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_bridge.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_bridge.h</a></td><td class='right'>842</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_bridge_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_bridge_helper.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_buddy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_buddy.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_client.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_client.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_client_event.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_client_event.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_color_mgmt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_color_mgmt.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_colorop.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_colorop.h</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_connector.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_connector.h</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_crtc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_crtc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_damage_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_damage_helper.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_debugfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_debugfs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_debugfs_crc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_debugfs_crc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_device.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/drm_displayid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_displayid.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_drv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_drv.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_dumb_buffers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_dumb_buffers.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_edid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_edid.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/drm_encoder_slave.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_encoder_slave.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_exec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_exec.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_fb_dma_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fb_dma_helper.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_fb_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fb_helper.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_fbdev_dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fbdev_dma.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/drm_fbdev_generic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fbdev_generic.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_fbdev_shmem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fbdev_shmem.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_fbdev_ttm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fbdev_ttm.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_file.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_file.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_fixed.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fixed.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_format_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_format_helper.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_fourcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fourcc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_framebuffer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_framebuffer.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_gem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_gem_dma_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem_dma_helper.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_gem_framebuffer_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem_framebuffer_helper.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_gem_shmem_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem_shmem_helper.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_gem_vram_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem_vram_helper.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_gpusvm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gpusvm.h</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_gpuvm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gpuvm.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_kunit_helpers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_kunit_helpers.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_lease.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_lease.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_managed.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_managed.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_mipi_dbi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mipi_dbi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_mipi_dsi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mipi_dsi.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_mm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_mode_config.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mode_config.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_mode_object.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mode_object.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_modes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_modes.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_modeset_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_modeset_helper.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_modeset_helper_vtables.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_modeset_helper_vtables.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_of.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_of.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_pagemap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_pagemap.h</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_panel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_panel.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_panic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_panic.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_plane.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_plane.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_prime.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_prime.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_print.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_print.h</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_probe_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_probe_helper.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_rect.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_rect.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_suballoc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_suballoc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_util.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_util.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_utils.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_utils.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_vblank.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_vblank.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/drm_vblank_helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_vblank_helper.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_vblank_work.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_vblank_work.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/drm_writeback.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_writeback.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/gma_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/gma_drm.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/gpu_scheduler.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/gpu_scheduler.h</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/i2c/ch7006.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i2c/ch7006.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/i2c/sil164.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i2c/sil164.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/i2c/tda998x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i2c/tda998x.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/i915_pciids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i915_pciids.h</a></td><td class='right'>760</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/intel/display_member.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/display_member.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/intel/display_parent_interface.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/display_parent_interface.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/drm/intel/i915_component.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/i915_component.h</a> (renamed from include/drm/i915_component.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/drm/intel/i915_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/i915_drm.h</a> (renamed from include/drm/i915_drm.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/drm/intel/i915_gsc_proxy_mei_interface.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/i915_gsc_proxy_mei_interface.h</a> (renamed from include/drm/i915_gsc_proxy_mei_interface.h)</td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/drm/intel/i915_hdcp_interface.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/i915_hdcp_interface.h</a> (renamed from include/drm/i915_hdcp_interface.h)</td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/drm/intel/i915_pxp_tee_interface.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/i915_pxp_tee_interface.h</a> (renamed from include/drm/i915_pxp_tee_interface.h)</td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/drm/intel/intel-gtt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/intel-gtt.h</a> (renamed from include/drm/intel-gtt.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/intel/intel_lb_mei_interface.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/intel_lb_mei_interface.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/drm/intel/intel_lpe_audio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/intel_lpe_audio.h</a> (renamed from include/drm/intel_lpe_audio.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/intel/pciids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/pciids.h</a></td><td class='right'>903</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/intel/xe_sriov_vfio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel/xe_sriov_vfio.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/spsc_queue.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/spsc_queue.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_allocation.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_allocation.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_backup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_backup.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_bo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_bo.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_caching.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_caching.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_device.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_execbuf_util.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_execbuf_util.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_kmap_iter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_kmap_iter.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_placement.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_placement.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_pool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_pool.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_resource.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_resource.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/drm/ttm/ttm_tt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_tt.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/drm/xe_pciids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/xe_pciids.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/arm/mhuv3-dt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/arm/mhuv3-dt.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/arm/qcom,ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/arm/qcom,ids.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/amlogic,a1-pll-clkc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/amlogic,a1-pll-clkc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/amlogic,c3-peripherals-clkc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/amlogic,c3-peripherals-clkc.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/amlogic,c3-pll-clkc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/amlogic,c3-pll-clkc.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/amlogic,c3-scmi-clkc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/amlogic,c3-scmi-clkc.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/aspeed,ast2700-scu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/aspeed,ast2700-scu.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/ast2600-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/ast2600-clock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/at91.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/at91.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/axg-audio-clkc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/axg-audio-clkc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/axis,artpec8-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/axis,artpec8-clk.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/cirrus,ep9301-syscon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/cirrus,ep9301-syscon.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/cix,sky1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/cix,sky1.h</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/en7523-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/en7523-clk.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/exynos7885.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/exynos7885.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/exynos850.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/exynos850.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/fsd-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/fsd-clk.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/google,gs101-acpm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/google,gs101-acpm.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/google,gs101.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/google,gs101.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/imx8ulp-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/imx8ulp-clock.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/imx93-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/imx93-clock.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/loongson,ls2k-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/loongson,ls2k-clk.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/marvell,pxa1908.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/marvell,pxa1908.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt6735-apmixedsys.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt6735-apmixedsys.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt6735-imgsys.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt6735-imgsys.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt6735-infracfg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt6735-infracfg.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt6735-mfgcfg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt6735-mfgcfg.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt6735-pericfg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt6735-pericfg.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt6735-topckgen.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt6735-topckgen.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt6735-vdecsys.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt6735-vdecsys.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt6735-vencsys.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt6735-vencsys.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt8188-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt8188-clk.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mt8196-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt8196-clock.h</a></td><td class='right'>803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mediatek,mtmips-sysc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mtmips-sysc.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/microchip,mpfs-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/microchip,mpfs-clock.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mobileye,eyeq5-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mobileye,eyeq5-clk.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/mt7622-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mt7622-clk.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/nvidia,tegra264.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/nvidia,tegra264.h</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/nxp,imx94-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/nxp,imx94-clock.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/nxp,imx95-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/nxp,imx95-clock.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/px30-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/px30-cru.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,apss-ipq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,apss-ipq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,dispcc-sc7280.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,dispcc-sc7280.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,dispcc-sm6350.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,dispcc-sm6350.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,dsi-phy-28nm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,dsi-phy-28nm.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,gcc-msm8917.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-msm8917.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,gcc-msm8998.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-msm8998.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,gcc-sc8180x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-sc8180x.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,gcc-sdm660.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-sdm660.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,gcc-sm8150.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-sm8150.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,gcc-sm8450.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-sm8450.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,glymur-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,glymur-dispcc.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,glymur-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,glymur-gcc.h</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,glymur-tcsr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,glymur-tcsr.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,ipq-cmn-pll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq-cmn-pll.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,ipq5332-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq5332-gcc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,ipq5424-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq5424-gcc.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,ipq5424-nsscc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq5424-nsscc.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,ipq9574-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq9574-gcc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,ipq9574-nsscc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq9574-nsscc.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,kaanapali-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,kaanapali-gcc.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,milos-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,milos-camcc.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,milos-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,milos-dispcc.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,milos-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,milos-gcc.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,milos-gpucc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,milos-gpucc.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,milos-videocc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,milos-videocc.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,mmcc-msm8960.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,mmcc-msm8960.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,mmcc-sdm660.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,mmcc-sdm660.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qca8k-nsscc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qca8k-nsscc.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcm2290-gpucc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcm2290-gpucc.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcs615-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcs615-camcc.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcs615-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcs615-dispcc.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcs615-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcs615-gcc.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcs615-gpucc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcs615-gpucc.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcs615-videocc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcs615-videocc.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcs8300-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcs8300-camcc.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcs8300-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcs8300-gcc.h</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,qcs8300-gpucc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,qcs8300-gpucc.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,rpmcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,rpmcc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sa8775p-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sa8775p-camcc.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sa8775p-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sa8775p-dispcc.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sa8775p-videocc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sa8775p-videocc.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sar2130p-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sar2130p-gcc.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sar2130p-gpucc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sar2130p-gpucc.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sc8180x-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sc8180x-camcc.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm4450-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm4450-camcc.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm4450-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm4450-dispcc.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm4450-gpucc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm4450-gpucc.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm6115-lpasscc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm6115-lpasscc.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm6350-videocc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm6350-videocc.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm7150-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm7150-camcc.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm7150-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm7150-dispcc.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm7150-videocc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm7150-videocc.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm8150-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8150-camcc.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm8650-camcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8650-camcc.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------<span class='modechange'>[-rw-r--r--]</span></td><td class='typ'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm8650-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8650-dispcc.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm8650-videocc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8650-videocc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm8750-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8750-dispcc.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm8750-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8750-gcc.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm8750-tcsr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8750-tcsr.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,sm8750-videocc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8750-videocc.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,x1e80100-dispcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,x1e80100-dispcc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,x1e80100-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,x1e80100-gcc.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/qcom,x1e80100-gpucc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,x1e80100-gpucc.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a73a4-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a73a4-clock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a7779-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7779-clock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a7790-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7790-clock.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a7791-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7791-clock.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a7792-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7792-clock.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a7793-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7793-clock.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a7794-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7794-clock.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a779a0-cpg-mssr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a779a0-cpg-mssr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r8a779g0-cpg-mssr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a779g0-cpg-mssr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/r9a07g043-cpg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r9a07g043-cpg.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/raspberrypi,rp1-clocks.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/raspberrypi,rp1-clocks.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/renesas,r9a08g045-vbattb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/renesas,r9a08g045-vbattb.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/renesas,r9a09g047-cpg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/renesas,r9a09g047-cpg.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/renesas,r9a09g056-cpg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/renesas,r9a09g056-cpg.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/renesas,r9a09g057-cpg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/renesas,r9a09g057-cpg.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3036-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3036-cru.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3128-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3128-cru.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3188-cru-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3188-cru-common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3228-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3228-cru.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3288-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3288-cru.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3308-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3308-cru.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3328-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3328-cru.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3368-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3368-cru.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3399-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3399-cru.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rk3568-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3568-cru.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rockchip,rk3506-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rockchip,rk3506-cru.h</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rockchip,rk3528-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rockchip,rk3528-cru.h</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rockchip,rk3562-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rockchip,rk3562-cru.h</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rockchip,rk3576-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rockchip,rk3576-cru.h</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/rockchip,rv1126b-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rockchip,rv1126b-cru.h</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/samsung,exynos2200-cmu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/samsung,exynos2200-cmu.h</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/samsung,exynos7870-cmu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/samsung,exynos7870-cmu.h</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/samsung,exynos8895.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/samsung,exynos8895.h</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/samsung,exynos990.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/samsung,exynos990.h</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/samsung,exynosautov9.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/samsung,exynosautov9.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/samsung,exynosautov920.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/samsung,exynosautov920.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sophgo,sg2042-clkgen.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sophgo,sg2042-clkgen.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sophgo,sg2042-pll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sophgo,sg2042-pll.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sophgo,sg2042-rpgate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sophgo,sg2042-rpgate.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sophgo,sg2044-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sophgo,sg2044-clk.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sophgo,sg2044-pll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sophgo,sg2044-pll.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/spacemit,k1-syscon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/spacemit,k1-syscon.h</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/st,stm32mp21-rcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/st,stm32mp21-rcc.h</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/stm32fx-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/stm32fx-clock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/stm32h7-clks.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/stm32h7-clks.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sun50i-a64-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun50i-a64-ccu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sun50i-h616-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun50i-h616-ccu.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sun55i-a523-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun55i-a523-ccu.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sun55i-a523-mcu-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun55i-a523-mcu-ccu.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sun55i-a523-r-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun55i-a523-r-ccu.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/sun8i-v3s-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun8i-v3s-ccu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/tegra30-car.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/tegra30-car.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/thead,th1520-clk-ap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/thead,th1520-clk-ap.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/toshiba,tmpv770x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/toshiba,tmpv770x.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/clock/xlnx-zynqmp-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/xlnx-zynqmp-clk.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/gpio/tegra256-gpio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/gpio/tegra256-gpio.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/i3c/i3c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/i3c/i3c.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/adi,ad4695.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/adi,ad4695.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/adi,ad7606.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/adi,ad7606.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/adi,ad7768-1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/adi,ad7768-1.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/gehc,pmc-adc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/gehc,pmc-adc.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/mediatek,mt6357-auxadc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/mediatek,mt6357-auxadc.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/mediatek,mt6358-auxadc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/mediatek,mt6358-auxadc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/mediatek,mt6359-auxadc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/mediatek,mt6359-auxadc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/input/cros-ec-keyboard.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/input/cros-ec-keyboard.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/mediatek,mt8183.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/mediatek,mt8183.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/mediatek,mt8195.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/mediatek,mt8195.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,glymur-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,glymur-rpmh.h</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,ipq5332.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,ipq5332.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,ipq5424.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,ipq5424.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,ipq9574.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,ipq9574.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,milos-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,milos-rpmh.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,msm8909.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,msm8909.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,msm8937.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,msm8937.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,msm8953.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,msm8953.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,msm8976.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,msm8976.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,qcs615-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,qcs615-rpmh.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,qcs8300-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,qcs8300-rpmh.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,sar2130p-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sar2130p-rpmh.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,sdx75.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sdx75.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,sm7150-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sm7150-rpmh.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,sm8350.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sm8350.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,sm8650-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sm8650-rpmh.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,sm8750-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sm8750-rpmh.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interrupt-controller/arm-gic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interrupt-controller/arm-gic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/interrupt-controller/aspeed-scu-ic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interrupt-controller/aspeed-scu-ic.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/leds/common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/leds/common.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/mailbox/qcom-ipcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/mailbox/qcom-ipcc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/media/c8sectpfe.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/media/c8sectpfe.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/media/tvp5150.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/media/tvp5150.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/media/video-interfaces.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/media/video-interfaces.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/memory/mediatek,mt6893-memory-port.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/memory/mediatek,mt6893-memory-port.h</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/memory/mediatek,mt8189-memory-port.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/memory/mediatek,mt8189-memory-port.h</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/memory/nvidia,tegra264.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/memory/nvidia,tegra264.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/memory/tegra210-mc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/memory/tegra210-mc.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/mfd/qcom-pm8008.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/mfd/qcom-pm8008.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/mfd/st,stpmic1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/mfd/st,stpmic1.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/net/renesas,r9a09g077-pcs-miic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/net/renesas,r9a09g077-pcs-miic.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/net/ti-dp83867.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/net/ti-dp83867.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/net/ti-dp83869.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/net/ti-dp83869.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/phy/phy-qcom-qmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/phy/phy-qcom-qmp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/amlogic,pinctrl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/amlogic,pinctrl.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/pinctrl-cv1800b.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/pinctrl-cv1800b.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/pinctrl-cv1812h.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/pinctrl-cv1812h.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/pinctrl-cv18xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/pinctrl-cv18xx.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/pinctrl-sg2000.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/pinctrl-sg2000.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/pinctrl-sg2002.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/pinctrl-sg2002.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/pinctrl-sg2042.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/pinctrl-sg2042.h</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/pinctrl-sg2044.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/pinctrl-sg2044.h</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/renesas,r9a09g047-pinctrl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/renesas,r9a09g047-pinctrl.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/renesas,r9a09g057-pinctrl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/renesas,r9a09g057-pinctrl.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/samsung.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/samsung.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/pinctrl/stm32-pinfunc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/stm32-pinfunc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/allwinner,sun55i-a523-ppu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/allwinner,sun55i-a523-ppu.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/allwinner,sun8i-v853-ppu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/allwinner,sun8i-v853-ppu.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/amlogic,a4-pwrc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/amlogic,a4-pwrc.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/amlogic,a5-pwrc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/amlogic,a5-pwrc.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/amlogic,c3-pwrc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/amlogic,c3-pwrc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/amlogic,s6-pwrc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/amlogic,s6-pwrc.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/amlogic,s7-pwrc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/amlogic,s7-pwrc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/amlogic,s7d-pwrc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/amlogic,s7d-pwrc.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/marvell,pxa1908-power.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/marvell,pxa1908-power.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/mediatek,mt6735-power-controller.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/mediatek,mt6735-power-controller.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/mediatek,mt6893-power.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/mediatek,mt6893-power.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/mediatek,mt8196-power.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/mediatek,mt8196-power.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/nvidia,tegra264-bpmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/nvidia,tegra264-bpmp.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/qcom,rpmhpd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/qcom,rpmhpd.h</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/qcom-rpmpd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/qcom-rpmpd.h</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/rockchip,rk3528-power.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/rockchip,rk3528-power.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/rockchip,rk3562-power.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/rockchip,rk3562-power.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/rockchip,rk3576-power.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/rockchip,rk3576-power.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/rockchip,rv1126b-power-controller.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/rockchip,rv1126b-power-controller.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/power/thead,th1520-power.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/thead,th1520-power.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/regulator/nxp,pca9450-regulator.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/regulator/nxp,pca9450-regulator.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/regulator/st,stm32mp15-regulator.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/regulator/st,stm32mp15-regulator.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/regulator/st,stm32mp25-regulator.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/regulator/st,stm32mp25-regulator.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/airoha,en7523-reset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/airoha,en7523-reset.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/airoha,en7581-reset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/airoha,en7581-reset.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/aspeed,ast2700-scu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/aspeed,ast2700-scu.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/canaan,k230-rst.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/canaan,k230-rst.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/eswin,eic7700-reset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/eswin,eic7700-reset.h</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/fsl,imx8ulp-sim-lpav.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/fsl,imx8ulp-sim-lpav.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/imx8mp-reset-audiomix.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/imx8mp-reset-audiomix.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/mediatek,mt6735-infracfg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/mediatek,mt6735-infracfg.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/mediatek,mt6735-mfgcfg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/mediatek,mt6735-mfgcfg.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/mediatek,mt6735-pericfg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/mediatek,mt6735-pericfg.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/mediatek,mt6735-vdecsys.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/mediatek,mt6735-vdecsys.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/mediatek,mt7988-resets.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/mediatek,mt7988-resets.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/mediatek,mt8196-resets.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/mediatek,mt8196-resets.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/nvidia,tegra114-car.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/nvidia,tegra114-car.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/nvidia,tegra264.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/nvidia,tegra264.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/qcom,ipq5424-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/qcom,ipq5424-gcc.h</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/qcom,ipq5424-nsscc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/qcom,ipq5424-nsscc.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/qcom,ipq9574-nsscc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/qcom,ipq9574-nsscc.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/qcom,qca8k-nsscc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/qcom,qca8k-nsscc.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/qcom,sar2130p-gpucc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/qcom,sar2130p-gpucc.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/rockchip,rk3506-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/rockchip,rk3506-cru.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/rockchip,rk3528-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/rockchip,rk3528-cru.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/rockchip,rk3562-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/rockchip,rk3562-cru.h</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/rockchip,rk3576-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/rockchip,rk3576-cru.h</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/rockchip,rk3588-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/rockchip,rk3588-cru.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/rockchip,rv1126b-cru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/rockchip,rv1126b-cru.h</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/sophgo,sg2042-reset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/sophgo,sg2042-reset.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/st,stm32mp21-rcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/st,stm32mp21-rcc.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/st,stm32mp25-rcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/st,stm32mp25-rcc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/sun50i-h616-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/sun50i-h616-ccu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/sun55i-a523-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/sun55i-a523-ccu.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/sun55i-a523-mcu-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/sun55i-a523-mcu-ccu.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/sun55i-a523-r-ccu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/sun55i-a523-r-ccu.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/thead,th1520-reset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/thead,th1520-reset.h</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/reset/toshiba,tmpv770x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/toshiba,tmpv770x.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/soc/qe-fsl,tsa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/soc/qe-fsl,tsa.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/soc/samsung,exynos-usi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/soc/samsung,exynos-usi.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/sound/audio-graph.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/sound/audio-graph.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/sound/cs48l32.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/sound/cs48l32.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/sound/qcom,wcd9335.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/sound/qcom,wcd9335.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/sound/qcom,wcd934x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/sound/qcom,wcd934x.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/thermal/mediatek,lvts-thermal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/thermal/mediatek,lvts-thermal.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/thermal/tegra114-soctherm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/thermal/tegra114-soctherm.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/dt-bindings/watchdog/aspeed-wdt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/watchdog/aspeed-wdt.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/hyperv/hvgdk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/hyperv/hvgdk.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/hyperv/hvgdk_ext.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/hyperv/hvgdk_ext.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/hyperv/hvgdk_mini.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/hyperv/hvgdk_mini.h</a></td><td class='right'>1528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/hyperv/hvhdk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/hyperv/hvhdk.h</a></td><td class='right'>899</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/hyperv/hvhdk_mini.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/hyperv/hvhdk_mini.h</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/keys/asymmetric-type.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/asymmetric-type.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/keys/dns_resolver-type.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/dns_resolver-type.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/keys/rxrpc-type.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/rxrpc-type.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/keys/system_keyring.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/system_keyring.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/keys/trusted_dcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/trusted_dcp.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/keys/trusted_tpm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/trusted_tpm.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kunit/assert.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/assert.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/kunit/clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/clk.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/kunit/of.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/of.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/kunit/platform_device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/platform_device.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/kunit/run-in-irq-context.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/run-in-irq-context.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kunit/skbuff.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/skbuff.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kunit/test.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/test.h</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kunit/try-catch.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/try-catch.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kunit/visibility.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/visibility.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kvm/arm_arch_timer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kvm/arm_arch_timer.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kvm/arm_pmu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kvm/arm_pmu.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kvm/arm_psci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kvm/arm_psci.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/kvm/arm_vgic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kvm/arm_vgic.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/acpi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/acpi_dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi_dma.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/acpi_iort.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi_iort.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/acpi_pmtmr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi_pmtmr.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/acpi_rimt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi_rimt.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/adi-axi-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/adi-axi-common.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/adreno-smmu-priv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/adreno-smmu-priv.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/aer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/aer.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/alarmtimer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/alarmtimer.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/alcor_pci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/alcor_pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/align.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/align.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/alloc_tag.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/alloc_tag.h</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/amba/bus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/amba/bus.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/amd-iommu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/amd-iommu.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/amd-pmf-io.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/amd-pmf-io.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/amd-pstate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/amd-pstate.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/annotate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/annotate.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/anon_inodes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/anon_inodes.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/arch_topology.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arch_topology.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/args.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/args.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/arm-smccc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arm-smccc.h</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/arm_ffa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arm_ffa.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/arm_mpam.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arm_mpam.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/arm_sdei.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arm_sdei.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/asn1_decoder.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/asn1_decoder.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/asn1_encoder.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/asn1_encoder.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/async_tx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/async_tx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ata.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ata.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/ath9k_platform.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ath9k_platform.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/atmdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/atmdev.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/atomic/atomic-arch-fallback.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/atomic/atomic-arch-fallback.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/atomic/atomic-instrumented.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/atomic/atomic-instrumented.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/atomic/atomic-long.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/atomic/atomic-long.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/attribute_container.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/attribute_container.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/audit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/audit.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/auxiliary_bus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/auxiliary_bus.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/avf/virtchnl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/avf/virtchnl.h</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/backing-dev-defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/backing-dev-defs.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/backing-dev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/backing-dev.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/backing-file.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/backing-file.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/backlight.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/backlight.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/badblocks.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/badblocks.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/balloon_compaction.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/balloon_compaction.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/base64.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/base64.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bcm47xx_nvram.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bcm47xx_nvram.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bcm47xx_sprom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bcm47xx_sprom.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bcm963xx_nvram.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bcm963xx_nvram.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bcma/bcma_driver_pci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bcma/bcma_driver_pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/binfmts.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/binfmts.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/bio-integrity.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bio-integrity.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bio.h</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bit_spinlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bit_spinlock.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bitfield.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bitfield.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bitmap-str.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bitmap-str.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bitmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bitmap.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bitops.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bitops.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bits.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bits.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/blk-crypto-profile.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-crypto-profile.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/blk-crypto.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-crypto.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/blk-integrity.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-integrity.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/blk-mq-dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-mq-dma.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/blk-mq-pci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-mq-pci.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/blk-mq-virtio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-mq-virtio.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/blk-mq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-mq.h</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/blk_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk_types.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/blkdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blkdev.h</a></td><td class='right'>865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/blktrace_api.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blktrace_api.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/bnxt/hsi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bnxt/hsi.h</a></td><td class='right'>11166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bootconfig.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bootconfig.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bootmem_info.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bootmem_info.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpf-cgroup-defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf-cgroup-defs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpf-cgroup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf-cgroup.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf.h</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/bpf_crypto.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_crypto.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpf_local_storage.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_local_storage.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpf_lsm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_lsm.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpf_mem_alloc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_mem_alloc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpf_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_types.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpf_verifier.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_verifier.h</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bpfptr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpfptr.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/brcmphy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/brcmphy.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bsg-lib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bsg-lib.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/btf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/btf.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/btf_ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/btf_ids.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/buffer_head.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/buffer_head.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bug.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/build_bug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/build_bug.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/buildid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/buildid.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/bus/stm32_firewall_device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bus/stm32_firewall_device.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/bvec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bvec.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/byteorder/generic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/byteorder/generic.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cache.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cache_coherency.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cache_coherency.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cacheinfo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cacheinfo.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/call_once.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/call_once.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/can/bittiming.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/can/bittiming.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/can/dev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/can/dev.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/can/dev/peak_canfd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/can/dev/peak_canfd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/capability.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/capability.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cc_platform.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cc_platform.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cdrom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cdrom.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cdx/bitfield.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cdx/bitfield.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cdx/cdx_bus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cdx/cdx_bus.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cdx/edac_cdx_pcol.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cdx/edac_cdx_pcol.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cdx/mcdi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cdx/mcdi.h</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ceph/ceph_debug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/ceph_debug.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ceph/ceph_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/ceph_fs.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ceph/decode.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/decode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ceph/libceph.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/libceph.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ceph/messenger.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/messenger.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ceph/osd_client.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/osd_client.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ceph/pagelist.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/pagelist.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cfag12864b.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cfag12864b.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cfi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cfi.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cfi_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cfi_types.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cgroup-defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cgroup-defs.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cgroup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cgroup.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cgroup_dmem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cgroup_dmem.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cgroup_namespace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cgroup_namespace.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cgroup_subsys.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cgroup_subsys.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cleanup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cleanup.h</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clk-provider.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk-provider.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clk/at91_pmc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk/at91_pmc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clk/davinci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk/davinci.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clk/renesas.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk/renesas.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clk/ti.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk/ti.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clockchips.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clockchips.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clocksource.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clocksource.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/clocksource_ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clocksource_ids.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/closure.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/closure.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cma.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cmpxchg-emu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cmpxchg-emu.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/codetag.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/codetag.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/comedi/comedidev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/comedi/comedidev.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/comedi/comedilib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/comedi/comedilib.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/compaction.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compaction.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/compat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compat.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/compiler-clang.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler-clang.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/compiler-gcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler-gcc.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/compiler-version.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler-version.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/compiler.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/compiler_attributes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler_attributes.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/compiler_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler_types.h</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/component.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/component.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/configfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/configfs.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/console.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/console.h</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/console_struct.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/console_struct.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/consolemap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/consolemap.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/container_of.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/container_of.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/context_tracking.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/context_tracking.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/context_tracking_irq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/context_tracking_irq.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/context_tracking_state.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/context_tracking_state.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/coredump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/coredump.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/coresight-pmu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/coresight-pmu.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/coresight.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/coresight.h</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/counter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/counter.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cper.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cpu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpu.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cpu_cooling.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpu_cooling.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cpu_rmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpu_rmap.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cpufreq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpufreq.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cpuhotplug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpuhotplug.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cpuhplock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpuhplock.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cpuidle.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpuidle.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cpumask.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpumask.h</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/cpumask_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpumask_types.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cpuset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpuset.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crash_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crash_core.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crash_dump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crash_dump.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/crash_reserve.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crash_reserve.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crc-t10dif.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc-t10dif.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crc16.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc16.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crc32.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc32.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crc32c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc32c.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crc32poly.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc32poly.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crc64.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc64.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crc7.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc7.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/cred.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cred.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/crypto.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crypto.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/cxl-event.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cxl-event.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/damon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/damon.h</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dax.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dax.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dcache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dcache.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dccp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dccp.h</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/debugfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/debugfs.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/debugobjects.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/debugobjects.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/decompress/unxz.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/decompress/unxz.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/delay.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/delay.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/delayacct.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/delayacct.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dev_printk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dev_printk.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/devcoredump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/devcoredump.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/devfreq-governor.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/devfreq-governor.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/devfreq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/devfreq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/device-mapper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device-mapper.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device.h</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/device/bus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device/bus.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/device/class.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device/class.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/device/devres.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device/devres.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/device/driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device/driver.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/device/faux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device/faux.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/device_cgroup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device_cgroup.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/devm-helpers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/devm-helpers.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dfl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dfl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/dibs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dibs.h</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dim.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dim.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dlm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dlm.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/dma-buf-mapping.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-buf-mapping.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-buf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-buf.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/dma-buf/heaps/cma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-buf/heaps/cma.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-direct.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-direct.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-fence-array.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-fence-array.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-fence-chain.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-fence-chain.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-fence-unwrap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-fence-unwrap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-fence.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-fence.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-heap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-heap.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-map-ops.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-map-ops.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-mapping.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-mapping.h</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma-resv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-resv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma/imx-dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma/imx-dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/dma/ipu-dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma/ipu-dma.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dma/k3-udma-glue.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma/k3-udma-glue.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dmaengine.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dmaengine.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dmapool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dmapool.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dmar.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dmar.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dpll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dpll.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dsa/8021q.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dsa/8021q.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dsa/lan9303.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dsa/lan9303.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dsa/ocelot.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dsa/ocelot.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dw_apb_timer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dw_apb_timer.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dynamic_debug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dynamic_debug.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/dynamic_queue_limits.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dynamic_queue_limits.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/edac.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/edac.h</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/eeprom_93cx6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/eeprom_93cx6.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/eeprom_93xx46.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/eeprom_93xx46.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/efi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/efi.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ehl_pse_io_aux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ehl_pse_io_aux.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/eisa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/eisa.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/elf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/elf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/elfnote.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/elfnote.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/energy_model.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/energy_model.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/entry-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/entry-common.h</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/linux/entry-virt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/entry-virt.h</a> (renamed from include/linux/entry-kvm.h)</td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/err.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/err.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/etherdevice.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/etherdevice.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ethtool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ethtool.h</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ethtool_netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ethtool_netlink.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/eventpoll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/eventpoll.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/evm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/evm.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/execmem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/execmem.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/export.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/export.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/exportfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/exportfs.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/f2fs_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/f2fs_fs.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/falloc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/falloc.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fanotify.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fanotify.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fault-inject.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fault-inject.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fb.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fbcon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fbcon.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fdtable.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fdtable.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fiemap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fiemap.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/file.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/file.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/file_ref.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/file_ref.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fileattr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fileattr.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/filelock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/filelock.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/filter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/filter.h</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/find.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/find.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firewire.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firewire.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/cirrus/cs_dsp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/cirrus/cs_dsp.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/cirrus/cs_dsp_test_utils.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/cirrus/cs_dsp_test_utils.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/imx/sm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/imx/sm.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/intel/stratix10-smc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/intel/stratix10-smc.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/intel/stratix10-svc-client.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/intel/stratix10-svc-client.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/mediatek/mtk-adsp-ipc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/mediatek/mtk-adsp-ipc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/qcom/qcom_qseecom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/qcom/qcom_qseecom.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/qcom/qcom_scm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/qcom/qcom_scm.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/qcom/qcom_tzmem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/qcom/qcom_tzmem.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/samsung/exynos-acpm-protocol.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/samsung/exynos-acpm-protocol.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/thead/thead,th1520-aon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/thead/thead,th1520-aon.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/xlnx-event-manager.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/xlnx-event-manager.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/xlnx-zynqmp-ufs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/xlnx-zynqmp-ufs.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/firmware/xlnx-zynqmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/xlnx-zynqmp.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/flex_proportions.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/flex_proportions.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/folio_queue.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/folio_queue.h</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/font.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/font.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fortify-string.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fortify-string.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/fpga/adi-axi-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpga/adi-axi-common.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fpga/fpga-bridge.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpga/fpga-bridge.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fpga/fpga-mgr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpga/fpga-mgr.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fpga/fpga-region.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpga/fpga-region.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fprobe.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fprobe.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/fpu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpu.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/framer/framer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/framer/framer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/freezer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/freezer.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs.h</a></td><td class='right'>1705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/fs/super.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs/super.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/fs/super_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs/super_types.h</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fs_context.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_context.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/linux/fs_dirent.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_dirent.h</a> (renamed from include/linux/fs_types.h)</td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fs_parser.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_parser.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fs_stack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_stack.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fs_struct.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_struct.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fscache-cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fscache-cache.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fscache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fscache.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fscrypt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fscrypt.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fsi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fsl/enetc_mdio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl/enetc_mdio.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fsl/mc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl/mc.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/fsl/netc_global.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl/netc_global.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/fsl/ntmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl/ntmp.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fsl/ptp_qoriq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl/ptp_qoriq.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fsl_devices.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl_devices.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fsnotify.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsnotify.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fsnotify_backend.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsnotify_backend.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fsverity.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsverity.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ftrace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ftrace.h</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ftrace_regs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ftrace_regs.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/futex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/futex.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fw_table.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fw_table.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/fwctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fwctl.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/fwnode.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fwnode.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gameport.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gameport.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gcd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gcd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/generic-radix-tree.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/generic-radix-tree.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/generic_pt/common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/generic_pt/common.h</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/generic_pt/iommu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/generic_pt/iommu.h</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/genetlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/genetlink.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/genl_magic_struct.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/genl_magic_struct.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gfp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gfp.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gfp_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gfp_types.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gpio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gpio/consumer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/consumer.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gpio/driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/driver.h</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/gpio/forwarder.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/forwarder.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/gpio/generic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/generic.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/gpio/gpio-nomadik.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/gpio-nomadik.h</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/gpio/legacy-of-mm-gpiochip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/legacy-of-mm-gpiochip.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gpio/property.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/property.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/gpio/regmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/regmap.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/greybus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/greybus.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/greybus/greybus_protocols.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/greybus/greybus_protocols.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/group_cpus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/group_cpus.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/habanalabs/cpucp_if.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/habanalabs/cpucp_if.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/habanalabs/hl_boot_if.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/habanalabs/hl_boot_if.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hdmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hdmi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/hfs_common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hfs_common.h</a></td><td class='right'>653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/hid-over-i2c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid-over-i2c.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/hid-over-spi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid-over-spi.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hid-sensor-hub.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid-sensor-hub.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hid-sensor-ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid-sensor-ids.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hid_bpf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid_bpf.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hidraw.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hidraw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/highmem-internal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/highmem-internal.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/highmem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/highmem.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hisi_acc_qm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hisi_acc_qm.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/hmm-dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hmm-dma.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hmm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hmm.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/host1x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/host1x.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/host1x_context_bus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/host1x_context_bus.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hrtimer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hrtimer.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hrtimer_defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hrtimer_defs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hrtimer_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hrtimer_types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/huge_mm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/huge_mm.h</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hugetlb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hugetlb.h</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hugetlb_inline.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hugetlb_inline.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/hung_task.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hung_task.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/hw_bitfield.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hw_bitfield.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hw_random.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hw_random.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hwmon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hwmon.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hwspinlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hwspinlock.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hyperv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hyperv.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/hypervisor.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hypervisor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i2c-algo-pca.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-algo-pca.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i2c-atr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-atr.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i2c-mux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-mux.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/i2c-of-prober.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-of-prober.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i2c-smbus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-smbus.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i2c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i3c/device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i3c/device.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i3c/master.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i3c/master.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i8042.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i8042.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/i8253.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i8253.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/icmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/icmp.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/idr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/idr.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211-eht.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211-eht.h</a></td><td class='right'>1182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211-he.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211-he.h</a></td><td class='right'>825</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211-ht.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211-ht.h</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211-mesh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211-mesh.h</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211-nan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211-nan.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211-p2p.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211-p2p.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211-s1g.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211-s1g.h</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211-vht.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211-vht.h</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ieee80211.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211.h</a></td><td class='right'>2917</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 24.6%;'/><td class='none' style='width: 73.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_bridge.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_bridge.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_ether.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_ether.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_hsr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_hsr.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/if_ltalk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_ltalk.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_macvlan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_macvlan.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_pppox.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_pppox.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_rmnet.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_rmnet.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_team.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_team.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_tun.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_tun.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/if_vlan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_vlan.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/igmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/igmp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/iio/adc-helpers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/adc-helpers.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/adc/ad_sigma_delta.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/adc/ad_sigma_delta.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/iio/adc/adi-axi-adc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/adc/adi-axi-adc.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/adc/qcom-vadc-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/adc/qcom-vadc-common.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/iio/backend.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/backend.h</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/buffer-dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/buffer-dma.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/buffer-dmaengine.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/buffer-dmaengine.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/buffer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/buffer.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/buffer_impl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/buffer_impl.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/common/cros_ec_sensors_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/common/cros_ec_sensors_core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/common/inv_sensors_timestamp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/common/inv_sensors_timestamp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/consumer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/consumer.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/driver.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/events.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/events.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/frequency/adf4350.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/frequency/adf4350.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/iio-gts-helper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/iio-gts-helper.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/iio-opaque.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/iio-opaque.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/iio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/iio.h</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/imu/adis.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/imu/adis.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/timer/stm32-lptim-trigger.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/timer/stm32-lptim-trigger.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/timer/stm32-timer-trigger.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/timer/stm32-timer-trigger.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iio/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/types.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ima.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ima.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/in6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/in6.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/inet.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/inet.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/inet_diag.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/inet_diag.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/inetdevice.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/inetdevice.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/init.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/init.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/init_task.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/init_task.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/input.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/input/matrix_keypad.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input/matrix_keypad.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/input/mt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input/mt.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/input/navpoint.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input/navpoint.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/input/touch-overlay.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input/touch-overlay.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/instrumentation.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/instrumentation.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/instrumented.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/instrumented.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/integrity.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/integrity.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/intel-ish-client-if.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel-ish-client-if.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/intel_dg_nvm_aux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_dg_nvm_aux.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/intel_pmt_features.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_pmt_features.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/intel_rapl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_rapl.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/intel_tcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_tcc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/intel_tpmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_tpmi.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/intel_vsec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_vsec.h</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/interconnect-clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interconnect-clk.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/interconnect-provider.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interconnect-provider.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/interconnect.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interconnect.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/interrupt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interrupt.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/interval_tree.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interval_tree.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/interval_tree_generic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interval_tree_generic.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/io-64-nonatomic-hi-lo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io-64-nonatomic-hi-lo.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/io-64-nonatomic-lo-hi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io-64-nonatomic-lo-hi.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/io-mapping.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io-mapping.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/io-pgtable.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io-pgtable.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/io.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/io_uring.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io_uring.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/io_uring/cmd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io_uring/cmd.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/io_uring/net.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io_uring/net.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/io_uring_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io_uring_types.h</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iocontext.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iocontext.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iomap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iomap.h</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/iommu-dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iommu-dma.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iommu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iommu.h</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iommufd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iommufd.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iopoll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iopoll.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ioport.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ioport.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ioprio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ioprio.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ioremap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ioremap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iosys-map.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iosys-map.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iov_iter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iov_iter.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/iova.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iova.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ipack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipack.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ipc_namespace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipc_namespace.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ipmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipmi.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ipmi_smi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipmi_smi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ipv6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipv6.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/irq-entry-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irq-entry-common.h</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irq.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irq_sim.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irq_sim.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irq_work.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irq_work.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/irq_work_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irq_work_types.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqbypass.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqbypass.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/arm-gic-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic-common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/arm-gic-v3-prio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic-v3-prio.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/arm-gic-v3.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic-v3.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/arm-gic-v4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic-v4.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/arm-gic-v5.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic-v5.h</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/arm-gic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/arm-vgic-info.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-vgic-info.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/irq-davinci-aintc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/irq-davinci-aintc.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/irq-davinci-cp-intc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/irq-davinci-cp-intc.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/irq-msi-lib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/irq-msi-lib.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/irq-partition-percpu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/irq-partition-percpu.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/irq-renesas-rzv2h.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/irq-renesas-rzv2h.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/riscv-aplic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/riscv-aplic.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/irqchip/riscv-imsic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/riscv-imsic.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqdesc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqdesc.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqdomain.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqdomain.h</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqdomain_defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqdomain_defs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqflags.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqflags.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/irqnr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqnr.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ism.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ism.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/jbd2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/jbd2.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/jhash.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/jhash.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/jiffies.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/jiffies.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/jump_label.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/jump_label.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kallsyms.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kallsyms.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kasan-enabled.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kasan-enabled.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kasan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kasan.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kcore.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kcore.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kcov.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kcov.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kdb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kdb.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kernel-page-flags.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernel-page-flags.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kernel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernel.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kernel_read_file.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernel_read_file.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kernel_stat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernel_stat.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kernfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernfs.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kexec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kexec.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/kexec_handover.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kexec_handover.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/key-type.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/key-type.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/key.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/key.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kfence.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kfence.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kfifo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kfifo.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kgdb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kgdb.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/kho/abi/luo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kho/abi/luo.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/kho/abi/memfd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kho/abi/memfd.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/khugepaged.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/khugepaged.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kmemleak.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmemleak.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kmod.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmod.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kmsan-checks.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmsan-checks.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kmsan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmsan.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kmsan_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmsan_types.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kmsg_dump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmsg_dump.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kobject.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kobject.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kobject_ns.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kobject_ns.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kprobes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kprobes.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kref.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kref.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ksm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ksm.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/linux/kstack_erase.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kstack_erase.h</a> (renamed from include/linux/stackleak.h)</td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kstrtox.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kstrtox.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kthread.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kthread.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ktime.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ktime.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kvm_dirty_ring.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kvm_dirty_ring.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kvm_host.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kvm_host.h</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kvm_irqfd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kvm_irqfd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/kvm_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kvm_types.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lcd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lcd.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/leafops.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/leafops.h</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/led-class-flash.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/led-class-flash.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/led-class-multicolor.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/led-class-multicolor.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/leds-expresswire.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/leds-expresswire.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/leds.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/leds.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/libata.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/libata.h</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/libgcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/libgcc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/libnvdimm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/libnvdimm.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/linkage.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/linkage.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/linkmode.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/linkmode.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/linux_logo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/linux_logo.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/list.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/list.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/list_lru.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/list_lru.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/list_nulls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/list_nulls.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/livepatch.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/livepatch.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/livepatch_external.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/livepatch_external.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/livepatch_helpers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/livepatch_helpers.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/livepatch_sched.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/livepatch_sched.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/liveupdate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/liveupdate.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/llist.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/llist.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/local_lock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/local_lock.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/local_lock_internal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/local_lock_internal.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lockd/lockd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockd/lockd.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lockd/xdr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockd/xdr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lockdep.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockdep.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lockdep_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockdep_types.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lockref.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockref.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/log2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/log2.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/logic_pio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/logic_pio.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lru_cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lru_cache.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/lsm/apparmor.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm/apparmor.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/lsm/bpf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm/bpf.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/lsm/selinux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm/selinux.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/lsm/smack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm/smack.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lsm_audit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm_audit.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/lsm_count.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm_count.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lsm_hook_defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm_hook_defs.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lsm_hooks.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm_hooks.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lz4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lz4.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/lzo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lzo.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mailbox/exynos-message.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox/exynos-message.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mailbox/mchp-ipc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox/mchp-ipc.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mailbox/mtk-cmdq-mailbox.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox/mtk-cmdq-mailbox.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mailbox/riscv-rpmi-message.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox/riscv-rpmi-message.h</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mailbox_client.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox_client.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mailbox_controller.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox_controller.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/maple.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/maple.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/maple_tree.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/maple_tree.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/marvell_phy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/marvell_phy.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/math.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/math.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/math64.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/math64.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mc33xs2410.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mc33xs2410.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mcb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mcb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mdio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mdio.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mei_cl_bus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mei_cl_bus.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mem_encrypt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mem_encrypt.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memblock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memblock.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memcontrol.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memcontrol.h</a></td><td class='right'>860</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memfd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memfd.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/memory-failure.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memory-failure.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memory-tiers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memory-tiers.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memory.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memory.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/memory/ti-aemif.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memory/ti-aemif.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memory_hotplug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memory_hotplug.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mempolicy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mempolicy.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mempool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mempool.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memregion.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memregion.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memremap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memremap.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/memstick.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memstick.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/88pm80x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/88pm80x.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/88pm886.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/88pm886.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/aat2870.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/aat2870.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/adp5585.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/adp5585.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/arizona/pdata.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/arizona/pdata.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/atmel-hlcdc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/atmel-hlcdc.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/axp20x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/axp20x.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/bcm590xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/bcm590xx.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/bq257xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/bq257xx.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/cgbc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/cgbc.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/cs40l50.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/cs40l50.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/cs42l43.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/cs42l43.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/da9052/da9052.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/da9052/da9052.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/da9063/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/da9063/core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/davinci_voicecodec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/davinci_voicecodec.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/dbx500-prcmu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/dbx500-prcmu.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/ds1wm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/ds1wm.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/ezx-pcap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/ezx-pcap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/idt8a340_reg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/idt8a340_reg.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/intel-m10-bmc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/intel-m10-bmc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/lm3533.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/lm3533.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/loongson-se.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/loongson-se.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/lp3943.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/lp3943.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/lp8788.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/lp8788.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/macsmc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/macsmc.h</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/madera/pdata.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/madera/pdata.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max14577-private.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max14577-private.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max14577.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max14577.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max5970.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max5970.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max7360.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max7360.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max77686-private.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77686-private.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max77686.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77686.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max77693-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77693-common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max77693-private.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77693-private.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max77693.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77693.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max77705-private.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77705-private.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max77759.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77759.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max8997-private.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max8997-private.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max8997.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max8997.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max8998-private.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max8998-private.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/max8998.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max8998.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/mc13xxx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/mc13xxx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/mt6328/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/mt6328/core.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/mt6328/registers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/mt6328/registers.h</a></td><td class='right'>822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/mt6397/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/mt6397/core.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/mt6397/rtc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/mt6397/rtc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/nct6694.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/nct6694.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/palmas.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/palmas.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/pcf50633/adc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/adc.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/pcf50633/backlight.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/backlight.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/pcf50633/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/core.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/pcf50633/gpio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/gpio.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/pcf50633/mbc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/mbc.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/pcf50633/pmic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/pmic.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/pf1550.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pf1550.h</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/qnap-mcu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/qnap-mcu.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/rk808.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/rk808.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/rohm-bd71828.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/rohm-bd71828.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/rohm-bd96801.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/rohm-bd96801.h</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/rohm-bd96802.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/rohm-bd96802.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/rohm-generic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/rohm-generic.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/samsung/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/samsung/core.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/samsung/irq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/samsung/irq.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/samsung/rtc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/samsung/rtc.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/samsung/s2mpg10.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/samsung/s2mpg10.h</a></td><td class='right'>454</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/samsung/s2mpu05.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/samsung/s2mpu05.h</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/sta2x11-mfd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/sta2x11-mfd.h</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/stm32-lptimer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/stm32-lptimer.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/stm32-timers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/stm32-timers.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/sun4i-gpadc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/sun4i-gpadc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/syscon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/syscon.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/syscon/atmel-smc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/syscon/atmel-smc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/tmio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/tmio.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/tps65219.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/tps65219.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/tps65912.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/tps65912.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/tps6594.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/tps6594.h</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/twl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/twl.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/upboard-fpga.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/upboard-fpga.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/wl1273-core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/wl1273-core.h</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mfd/wm8350/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/wm8350/core.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mhi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mhi.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mhi_ep.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mhi_ep.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/micrel_phy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/micrel_phy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/migrate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/migrate.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/migrate_mode.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/migrate_mode.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mii.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mii.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mii_timestamper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mii_timestamper.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/min_heap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/min_heap.h</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/minmax.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/minmax.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/misc/keba.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/misc/keba.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/misc_cgroup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/misc_cgroup.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/miscdevice.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/miscdevice.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx4/device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx4/device.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/cq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/cq.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/device.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/driver.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/eswitch.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/eswitch.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/fs.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/mlx5_ifc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/mlx5_ifc.h</a></td><td class='right'>1216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/mlx5_ifc_vdpa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/mlx5_ifc_vdpa.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/port.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/port.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/qp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/qp.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mlx5/vport.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/vport.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mm.h</a></td><td class='right'>2230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 80.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mm_inline.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mm_inline.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mm_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mm_types.h</a></td><td class='right'>848</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mm_types_task.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mm_types_task.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mman.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mman.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmap_lock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmap_lock.h</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmc/card.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/card.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmc/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/core.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmc/host.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/host.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmc/sd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/sd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mmc/sd_uhs2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/sd_uhs2.h</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmc/sdio_func.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/sdio_func.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmc/sdio_ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/sdio_ids.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmc/slot-gpio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/slot-gpio.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmdebug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmdebug.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmu_context.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmu_context.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmu_notifier.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmu_notifier.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mmzone.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmzone.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mnt_idmapping.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mnt_idmapping.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mnt_namespace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mnt_namespace.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mod_devicetable.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mod_devicetable.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/module.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/module.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/moduleloader.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/moduleloader.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/moduleparam.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/moduleparam.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mount.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mount.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/moxtet.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/moxtet.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mpi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mpi.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mroute6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mroute6.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mroute_base.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mroute_base.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/msi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/msi.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/msi_api.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/msi_api.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/cfi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/cfi.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/flashchip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/flashchip.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/lpc32xx_mlc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/lpc32xx_mlc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/lpc32xx_slc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/lpc32xx_slc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/map.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/map.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/mtd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/mtd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/nand-ecc-mxic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/nand-ecc-mxic.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/nand-qpic-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/nand-qpic-common.h</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/nand.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/nand.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/rawnand.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/rawnand.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/spear_smi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/spear_smi.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/spinand.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/spinand.h</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mtd/ubi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/ubi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mutex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mutex.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/mux/driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mux/driver.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/mv643xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mv643xx.h</a></td><td class='right'>921</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.2%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/namei.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/namei.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nd.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/net.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/net/intel/iidc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/iidc.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/net/intel/iidc_rdma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/iidc_rdma.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/net/intel/iidc_rdma_ice.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/iidc_rdma_ice.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/net/intel/iidc_rdma_idpf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/iidc_rdma_idpf.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/net/intel/libie/adminq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/libie/adminq.h</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/net/intel/libie/fwlog.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/libie/fwlog.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/net/intel/libie/pctype.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/libie/pctype.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/net/intel/libie/rx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/libie/rx.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/net_tstamp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net_tstamp.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/netdev_features.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netdev_features.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/netdevice.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netdevice.h</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/netdevice_xmit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netdevice_xmit.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/netfilter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfilter.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/netfilter/nf_conntrack_dccp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfilter/nf_conntrack_dccp.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/netfilter/x_tables.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfilter/x_tables.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/netfilter_netdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfilter_netdev.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/netfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfs.h</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netlink.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/netpoll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netpoll.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nfs4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs4.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/nfs_common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_common.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nfs_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_fs.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nfs_fs_sb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_fs_sb.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nfs_page.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_page.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nfs_xdr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_xdr.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/nfslocalio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfslocalio.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nmi.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/node.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/node.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nodemask.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nodemask.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nodemask_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nodemask_types.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/notifier.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/notifier.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ns/ns_common_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ns/ns_common_types.h</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ns/nstree_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ns/nstree_types.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ns_common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ns_common.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/nsfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nsfs.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nsproxy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nsproxy.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/nstree.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nstree.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/numa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/numa.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/numa_memblks.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/numa_memblks.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nvme-auth.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-auth.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nvme-fc-driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-fc-driver.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nvme-keyring.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-keyring.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nvme-rdma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-rdma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nvme-tcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-tcp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nvme.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme.h</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/nvmem-provider.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvmem-provider.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/oa_tc6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/oa_tc6.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/objagg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/objagg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/objpool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/objpool.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/objtool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/objtool.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/objtool_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/objtool_types.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/of.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of.h</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/of_address.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_address.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/of_fdt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_fdt.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/of_graph.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_graph.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/of_irq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_irq.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/of_platform.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_platform.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/of_reserved_mem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_reserved_mem.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/oid_registry.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/oid_registry.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/omap-gpmc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/omap-gpmc.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/omap-mailbox.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/omap-mailbox.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/once.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/once.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/once_lite.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/once_lite.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/oom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/oom.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/overflow.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/overflow.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/packing.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/packing.h</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/padata.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/padata.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page-flags-layout.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page-flags-layout.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page-flags.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page-flags.h</a></td><td class='right'>787</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page-isolation.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page-isolation.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page_counter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_counter.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page_ext.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_ext.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/page_frag_cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_frag_cache.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page_idle.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_idle.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page_owner.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_owner.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page_ref.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_ref.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/page_table_check.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_table_check.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pageblock-flags.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pageblock-flags.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pagemap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pagemap.h</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pagevec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pagevec.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pagewalk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pagewalk.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/panic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/panic.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/papr_scm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/papr_scm.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/parport.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/parport.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/part_stat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/part_stat.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/path.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/path.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci-ats.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-ats.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pci-bwctrl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-bwctrl.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci-doe.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-doe.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci-ecam.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-ecam.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pci-ep-msi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-ep-msi.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci-epc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-epc.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci-epf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-epf.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pci-ide.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-ide.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci-p2pdma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-p2pdma.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pci-pwrctrl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-pwrctrl.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pci-tph.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-tph.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pci-tsm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-tsm.h</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci.h</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci_hotplug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci_hotplug.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pci_ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci_ids.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pcie-dwc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pcie-dwc.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pcs/pcs-xpcs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pcs/pcs-xpcs.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pds/pds_adminq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pds/pds_adminq.h</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pds/pds_common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pds/pds_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pe.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pe.h</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/peci-cpu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/peci-cpu.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/peci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/peci.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/percpu-defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/percpu-defs.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/percpu-rwsem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/percpu-rwsem.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/percpu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/percpu.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/perf/arm_pmu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/perf/arm_pmu.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/perf/arm_pmuv3.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/perf/arm_pmuv3.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/perf/riscv_pmu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/perf/riscv_pmu.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/perf_event.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/perf_event.h</a></td><td class='right'>569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pfn.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pfn.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/pfn_t.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pfn_t.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pgalloc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pgalloc.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pgalloc_tag.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pgalloc_tag.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pgtable.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pgtable.h</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/phy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy.h</a></td><td class='right'>900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/phy/phy-dp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/phy-dp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/phy/phy-hdmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/phy-hdmi.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/phy/phy-sun4i-usb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/phy-sun4i-usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/phy/phy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/phy.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/phy/tegra/xusb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/tegra/xusb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/phy_fixed.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy_fixed.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/phy_link_topology.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy_link_topology.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/phylib_stubs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phylib_stubs.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/phylink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phylink.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pid.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pid_namespace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pid_namespace.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pidfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pidfs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pinctrl/consumer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/consumer.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pinctrl/machine.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/machine.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pinctrl/pinconf-generic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/pinconf-generic.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pinctrl/pinctrl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/pinctrl.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pinctrl/pinmux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/pinmux.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pipe_fs_i.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pipe_fs_i.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/pktcdvd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pktcdvd.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/ad5449.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/ad5449.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/amd_qdma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/amd_qdma.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/asoc-s3c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/asoc-s3c.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/bcmgenet.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/bcmgenet.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/clk-davinci-pll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/clk-davinci-pll.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/cros_ec_commands.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/cros_ec_commands.h</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/cros_ec_proto.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/cros_ec_proto.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/cyttsp4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/cyttsp4.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/davinci_asp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/davinci_asp.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/dma-ep93xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/dma-ep93xx.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/dmtimer-omap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/dmtimer-omap.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/emc2305.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/emc2305.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/eth-ep93xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/eth-ep93xx.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/gpio-ath79.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/gpio-ath79.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/gpio-davinci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/gpio-davinci.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/huawei-gaokun-ec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/huawei-gaokun-ec.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/hwmon-s3c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/hwmon-s3c.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/i2c-davinci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/i2c-davinci.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/i2c-mux-gpio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/i2c-mux-gpio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/keyboard-spear.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keyboard-spear.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/keypad-ep93xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keypad-ep93xx.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/keypad-nomadik-ske.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keypad-nomadik-ske.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/keypad-pxa27x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keypad-pxa27x.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/keyscan-davinci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keyscan-davinci.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/lenovo-yoga-c630.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/lenovo-yoga-c630.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/lp855x.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/lp855x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/max6639.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/max6639.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/max6697.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/max6697.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/mcs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mcs.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/media/omap4iss.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/media/omap4iss.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/microchip-ksz.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/microchip-ksz.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/mlxreg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mlxreg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/mmc-pxamci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mmc-pxamci.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/mtd-davinci-aemif.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mtd-davinci-aemif.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/mtd-davinci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mtd-davinci.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/mtd-nand-s3c2410.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mtd-nand-s3c2410.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/omap1_bl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/omap1_bl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/sa11x0-serial.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/sa11x0-serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/spi-davinci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/spi-davinci.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/spi-ep93xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/spi-ep93xx.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/spi-omap2-mcspi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/spi-omap2-mcspi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/syscon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/syscon.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/ti-aemif.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/ti-aemif.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/ti-sysc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/ti-sysc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/tmio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/tmio.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/touchscreen-s3c2410.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/touchscreen-s3c2410.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/uio_pruss.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/uio_pruss.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/usb-davinci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/usb-davinci.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/video-pxafb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/video-pxafb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/amd-fch.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/amd-fch.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/asus-wmi-leds-ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/asus-wmi-leds-ids.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/asus-wmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/asus-wmi.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/int3472.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/int3472.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/intel-mid_wdt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/intel-mid_wdt.h</a> (renamed from include/linux/platform_data/intel-mid_wdt.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/intel_pmc_ipc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/intel_pmc_ipc.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/intel_scu_ipc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/intel_scu_ipc.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/pmc_atom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/pmc_atom.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/pwm-lpss.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/pwm-lpss.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/x86/soc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/soc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/platform_data/zforce_ts.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/zforce_ts.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_device.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/platform_profile.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_profile.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pldmfw.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pldmfw.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pm_clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_clock.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pm_domain.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_domain.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pm_opp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_opp.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pm_qos.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_qos.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pm_runtime.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_runtime.h</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pm_wakeirq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_wakeirq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pm_wakeup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_wakeup.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pmbus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pmbus.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pnp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pnp.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/poison.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/poison.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/poll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/poll.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/posix-clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/posix-clock.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/posix-timers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/posix-timers.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/posix_acl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/posix_acl.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/power/bq27xxx_battery.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/power/bq27xxx_battery.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/power/max77705_charger.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/power/max77705_charger.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/power_supply.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/power_supply.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ppp_channel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ppp_channel.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pps_gen_kernel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pps_gen_kernel.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pps_kernel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pps_kernel.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/prandom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/prandom.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/preempt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/preempt.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/printk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/printk.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/prmt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/prmt.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/proc_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/proc_fs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/proc_ns.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/proc_ns.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/profile.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/profile.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/property.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/property.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pruss_driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pruss_driver.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pse-pd/pse.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pse-pd/pse.h</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pseudo_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pseudo_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/psi_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/psi_types.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/psp-platform-access.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/psp-platform-access.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/psp-sev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/psp-sev.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pstore.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pstore.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ptdump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ptdump.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ptp_classify.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ptp_classify.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ptp_clock_kernel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ptp_clock_kernel.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ptr_ring.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ptr_ring.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pwm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pwm.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pwm_backlight.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pwm_backlight.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pwrseq/consumer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pwrseq/consumer.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/pwrseq/provider.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pwrseq/provider.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/pxa2xx_ssp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pxa2xx_ssp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/qat/qat_mig_dev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/qat/qat_mig_dev.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/qed/qed_ll2_if.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/qed/qed_ll2_if.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/quota.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/quota.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/quotaops.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/quotaops.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/raid/pq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/raid/pq.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/random.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/random.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/randomize_kstack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/randomize_kstack.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/range.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/range.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ras.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ras.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/raspberrypi/vchiq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/raspberrypi/vchiq.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/raspberrypi/vchiq_arm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/raspberrypi/vchiq_arm.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/raspberrypi/vchiq_bus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/raspberrypi/vchiq_bus.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/raspberrypi/vchiq_cfg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/raspberrypi/vchiq_cfg.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/raspberrypi/vchiq_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/raspberrypi/vchiq_core.h</a></td><td class='right'>646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/raspberrypi/vchiq_debugfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/raspberrypi/vchiq_debugfs.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ratelimit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ratelimit.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ratelimit_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ratelimit_types.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rbtree.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rbtree.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rbtree_latch.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rbtree_latch.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rcu_segcblist.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcu_segcblist.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rculist.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rculist.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rculist_nulls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rculist_nulls.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rcupdate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcupdate.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rcupdate_trace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcupdate_trace.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rcupdate_wait.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcupdate_wait.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rcuref.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcuref.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rcutiny.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcutiny.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rcutree.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcutree.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rcuwait.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcuwait.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/reboot.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/reboot.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ref_tracker.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ref_tracker.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/refcount.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/refcount.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/regmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regmap.h</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/regset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regset.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/regulator/consumer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/consumer.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/regulator/coupler.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/coupler.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/regulator/driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/driver.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/regulator/machine.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/machine.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/regulator/max8952.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/max8952.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/regulator/mt6363-regulator.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/mt6363-regulator.h</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/regulator/pca9450.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/pca9450.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/regulator/s2dos05.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/s2dos05.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/relay.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/relay.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/remoteproc/mtk_scp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/remoteproc/mtk_scp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/resctrl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/resctrl.h</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/resctrl_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/resctrl_types.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/reset-controller.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/reset-controller.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/reset.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/reset.h</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/restart_block.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/restart_block.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/resume_user_mode.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/resume_user_mode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rfkill.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rfkill.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rhashtable-types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rhashtable-types.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rhashtable.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rhashtable.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ring_buffer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ring_buffer.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rio_drv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rio_drv.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rmap.h</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/rolling_buffer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rolling_buffer.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/rpmb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rpmb.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rpmsg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rpmsg.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rseq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rseq.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/rseq_entry.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rseq_entry.h</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/rseq_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rseq_types.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rtc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rtc/ds1685.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtc/ds1685.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rtc/m48t59.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtc/m48t59.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rtmutex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtmutex.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rtnetlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtnetlink.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rtsx_common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtsx_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rtsx_pci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtsx_pci.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rtsx_usb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtsx_usb.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rv.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rw_hint.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rw_hint.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rwbase_rt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwbase_rt.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rwlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwlock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rwlock_api_smp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwlock_api_smp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rwlock_rt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwlock_rt.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/rwsem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwsem.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sbitmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sbitmap.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/scatterlist.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/scatterlist.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched.h</a></td><td class='right'>593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/coredump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/coredump.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/deadline.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/deadline.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/debug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/sched/ext.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/ext.h</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/hotplug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/hotplug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/idle.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/idle.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/isolation.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/isolation.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/mm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/mm.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/nohz.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/nohz.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/prio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/prio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/rt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/rt.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/sd_flags.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/sd_flags.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/signal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/signal.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/smt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/smt.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/task.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/task.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/task_stack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/task_stack.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/topology.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/topology.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/vhost_task.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/vhost_task.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sched/wake_q.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/wake_q.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/scmi_imx_protocol.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/scmi_imx_protocol.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/scmi_protocol.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/scmi_protocol.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/screen_info.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/screen_info.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sctp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sctp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/seccomp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/seccomp.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/secretmem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/secretmem.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/security.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/security.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sed-opal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sed-opal.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/selection.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/selection.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sem.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/semaphore.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/semaphore.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/seq_buf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/seq_buf.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/seq_file.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/seq_file.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/seqlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/seqlock.h</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/serdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serdev.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/serial_8250.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_8250.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/serial_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_core.h</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/serial_max3100.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_max3100.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/serial_s3c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_s3c.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/serial_sci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_sci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/serio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serio.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/set_memory.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/set_memory.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sfp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sfp.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/shdma-base.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/shdma-base.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/shm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/shm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/shmem_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/shmem_fs.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sizes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sizes.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/skb_array.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/skb_array.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/skbuff.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/skbuff.h</a></td><td class='right'>717</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/skbuff_ref.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/skbuff_ref.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/skmsg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/skmsg.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/slab.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/slab.h</a></td><td class='right'>646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/slimbus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/slimbus.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sm501.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sm501.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/smp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/smp.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/soc/airoha/airoha_offload.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/airoha/airoha_offload.h</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/soc/amd/isp4_misc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/amd/isp4_misc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/apple/rtkit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/apple/rtkit.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/cirrus/ep93xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/cirrus/ep93xx.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/soc/marvell/silicons.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/marvell/silicons.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/soc/mediatek/dvfsrc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/dvfsrc.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/mediatek/infracfg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/infracfg.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/mediatek/mtk-cmdq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/mtk-cmdq.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/mediatek/mtk_sip_svc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/mtk_sip_svc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/mediatek/mtk_wed.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/mtk_wed.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/apr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/apr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/geni-se.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/geni-se.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/llcc-qcom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/llcc-qcom.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/mdt_loader.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/mdt_loader.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/pmic_glink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/pmic_glink.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/qmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/qmi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/smem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/smem.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/socinfo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/socinfo.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/soc/qcom/ubwc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/ubwc.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/samsung/exynos-regs-pmu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/samsung/exynos-regs-pmu.h</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soc/ti/ti_sci_protocol.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/ti/ti_sci_protocol.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/socket.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/socket.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sockptr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sockptr.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/sony-laptop.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sony-laptop.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sort.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sort.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soundwire/sdw.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw.h</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soundwire/sdw_amd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw_amd.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soundwire/sdw_intel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw_intel.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soundwire/sdw_registers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw_registers.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/soundwire/sdw_type.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw_type.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/spi/offload/consumer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/offload/consumer.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/spi/offload/provider.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/offload/provider.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/spi/offload/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/offload/types.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/spi/pxa2xx_spi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/pxa2xx_spi.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/spi/rspi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/rspi.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spi/sh_msiof.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/sh_msiof.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spi/spi-mem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/spi-mem.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spi/spi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/spi.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spi/spi_bitbang.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/spi_bitbang.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spi/xilinx_spi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/xilinx_spi.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spinlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spinlock_api_smp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock_api_smp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spinlock_rt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock_rt.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spinlock_types_up.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock_types_up.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/spinlock_up.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock_up.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sprintf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sprintf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/srcu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/srcu.h</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/srcutiny.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/srcutiny.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/srcutree.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/srcutree.h</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ssb/ssb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ssb/ssb.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/stackdepot.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stackdepot.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/start_kernel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/start_kernel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/stat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stat.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/static_call.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/static_call.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/static_call_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/static_call_types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/stddef.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stddef.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/stm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stm.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/stmmac.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stmmac.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/stop_machine.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stop_machine.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/string.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/string.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/string_choices.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/string_choices.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/string_helpers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/string_helpers.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sungem_phy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sungem_phy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/cache.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/clnt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/clnt.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/debug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/debug.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/gss_asn1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/gss_asn1.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/gss_krb5.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/gss_krb5.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/msg_prot.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/msg_prot.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/rdma_rn.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/rdma_rn.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/rpc_pipe_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/rpc_pipe_fs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/sched.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/sched.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/svc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svc.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/svc_rdma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svc_rdma.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/svc_xprt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svc_xprt.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/svcauth.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svcauth.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/svcsock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svcsock.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/xdr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xdr.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/xdrgen/_builtins.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xdrgen/_builtins.h</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/xdrgen/_defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xdrgen/_defs.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/xdrgen/nfs4_1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xdrgen/nfs4_1.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/xprt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xprt.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sunrpc/xprtmultipath.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xprtmultipath.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/suspend.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/suspend.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/swap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swap.h</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/swap_cgroup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swap_cgroup.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/swap_slots.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swap_slots.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/swapops.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swapops.h</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/swiotlb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swiotlb.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/switchtec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/switchtec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sync_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sync_core.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/sys_info.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sys_info.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/syscalls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/syscalls.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/syscore_ops.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/syscore_ops.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sysctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sysctl.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sysfb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sysfb.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/sysfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sysfs.h</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/sysv_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sysv_fs.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/t10-pi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/t10-pi.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/task_work.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/task_work.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/tca6416_keypad.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tca6416_keypad.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tcp.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/tee_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tee_core.h</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tee_drv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tee_drv.h</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/text-patching.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/text-patching.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/tfrc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tfrc.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/thermal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/thermal.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/thread_info.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/thread_info.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/threads.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/threads.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/thunderbolt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/thunderbolt.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tick.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tick.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/time64.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/time64.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/time_namespace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/time_namespace.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/timecounter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timecounter.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/timekeeper_internal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timekeeper_internal.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/timekeeping.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timekeeping.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/timer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timer.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/timerqueue.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timerqueue.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/timex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timex.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tnum.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tnum.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/topology.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/topology.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/torture.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/torture.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tpm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tpm.h</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tpm_eventlog.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tpm_eventlog.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/tpm_svsm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tpm_svsm.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/trace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/trace.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/trace_events.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/trace_events.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/trace_recursion.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/trace_recursion.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/trace_seq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/trace_seq.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tracefs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tracefs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tracepoint-defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tracepoint-defs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tracepoint.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tracepoint.h</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/tsm-mr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tsm-mr.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tsm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tsm.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tty.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tty.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tty_driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tty_driver.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tty_ldisc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tty_ldisc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/tty_port.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tty_port.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/turris-omnia-mcu-interface.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/turris-omnia-mcu-interface.h</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/turris-signing-key.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/turris-signing-key.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/types.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/u64_stats_sync.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/u64_stats_sync.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/uaccess.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uaccess.h</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ubsan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ubsan.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/ucopysize.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ucopysize.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/udp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/udp.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/uidgid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uidgid.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/uio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uio.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/uio_driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uio_driver.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/linux/unaligned.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/unaligned.h</a> (renamed from include/asm-generic/unaligned.h)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/unicode.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/unicode.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/union_find.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/union_find.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/unroll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/unroll.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/unwind_deferred.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/unwind_deferred.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/unwind_deferred_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/unwind_deferred_types.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/unwind_user.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/unwind_user.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/unwind_user_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/unwind_user_types.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/uprobes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uprobes.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/audio-v2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/audio-v2.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/cdc_ncm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/cdc_ncm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/chipidea.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/chipidea.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/composite.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/composite.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/usb/func_utils.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/func_utils.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/gadget.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/gadget.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/gadget_configfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/gadget_configfs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/usb/mctp-usb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/mctp-usb.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/musb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/musb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/of.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/of.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/usb/onboard_dev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/onboard_dev.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/usb/onboard_hub.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/onboard_hub.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/pd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/pd.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/pd_vdo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/pd_vdo.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/phy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/phy.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/r8152.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/r8152.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/renesas_usbhs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/renesas_usbhs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/serial.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/serial.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/storage.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/storage.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/tcpci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/tcpci.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/tcpm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/tcpm.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/tegra_usb_phy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/tegra_usb_phy.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/typec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/typec_altmode.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec_altmode.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/typec_dp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec_dp.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/typec_mux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec_mux.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/typec_tbt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec_tbt.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/ulpi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/ulpi.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/usb/usbio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/usbio.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/usbnet.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/usbnet.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/usb/uvc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/uvc.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/usb/xhci-sideband.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/xhci-sideband.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/user_events.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/user_events.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/user_namespace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/user_namespace.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/userfaultfd_k.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/userfaultfd_k.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/usermode_driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usermode_driver.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/util_macros.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/util_macros.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/uts_namespace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uts_namespace.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/utsname.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/utsname.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vdpa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vdpa.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/vdso_datastore.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vdso_datastore.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/verification.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/verification.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vermagic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vermagic.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vfio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vfio.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vfio_pci_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vfio_pci_core.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/vfsdebug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vfsdebug.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/videodev2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/videodev2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/virtio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/virtio.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/virtio_config.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/virtio_config.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/virtio_features.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/virtio_features.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/virtio_net.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/virtio_net.h</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/virtio_pci_admin.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/virtio_pci_admin.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/virtio_pci_modern.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/virtio_pci_modern.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/virtio_ring.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/virtio_ring.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/virtio_vsock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/virtio_vsock.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vm_event_item.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vm_event_item.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vmalloc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vmalloc.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/linux/vmcore_info.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vmcore_info.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vmstat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vmstat.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vmw_vmci_api.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vmw_vmci_api.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vmw_vmci_defs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vmw_vmci_defs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vringh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vringh.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vt_buffer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vt_buffer.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vt_kern.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vt_kern.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/vtime.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/vtime.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/w1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/w1.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/wait.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/wait.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/wait_bit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/wait_bit.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/watchdog.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/watchdog.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/win_minmax.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/win_minmax.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/wireless.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/wireless.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/wmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/wmi.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/wordpart.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/wordpart.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/workqueue.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/workqueue.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/writeback.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/writeback.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/ww_mutex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ww_mutex.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/wwan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/wwan.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/xarray.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/xarray.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/xattr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/xattr.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/xxhash.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/xxhash.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/xz.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/xz.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/zorro.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/zorro.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/linux/zpool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/zpool.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/zsmalloc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/zsmalloc.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/zstd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/zstd.h</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/zstd_errors.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/zstd_errors.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/zstd_lib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/zstd_lib.h</a></td><td class='right'>1123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/linux/zswap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/zswap.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/media/cadence/cdns-csi2rx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/cadence/cdns-csi2rx.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/cec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/cec.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/drv-intf/cx25840.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/drv-intf/cx25840.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/drv-intf/msp3400.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/drv-intf/msp3400.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/drv-intf/saa7146_vv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/drv-intf/saa7146_vv.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/bt819.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/bt819.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/cs5345.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/cs5345.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/cs53l32a.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/cs53l32a.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/m52790.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/m52790.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/media/i2c/mt9p031.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/mt9p031.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/mt9v011.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/mt9v011.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/media/i2c/mt9v022.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/mt9v022.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/media/i2c/mt9v032.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/mt9v032.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/saa7115.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/saa7115.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/saa7127.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/saa7127.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/ths7303.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/ths7303.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/tvaudio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/tvaudio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/upd64031a.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/upd64031a.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/upd64083.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/upd64083.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/i2c/wm8775.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/i2c/wm8775.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/ipu-bridge.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/ipu-bridge.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/media/ipu6-pci-table.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/ipu6-pci-table.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/media-device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/media-device.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/media-entity.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/media-entity.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/media-request.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/media-request.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/rc-core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/rc-core.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/rc-map.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/rc-map.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/rcar-fcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/rcar-fcp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/tuner-types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/tuner-types.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/tuner.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/tuner.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-async.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-async.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-common.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-ctrls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-ctrls.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-dev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-dev.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-device.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-dv-timings.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-dv-timings.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-fh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-fh.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-ioctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-ioctl.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-isp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-isp.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-jpeg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-jpeg.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-mc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-mc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-mediabus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-mediabus.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-mem2mem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-mem2mem.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/v4l2-subdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/v4l2-subdev.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/videobuf2-core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/videobuf2-core.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/videobuf2-v4l2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/videobuf2-v4l2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/media/vsp1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/media/vsp1.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/memory/renesas-rpc-if.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/memory/renesas-rpc-if.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/misc/cxl-base.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/misc/cxl-base.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/misc/cxl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/misc/cxl.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/misc/cxllib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/misc/cxllib.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/9p/client.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/9p/client.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/9p/transport.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/9p/transport.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/act_api.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/act_api.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/addrconf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/addrconf.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/af_rxrpc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/af_rxrpc.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/af_unix.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/af_unix.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/af_vsock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/af_vsock.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/aligned_data.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/aligned_data.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ax25.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ax25.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/bluetooth.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/bluetooth.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/hci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/hci.h</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/hci_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/hci_core.h</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/hci_drv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/hci_drv.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/hci_mon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/hci_mon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/hci_sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/hci_sock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/hci_sync.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/hci_sync.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/l2cap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/l2cap.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/mgmt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/mgmt.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bluetooth/rfcomm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bluetooth/rfcomm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bond_3ad.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bond_3ad.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bond_alb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bond_alb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bond_options.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bond_options.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/bonding.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/bonding.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/busy_poll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/busy_poll.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/caif/caif_layer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/caif/caif_layer.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/caif/cfpkt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/caif/cfpkt.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/caif/cfsrvl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/caif/cfsrvl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/calipso.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/calipso.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/cfg80211.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/cfg80211.h</a></td><td class='right'>1303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/checksum.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/checksum.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/cipso_ipv4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/cipso_ipv4.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/cls_cgroup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/cls_cgroup.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/devlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/devlink.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/dropreason-core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/dropreason-core.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/dropreason.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/dropreason.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/dsa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/dsa.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/dscp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/dscp.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/dst.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/dst.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/dst_cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/dst_cache.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/dst_metadata.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/dst_metadata.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/dst_ops.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/dst_ops.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/eee.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/eee.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/erspan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/erspan.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/espintcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/espintcp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/fib_notifier.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/fib_notifier.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/fib_rules.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/fib_rules.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/flow.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/flow.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/flow_dissector.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/flow_dissector.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/flow_offload.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/flow_offload.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/genetlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/genetlink.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/gre.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/gre.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/gro.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/gro.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/gtp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/gtp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/hotdata.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/hotdata.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/hwbm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/hwbm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/icmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/icmp.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ieee80211_radiotap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ieee80211_radiotap.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/ieee8021q.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ieee8021q.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet6_connection_sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet6_connection_sock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet6_hashtables.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet6_hashtables.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet_common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet_common.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet_connection_sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet_connection_sock.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet_dscp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet_dscp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet_frag.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet_frag.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet_hashtables.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet_hashtables.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet_sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet_sock.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inet_timewait_sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inet_timewait_sock.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/inetpeer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/inetpeer.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ip.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ip6_fib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ip6_fib.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ip6_route.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ip6_route.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ip6_tunnel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ip6_tunnel.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ip_fib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ip_fib.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ip_tunnels.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ip_tunnels.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ip_vs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ip_vs.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ipcomp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ipcomp.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ipv6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ipv6.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ipv6_frag.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ipv6_frag.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ipv6_stubs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ipv6_stubs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/iucv/iucv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/iucv/iucv.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/iw_handler.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/iw_handler.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/kcm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/kcm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/l3mdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/l3mdev.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/lapb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/lapb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/net/lib80211.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/lib80211.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/libeth/cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/libeth/cache.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/libeth/rx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/libeth/rx.h</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/libeth/tx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/libeth/tx.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/libeth/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/libeth/types.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/libeth/xdp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/libeth/xdp.h</a></td><td class='right'>1870</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/libeth/xsk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/libeth/xsk.h</a></td><td class='right'>685</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/llc_c_st.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/llc_c_st.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/llc_pdu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/llc_pdu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/llc_s_st.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/llc_s_st.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/lwtunnel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/lwtunnel.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/mac80211.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/mac80211.h</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/mac802154.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/mac802154.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/macsec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/macsec.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/mana/gdma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/mana/gdma.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/mana/hw_channel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/mana/hw_channel.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/mana/mana.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/mana/mana.h</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/mctp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/mctp.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/mctpdevice.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/mctpdevice.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/mptcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/mptcp.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ndisc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ndisc.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/neighbour.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/neighbour.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/neighbour_tables.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/neighbour_tables.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/net_debug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/net_debug.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/net_namespace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/net_namespace.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/net_shaper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/net_shaper.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/netdev_lock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netdev_lock.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/netdev_netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netdev_netlink.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netdev_queues.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netdev_queues.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netdev_rx_queue.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netdev_rx_queue.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/ipv4/nf_conntrack_ipv4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/ipv4/nf_conntrack_ipv4.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/ipv4/nf_reject.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/ipv4/nf_reject.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/ipv6/nf_reject.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/ipv6/nf_reject.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_conntrack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_conntrack.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_conntrack_count.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_conntrack_count.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_conntrack_ecache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_conntrack_ecache.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_conntrack_l4proto.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_conntrack_l4proto.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_flow_table.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_flow_table.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_hooks_lwtunnel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_hooks_lwtunnel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_log.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_log.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_reject.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_reject.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_tables.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_tables.h</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_tables_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_tables_core.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_tables_ipv4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_tables_ipv4.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_tables_ipv6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_tables_ipv6.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nf_tproxy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nf_tproxy.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nft_fib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nft_fib.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nft_meta.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nft_meta.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netfilter/nft_reject.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netfilter/nft_reject.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netlabel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netlabel.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netlink.h</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netmem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netmem.h</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/conntrack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/conntrack.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/ipv4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/ipv4.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/ipv6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/ipv6.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/mctp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/mctp.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/mpls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/mpls.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/netfilter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/netfilter.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/nftables.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/nftables.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/sctp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/sctp.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/smc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/smc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/netns/xfrm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/netns/xfrm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/nexthop.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/nexthop.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/nfc/nci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/nfc/nci.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/nfc/nci_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/nfc/nci_core.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/nfc/nfc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/nfc/nfc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/nl802154.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/nl802154.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/net/p8022.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/p8022.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/page_pool/helpers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/page_pool/helpers.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/page_pool/memory_provider.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/page_pool/memory_provider.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/page_pool/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/page_pool/types.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/pfcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/pfcp.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/phonet/pn_dev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/phonet/pn_dev.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/ping.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/ping.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/pkt_cls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/pkt_cls.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/pkt_sched.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/pkt_sched.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/proto_memory.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/proto_memory.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/psample.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/psample.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/psp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/psp.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/psp/functions.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/psp/functions.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/psp/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/psp/types.h</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/raw.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/raw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/red.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/red.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/regulatory.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/regulatory.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/request_sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/request_sock.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/rose.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/rose.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/route.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/route.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/rps.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/rps.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/rstreason.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/rstreason.h</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/rtnetlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/rtnetlink.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sch_generic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sch_generic.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/scm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/scm.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sctp/auth.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sctp/auth.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sctp/checksum.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sctp/checksum.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sctp/constants.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sctp/constants.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sctp/sctp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sctp/sctp.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sctp/sm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sctp/sm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sctp/stream_sched.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sctp/stream_sched.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sctp/structs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sctp/structs.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/secure_seq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/secure_seq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/seg6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/seg6.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/seg6_hmac.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/seg6_hmac.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/seg6_local.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/seg6_local.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/selftests.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/selftests.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/smc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/smc.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/snmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/snmp.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sock.h</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/sock_reuseport.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/sock_reuseport.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/strparser.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/strparser.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_connmark.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_connmark.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_csum.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_csum.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_ct.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_ct.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_ctinfo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_ctinfo.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_gate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_gate.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_mpls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_mpls.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_nat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_nat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_pedit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_pedit.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_police.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_police.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_sample.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_sample.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_skbedit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_skbedit.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_skbmod.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_skbmod.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_tunnel_key.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_tunnel_key.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tc_act/tc_vlan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tc_act/tc_vlan.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tcp.h</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tcp_ao.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tcp_ao.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/net/tcp_ecn.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tcp_ecn.h</a></td><td class='right'>642</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tcx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tcx.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/timewait_sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/timewait_sock.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/tls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/tls.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/udp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/udp.h</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/udp_tunnel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/udp_tunnel.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/vsock_addr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/vsock_addr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/vxlan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/vxlan.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/x25.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/x25.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/xdp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/xdp.h</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/xdp_sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/xdp_sock.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/xdp_sock_drv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/xdp_sock_drv.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/xfrm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/xfrm.h</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/net/xsk_buff_pool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/net/xsk_buff_pool.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/pcmcia/ss.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/pcmcia/ss.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/ras/ras_event.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/ras/ras_event.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_cache.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_cm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_cm.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_hdrs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_hdrs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_mad.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_mad.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_marshall.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_marshall.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_pack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_pack.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_sa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_sa.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_ucaps.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_ucaps.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_umem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_umem.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_umem_odp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_umem_odp.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/ib_verbs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/ib_verbs.h</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/iba.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/iba.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/rdma_cm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/rdma_cm.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/rdma_counter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/rdma_counter.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/rdma_netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/rdma_netlink.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/rdmavt_qp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/rdmavt_qp.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/restrack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/restrack.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/uverbs_ioctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/uverbs_ioctl.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/uverbs_std_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/uverbs_std_types.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rdma/uverbs_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rdma/uverbs_types.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/rv/da_monitor.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rv/da_monitor.h</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/rv/ltl_monitor.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/rv/ltl_monitor.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/fcoe_sysfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/fcoe_sysfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/iser.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/iser.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/libfc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/libfc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/libfcoe.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/libfcoe.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/libiscsi_tcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/libiscsi_tcp.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/libsas.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/libsas.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/sas_ata.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/sas_ata.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_bsg_iscsi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_bsg_iscsi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_cmnd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_cmnd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_dbg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_dbg.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_device.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_device.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_devinfo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_devinfo.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_driver.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_host.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_host.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_proto.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_proto.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_transport.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_transport.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_transport_fc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_transport_fc.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_transport_iscsi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_transport_iscsi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_transport_sas.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_transport_sas.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsi_transport_srp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsi_transport_srp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/scsi/scsicam.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/scsi/scsicam.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/soc/arc/arc_aux.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/arc/arc_aux.h</a> (renamed from include/soc/arc/aux.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/arc/mcip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/arc/mcip.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/arc/timers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/arc/timers.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/at91/sama7-sfrbu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/at91/sama7-sfrbu.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/bcm2835/raspberrypi-firmware.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/bcm2835/raspberrypi-firmware.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/fsl/caam-blob.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/fsl/caam-blob.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/soc/fsl/dcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/fsl/dcp.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/fsl/qe/qe.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/fsl/qe/qe.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/fsl/qe/qmc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/fsl/qe/qmc.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/fsl/qman.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/fsl/qman.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/microchip/mpfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/microchip/mpfs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/mscc/ocelot.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/mscc/ocelot.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/mscc/ocelot_vcap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/mscc/ocelot_vcap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/soc/nuvoton/clock-npcm8xx.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/nuvoton/clock-npcm8xx.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/qcom/cmd-db.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/qcom/cmd-db.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/qcom/ice.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/qcom/ice.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/qcom/qcom-spmi-pmic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/qcom/qcom-spmi-pmic.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/qcom/tcs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/qcom/tcs.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/rockchip/rk3588_grf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/rockchip/rk3588_grf.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/rockchip/rockchip_grf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/rockchip/rockchip_grf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/rockchip/rockchip_sip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/rockchip/rockchip_sip.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/soc/spacemit/k1-syscon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/spacemit/k1-syscon.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/tegra/bpmp-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/tegra/bpmp-abi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/soc/tegra/mc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/soc/tegra/mc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/ac97/codec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/ac97/codec.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/aci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/aci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/sound/adau1373.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/adau1373.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/ak4531_codec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/ak4531_codec.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/asoundef.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/asoundef.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/compress_driver.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/compress_driver.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/control.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/control.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/core.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/cs-amp-lib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs-amp-lib.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/cs35l41.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs35l41.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/cs35l56.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs35l56.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/cs42l42.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs42l42.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/sound/cs42l52.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs42l52.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/sound/cs42l56.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs42l56.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/sound/cs42l73.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs42l73.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/cs48l32.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs48l32.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/cs48l32_registers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/cs48l32_registers.h</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/dmaengine_pcm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/dmaengine_pcm.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/emu10k1.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/emu10k1.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/emux_synth.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/emux_synth.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/es1688.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/es1688.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/gus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/gus.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/hda-mlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/hda-mlink.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/hda-sdw-bpt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/hda-sdw-bpt.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/hda_codec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/hda_codec.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/hda_register.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/hda_register.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/hdaudio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/hdaudio.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/hdaudio_ext.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/hdaudio_ext.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/hdmi-codec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/hdmi-codec.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/intel-nhlt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/intel-nhlt.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/jack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/jack.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/memalloc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/memalloc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/pcm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/pcm.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/pcm_drm_eld.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/pcm_drm_eld.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/q6usboffload.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/q6usboffload.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/rawmidi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/rawmidi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/rt1318.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/rt1318.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/sdca.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sdca.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/sdca_asoc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sdca_asoc.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/sdca_fdl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sdca_fdl.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/sdca_function.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sdca_function.h</a></td><td class='right'>1475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/sdca_hid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sdca_hid.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/sdca_interrupts.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sdca_interrupts.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/sdca_regmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sdca_regmap.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/sdca_ump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sdca_ump.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/seq_kernel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/seq_kernel.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/simple_card_utils.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/simple_card_utils.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/snd_wavefront.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/snd_wavefront.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-acpi-intel-match.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-acpi-intel-match.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/soc-acpi-intel-ssp-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-acpi-intel-ssp-common.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-acpi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-acpi.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-card.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-card.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-component.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-component.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-dai.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-dai.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-dapm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-dapm.h</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-dpcm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-dpcm.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-jack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-jack.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc-topology.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-topology.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/soc-usb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc-usb.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc.h</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/soc_sdw_utils.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soc_sdw_utils.h</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/channel_map.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/channel_map.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/control.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/control.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/dai-amd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/dai-amd.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/dai-intel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/dai-intel.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/dai.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/dai.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/debug.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/ext_manifest.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/ext_manifest.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/ext_manifest4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/ext_manifest4.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/header.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/header.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/info.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/info.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/ipc4/header.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/ipc4/header.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/pm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/pm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/stream.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/stream.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/topology.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/topology.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/trace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/trace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/sof/xtensa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/sof/xtensa.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/soundfont.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/soundfont.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/tas2563-tlv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tas2563-tlv.h</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/tas2770-tlv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tas2770-tlv.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/tas2781-comlib-i2c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tas2781-comlib-i2c.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/tas2781-dsp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tas2781-dsp.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/tas2781-tlv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tas2781-tlv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/tas2781.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tas2781.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/tas2x20-tlv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tas2x20-tlv.h</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/sound/tas5825-tlv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tas5825-tlv.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/tlv320aic32x4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tlv320aic32x4.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/sound/tlv320dac33-plat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tlv320dac33-plat.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/sound/tpa6130a2-plat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/tpa6130a2-plat.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/ump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/ump.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/ump_convert.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/ump_convert.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/ump_msg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/ump_msg.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/vx_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/vx_core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/sound/wm8904.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/sound/wm8904.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/target/iscsi/iscsi_target_core.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/target/iscsi/iscsi_target_core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/target/target_core_backend.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/target/target_core_backend.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/target/target_core_base.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/target/target_core_base.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/bpf_probe.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/bpf_probe.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/define_trace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/define_trace.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/afs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/afs.h</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/alarmtimer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/alarmtimer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/amdxdna.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/amdxdna.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/asoc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/asoc.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/avc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/avc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/block.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/block.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/bpf_test_run.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/bpf_test_run.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/bridge.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/bridge.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/btrfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/btrfs.h</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/cachefiles.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/cachefiles.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/capability.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/capability.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/cgroup.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/cgroup.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/clk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/clk.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/cma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/cma.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/compaction.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/compaction.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/damon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/damon.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/devfreq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/devfreq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/devlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/devlink.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/dlm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/dlm.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/dma.h</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/dma_fence.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/dma_fence.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/erofs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/erofs.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/exceptions.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/exceptions.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/ext4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/ext4.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/f2fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/f2fs.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/fib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/fib.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/fib6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/fib6.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/filelock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/filelock.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/filemap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/filemap.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/firewire.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/firewire.h</a></td><td class='right'>912</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/firewire_ohci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/firewire_ohci.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/fs_dax.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/fs_dax.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/fscache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/fscache.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/habanalabs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/habanalabs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/huge_memory.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/huge_memory.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/hugetlbfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/hugetlbfs.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/trace/events/hw_pressure.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/hw_pressure.h</a> (renamed from include/trace/events/thermal_pressure.h)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/hwmon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/hwmon.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/icmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/icmp.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/initcall.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/initcall.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/intel_ifs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/intel_ifs.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/intel_ish.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/intel_ish.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/io_uring.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/io_uring.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/iocost.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/iocost.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/iommu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/iommu.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/ipi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/ipi.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/irq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/irq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/irq_matrix.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/irq_matrix.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/iscsi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/iscsi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/kmem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/kmem.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/kvm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/kvm.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/lock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/lock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/mce.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/mce.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/mdio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/mdio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/memcg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/memcg.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/memory-failure.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/memory-failure.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/migrate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/migrate.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/mmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/mmap.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/mmap_lock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/mmap_lock.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/mmc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/mmc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/mmflags.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/mmflags.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/module.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/module.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/mptcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/mptcp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/napi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/napi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/nbd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/nbd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/neigh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/neigh.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/net.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/net.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/net_probe_common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/net_probe_common.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/netfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/netfs.h</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/netlink.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/nilfs2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/nilfs2.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/oom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/oom.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/osnoise.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/osnoise.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/page_pool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/page_pool.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/page_ref.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/page_ref.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/power.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/power.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/preemptirq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/preemptirq.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/pwc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/pwc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/pwm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/pwm.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/qdisc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/qdisc.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/qla.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/qla.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/qrtr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/qrtr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/rcu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/rcu.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/readahead.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/readahead.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/regulator.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/regulator.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/rpcgss.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/rpcgss.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/rpcrdma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/rpcrdma.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/rpm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/rpm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/rseq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/rseq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/rust_sample.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/rust_sample.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/trace/events/rv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/rv.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/rxrpc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/rxrpc.h</a></td><td class='right'>1074</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/sched.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/sched.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/sched_ext.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/sched_ext.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/scmi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/scmi.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/scsi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/scsi.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/skb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/skb.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/sock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/sock.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/sof.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/sof.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/sof_intel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/sof_intel.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/spi-mem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/spi-mem.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/sunrpc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/sunrpc.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/swiotlb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/swiotlb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/syscalls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/syscalls.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/target.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/target.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/task.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/task.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/tcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/tcp.h</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/tegra_apb_dma.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/tegra_apb_dma.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/thp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/thp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/timer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/timer.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/timer_migration.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/timer_migration.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/timestamp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/timestamp.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/trace/events/tsm_mr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/tsm_mr.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/udp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/udp.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/trace/events/ufs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/ufs.h</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/vmscan.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/vmscan.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/workqueue.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/workqueue.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/writeback.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/writeback.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/events/xdp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/events/xdp.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/misc/fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/misc/fs.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/misc/nfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/misc/nfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/perf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/perf.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/stages/stage2_data_offsets.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/stages/stage2_data_offsets.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/stages/stage3_trace_output.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/stages/stage3_trace_output.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/stages/stage5_get_offsets.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/stages/stage5_get_offsets.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/stages/stage6_event_callback.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/stages/stage6_event_callback.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/stages/stage7_class_define.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/stages/stage7_class_define.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/syscall.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/syscall.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/trace/trace_events.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/trace/trace_events.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/bitsperlong.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/bitsperlong.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/fcntl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/fcntl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/ioctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/ioctl.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/mman-common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/mman-common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/mman.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/mman.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/param.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/param.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/posix_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/posix_types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/siginfo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/siginfo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/socket.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/socket.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/asm-generic/unistd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/asm-generic/unistd.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/cxl/features.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/cxl/features.h</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/amdgpu_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/amdgpu_drm.h</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/amdxdna_accel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/amdxdna_accel.h</a></td><td class='right'>698</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/asahi_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/asahi_drm.h</a></td><td class='right'>1194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/drm.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/drm_fourcc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/drm_fourcc.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/drm_mode.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/drm_mode.h</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/ethosu_accel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/ethosu_accel.h</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/i915_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/i915_drm.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/ivpu_accel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/ivpu_accel.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/msm_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/msm_drm.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/nouveau_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/nouveau_drm.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/nova_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/nova_drm.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/panfrost_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/panfrost_drm.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/panthor_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/panthor_drm.h</a></td><td class='right'>1095</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/qaic_accel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/qaic_accel.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/rocket_accel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/rocket_accel.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/v3d_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/v3d_drm.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/virtgpu_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/virtgpu_drm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/vmwgfx_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/vmwgfx_drm.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/drm/xe_drm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/drm/xe_drm.h</a></td><td class='right'>987</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/fwctl/cxl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/fwctl/cxl.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/fwctl/fwctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/fwctl/fwctl.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/fwctl/mlx5.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/fwctl/mlx5.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/fwctl/pds.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/fwctl/pds.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/acrn.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/acrn.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/android/binder.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/android/binder.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/android/binder_netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/android/binder_netlink.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/aspeed-video.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/aspeed-video.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/audit.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/audit.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/auto_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/auto_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/auxvec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/auxvec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/batadv_packet.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/batadv_packet.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/batman_adv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/batman_adv.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/bits.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/bits.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/blk-crypto.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/blk-crypto.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/blkdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/blkdev.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/blktrace_api.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/blktrace_api.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/blkzoned.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/blkzoned.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/bpf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/bpf.h</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/btf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/btf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/btrfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/btrfs.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/btrfs_tree.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/btrfs_tree.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/can.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/can.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/can/isotp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/can/isotp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/can/netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/can/netlink.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/capability.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/capability.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/cec-funcs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/cec-funcs.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/cec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/cec.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/cn_proc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/cn_proc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/const.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/const.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/coredump.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/coredump.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/counter.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/counter.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/counter/microchip-tcb-capture.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/counter/microchip-tcb-capture.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/cryptouser.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/cryptouser.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/cxl_mem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/cxl_mem.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/devlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/devlink.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/dlm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/dlm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/dm-ioctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/dm-ioctl.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/dma-heap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/dma-heap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/dpll.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/dpll.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/dvb/frontend.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/dvb/frontend.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/elf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/elf.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/energy_model.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/energy_model.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/errqueue.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/errqueue.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ethtool.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ethtool.h</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ethtool_netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ethtool_netlink.h</a></td><td class='right'>824</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ethtool_netlink_generated.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ethtool_netlink_generated.h</a></td><td class='right'>961</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/exfat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/exfat.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ext4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ext4.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/f2fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/f2fs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/falloc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/falloc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fanotify.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fanotify.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fb.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fcntl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fcntl.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fib_rules.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fib_rules.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fiemap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fiemap.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/firewire-cdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/firewire-cdev.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fou.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fou.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fs.h</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fscrypt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fscrypt.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/fuse.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/fuse.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/futex.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/futex.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/gpib.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/gpib.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/gpib_ioctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/gpib_ioctl.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/gtp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/gtp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/handshake.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/handshake.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/hidraw.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/hidraw.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/i2c.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/i2c.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/i8k.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/i8k.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/icmpv6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/icmpv6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_addr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_addr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_addrlabel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_addrlabel.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_alg.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_alg.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_arcnet.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_arcnet.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_bonding.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_bonding.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_bridge.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_bridge.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_cablemodem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_cablemodem.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_ether.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_ether.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_fc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_fc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_hippi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_hippi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_link.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_link.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_packet.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_packet.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_plip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_plip.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_slip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_slip.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_team.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_team.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_tun.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_tun.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_tunnel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_tunnel.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_x25.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_x25.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/if_xdp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/if_xdp.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/iio/buffer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/iio/buffer.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/iio/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/iio/types.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/in.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/in.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/in6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/in6.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/inet_diag.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/inet_diag.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/inotify.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/inotify.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/input-event-codes.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/input-event-codes.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/input.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/input.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/io_uring.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/io_uring.h</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/io_uring/mock_file.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/io_uring/mock_file.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/io_uring/query.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/io_uring/query.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ioam6_iptunnel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ioam6_iptunnel.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/iommufd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/iommufd.h</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ip.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ip.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ip6_tunnel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ip6_tunnel.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ipsec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ipsec.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ipv6.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ipv6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/isst_if.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/isst_if.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ivtv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ivtv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/kernel-page-flags.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/kernel-page-flags.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/kexec.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/kexec.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/kfd_ioctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/kfd_ioctl.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/kfd_sysfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/kfd_sysfs.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/kvm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/kvm.h</a></td><td class='right'>783</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/landlock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/landlock.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/libc-compat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/libc-compat.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/liveupdate.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/liveupdate.h</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/lockd_netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/lockd_netlink.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/lsm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/lsm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/magic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/magic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/map_benchmark.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/map_benchmark.h</a> (renamed from include/linux/map_benchmark.h)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/mctp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/mctp.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/mdio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/mdio.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/media-bus-format.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/media-bus-format.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/media/amlogic/c3-isp-config.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/media/amlogic/c3-isp-config.h</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/media/arm/mali-c55-config.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/media/arm/mali-c55-config.h</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/media/raspberrypi/pisp_be_config.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/media/raspberrypi/pisp_be_config.h</a></td><td class='right'>969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/media/raspberrypi/pisp_common.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/media/raspberrypi/pisp_common.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/media/raspberrypi/pisp_fe_config.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/media/raspberrypi/pisp_fe_config.h</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/media/raspberrypi/pisp_fe_statistics.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/media/raspberrypi/pisp_fe_statistics.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/media/v4l2-isp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/media/v4l2-isp.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/mempolicy.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/mempolicy.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/mman.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/mman.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/mount.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/mount.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/mptcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/mptcp.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/mptcp_pm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/mptcp_pm.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/mshv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/mshv.h</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nbd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nbd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/neighbour.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/neighbour.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/net_dropmon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/net_dropmon.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/net_shaper.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/net_shaper.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/net_tstamp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/net_tstamp.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/netconf.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/netconf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/netdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/netdev.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/netfilter/nf_tables.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/netfilter/nf_tables.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/netfilter/nfnetlink_conntrack.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/netfilter/nfnetlink_conntrack.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/netfilter/nfnetlink_hook.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/netfilter/nfnetlink_hook.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/netfilter_ipv6/ip6t_srh.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/netfilter_ipv6/ip6t_srh.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/netlink_diag.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/netlink_diag.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nexthop.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nexthop.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nfc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nfc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nfs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nfs4.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nfs4.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nfsd_netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nfsd_netlink.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nilfs2_ondisk.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nilfs2_ondisk.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nl80211-vnd-intel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nl80211-vnd-intel.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nl80211.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nl80211.h</a></td><td class='right'>729</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/nsfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/nsfs.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ntsync.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ntsync.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/openvswitch.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/openvswitch.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ovpn.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ovpn.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/papr_pdsm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/papr_pdsm.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pci_regs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pci_regs.h</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pcitest.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pcitest.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/perf_event.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/perf_event.h</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pfrut.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pfrut.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pidfd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pidfd.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pkt_cls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pkt_cls.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pkt_sched.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pkt_sched.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pps_gen.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pps_gen.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pr.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/prctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/prctl.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/psample.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/psample.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/psci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/psci.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/psp-sev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/psp-sev.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/psp-sfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/psp-sfs.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/psp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/psp.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ptp_clock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ptp_clock.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ptrace.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ptrace.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/pwm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/pwm.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/raid/md_p.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/raid/md_p.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/raid/md_u.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/raid/md_u.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/random.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/random.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/reiserfs_fs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/reiserfs_fs.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/reiserfs_xattr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/reiserfs_xattr.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/rkisp1-config.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/rkisp1-config.h</a></td><td class='right'>673</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/rseq.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/rseq.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/rtnetlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/rtnetlink.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/rxrpc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/rxrpc.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/sched.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/sched.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/sched/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/sched/types.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/securebits.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/securebits.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/sed-opal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/sed-opal.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/serio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/serio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/sev-guest.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/sev-guest.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/smc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/smc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/snmp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/snmp.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/spi/spi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/spi/spi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/stat.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/stat.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/stddef.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/stddef.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/sysctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/sysctl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/taskstats.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/taskstats.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/tcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/tcp.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/tcp_metrics.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/tcp_metrics.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/tee.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/tee.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/thermal.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/thermal.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/time.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/time.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/tiocl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/tiocl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/tls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/tls.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/trace_mmap.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/trace_mmap.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/ublk_cmd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/ublk_cmd.h</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/udp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/udp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/uio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/uio.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/um_timetravel.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/um_timetravel.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/usb/cdc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/usb/cdc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/usb/ch9.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/usb/ch9.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/usb/functionfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/usb/functionfs.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/usb/g_hid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/usb/g_hid.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/usb/gadgetfs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/usb/gadgetfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/usb/video.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/usb/video.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/user_events.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/user_events.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/uvcvideo.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/uvcvideo.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/v4l2-controls.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/v4l2-controls.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/v4l2-dv-timings.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/v4l2-dv-timings.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/v4l2-mediabus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/v4l2-mediabus.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/v4l2-subdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/v4l2-subdev.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vbox_vmmdev_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vbox_vmmdev_types.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vdpa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vdpa.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vduse.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vduse.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vesa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vesa.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vfio.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vfio.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vhost.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vhost.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vhost_types.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vhost_types.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/videodev2.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/videodev2.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_balloon.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_balloon.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_bt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_bt.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_crypto.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_crypto.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_gpu.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_gpu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_ids.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_mem.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_mem.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_net.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_net.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_pci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_pci.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_rtc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_rtc.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_snd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_snd.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/virtio_spi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/virtio_spi.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vm_sockets.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vm_sockets.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vmclock-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vmclock-abi.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vmcore.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vmcore.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/vt.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/vt.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/wireguard.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/wireguard.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/xattr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/xattr.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/xfrm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/xfrm.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/linux/zorro_ids.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/linux/zorro_ids.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/misc/amd-apml.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/misc/amd-apml.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/uapi/misc/cxl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/misc/cxl.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/misc/fastrpc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/misc/fastrpc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/misc/mrvl_cn10k_dpi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/misc/mrvl_cn10k_dpi.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/misc/pvpanic.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/misc/pvpanic.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/misc/uacce/hisi_qm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/misc/uacce/hisi_qm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/mtd/ubi-user.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/mtd/ubi-user.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/bnxt_re-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/bnxt_re-abi.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/efa-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/efa-abi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/hns-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/hns-abi.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/ib_user_ioctl_cmds.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/ib_user_ioctl_cmds.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/ib_user_ioctl_verbs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/ib_user_ioctl_verbs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/ib_user_sa.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/ib_user_sa.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/ib_user_verbs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/ib_user_verbs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/ionic-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/ionic-abi.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/irdma-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/irdma-abi.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/mana-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/mana-abi.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/mlx5-abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/mlx5-abi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/mlx5_user_ioctl_cmds.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/mlx5_user_ioctl_cmds.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/mlx5_user_ioctl_verbs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/mlx5_user_ioctl_verbs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/rdma_netlink.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/rdma_netlink.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/rdma/rdma_user_cm.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/rdma/rdma_user_cm.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/uapi/scsi/cxlflash_ioctl.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/scsi/cxlflash_ioctl.h</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/scsi/fc/fc_els.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/scsi/fc/fc_els.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/scsi/scsi_bsg_mpi3mr.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/scsi/scsi_bsg_mpi3mr.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/scsi/scsi_bsg_ufs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/scsi/scsi_bsg_ufs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/asequencer.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/asequencer.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/asoc.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/asoc.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/asound.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/asound.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/compress_offload.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/compress_offload.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/compress_params.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/compress_params.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/fcp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/fcp.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/intel/avs/tokens.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/intel/avs/tokens.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/skl-tplg-interface.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/skl-tplg-interface.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/snd_ar_tokens.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/snd_ar_tokens.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/sof/abi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/sof/abi.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/sof/fw.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/sof/fw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/sof/header.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/sof/header.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/sof/tokens.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/sof/tokens.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/sound/tlv.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/sound/tlv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/uapi/xen/privcmd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/uapi/xen/privcmd.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/ufs/ufs.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/ufs/ufs.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/ufs/ufs_quirks.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/ufs/ufs_quirks.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/ufs/ufshcd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/ufs/ufshcd.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/ufs/ufshci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/ufs/ufshci.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/ufs/unipro.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/ufs/unipro.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/vdso/align.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/align.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/vdso/auxclock.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/auxclock.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/vdso/cache.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/cache.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/vdso/datapage.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/datapage.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/vdso/getrandom.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/getrandom.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/vdso/gettime.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/gettime.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/vdso/helpers.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/helpers.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/vdso/jiffies.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/jiffies.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/vdso/math64.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/math64.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/vdso/page.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/page.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/vdso/unaligned.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/vdso/unaligned.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/cmdline.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/cmdline.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/include/video/da8xx-fb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/da8xx-fb.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/edid.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/edid.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/imx-ipu-image-convert.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/imx-ipu-image-convert.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/imx-ipu-v3.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/imx-ipu-v3.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/mach64.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/mach64.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/mmp_disp.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/mmp_disp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/omapfb_dss.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/omapfb_dss.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/include/video/pixel_format.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/pixel_format.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/platform_lcd.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/platform_lcd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/sisfb.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/sisfb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/video/vga.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/video/vga.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/acpi.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/acpi.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/events.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/events.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/grant_table.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/grant_table.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/interface/elfnote.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/interface/elfnote.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/interface/physdev.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/interface/physdev.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/interface/xen-mca.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/interface/xen-mca.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/mem-reservation.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/mem-reservation.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/pci.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/pci.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/xen-ops.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/xen-ops.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/xen.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/xen.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/include/xen/xenbus.h?id2=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/xen/xenbus.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>2950 files changed, 188008 insertions, 52062 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/include/Kbuild b/include/Kbuild<br/>new file mode 100644<br/>index 000000000000..5e76a599e2dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/Kbuild?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/Kbuild</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+obj-$(CONFIG_DRM_HEADER_TEST)	+= drm/</div><div class='head'>diff --git a/include/acpi/acbuffer.h b/include/acpi/acbuffer.h<br/>index 252b235dce5a..cbc9aeabcd99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acbuffer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acbuffer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acbuffer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acbuffer.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acbuffer.h - Support for buffers returned by ACPI predefined names</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h<br/>index d768d9c568cf..521d4bfa6ef0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acconfig.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acconfig.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acconfig.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acconfig.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acconfig.h - Global configuration constants</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -67,7 +67,6 @@</div><div class='ctx'>  *      General Purpose Events (GPEs)</div><div class='ctx'>  *      Global Lock</div><div class='ctx'>  *      ACPI PM timer</div><div class='del'>- *      FACS table (Waking vectors and Global Lock)</div><div class='ctx'>  */</div><div class='ctx'> #ifndef ACPI_REDUCED_HARDWARE</div><div class='ctx'> #define ACPI_REDUCED_HARDWARE           FALSE</div><div class='head'>diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h<br/>index c5ecd0a0170c..a2db36d18419 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acexcep.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acexcep.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acexcep.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acexcep.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acexcep.h - Exception codes returned by the ACPI subsystem</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -173,8 +173,10 @@ struct acpi_exception_info {</div><div class='ctx'> #define AE_AML_TARGET_TYPE              EXCEP_AML (0x0023)</div><div class='ctx'> #define AE_AML_PROTOCOL                 EXCEP_AML (0x0024)</div><div class='ctx'> #define AE_AML_BUFFER_LENGTH            EXCEP_AML (0x0025)</div><div class='add'>+#define AE_AML_TOO_FEW_ARGUMENTS        EXCEP_AML (0x0026)</div><div class='add'>+#define AE_AML_TOO_MANY_ARGUMENTS       EXCEP_AML (0x0027)</div><div class='ctx'> </div><div class='del'>-#define AE_CODE_AML_MAX                 0x0025</div><div class='add'>+#define AE_CODE_AML_MAX                 0x0027</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Internal exceptions used for control</div><div class='hunk'>@@ -353,7 +355,11 @@ static const struct acpi_exception_info acpi_gbl_exception_names_aml[] = {</div><div class='ctx'> 		  "A target operand of an incorrect type was encountered"),</div><div class='ctx'> 	EXCEP_TXT("AE_AML_PROTOCOL", "Violation of a fixed ACPI protocol"),</div><div class='ctx'> 	EXCEP_TXT("AE_AML_BUFFER_LENGTH",</div><div class='del'>-		  "The length of the buffer is invalid/incorrect")</div><div class='add'>+		  "The length of the buffer is invalid/incorrect"),</div><div class='add'>+	EXCEP_TXT("AE_AML_TOO_FEW_ARGUMENTS",</div><div class='add'>+		  "There are fewer than expected method arguments"),</div><div class='add'>+	EXCEP_TXT("AE_AML_TOO_MANY_ARGUMENTS",</div><div class='add'>+		  "There are too many arguments for this method")</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct acpi_exception_info acpi_gbl_exception_names_ctrl[] = {</div><div class='head'>diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h<br/>index 76aa6aa346ba..cb6a4dcc4e8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acnames.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acnames.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acnames.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acnames.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acnames.h - Global names and strings</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h<br/>index b1571dd96310..3584f33e352c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acoutput.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acoutput.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acoutput.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acoutput.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acoutput.h -- debug output</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -193,6 +193,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #ifndef ACPI_NO_ERROR_MESSAGES</div><div class='ctx'> #define AE_INFO                         _acpi_module_name, __LINE__</div><div class='add'>+#define ACPI_ONCE(_fn, _plist)                  { static char _done; if (!_done) { _done = 1; _fn _plist; } }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Error reporting. Callers module and line number are inserted by AE_INFO,</div><div class='hunk'>@@ -201,8 +202,10 @@</div><div class='ctx'>  */</div><div class='ctx'> #define ACPI_INFO(plist)                acpi_info plist</div><div class='ctx'> #define ACPI_WARNING(plist)             acpi_warning plist</div><div class='add'>+#define ACPI_WARNING_ONCE(plist)        ACPI_ONCE(acpi_warning, plist)</div><div class='ctx'> #define ACPI_EXCEPTION(plist)           acpi_exception plist</div><div class='ctx'> #define ACPI_ERROR(plist)               acpi_error plist</div><div class='add'>+#define ACPI_ERROR_ONCE(plist)          ACPI_ONCE(acpi_error, plist)</div><div class='ctx'> #define ACPI_BIOS_WARNING(plist)        acpi_bios_warning plist</div><div class='ctx'> #define ACPI_BIOS_EXCEPTION(plist)      acpi_bios_exception plist</div><div class='ctx'> #define ACPI_BIOS_ERROR(plist)          acpi_bios_error plist</div><div class='hunk'>@@ -214,8 +217,10 @@</div><div class='ctx'> </div><div class='ctx'> #define ACPI_INFO(plist)</div><div class='ctx'> #define ACPI_WARNING(plist)</div><div class='add'>+#define ACPI_WARNING_ONCE(plist)</div><div class='ctx'> #define ACPI_EXCEPTION(plist)</div><div class='ctx'> #define ACPI_ERROR(plist)</div><div class='add'>+#define ACPI_ERROR_ONCE(plist)</div><div class='ctx'> #define ACPI_BIOS_WARNING(plist)</div><div class='ctx'> #define ACPI_BIOS_EXCEPTION(plist)</div><div class='ctx'> #define ACPI_BIOS_ERROR(plist)</div><div class='head'>diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h<br/>index 8b4a497c1300..92bf80937e5f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acpi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acpi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acpi.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acpi.h - Master public include file used to interface to ACPICA</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h<br/>index 5de954e2b18a..aad1a95e6863 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acpi_bus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpi_bus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acpi_bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acpi_bus.h</a></div><div class='hunk'>@@ -9,8 +9,13 @@</div><div class='ctx'> #ifndef __ACPI_BUS_H__</div><div class='ctx'> #define __ACPI_BUS_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct acpi_handle_list {</div><div class='ctx'> 	u32 count;</div><div class='hunk'>@@ -38,9 +43,6 @@ acpi_status</div><div class='ctx'> acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code,</div><div class='ctx'> 		  struct acpi_buffer *status_buf);</div><div class='ctx'> </div><div class='del'>-acpi_status</div><div class='del'>-acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);</div><div class='del'>-</div><div class='ctx'> bool acpi_has_method(acpi_handle handle, char *name);</div><div class='ctx'> acpi_status acpi_execute_simple_method(acpi_handle handle, char *method,</div><div class='ctx'> 				       u64 arg);</div><div class='hunk'>@@ -55,6 +57,9 @@ bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs);</div><div class='ctx'> union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid,</div><div class='ctx'> 			u64 rev, u64 func, union acpi_object *argv4);</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='add'>+bool</div><div class='add'>+acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);</div><div class='add'>+</div><div class='ctx'> static inline union acpi_object *</div><div class='ctx'> acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,</div><div class='ctx'> 			u64 func, union acpi_object *argv4,</div><div class='hunk'>@@ -124,11 +129,12 @@ static inline struct acpi_hotplug_profile *to_acpi_hotplug_profile(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct acpi_scan_handler {</div><div class='del'>-	const struct acpi_device_id *ids;</div><div class='ctx'> 	struct list_head list_node;</div><div class='add'>+	const struct acpi_device_id *ids;</div><div class='ctx'> 	bool (*match)(const char *idstr, const struct acpi_device_id **matchid);</div><div class='ctx'> 	int (*attach)(struct acpi_device *dev, const struct acpi_device_id *id);</div><div class='ctx'> 	void (*detach)(struct acpi_device *dev);</div><div class='add'>+	void (*post_eject)(struct acpi_device *dev);</div><div class='ctx'> 	void (*bind)(struct device *phys_dev);</div><div class='ctx'> 	void (*unbind)(struct device *phys_dev);</div><div class='ctx'> 	struct acpi_hotplug_profile hotplug;</div><div class='hunk'>@@ -139,11 +145,15 @@ struct acpi_scan_handler {</div><div class='ctx'>  * --------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+typedef int (*acpi_hp_notify) (struct acpi_device *, u32);</div><div class='add'>+typedef void (*acpi_hp_uevent) (struct acpi_device *, u32);</div><div class='add'>+typedef void (*acpi_hp_fixup) (struct acpi_device *);</div><div class='add'>+</div><div class='ctx'> struct acpi_hotplug_context {</div><div class='ctx'> 	struct acpi_device *self;</div><div class='del'>-	int (*notify)(struct acpi_device *, u32);</div><div class='del'>-	void (*uevent)(struct acpi_device *, u32);</div><div class='del'>-	void (*fixup)(struct acpi_device *);</div><div class='add'>+	acpi_hp_notify notify;</div><div class='add'>+	acpi_hp_uevent uevent;</div><div class='add'>+	acpi_hp_fixup fixup;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -170,7 +180,6 @@ struct acpi_driver {</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> 	struct acpi_device_ops ops;</div><div class='ctx'> 	struct device_driver drv;</div><div class='del'>-	struct module *owner;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -219,10 +228,12 @@ struct acpi_device_dir {</div><div class='ctx'> </div><div class='ctx'> /* Plug and Play */</div><div class='ctx'> </div><div class='add'>+#define MAX_ACPI_DEVICE_NAME_LEN	40</div><div class='add'>+#define MAX_ACPI_CLASS_NAME_LEN		20</div><div class='ctx'> typedef char acpi_bus_id[8];</div><div class='ctx'> typedef u64 acpi_bus_address;</div><div class='del'>-typedef char acpi_device_name[40];</div><div class='del'>-typedef char acpi_device_class[20];</div><div class='add'>+typedef char acpi_device_name[MAX_ACPI_DEVICE_NAME_LEN];</div><div class='add'>+typedef char acpi_device_class[MAX_ACPI_CLASS_NAME_LEN];</div><div class='ctx'> </div><div class='ctx'> struct acpi_hardware_id {</div><div class='ctx'> 	struct list_head list;</div><div class='hunk'>@@ -246,7 +257,6 @@ struct acpi_device_pnp {</div><div class='ctx'> 	struct list_head ids;		/* _HID and _CIDs */</div><div class='ctx'> 	acpi_device_name device_name;	/* Driver-determined */</div><div class='ctx'> 	acpi_device_class device_class;	/*        "          */</div><div class='del'>-	union acpi_object *str_obj;	/* unicode string for _STR method */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define acpi_device_bid(d)	((d)-&gt;pnp.bus_id)</div><div class='hunk'>@@ -269,6 +279,7 @@ struct acpi_device_power_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_device_power_state {</div><div class='add'>+	struct list_head resources;	/* Power resources referenced */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8 valid:1;</div><div class='ctx'> 		u8 explicit_set:1;	/* _PSx present? */</div><div class='hunk'>@@ -276,7 +287,6 @@ struct acpi_device_power_state {</div><div class='ctx'> 	} flags;</div><div class='ctx'> 	int power;		/* % Power (compared to D0) */</div><div class='ctx'> 	int latency;		/* Dx-&gt;D0 time (microseconds) */</div><div class='del'>-	struct list_head resources;	/* Power resources referenced */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_device_power {</div><div class='hunk'>@@ -342,16 +352,16 @@ struct acpi_device_wakeup {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_device_physical_node {</div><div class='del'>-	unsigned int node_id;</div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	unsigned int node_id;</div><div class='ctx'> 	bool put_online:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_device_properties {</div><div class='add'>+	struct list_head list;</div><div class='ctx'> 	const guid_t *guid;</div><div class='ctx'> 	union acpi_object *properties;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> 	void **bufs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -488,12 +498,12 @@ struct acpi_device {</div><div class='ctx'> </div><div class='ctx'> /* Non-device subnode */</div><div class='ctx'> struct acpi_data_node {</div><div class='add'>+	struct list_head sibling;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	acpi_handle handle;</div><div class='ctx'> 	struct fwnode_handle fwnode;</div><div class='ctx'> 	struct fwnode_handle *parent;</div><div class='ctx'> 	struct acpi_device_data data;</div><div class='del'>-	struct list_head sibling;</div><div class='ctx'> 	struct kobject kobj;</div><div class='ctx'> 	struct completion kobj_done;</div><div class='ctx'> };</div><div class='hunk'>@@ -554,7 +564,7 @@ static inline void *acpi_driver_data(struct acpi_device *d)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define to_acpi_device(d)	container_of(d, struct acpi_device, dev)</div><div class='del'>-#define to_acpi_driver(d)	container_of(d, struct acpi_driver, drv)</div><div class='add'>+#define to_acpi_driver(d)	container_of_const(d, struct acpi_driver, drv)</div><div class='ctx'> </div><div class='ctx'> static inline struct acpi_device *acpi_dev_parent(struct acpi_device *adev)</div><div class='ctx'> {</div><div class='hunk'>@@ -578,8 +588,7 @@ static inline void acpi_set_hp_context(struct acpi_device *adev,</div><div class='ctx'> </div><div class='ctx'> void acpi_initialize_hp_context(struct acpi_device *adev,</div><div class='ctx'> 				struct acpi_hotplug_context *hp,</div><div class='del'>-				int (*notify)(struct acpi_device *, u32),</div><div class='del'>-				void (*uevent)(struct acpi_device *, u32));</div><div class='add'>+				acpi_hp_notify notify, acpi_hp_uevent uevent);</div><div class='ctx'> </div><div class='ctx'> /* acpi_device.dev.bus == &amp;acpi_bus_type */</div><div class='ctx'> extern const struct bus_type acpi_bus_type;</div><div class='hunk'>@@ -656,7 +665,12 @@ void acpi_scan_lock_release(void);</div><div class='ctx'> void acpi_lock_hp_context(void);</div><div class='ctx'> void acpi_unlock_hp_context(void);</div><div class='ctx'> int acpi_scan_add_handler(struct acpi_scan_handler *handler);</div><div class='del'>-int acpi_bus_register_driver(struct acpi_driver *driver);</div><div class='add'>+/*</div><div class='add'>+ * use a macro to avoid include chaining to get THIS_MODULE</div><div class='add'>+ */</div><div class='add'>+#define acpi_bus_register_driver(drv) \</div><div class='add'>+	__acpi_bus_register_driver(drv, THIS_MODULE)</div><div class='add'>+int __acpi_bus_register_driver(struct acpi_driver *driver, struct module *owner);</div><div class='ctx'> void acpi_bus_unregister_driver(struct acpi_driver *driver);</div><div class='ctx'> int acpi_bus_scan(acpi_handle handle);</div><div class='ctx'> void acpi_bus_trim(struct acpi_device *start);</div><div class='hunk'>@@ -724,8 +738,7 @@ struct iommu_ops;</div><div class='ctx'> bool acpi_dma_supported(const struct acpi_device *adev);</div><div class='ctx'> enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev);</div><div class='ctx'> int acpi_iommu_fwspec_init(struct device *dev, u32 id,</div><div class='del'>-			   struct fwnode_handle *fwnode,</div><div class='del'>-			   const struct iommu_ops *ops);</div><div class='add'>+			   struct fwnode_handle *fwnode);</div><div class='ctx'> int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map);</div><div class='ctx'> int acpi_dma_configure_id(struct device *dev, enum dev_dma_attr attr,</div><div class='ctx'> 			   const u32 *input_id);</div><div class='hunk'>@@ -911,17 +924,19 @@ static inline bool acpi_int_uid_match(struct acpi_device *adev, u64 uid2)</div><div class='ctx'>  * acpi_dev_hid_uid_match - Match device by supplied HID and UID</div><div class='ctx'>  * @adev: ACPI device to match.</div><div class='ctx'>  * @hid2: Hardware ID of the device.</div><div class='del'>- * @uid2: Unique ID of the device, pass 0 or NULL to not check _UID.</div><div class='add'>+ * @uid2: Unique ID of the device, pass NULL to not check _UID.</div><div class='ctx'>  *</div><div class='ctx'>  * Matches HID and UID in @adev with given @hid2 and @uid2. Absence of @uid2</div><div class='ctx'>  * will be treated as a match. If user wants to validate @uid2, it should be</div><div class='ctx'>  * done before calling this function.</div><div class='ctx'>  *</div><div class='del'>- * Returns: %true if matches or @uid2 is 0 or NULL, %false otherwise.</div><div class='add'>+ * Returns: %true if matches or @uid2 is NULL, %false otherwise.</div><div class='ctx'>  */</div><div class='ctx'> #define acpi_dev_hid_uid_match(adev, hid2, uid2)			\</div><div class='ctx'> 	(acpi_dev_hid_match(adev, hid2) &amp;&amp;				\</div><div class='del'>-		(!(uid2) || acpi_dev_uid_match(adev, uid2)))</div><div class='add'>+		/* Distinguish integer 0 from NULL @uid2 */		\</div><div class='add'>+		(_Generic(uid2,	ACPI_STR_TYPES(!(uid2)), default: 0) ||	\</div><div class='add'>+		acpi_dev_uid_match(adev, uid2)))</div><div class='ctx'> </div><div class='ctx'> void acpi_dev_clear_dependencies(struct acpi_device *supplier);</div><div class='ctx'> bool acpi_dev_ready_for_enumeration(const struct acpi_device *device);</div><div class='hunk'>@@ -976,11 +991,35 @@ static inline void acpi_put_acpi_dev(struct acpi_device *adev)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_dev_put(adev);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int acpi_wait_for_acpi_ipmi(void);</div><div class='add'>+</div><div class='add'>+int acpi_scan_add_dep(acpi_handle handle, struct acpi_handle_list *dep_devices);</div><div class='add'>+u32 arch_acpi_add_auto_dep(acpi_handle handle);</div><div class='ctx'> #else	/* CONFIG_ACPI */</div><div class='ctx'> </div><div class='ctx'> static inline int register_acpi_bus_type(void *bus) { return 0; }</div><div class='ctx'> static inline int unregister_acpi_bus_type(void *bus) { return 0; }</div><div class='ctx'> </div><div class='add'>+static inline int acpi_wait_for_acpi_ipmi(void) { return 0; }</div><div class='add'>+</div><div class='add'>+static inline const char *acpi_device_hid(struct acpi_device *device)</div><div class='add'>+{</div><div class='add'>+	return "";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define for_each_acpi_consumer_dev(supplier, consumer)			\</div><div class='add'>+	for (consumer = NULL; false &amp;&amp; (supplier);)</div><div class='add'>+</div><div class='add'>+#define for_each_acpi_dev_match(adev, hid, uid, hrv)			\</div><div class='add'>+	for (adev = NULL; false &amp;&amp; (hid) &amp;&amp; (uid) &amp;&amp; (hrv); )</div><div class='add'>+</div><div class='ctx'> #endif				/* CONFIG_ACPI */</div><div class='ctx'> </div><div class='ctx'> #endif /*__ACPI_BUS_H__*/</div><div class='head'>diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h<br/>index b5f594754a9e..99b960bd473c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acpi_numa.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpi_numa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acpi_numa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acpi_numa.h</a></div><div class='hunk'>@@ -17,11 +17,16 @@ extern int node_to_pxm(int);</div><div class='ctx'> extern int acpi_map_pxm_to_node(int);</div><div class='ctx'> extern unsigned char acpi_srat_revision;</div><div class='ctx'> extern void disable_srat(void);</div><div class='add'>+extern int fix_pxm_node_maps(int max_nid);</div><div class='ctx'> </div><div class='ctx'> extern void bad_srat(void);</div><div class='ctx'> extern int srat_disabled(void);</div><div class='ctx'> </div><div class='ctx'> #else				/* CONFIG_ACPI_NUMA */</div><div class='add'>+static inline int fix_pxm_node_maps(int max_nid)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> static inline void disable_srat(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h<br/>index 914c029f64c9..65c5737b6286 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acpiosxf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpiosxf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acpiosxf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acpiosxf.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *                    interfaces must be implemented by OSL to interface the</div><div class='ctx'>  *                    ACPI components to the host operating system.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h<br/>index 3d90716f9522..e65a2afe9250 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acpixf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acpixf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acpixf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acpixf.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acpixf.h - External interfaces to the ACPI subsystem</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Current ACPICA subsystem version in YYYYMMDD format */</div><div class='ctx'> </div><div class='del'>-#define ACPI_CA_VERSION                 0x20230628</div><div class='add'>+#define ACPI_CA_VERSION                 0x20250807</div><div class='ctx'> </div><div class='ctx'> #include &lt;acpi/acconfig.h&gt;</div><div class='ctx'> #include &lt;acpi/actypes.h&gt;</div><div class='hunk'>@@ -214,6 +214,12 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_osi_data, 0);</div><div class='ctx'> ACPI_INIT_GLOBAL(u8, acpi_gbl_reduced_hardware, FALSE);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * ACPI Global Lock is mainly used for systems with SMM, so no-SMM systems</div><div class='add'>+ * (such as loong_arch) may not have and not use Global Lock.</div><div class='add'>+ */</div><div class='add'>+ACPI_INIT_GLOBAL(u8, acpi_gbl_use_global_lock, TRUE);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Maximum timeout for While() loop iterations before forced method abort.</div><div class='ctx'>  * This mechanism is intended to prevent infinite loops during interpreter</div><div class='ctx'>  * execution within a host kernel.</div><div class='hunk'>@@ -660,6 +666,7 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status</div><div class='ctx'> 			     void *context))</div><div class='ctx'> ACPI_EXTERNAL_RETURN_STATUS(acpi_status</div><div class='ctx'> 			    acpi_execute_reg_methods(acpi_handle device,</div><div class='add'>+						     u32 nax_depth,</div><div class='ctx'> 						     acpi_adr_space_type</div><div class='ctx'> 						     space_id))</div><div class='ctx'> ACPI_EXTERNAL_RETURN_STATUS(acpi_status</div><div class='hunk'>@@ -762,6 +769,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status</div><div class='ctx'> 						     *event_status))</div><div class='ctx'> ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number))</div><div class='ctx'> ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_hw_disable_all_gpes(void))</div><div class='add'>+ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_hw_enable_all_wakeup_gpes(void))</div><div class='ctx'> ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void))</div><div class='ctx'> ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void))</div><div class='ctx'> ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))</div><div class='hunk'>@@ -877,10 +885,10 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status</div><div class='ctx'> 			    acpi_leave_sleep_state_prep(u8 sleep_state))</div><div class='ctx'> ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_leave_sleep_state(u8 sleep_state))</div><div class='ctx'> </div><div class='del'>-ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status</div><div class='del'>-				acpi_set_firmware_waking_vector</div><div class='del'>-				(acpi_physical_address physical_address,</div><div class='del'>-				 acpi_physical_address physical_address64))</div><div class='add'>+ACPI_EXTERNAL_RETURN_STATUS(acpi_status</div><div class='add'>+			    acpi_set_firmware_waking_vector</div><div class='add'>+			    (acpi_physical_address physical_address,</div><div class='add'>+			     acpi_physical_address physical_address64))</div><div class='ctx'> /*</div><div class='ctx'>  * ACPI Timer interfaces</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h<br/>index efef208b0324..842f932e2c2b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acrestyp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acrestyp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acrestyp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acrestyp.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acrestyp.h - Defines, types, and structures for resource descriptors</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h<br/>index 451f6276da49..8a67d4ea6e3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/actbl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actbl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/actbl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/actbl.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: actbl.h - Basic ACPI Table Definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -66,14 +66,14 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> struct acpi_table_header {</div><div class='del'>-	char signature[ACPI_NAMESEG_SIZE];	/* ASCII table signature */</div><div class='add'>+	char signature[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;	/* ASCII table signature */</div><div class='ctx'> 	u32 length;		/* Length of table in bytes, including this header */</div><div class='ctx'> 	u8 revision;		/* ACPI Specification minor version number */</div><div class='ctx'> 	u8 checksum;		/* To make sum of entire table == 0 */</div><div class='del'>-	char oem_id[ACPI_OEM_ID_SIZE];	/* ASCII OEM identification */</div><div class='del'>-	char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];	/* ASCII OEM table identification */</div><div class='add'>+	char oem_id[ACPI_OEM_ID_SIZE] ACPI_NONSTRING;	/* ASCII OEM identification */</div><div class='add'>+	char oem_table_id[ACPI_OEM_TABLE_ID_SIZE] ACPI_NONSTRING;	/* ASCII OEM table identification */</div><div class='ctx'> 	u32 oem_revision;	/* OEM revision number */</div><div class='del'>-	char asl_compiler_id[ACPI_NAMESEG_SIZE];	/* ASCII ASL compiler vendor ID */</div><div class='add'>+	char asl_compiler_id[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;	/* ASCII ASL compiler vendor ID */</div><div class='ctx'> 	u32 asl_compiler_revision;	/* ASL compiler version */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h<br/>index a33375e055ad..7f35eb0e8458 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/actbl1.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actbl1.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/actbl1.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/actbl1.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: actbl1.h - Additional ACPI table definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -155,6 +155,13 @@ struct acpi_aspt_acpi_mbox_regs {</div><div class='ctx'> 	u64 reserved2[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Larger subtable header (when Length can exceed 255) */</div><div class='add'>+</div><div class='add'>+struct acpi_subtbl_hdr_16 {</div><div class='add'>+	u16 type;</div><div class='add'>+	u16 length;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * ASF - Alert Standard Format table (Signature "ASF!")</div><div class='hunk'>@@ -403,6 +410,8 @@ struct acpi_cdat_dsmas {</div><div class='ctx'> /* Flags for subtable above */</div><div class='ctx'> </div><div class='ctx'> #define ACPI_CDAT_DSMAS_NON_VOLATILE        (1 &lt;&lt; 2)</div><div class='add'>+#define ACPI_CDAT_DSMAS_SHAREABLE           (1 &lt;&lt; 3)</div><div class='add'>+#define ACPI_CDAT_DSMAS_READ_ONLY           (1 &lt;&lt; 6)</div><div class='ctx'> </div><div class='ctx'> /* Subtable 1: Device scoped Latency and Bandwidth Information Structure (DSLBIS) */</div><div class='ctx'> </div><div class='hunk'>@@ -551,11 +560,12 @@ struct acpi_cedt_cfmws_target_element {</div><div class='ctx'> </div><div class='ctx'> /* Values for Restrictions field above */</div><div class='ctx'> </div><div class='del'>-#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2      (1)</div><div class='del'>-#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3      (1&lt;&lt;1)</div><div class='add'>+#define ACPI_CEDT_CFMWS_RESTRICT_DEVMEM      (1)</div><div class='add'>+#define ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM (1&lt;&lt;1)</div><div class='ctx'> #define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE   (1&lt;&lt;2)</div><div class='ctx'> #define ACPI_CEDT_CFMWS_RESTRICT_PMEM       (1&lt;&lt;3)</div><div class='ctx'> #define ACPI_CEDT_CFMWS_RESTRICT_FIXED      (1&lt;&lt;4)</div><div class='add'>+#define ACPI_CEDT_CFMWS_RESTRICT_BI         (1&lt;&lt;5)</div><div class='ctx'> </div><div class='ctx'> /* 2: CXL XOR Interleave Math Structure */</div><div class='ctx'> </div><div class='hunk'>@@ -567,12 +577,14 @@ struct acpi_cedt_cxims {</div><div class='ctx'> 	u64 xormap_list[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct acpi_cedt_cxims_target_element {</div><div class='add'>+	u64 xormap;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* 3: CXL RCEC Downstream Port Association Structure */</div><div class='ctx'> </div><div class='ctx'> struct acpi_cedt_rdpas {</div><div class='ctx'> 	struct acpi_cedt_header header;</div><div class='del'>-	u8 reserved1;</div><div class='del'>-	u16 length;</div><div class='ctx'> 	u16 segment;</div><div class='ctx'> 	u16 bdf;</div><div class='ctx'> 	u8 protocol;</div><div class='hunk'>@@ -753,6 +765,7 @@ struct acpi_dbg2_device {</div><div class='ctx'> #define ACPI_DBG2_16550_WITH_GAS    0x0012</div><div class='ctx'> #define ACPI_DBG2_SDM845_7_372MHZ   0x0013</div><div class='ctx'> #define ACPI_DBG2_INTEL_LPSS        0x0014</div><div class='add'>+#define ACPI_DBG2_RISCV_SBI_CON     0x0015</div><div class='ctx'> </div><div class='ctx'> #define ACPI_DBG2_1394_STANDARD     0x0000</div><div class='ctx'> </div><div class='hunk'>@@ -814,7 +827,8 @@ enum acpi_dmar_type {</div><div class='ctx'> 	ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3,</div><div class='ctx'> 	ACPI_DMAR_TYPE_NAMESPACE = 4,</div><div class='ctx'> 	ACPI_DMAR_TYPE_SATC = 5,</div><div class='del'>-	ACPI_DMAR_TYPE_RESERVED = 6	/* 6 and greater are reserved */</div><div class='add'>+	ACPI_DMAR_TYPE_SIDP = 6,</div><div class='add'>+	ACPI_DMAR_TYPE_RESERVED = 7	/* 7 and greater are reserved */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* DMAR Device Scope structure */</div><div class='hunk'>@@ -822,7 +836,8 @@ enum acpi_dmar_type {</div><div class='ctx'> struct acpi_dmar_device_scope {</div><div class='ctx'> 	u8 entry_type;</div><div class='ctx'> 	u8 length;</div><div class='del'>-	u16 reserved;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 reserved;</div><div class='ctx'> 	u8 enumeration_id;</div><div class='ctx'> 	u8 bus;</div><div class='ctx'> };</div><div class='hunk'>@@ -918,6 +933,15 @@ struct acpi_dmar_satc {</div><div class='ctx'> 	u8 reserved;</div><div class='ctx'> 	u16 segment;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* 6: so_c Integrated Device Property Reporting Structure */</div><div class='add'>+</div><div class='add'>+struct acpi_dmar_sidp {</div><div class='add'>+	struct acpi_dmar_header header;</div><div class='add'>+	u16 reserved;</div><div class='add'>+	u16 segment;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * DRTM - Dynamic Root of Trust for Measurement table</div><div class='hunk'>@@ -1019,17 +1043,18 @@ struct acpi_einj_entry {</div><div class='ctx'> /* Values for Action field above */</div><div class='ctx'> </div><div class='ctx'> enum acpi_einj_actions {</div><div class='del'>-	ACPI_EINJ_BEGIN_OPERATION = 0,</div><div class='del'>-	ACPI_EINJ_GET_TRIGGER_TABLE = 1,</div><div class='del'>-	ACPI_EINJ_SET_ERROR_TYPE = 2,</div><div class='del'>-	ACPI_EINJ_GET_ERROR_TYPE = 3,</div><div class='del'>-	ACPI_EINJ_END_OPERATION = 4,</div><div class='del'>-	ACPI_EINJ_EXECUTE_OPERATION = 5,</div><div class='del'>-	ACPI_EINJ_CHECK_BUSY_STATUS = 6,</div><div class='del'>-	ACPI_EINJ_GET_COMMAND_STATUS = 7,</div><div class='del'>-	ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 8,</div><div class='del'>-	ACPI_EINJ_GET_EXECUTE_TIMINGS = 9,</div><div class='del'>-	ACPI_EINJ_ACTION_RESERVED = 10,	/* 10 and greater are reserved */</div><div class='add'>+	ACPI_EINJ_BEGIN_OPERATION = 0x0,</div><div class='add'>+	ACPI_EINJ_GET_TRIGGER_TABLE = 0x1,</div><div class='add'>+	ACPI_EINJ_SET_ERROR_TYPE = 0x2,</div><div class='add'>+	ACPI_EINJ_GET_ERROR_TYPE = 0x3,</div><div class='add'>+	ACPI_EINJ_END_OPERATION = 0x4,</div><div class='add'>+	ACPI_EINJ_EXECUTE_OPERATION = 0x5,</div><div class='add'>+	ACPI_EINJ_CHECK_BUSY_STATUS = 0x6,</div><div class='add'>+	ACPI_EINJ_GET_COMMAND_STATUS = 0x7,</div><div class='add'>+	ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 0x8,</div><div class='add'>+	ACPI_EINJ_GET_EXECUTE_TIMINGS = 0x9,</div><div class='add'>+	ACPI_EINJV2_GET_ERROR_TYPE = 0x11,</div><div class='add'>+	ACPI_EINJ_ACTION_RESERVED = 0x12,	/* 0x12 and greater are reserved */</div><div class='ctx'> 	ACPI_EINJ_TRIGGER_ERROR = 0xFF	/* Except for this value */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1096,6 +1121,12 @@ enum acpi_einj_command_status {</div><div class='ctx'> #define ACPI_EINJ_PLATFORM_CORRECTABLE      (1&lt;&lt;9)</div><div class='ctx'> #define ACPI_EINJ_PLATFORM_UNCORRECTABLE    (1&lt;&lt;10)</div><div class='ctx'> #define ACPI_EINJ_PLATFORM_FATAL            (1&lt;&lt;11)</div><div class='add'>+#define ACPI_EINJ_CXL_CACHE_CORRECTABLE     (1&lt;&lt;12)</div><div class='add'>+#define ACPI_EINJ_CXL_CACHE_UNCORRECTABLE   (1&lt;&lt;13)</div><div class='add'>+#define ACPI_EINJ_CXL_CACHE_FATAL           (1&lt;&lt;14)</div><div class='add'>+#define ACPI_EINJ_CXL_MEM_CORRECTABLE       (1&lt;&lt;15)</div><div class='add'>+#define ACPI_EINJ_CXL_MEM_UNCORRECTABLE     (1&lt;&lt;16)</div><div class='add'>+#define ACPI_EINJ_CXL_MEM_FATAL             (1&lt;&lt;17)</div><div class='ctx'> #define ACPI_EINJ_VENDOR_DEFINED            (1&lt;&lt;31)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -1787,7 +1818,7 @@ struct acpi_hmat_cache {</div><div class='ctx'> 	u32 reserved1;</div><div class='ctx'> 	u64 cache_size;</div><div class='ctx'> 	u32 cache_attributes;</div><div class='del'>-	u16 reserved2;</div><div class='add'>+	u16 address_mode;</div><div class='ctx'> 	u16 number_of_SMBIOShandles;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1799,6 +1830,9 @@ struct acpi_hmat_cache {</div><div class='ctx'> #define ACPI_HMAT_WRITE_POLICY          (0x0000F000)</div><div class='ctx'> #define ACPI_HMAT_CACHE_LINE_SIZE       (0xFFFF0000)</div><div class='ctx'> </div><div class='add'>+#define ACPI_HMAT_CACHE_MODE_UNKNOWN            (0)</div><div class='add'>+#define ACPI_HMAT_CACHE_MODE_EXTENDED_LINEAR    (1)</div><div class='add'>+</div><div class='ctx'> /* Values for cache associativity flag */</div><div class='ctx'> </div><div class='ctx'> #define ACPI_HMAT_CA_NONE                     (0)</div><div class='head'>diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h<br/>index 9775384d61c6..f726bce3eb84 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/actbl2.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actbl2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/actbl2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/actbl2.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> /* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Name: actbl2.h - ACPI Table Definitions (tables not in ACPI spec)</div><div class='add'>+ * Name: actbl2.h - ACPI Table Definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #define ACPI_SIG_BDAT           "BDAT"	/* BIOS Data ACPI Table */</div><div class='ctx'> #define ACPI_SIG_CCEL           "CCEL"	/* CC Event Log Table */</div><div class='ctx'> #define ACPI_SIG_CDAT           "CDAT"	/* Coherent Device Attribute Table */</div><div class='add'>+#define ACPI_SIG_ERDT           "ERDT"	/* Enhanced Resource Director Technology */</div><div class='ctx'> #define ACPI_SIG_IORT           "IORT"	/* IO Remapping Table */</div><div class='ctx'> #define ACPI_SIG_IVRS           "IVRS"	/* I/O Virtualization Reporting Structure */</div><div class='ctx'> #define ACPI_SIG_LPIT           "LPIT"	/* Low Power Idle Table */</div><div class='hunk'>@@ -37,6 +38,7 @@</div><div class='ctx'> #define ACPI_SIG_MCHI           "MCHI"	/* Management Controller Host Interface table */</div><div class='ctx'> #define ACPI_SIG_MPAM           "MPAM"	/* Memory System Resource Partitioning and Monitoring Table */</div><div class='ctx'> #define ACPI_SIG_MPST           "MPST"	/* Memory Power State Table */</div><div class='add'>+#define ACPI_SIG_MRRM           "MRRM"	/* Memory Range and Region Mapping table */</div><div class='ctx'> #define ACPI_SIG_MSDM           "MSDM"	/* Microsoft Data Management Table */</div><div class='ctx'> #define ACPI_SIG_NFIT           "NFIT"	/* NVDIMM Firmware Interface Table */</div><div class='ctx'> #define ACPI_SIG_NHLT           "NHLT"	/* Non HD Audio Link Table */</div><div class='hunk'>@@ -47,12 +49,15 @@</div><div class='ctx'> #define ACPI_SIG_PPTT           "PPTT"	/* Processor Properties Topology Table */</div><div class='ctx'> #define ACPI_SIG_PRMT           "PRMT"	/* Platform Runtime Mechanism Table */</div><div class='ctx'> #define ACPI_SIG_RASF           "RASF"	/* RAS Feature table */</div><div class='add'>+#define ACPI_SIG_RAS2           "RAS2"	/* RAS2 Feature table */</div><div class='ctx'> #define ACPI_SIG_RGRT           "RGRT"	/* Regulatory Graphics Resource Table */</div><div class='ctx'> #define ACPI_SIG_RHCT           "RHCT"	/* RISC-V Hart Capabilities Table */</div><div class='add'>+#define ACPI_SIG_RIMT           "RIMT"	/* RISC-V IO Mapping Table */</div><div class='ctx'> #define ACPI_SIG_SBST           "SBST"	/* Smart Battery Specification Table */</div><div class='ctx'> #define ACPI_SIG_SDEI           "SDEI"	/* Software Delegated Exception Interface Table */</div><div class='ctx'> #define ACPI_SIG_SDEV           "SDEV"	/* Secure Devices table */</div><div class='ctx'> #define ACPI_SIG_SVKL           "SVKL"	/* Storage Volume Key Location Table */</div><div class='add'>+#define ACPI_SIG_SWFT           "SWFT"	/* SoundWire File Table */</div><div class='ctx'> #define ACPI_SIG_TDEL           "TDEL"	/* TD Event Log Table */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -77,8 +82,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * AEST - Arm Error Source Table</div><div class='ctx'>  *</div><div class='del'>- * Conforms to: ACPI for the Armv8 RAS Extensions 1.1 Platform Design Document</div><div class='del'>- * September 2020.</div><div class='add'>+ * Conforms to: ACPI for the Armv8 RAS Extensions 1.1(Sep 2020) and</div><div class='add'>+ * 2.0(May 2023) Platform Design Document.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +113,9 @@ struct acpi_aest_hdr {</div><div class='ctx'> #define ACPI_AEST_SMMU_ERROR_NODE           2</div><div class='ctx'> #define ACPI_AEST_VENDOR_ERROR_NODE         3</div><div class='ctx'> #define ACPI_AEST_GIC_ERROR_NODE            4</div><div class='del'>-#define ACPI_AEST_NODE_TYPE_RESERVED        5	/* 5 and above are reserved */</div><div class='add'>+#define ACPI_AEST_PCIE_ERROR_NODE           5</div><div class='add'>+#define ACPI_AEST_PROXY_ERROR_NODE          6</div><div class='add'>+#define ACPI_AEST_NODE_TYPE_RESERVED        7 /* 7 and above are reserved */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * AEST subtables (Error nodes)</div><div class='hunk'>@@ -187,6 +194,12 @@ typedef struct acpi_aest_vendor {</div><div class='ctx'> </div><div class='ctx'> } acpi_aest_vendor;</div><div class='ctx'> </div><div class='add'>+struct acpi_aest_vendor_v2 {</div><div class='add'>+	char acpi_hid[8];</div><div class='add'>+	u32 acpi_uid;</div><div class='add'>+	u8 vendor_specific_data[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* 4: Gic Error */</div><div class='ctx'> </div><div class='ctx'> typedef struct acpi_aest_gic {</div><div class='hunk'>@@ -203,6 +216,18 @@ typedef struct acpi_aest_gic {</div><div class='ctx'> #define ACPI_AEST_GIC_ITS                   3</div><div class='ctx'> #define ACPI_AEST_GIC_RESERVED              4	/* 4 and above are reserved */</div><div class='ctx'> </div><div class='add'>+/* 5: PCIe Error */</div><div class='add'>+</div><div class='add'>+struct acpi_aest_pcie {</div><div class='add'>+	u32 iort_node_reference;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 6: Proxy Error */</div><div class='add'>+</div><div class='add'>+struct acpi_aest_proxy {</div><div class='add'>+	u64 node_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Node Interface Structure */</div><div class='ctx'> </div><div class='ctx'> typedef struct acpi_aest_node_interface {</div><div class='hunk'>@@ -218,11 +243,57 @@ typedef struct acpi_aest_node_interface {</div><div class='ctx'> </div><div class='ctx'> } acpi_aest_node_interface;</div><div class='ctx'> </div><div class='add'>+/* Node Interface Structure V2 */</div><div class='add'>+</div><div class='add'>+struct acpi_aest_node_interface_header {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 group_format;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	u32 flags;</div><div class='add'>+	u64 address;</div><div class='add'>+	u32 error_record_index;</div><div class='add'>+	u32 error_record_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ACPI_AEST_NODE_GROUP_FORMAT_4K          0</div><div class='add'>+#define ACPI_AEST_NODE_GROUP_FORMAT_16K         1</div><div class='add'>+#define ACPI_AEST_NODE_GROUP_FORMAT_64K         2</div><div class='add'>+</div><div class='add'>+struct acpi_aest_node_interface_common {</div><div class='add'>+	u32 error_node_device;</div><div class='add'>+	u32 processor_affinity;</div><div class='add'>+	u64 error_group_register_base;</div><div class='add'>+	u64 fault_inject_register_base;</div><div class='add'>+	u64 interrupt_config_register_base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_aest_node_interface_4k {</div><div class='add'>+	u64 error_record_implemented;</div><div class='add'>+	u64 error_status_reporting;</div><div class='add'>+	u64 addressing_mode;</div><div class='add'>+	struct acpi_aest_node_interface_common common;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_aest_node_interface_16k {</div><div class='add'>+	u64 error_record_implemented[4];</div><div class='add'>+	u64 error_status_reporting[4];</div><div class='add'>+	u64 addressing_mode[4];</div><div class='add'>+	struct acpi_aest_node_interface_common common;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_aest_node_interface_64k {</div><div class='add'>+	u64 error_record_implemented[14];</div><div class='add'>+	u64 error_status_reporting[14];</div><div class='add'>+	u64 addressing_mode[14];</div><div class='add'>+	struct acpi_aest_node_interface_common common;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Values for Type field above */</div><div class='ctx'> </div><div class='del'>-#define ACPI_AEST_NODE_SYSTEM_REGISTER      0</div><div class='del'>-#define ACPI_AEST_NODE_MEMORY_MAPPED        1</div><div class='del'>-#define ACPI_AEST_XFACE_RESERVED            2	/* 2 and above are reserved */</div><div class='add'>+#define ACPI_AEST_NODE_SYSTEM_REGISTER			0</div><div class='add'>+#define ACPI_AEST_NODE_MEMORY_MAPPED			1</div><div class='add'>+#define ACPI_AEST_NODE_SINGLE_RECORD_MEMORY_MAPPED	2</div><div class='add'>+#define ACPI_AEST_XFACE_RESERVED			3   /* 2 and above are reserved */</div><div class='ctx'> </div><div class='ctx'> /* Node Interrupt Structure */</div><div class='ctx'> </div><div class='hunk'>@@ -236,6 +307,16 @@ typedef struct acpi_aest_node_interrupt {</div><div class='ctx'> </div><div class='ctx'> } acpi_aest_node_interrupt;</div><div class='ctx'> </div><div class='add'>+/* Node Interrupt Structure V2 */</div><div class='add'>+</div><div class='add'>+struct acpi_aest_node_interrupt_v2 {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	u8 flags;</div><div class='add'>+	u32 gsiv;</div><div class='add'>+	u8 reserved1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Values for Type field above */</div><div class='ctx'> </div><div class='ctx'> #define ACPI_AEST_NODE_FAULT_HANDLING       0</div><div class='hunk'>@@ -373,10 +454,199 @@ struct acpi_table_ccel {</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * ERDT - Enhanced Resource Director Technology (ERDT) table</div><div class='add'>+ *</div><div class='add'>+ * Conforms to "Intel Resource Director Technology Architecture Specification"</div><div class='add'>+ * Version 1.1, January 2025</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_table_erdt {</div><div class='add'>+	struct acpi_table_header header;	/* Common ACPI table header */</div><div class='add'>+	u32 max_clos;		/* Maximum classes of service */</div><div class='add'>+	u8 reserved[24];</div><div class='add'>+	u8 erdt_substructures[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Values for subtable type in struct acpi_subtbl_hdr_16 */</div><div class='add'>+</div><div class='add'>+enum acpi_erdt_type {</div><div class='add'>+	ACPI_ERDT_TYPE_RMDD = 0,</div><div class='add'>+	ACPI_ERDT_TYPE_CACD = 1,</div><div class='add'>+	ACPI_ERDT_TYPE_DACD = 2,</div><div class='add'>+	ACPI_ERDT_TYPE_CMRC = 3,</div><div class='add'>+	ACPI_ERDT_TYPE_MMRC = 4,</div><div class='add'>+	ACPI_ERDT_TYPE_MARC = 5,</div><div class='add'>+	ACPI_ERDT_TYPE_CARC = 6,</div><div class='add'>+	ACPI_ERDT_TYPE_CMRD = 7,</div><div class='add'>+	ACPI_ERDT_TYPE_IBRD = 8,</div><div class='add'>+	ACPI_ERDT_TYPE_IBAD = 9,</div><div class='add'>+	ACPI_ERDT_TYPE_CARD = 10,</div><div class='add'>+	ACPI_ERDT_TYPE_RESERVED = 11	/* 11 and above are reserved */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ERDT Subtables, correspond to Type in struct acpi_subtbl_hdr_16</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* 0: RMDD - Resource Management Domain Description */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_rmdd {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u16 flags;</div><div class='add'>+	u16 IO_l3_slices;	/* Number of slices in IO cache */</div><div class='add'>+	u8 IO_l3_sets;		/* Number of sets in IO cache */</div><div class='add'>+	u8 IO_l3_ways;		/* Number of ways in IO cache */</div><div class='add'>+	u64 reserved;</div><div class='add'>+	u16 domain_id;		/* Unique domain ID */</div><div class='add'>+	u32 max_rmid;		/* Maximun RMID supported */</div><div class='add'>+	u64 creg_base;		/* Control Register Base Address */</div><div class='add'>+	u16 creg_size;		/* Control Register Size (4K pages) */</div><div class='add'>+	u8 rmdd_structs[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 1: CACD - CPU Agent Collection Description */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_cacd {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u16 reserved;</div><div class='add'>+	u16 domain_id;		/* Unique domain ID */</div><div class='add'>+	u32 X2APICIDS[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 2: DACD - Device Agent Collection Description */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_dacd {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u16 reserved;</div><div class='add'>+	u16 domain_id;		/* Unique domain ID */</div><div class='add'>+	u8 dev_paths[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_dacd_dev_paths {</div><div class='add'>+	struct acpi_subtable_header header;</div><div class='add'>+	u16 segment;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	u8 start_bus;</div><div class='add'>+	u8 path[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 3: CMRC - Cache Monitoring Registers for CPU Agents */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_cmrc {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 index_fn;</div><div class='add'>+	u8 reserved2[11];</div><div class='add'>+	u64 cmt_reg_base;</div><div class='add'>+	u32 cmt_reg_size;</div><div class='add'>+	u16 clump_size;</div><div class='add'>+	u16 clump_stride;</div><div class='add'>+	u64 up_scale;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 4: MMRC - Memory-bandwidth Monitoring Registers for CPU Agents */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_mmrc {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 index_fn;</div><div class='add'>+	u8 reserved2[11];</div><div class='add'>+	u64 reg_base;</div><div class='add'>+	u32 reg_size;</div><div class='add'>+	u8 counter_width;</div><div class='add'>+	u64 up_scale;</div><div class='add'>+	u8 reserved3[7];</div><div class='add'>+	u32 corr_factor_list_len;</div><div class='add'>+	u32 corr_factor_list[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 5: MARC - Memory-bandwidth Allocation Registers for CPU Agents */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_marc {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u16 reserved1;</div><div class='add'>+	u16 flags;</div><div class='add'>+	u8 index_fn;</div><div class='add'>+	u8 reserved2[7];</div><div class='add'>+	u64 reg_base_opt;</div><div class='add'>+	u64 reg_base_min;</div><div class='add'>+	u64 reg_base_max;</div><div class='add'>+	u32 mba_reg_size;</div><div class='add'>+	u32 mba_ctrl_range;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 6: CARC - Cache Allocation Registers for CPU Agents */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_carc {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 7: CMRD - Cache Monitoring Registers for Device Agents */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_cmrd {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 index_fn;</div><div class='add'>+	u8 reserved2[11];</div><div class='add'>+	u64 reg_base;</div><div class='add'>+	u32 reg_size;</div><div class='add'>+	u16 cmt_reg_off;</div><div class='add'>+	u16 cmt_clump_size;</div><div class='add'>+	u64 up_scale;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 8: IBRD - Cache Monitoring Registers for Device Agents */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_ibrd {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 index_fn;</div><div class='add'>+	u8 reserved2[11];</div><div class='add'>+	u64 reg_base;</div><div class='add'>+	u32 reg_size;</div><div class='add'>+	u16 total_bw_offset;</div><div class='add'>+	u16 Iomiss_bw_offset;</div><div class='add'>+	u16 total_bw_clump;</div><div class='add'>+	u16 Iomiss_bw_clump;</div><div class='add'>+	u8 reserved3[7];</div><div class='add'>+	u8 counter_width;</div><div class='add'>+	u64 up_scale;</div><div class='add'>+	u32 corr_factor_list_len;</div><div class='add'>+	u32 corr_factor_list[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 9: IBAD - IO bandwidth Allocation Registers for device agents */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_ibad {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 10: CARD - IO bandwidth Allocation Registers for Device Agents */</div><div class='add'>+</div><div class='add'>+struct acpi_erdt_card {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 contention_mask;</div><div class='add'>+	u8 index_fn;</div><div class='add'>+	u8 reserved2[7];</div><div class='add'>+	u64 reg_base;</div><div class='add'>+	u32 reg_size;</div><div class='add'>+	u16 cat_reg_offset;</div><div class='add'>+	u16 cat_reg_block_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * IORT - IO Remapping Table</div><div class='ctx'>  *</div><div class='ctx'>  * Conforms to "IO Remapping Table System Software on ARM Platforms",</div><div class='del'>- * Document number: ARM DEN 0049E.e, Sep 2022</div><div class='add'>+ * Document number: ARM DEN 0049E.f, Apr 2024</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -447,6 +717,7 @@ struct acpi_iort_memory_access {</div><div class='ctx'> </div><div class='ctx'> #define ACPI_IORT_MF_COHERENCY          (1)</div><div class='ctx'> #define ACPI_IORT_MF_ATTRIBUTES         (1&lt;&lt;1)</div><div class='add'>+#define ACPI_IORT_MF_CANWBS             (1&lt;&lt;2)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * IORT node specific subtables</div><div class='hunk'>@@ -1117,11 +1388,23 @@ struct acpi_madt_generic_translator {</div><div class='ctx'> </div><div class='ctx'> struct acpi_madt_multiproc_wakeup {</div><div class='ctx'> 	struct acpi_subtable_header header;</div><div class='del'>-	u16 mailbox_version;</div><div class='add'>+	u16 version;</div><div class='ctx'> 	u32 reserved;		/* reserved - must be zero */</div><div class='del'>-	u64 base_address;</div><div class='add'>+	u64 mailbox_address;</div><div class='add'>+	u64 reset_vector;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Values for Version field above */</div><div class='add'>+</div><div class='add'>+enum acpi_madt_multiproc_wakeup_version {</div><div class='add'>+	ACPI_MADT_MP_WAKEUP_VERSION_NONE = 0,</div><div class='add'>+	ACPI_MADT_MP_WAKEUP_VERSION_V1 = 1,</div><div class='add'>+	ACPI_MADT_MP_WAKEUP_VERSION_RESERVED = 2, /* 2 and greater are reserved */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define ACPI_MADT_MP_WAKEUP_SIZE_V0	16</div><div class='add'>+#define ACPI_MADT_MP_WAKEUP_SIZE_V1	24</div><div class='add'>+</div><div class='ctx'> #define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE        2032</div><div class='ctx'> #define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE  2048</div><div class='ctx'> </div><div class='hunk'>@@ -1134,7 +1417,8 @@ struct acpi_madt_multiproc_wakeup_mailbox {</div><div class='ctx'> 	u8 reserved_firmware[ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE];	/* reserved for firmware use */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ACPI_MP_WAKE_COMMAND_WAKEUP    1</div><div class='add'>+#define ACPI_MP_WAKE_COMMAND_WAKEUP	1</div><div class='add'>+#define ACPI_MP_WAKE_COMMAND_TEST	2</div><div class='ctx'> </div><div class='ctx'> /* 17: CPU Core Interrupt Controller (ACPI 6.5) */</div><div class='ctx'> </div><div class='hunk'>@@ -1517,7 +1801,7 @@ struct acpi_mpam_msc_node {</div><div class='ctx'> 	u32 max_nrdy_usec;</div><div class='ctx'> 	u64 hardware_id_linked_device;</div><div class='ctx'> 	u32 instance_id_linked_device;</div><div class='del'>-	u32 num_resouce_nodes;</div><div class='add'>+	u32 num_resource_nodes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_table_mpam {</div><div class='hunk'>@@ -1647,6 +1931,47 @@ struct acpi_msct_proximity {</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * MRRM - Memory Range and Region Mapping (MRRM) table</div><div class='add'>+ * Conforms to "Intel Resource Director Technology Architecture Specification"</div><div class='add'>+ * Version 1.1, January 2025</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_table_mrrm {</div><div class='add'>+	struct acpi_table_header header;	/* Common ACPI table header */</div><div class='add'>+	u8 max_mem_region;	/* Max Memory Regions supported */</div><div class='add'>+	u8 flags;		/* Region assignment type */</div><div class='add'>+	u8 reserved[26];</div><div class='add'>+	u8 memory_range_entry[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Flags */</div><div class='add'>+#define ACPI_MRRM_FLAGS_REGION_ASSIGNMENT_OS    (1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+	*</div><div class='add'>+	* Memory Range entry - Memory Range entry in MRRM table</div><div class='add'>+	*</div><div class='add'>+	******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_mrrm_mem_range_entry {</div><div class='add'>+	struct acpi_subtbl_hdr_16 header;</div><div class='add'>+	u32 reserved0;		/* Reserved */</div><div class='add'>+	u64 addr_base;		/* Base addr of the mem range */</div><div class='add'>+	u64 addr_len;		/* Length of the mem range */</div><div class='add'>+	u16 region_id_flags;	/* Valid local or remote Region-ID */</div><div class='add'>+	u8 local_region_id;	/* Platform-assigned static local Region-ID */</div><div class='add'>+	u8 remote_region_id;	/* Platform-assigned static remote Region-ID */</div><div class='add'>+	u32 reserved1;		/* Reserved */</div><div class='add'>+	/* Region-ID Programming Registers[] */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Values for region_id_flags above */</div><div class='add'>+#define ACPI_MRRM_VALID_REGION_ID_FLAGS_LOCAL   (1&lt;&lt;0)</div><div class='add'>+#define ACPI_MRRM_VALID_REGION_ID_FLAGS_REMOTE  (1&lt;&lt;1)</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * MSDM - Microsoft Data Management table</div><div class='ctx'>  *</div><div class='ctx'>  * Conforms to "Microsoft Software Licensing Tables (SLIC and MSDM)",</div><div class='hunk'>@@ -1889,22 +2214,22 @@ struct nfit_device_handle {</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * NHLT - Non HD Audio Link Table</div><div class='del'>- *</div><div class='del'>- * Conforms to: Intel Smart Sound Technology NHLT Specification</div><div class='del'>- * Version 0.8.1, January 2020.</div><div class='add'>+ * NHLT - Non HDAudio Link Table</div><div class='add'>+ *        Version 1</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* Main table */</div><div class='del'>-</div><div class='ctx'> struct acpi_table_nhlt {</div><div class='ctx'> 	struct acpi_table_header header;	/* Common ACPI table header */</div><div class='del'>-	u8 endpoint_count;</div><div class='add'>+	u8 endpoints_count;</div><div class='add'>+	/*</div><div class='add'>+	 * struct acpi_nhlt_endpoint endpoints[];</div><div class='add'>+	 * struct acpi_nhlt_config oed_config;</div><div class='add'>+	 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_nhlt_endpoint {</div><div class='del'>-	u32 descriptor_length;</div><div class='add'>+	u32 length;</div><div class='ctx'> 	u8 link_type;</div><div class='ctx'> 	u8 instance_id;</div><div class='ctx'> 	u16 vendor_id;</div><div class='hunk'>@@ -1914,84 +2239,135 @@ struct acpi_nhlt_endpoint {</div><div class='ctx'> 	u8 device_type;</div><div class='ctx'> 	u8 direction;</div><div class='ctx'> 	u8 virtual_bus_id;</div><div class='add'>+	/*</div><div class='add'>+	 * struct acpi_nhlt_config device_config;</div><div class='add'>+	 * struct acpi_nhlt_formats_config formats_config;</div><div class='add'>+	 * struct acpi_nhlt_devices_info devices_info;</div><div class='add'>+	 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Types for link_type field above */</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_RESERVED_HD_AUDIO         0</div><div class='del'>-#define ACPI_NHLT_RESERVED_DSP              1</div><div class='del'>-#define ACPI_NHLT_PDM                       2</div><div class='del'>-#define ACPI_NHLT_SSP                       3</div><div class='del'>-#define ACPI_NHLT_RESERVED_SLIMBUS          4</div><div class='del'>-#define ACPI_NHLT_RESERVED_SOUNDWIRE        5</div><div class='del'>-#define ACPI_NHLT_TYPE_RESERVED             6	/* 6 and above are reserved */</div><div class='del'>-</div><div class='del'>-/* All other values above are reserved */</div><div class='add'>+/*</div><div class='add'>+ * Values for link_type field above</div><div class='add'>+ *</div><div class='add'>+ * Only types PDM and SSP are used</div><div class='add'>+ */</div><div class='add'>+#define ACPI_NHLT_LINKTYPE_HDA			0</div><div class='add'>+#define ACPI_NHLT_LINKTYPE_DSP			1</div><div class='add'>+#define ACPI_NHLT_LINKTYPE_PDM			2</div><div class='add'>+#define ACPI_NHLT_LINKTYPE_SSP			3</div><div class='add'>+#define ACPI_NHLT_LINKTYPE_SLIMBUS		4</div><div class='add'>+#define ACPI_NHLT_LINKTYPE_SDW			5</div><div class='add'>+#define ACPI_NHLT_LINKTYPE_UAOL			6</div><div class='ctx'> </div><div class='ctx'> /* Values for device_id field above */</div><div class='ctx'> </div><div class='del'>-#define ACPI_NHLT_PDM_DMIC                  0xAE20</div><div class='del'>-#define ACPI_NHLT_BT_SIDEBAND               0xAE30</div><div class='del'>-#define ACPI_NHLT_I2S_TDM_CODECS            0xAE23</div><div class='add'>+#define ACPI_NHLT_DEVICEID_DMIC			0xAE20</div><div class='add'>+#define ACPI_NHLT_DEVICEID_BT			0xAE30</div><div class='add'>+#define ACPI_NHLT_DEVICEID_I2S			0xAE34</div><div class='ctx'> </div><div class='ctx'> /* Values for device_type field above */</div><div class='ctx'> </div><div class='del'>-/* SSP Link */</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_LINK_BT_SIDEBAND          0</div><div class='del'>-#define ACPI_NHLT_LINK_FM                   1</div><div class='del'>-#define ACPI_NHLT_LINK_MODEM                2</div><div class='del'>-/* 3 is reserved */</div><div class='del'>-#define ACPI_NHLT_LINK_SSP_ANALOG_CODEC     4</div><div class='del'>-</div><div class='del'>-/* PDM Link */</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_PDM_ON_CAVS_1P8           0</div><div class='del'>-#define ACPI_NHLT_PDM_ON_CAVS_1P5           1</div><div class='add'>+/*</div><div class='add'>+ * Device types unique to endpoint of link_type=PDM</div><div class='add'>+ *</div><div class='add'>+ * Type PDM used for all SKL+ platforms</div><div class='add'>+ */</div><div class='add'>+#define ACPI_NHLT_DEVICETYPE_PDM		0</div><div class='add'>+#define ACPI_NHLT_DEVICETYPE_PDM_SKL		1</div><div class='add'>+/* Device types unique to endpoint of link_type=SSP */</div><div class='add'>+#define ACPI_NHLT_DEVICETYPE_BT			0</div><div class='add'>+#define ACPI_NHLT_DEVICETYPE_FM			1</div><div class='add'>+#define ACPI_NHLT_DEVICETYPE_MODEM		2</div><div class='add'>+#define ACPI_NHLT_DEVICETYPE_CODEC		4</div><div class='ctx'> </div><div class='ctx'> /* Values for Direction field above */</div><div class='ctx'> </div><div class='del'>-#define ACPI_NHLT_DIR_RENDER                0</div><div class='del'>-#define ACPI_NHLT_DIR_CAPTURE               1</div><div class='del'>-#define ACPI_NHLT_DIR_RENDER_LOOPBACK       2</div><div class='del'>-#define ACPI_NHLT_DIR_RENDER_FEEDBACK       3</div><div class='del'>-#define ACPI_NHLT_DIR_RESERVED              4	/* 4 and above are reserved */</div><div class='add'>+#define ACPI_NHLT_DIR_RENDER			0</div><div class='add'>+#define ACPI_NHLT_DIR_CAPTURE			1</div><div class='ctx'> </div><div class='del'>-struct acpi_nhlt_device_specific_config {</div><div class='add'>+struct acpi_nhlt_config {</div><div class='ctx'> 	u32 capabilities_size;</div><div class='add'>+	u8 capabilities[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_nhlt_gendevice_config {</div><div class='ctx'> 	u8 virtual_slot;</div><div class='ctx'> 	u8 config_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct acpi_nhlt_device_specific_config_a {</div><div class='del'>-	u32 capabilities_size;</div><div class='add'>+/* Values for config_type field above */</div><div class='add'>+</div><div class='add'>+#define ACPI_NHLT_CONFIGTYPE_GENERIC		0</div><div class='add'>+#define ACPI_NHLT_CONFIGTYPE_MICARRAY		1</div><div class='add'>+</div><div class='add'>+struct acpi_nhlt_micdevice_config {</div><div class='ctx'> 	u8 virtual_slot;</div><div class='ctx'> 	u8 config_type;</div><div class='ctx'> 	u8 array_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Values for Config Type above */</div><div class='add'>+/* Values for array_type field above */</div><div class='ctx'> </div><div class='del'>-#define ACPI_NHLT_CONFIG_TYPE_GENERIC              0x00</div><div class='del'>-#define ACPI_NHLT_CONFIG_TYPE_MIC_ARRAY            0x01</div><div class='del'>-#define ACPI_NHLT_CONFIG_TYPE_RENDER_FEEDBACK      0x03</div><div class='del'>-#define ACPI_NHLT_CONFIG_TYPE_RESERVED             0x04	/* 4 and above are reserved */</div><div class='add'>+#define ACPI_NHLT_ARRAYTYPE_LINEAR2_SMALL	0xA</div><div class='add'>+#define ACPI_NHLT_ARRAYTYPE_LINEAR2_BIG		0xB</div><div class='add'>+#define ACPI_NHLT_ARRAYTYPE_LINEAR4_GEO1	0xC</div><div class='add'>+#define ACPI_NHLT_ARRAYTYPE_PLANAR4_LSHAPED	0xD</div><div class='add'>+#define ACPI_NHLT_ARRAYTYPE_LINEAR4_GEO2	0xE</div><div class='add'>+#define ACPI_NHLT_ARRAYTYPE_VENDOR		0xF</div><div class='ctx'> </div><div class='del'>-struct acpi_nhlt_device_specific_config_b {</div><div class='del'>-	u32 capabilities_size;</div><div class='add'>+struct acpi_nhlt_vendor_mic_config {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 panel;</div><div class='add'>+	u16 speaker_position_distance;		/* mm */</div><div class='add'>+	u16 horizontal_offset;			/* mm */</div><div class='add'>+	u16 vertical_offset;			/* mm */</div><div class='add'>+	u8 frequency_low_band;			/* 5*Hz */</div><div class='add'>+	u8 frequency_high_band;			/* 500*Hz */</div><div class='add'>+	u16 direction_angle;			/* -180 - +180 */</div><div class='add'>+	u16 elevation_angle;			/* -180 - +180 */</div><div class='add'>+	u16 work_vertical_angle_begin;		/* -180 - +180 with 2 deg step */</div><div class='add'>+	u16 work_vertical_angle_end;		/* -180 - +180 with 2 deg step */</div><div class='add'>+	u16 work_horizontal_angle_begin;	/* -180 - +180 with 2 deg step */</div><div class='add'>+	u16 work_horizontal_angle_end;		/* -180 - +180 with 2 deg step */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct acpi_nhlt_device_specific_config_c {</div><div class='del'>-	u32 capabilities_size;</div><div class='add'>+/* Values for Type field above */</div><div class='add'>+</div><div class='add'>+#define ACPI_NHLT_MICTYPE_OMNIDIRECTIONAL	0</div><div class='add'>+#define ACPI_NHLT_MICTYPE_SUBCARDIOID		1</div><div class='add'>+#define ACPI_NHLT_MICTYPE_CARDIOID		2</div><div class='add'>+#define ACPI_NHLT_MICTYPE_SUPERCARDIOID		3</div><div class='add'>+#define ACPI_NHLT_MICTYPE_HYPERCARDIOID		4</div><div class='add'>+#define ACPI_NHLT_MICTYPE_8SHAPED		5</div><div class='add'>+#define ACPI_NHLT_MICTYPE_RESERVED		6</div><div class='add'>+#define ACPI_NHLT_MICTYPE_VENDORDEFINED		7</div><div class='add'>+</div><div class='add'>+/* Values for Panel field above */</div><div class='add'>+</div><div class='add'>+#define ACPI_NHLT_MICLOCATION_TOP		0</div><div class='add'>+#define ACPI_NHLT_MICLOCATION_BOTTOM		1</div><div class='add'>+#define ACPI_NHLT_MICLOCATION_LEFT		2</div><div class='add'>+#define ACPI_NHLT_MICLOCATION_RIGHT		3</div><div class='add'>+#define ACPI_NHLT_MICLOCATION_FRONT		4</div><div class='add'>+#define ACPI_NHLT_MICLOCATION_REAR		5</div><div class='add'>+</div><div class='add'>+struct acpi_nhlt_vendor_micdevice_config {</div><div class='ctx'> 	u8 virtual_slot;</div><div class='add'>+	u8 config_type;</div><div class='add'>+	u8 array_type;</div><div class='add'>+	u8 mics_count;</div><div class='add'>+	struct acpi_nhlt_vendor_mic_config mics[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct acpi_nhlt_render_device_specific_config {</div><div class='del'>-	u32 capabilities_size;</div><div class='add'>+union acpi_nhlt_device_config {</div><div class='ctx'> 	u8 virtual_slot;</div><div class='add'>+	struct acpi_nhlt_gendevice_config gen;</div><div class='add'>+	struct acpi_nhlt_micdevice_config mic;</div><div class='add'>+	struct acpi_nhlt_vendor_micdevice_config vendor_mic;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct acpi_nhlt_wave_extensible {</div><div class='add'>+/* Inherited from Microsoft's WAVEFORMATEXTENSIBLE. */</div><div class='add'>+struct acpi_nhlt_wave_formatext {</div><div class='ctx'> 	u16 format_tag;</div><div class='ctx'> 	u16 channel_count;</div><div class='ctx'> 	u32 samples_per_sec;</div><div class='hunk'>@@ -2001,144 +2377,28 @@ struct acpi_nhlt_wave_extensible {</div><div class='ctx'> 	u16 extra_format_size;</div><div class='ctx'> 	u16 valid_bits_per_sample;</div><div class='ctx'> 	u32 channel_mask;</div><div class='del'>-	u8 sub_format_guid[16];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Values for channel_mask above */</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_SPKR_FRONT_LEFT             0x1</div><div class='del'>-#define ACPI_NHLT_SPKR_FRONT_RIGHT            0x2</div><div class='del'>-#define ACPI_NHLT_SPKR_FRONT_CENTER           0x4</div><div class='del'>-#define ACPI_NHLT_SPKR_LOW_FREQ               0x8</div><div class='del'>-#define ACPI_NHLT_SPKR_BACK_LEFT              0x10</div><div class='del'>-#define ACPI_NHLT_SPKR_BACK_RIGHT             0x20</div><div class='del'>-#define ACPI_NHLT_SPKR_FRONT_LEFT_OF_CENTER   0x40</div><div class='del'>-#define ACPI_NHLT_SPKR_FRONT_RIGHT_OF_CENTER  0x80</div><div class='del'>-#define ACPI_NHLT_SPKR_BACK_CENTER            0x100</div><div class='del'>-#define ACPI_NHLT_SPKR_SIDE_LEFT              0x200</div><div class='del'>-#define ACPI_NHLT_SPKR_SIDE_RIGHT             0x400</div><div class='del'>-#define ACPI_NHLT_SPKR_TOP_CENTER             0x800</div><div class='del'>-#define ACPI_NHLT_SPKR_TOP_FRONT_LEFT         0x1000</div><div class='del'>-#define ACPI_NHLT_SPKR_TOP_FRONT_CENTER       0x2000</div><div class='del'>-#define ACPI_NHLT_SPKR_TOP_FRONT_RIGHT        0x4000</div><div class='del'>-#define ACPI_NHLT_SPKR_TOP_BACK_LEFT          0x8000</div><div class='del'>-#define ACPI_NHLT_SPKR_TOP_BACK_CENTER        0x10000</div><div class='del'>-#define ACPI_NHLT_SPKR_TOP_BACK_RIGHT         0x20000</div><div class='add'>+	u8 subformat[16];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct acpi_nhlt_format_config {</div><div class='del'>-	struct acpi_nhlt_wave_extensible format;</div><div class='del'>-	u32 capability_size;</div><div class='del'>-	u8 capabilities[];</div><div class='add'>+	struct acpi_nhlt_wave_formatext format;</div><div class='add'>+	struct acpi_nhlt_config config;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_nhlt_formats_config {</div><div class='ctx'> 	u8 formats_count;</div><div class='add'>+	struct acpi_nhlt_format_config formats[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct acpi_nhlt_device_specific_hdr {</div><div class='del'>-	u8 virtual_slot;</div><div class='del'>-	u8 config_type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Types for config_type above */</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_GENERIC                   0</div><div class='del'>-#define ACPI_NHLT_MIC                       1</div><div class='del'>-#define ACPI_NHLT_RENDER                    3</div><div class='del'>-</div><div class='del'>-struct acpi_nhlt_mic_device_specific_config {</div><div class='del'>-	struct acpi_nhlt_device_specific_hdr device_config;</div><div class='del'>-	u8 array_type_ext;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Values for array_type_ext above */</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_ARRAY_TYPE_RESERVED               0x09	/* 9 and below are reserved */</div><div class='del'>-#define ACPI_NHLT_SMALL_LINEAR_2ELEMENT             0x0A</div><div class='del'>-#define ACPI_NHLT_BIG_LINEAR_2ELEMENT               0x0B</div><div class='del'>-#define ACPI_NHLT_FIRST_GEOMETRY_LINEAR_4ELEMENT    0x0C</div><div class='del'>-#define ACPI_NHLT_PLANAR_LSHAPED_4ELEMENT           0x0D</div><div class='del'>-#define ACPI_NHLT_SECOND_GEOMETRY_LINEAR_4ELEMENT   0x0E</div><div class='del'>-#define ACPI_NHLT_VENDOR_DEFINED                    0x0F</div><div class='del'>-#define ACPI_NHLT_ARRAY_TYPE_MASK                   0x0F</div><div class='del'>-#define ACPI_NHLT_ARRAY_TYPE_EXT_MASK               0x10</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_NO_EXTENSION                      0x0</div><div class='del'>-#define ACPI_NHLT_MIC_SNR_SENSITIVITY_EXT           (1&lt;&lt;4)</div><div class='del'>-</div><div class='del'>-struct acpi_nhlt_vendor_mic_count {</div><div class='del'>-	u8 microphone_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct acpi_nhlt_vendor_mic_config {</div><div class='del'>-	u8 type;</div><div class='del'>-	u8 panel;</div><div class='del'>-	u16 speaker_position_distance;	/* mm */</div><div class='del'>-	u16 horizontal_offset;	/* mm */</div><div class='del'>-	u16 vertical_offset;	/* mm */</div><div class='del'>-	u8 frequency_low_band;	/* 5*Hz */</div><div class='del'>-	u8 frequency_high_band;	/* 500*Hz */</div><div class='del'>-	u16 direction_angle;	/* -180 - + 180 */</div><div class='del'>-	u16 elevation_angle;	/* -180 - + 180 */</div><div class='del'>-	u16 work_vertical_angle_begin;	/* -180 - + 180 with 2 deg step */</div><div class='del'>-	u16 work_vertical_angle_end;	/* -180 - + 180 with 2 deg step */</div><div class='del'>-	u16 work_horizontal_angle_begin;	/* -180 - + 180 with 2 deg step */</div><div class='del'>-	u16 work_horizontal_angle_end;	/* -180 - + 180 with 2 deg step */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Values for Type field above */</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_MIC_OMNIDIRECTIONAL       0</div><div class='del'>-#define ACPI_NHLT_MIC_SUBCARDIOID           1</div><div class='del'>-#define ACPI_NHLT_MIC_CARDIOID              2</div><div class='del'>-#define ACPI_NHLT_MIC_SUPER_CARDIOID        3</div><div class='del'>-#define ACPI_NHLT_MIC_HYPER_CARDIOID        4</div><div class='del'>-#define ACPI_NHLT_MIC_8_SHAPED              5</div><div class='del'>-#define ACPI_NHLT_MIC_RESERVED6             6	/* 6 is reserved */</div><div class='del'>-#define ACPI_NHLT_MIC_VENDOR_DEFINED        7</div><div class='del'>-#define ACPI_NHLT_MIC_RESERVED              8	/* 8 and above are reserved */</div><div class='del'>-</div><div class='del'>-/* Values for Panel field above */</div><div class='del'>-</div><div class='del'>-#define ACPI_NHLT_MIC_POSITION_TOP          0</div><div class='del'>-#define ACPI_NHLT_MIC_POSITION_BOTTOM       1</div><div class='del'>-#define ACPI_NHLT_MIC_POSITION_LEFT         2</div><div class='del'>-#define ACPI_NHLT_MIC_POSITION_RIGHT        3</div><div class='del'>-#define ACPI_NHLT_MIC_POSITION_FRONT        4</div><div class='del'>-#define ACPI_NHLT_MIC_POSITION_BACK         5</div><div class='del'>-#define ACPI_NHLT_MIC_POSITION_RESERVED     6	/* 6 and above are reserved */</div><div class='del'>-</div><div class='del'>-struct acpi_nhlt_vendor_mic_device_specific_config {</div><div class='del'>-	struct acpi_nhlt_mic_device_specific_config mic_array_device_config;</div><div class='del'>-	u8 number_of_microphones;</div><div class='del'>-	struct acpi_nhlt_vendor_mic_config mic_config[];	/* Indexed by number_of_microphones */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Microphone SNR and Sensitivity extension */</div><div class='del'>-</div><div class='del'>-struct acpi_nhlt_mic_snr_sensitivity_extension {</div><div class='del'>-	u32 SNR;</div><div class='del'>-	u32 sensitivity;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Render device with feedback */</div><div class='del'>-</div><div class='del'>-struct acpi_nhlt_render_feedback_device_specific_config {</div><div class='del'>-	u8 feedback_virtual_slot;	/* Render slot in case of capture */</div><div class='del'>-	u16 feedback_channels;	/* Informative only */</div><div class='del'>-	u16 feedback_valid_bits_per_sample;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Non documented structures */</div><div class='del'>-</div><div class='del'>-struct acpi_nhlt_device_info_count {</div><div class='del'>-	u8 structure_count;</div><div class='add'>+struct acpi_nhlt_device_info {</div><div class='add'>+	u8 id[16];</div><div class='add'>+	u8 instance_id;</div><div class='add'>+	u8 port_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct acpi_nhlt_device_info {</div><div class='del'>-	u8 device_id[16];</div><div class='del'>-	u8 device_instance_id;</div><div class='del'>-	u8 device_port_id;</div><div class='add'>+struct acpi_nhlt_devices_info {</div><div class='add'>+	u8 devices_count;</div><div class='add'>+	struct acpi_nhlt_device_info devices[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -2753,6 +3013,134 @@ enum acpi_rasf_status {</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * RAS2 - RAS2 Feature Table (ACPI 6.5)</div><div class='add'>+ *        Version 1</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_table_ras2 {</div><div class='add'>+	struct acpi_table_header header;	/* Common ACPI table header */</div><div class='add'>+	u16 reserved;</div><div class='add'>+	u16 num_pcc_descs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RAS2 Platform Communication Channel Descriptor */</div><div class='add'>+</div><div class='add'>+struct acpi_ras2_pcc_desc {</div><div class='add'>+	u8 channel_id;</div><div class='add'>+	u16 reserved;</div><div class='add'>+	u8 feature_type;</div><div class='add'>+	u32 instance;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RAS2 Platform Communication Channel Shared Memory Region */</div><div class='add'>+</div><div class='add'>+struct acpi_ras2_shmem {</div><div class='add'>+	u32 signature;</div><div class='add'>+	u16 command;</div><div class='add'>+	u16 status;</div><div class='add'>+	u16 version;</div><div class='add'>+	u8 features[16];</div><div class='add'>+	u8 set_caps[16];</div><div class='add'>+	u16 num_param_blks;</div><div class='add'>+	u32 set_caps_status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RAS2 Parameter Block Structure for PATROL_SCRUB */</div><div class='add'>+</div><div class='add'>+struct acpi_ras2_parameter_block {</div><div class='add'>+	u16 type;</div><div class='add'>+	u16 version;</div><div class='add'>+	u16 length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RAS2 Parameter Block Structure for PATROL_SCRUB */</div><div class='add'>+</div><div class='add'>+struct acpi_ras2_patrol_scrub_param {</div><div class='add'>+	struct acpi_ras2_parameter_block header;</div><div class='add'>+	u16 command;</div><div class='add'>+	u64 req_addr_range[2];</div><div class='add'>+	u64 actl_addr_range[2];</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 scrub_params_out;</div><div class='add'>+	u32 scrub_params_in;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Masks for Flags field above */</div><div class='add'>+</div><div class='add'>+#define ACPI_RAS2_SCRUBBER_RUNNING      1</div><div class='add'>+</div><div class='add'>+/* RAS2 Parameter Block Structure for LA2PA_TRANSLATION */</div><div class='add'>+</div><div class='add'>+struct acpi_ras2_la2pa_translation_parameter {</div><div class='add'>+	struct acpi_ras2_parameter_block header;</div><div class='add'>+	u16 addr_translation_command;</div><div class='add'>+	u64 sub_inst_id;</div><div class='add'>+	u64 logical_address;</div><div class='add'>+	u64 physical_address;</div><div class='add'>+	u32 status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Channel Commands */</div><div class='add'>+</div><div class='add'>+enum acpi_ras2_commands {</div><div class='add'>+	ACPI_RAS2_EXECUTE_RAS2_COMMAND = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Platform RAS2 Features */</div><div class='add'>+</div><div class='add'>+enum acpi_ras2_features {</div><div class='add'>+	ACPI_RAS2_PATROL_SCRUB_SUPPORTED = 0,</div><div class='add'>+	ACPI_RAS2_LA2PA_TRANSLATION = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RAS2 Patrol Scrub Commands */</div><div class='add'>+</div><div class='add'>+enum acpi_ras2_patrol_scrub_commands {</div><div class='add'>+	ACPI_RAS2_GET_PATROL_PARAMETERS = 1,</div><div class='add'>+	ACPI_RAS2_START_PATROL_SCRUBBER = 2,</div><div class='add'>+	ACPI_RAS2_STOP_PATROL_SCRUBBER = 3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RAS2 LA2PA Translation Commands */</div><div class='add'>+</div><div class='add'>+enum acpi_ras2_la2_pa_translation_commands {</div><div class='add'>+	ACPI_RAS2_GET_LA2PA_TRANSLATION = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RAS2 LA2PA Translation Status values */</div><div class='add'>+</div><div class='add'>+enum acpi_ras2_la2_pa_translation_status {</div><div class='add'>+	ACPI_RAS2_LA2PA_TRANSLATION_SUCCESS = 0,</div><div class='add'>+	ACPI_RAS2_LA2PA_TRANSLATION_FAIL = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Channel Command flags */</div><div class='add'>+</div><div class='add'>+#define ACPI_RAS2_GENERATE_SCI          (1&lt;&lt;15)</div><div class='add'>+</div><div class='add'>+/* Status values */</div><div class='add'>+</div><div class='add'>+enum acpi_ras2_status {</div><div class='add'>+	ACPI_RAS2_SUCCESS = 0,</div><div class='add'>+	ACPI_RAS2_NOT_VALID = 1,</div><div class='add'>+	ACPI_RAS2_NOT_SUPPORTED = 2,</div><div class='add'>+	ACPI_RAS2_BUSY = 3,</div><div class='add'>+	ACPI_RAS2_FAILED = 4,</div><div class='add'>+	ACPI_RAS2_ABORTED = 5,</div><div class='add'>+	ACPI_RAS2_INVALID_DATA = 6</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Status flags */</div><div class='add'>+</div><div class='add'>+#define ACPI_RAS2_COMMAND_COMPLETE      (1)</div><div class='add'>+#define ACPI_RAS2_SCI_DOORBELL          (1&lt;&lt;1)</div><div class='add'>+#define ACPI_RAS2_ERROR                 (1&lt;&lt;2)</div><div class='add'>+#define ACPI_RAS2_STATUS                (0x1F&lt;&lt;3)</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * RGRT - Regulatory Graphics Resource Table</div><div class='ctx'>  *        Version 1</div><div class='ctx'>  *</div><div class='hunk'>@@ -2850,6 +3238,88 @@ struct acpi_rhct_hart_info {</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * RIMT - RISC-V IO Remapping Table</div><div class='add'>+ *</div><div class='add'>+ * https://github.com/riscv-non-isa/riscv-acpi-rimt</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+struct acpi_table_rimt {</div><div class='add'>+	struct acpi_table_header header;	/* Common ACPI table header */</div><div class='add'>+	u32 num_nodes;		/* Number of RIMT Nodes */</div><div class='add'>+	u32 node_offset;	/* Offset to RIMT Node Array */</div><div class='add'>+	u32 reserved;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_rimt_node {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 revision;</div><div class='add'>+	u16 length;</div><div class='add'>+	u16 reserved;</div><div class='add'>+	u16 id;</div><div class='add'>+	char node_data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum acpi_rimt_node_type {</div><div class='add'>+	ACPI_RIMT_NODE_TYPE_IOMMU = 0x0,</div><div class='add'>+	ACPI_RIMT_NODE_TYPE_PCIE_ROOT_COMPLEX = 0x1,</div><div class='add'>+	ACPI_RIMT_NODE_TYPE_PLAT_DEVICE = 0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_rimt_iommu {</div><div class='add'>+	u8 hardware_id[8];	/* Hardware ID */</div><div class='add'>+	u64 base_address;	/* Base Address */</div><div class='add'>+	u32 flags;		/* Flags */</div><div class='add'>+	u32 proximity_domain;	/* Proximity Domain */</div><div class='add'>+	u16 pcie_segment_number;	/* PCIe Segment number */</div><div class='add'>+	u16 pcie_bdf;		/* PCIe B/D/F */</div><div class='add'>+	u16 num_interrupt_wires;	/* Number of interrupt wires */</div><div class='add'>+	u16 interrupt_wire_offset;	/* Interrupt wire array offset */</div><div class='add'>+	u64 interrupt_wire[];	/* Interrupt wire array */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IOMMU Node Flags */</div><div class='add'>+#define ACPI_RIMT_IOMMU_FLAGS_PCIE      (1)</div><div class='add'>+#define ACPI_RIMT_IOMMU_FLAGS_PXM_VALID (1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+/* Interrupt Wire Structure */</div><div class='add'>+struct acpi_rimt_iommu_wire_gsi {</div><div class='add'>+	u32 irq_num;		/* Interrupt Number */</div><div class='add'>+	u32 flags;		/* Flags */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Interrupt Wire Flags */</div><div class='add'>+#define ACPI_RIMT_GSI_LEVEL_TRIGGERRED  (1)</div><div class='add'>+#define ACPI_RIMT_GSI_ACTIVE_HIGH       (1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+struct acpi_rimt_id_mapping {</div><div class='add'>+	u32 source_id_base;	/* Source ID Base */</div><div class='add'>+	u32 num_ids;		/* Number of IDs */</div><div class='add'>+	u32 dest_id_base;	/* Destination Device ID Base */</div><div class='add'>+	u32 dest_offset;	/* Destination IOMMU Offset */</div><div class='add'>+	u32 flags;		/* Flags */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_rimt_pcie_rc {</div><div class='add'>+	u32 flags;		/* Flags */</div><div class='add'>+	u16 reserved;		/* Reserved */</div><div class='add'>+	u16 pcie_segment_number;	/* PCIe Segment number */</div><div class='add'>+	u16 id_mapping_offset;	/* ID mapping array offset */</div><div class='add'>+	u16 num_id_mappings;	/* Number of ID mappings */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PCIe Root Complex Node Flags */</div><div class='add'>+#define ACPI_RIMT_PCIE_ATS_SUPPORTED   (1)</div><div class='add'>+#define ACPI_RIMT_PCIE_PRI_SUPPORTED   (1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+struct acpi_rimt_platform_device {</div><div class='add'>+	u16 id_mapping_offset;	/* ID Mapping array offset */</div><div class='add'>+	u16 num_id_mappings;	/* Number of ID mappings */</div><div class='add'>+	char device_name[];	/* Device Object Name */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * SBST - Smart Battery Specification Table</div><div class='ctx'>  *        Version 1</div><div class='ctx'>  *</div><div class='hunk'>@@ -3010,6 +3480,26 @@ enum acpi_svkl_format {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='add'>+ * SWFT - SoundWire File Table</div><div class='add'>+ *</div><div class='add'>+ * Conforms to "Discovery and Configuration (DisCo) Specification for SoundWire"</div><div class='add'>+ * Version 2.1, 2 October 2023</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+struct acpi_sw_file {</div><div class='add'>+	u16 vendor_id;</div><div class='add'>+	u32 file_id;</div><div class='add'>+	u16 file_version;</div><div class='add'>+	u32 file_length;</div><div class='add'>+	u8 data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_table_swft {</div><div class='add'>+	struct acpi_table_header header;</div><div class='add'>+	struct acpi_sw_file files[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * TDEL - TD-Event Log</div><div class='ctx'>  *        From: "Guest-Host-Communication Interface (GHCI) for Intel</div><div class='head'>diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h<br/>index c080d579a546..79d3aa5a4bad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/actbl3.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actbl3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/actbl3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/actbl3.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: actbl3.h - ACPI Table Definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -92,10 +92,10 @@ struct acpi_table_slit {</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * SPCR - Serial Port Console Redirection table</div><div class='del'>- *        Version 2</div><div class='add'>+ *        Version 4</div><div class='ctx'>  *</div><div class='ctx'>  * Conforms to "Serial Port Console Redirection Table",</div><div class='del'>- * Version 1.03, August 10, 2015</div><div class='add'>+ * Version 1.10, Jan 5, 2023</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +112,7 @@ struct acpi_table_spcr {</div><div class='ctx'> 	u8 stop_bits;</div><div class='ctx'> 	u8 flow_control;</div><div class='ctx'> 	u8 terminal_type;</div><div class='del'>-	u8 reserved1;</div><div class='add'>+	u8 language;</div><div class='ctx'> 	u16 pci_device_id;</div><div class='ctx'> 	u16 pci_vendor_id;</div><div class='ctx'> 	u8 pci_bus;</div><div class='hunk'>@@ -120,7 +120,11 @@ struct acpi_table_spcr {</div><div class='ctx'> 	u8 pci_function;</div><div class='ctx'> 	u32 pci_flags;</div><div class='ctx'> 	u8 pci_segment;</div><div class='del'>-	u32 reserved2;</div><div class='add'>+	u32 uart_clk_freq;</div><div class='add'>+	u32 precise_baudrate;</div><div class='add'>+	u16 name_space_string_length;</div><div class='add'>+	u16 name_space_string_offset;</div><div class='add'>+	char name_space_string[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Masks for pci_flags field above */</div><div class='hunk'>@@ -192,7 +196,8 @@ enum acpi_srat_type {</div><div class='ctx'> 	ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4,	/* ACPI 6.2 */</div><div class='ctx'> 	ACPI_SRAT_TYPE_GENERIC_AFFINITY = 5,	/* ACPI 6.3 */</div><div class='ctx'> 	ACPI_SRAT_TYPE_GENERIC_PORT_AFFINITY = 6,	/* ACPI 6.4 */</div><div class='del'>-	ACPI_SRAT_TYPE_RESERVED = 7	/* 7 and greater are reserved */</div><div class='add'>+	ACPI_SRAT_TYPE_RINTC_AFFINITY = 7,	/* ACPI 6.6 */</div><div class='add'>+	ACPI_SRAT_TYPE_RESERVED = 8	/* 8 and greater are reserved */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -264,7 +269,7 @@ struct acpi_srat_gicc_affinity {</div><div class='ctx'> </div><div class='ctx'> #define ACPI_SRAT_GICC_ENABLED     (1)	/* 00: Use affinity structure */</div><div class='ctx'> </div><div class='del'>-/* 4: GCC ITS Affinity (ACPI 6.2) */</div><div class='add'>+/* 4: GIC ITS Affinity (ACPI 6.2) */</div><div class='ctx'> </div><div class='ctx'> struct acpi_srat_gic_its_affinity {</div><div class='ctx'> 	struct acpi_subtable_header header;</div><div class='hunk'>@@ -296,6 +301,21 @@ struct acpi_srat_generic_affinity {</div><div class='ctx'> #define ACPI_SRAT_GENERIC_AFFINITY_ENABLED     (1)	/* 00: Use affinity structure */</div><div class='ctx'> #define ACPI_SRAT_ARCHITECTURAL_TRANSACTIONS   (1&lt;&lt;1)	/* ACPI 6.4 */</div><div class='ctx'> </div><div class='add'>+/* 7: RINTC Affinity Structure(ACPI 6.6) */</div><div class='add'>+</div><div class='add'>+struct acpi_srat_rintc_affinity {</div><div class='add'>+	struct acpi_subtable_header header;</div><div class='add'>+	u16 reserved;</div><div class='add'>+	u32 proximity_domain;</div><div class='add'>+	u32 acpi_processor_uid;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 clock_domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Flags for struct acpi_srat_rintc_affinity */</div><div class='add'>+</div><div class='add'>+#define ACPI_SRAT_RINTC_ENABLED     (1)	/* 00: Use affinity structure */</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * STAO - Status Override Table (_STA override) - ACPI 6.0</div><div class='hunk'>@@ -446,6 +466,7 @@ struct acpi_tpm2_phy {</div><div class='ctx'> #define ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC       11	/* V1.2 Rev 8 */</div><div class='ctx'> #define ACPI_TPM2_RESERVED                          12</div><div class='ctx'> #define ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON        13</div><div class='add'>+#define ACPI_TPM2_CRB_WITH_ARM_FFA                  15</div><div class='ctx'> </div><div class='ctx'> /* Optional trailer appears after any start_method subtables */</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h<br/>index 85c2dcf2b704..8fe893d776dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/actypes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/actypes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/actypes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/actypes.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: actypes.h - Common data types for the entire ACPI subsystem</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -522,12 +522,12 @@ typedef u64 acpi_integer;</div><div class='ctx'> #define ACPI_COPY_NAMESEG(dest,src)     (*ACPI_CAST_PTR (u32, (dest)) = *ACPI_CAST_PTR (u32, (src)))</div><div class='ctx'> #else</div><div class='ctx'> #define ACPI_COMPARE_NAMESEG(a,b)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))</div><div class='del'>-#define ACPI_COPY_NAMESEG(dest,src)     (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))</div><div class='add'>+#define ACPI_COPY_NAMESEG(dest,src)     (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Support for the special RSDP signature (8 characters) */</div><div class='ctx'> </div><div class='del'>-#define ACPI_VALIDATE_RSDP_SIG(a)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8))</div><div class='add'>+#define ACPI_VALIDATE_RSDP_SIG(a)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, (sizeof(a) &lt; 8) ? ACPI_NAMESEG_SIZE : 8))</div><div class='ctx'> #define ACPI_MAKE_RSDP_SIG(dest)        (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8))</div><div class='ctx'> </div><div class='ctx'> /* Support for OEMx signature (x can be any character) */</div><div class='hunk'>@@ -1311,6 +1311,7 @@ typedef enum {</div><div class='ctx'> #define ACPI_OSI_WIN_10_19H1            0x14</div><div class='ctx'> #define ACPI_OSI_WIN_10_20H1            0x15</div><div class='ctx'> #define ACPI_OSI_WIN_11                 0x16</div><div class='add'>+#define ACPI_OSI_WIN_11_22H2            0x17</div><div class='ctx'> </div><div class='ctx'> /* Definitions of getopt */</div><div class='ctx'> </div><div class='hunk'>@@ -1326,4 +1327,8 @@ typedef enum {</div><div class='ctx'> #define ACPI_FLEX_ARRAY(TYPE, NAME)     TYPE NAME[0]</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef ACPI_NONSTRING</div><div class='add'>+#define ACPI_NONSTRING		/* No terminating NUL character */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif				/* __ACTYPES_H__ */</div><div class='head'>diff --git a/include/acpi/acuuid.h b/include/acpi/acuuid.h<br/>index 52a84523bfac..25dd3e998727 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/acuuid.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/acuuid.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/acuuid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/acuuid.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acuuid.h - ACPI-related UUID/GUID definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/battery.h b/include/acpi/battery.h<br/>index 611a2561a014..c93f16dfb944 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/battery.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/battery.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/battery.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/battery.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #ifndef __ACPI_BATTERY_H</div><div class='ctx'> #define __ACPI_BATTERY_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/power_supply.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ACPI_BATTERY_CLASS "battery"</div><div class='hunk'>@@ -19,5 +20,6 @@ struct acpi_battery_hook {</div><div class='ctx'> </div><div class='ctx'> void battery_hook_register(struct acpi_battery_hook *hook);</div><div class='ctx'> void battery_hook_unregister(struct acpi_battery_hook *hook);</div><div class='add'>+int devm_battery_hook_register(struct device *dev, struct acpi_battery_hook *hook);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h<br/>index 930b6afba6f4..13fa81504844 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/cppc_acpi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/cppc_acpi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/cppc_acpi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/cppc_acpi.h</a></div><div class='hunk'>@@ -32,6 +32,15 @@</div><div class='ctx'> #define	CMD_READ 0</div><div class='ctx'> #define	CMD_WRITE 1</div><div class='ctx'> </div><div class='add'>+#define CPPC_AUTO_ACT_WINDOW_SIG_BIT_SIZE	(7)</div><div class='add'>+#define CPPC_AUTO_ACT_WINDOW_EXP_BIT_SIZE	(3)</div><div class='add'>+#define CPPC_AUTO_ACT_WINDOW_MAX_SIG	((1 &lt;&lt; CPPC_AUTO_ACT_WINDOW_SIG_BIT_SIZE) - 1)</div><div class='add'>+#define CPPC_AUTO_ACT_WINDOW_MAX_EXP	((1 &lt;&lt; CPPC_AUTO_ACT_WINDOW_EXP_BIT_SIZE) - 1)</div><div class='add'>+/* CPPC_AUTO_ACT_WINDOW_MAX_SIG is 127, so 128 and 129 will decay to 127 when writing */</div><div class='add'>+#define CPPC_AUTO_ACT_WINDOW_SIG_CARRY_THRESH 129</div><div class='add'>+</div><div class='add'>+#define CPPC_ENERGY_PERF_MAX	(0xFF)</div><div class='add'>+</div><div class='ctx'> /* Each register has the folowing format. */</div><div class='ctx'> struct cpc_reg {</div><div class='ctx'> 	u8 descriptor;</div><div class='hunk'>@@ -64,6 +73,8 @@ struct cpc_desc {</div><div class='ctx'> 	int cpu_id;</div><div class='ctx'> 	int write_cmd_status;</div><div class='ctx'> 	int write_cmd_id;</div><div class='add'>+	/* Lock used for RMW operations in cpc_write() */</div><div class='add'>+	raw_spinlock_t rmw_lock;</div><div class='ctx'> 	struct cpc_register_resource cpc_regs[MAX_CPC_REG_ENT];</div><div class='ctx'> 	struct acpi_psd_package domain_info;</div><div class='ctx'> 	struct kobject kobj;</div><div class='hunk'>@@ -128,7 +139,6 @@ struct cppc_perf_fb_ctrs {</div><div class='ctx'> </div><div class='ctx'> /* Per CPU container for runtime CPPC management. */</div><div class='ctx'> struct cppc_cpudata {</div><div class='del'>-	struct list_head node;</div><div class='ctx'> 	struct cppc_perf_caps perf_caps;</div><div class='ctx'> 	struct cppc_perf_ctrls perf_ctrls;</div><div class='ctx'> 	struct cppc_perf_fb_ctrs perf_fb_ctrs;</div><div class='hunk'>@@ -150,43 +160,49 @@ extern unsigned int cppc_khz_to_perf(struct cppc_perf_caps *caps, unsigned int f</div><div class='ctx'> extern bool acpi_cpc_valid(void);</div><div class='ctx'> extern bool cppc_allow_fast_switch(void);</div><div class='ctx'> extern int acpi_get_psd_map(unsigned int cpu, struct cppc_cpudata *cpu_data);</div><div class='del'>-extern unsigned int cppc_get_transition_latency(int cpu);</div><div class='add'>+extern int cppc_get_transition_latency(int cpu);</div><div class='ctx'> extern bool cpc_ffh_supported(void);</div><div class='ctx'> extern bool cpc_supported_by_cpu(void);</div><div class='ctx'> extern int cpc_read_ffh(int cpunum, struct cpc_reg *reg, u64 *val);</div><div class='ctx'> extern int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val);</div><div class='ctx'> extern int cppc_get_epp_perf(int cpunum, u64 *epp_perf);</div><div class='ctx'> extern int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable);</div><div class='del'>-extern int cppc_get_auto_sel_caps(int cpunum, struct cppc_perf_caps *perf_caps);</div><div class='add'>+extern int cppc_set_epp(int cpu, u64 epp_val);</div><div class='add'>+extern int cppc_get_auto_act_window(int cpu, u64 *auto_act_window);</div><div class='add'>+extern int cppc_set_auto_act_window(int cpu, u64 auto_act_window);</div><div class='add'>+extern int cppc_get_auto_sel(int cpu, bool *enable);</div><div class='ctx'> extern int cppc_set_auto_sel(int cpu, bool enable);</div><div class='add'>+extern int amd_get_highest_perf(unsigned int cpu, u32 *highest_perf);</div><div class='add'>+extern int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator);</div><div class='add'>+extern int amd_detect_prefcore(bool *detected);</div><div class='ctx'> #else /* !CONFIG_ACPI_CPPC_LIB */</div><div class='ctx'> static inline int cppc_get_desired_perf(int cpunum, u64 *desired_perf)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_get_highest_perf(int cpunum, u64 *highest_perf)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_get_perf_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_set_enable(int cpu, bool enable)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_get_perf_caps(int cpu, struct cppc_perf_caps *caps)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline bool cppc_perf_ctrs_in_pcc(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -200,9 +216,9 @@ static inline bool cppc_allow_fast_switch(void)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-static inline unsigned int cppc_get_transition_latency(int cpu)</div><div class='add'>+static inline int cppc_get_transition_latency(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return CPUFREQ_ETERNAL;</div><div class='add'>+	return -ENODATA;</div><div class='ctx'> }</div><div class='ctx'> static inline bool cpc_ffh_supported(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -210,27 +226,51 @@ static inline bool cpc_ffh_supported(void)</div><div class='ctx'> }</div><div class='ctx'> static inline int cpc_read_ffh(int cpunum, struct cpc_reg *reg, u64 *val)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_get_epp_perf(int cpunum, u64 *epp_perf)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int cppc_set_epp(int cpu, u64 epp_val)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int cppc_get_auto_act_window(int cpu, u64 *auto_act_window)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int cppc_set_auto_act_window(int cpu, u64 auto_act_window)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int cppc_get_auto_sel(int cpu, bool *enable)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int cppc_set_auto_sel(int cpu, bool enable)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int amd_get_highest_perf(unsigned int cpu, u32 *highest_perf)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static inline int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-static inline int cppc_get_auto_sel_caps(int cpunum, struct cppc_perf_caps *perf_caps)</div><div class='add'>+static inline int amd_detect_prefcore(bool *detected)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> #endif /* !CONFIG_ACPI_CPPC_LIB */</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h<br/>index be1dd4c1a917..ebd21b05fe6e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/ghes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/ghes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/ghes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/ghes.h</a></div><div class='hunk'>@@ -35,9 +35,6 @@ struct ghes_estatus_node {</div><div class='ctx'> 	struct llist_node llnode;</div><div class='ctx'> 	struct acpi_hest_generic *generic;</div><div class='ctx'> 	struct ghes *ghes;</div><div class='del'>-</div><div class='del'>-	int task_work_cpu;</div><div class='del'>-	struct callback_head task_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ghes_estatus_cache {</div><div class='head'>diff --git a/include/acpi/nhlt.h b/include/acpi/nhlt.h<br/>new file mode 100644<br/>index 000000000000..2108aa6d0207<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/nhlt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/nhlt.h</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2023-2024 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ * Authors: Cezary Rojewski &lt;cezary.rojewski@intel.com&gt;</div><div class='add'>+ *          Amadeusz Slawinski &lt;amadeuszx.slawinski@linux.intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ACPI_NHLT_H__</div><div class='add'>+#define __ACPI_NHLT_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/kconfig.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define __acpi_nhlt_endpoint_config(ep)		((void *)((ep) + 1))</div><div class='add'>+#define __acpi_nhlt_config_caps(cfg)		((void *)((cfg) + 1))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acpi_nhlt_endpoint_fmtscfg - Get the formats configuration space.</div><div class='add'>+ * @ep:		the endpoint to retrieve the space for.</div><div class='add'>+ *</div><div class='add'>+ * Return: A pointer to the formats configuration space.</div><div class='add'>+ */</div><div class='add'>+static inline struct acpi_nhlt_formats_config *</div><div class='add'>+acpi_nhlt_endpoint_fmtscfg(const struct acpi_nhlt_endpoint *ep)</div><div class='add'>+{</div><div class='add'>+	struct acpi_nhlt_config *cfg = __acpi_nhlt_endpoint_config(ep);</div><div class='add'>+</div><div class='add'>+	return (struct acpi_nhlt_formats_config *)((u8 *)(cfg + 1) + cfg-&gt;capabilities_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __acpi_nhlt_first_endpoint(tb) \</div><div class='add'>+	((void *)(tb + 1))</div><div class='add'>+</div><div class='add'>+#define __acpi_nhlt_next_endpoint(ep) \</div><div class='add'>+	((void *)((u8 *)(ep) + (ep)-&gt;length))</div><div class='add'>+</div><div class='add'>+#define __acpi_nhlt_get_endpoint(tb, ep, i) \</div><div class='add'>+	((i) ? __acpi_nhlt_next_endpoint(ep) : __acpi_nhlt_first_endpoint(tb))</div><div class='add'>+</div><div class='add'>+#define __acpi_nhlt_first_fmtcfg(fmts) \</div><div class='add'>+	((void *)(fmts + 1))</div><div class='add'>+</div><div class='add'>+#define __acpi_nhlt_next_fmtcfg(fmt) \</div><div class='add'>+	((void *)((u8 *)((fmt) + 1) + (fmt)-&gt;config.capabilities_size))</div><div class='add'>+</div><div class='add'>+#define __acpi_nhlt_get_fmtcfg(fmts, fmt, i) \</div><div class='add'>+	((i) ? __acpi_nhlt_next_fmtcfg(fmt) : __acpi_nhlt_first_fmtcfg(fmts))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The for_each_nhlt_*() macros rely on an iterator to deal with the</div><div class='add'>+ * variable length of each endpoint structure and the possible presence</div><div class='add'>+ * of an OED-Config used by Windows only.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * for_each_nhlt_endpoint - Iterate over endpoints in a NHLT table.</div><div class='add'>+ * @tb:		the pointer to a NHLT table.</div><div class='add'>+ * @ep:		the pointer to endpoint to use as loop cursor.</div><div class='add'>+ */</div><div class='add'>+#define for_each_nhlt_endpoint(tb, ep)					\</div><div class='add'>+	for (unsigned int __i = 0;					\</div><div class='add'>+	     __i &lt; (tb)-&gt;endpoints_count &amp;&amp;				\</div><div class='add'>+		(ep = __acpi_nhlt_get_endpoint(tb, ep, __i));		\</div><div class='add'>+	     __i++)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * for_each_nhlt_fmtcfg - Iterate over format configurations.</div><div class='add'>+ * @fmts:	the pointer to formats configuration space.</div><div class='add'>+ * @fmt:	the pointer to format to use as loop cursor.</div><div class='add'>+ */</div><div class='add'>+#define for_each_nhlt_fmtcfg(fmts, fmt)					\</div><div class='add'>+	for (unsigned int __i = 0;					\</div><div class='add'>+	     __i &lt; (fmts)-&gt;formats_count &amp;&amp;				\</div><div class='add'>+		(fmt = __acpi_nhlt_get_fmtcfg(fmts, fmt, __i));	\</div><div class='add'>+	     __i++)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * for_each_nhlt_endpoint_fmtcfg - Iterate over format configurations in an endpoint.</div><div class='add'>+ * @ep:		the pointer to an endpoint.</div><div class='add'>+ * @fmt:	the pointer to format to use as loop cursor.</div><div class='add'>+ */</div><div class='add'>+#define for_each_nhlt_endpoint_fmtcfg(ep, fmt) \</div><div class='add'>+	for_each_nhlt_fmtcfg(acpi_nhlt_endpoint_fmtscfg(ep), fmt)</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_ACPI_NHLT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * System-wide pointer to the first NHLT table.</div><div class='add'>+ *</div><div class='add'>+ * A sound driver may utilize acpi_nhlt_get/put_gbl_table() on its</div><div class='add'>+ * initialization and removal respectively to avoid excessive mapping</div><div class='add'>+ * and unmapping of the memory occupied by the table between streaming</div><div class='add'>+ * operations.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+acpi_status acpi_nhlt_get_gbl_table(void);</div><div class='add'>+void acpi_nhlt_put_gbl_table(void);</div><div class='add'>+</div><div class='add'>+bool acpi_nhlt_endpoint_match(const struct acpi_nhlt_endpoint *ep,</div><div class='add'>+			      int link_type, int dev_type, int dir, int bus_id);</div><div class='add'>+struct acpi_nhlt_endpoint *</div><div class='add'>+acpi_nhlt_tb_find_endpoint(const struct acpi_table_nhlt *tb,</div><div class='add'>+			   int link_type, int dev_type, int dir, int bus_id);</div><div class='add'>+struct acpi_nhlt_endpoint *</div><div class='add'>+acpi_nhlt_find_endpoint(int link_type, int dev_type, int dir, int bus_id);</div><div class='add'>+struct acpi_nhlt_format_config *</div><div class='add'>+acpi_nhlt_endpoint_find_fmtcfg(const struct acpi_nhlt_endpoint *ep,</div><div class='add'>+			       u16 ch, u32 rate, u16 vbps, u16 bps);</div><div class='add'>+struct acpi_nhlt_format_config *</div><div class='add'>+acpi_nhlt_tb_find_fmtcfg(const struct acpi_table_nhlt *tb,</div><div class='add'>+			 int link_type, int dev_type, int dir, int bus_id,</div><div class='add'>+			 u16 ch, u32 rate, u16 vpbs, u16 bps);</div><div class='add'>+struct acpi_nhlt_format_config *</div><div class='add'>+acpi_nhlt_find_fmtcfg(int link_type, int dev_type, int dir, int bus_id,</div><div class='add'>+		      u16 ch, u32 rate, u16 vpbs, u16 bps);</div><div class='add'>+int acpi_nhlt_endpoint_mic_count(const struct acpi_nhlt_endpoint *ep);</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_ACPI_NHLT */</div><div class='add'>+</div><div class='add'>+static inline acpi_status acpi_nhlt_get_gbl_table(void)</div><div class='add'>+{</div><div class='add'>+	return AE_NOT_FOUND;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acpi_nhlt_put_gbl_table(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+acpi_nhlt_endpoint_match(const struct acpi_nhlt_endpoint *ep,</div><div class='add'>+			 int link_type, int dev_type, int dir, int bus_id)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct acpi_nhlt_endpoint *</div><div class='add'>+acpi_nhlt_tb_find_endpoint(const struct acpi_table_nhlt *tb,</div><div class='add'>+			   int link_type, int dev_type, int dir, int bus_id)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct acpi_nhlt_format_config *</div><div class='add'>+acpi_nhlt_endpoint_find_fmtcfg(const struct acpi_nhlt_endpoint *ep,</div><div class='add'>+			       u16 ch, u32 rate, u16 vbps, u16 bps)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct acpi_nhlt_format_config *</div><div class='add'>+acpi_nhlt_tb_find_fmtcfg(const struct acpi_table_nhlt *tb,</div><div class='add'>+			 int link_type, int dev_type, int dir, int bus_id,</div><div class='add'>+			 u16 ch, u32 rate, u16 vpbs, u16 bps)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int acpi_nhlt_endpoint_mic_count(const struct acpi_nhlt_endpoint *ep)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct acpi_nhlt_endpoint *</div><div class='add'>+acpi_nhlt_find_endpoint(int link_type, int dev_type, int dir, int bus_id)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct acpi_nhlt_format_config *</div><div class='add'>+acpi_nhlt_find_fmtcfg(int link_type, int dev_type, int dir, int bus_id,</div><div class='add'>+		      u16 ch, u32 rate, u16 vpbs, u16 bps)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ACPI_NHLT */</div><div class='add'>+</div><div class='add'>+#endif /* __ACPI_NHLT_H__ */</div><div class='head'>diff --git a/include/acpi/pcc.h b/include/acpi/pcc.h<br/>index 9b373d172a77..9af3b502f839 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/pcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/pcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/pcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/pcc.h</a></div><div class='hunk'>@@ -12,10 +12,40 @@</div><div class='ctx'> struct pcc_mbox_chan {</div><div class='ctx'> 	struct mbox_chan *mchan;</div><div class='ctx'> 	u64 shmem_base_addr;</div><div class='add'>+	void __iomem *shmem;</div><div class='ctx'> 	u64 shmem_size;</div><div class='ctx'> 	u32 latency;</div><div class='ctx'> 	u32 max_access_rate;</div><div class='ctx'> 	u16 min_turnaround_time;</div><div class='add'>+</div><div class='add'>+	/* Set to true to indicate that the mailbox should manage</div><div class='add'>+	 * writing the dat to the shared buffer. This differs from</div><div class='add'>+	 * the case where the drivesr are writing to the buffer and</div><div class='add'>+	 * using send_data only to  ring the doorbell.  If this flag</div><div class='add'>+	 * is set, then the void * data parameter of send_data must</div><div class='add'>+	 * point to a kernel-memory buffer formatted in accordance with</div><div class='add'>+	 * the PCC specification.</div><div class='add'>+	 *</div><div class='add'>+	 * The active buffer management will include reading the</div><div class='add'>+	 * notify_on_completion flag, and will then</div><div class='add'>+	 * call mbox_chan_txdone when the acknowledgment interrupt is</div><div class='add'>+	 * received.</div><div class='add'>+	 */</div><div class='add'>+	bool manage_writes;</div><div class='add'>+</div><div class='add'>+	/* Optional callback that allows the driver</div><div class='add'>+	 * to allocate the memory used for receiving</div><div class='add'>+	 * messages.  The return value is the location</div><div class='add'>+	 * inside the buffer where the mailbox should write the data.</div><div class='add'>+	 */</div><div class='add'>+	void *(*rx_alloc)(struct mbox_client *cl,  int size);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pcc_header {</div><div class='add'>+	u32 signature;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 length;</div><div class='add'>+	u32 command;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Generic Communications Channel Shared Memory Region */</div><div class='head'>diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h<br/>index 337ffa931ee8..a11fa83955f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/acenv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/acenv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/acenv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/platform/acenv.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acenv.h - Host and compiler configuration</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -252,6 +252,12 @@</div><div class='ctx'> #define ACPI_RELEASE_GLOBAL_LOCK(Glptr, pending) pending = 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* NULL/invalid value to use for destroyed or not-yet-created semaphores. */</div><div class='add'>+</div><div class='add'>+#ifndef ACPI_SEMAPHORE_NULL</div><div class='add'>+#define ACPI_SEMAPHORE_NULL NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Flush CPU cache - used when going to sleep. Wbinvd or similar. */</div><div class='ctx'> </div><div class='ctx'> #ifndef ACPI_FLUSH_CPU_CACHE</div><div class='head'>diff --git a/include/acpi/platform/acenvex.h b/include/acpi/platform/acenvex.h<br/>index 7e67e3503f7b..8ffc4e1c87cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/acenvex.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/acenvex.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/acenvex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/platform/acenvex.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acenvex.h - Extra host and compiler configuration</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h<br/>index 04b4bf620517..8e4cf2f6b383 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/acgcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/acgcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/acgcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/platform/acgcc.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acgcc.h - GCC specific defines, etc.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -72,4 +72,12 @@</div><div class='ctx'>                 TYPE NAME[];                    \</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Explicitly mark strings that lack a terminating NUL character so</div><div class='add'>+ * that ACPICA can be built with -Wunterminated-string-initialization.</div><div class='add'>+ */</div><div class='add'>+#if __has_attribute(__nonstring__)</div><div class='add'>+#define ACPI_NONSTRING __attribute__((__nonstring__))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif				/* __ACGCC_H__ */</div><div class='head'>diff --git a/include/acpi/platform/acgccex.h b/include/acpi/platform/acgccex.h<br/>index 7c9f10e9633a..4a3c019a4d03 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/acgccex.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/acgccex.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/acgccex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/platform/acgccex.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: acgccex.h - Extra GCC specific defines, etc.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h<br/>index 565341c826e3..edbbc9061d1e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/aclinux.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/aclinux.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/aclinux.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/platform/aclinux.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: aclinux.h - OS specific defines, etc. for Linux</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> /* ACPICA external files should not include ACPICA headers directly. */</div><div class='ctx'> </div><div class='ctx'> #if !defined(BUILDING_ACPICA) &amp;&amp; !defined(_LINUX_ACPI_H)</div><div class='del'>-#error "Please don't include &lt;acpi/acpi.h&gt; directly, include &lt;linux/acpi.h&gt; instead."</div><div class='add'>+#error "Please do not include &lt;acpi/acpi.h&gt; directly, include &lt;linux/acpi.h&gt; instead."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/acpi/platform/aclinuxex.h b/include/acpi/platform/aclinuxex.h<br/>index 600d4e2641da..73265650f46b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/aclinuxex.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/aclinuxex.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/aclinuxex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/platform/aclinuxex.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Name: aclinuxex.h - Extra OS specific defines, etc. for Linux</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -46,28 +46,24 @@ acpi_status acpi_os_terminate(void);</div><div class='ctx'>  * Interrupts are off during resume, just like they are for boot.</div><div class='ctx'>  * However, boot has  (system_state != SYSTEM_RUNNING)</div><div class='ctx'>  * to quiet __might_sleep() in kmalloc() and resume does not.</div><div class='add'>+ *</div><div class='add'>+ * These specialized allocators have to be macros for their allocations to be</div><div class='add'>+ * accounted separately (to have separate alloc_tag).</div><div class='ctx'>  */</div><div class='del'>-static inline void *acpi_os_allocate(acpi_size size)</div><div class='del'>-{</div><div class='del'>-	return kmalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);</div><div class='del'>-}</div><div class='add'>+#define acpi_os_allocate(_size)	\</div><div class='add'>+		kmalloc(_size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL)</div><div class='ctx'> </div><div class='del'>-static inline void *acpi_os_allocate_zeroed(acpi_size size)</div><div class='del'>-{</div><div class='del'>-	return kzalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);</div><div class='del'>-}</div><div class='add'>+#define acpi_os_allocate_zeroed(_size)	\</div><div class='add'>+		kzalloc(_size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL)</div><div class='add'>+</div><div class='add'>+#define acpi_os_acquire_object(_cache)	\</div><div class='add'>+		kmem_cache_zalloc(_cache, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL)</div><div class='ctx'> </div><div class='ctx'> static inline void acpi_os_free(void *memory)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(memory);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *acpi_os_acquire_object(acpi_cache_t * cache)</div><div class='del'>-{</div><div class='del'>-	return kmem_cache_zalloc(cache,</div><div class='del'>-				 irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline acpi_thread_id acpi_os_get_thread_id(void)</div><div class='ctx'> {</div><div class='ctx'> 	return (acpi_thread_id) (unsigned long)current;</div><div class='head'>diff --git a/include/acpi/platform/aczephyr.h b/include/acpi/platform/aczephyr.h<br/>index 703db4dc740d..03d9a4a39c80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/aczephyr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/platform/aczephyr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/platform/aczephyr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/platform/aczephyr.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Module Name: aczephyr.h - OS specific defines, etc.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2000 - 2023, Intel Corp.</div><div class='add'>+ * Copyright (C) 2000 - 2025, Intel Corp.</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/include/acpi/processor.h b/include/acpi/processor.h<br/>index 3f34ebb27525..d0eccbd920e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/processor.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/processor.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/processor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/processor.h</a></div><div class='hunk'>@@ -217,7 +217,7 @@ struct acpi_processor_flags {</div><div class='ctx'> 	u8 has_lpi:1;</div><div class='ctx'> 	u8 power_setup_done:1;</div><div class='ctx'> 	u8 bm_rld_set:1;</div><div class='del'>-	u8 need_hotplug_init:1;</div><div class='add'>+	u8 previously_online:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_processor {</div><div class='hunk'>@@ -280,6 +280,7 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu,</div><div class='ctx'> 				    struct acpi_processor_cx *cx,</div><div class='ctx'> 				    struct acpi_power_register *reg);</div><div class='ctx'> void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cstate);</div><div class='add'>+void __noreturn acpi_processor_ffh_play_dead(struct acpi_processor_cx *cx);</div><div class='ctx'> #else</div><div class='ctx'> static inline void acpi_processor_power_init_bm_check(struct</div><div class='ctx'> 						      acpi_processor_flags</div><div class='hunk'>@@ -300,6 +301,10 @@ static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx</div><div class='ctx'> {</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='add'>+static inline void __noreturn acpi_processor_ffh_play_dead(struct acpi_processor_cx *cx)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline int call_on_cpu(int cpu, long (*fn)(void *), void *arg,</div><div class='hunk'>@@ -465,4 +470,6 @@ extern int acpi_processor_ffh_lpi_probe(unsigned int cpu);</div><div class='ctx'> extern int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+void acpi_processor_init_invariance_cppc(void);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/acpi/video.h b/include/acpi/video.h<br/>index 3d538d4178ab..044c463138df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/acpi/video.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/acpi/video.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/acpi/video.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/acpi/video.h</a></div><div class='hunk'>@@ -50,6 +50,7 @@ enum acpi_backlight_type {</div><div class='ctx'> 	acpi_backlight_native,</div><div class='ctx'> 	acpi_backlight_nvidia_wmi_ec,</div><div class='ctx'> 	acpi_backlight_apple_gmux,</div><div class='add'>+	acpi_backlight_dell_uart,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_ACPI_VIDEO)</div><div class='head'>diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild<br/>index d436bee4d129..295c94a3ccc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/Kbuild?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/Kbuild</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/Kbuild?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/Kbuild</a></div><div class='hunk'>@@ -9,7 +9,6 @@ mandatory-y += archrandom.h</div><div class='ctx'> mandatory-y += barrier.h</div><div class='ctx'> mandatory-y += bitops.h</div><div class='ctx'> mandatory-y += bug.h</div><div class='del'>-mandatory-y += bugs.h</div><div class='ctx'> mandatory-y += cacheflush.h</div><div class='ctx'> mandatory-y += cfi.h</div><div class='ctx'> mandatory-y += checksum.h</div><div class='hunk'>@@ -22,7 +21,6 @@ mandatory-y += dma-mapping.h</div><div class='ctx'> mandatory-y += dma.h</div><div class='ctx'> mandatory-y += emergency-restart.h</div><div class='ctx'> mandatory-y += exec.h</div><div class='del'>-mandatory-y += fb.h</div><div class='ctx'> mandatory-y += ftrace.h</div><div class='ctx'> mandatory-y += futex.h</div><div class='ctx'> mandatory-y += hardirq.h</div><div class='hunk'>@@ -47,6 +45,8 @@ mandatory-y += pci.h</div><div class='ctx'> mandatory-y += percpu.h</div><div class='ctx'> mandatory-y += pgalloc.h</div><div class='ctx'> mandatory-y += preempt.h</div><div class='add'>+mandatory-y += rqspinlock.h</div><div class='add'>+mandatory-y += runtime-const.h</div><div class='ctx'> mandatory-y += rwonce.h</div><div class='ctx'> mandatory-y += sections.h</div><div class='ctx'> mandatory-y += serial.h</div><div class='hunk'>@@ -59,8 +59,9 @@ mandatory-y += tlbflush.h</div><div class='ctx'> mandatory-y += topology.h</div><div class='ctx'> mandatory-y += trace_clock.h</div><div class='ctx'> mandatory-y += uaccess.h</div><div class='del'>-mandatory-y += unaligned.h</div><div class='add'>+mandatory-y += unwind_user.h</div><div class='ctx'> mandatory-y += vermagic.h</div><div class='ctx'> mandatory-y += vga.h</div><div class='add'>+mandatory-y += video.h</div><div class='ctx'> mandatory-y += word-at-a-time.h</div><div class='ctx'> mandatory-y += xor.h</div><div class='head'>diff --git a/include/asm-generic/audit_change_attr.h b/include/asm-generic/audit_change_attr.h<br/>index 331670807cf0..cc840537885f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/audit_change_attr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/audit_change_attr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/audit_change_attr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/audit_change_attr.h</a></div><div class='hunk'>@@ -11,9 +11,15 @@ __NR_lchown,</div><div class='ctx'> __NR_fchown,</div><div class='ctx'> #endif</div><div class='ctx'> __NR_setxattr,</div><div class='add'>+#ifdef __NR_setxattrat</div><div class='add'>+__NR_setxattrat,</div><div class='add'>+#endif</div><div class='ctx'> __NR_lsetxattr,</div><div class='ctx'> __NR_fsetxattr,</div><div class='ctx'> __NR_removexattr,</div><div class='add'>+#ifdef __NR_removexattrat</div><div class='add'>+__NR_removexattrat,</div><div class='add'>+#endif</div><div class='ctx'> __NR_lremovexattr,</div><div class='ctx'> __NR_fremovexattr,</div><div class='ctx'> #ifdef __NR_fchownat</div><div class='head'>diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h<br/>index 0c0695763bea..d4f581c1e21d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/barrier.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/barrier.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/barrier.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/barrier.h</a></div><div class='hunk'>@@ -294,5 +294,13 @@ do {									\</div><div class='ctx'> #define io_stop_wc() do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Architectures that guarantee an implicit smp_mb() in switch_mm()</div><div class='add'>+ * can override smp_mb__after_switch_mm.</div><div class='add'>+ */</div><div class='add'>+#ifndef smp_mb__after_switch_mm</div><div class='add'>+# define smp_mb__after_switch_mm()	smp_mb()</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> #endif /* __ASM_GENERIC_BARRIER_H */</div><div class='head'>diff --git a/include/asm-generic/bitops/__ffs.h b/include/asm-generic/bitops/__ffs.h<br/>index 39e56e1c7203..3a899c626fdc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/__ffs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/__ffs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/__ffs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bitops/__ffs.h</a></div><div class='hunk'>@@ -5,14 +5,14 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __ffs - find first bit in word.</div><div class='add'>+ * generic___ffs - find first bit in word.</div><div class='ctx'>  * @word: The word to search</div><div class='ctx'>  *</div><div class='ctx'>  * Undefined if no bit exists, so code should check against 0 first.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline unsigned long __ffs(unsigned long word)</div><div class='add'>+static __always_inline __attribute_const__ unsigned int generic___ffs(unsigned long word)</div><div class='ctx'> {</div><div class='del'>-	int num = 0;</div><div class='add'>+	unsigned int num = 0;</div><div class='ctx'> </div><div class='ctx'> #if BITS_PER_LONG == 64</div><div class='ctx'> 	if ((word &amp; 0xffffffff) == 0) {</div><div class='hunk'>@@ -41,4 +41,8 @@ static __always_inline unsigned long __ffs(unsigned long word)</div><div class='ctx'> 	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef __HAVE_ARCH___FFS</div><div class='add'>+#define __ffs(word) generic___ffs(word)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_GENERIC_BITOPS___FFS_H_ */</div><div class='head'>diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h<br/>index 03f721a8a2b1..35f33780ca6c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/__fls.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/__fls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/__fls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bitops/__fls.h</a></div><div class='hunk'>@@ -5,14 +5,14 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __fls - find last (most-significant) set bit in a long word</div><div class='add'>+ * generic___fls - find last (most-significant) set bit in a long word</div><div class='ctx'>  * @word: the word to search</div><div class='ctx'>  *</div><div class='ctx'>  * Undefined if no set bit exists, so code should check against 0 first.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline unsigned long __fls(unsigned long word)</div><div class='add'>+static __always_inline __attribute_const__ unsigned int generic___fls(unsigned long word)</div><div class='ctx'> {</div><div class='del'>-	int num = BITS_PER_LONG - 1;</div><div class='add'>+	unsigned int num = BITS_PER_LONG - 1;</div><div class='ctx'> </div><div class='ctx'> #if BITS_PER_LONG == 64</div><div class='ctx'> 	if (!(word &amp; (~0ul &lt;&lt; 32))) {</div><div class='hunk'>@@ -41,4 +41,8 @@ static __always_inline unsigned long __fls(unsigned long word)</div><div class='ctx'> 	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef __HAVE_ARCH___FLS</div><div class='add'>+#define __fls(word) generic___fls(word)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_GENERIC_BITOPS___FLS_H_ */</div><div class='head'>diff --git a/include/asm-generic/bitops/builtin-__ffs.h b/include/asm-generic/bitops/builtin-__ffs.h<br/>index 87024da44d10..d3c3f567045d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/builtin-__ffs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/builtin-__ffs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/builtin-__ffs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bitops/builtin-__ffs.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Undefined if no bit exists, so code should check against 0 first.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline unsigned long __ffs(unsigned long word)</div><div class='add'>+static __always_inline __attribute_const__ unsigned int __ffs(unsigned long word)</div><div class='ctx'> {</div><div class='ctx'> 	return __builtin_ctzl(word);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/asm-generic/bitops/builtin-__fls.h b/include/asm-generic/bitops/builtin-__fls.h<br/>index 43a5aa9afbdb..7770c4f1bfcd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/builtin-__fls.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/builtin-__fls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/builtin-__fls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bitops/builtin-__fls.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Undefined if no set bit exists, so code should check against 0 first.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline unsigned long __fls(unsigned long word)</div><div class='add'>+static __always_inline __attribute_const__ unsigned int __fls(unsigned long word)</div><div class='ctx'> {</div><div class='ctx'> 	return (sizeof(word) * 8) - 1 - __builtin_clzl(word);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/asm-generic/bitops/builtin-fls.h b/include/asm-generic/bitops/builtin-fls.h<br/>index c8455cc28841..be707da8c7cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/builtin-fls.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/builtin-fls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/builtin-fls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bitops/builtin-fls.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * This is defined the same way as ffs.</div><div class='ctx'>  * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline int fls(unsigned int x)</div><div class='add'>+static __always_inline __attribute_const__ int fls(unsigned int x)</div><div class='ctx'> {</div><div class='ctx'> 	return x ? sizeof(x) * 8 - __builtin_clz(x) : 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/asm-generic/bitops/ffs.h b/include/asm-generic/bitops/ffs.h<br/>index 323fd5d6ae26..5ff2b7fbda6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/ffs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/ffs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/ffs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bitops/ffs.h</a></div><div class='hunk'>@@ -3,14 +3,14 @@</div><div class='ctx'> #define _ASM_GENERIC_BITOPS_FFS_H_</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ffs - find first bit set</div><div class='add'>+ * generic_ffs - find first bit set</div><div class='ctx'>  * @x: the word to search</div><div class='ctx'>  *</div><div class='ctx'>  * This is defined the same way as</div><div class='ctx'>  * the libc and compiler builtin ffs routines, therefore</div><div class='ctx'>  * differs in spirit from ffz (man ffs).</div><div class='ctx'>  */</div><div class='del'>-static inline int ffs(int x)</div><div class='add'>+static inline __attribute_const__ int generic_ffs(int x)</div><div class='ctx'> {</div><div class='ctx'> 	int r = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -39,4 +39,8 @@ static inline int ffs(int x)</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef __HAVE_ARCH_FFS</div><div class='add'>+#define ffs(x) generic_ffs(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_GENERIC_BITOPS_FFS_H_ */</div><div class='head'>diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h<br/>index b168bb10e1be..8eed3437edb9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/fls.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/fls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/fls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bitops/fls.h</a></div><div class='hunk'>@@ -3,14 +3,14 @@</div><div class='ctx'> #define _ASM_GENERIC_BITOPS_FLS_H_</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * fls - find last (most-significant) bit set</div><div class='add'>+ * generic_fls - find last (most-significant) bit set</div><div class='ctx'>  * @x: the word to search</div><div class='ctx'>  *</div><div class='ctx'>  * This is defined the same way as ffs.</div><div class='ctx'>  * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static __always_inline int fls(unsigned int x)</div><div class='add'>+static __always_inline __attribute_const__ int generic_fls(unsigned int x)</div><div class='ctx'> {</div><div class='ctx'> 	int r = 32;</div><div class='ctx'> </div><div class='hunk'>@@ -39,4 +39,8 @@ static __always_inline int fls(unsigned int x)</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef __HAVE_ARCH_FLS</div><div class='add'>+#define fls(x) generic_fls(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _ASM_GENERIC_BITOPS_FLS_H_ */</div><div class='head'>diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h<br/>index 866f2b2304ff..b5f58dd261a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/fls64.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bitops/fls64.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bitops/fls64.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bitops/fls64.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  * at position 64.</div><div class='ctx'>  */</div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='del'>-static __always_inline int fls64(__u64 x)</div><div class='add'>+static __always_inline __attribute_const__ int fls64(__u64 x)</div><div class='ctx'> {</div><div class='ctx'> 	__u32 h = x &gt;&gt; 32;</div><div class='ctx'> 	if (h)</div><div class='hunk'>@@ -24,7 +24,7 @@ static __always_inline int fls64(__u64 x)</div><div class='ctx'> 	return fls(x);</div><div class='ctx'> }</div><div class='ctx'> #elif BITS_PER_LONG == 64</div><div class='del'>-static __always_inline int fls64(__u64 x)</div><div class='add'>+static __always_inline __attribute_const__ int fls64(__u64 x)</div><div class='ctx'> {</div><div class='ctx'> 	if (x == 0)</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h<br/>index 6e794420bd39..09e8eccee8ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/bug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/bug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/bug.h</a></div><div class='hunk'>@@ -13,10 +13,19 @@</div><div class='ctx'> #define BUGFLAG_ONCE		(1 &lt;&lt; 1)</div><div class='ctx'> #define BUGFLAG_DONE		(1 &lt;&lt; 2)</div><div class='ctx'> #define BUGFLAG_NO_CUT_HERE	(1 &lt;&lt; 3)	/* CUT_HERE already sent */</div><div class='add'>+#define BUGFLAG_ARGS		(1 &lt;&lt; 4)</div><div class='ctx'> #define BUGFLAG_TAINT(taint)	((taint) &lt;&lt; 8)</div><div class='ctx'> #define BUG_GET_TAINT(bug)	((bug)-&gt;flags &gt;&gt; 8)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef WARN_CONDITION_STR</div><div class='add'>+#ifdef CONFIG_DEBUG_BUGVERBOSE_DETAILED</div><div class='add'>+# define WARN_CONDITION_STR(cond_str) "[" cond_str "] "</div><div class='add'>+#else</div><div class='add'>+# define WARN_CONDITION_STR(cond_str)</div><div class='add'>+#endif</div><div class='add'>+#endif /* WARN_CONDITION_STR */</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> #include &lt;linux/panic.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='hunk'>@@ -29,19 +38,20 @@ void __warn(const char *file, int line, void *caller, unsigned taint,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BUG</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_GENERIC_BUG</div><div class='del'>-struct bug_entry {</div><div class='ctx'> #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS</div><div class='del'>-	unsigned long	bug_addr;</div><div class='add'>+#define BUG_REL(type, name) type name</div><div class='ctx'> #else</div><div class='del'>-	signed int	bug_addr_disp;</div><div class='add'>+#define BUG_REL(type, name) signed int name##_disp</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_DEBUG_BUGVERBOSE</div><div class='del'>-#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS</div><div class='del'>-	const char	*file;</div><div class='del'>-#else</div><div class='del'>-	signed int	file_disp;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_GENERIC_BUG</div><div class='add'>+struct bug_entry {</div><div class='add'>+	BUG_REL(unsigned long, bug_addr);</div><div class='add'>+#ifdef HAVE_ARCH_BUG_FORMAT</div><div class='add'>+	BUG_REL(const char *, format);</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_DEBUG_BUGVERBOSE</div><div class='add'>+	BUG_REL(const char *, file);</div><div class='ctx'> 	unsigned short	line;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned short	flags;</div><div class='hunk'>@@ -72,7 +82,7 @@ struct bug_entry {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report</div><div class='add'>+ * WARN(), WARN_ON(), WARN_ON_ONCE(), and so on can be used to report</div><div class='ctx'>  * significant kernel issues that need prompt attention if they should ever</div><div class='ctx'>  * appear at runtime.</div><div class='ctx'>  *</div><div class='hunk'>@@ -92,28 +102,50 @@ void warn_slowpath_fmt(const char *file, const int line, unsigned taint,</div><div class='ctx'> 		       const char *fmt, ...);</div><div class='ctx'> extern __printf(1, 2) void __warn_printk(const char *fmt, ...);</div><div class='ctx'> </div><div class='del'>-#ifndef __WARN_FLAGS</div><div class='del'>-#define __WARN()		__WARN_printf(TAINT_WARN, NULL)</div><div class='add'>+#ifdef __WARN_FLAGS</div><div class='add'>+#define __WARN()		__WARN_FLAGS("", BUGFLAG_TAINT(TAINT_WARN))</div><div class='add'>+</div><div class='add'>+#ifndef WARN_ON</div><div class='add'>+#define WARN_ON(condition) ({						\</div><div class='add'>+	int __ret_warn_on = !!(condition);				\</div><div class='add'>+	if (unlikely(__ret_warn_on))					\</div><div class='add'>+		__WARN_FLAGS(#condition,				\</div><div class='add'>+			     BUGFLAG_TAINT(TAINT_WARN));		\</div><div class='add'>+	unlikely(__ret_warn_on);					\</div><div class='add'>+})</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef WARN_ON_ONCE</div><div class='add'>+#define WARN_ON_ONCE(condition) ({					\</div><div class='add'>+	int __ret_warn_on = !!(condition);				\</div><div class='add'>+	if (unlikely(__ret_warn_on))					\</div><div class='add'>+		__WARN_FLAGS(#condition,				\</div><div class='add'>+			     BUGFLAG_ONCE |				\</div><div class='add'>+			     BUGFLAG_TAINT(TAINT_WARN));		\</div><div class='add'>+	unlikely(__ret_warn_on);					\</div><div class='add'>+})</div><div class='add'>+#endif</div><div class='add'>+#endif /* __WARN_FLAGS */</div><div class='add'>+</div><div class='add'>+#if defined(__WARN_FLAGS) &amp;&amp; !defined(__WARN_printf)</div><div class='ctx'> #define __WARN_printf(taint, arg...) do {				\</div><div class='ctx'> 		instrumentation_begin();				\</div><div class='del'>-		warn_slowpath_fmt(__FILE__, __LINE__, taint, arg);	\</div><div class='add'>+		__warn_printk(arg);					\</div><div class='add'>+		__WARN_FLAGS("", BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\</div><div class='ctx'> 		instrumentation_end();					\</div><div class='ctx'> 	} while (0)</div><div class='del'>-#else</div><div class='del'>-#define __WARN()		__WARN_FLAGS(BUGFLAG_TAINT(TAINT_WARN))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __WARN_printf</div><div class='ctx'> #define __WARN_printf(taint, arg...) do {				\</div><div class='ctx'> 		instrumentation_begin();				\</div><div class='del'>-		__warn_printk(arg);					\</div><div class='del'>-		__WARN_FLAGS(BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\</div><div class='add'>+		warn_slowpath_fmt(__FILE__, __LINE__, taint, arg);	\</div><div class='ctx'> 		instrumentation_end();					\</div><div class='ctx'> 	} while (0)</div><div class='del'>-#define WARN_ON_ONCE(condition) ({				\</div><div class='del'>-	int __ret_warn_on = !!(condition);			\</div><div class='del'>-	if (unlikely(__ret_warn_on))				\</div><div class='del'>-		__WARN_FLAGS(BUGFLAG_ONCE |			\</div><div class='del'>-			     BUGFLAG_TAINT(TAINT_WARN));	\</div><div class='del'>-	unlikely(__ret_warn_on);				\</div><div class='del'>-})</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __WARN</div><div class='add'>+#define __WARN()		__WARN_printf(TAINT_WARN, NULL)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* used internally by panic.c */</div><div class='hunk'>@@ -148,15 +180,20 @@ extern __printf(1, 2) void __warn_printk(const char *fmt, ...);</div><div class='ctx'> 	DO_ONCE_LITE_IF(condition, WARN_ON, 1)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef WARN_ONCE</div><div class='ctx'> #define WARN_ONCE(condition, format...)				\</div><div class='ctx'> 	DO_ONCE_LITE_IF(condition, WARN, 1, format)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define WARN_TAINT_ONCE(condition, taint, format...)		\</div><div class='ctx'> 	DO_ONCE_LITE_IF(condition, WARN_TAINT, 1, taint, format)</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_BUG */</div><div class='ctx'> #ifndef HAVE_ARCH_BUG</div><div class='del'>-#define BUG() do {} while (1)</div><div class='add'>+#define BUG() do {		\</div><div class='add'>+	do {} while (1);	\</div><div class='add'>+	unreachable();		\</div><div class='add'>+} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef HAVE_ARCH_BUG_ON</div><div class='head'>diff --git a/include/asm-generic/codetag.lds.h b/include/asm-generic/codetag.lds.h<br/>new file mode 100644<br/>index 000000000000..a14f4bdafdda<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/codetag.lds.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/codetag.lds.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef __ASM_GENERIC_CODETAG_LDS_H</div><div class='add'>+#define __ASM_GENERIC_CODETAG_LDS_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING</div><div class='add'>+#define IF_MEM_ALLOC_PROFILING(...) __VA_ARGS__</div><div class='add'>+#else</div><div class='add'>+#define IF_MEM_ALLOC_PROFILING(...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define SECTION_WITH_BOUNDARIES(_name)	\</div><div class='add'>+	. = ALIGN(8);			\</div><div class='add'>+	__start_##_name = .;		\</div><div class='add'>+	KEEP(*(_name))			\</div><div class='add'>+	__stop_##_name = .;</div><div class='add'>+</div><div class='add'>+#define CODETAG_SECTIONS()		\</div><div class='add'>+	IF_MEM_ALLOC_PROFILING(SECTION_WITH_BOUNDARIES(alloc_tags))</div><div class='add'>+</div><div class='add'>+#define MOD_SEPARATE_CODETAG_SECTION(_name)	\</div><div class='add'>+	.codetag.##_name : {			\</div><div class='add'>+		SECTION_WITH_BOUNDARIES(_name)	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For codetags which might be used after module unload, therefore might stay</div><div class='add'>+ * longer in memory. Each such codetag type has its own section so that we can</div><div class='add'>+ * unload them individually once unused.</div><div class='add'>+ */</div><div class='add'>+#define MOD_SEPARATE_CODETAG_SECTIONS()		\</div><div class='add'>+	IF_MEM_ALLOC_PROFILING(MOD_SEPARATE_CODETAG_SECTION(alloc_tags))</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_GENERIC_CODETAG_LDS_H */</div><div class='head'>diff --git a/include/asm-generic/delay.h b/include/asm-generic/delay.h<br/>index e448ac61430c..03b0ec7afca6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/delay.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/delay.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/delay.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/delay.h</a></div><div class='hunk'>@@ -2,6 +2,9 @@</div><div class='ctx'> #ifndef __ASM_GENERIC_DELAY_H</div><div class='ctx'> #define __ASM_GENERIC_DELAY_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/math.h&gt;</div><div class='add'>+#include &lt;vdso/time64.h&gt;</div><div class='add'>+</div><div class='ctx'> /* Undefined functions to get compile-time errors */</div><div class='ctx'> extern void __bad_udelay(void);</div><div class='ctx'> extern void __bad_ndelay(void);</div><div class='hunk'>@@ -12,34 +15,73 @@ extern void __const_udelay(unsigned long xloops);</div><div class='ctx'> extern void __delay(unsigned long loops);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The weird n/20000 thing suppresses a "comparison is always false due to</div><div class='del'>- * limited range of data type" warning with non-const 8-bit arguments.</div><div class='add'>+ * The microseconds/nanosecond delay multiplicators are used to convert a</div><div class='add'>+ * constant microseconds/nanoseconds value to a value which can be used by the</div><div class='add'>+ * architectures specific implementation to transform it into loops.</div><div class='add'>+ */</div><div class='add'>+#define UDELAY_CONST_MULT	((unsigned long)DIV_ROUND_UP(1ULL &lt;&lt; 32, USEC_PER_SEC))</div><div class='add'>+#define NDELAY_CONST_MULT	((unsigned long)DIV_ROUND_UP(1ULL &lt;&lt; 32, NSEC_PER_SEC))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The maximum constant udelay/ndelay value picked out of thin air to prevent</div><div class='add'>+ * too long constant udelays/ndelays.</div><div class='ctx'>  */</div><div class='add'>+#define DELAY_CONST_MAX   20000</div><div class='ctx'> </div><div class='del'>-/* 0x10c7 is 2**32 / 1000000 (rounded up) */</div><div class='del'>-#define udelay(n)							\</div><div class='del'>-	({								\</div><div class='del'>-		if (__builtin_constant_p(n)) {				\</div><div class='del'>-			if ((n) / 20000 &gt;= 1)				\</div><div class='del'>-				 __bad_udelay();			\</div><div class='del'>-			else						\</div><div class='del'>-				__const_udelay((n) * 0x10c7ul);		\</div><div class='del'>-		} else {						\</div><div class='del'>-			__udelay(n);					\</div><div class='del'>-		}							\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-/* 0x5 is 2**32 / 1000000000 (rounded up) */</div><div class='del'>-#define ndelay(n)							\</div><div class='del'>-	({								\</div><div class='del'>-		if (__builtin_constant_p(n)) {				\</div><div class='del'>-			if ((n) / 20000 &gt;= 1)				\</div><div class='del'>-				__bad_ndelay();				\</div><div class='del'>-			else						\</div><div class='del'>-				__const_udelay((n) * 5ul);		\</div><div class='del'>-		} else {						\</div><div class='del'>-			__ndelay(n);					\</div><div class='del'>-		}							\</div><div class='del'>-	})</div><div class='add'>+/**</div><div class='add'>+ * udelay - Inserting a delay based on microseconds with busy waiting</div><div class='add'>+ * @usec:	requested delay in microseconds</div><div class='add'>+ *</div><div class='add'>+ * When delaying in an atomic context ndelay(), udelay() and mdelay() are the</div><div class='add'>+ * only valid variants of delaying/sleeping to go with.</div><div class='add'>+ *</div><div class='add'>+ * When inserting delays in non atomic context which are shorter than the time</div><div class='add'>+ * which is required to queue e.g. an hrtimer and to enter then the scheduler,</div><div class='add'>+ * it is also valuable to use udelay(). But it is not simple to specify a</div><div class='add'>+ * generic threshold for this which will fit for all systems. An approximation</div><div class='add'>+ * is a threshold for all delays up to 10 microseconds.</div><div class='add'>+ *</div><div class='add'>+ * When having a delay which is larger than the architecture specific</div><div class='add'>+ * %MAX_UDELAY_MS value, please make sure mdelay() is used. Otherwise a overflow</div><div class='add'>+ * risk is given.</div><div class='add'>+ *</div><div class='add'>+ * Please note that ndelay(), udelay() and mdelay() may return early for several</div><div class='add'>+ * reasons (https://lists.openwall.net/linux-kernel/2011/01/09/56):</div><div class='add'>+ *</div><div class='add'>+ * #. computed loops_per_jiffy too low (due to the time taken to execute the</div><div class='add'>+ *    timer interrupt.)</div><div class='add'>+ * #. cache behaviour affecting the time it takes to execute the loop function.</div><div class='add'>+ * #. CPU clock rate changes.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void udelay(unsigned long usec)</div><div class='add'>+{</div><div class='add'>+	if (__builtin_constant_p(usec)) {</div><div class='add'>+		if (usec &gt;= DELAY_CONST_MAX)</div><div class='add'>+			__bad_udelay();</div><div class='add'>+		else</div><div class='add'>+			__const_udelay(usec * UDELAY_CONST_MULT);</div><div class='add'>+	} else {</div><div class='add'>+		__udelay(usec);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ndelay - Inserting a delay based on nanoseconds with busy waiting</div><div class='add'>+ * @nsec:	requested delay in nanoseconds</div><div class='add'>+ *</div><div class='add'>+ * See udelay() for basic information about ndelay() and it's variants.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void ndelay(unsigned long nsec)</div><div class='add'>+{</div><div class='add'>+	if (__builtin_constant_p(nsec)) {</div><div class='add'>+		if (nsec &gt;= DELAY_CONST_MAX)</div><div class='add'>+			__bad_ndelay();</div><div class='add'>+		else</div><div class='add'>+			__const_udelay(nsec * NDELAY_CONST_MULT);</div><div class='add'>+	} else {</div><div class='add'>+		__ndelay(nsec);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#define ndelay(x) ndelay(x)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_GENERIC_DELAY_H */</div><div class='head'>diff --git a/include/asm-generic/div64.h b/include/asm-generic/div64.h<br/>index 13f5aa68a455..25e7b4b58dcf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/div64.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/div64.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/div64.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/div64.h</a></div><div class='hunk'>@@ -74,7 +74,8 @@</div><div class='ctx'> 	 * do the trick here).						\</div><div class='ctx'> 	 */								\</div><div class='ctx'> 	uint64_t ___res, ___x, ___t, ___m, ___n = (n);			\</div><div class='del'>-	uint32_t ___p, ___bias;						\</div><div class='add'>+	uint32_t ___p;							\</div><div class='add'>+	bool ___bias = false;						\</div><div class='ctx'> 									\</div><div class='ctx'> 	/* determine MSB of b */					\</div><div class='ctx'> 	___p = 1 &lt;&lt; ilog2(___b);					\</div><div class='hunk'>@@ -87,22 +88,14 @@</div><div class='ctx'> 	___x = ~0ULL / ___b * ___b - 1;					\</div><div class='ctx'> 									\</div><div class='ctx'> 	/* test our ___m with res = m * x / (p &lt;&lt; 64) */		\</div><div class='del'>-	___res = ((___m &amp; 0xffffffff) * (___x &amp; 0xffffffff)) &gt;&gt; 32;	\</div><div class='del'>-	___t = ___res += (___m &amp; 0xffffffff) * (___x &gt;&gt; 32);		\</div><div class='del'>-	___res += (___x &amp; 0xffffffff) * (___m &gt;&gt; 32);			\</div><div class='del'>-	___t = (___res &lt; ___t) ? (1ULL &lt;&lt; 32) : 0;			\</div><div class='del'>-	___res = (___res &gt;&gt; 32) + ___t;					\</div><div class='del'>-	___res += (___m &gt;&gt; 32) * (___x &gt;&gt; 32);				\</div><div class='del'>-	___res /= ___p;							\</div><div class='add'>+	___res = (___m &amp; 0xffffffff) * (___x &amp; 0xffffffff);		\</div><div class='add'>+	___t = (___m &amp; 0xffffffff) * (___x &gt;&gt; 32) + (___res &gt;&gt; 32);	\</div><div class='add'>+	___res = (___m &gt;&gt; 32) * (___x &gt;&gt; 32) + (___t &gt;&gt; 32);		\</div><div class='add'>+	___t = (___m &gt;&gt; 32) * (___x &amp; 0xffffffff) + (___t &amp; 0xffffffff);\</div><div class='add'>+	___res = (___res + (___t &gt;&gt; 32)) / ___p;			\</div><div class='ctx'> 									\</div><div class='del'>-	/* Now sanitize and optimize what we've got. */			\</div><div class='del'>-	if (~0ULL % (___b / (___b &amp; -___b)) == 0) {			\</div><div class='del'>-		/* special case, can be simplified to ... */		\</div><div class='del'>-		___n /= (___b &amp; -___b);					\</div><div class='del'>-		___m = ~0ULL / (___b / (___b &amp; -___b));			\</div><div class='del'>-		___p = 1;						\</div><div class='del'>-		___bias = 1;						\</div><div class='del'>-	} else if (___res != ___x / ___b) {				\</div><div class='add'>+	/* Now validate what we've got. */				\</div><div class='add'>+	if (___res != ___x / ___b) {					\</div><div class='ctx'> 		/*							\</div><div class='ctx'> 		 * We can't get away without a bias to compensate	\</div><div class='ctx'> 		 * for bit truncation errors.  To avoid it we'd need an	\</div><div class='hunk'>@@ -111,45 +104,18 @@</div><div class='ctx'> 		 *							\</div><div class='ctx'> 		 * Instead we do m = p / b and n / b = (n * m + m) / p.	\</div><div class='ctx'> 		 */							\</div><div class='del'>-		___bias = 1;						\</div><div class='add'>+		___bias = true;						\</div><div class='ctx'> 		/* Compute m = (p &lt;&lt; 64) / b */				\</div><div class='ctx'> 		___m = (~0ULL / ___b) * ___p;				\</div><div class='ctx'> 		___m += ((~0ULL % ___b + 1) * ___p) / ___b;		\</div><div class='del'>-	} else {							\</div><div class='del'>-		/*							\</div><div class='del'>-		 * Reduce m / p, and try to clear bit 31 of m when	\</div><div class='del'>-		 * possible, otherwise that'll need extra overflow	\</div><div class='del'>-		 * handling later.					\</div><div class='del'>-		 */							\</div><div class='del'>-		uint32_t ___bits = -(___m &amp; -___m);			\</div><div class='del'>-		___bits |= ___m &gt;&gt; 32;					\</div><div class='del'>-		___bits = (~___bits) &lt;&lt; 1;				\</div><div class='del'>-		/*							\</div><div class='del'>-		 * If ___bits == 0 then setting bit 31 is  unavoidable.	\</div><div class='del'>-		 * Simply apply the maximum possible reduction in that	\</div><div class='del'>-		 * case. Otherwise the MSB of ___bits indicates the	\</div><div class='del'>-		 * best reduction we should apply.			\</div><div class='del'>-		 */							\</div><div class='del'>-		if (!___bits) {						\</div><div class='del'>-			___p /= (___m &amp; -___m);				\</div><div class='del'>-			___m /= (___m &amp; -___m);				\</div><div class='del'>-		} else {						\</div><div class='del'>-			___p &gt;&gt;= ilog2(___bits);			\</div><div class='del'>-			___m &gt;&gt;= ilog2(___bits);			\</div><div class='del'>-		}							\</div><div class='del'>-		/* No bias needed. */					\</div><div class='del'>-		___bias = 0;						\</div><div class='ctx'> 	}								\</div><div class='ctx'> 									\</div><div class='add'>+	/* Reduce m / p to help avoid overflow handling later. */	\</div><div class='add'>+	___p /= (___m &amp; -___m);						\</div><div class='add'>+	___m /= (___m &amp; -___m);						\</div><div class='add'>+									\</div><div class='ctx'> 	/*								\</div><div class='del'>-	 * Now we have a combination of 2 conditions:			\</div><div class='del'>-	 *								\</div><div class='del'>-	 * 1) whether or not we need to apply a bias, and		\</div><div class='del'>-	 *								\</div><div class='del'>-	 * 2) whether or not there might be an overflow in the cross	\</div><div class='del'>-	 *    product determined by (___m &amp; ((1 &lt;&lt; 63) | (1 &lt;&lt; 31))).	\</div><div class='del'>-	 *								\</div><div class='del'>-	 * Select the best way to do (m_bias + m * n) / (1 &lt;&lt; 64).	\</div><div class='add'>+	 * Perform (m_bias + m * n) / (1 &lt;&lt; 64).			\</div><div class='ctx'> 	 * From now on there will be actual runtime code generated.	\</div><div class='ctx'> 	 */								\</div><div class='ctx'> 	___res = __arch_xprod_64(___m, ___n, ___bias);			\</div><div class='hunk'>@@ -165,47 +131,42 @@</div><div class='ctx'>  * Semantic:  retval = ((bias ? m : 0) + m * n) &gt;&gt; 64</div><div class='ctx'>  *</div><div class='ctx'>  * The product is a 128-bit value, scaled down to 64 bits.</div><div class='del'>- * Assuming constant propagation to optimize away unused conditional code.</div><div class='add'>+ * Hoping for compile-time optimization of  conditional code.</div><div class='ctx'>  * Architectures may provide their own optimized assembly implementation.</div><div class='ctx'>  */</div><div class='del'>-static inline uint64_t __arch_xprod_64(const uint64_t m, uint64_t n, bool bias)</div><div class='add'>+#ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE</div><div class='add'>+static __always_inline</div><div class='add'>+#else</div><div class='add'>+static inline</div><div class='add'>+#endif</div><div class='add'>+uint64_t __arch_xprod_64(const uint64_t m, uint64_t n, bool bias)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t m_lo = m;</div><div class='ctx'> 	uint32_t m_hi = m &gt;&gt; 32;</div><div class='ctx'> 	uint32_t n_lo = n;</div><div class='ctx'> 	uint32_t n_hi = n &gt;&gt; 32;</div><div class='del'>-	uint64_t res;</div><div class='del'>-	uint32_t res_lo, res_hi, tmp;</div><div class='del'>-</div><div class='del'>-	if (!bias) {</div><div class='del'>-		res = ((uint64_t)m_lo * n_lo) &gt;&gt; 32;</div><div class='del'>-	} else if (!(m &amp; ((1ULL &lt;&lt; 63) | (1ULL &lt;&lt; 31)))) {</div><div class='del'>-		/* there can't be any overflow here */</div><div class='del'>-		res = (m + (uint64_t)m_lo * n_lo) &gt;&gt; 32;</div><div class='add'>+	uint64_t x, y;</div><div class='add'>+</div><div class='add'>+	/* Determine if overflow handling can be dispensed with. */</div><div class='add'>+	bool no_ovf = __builtin_constant_p(m) &amp;&amp;</div><div class='add'>+		      ((m &gt;&gt; 32) + (m &amp; 0xffffffff) &lt; 0x100000000);</div><div class='add'>+</div><div class='add'>+	if (no_ovf) {</div><div class='add'>+		x = (uint64_t)m_lo * n_lo + (bias ? m : 0);</div><div class='add'>+		x &gt;&gt;= 32;</div><div class='add'>+		x += (uint64_t)m_lo * n_hi;</div><div class='add'>+		x += (uint64_t)m_hi * n_lo;</div><div class='add'>+		x &gt;&gt;= 32;</div><div class='add'>+		x += (uint64_t)m_hi * n_hi;</div><div class='ctx'> 	} else {</div><div class='del'>-		res = m + (uint64_t)m_lo * n_lo;</div><div class='del'>-		res_lo = res &gt;&gt; 32;</div><div class='del'>-		res_hi = (res_lo &lt; m_hi);</div><div class='del'>-		res = res_lo | ((uint64_t)res_hi &lt;&lt; 32);</div><div class='add'>+		x = (uint64_t)m_lo * n_lo + (bias ? m_lo : 0);</div><div class='add'>+		y = (uint64_t)m_lo * n_hi + (uint32_t)(x &gt;&gt; 32) + (bias ? m_hi : 0);</div><div class='add'>+		x = (uint64_t)m_hi * n_hi + (uint32_t)(y &gt;&gt; 32);</div><div class='add'>+		y = (uint64_t)m_hi * n_lo + (uint32_t)y;</div><div class='add'>+		x += (uint32_t)(y &gt;&gt; 32);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(m &amp; ((1ULL &lt;&lt; 63) | (1ULL &lt;&lt; 31)))) {</div><div class='del'>-		/* there can't be any overflow here */</div><div class='del'>-		res += (uint64_t)m_lo * n_hi;</div><div class='del'>-		res += (uint64_t)m_hi * n_lo;</div><div class='del'>-		res &gt;&gt;= 32;</div><div class='del'>-	} else {</div><div class='del'>-		res += (uint64_t)m_lo * n_hi;</div><div class='del'>-		tmp = res &gt;&gt; 32;</div><div class='del'>-		res += (uint64_t)m_hi * n_lo;</div><div class='del'>-		res_lo = res &gt;&gt; 32;</div><div class='del'>-		res_hi = (res_lo &lt; tmp);</div><div class='del'>-		res = res_lo | ((uint64_t)res_hi &lt;&lt; 32);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res += (uint64_t)m_hi * n_hi;</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='add'>+	return x;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-generic/early_ioremap.h b/include/asm-generic/early_ioremap.h<br/>index 9d0479f50f97..5db59a1efb65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/early_ioremap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/early_ioremap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/early_ioremap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/early_ioremap.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@ extern void early_ioremap_reset(void);</div><div class='ctx'> /*</div><div class='ctx'>  * Early copy from unmapped memory to kernel mapped memory.</div><div class='ctx'>  */</div><div class='del'>-extern void copy_from_early_mem(void *dest, phys_addr_t src,</div><div class='add'>+extern int copy_from_early_mem(void *dest, phys_addr_t src,</div><div class='ctx'> 				unsigned long size);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='head'>diff --git a/include/asm-generic/export.h b/include/asm-generic/export.h<br/>deleted file mode 100644<br/>index 570cd4da7210..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/export.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/export.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-#ifndef __ASM_GENERIC_EXPORT_H</div><div class='del'>-#define __ASM_GENERIC_EXPORT_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * &lt;asm/export.h&gt; and &lt;asm-generic/export.h&gt; are deprecated.</div><div class='del'>- * Please include &lt;linux/export.h&gt; directly.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/export.h&gt;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h<br/>index 8cc7b09c1bc7..29cab7947980 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/fixmap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/fixmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/fixmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/fixmap.h</a></div><div class='hunk'>@@ -97,8 +97,5 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)</div><div class='ctx'> #define set_fixmap_io(idx, phys) \</div><div class='ctx'> 	__set_fixmap(idx, phys, FIXMAP_PAGE_IO)</div><div class='ctx'> </div><div class='del'>-#define set_fixmap_offset_io(idx, phys) \</div><div class='del'>-	__set_fixmap_offset(idx, phys, FIXMAP_PAGE_IO)</div><div class='del'>-</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* __ASM_GENERIC_FIXMAP_H */</div><div class='head'>diff --git a/include/asm-generic/fprobe.h b/include/asm-generic/fprobe.h<br/>new file mode 100644<br/>index 000000000000..8659a4dc6eb6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/fprobe.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/fprobe.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Generic arch dependent fprobe macros.</div><div class='add'>+ */</div><div class='add'>+#ifndef __ASM_GENERIC_FPROBE_H__</div><div class='add'>+#define __ASM_GENERIC_FPROBE_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+/*</div><div class='add'>+ * Encoding the size and the address of fprobe into one 64bit entry.</div><div class='add'>+ * The 32bit architectures should use 2 entries to store those info.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define ARCH_DEFINE_ENCODE_FPROBE_HEADER</div><div class='add'>+</div><div class='add'>+#define FPROBE_HEADER_MSB_SIZE_SHIFT (BITS_PER_LONG - FPROBE_DATA_SIZE_BITS)</div><div class='add'>+#define FPROBE_HEADER_MSB_MASK					\</div><div class='add'>+	GENMASK(FPROBE_HEADER_MSB_SIZE_SHIFT - 1, 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * By default, this expects the MSBs in the address of kprobe is 0xf.</div><div class='add'>+ * If any arch needs another fixed pattern (e.g. s390 is zero filled),</div><div class='add'>+ * override this.</div><div class='add'>+ */</div><div class='add'>+#define FPROBE_HEADER_MSB_PATTERN				\</div><div class='add'>+	GENMASK(BITS_PER_LONG - 1, FPROBE_HEADER_MSB_SIZE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define arch_fprobe_header_encodable(fp)			\</div><div class='add'>+	(((unsigned long)(fp) &amp; ~FPROBE_HEADER_MSB_MASK) ==	\</div><div class='add'>+	 FPROBE_HEADER_MSB_PATTERN)</div><div class='add'>+</div><div class='add'>+#define arch_encode_fprobe_header(fp, size)			\</div><div class='add'>+	(((unsigned long)(fp) &amp; FPROBE_HEADER_MSB_MASK) |	\</div><div class='add'>+	 ((unsigned long)(size) &lt;&lt; FPROBE_HEADER_MSB_SIZE_SHIFT))</div><div class='add'>+</div><div class='add'>+#define arch_decode_fprobe_header_size(val)			\</div><div class='add'>+	((unsigned long)(val) &gt;&gt; FPROBE_HEADER_MSB_SIZE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define arch_decode_fprobe_header_fp(val)					\</div><div class='add'>+	((struct fprobe *)(((unsigned long)(val) &amp; FPROBE_HEADER_MSB_MASK) |	\</div><div class='add'>+			   FPROBE_HEADER_MSB_PATTERN))</div><div class='add'>+#endif /* CONFIG_64BIT */</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_GENERIC_FPROBE_H__ */</div><div class='head'>diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h<br/>index 6dcf4d576970..e1a2e1b7c8e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/hugetlb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/hugetlb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/hugetlb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/hugetlb.h</a></div><div class='hunk'>@@ -5,11 +5,6 @@</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/swapops.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)</div><div class='del'>-{</div><div class='del'>-	return mk_pte(page, pgprot);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned long huge_pte_write(pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	return pte_write(pte);</div><div class='hunk'>@@ -42,20 +37,26 @@ static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot)</div><div class='ctx'> 	return pte_modify(pte, newprot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef __HAVE_ARCH_HUGE_PTE_MKUFFD_WP</div><div class='ctx'> static inline pte_t huge_pte_mkuffd_wp(pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	return huge_pte_wrprotect(pte_mkuffd_wp(pte));</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifndef __HAVE_ARCH_HUGE_PTE_CLEAR_UFFD_WP</div><div class='ctx'> static inline pte_t huge_pte_clear_uffd_wp(pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	return pte_clear_uffd_wp(pte);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifndef __HAVE_ARCH_HUGE_PTE_UFFD_WP</div><div class='ctx'> static inline int huge_pte_uffd_wp(pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	return pte_uffd_wp(pte);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef __HAVE_ARCH_HUGE_PTE_CLEAR</div><div class='ctx'> static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,</div><div class='hunk'>@@ -65,15 +66,6 @@ static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef __HAVE_ARCH_HUGETLB_FREE_PGD_RANGE</div><div class='del'>-static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,</div><div class='del'>-		unsigned long addr, unsigned long end,</div><div class='del'>-		unsigned long floor, unsigned long ceiling)</div><div class='del'>-{</div><div class='del'>-	free_pgd_range(tlb, addr, end, floor, ceiling);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT</div><div class='ctx'> static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 		pte_t *ptep, pte_t pte, unsigned long sz)</div><div class='hunk'>@@ -84,7 +76,7 @@ static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> </div><div class='ctx'> #ifndef __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR</div><div class='ctx'> static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,</div><div class='del'>-		unsigned long addr, pte_t *ptep)</div><div class='add'>+		unsigned long addr, pte_t *ptep, unsigned long sz)</div><div class='ctx'> {</div><div class='ctx'> 	return ptep_get_and_clear(mm, addr, ptep);</div><div class='ctx'> }</div><div class='hunk'>@@ -105,27 +97,6 @@ static inline int huge_pte_none(pte_t pte)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Please refer to comments above pte_none_mostly() for the usage */</div><div class='del'>-static inline int huge_pte_none_mostly(pte_t pte)</div><div class='del'>-{</div><div class='del'>-	return huge_pte_none(pte) || is_pte_marker(pte);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE</div><div class='del'>-static inline int prepare_hugepage_range(struct file *file,</div><div class='del'>-		unsigned long addr, unsigned long len)</div><div class='del'>-{</div><div class='del'>-	struct hstate *h = hstate_file(file);</div><div class='del'>-</div><div class='del'>-	if (len &amp; ~huge_page_mask(h))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (addr &amp; ~huge_page_mask(h))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT</div><div class='ctx'> static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,</div><div class='ctx'> 		unsigned long addr, pte_t *ptep)</div><div class='hunk'>@@ -144,7 +115,7 @@ static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef __HAVE_ARCH_HUGE_PTEP_GET</div><div class='del'>-static inline pte_t huge_ptep_get(pte_t *ptep)</div><div class='add'>+static inline pte_t huge_ptep_get(struct mm_struct *mm, unsigned long addr, pte_t *ptep)</div><div class='ctx'> {</div><div class='ctx'> 	return ptep_get(ptep);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h<br/>deleted file mode 100644<br/>index fdac4a1714ec..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/hyperv-tlfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/hyperv-tlfs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,826 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This file contains definitions from Hyper-V Hypervisor Top-Level Functional</div><div class='del'>- * Specification (TLFS):</div><div class='del'>- * https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ASM_GENERIC_HYPERV_TLFS_H</div><div class='del'>-#define _ASM_GENERIC_HYPERV_TLFS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/bits.h&gt;</div><div class='del'>-#include &lt;linux/time64.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * While not explicitly listed in the TLFS, Hyper-V always runs with a page size</div><div class='del'>- * of 4096. These definitions are used when communicating with Hyper-V using</div><div class='del'>- * guest physical pages and guest physical page addresses, since the guest page</div><div class='del'>- * size may not be 4096 on all architectures.</div><div class='del'>- */</div><div class='del'>-#define HV_HYP_PAGE_SHIFT      12</div><div class='del'>-#define HV_HYP_PAGE_SIZE       BIT(HV_HYP_PAGE_SHIFT)</div><div class='del'>-#define HV_HYP_PAGE_MASK       (~(HV_HYP_PAGE_SIZE - 1))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Hyper-V provides two categories of flags relevant to guest VMs.  The</div><div class='del'>- * "Features" category indicates specific functionality that is available</div><div class='del'>- * to guests on this particular instance of Hyper-V. The "Features"</div><div class='del'>- * are presented in four groups, each of which is 32 bits. The group A</div><div class='del'>- * and B definitions are common across architectures and are listed here.</div><div class='del'>- * However, not all flags are relevant on all architectures.</div><div class='del'>- *</div><div class='del'>- * Groups C and D vary across architectures and are listed in the</div><div class='del'>- * architecture specific portion of hyperv-tlfs.h. Some of these flags exist</div><div class='del'>- * on multiple architectures, but the bit positions are different so they</div><div class='del'>- * cannot appear in the generic portion of hyperv-tlfs.h.</div><div class='del'>- *</div><div class='del'>- * The "Enlightenments" category provides recommendations on whether to use</div><div class='del'>- * specific enlightenments that are available. The Enlighenments are a single</div><div class='del'>- * group of 32 bits, but they vary across architectures and are listed in</div><div class='del'>- * the architecture specific portion of hyperv-tlfs.h.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Group A Features.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* VP Runtime register available */</div><div class='del'>-#define HV_MSR_VP_RUNTIME_AVAILABLE		BIT(0)</div><div class='del'>-/* Partition Reference Counter available*/</div><div class='del'>-#define HV_MSR_TIME_REF_COUNT_AVAILABLE		BIT(1)</div><div class='del'>-/* Basic SynIC register available */</div><div class='del'>-#define HV_MSR_SYNIC_AVAILABLE			BIT(2)</div><div class='del'>-/* Synthetic Timer registers available */</div><div class='del'>-#define HV_MSR_SYNTIMER_AVAILABLE		BIT(3)</div><div class='del'>-/* Virtual APIC assist and VP assist page registers available */</div><div class='del'>-#define HV_MSR_APIC_ACCESS_AVAILABLE		BIT(4)</div><div class='del'>-/* Hypercall and Guest OS ID registers available*/</div><div class='del'>-#define HV_MSR_HYPERCALL_AVAILABLE		BIT(5)</div><div class='del'>-/* Access virtual processor index register available*/</div><div class='del'>-#define HV_MSR_VP_INDEX_AVAILABLE		BIT(6)</div><div class='del'>-/* Virtual system reset register available*/</div><div class='del'>-#define HV_MSR_RESET_AVAILABLE			BIT(7)</div><div class='del'>-/* Access statistics page registers available */</div><div class='del'>-#define HV_MSR_STAT_PAGES_AVAILABLE		BIT(8)</div><div class='del'>-/* Partition reference TSC register is available */</div><div class='del'>-#define HV_MSR_REFERENCE_TSC_AVAILABLE		BIT(9)</div><div class='del'>-/* Partition Guest IDLE register is available */</div><div class='del'>-#define HV_MSR_GUEST_IDLE_AVAILABLE		BIT(10)</div><div class='del'>-/* Partition local APIC and TSC frequency registers available */</div><div class='del'>-#define HV_ACCESS_FREQUENCY_MSRS		BIT(11)</div><div class='del'>-/* AccessReenlightenmentControls privilege */</div><div class='del'>-#define HV_ACCESS_REENLIGHTENMENT		BIT(13)</div><div class='del'>-/* AccessTscInvariantControls privilege */</div><div class='del'>-#define HV_ACCESS_TSC_INVARIANT			BIT(15)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Group B features.</div><div class='del'>- */</div><div class='del'>-#define HV_CREATE_PARTITIONS			BIT(0)</div><div class='del'>-#define HV_ACCESS_PARTITION_ID			BIT(1)</div><div class='del'>-#define HV_ACCESS_MEMORY_POOL			BIT(2)</div><div class='del'>-#define HV_ADJUST_MESSAGE_BUFFERS		BIT(3)</div><div class='del'>-#define HV_POST_MESSAGES			BIT(4)</div><div class='del'>-#define HV_SIGNAL_EVENTS			BIT(5)</div><div class='del'>-#define HV_CREATE_PORT				BIT(6)</div><div class='del'>-#define HV_CONNECT_PORT				BIT(7)</div><div class='del'>-#define HV_ACCESS_STATS				BIT(8)</div><div class='del'>-#define HV_DEBUGGING				BIT(11)</div><div class='del'>-#define HV_CPU_MANAGEMENT			BIT(12)</div><div class='del'>-#define HV_ENABLE_EXTENDED_HYPERCALLS		BIT(20)</div><div class='del'>-#define HV_ISOLATION				BIT(22)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * TSC page layout.</div><div class='del'>- */</div><div class='del'>-struct ms_hyperv_tsc_page {</div><div class='del'>-	volatile u32 tsc_sequence;</div><div class='del'>-	u32 reserved1;</div><div class='del'>-	volatile u64 tsc_scale;</div><div class='del'>-	volatile s64 tsc_offset;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-union hv_reference_tsc_msr {</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-	struct {</div><div class='del'>-		u64 enable:1;</div><div class='del'>-		u64 reserved:11;</div><div class='del'>-		u64 pfn:52;</div><div class='del'>-	} __packed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The guest OS needs to register the guest ID with the hypervisor.</div><div class='del'>- * The guest ID is a 64 bit entity and the structure of this ID is</div><div class='del'>- * specified in the Hyper-V specification:</div><div class='del'>- *</div><div class='del'>- * msdn.microsoft.com/en-us/library/windows/hardware/ff542653%28v=vs.85%29.aspx</div><div class='del'>- *</div><div class='del'>- * While the current guideline does not specify how Linux guest ID(s)</div><div class='del'>- * need to be generated, our plan is to publish the guidelines for</div><div class='del'>- * Linux and other guest operating systems that currently are hosted</div><div class='del'>- * on Hyper-V. The implementation here conforms to this yet</div><div class='del'>- * unpublished guidelines.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Bit(s)</div><div class='del'>- * 63 - Indicates if the OS is Open Source or not; 1 is Open Source</div><div class='del'>- * 62:56 - Os Type; Linux is 0x100</div><div class='del'>- * 55:48 - Distro specific identification</div><div class='del'>- * 47:16 - Linux kernel version number</div><div class='del'>- * 15:0  - Distro specific identification</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define HV_LINUX_VENDOR_ID              0x8100</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Crash notification flags.</div><div class='del'>- */</div><div class='del'>-#define HV_CRASH_CTL_CRASH_NOTIFY_MSG		BIT_ULL(62)</div><div class='del'>-#define HV_CRASH_CTL_CRASH_NOTIFY		BIT_ULL(63)</div><div class='del'>-</div><div class='del'>-/* Declare the various hypercall operations. */</div><div class='del'>-#define HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE	0x0002</div><div class='del'>-#define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST	0x0003</div><div class='del'>-#define HVCALL_ENABLE_VP_VTL			0x000f</div><div class='del'>-#define HVCALL_NOTIFY_LONG_SPIN_WAIT		0x0008</div><div class='del'>-#define HVCALL_SEND_IPI				0x000b</div><div class='del'>-#define HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE_EX	0x0013</div><div class='del'>-#define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST_EX	0x0014</div><div class='del'>-#define HVCALL_SEND_IPI_EX			0x0015</div><div class='del'>-#define HVCALL_GET_PARTITION_ID			0x0046</div><div class='del'>-#define HVCALL_DEPOSIT_MEMORY			0x0048</div><div class='del'>-#define HVCALL_CREATE_VP			0x004e</div><div class='del'>-#define HVCALL_GET_VP_REGISTERS			0x0050</div><div class='del'>-#define HVCALL_SET_VP_REGISTERS			0x0051</div><div class='del'>-#define HVCALL_POST_MESSAGE			0x005c</div><div class='del'>-#define HVCALL_SIGNAL_EVENT			0x005d</div><div class='del'>-#define HVCALL_POST_DEBUG_DATA			0x0069</div><div class='del'>-#define HVCALL_RETRIEVE_DEBUG_DATA		0x006a</div><div class='del'>-#define HVCALL_RESET_DEBUG_SESSION		0x006b</div><div class='del'>-#define HVCALL_ADD_LOGICAL_PROCESSOR		0x0076</div><div class='del'>-#define HVCALL_MAP_DEVICE_INTERRUPT		0x007c</div><div class='del'>-#define HVCALL_UNMAP_DEVICE_INTERRUPT		0x007d</div><div class='del'>-#define HVCALL_RETARGET_INTERRUPT		0x007e</div><div class='del'>-#define HVCALL_START_VP				0x0099</div><div class='del'>-#define HVCALL_GET_VP_ID_FROM_APIC_ID		0x009a</div><div class='del'>-#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af</div><div class='del'>-#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0</div><div class='del'>-#define HVCALL_MODIFY_SPARSE_GPA_PAGE_HOST_VISIBILITY 0x00db</div><div class='del'>-#define HVCALL_MMIO_READ			0x0106</div><div class='del'>-#define HVCALL_MMIO_WRITE			0x0107</div><div class='del'>-</div><div class='del'>-/* Extended hypercalls */</div><div class='del'>-#define HV_EXT_CALL_QUERY_CAPABILITIES		0x8001</div><div class='del'>-#define HV_EXT_CALL_MEMORY_HEAT_HINT		0x8003</div><div class='del'>-</div><div class='del'>-#define HV_FLUSH_ALL_PROCESSORS			BIT(0)</div><div class='del'>-#define HV_FLUSH_ALL_VIRTUAL_ADDRESS_SPACES	BIT(1)</div><div class='del'>-#define HV_FLUSH_NON_GLOBAL_MAPPINGS_ONLY	BIT(2)</div><div class='del'>-#define HV_FLUSH_USE_EXTENDED_RANGE_FORMAT	BIT(3)</div><div class='del'>-</div><div class='del'>-/* Extended capability bits */</div><div class='del'>-#define HV_EXT_CAPABILITY_MEMORY_COLD_DISCARD_HINT BIT(8)</div><div class='del'>-</div><div class='del'>-enum HV_GENERIC_SET_FORMAT {</div><div class='del'>-	HV_GENERIC_SET_SPARSE_4K,</div><div class='del'>-	HV_GENERIC_SET_ALL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define HV_PARTITION_ID_SELF		((u64)-1)</div><div class='del'>-#define HV_VP_INDEX_SELF		((u32)-2)</div><div class='del'>-</div><div class='del'>-#define HV_HYPERCALL_RESULT_MASK	GENMASK_ULL(15, 0)</div><div class='del'>-#define HV_HYPERCALL_FAST_BIT		BIT(16)</div><div class='del'>-#define HV_HYPERCALL_VARHEAD_OFFSET	17</div><div class='del'>-#define HV_HYPERCALL_VARHEAD_MASK	GENMASK_ULL(26, 17)</div><div class='del'>-#define HV_HYPERCALL_RSVD0_MASK		GENMASK_ULL(31, 27)</div><div class='del'>-#define HV_HYPERCALL_NESTED		BIT_ULL(31)</div><div class='del'>-#define HV_HYPERCALL_REP_COMP_OFFSET	32</div><div class='del'>-#define HV_HYPERCALL_REP_COMP_1		BIT_ULL(32)</div><div class='del'>-#define HV_HYPERCALL_REP_COMP_MASK	GENMASK_ULL(43, 32)</div><div class='del'>-#define HV_HYPERCALL_RSVD1_MASK		GENMASK_ULL(47, 44)</div><div class='del'>-#define HV_HYPERCALL_REP_START_OFFSET	48</div><div class='del'>-#define HV_HYPERCALL_REP_START_MASK	GENMASK_ULL(59, 48)</div><div class='del'>-#define HV_HYPERCALL_RSVD2_MASK		GENMASK_ULL(63, 60)</div><div class='del'>-#define HV_HYPERCALL_RSVD_MASK		(HV_HYPERCALL_RSVD0_MASK | \</div><div class='del'>-					 HV_HYPERCALL_RSVD1_MASK | \</div><div class='del'>-					 HV_HYPERCALL_RSVD2_MASK)</div><div class='del'>-</div><div class='del'>-/* hypercall status code */</div><div class='del'>-#define HV_STATUS_SUCCESS			0</div><div class='del'>-#define HV_STATUS_INVALID_HYPERCALL_CODE	2</div><div class='del'>-#define HV_STATUS_INVALID_HYPERCALL_INPUT	3</div><div class='del'>-#define HV_STATUS_INVALID_ALIGNMENT		4</div><div class='del'>-#define HV_STATUS_INVALID_PARAMETER		5</div><div class='del'>-#define HV_STATUS_ACCESS_DENIED			6</div><div class='del'>-#define HV_STATUS_OPERATION_DENIED		8</div><div class='del'>-#define HV_STATUS_INSUFFICIENT_MEMORY		11</div><div class='del'>-#define HV_STATUS_INVALID_PORT_ID		17</div><div class='del'>-#define HV_STATUS_INVALID_CONNECTION_ID		18</div><div class='del'>-#define HV_STATUS_INSUFFICIENT_BUFFERS		19</div><div class='del'>-#define HV_STATUS_TIME_OUT                      120</div><div class='del'>-#define HV_STATUS_VTL_ALREADY_ENABLED		134</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The Hyper-V TimeRefCount register and the TSC</div><div class='del'>- * page provide a guest VM clock with 100ns tick rate</div><div class='del'>- */</div><div class='del'>-#define HV_CLOCK_HZ (NSEC_PER_SEC/100)</div><div class='del'>-</div><div class='del'>-/* Define the number of synthetic interrupt sources. */</div><div class='del'>-#define HV_SYNIC_SINT_COUNT		(16)</div><div class='del'>-/* Define the expected SynIC version. */</div><div class='del'>-#define HV_SYNIC_VERSION_1		(0x1)</div><div class='del'>-/* Valid SynIC vectors are 16-255. */</div><div class='del'>-#define HV_SYNIC_FIRST_VALID_VECTOR	(16)</div><div class='del'>-</div><div class='del'>-#define HV_SYNIC_CONTROL_ENABLE		(1ULL &lt;&lt; 0)</div><div class='del'>-#define HV_SYNIC_SIMP_ENABLE		(1ULL &lt;&lt; 0)</div><div class='del'>-#define HV_SYNIC_SIEFP_ENABLE		(1ULL &lt;&lt; 0)</div><div class='del'>-#define HV_SYNIC_SINT_MASKED		(1ULL &lt;&lt; 16)</div><div class='del'>-#define HV_SYNIC_SINT_AUTO_EOI		(1ULL &lt;&lt; 17)</div><div class='del'>-#define HV_SYNIC_SINT_VECTOR_MASK	(0xFF)</div><div class='del'>-</div><div class='del'>-#define HV_SYNIC_STIMER_COUNT		(4)</div><div class='del'>-</div><div class='del'>-/* Define synthetic interrupt controller message constants. */</div><div class='del'>-#define HV_MESSAGE_SIZE			(256)</div><div class='del'>-#define HV_MESSAGE_PAYLOAD_BYTE_COUNT	(240)</div><div class='del'>-#define HV_MESSAGE_PAYLOAD_QWORD_COUNT	(30)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Define hypervisor message types. Some of the message types</div><div class='del'>- * are x86/x64 specific, but there's no good way to separate</div><div class='del'>- * them out into the arch-specific version of hyperv-tlfs.h</div><div class='del'>- * because C doesn't provide a way to extend enum types.</div><div class='del'>- * Keeping them all in the arch neutral hyperv-tlfs.h seems</div><div class='del'>- * the least messy compromise.</div><div class='del'>- */</div><div class='del'>-enum hv_message_type {</div><div class='del'>-	HVMSG_NONE			= 0x00000000,</div><div class='del'>-</div><div class='del'>-	/* Memory access messages. */</div><div class='del'>-	HVMSG_UNMAPPED_GPA		= 0x80000000,</div><div class='del'>-	HVMSG_GPA_INTERCEPT		= 0x80000001,</div><div class='del'>-</div><div class='del'>-	/* Timer notification messages. */</div><div class='del'>-	HVMSG_TIMER_EXPIRED		= 0x80000010,</div><div class='del'>-</div><div class='del'>-	/* Error messages. */</div><div class='del'>-	HVMSG_INVALID_VP_REGISTER_VALUE	= 0x80000020,</div><div class='del'>-	HVMSG_UNRECOVERABLE_EXCEPTION	= 0x80000021,</div><div class='del'>-	HVMSG_UNSUPPORTED_FEATURE	= 0x80000022,</div><div class='del'>-</div><div class='del'>-	/* Trace buffer complete messages. */</div><div class='del'>-	HVMSG_EVENTLOG_BUFFERCOMPLETE	= 0x80000040,</div><div class='del'>-</div><div class='del'>-	/* Platform-specific processor intercept messages. */</div><div class='del'>-	HVMSG_X64_IOPORT_INTERCEPT	= 0x80010000,</div><div class='del'>-	HVMSG_X64_MSR_INTERCEPT		= 0x80010001,</div><div class='del'>-	HVMSG_X64_CPUID_INTERCEPT	= 0x80010002,</div><div class='del'>-	HVMSG_X64_EXCEPTION_INTERCEPT	= 0x80010003,</div><div class='del'>-	HVMSG_X64_APIC_EOI		= 0x80010004,</div><div class='del'>-	HVMSG_X64_LEGACY_FP_ERROR	= 0x80010005</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Define synthetic interrupt controller message flags. */</div><div class='del'>-union hv_message_flags {</div><div class='del'>-	__u8 asu8;</div><div class='del'>-	struct {</div><div class='del'>-		__u8 msg_pending:1;</div><div class='del'>-		__u8 reserved:7;</div><div class='del'>-	} __packed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Define port identifier type. */</div><div class='del'>-union hv_port_id {</div><div class='del'>-	__u32 asu32;</div><div class='del'>-	struct {</div><div class='del'>-		__u32 id:24;</div><div class='del'>-		__u32 reserved:8;</div><div class='del'>-	} __packed u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Define synthetic interrupt controller message header. */</div><div class='del'>-struct hv_message_header {</div><div class='del'>-	__u32 message_type;</div><div class='del'>-	__u8 payload_size;</div><div class='del'>-	union hv_message_flags message_flags;</div><div class='del'>-	__u8 reserved[2];</div><div class='del'>-	union {</div><div class='del'>-		__u64 sender;</div><div class='del'>-		union hv_port_id port;</div><div class='del'>-	};</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Define synthetic interrupt controller message format. */</div><div class='del'>-struct hv_message {</div><div class='del'>-	struct hv_message_header header;</div><div class='del'>-	union {</div><div class='del'>-		__u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];</div><div class='del'>-	} u;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Define the synthetic interrupt message page layout. */</div><div class='del'>-struct hv_message_page {</div><div class='del'>-	struct hv_message sint_message[HV_SYNIC_SINT_COUNT];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Define timer message payload structure. */</div><div class='del'>-struct hv_timer_message_payload {</div><div class='del'>-	__u32 timer_index;</div><div class='del'>-	__u32 reserved;</div><div class='del'>-	__u64 expiration_time;	/* When the timer expired */</div><div class='del'>-	__u64 delivery_time;	/* When the message was delivered */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Define synthetic interrupt controller flag constants. */</div><div class='del'>-#define HV_EVENT_FLAGS_COUNT		(256 * 8)</div><div class='del'>-#define HV_EVENT_FLAGS_LONG_COUNT	(256 / sizeof(unsigned long))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Synthetic timer configuration.</div><div class='del'>- */</div><div class='del'>-union hv_stimer_config {</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-	struct {</div><div class='del'>-		u64 enable:1;</div><div class='del'>-		u64 periodic:1;</div><div class='del'>-		u64 lazy:1;</div><div class='del'>-		u64 auto_enable:1;</div><div class='del'>-		u64 apic_vector:8;</div><div class='del'>-		u64 direct_mode:1;</div><div class='del'>-		u64 reserved_z0:3;</div><div class='del'>-		u64 sintx:4;</div><div class='del'>-		u64 reserved_z1:44;</div><div class='del'>-	} __packed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Define the synthetic interrupt controller event flags format. */</div><div class='del'>-union hv_synic_event_flags {</div><div class='del'>-	unsigned long flags[HV_EVENT_FLAGS_LONG_COUNT];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Define SynIC control register. */</div><div class='del'>-union hv_synic_scontrol {</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-	struct {</div><div class='del'>-		u64 enable:1;</div><div class='del'>-		u64 reserved:63;</div><div class='del'>-	} __packed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Define synthetic interrupt source. */</div><div class='del'>-union hv_synic_sint {</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-	struct {</div><div class='del'>-		u64 vector:8;</div><div class='del'>-		u64 reserved1:8;</div><div class='del'>-		u64 masked:1;</div><div class='del'>-		u64 auto_eoi:1;</div><div class='del'>-		u64 polling:1;</div><div class='del'>-		u64 reserved2:45;</div><div class='del'>-	} __packed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Define the format of the SIMP register */</div><div class='del'>-union hv_synic_simp {</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-	struct {</div><div class='del'>-		u64 simp_enabled:1;</div><div class='del'>-		u64 preserved:11;</div><div class='del'>-		u64 base_simp_gpa:52;</div><div class='del'>-	} __packed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Define the format of the SIEFP register */</div><div class='del'>-union hv_synic_siefp {</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-	struct {</div><div class='del'>-		u64 siefp_enabled:1;</div><div class='del'>-		u64 preserved:11;</div><div class='del'>-		u64 base_siefp_gpa:52;</div><div class='del'>-	} __packed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hv_vpset {</div><div class='del'>-	u64 format;</div><div class='del'>-	u64 valid_bank_mask;</div><div class='del'>-	u64 bank_contents[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* The maximum number of sparse vCPU banks which can be encoded by 'struct hv_vpset' */</div><div class='del'>-#define HV_MAX_SPARSE_VCPU_BANKS (64)</div><div class='del'>-/* The number of vCPUs in one sparse bank */</div><div class='del'>-#define HV_VCPUS_PER_SPARSE_BANK (64)</div><div class='del'>-</div><div class='del'>-/* HvCallSendSyntheticClusterIpi hypercall */</div><div class='del'>-struct hv_send_ipi {</div><div class='del'>-	u32 vector;</div><div class='del'>-	u32 reserved;</div><div class='del'>-	u64 cpu_mask;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HvCallSendSyntheticClusterIpiEx hypercall */</div><div class='del'>-struct hv_send_ipi_ex {</div><div class='del'>-	u32 vector;</div><div class='del'>-	u32 reserved;</div><div class='del'>-	struct hv_vpset vp_set;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HvFlushGuestPhysicalAddressSpace hypercalls */</div><div class='del'>-struct hv_guest_mapping_flush {</div><div class='del'>-	u64 address_space;</div><div class='del'>-	u64 flags;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  HV_MAX_FLUSH_PAGES = "additional_pages" + 1. It's limited</div><div class='del'>- *  by the bitwidth of "additional_pages" in union hv_gpa_page_range.</div><div class='del'>- */</div><div class='del'>-#define HV_MAX_FLUSH_PAGES (2048)</div><div class='del'>-#define HV_GPA_PAGE_RANGE_PAGE_SIZE_2MB		0</div><div class='del'>-#define HV_GPA_PAGE_RANGE_PAGE_SIZE_1GB		1</div><div class='del'>-</div><div class='del'>-/* HvFlushGuestPhysicalAddressList, HvExtCallMemoryHeatHint hypercall */</div><div class='del'>-union hv_gpa_page_range {</div><div class='del'>-	u64 address_space;</div><div class='del'>-	struct {</div><div class='del'>-		u64 additional_pages:11;</div><div class='del'>-		u64 largepage:1;</div><div class='del'>-		u64 basepfn:52;</div><div class='del'>-	} page;</div><div class='del'>-	struct {</div><div class='del'>-		u64 reserved:12;</div><div class='del'>-		u64 page_size:1;</div><div class='del'>-		u64 reserved1:8;</div><div class='del'>-		u64 base_large_pfn:43;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * All input flush parameters should be in single page. The max flush</div><div class='del'>- * count is equal with how many entries of union hv_gpa_page_range can</div><div class='del'>- * be populated into the input parameter page.</div><div class='del'>- */</div><div class='del'>-#define HV_MAX_FLUSH_REP_COUNT ((HV_HYP_PAGE_SIZE - 2 * sizeof(u64)) /	\</div><div class='del'>-				sizeof(union hv_gpa_page_range))</div><div class='del'>-</div><div class='del'>-struct hv_guest_mapping_flush_list {</div><div class='del'>-	u64 address_space;</div><div class='del'>-	u64 flags;</div><div class='del'>-	union hv_gpa_page_range gpa_list[HV_MAX_FLUSH_REP_COUNT];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* HvFlushVirtualAddressSpace, HvFlushVirtualAddressList hypercalls */</div><div class='del'>-struct hv_tlb_flush {</div><div class='del'>-	u64 address_space;</div><div class='del'>-	u64 flags;</div><div class='del'>-	u64 processor_mask;</div><div class='del'>-	u64 gva_list[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HvFlushVirtualAddressSpaceEx, HvFlushVirtualAddressListEx hypercalls */</div><div class='del'>-struct hv_tlb_flush_ex {</div><div class='del'>-	u64 address_space;</div><div class='del'>-	u64 flags;</div><div class='del'>-	struct hv_vpset hv_vp_set;</div><div class='del'>-	u64 gva_list[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HvGetPartitionId hypercall (output only) */</div><div class='del'>-struct hv_get_partition_id {</div><div class='del'>-	u64 partition_id;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HvDepositMemory hypercall */</div><div class='del'>-struct hv_deposit_memory {</div><div class='del'>-	u64 partition_id;</div><div class='del'>-	u64 gpa_page_list[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_proximity_domain_flags {</div><div class='del'>-	u32 proximity_preferred : 1;</div><div class='del'>-	u32 reserved : 30;</div><div class='del'>-	u32 proximity_info_valid : 1;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Not a union in windows but useful for zeroing */</div><div class='del'>-union hv_proximity_domain_info {</div><div class='del'>-	struct {</div><div class='del'>-		u32 domain_id;</div><div class='del'>-		struct hv_proximity_domain_flags flags;</div><div class='del'>-	};</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_lp_startup_status {</div><div class='del'>-	u64 hv_status;</div><div class='del'>-	u64 substatus1;</div><div class='del'>-	u64 substatus2;</div><div class='del'>-	u64 substatus3;</div><div class='del'>-	u64 substatus4;</div><div class='del'>-	u64 substatus5;</div><div class='del'>-	u64 substatus6;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HvAddLogicalProcessor hypercall */</div><div class='del'>-struct hv_add_logical_processor_in {</div><div class='del'>-	u32 lp_index;</div><div class='del'>-	u32 apic_id;</div><div class='del'>-	union hv_proximity_domain_info proximity_domain_info;</div><div class='del'>-	u64 flags;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_add_logical_processor_out {</div><div class='del'>-	struct hv_lp_startup_status startup_status;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-enum HV_SUBNODE_TYPE</div><div class='del'>-{</div><div class='del'>-    HvSubnodeAny = 0,</div><div class='del'>-    HvSubnodeSocket = 1,</div><div class='del'>-    HvSubnodeAmdNode = 2,</div><div class='del'>-    HvSubnodeL3 = 3,</div><div class='del'>-    HvSubnodeCount = 4,</div><div class='del'>-    HvSubnodeInvalid = -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* HvCreateVp hypercall */</div><div class='del'>-struct hv_create_vp {</div><div class='del'>-	u64 partition_id;</div><div class='del'>-	u32 vp_index;</div><div class='del'>-	u8 padding[3];</div><div class='del'>-	u8 subnode_type;</div><div class='del'>-	u64 subnode_id;</div><div class='del'>-	union hv_proximity_domain_info proximity_domain_info;</div><div class='del'>-	u64 flags;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-enum hv_interrupt_source {</div><div class='del'>-	HV_INTERRUPT_SOURCE_MSI = 1, /* MSI and MSI-X */</div><div class='del'>-	HV_INTERRUPT_SOURCE_IOAPIC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-union hv_ioapic_rte {</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u32 vector:8;</div><div class='del'>-		u32 delivery_mode:3;</div><div class='del'>-		u32 destination_mode:1;</div><div class='del'>-		u32 delivery_status:1;</div><div class='del'>-		u32 interrupt_polarity:1;</div><div class='del'>-		u32 remote_irr:1;</div><div class='del'>-		u32 trigger_mode:1;</div><div class='del'>-		u32 interrupt_mask:1;</div><div class='del'>-		u32 reserved1:15;</div><div class='del'>-</div><div class='del'>-		u32 reserved2:24;</div><div class='del'>-		u32 destination_id:8;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u32 low_uint32;</div><div class='del'>-		u32 high_uint32;</div><div class='del'>-	};</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_interrupt_entry {</div><div class='del'>-	u32 source;</div><div class='del'>-	u32 reserved1;</div><div class='del'>-	union {</div><div class='del'>-		union hv_msi_entry msi_entry;</div><div class='del'>-		union hv_ioapic_rte ioapic_rte;</div><div class='del'>-	};</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * flags for hv_device_interrupt_target.flags</div><div class='del'>- */</div><div class='del'>-#define HV_DEVICE_INTERRUPT_TARGET_MULTICAST		1</div><div class='del'>-#define HV_DEVICE_INTERRUPT_TARGET_PROCESSOR_SET	2</div><div class='del'>-</div><div class='del'>-struct hv_device_interrupt_target {</div><div class='del'>-	u32 vector;</div><div class='del'>-	u32 flags;</div><div class='del'>-	union {</div><div class='del'>-		u64 vp_mask;</div><div class='del'>-		struct hv_vpset vp_set;</div><div class='del'>-	};</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_retarget_device_interrupt {</div><div class='del'>-	u64 partition_id;		/* use "self" */</div><div class='del'>-	u64 device_id;</div><div class='del'>-	struct hv_interrupt_entry int_entry;</div><div class='del'>-	u64 reserved2;</div><div class='del'>-	struct hv_device_interrupt_target int_target;</div><div class='del'>-} __packed __aligned(8);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* HvGetVpRegisters hypercall input with variable size reg name list*/</div><div class='del'>-struct hv_get_vp_registers_input {</div><div class='del'>-	struct {</div><div class='del'>-		u64 partitionid;</div><div class='del'>-		u32 vpindex;</div><div class='del'>-		u8  inputvtl;</div><div class='del'>-		u8  padding[3];</div><div class='del'>-	} header;</div><div class='del'>-	struct input {</div><div class='del'>-		u32 name0;</div><div class='del'>-		u32 name1;</div><div class='del'>-	} element[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* HvGetVpRegisters returns an array of these output elements */</div><div class='del'>-struct hv_get_vp_registers_output {</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			u32 a;</div><div class='del'>-			u32 b;</div><div class='del'>-			u32 c;</div><div class='del'>-			u32 d;</div><div class='del'>-		} as32 __packed;</div><div class='del'>-		struct {</div><div class='del'>-			u64 low;</div><div class='del'>-			u64 high;</div><div class='del'>-		} as64 __packed;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* HvSetVpRegisters hypercall with variable size reg name/value list*/</div><div class='del'>-struct hv_set_vp_registers_input {</div><div class='del'>-	struct {</div><div class='del'>-		u64 partitionid;</div><div class='del'>-		u32 vpindex;</div><div class='del'>-		u8  inputvtl;</div><div class='del'>-		u8  padding[3];</div><div class='del'>-	} header;</div><div class='del'>-	struct {</div><div class='del'>-		u32 name;</div><div class='del'>-		u32 padding1;</div><div class='del'>-		u64 padding2;</div><div class='del'>-		u64 valuelow;</div><div class='del'>-		u64 valuehigh;</div><div class='del'>-	} element[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-enum hv_device_type {</div><div class='del'>-	HV_DEVICE_TYPE_LOGICAL = 0,</div><div class='del'>-	HV_DEVICE_TYPE_PCI = 1,</div><div class='del'>-	HV_DEVICE_TYPE_IOAPIC = 2,</div><div class='del'>-	HV_DEVICE_TYPE_ACPI = 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef u16 hv_pci_rid;</div><div class='del'>-typedef u16 hv_pci_segment;</div><div class='del'>-typedef u64 hv_logical_device_id;</div><div class='del'>-union hv_pci_bdf {</div><div class='del'>-	u16 as_uint16;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u8 function:3;</div><div class='del'>-		u8 device:5;</div><div class='del'>-		u8 bus;</div><div class='del'>-	};</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-union hv_pci_bus_range {</div><div class='del'>-	u16 as_uint16;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u8 subordinate_bus;</div><div class='del'>-		u8 secondary_bus;</div><div class='del'>-	};</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-union hv_device_id {</div><div class='del'>-	u64 as_uint64;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		u64 reserved0:62;</div><div class='del'>-		u64 device_type:2;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* HV_DEVICE_TYPE_LOGICAL */</div><div class='del'>-	struct {</div><div class='del'>-		u64 id:62;</div><div class='del'>-		u64 device_type:2;</div><div class='del'>-	} logical;</div><div class='del'>-</div><div class='del'>-	/* HV_DEVICE_TYPE_PCI */</div><div class='del'>-	struct {</div><div class='del'>-		union {</div><div class='del'>-			hv_pci_rid rid;</div><div class='del'>-			union hv_pci_bdf bdf;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		hv_pci_segment segment;</div><div class='del'>-		union hv_pci_bus_range shadow_bus_range;</div><div class='del'>-</div><div class='del'>-		u16 phantom_function_bits:2;</div><div class='del'>-		u16 source_shadow:1;</div><div class='del'>-</div><div class='del'>-		u16 rsvdz0:11;</div><div class='del'>-		u16 device_type:2;</div><div class='del'>-	} pci;</div><div class='del'>-</div><div class='del'>-	/* HV_DEVICE_TYPE_IOAPIC */</div><div class='del'>-	struct {</div><div class='del'>-		u8 ioapic_id;</div><div class='del'>-		u8 rsvdz0;</div><div class='del'>-		u16 rsvdz1;</div><div class='del'>-		u16 rsvdz2;</div><div class='del'>-</div><div class='del'>-		u16 rsvdz3:14;</div><div class='del'>-		u16 device_type:2;</div><div class='del'>-	} ioapic;</div><div class='del'>-</div><div class='del'>-	/* HV_DEVICE_TYPE_ACPI */</div><div class='del'>-	struct {</div><div class='del'>-		u32 input_mapping_base;</div><div class='del'>-		u32 input_mapping_count:30;</div><div class='del'>-		u32 device_type:2;</div><div class='del'>-	} acpi;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-enum hv_interrupt_trigger_mode {</div><div class='del'>-	HV_INTERRUPT_TRIGGER_MODE_EDGE = 0,</div><div class='del'>-	HV_INTERRUPT_TRIGGER_MODE_LEVEL = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hv_device_interrupt_descriptor {</div><div class='del'>-	u32 interrupt_type;</div><div class='del'>-	u32 trigger_mode;</div><div class='del'>-	u32 vector_count;</div><div class='del'>-	u32 reserved;</div><div class='del'>-	struct hv_device_interrupt_target target;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_input_map_device_interrupt {</div><div class='del'>-	u64 partition_id;</div><div class='del'>-	u64 device_id;</div><div class='del'>-	u64 flags;</div><div class='del'>-	struct hv_interrupt_entry logical_interrupt_entry;</div><div class='del'>-	struct hv_device_interrupt_descriptor interrupt_descriptor;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_output_map_device_interrupt {</div><div class='del'>-	struct hv_interrupt_entry interrupt_entry;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_input_unmap_device_interrupt {</div><div class='del'>-	u64 partition_id;</div><div class='del'>-	u64 device_id;</div><div class='del'>-	struct hv_interrupt_entry interrupt_entry;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define HV_SOURCE_SHADOW_NONE               0x0</div><div class='del'>-#define HV_SOURCE_SHADOW_BRIDGE_BUS_RANGE   0x1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The whole argument should fit in a page to be able to pass to the hypervisor</div><div class='del'>- * in one hypercall.</div><div class='del'>- */</div><div class='del'>-#define HV_MEMORY_HINT_MAX_GPA_PAGE_RANGES  \</div><div class='del'>-	((HV_HYP_PAGE_SIZE - sizeof(struct hv_memory_hint)) / \</div><div class='del'>-		sizeof(union hv_gpa_page_range))</div><div class='del'>-</div><div class='del'>-/* HvExtCallMemoryHeatHint hypercall */</div><div class='del'>-#define HV_EXT_MEMORY_HEAT_HINT_TYPE_COLD_DISCARD	2</div><div class='del'>-struct hv_memory_hint {</div><div class='del'>-	u64 type:2;</div><div class='del'>-	u64 reserved:62;</div><div class='del'>-	union hv_gpa_page_range ranges[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* Data structures for HVCALL_MMIO_READ and HVCALL_MMIO_WRITE */</div><div class='del'>-#define HV_HYPERCALL_MMIO_MAX_DATA_LENGTH 64</div><div class='del'>-</div><div class='del'>-struct hv_mmio_read_input {</div><div class='del'>-	u64 gpa;</div><div class='del'>-	u32 size;</div><div class='del'>-	u32 reserved;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_mmio_read_output {</div><div class='del'>-	u8 data[HV_HYPERCALL_MMIO_MAX_DATA_LENGTH];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct hv_mmio_write_input {</div><div class='del'>-	u64 gpa;</div><div class='del'>-	u32 size;</div><div class='del'>-	u32 reserved;</div><div class='del'>-	u8 data[HV_HYPERCALL_MMIO_MAX_DATA_LENGTH];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h<br/>index bac63e874c7b..ca5a1ce6f0f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/io.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/io.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt; /* I/O is all done through memory accesses */</div><div class='ctx'> #include &lt;linux/string.h&gt; /* for memset() and memcpy() */</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/instruction_pointer.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -74,6 +75,7 @@</div><div class='ctx'> #if IS_ENABLED(CONFIG_TRACE_MMIO_ACCESS) &amp;&amp; !(defined(__DISABLE_TRACE_MMIO__))</div><div class='ctx'> #include &lt;linux/tracepoint-defs.h&gt;</div><div class='ctx'> </div><div class='add'>+#define rwmmio_tracepoint_enabled(tracepoint) tracepoint_enabled(tracepoint)</div><div class='ctx'> DECLARE_TRACEPOINT(rwmmio_write);</div><div class='ctx'> DECLARE_TRACEPOINT(rwmmio_post_write);</div><div class='ctx'> DECLARE_TRACEPOINT(rwmmio_read);</div><div class='hunk'>@@ -90,6 +92,7 @@ void log_post_read_mmio(u64 val, u8 width, const volatile void __iomem *addr,</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+#define rwmmio_tracepoint_enabled(tracepoint) false</div><div class='ctx'> static inline void log_write_mmio(u64 val, u8 width, volatile void __iomem *addr,</div><div class='ctx'> 				  unsigned long caller_addr, unsigned long caller_addr0) {}</div><div class='ctx'> static inline void log_post_write_mmio(u64 val, u8 width, volatile void __iomem *addr,</div><div class='hunk'>@@ -188,11 +191,13 @@ static inline u8 readb(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='del'>-	log_read_mmio(8, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_read))</div><div class='add'>+		log_read_mmio(8, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__io_br();</div><div class='ctx'> 	val = __raw_readb(addr);</div><div class='ctx'> 	__io_ar(val);</div><div class='del'>-	log_post_read_mmio(val, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_read))</div><div class='add'>+		log_post_read_mmio(val, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -203,11 +208,13 @@ static inline u16 readw(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='del'>-	log_read_mmio(16, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_read))</div><div class='add'>+		log_read_mmio(16, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__io_br();</div><div class='ctx'> 	val = __le16_to_cpu((__le16 __force)__raw_readw(addr));</div><div class='ctx'> 	__io_ar(val);</div><div class='del'>-	log_post_read_mmio(val, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_read))</div><div class='add'>+		log_post_read_mmio(val, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -218,11 +225,13 @@ static inline u32 readl(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	log_read_mmio(32, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_read))</div><div class='add'>+		log_read_mmio(32, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__io_br();</div><div class='ctx'> 	val = __le32_to_cpu((__le32 __force)__raw_readl(addr));</div><div class='ctx'> 	__io_ar(val);</div><div class='del'>-	log_post_read_mmio(val, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_read))</div><div class='add'>+		log_post_read_mmio(val, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -234,11 +243,13 @@ static inline u64 readq(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='del'>-	log_read_mmio(64, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_read))</div><div class='add'>+		log_read_mmio(64, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__io_br();</div><div class='ctx'> 	val = __le64_to_cpu((__le64 __force)__raw_readq(addr));</div><div class='ctx'> 	__io_ar(val);</div><div class='del'>-	log_post_read_mmio(val, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_read))</div><div class='add'>+		log_post_read_mmio(val, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -248,11 +259,13 @@ static inline u64 readq(const volatile void __iomem *addr)</div><div class='ctx'> #define writeb writeb</div><div class='ctx'> static inline void writeb(u8 value, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	log_write_mmio(value, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_write))</div><div class='add'>+		log_write_mmio(value, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__io_bw();</div><div class='ctx'> 	__raw_writeb(value, addr);</div><div class='ctx'> 	__io_aw();</div><div class='del'>-	log_post_write_mmio(value, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_write))</div><div class='add'>+		log_post_write_mmio(value, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -260,11 +273,13 @@ static inline void writeb(u8 value, volatile void __iomem *addr)</div><div class='ctx'> #define writew writew</div><div class='ctx'> static inline void writew(u16 value, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	log_write_mmio(value, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_write))</div><div class='add'>+		log_write_mmio(value, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__io_bw();</div><div class='ctx'> 	__raw_writew((u16 __force)cpu_to_le16(value), addr);</div><div class='ctx'> 	__io_aw();</div><div class='del'>-	log_post_write_mmio(value, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_write))</div><div class='add'>+		log_post_write_mmio(value, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -272,11 +287,13 @@ static inline void writew(u16 value, volatile void __iomem *addr)</div><div class='ctx'> #define writel writel</div><div class='ctx'> static inline void writel(u32 value, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	log_write_mmio(value, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_write))</div><div class='add'>+		log_write_mmio(value, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__io_bw();</div><div class='ctx'> 	__raw_writel((u32 __force)__cpu_to_le32(value), addr);</div><div class='ctx'> 	__io_aw();</div><div class='del'>-	log_post_write_mmio(value, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_write))</div><div class='add'>+		log_post_write_mmio(value, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -285,11 +302,13 @@ static inline void writel(u32 value, volatile void __iomem *addr)</div><div class='ctx'> #define writeq writeq</div><div class='ctx'> static inline void writeq(u64 value, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	log_write_mmio(value, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_write))</div><div class='add'>+		log_write_mmio(value, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__io_bw();</div><div class='ctx'> 	__raw_writeq((u64 __force)__cpu_to_le64(value), addr);</div><div class='ctx'> 	__io_aw();</div><div class='del'>-	log_post_write_mmio(value, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_write))</div><div class='add'>+		log_post_write_mmio(value, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* CONFIG_64BIT */</div><div class='hunk'>@@ -305,9 +324,11 @@ static inline u8 readb_relaxed(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='del'>-	log_read_mmio(8, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_read))</div><div class='add'>+		log_read_mmio(8, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	val = __raw_readb(addr);</div><div class='del'>-	log_post_read_mmio(val, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_read))</div><div class='add'>+		log_post_read_mmio(val, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -318,9 +339,11 @@ static inline u16 readw_relaxed(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='del'>-	log_read_mmio(16, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_read))</div><div class='add'>+		log_read_mmio(16, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	val = __le16_to_cpu((__le16 __force)__raw_readw(addr));</div><div class='del'>-	log_post_read_mmio(val, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_read))</div><div class='add'>+		log_post_read_mmio(val, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -331,9 +354,11 @@ static inline u32 readl_relaxed(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	log_read_mmio(32, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_read))</div><div class='add'>+		log_read_mmio(32, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	val = __le32_to_cpu((__le32 __force)__raw_readl(addr));</div><div class='del'>-	log_post_read_mmio(val, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_read))</div><div class='add'>+		log_post_read_mmio(val, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -344,9 +369,11 @@ static inline u64 readq_relaxed(const volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='del'>-	log_read_mmio(64, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_read))</div><div class='add'>+		log_read_mmio(64, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	val = __le64_to_cpu((__le64 __force)__raw_readq(addr));</div><div class='del'>-	log_post_read_mmio(val, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_read))</div><div class='add'>+		log_post_read_mmio(val, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -355,9 +382,11 @@ static inline u64 readq_relaxed(const volatile void __iomem *addr)</div><div class='ctx'> #define writeb_relaxed writeb_relaxed</div><div class='ctx'> static inline void writeb_relaxed(u8 value, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	log_write_mmio(value, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_write))</div><div class='add'>+		log_write_mmio(value, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__raw_writeb(value, addr);</div><div class='del'>-	log_post_write_mmio(value, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_write))</div><div class='add'>+		log_post_write_mmio(value, 8, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -365,9 +394,11 @@ static inline void writeb_relaxed(u8 value, volatile void __iomem *addr)</div><div class='ctx'> #define writew_relaxed writew_relaxed</div><div class='ctx'> static inline void writew_relaxed(u16 value, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	log_write_mmio(value, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_write))</div><div class='add'>+		log_write_mmio(value, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__raw_writew((u16 __force)cpu_to_le16(value), addr);</div><div class='del'>-	log_post_write_mmio(value, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_write))</div><div class='add'>+		log_post_write_mmio(value, 16, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -375,9 +406,11 @@ static inline void writew_relaxed(u16 value, volatile void __iomem *addr)</div><div class='ctx'> #define writel_relaxed writel_relaxed</div><div class='ctx'> static inline void writel_relaxed(u32 value, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	log_write_mmio(value, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_write))</div><div class='add'>+		log_write_mmio(value, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__raw_writel((u32 __force)__cpu_to_le32(value), addr);</div><div class='del'>-	log_post_write_mmio(value, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_write))</div><div class='add'>+		log_post_write_mmio(value, 32, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -385,9 +418,11 @@ static inline void writel_relaxed(u32 value, volatile void __iomem *addr)</div><div class='ctx'> #define writeq_relaxed writeq_relaxed</div><div class='ctx'> static inline void writeq_relaxed(u64 value, volatile void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	log_write_mmio(value, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_write))</div><div class='add'>+		log_write_mmio(value, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> 	__raw_writeq((u64 __force)__cpu_to_le64(value), addr);</div><div class='del'>-	log_post_write_mmio(value, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='add'>+	if (rwmmio_tracepoint_enabled(rwmmio_post_write))</div><div class='add'>+		log_post_write_mmio(value, 64, addr, _THIS_IP_, _RET_IP_);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -539,6 +574,7 @@ static inline void writesq(volatile void __iomem *addr, const void *buffer,</div><div class='ctx'> </div><div class='ctx'> #if !defined(inb) &amp;&amp; !defined(_inb)</div><div class='ctx'> #define _inb _inb</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline u8 _inb(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='hunk'>@@ -548,10 +584,15 @@ static inline u8 _inb(unsigned long addr)</div><div class='ctx'> 	__io_par(val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+u8 _inb(unsigned long addr)</div><div class='add'>+	__compiletime_error("inb()) requires CONFIG_HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if !defined(inw) &amp;&amp; !defined(_inw)</div><div class='ctx'> #define _inw _inw</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline u16 _inw(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='hunk'>@@ -561,10 +602,15 @@ static inline u16 _inw(unsigned long addr)</div><div class='ctx'> 	__io_par(val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+u16 _inw(unsigned long addr)</div><div class='add'>+	__compiletime_error("inw() requires CONFIG_HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if !defined(inl) &amp;&amp; !defined(_inl)</div><div class='ctx'> #define _inl _inl</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline u32 _inl(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -574,36 +620,55 @@ static inline u32 _inl(unsigned long addr)</div><div class='ctx'> 	__io_par(val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+u32 _inl(unsigned long addr)</div><div class='add'>+	__compiletime_error("inl() requires CONFIG_HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if !defined(outb) &amp;&amp; !defined(_outb)</div><div class='ctx'> #define _outb _outb</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void _outb(u8 value, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	__io_pbw();</div><div class='ctx'> 	__raw_writeb(value, PCI_IOBASE + addr);</div><div class='ctx'> 	__io_paw();</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void _outb(u8 value, unsigned long addr)</div><div class='add'>+	__compiletime_error("outb() requires CONFIG_HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if !defined(outw) &amp;&amp; !defined(_outw)</div><div class='ctx'> #define _outw _outw</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void _outw(u16 value, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	__io_pbw();</div><div class='ctx'> 	__raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);</div><div class='ctx'> 	__io_paw();</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void _outw(u16 value, unsigned long addr)</div><div class='add'>+	__compiletime_error("outw() requires CONFIG_HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if !defined(outl) &amp;&amp; !defined(_outl)</div><div class='ctx'> #define _outl _outl</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void _outl(u32 value, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	__io_pbw();</div><div class='ctx'> 	__raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);</div><div class='ctx'> 	__io_paw();</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void _outl(u32 value, unsigned long addr)</div><div class='add'>+	__compiletime_error("outl() requires CONFIG_HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/logic_pio.h&gt;</div><div class='hunk'>@@ -687,53 +752,83 @@ static inline void outl_p(u32 value, unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> #ifndef insb</div><div class='ctx'> #define insb insb</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void insb(unsigned long addr, void *buffer, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	readsb(PCI_IOBASE + addr, buffer, count);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void insb(unsigned long addr, void *buffer, unsigned int count)</div><div class='add'>+	__compiletime_error("insb() requires HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef insw</div><div class='ctx'> #define insw insw</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void insw(unsigned long addr, void *buffer, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	readsw(PCI_IOBASE + addr, buffer, count);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void insw(unsigned long addr, void *buffer, unsigned int count)</div><div class='add'>+	__compiletime_error("insw() requires HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef insl</div><div class='ctx'> #define insl insl</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void insl(unsigned long addr, void *buffer, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	readsl(PCI_IOBASE + addr, buffer, count);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void insl(unsigned long addr, void *buffer, unsigned int count)</div><div class='add'>+	__compiletime_error("insl() requires HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef outsb</div><div class='ctx'> #define outsb outsb</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void outsb(unsigned long addr, const void *buffer,</div><div class='ctx'> 			 unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	writesb(PCI_IOBASE + addr, buffer, count);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void outsb(unsigned long addr, const void *buffer, unsigned int count)</div><div class='add'>+	__compiletime_error("outsb() requires HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef outsw</div><div class='ctx'> #define outsw outsw</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void outsw(unsigned long addr, const void *buffer,</div><div class='ctx'> 			 unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	writesw(PCI_IOBASE + addr, buffer, count);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void outsw(unsigned long addr, const void *buffer, unsigned int count)</div><div class='add'>+	__compiletime_error("outsw() requires HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef outsl</div><div class='ctx'> #define outsl outsl</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> static inline void outsl(unsigned long addr, const void *buffer,</div><div class='ctx'> 			 unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	writesl(PCI_IOBASE + addr, buffer, count);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+void outsl(unsigned long addr, const void *buffer, unsigned int count)</div><div class='add'>+	__compiletime_error("outsl() requires HAS_IOPORT");</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef insb_p</div><div class='hunk'>@@ -991,7 +1086,6 @@ static inline void iowrite64_rep(volatile void __iomem *addr,</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #define __io_virt(x) ((void __force *)(x))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1051,7 +1145,7 @@ void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,</div><div class='ctx'> 				   pgprot_t prot);</div><div class='ctx'> </div><div class='ctx'> void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,</div><div class='del'>-			   unsigned long prot);</div><div class='add'>+			   pgprot_t prot);</div><div class='ctx'> void iounmap(volatile void __iomem *addr);</div><div class='ctx'> void generic_iounmap(volatile void __iomem *addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1060,7 +1154,7 @@ void generic_iounmap(volatile void __iomem *addr);</div><div class='ctx'> static inline void __iomem *ioremap(phys_addr_t addr, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	/* _PAGE_IOREMAP needs to be supplied by the architecture */</div><div class='del'>-	return ioremap_prot(addr, size, _PAGE_IOREMAP);</div><div class='add'>+	return ioremap_prot(addr, size, __pgprot(_PAGE_IOREMAP));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */</div><div class='hunk'>@@ -1151,55 +1245,39 @@ static inline void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef memset_io</div><div class='del'>-#define memset_io memset_io</div><div class='ctx'> /**</div><div class='del'>- * memset_io	Set a range of I/O memory to a constant value</div><div class='add'>+ * memset_io -	Set a range of I/O memory to a constant value</div><div class='ctx'>  * @addr:	The beginning of the I/O-memory range to set</div><div class='ctx'>  * @val:	The value to set the memory to</div><div class='ctx'>  * @count:	The number of bytes to set</div><div class='ctx'>  *</div><div class='ctx'>  * Set a range of I/O memory to a given value.</div><div class='ctx'>  */</div><div class='del'>-static inline void memset_io(volatile void __iomem *addr, int value,</div><div class='del'>-			     size_t size)</div><div class='del'>-{</div><div class='del'>-	memset(__io_virt(addr), value, size);</div><div class='del'>-}</div><div class='add'>+void memset_io(volatile void __iomem *addr, int val, size_t count);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef memcpy_fromio</div><div class='del'>-#define memcpy_fromio memcpy_fromio</div><div class='ctx'> /**</div><div class='del'>- * memcpy_fromio	Copy a block of data from I/O memory</div><div class='add'>+ * memcpy_fromio -	Copy a block of data from I/O memory</div><div class='ctx'>  * @dst:		The (RAM) destination for the copy</div><div class='ctx'>  * @src:		The (I/O memory) source for the data</div><div class='ctx'>  * @count:		The number of bytes to copy</div><div class='ctx'>  *</div><div class='ctx'>  * Copy a block of data from I/O memory.</div><div class='ctx'>  */</div><div class='del'>-static inline void memcpy_fromio(void *buffer,</div><div class='del'>-				 const volatile void __iomem *addr,</div><div class='del'>-				 size_t size)</div><div class='del'>-{</div><div class='del'>-	memcpy(buffer, __io_virt(addr), size);</div><div class='del'>-}</div><div class='add'>+void memcpy_fromio(void *dst, const volatile void __iomem *src, size_t count);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef memcpy_toio</div><div class='del'>-#define memcpy_toio memcpy_toio</div><div class='ctx'> /**</div><div class='del'>- * memcpy_toio		Copy a block of data into I/O memory</div><div class='add'>+ * memcpy_toio -	Copy a block of data into I/O memory</div><div class='ctx'>  * @dst:		The (I/O memory) destination for the copy</div><div class='ctx'>  * @src:		The (RAM) source for the data</div><div class='ctx'>  * @count:		The number of bytes to copy</div><div class='ctx'>  *</div><div class='ctx'>  * Copy a block of data to I/O memory.</div><div class='ctx'>  */</div><div class='del'>-static inline void memcpy_toio(volatile void __iomem *addr, const void *buffer,</div><div class='del'>-			       size_t size)</div><div class='del'>-{</div><div class='del'>-	memcpy(__io_virt(addr), buffer, size);</div><div class='del'>-}</div><div class='add'>+void memcpy_toio(volatile void __iomem *dst, const void *src, size_t count);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern int devmem_is_allowed(unsigned long pfn);</div><div class='head'>diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h<br/>index 196087a8126e..9f3f25d7fc58 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/iomap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/iomap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/iomap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/iomap.h</a></div><div class='hunk'>@@ -31,42 +31,22 @@ extern unsigned int ioread16(const void __iomem *);</div><div class='ctx'> extern unsigned int ioread16be(const void __iomem *);</div><div class='ctx'> extern unsigned int ioread32(const void __iomem *);</div><div class='ctx'> extern unsigned int ioread32be(const void __iomem *);</div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='del'>-extern u64 ioread64(const void __iomem *);</div><div class='del'>-extern u64 ioread64be(const void __iomem *);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef readq</div><div class='del'>-#define ioread64_lo_hi ioread64_lo_hi</div><div class='del'>-#define ioread64_hi_lo ioread64_hi_lo</div><div class='del'>-#define ioread64be_lo_hi ioread64be_lo_hi</div><div class='del'>-#define ioread64be_hi_lo ioread64be_hi_lo</div><div class='del'>-extern u64 ioread64_lo_hi(const void __iomem *addr);</div><div class='del'>-extern u64 ioread64_hi_lo(const void __iomem *addr);</div><div class='del'>-extern u64 ioread64be_lo_hi(const void __iomem *addr);</div><div class='del'>-extern u64 ioread64be_hi_lo(const void __iomem *addr);</div><div class='del'>-#endif</div><div class='add'>+extern u64 __ioread64_lo_hi(const void __iomem *addr);</div><div class='add'>+extern u64 __ioread64_hi_lo(const void __iomem *addr);</div><div class='add'>+extern u64 __ioread64be_lo_hi(const void __iomem *addr);</div><div class='add'>+extern u64 __ioread64be_hi_lo(const void __iomem *addr);</div><div class='ctx'> </div><div class='ctx'> extern void iowrite8(u8, void __iomem *);</div><div class='ctx'> extern void iowrite16(u16, void __iomem *);</div><div class='ctx'> extern void iowrite16be(u16, void __iomem *);</div><div class='ctx'> extern void iowrite32(u32, void __iomem *);</div><div class='ctx'> extern void iowrite32be(u32, void __iomem *);</div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='del'>-extern void iowrite64(u64, void __iomem *);</div><div class='del'>-extern void iowrite64be(u64, void __iomem *);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef writeq</div><div class='del'>-#define iowrite64_lo_hi iowrite64_lo_hi</div><div class='del'>-#define iowrite64_hi_lo iowrite64_hi_lo</div><div class='del'>-#define iowrite64be_lo_hi iowrite64be_lo_hi</div><div class='del'>-#define iowrite64be_hi_lo iowrite64be_hi_lo</div><div class='del'>-extern void iowrite64_lo_hi(u64 val, void __iomem *addr);</div><div class='del'>-extern void iowrite64_hi_lo(u64 val, void __iomem *addr);</div><div class='del'>-extern void iowrite64be_lo_hi(u64 val, void __iomem *addr);</div><div class='del'>-extern void iowrite64be_hi_lo(u64 val, void __iomem *addr);</div><div class='del'>-#endif</div><div class='add'>+extern void __iowrite64_lo_hi(u64 val, void __iomem *addr);</div><div class='add'>+extern void __iowrite64_hi_lo(u64 val, void __iomem *addr);</div><div class='add'>+extern void __iowrite64be_lo_hi(u64 val, void __iomem *addr);</div><div class='add'>+extern void __iowrite64be_hi_lo(u64 val, void __iomem *addr);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * "string" versions of the above. Note that they</div><div class='head'>diff --git a/include/asm-generic/mcs_spinlock.h b/include/asm-generic/mcs_spinlock.h<br/>index 10cd4ffc6ba2..39c94012b88a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/mcs_spinlock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/mcs_spinlock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/mcs_spinlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/mcs_spinlock.h</a></div><div class='hunk'>@@ -1,6 +1,12 @@</div><div class='ctx'> #ifndef __ASM_MCS_SPINLOCK_H</div><div class='ctx'> #define __ASM_MCS_SPINLOCK_H</div><div class='ctx'> </div><div class='add'>+struct mcs_spinlock {</div><div class='add'>+	struct mcs_spinlock *next;</div><div class='add'>+	int locked; /* 1 if lock acquired */</div><div class='add'>+	int count;  /* nesting count, see qspinlock.c */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Architectures can define their own:</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h<br/>index 6796abe1900e..efa6610acbc7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/memory_model.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/memory_model.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/memory_model.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/memory_model.h</a></div><div class='hunk'>@@ -19,17 +19,26 @@</div><div class='ctx'> #define __page_to_pfn(page)	((unsigned long)((page) - mem_map) + \</div><div class='ctx'> 				 ARCH_PFN_OFFSET)</div><div class='ctx'> </div><div class='add'>+/* avoid &lt;linux/mm.h&gt; include hell */</div><div class='add'>+extern unsigned long max_mapnr;</div><div class='add'>+</div><div class='ctx'> #ifndef pfn_valid</div><div class='ctx'> static inline int pfn_valid(unsigned long pfn)</div><div class='ctx'> {</div><div class='del'>-	/* avoid &lt;linux/mm.h&gt; include hell */</div><div class='del'>-	extern unsigned long max_mapnr;</div><div class='ctx'> 	unsigned long pfn_offset = ARCH_PFN_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	return pfn &gt;= pfn_offset &amp;&amp; (pfn - pfn_offset) &lt; max_mapnr;</div><div class='ctx'> }</div><div class='ctx'> #define pfn_valid pfn_valid</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#ifndef for_each_valid_pfn</div><div class='add'>+#define for_each_valid_pfn(pfn, start_pfn, end_pfn)			 \</div><div class='add'>+	for ((pfn) = max_t(unsigned long, (start_pfn), ARCH_PFN_OFFSET); \</div><div class='add'>+	     (pfn) &lt; min_t(unsigned long, (end_pfn),			 \</div><div class='add'>+			   ARCH_PFN_OFFSET + max_mapnr);		 \</div><div class='add'>+	     (pfn)++)</div><div class='add'>+#endif /* for_each_valid_pfn */</div><div class='add'>+#endif /* valid_pfn */</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_SPARSEMEM_VMEMMAP)</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +53,7 @@ static inline int pfn_valid(unsigned long pfn)</div><div class='ctx'>  */</div><div class='ctx'> #define __page_to_pfn(pg)					\</div><div class='ctx'> ({	const struct page *__pg = (pg);				\</div><div class='del'>-	int __sec = page_to_section(__pg);			\</div><div class='add'>+	int __sec = memdesc_section(__pg-&gt;flags);		\</div><div class='ctx'> 	(unsigned long)(__pg - __section_mem_map_addr(__nr_to_section(__sec)));	\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='hunk'>@@ -64,6 +73,19 @@ static inline int pfn_valid(unsigned long pfn)</div><div class='ctx'> #define page_to_pfn __page_to_pfn</div><div class='ctx'> #define pfn_to_page __pfn_to_page</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_VIRTUAL</div><div class='add'>+#define page_to_phys(page)						\</div><div class='add'>+({									\</div><div class='add'>+	unsigned long __pfn = page_to_pfn(page);			\</div><div class='add'>+									\</div><div class='add'>+	WARN_ON_ONCE(!pfn_valid(__pfn));				\</div><div class='add'>+	PFN_PHYS(__pfn);						\</div><div class='add'>+})</div><div class='add'>+#else</div><div class='add'>+#define page_to_phys(page)	PFN_PHYS(page_to_pfn(page))</div><div class='add'>+#endif /* CONFIG_DEBUG_VIRTUAL */</div><div class='add'>+#define phys_to_page(phys)	pfn_to_page(PHYS_PFN(phys))</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-generic/mm_hooks.h b/include/asm-generic/mm_hooks.h<br/>index 4dbb177d1150..6eea3b3c1e65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/mm_hooks.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/mm_hooks.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/mm_hooks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/mm_hooks.h</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- * Define generic no-op hooks for arch_dup_mmap, arch_exit_mmap</div><div class='del'>- * and arch_unmap to be included in asm-FOO/mmu_context.h for any</div><div class='del'>- * arch FOO which doesn't need to hook these.</div><div class='add'>+ * Define generic no-op hooks for arch_dup_mmap and arch_exit_mmap</div><div class='add'>+ * to be included in asm-FOO/mmu_context.h for any arch FOO which</div><div class='add'>+ * doesn't need to hook these.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _ASM_GENERIC_MM_HOOKS_H</div><div class='ctx'> #define _ASM_GENERIC_MM_HOOKS_H</div><div class='hunk'>@@ -17,11 +17,6 @@ static inline void arch_exit_mmap(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void arch_unmap(struct mm_struct *mm,</div><div class='del'>-			unsigned long start, unsigned long end)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,</div><div class='ctx'> 		bool write, bool execute, bool foreign)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-generic/mmzone.h b/include/asm-generic/mmzone.h<br/>new file mode 100644<br/>index 000000000000..2ab5193e8394<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/mmzone.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/mmzone.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_GENERIC_MMZONE_H</div><div class='add'>+#define _ASM_GENERIC_MMZONE_H</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/asm-generic/module.h b/include/asm-generic/module.h<br/>index 98e1541b72b7..a8622501b975 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/module.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/module.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/module.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/module.h</a></div><div class='hunk'>@@ -19,12 +19,8 @@ struct mod_arch_specific</div><div class='ctx'> #define Elf_Dyn		Elf64_Dyn</div><div class='ctx'> #define Elf_Ehdr	Elf64_Ehdr</div><div class='ctx'> #define Elf_Addr	Elf64_Addr</div><div class='del'>-#ifdef CONFIG_MODULES_USE_ELF_REL</div><div class='ctx'> #define Elf_Rel		Elf64_Rel</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MODULES_USE_ELF_RELA</div><div class='ctx'> #define Elf_Rela	Elf64_Rela</div><div class='del'>-#endif</div><div class='ctx'> #define ELF_R_TYPE(X)	ELF64_R_TYPE(X)</div><div class='ctx'> #define ELF_R_SYM(X)	ELF64_R_SYM(X)</div><div class='ctx'> </div><div class='hunk'>@@ -36,12 +32,8 @@ struct mod_arch_specific</div><div class='ctx'> #define Elf_Dyn		Elf32_Dyn</div><div class='ctx'> #define Elf_Ehdr	Elf32_Ehdr</div><div class='ctx'> #define Elf_Addr	Elf32_Addr</div><div class='del'>-#ifdef CONFIG_MODULES_USE_ELF_REL</div><div class='ctx'> #define Elf_Rel		Elf32_Rel</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MODULES_USE_ELF_RELA</div><div class='ctx'> #define Elf_Rela	Elf32_Rela</div><div class='del'>-#endif</div><div class='ctx'> #define ELF_R_TYPE(X)	ELF32_R_TYPE(X)</div><div class='ctx'> #define ELF_R_SYM(X)	ELF32_R_SYM(X)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h<br/>index 430f0ae0dde2..ecedab554c80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/mshyperv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/mshyperv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/mshyperv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/mshyperv.h</a></div><div class='hunk'>@@ -6,9 +6,8 @@</div><div class='ctx'>  * independent. See arch/&lt;arch&gt;/include/asm/mshyperv.h for definitions</div><div class='ctx'>  * that are specific to architecture &lt;arch&gt;.</div><div class='ctx'>  *</div><div class='del'>- * Definitions that are specified in the Hyper-V Top Level Functional</div><div class='del'>- * Spec (TLFS) should not go in this file, but should instead go in</div><div class='del'>- * hyperv-tlfs.h.</div><div class='add'>+ * Definitions that are derived from Hyper-V code or headers should not go in</div><div class='add'>+ * this file, but should instead go in the relevant files in include/hyperv.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2019, Microsoft, Inc.</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,16 +20,24 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;acpi/acpi_numa.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/hyperv-tlfs.h&gt;</div><div class='add'>+#include &lt;hyperv/hvhdk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VTPM_BASE_ADDRESS 0xfed40000</div><div class='ctx'> </div><div class='add'>+enum hv_partition_type {</div><div class='add'>+	HV_PARTITION_TYPE_GUEST,</div><div class='add'>+	HV_PARTITION_TYPE_ROOT,</div><div class='add'>+	HV_PARTITION_TYPE_L1VH,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ms_hyperv_info {</div><div class='ctx'> 	u32 features;</div><div class='ctx'> 	u32 priv_high;</div><div class='add'>+	u32 ext_features;</div><div class='ctx'> 	u32 misc_features;</div><div class='ctx'> 	u32 hints;</div><div class='ctx'> 	u32 nested_features;</div><div class='hunk'>@@ -55,18 +62,50 @@ struct ms_hyperv_info {</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> 	u64 shared_gpa_boundary;</div><div class='add'>+	bool msi_ext_dest_id;</div><div class='add'>+	bool confidential_vmbus_available;</div><div class='ctx'> };</div><div class='ctx'> extern struct ms_hyperv_info ms_hyperv;</div><div class='ctx'> extern bool hv_nested;</div><div class='add'>+extern u64 hv_current_partition_id;</div><div class='add'>+extern enum hv_partition_type hv_curr_partition_type;</div><div class='ctx'> </div><div class='ctx'> extern void * __percpu *hyperv_pcpu_input_arg;</div><div class='ctx'> extern void * __percpu *hyperv_pcpu_output_arg;</div><div class='ctx'> </div><div class='del'>-extern u64 hv_do_hypercall(u64 control, void *inputaddr, void *outputaddr);</div><div class='del'>-extern u64 hv_do_fast_hypercall8(u16 control, u64 input8);</div><div class='add'>+u64 hv_do_hypercall(u64 control, void *inputaddr, void *outputaddr);</div><div class='add'>+u64 hv_do_fast_hypercall8(u16 control, u64 input8);</div><div class='add'>+u64 hv_do_fast_hypercall16(u16 control, u64 input1, u64 input2);</div><div class='add'>+</div><div class='ctx'> bool hv_isolation_type_snp(void);</div><div class='ctx'> bool hv_isolation_type_tdx(void);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * On architectures where Hyper-V doesn't support AEOI (e.g., ARM64),</div><div class='add'>+ * it doesn't provide a recommendation flag and AEOI must be disabled.</div><div class='add'>+ */</div><div class='add'>+static inline bool hv_recommend_using_aeoi(void)</div><div class='add'>+{</div><div class='add'>+#ifdef HV_DEPRECATING_AEOI_RECOMMENDED</div><div class='add'>+	return !(ms_hyperv.hints &amp; HV_DEPRECATING_AEOI_RECOMMENDED);</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct hv_proximity_domain_info hv_numa_node_to_pxm_info(int node)</div><div class='add'>+{</div><div class='add'>+	struct hv_proximity_domain_info pxm_info = {};</div><div class='add'>+</div><div class='add'>+	if (node != NUMA_NO_NODE) {</div><div class='add'>+		pxm_info.domain_id = node_to_pxm(node);</div><div class='add'>+		pxm_info.flags.proximity_info_valid = 1;</div><div class='add'>+		pxm_info.flags.proximity_preferred = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pxm_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Helper functions that provide a consistent pattern for checking Hyper-V hypercall status. */</div><div class='ctx'> static inline int hv_result(u64 status)</div><div class='ctx'> {</div><div class='hunk'>@@ -87,10 +126,12 @@ static inline unsigned int hv_repcomp(u64 status)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Rep hypercalls. Callers of this functions are supposed to ensure that</div><div class='del'>- * rep_count and varhead_size comply with Hyper-V hypercall definition.</div><div class='add'>+ * rep_count, varhead_size, and rep_start comply with Hyper-V hypercall</div><div class='add'>+ * definition.</div><div class='ctx'>  */</div><div class='del'>-static inline u64 hv_do_rep_hypercall(u16 code, u16 rep_count, u16 varhead_size,</div><div class='del'>-				      void *input, void *output)</div><div class='add'>+static inline u64 hv_do_rep_hypercall_ex(u16 code, u16 rep_count,</div><div class='add'>+					 u16 varhead_size, u16 rep_start,</div><div class='add'>+					 void *input, void *output)</div><div class='ctx'> {</div><div class='ctx'> 	u64 control = code;</div><div class='ctx'> 	u64 status;</div><div class='hunk'>@@ -98,6 +139,7 @@ static inline u64 hv_do_rep_hypercall(u16 code, u16 rep_count, u16 varhead_size,</div><div class='ctx'> </div><div class='ctx'> 	control |= (u64)varhead_size &lt;&lt; HV_HYPERCALL_VARHEAD_OFFSET;</div><div class='ctx'> 	control |= (u64)rep_count &lt;&lt; HV_HYPERCALL_REP_COMP_OFFSET;</div><div class='add'>+	control |= (u64)rep_start &lt;&lt; HV_HYPERCALL_REP_START_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		status = hv_do_hypercall(control, input, output);</div><div class='hunk'>@@ -115,6 +157,14 @@ static inline u64 hv_do_rep_hypercall(u16 code, u16 rep_count, u16 varhead_size,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* For the typical case where rep_start is 0 */</div><div class='add'>+static inline u64 hv_do_rep_hypercall(u16 code, u16 rep_count, u16 varhead_size,</div><div class='add'>+				      void *input, void *output)</div><div class='add'>+{</div><div class='add'>+	return hv_do_rep_hypercall_ex(code, rep_count, varhead_size, 0,</div><div class='add'>+				      input, output);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Generate the guest OS identifier as described in the Hyper-V TLFS */</div><div class='ctx'> static inline u64 hv_generate_guest_id(u64 kernel_version)</div><div class='ctx'> {</div><div class='hunk'>@@ -126,40 +176,7 @@ static inline u64 hv_generate_guest_id(u64 kernel_version)</div><div class='ctx'> 	return guest_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Free the message slot and signal end-of-message if required */</div><div class='del'>-static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * On crash we're reading some other CPU's message page and we need</div><div class='del'>-	 * to be careful: this other CPU may already had cleared the header</div><div class='del'>-	 * and the host may already had delivered some other message there.</div><div class='del'>-	 * In case we blindly write msg-&gt;header.message_type we're going</div><div class='del'>-	 * to lose it. We can still lose a message of the same type but</div><div class='del'>-	 * we count on the fact that there can only be one</div><div class='del'>-	 * CHANNELMSG_UNLOAD_RESPONSE and we don't care about other messages</div><div class='del'>-	 * on crash.</div><div class='del'>-	 */</div><div class='del'>-	if (cmpxchg(&amp;msg-&gt;header.message_type, old_msg_type,</div><div class='del'>-		    HVMSG_NONE) != old_msg_type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The cmxchg() above does an implicit memory barrier to</div><div class='del'>-	 * ensure the write to MessageType (ie set to</div><div class='del'>-	 * HVMSG_NONE) happens before we read the</div><div class='del'>-	 * MessagePending and EOMing. Otherwise, the EOMing</div><div class='del'>-	 * will not deliver any more messages since there is</div><div class='del'>-	 * no empty slot</div><div class='del'>-	 */</div><div class='del'>-	if (msg-&gt;header.message_flags.msg_pending) {</div><div class='del'>-		/*</div><div class='del'>-		 * This will cause message queue rescan to</div><div class='del'>-		 * possibly deliver another msg from the</div><div class='del'>-		 * hypervisor</div><div class='del'>-		 */</div><div class='del'>-		hv_set_register(HV_REGISTER_EOM, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+int hv_get_hypervisor_version(union hv_hypervisor_version_info *info);</div><div class='ctx'> </div><div class='ctx'> void hv_setup_vmbus_handler(void (*handler)(void));</div><div class='ctx'> void hv_remove_vmbus_handler(void);</div><div class='hunk'>@@ -170,11 +187,7 @@ void hv_setup_kexec_handler(void (*handler)(void));</div><div class='ctx'> void hv_remove_kexec_handler(void);</div><div class='ctx'> void hv_setup_crash_handler(void (*handler)(struct pt_regs *regs));</div><div class='ctx'> void hv_remove_crash_handler(void);</div><div class='del'>-</div><div class='del'>-extern int vmbus_interrupt;</div><div class='del'>-extern int vmbus_irq;</div><div class='del'>-</div><div class='del'>-extern bool hv_root_partition;</div><div class='add'>+void hv_setup_mshv_handler(void (*handler)(void));</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_HYPERV)</div><div class='ctx'> /*</div><div class='hunk'>@@ -192,13 +205,12 @@ extern u64 (*hv_read_reference_counter)(void);</div><div class='ctx'> #define VP_INVAL	U32_MAX</div><div class='ctx'> </div><div class='ctx'> int __init hv_common_init(void);</div><div class='add'>+void __init hv_get_partition_id(void);</div><div class='ctx'> void __init hv_common_free(void);</div><div class='add'>+void __init ms_hyperv_late_init(void);</div><div class='ctx'> int hv_common_cpu_init(unsigned int cpu);</div><div class='ctx'> int hv_common_cpu_die(unsigned int cpu);</div><div class='del'>-</div><div class='del'>-void *hv_alloc_hyperv_page(void);</div><div class='del'>-void *hv_alloc_hyperv_zeroed_page(void);</div><div class='del'>-void hv_free_hyperv_page(void *addr);</div><div class='add'>+void hv_identify_partition_type(void);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * hv_cpu_number_to_vp_number() - Map CPU to VP.</div><div class='hunk'>@@ -275,6 +287,20 @@ static inline int cpumask_to_vpset_skip(struct hv_vpset *vpset,</div><div class='ctx'> 	return __cpumask_to_vpset(vpset, cpus, func);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define _hv_status_fmt(fmt) "%s: Hyper-V status: %#x = %s: " fmt</div><div class='add'>+#define hv_status_printk(level, status, fmt, ...) \</div><div class='add'>+do { \</div><div class='add'>+	u64 __status = (status); \</div><div class='add'>+	pr_##level(_hv_status_fmt(fmt), __func__, hv_result(__status), \</div><div class='add'>+		   hv_result_to_string(__status), ##__VA_ARGS__); \</div><div class='add'>+} while (0)</div><div class='add'>+#define hv_status_err(status, fmt, ...) \</div><div class='add'>+	hv_status_printk(err, status, fmt, ##__VA_ARGS__)</div><div class='add'>+#define hv_status_debug(status, fmt, ...) \</div><div class='add'>+	hv_status_printk(debug, status, fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+const char *hv_result_to_string(u64 hv_status);</div><div class='add'>+int hv_result_to_errno(u64 status);</div><div class='ctx'> void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die);</div><div class='ctx'> bool hv_is_hyperv_initialized(void);</div><div class='ctx'> bool hv_is_hibernation_supported(void);</div><div class='hunk'>@@ -283,13 +309,19 @@ bool hv_is_isolation_supported(void);</div><div class='ctx'> bool hv_isolation_type_snp(void);</div><div class='ctx'> u64 hv_ghcb_hypercall(u64 control, void *input, void *output, u32 input_size);</div><div class='ctx'> u64 hv_tdx_hypercall(u64 control, u64 param1, u64 param2);</div><div class='add'>+void hv_enable_coco_interrupt(unsigned int cpu, unsigned int vector, bool set);</div><div class='add'>+void hv_para_set_sint_proxy(bool enable);</div><div class='add'>+u64 hv_para_get_synic_register(unsigned int reg);</div><div class='add'>+void hv_para_set_synic_register(unsigned int reg, u64 val);</div><div class='ctx'> void hyperv_cleanup(void);</div><div class='ctx'> bool hv_query_ext_cap(u64 cap_query);</div><div class='ctx'> void hv_setup_dma_ops(struct device *dev, bool coherent);</div><div class='ctx'> #else /* CONFIG_HYPERV */</div><div class='add'>+static inline void hv_identify_partition_type(void) {}</div><div class='ctx'> static inline bool hv_is_hyperv_initialized(void) { return false; }</div><div class='ctx'> static inline bool hv_is_hibernation_supported(void) { return false; }</div><div class='ctx'> static inline void hyperv_cleanup(void) {}</div><div class='add'>+static inline void ms_hyperv_late_init(void) {}</div><div class='ctx'> static inline bool hv_is_isolation_supported(void) { return false; }</div><div class='ctx'> static inline enum hv_isolation_type hv_get_isolation_type(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -297,4 +329,45 @@ static inline enum hv_isolation_type hv_get_isolation_type(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_HYPERV */</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_MSHV_ROOT)</div><div class='add'>+static inline bool hv_root_partition(void)</div><div class='add'>+{</div><div class='add'>+	return hv_curr_partition_type == HV_PARTITION_TYPE_ROOT;</div><div class='add'>+}</div><div class='add'>+static inline bool hv_l1vh_partition(void)</div><div class='add'>+{</div><div class='add'>+	return hv_curr_partition_type == HV_PARTITION_TYPE_L1VH;</div><div class='add'>+}</div><div class='add'>+static inline bool hv_parent_partition(void)</div><div class='add'>+{</div><div class='add'>+	return hv_root_partition() || hv_l1vh_partition();</div><div class='add'>+}</div><div class='add'>+int hv_call_deposit_pages(int node, u64 partition_id, u32 num_pages);</div><div class='add'>+int hv_call_add_logical_proc(int node, u32 lp_index, u32 acpi_id);</div><div class='add'>+int hv_call_create_vp(int node, u64 partition_id, u32 vp_index, u32 flags);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MSHV_ROOT */</div><div class='add'>+static inline bool hv_root_partition(void) { return false; }</div><div class='add'>+static inline bool hv_l1vh_partition(void) { return false; }</div><div class='add'>+static inline bool hv_parent_partition(void) { return false; }</div><div class='add'>+static inline int hv_call_deposit_pages(int node, u64 partition_id, u32 num_pages)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int hv_call_add_logical_proc(int node, u32 lp_index, u32 acpi_id)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int hv_call_create_vp(int node, u64 partition_id, u32 vp_index, u32 flags)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MSHV_ROOT */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_HYPERV_VTL_MODE)</div><div class='add'>+u8 __init get_vtl(void);</div><div class='add'>+#else</div><div class='add'>+static inline u8 get_vtl(void) { return 0; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/asm-generic/msi.h b/include/asm-generic/msi.h<br/>index 124c734ca5d9..92cca4b23f13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/msi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/msi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/msi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/msi.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@ typedef struct msi_alloc_info {</div><div class='ctx'> </div><div class='ctx'> /* Device generating MSIs is proxying for another device */</div><div class='ctx'> #define MSI_ALLOC_FLAGS_PROXY_DEVICE	(1UL &lt;&lt; 0)</div><div class='add'>+#define MSI_ALLOC_FLAGS_FIXED_MSG_DATA	(1UL &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> #define GENERIC_MSI_DOMAIN_OPS		1</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-generic/numa.h b/include/asm-generic/numa.h<br/>index c32e0cf23c90..e063d6487f66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/numa.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/numa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/numa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/numa.h</a></div><div class='hunk'>@@ -32,10 +32,8 @@ static inline const struct cpumask *cpumask_of_node(int node)</div><div class='ctx'> </div><div class='ctx'> void __init arch_numa_init(void);</div><div class='ctx'> int __init numa_add_memblk(int nodeid, u64 start, u64 end);</div><div class='del'>-void __init numa_set_distance(int from, int to, int distance);</div><div class='del'>-void __init numa_free_distance(void);</div><div class='ctx'> void __init early_map_cpu_to_node(unsigned int cpu, int nid);</div><div class='del'>-int __init early_cpu_to_node(int cpu);</div><div class='add'>+int early_cpu_to_node(int cpu);</div><div class='ctx'> void numa_store_cpu_info(unsigned int cpu);</div><div class='ctx'> void numa_add_cpu(unsigned int cpu);</div><div class='ctx'> void numa_remove_cpu(unsigned int cpu);</div><div class='hunk'>@@ -51,4 +49,8 @@ static inline int early_cpu_to_node(int cpu) { return 0; }</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_NUMA */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NUMA_EMU</div><div class='add'>+void debug_cpumask_set_cpu(unsigned int cpu, int node, bool enable);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif	/* __ASM_GENERIC_NUMA_H */</div><div class='head'>diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h<br/>deleted file mode 100644<br/>index 9773582fd96e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/page.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,103 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __ASM_GENERIC_PAGE_H</div><div class='del'>-#define __ASM_GENERIC_PAGE_H</div><div class='del'>-/*</div><div class='del'>- * Generic page.h implementation, for NOMMU architectures.</div><div class='del'>- * This provides the dummy definitions for the memory management.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-#error need to provide a real asm/page.h</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* PAGE_SHIFT determines the page size */</div><div class='del'>-</div><div class='del'>-#define PAGE_SHIFT	12</div><div class='del'>-#ifdef __ASSEMBLY__</div><div class='del'>-#define PAGE_SIZE	(1 &lt;&lt; PAGE_SHIFT)</div><div class='del'>-#else</div><div class='del'>-#define PAGE_SIZE	(1UL &lt;&lt; PAGE_SHIFT)</div><div class='del'>-#endif</div><div class='del'>-#define PAGE_MASK	(~(PAGE_SIZE-1))</div><div class='del'>-</div><div class='del'>-#include &lt;asm/setup.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-#define clear_page(page)	memset((page), 0, PAGE_SIZE)</div><div class='del'>-#define copy_page(to,from)	memcpy((to), (from), PAGE_SIZE)</div><div class='del'>-</div><div class='del'>-#define clear_user_page(page, vaddr, pg)	clear_page(page)</div><div class='del'>-#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These are used to make use of C type-checking..</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned long pte;</div><div class='del'>-} pte_t;</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned long pmd[16];</div><div class='del'>-} pmd_t;</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned long pgd;</div><div class='del'>-} pgd_t;</div><div class='del'>-typedef struct {</div><div class='del'>-	unsigned long pgprot;</div><div class='del'>-} pgprot_t;</div><div class='del'>-typedef struct page *pgtable_t;</div><div class='del'>-</div><div class='del'>-#define pte_val(x)	((x).pte)</div><div class='del'>-#define pmd_val(x)	((&amp;x)-&gt;pmd[0])</div><div class='del'>-#define pgd_val(x)	((x).pgd)</div><div class='del'>-#define pgprot_val(x)	((x).pgprot)</div><div class='del'>-</div><div class='del'>-#define __pte(x)	((pte_t) { (x) } )</div><div class='del'>-#define __pmd(x)	((pmd_t) { (x) } )</div><div class='del'>-#define __pgd(x)	((pgd_t) { (x) } )</div><div class='del'>-#define __pgprot(x)	((pgprot_t) { (x) } )</div><div class='del'>-</div><div class='del'>-extern unsigned long memory_start;</div><div class='del'>-extern unsigned long memory_end;</div><div class='del'>-</div><div class='del'>-#endif /* !__ASSEMBLY__ */</div><div class='del'>-</div><div class='del'>-#define PAGE_OFFSET		(0)</div><div class='del'>-</div><div class='del'>-#ifndef ARCH_PFN_OFFSET</div><div class='del'>-#define ARCH_PFN_OFFSET		(PAGE_OFFSET &gt;&gt; PAGE_SHIFT)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-</div><div class='del'>-#define __va(x) ((void *)((unsigned long) (x)))</div><div class='del'>-#define __pa(x) ((unsigned long) (x))</div><div class='del'>-</div><div class='del'>-static inline unsigned long virt_to_pfn(const void *kaddr)</div><div class='del'>-{</div><div class='del'>-	return __pa(kaddr) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-}</div><div class='del'>-#define virt_to_pfn virt_to_pfn</div><div class='del'>-static inline void *pfn_to_virt(unsigned long pfn)</div><div class='del'>-{</div><div class='del'>-	return __va(pfn) &lt;&lt; PAGE_SHIFT;</div><div class='del'>-}</div><div class='del'>-#define pfn_to_virt pfn_to_virt</div><div class='del'>-</div><div class='del'>-#define virt_to_page(addr)	pfn_to_page(virt_to_pfn(addr))</div><div class='del'>-#define page_to_virt(page)	pfn_to_virt(page_to_pfn(page))</div><div class='del'>-</div><div class='del'>-#ifndef page_to_phys</div><div class='del'>-#define page_to_phys(page)      ((dma_addr_t)page_to_pfn(page) &lt;&lt; PAGE_SHIFT)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define	virt_addr_valid(kaddr)	(((void *)(kaddr) &gt;= (void *)PAGE_OFFSET) &amp;&amp; \</div><div class='del'>-				((void *)(kaddr) &lt; (void *)memory_end))</div><div class='del'>-</div><div class='del'>-#endif /* __ASSEMBLY__ */</div><div class='del'>-</div><div class='del'>-#include &lt;asm-generic/memory_model.h&gt;</div><div class='del'>-#include &lt;asm-generic/getorder.h&gt;</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_GENERIC_PAGE_H */</div><div class='head'>diff --git a/include/asm-generic/param.h b/include/asm-generic/param.h<br/>index 8d3009dd28ff..8348c116aa3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/param.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/param.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/param.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/param.h</a></div><div class='hunk'>@@ -6,6 +6,6 @@</div><div class='ctx'> </div><div class='ctx'> # undef HZ</div><div class='ctx'> # define HZ		CONFIG_HZ	/* Internal kernel timer frequency */</div><div class='del'>-# define USER_HZ	100		/* some user interfaces are */</div><div class='add'>+# define USER_HZ	__USER_HZ	/* some user interfaces are */</div><div class='ctx'> # define CLOCKS_PER_SEC	(USER_HZ)       /* in "ticks" like times() */</div><div class='ctx'> #endif /* __ASM_GENERIC_PARAM_H */</div><div class='head'>diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h<br/>index 94cbd50cc870..6628670bcb90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/percpu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/percpu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/percpu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/percpu.h</a></div><div class='hunk'>@@ -2,10 +2,25 @@</div><div class='ctx'> #ifndef _ASM_GENERIC_PERCPU_H_</div><div class='ctx'> #define _ASM_GENERIC_PERCPU_H_</div><div class='ctx'> </div><div class='add'>+#ifndef __ASSEMBLER__</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/percpu-defs.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * __percpu_qual is the qualifier for the percpu named address space.</div><div class='add'>+ *</div><div class='add'>+ * Most arches use generic named address space for percpu variables but</div><div class='add'>+ * some arches define percpu variables in different named address space</div><div class='add'>+ * (on the x86 arch, percpu variable may be declared as being relative</div><div class='add'>+ * to the %fs or %gs segments using __seg_fs or __seg_gs named address</div><div class='add'>+ * space qualifier).</div><div class='add'>+ */</div><div class='add'>+#ifndef __percpu_qual</div><div class='add'>+# define __percpu_qual</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -74,7 +89,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define raw_cpu_generic_add_return(pcp, val)				\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) *__p = raw_cpu_ptr(&amp;(pcp));				\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&amp;(pcp));			\</div><div class='ctx'> 									\</div><div class='ctx'> 	*__p += val;							\</div><div class='ctx'> 	*__p;								\</div><div class='hunk'>@@ -82,8 +97,8 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define raw_cpu_generic_xchg(pcp, nval)					\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) *__p = raw_cpu_ptr(&amp;(pcp));				\</div><div class='del'>-	typeof(pcp) __ret;						\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&amp;(pcp));			\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) __ret;					\</div><div class='ctx'> 	__ret = *__p;							\</div><div class='ctx'> 	*__p = nval;							\</div><div class='ctx'> 	__ret;								\</div><div class='hunk'>@@ -91,7 +106,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __cpu_fallback_try_cmpxchg(pcp, ovalp, nval, _cmpxchg)		\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) __val, __old = *(ovalp);				\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) __val, __old = *(ovalp);			\</div><div class='ctx'> 	__val = _cmpxchg(pcp, __old, nval);				\</div><div class='ctx'> 	if (__val != __old)						\</div><div class='ctx'> 		*(ovalp) = __val;					\</div><div class='hunk'>@@ -100,8 +115,8 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define raw_cpu_generic_try_cmpxchg(pcp, ovalp, nval)			\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) *__p = raw_cpu_ptr(&amp;(pcp));				\</div><div class='del'>-	typeof(pcp) __val = *__p, ___old = *(ovalp);			\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) *__p = raw_cpu_ptr(&amp;(pcp));			\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) __val = *__p, ___old = *(ovalp);		\</div><div class='ctx'> 	bool __ret;							\</div><div class='ctx'> 	if (__val == ___old) {						\</div><div class='ctx'> 		*__p = nval;						\</div><div class='hunk'>@@ -115,14 +130,14 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define raw_cpu_generic_cmpxchg(pcp, oval, nval)			\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) __old = (oval);					\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) __old = (oval);				\</div><div class='ctx'> 	raw_cpu_generic_try_cmpxchg(pcp, &amp;__old, nval);			\</div><div class='ctx'> 	__old;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> #define __this_cpu_generic_read_nopreempt(pcp)				\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) ___ret;						\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) ___ret;					\</div><div class='ctx'> 	preempt_disable_notrace();					\</div><div class='ctx'> 	___ret = READ_ONCE(*raw_cpu_ptr(&amp;(pcp)));			\</div><div class='ctx'> 	preempt_enable_notrace();					\</div><div class='hunk'>@@ -131,7 +146,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define __this_cpu_generic_read_noirq(pcp)				\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) ___ret;						\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) ___ret;					\</div><div class='ctx'> 	unsigned long ___flags;						\</div><div class='ctx'> 	raw_local_irq_save(___flags);					\</div><div class='ctx'> 	___ret = raw_cpu_generic_read(pcp);				\</div><div class='hunk'>@@ -141,7 +156,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define this_cpu_generic_read(pcp)					\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) __ret;						\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) __ret;					\</div><div class='ctx'> 	if (__native_word(pcp))						\</div><div class='ctx'> 		__ret = __this_cpu_generic_read_nopreempt(pcp);		\</div><div class='ctx'> 	else								\</div><div class='hunk'>@@ -160,7 +175,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define this_cpu_generic_add_return(pcp, val)				\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) __ret;						\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) __ret;					\</div><div class='ctx'> 	unsigned long __flags;						\</div><div class='ctx'> 	raw_local_irq_save(__flags);					\</div><div class='ctx'> 	__ret = raw_cpu_generic_add_return(pcp, val);			\</div><div class='hunk'>@@ -170,7 +185,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define this_cpu_generic_xchg(pcp, nval)				\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) __ret;						\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) __ret;					\</div><div class='ctx'> 	unsigned long __flags;						\</div><div class='ctx'> 	raw_local_irq_save(__flags);					\</div><div class='ctx'> 	__ret = raw_cpu_generic_xchg(pcp, nval);			\</div><div class='hunk'>@@ -190,7 +205,7 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #define this_cpu_generic_cmpxchg(pcp, oval, nval)			\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(pcp) __ret;						\</div><div class='add'>+	TYPEOF_UNQUAL(pcp) __ret;					\</div><div class='ctx'> 	unsigned long __flags;						\</div><div class='ctx'> 	raw_local_irq_save(__flags);					\</div><div class='ctx'> 	__ret = raw_cpu_generic_cmpxchg(pcp, oval, nval);		\</div><div class='hunk'>@@ -544,4 +559,5 @@ do {									\</div><div class='ctx'> 	this_cpu_generic_cmpxchg(pcp, oval, nval)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#endif /* __ASSEMBLER__ */</div><div class='ctx'> #endif /* _ASM_GENERIC_PERCPU_H_ */</div><div class='head'>diff --git a/include/asm-generic/pgalloc.h b/include/asm-generic/pgalloc.h<br/>index 879e5f8aa5e9..57137d3ac159 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/pgalloc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/pgalloc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/pgalloc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/pgalloc.h</a></div><div class='hunk'>@@ -16,15 +16,22 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Return: pointer to the allocated memory or %NULL on error</div><div class='ctx'>  */</div><div class='del'>-static inline pte_t *__pte_alloc_one_kernel(struct mm_struct *mm)</div><div class='add'>+static inline pte_t *__pte_alloc_one_kernel_noprof(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	struct ptdesc *ptdesc = pagetable_alloc(GFP_PGTABLE_KERNEL &amp;</div><div class='del'>-			~__GFP_HIGHMEM, 0);</div><div class='add'>+	struct ptdesc *ptdesc = pagetable_alloc_noprof(GFP_PGTABLE_KERNEL, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!ptdesc)</div><div class='ctx'> 		return NULL;</div><div class='add'>+	if (!pagetable_pte_ctor(mm, ptdesc)) {</div><div class='add'>+		pagetable_free(ptdesc);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptdesc_set_kernel(ptdesc);</div><div class='add'>+</div><div class='ctx'> 	return ptdesc_address(ptdesc);</div><div class='ctx'> }</div><div class='add'>+#define __pte_alloc_one_kernel(...)	alloc_hooks(__pte_alloc_one_kernel_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> #ifndef __HAVE_ARCH_PTE_ALLOC_ONE_KERNEL</div><div class='ctx'> /**</div><div class='hunk'>@@ -33,10 +40,11 @@ static inline pte_t *__pte_alloc_one_kernel(struct mm_struct *mm)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: pointer to the allocated memory or %NULL on error</div><div class='ctx'>  */</div><div class='del'>-static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)</div><div class='add'>+static inline pte_t *pte_alloc_one_kernel_noprof(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	return __pte_alloc_one_kernel(mm);</div><div class='add'>+	return __pte_alloc_one_kernel_noprof(mm);</div><div class='ctx'> }</div><div class='add'>+#define pte_alloc_one_kernel(...)	alloc_hooks(pte_alloc_one_kernel_noprof(__VA_ARGS__))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -46,7 +54,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)</div><div class='ctx'>  */</div><div class='ctx'> static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)</div><div class='ctx'> {</div><div class='del'>-	pagetable_free(virt_to_ptdesc(pte));</div><div class='add'>+	pagetable_dtor_free(virt_to_ptdesc(pte));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -61,20 +69,21 @@ static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: `struct page` referencing the ptdesc or %NULL on error</div><div class='ctx'>  */</div><div class='del'>-static inline pgtable_t __pte_alloc_one(struct mm_struct *mm, gfp_t gfp)</div><div class='add'>+static inline pgtable_t __pte_alloc_one_noprof(struct mm_struct *mm, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ptdesc *ptdesc;</div><div class='ctx'> </div><div class='del'>-	ptdesc = pagetable_alloc(gfp, 0);</div><div class='add'>+	ptdesc = pagetable_alloc_noprof(gfp, 0);</div><div class='ctx'> 	if (!ptdesc)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (!pagetable_pte_ctor(ptdesc)) {</div><div class='add'>+	if (!pagetable_pte_ctor(mm, ptdesc)) {</div><div class='ctx'> 		pagetable_free(ptdesc);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ptdesc_page(ptdesc);</div><div class='ctx'> }</div><div class='add'>+#define __pte_alloc_one(...)	alloc_hooks(__pte_alloc_one_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> #ifndef __HAVE_ARCH_PTE_ALLOC_ONE</div><div class='ctx'> /**</div><div class='hunk'>@@ -85,10 +94,11 @@ static inline pgtable_t __pte_alloc_one(struct mm_struct *mm, gfp_t gfp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: `struct page` referencing the ptdesc or %NULL on error</div><div class='ctx'>  */</div><div class='del'>-static inline pgtable_t pte_alloc_one(struct mm_struct *mm)</div><div class='add'>+static inline pgtable_t pte_alloc_one_noprof(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	return __pte_alloc_one(mm, GFP_PGTABLE_USER);</div><div class='add'>+	return __pte_alloc_one_noprof(mm, GFP_PGTABLE_USER);</div><div class='ctx'> }</div><div class='add'>+#define pte_alloc_one(...)	alloc_hooks(pte_alloc_one_noprof(__VA_ARGS__))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -105,8 +115,7 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte_page)</div><div class='ctx'> {</div><div class='ctx'> 	struct ptdesc *ptdesc = page_ptdesc(pte_page);</div><div class='ctx'> </div><div class='del'>-	pagetable_pte_dtor(ptdesc);</div><div class='del'>-	pagetable_free(ptdesc);</div><div class='add'>+	pagetable_dtor_free(ptdesc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -124,22 +133,27 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte_page)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: pointer to the allocated memory or %NULL on error</div><div class='ctx'>  */</div><div class='del'>-static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)</div><div class='add'>+static inline pmd_t *pmd_alloc_one_noprof(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ptdesc *ptdesc;</div><div class='ctx'> 	gfp_t gfp = GFP_PGTABLE_USER;</div><div class='ctx'> </div><div class='ctx'> 	if (mm == &amp;init_mm)</div><div class='ctx'> 		gfp = GFP_PGTABLE_KERNEL;</div><div class='del'>-	ptdesc = pagetable_alloc(gfp, 0);</div><div class='add'>+	ptdesc = pagetable_alloc_noprof(gfp, 0);</div><div class='ctx'> 	if (!ptdesc)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (!pagetable_pmd_ctor(ptdesc)) {</div><div class='add'>+	if (!pagetable_pmd_ctor(mm, ptdesc)) {</div><div class='ctx'> 		pagetable_free(ptdesc);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (mm == &amp;init_mm)</div><div class='add'>+		ptdesc_set_kernel(ptdesc);</div><div class='add'>+</div><div class='ctx'> 	return ptdesc_address(ptdesc);</div><div class='ctx'> }</div><div class='add'>+#define pmd_alloc_one(...)	alloc_hooks(pmd_alloc_one_noprof(__VA_ARGS__))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef __HAVE_ARCH_PMD_FREE</div><div class='hunk'>@@ -148,8 +162,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)</div><div class='ctx'> 	struct ptdesc *ptdesc = virt_to_ptdesc(pmd);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON((unsigned long)pmd &amp; (PAGE_SIZE-1));</div><div class='del'>-	pagetable_pmd_dtor(ptdesc);</div><div class='del'>-	pagetable_free(ptdesc);</div><div class='add'>+	pagetable_dtor_free(ptdesc);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -157,22 +170,26 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)</div><div class='ctx'> </div><div class='ctx'> #if CONFIG_PGTABLE_LEVELS &gt; 3</div><div class='ctx'> </div><div class='del'>-static inline pud_t *__pud_alloc_one(struct mm_struct *mm, unsigned long addr)</div><div class='add'>+static inline pud_t *__pud_alloc_one_noprof(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	gfp_t gfp = GFP_PGTABLE_USER;</div><div class='ctx'> 	struct ptdesc *ptdesc;</div><div class='ctx'> </div><div class='ctx'> 	if (mm == &amp;init_mm)</div><div class='ctx'> 		gfp = GFP_PGTABLE_KERNEL;</div><div class='del'>-	gfp &amp;= ~__GFP_HIGHMEM;</div><div class='ctx'> </div><div class='del'>-	ptdesc = pagetable_alloc(gfp, 0);</div><div class='add'>+	ptdesc = pagetable_alloc_noprof(gfp, 0);</div><div class='ctx'> 	if (!ptdesc)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	pagetable_pud_ctor(ptdesc);</div><div class='add'>+</div><div class='add'>+	if (mm == &amp;init_mm)</div><div class='add'>+		ptdesc_set_kernel(ptdesc);</div><div class='add'>+</div><div class='ctx'> 	return ptdesc_address(ptdesc);</div><div class='ctx'> }</div><div class='add'>+#define __pud_alloc_one(...)	alloc_hooks(__pud_alloc_one_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> #ifndef __HAVE_ARCH_PUD_ALLOC_ONE</div><div class='ctx'> /**</div><div class='hunk'>@@ -184,10 +201,11 @@ static inline pud_t *__pud_alloc_one(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: pointer to the allocated memory or %NULL on error</div><div class='ctx'>  */</div><div class='del'>-static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)</div><div class='add'>+static inline pud_t *pud_alloc_one_noprof(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	return __pud_alloc_one(mm, addr);</div><div class='add'>+	return __pud_alloc_one_noprof(mm, addr);</div><div class='ctx'> }</div><div class='add'>+#define pud_alloc_one(...)	alloc_hooks(pud_alloc_one_noprof(__VA_ARGS__))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline void __pud_free(struct mm_struct *mm, pud_t *pud)</div><div class='hunk'>@@ -195,8 +213,7 @@ static inline void __pud_free(struct mm_struct *mm, pud_t *pud)</div><div class='ctx'> 	struct ptdesc *ptdesc = virt_to_ptdesc(pud);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON((unsigned long)pud &amp; (PAGE_SIZE-1));</div><div class='del'>-	pagetable_pud_dtor(ptdesc);</div><div class='del'>-	pagetable_free(ptdesc);</div><div class='add'>+	pagetable_dtor_free(ptdesc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef __HAVE_ARCH_PUD_FREE</div><div class='hunk'>@@ -208,10 +225,88 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PGTABLE_LEVELS &gt; 3 */</div><div class='ctx'> </div><div class='add'>+#if CONFIG_PGTABLE_LEVELS &gt; 4</div><div class='add'>+</div><div class='add'>+static inline p4d_t *__p4d_alloc_one_noprof(struct mm_struct *mm, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	gfp_t gfp = GFP_PGTABLE_USER;</div><div class='add'>+	struct ptdesc *ptdesc;</div><div class='add'>+</div><div class='add'>+	if (mm == &amp;init_mm)</div><div class='add'>+		gfp = GFP_PGTABLE_KERNEL;</div><div class='add'>+</div><div class='add'>+	ptdesc = pagetable_alloc_noprof(gfp, 0);</div><div class='add'>+	if (!ptdesc)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pagetable_p4d_ctor(ptdesc);</div><div class='add'>+</div><div class='add'>+	if (mm == &amp;init_mm)</div><div class='add'>+		ptdesc_set_kernel(ptdesc);</div><div class='add'>+</div><div class='add'>+	return ptdesc_address(ptdesc);</div><div class='add'>+}</div><div class='add'>+#define __p4d_alloc_one(...)	alloc_hooks(__p4d_alloc_one_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+#ifndef __HAVE_ARCH_P4D_ALLOC_ONE</div><div class='add'>+static inline p4d_t *p4d_alloc_one_noprof(struct mm_struct *mm, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return __p4d_alloc_one_noprof(mm, addr);</div><div class='add'>+}</div><div class='add'>+#define p4d_alloc_one(...)	alloc_hooks(p4d_alloc_one_noprof(__VA_ARGS__))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline void __p4d_free(struct mm_struct *mm, p4d_t *p4d)</div><div class='add'>+{</div><div class='add'>+	struct ptdesc *ptdesc = virt_to_ptdesc(p4d);</div><div class='add'>+</div><div class='add'>+	BUG_ON((unsigned long)p4d &amp; (PAGE_SIZE-1));</div><div class='add'>+	pagetable_dtor_free(ptdesc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef __HAVE_ARCH_P4D_FREE</div><div class='add'>+static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d)</div><div class='add'>+{</div><div class='add'>+	if (!mm_p4d_folded(mm))</div><div class='add'>+		__p4d_free(mm, p4d);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PGTABLE_LEVELS &gt; 4 */</div><div class='add'>+</div><div class='add'>+static inline pgd_t *__pgd_alloc_noprof(struct mm_struct *mm, unsigned int order)</div><div class='add'>+{</div><div class='add'>+	gfp_t gfp = GFP_PGTABLE_USER;</div><div class='add'>+	struct ptdesc *ptdesc;</div><div class='add'>+</div><div class='add'>+	if (mm == &amp;init_mm)</div><div class='add'>+		gfp = GFP_PGTABLE_KERNEL;</div><div class='add'>+</div><div class='add'>+	ptdesc = pagetable_alloc_noprof(gfp, order);</div><div class='add'>+	if (!ptdesc)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pagetable_pgd_ctor(ptdesc);</div><div class='add'>+</div><div class='add'>+	if (mm == &amp;init_mm)</div><div class='add'>+		ptdesc_set_kernel(ptdesc);</div><div class='add'>+</div><div class='add'>+	return ptdesc_address(ptdesc);</div><div class='add'>+}</div><div class='add'>+#define __pgd_alloc(...)	alloc_hooks(__pgd_alloc_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+static inline void __pgd_free(struct mm_struct *mm, pgd_t *pgd)</div><div class='add'>+{</div><div class='add'>+	struct ptdesc *ptdesc = virt_to_ptdesc(pgd);</div><div class='add'>+</div><div class='add'>+	BUG_ON((unsigned long)pgd &amp; (PAGE_SIZE-1));</div><div class='add'>+	pagetable_dtor_free(ptdesc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef __HAVE_ARCH_PGD_FREE</div><div class='ctx'> static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)</div><div class='ctx'> {</div><div class='del'>-	pagetable_free(virt_to_ptdesc(pgd));</div><div class='add'>+	__pgd_free(mm, pgd);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-generic/pgtable_uffd.h b/include/asm-generic/pgtable_uffd.h<br/>index 828966d4c281..0d85791efdf7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/pgtable_uffd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/pgtable_uffd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/pgtable_uffd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/pgtable_uffd.h</a></div><div class='hunk'>@@ -1,6 +1,23 @@</div><div class='ctx'> #ifndef _ASM_GENERIC_PGTABLE_UFFD_H</div><div class='ctx'> #define _ASM_GENERIC_PGTABLE_UFFD_H</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Some platforms can customize the uffd-wp bit, making it unavailable</div><div class='add'>+ * even if the architecture provides the resource.</div><div class='add'>+ * Adding this API allows architectures to add their own checks for the</div><div class='add'>+ * devices on which the kernel is running.</div><div class='add'>+ * Note: When overriding it, please make sure the</div><div class='add'>+ * CONFIG_HAVE_ARCH_USERFAULTFD_WP is part of this macro.</div><div class='add'>+ */</div><div class='add'>+#ifndef pgtable_supports_uffd_wp</div><div class='add'>+#define pgtable_supports_uffd_wp()	IS_ENABLED(CONFIG_HAVE_ARCH_USERFAULTFD_WP)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline bool uffd_supports_wp_marker(void)</div><div class='add'>+{</div><div class='add'>+	return pgtable_supports_uffd_wp() &amp;&amp; IS_ENABLED(CONFIG_PTE_MARKER_UFFD_WP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP</div><div class='ctx'> static __always_inline int pte_uffd_wp(pte_t pte)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h<br/>index 0655aa5b57b2..bf47cca2c375 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/qspinlock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/qspinlock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/qspinlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/qspinlock.h</a></div><div class='hunk'>@@ -136,6 +136,7 @@ static __always_inline bool virt_spin_lock(struct qspinlock *lock)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef __no_arch_spinlock_redefine</div><div class='ctx'> /*</div><div class='ctx'>  * Remapping spinlock architecture specific functions to the corresponding</div><div class='ctx'>  * queued spinlock functions.</div><div class='hunk'>@@ -146,5 +147,6 @@ static __always_inline bool virt_spin_lock(struct qspinlock *lock)</div><div class='ctx'> #define arch_spin_lock(l)		queued_spin_lock(l)</div><div class='ctx'> #define arch_spin_trylock(l)		queued_spin_trylock(l)</div><div class='ctx'> #define arch_spin_unlock(l)		queued_spin_unlock(l)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_GENERIC_QSPINLOCK_H */</div><div class='head'>diff --git a/include/asm-generic/rqspinlock.h b/include/asm-generic/rqspinlock.h<br/>new file mode 100644<br/>index 000000000000..0f2dcbbfee2f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/rqspinlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/rqspinlock.h</a></div><div class='hunk'>@@ -0,0 +1,254 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Resilient Queued Spin Lock</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2024-2025 Meta Platforms, Inc. and affiliates.</div><div class='add'>+ *</div><div class='add'>+ * Authors: Kumar Kartikeya Dwivedi &lt;memxor@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef __ASM_GENERIC_RQSPINLOCK_H</div><div class='add'>+#define __ASM_GENERIC_RQSPINLOCK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;vdso/time64.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='add'>+#ifdef CONFIG_QUEUED_SPINLOCKS</div><div class='add'>+#include &lt;asm/qspinlock.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct rqspinlock {</div><div class='add'>+	union {</div><div class='add'>+		atomic_t val;</div><div class='add'>+		u32 locked;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Even though this is same as struct rqspinlock, we need to emit a distinct</div><div class='add'>+ * type in BTF for BPF programs.</div><div class='add'>+ */</div><div class='add'>+struct bpf_res_spin_lock {</div><div class='add'>+	u32 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qspinlock;</div><div class='add'>+#ifdef CONFIG_QUEUED_SPINLOCKS</div><div class='add'>+typedef struct qspinlock rqspinlock_t;</div><div class='add'>+#else</div><div class='add'>+typedef struct rqspinlock rqspinlock_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern int resilient_tas_spin_lock(rqspinlock_t *lock);</div><div class='add'>+#ifdef CONFIG_QUEUED_SPINLOCKS</div><div class='add'>+extern int resilient_queued_spin_lock_slowpath(rqspinlock_t *lock, u32 val);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef resilient_virt_spin_lock_enabled</div><div class='add'>+static __always_inline bool resilient_virt_spin_lock_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef resilient_virt_spin_lock</div><div class='add'>+static __always_inline int resilient_virt_spin_lock(rqspinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default timeout for waiting loops is 0.25 seconds</div><div class='add'>+ */</div><div class='add'>+#define RES_DEF_TIMEOUT (NSEC_PER_SEC / 4)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Choose 31 as it makes rqspinlock_held cacheline-aligned.</div><div class='add'>+ */</div><div class='add'>+#define RES_NR_HELD 31</div><div class='add'>+</div><div class='add'>+struct rqspinlock_held {</div><div class='add'>+	int cnt;</div><div class='add'>+	void *locks[RES_NR_HELD];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DECLARE_PER_CPU_ALIGNED(struct rqspinlock_held, rqspinlock_held_locks);</div><div class='add'>+</div><div class='add'>+static __always_inline void grab_held_lock_entry(void *lock)</div><div class='add'>+{</div><div class='add'>+	int cnt = this_cpu_inc_return(rqspinlock_held_locks.cnt);</div><div class='add'>+</div><div class='add'>+	if (unlikely(cnt &gt; RES_NR_HELD)) {</div><div class='add'>+		/* Still keep the inc so we decrement later. */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Implied compiler barrier in per-CPU operations; otherwise we can have</div><div class='add'>+	 * the compiler reorder inc with write to table, allowing interrupts to</div><div class='add'>+	 * overwrite and erase our write to the table (as on interrupt exit it</div><div class='add'>+	 * will be reset to NULL).</div><div class='add'>+	 *</div><div class='add'>+	 * It is fine for cnt inc to be reordered wrt remote readers though,</div><div class='add'>+	 * they won't observe our entry until the cnt update is visible, that's</div><div class='add'>+	 * all.</div><div class='add'>+	 */</div><div class='add'>+	this_cpu_write(rqspinlock_held_locks.locks[cnt - 1], lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We simply don't support out-of-order unlocks, and keep the logic simple here.</div><div class='add'>+ * The verifier prevents BPF programs from unlocking out-of-order, and the same</div><div class='add'>+ * holds for in-kernel users.</div><div class='add'>+ *</div><div class='add'>+ * It is possible to run into misdetection scenarios of AA deadlocks on the same</div><div class='add'>+ * CPU, and missed ABBA deadlocks on remote CPUs if this function pops entries</div><div class='add'>+ * out of order (due to lock A, lock B, unlock A, unlock B) pattern. The correct</div><div class='add'>+ * logic to preserve right entries in the table would be to walk the array of</div><div class='add'>+ * held locks and swap and clear out-of-order entries, but that's too</div><div class='add'>+ * complicated and we don't have a compelling use case for out of order unlocking.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void release_held_lock_entry(void)</div><div class='add'>+{</div><div class='add'>+	struct rqspinlock_held *rqh = this_cpu_ptr(&amp;rqspinlock_held_locks);</div><div class='add'>+</div><div class='add'>+	if (unlikely(rqh-&gt;cnt &gt; RES_NR_HELD))</div><div class='add'>+		goto dec;</div><div class='add'>+	WRITE_ONCE(rqh-&gt;locks[rqh-&gt;cnt - 1], NULL);</div><div class='add'>+dec:</div><div class='add'>+	/*</div><div class='add'>+	 * Reordering of clearing above with inc and its write in</div><div class='add'>+	 * grab_held_lock_entry that came before us (in same acquisition</div><div class='add'>+	 * attempt) is ok, we either see a valid entry or NULL when it's</div><div class='add'>+	 * visible.</div><div class='add'>+	 *</div><div class='add'>+	 * But this helper is invoked when we unwind upon failing to acquire the</div><div class='add'>+	 * lock. Unlike the unlock path which constitutes a release store after</div><div class='add'>+	 * we clear the entry, we need to emit a write barrier here. Otherwise,</div><div class='add'>+	 * we may have a situation as follows:</div><div class='add'>+	 *</div><div class='add'>+	 * &lt;error&gt; for lock B</div><div class='add'>+	 * release_held_lock_entry</div><div class='add'>+	 *</div><div class='add'>+	 * grab_held_lock_entry</div><div class='add'>+	 * try_cmpxchg_acquire for lock A</div><div class='add'>+	 *</div><div class='add'>+	 * Lack of any ordering means reordering may occur such that dec, inc</div><div class='add'>+	 * are done before entry is overwritten. This permits a remote lock</div><div class='add'>+	 * holder of lock B (which this CPU failed to acquire) to now observe it</div><div class='add'>+	 * as being attempted on this CPU, and may lead to misdetection (if this</div><div class='add'>+	 * CPU holds a lock it is attempting to acquire, leading to false ABBA</div><div class='add'>+	 * diagnosis).</div><div class='add'>+	 *</div><div class='add'>+	 * The case of unlock is treated differently due to NMI reentrancy, see</div><div class='add'>+	 * comments in res_spin_unlock.</div><div class='add'>+	 *</div><div class='add'>+	 * In theory we don't have a problem if the dec and WRITE_ONCE above get</div><div class='add'>+	 * reordered with each other, we either notice an empty NULL entry on</div><div class='add'>+	 * top (if dec succeeds WRITE_ONCE), or a potentially stale entry which</div><div class='add'>+	 * cannot be observed (if dec precedes WRITE_ONCE).</div><div class='add'>+	 *</div><div class='add'>+	 * Emit the write barrier _before_ the dec, this permits dec-inc</div><div class='add'>+	 * reordering but that is harmless as we'd have new entry set to NULL</div><div class='add'>+	 * already, i.e. they cannot precede the NULL store above.</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	this_cpu_dec(rqspinlock_held_locks.cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_QUEUED_SPINLOCKS</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * res_spin_lock - acquire a queued spinlock</div><div class='add'>+ * @lock: Pointer to queued spinlock structure</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 0		- Lock was acquired successfully.</div><div class='add'>+ * * -EDEADLK	- Lock acquisition failed because of AA/ABBA deadlock.</div><div class='add'>+ * * -ETIMEDOUT - Lock acquisition failed because of timeout.</div><div class='add'>+ */</div><div class='add'>+static __always_inline int res_spin_lock(rqspinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Grab the deadlock detection entry before doing the cmpxchg, so that</div><div class='add'>+	 * reentrancy due to NMIs between the succeeding cmpxchg and creation of</div><div class='add'>+	 * held lock entry can correctly detect an acquisition attempt in the</div><div class='add'>+	 * interrupted context.</div><div class='add'>+	 *</div><div class='add'>+	 * cmpxchg lock A</div><div class='add'>+	 * &lt;NMI&gt;</div><div class='add'>+	 * res_spin_lock(A) --&gt; missed AA, leads to timeout</div><div class='add'>+	 * &lt;/NMI&gt;</div><div class='add'>+	 * grab_held_lock_entry(A)</div><div class='add'>+	 */</div><div class='add'>+	grab_held_lock_entry(lock);</div><div class='add'>+</div><div class='add'>+	if (likely(atomic_try_cmpxchg_acquire(&amp;lock-&gt;val, &amp;val, _Q_LOCKED_VAL)))</div><div class='add'>+		return 0;</div><div class='add'>+	return resilient_queued_spin_lock_slowpath(lock, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define res_spin_lock(lock) resilient_tas_spin_lock(lock)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_QUEUED_SPINLOCKS */</div><div class='add'>+</div><div class='add'>+static __always_inline void res_spin_unlock(rqspinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	struct rqspinlock_held *rqh = this_cpu_ptr(&amp;rqspinlock_held_locks);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Release barrier, ensures correct ordering. Perform release store</div><div class='add'>+	 * instead of queued_spin_unlock, since we use this function for the TAS</div><div class='add'>+	 * fallback as well. When we have CONFIG_QUEUED_SPINLOCKS=n, we clear</div><div class='add'>+	 * the full 4-byte lockword.</div><div class='add'>+	 *</div><div class='add'>+	 * Perform the smp_store_release before clearing the lock entry so that</div><div class='add'>+	 * NMIs landing in the unlock path can correctly detect AA issues. The</div><div class='add'>+	 * opposite order shown below may lead to missed AA checks:</div><div class='add'>+	 *</div><div class='add'>+	 * WRITE_ONCE(rqh-&gt;locks[rqh-&gt;cnt - 1], NULL)</div><div class='add'>+	 * &lt;NMI&gt;</div><div class='add'>+	 * res_spin_lock(A) --&gt; missed AA, leads to timeout</div><div class='add'>+	 * &lt;/NMI&gt;</div><div class='add'>+	 * smp_store_release(A-&gt;locked, 0)</div><div class='add'>+	 */</div><div class='add'>+	smp_store_release(&amp;lock-&gt;locked, 0);</div><div class='add'>+	if (likely(rqh-&gt;cnt &lt;= RES_NR_HELD))</div><div class='add'>+		WRITE_ONCE(rqh-&gt;locks[rqh-&gt;cnt - 1], NULL);</div><div class='add'>+	this_cpu_dec(rqspinlock_held_locks.cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_QUEUED_SPINLOCKS</div><div class='add'>+#define raw_res_spin_lock_init(lock) ({ *(lock) = (rqspinlock_t)__ARCH_SPIN_LOCK_UNLOCKED; })</div><div class='add'>+#else</div><div class='add'>+#define raw_res_spin_lock_init(lock) ({ *(lock) = (rqspinlock_t){0}; })</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define raw_res_spin_lock(lock)                    \</div><div class='add'>+	({                                         \</div><div class='add'>+		int __ret;                         \</div><div class='add'>+		preempt_disable();                 \</div><div class='add'>+		__ret = res_spin_lock(lock);	   \</div><div class='add'>+		if (__ret)                         \</div><div class='add'>+			preempt_enable();          \</div><div class='add'>+		__ret;                             \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define raw_res_spin_unlock(lock) ({ res_spin_unlock(lock); preempt_enable(); })</div><div class='add'>+</div><div class='add'>+#define raw_res_spin_lock_irqsave(lock, flags)    \</div><div class='add'>+	({                                        \</div><div class='add'>+		int __ret;                        \</div><div class='add'>+		local_irq_save(flags);            \</div><div class='add'>+		__ret = raw_res_spin_lock(lock);  \</div><div class='add'>+		if (__ret)                        \</div><div class='add'>+			local_irq_restore(flags); \</div><div class='add'>+		__ret;                            \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define raw_res_spin_unlock_irqrestore(lock, flags) ({ raw_res_spin_unlock(lock); local_irq_restore(flags); })</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_GENERIC_RQSPINLOCK_H */</div><div class='head'>diff --git a/include/asm-generic/runtime-const.h b/include/asm-generic/runtime-const.h<br/>new file mode 100644<br/>index 000000000000..670499459514<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/runtime-const.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/runtime-const.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_RUNTIME_CONST_H</div><div class='add'>+#define _ASM_RUNTIME_CONST_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the fallback for when the architecture doesn't</div><div class='add'>+ * support the runtime const operations.</div><div class='add'>+ *</div><div class='add'>+ * We just use the actual symbols as-is.</div><div class='add'>+ */</div><div class='add'>+#define runtime_const_ptr(sym) (sym)</div><div class='add'>+#define runtime_const_shift_right_32(val, sym) ((u32)(val)&gt;&gt;(sym))</div><div class='add'>+#define runtime_const_init(type,sym) do { } while (0)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/asm-generic/rwonce.h b/include/asm-generic/rwonce.h<br/>index 8d0a6280e982..52b969c7cef9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/rwonce.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/rwonce.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/rwonce.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/rwonce.h</a></div><div class='hunk'>@@ -79,10 +79,18 @@ unsigned long __read_once_word_nocheck(const void *addr)</div><div class='ctx'> 	(typeof(x))__read_once_word_nocheck(&amp;(x));			\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-static __no_kasan_or_inline</div><div class='add'>+static __no_sanitize_or_inline</div><div class='ctx'> unsigned long read_word_at_a_time(const void *addr)</div><div class='ctx'> {</div><div class='add'>+	/* open-coded instrument_read(addr, 1) */</div><div class='ctx'> 	kasan_check_read(addr, 1);</div><div class='add'>+	kcsan_check_read(addr, 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This load can race with concurrent stores to out-of-bounds memory,</div><div class='add'>+	 * but READ_ONCE() can't be used because it requires higher alignment</div><div class='add'>+	 * than plain loads in arm64 builds with LTO.</div><div class='add'>+	 */</div><div class='ctx'> 	return *(unsigned long *)addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h<br/>index db13bb620f52..0755bc39b0d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/sections.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/sections.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/sections.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/sections.h</a></div><div class='hunk'>@@ -39,7 +39,7 @@ extern char __init_begin[], __init_end[];</div><div class='ctx'> extern char _sinittext[], _einittext[];</div><div class='ctx'> extern char __start_ro_after_init[], __end_ro_after_init[];</div><div class='ctx'> extern char _end[];</div><div class='del'>-extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];</div><div class='add'>+extern char __per_cpu_start[], __per_cpu_end[];</div><div class='ctx'> extern char __kprobes_text_start[], __kprobes_text_end[];</div><div class='ctx'> extern char __entry_text_start[], __entry_text_end[];</div><div class='ctx'> extern char __start_rodata[], __end_rodata[];</div><div class='hunk'>@@ -180,6 +180,11 @@ static inline bool is_kernel_rodata(unsigned long addr)</div><div class='ctx'> 	       addr &lt; (unsigned long)__end_rodata;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool is_kernel_ro_after_init(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return addr &gt;= (unsigned long)__start_ro_after_init &amp;&amp;</div><div class='add'>+	       addr &lt; (unsigned long)__end_ro_after_init;</div><div class='add'>+}</div><div class='ctx'> /**</div><div class='ctx'>  * is_kernel_inittext - checks if the pointer address is located in the</div><div class='ctx'>  *                      .init.text section</div><div class='head'>diff --git a/include/asm-generic/simd.h b/include/asm-generic/simd.h<br/>index d0343d58a74a..70c8716ad32a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/simd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/simd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/simd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/simd.h</a></div><div class='hunk'>@@ -1,6 +1,11 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_GENERIC_SIMD_H</div><div class='add'>+#define _ASM_GENERIC_SIMD_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/compiler_attributes.h&gt;</div><div class='add'>+#include &lt;linux/preempt.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * may_use_simd - whether it is allowable at this time to issue SIMD</div><div class='hunk'>@@ -13,3 +18,5 @@ static __must_check inline bool may_use_simd(void)</div><div class='ctx'> {</div><div class='ctx'> 	return !in_interrupt();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#endif	/* _ASM_GENERIC_SIMD_H */</div><div class='head'>diff --git a/include/asm-generic/spinlock.h b/include/asm-generic/spinlock.h<br/>index 90803a826ba0..970590baf61b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/spinlock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/spinlock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/spinlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/spinlock.h</a></div><div class='hunk'>@@ -1,94 +1,9 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 'Generic' ticket-lock implementation.</div><div class='del'>- *</div><div class='del'>- * It relies on atomic_fetch_add() having well defined forward progress</div><div class='del'>- * guarantees under contention. If your architecture cannot provide this, stick</div><div class='del'>- * to a test-and-set lock.</div><div class='del'>- *</div><div class='del'>- * It also relies on atomic_fetch_add() being safe vs smp_store_release() on a</div><div class='del'>- * sub-word of the value. This is generally true for anything LL/SC although</div><div class='del'>- * you'd be hard pressed to find anything useful in architecture specifications</div><div class='del'>- * about this. If your architecture cannot do this you might be better off with</div><div class='del'>- * a test-and-set.</div><div class='del'>- *</div><div class='del'>- * It further assumes atomic_*_release() + atomic_*_acquire() is RCpc and hence</div><div class='del'>- * uses atomic_fetch_add() which is RCsc to create an RCsc hot path, along with</div><div class='del'>- * a full fence after the spin to upgrade the otherwise-RCpc</div><div class='del'>- * atomic_cond_read_acquire().</div><div class='del'>- *</div><div class='del'>- * The implementation uses smp_cond_load_acquire() to spin, so if the</div><div class='del'>- * architecture has WFE like instructions to sleep instead of poll for word</div><div class='del'>- * modifications be sure to implement that (see ARM64 for example).</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #ifndef __ASM_GENERIC_SPINLOCK_H</div><div class='ctx'> #define __ASM_GENERIC_SPINLOCK_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;asm-generic/spinlock_types.h&gt;</div><div class='del'>-</div><div class='del'>-static __always_inline void arch_spin_lock(arch_spinlock_t *lock)</div><div class='del'>-{</div><div class='del'>-	u32 val = atomic_fetch_add(1&lt;&lt;16, lock);</div><div class='del'>-	u16 ticket = val &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if (ticket == (u16)val)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * atomic_cond_read_acquire() is RCpc, but rather than defining a</div><div class='del'>-	 * custom cond_read_rcsc() here we just emit a full fence.  We only</div><div class='del'>-	 * need the prior reads before subsequent writes ordering from</div><div class='del'>-	 * smb_mb(), but as atomic_cond_read_acquire() just emits reads and we</div><div class='del'>-	 * have no outstanding writes due to the atomic_fetch_add() the extra</div><div class='del'>-	 * orderings are free.</div><div class='del'>-	 */</div><div class='del'>-	atomic_cond_read_acquire(lock, ticket == (u16)VAL);</div><div class='del'>-	smp_mb();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool arch_spin_trylock(arch_spinlock_t *lock)</div><div class='del'>-{</div><div class='del'>-	u32 old = atomic_read(lock);</div><div class='del'>-</div><div class='del'>-	if ((old &gt;&gt; 16) != (old &amp; 0xffff))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return atomic_try_cmpxchg(lock, &amp;old, old + (1&lt;&lt;16)); /* SC, for RCsc */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline void arch_spin_unlock(arch_spinlock_t *lock)</div><div class='del'>-{</div><div class='del'>-	u16 *ptr = (u16 *)lock + IS_ENABLED(CONFIG_CPU_BIG_ENDIAN);</div><div class='del'>-	u32 val = atomic_read(lock);</div><div class='del'>-</div><div class='del'>-	smp_store_release(ptr, (u16)val + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int arch_spin_value_unlocked(arch_spinlock_t lock)</div><div class='del'>-{</div><div class='del'>-	u32 val = lock.counter;</div><div class='del'>-</div><div class='del'>-	return ((val &gt;&gt; 16) == (val &amp; 0xffff));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int arch_spin_is_locked(arch_spinlock_t *lock)</div><div class='del'>-{</div><div class='del'>-	arch_spinlock_t val = READ_ONCE(*lock);</div><div class='del'>-</div><div class='del'>-	return !arch_spin_value_unlocked(val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int arch_spin_is_contended(arch_spinlock_t *lock)</div><div class='del'>-{</div><div class='del'>-	u32 val = atomic_read(lock);</div><div class='del'>-</div><div class='del'>-	return (s16)((val &gt;&gt; 16) - (val &amp; 0xffff)) &gt; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+#include &lt;asm-generic/ticket_spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/qrwlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_GENERIC_SPINLOCK_H */</div><div class='head'>diff --git a/include/asm-generic/spinlock_types.h b/include/asm-generic/spinlock_types.h<br/>index 8962bb730945..f534aa5de394 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/spinlock_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/spinlock_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/spinlock_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/spinlock_types.h</a></div><div class='hunk'>@@ -3,15 +3,7 @@</div><div class='ctx'> #ifndef __ASM_GENERIC_SPINLOCK_TYPES_H</div><div class='ctx'> #define __ASM_GENERIC_SPINLOCK_TYPES_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-typedef atomic_t arch_spinlock_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * qrwlock_types depends on arch_spinlock_t, so we must typedef that before the</div><div class='del'>- * include.</div><div class='del'>- */</div><div class='del'>-#include &lt;asm/qrwlock_types.h&gt;</div><div class='del'>-</div><div class='del'>-#define __ARCH_SPIN_LOCK_UNLOCKED	ATOMIC_INIT(0)</div><div class='add'>+#include &lt;asm-generic/qspinlock_types.h&gt;</div><div class='add'>+#include &lt;asm-generic/qrwlock_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASM_GENERIC_SPINLOCK_TYPES_H */</div><div class='head'>diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h<br/>index 5a80fe728dc8..c5a3ad53beec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/syscall.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/syscall.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/syscall.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/syscall.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  * Copyright (C) 2008-2009 Red Hat, Inc.  All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This file is a stub providing documentation for what functions</div><div class='del'>- * asm-ARCH/syscall.h files need to define.  Most arch definitions</div><div class='add'>+ * arch/ARCH/include/asm/syscall.h files need to define.  Most arch definitions</div><div class='ctx'>  * will be simple inlines.</div><div class='ctx'>  *</div><div class='ctx'>  * All of these functions expect to be called with no locks,</div><div class='hunk'>@@ -38,6 +38,20 @@ struct pt_regs;</div><div class='ctx'> int syscall_get_nr(struct task_struct *task, struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * syscall_set_nr - change the system call a task is executing</div><div class='add'>+ * @task:	task of interest, must be blocked</div><div class='add'>+ * @regs:	task_pt_regs() of @task</div><div class='add'>+ * @nr:		system call number</div><div class='add'>+ *</div><div class='add'>+ * Changes the system call number @task is about to execute.</div><div class='add'>+ *</div><div class='add'>+ * It's only valid to call this when @task is stopped for tracing on</div><div class='add'>+ * entry to a system call, due to %SYSCALL_WORK_SYSCALL_TRACE or</div><div class='add'>+ * %SYSCALL_WORK_SYSCALL_AUDIT.</div><div class='add'>+ */</div><div class='add'>+void syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * syscall_rollback - roll back registers after an aborted system call</div><div class='ctx'>  * @task:	task of interest, must be in system call exit tracing</div><div class='ctx'>  * @regs:	task_pt_regs() of @task</div><div class='hunk'>@@ -118,6 +132,22 @@ void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 			   unsigned long *args);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * syscall_set_arguments - change system call parameter value</div><div class='add'>+ * @task:	task of interest, must be in system call entry tracing</div><div class='add'>+ * @regs:	task_pt_regs() of @task</div><div class='add'>+ * @args:	array of argument values to store</div><div class='add'>+ *</div><div class='add'>+ * Changes 6 arguments to the system call.</div><div class='add'>+ * The first argument gets value @args[0], and so on.</div><div class='add'>+ *</div><div class='add'>+ * It's only valid to call this when @task is stopped for tracing on</div><div class='add'>+ * entry to a system call, due to %SYSCALL_WORK_SYSCALL_TRACE or</div><div class='add'>+ * %SYSCALL_WORK_SYSCALL_AUDIT.</div><div class='add'>+ */</div><div class='add'>+void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+			   const unsigned long *args);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * syscall_get_arch - return the AUDIT_ARCH for the current system call</div><div class='ctx'>  * @task:	task of interest, must be blocked</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h<br/>index 933ca6581aba..fabcefe8a80a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/syscalls.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/syscalls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/syscalls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/syscalls.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,</div><div class='ctx'> #ifndef sys_mmap</div><div class='ctx'> asmlinkage long sys_mmap(unsigned long addr, unsigned long len,</div><div class='ctx'> 			unsigned long prot, unsigned long flags,</div><div class='del'>-			unsigned long fd, off_t pgoff);</div><div class='add'>+			unsigned long fd, unsigned long off);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef sys_rt_sigreturn</div><div class='head'>diff --git a/include/asm-generic/text-patching.h b/include/asm-generic/text-patching.h<br/>new file mode 100644<br/>index 000000000000..2245c641b741<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/text-patching.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/text-patching.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_GENERIC_TEXT_PATCHING_H</div><div class='add'>+#define _ASM_GENERIC_TEXT_PATCHING_H</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_GENERIC_TEXT_PATCHING_H */</div><div class='head'>diff --git a/include/asm-generic/thread_info_tif.h b/include/asm-generic/thread_info_tif.h<br/>new file mode 100644<br/>index 000000000000..da1610a78f92<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/thread_info_tif.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/thread_info_tif.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_GENERIC_THREAD_INFO_TIF_H_</div><div class='add'>+#define _ASM_GENERIC_THREAD_INFO_TIF_H_</div><div class='add'>+</div><div class='add'>+#include &lt;vdso/bits.h&gt;</div><div class='add'>+</div><div class='add'>+/* Bits 16-31 are reserved for architecture specific purposes */</div><div class='add'>+</div><div class='add'>+#define TIF_NOTIFY_RESUME	0	// callback before returning to user</div><div class='add'>+#define _TIF_NOTIFY_RESUME	BIT(TIF_NOTIFY_RESUME)</div><div class='add'>+</div><div class='add'>+#define TIF_SIGPENDING		1	// signal pending</div><div class='add'>+#define _TIF_SIGPENDING		BIT(TIF_SIGPENDING)</div><div class='add'>+</div><div class='add'>+#define TIF_NOTIFY_SIGNAL	2	// signal notifications exist</div><div class='add'>+#define _TIF_NOTIFY_SIGNAL	BIT(TIF_NOTIFY_SIGNAL)</div><div class='add'>+</div><div class='add'>+#define TIF_MEMDIE		3	// is terminating due to OOM killer</div><div class='add'>+#define _TIF_MEMDIE		BIT(TIF_MEMDIE)</div><div class='add'>+</div><div class='add'>+#define TIF_NEED_RESCHED	4	// rescheduling necessary</div><div class='add'>+#define _TIF_NEED_RESCHED	BIT(TIF_NEED_RESCHED)</div><div class='add'>+</div><div class='add'>+#ifdef HAVE_TIF_NEED_RESCHED_LAZY</div><div class='add'>+# define TIF_NEED_RESCHED_LAZY	5	// Lazy rescheduling needed</div><div class='add'>+# define _TIF_NEED_RESCHED_LAZY	BIT(TIF_NEED_RESCHED_LAZY)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef HAVE_TIF_POLLING_NRFLAG</div><div class='add'>+# define TIF_POLLING_NRFLAG	6	// idle is polling for TIF_NEED_RESCHED</div><div class='add'>+# define _TIF_POLLING_NRFLAG	BIT(TIF_POLLING_NRFLAG)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define TIF_USER_RETURN_NOTIFY	7	// notify kernel of userspace return</div><div class='add'>+#define _TIF_USER_RETURN_NOTIFY	BIT(TIF_USER_RETURN_NOTIFY)</div><div class='add'>+</div><div class='add'>+#define TIF_UPROBE		8	// breakpointed or singlestepping</div><div class='add'>+#define _TIF_UPROBE		BIT(TIF_UPROBE)</div><div class='add'>+</div><div class='add'>+#define TIF_PATCH_PENDING	9	// pending live patching update</div><div class='add'>+#define _TIF_PATCH_PENDING	BIT(TIF_PATCH_PENDING)</div><div class='add'>+</div><div class='add'>+#ifdef HAVE_TIF_RESTORE_SIGMASK</div><div class='add'>+# define TIF_RESTORE_SIGMASK	10	// Restore signal mask in do_signal() */</div><div class='add'>+# define _TIF_RESTORE_SIGMASK	BIT(TIF_RESTORE_SIGMASK)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define TIF_RSEQ		11	// Run RSEQ fast path</div><div class='add'>+#define _TIF_RSEQ		BIT(TIF_RSEQ)</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_GENERIC_THREAD_INFO_TIF_H_ */</div><div class='head'>diff --git a/include/asm-generic/ticket_spinlock.h b/include/asm-generic/ticket_spinlock.h<br/>new file mode 100644<br/>index 000000000000..325779970d8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/ticket_spinlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/ticket_spinlock.h</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 'Generic' ticket-lock implementation.</div><div class='add'>+ *</div><div class='add'>+ * It relies on atomic_fetch_add() having well defined forward progress</div><div class='add'>+ * guarantees under contention. If your architecture cannot provide this, stick</div><div class='add'>+ * to a test-and-set lock.</div><div class='add'>+ *</div><div class='add'>+ * It also relies on atomic_fetch_add() being safe vs smp_store_release() on a</div><div class='add'>+ * sub-word of the value. This is generally true for anything LL/SC although</div><div class='add'>+ * you'd be hard pressed to find anything useful in architecture specifications</div><div class='add'>+ * about this. If your architecture cannot do this you might be better off with</div><div class='add'>+ * a test-and-set.</div><div class='add'>+ *</div><div class='add'>+ * It further assumes atomic_*_release() + atomic_*_acquire() is RCpc and hence</div><div class='add'>+ * uses atomic_fetch_add() which is RCsc to create an RCsc hot path, along with</div><div class='add'>+ * a full fence after the spin to upgrade the otherwise-RCpc</div><div class='add'>+ * atomic_cond_read_acquire().</div><div class='add'>+ *</div><div class='add'>+ * The implementation uses smp_cond_load_acquire() to spin, so if the</div><div class='add'>+ * architecture has WFE like instructions to sleep instead of poll for word</div><div class='add'>+ * modifications be sure to implement that (see ARM64 for example).</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ASM_GENERIC_TICKET_SPINLOCK_H</div><div class='add'>+#define __ASM_GENERIC_TICKET_SPINLOCK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;asm-generic/spinlock_types.h&gt;</div><div class='add'>+</div><div class='add'>+static __always_inline void ticket_spin_lock(arch_spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	u32 val = atomic_fetch_add(1&lt;&lt;16, &amp;lock-&gt;val);</div><div class='add'>+	u16 ticket = val &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	if (ticket == (u16)val)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * atomic_cond_read_acquire() is RCpc, but rather than defining a</div><div class='add'>+	 * custom cond_read_rcsc() here we just emit a full fence.  We only</div><div class='add'>+	 * need the prior reads before subsequent writes ordering from</div><div class='add'>+	 * smb_mb(), but as atomic_cond_read_acquire() just emits reads and we</div><div class='add'>+	 * have no outstanding writes due to the atomic_fetch_add() the extra</div><div class='add'>+	 * orderings are free.</div><div class='add'>+	 */</div><div class='add'>+	atomic_cond_read_acquire(&amp;lock-&gt;val, ticket == (u16)VAL);</div><div class='add'>+	smp_mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline bool ticket_spin_trylock(arch_spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	u32 old = atomic_read(&amp;lock-&gt;val);</div><div class='add'>+</div><div class='add'>+	if ((old &gt;&gt; 16) != (old &amp; 0xffff))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return atomic_try_cmpxchg(&amp;lock-&gt;val, &amp;old, old + (1&lt;&lt;16)); /* SC, for RCsc */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void ticket_spin_unlock(arch_spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	u16 *ptr = (u16 *)lock + IS_ENABLED(CONFIG_CPU_BIG_ENDIAN);</div><div class='add'>+	u32 val = atomic_read(&amp;lock-&gt;val);</div><div class='add'>+</div><div class='add'>+	smp_store_release(ptr, (u16)val + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline int ticket_spin_value_unlocked(arch_spinlock_t lock)</div><div class='add'>+{</div><div class='add'>+	u32 val = lock.val.counter;</div><div class='add'>+</div><div class='add'>+	return ((val &gt;&gt; 16) == (val &amp; 0xffff));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline int ticket_spin_is_locked(arch_spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	arch_spinlock_t val = READ_ONCE(*lock);</div><div class='add'>+</div><div class='add'>+	return !ticket_spin_value_unlocked(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline int ticket_spin_is_contended(arch_spinlock_t *lock)</div><div class='add'>+{</div><div class='add'>+	u32 val = atomic_read(&amp;lock-&gt;val);</div><div class='add'>+</div><div class='add'>+	return (s16)((val &gt;&gt; 16) - (val &amp; 0xffff)) &gt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef __no_arch_spinlock_redefine</div><div class='add'>+/*</div><div class='add'>+ * Remapping spinlock architecture specific functions to the corresponding</div><div class='add'>+ * ticket spinlock functions.</div><div class='add'>+ */</div><div class='add'>+#define arch_spin_is_locked(l)		ticket_spin_is_locked(l)</div><div class='add'>+#define arch_spin_is_contended(l)	ticket_spin_is_contended(l)</div><div class='add'>+#define arch_spin_value_unlocked(l)	ticket_spin_value_unlocked(l)</div><div class='add'>+#define arch_spin_lock(l)		ticket_spin_lock(l)</div><div class='add'>+#define arch_spin_trylock(l)		ticket_spin_trylock(l)</div><div class='add'>+#define arch_spin_unlock(l)		ticket_spin_unlock(l)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_GENERIC_TICKET_SPINLOCK_H */</div><div class='head'>diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h<br/>index 129a3a759976..1fff717cae51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/tlb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/tlb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/tlb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/tlb.h</a></div><div class='hunk'>@@ -58,6 +58,11 @@</div><div class='ctx'>  *    Defaults to flushing at tlb_end_vma() to reset the range; helps when</div><div class='ctx'>  *    there's large holes between the VMAs.</div><div class='ctx'>  *</div><div class='add'>+ *  - tlb_free_vmas()</div><div class='add'>+ *</div><div class='add'>+ *    tlb_free_vmas() marks the start of unlinking of one or more vmas</div><div class='add'>+ *    and freeing page-tables.</div><div class='add'>+ *</div><div class='ctx'>  *  - tlb_remove_table()</div><div class='ctx'>  *</div><div class='ctx'>  *    tlb_remove_table() is the basic primitive to free page-table directories</div><div class='hunk'>@@ -67,17 +72,22 @@</div><div class='ctx'>  *</div><div class='ctx'>  *    See also MMU_GATHER_TABLE_FREE and MMU_GATHER_RCU_TABLE_FREE.</div><div class='ctx'>  *</div><div class='del'>- *  - tlb_remove_page() / __tlb_remove_page()</div><div class='del'>- *  - tlb_remove_page_size() / __tlb_remove_page_size()</div><div class='add'>+ *  - tlb_remove_page() / tlb_remove_page_size()</div><div class='add'>+ *  - __tlb_remove_folio_pages() / __tlb_remove_page_size()</div><div class='add'>+ *  - __tlb_remove_folio_pages_size()</div><div class='ctx'>  *</div><div class='del'>- *    __tlb_remove_page_size() is the basic primitive that queues a page for</div><div class='del'>- *    freeing. __tlb_remove_page() assumes PAGE_SIZE. Both will return a</div><div class='del'>- *    boolean indicating if the queue is (now) full and a call to</div><div class='del'>- *    tlb_flush_mmu() is required.</div><div class='add'>+ *    __tlb_remove_folio_pages_size() is the basic primitive that queues pages</div><div class='add'>+ *    for freeing. It will return a boolean indicating if the queue is (now)</div><div class='add'>+ *    full and a call to tlb_flush_mmu() is required.</div><div class='ctx'>  *</div><div class='ctx'>  *    tlb_remove_page() and tlb_remove_page_size() imply the call to</div><div class='ctx'>  *    tlb_flush_mmu() when required and has no return value.</div><div class='ctx'>  *</div><div class='add'>+ *    __tlb_remove_folio_pages() is similar to __tlb_remove_page_size(),</div><div class='add'>+ *    however, instead of removing a single page, assume PAGE_SIZE and remove</div><div class='add'>+ *    the given number of consecutive pages that are all part of the</div><div class='add'>+ *    same (large) folio.</div><div class='add'>+ *</div><div class='ctx'>  *  - tlb_change_page_size()</div><div class='ctx'>  *</div><div class='ctx'>  *    call before __tlb_remove_page*() to set the current page-size; implies a</div><div class='hunk'>@@ -147,8 +157,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Useful if your architecture has non-page page directories.</div><div class='ctx'>  *</div><div class='del'>- *  When used, an architecture is expected to provide __tlb_remove_table()</div><div class='del'>- *  which does the actual freeing of these pages.</div><div class='add'>+ *  When used, an architecture is expected to provide __tlb_remove_table() or</div><div class='add'>+ *  use the generic __tlb_remove_table(), which does the actual freeing of these</div><div class='add'>+ *  pages.</div><div class='ctx'>  *</div><div class='ctx'>  *  MMU_GATHER_RCU_TABLE_FREE</div><div class='ctx'>  *</div><div class='hunk'>@@ -201,16 +212,31 @@ struct mmu_table_batch {</div><div class='ctx'> #define MAX_TABLE_BATCH		\</div><div class='ctx'> 	((PAGE_SIZE - sizeof(struct mmu_table_batch)) / sizeof(void *))</div><div class='ctx'> </div><div class='add'>+#ifndef __HAVE_ARCH_TLB_REMOVE_TABLE</div><div class='add'>+static inline void __tlb_remove_table(void *table)</div><div class='add'>+{</div><div class='add'>+	struct ptdesc *ptdesc = (struct ptdesc *)table;</div><div class='add'>+</div><div class='add'>+	pagetable_dtor_free(ptdesc);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> extern void tlb_remove_table(struct mmu_gather *tlb, void *table);</div><div class='ctx'> </div><div class='del'>-#else /* !CONFIG_MMU_GATHER_HAVE_TABLE_FREE */</div><div class='add'>+#else /* !CONFIG_MMU_GATHER_TABLE_FREE */</div><div class='ctx'> </div><div class='add'>+static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page);</div><div class='ctx'> /*</div><div class='ctx'>  * Without MMU_GATHER_TABLE_FREE the architecture is assumed to have page based</div><div class='ctx'>  * page directories and we can use the normal page batching to free them.</div><div class='ctx'>  */</div><div class='del'>-#define tlb_remove_table(tlb, page) tlb_remove_page((tlb), (page))</div><div class='add'>+static inline void tlb_remove_table(struct mmu_gather *tlb, void *table)</div><div class='add'>+{</div><div class='add'>+	struct ptdesc *ptdesc = (struct ptdesc *)table;</div><div class='ctx'> </div><div class='add'>+	pagetable_dtor(ptdesc);</div><div class='add'>+	tlb_remove_page(tlb, ptdesc_page(ptdesc));</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_MMU_GATHER_TABLE_FREE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE</div><div class='hunk'>@@ -260,9 +286,10 @@ struct mmu_gather_batch {</div><div class='ctx'>  */</div><div class='ctx'> #define MAX_GATHER_BATCH_COUNT	(10000UL/MAX_GATHER_BATCH)</div><div class='ctx'> </div><div class='del'>-extern bool __tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='del'>-				   struct encoded_page *page,</div><div class='del'>-				   int page_size);</div><div class='add'>+extern bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page,</div><div class='add'>+		bool delay_rmap, int page_size);</div><div class='add'>+bool __tlb_remove_folio_pages(struct mmu_gather *tlb, struct page *page,</div><div class='add'>+		unsigned int nr_pages, bool delay_rmap);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> /*</div><div class='hunk'>@@ -442,7 +469,12 @@ tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma)</div><div class='ctx'> 	 */</div><div class='ctx'> 	tlb-&gt;vma_huge = is_vm_hugetlb_page(vma);</div><div class='ctx'> 	tlb-&gt;vma_exec = !!(vma-&gt;vm_flags &amp; VM_EXEC);</div><div class='del'>-	tlb-&gt;vma_pfn  = !!(vma-&gt;vm_flags &amp; (VM_PFNMAP|VM_MIXEDMAP));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Track if there's at least one VM_PFNMAP/VM_MIXEDMAP vma</div><div class='add'>+	 * in the tracked range, see tlb_free_vmas().</div><div class='add'>+	 */</div><div class='add'>+	tlb-&gt;vma_pfn |= !!(vma-&gt;vm_flags &amp; (VM_PFNMAP|VM_MIXEDMAP));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)</div><div class='hunk'>@@ -462,35 +494,20 @@ static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)</div><div class='ctx'> static inline void tlb_remove_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 					struct page *page, int page_size)</div><div class='ctx'> {</div><div class='del'>-	if (__tlb_remove_page_size(tlb, encode_page(page, 0), page_size))</div><div class='add'>+	if (__tlb_remove_page_size(tlb, page, false, page_size))</div><div class='ctx'> 		tlb_flush_mmu(tlb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline bool __tlb_remove_page(struct mmu_gather *tlb, struct page *page, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return __tlb_remove_page_size(tlb, encode_page(page, flags), PAGE_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* tlb_remove_page</div><div class='del'>- *	Similar to __tlb_remove_page but will call tlb_flush_mmu() itself when</div><div class='del'>- *	required.</div><div class='del'>- */</div><div class='ctx'> static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return tlb_remove_page_size(tlb, page, PAGE_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void tlb_remove_ptdesc(struct mmu_gather *tlb, void *pt)</div><div class='add'>+static inline void tlb_remove_ptdesc(struct mmu_gather *tlb, struct ptdesc *pt)</div><div class='ctx'> {</div><div class='ctx'> 	tlb_remove_table(tlb, pt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Like tlb_remove_ptdesc, but for page-like page directories. */</div><div class='del'>-static inline void tlb_remove_page_ptdesc(struct mmu_gather *tlb, struct ptdesc *pt)</div><div class='del'>-{</div><div class='del'>-	tlb_remove_page(tlb, ptdesc_page(pt));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void tlb_change_page_size(struct mmu_gather *tlb,</div><div class='ctx'> 						     unsigned int page_size)</div><div class='ctx'> {</div><div class='hunk'>@@ -541,22 +558,38 @@ static inline void tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *</div><div class='ctx'> </div><div class='ctx'> static inline void tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='add'>+	if (tlb-&gt;fullmm || IS_ENABLED(CONFIG_MMU_GATHER_MERGE_VMAS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do a TLB flush and reset the range at VMA boundaries; this avoids</div><div class='add'>+	 * the ranges growing with the unused space between consecutive VMAs,</div><div class='add'>+	 * but also the mmu_gather::vma_* flags from tlb_start_vma() rely on</div><div class='add'>+	 * this.</div><div class='add'>+	 */</div><div class='add'>+	tlb_flush_mmu_tlbonly(tlb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tlb_free_vmas(struct mmu_gather *tlb)</div><div class='add'>+{</div><div class='ctx'> 	if (tlb-&gt;fullmm)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * VM_PFNMAP is more fragile because the core mm will not track the</div><div class='del'>-	 * page mapcount -- there might not be page-frames for these PFNs after</div><div class='del'>-	 * all. Force flush TLBs for such ranges to avoid munmap() vs</div><div class='del'>-	 * unmap_mapping_range() races.</div><div class='add'>+	 * page mapcount -- there might not be page-frames for these PFNs</div><div class='add'>+	 * after all.</div><div class='add'>+	 *</div><div class='add'>+	 * Specifically() there is a race between munmap() and</div><div class='add'>+	 * unmap_mapping_range(), where munmap() will unlink the VMA, such</div><div class='add'>+	 * that unmap_mapping_range() will no longer observe the VMA and</div><div class='add'>+	 * no-op, without observing the TLBI, returning prematurely.</div><div class='add'>+	 *</div><div class='add'>+	 * So if we're about to unlink such a VMA, and we have pending</div><div class='add'>+	 * TLBI for such a vma, flush things now.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tlb-&gt;vma_pfn || !IS_ENABLED(CONFIG_MMU_GATHER_MERGE_VMAS)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Do a TLB flush and reset the range at VMA boundaries; this avoids</div><div class='del'>-		 * the ranges growing with the unused space between consecutive VMAs.</div><div class='del'>-		 */</div><div class='add'>+	if (tlb-&gt;vma_pfn)</div><div class='ctx'> 		tlb_flush_mmu_tlbonly(tlb);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -592,7 +625,9 @@ static inline void tlb_flush_p4d_range(struct mmu_gather *tlb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef __tlb_remove_tlb_entry</div><div class='del'>-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)</div><div class='add'>+static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long address)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -608,6 +643,26 @@ static inline void tlb_flush_p4d_range(struct mmu_gather *tlb,</div><div class='ctx'> 		__tlb_remove_tlb_entry(tlb, ptep, address);	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * tlb_remove_tlb_entries - remember unmapping of multiple consecutive ptes for</div><div class='add'>+ *			    later tlb invalidation.</div><div class='add'>+ *</div><div class='add'>+ * Similar to tlb_remove_tlb_entry(), but remember unmapping of multiple</div><div class='add'>+ * consecutive ptes instead of only a single one.</div><div class='add'>+ */</div><div class='add'>+static inline void tlb_remove_tlb_entries(struct mmu_gather *tlb,</div><div class='add'>+		pte_t *ptep, unsigned int nr, unsigned long address)</div><div class='add'>+{</div><div class='add'>+	tlb_flush_pte_range(tlb, address, PAGE_SIZE * nr);</div><div class='add'>+	for (;;) {</div><div class='add'>+		__tlb_remove_tlb_entry(tlb, ptep, address);</div><div class='add'>+		if (--nr == 0)</div><div class='add'>+			break;</div><div class='add'>+		ptep++;</div><div class='add'>+		address += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		unsigned long _sz = huge_page_size(h);		\</div><div class='head'>diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h<br/>index a5be9e61a2a2..b276f783494c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/uaccess.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/uaccess.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/uaccess.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/uaccess.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;asm-generic/access_ok.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_UACCESS_MEMCPY</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> static __always_inline int</div><div class='ctx'> __get_user_fn(size_t size, const void __user *from, void *to)</div><div class='head'>diff --git a/include/asm-generic/unwind_user.h b/include/asm-generic/unwind_user.h<br/>new file mode 100644<br/>index 000000000000..b8882b909944<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/unwind_user.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/unwind_user.h</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_GENERIC_UNWIND_USER_H</div><div class='add'>+#define _ASM_GENERIC_UNWIND_USER_H</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_GENERIC_UNWIND_USER_H */</div><div class='head'>diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h<br/>index c835607f78ae..5c6d9799f4e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/vdso/vsyscall.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/vdso/vsyscall.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/vdso/vsyscall.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/vdso/vsyscall.h</a></div><div class='hunk'>@@ -4,25 +4,31 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-#ifndef __arch_get_k_vdso_data</div><div class='del'>-static __always_inline struct vdso_data *__arch_get_k_vdso_data(void)</div><div class='add'>+#ifndef __arch_get_vdso_u_time_data</div><div class='add'>+static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return &amp;vdso_u_time_data;</div><div class='ctx'> }</div><div class='del'>-#endif /* __arch_get_k_vdso_data */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#ifndef __arch_update_vsyscall</div><div class='del'>-static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata,</div><div class='del'>-						   struct timekeeper *tk)</div><div class='add'>+#ifndef __arch_get_vdso_u_rng_data</div><div class='add'>+static __always_inline const struct vdso_rng_data *__arch_get_vdso_u_rng_data(void)</div><div class='ctx'> {</div><div class='add'>+	return &amp;vdso_u_rng_data;</div><div class='ctx'> }</div><div class='del'>-#endif /* __arch_update_vsyscall */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#ifndef __arch_sync_vdso_data</div><div class='del'>-static __always_inline void __arch_sync_vdso_data(struct vdso_data *vdata)</div><div class='add'>+#ifndef __arch_update_vdso_clock</div><div class='add'>+static __always_inline void __arch_update_vdso_clock(struct vdso_clock *vc)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-#endif /* __arch_sync_vdso_data */</div><div class='add'>+#endif /* __arch_update_vdso_clock */</div><div class='add'>+</div><div class='add'>+#ifndef __arch_sync_vdso_time_data</div><div class='add'>+static __always_inline void __arch_sync_vdso_time_data(struct vdso_time_data *vdata)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* __arch_sync_vdso_time_data */</div><div class='ctx'> </div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='head'>diff --git a/include/asm-generic/vga.h b/include/asm-generic/vga.h<br/>index adf91a783b5c..5dcaf4ae904a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/vga.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/vga.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/vga.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/vga.h</a></div><div class='hunk'>@@ -1,25 +1,4 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- *	Access to VGA videoram</div><div class='del'>- *</div><div class='del'>- *	(c) 1998 Martin Mares &lt;mj@ucw.cz&gt;</div><div class='del'>- */</div><div class='ctx'> #ifndef __ASM_GENERIC_VGA_H</div><div class='ctx'> #define __ASM_GENERIC_VGA_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	On most architectures that support VGA, we can just</div><div class='del'>- *	recalculate addresses and then access the videoram</div><div class='del'>- *	directly without any black magic.</div><div class='del'>- *</div><div class='del'>- *	Everyone else needs to ioremap the address and use</div><div class='del'>- *	proper I/O accesses.</div><div class='del'>- */</div><div class='del'>-#ifndef VGA_MAP_MEM</div><div class='del'>-#define VGA_MAP_MEM(x, s) (unsigned long)phys_to_virt(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define vga_readb(x) (*(x))</div><div class='del'>-#define vga_writeb(x, y) (*(y) = (x))</div><div class='del'>-</div><div class='del'>-#endif /* _ASM_GENERIC_VGA_H */</div><div class='add'>+#endif /* __ASM_GENERIC_VGA_H */</div><div class='head'>diff --git a/include/asm-generic/fb.h b/include/asm-generic/video.h<br/>index 6ccabb400aa6..b1da2309d943 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/fb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/fb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/video.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/video.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> </div><div class='del'>-#ifndef __ASM_GENERIC_FB_H_</div><div class='del'>-#define __ASM_GENERIC_FB_H_</div><div class='add'>+#ifndef __ASM_GENERIC_VIDEO_H_</div><div class='add'>+#define __ASM_GENERIC_VIDEO_H_</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Only include this header file from your architecture's &lt;asm/fb.h&gt;.</div><div class='hunk'>@@ -10,8 +10,9 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/pgtable.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-struct fb_info;</div><div class='add'>+struct device;</div><div class='ctx'> </div><div class='ctx'> #ifndef pgprot_framebuffer</div><div class='ctx'> #define pgprot_framebuffer pgprot_framebuffer</div><div class='hunk'>@@ -23,11 +24,11 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef fb_is_primary_device</div><div class='del'>-#define fb_is_primary_device fb_is_primary_device</div><div class='del'>-static inline int fb_is_primary_device(struct fb_info *info)</div><div class='add'>+#ifndef video_is_primary_device</div><div class='add'>+#define video_is_primary_device video_is_primary_device</div><div class='add'>+static inline bool video_is_primary_device(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -132,4 +133,4 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n)</div><div class='ctx'> #define fb_memset fb_memset_io</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#endif /* __ASM_GENERIC_FB_H_ */</div><div class='add'>+#endif /* __ASM_GENERIC_VIDEO_H_ */</div><div class='head'>diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h<br/>index 5dd3a61d673d..8ca130af301f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/vmlinux.lds.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/vmlinux.lds.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/asm-generic/vmlinux.lds.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/asm-generic/vmlinux.lds.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * linker scripts.</div><div class='ctx'>  *</div><div class='ctx'>  * A minimal linker scripts has following content:</div><div class='del'>- * [This is a sample, architectures may have special requiriements]</div><div class='add'>+ * [This is a sample, architectures may have special requirements]</div><div class='ctx'>  *</div><div class='ctx'>  * OUTPUT_FORMAT(...)</div><div class='ctx'>  * OUTPUT_ARCH(...)</div><div class='hunk'>@@ -50,6 +50,8 @@</div><div class='ctx'>  *               [__nosave_begin, __nosave_end] for the nosave data</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;asm-generic/codetag.lds.h&gt;</div><div class='add'>+</div><div class='ctx'> #ifndef LOAD_OFFSET</div><div class='ctx'> #define LOAD_OFFSET 0</div><div class='ctx'> #endif</div><div class='hunk'>@@ -85,32 +87,56 @@</div><div class='ctx'> #define ALIGN_FUNCTION()  . = ALIGN(CONFIG_FUNCTION_ALIGNMENT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * LD_DEAD_CODE_DATA_ELIMINATION option enables -fdata-sections, which</div><div class='del'>- * generates .data.identifier sections, which need to be pulled in with</div><div class='del'>- * .data. We don't want to pull in .data..other sections, which Linux</div><div class='del'>- * has defined. Same for text and bss.</div><div class='add'>+ * Support -ffunction-sections by matching .text and .text.*,</div><div class='add'>+ * but exclude '.text..*', .text.startup[.*], and .text.exit[.*].</div><div class='add'>+ *</div><div class='add'>+ * .text.startup and .text.startup.* are matched later by INIT_TEXT, and</div><div class='add'>+ * .text.exit and .text.exit.* are matched later by EXIT_TEXT, so they must be</div><div class='add'>+ * explicitly excluded here.</div><div class='add'>+ *</div><div class='add'>+ * Other .text.* sections that are typically grouped separately, such as</div><div class='add'>+ * .text.unlikely or .text.hot, must be matched explicitly before using</div><div class='add'>+ * TEXT_MAIN.</div><div class='ctx'>  *</div><div class='del'>- * With LTO_CLANG, the linker also splits sections by default, so we need</div><div class='del'>- * these macros to combine the sections during the final link.</div><div class='add'>+ * NOTE: builds *with* and *without* -ffunction-sections are both supported by</div><div class='add'>+ * this single macro.  Even with -ffunction-sections, there may be some objects</div><div class='add'>+ * NOT compiled with the flag due to the use of a specific Makefile override</div><div class='add'>+ * like cflags-y or AUTOFDO_PROFILE_foo.o.  So this single catchall rule is</div><div class='add'>+ * needed to support mixed object builds.</div><div class='ctx'>  *</div><div class='del'>- * RODATA_MAIN is not used because existing code already defines .rodata.x</div><div class='del'>- * sections to be brought in with rodata.</div><div class='add'>+ * One implication is that functions named startup(), exit(), split(),</div><div class='add'>+ * unlikely(), hot(), and unknown() are not allowed in the kernel due to the</div><div class='add'>+ * ambiguity of their section names with -ffunction-sections.  For example,</div><div class='add'>+ * .text.startup could be __attribute__((constructor)) code in a *non*</div><div class='add'>+ * ffunction-sections object, which should be placed in .init.text; or it could</div><div class='add'>+ * be an actual function named startup() in an ffunction-sections object, which</div><div class='add'>+ * should be placed in .text.  The build will detect and complain about any such</div><div class='add'>+ * ambiguously named functions.</div><div class='add'>+ */</div><div class='add'>+#define TEXT_MAIN							\</div><div class='add'>+	.text								\</div><div class='add'>+	.text.[_0-9A-Za-df-rt-z]*					\</div><div class='add'>+	.text.s[_0-9A-Za-su-z]*		.text.s		.text.s.*	\</div><div class='add'>+	.text.st[_0-9A-Zb-z]*		.text.st	.text.st.*	\</div><div class='add'>+	.text.sta[_0-9A-Za-qs-z]*	.text.sta	.text.sta.*	\</div><div class='add'>+	.text.star[_0-9A-Za-su-z]*	.text.star	.text.star.*	\</div><div class='add'>+	.text.start[_0-9A-Za-tv-z]*	.text.start	.text.start.*	\</div><div class='add'>+	.text.startu[_0-9A-Za-oq-z]*	.text.startu	.text.startu.*	\</div><div class='add'>+	.text.startup[_0-9A-Za-z]*					\</div><div class='add'>+	.text.e[_0-9A-Za-wy-z]*		.text.e		.text.e.*	\</div><div class='add'>+	.text.ex[_0-9A-Za-hj-z]*	.text.ex	.text.ex.*	\</div><div class='add'>+	.text.exi[_0-9A-Za-su-z]*	.text.exi	.text.exi.*	\</div><div class='add'>+	.text.exit[_0-9A-Za-z]*</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Support -fdata-sections by matching .data, .data.*, and others,</div><div class='add'>+ * but exclude '.data..*'.</div><div class='ctx'>  */</div><div class='del'>-#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG)</div><div class='del'>-#define TEXT_MAIN .text .text.[0-9a-zA-Z_]*</div><div class='del'>-#define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..L* .data..compoundliteral* .data.$__unnamed_* .data.$L*</div><div class='add'>+#define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data.rel.* .data..L* .data..compoundliteral* .data.$__unnamed_* .data.$L*</div><div class='ctx'> #define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]*</div><div class='ctx'> #define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]* .rodata..L*</div><div class='del'>-#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..compoundliteral*</div><div class='add'>+#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..L* .bss..compoundliteral*</div><div class='ctx'> #define SBSS_MAIN .sbss .sbss.[0-9a-zA-Z_]*</div><div class='del'>-#else</div><div class='del'>-#define TEXT_MAIN .text</div><div class='del'>-#define DATA_MAIN .data</div><div class='del'>-#define SDATA_MAIN .sdata</div><div class='del'>-#define RODATA_MAIN .rodata</div><div class='del'>-#define BSS_MAIN .bss</div><div class='del'>-#define SBSS_MAIN .sbss</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * GCC 4.5 and later have a 32 bytes section alignment for structures.</div><div class='hunk'>@@ -131,6 +157,7 @@</div><div class='ctx'> 	*(__dl_sched_class)			\</div><div class='ctx'> 	*(__rt_sched_class)			\</div><div class='ctx'> 	*(__fair_sched_class)			\</div><div class='add'>+	*(__ext_sched_class)			\</div><div class='ctx'> 	*(__idle_sched_class)			\</div><div class='ctx'> 	__sched_class_lowest = .;</div><div class='ctx'> </div><div class='hunk'>@@ -139,14 +166,6 @@</div><div class='ctx'>  * often happens at runtime)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MEMORY_HOTPLUG)</div><div class='del'>-#define MEM_KEEP(sec)    *(.mem##sec)</div><div class='del'>-#define MEM_DISCARD(sec)</div><div class='del'>-#else</div><div class='del'>-#define MEM_KEEP(sec)</div><div class='del'>-#define MEM_DISCARD(sec) *(.mem##sec)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef CONFIG_HAVE_DYNAMIC_FTRACE_NO_PATCHABLE</div><div class='ctx'> #define KEEP_PATCHABLE		KEEP(*(__patchable_function_entries))</div><div class='ctx'> #define PATCHABLE_DISCARDS</div><div class='hunk'>@@ -155,7 +174,7 @@</div><div class='ctx'> #define PATCHABLE_DISCARDS	*(__patchable_function_entries)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_ARCH_SUPPORTS_CFI_CLANG</div><div class='add'>+#ifndef CONFIG_ARCH_SUPPORTS_CFI</div><div class='ctx'> /*</div><div class='ctx'>  * Simply points to ftrace_stub, but with the proper protocol.</div><div class='ctx'>  * Defined by the linker script in linux/vmlinux.lds.h</div><div class='hunk'>@@ -165,7 +184,7 @@</div><div class='ctx'> #define FTRACE_STUB_HACK</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FTRACE_MCOUNT_RECORD</div><div class='add'>+#ifdef CONFIG_DYNAMIC_FTRACE</div><div class='ctx'> /*</div><div class='ctx'>  * The ftrace call sites are logged to a section whose name depends on the</div><div class='ctx'>  * compiler option used. A given kernel image will only use one, AKA</div><div class='hunk'>@@ -355,17 +374,18 @@</div><div class='ctx'> 	*(.data..decrypted)						\</div><div class='ctx'> 	*(.ref.data)							\</div><div class='ctx'> 	*(.data..shared_aligned) /* percpu related */			\</div><div class='del'>-	MEM_KEEP(init.data*)						\</div><div class='del'>-	*(.data.unlikely)						\</div><div class='add'>+	*(.data..unlikely)						\</div><div class='ctx'> 	__start_once = .;						\</div><div class='del'>-	*(.data.once)							\</div><div class='add'>+	*(.data..once)							\</div><div class='ctx'> 	__end_once = .;							\</div><div class='add'>+	*(.data..do_once)						\</div><div class='ctx'> 	STRUCT_ALIGN();							\</div><div class='ctx'> 	*(__tracepoints)						\</div><div class='ctx'> 	/* implement dynamic printk debug */				\</div><div class='ctx'> 	. = ALIGN(8);							\</div><div class='ctx'> 	BOUNDED_SECTION_BY(__dyndbg_classes, ___dyndbg_classes)		\</div><div class='ctx'> 	BOUNDED_SECTION_BY(__dyndbg, ___dyndbg)				\</div><div class='add'>+	CODETAG_SECTIONS()						\</div><div class='ctx'> 	LIKELY_PROFILE()		       				\</div><div class='ctx'> 	BRANCH_PROFILE()						\</div><div class='ctx'> 	TRACE_PRINTKS()							\</div><div class='hunk'>@@ -383,6 +403,11 @@</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);						\</div><div class='ctx'> 	__nosave_end = .;</div><div class='ctx'> </div><div class='add'>+#define CACHE_HOT_DATA(align)						\</div><div class='add'>+	. = ALIGN(align);						\</div><div class='add'>+	*(SORT_BY_ALIGNMENT(.data..hot.*))				\</div><div class='add'>+	. = ALIGN(align);</div><div class='add'>+</div><div class='ctx'> #define PAGE_ALIGNED_DATA(page_align)					\</div><div class='ctx'> 	. = ALIGN(page_align);						\</div><div class='ctx'> 	*(.data..page_aligned)						\</div><div class='hunk'>@@ -399,13 +424,12 @@</div><div class='ctx'> </div><div class='ctx'> #define INIT_TASK_DATA(align)						\</div><div class='ctx'> 	. = ALIGN(align);						\</div><div class='del'>-	__start_init_task = .;						\</div><div class='add'>+	__start_init_stack = .;						\</div><div class='ctx'> 	init_thread_union = .;						\</div><div class='ctx'> 	init_stack = .;							\</div><div class='del'>-	KEEP(*(.data..init_task))					\</div><div class='ctx'> 	KEEP(*(.data..init_thread_info))				\</div><div class='del'>-	. = __start_init_task + THREAD_SIZE;				\</div><div class='del'>-	__end_init_task = .;</div><div class='add'>+	. = __start_init_stack + THREAD_SIZE;				\</div><div class='add'>+	__end_init_stack = .;</div><div class='ctx'> </div><div class='ctx'> #define JUMP_TABLE_DATA							\</div><div class='ctx'> 	. = ALIGN(8);							\</div><div class='hunk'>@@ -455,7 +479,7 @@</div><div class='ctx'> 	. = ALIGN((align));						\</div><div class='ctx'> 	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\</div><div class='ctx'> 		__start_rodata = .;					\</div><div class='del'>-		*(.rodata) *(.rodata.*)					\</div><div class='add'>+		*(.rodata) *(.rodata.*) *(.data.rel.ro*)		\</div><div class='ctx'> 		SCHED_DATA						\</div><div class='ctx'> 		RO_AFTER_INIT_DATA	/* Read only after init */	\</div><div class='ctx'> 		. = ALIGN(8);						\</div><div class='hunk'>@@ -520,7 +544,6 @@</div><div class='ctx'> 	/* __*init sections */						\</div><div class='ctx'> 	__init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) {		\</div><div class='ctx'> 		*(.ref.rodata)						\</div><div class='del'>-		MEM_KEEP(init.rodata)					\</div><div class='ctx'> 	}								\</div><div class='ctx'> 									\</div><div class='ctx'> 	/* Built-in module parameters. */				\</div><div class='hunk'>@@ -555,25 +578,43 @@</div><div class='ctx'> 		__cpuidle_text_end = .;					\</div><div class='ctx'> 		__noinstr_text_end = .;</div><div class='ctx'> </div><div class='add'>+#define TEXT_SPLIT							\</div><div class='add'>+		__split_text_start = .;					\</div><div class='add'>+		*(.text.split .text.split.[0-9a-zA-Z_]*)		\</div><div class='add'>+		__split_text_end = .;</div><div class='add'>+</div><div class='add'>+#define TEXT_UNLIKELY							\</div><div class='add'>+		__unlikely_text_start = .;				\</div><div class='add'>+		*(.text.unlikely .text.unlikely.*)			\</div><div class='add'>+		__unlikely_text_end = .;</div><div class='add'>+</div><div class='add'>+#define TEXT_HOT							\</div><div class='add'>+		__hot_text_start = .;					\</div><div class='add'>+		*(.text.hot .text.hot.*)				\</div><div class='add'>+		__hot_text_end = .;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * .text section. Map to function alignment to avoid address changes</div><div class='ctx'>  * during second ld run in second ld pass when generating System.map</div><div class='ctx'>  *</div><div class='del'>- * TEXT_MAIN here will match .text.fixup and .text.unlikely if dead</div><div class='del'>- * code elimination is enabled, so these sections should be converted</div><div class='del'>- * to use ".." first.</div><div class='add'>+ * TEXT_MAIN here will match symbols with a fixed pattern (for example,</div><div class='add'>+ * .text.hot or .text.unlikely).  Match those before TEXT_MAIN to ensure</div><div class='add'>+ * they get grouped together.</div><div class='add'>+ *</div><div class='add'>+ * Also placing .text.hot section at the beginning of a page, this</div><div class='add'>+ * would help the TLB performance.</div><div class='ctx'>  */</div><div class='ctx'> #define TEXT_TEXT							\</div><div class='ctx'> 		ALIGN_FUNCTION();					\</div><div class='del'>-		*(.text.hot .text.hot.*)				\</div><div class='del'>-		*(TEXT_MAIN .text.fixup)				\</div><div class='del'>-		*(.text.unlikely .text.unlikely.*)			\</div><div class='add'>+		*(.text.asan.* .text.tsan.*)				\</div><div class='ctx'> 		*(.text.unknown .text.unknown.*)			\</div><div class='add'>+		TEXT_SPLIT						\</div><div class='add'>+		TEXT_UNLIKELY						\</div><div class='add'>+		. = ALIGN(PAGE_SIZE);					\</div><div class='add'>+		TEXT_HOT						\</div><div class='add'>+		*(TEXT_MAIN .text.fixup)				\</div><div class='ctx'> 		NOINSTR_TEXT						\</div><div class='del'>-		*(.ref.text)						\</div><div class='del'>-		*(.text.asan.* .text.tsan.*)				\</div><div class='del'>-	MEM_KEEP(init.text*)						\</div><div class='del'>-</div><div class='add'>+		*(.ref.text)</div><div class='ctx'> </div><div class='ctx'> /* sched.text is aling to function alignment to secure we have same</div><div class='ctx'>  * address even at second ld pass when generating System.map */</div><div class='hunk'>@@ -643,10 +684,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_DEBUG_INFO_BTF</div><div class='ctx'> #define BTF								\</div><div class='add'>+	. = ALIGN(PAGE_SIZE);						\</div><div class='ctx'> 	.BTF : AT(ADDR(.BTF) - LOAD_OFFSET) {				\</div><div class='ctx'> 		BOUNDED_SECTION_BY(.BTF, _BTF)				\</div><div class='ctx'> 	}								\</div><div class='del'>-	. = ALIGN(4);							\</div><div class='add'>+	. = ALIGN(PAGE_SIZE);						\</div><div class='ctx'> 	.BTF_ids : AT(ADDR(.BTF_ids) - LOAD_OFFSET) {			\</div><div class='ctx'> 		*(.BTF_ids)						\</div><div class='ctx'> 	}</div><div class='hunk'>@@ -679,7 +721,6 @@</div><div class='ctx'> #define INIT_DATA							\</div><div class='ctx'> 	KEEP(*(SORT(___kentry+*)))					\</div><div class='ctx'> 	*(.init.data .init.data.*)					\</div><div class='del'>-	MEM_DISCARD(init.data*)						\</div><div class='ctx'> 	KERNEL_CTORS()							\</div><div class='ctx'> 	MCOUNT_REC()							\</div><div class='ctx'> 	*(.init.rodata .init.rodata.*)					\</div><div class='hunk'>@@ -687,7 +728,6 @@</div><div class='ctx'> 	TRACE_SYSCALLS()						\</div><div class='ctx'> 	KPROBE_BLACKLIST()						\</div><div class='ctx'> 	ERROR_INJECT_WHITELIST()					\</div><div class='del'>-	MEM_DISCARD(init.rodata)					\</div><div class='ctx'> 	CLK_OF_TABLES()							\</div><div class='ctx'> 	RESERVEDMEM_OF_TABLES()						\</div><div class='ctx'> 	TIMER_OF_TABLES()						\</div><div class='hunk'>@@ -705,17 +745,16 @@</div><div class='ctx'> </div><div class='ctx'> #define INIT_TEXT							\</div><div class='ctx'> 	*(.init.text .init.text.*)					\</div><div class='del'>-	*(.text.startup)						\</div><div class='del'>-	MEM_DISCARD(init.text*)</div><div class='add'>+	*(.text.startup .text.startup.*)</div><div class='ctx'> </div><div class='ctx'> #define EXIT_DATA							\</div><div class='ctx'> 	*(.exit.data .exit.data.*)					\</div><div class='ctx'> 	*(.fini_array .fini_array.*)					\</div><div class='del'>-	*(.dtors .dtors.*)						\</div><div class='add'>+	*(.dtors .dtors.*)</div><div class='ctx'> </div><div class='ctx'> #define EXIT_TEXT							\</div><div class='ctx'> 	*(.exit.text)							\</div><div class='del'>-	*(.text.exit)							\</div><div class='add'>+	*(.text.exit .text.exit.*)</div><div class='ctx'> </div><div class='ctx'> #define EXIT_CALL							\</div><div class='ctx'> 	*(.exitcall.exit)</div><div class='hunk'>@@ -809,6 +848,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Required sections not related to debugging. */</div><div class='ctx'> #define ELF_DETAILS							\</div><div class='add'>+		.modinfo : { *(.modinfo) . = ALIGN(8); }		\</div><div class='ctx'> 		.comment 0 : { *(.comment) }				\</div><div class='ctx'> 		.symtab 0 : { *(.symtab) }				\</div><div class='ctx'> 		.strtab 0 : { *(.strtab) }				\</div><div class='hunk'>@@ -922,6 +962,18 @@</div><div class='ctx'> #define CON_INITCALL							\</div><div class='ctx'> 	BOUNDED_SECTION_POST_LABEL(.con_initcall.init, __con_initcall, _start, _end)</div><div class='ctx'> </div><div class='add'>+#define NAMED_SECTION(name) \</div><div class='add'>+	. = ALIGN(8); \</div><div class='add'>+	name : AT(ADDR(name) - LOAD_OFFSET) \</div><div class='add'>+	{ BOUNDED_SECTION_PRE_LABEL(name, name, __start_, __stop_) }</div><div class='add'>+</div><div class='add'>+#define RUNTIME_CONST(t,x) NAMED_SECTION(runtime_##t##_##x)</div><div class='add'>+</div><div class='add'>+#define RUNTIME_CONST_VARIABLES						\</div><div class='add'>+		RUNTIME_CONST(shift, d_hash_shift)			\</div><div class='add'>+		RUNTIME_CONST(ptr, dentry_hashtable)			\</div><div class='add'>+		RUNTIME_CONST(ptr, __dentry_cache)</div><div class='add'>+</div><div class='ctx'> /* Alignment must be consistent with (kunit_suite *) in include/kunit/test.h */</div><div class='ctx'> #define KUNIT_TABLE()							\</div><div class='ctx'> 		. = ALIGN(8);						\</div><div class='hunk'>@@ -984,7 +1036,7 @@</div><div class='ctx'>  * -fsanitize=thread produce unwanted sections (.eh_frame</div><div class='ctx'>  * and .init_array.*), but CONFIG_CONSTRUCTORS wants to</div><div class='ctx'>  * keep any .init_array.* sections.</div><div class='del'>- * https://bugs.llvm.org/show_bug.cgi?id=46478</div><div class='add'>+ * https://llvm.org/pr46478</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_UNWIND_TABLES</div><div class='ctx'> #define DISCARD_EH_FRAME</div><div class='hunk'>@@ -1010,9 +1062,10 @@</div><div class='ctx'> 	*(.discard)							\</div><div class='ctx'> 	*(.discard.*)							\</div><div class='ctx'> 	*(.export_symbol)						\</div><div class='del'>-	*(.modinfo)							\</div><div class='add'>+	*(.no_trim_symbol)						\</div><div class='ctx'> 	/* ld.bfd warns about .gnu.version* even when not emitted */	\</div><div class='ctx'> 	*(.gnu.version*)						\</div><div class='add'>+	*(__tracepoint_check)						\</div><div class='ctx'> </div><div class='ctx'> #define DISCARDS							\</div><div class='ctx'> 	/DISCARD/ : {							\</div><div class='hunk'>@@ -1033,10 +1086,13 @@</div><div class='ctx'>  */</div><div class='ctx'> #define PERCPU_INPUT(cacheline)						\</div><div class='ctx'> 	__per_cpu_start = .;						\</div><div class='del'>-	*(.data..percpu..first)						\</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);						\</div><div class='ctx'> 	*(.data..percpu..page_aligned)					\</div><div class='ctx'> 	. = ALIGN(cacheline);						\</div><div class='add'>+	__per_cpu_hot_start = .;					\</div><div class='add'>+	*(SORT_BY_ALIGNMENT(.data..percpu..hot.*))			\</div><div class='add'>+	__per_cpu_hot_end = .;						\</div><div class='add'>+	. = ALIGN(cacheline);						\</div><div class='ctx'> 	*(.data..percpu..read_mostly)					\</div><div class='ctx'> 	. = ALIGN(cacheline);						\</div><div class='ctx'> 	*(.data..percpu)						\</div><div class='hunk'>@@ -1045,52 +1101,17 @@</div><div class='ctx'> 	__per_cpu_end = .;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * PERCPU_VADDR - define output section for percpu area</div><div class='add'>+ * PERCPU_SECTION - define output section for percpu area</div><div class='ctx'>  * @cacheline: cacheline size</div><div class='del'>- * @vaddr: explicit base address (optional)</div><div class='del'>- * @phdr: destination PHDR (optional)</div><div class='ctx'>  *</div><div class='ctx'>  * Macro which expands to output section for percpu area.</div><div class='ctx'>  *</div><div class='ctx'>  * @cacheline is used to align subsections to avoid false cacheline</div><div class='ctx'>  * sharing between subsections for different purposes.</div><div class='del'>- *</div><div class='del'>- * If @vaddr is not blank, it specifies explicit base address and all</div><div class='del'>- * percpu symbols will be offset from the given address.  If blank,</div><div class='del'>- * @vaddr always equals @laddr + LOAD_OFFSET.</div><div class='del'>- *</div><div class='del'>- * @phdr defines the output PHDR to use if not blank.  Be warned that</div><div class='del'>- * output PHDR is sticky.  If @phdr is specified, the next output</div><div class='del'>- * section in the linker script will go there too.  @phdr should have</div><div class='del'>- * a leading colon.</div><div class='del'>- *</div><div class='del'>- * Note that this macros defines __per_cpu_load as an absolute symbol.</div><div class='del'>- * If there is no need to put the percpu section at a predetermined</div><div class='del'>- * address, use PERCPU_SECTION.</div><div class='del'>- */</div><div class='del'>-#define PERCPU_VADDR(cacheline, vaddr, phdr)				\</div><div class='del'>-	__per_cpu_load = .;						\</div><div class='del'>-	.data..percpu vaddr : AT(__per_cpu_load - LOAD_OFFSET) {	\</div><div class='del'>-		PERCPU_INPUT(cacheline)					\</div><div class='del'>-	} phdr								\</div><div class='del'>-	. = __per_cpu_load + SIZEOF(.data..percpu);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * PERCPU_SECTION - define output section for percpu area, simple version</div><div class='del'>- * @cacheline: cacheline size</div><div class='del'>- *</div><div class='del'>- * Align to PAGE_SIZE and outputs output section for percpu area.  This</div><div class='del'>- * macro doesn't manipulate @vaddr or @phdr and __per_cpu_load and</div><div class='del'>- * __per_cpu_start will be identical.</div><div class='del'>- *</div><div class='del'>- * This macro is equivalent to ALIGN(PAGE_SIZE); PERCPU_VADDR(@cacheline,,)</div><div class='del'>- * except that __per_cpu_load is defined as a relative symbol against</div><div class='del'>- * .data..percpu which is required for relocatable x86_32 configuration.</div><div class='ctx'>  */</div><div class='ctx'> #define PERCPU_SECTION(cacheline)					\</div><div class='ctx'> 	. = ALIGN(PAGE_SIZE);						\</div><div class='ctx'> 	.data..percpu	: AT(ADDR(.data..percpu) - LOAD_OFFSET) {	\</div><div class='del'>-		__per_cpu_load = .;					\</div><div class='ctx'> 		PERCPU_INPUT(cacheline)					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1119,6 +1140,7 @@</div><div class='ctx'> 		INIT_TASK_DATA(inittask)				\</div><div class='ctx'> 		NOSAVE_DATA						\</div><div class='ctx'> 		PAGE_ALIGNED_DATA(pagealigned)				\</div><div class='add'>+		CACHE_HOT_DATA(cacheline)				\</div><div class='ctx'> 		CACHELINE_ALIGNED_DATA(cacheline)			\</div><div class='ctx'> 		READ_MOSTLY_DATA(cacheline)				\</div><div class='ctx'> 		DATA_DATA						\</div><div class='head'>diff --git a/include/asm-generic/vtime.h b/include/asm-generic/vtime.h<br/>deleted file mode 100644<br/>index b1a49677fe25..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/vtime.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/vtime.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-/* no content, but patch(1) dislikes empty files */</div><div class='head'>diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h<br/>index cbbc9a6dc571..2eda895f19f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/clocksource/arm_arch_timer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/clocksource/arm_arch_timer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/clocksource/arm_arch_timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/clocksource/arm_arch_timer.h</a></div><div class='hunk'>@@ -9,9 +9,6 @@</div><div class='ctx'> #include &lt;linux/timecounter.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#define ARCH_TIMER_TYPE_CP15		BIT(0)</div><div class='del'>-#define ARCH_TIMER_TYPE_MEM		BIT(1)</div><div class='del'>-</div><div class='ctx'> #define ARCH_TIMER_CTRL_ENABLE		(1 &lt;&lt; 0)</div><div class='ctx'> #define ARCH_TIMER_CTRL_IT_MASK		(1 &lt;&lt; 1)</div><div class='ctx'> #define ARCH_TIMER_CTRL_IT_STAT		(1 &lt;&lt; 2)</div><div class='hunk'>@@ -22,6 +19,12 @@</div><div class='ctx'> #define CNTHCTL_EVNTDIR			(1 &lt;&lt; 3)</div><div class='ctx'> #define CNTHCTL_EVNTI			(0xF &lt;&lt; 4)</div><div class='ctx'> #define CNTHCTL_ECV			(1 &lt;&lt; 12)</div><div class='add'>+#define CNTHCTL_EL1TVT			(1 &lt;&lt; 13)</div><div class='add'>+#define CNTHCTL_EL1TVCT			(1 &lt;&lt; 14)</div><div class='add'>+#define CNTHCTL_EL1NVPCT		(1 &lt;&lt; 15)</div><div class='add'>+#define CNTHCTL_EL1NVVCT		(1 &lt;&lt; 16)</div><div class='add'>+#define CNTHCTL_CNTVMASK		(1 &lt;&lt; 18)</div><div class='add'>+#define CNTHCTL_CNTPMASK		(1 &lt;&lt; 19)</div><div class='ctx'> </div><div class='ctx'> enum arch_timer_reg {</div><div class='ctx'> 	ARCH_TIMER_REG_CTRL,</div><div class='hunk'>@@ -45,8 +48,6 @@ enum arch_timer_spi_nr {</div><div class='ctx'> </div><div class='ctx'> #define ARCH_TIMER_PHYS_ACCESS		0</div><div class='ctx'> #define ARCH_TIMER_VIRT_ACCESS		1</div><div class='del'>-#define ARCH_TIMER_MEM_PHYS_ACCESS	2</div><div class='del'>-#define ARCH_TIMER_MEM_VIRT_ACCESS	3</div><div class='ctx'> </div><div class='ctx'> #define ARCH_TIMER_MEM_MAX_FRAMES	8</div><div class='ctx'> </div><div class='head'>diff --git a/include/clocksource/hyperv_timer.h b/include/clocksource/hyperv_timer.h<br/>index 6cdc873ac907..d48dd4176fd3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/clocksource/hyperv_timer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/clocksource/hyperv_timer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/clocksource/hyperv_timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/clocksource/hyperv_timer.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clocksource.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;asm/hyperv-tlfs.h&gt;</div><div class='add'>+#include &lt;hyperv/hvhdk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define HV_MAX_MAX_DELTA_TICKS 0xffffffff</div><div class='ctx'> #define HV_MIN_DELTA_TICKS 1</div><div class='hunk'>@@ -38,6 +38,8 @@ extern void hv_remap_tsc_clocksource(void);</div><div class='ctx'> extern unsigned long hv_get_tsc_pfn(void);</div><div class='ctx'> extern struct ms_hyperv_tsc_page *hv_get_tsc_page(void);</div><div class='ctx'> </div><div class='add'>+extern void hv_adj_sched_clock_offset(u64 offset);</div><div class='add'>+</div><div class='ctx'> static __always_inline bool</div><div class='ctx'> hv_read_tsc_page_tsc(const struct ms_hyperv_tsc_page *tsc_pg,</div><div class='ctx'> 		     u64 *cur_tsc, u64 *time)</div><div class='head'>diff --git a/include/clocksource/timer-xilinx.h b/include/clocksource/timer-xilinx.h<br/>index c0f56fe6d22a..d116f18de899 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/clocksource/timer-xilinx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/clocksource/timer-xilinx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/clocksource/timer-xilinx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/clocksource/timer-xilinx.h</a></div><div class='hunk'>@@ -41,7 +41,7 @@ struct regmap;</div><div class='ctx'> struct xilinx_timer_priv {</div><div class='ctx'> 	struct regmap *map;</div><div class='ctx'> 	struct clk *clk;</div><div class='del'>-	u32 max;</div><div class='add'>+	u64 max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/crypto/acompress.h b/include/crypto/acompress.h<br/>index 574cffc90730..9eacb9fa375d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/acompress.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/acompress.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/acompress.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/acompress.h</a></div><div class='hunk'>@@ -10,30 +10,93 @@</div><div class='ctx'> #define _CRYPTO_ACOMP_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/args.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='ctx'> #include &lt;linux/container_of.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/spinlock_types.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* Set this bit if source is virtual address instead of SG list. */</div><div class='add'>+#define CRYPTO_ACOMP_REQ_SRC_VIRT	0x00000002</div><div class='add'>+</div><div class='add'>+/* Set this bit for if virtual address source cannot be used for DMA. */</div><div class='add'>+#define CRYPTO_ACOMP_REQ_SRC_NONDMA	0x00000004</div><div class='add'>+</div><div class='add'>+/* Set this bit if destination is virtual address instead of SG list. */</div><div class='add'>+#define CRYPTO_ACOMP_REQ_DST_VIRT	0x00000008</div><div class='add'>+</div><div class='add'>+/* Set this bit for if virtual address destination cannot be used for DMA. */</div><div class='add'>+#define CRYPTO_ACOMP_REQ_DST_NONDMA	0x00000010</div><div class='add'>+</div><div class='add'>+/* Private flags that should not be touched by the user. */</div><div class='add'>+#define CRYPTO_ACOMP_REQ_PRIVATE \</div><div class='add'>+	(CRYPTO_ACOMP_REQ_SRC_VIRT | CRYPTO_ACOMP_REQ_SRC_NONDMA | \</div><div class='add'>+	 CRYPTO_ACOMP_REQ_DST_VIRT | CRYPTO_ACOMP_REQ_DST_NONDMA)</div><div class='ctx'> </div><div class='del'>-#define CRYPTO_ACOMP_ALLOC_OUTPUT	0x00000001</div><div class='ctx'> #define CRYPTO_ACOMP_DST_MAX		131072</div><div class='ctx'> </div><div class='add'>+#define	MAX_SYNC_COMP_REQSIZE		0</div><div class='add'>+</div><div class='add'>+#define ACOMP_REQUEST_ON_STACK(name, tfm) \</div><div class='add'>+        char __##name##_req[sizeof(struct acomp_req) + \</div><div class='add'>+                            MAX_SYNC_COMP_REQSIZE] CRYPTO_MINALIGN_ATTR; \</div><div class='add'>+        struct acomp_req *name = acomp_request_on_stack_init( \</div><div class='add'>+                __##name##_req, (tfm))</div><div class='add'>+</div><div class='add'>+#define ACOMP_REQUEST_CLONE(name, gfp) \</div><div class='add'>+	acomp_request_clone(name, sizeof(__##name##_req), gfp)</div><div class='add'>+</div><div class='add'>+struct acomp_req;</div><div class='add'>+struct folio;</div><div class='add'>+</div><div class='add'>+struct acomp_req_chain {</div><div class='add'>+	crypto_completion_t compl;</div><div class='add'>+	void *data;</div><div class='add'>+	struct scatterlist ssg;</div><div class='add'>+	struct scatterlist dsg;</div><div class='add'>+	union {</div><div class='add'>+		const u8 *src;</div><div class='add'>+		struct folio *sfolio;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		u8 *dst;</div><div class='add'>+		struct folio *dfolio;</div><div class='add'>+	};</div><div class='add'>+	u32 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct acomp_req - asynchronous (de)compression request</div><div class='ctx'>  *</div><div class='ctx'>  * @base:	Common attributes for asynchronous crypto requests</div><div class='del'>- * @src:	Source Data</div><div class='del'>- * @dst:	Destination data</div><div class='add'>+ * @src:	Source scatterlist</div><div class='add'>+ * @dst:	Destination scatterlist</div><div class='add'>+ * @svirt:	Source virtual address</div><div class='add'>+ * @dvirt:	Destination virtual address</div><div class='ctx'>  * @slen:	Size of the input buffer</div><div class='ctx'>  * @dlen:	Size of the output buffer and number of bytes produced</div><div class='del'>- * @flags:	Internal flags</div><div class='add'>+ * @chain:	Private API code data, do not use</div><div class='ctx'>  * @__ctx:	Start of private context data</div><div class='ctx'>  */</div><div class='ctx'> struct acomp_req {</div><div class='ctx'> 	struct crypto_async_request base;</div><div class='del'>-	struct scatterlist *src;</div><div class='del'>-	struct scatterlist *dst;</div><div class='add'>+	union {</div><div class='add'>+		struct scatterlist *src;</div><div class='add'>+		const u8 *svirt;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		struct scatterlist *dst;</div><div class='add'>+		u8 *dvirt;</div><div class='add'>+	};</div><div class='ctx'> 	unsigned int slen;</div><div class='ctx'> 	unsigned int dlen;</div><div class='del'>-	u32 flags;</div><div class='add'>+</div><div class='add'>+	struct acomp_req_chain chain;</div><div class='add'>+</div><div class='ctx'> 	void *__ctx[] CRYPTO_MINALIGN_ATTR;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -43,44 +106,18 @@ struct acomp_req {</div><div class='ctx'>  *</div><div class='ctx'>  * @compress:		Function performs a compress operation</div><div class='ctx'>  * @decompress:		Function performs a de-compress operation</div><div class='del'>- * @dst_free:		Frees destination buffer if allocated inside the</div><div class='del'>- *			algorithm</div><div class='ctx'>  * @reqsize:		Context size for (de)compression requests</div><div class='add'>+ * @fb:			Synchronous fallback tfm</div><div class='ctx'>  * @base:		Common crypto API algorithm data structure</div><div class='ctx'>  */</div><div class='ctx'> struct crypto_acomp {</div><div class='ctx'> 	int (*compress)(struct acomp_req *req);</div><div class='ctx'> 	int (*decompress)(struct acomp_req *req);</div><div class='del'>-	void (*dst_free)(struct scatterlist *dst);</div><div class='ctx'> 	unsigned int reqsize;</div><div class='ctx'> 	struct crypto_tfm base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct crypto_istat_compress - statistics for compress algorithm</div><div class='del'>- * @compress_cnt:	number of compress requests</div><div class='del'>- * @compress_tlen:	total data size handled by compress requests</div><div class='del'>- * @decompress_cnt:	number of decompress requests</div><div class='del'>- * @decompress_tlen:	total data size handled by decompress requests</div><div class='del'>- * @err_cnt:		number of error for compress requests</div><div class='del'>- */</div><div class='del'>-struct crypto_istat_compress {</div><div class='del'>-	atomic64_t compress_cnt;</div><div class='del'>-	atomic64_t compress_tlen;</div><div class='del'>-	atomic64_t decompress_cnt;</div><div class='del'>-	atomic64_t decompress_tlen;</div><div class='del'>-	atomic64_t err_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-#define COMP_ALG_COMMON_STATS struct crypto_istat_compress stat;</div><div class='del'>-#else</div><div class='del'>-#define COMP_ALG_COMMON_STATS</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define COMP_ALG_COMMON {			\</div><div class='del'>-	COMP_ALG_COMMON_STATS			\</div><div class='del'>-						\</div><div class='ctx'> 	struct crypto_alg base;			\</div><div class='ctx'> }</div><div class='ctx'> struct comp_alg_common COMP_ALG_COMMON;</div><div class='hunk'>@@ -157,7 +194,13 @@ static inline unsigned int crypto_acomp_reqsize(struct crypto_acomp *tfm)</div><div class='ctx'> static inline void acomp_request_set_tfm(struct acomp_req *req,</div><div class='ctx'> 					 struct crypto_acomp *tfm)</div><div class='ctx'> {</div><div class='del'>-	req-&gt;base.tfm = crypto_acomp_tfm(tfm);</div><div class='add'>+	crypto_request_set_tfm(&amp;req-&gt;base, crypto_acomp_tfm(tfm));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool acomp_is_async(struct crypto_acomp *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_comp_alg_common(tfm)-&gt;base.cra_flags &amp;</div><div class='add'>+	       CRYPTO_ALG_ASYNC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct crypto_acomp *crypto_acomp_reqtfm(struct acomp_req *req)</div><div class='hunk'>@@ -186,14 +229,72 @@ static inline int crypto_has_acomp(const char *alg_name, u32 type, u32 mask)</div><div class='ctx'> 	return crypto_has_alg(alg_name, type, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline const char *crypto_acomp_alg_name(struct crypto_acomp *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_tfm_alg_name(crypto_acomp_tfm(tfm));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *crypto_acomp_driver_name(struct crypto_acomp *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_tfm_alg_driver_name(crypto_acomp_tfm(tfm));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * acomp_request_alloc() -- allocates asynchronous (de)compression request</div><div class='ctx'>  *</div><div class='ctx'>  * @tfm:	ACOMPRESS tfm handle allocated with crypto_alloc_acomp()</div><div class='add'>+ * @gfp:	gfp to pass to kzalloc (defaults to GFP_KERNEL)</div><div class='add'>+ *</div><div class='add'>+ * Return:	allocated handle in case of success or NULL in case of an error</div><div class='add'>+ */</div><div class='add'>+static inline struct acomp_req *acomp_request_alloc_extra_noprof(</div><div class='add'>+	struct crypto_acomp *tfm, size_t extra, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct acomp_req *req;</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = ALIGN(sizeof(*req) + crypto_acomp_reqsize(tfm), CRYPTO_MINALIGN);</div><div class='add'>+	if (check_add_overflow(len, extra, &amp;len))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	req = kzalloc_noprof(len, gfp);</div><div class='add'>+	if (likely(req))</div><div class='add'>+		acomp_request_set_tfm(req, tfm);</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+#define acomp_request_alloc_noprof(tfm, ...) \</div><div class='add'>+	CONCATENATE(acomp_request_alloc_noprof_, COUNT_ARGS(__VA_ARGS__))( \</div><div class='add'>+		tfm, ##__VA_ARGS__)</div><div class='add'>+#define acomp_request_alloc_noprof_0(tfm) \</div><div class='add'>+	acomp_request_alloc_noprof_1(tfm, GFP_KERNEL)</div><div class='add'>+#define acomp_request_alloc_noprof_1(tfm, gfp) \</div><div class='add'>+	acomp_request_alloc_extra_noprof(tfm, 0, gfp)</div><div class='add'>+#define acomp_request_alloc(...)	alloc_hooks(acomp_request_alloc_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acomp_request_alloc_extra() -- allocate acomp request with extra memory</div><div class='add'>+ *</div><div class='add'>+ * @tfm:	ACOMPRESS tfm handle allocated with crypto_alloc_acomp()</div><div class='add'>+ * @extra:	amount of extra memory</div><div class='add'>+ * @gfp:	gfp to pass to kzalloc</div><div class='ctx'>  *</div><div class='ctx'>  * Return:	allocated handle in case of success or NULL in case of an error</div><div class='ctx'>  */</div><div class='del'>-struct acomp_req *acomp_request_alloc(struct crypto_acomp *tfm);</div><div class='add'>+#define acomp_request_alloc_extra(...)	alloc_hooks(acomp_request_alloc_extra_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+static inline void *acomp_request_extra(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *tfm = crypto_acomp_reqtfm(req);</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	len = ALIGN(sizeof(*req) + crypto_acomp_reqsize(tfm), CRYPTO_MINALIGN);</div><div class='add'>+	return (void *)((char *)req + len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool acomp_req_on_stack(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return crypto_req_on_stack(&amp;req-&gt;base);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * acomp_request_free() -- zeroize and free asynchronous (de)compression</div><div class='hunk'>@@ -202,7 +303,12 @@ struct acomp_req *acomp_request_alloc(struct crypto_acomp *tfm);</div><div class='ctx'>  *</div><div class='ctx'>  * @req:	request to free</div><div class='ctx'>  */</div><div class='del'>-void acomp_request_free(struct acomp_req *req);</div><div class='add'>+static inline void acomp_request_free(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	if (!req || acomp_req_on_stack(req))</div><div class='add'>+		return;</div><div class='add'>+	kfree_sensitive(req);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * acomp_request_set_callback() -- Sets an asynchronous callback</div><div class='hunk'>@@ -220,10 +326,9 @@ static inline void acomp_request_set_callback(struct acomp_req *req,</div><div class='ctx'> 					      crypto_completion_t cmpl,</div><div class='ctx'> 					      void *data)</div><div class='ctx'> {</div><div class='del'>-	req-&gt;base.complete = cmpl;</div><div class='del'>-	req-&gt;base.data = data;</div><div class='del'>-	req-&gt;base.flags &amp;= CRYPTO_ACOMP_ALLOC_OUTPUT;</div><div class='del'>-	req-&gt;base.flags |= flgs &amp; ~CRYPTO_ACOMP_ALLOC_OUTPUT;</div><div class='add'>+	flgs &amp;= ~CRYPTO_ACOMP_REQ_PRIVATE;</div><div class='add'>+	flgs |= req-&gt;base.flags &amp; CRYPTO_ACOMP_REQ_PRIVATE;</div><div class='add'>+	crypto_request_set_callback(&amp;req-&gt;base, flgs, cmpl, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -250,59 +355,183 @@ static inline void acomp_request_set_params(struct acomp_req *req,</div><div class='ctx'> 	req-&gt;slen = slen;</div><div class='ctx'> 	req-&gt;dlen = dlen;</div><div class='ctx'> </div><div class='del'>-	req-&gt;flags &amp;= ~CRYPTO_ACOMP_ALLOC_OUTPUT;</div><div class='del'>-	if (!req-&gt;dst)</div><div class='del'>-		req-&gt;flags |= CRYPTO_ACOMP_ALLOC_OUTPUT;</div><div class='add'>+	req-&gt;base.flags &amp;= ~(CRYPTO_ACOMP_REQ_SRC_VIRT |</div><div class='add'>+			     CRYPTO_ACOMP_REQ_SRC_NONDMA |</div><div class='add'>+			     CRYPTO_ACOMP_REQ_DST_VIRT |</div><div class='add'>+			     CRYPTO_ACOMP_REQ_DST_NONDMA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct crypto_istat_compress *comp_get_stat(</div><div class='del'>-	struct comp_alg_common *alg)</div><div class='add'>+/**</div><div class='add'>+ * acomp_request_set_src_sg() -- Sets source scatterlist</div><div class='add'>+ *</div><div class='add'>+ * Sets source scatterlist required by an acomp operation.</div><div class='add'>+ *</div><div class='add'>+ * @req:	asynchronous compress request</div><div class='add'>+ * @src:	pointer to input buffer scatterlist</div><div class='add'>+ * @slen:	size of the input buffer</div><div class='add'>+ */</div><div class='add'>+static inline void acomp_request_set_src_sg(struct acomp_req *req,</div><div class='add'>+					    struct scatterlist *src,</div><div class='add'>+					    unsigned int slen)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	return &amp;alg-&gt;stat;</div><div class='del'>-#else</div><div class='del'>-	return NULL;</div><div class='del'>-#endif</div><div class='add'>+	req-&gt;src = src;</div><div class='add'>+	req-&gt;slen = slen;</div><div class='add'>+</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_ACOMP_REQ_SRC_NONDMA;</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_ACOMP_REQ_SRC_VIRT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acomp_request_set_src_dma() -- Sets DMA source virtual address</div><div class='add'>+ *</div><div class='add'>+ * Sets source virtual address required by an acomp operation.</div><div class='add'>+ * The address must be usable for DMA.</div><div class='add'>+ *</div><div class='add'>+ * @req:	asynchronous compress request</div><div class='add'>+ * @src:	virtual address pointer to input buffer</div><div class='add'>+ * @slen:	size of the input buffer</div><div class='add'>+ */</div><div class='add'>+static inline void acomp_request_set_src_dma(struct acomp_req *req,</div><div class='add'>+					     const u8 *src, unsigned int slen)</div><div class='add'>+{</div><div class='add'>+	req-&gt;svirt = src;</div><div class='add'>+	req-&gt;slen = slen;</div><div class='add'>+</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_ACOMP_REQ_SRC_NONDMA;</div><div class='add'>+	req-&gt;base.flags |= CRYPTO_ACOMP_REQ_SRC_VIRT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int crypto_comp_errstat(struct comp_alg_common *alg, int err)</div><div class='add'>+/**</div><div class='add'>+ * acomp_request_set_src_nondma() -- Sets non-DMA source virtual address</div><div class='add'>+ *</div><div class='add'>+ * Sets source virtual address required by an acomp operation.</div><div class='add'>+ * The address can not be used for DMA.</div><div class='add'>+ *</div><div class='add'>+ * @req:	asynchronous compress request</div><div class='add'>+ * @src:	virtual address pointer to input buffer</div><div class='add'>+ * @slen:	size of the input buffer</div><div class='add'>+ */</div><div class='add'>+static inline void acomp_request_set_src_nondma(struct acomp_req *req,</div><div class='add'>+						const u8 *src,</div><div class='add'>+						unsigned int slen)</div><div class='ctx'> {</div><div class='del'>-	if (!IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		return err;</div><div class='add'>+	req-&gt;svirt = src;</div><div class='add'>+	req-&gt;slen = slen;</div><div class='ctx'> </div><div class='del'>-	if (err &amp;&amp; err != -EINPROGRESS &amp;&amp; err != -EBUSY)</div><div class='del'>-		atomic64_inc(&amp;comp_get_stat(alg)-&gt;err_cnt);</div><div class='add'>+	req-&gt;base.flags |= CRYPTO_ACOMP_REQ_SRC_NONDMA;</div><div class='add'>+	req-&gt;base.flags |= CRYPTO_ACOMP_REQ_SRC_VIRT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+/**</div><div class='add'>+ * acomp_request_set_src_folio() -- Sets source folio</div><div class='add'>+ *</div><div class='add'>+ * Sets source folio required by an acomp operation.</div><div class='add'>+ *</div><div class='add'>+ * @req:	asynchronous compress request</div><div class='add'>+ * @folio:	pointer to input folio</div><div class='add'>+ * @off:	input folio offset</div><div class='add'>+ * @len:	size of the input buffer</div><div class='add'>+ */</div><div class='add'>+static inline void acomp_request_set_src_folio(struct acomp_req *req,</div><div class='add'>+					       struct folio *folio, size_t off,</div><div class='add'>+					       unsigned int len)</div><div class='add'>+{</div><div class='add'>+	sg_init_table(&amp;req-&gt;chain.ssg, 1);</div><div class='add'>+	sg_set_folio(&amp;req-&gt;chain.ssg, folio, len, off);</div><div class='add'>+	acomp_request_set_src_sg(req, &amp;req-&gt;chain.ssg, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * crypto_acomp_compress() -- Invoke asynchronous compress operation</div><div class='add'>+ * acomp_request_set_dst_sg() -- Sets destination scatterlist</div><div class='ctx'>  *</div><div class='del'>- * Function invokes the asynchronous compress operation</div><div class='add'>+ * Sets destination scatterlist required by an acomp operation.</div><div class='ctx'>  *</div><div class='ctx'>  * @req:	asynchronous compress request</div><div class='add'>+ * @dst:	pointer to output buffer scatterlist</div><div class='add'>+ * @dlen:	size of the output buffer</div><div class='add'>+ */</div><div class='add'>+static inline void acomp_request_set_dst_sg(struct acomp_req *req,</div><div class='add'>+					    struct scatterlist *dst,</div><div class='add'>+					    unsigned int dlen)</div><div class='add'>+{</div><div class='add'>+	req-&gt;dst = dst;</div><div class='add'>+	req-&gt;dlen = dlen;</div><div class='add'>+</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_ACOMP_REQ_DST_NONDMA;</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_ACOMP_REQ_DST_VIRT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acomp_request_set_dst_dma() -- Sets DMA destination virtual address</div><div class='ctx'>  *</div><div class='del'>- * Return:	zero on success; error code in case of error</div><div class='add'>+ * Sets destination virtual address required by an acomp operation.</div><div class='add'>+ * The address must be usable for DMA.</div><div class='add'>+ *</div><div class='add'>+ * @req:	asynchronous compress request</div><div class='add'>+ * @dst:	virtual address pointer to output buffer</div><div class='add'>+ * @dlen:	size of the output buffer</div><div class='ctx'>  */</div><div class='del'>-static inline int crypto_acomp_compress(struct acomp_req *req)</div><div class='add'>+static inline void acomp_request_set_dst_dma(struct acomp_req *req,</div><div class='add'>+					     u8 *dst, unsigned int dlen)</div><div class='ctx'> {</div><div class='del'>-	struct crypto_acomp *tfm = crypto_acomp_reqtfm(req);</div><div class='del'>-	struct comp_alg_common *alg;</div><div class='add'>+	req-&gt;dvirt = dst;</div><div class='add'>+	req-&gt;dlen = dlen;</div><div class='ctx'> </div><div class='del'>-	alg = crypto_comp_alg_common(tfm);</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_ACOMP_REQ_DST_NONDMA;</div><div class='add'>+	req-&gt;base.flags |= CRYPTO_ACOMP_REQ_DST_VIRT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {</div><div class='del'>-		struct crypto_istat_compress *istat = comp_get_stat(alg);</div><div class='add'>+/**</div><div class='add'>+ * acomp_request_set_dst_nondma() -- Sets non-DMA destination virtual address</div><div class='add'>+ *</div><div class='add'>+ * Sets destination virtual address required by an acomp operation.</div><div class='add'>+ * The address can not be used for DMA.</div><div class='add'>+ *</div><div class='add'>+ * @req:	asynchronous compress request</div><div class='add'>+ * @dst:	virtual address pointer to output buffer</div><div class='add'>+ * @dlen:	size of the output buffer</div><div class='add'>+ */</div><div class='add'>+static inline void acomp_request_set_dst_nondma(struct acomp_req *req,</div><div class='add'>+						u8 *dst, unsigned int dlen)</div><div class='add'>+{</div><div class='add'>+	req-&gt;dvirt = dst;</div><div class='add'>+	req-&gt;dlen = dlen;</div><div class='ctx'> </div><div class='del'>-		atomic64_inc(&amp;istat-&gt;compress_cnt);</div><div class='del'>-		atomic64_add(req-&gt;slen, &amp;istat-&gt;compress_tlen);</div><div class='del'>-	}</div><div class='add'>+	req-&gt;base.flags |= CRYPTO_ACOMP_REQ_DST_NONDMA;</div><div class='add'>+	req-&gt;base.flags |= CRYPTO_ACOMP_REQ_DST_VIRT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return crypto_comp_errstat(alg, tfm-&gt;compress(req));</div><div class='add'>+/**</div><div class='add'>+ * acomp_request_set_dst_folio() -- Sets destination folio</div><div class='add'>+ *</div><div class='add'>+ * Sets destination folio required by an acomp operation.</div><div class='add'>+ *</div><div class='add'>+ * @req:	asynchronous compress request</div><div class='add'>+ * @folio:	pointer to input folio</div><div class='add'>+ * @off:	input folio offset</div><div class='add'>+ * @len:	size of the input buffer</div><div class='add'>+ */</div><div class='add'>+static inline void acomp_request_set_dst_folio(struct acomp_req *req,</div><div class='add'>+					       struct folio *folio, size_t off,</div><div class='add'>+					       unsigned int len)</div><div class='add'>+{</div><div class='add'>+	sg_init_table(&amp;req-&gt;chain.dsg, 1);</div><div class='add'>+	sg_set_folio(&amp;req-&gt;chain.dsg, folio, len, off);</div><div class='add'>+	acomp_request_set_dst_sg(req, &amp;req-&gt;chain.dsg, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * crypto_acomp_compress() -- Invoke asynchronous compress operation</div><div class='add'>+ *</div><div class='add'>+ * Function invokes the asynchronous compress operation</div><div class='add'>+ *</div><div class='add'>+ * @req:	asynchronous compress request</div><div class='add'>+ *</div><div class='add'>+ * Return:	zero on success; error code in case of error</div><div class='add'>+ */</div><div class='add'>+int crypto_acomp_compress(struct acomp_req *req);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * crypto_acomp_decompress() -- Invoke asynchronous decompress operation</div><div class='ctx'>  *</div><div class='ctx'>  * Function invokes the asynchronous decompress operation</div><div class='hunk'>@@ -311,21 +540,18 @@ static inline int crypto_acomp_compress(struct acomp_req *req)</div><div class='ctx'>  *</div><div class='ctx'>  * Return:	zero on success; error code in case of error</div><div class='ctx'>  */</div><div class='del'>-static inline int crypto_acomp_decompress(struct acomp_req *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_acomp *tfm = crypto_acomp_reqtfm(req);</div><div class='del'>-	struct comp_alg_common *alg;</div><div class='add'>+int crypto_acomp_decompress(struct acomp_req *req);</div><div class='ctx'> </div><div class='del'>-	alg = crypto_comp_alg_common(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {</div><div class='del'>-		struct crypto_istat_compress *istat = comp_get_stat(alg);</div><div class='del'>-</div><div class='del'>-		atomic64_inc(&amp;istat-&gt;decompress_cnt);</div><div class='del'>-		atomic64_add(req-&gt;slen, &amp;istat-&gt;decompress_tlen);</div><div class='del'>-	}</div><div class='add'>+static inline struct acomp_req *acomp_request_on_stack_init(</div><div class='add'>+	char *buf, struct crypto_acomp *tfm)</div><div class='add'>+{</div><div class='add'>+	struct acomp_req *req = (void *)buf;</div><div class='ctx'> </div><div class='del'>-	return crypto_comp_errstat(alg, tfm-&gt;decompress(req));</div><div class='add'>+	crypto_stack_request_init(&amp;req-&gt;base, crypto_acomp_tfm(tfm));</div><div class='add'>+	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct acomp_req *acomp_request_clone(struct acomp_req *req,</div><div class='add'>+				      size_t total, gfp_t gfp);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/aead.h b/include/crypto/aead.h<br/>index 51382befbe37..8e66a1fa9c78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/aead.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/aead.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/aead.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/aead.h</a></div><div class='hunk'>@@ -101,22 +101,6 @@ struct aead_request {</div><div class='ctx'> 	void *__ctx[] CRYPTO_MINALIGN_ATTR;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct crypto_istat_aead - statistics for AEAD algorithm</div><div class='del'>- * @encrypt_cnt:	number of encrypt requests</div><div class='del'>- * @encrypt_tlen:	total data size handled by encrypt requests</div><div class='del'>- * @decrypt_cnt:	number of decrypt requests</div><div class='del'>- * @decrypt_tlen:	total data size handled by decrypt requests</div><div class='del'>- * @err_cnt:		number of error for AEAD requests</div><div class='del'>- */</div><div class='del'>-struct crypto_istat_aead {</div><div class='del'>-	atomic64_t encrypt_cnt;</div><div class='del'>-	atomic64_t encrypt_tlen;</div><div class='del'>-	atomic64_t decrypt_cnt;</div><div class='del'>-	atomic64_t decrypt_tlen;</div><div class='del'>-	atomic64_t err_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct aead_alg - AEAD cipher definition</div><div class='ctx'>  * @maxauthsize: Set the maximum authentication tag size supported by the</div><div class='hunk'>@@ -135,7 +119,6 @@ struct crypto_istat_aead {</div><div class='ctx'>  * @setkey: see struct skcipher_alg</div><div class='ctx'>  * @encrypt: see struct skcipher_alg</div><div class='ctx'>  * @decrypt: see struct skcipher_alg</div><div class='del'>- * @stat: statistics for AEAD algorithm</div><div class='ctx'>  * @ivsize: see struct skcipher_alg</div><div class='ctx'>  * @chunksize: see struct skcipher_alg</div><div class='ctx'>  * @init: Initialize the cryptographic transformation object. This function</div><div class='hunk'>@@ -162,10 +145,6 @@ struct aead_alg {</div><div class='ctx'> 	int (*init)(struct crypto_aead *tfm);</div><div class='ctx'> 	void (*exit)(struct crypto_aead *tfm);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	struct crypto_istat_aead stat;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	unsigned int ivsize;</div><div class='ctx'> 	unsigned int maxauthsize;</div><div class='ctx'> 	unsigned int chunksize;</div><div class='hunk'>@@ -180,6 +159,21 @@ struct crypto_aead {</div><div class='ctx'> 	struct crypto_tfm base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct crypto_sync_aead {</div><div class='add'>+	struct crypto_aead base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_SYNC_AEAD_REQSIZE		384</div><div class='add'>+</div><div class='add'>+#define SYNC_AEAD_REQUEST_ON_STACK(name, _tfm)		\</div><div class='add'>+	char __##name##_desc[sizeof(struct aead_request) +	\</div><div class='add'>+			     MAX_SYNC_AEAD_REQSIZE		\</div><div class='add'>+			    ] CRYPTO_MINALIGN_ATTR;		\</div><div class='add'>+	struct aead_request *name =				\</div><div class='add'>+		(((struct aead_request *)__##name##_desc)-&gt;base.tfm = \</div><div class='add'>+			crypto_sync_aead_tfm((_tfm)),		\</div><div class='add'>+		 (void *)__##name##_desc)</div><div class='add'>+</div><div class='ctx'> static inline struct crypto_aead *__crypto_aead_cast(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(tfm, struct crypto_aead, base);</div><div class='hunk'>@@ -201,11 +195,18 @@ static inline struct crypto_aead *__crypto_aead_cast(struct crypto_tfm *tfm)</div><div class='ctx'>  */</div><div class='ctx'> struct crypto_aead *crypto_alloc_aead(const char *alg_name, u32 type, u32 mask);</div><div class='ctx'> </div><div class='add'>+struct crypto_sync_aead *crypto_alloc_sync_aead(const char *alg_name, u32 type, u32 mask);</div><div class='add'>+</div><div class='ctx'> static inline struct crypto_tfm *crypto_aead_tfm(struct crypto_aead *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;tfm-&gt;base;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct crypto_tfm *crypto_sync_aead_tfm(struct crypto_sync_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_aead_tfm(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_free_aead() - zeroize and free aead handle</div><div class='ctx'>  * @tfm: cipher handle to be freed</div><div class='hunk'>@@ -217,6 +218,11 @@ static inline void crypto_free_aead(struct crypto_aead *tfm)</div><div class='ctx'> 	crypto_destroy_tfm(tfm, crypto_aead_tfm(tfm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void crypto_free_sync_aead(struct crypto_sync_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	crypto_free_aead(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_has_aead() - Search for the availability of an aead.</div><div class='ctx'>  * @alg_name: is the cra_name / name or cra_driver_name / driver name of the</div><div class='hunk'>@@ -259,6 +265,11 @@ static inline unsigned int crypto_aead_ivsize(struct crypto_aead *tfm)</div><div class='ctx'> 	return crypto_aead_alg_ivsize(crypto_aead_alg(tfm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int crypto_sync_aead_ivsize(struct crypto_sync_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_aead_ivsize(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_aead_authsize() - obtain maximum authentication data size</div><div class='ctx'>  * @tfm: cipher handle</div><div class='hunk'>@@ -276,6 +287,11 @@ static inline unsigned int crypto_aead_authsize(struct crypto_aead *tfm)</div><div class='ctx'> 	return tfm-&gt;authsize;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int crypto_sync_aead_authsize(struct crypto_sync_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_aead_authsize(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline unsigned int crypto_aead_alg_maxauthsize(struct aead_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	return alg-&gt;maxauthsize;</div><div class='hunk'>@@ -286,6 +302,11 @@ static inline unsigned int crypto_aead_maxauthsize(struct crypto_aead *aead)</div><div class='ctx'> 	return crypto_aead_alg_maxauthsize(crypto_aead_alg(aead));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int crypto_sync_aead_maxauthsize(struct crypto_sync_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_aead_maxauthsize(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_aead_blocksize() - obtain block size of cipher</div><div class='ctx'>  * @tfm: cipher handle</div><div class='hunk'>@@ -301,6 +322,11 @@ static inline unsigned int crypto_aead_blocksize(struct crypto_aead *tfm)</div><div class='ctx'> 	return crypto_tfm_alg_blocksize(crypto_aead_tfm(tfm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int crypto_sync_aead_blocksize(struct crypto_sync_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_aead_blocksize(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline unsigned int crypto_aead_alignmask(struct crypto_aead *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	return crypto_tfm_alg_alignmask(crypto_aead_tfm(tfm));</div><div class='hunk'>@@ -321,6 +347,21 @@ static inline void crypto_aead_clear_flags(struct crypto_aead *tfm, u32 flags)</div><div class='ctx'> 	crypto_tfm_clear_flags(crypto_aead_tfm(tfm), flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u32 crypto_sync_aead_get_flags(struct crypto_sync_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_aead_get_flags(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void crypto_sync_aead_set_flags(struct crypto_sync_aead *tfm, u32 flags)</div><div class='add'>+{</div><div class='add'>+	crypto_aead_set_flags(&amp;tfm-&gt;base, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void crypto_sync_aead_clear_flags(struct crypto_sync_aead *tfm, u32 flags)</div><div class='add'>+{</div><div class='add'>+	crypto_aead_clear_flags(&amp;tfm-&gt;base, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_aead_setkey() - set key for cipher</div><div class='ctx'>  * @tfm: cipher handle</div><div class='hunk'>@@ -340,6 +381,12 @@ static inline void crypto_aead_clear_flags(struct crypto_aead *tfm, u32 flags)</div><div class='ctx'> int crypto_aead_setkey(struct crypto_aead *tfm,</div><div class='ctx'> 		       const u8 *key, unsigned int keylen);</div><div class='ctx'> </div><div class='add'>+static inline int crypto_sync_aead_setkey(struct crypto_sync_aead *tfm,</div><div class='add'>+					 const u8 *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	return crypto_aead_setkey(&amp;tfm-&gt;base, key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_aead_setauthsize() - set authentication data size</div><div class='ctx'>  * @tfm: cipher handle</div><div class='hunk'>@@ -352,11 +399,24 @@ int crypto_aead_setkey(struct crypto_aead *tfm,</div><div class='ctx'>  */</div><div class='ctx'> int crypto_aead_setauthsize(struct crypto_aead *tfm, unsigned int authsize);</div><div class='ctx'> </div><div class='add'>+static inline int crypto_sync_aead_setauthsize(struct crypto_sync_aead *tfm,</div><div class='add'>+					       unsigned int authsize)</div><div class='add'>+{</div><div class='add'>+	return crypto_aead_setauthsize(&amp;tfm-&gt;base, authsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct crypto_aead *crypto_aead_reqtfm(struct aead_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	return __crypto_aead_cast(req-&gt;base.tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct crypto_sync_aead *crypto_sync_aead_reqtfm(struct aead_request *req)</div><div class='add'>+{</div><div class='add'>+	struct crypto_aead *tfm = crypto_aead_reqtfm(req);</div><div class='add'>+</div><div class='add'>+	return container_of(tfm, struct crypto_sync_aead, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_aead_encrypt() - encrypt plaintext</div><div class='ctx'>  * @req: reference to the aead_request handle that holds all information</div><div class='hunk'>@@ -438,6 +498,12 @@ static inline void aead_request_set_tfm(struct aead_request *req,</div><div class='ctx'> 	req-&gt;base.tfm = crypto_aead_tfm(tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void aead_request_set_sync_tfm(struct aead_request *req,</div><div class='add'>+					     struct crypto_sync_aead *tfm)</div><div class='add'>+{</div><div class='add'>+	aead_request_set_tfm(req, &amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * aead_request_alloc() - allocate request data structure</div><div class='ctx'>  * @tfm: cipher handle to be registered with the request</div><div class='head'>diff --git a/include/crypto/aes.h b/include/crypto/aes.h<br/>index 2090729701ab..9339da7c20a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/aes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/aes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/aes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/aes.h</a></div><div class='hunk'>@@ -87,4 +87,9 @@ void aes_decrypt(const struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);</div><div class='ctx'> extern const u8 crypto_aes_sbox[];</div><div class='ctx'> extern const u8 crypto_aes_inv_sbox[];</div><div class='ctx'> </div><div class='add'>+void aescfb_encrypt(const struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src,</div><div class='add'>+		    int len, const u8 iv[AES_BLOCK_SIZE]);</div><div class='add'>+void aescfb_decrypt(const struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src,</div><div class='add'>+		    int len, const u8 iv[AES_BLOCK_SIZE]);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/akcipher.h b/include/crypto/akcipher.h<br/>index 31c111bebb68..cdf7da74bf2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/akcipher.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/akcipher.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/akcipher.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/akcipher.h</a></div><div class='hunk'>@@ -12,24 +12,19 @@</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct akcipher_request - public key request</div><div class='add'>+ * struct akcipher_request - public key cipher request</div><div class='ctx'>  *</div><div class='ctx'>  * @base:	Common attributes for async crypto requests</div><div class='ctx'>  * @src:	Source data</div><div class='del'>- *		For verify op this is signature + digest, in that case</div><div class='del'>- *		total size of @src is @src_len + @dst_len.</div><div class='del'>- * @dst:	Destination data (Should be NULL for verify op)</div><div class='add'>+ * @dst:	Destination data</div><div class='ctx'>  * @src_len:	Size of the input buffer</div><div class='del'>- *		For verify op it's size of signature part of @src, this part</div><div class='del'>- *		is supposed to be operated by cipher.</div><div class='del'>- * @dst_len:	Size of @dst buffer (for all ops except verify).</div><div class='add'>+ * @dst_len:	Size of @dst buffer</div><div class='ctx'>  *		It needs to be at least	as big as the expected result</div><div class='ctx'>  *		depending on the operation.</div><div class='ctx'>  *		After operation it will be updated with the actual size of the</div><div class='ctx'>  *		result.</div><div class='ctx'>  *		In case of error where the dst sgl size was insufficient,</div><div class='ctx'>  *		it will be updated to the size required for the operation.</div><div class='del'>- *		For verify op this is size of digest part in @src.</div><div class='ctx'>  * @__ctx:	Start of private context data</div><div class='ctx'>  */</div><div class='ctx'> struct akcipher_request {</div><div class='hunk'>@@ -54,36 +49,9 @@ struct crypto_akcipher {</div><div class='ctx'> 	struct crypto_tfm base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct crypto_istat_akcipher - statistics for akcipher algorithm</div><div class='del'>- * @encrypt_cnt:	number of encrypt requests</div><div class='del'>- * @encrypt_tlen:	total data size handled by encrypt requests</div><div class='del'>- * @decrypt_cnt:	number of decrypt requests</div><div class='del'>- * @decrypt_tlen:	total data size handled by decrypt requests</div><div class='del'>- * @verify_cnt:		number of verify operation</div><div class='del'>- * @sign_cnt:		number of sign requests</div><div class='del'>- * @err_cnt:		number of error for akcipher requests</div><div class='del'>- */</div><div class='del'>-struct crypto_istat_akcipher {</div><div class='del'>-	atomic64_t encrypt_cnt;</div><div class='del'>-	atomic64_t encrypt_tlen;</div><div class='del'>-	atomic64_t decrypt_cnt;</div><div class='del'>-	atomic64_t decrypt_tlen;</div><div class='del'>-	atomic64_t verify_cnt;</div><div class='del'>-	atomic64_t sign_cnt;</div><div class='del'>-	atomic64_t err_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * struct akcipher_alg - generic public key algorithm</div><div class='add'>+ * struct akcipher_alg - generic public key cipher algorithm</div><div class='ctx'>  *</div><div class='del'>- * @sign:	Function performs a sign operation as defined by public key</div><div class='del'>- *		algorithm. In case of error, where the dst_len was insufficient,</div><div class='del'>- *		the req-&gt;dst_len will be updated to the size required for the</div><div class='del'>- *		operation</div><div class='del'>- * @verify:	Function performs a complete verify operation as defined by</div><div class='del'>- *		public key algorithm, returning verification status. Requires</div><div class='del'>- *		digest value as input parameter.</div><div class='ctx'>  * @encrypt:	Function performs an encrypt operation as defined by public key</div><div class='ctx'>  *		algorithm. In case of error, where the dst_len was insufficient,</div><div class='ctx'>  *		the req-&gt;dst_len will be updated to the size required for the</div><div class='hunk'>@@ -110,13 +78,10 @@ struct crypto_istat_akcipher {</div><div class='ctx'>  * @exit:	Deinitialize the cryptographic transformation object. This is a</div><div class='ctx'>  *		counterpart to @init, used to remove various changes set in</div><div class='ctx'>  *		@init.</div><div class='del'>- * @stat:	Statistics for akcipher algorithm</div><div class='ctx'>  *</div><div class='ctx'>  * @base:	Common crypto API algorithm data structure</div><div class='ctx'>  */</div><div class='ctx'> struct akcipher_alg {</div><div class='del'>-	int (*sign)(struct akcipher_request *req);</div><div class='del'>-	int (*verify)(struct akcipher_request *req);</div><div class='ctx'> 	int (*encrypt)(struct akcipher_request *req);</div><div class='ctx'> 	int (*decrypt)(struct akcipher_request *req);</div><div class='ctx'> 	int (*set_pub_key)(struct crypto_akcipher *tfm, const void *key,</div><div class='hunk'>@@ -127,17 +92,13 @@ struct akcipher_alg {</div><div class='ctx'> 	int (*init)(struct crypto_akcipher *tfm);</div><div class='ctx'> 	void (*exit)(struct crypto_akcipher *tfm);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	struct crypto_istat_akcipher stat;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	struct crypto_alg base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * DOC: Generic Public Key API</div><div class='add'>+ * DOC: Generic Public Key Cipher API</div><div class='ctx'>  *</div><div class='del'>- * The Public Key API is used with the algorithms of type</div><div class='add'>+ * The Public Key Cipher API is used with the algorithms of type</div><div class='ctx'>  * CRYPTO_ALG_TYPE_AKCIPHER (listed as type "akcipher" in /proc/crypto)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -268,10 +229,9 @@ static inline void akcipher_request_set_callback(struct akcipher_request *req,</div><div class='ctx'>  *</div><div class='ctx'>  * @req:	public key request</div><div class='ctx'>  * @src:	ptr to input scatter list</div><div class='del'>- * @dst:	ptr to output scatter list or NULL for verify op</div><div class='add'>+ * @dst:	ptr to output scatter list</div><div class='ctx'>  * @src_len:	size of the src input scatter list to be processed</div><div class='del'>- * @dst_len:	size of the dst output scatter list or size of signature</div><div class='del'>- *		portion in @src for verify op</div><div class='add'>+ * @dst_len:	size of the dst output scatter list</div><div class='ctx'>  */</div><div class='ctx'> static inline void akcipher_request_set_crypt(struct akcipher_request *req,</div><div class='ctx'> 					      struct scatterlist *src,</div><div class='hunk'>@@ -302,27 +262,6 @@ static inline unsigned int crypto_akcipher_maxsize(struct crypto_akcipher *tfm)</div><div class='ctx'> 	return alg-&gt;max_size(tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct crypto_istat_akcipher *akcipher_get_stat(</div><div class='del'>-	struct akcipher_alg *alg)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	return &amp;alg-&gt;stat;</div><div class='del'>-#else</div><div class='del'>-	return NULL;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int crypto_akcipher_errstat(struct akcipher_alg *alg, int err)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (err &amp;&amp; err != -EINPROGRESS &amp;&amp; err != -EBUSY)</div><div class='del'>-		atomic64_inc(&amp;akcipher_get_stat(alg)-&gt;err_cnt);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_akcipher_encrypt() - Invoke public key encrypt operation</div><div class='ctx'>  *</div><div class='hunk'>@@ -336,16 +275,8 @@ static inline int crypto_akcipher_errstat(struct akcipher_alg *alg, int err)</div><div class='ctx'> static inline int crypto_akcipher_encrypt(struct akcipher_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);</div><div class='del'>-	struct akcipher_alg *alg = crypto_akcipher_alg(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {</div><div class='del'>-		struct crypto_istat_akcipher *istat = akcipher_get_stat(alg);</div><div class='del'>-</div><div class='del'>-		atomic64_inc(&amp;istat-&gt;encrypt_cnt);</div><div class='del'>-		atomic64_add(req-&gt;src_len, &amp;istat-&gt;encrypt_tlen);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return crypto_akcipher_errstat(alg, alg-&gt;encrypt(req));</div><div class='add'>+	return crypto_akcipher_alg(tfm)-&gt;encrypt(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -361,16 +292,8 @@ static inline int crypto_akcipher_encrypt(struct akcipher_request *req)</div><div class='ctx'> static inline int crypto_akcipher_decrypt(struct akcipher_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);</div><div class='del'>-	struct akcipher_alg *alg = crypto_akcipher_alg(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {</div><div class='del'>-		struct crypto_istat_akcipher *istat = akcipher_get_stat(alg);</div><div class='del'>-</div><div class='del'>-		atomic64_inc(&amp;istat-&gt;decrypt_cnt);</div><div class='del'>-		atomic64_add(req-&gt;src_len, &amp;istat-&gt;decrypt_tlen);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return crypto_akcipher_errstat(alg, alg-&gt;decrypt(req));</div><div class='add'>+	return crypto_akcipher_alg(tfm)-&gt;decrypt(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -410,52 +333,6 @@ int crypto_akcipher_sync_decrypt(struct crypto_akcipher *tfm,</div><div class='ctx'> 				 void *dst, unsigned int dlen);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * crypto_akcipher_sign() - Invoke public key sign operation</div><div class='del'>- *</div><div class='del'>- * Function invokes the specific public key sign operation for a given</div><div class='del'>- * public key algorithm</div><div class='del'>- *</div><div class='del'>- * @req:	asymmetric key request</div><div class='del'>- *</div><div class='del'>- * Return: zero on success; error code in case of error</div><div class='del'>- */</div><div class='del'>-static inline int crypto_akcipher_sign(struct akcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);</div><div class='del'>-	struct akcipher_alg *alg = crypto_akcipher_alg(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		atomic64_inc(&amp;akcipher_get_stat(alg)-&gt;sign_cnt);</div><div class='del'>-</div><div class='del'>-	return crypto_akcipher_errstat(alg, alg-&gt;sign(req));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * crypto_akcipher_verify() - Invoke public key signature verification</div><div class='del'>- *</div><div class='del'>- * Function invokes the specific public key signature verification operation</div><div class='del'>- * for a given public key algorithm.</div><div class='del'>- *</div><div class='del'>- * @req:	asymmetric key request</div><div class='del'>- *</div><div class='del'>- * Note: req-&gt;dst should be NULL, req-&gt;src should point to SG of size</div><div class='del'>- * (req-&gt;src_size + req-&gt;dst_size), containing signature (of req-&gt;src_size</div><div class='del'>- * length) with appended digest (of req-&gt;dst_size length).</div><div class='del'>- *</div><div class='del'>- * Return: zero on verification success; error code in case of error.</div><div class='del'>- */</div><div class='del'>-static inline int crypto_akcipher_verify(struct akcipher_request *req)</div><div class='del'>-{</div><div class='del'>-	struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);</div><div class='del'>-	struct akcipher_alg *alg = crypto_akcipher_alg(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		atomic64_inc(&amp;akcipher_get_stat(alg)-&gt;verify_cnt);</div><div class='del'>-</div><div class='del'>-	return crypto_akcipher_errstat(alg, alg-&gt;verify(req));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * crypto_akcipher_set_pub_key() - Invoke set public key operation</div><div class='ctx'>  *</div><div class='ctx'>  * Function invokes the algorithm specific set key function, which knows</div><div class='head'>diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h<br/>index 7a4a71af653f..05deea9dac5e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/algapi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/algapi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/algapi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/algapi.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/align.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -42,8 +43,8 @@</div><div class='ctx'>  * alias.</div><div class='ctx'>  */</div><div class='ctx'> #define MODULE_ALIAS_CRYPTO(name)	\</div><div class='del'>-		__MODULE_INFO(alias, alias_userspace, name);	\</div><div class='del'>-		__MODULE_INFO(alias, alias_crypto, "crypto-" name)</div><div class='add'>+		MODULE_INFO(alias, name);	\</div><div class='add'>+		MODULE_INFO(alias, "crypto-" name)</div><div class='ctx'> </div><div class='ctx'> struct crypto_aead;</div><div class='ctx'> struct crypto_instance;</div><div class='hunk'>@@ -53,23 +54,7 @@ struct rtattr;</div><div class='ctx'> struct scatterlist;</div><div class='ctx'> struct seq_file;</div><div class='ctx'> struct sk_buff;</div><div class='del'>-</div><div class='del'>-struct crypto_type {</div><div class='del'>-	unsigned int (*ctxsize)(struct crypto_alg *alg, u32 type, u32 mask);</div><div class='del'>-	unsigned int (*extsize)(struct crypto_alg *alg);</div><div class='del'>-	int (*init_tfm)(struct crypto_tfm *tfm);</div><div class='del'>-	void (*show)(struct seq_file *m, struct crypto_alg *alg);</div><div class='del'>-	int (*report)(struct sk_buff *skb, struct crypto_alg *alg);</div><div class='del'>-	void (*free)(struct crypto_instance *inst);</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	int (*report_stat)(struct sk_buff *skb, struct crypto_alg *alg);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	unsigned int type;</div><div class='del'>-	unsigned int maskclear;</div><div class='del'>-	unsigned int maskset;</div><div class='del'>-	unsigned int tfmsize;</div><div class='del'>-};</div><div class='add'>+union crypto_no_such_thing;</div><div class='ctx'> </div><div class='ctx'> struct crypto_instance {</div><div class='ctx'> 	struct crypto_alg alg;</div><div class='hunk'>@@ -83,16 +68,17 @@ struct crypto_instance {</div><div class='ctx'> 		struct crypto_spawn *spawns;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	struct work_struct free_work;</div><div class='del'>-</div><div class='ctx'> 	void *__ctx[] CRYPTO_MINALIGN_ATTR;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct crypto_template {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct hlist_head instances;</div><div class='add'>+	struct hlist_head dead;</div><div class='ctx'> 	struct module *module;</div><div class='ctx'> </div><div class='add'>+	struct work_struct free_work;</div><div class='add'>+</div><div class='ctx'> 	int (*create)(struct crypto_template *tmpl, struct rtattr **tb);</div><div class='ctx'> </div><div class='ctx'> 	char name[CRYPTO_MAX_ALG_NAME];</div><div class='hunk'>@@ -122,6 +108,13 @@ struct crypto_queue {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct scatter_walk {</div><div class='add'>+	/* Must be the first member, see struct skcipher_walk. */</div><div class='add'>+	union {</div><div class='add'>+		void *const addr;</div><div class='add'>+</div><div class='add'>+		/* Private API field, do not touch. */</div><div class='add'>+		union crypto_no_such_thing *__addr;</div><div class='add'>+	};</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> };</div><div class='hunk'>@@ -165,8 +158,16 @@ void *crypto_spawn_tfm2(struct crypto_spawn *spawn);</div><div class='ctx'> struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb);</div><div class='ctx'> int crypto_check_attr_type(struct rtattr **tb, u32 type, u32 *mask_ret);</div><div class='ctx'> const char *crypto_attr_alg_name(struct rtattr *rta);</div><div class='del'>-int crypto_inst_setname(struct crypto_instance *inst, const char *name,</div><div class='del'>-			struct crypto_alg *alg);</div><div class='add'>+int __crypto_inst_setname(struct crypto_instance *inst, const char *name,</div><div class='add'>+			  const char *driver, struct crypto_alg *alg);</div><div class='add'>+</div><div class='add'>+#define crypto_inst_setname(inst, name, ...) \</div><div class='add'>+	CONCATENATE(crypto_inst_setname_, COUNT_ARGS(__VA_ARGS__))( \</div><div class='add'>+		inst, name, ##__VA_ARGS__)</div><div class='add'>+#define crypto_inst_setname_1(inst, name, alg) \</div><div class='add'>+	__crypto_inst_setname(inst, name, name, alg)</div><div class='add'>+#define crypto_inst_setname_2(inst, name, driver, alg) \</div><div class='add'>+	__crypto_inst_setname(inst, name, driver, alg)</div><div class='ctx'> </div><div class='ctx'> void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen);</div><div class='ctx'> int crypto_enqueue_request(struct crypto_queue *queue,</div><div class='hunk'>@@ -274,4 +275,14 @@ static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)</div><div class='ctx'> 	return tfm-&gt;__crt_alg-&gt;cra_flags &amp; CRYPTO_ALG_TYPE_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool crypto_tfm_req_virt(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	return tfm-&gt;__crt_alg-&gt;cra_flags &amp; CRYPTO_ALG_REQ_VIRT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 crypto_request_flags(struct crypto_async_request *req)</div><div class='add'>+{</div><div class='add'>+	return req-&gt;flags &amp; ~CRYPTO_TFM_REQ_ON_STACK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* _CRYPTO_ALGAPI_H */</div><div class='head'>diff --git a/include/crypto/authenc.h b/include/crypto/authenc.h<br/>index 5f92a986083c..15a9caa2354a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/authenc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/authenc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/authenc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/authenc.h</a></div><div class='hunk'>@@ -28,5 +28,7 @@ struct crypto_authenc_keys {</div><div class='ctx'> </div><div class='ctx'> int crypto_authenc_extractkeys(struct crypto_authenc_keys *keys, const u8 *key,</div><div class='ctx'> 			       unsigned int keylen);</div><div class='add'>+int crypto_krb5enc_extractkeys(struct crypto_authenc_keys *keys, const u8 *key,</div><div class='add'>+			       unsigned int keylen);</div><div class='ctx'> </div><div class='ctx'> #endif	/* _CRYPTO_AUTHENC_H */</div><div class='head'>diff --git a/include/crypto/blake2b.h b/include/crypto/blake2b.h<br/>index 0c0176285349..3bc37fd103a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/blake2b.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/blake2b.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/blake2b.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/blake2b.h</a></div><div class='hunk'>@@ -18,7 +18,16 @@ enum blake2b_lengths {</div><div class='ctx'> 	BLAKE2B_512_HASH_SIZE = 64,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct blake2b_state {</div><div class='add'>+/**</div><div class='add'>+ * struct blake2b_ctx - Context for hashing a message with BLAKE2b</div><div class='add'>+ * @h: compression function state</div><div class='add'>+ * @t: block counter</div><div class='add'>+ * @f: finalization indicator</div><div class='add'>+ * @buf: partial block buffer; 'buflen' bytes are valid</div><div class='add'>+ * @buflen: number of bytes buffered in @buf</div><div class='add'>+ * @outlen: length of output hash value in bytes, at most BLAKE2B_HASH_SIZE</div><div class='add'>+ */</div><div class='add'>+struct blake2b_ctx {</div><div class='ctx'> 	/* 'h', 't', and 'f' are used in assembly code, so keep them as-is. */</div><div class='ctx'> 	u64 h[8];</div><div class='ctx'> 	u64 t[2];</div><div class='hunk'>@@ -39,28 +48,109 @@ enum blake2b_iv {</div><div class='ctx'> 	BLAKE2B_IV7 = 0x5BE0CD19137E2179ULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void __blake2b_init(struct blake2b_state *state, size_t outlen,</div><div class='add'>+static inline void __blake2b_init(struct blake2b_ctx *ctx, size_t outlen,</div><div class='ctx'> 				  const void *key, size_t keylen)</div><div class='ctx'> {</div><div class='del'>-	state-&gt;h[0] = BLAKE2B_IV0 ^ (0x01010000 | keylen &lt;&lt; 8 | outlen);</div><div class='del'>-	state-&gt;h[1] = BLAKE2B_IV1;</div><div class='del'>-	state-&gt;h[2] = BLAKE2B_IV2;</div><div class='del'>-	state-&gt;h[3] = BLAKE2B_IV3;</div><div class='del'>-	state-&gt;h[4] = BLAKE2B_IV4;</div><div class='del'>-	state-&gt;h[5] = BLAKE2B_IV5;</div><div class='del'>-	state-&gt;h[6] = BLAKE2B_IV6;</div><div class='del'>-	state-&gt;h[7] = BLAKE2B_IV7;</div><div class='del'>-	state-&gt;t[0] = 0;</div><div class='del'>-	state-&gt;t[1] = 0;</div><div class='del'>-	state-&gt;f[0] = 0;</div><div class='del'>-	state-&gt;f[1] = 0;</div><div class='del'>-	state-&gt;buflen = 0;</div><div class='del'>-	state-&gt;outlen = outlen;</div><div class='add'>+	ctx-&gt;h[0] = BLAKE2B_IV0 ^ (0x01010000 | keylen &lt;&lt; 8 | outlen);</div><div class='add'>+	ctx-&gt;h[1] = BLAKE2B_IV1;</div><div class='add'>+	ctx-&gt;h[2] = BLAKE2B_IV2;</div><div class='add'>+	ctx-&gt;h[3] = BLAKE2B_IV3;</div><div class='add'>+	ctx-&gt;h[4] = BLAKE2B_IV4;</div><div class='add'>+	ctx-&gt;h[5] = BLAKE2B_IV5;</div><div class='add'>+	ctx-&gt;h[6] = BLAKE2B_IV6;</div><div class='add'>+	ctx-&gt;h[7] = BLAKE2B_IV7;</div><div class='add'>+	ctx-&gt;t[0] = 0;</div><div class='add'>+	ctx-&gt;t[1] = 0;</div><div class='add'>+	ctx-&gt;f[0] = 0;</div><div class='add'>+	ctx-&gt;f[1] = 0;</div><div class='add'>+	ctx-&gt;buflen = 0;</div><div class='add'>+	ctx-&gt;outlen = outlen;</div><div class='ctx'> 	if (keylen) {</div><div class='del'>-		memcpy(state-&gt;buf, key, keylen);</div><div class='del'>-		memset(&amp;state-&gt;buf[keylen], 0, BLAKE2B_BLOCK_SIZE - keylen);</div><div class='del'>-		state-&gt;buflen = BLAKE2B_BLOCK_SIZE;</div><div class='add'>+		memcpy(ctx-&gt;buf, key, keylen);</div><div class='add'>+		memset(&amp;ctx-&gt;buf[keylen], 0, BLAKE2B_BLOCK_SIZE - keylen);</div><div class='add'>+		ctx-&gt;buflen = BLAKE2B_BLOCK_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * blake2b_init() - Initialize a BLAKE2b context for a new message (unkeyed)</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ * @outlen: length of output hash value in bytes, at most BLAKE2B_HASH_SIZE</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void blake2b_init(struct blake2b_ctx *ctx, size_t outlen)</div><div class='add'>+{</div><div class='add'>+	__blake2b_init(ctx, outlen, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blake2b_init_key() - Initialize a BLAKE2b context for a new message (keyed)</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ * @outlen: length of output hash value in bytes, at most BLAKE2B_HASH_SIZE</div><div class='add'>+ * @key: the key</div><div class='add'>+ * @keylen: the key length in bytes, at most BLAKE2B_KEY_SIZE</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void blake2b_init_key(struct blake2b_ctx *ctx, size_t outlen,</div><div class='add'>+				    const void *key, size_t keylen)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(IS_ENABLED(DEBUG) &amp;&amp; (!outlen || outlen &gt; BLAKE2B_HASH_SIZE ||</div><div class='add'>+		!key || !keylen || keylen &gt; BLAKE2B_KEY_SIZE));</div><div class='add'>+</div><div class='add'>+	__blake2b_init(ctx, outlen, key, keylen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blake2b_update() - Update a BLAKE2b context with message data</div><div class='add'>+ * @ctx: the context to update; must have been initialized</div><div class='add'>+ * @in: the message data</div><div class='add'>+ * @inlen: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void blake2b_update(struct blake2b_ctx *ctx, const u8 *in, size_t inlen);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blake2b_final() - Finish computing a BLAKE2b hash</div><div class='add'>+ * @ctx: the context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting BLAKE2b hash.  Its length will be equal to the</div><div class='add'>+ *	 @outlen that was passed to blake2b_init() or blake2b_init_key().</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void blake2b_final(struct blake2b_ctx *ctx, u8 *out);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blake2b() - Compute BLAKE2b hash in one shot</div><div class='add'>+ * @key: the key, or NULL for an unkeyed hash</div><div class='add'>+ * @keylen: the key length in bytes (at most BLAKE2B_KEY_SIZE), or 0 for an</div><div class='add'>+ *	    unkeyed hash</div><div class='add'>+ * @in: the message data</div><div class='add'>+ * @inlen: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting BLAKE2b hash, with length @outlen</div><div class='add'>+ * @outlen: length of output hash value in bytes, at most BLAKE2B_HASH_SIZE</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void blake2b(const u8 *key, size_t keylen,</div><div class='add'>+			   const u8 *in, size_t inlen,</div><div class='add'>+			   u8 *out, size_t outlen)</div><div class='add'>+{</div><div class='add'>+	struct blake2b_ctx ctx;</div><div class='add'>+</div><div class='add'>+	WARN_ON(IS_ENABLED(DEBUG) &amp;&amp; ((!in &amp;&amp; inlen &gt; 0) || !out || !outlen ||</div><div class='add'>+		outlen &gt; BLAKE2B_HASH_SIZE || keylen &gt; BLAKE2B_KEY_SIZE ||</div><div class='add'>+		(!key &amp;&amp; keylen)));</div><div class='add'>+</div><div class='add'>+	__blake2b_init(&amp;ctx, outlen, key, keylen);</div><div class='add'>+	blake2b_update(&amp;ctx, in, inlen);</div><div class='add'>+	blake2b_final(&amp;ctx, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _CRYPTO_BLAKE2B_H */</div><div class='head'>diff --git a/include/crypto/blake2s.h b/include/crypto/blake2s.h<br/>index f9ffd39194eb..648cb7824358 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/blake2s.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/blake2s.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/blake2s.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/blake2s.h</a></div><div class='hunk'>@@ -22,7 +22,16 @@ enum blake2s_lengths {</div><div class='ctx'> 	BLAKE2S_256_HASH_SIZE = 32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct blake2s_state {</div><div class='add'>+/**</div><div class='add'>+ * struct blake2s_ctx - Context for hashing a message with BLAKE2s</div><div class='add'>+ * @h: compression function state</div><div class='add'>+ * @t: block counter</div><div class='add'>+ * @f: finalization indicator</div><div class='add'>+ * @buf: partial block buffer; 'buflen' bytes are valid</div><div class='add'>+ * @buflen: number of bytes buffered in @buf</div><div class='add'>+ * @outlen: length of output hash value in bytes, at most BLAKE2S_HASH_SIZE</div><div class='add'>+ */</div><div class='add'>+struct blake2s_ctx {</div><div class='ctx'> 	/* 'h', 't', and 'f' are used in assembly code, so keep them as-is. */</div><div class='ctx'> 	u32 h[8];</div><div class='ctx'> 	u32 t[2];</div><div class='hunk'>@@ -43,62 +52,109 @@ enum blake2s_iv {</div><div class='ctx'> 	BLAKE2S_IV7 = 0x5BE0CD19UL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void __blake2s_init(struct blake2s_state *state, size_t outlen,</div><div class='add'>+static inline void __blake2s_init(struct blake2s_ctx *ctx, size_t outlen,</div><div class='ctx'> 				  const void *key, size_t keylen)</div><div class='ctx'> {</div><div class='del'>-	state-&gt;h[0] = BLAKE2S_IV0 ^ (0x01010000 | keylen &lt;&lt; 8 | outlen);</div><div class='del'>-	state-&gt;h[1] = BLAKE2S_IV1;</div><div class='del'>-	state-&gt;h[2] = BLAKE2S_IV2;</div><div class='del'>-	state-&gt;h[3] = BLAKE2S_IV3;</div><div class='del'>-	state-&gt;h[4] = BLAKE2S_IV4;</div><div class='del'>-	state-&gt;h[5] = BLAKE2S_IV5;</div><div class='del'>-	state-&gt;h[6] = BLAKE2S_IV6;</div><div class='del'>-	state-&gt;h[7] = BLAKE2S_IV7;</div><div class='del'>-	state-&gt;t[0] = 0;</div><div class='del'>-	state-&gt;t[1] = 0;</div><div class='del'>-	state-&gt;f[0] = 0;</div><div class='del'>-	state-&gt;f[1] = 0;</div><div class='del'>-	state-&gt;buflen = 0;</div><div class='del'>-	state-&gt;outlen = outlen;</div><div class='add'>+	ctx-&gt;h[0] = BLAKE2S_IV0 ^ (0x01010000 | keylen &lt;&lt; 8 | outlen);</div><div class='add'>+	ctx-&gt;h[1] = BLAKE2S_IV1;</div><div class='add'>+	ctx-&gt;h[2] = BLAKE2S_IV2;</div><div class='add'>+	ctx-&gt;h[3] = BLAKE2S_IV3;</div><div class='add'>+	ctx-&gt;h[4] = BLAKE2S_IV4;</div><div class='add'>+	ctx-&gt;h[5] = BLAKE2S_IV5;</div><div class='add'>+	ctx-&gt;h[6] = BLAKE2S_IV6;</div><div class='add'>+	ctx-&gt;h[7] = BLAKE2S_IV7;</div><div class='add'>+	ctx-&gt;t[0] = 0;</div><div class='add'>+	ctx-&gt;t[1] = 0;</div><div class='add'>+	ctx-&gt;f[0] = 0;</div><div class='add'>+	ctx-&gt;f[1] = 0;</div><div class='add'>+	ctx-&gt;buflen = 0;</div><div class='add'>+	ctx-&gt;outlen = outlen;</div><div class='ctx'> 	if (keylen) {</div><div class='del'>-		memcpy(state-&gt;buf, key, keylen);</div><div class='del'>-		memset(&amp;state-&gt;buf[keylen], 0, BLAKE2S_BLOCK_SIZE - keylen);</div><div class='del'>-		state-&gt;buflen = BLAKE2S_BLOCK_SIZE;</div><div class='add'>+		memcpy(ctx-&gt;buf, key, keylen);</div><div class='add'>+		memset(&amp;ctx-&gt;buf[keylen], 0, BLAKE2S_BLOCK_SIZE - keylen);</div><div class='add'>+		ctx-&gt;buflen = BLAKE2S_BLOCK_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void blake2s_init(struct blake2s_state *state,</div><div class='del'>-				const size_t outlen)</div><div class='add'>+/**</div><div class='add'>+ * blake2s_init() - Initialize a BLAKE2s context for a new message (unkeyed)</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ * @outlen: length of output hash value in bytes, at most BLAKE2S_HASH_SIZE</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void blake2s_init(struct blake2s_ctx *ctx, size_t outlen)</div><div class='ctx'> {</div><div class='del'>-	__blake2s_init(state, outlen, NULL, 0);</div><div class='add'>+	__blake2s_init(ctx, outlen, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void blake2s_init_key(struct blake2s_state *state,</div><div class='del'>-				    const size_t outlen, const void *key,</div><div class='del'>-				    const size_t keylen)</div><div class='add'>+/**</div><div class='add'>+ * blake2s_init_key() - Initialize a BLAKE2s context for a new message (keyed)</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ * @outlen: length of output hash value in bytes, at most BLAKE2S_HASH_SIZE</div><div class='add'>+ * @key: the key</div><div class='add'>+ * @keylen: the key length in bytes, at most BLAKE2S_KEY_SIZE</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void blake2s_init_key(struct blake2s_ctx *ctx, size_t outlen,</div><div class='add'>+				    const void *key, size_t keylen)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON(IS_ENABLED(DEBUG) &amp;&amp; (!outlen || outlen &gt; BLAKE2S_HASH_SIZE ||</div><div class='ctx'> 		!key || !keylen || keylen &gt; BLAKE2S_KEY_SIZE));</div><div class='ctx'> </div><div class='del'>-	__blake2s_init(state, outlen, key, keylen);</div><div class='add'>+	__blake2s_init(ctx, outlen, key, keylen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void blake2s_update(struct blake2s_state *state, const u8 *in, size_t inlen);</div><div class='del'>-void blake2s_final(struct blake2s_state *state, u8 *out);</div><div class='add'>+/**</div><div class='add'>+ * blake2s_update() - Update a BLAKE2s context with message data</div><div class='add'>+ * @ctx: the context to update; must have been initialized</div><div class='add'>+ * @in: the message data</div><div class='add'>+ * @inlen: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void blake2s_update(struct blake2s_ctx *ctx, const u8 *in, size_t inlen);</div><div class='ctx'> </div><div class='del'>-static inline void blake2s(u8 *out, const u8 *in, const u8 *key,</div><div class='del'>-			   const size_t outlen, const size_t inlen,</div><div class='del'>-			   const size_t keylen)</div><div class='add'>+/**</div><div class='add'>+ * blake2s_final() - Finish computing a BLAKE2s hash</div><div class='add'>+ * @ctx: the context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting BLAKE2s hash.  Its length will be equal to the</div><div class='add'>+ *	 @outlen that was passed to blake2s_init() or blake2s_init_key().</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void blake2s_final(struct blake2s_ctx *ctx, u8 *out);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blake2s() - Compute BLAKE2s hash in one shot</div><div class='add'>+ * @key: the key, or NULL for an unkeyed hash</div><div class='add'>+ * @keylen: the key length in bytes (at most BLAKE2S_KEY_SIZE), or 0 for an</div><div class='add'>+ *	    unkeyed hash</div><div class='add'>+ * @in: the message data</div><div class='add'>+ * @inlen: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting BLAKE2s hash, with length @outlen</div><div class='add'>+ * @outlen: length of output hash value in bytes, at most BLAKE2S_HASH_SIZE</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void blake2s(const u8 *key, size_t keylen,</div><div class='add'>+			   const u8 *in, size_t inlen,</div><div class='add'>+			   u8 *out, size_t outlen)</div><div class='ctx'> {</div><div class='del'>-	struct blake2s_state state;</div><div class='add'>+	struct blake2s_ctx ctx;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(IS_ENABLED(DEBUG) &amp;&amp; ((!in &amp;&amp; inlen &gt; 0) || !out || !outlen ||</div><div class='ctx'> 		outlen &gt; BLAKE2S_HASH_SIZE || keylen &gt; BLAKE2S_KEY_SIZE ||</div><div class='ctx'> 		(!key &amp;&amp; keylen)));</div><div class='ctx'> </div><div class='del'>-	__blake2s_init(&amp;state, outlen, key, keylen);</div><div class='del'>-	blake2s_update(&amp;state, in, inlen);</div><div class='del'>-	blake2s_final(&amp;state, out);</div><div class='add'>+	__blake2s_init(&amp;ctx, outlen, key, keylen);</div><div class='add'>+	blake2s_update(&amp;ctx, in, inlen);</div><div class='add'>+	blake2s_final(&amp;ctx, out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* _CRYPTO_BLAKE2S_H */</div><div class='head'>diff --git a/include/crypto/chacha.h b/include/crypto/chacha.h<br/>index b3ea73b81944..1cc301a48469 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/chacha.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/chacha.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/chacha.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/chacha.h</a></div><div class='hunk'>@@ -15,7 +15,8 @@</div><div class='ctx'> #ifndef _CRYPTO_CHACHA_H</div><div class='ctx'> #define _CRYPTO_CHACHA_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* 32-bit stream position, then 96-bit nonce (RFC7539 convention) */</div><div class='hunk'>@@ -25,27 +26,30 @@</div><div class='ctx'> #define CHACHA_BLOCK_SIZE	64</div><div class='ctx'> #define CHACHAPOLY_IV_SIZE	12</div><div class='ctx'> </div><div class='del'>-#define CHACHA_STATE_WORDS	(CHACHA_BLOCK_SIZE / sizeof(u32))</div><div class='add'>+#define CHACHA_KEY_WORDS	8</div><div class='add'>+#define CHACHA_STATE_WORDS	16</div><div class='add'>+#define HCHACHA_OUT_WORDS	8</div><div class='ctx'> </div><div class='ctx'> /* 192-bit nonce, then 64-bit stream position */</div><div class='ctx'> #define XCHACHA_IV_SIZE		32</div><div class='ctx'> </div><div class='del'>-void chacha_block_generic(u32 *state, u8 *stream, int nrounds);</div><div class='del'>-static inline void chacha20_block(u32 *state, u8 *stream)</div><div class='add'>+struct chacha_state {</div><div class='add'>+	u32 x[CHACHA_STATE_WORDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void chacha_block_generic(struct chacha_state *state,</div><div class='add'>+			  u8 out[at_least CHACHA_BLOCK_SIZE], int nrounds);</div><div class='add'>+static inline void chacha20_block(struct chacha_state *state,</div><div class='add'>+				  u8 out[at_least CHACHA_BLOCK_SIZE])</div><div class='ctx'> {</div><div class='del'>-	chacha_block_generic(state, stream, 20);</div><div class='add'>+	chacha_block_generic(state, out, 20);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hchacha_block_arch(const u32 *state, u32 *out, int nrounds);</div><div class='del'>-void hchacha_block_generic(const u32 *state, u32 *out, int nrounds);</div><div class='add'>+void hchacha_block_generic(const struct chacha_state *state,</div><div class='add'>+			   u32 out[at_least HCHACHA_OUT_WORDS], int nrounds);</div><div class='ctx'> </div><div class='del'>-static inline void hchacha_block(const u32 *state, u32 *out, int nrounds)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA))</div><div class='del'>-		hchacha_block_arch(state, out, nrounds);</div><div class='del'>-	else</div><div class='del'>-		hchacha_block_generic(state, out, nrounds);</div><div class='del'>-}</div><div class='add'>+void hchacha_block(const struct chacha_state *state,</div><div class='add'>+		   u32 out[at_least HCHACHA_OUT_WORDS], int nrounds);</div><div class='ctx'> </div><div class='ctx'> enum chacha_constants { /* expand 32-byte k */</div><div class='ctx'> 	CHACHA_CONSTANT_EXPA = 0x61707865U,</div><div class='hunk'>@@ -54,58 +58,45 @@ enum chacha_constants { /* expand 32-byte k */</div><div class='ctx'> 	CHACHA_CONSTANT_TE_K = 0x6b206574U</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void chacha_init_consts(u32 *state)</div><div class='add'>+static inline void chacha_init_consts(struct chacha_state *state)</div><div class='ctx'> {</div><div class='del'>-	state[0]  = CHACHA_CONSTANT_EXPA;</div><div class='del'>-	state[1]  = CHACHA_CONSTANT_ND_3;</div><div class='del'>-	state[2]  = CHACHA_CONSTANT_2_BY;</div><div class='del'>-	state[3]  = CHACHA_CONSTANT_TE_K;</div><div class='add'>+	state-&gt;x[0]  = CHACHA_CONSTANT_EXPA;</div><div class='add'>+	state-&gt;x[1]  = CHACHA_CONSTANT_ND_3;</div><div class='add'>+	state-&gt;x[2]  = CHACHA_CONSTANT_2_BY;</div><div class='add'>+	state-&gt;x[3]  = CHACHA_CONSTANT_TE_K;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv);</div><div class='del'>-static inline void chacha_init_generic(u32 *state, const u32 *key, const u8 *iv)</div><div class='add'>+static inline void chacha_init(struct chacha_state *state,</div><div class='add'>+			       const u32 key[at_least CHACHA_KEY_WORDS],</div><div class='add'>+			       const u8 iv[at_least CHACHA_IV_SIZE])</div><div class='ctx'> {</div><div class='ctx'> 	chacha_init_consts(state);</div><div class='del'>-	state[4]  = key[0];</div><div class='del'>-	state[5]  = key[1];</div><div class='del'>-	state[6]  = key[2];</div><div class='del'>-	state[7]  = key[3];</div><div class='del'>-	state[8]  = key[4];</div><div class='del'>-	state[9]  = key[5];</div><div class='del'>-	state[10] = key[6];</div><div class='del'>-	state[11] = key[7];</div><div class='del'>-	state[12] = get_unaligned_le32(iv +  0);</div><div class='del'>-	state[13] = get_unaligned_le32(iv +  4);</div><div class='del'>-	state[14] = get_unaligned_le32(iv +  8);</div><div class='del'>-	state[15] = get_unaligned_le32(iv + 12);</div><div class='add'>+	state-&gt;x[4]  = key[0];</div><div class='add'>+	state-&gt;x[5]  = key[1];</div><div class='add'>+	state-&gt;x[6]  = key[2];</div><div class='add'>+	state-&gt;x[7]  = key[3];</div><div class='add'>+	state-&gt;x[8]  = key[4];</div><div class='add'>+	state-&gt;x[9]  = key[5];</div><div class='add'>+	state-&gt;x[10] = key[6];</div><div class='add'>+	state-&gt;x[11] = key[7];</div><div class='add'>+	state-&gt;x[12] = get_unaligned_le32(iv +  0);</div><div class='add'>+	state-&gt;x[13] = get_unaligned_le32(iv +  4);</div><div class='add'>+	state-&gt;x[14] = get_unaligned_le32(iv +  8);</div><div class='add'>+	state-&gt;x[15] = get_unaligned_le32(iv + 12);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void chacha_init(u32 *state, const u32 *key, const u8 *iv)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA))</div><div class='del'>-		chacha_init_arch(state, key, iv);</div><div class='del'>-	else</div><div class='del'>-		chacha_init_generic(state, key, iv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src,</div><div class='del'>-		       unsigned int bytes, int nrounds);</div><div class='del'>-void chacha_crypt_generic(u32 *state, u8 *dst, const u8 *src,</div><div class='del'>-			  unsigned int bytes, int nrounds);</div><div class='add'>+void chacha_crypt(struct chacha_state *state, u8 *dst, const u8 *src,</div><div class='add'>+		  unsigned int bytes, int nrounds);</div><div class='ctx'> </div><div class='del'>-static inline void chacha_crypt(u32 *state, u8 *dst, const u8 *src,</div><div class='del'>-				unsigned int bytes, int nrounds)</div><div class='add'>+static inline void chacha20_crypt(struct chacha_state *state,</div><div class='add'>+				  u8 *dst, const u8 *src, unsigned int bytes)</div><div class='ctx'> {</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA))</div><div class='del'>-		chacha_crypt_arch(state, dst, src, bytes, nrounds);</div><div class='del'>-	else</div><div class='del'>-		chacha_crypt_generic(state, dst, src, bytes, nrounds);</div><div class='add'>+	chacha_crypt(state, dst, src, bytes, 20);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void chacha20_crypt(u32 *state, u8 *dst, const u8 *src,</div><div class='del'>-				  unsigned int bytes)</div><div class='add'>+static inline void chacha_zeroize_state(struct chacha_state *state)</div><div class='ctx'> {</div><div class='del'>-	chacha_crypt(state, dst, src, bytes, 20);</div><div class='add'>+	memzero_explicit(state, sizeof(*state));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* _CRYPTO_CHACHA_H */</div><div class='head'>diff --git a/include/crypto/chacha20poly1305.h b/include/crypto/chacha20poly1305.h<br/>index d2ac3ff7dc1e..0f71b037702d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/chacha20poly1305.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/chacha20poly1305.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/chacha20poly1305.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/chacha20poly1305.h</a></div><div class='hunk'>@@ -18,32 +18,33 @@ enum chacha20poly1305_lengths {</div><div class='ctx'> void chacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,</div><div class='ctx'> 			      const u8 *ad, const size_t ad_len,</div><div class='ctx'> 			      const u64 nonce,</div><div class='del'>-			      const u8 key[CHACHA20POLY1305_KEY_SIZE]);</div><div class='add'>+			      const u8 key[at_least CHACHA20POLY1305_KEY_SIZE]);</div><div class='ctx'> </div><div class='ctx'> bool __must_check</div><div class='ctx'> chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len,</div><div class='ctx'> 			 const u8 *ad, const size_t ad_len, const u64 nonce,</div><div class='del'>-			 const u8 key[CHACHA20POLY1305_KEY_SIZE]);</div><div class='add'>+			 const u8 key[at_least CHACHA20POLY1305_KEY_SIZE]);</div><div class='ctx'> </div><div class='ctx'> void xchacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,</div><div class='ctx'> 			       const u8 *ad, const size_t ad_len,</div><div class='del'>-			       const u8 nonce[XCHACHA20POLY1305_NONCE_SIZE],</div><div class='del'>-			       const u8 key[CHACHA20POLY1305_KEY_SIZE]);</div><div class='add'>+			       const u8 nonce[at_least XCHACHA20POLY1305_NONCE_SIZE],</div><div class='add'>+			       const u8 key[at_least CHACHA20POLY1305_KEY_SIZE]);</div><div class='ctx'> </div><div class='ctx'> bool __must_check xchacha20poly1305_decrypt(</div><div class='del'>-	u8 *dst, const u8 *src, const size_t src_len, const u8 *ad,</div><div class='del'>-	const size_t ad_len, const u8 nonce[XCHACHA20POLY1305_NONCE_SIZE],</div><div class='del'>-	const u8 key[CHACHA20POLY1305_KEY_SIZE]);</div><div class='add'>+	u8 *dst, const u8 *src, const size_t src_len,</div><div class='add'>+	const u8 *ad, const size_t ad_len,</div><div class='add'>+	const u8 nonce[at_least XCHACHA20POLY1305_NONCE_SIZE],</div><div class='add'>+	const u8 key[at_least CHACHA20POLY1305_KEY_SIZE]);</div><div class='ctx'> </div><div class='ctx'> bool chacha20poly1305_encrypt_sg_inplace(struct scatterlist *src, size_t src_len,</div><div class='ctx'> 					 const u8 *ad, const size_t ad_len,</div><div class='ctx'> 					 const u64 nonce,</div><div class='del'>-					 const u8 key[CHACHA20POLY1305_KEY_SIZE]);</div><div class='add'>+					 const u8 key[at_least CHACHA20POLY1305_KEY_SIZE]);</div><div class='ctx'> </div><div class='ctx'> bool chacha20poly1305_decrypt_sg_inplace(struct scatterlist *src, size_t src_len,</div><div class='ctx'> 					 const u8 *ad, const size_t ad_len,</div><div class='ctx'> 					 const u64 nonce,</div><div class='del'>-					 const u8 key[CHACHA20POLY1305_KEY_SIZE]);</div><div class='add'>+					 const u8 key[at_least CHACHA20POLY1305_KEY_SIZE]);</div><div class='ctx'> </div><div class='ctx'> bool chacha20poly1305_selftest(void);</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/ctr.h b/include/crypto/ctr.h<br/>index a1c66d1001af..06984a26c8cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/ctr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/ctr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/ctr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/ctr.h</a></div><div class='hunk'>@@ -8,58 +8,8 @@</div><div class='ctx'> #ifndef _CRYPTO_CTR_H</div><div class='ctx'> #define _CRYPTO_CTR_H</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='del'>-#include &lt;crypto/internal/skcipher.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='ctx'> #define CTR_RFC3686_NONCE_SIZE 4</div><div class='ctx'> #define CTR_RFC3686_IV_SIZE 8</div><div class='ctx'> #define CTR_RFC3686_BLOCK_SIZE 16</div><div class='ctx'> </div><div class='del'>-static inline int crypto_ctr_encrypt_walk(struct skcipher_request *req,</div><div class='del'>-					  void (*fn)(struct crypto_skcipher *,</div><div class='del'>-						     const u8 *, u8 *))</div><div class='del'>-{</div><div class='del'>-	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);</div><div class='del'>-	int blocksize = crypto_skcipher_chunksize(tfm);</div><div class='del'>-	u8 buf[MAX_CIPHER_BLOCKSIZE];</div><div class='del'>-	struct skcipher_walk walk;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* avoid integer division due to variable blocksize parameter */</div><div class='del'>-	if (WARN_ON_ONCE(!is_power_of_2(blocksize)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = skcipher_walk_virt(&amp;walk, req, false);</div><div class='del'>-</div><div class='del'>-	while (walk.nbytes &gt; 0) {</div><div class='del'>-		u8 *dst = walk.dst.virt.addr;</div><div class='del'>-		u8 *src = walk.src.virt.addr;</div><div class='del'>-		int nbytes = walk.nbytes;</div><div class='del'>-		int tail = 0;</div><div class='del'>-</div><div class='del'>-		if (nbytes &lt; walk.total) {</div><div class='del'>-			tail = walk.nbytes &amp; (blocksize - 1);</div><div class='del'>-			nbytes -= tail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			int bsize = min(nbytes, blocksize);</div><div class='del'>-</div><div class='del'>-			fn(tfm, walk.iv, buf);</div><div class='del'>-</div><div class='del'>-			crypto_xor_cpy(dst, src, buf, bsize);</div><div class='del'>-			crypto_inc(walk.iv, blocksize);</div><div class='del'>-</div><div class='del'>-			dst += bsize;</div><div class='del'>-			src += bsize;</div><div class='del'>-			nbytes -= bsize;</div><div class='del'>-		} while (nbytes &gt; 0);</div><div class='del'>-</div><div class='del'>-		err = skcipher_walk_done(&amp;walk, tail);</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif  /* _CRYPTO_CTR_H */</div><div class='head'>diff --git a/include/crypto/curve25519.h b/include/crypto/curve25519.h<br/>index ece6a9b5fafc..2362b48f8741 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/curve25519.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/curve25519.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/curve25519.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/curve25519.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #ifndef CURVE25519_H</div><div class='ctx'> #define CURVE25519_H</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/algapi.h&gt; // For crypto_memneq.</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -14,57 +13,28 @@ enum curve25519_lengths {</div><div class='ctx'> 	CURVE25519_KEY_SIZE = 32</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern const u8 curve25519_null_point[];</div><div class='del'>-extern const u8 curve25519_base_point[];</div><div class='add'>+void curve25519_generic(u8 out[at_least CURVE25519_KEY_SIZE],</div><div class='add'>+			const u8 scalar[at_least CURVE25519_KEY_SIZE],</div><div class='add'>+			const u8 point[at_least CURVE25519_KEY_SIZE]);</div><div class='ctx'> </div><div class='del'>-void curve25519_generic(u8 out[CURVE25519_KEY_SIZE],</div><div class='del'>-			const u8 scalar[CURVE25519_KEY_SIZE],</div><div class='del'>-			const u8 point[CURVE25519_KEY_SIZE]);</div><div class='add'>+bool __must_check</div><div class='add'>+curve25519(u8 mypublic[at_least CURVE25519_KEY_SIZE],</div><div class='add'>+	   const u8 secret[at_least CURVE25519_KEY_SIZE],</div><div class='add'>+	   const u8 basepoint[at_least CURVE25519_KEY_SIZE]);</div><div class='ctx'> </div><div class='del'>-void curve25519_arch(u8 out[CURVE25519_KEY_SIZE],</div><div class='del'>-		     const u8 scalar[CURVE25519_KEY_SIZE],</div><div class='del'>-		     const u8 point[CURVE25519_KEY_SIZE]);</div><div class='add'>+bool __must_check</div><div class='add'>+curve25519_generate_public(u8 pub[at_least CURVE25519_KEY_SIZE],</div><div class='add'>+			   const u8 secret[at_least CURVE25519_KEY_SIZE]);</div><div class='ctx'> </div><div class='del'>-void curve25519_base_arch(u8 pub[CURVE25519_KEY_SIZE],</div><div class='del'>-			  const u8 secret[CURVE25519_KEY_SIZE]);</div><div class='del'>-</div><div class='del'>-bool curve25519_selftest(void);</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-bool __must_check curve25519(u8 mypublic[CURVE25519_KEY_SIZE],</div><div class='del'>-			     const u8 secret[CURVE25519_KEY_SIZE],</div><div class='del'>-			     const u8 basepoint[CURVE25519_KEY_SIZE])</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519))</div><div class='del'>-		curve25519_arch(mypublic, secret, basepoint);</div><div class='del'>-	else</div><div class='del'>-		curve25519_generic(mypublic, secret, basepoint);</div><div class='del'>-	return crypto_memneq(mypublic, curve25519_null_point,</div><div class='del'>-			     CURVE25519_KEY_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool</div><div class='del'>-__must_check curve25519_generate_public(u8 pub[CURVE25519_KEY_SIZE],</div><div class='del'>-					const u8 secret[CURVE25519_KEY_SIZE])</div><div class='del'>-{</div><div class='del'>-	if (unlikely(!crypto_memneq(secret, curve25519_null_point,</div><div class='del'>-				    CURVE25519_KEY_SIZE)))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519))</div><div class='del'>-		curve25519_base_arch(pub, secret);</div><div class='del'>-	else</div><div class='del'>-		curve25519_generic(pub, secret, curve25519_base_point);</div><div class='del'>-	return crypto_memneq(pub, curve25519_null_point, CURVE25519_KEY_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void curve25519_clamp_secret(u8 secret[CURVE25519_KEY_SIZE])</div><div class='add'>+static inline void</div><div class='add'>+curve25519_clamp_secret(u8 secret[at_least CURVE25519_KEY_SIZE])</div><div class='ctx'> {</div><div class='ctx'> 	secret[0] &amp;= 248;</div><div class='ctx'> 	secret[31] = (secret[31] &amp; 127) | 64;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void curve25519_generate_secret(u8 secret[CURVE25519_KEY_SIZE])</div><div class='add'>+static inline void</div><div class='add'>+curve25519_generate_secret(u8 secret[at_least CURVE25519_KEY_SIZE])</div><div class='ctx'> {</div><div class='ctx'> 	get_random_bytes_wait(secret, CURVE25519_KEY_SIZE);</div><div class='ctx'> 	curve25519_clamp_secret(secret);</div><div class='head'>diff --git a/include/crypto/df_sp80090a.h b/include/crypto/df_sp80090a.h<br/>new file mode 100644<br/>index 000000000000..6b25305fe611<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/df_sp80090a.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/df_sp80090a.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright Stephan Mueller &lt;smueller@chronox.de&gt;, 2014</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CRYPTO_DF80090A_H</div><div class='add'>+#define _CRYPTO_DF80090A_H</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/internal/cipher.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int crypto_drbg_ctr_df_datalen(u8 statelen, u8 blocklen)</div><div class='add'>+{</div><div class='add'>+	return statelen +       /* df_data */</div><div class='add'>+		blocklen +      /* pad */</div><div class='add'>+		blocklen +      /* iv */</div><div class='add'>+		statelen + blocklen;  /* temp */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int crypto_drbg_ctr_df(struct crypto_aes_ctx *aes,</div><div class='add'>+		       unsigned char *df_data,</div><div class='add'>+		       size_t bytes_to_return,</div><div class='add'>+		       struct list_head *seedlist,</div><div class='add'>+		       u8 blocklen_bytes,</div><div class='add'>+		       u8 statelen);</div><div class='add'>+</div><div class='add'>+#endif /* _CRYPTO_DF80090A_H */</div><div class='head'>diff --git a/include/crypto/drbg.h b/include/crypto/drbg.h<br/>index af5ad51d3eef..2d42518cbdce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/drbg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/drbg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/drbg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/drbg.h</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;crypto/internal/drbg.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/rng.h&gt;</div><div class='ctx'> #include &lt;crypto/rng.h&gt;</div><div class='ctx'> #include &lt;linux/fips.h&gt;</div><div class='hunk'>@@ -54,30 +55,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Concatenation Helper and string operation helper</div><div class='del'>- *</div><div class='del'>- * SP800-90A requires the concatenation of different data. To avoid copying</div><div class='del'>- * buffers around or allocate additional memory, the following data structure</div><div class='del'>- * is used to point to the original memory with its size. In addition, it</div><div class='del'>- * is used to build a linked list. The linked list defines the concatenation</div><div class='del'>- * of individual buffers. The order of memory block referenced in that</div><div class='del'>- * linked list determines the order of concatenation.</div><div class='del'>- */</div><div class='del'>-struct drbg_string {</div><div class='del'>-	const unsigned char *buf;</div><div class='del'>-	size_t len;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void drbg_string_fill(struct drbg_string *string,</div><div class='del'>-				    const unsigned char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	string-&gt;buf = buf;</div><div class='del'>-	string-&gt;len = len;</div><div class='del'>-	INIT_LIST_HEAD(&amp;string-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct drbg_state;</div><div class='ctx'> typedef uint32_t drbg_flag_t;</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/ecc_curve.h b/include/crypto/ecc_curve.h<br/>index 70964781eb68..7d90c5e82266 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/ecc_curve.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/ecc_curve.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/ecc_curve.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/ecc_curve.h</a></div><div class='hunk'>@@ -23,6 +23,7 @@ struct ecc_point {</div><div class='ctx'>  * struct ecc_curve - definition of elliptic curve</div><div class='ctx'>  *</div><div class='ctx'>  * @name:	Short name of the curve.</div><div class='add'>+ * @nbits:	The number of bits of a curve.</div><div class='ctx'>  * @g:		Generator point of the curve.</div><div class='ctx'>  * @p:		Prime number, if Barrett's reduction is used for this curve</div><div class='ctx'>  *		pre-calculated value 'mu' is appended to the @p after ndigits.</div><div class='hunk'>@@ -34,6 +35,7 @@ struct ecc_point {</div><div class='ctx'>  */</div><div class='ctx'> struct ecc_curve {</div><div class='ctx'> 	char *name;</div><div class='add'>+	u32 nbits;</div><div class='ctx'> 	struct ecc_point g;</div><div class='ctx'> 	u64 *p;</div><div class='ctx'> 	u64 *n;</div><div class='head'>diff --git a/include/crypto/ecdh.h b/include/crypto/ecdh.h<br/>index a9f98078d29c..9784ecdd2fb4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/ecdh.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/ecdh.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/ecdh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/ecdh.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #define ECC_CURVE_NIST_P192	0x0001</div><div class='ctx'> #define ECC_CURVE_NIST_P256	0x0002</div><div class='ctx'> #define ECC_CURVE_NIST_P384	0x0003</div><div class='add'>+#define ECC_CURVE_NIST_P521	0x0004</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ecdh - define an ECDH private key</div><div class='head'>diff --git a/include/crypto/engine.h b/include/crypto/engine.h<br/>index 545dbefe3e13..2e60344437da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/engine.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/engine.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/engine.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/engine.h</a></div><div class='hunk'>@@ -76,7 +76,6 @@ int crypto_engine_stop(struct crypto_engine *engine);</div><div class='ctx'> struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt);</div><div class='ctx'> struct crypto_engine *crypto_engine_alloc_init_and_set(struct device *dev,</div><div class='ctx'> 						       bool retry_support,</div><div class='del'>-						       int (*cbk_do_batch)(struct crypto_engine *engine),</div><div class='ctx'> 						       bool rt, int qlen);</div><div class='ctx'> void crypto_engine_exit(struct crypto_engine *engine);</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/gf128mul.h b/include/crypto/gf128mul.h<br/>index 81330c6446f6..b0853f7cada0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/gf128mul.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/gf128mul.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/gf128mul.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/gf128mul.h</a></div><div class='hunk'>@@ -158,12 +158,10 @@</div><div class='ctx'>     64...71 72...79 80...87 88...95  96..103 104.111 112.119 120.127</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-/*	A slow generic version of gf_mul, implemented for lle and bbe</div><div class='add'>+/*	A slow generic version of gf_mul, implemented for lle</div><div class='ctx'>  * 	It multiplies a and b and puts the result in a */</div><div class='ctx'> void gf128mul_lle(be128 *a, const be128 *b);</div><div class='ctx'> </div><div class='del'>-void gf128mul_bbe(be128 *a, const be128 *b);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The following functions multiply a field element by x in</div><div class='ctx'>  * the polynomial field representation.  They use 64-bit word operations</div><div class='hunk'>@@ -224,9 +222,7 @@ struct gf128mul_4k {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gf128mul_4k *gf128mul_init_4k_lle(const be128 *g);</div><div class='del'>-struct gf128mul_4k *gf128mul_init_4k_bbe(const be128 *g);</div><div class='ctx'> void gf128mul_4k_lle(be128 *a, const struct gf128mul_4k *t);</div><div class='del'>-void gf128mul_4k_bbe(be128 *a, const struct gf128mul_4k *t);</div><div class='ctx'> void gf128mul_x8_ble(le128 *r, const le128 *x);</div><div class='ctx'> static inline void gf128mul_free_4k(struct gf128mul_4k *t)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/crypto/ghash.h b/include/crypto/ghash.h<br/>index f832c9f2aca3..043d938e9a2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/ghash.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/ghash.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/ghash.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/ghash.h</a></div><div class='hunk'>@@ -7,18 +7,18 @@</div><div class='ctx'> #define __CRYPTO_GHASH_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;crypto/gf128mul.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GHASH_BLOCK_SIZE	16</div><div class='ctx'> #define GHASH_DIGEST_SIZE	16</div><div class='ctx'> </div><div class='add'>+struct gf128mul_4k;</div><div class='add'>+</div><div class='ctx'> struct ghash_ctx {</div><div class='ctx'> 	struct gf128mul_4k *gf128;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ghash_desc_ctx {</div><div class='ctx'> 	u8 buffer[GHASH_BLOCK_SIZE];</div><div class='del'>-	u32 bytes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/hash.h b/include/crypto/hash.h<br/>index 5d61f576cfc8..586700332c73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/hash.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/hash.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/hash.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/hash.h</a></div><div class='hunk'>@@ -8,10 +8,17 @@</div><div class='ctx'> #ifndef _CRYPTO_HASH_H</div><div class='ctx'> #define _CRYPTO_HASH_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Set this bit for virtual address instead of SG list. */</div><div class='add'>+#define CRYPTO_AHASH_REQ_VIRT	0x00000001</div><div class='add'>+</div><div class='add'>+#define CRYPTO_AHASH_REQ_PRIVATE \</div><div class='add'>+	CRYPTO_AHASH_REQ_VIRT</div><div class='add'>+</div><div class='ctx'> struct crypto_ahash;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -24,26 +31,7 @@ struct crypto_ahash;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * struct crypto_istat_hash - statistics for has algorithm</div><div class='del'>- * @hash_cnt:		number of hash requests</div><div class='del'>- * @hash_tlen:		total data size hashed</div><div class='del'>- * @err_cnt:		number of error for hash requests</div><div class='del'>- */</div><div class='del'>-struct crypto_istat_hash {</div><div class='del'>-	atomic64_t hash_cnt;</div><div class='del'>-	atomic64_t hash_tlen;</div><div class='del'>-	atomic64_t err_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-#define HASH_ALG_COMMON_STAT struct crypto_istat_hash stat;</div><div class='del'>-#else</div><div class='del'>-#define HASH_ALG_COMMON_STAT</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * struct hash_alg_common - define properties of message digest</div><div class='del'>- * @stat: Statistics for hash algorithm.</div><div class='ctx'>  * @digestsize: Size of the result of the transformation. A buffer of this size</div><div class='ctx'>  *	        must be available to the @final and @finup calls, so they can</div><div class='ctx'>  *	        store the resulting hash into it. For various predefined sizes,</div><div class='hunk'>@@ -60,8 +48,6 @@ struct crypto_istat_hash {</div><div class='ctx'>  *	  information.</div><div class='ctx'>  */</div><div class='ctx'> #define HASH_ALG_COMMON {		\</div><div class='del'>-	HASH_ALG_COMMON_STAT		\</div><div class='del'>-					\</div><div class='ctx'> 	unsigned int digestsize;	\</div><div class='ctx'> 	unsigned int statesize;		\</div><div class='ctx'> 					\</div><div class='hunk'>@@ -73,11 +59,15 @@ struct ahash_request {</div><div class='ctx'> 	struct crypto_async_request base;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int nbytes;</div><div class='del'>-	struct scatterlist *src;</div><div class='add'>+	union {</div><div class='add'>+		struct scatterlist *src;</div><div class='add'>+		const u8 *svirt;</div><div class='add'>+	};</div><div class='ctx'> 	u8 *result;</div><div class='ctx'> </div><div class='del'>-	/* This field may only be used by the ahash API code. */</div><div class='del'>-	void *priv;</div><div class='add'>+	struct scatterlist sg_head[2];</div><div class='add'>+	crypto_completion_t saved_complete;</div><div class='add'>+	void *saved_data;</div><div class='ctx'> </div><div class='ctx'> 	void *__ctx[] CRYPTO_MINALIGN_ATTR;</div><div class='ctx'> };</div><div class='hunk'>@@ -99,6 +89,8 @@ struct ahash_request {</div><div class='ctx'>  *	   transformation object. Data processing can happen synchronously</div><div class='ctx'>  *	   [SHASH] or asynchronously [AHASH] at this point. Driver must not use</div><div class='ctx'>  *	   req-&gt;result.</div><div class='add'>+ *	   For block-only algorithms, @update must return the number</div><div class='add'>+ *	   of bytes to store in the API partial block buffer.</div><div class='ctx'>  * @final: **[mandatory]** Retrieve result from the driver. This function finalizes the</div><div class='ctx'>  *	   transformation and retrieves the resulting hash from the driver and</div><div class='ctx'>  *	   pushes it back to upper layers. No data processing happens at this</div><div class='hunk'>@@ -141,6 +133,10 @@ struct ahash_request {</div><div class='ctx'>  *	    data so the transformation can continue from this point onward. No</div><div class='ctx'>  *	    data processing happens at this point. Driver must not use</div><div class='ctx'>  *	    req-&gt;result.</div><div class='add'>+ * @export_core: Export partial state without partial block.  Only defined</div><div class='add'>+ *		 for algorithms that are not block-only.</div><div class='add'>+ * @import_core: Import partial state without partial block.  Only defined</div><div class='add'>+ *		 for algorithms that are not block-only.</div><div class='ctx'>  * @init_tfm: Initialize the cryptographic transformation object.</div><div class='ctx'>  *	      This function is called only once at the instantiation</div><div class='ctx'>  *	      time, right after the transformation context was</div><div class='hunk'>@@ -163,6 +159,8 @@ struct ahash_alg {</div><div class='ctx'> 	int (*digest)(struct ahash_request *req);</div><div class='ctx'> 	int (*export)(struct ahash_request *req, void *out);</div><div class='ctx'> 	int (*import)(struct ahash_request *req, const void *in);</div><div class='add'>+	int (*export_core)(struct ahash_request *req, void *out);</div><div class='add'>+	int (*import_core)(struct ahash_request *req, const void *in);</div><div class='ctx'> 	int (*setkey)(struct crypto_ahash *tfm, const u8 *key,</div><div class='ctx'> 		      unsigned int keylen);</div><div class='ctx'> 	int (*init_tfm)(struct crypto_ahash *tfm);</div><div class='hunk'>@@ -180,16 +178,44 @@ struct shash_desc {</div><div class='ctx'> #define HASH_MAX_DIGESTSIZE	 64</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Worst case is hmac(sha3-224-generic).  Its context is a nested 'shash_desc'</div><div class='del'>- * containing a 'struct sha3_state'.</div><div class='add'>+ * The size of a core hash state and a partial block.  The final byte</div><div class='add'>+ * is the length of the partial block.</div><div class='ctx'>  */</div><div class='del'>-#define HASH_MAX_DESCSIZE	(sizeof(struct shash_desc) + 360)</div><div class='add'>+#define HASH_STATE_AND_BLOCK(state, block) ((state) + (block) + 1)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Worst case is sha3-224. */</div><div class='add'>+#define HASH_MAX_STATESIZE	 HASH_STATE_AND_BLOCK(200, 144)</div><div class='add'>+</div><div class='add'>+/* This needs to match arch/s390/crypto/sha.h. */</div><div class='add'>+#define S390_SHA_CTX_SIZE	216</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Worst case is hmac(sha3-224-s390).  Its context is a nested 'shash_desc'</div><div class='add'>+ * containing a 'struct s390_sha_ctx'.</div><div class='add'>+ */</div><div class='add'>+#define SHA3_224_S390_DESCSIZE	HASH_STATE_AND_BLOCK(S390_SHA_CTX_SIZE, 144)</div><div class='add'>+#define HASH_MAX_DESCSIZE	(sizeof(struct shash_desc) + \</div><div class='add'>+				 SHA3_224_S390_DESCSIZE)</div><div class='add'>+#define MAX_SYNC_HASH_REQSIZE	(sizeof(struct ahash_request) + \</div><div class='add'>+				 HASH_MAX_DESCSIZE)</div><div class='ctx'> </div><div class='ctx'> #define SHASH_DESC_ON_STACK(shash, ctx)					     \</div><div class='ctx'> 	char __##shash##_desc[sizeof(struct shash_desc) + HASH_MAX_DESCSIZE] \</div><div class='ctx'> 		__aligned(__alignof__(struct shash_desc));		     \</div><div class='ctx'> 	struct shash_desc *shash = (struct shash_desc *)__##shash##_desc</div><div class='ctx'> </div><div class='add'>+#define HASH_REQUEST_ON_STACK(name, _tfm) \</div><div class='add'>+	char __##name##_req[sizeof(struct ahash_request) + \</div><div class='add'>+			    MAX_SYNC_HASH_REQSIZE] CRYPTO_MINALIGN_ATTR; \</div><div class='add'>+	struct ahash_request *name = \</div><div class='add'>+		ahash_request_on_stack_init(__##name##_req, (_tfm))</div><div class='add'>+</div><div class='add'>+#define HASH_REQUEST_CLONE(name, gfp) \</div><div class='add'>+	hash_request_clone(name, sizeof(__##name##_req), gfp)</div><div class='add'>+</div><div class='add'>+#define CRYPTO_HASH_STATESIZE(coresize, blocksize) (coresize + blocksize + 1)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct shash_alg - synchronous message digest definition</div><div class='ctx'>  * @init: see struct ahash_alg</div><div class='hunk'>@@ -199,6 +225,8 @@ struct shash_desc {</div><div class='ctx'>  * @digest: see struct ahash_alg</div><div class='ctx'>  * @export: see struct ahash_alg</div><div class='ctx'>  * @import: see struct ahash_alg</div><div class='add'>+ * @export_core: see struct ahash_alg</div><div class='add'>+ * @import_core: see struct ahash_alg</div><div class='ctx'>  * @setkey: see struct ahash_alg</div><div class='ctx'>  * @init_tfm: Initialize the cryptographic transformation object.</div><div class='ctx'>  *	      This function is called only once at the instantiation</div><div class='hunk'>@@ -229,6 +257,8 @@ struct shash_alg {</div><div class='ctx'> 		      unsigned int len, u8 *out);</div><div class='ctx'> 	int (*export)(struct shash_desc *desc, void *out);</div><div class='ctx'> 	int (*import)(struct shash_desc *desc, const void *in);</div><div class='add'>+	int (*export_core)(struct shash_desc *desc, void *out);</div><div class='add'>+	int (*import_core)(struct shash_desc *desc, const void *in);</div><div class='ctx'> 	int (*setkey)(struct crypto_shash *tfm, const u8 *key,</div><div class='ctx'> 		      unsigned int keylen);</div><div class='ctx'> 	int (*init_tfm)(struct crypto_shash *tfm);</div><div class='hunk'>@@ -243,7 +273,6 @@ struct shash_alg {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> #undef HASH_ALG_COMMON</div><div class='del'>-#undef HASH_ALG_COMMON_STAT</div><div class='ctx'> </div><div class='ctx'> struct crypto_ahash {</div><div class='ctx'> 	bool using_shash; /* Underlying algorithm is shash, not ahash */</div><div class='hunk'>@@ -253,7 +282,6 @@ struct crypto_ahash {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct crypto_shash {</div><div class='del'>-	unsigned int descsize;</div><div class='ctx'> 	struct crypto_tfm base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -267,6 +295,11 @@ struct crypto_shash {</div><div class='ctx'>  * CRYPTO_ALG_TYPE_SKCIPHER API applies here as well.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static inline bool ahash_req_on_stack(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	return crypto_req_on_stack(&amp;req-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct crypto_ahash *__crypto_ahash_cast(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(tfm, struct crypto_ahash, base);</div><div class='hunk'>@@ -474,7 +507,11 @@ int crypto_ahash_finup(struct ahash_request *req);</div><div class='ctx'>  * -EBUSY	if queue is full and request should be resubmitted later;</div><div class='ctx'>  * other &lt; 0	if an error occurred</div><div class='ctx'>  */</div><div class='del'>-int crypto_ahash_final(struct ahash_request *req);</div><div class='add'>+static inline int crypto_ahash_final(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	req-&gt;nbytes = 0;</div><div class='add'>+	return crypto_ahash_finup(req);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * crypto_ahash_digest() - calculate message digest for a buffer</div><div class='hunk'>@@ -563,7 +600,7 @@ int crypto_ahash_update(struct ahash_request *req);</div><div class='ctx'> static inline void ahash_request_set_tfm(struct ahash_request *req,</div><div class='ctx'> 					 struct crypto_ahash *tfm)</div><div class='ctx'> {</div><div class='del'>-	req-&gt;base.tfm = crypto_ahash_tfm(tfm);</div><div class='add'>+	crypto_request_set_tfm(&amp;req-&gt;base, crypto_ahash_tfm(tfm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -578,28 +615,26 @@ static inline void ahash_request_set_tfm(struct ahash_request *req,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: allocated request handle in case of success, or NULL if out of memory</div><div class='ctx'>  */</div><div class='del'>-static inline struct ahash_request *ahash_request_alloc(</div><div class='add'>+static inline struct ahash_request *ahash_request_alloc_noprof(</div><div class='ctx'> 	struct crypto_ahash *tfm, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ahash_request *req;</div><div class='ctx'> </div><div class='del'>-	req = kmalloc(sizeof(struct ahash_request) +</div><div class='del'>-		      crypto_ahash_reqsize(tfm), gfp);</div><div class='add'>+	req = kmalloc_noprof(sizeof(struct ahash_request) +</div><div class='add'>+			     crypto_ahash_reqsize(tfm), gfp);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(req))</div><div class='ctx'> 		ahash_request_set_tfm(req, tfm);</div><div class='ctx'> </div><div class='ctx'> 	return req;</div><div class='ctx'> }</div><div class='add'>+#define ahash_request_alloc(...)	alloc_hooks(ahash_request_alloc_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ahash_request_free() - zeroize and free the request data structure</div><div class='ctx'>  * @req: request data structure cipher handle to be freed</div><div class='ctx'>  */</div><div class='del'>-static inline void ahash_request_free(struct ahash_request *req)</div><div class='del'>-{</div><div class='del'>-	kfree_sensitive(req);</div><div class='del'>-}</div><div class='add'>+void ahash_request_free(struct ahash_request *req);</div><div class='ctx'> </div><div class='ctx'> static inline void ahash_request_zero(struct ahash_request *req)</div><div class='ctx'> {</div><div class='hunk'>@@ -643,9 +678,9 @@ static inline void ahash_request_set_callback(struct ahash_request *req,</div><div class='ctx'> 					      crypto_completion_t compl,</div><div class='ctx'> 					      void *data)</div><div class='ctx'> {</div><div class='del'>-	req-&gt;base.complete = compl;</div><div class='del'>-	req-&gt;base.data = data;</div><div class='del'>-	req-&gt;base.flags = flags;</div><div class='add'>+	flags &amp;= ~CRYPTO_AHASH_REQ_PRIVATE;</div><div class='add'>+	flags |= req-&gt;base.flags &amp; CRYPTO_AHASH_REQ_PRIVATE;</div><div class='add'>+	crypto_request_set_callback(&amp;req-&gt;base, flags, compl, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -668,6 +703,30 @@ static inline void ahash_request_set_crypt(struct ahash_request *req,</div><div class='ctx'> 	req-&gt;src = src;</div><div class='ctx'> 	req-&gt;nbytes = nbytes;</div><div class='ctx'> 	req-&gt;result = result;</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_AHASH_REQ_VIRT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ahash_request_set_virt() - set virtual address data buffers</div><div class='add'>+ * @req: ahash_request handle to be updated</div><div class='add'>+ * @src: source virtual address</div><div class='add'>+ * @result: buffer that is filled with the message digest -- the caller must</div><div class='add'>+ *	    ensure that the buffer has sufficient space by, for example, calling</div><div class='add'>+ *	    crypto_ahash_digestsize()</div><div class='add'>+ * @nbytes: number of bytes to process from the source virtual address</div><div class='add'>+ *</div><div class='add'>+ * By using this call, the caller references the source virtual address.</div><div class='add'>+ * The source virtual address points to the data the message digest is to</div><div class='add'>+ * be calculated for.</div><div class='add'>+ */</div><div class='add'>+static inline void ahash_request_set_virt(struct ahash_request *req,</div><div class='add'>+					  const u8 *src, u8 *result,</div><div class='add'>+					  unsigned int nbytes)</div><div class='add'>+{</div><div class='add'>+	req-&gt;svirt = src;</div><div class='add'>+	req-&gt;nbytes = nbytes;</div><div class='add'>+	req-&gt;result = result;</div><div class='add'>+	req-&gt;base.flags |= CRYPTO_AHASH_REQ_VIRT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -805,7 +864,7 @@ static inline void crypto_shash_clear_flags(struct crypto_shash *tfm, u32 flags)</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned int crypto_shash_descsize(struct crypto_shash *tfm)</div><div class='ctx'> {</div><div class='del'>-	return tfm-&gt;descsize;</div><div class='add'>+	return crypto_shash_alg(tfm)-&gt;descsize;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void *shash_desc_ctx(struct shash_desc *desc)</div><div class='hunk'>@@ -823,7 +882,7 @@ static inline void *shash_desc_ctx(struct shash_desc *desc)</div><div class='ctx'>  * cipher handle must point to a keyed message digest cipher in order for this</div><div class='ctx'>  * function to succeed.</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context.</div><div class='add'>+ * Context: Softirq or process context.</div><div class='ctx'>  * Return: 0 if the setting of the key was successful; &lt; 0 if an error occurred</div><div class='ctx'>  */</div><div class='ctx'> int crypto_shash_setkey(struct crypto_shash *tfm, const u8 *key,</div><div class='hunk'>@@ -840,7 +899,7 @@ int crypto_shash_setkey(struct crypto_shash *tfm, const u8 *key,</div><div class='ctx'>  * crypto_shash_update and crypto_shash_final. The parameters have the same</div><div class='ctx'>  * meaning as discussed for those separate three functions.</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context.</div><div class='add'>+ * Context: Softirq or process context.</div><div class='ctx'>  * Return: 0 if the message digest creation was successful; &lt; 0 if an error</div><div class='ctx'>  *	   occurred</div><div class='ctx'>  */</div><div class='hunk'>@@ -860,12 +919,15 @@ int crypto_shash_digest(struct shash_desc *desc, const u8 *data,</div><div class='ctx'>  * directly, and it allocates a hash descriptor on the stack internally.</div><div class='ctx'>  * Note that this stack allocation may be fairly large.</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context.</div><div class='add'>+ * Context: Softirq or process context.</div><div class='ctx'>  * Return: 0 on success; &lt; 0 if an error occurred.</div><div class='ctx'>  */</div><div class='ctx'> int crypto_shash_tfm_digest(struct crypto_shash *tfm, const u8 *data,</div><div class='ctx'> 			    unsigned int len, u8 *out);</div><div class='ctx'> </div><div class='add'>+int crypto_hash_digest(struct crypto_ahash *tfm, const u8 *data,</div><div class='add'>+		       unsigned int len, u8 *out);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_shash_export() - extract operational state for message digest</div><div class='ctx'>  * @desc: reference to the operational state handle whose state is exported</div><div class='hunk'>@@ -875,7 +937,7 @@ int crypto_shash_tfm_digest(struct crypto_shash *tfm, const u8 *data,</div><div class='ctx'>  * caller-allocated output buffer out which must have sufficient size (e.g. by</div><div class='ctx'>  * calling crypto_shash_descsize).</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context.</div><div class='add'>+ * Context: Softirq or process context.</div><div class='ctx'>  * Return: 0 if the export creation was successful; &lt; 0 if an error occurred</div><div class='ctx'>  */</div><div class='ctx'> int crypto_shash_export(struct shash_desc *desc, void *out);</div><div class='hunk'>@@ -889,7 +951,7 @@ int crypto_shash_export(struct shash_desc *desc, void *out);</div><div class='ctx'>  * the input buffer. That buffer should have been generated with the</div><div class='ctx'>  * crypto_ahash_export function.</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context.</div><div class='add'>+ * Context: Softirq or process context.</div><div class='ctx'>  * Return: 0 if the import was successful; &lt; 0 if an error occurred</div><div class='ctx'>  */</div><div class='ctx'> int crypto_shash_import(struct shash_desc *desc, const void *in);</div><div class='hunk'>@@ -902,19 +964,29 @@ int crypto_shash_import(struct shash_desc *desc, const void *in);</div><div class='ctx'>  * operational state handle. Any potentially existing state created by</div><div class='ctx'>  * previous operations is discarded.</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context.</div><div class='add'>+ * Context: Softirq or process context.</div><div class='ctx'>  * Return: 0 if the message digest initialization was successful; &lt; 0 if an</div><div class='ctx'>  *	   error occurred</div><div class='ctx'>  */</div><div class='del'>-static inline int crypto_shash_init(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct crypto_shash *tfm = desc-&gt;tfm;</div><div class='del'>-</div><div class='del'>-	if (crypto_shash_get_flags(tfm) &amp; CRYPTO_TFM_NEED_KEY)</div><div class='del'>-		return -ENOKEY;</div><div class='add'>+int crypto_shash_init(struct shash_desc *desc);</div><div class='ctx'> </div><div class='del'>-	return crypto_shash_alg(tfm)-&gt;init(desc);</div><div class='del'>-}</div><div class='add'>+/**</div><div class='add'>+ * crypto_shash_finup() - calculate message digest of buffer</div><div class='add'>+ * @desc: see crypto_shash_final()</div><div class='add'>+ * @data: see crypto_shash_update()</div><div class='add'>+ * @len: see crypto_shash_update()</div><div class='add'>+ * @out: see crypto_shash_final()</div><div class='add'>+ *</div><div class='add'>+ * This function is a "short-hand" for the function calls of</div><div class='add'>+ * crypto_shash_update and crypto_shash_final. The parameters have the same</div><div class='add'>+ * meaning as discussed for those separate functions.</div><div class='add'>+ *</div><div class='add'>+ * Context: Softirq or process context.</div><div class='add'>+ * Return: 0 if the message digest creation was successful; &lt; 0 if an error</div><div class='add'>+ *	   occurred</div><div class='add'>+ */</div><div class='add'>+int crypto_shash_finup(struct shash_desc *desc, const u8 *data,</div><div class='add'>+		       unsigned int len, u8 *out);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * crypto_shash_update() - add data to message digest for processing</div><div class='hunk'>@@ -924,12 +996,15 @@ static inline int crypto_shash_init(struct shash_desc *desc)</div><div class='ctx'>  *</div><div class='ctx'>  * Updates the message digest state of the operational state handle.</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context.</div><div class='add'>+ * Context: Softirq or process context.</div><div class='ctx'>  * Return: 0 if the message digest update was successful; &lt; 0 if an error</div><div class='ctx'>  *	   occurred</div><div class='ctx'>  */</div><div class='del'>-int crypto_shash_update(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			unsigned int len);</div><div class='add'>+static inline int crypto_shash_update(struct shash_desc *desc, const u8 *data,</div><div class='add'>+				      unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return crypto_shash_finup(desc, data, len, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * crypto_shash_final() - calculate message digest</div><div class='hunk'>@@ -941,29 +1016,14 @@ int crypto_shash_update(struct shash_desc *desc, const u8 *data,</div><div class='ctx'>  * into the output buffer. The caller must ensure that the output buffer is</div><div class='ctx'>  * large enough by using crypto_shash_digestsize.</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context.</div><div class='del'>- * Return: 0 if the message digest creation was successful; &lt; 0 if an error</div><div class='del'>- *	   occurred</div><div class='del'>- */</div><div class='del'>-int crypto_shash_final(struct shash_desc *desc, u8 *out);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * crypto_shash_finup() - calculate message digest of buffer</div><div class='del'>- * @desc: see crypto_shash_final()</div><div class='del'>- * @data: see crypto_shash_update()</div><div class='del'>- * @len: see crypto_shash_update()</div><div class='del'>- * @out: see crypto_shash_final()</div><div class='del'>- *</div><div class='del'>- * This function is a "short-hand" for the function calls of</div><div class='del'>- * crypto_shash_update and crypto_shash_final. The parameters have the same</div><div class='del'>- * meaning as discussed for those separate functions.</div><div class='del'>- *</div><div class='del'>- * Context: Any context.</div><div class='add'>+ * Context: Softirq or process context.</div><div class='ctx'>  * Return: 0 if the message digest creation was successful; &lt; 0 if an error</div><div class='ctx'>  *	   occurred</div><div class='ctx'>  */</div><div class='del'>-int crypto_shash_finup(struct shash_desc *desc, const u8 *data,</div><div class='del'>-		       unsigned int len, u8 *out);</div><div class='add'>+static inline int crypto_shash_final(struct shash_desc *desc, u8 *out)</div><div class='add'>+{</div><div class='add'>+	return crypto_shash_finup(desc, NULL, 0, out);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void shash_desc_zero(struct shash_desc *desc)</div><div class='ctx'> {</div><div class='hunk'>@@ -971,4 +1031,25 @@ static inline void shash_desc_zero(struct shash_desc *desc)</div><div class='ctx'> 			 sizeof(*desc) + crypto_shash_descsize(desc-&gt;tfm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool ahash_is_async(struct crypto_ahash *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_tfm_is_async(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ahash_request *ahash_request_on_stack_init(</div><div class='add'>+	char *buf, struct crypto_ahash *tfm)</div><div class='add'>+{</div><div class='add'>+	struct ahash_request *req = (void *)buf;</div><div class='add'>+</div><div class='add'>+	crypto_stack_request_init(&amp;req-&gt;base, crypto_ahash_tfm(tfm));</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ahash_request *ahash_request_clone(</div><div class='add'>+	struct ahash_request *req, size_t total, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return container_of(crypto_request_clone(&amp;req-&gt;base, total, gfp),</div><div class='add'>+			    struct ahash_request, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* _CRYPTO_HASH_H */</div><div class='head'>diff --git a/include/crypto/hkdf.h b/include/crypto/hkdf.h<br/>new file mode 100644<br/>index 000000000000..6a9678f508f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/hkdf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/hkdf.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * HKDF: HMAC-based Key Derivation Function (HKDF), RFC 5869</div><div class='add'>+ *</div><div class='add'>+ * Extracted from fs/crypto/hkdf.c, which has</div><div class='add'>+ * Copyright 2019 Google LLC</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CRYPTO_HKDF_H</div><div class='add'>+#define _CRYPTO_HKDF_H</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+</div><div class='add'>+int hkdf_extract(struct crypto_shash *hmac_tfm, const u8 *ikm,</div><div class='add'>+		 unsigned int ikmlen, const u8 *salt, unsigned int saltlen,</div><div class='add'>+		 u8 *prk);</div><div class='add'>+int hkdf_expand(struct crypto_shash *hmac_tfm,</div><div class='add'>+		const u8 *info, unsigned int infolen,</div><div class='add'>+		u8 *okm, unsigned int okmlen);</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h<br/>index 78ecaf5db04c..107b797c33ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/if_alg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/if_alg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/if_alg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/if_alg.h</a></div><div class='hunk'>@@ -135,6 +135,7 @@ struct af_alg_async_req {</div><div class='ctx'>  *			SG?</div><div class='ctx'>  * @enc:		Cryptographic operation to be performed when</div><div class='ctx'>  *			recvmsg is invoked.</div><div class='add'>+ * @write:		True if we are in the middle of a write.</div><div class='ctx'>  * @init:		True if metadata has been sent.</div><div class='ctx'>  * @len:		Length of memory allocated for this data structure.</div><div class='ctx'>  * @inflight:		Non-zero when AIO requests are in flight.</div><div class='hunk'>@@ -151,10 +152,11 @@ struct af_alg_ctx {</div><div class='ctx'> 	size_t used;</div><div class='ctx'> 	atomic_t rcvused;</div><div class='ctx'> </div><div class='del'>-	bool more;</div><div class='del'>-	bool merge;</div><div class='del'>-	bool enc;</div><div class='del'>-	bool init;</div><div class='add'>+	bool		more:1,</div><div class='add'>+			merge:1,</div><div class='add'>+			enc:1,</div><div class='add'>+			write:1,</div><div class='add'>+			init:1;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +168,8 @@ int af_alg_unregister_type(const struct af_alg_type *type);</div><div class='ctx'> </div><div class='ctx'> int af_alg_release(struct socket *sock);</div><div class='ctx'> void af_alg_release_parent(struct sock *sk);</div><div class='del'>-int af_alg_accept(struct sock *sk, struct socket *newsock, bool kern);</div><div class='add'>+int af_alg_accept(struct sock *sk, struct socket *newsock,</div><div class='add'>+		  struct proto_accept_arg *arg);</div><div class='ctx'> </div><div class='ctx'> void af_alg_free_sg(struct af_alg_sgl *sgl);</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/internal/acompress.h b/include/crypto/internal/acompress.h<br/>index 4ac46bafba9d..2d97440028ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/acompress.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/acompress.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/acompress.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/acompress.h</a></div><div class='hunk'>@@ -11,13 +11,23 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/acompress.h&gt;</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/workqueue_types.h&gt;</div><div class='add'>+</div><div class='add'>+#define ACOMP_FBREQ_ON_STACK(name, req) \</div><div class='add'>+        char __##name##_req[sizeof(struct acomp_req) + \</div><div class='add'>+                            MAX_SYNC_COMP_REQSIZE] CRYPTO_MINALIGN_ATTR; \</div><div class='add'>+        struct acomp_req *name = acomp_fbreq_on_stack_init( \</div><div class='add'>+                __##name##_req, (req))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct acomp_alg - asynchronous compression algorithm</div><div class='ctx'>  *</div><div class='ctx'>  * @compress:	Function performs a compress operation</div><div class='ctx'>  * @decompress:	Function performs a de-compress operation</div><div class='del'>- * @dst_free:	Frees destination buffer if allocated inside the algorithm</div><div class='ctx'>  * @init:	Initialize the cryptographic transformation object.</div><div class='ctx'>  *		This function is used to initialize the cryptographic</div><div class='ctx'>  *		transformation object. This function is called only once at</div><div class='hunk'>@@ -30,26 +40,67 @@</div><div class='ctx'>  *		counterpart to @init, used to remove various changes set in</div><div class='ctx'>  *		@init.</div><div class='ctx'>  *</div><div class='del'>- * @reqsize:	Context size for (de)compression requests</div><div class='del'>- * @stat:	Statistics for compress algorithm</div><div class='ctx'>  * @base:	Common crypto API algorithm data structure</div><div class='ctx'>  * @calg:	Cmonn algorithm data structure shared with scomp</div><div class='ctx'>  */</div><div class='ctx'> struct acomp_alg {</div><div class='ctx'> 	int (*compress)(struct acomp_req *req);</div><div class='ctx'> 	int (*decompress)(struct acomp_req *req);</div><div class='del'>-	void (*dst_free)(struct scatterlist *dst);</div><div class='ctx'> 	int (*init)(struct crypto_acomp *tfm);</div><div class='ctx'> 	void (*exit)(struct crypto_acomp *tfm);</div><div class='ctx'> </div><div class='del'>-	unsigned int reqsize;</div><div class='del'>-</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct COMP_ALG_COMMON;</div><div class='ctx'> 		struct comp_alg_common calg;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct crypto_acomp_stream {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	void *ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct crypto_acomp_streams {</div><div class='add'>+	/* These must come first because of struct scomp_alg. */</div><div class='add'>+	void *(*alloc_ctx)(void);</div><div class='add'>+	void (*free_ctx)(void *);</div><div class='add'>+</div><div class='add'>+	struct crypto_acomp_stream __percpu *streams;</div><div class='add'>+	struct work_struct stream_work;</div><div class='add'>+	cpumask_t stream_want;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acomp_walk {</div><div class='add'>+	union {</div><div class='add'>+		/* Virtual address of the source. */</div><div class='add'>+		struct {</div><div class='add'>+			struct {</div><div class='add'>+				const void *const addr;</div><div class='add'>+			} virt;</div><div class='add'>+		} src;</div><div class='add'>+</div><div class='add'>+		/* Private field for the API, do not use. */</div><div class='add'>+		struct scatter_walk in;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		/* Virtual address of the destination. */</div><div class='add'>+		struct {</div><div class='add'>+			struct {</div><div class='add'>+				void *const addr;</div><div class='add'>+			} virt;</div><div class='add'>+		} dst;</div><div class='add'>+</div><div class='add'>+		/* Private field for the API, do not use. */</div><div class='add'>+		struct scatter_walk out;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	unsigned int slen;</div><div class='add'>+	unsigned int dlen;</div><div class='add'>+</div><div class='add'>+	int flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Transform internal helpers.</div><div class='ctx'>  */</div><div class='hunk'>@@ -69,21 +120,6 @@ static inline void acomp_request_complete(struct acomp_req *req,</div><div class='ctx'> 	crypto_request_complete(&amp;req-&gt;base, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct acomp_req *__acomp_request_alloc(struct crypto_acomp *tfm)</div><div class='del'>-{</div><div class='del'>-	struct acomp_req *req;</div><div class='del'>-</div><div class='del'>-	req = kzalloc(sizeof(*req) + crypto_acomp_reqsize(tfm), GFP_KERNEL);</div><div class='del'>-	if (likely(req))</div><div class='del'>-		acomp_request_set_tfm(req, tfm);</div><div class='del'>-	return req;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __acomp_request_free(struct acomp_req *req)</div><div class='del'>-{</div><div class='del'>-	kfree_sensitive(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_register_acomp() -- Register asynchronous compression algorithm</div><div class='ctx'>  *</div><div class='hunk'>@@ -109,4 +145,100 @@ void crypto_unregister_acomp(struct acomp_alg *alg);</div><div class='ctx'> int crypto_register_acomps(struct acomp_alg *algs, int count);</div><div class='ctx'> void crypto_unregister_acomps(struct acomp_alg *algs, int count);</div><div class='ctx'> </div><div class='add'>+static inline bool acomp_request_issg(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return !(req-&gt;base.flags &amp; (CRYPTO_ACOMP_REQ_SRC_VIRT |</div><div class='add'>+				    CRYPTO_ACOMP_REQ_DST_VIRT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool acomp_request_src_isvirt(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return req-&gt;base.flags &amp; CRYPTO_ACOMP_REQ_SRC_VIRT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool acomp_request_dst_isvirt(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return req-&gt;base.flags &amp; CRYPTO_ACOMP_REQ_DST_VIRT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool acomp_request_isvirt(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return req-&gt;base.flags &amp; (CRYPTO_ACOMP_REQ_SRC_VIRT |</div><div class='add'>+				  CRYPTO_ACOMP_REQ_DST_VIRT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool acomp_request_src_isnondma(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return req-&gt;base.flags &amp; CRYPTO_ACOMP_REQ_SRC_NONDMA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool acomp_request_dst_isnondma(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return req-&gt;base.flags &amp; CRYPTO_ACOMP_REQ_DST_NONDMA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool acomp_request_isnondma(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return req-&gt;base.flags &amp; (CRYPTO_ACOMP_REQ_SRC_NONDMA |</div><div class='add'>+				  CRYPTO_ACOMP_REQ_DST_NONDMA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool crypto_acomp_req_virt(struct crypto_acomp *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_tfm_req_virt(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void crypto_acomp_free_streams(struct crypto_acomp_streams *s);</div><div class='add'>+int crypto_acomp_alloc_streams(struct crypto_acomp_streams *s);</div><div class='add'>+</div><div class='add'>+struct crypto_acomp_stream *crypto_acomp_lock_stream_bh(</div><div class='add'>+	struct crypto_acomp_streams *s) __acquires(stream);</div><div class='add'>+</div><div class='add'>+static inline void crypto_acomp_unlock_stream_bh(</div><div class='add'>+	struct crypto_acomp_stream *stream) __releases(stream)</div><div class='add'>+{</div><div class='add'>+	spin_unlock_bh(&amp;stream-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void acomp_walk_done_src(struct acomp_walk *walk, int used);</div><div class='add'>+void acomp_walk_done_dst(struct acomp_walk *walk, int used);</div><div class='add'>+int acomp_walk_next_src(struct acomp_walk *walk);</div><div class='add'>+int acomp_walk_next_dst(struct acomp_walk *walk);</div><div class='add'>+int acomp_walk_virt(struct acomp_walk *__restrict walk,</div><div class='add'>+		    struct acomp_req *__restrict req, bool atomic);</div><div class='add'>+</div><div class='add'>+static inline bool acomp_walk_more_src(const struct acomp_walk *walk, int cur)</div><div class='add'>+{</div><div class='add'>+	return walk-&gt;slen != cur;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 acomp_request_flags(struct acomp_req *req)</div><div class='add'>+{</div><div class='add'>+	return crypto_request_flags(&amp;req-&gt;base) &amp; ~CRYPTO_ACOMP_REQ_PRIVATE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct crypto_acomp *crypto_acomp_fb(struct crypto_acomp *tfm)</div><div class='add'>+{</div><div class='add'>+	return __crypto_acomp_tfm(crypto_acomp_tfm(tfm)-&gt;fb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct acomp_req *acomp_fbreq_on_stack_init(</div><div class='add'>+	char *buf, struct acomp_req *old)</div><div class='add'>+{</div><div class='add'>+	struct crypto_acomp *tfm = crypto_acomp_reqtfm(old);</div><div class='add'>+	struct acomp_req *req = (void *)buf;</div><div class='add'>+</div><div class='add'>+	crypto_stack_request_init(&amp;req-&gt;base,</div><div class='add'>+				  crypto_acomp_tfm(crypto_acomp_fb(tfm)));</div><div class='add'>+	acomp_request_set_callback(req, acomp_request_flags(old), NULL, NULL);</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_ACOMP_REQ_PRIVATE;</div><div class='add'>+	req-&gt;base.flags |= old-&gt;base.flags &amp; CRYPTO_ACOMP_REQ_PRIVATE;</div><div class='add'>+	req-&gt;src = old-&gt;src;</div><div class='add'>+	req-&gt;dst = old-&gt;dst;</div><div class='add'>+	req-&gt;slen = old-&gt;slen;</div><div class='add'>+	req-&gt;dlen = old-&gt;dlen;</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/internal/akcipher.h b/include/crypto/internal/akcipher.h<br/>index a0fba4b2eccf..14ee62bc52b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/akcipher.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/akcipher.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/akcipher.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/akcipher.h</a></div><div class='hunk'>@@ -124,7 +124,7 @@ static inline struct akcipher_alg *crypto_spawn_akcipher_alg(</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_register_akcipher() -- Register public key algorithm</div><div class='ctx'>  *</div><div class='del'>- * Function registers an implementation of a public key verify algorithm</div><div class='add'>+ * Function registers an implementation of a public key cipher algorithm</div><div class='ctx'>  *</div><div class='ctx'>  * @alg:	algorithm definition</div><div class='ctx'>  *</div><div class='hunk'>@@ -135,7 +135,7 @@ int crypto_register_akcipher(struct akcipher_alg *alg);</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_unregister_akcipher() -- Unregister public key algorithm</div><div class='ctx'>  *</div><div class='del'>- * Function unregisters an implementation of a public key verify algorithm</div><div class='add'>+ * Function unregisters an implementation of a public key cipher algorithm</div><div class='ctx'>  *</div><div class='ctx'>  * @alg:	algorithm definition</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/crypto/internal/blake2b.h b/include/crypto/internal/blake2b.h<br/>deleted file mode 100644<br/>index 982fe5e8471c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/blake2b.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/blake2b.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,115 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 OR MIT */</div><div class='del'>-/*</div><div class='del'>- * Helper functions for BLAKE2b implementations.</div><div class='del'>- * Keep this in sync with the corresponding BLAKE2s header.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CRYPTO_INTERNAL_BLAKE2B_H</div><div class='del'>-#define _CRYPTO_INTERNAL_BLAKE2B_H</div><div class='del'>-</div><div class='del'>-#include &lt;crypto/blake2b.h&gt;</div><div class='del'>-#include &lt;crypto/internal/hash.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-void blake2b_compress_generic(struct blake2b_state *state,</div><div class='del'>-			      const u8 *block, size_t nblocks, u32 inc);</div><div class='del'>-</div><div class='del'>-static inline void blake2b_set_lastblock(struct blake2b_state *state)</div><div class='del'>-{</div><div class='del'>-	state-&gt;f[0] = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*blake2b_compress_t)(struct blake2b_state *state,</div><div class='del'>-				   const u8 *block, size_t nblocks, u32 inc);</div><div class='del'>-</div><div class='del'>-static inline void __blake2b_update(struct blake2b_state *state,</div><div class='del'>-				    const u8 *in, size_t inlen,</div><div class='del'>-				    blake2b_compress_t compress)</div><div class='del'>-{</div><div class='del'>-	const size_t fill = BLAKE2B_BLOCK_SIZE - state-&gt;buflen;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!inlen))</div><div class='del'>-		return;</div><div class='del'>-	if (inlen &gt; fill) {</div><div class='del'>-		memcpy(state-&gt;buf + state-&gt;buflen, in, fill);</div><div class='del'>-		(*compress)(state, state-&gt;buf, 1, BLAKE2B_BLOCK_SIZE);</div><div class='del'>-		state-&gt;buflen = 0;</div><div class='del'>-		in += fill;</div><div class='del'>-		inlen -= fill;</div><div class='del'>-	}</div><div class='del'>-	if (inlen &gt; BLAKE2B_BLOCK_SIZE) {</div><div class='del'>-		const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2B_BLOCK_SIZE);</div><div class='del'>-		/* Hash one less (full) block than strictly possible */</div><div class='del'>-		(*compress)(state, in, nblocks - 1, BLAKE2B_BLOCK_SIZE);</div><div class='del'>-		in += BLAKE2B_BLOCK_SIZE * (nblocks - 1);</div><div class='del'>-		inlen -= BLAKE2B_BLOCK_SIZE * (nblocks - 1);</div><div class='del'>-	}</div><div class='del'>-	memcpy(state-&gt;buf + state-&gt;buflen, in, inlen);</div><div class='del'>-	state-&gt;buflen += inlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __blake2b_final(struct blake2b_state *state, u8 *out,</div><div class='del'>-				   blake2b_compress_t compress)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	blake2b_set_lastblock(state);</div><div class='del'>-	memset(state-&gt;buf + state-&gt;buflen, 0,</div><div class='del'>-	       BLAKE2B_BLOCK_SIZE - state-&gt;buflen); /* Padding */</div><div class='del'>-	(*compress)(state, state-&gt;buf, 1, state-&gt;buflen);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(state-&gt;h); i++)</div><div class='del'>-		__cpu_to_le64s(&amp;state-&gt;h[i]);</div><div class='del'>-	memcpy(out, state-&gt;h, state-&gt;outlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Helper functions for shash implementations of BLAKE2b */</div><div class='del'>-</div><div class='del'>-struct blake2b_tfm_ctx {</div><div class='del'>-	u8 key[BLAKE2B_KEY_SIZE];</div><div class='del'>-	unsigned int keylen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int crypto_blake2b_setkey(struct crypto_shash *tfm,</div><div class='del'>-					const u8 *key, unsigned int keylen)</div><div class='del'>-{</div><div class='del'>-	struct blake2b_tfm_ctx *tctx = crypto_shash_ctx(tfm);</div><div class='del'>-</div><div class='del'>-	if (keylen == 0 || keylen &gt; BLAKE2B_KEY_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	memcpy(tctx-&gt;key, key, keylen);</div><div class='del'>-	tctx-&gt;keylen = keylen;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int crypto_blake2b_init(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	const struct blake2b_tfm_ctx *tctx = crypto_shash_ctx(desc-&gt;tfm);</div><div class='del'>-	struct blake2b_state *state = shash_desc_ctx(desc);</div><div class='del'>-	unsigned int outlen = crypto_shash_digestsize(desc-&gt;tfm);</div><div class='del'>-</div><div class='del'>-	__blake2b_init(state, outlen, tctx-&gt;key, tctx-&gt;keylen);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int crypto_blake2b_update(struct shash_desc *desc,</div><div class='del'>-					const u8 *in, unsigned int inlen,</div><div class='del'>-					blake2b_compress_t compress)</div><div class='del'>-{</div><div class='del'>-	struct blake2b_state *state = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	__blake2b_update(state, in, inlen, compress);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int crypto_blake2b_final(struct shash_desc *desc, u8 *out,</div><div class='del'>-				       blake2b_compress_t compress)</div><div class='del'>-{</div><div class='del'>-	struct blake2b_state *state = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	__blake2b_final(state, out, compress);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _CRYPTO_INTERNAL_BLAKE2B_H */</div><div class='head'>diff --git a/include/crypto/internal/blake2s.h b/include/crypto/internal/blake2s.h<br/>deleted file mode 100644<br/>index 506d56530ca9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/blake2s.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/blake2s.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 OR MIT */</div><div class='del'>-/*</div><div class='del'>- * Helper functions for BLAKE2s implementations.</div><div class='del'>- * Keep this in sync with the corresponding BLAKE2b header.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CRYPTO_INTERNAL_BLAKE2S_H</div><div class='del'>-#define _CRYPTO_INTERNAL_BLAKE2S_H</div><div class='del'>-</div><div class='del'>-#include &lt;crypto/blake2s.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-void blake2s_compress_generic(struct blake2s_state *state, const u8 *block,</div><div class='del'>-			      size_t nblocks, const u32 inc);</div><div class='del'>-</div><div class='del'>-void blake2s_compress(struct blake2s_state *state, const u8 *block,</div><div class='del'>-		      size_t nblocks, const u32 inc);</div><div class='del'>-</div><div class='del'>-bool blake2s_selftest(void);</div><div class='del'>-</div><div class='del'>-#endif /* _CRYPTO_INTERNAL_BLAKE2S_H */</div><div class='head'>diff --git a/include/crypto/internal/blockhash.h b/include/crypto/internal/blockhash.h<br/>new file mode 100644<br/>index 000000000000..52d9d4c82493<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/blockhash.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/blockhash.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Handle partial blocks for block hash.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='add'>+ * Copyright (c) 2025 Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CRYPTO_INTERNAL_BLOCKHASH_H</div><div class='add'>+#define _CRYPTO_INTERNAL_BLOCKHASH_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define BLOCK_HASH_UPDATE_BASE(block_fn, state, src, nbytes, bs, dv,	\</div><div class='add'>+			       buf, buflen)				\</div><div class='add'>+	({								\</div><div class='add'>+		typeof(block_fn) *_block_fn = &amp;(block_fn);		\</div><div class='add'>+		typeof(state + 0) _state = (state);			\</div><div class='add'>+		unsigned int _buflen = (buflen);			\</div><div class='add'>+		size_t _nbytes = (nbytes);				\</div><div class='add'>+		unsigned int _bs = (bs);				\</div><div class='add'>+		const u8 *_src = (src);					\</div><div class='add'>+		u8 *_buf = (buf);					\</div><div class='add'>+		while ((_buflen + _nbytes) &gt;= _bs) {			\</div><div class='add'>+			const u8 *data = _src;				\</div><div class='add'>+			size_t len = _nbytes;				\</div><div class='add'>+			size_t blocks;					\</div><div class='add'>+			int remain;					\</div><div class='add'>+			if (_buflen) {					\</div><div class='add'>+				remain = _bs - _buflen;			\</div><div class='add'>+				memcpy(_buf + _buflen, _src, remain);	\</div><div class='add'>+				data = _buf;				\</div><div class='add'>+				len = _bs;				\</div><div class='add'>+			}						\</div><div class='add'>+			remain = len % bs;				\</div><div class='add'>+			blocks = (len - remain) / (dv);			\</div><div class='add'>+			(*_block_fn)(_state, data, blocks);		\</div><div class='add'>+			_src += len - remain - _buflen;			\</div><div class='add'>+			_nbytes -= len - remain - _buflen;		\</div><div class='add'>+			_buflen = 0;					\</div><div class='add'>+		}							\</div><div class='add'>+		memcpy(_buf + _buflen, _src, _nbytes);			\</div><div class='add'>+		_buflen += _nbytes;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define BLOCK_HASH_UPDATE(block, state, src, nbytes, bs, buf, buflen) \</div><div class='add'>+	BLOCK_HASH_UPDATE_BASE(block, state, src, nbytes, bs, 1, buf, buflen)</div><div class='add'>+#define BLOCK_HASH_UPDATE_BLOCKS(block, state, src, nbytes, bs, buf, buflen) \</div><div class='add'>+	BLOCK_HASH_UPDATE_BASE(block, state, src, nbytes, bs, bs, buf, buflen)</div><div class='add'>+</div><div class='add'>+#endif	/* _CRYPTO_INTERNAL_BLOCKHASH_H */</div><div class='head'>diff --git a/include/crypto/internal/chacha.h b/include/crypto/internal/chacha.h<br/>deleted file mode 100644<br/>index b085dc1ac151..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/chacha.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/chacha.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-</div><div class='del'>-#ifndef _CRYPTO_INTERNAL_CHACHA_H</div><div class='del'>-#define _CRYPTO_INTERNAL_CHACHA_H</div><div class='del'>-</div><div class='del'>-#include &lt;crypto/chacha.h&gt;</div><div class='del'>-#include &lt;crypto/internal/skcipher.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-</div><div class='del'>-struct chacha_ctx {</div><div class='del'>-	u32 key[8];</div><div class='del'>-	int nrounds;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='del'>-				unsigned int keysize, int nrounds)</div><div class='del'>-{</div><div class='del'>-	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (keysize != CHACHA_KEY_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ctx-&gt;key); i++)</div><div class='del'>-		ctx-&gt;key[i] = get_unaligned_le32(key + i * sizeof(u32));</div><div class='del'>-</div><div class='del'>-	ctx-&gt;nrounds = nrounds;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='del'>-				  unsigned int keysize)</div><div class='del'>-{</div><div class='del'>-	return chacha_setkey(tfm, key, keysize, 20);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,</div><div class='del'>-				  unsigned int keysize)</div><div class='del'>-{</div><div class='del'>-	return chacha_setkey(tfm, key, keysize, 12);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _CRYPTO_CHACHA_H */</div><div class='head'>diff --git a/include/crypto/internal/cryptouser.h b/include/crypto/internal/cryptouser.h<br/>deleted file mode 100644<br/>index fd54074332f5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/cryptouser.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/cryptouser.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#include &lt;linux/cryptouser.h&gt;</div><div class='del'>-#include &lt;net/netlink.h&gt;</div><div class='del'>-</div><div class='del'>-struct crypto_alg *crypto_alg_match(struct crypto_user_alg *p, int exact);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-int crypto_reportstat(struct sk_buff *in_skb, struct nlmsghdr *in_nlh, struct nlattr **attrs);</div><div class='del'>-#else</div><div class='del'>-static inline int crypto_reportstat(struct sk_buff *in_skb,</div><div class='del'>-				    struct nlmsghdr *in_nlh,</div><div class='del'>-				    struct nlattr **attrs)</div><div class='del'>-{</div><div class='del'>-	return -ENOTSUPP;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/crypto/internal/drbg.h b/include/crypto/internal/drbg.h<br/>new file mode 100644<br/>index 000000000000..371e52dcee6c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/drbg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/drbg.h</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NIST SP800-90A DRBG derivation function</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2014, Stephan Mueller &lt;smueller@chronox.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _INTERNAL_DRBG_H</div><div class='add'>+#define _INTERNAL_DRBG_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert an integer into a byte representation of this integer.</div><div class='add'>+ * The byte representation is big-endian</div><div class='add'>+ *</div><div class='add'>+ * @val value to be converted</div><div class='add'>+ * @buf buffer holding the converted integer -- caller must ensure that</div><div class='add'>+ *      buffer size is at least 32 bit</div><div class='add'>+ */</div><div class='add'>+static inline void drbg_cpu_to_be32(__u32 val, unsigned char *buf)</div><div class='add'>+{</div><div class='add'>+	struct s {</div><div class='add'>+		__be32 conv;</div><div class='add'>+	};</div><div class='add'>+	struct s *conversion = (struct s *)buf;</div><div class='add'>+</div><div class='add'>+	conversion-&gt;conv = cpu_to_be32(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Concatenation Helper and string operation helper</div><div class='add'>+ *</div><div class='add'>+ * SP800-90A requires the concatenation of different data. To avoid copying</div><div class='add'>+ * buffers around or allocate additional memory, the following data structure</div><div class='add'>+ * is used to point to the original memory with its size. In addition, it</div><div class='add'>+ * is used to build a linked list. The linked list defines the concatenation</div><div class='add'>+ * of individual buffers. The order of memory block referenced in that</div><div class='add'>+ * linked list determines the order of concatenation.</div><div class='add'>+ */</div><div class='add'>+struct drbg_string {</div><div class='add'>+	const unsigned char *buf;</div><div class='add'>+	size_t len;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void drbg_string_fill(struct drbg_string *string,</div><div class='add'>+				    const unsigned char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	string-&gt;buf = buf;</div><div class='add'>+	string-&gt;len = len;</div><div class='add'>+	INIT_LIST_HEAD(&amp;string-&gt;list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif //_INTERNAL_DRBG_H</div><div class='head'>diff --git a/include/crypto/internal/ecc.h b/include/crypto/internal/ecc.h<br/>index 4f6c1a68882f..57cd75242141 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/ecc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/ecc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/ecc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/ecc.h</a></div><div class='hunk'>@@ -27,13 +27,14 @@</div><div class='ctx'> #define _CRYPTO_ECC_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/ecc_curve.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* One digit is u64 qword. */</div><div class='ctx'> #define ECC_CURVE_NIST_P192_DIGITS  3</div><div class='ctx'> #define ECC_CURVE_NIST_P256_DIGITS  4</div><div class='ctx'> #define ECC_CURVE_NIST_P384_DIGITS  6</div><div class='del'>-#define ECC_MAX_DIGITS              (512 / 64) /* due to ecrdsa */</div><div class='add'>+#define ECC_CURVE_NIST_P521_DIGITS  9</div><div class='add'>+#define ECC_MAX_DIGITS              DIV_ROUND_UP(521, 64) /* NIST P521 */</div><div class='ctx'> </div><div class='ctx'> #define ECC_DIGITS_TO_BYTES_SHIFT 3</div><div class='ctx'> </div><div class='hunk'>@@ -41,6 +42,18 @@</div><div class='ctx'> </div><div class='ctx'> #define ECC_POINT_INIT(x, y, ndigits)	(struct ecc_point) { x, y, ndigits }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The integers r and s making up the signature are expected to be</div><div class='add'>+ * formatted as two consecutive u64 arrays of size ECC_MAX_BYTES.</div><div class='add'>+ * The bytes within each u64 digit are in native endianness,</div><div class='add'>+ * but the order of the u64 digits themselves is little endian.</div><div class='add'>+ * This format allows direct use by internal vli_*() functions.</div><div class='add'>+ */</div><div class='add'>+struct ecdsa_raw_sig {</div><div class='add'>+	u64 r[ECC_MAX_DIGITS];</div><div class='add'>+	u64 s[ECC_MAX_DIGITS];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ecc_swap_digits() - Copy ndigits from big endian array to native array</div><div class='ctx'>  * @in:       Input array</div><div class='hunk'>@@ -57,6 +70,19 @@ static inline void ecc_swap_digits(const void *in, u64 *out, unsigned int ndigit</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ecc_digits_from_bytes() - Create ndigits-sized digits array from byte array</div><div class='add'>+ * @in:       Input byte array</div><div class='add'>+ * @nbytes    Size of input byte array</div><div class='add'>+ * @out       Output digits array</div><div class='add'>+ * @ndigits:  Number of digits to create from byte array</div><div class='add'>+ *</div><div class='add'>+ * The first byte in the input byte array is expected to hold the most</div><div class='add'>+ * significant bits of the large integer.</div><div class='add'>+ */</div><div class='add'>+void ecc_digits_from_bytes(const u8 *in, unsigned int nbytes,</div><div class='add'>+			   u64 *out, unsigned int ndigits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ecc_is_key_valid() - Validate a given ECDH private key</div><div class='ctx'>  *</div><div class='ctx'>  * @curve_id:		id representing the curve to use</div><div class='hunk'>@@ -81,7 +107,8 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,</div><div class='ctx'>  * Returns 0 if the private key was generated successfully, a negative value</div><div class='ctx'>  * if an error occurred.</div><div class='ctx'>  */</div><div class='del'>-int ecc_gen_privkey(unsigned int curve_id, unsigned int ndigits, u64 *privkey);</div><div class='add'>+int ecc_gen_privkey(unsigned int curve_id, unsigned int ndigits,</div><div class='add'>+		    u64 *private_key);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ecc_make_pub_key() - Compute an ECC public key</div><div class='hunk'>@@ -278,4 +305,6 @@ void ecc_point_mult_shamir(const struct ecc_point *result,</div><div class='ctx'> 			   const u64 *y, const struct ecc_point *q,</div><div class='ctx'> 			   const struct ecc_curve *curve);</div><div class='ctx'> </div><div class='add'>+extern struct crypto_template ecdsa_x962_tmpl;</div><div class='add'>+extern struct crypto_template ecdsa_p1363_tmpl;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/internal/engine.h b/include/crypto/internal/engine.h<br/>index fbf4be56cf12..f19ef376833f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/engine.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/engine.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/engine.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/engine.h</a></div><div class='hunk'>@@ -21,24 +21,15 @@ struct device;</div><div class='ctx'> /*</div><div class='ctx'>  * struct crypto_engine - crypto hardware engine</div><div class='ctx'>  * @name: the engine name</div><div class='del'>- * @idling: the engine is entering idle state</div><div class='ctx'>  * @busy: request pump is busy</div><div class='ctx'>  * @running: the engine is on working</div><div class='ctx'>  * @retry_support: indication that the hardware allows re-execution</div><div class='ctx'>  * of a failed backlog request</div><div class='ctx'>  * crypto-engine, in head position to keep order</div><div class='add'>+ * @rt: whether this queue is set to run as a realtime task</div><div class='ctx'>  * @list: link with the global crypto engine list</div><div class='ctx'>  * @queue_lock: spinlock to synchronise access to request queue</div><div class='ctx'>  * @queue: the crypto queue of the engine</div><div class='del'>- * @rt: whether this queue is set to run as a realtime task</div><div class='del'>- * @prepare_crypt_hardware: a request will soon arrive from the queue</div><div class='del'>- * so the subsystem requests the driver to prepare the hardware</div><div class='del'>- * by issuing this call</div><div class='del'>- * @unprepare_crypt_hardware: there are currently no more requests on the</div><div class='del'>- * queue so the subsystem notifies the driver that it may relax the</div><div class='del'>- * hardware by issuing this call</div><div class='del'>- * @do_batch_requests: execute a batch of requests. Depends on multiple</div><div class='del'>- * requests support.</div><div class='ctx'>  * @kworker: kthread worker struct for request pump</div><div class='ctx'>  * @pump_requests: work struct for scheduling work to the request pump</div><div class='ctx'>  * @priv_data: the engine private data</div><div class='hunk'>@@ -46,24 +37,17 @@ struct device;</div><div class='ctx'>  */</div><div class='ctx'> struct crypto_engine {</div><div class='ctx'> 	char			name[ENGINE_NAME_LEN];</div><div class='del'>-	bool			idling;</div><div class='ctx'> 	bool			busy;</div><div class='ctx'> 	bool			running;</div><div class='ctx'> </div><div class='ctx'> 	bool			retry_support;</div><div class='add'>+	bool			rt;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> 	spinlock_t		queue_lock;</div><div class='ctx'> 	struct crypto_queue	queue;</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> </div><div class='del'>-	bool			rt;</div><div class='del'>-</div><div class='del'>-	int (*prepare_crypt_hardware)(struct crypto_engine *engine);</div><div class='del'>-	int (*unprepare_crypt_hardware)(struct crypto_engine *engine);</div><div class='del'>-	int (*do_batch_requests)(struct crypto_engine *engine);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	struct kthread_worker           *kworker;</div><div class='ctx'> 	struct kthread_work             pump_requests;</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/internal/geniv.h b/include/crypto/internal/geniv.h<br/>index 7fd7126f593a..012f5fb22d43 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/geniv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/geniv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/geniv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/geniv.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> struct aead_geniv_ctx {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct crypto_aead *child;</div><div class='del'>-	struct crypto_sync_skcipher *sknull;</div><div class='ctx'> 	u8 salt[] __attribute__ ((aligned(__alignof__(u32))));</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h<br/>index 59c707e4dea4..6ec5f2f37ccb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/hash.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/hash.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/hash.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/hash.h</a></div><div class='hunk'>@@ -11,11 +11,29 @@</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/hash.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Set this bit to handle partial blocks in the API. */</div><div class='add'>+#define CRYPTO_AHASH_ALG_BLOCK_ONLY	0x01000000</div><div class='add'>+</div><div class='add'>+/* Set this bit if final requires at least one byte. */</div><div class='add'>+#define CRYPTO_AHASH_ALG_FINAL_NONZERO	0x02000000</div><div class='add'>+</div><div class='add'>+/* Set this bit if finup can deal with multiple blocks. */</div><div class='add'>+#define CRYPTO_AHASH_ALG_FINUP_MAX	0x04000000</div><div class='add'>+</div><div class='add'>+/* This bit is set by the Crypto API if export_core is not supported. */</div><div class='add'>+#define CRYPTO_AHASH_ALG_NO_EXPORT_CORE	0x08000000</div><div class='add'>+</div><div class='add'>+#define HASH_FBREQ_ON_STACK(name, req) \</div><div class='add'>+        char __##name##_req[sizeof(struct ahash_request) + \</div><div class='add'>+                            MAX_SYNC_HASH_REQSIZE] CRYPTO_MINALIGN_ATTR; \</div><div class='add'>+        struct ahash_request *name = ahash_fbreq_on_stack_init( \</div><div class='add'>+                __##name##_req, (req))</div><div class='add'>+</div><div class='ctx'> struct ahash_request;</div><div class='ctx'> struct scatterlist;</div><div class='ctx'> </div><div class='ctx'> struct crypto_hash_walk {</div><div class='del'>-	char *data;</div><div class='add'>+	const char *data;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> 	unsigned int flags;</div><div class='hunk'>@@ -72,6 +90,7 @@ int crypto_register_ahashes(struct ahash_alg *algs, int count);</div><div class='ctx'> void crypto_unregister_ahashes(struct ahash_alg *algs, int count);</div><div class='ctx'> int ahash_register_instance(struct crypto_template *tmpl,</div><div class='ctx'> 			    struct ahash_instance *inst);</div><div class='add'>+void ahash_free_singlespawn_instance(struct ahash_instance *inst);</div><div class='ctx'> </div><div class='ctx'> int shash_no_setkey(struct crypto_shash *tfm, const u8 *key,</div><div class='ctx'> 		    unsigned int keylen);</div><div class='hunk'>@@ -81,13 +100,25 @@ static inline bool crypto_shash_alg_has_setkey(struct shash_alg *alg)</div><div class='ctx'> 	return alg-&gt;setkey != shash_no_setkey;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool crypto_hash_alg_has_setkey(struct hash_alg_common *halg);</div><div class='add'>+</div><div class='ctx'> static inline bool crypto_shash_alg_needs_key(struct shash_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	return crypto_shash_alg_has_setkey(alg) &amp;&amp;</div><div class='ctx'> 		!(alg-&gt;base.cra_flags &amp; CRYPTO_ALG_OPTIONAL_KEY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool crypto_hash_alg_has_setkey(struct hash_alg_common *halg);</div><div class='add'>+static inline bool crypto_hash_alg_needs_key(struct hash_alg_common *alg)</div><div class='add'>+{</div><div class='add'>+	return crypto_hash_alg_has_setkey(alg) &amp;&amp;</div><div class='add'>+		!(alg-&gt;base.cra_flags &amp; CRYPTO_ALG_OPTIONAL_KEY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool crypto_hash_no_export_core(struct crypto_ahash *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_hash_alg_common(tfm)-&gt;base.cra_flags &amp;</div><div class='add'>+	       CRYPTO_AHASH_ALG_NO_EXPORT_CORE;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int crypto_grab_ahash(struct crypto_ahash_spawn *spawn,</div><div class='ctx'> 		      struct crypto_instance *inst,</div><div class='hunk'>@@ -165,6 +196,13 @@ static inline void crypto_ahash_set_reqsize(struct crypto_ahash *tfm,</div><div class='ctx'> 	tfm-&gt;reqsize = reqsize;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool crypto_ahash_tested(struct crypto_ahash *tfm)</div><div class='add'>+{</div><div class='add'>+	struct crypto_tfm *tfm_base = crypto_ahash_tfm(tfm);</div><div class='add'>+</div><div class='add'>+	return tfm_base-&gt;__crt_alg-&gt;cra_flags &amp; CRYPTO_ALG_TESTED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void crypto_ahash_set_reqsize_dma(struct crypto_ahash *ahash,</div><div class='ctx'> 						unsigned int reqsize)</div><div class='ctx'> {</div><div class='hunk'>@@ -212,7 +250,7 @@ static inline void ahash_request_complete(struct ahash_request *req, int err)</div><div class='ctx'> </div><div class='ctx'> static inline u32 ahash_request_flags(struct ahash_request *req)</div><div class='ctx'> {</div><div class='del'>-	return req-&gt;base.flags;</div><div class='add'>+	return crypto_request_flags(&amp;req-&gt;base) &amp; ~CRYPTO_AHASH_REQ_PRIVATE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct crypto_ahash *crypto_spawn_ahash(</div><div class='hunk'>@@ -272,5 +310,96 @@ static inline struct crypto_shash *__crypto_shash_cast(struct crypto_tfm *tfm)</div><div class='ctx'> 	return container_of(tfm, struct crypto_shash, base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool ahash_request_isvirt(struct ahash_request *req)</div><div class='add'>+{</div><div class='add'>+	return req-&gt;base.flags &amp; CRYPTO_AHASH_REQ_VIRT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool crypto_ahash_req_virt(struct crypto_ahash *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_tfm_req_virt(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct crypto_ahash *crypto_ahash_fb(struct crypto_ahash *tfm)</div><div class='add'>+{</div><div class='add'>+	return __crypto_ahash_cast(crypto_ahash_tfm(tfm)-&gt;fb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ahash_request *ahash_fbreq_on_stack_init(</div><div class='add'>+	char *buf, struct ahash_request *old)</div><div class='add'>+{</div><div class='add'>+	struct crypto_ahash *tfm = crypto_ahash_reqtfm(old);</div><div class='add'>+	struct ahash_request *req = (void *)buf;</div><div class='add'>+</div><div class='add'>+	crypto_stack_request_init(&amp;req-&gt;base,</div><div class='add'>+				  crypto_ahash_tfm(crypto_ahash_fb(tfm)));</div><div class='add'>+	ahash_request_set_callback(req, ahash_request_flags(old), NULL, NULL);</div><div class='add'>+	req-&gt;base.flags &amp;= ~CRYPTO_AHASH_REQ_PRIVATE;</div><div class='add'>+	req-&gt;base.flags |= old-&gt;base.flags &amp; CRYPTO_AHASH_REQ_PRIVATE;</div><div class='add'>+	req-&gt;src = old-&gt;src;</div><div class='add'>+	req-&gt;result = old-&gt;result;</div><div class='add'>+	req-&gt;nbytes = old-&gt;nbytes;</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return the state size without partial block for block-only algorithms. */</div><div class='add'>+static inline unsigned int crypto_shash_coresize(struct crypto_shash *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_shash_statesize(tfm) - crypto_shash_blocksize(tfm) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This can only be used if the request was never cloned. */</div><div class='add'>+#define HASH_REQUEST_ZERO(name) \</div><div class='add'>+	memzero_explicit(__##name##_req, sizeof(__##name##_req))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crypto_ahash_export_core() - extract core state for message digest</div><div class='add'>+ * @req: reference to the ahash_request handle whose state is exported</div><div class='add'>+ * @out: output buffer of sufficient size that can hold the hash state</div><div class='add'>+ *</div><div class='add'>+ * Export the hash state without the partial block buffer.</div><div class='add'>+ *</div><div class='add'>+ * Context: Softirq or process context.</div><div class='add'>+ * Return: 0 if the export creation was successful; &lt; 0 if an error occurred</div><div class='add'>+ */</div><div class='add'>+int crypto_ahash_export_core(struct ahash_request *req, void *out);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crypto_ahash_import_core() - import core state</div><div class='add'>+ * @req: reference to ahash_request handle the state is imported into</div><div class='add'>+ * @in: buffer holding the state</div><div class='add'>+ *</div><div class='add'>+ * Import the hash state without the partial block buffer.</div><div class='add'>+ *</div><div class='add'>+ * Context: Softirq or process context.</div><div class='add'>+ * Return: 0 if the import was successful; &lt; 0 if an error occurred</div><div class='add'>+ */</div><div class='add'>+int crypto_ahash_import_core(struct ahash_request *req, const void *in);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crypto_shash_export_core() - extract core state for message digest</div><div class='add'>+ * @desc: reference to the operational state handle whose state is exported</div><div class='add'>+ * @out: output buffer of sufficient size that can hold the hash state</div><div class='add'>+ *</div><div class='add'>+ * Export the hash state without the partial block buffer.</div><div class='add'>+ *</div><div class='add'>+ * Context: Softirq or process context.</div><div class='add'>+ * Return: 0 if the export creation was successful; &lt; 0 if an error occurred</div><div class='add'>+ */</div><div class='add'>+int crypto_shash_export_core(struct shash_desc *desc, void *out);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crypto_shash_import_core() - import core state</div><div class='add'>+ * @desc: reference to the operational state handle the state imported into</div><div class='add'>+ * @in: buffer holding the state</div><div class='add'>+ *</div><div class='add'>+ * Import the hash state without the partial block buffer.</div><div class='add'>+ *</div><div class='add'>+ * Context: Softirq or process context.</div><div class='add'>+ * Return: 0 if the import was successful; &lt; 0 if an error occurred</div><div class='add'>+ */</div><div class='add'>+int crypto_shash_import_core(struct shash_desc *desc, const void *in);</div><div class='add'>+</div><div class='ctx'> #endif	/* _CRYPTO_INTERNAL_HASH_H */</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/internal/poly1305.h b/include/crypto/internal/poly1305.h<br/>index 196aa769f296..a72fff409ab8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/poly1305.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/poly1305.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/poly1305.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/poly1305.h</a></div><div class='hunk'>@@ -6,9 +6,8 @@</div><div class='ctx'> #ifndef _CRYPTO_INTERNAL_POLY1305_H</div><div class='ctx'> #define _CRYPTO_INTERNAL_POLY1305_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;crypto/poly1305.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Poly1305 core functions.  These only accept whole blocks; the caller must</div><div class='hunk'>@@ -31,4 +30,27 @@ void poly1305_core_blocks(struct poly1305_state *state,</div><div class='ctx'> void poly1305_core_emit(const struct poly1305_state *state, const u32 nonce[4],</div><div class='ctx'> 			void *dst);</div><div class='ctx'> </div><div class='add'>+static inline void</div><div class='add'>+poly1305_block_init_generic(struct poly1305_block_state *desc,</div><div class='add'>+			    const u8 raw_key[POLY1305_BLOCK_SIZE])</div><div class='add'>+{</div><div class='add'>+	poly1305_core_init(&amp;desc-&gt;h);</div><div class='add'>+	poly1305_core_setkey(&amp;desc-&gt;core_r, raw_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void poly1305_blocks_generic(struct poly1305_block_state *state,</div><div class='add'>+					   const u8 *src, unsigned int len,</div><div class='add'>+					   u32 padbit)</div><div class='add'>+{</div><div class='add'>+	poly1305_core_blocks(&amp;state-&gt;h, &amp;state-&gt;core_r, src,</div><div class='add'>+			     len / POLY1305_BLOCK_SIZE, padbit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void poly1305_emit_generic(const struct poly1305_state *state,</div><div class='add'>+					 u8 digest[POLY1305_DIGEST_SIZE],</div><div class='add'>+					 const u32 nonce[4])</div><div class='add'>+{</div><div class='add'>+	poly1305_core_emit(state, nonce, digest);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/internal/rsa.h b/include/crypto/internal/rsa.h<br/>index e870133f4b77..071a1951b992 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/rsa.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/rsa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/rsa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/rsa.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #ifndef _RSA_HELPER_</div><div class='ctx'> #define _RSA_HELPER_</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;crypto/akcipher.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * rsa_key - RSA key structure</div><div class='hunk'>@@ -53,5 +54,33 @@ int rsa_parse_pub_key(struct rsa_key *rsa_key, const void *key,</div><div class='ctx'> int rsa_parse_priv_key(struct rsa_key *rsa_key, const void *key,</div><div class='ctx'> 		       unsigned int key_len);</div><div class='ctx'> </div><div class='add'>+#define RSA_PUB (true)</div><div class='add'>+#define RSA_PRIV (false)</div><div class='add'>+</div><div class='add'>+static inline int rsa_set_key(struct crypto_akcipher *child,</div><div class='add'>+			      unsigned int *key_size, bool is_pubkey,</div><div class='add'>+			      const void *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	*key_size = 0;</div><div class='add'>+</div><div class='add'>+	if (is_pubkey)</div><div class='add'>+		err = crypto_akcipher_set_pub_key(child, key, keylen);</div><div class='add'>+	else</div><div class='add'>+		err = crypto_akcipher_set_priv_key(child, key, keylen);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Find out new modulus size from rsa implementation */</div><div class='add'>+	err = crypto_akcipher_maxsize(child);</div><div class='add'>+	if (err &gt; PAGE_SIZE)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	*key_size = err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern struct crypto_template rsa_pkcs1pad_tmpl;</div><div class='add'>+extern struct crypto_template rsassa_pkcs1_tmpl;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/internal/scompress.h b/include/crypto/internal/scompress.h<br/>index 858fe3965ae3..6a2c5f2e90f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/scompress.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/scompress.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/scompress.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/scompress.h</a></div><div class='hunk'>@@ -9,12 +9,7 @@</div><div class='ctx'> #ifndef _CRYPTO_SCOMP_INT_H</div><div class='ctx'> #define _CRYPTO_SCOMP_INT_H</div><div class='ctx'> </div><div class='del'>-#include &lt;crypto/acompress.h&gt;</div><div class='del'>-#include &lt;crypto/algapi.h&gt;</div><div class='del'>-</div><div class='del'>-#define SCOMP_SCRATCH_SIZE	131072</div><div class='del'>-</div><div class='del'>-struct acomp_req;</div><div class='add'>+#include &lt;crypto/internal/acompress.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct crypto_scomp {</div><div class='ctx'> 	struct crypto_tfm base;</div><div class='hunk'>@@ -23,17 +18,12 @@ struct crypto_scomp {</div><div class='ctx'> /**</div><div class='ctx'>  * struct scomp_alg - synchronous compression algorithm</div><div class='ctx'>  *</div><div class='del'>- * @alloc_ctx:	Function allocates algorithm specific context</div><div class='del'>- * @free_ctx:	Function frees context allocated with alloc_ctx</div><div class='ctx'>  * @compress:	Function performs a compress operation</div><div class='ctx'>  * @decompress:	Function performs a de-compress operation</div><div class='del'>- * @stat:	Statistics for compress algorithm</div><div class='del'>- * @base:	Common crypto API algorithm data structure</div><div class='add'>+ * @streams:	Per-cpu memory for algorithm</div><div class='ctx'>  * @calg:	Cmonn algorithm data structure shared with acomp</div><div class='ctx'>  */</div><div class='ctx'> struct scomp_alg {</div><div class='del'>-	void *(*alloc_ctx)(struct crypto_scomp *tfm);</div><div class='del'>-	void (*free_ctx)(struct crypto_scomp *tfm, void *ctx);</div><div class='ctx'> 	int (*compress)(struct crypto_scomp *tfm, const u8 *src,</div><div class='ctx'> 			unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='ctx'> 			void *ctx);</div><div class='hunk'>@@ -41,6 +31,8 @@ struct scomp_alg {</div><div class='ctx'> 			  unsigned int slen, u8 *dst, unsigned int *dlen,</div><div class='ctx'> 			  void *ctx);</div><div class='ctx'> </div><div class='add'>+	struct crypto_acomp_streams streams;</div><div class='add'>+</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct COMP_ALG_COMMON;</div><div class='ctx'> 		struct comp_alg_common calg;</div><div class='hunk'>@@ -72,17 +64,6 @@ static inline struct scomp_alg *crypto_scomp_alg(struct crypto_scomp *tfm)</div><div class='ctx'> 	return __crypto_scomp_alg(crypto_scomp_tfm(tfm)-&gt;__crt_alg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *crypto_scomp_alloc_ctx(struct crypto_scomp *tfm)</div><div class='del'>-{</div><div class='del'>-	return crypto_scomp_alg(tfm)-&gt;alloc_ctx(tfm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void crypto_scomp_free_ctx(struct crypto_scomp *tfm,</div><div class='del'>-					 void *ctx)</div><div class='del'>-{</div><div class='del'>-	return crypto_scomp_alg(tfm)-&gt;free_ctx(tfm, ctx);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int crypto_scomp_compress(struct crypto_scomp *tfm,</div><div class='ctx'> 					const u8 *src, unsigned int slen,</div><div class='ctx'> 					u8 *dst, unsigned int *dlen, void *ctx)</div><div class='head'>diff --git a/include/crypto/internal/sig.h b/include/crypto/internal/sig.h<br/>index 97cb26ef8115..b16648c1a986 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/sig.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/sig.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/sig.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/sig.h</a></div><div class='hunk'>@@ -10,8 +10,88 @@</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/sig.h&gt;</div><div class='ctx'> </div><div class='add'>+struct sig_instance {</div><div class='add'>+	void (*free)(struct sig_instance *inst);</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			char head[offsetof(struct sig_alg, base)];</div><div class='add'>+			struct crypto_instance base;</div><div class='add'>+		};</div><div class='add'>+		struct sig_alg alg;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct crypto_sig_spawn {</div><div class='add'>+	struct crypto_spawn base;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline void *crypto_sig_ctx(struct crypto_sig *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	return crypto_tfm_ctx(&amp;tfm-&gt;base);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crypto_register_sig() -- Register public key signature algorithm</div><div class='add'>+ *</div><div class='add'>+ * Function registers an implementation of a public key signature algorithm</div><div class='add'>+ *</div><div class='add'>+ * @alg:	algorithm definition</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success; error code in case of error</div><div class='add'>+ */</div><div class='add'>+int crypto_register_sig(struct sig_alg *alg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crypto_unregister_sig() -- Unregister public key signature algorithm</div><div class='add'>+ *</div><div class='add'>+ * Function unregisters an implementation of a public key signature algorithm</div><div class='add'>+ *</div><div class='add'>+ * @alg:	algorithm definition</div><div class='add'>+ */</div><div class='add'>+void crypto_unregister_sig(struct sig_alg *alg);</div><div class='add'>+</div><div class='add'>+int sig_register_instance(struct crypto_template *tmpl,</div><div class='add'>+			  struct sig_instance *inst);</div><div class='add'>+</div><div class='add'>+static inline struct sig_instance *sig_instance(struct crypto_instance *inst)</div><div class='add'>+{</div><div class='add'>+	return container_of(&amp;inst-&gt;alg, struct sig_instance, alg.base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sig_instance *sig_alg_instance(struct crypto_sig *tfm)</div><div class='add'>+{</div><div class='add'>+	return sig_instance(crypto_tfm_alg_instance(&amp;tfm-&gt;base));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct crypto_instance *sig_crypto_instance(struct sig_instance</div><div class='add'>+									*inst)</div><div class='add'>+{</div><div class='add'>+	return container_of(&amp;inst-&gt;alg.base, struct crypto_instance, alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *sig_instance_ctx(struct sig_instance *inst)</div><div class='add'>+{</div><div class='add'>+	return crypto_instance_ctx(sig_crypto_instance(inst));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int crypto_grab_sig(struct crypto_sig_spawn *spawn,</div><div class='add'>+		    struct crypto_instance *inst,</div><div class='add'>+		    const char *name, u32 type, u32 mask);</div><div class='add'>+</div><div class='add'>+static inline struct crypto_sig *crypto_spawn_sig(struct crypto_sig_spawn</div><div class='add'>+								   *spawn)</div><div class='add'>+{</div><div class='add'>+	return crypto_spawn_tfm2(&amp;spawn-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void crypto_drop_sig(struct crypto_sig_spawn *spawn)</div><div class='add'>+{</div><div class='add'>+	crypto_drop_spawn(&amp;spawn-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sig_alg *crypto_spawn_sig_alg(struct crypto_sig_spawn</div><div class='add'>+								    *spawn)</div><div class='add'>+{</div><div class='add'>+	return container_of(spawn-&gt;base.alg, struct sig_alg, base);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/internal/simd.h b/include/crypto/internal/simd.h<br/>index d2316242a988..9e338e7aafbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/simd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/simd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/simd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/simd.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #ifndef _CRYPTO_INTERNAL_SIMD_H</div><div class='ctx'> #define _CRYPTO_INTERNAL_SIMD_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/simd.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -14,11 +15,10 @@</div><div class='ctx'> struct simd_skcipher_alg;</div><div class='ctx'> struct skcipher_alg;</div><div class='ctx'> </div><div class='del'>-struct simd_skcipher_alg *simd_skcipher_create_compat(const char *algname,</div><div class='add'>+struct simd_skcipher_alg *simd_skcipher_create_compat(struct skcipher_alg *ialg,</div><div class='add'>+						      const char *algname,</div><div class='ctx'> 						      const char *drvname,</div><div class='ctx'> 						      const char *basename);</div><div class='del'>-struct simd_skcipher_alg *simd_skcipher_create(const char *algname,</div><div class='del'>-					       const char *basename);</div><div class='ctx'> void simd_skcipher_free(struct simd_skcipher_alg *alg);</div><div class='ctx'> </div><div class='ctx'> int simd_register_skciphers_compat(struct skcipher_alg *algs, int count,</div><div class='hunk'>@@ -32,13 +32,6 @@ void simd_unregister_skciphers(struct skcipher_alg *algs, int count,</div><div class='ctx'> struct simd_aead_alg;</div><div class='ctx'> struct aead_alg;</div><div class='ctx'> </div><div class='del'>-struct simd_aead_alg *simd_aead_create_compat(const char *algname,</div><div class='del'>-					      const char *drvname,</div><div class='del'>-					      const char *basename);</div><div class='del'>-struct simd_aead_alg *simd_aead_create(const char *algname,</div><div class='del'>-				       const char *basename);</div><div class='del'>-void simd_aead_free(struct simd_aead_alg *alg);</div><div class='del'>-</div><div class='ctx'> int simd_register_aeads_compat(struct aead_alg *algs, int count,</div><div class='ctx'> 			       struct simd_aead_alg **simd_algs);</div><div class='ctx'> </div><div class='hunk'>@@ -52,13 +45,10 @@ void simd_unregister_aeads(struct aead_alg *algs, int count,</div><div class='ctx'>  * This delegates to may_use_simd(), except that this also returns false if SIMD</div><div class='ctx'>  * in crypto code has been temporarily disabled on this CPU by the crypto</div><div class='ctx'>  * self-tests, in order to test the no-SIMD fallback code.  This override is</div><div class='del'>- * currently limited to configurations where the extra self-tests are enabled,</div><div class='del'>- * because it might be a bit too invasive to be part of the regular self-tests.</div><div class='del'>- *</div><div class='del'>- * This is a macro so that &lt;asm/simd.h&gt;, which some architectures don't have,</div><div class='del'>- * doesn't have to be included directly here.</div><div class='add'>+ * currently limited to configurations where the "full" self-tests are enabled,</div><div class='add'>+ * because it might be a bit too invasive to be part of the "fast" self-tests.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS</div><div class='add'>+#ifdef CONFIG_CRYPTO_SELFTESTS_FULL</div><div class='ctx'> DECLARE_PER_CPU(bool, crypto_simd_disabled_for_test);</div><div class='ctx'> #define crypto_simd_usable() \</div><div class='ctx'> 	(may_use_simd() &amp;&amp; !this_cpu_read(crypto_simd_disabled_for_test))</div><div class='head'>diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h<br/>index 7ae42afdcf3e..0cad8e7364c8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/skcipher.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/internal/skcipher.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/internal/skcipher.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/internal/skcipher.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;crypto/algapi.h&gt;</div><div class='ctx'> #include &lt;crypto/internal/cipher.h&gt;</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -57,25 +56,32 @@ struct crypto_lskcipher_spawn {</div><div class='ctx'> </div><div class='ctx'> struct skcipher_walk {</div><div class='ctx'> 	union {</div><div class='add'>+		/* Virtual address of the source. */</div><div class='ctx'> 		struct {</div><div class='del'>-			struct page *page;</div><div class='del'>-			unsigned long offset;</div><div class='del'>-		} phys;</div><div class='add'>+			struct {</div><div class='add'>+				const void *const addr;</div><div class='add'>+			} virt;</div><div class='add'>+		} src;</div><div class='ctx'> </div><div class='add'>+		/* Private field for the API, do not use. */</div><div class='add'>+		struct scatter_walk in;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		/* Virtual address of the destination. */</div><div class='ctx'> 		struct {</div><div class='del'>-			u8 *page;</div><div class='del'>-			void *addr;</div><div class='del'>-		} virt;</div><div class='del'>-	} src, dst;</div><div class='add'>+			struct {</div><div class='add'>+				void *const addr;</div><div class='add'>+			} virt;</div><div class='add'>+		} dst;</div><div class='ctx'> </div><div class='del'>-	struct scatter_walk in;</div><div class='del'>-	unsigned int nbytes;</div><div class='add'>+		/* Private field for the API, do not use. */</div><div class='add'>+		struct scatter_walk out;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	struct scatter_walk out;</div><div class='add'>+	unsigned int nbytes;</div><div class='ctx'> 	unsigned int total;</div><div class='ctx'> </div><div class='del'>-	struct list_head buffers;</div><div class='del'>-</div><div class='ctx'> 	u8 *page;</div><div class='ctx'> 	u8 *buffer;</div><div class='ctx'> 	u8 *oiv;</div><div class='hunk'>@@ -205,17 +211,16 @@ void crypto_unregister_lskciphers(struct lskcipher_alg *algs, int count);</div><div class='ctx'> int lskcipher_register_instance(struct crypto_template *tmpl,</div><div class='ctx'> 				struct lskcipher_instance *inst);</div><div class='ctx'> </div><div class='del'>-int skcipher_walk_done(struct skcipher_walk *walk, int err);</div><div class='del'>-int skcipher_walk_virt(struct skcipher_walk *walk,</div><div class='del'>-		       struct skcipher_request *req,</div><div class='add'>+int skcipher_walk_done(struct skcipher_walk *walk, int res);</div><div class='add'>+int skcipher_walk_virt(struct skcipher_walk *__restrict walk,</div><div class='add'>+		       struct skcipher_request *__restrict req,</div><div class='ctx'> 		       bool atomic);</div><div class='del'>-int skcipher_walk_async(struct skcipher_walk *walk,</div><div class='del'>-			struct skcipher_request *req);</div><div class='del'>-int skcipher_walk_aead_encrypt(struct skcipher_walk *walk,</div><div class='del'>-			       struct aead_request *req, bool atomic);</div><div class='del'>-int skcipher_walk_aead_decrypt(struct skcipher_walk *walk,</div><div class='del'>-			       struct aead_request *req, bool atomic);</div><div class='del'>-void skcipher_walk_complete(struct skcipher_walk *walk, int err);</div><div class='add'>+int skcipher_walk_aead_encrypt(struct skcipher_walk *__restrict walk,</div><div class='add'>+			       struct aead_request *__restrict req,</div><div class='add'>+			       bool atomic);</div><div class='add'>+int skcipher_walk_aead_decrypt(struct skcipher_walk *__restrict walk,</div><div class='add'>+			       struct aead_request *__restrict req,</div><div class='add'>+			       bool atomic);</div><div class='ctx'> </div><div class='ctx'> static inline void skcipher_walk_abort(struct skcipher_walk *walk)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/crypto/kpp.h b/include/crypto/kpp.h<br/>index 1988e24a0d1d..2d9c4de57b69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/kpp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/kpp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/kpp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/kpp.h</a></div><div class='hunk'>@@ -51,20 +51,6 @@ struct crypto_kpp {</div><div class='ctx'> 	struct crypto_tfm base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct crypto_istat_kpp - statistics for KPP algorithm</div><div class='del'>- * @setsecret_cnt:		number of setsecrey operation</div><div class='del'>- * @generate_public_key_cnt:	number of generate_public_key operation</div><div class='del'>- * @compute_shared_secret_cnt:	number of compute_shared_secret operation</div><div class='del'>- * @err_cnt:			number of error for KPP requests</div><div class='del'>- */</div><div class='del'>-struct crypto_istat_kpp {</div><div class='del'>-	atomic64_t setsecret_cnt;</div><div class='del'>-	atomic64_t generate_public_key_cnt;</div><div class='del'>-	atomic64_t compute_shared_secret_cnt;</div><div class='del'>-	atomic64_t err_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct kpp_alg - generic key-agreement protocol primitives</div><div class='ctx'>  *</div><div class='hunk'>@@ -87,7 +73,6 @@ struct crypto_istat_kpp {</div><div class='ctx'>  * @exit:		Undo everything @init did.</div><div class='ctx'>  *</div><div class='ctx'>  * @base:		Common crypto API algorithm data structure</div><div class='del'>- * @stat:		Statistics for KPP algorithm</div><div class='ctx'>  */</div><div class='ctx'> struct kpp_alg {</div><div class='ctx'> 	int (*set_secret)(struct crypto_kpp *tfm, const void *buffer,</div><div class='hunk'>@@ -100,10 +85,6 @@ struct kpp_alg {</div><div class='ctx'> 	int (*init)(struct crypto_kpp *tfm);</div><div class='ctx'> 	void (*exit)(struct crypto_kpp *tfm);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	struct crypto_istat_kpp stat;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	struct crypto_alg base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -291,26 +272,6 @@ struct kpp_secret {</div><div class='ctx'> 	unsigned short len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct crypto_istat_kpp *kpp_get_stat(struct kpp_alg *alg)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	return &amp;alg-&gt;stat;</div><div class='del'>-#else</div><div class='del'>-	return NULL;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int crypto_kpp_errstat(struct kpp_alg *alg, int err)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (err &amp;&amp; err != -EINPROGRESS &amp;&amp; err != -EBUSY)</div><div class='del'>-		atomic64_inc(&amp;kpp_get_stat(alg)-&gt;err_cnt);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_kpp_set_secret() - Invoke kpp operation</div><div class='ctx'>  *</div><div class='hunk'>@@ -329,12 +290,7 @@ static inline int crypto_kpp_errstat(struct kpp_alg *alg, int err)</div><div class='ctx'> static inline int crypto_kpp_set_secret(struct crypto_kpp *tfm,</div><div class='ctx'> 					const void *buffer, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct kpp_alg *alg = crypto_kpp_alg(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		atomic64_inc(&amp;kpp_get_stat(alg)-&gt;setsecret_cnt);</div><div class='del'>-</div><div class='del'>-	return crypto_kpp_errstat(alg, alg-&gt;set_secret(tfm, buffer, len));</div><div class='add'>+	return crypto_kpp_alg(tfm)-&gt;set_secret(tfm, buffer, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -353,12 +309,8 @@ static inline int crypto_kpp_set_secret(struct crypto_kpp *tfm,</div><div class='ctx'> static inline int crypto_kpp_generate_public_key(struct kpp_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);</div><div class='del'>-	struct kpp_alg *alg = crypto_kpp_alg(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		atomic64_inc(&amp;kpp_get_stat(alg)-&gt;generate_public_key_cnt);</div><div class='ctx'> </div><div class='del'>-	return crypto_kpp_errstat(alg, alg-&gt;generate_public_key(req));</div><div class='add'>+	return crypto_kpp_alg(tfm)-&gt;generate_public_key(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -374,12 +326,8 @@ static inline int crypto_kpp_generate_public_key(struct kpp_request *req)</div><div class='ctx'> static inline int crypto_kpp_compute_shared_secret(struct kpp_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);</div><div class='del'>-	struct kpp_alg *alg = crypto_kpp_alg(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		atomic64_inc(&amp;kpp_get_stat(alg)-&gt;compute_shared_secret_cnt);</div><div class='ctx'> </div><div class='del'>-	return crypto_kpp_errstat(alg, alg-&gt;compute_shared_secret(req));</div><div class='add'>+	return crypto_kpp_alg(tfm)-&gt;compute_shared_secret(req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/crypto/krb5.h b/include/crypto/krb5.h<br/>new file mode 100644<br/>index 000000000000..71dd38f59be1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/krb5.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/krb5.h</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* Kerberos 5 crypto</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CRYPTO_KRB5_H</div><div class='add'>+#define _CRYPTO_KRB5_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;crypto/aead.h&gt;</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+</div><div class='add'>+struct crypto_shash;</div><div class='add'>+struct scatterlist;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Per Kerberos v5 protocol spec crypto types from the wire.  These get mapped</div><div class='add'>+ * to linux kernel crypto routines.</div><div class='add'>+ */</div><div class='add'>+#define KRB5_ENCTYPE_NULL			0x0000</div><div class='add'>+#define KRB5_ENCTYPE_DES_CBC_CRC		0x0001	/* DES cbc mode with CRC-32 */</div><div class='add'>+#define KRB5_ENCTYPE_DES_CBC_MD4		0x0002	/* DES cbc mode with RSA-MD4 */</div><div class='add'>+#define KRB5_ENCTYPE_DES_CBC_MD5		0x0003	/* DES cbc mode with RSA-MD5 */</div><div class='add'>+#define KRB5_ENCTYPE_DES_CBC_RAW		0x0004	/* DES cbc mode raw */</div><div class='add'>+/* XXX deprecated? */</div><div class='add'>+#define KRB5_ENCTYPE_DES3_CBC_SHA		0x0005	/* DES-3 cbc mode with NIST-SHA */</div><div class='add'>+#define KRB5_ENCTYPE_DES3_CBC_RAW		0x0006	/* DES-3 cbc mode raw */</div><div class='add'>+#define KRB5_ENCTYPE_DES_HMAC_SHA1		0x0008</div><div class='add'>+#define KRB5_ENCTYPE_DES3_CBC_SHA1		0x0010</div><div class='add'>+#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96	0x0011</div><div class='add'>+#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96	0x0012</div><div class='add'>+#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA256_128	0x0013</div><div class='add'>+#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA384_192	0x0014</div><div class='add'>+#define KRB5_ENCTYPE_ARCFOUR_HMAC		0x0017</div><div class='add'>+#define KRB5_ENCTYPE_ARCFOUR_HMAC_EXP		0x0018</div><div class='add'>+#define KRB5_ENCTYPE_CAMELLIA128_CTS_CMAC	0x0019</div><div class='add'>+#define KRB5_ENCTYPE_CAMELLIA256_CTS_CMAC	0x001a</div><div class='add'>+#define KRB5_ENCTYPE_UNKNOWN			0x01ff</div><div class='add'>+</div><div class='add'>+#define KRB5_CKSUMTYPE_CRC32			0x0001</div><div class='add'>+#define KRB5_CKSUMTYPE_RSA_MD4			0x0002</div><div class='add'>+#define KRB5_CKSUMTYPE_RSA_MD4_DES		0x0003</div><div class='add'>+#define KRB5_CKSUMTYPE_DESCBC			0x0004</div><div class='add'>+#define KRB5_CKSUMTYPE_RSA_MD5			0x0007</div><div class='add'>+#define KRB5_CKSUMTYPE_RSA_MD5_DES		0x0008</div><div class='add'>+#define KRB5_CKSUMTYPE_NIST_SHA			0x0009</div><div class='add'>+#define KRB5_CKSUMTYPE_HMAC_SHA1_DES3		0x000c</div><div class='add'>+#define KRB5_CKSUMTYPE_HMAC_SHA1_96_AES128	0x000f</div><div class='add'>+#define KRB5_CKSUMTYPE_HMAC_SHA1_96_AES256	0x0010</div><div class='add'>+#define KRB5_CKSUMTYPE_CMAC_CAMELLIA128		0x0011</div><div class='add'>+#define KRB5_CKSUMTYPE_CMAC_CAMELLIA256		0x0012</div><div class='add'>+#define KRB5_CKSUMTYPE_HMAC_SHA256_128_AES128	0x0013</div><div class='add'>+#define KRB5_CKSUMTYPE_HMAC_SHA384_192_AES256	0x0014</div><div class='add'>+#define KRB5_CKSUMTYPE_HMAC_MD5_ARCFOUR		-138 /* Microsoft md5 hmac cksumtype */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Constants used for key derivation</div><div class='add'>+ */</div><div class='add'>+/* from rfc3961 */</div><div class='add'>+#define KEY_USAGE_SEED_CHECKSUM         (0x99)</div><div class='add'>+#define KEY_USAGE_SEED_ENCRYPTION       (0xAA)</div><div class='add'>+#define KEY_USAGE_SEED_INTEGRITY        (0x55)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Standard Kerberos error codes.</div><div class='add'>+ */</div><div class='add'>+#define KRB5_PROG_KEYTYPE_NOSUPP		-1765328233</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mode of operation.</div><div class='add'>+ */</div><div class='add'>+enum krb5_crypto_mode {</div><div class='add'>+	KRB5_CHECKSUM_MODE,	/* Checksum only */</div><div class='add'>+	KRB5_ENCRYPT_MODE,	/* Fully encrypted, possibly with integrity checksum */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct krb5_buffer {</div><div class='add'>+	unsigned int	len;</div><div class='add'>+	void		*data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Kerberos encoding type definition.</div><div class='add'>+ */</div><div class='add'>+struct krb5_enctype {</div><div class='add'>+	int		etype;		/* Encryption (key) type */</div><div class='add'>+	int		ctype;		/* Checksum type */</div><div class='add'>+	const char	*name;		/* "Friendly" name */</div><div class='add'>+	const char	*encrypt_name;	/* Crypto encrypt+checksum name */</div><div class='add'>+	const char	*cksum_name;	/* Crypto checksum name */</div><div class='add'>+	const char	*hash_name;	/* Crypto hash name */</div><div class='add'>+	const char	*derivation_enc; /* Cipher used in key derivation */</div><div class='add'>+	u16		block_len;	/* Length of encryption block */</div><div class='add'>+	u16		conf_len;	/* Length of confounder (normally == block_len) */</div><div class='add'>+	u16		cksum_len;	/* Length of checksum */</div><div class='add'>+	u16		key_bytes;	/* Length of raw key, in bytes */</div><div class='add'>+	u16		key_len;	/* Length of final key, in bytes */</div><div class='add'>+	u16		hash_len;	/* Length of hash in bytes */</div><div class='add'>+	u16		prf_len;	/* Length of PRF() result in bytes */</div><div class='add'>+	u16		Kc_len;		/* Length of Kc in bytes */</div><div class='add'>+	u16		Ke_len;		/* Length of Ke in bytes */</div><div class='add'>+	u16		Ki_len;		/* Length of Ki in bytes */</div><div class='add'>+	bool		keyed_cksum;	/* T if a keyed cksum */</div><div class='add'>+</div><div class='add'>+	const struct krb5_crypto_profile *profile;</div><div class='add'>+</div><div class='add'>+	int (*random_to_key)(const struct krb5_enctype *krb5,</div><div class='add'>+			     const struct krb5_buffer *in,</div><div class='add'>+			     struct krb5_buffer *out);	/* complete key generation */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * krb5_api.c</div><div class='add'>+ */</div><div class='add'>+const struct krb5_enctype *crypto_krb5_find_enctype(u32 enctype);</div><div class='add'>+size_t crypto_krb5_how_much_buffer(const struct krb5_enctype *krb5,</div><div class='add'>+				   enum krb5_crypto_mode mode,</div><div class='add'>+				   size_t data_size, size_t *_offset);</div><div class='add'>+size_t crypto_krb5_how_much_data(const struct krb5_enctype *krb5,</div><div class='add'>+				 enum krb5_crypto_mode mode,</div><div class='add'>+				 size_t *_buffer_size, size_t *_offset);</div><div class='add'>+void crypto_krb5_where_is_the_data(const struct krb5_enctype *krb5,</div><div class='add'>+				   enum krb5_crypto_mode mode,</div><div class='add'>+				   size_t *_offset, size_t *_len);</div><div class='add'>+struct crypto_aead *crypto_krb5_prepare_encryption(const struct krb5_enctype *krb5,</div><div class='add'>+						   const struct krb5_buffer *TK,</div><div class='add'>+						   u32 usage, gfp_t gfp);</div><div class='add'>+struct crypto_shash *crypto_krb5_prepare_checksum(const struct krb5_enctype *krb5,</div><div class='add'>+						  const struct krb5_buffer *TK,</div><div class='add'>+						  u32 usage, gfp_t gfp);</div><div class='add'>+ssize_t crypto_krb5_encrypt(const struct krb5_enctype *krb5,</div><div class='add'>+			    struct crypto_aead *aead,</div><div class='add'>+			    struct scatterlist *sg, unsigned int nr_sg,</div><div class='add'>+			    size_t sg_len,</div><div class='add'>+			    size_t data_offset, size_t data_len,</div><div class='add'>+			    bool preconfounded);</div><div class='add'>+int crypto_krb5_decrypt(const struct krb5_enctype *krb5,</div><div class='add'>+			struct crypto_aead *aead,</div><div class='add'>+			struct scatterlist *sg, unsigned int nr_sg,</div><div class='add'>+			size_t *_offset, size_t *_len);</div><div class='add'>+ssize_t crypto_krb5_get_mic(const struct krb5_enctype *krb5,</div><div class='add'>+			    struct crypto_shash *shash,</div><div class='add'>+			    const struct krb5_buffer *metadata,</div><div class='add'>+			    struct scatterlist *sg, unsigned int nr_sg,</div><div class='add'>+			    size_t sg_len,</div><div class='add'>+			    size_t data_offset, size_t data_len);</div><div class='add'>+int crypto_krb5_verify_mic(const struct krb5_enctype *krb5,</div><div class='add'>+			   struct crypto_shash *shash,</div><div class='add'>+			   const struct krb5_buffer *metadata,</div><div class='add'>+			   struct scatterlist *sg, unsigned int nr_sg,</div><div class='add'>+			   size_t *_offset, size_t *_len);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * krb5_kdf.c</div><div class='add'>+ */</div><div class='add'>+int crypto_krb5_calc_PRFplus(const struct krb5_enctype *krb5,</div><div class='add'>+			     const struct krb5_buffer *K,</div><div class='add'>+			     unsigned int L,</div><div class='add'>+			     const struct krb5_buffer *S,</div><div class='add'>+			     struct krb5_buffer *result,</div><div class='add'>+			     gfp_t gfp);</div><div class='add'>+</div><div class='add'>+#endif /* _CRYPTO_KRB5_H */</div><div class='head'>diff --git a/include/crypto/md5.h b/include/crypto/md5.h<br/>index cf9e9dec3d21..c47aedfe67ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/md5.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/md5.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/md5.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/md5.h</a></div><div class='hunk'>@@ -2,24 +2,209 @@</div><div class='ctx'> #ifndef _CRYPTO_MD5_H</div><div class='ctx'> #define _CRYPTO_MD5_H</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MD5_DIGEST_SIZE		16</div><div class='ctx'> #define MD5_HMAC_BLOCK_SIZE	64</div><div class='add'>+#define MD5_BLOCK_SIZE		64</div><div class='ctx'> #define MD5_BLOCK_WORDS		16</div><div class='ctx'> #define MD5_HASH_WORDS		4</div><div class='add'>+#define MD5_STATE_SIZE		24</div><div class='ctx'> </div><div class='ctx'> #define MD5_H0	0x67452301UL</div><div class='ctx'> #define MD5_H1	0xefcdab89UL</div><div class='ctx'> #define MD5_H2	0x98badcfeUL</div><div class='ctx'> #define MD5_H3	0x10325476UL</div><div class='ctx'> </div><div class='add'>+#define CRYPTO_MD5_STATESIZE \</div><div class='add'>+	CRYPTO_HASH_STATESIZE(MD5_STATE_SIZE, MD5_HMAC_BLOCK_SIZE)</div><div class='add'>+</div><div class='ctx'> extern const u8 md5_zero_message_hash[MD5_DIGEST_SIZE];</div><div class='ctx'> </div><div class='ctx'> struct md5_state {</div><div class='ctx'> 	u32 hash[MD5_HASH_WORDS];</div><div class='del'>-	u32 block[MD5_BLOCK_WORDS];</div><div class='ctx'> 	u64 byte_count;</div><div class='add'>+	u32 block[MD5_BLOCK_WORDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* State for the MD5 compression function */</div><div class='add'>+struct md5_block_state {</div><div class='add'>+	u32 h[MD5_HASH_WORDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct md5_ctx - Context for hashing a message with MD5</div><div class='add'>+ * @state: the compression function state</div><div class='add'>+ * @bytecount: number of bytes processed so far</div><div class='add'>+ * @buf: partial block buffer; bytecount % MD5_BLOCK_SIZE bytes are valid</div><div class='add'>+ */</div><div class='add'>+struct md5_ctx {</div><div class='add'>+	struct md5_block_state state;</div><div class='add'>+	u64 bytecount;</div><div class='add'>+	u8 buf[MD5_BLOCK_SIZE] __aligned(__alignof__(__le64));</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * md5_init() - Initialize an MD5 context for a new message</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider md5() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void md5_init(struct md5_ctx *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * md5_update() - Update an MD5 context with message data</div><div class='add'>+ * @ctx: the context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void md5_update(struct md5_ctx *ctx, const u8 *data, size_t len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * md5_final() - Finish computing an MD5 message digest</div><div class='add'>+ * @ctx: the context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting MD5 message digest</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void md5_final(struct md5_ctx *ctx, u8 out[at_least MD5_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * md5() - Compute MD5 message digest in one shot</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting MD5 message digest</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void md5(const u8 *data, size_t len, u8 out[at_least MD5_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_md5_key - Prepared key for HMAC-MD5</div><div class='add'>+ * @istate: private</div><div class='add'>+ * @ostate: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_md5_key {</div><div class='add'>+	struct md5_block_state istate;</div><div class='add'>+	struct md5_block_state ostate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_md5_ctx - Context for computing HMAC-MD5 of a message</div><div class='add'>+ * @hash_ctx: private</div><div class='add'>+ * @ostate: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_md5_ctx {</div><div class='add'>+	struct md5_ctx hash_ctx;</div><div class='add'>+	struct md5_block_state ostate;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+/**</div><div class='add'>+ * hmac_md5_preparekey() - Prepare a key for HMAC-MD5</div><div class='add'>+ * @key: (output) the key structure to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-MD5 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * Note: the caller is responsible for zeroizing both the struct hmac_md5_key</div><div class='add'>+ * and the raw key once they are no longer needed.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_md5_preparekey(struct hmac_md5_key *key,</div><div class='add'>+			 const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_md5_init() - Initialize an HMAC-MD5 context for a new message</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_md5() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_md5_init(struct hmac_md5_ctx *ctx, const struct hmac_md5_key *key);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_md5_init_usingrawkey() - Initialize an HMAC-MD5 context for a new</div><div class='add'>+ *				  message, using a raw key</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-MD5 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_md5_usingrawkey()</div><div class='add'>+ * instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_md5_init_usingrawkey(struct hmac_md5_ctx *ctx,</div><div class='add'>+			       const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_md5_update() - Update an HMAC-MD5 context with message data</div><div class='add'>+ * @ctx: the HMAC context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_md5_update(struct hmac_md5_ctx *ctx,</div><div class='add'>+				   const u8 *data, size_t data_len)</div><div class='add'>+{</div><div class='add'>+	md5_update(&amp;ctx-&gt;hash_ctx, data, data_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_md5_final() - Finish computing an HMAC-MD5 value</div><div class='add'>+ * @ctx: the HMAC context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting HMAC-MD5 value</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_md5_final(struct hmac_md5_ctx *ctx, u8 out[at_least MD5_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_md5() - Compute HMAC-MD5 in one shot, using a prepared key</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-MD5 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key only once, consider using hmac_md5_usingrawkey().</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_md5(const struct hmac_md5_key *key,</div><div class='add'>+	      const u8 *data, size_t data_len,</div><div class='add'>+	      u8 out[at_least MD5_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_md5_usingrawkey() - Compute HMAC-MD5 in one shot, using a raw key</div><div class='add'>+ * @raw_key: the raw HMAC-MD5 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-MD5 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key multiple times, prefer to use hmac_md5_preparekey()</div><div class='add'>+ * followed by multiple calls to hmac_md5() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_md5_usingrawkey(const u8 *raw_key, size_t raw_key_len,</div><div class='add'>+			  const u8 *data, size_t data_len,</div><div class='add'>+			  u8 out[at_least MD5_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+#endif /* _CRYPTO_MD5_H */</div><div class='head'>diff --git a/include/crypto/null.h b/include/crypto/null.h<br/>index 0ef577cc00e3..1c66abf9de3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/null.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/null.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/null.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/null.h</a></div><div class='hunk'>@@ -9,7 +9,4 @@</div><div class='ctx'> #define NULL_DIGEST_SIZE	0</div><div class='ctx'> #define NULL_IV_SIZE		0</div><div class='ctx'> </div><div class='del'>-struct crypto_sync_skcipher *crypto_get_default_null_skcipher(void);</div><div class='del'>-void crypto_put_default_null_skcipher(void);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/poly1305.h b/include/crypto/poly1305.h<br/>index 090692ec3bc7..190beb427c6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/poly1305.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/poly1305.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/poly1305.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/poly1305.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #define _CRYPTO_POLY1305_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define POLY1305_BLOCK_SIZE	16</div><div class='ctx'> #define POLY1305_KEY_SIZE	32</div><div class='hunk'>@@ -38,17 +37,8 @@ struct poly1305_state {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct poly1305_desc_ctx {</div><div class='del'>-	/* partial buffer */</div><div class='del'>-	u8 buf[POLY1305_BLOCK_SIZE];</div><div class='del'>-	/* bytes used in partial buffer */</div><div class='del'>-	unsigned int buflen;</div><div class='del'>-	/* how many keys have been set in r[] */</div><div class='del'>-	unsigned short rset;</div><div class='del'>-	/* whether s[] has been set */</div><div class='del'>-	bool sset;</div><div class='del'>-	/* finalize key */</div><div class='del'>-	u32 s[4];</div><div class='add'>+/* Combined state for block function. */</div><div class='add'>+struct poly1305_block_state {</div><div class='ctx'> 	/* accumulator */</div><div class='ctx'> 	struct poly1305_state h;</div><div class='ctx'> 	/* key */</div><div class='hunk'>@@ -58,42 +48,20 @@ struct poly1305_desc_ctx {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void poly1305_init_arch(struct poly1305_desc_ctx *desc,</div><div class='del'>-			const u8 key[POLY1305_KEY_SIZE]);</div><div class='del'>-void poly1305_init_generic(struct poly1305_desc_ctx *desc,</div><div class='del'>-			   const u8 key[POLY1305_KEY_SIZE]);</div><div class='del'>-</div><div class='del'>-static inline void poly1305_init(struct poly1305_desc_ctx *desc, const u8 *key)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305))</div><div class='del'>-		poly1305_init_arch(desc, key);</div><div class='del'>-	else</div><div class='del'>-		poly1305_init_generic(desc, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void poly1305_update_arch(struct poly1305_desc_ctx *desc, const u8 *src,</div><div class='del'>-			  unsigned int nbytes);</div><div class='del'>-void poly1305_update_generic(struct poly1305_desc_ctx *desc, const u8 *src,</div><div class='del'>-			     unsigned int nbytes);</div><div class='del'>-</div><div class='del'>-static inline void poly1305_update(struct poly1305_desc_ctx *desc,</div><div class='del'>-				   const u8 *src, unsigned int nbytes)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305))</div><div class='del'>-		poly1305_update_arch(desc, src, nbytes);</div><div class='del'>-	else</div><div class='del'>-		poly1305_update_generic(desc, src, nbytes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void poly1305_final_arch(struct poly1305_desc_ctx *desc, u8 *digest);</div><div class='del'>-void poly1305_final_generic(struct poly1305_desc_ctx *desc, u8 *digest);</div><div class='add'>+struct poly1305_desc_ctx {</div><div class='add'>+	/* partial buffer */</div><div class='add'>+	u8 buf[POLY1305_BLOCK_SIZE];</div><div class='add'>+	/* bytes used in partial buffer */</div><div class='add'>+	unsigned int buflen;</div><div class='add'>+	/* finalize key */</div><div class='add'>+	u32 s[4];</div><div class='add'>+	struct poly1305_block_state state;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static inline void poly1305_final(struct poly1305_desc_ctx *desc, u8 *digest)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305))</div><div class='del'>-		poly1305_final_arch(desc, digest);</div><div class='del'>-	else</div><div class='del'>-		poly1305_final_generic(desc, digest);</div><div class='del'>-}</div><div class='add'>+void poly1305_init(struct poly1305_desc_ctx *desc,</div><div class='add'>+		   const u8 key[at_least POLY1305_KEY_SIZE]);</div><div class='add'>+void poly1305_update(struct poly1305_desc_ctx *desc,</div><div class='add'>+		     const u8 *src, unsigned int nbytes);</div><div class='add'>+void poly1305_final(struct poly1305_desc_ctx *desc, u8 *digest);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/polyval.h b/include/crypto/polyval.h<br/>index 1d630f371f77..b28b8ef11353 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/polyval.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/polyval.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/polyval.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/polyval.h</a></div><div class='hunk'>@@ -1,22 +1,190 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='del'>- * Common values for the Polyval hash algorithm</div><div class='add'>+ * POLYVAL library API</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2021 Google LLC</div><div class='add'>+ * Copyright 2025 Google LLC</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _CRYPTO_POLYVAL_H</div><div class='ctx'> #define _CRYPTO_POLYVAL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define POLYVAL_BLOCK_SIZE	16</div><div class='ctx'> #define POLYVAL_DIGEST_SIZE	16</div><div class='ctx'> </div><div class='del'>-void polyval_mul_non4k(u8 *op1, const u8 *op2);</div><div class='add'>+/**</div><div class='add'>+ * struct polyval_elem - An element of the POLYVAL finite field</div><div class='add'>+ * @bytes: View of the element as a byte array (unioned with @lo and @hi)</div><div class='add'>+ * @lo: The low 64 terms of the element's polynomial</div><div class='add'>+ * @hi: The high 64 terms of the element's polynomial</div><div class='add'>+ *</div><div class='add'>+ * This represents an element of the finite field GF(2^128), using the POLYVAL</div><div class='add'>+ * convention: little-endian byte order and natural bit order.</div><div class='add'>+ */</div><div class='add'>+struct polyval_elem {</div><div class='add'>+	union {</div><div class='add'>+		u8 bytes[POLYVAL_BLOCK_SIZE];</div><div class='add'>+		struct {</div><div class='add'>+			__le64 lo;</div><div class='add'>+			__le64 hi;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-void polyval_update_non4k(const u8 *key, const u8 *in,</div><div class='del'>-			  size_t nblocks, u8 *accumulator);</div><div class='add'>+/**</div><div class='add'>+ * struct polyval_key - Prepared key for POLYVAL</div><div class='add'>+ *</div><div class='add'>+ * This may contain just the raw key H, or it may contain precomputed key</div><div class='add'>+ * powers, depending on the platform's POLYVAL implementation.  Use</div><div class='add'>+ * polyval_preparekey() to initialize this.</div><div class='add'>+ *</div><div class='add'>+ * By H^i we mean H^(i-1) * H * x^-128, with base case H^1 = H.  I.e. the</div><div class='add'>+ * exponentiation repeats the POLYVAL dot operation, with its "extra" x^-128.</div><div class='add'>+ */</div><div class='add'>+struct polyval_key {</div><div class='add'>+#ifdef CONFIG_CRYPTO_LIB_POLYVAL_ARCH</div><div class='add'>+#ifdef CONFIG_ARM64</div><div class='add'>+	/** @h_powers: Powers of the hash key H^8 through H^1 */</div><div class='add'>+	struct polyval_elem h_powers[8];</div><div class='add'>+#elif defined(CONFIG_X86)</div><div class='add'>+	/** @h_powers: Powers of the hash key H^8 through H^1 */</div><div class='add'>+	struct polyval_elem h_powers[8];</div><div class='add'>+#else</div><div class='add'>+#error "Unhandled arch"</div><div class='add'>+#endif</div><div class='add'>+#else /* CONFIG_CRYPTO_LIB_POLYVAL_ARCH */</div><div class='add'>+	/** @h: The hash key H */</div><div class='add'>+	struct polyval_elem h;</div><div class='add'>+#endif /* !CONFIG_CRYPTO_LIB_POLYVAL_ARCH */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct polyval_ctx - Context for computing a POLYVAL value</div><div class='add'>+ * @key: Pointer to the prepared POLYVAL key.  The user of the API is</div><div class='add'>+ *	 responsible for ensuring that the key lives as long as the context.</div><div class='add'>+ * @acc: The accumulator</div><div class='add'>+ * @partial: Number of data bytes processed so far modulo POLYVAL_BLOCK_SIZE</div><div class='add'>+ */</div><div class='add'>+struct polyval_ctx {</div><div class='add'>+	const struct polyval_key *key;</div><div class='add'>+	struct polyval_elem acc;</div><div class='add'>+	size_t partial;</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * polyval_preparekey() - Prepare a POLYVAL key</div><div class='add'>+ * @key: (output) The key structure to initialize</div><div class='add'>+ * @raw_key: The raw hash key</div><div class='add'>+ *</div><div class='add'>+ * Initialize a POLYVAL key structure from a raw key.  This may be a simple</div><div class='add'>+ * copy, or it may involve precomputing powers of the key, depending on the</div><div class='add'>+ * platform's POLYVAL implementation.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CRYPTO_LIB_POLYVAL_ARCH</div><div class='add'>+void polyval_preparekey(struct polyval_key *key,</div><div class='add'>+			const u8 raw_key[POLYVAL_BLOCK_SIZE]);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline void polyval_preparekey(struct polyval_key *key,</div><div class='add'>+				      const u8 raw_key[POLYVAL_BLOCK_SIZE])</div><div class='add'>+{</div><div class='add'>+	/* Just a simple copy, so inline it. */</div><div class='add'>+	memcpy(key-&gt;h.bytes, raw_key, POLYVAL_BLOCK_SIZE);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * polyval_init() - Initialize a POLYVAL context for a new message</div><div class='add'>+ * @ctx: The context to initialize</div><div class='add'>+ * @key: The key to use.  Note that a pointer to the key is saved in the</div><div class='add'>+ *	 context, so the key must live at least as long as the context.</div><div class='add'>+ */</div><div class='add'>+static inline void polyval_init(struct polyval_ctx *ctx,</div><div class='add'>+				const struct polyval_key *key)</div><div class='add'>+{</div><div class='add'>+	*ctx = (struct polyval_ctx){ .key = key };</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * polyval_import_blkaligned() - Import a POLYVAL accumulator value</div><div class='add'>+ * @ctx: The context to initialize</div><div class='add'>+ * @key: The key to import.  Note that a pointer to the key is saved in the</div><div class='add'>+ *	 context, so the key must live at least as long as the context.</div><div class='add'>+ * @acc: The accumulator value to import.</div><div class='add'>+ *</div><div class='add'>+ * This imports an accumulator that was saved by polyval_export_blkaligned().</div><div class='add'>+ * The same key must be used.</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+polyval_import_blkaligned(struct polyval_ctx *ctx,</div><div class='add'>+			  const struct polyval_key *key,</div><div class='add'>+			  const struct polyval_elem *acc)</div><div class='add'>+{</div><div class='add'>+	*ctx = (struct polyval_ctx){ .key = key, .acc = *acc };</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * polyval_export_blkaligned() - Export a POLYVAL accumulator value</div><div class='add'>+ * @ctx: The context to export the accumulator value from</div><div class='add'>+ * @acc: (output) The exported accumulator value</div><div class='add'>+ *</div><div class='add'>+ * This exports the accumulator from a POLYVAL context.  The number of data</div><div class='add'>+ * bytes processed so far must be a multiple of POLYVAL_BLOCK_SIZE.</div><div class='add'>+ */</div><div class='add'>+static inline void polyval_export_blkaligned(const struct polyval_ctx *ctx,</div><div class='add'>+					     struct polyval_elem *acc)</div><div class='add'>+{</div><div class='add'>+	*acc = ctx-&gt;acc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * polyval_update() - Update a POLYVAL context with message data</div><div class='add'>+ * @ctx: The context to update; must have been initialized</div><div class='add'>+ * @data: The message data</div><div class='add'>+ * @len: The data length in bytes.  Doesn't need to be block-aligned.</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void polyval_update(struct polyval_ctx *ctx, const u8 *data, size_t len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * polyval_final() - Finish computing a POLYVAL value</div><div class='add'>+ * @ctx: The context to finalize</div><div class='add'>+ * @out: The output value</div><div class='add'>+ *</div><div class='add'>+ * If the total data length isn't a multiple of POLYVAL_BLOCK_SIZE, then the</div><div class='add'>+ * final block is automatically zero-padded.</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void polyval_final(struct polyval_ctx *ctx, u8 out[POLYVAL_BLOCK_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * polyval() - Compute a POLYVAL value</div><div class='add'>+ * @key: The prepared key</div><div class='add'>+ * @data: The message data</div><div class='add'>+ * @len: The data length in bytes.  Doesn't need to be block-aligned.</div><div class='add'>+ * @out: The output value</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void polyval(const struct polyval_key *key,</div><div class='add'>+			   const u8 *data, size_t len,</div><div class='add'>+			   u8 out[POLYVAL_BLOCK_SIZE])</div><div class='add'>+{</div><div class='add'>+	struct polyval_ctx ctx;</div><div class='add'>+</div><div class='add'>+	polyval_init(&amp;ctx, key);</div><div class='add'>+	polyval_update(&amp;ctx, data, len);</div><div class='add'>+	polyval_final(&amp;ctx, out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _CRYPTO_POLYVAL_H */</div><div class='head'>diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h<br/>index 462f8a34cdf8..81098e00c08f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/public_key.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/public_key.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/public_key.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/public_key.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #ifndef _LINUX_PUBLIC_KEY_H</div><div class='ctx'> #define _LINUX_PUBLIC_KEY_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/keyctl.h&gt;</div><div class='ctx'> #include &lt;linux/oid_registry.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -103,9 +104,6 @@ static inline int restrict_link_by_digsig(struct key *dest_keyring,</div><div class='ctx'> extern int query_asymmetric_key(const struct kernel_pkey_params *,</div><div class='ctx'> 				struct kernel_pkey_query *);</div><div class='ctx'> </div><div class='del'>-extern int encrypt_blob(struct kernel_pkey_params *, const void *, void *);</div><div class='del'>-extern int decrypt_blob(struct kernel_pkey_params *, const void *, void *);</div><div class='del'>-extern int create_signature(struct kernel_pkey_params *, const void *, void *);</div><div class='ctx'> extern int verify_signature(const struct key *,</div><div class='ctx'> 			    const struct public_key_signature *);</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/rng.h b/include/crypto/rng.h<br/>index 6abe5102e5fb..d451b54b322a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/rng.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/rng.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/rng.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/rng.h</a></div><div class='hunk'>@@ -15,20 +15,6 @@</div><div class='ctx'> </div><div class='ctx'> struct crypto_rng;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct crypto_istat_rng: statistics for RNG algorithm</div><div class='del'>- * @generate_cnt:	number of RNG generate requests</div><div class='del'>- * @generate_tlen:	total data size of generated data by the RNG</div><div class='del'>- * @seed_cnt:		number of times the RNG was seeded</div><div class='del'>- * @err_cnt:		number of error for RNG requests</div><div class='del'>- */</div><div class='del'>-struct crypto_istat_rng {</div><div class='del'>-	atomic64_t generate_cnt;</div><div class='del'>-	atomic64_t generate_tlen;</div><div class='del'>-	atomic64_t seed_cnt;</div><div class='del'>-	atomic64_t err_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct rng_alg - random number generator definition</div><div class='ctx'>  *</div><div class='hunk'>@@ -46,7 +32,6 @@ struct crypto_istat_rng {</div><div class='ctx'>  *		size of the seed is defined with @seedsize .</div><div class='ctx'>  * @set_ent:	Set entropy that would otherwise be obtained from</div><div class='ctx'>  *		entropy source.  Internal use only.</div><div class='del'>- * @stat:	Statistics for rng algorithm</div><div class='ctx'>  * @seedsize:	The seed size required for a random number generator</div><div class='ctx'>  *		initialization defined with this variable. Some</div><div class='ctx'>  *		random number generators does not require a seed</div><div class='hunk'>@@ -63,10 +48,6 @@ struct rng_alg {</div><div class='ctx'> 	void (*set_ent)(struct crypto_rng *tfm, const u8 *data,</div><div class='ctx'> 			unsigned int len);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	struct crypto_istat_rng stat;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	unsigned int seedsize;</div><div class='ctx'> </div><div class='ctx'> 	struct crypto_alg base;</div><div class='hunk'>@@ -121,12 +102,10 @@ static inline struct rng_alg *__crypto_rng_alg(struct crypto_alg *alg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * crypto_rng_alg - obtain name of RNG</div><div class='del'>- * @tfm: cipher handle</div><div class='del'>- *</div><div class='del'>- * Return the generic name (cra_name) of the initialized random number generator</div><div class='add'>+ * crypto_rng_alg() - obtain 'struct rng_alg' pointer from RNG handle</div><div class='add'>+ * @tfm: RNG handle</div><div class='ctx'>  *</div><div class='del'>- * Return: generic name string</div><div class='add'>+ * Return: Pointer to 'struct rng_alg', derived from @tfm RNG handle</div><div class='ctx'>  */</div><div class='ctx'> static inline struct rng_alg *crypto_rng_alg(struct crypto_rng *tfm)</div><div class='ctx'> {</div><div class='hunk'>@@ -144,26 +123,6 @@ static inline void crypto_free_rng(struct crypto_rng *tfm)</div><div class='ctx'> 	crypto_destroy_tfm(tfm, crypto_rng_tfm(tfm));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct crypto_istat_rng *rng_get_stat(struct rng_alg *alg)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-	return &amp;alg-&gt;stat;</div><div class='del'>-#else</div><div class='del'>-	return NULL;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int crypto_rng_errstat(struct rng_alg *alg, int err)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ENABLED(CONFIG_CRYPTO_STATS))</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (err &amp;&amp; err != -EINPROGRESS &amp;&amp; err != -EBUSY)</div><div class='del'>-		atomic64_inc(&amp;rng_get_stat(alg)-&gt;err_cnt);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_rng_generate() - get random number</div><div class='ctx'>  * @tfm: cipher handle</div><div class='hunk'>@@ -182,17 +141,7 @@ static inline int crypto_rng_generate(struct crypto_rng *tfm,</div><div class='ctx'> 				      const u8 *src, unsigned int slen,</div><div class='ctx'> 				      u8 *dst, unsigned int dlen)</div><div class='ctx'> {</div><div class='del'>-	struct rng_alg *alg = crypto_rng_alg(tfm);</div><div class='del'>-</div><div class='del'>-	if (IS_ENABLED(CONFIG_CRYPTO_STATS)) {</div><div class='del'>-		struct crypto_istat_rng *istat = rng_get_stat(alg);</div><div class='del'>-</div><div class='del'>-		atomic64_inc(&amp;istat-&gt;generate_cnt);</div><div class='del'>-		atomic64_add(dlen, &amp;istat-&gt;generate_tlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return crypto_rng_errstat(alg,</div><div class='del'>-				  alg-&gt;generate(tfm, src, slen, dst, dlen));</div><div class='add'>+	return crypto_rng_alg(tfm)-&gt;generate(tfm, src, slen, dst, dlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -220,12 +169,11 @@ static inline int crypto_rng_get_bytes(struct crypto_rng *tfm,</div><div class='ctx'>  *</div><div class='ctx'>  * The reset function completely re-initializes the random number generator</div><div class='ctx'>  * referenced by the cipher handle by clearing the current state. The new state</div><div class='del'>- * is initialized with the caller provided seed or automatically, depending</div><div class='del'>- * on the random number generator type (the ANSI X9.31 RNG requires</div><div class='del'>- * caller-provided seed, the SP800-90A DRBGs perform an automatic seeding).</div><div class='del'>- * The seed is provided as a parameter to this function call. The provided seed</div><div class='del'>- * should have the length of the seed size defined for the random number</div><div class='del'>- * generator as defined by crypto_rng_seedsize.</div><div class='add'>+ * is initialized with the caller provided seed or automatically, depending on</div><div class='add'>+ * the random number generator type. (The SP800-90A DRBGs perform an automatic</div><div class='add'>+ * seeding.) The seed is provided as a parameter to this function call. The</div><div class='add'>+ * provided seed should have the length of the seed size defined for the random</div><div class='add'>+ * number generator as defined by crypto_rng_seedsize.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 if the setting of the key was successful; &lt; 0 if an error occurred</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h<br/>index 32fc4473175b..624fab589c2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/scatterwalk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/scatterwalk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/scatterwalk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/scatterwalk.h</a></div><div class='hunk'>@@ -26,76 +26,228 @@ static inline void scatterwalk_crypto_chain(struct scatterlist *head,</div><div class='ctx'> 		sg_mark_end(head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int scatterwalk_pagelen(struct scatter_walk *walk)</div><div class='add'>+static inline void scatterwalk_start(struct scatter_walk *walk,</div><div class='add'>+				     struct scatterlist *sg)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len = walk-&gt;sg-&gt;offset + walk-&gt;sg-&gt;length - walk-&gt;offset;</div><div class='del'>-	unsigned int len_this_page = offset_in_page(~walk-&gt;offset) + 1;</div><div class='del'>-	return len_this_page &gt; len ? len : len_this_page;</div><div class='add'>+	walk-&gt;sg = sg;</div><div class='add'>+	walk-&gt;offset = sg-&gt;offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is equivalent to scatterwalk_start(walk, sg) followed by</div><div class='add'>+ * scatterwalk_skip(walk, pos).</div><div class='add'>+ */</div><div class='add'>+static inline void scatterwalk_start_at_pos(struct scatter_walk *walk,</div><div class='add'>+					    struct scatterlist *sg,</div><div class='add'>+					    unsigned int pos)</div><div class='add'>+{</div><div class='add'>+	while (pos &gt; sg-&gt;length) {</div><div class='add'>+		pos -= sg-&gt;length;</div><div class='add'>+		sg = sg_next(sg);</div><div class='add'>+	}</div><div class='add'>+	walk-&gt;sg = sg;</div><div class='add'>+	walk-&gt;offset = sg-&gt;offset + pos;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int scatterwalk_clamp(struct scatter_walk *walk,</div><div class='ctx'> 					     unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len_this_page = scatterwalk_pagelen(walk);</div><div class='del'>-	return nbytes &gt; len_this_page ? len_this_page : nbytes;</div><div class='add'>+	unsigned int len_this_sg;</div><div class='add'>+	unsigned int limit;</div><div class='add'>+</div><div class='add'>+	if (walk-&gt;offset &gt;= walk-&gt;sg-&gt;offset + walk-&gt;sg-&gt;length)</div><div class='add'>+		scatterwalk_start(walk, sg_next(walk-&gt;sg));</div><div class='add'>+	len_this_sg = walk-&gt;sg-&gt;offset + walk-&gt;sg-&gt;length - walk-&gt;offset;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HIGHMEM case: the page may have to be mapped into memory.  To avoid</div><div class='add'>+	 * the complexity of having to map multiple pages at once per sg entry,</div><div class='add'>+	 * clamp the returned length to not cross a page boundary.</div><div class='add'>+	 *</div><div class='add'>+	 * !HIGHMEM case: no mapping is needed; all pages of the sg entry are</div><div class='add'>+	 * already mapped contiguously in the kernel's direct map.  For improved</div><div class='add'>+	 * performance, allow the walker to return data segments that cross a</div><div class='add'>+	 * page boundary.  Do still cap the length to PAGE_SIZE, since some</div><div class='add'>+	 * users rely on that to avoid disabling preemption for too long when</div><div class='add'>+	 * using SIMD.  It's also needed for when skcipher_walk uses a bounce</div><div class='add'>+	 * page due to the data not being aligned to the algorithm's alignmask.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ENABLED(CONFIG_HIGHMEM))</div><div class='add'>+		limit = PAGE_SIZE - offset_in_page(walk-&gt;offset);</div><div class='add'>+	else</div><div class='add'>+		limit = PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	return min3(nbytes, len_this_sg, limit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a scatterlist that represents the remaining data in a walk.  Uses</div><div class='add'>+ * chaining to reference the original scatterlist, so this uses at most two</div><div class='add'>+ * entries in @sg_out regardless of the number of entries in the original list.</div><div class='add'>+ * Assumes that sg_init_table() was already done.</div><div class='add'>+ */</div><div class='add'>+static inline void scatterwalk_get_sglist(struct scatter_walk *walk,</div><div class='add'>+					  struct scatterlist sg_out[2])</div><div class='add'>+{</div><div class='add'>+	if (walk-&gt;offset &gt;= walk-&gt;sg-&gt;offset + walk-&gt;sg-&gt;length)</div><div class='add'>+		scatterwalk_start(walk, sg_next(walk-&gt;sg));</div><div class='add'>+	sg_set_page(sg_out, sg_page(walk-&gt;sg),</div><div class='add'>+		    walk-&gt;sg-&gt;offset + walk-&gt;sg-&gt;length - walk-&gt;offset,</div><div class='add'>+		    walk-&gt;offset);</div><div class='add'>+	scatterwalk_crypto_chain(sg_out, sg_next(walk-&gt;sg), 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void scatterwalk_advance(struct scatter_walk *walk,</div><div class='del'>-				       unsigned int nbytes)</div><div class='add'>+static inline void scatterwalk_map(struct scatter_walk *walk)</div><div class='ctx'> {</div><div class='del'>-	walk-&gt;offset += nbytes;</div><div class='add'>+	struct page *base_page = sg_page(walk-&gt;sg);</div><div class='add'>+	unsigned int offset = walk-&gt;offset;</div><div class='add'>+	void *addr;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_HIGHMEM)) {</div><div class='add'>+		struct page *page;</div><div class='add'>+</div><div class='add'>+		page = base_page + (offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+		offset = offset_in_page(offset);</div><div class='add'>+		addr = kmap_local_page(page) + offset;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * When !HIGHMEM we allow the walker to return segments that</div><div class='add'>+		 * span a page boundary; see scatterwalk_clamp().  To make it</div><div class='add'>+		 * clear that in this case we're working in the linear buffer of</div><div class='add'>+		 * the whole sg entry in the kernel's direct map rather than</div><div class='add'>+		 * within the mapped buffer of a single page, compute the</div><div class='add'>+		 * address as an offset from the page_address() of the first</div><div class='add'>+		 * page of the sg entry.  Either way the result is the address</div><div class='add'>+		 * in the direct map, but this makes it clearer what is really</div><div class='add'>+		 * going on.</div><div class='add'>+		 */</div><div class='add'>+		addr = page_address(base_page) + offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	walk-&gt;__addr = addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page *scatterwalk_page(struct scatter_walk *walk)</div><div class='add'>+/**</div><div class='add'>+ * scatterwalk_next() - Get the next data buffer in a scatterlist walk</div><div class='add'>+ * @walk: the scatter_walk</div><div class='add'>+ * @total: the total number of bytes remaining, &gt; 0</div><div class='add'>+ *</div><div class='add'>+ * A virtual address for the next segment of data from the scatterlist will</div><div class='add'>+ * be placed into @walk-&gt;addr.  The caller must call scatterwalk_done_src()</div><div class='add'>+ * or scatterwalk_done_dst() when it is done using this virtual address.</div><div class='add'>+ *</div><div class='add'>+ * Returns: the next number of bytes available, &lt;= @total</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int scatterwalk_next(struct scatter_walk *walk,</div><div class='add'>+					    unsigned int total)</div><div class='ctx'> {</div><div class='del'>-	return sg_page(walk-&gt;sg) + (walk-&gt;offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	unsigned int nbytes = scatterwalk_clamp(walk, total);</div><div class='add'>+</div><div class='add'>+	scatterwalk_map(walk);</div><div class='add'>+	return nbytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void scatterwalk_unmap(void *vaddr)</div><div class='add'>+static inline void scatterwalk_unmap(struct scatter_walk *walk)</div><div class='ctx'> {</div><div class='del'>-	kunmap_local(vaddr);</div><div class='add'>+	if (IS_ENABLED(CONFIG_HIGHMEM))</div><div class='add'>+		kunmap_local(walk-&gt;__addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void scatterwalk_start(struct scatter_walk *walk,</div><div class='del'>-				     struct scatterlist *sg)</div><div class='add'>+static inline void scatterwalk_advance(struct scatter_walk *walk,</div><div class='add'>+				       unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	walk-&gt;sg = sg;</div><div class='del'>-	walk-&gt;offset = sg-&gt;offset;</div><div class='add'>+	walk-&gt;offset += nbytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *scatterwalk_map(struct scatter_walk *walk)</div><div class='add'>+/**</div><div class='add'>+ * scatterwalk_done_src() - Finish one step of a walk of source scatterlist</div><div class='add'>+ * @walk: the scatter_walk</div><div class='add'>+ * @nbytes: the number of bytes processed this step, less than or equal to the</div><div class='add'>+ *	    number of bytes that scatterwalk_next() returned.</div><div class='add'>+ *</div><div class='add'>+ * Use this if the mapped address was not written to, i.e. it is source data.</div><div class='add'>+ */</div><div class='add'>+static inline void scatterwalk_done_src(struct scatter_walk *walk,</div><div class='add'>+					unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	return kmap_local_page(scatterwalk_page(walk)) +</div><div class='del'>-	       offset_in_page(walk-&gt;offset);</div><div class='add'>+	scatterwalk_unmap(walk);</div><div class='add'>+	scatterwalk_advance(walk, nbytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void scatterwalk_pagedone(struct scatter_walk *walk, int out,</div><div class='del'>-					unsigned int more)</div><div class='add'>+/*</div><div class='add'>+ * Flush the dcache of any pages that overlap the region</div><div class='add'>+ * [offset, offset + nbytes) relative to base_page.</div><div class='add'>+ *</div><div class='add'>+ * This should be called only when ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE, to ensure</div><div class='add'>+ * that all relevant code (including the call to sg_page() in the caller, if</div><div class='add'>+ * applicable) gets fully optimized out when !ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE.</div><div class='add'>+ */</div><div class='add'>+static inline void __scatterwalk_flush_dcache_pages(struct page *base_page,</div><div class='add'>+						    unsigned int offset,</div><div class='add'>+						    unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	if (out) {</div><div class='del'>-		struct page *page;</div><div class='add'>+	unsigned int num_pages;</div><div class='ctx'> </div><div class='del'>-		page = sg_page(walk-&gt;sg) + ((walk-&gt;offset - 1) &gt;&gt; PAGE_SHIFT);</div><div class='del'>-		flush_dcache_page(page);</div><div class='del'>-	}</div><div class='add'>+	base_page += offset / PAGE_SIZE;</div><div class='add'>+	offset %= PAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-	if (more &amp;&amp; walk-&gt;offset &gt;= walk-&gt;sg-&gt;offset + walk-&gt;sg-&gt;length)</div><div class='del'>-		scatterwalk_start(walk, sg_next(walk-&gt;sg));</div><div class='add'>+	/*</div><div class='add'>+	 * This is an overflow-safe version of</div><div class='add'>+	 * num_pages = DIV_ROUND_UP(offset + nbytes, PAGE_SIZE).</div><div class='add'>+	 */</div><div class='add'>+	num_pages = nbytes / PAGE_SIZE;</div><div class='add'>+	num_pages += DIV_ROUND_UP(offset + (nbytes % PAGE_SIZE), PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	for (unsigned int i = 0; i &lt; num_pages; i++)</div><div class='add'>+		flush_dcache_page(base_page + i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void scatterwalk_done(struct scatter_walk *walk, int out,</div><div class='del'>-				    int more)</div><div class='add'>+/**</div><div class='add'>+ * scatterwalk_done_dst() - Finish one step of a walk of destination scatterlist</div><div class='add'>+ * @walk: the scatter_walk</div><div class='add'>+ * @nbytes: the number of bytes processed this step, less than or equal to the</div><div class='add'>+ *	    number of bytes that scatterwalk_next() returned.</div><div class='add'>+ *</div><div class='add'>+ * Use this if the mapped address may have been written to, i.e. it is</div><div class='add'>+ * destination data.</div><div class='add'>+ */</div><div class='add'>+static inline void scatterwalk_done_dst(struct scatter_walk *walk,</div><div class='add'>+					unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	if (!more || walk-&gt;offset &gt;= walk-&gt;sg-&gt;offset + walk-&gt;sg-&gt;length ||</div><div class='del'>-	    !(walk-&gt;offset &amp; (PAGE_SIZE - 1)))</div><div class='del'>-		scatterwalk_pagedone(walk, out, more);</div><div class='add'>+	scatterwalk_unmap(walk);</div><div class='add'>+	if (ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE)</div><div class='add'>+		__scatterwalk_flush_dcache_pages(sg_page(walk-&gt;sg),</div><div class='add'>+						 walk-&gt;offset, nbytes);</div><div class='add'>+	scatterwalk_advance(walk, nbytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,</div><div class='del'>-			    size_t nbytes, int out);</div><div class='add'>+void scatterwalk_skip(struct scatter_walk *walk, unsigned int nbytes);</div><div class='add'>+</div><div class='add'>+void memcpy_from_scatterwalk(void *buf, struct scatter_walk *walk,</div><div class='add'>+			     unsigned int nbytes);</div><div class='ctx'> </div><div class='del'>-void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,</div><div class='del'>-			      unsigned int start, unsigned int nbytes, int out);</div><div class='add'>+void memcpy_to_scatterwalk(struct scatter_walk *walk, const void *buf,</div><div class='add'>+			   unsigned int nbytes);</div><div class='add'>+</div><div class='add'>+void memcpy_from_sglist(void *buf, struct scatterlist *sg,</div><div class='add'>+			unsigned int start, unsigned int nbytes);</div><div class='add'>+</div><div class='add'>+void memcpy_to_sglist(struct scatterlist *sg, unsigned int start,</div><div class='add'>+		      const void *buf, unsigned int nbytes);</div><div class='add'>+</div><div class='add'>+void memcpy_sglist(struct scatterlist *dst, struct scatterlist *src,</div><div class='add'>+		   unsigned int nbytes);</div><div class='add'>+</div><div class='add'>+/* In new code, please use memcpy_{from,to}_sglist() directly instead. */</div><div class='add'>+static inline void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,</div><div class='add'>+					    unsigned int start,</div><div class='add'>+					    unsigned int nbytes, int out)</div><div class='add'>+{</div><div class='add'>+	if (out)</div><div class='add'>+		memcpy_to_sglist(sg, start, buf, nbytes);</div><div class='add'>+	else</div><div class='add'>+		memcpy_from_sglist(buf, sg, start, nbytes);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct scatterlist *scatterwalk_ffwd(struct scatterlist dst[2],</div><div class='ctx'> 				     struct scatterlist *src,</div><div class='head'>diff --git a/include/crypto/sha1.h b/include/crypto/sha1.h<br/>index 044ecea60ac8..27f08b972931 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sha1.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha1.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/sha1.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/sha1.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SHA1_DIGEST_SIZE        20</div><div class='ctx'> #define SHA1_BLOCK_SIZE         64</div><div class='add'>+#define SHA1_STATE_SIZE         offsetof(struct sha1_state, buffer)</div><div class='ctx'> </div><div class='ctx'> #define SHA1_H0		0x67452301UL</div><div class='ctx'> #define SHA1_H1		0xefcdab89UL</div><div class='hunk'>@@ -25,14 +26,6 @@ struct sha1_state {</div><div class='ctx'> 	u8 buffer[SHA1_BLOCK_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct shash_desc;</div><div class='del'>-</div><div class='del'>-extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			      unsigned int len);</div><div class='del'>-</div><div class='del'>-extern int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			     unsigned int len, u8 *hash);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * An implementation of SHA-1's compression function.  Don't use in new code!</div><div class='ctx'>  * You shouldn't be using SHA-1, and even if you *have* to use SHA-1, this isn't</div><div class='hunk'>@@ -40,7 +33,187 @@ extern int crypto_sha1_finup(struct shash_desc *desc, const u8 *data,</div><div class='ctx'>  */</div><div class='ctx'> #define SHA1_DIGEST_WORDS	(SHA1_DIGEST_SIZE / 4)</div><div class='ctx'> #define SHA1_WORKSPACE_WORDS	16</div><div class='del'>-void sha1_init(__u32 *buf);</div><div class='add'>+void sha1_init_raw(__u32 *buf);</div><div class='ctx'> void sha1_transform(__u32 *digest, const char *data, __u32 *W);</div><div class='ctx'> </div><div class='add'>+/* State for the SHA-1 compression function */</div><div class='add'>+struct sha1_block_state {</div><div class='add'>+	u32 h[SHA1_DIGEST_SIZE / 4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sha1_ctx - Context for hashing a message with SHA-1</div><div class='add'>+ * @state: the compression function state</div><div class='add'>+ * @bytecount: number of bytes processed so far</div><div class='add'>+ * @buf: partial block buffer; bytecount % SHA1_BLOCK_SIZE bytes are valid</div><div class='add'>+ */</div><div class='add'>+struct sha1_ctx {</div><div class='add'>+	struct sha1_block_state state;</div><div class='add'>+	u64 bytecount;</div><div class='add'>+	u8 buf[SHA1_BLOCK_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha1_init() - Initialize a SHA-1 context for a new message</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider sha1() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha1_init(struct sha1_ctx *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha1_update() - Update a SHA-1 context with message data</div><div class='add'>+ * @ctx: the context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha1_update(struct sha1_ctx *ctx, const u8 *data, size_t len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha1_final() - Finish computing a SHA-1 message digest</div><div class='add'>+ * @ctx: the context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting SHA-1 message digest</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha1_final(struct sha1_ctx *ctx, u8 out[at_least SHA1_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha1() - Compute SHA-1 message digest in one shot</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting SHA-1 message digest</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha1(const u8 *data, size_t len, u8 out[at_least SHA1_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha1_key - Prepared key for HMAC-SHA1</div><div class='add'>+ * @istate: private</div><div class='add'>+ * @ostate: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha1_key {</div><div class='add'>+	struct sha1_block_state istate;</div><div class='add'>+	struct sha1_block_state ostate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha1_ctx - Context for computing HMAC-SHA1 of a message</div><div class='add'>+ * @sha_ctx: private</div><div class='add'>+ * @ostate: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha1_ctx {</div><div class='add'>+	struct sha1_ctx sha_ctx;</div><div class='add'>+	struct sha1_block_state ostate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha1_preparekey() - Prepare a key for HMAC-SHA1</div><div class='add'>+ * @key: (output) the key structure to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA1 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * Note: the caller is responsible for zeroizing both the struct hmac_sha1_key</div><div class='add'>+ * and the raw key once they are no longer needed.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha1_preparekey(struct hmac_sha1_key *key,</div><div class='add'>+			  const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha1_init() - Initialize an HMAC-SHA1 context for a new message</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha1() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha1_init(struct hmac_sha1_ctx *ctx, const struct hmac_sha1_key *key);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha1_init_usingrawkey() - Initialize an HMAC-SHA1 context for a new</div><div class='add'>+ *				  message, using a raw key</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA1 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha1_usingrawkey()</div><div class='add'>+ * instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha1_init_usingrawkey(struct hmac_sha1_ctx *ctx,</div><div class='add'>+				const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha1_update() - Update an HMAC-SHA1 context with message data</div><div class='add'>+ * @ctx: the HMAC context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha1_update(struct hmac_sha1_ctx *ctx,</div><div class='add'>+				    const u8 *data, size_t data_len)</div><div class='add'>+{</div><div class='add'>+	sha1_update(&amp;ctx-&gt;sha_ctx, data, data_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha1_final() - Finish computing an HMAC-SHA1 value</div><div class='add'>+ * @ctx: the HMAC context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA1 value</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha1_final(struct hmac_sha1_ctx *ctx,</div><div class='add'>+		     u8 out[at_least SHA1_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha1() - Compute HMAC-SHA1 in one shot, using a prepared key</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA1 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key only once, consider using hmac_sha1_usingrawkey().</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha1(const struct hmac_sha1_key *key,</div><div class='add'>+	       const u8 *data, size_t data_len,</div><div class='add'>+	       u8 out[at_least SHA1_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha1_usingrawkey() - Compute HMAC-SHA1 in one shot, using a raw key</div><div class='add'>+ * @raw_key: the raw HMAC-SHA1 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA1 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key multiple times, prefer to use hmac_sha1_preparekey()</div><div class='add'>+ * followed by multiple calls to hmac_sha1() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha1_usingrawkey(const u8 *raw_key, size_t raw_key_len,</div><div class='add'>+			   const u8 *data, size_t data_len,</div><div class='add'>+			   u8 out[at_least SHA1_DIGEST_SIZE]);</div><div class='add'>+</div><div class='ctx'> #endif /* _CRYPTO_SHA1_H */</div><div class='head'>diff --git a/include/crypto/sha1_base.h b/include/crypto/sha1_base.h<br/>deleted file mode 100644<br/>index 2e0e7c3827d1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sha1_base.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha1_base.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * sha1_base.h - core logic for SHA-1 implementations</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2015 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CRYPTO_SHA1_BASE_H</div><div class='del'>-#define _CRYPTO_SHA1_BASE_H</div><div class='del'>-</div><div class='del'>-#include &lt;crypto/internal/hash.h&gt;</div><div class='del'>-#include &lt;crypto/sha1.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-typedef void (sha1_block_fn)(struct sha1_state *sst, u8 const *src, int blocks);</div><div class='del'>-</div><div class='del'>-static inline int sha1_base_init(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct sha1_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	sctx-&gt;state[0] = SHA1_H0;</div><div class='del'>-	sctx-&gt;state[1] = SHA1_H1;</div><div class='del'>-	sctx-&gt;state[2] = SHA1_H2;</div><div class='del'>-	sctx-&gt;state[3] = SHA1_H3;</div><div class='del'>-	sctx-&gt;state[4] = SHA1_H4;</div><div class='del'>-	sctx-&gt;count = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha1_base_do_update(struct shash_desc *desc,</div><div class='del'>-				      const u8 *data,</div><div class='del'>-				      unsigned int len,</div><div class='del'>-				      sha1_block_fn *block_fn)</div><div class='del'>-{</div><div class='del'>-	struct sha1_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-	unsigned int partial = sctx-&gt;count % SHA1_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	sctx-&gt;count += len;</div><div class='del'>-</div><div class='del'>-	if (unlikely((partial + len) &gt;= SHA1_BLOCK_SIZE)) {</div><div class='del'>-		int blocks;</div><div class='del'>-</div><div class='del'>-		if (partial) {</div><div class='del'>-			int p = SHA1_BLOCK_SIZE - partial;</div><div class='del'>-</div><div class='del'>-			memcpy(sctx-&gt;buffer + partial, data, p);</div><div class='del'>-			data += p;</div><div class='del'>-			len -= p;</div><div class='del'>-</div><div class='del'>-			block_fn(sctx, sctx-&gt;buffer, 1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		blocks = len / SHA1_BLOCK_SIZE;</div><div class='del'>-		len %= SHA1_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-		if (blocks) {</div><div class='del'>-			block_fn(sctx, data, blocks);</div><div class='del'>-			data += blocks * SHA1_BLOCK_SIZE;</div><div class='del'>-		}</div><div class='del'>-		partial = 0;</div><div class='del'>-	}</div><div class='del'>-	if (len)</div><div class='del'>-		memcpy(sctx-&gt;buffer + partial, data, len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha1_base_do_finalize(struct shash_desc *desc,</div><div class='del'>-					sha1_block_fn *block_fn)</div><div class='del'>-{</div><div class='del'>-	const int bit_offset = SHA1_BLOCK_SIZE - sizeof(__be64);</div><div class='del'>-	struct sha1_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-	__be64 *bits = (__be64 *)(sctx-&gt;buffer + bit_offset);</div><div class='del'>-	unsigned int partial = sctx-&gt;count % SHA1_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	sctx-&gt;buffer[partial++] = 0x80;</div><div class='del'>-	if (partial &gt; bit_offset) {</div><div class='del'>-		memset(sctx-&gt;buffer + partial, 0x0, SHA1_BLOCK_SIZE - partial);</div><div class='del'>-		partial = 0;</div><div class='del'>-</div><div class='del'>-		block_fn(sctx, sctx-&gt;buffer, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(sctx-&gt;buffer + partial, 0x0, bit_offset - partial);</div><div class='del'>-	*bits = cpu_to_be64(sctx-&gt;count &lt;&lt; 3);</div><div class='del'>-	block_fn(sctx, sctx-&gt;buffer, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha1_base_finish(struct shash_desc *desc, u8 *out)</div><div class='del'>-{</div><div class='del'>-	struct sha1_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-	__be32 *digest = (__be32 *)out;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; SHA1_DIGEST_SIZE / sizeof(__be32); i++)</div><div class='del'>-		put_unaligned_be32(sctx-&gt;state[i], digest++);</div><div class='del'>-</div><div class='del'>-	memzero_explicit(sctx, sizeof(*sctx));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _CRYPTO_SHA1_BASE_H */</div><div class='head'>diff --git a/include/crypto/sha2.h b/include/crypto/sha2.h<br/>index b9e9281d76c9..7bb8fe169daf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sha2.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/sha2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/sha2.h</a></div><div class='hunk'>@@ -13,12 +13,14 @@</div><div class='ctx'> </div><div class='ctx'> #define SHA256_DIGEST_SIZE      32</div><div class='ctx'> #define SHA256_BLOCK_SIZE       64</div><div class='add'>+#define SHA256_STATE_WORDS      8</div><div class='ctx'> </div><div class='ctx'> #define SHA384_DIGEST_SIZE      48</div><div class='ctx'> #define SHA384_BLOCK_SIZE       128</div><div class='ctx'> </div><div class='ctx'> #define SHA512_DIGEST_SIZE      64</div><div class='ctx'> #define SHA512_BLOCK_SIZE       128</div><div class='add'>+#define SHA512_STATE_SIZE       80</div><div class='ctx'> </div><div class='ctx'> #define SHA224_H0	0xc1059ed8UL</div><div class='ctx'> #define SHA224_H1	0x367cd507UL</div><div class='hunk'>@@ -64,9 +66,45 @@ extern const u8 sha384_zero_message_hash[SHA384_DIGEST_SIZE];</div><div class='ctx'> </div><div class='ctx'> extern const u8 sha512_zero_message_hash[SHA512_DIGEST_SIZE];</div><div class='ctx'> </div><div class='del'>-struct sha256_state {</div><div class='del'>-	u32 state[SHA256_DIGEST_SIZE / 4];</div><div class='add'>+struct crypto_sha256_state {</div><div class='add'>+	u32 state[SHA256_STATE_WORDS];</div><div class='ctx'> 	u64 count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void sha224_block_init(struct crypto_sha256_state *sctx)</div><div class='add'>+{</div><div class='add'>+	sctx-&gt;state[0] = SHA224_H0;</div><div class='add'>+	sctx-&gt;state[1] = SHA224_H1;</div><div class='add'>+	sctx-&gt;state[2] = SHA224_H2;</div><div class='add'>+	sctx-&gt;state[3] = SHA224_H3;</div><div class='add'>+	sctx-&gt;state[4] = SHA224_H4;</div><div class='add'>+	sctx-&gt;state[5] = SHA224_H5;</div><div class='add'>+	sctx-&gt;state[6] = SHA224_H6;</div><div class='add'>+	sctx-&gt;state[7] = SHA224_H7;</div><div class='add'>+	sctx-&gt;count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sha256_block_init(struct crypto_sha256_state *sctx)</div><div class='add'>+{</div><div class='add'>+	sctx-&gt;state[0] = SHA256_H0;</div><div class='add'>+	sctx-&gt;state[1] = SHA256_H1;</div><div class='add'>+	sctx-&gt;state[2] = SHA256_H2;</div><div class='add'>+	sctx-&gt;state[3] = SHA256_H3;</div><div class='add'>+	sctx-&gt;state[4] = SHA256_H4;</div><div class='add'>+	sctx-&gt;state[5] = SHA256_H5;</div><div class='add'>+	sctx-&gt;state[6] = SHA256_H6;</div><div class='add'>+	sctx-&gt;state[7] = SHA256_H7;</div><div class='add'>+	sctx-&gt;count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sha256_state {</div><div class='add'>+	union {</div><div class='add'>+		struct crypto_sha256_state ctx;</div><div class='add'>+		struct {</div><div class='add'>+			u32 state[SHA256_STATE_WORDS];</div><div class='add'>+			u64 count;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> 	u8 buf[SHA256_BLOCK_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -76,59 +114,800 @@ struct sha512_state {</div><div class='ctx'> 	u8 buf[SHA512_BLOCK_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct shash_desc;</div><div class='add'>+/* State for the SHA-256 (and SHA-224) compression function */</div><div class='add'>+struct sha256_block_state {</div><div class='add'>+	u32 h[SHA256_STATE_WORDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Context structure, shared by SHA-224 and SHA-256.  The sha224_ctx and</div><div class='add'>+ * sha256_ctx structs wrap this one so that the API has proper typing and</div><div class='add'>+ * doesn't allow mixing the SHA-224 and SHA-256 functions arbitrarily.</div><div class='add'>+ */</div><div class='add'>+struct __sha256_ctx {</div><div class='add'>+	struct sha256_block_state state;</div><div class='add'>+	u64 bytecount;</div><div class='add'>+	u8 buf[SHA256_BLOCK_SIZE] __aligned(__alignof__(__be64));</div><div class='add'>+};</div><div class='add'>+void __sha256_update(struct __sha256_ctx *ctx, const u8 *data, size_t len);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HMAC key and message context structs, shared by HMAC-SHA224 and HMAC-SHA256.</div><div class='add'>+ * The hmac_sha224_* and hmac_sha256_* structs wrap this one so that the API has</div><div class='add'>+ * proper typing and doesn't allow mixing the functions arbitrarily.</div><div class='add'>+ */</div><div class='add'>+struct __hmac_sha256_key {</div><div class='add'>+	struct sha256_block_state istate;</div><div class='add'>+	struct sha256_block_state ostate;</div><div class='add'>+};</div><div class='add'>+struct __hmac_sha256_ctx {</div><div class='add'>+	struct __sha256_ctx sha_ctx;</div><div class='add'>+	struct sha256_block_state ostate;</div><div class='add'>+};</div><div class='add'>+void __hmac_sha256_init(struct __hmac_sha256_ctx *ctx,</div><div class='add'>+			const struct __hmac_sha256_key *key);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sha224_ctx - Context for hashing a message with SHA-224</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct sha224_ctx {</div><div class='add'>+	struct __sha256_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha224_init() - Initialize a SHA-224 context for a new message</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider sha224() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha224_init(struct sha224_ctx *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha224_update() - Update a SHA-224 context with message data</div><div class='add'>+ * @ctx: the context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha224_update(struct sha224_ctx *ctx,</div><div class='add'>+				 const u8 *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	__sha256_update(&amp;ctx-&gt;ctx, data, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha224_final() - Finish computing a SHA-224 message digest</div><div class='add'>+ * @ctx: the context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting SHA-224 message digest</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha224_final(struct sha224_ctx *ctx, u8 out[at_least SHA224_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha224() - Compute SHA-224 message digest in one shot</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting SHA-224 message digest</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha224(const u8 *data, size_t len, u8 out[at_least SHA224_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha224_key - Prepared key for HMAC-SHA224</div><div class='add'>+ * @key: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha224_key {</div><div class='add'>+	struct __hmac_sha256_key key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha224_ctx - Context for computing HMAC-SHA224 of a message</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha224_ctx {</div><div class='add'>+	struct __hmac_sha256_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha224_preparekey() - Prepare a key for HMAC-SHA224</div><div class='add'>+ * @key: (output) the key structure to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA224 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * Note: the caller is responsible for zeroizing both the struct hmac_sha224_key</div><div class='add'>+ * and the raw key once they are no longer needed.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha224_preparekey(struct hmac_sha224_key *key,</div><div class='add'>+			    const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha224_init() - Initialize an HMAC-SHA224 context for a new message</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha224() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha224_init(struct hmac_sha224_ctx *ctx,</div><div class='add'>+				    const struct hmac_sha224_key *key)</div><div class='add'>+{</div><div class='add'>+	__hmac_sha256_init(&amp;ctx-&gt;ctx, &amp;key-&gt;key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha224_init_usingrawkey() - Initialize an HMAC-SHA224 context for a new</div><div class='add'>+ *				    message, using a raw key</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA224 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha224_usingrawkey()</div><div class='add'>+ * instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha224_init_usingrawkey(struct hmac_sha224_ctx *ctx,</div><div class='add'>+				  const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha224_update() - Update an HMAC-SHA224 context with message data</div><div class='add'>+ * @ctx: the HMAC context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha224_update(struct hmac_sha224_ctx *ctx,</div><div class='add'>+				      const u8 *data, size_t data_len)</div><div class='add'>+{</div><div class='add'>+	__sha256_update(&amp;ctx-&gt;ctx.sha_ctx, data, data_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha224_final() - Finish computing an HMAC-SHA224 value</div><div class='add'>+ * @ctx: the HMAC context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA224 value</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha224_final(struct hmac_sha224_ctx *ctx,</div><div class='add'>+		       u8 out[at_least SHA224_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha224() - Compute HMAC-SHA224 in one shot, using a prepared key</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA224 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key only once, consider using hmac_sha224_usingrawkey().</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha224(const struct hmac_sha224_key *key,</div><div class='add'>+		 const u8 *data, size_t data_len,</div><div class='add'>+		 u8 out[at_least SHA224_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha224_usingrawkey() - Compute HMAC-SHA224 in one shot, using a raw key</div><div class='add'>+ * @raw_key: the raw HMAC-SHA224 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA224 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key multiple times, prefer to use</div><div class='add'>+ * hmac_sha224_preparekey() followed by multiple calls to hmac_sha224() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha224_usingrawkey(const u8 *raw_key, size_t raw_key_len,</div><div class='add'>+			     const u8 *data, size_t data_len,</div><div class='add'>+			     u8 out[at_least SHA224_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sha256_ctx - Context for hashing a message with SHA-256</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct sha256_ctx {</div><div class='add'>+	struct __sha256_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha256_init() - Initialize a SHA-256 context for a new message</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider sha256() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha256_init(struct sha256_ctx *ctx);</div><div class='ctx'> </div><div class='del'>-extern int crypto_sha256_update(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			      unsigned int len);</div><div class='add'>+/**</div><div class='add'>+ * sha256_update() - Update a SHA-256 context with message data</div><div class='add'>+ * @ctx: the context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha256_update(struct sha256_ctx *ctx,</div><div class='add'>+				 const u8 *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	__sha256_update(&amp;ctx-&gt;ctx, data, len);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-extern int crypto_sha256_finup(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			       unsigned int len, u8 *hash);</div><div class='add'>+/**</div><div class='add'>+ * sha256_final() - Finish computing a SHA-256 message digest</div><div class='add'>+ * @ctx: the context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting SHA-256 message digest</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha256_final(struct sha256_ctx *ctx, u8 out[at_least SHA256_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha256() - Compute SHA-256 message digest in one shot</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting SHA-256 message digest</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha256(const u8 *data, size_t len, u8 out[at_least SHA256_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha256_finup_2x() - Compute two SHA-256 digests from a common initial</div><div class='add'>+ *		       context.  On some CPUs, this is faster than sequentially</div><div class='add'>+ *		       computing each digest.</div><div class='add'>+ * @ctx: an optional initial context, which may have already processed data.  If</div><div class='add'>+ *	 NULL, a default initial context is used (equivalent to sha256_init()).</div><div class='add'>+ * @data1: data for the first message</div><div class='add'>+ * @data2: data for the second message</div><div class='add'>+ * @len: the length of each of @data1 and @data2, in bytes</div><div class='add'>+ * @out1: (output) the first SHA-256 message digest</div><div class='add'>+ * @out2: (output) the second SHA-256 message digest</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha256_finup_2x(const struct sha256_ctx *ctx, const u8 *data1,</div><div class='add'>+		     const u8 *data2, size_t len,</div><div class='add'>+		     u8 out1[at_least SHA256_DIGEST_SIZE],</div><div class='add'>+		     u8 out2[at_least SHA256_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha256_finup_2x_is_optimized() - Check if sha256_finup_2x() is using a real</div><div class='add'>+ *				    interleaved implementation, as opposed to a</div><div class='add'>+ *				    sequential fallback</div><div class='add'>+ * @return: true if optimized</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+bool sha256_finup_2x_is_optimized(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha256_key - Prepared key for HMAC-SHA256</div><div class='add'>+ * @key: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha256_key {</div><div class='add'>+	struct __hmac_sha256_key key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha256_ctx - Context for computing HMAC-SHA256 of a message</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha256_ctx {</div><div class='add'>+	struct __hmac_sha256_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha256_preparekey() - Prepare a key for HMAC-SHA256</div><div class='add'>+ * @key: (output) the key structure to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA256 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * Note: the caller is responsible for zeroizing both the struct hmac_sha256_key</div><div class='add'>+ * and the raw key once they are no longer needed.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha256_preparekey(struct hmac_sha256_key *key,</div><div class='add'>+			    const u8 *raw_key, size_t raw_key_len);</div><div class='ctx'> </div><div class='del'>-extern int crypto_sha512_update(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			      unsigned int len);</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha256_init() - Initialize an HMAC-SHA256 context for a new message</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha256() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha256_init(struct hmac_sha256_ctx *ctx,</div><div class='add'>+				    const struct hmac_sha256_key *key)</div><div class='add'>+{</div><div class='add'>+	__hmac_sha256_init(&amp;ctx-&gt;ctx, &amp;key-&gt;key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha256_init_usingrawkey() - Initialize an HMAC-SHA256 context for a new</div><div class='add'>+ *				    message, using a raw key</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA256 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha256_usingrawkey()</div><div class='add'>+ * instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha256_init_usingrawkey(struct hmac_sha256_ctx *ctx,</div><div class='add'>+				  const u8 *raw_key, size_t raw_key_len);</div><div class='ctx'> </div><div class='del'>-extern int crypto_sha512_finup(struct shash_desc *desc, const u8 *data,</div><div class='del'>-			       unsigned int len, u8 *hash);</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha256_update() - Update an HMAC-SHA256 context with message data</div><div class='add'>+ * @ctx: the HMAC context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha256_update(struct hmac_sha256_ctx *ctx,</div><div class='add'>+				      const u8 *data, size_t data_len)</div><div class='add'>+{</div><div class='add'>+	__sha256_update(&amp;ctx-&gt;ctx.sha_ctx, data, data_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha256_final() - Finish computing an HMAC-SHA256 value</div><div class='add'>+ * @ctx: the HMAC context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA256 value</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha256_final(struct hmac_sha256_ctx *ctx,</div><div class='add'>+		       u8 out[at_least SHA256_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha256() - Compute HMAC-SHA256 in one shot, using a prepared key</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA256 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key only once, consider using hmac_sha256_usingrawkey().</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha256(const struct hmac_sha256_key *key,</div><div class='add'>+		 const u8 *data, size_t data_len,</div><div class='add'>+		 u8 out[at_least SHA256_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha256_usingrawkey() - Compute HMAC-SHA256 in one shot, using a raw key</div><div class='add'>+ * @raw_key: the raw HMAC-SHA256 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA256 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key multiple times, prefer to use</div><div class='add'>+ * hmac_sha256_preparekey() followed by multiple calls to hmac_sha256() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha256_usingrawkey(const u8 *raw_key, size_t raw_key_len,</div><div class='add'>+			     const u8 *data, size_t data_len,</div><div class='add'>+			     u8 out[at_least SHA256_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/* State for the SHA-512 (and SHA-384) compression function */</div><div class='add'>+struct sha512_block_state {</div><div class='add'>+	u64 h[8];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Stand-alone implementation of the SHA256 algorithm. It is designed to</div><div class='del'>- * have as little dependencies as possible so it can be used in the</div><div class='del'>- * kexec_file purgatory. In other cases you should generally use the</div><div class='del'>- * hash APIs from include/crypto/hash.h. Especially when hashing large</div><div class='del'>- * amounts of data as those APIs may be hw-accelerated.</div><div class='add'>+ * Context structure, shared by SHA-384 and SHA-512.  The sha384_ctx and</div><div class='add'>+ * sha512_ctx structs wrap this one so that the API has proper typing and</div><div class='add'>+ * doesn't allow mixing the SHA-384 and SHA-512 functions arbitrarily.</div><div class='add'>+ */</div><div class='add'>+struct __sha512_ctx {</div><div class='add'>+	struct sha512_block_state state;</div><div class='add'>+	u64 bytecount_lo;</div><div class='add'>+	u64 bytecount_hi;</div><div class='add'>+	u8 buf[SHA512_BLOCK_SIZE] __aligned(__alignof__(__be64));</div><div class='add'>+};</div><div class='add'>+void __sha512_update(struct __sha512_ctx *ctx, const u8 *data, size_t len);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HMAC key and message context structs, shared by HMAC-SHA384 and HMAC-SHA512.</div><div class='add'>+ * The hmac_sha384_* and hmac_sha512_* structs wrap this one so that the API has</div><div class='add'>+ * proper typing and doesn't allow mixing the functions arbitrarily.</div><div class='add'>+ */</div><div class='add'>+struct __hmac_sha512_key {</div><div class='add'>+	struct sha512_block_state istate;</div><div class='add'>+	struct sha512_block_state ostate;</div><div class='add'>+};</div><div class='add'>+struct __hmac_sha512_ctx {</div><div class='add'>+	struct __sha512_ctx sha_ctx;</div><div class='add'>+	struct sha512_block_state ostate;</div><div class='add'>+};</div><div class='add'>+void __hmac_sha512_init(struct __hmac_sha512_ctx *ctx,</div><div class='add'>+			const struct __hmac_sha512_key *key);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sha384_ctx - Context for hashing a message with SHA-384</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct sha384_ctx {</div><div class='add'>+	struct __sha512_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha384_init() - Initialize a SHA-384 context for a new message</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider sha384() instead.</div><div class='ctx'>  *</div><div class='del'>- * For details see lib/crypto/sha256.c</div><div class='add'>+ * Context: Any context.</div><div class='ctx'>  */</div><div class='add'>+void sha384_init(struct sha384_ctx *ctx);</div><div class='ctx'> </div><div class='del'>-static inline void sha256_init(struct sha256_state *sctx)</div><div class='add'>+/**</div><div class='add'>+ * sha384_update() - Update a SHA-384 context with message data</div><div class='add'>+ * @ctx: the context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha384_update(struct sha384_ctx *ctx,</div><div class='add'>+				 const u8 *data, size_t len)</div><div class='ctx'> {</div><div class='del'>-	sctx-&gt;state[0] = SHA256_H0;</div><div class='del'>-	sctx-&gt;state[1] = SHA256_H1;</div><div class='del'>-	sctx-&gt;state[2] = SHA256_H2;</div><div class='del'>-	sctx-&gt;state[3] = SHA256_H3;</div><div class='del'>-	sctx-&gt;state[4] = SHA256_H4;</div><div class='del'>-	sctx-&gt;state[5] = SHA256_H5;</div><div class='del'>-	sctx-&gt;state[6] = SHA256_H6;</div><div class='del'>-	sctx-&gt;state[7] = SHA256_H7;</div><div class='del'>-	sctx-&gt;count = 0;</div><div class='add'>+	__sha512_update(&amp;ctx-&gt;ctx, data, len);</div><div class='ctx'> }</div><div class='del'>-void sha256_update(struct sha256_state *sctx, const u8 *data, unsigned int len);</div><div class='del'>-void sha256_final(struct sha256_state *sctx, u8 *out);</div><div class='del'>-void sha256(const u8 *data, unsigned int len, u8 *out);</div><div class='ctx'> </div><div class='del'>-static inline void sha224_init(struct sha256_state *sctx)</div><div class='add'>+/**</div><div class='add'>+ * sha384_final() - Finish computing a SHA-384 message digest</div><div class='add'>+ * @ctx: the context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting SHA-384 message digest</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha384_final(struct sha384_ctx *ctx, u8 out[at_least SHA384_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha384() - Compute SHA-384 message digest in one shot</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting SHA-384 message digest</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha384(const u8 *data, size_t len, u8 out[at_least SHA384_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha384_key - Prepared key for HMAC-SHA384</div><div class='add'>+ * @key: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha384_key {</div><div class='add'>+	struct __hmac_sha512_key key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha384_ctx - Context for computing HMAC-SHA384 of a message</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha384_ctx {</div><div class='add'>+	struct __hmac_sha512_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha384_preparekey() - Prepare a key for HMAC-SHA384</div><div class='add'>+ * @key: (output) the key structure to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA384 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * Note: the caller is responsible for zeroizing both the struct hmac_sha384_key</div><div class='add'>+ * and the raw key once they are no longer needed.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha384_preparekey(struct hmac_sha384_key *key,</div><div class='add'>+			    const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha384_init() - Initialize an HMAC-SHA384 context for a new message</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha384() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha384_init(struct hmac_sha384_ctx *ctx,</div><div class='add'>+				    const struct hmac_sha384_key *key)</div><div class='ctx'> {</div><div class='del'>-	sctx-&gt;state[0] = SHA224_H0;</div><div class='del'>-	sctx-&gt;state[1] = SHA224_H1;</div><div class='del'>-	sctx-&gt;state[2] = SHA224_H2;</div><div class='del'>-	sctx-&gt;state[3] = SHA224_H3;</div><div class='del'>-	sctx-&gt;state[4] = SHA224_H4;</div><div class='del'>-	sctx-&gt;state[5] = SHA224_H5;</div><div class='del'>-	sctx-&gt;state[6] = SHA224_H6;</div><div class='del'>-	sctx-&gt;state[7] = SHA224_H7;</div><div class='del'>-	sctx-&gt;count = 0;</div><div class='add'>+	__hmac_sha512_init(&amp;ctx-&gt;ctx, &amp;key-&gt;key);</div><div class='ctx'> }</div><div class='del'>-/* Simply use sha256_update as it is equivalent to sha224_update. */</div><div class='del'>-void sha224_final(struct sha256_state *sctx, u8 *out);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha384_init_usingrawkey() - Initialize an HMAC-SHA384 context for a new</div><div class='add'>+ *				    message, using a raw key</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA384 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha384_usingrawkey()</div><div class='add'>+ * instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha384_init_usingrawkey(struct hmac_sha384_ctx *ctx,</div><div class='add'>+				  const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha384_update() - Update an HMAC-SHA384 context with message data</div><div class='add'>+ * @ctx: the HMAC context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha384_update(struct hmac_sha384_ctx *ctx,</div><div class='add'>+				      const u8 *data, size_t data_len)</div><div class='add'>+{</div><div class='add'>+	__sha512_update(&amp;ctx-&gt;ctx.sha_ctx, data, data_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha384_final() - Finish computing an HMAC-SHA384 value</div><div class='add'>+ * @ctx: the HMAC context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA384 value</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha384_final(struct hmac_sha384_ctx *ctx,</div><div class='add'>+		       u8 out[at_least SHA384_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha384() - Compute HMAC-SHA384 in one shot, using a prepared key</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA384 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key only once, consider using hmac_sha384_usingrawkey().</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha384(const struct hmac_sha384_key *key,</div><div class='add'>+		 const u8 *data, size_t data_len,</div><div class='add'>+		 u8 out[at_least SHA384_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha384_usingrawkey() - Compute HMAC-SHA384 in one shot, using a raw key</div><div class='add'>+ * @raw_key: the raw HMAC-SHA384 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA384 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key multiple times, prefer to use</div><div class='add'>+ * hmac_sha384_preparekey() followed by multiple calls to hmac_sha384() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha384_usingrawkey(const u8 *raw_key, size_t raw_key_len,</div><div class='add'>+			     const u8 *data, size_t data_len,</div><div class='add'>+			     u8 out[at_least SHA384_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sha512_ctx - Context for hashing a message with SHA-512</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct sha512_ctx {</div><div class='add'>+	struct __sha512_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha512_init() - Initialize a SHA-512 context for a new message</div><div class='add'>+ * @ctx: the context to initialize</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider sha512() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha512_init(struct sha512_ctx *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha512_update() - Update a SHA-512 context with message data</div><div class='add'>+ * @ctx: the context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha512_update(struct sha512_ctx *ctx,</div><div class='add'>+				 const u8 *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	__sha512_update(&amp;ctx-&gt;ctx, data, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha512_final() - Finish computing a SHA-512 message digest</div><div class='add'>+ * @ctx: the context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting SHA-512 message digest</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha512_final(struct sha512_ctx *ctx, u8 out[at_least SHA512_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha512() - Compute SHA-512 message digest in one shot</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting SHA-512 message digest</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha512(const u8 *data, size_t len, u8 out[at_least SHA512_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha512_key - Prepared key for HMAC-SHA512</div><div class='add'>+ * @key: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha512_key {</div><div class='add'>+	struct __hmac_sha512_key key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hmac_sha512_ctx - Context for computing HMAC-SHA512 of a message</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct hmac_sha512_ctx {</div><div class='add'>+	struct __hmac_sha512_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha512_preparekey() - Prepare a key for HMAC-SHA512</div><div class='add'>+ * @key: (output) the key structure to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA512 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * Note: the caller is responsible for zeroizing both the struct hmac_sha512_key</div><div class='add'>+ * and the raw key once they are no longer needed.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha512_preparekey(struct hmac_sha512_key *key,</div><div class='add'>+			    const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha512_init() - Initialize an HMAC-SHA512 context for a new message</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha512() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha512_init(struct hmac_sha512_ctx *ctx,</div><div class='add'>+				    const struct hmac_sha512_key *key)</div><div class='add'>+{</div><div class='add'>+	__hmac_sha512_init(&amp;ctx-&gt;ctx, &amp;key-&gt;key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha512_init_usingrawkey() - Initialize an HMAC-SHA512 context for a new</div><div class='add'>+ *				    message, using a raw key</div><div class='add'>+ * @ctx: (output) the HMAC context to initialize</div><div class='add'>+ * @raw_key: the raw HMAC-SHA512 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * If you don't need incremental computation, consider hmac_sha512_usingrawkey()</div><div class='add'>+ * instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha512_init_usingrawkey(struct hmac_sha512_ctx *ctx,</div><div class='add'>+				  const u8 *raw_key, size_t raw_key_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha512_update() - Update an HMAC-SHA512 context with message data</div><div class='add'>+ * @ctx: the HMAC context to update; must have been initialized</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void hmac_sha512_update(struct hmac_sha512_ctx *ctx,</div><div class='add'>+				      const u8 *data, size_t data_len)</div><div class='add'>+{</div><div class='add'>+	__sha512_update(&amp;ctx-&gt;ctx.sha_ctx, data, data_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha512_final() - Finish computing an HMAC-SHA512 value</div><div class='add'>+ * @ctx: the HMAC context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA512 value</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha512_final(struct hmac_sha512_ctx *ctx,</div><div class='add'>+		       u8 out[at_least SHA512_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha512() - Compute HMAC-SHA512 in one shot, using a prepared key</div><div class='add'>+ * @key: the prepared HMAC key</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA512 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key only once, consider using hmac_sha512_usingrawkey().</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha512(const struct hmac_sha512_key *key,</div><div class='add'>+		 const u8 *data, size_t data_len,</div><div class='add'>+		 u8 out[at_least SHA512_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hmac_sha512_usingrawkey() - Compute HMAC-SHA512 in one shot, using a raw key</div><div class='add'>+ * @raw_key: the raw HMAC-SHA512 key</div><div class='add'>+ * @raw_key_len: the key length in bytes.  All key lengths are supported.</div><div class='add'>+ * @data: the message data</div><div class='add'>+ * @data_len: the data length in bytes</div><div class='add'>+ * @out: (output) the resulting HMAC-SHA512 value</div><div class='add'>+ *</div><div class='add'>+ * If you're using the key multiple times, prefer to use</div><div class='add'>+ * hmac_sha512_preparekey() followed by multiple calls to hmac_sha512() instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void hmac_sha512_usingrawkey(const u8 *raw_key, size_t raw_key_len,</div><div class='add'>+			     const u8 *data, size_t data_len,</div><div class='add'>+			     u8 out[at_least SHA512_DIGEST_SIZE]);</div><div class='ctx'> </div><div class='ctx'> #endif /* _CRYPTO_SHA2_H */</div><div class='head'>diff --git a/include/crypto/sha256_base.h b/include/crypto/sha256_base.h<br/>deleted file mode 100644<br/>index ab904d82236f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sha256_base.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha256_base.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,135 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * sha256_base.h - core logic for SHA-256 implementations</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2015 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CRYPTO_SHA256_BASE_H</div><div class='del'>-#define _CRYPTO_SHA256_BASE_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;crypto/internal/hash.h&gt;</div><div class='del'>-#include &lt;crypto/sha2.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-typedef void (sha256_block_fn)(struct sha256_state *sst, u8 const *src,</div><div class='del'>-			       int blocks);</div><div class='del'>-</div><div class='del'>-static inline int sha224_base_init(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	sha224_init(sctx);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha256_base_init(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	sha256_init(sctx);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int lib_sha256_base_do_update(struct sha256_state *sctx,</div><div class='del'>-					    const u8 *data,</div><div class='del'>-					    unsigned int len,</div><div class='del'>-					    sha256_block_fn *block_fn)</div><div class='del'>-{</div><div class='del'>-	unsigned int partial = sctx-&gt;count % SHA256_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	sctx-&gt;count += len;</div><div class='del'>-</div><div class='del'>-	if (unlikely((partial + len) &gt;= SHA256_BLOCK_SIZE)) {</div><div class='del'>-		int blocks;</div><div class='del'>-</div><div class='del'>-		if (partial) {</div><div class='del'>-			int p = SHA256_BLOCK_SIZE - partial;</div><div class='del'>-</div><div class='del'>-			memcpy(sctx-&gt;buf + partial, data, p);</div><div class='del'>-			data += p;</div><div class='del'>-			len -= p;</div><div class='del'>-</div><div class='del'>-			block_fn(sctx, sctx-&gt;buf, 1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		blocks = len / SHA256_BLOCK_SIZE;</div><div class='del'>-		len %= SHA256_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-		if (blocks) {</div><div class='del'>-			block_fn(sctx, data, blocks);</div><div class='del'>-			data += blocks * SHA256_BLOCK_SIZE;</div><div class='del'>-		}</div><div class='del'>-		partial = 0;</div><div class='del'>-	}</div><div class='del'>-	if (len)</div><div class='del'>-		memcpy(sctx-&gt;buf + partial, data, len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha256_base_do_update(struct shash_desc *desc,</div><div class='del'>-					const u8 *data,</div><div class='del'>-					unsigned int len,</div><div class='del'>-					sha256_block_fn *block_fn)</div><div class='del'>-{</div><div class='del'>-	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	return lib_sha256_base_do_update(sctx, data, len, block_fn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int lib_sha256_base_do_finalize(struct sha256_state *sctx,</div><div class='del'>-					      sha256_block_fn *block_fn)</div><div class='del'>-{</div><div class='del'>-	const int bit_offset = SHA256_BLOCK_SIZE - sizeof(__be64);</div><div class='del'>-	__be64 *bits = (__be64 *)(sctx-&gt;buf + bit_offset);</div><div class='del'>-	unsigned int partial = sctx-&gt;count % SHA256_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	sctx-&gt;buf[partial++] = 0x80;</div><div class='del'>-	if (partial &gt; bit_offset) {</div><div class='del'>-		memset(sctx-&gt;buf + partial, 0x0, SHA256_BLOCK_SIZE - partial);</div><div class='del'>-		partial = 0;</div><div class='del'>-</div><div class='del'>-		block_fn(sctx, sctx-&gt;buf, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(sctx-&gt;buf + partial, 0x0, bit_offset - partial);</div><div class='del'>-	*bits = cpu_to_be64(sctx-&gt;count &lt;&lt; 3);</div><div class='del'>-	block_fn(sctx, sctx-&gt;buf, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha256_base_do_finalize(struct shash_desc *desc,</div><div class='del'>-					  sha256_block_fn *block_fn)</div><div class='del'>-{</div><div class='del'>-	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	return lib_sha256_base_do_finalize(sctx, block_fn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int lib_sha256_base_finish(struct sha256_state *sctx, u8 *out,</div><div class='del'>-					 unsigned int digest_size)</div><div class='del'>-{</div><div class='del'>-	__be32 *digest = (__be32 *)out;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; digest_size &gt; 0; i++, digest_size -= sizeof(__be32))</div><div class='del'>-		put_unaligned_be32(sctx-&gt;state[i], digest++);</div><div class='del'>-</div><div class='del'>-	memzero_explicit(sctx, sizeof(*sctx));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha256_base_finish(struct shash_desc *desc, u8 *out)</div><div class='del'>-{</div><div class='del'>-	unsigned int digest_size = crypto_shash_digestsize(desc-&gt;tfm);</div><div class='del'>-	struct sha256_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	return lib_sha256_base_finish(sctx, out, digest_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _CRYPTO_SHA256_BASE_H */</div><div class='head'>diff --git a/include/crypto/sha3.h b/include/crypto/sha3.h<br/>index 080f60c2e6b1..c9e4182ff74f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sha3.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/sha3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/sha3.h</a></div><div class='hunk'>@@ -1,34 +1,346 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Common values for SHA-3 algorithms</div><div class='add'>+ *</div><div class='add'>+ * See also Documentation/crypto/sha3.rst</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __CRYPTO_SHA3_H__</div><div class='ctx'> #define __CRYPTO_SHA3_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='ctx'> #define SHA3_224_DIGEST_SIZE	(224 / 8)</div><div class='ctx'> #define SHA3_224_BLOCK_SIZE	(200 - 2 * SHA3_224_DIGEST_SIZE)</div><div class='add'>+#define SHA3_224_EXPORT_SIZE	SHA3_STATE_SIZE + SHA3_224_BLOCK_SIZE + 1</div><div class='ctx'> </div><div class='ctx'> #define SHA3_256_DIGEST_SIZE	(256 / 8)</div><div class='ctx'> #define SHA3_256_BLOCK_SIZE	(200 - 2 * SHA3_256_DIGEST_SIZE)</div><div class='add'>+#define SHA3_256_EXPORT_SIZE	SHA3_STATE_SIZE + SHA3_256_BLOCK_SIZE + 1</div><div class='ctx'> </div><div class='ctx'> #define SHA3_384_DIGEST_SIZE	(384 / 8)</div><div class='ctx'> #define SHA3_384_BLOCK_SIZE	(200 - 2 * SHA3_384_DIGEST_SIZE)</div><div class='add'>+#define SHA3_384_EXPORT_SIZE	SHA3_STATE_SIZE + SHA3_384_BLOCK_SIZE + 1</div><div class='ctx'> </div><div class='ctx'> #define SHA3_512_DIGEST_SIZE	(512 / 8)</div><div class='ctx'> #define SHA3_512_BLOCK_SIZE	(200 - 2 * SHA3_512_DIGEST_SIZE)</div><div class='add'>+#define SHA3_512_EXPORT_SIZE	SHA3_STATE_SIZE + SHA3_512_BLOCK_SIZE + 1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SHAKE128 and SHAKE256 actually have variable output size, but this is used to</div><div class='add'>+ * calculate the block size (rate) analogously to the above.</div><div class='add'>+ */</div><div class='add'>+#define SHAKE128_DEFAULT_SIZE	(128 / 8)</div><div class='add'>+#define SHAKE128_BLOCK_SIZE	(200 - 2 * SHAKE128_DEFAULT_SIZE)</div><div class='add'>+#define SHAKE256_DEFAULT_SIZE	(256 / 8)</div><div class='add'>+#define SHAKE256_BLOCK_SIZE	(200 - 2 * SHAKE256_DEFAULT_SIZE)</div><div class='ctx'> </div><div class='add'>+#define SHA3_STATE_SIZE		200</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * State for the Keccak-f[1600] permutation: 25 64-bit words.</div><div class='add'>+ *</div><div class='add'>+ * We usually keep the state words as little-endian, to make absorbing and</div><div class='add'>+ * squeezing easier.  (It means that absorbing and squeezing can just treat the</div><div class='add'>+ * state as a byte array.)  The state words are converted to native-endian only</div><div class='add'>+ * temporarily by implementations of the permutation that need native-endian</div><div class='add'>+ * words.  Of course, that conversion is a no-op on little-endian machines.</div><div class='add'>+ */</div><div class='ctx'> struct sha3_state {</div><div class='del'>-	u64		st[25];</div><div class='del'>-	unsigned int	rsiz;</div><div class='del'>-	unsigned int	rsizw;</div><div class='add'>+	union {</div><div class='add'>+		__le64 words[SHA3_STATE_SIZE / 8];</div><div class='add'>+		u8 bytes[SHA3_STATE_SIZE];</div><div class='add'>+</div><div class='add'>+		u64 native_words[SHA3_STATE_SIZE / 8]; /* see comment above */</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Internal context, shared by the digests (SHA3-*) and the XOFs (SHAKE*) */</div><div class='add'>+struct __sha3_ctx {</div><div class='add'>+	struct sha3_state state;</div><div class='add'>+	u8 digest_size;		/* Digests only: the digest size in bytes */</div><div class='add'>+	u8 block_size;		/* Block size in bytes */</div><div class='add'>+	u8 absorb_offset;	/* Index of next state byte to absorb into */</div><div class='add'>+	u8 squeeze_offset;	/* XOFs only: index of next state byte to extract */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __sha3_update(struct __sha3_ctx *ctx, const u8 *in, size_t in_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sha3_ctx - Context for SHA3-224, SHA3-256, SHA3-384, or SHA3-512</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct sha3_ctx {</div><div class='add'>+	struct __sha3_ctx ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_zeroize_ctx() - Zeroize a SHA-3 context</div><div class='add'>+ * @ctx: The context to zeroize</div><div class='add'>+ *</div><div class='add'>+ * This is already called by sha3_final().  Call this explicitly when abandoning</div><div class='add'>+ * a context without calling sha3_final().</div><div class='add'>+ */</div><div class='add'>+static inline void sha3_zeroize_ctx(struct sha3_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	memzero_explicit(ctx, sizeof(*ctx));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	unsigned int	partial;</div><div class='del'>-	u8		buf[SHA3_224_BLOCK_SIZE];</div><div class='add'>+/**</div><div class='add'>+ * struct shake_ctx - Context for SHAKE128 or SHAKE256</div><div class='add'>+ * @ctx: private</div><div class='add'>+ */</div><div class='add'>+struct shake_ctx {</div><div class='add'>+	struct __sha3_ctx ctx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int crypto_sha3_init(struct shash_desc *desc);</div><div class='del'>-int crypto_sha3_update(struct shash_desc *desc, const u8 *data,</div><div class='del'>-		       unsigned int len);</div><div class='del'>-int crypto_sha3_final(struct shash_desc *desc, u8 *out);</div><div class='add'>+/**</div><div class='add'>+ * shake_zeroize_ctx() - Zeroize a SHAKE context</div><div class='add'>+ * @ctx: The context to zeroize</div><div class='add'>+ *</div><div class='add'>+ * Call this after the last squeeze.</div><div class='add'>+ */</div><div class='add'>+static inline void shake_zeroize_ctx(struct shake_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	memzero_explicit(ctx, sizeof(*ctx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_224_init() - Initialize a context for SHA3-224</div><div class='add'>+ * @ctx: The context to initialize</div><div class='add'>+ *</div><div class='add'>+ * This begins a new SHA3-224 message digest computation.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha3_224_init(struct sha3_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	*ctx = (struct sha3_ctx){</div><div class='add'>+		.ctx.digest_size = SHA3_224_DIGEST_SIZE,</div><div class='add'>+		.ctx.block_size = SHA3_224_BLOCK_SIZE,</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_256_init() - Initialize a context for SHA3-256</div><div class='add'>+ * @ctx: The context to initialize</div><div class='add'>+ *</div><div class='add'>+ * This begins a new SHA3-256 message digest computation.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha3_256_init(struct sha3_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	*ctx = (struct sha3_ctx){</div><div class='add'>+		.ctx.digest_size = SHA3_256_DIGEST_SIZE,</div><div class='add'>+		.ctx.block_size = SHA3_256_BLOCK_SIZE,</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_384_init() - Initialize a context for SHA3-384</div><div class='add'>+ * @ctx: The context to initialize</div><div class='add'>+ *</div><div class='add'>+ * This begins a new SHA3-384 message digest computation.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha3_384_init(struct sha3_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	*ctx = (struct sha3_ctx){</div><div class='add'>+		.ctx.digest_size = SHA3_384_DIGEST_SIZE,</div><div class='add'>+		.ctx.block_size = SHA3_384_BLOCK_SIZE,</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_512_init() - Initialize a context for SHA3-512</div><div class='add'>+ * @ctx: The context to initialize</div><div class='add'>+ *</div><div class='add'>+ * This begins a new SHA3-512 message digest computation.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha3_512_init(struct sha3_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	*ctx = (struct sha3_ctx){</div><div class='add'>+		.ctx.digest_size = SHA3_512_DIGEST_SIZE,</div><div class='add'>+		.ctx.block_size = SHA3_512_BLOCK_SIZE,</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_update() - Update a SHA-3 digest context with input data</div><div class='add'>+ * @ctx: The context to update; must have been initialized</div><div class='add'>+ * @in: The input data</div><div class='add'>+ * @in_len: Length of the input data in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times to add data to a SHA3-224, SHA3-256,</div><div class='add'>+ * SHA3-384, or SHA3-512 digest (depending on which init function was called).</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void sha3_update(struct sha3_ctx *ctx,</div><div class='add'>+			       const u8 *in, size_t in_len)</div><div class='add'>+{</div><div class='add'>+	__sha3_update(&amp;ctx-&gt;ctx, in, in_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_final() - Finish computing a SHA-3 message digest</div><div class='add'>+ * @ctx: The context to finalize; must have been initialized</div><div class='add'>+ * @out: (output) The resulting SHA3-224, SHA3-256, SHA3-384, or SHA3-512</div><div class='add'>+ *	 message digest, matching the init function that was called.  Note that</div><div class='add'>+ *	 the size differs for each one; see SHA3_*_DIGEST_SIZE.</div><div class='add'>+ *</div><div class='add'>+ * After finishing, this zeroizes @ctx.  So the caller does not need to do it.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha3_final(struct sha3_ctx *ctx, u8 *out);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * shake128_init() - Initialize a context for SHAKE128</div><div class='add'>+ * @ctx: The context to initialize</div><div class='add'>+ *</div><div class='add'>+ * This begins a new SHAKE128 extendable-output function (XOF) computation.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void shake128_init(struct shake_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	*ctx = (struct shake_ctx){</div><div class='add'>+		.ctx.block_size = SHAKE128_BLOCK_SIZE,</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * shake256_init() - Initialize a context for SHAKE256</div><div class='add'>+ * @ctx: The context to initialize</div><div class='add'>+ *</div><div class='add'>+ * This begins a new SHAKE256 extendable-output function (XOF) computation.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void shake256_init(struct shake_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	*ctx = (struct shake_ctx){</div><div class='add'>+		.ctx.block_size = SHAKE256_BLOCK_SIZE,</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * shake_update() - Update a SHAKE context with input data</div><div class='add'>+ * @ctx: The context to update; must have been initialized</div><div class='add'>+ * @in: The input data</div><div class='add'>+ * @in_len: Length of the input data in bytes</div><div class='add'>+ *</div><div class='add'>+ * This can be called any number of times to add more input data to SHAKE128 or</div><div class='add'>+ * SHAKE256.  This cannot be called after squeezing has begun.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void shake_update(struct shake_ctx *ctx,</div><div class='add'>+				const u8 *in, size_t in_len)</div><div class='add'>+{</div><div class='add'>+	__sha3_update(&amp;ctx-&gt;ctx, in, in_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * shake_squeeze() - Generate output from SHAKE128 or SHAKE256</div><div class='add'>+ * @ctx: The context to squeeze; must have been initialized</div><div class='add'>+ * @out: Where to write the resulting output data</div><div class='add'>+ * @out_len: The amount of data to extract to @out in bytes</div><div class='add'>+ *</div><div class='add'>+ * This may be called multiple times.  A number of consecutive squeezes laid</div><div class='add'>+ * end-to-end will yield the same output as one big squeeze generating the same</div><div class='add'>+ * total amount of output.  More input cannot be provided after squeezing has</div><div class='add'>+ * begun.  After the last squeeze, call shake_zeroize_ctx().</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void shake_squeeze(struct shake_ctx *ctx, u8 *out, size_t out_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_224() - Compute SHA3-224 digest in one shot</div><div class='add'>+ * @in: The input data to be digested</div><div class='add'>+ * @in_len: Length of the input data in bytes</div><div class='add'>+ * @out: The buffer into which the digest will be stored</div><div class='add'>+ *</div><div class='add'>+ * Convenience function that computes a SHA3-224 digest.  Use this instead of</div><div class='add'>+ * the incremental API if you're able to provide all the input at once.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha3_224(const u8 *in, size_t in_len, u8 out[SHA3_224_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_256() - Compute SHA3-256 digest in one shot</div><div class='add'>+ * @in: The input data to be digested</div><div class='add'>+ * @in_len: Length of the input data in bytes</div><div class='add'>+ * @out: The buffer into which the digest will be stored</div><div class='add'>+ *</div><div class='add'>+ * Convenience function that computes a SHA3-256 digest.  Use this instead of</div><div class='add'>+ * the incremental API if you're able to provide all the input at once.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha3_256(const u8 *in, size_t in_len, u8 out[SHA3_256_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_384() - Compute SHA3-384 digest in one shot</div><div class='add'>+ * @in: The input data to be digested</div><div class='add'>+ * @in_len: Length of the input data in bytes</div><div class='add'>+ * @out: The buffer into which the digest will be stored</div><div class='add'>+ *</div><div class='add'>+ * Convenience function that computes a SHA3-384 digest.  Use this instead of</div><div class='add'>+ * the incremental API if you're able to provide all the input at once.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha3_384(const u8 *in, size_t in_len, u8 out[SHA3_384_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sha3_512() - Compute SHA3-512 digest in one shot</div><div class='add'>+ * @in: The input data to be digested</div><div class='add'>+ * @in_len: Length of the input data in bytes</div><div class='add'>+ * @out: The buffer into which the digest will be stored</div><div class='add'>+ *</div><div class='add'>+ * Convenience function that computes a SHA3-512 digest.  Use this instead of</div><div class='add'>+ * the incremental API if you're able to provide all the input at once.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void sha3_512(const u8 *in, size_t in_len, u8 out[SHA3_512_DIGEST_SIZE]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * shake128() - Compute SHAKE128 in one shot</div><div class='add'>+ * @in: The input data to be used</div><div class='add'>+ * @in_len: Length of the input data in bytes</div><div class='add'>+ * @out: The buffer into which the output will be stored</div><div class='add'>+ * @out_len: Length of the output to produce in bytes</div><div class='add'>+ *</div><div class='add'>+ * Convenience function that computes SHAKE128 in one shot.  Use this instead of</div><div class='add'>+ * the incremental API if you're able to provide all the input at once as well</div><div class='add'>+ * as receive all the output at once.  All output lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void shake128(const u8 *in, size_t in_len, u8 *out, size_t out_len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * shake256() - Compute SHAKE256 in one shot</div><div class='add'>+ * @in: The input data to be used</div><div class='add'>+ * @in_len: Length of the input data in bytes</div><div class='add'>+ * @out: The buffer into which the output will be stored</div><div class='add'>+ * @out_len: Length of the output to produce in bytes</div><div class='add'>+ *</div><div class='add'>+ * Convenience function that computes SHAKE256 in one shot.  Use this instead of</div><div class='add'>+ * the incremental API if you're able to provide all the input at once as well</div><div class='add'>+ * as receive all the output at once.  All output lengths are supported.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+void shake256(const u8 *in, size_t in_len, u8 *out, size_t out_len);</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* __CRYPTO_SHA3_H__ */</div><div class='head'>diff --git a/include/crypto/sha512_base.h b/include/crypto/sha512_base.h<br/>deleted file mode 100644<br/>index b370b3340b16..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sha512_base.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sha512_base.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,134 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * sha512_base.h - core logic for SHA-512 implementations</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2015 Linaro Ltd &lt;ard.biesheuvel@linaro.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CRYPTO_SHA512_BASE_H</div><div class='del'>-#define _CRYPTO_SHA512_BASE_H</div><div class='del'>-</div><div class='del'>-#include &lt;crypto/internal/hash.h&gt;</div><div class='del'>-#include &lt;crypto/sha2.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-typedef void (sha512_block_fn)(struct sha512_state *sst, u8 const *src,</div><div class='del'>-			       int blocks);</div><div class='del'>-</div><div class='del'>-static inline int sha384_base_init(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct sha512_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	sctx-&gt;state[0] = SHA384_H0;</div><div class='del'>-	sctx-&gt;state[1] = SHA384_H1;</div><div class='del'>-	sctx-&gt;state[2] = SHA384_H2;</div><div class='del'>-	sctx-&gt;state[3] = SHA384_H3;</div><div class='del'>-	sctx-&gt;state[4] = SHA384_H4;</div><div class='del'>-	sctx-&gt;state[5] = SHA384_H5;</div><div class='del'>-	sctx-&gt;state[6] = SHA384_H6;</div><div class='del'>-	sctx-&gt;state[7] = SHA384_H7;</div><div class='del'>-	sctx-&gt;count[0] = sctx-&gt;count[1] = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha512_base_init(struct shash_desc *desc)</div><div class='del'>-{</div><div class='del'>-	struct sha512_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	sctx-&gt;state[0] = SHA512_H0;</div><div class='del'>-	sctx-&gt;state[1] = SHA512_H1;</div><div class='del'>-	sctx-&gt;state[2] = SHA512_H2;</div><div class='del'>-	sctx-&gt;state[3] = SHA512_H3;</div><div class='del'>-	sctx-&gt;state[4] = SHA512_H4;</div><div class='del'>-	sctx-&gt;state[5] = SHA512_H5;</div><div class='del'>-	sctx-&gt;state[6] = SHA512_H6;</div><div class='del'>-	sctx-&gt;state[7] = SHA512_H7;</div><div class='del'>-	sctx-&gt;count[0] = sctx-&gt;count[1] = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha512_base_do_update(struct shash_desc *desc,</div><div class='del'>-					const u8 *data,</div><div class='del'>-					unsigned int len,</div><div class='del'>-					sha512_block_fn *block_fn)</div><div class='del'>-{</div><div class='del'>-	struct sha512_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-	unsigned int partial = sctx-&gt;count[0] % SHA512_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	sctx-&gt;count[0] += len;</div><div class='del'>-	if (sctx-&gt;count[0] &lt; len)</div><div class='del'>-		sctx-&gt;count[1]++;</div><div class='del'>-</div><div class='del'>-	if (unlikely((partial + len) &gt;= SHA512_BLOCK_SIZE)) {</div><div class='del'>-		int blocks;</div><div class='del'>-</div><div class='del'>-		if (partial) {</div><div class='del'>-			int p = SHA512_BLOCK_SIZE - partial;</div><div class='del'>-</div><div class='del'>-			memcpy(sctx-&gt;buf + partial, data, p);</div><div class='del'>-			data += p;</div><div class='del'>-			len -= p;</div><div class='del'>-</div><div class='del'>-			block_fn(sctx, sctx-&gt;buf, 1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		blocks = len / SHA512_BLOCK_SIZE;</div><div class='del'>-		len %= SHA512_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-		if (blocks) {</div><div class='del'>-			block_fn(sctx, data, blocks);</div><div class='del'>-			data += blocks * SHA512_BLOCK_SIZE;</div><div class='del'>-		}</div><div class='del'>-		partial = 0;</div><div class='del'>-	}</div><div class='del'>-	if (len)</div><div class='del'>-		memcpy(sctx-&gt;buf + partial, data, len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha512_base_do_finalize(struct shash_desc *desc,</div><div class='del'>-					  sha512_block_fn *block_fn)</div><div class='del'>-{</div><div class='del'>-	const int bit_offset = SHA512_BLOCK_SIZE - sizeof(__be64[2]);</div><div class='del'>-	struct sha512_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-	__be64 *bits = (__be64 *)(sctx-&gt;buf + bit_offset);</div><div class='del'>-	unsigned int partial = sctx-&gt;count[0] % SHA512_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	sctx-&gt;buf[partial++] = 0x80;</div><div class='del'>-	if (partial &gt; bit_offset) {</div><div class='del'>-		memset(sctx-&gt;buf + partial, 0x0, SHA512_BLOCK_SIZE - partial);</div><div class='del'>-		partial = 0;</div><div class='del'>-</div><div class='del'>-		block_fn(sctx, sctx-&gt;buf, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(sctx-&gt;buf + partial, 0x0, bit_offset - partial);</div><div class='del'>-	bits[0] = cpu_to_be64(sctx-&gt;count[1] &lt;&lt; 3 | sctx-&gt;count[0] &gt;&gt; 61);</div><div class='del'>-	bits[1] = cpu_to_be64(sctx-&gt;count[0] &lt;&lt; 3);</div><div class='del'>-	block_fn(sctx, sctx-&gt;buf, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sha512_base_finish(struct shash_desc *desc, u8 *out)</div><div class='del'>-{</div><div class='del'>-	unsigned int digest_size = crypto_shash_digestsize(desc-&gt;tfm);</div><div class='del'>-	struct sha512_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-	__be64 *digest = (__be64 *)out;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; digest_size &gt; 0; i++, digest_size -= sizeof(__be64))</div><div class='del'>-		put_unaligned_be64(sctx-&gt;state[i], digest++);</div><div class='del'>-</div><div class='del'>-	memzero_explicit(sctx, sizeof(*sctx));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* _CRYPTO_SHA512_BASE_H */</div><div class='head'>diff --git a/include/crypto/sig.h b/include/crypto/sig.h<br/>index d25186bb2be3..fa6dafafab3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sig.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sig.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/sig.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/sig.h</a></div><div class='hunk'>@@ -20,6 +20,57 @@ struct crypto_sig {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct sig_alg - generic public key signature algorithm</div><div class='add'>+ *</div><div class='add'>+ * @sign:	Function performs a sign operation as defined by public key</div><div class='add'>+ *		algorithm. On success, the signature size is returned.</div><div class='add'>+ *		Optional.</div><div class='add'>+ * @verify:	Function performs a complete verify operation as defined by</div><div class='add'>+ *		public key algorithm, returning verification status. Optional.</div><div class='add'>+ * @set_pub_key: Function invokes the algorithm specific set public key</div><div class='add'>+ *		function, which knows how to decode and interpret</div><div class='add'>+ *		the BER encoded public key and parameters. Mandatory.</div><div class='add'>+ * @set_priv_key: Function invokes the algorithm specific set private key</div><div class='add'>+ *		function, which knows how to decode and interpret</div><div class='add'>+ *		the BER encoded private key and parameters. Optional.</div><div class='add'>+ * @key_size:	Function returns key size. Mandatory.</div><div class='add'>+ * @digest_size: Function returns maximum digest size. Optional.</div><div class='add'>+ * @max_size:	Function returns maximum signature size. Optional.</div><div class='add'>+ * @init:	Initialize the cryptographic transformation object.</div><div class='add'>+ *		This function is used to initialize the cryptographic</div><div class='add'>+ *		transformation object. This function is called only once at</div><div class='add'>+ *		the instantiation time, right after the transformation context</div><div class='add'>+ *		was allocated. In case the cryptographic hardware has some</div><div class='add'>+ *		special requirements which need to be handled by software, this</div><div class='add'>+ *		function shall check for the precise requirement of the</div><div class='add'>+ *		transformation and put any software fallbacks in place.</div><div class='add'>+ * @exit:	Deinitialize the cryptographic transformation object. This is a</div><div class='add'>+ *		counterpart to @init, used to remove various changes set in</div><div class='add'>+ *		@init.</div><div class='add'>+ *</div><div class='add'>+ * @base:	Common crypto API algorithm data structure</div><div class='add'>+ */</div><div class='add'>+struct sig_alg {</div><div class='add'>+	int (*sign)(struct crypto_sig *tfm,</div><div class='add'>+		    const void *src, unsigned int slen,</div><div class='add'>+		    void *dst, unsigned int dlen);</div><div class='add'>+	int (*verify)(struct crypto_sig *tfm,</div><div class='add'>+		      const void *src, unsigned int slen,</div><div class='add'>+		      const void *digest, unsigned int dlen);</div><div class='add'>+	int (*set_pub_key)(struct crypto_sig *tfm,</div><div class='add'>+			   const void *key, unsigned int keylen);</div><div class='add'>+	int (*set_priv_key)(struct crypto_sig *tfm,</div><div class='add'>+			    const void *key, unsigned int keylen);</div><div class='add'>+	unsigned int (*key_size)(struct crypto_sig *tfm);</div><div class='add'>+	unsigned int (*digest_size)(struct crypto_sig *tfm);</div><div class='add'>+	unsigned int (*max_size)(struct crypto_sig *tfm);</div><div class='add'>+	int (*init)(struct crypto_sig *tfm);</div><div class='add'>+	void (*exit)(struct crypto_sig *tfm);</div><div class='add'>+</div><div class='add'>+	struct crypto_alg base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * DOC: Generic Public Key Signature API</div><div class='ctx'>  *</div><div class='ctx'>  * The Public Key Signature API is used with the algorithms of type</div><div class='hunk'>@@ -47,6 +98,21 @@ static inline struct crypto_tfm *crypto_sig_tfm(struct crypto_sig *tfm)</div><div class='ctx'> 	return &amp;tfm-&gt;base;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct crypto_sig *__crypto_sig_tfm(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	return container_of(tfm, struct crypto_sig, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sig_alg *__crypto_sig_alg(struct crypto_alg *alg)</div><div class='add'>+{</div><div class='add'>+	return container_of(alg, struct sig_alg, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sig_alg *crypto_sig_alg(struct crypto_sig *tfm)</div><div class='add'>+{</div><div class='add'>+	return __crypto_sig_alg(crypto_sig_tfm(tfm)-&gt;__crt_alg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_free_sig() - free signature tfm handle</div><div class='ctx'>  *</div><div class='hunk'>@@ -60,16 +126,55 @@ static inline void crypto_free_sig(struct crypto_sig *tfm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * crypto_sig_maxsize() - Get len for output buffer</div><div class='add'>+ * crypto_sig_keysize() - Get key size</div><div class='ctx'>  *</div><div class='del'>- * Function returns the dest buffer size required for a given key.</div><div class='add'>+ * Function returns the key size in bits.</div><div class='ctx'>  * Function assumes that the key is already set in the transformation. If this</div><div class='del'>- * function is called without a setkey or with a failed setkey, you will end up</div><div class='add'>+ * function is called without a setkey or with a failed setkey, you may end up</div><div class='ctx'>  * in a NULL dereference.</div><div class='ctx'>  *</div><div class='ctx'>  * @tfm:	signature tfm handle allocated with crypto_alloc_sig()</div><div class='ctx'>  */</div><div class='del'>-int crypto_sig_maxsize(struct crypto_sig *tfm);</div><div class='add'>+static inline unsigned int crypto_sig_keysize(struct crypto_sig *tfm)</div><div class='add'>+{</div><div class='add'>+	struct sig_alg *alg = crypto_sig_alg(tfm);</div><div class='add'>+</div><div class='add'>+	return alg-&gt;key_size(tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crypto_sig_digestsize() - Get maximum digest size</div><div class='add'>+ *</div><div class='add'>+ * Function returns the maximum digest size in bytes.</div><div class='add'>+ * Function assumes that the key is already set in the transformation. If this</div><div class='add'>+ * function is called without a setkey or with a failed setkey, you may end up</div><div class='add'>+ * in a NULL dereference.</div><div class='add'>+ *</div><div class='add'>+ * @tfm:	signature tfm handle allocated with crypto_alloc_sig()</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int crypto_sig_digestsize(struct crypto_sig *tfm)</div><div class='add'>+{</div><div class='add'>+	struct sig_alg *alg = crypto_sig_alg(tfm);</div><div class='add'>+</div><div class='add'>+	return alg-&gt;digest_size(tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * crypto_sig_maxsize() - Get maximum signature size</div><div class='add'>+ *</div><div class='add'>+ * Function returns the maximum signature size in bytes.</div><div class='add'>+ * Function assumes that the key is already set in the transformation. If this</div><div class='add'>+ * function is called without a setkey or with a failed setkey, you may end up</div><div class='add'>+ * in a NULL dereference.</div><div class='add'>+ *</div><div class='add'>+ * @tfm:	signature tfm handle allocated with crypto_alloc_sig()</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int crypto_sig_maxsize(struct crypto_sig *tfm)</div><div class='add'>+{</div><div class='add'>+	struct sig_alg *alg = crypto_sig_alg(tfm);</div><div class='add'>+</div><div class='add'>+	return alg-&gt;max_size(tfm);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * crypto_sig_sign() - Invoke signing operation</div><div class='hunk'>@@ -82,11 +187,16 @@ int crypto_sig_maxsize(struct crypto_sig *tfm);</div><div class='ctx'>  * @dst:	destination obuffer</div><div class='ctx'>  * @dlen:	destination length</div><div class='ctx'>  *</div><div class='del'>- * Return: zero on success; error code in case of error</div><div class='add'>+ * Return: signature size on success; error code in case of error</div><div class='ctx'>  */</div><div class='del'>-int crypto_sig_sign(struct crypto_sig *tfm,</div><div class='del'>-		    const void *src, unsigned int slen,</div><div class='del'>-		    void *dst, unsigned int dlen);</div><div class='add'>+static inline int crypto_sig_sign(struct crypto_sig *tfm,</div><div class='add'>+				  const void *src, unsigned int slen,</div><div class='add'>+				  void *dst, unsigned int dlen)</div><div class='add'>+{</div><div class='add'>+	struct sig_alg *alg = crypto_sig_alg(tfm);</div><div class='add'>+</div><div class='add'>+	return alg-&gt;sign(tfm, src, slen, dst, dlen);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * crypto_sig_verify() - Invoke signature verification</div><div class='hunk'>@@ -102,9 +212,14 @@ int crypto_sig_sign(struct crypto_sig *tfm,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: zero on verification success; error code in case of error.</div><div class='ctx'>  */</div><div class='del'>-int crypto_sig_verify(struct crypto_sig *tfm,</div><div class='del'>-		      const void *src, unsigned int slen,</div><div class='del'>-		      const void *digest, unsigned int dlen);</div><div class='add'>+static inline int crypto_sig_verify(struct crypto_sig *tfm,</div><div class='add'>+				    const void *src, unsigned int slen,</div><div class='add'>+				    const void *digest, unsigned int dlen)</div><div class='add'>+{</div><div class='add'>+	struct sig_alg *alg = crypto_sig_alg(tfm);</div><div class='add'>+</div><div class='add'>+	return alg-&gt;verify(tfm, src, slen, digest, dlen);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * crypto_sig_set_pubkey() - Invoke set public key operation</div><div class='hunk'>@@ -119,8 +234,13 @@ int crypto_sig_verify(struct crypto_sig *tfm,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: zero on success; error code in case of error</div><div class='ctx'>  */</div><div class='del'>-int crypto_sig_set_pubkey(struct crypto_sig *tfm,</div><div class='del'>-			  const void *key, unsigned int keylen);</div><div class='add'>+static inline int crypto_sig_set_pubkey(struct crypto_sig *tfm,</div><div class='add'>+					const void *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct sig_alg *alg = crypto_sig_alg(tfm);</div><div class='add'>+</div><div class='add'>+	return alg-&gt;set_pub_key(tfm, key, keylen);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * crypto_sig_set_privkey() - Invoke set private key operation</div><div class='hunk'>@@ -135,6 +255,11 @@ int crypto_sig_set_pubkey(struct crypto_sig *tfm,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: zero on success; error code in case of error</div><div class='ctx'>  */</div><div class='del'>-int crypto_sig_set_privkey(struct crypto_sig *tfm,</div><div class='del'>-			   const void *key, unsigned int keylen);</div><div class='add'>+static inline int crypto_sig_set_privkey(struct crypto_sig *tfm,</div><div class='add'>+					 const void *key, unsigned int keylen)</div><div class='add'>+{</div><div class='add'>+	struct sig_alg *alg = crypto_sig_alg(tfm);</div><div class='add'>+</div><div class='add'>+	return alg-&gt;set_priv_key(tfm, key, keylen);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h<br/>index c8857d7bdb37..9e5853464345 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/skcipher.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/skcipher.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/skcipher.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/skcipher.h</a></div><div class='hunk'>@@ -65,28 +65,6 @@ struct crypto_lskcipher {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * struct crypto_istat_cipher - statistics for cipher algorithm</div><div class='del'>- * @encrypt_cnt:	number of encrypt requests</div><div class='del'>- * @encrypt_tlen:	total data size handled by encrypt requests</div><div class='del'>- * @decrypt_cnt:	number of decrypt requests</div><div class='del'>- * @decrypt_tlen:	total data size handled by decrypt requests</div><div class='del'>- * @err_cnt:		number of error for cipher requests</div><div class='del'>- */</div><div class='del'>-struct crypto_istat_cipher {</div><div class='del'>-	atomic64_t encrypt_cnt;</div><div class='del'>-	atomic64_t encrypt_tlen;</div><div class='del'>-	atomic64_t decrypt_cnt;</div><div class='del'>-	atomic64_t decrypt_tlen;</div><div class='del'>-	atomic64_t err_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CRYPTO_STATS</div><div class='del'>-#define SKCIPHER_ALG_COMMON_STAT struct crypto_istat_cipher stat;</div><div class='del'>-#else</div><div class='del'>-#define SKCIPHER_ALG_COMMON_STAT</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * struct skcipher_alg_common - common properties of skcipher_alg</div><div class='ctx'>  * @min_keysize: Minimum key size supported by the transformation. This is the</div><div class='ctx'>  *		 smallest key length supported by this transformation algorithm.</div><div class='hunk'>@@ -103,7 +81,6 @@ struct crypto_istat_cipher {</div><div class='ctx'>  * @chunksize: Equal to the block size except for stream ciphers such as</div><div class='ctx'>  *	       CTR where it is set to the underlying block size.</div><div class='ctx'>  * @statesize: Size of the internal state for the algorithm.</div><div class='del'>- * @stat: Statistics for cipher algorithm</div><div class='ctx'>  * @base: Definition of a generic crypto algorithm.</div><div class='ctx'>  */</div><div class='ctx'> #define SKCIPHER_ALG_COMMON {		\</div><div class='hunk'>@@ -113,8 +90,6 @@ struct crypto_istat_cipher {</div><div class='ctx'> 	unsigned int chunksize;		\</div><div class='ctx'> 	unsigned int statesize;		\</div><div class='ctx'> 					\</div><div class='del'>-	SKCIPHER_ALG_COMMON_STAT	\</div><div class='del'>-					\</div><div class='ctx'> 	struct crypto_alg base;		\</div><div class='ctx'> }</div><div class='ctx'> struct skcipher_alg_common SKCIPHER_ALG_COMMON;</div><div class='hunk'>@@ -239,16 +214,17 @@ struct lskcipher_alg {</div><div class='ctx'> </div><div class='ctx'> #define MAX_SYNC_SKCIPHER_REQSIZE      384</div><div class='ctx'> /*</div><div class='del'>- * This performs a type-check against the "tfm" argument to make sure</div><div class='add'>+ * This performs a type-check against the "_tfm" argument to make sure</div><div class='ctx'>  * all users have the correct skcipher tfm for doing on-stack requests.</div><div class='ctx'>  */</div><div class='del'>-#define SYNC_SKCIPHER_REQUEST_ON_STACK(name, tfm) \</div><div class='add'>+#define SYNC_SKCIPHER_REQUEST_ON_STACK(name, _tfm) \</div><div class='ctx'> 	char __##name##_desc[sizeof(struct skcipher_request) + \</div><div class='del'>-			     MAX_SYNC_SKCIPHER_REQSIZE + \</div><div class='del'>-			     (!(sizeof((struct crypto_sync_skcipher *)1 == \</div><div class='del'>-				       (typeof(tfm))1))) \</div><div class='add'>+			     MAX_SYNC_SKCIPHER_REQSIZE \</div><div class='ctx'> 			    ] CRYPTO_MINALIGN_ATTR; \</div><div class='del'>-	struct skcipher_request *name = (void *)__##name##_desc</div><div class='add'>+	struct skcipher_request *name = \</div><div class='add'>+		(((struct skcipher_request *)__##name##_desc)-&gt;base.tfm = \</div><div class='add'>+			crypto_sync_skcipher_tfm((_tfm)), \</div><div class='add'>+		 (void *)__##name##_desc)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DOC: Symmetric Key Cipher API</div><div class='hunk'>@@ -336,6 +312,12 @@ static inline struct crypto_tfm *crypto_lskcipher_tfm(</div><div class='ctx'> 	return &amp;tfm-&gt;base;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct crypto_tfm *crypto_sync_skcipher_tfm(</div><div class='add'>+	struct crypto_sync_skcipher *tfm)</div><div class='add'>+{</div><div class='add'>+	return crypto_skcipher_tfm(&amp;tfm-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * crypto_free_skcipher() - zeroize and free cipher handle</div><div class='ctx'>  * @tfm: cipher handle to be freed</div><div class='hunk'>@@ -861,19 +843,20 @@ static inline struct skcipher_request *skcipher_request_cast(</div><div class='ctx'>  *</div><div class='ctx'>  * Return: allocated request handle in case of success, or NULL if out of memory</div><div class='ctx'>  */</div><div class='del'>-static inline struct skcipher_request *skcipher_request_alloc(</div><div class='add'>+static inline struct skcipher_request *skcipher_request_alloc_noprof(</div><div class='ctx'> 	struct crypto_skcipher *tfm, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct skcipher_request *req;</div><div class='ctx'> </div><div class='del'>-	req = kmalloc(sizeof(struct skcipher_request) +</div><div class='del'>-		      crypto_skcipher_reqsize(tfm), gfp);</div><div class='add'>+	req = kmalloc_noprof(sizeof(struct skcipher_request) +</div><div class='add'>+			     crypto_skcipher_reqsize(tfm), gfp);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(req))</div><div class='ctx'> 		skcipher_request_set_tfm(req, tfm);</div><div class='ctx'> </div><div class='ctx'> 	return req;</div><div class='ctx'> }</div><div class='add'>+#define skcipher_request_alloc(...)	alloc_hooks(skcipher_request_alloc_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * skcipher_request_free() - zeroize and free request data structure</div><div class='head'>diff --git a/include/crypto/sm2.h b/include/crypto/sm2.h<br/>deleted file mode 100644<br/>index 04a92c1013c8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sm2.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sm2.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * sm2.h - SM2 asymmetric public-key algorithm</div><div class='del'>- * as specified by OSCCA GM/T 0003.1-2012 -- 0003.5-2012 SM2 and</div><div class='del'>- * described at https://tools.ietf.org/html/draft-shen-sm2-ecdsa-02</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2020, Alibaba Group.</div><div class='del'>- * Written by Tianjia Zhang &lt;tianjia.zhang@linux.alibaba.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CRYPTO_SM2_H</div><div class='del'>-#define _CRYPTO_SM2_H</div><div class='del'>-</div><div class='del'>-struct shash_desc;</div><div class='del'>-</div><div class='del'>-#if IS_REACHABLE(CONFIG_CRYPTO_SM2)</div><div class='del'>-int sm2_compute_z_digest(struct shash_desc *desc,</div><div class='del'>-			 const void *key, unsigned int keylen, void *dgst);</div><div class='del'>-#else</div><div class='del'>-static inline int sm2_compute_z_digest(struct shash_desc *desc,</div><div class='del'>-				       const void *key, unsigned int keylen,</div><div class='del'>-				       void *dgst)</div><div class='del'>-{</div><div class='del'>-	return -ENOTSUPP;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* _CRYPTO_SM2_H */</div><div class='head'>diff --git a/include/crypto/sm3.h b/include/crypto/sm3.h<br/>index 1f021ad0533f..c8d02c86c298 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sm3.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sm3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/sm3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/sm3.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SM3_DIGEST_SIZE	32</div><div class='ctx'> #define SM3_BLOCK_SIZE	64</div><div class='add'>+#define SM3_STATE_SIZE	40</div><div class='ctx'> </div><div class='ctx'> #define SM3_T1		0x79CC4519</div><div class='ctx'> #define SM3_T2		0x7A879D8A</div><div class='hunk'>@@ -58,7 +59,6 @@ static inline void sm3_init(struct sm3_state *sctx)</div><div class='ctx'> 	sctx-&gt;count = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sm3_update(struct sm3_state *sctx, const u8 *data, unsigned int len);</div><div class='del'>-void sm3_final(struct sm3_state *sctx, u8 *out);</div><div class='add'>+void sm3_block_generic(struct sm3_state *sctx, u8 const *data, int blocks);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/crypto/sm3_base.h b/include/crypto/sm3_base.h<br/>index 2f3a32ab97bb..7c53570bc05e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/sm3_base.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/sm3_base.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/sm3_base.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/sm3_base.h</a></div><div class='hunk'>@@ -11,87 +11,59 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;crypto/internal/hash.h&gt;</div><div class='ctx'> #include &lt;crypto/sm3.h&gt;</div><div class='del'>-#include &lt;linux/crypto.h&gt;</div><div class='add'>+#include &lt;linux/math.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef void (sm3_block_fn)(struct sm3_state *sst, u8 const *src, int blocks);</div><div class='ctx'> </div><div class='ctx'> static inline int sm3_base_init(struct shash_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	struct sm3_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-</div><div class='del'>-	sctx-&gt;state[0] = SM3_IVA;</div><div class='del'>-	sctx-&gt;state[1] = SM3_IVB;</div><div class='del'>-	sctx-&gt;state[2] = SM3_IVC;</div><div class='del'>-	sctx-&gt;state[3] = SM3_IVD;</div><div class='del'>-	sctx-&gt;state[4] = SM3_IVE;</div><div class='del'>-	sctx-&gt;state[5] = SM3_IVF;</div><div class='del'>-	sctx-&gt;state[6] = SM3_IVG;</div><div class='del'>-	sctx-&gt;state[7] = SM3_IVH;</div><div class='del'>-	sctx-&gt;count = 0;</div><div class='del'>-</div><div class='add'>+	sm3_init(shash_desc_ctx(desc));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int sm3_base_do_update(struct shash_desc *desc,</div><div class='del'>-				      const u8 *data,</div><div class='del'>-				      unsigned int len,</div><div class='del'>-				      sm3_block_fn *block_fn)</div><div class='add'>+static inline int sm3_base_do_update_blocks(struct shash_desc *desc,</div><div class='add'>+					    const u8 *data, unsigned int len,</div><div class='add'>+					    sm3_block_fn *block_fn)</div><div class='ctx'> {</div><div class='add'>+	unsigned int remain = len - round_down(len, SM3_BLOCK_SIZE);</div><div class='ctx'> 	struct sm3_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-	unsigned int partial = sctx-&gt;count % SM3_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-	sctx-&gt;count += len;</div><div class='del'>-</div><div class='del'>-	if (unlikely((partial + len) &gt;= SM3_BLOCK_SIZE)) {</div><div class='del'>-		int blocks;</div><div class='del'>-</div><div class='del'>-		if (partial) {</div><div class='del'>-			int p = SM3_BLOCK_SIZE - partial;</div><div class='del'>-</div><div class='del'>-			memcpy(sctx-&gt;buffer + partial, data, p);</div><div class='del'>-			data += p;</div><div class='del'>-			len -= p;</div><div class='ctx'> </div><div class='del'>-			block_fn(sctx, sctx-&gt;buffer, 1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		blocks = len / SM3_BLOCK_SIZE;</div><div class='del'>-		len %= SM3_BLOCK_SIZE;</div><div class='del'>-</div><div class='del'>-		if (blocks) {</div><div class='del'>-			block_fn(sctx, data, blocks);</div><div class='del'>-			data += blocks * SM3_BLOCK_SIZE;</div><div class='del'>-		}</div><div class='del'>-		partial = 0;</div><div class='del'>-	}</div><div class='del'>-	if (len)</div><div class='del'>-		memcpy(sctx-&gt;buffer + partial, data, len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	sctx-&gt;count += len - remain;</div><div class='add'>+	block_fn(sctx, data, len / SM3_BLOCK_SIZE);</div><div class='add'>+	return remain;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int sm3_base_do_finalize(struct shash_desc *desc,</div><div class='del'>-					sm3_block_fn *block_fn)</div><div class='add'>+static inline int sm3_base_do_finup(struct shash_desc *desc,</div><div class='add'>+				    const u8 *src, unsigned int len,</div><div class='add'>+				    sm3_block_fn *block_fn)</div><div class='ctx'> {</div><div class='del'>-	const int bit_offset = SM3_BLOCK_SIZE - sizeof(__be64);</div><div class='add'>+	unsigned int bit_offset = SM3_BLOCK_SIZE / 8 - 1;</div><div class='ctx'> 	struct sm3_state *sctx = shash_desc_ctx(desc);</div><div class='del'>-	__be64 *bits = (__be64 *)(sctx-&gt;buffer + bit_offset);</div><div class='del'>-	unsigned int partial = sctx-&gt;count % SM3_BLOCK_SIZE;</div><div class='add'>+	union {</div><div class='add'>+		__be64 b64[SM3_BLOCK_SIZE / 4];</div><div class='add'>+		u8 u8[SM3_BLOCK_SIZE * 2];</div><div class='add'>+	} block = {};</div><div class='ctx'> </div><div class='del'>-	sctx-&gt;buffer[partial++] = 0x80;</div><div class='del'>-	if (partial &gt; bit_offset) {</div><div class='del'>-		memset(sctx-&gt;buffer + partial, 0x0, SM3_BLOCK_SIZE - partial);</div><div class='del'>-		partial = 0;</div><div class='add'>+	if (len &gt;= SM3_BLOCK_SIZE) {</div><div class='add'>+		int remain;</div><div class='ctx'> </div><div class='del'>-		block_fn(sctx, sctx-&gt;buffer, 1);</div><div class='add'>+		remain = sm3_base_do_update_blocks(desc, src, len, block_fn);</div><div class='add'>+		src += len - remain;</div><div class='add'>+		len = remain;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(sctx-&gt;buffer + partial, 0x0, bit_offset - partial);</div><div class='del'>-	*bits = cpu_to_be64(sctx-&gt;count &lt;&lt; 3);</div><div class='del'>-	block_fn(sctx, sctx-&gt;buffer, 1);</div><div class='add'>+	if (len &gt;= bit_offset * 8)</div><div class='add'>+		bit_offset += SM3_BLOCK_SIZE / 8;</div><div class='add'>+	memcpy(&amp;block, src, len);</div><div class='add'>+	block.u8[len] = 0x80;</div><div class='add'>+	sctx-&gt;count += len;</div><div class='add'>+	block.b64[bit_offset] = cpu_to_be64(sctx-&gt;count &lt;&lt; 3);</div><div class='add'>+	block_fn(sctx, block.u8, (bit_offset + 1) * 8 / SM3_BLOCK_SIZE);</div><div class='add'>+	memzero_explicit(&amp;block, sizeof(block));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -104,8 +76,6 @@ static inline int sm3_base_finish(struct shash_desc *desc, u8 *out)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SM3_DIGEST_SIZE / sizeof(__be32); i++)</div><div class='ctx'> 		put_unaligned_be32(sctx-&gt;state[i], digest++);</div><div class='del'>-</div><div class='del'>-	memzero_explicit(sctx, sizeof(*sctx));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/crypto/streebog.h b/include/crypto/streebog.h<br/>index cae1b4a01971..570f720a113b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/streebog.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/streebog.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/streebog.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/streebog.h</a></div><div class='hunk'>@@ -23,15 +23,10 @@ struct streebog_uint512 {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct streebog_state {</div><div class='del'>-	union {</div><div class='del'>-		u8 buffer[STREEBOG_BLOCK_SIZE];</div><div class='del'>-		struct streebog_uint512 m;</div><div class='del'>-	};</div><div class='ctx'> 	struct streebog_uint512 hash;</div><div class='ctx'> 	struct streebog_uint512 h;</div><div class='ctx'> 	struct streebog_uint512 N;</div><div class='ctx'> 	struct streebog_uint512 Sigma;</div><div class='del'>-	size_t fillsize;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* !_CRYPTO_STREEBOG_H_ */</div><div class='head'>diff --git a/include/crypto/utils.h b/include/crypto/utils.h<br/>index acbb917a00c6..2594f45777b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/crypto/utils.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/crypto/utils.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/crypto/utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/crypto/utils.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #ifndef _CRYPTO_UTILS_H</div><div class='ctx'> #define _CRYPTO_UTILS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/compiler_attributes.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/cxl/einj.h b/include/cxl/einj.h<br/>new file mode 100644<br/>index 000000000000..624ff6ff41f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/cxl/einj.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/cxl/einj.h</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * CXL protocol Error INJection support.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023 Advanced Micro Devices, Inc.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Author: Ben Cheatham &lt;benjamin.cheatham@amd.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef EINJ_CXL_H</div><div class='add'>+#define EINJ_CXL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct pci_dev;</div><div class='add'>+struct seq_file;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_ACPI_APEI_EINJ_CXL)</div><div class='add'>+int einj_cxl_available_error_type_show(struct seq_file *m, void *v);</div><div class='add'>+int einj_cxl_inject_error(struct pci_dev *dport_dev, u64 type);</div><div class='add'>+int einj_cxl_inject_rch_error(u64 rcrb, u64 type);</div><div class='add'>+bool einj_cxl_is_initialized(void);</div><div class='add'>+#else /* !IS_ENABLED(CONFIG_ACPI_APEI_EINJ_CXL) */</div><div class='add'>+static inline int einj_cxl_available_error_type_show(struct seq_file *m,</div><div class='add'>+						     void *v)</div><div class='add'>+{</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int einj_cxl_inject_error(struct pci_dev *dport_dev, u64 type)</div><div class='add'>+{</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int einj_cxl_inject_rch_error(u64 rcrb, u64 type)</div><div class='add'>+{</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool einj_cxl_is_initialized(void) { return false; }</div><div class='add'>+#endif /* CONFIG_ACPI_APEI_EINJ_CXL */</div><div class='add'>+</div><div class='add'>+#endif /* EINJ_CXL_H */</div><div class='head'>diff --git a/include/cxl/event.h b/include/cxl/event.h<br/>new file mode 100644<br/>index 000000000000..6fd90f9cc203<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/cxl/event.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/cxl/event.h</a></div><div class='hunk'>@@ -0,0 +1,323 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright(c) 2023 Intel Corporation. */</div><div class='add'>+#ifndef _LINUX_CXL_EVENT_H</div><div class='add'>+#define _LINUX_CXL_EVENT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+#include &lt;linux/workqueue_types.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common Event Record Format</div><div class='add'>+ * CXL rev 3.0 section 8.2.9.2.1; Table 8-42</div><div class='add'>+ */</div><div class='add'>+struct cxl_event_record_hdr {</div><div class='add'>+	u8 length;</div><div class='add'>+	u8 flags[3];</div><div class='add'>+	__le16 handle;</div><div class='add'>+	__le16 related_handle;</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	u8 maint_op_class;</div><div class='add'>+	u8 maint_op_sub_class;</div><div class='add'>+	__le16 ld_id;</div><div class='add'>+	u8 head_id;</div><div class='add'>+	u8 reserved[11];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct cxl_event_media_hdr {</div><div class='add'>+	struct cxl_event_record_hdr hdr;</div><div class='add'>+	__le64 phys_addr;</div><div class='add'>+	u8 descriptor;</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 transaction_type;</div><div class='add'>+	/*</div><div class='add'>+	 * The meaning of Validity Flags from bit 2 is</div><div class='add'>+	 * different across DRAM and General Media records</div><div class='add'>+	 */</div><div class='add'>+	u8 validity_flags[2];</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 rank;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define CXL_EVENT_RECORD_DATA_LENGTH 0x50</div><div class='add'>+struct cxl_event_generic {</div><div class='add'>+	struct cxl_event_record_hdr hdr;</div><div class='add'>+	u8 data[CXL_EVENT_RECORD_DATA_LENGTH];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * General Media Event Record</div><div class='add'>+ * CXL rev 3.1 Section 8.2.9.2.1.1; Table 8-45</div><div class='add'>+ */</div><div class='add'>+#define CXL_EVENT_GEN_MED_COMP_ID_SIZE	0x10</div><div class='add'>+struct cxl_event_gen_media {</div><div class='add'>+	struct cxl_event_media_hdr media_hdr;</div><div class='add'>+	u8 device[3];</div><div class='add'>+	u8 component_id[CXL_EVENT_GEN_MED_COMP_ID_SIZE];</div><div class='add'>+	u8 cme_threshold_ev_flags;</div><div class='add'>+	u8 cme_count[3];</div><div class='add'>+	u8 sub_type;</div><div class='add'>+	u8 reserved[41];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DRAM Event Record - DER</div><div class='add'>+ * CXL rev 3.1 section 8.2.9.2.1.2; Table 8-46</div><div class='add'>+ */</div><div class='add'>+#define CXL_EVENT_DER_CORRECTION_MASK_SIZE	0x20</div><div class='add'>+struct cxl_event_dram {</div><div class='add'>+	struct cxl_event_media_hdr media_hdr;</div><div class='add'>+	u8 nibble_mask[3];</div><div class='add'>+	u8 bank_group;</div><div class='add'>+	u8 bank;</div><div class='add'>+	u8 row[3];</div><div class='add'>+	u8 column[2];</div><div class='add'>+	u8 correction_mask[CXL_EVENT_DER_CORRECTION_MASK_SIZE];</div><div class='add'>+	u8 component_id[CXL_EVENT_GEN_MED_COMP_ID_SIZE];</div><div class='add'>+	u8 sub_channel;</div><div class='add'>+	u8 cme_threshold_ev_flags;</div><div class='add'>+	u8 cvme_count[3];</div><div class='add'>+	u8 sub_type;</div><div class='add'>+	u8 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get Health Info Record</div><div class='add'>+ * CXL rev 3.1 section 8.2.9.9.3.1; Table 8-133</div><div class='add'>+ */</div><div class='add'>+struct cxl_get_health_info {</div><div class='add'>+	u8 health_status;</div><div class='add'>+	u8 media_status;</div><div class='add'>+	u8 add_status;</div><div class='add'>+	u8 life_used;</div><div class='add'>+	u8 device_temp[2];</div><div class='add'>+	u8 dirty_shutdown_cnt[4];</div><div class='add'>+	u8 cor_vol_err_cnt[4];</div><div class='add'>+	u8 cor_per_err_cnt[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Memory Module Event Record</div><div class='add'>+ * CXL rev 3.1 section 8.2.9.2.1.3; Table 8-47</div><div class='add'>+ */</div><div class='add'>+struct cxl_event_mem_module {</div><div class='add'>+	struct cxl_event_record_hdr hdr;</div><div class='add'>+	u8 event_type;</div><div class='add'>+	struct cxl_get_health_info info;</div><div class='add'>+	u8 validity_flags[2];</div><div class='add'>+	u8 component_id[CXL_EVENT_GEN_MED_COMP_ID_SIZE];</div><div class='add'>+	u8 event_sub_type;</div><div class='add'>+	u8 reserved[0x2a];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Memory Sparing Event Record - MSER</div><div class='add'>+ * CXL rev 3.2 section 8.2.10.2.1.4; Table 8-60</div><div class='add'>+ */</div><div class='add'>+struct cxl_event_mem_sparing {</div><div class='add'>+	struct cxl_event_record_hdr hdr;</div><div class='add'>+	/*</div><div class='add'>+	 * The fields maintenance operation class and maintenance operation</div><div class='add'>+	 * subclass defined in the Memory Sparing Event Record are the</div><div class='add'>+	 * duplication of the same in the common event record. Thus defined</div><div class='add'>+	 * as reserved and to be removed after the spec correction.</div><div class='add'>+	 */</div><div class='add'>+	u8 rsv1;</div><div class='add'>+	u8 rsv2;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 result;</div><div class='add'>+	__le16 validity_flags;</div><div class='add'>+	u8 reserved1[6];</div><div class='add'>+	__le16 res_avail;</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 rank;</div><div class='add'>+	u8 nibble_mask[3];</div><div class='add'>+	u8 bank_group;</div><div class='add'>+	u8 bank;</div><div class='add'>+	u8 row[3];</div><div class='add'>+	__le16 column;</div><div class='add'>+	u8 component_id[CXL_EVENT_GEN_MED_COMP_ID_SIZE];</div><div class='add'>+	u8 sub_channel;</div><div class='add'>+	u8 reserved2[0x25];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union cxl_event {</div><div class='add'>+	struct cxl_event_generic generic;</div><div class='add'>+	struct cxl_event_gen_media gen_media;</div><div class='add'>+	struct cxl_event_dram dram;</div><div class='add'>+	struct cxl_event_mem_module mem_module;</div><div class='add'>+	struct cxl_event_mem_sparing mem_sparing;</div><div class='add'>+	/* dram &amp; gen_media event header */</div><div class='add'>+	struct cxl_event_media_hdr media_hdr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common Event Record Format; in event logs</div><div class='add'>+ * CXL rev 3.0 section 8.2.9.2.1; Table 8-42</div><div class='add'>+ */</div><div class='add'>+struct cxl_event_record_raw {</div><div class='add'>+	uuid_t id;</div><div class='add'>+	union cxl_event event;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum cxl_event_type {</div><div class='add'>+	CXL_CPER_EVENT_GENERIC,</div><div class='add'>+	CXL_CPER_EVENT_GEN_MEDIA,</div><div class='add'>+	CXL_CPER_EVENT_DRAM,</div><div class='add'>+	CXL_CPER_EVENT_MEM_MODULE,</div><div class='add'>+	CXL_CPER_EVENT_MEM_SPARING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CPER_CXL_DEVICE_ID_VALID		BIT(0)</div><div class='add'>+#define CPER_CXL_DEVICE_SN_VALID		BIT(1)</div><div class='add'>+#define CPER_CXL_COMP_EVENT_LOG_VALID		BIT(2)</div><div class='add'>+struct cxl_cper_event_rec {</div><div class='add'>+	struct {</div><div class='add'>+		u32 length;</div><div class='add'>+		u64 validation_bits;</div><div class='add'>+		struct cper_cxl_event_devid {</div><div class='add'>+			u16 vendor_id;</div><div class='add'>+			u16 device_id;</div><div class='add'>+			u8 func_num;</div><div class='add'>+			u8 device_num;</div><div class='add'>+			u8 bus_num;</div><div class='add'>+			u16 segment_num;</div><div class='add'>+			u16 slot_num; /* bits 2:0 reserved */</div><div class='add'>+			u8 reserved;</div><div class='add'>+		} __packed device_id;</div><div class='add'>+		struct cper_cxl_event_sn {</div><div class='add'>+			u32 lower_dw;</div><div class='add'>+			u32 upper_dw;</div><div class='add'>+		} __packed dev_serial_num;</div><div class='add'>+	} __packed hdr;</div><div class='add'>+</div><div class='add'>+	union cxl_event event;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct cxl_cper_work_data {</div><div class='add'>+	enum cxl_event_type event_type;</div><div class='add'>+	struct cxl_cper_event_rec rec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PROT_ERR_VALID_AGENT_TYPE		BIT_ULL(0)</div><div class='add'>+#define PROT_ERR_VALID_AGENT_ADDRESS		BIT_ULL(1)</div><div class='add'>+#define PROT_ERR_VALID_DEVICE_ID		BIT_ULL(2)</div><div class='add'>+#define PROT_ERR_VALID_SERIAL_NUMBER		BIT_ULL(3)</div><div class='add'>+#define PROT_ERR_VALID_CAPABILITY		BIT_ULL(4)</div><div class='add'>+#define PROT_ERR_VALID_DVSEC			BIT_ULL(5)</div><div class='add'>+#define PROT_ERR_VALID_ERROR_LOG		BIT_ULL(6)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The layout of the enumeration and the values matches CXL Agent Type</div><div class='add'>+ * field in the UEFI 2.10 Section N.2.13,</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	RCD,	/* Restricted CXL Device */</div><div class='add'>+	RCH_DP,	/* Restricted CXL Host Downstream Port */</div><div class='add'>+	DEVICE,	/* CXL Device */</div><div class='add'>+	LD,	/* CXL Logical Device */</div><div class='add'>+	FMLD,	/* CXL Fabric Manager managed Logical Device */</div><div class='add'>+	RP,	/* CXL Root Port */</div><div class='add'>+	DSP,	/* CXL Downstream Switch Port */</div><div class='add'>+	USP,	/* CXL Upstream Switch Port */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#pragma pack(1)</div><div class='add'>+</div><div class='add'>+/* Compute Express Link Protocol Error Section, UEFI v2.10 sec N.2.13 */</div><div class='add'>+struct cxl_cper_sec_prot_err {</div><div class='add'>+	u64 valid_bits;</div><div class='add'>+	u8 agent_type;</div><div class='add'>+	u8 reserved[7];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Except for RCH Downstream Port, all the remaining CXL Agent</div><div class='add'>+	 * types are uniquely identified by the PCIe compatible SBDF number.</div><div class='add'>+	 */</div><div class='add'>+	union {</div><div class='add'>+		u64 rcrb_base_addr;</div><div class='add'>+		struct {</div><div class='add'>+			u8 function;</div><div class='add'>+			u8 device;</div><div class='add'>+			u8 bus;</div><div class='add'>+			u16 segment;</div><div class='add'>+			u8 reserved_1[3];</div><div class='add'>+		};</div><div class='add'>+	} agent_addr;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u16 vendor_id;</div><div class='add'>+		u16 device_id;</div><div class='add'>+		u16 subsystem_vendor_id;</div><div class='add'>+		u16 subsystem_id;</div><div class='add'>+		u8 class_code[2];</div><div class='add'>+		u16 slot;</div><div class='add'>+		u8 reserved_1[4];</div><div class='add'>+	} device_id;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 lower_dw;</div><div class='add'>+		u32 upper_dw;</div><div class='add'>+	} dev_serial_num;</div><div class='add'>+</div><div class='add'>+	u8 capability[60];</div><div class='add'>+	u16 dvsec_len;</div><div class='add'>+	u16 err_len;</div><div class='add'>+	u8 reserved_2[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#pragma pack()</div><div class='add'>+</div><div class='add'>+/* CXL RAS Capability Structure, CXL v3.0 sec 8.2.4.16 */</div><div class='add'>+struct cxl_ras_capability_regs {</div><div class='add'>+	u32 uncor_status;</div><div class='add'>+	u32 uncor_mask;</div><div class='add'>+	u32 uncor_severity;</div><div class='add'>+	u32 cor_status;</div><div class='add'>+	u32 cor_mask;</div><div class='add'>+	u32 cap_control;</div><div class='add'>+	u32 header_log[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxl_cper_prot_err_work_data {</div><div class='add'>+	struct cxl_cper_sec_prot_err prot_err;</div><div class='add'>+	struct cxl_ras_capability_regs ras_cap;</div><div class='add'>+	int severity;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI_APEI_GHES</div><div class='add'>+int cxl_cper_register_work(struct work_struct *work);</div><div class='add'>+int cxl_cper_unregister_work(struct work_struct *work);</div><div class='add'>+int cxl_cper_kfifo_get(struct cxl_cper_work_data *wd);</div><div class='add'>+int cxl_cper_register_prot_err_work(struct work_struct *work);</div><div class='add'>+int cxl_cper_unregister_prot_err_work(struct work_struct *work);</div><div class='add'>+int cxl_cper_prot_err_kfifo_get(struct cxl_cper_prot_err_work_data *wd);</div><div class='add'>+#else</div><div class='add'>+static inline int cxl_cper_register_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cxl_cper_unregister_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int cxl_cper_kfifo_get(struct cxl_cper_work_data *wd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int cxl_cper_register_prot_err_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int cxl_cper_unregister_prot_err_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int cxl_cper_prot_err_kfifo_get(struct cxl_cper_prot_err_work_data *wd)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_CXL_EVENT_H */</div><div class='head'>diff --git a/include/cxl/features.h b/include/cxl/features.h<br/>new file mode 100644<br/>index 000000000000..b9297693dae7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/cxl/features.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/cxl/features.h</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright(c) 2024-2025 Intel Corporation. */</div><div class='add'>+#ifndef __CXL_FEATURES_H__</div><div class='add'>+#define __CXL_FEATURES_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+#include &lt;linux/fwctl.h&gt;</div><div class='add'>+#include &lt;uapi/cxl/features.h&gt;</div><div class='add'>+</div><div class='add'>+/* Feature UUIDs used by the kernel */</div><div class='add'>+#define CXL_FEAT_PATROL_SCRUB_UUID						\</div><div class='add'>+	UUID_INIT(0x96dad7d6, 0xfde8, 0x482b, 0xa7, 0x33, 0x75, 0x77, 0x4e,	\</div><div class='add'>+		  0x06, 0xdb, 0x8a)</div><div class='add'>+</div><div class='add'>+#define CXL_FEAT_ECS_UUID							\</div><div class='add'>+	UUID_INIT(0xe5b13f22, 0x2328, 0x4a14, 0xb8, 0xba, 0xb9, 0x69, 0x1e,	\</div><div class='add'>+		  0x89, 0x33, 0x86)</div><div class='add'>+</div><div class='add'>+#define CXL_FEAT_SPPR_UUID							\</div><div class='add'>+	UUID_INIT(0x892ba475, 0xfad8, 0x474e, 0x9d, 0x3e, 0x69, 0x2c, 0x91,	\</div><div class='add'>+		  0x75, 0x68, 0xbb)</div><div class='add'>+</div><div class='add'>+#define CXL_FEAT_HPPR_UUID							\</div><div class='add'>+	UUID_INIT(0x80ea4521, 0x786f, 0x4127, 0xaf, 0xb1, 0xec, 0x74, 0x59,	\</div><div class='add'>+		  0xfb, 0x0e, 0x24)</div><div class='add'>+</div><div class='add'>+#define CXL_FEAT_CACHELINE_SPARING_UUID						\</div><div class='add'>+	UUID_INIT(0x96C33386, 0x91dd, 0x44c7, 0x9e, 0xcb, 0xfd, 0xaf, 0x65,	\</div><div class='add'>+		  0x03, 0xba, 0xc4)</div><div class='add'>+</div><div class='add'>+#define CXL_FEAT_ROW_SPARING_UUID						\</div><div class='add'>+	UUID_INIT(0x450ebf67, 0xb135, 0x4f97, 0xa4, 0x98, 0xc2, 0xd5, 0x7f,	\</div><div class='add'>+		  0x27, 0x9b, 0xed)</div><div class='add'>+</div><div class='add'>+#define CXL_FEAT_BANK_SPARING_UUID						\</div><div class='add'>+	UUID_INIT(0x78b79636, 0x90ac, 0x4b64, 0xa4, 0xef, 0xfa, 0xac, 0x5d,	\</div><div class='add'>+		  0x18, 0xa8, 0x63)</div><div class='add'>+</div><div class='add'>+#define CXL_FEAT_RANK_SPARING_UUID						\</div><div class='add'>+	UUID_INIT(0x34dbaff5, 0x0552, 0x4281, 0x8f, 0x76, 0xda, 0x0b, 0x5e,	\</div><div class='add'>+		  0x7a, 0x76, 0xa7)</div><div class='add'>+</div><div class='add'>+/* Feature commands capability supported by a device */</div><div class='add'>+enum cxl_features_capability {</div><div class='add'>+	CXL_FEATURES_NONE = 0,</div><div class='add'>+	CXL_FEATURES_RO,</div><div class='add'>+	CXL_FEATURES_RW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cxl_features_state - The Features state for the device</div><div class='add'>+ * @cxlds: Pointer to CXL device state</div><div class='add'>+ * @entries: CXl feature entry context</div><div class='add'>+ */</div><div class='add'>+struct cxl_features_state {</div><div class='add'>+	struct cxl_dev_state *cxlds;</div><div class='add'>+	struct cxl_feat_entries {</div><div class='add'>+		int num_features;</div><div class='add'>+		int num_user_features;</div><div class='add'>+		struct cxl_feat_entry ent[] __counted_by(num_features);</div><div class='add'>+	} *entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxl_mailbox;</div><div class='add'>+struct cxl_memdev;</div><div class='add'>+#ifdef CONFIG_CXL_FEATURES</div><div class='add'>+struct cxl_features_state *to_cxlfs(struct cxl_dev_state *cxlds);</div><div class='add'>+int devm_cxl_setup_features(struct cxl_dev_state *cxlds);</div><div class='add'>+int devm_cxl_setup_fwctl(struct device *host, struct cxl_memdev *cxlmd);</div><div class='add'>+#else</div><div class='add'>+static inline struct cxl_features_state *to_cxlfs(struct cxl_dev_state *cxlds)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int devm_cxl_setup_features(struct cxl_dev_state *cxlds)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int devm_cxl_setup_fwctl(struct device *host,</div><div class='add'>+				       struct cxl_memdev *cxlmd)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/cxl/mailbox.h b/include/cxl/mailbox.h<br/>new file mode 100644<br/>index 000000000000..c4e99e2e3a9d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/cxl/mailbox.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/cxl/mailbox.h</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright(c) 2024 Intel Corporation. */</div><div class='add'>+#ifndef __CXL_MBOX_H__</div><div class='add'>+#define __CXL_MBOX_H__</div><div class='add'>+#include &lt;linux/rcuwait.h&gt;</div><div class='add'>+#include &lt;cxl/features.h&gt;</div><div class='add'>+#include &lt;uapi/linux/cxl_mem.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cxl_mbox_cmd - A command to be submitted to hardware.</div><div class='add'>+ * @opcode: (input) The command set and command submitted to hardware.</div><div class='add'>+ * @payload_in: (input) Pointer to the input payload.</div><div class='add'>+ * @payload_out: (output) Pointer to the output payload. Must be allocated by</div><div class='add'>+ *		 the caller.</div><div class='add'>+ * @size_in: (input) Number of bytes to load from @payload_in.</div><div class='add'>+ * @size_out: (input) Max number of bytes loaded into @payload_out.</div><div class='add'>+ *            (output) Number of bytes generated by the device. For fixed size</div><div class='add'>+ *            outputs commands this is always expected to be deterministic. For</div><div class='add'>+ *            variable sized output commands, it tells the exact number of bytes</div><div class='add'>+ *            written.</div><div class='add'>+ * @min_out: (input) internal command output payload size validation</div><div class='add'>+ * @poll_count: (input) Number of timeouts to attempt.</div><div class='add'>+ * @poll_interval_ms: (input) Time between mailbox background command polling</div><div class='add'>+ *                    interval timeouts.</div><div class='add'>+ * @return_code: (output) Error code returned from hardware.</div><div class='add'>+ *</div><div class='add'>+ * This is the primary mechanism used to send commands to the hardware.</div><div class='add'>+ * All the fields except @payload_* correspond exactly to the fields described in</div><div class='add'>+ * Command Register section of the CXL 2.0 8.2.8.4.5. @payload_in and</div><div class='add'>+ * @payload_out are written to, and read from the Command Payload Registers</div><div class='add'>+ * defined in CXL 2.0 8.2.8.4.8.</div><div class='add'>+ */</div><div class='add'>+struct cxl_mbox_cmd {</div><div class='add'>+	u16 opcode;</div><div class='add'>+	void *payload_in;</div><div class='add'>+	void *payload_out;</div><div class='add'>+	size_t size_in;</div><div class='add'>+	size_t size_out;</div><div class='add'>+	size_t min_out;</div><div class='add'>+	int poll_count;</div><div class='add'>+	int poll_interval_ms;</div><div class='add'>+	u16 return_code;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cxl_mailbox - context for CXL mailbox operations</div><div class='add'>+ * @host: device that hosts the mailbox</div><div class='add'>+ * @enabled_cmds: mailbox commands that are enabled by the driver</div><div class='add'>+ * @exclusive_cmds: mailbox commands that are exclusive to the kernel</div><div class='add'>+ * @payload_size: Size of space for payload</div><div class='add'>+ *                (CXL 3.1 8.2.8.4.3 Mailbox Capabilities Register)</div><div class='add'>+ * @mbox_mutex: mutex protects device mailbox and firmware</div><div class='add'>+ * @mbox_wait: rcuwait for mailbox</div><div class='add'>+ * @mbox_send: @dev specific transport for transmitting mailbox commands</div><div class='add'>+ * @feat_cap: Features capability</div><div class='add'>+ */</div><div class='add'>+struct cxl_mailbox {</div><div class='add'>+	struct device *host;</div><div class='add'>+	DECLARE_BITMAP(enabled_cmds, CXL_MEM_COMMAND_ID_MAX);</div><div class='add'>+	DECLARE_BITMAP(exclusive_cmds, CXL_MEM_COMMAND_ID_MAX);</div><div class='add'>+	size_t payload_size;</div><div class='add'>+	struct mutex mbox_mutex; /* lock to protect mailbox context */</div><div class='add'>+	struct rcuwait mbox_wait;</div><div class='add'>+	int (*mbox_send)(struct cxl_mailbox *cxl_mbox, struct cxl_mbox_cmd *cmd);</div><div class='add'>+	enum cxl_features_capability feat_cap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cxl_mailbox_init(struct cxl_mailbox *cxl_mbox, struct device *host);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/Makefile b/include/drm/Makefile<br/>new file mode 100644<br/>index 000000000000..48fae3f167c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# Ensure drm headers are self-contained and pass kernel-doc</div><div class='add'>+hdrtest-files := \</div><div class='add'>+	$(shell cd $(src) &amp;&amp; find * -name '*.h' 2&gt;/dev/null)</div><div class='add'>+</div><div class='add'>+always-$(CONFIG_DRM_HEADER_TEST) += \</div><div class='add'>+	$(patsubst %.h,%.hdrtest, $(hdrtest-files))</div><div class='add'>+</div><div class='add'>+# Include the header twice to detect missing include guard.</div><div class='add'>+quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@)</div><div class='add'>+      cmd_hdrtest = \</div><div class='add'>+		$(CC) $(c_flags) -fsyntax-only -x c /dev/null -include $&lt; -include $&lt;; \</div><div class='add'>+		PYTHONDONTWRITEBYTECODE=1 $(PYTHON3) $(KERNELDOC) -none $(if $(CONFIG_WERROR)$(CONFIG_DRM_WERROR),-Werror) $&lt;; \</div><div class='add'>+		touch $@</div><div class='add'>+</div><div class='add'>+$(obj)/%.hdrtest: $(src)/%.h FORCE</div><div class='add'>+	$(call if_changed_dep,hdrtest)</div><div class='head'>diff --git a/include/drm/amd/isp.h b/include/drm/amd/isp.h<br/>new file mode 100644<br/>index 000000000000..ec868288abf2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/amd/isp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/amd/isp.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sub license, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so, subject to</div><div class='add'>+ * the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,</div><div class='add'>+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR</div><div class='add'>+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE</div><div class='add'>+ * USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial portions</div><div class='add'>+ * of the Software.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ISP_H__</div><div class='add'>+#define __ISP_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+struct isp_platform_data {</div><div class='add'>+	void *adev;</div><div class='add'>+	u32 asic_type;</div><div class='add'>+	resource_size_t base_rmmio_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int isp_user_buffer_alloc(struct device *dev, void *dmabuf,</div><div class='add'>+			  void **buf_obj, u64 *buf_addr);</div><div class='add'>+</div><div class='add'>+void isp_user_buffer_free(void *buf_obj);</div><div class='add'>+</div><div class='add'>+int isp_kernel_buffer_alloc(struct device *dev, u64 size,</div><div class='add'>+			    void **buf_obj, u64 *gpu_addr, void **cpu_addr);</div><div class='add'>+</div><div class='add'>+void isp_kernel_buffer_free(void **buf_obj, u64 *gpu_addr, void **cpu_addr);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/amd_asic_type.h b/include/drm/amd_asic_type.h<br/>index 724c45e3e9a7..9be85b821aa6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/amd_asic_type.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/amd_asic_type.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/amd_asic_type.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/amd_asic_type.h</a></div><div class='hunk'>@@ -22,6 +22,9 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __AMD_ASIC_TYPE_H__</div><div class='ctx'> #define __AMD_ASIC_TYPE_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Supported ASIC types</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h<br/>index b0dcc07334a1..cf17646c1310 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/analogix_dp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/analogix_dp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/analogix_dp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/bridge/analogix_dp.h</a></div><div class='hunk'>@@ -10,16 +10,18 @@</div><div class='ctx'> #include &lt;drm/drm_crtc.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct analogix_dp_device;</div><div class='add'>+struct drm_dp_aux;</div><div class='ctx'> </div><div class='ctx'> enum analogix_dp_devtype {</div><div class='ctx'> 	EXYNOS_DP,</div><div class='ctx'> 	RK3288_DP,</div><div class='ctx'> 	RK3399_EDP,</div><div class='add'>+	RK3588_EDP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool is_rockchip(enum analogix_dp_devtype type)</div><div class='ctx'> {</div><div class='del'>-	return type == RK3288_DP || type == RK3399_EDP;</div><div class='add'>+	return type == RK3288_DP || type == RK3399_EDP || type == RK3588_EDP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct analogix_dp_plat_data {</div><div class='hunk'>@@ -29,8 +31,7 @@ struct analogix_dp_plat_data {</div><div class='ctx'> 	struct drm_connector *connector;</div><div class='ctx'> 	bool skip_connector;</div><div class='ctx'> </div><div class='del'>-	int (*power_on_start)(struct analogix_dp_plat_data *);</div><div class='del'>-	int (*power_on_end)(struct analogix_dp_plat_data *);</div><div class='add'>+	int (*power_on)(struct analogix_dp_plat_data *);</div><div class='ctx'> 	int (*power_off)(struct analogix_dp_plat_data *);</div><div class='ctx'> 	int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *,</div><div class='ctx'> 		      struct drm_connector *);</div><div class='hunk'>@@ -45,9 +46,11 @@ struct analogix_dp_device *</div><div class='ctx'> analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data);</div><div class='ctx'> int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev);</div><div class='ctx'> void analogix_dp_unbind(struct analogix_dp_device *dp);</div><div class='del'>-void analogix_dp_remove(struct analogix_dp_device *dp);</div><div class='ctx'> </div><div class='ctx'> int analogix_dp_start_crc(struct drm_connector *connector);</div><div class='ctx'> int analogix_dp_stop_crc(struct drm_connector *connector);</div><div class='ctx'> </div><div class='add'>+struct analogix_dp_plat_data *analogix_dp_aux_to_plat_data(struct drm_dp_aux *aux);</div><div class='add'>+struct drm_dp_aux *analogix_dp_get_aux(struct analogix_dp_device *dp);</div><div class='add'>+</div><div class='ctx'> #endif /* _ANALOGIX_DP_H_ */</div><div class='head'>diff --git a/include/drm/bridge/aux-bridge.h b/include/drm/bridge/aux-bridge.h<br/>index 4453906105ca..c2f5a855512f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/aux-bridge.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/aux-bridge.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/aux-bridge.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/bridge/aux-bridge.h</a></div><div class='hunk'>@@ -33,7 +33,7 @@ static inline struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct devic</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int devm_drm_dp_hpd_bridge_add(struct auxiliary_device *adev)</div><div class='add'>+static inline int devm_drm_dp_hpd_bridge_add(struct device *dev, struct auxiliary_device *adev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/drm/bridge/dw_dp.h b/include/drm/bridge/dw_dp.h<br/>new file mode 100644<br/>index 000000000000..d05df49fd884<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/dw_dp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/bridge/dw_dp.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Rockchip Electronics Co., Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DW_DP__</div><div class='add'>+#define __DW_DP__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_encoder;</div><div class='add'>+struct dw_dp;</div><div class='add'>+</div><div class='add'>+struct dw_dp_plat_data {</div><div class='add'>+	u32 max_link_rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_dp *dw_dp_bind(struct device *dev, struct drm_encoder *encoder,</div><div class='add'>+			 const struct dw_dp_plat_data *plat_data);</div><div class='add'>+#endif /* __DW_DP__ */</div><div class='head'>diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h<br/>index 6a46baa0737c..336f062e1f9d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/dw_hdmi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/dw_hdmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/dw_hdmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/bridge/dw_hdmi.h</a></div><div class='hunk'>@@ -143,9 +143,15 @@ struct dw_hdmi_plat_data {</div><div class='ctx'> 					   const struct drm_display_info *info,</div><div class='ctx'> 					   const struct drm_display_mode *mode);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * priv_audio is specially used for additional audio device to get</div><div class='add'>+	 * driver data through this dw_hdmi_plat_data.</div><div class='add'>+	 */</div><div class='add'>+	void *priv_audio;</div><div class='add'>+</div><div class='ctx'> 	/* Platform-specific audio enable/disable (optional) */</div><div class='ctx'> 	void (*enable_audio)(struct dw_hdmi *hdmi, int channel,</div><div class='del'>-			     int width, int rate, int non_pcm);</div><div class='add'>+			     int width, int rate, int non_pcm, int iec958);</div><div class='ctx'> 	void (*disable_audio)(struct dw_hdmi *hdmi);</div><div class='ctx'> </div><div class='ctx'> 	/* Vendor PHY support */</div><div class='hunk'>@@ -179,6 +185,7 @@ void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense);</div><div class='ctx'> int dw_hdmi_set_plugged_cb(struct dw_hdmi *hdmi, hdmi_codec_plugged_cb fn,</div><div class='ctx'> 			   struct device *codec_dev);</div><div class='ctx'> void dw_hdmi_set_sample_non_pcm(struct dw_hdmi *hdmi, unsigned int non_pcm);</div><div class='add'>+void dw_hdmi_set_sample_iec958(struct dw_hdmi *hdmi, unsigned int iec958);</div><div class='ctx'> void dw_hdmi_set_sample_width(struct dw_hdmi *hdmi, unsigned int width);</div><div class='ctx'> void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate);</div><div class='ctx'> void dw_hdmi_set_channel_count(struct dw_hdmi *hdmi, unsigned int cnt);</div><div class='hunk'>@@ -208,4 +215,6 @@ void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void *data);</div><div class='ctx'> </div><div class='ctx'> bool dw_hdmi_bus_fmt_is_420(struct dw_hdmi *hdmi);</div><div class='ctx'> </div><div class='add'>+const struct dw_hdmi_plat_data *dw_hdmi_to_plat_data(struct dw_hdmi *hdmi);</div><div class='add'>+</div><div class='ctx'> #endif /* __IMX_HDMI_H__ */</div><div class='head'>diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h<br/>new file mode 100644<br/>index 000000000000..3f461f6b9bbf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/dw_hdmi_qp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/bridge/dw_hdmi_qp.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2021-2022 Rockchip Electronics Co., Ltd.</div><div class='add'>+ * Copyright (c) 2024 Collabora Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DW_HDMI_QP__</div><div class='add'>+#define __DW_HDMI_QP__</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct drm_encoder;</div><div class='add'>+struct dw_hdmi_qp;</div><div class='add'>+struct platform_device;</div><div class='add'>+</div><div class='add'>+struct dw_hdmi_qp_phy_ops {</div><div class='add'>+	int (*init)(struct dw_hdmi_qp *hdmi, void *data);</div><div class='add'>+	void (*disable)(struct dw_hdmi_qp *hdmi, void *data);</div><div class='add'>+	enum drm_connector_status (*read_hpd)(struct dw_hdmi_qp *hdmi, void *data);</div><div class='add'>+	void (*setup_hpd)(struct dw_hdmi_qp *hdmi, void *data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_hdmi_qp_plat_data {</div><div class='add'>+	const struct dw_hdmi_qp_phy_ops *phy_ops;</div><div class='add'>+	void *phy_data;</div><div class='add'>+	int main_irq;</div><div class='add'>+	int cec_irq;</div><div class='add'>+	unsigned long ref_clk_rate;</div><div class='add'>+	/* Supported output formats: bitmask of @hdmi_colorspace */</div><div class='add'>+	unsigned int supported_formats;</div><div class='add'>+	/* Maximum bits per color channel: 8, 10 or 12 */</div><div class='add'>+	unsigned int max_bpc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,</div><div class='add'>+				   struct drm_encoder *encoder,</div><div class='add'>+				   const struct dw_hdmi_qp_plat_data *plat_data);</div><div class='add'>+void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi);</div><div class='add'>+#endif /* __DW_HDMI_QP__ */</div><div class='head'>diff --git a/include/drm/bridge/dw_mipi_dsi2.h b/include/drm/bridge/dw_mipi_dsi2.h<br/>new file mode 100644<br/>index 000000000000..c18c49379247<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/dw_mipi_dsi2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/bridge/dw_mipi_dsi2.h</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Fuzhou Rockchip Electronics Co., Ltd</div><div class='add'>+ *</div><div class='add'>+ * Authors: Guochun Huang &lt;hero.huang@rock-chips.com&gt;</div><div class='add'>+ *          Heiko Stuebner &lt;heiko.stuebner@cherry.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DW_MIPI_DSI2__</div><div class='add'>+#define __DW_MIPI_DSI2__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drm_atomic.h&gt;</div><div class='add'>+#include &lt;drm/drm_bridge.h&gt;</div><div class='add'>+#include &lt;drm/drm_connector.h&gt;</div><div class='add'>+#include &lt;drm/drm_crtc.h&gt;</div><div class='add'>+#include &lt;drm/drm_modes.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_display_mode;</div><div class='add'>+struct drm_encoder;</div><div class='add'>+struct dw_mipi_dsi2;</div><div class='add'>+struct mipi_dsi_device;</div><div class='add'>+struct platform_device;</div><div class='add'>+</div><div class='add'>+enum dw_mipi_dsi2_phy_type {</div><div class='add'>+	DW_MIPI_DSI2_DPHY,</div><div class='add'>+	DW_MIPI_DSI2_CPHY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_mipi_dsi2_phy_iface {</div><div class='add'>+	int ppi_width;</div><div class='add'>+	enum dw_mipi_dsi2_phy_type phy_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_mipi_dsi2_phy_timing {</div><div class='add'>+	u32 data_hs2lp;</div><div class='add'>+	u32 data_lp2hs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_mipi_dsi2_phy_ops {</div><div class='add'>+	int (*init)(void *priv_data);</div><div class='add'>+	void (*power_on)(void *priv_data);</div><div class='add'>+	void (*power_off)(void *priv_data);</div><div class='add'>+	void (*get_interface)(void *priv_data, struct dw_mipi_dsi2_phy_iface *iface);</div><div class='add'>+	int (*get_lane_mbps)(void *priv_data,</div><div class='add'>+			     const struct drm_display_mode *mode,</div><div class='add'>+			     unsigned long mode_flags, u32 lanes, u32 format,</div><div class='add'>+			     unsigned int *lane_mbps);</div><div class='add'>+	int (*get_timing)(void *priv_data, unsigned int lane_mbps,</div><div class='add'>+			  struct dw_mipi_dsi2_phy_timing *timing);</div><div class='add'>+	int (*get_esc_clk_rate)(void *priv_data, unsigned int *esc_clk_rate);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_mipi_dsi2_host_ops {</div><div class='add'>+	int (*attach)(void *priv_data,</div><div class='add'>+		      struct mipi_dsi_device *dsi);</div><div class='add'>+	int (*detach)(void *priv_data,</div><div class='add'>+		      struct mipi_dsi_device *dsi);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_mipi_dsi2_plat_data {</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	unsigned int max_data_lanes;</div><div class='add'>+</div><div class='add'>+	enum drm_mode_status (*mode_valid)(void *priv_data,</div><div class='add'>+					   const struct drm_display_mode *mode,</div><div class='add'>+					   unsigned long mode_flags,</div><div class='add'>+					   u32 lanes, u32 format);</div><div class='add'>+</div><div class='add'>+	bool (*mode_fixup)(void *priv_data, const struct drm_display_mode *mode,</div><div class='add'>+			   struct drm_display_mode *adjusted_mode);</div><div class='add'>+</div><div class='add'>+	u32 *(*get_input_bus_fmts)(void *priv_data,</div><div class='add'>+				   struct drm_bridge *bridge,</div><div class='add'>+				   struct drm_bridge_state *bridge_state,</div><div class='add'>+				   struct drm_crtc_state *crtc_state,</div><div class='add'>+				   struct drm_connector_state *conn_state,</div><div class='add'>+				   u32 output_fmt,</div><div class='add'>+				   unsigned int *num_input_fmts);</div><div class='add'>+</div><div class='add'>+	const struct dw_mipi_dsi2_phy_ops *phy_ops;</div><div class='add'>+	const struct dw_mipi_dsi2_host_ops *host_ops;</div><div class='add'>+</div><div class='add'>+	void *priv_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dw_mipi_dsi2 *dw_mipi_dsi2_probe(struct platform_device *pdev,</div><div class='add'>+					const struct dw_mipi_dsi2_plat_data *plat_data);</div><div class='add'>+void dw_mipi_dsi2_remove(struct dw_mipi_dsi2 *dsi2);</div><div class='add'>+int dw_mipi_dsi2_bind(struct dw_mipi_dsi2 *dsi2, struct drm_encoder *encoder);</div><div class='add'>+void dw_mipi_dsi2_unbind(struct dw_mipi_dsi2 *dsi2);</div><div class='add'>+</div><div class='add'>+#endif /* __DW_MIPI_DSI2__ */</div><div class='head'>diff --git a/include/drm/bridge/imx.h b/include/drm/bridge/imx.h<br/>new file mode 100644<br/>index 000000000000..b93f719fe0e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/imx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/bridge/imx.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2012 Sascha Hauer, Pengutronix</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef DRM_IMX_BRIDGE_H</div><div class='add'>+#define DRM_IMX_BRIDGE_H</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct device_node;</div><div class='add'>+struct drm_bridge;</div><div class='add'>+</div><div class='add'>+struct drm_bridge *devm_imx_drm_legacy_bridge(struct device *dev,</div><div class='add'>+					      struct device_node *np,</div><div class='add'>+					      int type);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h<br/>index e0c105051246..31d7ed589233 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/samsung-dsim.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/bridge/samsung-dsim.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/bridge/samsung-dsim.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/bridge/samsung-dsim.h</a></div><div class='hunk'>@@ -11,9 +11,11 @@</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;drm/drm_atomic_helper.h&gt;</div><div class='del'>-#include &lt;drm/drm_of.h&gt;</div><div class='add'>+#include &lt;drm/drm_bridge.h&gt;</div><div class='ctx'> #include &lt;drm/drm_mipi_dsi.h&gt;</div><div class='add'>+#include &lt;drm/drm_of.h&gt;</div><div class='ctx'> </div><div class='add'>+struct platform_device;</div><div class='ctx'> struct samsung_dsim;</div><div class='ctx'> </div><div class='ctx'> #define DSIM_STATE_ENABLED		BIT(0)</div><div class='hunk'>@@ -27,6 +29,7 @@ enum samsung_dsim_type {</div><div class='ctx'> 	DSIM_TYPE_EXYNOS5410,</div><div class='ctx'> 	DSIM_TYPE_EXYNOS5422,</div><div class='ctx'> 	DSIM_TYPE_EXYNOS5433,</div><div class='add'>+	DSIM_TYPE_EXYNOS7870,</div><div class='ctx'> 	DSIM_TYPE_IMX8MM,</div><div class='ctx'> 	DSIM_TYPE_IMX8MP,</div><div class='ctx'> 	DSIM_TYPE_COUNT,</div><div class='hunk'>@@ -51,15 +54,29 @@ struct samsung_dsim_transfer {</div><div class='ctx'> struct samsung_dsim_driver_data {</div><div class='ctx'> 	const unsigned int *reg_ofs;</div><div class='ctx'> 	unsigned int plltmr_reg;</div><div class='add'>+	unsigned int has_legacy_status_reg:1;</div><div class='ctx'> 	unsigned int has_freqband:1;</div><div class='ctx'> 	unsigned int has_clklane_stop:1;</div><div class='ctx'> 	unsigned int has_broken_fifoctrl_emptyhdr:1;</div><div class='add'>+	unsigned int has_sfrctrl:1;</div><div class='add'>+	struct clk_bulk_data *clk_data;</div><div class='ctx'> 	unsigned int num_clks;</div><div class='ctx'> 	unsigned int min_freq;</div><div class='ctx'> 	unsigned int max_freq;</div><div class='add'>+	unsigned int wait_for_hdr_fifo;</div><div class='ctx'> 	unsigned int wait_for_reset;</div><div class='ctx'> 	unsigned int num_bits_resol;</div><div class='add'>+	unsigned int video_mode_bit;</div><div class='add'>+	unsigned int pll_stable_bit;</div><div class='add'>+	unsigned int esc_clken_bit;</div><div class='add'>+	unsigned int byte_clken_bit;</div><div class='add'>+	unsigned int tx_req_hsclk_bit;</div><div class='add'>+	unsigned int lane_esc_clk_bit;</div><div class='add'>+	unsigned int lane_esc_data_offset;</div><div class='ctx'> 	unsigned int pll_p_offset;</div><div class='add'>+	unsigned int pll_m_offset;</div><div class='add'>+	unsigned int pll_s_offset;</div><div class='add'>+	unsigned int main_vsa_offset;</div><div class='ctx'> 	const unsigned int *reg_values;</div><div class='ctx'> 	unsigned int pll_fin_min;</div><div class='ctx'> 	unsigned int pll_fin_max;</div><div class='hunk'>@@ -89,7 +106,6 @@ struct samsung_dsim {</div><div class='ctx'> </div><div class='ctx'> 	void __iomem *reg_base;</div><div class='ctx'> 	struct phy *phy;</div><div class='del'>-	struct clk **clks;</div><div class='ctx'> 	struct clk *pll_clk;</div><div class='ctx'> 	struct regulator_bulk_data supplies[2];</div><div class='ctx'> 	int irq;</div><div class='head'>diff --git a/include/drm/clients/drm_client_setup.h b/include/drm/clients/drm_client_setup.h<br/>new file mode 100644<br/>index 000000000000..46aab3fb46be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/clients/drm_client_setup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/clients/drm_client_setup.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+</div><div class='add'>+#ifndef DRM_CLIENT_SETUP_H</div><div class='add'>+#define DRM_CLIENT_SETUP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_device;</div><div class='add'>+struct drm_format_info;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DRM_CLIENT_SETUP)</div><div class='add'>+void drm_client_setup(struct drm_device *dev, const struct drm_format_info *format);</div><div class='add'>+void drm_client_setup_with_fourcc(struct drm_device *dev, u32 fourcc);</div><div class='add'>+void drm_client_setup_with_color_mode(struct drm_device *dev, unsigned int color_mode);</div><div class='add'>+#else</div><div class='add'>+static inline void drm_client_setup(struct drm_device *dev,</div><div class='add'>+				    const struct drm_format_info *format)</div><div class='add'>+{ }</div><div class='add'>+static inline void drm_client_setup_with_fourcc(struct drm_device *dev, u32 fourcc)</div><div class='add'>+{ }</div><div class='add'>+static inline void drm_client_setup_with_color_mode(struct drm_device *dev,</div><div class='add'>+						    unsigned int color_mode)</div><div class='add'>+{ }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/display/drm_dp.h b/include/drm/display/drm_dp.h<br/>index 3731828825bd..e4eebabab975 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_dp.h</a></div><div class='hunk'>@@ -115,6 +115,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DP_MAX_LANE_COUNT                   0x002</div><div class='ctx'> # define DP_MAX_LANE_COUNT_MASK		    0x1f</div><div class='add'>+# define DP_POST_LT_ADJ_REQ_SUPPORTED	    (1 &lt;&lt; 5) /* 1.3 */</div><div class='ctx'> # define DP_TPS3_SUPPORTED		    (1 &lt;&lt; 6) /* 1.2 */</div><div class='ctx'> # define DP_ENHANCED_FRAME_CAP		    (1 &lt;&lt; 7)</div><div class='ctx'> </div><div class='hunk'>@@ -232,6 +233,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DP_RECEIVER_ALPM_CAP		    0x02e   /* eDP 1.4 */</div><div class='ctx'> # define DP_ALPM_CAP			    (1 &lt;&lt; 0)</div><div class='add'>+# define DP_ALPM_PM_STATE_2A_SUPPORT	    (1 &lt;&lt; 1) /* eDP 1.5 */</div><div class='add'>+# define DP_ALPM_AUX_LESS_CAP		    (1 &lt;&lt; 2) /* eDP 1.5 */</div><div class='ctx'> </div><div class='ctx'> #define DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP   0x02f   /* eDP 1.4 */</div><div class='ctx'> # define DP_AUX_FRAME_SYNC_CAP		    (1 &lt;&lt; 0)</div><div class='hunk'>@@ -255,6 +258,8 @@</div><div class='ctx'> # define DP_DSC_RC_BUF_BLK_SIZE_4           0x1</div><div class='ctx'> # define DP_DSC_RC_BUF_BLK_SIZE_16          0x2</div><div class='ctx'> # define DP_DSC_RC_BUF_BLK_SIZE_64          0x3</div><div class='add'>+# define DP_DSC_THROUGHPUT_MODE_0_DELTA_SHIFT 3 /* DP 2.1a, in units of 2 MPixels/sec */</div><div class='add'>+# define DP_DSC_THROUGHPUT_MODE_0_DELTA_MASK  (0x1f &lt;&lt; DP_DSC_THROUGHPUT_MODE_0_DELTA_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define DP_DSC_RC_BUF_SIZE                  0x063</div><div class='ctx'> </div><div class='hunk'>@@ -357,6 +362,7 @@</div><div class='ctx'> # define DP_DSC_BITS_PER_PIXEL_1_4          0x2</div><div class='ctx'> # define DP_DSC_BITS_PER_PIXEL_1_2          0x3</div><div class='ctx'> # define DP_DSC_BITS_PER_PIXEL_1_1          0x4</div><div class='add'>+# define DP_DSC_BITS_PER_PIXEL_MASK         0x7</div><div class='ctx'> </div><div class='ctx'> #define DP_PSR_SUPPORT                      0x070   /* XXX 1.2? */</div><div class='ctx'> # define DP_PSR_IS_SUPPORTED                1</div><div class='hunk'>@@ -544,9 +550,28 @@</div><div class='ctx'> /* DFP Capability Extension */</div><div class='ctx'> #define DP_DFP_CAPABILITY_EXTENSION_SUPPORT	0x0a3	/* 2.0 */</div><div class='ctx'> </div><div class='del'>-#define DP_PANEL_REPLAY_CAP                 0x0b0  /* DP 2.0 */</div><div class='del'>-# define DP_PANEL_REPLAY_SUPPORT            (1 &lt;&lt; 0)</div><div class='del'>-# define DP_PANEL_REPLAY_SU_SUPPORT         (1 &lt;&lt; 1)</div><div class='add'>+#define DP_PANEL_REPLAY_CAP_SUPPORT			0x0b0  /* DP 2.0 */</div><div class='add'>+# define DP_PANEL_REPLAY_SUPPORT			(1 &lt;&lt; 0)</div><div class='add'>+# define DP_PANEL_REPLAY_SU_SUPPORT			(1 &lt;&lt; 1)</div><div class='add'>+# define DP_PANEL_REPLAY_EARLY_TRANSPORT_SUPPORT	(1 &lt;&lt; 2) /* eDP 1.5 */</div><div class='add'>+</div><div class='add'>+#define DP_PANEL_REPLAY_CAP_SIZE	7</div><div class='add'>+</div><div class='add'>+#define DP_PANEL_REPLAY_CAP_CAPABILITY					0xb1</div><div class='add'>+# define DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT			1 /* DP 2.1a */</div><div class='add'>+# define DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_MASK			(3 &lt;&lt; DP_PANEL_REPLAY_DSC_DECODE_CAPABILITY_IN_PR_SHIFT)</div><div class='add'>+# define DP_DSC_DECODE_CAPABILITY_IN_PR_SUPPORTED				0x00</div><div class='add'>+# define DP_DSC_DECODE_CAPABILITY_IN_PR_FULL_FRAME_ONLY				0x01</div><div class='add'>+# define DP_DSC_DECODE_CAPABILITY_IN_PR_NOT_SUPPORTED				0x02</div><div class='add'>+# define DP_DSC_DECODE_CAPABILITY_IN_PR_RESERVED				0x03</div><div class='add'>+# define DP_PANEL_REPLAY_ASYNC_VIDEO_TIMING_NOT_SUPPORTED_IN_PR			(1 &lt;&lt; 3)</div><div class='add'>+# define DP_PANEL_REPLAY_DSC_CRC_OF_MULTIPLE_SUS_SUPPORTED			(1 &lt;&lt; 4)</div><div class='add'>+# define DP_PANEL_REPLAY_SU_GRANULARITY_REQUIRED				(1 &lt;&lt; 5)</div><div class='add'>+# define DP_PANEL_REPLAY_SU_Y_GRANULARITY_EXTENDED_CAPABILITY_SUPPORTED		(1 &lt;&lt; 6)</div><div class='add'>+# define DP_PANEL_REPLAY_LINK_OFF_SUPPORTED_IN_PR_AFTER_ADAPTIVE_SYNC_SDP	(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+#define DP_PANEL_REPLAY_CAP_X_GRANULARITY		0xb2</div><div class='add'>+#define DP_PANEL_REPLAY_CAP_Y_GRANULARITY		0xb4</div><div class='ctx'> </div><div class='ctx'> /* Link Configuration */</div><div class='ctx'> #define	DP_LINK_BW_SET		            0x100</div><div class='hunk'>@@ -561,6 +586,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DP_LANE_COUNT_SET	            0x101</div><div class='ctx'> # define DP_LANE_COUNT_MASK		    0x0f</div><div class='add'>+# define DP_POST_LT_ADJ_REQ_GRANTED         (1 &lt;&lt; 5) /* 1.3 */</div><div class='ctx'> # define DP_LANE_COUNT_ENHANCED_FRAME_EN    (1 &lt;&lt; 7)</div><div class='ctx'> </div><div class='ctx'> #define DP_TRAINING_PATTERN_SET	            0x102</div><div class='hunk'>@@ -677,7 +703,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DP_RECEIVER_ALPM_CONFIG		    0x116   /* eDP 1.4 */</div><div class='ctx'> # define DP_ALPM_ENABLE			    (1 &lt;&lt; 0)</div><div class='del'>-# define DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE  (1 &lt;&lt; 1)</div><div class='add'>+# define DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE  (1 &lt;&lt; 1) /* eDP 1.5 */</div><div class='add'>+# define DP_ALPM_MODE_AUX_LESS		    (1 &lt;&lt; 2) /* eDP 1.5 */</div><div class='ctx'> </div><div class='ctx'> #define DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF  0x117   /* eDP 1.4 */</div><div class='ctx'> # define DP_AUX_FRAME_SYNC_ENABLE	    (1 &lt;&lt; 0)</div><div class='hunk'>@@ -686,6 +713,9 @@</div><div class='ctx'> #define DP_UPSTREAM_DEVICE_DP_PWR_NEED	    0x118   /* 1.2 */</div><div class='ctx'> # define DP_PWR_NOT_NEEDED		    (1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='add'>+#define DP_EXTENDED_DPRX_SLEEP_WAKE_TIMEOUT_GRANT	    0x119   /* 1.4a */</div><div class='add'>+# define DP_DPRX_SLEEP_WAKE_TIMEOUT_PERIOD_GRANTED	    (1 &lt;&lt; 0)</div><div class='add'>+</div><div class='ctx'> #define DP_FEC_CONFIGURATION		    0x120    /* 1.4 */</div><div class='ctx'> # define DP_FEC_READY			    (1 &lt;&lt; 0)</div><div class='ctx'> # define DP_FEC_ERR_COUNT_SEL_MASK	    (7 &lt;&lt; 1)</div><div class='hunk'>@@ -718,6 +748,7 @@</div><div class='ctx'> # define DP_PSR_SU_REGION_SCANLINE_CAPTURE	BIT(4) /* eDP 1.4a */</div><div class='ctx'> # define DP_PSR_IRQ_HPD_WITH_CRC_ERRORS		BIT(5) /* eDP 1.4a */</div><div class='ctx'> # define DP_PSR_ENABLE_PSR2			BIT(6) /* eDP 1.4a */</div><div class='add'>+# define DP_PSR_ENABLE_SU_REGION_ET             BIT(7) /* eDP 1.5 */</div><div class='ctx'> </div><div class='ctx'> #define DP_ADAPTER_CTRL			    0x1a0</div><div class='ctx'> # define DP_ADAPTER_CTRL_FORCE_LOAD_SENSE   (1 &lt;&lt; 0)</div><div class='hunk'>@@ -727,10 +758,20 @@</div><div class='ctx'> </div><div class='ctx'> #define PANEL_REPLAY_CONFIG                             0x1b0  /* DP 2.0 */</div><div class='ctx'> # define DP_PANEL_REPLAY_ENABLE                         (1 &lt;&lt; 0)</div><div class='add'>+# define DP_PANEL_REPLAY_VSC_SDP_CRC_EN                 (1 &lt;&lt; 1) /* eDP 1.5 */</div><div class='ctx'> # define DP_PANEL_REPLAY_UNRECOVERABLE_ERROR_EN         (1 &lt;&lt; 3)</div><div class='ctx'> # define DP_PANEL_REPLAY_RFB_STORAGE_ERROR_EN           (1 &lt;&lt; 4)</div><div class='ctx'> # define DP_PANEL_REPLAY_ACTIVE_FRAME_CRC_ERROR_EN      (1 &lt;&lt; 5)</div><div class='ctx'> # define DP_PANEL_REPLAY_SU_ENABLE                      (1 &lt;&lt; 6)</div><div class='add'>+# define DP_PANEL_REPLAY_ENABLE_SU_REGION_ET            (1 &lt;&lt; 7) /* DP 2.1 */</div><div class='add'>+</div><div class='add'>+#define PANEL_REPLAY_CONFIG2                                     0x1b1 /* eDP 1.5 */</div><div class='add'>+# define DP_PANEL_REPLAY_SINK_REFRESH_RATE_UNLOCK_GRANTED	 (1 &lt;&lt; 0)</div><div class='add'>+# define DP_PANEL_REPLAY_CRC_VERIFICATION			 (1 &lt;&lt; 1)</div><div class='add'>+# define DP_PANEL_REPLAY_SU_Y_GRANULARITY_EXTENDED_EN		 (1 &lt;&lt; 2)</div><div class='add'>+# define DP_PANEL_REPLAY_SU_Y_GRANULARITY_EXTENDED_VAL_SEL_SHIFT 3</div><div class='add'>+# define DP_PANEL_REPLAY_SU_Y_GRANULARITY_EXTENDED_VAL_SEL_MASK  (0xf &lt;&lt; 3)</div><div class='add'>+# define DP_PANEL_REPLAY_SU_REGION_SCANLINE_CAPTURE		 (1 &lt;&lt; 7)</div><div class='ctx'> </div><div class='ctx'> #define DP_PAYLOAD_ALLOCATE_SET		    0x1c0</div><div class='ctx'> #define DP_PAYLOAD_ALLOCATE_START_TIME_SLOT 0x1c1</div><div class='hunk'>@@ -763,6 +804,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DP_LANE_ALIGN_STATUS_UPDATED                    0x204</div><div class='ctx'> #define  DP_INTERLANE_ALIGN_DONE                        (1 &lt;&lt; 0)</div><div class='add'>+#define  DP_POST_LT_ADJ_REQ_IN_PROGRESS                 (1 &lt;&lt; 1) /* 1.3 */</div><div class='ctx'> #define  DP_128B132B_DPRX_EQ_INTERLANE_ALIGN_DONE       (1 &lt;&lt; 2) /* 2.0 E11 */</div><div class='ctx'> #define  DP_128B132B_DPRX_CDS_INTERLANE_ALIGN_DONE      (1 &lt;&lt; 3) /* 2.0 E11 */</div><div class='ctx'> #define  DP_128B132B_LT_FAILED                          (1 &lt;&lt; 4) /* 2.0 E11 */</div><div class='hunk'>@@ -975,6 +1017,7 @@</div><div class='ctx'> # define DP_EDP_14			    0x03</div><div class='ctx'> # define DP_EDP_14a                         0x04    /* eDP 1.4a */</div><div class='ctx'> # define DP_EDP_14b                         0x05    /* eDP 1.4b */</div><div class='add'>+# define DP_EDP_15			    0x06    /* eDP 1.5 */</div><div class='ctx'> </div><div class='ctx'> #define DP_EDP_GENERAL_CAP_1		    0x701</div><div class='ctx'> # define DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP		(1 &lt;&lt; 0)</div><div class='hunk'>@@ -999,6 +1042,7 @@</div><div class='ctx'> #define DP_EDP_GENERAL_CAP_2		    0x703</div><div class='ctx'> # define DP_EDP_OVERDRIVE_ENGINE_ENABLED		(1 &lt;&lt; 0)</div><div class='ctx'> # define DP_EDP_PANEL_LUMINANCE_CONTROL_CAPABLE		(1 &lt;&lt; 4)</div><div class='add'>+# define DP_EDP_SMOOTH_BRIGHTNESS_CAPABLE		(1 &lt;&lt; 6) /* eDP 2.0 */</div><div class='ctx'> </div><div class='ctx'> #define DP_EDP_GENERAL_CAP_3		    0x704    /* eDP 1.4 */</div><div class='ctx'> # define DP_EDP_X_REGION_CAP_MASK			(0xf &lt;&lt; 0)</div><div class='hunk'>@@ -1080,6 +1124,7 @@</div><div class='ctx'> # define STREAM_STATUS_CHANGED               (1 &lt;&lt; 2)</div><div class='ctx'> # define HDMI_LINK_STATUS_CHANGED            (1 &lt;&lt; 3)</div><div class='ctx'> # define CONNECTED_OFF_ENTRY_REQUESTED       (1 &lt;&lt; 4)</div><div class='add'>+# define DP_TUNNELING_IRQ                    (1 &lt;&lt; 5)</div><div class='ctx'> </div><div class='ctx'> #define DP_PSR_ERROR_STATUS                 0x2006  /* XXX 1.2? */</div><div class='ctx'> # define DP_PSR_LINK_CRC_ERROR              (1 &lt;&lt; 0)</div><div class='hunk'>@@ -1146,8 +1191,19 @@</div><div class='ctx'> # define DP_VSC_EXT_CEA_SDP_SUPPORTED			(1 &lt;&lt; 6)  /* DP 1.4 */</div><div class='ctx'> # define DP_VSC_EXT_CEA_SDP_CHAINING_SUPPORTED		(1 &lt;&lt; 7)  /* DP 1.4 */</div><div class='ctx'> </div><div class='add'>+#define DP_EXTENDED_DPRX_SLEEP_WAKE_TIMEOUT_REQUEST	0x2211  /* 1.4a */</div><div class='add'>+# define DP_DPRX_SLEEP_WAKE_TIMEOUT_PERIOD_MASK		0xff</div><div class='add'>+# define DP_DPRX_SLEEP_WAKE_TIMEOUT_PERIOD_1_MS		0x00</div><div class='add'>+# define DP_DPRX_SLEEP_WAKE_TIMEOUT_PERIOD_20_MS	0x01</div><div class='add'>+# define DP_DPRX_SLEEP_WAKE_TIMEOUT_PERIOD_40_MS	0x02</div><div class='add'>+# define DP_DPRX_SLEEP_WAKE_TIMEOUT_PERIOD_60_MS	0x03</div><div class='add'>+# define DP_DPRX_SLEEP_WAKE_TIMEOUT_PERIOD_80_MS	0x04</div><div class='add'>+# define DP_DPRX_SLEEP_WAKE_TIMEOUT_PERIOD_100_MS	0x05</div><div class='add'>+</div><div class='ctx'> #define DP_DPRX_FEATURE_ENUMERATION_LIST_CONT_1         0x2214 /* 2.0 E11 */</div><div class='ctx'> # define DP_ADAPTIVE_SYNC_SDP_SUPPORTED    (1 &lt;&lt; 0)</div><div class='add'>+# define DP_ADAPTIVE_SYNC_SDP_OPERATION_MODE		GENMASK(1, 0)</div><div class='add'>+# define DP_ADAPTIVE_SYNC_SDP_LENGTH				GENMASK(5, 0)</div><div class='ctx'> # define DP_AS_SDP_FIRST_HALF_LINE_OR_3840_PIXEL_CYCLE_WINDOW_NOT_SUPPORTED (1 &lt;&lt; 1)</div><div class='ctx'> # define DP_VSC_EXT_SDP_FRAMEWORK_VERSION_1_SUPPORTED  (1 &lt;&lt; 4)</div><div class='ctx'> </div><div class='hunk'>@@ -1381,6 +1437,66 @@</div><div class='ctx'> #define DP_HDCP_2_2_REG_STREAM_TYPE_OFFSET	0x69494</div><div class='ctx'> #define DP_HDCP_2_2_REG_DBG_OFFSET		0x69518</div><div class='ctx'> </div><div class='add'>+/* DP-tunneling */</div><div class='add'>+#define DP_TUNNELING_OUI				0xe0000</div><div class='add'>+#define  DP_TUNNELING_OUI_BYTES				3</div><div class='add'>+</div><div class='add'>+#define DP_TUNNELING_DEV_ID				0xe0003</div><div class='add'>+#define  DP_TUNNELING_DEV_ID_BYTES			6</div><div class='add'>+</div><div class='add'>+#define DP_TUNNELING_HW_REV				0xe0009</div><div class='add'>+#define  DP_TUNNELING_HW_REV_MAJOR_SHIFT		4</div><div class='add'>+#define  DP_TUNNELING_HW_REV_MAJOR_MASK			(0xf &lt;&lt; DP_TUNNELING_HW_REV_MAJOR_SHIFT)</div><div class='add'>+#define  DP_TUNNELING_HW_REV_MINOR_SHIFT		0</div><div class='add'>+#define  DP_TUNNELING_HW_REV_MINOR_MASK			(0xf &lt;&lt; DP_TUNNELING_HW_REV_MINOR_SHIFT)</div><div class='add'>+</div><div class='add'>+#define DP_TUNNELING_SW_REV_MAJOR			0xe000a</div><div class='add'>+#define DP_TUNNELING_SW_REV_MINOR			0xe000b</div><div class='add'>+</div><div class='add'>+#define DP_TUNNELING_CAPABILITIES			0xe000d</div><div class='add'>+#define  DP_IN_BW_ALLOCATION_MODE_SUPPORT		(1 &lt;&lt; 7)</div><div class='add'>+#define  DP_PANEL_REPLAY_OPTIMIZATION_SUPPORT		(1 &lt;&lt; 6)</div><div class='add'>+#define  DP_TUNNELING_SUPPORT				(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define DP_IN_ADAPTER_INFO				0xe000e</div><div class='add'>+#define  DP_IN_ADAPTER_NUMBER_BITS			7</div><div class='add'>+#define  DP_IN_ADAPTER_NUMBER_MASK			((1 &lt;&lt; DP_IN_ADAPTER_NUMBER_BITS) - 1)</div><div class='add'>+</div><div class='add'>+#define DP_USB4_DRIVER_ID				0xe000f</div><div class='add'>+#define  DP_USB4_DRIVER_ID_BITS				4</div><div class='add'>+#define  DP_USB4_DRIVER_ID_MASK				((1 &lt;&lt; DP_USB4_DRIVER_ID_BITS) - 1)</div><div class='add'>+</div><div class='add'>+#define DP_USB4_DRIVER_BW_CAPABILITY			0xe0020</div><div class='add'>+#define  DP_USB4_DRIVER_BW_ALLOCATION_MODE_SUPPORT	(1 &lt;&lt; 7)</div><div class='add'>+</div><div class='add'>+#define DP_IN_ADAPTER_TUNNEL_INFORMATION		0xe0021</div><div class='add'>+#define  DP_GROUP_ID_BITS				3</div><div class='add'>+#define  DP_GROUP_ID_MASK				((1 &lt;&lt; DP_GROUP_ID_BITS) - 1)</div><div class='add'>+</div><div class='add'>+#define DP_BW_GRANULARITY				0xe0022</div><div class='add'>+#define  DP_BW_GRANULARITY_MASK				0x3</div><div class='add'>+</div><div class='add'>+#define DP_ESTIMATED_BW					0xe0023</div><div class='add'>+#define DP_ALLOCATED_BW					0xe0024</div><div class='add'>+</div><div class='add'>+#define DP_TUNNELING_STATUS				0xe0025</div><div class='add'>+#define  DP_BW_ALLOCATION_CAPABILITY_CHANGED		(1 &lt;&lt; 3)</div><div class='add'>+#define  DP_ESTIMATED_BW_CHANGED			(1 &lt;&lt; 2)</div><div class='add'>+#define  DP_BW_REQUEST_SUCCEEDED			(1 &lt;&lt; 1)</div><div class='add'>+#define  DP_BW_REQUEST_FAILED				(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define DP_TUNNELING_MAX_LINK_RATE			0xe0028</div><div class='add'>+</div><div class='add'>+#define DP_TUNNELING_MAX_LANE_COUNT			0xe0029</div><div class='add'>+#define  DP_TUNNELING_MAX_LANE_COUNT_MASK		0x1f</div><div class='add'>+</div><div class='add'>+#define DP_DPTX_BW_ALLOCATION_MODE_CONTROL		0xe0030</div><div class='add'>+#define  DP_DISPLAY_DRIVER_BW_ALLOCATION_MODE_ENABLE	(1 &lt;&lt; 7)</div><div class='add'>+#define  DP_UNMASK_BW_ALLOCATION_IRQ			(1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#define DP_REQUEST_BW					0xe0031</div><div class='add'>+#define  MAX_DP_REQUEST_BW				255</div><div class='add'>+</div><div class='ctx'> /* LTTPR: Link Training (LT)-tunable PHY Repeaters */</div><div class='ctx'> #define DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV 0xf0000 /* 1.3 */</div><div class='ctx'> #define DP_MAX_LINK_RATE_PHY_REPEATER			    0xf0001 /* 1.4a */</div><div class='hunk'>@@ -1389,6 +1505,8 @@</div><div class='ctx'> #define DP_MAX_LANE_COUNT_PHY_REPEATER			    0xf0004 /* 1.4a */</div><div class='ctx'> #define DP_Repeater_FEC_CAPABILITY			    0xf0004 /* 1.4 */</div><div class='ctx'> #define DP_PHY_REPEATER_EXTENDED_WAIT_TIMEOUT		    0xf0005 /* 1.4a */</div><div class='add'>+# define DP_EXTENDED_WAKE_TIMEOUT_REQUEST_MASK		0x7f</div><div class='add'>+# define DP_EXTENDED_WAKE_TIMEOUT_GRANT			(1 &lt;&lt; 7)</div><div class='ctx'> #define DP_MAIN_LINK_CHANNEL_CODING_PHY_REPEATER	    0xf0006 /* 2.0 */</div><div class='ctx'> # define DP_PHY_REPEATER_128B132B_SUPPORTED		    (1 &lt;&lt; 0)</div><div class='ctx'> /* See DP_128B132B_SUPPORTED_LINK_RATES for values */</div><div class='hunk'>@@ -1459,6 +1577,10 @@ enum drm_dp_phy {</div><div class='ctx'> #define DP_SYMBOL_ERROR_COUNT_LANE2_PHY_REPEATER1	    0xf0039 /* 1.3 */</div><div class='ctx'> #define DP_SYMBOL_ERROR_COUNT_LANE3_PHY_REPEATER1	    0xf003b /* 1.3 */</div><div class='ctx'> </div><div class='add'>+#define DP_OUI_PHY_REPEATER1				    0xf003d /* 1.3 */</div><div class='add'>+#define DP_OUI_PHY_REPEATER(dp_phy) \</div><div class='add'>+	DP_LTTPR_REG(dp_phy, DP_OUI_PHY_REPEATER1)</div><div class='add'>+</div><div class='ctx'> #define __DP_FEC1_BASE					    0xf0290 /* 1.4 */</div><div class='ctx'> #define __DP_FEC2_BASE					    0xf0298 /* 1.4 */</div><div class='ctx'> #define DP_FEC_BASE(dp_phy) \</div><div class='hunk'>@@ -1566,8 +1688,9 @@ enum drm_dp_phy {</div><div class='ctx'> #define DP_BRANCH_OUI_HEADER_SIZE	0xc</div><div class='ctx'> #define DP_RECEIVER_CAP_SIZE		0xf</div><div class='ctx'> #define DP_DSC_RECEIVER_CAP_SIZE        0x10 /* DSC Capabilities 0x60 through 0x6F */</div><div class='add'>+#define DP_DSC_BRANCH_CAP_SIZE		3</div><div class='ctx'> #define EDP_PSR_RECEIVER_CAP_SIZE	2</div><div class='del'>-#define EDP_DISPLAY_CTL_CAP_SIZE	3</div><div class='add'>+#define EDP_DISPLAY_CTL_CAP_SIZE	5</div><div class='ctx'> #define DP_LTTPR_COMMON_CAP_SIZE	8</div><div class='ctx'> #define DP_LTTPR_PHY_CAP_SIZE		3</div><div class='ctx'> </div><div class='hunk'>@@ -1577,10 +1700,12 @@ enum drm_dp_phy {</div><div class='ctx'> #define DP_SDP_AUDIO_COPYMANAGEMENT	0x05 /* DP 1.2 */</div><div class='ctx'> #define DP_SDP_ISRC			0x06 /* DP 1.2 */</div><div class='ctx'> #define DP_SDP_VSC			0x07 /* DP 1.2 */</div><div class='add'>+#define DP_SDP_ADAPTIVE_SYNC		0x22 /* DP 1.4 */</div><div class='ctx'> #define DP_SDP_CAMERA_GENERIC(i)	(0x08 + (i)) /* 0-7, DP 1.3 */</div><div class='ctx'> #define DP_SDP_PPS			0x10 /* DP 1.4 */</div><div class='ctx'> #define DP_SDP_VSC_EXT_VESA		0x20 /* DP 1.4 */</div><div class='ctx'> #define DP_SDP_VSC_EXT_CEA		0x21 /* DP 1.4 */</div><div class='add'>+</div><div class='ctx'> /* 0x80+ CEA-861 infoframe types */</div><div class='ctx'> </div><div class='ctx'> #define DP_SDP_AUDIO_INFOFRAME_HB2	0x1b</div><div class='hunk'>@@ -1736,4 +1861,11 @@ enum dp_content_type {</div><div class='ctx'> 	DP_CONTENT_TYPE_GAME = 0x04,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum operation_mode {</div><div class='add'>+	DP_AS_SDP_AVT_DYNAMIC_VTOTAL = 0x00,</div><div class='add'>+	DP_AS_SDP_AVT_FIXED_VTOTAL = 0x01,</div><div class='add'>+	DP_AS_SDP_FAVT_TRR_NOT_REACHED = 0x02,</div><div class='add'>+	DP_AS_SDP_FAVT_TRR_REACHED = 0x03</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* _DRM_DP_H_ */</div><div class='head'>diff --git a/include/drm/display/drm_dp_dual_mode_helper.h b/include/drm/display/drm_dp_dual_mode_helper.h<br/>index 7ee482265087..7ac6969db935 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp_dual_mode_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp_dual_mode_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp_dual_mode_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_dp_dual_mode_helper.h</a></div><div class='hunk'>@@ -117,5 +117,5 @@ const char *drm_dp_get_dual_mode_type_name(enum drm_dp_dual_mode_type type);</div><div class='ctx'> int drm_lspcon_get_mode(const struct drm_device *dev, struct i2c_adapter *adapter,</div><div class='ctx'> 			enum drm_lspcon_mode *current_mode);</div><div class='ctx'> int drm_lspcon_set_mode(const struct drm_device *dev, struct i2c_adapter *adapter,</div><div class='del'>-			enum drm_lspcon_mode reqd_mode);</div><div class='add'>+			enum drm_lspcon_mode reqd_mode, int time_out);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/display/drm_dp_helper.h b/include/drm/display/drm_dp_helper.h<br/>index 863b2e7add29..df2f24b950e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_dp_helper.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@ bool drm_dp_channel_eq_ok(const u8 link_status[DP_LINK_STATUS_SIZE],</div><div class='ctx'> 			  int lane_count);</div><div class='ctx'> bool drm_dp_clock_recovery_ok(const u8 link_status[DP_LINK_STATUS_SIZE],</div><div class='ctx'> 			      int lane_count);</div><div class='add'>+bool drm_dp_post_lt_adj_req_in_progress(const u8 link_status[DP_LINK_STATUS_SIZE]);</div><div class='ctx'> u8 drm_dp_get_adjust_request_voltage(const u8 link_status[DP_LINK_STATUS_SIZE],</div><div class='ctx'> 				     int lane);</div><div class='ctx'> u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SIZE],</div><div class='hunk'>@@ -98,8 +99,41 @@ struct drm_dp_vsc_sdp {</div><div class='ctx'> 	enum dp_content_type content_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void drm_dp_vsc_sdp_log(const char *level, struct device *dev,</div><div class='del'>-			const struct drm_dp_vsc_sdp *vsc);</div><div class='add'>+/**</div><div class='add'>+ * struct drm_dp_as_sdp - drm DP Adaptive Sync SDP</div><div class='add'>+ *</div><div class='add'>+ * This structure represents a DP AS SDP of drm</div><div class='add'>+ * It is based on DP 2.1 spec [Table 2-126:  Adaptive-Sync SDP Header Bytes] and</div><div class='add'>+ * [Table 2-127: Adaptive-Sync SDP Payload for DB0 through DB8]</div><div class='add'>+ *</div><div class='add'>+ * @sdp_type: Secondary-data packet type</div><div class='add'>+ * @revision: Revision Number</div><div class='add'>+ * @length: Number of valid data bytes</div><div class='add'>+ * @vtotal: Minimum Vertical Vtotal</div><div class='add'>+ * @target_rr: Target Refresh</div><div class='add'>+ * @duration_incr_ms: Successive frame duration increase</div><div class='add'>+ * @duration_decr_ms: Successive frame duration decrease</div><div class='add'>+ * @target_rr_divider: Target refresh rate divider</div><div class='add'>+ * @mode: Adaptive Sync Operation Mode</div><div class='add'>+ */</div><div class='add'>+struct drm_dp_as_sdp {</div><div class='add'>+	unsigned char sdp_type;</div><div class='add'>+	unsigned char revision;</div><div class='add'>+	unsigned char length;</div><div class='add'>+	int vtotal;</div><div class='add'>+	int target_rr;</div><div class='add'>+	int duration_incr_ms;</div><div class='add'>+	int duration_decr_ms;</div><div class='add'>+	bool target_rr_divider;</div><div class='add'>+	enum operation_mode mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void drm_dp_as_sdp_log(struct drm_printer *p,</div><div class='add'>+		       const struct drm_dp_as_sdp *as_sdp);</div><div class='add'>+void drm_dp_vsc_sdp_log(struct drm_printer *p, const struct drm_dp_vsc_sdp *vsc);</div><div class='add'>+</div><div class='add'>+bool drm_dp_vsc_sdp_supported(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]);</div><div class='add'>+bool drm_dp_as_sdp_supported(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]);</div><div class='ctx'> </div><div class='ctx'> int drm_dp_psr_setup_time(const u8 psr_cap[EDP_PSR_RECEIVER_CAP_SIZE]);</div><div class='ctx'> </div><div class='hunk'>@@ -123,6 +157,13 @@ drm_dp_enhanced_frame_cap(const u8 dpcd[DP_RECEIVER_CAP_SIZE])</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='add'>+drm_dp_post_lt_adj_req_supported(const u8 dpcd[DP_RECEIVER_CAP_SIZE])</div><div class='add'>+{</div><div class='add'>+	return dpcd[DP_DPCD_REV] &gt;= 0x13 &amp;&amp;</div><div class='add'>+		(dpcd[DP_MAX_LANE_COUNT] &amp; DP_POST_LT_ADJ_REQ_SUPPORTED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='ctx'> drm_dp_fast_training_cap(const u8 dpcd[DP_RECEIVER_CAP_SIZE])</div><div class='ctx'> {</div><div class='ctx'> 	return dpcd[DP_DPCD_REV] &gt;= 0x11 &amp;&amp;</div><div class='hunk'>@@ -170,6 +211,11 @@ u8 drm_dp_dsc_sink_max_slice_count(const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE],</div><div class='ctx'> u8 drm_dp_dsc_sink_line_buf_depth(const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE]);</div><div class='ctx'> int drm_dp_dsc_sink_supported_input_bpcs(const u8 dsc_dpc[DP_DSC_RECEIVER_CAP_SIZE],</div><div class='ctx'> 					 u8 dsc_bpc[3]);</div><div class='add'>+int drm_dp_dsc_sink_max_slice_throughput(const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE],</div><div class='add'>+					 int peak_pixel_rate, bool is_rgb_yuv444);</div><div class='add'>+int drm_dp_dsc_branch_max_overall_throughput(const u8 dsc_branch_dpcd[DP_DSC_BRANCH_CAP_SIZE],</div><div class='add'>+					     bool is_rgb_yuv444);</div><div class='add'>+int drm_dp_dsc_branch_max_line_width(const u8 dsc_branch_dpcd[DP_DSC_BRANCH_CAP_SIZE]);</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='ctx'> drm_dp_sink_supports_dsc(const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE])</div><div class='hunk'>@@ -221,6 +267,12 @@ drm_dp_channel_coding_supported(const u8 dpcd[DP_RECEIVER_CAP_SIZE])</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='add'>+drm_dp_128b132b_supported(const u8 dpcd[DP_RECEIVER_CAP_SIZE])</div><div class='add'>+{</div><div class='add'>+	return dpcd[DP_MAIN_LINK_CHANNEL_CODING] &amp; DP_CAP_ANSI_128B132B;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='ctx'> drm_dp_alternate_scrambler_reset_cap(const u8 dpcd[DP_RECEIVER_CAP_SIZE])</div><div class='ctx'> {</div><div class='ctx'> 	return dpcd[DP_EDP_CONFIGURATION_CAP] &amp;</div><div class='hunk'>@@ -421,7 +473,18 @@ struct drm_dp_aux {</div><div class='ctx'> 	 * @wait_hpd_asserted: wait for HPD to be asserted</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This is mainly useful for eDP panels drivers to wait for an eDP</div><div class='del'>-	 * panel to finish powering on. This is an optional function.</div><div class='add'>+	 * panel to finish powering on. It is optional for DP AUX controllers</div><div class='add'>+	 * to implement this function. It is required for DP AUX endpoints</div><div class='add'>+	 * (panel drivers) to call this function after powering up but before</div><div class='add'>+	 * doing AUX transfers unless the DP AUX endpoint driver knows that</div><div class='add'>+	 * we're not using the AUX controller's HPD. One example of the panel</div><div class='add'>+	 * driver not needing to call this is if HPD is hooked up to a GPIO</div><div class='add'>+	 * that the panel driver can read directly.</div><div class='add'>+	 *</div><div class='add'>+	 * If a DP AUX controller does not implement this function then it</div><div class='add'>+	 * may still support eDP panels that use the AUX controller's built-in</div><div class='add'>+	 * HPD signal by implementing a long wait for HPD in the transfer()</div><div class='add'>+	 * callback, though this is deprecated.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This function will efficiently wait for the HPD signal to be</div><div class='ctx'> 	 * asserted. The `wait_us` parameter that is passed in says that we</div><div class='hunk'>@@ -463,22 +526,98 @@ struct drm_dp_aux {</div><div class='ctx'> 	 * @is_remote: Is this AUX CH actually using sideband messaging.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool is_remote;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @powered_down: If true then the remote endpoint is powered down.</div><div class='add'>+	 */</div><div class='add'>+	bool powered_down;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @no_zero_sized: If the hw can't use zero sized transfers (NVIDIA)</div><div class='add'>+	 */</div><div class='add'>+	bool no_zero_sized;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dpcd_probe_disabled: If probing before a DPCD access is disabled.</div><div class='add'>+	 */</div><div class='add'>+	bool dpcd_probe_disabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int drm_dp_dpcd_probe(struct drm_dp_aux *aux, unsigned int offset);</div><div class='add'>+void drm_dp_dpcd_set_powered(struct drm_dp_aux *aux, bool powered);</div><div class='add'>+void drm_dp_dpcd_set_probe(struct drm_dp_aux *aux, bool enable);</div><div class='ctx'> ssize_t drm_dp_dpcd_read(struct drm_dp_aux *aux, unsigned int offset,</div><div class='ctx'> 			 void *buffer, size_t size);</div><div class='ctx'> ssize_t drm_dp_dpcd_write(struct drm_dp_aux *aux, unsigned int offset,</div><div class='ctx'> 			  void *buffer, size_t size);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * drm_dp_dpcd_read_data() - read a series of bytes from the DPCD</div><div class='add'>+ * @aux: DisplayPort AUX channel (SST or MST)</div><div class='add'>+ * @offset: address of the (first) register to read</div><div class='add'>+ * @buffer: buffer to store the register values</div><div class='add'>+ * @size: number of bytes in @buffer</div><div class='add'>+ *</div><div class='add'>+ * Returns zero (0) on success, or a negative error</div><div class='add'>+ * code on failure. -EIO is returned if the request was NAKed by the sink or</div><div class='add'>+ * if the retry count was exceeded. If not all bytes were transferred, this</div><div class='add'>+ * function returns -EPROTO. Errors from the underlying AUX channel transfer</div><div class='add'>+ * function, with the exception of -EBUSY (which causes the transaction to</div><div class='add'>+ * be retried), are propagated to the caller.</div><div class='add'>+ */</div><div class='add'>+static inline int drm_dp_dpcd_read_data(struct drm_dp_aux *aux,</div><div class='add'>+					unsigned int offset,</div><div class='add'>+					void *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = drm_dp_dpcd_read(aux, offset, buffer, size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret &lt; size)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_dp_dpcd_write_data() - write a series of bytes to the DPCD</div><div class='add'>+ * @aux: DisplayPort AUX channel (SST or MST)</div><div class='add'>+ * @offset: address of the (first) register to write</div><div class='add'>+ * @buffer: buffer containing the values to write</div><div class='add'>+ * @size: number of bytes in @buffer</div><div class='add'>+ *</div><div class='add'>+ * Returns zero (0) on success, or a negative error</div><div class='add'>+ * code on failure. -EIO is returned if the request was NAKed by the sink or</div><div class='add'>+ * if the retry count was exceeded. If not all bytes were transferred, this</div><div class='add'>+ * function returns -EPROTO. Errors from the underlying AUX channel transfer</div><div class='add'>+ * function, with the exception of -EBUSY (which causes the transaction to</div><div class='add'>+ * be retried), are propagated to the caller.</div><div class='add'>+ */</div><div class='add'>+static inline int drm_dp_dpcd_write_data(struct drm_dp_aux *aux,</div><div class='add'>+					 unsigned int offset,</div><div class='add'>+					 void *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = drm_dp_dpcd_write(aux, offset, buffer, size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (ret &lt; size)</div><div class='add'>+		return -EPROTO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * drm_dp_dpcd_readb() - read a single byte from the DPCD</div><div class='ctx'>  * @aux: DisplayPort AUX channel</div><div class='ctx'>  * @offset: address of the register to read</div><div class='ctx'>  * @valuep: location where the value of the register will be stored</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the number of bytes transferred (1) on success, or a negative</div><div class='del'>- * error code on failure.</div><div class='add'>+ * error code on failure. In most of the cases you should be using</div><div class='add'>+ * drm_dp_dpcd_read_byte() instead.</div><div class='ctx'>  */</div><div class='ctx'> static inline ssize_t drm_dp_dpcd_readb(struct drm_dp_aux *aux,</div><div class='ctx'> 					unsigned int offset, u8 *valuep)</div><div class='hunk'>@@ -493,7 +632,8 @@ static inline ssize_t drm_dp_dpcd_readb(struct drm_dp_aux *aux,</div><div class='ctx'>  * @value: value to write to the register</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the number of bytes transferred (1) on success, or a negative</div><div class='del'>- * error code on failure.</div><div class='add'>+ * error code on failure. In most of the cases you should be using</div><div class='add'>+ * drm_dp_dpcd_write_byte() instead.</div><div class='ctx'>  */</div><div class='ctx'> static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,</div><div class='ctx'> 					 unsigned int offset, u8 value)</div><div class='hunk'>@@ -501,6 +641,34 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,</div><div class='ctx'> 	return drm_dp_dpcd_write(aux, offset, &amp;value, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * drm_dp_dpcd_read_byte() - read a single byte from the DPCD</div><div class='add'>+ * @aux: DisplayPort AUX channel</div><div class='add'>+ * @offset: address of the register to read</div><div class='add'>+ * @valuep: location where the value of the register will be stored</div><div class='add'>+ *</div><div class='add'>+ * Returns zero (0) on success, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static inline int drm_dp_dpcd_read_byte(struct drm_dp_aux *aux,</div><div class='add'>+					unsigned int offset, u8 *valuep)</div><div class='add'>+{</div><div class='add'>+	return drm_dp_dpcd_read_data(aux, offset, valuep, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_dp_dpcd_write_byte() - write a single byte to the DPCD</div><div class='add'>+ * @aux: DisplayPort AUX channel</div><div class='add'>+ * @offset: address of the register to write</div><div class='add'>+ * @value: value to write to the register</div><div class='add'>+ *</div><div class='add'>+ * Returns zero (0) on success, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static inline int drm_dp_dpcd_write_byte(struct drm_dp_aux *aux,</div><div class='add'>+					 unsigned int offset, u8 value)</div><div class='add'>+{</div><div class='add'>+	return drm_dp_dpcd_write_data(aux, offset, &amp;value, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int drm_dp_read_dpcd_caps(struct drm_dp_aux *aux,</div><div class='ctx'> 			  u8 dpcd[DP_RECEIVER_CAP_SIZE]);</div><div class='ctx'> </div><div class='hunk'>@@ -510,6 +678,13 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux,</div><div class='ctx'> int drm_dp_dpcd_read_phy_link_status(struct drm_dp_aux *aux,</div><div class='ctx'> 				     enum drm_dp_phy dp_phy,</div><div class='ctx'> 				     u8 link_status[DP_LINK_STATUS_SIZE]);</div><div class='add'>+int drm_dp_link_power_up(struct drm_dp_aux *aux, unsigned char revision);</div><div class='add'>+int drm_dp_link_power_down(struct drm_dp_aux *aux, unsigned char revision);</div><div class='add'>+</div><div class='add'>+int drm_dp_dpcd_write_payload(struct drm_dp_aux *aux,</div><div class='add'>+			      int vcpid, u8 start_time_slot, u8 time_slot_count);</div><div class='add'>+int drm_dp_dpcd_clear_payload(struct drm_dp_aux *aux);</div><div class='add'>+int drm_dp_dpcd_poll_act_handled(struct drm_dp_aux *aux, int timeout_ms);</div><div class='ctx'> </div><div class='ctx'> bool drm_dp_send_real_edid_checksum(struct drm_dp_aux *aux,</div><div class='ctx'> 				    u8 real_edid_checksum);</div><div class='hunk'>@@ -569,9 +744,12 @@ int drm_dp_read_lttpr_phy_caps(struct drm_dp_aux *aux,</div><div class='ctx'> 			       u8 caps[DP_LTTPR_PHY_CAP_SIZE]);</div><div class='ctx'> int drm_dp_lttpr_count(const u8 cap[DP_LTTPR_COMMON_CAP_SIZE]);</div><div class='ctx'> int drm_dp_lttpr_max_link_rate(const u8 caps[DP_LTTPR_COMMON_CAP_SIZE]);</div><div class='add'>+int drm_dp_lttpr_set_transparent_mode(struct drm_dp_aux *aux, bool enable);</div><div class='add'>+int drm_dp_lttpr_init(struct drm_dp_aux *aux, int lttpr_count);</div><div class='ctx'> int drm_dp_lttpr_max_lane_count(const u8 caps[DP_LTTPR_COMMON_CAP_SIZE]);</div><div class='ctx'> bool drm_dp_lttpr_voltage_swing_level_3_supported(const u8 caps[DP_LTTPR_PHY_CAP_SIZE]);</div><div class='ctx'> bool drm_dp_lttpr_pre_emphasis_level_3_supported(const u8 caps[DP_LTTPR_PHY_CAP_SIZE]);</div><div class='add'>+void drm_dp_lttpr_wake_timeout_setup(struct drm_dp_aux *aux, bool transparent_mode);</div><div class='ctx'> </div><div class='ctx'> void drm_dp_remote_aux_init(struct drm_dp_aux *aux);</div><div class='ctx'> void drm_dp_aux_init(struct drm_dp_aux *aux);</div><div class='hunk'>@@ -602,6 +780,8 @@ struct drm_dp_desc {</div><div class='ctx'> int drm_dp_read_desc(struct drm_dp_aux *aux, struct drm_dp_desc *desc,</div><div class='ctx'> 		     bool is_branch);</div><div class='ctx'> </div><div class='add'>+int drm_dp_dump_lttpr_desc(struct drm_dp_aux *aux, enum drm_dp_phy dp_phy);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * enum drm_dp_quirk - Display Port sink/branch device specific quirks</div><div class='ctx'>  *</div><div class='hunk'>@@ -653,6 +833,15 @@ enum drm_dp_quirk {</div><div class='ctx'> 	 * requires enabling DSC.</div><div class='ctx'> 	 */</div><div class='ctx'> 	DP_DPCD_QUIRK_HBLANK_EXPANSION_REQUIRES_DSC,</div><div class='add'>+	/**</div><div class='add'>+	 * @DP_DPCD_QUIRK_DSC_THROUGHPUT_BPP_LIMIT:</div><div class='add'>+	 *</div><div class='add'>+	 * The device doesn't support DSC decompression at the maximum DSC</div><div class='add'>+	 * pixel throughput and compressed bpp it indicates via its DPCD DSC</div><div class='add'>+	 * capabilities. The compressed bpp must be limited above a device</div><div class='add'>+	 * specific DSC pixel throughput.</div><div class='add'>+	 */</div><div class='add'>+	DP_DPCD_QUIRK_DSC_THROUGHPUT_BPP_LIMIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -676,6 +865,7 @@ drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)</div><div class='ctx'>  * @lsb_reg_used: Do we also write values to the DP_EDP_BACKLIGHT_BRIGHTNESS_LSB register?</div><div class='ctx'>  * @aux_enable: Does the panel support the AUX enable cap?</div><div class='ctx'>  * @aux_set: Does the panel support setting the brightness through AUX?</div><div class='add'>+ * @luminance_set: Does the panel support setting the brightness through AUX using luminance values?</div><div class='ctx'>  *</div><div class='ctx'>  * This structure contains various data about an eDP backlight, which can be populated by using</div><div class='ctx'>  * drm_edp_backlight_init().</div><div class='hunk'>@@ -683,21 +873,23 @@ drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)</div><div class='ctx'> struct drm_edp_backlight_info {</div><div class='ctx'> 	u8 pwmgen_bit_count;</div><div class='ctx'> 	u8 pwm_freq_pre_divider;</div><div class='del'>-	u16 max;</div><div class='add'>+	u32 max;</div><div class='ctx'> </div><div class='ctx'> 	bool lsb_reg_used : 1;</div><div class='ctx'> 	bool aux_enable : 1;</div><div class='ctx'> 	bool aux_set : 1;</div><div class='add'>+	bool luminance_set : 1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> drm_edp_backlight_init(struct drm_dp_aux *aux, struct drm_edp_backlight_info *bl,</div><div class='add'>+		       u32 max_luminance,</div><div class='ctx'> 		       u16 driver_pwm_freq_hz, const u8 edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE],</div><div class='del'>-		       u16 *current_level, u8 *current_mode);</div><div class='add'>+		       u32 *current_level, u8 *current_mode, bool need_luminance);</div><div class='ctx'> int drm_edp_backlight_set_level(struct drm_dp_aux *aux, const struct drm_edp_backlight_info *bl,</div><div class='del'>-				u16 level);</div><div class='add'>+				u32 level);</div><div class='ctx'> int drm_edp_backlight_enable(struct drm_dp_aux *aux, const struct drm_edp_backlight_info *bl,</div><div class='del'>-			     u16 level);</div><div class='add'>+			     u32 level);</div><div class='ctx'> int drm_edp_backlight_disable(struct drm_dp_aux *aux, const struct drm_edp_backlight_info *bl);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_DRM_KMS_HELPER) &amp;&amp; (IS_BUILTIN(CONFIG_BACKLIGHT_CLASS_DEVICE) || \</div><div class='hunk'>@@ -715,7 +907,7 @@ static inline int drm_panel_dp_aux_backlight(struct drm_panel *panel,</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DRM_DP_CEC</div><div class='add'>+#ifdef CONFIG_DRM_DISPLAY_DP_AUX_CEC</div><div class='ctx'> void drm_dp_cec_irq(struct drm_dp_aux *aux);</div><div class='ctx'> void drm_dp_cec_register_connector(struct drm_dp_aux *aux,</div><div class='ctx'> 				   struct drm_connector *connector);</div><div class='hunk'>@@ -812,5 +1004,10 @@ int drm_dp_bw_overhead(int lane_count, int hactive,</div><div class='ctx'> 		       int dsc_slice_count,</div><div class='ctx'> 		       int bpp_x16, unsigned long flags);</div><div class='ctx'> int drm_dp_bw_channel_coding_efficiency(bool is_uhbr);</div><div class='add'>+int drm_dp_max_dprx_data_rate(int max_link_rate, int max_lanes);</div><div class='add'>+</div><div class='add'>+ssize_t drm_dp_vsc_sdp_pack(const struct drm_dp_vsc_sdp *vsc, struct dp_sdp *sdp);</div><div class='add'>+int drm_dp_link_symbol_cycles(int lane_count, int pixels, int dsc_slice_count,</div><div class='add'>+			      int bpp_x16, int symbol_size, bool is_mst);</div><div class='ctx'> </div><div class='ctx'> #endif /* _DRM_DP_HELPER_H_ */</div><div class='head'>diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h<br/>index 9b19d8bd520a..2cfe1d4bfc96 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp_mst_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dp_mst_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp_mst_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_dp_mst_helper.h</a></div><div class='hunk'>@@ -83,7 +83,6 @@ struct drm_dp_mst_branch;</div><div class='ctx'>  * @passthrough_aux: parent aux to which DSC pass-through requests should be</div><div class='ctx'>  * sent, only set if DSC pass-through is possible.</div><div class='ctx'>  * @parent: branch device parent of this port</div><div class='del'>- * @vcpi: Virtual Channel Payload info for this port.</div><div class='ctx'>  * @connector: DRM connector this port is connected to. Protected by</div><div class='ctx'>  * &amp;drm_dp_mst_topology_mgr.base.lock.</div><div class='ctx'>  * @mgr: topology manager this port lives under.</div><div class='hunk'>@@ -223,6 +222,13 @@ struct drm_dp_mst_branch {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head destroy_next;</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @rad: Relative Address of the MST branch.</div><div class='add'>+	 * For &amp;drm_dp_mst_topology_mgr.mst_primary, it's rad[8] are all 0,</div><div class='add'>+	 * unset and unused. For MST branches connected after mst_primary,</div><div class='add'>+	 * in each element of rad[] the nibbles are ordered by the most</div><div class='add'>+	 * signifcant 4 bits first and the least significant 4 bits second.</div><div class='add'>+	 */</div><div class='ctx'> 	u8 rad[8];</div><div class='ctx'> 	u8 lct;</div><div class='ctx'> 	int num_ports;</div><div class='hunk'>@@ -245,18 +251,18 @@ struct drm_dp_mst_branch {</div><div class='ctx'> 	bool link_address_sent;</div><div class='ctx'> </div><div class='ctx'> 	/* global unique identifier to identify branch devices */</div><div class='del'>-	u8 guid[16];</div><div class='add'>+	guid_t guid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct drm_dp_nak_reply {</div><div class='del'>-	u8 guid[16];</div><div class='add'>+	guid_t guid;</div><div class='ctx'> 	u8 reason;</div><div class='ctx'> 	u8 nak_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct drm_dp_link_address_ack_reply {</div><div class='del'>-	u8 guid[16];</div><div class='add'>+	guid_t guid;</div><div class='ctx'> 	u8 nports;</div><div class='ctx'> 	struct drm_dp_link_addr_reply_port {</div><div class='ctx'> 		bool input_port;</div><div class='hunk'>@@ -266,7 +272,7 @@ struct drm_dp_link_address_ack_reply {</div><div class='ctx'> 		bool ddps;</div><div class='ctx'> 		bool legacy_device_plug_status;</div><div class='ctx'> 		u8 dpcd_revision;</div><div class='del'>-		u8 peer_guid[16];</div><div class='add'>+		guid_t peer_guid;</div><div class='ctx'> 		u8 num_sdp_streams;</div><div class='ctx'> 		u8 num_sdp_stream_sinks;</div><div class='ctx'> 	} ports[16];</div><div class='hunk'>@@ -349,7 +355,7 @@ struct drm_dp_allocate_payload_ack_reply {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct drm_dp_connection_status_notify {</div><div class='del'>-	u8 guid[16];</div><div class='add'>+	guid_t guid;</div><div class='ctx'> 	u8 port_number;</div><div class='ctx'> 	bool legacy_device_plug_status;</div><div class='ctx'> 	bool displayport_device_plug_status;</div><div class='hunk'>@@ -426,7 +432,7 @@ struct drm_dp_query_payload {</div><div class='ctx'> </div><div class='ctx'> struct drm_dp_resource_status_notify {</div><div class='ctx'> 	u8 port_number;</div><div class='del'>-	u8 guid[16];</div><div class='add'>+	guid_t guid;</div><div class='ctx'> 	u16 available_pbn;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -701,6 +707,13 @@ struct drm_dp_mst_topology_mgr {</div><div class='ctx'> 	bool payload_id_table_cleared : 1;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @reset_rx_state: The down request's reply and up request message</div><div class='add'>+	 * receiver state must be reset, after the topology manager got</div><div class='add'>+	 * removed. Protected by @lock.</div><div class='add'>+	 */</div><div class='add'>+	bool reset_rx_state : 1;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @payload_count: The number of currently active payloads in hardware. This value is only</div><div class='ctx'> 	 * intended to be used internally by MST helpers for payload tracking, and is only safe to</div><div class='ctx'> 	 * read/write from the atomic commit (not check) context.</div><div class='hunk'>@@ -818,7 +831,28 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,</div><div class='ctx'> </div><div class='ctx'> void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr);</div><div class='ctx'> </div><div class='del'>-bool drm_dp_read_mst_cap(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]);</div><div class='add'>+/**</div><div class='add'>+ * enum drm_dp_mst_mode - sink's MST mode capability</div><div class='add'>+ */</div><div class='add'>+enum drm_dp_mst_mode {</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_DP_SST: The sink does not support MST nor single stream sideband</div><div class='add'>+	 * messaging.</div><div class='add'>+	 */</div><div class='add'>+	DRM_DP_SST,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_DP_MST: Sink supports MST, more than one stream and single</div><div class='add'>+	 * stream sideband messaging.</div><div class='add'>+	 */</div><div class='add'>+	DRM_DP_MST,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_DP_SST_SIDEBAND_MSG: Sink supports only one stream and single</div><div class='add'>+	 * stream sideband messaging.</div><div class='add'>+	 */</div><div class='add'>+	DRM_DP_SST_SIDEBAND_MSG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum drm_dp_mst_mode drm_dp_read_mst_cap(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]);</div><div class='ctx'> int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool mst_state);</div><div class='ctx'> </div><div class='ctx'> int drm_dp_mst_hpd_irq_handle_event(struct drm_dp_mst_topology_mgr *mgr,</div><div class='hunk'>@@ -840,8 +874,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector,</div><div class='ctx'> 				 struct drm_dp_mst_topology_mgr *mgr,</div><div class='ctx'> 				 struct drm_dp_mst_port *port);</div><div class='ctx'> </div><div class='del'>-fixed20_12 drm_dp_get_vc_payload_bw(const struct drm_dp_mst_topology_mgr *mgr,</div><div class='del'>-				    int link_rate, int link_lane_count);</div><div class='add'>+fixed20_12 drm_dp_get_vc_payload_bw(int link_rate, int link_lane_count);</div><div class='ctx'> </div><div class='ctx'> int drm_dp_calc_pbn_mode(int clock, int bpp);</div><div class='ctx'> </div><div class='hunk'>@@ -851,7 +884,6 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,</div><div class='ctx'> 			     struct drm_dp_mst_topology_state *mst_state,</div><div class='ctx'> 			     struct drm_dp_mst_atomic_payload *payload);</div><div class='ctx'> int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,</div><div class='del'>-			     struct drm_atomic_state *state,</div><div class='ctx'> 			     struct drm_dp_mst_atomic_payload *payload);</div><div class='ctx'> void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr,</div><div class='ctx'> 				 struct drm_dp_mst_topology_state *mst_state,</div><div class='hunk'>@@ -866,6 +898,8 @@ int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);</div><div class='ctx'> void drm_dp_mst_dump_topology(struct seq_file *m,</div><div class='ctx'> 			      struct drm_dp_mst_topology_mgr *mgr);</div><div class='ctx'> </div><div class='add'>+void drm_dp_mst_topology_queue_probe(struct drm_dp_mst_topology_mgr *mgr);</div><div class='add'>+</div><div class='ctx'> void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr);</div><div class='ctx'> int __must_check</div><div class='ctx'> drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr,</div><div class='hunk'>@@ -928,6 +962,13 @@ int __must_check drm_dp_mst_root_conn_atomic_check(struct drm_connector_state *n</div><div class='ctx'> void drm_dp_mst_get_port_malloc(struct drm_dp_mst_port *port);</div><div class='ctx'> void drm_dp_mst_put_port_malloc(struct drm_dp_mst_port *port);</div><div class='ctx'> </div><div class='add'>+static inline</div><div class='add'>+bool drm_dp_mst_port_is_logical(struct drm_dp_mst_port *port)</div><div class='add'>+{</div><div class='add'>+	return port-&gt;port_num &gt;= DP_MST_LOGICAL_PORT_0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct drm_dp_aux *drm_dp_mst_aux_for_parent(struct drm_dp_mst_port *port);</div><div class='ctx'> struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port);</div><div class='ctx'> </div><div class='ctx'> static inline struct drm_dp_mst_topology_state *</div><div class='head'>diff --git a/include/drm/display/drm_dp_tunnel.h b/include/drm/display/drm_dp_tunnel.h<br/>new file mode 100644<br/>index 000000000000..87212c847915<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dp_tunnel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_dp_tunnel.h</a></div><div class='hunk'>@@ -0,0 +1,248 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2023 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DRM_DP_TUNNEL_H__</div><div class='add'>+#define __DRM_DP_TUNNEL_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_dp_aux;</div><div class='add'>+</div><div class='add'>+struct drm_device;</div><div class='add'>+</div><div class='add'>+struct drm_atomic_state;</div><div class='add'>+struct drm_dp_tunnel_mgr;</div><div class='add'>+struct drm_dp_tunnel_state;</div><div class='add'>+</div><div class='add'>+struct ref_tracker;</div><div class='add'>+</div><div class='add'>+struct drm_dp_tunnel_ref {</div><div class='add'>+	struct drm_dp_tunnel *tunnel;</div><div class='add'>+	struct ref_tracker *tracker;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL</div><div class='add'>+</div><div class='add'>+struct drm_dp_tunnel *</div><div class='add'>+drm_dp_tunnel_get(struct drm_dp_tunnel *tunnel, struct ref_tracker **tracker);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+drm_dp_tunnel_put(struct drm_dp_tunnel *tunnel, struct ref_tracker **tracker);</div><div class='add'>+</div><div class='add'>+static inline void drm_dp_tunnel_ref_get(struct drm_dp_tunnel *tunnel,</div><div class='add'>+					 struct drm_dp_tunnel_ref *tunnel_ref)</div><div class='add'>+{</div><div class='add'>+	tunnel_ref-&gt;tunnel = drm_dp_tunnel_get(tunnel, &amp;tunnel_ref-&gt;tracker);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void drm_dp_tunnel_ref_put(struct drm_dp_tunnel_ref *tunnel_ref)</div><div class='add'>+{</div><div class='add'>+	drm_dp_tunnel_put(tunnel_ref-&gt;tunnel, &amp;tunnel_ref-&gt;tracker);</div><div class='add'>+	tunnel_ref-&gt;tunnel = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct drm_dp_tunnel *</div><div class='add'>+drm_dp_tunnel_detect(struct drm_dp_tunnel_mgr *mgr,</div><div class='add'>+		     struct drm_dp_aux *aux);</div><div class='add'>+int drm_dp_tunnel_destroy(struct drm_dp_tunnel *tunnel);</div><div class='add'>+</div><div class='add'>+int drm_dp_tunnel_enable_bw_alloc(struct drm_dp_tunnel *tunnel);</div><div class='add'>+int drm_dp_tunnel_disable_bw_alloc(struct drm_dp_tunnel *tunnel);</div><div class='add'>+bool drm_dp_tunnel_bw_alloc_is_enabled(const struct drm_dp_tunnel *tunnel);</div><div class='add'>+int drm_dp_tunnel_alloc_bw(struct drm_dp_tunnel *tunnel, int bw);</div><div class='add'>+int drm_dp_tunnel_get_allocated_bw(struct drm_dp_tunnel *tunnel);</div><div class='add'>+int drm_dp_tunnel_update_state(struct drm_dp_tunnel *tunnel);</div><div class='add'>+</div><div class='add'>+void drm_dp_tunnel_set_io_error(struct drm_dp_tunnel *tunnel);</div><div class='add'>+</div><div class='add'>+int drm_dp_tunnel_handle_irq(struct drm_dp_tunnel_mgr *mgr,</div><div class='add'>+			     struct drm_dp_aux *aux);</div><div class='add'>+</div><div class='add'>+int drm_dp_tunnel_max_dprx_rate(const struct drm_dp_tunnel *tunnel);</div><div class='add'>+int drm_dp_tunnel_max_dprx_lane_count(const struct drm_dp_tunnel *tunnel);</div><div class='add'>+int drm_dp_tunnel_available_bw(const struct drm_dp_tunnel *tunnel);</div><div class='add'>+</div><div class='add'>+const char *drm_dp_tunnel_name(const struct drm_dp_tunnel *tunnel);</div><div class='add'>+</div><div class='add'>+struct drm_dp_tunnel_state *</div><div class='add'>+drm_dp_tunnel_atomic_get_state(struct drm_atomic_state *state,</div><div class='add'>+			       struct drm_dp_tunnel *tunnel);</div><div class='add'>+</div><div class='add'>+struct drm_dp_tunnel_state *</div><div class='add'>+drm_dp_tunnel_atomic_get_old_state(struct drm_atomic_state *state,</div><div class='add'>+				   const struct drm_dp_tunnel *tunnel);</div><div class='add'>+</div><div class='add'>+struct drm_dp_tunnel_state *</div><div class='add'>+drm_dp_tunnel_atomic_get_new_state(struct drm_atomic_state *state,</div><div class='add'>+				   const struct drm_dp_tunnel *tunnel);</div><div class='add'>+</div><div class='add'>+int drm_dp_tunnel_atomic_set_stream_bw(struct drm_atomic_state *state,</div><div class='add'>+				       struct drm_dp_tunnel *tunnel,</div><div class='add'>+				       u8 stream_id, int bw);</div><div class='add'>+int drm_dp_tunnel_atomic_get_group_streams_in_state(struct drm_atomic_state *state,</div><div class='add'>+						    const struct drm_dp_tunnel *tunnel,</div><div class='add'>+						    u32 *stream_mask);</div><div class='add'>+</div><div class='add'>+int drm_dp_tunnel_atomic_check_stream_bws(struct drm_atomic_state *state,</div><div class='add'>+					  u32 *failed_stream_mask);</div><div class='add'>+</div><div class='add'>+int drm_dp_tunnel_atomic_get_required_bw(const struct drm_dp_tunnel_state *tunnel_state);</div><div class='add'>+</div><div class='add'>+struct drm_dp_tunnel_mgr *</div><div class='add'>+drm_dp_tunnel_mgr_create(struct drm_device *dev, int max_group_count);</div><div class='add'>+void drm_dp_tunnel_mgr_destroy(struct drm_dp_tunnel_mgr *mgr);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline struct drm_dp_tunnel *</div><div class='add'>+drm_dp_tunnel_get(struct drm_dp_tunnel *tunnel, struct ref_tracker **tracker)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+drm_dp_tunnel_put(struct drm_dp_tunnel *tunnel, struct ref_tracker **tracker) {}</div><div class='add'>+</div><div class='add'>+static inline void drm_dp_tunnel_ref_get(struct drm_dp_tunnel *tunnel,</div><div class='add'>+					 struct drm_dp_tunnel_ref *tunnel_ref) {}</div><div class='add'>+</div><div class='add'>+static inline void drm_dp_tunnel_ref_put(struct drm_dp_tunnel_ref *tunnel_ref) {}</div><div class='add'>+</div><div class='add'>+static inline struct drm_dp_tunnel *</div><div class='add'>+drm_dp_tunnel_detect(struct drm_dp_tunnel_mgr *mgr,</div><div class='add'>+		     struct drm_dp_aux *aux)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_destroy(struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int drm_dp_tunnel_enable_bw_alloc(struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int drm_dp_tunnel_disable_bw_alloc(struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool drm_dp_tunnel_bw_alloc_is_enabled(const struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_alloc_bw(struct drm_dp_tunnel *tunnel, int bw)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_get_allocated_bw(struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_update_state(struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void drm_dp_tunnel_set_io_error(struct drm_dp_tunnel *tunnel) {}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_handle_irq(struct drm_dp_tunnel_mgr *mgr,</div><div class='add'>+			 struct drm_dp_aux *aux)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_max_dprx_rate(const struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_max_dprx_lane_count(const struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_available_bw(const struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *</div><div class='add'>+drm_dp_tunnel_name(const struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct drm_dp_tunnel_state *</div><div class='add'>+drm_dp_tunnel_atomic_get_state(struct drm_atomic_state *state,</div><div class='add'>+			       struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct drm_dp_tunnel_state *</div><div class='add'>+drm_dp_tunnel_atomic_get_new_state(struct drm_atomic_state *state,</div><div class='add'>+				   const struct drm_dp_tunnel *tunnel)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_atomic_set_stream_bw(struct drm_atomic_state *state,</div><div class='add'>+				   struct drm_dp_tunnel *tunnel,</div><div class='add'>+				   u8 stream_id, int bw)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_atomic_get_group_streams_in_state(struct drm_atomic_state *state,</div><div class='add'>+						const struct drm_dp_tunnel *tunnel,</div><div class='add'>+						u32 *stream_mask)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_atomic_check_stream_bws(struct drm_atomic_state *state,</div><div class='add'>+				      u32 *failed_stream_mask)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+drm_dp_tunnel_atomic_get_required_bw(const struct drm_dp_tunnel_state *tunnel_state)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct drm_dp_tunnel_mgr *</div><div class='add'>+drm_dp_tunnel_mgr_create(struct drm_device *dev, int max_group_count)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void drm_dp_tunnel_mgr_destroy(struct drm_dp_tunnel_mgr *mgr) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DRM_DISPLAY_DP_TUNNEL */</div><div class='add'>+</div><div class='add'>+#endif /* __DRM_DP_TUNNEL_H__ */</div><div class='head'>diff --git a/include/drm/display/drm_dsc.h b/include/drm/display/drm_dsc.h<br/>index bc90273d06a6..bbbe7438473d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dsc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dsc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dsc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_dsc.h</a></div><div class='hunk'>@@ -40,9 +40,6 @@</div><div class='ctx'> #define DSC_PPS_RC_RANGE_MINQP_SHIFT		11</div><div class='ctx'> #define DSC_PPS_RC_RANGE_MAXQP_SHIFT		6</div><div class='ctx'> #define DSC_PPS_NATIVE_420_SHIFT		1</div><div class='del'>-#define DSC_1_2_MAX_LINEBUF_DEPTH_BITS		16</div><div class='del'>-#define DSC_1_2_MAX_LINEBUF_DEPTH_VAL		0</div><div class='del'>-#define DSC_1_1_MAX_LINEBUF_DEPTH_BITS		13</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_dsc_rc_range_parameters - DSC Rate Control range parameters</div><div class='head'>diff --git a/include/drm/display/drm_dsc_helper.h b/include/drm/display/drm_dsc_helper.h<br/>index 913aa2071232..2c2b9033f60f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dsc_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_dsc_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_dsc_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_dsc_helper.h</a></div><div class='hunk'>@@ -17,6 +17,8 @@ enum drm_dsc_params_type {</div><div class='ctx'> 	DRM_DSC_1_2_420,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct drm_printer;</div><div class='add'>+</div><div class='ctx'> void drm_dsc_dp_pps_header_init(struct dp_sdp_header *pps_header);</div><div class='ctx'> int drm_dsc_dp_rc_buffer_size(u8 rc_buffer_block_size, u8 rc_buffer_size);</div><div class='ctx'> void drm_dsc_pps_payload_pack(struct drm_dsc_picture_parameter_set *pps_sdp,</div><div class='hunk'>@@ -28,6 +30,7 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg);</div><div class='ctx'> u8 drm_dsc_initial_scale_value(const struct drm_dsc_config *dsc);</div><div class='ctx'> u32 drm_dsc_flatness_det_thresh(const struct drm_dsc_config *dsc);</div><div class='ctx'> u32 drm_dsc_get_bpp_int(const struct drm_dsc_config *vdsc_cfg);</div><div class='add'>+void drm_dsc_dump_config(struct drm_printer *p, int indent, const struct drm_dsc_config *cfg);</div><div class='ctx'> </div><div class='ctx'> #endif /* _DRM_DSC_HELPER_H_ */</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/display/drm_hdmi_audio_helper.h b/include/drm/display/drm_hdmi_audio_helper.h<br/>new file mode 100644<br/>index 000000000000..44d910bdc72d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_hdmi_audio_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_hdmi_audio_helper.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+</div><div class='add'>+#ifndef DRM_DISPLAY_HDMI_AUDIO_HELPER_H_</div><div class='add'>+#define DRM_DISPLAY_HDMI_AUDIO_HELPER_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_connector;</div><div class='add'>+struct drm_connector_hdmi_audio_funcs;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+int drm_connector_hdmi_audio_init(struct drm_connector *connector,</div><div class='add'>+				  struct device *hdmi_codec_dev,</div><div class='add'>+				  const struct drm_connector_hdmi_audio_funcs *funcs,</div><div class='add'>+				  unsigned int max_i2s_playback_channels,</div><div class='add'>+				  u64 i2s_formats,</div><div class='add'>+				  bool spdif_playback,</div><div class='add'>+				  int sound_dai_port);</div><div class='add'>+void drm_connector_hdmi_audio_plugged_notify(struct drm_connector *connector,</div><div class='add'>+					     bool plugged);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/display/drm_hdmi_cec_helper.h b/include/drm/display/drm_hdmi_cec_helper.h<br/>new file mode 100644<br/>index 000000000000..fd8f4d2f02c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_hdmi_cec_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_hdmi_cec_helper.h</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+</div><div class='add'>+#ifndef DRM_DISPLAY_HDMI_CEC_HELPER</div><div class='add'>+#define DRM_DISPLAY_HDMI_CEC_HELPER</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_connector;</div><div class='add'>+</div><div class='add'>+struct cec_msg;</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+struct drm_connector_hdmi_cec_funcs {</div><div class='add'>+	/**</div><div class='add'>+	 * @init: perform hardware-specific initialization before registering the CEC adapter</div><div class='add'>+	 */</div><div class='add'>+	int (*init)(struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @uninit: perform hardware-specific teardown for the CEC adapter</div><div class='add'>+	 */</div><div class='add'>+	void (*uninit)(struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @enable: enable or disable CEC adapter</div><div class='add'>+	 */</div><div class='add'>+	int (*enable)(struct drm_connector *connector, bool enable);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @log_addr: set adapter's logical address, can be called multiple</div><div class='add'>+	 * times if adapter supports several LAs</div><div class='add'>+	 */</div><div class='add'>+	int (*log_addr)(struct drm_connector *connector, u8 logical_addr);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @transmit: start transmission of the specified CEC message</div><div class='add'>+	 */</div><div class='add'>+	int (*transmit)(struct drm_connector *connector, u8 attempts,</div><div class='add'>+			u32 signal_free_time, struct cec_msg *msg);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int drmm_connector_hdmi_cec_register(struct drm_connector *connector,</div><div class='add'>+				     const struct drm_connector_hdmi_cec_funcs *funcs,</div><div class='add'>+				     const char *name,</div><div class='add'>+				     u8 available_las,</div><div class='add'>+				     struct device *dev);</div><div class='add'>+</div><div class='add'>+void drm_connector_hdmi_cec_received_msg(struct drm_connector *connector,</div><div class='add'>+					 struct cec_msg *msg);</div><div class='add'>+</div><div class='add'>+void drm_connector_hdmi_cec_transmit_done(struct drm_connector *connector,</div><div class='add'>+					  u8 status,</div><div class='add'>+					  u8 arb_lost_cnt, u8 nack_cnt,</div><div class='add'>+					  u8 low_drive_cnt, u8 error_cnt);</div><div class='add'>+</div><div class='add'>+void drm_connector_hdmi_cec_transmit_attempt_done(struct drm_connector *connector,</div><div class='add'>+						  u8 status);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_DRM_DISPLAY_HDMI_CEC_NOTIFIER_HELPER)</div><div class='add'>+int drmm_connector_hdmi_cec_notifier_register(struct drm_connector *connector,</div><div class='add'>+					      const char *port_name,</div><div class='add'>+					      struct device *dev);</div><div class='add'>+#else</div><div class='add'>+static inline int drmm_connector_hdmi_cec_notifier_register(struct drm_connector *connector,</div><div class='add'>+							    const char *port_name,</div><div class='add'>+							    struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/display/drm_hdmi_helper.h b/include/drm/display/drm_hdmi_helper.h<br/>index 76d234826e22..09145c9ee9fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_hdmi_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/display/drm_hdmi_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_hdmi_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_hdmi_helper.h</a></div><div class='hunk'>@@ -24,4 +24,14 @@ drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,</div><div class='ctx'> void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,</div><div class='ctx'> 					 const struct drm_connector_state *conn_state);</div><div class='ctx'> </div><div class='add'>+unsigned long long</div><div class='add'>+drm_hdmi_compute_mode_clock(const struct drm_display_mode *mode,</div><div class='add'>+			    unsigned int bpc, enum hdmi_colorspace fmt);</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+drm_hdmi_acr_get_n_cts(unsigned long long tmds_char_rate,</div><div class='add'>+		       unsigned int sample_rate,</div><div class='add'>+		       unsigned int *out_n,</div><div class='add'>+		       unsigned int *out_cts);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/display/drm_hdmi_state_helper.h b/include/drm/display/drm_hdmi_state_helper.h<br/>new file mode 100644<br/>index 000000000000..2349c0d0f00f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/display/drm_hdmi_state_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/display/drm_hdmi_state_helper.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+</div><div class='add'>+#ifndef DRM_HDMI_STATE_HELPER_H_</div><div class='add'>+#define DRM_HDMI_STATE_HELPER_H_</div><div class='add'>+</div><div class='add'>+struct drm_atomic_state;</div><div class='add'>+struct drm_connector;</div><div class='add'>+struct drm_connector_state;</div><div class='add'>+struct drm_display_mode;</div><div class='add'>+struct hdmi_audio_infoframe;</div><div class='add'>+</div><div class='add'>+enum drm_connector_status;</div><div class='add'>+</div><div class='add'>+void __drm_atomic_helper_connector_hdmi_reset(struct drm_connector *connector,</div><div class='add'>+					      struct drm_connector_state *new_conn_state);</div><div class='add'>+</div><div class='add'>+int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector,</div><div class='add'>+					   struct drm_atomic_state *state);</div><div class='add'>+</div><div class='add'>+int drm_atomic_helper_connector_hdmi_update_audio_infoframe(struct drm_connector *connector,</div><div class='add'>+							    struct hdmi_audio_infoframe *frame);</div><div class='add'>+int drm_atomic_helper_connector_hdmi_clear_audio_infoframe(struct drm_connector *connector);</div><div class='add'>+int drm_atomic_helper_connector_hdmi_update_infoframes(struct drm_connector *connector,</div><div class='add'>+						       struct drm_atomic_state *state);</div><div class='add'>+void drm_atomic_helper_connector_hdmi_hotplug(struct drm_connector *connector,</div><div class='add'>+					      enum drm_connector_status status);</div><div class='add'>+void drm_atomic_helper_connector_hdmi_force(struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+enum drm_mode_status</div><div class='add'>+drm_hdmi_connector_mode_valid(struct drm_connector *connector,</div><div class='add'>+			      const struct drm_display_mode *mode);</div><div class='add'>+</div><div class='add'>+#endif // DRM_HDMI_STATE_HELPER_H_</div><div class='head'>diff --git a/include/drm/drm_accel.h b/include/drm/drm_accel.h<br/>index f4d3784b1dce..20a665ec6f16 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_accel.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_accel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_accel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_accel.h</a></div><div class='hunk'>@@ -28,7 +28,8 @@</div><div class='ctx'> 	.poll		= drm_poll,\</div><div class='ctx'> 	.read		= drm_read,\</div><div class='ctx'> 	.llseek		= noop_llseek, \</div><div class='del'>-	.mmap		= drm_gem_mmap</div><div class='add'>+	.mmap		= drm_gem_mmap, \</div><div class='add'>+	.fop_flags	= FOP_UNSIGNED_OFFSET</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DEFINE_DRM_ACCEL_FOPS() - macro to generate file operations for accelerators drivers</div><div class='hunk'>@@ -51,14 +52,12 @@</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_DRM_ACCEL)</div><div class='ctx'> </div><div class='add'>+extern struct xarray accel_minors_xa;</div><div class='add'>+</div><div class='ctx'> void accel_core_exit(void);</div><div class='ctx'> int accel_core_init(void);</div><div class='del'>-void accel_minor_remove(int index);</div><div class='del'>-int accel_minor_alloc(void);</div><div class='del'>-void accel_minor_replace(struct drm_minor *minor, int index);</div><div class='ctx'> void accel_set_device_instance_params(struct device *kdev, int index);</div><div class='ctx'> int accel_open(struct inode *inode, struct file *filp);</div><div class='del'>-void accel_debugfs_init(struct drm_device *dev);</div><div class='ctx'> void accel_debugfs_register(struct drm_device *dev);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -73,27 +72,10 @@ static inline int __init accel_core_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void accel_minor_remove(int index)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int accel_minor_alloc(void)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void accel_minor_replace(struct drm_minor *minor, int index)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void accel_set_device_instance_params(struct device *kdev, int index)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void accel_debugfs_init(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void accel_debugfs_register(struct drm_device *dev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/include/drm/drm_aperture.h b/include/drm/drm_aperture.h<br/>deleted file mode 100644<br/>index cbe33b49fd5d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_aperture.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_aperture.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,38 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: MIT */</div><div class='del'>-</div><div class='del'>-#ifndef _DRM_APERTURE_H_</div><div class='del'>-#define _DRM_APERTURE_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct drm_device;</div><div class='del'>-struct drm_driver;</div><div class='del'>-struct pci_dev;</div><div class='del'>-</div><div class='del'>-int devm_aperture_acquire_from_firmware(struct drm_device *dev, resource_size_t base,</div><div class='del'>-					resource_size_t size);</div><div class='del'>-</div><div class='del'>-int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,</div><div class='del'>-						 const struct drm_driver *req_driver);</div><div class='del'>-</div><div class='del'>-int drm_aperture_remove_conflicting_pci_framebuffers(struct pci_dev *pdev,</div><div class='del'>-						     const struct drm_driver *req_driver);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * drm_aperture_remove_framebuffers - remove all existing framebuffers</div><div class='del'>- * @req_driver: requesting DRM driver</div><div class='del'>- *</div><div class='del'>- * This function removes all graphics device drivers. Use this function on systems</div><div class='del'>- * that can have their framebuffer located anywhere in memory.</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- * 0 on success, or a negative errno code otherwise</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-drm_aperture_remove_framebuffers(const struct drm_driver *req_driver)</div><div class='del'>-{</div><div class='del'>-	return drm_aperture_remove_conflicting_framebuffers(0, (resource_size_t)-1,</div><div class='del'>-							    req_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h<br/>index cf8e1220a4ac..43783891d359 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_atomic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_atomic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_atomic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_atomic.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;drm/drm_crtc.h&gt;</div><div class='ctx'> #include &lt;drm/drm_util.h&gt;</div><div class='add'>+#include &lt;drm/drm_colorop.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_crtc_commit - track modeset commits on a CRTC</div><div class='hunk'>@@ -157,14 +158,51 @@ struct drm_crtc_commit {</div><div class='ctx'> 	bool abort_completion;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct __drm_colorops_state {</div><div class='add'>+	struct drm_colorop *ptr;</div><div class='add'>+	struct drm_colorop_state *state, *old_state, *new_state;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct __drm_planes_state {</div><div class='ctx'> 	struct drm_plane *ptr;</div><div class='del'>-	struct drm_plane_state *state, *old_state, *new_state;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @state_to_destroy:</div><div class='add'>+	 *</div><div class='add'>+	 * Used to track the @drm_plane_state we will need to free when</div><div class='add'>+	 * tearing down the associated &amp;drm_atomic_state in</div><div class='add'>+	 * $drm_mode_config_funcs.atomic_state_clear or</div><div class='add'>+	 * drm_atomic_state_default_clear().</div><div class='add'>+	 *</div><div class='add'>+	 * Before a commit, and the call to</div><div class='add'>+	 * drm_atomic_helper_swap_state() in particular, it points to</div><div class='add'>+	 * the same state than @new_state. After a commit, it points to</div><div class='add'>+	 * the same state than @old_state.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_plane_state *state_to_destroy;</div><div class='add'>+</div><div class='add'>+	struct drm_plane_state *old_state, *new_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __drm_crtcs_state {</div><div class='ctx'> 	struct drm_crtc *ptr;</div><div class='del'>-	struct drm_crtc_state *state, *old_state, *new_state;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @state_to_destroy:</div><div class='add'>+	 *</div><div class='add'>+	 * Used to track the @drm_crtc_state we will need to free when</div><div class='add'>+	 * tearing down the associated &amp;drm_atomic_state in</div><div class='add'>+	 * $drm_mode_config_funcs.atomic_state_clear or</div><div class='add'>+	 * drm_atomic_state_default_clear().</div><div class='add'>+	 *</div><div class='add'>+	 * Before a commit, and the call to</div><div class='add'>+	 * drm_atomic_helper_swap_state() in particular, it points to</div><div class='add'>+	 * the same state than @new_state. After a commit, it points to</div><div class='add'>+	 * the same state than @old_state.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_crtc_state *state_to_destroy;</div><div class='add'>+</div><div class='add'>+	struct drm_crtc_state *old_state, *new_state;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @commit:</div><div class='hunk'>@@ -182,7 +220,24 @@ struct __drm_crtcs_state {</div><div class='ctx'> </div><div class='ctx'> struct __drm_connnectors_state {</div><div class='ctx'> 	struct drm_connector *ptr;</div><div class='del'>-	struct drm_connector_state *state, *old_state, *new_state;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @state_to_destroy:</div><div class='add'>+	 *</div><div class='add'>+	 * Used to track the @drm_connector_state we will need to free</div><div class='add'>+	 * when tearing down the associated &amp;drm_atomic_state in</div><div class='add'>+	 * $drm_mode_config_funcs.atomic_state_clear or</div><div class='add'>+	 * drm_atomic_state_default_clear().</div><div class='add'>+	 *</div><div class='add'>+	 * Before a commit, and the call to</div><div class='add'>+	 * drm_atomic_helper_swap_state() in particular, it points to</div><div class='add'>+	 * the same state than @new_state. After a commit, it points to</div><div class='add'>+	 * the same state than @old_state.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_connector_state *state_to_destroy;</div><div class='add'>+</div><div class='add'>+	struct drm_connector_state *old_state, *new_state;</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @out_fence_ptr:</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -342,29 +397,80 @@ struct drm_private_state {</div><div class='ctx'> </div><div class='ctx'> struct __drm_private_objs_state {</div><div class='ctx'> 	struct drm_private_obj *ptr;</div><div class='del'>-	struct drm_private_state *state, *old_state, *new_state;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @state_to_destroy:</div><div class='add'>+	 *</div><div class='add'>+	 * Used to track the @drm_private_state we will need to free</div><div class='add'>+	 * when tearing down the associated &amp;drm_atomic_state in</div><div class='add'>+	 * $drm_mode_config_funcs.atomic_state_clear or</div><div class='add'>+	 * drm_atomic_state_default_clear().</div><div class='add'>+	 *</div><div class='add'>+	 * Before a commit, and the call to</div><div class='add'>+	 * drm_atomic_helper_swap_state() in particular, it points to</div><div class='add'>+	 * the same state than @new_state. After a commit, it points to</div><div class='add'>+	 * the same state than @old_state.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_private_state *state_to_destroy;</div><div class='add'>+</div><div class='add'>+	struct drm_private_state *old_state, *new_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct drm_atomic_state - the global state object for atomic updates</div><div class='del'>- * @ref: count of all references to this state (will not be freed until zero)</div><div class='del'>- * @dev: parent DRM device</div><div class='del'>- * @async_update: hint for asynchronous plane update</div><div class='del'>- * @planes: pointer to array of structures with per-plane data</div><div class='del'>- * @crtcs: pointer to array of CRTC pointers</div><div class='del'>- * @num_connector: size of the @connectors and @connector_states arrays</div><div class='del'>- * @connectors: pointer to array of structures with per-connector data</div><div class='del'>- * @num_private_objs: size of the @private_objs array</div><div class='del'>- * @private_objs: pointer to array of private object pointers</div><div class='del'>- * @acquire_ctx: acquire context for this atomic modeset state update</div><div class='add'>+ * struct drm_atomic_state - Atomic commit structure</div><div class='add'>+ *</div><div class='add'>+ * This structure is the kernel counterpart of @drm_mode_atomic and represents</div><div class='add'>+ * an atomic commit that transitions from an old to a new display state. It</div><div class='add'>+ * contains all the objects affected by the atomic commit and both the new</div><div class='add'>+ * state structures and pointers to the old state structures for</div><div class='add'>+ * these.</div><div class='ctx'>  *</div><div class='ctx'>  * States are added to an atomic update by calling drm_atomic_get_crtc_state(),</div><div class='ctx'>  * drm_atomic_get_plane_state(), drm_atomic_get_connector_state(), or for</div><div class='ctx'>  * private state structures, drm_atomic_get_private_obj_state().</div><div class='add'>+ *</div><div class='add'>+ * NOTE: struct drm_atomic_state first started as a single collection of</div><div class='add'>+ * entities state pointers (drm_plane_state, drm_crtc_state, etc.).</div><div class='add'>+ *</div><div class='add'>+ * At atomic_check time, you could get the state about to be committed</div><div class='add'>+ * from drm_atomic_state, and the one currently running from the</div><div class='add'>+ * entities state pointer (drm_crtc.state, for example). After the call</div><div class='add'>+ * to drm_atomic_helper_swap_state(), the entities state pointer would</div><div class='add'>+ * contain the state previously checked, and the drm_atomic_state</div><div class='add'>+ * structure the old state.</div><div class='add'>+ *</div><div class='add'>+ * Over time, and in order to avoid confusion, drm_atomic_state has</div><div class='add'>+ * grown to have both the old state (ie, the state we replace) and the</div><div class='add'>+ * new state (ie, the state we want to apply). Those names are stable</div><div class='add'>+ * during the commit process, which makes it easier to reason about.</div><div class='add'>+ *</div><div class='add'>+ * You can still find some traces of that evolution through some hooks</div><div class='add'>+ * or callbacks taking a drm_atomic_state parameter called names like</div><div class='add'>+ * "old_state". This doesn't necessarily mean that the previous</div><div class='add'>+ * drm_atomic_state is passed, but rather that this used to be the state</div><div class='add'>+ * collection we were replacing after drm_atomic_helper_swap_state(),</div><div class='add'>+ * but the variable name was never updated.</div><div class='add'>+ *</div><div class='add'>+ * Some atomic operations implementations followed a similar process. We</div><div class='add'>+ * first started to pass the entity state only. However, it was pretty</div><div class='add'>+ * cumbersome for drivers, and especially CRTCs, to retrieve the states</div><div class='add'>+ * of other components. Thus, we switched to passing the whole</div><div class='add'>+ * drm_atomic_state as a parameter to those operations. Similarly, the</div><div class='add'>+ * transition isn't complete yet, and one might still find atomic</div><div class='add'>+ * operations taking a drm_atomic_state pointer, or a component state</div><div class='add'>+ * pointer. The former is the preferred form.</div><div class='ctx'>  */</div><div class='ctx'> struct drm_atomic_state {</div><div class='add'>+	/**</div><div class='add'>+	 * @ref:</div><div class='add'>+	 *</div><div class='add'>+	 * Count of all references to this update (will not be freed until zero).</div><div class='add'>+	 */</div><div class='ctx'> 	struct kref ref;</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @dev: Parent DRM Device.</div><div class='add'>+	 */</div><div class='ctx'> 	struct drm_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='hunk'>@@ -372,8 +478,27 @@ struct drm_atomic_state {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Allow full modeset. This is used by the ATOMIC IOCTL handler to</div><div class='ctx'> 	 * implement the DRM_MODE_ATOMIC_ALLOW_MODESET flag. Drivers should</div><div class='del'>-	 * never consult this flag, instead looking at the output of</div><div class='del'>-	 * drm_atomic_crtc_needs_modeset().</div><div class='add'>+	 * generally not consult this flag, but instead look at the output of</div><div class='add'>+	 * drm_atomic_crtc_needs_modeset(). The detailed rules are:</div><div class='add'>+	 *</div><div class='add'>+	 * - Drivers must not consult @allow_modeset in the atomic commit path.</div><div class='add'>+	 *   Use drm_atomic_crtc_needs_modeset() instead.</div><div class='add'>+	 *</div><div class='add'>+	 * - Drivers must consult @allow_modeset before adding unrelated struct</div><div class='add'>+	 *   drm_crtc_state to this commit by calling</div><div class='add'>+	 *   drm_atomic_get_crtc_state(). See also the warning in the</div><div class='add'>+	 *   documentation for that function.</div><div class='add'>+	 *</div><div class='add'>+	 * - Drivers must never change this flag, it is under the exclusive</div><div class='add'>+	 *   control of userspace.</div><div class='add'>+	 *</div><div class='add'>+	 * - Drivers may consult @allow_modeset in the atomic check path, if</div><div class='add'>+	 *   they have the choice between an optimal hardware configuration</div><div class='add'>+	 *   which requires a modeset, and a less optimal configuration which</div><div class='add'>+	 *   can be committed without a modeset. An example would be suboptimal</div><div class='add'>+	 *   scanout FIFO allocation resulting in increased idle power</div><div class='add'>+	 *   consumption. This allows userspace to avoid flickering and delays</div><div class='add'>+	 *   for the normal composition loop at reasonable cost.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool allow_modeset : 1;</div><div class='ctx'> 	/**</div><div class='hunk'>@@ -388,7 +513,12 @@ struct drm_atomic_state {</div><div class='ctx'> 	 * flag are not allowed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool legacy_cursor_update : 1;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @async_update: hint for asynchronous plane update</div><div class='add'>+	 */</div><div class='ctx'> 	bool async_update : 1;</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @duplicated:</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -398,13 +528,86 @@ struct drm_atomic_state {</div><div class='ctx'> 	 * states.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool duplicated : 1;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @checked:</div><div class='add'>+	 *</div><div class='add'>+	 * Indicates the state has been checked and thus must no longer</div><div class='add'>+	 * be mutated. For internal use only, do not consult from drivers.</div><div class='add'>+	 */</div><div class='add'>+	bool checked : 1;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @plane_color_pipeline:</div><div class='add'>+	 *</div><div class='add'>+	 * Indicates whether this atomic state originated with a client that</div><div class='add'>+	 * set the DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE.</div><div class='add'>+	 *</div><div class='add'>+	 * Drivers and helper functions should use this to ignore legacy</div><div class='add'>+	 * properties that are incompatible with the drm_plane COLOR_PIPELINE</div><div class='add'>+	 * behavior, such as:</div><div class='add'>+	 *</div><div class='add'>+	 *  - COLOR_RANGE</div><div class='add'>+	 *  - COLOR_ENCODING</div><div class='add'>+	 *</div><div class='add'>+	 * or any other driver-specific properties that might affect pixel</div><div class='add'>+	 * values.</div><div class='add'>+	 */</div><div class='add'>+	bool plane_color_pipeline : 1;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @colorops:</div><div class='add'>+	 *</div><div class='add'>+	 * Pointer to array of @drm_colorop and @drm_colorop_state part of this</div><div class='add'>+	 * update.</div><div class='add'>+	 */</div><div class='add'>+	struct __drm_colorops_state *colorops;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @planes:</div><div class='add'>+	 *</div><div class='add'>+	 * Pointer to array of @drm_plane and @drm_plane_state part of this</div><div class='add'>+	 * update.</div><div class='add'>+	 */</div><div class='ctx'> 	struct __drm_planes_state *planes;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @crtcs:</div><div class='add'>+	 *</div><div class='add'>+	 * Pointer to array of @drm_crtc and @drm_crtc_state part of this</div><div class='add'>+	 * update.</div><div class='add'>+	 */</div><div class='ctx'> 	struct __drm_crtcs_state *crtcs;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @num_connector: size of the @connectors array</div><div class='add'>+	 */</div><div class='ctx'> 	int num_connector;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @connectors:</div><div class='add'>+	 *</div><div class='add'>+	 * Pointer to array of @drm_connector and @drm_connector_state part of</div><div class='add'>+	 * this update.</div><div class='add'>+	 */</div><div class='ctx'> 	struct __drm_connnectors_state *connectors;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @num_private_objs: size of the @private_objs array</div><div class='add'>+	 */</div><div class='ctx'> 	int num_private_objs;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @private_objs:</div><div class='add'>+	 *</div><div class='add'>+	 * Pointer to array of @drm_private_obj and @drm_private_obj_state part</div><div class='add'>+	 * of this update.</div><div class='add'>+	 */</div><div class='ctx'> 	struct __drm_private_objs_state *private_objs;</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @acquire_ctx: acquire context for this atomic modeset state update</div><div class='add'>+	 */</div><div class='ctx'> 	struct drm_modeset_acquire_ctx *acquire_ctx;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='hunk'>@@ -412,7 +615,7 @@ struct drm_atomic_state {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Used for signaling unbound planes/connectors.</div><div class='ctx'> 	 * When a connector or plane is not bound to any CRTC, it's still important</div><div class='del'>-	 * to preserve linearity to prevent the atomic states from being freed to early.</div><div class='add'>+	 * to preserve linearity to prevent the atomic states from being freed too early.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This commit (if set) is not bound to any CRTC, but will be completed when</div><div class='ctx'> 	 * drm_atomic_helper_commit_hw_done() is called.</div><div class='hunk'>@@ -501,6 +704,9 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state,</div><div class='ctx'> struct drm_plane_state * __must_check</div><div class='ctx'> drm_atomic_get_plane_state(struct drm_atomic_state *state,</div><div class='ctx'> 			   struct drm_plane *plane);</div><div class='add'>+struct drm_colorop_state *</div><div class='add'>+drm_atomic_get_colorop_state(struct drm_atomic_state *state,</div><div class='add'>+			     struct drm_colorop *colorop);</div><div class='ctx'> struct drm_connector_state * __must_check</div><div class='ctx'> drm_atomic_get_connector_state(struct drm_atomic_state *state,</div><div class='ctx'> 			       struct drm_connector *connector);</div><div class='hunk'>@@ -527,6 +733,9 @@ drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *state,</div><div class='ctx'> struct drm_connector *</div><div class='ctx'> drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *state,</div><div class='ctx'> 					 struct drm_encoder *encoder);</div><div class='add'>+struct drm_connector *</div><div class='add'>+drm_atomic_get_connector_for_encoder(const struct drm_encoder *encoder,</div><div class='add'>+				     struct drm_modeset_acquire_ctx *ctx);</div><div class='ctx'> </div><div class='ctx'> struct drm_crtc *</div><div class='ctx'> drm_atomic_get_old_crtc_for_encoder(struct drm_atomic_state *state,</div><div class='hunk'>@@ -536,24 +745,6 @@ drm_atomic_get_new_crtc_for_encoder(struct drm_atomic_state *state,</div><div class='ctx'> 					 struct drm_encoder *encoder);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * drm_atomic_get_existing_crtc_state - get CRTC state, if it exists</div><div class='del'>- * @state: global atomic state object</div><div class='del'>- * @crtc: CRTC to grab</div><div class='del'>- *</div><div class='del'>- * This function returns the CRTC state for the given CRTC, or NULL</div><div class='del'>- * if the CRTC is not part of the global atomic state.</div><div class='del'>- *</div><div class='del'>- * This function is deprecated, @drm_atomic_get_old_crtc_state or</div><div class='del'>- * @drm_atomic_get_new_crtc_state should be used instead.</div><div class='del'>- */</div><div class='del'>-static inline struct drm_crtc_state *</div><div class='del'>-drm_atomic_get_existing_crtc_state(const struct drm_atomic_state *state,</div><div class='del'>-				   struct drm_crtc *crtc)</div><div class='del'>-{</div><div class='del'>-	return state-&gt;crtcs[drm_crtc_index(crtc)].state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * drm_atomic_get_old_crtc_state - get old CRTC state, if it exists</div><div class='ctx'>  * @state: global atomic state object</div><div class='ctx'>  * @crtc: CRTC to grab</div><div class='hunk'>@@ -583,24 +774,6 @@ drm_atomic_get_new_crtc_state(const struct drm_atomic_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * drm_atomic_get_existing_plane_state - get plane state, if it exists</div><div class='del'>- * @state: global atomic state object</div><div class='del'>- * @plane: plane to grab</div><div class='del'>- *</div><div class='del'>- * This function returns the plane state for the given plane, or NULL</div><div class='del'>- * if the plane is not part of the global atomic state.</div><div class='del'>- *</div><div class='del'>- * This function is deprecated, @drm_atomic_get_old_plane_state or</div><div class='del'>- * @drm_atomic_get_new_plane_state should be used instead.</div><div class='del'>- */</div><div class='del'>-static inline struct drm_plane_state *</div><div class='del'>-drm_atomic_get_existing_plane_state(const struct drm_atomic_state *state,</div><div class='del'>-				    struct drm_plane *plane)</div><div class='del'>-{</div><div class='del'>-	return state-&gt;planes[drm_plane_index(plane)].state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * drm_atomic_get_old_plane_state - get plane state, if it exists</div><div class='ctx'>  * @state: global atomic state object</div><div class='ctx'>  * @plane: plane to grab</div><div class='hunk'>@@ -631,26 +804,33 @@ drm_atomic_get_new_plane_state(const struct drm_atomic_state *state,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * drm_atomic_get_existing_connector_state - get connector state, if it exists</div><div class='add'>+ * drm_atomic_get_old_colorop_state - get colorop state, if it exists</div><div class='ctx'>  * @state: global atomic state object</div><div class='del'>- * @connector: connector to grab</div><div class='add'>+ * @colorop: colorop to grab</div><div class='ctx'>  *</div><div class='del'>- * This function returns the connector state for the given connector,</div><div class='del'>- * or NULL if the connector is not part of the global atomic state.</div><div class='del'>- *</div><div class='del'>- * This function is deprecated, @drm_atomic_get_old_connector_state or</div><div class='del'>- * @drm_atomic_get_new_connector_state should be used instead.</div><div class='add'>+ * This function returns the old colorop state for the given colorop, or</div><div class='add'>+ * NULL if the colorop is not part of the global atomic state.</div><div class='ctx'>  */</div><div class='del'>-static inline struct drm_connector_state *</div><div class='del'>-drm_atomic_get_existing_connector_state(const struct drm_atomic_state *state,</div><div class='del'>-					struct drm_connector *connector)</div><div class='add'>+static inline struct drm_colorop_state *</div><div class='add'>+drm_atomic_get_old_colorop_state(struct drm_atomic_state *state,</div><div class='add'>+				 struct drm_colorop *colorop)</div><div class='ctx'> {</div><div class='del'>-	int index = drm_connector_index(connector);</div><div class='del'>-</div><div class='del'>-	if (index &gt;= state-&gt;num_connector)</div><div class='del'>-		return NULL;</div><div class='add'>+	return state-&gt;colorops[drm_colorop_index(colorop)].old_state;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return state-&gt;connectors[index].state;</div><div class='add'>+/**</div><div class='add'>+ * drm_atomic_get_new_colorop_state - get colorop state, if it exists</div><div class='add'>+ * @state: global atomic state object</div><div class='add'>+ * @colorop: colorop to grab</div><div class='add'>+ *</div><div class='add'>+ * This function returns the new colorop state for the given colorop, or</div><div class='add'>+ * NULL if the colorop is not part of the global atomic state.</div><div class='add'>+ */</div><div class='add'>+static inline struct drm_colorop_state *</div><div class='add'>+drm_atomic_get_new_colorop_state(struct drm_atomic_state *state,</div><div class='add'>+				 struct drm_colorop *colorop)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;colorops[drm_colorop_index(colorop)].new_state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -698,11 +878,11 @@ drm_atomic_get_new_connector_state(const struct drm_atomic_state *state,</div><div class='ctx'>  * @state: global atomic state object</div><div class='ctx'>  * @plane: plane to grab</div><div class='ctx'>  *</div><div class='del'>- * This function returns the plane state for the given plane, either from</div><div class='del'>- * @state, or if the plane isn't part of the atomic state update, from @plane.</div><div class='del'>- * This is useful in atomic check callbacks, when drivers need to peek at, but</div><div class='del'>- * not change, state of other planes, since it avoids threading an error code</div><div class='del'>- * back up the call chain.</div><div class='add'>+ * This function returns the plane state for the given plane, either the</div><div class='add'>+ * new plane state from @state, or if the plane isn't part of the atomic</div><div class='add'>+ * state update, from @plane. This is useful in atomic check callbacks,</div><div class='add'>+ * when drivers need to peek at, but not change, state of other planes,</div><div class='add'>+ * since it avoids threading an error code back up the call chain.</div><div class='ctx'>  *</div><div class='ctx'>  * WARNING:</div><div class='ctx'>  *</div><div class='hunk'>@@ -723,9 +903,15 @@ static inline const struct drm_plane_state *</div><div class='ctx'> __drm_atomic_get_current_plane_state(const struct drm_atomic_state *state,</div><div class='ctx'> 				     struct drm_plane *plane)</div><div class='ctx'> {</div><div class='del'>-	if (state-&gt;planes[drm_plane_index(plane)].state)</div><div class='del'>-		return state-&gt;planes[drm_plane_index(plane)].state;</div><div class='add'>+	struct drm_plane_state *plane_state;</div><div class='ctx'> </div><div class='add'>+	plane_state = drm_atomic_get_new_plane_state(state, plane);</div><div class='add'>+	if (plane_state)</div><div class='add'>+		return plane_state;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the plane isn't part of the state, fallback to the currently active one.</div><div class='add'>+	 */</div><div class='ctx'> 	return plane-&gt;state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -738,6 +924,9 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state,</div><div class='ctx'> int __must_check</div><div class='ctx'> drm_atomic_add_affected_planes(struct drm_atomic_state *state,</div><div class='ctx'> 			       struct drm_crtc *crtc);</div><div class='add'>+int __must_check</div><div class='add'>+drm_atomic_add_affected_colorops(struct drm_atomic_state *state,</div><div class='add'>+				 struct drm_plane *plane);</div><div class='ctx'> </div><div class='ctx'> int __must_check drm_atomic_check_only(struct drm_atomic_state *state);</div><div class='ctx'> int __must_check drm_atomic_commit(struct drm_atomic_state *state);</div><div class='hunk'>@@ -878,6 +1067,49 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p);</div><div class='ctx'> 			     (void)(new_crtc_state) /* Only to avoid unused-but-set-variable warning */, 1))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * for_each_oldnew_colorop_in_state - iterate over all colorops in an atomic update</div><div class='add'>+ * @__state: &amp;struct drm_atomic_state pointer</div><div class='add'>+ * @colorop: &amp;struct drm_colorop iteration cursor</div><div class='add'>+ * @old_colorop_state: &amp;struct drm_colorop_state iteration cursor for the old state</div><div class='add'>+ * @new_colorop_state: &amp;struct drm_colorop_state iteration cursor for the new state</div><div class='add'>+ * @__i: int iteration cursor, for macro-internal use</div><div class='add'>+ *</div><div class='add'>+ * This iterates over all colorops in an atomic update, tracking both old and</div><div class='add'>+ * new state. This is useful in places where the state delta needs to be</div><div class='add'>+ * considered, for example in atomic check functions.</div><div class='add'>+ */</div><div class='add'>+#define for_each_oldnew_colorop_in_state(__state, colorop, old_colorop_state,	\</div><div class='add'>+					 new_colorop_state, __i)		\</div><div class='add'>+	for ((__i) = 0;								\</div><div class='add'>+	     (__i) &lt; (__state)-&gt;dev-&gt;mode_config.num_colorop;			\</div><div class='add'>+	     (__i)++)								\</div><div class='add'>+		for_each_if ((__state)-&gt;colorops[__i].ptr &amp;&amp;			\</div><div class='add'>+			     ((colorop) = (__state)-&gt;colorops[__i].ptr,		\</div><div class='add'>+			      (void)(colorop) /* Only to avoid unused-but-set-variable warning */, \</div><div class='add'>+			      (old_colorop_state) = (__state)-&gt;colorops[__i].old_state,\</div><div class='add'>+			      (new_colorop_state) = (__state)-&gt;colorops[__i].new_state, 1))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * for_each_new_colorop_in_state - iterate over all colorops in an atomic update</div><div class='add'>+ * @__state: &amp;struct drm_atomic_state pointer</div><div class='add'>+ * @colorop: &amp;struct drm_colorop iteration cursor</div><div class='add'>+ * @new_colorop_state: &amp;struct drm_colorop_state iteration cursor for the new state</div><div class='add'>+ * @__i: int iteration cursor, for macro-internal use</div><div class='add'>+ *</div><div class='add'>+ * This iterates over all colorops in an atomic update, tracking new state. This is</div><div class='add'>+ * useful in places where the state delta needs to be considered, for example in</div><div class='add'>+ * atomic check functions.</div><div class='add'>+ */</div><div class='add'>+#define for_each_new_colorop_in_state(__state, colorop, new_colorop_state, __i) \</div><div class='add'>+	for ((__i) = 0;							\</div><div class='add'>+	     (__i) &lt; (__state)-&gt;dev-&gt;mode_config.num_colorop;		\</div><div class='add'>+	     (__i)++)							\</div><div class='add'>+		for_each_if ((__state)-&gt;colorops[__i].ptr &amp;&amp;		\</div><div class='add'>+			     ((colorop) = (__state)-&gt;colorops[__i].ptr,	\</div><div class='add'>+			      (void)(colorop) /* Only to avoid unused-but-set-variable warning */, \</div><div class='add'>+			      (new_colorop_state) = (__state)-&gt;colorops[__i].new_state, 1))</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * for_each_oldnew_plane_in_state - iterate over all planes in an atomic update</div><div class='ctx'>  * @__state: &amp;struct drm_atomic_state pointer</div><div class='ctx'>  * @plane: &amp;struct drm_plane iteration cursor</div><div class='head'>diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h<br/>index 9aa0a05aa072..53382fe93537 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_atomic_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_atomic_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_atomic_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_atomic_helper.h</a></div><div class='hunk'>@@ -139,6 +139,8 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,</div><div class='ctx'> </div><div class='ctx'> int drm_atomic_helper_disable_all(struct drm_device *dev,</div><div class='ctx'> 				  struct drm_modeset_acquire_ctx *ctx);</div><div class='add'>+int drm_atomic_helper_reset_crtc(struct drm_crtc *crtc,</div><div class='add'>+				 struct drm_modeset_acquire_ctx *ctx);</div><div class='ctx'> void drm_atomic_helper_shutdown(struct drm_device *dev);</div><div class='ctx'> struct drm_atomic_state *</div><div class='ctx'> drm_atomic_helper_duplicate_state(struct drm_device *dev,</div><div class='head'>diff --git a/include/drm/drm_atomic_uapi.h b/include/drm/drm_atomic_uapi.h<br/>index 4c6d39d7bdb2..436315523326 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_atomic_uapi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_atomic_uapi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_atomic_uapi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_atomic_uapi.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@ struct drm_crtc;</div><div class='ctx'> struct drm_connector_state;</div><div class='ctx'> struct dma_fence;</div><div class='ctx'> struct drm_framebuffer;</div><div class='add'>+struct drm_colorop;</div><div class='ctx'> </div><div class='ctx'> int __must_check</div><div class='ctx'> drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state,</div><div class='hunk'>@@ -49,6 +50,8 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,</div><div class='ctx'> 			      struct drm_crtc *crtc);</div><div class='ctx'> void drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state,</div><div class='ctx'> 				 struct drm_framebuffer *fb);</div><div class='add'>+void drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state,</div><div class='add'>+				      struct drm_colorop *colorop);</div><div class='ctx'> int __must_check</div><div class='ctx'> drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,</div><div class='ctx'> 				  struct drm_crtc *crtc);</div><div class='head'>diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h<br/>index e39da5807ba7..0ff7ab4aa868 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_bridge.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_bridge.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_bridge.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_bridge.h</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #ifndef __DRM_BRIDGE_H__</div><div class='ctx'> #define __DRM_BRIDGE_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -32,6 +33,7 @@</div><div class='ctx'> #include &lt;drm/drm_mode_object.h&gt;</div><div class='ctx'> #include &lt;drm/drm_modes.h&gt;</div><div class='ctx'> </div><div class='add'>+struct cec_msg;</div><div class='ctx'> struct device_node;</div><div class='ctx'> </div><div class='ctx'> struct drm_bridge;</div><div class='hunk'>@@ -41,6 +43,8 @@ struct drm_display_info;</div><div class='ctx'> struct drm_minor;</div><div class='ctx'> struct drm_panel;</div><div class='ctx'> struct edid;</div><div class='add'>+struct hdmi_codec_daifmt;</div><div class='add'>+struct hdmi_codec_params;</div><div class='ctx'> struct i2c_adapter;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -71,10 +75,20 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Zero on success, error code on failure.</div><div class='ctx'> 	 */</div><div class='del'>-	int (*attach)(struct drm_bridge *bridge,</div><div class='add'>+	int (*attach)(struct drm_bridge *bridge, struct drm_encoder *encoder,</div><div class='ctx'> 		      enum drm_bridge_attach_flags flags);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @destroy:</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is invoked when the bridge is about to be</div><div class='add'>+	 * deallocated.</div><div class='add'>+	 *</div><div class='add'>+	 * The @destroy callback is optional.</div><div class='add'>+	 */</div><div class='add'>+	void (*destroy)(struct drm_bridge *bridge);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @detach:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This callback is invoked whenever our bridge is being detached from a</div><div class='hunk'>@@ -107,7 +121,7 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	 * Since this function is both called from the check phase of an atomic</div><div class='ctx'> 	 * commit, and the mode validation in the probe paths it is not allowed</div><div class='ctx'> 	 * to look at anything else but the passed-in mode, and validate it</div><div class='del'>-	 * against configuration-invariant hardward constraints. Any further</div><div class='add'>+	 * against configuration-invariant hardware constraints. Any further</div><div class='ctx'> 	 * limits which depend upon the configuration can only be checked in</div><div class='ctx'> 	 * @mode_fixup.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -162,17 +176,33 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @disable:</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback should disable the bridge. It is called right before</div><div class='del'>-	 * the preceding element in the display pipe is disabled. If the</div><div class='del'>-	 * preceding element is a bridge this means it's called before that</div><div class='del'>-	 * bridge's @disable vfunc. If the preceding element is a &amp;drm_encoder</div><div class='del'>-	 * it's called right before the &amp;drm_encoder_helper_funcs.disable,</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.prepare or &amp;drm_encoder_helper_funcs.dpms</div><div class='del'>-	 * hook.</div><div class='add'>+	 * The @disable callback should disable the bridge.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The bridge can assume that the display pipe (i.e. clocks and timing</div><div class='ctx'> 	 * signals) feeding it is still running when this callback is called.</div><div class='ctx'> 	 *</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element is a &amp;drm_bridge, then this is called before</div><div class='add'>+	 * that bridge is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_bridge_funcs.disable</div><div class='add'>+	 * - &amp;drm_bridge_funcs.atomic_disable</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element of the bridge is a display controller, then</div><div class='add'>+	 * this callback is called before the encoder is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.atomic_disable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.prepare</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.disable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.dpms</div><div class='add'>+	 *</div><div class='add'>+	 * and the CRTC is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.prepare</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.atomic_disable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.disable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.dpms.</div><div class='add'>+	 *</div><div class='ctx'> 	 * The @disable callback is optional.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * NOTE:</div><div class='hunk'>@@ -185,17 +215,34 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @post_disable:</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback should disable the bridge. It is called right after the</div><div class='del'>-	 * preceding element in the display pipe is disabled. If the preceding</div><div class='del'>-	 * element is a bridge this means it's called after that bridge's</div><div class='del'>-	 * @post_disable function. If the preceding element is a &amp;drm_encoder</div><div class='del'>-	 * it's called right after the encoder's</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.disable, &amp;drm_encoder_helper_funcs.prepare</div><div class='del'>-	 * or &amp;drm_encoder_helper_funcs.dpms hook.</div><div class='del'>-	 *</div><div class='ctx'> 	 * The bridge must assume that the display pipe (i.e. clocks and timing</div><div class='del'>-	 * signals) feeding it is no longer running when this callback is</div><div class='del'>-	 * called.</div><div class='add'>+	 * signals) feeding this bridge is no longer running when the</div><div class='add'>+	 * @post_disable is called.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback should perform all the actions required by the hardware</div><div class='add'>+	 * after it has stopped receiving signals from the preceding element.</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element is a &amp;drm_bridge, then this is called after</div><div class='add'>+	 * that bridge is post-disabled (unless marked otherwise by the</div><div class='add'>+	 * @pre_enable_prev_first flag) via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_bridge_funcs.post_disable</div><div class='add'>+	 * - &amp;drm_bridge_funcs.atomic_post_disable</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element of the bridge is a display controller, then</div><div class='add'>+	 * this callback is called after the encoder is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.atomic_disable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.prepare</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.disable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.dpms</div><div class='add'>+	 *</div><div class='add'>+	 * and the CRTC is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.prepare</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.atomic_disable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.disable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.dpms</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The @post_disable callback is optional.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -238,18 +285,30 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @pre_enable:</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback should enable the bridge. It is called right before</div><div class='del'>-	 * the preceding element in the display pipe is enabled. If the</div><div class='del'>-	 * preceding element is a bridge this means it's called before that</div><div class='del'>-	 * bridge's @pre_enable function. If the preceding element is a</div><div class='del'>-	 * &amp;drm_encoder it's called right before the encoder's</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.enable, &amp;drm_encoder_helper_funcs.commit or</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.dpms hook.</div><div class='del'>-	 *</div><div class='ctx'> 	 * The display pipe (i.e. clocks and timing signals) feeding this bridge</div><div class='del'>-	 * will not yet be running when this callback is called. The bridge must</div><div class='del'>-	 * not enable the display link feeding the next bridge in the chain (if</div><div class='del'>-	 * there is one) when this callback is called.</div><div class='add'>+	 * will not yet be running when the @pre_enable is called.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback should perform all the necessary actions to prepare the</div><div class='add'>+	 * bridge to accept signals from the preceding element.</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element is a &amp;drm_bridge, then this is called before</div><div class='add'>+	 * that bridge is pre-enabled (unless marked otherwise by</div><div class='add'>+	 * @pre_enable_prev_first flag) via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_bridge_funcs.pre_enable</div><div class='add'>+	 * - &amp;drm_bridge_funcs.atomic_pre_enable</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element of the bridge is a display controller, then</div><div class='add'>+	 * this callback is called before the CRTC is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.atomic_enable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.commit</div><div class='add'>+	 *</div><div class='add'>+	 * and the encoder is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.atomic_enable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.enable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.commit</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The @pre_enable callback is optional.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -263,19 +322,31 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @enable:</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback should enable the bridge. It is called right after</div><div class='del'>-	 * the preceding element in the display pipe is enabled. If the</div><div class='del'>-	 * preceding element is a bridge this means it's called after that</div><div class='del'>-	 * bridge's @enable function. If the preceding element is a</div><div class='del'>-	 * &amp;drm_encoder it's called right after the encoder's</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.enable, &amp;drm_encoder_helper_funcs.commit or</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.dpms hook.</div><div class='add'>+	 * The @enable callback should enable the bridge.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The bridge can assume that the display pipe (i.e. clocks and timing</div><div class='ctx'> 	 * signals) feeding it is running when this callback is called. This</div><div class='ctx'> 	 * callback must enable the display link feeding the next bridge in the</div><div class='ctx'> 	 * chain if there is one.</div><div class='ctx'> 	 *</div><div class='add'>+	 * If the preceding element is a &amp;drm_bridge, then this is called after</div><div class='add'>+	 * that bridge is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_bridge_funcs.enable</div><div class='add'>+	 * - &amp;drm_bridge_funcs.atomic_enable</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element of the bridge is a display controller, then</div><div class='add'>+	 * this callback is called after the CRTC is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.atomic_enable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.commit</div><div class='add'>+	 *</div><div class='add'>+	 * and the encoder is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.atomic_enable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.enable</div><div class='add'>+	 * - drm_encoder_helper_funcs.commit</div><div class='add'>+	 *</div><div class='ctx'> 	 * The @enable callback is optional.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * NOTE:</div><div class='hunk'>@@ -288,78 +359,138 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @atomic_pre_enable:</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback should enable the bridge. It is called right before</div><div class='del'>-	 * the preceding element in the display pipe is enabled. If the</div><div class='del'>-	 * preceding element is a bridge this means it's called before that</div><div class='del'>-	 * bridge's @atomic_pre_enable or @pre_enable function. If the preceding</div><div class='del'>-	 * element is a &amp;drm_encoder it's called right before the encoder's</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.atomic_enable hook.</div><div class='del'>-	 *</div><div class='ctx'> 	 * The display pipe (i.e. clocks and timing signals) feeding this bridge</div><div class='del'>-	 * will not yet be running when this callback is called. The bridge must</div><div class='del'>-	 * not enable the display link feeding the next bridge in the chain (if</div><div class='del'>-	 * there is one) when this callback is called.</div><div class='add'>+	 * will not yet be running when the @atomic_pre_enable is called.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback should perform all the necessary actions to prepare the</div><div class='add'>+	 * bridge to accept signals from the preceding element.</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element is a &amp;drm_bridge, then this is called before</div><div class='add'>+	 * that bridge is pre-enabled (unless marked otherwise by</div><div class='add'>+	 * @pre_enable_prev_first flag) via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_bridge_funcs.pre_enable</div><div class='add'>+	 * - &amp;drm_bridge_funcs.atomic_pre_enable</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element of the bridge is a display controller, then</div><div class='add'>+	 * this callback is called before the CRTC is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.atomic_enable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.commit</div><div class='add'>+	 *</div><div class='add'>+	 * and the encoder is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.atomic_enable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.enable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.commit</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The @atomic_pre_enable callback is optional.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*atomic_pre_enable)(struct drm_bridge *bridge,</div><div class='del'>-				  struct drm_bridge_state *old_bridge_state);</div><div class='add'>+				  struct drm_atomic_state *state);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @atomic_enable:</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback should enable the bridge. It is called right after</div><div class='del'>-	 * the preceding element in the display pipe is enabled. If the</div><div class='del'>-	 * preceding element is a bridge this means it's called after that</div><div class='del'>-	 * bridge's @atomic_enable or @enable function. If the preceding element</div><div class='del'>-	 * is a &amp;drm_encoder it's called right after the encoder's</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.atomic_enable hook.</div><div class='add'>+	 * The @atomic_enable callback should enable the bridge.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The bridge can assume that the display pipe (i.e. clocks and timing</div><div class='ctx'> 	 * signals) feeding it is running when this callback is called. This</div><div class='ctx'> 	 * callback must enable the display link feeding the next bridge in the</div><div class='ctx'> 	 * chain if there is one.</div><div class='ctx'> 	 *</div><div class='add'>+	 * If the preceding element is a &amp;drm_bridge, then this is called after</div><div class='add'>+	 * that bridge is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_bridge_funcs.enable</div><div class='add'>+	 * - &amp;drm_bridge_funcs.atomic_enable</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element of the bridge is a display controller, then</div><div class='add'>+	 * this callback is called after the CRTC is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.atomic_enable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.commit</div><div class='add'>+	 *</div><div class='add'>+	 * and the encoder is enabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.atomic_enable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.enable</div><div class='add'>+	 * - drm_encoder_helper_funcs.commit</div><div class='add'>+	 *</div><div class='ctx'> 	 * The @atomic_enable callback is optional.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*atomic_enable)(struct drm_bridge *bridge,</div><div class='del'>-			      struct drm_bridge_state *old_bridge_state);</div><div class='add'>+			      struct drm_atomic_state *state);</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @atomic_disable:</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback should disable the bridge. It is called right before</div><div class='del'>-	 * the preceding element in the display pipe is disabled. If the</div><div class='del'>-	 * preceding element is a bridge this means it's called before that</div><div class='del'>-	 * bridge's @atomic_disable or @disable vfunc. If the preceding element</div><div class='del'>-	 * is a &amp;drm_encoder it's called right before the</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.atomic_disable hook.</div><div class='add'>+	 * The @atomic_disable callback should disable the bridge.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The bridge can assume that the display pipe (i.e. clocks and timing</div><div class='ctx'> 	 * signals) feeding it is still running when this callback is called.</div><div class='ctx'> 	 *</div><div class='add'>+	 * If the preceding element is a &amp;drm_bridge, then this is called before</div><div class='add'>+	 * that bridge is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_bridge_funcs.disable</div><div class='add'>+	 * - &amp;drm_bridge_funcs.atomic_disable</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element of the bridge is a display controller, then</div><div class='add'>+	 * this callback is called before the encoder is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.atomic_disable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.prepare</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.disable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.dpms</div><div class='add'>+	 *</div><div class='add'>+	 * and the CRTC is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.prepare</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.atomic_disable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.disable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.dpms.</div><div class='add'>+	 *</div><div class='ctx'> 	 * The @atomic_disable callback is optional.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*atomic_disable)(struct drm_bridge *bridge,</div><div class='del'>-			       struct drm_bridge_state *old_bridge_state);</div><div class='add'>+			       struct drm_atomic_state *state);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @atomic_post_disable:</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback should disable the bridge. It is called right after the</div><div class='del'>-	 * preceding element in the display pipe is disabled. If the preceding</div><div class='del'>-	 * element is a bridge this means it's called after that bridge's</div><div class='del'>-	 * @atomic_post_disable or @post_disable function. If the preceding</div><div class='del'>-	 * element is a &amp;drm_encoder it's called right after the encoder's</div><div class='del'>-	 * &amp;drm_encoder_helper_funcs.atomic_disable hook.</div><div class='del'>-	 *</div><div class='ctx'> 	 * The bridge must assume that the display pipe (i.e. clocks and timing</div><div class='del'>-	 * signals) feeding it is no longer running when this callback is</div><div class='del'>-	 * called.</div><div class='add'>+	 * signals) feeding this bridge is no longer running when the</div><div class='add'>+	 * @atomic_post_disable is called.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback should perform all the actions required by the hardware</div><div class='add'>+	 * after it has stopped receiving signals from the preceding element.</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element is a &amp;drm_bridge, then this is called after</div><div class='add'>+	 * that bridge is post-disabled (unless marked otherwise by the</div><div class='add'>+	 * @pre_enable_prev_first flag) via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_bridge_funcs.post_disable</div><div class='add'>+	 * - &amp;drm_bridge_funcs.atomic_post_disable</div><div class='add'>+	 *</div><div class='add'>+	 * If the preceding element of the bridge is a display controller, then</div><div class='add'>+	 * this callback is called after the encoder is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.atomic_disable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.prepare</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.disable</div><div class='add'>+	 * - &amp;drm_encoder_helper_funcs.dpms</div><div class='add'>+	 *</div><div class='add'>+	 * and the CRTC is disabled via one of:</div><div class='add'>+	 *</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.prepare</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.atomic_disable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.disable</div><div class='add'>+	 * - &amp;drm_crtc_helper_funcs.dpms</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The @atomic_post_disable callback is optional.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*atomic_post_disable)(struct drm_bridge *bridge,</div><div class='del'>-				    struct drm_bridge_state *old_bridge_state);</div><div class='add'>+				    struct drm_atomic_state *state);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @atomic_duplicate_state:</div><div class='hunk'>@@ -530,7 +661,8 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * drm_connector_status indicating the bridge output status.</div><div class='ctx'> 	 */</div><div class='del'>-	enum drm_connector_status (*detect)(struct drm_bridge *bridge);</div><div class='add'>+	enum drm_connector_status (*detect)(struct drm_bridge *bridge,</div><div class='add'>+					    struct drm_connector *connector);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @get_modes:</div><div class='hunk'>@@ -541,7 +673,7 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	 * The @get_modes callback is mostly intended to support non-probeable</div><div class='ctx'> 	 * displays such as many fixed panels. Bridges that support reading</div><div class='ctx'> 	 * EDID shall leave @get_modes unimplemented and implement the</div><div class='del'>-	 * &amp;drm_bridge_funcs-&gt;get_edid callback instead.</div><div class='add'>+	 * &amp;drm_bridge_funcs-&gt;edid_read callback instead.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This callback is optional. Bridges that implement it shall set the</div><div class='ctx'> 	 * DRM_BRIDGE_OP_MODES flag in their &amp;drm_bridge-&gt;ops.</div><div class='hunk'>@@ -558,11 +690,11 @@ struct drm_bridge_funcs {</div><div class='ctx'> 			 struct drm_connector *connector);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @get_edid:</div><div class='add'>+	 * @edid_read:</div><div class='ctx'> 	 *</div><div class='del'>-	 * Read and parse the EDID data of the connected display.</div><div class='add'>+	 * Read the EDID data of the connected display.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The @get_edid callback is the preferred way of reporting mode</div><div class='add'>+	 * The @edid_read callback is the preferred way of reporting mode</div><div class='ctx'> 	 * information for a display connected to the bridge output. Bridges</div><div class='ctx'> 	 * that support reading EDID shall implement this callback and leave</div><div class='ctx'> 	 * the @get_modes callback unimplemented.</div><div class='hunk'>@@ -575,17 +707,18 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	 * DRM_BRIDGE_OP_EDID flag in their &amp;drm_bridge-&gt;ops.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The connector parameter shall be used for the sole purpose of EDID</div><div class='del'>-	 * retrieval and parsing, and shall not be stored internally by bridge</div><div class='del'>-	 * drivers for future usage.</div><div class='add'>+	 * retrieval, and shall not be stored internally by bridge drivers for</div><div class='add'>+	 * future usage.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * RETURNS:</div><div class='ctx'> 	 *</div><div class='del'>-	 * An edid structure newly allocated with kmalloc() (or similar) on</div><div class='del'>-	 * success, or NULL otherwise. The caller is responsible for freeing</div><div class='del'>-	 * the returned edid structure with kfree().</div><div class='add'>+	 * An edid structure newly allocated with drm_edid_alloc() or returned</div><div class='add'>+	 * from drm_edid_read() family of functions on success, or NULL</div><div class='add'>+	 * otherwise. The caller is responsible for freeing the returned edid</div><div class='add'>+	 * structure with drm_edid_free().</div><div class='ctx'> 	 */</div><div class='del'>-	struct edid *(*get_edid)(struct drm_bridge *bridge,</div><div class='del'>-				 struct drm_connector *connector);</div><div class='add'>+	const struct drm_edid *(*edid_read)(struct drm_bridge *bridge,</div><div class='add'>+					    struct drm_connector *connector);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @hpd_notify:</div><div class='hunk'>@@ -630,6 +763,228 @@ struct drm_bridge_funcs {</div><div class='ctx'> 	void (*hpd_disable)(struct drm_bridge *bridge);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @hdmi_tmds_char_rate_valid:</div><div class='add'>+	 *</div><div class='add'>+	 * Check whether a particular TMDS character rate is supported by the</div><div class='add'>+	 * driver.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional and should only be implemented by the</div><div class='add'>+	 * bridges that take part in the HDMI connector implementation. Bridges</div><div class='add'>+	 * that implement it shall set the DRM_BRIDGE_OP_HDMI flag in their</div><div class='add'>+	 * &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 *</div><div class='add'>+	 * Either &amp;drm_mode_status.MODE_OK or one of the failure reasons</div><div class='add'>+	 * in &amp;enum drm_mode_status.</div><div class='add'>+	 */</div><div class='add'>+	enum drm_mode_status</div><div class='add'>+	(*hdmi_tmds_char_rate_valid)(const struct drm_bridge *bridge,</div><div class='add'>+				     const struct drm_display_mode *mode,</div><div class='add'>+				     unsigned long long tmds_rate);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_clear_infoframe:</div><div class='add'>+	 *</div><div class='add'>+	 * This callback clears the infoframes in the hardware during commit.</div><div class='add'>+	 * It will be called multiple times, once for every disabled infoframe</div><div class='add'>+	 * type.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional but it must be implemented by bridges that</div><div class='add'>+	 * set the DRM_BRIDGE_OP_HDMI flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_clear_infoframe)(struct drm_bridge *bridge,</div><div class='add'>+				    enum hdmi_infoframe_type type);</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_write_infoframe:</div><div class='add'>+	 *</div><div class='add'>+	 * Program the infoframe into the hardware. It will be called multiple</div><div class='add'>+	 * times, once for every updated infoframe type.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional but it must be implemented by bridges that</div><div class='add'>+	 * set the DRM_BRIDGE_OP_HDMI flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_write_infoframe)(struct drm_bridge *bridge,</div><div class='add'>+				    enum hdmi_infoframe_type type,</div><div class='add'>+				    const u8 *buffer, size_t len);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_startup:</div><div class='add'>+	 *</div><div class='add'>+	 * Called when ASoC starts an audio stream setup.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional, it can be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_HDMI_AUDIO flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_audio_startup)(struct drm_bridge *bridge,</div><div class='add'>+				  struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_prepare:</div><div class='add'>+	 * Configures HDMI-encoder for audio stream. Can be called multiple</div><div class='add'>+	 * times for each setup.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional but it must be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_HDMI_AUDIO flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_audio_prepare)(struct drm_bridge *bridge,</div><div class='add'>+				  struct drm_connector *connector,</div><div class='add'>+				  struct hdmi_codec_daifmt *fmt,</div><div class='add'>+				  struct hdmi_codec_params *hparms);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_shutdown:</div><div class='add'>+	 *</div><div class='add'>+	 * Shut down the audio stream.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional but it must be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_HDMI_AUDIO flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	void (*hdmi_audio_shutdown)(struct drm_bridge *bridge,</div><div class='add'>+				    struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_mute_stream:</div><div class='add'>+	 *</div><div class='add'>+	 * Mute/unmute HDMI audio stream.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional, it can be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_HDMI_AUDIO flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_audio_mute_stream)(struct drm_bridge *bridge,</div><div class='add'>+				      struct drm_connector *connector,</div><div class='add'>+				      bool enable, int direction);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_cec_init:</div><div class='add'>+	 *</div><div class='add'>+	 * Initialize CEC part of the bridge.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional, it can be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER flag in their</div><div class='add'>+	 * &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_cec_init)(struct drm_bridge *bridge,</div><div class='add'>+			     struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_cec_enable:</div><div class='add'>+	 *</div><div class='add'>+	 * Enable or disable the CEC adapter inside the bridge.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional, it can be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER flag in their</div><div class='add'>+	 * &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_cec_enable)(struct drm_bridge *bridge, bool enable);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_cec_log_addr:</div><div class='add'>+	 *</div><div class='add'>+	 * Set the logical address of the CEC adapter inside the bridge.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional, it can be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER flag in their</div><div class='add'>+	 * &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_cec_log_addr)(struct drm_bridge *bridge, u8 logical_addr);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_cec_transmit:</div><div class='add'>+	 *</div><div class='add'>+	 * Transmit the message using the CEC adapter inside the bridge.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional, it can be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER flag in their</div><div class='add'>+	 * &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*hdmi_cec_transmit)(struct drm_bridge *bridge, u8 attempts,</div><div class='add'>+				 u32 signal_free_time, struct cec_msg *msg);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dp_audio_startup:</div><div class='add'>+	 *</div><div class='add'>+	 * Called when ASoC starts a DisplayPort audio stream setup.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional, it can be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_DP_AUDIO flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*dp_audio_startup)(struct drm_bridge *bridge,</div><div class='add'>+				struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dp_audio_prepare:</div><div class='add'>+	 * Configures DisplayPort audio stream. Can be called multiple</div><div class='add'>+	 * times for each setup.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional but it must be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_DP_AUDIO flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*dp_audio_prepare)(struct drm_bridge *bridge,</div><div class='add'>+				struct drm_connector *connector,</div><div class='add'>+				struct hdmi_codec_daifmt *fmt,</div><div class='add'>+				struct hdmi_codec_params *hparms);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dp_audio_shutdown:</div><div class='add'>+	 *</div><div class='add'>+	 * Shut down the DisplayPort audio stream.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional but it must be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_DP_AUDIO flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	void (*dp_audio_shutdown)(struct drm_bridge *bridge,</div><div class='add'>+				  struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dp_audio_mute_stream:</div><div class='add'>+	 *</div><div class='add'>+	 * Mute/unmute DisplayPort audio stream.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional, it can be implemented by bridges that</div><div class='add'>+	 * set the @DRM_BRIDGE_OP_DP_AUDIO flag in their &amp;drm_bridge-&gt;ops.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*dp_audio_mute_stream)(struct drm_bridge *bridge,</div><div class='add'>+				    struct drm_connector *connector,</div><div class='add'>+				    bool enable, int direction);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @debugfs_init:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Allows bridges to create bridge-specific debugfs files.</div><div class='hunk'>@@ -686,7 +1041,7 @@ enum drm_bridge_ops {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @DRM_BRIDGE_OP_EDID: The bridge can retrieve the EDID of the display</div><div class='ctx'> 	 * connected to its output. Bridges that set this flag shall implement</div><div class='del'>-	 * the &amp;drm_bridge_funcs-&gt;get_edid callback.</div><div class='add'>+	 * the &amp;drm_bridge_funcs-&gt;edid_read callback.</div><div class='ctx'> 	 */</div><div class='ctx'> 	DRM_BRIDGE_OP_EDID = BIT(1),</div><div class='ctx'> 	/**</div><div class='hunk'>@@ -704,6 +1059,52 @@ enum drm_bridge_ops {</div><div class='ctx'> 	 * this flag shall implement the &amp;drm_bridge_funcs-&gt;get_modes callback.</div><div class='ctx'> 	 */</div><div class='ctx'> 	DRM_BRIDGE_OP_MODES = BIT(3),</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_BRIDGE_OP_HDMI: The bridge provides HDMI connector operations,</div><div class='add'>+	 * including infoframes support. Bridges that set this flag must</div><div class='add'>+	 * implement the &amp;drm_bridge_funcs-&gt;write_infoframe callback.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: currently there can be at most one bridge in a chain that sets</div><div class='add'>+	 * this bit. This is to simplify corresponding glue code in connector</div><div class='add'>+	 * drivers.</div><div class='add'>+	 */</div><div class='add'>+	DRM_BRIDGE_OP_HDMI = BIT(4),</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_BRIDGE_OP_HDMI_AUDIO: The bridge provides HDMI audio operations.</div><div class='add'>+	 * Bridges that set this flag must implement the</div><div class='add'>+	 * &amp;drm_bridge_funcs-&gt;hdmi_audio_prepare and</div><div class='add'>+	 * &amp;drm_bridge_funcs-&gt;hdmi_audio_shutdown callbacks.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: currently there can be at most one bridge in a chain that sets</div><div class='add'>+	 * this bit. This is to simplify corresponding glue code in connector</div><div class='add'>+	 * drivers. Also it is not possible to have a bridge in the chain that</div><div class='add'>+	 * sets @DRM_BRIDGE_OP_DP_AUDIO if there is a bridge that sets this</div><div class='add'>+	 * flag.</div><div class='add'>+	 */</div><div class='add'>+	DRM_BRIDGE_OP_HDMI_AUDIO = BIT(5),</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_BRIDGE_OP_DP_AUDIO: The bridge provides DisplayPort audio operations.</div><div class='add'>+	 * Bridges that set this flag must implement the</div><div class='add'>+	 * &amp;drm_bridge_funcs-&gt;dp_audio_prepare and</div><div class='add'>+	 * &amp;drm_bridge_funcs-&gt;dp_audio_shutdown callbacks.</div><div class='add'>+	 *</div><div class='add'>+	 * Note: currently there can be at most one bridge in a chain that sets</div><div class='add'>+	 * this bit. This is to simplify corresponding glue code in connector</div><div class='add'>+	 * drivers. Also it is not possible to have a bridge in the chain that</div><div class='add'>+	 * sets @DRM_BRIDGE_OP_HDMI_AUDIO if there is a bridge that sets this</div><div class='add'>+	 * flag.</div><div class='add'>+	 */</div><div class='add'>+	DRM_BRIDGE_OP_DP_AUDIO = BIT(6),</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER: The bridge requires CEC notifier</div><div class='add'>+	 * to be present.</div><div class='add'>+	 */</div><div class='add'>+	DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER = BIT(7),</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER: The bridge requires CEC adapter</div><div class='add'>+	 * to be present.</div><div class='add'>+	 */</div><div class='add'>+	DRM_BRIDGE_OP_HDMI_CEC_ADAPTER = BIT(8),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -730,6 +1131,18 @@ struct drm_bridge {</div><div class='ctx'> 	const struct drm_bridge_timings *timings;</div><div class='ctx'> 	/** @funcs: control functions */</div><div class='ctx'> 	const struct drm_bridge_funcs *funcs;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @container: Pointer to the private driver struct embedding this</div><div class='add'>+	 * @struct drm_bridge.</div><div class='add'>+	 */</div><div class='add'>+	void *container;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @refcount: reference count of users referencing this bridge.</div><div class='add'>+	 */</div><div class='add'>+	struct kref refcount;</div><div class='add'>+</div><div class='ctx'> 	/** @driver_private: pointer to the bridge driver's internal context */</div><div class='ctx'> 	void *driver_private;</div><div class='ctx'> 	/** @ops: bitmask of operations supported by the bridge */</div><div class='hunk'>@@ -746,6 +1159,11 @@ struct drm_bridge {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool interlace_allowed;</div><div class='ctx'> 	/**</div><div class='add'>+	 * @ycbcr_420_allowed: Indicate that the bridge can handle YCbCr 420</div><div class='add'>+	 * output.</div><div class='add'>+	 */</div><div class='add'>+	bool ycbcr_420_allowed;</div><div class='add'>+	/**</div><div class='ctx'> 	 * @pre_enable_prev_first: The bridge requires that the prev</div><div class='ctx'> 	 * bridge @pre_enable function is called before its @pre_enable,</div><div class='ctx'> 	 * and conversely for post_disable. This is most frequently a</div><div class='hunk'>@@ -754,9 +1172,89 @@ struct drm_bridge {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool pre_enable_prev_first;</div><div class='ctx'> 	/**</div><div class='add'>+	 * @support_hdcp: Indicate that the bridge supports HDCP.</div><div class='add'>+	 */</div><div class='add'>+	bool support_hdcp;</div><div class='add'>+	/**</div><div class='ctx'> 	 * @ddc: Associated I2C adapter for DDC access, if any.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct i2c_adapter *ddc;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @vendor: Vendor of the product to be used for the SPD InfoFrame</div><div class='add'>+	 * generation. This is required if @DRM_BRIDGE_OP_HDMI is set.</div><div class='add'>+	 */</div><div class='add'>+	const char *vendor;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @product: Name of the product to be used for the SPD InfoFrame</div><div class='add'>+	 * generation. This is required if @DRM_BRIDGE_OP_HDMI is set.</div><div class='add'>+	 */</div><div class='add'>+	const char *product;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @supported_formats: Bitmask of @hdmi_colorspace listing supported</div><div class='add'>+	 * output formats. This is only relevant if @DRM_BRIDGE_OP_HDMI is set.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int supported_formats;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @max_bpc: Maximum bits per char the HDMI bridge supports. Allowed</div><div class='add'>+	 * values are 8, 10 and 12. This is only relevant if</div><div class='add'>+	 * @DRM_BRIDGE_OP_HDMI is set.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int max_bpc;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_cec_dev: device to be used as a containing device for CEC</div><div class='add'>+	 * functions.</div><div class='add'>+	 */</div><div class='add'>+	struct device *hdmi_cec_dev;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_dev: device to be used as a parent for the HDMI Codec if</div><div class='add'>+	 * either of @DRM_BRIDGE_OP_HDMI_AUDIO or @DRM_BRIDGE_OP_DP_AUDIO is set.</div><div class='add'>+	 */</div><div class='add'>+	struct device *hdmi_audio_dev;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_max_i2s_playback_channels: maximum number of playback</div><div class='add'>+	 * I2S channels for the @DRM_BRIDGE_OP_HDMI_AUDIO or</div><div class='add'>+	 * @DRM_BRIDGE_OP_DP_AUDIO.</div><div class='add'>+	 */</div><div class='add'>+	int hdmi_audio_max_i2s_playback_channels;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_i2s_formats: supported I2S formats, optional. The</div><div class='add'>+	 * default is to allow all formats supported by the corresponding I2S</div><div class='add'>+	 * bus driver. This is only used for bridges setting</div><div class='add'>+	 * @DRM_BRIDGE_OP_HDMI_AUDIO or @DRM_BRIDGE_OP_DP_AUDIO.</div><div class='add'>+	 */</div><div class='add'>+	u64 hdmi_audio_i2s_formats;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_spdif_playback: set if this bridge has S/PDIF playback</div><div class='add'>+	 * port for @DRM_BRIDGE_OP_HDMI_AUDIO or @DRM_BRIDGE_OP_DP_AUDIO.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int hdmi_audio_spdif_playback : 1;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio_dai_port: sound DAI port for either of</div><div class='add'>+	 * @DRM_BRIDGE_OP_HDMI_AUDIO and @DRM_BRIDGE_OP_DP_AUDIO, -1 if it is</div><div class='add'>+	 * not used.</div><div class='add'>+	 */</div><div class='add'>+	int hdmi_audio_dai_port;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_cec_adapter_name: the name of the adapter to register</div><div class='add'>+	 */</div><div class='add'>+	const char *hdmi_cec_adapter_name;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_cec_available_las: number of logical addresses, CEC_MAX_LOG_ADDRS if unset</div><div class='add'>+	 */</div><div class='add'>+	u8 hdmi_cec_available_las;</div><div class='add'>+</div><div class='ctx'> 	/** private: */</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @hpd_mutex: Protects the @hpd_cb and @hpd_data fields.</div><div class='hunk'>@@ -780,6 +1278,33 @@ drm_priv_to_bridge(struct drm_private_obj *priv)</div><div class='ctx'> 	return container_of(priv, struct drm_bridge, base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct drm_bridge *drm_bridge_get(struct drm_bridge *bridge);</div><div class='add'>+void drm_bridge_put(struct drm_bridge *bridge);</div><div class='add'>+</div><div class='add'>+/* Cleanup action for use with __free() */</div><div class='add'>+DEFINE_FREE(drm_bridge_put, struct drm_bridge *, if (_T) drm_bridge_put(_T))</div><div class='add'>+</div><div class='add'>+void *__devm_drm_bridge_alloc(struct device *dev, size_t size, size_t offset,</div><div class='add'>+			      const struct drm_bridge_funcs *funcs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_drm_bridge_alloc - Allocate and initialize a bridge</div><div class='add'>+ * @dev: struct device of the bridge device</div><div class='add'>+ * @type: the type of the struct which contains struct &amp;drm_bridge</div><div class='add'>+ * @member: the name of the &amp;drm_bridge within @type</div><div class='add'>+ * @funcs: callbacks for this bridge</div><div class='add'>+ *</div><div class='add'>+ * The reference count of the returned bridge is initialized to 1. This</div><div class='add'>+ * reference will be automatically dropped via devm (by calling</div><div class='add'>+ * drm_bridge_put()) when @dev is removed.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * Pointer to new bridge, or ERR_PTR on failure.</div><div class='add'>+ */</div><div class='add'>+#define devm_drm_bridge_alloc(dev, type, member, funcs) \</div><div class='add'>+	((type *)__devm_drm_bridge_alloc(dev, sizeof(type), \</div><div class='add'>+					 offsetof(type, member), funcs))</div><div class='add'>+</div><div class='ctx'> void drm_bridge_add(struct drm_bridge *bridge);</div><div class='ctx'> int devm_drm_bridge_add(struct device *dev, struct drm_bridge *bridge);</div><div class='ctx'> void drm_bridge_remove(struct drm_bridge *bridge);</div><div class='hunk'>@@ -796,10 +1321,54 @@ static inline struct drm_bridge *of_drm_find_bridge(struct device_node *np)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline bool drm_bridge_is_last(struct drm_bridge *bridge)</div><div class='add'>+{</div><div class='add'>+	return list_is_last(&amp;bridge-&gt;chain_node, &amp;bridge-&gt;encoder-&gt;bridge_chain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_bridge_get_current_state() - Get the current bridge state</div><div class='add'>+ * @bridge: bridge object</div><div class='add'>+ *</div><div class='add'>+ * This function must be called with the modeset lock held.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ *</div><div class='add'>+ * The current bridge state, or NULL if there is none.</div><div class='add'>+ */</div><div class='add'>+static inline struct drm_bridge_state *</div><div class='add'>+drm_bridge_get_current_state(struct drm_bridge *bridge)</div><div class='add'>+{</div><div class='add'>+	if (!bridge)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only atomic bridges will have bridge-&gt;base initialized by</div><div class='add'>+	 * drm_atomic_private_obj_init(), so we need to make sure we're</div><div class='add'>+	 * working with one before we try to use the lock.</div><div class='add'>+	 */</div><div class='add'>+	if (!bridge-&gt;funcs || !bridge-&gt;funcs-&gt;atomic_reset)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	drm_modeset_lock_assert_held(&amp;bridge-&gt;base.lock);</div><div class='add'>+</div><div class='add'>+	if (!bridge-&gt;base.state)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return drm_priv_to_bridge_state(bridge-&gt;base.state);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * drm_bridge_get_next_bridge() - Get the next bridge in the chain</div><div class='ctx'>  * @bridge: bridge object</div><div class='ctx'>  *</div><div class='add'>+ * The caller is responsible of having a reference to @bridge via</div><div class='add'>+ * drm_bridge_get() or equivalent. This function leaves the refcount of</div><div class='add'>+ * @bridge unmodified.</div><div class='add'>+ *</div><div class='add'>+ * The refcount of the returned bridge is incremented. Use drm_bridge_put()</div><div class='add'>+ * when done with it.</div><div class='add'>+ *</div><div class='ctx'>  * RETURNS:</div><div class='ctx'>  * the next bridge in the chain after @bridge, or NULL if @bridge is the last.</div><div class='ctx'>  */</div><div class='hunk'>@@ -809,13 +1378,20 @@ drm_bridge_get_next_bridge(struct drm_bridge *bridge)</div><div class='ctx'> 	if (list_is_last(&amp;bridge-&gt;chain_node, &amp;bridge-&gt;encoder-&gt;bridge_chain))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return list_next_entry(bridge, chain_node);</div><div class='add'>+	return drm_bridge_get(list_next_entry(bridge, chain_node));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * drm_bridge_get_prev_bridge() - Get the previous bridge in the chain</div><div class='ctx'>  * @bridge: bridge object</div><div class='ctx'>  *</div><div class='add'>+ * The caller is responsible of having a reference to @bridge via</div><div class='add'>+ * drm_bridge_get() or equivalent. This function leaves the refcount of</div><div class='add'>+ * @bridge unmodified.</div><div class='add'>+ *</div><div class='add'>+ * The refcount of the returned bridge is incremented. Use drm_bridge_put()</div><div class='add'>+ * when done with it.</div><div class='add'>+ *</div><div class='ctx'>  * RETURNS:</div><div class='ctx'>  * the previous bridge in the chain, or NULL if @bridge is the first.</div><div class='ctx'>  */</div><div class='hunk'>@@ -825,13 +1401,16 @@ drm_bridge_get_prev_bridge(struct drm_bridge *bridge)</div><div class='ctx'> 	if (list_is_first(&amp;bridge-&gt;chain_node, &amp;bridge-&gt;encoder-&gt;bridge_chain))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return list_prev_entry(bridge, chain_node);</div><div class='add'>+	return drm_bridge_get(list_prev_entry(bridge, chain_node));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * drm_bridge_chain_get_first_bridge() - Get the first bridge in the chain</div><div class='ctx'>  * @encoder: encoder object</div><div class='ctx'>  *</div><div class='add'>+ * The refcount of the returned bridge is incremented. Use drm_bridge_put()</div><div class='add'>+ * when done with it.</div><div class='add'>+ *</div><div class='ctx'>  * RETURNS:</div><div class='ctx'>  * the first bridge in the chain, or NULL if @encoder has no bridge attached</div><div class='ctx'>  * to it.</div><div class='hunk'>@@ -839,24 +1418,85 @@ drm_bridge_get_prev_bridge(struct drm_bridge *bridge)</div><div class='ctx'> static inline struct drm_bridge *</div><div class='ctx'> drm_bridge_chain_get_first_bridge(struct drm_encoder *encoder)</div><div class='ctx'> {</div><div class='del'>-	return list_first_entry_or_null(&amp;encoder-&gt;bridge_chain,</div><div class='del'>-					struct drm_bridge, chain_node);</div><div class='add'>+	return drm_bridge_get(list_first_entry_or_null(&amp;encoder-&gt;bridge_chain,</div><div class='add'>+						       struct drm_bridge, chain_node));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * drm_for_each_bridge_in_chain() - Iterate over all bridges present in a chain</div><div class='add'>+ * drm_bridge_chain_get_last_bridge() - Get the last bridge in the chain</div><div class='add'>+ * @encoder: encoder object</div><div class='add'>+ *</div><div class='add'>+ * The refcount of the returned bridge is incremented. Use drm_bridge_put()</div><div class='add'>+ * when done with it.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * the last bridge in the chain, or NULL if @encoder has no bridge attached</div><div class='add'>+ * to it.</div><div class='add'>+ */</div><div class='add'>+static inline struct drm_bridge *</div><div class='add'>+drm_bridge_chain_get_last_bridge(struct drm_encoder *encoder)</div><div class='add'>+{</div><div class='add'>+	return drm_bridge_get(list_last_entry_or_null(&amp;encoder-&gt;bridge_chain,</div><div class='add'>+						      struct drm_bridge, chain_node));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_bridge_get_next_bridge_and_put - Get the next bridge in the chain</div><div class='add'>+ *                                      and put the previous</div><div class='add'>+ * @bridge: bridge object</div><div class='add'>+ *</div><div class='add'>+ * Same as drm_bridge_get_next_bridge() but additionally puts the @bridge.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * the next bridge in the chain after @bridge, or NULL if @bridge is the last.</div><div class='add'>+ */</div><div class='add'>+static inline struct drm_bridge *</div><div class='add'>+drm_bridge_get_next_bridge_and_put(struct drm_bridge *bridge)</div><div class='add'>+{</div><div class='add'>+	struct drm_bridge *next = drm_bridge_get_next_bridge(bridge);</div><div class='add'>+</div><div class='add'>+	drm_bridge_put(bridge);</div><div class='add'>+</div><div class='add'>+	return next;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_for_each_bridge_in_chain_scoped - iterate over all bridges attached</div><div class='add'>+ *                                       to an encoder</div><div class='ctx'>  * @encoder: the encoder to iterate bridges on</div><div class='ctx'>  * @bridge: a bridge pointer updated to point to the current bridge at each</div><div class='ctx'>  *	    iteration</div><div class='ctx'>  *</div><div class='ctx'>  * Iterate over all bridges present in the bridge chain attached to @encoder.</div><div class='add'>+ *</div><div class='add'>+ * Automatically gets/puts the bridge reference while iterating, and puts</div><div class='add'>+ * the reference even if returning or breaking in the middle of the loop.</div><div class='ctx'>  */</div><div class='del'>-#define drm_for_each_bridge_in_chain(encoder, bridge)			\</div><div class='del'>-	list_for_each_entry(bridge, &amp;(encoder)-&gt;bridge_chain, chain_node)</div><div class='add'>+#define drm_for_each_bridge_in_chain_scoped(encoder, bridge)		\</div><div class='add'>+	for (struct drm_bridge *bridge __free(drm_bridge_put) =		\</div><div class='add'>+	     drm_bridge_chain_get_first_bridge(encoder);		\</div><div class='add'>+	     bridge;							\</div><div class='add'>+	     bridge = drm_bridge_get_next_bridge_and_put(bridge))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_for_each_bridge_in_chain_from - iterate over all bridges starting</div><div class='add'>+ *                                     from the given bridge</div><div class='add'>+ * @first_bridge: the bridge to start from</div><div class='add'>+ * @bridge: a bridge pointer updated to point to the current bridge at each</div><div class='add'>+ *	    iteration</div><div class='add'>+ *</div><div class='add'>+ * Iterate over all bridges in the encoder chain starting from</div><div class='add'>+ * @first_bridge, included.</div><div class='add'>+ *</div><div class='add'>+ * Automatically gets/puts the bridge reference while iterating, and puts</div><div class='add'>+ * the reference even if returning or breaking in the middle of the loop.</div><div class='add'>+ */</div><div class='add'>+#define drm_for_each_bridge_in_chain_from(first_bridge, bridge)		\</div><div class='add'>+	for (struct drm_bridge *bridge __free(drm_bridge_put) =		\</div><div class='add'>+		     drm_bridge_get(first_bridge);			\</div><div class='add'>+	     bridge;							\</div><div class='add'>+	     bridge = drm_bridge_get_next_bridge_and_put(bridge))</div><div class='ctx'> </div><div class='del'>-bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge,</div><div class='del'>-				 const struct drm_display_mode *mode,</div><div class='del'>-				 struct drm_display_mode *adjusted_mode);</div><div class='ctx'> enum drm_mode_status</div><div class='ctx'> drm_bridge_chain_mode_valid(struct drm_bridge *bridge,</div><div class='ctx'> 			    const struct drm_display_info *info,</div><div class='hunk'>@@ -885,11 +1525,12 @@ drm_atomic_helper_bridge_propagate_bus_fmt(struct drm_bridge *bridge,</div><div class='ctx'> 					u32 output_fmt,</div><div class='ctx'> 					unsigned int *num_input_fmts);</div><div class='ctx'> </div><div class='del'>-enum drm_connector_status drm_bridge_detect(struct drm_bridge *bridge);</div><div class='add'>+enum drm_connector_status</div><div class='add'>+drm_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connector);</div><div class='ctx'> int drm_bridge_get_modes(struct drm_bridge *bridge,</div><div class='ctx'> 			 struct drm_connector *connector);</div><div class='del'>-struct edid *drm_bridge_get_edid(struct drm_bridge *bridge,</div><div class='del'>-				 struct drm_connector *connector);</div><div class='add'>+const struct drm_edid *drm_bridge_edid_read(struct drm_bridge *bridge,</div><div class='add'>+					    struct drm_connector *connector);</div><div class='ctx'> void drm_bridge_hpd_enable(struct drm_bridge *bridge,</div><div class='ctx'> 			   void (*cb)(void *data,</div><div class='ctx'> 				      enum drm_connector_status status),</div><div class='hunk'>@@ -950,4 +1591,9 @@ static inline struct drm_bridge *drmm_of_get_bridge(struct drm_device *drm,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+void devm_drm_put_bridge(struct device *dev, struct drm_bridge *bridge);</div><div class='add'>+</div><div class='add'>+void drm_bridge_debugfs_params(struct dentry *root);</div><div class='add'>+void drm_bridge_debugfs_encoder_params(struct dentry *root, struct drm_encoder *encoder);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_bridge_helper.h b/include/drm/drm_bridge_helper.h<br/>new file mode 100644<br/>index 000000000000..6c35b479ec2a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_bridge_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_bridge_helper.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#ifndef __DRM_BRIDGE_HELPER_H_</div><div class='add'>+#define __DRM_BRIDGE_HELPER_H_</div><div class='add'>+</div><div class='add'>+struct drm_bridge;</div><div class='add'>+struct drm_modeset_acquire_ctx;</div><div class='add'>+</div><div class='add'>+int drm_bridge_helper_reset_crtc(struct drm_bridge *bridge,</div><div class='add'>+				 struct drm_modeset_acquire_ctx *ctx);</div><div class='add'>+</div><div class='add'>+#endif // __DRM_BRIDGE_HELPER_H_</div><div class='head'>diff --git a/include/drm/drm_buddy.h b/include/drm/drm_buddy.h<br/>index a5b39fc01003..b909fa8f810a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_buddy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_buddy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_buddy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_buddy.h</a></div><div class='hunk'>@@ -10,21 +10,16 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;drm/drm_print.h&gt;</div><div class='del'>-</div><div class='del'>-#define range_overflows(start, size, max) ({ \</div><div class='del'>-	typeof(start) start__ = (start); \</div><div class='del'>-	typeof(size) size__ = (size); \</div><div class='del'>-	typeof(max) max__ = (max); \</div><div class='del'>-	(void)(&amp;start__ == &amp;size__); \</div><div class='del'>-	(void)(&amp;start__ == &amp;max__); \</div><div class='del'>-	start__ &gt;= max__ || size__ &gt; max__ - start__; \</div><div class='del'>-})</div><div class='add'>+struct drm_printer;</div><div class='ctx'> </div><div class='ctx'> #define DRM_BUDDY_RANGE_ALLOCATION		BIT(0)</div><div class='ctx'> #define DRM_BUDDY_TOPDOWN_ALLOCATION		BIT(1)</div><div class='ctx'> #define DRM_BUDDY_CONTIGUOUS_ALLOCATION		BIT(2)</div><div class='add'>+#define DRM_BUDDY_CLEAR_ALLOCATION		BIT(3)</div><div class='add'>+#define DRM_BUDDY_CLEARED			BIT(4)</div><div class='add'>+#define DRM_BUDDY_TRIM_DISABLE			BIT(5)</div><div class='ctx'> </div><div class='ctx'> struct drm_buddy_block {</div><div class='ctx'> #define DRM_BUDDY_HEADER_OFFSET GENMASK_ULL(63, 12)</div><div class='hunk'>@@ -32,8 +27,9 @@ struct drm_buddy_block {</div><div class='ctx'> #define   DRM_BUDDY_ALLOCATED	   (1 &lt;&lt; 10)</div><div class='ctx'> #define   DRM_BUDDY_FREE	   (2 &lt;&lt; 10)</div><div class='ctx'> #define   DRM_BUDDY_SPLIT	   (3 &lt;&lt; 10)</div><div class='add'>+#define DRM_BUDDY_HEADER_CLEAR  GENMASK_ULL(9, 9)</div><div class='ctx'> /* Free to be used, if needed in the future */</div><div class='del'>-#define DRM_BUDDY_HEADER_UNUSED GENMASK_ULL(9, 6)</div><div class='add'>+#define DRM_BUDDY_HEADER_UNUSED GENMASK_ULL(8, 6)</div><div class='ctx'> #define DRM_BUDDY_HEADER_ORDER  GENMASK_ULL(5, 0)</div><div class='ctx'> 	u64 header;</div><div class='ctx'> </div><div class='hunk'>@@ -49,12 +45,16 @@ struct drm_buddy_block {</div><div class='ctx'> 	 * a list, if so desired. As soon as the block is freed with</div><div class='ctx'> 	 * drm_buddy_free* ownership is given back to the mm.</div><div class='ctx'> 	 */</div><div class='del'>-	struct list_head link;</div><div class='add'>+	union {</div><div class='add'>+		struct rb_node rb;</div><div class='add'>+		struct list_head link;</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	struct list_head tmp_link;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Order-zero must be at least PAGE_SIZE */</div><div class='del'>-#define DRM_BUDDY_MAX_ORDER (63 - PAGE_SHIFT)</div><div class='add'>+/* Order-zero must be at least SZ_4K */</div><div class='add'>+#define DRM_BUDDY_MAX_ORDER (63 - 12)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Binary Buddy System.</div><div class='hunk'>@@ -64,7 +64,7 @@ struct drm_buddy_block {</div><div class='ctx'>  */</div><div class='ctx'> struct drm_buddy {</div><div class='ctx'> 	/* Maintain a free list for each order. */</div><div class='del'>-	struct list_head *free_list;</div><div class='add'>+	struct rb_root **free_trees;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Maintain explicit binary tree(s) to track the allocation of the</div><div class='hunk'>@@ -82,14 +82,15 @@ struct drm_buddy {</div><div class='ctx'> 	unsigned int n_roots;</div><div class='ctx'> 	unsigned int max_order;</div><div class='ctx'> </div><div class='del'>-	/* Must be at least PAGE_SIZE */</div><div class='add'>+	/* Must be at least SZ_4K */</div><div class='ctx'> 	u64 chunk_size;</div><div class='ctx'> 	u64 size;</div><div class='ctx'> 	u64 avail;</div><div class='add'>+	u64 clear_avail;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u64</div><div class='del'>-drm_buddy_block_offset(struct drm_buddy_block *block)</div><div class='add'>+drm_buddy_block_offset(const struct drm_buddy_block *block)</div><div class='ctx'> {</div><div class='ctx'> 	return block-&gt;header &amp; DRM_BUDDY_HEADER_OFFSET;</div><div class='ctx'> }</div><div class='hunk'>@@ -113,6 +114,12 @@ drm_buddy_block_is_allocated(struct drm_buddy_block *block)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='add'>+drm_buddy_block_is_clear(struct drm_buddy_block *block)</div><div class='add'>+{</div><div class='add'>+	return block-&gt;header &amp; DRM_BUDDY_HEADER_CLEAR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='ctx'> drm_buddy_block_is_free(struct drm_buddy_block *block)</div><div class='ctx'> {</div><div class='ctx'> 	return drm_buddy_block_state(block) == DRM_BUDDY_FREE;</div><div class='hunk'>@@ -145,12 +152,17 @@ int drm_buddy_alloc_blocks(struct drm_buddy *mm,</div><div class='ctx'> 			   unsigned long flags);</div><div class='ctx'> </div><div class='ctx'> int drm_buddy_block_trim(struct drm_buddy *mm,</div><div class='add'>+			 u64 *start,</div><div class='ctx'> 			 u64 new_size,</div><div class='ctx'> 			 struct list_head *blocks);</div><div class='ctx'> </div><div class='add'>+void drm_buddy_reset_clear(struct drm_buddy *mm, bool is_clear);</div><div class='add'>+</div><div class='ctx'> void drm_buddy_free_block(struct drm_buddy *mm, struct drm_buddy_block *block);</div><div class='ctx'> </div><div class='del'>-void drm_buddy_free_list(struct drm_buddy *mm, struct list_head *objects);</div><div class='add'>+void drm_buddy_free_list(struct drm_buddy *mm,</div><div class='add'>+			 struct list_head *objects,</div><div class='add'>+			 unsigned int flags);</div><div class='ctx'> </div><div class='ctx'> void drm_buddy_print(struct drm_buddy *mm, struct drm_printer *p);</div><div class='ctx'> void drm_buddy_block_print(struct drm_buddy *mm,</div><div class='head'>diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h<br/>index d47458ecdac4..c972a8a3385b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_client.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_client.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_client.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_client.h</a></div><div class='hunk'>@@ -29,6 +29,16 @@ struct drm_client_funcs {</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @free:</div><div class='add'>+	 *</div><div class='add'>+	 * Called when the client gets unregistered. Implementations should</div><div class='add'>+	 * release all client-specific data and free the memory.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional.</div><div class='add'>+	 */</div><div class='add'>+	void (*free)(struct drm_client_dev *client);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @unregister:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Called when &amp;drm_device is unregistered. The client should respond by</div><div class='hunk'>@@ -47,12 +57,14 @@ struct drm_client_funcs {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Note that the core does not guarantee exclusion against concurrent</div><div class='ctx'> 	 * drm_open(). Clients need to ensure this themselves, for example by</div><div class='del'>-	 * using drm_master_internal_acquire() and</div><div class='del'>-	 * drm_master_internal_release().</div><div class='add'>+	 * using drm_master_internal_acquire() and drm_master_internal_release().</div><div class='add'>+	 *</div><div class='add'>+	 * If the caller passes force, the client should ignore any present DRM</div><div class='add'>+	 * master and restore the display anyway.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This callback is optional.</div><div class='ctx'> 	 */</div><div class='del'>-	int (*restore)(struct drm_client_dev *client);</div><div class='add'>+	int (*restore)(struct drm_client_dev *client, bool force);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @hotplug:</div><div class='hunk'>@@ -63,6 +75,24 @@ struct drm_client_funcs {</div><div class='ctx'> 	 * This callback is optional.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*hotplug)(struct drm_client_dev *client);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @suspend:</div><div class='add'>+	 *</div><div class='add'>+	 * Called when suspending the device.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional.</div><div class='add'>+	 */</div><div class='add'>+	int (*suspend)(struct drm_client_dev *client);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @resume:</div><div class='add'>+	 *</div><div class='add'>+	 * Called when resuming the device from suspend.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional.</div><div class='add'>+	 */</div><div class='add'>+	int (*resume)(struct drm_client_dev *client);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -108,6 +138,21 @@ struct drm_client_dev {</div><div class='ctx'> 	struct drm_mode_set *modesets;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @suspended:</div><div class='add'>+	 *</div><div class='add'>+	 * The client has been suspended.</div><div class='add'>+	 */</div><div class='add'>+	bool suspended;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hotplug_pending:</div><div class='add'>+	 *</div><div class='add'>+	 * A hotplug event has been received while the client was suspended.</div><div class='add'>+	 * Try again on resume.</div><div class='add'>+	 */</div><div class='add'>+	bool hotplug_pending;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @hotplug_failed:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Set by client hotplug helpers if the hotplugging failed</div><div class='hunk'>@@ -121,10 +166,6 @@ int drm_client_init(struct drm_device *dev, struct drm_client_dev *client,</div><div class='ctx'> void drm_client_release(struct drm_client_dev *client);</div><div class='ctx'> void drm_client_register(struct drm_client_dev *client);</div><div class='ctx'> </div><div class='del'>-void drm_client_dev_unregister(struct drm_device *dev);</div><div class='del'>-void drm_client_dev_hotplug(struct drm_device *dev);</div><div class='del'>-void drm_client_dev_restore(struct drm_device *dev);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_client_buffer - DRM client buffer</div><div class='ctx'>  */</div><div class='hunk'>@@ -135,12 +176,11 @@ struct drm_client_buffer {</div><div class='ctx'> 	struct drm_client_dev *client;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @pitch: Buffer pitch</div><div class='del'>-	 */</div><div class='del'>-	u32 pitch;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @gem: GEM object backing this buffer</div><div class='add'>+	 *</div><div class='add'>+	 * FIXME: The DRM framebuffer holds a reference on its GEM</div><div class='add'>+	 * buffer objects. Do not use this field in new code and</div><div class='add'>+	 * update existing users.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_gem_object *gem;</div><div class='ctx'> </div><div class='hunk'>@@ -156,9 +196,12 @@ struct drm_client_buffer {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct drm_client_buffer *</div><div class='del'>-drm_client_framebuffer_create(struct drm_client_dev *client, u32 width, u32 height, u32 format);</div><div class='del'>-void drm_client_framebuffer_delete(struct drm_client_buffer *buffer);</div><div class='del'>-int drm_client_framebuffer_flush(struct drm_client_buffer *buffer, struct drm_rect *rect);</div><div class='add'>+drm_client_buffer_create_dumb(struct drm_client_dev *client, u32 width, u32 height, u32 format);</div><div class='add'>+void drm_client_buffer_delete(struct drm_client_buffer *buffer);</div><div class='add'>+int drm_client_buffer_flush(struct drm_client_buffer *buffer, struct drm_rect *rect);</div><div class='add'>+int drm_client_buffer_vmap_local(struct drm_client_buffer *buffer,</div><div class='add'>+				 struct iosys_map *map_copy);</div><div class='add'>+void drm_client_buffer_vunmap_local(struct drm_client_buffer *buffer);</div><div class='ctx'> int drm_client_buffer_vmap(struct drm_client_buffer *buffer,</div><div class='ctx'> 			   struct iosys_map *map);</div><div class='ctx'> void drm_client_buffer_vunmap(struct drm_client_buffer *buffer);</div><div class='hunk'>@@ -171,6 +214,7 @@ int drm_client_modeset_check(struct drm_client_dev *client);</div><div class='ctx'> int drm_client_modeset_commit_locked(struct drm_client_dev *client);</div><div class='ctx'> int drm_client_modeset_commit(struct drm_client_dev *client);</div><div class='ctx'> int drm_client_modeset_dpms(struct drm_client_dev *client, int mode);</div><div class='add'>+int drm_client_modeset_wait_for_vblank(struct drm_client_dev *client, unsigned int crtc_index);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * drm_client_for_each_modeset() - Iterate over client modesets</div><div class='hunk'>@@ -195,6 +239,4 @@ int drm_client_modeset_dpms(struct drm_client_dev *client, int mode);</div><div class='ctx'> 	drm_for_each_connector_iter(connector, iter) \</div><div class='ctx'> 		if (connector-&gt;connector_type != DRM_MODE_CONNECTOR_WRITEBACK)</div><div class='ctx'> </div><div class='del'>-void drm_client_debugfs_init(struct drm_device *dev);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_client_event.h b/include/drm/drm_client_event.h<br/>new file mode 100644<br/>index 000000000000..79369c755bc9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_client_event.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_client_event.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 or MIT */</div><div class='add'>+</div><div class='add'>+#ifndef _DRM_CLIENT_EVENT_H_</div><div class='add'>+#define _DRM_CLIENT_EVENT_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_device;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DRM_CLIENT)</div><div class='add'>+void drm_client_dev_unregister(struct drm_device *dev);</div><div class='add'>+void drm_client_dev_hotplug(struct drm_device *dev);</div><div class='add'>+void drm_client_dev_restore(struct drm_device *dev, bool force);</div><div class='add'>+void drm_client_dev_suspend(struct drm_device *dev);</div><div class='add'>+void drm_client_dev_resume(struct drm_device *dev);</div><div class='add'>+#else</div><div class='add'>+static inline void drm_client_dev_unregister(struct drm_device *dev)</div><div class='add'>+{ }</div><div class='add'>+static inline void drm_client_dev_hotplug(struct drm_device *dev)</div><div class='add'>+{ }</div><div class='add'>+static inline void drm_client_dev_restore(struct drm_device *dev, bool force)</div><div class='add'>+{ }</div><div class='add'>+static inline void drm_client_dev_suspend(struct drm_device *dev)</div><div class='add'>+{ }</div><div class='add'>+static inline void drm_client_dev_resume(struct drm_device *dev)</div><div class='add'>+{ }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h<br/>index ed81741036d7..5140691f476a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_color_mgmt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_color_mgmt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_color_mgmt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_color_mgmt.h</a></div><div class='hunk'>@@ -50,6 +50,22 @@ static inline u32 drm_color_lut_extract(u32 user_input, int bit_precision)</div><div class='ctx'> 					 (1 &lt;&lt; 16) - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * drm_color_lut32_extract - clamp and round LUT entries</div><div class='add'>+ * @user_input: input value</div><div class='add'>+ * @bit_precision: number of bits the hw LUT supports</div><div class='add'>+ *</div><div class='add'>+ * Extract U0.bit_precision from a U0.32 LUT value.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline u32 drm_color_lut32_extract(u32 user_input, int bit_precision)</div><div class='add'>+{</div><div class='add'>+	u64 max = (bit_precision &gt;= 64) ? ~0ULL : (1ULL &lt;&lt; bit_precision) - 1;</div><div class='add'>+</div><div class='add'>+	return DIV_ROUND_CLOSEST_ULL((u64)user_input * max,</div><div class='add'>+				     (1ULL &lt;&lt; 32) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u64 drm_color_ctm_s31_32_to_qm_n(u64 user_input, u32 m, u32 n);</div><div class='ctx'> </div><div class='ctx'> void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,</div><div class='hunk'>@@ -72,6 +88,18 @@ static inline int drm_color_lut_size(const struct drm_property_blob *blob)</div><div class='ctx'> 	return blob-&gt;length / sizeof(struct drm_color_lut);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * drm_color_lut32_size - calculate the number of entries in the extended LUT</div><div class='add'>+ * @blob: blob containing the LUT</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * The number of entries in the color LUT stored in @blob.</div><div class='add'>+ */</div><div class='add'>+static inline int drm_color_lut32_size(const struct drm_property_blob *blob)</div><div class='add'>+{</div><div class='add'>+	return blob-&gt;length / sizeof(struct drm_color_lut32);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum drm_color_encoding {</div><div class='ctx'> 	DRM_COLOR_YCBCR_BT601,</div><div class='ctx'> 	DRM_COLOR_YCBCR_BT709,</div><div class='hunk'>@@ -118,4 +146,33 @@ enum drm_color_lut_tests {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int drm_color_lut_check(const struct drm_property_blob *lut, u32 tests);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Gamma-LUT programming</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+typedef void (*drm_crtc_set_lut_func)(struct drm_crtc *, unsigned int, u16, u16, u16);</div><div class='add'>+</div><div class='add'>+void drm_crtc_load_gamma_888(struct drm_crtc *crtc, const struct drm_color_lut *lut,</div><div class='add'>+			     drm_crtc_set_lut_func set_gamma);</div><div class='add'>+void drm_crtc_load_gamma_565_from_888(struct drm_crtc *crtc, const struct drm_color_lut *lut,</div><div class='add'>+				      drm_crtc_set_lut_func set_gamma);</div><div class='add'>+void drm_crtc_load_gamma_555_from_888(struct drm_crtc *crtc, const struct drm_color_lut *lut,</div><div class='add'>+				      drm_crtc_set_lut_func set_gamma);</div><div class='add'>+</div><div class='add'>+void drm_crtc_fill_gamma_888(struct drm_crtc *crtc, drm_crtc_set_lut_func set_gamma);</div><div class='add'>+void drm_crtc_fill_gamma_565(struct drm_crtc *crtc, drm_crtc_set_lut_func set_gamma);</div><div class='add'>+void drm_crtc_fill_gamma_555(struct drm_crtc *crtc, drm_crtc_set_lut_func set_gamma);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Color-LUT programming</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void drm_crtc_load_palette_8(struct drm_crtc *crtc, const struct drm_color_lut *lut,</div><div class='add'>+			     drm_crtc_set_lut_func set_palette);</div><div class='add'>+</div><div class='add'>+void drm_crtc_fill_palette_332(struct drm_crtc *crtc, drm_crtc_set_lut_func set_palette);</div><div class='add'>+void drm_crtc_fill_palette_8(struct drm_crtc *crtc, drm_crtc_set_lut_func set_palette);</div><div class='add'>+</div><div class='add'>+int drm_color_lut32_check(const struct drm_property_blob *lut, u32 tests);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h<br/>new file mode 100644<br/>index 000000000000..a3a32f9f918c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_colorop.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_colorop.h</a></div><div class='hunk'>@@ -0,0 +1,464 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the "Software"),</div><div class='add'>+ * to deal in the Software without restriction, including without limitation</div><div class='add'>+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='add'>+ * and/or sell copies of the Software, and to permit persons to whom the</div><div class='add'>+ * Software is furnished to do so, subject to the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice shall be included in</div><div class='add'>+ * all copies or substantial portions of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='add'>+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='add'>+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='add'>+ * OTHER DEALINGS IN THE SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Authors: AMD</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DRM_COLOROP_H__</div><div class='add'>+#define __DRM_COLOROP_H__</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drm_mode_object.h&gt;</div><div class='add'>+#include &lt;drm/drm_mode.h&gt;</div><div class='add'>+#include &lt;drm/drm_property.h&gt;</div><div class='add'>+</div><div class='add'>+/* DRM colorop flags */</div><div class='add'>+#define DRM_COLOROP_FLAG_ALLOW_BYPASS	(1&lt;&lt;0)	/* Allow bypass on the drm_colorop */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum drm_colorop_curve_1d_type - type of 1D curve</div><div class='add'>+ *</div><div class='add'>+ * Describes a 1D curve to be applied by the DRM_COLOROP_1D_CURVE colorop.</div><div class='add'>+ */</div><div class='add'>+enum drm_colorop_curve_1d_type {</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_SRGB_EOTF:</div><div class='add'>+	 *</div><div class='add'>+	 * enum string "sRGB EOTF"</div><div class='add'>+	 *</div><div class='add'>+	 * sRGB piece-wise electro-optical transfer function. Transfer</div><div class='add'>+	 * characteristics as defined by IEC 61966-2-1 sRGB. Equivalent</div><div class='add'>+	 * to H.273 TransferCharacteristics code point 13 with</div><div class='add'>+	 * MatrixCoefficients set to 0.</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_SRGB_EOTF,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_SRGB_INV_EOTF:</div><div class='add'>+	 *</div><div class='add'>+	 * enum string "sRGB Inverse EOTF"</div><div class='add'>+	 *</div><div class='add'>+	 * The inverse of &amp;DRM_COLOROP_1D_CURVE_SRGB_EOTF</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_SRGB_INV_EOTF,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_PQ_125_EOTF:</div><div class='add'>+	 *</div><div class='add'>+	 * enum string "PQ 125 EOTF"</div><div class='add'>+	 *</div><div class='add'>+	 * The PQ transfer function, scaled by 125.0f, so that 10,000</div><div class='add'>+	 * nits correspond to 125.0f.</div><div class='add'>+	 *</div><div class='add'>+	 * Transfer characteristics of the PQ function as defined by</div><div class='add'>+	 * SMPTE ST 2084 (2014) for 10-, 12-, 14-, and 16-bit systems</div><div class='add'>+	 * and Rec. ITU-R BT.2100-2 perceptual quantization (PQ) system,</div><div class='add'>+	 * represented by H.273 TransferCharacteristics code point 16.</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_PQ_125_EOTF,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_PQ_125_INV_EOTF:</div><div class='add'>+	 *</div><div class='add'>+	 * enum string "PQ 125 Inverse EOTF"</div><div class='add'>+	 *</div><div class='add'>+	 * The inverse of DRM_COLOROP_1D_CURVE_PQ_125_EOTF.</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_PQ_125_INV_EOTF,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_BT2020_INV_OETF:</div><div class='add'>+	 *</div><div class='add'>+	 * enum string "BT.2020 Inverse OETF"</div><div class='add'>+	 *</div><div class='add'>+	 * The inverse of &amp;DRM_COLOROP_1D_CURVE_BT2020_OETF</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_BT2020_INV_OETF,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_BT2020_OETF:</div><div class='add'>+	 *</div><div class='add'>+	 * enum string "BT.2020 OETF"</div><div class='add'>+	 *</div><div class='add'>+	 * The BT.2020/BT.709 transfer function. The BT.709 and BT.2020</div><div class='add'>+	 * transfer functions are the same, the only difference is that</div><div class='add'>+	 * BT.2020 is defined with more precision for 10 and 12-bit</div><div class='add'>+	 * encodings.</div><div class='add'>+	 *</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_BT2020_OETF,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_GAMMA22:</div><div class='add'>+	 *</div><div class='add'>+	 * enum string "Gamma 2.2"</div><div class='add'>+	 *</div><div class='add'>+	 * A gamma 2.2 power function. This applies a power curve with</div><div class='add'>+	 * gamma value of 2.2 to the input values.</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_GAMMA22,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_GAMMA22_INV:</div><div class='add'>+	 *</div><div class='add'>+	 * enum string "Gamma 2.2 Inverse"</div><div class='add'>+	 *</div><div class='add'>+	 * The inverse of &amp;DRM_COLOROP_1D_CURVE_GAMMA22</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_GAMMA22_INV,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_COLOROP_1D_CURVE_COUNT:</div><div class='add'>+	 *</div><div class='add'>+	 * enum value denoting the size of the enum</div><div class='add'>+	 */</div><div class='add'>+	DRM_COLOROP_1D_CURVE_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_colorop_state - mutable colorop state</div><div class='add'>+ */</div><div class='add'>+struct drm_colorop_state {</div><div class='add'>+	/** @colorop: backpointer to the colorop */</div><div class='add'>+	struct drm_colorop *colorop;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Color properties</div><div class='add'>+	 *</div><div class='add'>+	 * The following fields are not always valid, their usage depends</div><div class='add'>+	 * on the colorop type. See their associated comment for more</div><div class='add'>+	 * information.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @bypass:</div><div class='add'>+	 *</div><div class='add'>+	 * When the property BYPASS exists on this colorop, this stores</div><div class='add'>+	 * the requested bypass state: true if colorop shall be bypassed,</div><div class='add'>+	 * false if colorop is enabled.</div><div class='add'>+	 */</div><div class='add'>+	bool bypass;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @curve_1d_type:</div><div class='add'>+	 *</div><div class='add'>+	 * Type of 1D curve.</div><div class='add'>+	 */</div><div class='add'>+	enum drm_colorop_curve_1d_type curve_1d_type;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @multiplier:</div><div class='add'>+	 *</div><div class='add'>+	 * Multiplier to 'gain' the plane. Format is S31.32 sign-magnitude.</div><div class='add'>+	 */</div><div class='add'>+	uint64_t multiplier;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @data:</div><div class='add'>+	 *</div><div class='add'>+	 * Data blob for any TYPE that requires such a blob. The</div><div class='add'>+	 * interpretation of the blob is TYPE-specific.</div><div class='add'>+	 *</div><div class='add'>+	 * See the &amp;drm_colorop_type documentation for how blob is laid</div><div class='add'>+	 * out.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property_blob *data;</div><div class='add'>+</div><div class='add'>+	/** @state: backpointer to global drm_atomic_state */</div><div class='add'>+	struct drm_atomic_state *state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_colorop - DRM color operation control structure</div><div class='add'>+ *</div><div class='add'>+ * A colorop represents one color operation. They can be chained via</div><div class='add'>+ * the 'next' pointer to build a color pipeline.</div><div class='add'>+ *</div><div class='add'>+ * Since colorops cannot stand-alone and are used to describe colorop</div><div class='add'>+ * operations on a plane they don't have their own locking mechanism but</div><div class='add'>+ * are locked and programmed along with their associated &amp;drm_plane.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct drm_colorop {</div><div class='add'>+	/** @dev: parent DRM device */</div><div class='add'>+	struct drm_device *dev;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @head:</div><div class='add'>+	 *</div><div class='add'>+	 * List of all colorops on @dev, linked from &amp;drm_mode_config.colorop_list.</div><div class='add'>+	 * Invariant over the lifetime of @dev and therefore does not need</div><div class='add'>+	 * locking.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head head;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @index: Position inside the mode_config.list, can be used as an array</div><div class='add'>+	 * index. It is invariant over the lifetime of the colorop.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int index;</div><div class='add'>+</div><div class='add'>+	/** @base: base mode object */</div><div class='add'>+	struct drm_mode_object base;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @plane:</div><div class='add'>+	 *</div><div class='add'>+	 * The plane on which the colorop sits. A drm_colorop is always unique</div><div class='add'>+	 * to a plane.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_plane *plane;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @state:</div><div class='add'>+	 *</div><div class='add'>+	 * Current atomic state for this colorop.</div><div class='add'>+	 *</div><div class='add'>+	 * This is protected by @mutex. Note that nonblocking atomic commits</div><div class='add'>+	 * access the current colorop state without taking locks.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_colorop_state *state;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Color properties</div><div class='add'>+	 *</div><div class='add'>+	 * The following fields are not always valid, their usage depends</div><div class='add'>+	 * on the colorop type. See their associated comment for more</div><div class='add'>+	 * information.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/** @properties: property tracking for this colorop */</div><div class='add'>+	struct drm_object_properties properties;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @type:</div><div class='add'>+	 *</div><div class='add'>+	 * Read-only</div><div class='add'>+	 * Type of color operation</div><div class='add'>+	 */</div><div class='add'>+	enum drm_colorop_type type;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @next:</div><div class='add'>+	 *</div><div class='add'>+	 * Read-only</div><div class='add'>+	 * Pointer to next drm_colorop in pipeline</div><div class='add'>+	 */</div><div class='add'>+	struct drm_colorop *next;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @type_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Read-only "TYPE" property for specifying the type of</div><div class='add'>+	 * this color operation. The type is enum drm_colorop_type.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *type_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @bypass_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Boolean property to control enablement of the color</div><div class='add'>+	 * operation. Only present if DRM_COLOROP_FLAG_ALLOW_BYPASS</div><div class='add'>+	 * flag is set. When present, setting bypass to "true" shall</div><div class='add'>+	 * always be supported to allow compositors to quickly fall</div><div class='add'>+	 * back to alternate methods of color processing. This is</div><div class='add'>+	 * important since setting color operations can fail due to</div><div class='add'>+	 * unique HW constraints.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *bypass_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @size:</div><div class='add'>+	 *</div><div class='add'>+	 * Number of entries of the custom LUT. This should be read-only.</div><div class='add'>+	 */</div><div class='add'>+	uint32_t size;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @lut1d_interpolation:</div><div class='add'>+	 *</div><div class='add'>+	 * Read-only</div><div class='add'>+	 * Interpolation for DRM_COLOROP_1D_LUT</div><div class='add'>+	 */</div><div class='add'>+	enum drm_colorop_lut1d_interpolation_type lut1d_interpolation;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @lut3d_interpolation:</div><div class='add'>+	 *</div><div class='add'>+	 * Read-only</div><div class='add'>+	 * Interpolation for DRM_COLOROP_3D_LUT</div><div class='add'>+	 */</div><div class='add'>+	enum drm_colorop_lut3d_interpolation_type lut3d_interpolation;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @lut1d_interpolation_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Read-only property for DRM_COLOROP_1D_LUT interpolation</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *lut1d_interpolation_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @curve_1d_type_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Sub-type for DRM_COLOROP_1D_CURVE type.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *curve_1d_type_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @multiplier_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Multiplier property for plane gain</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *multiplier_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @size_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Size property for custom LUT from userspace.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *size_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @lut3d_interpolation_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Read-only property for DRM_COLOROP_3D_LUT interpolation</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *lut3d_interpolation_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @data_property:</div><div class='add'>+	 *</div><div class='add'>+	 * blob property for any TYPE that requires a blob of data,</div><div class='add'>+	 * such as 1DLUT, CTM, 3DLUT, etc.</div><div class='add'>+	 *</div><div class='add'>+	 * The way this blob is interpreted depends on the TYPE of</div><div class='add'>+	 * this</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *data_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @next_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Read-only property to next colorop in the pipeline</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *next_property;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define obj_to_colorop(x) container_of(x, struct drm_colorop, base)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_colorop_find - look up a Colorop object from its ID</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @file_priv: drm file to check for lease against.</div><div class='add'>+ * @id: &amp;drm_mode_object ID</div><div class='add'>+ *</div><div class='add'>+ * This can be used to look up a Colorop from its userspace ID. Only used by</div><div class='add'>+ * drivers for legacy IOCTLs and interface, nowadays extensions to the KMS</div><div class='add'>+ * userspace interface should be done using &amp;drm_property.</div><div class='add'>+ */</div><div class='add'>+static inline struct drm_colorop *drm_colorop_find(struct drm_device *dev,</div><div class='add'>+						   struct drm_file *file_priv,</div><div class='add'>+						   uint32_t id)</div><div class='add'>+{</div><div class='add'>+	struct drm_mode_object *mo;</div><div class='add'>+</div><div class='add'>+	mo = drm_mode_object_find(dev, file_priv, id, DRM_MODE_OBJECT_COLOROP);</div><div class='add'>+	return mo ? obj_to_colorop(mo) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void drm_colorop_pipeline_destroy(struct drm_device *dev);</div><div class='add'>+void drm_colorop_cleanup(struct drm_colorop *colorop);</div><div class='add'>+</div><div class='add'>+int drm_plane_colorop_curve_1d_init(struct drm_device *dev, struct drm_colorop *colorop,</div><div class='add'>+				    struct drm_plane *plane, u64 supported_tfs, uint32_t flags);</div><div class='add'>+int drm_plane_colorop_curve_1d_lut_init(struct drm_device *dev, struct drm_colorop *colorop,</div><div class='add'>+					struct drm_plane *plane, uint32_t lut_size,</div><div class='add'>+					enum drm_colorop_lut1d_interpolation_type interpolation,</div><div class='add'>+					uint32_t flags);</div><div class='add'>+int drm_plane_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop *colorop,</div><div class='add'>+				   struct drm_plane *plane, uint32_t flags);</div><div class='add'>+int drm_plane_colorop_mult_init(struct drm_device *dev, struct drm_colorop *colorop,</div><div class='add'>+				struct drm_plane *plane, uint32_t flags);</div><div class='add'>+int drm_plane_colorop_3dlut_init(struct drm_device *dev, struct drm_colorop *colorop,</div><div class='add'>+				 struct drm_plane *plane,</div><div class='add'>+				 uint32_t lut_size,</div><div class='add'>+				 enum drm_colorop_lut3d_interpolation_type interpolation,</div><div class='add'>+				 uint32_t flags);</div><div class='add'>+</div><div class='add'>+struct drm_colorop_state *</div><div class='add'>+drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop);</div><div class='add'>+</div><div class='add'>+void drm_colorop_atomic_destroy_state(struct drm_colorop *colorop,</div><div class='add'>+				      struct drm_colorop_state *state);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_colorop_reset - reset colorop atomic state</div><div class='add'>+ * @colorop: drm colorop</div><div class='add'>+ *</div><div class='add'>+ * Resets the atomic state for @colorop by freeing the state pointer (which might</div><div class='add'>+ * be NULL, e.g. at driver load time) and allocating a new empty state object.</div><div class='add'>+ */</div><div class='add'>+void drm_colorop_reset(struct drm_colorop *colorop);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_colorop_index - find the index of a registered colorop</div><div class='add'>+ * @colorop: colorop to find index for</div><div class='add'>+ *</div><div class='add'>+ * Given a registered colorop, return the index of that colorop within a DRM</div><div class='add'>+ * device's list of colorops.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int drm_colorop_index(const struct drm_colorop *colorop)</div><div class='add'>+{</div><div class='add'>+	return colorop-&gt;index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define drm_for_each_colorop(colorop, dev) \</div><div class='add'>+	list_for_each_entry(colorop, &amp;(dev)-&gt;mode_config.colorop_list, head)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_get_colorop_type_name - return a string for colorop type</div><div class='add'>+ * @type: colorop type to compute name of</div><div class='add'>+ *</div><div class='add'>+ * In contrast to the other drm_get_*_name functions this one here returns a</div><div class='add'>+ * const pointer and hence is threadsafe.</div><div class='add'>+ */</div><div class='add'>+const char *drm_get_colorop_type_name(enum drm_colorop_type type);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_get_colorop_curve_1d_type_name - return a string for 1D curve type</div><div class='add'>+ * @type: 1d curve type to compute name of</div><div class='add'>+ *</div><div class='add'>+ * In contrast to the other drm_get_*_name functions this one here returns a</div><div class='add'>+ * const pointer and hence is threadsafe.</div><div class='add'>+ */</div><div class='add'>+const char *drm_get_colorop_curve_1d_type_name(enum drm_colorop_curve_1d_type type);</div><div class='add'>+</div><div class='add'>+const char *</div><div class='add'>+drm_get_colorop_lut1d_interpolation_name(enum drm_colorop_lut1d_interpolation_type type);</div><div class='add'>+</div><div class='add'>+const char *</div><div class='add'>+drm_get_colorop_lut3d_interpolation_name(enum drm_colorop_lut3d_interpolation_type type);</div><div class='add'>+</div><div class='add'>+void drm_colorop_set_next_property(struct drm_colorop *colorop, struct drm_colorop *next);</div><div class='add'>+</div><div class='add'>+#endif /* __DRM_COLOROP_H__ */</div><div class='head'>diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h<br/>index fe88d7fc6b8f..8f34f4b8183d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_connector.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_connector.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_connector.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_connector.h</a></div><div class='hunk'>@@ -38,13 +38,17 @@ struct drm_connector_helper_funcs;</div><div class='ctx'> struct drm_modeset_acquire_ctx;</div><div class='ctx'> struct drm_device;</div><div class='ctx'> struct drm_crtc;</div><div class='add'>+struct drm_display_mode;</div><div class='ctx'> struct drm_encoder;</div><div class='ctx'> struct drm_panel;</div><div class='ctx'> struct drm_property;</div><div class='ctx'> struct drm_property_blob;</div><div class='ctx'> struct drm_printer;</div><div class='ctx'> struct drm_privacy_screen;</div><div class='add'>+struct drm_edid;</div><div class='ctx'> struct edid;</div><div class='add'>+struct hdmi_codec_daifmt;</div><div class='add'>+struct hdmi_codec_params;</div><div class='ctx'> struct i2c_adapter;</div><div class='ctx'> </div><div class='ctx'> enum drm_connector_force {</div><div class='hunk'>@@ -201,6 +205,13 @@ enum drm_connector_tv_mode {</div><div class='ctx'> 	DRM_MODE_TV_MODE_SECAM,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @DRM_MODE_TV_MODE_MONOCHROME: Use timings appropriate to</div><div class='add'>+	 * the DRM mode, including equalizing pulses for a 525-line</div><div class='add'>+	 * or 625-line mode, with no pedestal or color encoding.</div><div class='add'>+	 */</div><div class='add'>+	DRM_MODE_TV_MODE_MONOCHROME,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @DRM_MODE_TV_MODE_MAX: Number of analog TV output modes.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Internal implementation detail; this is not uABI.</div><div class='hunk'>@@ -369,6 +380,32 @@ enum drm_panel_orientation {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum drm_hdmi_broadcast_rgb - Broadcast RGB Selection for an HDMI @drm_connector</div><div class='add'>+ */</div><div class='add'>+enum drm_hdmi_broadcast_rgb {</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_HDMI_BROADCAST_RGB_AUTO: The RGB range is selected</div><div class='add'>+	 * automatically based on the mode.</div><div class='add'>+	 */</div><div class='add'>+	DRM_HDMI_BROADCAST_RGB_AUTO,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_HDMI_BROADCAST_RGB_FULL: Full range RGB is forced.</div><div class='add'>+	 */</div><div class='add'>+	DRM_HDMI_BROADCAST_RGB_FULL,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_HDMI_BROADCAST_RGB_LIMITED: Limited range RGB is forced.</div><div class='add'>+	 */</div><div class='add'>+	DRM_HDMI_BROADCAST_RGB_LIMITED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *</div><div class='add'>+drm_hdmi_connector_get_broadcast_rgb_name(enum drm_hdmi_broadcast_rgb broadcast_rgb);</div><div class='add'>+const char *</div><div class='add'>+drm_hdmi_connector_get_output_format_name(enum hdmi_colorspace fmt);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct drm_monitor_range_info - Panel's Monitor range in EDID for</div><div class='ctx'>  * &amp;drm_display_info</div><div class='ctx'>  *</div><div class='hunk'>@@ -437,14 +474,6 @@ enum drm_privacy_screen_status {</div><div class='ctx'>  *</div><div class='ctx'>  * DP definitions come from the DP v2.0 spec</div><div class='ctx'>  * HDMI definitions come from the CTA-861-H spec</div><div class='del'>- *</div><div class='del'>- * A note on YCC and RGB variants:</div><div class='del'>- *</div><div class='del'>- * Since userspace is not aware of the encoding on the wire</div><div class='del'>- * (RGB or YCbCr), drivers are free to pick the appropriate</div><div class='del'>- * variant, regardless of what userspace selects. E.g., if</div><div class='del'>- * BT2020_RGB is selected by userspace a driver will pick</div><div class='del'>- * BT2020_YCC if the encoding on the wire is YUV444 or YUV420.</div><div class='ctx'>   *</div><div class='ctx'>  * @DRM_MODE_COLORIMETRY_DEFAULT:</div><div class='ctx'>  *   Driver specific behavior.</div><div class='hunk'>@@ -771,6 +800,11 @@ struct drm_display_info {</div><div class='ctx'> 	struct drm_hdmi_info hdmi;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @hdr_sink_metadata: HDR Metadata Information read from sink</div><div class='add'>+	 */</div><div class='add'>+	struct hdr_sink_metadata hdr_sink_metadata;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @non_desktop: Non desktop display (HMD).</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool non_desktop;</div><div class='hunk'>@@ -814,7 +848,9 @@ struct drm_display_info {</div><div class='ctx'> 	int vics_len;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @quirks: EDID based quirks. Internal to EDID parsing.</div><div class='add'>+	 * @quirks: EDID based quirks. DRM core and drivers can query the</div><div class='add'>+	 * @drm_edid_quirk quirks using drm_edid_has_quirk(), the rest of</div><div class='add'>+	 * the quirks also tracked here are internal to EDID parsing.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32 quirks;</div><div class='ctx'> </div><div class='hunk'>@@ -888,6 +924,82 @@ struct drm_tv_connector_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct drm_connector_hdmi_infoframe - HDMI Infoframe container</div><div class='add'>+ */</div><div class='add'>+struct drm_connector_hdmi_infoframe {</div><div class='add'>+	/**</div><div class='add'>+	 * @data: HDMI Infoframe structure</div><div class='add'>+	 */</div><div class='add'>+	union hdmi_infoframe data;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @set: Is the content of @data valid?</div><div class='add'>+	 */</div><div class='add'>+	bool set;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct drm_connector_hdmi_state - HDMI state container</div><div class='add'>+ */</div><div class='add'>+struct drm_connector_hdmi_state {</div><div class='add'>+	/**</div><div class='add'>+	 * @broadcast_rgb: Connector property to pass the</div><div class='add'>+	 * Broadcast RGB selection value.</div><div class='add'>+	 */</div><div class='add'>+	enum drm_hdmi_broadcast_rgb broadcast_rgb;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @infoframes: HDMI Infoframes matching that state</div><div class='add'>+	 */</div><div class='add'>+	struct {</div><div class='add'>+		/**</div><div class='add'>+		 * @avi: AVI Infoframes structure matching our</div><div class='add'>+		 * state.</div><div class='add'>+		 */</div><div class='add'>+		struct drm_connector_hdmi_infoframe avi;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * @hdr_drm: DRM (Dynamic Range and Mastering)</div><div class='add'>+		 * Infoframes structure matching our state.</div><div class='add'>+		 */</div><div class='add'>+		struct drm_connector_hdmi_infoframe hdr_drm;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * @spd: SPD Infoframes structure matching our</div><div class='add'>+		 * state.</div><div class='add'>+		 */</div><div class='add'>+		struct drm_connector_hdmi_infoframe spd;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * @vendor: HDMI Vendor Infoframes structure</div><div class='add'>+		 * matching our state.</div><div class='add'>+		 */</div><div class='add'>+		struct drm_connector_hdmi_infoframe hdmi;</div><div class='add'>+	} infoframes;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @is_limited_range: Is the output supposed to use a limited</div><div class='add'>+	 * RGB Quantization Range or not?</div><div class='add'>+	 */</div><div class='add'>+	bool is_limited_range;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @output_bpc: Bits per color channel to output.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int output_bpc;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @output_format: Pixel format to output in.</div><div class='add'>+	 */</div><div class='add'>+	enum hdmi_colorspace output_format;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @tmds_char_rate: TMDS Character Rate, in Hz.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long long tmds_char_rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct drm_connector_state - mutable connector state</div><div class='ctx'>  */</div><div class='ctx'> struct drm_connector_state {</div><div class='hunk'>@@ -1031,6 +1143,156 @@ struct drm_connector_state {</div><div class='ctx'> 	 * DRM blob property for HDR output metadata</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_property_blob *hdr_output_metadata;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi: HDMI-related variable and properties. Filled by</div><div class='add'>+	 * @drm_atomic_helper_connector_hdmi_check().</div><div class='add'>+	 */</div><div class='add'>+	struct drm_connector_hdmi_state hdmi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct drm_connector_hdmi_audio_funcs {</div><div class='add'>+	/**</div><div class='add'>+	 * @startup:</div><div class='add'>+	 *</div><div class='add'>+	 * Called when ASoC starts an audio stream setup. The</div><div class='add'>+	 * @startup() is optional.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*startup)(struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @prepare:</div><div class='add'>+	 * Configures HDMI-encoder for audio stream. Can be called</div><div class='add'>+	 * multiple times for each setup. Mandatory.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*prepare)(struct drm_connector *connector,</div><div class='add'>+		       struct hdmi_codec_daifmt *fmt,</div><div class='add'>+		       struct hdmi_codec_params *hparms);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @shutdown:</div><div class='add'>+	 *</div><div class='add'>+	 * Shut down the audio stream. Mandatory.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	void (*shutdown)(struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @mute_stream:</div><div class='add'>+	 *</div><div class='add'>+	 * Mute/unmute HDMI audio stream. The @mute_stream callback is</div><div class='add'>+	 * optional.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*mute_stream)(struct drm_connector *connector,</div><div class='add'>+			   bool enable, int direction);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void drm_connector_cec_phys_addr_invalidate(struct drm_connector *connector);</div><div class='add'>+void drm_connector_cec_phys_addr_set(struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_connector_cec_funcs - drm_hdmi_connector control functions</div><div class='add'>+ */</div><div class='add'>+struct drm_connector_cec_funcs {</div><div class='add'>+	/**</div><div class='add'>+	 * @phys_addr_invalidate: mark CEC physical address as invalid</div><div class='add'>+	 *</div><div class='add'>+	 * The callback to mark CEC physical address as invalid, abstracting</div><div class='add'>+	 * the operation.</div><div class='add'>+	 */</div><div class='add'>+	void (*phys_addr_invalidate)(struct drm_connector *connector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @phys_addr_set: set CEC physical address</div><div class='add'>+	 *</div><div class='add'>+	 * The callback to set CEC physical address, abstracting the operation.</div><div class='add'>+	 */</div><div class='add'>+	void (*phys_addr_set)(struct drm_connector *connector, u16 addr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_connector_hdmi_funcs - drm_hdmi_connector control functions</div><div class='add'>+ */</div><div class='add'>+struct drm_connector_hdmi_funcs {</div><div class='add'>+	/**</div><div class='add'>+	 * @tmds_char_rate_valid:</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is invoked at atomic_check time to figure out</div><div class='add'>+	 * whether a particular TMDS character rate is supported by the</div><div class='add'>+	 * driver.</div><div class='add'>+	 *</div><div class='add'>+	 * The @tmds_char_rate_valid callback is optional.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 *</div><div class='add'>+	 * Either &amp;drm_mode_status.MODE_OK or one of the failure reasons</div><div class='add'>+	 * in &amp;enum drm_mode_status.</div><div class='add'>+	 */</div><div class='add'>+	enum drm_mode_status</div><div class='add'>+	(*tmds_char_rate_valid)(const struct drm_connector *connector,</div><div class='add'>+				const struct drm_display_mode *mode,</div><div class='add'>+				unsigned long long tmds_rate);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @clear_infoframe:</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is invoked through</div><div class='add'>+	 * @drm_atomic_helper_connector_hdmi_update_infoframes during a</div><div class='add'>+	 * commit to clear the infoframes into the hardware. It will be</div><div class='add'>+	 * called multiple times, once for every disabled infoframe</div><div class='add'>+	 * type.</div><div class='add'>+	 *</div><div class='add'>+	 * The @clear_infoframe callback is optional.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*clear_infoframe)(struct drm_connector *connector,</div><div class='add'>+			       enum hdmi_infoframe_type type);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @write_infoframe:</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is invoked through</div><div class='add'>+	 * @drm_atomic_helper_connector_hdmi_update_infoframes during a</div><div class='add'>+	 * commit to program the infoframes into the hardware. It will</div><div class='add'>+	 * be called multiple times, once for every updated infoframe</div><div class='add'>+	 * type.</div><div class='add'>+	 *</div><div class='add'>+	 * The @write_infoframe callback is mandatory.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * 0 on success, a negative error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*write_infoframe)(struct drm_connector *connector,</div><div class='add'>+			       enum hdmi_infoframe_type type,</div><div class='add'>+			       const u8 *buffer, size_t len);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @read_edid:</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is used by the framework as a replacement for reading</div><div class='add'>+	 * the EDID from connector-&gt;ddc. It is still recommended to provide</div><div class='add'>+	 * connector-&gt;ddc instead of implementing this callback. Returned EDID</div><div class='add'>+	 * should be freed via the drm_edid_free().</div><div class='add'>+	 *</div><div class='add'>+	 * The @read_edid callback is optional.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 * Valid EDID on success, NULL in case of failure.</div><div class='add'>+	 */</div><div class='add'>+	const struct drm_edid *(*read_edid)(struct drm_connector *connector);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1494,6 +1756,133 @@ struct drm_cmdline_mode {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct drm_connector_hdmi_audio - DRM gemeric HDMI Codec-related structure</div><div class='add'>+ *</div><div class='add'>+ * HDMI drivers usually incorporate a HDMI Codec. This structure expresses the</div><div class='add'>+ * generic HDMI Codec as used by the DRM HDMI Codec framework.</div><div class='add'>+ */</div><div class='add'>+struct drm_connector_hdmi_audio {</div><div class='add'>+	/**</div><div class='add'>+	 * @funcs:</div><div class='add'>+	 *</div><div class='add'>+	 * Implementation of the HDMI codec functionality to be used by the DRM</div><div class='add'>+	 * HDMI Codec framework.</div><div class='add'>+	 */</div><div class='add'>+	const struct drm_connector_hdmi_audio_funcs *funcs;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @codec_pdev:</div><div class='add'>+	 *</div><div class='add'>+	 * Platform device created to hold the HDMI Codec. It will be</div><div class='add'>+	 * automatically unregistered during drm_connector_cleanup().</div><div class='add'>+	 */</div><div class='add'>+	struct platform_device *codec_pdev;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @lock:</div><div class='add'>+	 *</div><div class='add'>+	 * Mutex to protect @last_state, @plugged_cb and @plugged_cb_dev.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @plugged_cb:</div><div class='add'>+	 *</div><div class='add'>+	 * Callback to be called when the HDMI sink get plugged to or unplugged</div><div class='add'>+	 * from this connector. This is assigned by the framework when</div><div class='add'>+	 * requested by the ASoC code.</div><div class='add'>+	 */</div><div class='add'>+	void (*plugged_cb)(struct device *dev, bool plugged);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @plugged_cb_dev:</div><div class='add'>+	 *</div><div class='add'>+	 * The data for @plugged_cb(). It is being provided by the ASoC.</div><div class='add'>+	 */</div><div class='add'>+	struct device *plugged_cb_dev;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @last_state:</div><div class='add'>+	 *</div><div class='add'>+	 * Last plugged state recored by the framework. It is used to correctly</div><div class='add'>+	 * report the state to @plugged_cb().</div><div class='add'>+	 */</div><div class='add'>+	bool last_state;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @dai_port:</div><div class='add'>+	 *</div><div class='add'>+	 * The port in DT that is used for the Codec DAI.</div><div class='add'>+	 */</div><div class='add'>+	int dai_port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct drm_connector_hdmi - DRM Connector HDMI-related structure</div><div class='add'>+ */</div><div class='add'>+struct drm_connector_hdmi {</div><div class='add'>+#define DRM_CONNECTOR_HDMI_VENDOR_LEN	8</div><div class='add'>+	/**</div><div class='add'>+	 * @vendor: HDMI Controller Vendor Name</div><div class='add'>+	 */</div><div class='add'>+	unsigned char vendor[DRM_CONNECTOR_HDMI_VENDOR_LEN] __nonstring;</div><div class='add'>+</div><div class='add'>+#define DRM_CONNECTOR_HDMI_PRODUCT_LEN	16</div><div class='add'>+	/**</div><div class='add'>+	 * @product: HDMI Controller Product Name</div><div class='add'>+	 */</div><div class='add'>+	unsigned char product[DRM_CONNECTOR_HDMI_PRODUCT_LEN] __nonstring;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @supported_formats: Bitmask of @hdmi_colorspace</div><div class='add'>+	 * supported by the controller.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long supported_formats;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @funcs: HDMI connector Control Functions</div><div class='add'>+	 */</div><div class='add'>+	const struct drm_connector_hdmi_funcs *funcs;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @infoframes: Current Infoframes output by the connector</div><div class='add'>+	 */</div><div class='add'>+	struct {</div><div class='add'>+		/**</div><div class='add'>+		 * @lock: Mutex protecting against concurrent access to</div><div class='add'>+		 * the infoframes, most notably between KMS and ALSA.</div><div class='add'>+		 */</div><div class='add'>+		struct mutex lock;</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * @audio: Current Audio Infoframes structure. Protected</div><div class='add'>+		 * by @lock.</div><div class='add'>+		 */</div><div class='add'>+		struct drm_connector_hdmi_infoframe audio;</div><div class='add'>+	} infoframes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_connector_cec - DRM Connector CEC-related structure</div><div class='add'>+ */</div><div class='add'>+struct drm_connector_cec {</div><div class='add'>+	/**</div><div class='add'>+	 * @mutex: protects all fields in this structure.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @funcs: CEC Control Functions</div><div class='add'>+	 */</div><div class='add'>+	const struct drm_connector_cec_funcs *funcs;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @data: CEC implementation-specific data</div><div class='add'>+	 */</div><div class='add'>+	void *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct drm_connector - central DRM connector control structure</div><div class='ctx'>  *</div><div class='ctx'>  * Each connector may be connected to one or more CRTCs, or may be clonable by</div><div class='hunk'>@@ -1636,8 +2025,12 @@ struct drm_connector {</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @edid_blob_ptr: DRM property containing EDID if present. Protected by</div><div class='del'>-	 * &amp;drm_mode_config.mutex. This should be updated only by calling</div><div class='add'>+	 * &amp;drm_mode_config.mutex.</div><div class='add'>+	 *</div><div class='add'>+	 * This must be updated only by calling drm_edid_connector_update() or</div><div class='ctx'> 	 * drm_connector_update_edid_property().</div><div class='add'>+	 *</div><div class='add'>+	 * This must not be used by drivers directly.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_property_blob *edid_blob_ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -1676,6 +2069,11 @@ struct drm_connector {</div><div class='ctx'> 	struct drm_property_blob *path_blob_ptr;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @max_bpc: Maximum bits per color channel the connector supports.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int max_bpc;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @max_bpc_property: Default connector property for the max bpc to be</div><div class='ctx'> 	 * driven out of the connector.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1699,6 +2097,12 @@ struct drm_connector {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_property *privacy_screen_hw_state_property;</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @broadcast_rgb_property: Connector property to set the</div><div class='add'>+	 * Broadcast RGB selection to output with.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *broadcast_rgb_property;</div><div class='add'>+</div><div class='ctx'> #define DRM_CONNECTOR_POLL_HPD (1 &lt;&lt; 0)</div><div class='ctx'> #define DRM_CONNECTOR_POLL_CONNECT (1 &lt;&lt; 1)</div><div class='ctx'> #define DRM_CONNECTOR_POLL_DISCONNECT (1 &lt;&lt; 2)</div><div class='hunk'>@@ -1774,8 +2178,11 @@ struct drm_connector {</div><div class='ctx'> 	struct drm_encoder *encoder;</div><div class='ctx'> </div><div class='ctx'> #define MAX_ELD_BYTES	128</div><div class='del'>-	/** @eld: EDID-like data, if present */</div><div class='add'>+	/** @eld: EDID-like data, if present, protected by @eld_mutex */</div><div class='ctx'> 	uint8_t eld[MAX_ELD_BYTES];</div><div class='add'>+	/** @eld_mutex: protection for concurrenct access to @eld */</div><div class='add'>+	struct mutex eld_mutex;</div><div class='add'>+</div><div class='ctx'> 	/** @latency_present: AV delay info from ELD, if found */</div><div class='ctx'> 	bool latency_present[2];</div><div class='ctx'> 	/**</div><div class='hunk'>@@ -1884,8 +2291,20 @@ struct drm_connector {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct llist_node free_node;</div><div class='ctx'> </div><div class='del'>-	/** @hdr_sink_metadata: HDR Metadata Information read from sink */</div><div class='del'>-	struct hdr_sink_metadata hdr_sink_metadata;</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi: HDMI-related variable and properties.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_connector_hdmi hdmi;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hdmi_audio: HDMI codec properties and non-DRM state.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_connector_hdmi_audio hdmi_audio;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @cec: CEC-related data.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_connector_cec cec;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define obj_to_connector(x) container_of(x, struct drm_connector, base)</div><div class='hunk'>@@ -1894,6 +2313,11 @@ int drm_connector_init(struct drm_device *dev,</div><div class='ctx'> 		       struct drm_connector *connector,</div><div class='ctx'> 		       const struct drm_connector_funcs *funcs,</div><div class='ctx'> 		       int connector_type);</div><div class='add'>+int drm_connector_dynamic_init(struct drm_device *dev,</div><div class='add'>+			       struct drm_connector *connector,</div><div class='add'>+			       const struct drm_connector_funcs *funcs,</div><div class='add'>+			       int connector_type,</div><div class='add'>+			       struct i2c_adapter *ddc);</div><div class='ctx'> int drm_connector_init_with_ddc(struct drm_device *dev,</div><div class='ctx'> 				struct drm_connector *connector,</div><div class='ctx'> 				const struct drm_connector_funcs *funcs,</div><div class='hunk'>@@ -1904,8 +2328,18 @@ int drmm_connector_init(struct drm_device *dev,</div><div class='ctx'> 			const struct drm_connector_funcs *funcs,</div><div class='ctx'> 			int connector_type,</div><div class='ctx'> 			struct i2c_adapter *ddc);</div><div class='add'>+int drmm_connector_hdmi_init(struct drm_device *dev,</div><div class='add'>+			     struct drm_connector *connector,</div><div class='add'>+			     const char *vendor, const char *product,</div><div class='add'>+			     const struct drm_connector_funcs *funcs,</div><div class='add'>+			     const struct drm_connector_hdmi_funcs *hdmi_funcs,</div><div class='add'>+			     int connector_type,</div><div class='add'>+			     struct i2c_adapter *ddc,</div><div class='add'>+			     unsigned long supported_formats,</div><div class='add'>+			     unsigned int max_bpc);</div><div class='ctx'> void drm_connector_attach_edid_property(struct drm_connector *connector);</div><div class='ctx'> int drm_connector_register(struct drm_connector *connector);</div><div class='add'>+int drm_connector_dynamic_register(struct drm_connector *connector);</div><div class='ctx'> void drm_connector_unregister(struct drm_connector *connector);</div><div class='ctx'> int drm_connector_attach_encoder(struct drm_connector *connector,</div><div class='ctx'> 				      struct drm_encoder *encoder);</div><div class='hunk'>@@ -2014,6 +2448,7 @@ int drm_connector_attach_scaling_mode_property(struct drm_connector *connector,</div><div class='ctx'> 					       u32 scaling_mode_mask);</div><div class='ctx'> int drm_connector_attach_vrr_capable_property(</div><div class='ctx'> 		struct drm_connector *connector);</div><div class='add'>+int drm_connector_attach_broadcast_rgb_property(struct drm_connector *connector);</div><div class='ctx'> int drm_connector_attach_colorspace_property(struct drm_connector *connector);</div><div class='ctx'> int drm_connector_attach_hdr_output_metadata_property(struct drm_connector *connector);</div><div class='ctx'> bool drm_connector_atomic_hdr_metadata_equal(struct drm_connector_state *old_state,</div><div class='head'>diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h<br/>index 8b48a1974da3..66278ffeebd6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_crtc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_crtc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_crtc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_crtc.h</a></div><div class='hunk'>@@ -186,7 +186,7 @@ struct drm_crtc_state {</div><div class='ctx'> 	 * this case the driver will send the VBLANK event on its own when the</div><div class='ctx'> 	 * writeback job is complete.</div><div class='ctx'> 	 */</div><div class='del'>-	bool no_vblank : 1;</div><div class='add'>+	bool no_vblank;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @plane_mask: Bitmask of drm_plane_mask(plane) of planes attached to</div><div class='hunk'>@@ -318,6 +318,17 @@ struct drm_crtc_state {</div><div class='ctx'> 	enum drm_scaling_filter scaling_filter;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @sharpness_strength:</div><div class='add'>+	 *</div><div class='add'>+	 * Used by the user to set the sharpness intensity.</div><div class='add'>+	 * The value ranges from 0-255.</div><div class='add'>+	 * Default value is 0 which disable the sharpness feature.</div><div class='add'>+	 * Any value greater than 0 enables sharpening with the</div><div class='add'>+	 * specified strength.</div><div class='add'>+	 */</div><div class='add'>+	u8 sharpness_strength;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @event:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Optional pointer to a DRM event to signal upon completion of the</div><div class='hunk'>@@ -1089,6 +1100,12 @@ struct drm_crtc {</div><div class='ctx'> 	struct drm_property *scaling_filter_property;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @sharpness_strength_property: property to apply</div><div class='add'>+	 * the intensity of the sharpness requested.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *sharpness_strength_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @state:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Current atomic state for this CRTC.</div><div class='hunk'>@@ -1323,5 +1340,6 @@ static inline struct drm_crtc *drm_crtc_find(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc,</div><div class='ctx'> 					    unsigned int supported_filters);</div><div class='del'>-</div><div class='add'>+bool drm_crtc_in_clone_mode(struct drm_crtc_state *crtc_state);</div><div class='add'>+int drm_crtc_create_sharpness_strength_property(struct drm_crtc *crtc);</div><div class='ctx'> #endif /* __DRM_CRTC_H__ */</div><div class='head'>diff --git a/include/drm/drm_damage_helper.h b/include/drm/drm_damage_helper.h<br/>index effda42cce31..a58cbcd11276 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_damage_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_damage_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_damage_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_damage_helper.h</a></div><div class='hunk'>@@ -78,7 +78,7 @@ bool</div><div class='ctx'> drm_atomic_helper_damage_iter_next(struct drm_atomic_helper_damage_iter *iter,</div><div class='ctx'> 				   struct drm_rect *rect);</div><div class='ctx'> bool drm_atomic_helper_damage_merged(const struct drm_plane_state *old_state,</div><div class='del'>-				     struct drm_plane_state *state,</div><div class='add'>+				     const struct drm_plane_state *state,</div><div class='ctx'> 				     struct drm_rect *rect);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_debugfs.h b/include/drm/drm_debugfs.h<br/>index cf06cee4343f..ea8cba94208a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_debugfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_debugfs.h</a></div><div class='hunk'>@@ -153,6 +153,9 @@ void drm_debugfs_add_files(struct drm_device *dev,</div><div class='ctx'> </div><div class='ctx'> int drm_debugfs_gpuva_info(struct seq_file *m,</div><div class='ctx'> 			   struct drm_gpuvm *gpuvm);</div><div class='add'>+</div><div class='add'>+void drm_debugfs_clients_add(struct drm_file *file);</div><div class='add'>+void drm_debugfs_clients_remove(struct drm_file *file);</div><div class='ctx'> #else</div><div class='ctx'> static inline void drm_debugfs_create_files(const struct drm_info_list *files,</div><div class='ctx'> 					    int count, struct dentry *root,</div><div class='hunk'>@@ -181,6 +184,14 @@ static inline int drm_debugfs_gpuva_info(struct seq_file *m,</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void drm_debugfs_clients_add(struct drm_file *file)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void drm_debugfs_clients_remove(struct drm_file *file)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _DRM_DEBUGFS_H_ */</div><div class='head'>diff --git a/include/drm/drm_debugfs_crc.h b/include/drm/drm_debugfs_crc.h<br/>index b225eeb30d05..1b4c98c2f838 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_debugfs_crc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_debugfs_crc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_debugfs_crc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_debugfs_crc.h</a></div><div class='hunk'>@@ -22,13 +22,19 @@</div><div class='ctx'> #ifndef __DRM_DEBUGFS_CRC_H__</div><div class='ctx'> #define __DRM_DEBUGFS_CRC_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/spinlock_types.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_crtc;</div><div class='add'>+</div><div class='ctx'> #define DRM_MAX_CRC_NR		10</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_crtc_crc_entry - entry describing a frame's content</div><div class='ctx'>  * @has_frame_counter: whether the source was able to provide a frame number</div><div class='ctx'>  * @frame: number of the frame this CRC is about, if @has_frame_counter is true</div><div class='del'>- * @crc: array of values that characterize the frame</div><div class='add'>+ * @crcs: array of values that characterize the frame</div><div class='ctx'>  */</div><div class='ctx'> struct drm_crtc_crc_entry {</div><div class='ctx'> 	bool has_frame_counter;</div><div class='head'>diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h<br/>index 63767cf24371..5af49c5c3778 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_device.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_device.h</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;drm/drm_mode_config.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +22,28 @@ struct inode;</div><div class='ctx'> struct pci_dev;</div><div class='ctx'> struct pci_controller;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Recovery methods for wedged device in order of less to more side-effects.</div><div class='add'>+ * To be used with drm_dev_wedged_event() as recovery @method. Callers can</div><div class='add'>+ * use any one, multiple (or'd) or none depending on their needs.</div><div class='add'>+ *</div><div class='add'>+ * Refer to "Device Wedging" chapter in Documentation/gpu/drm-uapi.rst for more</div><div class='add'>+ * details.</div><div class='add'>+ */</div><div class='add'>+#define DRM_WEDGE_RECOVERY_NONE		BIT(0)	/* optional telemetry collection */</div><div class='add'>+#define DRM_WEDGE_RECOVERY_REBIND	BIT(1)	/* unbind + bind driver */</div><div class='add'>+#define DRM_WEDGE_RECOVERY_BUS_RESET	BIT(2)	/* unbind + reset bus device + bind */</div><div class='add'>+#define DRM_WEDGE_RECOVERY_VENDOR	BIT(3)	/* vendor specific recovery method */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_wedge_task_info - information about the guilty task of a wedge dev</div><div class='add'>+ */</div><div class='add'>+struct drm_wedge_task_info {</div><div class='add'>+	/** @pid: pid of the task */</div><div class='add'>+	pid_t pid;</div><div class='add'>+	/** @comm: command name of the task */</div><div class='add'>+	char comm[TASK_COMM_LEN];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum switch_power_state - power state of drm device</div><div class='hunk'>@@ -57,6 +80,28 @@ struct drm_device {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @dma_dev:</div><div class='add'>+	 *</div><div class='add'>+	 * Device for DMA operations. Only required if the device @dev</div><div class='add'>+	 * cannot perform DMA by itself. Should be NULL otherwise. Call</div><div class='add'>+	 * drm_dev_dma_dev() to get the DMA device instead of using this</div><div class='add'>+	 * field directly. Call drm_dev_set_dma_dev() to set this field.</div><div class='add'>+	 *</div><div class='add'>+	 * DRM devices are sometimes bound to virtual devices that cannot</div><div class='add'>+	 * perform DMA by themselves. Drivers should set this field to the</div><div class='add'>+	 * respective DMA controller.</div><div class='add'>+	 *</div><div class='add'>+	 * Devices on USB and other peripheral busses also cannot perform</div><div class='add'>+	 * DMA by themselves. The @dma_dev field should point the bus</div><div class='add'>+	 * controller that does DMA on behalve of such a device. Required</div><div class='add'>+	 * for importing buffers via dma-buf.</div><div class='add'>+	 *</div><div class='add'>+	 * If set, the DRM core automatically releases the reference on the</div><div class='add'>+	 * device.</div><div class='add'>+	 */</div><div class='add'>+	struct device *dma_dev;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @managed:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Managed resources linked to the lifetime of this &amp;drm_device as</div><div class='hunk'>@@ -148,16 +193,6 @@ struct drm_device {</div><div class='ctx'> 	char *unique;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @struct_mutex:</div><div class='del'>-	 *</div><div class='del'>-	 * Lock for others (not &amp;drm_minor.master and &amp;drm_file.is_master)</div><div class='del'>-	 *</div><div class='del'>-	 * TODO: This lock used to be the BKL of the DRM subsystem. Move the</div><div class='del'>-	 *       lock into i915, which is the only remaining user.</div><div class='del'>-	 */</div><div class='del'>-	struct mutex struct_mutex;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @master_mutex:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Lock for &amp;drm_minor.master and &amp;drm_file.is_master</div><div class='hunk'>@@ -204,6 +239,14 @@ struct drm_device {</div><div class='ctx'> 	struct list_head clientlist;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @client_sysrq_list:</div><div class='add'>+	 *</div><div class='add'>+	 * Entry into list of devices registered for sysrq. Allows in-kernel</div><div class='add'>+	 * clients on this device to handle sysrq keys.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head client_sysrq_list;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @vblank_disable_immediate:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * If true, vblank interrupt will be disabled immediately when the</div><div class='hunk'>@@ -213,8 +256,9 @@ struct drm_device {</div><div class='ctx'> 	 * This can be set to true it the hardware has a working vblank counter</div><div class='ctx'> 	 * with high-precision timestamping (otherwise there are races) and the</div><div class='ctx'> 	 * driver uses drm_crtc_vblank_on() and drm_crtc_vblank_off()</div><div class='del'>-	 * appropriately. See also @max_vblank_count and</div><div class='del'>-	 * &amp;drm_crtc_funcs.get_vblank_counter.</div><div class='add'>+	 * appropriately. Also, see @max_vblank_count,</div><div class='add'>+	 * &amp;drm_crtc_funcs.get_vblank_counter and</div><div class='add'>+	 * &amp;drm_vblank_crtc_config.disable_immediate.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool vblank_disable_immediate;</div><div class='ctx'> </div><div class='hunk'>@@ -318,4 +362,23 @@ struct drm_device {</div><div class='ctx'> 	struct dentry *debugfs_root;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void drm_dev_set_dma_dev(struct drm_device *dev, struct device *dma_dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_dev_dma_dev - returns the DMA device for a DRM device</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ *</div><div class='add'>+ * Returns the DMA device of the given DRM device. By default, this</div><div class='add'>+ * the DRM device's parent. See drm_dev_set_dma_dev().</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * A DMA-capable device for the DRM device.</div><div class='add'>+ */</div><div class='add'>+static inline struct device *drm_dev_dma_dev(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;dma_dev)</div><div class='add'>+		return dev-&gt;dma_dev;</div><div class='add'>+	return dev-&gt;dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h<br/>deleted file mode 100644<br/>index 566497eeb3b8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_displayid.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_displayid.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,170 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright © 2014 Red Hat Inc.</div><div class='del'>- *</div><div class='del'>- * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='del'>- * copy of this software and associated documentation files (the "Software"),</div><div class='del'>- * to deal in the Software without restriction, including without limitation</div><div class='del'>- * the rights to use, copy, modify, merge, publish, distribute, sublicense,</div><div class='del'>- * and/or sell copies of the Software, and to permit persons to whom the</div><div class='del'>- * Software is furnished to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- * The above copyright notice and this permission notice shall be included in</div><div class='del'>- * all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='del'>- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='del'>- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='del'>- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR</div><div class='del'>- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,</div><div class='del'>- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR</div><div class='del'>- * OTHER DEALINGS IN THE SOFTWARE.</div><div class='del'>- */</div><div class='del'>-#ifndef DRM_DISPLAYID_H</div><div class='del'>-#define DRM_DISPLAYID_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/bits.h&gt;</div><div class='del'>-</div><div class='del'>-struct drm_edid;</div><div class='del'>-</div><div class='del'>-#define VESA_IEEE_OUI				0x3a0292</div><div class='del'>-</div><div class='del'>-/* DisplayID Structure versions */</div><div class='del'>-#define DISPLAY_ID_STRUCTURE_VER_12		0x12</div><div class='del'>-#define DISPLAY_ID_STRUCTURE_VER_20		0x20</div><div class='del'>-</div><div class='del'>-/* DisplayID Structure v1r2 Data Blocks */</div><div class='del'>-#define DATA_BLOCK_PRODUCT_ID			0x00</div><div class='del'>-#define DATA_BLOCK_DISPLAY_PARAMETERS		0x01</div><div class='del'>-#define DATA_BLOCK_COLOR_CHARACTERISTICS	0x02</div><div class='del'>-#define DATA_BLOCK_TYPE_1_DETAILED_TIMING	0x03</div><div class='del'>-#define DATA_BLOCK_TYPE_2_DETAILED_TIMING	0x04</div><div class='del'>-#define DATA_BLOCK_TYPE_3_SHORT_TIMING		0x05</div><div class='del'>-#define DATA_BLOCK_TYPE_4_DMT_TIMING		0x06</div><div class='del'>-#define DATA_BLOCK_VESA_TIMING			0x07</div><div class='del'>-#define DATA_BLOCK_CEA_TIMING			0x08</div><div class='del'>-#define DATA_BLOCK_VIDEO_TIMING_RANGE		0x09</div><div class='del'>-#define DATA_BLOCK_PRODUCT_SERIAL_NUMBER	0x0a</div><div class='del'>-#define DATA_BLOCK_GP_ASCII_STRING		0x0b</div><div class='del'>-#define DATA_BLOCK_DISPLAY_DEVICE_DATA		0x0c</div><div class='del'>-#define DATA_BLOCK_INTERFACE_POWER_SEQUENCING	0x0d</div><div class='del'>-#define DATA_BLOCK_TRANSFER_CHARACTERISTICS	0x0e</div><div class='del'>-#define DATA_BLOCK_DISPLAY_INTERFACE		0x0f</div><div class='del'>-#define DATA_BLOCK_STEREO_DISPLAY_INTERFACE	0x10</div><div class='del'>-#define DATA_BLOCK_TILED_DISPLAY		0x12</div><div class='del'>-#define DATA_BLOCK_VENDOR_SPECIFIC		0x7f</div><div class='del'>-#define DATA_BLOCK_CTA				0x81</div><div class='del'>-</div><div class='del'>-/* DisplayID Structure v2r0 Data Blocks */</div><div class='del'>-#define DATA_BLOCK_2_PRODUCT_ID			0x20</div><div class='del'>-#define DATA_BLOCK_2_DISPLAY_PARAMETERS		0x21</div><div class='del'>-#define DATA_BLOCK_2_TYPE_7_DETAILED_TIMING	0x22</div><div class='del'>-#define DATA_BLOCK_2_TYPE_8_ENUMERATED_TIMING	0x23</div><div class='del'>-#define DATA_BLOCK_2_TYPE_9_FORMULA_TIMING	0x24</div><div class='del'>-#define DATA_BLOCK_2_DYNAMIC_VIDEO_TIMING	0x25</div><div class='del'>-#define DATA_BLOCK_2_DISPLAY_INTERFACE_FEATURES	0x26</div><div class='del'>-#define DATA_BLOCK_2_STEREO_DISPLAY_INTERFACE	0x27</div><div class='del'>-#define DATA_BLOCK_2_TILED_DISPLAY_TOPOLOGY	0x28</div><div class='del'>-#define DATA_BLOCK_2_CONTAINER_ID		0x29</div><div class='del'>-#define DATA_BLOCK_2_VENDOR_SPECIFIC		0x7e</div><div class='del'>-#define DATA_BLOCK_2_CTA_DISPLAY_ID		0x81</div><div class='del'>-</div><div class='del'>-/* DisplayID Structure v1r2 Product Type */</div><div class='del'>-#define PRODUCT_TYPE_EXTENSION			0</div><div class='del'>-#define PRODUCT_TYPE_TEST			1</div><div class='del'>-#define PRODUCT_TYPE_PANEL			2</div><div class='del'>-#define PRODUCT_TYPE_MONITOR			3</div><div class='del'>-#define PRODUCT_TYPE_TV				4</div><div class='del'>-#define PRODUCT_TYPE_REPEATER			5</div><div class='del'>-#define PRODUCT_TYPE_DIRECT_DRIVE		6</div><div class='del'>-</div><div class='del'>-/* DisplayID Structure v2r0 Display Product Primary Use Case (~Product Type) */</div><div class='del'>-#define PRIMARY_USE_EXTENSION			0</div><div class='del'>-#define PRIMARY_USE_TEST			1</div><div class='del'>-#define PRIMARY_USE_GENERIC			2</div><div class='del'>-#define PRIMARY_USE_TV				3</div><div class='del'>-#define PRIMARY_USE_DESKTOP_PRODUCTIVITY	4</div><div class='del'>-#define PRIMARY_USE_DESKTOP_GAMING		5</div><div class='del'>-#define PRIMARY_USE_PRESENTATION		6</div><div class='del'>-#define PRIMARY_USE_HEAD_MOUNTED_VR		7</div><div class='del'>-#define PRIMARY_USE_HEAD_MOUNTED_AR		8</div><div class='del'>-</div><div class='del'>-struct displayid_header {</div><div class='del'>-	u8 rev;</div><div class='del'>-	u8 bytes;</div><div class='del'>-	u8 prod_id;</div><div class='del'>-	u8 ext_count;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct displayid_block {</div><div class='del'>-	u8 tag;</div><div class='del'>-	u8 rev;</div><div class='del'>-	u8 num_bytes;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct displayid_tiled_block {</div><div class='del'>-	struct displayid_block base;</div><div class='del'>-	u8 tile_cap;</div><div class='del'>-	u8 topo[3];</div><div class='del'>-	u8 tile_size[4];</div><div class='del'>-	u8 tile_pixel_bezel[5];</div><div class='del'>-	u8 topology_id[8];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct displayid_detailed_timings_1 {</div><div class='del'>-	u8 pixel_clock[3];</div><div class='del'>-	u8 flags;</div><div class='del'>-	u8 hactive[2];</div><div class='del'>-	u8 hblank[2];</div><div class='del'>-	u8 hsync[2];</div><div class='del'>-	u8 hsw[2];</div><div class='del'>-	u8 vactive[2];</div><div class='del'>-	u8 vblank[2];</div><div class='del'>-	u8 vsync[2];</div><div class='del'>-	u8 vsw[2];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct displayid_detailed_timing_block {</div><div class='del'>-	struct displayid_block base;</div><div class='del'>-	struct displayid_detailed_timings_1 timings[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DISPLAYID_VESA_MSO_OVERLAP	GENMASK(3, 0)</div><div class='del'>-#define DISPLAYID_VESA_MSO_MODE		GENMASK(6, 5)</div><div class='del'>-</div><div class='del'>-struct displayid_vesa_vendor_specific_block {</div><div class='del'>-	struct displayid_block base;</div><div class='del'>-	u8 oui[3];</div><div class='del'>-	u8 data_structure_type;</div><div class='del'>-	u8 mso;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DisplayID iteration.</div><div class='del'>- *</div><div class='del'>- * Do not access directly, this is private.</div><div class='del'>- */</div><div class='del'>-struct displayid_iter {</div><div class='del'>-	const struct drm_edid *drm_edid;</div><div class='del'>-</div><div class='del'>-	const u8 *section;</div><div class='del'>-	int length;</div><div class='del'>-	int idx;</div><div class='del'>-	int ext_index;</div><div class='del'>-</div><div class='del'>-	u8 version;</div><div class='del'>-	u8 primary_use;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void displayid_iter_edid_begin(const struct drm_edid *drm_edid,</div><div class='del'>-			       struct displayid_iter *iter);</div><div class='del'>-const struct displayid_block *</div><div class='del'>-__displayid_iter_next(struct displayid_iter *iter);</div><div class='del'>-#define displayid_iter_for_each(__block, __iter) \</div><div class='del'>-	while (((__block) = __displayid_iter_next(__iter)))</div><div class='del'>-void displayid_iter_end(struct displayid_iter *iter);</div><div class='del'>-</div><div class='del'>-u8 displayid_version(const struct displayid_iter *iter);</div><div class='del'>-u8 displayid_primary_use(const struct displayid_iter *iter);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h<br/>index 8878260d7529..42fc085f986d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_drv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_drv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_drv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_drv.h</a></div><div class='hunk'>@@ -34,6 +34,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;drm/drm_device.h&gt;</div><div class='ctx'> </div><div class='add'>+struct dmem_cgroup_region;</div><div class='add'>+struct drm_fb_helper;</div><div class='add'>+struct drm_fb_helper_surface_size;</div><div class='ctx'> struct drm_file;</div><div class='ctx'> struct drm_gem_object;</div><div class='ctx'> struct drm_master;</div><div class='hunk'>@@ -229,34 +232,6 @@ struct drm_driver {</div><div class='ctx'> 	void (*postclose) (struct drm_device *, struct drm_file *);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @lastclose:</div><div class='del'>-	 *</div><div class='del'>-	 * Called when the last &amp;struct drm_file has been closed and there's</div><div class='del'>-	 * currently no userspace client for the &amp;struct drm_device.</div><div class='del'>-	 *</div><div class='del'>-	 * Modern drivers should only use this to force-restore the fbdev</div><div class='del'>-	 * framebuffer using drm_fb_helper_restore_fbdev_mode_unlocked().</div><div class='del'>-	 * Anything else would indicate there's something seriously wrong.</div><div class='del'>-	 * Modern drivers can also use this to execute delayed power switching</div><div class='del'>-	 * state changes, e.g. in conjunction with the :ref:`vga_switcheroo`</div><div class='del'>-	 * infrastructure.</div><div class='del'>-	 *</div><div class='del'>-	 * This is called after @postclose hook has been called.</div><div class='del'>-	 *</div><div class='del'>-	 * NOTE:</div><div class='del'>-	 *</div><div class='del'>-	 * All legacy drivers use this callback to de-initialize the hardware.</div><div class='del'>-	 * This is purely because of the shadow-attach model, where the DRM</div><div class='del'>-	 * kernel driver does not really own the hardware. Instead ownershipe is</div><div class='del'>-	 * handled with the help of userspace through an inheritedly racy dance</div><div class='del'>-	 * to set/unset the VT into raw mode.</div><div class='del'>-	 *</div><div class='del'>-	 * Legacy drivers initialize the hardware in the @firstopen callback,</div><div class='del'>-	 * which isn't even called for modern drivers.</div><div class='del'>-	 */</div><div class='del'>-	void (*lastclose) (struct drm_device *);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @unload:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Reverse the effects of the driver load callback.  Ideally,</div><div class='hunk'>@@ -395,6 +370,22 @@ struct drm_driver {</div><div class='ctx'> 			       uint64_t *offset);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @fbdev_probe:</div><div class='add'>+	 *</div><div class='add'>+	 * Allocates and initialize the fb_info structure for fbdev emulation.</div><div class='add'>+	 * Furthermore it also needs to allocate the DRM framebuffer used to</div><div class='add'>+	 * back the fbdev.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is mandatory for fbdev support.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 *</div><div class='add'>+	 * 0 on success ot a negative error code otherwise.</div><div class='add'>+	 */</div><div class='add'>+	int (*fbdev_probe)(struct drm_fb_helper *fbdev_helper,</div><div class='add'>+			   struct drm_fb_helper_surface_size *sizes);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @show_fdinfo:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Print device specific fdinfo.  See Documentation/gpu/drm-usage-stats.rst.</div><div class='hunk'>@@ -411,8 +402,6 @@ struct drm_driver {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	/** @desc: driver description */</div><div class='ctx'> 	char *desc;</div><div class='del'>-	/** @date: driver date */</div><div class='del'>-	char *date;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @driver_features:</div><div class='hunk'>@@ -448,6 +437,10 @@ void *__devm_drm_dev_alloc(struct device *parent,</div><div class='ctx'> 			   const struct drm_driver *driver,</div><div class='ctx'> 			   size_t size, size_t offset);</div><div class='ctx'> </div><div class='add'>+struct dmem_cgroup_region *</div><div class='add'>+drmm_cgroup_register_region(struct drm_device *dev,</div><div class='add'>+			    const char *region_name, u64 size);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * devm_drm_dev_alloc - Resource managed allocation of a &amp;drm_device instance</div><div class='ctx'>  * @parent: Parent device object</div><div class='hunk'>@@ -480,6 +473,11 @@ void *__devm_drm_dev_alloc(struct device *parent,</div><div class='ctx'> </div><div class='ctx'> struct drm_device *drm_dev_alloc(const struct drm_driver *driver,</div><div class='ctx'> 				 struct device *parent);</div><div class='add'>+</div><div class='add'>+void *__drm_dev_alloc(struct device *parent,</div><div class='add'>+		      const struct drm_driver *driver,</div><div class='add'>+		      size_t size, size_t offset);</div><div class='add'>+</div><div class='ctx'> int drm_dev_register(struct drm_device *dev, unsigned long flags);</div><div class='ctx'> void drm_dev_unregister(struct drm_device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -489,6 +487,8 @@ void drm_put_dev(struct drm_device *dev);</div><div class='ctx'> bool drm_dev_enter(struct drm_device *dev, int *idx);</div><div class='ctx'> void drm_dev_exit(int idx);</div><div class='ctx'> void drm_dev_unplug(struct drm_device *dev);</div><div class='add'>+int drm_dev_wedged_event(struct drm_device *dev, unsigned long method,</div><div class='add'>+			 struct drm_wedge_task_info *info);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * drm_dev_is_unplugged - is a DRM device unplugged</div><div class='hunk'>@@ -572,9 +572,24 @@ static inline bool drm_firmware_drivers_only(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='del'>-void drm_debugfs_dev_init(struct drm_device *dev, struct dentry *root);</div><div class='add'>+void drm_debugfs_dev_init(struct drm_device *dev);</div><div class='add'>+void drm_debugfs_init_root(void);</div><div class='add'>+void drm_debugfs_remove_root(void);</div><div class='add'>+void drm_debugfs_bridge_params(void);</div><div class='ctx'> #else</div><div class='del'>-static inline void drm_debugfs_dev_init(struct drm_device *dev, struct dentry *root)</div><div class='add'>+static inline void drm_debugfs_dev_init(struct drm_device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void drm_debugfs_init_root(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void drm_debugfs_remove_root(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void drm_debugfs_bridge_params(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_dumb_buffers.h b/include/drm/drm_dumb_buffers.h<br/>new file mode 100644<br/>index 000000000000..1f3a8236fb3d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_dumb_buffers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_dumb_buffers.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+</div><div class='add'>+#ifndef __DRM_DUMB_BUFFERS_H__</div><div class='add'>+#define __DRM_DUMB_BUFFERS_H__</div><div class='add'>+</div><div class='add'>+struct drm_device;</div><div class='add'>+struct drm_mode_create_dumb;</div><div class='add'>+</div><div class='add'>+int drm_mode_size_dumb(struct drm_device *dev,</div><div class='add'>+		       struct drm_mode_create_dumb *args,</div><div class='add'>+		       unsigned long hw_pitch_align,</div><div class='add'>+		       unsigned long hw_size_align);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h<br/>index 518d1b8106c7..04f7a7f1f108 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_edid.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_edid.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_edid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_edid.h</a></div><div class='hunk'>@@ -24,11 +24,15 @@</div><div class='ctx'> #define __DRM_EDID_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/hdmi.h&gt;</div><div class='del'>-#include &lt;drm/drm_mode.h&gt;</div><div class='ctx'> </div><div class='add'>+enum hdmi_quantization_range;</div><div class='add'>+struct drm_connector;</div><div class='ctx'> struct drm_device;</div><div class='add'>+struct drm_display_mode;</div><div class='ctx'> struct drm_edid;</div><div class='add'>+struct drm_printer;</div><div class='add'>+struct hdmi_avi_infoframe;</div><div class='add'>+struct hdmi_vendor_infoframe;</div><div class='ctx'> struct i2c_adapter;</div><div class='ctx'> </div><div class='ctx'> #define EDID_LENGTH 128</div><div class='hunk'>@@ -46,7 +50,7 @@ struct est_timings {</div><div class='ctx'> 	u8 t1;</div><div class='ctx'> 	u8 t2;</div><div class='ctx'> 	u8 mfg_rsvd;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /* 00=16:10, 01=4:3, 10=5:4, 11=16:9 */</div><div class='ctx'> #define EDID_TIMING_ASPECT_SHIFT 6</div><div class='hunk'>@@ -59,7 +63,7 @@ struct est_timings {</div><div class='ctx'> struct std_timing {</div><div class='ctx'> 	u8 hsize; /* need to multiply by 8 then add 248 */</div><div class='ctx'> 	u8 vfreq_aspect;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> #define DRM_EDID_PT_HSYNC_POSITIVE (1 &lt;&lt; 1)</div><div class='ctx'> #define DRM_EDID_PT_VSYNC_POSITIVE (1 &lt;&lt; 2)</div><div class='hunk'>@@ -85,12 +89,12 @@ struct detailed_pixel_timing {</div><div class='ctx'> 	u8 hborder;</div><div class='ctx'> 	u8 vborder;</div><div class='ctx'> 	u8 misc;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /* If it's not pixel timing, it'll be one of the below */</div><div class='ctx'> struct detailed_data_string {</div><div class='ctx'> 	u8 str[13];</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> #define DRM_EDID_RANGE_OFFSET_MIN_VFREQ (1 &lt;&lt; 0) /* 1.4 */</div><div class='ctx'> #define DRM_EDID_RANGE_OFFSET_MAX_VFREQ (1 &lt;&lt; 1) /* 1.4 */</div><div class='hunk'>@@ -105,6 +109,13 @@ struct detailed_data_string {</div><div class='ctx'> #define DRM_EDID_CVT_FLAGS_STANDARD_BLANKING (1 &lt;&lt; 3)</div><div class='ctx'> #define DRM_EDID_CVT_FLAGS_REDUCED_BLANKING  (1 &lt;&lt; 4)</div><div class='ctx'> </div><div class='add'>+enum drm_edid_quirk {</div><div class='add'>+	/* Do a dummy read before DPCD accesses, to prevent corruption. */</div><div class='add'>+	DRM_EDID_QUIRK_DP_DPCD_PROBE,</div><div class='add'>+</div><div class='add'>+	DRM_EDID_QUIRK_NUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct detailed_data_monitor_range {</div><div class='ctx'> 	u8 min_vfreq;</div><div class='ctx'> 	u8 max_vfreq;</div><div class='hunk'>@@ -120,7 +131,7 @@ struct detailed_data_monitor_range {</div><div class='ctx'> 			__le16 m;</div><div class='ctx'> 			u8 k;</div><div class='ctx'> 			u8 j; /* need to divide by 2 */</div><div class='del'>-		} __attribute__((packed)) gtf2;</div><div class='add'>+		} __packed gtf2;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 version;</div><div class='ctx'> 			u8 data1; /* high 6 bits: extra clock resolution */</div><div class='hunk'>@@ -129,27 +140,27 @@ struct detailed_data_monitor_range {</div><div class='ctx'> 			u8 flags; /* preferred aspect and blanking support */</div><div class='ctx'> 			u8 supported_scalings;</div><div class='ctx'> 			u8 preferred_refresh;</div><div class='del'>-		} __attribute__((packed)) cvt;</div><div class='del'>-	} __attribute__((packed)) formula;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+		} __packed cvt;</div><div class='add'>+	} __packed formula;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct detailed_data_wpindex {</div><div class='ctx'> 	u8 white_yx_lo; /* Lower 2 bits each */</div><div class='ctx'> 	u8 white_x_hi;</div><div class='ctx'> 	u8 white_y_hi;</div><div class='ctx'> 	u8 gamma; /* need to divide by 100 then add 1 */</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct detailed_data_color_point {</div><div class='ctx'> 	u8 windex1;</div><div class='ctx'> 	u8 wpindex1[3];</div><div class='ctx'> 	u8 windex2;</div><div class='ctx'> 	u8 wpindex2[3];</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct cvt_timing {</div><div class='ctx'> 	u8 code[3];</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> struct detailed_non_pixel {</div><div class='ctx'> 	u8 pad1;</div><div class='hunk'>@@ -163,8 +174,8 @@ struct detailed_non_pixel {</div><div class='ctx'> 		struct detailed_data_wpindex color;</div><div class='ctx'> 		struct std_timing timings[6];</div><div class='ctx'> 		struct cvt_timing cvt[4];</div><div class='del'>-	} __attribute__((packed)) data;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+	} __packed data;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> #define EDID_DETAIL_EST_TIMINGS 0xf7</div><div class='ctx'> #define EDID_DETAIL_CVT_3BYTE 0xf8</div><div class='hunk'>@@ -181,8 +192,8 @@ struct detailed_timing {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct detailed_pixel_timing pixel_data;</div><div class='ctx'> 		struct detailed_non_pixel other_data;</div><div class='del'>-	} __attribute__((packed)) data;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+	} __packed data;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> #define DRM_EDID_INPUT_SERRATION_VSYNC (1 &lt;&lt; 0)</div><div class='ctx'> #define DRM_EDID_INPUT_SYNC_ON_GREEN   (1 &lt;&lt; 1)</div><div class='hunk'>@@ -269,14 +280,27 @@ struct detailed_timing {</div><div class='ctx'> #define DRM_EDID_DSC_MAX_SLICES			0xf</div><div class='ctx'> #define DRM_EDID_DSC_TOTAL_CHUNK_KBYTES		0x3f</div><div class='ctx'> </div><div class='add'>+struct drm_edid_product_id {</div><div class='add'>+	__be16 manufacturer_name;</div><div class='add'>+	__le16 product_code;</div><div class='add'>+	__le32 serial_number;</div><div class='add'>+	u8 week_of_manufacture;</div><div class='add'>+	u8 year_of_manufacture;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct edid {</div><div class='ctx'> 	u8 header[8];</div><div class='ctx'> 	/* Vendor &amp; product info */</div><div class='del'>-	u8 mfg_id[2];</div><div class='del'>-	u8 prod_code[2];</div><div class='del'>-	u32 serial; /* FIXME: byte order */</div><div class='del'>-	u8 mfg_week;</div><div class='del'>-	u8 mfg_year;</div><div class='add'>+	union {</div><div class='add'>+		struct drm_edid_product_id product_id;</div><div class='add'>+		struct {</div><div class='add'>+			u8 mfg_id[2];</div><div class='add'>+			u8 prod_code[2];</div><div class='add'>+			u32 serial; /* FIXME: byte order */</div><div class='add'>+			u8 mfg_week;</div><div class='add'>+			u8 mfg_year;</div><div class='add'>+		} __packed;</div><div class='add'>+	} __packed;</div><div class='ctx'> 	/* EDID version */</div><div class='ctx'> 	u8 version;</div><div class='ctx'> 	u8 revision;</div><div class='hunk'>@@ -307,7 +331,20 @@ struct edid {</div><div class='ctx'> 	u8 extensions;</div><div class='ctx'> 	/* Checksum */</div><div class='ctx'> 	u8 checksum;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* EDID matching */</div><div class='add'>+struct drm_edid_ident {</div><div class='add'>+	/* ID encoded by drm_edid_encode_panel_id() */</div><div class='add'>+	u32 panel_id;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DRM_EDID_IDENT_INIT(_vend_chr_0, _vend_chr_1, _vend_chr_2, _product_id, _name) \</div><div class='add'>+{ \</div><div class='add'>+	.panel_id = drm_edid_encode_panel_id(_vend_chr_0, _vend_chr_1, _vend_chr_2, _product_id), \</div><div class='add'>+	.name = _name, \</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define EDID_PRODUCT_ID(e) ((e)-&gt;prod_code[0] | ((e)-&gt;prod_code[1] &lt;&lt; 8))</div><div class='ctx'> </div><div class='hunk'>@@ -319,18 +356,11 @@ struct cea_sad {</div><div class='ctx'> 	u8 byte2; /* meaning depends on format */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct drm_encoder;</div><div class='del'>-struct drm_connector;</div><div class='del'>-struct drm_connector_state;</div><div class='del'>-struct drm_display_mode;</div><div class='del'>-</div><div class='ctx'> int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads);</div><div class='ctx'> int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb);</div><div class='ctx'> int drm_av_sync_delay(struct drm_connector *connector,</div><div class='ctx'> 		      const struct drm_display_mode *mode);</div><div class='ctx'> </div><div class='del'>-bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2);</div><div class='del'>-</div><div class='ctx'> int</div><div class='ctx'> drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,</div><div class='ctx'> 					 const struct drm_connector *connector,</div><div class='hunk'>@@ -406,13 +436,8 @@ static inline void drm_edid_decode_panel_id(u32 panel_id, char vend[4], u16 *pro</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool drm_probe_ddc(struct i2c_adapter *adapter);</div><div class='del'>-struct edid *drm_do_get_edid(struct drm_connector *connector,</div><div class='del'>-	int (*get_edid_block)(void *data, u8 *buf, unsigned int block,</div><div class='del'>-			      size_t len),</div><div class='del'>-	void *data);</div><div class='ctx'> struct edid *drm_get_edid(struct drm_connector *connector,</div><div class='ctx'> 			  struct i2c_adapter *adapter);</div><div class='del'>-u32 drm_edid_get_panel_id(struct i2c_adapter *adapter);</div><div class='ctx'> struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,</div><div class='ctx'> 				     struct i2c_adapter *adapter);</div><div class='ctx'> struct edid *drm_edid_duplicate(const struct edid *edid);</div><div class='hunk'>@@ -425,13 +450,9 @@ bool drm_detect_monitor_audio(const struct edid *edid);</div><div class='ctx'> enum hdmi_quantization_range</div><div class='ctx'> drm_default_rgb_quant_range(const struct drm_display_mode *mode);</div><div class='ctx'> int drm_add_modes_noedid(struct drm_connector *connector,</div><div class='del'>-			 int hdisplay, int vdisplay);</div><div class='del'>-void drm_set_preferred_mode(struct drm_connector *connector,</div><div class='del'>-			    int hpref, int vpref);</div><div class='add'>+			 unsigned int hdisplay, unsigned int vdisplay);</div><div class='ctx'> </div><div class='ctx'> int drm_edid_header_is_valid(const void *edid);</div><div class='del'>-bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,</div><div class='del'>-			  bool *edid_corrupt);</div><div class='ctx'> bool drm_edid_is_valid(struct edid *edid);</div><div class='ctx'> void drm_edid_get_monitor_name(const struct edid *edid, char *name,</div><div class='ctx'> 			       int buflen);</div><div class='hunk'>@@ -454,14 +475,20 @@ const struct drm_edid *drm_edid_read_ddc(struct drm_connector *connector,</div><div class='ctx'> const struct drm_edid *drm_edid_read_custom(struct drm_connector *connector,</div><div class='ctx'> 					    int (*read_block)(void *context, u8 *buf, unsigned int block, size_t len),</div><div class='ctx'> 					    void *context);</div><div class='add'>+const struct drm_edid *drm_edid_read_base_block(struct i2c_adapter *adapter);</div><div class='ctx'> const struct drm_edid *drm_edid_read_switcheroo(struct drm_connector *connector,</div><div class='ctx'> 						struct i2c_adapter *adapter);</div><div class='ctx'> int drm_edid_connector_update(struct drm_connector *connector,</div><div class='ctx'> 			      const struct drm_edid *edid);</div><div class='ctx'> int drm_edid_connector_add_modes(struct drm_connector *connector);</div><div class='ctx'> bool drm_edid_is_digital(const struct drm_edid *drm_edid);</div><div class='del'>-</div><div class='del'>-const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,</div><div class='del'>-				  int ext_id, int *ext_index);</div><div class='add'>+void drm_edid_get_product_id(const struct drm_edid *drm_edid,</div><div class='add'>+			     struct drm_edid_product_id *id);</div><div class='add'>+void drm_edid_print_product_id(struct drm_printer *p,</div><div class='add'>+			       const struct drm_edid_product_id *id, bool raw);</div><div class='add'>+u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid);</div><div class='add'>+bool drm_edid_match(const struct drm_edid *drm_edid,</div><div class='add'>+		    const struct drm_edid_ident *ident);</div><div class='add'>+bool drm_edid_has_quirk(struct drm_connector *connector, enum drm_edid_quirk quirk);</div><div class='ctx'> </div><div class='ctx'> #endif /* __DRM_EDID_H__ */</div><div class='head'>diff --git a/include/drm/drm_encoder_slave.h b/include/drm/drm_encoder_slave.h<br/>deleted file mode 100644<br/>index 7214101fd731..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_encoder_slave.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_encoder_slave.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,184 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Francisco Jerez.</div><div class='del'>- * All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * Permission is hereby granted, free of charge, to any person obtaining</div><div class='del'>- * a copy of this software and associated documentation files (the</div><div class='del'>- * "Software"), to deal in the Software without restriction, including</div><div class='del'>- * without limitation the rights to use, copy, modify, merge, publish,</div><div class='del'>- * distribute, sublicense, and/or sell copies of the Software, and to</div><div class='del'>- * permit persons to whom the Software is furnished to do so, subject to</div><div class='del'>- * the following conditions:</div><div class='del'>- *</div><div class='del'>- * The above copyright notice and this permission notice (including the</div><div class='del'>- * next paragraph) shall be included in all copies or substantial</div><div class='del'>- * portions of the Software.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.</div><div class='del'>- * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE</div><div class='del'>- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION</div><div class='del'>- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION</div><div class='del'>- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DRM_ENCODER_SLAVE_H__</div><div class='del'>-#define __DRM_ENCODER_SLAVE_H__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;drm/drm_crtc.h&gt;</div><div class='del'>-#include &lt;drm/drm_encoder.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct drm_encoder_slave_funcs - Entry points exposed by a slave encoder driver</div><div class='del'>- * @set_config:	Initialize any encoder-specific modesetting parameters.</div><div class='del'>- *		The meaning of the @params parameter is implementation</div><div class='del'>- *		dependent. It will usually be a structure with DVO port</div><div class='del'>- *		data format settings or timings. It's not required for</div><div class='del'>- *		the new parameters to take effect until the next mode</div><div class='del'>- *		is set.</div><div class='del'>- *</div><div class='del'>- * Most of its members are analogous to the function pointers in</div><div class='del'>- * &amp;drm_encoder_helper_funcs and they can optionally be used to</div><div class='del'>- * initialize the latter. Connector-like methods (e.g. @get_modes and</div><div class='del'>- * @set_property) will typically be wrapped around and only be called</div><div class='del'>- * if the encoder is the currently selected one for the connector.</div><div class='del'>- */</div><div class='del'>-struct drm_encoder_slave_funcs {</div><div class='del'>-	void (*set_config)(struct drm_encoder *encoder,</div><div class='del'>-			   void *params);</div><div class='del'>-</div><div class='del'>-	void (*destroy)(struct drm_encoder *encoder);</div><div class='del'>-	void (*dpms)(struct drm_encoder *encoder, int mode);</div><div class='del'>-	void (*save)(struct drm_encoder *encoder);</div><div class='del'>-	void (*restore)(struct drm_encoder *encoder);</div><div class='del'>-	bool (*mode_fixup)(struct drm_encoder *encoder,</div><div class='del'>-			   const struct drm_display_mode *mode,</div><div class='del'>-			   struct drm_display_mode *adjusted_mode);</div><div class='del'>-	int (*mode_valid)(struct drm_encoder *encoder,</div><div class='del'>-			  struct drm_display_mode *mode);</div><div class='del'>-	void (*mode_set)(struct drm_encoder *encoder,</div><div class='del'>-			 struct drm_display_mode *mode,</div><div class='del'>-			 struct drm_display_mode *adjusted_mode);</div><div class='del'>-</div><div class='del'>-	enum drm_connector_status (*detect)(struct drm_encoder *encoder,</div><div class='del'>-					    struct drm_connector *connector);</div><div class='del'>-	int (*get_modes)(struct drm_encoder *encoder,</div><div class='del'>-			 struct drm_connector *connector);</div><div class='del'>-	int (*create_resources)(struct drm_encoder *encoder,</div><div class='del'>-				 struct drm_connector *connector);</div><div class='del'>-	int (*set_property)(struct drm_encoder *encoder,</div><div class='del'>-			    struct drm_connector *connector,</div><div class='del'>-			    struct drm_property *property,</div><div class='del'>-			    uint64_t val);</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct drm_encoder_slave - Slave encoder struct</div><div class='del'>- * @base: DRM encoder object.</div><div class='del'>- * @slave_funcs: Slave encoder callbacks.</div><div class='del'>- * @slave_priv: Slave encoder private data.</div><div class='del'>- * @bus_priv: Bus specific data.</div><div class='del'>- *</div><div class='del'>- * A &amp;drm_encoder_slave has two sets of callbacks, @slave_funcs and the</div><div class='del'>- * ones in @base. The former are never actually called by the common</div><div class='del'>- * CRTC code, it's just a convenience for splitting the encoder</div><div class='del'>- * functions in an upper, GPU-specific layer and a (hopefully)</div><div class='del'>- * GPU-agnostic lower layer: It's the GPU driver responsibility to</div><div class='del'>- * call the slave methods when appropriate.</div><div class='del'>- *</div><div class='del'>- * drm_i2c_encoder_init() provides a way to get an implementation of</div><div class='del'>- * this.</div><div class='del'>- */</div><div class='del'>-struct drm_encoder_slave {</div><div class='del'>-	struct drm_encoder base;</div><div class='del'>-</div><div class='del'>-	const struct drm_encoder_slave_funcs *slave_funcs;</div><div class='del'>-	void *slave_priv;</div><div class='del'>-	void *bus_priv;</div><div class='del'>-};</div><div class='del'>-#define to_encoder_slave(x) container_of((x), struct drm_encoder_slave, base)</div><div class='del'>-</div><div class='del'>-int drm_i2c_encoder_init(struct drm_device *dev,</div><div class='del'>-			 struct drm_encoder_slave *encoder,</div><div class='del'>-			 struct i2c_adapter *adap,</div><div class='del'>-			 const struct i2c_board_info *info);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct drm_i2c_encoder_driver</div><div class='del'>- *</div><div class='del'>- * Describes a device driver for an encoder connected to the GPU</div><div class='del'>- * through an I2C bus. In addition to the entry points in @i2c_driver</div><div class='del'>- * an @encoder_init function should be provided. It will be called to</div><div class='del'>- * give the driver an opportunity to allocate any per-encoder data</div><div class='del'>- * structures and to initialize the @slave_funcs and (optionally)</div><div class='del'>- * @slave_priv members of @encoder.</div><div class='del'>- */</div><div class='del'>-struct drm_i2c_encoder_driver {</div><div class='del'>-	struct i2c_driver i2c_driver;</div><div class='del'>-</div><div class='del'>-	int (*encoder_init)(struct i2c_client *client,</div><div class='del'>-			    struct drm_device *dev,</div><div class='del'>-			    struct drm_encoder_slave *encoder);</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-#define to_drm_i2c_encoder_driver(x) container_of((x),			\</div><div class='del'>-						  struct drm_i2c_encoder_driver, \</div><div class='del'>-						  i2c_driver)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * drm_i2c_encoder_get_client - Get the I2C client corresponding to an encoder</div><div class='del'>- */</div><div class='del'>-static inline struct i2c_client *drm_i2c_encoder_get_client(struct drm_encoder *encoder)</div><div class='del'>-{</div><div class='del'>-	return (struct i2c_client *)to_encoder_slave(encoder)-&gt;bus_priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * drm_i2c_encoder_register - Register an I2C encoder driver</div><div class='del'>- * @owner:	Module containing the driver.</div><div class='del'>- * @driver:	Driver to be registered.</div><div class='del'>- */</div><div class='del'>-static inline int drm_i2c_encoder_register(struct module *owner,</div><div class='del'>-					   struct drm_i2c_encoder_driver *driver)</div><div class='del'>-{</div><div class='del'>-	return i2c_register_driver(owner, &amp;driver-&gt;i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * drm_i2c_encoder_unregister - Unregister an I2C encoder driver</div><div class='del'>- * @driver:	Driver to be unregistered.</div><div class='del'>- */</div><div class='del'>-static inline void drm_i2c_encoder_unregister(struct drm_i2c_encoder_driver *driver)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;driver-&gt;i2c_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void drm_i2c_encoder_destroy(struct drm_encoder *encoder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wrapper fxns which can be plugged in to drm_encoder_helper_funcs:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void drm_i2c_encoder_dpms(struct drm_encoder *encoder, int mode);</div><div class='del'>-bool drm_i2c_encoder_mode_fixup(struct drm_encoder *encoder,</div><div class='del'>-		const struct drm_display_mode *mode,</div><div class='del'>-		struct drm_display_mode *adjusted_mode);</div><div class='del'>-void drm_i2c_encoder_prepare(struct drm_encoder *encoder);</div><div class='del'>-void drm_i2c_encoder_commit(struct drm_encoder *encoder);</div><div class='del'>-void drm_i2c_encoder_mode_set(struct drm_encoder *encoder,</div><div class='del'>-		struct drm_display_mode *mode,</div><div class='del'>-		struct drm_display_mode *adjusted_mode);</div><div class='del'>-enum drm_connector_status drm_i2c_encoder_detect(struct drm_encoder *encoder,</div><div class='del'>-	    struct drm_connector *connector);</div><div class='del'>-void drm_i2c_encoder_save(struct drm_encoder *encoder);</div><div class='del'>-void drm_i2c_encoder_restore(struct drm_encoder *encoder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/drm/drm_exec.h b/include/drm/drm_exec.h<br/>index f1a66c048721..aa786b828a0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_exec.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_exec.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_exec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_exec.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@ struct drm_exec {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @flags: Flags to control locking behavior</div><div class='ctx'> 	 */</div><div class='del'>-	uint32_t		flags;</div><div class='add'>+	u32                     flags;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @ticket: WW ticket used for acquiring locks</div><div class='hunk'>@@ -135,7 +135,7 @@ static inline bool drm_exec_is_contended(struct drm_exec *exec)</div><div class='ctx'> 	return !!exec-&gt;contended;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void drm_exec_init(struct drm_exec *exec, uint32_t flags, unsigned nr);</div><div class='add'>+void drm_exec_init(struct drm_exec *exec, u32 flags, unsigned nr);</div><div class='ctx'> void drm_exec_fini(struct drm_exec *exec);</div><div class='ctx'> bool drm_exec_cleanup(struct drm_exec *exec);</div><div class='ctx'> int drm_exec_lock_obj(struct drm_exec *exec, struct drm_gem_object *obj);</div><div class='head'>diff --git a/include/drm/drm_fb_dma_helper.h b/include/drm/drm_fb_dma_helper.h<br/>index d5e036c57801..c950732c6d36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fb_dma_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fb_dma_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fb_dma_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_fb_dma_helper.h</a></div><div class='hunk'>@@ -6,7 +6,9 @@</div><div class='ctx'> </div><div class='ctx'> struct drm_device;</div><div class='ctx'> struct drm_framebuffer;</div><div class='add'>+struct drm_plane;</div><div class='ctx'> struct drm_plane_state;</div><div class='add'>+struct drm_scanout_buffer;</div><div class='ctx'> </div><div class='ctx'> struct drm_gem_dma_object *drm_fb_dma_get_gem_obj(struct drm_framebuffer *fb,</div><div class='ctx'> 	unsigned int plane);</div><div class='hunk'>@@ -19,5 +21,8 @@ void drm_fb_dma_sync_non_coherent(struct drm_device *drm,</div><div class='ctx'> 				  struct drm_plane_state *old_state,</div><div class='ctx'> 				  struct drm_plane_state *state);</div><div class='ctx'> </div><div class='add'>+int drm_fb_dma_get_scanout_buffer(struct drm_plane *plane,</div><div class='add'>+				  struct drm_scanout_buffer *sb);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h<br/>index 375737fd6c36..dd9a18f8de5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fb_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fb_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fb_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_fb_helper.h</a></div><div class='hunk'>@@ -70,23 +70,6 @@ struct drm_fb_helper_surface_size {</div><div class='ctx'>  */</div><div class='ctx'> struct drm_fb_helper_funcs {</div><div class='ctx'> 	/**</div><div class='del'>-	 * @fb_probe:</div><div class='del'>-	 *</div><div class='del'>-	 * Driver callback to allocate and initialize the fbdev info structure.</div><div class='del'>-	 * Furthermore it also needs to allocate the DRM framebuffer used to</div><div class='del'>-	 * back the fbdev.</div><div class='del'>-	 *</div><div class='del'>-	 * This callback is mandatory.</div><div class='del'>-	 *</div><div class='del'>-	 * RETURNS:</div><div class='del'>-	 *</div><div class='del'>-	 * The driver should return 0 on success and a negative error code on</div><div class='del'>-	 * failure.</div><div class='del'>-	 */</div><div class='del'>-	int (*fb_probe)(struct drm_fb_helper *helper,</div><div class='del'>-			struct drm_fb_helper_surface_size *sizes);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @fb_dirty:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Driver callback to update the framebuffer memory. If set, fbdev</div><div class='hunk'>@@ -99,6 +82,33 @@ struct drm_fb_helper_funcs {</div><div class='ctx'> 	 * 0 on success, or an error code otherwise.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*fb_dirty)(struct drm_fb_helper *helper, struct drm_clip_rect *clip);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @fb_restore:</div><div class='add'>+	 *</div><div class='add'>+	 * Driver callback to restore internal fbdev state. If set, fbdev</div><div class='add'>+	 * emulation will invoke this callback after restoring the display</div><div class='add'>+	 * mode.</div><div class='add'>+	 *</div><div class='add'>+	 * Only for i915. Do not use in new code.</div><div class='add'>+	 *</div><div class='add'>+	 * TODO: Fix i915 to not require this callback.</div><div class='add'>+	 */</div><div class='add'>+	void (*fb_restore)(struct drm_fb_helper *helper);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @fb_set_suspend:</div><div class='add'>+	 *</div><div class='add'>+	 * Driver callback to suspend or resume, if set, fbdev emulation will</div><div class='add'>+	 * invoke this callback during suspend and resume. Driver should call</div><div class='add'>+	 * fb_set_suspend() from their implementation. If not set, fbdev</div><div class='add'>+	 * emulation will invoke fb_set_suspend() directly.</div><div class='add'>+	 *</div><div class='add'>+	 * Only for i915. Do not use in new code.</div><div class='add'>+	 *</div><div class='add'>+	 * TODO: Fix i915 to not require this callback.</div><div class='add'>+	 */</div><div class='add'>+	void (*fb_set_suspend)(struct drm_fb_helper *helper, bool suspend);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -244,10 +254,9 @@ int drm_fb_helper_set_par(struct fb_info *info);</div><div class='ctx'> int drm_fb_helper_check_var(struct fb_var_screeninfo *var,</div><div class='ctx'> 			    struct fb_info *info);</div><div class='ctx'> </div><div class='del'>-int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper);</div><div class='add'>+int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper,</div><div class='add'>+					      bool force);</div><div class='ctx'> </div><div class='del'>-struct fb_info *drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper);</div><div class='del'>-void drm_fb_helper_release_info(struct drm_fb_helper *fb_helper);</div><div class='ctx'> void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper);</div><div class='ctx'> void drm_fb_helper_fill_info(struct fb_info *info,</div><div class='ctx'> 			     struct drm_fb_helper *fb_helper,</div><div class='hunk'>@@ -256,7 +265,9 @@ void drm_fb_helper_fill_info(struct fb_info *info,</div><div class='ctx'> void drm_fb_helper_damage_range(struct fb_info *info, off_t off, size_t len);</div><div class='ctx'> void drm_fb_helper_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u32 height);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FB_DEFERRED_IO</div><div class='ctx'> void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagereflist);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper, bool suspend);</div><div class='ctx'> void drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper,</div><div class='hunk'>@@ -271,9 +282,6 @@ int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);</div><div class='ctx'> int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper);</div><div class='ctx'> int drm_fb_helper_debug_enter(struct fb_info *info);</div><div class='ctx'> int drm_fb_helper_debug_leave(struct fb_info *info);</div><div class='del'>-</div><div class='del'>-void drm_fb_helper_lastclose(struct drm_device *dev);</div><div class='del'>-void drm_fb_helper_output_poll_changed(struct drm_device *dev);</div><div class='ctx'> #else</div><div class='ctx'> static inline void drm_fb_helper_prepare(struct drm_device *dev,</div><div class='ctx'> 					 struct drm_fb_helper *helper,</div><div class='hunk'>@@ -330,16 +338,6 @@ drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct fb_info *</div><div class='del'>-drm_fb_helper_alloc_info(struct drm_fb_helper *fb_helper)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void drm_fb_helper_release_info(struct drm_fb_helper *fb_helper)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -363,10 +361,12 @@ static inline int drm_fb_helper_ioctl(struct fb_info *info, unsigned int cmd,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FB_DEFERRED_IO</div><div class='ctx'> static inline void drm_fb_helper_deferred_io(struct fb_info *info,</div><div class='ctx'> 					     struct list_head *pagelist)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static inline void drm_fb_helper_set_suspend(struct drm_fb_helper *fb_helper,</div><div class='ctx'> 					     bool suspend)</div><div class='hunk'>@@ -397,14 +397,6 @@ static inline int drm_fb_helper_debug_leave(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void drm_fb_helper_lastclose(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void drm_fb_helper_output_poll_changed(struct drm_device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_fbdev_dma.h b/include/drm/drm_fbdev_dma.h<br/>index 2da7ee784133..fb3f2a9aa01a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fbdev_dma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fbdev_dma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fbdev_dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_fbdev_dma.h</a></div><div class='hunk'>@@ -3,13 +3,18 @@</div><div class='ctx'> #ifndef DRM_FBDEV_DMA_H</div><div class='ctx'> #define DRM_FBDEV_DMA_H</div><div class='ctx'> </div><div class='del'>-struct drm_device;</div><div class='add'>+struct drm_fb_helper;</div><div class='add'>+struct drm_fb_helper_surface_size;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DRM_FBDEV_EMULATION</div><div class='del'>-void drm_fbdev_dma_setup(struct drm_device *dev, unsigned int preferred_bpp);</div><div class='add'>+int drm_fbdev_dma_driver_fbdev_probe(struct drm_fb_helper *fb_helper,</div><div class='add'>+				     struct drm_fb_helper_surface_size *sizes);</div><div class='add'>+</div><div class='add'>+#define DRM_FBDEV_DMA_DRIVER_OPS \</div><div class='add'>+	.fbdev_probe = drm_fbdev_dma_driver_fbdev_probe</div><div class='ctx'> #else</div><div class='del'>-static inline void drm_fbdev_dma_setup(struct drm_device *dev, unsigned int preferred_bpp)</div><div class='del'>-{ }</div><div class='add'>+#define DRM_FBDEV_DMA_DRIVER_OPS \</div><div class='add'>+	.fbdev_probe = NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_fbdev_generic.h b/include/drm/drm_fbdev_generic.h<br/>deleted file mode 100644<br/>index 75799342098d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fbdev_generic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fbdev_generic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: MIT */</div><div class='del'>-</div><div class='del'>-#ifndef DRM_FBDEV_GENERIC_H</div><div class='del'>-#define DRM_FBDEV_GENERIC_H</div><div class='del'>-</div><div class='del'>-struct drm_device;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DRM_FBDEV_EMULATION</div><div class='del'>-void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp);</div><div class='del'>-#else</div><div class='del'>-static inline void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)</div><div class='del'>-{ }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/drm/drm_fbdev_shmem.h b/include/drm/drm_fbdev_shmem.h<br/>new file mode 100644<br/>index 000000000000..2fc708964d75<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fbdev_shmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_fbdev_shmem.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+</div><div class='add'>+#ifndef DRM_FBDEV_SHMEM_H</div><div class='add'>+#define DRM_FBDEV_SHMEM_H</div><div class='add'>+</div><div class='add'>+struct drm_fb_helper;</div><div class='add'>+struct drm_fb_helper_surface_size;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DRM_FBDEV_EMULATION</div><div class='add'>+int drm_fbdev_shmem_driver_fbdev_probe(struct drm_fb_helper *fb_helper,</div><div class='add'>+				       struct drm_fb_helper_surface_size *sizes);</div><div class='add'>+</div><div class='add'>+#define DRM_FBDEV_SHMEM_DRIVER_OPS \</div><div class='add'>+	.fbdev_probe = drm_fbdev_shmem_driver_fbdev_probe</div><div class='add'>+#else</div><div class='add'>+#define DRM_FBDEV_SHMEM_DRIVER_OPS \</div><div class='add'>+	.fbdev_probe = NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/drm_fbdev_ttm.h b/include/drm/drm_fbdev_ttm.h<br/>new file mode 100644<br/>index 000000000000..ad4a10bb4c78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fbdev_ttm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_fbdev_ttm.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+</div><div class='add'>+#ifndef DRM_FBDEV_TTM_H</div><div class='add'>+#define DRM_FBDEV_TTM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_fb_helper;</div><div class='add'>+struct drm_fb_helper_surface_size;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DRM_FBDEV_EMULATION</div><div class='add'>+int drm_fbdev_ttm_driver_fbdev_probe(struct drm_fb_helper *fb_helper,</div><div class='add'>+				     struct drm_fb_helper_surface_size *sizes);</div><div class='add'>+</div><div class='add'>+#define DRM_FBDEV_TTM_DRIVER_OPS \</div><div class='add'>+	.fbdev_probe = drm_fbdev_ttm_driver_fbdev_probe</div><div class='add'>+#else</div><div class='add'>+#define DRM_FBDEV_TTM_DRIVER_OPS \</div><div class='add'>+	.fbdev_probe = NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h<br/>index ab230d3af138..1a3018e4a537 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_file.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_file.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_file.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_file.h</a></div><div class='hunk'>@@ -45,6 +45,8 @@ struct drm_printer;</div><div class='ctx'> struct device;</div><div class='ctx'> struct file;</div><div class='ctx'> </div><div class='add'>+extern struct xarray drm_minors_xa;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * FIXME: Not sure we want to have drm_minor here in the end, but to avoid</div><div class='ctx'>  * header include loops we need it here for now.</div><div class='hunk'>@@ -205,6 +207,13 @@ struct drm_file {</div><div class='ctx'> 	bool writeback_connectors;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @plane_color_pipeline:</div><div class='add'>+	 *</div><div class='add'>+	 * True if client understands plane color pipelines</div><div class='add'>+	 */</div><div class='add'>+	bool plane_color_pipeline;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @was_master:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This client has or had, master capability. Protected by struct</div><div class='hunk'>@@ -298,6 +307,9 @@ struct drm_file {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Mapping of mm object handles to object pointers. Used by the GEM</div><div class='ctx'> 	 * subsystem. Protected by @table_lock.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that allocated entries might be NULL as a transient state when</div><div class='add'>+	 * creating or deleting a handle.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct idr object_idr;</div><div class='ctx'> </div><div class='hunk'>@@ -386,6 +398,25 @@ struct drm_file {</div><div class='ctx'> 	 * Per-file buffer caches used by the PRIME buffer sharing code.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_prime_file_private prime;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @client_name:</div><div class='add'>+	 *</div><div class='add'>+	 * Userspace-provided name; useful for accounting and debugging.</div><div class='add'>+	 */</div><div class='add'>+	const char *client_name;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @client_name_lock: Protects @client_name.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex client_name_lock;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @debugfs_client:</div><div class='add'>+	 *</div><div class='add'>+	 * debugfs directory for each client under a drm node.</div><div class='add'>+	 */</div><div class='add'>+	struct dentry *debugfs_client;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -432,8 +463,14 @@ static inline bool drm_is_accel_client(const struct drm_file *file_priv)</div><div class='ctx'> 	return file_priv-&gt;minor-&gt;type == DRM_MINOR_ACCEL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+__printf(2, 3)</div><div class='add'>+void drm_file_err(struct drm_file *file_priv, const char *fmt, ...);</div><div class='add'>+</div><div class='ctx'> void drm_file_update_pid(struct drm_file *);</div><div class='ctx'> </div><div class='add'>+struct drm_minor *drm_minor_acquire(struct xarray *minors_xa, unsigned int minor_id);</div><div class='add'>+void drm_minor_release(struct drm_minor *minor);</div><div class='add'>+</div><div class='ctx'> int drm_open(struct inode *inode, struct file *filp);</div><div class='ctx'> int drm_open_helper(struct file *filp, struct drm_minor *minor);</div><div class='ctx'> ssize_t drm_read(struct file *filp, char __user *buffer,</div><div class='hunk'>@@ -477,6 +514,12 @@ struct drm_memory_stats {</div><div class='ctx'> </div><div class='ctx'> enum drm_gem_object_status;</div><div class='ctx'> </div><div class='add'>+int drm_memory_stats_is_zero(const struct drm_memory_stats *stats);</div><div class='add'>+void drm_fdinfo_print_size(struct drm_printer *p,</div><div class='add'>+			   const char *prefix,</div><div class='add'>+			   const char *stat,</div><div class='add'>+			   const char *region,</div><div class='add'>+			   u64 sz);</div><div class='ctx'> void drm_print_memory_stats(struct drm_printer *p,</div><div class='ctx'> 			    const struct drm_memory_stats *stats,</div><div class='ctx'> 			    enum drm_gem_object_status supported_status,</div><div class='head'>diff --git a/include/drm/drm_fixed.h b/include/drm/drm_fixed.h<br/>index 6ea339d5de08..33de514a5221 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fixed.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fixed.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fixed.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_fixed.h</a></div><div class='hunk'>@@ -25,8 +25,9 @@</div><div class='ctx'> #ifndef DRM_FIXED_H</div><div class='ctx'> #define DRM_FIXED_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/wordpart.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef union dfixed {</div><div class='ctx'> 	u32 full;</div><div class='hunk'>@@ -71,13 +72,29 @@ static inline u32 dfixed_div(fixed20_12 A, fixed20_12 B)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DRM_FIXED_POINT		32</div><div class='del'>-#define DRM_FIXED_POINT_HALF	16</div><div class='ctx'> #define DRM_FIXED_ONE		(1ULL &lt;&lt; DRM_FIXED_POINT)</div><div class='ctx'> #define DRM_FIXED_DECIMAL_MASK	(DRM_FIXED_ONE - 1)</div><div class='ctx'> #define DRM_FIXED_DIGITS_MASK	(~DRM_FIXED_DECIMAL_MASK)</div><div class='ctx'> #define DRM_FIXED_EPSILON	1LL</div><div class='ctx'> #define DRM_FIXED_ALMOST_ONE	(DRM_FIXED_ONE - DRM_FIXED_EPSILON)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * @drm_sm2fixp</div><div class='add'>+ *</div><div class='add'>+ * Convert a 1.31.32 signed-magnitude fixed point to 32.32</div><div class='add'>+ * 2s-complement fixed point</div><div class='add'>+ *</div><div class='add'>+ * @return s64 2s-complement fixed point</div><div class='add'>+ */</div><div class='add'>+static inline s64 drm_sm2fixp(__u64 a)</div><div class='add'>+{</div><div class='add'>+	if ((a &amp; (1LL &lt;&lt; 63))) {</div><div class='add'>+		return -(a &amp; 0x7fffffffffffffffll);</div><div class='add'>+	} else {</div><div class='add'>+		return a;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline s64 drm_int2fixp(int a)</div><div class='ctx'> {</div><div class='ctx'> 	return ((s64)a) &lt;&lt; DRM_FIXED_POINT;</div><div class='hunk'>@@ -90,12 +107,12 @@ static inline int drm_fixp2int(s64 a)</div><div class='ctx'> </div><div class='ctx'> static inline int drm_fixp2int_round(s64 a)</div><div class='ctx'> {</div><div class='del'>-	return drm_fixp2int(a + (1 &lt;&lt; (DRM_FIXED_POINT_HALF - 1)));</div><div class='add'>+	return drm_fixp2int(a + DRM_FIXED_ONE / 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int drm_fixp2int_ceil(s64 a)</div><div class='ctx'> {</div><div class='del'>-	if (a &gt; 0)</div><div class='add'>+	if (a &gt;= 0)</div><div class='ctx'> 		return drm_fixp2int(a + DRM_FIXED_ALMOST_ONE);</div><div class='ctx'> 	else</div><div class='ctx'> 		return drm_fixp2int(a - DRM_FIXED_ALMOST_ONE);</div><div class='hunk'>@@ -215,4 +232,27 @@ static inline s64 drm_fixp_exp(s64 x)</div><div class='ctx'> 	return sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int fxp_q4_from_int(int val_int)</div><div class='add'>+{</div><div class='add'>+	return val_int &lt;&lt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int fxp_q4_to_int(int val_q4)</div><div class='add'>+{</div><div class='add'>+	return val_q4 &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int fxp_q4_to_int_roundup(int val_q4)</div><div class='add'>+{</div><div class='add'>+	return (val_q4 + 0xf) &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int fxp_q4_to_frac(int val_q4)</div><div class='add'>+{</div><div class='add'>+	return val_q4 &amp; 0xf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FXP_Q4_FMT		"%d.%04d"</div><div class='add'>+#define FXP_Q4_ARGS(val_q4)	fxp_q4_to_int(val_q4), (fxp_q4_to_frac(val_q4) * 625)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h<br/>index f13b34e0b752..2b5c1aef80b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_format_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_format_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_format_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_format_helper.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@ struct iosys_map;</div><div class='ctx'>  * All fields are considered private.</div><div class='ctx'>  */</div><div class='ctx'> struct drm_format_conv_state {</div><div class='add'>+	/* private: */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		void *mem;</div><div class='ctx'> 		size_t size;</div><div class='hunk'>@@ -81,8 +82,10 @@ void drm_fb_xrgb8888_to_rgb332(struct iosys_map *dst, const unsigned int *dst_pi</div><div class='ctx'> 			       const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='ctx'> void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='ctx'> 			       const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='del'>-			       const struct drm_rect *clip, struct drm_format_conv_state *state,</div><div class='del'>-			       bool swab);</div><div class='add'>+			       const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='add'>+void drm_fb_xrgb8888_to_rgb565be(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='add'>+				 const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='add'>+				 const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='ctx'> void drm_fb_xrgb8888_to_xrgb1555(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='ctx'> 				 const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='ctx'> 				 const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='hunk'>@@ -95,9 +98,21 @@ void drm_fb_xrgb8888_to_rgba5551(struct iosys_map *dst, const unsigned int *dst_</div><div class='ctx'> void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='ctx'> 			       const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='ctx'> 			       const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='add'>+void drm_fb_xrgb8888_to_bgr888(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='add'>+			       const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='add'>+			       const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='ctx'> void drm_fb_xrgb8888_to_argb8888(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='ctx'> 				 const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='ctx'> 				 const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='add'>+void drm_fb_xrgb8888_to_abgr8888(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='add'>+				 const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='add'>+				 const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='add'>+void drm_fb_xrgb8888_to_xbgr8888(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='add'>+				 const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='add'>+				 const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='add'>+void drm_fb_xrgb8888_to_bgrx8888(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='add'>+				 const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='add'>+				 const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='ctx'> void drm_fb_xrgb8888_to_xrgb2101010(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='ctx'> 				    const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='ctx'> 				    const struct drm_rect *clip,</div><div class='hunk'>@@ -109,17 +124,16 @@ void drm_fb_xrgb8888_to_argb2101010(struct iosys_map *dst, const unsigned int *d</div><div class='ctx'> void drm_fb_xrgb8888_to_gray8(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='ctx'> 			      const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='ctx'> 			      const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='del'>-</div><div class='del'>-int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t dst_format,</div><div class='del'>-		const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='del'>-		const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='add'>+void drm_fb_argb8888_to_argb4444(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='add'>+				 const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='add'>+				 const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='ctx'> </div><div class='ctx'> void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='ctx'> 			     const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='ctx'> 			     const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='ctx'> </div><div class='del'>-size_t drm_fb_build_fourcc_list(struct drm_device *dev,</div><div class='del'>-				const u32 *native_fourccs, size_t native_nfourccs,</div><div class='del'>-				u32 *fourccs_out, size_t nfourccs_out);</div><div class='add'>+void drm_fb_xrgb8888_to_gray2(struct iosys_map *dst, const unsigned int *dst_pitch,</div><div class='add'>+			      const struct iosys_map *src, const struct drm_framebuffer *fb,</div><div class='add'>+			      const struct drm_rect *clip, struct drm_format_conv_state *state);</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_DRM_FORMAT_HELPER_H */</div><div class='head'>diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h<br/>index ccf91daa4307..471784426857 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fourcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_fourcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_fourcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_fourcc.h</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct drm_device;</div><div class='del'>-struct drm_mode_fb_cmd2;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_format_info - information about a DRM format</div><div class='hunk'>@@ -309,10 +308,11 @@ const struct drm_format_info *__drm_format_info(u32 format);</div><div class='ctx'> const struct drm_format_info *drm_format_info(u32 format);</div><div class='ctx'> const struct drm_format_info *</div><div class='ctx'> drm_get_format_info(struct drm_device *dev,</div><div class='del'>-		    const struct drm_mode_fb_cmd2 *mode_cmd);</div><div class='add'>+		    u32 pixel_format, u64 modifier);</div><div class='ctx'> uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth);</div><div class='ctx'> uint32_t drm_driver_legacy_fb_format(struct drm_device *dev,</div><div class='ctx'> 				     uint32_t bpp, uint32_t depth);</div><div class='add'>+uint32_t drm_driver_color_mode_format(struct drm_device *dev, unsigned int color_mode);</div><div class='ctx'> unsigned int drm_format_info_block_width(const struct drm_format_info *info,</div><div class='ctx'> 					 int plane);</div><div class='ctx'> unsigned int drm_format_info_block_height(const struct drm_format_info *info,</div><div class='head'>diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h<br/>index 668077009fce..38b24fc8978d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_framebuffer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_framebuffer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_framebuffer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_framebuffer.h</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #ifndef __DRM_FRAMEBUFFER_H__</div><div class='ctx'> #define __DRM_FRAMEBUFFER_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -100,6 +101,8 @@ struct drm_framebuffer_funcs {</div><div class='ctx'> 		     unsigned num_clips);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define DRM_FRAMEBUFFER_HAS_HANDLE_REF(_i)	BIT(0u + (_i))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_framebuffer - frame buffer object</div><div class='ctx'>  *</div><div class='hunk'>@@ -189,6 +192,10 @@ struct drm_framebuffer {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int flags;</div><div class='ctx'> 	/**</div><div class='add'>+	 * @internal_flags: Framebuffer flags like DRM_FRAMEBUFFER_HAS_HANDLE_REF.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int internal_flags;</div><div class='add'>+	/**</div><div class='ctx'> 	 * @filp_head: Placed on &amp;drm_file.fbs, protected by &amp;drm_file.fbs_lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head filp_head;</div><div class='head'>diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h<br/>index 369505447acd..8d48d2af2649 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_gem.h</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/dma-buf.h&gt;</div><div class='ctx'> #include &lt;linux/dma-resv.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -48,19 +49,21 @@ struct drm_gem_object;</div><div class='ctx'>  * enum drm_gem_object_status - bitmask of object state for fdinfo reporting</div><div class='ctx'>  * @DRM_GEM_OBJECT_RESIDENT: object is resident in memory (ie. not unpinned)</div><div class='ctx'>  * @DRM_GEM_OBJECT_PURGEABLE: object marked as purgeable by userspace</div><div class='add'>+ * @DRM_GEM_OBJECT_ACTIVE: object is currently used by an active submission</div><div class='ctx'>  *</div><div class='ctx'>  * Bitmask of status used for fdinfo memory stats, see &amp;drm_gem_object_funcs.status</div><div class='del'>- * and drm_show_fdinfo().  Note that an object can DRM_GEM_OBJECT_PURGEABLE if</div><div class='del'>- * it still active or not resident, in which case drm_show_fdinfo() will not</div><div class='add'>+ * and drm_show_fdinfo().  Note that an object can report DRM_GEM_OBJECT_PURGEABLE</div><div class='add'>+ * and be active or not resident, in which case drm_show_fdinfo() will not</div><div class='ctx'>  * account for it as purgeable.  So drivers do not need to check if the buffer</div><div class='del'>- * is idle and resident to return this bit.  (Ie. userspace can mark a buffer</div><div class='del'>- * as purgeable even while it is still busy on the GPU.. it does not _actually_</div><div class='del'>- * become puregeable until it becomes idle.  The status gem object func does</div><div class='del'>- * not need to consider this.)</div><div class='add'>+ * is idle and resident to return this bit, i.e. userspace can mark a buffer as</div><div class='add'>+ * purgeable even while it is still busy on the GPU. It will not get reported in</div><div class='add'>+ * the puregeable stats until it becomes idle.  The status gem object func does</div><div class='add'>+ * not need to consider this.</div><div class='ctx'>  */</div><div class='ctx'> enum drm_gem_object_status {</div><div class='ctx'> 	DRM_GEM_OBJECT_RESIDENT  = BIT(0),</div><div class='ctx'> 	DRM_GEM_OBJECT_PURGEABLE = BIT(1),</div><div class='add'>+	DRM_GEM_OBJECT_ACTIVE    = BIT(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -123,7 +126,8 @@ struct drm_gem_object_funcs {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @pin:</div><div class='ctx'> 	 *</div><div class='del'>-	 * Pin backing buffer in memory. Used by the drm_gem_map_attach() helper.</div><div class='add'>+	 * Pin backing buffer in memory, such that dma-buf importers can</div><div class='add'>+	 * access it. Used by the drm_gem_map_attach() helper.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This callback is optional.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -156,7 +160,8 @@ struct drm_gem_object_funcs {</div><div class='ctx'> 	 * @vmap:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Returns a virtual address for the buffer. Used by the</div><div class='del'>-	 * drm_gem_dmabuf_vmap() helper.</div><div class='add'>+	 * drm_gem_dmabuf_vmap() helper. Called with a held GEM reservation</div><div class='add'>+	 * lock.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This callback is optional.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -166,7 +171,8 @@ struct drm_gem_object_funcs {</div><div class='ctx'> 	 * @vunmap:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Releases the address previously returned by @vmap. Used by the</div><div class='del'>-	 * drm_gem_dmabuf_vunmap() helper.</div><div class='add'>+	 * drm_gem_dmabuf_vunmap() helper. Called with a held GEM reservation</div><div class='add'>+	 * lock.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This callback is optional.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -189,7 +195,8 @@ struct drm_gem_object_funcs {</div><div class='ctx'> 	 * @evict:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Evicts gem object out from memory. Used by the drm_gem_object_evict()</div><div class='del'>-	 * helper. Returns 0 on success, -errno otherwise.</div><div class='add'>+	 * helper. Returns 0 on success, -errno otherwise. Called with a held</div><div class='add'>+	 * GEM reservation lock.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This callback is optional.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -391,19 +398,34 @@ struct drm_gem_object {</div><div class='ctx'> 	struct dma_resv _resv;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @gpuva:</div><div class='add'>+	 * @gpuva: Fields used by GPUVM to manage mappings pointing to this GEM object.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Provides the list of GPU VAs attached to this GEM object.</div><div class='add'>+	 * When DRM_GPUVM_IMMEDIATE_MODE is set, this list is protected by the</div><div class='add'>+	 * mutex. Otherwise, the list is protected by the GEMs &amp;dma_resv lock.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Drivers should lock list accesses with the GEMs &amp;dma_resv lock</div><div class='del'>-	 * (&amp;drm_gem_object.resv) or a custom lock if one is provided.</div><div class='add'>+	 * Note that all entries in this list must agree on whether</div><div class='add'>+	 * DRM_GPUVM_IMMEDIATE_MODE is set.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct {</div><div class='add'>+		/**</div><div class='add'>+		 * @gpuva.list: list of GPUVM mappings attached to this GEM object.</div><div class='add'>+		 *</div><div class='add'>+		 * Drivers should lock list accesses with either the GEMs</div><div class='add'>+		 * &amp;dma_resv lock (&amp;drm_gem_object.resv) or the</div><div class='add'>+		 * &amp;drm_gem_object.gpuva.lock mutex.</div><div class='add'>+		 */</div><div class='ctx'> 		struct list_head list;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='del'>-		struct lockdep_map *lock_dep_map;</div><div class='del'>-#endif</div><div class='add'>+		/**</div><div class='add'>+		 * @gpuva.lock: lock protecting access to &amp;drm_gem_object.gpuva.list</div><div class='add'>+		 * when DRM_GPUVM_IMMEDIATE_MODE is used.</div><div class='add'>+		 *</div><div class='add'>+		 * Only used when DRM_GPUVM_IMMEDIATE_MODE is set. It should be</div><div class='add'>+		 * safe to take this mutex during the fence signalling path, so</div><div class='add'>+		 * do not allocate memory while holding this lock. Otherwise,</div><div class='add'>+		 * the &amp;dma_resv lock should be used.</div><div class='add'>+		 */</div><div class='add'>+		struct mutex lock;</div><div class='ctx'> 	} gpuva;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='hunk'>@@ -447,7 +469,8 @@ struct drm_gem_object {</div><div class='ctx'> 	.poll		= drm_poll,\</div><div class='ctx'> 	.read		= drm_read,\</div><div class='ctx'> 	.llseek		= noop_llseek,\</div><div class='del'>-	.mmap		= drm_gem_mmap</div><div class='add'>+	.mmap		= drm_gem_mmap, \</div><div class='add'>+	.fop_flags	= FOP_UNSIGNED_OFFSET</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DEFINE_DRM_GEM_FOPS() - macro to generate file operations for GEM drivers</div><div class='hunk'>@@ -472,6 +495,9 @@ void drm_gem_object_release(struct drm_gem_object *obj);</div><div class='ctx'> void drm_gem_object_free(struct kref *kref);</div><div class='ctx'> int drm_gem_object_init(struct drm_device *dev,</div><div class='ctx'> 			struct drm_gem_object *obj, size_t size);</div><div class='add'>+int drm_gem_object_init_with_mnt(struct drm_device *dev,</div><div class='add'>+				 struct drm_gem_object *obj, size_t size,</div><div class='add'>+				 struct vfsmount *gemfs);</div><div class='ctx'> void drm_gem_private_object_init(struct drm_device *dev,</div><div class='ctx'> 				 struct drm_gem_object *obj, size_t size);</div><div class='ctx'> void drm_gem_private_object_fini(struct drm_gem_object *obj);</div><div class='hunk'>@@ -527,8 +553,11 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj);</div><div class='ctx'> void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,</div><div class='ctx'> 		bool dirty, bool accessed);</div><div class='ctx'> </div><div class='del'>-int drm_gem_vmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map);</div><div class='del'>-void drm_gem_vunmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map);</div><div class='add'>+void drm_gem_lock(struct drm_gem_object *obj);</div><div class='add'>+void drm_gem_unlock(struct drm_gem_object *obj);</div><div class='add'>+</div><div class='add'>+int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);</div><div class='add'>+void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);</div><div class='ctx'> </div><div class='ctx'> int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,</div><div class='ctx'> 			   int count, struct drm_gem_object ***objs_out);</div><div class='hunk'>@@ -546,34 +575,47 @@ void drm_gem_lru_init(struct drm_gem_lru *lru, struct mutex *lock);</div><div class='ctx'> void drm_gem_lru_remove(struct drm_gem_object *obj);</div><div class='ctx'> void drm_gem_lru_move_tail_locked(struct drm_gem_lru *lru, struct drm_gem_object *obj);</div><div class='ctx'> void drm_gem_lru_move_tail(struct drm_gem_lru *lru, struct drm_gem_object *obj);</div><div class='del'>-unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru,</div><div class='del'>-			       unsigned int nr_to_scan,</div><div class='del'>-			       unsigned long *remaining,</div><div class='del'>-			       bool (*shrink)(struct drm_gem_object *obj));</div><div class='add'>+unsigned long</div><div class='add'>+drm_gem_lru_scan(struct drm_gem_lru *lru,</div><div class='add'>+		 unsigned int nr_to_scan,</div><div class='add'>+		 unsigned long *remaining,</div><div class='add'>+		 bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket),</div><div class='add'>+		 struct ww_acquire_ctx *ticket);</div><div class='ctx'> </div><div class='del'>-int drm_gem_evict(struct drm_gem_object *obj);</div><div class='add'>+int drm_gem_evict_locked(struct drm_gem_object *obj);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='ctx'> /**</div><div class='del'>- * drm_gem_gpuva_set_lock() - Set the lock protecting accesses to the gpuva list.</div><div class='del'>- * @obj: the &amp;drm_gem_object</div><div class='del'>- * @lock: the lock used to protect the gpuva list. The locking primitive</div><div class='del'>- * must contain a dep_map field.</div><div class='add'>+ * drm_gem_object_is_shared_for_memory_stats - helper for shared memory stats</div><div class='add'>+ *</div><div class='add'>+ * This helper should only be used for fdinfo shared memory stats to determine</div><div class='add'>+ * if a GEM object is shared.</div><div class='add'>+ *</div><div class='add'>+ * @obj: obj in question</div><div class='add'>+ */</div><div class='add'>+static inline bool drm_gem_object_is_shared_for_memory_stats(struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	return (obj-&gt;handle_count &gt; 1) || obj-&gt;dma_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gem_is_imported() - Tests if GEM object's buffer has been imported</div><div class='add'>+ * @obj: the GEM object</div><div class='ctx'>  *</div><div class='del'>- * Call this if you're not proctecting access to the gpuva list with the</div><div class='del'>- * dma-resv lock, but with a custom lock.</div><div class='add'>+ * Returns:</div><div class='add'>+ * True if the GEM object's buffer has been imported, false otherwise</div><div class='ctx'>  */</div><div class='del'>-#define drm_gem_gpuva_set_lock(obj, lock) \</div><div class='del'>-	if (!WARN((obj)-&gt;gpuva.lock_dep_map, \</div><div class='del'>-		  "GEM GPUVA lock should be set only once.")) \</div><div class='del'>-		(obj)-&gt;gpuva.lock_dep_map = &amp;(lock)-&gt;dep_map</div><div class='del'>-#define drm_gem_gpuva_assert_lock_held(obj) \</div><div class='del'>-	lockdep_assert((obj)-&gt;gpuva.lock_dep_map ? \</div><div class='del'>-		       lock_is_held((obj)-&gt;gpuva.lock_dep_map) : \</div><div class='add'>+static inline bool drm_gem_is_imported(const struct drm_gem_object *obj)</div><div class='add'>+{</div><div class='add'>+	return !!obj-&gt;import_attach;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+#define drm_gem_gpuva_assert_lock_held(gpuvm, obj) \</div><div class='add'>+	lockdep_assert(drm_gpuvm_immediate_mode(gpuvm) ? \</div><div class='add'>+		       lockdep_is_held(&amp;(obj)-&gt;gpuva.lock) : \</div><div class='ctx'> 		       dma_resv_held((obj)-&gt;resv))</div><div class='ctx'> #else</div><div class='del'>-#define drm_gem_gpuva_set_lock(obj, lock) do {} while (0)</div><div class='del'>-#define drm_gem_gpuva_assert_lock_held(obj) do {} while (0)</div><div class='add'>+#define drm_gem_gpuva_assert_lock_held(gpuvm, obj) do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/drm/drm_gem_dma_helper.h b/include/drm/drm_gem_dma_helper.h<br/>index a827bde494f6..f2678e7ecb98 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem_dma_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem_dma_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem_dma_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_gem_dma_helper.h</a></div><div class='hunk'>@@ -267,6 +267,7 @@ unsigned long drm_gem_dma_get_unmapped_area(struct file *filp,</div><div class='ctx'> 		.read		= drm_read,\</div><div class='ctx'> 		.llseek		= noop_llseek,\</div><div class='ctx'> 		.mmap		= drm_gem_mmap,\</div><div class='add'>+		.fop_flags = FOP_UNSIGNED_OFFSET, \</div><div class='ctx'> 		DRM_GEM_DMA_UNMAPPED_AREA_FOPS \</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/drm_gem_framebuffer_helper.h b/include/drm/drm_gem_framebuffer_helper.h<br/>index d302521f3dd4..24f1fd40d553 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem_framebuffer_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem_framebuffer_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem_framebuffer_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_gem_framebuffer_helper.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@ struct drm_afbc_framebuffer;</div><div class='ctx'> struct drm_device;</div><div class='ctx'> struct drm_fb_helper_surface_size;</div><div class='ctx'> struct drm_file;</div><div class='add'>+struct drm_format_info;</div><div class='ctx'> struct drm_framebuffer;</div><div class='ctx'> struct drm_framebuffer_funcs;</div><div class='ctx'> struct drm_gem_object;</div><div class='hunk'>@@ -24,17 +25,21 @@ int drm_gem_fb_create_handle(struct drm_framebuffer *fb, struct drm_file *file,</div><div class='ctx'> int drm_gem_fb_init_with_funcs(struct drm_device *dev,</div><div class='ctx'> 			       struct drm_framebuffer *fb,</div><div class='ctx'> 			       struct drm_file *file,</div><div class='add'>+			       const struct drm_format_info *info,</div><div class='ctx'> 			       const struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 			       const struct drm_framebuffer_funcs *funcs);</div><div class='ctx'> struct drm_framebuffer *</div><div class='ctx'> drm_gem_fb_create_with_funcs(struct drm_device *dev, struct drm_file *file,</div><div class='add'>+			     const struct drm_format_info *info,</div><div class='ctx'> 			     const struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 			     const struct drm_framebuffer_funcs *funcs);</div><div class='ctx'> struct drm_framebuffer *</div><div class='ctx'> drm_gem_fb_create(struct drm_device *dev, struct drm_file *file,</div><div class='add'>+		  const struct drm_format_info *info,</div><div class='ctx'> 		  const struct drm_mode_fb_cmd2 *mode_cmd);</div><div class='ctx'> struct drm_framebuffer *</div><div class='ctx'> drm_gem_fb_create_with_dirty(struct drm_device *dev, struct drm_file *file,</div><div class='add'>+			     const struct drm_format_info *info,</div><div class='ctx'> 			     const struct drm_mode_fb_cmd2 *mode_cmd);</div><div class='ctx'> </div><div class='ctx'> int drm_gem_fb_vmap(struct drm_framebuffer *fb, struct iosys_map *map,</div><div class='hunk'>@@ -47,6 +52,7 @@ void drm_gem_fb_end_cpu_access(struct drm_framebuffer *fb, enum dma_data_directi</div><div class='ctx'> 	(((modifier) &amp; AFBC_VENDOR_AND_TYPE_MASK) == DRM_FORMAT_MOD_ARM_AFBC(0))</div><div class='ctx'> </div><div class='ctx'> int drm_gem_fb_afbc_init(struct drm_device *dev,</div><div class='add'>+			 const struct drm_format_info *info,</div><div class='ctx'> 			 const struct drm_mode_fb_cmd2 *mode_cmd,</div><div class='ctx'> 			 struct drm_afbc_framebuffer *afbc_fb);</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h<br/>index bf0c31aa8fbe..589f7bfe7506 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem_shmem_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem_shmem_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem_shmem_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_gem_shmem_helper.h</a></div><div class='hunk'>@@ -37,7 +37,18 @@ struct drm_gem_shmem_object {</div><div class='ctx'> 	 * Reference count on the pages table.</div><div class='ctx'> 	 * The pages are put when the count reaches zero.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int pages_use_count;</div><div class='add'>+	refcount_t pages_use_count;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @pages_pin_count:</div><div class='add'>+	 *</div><div class='add'>+	 * Reference count on the pinned pages table.</div><div class='add'>+	 *</div><div class='add'>+	 * Pages are hard-pinned and reside in memory if count</div><div class='add'>+	 * greater than zero. Otherwise, when count is zero, the pages are</div><div class='add'>+	 * allowed to be evicted and purged by memory shrinker.</div><div class='add'>+	 */</div><div class='add'>+	refcount_t pages_pin_count;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @madv: State for madvise</div><div class='hunk'>@@ -71,7 +82,7 @@ struct drm_gem_shmem_object {</div><div class='ctx'> 	 * Reference count on the virtual address.</div><div class='ctx'> 	 * The address are un-mapped when the count reaches zero.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int vmap_use_count;</div><div class='add'>+	refcount_t vmap_use_count;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @pages_mark_dirty_on_put:</div><div class='hunk'>@@ -96,28 +107,36 @@ struct drm_gem_shmem_object {</div><div class='ctx'> #define to_drm_gem_shmem_obj(obj) \</div><div class='ctx'> 	container_of(obj, struct drm_gem_shmem_object, base)</div><div class='ctx'> </div><div class='add'>+int drm_gem_shmem_init(struct drm_device *dev, struct drm_gem_shmem_object *shmem, size_t size);</div><div class='ctx'> struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t size);</div><div class='add'>+struct drm_gem_shmem_object *drm_gem_shmem_create_with_mnt(struct drm_device *dev,</div><div class='add'>+							   size_t size,</div><div class='add'>+							   struct vfsmount *gemfs);</div><div class='add'>+void drm_gem_shmem_release(struct drm_gem_shmem_object *shmem);</div><div class='ctx'> void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem);</div><div class='ctx'> </div><div class='del'>-void drm_gem_shmem_put_pages(struct drm_gem_shmem_object *shmem);</div><div class='add'>+void drm_gem_shmem_put_pages_locked(struct drm_gem_shmem_object *shmem);</div><div class='ctx'> int drm_gem_shmem_pin(struct drm_gem_shmem_object *shmem);</div><div class='ctx'> void drm_gem_shmem_unpin(struct drm_gem_shmem_object *shmem);</div><div class='del'>-int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,</div><div class='del'>-		       struct iosys_map *map);</div><div class='del'>-void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,</div><div class='del'>-			  struct iosys_map *map);</div><div class='add'>+int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem,</div><div class='add'>+			      struct iosys_map *map);</div><div class='add'>+void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem,</div><div class='add'>+				 struct iosys_map *map);</div><div class='ctx'> int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='del'>-int drm_gem_shmem_madvise(struct drm_gem_shmem_object *shmem, int madv);</div><div class='add'>+int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem);</div><div class='add'>+void drm_gem_shmem_unpin_locked(struct drm_gem_shmem_object *shmem);</div><div class='add'>+</div><div class='add'>+int drm_gem_shmem_madvise_locked(struct drm_gem_shmem_object *shmem, int madv);</div><div class='ctx'> </div><div class='ctx'> static inline bool drm_gem_shmem_is_purgeable(struct drm_gem_shmem_object *shmem)</div><div class='ctx'> {</div><div class='ctx'> 	return (shmem-&gt;madv &gt; 0) &amp;&amp;</div><div class='del'>-		!shmem-&gt;vmap_use_count &amp;&amp; shmem-&gt;sgt &amp;&amp;</div><div class='del'>-		!shmem-&gt;base.dma_buf &amp;&amp; !shmem-&gt;base.import_attach;</div><div class='add'>+		!refcount_read(&amp;shmem-&gt;pages_pin_count) &amp;&amp; shmem-&gt;sgt &amp;&amp;</div><div class='add'>+		!shmem-&gt;base.dma_buf &amp;&amp; !drm_gem_is_imported(&amp;shmem-&gt;base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem);</div><div class='add'>+void drm_gem_shmem_purge_locked(struct drm_gem_shmem_object *shmem);</div><div class='ctx'> </div><div class='ctx'> struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem);</div><div class='ctx'> struct sg_table *drm_gem_shmem_get_pages_sgt(struct drm_gem_shmem_object *shmem);</div><div class='hunk'>@@ -173,7 +192,7 @@ static inline int drm_gem_shmem_object_pin(struct drm_gem_object *obj)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);</div><div class='ctx'> </div><div class='del'>-	return drm_gem_shmem_pin(shmem);</div><div class='add'>+	return drm_gem_shmem_pin_locked(shmem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -187,7 +206,7 @@ static inline void drm_gem_shmem_object_unpin(struct drm_gem_object *obj)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);</div><div class='ctx'> </div><div class='del'>-	drm_gem_shmem_unpin(shmem);</div><div class='add'>+	drm_gem_shmem_unpin_locked(shmem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -208,12 +227,12 @@ static inline struct sg_table *drm_gem_shmem_object_get_sg_table(struct drm_gem_</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * drm_gem_shmem_object_vmap - GEM object function for drm_gem_shmem_vmap()</div><div class='add'>+ * drm_gem_shmem_object_vmap - GEM object function for drm_gem_shmem_vmap_locked()</div><div class='ctx'>  * @obj: GEM object</div><div class='ctx'>  * @map: Returns the kernel virtual address of the SHMEM GEM object's backing store.</div><div class='ctx'>  *</div><div class='del'>- * This function wraps drm_gem_shmem_vmap(). Drivers that employ the shmem helpers should</div><div class='del'>- * use it as their &amp;drm_gem_object_funcs.vmap handler.</div><div class='add'>+ * This function wraps drm_gem_shmem_vmap_locked(). Drivers that employ the shmem</div><div class='add'>+ * helpers should use it as their &amp;drm_gem_object_funcs.vmap handler.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns:</div><div class='ctx'>  * 0 on success or a negative error code on failure.</div><div class='hunk'>@@ -223,7 +242,7 @@ static inline int drm_gem_shmem_object_vmap(struct drm_gem_object *obj,</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);</div><div class='ctx'> </div><div class='del'>-	return drm_gem_shmem_vmap(shmem, map);</div><div class='add'>+	return drm_gem_shmem_vmap_locked(shmem, map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -231,15 +250,15 @@ static inline int drm_gem_shmem_object_vmap(struct drm_gem_object *obj,</div><div class='ctx'>  * @obj: GEM object</div><div class='ctx'>  * @map: Kernel virtual address where the SHMEM GEM object was mapped</div><div class='ctx'>  *</div><div class='del'>- * This function wraps drm_gem_shmem_vunmap(). Drivers that employ the shmem helpers should</div><div class='del'>- * use it as their &amp;drm_gem_object_funcs.vunmap handler.</div><div class='add'>+ * This function wraps drm_gem_shmem_vunmap_locked(). Drivers that employ the shmem</div><div class='add'>+ * helpers should use it as their &amp;drm_gem_object_funcs.vunmap handler.</div><div class='ctx'>  */</div><div class='ctx'> static inline void drm_gem_shmem_object_vunmap(struct drm_gem_object *obj,</div><div class='ctx'> 					       struct iosys_map *map)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);</div><div class='ctx'> </div><div class='del'>-	drm_gem_shmem_vunmap(shmem, map);</div><div class='add'>+	drm_gem_shmem_vunmap_locked(shmem, map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -270,15 +289,18 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,</div><div class='ctx'> 				    struct sg_table *sgt);</div><div class='ctx'> int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,</div><div class='ctx'> 			      struct drm_mode_create_dumb *args);</div><div class='add'>+struct drm_gem_object *drm_gem_shmem_prime_import_no_map(struct drm_device *dev,</div><div class='add'>+							 struct dma_buf *buf);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DRM_GEM_SHMEM_DRIVER_OPS - Default shmem GEM operations</div><div class='ctx'>  *</div><div class='del'>- * This macro provides a shortcut for setting the shmem GEM operations in</div><div class='del'>- * the &amp;drm_driver structure.</div><div class='add'>+ * This macro provides a shortcut for setting the shmem GEM operations</div><div class='add'>+ * in the &amp;drm_driver structure. Drivers that do not require an s/g table</div><div class='add'>+ * for imported buffers should use this.</div><div class='ctx'>  */</div><div class='ctx'> #define DRM_GEM_SHMEM_DRIVER_OPS \</div><div class='del'>-	.gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, \</div><div class='del'>-	.dumb_create		   = drm_gem_shmem_dumb_create</div><div class='add'>+	.gem_prime_import       = drm_gem_shmem_prime_import_no_map, \</div><div class='add'>+	.dumb_create            = drm_gem_shmem_dumb_create</div><div class='ctx'> </div><div class='ctx'> #endif /* __DRM_GEM_SHMEM_HELPER_H__ */</div><div class='head'>diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h<br/>index 2938ba80750d..2dd42bed679d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem_vram_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gem_vram_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gem_vram_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_gem_vram_helper.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> struct drm_mode_create_dumb;</div><div class='ctx'> struct drm_plane;</div><div class='ctx'> struct drm_plane_state;</div><div class='del'>-struct drm_simple_display_pipe;</div><div class='ctx'> struct filp;</div><div class='ctx'> struct vm_area_struct;</div><div class='ctx'> </div><div class='hunk'>@@ -95,8 +94,6 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,</div><div class='ctx'> 						unsigned long pg_align);</div><div class='ctx'> void drm_gem_vram_put(struct drm_gem_vram_object *gbo);</div><div class='ctx'> s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo);</div><div class='del'>-int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, unsigned long pl_flag);</div><div class='del'>-int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo);</div><div class='ctx'> int drm_gem_vram_vmap(struct drm_gem_vram_object *gbo, struct iosys_map *map);</div><div class='ctx'> void drm_gem_vram_vunmap(struct drm_gem_vram_object *gbo,</div><div class='ctx'> 			 struct iosys_map *map);</div><div class='hunk'>@@ -137,18 +134,6 @@ drm_gem_vram_plane_helper_cleanup_fb(struct drm_plane *plane,</div><div class='ctx'> 	.prepare_fb = drm_gem_vram_plane_helper_prepare_fb, \</div><div class='ctx'> 	.cleanup_fb = drm_gem_vram_plane_helper_cleanup_fb</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Helpers for struct drm_simple_display_pipe_funcs</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int drm_gem_vram_simple_display_pipe_prepare_fb(</div><div class='del'>-	struct drm_simple_display_pipe *pipe,</div><div class='del'>-	struct drm_plane_state *new_state);</div><div class='del'>-</div><div class='del'>-void drm_gem_vram_simple_display_pipe_cleanup_fb(</div><div class='del'>-	struct drm_simple_display_pipe *pipe,</div><div class='del'>-	struct drm_plane_state *old_state);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * define DRM_GEM_VRAM_DRIVER - default callback functions for</div><div class='ctx'>  *				&amp;struct drm_driver</div><div class='hunk'>@@ -170,7 +155,6 @@ void drm_gem_vram_simple_display_pipe_cleanup_fb(</div><div class='ctx'>  * @vram_base:	Base address of the managed video memory</div><div class='ctx'>  * @vram_size:	Size of the managed video memory in bytes</div><div class='ctx'>  * @bdev:	The TTM BO device.</div><div class='del'>- * @funcs:	TTM BO functions</div><div class='ctx'>  *</div><div class='ctx'>  * The fields &amp;struct drm_vram_mm.vram_base and</div><div class='ctx'>  * &amp;struct drm_vram_mm.vrm_size are managed by VRAM MM, but are</div><div class='head'>diff --git a/include/drm/drm_gpusvm.h b/include/drm/drm_gpusvm.h<br/>new file mode 100644<br/>index 000000000000..632e100e6efb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gpusvm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_gpusvm.h</a></div><div class='hunk'>@@ -0,0 +1,542 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DRM_GPUSVM_H__</div><div class='add'>+#define __DRM_GPUSVM_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/interval_tree.h&gt;</div><div class='add'>+#include &lt;linux/mmu_notifier.h&gt;</div><div class='add'>+</div><div class='add'>+struct dev_pagemap_ops;</div><div class='add'>+struct drm_device;</div><div class='add'>+struct drm_gpusvm;</div><div class='add'>+struct drm_gpusvm_notifier;</div><div class='add'>+struct drm_gpusvm_ops;</div><div class='add'>+struct drm_gpusvm_range;</div><div class='add'>+struct drm_pagemap;</div><div class='add'>+struct drm_pagemap_addr;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_gpusvm_ops - Operations structure for GPU SVM</div><div class='add'>+ *</div><div class='add'>+ * This structure defines the operations for GPU Shared Virtual Memory (SVM).</div><div class='add'>+ * These operations are provided by the GPU driver to manage SVM ranges and</div><div class='add'>+ * notifiers.</div><div class='add'>+ */</div><div class='add'>+struct drm_gpusvm_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * @notifier_alloc: Allocate a GPU SVM notifier (optional)</div><div class='add'>+	 *</div><div class='add'>+	 * Allocate a GPU SVM notifier.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: Pointer to the allocated GPU SVM notifier on success, NULL on failure.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_gpusvm_notifier *(*notifier_alloc)(void);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @notifier_free: Free a GPU SVM notifier (optional)</div><div class='add'>+	 * @notifier: Pointer to the GPU SVM notifier to be freed</div><div class='add'>+	 *</div><div class='add'>+	 * Free a GPU SVM notifier.</div><div class='add'>+	 */</div><div class='add'>+	void (*notifier_free)(struct drm_gpusvm_notifier *notifier);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @range_alloc: Allocate a GPU SVM range (optional)</div><div class='add'>+	 * @gpusvm: Pointer to the GPU SVM</div><div class='add'>+	 *</div><div class='add'>+	 * Allocate a GPU SVM range.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: Pointer to the allocated GPU SVM range on success, NULL on failure.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_gpusvm_range *(*range_alloc)(struct drm_gpusvm *gpusvm);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @range_free: Free a GPU SVM range (optional)</div><div class='add'>+	 * @range: Pointer to the GPU SVM range to be freed</div><div class='add'>+	 *</div><div class='add'>+	 * Free a GPU SVM range.</div><div class='add'>+	 */</div><div class='add'>+	void (*range_free)(struct drm_gpusvm_range *range);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @invalidate: Invalidate GPU SVM notifier (required)</div><div class='add'>+	 * @gpusvm: Pointer to the GPU SVM</div><div class='add'>+	 * @notifier: Pointer to the GPU SVM notifier</div><div class='add'>+	 * @mmu_range: Pointer to the mmu_notifier_range structure</div><div class='add'>+	 *</div><div class='add'>+	 * Invalidate the GPU page tables. It can safely walk the notifier range</div><div class='add'>+	 * RB tree/list in this function. Called while holding the notifier lock.</div><div class='add'>+	 */</div><div class='add'>+	void (*invalidate)(struct drm_gpusvm *gpusvm,</div><div class='add'>+			   struct drm_gpusvm_notifier *notifier,</div><div class='add'>+			   const struct mmu_notifier_range *mmu_range);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_gpusvm_notifier - Structure representing a GPU SVM notifier</div><div class='add'>+ *</div><div class='add'>+ * @gpusvm: Pointer to the GPU SVM structure</div><div class='add'>+ * @notifier: MMU interval notifier</div><div class='add'>+ * @itree: Interval tree node for the notifier (inserted in GPU SVM)</div><div class='add'>+ * @entry: List entry to fast interval tree traversal</div><div class='add'>+ * @root: Cached root node of the RB tree containing ranges</div><div class='add'>+ * @range_list: List head containing of ranges in the same order they appear in</div><div class='add'>+ *              interval tree. This is useful to keep iterating ranges while</div><div class='add'>+ *              doing modifications to RB tree.</div><div class='add'>+ * @flags: Flags for notifier</div><div class='add'>+ * @flags.removed: Flag indicating whether the MMU interval notifier has been</div><div class='add'>+ *                 removed</div><div class='add'>+ *</div><div class='add'>+ * This structure represents a GPU SVM notifier.</div><div class='add'>+ */</div><div class='add'>+struct drm_gpusvm_notifier {</div><div class='add'>+	struct drm_gpusvm *gpusvm;</div><div class='add'>+	struct mmu_interval_notifier notifier;</div><div class='add'>+	struct interval_tree_node itree;</div><div class='add'>+	struct list_head entry;</div><div class='add'>+	struct rb_root_cached root;</div><div class='add'>+	struct list_head range_list;</div><div class='add'>+	struct {</div><div class='add'>+		u32 removed : 1;</div><div class='add'>+	} flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_gpusvm_pages_flags - Structure representing a GPU SVM pages flags</div><div class='add'>+ *</div><div class='add'>+ * @migrate_devmem: Flag indicating whether the pages can be migrated to device memory</div><div class='add'>+ * @unmapped: Flag indicating if the pages has been unmapped</div><div class='add'>+ * @partial_unmap: Flag indicating if the pages has been partially unmapped</div><div class='add'>+ * @has_devmem_pages: Flag indicating if the pages has devmem pages</div><div class='add'>+ * @has_dma_mapping: Flag indicating if the pages has a DMA mapping</div><div class='add'>+ * @__flags: Flags for pages in u16 form (used for READ_ONCE)</div><div class='add'>+ */</div><div class='add'>+struct drm_gpusvm_pages_flags {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			/* All flags below must be set upon creation */</div><div class='add'>+			u16 migrate_devmem : 1;</div><div class='add'>+			/* All flags below must be set / cleared under notifier lock */</div><div class='add'>+			u16 unmapped : 1;</div><div class='add'>+			u16 partial_unmap : 1;</div><div class='add'>+			u16 has_devmem_pages : 1;</div><div class='add'>+			u16 has_dma_mapping : 1;</div><div class='add'>+		};</div><div class='add'>+		u16 __flags;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_gpusvm_pages - Structure representing a GPU SVM mapped pages</div><div class='add'>+ *</div><div class='add'>+ * @dma_addr: Device address array</div><div class='add'>+ * @dpagemap: The struct drm_pagemap of the device pages we're dma-mapping.</div><div class='add'>+ *            Note this is assuming only one drm_pagemap per range is allowed.</div><div class='add'>+ * @notifier_seq: Notifier sequence number of the range's pages</div><div class='add'>+ * @flags: Flags for range</div><div class='add'>+ * @flags.migrate_devmem: Flag indicating whether the range can be migrated to device memory</div><div class='add'>+ * @flags.unmapped: Flag indicating if the range has been unmapped</div><div class='add'>+ * @flags.partial_unmap: Flag indicating if the range has been partially unmapped</div><div class='add'>+ * @flags.has_devmem_pages: Flag indicating if the range has devmem pages</div><div class='add'>+ * @flags.has_dma_mapping: Flag indicating if the range has a DMA mapping</div><div class='add'>+ */</div><div class='add'>+struct drm_gpusvm_pages {</div><div class='add'>+	struct drm_pagemap_addr *dma_addr;</div><div class='add'>+	struct drm_pagemap *dpagemap;</div><div class='add'>+	unsigned long notifier_seq;</div><div class='add'>+	struct drm_gpusvm_pages_flags flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_gpusvm_range - Structure representing a GPU SVM range</div><div class='add'>+ *</div><div class='add'>+ * @gpusvm: Pointer to the GPU SVM structure</div><div class='add'>+ * @notifier: Pointer to the GPU SVM notifier</div><div class='add'>+ * @refcount: Reference count for the range</div><div class='add'>+ * @itree: Interval tree node for the range (inserted in GPU SVM notifier)</div><div class='add'>+ * @entry: List entry to fast interval tree traversal</div><div class='add'>+ * @pages: The pages for this range.</div><div class='add'>+ *</div><div class='add'>+ * This structure represents a GPU SVM range used for tracking memory ranges</div><div class='add'>+ * mapped in a DRM device.</div><div class='add'>+ */</div><div class='add'>+struct drm_gpusvm_range {</div><div class='add'>+	struct drm_gpusvm *gpusvm;</div><div class='add'>+	struct drm_gpusvm_notifier *notifier;</div><div class='add'>+	struct kref refcount;</div><div class='add'>+	struct interval_tree_node itree;</div><div class='add'>+	struct list_head entry;</div><div class='add'>+	struct drm_gpusvm_pages pages;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_gpusvm - GPU SVM structure</div><div class='add'>+ *</div><div class='add'>+ * @name: Name of the GPU SVM</div><div class='add'>+ * @drm: Pointer to the DRM device structure</div><div class='add'>+ * @mm: Pointer to the mm_struct for the address space</div><div class='add'>+ * @mm_start: Start address of GPU SVM</div><div class='add'>+ * @mm_range: Range of the GPU SVM</div><div class='add'>+ * @notifier_size: Size of individual notifiers</div><div class='add'>+ * @ops: Pointer to the operations structure for GPU SVM</div><div class='add'>+ * @chunk_sizes: Pointer to the array of chunk sizes used in range allocation.</div><div class='add'>+ *               Entries should be powers of 2 in descending order.</div><div class='add'>+ * @num_chunks: Number of chunks</div><div class='add'>+ * @notifier_lock: Read-write semaphore for protecting notifier operations</div><div class='add'>+ * @root: Cached root node of the Red-Black tree containing GPU SVM notifiers</div><div class='add'>+ * @notifier_list: list head containing of notifiers in the same order they</div><div class='add'>+ *                 appear in interval tree. This is useful to keep iterating</div><div class='add'>+ *                 notifiers while doing modifications to RB tree.</div><div class='add'>+ *</div><div class='add'>+ * This structure represents a GPU SVM (Shared Virtual Memory) used for tracking</div><div class='add'>+ * memory ranges mapped in a DRM (Direct Rendering Manager) device.</div><div class='add'>+ *</div><div class='add'>+ * No reference counting is provided, as this is expected to be embedded in the</div><div class='add'>+ * driver VM structure along with the struct drm_gpuvm, which handles reference</div><div class='add'>+ * counting.</div><div class='add'>+ */</div><div class='add'>+struct drm_gpusvm {</div><div class='add'>+	const char *name;</div><div class='add'>+	struct drm_device *drm;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+	unsigned long mm_start;</div><div class='add'>+	unsigned long mm_range;</div><div class='add'>+	unsigned long notifier_size;</div><div class='add'>+	const struct drm_gpusvm_ops *ops;</div><div class='add'>+	const unsigned long *chunk_sizes;</div><div class='add'>+	int num_chunks;</div><div class='add'>+	struct rw_semaphore notifier_lock;</div><div class='add'>+	struct rb_root_cached root;</div><div class='add'>+	struct list_head notifier_list;</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	/**</div><div class='add'>+	 * @lock_dep_map: Annotates drm_gpusvm_range_find_or_insert and</div><div class='add'>+	 * drm_gpusvm_range_remove with a driver provided lock.</div><div class='add'>+	 */</div><div class='add'>+	struct lockdep_map *lock_dep_map;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_gpusvm_ctx - DRM GPU SVM context</div><div class='add'>+ *</div><div class='add'>+ * @device_private_page_owner: The device-private page owner to use for</div><div class='add'>+ * this operation</div><div class='add'>+ * @check_pages_threshold: Check CPU pages for present if chunk is less than or</div><div class='add'>+ *                         equal to threshold. If not present, reduce chunk</div><div class='add'>+ *                         size.</div><div class='add'>+ * @timeslice_ms: The timeslice MS which in minimum time a piece of memory</div><div class='add'>+ *		  remains with either exclusive GPU or CPU access.</div><div class='add'>+ * @in_notifier: entering from a MMU notifier</div><div class='add'>+ * @read_only: operating on read-only memory</div><div class='add'>+ * @devmem_possible: possible to use device memory</div><div class='add'>+ * @devmem_only: use only device memory</div><div class='add'>+ * @allow_mixed: Allow mixed mappings in get pages. Mixing between system and</div><div class='add'>+ *               single dpagemap is supported, mixing between multiple dpagemap</div><div class='add'>+ *               is unsupported.</div><div class='add'>+ *</div><div class='add'>+ * Context that is DRM GPUSVM is operating in (i.e. user arguments).</div><div class='add'>+ */</div><div class='add'>+struct drm_gpusvm_ctx {</div><div class='add'>+	void *device_private_page_owner;</div><div class='add'>+	unsigned long check_pages_threshold;</div><div class='add'>+	unsigned long timeslice_ms;</div><div class='add'>+	unsigned int in_notifier :1;</div><div class='add'>+	unsigned int read_only :1;</div><div class='add'>+	unsigned int devmem_possible :1;</div><div class='add'>+	unsigned int devmem_only :1;</div><div class='add'>+	unsigned int allow_mixed :1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int drm_gpusvm_init(struct drm_gpusvm *gpusvm,</div><div class='add'>+		    const char *name, struct drm_device *drm,</div><div class='add'>+		    struct mm_struct *mm,</div><div class='add'>+		    unsigned long mm_start, unsigned long mm_range,</div><div class='add'>+		    unsigned long notifier_size,</div><div class='add'>+		    const struct drm_gpusvm_ops *ops,</div><div class='add'>+		    const unsigned long *chunk_sizes, int num_chunks);</div><div class='add'>+</div><div class='add'>+void drm_gpusvm_fini(struct drm_gpusvm *gpusvm);</div><div class='add'>+</div><div class='add'>+void drm_gpusvm_free(struct drm_gpusvm *gpusvm);</div><div class='add'>+</div><div class='add'>+unsigned long</div><div class='add'>+drm_gpusvm_find_vma_start(struct drm_gpusvm *gpusvm,</div><div class='add'>+			  unsigned long start,</div><div class='add'>+			  unsigned long end);</div><div class='add'>+</div><div class='add'>+struct drm_gpusvm_range *</div><div class='add'>+drm_gpusvm_range_find_or_insert(struct drm_gpusvm *gpusvm,</div><div class='add'>+				unsigned long fault_addr,</div><div class='add'>+				unsigned long gpuva_start,</div><div class='add'>+				unsigned long gpuva_end,</div><div class='add'>+				const struct drm_gpusvm_ctx *ctx);</div><div class='add'>+</div><div class='add'>+void drm_gpusvm_range_remove(struct drm_gpusvm *gpusvm,</div><div class='add'>+			     struct drm_gpusvm_range *range);</div><div class='add'>+</div><div class='add'>+int drm_gpusvm_range_evict(struct drm_gpusvm *gpusvm,</div><div class='add'>+			   struct drm_gpusvm_range *range);</div><div class='add'>+</div><div class='add'>+struct drm_gpusvm_range *</div><div class='add'>+drm_gpusvm_range_get(struct drm_gpusvm_range *range);</div><div class='add'>+</div><div class='add'>+void drm_gpusvm_range_put(struct drm_gpusvm_range *range);</div><div class='add'>+</div><div class='add'>+bool drm_gpusvm_range_pages_valid(struct drm_gpusvm *gpusvm,</div><div class='add'>+				  struct drm_gpusvm_range *range);</div><div class='add'>+</div><div class='add'>+int drm_gpusvm_range_get_pages(struct drm_gpusvm *gpusvm,</div><div class='add'>+			       struct drm_gpusvm_range *range,</div><div class='add'>+			       const struct drm_gpusvm_ctx *ctx);</div><div class='add'>+</div><div class='add'>+void drm_gpusvm_range_unmap_pages(struct drm_gpusvm *gpusvm,</div><div class='add'>+				  struct drm_gpusvm_range *range,</div><div class='add'>+				  const struct drm_gpusvm_ctx *ctx);</div><div class='add'>+</div><div class='add'>+bool drm_gpusvm_has_mapping(struct drm_gpusvm *gpusvm, unsigned long start,</div><div class='add'>+			    unsigned long end);</div><div class='add'>+</div><div class='add'>+struct drm_gpusvm_notifier *</div><div class='add'>+drm_gpusvm_notifier_find(struct drm_gpusvm *gpusvm, unsigned long start,</div><div class='add'>+			 unsigned long end);</div><div class='add'>+</div><div class='add'>+struct drm_gpusvm_range *</div><div class='add'>+drm_gpusvm_range_find(struct drm_gpusvm_notifier *notifier, unsigned long start,</div><div class='add'>+		      unsigned long end);</div><div class='add'>+</div><div class='add'>+void drm_gpusvm_range_set_unmapped(struct drm_gpusvm_range *range,</div><div class='add'>+				   const struct mmu_notifier_range *mmu_range);</div><div class='add'>+</div><div class='add'>+int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm,</div><div class='add'>+			 struct drm_gpusvm_pages *svm_pages,</div><div class='add'>+			 struct mm_struct *mm,</div><div class='add'>+			 struct mmu_interval_notifier *notifier,</div><div class='add'>+			 unsigned long pages_start, unsigned long pages_end,</div><div class='add'>+			 const struct drm_gpusvm_ctx *ctx);</div><div class='add'>+</div><div class='add'>+void drm_gpusvm_unmap_pages(struct drm_gpusvm *gpusvm,</div><div class='add'>+			    struct drm_gpusvm_pages *svm_pages,</div><div class='add'>+			    unsigned long npages,</div><div class='add'>+			    const struct drm_gpusvm_ctx *ctx);</div><div class='add'>+</div><div class='add'>+void drm_gpusvm_free_pages(struct drm_gpusvm *gpusvm,</div><div class='add'>+			   struct drm_gpusvm_pages *svm_pages,</div><div class='add'>+			   unsigned long npages);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_driver_set_lock() - Set the lock protecting accesses to GPU SVM</div><div class='add'>+ * @gpusvm: Pointer to the GPU SVM structure.</div><div class='add'>+ * @lock: the lock used to protect the gpuva list. The locking primitive</div><div class='add'>+ * must contain a dep_map field.</div><div class='add'>+ *</div><div class='add'>+ * Call this to annotate drm_gpusvm_range_find_or_insert and</div><div class='add'>+ * drm_gpusvm_range_remove.</div><div class='add'>+ */</div><div class='add'>+#define drm_gpusvm_driver_set_lock(gpusvm, lock) \</div><div class='add'>+	do { \</div><div class='add'>+		if (!WARN((gpusvm)-&gt;lock_dep_map, \</div><div class='add'>+			  "GPUSVM range lock should be set only once."))\</div><div class='add'>+			(gpusvm)-&gt;lock_dep_map = &amp;(lock)-&gt;dep_map;	\</div><div class='add'>+	} while (0)</div><div class='add'>+#else</div><div class='add'>+#define drm_gpusvm_driver_set_lock(gpusvm, lock) do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_notifier_lock() - Lock GPU SVM notifier</div><div class='add'>+ * @gpusvm__: Pointer to the GPU SVM structure.</div><div class='add'>+ *</div><div class='add'>+ * Abstract client usage GPU SVM notifier lock, take lock</div><div class='add'>+ */</div><div class='add'>+#define drm_gpusvm_notifier_lock(gpusvm__)	\</div><div class='add'>+	down_read(&amp;(gpusvm__)-&gt;notifier_lock)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_notifier_unlock() - Unlock GPU SVM notifier</div><div class='add'>+ * @gpusvm__: Pointer to the GPU SVM structure.</div><div class='add'>+ *</div><div class='add'>+ * Abstract client usage GPU SVM notifier lock, drop lock</div><div class='add'>+ */</div><div class='add'>+#define drm_gpusvm_notifier_unlock(gpusvm__)	\</div><div class='add'>+	up_read(&amp;(gpusvm__)-&gt;notifier_lock)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_range_start() - GPU SVM range start address</div><div class='add'>+ * @range: Pointer to the GPU SVM range</div><div class='add'>+ *</div><div class='add'>+ * Return: GPU SVM range start address</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+drm_gpusvm_range_start(struct drm_gpusvm_range *range)</div><div class='add'>+{</div><div class='add'>+	return range-&gt;itree.start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_range_end() - GPU SVM range end address</div><div class='add'>+ * @range: Pointer to the GPU SVM range</div><div class='add'>+ *</div><div class='add'>+ * Return: GPU SVM range end address</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+drm_gpusvm_range_end(struct drm_gpusvm_range *range)</div><div class='add'>+{</div><div class='add'>+	return range-&gt;itree.last + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_range_size() - GPU SVM range size</div><div class='add'>+ * @range: Pointer to the GPU SVM range</div><div class='add'>+ *</div><div class='add'>+ * Return: GPU SVM range size</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+drm_gpusvm_range_size(struct drm_gpusvm_range *range)</div><div class='add'>+{</div><div class='add'>+	return drm_gpusvm_range_end(range) - drm_gpusvm_range_start(range);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_notifier_start() - GPU SVM notifier start address</div><div class='add'>+ * @notifier: Pointer to the GPU SVM notifier</div><div class='add'>+ *</div><div class='add'>+ * Return: GPU SVM notifier start address</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+drm_gpusvm_notifier_start(struct drm_gpusvm_notifier *notifier)</div><div class='add'>+{</div><div class='add'>+	return notifier-&gt;itree.start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_notifier_end() - GPU SVM notifier end address</div><div class='add'>+ * @notifier: Pointer to the GPU SVM notifier</div><div class='add'>+ *</div><div class='add'>+ * Return: GPU SVM notifier end address</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+drm_gpusvm_notifier_end(struct drm_gpusvm_notifier *notifier)</div><div class='add'>+{</div><div class='add'>+	return notifier-&gt;itree.last + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_notifier_size() - GPU SVM notifier size</div><div class='add'>+ * @notifier: Pointer to the GPU SVM notifier</div><div class='add'>+ *</div><div class='add'>+ * Return: GPU SVM notifier size</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+drm_gpusvm_notifier_size(struct drm_gpusvm_notifier *notifier)</div><div class='add'>+{</div><div class='add'>+	return drm_gpusvm_notifier_end(notifier) -</div><div class='add'>+		drm_gpusvm_notifier_start(notifier);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __drm_gpusvm_range_next() - Get the next GPU SVM range in the list</div><div class='add'>+ * @range: a pointer to the current GPU SVM range</div><div class='add'>+ *</div><div class='add'>+ * Return: A pointer to the next drm_gpusvm_range if available, or NULL if the</div><div class='add'>+ *         current range is the last one or if the input range is NULL.</div><div class='add'>+ */</div><div class='add'>+static inline struct drm_gpusvm_range *</div><div class='add'>+__drm_gpusvm_range_next(struct drm_gpusvm_range *range)</div><div class='add'>+{</div><div class='add'>+	if (range &amp;&amp; !list_is_last(&amp;range-&gt;entry,</div><div class='add'>+				   &amp;range-&gt;notifier-&gt;range_list))</div><div class='add'>+		return list_next_entry(range, entry);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_for_each_range() - Iterate over GPU SVM ranges in a notifier</div><div class='add'>+ * @range__: Iterator variable for the ranges. If set, it indicates the start of</div><div class='add'>+ *	     the iterator. If NULL, call drm_gpusvm_range_find() to get the range.</div><div class='add'>+ * @notifier__: Pointer to the GPU SVM notifier</div><div class='add'>+ * @start__: Start address of the range</div><div class='add'>+ * @end__: End address of the range</div><div class='add'>+ *</div><div class='add'>+ * This macro is used to iterate over GPU SVM ranges in a notifier. It is safe</div><div class='add'>+ * to use while holding the driver SVM lock or the notifier lock.</div><div class='add'>+ */</div><div class='add'>+#define drm_gpusvm_for_each_range(range__, notifier__, start__, end__)	\</div><div class='add'>+	for ((range__) = (range__) ?:					\</div><div class='add'>+	     drm_gpusvm_range_find((notifier__), (start__), (end__));	\</div><div class='add'>+	     (range__) &amp;&amp; (drm_gpusvm_range_start(range__) &lt; (end__));	\</div><div class='add'>+	     (range__) = __drm_gpusvm_range_next(range__))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_for_each_range_safe() - Safely iterate over GPU SVM ranges in a notifier</div><div class='add'>+ * @range__: Iterator variable for the ranges</div><div class='add'>+ * @next__: Iterator variable for the ranges temporay storage</div><div class='add'>+ * @notifier__: Pointer to the GPU SVM notifier</div><div class='add'>+ * @start__: Start address of the range</div><div class='add'>+ * @end__: End address of the range</div><div class='add'>+ *</div><div class='add'>+ * This macro is used to iterate over GPU SVM ranges in a notifier while</div><div class='add'>+ * removing ranges from it.</div><div class='add'>+ */</div><div class='add'>+#define drm_gpusvm_for_each_range_safe(range__, next__, notifier__, start__, end__)	\</div><div class='add'>+	for ((range__) = drm_gpusvm_range_find((notifier__), (start__), (end__)),	\</div><div class='add'>+	     (next__) = __drm_gpusvm_range_next(range__);				\</div><div class='add'>+	     (range__) &amp;&amp; (drm_gpusvm_range_start(range__) &lt; (end__));			\</div><div class='add'>+	     (range__) = (next__), (next__) = __drm_gpusvm_range_next(range__))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __drm_gpusvm_notifier_next() - get the next drm_gpusvm_notifier in the list</div><div class='add'>+ * @notifier: a pointer to the current drm_gpusvm_notifier</div><div class='add'>+ *</div><div class='add'>+ * Return: A pointer to the next drm_gpusvm_notifier if available, or NULL if</div><div class='add'>+ *         the current notifier is the last one or if the input notifier is</div><div class='add'>+ *         NULL.</div><div class='add'>+ */</div><div class='add'>+static inline struct drm_gpusvm_notifier *</div><div class='add'>+__drm_gpusvm_notifier_next(struct drm_gpusvm_notifier *notifier)</div><div class='add'>+{</div><div class='add'>+	if (notifier &amp;&amp; !list_is_last(&amp;notifier-&gt;entry,</div><div class='add'>+				      &amp;notifier-&gt;gpusvm-&gt;notifier_list))</div><div class='add'>+		return list_next_entry(notifier, entry);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_for_each_notifier() - Iterate over GPU SVM notifiers in a gpusvm</div><div class='add'>+ * @notifier__: Iterator variable for the notifiers</div><div class='add'>+ * @gpusvm__: Pointer to the GPU SVM notifier</div><div class='add'>+ * @start__: Start address of the notifier</div><div class='add'>+ * @end__: End address of the notifier</div><div class='add'>+ *</div><div class='add'>+ * This macro is used to iterate over GPU SVM notifiers in a gpusvm.</div><div class='add'>+ */</div><div class='add'>+#define drm_gpusvm_for_each_notifier(notifier__, gpusvm__, start__, end__)		\</div><div class='add'>+	for ((notifier__) = drm_gpusvm_notifier_find((gpusvm__), (start__), (end__));	\</div><div class='add'>+	     (notifier__) &amp;&amp; (drm_gpusvm_notifier_start(notifier__) &lt; (end__));		\</div><div class='add'>+	     (notifier__) = __drm_gpusvm_notifier_next(notifier__))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_gpusvm_for_each_notifier_safe() - Safely iterate over GPU SVM notifiers in a gpusvm</div><div class='add'>+ * @notifier__: Iterator variable for the notifiers</div><div class='add'>+ * @next__: Iterator variable for the notifiers temporay storage</div><div class='add'>+ * @gpusvm__: Pointer to the GPU SVM notifier</div><div class='add'>+ * @start__: Start address of the notifier</div><div class='add'>+ * @end__: End address of the notifier</div><div class='add'>+ *</div><div class='add'>+ * This macro is used to iterate over GPU SVM notifiers in a gpusvm while</div><div class='add'>+ * removing notifiers from it.</div><div class='add'>+ */</div><div class='add'>+#define drm_gpusvm_for_each_notifier_safe(notifier__, next__, gpusvm__, start__, end__)	\</div><div class='add'>+	for ((notifier__) = drm_gpusvm_notifier_find((gpusvm__), (start__), (end__)),	\</div><div class='add'>+	     (next__) = __drm_gpusvm_notifier_next(notifier__);				\</div><div class='add'>+	     (notifier__) &amp;&amp; (drm_gpusvm_notifier_start(notifier__) &lt; (end__));		\</div><div class='add'>+	     (notifier__) = (next__), (next__) = __drm_gpusvm_notifier_next(notifier__))</div><div class='add'>+</div><div class='add'>+#endif /* __DRM_GPUSVM_H__ */</div><div class='head'>diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h<br/>index 9060f9fae6f1..fdfc575b2603 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gpuvm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_gpuvm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_gpuvm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_gpuvm.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-resv.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/llist.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +104,7 @@ struct drm_gpuva {</div><div class='ctx'> 	} va;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @gem: structure containing the &amp;drm_gem_object and it's offset</div><div class='add'>+	 * @gem: structure containing the &amp;drm_gem_object and its offset</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		/**</div><div class='hunk'>@@ -152,6 +153,7 @@ void drm_gpuva_remove(struct drm_gpuva *va);</div><div class='ctx'> </div><div class='ctx'> void drm_gpuva_link(struct drm_gpuva *va, struct drm_gpuvm_bo *vm_bo);</div><div class='ctx'> void drm_gpuva_unlink(struct drm_gpuva *va);</div><div class='add'>+void drm_gpuva_unlink_defer(struct drm_gpuva *va);</div><div class='ctx'> </div><div class='ctx'> struct drm_gpuva *drm_gpuva_find(struct drm_gpuvm *gpuvm,</div><div class='ctx'> 				 u64 addr, u64 range);</div><div class='hunk'>@@ -160,15 +162,6 @@ struct drm_gpuva *drm_gpuva_find_first(struct drm_gpuvm *gpuvm,</div><div class='ctx'> struct drm_gpuva *drm_gpuva_find_prev(struct drm_gpuvm *gpuvm, u64 start);</div><div class='ctx'> struct drm_gpuva *drm_gpuva_find_next(struct drm_gpuvm *gpuvm, u64 end);</div><div class='ctx'> </div><div class='del'>-static inline void drm_gpuva_init(struct drm_gpuva *va, u64 addr, u64 range,</div><div class='del'>-				  struct drm_gem_object *obj, u64 offset)</div><div class='del'>-{</div><div class='del'>-	va-&gt;va.addr = addr;</div><div class='del'>-	va-&gt;va.range = range;</div><div class='del'>-	va-&gt;gem.obj = obj;</div><div class='del'>-	va-&gt;gem.offset = offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * drm_gpuva_invalidate() - sets whether the backing GEM of this &amp;drm_gpuva is</div><div class='ctx'>  * invalidated</div><div class='hunk'>@@ -206,9 +199,19 @@ enum drm_gpuvm_flags {</div><div class='ctx'> 	DRM_GPUVM_RESV_PROTECTED = BIT(0),</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @DRM_GPUVM_IMMEDIATE_MODE: use the locking scheme for GEMs designed</div><div class='add'>+	 * for modifying the GPUVM during the fence signalling path</div><div class='add'>+	 *</div><div class='add'>+	 * When set, gpuva.lock is used to protect gpuva.list in all GEM</div><div class='add'>+	 * objects associated with this GPUVM. Otherwise, the GEMs dma-resv is</div><div class='add'>+	 * used.</div><div class='add'>+	 */</div><div class='add'>+	DRM_GPUVM_IMMEDIATE_MODE = BIT(1),</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @DRM_GPUVM_USERBITS: user defined bits</div><div class='ctx'> 	 */</div><div class='del'>-	DRM_GPUVM_USERBITS = BIT(1),</div><div class='add'>+	DRM_GPUVM_USERBITS = BIT(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -330,6 +333,11 @@ struct drm_gpuvm {</div><div class='ctx'> 		 */</div><div class='ctx'> 		spinlock_t lock;</div><div class='ctx'> 	} evict;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @bo_defer: structure holding vm_bos that need to be destroyed</div><div class='add'>+	 */</div><div class='add'>+	struct llist_head bo_defer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name,</div><div class='hunk'>@@ -379,6 +387,19 @@ drm_gpuvm_resv_protected(struct drm_gpuvm *gpuvm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * drm_gpuvm_immediate_mode() - indicates whether &amp;DRM_GPUVM_IMMEDIATE_MODE is</div><div class='add'>+ * set</div><div class='add'>+ * @gpuvm: the &amp;drm_gpuvm</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if &amp;DRM_GPUVM_IMMEDIATE_MODE is set, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool</div><div class='add'>+drm_gpuvm_immediate_mode(struct drm_gpuvm *gpuvm)</div><div class='add'>+{</div><div class='add'>+	return gpuvm-&gt;flags &amp; DRM_GPUVM_IMMEDIATE_MODE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * drm_gpuvm_resv() - returns the &amp;drm_gpuvm's &amp;dma_resv</div><div class='ctx'>  * @gpuvm__: the &amp;drm_gpuvm</div><div class='ctx'>  *</div><div class='hunk'>@@ -518,7 +539,7 @@ struct drm_gpuvm_exec {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @flags: the flags for the struct drm_exec</div><div class='ctx'> 	 */</div><div class='del'>-	uint32_t flags;</div><div class='add'>+	u32 flags;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @vm: the &amp;drm_gpuvm to lock its DMA reservations</div><div class='hunk'>@@ -700,6 +721,12 @@ struct drm_gpuvm_bo {</div><div class='ctx'> 			 * &amp;drm_gpuvms evict list.</div><div class='ctx'> 			 */</div><div class='ctx'> 			struct list_head evict;</div><div class='add'>+</div><div class='add'>+			/**</div><div class='add'>+			 * @list.entry.bo_defer: List entry to attach to</div><div class='add'>+			 * the &amp;drm_gpuvms bo_defer list.</div><div class='add'>+			 */</div><div class='add'>+			struct llist_node bo_defer;</div><div class='ctx'> 		} entry;</div><div class='ctx'> 	} list;</div><div class='ctx'> };</div><div class='hunk'>@@ -732,6 +759,9 @@ drm_gpuvm_bo_get(struct drm_gpuvm_bo *vm_bo)</div><div class='ctx'> </div><div class='ctx'> bool drm_gpuvm_bo_put(struct drm_gpuvm_bo *vm_bo);</div><div class='ctx'> </div><div class='add'>+bool drm_gpuvm_bo_put_deferred(struct drm_gpuvm_bo *vm_bo);</div><div class='add'>+void drm_gpuvm_bo_deferred_cleanup(struct drm_gpuvm *gpuvm);</div><div class='add'>+</div><div class='ctx'> struct drm_gpuvm_bo *</div><div class='ctx'> drm_gpuvm_bo_find(struct drm_gpuvm *gpuvm,</div><div class='ctx'> 		  struct drm_gem_object *obj);</div><div class='hunk'>@@ -751,9 +781,10 @@ drm_gpuvm_bo_gem_evict(struct drm_gem_object *obj, bool evict)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_gpuvm_bo *vm_bo;</div><div class='ctx'> </div><div class='del'>-	drm_gem_gpuva_assert_lock_held(obj);</div><div class='del'>-	drm_gem_for_each_gpuvm_bo(vm_bo, obj)</div><div class='add'>+	drm_gem_for_each_gpuvm_bo(vm_bo, obj) {</div><div class='add'>+		drm_gem_gpuva_assert_lock_held(vm_bo-&gt;vm, obj);</div><div class='ctx'> 		drm_gpuvm_bo_evict(vm_bo, evict);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void drm_gpuvm_bo_extobj_add(struct drm_gpuvm_bo *vm_bo);</div><div class='hunk'>@@ -812,6 +843,11 @@ enum drm_gpuva_op_type {</div><div class='ctx'> 	 * @DRM_GPUVA_OP_PREFETCH: the prefetch op type</div><div class='ctx'> 	 */</div><div class='ctx'> 	DRM_GPUVA_OP_PREFETCH,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_GPUVA_OP_DRIVER: the driver defined op type</div><div class='add'>+	 */</div><div class='add'>+	DRM_GPUVA_OP_DRIVER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -838,7 +874,7 @@ struct drm_gpuva_op_map {</div><div class='ctx'> 	} va;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @gem: structure containing the &amp;drm_gem_object and it's offset</div><div class='add'>+	 * @gem: structure containing the &amp;drm_gem_object and its offset</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		/**</div><div class='hunk'>@@ -1053,10 +1089,23 @@ struct drm_gpuva_ops {</div><div class='ctx'>  */</div><div class='ctx'> #define drm_gpuva_next_op(op) list_next_entry(op, entry)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct drm_gpuvm_map_req - arguments passed to drm_gpuvm_sm_map[_ops_create]()</div><div class='add'>+ */</div><div class='add'>+struct drm_gpuvm_map_req {</div><div class='add'>+	/**</div><div class='add'>+	 * @map: struct drm_gpuva_op_map</div><div class='add'>+	 */</div><div class='add'>+	struct drm_gpuva_op_map map;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct drm_gpuva_ops *</div><div class='ctx'> drm_gpuvm_sm_map_ops_create(struct drm_gpuvm *gpuvm,</div><div class='del'>-			    u64 addr, u64 range,</div><div class='del'>-			    struct drm_gem_object *obj, u64 offset);</div><div class='add'>+			    const struct drm_gpuvm_map_req *req);</div><div class='add'>+struct drm_gpuva_ops *</div><div class='add'>+drm_gpuvm_madvise_ops_create(struct drm_gpuvm *gpuvm,</div><div class='add'>+			     const struct drm_gpuvm_map_req *req);</div><div class='add'>+</div><div class='ctx'> struct drm_gpuva_ops *</div><div class='ctx'> drm_gpuvm_sm_unmap_ops_create(struct drm_gpuvm *gpuvm,</div><div class='ctx'> 			      u64 addr, u64 range);</div><div class='hunk'>@@ -1074,8 +1123,10 @@ void drm_gpuva_ops_free(struct drm_gpuvm *gpuvm,</div><div class='ctx'> static inline void drm_gpuva_init_from_op(struct drm_gpuva *va,</div><div class='ctx'> 					  struct drm_gpuva_op_map *op)</div><div class='ctx'> {</div><div class='del'>-	drm_gpuva_init(va, op-&gt;va.addr, op-&gt;va.range,</div><div class='del'>-		       op-&gt;gem.obj, op-&gt;gem.offset);</div><div class='add'>+	va-&gt;va.addr = op-&gt;va.addr;</div><div class='add'>+	va-&gt;va.range = op-&gt;va.range;</div><div class='add'>+	va-&gt;gem.obj = op-&gt;gem.obj;</div><div class='add'>+	va-&gt;gem.offset = op-&gt;gem.offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1184,11 +1235,11 @@ struct drm_gpuvm_ops {</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @sm_step_unmap: called from &amp;drm_gpuvm_sm_map and</div><div class='del'>-	 * &amp;drm_gpuvm_sm_unmap to unmap an existent mapping</div><div class='add'>+	 * &amp;drm_gpuvm_sm_unmap to unmap an existing mapping</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback is called when existent mapping needs to be unmapped.</div><div class='add'>+	 * This callback is called when existing mapping needs to be unmapped.</div><div class='ctx'> 	 * This is the case when either a newly requested mapping encloses an</div><div class='del'>-	 * existent mapping or an unmap of an existent mapping is requested.</div><div class='add'>+	 * existing mapping or an unmap of an existing mapping is requested.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The &amp;priv pointer matches the one the driver passed to</div><div class='ctx'> 	 * &amp;drm_gpuvm_sm_map or &amp;drm_gpuvm_sm_unmap, respectively.</div><div class='hunk'>@@ -1200,12 +1251,18 @@ struct drm_gpuvm_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, void *priv,</div><div class='del'>-		     u64 addr, u64 range,</div><div class='del'>-		     struct drm_gem_object *obj, u64 offset);</div><div class='add'>+		     const struct drm_gpuvm_map_req *req);</div><div class='ctx'> </div><div class='ctx'> int drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, void *priv,</div><div class='ctx'> 		       u64 addr, u64 range);</div><div class='ctx'> </div><div class='add'>+int drm_gpuvm_sm_map_exec_lock(struct drm_gpuvm *gpuvm,</div><div class='add'>+			  struct drm_exec *exec, unsigned int num_fences,</div><div class='add'>+			  struct drm_gpuvm_map_req *req);</div><div class='add'>+</div><div class='add'>+int drm_gpuvm_sm_unmap_exec_lock(struct drm_gpuvm *gpuvm, struct drm_exec *exec,</div><div class='add'>+				 u64 req_addr, u64 req_range);</div><div class='add'>+</div><div class='ctx'> void drm_gpuva_map(struct drm_gpuvm *gpuvm,</div><div class='ctx'> 		   struct drm_gpuva *va,</div><div class='ctx'> 		   struct drm_gpuva_op_map *op);</div><div class='head'>diff --git a/include/drm/drm_kunit_helpers.h b/include/drm/drm_kunit_helpers.h<br/>index ba483c87f0e7..4948379237e9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_kunit_helpers.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_kunit_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_kunit_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_kunit_helpers.h</a></div><div class='hunk'>@@ -3,11 +3,18 @@</div><div class='ctx'> #ifndef DRM_KUNIT_HELPERS_H_</div><div class='ctx'> #define DRM_KUNIT_HELPERS_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;drm/drm_drv.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;kunit/test.h&gt;</div><div class='ctx'> </div><div class='add'>+struct drm_connector;</div><div class='add'>+struct drm_crtc_funcs;</div><div class='add'>+struct drm_crtc_helper_funcs;</div><div class='ctx'> struct drm_device;</div><div class='add'>+struct drm_plane_funcs;</div><div class='add'>+struct drm_plane_helper_funcs;</div><div class='ctx'> struct kunit;</div><div class='ctx'> </div><div class='ctx'> struct device *drm_kunit_helper_alloc_device(struct kunit *test);</div><div class='hunk'>@@ -69,7 +76,7 @@ __drm_kunit_helper_alloc_drm_device(struct kunit *test,</div><div class='ctx'>  * @_dev: The parent device object</div><div class='ctx'>  * @_type: the type of the struct which contains struct &amp;drm_device</div><div class='ctx'>  * @_member: the name of the &amp;drm_device within @_type.</div><div class='del'>- * @_features: Mocked DRM device driver features</div><div class='add'>+ * @_feat: Mocked DRM device driver features</div><div class='ctx'>  *</div><div class='ctx'>  * This function creates a struct &amp;drm_driver and will create a struct</div><div class='ctx'>  * &amp;drm_device from @_dev and that driver.</div><div class='hunk'>@@ -89,12 +96,41 @@ __drm_kunit_helper_alloc_drm_device(struct kunit *test,</div><div class='ctx'> 						      sizeof(_type),		\</div><div class='ctx'> 						      offsetof(_type, _member),	\</div><div class='ctx'> 						      _feat))</div><div class='del'>-struct drm_modeset_acquire_ctx *</div><div class='del'>-drm_kunit_helper_acquire_ctx_alloc(struct kunit *test);</div><div class='ctx'> </div><div class='ctx'> struct drm_atomic_state *</div><div class='ctx'> drm_kunit_helper_atomic_state_alloc(struct kunit *test,</div><div class='ctx'> 				    struct drm_device *drm,</div><div class='ctx'> 				    struct drm_modeset_acquire_ctx *ctx);</div><div class='ctx'> </div><div class='add'>+struct drm_plane *</div><div class='add'>+drm_kunit_helper_create_primary_plane(struct kunit *test,</div><div class='add'>+				      struct drm_device *drm,</div><div class='add'>+				      const struct drm_plane_funcs *funcs,</div><div class='add'>+				      const struct drm_plane_helper_funcs *helper_funcs,</div><div class='add'>+				      const uint32_t *formats,</div><div class='add'>+				      unsigned int num_formats,</div><div class='add'>+				      const uint64_t *modifiers);</div><div class='add'>+</div><div class='add'>+struct drm_crtc *</div><div class='add'>+drm_kunit_helper_create_crtc(struct kunit *test,</div><div class='add'>+			     struct drm_device *drm,</div><div class='add'>+			     struct drm_plane *primary,</div><div class='add'>+			     struct drm_plane *cursor,</div><div class='add'>+			     const struct drm_crtc_funcs *funcs,</div><div class='add'>+			     const struct drm_crtc_helper_funcs *helper_funcs);</div><div class='add'>+</div><div class='add'>+int drm_kunit_helper_enable_crtc_connector(struct kunit *test,</div><div class='add'>+					   struct drm_device *drm,</div><div class='add'>+					   struct drm_crtc *crtc,</div><div class='add'>+					   struct drm_connector *connector,</div><div class='add'>+					   const struct drm_display_mode *mode,</div><div class='add'>+					   struct drm_modeset_acquire_ctx *ctx);</div><div class='add'>+</div><div class='add'>+int drm_kunit_add_mode_destroy_action(struct kunit *test,</div><div class='add'>+				      struct drm_display_mode *mode);</div><div class='add'>+</div><div class='add'>+struct drm_display_mode *</div><div class='add'>+drm_kunit_display_mode_from_cea_vic(struct kunit *test, struct drm_device *dev,</div><div class='add'>+				    u8 video_code);</div><div class='add'>+</div><div class='ctx'> #endif // DRM_KUNIT_HELPERS_H_</div><div class='head'>diff --git a/include/drm/drm_lease.h b/include/drm/drm_lease.h<br/>index 5c9ef6a2aeae..53545b4ca9ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_lease.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_lease.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_lease.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_lease.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #ifndef _DRM_LEASE_H_</div><div class='ctx'> #define _DRM_LEASE_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> struct drm_file;</div><div class='ctx'> struct drm_device;</div><div class='ctx'> struct drm_master;</div><div class='head'>diff --git a/include/drm/drm_managed.h b/include/drm/drm_managed.h<br/>index ad08f834af40..72bfac002c06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_managed.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_managed.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_managed.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_managed.h</a></div><div class='hunk'>@@ -45,6 +45,10 @@ int __must_check __drmm_add_action_or_reset(struct drm_device *dev,</div><div class='ctx'> 					    drmres_release_t action,</div><div class='ctx'> 					    void *data, const char *name);</div><div class='ctx'> </div><div class='add'>+void drmm_release_action(struct drm_device *dev,</div><div class='add'>+			 drmres_release_t action,</div><div class='add'>+			 void *data);</div><div class='add'>+</div><div class='ctx'> void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) __malloc;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -123,4 +127,27 @@ void __drmm_mutex_release(struct drm_device *dev, void *res);</div><div class='ctx'> 	drmm_add_action_or_reset(dev, __drmm_mutex_release, lock);	     \</div><div class='ctx'> })									     \</div><div class='ctx'> </div><div class='add'>+void __drmm_workqueue_release(struct drm_device *device, void *wq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drmm_alloc_ordered_workqueue - &amp;drm_device managed alloc_ordered_workqueue()</div><div class='add'>+ * @dev: DRM device</div><div class='add'>+ * @fmt: printf format for the name of the workqueue</div><div class='add'>+ * @flags: WQ_* flags (only WQ_FREEZABLE and WQ_MEM_RECLAIM are meaningful)</div><div class='add'>+ * @args: args for @fmt</div><div class='add'>+ *</div><div class='add'>+ * This is a &amp;drm_device-managed version of alloc_ordered_workqueue(). The</div><div class='add'>+ * allocated workqueue is automatically destroyed on the final drm_dev_put().</div><div class='add'>+ *</div><div class='add'>+ * Returns: workqueue on success, negative ERR_PTR otherwise.</div><div class='add'>+ */</div><div class='add'>+#define drmm_alloc_ordered_workqueue(dev, fmt, flags, args...)					\</div><div class='add'>+	({											\</div><div class='add'>+		struct workqueue_struct *wq = alloc_ordered_workqueue(fmt, flags, ##args);	\</div><div class='add'>+		wq ? ({										\</div><div class='add'>+			int ret = drmm_add_action_or_reset(dev, __drmm_workqueue_release, wq);	\</div><div class='add'>+			ret ? ERR_PTR(ret) : wq;						\</div><div class='add'>+		}) : ERR_PTR(-ENOMEM);								\</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_mipi_dbi.h b/include/drm/drm_mipi_dbi.h<br/>index e8e0f8d39f3a..f45f9612c0bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mipi_dbi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mipi_dbi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mipi_dbi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_mipi_dbi.h</a></div><div class='hunk'>@@ -57,6 +57,11 @@ struct mipi_dbi {</div><div class='ctx'> 	struct spi_device *spi;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @write_memory_bpw: Bits per word used on a MIPI_DCS_WRITE_MEMORY_START transfer</div><div class='add'>+	 */</div><div class='add'>+	unsigned int write_memory_bpw;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @dc: Optional D/C gpio.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct gpio_desc *dc;</div><div class='hunk'>@@ -97,6 +102,11 @@ struct mipi_dbi_dev {</div><div class='ctx'> 	struct drm_display_mode mode;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @pixel_format: Native pixel format (DRM_FORMAT\_\*)</div><div class='add'>+	 */</div><div class='add'>+	u32 pixel_format;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @tx_buf: Buffer used for transfer (copy clip rect area)</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 *tx_buf;</div><div class='head'>diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h<br/>index c0aec0d4d664..3aba7b380c8d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mipi_dsi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mipi_dsi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mipi_dsi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_mipi_dsi.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #define __DRM_MIPI_DSI_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mipi_dsi_host;</div><div class='ctx'> struct mipi_dsi_device;</div><div class='hunk'>@@ -129,8 +130,6 @@ struct mipi_dsi_host *of_find_mipi_dsi_host_by_node(struct device_node *node);</div><div class='ctx'> #define MIPI_DSI_MODE_VIDEO_NO_HBP	BIT(6)</div><div class='ctx'> /* disable hsync-active area */</div><div class='ctx'> #define MIPI_DSI_MODE_VIDEO_NO_HSA	BIT(7)</div><div class='del'>-/* flush display FIFO on vsync pulse */</div><div class='del'>-#define MIPI_DSI_MODE_VSYNC_FLUSH	BIT(8)</div><div class='ctx'> /* disable EoT packets in HS mode */</div><div class='ctx'> #define MIPI_DSI_MODE_NO_EOT_PACKET	BIT(9)</div><div class='ctx'> /* device supports non-continuous clock behavior (DSI spec 5.6.1) */</div><div class='hunk'>@@ -197,10 +196,34 @@ struct mipi_dsi_device {</div><div class='ctx'> 	struct drm_dsc_config *dsc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct mipi_dsi_multi_context - Context to call multiple MIPI DSI funcs in a row</div><div class='add'>+ */</div><div class='add'>+struct mipi_dsi_multi_context {</div><div class='add'>+	/**</div><div class='add'>+	 * @dsi: Pointer to the MIPI DSI device</div><div class='add'>+	 */</div><div class='add'>+	struct mipi_dsi_device *dsi;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @accum_err: Storage for the accumulated error over the multiple calls</div><div class='add'>+	 *</div><div class='add'>+	 * Init to 0. If a function encounters an error then the error code</div><div class='add'>+	 * will be stored here. If you call a function and this points to a</div><div class='add'>+	 * non-zero value then the function will be a noop. This allows calling</div><div class='add'>+	 * a function many times in a row and just checking the error at the</div><div class='add'>+	 * end to see if any of them failed.</div><div class='add'>+	 */</div><div class='add'>+	int accum_err;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MIPI_DSI_MODULE_PREFIX "mipi-dsi:"</div><div class='ctx'> </div><div class='ctx'> #define to_mipi_dsi_device(__dev)	container_of_const(__dev, struct mipi_dsi_device, dev)</div><div class='ctx'> </div><div class='add'>+extern const struct bus_type mipi_dsi_bus_type;</div><div class='add'>+#define dev_is_mipi_dsi(dev)	((dev)-&gt;bus == &amp;mipi_dsi_bus_type)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * mipi_dsi_pixel_format_to_bpp - obtain the number of bits per pixel for any</div><div class='ctx'>  *                                given pixel format defined by the MIPI DSI</div><div class='hunk'>@@ -226,6 +249,12 @@ static inline int mipi_dsi_pixel_format_to_bpp(enum mipi_dsi_pixel_format fmt)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum mipi_dsi_compression_algo {</div><div class='add'>+	MIPI_DSI_COMPRESSION_DSC = 0,</div><div class='add'>+	MIPI_DSI_COMPRESSION_VENDOR = 3,</div><div class='add'>+	/* other two values are reserved, DSI 1.3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mipi_dsi_device *</div><div class='ctx'> mipi_dsi_device_register_full(struct mipi_dsi_host *host,</div><div class='ctx'> 			      const struct mipi_dsi_device_info *info);</div><div class='hunk'>@@ -241,14 +270,45 @@ int mipi_dsi_shutdown_peripheral(struct mipi_dsi_device *dsi);</div><div class='ctx'> int mipi_dsi_turn_on_peripheral(struct mipi_dsi_device *dsi);</div><div class='ctx'> int mipi_dsi_set_maximum_return_packet_size(struct mipi_dsi_device *dsi,</div><div class='ctx'> 					    u16 value);</div><div class='del'>-ssize_t mipi_dsi_compression_mode(struct mipi_dsi_device *dsi, bool enable);</div><div class='del'>-ssize_t mipi_dsi_picture_parameter_set(struct mipi_dsi_device *dsi,</div><div class='del'>-				       const struct drm_dsc_picture_parameter_set *pps);</div><div class='add'>+int mipi_dsi_compression_mode(struct mipi_dsi_device *dsi, bool enable);</div><div class='add'>+int mipi_dsi_compression_mode_ext(struct mipi_dsi_device *dsi, bool enable,</div><div class='add'>+				  enum mipi_dsi_compression_algo algo,</div><div class='add'>+				  unsigned int pps_selector);</div><div class='add'>+int mipi_dsi_picture_parameter_set(struct mipi_dsi_device *dsi,</div><div class='add'>+				   const struct drm_dsc_picture_parameter_set *pps);</div><div class='add'>+</div><div class='add'>+void mipi_dsi_compression_mode_ext_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+					 bool enable,</div><div class='add'>+					 enum mipi_dsi_compression_algo algo,</div><div class='add'>+					 unsigned int pps_selector);</div><div class='add'>+void mipi_dsi_compression_mode_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+				     bool enable);</div><div class='add'>+void mipi_dsi_picture_parameter_set_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+					  const struct drm_dsc_picture_parameter_set *pps);</div><div class='ctx'> </div><div class='ctx'> ssize_t mipi_dsi_generic_write(struct mipi_dsi_device *dsi, const void *payload,</div><div class='ctx'> 			       size_t size);</div><div class='add'>+void mipi_dsi_generic_write_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+				  const void *payload, size_t size);</div><div class='add'>+void mipi_dsi_dual_generic_write_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+				       struct mipi_dsi_device *dsi1,</div><div class='add'>+				       struct mipi_dsi_device *dsi2,</div><div class='add'>+				       const void *payload, size_t size);</div><div class='ctx'> ssize_t mipi_dsi_generic_read(struct mipi_dsi_device *dsi, const void *params,</div><div class='ctx'> 			      size_t num_params, void *data, size_t size);</div><div class='add'>+u32 drm_mipi_dsi_get_input_bus_fmt(enum mipi_dsi_pixel_format dsi_format);</div><div class='add'>+</div><div class='add'>+#define mipi_dsi_msleep(ctx, delay)	\</div><div class='add'>+	do {				\</div><div class='add'>+		if (!(ctx)-&gt;accum_err)	\</div><div class='add'>+			msleep(delay);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define mipi_dsi_usleep_range(ctx, min, max)	\</div><div class='add'>+	do {					\</div><div class='add'>+		if (!(ctx)-&gt;accum_err)		\</div><div class='add'>+			usleep_range(min, max);	\</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum mipi_dsi_dcs_tear_mode - Tearing Effect Output Line mode</div><div class='hunk'>@@ -270,10 +330,20 @@ enum mipi_dsi_dcs_tear_mode {</div><div class='ctx'> </div><div class='ctx'> ssize_t mipi_dsi_dcs_write_buffer(struct mipi_dsi_device *dsi,</div><div class='ctx'> 				  const void *data, size_t len);</div><div class='add'>+int mipi_dsi_dcs_write_buffer_chatty(struct mipi_dsi_device *dsi,</div><div class='add'>+				     const void *data, size_t len);</div><div class='add'>+void mipi_dsi_dcs_write_buffer_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+				     const void *data, size_t len);</div><div class='add'>+void mipi_dsi_dual_dcs_write_buffer_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+					  struct mipi_dsi_device *dsi1,</div><div class='add'>+					  struct mipi_dsi_device *dsi2,</div><div class='add'>+					  const void *data, size_t len);</div><div class='ctx'> ssize_t mipi_dsi_dcs_write(struct mipi_dsi_device *dsi, u8 cmd,</div><div class='ctx'> 			   const void *data, size_t len);</div><div class='ctx'> ssize_t mipi_dsi_dcs_read(struct mipi_dsi_device *dsi, u8 cmd, void *data,</div><div class='ctx'> 			  size_t len);</div><div class='add'>+void mipi_dsi_dcs_read_multi(struct mipi_dsi_multi_context *ctx, u8 cmd,</div><div class='add'>+			     void *data, size_t len);</div><div class='ctx'> int mipi_dsi_dcs_nop(struct mipi_dsi_device *dsi);</div><div class='ctx'> int mipi_dsi_dcs_soft_reset(struct mipi_dsi_device *dsi);</div><div class='ctx'> int mipi_dsi_dcs_get_power_mode(struct mipi_dsi_device *dsi, u8 *mode);</div><div class='hunk'>@@ -286,7 +356,6 @@ int mipi_dsi_dcs_set_column_address(struct mipi_dsi_device *dsi, u16 start,</div><div class='ctx'> 				    u16 end);</div><div class='ctx'> int mipi_dsi_dcs_set_page_address(struct mipi_dsi_device *dsi, u16 start,</div><div class='ctx'> 				  u16 end);</div><div class='del'>-int mipi_dsi_dcs_set_tear_off(struct mipi_dsi_device *dsi);</div><div class='ctx'> int mipi_dsi_dcs_set_tear_on(struct mipi_dsi_device *dsi,</div><div class='ctx'> 			     enum mipi_dsi_dcs_tear_mode mode);</div><div class='ctx'> int mipi_dsi_dcs_set_pixel_format(struct mipi_dsi_device *dsi, u8 format);</div><div class='hunk'>@@ -300,42 +369,176 @@ int mipi_dsi_dcs_set_display_brightness_large(struct mipi_dsi_device *dsi,</div><div class='ctx'> int mipi_dsi_dcs_get_display_brightness_large(struct mipi_dsi_device *dsi,</div><div class='ctx'> 					     u16 *brightness);</div><div class='ctx'> </div><div class='add'>+void mipi_dsi_dcs_nop_multi(struct mipi_dsi_multi_context *ctx);</div><div class='add'>+void mipi_dsi_dcs_enter_sleep_mode_multi(struct mipi_dsi_multi_context *ctx);</div><div class='add'>+void mipi_dsi_dcs_exit_sleep_mode_multi(struct mipi_dsi_multi_context *ctx);</div><div class='add'>+void mipi_dsi_dcs_set_display_off_multi(struct mipi_dsi_multi_context *ctx);</div><div class='add'>+void mipi_dsi_dcs_set_display_on_multi(struct mipi_dsi_multi_context *ctx);</div><div class='add'>+void mipi_dsi_dcs_set_tear_on_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+				    enum mipi_dsi_dcs_tear_mode mode);</div><div class='add'>+void mipi_dsi_turn_on_peripheral_multi(struct mipi_dsi_multi_context *ctx);</div><div class='add'>+void mipi_dsi_dcs_soft_reset_multi(struct mipi_dsi_multi_context *ctx);</div><div class='add'>+void mipi_dsi_dcs_set_display_brightness_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+					       u16 brightness);</div><div class='add'>+void mipi_dsi_dcs_set_pixel_format_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+					 u8 format);</div><div class='add'>+void mipi_dsi_dcs_set_column_address_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+					   u16 start, u16 end);</div><div class='add'>+void mipi_dsi_dcs_set_page_address_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+					 u16 start, u16 end);</div><div class='add'>+void mipi_dsi_dcs_set_tear_scanline_multi(struct mipi_dsi_multi_context *ctx,</div><div class='add'>+					  u16 scanline);</div><div class='add'>+void mipi_dsi_dcs_set_tear_off_multi(struct mipi_dsi_multi_context *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mipi_dsi_generic_write_seq_multi - transmit data using a generic write packet</div><div class='add'>+ *</div><div class='add'>+ * This macro will print errors for you and error handling is optimized for</div><div class='add'>+ * callers that call this multiple times in a row.</div><div class='add'>+ *</div><div class='add'>+ * @ctx: Context for multiple DSI transactions</div><div class='add'>+ * @seq: buffer containing the payload</div><div class='add'>+ */</div><div class='add'>+#define mipi_dsi_generic_write_seq_multi(ctx, seq...)                \</div><div class='add'>+	do {                                                         \</div><div class='add'>+		static const u8 d[] = { seq };                       \</div><div class='add'>+		mipi_dsi_generic_write_multi(ctx, d, ARRAY_SIZE(d)); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * mipi_dsi_generic_write_seq - transmit data using a generic write packet</div><div class='del'>- * @dsi: DSI peripheral device</div><div class='add'>+ * mipi_dsi_generic_write_var_seq_multi - transmit non-constant data using a</div><div class='add'>+ * generic write packet</div><div class='add'>+ *</div><div class='add'>+ * This macro will print errors for you and error handling is optimized for</div><div class='add'>+ * callers that call this multiple times in a row.</div><div class='add'>+ *</div><div class='add'>+ * @ctx: Context for multiple DSI transactions</div><div class='ctx'>  * @seq: buffer containing the payload</div><div class='ctx'>  */</div><div class='del'>-#define mipi_dsi_generic_write_seq(dsi, seq...)                                \</div><div class='del'>-	do {                                                                   \</div><div class='del'>-		static const u8 d[] = { seq };                                 \</div><div class='del'>-		struct device *dev = &amp;dsi-&gt;dev;                                \</div><div class='del'>-		int ret;                                                       \</div><div class='del'>-		ret = mipi_dsi_generic_write(dsi, d, ARRAY_SIZE(d));           \</div><div class='del'>-		if (ret &lt; 0) {                                                 \</div><div class='del'>-			dev_err_ratelimited(dev, "transmit data failed: %d\n", \</div><div class='del'>-					    ret);                              \</div><div class='del'>-			return ret;                                            \</div><div class='del'>-		}                                                              \</div><div class='add'>+#define mipi_dsi_generic_write_var_seq_multi(ctx, seq...)	     \</div><div class='add'>+	do {							     \</div><div class='add'>+		const u8 d[] = { seq };				     \</div><div class='add'>+		mipi_dsi_generic_write_multi(ctx, d, ARRAY_SIZE(d)); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mipi_dsi_dcs_write_seq_multi - transmit a DCS command with payload</div><div class='add'>+ *</div><div class='add'>+ * This macro will print errors for you and error handling is optimized for</div><div class='add'>+ * callers that call this multiple times in a row.</div><div class='add'>+ *</div><div class='add'>+ * @ctx: Context for multiple DSI transactions</div><div class='add'>+ * @cmd: Command</div><div class='add'>+ * @seq: buffer containing data to be transmitted</div><div class='add'>+ */</div><div class='add'>+#define mipi_dsi_dcs_write_seq_multi(ctx, cmd, seq...)                  \</div><div class='add'>+	do {                                                            \</div><div class='add'>+		static const u8 d[] = { cmd, seq };                     \</div><div class='add'>+		mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d)); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mipi_dsi_dcs_write_seq - transmit a DCS command with payload</div><div class='del'>- * @dsi: DSI peripheral device</div><div class='add'>+ * mipi_dsi_dcs_write_var_seq_multi - transmit a DCS command with non-constant</div><div class='add'>+ * payload</div><div class='add'>+ *</div><div class='add'>+ * This macro will print errors for you and error handling is optimized for</div><div class='add'>+ * callers that call this multiple times in a row.</div><div class='add'>+ *</div><div class='add'>+ * @ctx: Context for multiple DSI transactions</div><div class='ctx'>  * @cmd: Command</div><div class='ctx'>  * @seq: buffer containing data to be transmitted</div><div class='ctx'>  */</div><div class='del'>-#define mipi_dsi_dcs_write_seq(dsi, cmd, seq...)                           \</div><div class='del'>-	do {                                                               \</div><div class='del'>-		static const u8 d[] = { cmd, seq };                        \</div><div class='del'>-		struct device *dev = &amp;dsi-&gt;dev;                            \</div><div class='del'>-		int ret;                                                   \</div><div class='del'>-		ret = mipi_dsi_dcs_write_buffer(dsi, d, ARRAY_SIZE(d));    \</div><div class='del'>-		if (ret &lt; 0) {                                             \</div><div class='del'>-			dev_err_ratelimited(                               \</div><div class='del'>-				dev, "sending command %#02x failed: %d\n", \</div><div class='del'>-				cmd, ret);                                 \</div><div class='del'>-			return ret;                                        \</div><div class='del'>-		}                                                          \</div><div class='add'>+#define mipi_dsi_dcs_write_var_seq_multi(ctx, cmd, seq...)		\</div><div class='add'>+	do {								\</div><div class='add'>+		const u8 d[] = { cmd, seq };				\</div><div class='add'>+		mipi_dsi_dcs_write_buffer_multi(ctx, d, ARRAY_SIZE(d));	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mipi_dsi_dual - send the same MIPI DSI command to two interfaces</div><div class='add'>+ *</div><div class='add'>+ * This macro will send the specified MIPI DSI command twice, once per each of</div><div class='add'>+ * the two interfaces supplied. This is useful for reducing duplication of code</div><div class='add'>+ * in panel drivers which use two parallel serial interfaces.</div><div class='add'>+ *</div><div class='add'>+ * Note that the _func parameter cannot accept a macro such as</div><div class='add'>+ * mipi_dsi_generic_write_multi() or mipi_dsi_dcs_write_buffer_multi(). See</div><div class='add'>+ * mipi_dsi_dual_generic_write_multi() and</div><div class='add'>+ * mipi_dsi_dual_dcs_write_buffer_multi() instead.</div><div class='add'>+ *</div><div class='add'>+ * WARNING: This macro reuses the _func argument and the optional trailing</div><div class='add'>+ * arguments twice each, which may cause unintended side effects. For example,</div><div class='add'>+ * adding the postfix increment ++ operator to one of the arguments to be</div><div class='add'>+ * passed to _func will cause the variable to be incremented twice instead of</div><div class='add'>+ * once and the variable will be its original value + 1 when sent to _dsi2.</div><div class='add'>+ *</div><div class='add'>+ * @_func: MIPI DSI function to pass context and arguments into</div><div class='add'>+ * @_ctx: Context for multiple DSI transactions</div><div class='add'>+ * @_dsi1: First DSI interface to act as recipient of the MIPI DSI command</div><div class='add'>+ * @_dsi2: Second DSI interface to act as recipient of the MIPI DSI command</div><div class='add'>+ * @...: Arguments to pass to MIPI DSI function or macro</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define mipi_dsi_dual(_func, _ctx, _dsi1, _dsi2, ...)		 \</div><div class='add'>+	do {							 \</div><div class='add'>+		struct mipi_dsi_multi_context *_ctxcpy = (_ctx); \</div><div class='add'>+		_ctxcpy-&gt;dsi = (_dsi1);				 \</div><div class='add'>+		(_func)(_ctxcpy, ##__VA_ARGS__);		 \</div><div class='add'>+		_ctxcpy-&gt;dsi = (_dsi2);				 \</div><div class='add'>+		(_func)(_ctxcpy, ##__VA_ARGS__);		 \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mipi_dsi_dual_generic_write_seq_multi - transmit data using a generic write</div><div class='add'>+ * packet to two dsi interfaces, one after the other</div><div class='add'>+ *</div><div class='add'>+ * This macro will send the specified generic packet twice, once per each of</div><div class='add'>+ * the two interfaces supplied. This is useful for reducing duplication of code</div><div class='add'>+ * in panel drivers which use two parallel serial interfaces.</div><div class='add'>+ *</div><div class='add'>+ * Note that if an error occurs while transmitting the packet to the first DSI</div><div class='add'>+ * interface, the packet will not be sent to the second DSI interface.</div><div class='add'>+ *</div><div class='add'>+ * This macro will print errors for you and error handling is optimized for</div><div class='add'>+ * callers that call this multiple times in a row.</div><div class='add'>+ *</div><div class='add'>+ * @_ctx: Context for multiple DSI transactions</div><div class='add'>+ * @_dsi1: First DSI interface to act as recipient of packet</div><div class='add'>+ * @_dsi2: Second DSI interface to act as recipient of packet</div><div class='add'>+ * @_seq: buffer containing the payload</div><div class='add'>+ */</div><div class='add'>+#define mipi_dsi_dual_generic_write_seq_multi(_ctx, _dsi1, _dsi2, _seq...) \</div><div class='add'>+	do {								   \</div><div class='add'>+		static const u8 d[] = { _seq };				   \</div><div class='add'>+		mipi_dsi_dual_generic_write_multi(_ctx, _dsi1, _dsi2, d,   \</div><div class='add'>+						  ARRAY_SIZE(d));	   \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mipi_dsi_dual_dcs_write_seq_multi - transmit a DCS command with payload to</div><div class='add'>+ * two dsi interfaces, one after the other</div><div class='add'>+ *</div><div class='add'>+ * This macro will send the specified DCS command with payload twice, once per</div><div class='add'>+ * each of the two interfaces supplied. This is useful for reducing duplication</div><div class='add'>+ * of code in panel drivers which use two parallel serial interfaces.</div><div class='add'>+ *</div><div class='add'>+ * Note that if an error occurs while transmitting the payload to the first DSI</div><div class='add'>+ * interface, the payload will not be sent to the second DSI interface.</div><div class='add'>+ *</div><div class='add'>+ * This macro will print errors for you and error handling is optimized for</div><div class='add'>+ * callers that call this multiple times in a row.</div><div class='add'>+ *</div><div class='add'>+ * @_ctx: Context for multiple DSI transactions</div><div class='add'>+ * @_dsi1: First DSI interface to act as recipient of packet</div><div class='add'>+ * @_dsi2: Second DSI interface to act as recipient of packet</div><div class='add'>+ * @_cmd: Command</div><div class='add'>+ * @_seq: buffer containing the payload</div><div class='add'>+ */</div><div class='add'>+#define mipi_dsi_dual_dcs_write_seq_multi(_ctx, _dsi1, _dsi2, _cmd, _seq...) \</div><div class='add'>+	do {								     \</div><div class='add'>+		static const u8 d[] = { _cmd, _seq };			     \</div><div class='add'>+		mipi_dsi_dual_dcs_write_buffer_multi(_ctx, _dsi1, _dsi2, d,  \</div><div class='add'>+						     ARRAY_SIZE(d));	     \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h<br/>index ac33ba1b18bc..16ce0e8f36a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_mm.h</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;drm/drm_print.h&gt;</div><div class='add'>+struct drm_printer;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DRM_DEBUG_MM</div><div class='ctx'> #define DRM_MM_BUG_ON(expr) BUG_ON(expr)</div><div class='hunk'>@@ -463,7 +463,6 @@ static inline int drm_mm_insert_node(struct drm_mm *mm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void drm_mm_remove_node(struct drm_mm_node *node);</div><div class='del'>-void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new);</div><div class='ctx'> void drm_mm_init(struct drm_mm *mm, u64 start, u64 size);</div><div class='ctx'> void drm_mm_takedown(struct drm_mm *mm);</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h<br/>index 973119a9176b..895fb820dba0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mode_config.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mode_config.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mode_config.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_mode_config.h</a></div><div class='hunk'>@@ -82,6 +82,7 @@ struct drm_mode_config_funcs {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_framebuffer *(*fb_create)(struct drm_device *dev,</div><div class='ctx'> 					     struct drm_file *file_priv,</div><div class='add'>+					     const struct drm_format_info *info,</div><div class='ctx'> 					     const struct drm_mode_fb_cmd2 *mode_cmd);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='hunk'>@@ -95,23 +96,7 @@ struct drm_mode_config_funcs {</div><div class='ctx'> 	 * The format information specific to the given fb metadata, or</div><div class='ctx'> 	 * NULL if none is found.</div><div class='ctx'> 	 */</div><div class='del'>-	const struct drm_format_info *(*get_format_info)(const struct drm_mode_fb_cmd2 *mode_cmd);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @output_poll_changed:</div><div class='del'>-	 *</div><div class='del'>-	 * Callback used by helpers to inform the driver of output configuration</div><div class='del'>-	 * changes.</div><div class='del'>-	 *</div><div class='del'>-	 * Drivers implementing fbdev emulation use drm_kms_helper_hotplug_event()</div><div class='del'>-	 * to call this hook to inform the fbdev helper of output changes.</div><div class='del'>-	 *</div><div class='del'>-	 * This hook is deprecated, drivers should instead use</div><div class='del'>-	 * drm_fbdev_generic_setup() which takes care of any necessary</div><div class='del'>-	 * hotplug event forwarding already without further involvement by</div><div class='del'>-	 * the driver.</div><div class='del'>-	 */</div><div class='del'>-	void (*output_poll_changed)(struct drm_device *dev);</div><div class='add'>+	const struct drm_format_info *(*get_format_info)(u32 pixel_format, u64 modifier);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @mode_valid:</div><div class='hunk'>@@ -506,6 +491,34 @@ struct drm_mode_config {</div><div class='ctx'> 	struct list_head plane_list;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @panic_lock:</div><div class='add'>+	 *</div><div class='add'>+	 * Raw spinlock used to protect critical sections of code that access</div><div class='add'>+	 * the display hardware or modeset software state, which the panic</div><div class='add'>+	 * printing code must be protected against. See drm_panic_trylock(),</div><div class='add'>+	 * drm_panic_lock() and drm_panic_unlock().</div><div class='add'>+	 */</div><div class='add'>+	struct raw_spinlock panic_lock;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @num_colorop:</div><div class='add'>+	 *</div><div class='add'>+	 * Number of colorop objects on this device.</div><div class='add'>+	 * This is invariant over the lifetime of a device and hence doesn't</div><div class='add'>+	 * need any locks.</div><div class='add'>+	 */</div><div class='add'>+	int num_colorop;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @colorop_list:</div><div class='add'>+	 *</div><div class='add'>+	 * List of colorop objects linked with &amp;drm_colorop.head. This is</div><div class='add'>+	 * invariant over the lifetime of a device and hence doesn't need any</div><div class='add'>+	 * locks.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head colorop_list;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @num_crtc:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Number of CRTCs on this device linked with &amp;drm_crtc.head. This is invariant over the lifetime</div><div class='hunk'>@@ -538,8 +551,8 @@ struct drm_mode_config {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head privobj_list;</div><div class='ctx'> </div><div class='del'>-	int min_width, min_height;</div><div class='del'>-	int max_width, max_height;</div><div class='add'>+	unsigned int min_width, min_height;</div><div class='add'>+	unsigned int max_width, max_height;</div><div class='ctx'> 	const struct drm_mode_config_funcs *funcs;</div><div class='ctx'> </div><div class='ctx'> 	/* output poll support */</div><div class='hunk'>@@ -942,6 +955,17 @@ struct drm_mode_config {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_property *modifiers_property;</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @async_modifiers_property: Plane property to list support modifier/format</div><div class='add'>+	 * combination for asynchronous flips.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *async_modifiers_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @size_hints_property: Plane SIZE_HINTS property.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *size_hints_property;</div><div class='add'>+</div><div class='ctx'> 	/* cursor size */</div><div class='ctx'> 	uint32_t cursor_width, cursor_height;</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/drm_mode_object.h b/include/drm/drm_mode_object.h<br/>index 08d7a7f0188f..c68edbd126d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mode_object.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_mode_object.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_mode_object.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_mode_object.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@ struct drm_file;</div><div class='ctx'>  * @id: userspace visible identifier</div><div class='ctx'>  * @type: type of the object, one of DRM_MODE_OBJECT\_\*</div><div class='ctx'>  * @properties: properties attached to this object, including values</div><div class='del'>- * @refcount: reference count for objects which with dynamic lifetime</div><div class='add'>+ * @refcount: reference count for objects with dynamic lifetime</div><div class='ctx'>  * @free_cb: free function callback, only set for objects with dynamic lifetime</div><div class='ctx'>  *</div><div class='ctx'>  * Base structure for modeset objects visible to userspace. Objects can be</div><div class='head'>diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h<br/>index c613f0abe9dc..b9bb92e4b029 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_modes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_modes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_modes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_modes.h</a></div><div class='hunk'>@@ -467,6 +467,8 @@ bool drm_mode_is_420_also(const struct drm_display_info *display,</div><div class='ctx'> 			  const struct drm_display_mode *mode);</div><div class='ctx'> bool drm_mode_is_420(const struct drm_display_info *display,</div><div class='ctx'> 		     const struct drm_display_mode *mode);</div><div class='add'>+void drm_set_preferred_mode(struct drm_connector *connector,</div><div class='add'>+			    int hpref, int vpref);</div><div class='ctx'> </div><div class='ctx'> struct drm_display_mode *drm_analog_tv_mode(struct drm_device *dev,</div><div class='ctx'> 					    enum drm_connector_tv_mode mode,</div><div class='head'>diff --git a/include/drm/drm_modeset_helper.h b/include/drm/drm_modeset_helper.h<br/>index 995fd981cab0..7e3d4c5a7f66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_modeset_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_modeset_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_modeset_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_modeset_helper.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> struct drm_crtc;</div><div class='ctx'> struct drm_crtc_funcs;</div><div class='ctx'> struct drm_device;</div><div class='add'>+struct drm_format_info;</div><div class='ctx'> struct drm_framebuffer;</div><div class='ctx'> struct drm_mode_fb_cmd2;</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +34,7 @@ void drm_helper_move_panel_connectors_to_head(struct drm_device *);</div><div class='ctx'> </div><div class='ctx'> void drm_helper_mode_fill_fb_struct(struct drm_device *dev,</div><div class='ctx'> 				    struct drm_framebuffer *fb,</div><div class='add'>+				    const struct drm_format_info *info,</div><div class='ctx'> 				    const struct drm_mode_fb_cmd2 *mode_cmd);</div><div class='ctx'> </div><div class='ctx'> int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,</div><div class='head'>diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h<br/>index 881b03e4dc28..fe32854b7ffe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_modeset_helper_vtables.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_modeset_helper_vtables.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_modeset_helper_vtables.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_modeset_helper_vtables.h</a></div><div class='hunk'>@@ -48,6 +48,7 @@</div><div class='ctx'>  * To make this clear all the helper vtables are pulled together in this location here.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+struct drm_scanout_buffer;</div><div class='ctx'> struct drm_writeback_connector;</div><div class='ctx'> struct drm_writeback_job;</div><div class='ctx'> </div><div class='hunk'>@@ -489,6 +490,18 @@ struct drm_crtc_helper_funcs {</div><div class='ctx'> 				     bool in_vblank_irq, int *vpos, int *hpos,</div><div class='ctx'> 				     ktime_t *stime, ktime_t *etime,</div><div class='ctx'> 				     const struct drm_display_mode *mode);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @handle_vblank_timeout: Handles timeouts of the vblank timer.</div><div class='add'>+	 *</div><div class='add'>+	 * Called by CRTC's the vblank timer on each timeout. Semantics is</div><div class='add'>+	 * equivalient to drm_crtc_handle_vblank(). Implementations should</div><div class='add'>+	 * invoke drm_crtc_handle_vblank() as part of processing the timeout.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is optional. If unset, the vblank timer invokes</div><div class='add'>+	 * drm_crtc_handle_vblank() directly.</div><div class='add'>+	 */</div><div class='add'>+	bool (*handle_vblank_timeout)(struct drm_crtc *crtc);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -898,7 +911,8 @@ struct drm_connector_helper_funcs {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * RETURNS:</div><div class='ctx'> 	 *</div><div class='del'>-	 * The number of modes added by calling drm_mode_probed_add().</div><div class='add'>+	 * The number of modes added by calling drm_mode_probed_add(). Return 0</div><div class='add'>+	 * on failures (no modes) instead of negative error codes.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*get_modes)(struct drm_connector *connector);</div><div class='ctx'> </div><div class='hunk'>@@ -965,7 +979,7 @@ struct drm_connector_helper_funcs {</div><div class='ctx'> 	 * drm_mode_status.</div><div class='ctx'> 	 */</div><div class='ctx'> 	enum drm_mode_status (*mode_valid)(struct drm_connector *connector,</div><div class='del'>-					   struct drm_display_mode *mode);</div><div class='add'>+					   const struct drm_display_mode *mode);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @mode_valid_ctx:</div><div class='hunk'>@@ -1004,7 +1018,7 @@ struct drm_connector_helper_funcs {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*mode_valid_ctx)(struct drm_connector *connector,</div><div class='del'>-			      struct drm_display_mode *mode,</div><div class='add'>+			      const struct drm_display_mode *mode,</div><div class='ctx'> 			      struct drm_modeset_acquire_ctx *ctx,</div><div class='ctx'> 			      enum drm_mode_status *status);</div><div class='ctx'> </div><div class='hunk'>@@ -1398,13 +1412,18 @@ struct drm_plane_helper_funcs {</div><div class='ctx'> 	 * given update can be committed asynchronously, that is, if it can</div><div class='ctx'> 	 * jump ahead of the state currently queued for update.</div><div class='ctx'> 	 *</div><div class='add'>+	 * This function is also used by drm_atomic_set_property() to determine</div><div class='add'>+	 * if the plane can be flipped in async. The flip flag is used to</div><div class='add'>+	 * distinguish if the function is used for just the plane state or for a</div><div class='add'>+	 * flip.</div><div class='add'>+	 *</div><div class='ctx'> 	 * RETURNS:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Return 0 on success and any error returned indicates that the update</div><div class='ctx'> 	 * can not be applied in asynchronous manner.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*atomic_async_check)(struct drm_plane *plane,</div><div class='del'>-				  struct drm_atomic_state *state);</div><div class='add'>+				  struct drm_atomic_state *state, bool flip);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @atomic_async_update:</div><div class='hunk'>@@ -1442,6 +1461,44 @@ struct drm_plane_helper_funcs {</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*atomic_async_update)(struct drm_plane *plane,</div><div class='ctx'> 				    struct drm_atomic_state *state);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @get_scanout_buffer:</div><div class='add'>+	 *</div><div class='add'>+	 * Get the current scanout buffer, to display a message with drm_panic.</div><div class='add'>+	 * The driver should do the minimum changes to provide a buffer,</div><div class='add'>+	 * that can be used to display the panic screen. Currently only linear</div><div class='add'>+	 * buffers are supported. Non-linear buffer support is on the TODO list.</div><div class='add'>+	 * The device &amp;dev.mode_config.panic_lock is taken before calling this</div><div class='add'>+	 * function, so you can safely access the &amp;plane.state</div><div class='add'>+	 * It is called from a panic callback, and must follow its restrictions.</div><div class='add'>+	 * Please look the documentation at drm_panic_trylock() for an in-depth</div><div class='add'>+	 * discussions of what's safe and what is not allowed.</div><div class='add'>+	 * It's a best effort mode, so it's expected that in some complex cases</div><div class='add'>+	 * the panic screen won't be displayed.</div><div class='add'>+	 * The returned &amp;drm_scanout_buffer.map must be valid if no error code is</div><div class='add'>+	 * returned.</div><div class='add'>+	 *</div><div class='add'>+	 * Return:</div><div class='add'>+	 * %0 on success, negative errno on failure.</div><div class='add'>+	 */</div><div class='add'>+	int (*get_scanout_buffer)(struct drm_plane *plane,</div><div class='add'>+				  struct drm_scanout_buffer *sb);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @panic_flush:</div><div class='add'>+	 *</div><div class='add'>+	 * It is used by drm_panic, and is called after the panic screen is</div><div class='add'>+	 * drawn to the scanout buffer. In this function, the driver</div><div class='add'>+	 * can send additional commands to the hardware, to make the scanout</div><div class='add'>+	 * buffer visible.</div><div class='add'>+	 * It is only called if get_scanout_buffer() returned successfully, and</div><div class='add'>+	 * the &amp;dev.mode_config.panic_lock is held during the entire sequence.</div><div class='add'>+	 * It is called from a panic callback, and must follow its restrictions.</div><div class='add'>+	 * Please look the documentation at drm_panic_trylock() for an in-depth</div><div class='add'>+	 * discussions of what's safe and what is not allowed.</div><div class='add'>+	 */</div><div class='add'>+	void (*panic_flush)(struct drm_plane *plane);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h<br/>index 082a6e980d01..7f0256dae3f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_of.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_of.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_of.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_of.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #ifndef __DRM_OF_H__</div><div class='ctx'> #define __DRM_OF_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/of_graph.h&gt;</div><div class='ctx'> #if IS_ENABLED(CONFIG_OF) &amp;&amp; IS_ENABLED(CONFIG_DRM_PANEL_BRIDGE)</div><div class='ctx'> #include &lt;drm/drm_bridge.h&gt;</div><div class='hunk'>@@ -51,6 +52,8 @@ int drm_of_find_panel_or_bridge(const struct device_node *np,</div><div class='ctx'> 				struct drm_bridge **bridge);</div><div class='ctx'> int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,</div><div class='ctx'> 					  const struct device_node *port2);</div><div class='add'>+int drm_of_lvds_get_dual_link_pixel_order_sink(struct device_node *port1,</div><div class='add'>+					       struct device_node *port2);</div><div class='ctx'> int drm_of_lvds_get_data_mapping(const struct device_node *port);</div><div class='ctx'> int drm_of_get_data_lanes_count(const struct device_node *endpoint,</div><div class='ctx'> 				const unsigned int min, const unsigned int max);</div><div class='hunk'>@@ -109,6 +112,13 @@ drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='add'>+drm_of_lvds_get_dual_link_pixel_order_sink(struct device_node *port1,</div><div class='add'>+					   struct device_node *port2)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='ctx'> drm_of_lvds_get_data_mapping(const struct device_node *port)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='head'>diff --git a/include/drm/drm_pagemap.h b/include/drm/drm_pagemap.h<br/>new file mode 100644<br/>index 000000000000..f6e7e234c089<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_pagemap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_pagemap.h</a></div><div class='hunk'>@@ -0,0 +1,248 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+#ifndef _DRM_PAGEMAP_H_</div><div class='add'>+#define _DRM_PAGEMAP_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-direction.h&gt;</div><div class='add'>+#include &lt;linux/hmm.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define NR_PAGES(order) (1U &lt;&lt; (order))</div><div class='add'>+</div><div class='add'>+struct drm_pagemap;</div><div class='add'>+struct drm_pagemap_zdd;</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum drm_interconnect_protocol - Used to identify an interconnect protocol.</div><div class='add'>+ *</div><div class='add'>+ * @DRM_INTERCONNECT_SYSTEM: DMA map is system pages</div><div class='add'>+ * @DRM_INTERCONNECT_DRIVER: DMA map is driver defined</div><div class='add'>+ */</div><div class='add'>+enum drm_interconnect_protocol {</div><div class='add'>+	DRM_INTERCONNECT_SYSTEM,</div><div class='add'>+	DRM_INTERCONNECT_DRIVER,</div><div class='add'>+	/* A driver can add private values beyond DRM_INTERCONNECT_DRIVER */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_pagemap_addr - Address representation.</div><div class='add'>+ * @addr: The dma address or driver-defined address for driver private interconnects.</div><div class='add'>+ * @proto: The interconnect protocol.</div><div class='add'>+ * @order: The page order of the device mapping. (Size is PAGE_SIZE &lt;&lt; order).</div><div class='add'>+ * @dir: The DMA direction.</div><div class='add'>+ *</div><div class='add'>+ * Note: There is room for improvement here. We should be able to pack into</div><div class='add'>+ * 64 bits.</div><div class='add'>+ */</div><div class='add'>+struct drm_pagemap_addr {</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	u64 proto : 54;</div><div class='add'>+	u64 order : 8;</div><div class='add'>+	u64 dir : 2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_pagemap_addr_encode() - Encode a dma address with metadata</div><div class='add'>+ * @addr: The dma address or driver-defined address for driver private interconnects.</div><div class='add'>+ * @proto: The interconnect protocol.</div><div class='add'>+ * @order: The page order of the dma mapping. (Size is PAGE_SIZE &lt;&lt; order).</div><div class='add'>+ * @dir: The DMA direction.</div><div class='add'>+ *</div><div class='add'>+ * Return: A struct drm_pagemap_addr encoding the above information.</div><div class='add'>+ */</div><div class='add'>+static inline struct drm_pagemap_addr</div><div class='add'>+drm_pagemap_addr_encode(dma_addr_t addr,</div><div class='add'>+			enum drm_interconnect_protocol proto,</div><div class='add'>+			unsigned int order,</div><div class='add'>+			enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	return (struct drm_pagemap_addr) {</div><div class='add'>+		.addr = addr,</div><div class='add'>+		.proto = proto,</div><div class='add'>+		.order = order,</div><div class='add'>+		.dir = dir,</div><div class='add'>+	};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_pagemap_ops: Ops for a drm-pagemap.</div><div class='add'>+ */</div><div class='add'>+struct drm_pagemap_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * @device_map: Map for device access or provide a virtual address suitable for</div><div class='add'>+	 *</div><div class='add'>+	 * @dpagemap: The struct drm_pagemap for the page.</div><div class='add'>+	 * @dev: The device mapper.</div><div class='add'>+	 * @page: The page to map.</div><div class='add'>+	 * @order: The page order of the device mapping. (Size is PAGE_SIZE &lt;&lt; order).</div><div class='add'>+	 * @dir: The transfer direction.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_pagemap_addr (*device_map)(struct drm_pagemap *dpagemap,</div><div class='add'>+					      struct device *dev,</div><div class='add'>+					      struct page *page,</div><div class='add'>+					      unsigned int order,</div><div class='add'>+					      enum dma_data_direction dir);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @device_unmap: Unmap a device address previously obtained using @device_map.</div><div class='add'>+	 *</div><div class='add'>+	 * @dpagemap: The struct drm_pagemap for the mapping.</div><div class='add'>+	 * @dev: The device unmapper.</div><div class='add'>+	 * @addr: The device address obtained when mapping.</div><div class='add'>+	 */</div><div class='add'>+	void (*device_unmap)(struct drm_pagemap *dpagemap,</div><div class='add'>+			     struct device *dev,</div><div class='add'>+			     struct drm_pagemap_addr addr);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @populate_mm: Populate part of the mm with @dpagemap memory,</div><div class='add'>+	 * migrating existing data.</div><div class='add'>+	 * @dpagemap: The struct drm_pagemap managing the memory.</div><div class='add'>+	 * @start: The virtual start address in @mm</div><div class='add'>+	 * @end: The virtual end address in @mm</div><div class='add'>+	 * @mm: Pointer to a live mm. The caller must have an mmget()</div><div class='add'>+	 * reference.</div><div class='add'>+	 *</div><div class='add'>+	 * The caller will have the mm lock at least in read mode.</div><div class='add'>+	 * Note that there is no guarantee that the memory is resident</div><div class='add'>+	 * after the function returns, it's best effort only.</div><div class='add'>+	 * When the mm is not using the memory anymore,</div><div class='add'>+	 * it will be released. The struct drm_pagemap might have a</div><div class='add'>+	 * mechanism in place to reclaim the memory and the data will</div><div class='add'>+	 * then be migrated. Typically to system memory.</div><div class='add'>+	 * The implementation should hold sufficient runtime power-</div><div class='add'>+	 * references while pages are used in an address space and</div><div class='add'>+	 * should ideally guard against hardware device unbind in</div><div class='add'>+	 * a way such that device pages are migrated back to system</div><div class='add'>+	 * followed by device page removal. The implementation should</div><div class='add'>+	 * return -ENODEV after device removal.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: 0 if successful. Negative error code on error.</div><div class='add'>+	 */</div><div class='add'>+	int (*populate_mm)(struct drm_pagemap *dpagemap,</div><div class='add'>+			   unsigned long start, unsigned long end,</div><div class='add'>+			   struct mm_struct *mm,</div><div class='add'>+			   unsigned long timeslice_ms);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_pagemap: Additional information for a struct dev_pagemap</div><div class='add'>+ * used for device p2p handshaking.</div><div class='add'>+ * @ops: The struct drm_pagemap_ops.</div><div class='add'>+ * @dev: The struct drevice owning the device-private memory.</div><div class='add'>+ */</div><div class='add'>+struct drm_pagemap {</div><div class='add'>+	const struct drm_pagemap_ops *ops;</div><div class='add'>+	struct device *dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct drm_pagemap_devmem;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_pagemap_devmem_ops - Operations structure for GPU SVM device memory</div><div class='add'>+ *</div><div class='add'>+ * This structure defines the operations for GPU Shared Virtual Memory (SVM)</div><div class='add'>+ * device memory. These operations are provided by the GPU driver to manage device memory</div><div class='add'>+ * allocations and perform operations such as migration between device memory and system</div><div class='add'>+ * RAM.</div><div class='add'>+ */</div><div class='add'>+struct drm_pagemap_devmem_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * @devmem_release: Release device memory allocation (optional)</div><div class='add'>+	 * @devmem_allocation: device memory allocation</div><div class='add'>+	 *</div><div class='add'>+	 * Release device memory allocation and drop a reference to device</div><div class='add'>+	 * memory allocation.</div><div class='add'>+	 */</div><div class='add'>+	void (*devmem_release)(struct drm_pagemap_devmem *devmem_allocation);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @populate_devmem_pfn: Populate device memory PFN (required for migration)</div><div class='add'>+	 * @devmem_allocation: device memory allocation</div><div class='add'>+	 * @npages: Number of pages to populate</div><div class='add'>+	 * @pfn: Array of page frame numbers to populate</div><div class='add'>+	 *</div><div class='add'>+	 * Populate device memory page frame numbers (PFN).</div><div class='add'>+	 *</div><div class='add'>+	 * Return: 0 on success, a negative error code on failure.</div><div class='add'>+	 */</div><div class='add'>+	int (*populate_devmem_pfn)(struct drm_pagemap_devmem *devmem_allocation,</div><div class='add'>+				   unsigned long npages, unsigned long *pfn);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @copy_to_devmem: Copy to device memory (required for migration)</div><div class='add'>+	 * @pages: Pointer to array of device memory pages (destination)</div><div class='add'>+	 * @pagemap_addr: Pointer to array of DMA information (source)</div><div class='add'>+	 * @npages: Number of pages to copy</div><div class='add'>+	 *</div><div class='add'>+	 * Copy pages to device memory. If the order of a @pagemap_addr entry</div><div class='add'>+	 * is greater than 0, the entry is populated but subsequent entries</div><div class='add'>+	 * within the range of that order are not populated.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: 0 on success, a negative error code on failure.</div><div class='add'>+	 */</div><div class='add'>+	int (*copy_to_devmem)(struct page **pages,</div><div class='add'>+			      struct drm_pagemap_addr *pagemap_addr,</div><div class='add'>+			      unsigned long npages);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @copy_to_ram: Copy to system RAM (required for migration)</div><div class='add'>+	 * @pages: Pointer to array of device memory pages (source)</div><div class='add'>+	 * @pagemap_addr: Pointer to array of DMA information (destination)</div><div class='add'>+	 * @npages: Number of pages to copy</div><div class='add'>+	 *</div><div class='add'>+	 * Copy pages to system RAM. If the order of a @pagemap_addr entry</div><div class='add'>+	 * is greater than 0, the entry is populated but subsequent entries</div><div class='add'>+	 * within the range of that order are not populated.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: 0 on success, a negative error code on failure.</div><div class='add'>+	 */</div><div class='add'>+	int (*copy_to_ram)(struct page **pages,</div><div class='add'>+			   struct drm_pagemap_addr *pagemap_addr,</div><div class='add'>+			   unsigned long npages);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_pagemap_devmem - Structure representing a GPU SVM device memory allocation</div><div class='add'>+ *</div><div class='add'>+ * @dev: Pointer to the device structure which device memory allocation belongs to</div><div class='add'>+ * @mm: Pointer to the mm_struct for the address space</div><div class='add'>+ * @detached: device memory allocations is detached from device pages</div><div class='add'>+ * @ops: Pointer to the operations structure for GPU SVM device memory</div><div class='add'>+ * @dpagemap: The struct drm_pagemap of the pages this allocation belongs to.</div><div class='add'>+ * @size: Size of device memory allocation</div><div class='add'>+ * @timeslice_expiration: Timeslice expiration in jiffies</div><div class='add'>+ */</div><div class='add'>+struct drm_pagemap_devmem {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct mm_struct *mm;</div><div class='add'>+	struct completion detached;</div><div class='add'>+	const struct drm_pagemap_devmem_ops *ops;</div><div class='add'>+	struct drm_pagemap *dpagemap;</div><div class='add'>+	size_t size;</div><div class='add'>+	u64 timeslice_expiration;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation,</div><div class='add'>+				  struct mm_struct *mm,</div><div class='add'>+				  unsigned long start, unsigned long end,</div><div class='add'>+				  unsigned long timeslice_ms,</div><div class='add'>+				  void *pgmap_owner);</div><div class='add'>+</div><div class='add'>+int drm_pagemap_evict_to_ram(struct drm_pagemap_devmem *devmem_allocation);</div><div class='add'>+</div><div class='add'>+const struct dev_pagemap_ops *drm_pagemap_pagemap_ops_get(void);</div><div class='add'>+</div><div class='add'>+struct drm_pagemap *drm_pagemap_page_to_dpagemap(struct page *page);</div><div class='add'>+</div><div class='add'>+void drm_pagemap_devmem_init(struct drm_pagemap_devmem *devmem_allocation,</div><div class='add'>+			     struct device *dev, struct mm_struct *mm,</div><div class='add'>+			     const struct drm_pagemap_devmem_ops *ops,</div><div class='add'>+			     struct drm_pagemap *dpagemap, size_t size);</div><div class='add'>+</div><div class='add'>+int drm_pagemap_populate_mm(struct drm_pagemap *dpagemap,</div><div class='add'>+			    unsigned long start, unsigned long end,</div><div class='add'>+			    struct mm_struct *mm,</div><div class='add'>+			    unsigned long timeslice_ms);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h<br/>index 10015891b056..2407bfa60236 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_panel.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_panel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_panel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_panel.h</a></div><div class='hunk'>@@ -28,12 +28,12 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct backlight_device;</div><div class='ctx'> struct dentry;</div><div class='ctx'> struct device_node;</div><div class='ctx'> struct drm_connector;</div><div class='del'>-struct drm_device;</div><div class='ctx'> struct drm_panel_follower;</div><div class='ctx'> struct drm_panel;</div><div class='ctx'> struct display_timing;</div><div class='hunk'>@@ -160,6 +160,20 @@ struct drm_panel_follower_funcs {</div><div class='ctx'> 	 * Called before the panel is powered off.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*panel_unpreparing)(struct drm_panel_follower *follower);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @panel_enabled:</div><div class='add'>+	 *</div><div class='add'>+	 * Called after the panel and the backlight have been enabled.</div><div class='add'>+	 */</div><div class='add'>+	int (*panel_enabled)(struct drm_panel_follower *follower);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @panel_disabling:</div><div class='add'>+	 *</div><div class='add'>+	 * Called before the panel and the backlight are disabled.</div><div class='add'>+	 */</div><div class='add'>+	int (*panel_disabling)(struct drm_panel_follower *follower);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct drm_panel_follower {</div><div class='hunk'>@@ -267,20 +281,60 @@ struct drm_panel {</div><div class='ctx'> 	 * If true then the panel has been enabled.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool enabled;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @container: Pointer to the private driver struct embedding this</div><div class='add'>+	 * @struct drm_panel.</div><div class='add'>+	 */</div><div class='add'>+	void *container;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @refcount: reference count of users referencing this panel.</div><div class='add'>+	 */</div><div class='add'>+	struct kref refcount;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void *__devm_drm_panel_alloc(struct device *dev, size_t size, size_t offset,</div><div class='add'>+			     const struct drm_panel_funcs *funcs,</div><div class='add'>+			     int connector_type);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_drm_panel_alloc - Allocate and initialize a refcounted panel.</div><div class='add'>+ *</div><div class='add'>+ * @dev: struct device of the panel device</div><div class='add'>+ * @type: the type of the struct which contains struct &amp;drm_panel</div><div class='add'>+ * @member: the name of the &amp;drm_panel within @type</div><div class='add'>+ * @funcs: callbacks for this panel</div><div class='add'>+ * @connector_type: the connector type (DRM_MODE_CONNECTOR_*) corresponding to</div><div class='add'>+ * the panel interface</div><div class='add'>+ *</div><div class='add'>+ * The reference count of the returned panel is initialized to 1. This</div><div class='add'>+ * reference will be automatically dropped via devm (by calling</div><div class='add'>+ * drm_panel_put()) when @dev is removed.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * Pointer to container structure embedding the panel, ERR_PTR on failure.</div><div class='add'>+ */</div><div class='add'>+#define devm_drm_panel_alloc(dev, type, member, funcs, connector_type) \</div><div class='add'>+	((type *)__devm_drm_panel_alloc(dev, sizeof(type), \</div><div class='add'>+					offsetof(type, member), funcs, \</div><div class='add'>+					connector_type))</div><div class='add'>+</div><div class='ctx'> void drm_panel_init(struct drm_panel *panel, struct device *dev,</div><div class='ctx'> 		    const struct drm_panel_funcs *funcs,</div><div class='ctx'> 		    int connector_type);</div><div class='ctx'> </div><div class='add'>+struct drm_panel *drm_panel_get(struct drm_panel *panel);</div><div class='add'>+void drm_panel_put(struct drm_panel *panel);</div><div class='add'>+</div><div class='ctx'> void drm_panel_add(struct drm_panel *panel);</div><div class='ctx'> void drm_panel_remove(struct drm_panel *panel);</div><div class='ctx'> </div><div class='del'>-int drm_panel_prepare(struct drm_panel *panel);</div><div class='del'>-int drm_panel_unprepare(struct drm_panel *panel);</div><div class='add'>+void drm_panel_prepare(struct drm_panel *panel);</div><div class='add'>+void drm_panel_unprepare(struct drm_panel *panel);</div><div class='ctx'> </div><div class='del'>-int drm_panel_enable(struct drm_panel *panel);</div><div class='del'>-int drm_panel_disable(struct drm_panel *panel);</div><div class='add'>+void drm_panel_enable(struct drm_panel *panel);</div><div class='add'>+void drm_panel_disable(struct drm_panel *panel);</div><div class='ctx'> </div><div class='ctx'> int drm_panel_get_modes(struct drm_panel *panel, struct drm_connector *connector);</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/drm_panic.h b/include/drm/drm_panic.h<br/>new file mode 100644<br/>index 000000000000..ac0e46b73436<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_panic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_panic.h</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 or MIT */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Intel</div><div class='add'>+ * Copyright (c) 2024 Red Hat</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DRM_PANIC_H__</div><div class='add'>+#define __DRM_PANIC_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/iosys-map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drm_device.h&gt;</div><div class='add'>+#include &lt;drm/drm_fourcc.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_scanout_buffer - DRM scanout buffer</div><div class='add'>+ *</div><div class='add'>+ * This structure holds the information necessary for drm_panic to draw the</div><div class='add'>+ * panic screen, and display it.</div><div class='add'>+ */</div><div class='add'>+struct drm_scanout_buffer {</div><div class='add'>+	/**</div><div class='add'>+	 * @format:</div><div class='add'>+	 *</div><div class='add'>+	 * drm format of the scanout buffer.</div><div class='add'>+	 */</div><div class='add'>+	const struct drm_format_info *format;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @map:</div><div class='add'>+	 *</div><div class='add'>+	 * Virtual address of the scanout buffer, either in memory or iomem.</div><div class='add'>+	 * The scanout buffer should be in linear format, and can be directly</div><div class='add'>+	 * sent to the display hardware. Tearing is not an issue for the panic</div><div class='add'>+	 * screen.</div><div class='add'>+	 */</div><div class='add'>+	struct iosys_map map[DRM_FORMAT_MAX_PLANES];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @pages: Optional, if the scanout buffer is not mapped, set this field</div><div class='add'>+	 * to the array of pages of the scanout buffer. The panic code will use</div><div class='add'>+	 * kmap_local_page_try_from_panic() to map one page at a time to write</div><div class='add'>+	 * all the pixels. This array shouldn't be allocated from the</div><div class='add'>+	 * get_scanoutbuffer() callback.</div><div class='add'>+	 * The scanout buffer should be in linear format.</div><div class='add'>+	 */</div><div class='add'>+	struct page **pages;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @width: Width of the scanout buffer, in pixels.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int width;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @height: Height of the scanout buffer, in pixels.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int height;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @pitch: Length in bytes between the start of two consecutive lines.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int pitch[DRM_FORMAT_MAX_PLANES];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @set_pixel: Optional function, to set a pixel color on the</div><div class='add'>+	 * framebuffer. It allows to handle special tiling format inside the</div><div class='add'>+	 * driver. It takes precedence over the @map and @pages fields.</div><div class='add'>+	 */</div><div class='add'>+	void (*set_pixel)(struct drm_scanout_buffer *sb, unsigned int x,</div><div class='add'>+			  unsigned int y, u32 color);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @private: private pointer that you can use in the callbacks</div><div class='add'>+	 * set_pixel()</div><div class='add'>+	 */</div><div class='add'>+	void *private;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DRM_PANIC</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_panic_trylock - try to enter the panic printing critical section</div><div class='add'>+ * @dev: struct drm_device</div><div class='add'>+ * @flags: unsigned long irq flags you need to pass to the unlock() counterpart</div><div class='add'>+ *</div><div class='add'>+ * This function must be called by any panic printing code. The panic printing</div><div class='add'>+ * attempt must be aborted if the trylock fails.</div><div class='add'>+ *</div><div class='add'>+ * Panic printing code can make the following assumptions while holding the</div><div class='add'>+ * panic lock:</div><div class='add'>+ *</div><div class='add'>+ * - Anything protected by drm_panic_lock() and drm_panic_unlock() pairs is safe</div><div class='add'>+ *   to access.</div><div class='add'>+ *</div><div class='add'>+ * - Furthermore the panic printing code only registers in drm_dev_unregister()</div><div class='add'>+ *   and gets removed in drm_dev_unregister(). This allows the panic code to</div><div class='add'>+ *   safely access any state which is invariant in between these two function</div><div class='add'>+ *   calls, like the list of planes &amp;drm_mode_config.plane_list or most of the</div><div class='add'>+ *   struct drm_plane structure.</div><div class='add'>+ *</div><div class='add'>+ * Specifically thanks to the protection around plane updates in</div><div class='add'>+ * drm_atomic_helper_swap_state() the following additional guarantees hold:</div><div class='add'>+ *</div><div class='add'>+ * - It is safe to deference the drm_plane.state pointer.</div><div class='add'>+ *</div><div class='add'>+ * - Anything in struct drm_plane_state or the driver's subclass thereof which</div><div class='add'>+ *   stays invariant after the atomic check code has finished is safe to access.</div><div class='add'>+ *   Specifically this includes the reference counted pointers to framebuffer</div><div class='add'>+ *   and buffer objects.</div><div class='add'>+ *</div><div class='add'>+ * - Anything set up by &amp;drm_plane_helper_funcs.fb_prepare and cleaned up</div><div class='add'>+ *   &amp;drm_plane_helper_funcs.fb_cleanup is safe to access, as long as it stays</div><div class='add'>+ *   invariant between these two calls. This also means that for drivers using</div><div class='add'>+ *   dynamic buffer management the framebuffer is pinned, and therefer all</div><div class='add'>+ *   relevant datastructures can be accessed without taking any further locks</div><div class='add'>+ *   (which would be impossible in panic context anyway).</div><div class='add'>+ *</div><div class='add'>+ * - Importantly, software and hardware state set up by</div><div class='add'>+ *   &amp;drm_plane_helper_funcs.begin_fb_access and</div><div class='add'>+ *   &amp;drm_plane_helper_funcs.end_fb_access is not safe to access.</div><div class='add'>+ *</div><div class='add'>+ * Drivers must not make any assumptions about the actual state of the hardware,</div><div class='add'>+ * unless they explicitly protected these hardware access with drm_panic_lock()</div><div class='add'>+ * and drm_panic_unlock().</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * %0 when failing to acquire the raw spinlock, nonzero on success.</div><div class='add'>+ */</div><div class='add'>+#define drm_panic_trylock(dev, flags) \</div><div class='add'>+	raw_spin_trylock_irqsave(&amp;(dev)-&gt;mode_config.panic_lock, flags)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_panic_lock - protect panic printing relevant state</div><div class='add'>+ * @dev: struct drm_device</div><div class='add'>+ * @flags: unsigned long irq flags you need to pass to the unlock() counterpart</div><div class='add'>+ *</div><div class='add'>+ * This function must be called to protect software and hardware state that the</div><div class='add'>+ * panic printing code must be able to rely on. The protected sections must be</div><div class='add'>+ * as small as possible. It uses the irqsave/irqrestore variant, and can be</div><div class='add'>+ * called from irq handler. Examples include:</div><div class='add'>+ *</div><div class='add'>+ * - Access to peek/poke or other similar registers, if that is the way the</div><div class='add'>+ *   driver prints the pixels into the scanout buffer at panic time.</div><div class='add'>+ *</div><div class='add'>+ * - Updates to pointers like &amp;drm_plane.state, allowing the panic handler to</div><div class='add'>+ *   safely deference these. This is done in drm_atomic_helper_swap_state().</div><div class='add'>+ *</div><div class='add'>+ * - An state that isn't invariant and that the driver must be able to access</div><div class='add'>+ *   during panic printing.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define drm_panic_lock(dev, flags) \</div><div class='add'>+	raw_spin_lock_irqsave(&amp;(dev)-&gt;mode_config.panic_lock, flags)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * drm_panic_unlock - end of the panic printing critical section</div><div class='add'>+ * @dev: struct drm_device</div><div class='add'>+ * @flags: irq flags that were returned when acquiring the lock</div><div class='add'>+ *</div><div class='add'>+ * Unlocks the raw spinlock acquired by either drm_panic_lock() or</div><div class='add'>+ * drm_panic_trylock().</div><div class='add'>+ */</div><div class='add'>+#define drm_panic_unlock(dev, flags) \</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;(dev)-&gt;mode_config.panic_lock, flags)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline bool drm_panic_trylock(struct drm_device *dev, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void drm_panic_lock(struct drm_device *dev, unsigned long flags) {}</div><div class='add'>+static inline void drm_panic_unlock(struct drm_device *dev, unsigned long flags) {}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DRM_PANIC_SCREEN_QR_CODE)</div><div class='add'>+size_t drm_panic_qr_max_data_size(u8 version, size_t url_len);</div><div class='add'>+</div><div class='add'>+u8 drm_panic_qr_generate(const char *url, u8 *data, size_t data_len, size_t data_size,</div><div class='add'>+			 u8 *tmp, size_t tmp_size);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __DRM_PANIC_H__ */</div><div class='head'>diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h<br/>index 641fe298052d..703ef4d1bbbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_plane.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_plane.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_plane.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_plane.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/kmsg_dump.h&gt;</div><div class='ctx'> #include &lt;drm/drm_mode_object.h&gt;</div><div class='ctx'> #include &lt;drm/drm_color_mgmt.h&gt;</div><div class='ctx'> #include &lt;drm/drm_rect.h&gt;</div><div class='hunk'>@@ -32,6 +33,7 @@</div><div class='ctx'> #include &lt;drm/drm_util.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct drm_crtc;</div><div class='add'>+struct drm_plane_size_hint;</div><div class='ctx'> struct drm_printer;</div><div class='ctx'> struct drm_modeset_acquire_ctx;</div><div class='ctx'> </div><div class='hunk'>@@ -242,6 +244,14 @@ struct drm_plane_state {</div><div class='ctx'> 	enum drm_scaling_filter scaling_filter;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @color_pipeline:</div><div class='add'>+	 *</div><div class='add'>+	 * The first colorop of the active color pipeline, or NULL, if no</div><div class='add'>+	 * color pipeline is active.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_colorop *color_pipeline;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @commit: Tracks the pending commit to prevent use-after-free conditions,</div><div class='ctx'> 	 * and for async plane updates.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -547,6 +557,23 @@ struct drm_plane_funcs {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool (*format_mod_supported)(struct drm_plane *plane, uint32_t format,</div><div class='ctx'> 				     uint64_t modifier);</div><div class='add'>+	/**</div><div class='add'>+	 * @format_mod_supported_async:</div><div class='add'>+	 *</div><div class='add'>+	 * This optional hook is used for the DRM to determine if for</div><div class='add'>+	 * asynchronous flip the given format/modifier combination is valid for</div><div class='add'>+	 * the plane. This allows the DRM to generate the correct format</div><div class='add'>+	 * bitmask (which formats apply to which modifier), and to validate</div><div class='add'>+	 * modifiers at atomic_check time.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns:</div><div class='add'>+	 *</div><div class='add'>+	 * True if the given modifier is valid for that format on the plane.</div><div class='add'>+	 * False otherwise.</div><div class='add'>+	 */</div><div class='add'>+	bool (*format_mod_supported_async)(struct drm_plane *plane,</div><div class='add'>+					   u32 format, u64 modifier);</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -765,6 +792,14 @@ struct drm_plane {</div><div class='ctx'> 	struct drm_property *color_range_property;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @color_pipeline_property:</div><div class='add'>+	 *</div><div class='add'>+	 * Optional "COLOR_PIPELINE" enum property for specifying</div><div class='add'>+	 * a color pipeline to use on the plane.</div><div class='add'>+	 */</div><div class='add'>+	struct drm_property *color_pipeline_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @scaling_filter_property: property to apply a particular filter while</div><div class='ctx'> 	 * scaling.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -779,6 +814,11 @@ struct drm_plane {</div><div class='ctx'> 	 * @hotspot_y_property: property to set mouse hotspot y offset.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_property *hotspot_y_property;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @kmsg_panic: Used to register a panic notifier for this plane</div><div class='add'>+	 */</div><div class='add'>+	struct kmsg_dumper kmsg_panic;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define obj_to_plane(x) container_of(x, struct drm_plane, base)</div><div class='hunk'>@@ -965,6 +1005,8 @@ static inline struct drm_plane *drm_plane_find(struct drm_device *dev,</div><div class='ctx'> #define drm_for_each_plane(plane, dev) \</div><div class='ctx'> 	list_for_each_entry(plane, &amp;(dev)-&gt;mode_config.plane_list, head)</div><div class='ctx'> </div><div class='add'>+bool drm_plane_has_format(struct drm_plane *plane,</div><div class='add'>+			  u32 format, u64 modifier);</div><div class='ctx'> bool drm_any_plane_has_format(struct drm_device *dev,</div><div class='ctx'> 			      u32 format, u64 modifier);</div><div class='ctx'> </div><div class='hunk'>@@ -976,5 +1018,11 @@ drm_plane_get_damage_clips(const struct drm_plane_state *state);</div><div class='ctx'> </div><div class='ctx'> int drm_plane_create_scaling_filter_property(struct drm_plane *plane,</div><div class='ctx'> 					     unsigned int supported_filters);</div><div class='add'>+int drm_plane_add_size_hints_property(struct drm_plane *plane,</div><div class='add'>+				      const struct drm_plane_size_hint *hints,</div><div class='add'>+				      int num_hints);</div><div class='ctx'> </div><div class='add'>+int drm_plane_create_color_pipeline_property(struct drm_plane *plane,</div><div class='add'>+					     const struct drm_prop_enum_list *pipelines,</div><div class='add'>+					     int num_pipelines);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h<br/>index 2a1d01e5b56b..f50f862f0d8b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_prime.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_prime.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_prime.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_prime.h</a></div><div class='hunk'>@@ -69,6 +69,9 @@ void drm_gem_dmabuf_release(struct dma_buf *dma_buf);</div><div class='ctx'> </div><div class='ctx'> int drm_gem_prime_fd_to_handle(struct drm_device *dev,</div><div class='ctx'> 			       struct drm_file *file_priv, int prime_fd, uint32_t *handle);</div><div class='add'>+struct dma_buf *drm_gem_prime_handle_to_dmabuf(struct drm_device *dev,</div><div class='add'>+			       struct drm_file *file_priv, uint32_t handle,</div><div class='add'>+			       uint32_t flags);</div><div class='ctx'> int drm_gem_prime_handle_to_fd(struct drm_device *dev,</div><div class='ctx'> 			       struct drm_file *file_priv, uint32_t handle, uint32_t flags,</div><div class='ctx'> 			       int *prime_fd);</div><div class='hunk'>@@ -97,6 +100,9 @@ struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj,</div><div class='ctx'> unsigned long drm_prime_get_contiguous_size(struct sg_table *sgt);</div><div class='ctx'> </div><div class='ctx'> /* helper functions for importing */</div><div class='add'>+bool drm_gem_is_prime_exported_dma_buf(struct drm_device *dev,</div><div class='add'>+				       struct dma_buf *dma_buf);</div><div class='add'>+</div><div class='ctx'> struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev,</div><div class='ctx'> 						struct dma_buf *dma_buf,</div><div class='ctx'> 						struct device *attach_dev);</div><div class='head'>diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h<br/>index dd4883df876a..ab017b05e175 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_print.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_print.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_print.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_print.h</a></div><div class='hunk'>@@ -28,12 +28,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/printk.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/dynamic_debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;drm/drm.h&gt;</div><div class='add'>+#include &lt;drm/drm_device.h&gt;</div><div class='add'>+</div><div class='add'>+struct debugfs_regset32;</div><div class='add'>+struct drm_device;</div><div class='add'>+struct seq_file;</div><div class='ctx'> </div><div class='ctx'> /* Do *not* use outside of drm_print.[ch]! */</div><div class='ctx'> extern unsigned long __drm_debug;</div><div class='hunk'>@@ -68,6 +71,101 @@ extern unsigned long __drm_debug;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum drm_debug_category - The DRM debug categories</div><div class='add'>+ *</div><div class='add'>+ * Each of the DRM debug logging macros use a specific category, and the logging</div><div class='add'>+ * is filtered by the drm.debug module parameter. This enum specifies the values</div><div class='add'>+ * for the interface.</div><div class='add'>+ *</div><div class='add'>+ * Each DRM_DEBUG_&lt;CATEGORY&gt; macro logs to DRM_UT_&lt;CATEGORY&gt; category, except</div><div class='add'>+ * DRM_DEBUG() logs to DRM_UT_CORE.</div><div class='add'>+ *</div><div class='add'>+ * Enabling verbose debug messages is done through the drm.debug parameter, each</div><div class='add'>+ * category being enabled by a bit:</div><div class='add'>+ *</div><div class='add'>+ *  - drm.debug=0x1 will enable CORE messages</div><div class='add'>+ *  - drm.debug=0x2 will enable DRIVER messages</div><div class='add'>+ *  - drm.debug=0x3 will enable CORE and DRIVER messages</div><div class='add'>+ *  - ...</div><div class='add'>+ *  - drm.debug=0x1ff will enable all messages</div><div class='add'>+ *</div><div class='add'>+ * An interesting feature is that it's possible to enable verbose logging at</div><div class='add'>+ * run-time by echoing the debug value in its sysfs node::</div><div class='add'>+ *</div><div class='add'>+ *   # echo 0xf &gt; /sys/module/drm/parameters/debug</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+enum drm_debug_category {</div><div class='add'>+	/* These names must match those in DYNAMIC_DEBUG_CLASSBITS */</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c,</div><div class='add'>+	 * drm_memory.c, ...</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_CORE,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_DRIVER: Used in the vendor specific part of the driver: i915,</div><div class='add'>+	 * radeon, ... macro.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_DRIVER,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_KMS: Used in the modesetting code.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_KMS,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_PRIME: Used in the prime code.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_PRIME,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_ATOMIC: Used in the atomic code.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_ATOMIC,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_VBL: Used for verbose debug message in the vblank code.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_VBL,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_STATE: Used for verbose atomic state debugging.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_STATE,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_LEASE: Used in the lease code.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_LEASE,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_DP: Used in the DP code.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_DP,</div><div class='add'>+	/**</div><div class='add'>+	 * @DRM_UT_DRMRES: Used in the drm managed resources code.</div><div class='add'>+	 */</div><div class='add'>+	DRM_UT_DRMRES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool drm_debug_enabled_raw(enum drm_debug_category category)</div><div class='add'>+{</div><div class='add'>+	return unlikely(__drm_debug &amp; BIT(category));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define drm_debug_enabled_instrumented(category)			\</div><div class='add'>+	({								\</div><div class='add'>+		pr_debug("todo: is this frequent enough to optimize ?\n"); \</div><div class='add'>+		drm_debug_enabled_raw(category);			\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)</div><div class='add'>+/*</div><div class='add'>+ * the drm.debug API uses dyndbg, so each drm_*dbg macro/callsite gets</div><div class='add'>+ * a descriptor, and only enabled callsites are reachable.  They use</div><div class='add'>+ * the private macro to avoid re-testing the enable-bit.</div><div class='add'>+ */</div><div class='add'>+#define __drm_debug_enabled(category)	true</div><div class='add'>+#define drm_debug_enabled(category)	drm_debug_enabled_instrumented(category)</div><div class='add'>+#else</div><div class='add'>+#define __drm_debug_enabled(category)	drm_debug_enabled_raw(category)</div><div class='add'>+#define drm_debug_enabled(category)	drm_debug_enabled_raw(category)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct drm_printer - drm output "stream"</div><div class='ctx'>  *</div><div class='ctx'>  * Do not use struct members directly.  Use drm_printer_seq_file(),</div><div class='hunk'>@@ -78,7 +176,13 @@ struct drm_printer {</div><div class='ctx'> 	void (*printfn)(struct drm_printer *p, struct va_format *vaf);</div><div class='ctx'> 	void (*puts)(struct drm_printer *p, const char *str);</div><div class='ctx'> 	void *arg;</div><div class='add'>+	const void *origin;</div><div class='ctx'> 	const char *prefix;</div><div class='add'>+	struct {</div><div class='add'>+		unsigned int series;</div><div class='add'>+		unsigned int counter;</div><div class='add'>+	} line;</div><div class='add'>+	enum drm_debug_category category;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __drm_printfn_coredump(struct drm_printer *p, struct va_format *vaf);</div><div class='hunk'>@@ -86,8 +190,9 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str);</div><div class='ctx'> void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf);</div><div class='ctx'> void __drm_puts_seq_file(struct drm_printer *p, const char *str);</div><div class='ctx'> void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);</div><div class='del'>-void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf);</div><div class='add'>+void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf);</div><div class='ctx'> void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);</div><div class='add'>+void __drm_printfn_line(struct drm_printer *p, struct va_format *vaf);</div><div class='ctx'> </div><div class='ctx'> __printf(2, 3)</div><div class='ctx'> void drm_printf(struct drm_printer *p, const char *f, ...);</div><div class='hunk'>@@ -95,6 +200,8 @@ void drm_puts(struct drm_printer *p, const char *str);</div><div class='ctx'> void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset);</div><div class='ctx'> void drm_print_bits(struct drm_printer *p, unsigned long value,</div><div class='ctx'> 		    const char * const bits[], unsigned int nbits);</div><div class='add'>+void drm_print_hex_dump(struct drm_printer *p, const char *prefix,</div><div class='add'>+			const u8 *buf, size_t len);</div><div class='ctx'> </div><div class='ctx'> __printf(2, 0)</div><div class='ctx'> /**</div><div class='hunk'>@@ -122,7 +229,8 @@ drm_vprintf(struct drm_printer *p, const char *fmt, va_list *va)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_print_iterator - local struct used with drm_printer_coredump</div><div class='del'>- * @data: Pointer to the devcoredump output buffer</div><div class='add'>+ * @data: Pointer to the devcoredump output buffer, can be NULL if using</div><div class='add'>+ * drm_printer_coredump to determine size of devcoredump</div><div class='ctx'>  * @start: The offset within the buffer to start writing</div><div class='ctx'>  * @remain: The number of bytes to write for this iteration</div><div class='ctx'>  */</div><div class='hunk'>@@ -167,6 +275,57 @@ struct drm_print_iterator {</div><div class='ctx'>  *			coredump_read, ...)</div><div class='ctx'>  *	}</div><div class='ctx'>  *</div><div class='add'>+ * The above example has a time complexity of O(N^2), where N is the size of the</div><div class='add'>+ * devcoredump. This is acceptable for small devcoredumps but scales poorly for</div><div class='add'>+ * larger ones.</div><div class='add'>+ *</div><div class='add'>+ * Another use case for drm_coredump_printer is to capture the devcoredump into</div><div class='add'>+ * a saved buffer before the dev_coredump() callback. This involves two passes:</div><div class='add'>+ * one to determine the size of the devcoredump and another to print it to a</div><div class='add'>+ * buffer. Then, in dev_coredump(), copy from the saved buffer into the</div><div class='add'>+ * devcoredump read buffer.</div><div class='add'>+ *</div><div class='add'>+ * For example::</div><div class='add'>+ *</div><div class='add'>+ *	char *devcoredump_saved_buffer;</div><div class='add'>+ *</div><div class='add'>+ *	ssize_t __coredump_print(char *buffer, ssize_t count, ...)</div><div class='add'>+ *	{</div><div class='add'>+ *		struct drm_print_iterator iter;</div><div class='add'>+ *		struct drm_printer p;</div><div class='add'>+ *</div><div class='add'>+ *		iter.data = buffer;</div><div class='add'>+ *		iter.start = 0;</div><div class='add'>+ *		iter.remain = count;</div><div class='add'>+ *</div><div class='add'>+ *		p = drm_coredump_printer(&amp;iter);</div><div class='add'>+ *</div><div class='add'>+ *		drm_printf(p, "foo=%d\n", foo);</div><div class='add'>+ *		...</div><div class='add'>+ *		return count - iter.remain;</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ *	void coredump_print(...)</div><div class='add'>+ *	{</div><div class='add'>+ *		ssize_t count;</div><div class='add'>+ *</div><div class='add'>+ *		count = __coredump_print(NULL, INT_MAX, ...);</div><div class='add'>+ *		devcoredump_saved_buffer = kvmalloc(count, GFP_KERNEL);</div><div class='add'>+ *		__coredump_print(devcoredump_saved_buffer, count, ...);</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ *	void coredump_read(char *buffer, loff_t offset, size_t count,</div><div class='add'>+ *			   void *data, size_t datalen)</div><div class='add'>+ *	{</div><div class='add'>+ *		...</div><div class='add'>+ *		memcpy(buffer, devcoredump_saved_buffer + offset, count);</div><div class='add'>+ *		...</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ * The above example has a time complexity of O(N*2), where N is the size of the</div><div class='add'>+ * devcoredump. This scales better than the previous example for larger</div><div class='add'>+ * devcoredumps.</div><div class='add'>+ *</div><div class='ctx'>  * RETURNS:</div><div class='ctx'>  * The &amp;drm_printer object</div><div class='ctx'>  */</div><div class='hunk'>@@ -186,6 +345,26 @@ drm_coredump_printer(struct drm_print_iterator *iter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * drm_coredump_printer_is_full() - DRM coredump printer output is full</div><div class='add'>+ * @p: DRM coredump printer</div><div class='add'>+ *</div><div class='add'>+ * DRM printer output is full, useful to short circuit coredump printing once</div><div class='add'>+ * printer is full.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * True if DRM coredump printer output buffer is full, False otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool drm_coredump_printer_is_full(struct drm_printer *p)</div><div class='add'>+{</div><div class='add'>+	struct drm_print_iterator *iterator = p-&gt;arg;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;printfn != __drm_printfn_coredump)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return !iterator-&gt;remain;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * drm_seq_file_printer - construct a &amp;drm_printer that outputs to &amp;seq_file</div><div class='ctx'>  * @f:  the &amp;struct seq_file to output to</div><div class='ctx'>  *</div><div class='hunk'>@@ -219,132 +398,106 @@ static inline struct drm_printer drm_info_printer(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * drm_debug_printer - construct a &amp;drm_printer that outputs to pr_debug()</div><div class='del'>- * @prefix: debug output prefix</div><div class='add'>+ * drm_dbg_printer - construct a &amp;drm_printer for drm device specific output</div><div class='add'>+ * @drm: the &amp;struct drm_device pointer, or NULL</div><div class='add'>+ * @category: the debug category to use</div><div class='add'>+ * @prefix: debug output prefix, or NULL for no prefix</div><div class='ctx'>  *</div><div class='ctx'>  * RETURNS:</div><div class='ctx'>  * The &amp;drm_printer object</div><div class='ctx'>  */</div><div class='del'>-static inline struct drm_printer drm_debug_printer(const char *prefix)</div><div class='add'>+static inline struct drm_printer drm_dbg_printer(struct drm_device *drm,</div><div class='add'>+						 enum drm_debug_category category,</div><div class='add'>+						 const char *prefix)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_printer p = {</div><div class='del'>-		.printfn = __drm_printfn_debug,</div><div class='del'>-		.prefix = prefix</div><div class='add'>+		.printfn = __drm_printfn_dbg,</div><div class='add'>+		.arg = drm,</div><div class='add'>+		.origin = (const void *)_THIS_IP_, /* it's fine as we will be inlined */</div><div class='add'>+		.prefix = prefix,</div><div class='add'>+		.category = category,</div><div class='ctx'> 	};</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * drm_err_printer - construct a &amp;drm_printer that outputs to pr_err()</div><div class='del'>- * @prefix: debug output prefix</div><div class='add'>+ * drm_err_printer - construct a &amp;drm_printer that outputs to drm_err()</div><div class='add'>+ * @drm: the &amp;struct drm_device pointer</div><div class='add'>+ * @prefix: debug output prefix, or NULL for no prefix</div><div class='ctx'>  *</div><div class='ctx'>  * RETURNS:</div><div class='ctx'>  * The &amp;drm_printer object</div><div class='ctx'>  */</div><div class='del'>-static inline struct drm_printer drm_err_printer(const char *prefix)</div><div class='add'>+static inline struct drm_printer drm_err_printer(struct drm_device *drm,</div><div class='add'>+						 const char *prefix)</div><div class='ctx'> {</div><div class='ctx'> 	struct drm_printer p = {</div><div class='ctx'> 		.printfn = __drm_printfn_err,</div><div class='add'>+		.arg = drm,</div><div class='ctx'> 		.prefix = prefix</div><div class='ctx'> 	};</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum drm_debug_category - The DRM debug categories</div><div class='add'>+ * drm_line_printer - construct a &amp;drm_printer that prefixes outputs with line numbers</div><div class='add'>+ * @p: the &amp;struct drm_printer which actually generates the output</div><div class='add'>+ * @prefix: optional output prefix, or NULL for no prefix</div><div class='add'>+ * @series: optional unique series identifier, or 0 to omit identifier in the output</div><div class='ctx'>  *</div><div class='del'>- * Each of the DRM debug logging macros use a specific category, and the logging</div><div class='del'>- * is filtered by the drm.debug module parameter. This enum specifies the values</div><div class='del'>- * for the interface.</div><div class='add'>+ * This printer can be used to increase the robustness of the captured output</div><div class='add'>+ * to make sure we didn't lost any intermediate lines of the output. Helpful</div><div class='add'>+ * while capturing some crash data.</div><div class='ctx'>  *</div><div class='del'>- * Each DRM_DEBUG_&lt;CATEGORY&gt; macro logs to DRM_UT_&lt;CATEGORY&gt; category, except</div><div class='del'>- * DRM_DEBUG() logs to DRM_UT_CORE.</div><div class='add'>+ * Example 1::</div><div class='ctx'>  *</div><div class='del'>- * Enabling verbose debug messages is done through the drm.debug parameter, each</div><div class='del'>- * category being enabled by a bit:</div><div class='add'>+ *	void crash_dump(struct drm_device *drm)</div><div class='add'>+ *	{</div><div class='add'>+ *		static unsigned int id;</div><div class='add'>+ *		struct drm_printer p = drm_err_printer(drm, "crash");</div><div class='add'>+ *		struct drm_printer lp = drm_line_printer(&amp;p, "dump", ++id);</div><div class='ctx'>  *</div><div class='del'>- *  - drm.debug=0x1 will enable CORE messages</div><div class='del'>- *  - drm.debug=0x2 will enable DRIVER messages</div><div class='del'>- *  - drm.debug=0x3 will enable CORE and DRIVER messages</div><div class='del'>- *  - ...</div><div class='del'>- *  - drm.debug=0x1ff will enable all messages</div><div class='add'>+ *		drm_printf(&amp;lp, "foo");</div><div class='add'>+ *		drm_printf(&amp;lp, "bar");</div><div class='add'>+ *	}</div><div class='ctx'>  *</div><div class='del'>- * An interesting feature is that it's possible to enable verbose logging at</div><div class='del'>- * run-time by echoing the debug value in its sysfs node::</div><div class='add'>+ * Above code will print into the dmesg something like::</div><div class='ctx'>  *</div><div class='del'>- *   # echo 0xf &gt; /sys/module/drm/parameters/debug</div><div class='add'>+ *	[ ] 0000:00:00.0: [drm] *ERROR* crash dump 1.1: foo</div><div class='add'>+ *	[ ] 0000:00:00.0: [drm] *ERROR* crash dump 1.2: bar</div><div class='ctx'>  *</div><div class='add'>+ * Example 2::</div><div class='add'>+ *</div><div class='add'>+ *	void line_dump(struct device *dev)</div><div class='add'>+ *	{</div><div class='add'>+ *		struct drm_printer p = drm_info_printer(dev);</div><div class='add'>+ *		struct drm_printer lp = drm_line_printer(&amp;p, NULL, 0);</div><div class='add'>+ *</div><div class='add'>+ *		drm_printf(&amp;lp, "foo");</div><div class='add'>+ *		drm_printf(&amp;lp, "bar");</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ * Above code will print::</div><div class='add'>+ *</div><div class='add'>+ *	[ ] 0000:00:00.0: [drm] 1: foo</div><div class='add'>+ *	[ ] 0000:00:00.0: [drm] 2: bar</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * The &amp;drm_printer object</div><div class='ctx'>  */</div><div class='del'>-enum drm_debug_category {</div><div class='del'>-	/* These names must match those in DYNAMIC_DEBUG_CLASSBITS */</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c,</div><div class='del'>-	 * drm_memory.c, ...</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_CORE,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_DRIVER: Used in the vendor specific part of the driver: i915,</div><div class='del'>-	 * radeon, ... macro.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_DRIVER,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_KMS: Used in the modesetting code.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_KMS,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_PRIME: Used in the prime code.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_PRIME,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_ATOMIC: Used in the atomic code.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_ATOMIC,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_VBL: Used for verbose debug message in the vblank code.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_VBL,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_STATE: Used for verbose atomic state debugging.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_STATE,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_LEASE: Used in the lease code.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_LEASE,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_DP: Used in the DP code.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_DP,</div><div class='del'>-	/**</div><div class='del'>-	 * @DRM_UT_DRMRES: Used in the drm managed resources code.</div><div class='del'>-	 */</div><div class='del'>-	DRM_UT_DRMRES</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline bool drm_debug_enabled_raw(enum drm_debug_category category)</div><div class='add'>+static inline struct drm_printer drm_line_printer(struct drm_printer *p,</div><div class='add'>+						  const char *prefix,</div><div class='add'>+						  unsigned int series)</div><div class='ctx'> {</div><div class='del'>-	return unlikely(__drm_debug &amp; BIT(category));</div><div class='add'>+	struct drm_printer lp = {</div><div class='add'>+		.printfn = __drm_printfn_line,</div><div class='add'>+		.arg = p,</div><div class='add'>+		.prefix = prefix,</div><div class='add'>+		.line = { .series = series, },</div><div class='add'>+	};</div><div class='add'>+	return lp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define drm_debug_enabled_instrumented(category)			\</div><div class='del'>-	({								\</div><div class='del'>-		pr_debug("todo: is this frequent enough to optimize ?\n"); \</div><div class='del'>-		drm_debug_enabled_raw(category);			\</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)</div><div class='del'>-/*</div><div class='del'>- * the drm.debug API uses dyndbg, so each drm_*dbg macro/callsite gets</div><div class='del'>- * a descriptor, and only enabled callsites are reachable.  They use</div><div class='del'>- * the private macro to avoid re-testing the enable-bit.</div><div class='del'>- */</div><div class='del'>-#define __drm_debug_enabled(category)	true</div><div class='del'>-#define drm_debug_enabled(category)	drm_debug_enabled_instrumented(category)</div><div class='del'>-#else</div><div class='del'>-#define __drm_debug_enabled(category)	drm_debug_enabled_raw(category)</div><div class='del'>-#define drm_debug_enabled(category)	drm_debug_enabled_raw(category)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * struct device based logging</div><div class='ctx'>  *</div><div class='hunk'>@@ -451,9 +604,15 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,</div><div class='ctx'>  * Prefer drm_device based logging over device or prink based logging.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* Helper to enforce struct drm_device type */</div><div class='add'>+static inline struct device *__drm_to_dev(const struct drm_device *drm)</div><div class='add'>+{</div><div class='add'>+	return drm ? drm-&gt;dev : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Helper for struct drm_device based logging. */</div><div class='ctx'> #define __drm_printk(drm, level, type, fmt, ...)			\</div><div class='del'>-	dev_##level##type((drm) ? (drm)-&gt;dev : NULL, "[drm] " fmt, ##__VA_ARGS__)</div><div class='add'>+	dev_##level##type(__drm_to_dev(drm), "[drm] " fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define drm_info(drm, fmt, ...)					\</div><div class='hunk'>@@ -487,25 +646,25 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define drm_dbg_core(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_CORE, fmt, ##__VA_ARGS__)</div><div class='del'>-#define drm_dbg_driver(drm, fmt, ...)						\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_DRIVER, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_CORE, fmt, ##__VA_ARGS__)</div><div class='add'>+#define drm_dbg_driver(drm, fmt, ...)					\</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_DRIVER, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define drm_dbg_kms(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_KMS, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define drm_dbg_prime(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_PRIME, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_PRIME, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define drm_dbg_atomic(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define drm_dbg_vbl(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_VBL, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_VBL, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define drm_dbg_state(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_STATE, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_STATE, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define drm_dbg_lease(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_LEASE, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_LEASE, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define drm_dbg_dp(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_DP, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_DP, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define drm_dbg_drmres(drm, fmt, ...)					\</div><div class='del'>-	drm_dev_dbg((drm) ? (drm)-&gt;dev : NULL, DRM_UT_DRMRES, fmt, ##__VA_ARGS__)</div><div class='add'>+	drm_dev_dbg(__drm_to_dev(drm), DRM_UT_DRMRES, fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define drm_dbg(drm, fmt, ...)	drm_dbg_driver(drm, fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='hunk'>@@ -515,17 +674,15 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,</div><div class='ctx'>  * Prefer drm_device based logging over device or prink based logging.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-__printf(3, 4)</div><div class='del'>-void ___drm_dbg(struct _ddebug *desc, enum drm_debug_category category, const char *format, ...);</div><div class='ctx'> __printf(1, 2)</div><div class='ctx'> void __drm_err(const char *format, ...);</div><div class='ctx'> </div><div class='ctx'> #if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)</div><div class='del'>-#define __drm_dbg(cat, fmt, ...)		___drm_dbg(NULL, cat, fmt, ##__VA_ARGS__)</div><div class='add'>+#define __drm_dbg(cat, fmt, ...)	__drm_dev_dbg(NULL, NULL, cat, fmt, ##__VA_ARGS__)</div><div class='ctx'> #else</div><div class='ctx'> #define __drm_dbg(cat, fmt, ...)					\</div><div class='del'>-	_dynamic_func_call_cls(cat, fmt, ___drm_dbg,			\</div><div class='del'>-			       cat, fmt, ##__VA_ARGS__)</div><div class='add'>+	_dynamic_func_call_cls(cat, fmt, __drm_dev_dbg,			\</div><div class='add'>+			       NULL, cat, fmt, ##__VA_ARGS__)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Macros to make printk easier */</div><div class='hunk'>@@ -596,12 +753,14 @@ void __drm_err(const char *format, ...);</div><div class='ctx'> #define __DRM_DEFINE_DBG_RATELIMITED(category, drm, fmt, ...)					\</div><div class='ctx'> ({												\</div><div class='ctx'> 	static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST);\</div><div class='del'>-	const struct drm_device *drm_ = (drm);							\</div><div class='ctx'> 												\</div><div class='ctx'> 	if (drm_debug_enabled(DRM_UT_ ## category) &amp;&amp; __ratelimit(&amp;rs_))			\</div><div class='del'>-		drm_dev_printk(drm_ ? drm_-&gt;dev : NULL, KERN_DEBUG, fmt, ## __VA_ARGS__);	\</div><div class='add'>+		drm_dev_printk(__drm_to_dev(drm), KERN_DEBUG, fmt, ## __VA_ARGS__);		\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+#define drm_dbg_ratelimited(drm, fmt, ...) \</div><div class='add'>+	__DRM_DEFINE_DBG_RATELIMITED(DRIVER, drm, fmt, ## __VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #define drm_dbg_kms_ratelimited(drm, fmt, ...) \</div><div class='ctx'> 	__DRM_DEFINE_DBG_RATELIMITED(KMS, drm, fmt, ## __VA_ARGS__)</div><div class='ctx'> </div><div class='hunk'>@@ -617,14 +776,14 @@ void __drm_err(const char *format, ...);</div><div class='ctx'> </div><div class='ctx'> /* Helper for struct drm_device based WARNs */</div><div class='ctx'> #define drm_WARN(drm, condition, format, arg...)			\</div><div class='del'>-	WARN(condition, "%s %s: " format,				\</div><div class='del'>-			dev_driver_string((drm)-&gt;dev),			\</div><div class='del'>-			dev_name((drm)-&gt;dev), ## arg)</div><div class='add'>+	WARN(condition, "%s %s: [drm] " format,				\</div><div class='add'>+			dev_driver_string(__drm_to_dev(drm)),		\</div><div class='add'>+			dev_name(__drm_to_dev(drm)), ## arg)</div><div class='ctx'> </div><div class='ctx'> #define drm_WARN_ONCE(drm, condition, format, arg...)			\</div><div class='del'>-	WARN_ONCE(condition, "%s %s: " format,				\</div><div class='del'>-			dev_driver_string((drm)-&gt;dev),			\</div><div class='del'>-			dev_name((drm)-&gt;dev), ## arg)</div><div class='add'>+	WARN_ONCE(condition, "%s %s: [drm] " format,			\</div><div class='add'>+			dev_driver_string(__drm_to_dev(drm)),		\</div><div class='add'>+			dev_name(__drm_to_dev(drm)), ## arg)</div><div class='ctx'> </div><div class='ctx'> #define drm_WARN_ON(drm, x)						\</div><div class='ctx'> 	drm_WARN((drm), (x), "%s",					\</div><div class='head'>diff --git a/include/drm/drm_probe_helper.h b/include/drm/drm_probe_helper.h<br/>index fad3c4003b2b..840ae5f798c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_probe_helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_probe_helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_probe_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_probe_helper.h</a></div><div class='hunk'>@@ -16,6 +16,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector</div><div class='ctx'> int drm_helper_probe_detect(struct drm_connector *connector,</div><div class='ctx'> 			    struct drm_modeset_acquire_ctx *ctx,</div><div class='ctx'> 			    bool force);</div><div class='add'>+</div><div class='add'>+void drmm_kms_helper_poll_init(struct drm_device *dev);</div><div class='ctx'> void drm_kms_helper_poll_init(struct drm_device *dev);</div><div class='ctx'> void drm_kms_helper_poll_fini(struct drm_device *dev);</div><div class='ctx'> bool drm_helper_hpd_irq_event(struct drm_device *dev);</div><div class='hunk'>@@ -32,10 +34,13 @@ enum drm_mode_status drm_crtc_helper_mode_valid_fixed(struct drm_crtc *crtc,</div><div class='ctx'> 						      const struct drm_display_mode *mode,</div><div class='ctx'> 						      const struct drm_display_mode *fixed_mode);</div><div class='ctx'> </div><div class='del'>-int drm_connector_helper_get_modes_from_ddc(struct drm_connector *connector);</div><div class='ctx'> int drm_connector_helper_get_modes_fixed(struct drm_connector *connector,</div><div class='ctx'> 					 const struct drm_display_mode *fixed_mode);</div><div class='ctx'> int drm_connector_helper_get_modes(struct drm_connector *connector);</div><div class='ctx'> int drm_connector_helper_tv_get_modes(struct drm_connector *connector);</div><div class='ctx'> </div><div class='add'>+int drm_connector_helper_detect_from_ddc(struct drm_connector *connector,</div><div class='add'>+					 struct drm_modeset_acquire_ctx *ctx,</div><div class='add'>+					 bool force);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_rect.h b/include/drm/drm_rect.h<br/>index e8d94fca2703..46f09cf68458 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_rect.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_rect.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_rect.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_rect.h</a></div><div class='hunk'>@@ -129,7 +129,7 @@ static inline void drm_rect_adjust_size(struct drm_rect *r, int dw, int dh)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * drm_rect_translate - translate the rectangle</div><div class='del'>- * @r: rectangle to be tranlated</div><div class='add'>+ * @r: rectangle to be translated</div><div class='ctx'>  * @dx: horizontal translation</div><div class='ctx'>  * @dy: vertical translation</div><div class='ctx'>  *</div><div class='hunk'>@@ -146,7 +146,7 @@ static inline void drm_rect_translate(struct drm_rect *r, int dx, int dy)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * drm_rect_translate_to - translate the rectangle to an absolute position</div><div class='del'>- * @r: rectangle to be tranlated</div><div class='add'>+ * @r: rectangle to be translated</div><div class='ctx'>  * @x: horizontal position</div><div class='ctx'>  * @y: vertical position</div><div class='ctx'>  *</div><div class='hunk'>@@ -238,6 +238,21 @@ static inline void drm_rect_fp_to_int(struct drm_rect *dst,</div><div class='ctx'> 		      drm_rect_height(src) &gt;&gt; 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * drm_rect_overlap - Check if two rectangles overlap</div><div class='add'>+ * @a: first rectangle</div><div class='add'>+ * @b: second rectangle</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * %true if the rectangles overlap, %false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool drm_rect_overlap(const struct drm_rect *a,</div><div class='add'>+				    const struct drm_rect *b)</div><div class='add'>+{</div><div class='add'>+	return (a-&gt;x2 &gt; b-&gt;x1 &amp;&amp; b-&gt;x2 &gt; a-&gt;x1 &amp;&amp;</div><div class='add'>+		a-&gt;y2 &gt; b-&gt;y1 &amp;&amp; b-&gt;y2 &gt; a-&gt;y1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool drm_rect_intersect(struct drm_rect *r, const struct drm_rect *clip);</div><div class='ctx'> bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,</div><div class='ctx'> 			  const struct drm_rect *clip);</div><div class='head'>diff --git a/include/drm/drm_suballoc.h b/include/drm/drm_suballoc.h<br/>index c2188bb0b157..7ba72a81a808 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_suballoc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_suballoc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_suballoc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_suballoc.h</a></div><div class='hunk'>@@ -37,7 +37,7 @@ struct drm_suballoc_manager {</div><div class='ctx'>  * @manager: The drm_suballoc_manager.</div><div class='ctx'>  * @soffset: Start offset.</div><div class='ctx'>  * @eoffset: End offset + 1 so that @eoffset - @soffset = size.</div><div class='del'>- * @dma_fence: The fence protecting the allocation.</div><div class='add'>+ * @fence: The fence protecting the allocation.</div><div class='ctx'>  */</div><div class='ctx'> struct drm_suballoc {</div><div class='ctx'> 	struct list_head olist;</div><div class='head'>diff --git a/include/drm/drm_util.h b/include/drm/drm_util.h<br/>index 79952d8c4bba..440199618620 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_util.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_util.h</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/kgdb.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/util_macros.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Use EXPORT_SYMBOL_FOR_TESTS_ONLY() for functions that shall</div><div class='hunk'>@@ -48,21 +49,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * for_each_if - helper for handling conditionals in various for_each macros</div><div class='del'>- * @condition: The condition to check</div><div class='del'>- *</div><div class='del'>- * Typical use::</div><div class='del'>- *</div><div class='del'>- *	#define for_each_foo_bar(x, y) \'</div><div class='del'>- *		list_for_each_entry(x, y-&gt;list, head) \'</div><div class='del'>- *			for_each_if(x-&gt;something == SOMETHING)</div><div class='del'>- *</div><div class='del'>- * The for_each_if() macro makes the use of for_each_foo_bar() less error</div><div class='del'>- * prone.</div><div class='del'>- */</div><div class='del'>-#define for_each_if(condition) if (!(condition)) {} else</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * drm_can_sleep - returns true if currently okay to sleep</div><div class='ctx'>  *</div><div class='ctx'>  * This function shall not be used in new code.</div><div class='head'>diff --git a/include/drm/drm_utils.h b/include/drm/drm_utils.h<br/>index 70775748d243..6a46f755daba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_utils.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_utils.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_utils.h</a></div><div class='hunk'>@@ -12,8 +12,18 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+struct drm_edid;</div><div class='add'>+</div><div class='ctx'> int drm_get_panel_orientation_quirk(int width, int height);</div><div class='ctx'> </div><div class='add'>+struct drm_panel_backlight_quirk {</div><div class='add'>+	u16 min_brightness;</div><div class='add'>+	u32 brightness_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct drm_panel_backlight_quirk *</div><div class='add'>+drm_get_panel_backlight_quirk(const struct drm_edid *edid);</div><div class='add'>+</div><div class='ctx'> signed long drm_timeout_abs_to_jiffies(int64_t timeout_nsec);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/drm_vblank.h b/include/drm/drm_vblank.h<br/>index 7f3957943dd1..ffa564d79638 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_vblank.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_vblank.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_vblank.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_vblank.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #define _DRM_VBLANK_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/seqlock.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='hunk'>@@ -79,6 +80,53 @@ struct drm_pending_vblank_event {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct drm_vblank_crtc_config - vblank configuration for a CRTC</div><div class='add'>+ */</div><div class='add'>+struct drm_vblank_crtc_config {</div><div class='add'>+	/**</div><div class='add'>+	 * @offdelay_ms: Vblank off delay in ms, used to determine how long</div><div class='add'>+	 * &amp;drm_vblank_crtc.disable_timer waits before disabling.</div><div class='add'>+	 *</div><div class='add'>+	 * Defaults to the value of drm_vblank_offdelay in drm_crtc_vblank_on().</div><div class='add'>+	 */</div><div class='add'>+	int offdelay_ms;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @disable_immediate: See &amp;drm_device.vblank_disable_immediate</div><div class='add'>+	 * for the exact semantics of immediate vblank disabling.</div><div class='add'>+	 *</div><div class='add'>+	 * Additionally, this tracks the disable immediate value per crtc, just</div><div class='add'>+	 * in case it needs to differ from the default value for a given device.</div><div class='add'>+	 *</div><div class='add'>+	 * Defaults to the value of &amp;drm_device.vblank_disable_immediate in</div><div class='add'>+	 * drm_crtc_vblank_on().</div><div class='add'>+	 */</div><div class='add'>+	bool disable_immediate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct drm_vblank_crtc_timer - vblank timer for a CRTC</div><div class='add'>+ */</div><div class='add'>+struct drm_vblank_crtc_timer {</div><div class='add'>+	/**</div><div class='add'>+	 * @timer: The vblank's high-resolution timer</div><div class='add'>+	 */</div><div class='add'>+	struct hrtimer timer;</div><div class='add'>+	/**</div><div class='add'>+	 * @interval_lock: Protects @interval</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t interval_lock;</div><div class='add'>+	/**</div><div class='add'>+	 * @interval: Duration between two vblanks</div><div class='add'>+	 */</div><div class='add'>+	ktime_t interval;</div><div class='add'>+	/**</div><div class='add'>+	 * @crtc: The timer's CRTC</div><div class='add'>+	 */</div><div class='add'>+	struct drm_crtc *crtc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct drm_vblank_crtc - vblank tracking for a CRTC</div><div class='ctx'>  *</div><div class='ctx'>  * This structure tracks the vblank state for one CRTC.</div><div class='hunk'>@@ -99,8 +147,8 @@ struct drm_vblank_crtc {</div><div class='ctx'> 	wait_queue_head_t queue;</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @disable_timer: Disable timer for the delayed vblank disabling</div><div class='del'>-	 * hysteresis logic. Vblank disabling is controlled through the</div><div class='del'>-	 * drm_vblank_offdelay module option and the setting of the</div><div class='add'>+	 * hysteresis logic. Vblank disabling is controlled through</div><div class='add'>+	 * &amp;drm_vblank_crtc_config.offdelay_ms and the setting of the</div><div class='ctx'> 	 * &amp;drm_device.max_vblank_count value.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct timer_list disable_timer;</div><div class='hunk'>@@ -199,6 +247,12 @@ struct drm_vblank_crtc {</div><div class='ctx'> 	struct drm_display_mode hwmode;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @config: Stores vblank configuration values for a given CRTC.</div><div class='add'>+	 * Also, see drm_crtc_vblank_on_config().</div><div class='add'>+	 */</div><div class='add'>+	struct drm_vblank_crtc_config config;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @enabled: Tracks the enabling state of the corresponding &amp;drm_crtc to</div><div class='ctx'> 	 * avoid double-disabling and hence corrupting saved state. Needed by</div><div class='ctx'> 	 * drivers not using atomic KMS, since those might go through their CRTC</div><div class='hunk'>@@ -223,8 +277,14 @@ struct drm_vblank_crtc {</div><div class='ctx'> 	 * cancelled.</div><div class='ctx'> 	 */</div><div class='ctx'> 	wait_queue_head_t work_wait_queue;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @vblank_timer: Holds the state of the vblank timer</div><div class='add'>+	 */</div><div class='add'>+	struct drm_vblank_crtc_timer vblank_timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct drm_vblank_crtc *drm_crtc_vblank_crtc(struct drm_crtc *crtc);</div><div class='ctx'> int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);</div><div class='ctx'> bool drm_dev_has_vblank(const struct drm_device *dev);</div><div class='ctx'> u64 drm_crtc_vblank_count(struct drm_crtc *crtc);</div><div class='hunk'>@@ -246,6 +306,8 @@ void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);</div><div class='ctx'> void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);</div><div class='ctx'> void drm_crtc_vblank_off(struct drm_crtc *crtc);</div><div class='ctx'> void drm_crtc_vblank_reset(struct drm_crtc *crtc);</div><div class='add'>+void drm_crtc_vblank_on_config(struct drm_crtc *crtc,</div><div class='add'>+			       const struct drm_vblank_crtc_config *config);</div><div class='ctx'> void drm_crtc_vblank_on(struct drm_crtc *crtc);</div><div class='ctx'> u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc);</div><div class='ctx'> void drm_crtc_vblank_restore(struct drm_crtc *crtc);</div><div class='hunk'>@@ -256,6 +318,10 @@ wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc);</div><div class='ctx'> void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc,</div><div class='ctx'> 				   u32 max_vblank_count);</div><div class='ctx'> </div><div class='add'>+int drm_crtc_vblank_start_timer(struct drm_crtc *crtc);</div><div class='add'>+void drm_crtc_vblank_cancel_timer(struct drm_crtc *crtc);</div><div class='add'>+void drm_crtc_vblank_get_vblank_timeout(struct drm_crtc *crtc, ktime_t *vblank_time);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Helpers for struct drm_crtc_funcs</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/drm/drm_vblank_helper.h b/include/drm/drm_vblank_helper.h<br/>new file mode 100644<br/>index 000000000000..fcd8a9b35846<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_vblank_helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_vblank_helper.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DRM_VBLANK_HELPER_H_</div><div class='add'>+#define _DRM_VBLANK_HELPER_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/hrtimer_types.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_atomic_state;</div><div class='add'>+struct drm_crtc;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VBLANK helpers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void drm_crtc_vblank_atomic_flush(struct drm_crtc *crtc,</div><div class='add'>+				  struct drm_atomic_state *state);</div><div class='add'>+void drm_crtc_vblank_atomic_enable(struct drm_crtc *crtc,</div><div class='add'>+				   struct drm_atomic_state *state);</div><div class='add'>+void drm_crtc_vblank_atomic_disable(struct drm_crtc *crtc,</div><div class='add'>+				    struct drm_atomic_state *crtc_state);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DRM_CRTC_HELPER_VBLANK_FUNCS - Default implementation for VBLANK helpers</div><div class='add'>+ *</div><div class='add'>+ * This macro initializes struct &amp;drm_crtc_helper_funcs to default helpers</div><div class='add'>+ * for VBLANK handling.</div><div class='add'>+ */</div><div class='add'>+#define DRM_CRTC_HELPER_VBLANK_FUNCS \</div><div class='add'>+	.atomic_flush = drm_crtc_vblank_atomic_flush, \</div><div class='add'>+	.atomic_enable = drm_crtc_vblank_atomic_enable, \</div><div class='add'>+	.atomic_disable = drm_crtc_vblank_atomic_disable</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VBLANK timer</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int drm_crtc_vblank_helper_enable_vblank_timer(struct drm_crtc *crtc);</div><div class='add'>+void drm_crtc_vblank_helper_disable_vblank_timer(struct drm_crtc *crtc);</div><div class='add'>+bool drm_crtc_vblank_helper_get_vblank_timestamp_from_timer(struct drm_crtc *crtc,</div><div class='add'>+							    int *max_error,</div><div class='add'>+							    ktime_t *vblank_time,</div><div class='add'>+							    bool in_vblank_irq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DRM_CRTC_VBLANK_TIMER_FUNCS - Default implementation for VBLANK timers</div><div class='add'>+ *</div><div class='add'>+ * This macro initializes struct &amp;drm_crtc_funcs to default helpers for</div><div class='add'>+ * VBLANK timers.</div><div class='add'>+ */</div><div class='add'>+#define DRM_CRTC_VBLANK_TIMER_FUNCS \</div><div class='add'>+	.enable_vblank = drm_crtc_vblank_helper_enable_vblank_timer, \</div><div class='add'>+	.disable_vblank = drm_crtc_vblank_helper_disable_vblank_timer, \</div><div class='add'>+	.get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp_from_timer</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/drm_vblank_work.h b/include/drm/drm_vblank_work.h<br/>index eb41d0810c4f..e04d436b7297 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_vblank_work.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_vblank_work.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_vblank_work.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_vblank_work.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@ struct drm_crtc;</div><div class='ctx'>  * drm_vblank_work_init()</div><div class='ctx'>  * drm_vblank_work_cancel_sync()</div><div class='ctx'>  * drm_vblank_work_flush()</div><div class='add'>+ * drm_vblank_work_flush_all()</div><div class='ctx'>  */</div><div class='ctx'> struct drm_vblank_work {</div><div class='ctx'> 	/**</div><div class='hunk'>@@ -67,5 +68,6 @@ void drm_vblank_work_init(struct drm_vblank_work *work, struct drm_crtc *crtc,</div><div class='ctx'> 			  void (*func)(struct kthread_work *work));</div><div class='ctx'> bool drm_vblank_work_cancel_sync(struct drm_vblank_work *work);</div><div class='ctx'> void drm_vblank_work_flush(struct drm_vblank_work *work);</div><div class='add'>+void drm_vblank_work_flush_all(struct drm_crtc *crtc);</div><div class='ctx'> </div><div class='ctx'> #endif /* !_DRM_VBLANK_WORK_H_ */</div><div class='head'>diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h<br/>index 17e576c80169..c380a7b8f55a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/drm_writeback.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/drm_writeback.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/drm_writeback.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/drm_writeback.h</a></div><div class='hunk'>@@ -161,6 +161,12 @@ int drm_writeback_connector_init_with_encoder(struct drm_device *dev,</div><div class='ctx'> 				const struct drm_connector_funcs *con_funcs, const u32 *formats,</div><div class='ctx'> 				int n_formats);</div><div class='ctx'> </div><div class='add'>+int drmm_writeback_connector_init(struct drm_device *dev,</div><div class='add'>+				  struct drm_writeback_connector *wb_connector,</div><div class='add'>+				  const struct drm_connector_funcs *con_funcs,</div><div class='add'>+				  struct drm_encoder *enc,</div><div class='add'>+				  const u32 *formats, int n_formats);</div><div class='add'>+</div><div class='ctx'> int drm_writeback_set_fb(struct drm_connector_state *conn_state,</div><div class='ctx'> 			 struct drm_framebuffer *fb);</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/gma_drm.h b/include/drm/gma_drm.h<br/>deleted file mode 100644<br/>index 228f43e8df89..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/gma_drm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/gma_drm.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/**************************************************************************</div><div class='del'>- * Copyright (c) 2007-2011, Intel Corporation.</div><div class='del'>- * All Rights Reserved.</div><div class='del'>- * Copyright (c) 2008, Tungsten Graphics Inc.  Cedar Park, TX., USA.</div><div class='del'>- * All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef _GMA_DRM_H_</div><div class='del'>-#define _GMA_DRM_H_</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h<br/>index 5acc64954a88..fb88301b3c45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/gpu_scheduler.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/gpu_scheduler.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/gpu_scheduler.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/gpu_scheduler.h</a></div><div class='hunk'>@@ -33,11 +33,11 @@</div><div class='ctx'> #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * DRM_SCHED_FENCE_DONT_PIPELINE - Prefent dependency pipelining</div><div class='add'>+ * DRM_SCHED_FENCE_DONT_PIPELINE - Prevent dependency pipelining</div><div class='ctx'>  *</div><div class='ctx'>  * Setting this flag on a scheduler fence prevents pipelining of jobs depending</div><div class='ctx'>  * on this fence. In other words we always insert a full CPU round trip before</div><div class='del'>- * dependen jobs are pushed to the hw queue.</div><div class='add'>+ * dependent jobs are pushed to the hw queue.</div><div class='ctx'>  */</div><div class='ctx'> #define DRM_SCHED_FENCE_DONT_PIPELINE	DMA_FENCE_FLAG_USER_BITS</div><div class='ctx'> </div><div class='hunk'>@@ -71,12 +71,6 @@ enum drm_sched_priority {</div><div class='ctx'> 	DRM_SCHED_PRIORITY_COUNT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Used to chose between FIFO and RR jobs scheduling */</div><div class='del'>-extern int drm_sched_policy;</div><div class='del'>-</div><div class='del'>-#define DRM_SCHED_POLICY_RR    0</div><div class='del'>-#define DRM_SCHED_POLICY_FIFO  1</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_sched_entity - A wrapper around a job queue (typically</div><div class='ctx'>  * attached to the DRM file_priv).</div><div class='hunk'>@@ -97,13 +91,21 @@ struct drm_sched_entity {</div><div class='ctx'> 	struct list_head		list;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @lock:</div><div class='add'>+	 *</div><div class='add'>+	 * Lock protecting the run-queue (@rq) to which this entity belongs,</div><div class='add'>+	 * @priority and the list of schedulers (@sched_list, @num_sched_list).</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t			lock;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @rq:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Runqueue on which this entity is currently scheduled.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * FIXME: Locking is very unclear for this. Writers are protected by</div><div class='del'>-	 * @rq_lock, but readers are generally lockless and seem to just race</div><div class='del'>-	 * with not even a READ_ONCE.</div><div class='add'>+	 * @lock, but readers are generally lockless and seem to just race with</div><div class='add'>+	 * not even a READ_ONCE.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct drm_sched_rq		*rq;</div><div class='ctx'> </div><div class='hunk'>@@ -136,18 +138,11 @@ struct drm_sched_entity {</div><div class='ctx'> 	 * @priority:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Priority of the entity. This can be modified by calling</div><div class='del'>-	 * drm_sched_entity_set_priority(). Protected by &amp;rq_lock.</div><div class='add'>+	 * drm_sched_entity_set_priority(). Protected by @lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	enum drm_sched_priority         priority;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @rq_lock:</div><div class='del'>-	 *</div><div class='del'>-	 * Lock to modify the runqueue to which this entity belongs.</div><div class='del'>-	 */</div><div class='del'>-	spinlock_t			rq_lock;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @job_queue: the list of jobs of this entity.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct spsc_queue		job_queue;</div><div class='hunk'>@@ -197,8 +192,8 @@ struct drm_sched_entity {</div><div class='ctx'> 	 * @last_scheduled:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Points to the finished fence of the last scheduled job. Only written</div><div class='del'>-	 * by the scheduler thread, can be accessed locklessly from</div><div class='del'>-	 * drm_sched_job_arm() iff the queue is empty.</div><div class='add'>+	 * by drm_sched_entity_pop_job(). Can be accessed locklessly from</div><div class='add'>+	 * drm_sched_job_arm() if the queue is empty.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct dma_fence __rcu		*last_scheduled;</div><div class='ctx'> </div><div class='hunk'>@@ -243,21 +238,23 @@ struct drm_sched_entity {</div><div class='ctx'> /**</div><div class='ctx'>  * struct drm_sched_rq - queue of entities to be scheduled.</div><div class='ctx'>  *</div><div class='del'>- * @lock: to modify the entities list.</div><div class='ctx'>  * @sched: the scheduler to which this rq belongs to.</div><div class='del'>- * @entities: list of the entities to be scheduled.</div><div class='add'>+ * @lock: protects @entities, @rb_tree_root and @current_entity.</div><div class='ctx'>  * @current_entity: the entity which is to be scheduled.</div><div class='del'>- * @rb_tree_root: root of time based priory queue of entities for FIFO scheduling</div><div class='add'>+ * @entities: list of the entities to be scheduled.</div><div class='add'>+ * @rb_tree_root: root of time based priority queue of entities for FIFO scheduling</div><div class='ctx'>  *</div><div class='ctx'>  * Run queue is a set of entities scheduling command submissions for</div><div class='ctx'>  * one specific ring. It implements the scheduling policy that selects</div><div class='ctx'>  * the next entity to emit commands from.</div><div class='ctx'>  */</div><div class='ctx'> struct drm_sched_rq {</div><div class='del'>-	spinlock_t			lock;</div><div class='ctx'> 	struct drm_gpu_scheduler	*sched;</div><div class='del'>-	struct list_head		entities;</div><div class='add'>+</div><div class='add'>+	spinlock_t			lock;</div><div class='add'>+	/* Following members are protected by the @lock: */</div><div class='ctx'> 	struct drm_sched_entity		*current_entity;</div><div class='add'>+	struct list_head		entities;</div><div class='ctx'> 	struct rb_root_cached		rb_tree_root;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -308,6 +305,13 @@ struct drm_sched_fence {</div><div class='ctx'>          * @owner: job owner for debugging</div><div class='ctx'>          */</div><div class='ctx'> 	void				*owner;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @drm_client_id:</div><div class='add'>+	 *</div><div class='add'>+	 * The client_id of the drm_file which owns the job.</div><div class='add'>+	 */</div><div class='add'>+	uint64_t			drm_client_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f);</div><div class='hunk'>@@ -321,8 +325,7 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f);</div><div class='ctx'>  * @s_fence: contains the fences for the scheduling of job.</div><div class='ctx'>  * @finish_cb: the callback for the finished fence.</div><div class='ctx'>  * @credits: the number of credits this job contributes to the scheduler</div><div class='del'>- * @work: Helper to reschdeule job kill to different context.</div><div class='del'>- * @id: a unique id assigned to each job scheduled on the scheduler.</div><div class='add'>+ * @work: Helper to reschedule job kill to different context.</div><div class='ctx'>  * @karma: increment on every hang caused by this job. If this exceeds the hang</div><div class='ctx'>  *         limit of the scheduler then the job is marked guilty and will not</div><div class='ctx'>  *         be scheduled further.</div><div class='hunk'>@@ -335,27 +338,45 @@ struct drm_sched_fence *to_drm_sched_fence(struct dma_fence *f);</div><div class='ctx'>  * to schedule the job.</div><div class='ctx'>  */</div><div class='ctx'> struct drm_sched_job {</div><div class='del'>-	struct spsc_node		queue_node;</div><div class='del'>-	struct list_head		list;</div><div class='add'>+	/**</div><div class='add'>+	 * @submit_ts:</div><div class='add'>+	 *</div><div class='add'>+	 * When the job was pushed into the entity queue.</div><div class='add'>+	 */</div><div class='add'>+	ktime_t                         submit_ts;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @sched:</div><div class='add'>+	 *</div><div class='add'>+	 * The scheduler this job is or will be scheduled on. Gets set by</div><div class='add'>+	 * drm_sched_job_arm(). Valid until drm_sched_backend_ops.free_job()</div><div class='add'>+	 * has finished.</div><div class='add'>+	 */</div><div class='ctx'> 	struct drm_gpu_scheduler	*sched;</div><div class='add'>+</div><div class='ctx'> 	struct drm_sched_fence		*s_fence;</div><div class='add'>+	struct drm_sched_entity         *entity;</div><div class='ctx'> </div><div class='add'>+	enum drm_sched_priority		s_priority;</div><div class='ctx'> 	u32				credits;</div><div class='add'>+	/** @last_dependency: tracks @dependencies as they signal */</div><div class='add'>+	unsigned int			last_dependency;</div><div class='add'>+	atomic_t			karma;</div><div class='add'>+</div><div class='add'>+	struct spsc_node		queue_node;</div><div class='add'>+	struct list_head		list;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * work is used only after finish_cb has been used and will not be</div><div class='ctx'> 	 * accessed anymore.</div><div class='ctx'> 	 */</div><div class='ctx'> 	union {</div><div class='del'>-		struct dma_fence_cb		finish_cb;</div><div class='del'>-		struct work_struct		work;</div><div class='add'>+		struct dma_fence_cb	finish_cb;</div><div class='add'>+		struct work_struct	work;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uint64_t			id;</div><div class='del'>-	atomic_t			karma;</div><div class='del'>-	enum drm_sched_priority		s_priority;</div><div class='del'>-	struct drm_sched_entity         *entity;</div><div class='ctx'> 	struct dma_fence_cb		cb;</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @dependencies:</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -364,28 +385,22 @@ struct drm_sched_job {</div><div class='ctx'> 	 * drm_sched_job_add_implicit_dependencies().</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct xarray			dependencies;</div><div class='del'>-</div><div class='del'>-	/** @last_dependency: tracks @dependencies as they signal */</div><div class='del'>-	unsigned long			last_dependency;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @submit_ts:</div><div class='del'>-	 *</div><div class='del'>-	 * When the job was pushed into the entity queue.</div><div class='del'>-	 */</div><div class='del'>-	ktime_t                         submit_ts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool drm_sched_invalidate_job(struct drm_sched_job *s_job,</div><div class='del'>-					    int threshold)</div><div class='del'>-{</div><div class='del'>-	return s_job &amp;&amp; atomic_inc_return(&amp;s_job-&gt;karma) &gt; threshold;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * enum drm_gpu_sched_stat - the scheduler's status</div><div class='add'>+ *</div><div class='add'>+ * @DRM_GPU_SCHED_STAT_NONE: Reserved. Do not use.</div><div class='add'>+ * @DRM_GPU_SCHED_STAT_RESET: The GPU hung and successfully reset.</div><div class='add'>+ * @DRM_GPU_SCHED_STAT_ENODEV: Error: Device is not available anymore.</div><div class='add'>+ * @DRM_GPU_SCHED_STAT_NO_HANG: Contrary to scheduler's assumption, the GPU</div><div class='add'>+ * did not hang and is still running.</div><div class='add'>+ */</div><div class='ctx'> enum drm_gpu_sched_stat {</div><div class='del'>-	DRM_GPU_SCHED_STAT_NONE, /* Reserve 0 */</div><div class='del'>-	DRM_GPU_SCHED_STAT_NOMINAL,</div><div class='add'>+	DRM_GPU_SCHED_STAT_NONE,</div><div class='add'>+	DRM_GPU_SCHED_STAT_RESET,</div><div class='ctx'> 	DRM_GPU_SCHED_STAT_ENODEV,</div><div class='add'>+	DRM_GPU_SCHED_STAT_NO_HANG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -409,10 +424,36 @@ struct drm_sched_backend_ops {</div><div class='ctx'> 					 struct drm_sched_entity *s_entity);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-         * @run_job: Called to execute the job once all of the dependencies</div><div class='del'>-         * have been resolved.  This may be called multiple times, if</div><div class='del'>-	 * timedout_job() has happened and drm_sched_job_recovery()</div><div class='del'>-	 * decides to try it again.</div><div class='add'>+	 * @run_job: Called to execute the job once all of the dependencies</div><div class='add'>+	 * have been resolved.</div><div class='add'>+	 *</div><div class='add'>+	 * @sched_job: the job to run</div><div class='add'>+	 *</div><div class='add'>+	 * The deprecated drm_sched_resubmit_jobs() (called by &amp;struct</div><div class='add'>+	 * drm_sched_backend_ops.timedout_job) can invoke this again with the</div><div class='add'>+	 * same parameters. Using this is discouraged because it violates</div><div class='add'>+	 * dma_fence rules, notably dma_fence_init() has to be called on</div><div class='add'>+	 * already initialized fences for a second time. Moreover, this is</div><div class='add'>+	 * dangerous because attempts to allocate memory might deadlock with</div><div class='add'>+	 * memory management code waiting for the reset to complete.</div><div class='add'>+	 *</div><div class='add'>+	 * TODO: Document what drivers should do / use instead.</div><div class='add'>+	 *</div><div class='add'>+	 * This method is called in a workqueue context - either from the</div><div class='add'>+	 * submit_wq the driver passed through drm_sched_init(), or, if the</div><div class='add'>+	 * driver passed NULL, a separate, ordered workqueue the scheduler</div><div class='add'>+	 * allocated.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that the scheduler expects to 'inherit' its own reference to</div><div class='add'>+	 * this fence from the callback. It does not invoke an extra</div><div class='add'>+	 * dma_fence_get() on it. Consequently, this callback must take a</div><div class='add'>+	 * reference for the scheduler, and additional ones for the driver's</div><div class='add'>+	 * respective needs.</div><div class='add'>+	 *</div><div class='add'>+	 * Return:</div><div class='add'>+	 * * On success: dma_fence the driver must signal once the hardware has</div><div class='add'>+	 * completed the job ("hardware fence").</div><div class='add'>+	 * * On failure: NULL or an ERR_PTR.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct dma_fence *(*run_job)(struct drm_sched_job *sched_job);</div><div class='ctx'> </div><div class='hunk'>@@ -420,43 +461,52 @@ struct drm_sched_backend_ops {</div><div class='ctx'> 	 * @timedout_job: Called when a job has taken too long to execute,</div><div class='ctx'> 	 * to trigger GPU recovery.</div><div class='ctx'> 	 *</div><div class='del'>-	 * This method is called in a workqueue context.</div><div class='add'>+	 * @sched_job: The job that has timed out</div><div class='add'>+	 *</div><div class='add'>+	 * Drivers typically issue a reset to recover from GPU hangs.</div><div class='add'>+	 * This procedure looks very different depending on whether a firmware</div><div class='add'>+	 * or a hardware scheduler is being used.</div><div class='add'>+	 *</div><div class='add'>+	 * For a FIRMWARE SCHEDULER, each ring has one scheduler, and each</div><div class='add'>+	 * scheduler has one entity. Hence, the steps taken typically look as</div><div class='add'>+	 * follows:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. Stop the scheduler using drm_sched_stop(). This will pause the</div><div class='add'>+	 *    scheduler workqueues and cancel the timeout work, guaranteeing</div><div class='add'>+	 *    that nothing is queued while the ring is being removed.</div><div class='add'>+	 * 2. Remove the ring. The firmware will make sure that the</div><div class='add'>+	 *    corresponding parts of the hardware are resetted, and that other</div><div class='add'>+	 *    rings are not impacted.</div><div class='add'>+	 * 3. Kill the entity and the associated scheduler.</div><div class='add'>+	 *</div><div class='ctx'> 	 *</div><div class='del'>-	 * Drivers typically issue a reset to recover from GPU hangs, and this</div><div class='del'>-	 * procedure usually follows the following workflow:</div><div class='add'>+	 * For a HARDWARE SCHEDULER, a scheduler instance schedules jobs from</div><div class='add'>+	 * one or more entities to one ring. This implies that all entities</div><div class='add'>+	 * associated with the affected scheduler cannot be torn down, because</div><div class='add'>+	 * this would effectively also affect innocent userspace processes which</div><div class='add'>+	 * did not submit faulty jobs (for example).</div><div class='ctx'> 	 *</div><div class='del'>-	 * 1. Stop the scheduler using drm_sched_stop(). This will park the</div><div class='del'>-	 *    scheduler thread and cancel the timeout work, guaranteeing that</div><div class='del'>-	 *    nothing is queued while we reset the hardware queue</div><div class='del'>-	 * 2. Try to gracefully stop non-faulty jobs (optional)</div><div class='del'>-	 * 3. Issue a GPU reset (driver-specific)</div><div class='del'>-	 * 4. Re-submit jobs using drm_sched_resubmit_jobs()</div><div class='del'>-	 * 5. Restart the scheduler using drm_sched_start(). At that point, new</div><div class='del'>-	 *    jobs can be queued, and the scheduler thread is unblocked</div><div class='add'>+	 * Consequently, the procedure to recover with a hardware scheduler</div><div class='add'>+	 * should look like this:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. Stop all schedulers impacted by the reset using drm_sched_stop().</div><div class='add'>+	 * 2. Kill the entity the faulty job stems from.</div><div class='add'>+	 * 3. Issue a GPU reset on all faulty rings (driver-specific).</div><div class='add'>+	 * 4. Re-submit jobs on all schedulers impacted by re-submitting them to</div><div class='add'>+	 *    the entities which are still alive.</div><div class='add'>+	 * 5. Restart all schedulers that were stopped in step #1 using</div><div class='add'>+	 *    drm_sched_start().</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Note that some GPUs have distinct hardware queues but need to reset</div><div class='ctx'> 	 * the GPU globally, which requires extra synchronization between the</div><div class='del'>-	 * timeout handler of the different &amp;drm_gpu_scheduler. One way to</div><div class='del'>-	 * achieve this synchronization is to create an ordered workqueue</div><div class='del'>-	 * (using alloc_ordered_workqueue()) at the driver level, and pass this</div><div class='del'>-	 * queue to drm_sched_init(), to guarantee that timeout handlers are</div><div class='del'>-	 * executed sequentially. The above workflow needs to be slightly</div><div class='del'>-	 * adjusted in that case:</div><div class='del'>-	 *</div><div class='del'>-	 * 1. Stop all schedulers impacted by the reset using drm_sched_stop()</div><div class='del'>-	 * 2. Try to gracefully stop non-faulty jobs on all queues impacted by</div><div class='del'>-	 *    the reset (optional)</div><div class='del'>-	 * 3. Issue a GPU reset on all faulty queues (driver-specific)</div><div class='del'>-	 * 4. Re-submit jobs on all schedulers impacted by the reset using</div><div class='del'>-	 *    drm_sched_resubmit_jobs()</div><div class='del'>-	 * 5. Restart all schedulers that were stopped in step #1 using</div><div class='del'>-	 *    drm_sched_start()</div><div class='add'>+	 * timeout handlers of different schedulers. One way to achieve this</div><div class='add'>+	 * synchronization is to create an ordered workqueue (using</div><div class='add'>+	 * alloc_ordered_workqueue()) at the driver level, and pass this queue</div><div class='add'>+	 * as drm_sched_init()'s @timeout_wq parameter. This will guarantee</div><div class='add'>+	 * that timeout handlers are executed sequentially.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Return DRM_GPU_SCHED_STAT_NOMINAL, when all is normal,</div><div class='del'>-	 * and the underlying driver has started or completed recovery.</div><div class='add'>+	 * Return: The scheduler's status, defined by &amp;enum drm_gpu_sched_stat</div><div class='ctx'> 	 *</div><div class='del'>-	 * Return DRM_GPU_SCHED_STAT_ENODEV, if the device is no longer</div><div class='del'>-	 * available, i.e. has been unplugged.</div><div class='ctx'> 	 */</div><div class='ctx'> 	enum drm_gpu_sched_stat (*timedout_job)(struct drm_sched_job *sched_job);</div><div class='ctx'> </div><div class='hunk'>@@ -467,17 +517,22 @@ struct drm_sched_backend_ops {</div><div class='ctx'> 	void (*free_job)(struct drm_sched_job *sched_job);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @update_job_credits: Called when the scheduler is considering this</div><div class='del'>-	 * job for execution.</div><div class='add'>+	 * @cancel_job: Used by the scheduler to guarantee remaining jobs' fences</div><div class='add'>+	 * get signaled in drm_sched_fini().</div><div class='add'>+	 *</div><div class='add'>+	 * Used by the scheduler to cancel all jobs that have not been executed</div><div class='add'>+	 * with &amp;struct drm_sched_backend_ops.run_job by the time</div><div class='add'>+	 * drm_sched_fini() gets invoked.</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback returns the number of credits the job would take if</div><div class='del'>-	 * pushed to the hardware. Drivers may use this to dynamically update</div><div class='del'>-	 * the job's credit count. For instance, deduct the number of credits</div><div class='del'>-	 * for already signalled native fences.</div><div class='add'>+	 * Drivers need to signal the passed job's hardware fence with an</div><div class='add'>+	 * appropriate error code (e.g., -ECANCELED) in this callback. They</div><div class='add'>+	 * must not free the job.</div><div class='ctx'> 	 *</div><div class='del'>-	 * This callback is optional.</div><div class='add'>+	 * The scheduler will only call this callback once it stopped calling</div><div class='add'>+	 * all other callbacks forever, with the exception of &amp;struct</div><div class='add'>+	 * drm_sched_backend_ops.free_job.</div><div class='ctx'> 	 */</div><div class='del'>-	u32 (*update_job_credits)(struct drm_sched_job *sched_job);</div><div class='add'>+	void (*cancel_job)(struct drm_sched_job *sched_job);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -491,7 +546,7 @@ struct drm_sched_backend_ops {</div><div class='ctx'>  * @num_rqs: Number of run-queues. This is at most DRM_SCHED_PRIORITY_COUNT,</div><div class='ctx'>  *           as there's usually one run-queue per priority, but could be less.</div><div class='ctx'>  * @sched_rq: An allocated array of run-queues of size @num_rqs;</div><div class='del'>- * @job_scheduled: once @drm_sched_entity_do_release is called the scheduler</div><div class='add'>+ * @job_scheduled: once drm_sched_entity_flush() is called the scheduler</div><div class='ctx'>  *                 waits on this wait queue until all the scheduled jobs are</div><div class='ctx'>  *                 finished.</div><div class='ctx'>  * @job_id_count: used to assign unique id to the each job.</div><div class='hunk'>@@ -542,18 +597,67 @@ struct drm_gpu_scheduler {</div><div class='ctx'> 	struct device			*dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct drm_sched_init_args - parameters for initializing a DRM GPU scheduler</div><div class='add'>+ *</div><div class='add'>+ * @ops: backend operations provided by the driver</div><div class='add'>+ * @submit_wq: workqueue to use for submission. If NULL, an ordered wq is</div><div class='add'>+ *	       allocated and used.</div><div class='add'>+ * @num_rqs: Number of run-queues. This may be at most DRM_SCHED_PRIORITY_COUNT,</div><div class='add'>+ *	     as there's usually one run-queue per priority, but may be less.</div><div class='add'>+ * @credit_limit: the number of credits this scheduler can hold from all jobs</div><div class='add'>+ * @hang_limit: number of times to allow a job to hang before dropping it.</div><div class='add'>+ *		This mechanism is DEPRECATED. Set it to 0.</div><div class='add'>+ * @timeout: timeout value in jiffies for submitted jobs.</div><div class='add'>+ * @timeout_wq: workqueue to use for timeout work. If NULL, the system_wq is used.</div><div class='add'>+ * @score: score atomic shared with other schedulers. May be NULL.</div><div class='add'>+ * @name: name (typically the driver's name). Used for debugging</div><div class='add'>+ * @dev: associated device. Used for debugging</div><div class='add'>+ */</div><div class='add'>+struct drm_sched_init_args {</div><div class='add'>+	const struct drm_sched_backend_ops *ops;</div><div class='add'>+	struct workqueue_struct *submit_wq;</div><div class='add'>+	struct workqueue_struct *timeout_wq;</div><div class='add'>+	u32 num_rqs;</div><div class='add'>+	u32 credit_limit;</div><div class='add'>+	unsigned int hang_limit;</div><div class='add'>+	long timeout;</div><div class='add'>+	atomic_t *score;</div><div class='add'>+	const char *name;</div><div class='add'>+	struct device *dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Scheduler operations */</div><div class='add'>+</div><div class='ctx'> int drm_sched_init(struct drm_gpu_scheduler *sched,</div><div class='del'>-		   const struct drm_sched_backend_ops *ops,</div><div class='del'>-		   struct workqueue_struct *submit_wq,</div><div class='del'>-		   u32 num_rqs, u32 credit_limit, unsigned int hang_limit,</div><div class='del'>-		   long timeout, struct workqueue_struct *timeout_wq,</div><div class='del'>-		   atomic_t *score, const char *name, struct device *dev);</div><div class='add'>+		   const struct drm_sched_init_args *args);</div><div class='ctx'> </div><div class='ctx'> void drm_sched_fini(struct drm_gpu_scheduler *sched);</div><div class='add'>+</div><div class='add'>+unsigned long drm_sched_suspend_timeout(struct drm_gpu_scheduler *sched);</div><div class='add'>+void drm_sched_resume_timeout(struct drm_gpu_scheduler *sched,</div><div class='add'>+			      unsigned long remaining);</div><div class='add'>+void drm_sched_tdr_queue_imm(struct drm_gpu_scheduler *sched);</div><div class='add'>+bool drm_sched_wqueue_ready(struct drm_gpu_scheduler *sched);</div><div class='add'>+void drm_sched_wqueue_stop(struct drm_gpu_scheduler *sched);</div><div class='add'>+void drm_sched_wqueue_start(struct drm_gpu_scheduler *sched);</div><div class='add'>+void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad);</div><div class='add'>+void drm_sched_start(struct drm_gpu_scheduler *sched, int errno);</div><div class='add'>+void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched);</div><div class='add'>+void drm_sched_fault(struct drm_gpu_scheduler *sched);</div><div class='add'>+</div><div class='add'>+struct drm_gpu_scheduler *</div><div class='add'>+drm_sched_pick_best(struct drm_gpu_scheduler **sched_list,</div><div class='add'>+		    unsigned int num_sched_list);</div><div class='add'>+</div><div class='add'>+/* Jobs */</div><div class='add'>+</div><div class='ctx'> int drm_sched_job_init(struct drm_sched_job *job,</div><div class='ctx'> 		       struct drm_sched_entity *entity,</div><div class='del'>-		       u32 credits, void *owner);</div><div class='add'>+		       u32 credits, void *owner,</div><div class='add'>+		       u64 drm_client_id);</div><div class='ctx'> void drm_sched_job_arm(struct drm_sched_job *job);</div><div class='add'>+void drm_sched_entity_push_job(struct drm_sched_job *sched_job);</div><div class='ctx'> int drm_sched_job_add_dependency(struct drm_sched_job *job,</div><div class='ctx'> 				 struct dma_fence *fence);</div><div class='ctx'> int drm_sched_job_add_syncobj_dependency(struct drm_sched_job *job,</div><div class='hunk'>@@ -566,34 +670,18 @@ int drm_sched_job_add_resv_dependencies(struct drm_sched_job *job,</div><div class='ctx'> int drm_sched_job_add_implicit_dependencies(struct drm_sched_job *job,</div><div class='ctx'> 					    struct drm_gem_object *obj,</div><div class='ctx'> 					    bool write);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void drm_sched_entity_modify_sched(struct drm_sched_entity *entity,</div><div class='del'>-				    struct drm_gpu_scheduler **sched_list,</div><div class='del'>-                                   unsigned int num_sched_list);</div><div class='del'>-</div><div class='del'>-void drm_sched_tdr_queue_imm(struct drm_gpu_scheduler *sched);</div><div class='add'>+bool drm_sched_job_has_dependency(struct drm_sched_job *job,</div><div class='add'>+				  struct dma_fence *fence);</div><div class='ctx'> void drm_sched_job_cleanup(struct drm_sched_job *job);</div><div class='del'>-void drm_sched_wakeup(struct drm_gpu_scheduler *sched, struct drm_sched_entity *entity);</div><div class='del'>-bool drm_sched_wqueue_ready(struct drm_gpu_scheduler *sched);</div><div class='del'>-void drm_sched_wqueue_stop(struct drm_gpu_scheduler *sched);</div><div class='del'>-void drm_sched_wqueue_start(struct drm_gpu_scheduler *sched);</div><div class='del'>-void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad);</div><div class='del'>-void drm_sched_start(struct drm_gpu_scheduler *sched, bool full_recovery);</div><div class='del'>-void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched);</div><div class='ctx'> void drm_sched_increase_karma(struct drm_sched_job *bad);</div><div class='del'>-void drm_sched_reset_karma(struct drm_sched_job *bad);</div><div class='del'>-void drm_sched_increase_karma_ext(struct drm_sched_job *bad, int type);</div><div class='del'>-bool drm_sched_dependency_optimized(struct dma_fence* fence,</div><div class='del'>-				    struct drm_sched_entity *entity);</div><div class='del'>-void drm_sched_fault(struct drm_gpu_scheduler *sched);</div><div class='ctx'> </div><div class='del'>-void drm_sched_rq_add_entity(struct drm_sched_rq *rq,</div><div class='del'>-			     struct drm_sched_entity *entity);</div><div class='del'>-void drm_sched_rq_remove_entity(struct drm_sched_rq *rq,</div><div class='del'>-				struct drm_sched_entity *entity);</div><div class='add'>+static inline bool drm_sched_invalidate_job(struct drm_sched_job *s_job,</div><div class='add'>+					    int threshold)</div><div class='add'>+{</div><div class='add'>+	return s_job &amp;&amp; atomic_inc_return(&amp;s_job-&gt;karma) &gt; threshold;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-void drm_sched_rq_update_fifo(struct drm_sched_entity *entity, ktime_t ts);</div><div class='add'>+/* Entities */</div><div class='ctx'> </div><div class='ctx'> int drm_sched_entity_init(struct drm_sched_entity *entity,</div><div class='ctx'> 			  enum drm_sched_priority priority,</div><div class='hunk'>@@ -603,29 +691,11 @@ int drm_sched_entity_init(struct drm_sched_entity *entity,</div><div class='ctx'> long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout);</div><div class='ctx'> void drm_sched_entity_fini(struct drm_sched_entity *entity);</div><div class='ctx'> void drm_sched_entity_destroy(struct drm_sched_entity *entity);</div><div class='del'>-void drm_sched_entity_select_rq(struct drm_sched_entity *entity);</div><div class='del'>-struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity);</div><div class='del'>-void drm_sched_entity_push_job(struct drm_sched_job *sched_job);</div><div class='ctx'> void drm_sched_entity_set_priority(struct drm_sched_entity *entity,</div><div class='ctx'> 				   enum drm_sched_priority priority);</div><div class='del'>-bool drm_sched_entity_is_ready(struct drm_sched_entity *entity);</div><div class='ctx'> int drm_sched_entity_error(struct drm_sched_entity *entity);</div><div class='del'>-</div><div class='del'>-struct drm_sched_fence *drm_sched_fence_alloc(</div><div class='del'>-	struct drm_sched_entity *s_entity, void *owner);</div><div class='del'>-void drm_sched_fence_init(struct drm_sched_fence *fence,</div><div class='del'>-			  struct drm_sched_entity *entity);</div><div class='del'>-void drm_sched_fence_free(struct drm_sched_fence *fence);</div><div class='del'>-</div><div class='del'>-void drm_sched_fence_scheduled(struct drm_sched_fence *fence,</div><div class='del'>-			       struct dma_fence *parent);</div><div class='del'>-void drm_sched_fence_finished(struct drm_sched_fence *fence, int result);</div><div class='del'>-</div><div class='del'>-unsigned long drm_sched_suspend_timeout(struct drm_gpu_scheduler *sched);</div><div class='del'>-void drm_sched_resume_timeout(struct drm_gpu_scheduler *sched,</div><div class='del'>-		                unsigned long remaining);</div><div class='del'>-struct drm_gpu_scheduler *</div><div class='del'>-drm_sched_pick_best(struct drm_gpu_scheduler **sched_list,</div><div class='del'>-		     unsigned int num_sched_list);</div><div class='add'>+void drm_sched_entity_modify_sched(struct drm_sched_entity *entity,</div><div class='add'>+				   struct drm_gpu_scheduler **sched_list,</div><div class='add'>+				   unsigned int num_sched_list);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/i2c/ch7006.h b/include/drm/i2c/ch7006.h<br/>deleted file mode 100644<br/>index 8390b437a1f8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i2c/ch7006.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i2c/ch7006.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,86 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Francisco Jerez.</div><div class='del'>- * All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * Permission is hereby granted, free of charge, to any person obtaining</div><div class='del'>- * a copy of this software and associated documentation files (the</div><div class='del'>- * "Software"), to deal in the Software without restriction, including</div><div class='del'>- * without limitation the rights to use, copy, modify, merge, publish,</div><div class='del'>- * distribute, sublicense, and/or sell copies of the Software, and to</div><div class='del'>- * permit persons to whom the Software is furnished to do so, subject to</div><div class='del'>- * the following conditions:</div><div class='del'>- *</div><div class='del'>- * The above copyright notice and this permission notice (including the</div><div class='del'>- * next paragraph) shall be included in all copies or substantial</div><div class='del'>- * portions of the Software.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.</div><div class='del'>- * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE</div><div class='del'>- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION</div><div class='del'>- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION</div><div class='del'>- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DRM_I2C_CH7006_H__</div><div class='del'>-#define __DRM_I2C_CH7006_H__</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ch7006_encoder_params</div><div class='del'>- *</div><div class='del'>- * Describes how the ch7006 is wired up with the GPU. It should be</div><div class='del'>- * used as the @params parameter of its @set_config method.</div><div class='del'>- *</div><div class='del'>- * See "http://www.chrontel.com/pdf/7006.pdf" for their precise</div><div class='del'>- * meaning.</div><div class='del'>- */</div><div class='del'>-struct ch7006_encoder_params {</div><div class='del'>-	enum {</div><div class='del'>-		CH7006_FORMAT_RGB16 = 0,</div><div class='del'>-		CH7006_FORMAT_YCrCb24m16,</div><div class='del'>-		CH7006_FORMAT_RGB24m16,</div><div class='del'>-		CH7006_FORMAT_RGB15,</div><div class='del'>-		CH7006_FORMAT_RGB24m12C,</div><div class='del'>-		CH7006_FORMAT_RGB24m12I,</div><div class='del'>-		CH7006_FORMAT_RGB24m8,</div><div class='del'>-		CH7006_FORMAT_RGB16m8,</div><div class='del'>-		CH7006_FORMAT_RGB15m8,</div><div class='del'>-		CH7006_FORMAT_YCrCb24m8,</div><div class='del'>-	} input_format;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		CH7006_CLOCK_SLAVE = 0,</div><div class='del'>-		CH7006_CLOCK_MASTER,</div><div class='del'>-	} clock_mode;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		CH7006_CLOCK_EDGE_NEG = 0,</div><div class='del'>-		CH7006_CLOCK_EDGE_POS,</div><div class='del'>-	} clock_edge;</div><div class='del'>-</div><div class='del'>-	int xcm, pcm;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		CH7006_SYNC_SLAVE = 0,</div><div class='del'>-		CH7006_SYNC_MASTER,</div><div class='del'>-	} sync_direction;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		CH7006_SYNC_SEPARATED = 0,</div><div class='del'>-		CH7006_SYNC_EMBEDDED,</div><div class='del'>-	} sync_encoding;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		CH7006_POUT_1_8V = 0,</div><div class='del'>-		CH7006_POUT_3_3V,</div><div class='del'>-	} pout_level;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		CH7006_ACTIVE_HSYNC = 0,</div><div class='del'>-		CH7006_ACTIVE_DSTART,</div><div class='del'>-	} active_detect;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/drm/i2c/sil164.h b/include/drm/i2c/sil164.h<br/>deleted file mode 100644<br/>index 205e27384c83..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i2c/sil164.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i2c/sil164.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2010 Francisco Jerez.</div><div class='del'>- * All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * Permission is hereby granted, free of charge, to any person obtaining</div><div class='del'>- * a copy of this software and associated documentation files (the</div><div class='del'>- * "Software"), to deal in the Software without restriction, including</div><div class='del'>- * without limitation the rights to use, copy, modify, merge, publish,</div><div class='del'>- * distribute, sublicense, and/or sell copies of the Software, and to</div><div class='del'>- * permit persons to whom the Software is furnished to do so, subject to</div><div class='del'>- * the following conditions:</div><div class='del'>- *</div><div class='del'>- * The above copyright notice and this permission notice (including the</div><div class='del'>- * next paragraph) shall be included in all copies or substantial</div><div class='del'>- * portions of the Software.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.</div><div class='del'>- * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE</div><div class='del'>- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION</div><div class='del'>- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION</div><div class='del'>- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DRM_I2C_SIL164_H__</div><div class='del'>-#define __DRM_I2C_SIL164_H__</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct sil164_encoder_params</div><div class='del'>- *</div><div class='del'>- * Describes how the sil164 is connected to the GPU. It should be used</div><div class='del'>- * as the @params parameter of its @set_config method.</div><div class='del'>- *</div><div class='del'>- * See "http://www.siliconimage.com/docs/SiI-DS-0021-E-164.pdf".</div><div class='del'>- */</div><div class='del'>-struct sil164_encoder_params {</div><div class='del'>-	enum {</div><div class='del'>-		SIL164_INPUT_EDGE_FALLING = 0,</div><div class='del'>-		SIL164_INPUT_EDGE_RISING</div><div class='del'>-	} input_edge;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		SIL164_INPUT_WIDTH_12BIT = 0,</div><div class='del'>-		SIL164_INPUT_WIDTH_24BIT</div><div class='del'>-	} input_width;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		SIL164_INPUT_SINGLE_EDGE = 0,</div><div class='del'>-		SIL164_INPUT_DUAL_EDGE</div><div class='del'>-	} input_dual;</div><div class='del'>-</div><div class='del'>-	enum {</div><div class='del'>-		SIL164_PLL_FILTER_ON = 0,</div><div class='del'>-		SIL164_PLL_FILTER_OFF,</div><div class='del'>-	} pll_filter;</div><div class='del'>-</div><div class='del'>-	int input_skew; /** &lt; Allowed range [-4, 3], use 0 for no de-skew. */</div><div class='del'>-	int duallink_skew; /** &lt; Allowed range [-4, 3]. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/drm/i2c/tda998x.h b/include/drm/i2c/tda998x.h<br/>deleted file mode 100644<br/>index 3cb25ccbe5e6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i2c/tda998x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i2c/tda998x.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __DRM_I2C_TDA998X_H__</div><div class='del'>-#define __DRM_I2C_TDA998X_H__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/hdmi.h&gt;</div><div class='del'>-#include &lt;dt-bindings/display/tda998x.h&gt;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	AFMT_UNUSED =	0,</div><div class='del'>-	AFMT_SPDIF =	TDA998x_SPDIF,</div><div class='del'>-	AFMT_I2S =	TDA998x_I2S,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tda998x_audio_params {</div><div class='del'>-	u8 config;</div><div class='del'>-	u8 format;</div><div class='del'>-	unsigned sample_width;</div><div class='del'>-	unsigned sample_rate;</div><div class='del'>-	struct hdmi_audio_infoframe cea;</div><div class='del'>-	u8 status[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tda998x_encoder_params {</div><div class='del'>-	u8 swap_b:3;</div><div class='del'>-	u8 mirr_b:1;</div><div class='del'>-	u8 swap_a:3;</div><div class='del'>-	u8 mirr_a:1;</div><div class='del'>-	u8 swap_d:3;</div><div class='del'>-	u8 mirr_d:1;</div><div class='del'>-	u8 swap_c:3;</div><div class='del'>-	u8 mirr_c:1;</div><div class='del'>-	u8 swap_f:3;</div><div class='del'>-	u8 mirr_f:1;</div><div class='del'>-	u8 swap_e:3;</div><div class='del'>-	u8 mirr_e:1;</div><div class='del'>-</div><div class='del'>-	struct tda998x_audio_params audio_params;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h<br/>deleted file mode 100644<br/>index fcf1849aa47c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i915_pciids.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i915_pciids.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,760 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2013 Intel Corporation</div><div class='del'>- * All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='del'>- * copy of this software and associated documentation files (the</div><div class='del'>- * "Software"), to deal in the Software without restriction, including</div><div class='del'>- * without limitation the rights to use, copy, modify, merge, publish,</div><div class='del'>- * distribute, sub license, and/or sell copies of the Software, and to</div><div class='del'>- * permit persons to whom the Software is furnished to do so, subject to</div><div class='del'>- * the following conditions:</div><div class='del'>- *</div><div class='del'>- * The above copyright notice and this permission notice (including the</div><div class='del'>- * next paragraph) shall be included in all copies or substantial portions</div><div class='del'>- * of the Software.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='del'>- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='del'>- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='del'>- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='del'>- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='del'>- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='del'>- * DEALINGS IN THE SOFTWARE.</div><div class='del'>- */</div><div class='del'>-#ifndef _I915_PCIIDS_H</div><div class='del'>-#define _I915_PCIIDS_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A pci_device_id struct {</div><div class='del'>- *	__u32 vendor, device;</div><div class='del'>- *      __u32 subvendor, subdevice;</div><div class='del'>- *	__u32 class, class_mask;</div><div class='del'>- *	kernel_ulong_t driver_data;</div><div class='del'>- * };</div><div class='del'>- * Don't use C99 here because "class" is reserved and we want to</div><div class='del'>- * give userspace flexibility.</div><div class='del'>- */</div><div class='del'>-#define INTEL_VGA_DEVICE(id, info) {		\</div><div class='del'>-	0x8086,	id,				\</div><div class='del'>-	~0, ~0,					\</div><div class='del'>-	0x030000, 0xff0000,			\</div><div class='del'>-	(unsigned long) info }</div><div class='del'>-</div><div class='del'>-#define INTEL_QUANTA_VGA_DEVICE(info) {		\</div><div class='del'>-	0x8086,	0x16a,				\</div><div class='del'>-	0x152d,	0x8990,				\</div><div class='del'>-	0x030000, 0xff0000,			\</div><div class='del'>-	(unsigned long) info }</div><div class='del'>-</div><div class='del'>-#define INTEL_I810_IDS(info)					\</div><div class='del'>-	INTEL_VGA_DEVICE(0x7121, info), /* I810 */		\</div><div class='del'>-	INTEL_VGA_DEVICE(0x7123, info), /* I810_DC100 */	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x7125, info)  /* I810_E */</div><div class='del'>-</div><div class='del'>-#define INTEL_I815_IDS(info)					\</div><div class='del'>-	INTEL_VGA_DEVICE(0x1132, info)  /* I815*/</div><div class='del'>-</div><div class='del'>-#define INTEL_I830_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x3577, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_I845G_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2562, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_I85X_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x3582, info), /* I855_GM */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x358e, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_I865G_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2572, info) /* I865_G */</div><div class='del'>-</div><div class='del'>-#define INTEL_I915G_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2582, info), /* I915_G */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x258a, info)  /* E7221_G */</div><div class='del'>-</div><div class='del'>-#define INTEL_I915GM_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2592, info) /* I915_GM */</div><div class='del'>-</div><div class='del'>-#define INTEL_I945G_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2772, info) /* I945_G */</div><div class='del'>-</div><div class='del'>-#define INTEL_I945GM_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x27a2, info), /* I945_GM */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x27ae, info)  /* I945_GME */</div><div class='del'>-</div><div class='del'>-#define INTEL_I965G_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2972, info), /* I946_GZ */	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2982, info),	/* G35_G */	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2992, info),	/* I965_Q */	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x29a2, info)	/* I965_G */</div><div class='del'>-</div><div class='del'>-#define INTEL_G33_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x29b2, info), /* Q35_G */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x29c2, info),	/* G33_G */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x29d2, info)	/* Q33_G */</div><div class='del'>-</div><div class='del'>-#define INTEL_I965GM_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2a02, info),	/* I965_GM */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x2a12, info)  /* I965_GME */</div><div class='del'>-</div><div class='del'>-#define INTEL_GM45_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2a42, info) /* GM45_G */</div><div class='del'>-</div><div class='del'>-#define INTEL_G45_IDS(info)				\</div><div class='del'>-	INTEL_VGA_DEVICE(0x2e02, info), /* IGD_E_G */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x2e12, info), /* Q45_G */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x2e22, info), /* G45_G */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x2e32, info), /* G41_G */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x2e42, info), /* B43_G */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x2e92, info)	/* B43_G.1 */</div><div class='del'>-</div><div class='del'>-#define INTEL_PINEVIEW_G_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0xa001, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_PINEVIEW_M_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0xa011, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_IRONLAKE_D_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0042, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_IRONLAKE_M_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0046, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_SNB_D_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0102, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x010A, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_SNB_D_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0112, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0122, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_SNB_D_IDS(info) \</div><div class='del'>-	INTEL_SNB_D_GT1_IDS(info), \</div><div class='del'>-	INTEL_SNB_D_GT2_IDS(info)</div><div class='del'>-</div><div class='del'>-#define INTEL_SNB_M_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0106, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_SNB_M_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0116, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0126, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_SNB_M_IDS(info) \</div><div class='del'>-	INTEL_SNB_M_GT1_IDS(info), \</div><div class='del'>-	INTEL_SNB_M_GT2_IDS(info)</div><div class='del'>-</div><div class='del'>-#define INTEL_IVB_M_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0156, info) /* GT1 mobile */</div><div class='del'>-</div><div class='del'>-#define INTEL_IVB_M_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0166, info) /* GT2 mobile */</div><div class='del'>-</div><div class='del'>-#define INTEL_IVB_M_IDS(info) \</div><div class='del'>-	INTEL_IVB_M_GT1_IDS(info), \</div><div class='del'>-	INTEL_IVB_M_GT2_IDS(info)</div><div class='del'>-</div><div class='del'>-#define INTEL_IVB_D_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0152, info), /* GT1 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x015a, info)  /* GT1 server */</div><div class='del'>-</div><div class='del'>-#define INTEL_IVB_D_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0162, info), /* GT2 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x016a, info)  /* GT2 server */</div><div class='del'>-</div><div class='del'>-#define INTEL_IVB_D_IDS(info) \</div><div class='del'>-	INTEL_IVB_D_GT1_IDS(info), \</div><div class='del'>-	INTEL_IVB_D_GT2_IDS(info)</div><div class='del'>-</div><div class='del'>-#define INTEL_IVB_Q_IDS(info) \</div><div class='del'>-	INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_ULT_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A0B, info)  /* ULT GT1 reserved */</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_ULX_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A0E, info) /* ULX GT1 mobile */</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_GT1_IDS(info) \</div><div class='del'>-	INTEL_HSW_ULT_GT1_IDS(info), \</div><div class='del'>-	INTEL_HSW_ULX_GT1_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x040A, info), /* GT1 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x040E, info), /* GT1 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C02, info), /* SDV GT1 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C0A, info), /* SDV GT1 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C0B, info), /* SDV GT1 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C0E, info), /* SDV GT1 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D02, info), /* CRW GT1 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D06, info), /* CRW GT1 mobile */	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D0A, info), /* CRW GT1 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D0B, info), /* CRW GT1 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D0E, info)  /* CRW GT1 reserved */</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_ULT_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A1B, info)  /* ULT GT2 reserved */ \</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_ULX_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A1E, info) /* ULX GT2 mobile */ \</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_GT2_IDS(info) \</div><div class='del'>-	INTEL_HSW_ULT_GT2_IDS(info), \</div><div class='del'>-	INTEL_HSW_ULX_GT2_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x041A, info), /* GT2 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x041E, info), /* GT2 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C12, info), /* SDV GT2 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D1E, info)  /* CRW GT2 reserved */</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_ULT_GT3_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A2E, info)  /* ULT GT3 reserved */</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_GT3_IDS(info) \</div><div class='del'>-	INTEL_HSW_ULT_GT3_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0426, info), /* GT3 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x042A, info), /* GT3 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x042E, info), /* GT3 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C22, info), /* SDV GT3 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D26, info), /* CRW GT3 mobile */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0D2E, info)  /* CRW GT3 reserved */</div><div class='del'>-</div><div class='del'>-#define INTEL_HSW_IDS(info) \</div><div class='del'>-	INTEL_HSW_GT1_IDS(info), \</div><div class='del'>-	INTEL_HSW_GT2_IDS(info), \</div><div class='del'>-	INTEL_HSW_GT3_IDS(info)</div><div class='del'>-</div><div class='del'>-#define INTEL_VLV_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0f30, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0f31, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0f32, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0f33, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_ULT_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x160B, info)  /* GT1 Iris */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_ULX_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x160E, info) /* GT1 ULX */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_GT1_IDS(info) \</div><div class='del'>-	INTEL_BDW_ULT_GT1_IDS(info), \</div><div class='del'>-	INTEL_BDW_ULX_GT1_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x160D, info)  /* GT1 Workstation */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_ULT_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1616, info), /* GT2 ULT */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x161B, info)  /* GT2 ULT */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_ULX_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x161E, info) /* GT2 ULX */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_GT2_IDS(info) \</div><div class='del'>-	INTEL_BDW_ULT_GT2_IDS(info), \</div><div class='del'>-	INTEL_BDW_ULX_GT2_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x161A, info), /* GT2 Server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x161D, info)  /* GT2 Workstation */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_ULT_GT3_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x162B, info)  /* Iris */ \</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_ULX_GT3_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x162E, info)  /* ULX */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_GT3_IDS(info) \</div><div class='del'>-	INTEL_BDW_ULT_GT3_IDS(info), \</div><div class='del'>-	INTEL_BDW_ULX_GT3_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1622, info), /* ULT */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x162A, info), /* Server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x162D, info)  /* Workstation */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_ULT_RSVD_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x163B, info)  /* Iris */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_ULX_RSVD_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x163E, info) /* ULX */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_RSVD_IDS(info) \</div><div class='del'>-	INTEL_BDW_ULT_RSVD_IDS(info), \</div><div class='del'>-	INTEL_BDW_ULX_RSVD_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x163A, info), /* Server */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x163D, info)  /* Workstation */</div><div class='del'>-</div><div class='del'>-#define INTEL_BDW_IDS(info) \</div><div class='del'>-	INTEL_BDW_GT1_IDS(info), \</div><div class='del'>-	INTEL_BDW_GT2_IDS(info), \</div><div class='del'>-	INTEL_BDW_GT3_IDS(info), \</div><div class='del'>-	INTEL_BDW_RSVD_IDS(info)</div><div class='del'>-</div><div class='del'>-#define INTEL_CHV_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x22b0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x22b1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x22b2, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x22b3, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_ULT_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1913, info)  /* ULT GT1.5 */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_ULX_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1915, info)  /* ULX GT1.5 */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_GT1_IDS(info)	\</div><div class='del'>-	INTEL_SKL_ULT_GT1_IDS(info), \</div><div class='del'>-	INTEL_SKL_ULX_GT1_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1917, info)  /* DT  GT1.5 */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_ULT_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1921, info)  /* ULT GT2F */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_ULX_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x191E, info) /* ULX GT2 */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_GT2_IDS(info)	\</div><div class='del'>-	INTEL_SKL_ULT_GT2_IDS(info), \</div><div class='del'>-	INTEL_SKL_ULX_GT2_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1912, info), /* DT  GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_ULT_GT3_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3e */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1927, info)  /* ULT GT3e */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_GT3_IDS(info) \</div><div class='del'>-	INTEL_SKL_ULT_GT3_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3e */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x192D, info)  /* SRV GT3e */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_GT4_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x193A, info), /* SRV GT4e */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4e */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x193D, info) /* WKS GT4e */</div><div class='del'>-</div><div class='del'>-#define INTEL_SKL_IDS(info)	 \</div><div class='del'>-	INTEL_SKL_GT1_IDS(info), \</div><div class='del'>-	INTEL_SKL_GT2_IDS(info), \</div><div class='del'>-	INTEL_SKL_GT3_IDS(info), \</div><div class='del'>-	INTEL_SKL_GT4_IDS(info)</div><div class='del'>-</div><div class='del'>-#define INTEL_BXT_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x0A84, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1A84, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x1A85, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A84, info), /* APL HD Graphics 505 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A85, info)  /* APL HD Graphics 500 */</div><div class='del'>-</div><div class='del'>-#define INTEL_GLK_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3184, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3185, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_ULT_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5913, info)  /* ULT GT1.5 */</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_ULX_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5915, info)  /* ULX GT1.5 */</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_GT1_IDS(info)	\</div><div class='del'>-	INTEL_KBL_ULT_GT1_IDS(info), \</div><div class='del'>-	INTEL_KBL_ULX_GT1_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5902, info), /* DT  GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x590A, info), /* SRV GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x590B, info) /* Halo GT1 */</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_ULT_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5921, info)  /* ULT GT2F */</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_ULX_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x591E, info)  /* ULX GT2 */</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_GT2_IDS(info)	\</div><div class='del'>-	INTEL_KBL_ULT_GT2_IDS(info), \</div><div class='del'>-	INTEL_KBL_ULX_GT2_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_ULT_GT3_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5926, info) /* ULT GT3 */</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_GT3_IDS(info) \</div><div class='del'>-	INTEL_KBL_ULT_GT3_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_GT4_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */</div><div class='del'>-</div><div class='del'>-/* AML/KBL Y GT2 */</div><div class='del'>-#define INTEL_AML_KBL_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x591C, info),  /* ULX GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */</div><div class='del'>-</div><div class='del'>-/* AML/CFL Y GT2 */</div><div class='del'>-#define INTEL_AML_CFL_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x87CA, info)</div><div class='del'>-</div><div class='del'>-/* CML GT1 */</div><div class='del'>-#define INTEL_CML_GT1_IDS(info)	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BA2, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BA4, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BA5, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BA8, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_CML_U_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9B21, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BAA, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BAC, info)</div><div class='del'>-</div><div class='del'>-/* CML GT2 */</div><div class='del'>-#define INTEL_CML_GT2_IDS(info)	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BC2, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BC4, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BC5, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BC6, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BC8, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BE6, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BF6, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_CML_U_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9B41, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BCA, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9BCC, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_KBL_IDS(info) \</div><div class='del'>-	INTEL_KBL_GT1_IDS(info), \</div><div class='del'>-	INTEL_KBL_GT2_IDS(info), \</div><div class='del'>-	INTEL_KBL_GT3_IDS(info), \</div><div class='del'>-	INTEL_KBL_GT4_IDS(info), \</div><div class='del'>-	INTEL_AML_KBL_GT2_IDS(info)</div><div class='del'>-</div><div class='del'>-/* CFL S */</div><div class='del'>-#define INTEL_CFL_S_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E99, info)  /* SRV GT1 */</div><div class='del'>-</div><div class='del'>-#define INTEL_CFL_S_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E96, info), /* SRV GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E98, info), /* SRV GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E9A, info)  /* SRV GT2 */</div><div class='del'>-</div><div class='del'>-/* CFL H */</div><div class='del'>-#define INTEL_CFL_H_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E9C, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_CFL_H_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E94, info),  /* Halo GT2 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3E9B, info) /* Halo GT2 */</div><div class='del'>-</div><div class='del'>-/* CFL U GT2 */</div><div class='del'>-#define INTEL_CFL_U_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA9, info)</div><div class='del'>-</div><div class='del'>-/* CFL U GT3 */</div><div class='del'>-#define INTEL_CFL_U_GT3_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA5, info), /* ULT GT3 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA6, info), /* ULT GT3 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA7, info), /* ULT GT3 */ \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA8, info)  /* ULT GT3 */</div><div class='del'>-</div><div class='del'>-/* WHL/CFL U GT1 */</div><div class='del'>-#define INTEL_WHL_U_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA4, info)</div><div class='del'>-</div><div class='del'>-/* WHL/CFL U GT2 */</div><div class='del'>-#define INTEL_WHL_U_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA3, info)</div><div class='del'>-</div><div class='del'>-/* WHL/CFL U GT3 */</div><div class='del'>-#define INTEL_WHL_U_GT3_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x3EA2, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_CFL_IDS(info)	   \</div><div class='del'>-	INTEL_CFL_S_GT1_IDS(info), \</div><div class='del'>-	INTEL_CFL_S_GT2_IDS(info), \</div><div class='del'>-	INTEL_CFL_H_GT1_IDS(info), \</div><div class='del'>-	INTEL_CFL_H_GT2_IDS(info), \</div><div class='del'>-	INTEL_CFL_U_GT2_IDS(info), \</div><div class='del'>-	INTEL_CFL_U_GT3_IDS(info), \</div><div class='del'>-	INTEL_WHL_U_GT1_IDS(info), \</div><div class='del'>-	INTEL_WHL_U_GT2_IDS(info), \</div><div class='del'>-	INTEL_WHL_U_GT3_IDS(info), \</div><div class='del'>-	INTEL_AML_CFL_GT2_IDS(info), \</div><div class='del'>-	INTEL_CML_GT1_IDS(info), \</div><div class='del'>-	INTEL_CML_GT2_IDS(info), \</div><div class='del'>-	INTEL_CML_U_GT1_IDS(info), \</div><div class='del'>-	INTEL_CML_U_GT2_IDS(info)</div><div class='del'>-</div><div class='del'>-/* CNL */</div><div class='del'>-#define INTEL_CNL_PORT_F_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A44, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A4C, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A54, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A5C, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_CNL_IDS(info) \</div><div class='del'>-	INTEL_CNL_PORT_F_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A40, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A41, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A42, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A49, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A4A, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A50, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A51, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A52, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A59, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5A5A, info)</div><div class='del'>-</div><div class='del'>-/* ICL */</div><div class='del'>-#define INTEL_ICL_PORT_F_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A50, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A52, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A53, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A54, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A56, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A57, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A58, info),	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A59, info),	\</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A5A, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A5B, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A5C, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A70, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A71, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_ICL_11_IDS(info) \</div><div class='del'>-	INTEL_ICL_PORT_F_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A51, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x8A5D, info)</div><div class='del'>-</div><div class='del'>-/* EHL */</div><div class='del'>-#define INTEL_EHL_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4541, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4551, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4555, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4557, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4570, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4571, info)</div><div class='del'>-</div><div class='del'>-/* JSL */</div><div class='del'>-#define INTEL_JSL_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4E51, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4E55, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4E57, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4E61, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4E71, info)</div><div class='del'>-</div><div class='del'>-/* TGL */</div><div class='del'>-#define INTEL_TGL_12_GT1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9A60, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9A68, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9A70, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_TGL_12_GT2_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9A40, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9A49, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9A59, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9A78, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9AC0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9AC9, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9AD9, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x9AF8, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_TGL_12_IDS(info) \</div><div class='del'>-	INTEL_TGL_12_GT1_IDS(info), \</div><div class='del'>-	INTEL_TGL_12_GT2_IDS(info)</div><div class='del'>-</div><div class='del'>-/* RKL */</div><div class='del'>-#define INTEL_RKL_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4C80, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4C8A, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4C8B, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4C8C, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4C90, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4C9A, info)</div><div class='del'>-</div><div class='del'>-/* DG1 */</div><div class='del'>-#define INTEL_DG1_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4905, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4906, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4907, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4908, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4909, info)</div><div class='del'>-</div><div class='del'>-/* ADL-S */</div><div class='del'>-#define INTEL_ADLS_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4680, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4682, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4688, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x468A, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x468B, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4690, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4692, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4693, info)</div><div class='del'>-</div><div class='del'>-/* ADL-P */</div><div class='del'>-#define INTEL_ADLP_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46A0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46A1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46A2, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46A3, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46A6, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46A8, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46AA, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x462A, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4626, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x4628, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46B0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46B1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46B2, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46B3, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46C0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46C1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46C2, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46C3, info)</div><div class='del'>-</div><div class='del'>-/* ADL-N */</div><div class='del'>-#define INTEL_ADLN_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46D0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46D1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x46D2, info)</div><div class='del'>-</div><div class='del'>-/* RPL-S */</div><div class='del'>-#define INTEL_RPLS_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA780, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA781, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA782, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA783, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA788, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA789, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA78A, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA78B, info)</div><div class='del'>-</div><div class='del'>-/* RPL-U */</div><div class='del'>-#define INTEL_RPLU_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA721, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA7A1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA7A9, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA7AC, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA7AD, info)</div><div class='del'>-</div><div class='del'>-/* RPL-P */</div><div class='del'>-#define INTEL_RPLP_IDS(info) \</div><div class='del'>-	INTEL_RPLU_IDS(info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA720, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA7A0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA7A8, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA7AA, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0xA7AB, info)</div><div class='del'>-</div><div class='del'>-/* DG2 */</div><div class='del'>-#define INTEL_DG2_G10_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5690, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5691, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5692, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56A0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56A1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56A2, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_DG2_G11_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5693, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5694, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5695, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56A5, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56A6, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56B0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56B1, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56BA, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56BB, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56BC, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56BD, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_DG2_G12_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5696, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x5697, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56A3, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56A4, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56B2, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56B3, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_DG2_IDS(info) \</div><div class='del'>-	INTEL_DG2_G10_IDS(info), \</div><div class='del'>-	INTEL_DG2_G11_IDS(info), \</div><div class='del'>-	INTEL_DG2_G12_IDS(info)</div><div class='del'>-</div><div class='del'>-#define INTEL_ATS_M150_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56C0, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56C2, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_ATS_M75_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x56C1, info)</div><div class='del'>-</div><div class='del'>-#define INTEL_ATS_M_IDS(info) \</div><div class='del'>-	INTEL_ATS_M150_IDS(info), \</div><div class='del'>-	INTEL_ATS_M75_IDS(info)</div><div class='del'>-</div><div class='del'>-/* MTL */</div><div class='del'>-#define INTEL_MTL_IDS(info) \</div><div class='del'>-	INTEL_VGA_DEVICE(0x7D40, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x7D45, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x7D55, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x7D60, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x7D67, info), \</div><div class='del'>-	INTEL_VGA_DEVICE(0x7DD5, info)</div><div class='del'>-</div><div class='del'>-#endif /* _I915_PCIIDS_H */</div><div class='head'>diff --git a/include/drm/intel/display_member.h b/include/drm/intel/display_member.h<br/>new file mode 100644<br/>index 000000000000..0319ea560b60<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/display_member.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/display_member.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/* Copyright © 2025 Intel Corporation */</div><div class='add'>+</div><div class='add'>+#ifndef __DRM_INTEL_DISPLAY_H__</div><div class='add'>+#define __DRM_INTEL_DISPLAY_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/stringify.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;drm/drm_device.h&gt;</div><div class='add'>+</div><div class='add'>+struct intel_display;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A dummy device struct to define the relative offsets of drm and display</div><div class='add'>+ * members. With the members identically placed in struct drm_i915_private and</div><div class='add'>+ * struct xe_device, this allows figuring out the struct intel_display pointer</div><div class='add'>+ * without the definition of either driver specific structure.</div><div class='add'>+ */</div><div class='add'>+struct __intel_generic_device {</div><div class='add'>+	struct drm_device drm;</div><div class='add'>+	struct intel_display *display;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * INTEL_DISPLAY_MEMBER_STATIC_ASSERT() - ensure correct placing of drm and display members</div><div class='add'>+ * @type: The struct to check</div><div class='add'>+ * @drm_member: Name of the struct drm_device member</div><div class='add'>+ * @display_member: Name of the struct intel_display * member.</div><div class='add'>+ *</div><div class='add'>+ * Use this static assert macro to ensure the struct drm_i915_private and struct</div><div class='add'>+ * xe_device struct drm_device and struct intel_display * members are at the</div><div class='add'>+ * same relative offsets.</div><div class='add'>+ */</div><div class='add'>+#define INTEL_DISPLAY_MEMBER_STATIC_ASSERT(type, drm_member, display_member) \</div><div class='add'>+	static_assert( \</div><div class='add'>+		offsetof(struct __intel_generic_device, display) - offsetof(struct __intel_generic_device, drm) == \</div><div class='add'>+		offsetof(type, display_member) - offsetof(type, drm_member), \</div><div class='add'>+		__stringify(type) " " __stringify(drm_member) " and " __stringify(display_member) " members at invalid offsets")</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/intel/display_parent_interface.h b/include/drm/intel/display_parent_interface.h<br/>new file mode 100644<br/>index 000000000000..26bedc360044<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/display_parent_interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/display_parent_interface.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/* Copyright © 2025 Intel Corporation x*/</div><div class='add'>+</div><div class='add'>+#ifndef __DISPLAY_PARENT_INTERFACE_H__</div><div class='add'>+#define __DISPLAY_PARENT_INTERFACE_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct drm_device;</div><div class='add'>+struct ref_tracker;</div><div class='add'>+</div><div class='add'>+struct intel_display_rpm_interface {</div><div class='add'>+	struct ref_tracker *(*get)(const struct drm_device *drm);</div><div class='add'>+	struct ref_tracker *(*get_raw)(const struct drm_device *drm);</div><div class='add'>+	struct ref_tracker *(*get_if_in_use)(const struct drm_device *drm);</div><div class='add'>+	struct ref_tracker *(*get_noresume)(const struct drm_device *drm);</div><div class='add'>+</div><div class='add'>+	void (*put)(const struct drm_device *drm, struct ref_tracker *wakeref);</div><div class='add'>+	void (*put_raw)(const struct drm_device *drm, struct ref_tracker *wakeref);</div><div class='add'>+	void (*put_unchecked)(const struct drm_device *drm);</div><div class='add'>+</div><div class='add'>+	bool (*suspended)(const struct drm_device *drm);</div><div class='add'>+	void (*assert_held)(const struct drm_device *drm);</div><div class='add'>+	void (*assert_block)(const struct drm_device *drm);</div><div class='add'>+	void (*assert_unblock)(const struct drm_device *drm);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct intel_display_parent_interface - services parent driver provides to display</div><div class='add'>+ *</div><div class='add'>+ * The parent, or core, driver provides a pointer to this structure to display</div><div class='add'>+ * driver when calling intel_display_device_probe(). The display driver uses it</div><div class='add'>+ * to access services provided by the parent driver. The structure may contain</div><div class='add'>+ * sub-struct pointers to group function pointers by functionality.</div><div class='add'>+ *</div><div class='add'>+ * All function and sub-struct pointers must be initialized and callable unless</div><div class='add'>+ * explicitly marked as "optional" below. The display driver will only NULL</div><div class='add'>+ * check the optional pointers.</div><div class='add'>+ */</div><div class='add'>+struct intel_display_parent_interface {</div><div class='add'>+	/** @rpm: Runtime PM functions */</div><div class='add'>+	const struct intel_display_rpm_interface *rpm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/i915_component.h b/include/drm/intel/i915_component.h<br/>index 56a84ee1c64c..8082db222e00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i915_component.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i915_component.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/i915_component.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/i915_component.h</a></div><div class='hunk'>@@ -24,13 +24,14 @@</div><div class='ctx'> #ifndef _I915_COMPONENT_H_</div><div class='ctx'> #define _I915_COMPONENT_H_</div><div class='ctx'> </div><div class='del'>-#include "drm_audio_component.h"</div><div class='add'>+#include &lt;drm/drm_audio_component.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum i915_component_type {</div><div class='ctx'> 	I915_COMPONENT_AUDIO = 1,</div><div class='ctx'> 	I915_COMPONENT_HDCP,</div><div class='ctx'> 	I915_COMPONENT_PXP,</div><div class='ctx'> 	I915_COMPONENT_GSC_PROXY,</div><div class='add'>+	INTEL_COMPONENT_LB,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* MAX_PORT is the number of port</div><div class='head'>diff --git a/include/drm/i915_drm.h b/include/drm/intel/i915_drm.h<br/>index adff68538484..adff68538484 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i915_drm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i915_drm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/i915_drm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/i915_drm.h</a></div><div class='head'>diff --git a/include/drm/i915_gsc_proxy_mei_interface.h b/include/drm/intel/i915_gsc_proxy_mei_interface.h<br/>index 9462341d3ae1..850dfbf40607 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i915_gsc_proxy_mei_interface.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i915_gsc_proxy_mei_interface.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/i915_gsc_proxy_mei_interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/i915_gsc_proxy_mei_interface.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@ struct i915_gsc_proxy_component_ops {</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * send - Sends a proxy message to ME FW.</div><div class='add'>+	 * @send: Sends a proxy message to ME FW.</div><div class='ctx'> 	 * @dev: device struct corresponding to the mei device</div><div class='ctx'> 	 * @buf: message buffer to send</div><div class='ctx'> 	 * @size: size of the message</div><div class='hunk'>@@ -30,7 +30,7 @@ struct i915_gsc_proxy_component_ops {</div><div class='ctx'> 	int (*send)(struct device *dev, const void *buf, size_t size);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * recv - Receives a proxy message from ME FW.</div><div class='add'>+	 * @recv: Receives a proxy message from ME FW.</div><div class='ctx'> 	 * @dev: device struct corresponding to the mei device</div><div class='ctx'> 	 * @buf: message buffer to contain the received message</div><div class='ctx'> 	 * @size: size of the buffer</div><div class='head'>diff --git a/include/drm/i915_hdcp_interface.h b/include/drm/intel/i915_hdcp_interface.h<br/>index 4c9c8167c2d5..d776ed7dcd00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i915_hdcp_interface.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i915_hdcp_interface.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/i915_hdcp_interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/i915_hdcp_interface.h</a></div><div class='hunk'>@@ -54,7 +54,7 @@ enum hdcp_ddi {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum hdcp_tc - ME/GSC Firmware defined index for transcoders</div><div class='add'>+ * enum hdcp_transcoder - ME/GSC Firmware defined index for transcoders</div><div class='ctx'>  * @HDCP_INVALID_TRANSCODER: Index for Invalid transcoder</div><div class='ctx'>  * @HDCP_TRANSCODER_EDP: Index for EDP Transcoder</div><div class='ctx'>  * @HDCP_TRANSCODER_DSI0: Index for DSI0 Transcoder</div><div class='hunk'>@@ -106,7 +106,7 @@ struct hdcp_port_data {</div><div class='ctx'>  *			    And Prepare AKE_Init.</div><div class='ctx'>  * @verify_receiver_cert_prepare_km: Verify the Receiver Certificate</div><div class='ctx'>  *				     AKE_Send_Cert and prepare</div><div class='del'>-				     AKE_Stored_Km/AKE_No_Stored_Km</div><div class='add'>+ *				     AKE_Stored_Km/AKE_No_Stored_Km</div><div class='ctx'>  * @verify_hprime: Verify AKE_Send_H_prime</div><div class='ctx'>  * @store_pairing_info: Store pairing info received</div><div class='ctx'>  * @initiate_locality_check: Prepare LC_Init</div><div class='hunk'>@@ -170,14 +170,22 @@ struct i915_hdcp_ops {</div><div class='ctx'> /**</div><div class='ctx'>  * struct i915_hdcp_arbiter - Used for communication between i915</div><div class='ctx'>  * and hdcp drivers for the HDCP2.2 services</div><div class='del'>- * @hdcp_dev: device that provide the HDCP2.2 service from MEI Bus.</div><div class='del'>- * @hdcp_ops: Ops implemented by hdcp driver or intel_hdcp_gsc , used by i915 driver.</div><div class='ctx'>  */</div><div class='ctx'> struct i915_hdcp_arbiter {</div><div class='add'>+	/**</div><div class='add'>+	 * @hdcp_dev: device that provides the HDCP2.2 service from MEI Bus.</div><div class='add'>+	 */</div><div class='ctx'> 	struct device *hdcp_dev;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @ops: Ops implemented by hdcp driver or intel_hdcp_gsc, used by i915</div><div class='add'>+	 * driver.</div><div class='add'>+	 */</div><div class='ctx'> 	const struct i915_hdcp_ops *ops;</div><div class='ctx'> </div><div class='del'>-	/* To protect the above members. */</div><div class='add'>+	/**</div><div class='add'>+	 * @mutex: To protect the above members.</div><div class='add'>+	 */</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/i915_pxp_tee_interface.h b/include/drm/intel/i915_pxp_tee_interface.h<br/>index 7d96985f2d05..a532d32f58f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/i915_pxp_tee_interface.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/i915_pxp_tee_interface.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/i915_pxp_tee_interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/i915_pxp_tee_interface.h</a></div><div class='hunk'>@@ -12,20 +12,26 @@ struct scatterlist;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct i915_pxp_component_ops - ops for PXP services.</div><div class='del'>- * @owner: Module providing the ops</div><div class='del'>- * @send: sends data to PXP</div><div class='del'>- * @receive: receives data from PXP</div><div class='ctx'>  */</div><div class='ctx'> struct i915_pxp_component_ops {</div><div class='ctx'> 	/**</div><div class='del'>-	 * @owner: owner of the module provding the ops</div><div class='add'>+	 * @owner: Module providing the ops.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @send: Send a PXP message.</div><div class='add'>+	 */</div><div class='ctx'> 	int (*send)(struct device *dev, const void *message, size_t size,</div><div class='ctx'> 		    unsigned long timeout_ms);</div><div class='add'>+	/**</div><div class='add'>+	 * @recv: Receive a PXP message.</div><div class='add'>+	 */</div><div class='ctx'> 	int (*recv)(struct device *dev, void *buffer, size_t size,</div><div class='ctx'> 		    unsigned long timeout_ms);</div><div class='add'>+	/**</div><div class='add'>+	 * @gsc_command: Send a GSC command.</div><div class='add'>+	 */</div><div class='ctx'> 	ssize_t (*gsc_command)(struct device *dev, u8 client_id, u32 fence_id,</div><div class='ctx'> 			       struct scatterlist *sg_in, size_t total_in_len,</div><div class='ctx'> 			       struct scatterlist *sg_out);</div><div class='hunk'>@@ -35,14 +41,21 @@ struct i915_pxp_component_ops {</div><div class='ctx'> /**</div><div class='ctx'>  * struct i915_pxp_component - Used for communication between i915 and TEE</div><div class='ctx'>  * drivers for the PXP services</div><div class='del'>- * @tee_dev: device that provide the PXP service from TEE Bus.</div><div class='del'>- * @pxp_ops: Ops implemented by TEE driver, used by i915 driver.</div><div class='ctx'>  */</div><div class='ctx'> struct i915_pxp_component {</div><div class='add'>+	/**</div><div class='add'>+	 * @tee_dev: device that provide the PXP service from TEE Bus.</div><div class='add'>+	 */</div><div class='ctx'> 	struct device *tee_dev;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @ops: Ops implemented by TEE driver, used by i915 driver.</div><div class='add'>+	 */</div><div class='ctx'> 	const struct i915_pxp_component_ops *ops;</div><div class='ctx'> </div><div class='del'>-	/* To protect the above members. */</div><div class='add'>+	/**</div><div class='add'>+	 * @mutex: To protect the above members.</div><div class='add'>+	 */</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/intel-gtt.h b/include/drm/intel/intel-gtt.h<br/>index cb0d5b7200c7..f53bcff01f22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/intel-gtt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel-gtt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/intel-gtt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/intel-gtt.h</a></div><div class='hunk'>@@ -28,6 +28,8 @@ void intel_gmch_gtt_insert_sg_entries(struct sg_table *st,</div><div class='ctx'> 				      unsigned int pg_start,</div><div class='ctx'> 				      unsigned int flags);</div><div class='ctx'> void intel_gmch_gtt_clear_range(unsigned int first_entry, unsigned int num_entries);</div><div class='add'>+dma_addr_t intel_gmch_gtt_read_entry(unsigned int pg,</div><div class='add'>+				     bool *is_present, bool *is_local);</div><div class='ctx'> </div><div class='ctx'> /* Special gtt memory types */</div><div class='ctx'> #define AGP_DCACHE_MEMORY	1</div><div class='head'>diff --git a/include/drm/intel/intel_lb_mei_interface.h b/include/drm/intel/intel_lb_mei_interface.h<br/>new file mode 100644<br/>index 000000000000..d65be2cba2ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/intel_lb_mei_interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/intel_lb_mei_interface.h</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _INTEL_LB_MEI_INTERFACE_H_</div><div class='add'>+#define _INTEL_LB_MEI_INTERFACE_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * define INTEL_LB_FLAG_IS_PERSISTENT - Mark the payload as persistent</div><div class='add'>+ *</div><div class='add'>+ * This flag indicates that the late binding payload should be stored</div><div class='add'>+ * persistently in flash across warm resets.</div><div class='add'>+ */</div><div class='add'>+#define INTEL_LB_FLAG_IS_PERSISTENT	BIT(0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum intel_lb_type - enum to determine late binding payload type</div><div class='add'>+ * @INTEL_LB_TYPE_FAN_CONTROL: Fan controller configuration</div><div class='add'>+ */</div><div class='add'>+enum intel_lb_type {</div><div class='add'>+	INTEL_LB_TYPE_FAN_CONTROL = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum intel_lb_status - Status codes returned on late binding transmissions</div><div class='add'>+ * @INTEL_LB_STATUS_SUCCESS: Operation completed successfully</div><div class='add'>+ * @INTEL_LB_STATUS_4ID_MISMATCH: Mismatch in the expected 4ID (firmware identity/token)</div><div class='add'>+ * @INTEL_LB_STATUS_ARB_FAILURE: Arbitration failure (e.g. conflicting access or state)</div><div class='add'>+ * @INTEL_LB_STATUS_GENERAL_ERROR: General firmware error not covered by other codes</div><div class='add'>+ * @INTEL_LB_STATUS_INVALID_PARAMS: One or more input parameters are invalid</div><div class='add'>+ * @INTEL_LB_STATUS_INVALID_SIGNATURE: Payload has an invalid or untrusted signature</div><div class='add'>+ * @INTEL_LB_STATUS_INVALID_PAYLOAD: Payload contents are not accepted by firmware</div><div class='add'>+ * @INTEL_LB_STATUS_TIMEOUT: Operation timed out before completion</div><div class='add'>+ */</div><div class='add'>+enum intel_lb_status {</div><div class='add'>+	INTEL_LB_STATUS_SUCCESS           = 0,</div><div class='add'>+	INTEL_LB_STATUS_4ID_MISMATCH      = 1,</div><div class='add'>+	INTEL_LB_STATUS_ARB_FAILURE       = 2,</div><div class='add'>+	INTEL_LB_STATUS_GENERAL_ERROR     = 3,</div><div class='add'>+	INTEL_LB_STATUS_INVALID_PARAMS    = 4,</div><div class='add'>+	INTEL_LB_STATUS_INVALID_SIGNATURE = 5,</div><div class='add'>+	INTEL_LB_STATUS_INVALID_PAYLOAD   = 6,</div><div class='add'>+	INTEL_LB_STATUS_TIMEOUT           = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct intel_lb_component_ops - Ops for late binding services</div><div class='add'>+ */</div><div class='add'>+struct intel_lb_component_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * push_payload - Sends a payload to the authentication firmware</div><div class='add'>+	 * @dev: Device struct corresponding to the mei device</div><div class='add'>+	 * @type: Payload type (see &amp;enum intel_lb_type)</div><div class='add'>+	 * @flags: Payload flags bitmap (e.g. %INTEL_LB_FLAGS_IS_PERSISTENT)</div><div class='add'>+	 * @payload: Pointer to payload buffer</div><div class='add'>+	 * @payload_size: Payload buffer size in bytes</div><div class='add'>+	 *</div><div class='add'>+	 * Return: 0 success, negative errno value on transport failure,</div><div class='add'>+	 *         positive status returned by firmware</div><div class='add'>+	 */</div><div class='add'>+	int (*push_payload)(struct device *dev, u32 type, u32 flags,</div><div class='add'>+			    const void *payload, size_t payload_size);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _INTEL_LB_MEI_INTERFACE_H_ */</div><div class='head'>diff --git a/include/drm/intel_lpe_audio.h b/include/drm/intel/intel_lpe_audio.h<br/>index b6121c8fe539..b6121c8fe539 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/intel_lpe_audio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/intel_lpe_audio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/intel_lpe_audio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/intel_lpe_audio.h</a></div><div class='head'>diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h<br/>new file mode 100644<br/>index 000000000000..52520e684ab1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/pciids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/pciids.h</a></div><div class='hunk'>@@ -0,0 +1,903 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2013 Intel Corporation</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Permission is hereby granted, free of charge, to any person obtaining a</div><div class='add'>+ * copy of this software and associated documentation files (the</div><div class='add'>+ * "Software"), to deal in the Software without restriction, including</div><div class='add'>+ * without limitation the rights to use, copy, modify, merge, publish,</div><div class='add'>+ * distribute, sub license, and/or sell copies of the Software, and to</div><div class='add'>+ * permit persons to whom the Software is furnished to do so, subject to</div><div class='add'>+ * the following conditions:</div><div class='add'>+ *</div><div class='add'>+ * The above copyright notice and this permission notice (including the</div><div class='add'>+ * next paragraph) shall be included in all copies or substantial portions</div><div class='add'>+ * of the Software.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='add'>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL</div><div class='add'>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</div><div class='add'>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING</div><div class='add'>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER</div><div class='add'>+ * DEALINGS IN THE SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+#ifndef __PCIIDS_H__</div><div class='add'>+#define __PCIIDS_H__</div><div class='add'>+</div><div class='add'>+#ifdef __KERNEL__</div><div class='add'>+#define INTEL_PCI_DEVICE(_id, _info) { \</div><div class='add'>+	PCI_DEVICE(PCI_VENDOR_ID_INTEL, (_id)), \</div><div class='add'>+	.driver_data = (kernel_ulong_t)(_info), \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define INTEL_VGA_DEVICE(_id, _info) { \</div><div class='add'>+	PCI_DEVICE(PCI_VENDOR_ID_INTEL, (_id)), \</div><div class='add'>+	.class = PCI_BASE_CLASS_DISPLAY &lt;&lt; 16, .class_mask = 0xff &lt;&lt; 16, \</div><div class='add'>+	.driver_data = (kernel_ulong_t)(_info), \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define INTEL_QUANTA_VGA_DEVICE(_info) { \</div><div class='add'>+	.vendor = PCI_VENDOR_ID_INTEL, .device = 0x16a, \</div><div class='add'>+	.subvendor = 0x152d, .subdevice = 0x8990, \</div><div class='add'>+	.class = PCI_BASE_CLASS_DISPLAY &lt;&lt; 16, .class_mask = 0xff &lt;&lt; 16, \</div><div class='add'>+	.driver_data = (kernel_ulong_t)(_info), \</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define INTEL_I810_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x7121, ## __VA_ARGS__), /* I810 */ \</div><div class='add'>+	MACRO__(0x7123, ## __VA_ARGS__), /* I810_DC100 */ \</div><div class='add'>+	MACRO__(0x7125, ## __VA_ARGS__)  /* I810_E */</div><div class='add'>+</div><div class='add'>+#define INTEL_I815_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1132, ## __VA_ARGS__)  /* I815*/</div><div class='add'>+</div><div class='add'>+#define INTEL_I830_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3577, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_I845G_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2562, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_I85X_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3582, ## __VA_ARGS__), /* I855_GM */ \</div><div class='add'>+	MACRO__(0x358e, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_I865G_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2572, ## __VA_ARGS__) /* I865_G */</div><div class='add'>+</div><div class='add'>+#define INTEL_I915G_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2582, ## __VA_ARGS__), /* I915_G */ \</div><div class='add'>+	MACRO__(0x258a, ## __VA_ARGS__)  /* E7221_G */</div><div class='add'>+</div><div class='add'>+#define INTEL_I915GM_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2592, ## __VA_ARGS__) /* I915_GM */</div><div class='add'>+</div><div class='add'>+#define INTEL_I945G_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2772, ## __VA_ARGS__) /* I945_G */</div><div class='add'>+</div><div class='add'>+#define INTEL_I945GM_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x27a2, ## __VA_ARGS__), /* I945_GM */ \</div><div class='add'>+	MACRO__(0x27ae, ## __VA_ARGS__)  /* I945_GME */</div><div class='add'>+</div><div class='add'>+#define INTEL_I965G_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2972, ## __VA_ARGS__), /* I946_GZ */ \</div><div class='add'>+	MACRO__(0x2982, ## __VA_ARGS__),	/* G35_G */ \</div><div class='add'>+	MACRO__(0x2992, ## __VA_ARGS__),	/* I965_Q */ \</div><div class='add'>+	MACRO__(0x29a2, ## __VA_ARGS__)	/* I965_G */</div><div class='add'>+</div><div class='add'>+#define INTEL_G33_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x29b2, ## __VA_ARGS__), /* Q35_G */ \</div><div class='add'>+	MACRO__(0x29c2, ## __VA_ARGS__),	/* G33_G */ \</div><div class='add'>+	MACRO__(0x29d2, ## __VA_ARGS__)	/* Q33_G */</div><div class='add'>+</div><div class='add'>+#define INTEL_I965GM_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2a02, ## __VA_ARGS__),	/* I965_GM */ \</div><div class='add'>+	MACRO__(0x2a12, ## __VA_ARGS__)  /* I965_GME */</div><div class='add'>+</div><div class='add'>+#define INTEL_GM45_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2a42, ## __VA_ARGS__) /* GM45_G */</div><div class='add'>+</div><div class='add'>+#define INTEL_G45_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x2e02, ## __VA_ARGS__), /* IGD_E_G */ \</div><div class='add'>+	MACRO__(0x2e12, ## __VA_ARGS__), /* Q45_G */ \</div><div class='add'>+	MACRO__(0x2e22, ## __VA_ARGS__), /* G45_G */ \</div><div class='add'>+	MACRO__(0x2e32, ## __VA_ARGS__), /* G41_G */ \</div><div class='add'>+	MACRO__(0x2e42, ## __VA_ARGS__), /* B43_G */ \</div><div class='add'>+	MACRO__(0x2e92, ## __VA_ARGS__)	/* B43_G.1 */</div><div class='add'>+</div><div class='add'>+#define INTEL_PNV_G_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xa001, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_PNV_M_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xa011, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_PNV_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_PNV_G_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_PNV_M_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ILK_D_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0042, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ILK_M_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0046, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ILK_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_ILK_D_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_ILK_M_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_SNB_D_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0102, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x010A, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_SNB_D_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0112, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0122, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_SNB_D_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_SNB_D_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_SNB_D_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_SNB_M_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0106, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_SNB_M_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0116, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0126, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_SNB_M_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_SNB_M_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_SNB_M_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_SNB_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_SNB_D_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_SNB_M_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_IVB_M_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0156, ## __VA_ARGS__) /* GT1 mobile */</div><div class='add'>+</div><div class='add'>+#define INTEL_IVB_M_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0166, ## __VA_ARGS__) /* GT2 mobile */</div><div class='add'>+</div><div class='add'>+#define INTEL_IVB_M_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_IVB_M_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_IVB_M_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_IVB_D_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0152, ## __VA_ARGS__), /* GT1 desktop */ \</div><div class='add'>+	MACRO__(0x015a, ## __VA_ARGS__)  /* GT1 server */</div><div class='add'>+</div><div class='add'>+#define INTEL_IVB_D_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0162, ## __VA_ARGS__), /* GT2 desktop */ \</div><div class='add'>+	MACRO__(0x016a, ## __VA_ARGS__)  /* GT2 server */</div><div class='add'>+</div><div class='add'>+#define INTEL_IVB_D_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_IVB_D_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_IVB_D_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_IVB_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_IVB_M_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_IVB_D_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_IVB_Q_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_QUANTA_VGA_DEVICE(__VA_ARGS__) /* Quanta transcode */</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_ULT_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0A02, ## __VA_ARGS__), /* ULT GT1 desktop */ \</div><div class='add'>+	MACRO__(0x0A06, ## __VA_ARGS__), /* ULT GT1 mobile */ \</div><div class='add'>+	MACRO__(0x0A0A, ## __VA_ARGS__), /* ULT GT1 server */ \</div><div class='add'>+	MACRO__(0x0A0B, ## __VA_ARGS__)  /* ULT GT1 reserved */</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_ULX_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0A0E, ## __VA_ARGS__) /* ULX GT1 mobile */</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_HSW_ULT_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_HSW_ULX_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0402, ## __VA_ARGS__), /* GT1 desktop */ \</div><div class='add'>+	MACRO__(0x0406, ## __VA_ARGS__), /* GT1 mobile */ \</div><div class='add'>+	MACRO__(0x040A, ## __VA_ARGS__), /* GT1 server */ \</div><div class='add'>+	MACRO__(0x040B, ## __VA_ARGS__), /* GT1 reserved */ \</div><div class='add'>+	MACRO__(0x040E, ## __VA_ARGS__), /* GT1 reserved */ \</div><div class='add'>+	MACRO__(0x0C02, ## __VA_ARGS__), /* SDV GT1 desktop */ \</div><div class='add'>+	MACRO__(0x0C06, ## __VA_ARGS__), /* SDV GT1 mobile */ \</div><div class='add'>+	MACRO__(0x0C0A, ## __VA_ARGS__), /* SDV GT1 server */ \</div><div class='add'>+	MACRO__(0x0C0B, ## __VA_ARGS__), /* SDV GT1 reserved */ \</div><div class='add'>+	MACRO__(0x0C0E, ## __VA_ARGS__), /* SDV GT1 reserved */ \</div><div class='add'>+	MACRO__(0x0D02, ## __VA_ARGS__), /* CRW GT1 desktop */ \</div><div class='add'>+	MACRO__(0x0D06, ## __VA_ARGS__), /* CRW GT1 mobile */ \</div><div class='add'>+	MACRO__(0x0D0A, ## __VA_ARGS__), /* CRW GT1 server */ \</div><div class='add'>+	MACRO__(0x0D0B, ## __VA_ARGS__), /* CRW GT1 reserved */ \</div><div class='add'>+	MACRO__(0x0D0E, ## __VA_ARGS__)  /* CRW GT1 reserved */</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_ULT_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0A12, ## __VA_ARGS__), /* ULT GT2 desktop */ \</div><div class='add'>+	MACRO__(0x0A16, ## __VA_ARGS__), /* ULT GT2 mobile */ \</div><div class='add'>+	MACRO__(0x0A1A, ## __VA_ARGS__), /* ULT GT2 server */ \</div><div class='add'>+	MACRO__(0x0A1B, ## __VA_ARGS__)  /* ULT GT2 reserved */ \</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_ULX_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0A1E, ## __VA_ARGS__) /* ULX GT2 mobile */ \</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_HSW_ULT_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_HSW_ULX_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0412, ## __VA_ARGS__), /* GT2 desktop */ \</div><div class='add'>+	MACRO__(0x0416, ## __VA_ARGS__), /* GT2 mobile */ \</div><div class='add'>+	MACRO__(0x041A, ## __VA_ARGS__), /* GT2 server */ \</div><div class='add'>+	MACRO__(0x041B, ## __VA_ARGS__), /* GT2 reserved */ \</div><div class='add'>+	MACRO__(0x041E, ## __VA_ARGS__), /* GT2 reserved */ \</div><div class='add'>+	MACRO__(0x0C12, ## __VA_ARGS__), /* SDV GT2 desktop */ \</div><div class='add'>+	MACRO__(0x0C16, ## __VA_ARGS__), /* SDV GT2 mobile */ \</div><div class='add'>+	MACRO__(0x0C1A, ## __VA_ARGS__), /* SDV GT2 server */ \</div><div class='add'>+	MACRO__(0x0C1B, ## __VA_ARGS__), /* SDV GT2 reserved */ \</div><div class='add'>+	MACRO__(0x0C1E, ## __VA_ARGS__), /* SDV GT2 reserved */ \</div><div class='add'>+	MACRO__(0x0D12, ## __VA_ARGS__), /* CRW GT2 desktop */ \</div><div class='add'>+	MACRO__(0x0D16, ## __VA_ARGS__), /* CRW GT2 mobile */ \</div><div class='add'>+	MACRO__(0x0D1A, ## __VA_ARGS__), /* CRW GT2 server */ \</div><div class='add'>+	MACRO__(0x0D1B, ## __VA_ARGS__), /* CRW GT2 reserved */ \</div><div class='add'>+	MACRO__(0x0D1E, ## __VA_ARGS__)  /* CRW GT2 reserved */</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_ULT_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0A22, ## __VA_ARGS__), /* ULT GT3 desktop */ \</div><div class='add'>+	MACRO__(0x0A26, ## __VA_ARGS__), /* ULT GT3 mobile */ \</div><div class='add'>+	MACRO__(0x0A2A, ## __VA_ARGS__), /* ULT GT3 server */ \</div><div class='add'>+	MACRO__(0x0A2B, ## __VA_ARGS__), /* ULT GT3 reserved */ \</div><div class='add'>+	MACRO__(0x0A2E, ## __VA_ARGS__)  /* ULT GT3 reserved */</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_HSW_ULT_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0422, ## __VA_ARGS__), /* GT3 desktop */ \</div><div class='add'>+	MACRO__(0x0426, ## __VA_ARGS__), /* GT3 mobile */ \</div><div class='add'>+	MACRO__(0x042A, ## __VA_ARGS__), /* GT3 server */ \</div><div class='add'>+	MACRO__(0x042B, ## __VA_ARGS__), /* GT3 reserved */ \</div><div class='add'>+	MACRO__(0x042E, ## __VA_ARGS__), /* GT3 reserved */ \</div><div class='add'>+	MACRO__(0x0C22, ## __VA_ARGS__), /* SDV GT3 desktop */ \</div><div class='add'>+	MACRO__(0x0C26, ## __VA_ARGS__), /* SDV GT3 mobile */ \</div><div class='add'>+	MACRO__(0x0C2A, ## __VA_ARGS__), /* SDV GT3 server */ \</div><div class='add'>+	MACRO__(0x0C2B, ## __VA_ARGS__), /* SDV GT3 reserved */ \</div><div class='add'>+	MACRO__(0x0C2E, ## __VA_ARGS__), /* SDV GT3 reserved */ \</div><div class='add'>+	MACRO__(0x0D22, ## __VA_ARGS__), /* CRW GT3 desktop */ \</div><div class='add'>+	MACRO__(0x0D26, ## __VA_ARGS__), /* CRW GT3 mobile */ \</div><div class='add'>+	MACRO__(0x0D2A, ## __VA_ARGS__), /* CRW GT3 server */ \</div><div class='add'>+	MACRO__(0x0D2B, ## __VA_ARGS__), /* CRW GT3 reserved */ \</div><div class='add'>+	MACRO__(0x0D2E, ## __VA_ARGS__)  /* CRW GT3 reserved */</div><div class='add'>+</div><div class='add'>+#define INTEL_HSW_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_HSW_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_HSW_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_HSW_GT3_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_VLV_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0f30, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0f31, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0f32, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0f33, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_ULT_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1606, ## __VA_ARGS__), /* GT1 ULT */ \</div><div class='add'>+	MACRO__(0x160B, ## __VA_ARGS__)  /* GT1 Iris */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_ULX_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x160E, ## __VA_ARGS__) /* GT1 ULX */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_BDW_ULT_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_BDW_ULX_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x1602, ## __VA_ARGS__), /* GT1 ULT */ \</div><div class='add'>+	MACRO__(0x160A, ## __VA_ARGS__), /* GT1 Server */ \</div><div class='add'>+	MACRO__(0x160D, ## __VA_ARGS__)  /* GT1 Workstation */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_ULT_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1616, ## __VA_ARGS__), /* GT2 ULT */ \</div><div class='add'>+	MACRO__(0x161B, ## __VA_ARGS__)  /* GT2 ULT */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_ULX_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x161E, ## __VA_ARGS__) /* GT2 ULX */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_BDW_ULT_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_BDW_ULX_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x1612, ## __VA_ARGS__), /* GT2 Halo */ \</div><div class='add'>+	MACRO__(0x161A, ## __VA_ARGS__), /* GT2 Server */ \</div><div class='add'>+	MACRO__(0x161D, ## __VA_ARGS__)  /* GT2 Workstation */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_ULT_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1626, ## __VA_ARGS__), /* ULT */ \</div><div class='add'>+	MACRO__(0x162B, ## __VA_ARGS__)  /* Iris */ \</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_ULX_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x162E, ## __VA_ARGS__)  /* ULX */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_BDW_ULT_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_BDW_ULX_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x1622, ## __VA_ARGS__), /* ULT */ \</div><div class='add'>+	MACRO__(0x162A, ## __VA_ARGS__), /* Server */ \</div><div class='add'>+	MACRO__(0x162D, ## __VA_ARGS__)  /* Workstation */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_ULT_RSVD_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1636, ## __VA_ARGS__), /* ULT */ \</div><div class='add'>+	MACRO__(0x163B, ## __VA_ARGS__)  /* Iris */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_ULX_RSVD_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x163E, ## __VA_ARGS__) /* ULX */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_RSVD_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_BDW_ULT_RSVD_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_BDW_ULX_RSVD_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x1632, ## __VA_ARGS__), /* ULT */ \</div><div class='add'>+	MACRO__(0x163A, ## __VA_ARGS__), /* Server */ \</div><div class='add'>+	MACRO__(0x163D, ## __VA_ARGS__)  /* Workstation */</div><div class='add'>+</div><div class='add'>+#define INTEL_BDW_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_BDW_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_BDW_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_BDW_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_BDW_RSVD_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_CHV_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x22b0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x22b1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x22b2, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x22b3, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_ULT_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1906, ## __VA_ARGS__), /* ULT GT1 */ \</div><div class='add'>+	MACRO__(0x1913, ## __VA_ARGS__)  /* ULT GT1.5 */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_ULX_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x190E, ## __VA_ARGS__), /* ULX GT1 */ \</div><div class='add'>+	MACRO__(0x1915, ## __VA_ARGS__)  /* ULX GT1.5 */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_SKL_ULT_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_SKL_ULX_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x1902, ## __VA_ARGS__), /* DT  GT1 */ \</div><div class='add'>+	MACRO__(0x190A, ## __VA_ARGS__), /* SRV GT1 */ \</div><div class='add'>+	MACRO__(0x190B, ## __VA_ARGS__), /* Halo GT1 */ \</div><div class='add'>+	MACRO__(0x1917, ## __VA_ARGS__)  /* DT  GT1.5 */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_ULT_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1916, ## __VA_ARGS__), /* ULT GT2 */ \</div><div class='add'>+	MACRO__(0x1921, ## __VA_ARGS__)  /* ULT GT2F */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_ULX_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x191E, ## __VA_ARGS__) /* ULX GT2 */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_SKL_ULT_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_SKL_ULX_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x1912, ## __VA_ARGS__), /* DT  GT2 */ \</div><div class='add'>+	MACRO__(0x191A, ## __VA_ARGS__), /* SRV GT2 */ \</div><div class='add'>+	MACRO__(0x191B, ## __VA_ARGS__), /* Halo GT2 */ \</div><div class='add'>+	MACRO__(0x191D, ## __VA_ARGS__)  /* WKS GT2 */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_ULT_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1923, ## __VA_ARGS__), /* ULT GT3 */ \</div><div class='add'>+	MACRO__(0x1926, ## __VA_ARGS__), /* ULT GT3e */ \</div><div class='add'>+	MACRO__(0x1927, ## __VA_ARGS__)  /* ULT GT3e */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_SKL_ULT_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x192A, ## __VA_ARGS__), /* SRV GT3 */ \</div><div class='add'>+	MACRO__(0x192B, ## __VA_ARGS__), /* Halo GT3e */ \</div><div class='add'>+	MACRO__(0x192D, ## __VA_ARGS__)  /* SRV GT3e */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_GT4_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x1932, ## __VA_ARGS__), /* DT GT4 */ \</div><div class='add'>+	MACRO__(0x193A, ## __VA_ARGS__), /* SRV GT4e */ \</div><div class='add'>+	MACRO__(0x193B, ## __VA_ARGS__), /* Halo GT4e */ \</div><div class='add'>+	MACRO__(0x193D, ## __VA_ARGS__) /* WKS GT4e */</div><div class='add'>+</div><div class='add'>+#define INTEL_SKL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_SKL_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_SKL_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_SKL_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_SKL_GT4_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_BXT_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0A84, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x1A84, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x1A85, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A84, ## __VA_ARGS__), /* APL HD Graphics 505 */ \</div><div class='add'>+	MACRO__(0x5A85, ## __VA_ARGS__)  /* APL HD Graphics 500 */</div><div class='add'>+</div><div class='add'>+#define INTEL_GLK_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3184, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x3185, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_ULT_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x5906, ## __VA_ARGS__), /* ULT GT1 */ \</div><div class='add'>+	MACRO__(0x5913, ## __VA_ARGS__)  /* ULT GT1.5 */</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_ULX_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x590E, ## __VA_ARGS__), /* ULX GT1 */ \</div><div class='add'>+	MACRO__(0x5915, ## __VA_ARGS__)  /* ULX GT1.5 */</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_KBL_ULT_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_KBL_ULX_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5902, ## __VA_ARGS__), /* DT  GT1 */ \</div><div class='add'>+	MACRO__(0x5908, ## __VA_ARGS__), /* Halo GT1 */ \</div><div class='add'>+	MACRO__(0x590A, ## __VA_ARGS__), /* SRV GT1 */ \</div><div class='add'>+	MACRO__(0x590B, ## __VA_ARGS__) /* Halo GT1 */</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_ULT_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x5916, ## __VA_ARGS__), /* ULT GT2 */ \</div><div class='add'>+	MACRO__(0x5921, ## __VA_ARGS__)  /* ULT GT2F */</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_ULX_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x591E, ## __VA_ARGS__)  /* ULX GT2 */</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_KBL_ULT_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_KBL_ULX_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5912, ## __VA_ARGS__), /* DT  GT2 */ \</div><div class='add'>+	MACRO__(0x5917, ## __VA_ARGS__), /* Mobile GT2 */ \</div><div class='add'>+	MACRO__(0x591A, ## __VA_ARGS__), /* SRV GT2 */ \</div><div class='add'>+	MACRO__(0x591B, ## __VA_ARGS__), /* Halo GT2 */ \</div><div class='add'>+	MACRO__(0x591D, ## __VA_ARGS__) /* WKS GT2 */</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_ULT_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x5926, ## __VA_ARGS__) /* ULT GT3 */</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_KBL_ULT_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5923, ## __VA_ARGS__), /* ULT GT3 */ \</div><div class='add'>+	MACRO__(0x5927, ## __VA_ARGS__) /* ULT GT3 */</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_GT4_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x593B, ## __VA_ARGS__) /* Halo GT4 */</div><div class='add'>+</div><div class='add'>+/* AML/KBL Y GT2 */</div><div class='add'>+#define INTEL_AML_KBL_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x591C, ## __VA_ARGS__),  /* ULX GT2 */ \</div><div class='add'>+	MACRO__(0x87C0, ## __VA_ARGS__) /* ULX GT2 */</div><div class='add'>+</div><div class='add'>+/* AML/CFL Y GT2 */</div><div class='add'>+#define INTEL_AML_CFL_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x87CA, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* CML GT1 */</div><div class='add'>+#define INTEL_CML_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x9BA2, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BA4, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BA5, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BA8, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_CML_U_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x9B21, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BAA, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BAC, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* CML GT2 */</div><div class='add'>+#define INTEL_CML_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x9BC2, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BC4, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BC5, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BC6, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BC8, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BE6, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BF6, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_CML_U_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x9B41, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BCA, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9BCC, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_CML_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_CML_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_CML_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_CML_U_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_CML_U_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_KBL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_KBL_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_KBL_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_KBL_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_KBL_GT4_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_AML_KBL_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* CFL S */</div><div class='add'>+#define INTEL_CFL_S_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3E90, ## __VA_ARGS__), /* SRV GT1 */ \</div><div class='add'>+	MACRO__(0x3E93, ## __VA_ARGS__), /* SRV GT1 */ \</div><div class='add'>+	MACRO__(0x3E99, ## __VA_ARGS__)  /* SRV GT1 */</div><div class='add'>+</div><div class='add'>+#define INTEL_CFL_S_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3E91, ## __VA_ARGS__), /* SRV GT2 */ \</div><div class='add'>+	MACRO__(0x3E92, ## __VA_ARGS__), /* SRV GT2 */ \</div><div class='add'>+	MACRO__(0x3E96, ## __VA_ARGS__), /* SRV GT2 */ \</div><div class='add'>+	MACRO__(0x3E98, ## __VA_ARGS__), /* SRV GT2 */ \</div><div class='add'>+	MACRO__(0x3E9A, ## __VA_ARGS__)  /* SRV GT2 */</div><div class='add'>+</div><div class='add'>+/* CFL H */</div><div class='add'>+#define INTEL_CFL_H_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3E9C, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_CFL_H_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3E94, ## __VA_ARGS__),  /* Halo GT2 */ \</div><div class='add'>+	MACRO__(0x3E9B, ## __VA_ARGS__) /* Halo GT2 */</div><div class='add'>+</div><div class='add'>+/* CFL U GT2 */</div><div class='add'>+#define INTEL_CFL_U_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3EA9, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* CFL U GT3 */</div><div class='add'>+#define INTEL_CFL_U_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3EA5, ## __VA_ARGS__), /* ULT GT3 */ \</div><div class='add'>+	MACRO__(0x3EA6, ## __VA_ARGS__), /* ULT GT3 */ \</div><div class='add'>+	MACRO__(0x3EA7, ## __VA_ARGS__), /* ULT GT3 */ \</div><div class='add'>+	MACRO__(0x3EA8, ## __VA_ARGS__)  /* ULT GT3 */</div><div class='add'>+</div><div class='add'>+#define INTEL_CFL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_CFL_S_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_CFL_S_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_CFL_H_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_CFL_H_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_CFL_U_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_CFL_U_GT3_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_AML_CFL_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* WHL/CFL U GT1 */</div><div class='add'>+#define INTEL_WHL_U_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3EA1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x3EA4, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* WHL/CFL U GT2 */</div><div class='add'>+#define INTEL_WHL_U_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3EA0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x3EA3, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* WHL/CFL U GT3 */</div><div class='add'>+#define INTEL_WHL_U_GT3_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x3EA2, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_WHL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_WHL_U_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_WHL_U_GT2_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_WHL_U_GT3_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* CNL */</div><div class='add'>+#define INTEL_CNL_PORT_F_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x5A44, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A4C, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A54, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A5C, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_CNL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_CNL_PORT_F_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A40, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A41, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A42, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A49, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A4A, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A50, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A51, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A52, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A59, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5A5A, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* ICL */</div><div class='add'>+#define INTEL_ICL_PORT_F_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x8A50, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A52, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A53, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A54, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A56, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A57, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A58, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A59, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A5A, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A5B, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A5C, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A70, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A71, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ICL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_ICL_PORT_F_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A51, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x8A5D, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* EHL */</div><div class='add'>+#define INTEL_EHL_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x4541, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4551, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4555, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4557, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4570, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4571, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* JSL */</div><div class='add'>+#define INTEL_JSL_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x4E51, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4E55, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4E57, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4E61, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4E71, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* TGL */</div><div class='add'>+#define INTEL_TGL_GT1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x9A60, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9A68, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9A70, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_TGL_GT2_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x9A40, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9A49, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9A59, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9A78, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9AC0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9AC9, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9AD9, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x9AF8, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_TGL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* RKL */</div><div class='add'>+#define INTEL_RKL_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x4C80, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4C8A, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4C8B, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4C8C, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4C90, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4C9A, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* DG1 */</div><div class='add'>+#define INTEL_DG1_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x4905, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4906, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4907, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4908, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4909, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* ADL-S */</div><div class='add'>+#define INTEL_ADLS_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x4680, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4682, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4688, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x468A, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x468B, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4690, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4692, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4693, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* ADL-P */</div><div class='add'>+#define INTEL_ADLP_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x46A0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46A1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46A2, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46A3, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46A6, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46A8, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46AA, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x462A, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4626, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x4628, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46B0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46B1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46B2, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46B3, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46C0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46C1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46C2, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46C3, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* ADL-N */</div><div class='add'>+#define INTEL_ADLN_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x46D0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46D1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46D2, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46D3, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x46D4, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* RPL-S */</div><div class='add'>+#define INTEL_RPLS_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xA780, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA781, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA782, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA783, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA788, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA789, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA78A, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA78B, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* RPL-U */</div><div class='add'>+#define INTEL_RPLU_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xA721, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA7A1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA7A9, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA7AC, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA7AD, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* RPL-P */</div><div class='add'>+#define INTEL_RPLP_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xA720, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA7A0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA7A8, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA7AA, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xA7AB, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* DG2 */</div><div class='add'>+#define INTEL_DG2_G10_D_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x56A0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56A1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56A2, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G10_E_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x56BE, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56BF, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G10_M_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x5690, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5691, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5692, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G10_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_DG2_G10_D_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G10_E_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G10_M_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G11_D_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x56A5, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56A6, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56B0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56B1, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G11_E_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x56BA, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56BB, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56BC, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56BD, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G11_M_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x5693, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5694, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5695, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G11_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_DG2_G11_D_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G11_E_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G11_M_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G12_D_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x56A3, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56A4, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56B2, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56B3, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G12_M_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x5696, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x5697, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_G12_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_DG2_G12_D_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G12_M_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_D_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_DG2_G10_D_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G11_D_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G12_D_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_DG2_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_DG2_G10_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G11_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_DG2_G12_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ATS_M150_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x56C0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x56C2, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ATS_M75_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x56C1, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ATS_M_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_ATS_M150_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* ARL */</div><div class='add'>+#define INTEL_ARL_H_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x7D51, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x7DD1, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ARL_U_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x7D41, ## __VA_ARGS__) \</div><div class='add'>+</div><div class='add'>+#define INTEL_ARL_S_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x7D67, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB640, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_ARL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_ARL_H_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_ARL_U_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	INTEL_ARL_S_IDS(MACRO__, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* MTL */</div><div class='add'>+#define INTEL_MTL_U_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x7D40, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x7D45, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_MTL_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_MTL_U_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x7D55, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x7D60, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x7DD5, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* PVC */</div><div class='add'>+#define INTEL_PVC_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x0B69, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0B6E, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BD4, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BD5, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BD6, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BD7, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BD8, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BD9, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BDA, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BDB, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BE0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BE1, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x0BE5, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* LNL */</div><div class='add'>+#define INTEL_LNL_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x6420, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x64A0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0x64B0, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* BMG */</div><div class='add'>+#define INTEL_BMG_G21_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xE202, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE209, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE20B, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE20C, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE20D, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE210, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE211, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE212, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE216, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define INTEL_BMG_IDS(MACRO__, ...) \</div><div class='add'>+	INTEL_BMG_G21_IDS(MACRO__, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE220, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE221, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE222, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xE223, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* PTL */</div><div class='add'>+#define INTEL_PTL_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xB080, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB081, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB082, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB083, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB084, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB085, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB086, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB087, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB08F, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB090, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB0A0, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xB0B0, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* WCL */</div><div class='add'>+#define INTEL_WCL_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xFD80, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xFD81, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* NVL-S */</div><div class='add'>+#define INTEL_NVLS_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0xD740, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xD741, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xD742, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xD743, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xD744, ## __VA_ARGS__), \</div><div class='add'>+	MACRO__(0xD745, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/* CRI */</div><div class='add'>+#define INTEL_CRI_IDS(MACRO__, ...) \</div><div class='add'>+	MACRO__(0x674C, ## __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#endif /* __PCIIDS_H__ */</div><div class='head'>diff --git a/include/drm/intel/xe_sriov_vfio.h b/include/drm/intel/xe_sriov_vfio.h<br/>new file mode 100644<br/>index 000000000000..e9814e8149fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/intel/xe_sriov_vfio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/intel/xe_sriov_vfio.h</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _XE_SRIOV_VFIO_H_</div><div class='add'>+#define _XE_SRIOV_VFIO_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct pci_dev;</div><div class='add'>+struct xe_device;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_get_pf() - Get PF &amp;xe_device.</div><div class='add'>+ * @pdev: the VF &amp;pci_dev device</div><div class='add'>+ *</div><div class='add'>+ * Return: pointer to PF &amp;xe_device, NULL otherwise.</div><div class='add'>+ */</div><div class='add'>+struct xe_device *xe_sriov_vfio_get_pf(struct pci_dev *pdev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_migration_supported() - Check if migration is supported.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ *</div><div class='add'>+ * Return: true if migration is supported, false otherwise.</div><div class='add'>+ */</div><div class='add'>+bool xe_sriov_vfio_migration_supported(struct xe_device *xe);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_wait_flr_done() - Wait for VF FLR completion.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * This function will wait until VF FLR is processed by PF on all tiles (or</div><div class='add'>+ * until timeout occurs).</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int xe_sriov_vfio_wait_flr_done(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_suspend_device() - Suspend VF.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * This function will pause VF on all tiles/GTs.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int xe_sriov_vfio_suspend_device(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_resume_device() - Resume VF.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * This function will resume VF on all tiles.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int xe_sriov_vfio_resume_device(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_stop_copy_enter() - Initiate a VF device migration data save.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int xe_sriov_vfio_stop_copy_enter(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_stop_copy_exit() - Finish a VF device migration data save.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int xe_sriov_vfio_stop_copy_exit(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_resume_data_enter() - Initiate a VF device migration data restore.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int xe_sriov_vfio_resume_data_enter(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_resume_data_exit() - Finish a VF device migration data restore.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int xe_sriov_vfio_resume_data_exit(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_error() - Move VF device to error state.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * Reset is needed to move it out of error state.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int xe_sriov_vfio_error(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_data_read() - Read migration data from the VF device.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ * @buf: start address of userspace buffer</div><div class='add'>+ * @len: requested read size from userspace</div><div class='add'>+ *</div><div class='add'>+ * Return: number of bytes that has been successfully read,</div><div class='add'>+ *	   0 if no more migration data is available, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+ssize_t xe_sriov_vfio_data_read(struct xe_device *xe, unsigned int vfid,</div><div class='add'>+				char __user *buf, size_t len);</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_data_write() - Write migration data to the VF device.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ * @buf: start address of userspace buffer</div><div class='add'>+ * @len: requested write size from userspace</div><div class='add'>+ *</div><div class='add'>+ * Return: number of bytes that has been successfully written, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+ssize_t xe_sriov_vfio_data_write(struct xe_device *xe, unsigned int vfid,</div><div class='add'>+				 const char __user *buf, size_t len);</div><div class='add'>+/**</div><div class='add'>+ * xe_sriov_vfio_stop_copy_size() - Get a size estimate of VF device migration data.</div><div class='add'>+ * @xe: the PF &amp;xe_device obtained by calling xe_sriov_vfio_get_pf()</div><div class='add'>+ * @vfid: the VF identifier (can't be 0)</div><div class='add'>+ *</div><div class='add'>+ * Return: migration data size in bytes or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+ssize_t xe_sriov_vfio_stop_copy_size(struct xe_device *xe, unsigned int vfid);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/spsc_queue.h b/include/drm/spsc_queue.h<br/>index 125f096c88cb..ee9df8cc67b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/spsc_queue.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/spsc_queue.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/spsc_queue.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/spsc_queue.h</a></div><div class='hunk'>@@ -70,9 +70,11 @@ static inline bool spsc_queue_push(struct spsc_queue *queue, struct spsc_node *n</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> </div><div class='add'>+	atomic_inc(&amp;queue-&gt;job_count);</div><div class='add'>+	smp_mb__after_atomic();</div><div class='add'>+</div><div class='ctx'> 	tail = (struct spsc_node **)atomic_long_xchg(&amp;queue-&gt;tail, (long)&amp;node-&gt;next);</div><div class='ctx'> 	WRITE_ONCE(*tail, node);</div><div class='del'>-	atomic_inc(&amp;queue-&gt;job_count);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In case of first element verify new node will be visible to the consumer</div><div class='head'>diff --git a/include/drm/ttm/ttm_allocation.h b/include/drm/ttm/ttm_allocation.h<br/>new file mode 100644<br/>index 000000000000..655d1e44aba7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_allocation.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_allocation.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR MIT */</div><div class='add'>+/* Copyright (c) 2025 Valve Corporation */</div><div class='add'>+</div><div class='add'>+#ifndef _TTM_ALLOCATION_H_</div><div class='add'>+#define _TTM_ALLOCATION_H_</div><div class='add'>+</div><div class='add'>+#define TTM_ALLOCATION_POOL_BENEFICIAL_ORDER(n)	((n) &amp; 0xff) /* Max order which caller can benefit from */</div><div class='add'>+#define TTM_ALLOCATION_POOL_USE_DMA_ALLOC 	BIT(8) /* Use coherent DMA allocations. */</div><div class='add'>+#define TTM_ALLOCATION_POOL_USE_DMA32		BIT(9) /* Use GFP_DMA32 allocations. */</div><div class='add'>+#define TTM_ALLOCATION_PROPAGATE_ENOSPC		BIT(10) /* Do not convert ENOSPC from resource managers to ENOMEM. */</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/ttm/ttm_backup.h b/include/drm/ttm/ttm_backup.h<br/>new file mode 100644<br/>index 000000000000..c33cba111171<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_backup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_backup.h</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _TTM_BACKUP_H_</div><div class='add'>+#define _TTM_BACKUP_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+#include &lt;linux/shmem_fs.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ttm_backup_handle_to_page_ptr() - Convert handle to struct page pointer</div><div class='add'>+ * @handle: The handle to convert.</div><div class='add'>+ *</div><div class='add'>+ * Converts an opaque handle received from the</div><div class='add'>+ * ttm_backup_backup_page() function to an (invalid)</div><div class='add'>+ * struct page pointer suitable for a struct page array.</div><div class='add'>+ *</div><div class='add'>+ * Return: An (invalid) struct page pointer.</div><div class='add'>+ */</div><div class='add'>+static inline struct page *</div><div class='add'>+ttm_backup_handle_to_page_ptr(unsigned long handle)</div><div class='add'>+{</div><div class='add'>+	return (struct page *)(handle &lt;&lt; 1 | 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ttm_backup_page_ptr_is_handle() - Whether a struct page pointer is a handle</div><div class='add'>+ * @page: The struct page pointer to check.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the struct page pointer is a handld returned from</div><div class='add'>+ * ttm_backup_handle_to_page_ptr(). False otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool ttm_backup_page_ptr_is_handle(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)page &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ttm_backup_page_ptr_to_handle() - Convert a struct page pointer to a handle</div><div class='add'>+ * @page: The struct page pointer to convert</div><div class='add'>+ *</div><div class='add'>+ * Return: The handle that was previously used in</div><div class='add'>+ * ttm_backup_handle_to_page_ptr() to obtain a struct page pointer, suitable</div><div class='add'>+ * for use as argument in the struct ttm_backup_drop() or</div><div class='add'>+ * ttm_backup_copy_page() functions.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+ttm_backup_page_ptr_to_handle(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!ttm_backup_page_ptr_is_handle(page));</div><div class='add'>+	return (unsigned long)page &gt;&gt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ttm_backup_drop(struct file *backup, pgoff_t handle);</div><div class='add'>+</div><div class='add'>+int ttm_backup_copy_page(struct file *backup, struct page *dst,</div><div class='add'>+			 pgoff_t handle, bool intr);</div><div class='add'>+</div><div class='add'>+s64</div><div class='add'>+ttm_backup_backup_page(struct file *backup, struct page *page,</div><div class='add'>+		       bool writeback, pgoff_t idx, gfp_t page_gfp,</div><div class='add'>+		       gfp_t alloc_gfp);</div><div class='add'>+</div><div class='add'>+void ttm_backup_fini(struct file *backup);</div><div class='add'>+</div><div class='add'>+u64 ttm_backup_bytes_avail(void);</div><div class='add'>+</div><div class='add'>+struct file *ttm_backup_shmem_create(loff_t size);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/drm/ttm/ttm_bo.h b/include/drm/ttm/ttm_bo.h<br/>index 0223a41a64b2..bca3a8849d47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_bo.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_bo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_bo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_bo.h</a></div><div class='hunk'>@@ -83,6 +83,9 @@ enum ttm_bo_type {</div><div class='ctx'>  * @resource: structure describing current placement.</div><div class='ctx'>  * @ttm: TTM structure holding system pages.</div><div class='ctx'>  * @deleted: True if the object is only a zombie and already deleted.</div><div class='add'>+ * @bulk_move: The bulk move object.</div><div class='add'>+ * @priority: Priority for LRU, BOs with lower priority are evicted first.</div><div class='add'>+ * @pin_count: Pin count.</div><div class='ctx'>  *</div><div class='ctx'>  * Base class for TTM buffer object, that deals with data placement and CPU</div><div class='ctx'>  * mappings. GPU mappings are really up to the driver, but for simpler GPUs</div><div class='hunk'>@@ -128,26 +131,27 @@ struct ttm_buffer_object {</div><div class='ctx'> 	struct work_struct delayed_delete;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * Special members that are protected by the reserve lock</div><div class='del'>-	 * and the bo::lock when written to. Can be read with</div><div class='del'>-	 * either of these locks held.</div><div class='add'>+	 * @sg: external source of pages and DMA addresses, protected by the</div><div class='add'>+	 * reservation lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct sg_table *sg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define TTM_BO_MAP_IOMEM_MASK 0x80</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct ttm_bo_kmap_obj</div><div class='ctx'>  *</div><div class='ctx'>  * @virtual: The current kernel virtual address.</div><div class='ctx'>  * @page: The page when kmap'ing a single page.</div><div class='ctx'>  * @bo_kmap_type: Type of bo_kmap.</div><div class='add'>+ * @bo: The TTM BO.</div><div class='ctx'>  *</div><div class='ctx'>  * Object describing a kernel mapping. Since a TTM bo may be located</div><div class='ctx'>  * in various memory types with various caching policies, the</div><div class='ctx'>  * mapping can either be an ioremap, a vmap, a kmap or part of a</div><div class='ctx'>  * premapped region.</div><div class='ctx'>  */</div><div class='del'>-#define TTM_BO_MAP_IOMEM_MASK 0x80</div><div class='ctx'> struct ttm_bo_kmap_obj {</div><div class='ctx'> 	void *virtual;</div><div class='ctx'> 	struct page *page;</div><div class='hunk'>@@ -168,9 +172,9 @@ struct ttm_bo_kmap_obj {</div><div class='ctx'>  * @gfp_retry_mayfail: Set the __GFP_RETRY_MAYFAIL when allocation pages.</div><div class='ctx'>  * @allow_res_evict: Allow eviction of reserved BOs. Can be used when multiple</div><div class='ctx'>  * BOs share the same reservation object.</div><div class='del'>- * @force_alloc: Don't check the memory account during suspend or CPU page</div><div class='ctx'>  * faults. Should only be used by TTM internally.</div><div class='ctx'>  * @resv: Reservation object to allow reserved evictions with.</div><div class='add'>+ * @bytes_moved: Statistics on how many bytes have been moved.</div><div class='ctx'>  *</div><div class='ctx'>  * Context for TTM operations like changing buffer placement or general memory</div><div class='ctx'>  * allocation.</div><div class='hunk'>@@ -180,38 +184,73 @@ struct ttm_operation_ctx {</div><div class='ctx'> 	bool no_wait_gpu;</div><div class='ctx'> 	bool gfp_retry_mayfail;</div><div class='ctx'> 	bool allow_res_evict;</div><div class='del'>-	bool force_alloc;</div><div class='ctx'> 	struct dma_resv *resv;</div><div class='ctx'> 	uint64_t bytes_moved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ttm_lru_walk;</div><div class='add'>+</div><div class='add'>+/** struct ttm_lru_walk_ops - Operations for a LRU walk. */</div><div class='add'>+struct ttm_lru_walk_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * process_bo - Process this bo.</div><div class='add'>+	 * @walk: struct ttm_lru_walk describing the walk.</div><div class='add'>+	 * @bo: A locked and referenced buffer object.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: Negative error code on error, User-defined positive value</div><div class='add'>+	 * (typically, but not always, size of the processed bo) on success.</div><div class='add'>+	 * On success, the returned values are summed by the walk and the</div><div class='add'>+	 * walk exits when its target is met.</div><div class='add'>+	 * 0 also indicates success, -EBUSY means this bo was skipped.</div><div class='add'>+	 */</div><div class='add'>+	s64 (*process_bo)(struct ttm_lru_walk *walk, struct ttm_buffer_object *bo);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * ttm_bo_get - reference a struct ttm_buffer_object</div><div class='del'>- *</div><div class='del'>- * @bo: The buffer object.</div><div class='add'>+ * struct ttm_lru_walk_arg - Common part for the variants of BO LRU walk.</div><div class='ctx'>  */</div><div class='del'>-static inline void ttm_bo_get(struct ttm_buffer_object *bo)</div><div class='del'>-{</div><div class='del'>-	kref_get(&amp;bo-&gt;kref);</div><div class='del'>-}</div><div class='add'>+struct ttm_lru_walk_arg {</div><div class='add'>+	/** @ctx: Pointer to the struct ttm_operation_ctx. */</div><div class='add'>+	struct ttm_operation_ctx *ctx;</div><div class='add'>+	/** @ticket: The struct ww_acquire_ctx if any. */</div><div class='add'>+	struct ww_acquire_ctx *ticket;</div><div class='add'>+	/** @trylock_only: Only use trylock for locking. */</div><div class='add'>+	bool trylock_only;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ttm_bo_get_unless_zero - reference a struct ttm_buffer_object unless</div><div class='del'>- * its refcount has already reached zero.</div><div class='del'>- * @bo: The buffer object.</div><div class='del'>- *</div><div class='del'>- * Used to reference a TTM buffer object in lookups where the object is removed</div><div class='del'>- * from the lookup structure during the destructor and for RCU lookups.</div><div class='del'>- *</div><div class='del'>- * Returns: @bo if the referencing was successful, NULL otherwise.</div><div class='add'>+ * struct ttm_lru_walk - Structure describing a LRU walk.</div><div class='ctx'>  */</div><div class='del'>-static inline __must_check struct ttm_buffer_object *</div><div class='del'>-ttm_bo_get_unless_zero(struct ttm_buffer_object *bo)</div><div class='del'>-{</div><div class='del'>-	if (!kref_get_unless_zero(&amp;bo-&gt;kref))</div><div class='del'>-		return NULL;</div><div class='del'>-	return bo;</div><div class='del'>-}</div><div class='add'>+struct ttm_lru_walk {</div><div class='add'>+	/** @ops: Pointer to the ops structure. */</div><div class='add'>+	const struct ttm_lru_walk_ops *ops;</div><div class='add'>+	/** @arg: Common bo LRU walk arguments. */</div><div class='add'>+	struct ttm_lru_walk_arg arg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+s64 ttm_lru_walk_for_evict(struct ttm_lru_walk *walk, struct ttm_device *bdev,</div><div class='add'>+			   struct ttm_resource_manager *man, s64 target);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ttm_bo_shrink_flags - flags to govern the bo shrinking behaviour</div><div class='add'>+ * @purge: Purge the content rather than backing it up.</div><div class='add'>+ * @writeback: Attempt to immediately write content to swap space.</div><div class='add'>+ * @allow_move: Allow moving to system before shrinking. This is typically</div><div class='add'>+ * not desired for zombie- or ghost objects (with zombie object meaning</div><div class='add'>+ * objects with a zero gem object refcount)</div><div class='add'>+ */</div><div class='add'>+struct ttm_bo_shrink_flags {</div><div class='add'>+	u32 purge : 1;</div><div class='add'>+	u32 writeback : 1;</div><div class='add'>+	u32 allow_move : 1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+long ttm_bo_shrink(struct ttm_operation_ctx *ctx, struct ttm_buffer_object *bo,</div><div class='add'>+		   const struct ttm_bo_shrink_flags flags);</div><div class='add'>+</div><div class='add'>+bool ttm_bo_shrink_suitable(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx);</div><div class='add'>+</div><div class='add'>+bool ttm_bo_shrink_avoid_wait(void);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ttm_bo_reserve:</div><div class='hunk'>@@ -264,7 +303,7 @@ static inline int ttm_bo_reserve(struct ttm_buffer_object *bo,</div><div class='ctx'>  * ttm_bo_reserve_slowpath:</div><div class='ctx'>  * @bo: A pointer to a struct ttm_buffer_object.</div><div class='ctx'>  * @interruptible: Sleep interruptible if waiting.</div><div class='del'>- * @sequence: Set (@bo)-&gt;sequence to this value after lock</div><div class='add'>+ * @ticket: Ticket used to acquire the ww_mutex.</div><div class='ctx'>  *</div><div class='ctx'>  * This is called after ttm_bo_reserve returns -EAGAIN and we backed off</div><div class='ctx'>  * from all our other reservations. Because there are no other reservations</div><div class='hunk'>@@ -303,7 +342,7 @@ static inline void ttm_bo_assign_mem(struct ttm_buffer_object *bo,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ttm_bo_move_null = assign memory for a buffer object.</div><div class='add'>+ * ttm_bo_move_null - assign memory for a buffer object.</div><div class='ctx'>  * @bo: The bo to assign the memory to</div><div class='ctx'>  * @new_mem: The memory to be assigned.</div><div class='ctx'>  *</div><div class='hunk'>@@ -352,7 +391,7 @@ int ttm_bo_wait_ctx(struct ttm_buffer_object *bo,</div><div class='ctx'> int ttm_bo_validate(struct ttm_buffer_object *bo,</div><div class='ctx'> 		    struct ttm_placement *placement,</div><div class='ctx'> 		    struct ttm_operation_ctx *ctx);</div><div class='del'>-void ttm_bo_put(struct ttm_buffer_object *bo);</div><div class='add'>+void ttm_bo_fini(struct ttm_buffer_object *bo);</div><div class='ctx'> void ttm_bo_set_bulk_move(struct ttm_buffer_object *bo,</div><div class='ctx'> 			  struct ttm_lru_bulk_move *bulk);</div><div class='ctx'> bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,</div><div class='hunk'>@@ -370,18 +409,20 @@ int ttm_bo_init_validate(struct ttm_device *bdev, struct ttm_buffer_object *bo,</div><div class='ctx'> int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page,</div><div class='ctx'> 		unsigned long num_pages, struct ttm_bo_kmap_obj *map);</div><div class='ctx'> void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map);</div><div class='add'>+void *ttm_bo_kmap_try_from_panic(struct ttm_buffer_object *bo, unsigned long page);</div><div class='ctx'> int ttm_bo_vmap(struct ttm_buffer_object *bo, struct iosys_map *map);</div><div class='ctx'> void ttm_bo_vunmap(struct ttm_buffer_object *bo, struct iosys_map *map);</div><div class='ctx'> int ttm_bo_mmap_obj(struct vm_area_struct *vma, struct ttm_buffer_object *bo);</div><div class='del'>-int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx,</div><div class='del'>-		   gfp_t gfp_flags);</div><div class='add'>+s64 ttm_bo_swapout(struct ttm_device *bdev, struct ttm_operation_ctx *ctx,</div><div class='add'>+		   struct ttm_resource_manager *man, gfp_t gfp_flags,</div><div class='add'>+		   s64 target);</div><div class='ctx'> void ttm_bo_pin(struct ttm_buffer_object *bo);</div><div class='ctx'> void ttm_bo_unpin(struct ttm_buffer_object *bo);</div><div class='del'>-int ttm_mem_evict_first(struct ttm_device *bdev,</div><div class='del'>-			struct ttm_resource_manager *man,</div><div class='del'>-			const struct ttm_place *place,</div><div class='del'>-			struct ttm_operation_ctx *ctx,</div><div class='del'>-			struct ww_acquire_ctx *ticket);</div><div class='add'>+int ttm_bo_evict_first(struct ttm_device *bdev,</div><div class='add'>+		       struct ttm_resource_manager *man,</div><div class='add'>+		       struct ttm_operation_ctx *ctx);</div><div class='add'>+int ttm_bo_access(struct ttm_buffer_object *bo, unsigned long offset,</div><div class='add'>+		  void *buf, int len, int write);</div><div class='ctx'> vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_object *bo,</div><div class='ctx'> 			     struct vm_fault *vmf);</div><div class='ctx'> vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,</div><div class='hunk'>@@ -423,5 +464,83 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo);</div><div class='ctx'> pgprot_t ttm_io_prot(struct ttm_buffer_object *bo, struct ttm_resource *res,</div><div class='ctx'> 		     pgprot_t tmp);</div><div class='ctx'> void ttm_bo_tt_destroy(struct ttm_buffer_object *bo);</div><div class='add'>+int ttm_bo_populate(struct ttm_buffer_object *bo,</div><div class='add'>+		    struct ttm_operation_ctx *ctx);</div><div class='add'>+int ttm_bo_setup_export(struct ttm_buffer_object *bo,</div><div class='add'>+			struct ttm_operation_ctx *ctx);</div><div class='add'>+</div><div class='add'>+/* Driver LRU walk helpers initially targeted for shrinking. */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ttm_bo_lru_cursor - Iterator cursor for TTM LRU list looping</div><div class='add'>+ */</div><div class='add'>+struct ttm_bo_lru_cursor {</div><div class='add'>+	/** @res_curs: Embedded struct ttm_resource_cursor. */</div><div class='add'>+	struct ttm_resource_cursor res_curs;</div><div class='add'>+	/**</div><div class='add'>+	 * @bo: Buffer object pointer if a buffer object is refcounted,</div><div class='add'>+	 * NULL otherwise.</div><div class='add'>+	 */</div><div class='add'>+	struct ttm_buffer_object *bo;</div><div class='add'>+	/**</div><div class='add'>+	 * @needs_unlock: Valid iff @bo != NULL. The bo resv needs</div><div class='add'>+	 * unlock before the next iteration or after loop exit.</div><div class='add'>+	 */</div><div class='add'>+	bool needs_unlock;</div><div class='add'>+	/** @arg: Pointer to common BO LRU walk arguments. */</div><div class='add'>+	struct ttm_lru_walk_arg *arg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ttm_bo_lru_cursor_fini(struct ttm_bo_lru_cursor *curs);</div><div class='add'>+</div><div class='add'>+struct ttm_bo_lru_cursor *</div><div class='add'>+ttm_bo_lru_cursor_init(struct ttm_bo_lru_cursor *curs,</div><div class='add'>+		       struct ttm_resource_manager *man,</div><div class='add'>+		       struct ttm_lru_walk_arg *arg);</div><div class='add'>+</div><div class='add'>+struct ttm_buffer_object *ttm_bo_lru_cursor_first(struct ttm_bo_lru_cursor *curs);</div><div class='add'>+</div><div class='add'>+struct ttm_buffer_object *ttm_bo_lru_cursor_next(struct ttm_bo_lru_cursor *curs);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Defines needed to use autocleanup (linux/cleanup.h) with struct ttm_bo_lru_cursor.</div><div class='add'>+ */</div><div class='add'>+DEFINE_CLASS(ttm_bo_lru_cursor, struct ttm_bo_lru_cursor *,</div><div class='add'>+	     if (_T) {ttm_bo_lru_cursor_fini(_T); },</div><div class='add'>+	     ttm_bo_lru_cursor_init(curs, man, arg),</div><div class='add'>+	     struct ttm_bo_lru_cursor *curs, struct ttm_resource_manager *man,</div><div class='add'>+	     struct ttm_lru_walk_arg *arg);</div><div class='add'>+static inline void *</div><div class='add'>+class_ttm_bo_lru_cursor_lock_ptr(class_ttm_bo_lru_cursor_t *_T)</div><div class='add'>+{ return *_T; }</div><div class='add'>+#define class_ttm_bo_lru_cursor_is_conditional false</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ttm_bo_lru_for_each_reserved_guarded() - Iterate over buffer objects owning</div><div class='add'>+ * resources on LRU lists.</div><div class='add'>+ * @_cursor: struct ttm_bo_lru_cursor to use for the iteration.</div><div class='add'>+ * @_man: The resource manager whose LRU lists to iterate over.</div><div class='add'>+ * @_arg: The struct ttm_lru_walk_arg to govern the LRU walk.</div><div class='add'>+ * @_bo: The struct ttm_buffer_object pointer pointing to the buffer object</div><div class='add'>+ * for the current iteration.</div><div class='add'>+ *</div><div class='add'>+ * Iterate over all resources of @_man and for each resource, attempt to</div><div class='add'>+ * reference and lock (using the locking mode detailed in @_ctx) the buffer</div><div class='add'>+ * object it points to. If successful, assign @_bo to the address of the</div><div class='add'>+ * buffer object and update @_cursor. The iteration is guarded in the</div><div class='add'>+ * sense that @_cursor will be initialized before looping start and cleaned</div><div class='add'>+ * up at looping termination, even if terminated prematurely by, for</div><div class='add'>+ * example a return or break statement. Exiting the loop will also unlock</div><div class='add'>+ * (if needed) and unreference @_bo.</div><div class='add'>+ *</div><div class='add'>+ * Return: If locking of a bo returns an error, then iteration is terminated</div><div class='add'>+ * and @_bo is set to a corresponding error pointer. It's illegal to</div><div class='add'>+ * dereference @_bo after loop exit.</div><div class='add'>+ */</div><div class='add'>+#define ttm_bo_lru_for_each_reserved_guarded(_cursor, _man, _arg, _bo)	\</div><div class='add'>+	scoped_guard(ttm_bo_lru_cursor, _cursor, _man, _arg)		\</div><div class='add'>+		for ((_bo) = ttm_bo_lru_cursor_first(_cursor);		\</div><div class='add'>+		       !IS_ERR_OR_NULL(_bo);				\</div><div class='add'>+		       (_bo) = ttm_bo_lru_cursor_next(_cursor))</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/ttm/ttm_caching.h b/include/drm/ttm/ttm_caching.h<br/>index 235a743d90e1..a18f43e93aba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_caching.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_caching.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_caching.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_caching.h</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> #ifndef _TTM_CACHING_H_</div><div class='ctx'> #define _TTM_CACHING_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='add'>+</div><div class='ctx'> #define TTM_NUM_CACHING_TYPES	3</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h<br/>index c22f30535c84..5618aef462f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_device.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_device.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;drm/ttm/ttm_allocation.h&gt;</div><div class='ctx'> #include &lt;drm/ttm/ttm_resource.h&gt;</div><div class='ctx'> #include &lt;drm/ttm/ttm_pool.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -220,6 +221,11 @@ struct ttm_device {</div><div class='ctx'> 	struct list_head device_list;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @alloc_flags: TTM_ALLOCATION_* flags.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int alloc_flags;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @funcs: Function table for the device.</div><div class='ctx'> 	 * Constant after bo device init</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -252,9 +258,10 @@ struct ttm_device {</div><div class='ctx'> 	spinlock_t lru_lock;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @pinned: Buffer objects which are pinned and so not on any LRU list.</div><div class='add'>+	 * @unevictable: Buffer objects which are pinned or swapped and as such</div><div class='add'>+	 * not on an LRU list.</div><div class='ctx'> 	 */</div><div class='del'>-	struct list_head pinned;</div><div class='add'>+	struct list_head unevictable;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @dev_mapping: A pointer to the struct address_space for invalidating</div><div class='hunk'>@@ -271,6 +278,7 @@ struct ttm_device {</div><div class='ctx'> int ttm_global_swapout(struct ttm_operation_ctx *ctx, gfp_t gfp_flags);</div><div class='ctx'> int ttm_device_swapout(struct ttm_device *bdev, struct ttm_operation_ctx *ctx,</div><div class='ctx'> 		       gfp_t gfp_flags);</div><div class='add'>+int ttm_device_prepare_hibernation(struct ttm_device *bdev);</div><div class='ctx'> </div><div class='ctx'> static inline struct ttm_resource_manager *</div><div class='ctx'> ttm_manager_type(struct ttm_device *bdev, int mem_type)</div><div class='hunk'>@@ -290,7 +298,7 @@ static inline void ttm_set_driver_manager(struct ttm_device *bdev, int type,</div><div class='ctx'> int ttm_device_init(struct ttm_device *bdev, const struct ttm_device_funcs *funcs,</div><div class='ctx'> 		    struct device *dev, struct address_space *mapping,</div><div class='ctx'> 		    struct drm_vma_offset_manager *vma_manager,</div><div class='del'>-		    bool use_dma_alloc, bool use_dma32);</div><div class='add'>+		    unsigned int alloc_flags);</div><div class='ctx'> void ttm_device_fini(struct ttm_device *bdev);</div><div class='ctx'> void ttm_device_clear_dma_mappings(struct ttm_device *bdev);</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h<br/>index 03aca29d3ce4..fac1e3e57ebd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_execbuf_util.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_execbuf_util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_execbuf_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_execbuf_util.h</a></div><div class='hunk'>@@ -52,7 +52,7 @@ struct ttm_validate_buffer {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * function ttm_eu_backoff_reservation</div><div class='add'>+ * ttm_eu_backoff_reservation</div><div class='ctx'>  *</div><div class='ctx'>  * @ticket:   ww_acquire_ctx from reserve call</div><div class='ctx'>  * @list:     thread private list of ttm_validate_buffer structs.</div><div class='hunk'>@@ -64,14 +64,13 @@ void ttm_eu_backoff_reservation(struct ww_acquire_ctx *ticket,</div><div class='ctx'> 				struct list_head *list);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * function ttm_eu_reserve_buffers</div><div class='add'>+ * ttm_eu_reserve_buffers</div><div class='ctx'>  *</div><div class='ctx'>  * @ticket:  [out] ww_acquire_ctx filled in by call, or NULL if only</div><div class='ctx'>  *           non-blocking reserves should be tried.</div><div class='ctx'>  * @list:    thread private list of ttm_validate_buffer structs.</div><div class='ctx'>  * @intr:    should the wait be interruptible</div><div class='ctx'>  * @dups:    [out] optional list of duplicates.</div><div class='del'>- * @del_lru: true if BOs should be removed from the LRU.</div><div class='ctx'>  *</div><div class='ctx'>  * Tries to reserve bos pointed to by the list entries for validation.</div><div class='ctx'>  * If the function returns 0, all buffers are marked as "unfenced",</div><div class='hunk'>@@ -102,7 +101,7 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,</div><div class='ctx'> 			   struct list_head *dups);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * function ttm_eu_fence_buffer_objects.</div><div class='add'>+ * ttm_eu_fence_buffer_objects</div><div class='ctx'>  *</div><div class='ctx'>  * @ticket:      ww_acquire_ctx from reserve call</div><div class='ctx'>  * @list:        thread private list of ttm_validate_buffer structs.</div><div class='head'>diff --git a/include/drm/ttm/ttm_kmap_iter.h b/include/drm/ttm/ttm_kmap_iter.h<br/>index cc5c09a211b4..fe72631a6e93 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_kmap_iter.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_kmap_iter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_kmap_iter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_kmap_iter.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@ struct iosys_map;</div><div class='ctx'>  */</div><div class='ctx'> struct ttm_kmap_iter_ops {</div><div class='ctx'> 	/**</div><div class='del'>-	 * kmap_local() - Map a PAGE_SIZE part of the resource using</div><div class='add'>+	 * @map_local: Map a PAGE_SIZE part of the resource using</div><div class='ctx'> 	 * kmap_local semantics.</div><div class='ctx'> 	 * @res_iter: Pointer to the struct ttm_kmap_iter representing</div><div class='ctx'> 	 * the resource.</div><div class='hunk'>@@ -31,7 +31,7 @@ struct ttm_kmap_iter_ops {</div><div class='ctx'> 	void (*map_local)(struct ttm_kmap_iter *res_iter,</div><div class='ctx'> 			  struct iosys_map *dmap, pgoff_t i);</div><div class='ctx'> 	/**</div><div class='del'>-	 * unmap_local() - Unmap a PAGE_SIZE part of the resource previously</div><div class='add'>+	 * @unmap_local: Unmap a PAGE_SIZE part of the resource previously</div><div class='ctx'> 	 * mapped using kmap_local.</div><div class='ctx'> 	 * @res_iter: Pointer to the struct ttm_kmap_iter representing</div><div class='ctx'> 	 * the resource.</div><div class='head'>diff --git a/include/drm/ttm/ttm_placement.h b/include/drm/ttm/ttm_placement.h<br/>index 8074d0f6cae5..b510a4812609 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_placement.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_placement.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_placement.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_placement.h</a></div><div class='hunk'>@@ -64,6 +64,12 @@</div><div class='ctx'> /* For multihop handling */</div><div class='ctx'> #define TTM_PL_FLAG_TEMPORARY   (1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='add'>+/* Placement is never used during eviction */</div><div class='add'>+#define TTM_PL_FLAG_DESIRED	(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='add'>+/* Placement is only used during eviction */</div><div class='add'>+#define TTM_PL_FLAG_FALLBACK	(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct ttm_place</div><div class='ctx'>  *</div><div class='hunk'>@@ -86,16 +92,12 @@ struct ttm_place {</div><div class='ctx'>  *</div><div class='ctx'>  * @num_placement:	number of preferred placements</div><div class='ctx'>  * @placement:		preferred placements</div><div class='del'>- * @num_busy_placement:	number of preferred placements when need to evict buffer</div><div class='del'>- * @busy_placement:	preferred placements when need to evict buffer</div><div class='ctx'>  *</div><div class='ctx'>  * Structure indicating the placement you request for an object.</div><div class='ctx'>  */</div><div class='ctx'> struct ttm_placement {</div><div class='ctx'> 	unsigned		num_placement;</div><div class='ctx'> 	const struct ttm_place	*placement;</div><div class='del'>-	unsigned		num_busy_placement;</div><div class='del'>-	const struct ttm_place	*busy_placement;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/drm/ttm/ttm_pool.h b/include/drm/ttm/ttm_pool.h<br/>index 4490d43c63e3..233581670e78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_pool.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_pool.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_pool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_pool.h</a></div><div class='hunk'>@@ -32,9 +32,11 @@</div><div class='ctx'> #include &lt;drm/ttm/ttm_caching.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='del'>-struct ttm_tt;</div><div class='del'>-struct ttm_pool;</div><div class='add'>+struct seq_file;</div><div class='add'>+struct ttm_backup_flags;</div><div class='ctx'> struct ttm_operation_ctx;</div><div class='add'>+struct ttm_pool;</div><div class='add'>+struct ttm_tt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ttm_pool_type - Pool for a certain memory type</div><div class='hunk'>@@ -62,16 +64,14 @@ struct ttm_pool_type {</div><div class='ctx'>  *</div><div class='ctx'>  * @dev: the device we allocate pages for</div><div class='ctx'>  * @nid: which numa node to use</div><div class='del'>- * @use_dma_alloc: if coherent DMA allocations should be used</div><div class='del'>- * @use_dma32: if GFP_DMA32 should be used</div><div class='add'>+ * @alloc_flags: TTM_ALLOCATION_POOL_* flags</div><div class='ctx'>  * @caching: pools for each caching/order</div><div class='ctx'>  */</div><div class='ctx'> struct ttm_pool {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	int nid;</div><div class='ctx'> </div><div class='del'>-	bool use_dma_alloc;</div><div class='del'>-	bool use_dma32;</div><div class='add'>+	unsigned int alloc_flags;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct ttm_pool_type orders[NR_PAGE_ORDERS];</div><div class='hunk'>@@ -83,11 +83,18 @@ int ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt,</div><div class='ctx'> void ttm_pool_free(struct ttm_pool *pool, struct ttm_tt *tt);</div><div class='ctx'> </div><div class='ctx'> void ttm_pool_init(struct ttm_pool *pool, struct device *dev,</div><div class='del'>-		   int nid, bool use_dma_alloc, bool use_dma32);</div><div class='add'>+		   int nid, unsigned int alloc_flags);</div><div class='ctx'> void ttm_pool_fini(struct ttm_pool *pool);</div><div class='ctx'> </div><div class='ctx'> int ttm_pool_debugfs(struct ttm_pool *pool, struct seq_file *m);</div><div class='ctx'> </div><div class='add'>+void ttm_pool_drop_backed_up(struct ttm_tt *tt);</div><div class='add'>+</div><div class='add'>+long ttm_pool_backup(struct ttm_pool *pool, struct ttm_tt *ttm,</div><div class='add'>+		     const struct ttm_backup_flags *flags);</div><div class='add'>+int ttm_pool_restore_and_alloc(struct ttm_pool *pool, struct ttm_tt *tt,</div><div class='add'>+			       const struct ttm_operation_ctx *ctx);</div><div class='add'>+</div><div class='ctx'> int ttm_pool_mgr_init(unsigned long num_pages);</div><div class='ctx'> void ttm_pool_mgr_fini(void);</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/ttm/ttm_resource.h b/include/drm/ttm/ttm_resource.h<br/>index 78a226eba953..33e80f30b8b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_resource.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_resource.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_resource.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_resource.h</a></div><div class='hunk'>@@ -31,13 +31,15 @@</div><div class='ctx'> #include &lt;linux/iosys-map.h&gt;</div><div class='ctx'> #include &lt;linux/dma-fence.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;drm/drm_print.h&gt;</div><div class='ctx'> #include &lt;drm/ttm/ttm_caching.h&gt;</div><div class='ctx'> #include &lt;drm/ttm/ttm_kmap_iter.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TTM_MAX_BO_PRIORITY	4U</div><div class='del'>-#define TTM_NUM_MEM_TYPES 8</div><div class='add'>+#define TTM_NUM_MEM_TYPES 9</div><div class='ctx'> </div><div class='add'>+struct dentry;</div><div class='add'>+struct dmem_cgroup_device;</div><div class='add'>+struct drm_printer;</div><div class='ctx'> struct ttm_device;</div><div class='ctx'> struct ttm_resource_manager;</div><div class='ctx'> struct ttm_resource;</div><div class='hunk'>@@ -49,6 +51,52 @@ struct io_mapping;</div><div class='ctx'> struct sg_table;</div><div class='ctx'> struct scatterlist;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * define TTM_NUM_MOVE_FENCES - How many entities can be used for evictions</div><div class='add'>+ *</div><div class='add'>+ * Pipelined evictions can be spread on multiple entities. This</div><div class='add'>+ * is the max number of entities that can be used by the driver</div><div class='add'>+ * for that purpose.</div><div class='add'>+ */</div><div class='add'>+#define TTM_NUM_MOVE_FENCES 8</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ttm_lru_item_type - enumerate ttm_lru_item subclasses</div><div class='add'>+ */</div><div class='add'>+enum ttm_lru_item_type {</div><div class='add'>+	/** @TTM_LRU_RESOURCE: The resource subclass */</div><div class='add'>+	TTM_LRU_RESOURCE,</div><div class='add'>+	/** @TTM_LRU_HITCH: The iterator hitch subclass */</div><div class='add'>+	TTM_LRU_HITCH</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ttm_lru_item - The TTM lru list node base class</div><div class='add'>+ * @link: The list link</div><div class='add'>+ * @type: The subclass type</div><div class='add'>+ */</div><div class='add'>+struct ttm_lru_item {</div><div class='add'>+	struct list_head link;</div><div class='add'>+	enum ttm_lru_item_type type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ttm_lru_item_init() - initialize a struct ttm_lru_item</div><div class='add'>+ * @item: The item to initialize</div><div class='add'>+ * @type: The subclass type</div><div class='add'>+ */</div><div class='add'>+static inline void ttm_lru_item_init(struct ttm_lru_item *item,</div><div class='add'>+				     enum ttm_lru_item_type type)</div><div class='add'>+{</div><div class='add'>+	item-&gt;type = type;</div><div class='add'>+	INIT_LIST_HEAD(&amp;item-&gt;link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ttm_lru_item_is_res(const struct ttm_lru_item *item)</div><div class='add'>+{</div><div class='add'>+	return item-&gt;type == TTM_LRU_RESOURCE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct ttm_resource_manager_func {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * struct ttm_resource_manager_func member alloc</div><div class='hunk'>@@ -142,8 +190,8 @@ struct ttm_resource_manager_func {</div><div class='ctx'>  * @size: Size of the managed region.</div><div class='ctx'>  * @bdev: ttm device this manager belongs to</div><div class='ctx'>  * @func: structure pointer implementing the range manager. See above</div><div class='del'>- * @move_lock: lock for move fence</div><div class='del'>- * @move: The fence of the last pipelined move operation.</div><div class='add'>+ * @eviction_lock: lock for eviction fences</div><div class='add'>+ * @eviction_fences: The fences of the last pipelined move operation.</div><div class='ctx'>  * @lru: The lru list for this memory type.</div><div class='ctx'>  *</div><div class='ctx'>  * This structure is used to identify and manage memory types for a device.</div><div class='hunk'>@@ -157,12 +205,12 @@ struct ttm_resource_manager {</div><div class='ctx'> 	struct ttm_device *bdev;</div><div class='ctx'> 	uint64_t size;</div><div class='ctx'> 	const struct ttm_resource_manager_func *func;</div><div class='del'>-	spinlock_t move_lock;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Protected by @move_lock.</div><div class='add'>+	/* This is very similar to a dma_resv object, but locking rules make</div><div class='add'>+	 * it difficult to use one in this context.</div><div class='ctx'> 	 */</div><div class='del'>-	struct dma_fence *move;</div><div class='add'>+	spinlock_t eviction_lock;</div><div class='add'>+	struct dma_fence *eviction_fences[TTM_NUM_MOVE_FENCES];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Protected by the bdev-&gt;lru_lock.</div><div class='hunk'>@@ -174,6 +222,11 @@ struct ttm_resource_manager {</div><div class='ctx'> 	 * bdev-&gt;lru_lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	uint64_t usage;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @cg: &amp;dmem_cgroup_region used for memory accounting, if not NULL.</div><div class='add'>+	 */</div><div class='add'>+	struct dmem_cgroup_region *cg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -202,6 +255,7 @@ struct ttm_bus_placement {</div><div class='ctx'>  * @placement: Placement flags.</div><div class='ctx'>  * @bus: Placement on io bus accessible to the CPU</div><div class='ctx'>  * @bo: weak reference to the BO, protected by ttm_device::lru_lock</div><div class='add'>+ * @css: cgroup state this resource is charged to</div><div class='ctx'>  *</div><div class='ctx'>  * Structure indicating the placement and space resources used by a</div><div class='ctx'>  * buffer object.</div><div class='hunk'>@@ -214,22 +268,25 @@ struct ttm_resource {</div><div class='ctx'> 	struct ttm_bus_placement bus;</div><div class='ctx'> 	struct ttm_buffer_object *bo;</div><div class='ctx'> </div><div class='add'>+	struct dmem_cgroup_pool_state *css;</div><div class='add'>+</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @lru: Least recently used list, see &amp;ttm_resource_manager.lru</div><div class='ctx'> 	 */</div><div class='del'>-	struct list_head lru;</div><div class='add'>+	struct ttm_lru_item lru;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct ttm_resource_cursor</div><div class='del'>- *</div><div class='del'>- * @priority: the current priority</div><div class='add'>+ * ttm_lru_item_to_res() - Downcast a struct ttm_lru_item to a struct ttm_resource</div><div class='add'>+ * @item: The struct ttm_lru_item to downcast</div><div class='ctx'>  *</div><div class='del'>- * Cursor to iterate over the resources in a manager.</div><div class='add'>+ * Return: Pointer to the embedding struct ttm_resource</div><div class='ctx'>  */</div><div class='del'>-struct ttm_resource_cursor {</div><div class='del'>-	unsigned int priority;</div><div class='del'>-};</div><div class='add'>+static inline struct ttm_resource *</div><div class='add'>+ttm_lru_item_to_res(struct ttm_lru_item *item)</div><div class='add'>+{</div><div class='add'>+	return container_of(item, struct ttm_resource, lru);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ttm_lru_bulk_move_pos</div><div class='hunk'>@@ -246,17 +303,53 @@ struct ttm_lru_bulk_move_pos {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ttm_lru_bulk_move</div><div class='del'>- *</div><div class='ctx'>  * @pos: first/last lru entry for resources in the each domain/priority</div><div class='add'>+ * @cursor_list: The list of cursors currently traversing any of</div><div class='add'>+ * the sublists of @pos. Protected by the ttm device's lru_lock.</div><div class='ctx'>  *</div><div class='ctx'>  * Container for the current bulk move state. Should be used with</div><div class='ctx'>  * ttm_lru_bulk_move_init() and ttm_bo_set_bulk_move().</div><div class='add'>+ * All BOs in a bulk_move structure need to share the same reservation object to</div><div class='add'>+ * ensure that the bulk as a whole is locked for eviction even if only one BO of</div><div class='add'>+ * the bulk is evicted.</div><div class='ctx'>  */</div><div class='ctx'> struct ttm_lru_bulk_move {</div><div class='ctx'> 	struct ttm_lru_bulk_move_pos pos[TTM_NUM_MEM_TYPES][TTM_MAX_BO_PRIORITY];</div><div class='add'>+	struct list_head cursor_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct ttm_resource_cursor</div><div class='add'>+ * @man: The resource manager currently being iterated over</div><div class='add'>+ * @hitch: A hitch list node inserted before the next resource</div><div class='add'>+ * to iterate over.</div><div class='add'>+ * @bulk_link: A list link for the list of cursors traversing the</div><div class='add'>+ * bulk sublist of @bulk. Protected by the ttm device's lru_lock.</div><div class='add'>+ * @bulk: Pointer to struct ttm_lru_bulk_move whose subrange @hitch is</div><div class='add'>+ * inserted to. NULL if none. Never dereference this pointer since</div><div class='add'>+ * the struct ttm_lru_bulk_move object pointed to might have been</div><div class='add'>+ * freed. The pointer is only for comparison.</div><div class='add'>+ * @mem_type: The memory type of the LRU list being traversed.</div><div class='add'>+ * This field is valid iff @bulk != NULL.</div><div class='add'>+ * @priority: the current priority</div><div class='add'>+ *</div><div class='add'>+ * Cursor to iterate over the resources in a manager.</div><div class='add'>+ */</div><div class='add'>+struct ttm_resource_cursor {</div><div class='add'>+	struct ttm_resource_manager *man;</div><div class='add'>+	struct ttm_lru_item hitch;</div><div class='add'>+	struct list_head bulk_link;</div><div class='add'>+	struct ttm_lru_bulk_move *bulk;</div><div class='add'>+	unsigned int mem_type;</div><div class='add'>+	unsigned int priority;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ttm_resource_cursor_init(struct ttm_resource_cursor *cursor,</div><div class='add'>+			      struct ttm_resource_manager *man);</div><div class='add'>+</div><div class='add'>+void ttm_resource_cursor_fini(struct ttm_resource_cursor *cursor);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct ttm_kmap_iter_iomap - Specialization for a struct io_mapping +</div><div class='ctx'>  * struct sg_table backed struct ttm_resource.</div><div class='ctx'>  * @base: Embedded struct ttm_kmap_iter providing the usage interface.</div><div class='hunk'>@@ -338,12 +431,18 @@ static inline bool ttm_resource_manager_used(struct ttm_resource_manager *man)</div><div class='ctx'> static inline void</div><div class='ctx'> ttm_resource_manager_cleanup(struct ttm_resource_manager *man)</div><div class='ctx'> {</div><div class='del'>-	dma_fence_put(man-&gt;move);</div><div class='del'>-	man-&gt;move = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TTM_NUM_MOVE_FENCES; i++) {</div><div class='add'>+		dma_fence_put(man-&gt;eviction_fences[i]);</div><div class='add'>+		man-&gt;eviction_fences[i] = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ttm_lru_bulk_move_init(struct ttm_lru_bulk_move *bulk);</div><div class='ctx'> void ttm_lru_bulk_move_tail(struct ttm_lru_bulk_move *bulk);</div><div class='add'>+void ttm_lru_bulk_move_fini(struct ttm_device *bdev,</div><div class='add'>+			    struct ttm_lru_bulk_move *bulk);</div><div class='ctx'> </div><div class='ctx'> void ttm_resource_add_bulk_move(struct ttm_resource *res,</div><div class='ctx'> 				struct ttm_buffer_object *bo);</div><div class='hunk'>@@ -359,18 +458,16 @@ void ttm_resource_fini(struct ttm_resource_manager *man,</div><div class='ctx'> </div><div class='ctx'> int ttm_resource_alloc(struct ttm_buffer_object *bo,</div><div class='ctx'> 		       const struct ttm_place *place,</div><div class='del'>-		       struct ttm_resource **res);</div><div class='add'>+		       struct ttm_resource **res,</div><div class='add'>+		       struct dmem_cgroup_pool_state **ret_limit_pool);</div><div class='ctx'> void ttm_resource_free(struct ttm_buffer_object *bo, struct ttm_resource **res);</div><div class='ctx'> bool ttm_resource_intersects(struct ttm_device *bdev,</div><div class='ctx'> 			     struct ttm_resource *res,</div><div class='ctx'> 			     const struct ttm_place *place,</div><div class='ctx'> 			     size_t size);</div><div class='del'>-bool ttm_resource_compatible(struct ttm_device *bdev,</div><div class='del'>-			     struct ttm_resource *res,</div><div class='del'>-			     const struct ttm_place *place,</div><div class='del'>-			     size_t size);</div><div class='del'>-bool ttm_resource_compat(struct ttm_resource *res,</div><div class='del'>-			 struct ttm_placement *placement);</div><div class='add'>+bool ttm_resource_compatible(struct ttm_resource *res,</div><div class='add'>+			     struct ttm_placement *placement,</div><div class='add'>+			     bool evicting);</div><div class='ctx'> void ttm_resource_set_bo(struct ttm_resource *res,</div><div class='ctx'> 			 struct ttm_buffer_object *bo);</div><div class='ctx'> </div><div class='hunk'>@@ -386,24 +483,23 @@ void ttm_resource_manager_debug(struct ttm_resource_manager *man,</div><div class='ctx'> 				struct drm_printer *p);</div><div class='ctx'> </div><div class='ctx'> struct ttm_resource *</div><div class='del'>-ttm_resource_manager_first(struct ttm_resource_manager *man,</div><div class='del'>-			   struct ttm_resource_cursor *cursor);</div><div class='add'>+ttm_resource_manager_first(struct ttm_resource_cursor *cursor);</div><div class='add'>+struct ttm_resource *</div><div class='add'>+ttm_resource_manager_next(struct ttm_resource_cursor *cursor);</div><div class='add'>+</div><div class='ctx'> struct ttm_resource *</div><div class='del'>-ttm_resource_manager_next(struct ttm_resource_manager *man,</div><div class='del'>-			  struct ttm_resource_cursor *cursor,</div><div class='del'>-			  struct ttm_resource *res);</div><div class='add'>+ttm_lru_first_res_or_null(struct list_head *head);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ttm_resource_manager_for_each_res - iterate over all resources</div><div class='del'>- * @man: the resource manager</div><div class='ctx'>  * @cursor: struct ttm_resource_cursor for the current position</div><div class='ctx'>  * @res: the current resource</div><div class='ctx'>  *</div><div class='ctx'>  * Iterate over all the evictable resources in a resource manager.</div><div class='ctx'>  */</div><div class='del'>-#define ttm_resource_manager_for_each_res(man, cursor, res)		\</div><div class='del'>-	for (res = ttm_resource_manager_first(man, cursor); res;	\</div><div class='del'>-	     res = ttm_resource_manager_next(man, cursor, res))</div><div class='add'>+#define ttm_resource_manager_for_each_res(cursor, res)	\</div><div class='add'>+	for (res = ttm_resource_manager_first(cursor); res;	\</div><div class='add'>+	     res = ttm_resource_manager_next(cursor))</div><div class='ctx'> </div><div class='ctx'> struct ttm_kmap_iter *</div><div class='ctx'> ttm_kmap_iter_iomap_init(struct ttm_kmap_iter_iomap *iter_io,</div><div class='head'>diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h<br/>index a4eff85b1f44..406437ad674b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_tt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/ttm/ttm_tt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/drm/ttm/ttm_tt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/drm/ttm/ttm_tt.h</a></div><div class='hunk'>@@ -32,11 +32,13 @@</div><div class='ctx'> #include &lt;drm/ttm/ttm_caching.h&gt;</div><div class='ctx'> #include &lt;drm/ttm/ttm_kmap_iter.h&gt;</div><div class='ctx'> </div><div class='add'>+struct ttm_backup;</div><div class='ctx'> struct ttm_device;</div><div class='ctx'> struct ttm_tt;</div><div class='ctx'> struct ttm_resource;</div><div class='ctx'> struct ttm_buffer_object;</div><div class='ctx'> struct ttm_operation_ctx;</div><div class='add'>+struct ttm_pool_tt_restore;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ttm_tt - This is a structure holding the pages, caching- and aperture</div><div class='hunk'>@@ -79,16 +81,28 @@ struct ttm_tt {</div><div class='ctx'> 	 *   page_flags = TTM_TT_FLAG_EXTERNAL |</div><div class='ctx'> 	 *		  TTM_TT_FLAG_EXTERNAL_MAPPABLE;</div><div class='ctx'> 	 *</div><div class='add'>+	 * TTM_TT_FLAG_DECRYPTED: The mapped ttm pages should be marked as</div><div class='add'>+	 * not encrypted. The framework will try to match what the dma layer</div><div class='add'>+	 * is doing, but note that it is a little fragile because ttm page</div><div class='add'>+	 * fault handling abuses the DMA api a bit and dma_map_attrs can't be</div><div class='add'>+	 * used to assure pgprot always matches.</div><div class='add'>+	 *</div><div class='add'>+	 * TTM_TT_FLAG_BACKED_UP: TTM internal only. This is set if the</div><div class='add'>+	 * struct ttm_tt has been (possibly partially) backed up.</div><div class='add'>+	 *</div><div class='ctx'> 	 * TTM_TT_FLAG_PRIV_POPULATED: TTM internal only. DO NOT USE. This is</div><div class='ctx'> 	 * set by TTM after ttm_tt_populate() has successfully returned, and is</div><div class='ctx'> 	 * then unset when TTM calls ttm_tt_unpopulate().</div><div class='add'>+	 *</div><div class='ctx'> 	 */</div><div class='ctx'> #define TTM_TT_FLAG_SWAPPED		BIT(0)</div><div class='ctx'> #define TTM_TT_FLAG_ZERO_ALLOC		BIT(1)</div><div class='ctx'> #define TTM_TT_FLAG_EXTERNAL		BIT(2)</div><div class='ctx'> #define TTM_TT_FLAG_EXTERNAL_MAPPABLE	BIT(3)</div><div class='add'>+#define TTM_TT_FLAG_DECRYPTED		BIT(4)</div><div class='add'>+#define TTM_TT_FLAG_BACKED_UP	        BIT(5)</div><div class='ctx'> </div><div class='del'>-#define TTM_TT_FLAG_PRIV_POPULATED	BIT(4)</div><div class='add'>+#define TTM_TT_FLAG_PRIV_POPULATED	BIT(6)</div><div class='ctx'> 	uint32_t page_flags;</div><div class='ctx'> 	/** @num_pages: Number of pages in the page array. */</div><div class='ctx'> 	uint32_t num_pages;</div><div class='hunk'>@@ -99,10 +113,19 @@ struct ttm_tt {</div><div class='ctx'> 	/** @swap_storage: Pointer to shmem struct file for swap storage. */</div><div class='ctx'> 	struct file *swap_storage;</div><div class='ctx'> 	/**</div><div class='add'>+	 * @backup: Pointer to backup struct for backed up tts.</div><div class='add'>+	 * Could be unified with @swap_storage. Meanwhile, the driver's</div><div class='add'>+	 * ttm_tt_create() callback is responsible for assigning</div><div class='add'>+	 * this field.</div><div class='add'>+	 */</div><div class='add'>+	struct file *backup;</div><div class='add'>+	/**</div><div class='ctx'> 	 * @caching: The current caching state of the pages, see enum</div><div class='ctx'> 	 * ttm_caching.</div><div class='ctx'> 	 */</div><div class='ctx'> 	enum ttm_caching caching;</div><div class='add'>+	/** @restore: Partial restoration from backup state. TTM private */</div><div class='add'>+	struct ttm_pool_tt_restore *restore;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -123,6 +146,40 @@ static inline bool ttm_tt_is_populated(struct ttm_tt *tt)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ttm_tt_is_swapped() - Whether the ttm_tt is swapped out or backed up</div><div class='add'>+ * @tt: The struct ttm_tt.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if swapped or backed up, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool ttm_tt_is_swapped(const struct ttm_tt *tt)</div><div class='add'>+{</div><div class='add'>+	return tt-&gt;page_flags &amp; (TTM_TT_FLAG_SWAPPED | TTM_TT_FLAG_BACKED_UP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ttm_tt_is_backed_up() - Whether the ttm_tt backed up</div><div class='add'>+ * @tt: The struct ttm_tt.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if swapped or backed up, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool ttm_tt_is_backed_up(const struct ttm_tt *tt)</div><div class='add'>+{</div><div class='add'>+	return tt-&gt;page_flags &amp; TTM_TT_FLAG_BACKED_UP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ttm_tt_clear_backed_up() - Clear the ttm_tt backed-up status</div><div class='add'>+ * @tt: The struct ttm_tt.</div><div class='add'>+ *</div><div class='add'>+ * Drivers can use this functionto clear the backed-up status,</div><div class='add'>+ * for example before destroying or re-validating a purged tt.</div><div class='add'>+ */</div><div class='add'>+static inline void ttm_tt_clear_backed_up(struct ttm_tt *tt)</div><div class='add'>+{</div><div class='add'>+	tt-&gt;page_flags &amp;= ~TTM_TT_FLAG_BACKED_UP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ttm_tt_create</div><div class='ctx'>  *</div><div class='ctx'>  * @bo: pointer to a struct ttm_buffer_object</div><div class='hunk'>@@ -223,6 +280,26 @@ void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages);</div><div class='ctx'> struct ttm_kmap_iter *ttm_kmap_iter_tt_init(struct ttm_kmap_iter_tt *iter_tt,</div><div class='ctx'> 					    struct ttm_tt *tt);</div><div class='ctx'> unsigned long ttm_tt_pages_limit(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ttm_backup_flags - Flags to govern backup behaviour.</div><div class='add'>+ * @purge: Free pages without backing up. Bypass pools.</div><div class='add'>+ * @writeback: Attempt to copy contents directly to swap space, even</div><div class='add'>+ * if that means blocking on writes to external memory.</div><div class='add'>+ */</div><div class='add'>+struct ttm_backup_flags {</div><div class='add'>+	u32 purge : 1;</div><div class='add'>+	u32 writeback : 1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+long ttm_tt_backup(struct ttm_device *bdev, struct ttm_tt *tt,</div><div class='add'>+		   const struct ttm_backup_flags flags);</div><div class='add'>+</div><div class='add'>+int ttm_tt_restore(struct ttm_device *bdev, struct ttm_tt *tt,</div><div class='add'>+		   const struct ttm_operation_ctx *ctx);</div><div class='add'>+</div><div class='add'>+int ttm_tt_setup_backup(struct ttm_tt *tt);</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_AGP)</div><div class='ctx'> #include &lt;linux/agp_backend.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/drm/xe_pciids.h b/include/drm/xe_pciids.h<br/>deleted file mode 100644<br/>index de1a344737bc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/drm/xe_pciids.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/drm/xe_pciids.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,190 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: MIT */</div><div class='del'>-/*</div><div class='del'>- * Copyright © 2022 Intel Corporation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _XE_PCIIDS_H_</div><div class='del'>-#define _XE_PCIIDS_H_</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Lists below can be turned into initializers for a struct pci_device_id</div><div class='del'>- * by defining INTEL_VGA_DEVICE:</div><div class='del'>- *</div><div class='del'>- * #define INTEL_VGA_DEVICE(id, info) { \</div><div class='del'>- *	0x8086, id,			\</div><div class='del'>- *	~0, ~0,				\</div><div class='del'>- *	0x030000, 0xff0000,		\</div><div class='del'>- *	(unsigned long) info }</div><div class='del'>- *</div><div class='del'>- * And then calling like:</div><div class='del'>- *</div><div class='del'>- * XE_TGL_12_GT1_IDS(INTEL_VGA_DEVICE, ## __VA_ARGS__)</div><div class='del'>- *</div><div class='del'>- * To turn them into something else, just provide a different macro passed as</div><div class='del'>- * first argument.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* TGL */</div><div class='del'>-#define XE_TGL_GT1_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x9A60, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9A68, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9A70, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_TGL_GT2_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x9A40, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9A49, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9A59, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9A78, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9AC0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9AC9, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9AD9, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x9AF8, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_TGL_IDS(MACRO__, ...)		\</div><div class='del'>-	XE_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__),\</div><div class='del'>-	XE_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* RKL */</div><div class='del'>-#define XE_RKL_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x4C80, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4C8A, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4C8B, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4C8C, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4C90, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4C9A, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* DG1 */</div><div class='del'>-#define XE_DG1_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x4905, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4906, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4907, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4908, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4909, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* ADL-S */</div><div class='del'>-#define XE_ADLS_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x4680, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4682, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4688, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x468A, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x468B, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4690, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4692, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4693, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* ADL-P */</div><div class='del'>-#define XE_ADLP_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x46A0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46A1, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46A2, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46A3, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46A6, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46A8, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46AA, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x462A, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4626, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x4628, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46B0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46B1, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46B2, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46B3, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46C0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46C1, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46C2, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46C3, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* ADL-N */</div><div class='del'>-#define XE_ADLN_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x46D0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46D1, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x46D2, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* RPL-S */</div><div class='del'>-#define XE_RPLS_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0xA780, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA781, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA782, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA783, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA788, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA789, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA78A, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA78B, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* RPL-U */</div><div class='del'>-#define XE_RPLU_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0xA721, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA7A1, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA7A9, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA7AC, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA7AD, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* RPL-P */</div><div class='del'>-#define XE_RPLP_IDS(MACRO__, ...)		\</div><div class='del'>-	XE_RPLU_IDS(MACRO__, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA720, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA7A0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA7A8, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA7AA, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0xA7AB, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* DG2 */</div><div class='del'>-#define XE_DG2_G10_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x5690, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x5691, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x5692, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56A0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56A1, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56A2, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_DG2_G11_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x5693, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x5694, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x5695, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56A5, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56A6, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56B0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56B1, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56BA, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56BB, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56BC, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56BD, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_DG2_G12_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x5696, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x5697, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56A3, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56A4, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56B2, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56B3, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_DG2_IDS(MACRO__, ...)		\</div><div class='del'>-	XE_DG2_G10_IDS(MACRO__, ## __VA_ARGS__),\</div><div class='del'>-	XE_DG2_G11_IDS(MACRO__, ## __VA_ARGS__),\</div><div class='del'>-	XE_DG2_G12_IDS(MACRO__, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_ATS_M150_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x56C0, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x56C2, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_ATS_M75_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x56C1, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_ATS_M_IDS(MACRO__, ...)		\</div><div class='del'>-	XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\</div><div class='del'>-	XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-/* MTL / ARL */</div><div class='del'>-#define XE_MTL_IDS(MACRO__, ...)		\</div><div class='del'>-	MACRO__(0x7D40, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x7D45, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x7D55, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x7D60, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x7D67, ## __VA_ARGS__),	\</div><div class='del'>-	MACRO__(0x7DD5, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#define XE_LNL_IDS(MACRO__, ...) \</div><div class='del'>-	MACRO__(0x6420, ## __VA_ARGS__), \</div><div class='del'>-	MACRO__(0x64A0, ## __VA_ARGS__), \</div><div class='del'>-	MACRO__(0x64B0, ## __VA_ARGS__)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/dt-bindings/arm/mhuv3-dt.h b/include/dt-bindings/arm/mhuv3-dt.h<br/>new file mode 100644<br/>index 000000000000..4575406919dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/arm/mhuv3-dt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/arm/mhuv3-dt.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * This header provides constants for the defined MHUv3 types.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_ARM_MHUV3_DT_H</div><div class='add'>+#define _DT_BINDINGS_ARM_MHUV3_DT_H</div><div class='add'>+</div><div class='add'>+#define DBE_EXT		0</div><div class='add'>+#define FCE_EXT		1</div><div class='add'>+#define FE_EXT		2</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_ARM_MHUV3_DT_H */</div><div class='head'>diff --git a/include/dt-bindings/arm/qcom,ids.h b/include/dt-bindings/arm/qcom,ids.h<br/>index 19ac7b36f608..8776844e0eeb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/arm/qcom,ids.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/arm/qcom,ids.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/arm/qcom,ids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/arm/qcom,ids.h</a></div><div class='hunk'>@@ -175,6 +175,7 @@</div><div class='ctx'> #define QCOM_ID_SDA630			327</div><div class='ctx'> #define QCOM_ID_MSM8905			331</div><div class='ctx'> #define QCOM_ID_SDX202			333</div><div class='add'>+#define QCOM_ID_SDM670			336</div><div class='ctx'> #define QCOM_ID_SDM450			338</div><div class='ctx'> #define QCOM_ID_SM8150			339</div><div class='ctx'> #define QCOM_ID_SDA845			341</div><div class='hunk'>@@ -233,11 +234,14 @@</div><div class='ctx'> #define QCOM_ID_SA8540P			461</div><div class='ctx'> #define QCOM_ID_QCM4290			469</div><div class='ctx'> #define QCOM_ID_QCS4290			470</div><div class='add'>+#define QCOM_ID_SM7325			475</div><div class='ctx'> #define QCOM_ID_SM8450_2		480</div><div class='ctx'> #define QCOM_ID_SM8450_3		482</div><div class='ctx'> #define QCOM_ID_SC7280			487</div><div class='ctx'> #define QCOM_ID_SC7180P			495</div><div class='ctx'> #define QCOM_ID_QCM6490			497</div><div class='add'>+#define QCOM_ID_QCS6490			498</div><div class='add'>+#define QCOM_ID_SM7325P			499</div><div class='ctx'> #define QCOM_ID_IPQ5000			503</div><div class='ctx'> #define QCOM_ID_IPQ0509			504</div><div class='ctx'> #define QCOM_ID_IPQ0518			505</div><div class='hunk'>@@ -252,14 +256,18 @@</div><div class='ctx'> #define QCOM_ID_IPQ9510			521</div><div class='ctx'> #define QCOM_ID_QRB4210			523</div><div class='ctx'> #define QCOM_ID_QRB2210			524</div><div class='add'>+#define QCOM_ID_SAR2130P		525</div><div class='ctx'> #define QCOM_ID_SM8475			530</div><div class='ctx'> #define QCOM_ID_SM8475P			531</div><div class='add'>+#define QCOM_ID_SA8255P			532</div><div class='ctx'> #define QCOM_ID_SA8775P			534</div><div class='ctx'> #define QCOM_ID_QRU1000			539</div><div class='ctx'> #define QCOM_ID_SM8475_2		540</div><div class='ctx'> #define QCOM_ID_QDU1000			545</div><div class='add'>+#define QCOM_ID_X1E80100		555</div><div class='ctx'> #define QCOM_ID_SM8650			557</div><div class='ctx'> #define QCOM_ID_SM4450			568</div><div class='add'>+#define QCOM_ID_SAR1130P		579</div><div class='ctx'> #define QCOM_ID_QDU1010			587</div><div class='ctx'> #define QCOM_ID_QRU1032			588</div><div class='ctx'> #define QCOM_ID_QRU1052			589</div><div class='hunk'>@@ -270,7 +278,22 @@</div><div class='ctx'> #define QCOM_ID_IPQ5302			595</div><div class='ctx'> #define QCOM_ID_QCS8550			603</div><div class='ctx'> #define QCOM_ID_QCM8550			604</div><div class='add'>+#define QCOM_ID_SM8750			618</div><div class='ctx'> #define QCOM_ID_IPQ5300			624</div><div class='add'>+#define QCOM_ID_SM7635			636</div><div class='add'>+#define QCOM_ID_SM6650			640</div><div class='add'>+#define QCOM_ID_SM6650P			641</div><div class='add'>+#define QCOM_ID_IPQ5321			650</div><div class='add'>+#define QCOM_ID_IPQ5424			651</div><div class='add'>+#define QCOM_ID_QCM6690			657</div><div class='add'>+#define QCOM_ID_QCS6690			658</div><div class='add'>+#define QCOM_ID_SM8850			660</div><div class='add'>+#define QCOM_ID_IPQ5404			671</div><div class='add'>+#define QCOM_ID_QCS9100			667</div><div class='add'>+#define QCOM_ID_QCS8300			674</div><div class='add'>+#define QCOM_ID_QCS8275			675</div><div class='add'>+#define QCOM_ID_QCS9075			676</div><div class='add'>+#define QCOM_ID_QCS615			680</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The board type and revision information, used by Qualcomm bootloaders and</div><div class='head'>diff --git a/include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h b/include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h<br/>index 06f198ee7623..2ce1a06dc735 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h</a></div><div class='hunk'>@@ -164,5 +164,6 @@</div><div class='ctx'> #define CLKID_DMC_SEL		151</div><div class='ctx'> #define CLKID_DMC_DIV		152</div><div class='ctx'> #define CLKID_DMC_SEL2		153</div><div class='add'>+#define CLKID_SYS_PLL_DIV16	154</div><div class='ctx'> </div><div class='ctx'> #endif /* __A1_PERIPHERALS_CLKC_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/amlogic,a1-pll-clkc.h b/include/dt-bindings/clock/amlogic,a1-pll-clkc.h<br/>index 2b660c0f2c9f..0dfc5e78a2d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/amlogic,a1-pll-clkc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/amlogic,a1-pll-clkc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/amlogic,a1-pll-clkc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/amlogic,a1-pll-clkc.h</a></div><div class='hunk'>@@ -21,5 +21,6 @@</div><div class='ctx'> #define CLKID_FCLK_DIV5		8</div><div class='ctx'> #define CLKID_FCLK_DIV7		9</div><div class='ctx'> #define CLKID_HIFI_PLL		10</div><div class='add'>+#define CLKID_SYS_PLL		11</div><div class='ctx'> </div><div class='ctx'> #endif /* __A1_PLL_CLKC_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/amlogic,c3-peripherals-clkc.h b/include/dt-bindings/clock/amlogic,c3-peripherals-clkc.h<br/>new file mode 100644<br/>index 000000000000..d115c741c255<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/amlogic,c3-peripherals-clkc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/amlogic,c3-peripherals-clkc.h</a></div><div class='hunk'>@@ -0,0 +1,212 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Amlogic, Inc. All rights reserved.</div><div class='add'>+ * Author: Chuan Liu &lt;chuan.liu@amlogic.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_AMLOGIC_C3_PERIPHERALS_CLKC_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_AMLOGIC_C3_PERIPHERALS_CLKC_H</div><div class='add'>+</div><div class='add'>+#define CLKID_RTC_XTAL_CLKIN			0</div><div class='add'>+#define CLKID_RTC_32K_DIV			1</div><div class='add'>+#define CLKID_RTC_32K_MUX			2</div><div class='add'>+#define CLKID_RTC_32K				3</div><div class='add'>+#define CLKID_RTC_CLK				4</div><div class='add'>+#define CLKID_SYS_RESET_CTRL			5</div><div class='add'>+#define CLKID_SYS_PWR_CTRL			6</div><div class='add'>+#define CLKID_SYS_PAD_CTRL			7</div><div class='add'>+#define CLKID_SYS_CTRL				8</div><div class='add'>+#define CLKID_SYS_TS_PLL			9</div><div class='add'>+#define CLKID_SYS_DEV_ARB			10</div><div class='add'>+#define CLKID_SYS_MMC_PCLK			11</div><div class='add'>+#define CLKID_SYS_CPU_CTRL			12</div><div class='add'>+#define CLKID_SYS_JTAG_CTRL			13</div><div class='add'>+#define CLKID_SYS_IR_CTRL			14</div><div class='add'>+#define CLKID_SYS_IRQ_CTRL			15</div><div class='add'>+#define CLKID_SYS_MSR_CLK			16</div><div class='add'>+#define CLKID_SYS_ROM				17</div><div class='add'>+#define CLKID_SYS_UART_F			18</div><div class='add'>+#define CLKID_SYS_CPU_ARB			19</div><div class='add'>+#define CLKID_SYS_RSA				20</div><div class='add'>+#define CLKID_SYS_SAR_ADC			21</div><div class='add'>+#define CLKID_SYS_STARTUP			22</div><div class='add'>+#define CLKID_SYS_SECURE			23</div><div class='add'>+#define CLKID_SYS_SPIFC				24</div><div class='add'>+#define CLKID_SYS_NNA				25</div><div class='add'>+#define CLKID_SYS_ETH_MAC			26</div><div class='add'>+#define CLKID_SYS_GIC				27</div><div class='add'>+#define CLKID_SYS_RAMA				28</div><div class='add'>+#define CLKID_SYS_BIG_NIC			29</div><div class='add'>+#define CLKID_SYS_RAMB				30</div><div class='add'>+#define CLKID_SYS_AUDIO_PCLK			31</div><div class='add'>+#define CLKID_SYS_PWM_KL			32</div><div class='add'>+#define CLKID_SYS_PWM_IJ			33</div><div class='add'>+#define CLKID_SYS_USB				34</div><div class='add'>+#define CLKID_SYS_SD_EMMC_A			35</div><div class='add'>+#define CLKID_SYS_SD_EMMC_C			36</div><div class='add'>+#define CLKID_SYS_PWM_AB			37</div><div class='add'>+#define CLKID_SYS_PWM_CD			38</div><div class='add'>+#define CLKID_SYS_PWM_EF			39</div><div class='add'>+#define CLKID_SYS_PWM_GH			40</div><div class='add'>+#define CLKID_SYS_SPICC_1			41</div><div class='add'>+#define CLKID_SYS_SPICC_0			42</div><div class='add'>+#define CLKID_SYS_UART_A			43</div><div class='add'>+#define CLKID_SYS_UART_B			44</div><div class='add'>+#define CLKID_SYS_UART_C			45</div><div class='add'>+#define CLKID_SYS_UART_D			46</div><div class='add'>+#define CLKID_SYS_UART_E			47</div><div class='add'>+#define CLKID_SYS_I2C_M_A			48</div><div class='add'>+#define CLKID_SYS_I2C_M_B			49</div><div class='add'>+#define CLKID_SYS_I2C_M_C			50</div><div class='add'>+#define CLKID_SYS_I2C_M_D			51</div><div class='add'>+#define CLKID_SYS_I2S_S_A			52</div><div class='add'>+#define CLKID_SYS_RTC				53</div><div class='add'>+#define CLKID_SYS_GE2D				54</div><div class='add'>+#define CLKID_SYS_ISP				55</div><div class='add'>+#define CLKID_SYS_GPV_ISP_NIC			56</div><div class='add'>+#define CLKID_SYS_GPV_CVE_NIC			57</div><div class='add'>+#define CLKID_SYS_MIPI_DSI_HOST			58</div><div class='add'>+#define CLKID_SYS_MIPI_DSI_PHY			59</div><div class='add'>+#define CLKID_SYS_ETH_PHY			60</div><div class='add'>+#define CLKID_SYS_ACODEC			61</div><div class='add'>+#define CLKID_SYS_DWAP				62</div><div class='add'>+#define CLKID_SYS_DOS				63</div><div class='add'>+#define CLKID_SYS_CVE				64</div><div class='add'>+#define CLKID_SYS_VOUT				65</div><div class='add'>+#define CLKID_SYS_VC9000E			66</div><div class='add'>+#define CLKID_SYS_PWM_MN			67</div><div class='add'>+#define CLKID_SYS_SD_EMMC_B			68</div><div class='add'>+#define CLKID_AXI_SYS_NIC			69</div><div class='add'>+#define CLKID_AXI_ISP_NIC			70</div><div class='add'>+#define CLKID_AXI_CVE_NIC			71</div><div class='add'>+#define CLKID_AXI_RAMB				72</div><div class='add'>+#define CLKID_AXI_RAMA				73</div><div class='add'>+#define CLKID_AXI_CPU_DMC			74</div><div class='add'>+#define CLKID_AXI_NIC				75</div><div class='add'>+#define CLKID_AXI_DMA				76</div><div class='add'>+#define CLKID_AXI_MUX_NIC			77</div><div class='add'>+#define CLKID_AXI_CVE				78</div><div class='add'>+#define CLKID_AXI_DEV1_DMC			79</div><div class='add'>+#define CLKID_AXI_DEV0_DMC			80</div><div class='add'>+#define CLKID_AXI_DSP_DMC			81</div><div class='add'>+#define CLKID_12_24M_IN				82</div><div class='add'>+#define CLKID_12M_24M				83</div><div class='add'>+#define CLKID_FCLK_25M_DIV			84</div><div class='add'>+#define CLKID_FCLK_25M				85</div><div class='add'>+#define CLKID_GEN_SEL				86</div><div class='add'>+#define CLKID_GEN_DIV				87</div><div class='add'>+#define CLKID_GEN				88</div><div class='add'>+#define CLKID_SARADC_SEL			89</div><div class='add'>+#define CLKID_SARADC_DIV			90</div><div class='add'>+#define CLKID_SARADC				91</div><div class='add'>+#define CLKID_PWM_A_SEL				92</div><div class='add'>+#define CLKID_PWM_A_DIV				93</div><div class='add'>+#define CLKID_PWM_A				94</div><div class='add'>+#define CLKID_PWM_B_SEL				95</div><div class='add'>+#define CLKID_PWM_B_DIV				96</div><div class='add'>+#define CLKID_PWM_B				97</div><div class='add'>+#define CLKID_PWM_C_SEL				98</div><div class='add'>+#define CLKID_PWM_C_DIV				99</div><div class='add'>+#define CLKID_PWM_C				100</div><div class='add'>+#define CLKID_PWM_D_SEL				101</div><div class='add'>+#define CLKID_PWM_D_DIV				102</div><div class='add'>+#define CLKID_PWM_D				103</div><div class='add'>+#define CLKID_PWM_E_SEL				104</div><div class='add'>+#define CLKID_PWM_E_DIV				105</div><div class='add'>+#define CLKID_PWM_E				106</div><div class='add'>+#define CLKID_PWM_F_SEL				107</div><div class='add'>+#define CLKID_PWM_F_DIV				108</div><div class='add'>+#define CLKID_PWM_F				109</div><div class='add'>+#define CLKID_PWM_G_SEL				110</div><div class='add'>+#define CLKID_PWM_G_DIV				111</div><div class='add'>+#define CLKID_PWM_G				112</div><div class='add'>+#define CLKID_PWM_H_SEL				113</div><div class='add'>+#define CLKID_PWM_H_DIV				114</div><div class='add'>+#define CLKID_PWM_H				115</div><div class='add'>+#define CLKID_PWM_I_SEL				116</div><div class='add'>+#define CLKID_PWM_I_DIV				117</div><div class='add'>+#define CLKID_PWM_I				118</div><div class='add'>+#define CLKID_PWM_J_SEL				119</div><div class='add'>+#define CLKID_PWM_J_DIV				120</div><div class='add'>+#define CLKID_PWM_J				121</div><div class='add'>+#define CLKID_PWM_K_SEL				122</div><div class='add'>+#define CLKID_PWM_K_DIV				123</div><div class='add'>+#define CLKID_PWM_K				124</div><div class='add'>+#define CLKID_PWM_L_SEL				125</div><div class='add'>+#define CLKID_PWM_L_DIV				126</div><div class='add'>+#define CLKID_PWM_L				127</div><div class='add'>+#define CLKID_PWM_M_SEL				128</div><div class='add'>+#define CLKID_PWM_M_DIV				129</div><div class='add'>+#define CLKID_PWM_M				130</div><div class='add'>+#define CLKID_PWM_N_SEL				131</div><div class='add'>+#define CLKID_PWM_N_DIV				132</div><div class='add'>+#define CLKID_PWM_N				133</div><div class='add'>+#define CLKID_SPICC_A_SEL			134</div><div class='add'>+#define CLKID_SPICC_A_DIV			135</div><div class='add'>+#define CLKID_SPICC_A				136</div><div class='add'>+#define CLKID_SPICC_B_SEL			137</div><div class='add'>+#define CLKID_SPICC_B_DIV			138</div><div class='add'>+#define CLKID_SPICC_B				139</div><div class='add'>+#define CLKID_SPIFC_SEL				140</div><div class='add'>+#define CLKID_SPIFC_DIV				141</div><div class='add'>+#define CLKID_SPIFC				142</div><div class='add'>+#define CLKID_SD_EMMC_A_SEL			143</div><div class='add'>+#define CLKID_SD_EMMC_A_DIV			144</div><div class='add'>+#define CLKID_SD_EMMC_A				145</div><div class='add'>+#define CLKID_SD_EMMC_B_SEL			146</div><div class='add'>+#define CLKID_SD_EMMC_B_DIV			147</div><div class='add'>+#define CLKID_SD_EMMC_B				148</div><div class='add'>+#define CLKID_SD_EMMC_C_SEL			149</div><div class='add'>+#define CLKID_SD_EMMC_C_DIV			150</div><div class='add'>+#define CLKID_SD_EMMC_C				151</div><div class='add'>+#define CLKID_TS_DIV				152</div><div class='add'>+#define CLKID_TS				153</div><div class='add'>+#define CLKID_ETH_125M_DIV			154</div><div class='add'>+#define CLKID_ETH_125M				155</div><div class='add'>+#define CLKID_ETH_RMII_DIV			156</div><div class='add'>+#define CLKID_ETH_RMII				157</div><div class='add'>+#define CLKID_MIPI_DSI_MEAS_SEL			158</div><div class='add'>+#define CLKID_MIPI_DSI_MEAS_DIV			159</div><div class='add'>+#define CLKID_MIPI_DSI_MEAS			160</div><div class='add'>+#define CLKID_DSI_PHY_SEL			161</div><div class='add'>+#define CLKID_DSI_PHY_DIV			162</div><div class='add'>+#define CLKID_DSI_PHY				163</div><div class='add'>+#define CLKID_VOUT_MCLK_SEL			164</div><div class='add'>+#define CLKID_VOUT_MCLK_DIV			165</div><div class='add'>+#define CLKID_VOUT_MCLK				166</div><div class='add'>+#define CLKID_VOUT_ENC_SEL			167</div><div class='add'>+#define CLKID_VOUT_ENC_DIV			168</div><div class='add'>+#define CLKID_VOUT_ENC				169</div><div class='add'>+#define CLKID_HCODEC_0_SEL			170</div><div class='add'>+#define CLKID_HCODEC_0_DIV			171</div><div class='add'>+#define CLKID_HCODEC_0				172</div><div class='add'>+#define CLKID_HCODEC_1_SEL			173</div><div class='add'>+#define CLKID_HCODEC_1_DIV			174</div><div class='add'>+#define CLKID_HCODEC_1				175</div><div class='add'>+#define CLKID_HCODEC				176</div><div class='add'>+#define CLKID_VC9000E_ACLK_SEL			177</div><div class='add'>+#define CLKID_VC9000E_ACLK_DIV			178</div><div class='add'>+#define CLKID_VC9000E_ACLK			179</div><div class='add'>+#define CLKID_VC9000E_CORE_SEL			180</div><div class='add'>+#define CLKID_VC9000E_CORE_DIV			181</div><div class='add'>+#define CLKID_VC9000E_CORE			182</div><div class='add'>+#define CLKID_CSI_PHY0_SEL			183</div><div class='add'>+#define CLKID_CSI_PHY0_DIV			184</div><div class='add'>+#define CLKID_CSI_PHY0				185</div><div class='add'>+#define CLKID_DEWARPA_SEL			186</div><div class='add'>+#define CLKID_DEWARPA_DIV			187</div><div class='add'>+#define CLKID_DEWARPA				188</div><div class='add'>+#define CLKID_ISP0_SEL				189</div><div class='add'>+#define CLKID_ISP0_DIV				190</div><div class='add'>+#define CLKID_ISP0				191</div><div class='add'>+#define CLKID_NNA_CORE_SEL			192</div><div class='add'>+#define CLKID_NNA_CORE_DIV			193</div><div class='add'>+#define CLKID_NNA_CORE				194</div><div class='add'>+#define CLKID_GE2D_SEL				195</div><div class='add'>+#define CLKID_GE2D_DIV				196</div><div class='add'>+#define CLKID_GE2D				197</div><div class='add'>+#define CLKID_VAPB_SEL				198</div><div class='add'>+#define CLKID_VAPB_DIV				199</div><div class='add'>+#define CLKID_VAPB				200</div><div class='add'>+</div><div class='add'>+#endif  /* _DT_BINDINGS_CLOCK_AMLOGIC_C3_PERIPHERALS_CLKC_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/amlogic,c3-pll-clkc.h b/include/dt-bindings/clock/amlogic,c3-pll-clkc.h<br/>new file mode 100644<br/>index 000000000000..fcdc558715e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/amlogic,c3-pll-clkc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/amlogic,c3-pll-clkc.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Amlogic, Inc. All rights reserved.</div><div class='add'>+ * Author: Chuan Liu &lt;chuan.liu@amlogic.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_AMLOGIC_C3_PLL_CLKC_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_AMLOGIC_C3_PLL_CLKC_H</div><div class='add'>+</div><div class='add'>+#define CLKID_FCLK_50M_EN			0</div><div class='add'>+#define CLKID_FCLK_50M				1</div><div class='add'>+#define CLKID_FCLK_DIV2_DIV			2</div><div class='add'>+#define CLKID_FCLK_DIV2				3</div><div class='add'>+#define CLKID_FCLK_DIV2P5_DIV			4</div><div class='add'>+#define CLKID_FCLK_DIV2P5			5</div><div class='add'>+#define CLKID_FCLK_DIV3_DIV			6</div><div class='add'>+#define CLKID_FCLK_DIV3				7</div><div class='add'>+#define CLKID_FCLK_DIV4_DIV			8</div><div class='add'>+#define CLKID_FCLK_DIV4				9</div><div class='add'>+#define CLKID_FCLK_DIV5_DIV			10</div><div class='add'>+#define CLKID_FCLK_DIV5				11</div><div class='add'>+#define CLKID_FCLK_DIV7_DIV			12</div><div class='add'>+#define CLKID_FCLK_DIV7				13</div><div class='add'>+#define CLKID_GP0_PLL_DCO			14</div><div class='add'>+#define CLKID_GP0_PLL				15</div><div class='add'>+#define CLKID_HIFI_PLL_DCO			16</div><div class='add'>+#define CLKID_HIFI_PLL				17</div><div class='add'>+#define CLKID_MCLK_PLL_DCO			18</div><div class='add'>+#define CLKID_MCLK_PLL_OD			19</div><div class='add'>+#define CLKID_MCLK_PLL				20</div><div class='add'>+#define CLKID_MCLK0_SEL				21</div><div class='add'>+#define CLKID_MCLK0_SEL_EN			22</div><div class='add'>+#define CLKID_MCLK0_DIV				23</div><div class='add'>+#define CLKID_MCLK0				24</div><div class='add'>+#define CLKID_MCLK1_SEL				25</div><div class='add'>+#define CLKID_MCLK1_SEL_EN			26</div><div class='add'>+#define CLKID_MCLK1_DIV				27</div><div class='add'>+#define CLKID_MCLK1				28</div><div class='add'>+</div><div class='add'>+#endif  /* _DT_BINDINGS_CLOCK_AMLOGIC_C3_PLL_CLKC_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/amlogic,c3-scmi-clkc.h b/include/dt-bindings/clock/amlogic,c3-scmi-clkc.h<br/>new file mode 100644<br/>index 000000000000..663c9b349275<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/amlogic,c3-scmi-clkc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/amlogic,c3-scmi-clkc.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Amlogic, Inc. All rights reserved.</div><div class='add'>+ * Author: Chuan Liu &lt;chuan.liu@amlogic.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __AMLOGIC_C3_SCMI_CLKC_H</div><div class='add'>+#define __AMLOGIC_C3_SCMI_CLKC_H</div><div class='add'>+</div><div class='add'>+#define CLKID_DDR_PLL_OSC			0</div><div class='add'>+#define CLKID_DDR_PHY				1</div><div class='add'>+#define CLKID_TOP_PLL_OSC			2</div><div class='add'>+#define CLKID_USB_PLL_OSC			3</div><div class='add'>+#define CLKID_MIPIISP_VOUT			4</div><div class='add'>+#define CLKID_MCLK_PLL_OSC			5</div><div class='add'>+#define CLKID_USB_CTRL				6</div><div class='add'>+#define CLKID_ETH_PLL_OSC			7</div><div class='add'>+#define CLKID_OSC				8</div><div class='add'>+#define CLKID_SYS_CLK				9</div><div class='add'>+#define CLKID_AXI_CLK				10</div><div class='add'>+#define CLKID_CPU_CLK				11</div><div class='add'>+#define CLKID_FIXED_PLL_OSC			12</div><div class='add'>+#define CLKID_GP1_PLL_OSC			13</div><div class='add'>+#define CLKID_SYS_PLL_DIV16			14</div><div class='add'>+#define CLKID_CPU_CLK_DIV16			15</div><div class='add'>+</div><div class='add'>+#endif /* __AMLOGIC_C3_SCMI_CLKC_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/aspeed,ast2700-scu.h b/include/dt-bindings/clock/aspeed,ast2700-scu.h<br/>new file mode 100644<br/>index 000000000000..bacf712e8e04<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/aspeed,ast2700-scu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/aspeed,ast2700-scu.h</a></div><div class='hunk'>@@ -0,0 +1,167 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Device Tree binding constants for AST2700 clock controller.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2024 Aspeed Technology Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_AST2700_H</div><div class='add'>+#define __DT_BINDINGS_CLOCK_AST2700_H</div><div class='add'>+</div><div class='add'>+/* SOC0 clk */</div><div class='add'>+#define SCU0_CLKIN		0</div><div class='add'>+#define SCU0_CLK_24M		1</div><div class='add'>+#define SCU0_CLK_192M		2</div><div class='add'>+#define SCU0_CLK_UART		3</div><div class='add'>+#define SCU0_CLK_UART_DIV13	3</div><div class='add'>+#define SCU0_CLK_PSP		4</div><div class='add'>+#define SCU0_CLK_HPLL		5</div><div class='add'>+#define SCU0_CLK_HPLL_DIV2	6</div><div class='add'>+#define SCU0_CLK_HPLL_DIV4	7</div><div class='add'>+#define SCU0_CLK_HPLL_DIV_AHB	8</div><div class='add'>+#define SCU0_CLK_DPLL		9</div><div class='add'>+#define SCU0_CLK_MPLL		10</div><div class='add'>+#define SCU0_CLK_MPLL_DIV2	11</div><div class='add'>+#define SCU0_CLK_MPLL_DIV4	12</div><div class='add'>+#define SCU0_CLK_MPLL_DIV8	13</div><div class='add'>+#define SCU0_CLK_MPLL_DIV_AHB	14</div><div class='add'>+#define SCU0_CLK_D0		15</div><div class='add'>+#define SCU0_CLK_D1		16</div><div class='add'>+#define SCU0_CLK_CRT0		17</div><div class='add'>+#define SCU0_CLK_CRT1		18</div><div class='add'>+#define SCU0_CLK_MPHY		19</div><div class='add'>+#define SCU0_CLK_AXI0		20</div><div class='add'>+#define SCU0_CLK_AXI1		21</div><div class='add'>+#define SCU0_CLK_AHB		22</div><div class='add'>+#define SCU0_CLK_APB		23</div><div class='add'>+#define SCU0_CLK_UART4		24</div><div class='add'>+#define SCU0_CLK_EMMCMUX	25</div><div class='add'>+#define SCU0_CLK_EMMC		26</div><div class='add'>+#define SCU0_CLK_U2PHY_CLK12M	27</div><div class='add'>+#define SCU0_CLK_U2PHY_REFCLK	28</div><div class='add'>+</div><div class='add'>+/* SOC0 clk-gate */</div><div class='add'>+#define SCU0_CLK_GATE_MCLK	29</div><div class='add'>+#define SCU0_CLK_GATE_ECLK	30</div><div class='add'>+#define SCU0_CLK_GATE_2DCLK	31</div><div class='add'>+#define SCU0_CLK_GATE_VCLK	32</div><div class='add'>+#define SCU0_CLK_GATE_BCLK	33</div><div class='add'>+#define SCU0_CLK_GATE_VGA0CLK	34</div><div class='add'>+#define SCU0_CLK_GATE_REFCLK	35</div><div class='add'>+#define SCU0_CLK_GATE_PORTBUSB2CLK	36</div><div class='add'>+#define SCU0_CLK_GATE_UHCICLK	37</div><div class='add'>+#define SCU0_CLK_GATE_VGA1CLK	38</div><div class='add'>+#define SCU0_CLK_GATE_DDRPHYCLK	39</div><div class='add'>+#define SCU0_CLK_GATE_E2M0CLK	40</div><div class='add'>+#define SCU0_CLK_GATE_HACCLK	41</div><div class='add'>+#define SCU0_CLK_GATE_PORTAUSB2CLK	42</div><div class='add'>+#define SCU0_CLK_GATE_UART4CLK	43</div><div class='add'>+#define SCU0_CLK_GATE_SLICLK	44</div><div class='add'>+#define SCU0_CLK_GATE_DACCLK	45</div><div class='add'>+#define SCU0_CLK_GATE_DP	46</div><div class='add'>+#define SCU0_CLK_GATE_E2M1CLK	47</div><div class='add'>+#define SCU0_CLK_GATE_CRT0CLK	48</div><div class='add'>+#define SCU0_CLK_GATE_CRT1CLK	49</div><div class='add'>+#define SCU0_CLK_GATE_ECDSACLK	50</div><div class='add'>+#define SCU0_CLK_GATE_RSACLK	51</div><div class='add'>+#define SCU0_CLK_GATE_RVAS0CLK	52</div><div class='add'>+#define SCU0_CLK_GATE_UFSCLK	53</div><div class='add'>+#define SCU0_CLK_GATE_EMMCCLK	54</div><div class='add'>+#define SCU0_CLK_GATE_RVAS1CLK	55</div><div class='add'>+#define SCU0_CLK_U2PHY_REFCLKSRC 56</div><div class='add'>+#define SCU0_CLK_AHBMUX			57</div><div class='add'>+#define SCU0_CLK_MPHYSRC		58</div><div class='add'>+</div><div class='add'>+/* SOC1 clk */</div><div class='add'>+#define SCU1_CLKIN		0</div><div class='add'>+#define SCU1_CLK_HPLL		1</div><div class='add'>+#define SCU1_CLK_APLL		2</div><div class='add'>+#define SCU1_CLK_APLL_DIV2	3</div><div class='add'>+#define SCU1_CLK_APLL_DIV4	4</div><div class='add'>+#define SCU1_CLK_DPLL		5</div><div class='add'>+#define SCU1_CLK_UXCLK		6</div><div class='add'>+#define SCU1_CLK_HUXCLK		7</div><div class='add'>+#define SCU1_CLK_UARTX		8</div><div class='add'>+#define SCU1_CLK_HUARTX		9</div><div class='add'>+#define SCU1_CLK_AHB		10</div><div class='add'>+#define SCU1_CLK_APB		11</div><div class='add'>+#define SCU1_CLK_UART0		12</div><div class='add'>+#define SCU1_CLK_UART1		13</div><div class='add'>+#define SCU1_CLK_UART2		14</div><div class='add'>+#define SCU1_CLK_UART3		15</div><div class='add'>+#define SCU1_CLK_UART5		16</div><div class='add'>+#define SCU1_CLK_UART6		17</div><div class='add'>+#define SCU1_CLK_UART7		18</div><div class='add'>+#define SCU1_CLK_UART8		19</div><div class='add'>+#define SCU1_CLK_UART9		20</div><div class='add'>+#define SCU1_CLK_UART10		21</div><div class='add'>+#define SCU1_CLK_UART11		22</div><div class='add'>+#define SCU1_CLK_UART12		23</div><div class='add'>+#define SCU1_CLK_UART13		24</div><div class='add'>+#define SCU1_CLK_UART14		25</div><div class='add'>+#define SCU1_CLK_APLL_DIVN	26</div><div class='add'>+#define SCU1_CLK_SDMUX		27</div><div class='add'>+#define SCU1_CLK_SDCLK		28</div><div class='add'>+#define SCU1_CLK_RMII		29</div><div class='add'>+#define SCU1_CLK_RGMII		30</div><div class='add'>+#define SCU1_CLK_MACHCLK	31</div><div class='add'>+#define SCU1_CLK_MAC0RCLK	32</div><div class='add'>+#define SCU1_CLK_MAC1RCLK	33</div><div class='add'>+#define SCU1_CLK_CAN		34</div><div class='add'>+</div><div class='add'>+/* SOC1 clk gate */</div><div class='add'>+#define SCU1_CLK_GATE_LCLK0		35</div><div class='add'>+#define SCU1_CLK_GATE_LCLK1		36</div><div class='add'>+#define SCU1_CLK_GATE_ESPI0CLK		37</div><div class='add'>+#define SCU1_CLK_GATE_ESPI1CLK		38</div><div class='add'>+#define SCU1_CLK_GATE_SDCLK		39</div><div class='add'>+#define SCU1_CLK_GATE_IPEREFCLK		40</div><div class='add'>+#define SCU1_CLK_GATE_REFCLK		41</div><div class='add'>+#define SCU1_CLK_GATE_LPCHCLK		42</div><div class='add'>+#define SCU1_CLK_GATE_MAC0CLK		43</div><div class='add'>+#define SCU1_CLK_GATE_MAC1CLK		44</div><div class='add'>+#define SCU1_CLK_GATE_MAC2CLK		45</div><div class='add'>+#define SCU1_CLK_GATE_UART0CLK		46</div><div class='add'>+#define SCU1_CLK_GATE_UART1CLK		47</div><div class='add'>+#define SCU1_CLK_GATE_UART2CLK		48</div><div class='add'>+#define SCU1_CLK_GATE_UART3CLK		49</div><div class='add'>+#define SCU1_CLK_GATE_I2CCLK		50</div><div class='add'>+#define SCU1_CLK_GATE_I3C0CLK		51</div><div class='add'>+#define SCU1_CLK_GATE_I3C1CLK		52</div><div class='add'>+#define SCU1_CLK_GATE_I3C2CLK		53</div><div class='add'>+#define SCU1_CLK_GATE_I3C3CLK		54</div><div class='add'>+#define SCU1_CLK_GATE_I3C4CLK		55</div><div class='add'>+#define SCU1_CLK_GATE_I3C5CLK		56</div><div class='add'>+#define SCU1_CLK_GATE_I3C6CLK		57</div><div class='add'>+#define SCU1_CLK_GATE_I3C7CLK		58</div><div class='add'>+#define SCU1_CLK_GATE_I3C8CLK		59</div><div class='add'>+#define SCU1_CLK_GATE_I3C9CLK		60</div><div class='add'>+#define SCU1_CLK_GATE_I3C10CLK		61</div><div class='add'>+#define SCU1_CLK_GATE_I3C11CLK		62</div><div class='add'>+#define SCU1_CLK_GATE_I3C12CLK		63</div><div class='add'>+#define SCU1_CLK_GATE_I3C13CLK		64</div><div class='add'>+#define SCU1_CLK_GATE_I3C14CLK		65</div><div class='add'>+#define SCU1_CLK_GATE_I3C15CLK		66</div><div class='add'>+#define SCU1_CLK_GATE_UART5CLK		67</div><div class='add'>+#define SCU1_CLK_GATE_UART6CLK		68</div><div class='add'>+#define SCU1_CLK_GATE_UART7CLK		69</div><div class='add'>+#define SCU1_CLK_GATE_UART8CLK		70</div><div class='add'>+#define SCU1_CLK_GATE_UART9CLK		71</div><div class='add'>+#define SCU1_CLK_GATE_UART10CLK		72</div><div class='add'>+#define SCU1_CLK_GATE_UART11CLK		73</div><div class='add'>+#define SCU1_CLK_GATE_UART12CLK		74</div><div class='add'>+#define SCU1_CLK_GATE_FSICLK		75</div><div class='add'>+#define SCU1_CLK_GATE_LTPIPHYCLK	76</div><div class='add'>+#define SCU1_CLK_GATE_LTPICLK		77</div><div class='add'>+#define SCU1_CLK_GATE_VGALCLK		78</div><div class='add'>+#define SCU1_CLK_GATE_UHCICLK		79</div><div class='add'>+#define SCU1_CLK_GATE_CANCLK		80</div><div class='add'>+#define SCU1_CLK_GATE_PCICLK		81</div><div class='add'>+#define SCU1_CLK_GATE_SLICLK		82</div><div class='add'>+#define SCU1_CLK_GATE_E2MCLK		83</div><div class='add'>+#define SCU1_CLK_GATE_PORTCUSB2CLK	84</div><div class='add'>+#define SCU1_CLK_GATE_PORTDUSB2CLK	85</div><div class='add'>+#define SCU1_CLK_GATE_LTPI1TXCLK	86</div><div class='add'>+#define SCU1_CLK_I3C				87</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/ast2600-clock.h b/include/dt-bindings/clock/ast2600-clock.h<br/>index 712782177c90..f60fff261130 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/ast2600-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/ast2600-clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/ast2600-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/ast2600-clock.h</a></div><div class='hunk'>@@ -86,6 +86,7 @@</div><div class='ctx'> #define ASPEED_CLK_MAC3RCLK		69</div><div class='ctx'> #define ASPEED_CLK_MAC4RCLK		70</div><div class='ctx'> #define ASPEED_CLK_I3C			71</div><div class='add'>+#define ASPEED_CLK_FSI			72</div><div class='ctx'> </div><div class='ctx'> /* Only list resets here that are not part of a clock gate + reset pair */</div><div class='ctx'> #define ASPEED_RESET_ADC		55</div><div class='hunk'>@@ -121,6 +122,8 @@</div><div class='ctx'> #define ASPEED_RESET_PCIE_DEV_OEN	20</div><div class='ctx'> #define ASPEED_RESET_PCIE_RC_O		19</div><div class='ctx'> #define ASPEED_RESET_PCIE_RC_OEN	18</div><div class='add'>+#define ASPEED_RESET_MAC2		12</div><div class='add'>+#define ASPEED_RESET_MAC1		11</div><div class='ctx'> #define ASPEED_RESET_PCI_DP		5</div><div class='ctx'> #define ASPEED_RESET_HACE		4</div><div class='ctx'> #define ASPEED_RESET_AHB		1</div><div class='head'>diff --git a/include/dt-bindings/clock/at91.h b/include/dt-bindings/clock/at91.h<br/>index 3e3972a814c1..f2a7b7d39c0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/at91.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/at91.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/at91.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/at91.h</a></div><div class='hunk'>@@ -38,6 +38,14 @@</div><div class='ctx'> #define PMC_CPU			(PMC_MAIN + 9)</div><div class='ctx'> #define PMC_MCK1		(PMC_MAIN + 10)</div><div class='ctx'> </div><div class='add'>+/* SAM9X7 */</div><div class='add'>+#define PMC_PLLADIV2		(PMC_MAIN + 11)</div><div class='add'>+#define PMC_LVDSPLL		(PMC_MAIN + 12)</div><div class='add'>+</div><div class='add'>+/* SAMA7D65 */</div><div class='add'>+#define PMC_MCK3		(PMC_MAIN + 13)</div><div class='add'>+#define PMC_MCK5		(PMC_MAIN + 14)</div><div class='add'>+</div><div class='ctx'> #ifndef AT91_PMC_MOSCS</div><div class='ctx'> #define AT91_PMC_MOSCS		0		/* MOSCS Flag */</div><div class='ctx'> #define AT91_PMC_LOCKA		1		/* PLLA Lock */</div><div class='hunk'>@@ -51,4 +59,8 @@</div><div class='ctx'> #define AT91_PMC_GCKRDY		24		/* Generated Clocks */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Slow clock. */</div><div class='add'>+#define SCKC_MD_SLCK		0</div><div class='add'>+#define SCKC_TD_SLCK		1</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/axg-audio-clkc.h b/include/dt-bindings/clock/axg-audio-clkc.h<br/>index 08c82c22fa5f..607f23b83fa7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/axg-audio-clkc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/axg-audio-clkc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/axg-audio-clkc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/axg-audio-clkc.h</a></div><div class='hunk'>@@ -155,5 +155,12 @@</div><div class='ctx'> #define AUD_CLKID_SYSCLK_B_DIV		175</div><div class='ctx'> #define AUD_CLKID_SYSCLK_A_EN		176</div><div class='ctx'> #define AUD_CLKID_SYSCLK_B_EN		177</div><div class='add'>+#define AUD_CLKID_EARCRX		178</div><div class='add'>+#define AUD_CLKID_EARCRX_CMDC_SEL	179</div><div class='add'>+#define AUD_CLKID_EARCRX_CMDC_DIV	180</div><div class='add'>+#define AUD_CLKID_EARCRX_CMDC		181</div><div class='add'>+#define AUD_CLKID_EARCRX_DMAC_SEL	182</div><div class='add'>+#define AUD_CLKID_EARCRX_DMAC_DIV	183</div><div class='add'>+#define AUD_CLKID_EARCRX_DMAC		184</div><div class='ctx'> </div><div class='ctx'> #endif /* __AXG_AUDIO_CLKC_BINDINGS_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/axis,artpec8-clk.h b/include/dt-bindings/clock/axis,artpec8-clk.h<br/>new file mode 100644<br/>index 000000000000..1e6e1409dd94<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/axis,artpec8-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/axis,artpec8-clk.h</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Samsung Electronics Co., Ltd.</div><div class='add'>+ *             https://www.samsung.com</div><div class='add'>+ * Copyright (c) 2025 Axis Communications AB.</div><div class='add'>+ *             https://www.axis.com</div><div class='add'>+ *</div><div class='add'>+ * Device Tree binding constants for ARTPEC-8 clock controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_ARTPEC8_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_ARTPEC8_H</div><div class='add'>+</div><div class='add'>+/* CMU_CMU */</div><div class='add'>+#define CLK_FOUT_SHARED0_PLL					1</div><div class='add'>+#define CLK_DOUT_SHARED0_DIV2					2</div><div class='add'>+#define CLK_DOUT_SHARED0_DIV3					3</div><div class='add'>+#define CLK_DOUT_SHARED0_DIV4					4</div><div class='add'>+#define CLK_FOUT_SHARED1_PLL					5</div><div class='add'>+#define CLK_DOUT_SHARED1_DIV2					6</div><div class='add'>+#define CLK_DOUT_SHARED1_DIV3					7</div><div class='add'>+#define CLK_DOUT_SHARED1_DIV4					8</div><div class='add'>+#define CLK_FOUT_AUDIO_PLL					9</div><div class='add'>+#define CLK_DOUT_CMU_BUS					10</div><div class='add'>+#define CLK_DOUT_CMU_BUS_DLP					11</div><div class='add'>+#define CLK_DOUT_CMU_CDC_CORE					12</div><div class='add'>+#define CLK_DOUT_CMU_OTP					13</div><div class='add'>+#define CLK_DOUT_CMU_CORE_MAIN					14</div><div class='add'>+#define CLK_DOUT_CMU_CORE_DLP					15</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL_SWITCH				16</div><div class='add'>+#define CLK_DOUT_CMU_DLP_CORE					17</div><div class='add'>+#define CLK_DOUT_CMU_FSYS_BUS					18</div><div class='add'>+#define CLK_DOUT_CMU_FSYS_IP					19</div><div class='add'>+#define CLK_DOUT_CMU_FSYS_SCAN0					20</div><div class='add'>+#define CLK_DOUT_CMU_FSYS_SCAN1					21</div><div class='add'>+#define CLK_DOUT_CMU_GPU_3D					22</div><div class='add'>+#define CLK_DOUT_CMU_GPU_2D					23</div><div class='add'>+#define CLK_DOUT_CMU_IMEM_ACLK					24</div><div class='add'>+#define CLK_DOUT_CMU_IMEM_JPEG					25</div><div class='add'>+#define CLK_DOUT_CMU_MIF_SWITCH					26</div><div class='add'>+#define CLK_DOUT_CMU_MIF_BUSP					27</div><div class='add'>+#define CLK_DOUT_CMU_PERI_DISP					28</div><div class='add'>+#define CLK_DOUT_CMU_PERI_IP					29</div><div class='add'>+#define CLK_DOUT_CMU_PERI_AUDIO					30</div><div class='add'>+#define CLK_DOUT_CMU_RSP_CORE					31</div><div class='add'>+#define CLK_DOUT_CMU_TRFM_CORE					32</div><div class='add'>+#define CLK_DOUT_CMU_VCA_ACE					33</div><div class='add'>+#define CLK_DOUT_CMU_VCA_OD					34</div><div class='add'>+#define CLK_DOUT_CMU_VIO_CORE					35</div><div class='add'>+#define CLK_DOUT_CMU_VIO_AUDIO					36</div><div class='add'>+#define CLK_DOUT_CMU_VIP0_CORE					37</div><div class='add'>+#define CLK_DOUT_CMU_VIP1_CORE					38</div><div class='add'>+#define CLK_DOUT_CMU_VPP_CORE					39</div><div class='add'>+</div><div class='add'>+/* CMU_BUS */</div><div class='add'>+#define CLK_MOUT_BUS_ACLK_USER					1</div><div class='add'>+#define CLK_MOUT_BUS_DLP_USER					2</div><div class='add'>+#define CLK_DOUT_BUS_PCLK					3</div><div class='add'>+</div><div class='add'>+/* CMU_CORE */</div><div class='add'>+#define CLK_MOUT_CORE_ACLK_USER					1</div><div class='add'>+#define CLK_MOUT_CORE_DLP_USER					2</div><div class='add'>+#define CLK_DOUT_CORE_PCLK					3</div><div class='add'>+</div><div class='add'>+/* CMU_CPUCL */</div><div class='add'>+#define CLK_FOUT_CPUCL_PLL					1</div><div class='add'>+#define CLK_MOUT_CPUCL_PLL					2</div><div class='add'>+#define CLK_MOUT_CPUCL_SWITCH_USER				3</div><div class='add'>+#define CLK_DOUT_CPUCL_CPU					4</div><div class='add'>+#define CLK_DOUT_CPUCL_CLUSTER_ACLK				5</div><div class='add'>+#define CLK_DOUT_CPUCL_CLUSTER_PCLKDBG				6</div><div class='add'>+#define CLK_DOUT_CPUCL_CLUSTER_CNTCLK				7</div><div class='add'>+#define CLK_DOUT_CPUCL_CLUSTER_ATCLK				8</div><div class='add'>+#define CLK_DOUT_CPUCL_PCLK					9</div><div class='add'>+#define CLK_DOUT_CPUCL_CMUREF					10</div><div class='add'>+#define CLK_DOUT_CPUCL_DBG					11</div><div class='add'>+#define CLK_DOUT_CPUCL_PCLKDBG					12</div><div class='add'>+#define CLK_GOUT_CPUCL_CLUSTER_CPU				13</div><div class='add'>+#define CLK_GOUT_CPUCL_SHORTSTOP				14</div><div class='add'>+#define CLK_GOUT_CPUCL_CSSYS_IPCLKPORT_PCLKDBG			15</div><div class='add'>+#define CLK_GOUT_CPUCL_CSSYS_IPCLKPORT_ATCLK			16</div><div class='add'>+</div><div class='add'>+/* CMU_FSYS */</div><div class='add'>+#define CLK_FOUT_FSYS_PLL					1</div><div class='add'>+#define CLK_MOUT_FSYS_SCAN0_USER				2</div><div class='add'>+#define CLK_MOUT_FSYS_SCAN1_USER				3</div><div class='add'>+#define CLK_MOUT_FSYS_BUS_USER					4</div><div class='add'>+#define CLK_MOUT_FSYS_MMC_USER					5</div><div class='add'>+#define CLK_DOUT_FSYS_PCIE_PIPE					6</div><div class='add'>+#define CLK_DOUT_FSYS_ADC					7</div><div class='add'>+#define CLK_DOUT_FSYS_PCIE_PHY_REFCLK_SYSPLL			8</div><div class='add'>+#define CLK_DOUT_FSYS_EQOS_INT125				9</div><div class='add'>+#define CLK_DOUT_FSYS_OTP_MEM					10</div><div class='add'>+#define CLK_DOUT_FSYS_SCLK_UART					11</div><div class='add'>+#define CLK_DOUT_FSYS_EQOS_25					12</div><div class='add'>+#define CLK_DOUT_FSYS_EQOS_2p5					13</div><div class='add'>+#define CLK_DOUT_FSYS_BUS300					14</div><div class='add'>+#define CLK_DOUT_FSYS_BUS_QSPI					15</div><div class='add'>+#define CLK_DOUT_FSYS_MMC_CARD0					16</div><div class='add'>+#define CLK_DOUT_FSYS_MMC_CARD1					17</div><div class='add'>+#define CLK_DOUT_SCAN_CLK_FSYS_125				18</div><div class='add'>+#define CLK_DOUT_FSYS_QSPI					19</div><div class='add'>+#define CLK_DOUT_FSYS_SFMC_NAND					20</div><div class='add'>+#define CLK_DOUT_FSYS_SCAN_CLK_MMC				21</div><div class='add'>+#define CLK_GOUT_FSYS_USB20DRD_IPCLKPORT_ACLK_PHYCTRL_20	22</div><div class='add'>+#define CLK_GOUT_FSYS_USB20DRD_IPCLKPORT_BUS_CLK_EARLY		23</div><div class='add'>+#define CLK_GOUT_FSYS_XHB_USB_IPCLKPORT_CLK			24</div><div class='add'>+#define CLK_GOUT_FSYS_XHB_AHBBR_IPCLKPORT_CLK			25</div><div class='add'>+#define CLK_GOUT_FSYS_I2C0_IPCLKPORT_I_PCLK			26</div><div class='add'>+#define CLK_GOUT_FSYS_I2C1_IPCLKPORT_I_PCLK			27</div><div class='add'>+#define CLK_GOUT_FSYS_PWM_IPCLKPORT_I_PCLK_S0			28</div><div class='add'>+#define CLK_GOUT_FSYS_DWC_PCIE_CTL_INST_0_MSTR_ACLK_UG		29</div><div class='add'>+#define CLK_GOUT_FSYS_DWC_PCIE_CTL_INXT_0_SLV_ACLK_UG		30</div><div class='add'>+#define CLK_GOUT_FSYS_DWC_PCIE_CTL_INST_0_DBI_ACLK_UG		31</div><div class='add'>+#define CLK_GOUT_FSYS_PIPE_PAL_INST_0_I_APB_PCLK		32</div><div class='add'>+#define CLK_GOUT_FSYS_EQOS_TOP_IPCLKPORT_ACLK_I			33</div><div class='add'>+#define CLK_GOUT_FSYS_EQOS_TOP_IPCLKPORT_CLK_CSR_I		34</div><div class='add'>+#define CLK_GOUT_FSYS_EQOS_TOP_IPCLKPORT_I_RGMII_TXCLK_2P5	35</div><div class='add'>+#define CLK_GOUT_FSYS_SFMC_IPCLKPORT_I_ACLK_NAND		36</div><div class='add'>+#define CLK_GOUT_FSYS_MMC0_IPCLKPORT_SDCLKIN			37</div><div class='add'>+#define CLK_GOUT_FSYS_MMC0_IPCLKPORT_I_ACLK			38</div><div class='add'>+#define CLK_GOUT_FSYS_MMC1_IPCLKPORT_SDCLKIN			39</div><div class='add'>+#define CLK_GOUT_FSYS_MMC1_IPCLKPORT_I_ACLK			40</div><div class='add'>+#define CLK_GOUT_FSYS_PCIE_PHY_REFCLK_IN			41</div><div class='add'>+#define CLK_GOUT_FSYS_UART0_PCLK				42</div><div class='add'>+#define CLK_GOUT_FSYS_UART0_SCLK_UART				43</div><div class='add'>+#define CLK_GOUT_FSYS_BUS_QSPI					44</div><div class='add'>+#define CLK_GOUT_FSYS_QSPI_IPCLKPORT_HCLK			45</div><div class='add'>+#define CLK_GOUT_FSYS_QSPI_IPCLKPORT_SSI_CLK			46</div><div class='add'>+</div><div class='add'>+/* CMU_IMEM */</div><div class='add'>+#define CLK_MOUT_IMEM_ACLK_USER					1</div><div class='add'>+#define CLK_MOUT_IMEM_GIC_CA53					2</div><div class='add'>+#define CLK_MOUT_IMEM_GIC_CA5					3</div><div class='add'>+#define CLK_MOUT_IMEM_JPEG_USER					4</div><div class='add'>+#define CLK_GOUT_IMEM_MCT_PCLK					5</div><div class='add'>+#define CLK_GOUT_IMEM_PCLK_TMU0_APBIF				6</div><div class='add'>+</div><div class='add'>+/* CMU_PERI */</div><div class='add'>+#define CLK_MOUT_PERI_IP_USER					1</div><div class='add'>+#define CLK_MOUT_PERI_AUDIO_USER				2</div><div class='add'>+#define CLK_MOUT_PERI_I2S0					3</div><div class='add'>+#define CLK_MOUT_PERI_I2S1					4</div><div class='add'>+#define CLK_MOUT_PERI_DISP_USER					5</div><div class='add'>+#define CLK_DOUT_PERI_SPI					6</div><div class='add'>+#define CLK_DOUT_PERI_UART1					7</div><div class='add'>+#define CLK_DOUT_PERI_UART2					8</div><div class='add'>+#define CLK_DOUT_PERI_PCLK					9</div><div class='add'>+#define CLK_DOUT_PERI_I2S0					10</div><div class='add'>+#define CLK_DOUT_PERI_I2S1					11</div><div class='add'>+#define CLK_DOUT_PERI_DSIM					12</div><div class='add'>+#define CLK_GOUT_PERI_UART1_PCLK				13</div><div class='add'>+#define CLK_GOUT_PERI_UART1_SCLK_UART				14</div><div class='add'>+#define CLK_GOUT_PERI_UART2_PCLK				15</div><div class='add'>+#define CLK_GOUT_PERI_UART2_SCLK_UART				16</div><div class='add'>+#define CLK_GOUT_PERI_I2C2_IPCLKPORT_I_PCLK			17</div><div class='add'>+#define CLK_GOUT_PERI_I2C3_IPCLKPORT_I_PCLK			18</div><div class='add'>+#define CLK_GOUT_PERI_SPI0_PCLK					19</div><div class='add'>+#define CLK_GOUT_PERI_SPI0_SCLK_SPI				20</div><div class='add'>+#define CLK_GOUT_PERI_APB_ASYNC_DSIM_IPCLKPORT_PCLKS		21</div><div class='add'>+#define CLK_GOUT_PERI_I2SSC0_IPCLKPORT_CLK_HST			22</div><div class='add'>+#define CLK_GOUT_PERI_I2SSC1_IPCLKPORT_CLK_HST			23</div><div class='add'>+#define CLK_GOUT_PERI_AUDIO_OUT_IPCLKPORT_CLK			24</div><div class='add'>+#define CLK_GOUT_PERI_I2SSC0_IPCLKPORT_CLK			25</div><div class='add'>+#define CLK_GOUT_PERI_I2SSC1_IPCLKPORT_CLK			26</div><div class='add'>+#define CLK_GOUT_PERI_DMA4DSIM_IPCLKPORT_CLK_APB_CLK		27</div><div class='add'>+#define CLK_GOUT_PERI_DMA4DSIM_IPCLKPORT_CLK_AXI_CLK		28</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLOCK_ARTPEC8_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/cirrus,ep9301-syscon.h b/include/dt-bindings/clock/cirrus,ep9301-syscon.h<br/>new file mode 100644<br/>index 000000000000..6bb8f532e7d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/cirrus,ep9301-syscon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/cirrus,ep9301-syscon.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+#ifndef DT_BINDINGS_CIRRUS_EP93XX_CLOCK_H</div><div class='add'>+#define DT_BINDINGS_CIRRUS_EP93XX_CLOCK_H</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_PLL1		0</div><div class='add'>+#define EP93XX_CLK_PLL2		1</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_FCLK		2</div><div class='add'>+#define EP93XX_CLK_HCLK		3</div><div class='add'>+#define EP93XX_CLK_PCLK		4</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_UART		5</div><div class='add'>+#define EP93XX_CLK_SPI		6</div><div class='add'>+#define EP93XX_CLK_PWM		7</div><div class='add'>+#define EP93XX_CLK_USB		8</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_M2M0		9</div><div class='add'>+#define EP93XX_CLK_M2M1		10</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_M2P0		11</div><div class='add'>+#define EP93XX_CLK_M2P1		12</div><div class='add'>+#define EP93XX_CLK_M2P2		13</div><div class='add'>+#define EP93XX_CLK_M2P3		14</div><div class='add'>+#define EP93XX_CLK_M2P4		15</div><div class='add'>+#define EP93XX_CLK_M2P5		16</div><div class='add'>+#define EP93XX_CLK_M2P6		17</div><div class='add'>+#define EP93XX_CLK_M2P7		18</div><div class='add'>+#define EP93XX_CLK_M2P8		19</div><div class='add'>+#define EP93XX_CLK_M2P9		20</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_UART1	21</div><div class='add'>+#define EP93XX_CLK_UART2	22</div><div class='add'>+#define EP93XX_CLK_UART3	23</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_ADC		24</div><div class='add'>+#define EP93XX_CLK_ADC_EN	25</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_KEYPAD	26</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_VIDEO	27</div><div class='add'>+</div><div class='add'>+#define EP93XX_CLK_I2S_MCLK	28</div><div class='add'>+#define EP93XX_CLK_I2S_SCLK	29</div><div class='add'>+#define EP93XX_CLK_I2S_LRCLK	30</div><div class='add'>+</div><div class='add'>+#endif /* DT_BINDINGS_CIRRUS_EP93XX_CLOCK_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/cix,sky1.h b/include/dt-bindings/clock/cix,sky1.h<br/>new file mode 100644<br/>index 000000000000..9245ebd1e80a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/cix,sky1.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/cix,sky1.h</a></div><div class='hunk'>@@ -0,0 +1,279 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2024-2025 Cix Technology Group Co., Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_CIX_SKY1_H</div><div class='add'>+#define _DT_BINDINGS_CLK_CIX_SKY1_H</div><div class='add'>+</div><div class='add'>+#define CLK_TREE_CPU_GICxCLK			0</div><div class='add'>+#define CLK_TREE_CPU_PPUCLK			1</div><div class='add'>+#define CLK_TREE_CPU_PERIPHCLK			2</div><div class='add'>+#define CLK_TREE_DSU_CLK			3</div><div class='add'>+#define CLK_TREE_DSU_PCLK			4</div><div class='add'>+#define CLK_TREE_CPU_CLK_BC0			5</div><div class='add'>+#define CLK_TREE_CPU_CLK_BC1			6</div><div class='add'>+#define CLK_TREE_CPU_CLK_BC2			7</div><div class='add'>+#define CLK_TREE_CPU_CLK_BC3			8</div><div class='add'>+#define CLK_TREE_CPU_CLK_MC0			9</div><div class='add'>+#define CLK_TREE_CPU_CLK_MC1			10</div><div class='add'>+#define CLK_TREE_CPU_CLK_MC2			11</div><div class='add'>+#define CLK_TREE_CPU_CLK_MC3			12</div><div class='add'>+#define CLK_TREE_CPU_CLK_LC0			13</div><div class='add'>+#define CLK_TREE_CPU_CLK_LC1			14</div><div class='add'>+#define CLK_TREE_CPU_CLK_LC2			15</div><div class='add'>+#define CLK_TREE_CPU_CLK_LC3			16</div><div class='add'>+#define CLK_TREE_CSI_CTRL0_PCLK			17</div><div class='add'>+#define CLK_TREE_CSI_CTRL1_PCLK			18</div><div class='add'>+#define CLK_TREE_CSI_CTRL2_PCLK			19</div><div class='add'>+#define CLK_TREE_CSI_CTRL3_PCLK			20</div><div class='add'>+#define CLK_TREE_CSI_DMA0_PCLK			21</div><div class='add'>+#define CLK_TREE_CSI_DMA1_PCLK			22</div><div class='add'>+#define CLK_TREE_CSI_DMA2_PCLK			23</div><div class='add'>+#define CLK_TREE_CSI_DMA3_PCLK			24</div><div class='add'>+#define CLK_TREE_CSI_PHY0_PSM			25</div><div class='add'>+#define CLK_TREE_CSI_PHY1_PSM			26</div><div class='add'>+#define CLK_TREE_CSI_PHY0_APBCLK		27</div><div class='add'>+#define CLK_TREE_CSI_PHY1_APBCLK		28</div><div class='add'>+#define CLK_TREE_FCH_APB_CLK			29</div><div class='add'>+#define CLK_TREE_GPU_CLK_400M			30</div><div class='add'>+#define CLK_TREE_GPU_CLK_CORE			31</div><div class='add'>+#define CLK_TREE_GPU_CLK_STACKS			32</div><div class='add'>+#define CLK_TREE_DP0_PIXEL0			33</div><div class='add'>+#define CLK_TREE_DP0_PIXEL1			34</div><div class='add'>+#define CLK_TREE_DP1_PIXEL0			35</div><div class='add'>+#define CLK_TREE_DP1_PIXEL1			36</div><div class='add'>+#define CLK_TREE_DP2_PIXEL0			37</div><div class='add'>+#define CLK_TREE_DP2_PIXEL1			38</div><div class='add'>+#define CLK_TREE_DP3_PIXEL0			39</div><div class='add'>+#define CLK_TREE_DP3_PIXEL1			40</div><div class='add'>+#define CLK_TREE_DP4_PIXEL0			41</div><div class='add'>+#define CLK_TREE_DP4_PIXEL1			42</div><div class='add'>+#define CLK_TREE_DPU_CLK			43</div><div class='add'>+#define CLK_TREE_DPU0_ACLK			44</div><div class='add'>+#define CLK_TREE_DPU1_ACLK			45</div><div class='add'>+#define CLK_TREE_DPU2_ACLK			46</div><div class='add'>+#define CLK_TREE_DPU3_ACLK			47</div><div class='add'>+#define CLK_TREE_DPU4_ACLK			48</div><div class='add'>+#define CLK_TREE_DPC0_VIDCLK0			49</div><div class='add'>+#define CLK_TREE_DPC0_VIDCLK1			50</div><div class='add'>+#define CLK_TREE_DPC1_VIDCLK0			51</div><div class='add'>+#define CLK_TREE_DPC1_VIDCLK1			52</div><div class='add'>+#define CLK_TREE_DPC2_VIDCLK0			53</div><div class='add'>+#define CLK_TREE_DPC2_VIDCLK1			54</div><div class='add'>+#define CLK_TREE_DPC3_VIDCLK0			55</div><div class='add'>+#define CLK_TREE_DPC3_VIDCLK1			56</div><div class='add'>+#define CLK_TREE_DPC4_VIDCLK0			57</div><div class='add'>+#define CLK_TREE_DPC4_VIDCLK1			58</div><div class='add'>+#define CLK_TREE_DPC0_APBCLK			59</div><div class='add'>+#define CLK_TREE_DPC1_APBCLK			60</div><div class='add'>+#define CLK_TREE_DPC2_APBCLK			61</div><div class='add'>+#define CLK_TREE_DPC3_APBCLK			62</div><div class='add'>+#define CLK_TREE_DPC4_APBCLK			63</div><div class='add'>+#define CLK_TREE_NPU_MEMCLK			64</div><div class='add'>+#define CLK_TREE_NPU_SYSCLK			65</div><div class='add'>+#define CLK_TREE_NPU_DBGCLK			66</div><div class='add'>+#define CLK_TREE_VPU_APBCLK			67</div><div class='add'>+#define CLK_TREE_ISP_ACLK			68</div><div class='add'>+#define CLK_TREE_ISP_SCLK			69</div><div class='add'>+#define CLK_TREE_AUDIO_CLK4			70</div><div class='add'>+#define CLK_TREE_AUDIO_CLK5			71</div><div class='add'>+#define CLK_TREE_CAMERA_MCLK0			72</div><div class='add'>+#define CLK_TREE_CAMERA_MCLK1			73</div><div class='add'>+#define CLK_TREE_CAMERA_MCLK2			74</div><div class='add'>+#define CLK_TREE_CAMERA_MCLK3			75</div><div class='add'>+#define CLK_TREE_AUDIO_CLK0			76</div><div class='add'>+#define CLK_TREE_AUDIO_CLK1			77</div><div class='add'>+#define CLK_TREE_AUDIO_CLK2			78</div><div class='add'>+#define CLK_TREE_AUDIO_CLK3			79</div><div class='add'>+#define CLK_TREE_MM_NI700_CLK			80</div><div class='add'>+#define CLK_TREE_SYS_NI700_CLK			81</div><div class='add'>+#define CLK_TREE_GMAC0_ACLK			82</div><div class='add'>+#define CLK_TREE_GMAC1_ACLK			83</div><div class='add'>+#define CLK_TREE_GMAC0_DIV_ACLK			84</div><div class='add'>+#define CLK_TREE_GMAC0_DIV_TXCLK		85</div><div class='add'>+#define CLK_TREE_GMAC0_RGMII0_TXCLK		86</div><div class='add'>+#define CLK_TREE_GMAC1_DIV_ACLK			87</div><div class='add'>+#define CLK_TREE_GMAC1_DIV_TXCLK		88</div><div class='add'>+#define CLK_TREE_GMAC1_RGMII0_TXCLK		89</div><div class='add'>+#define CLK_TREE_GMAC0_PCLK			90</div><div class='add'>+#define CLK_TREE_GMAC1_PCLK			91</div><div class='add'>+#define CLK_TREE_USB2_0_AXI_GATE		92</div><div class='add'>+#define CLK_TREE_USB2_0_APB_GATE		93</div><div class='add'>+#define CLK_TREE_USB2_1_AXI_GATE		94</div><div class='add'>+#define CLK_TREE_USB2_1_APB_GATE		95</div><div class='add'>+#define CLK_TREE_USB2_2_AXI_GATE		96</div><div class='add'>+#define CLK_TREE_USB2_2_APB_GATE		97</div><div class='add'>+#define CLK_TREE_USB2_3_AXI_GATE		98</div><div class='add'>+#define CLK_TREE_USB2_3_APB_GATE		99</div><div class='add'>+#define CLK_TREE_USB2_0_PHY_GATE		100</div><div class='add'>+#define CLK_TREE_USB2_1_PHY_GATE		101</div><div class='add'>+#define CLK_TREE_USB2_2_PHY_GATE		102</div><div class='add'>+#define CLK_TREE_USB2_3_PHY_GATE		103</div><div class='add'>+#define CLK_TREE_USB3C_DRD_AXI_GATE		104</div><div class='add'>+#define CLK_TREE_USB3C_DRD_APB_GATE		105</div><div class='add'>+#define CLK_TREE_USB3C_DRD_PHY2_GATE		106</div><div class='add'>+#define CLK_TREE_USB3C_DRD_PHY3_GATE		107</div><div class='add'>+#define CLK_TREE_USB3C_0_AXI_GATE		108</div><div class='add'>+#define CLK_TREE_USB3C_0_APB_GATE		109</div><div class='add'>+#define CLK_TREE_USB3C_0_PHY2_GATE		110</div><div class='add'>+#define CLK_TREE_USB3C_0_PHY3_GATE		111</div><div class='add'>+#define CLK_TREE_USB3C_1_AXI_GATE		112</div><div class='add'>+#define CLK_TREE_USB3C_1_APB_GATE		113</div><div class='add'>+#define CLK_TREE_USB3C_1_PHY2_GATE		114</div><div class='add'>+#define CLK_TREE_USB3C_1_PHY3_GATE		115</div><div class='add'>+#define CLK_TREE_USB3C_2_AXI_GATE		116</div><div class='add'>+#define CLK_TREE_USB3C_2_APB_GATE		117</div><div class='add'>+#define CLK_TREE_USB3C_2_PHY2_GATE		118</div><div class='add'>+#define CLK_TREE_USB3C_2_PHY3_GATE		119</div><div class='add'>+#define CLK_TREE_USB3A_0_AXI_GATE		120</div><div class='add'>+#define CLK_TREE_USB3A_0_APB_GATE		121</div><div class='add'>+#define CLK_TREE_USB3A_0_PHY2_GATE		122</div><div class='add'>+#define CLK_TREE_USB3A_1_AXI_GATE		123</div><div class='add'>+#define CLK_TREE_USB3A_1_APB_GATE		124</div><div class='add'>+#define CLK_TREE_USB3A_1_PHY2_GATE		125</div><div class='add'>+#define CLK_TREE_USB3A_PHY3_GATE		126</div><div class='add'>+#define CLK_TREE_USB2_0_CLK_SOF			127</div><div class='add'>+#define CLK_TREE_USB2_1_CLK_SOF			128</div><div class='add'>+#define CLK_TREE_USB2_2_CLK_SOF			129</div><div class='add'>+#define CLK_TREE_USB2_3_CLK_SOF			130</div><div class='add'>+#define CLK_TREE_USB3C_DRD_CLK_SOF		131</div><div class='add'>+#define CLK_TREE_USB3C_H0_CLK_SOF		132</div><div class='add'>+#define CLK_TREE_USB3C_H1_CLK_SOF		133</div><div class='add'>+#define CLK_TREE_USB3C_H2_CLK_SOF		134</div><div class='add'>+#define CLK_TREE_USB3A_H0_CLK_SOF		135</div><div class='add'>+#define CLK_TREE_USB3A_H1_CLK_SOF		136</div><div class='add'>+#define CLK_TREE_USB2_0_CLK_LPM			137</div><div class='add'>+#define CLK_TREE_USB2_1_CLK_LPM			138</div><div class='add'>+#define CLK_TREE_USB2_2_CLK_LPM			139</div><div class='add'>+#define CLK_TREE_USB2_3_CLK_LPM			140</div><div class='add'>+#define CLK_TREE_USB3C_DRD_CLK_LPM		141</div><div class='add'>+#define CLK_TREE_USB3C_H0_CLK_LPM		142</div><div class='add'>+#define CLK_TREE_USB3C_H1_CLK_LPM		143</div><div class='add'>+#define CLK_TREE_USB3C_H2_CLK_LPM		144</div><div class='add'>+#define CLK_TREE_USB3A_H0_CLK_LPM		145</div><div class='add'>+#define CLK_TREE_USB3A_H1_CLK_LPM		146</div><div class='add'>+#define CLK_TREE_USB2_0_PHY_REF			147</div><div class='add'>+#define CLK_TREE_USB2_1_PHY_REF			148</div><div class='add'>+#define CLK_TREE_USB2_2_PHY_REF			149</div><div class='add'>+#define CLK_TREE_USB2_3_PHY_REF			150</div><div class='add'>+#define CLK_TREE_USB3C_DRD_PHY_REF		151</div><div class='add'>+#define CLK_TREE_USB3C_H0_PHY_REF		152</div><div class='add'>+#define CLK_TREE_USB3C_H1_PHY_REF		153</div><div class='add'>+#define CLK_TREE_USB3C_H2_PHY_REF		154</div><div class='add'>+#define CLK_TREE_USB3A_H0_PHY_REF		155</div><div class='add'>+#define CLK_TREE_USB3A_H1_PHY_REF		156</div><div class='add'>+#define CLK_TREE_USB3C_DRD_PHY_x4_REF		157</div><div class='add'>+#define CLK_TREE_USB3C_H0_PHY_x4_REF		158</div><div class='add'>+#define CLK_TREE_USB3C_H1_PHY_x4_REF		159</div><div class='add'>+#define CLK_TREE_USB3C_H2_PHY_x4_REF		160</div><div class='add'>+#define CLK_TREE_USB3A_PHY_x2_REF		161</div><div class='add'>+#define CLK_TREE_PCIE_X8CTRL_APB		162</div><div class='add'>+#define CLK_TREE_PCIE_X4CTRL_APB		163</div><div class='add'>+#define CLK_TREE_PCIE_X2CTRL_APB		164</div><div class='add'>+#define CLK_TREE_PCIE_X1_0CTRL_APB		165</div><div class='add'>+#define CLK_TREE_PCIE_X1_1CTRL_APB		166</div><div class='add'>+#define CLK_TREE_PCIE_X8_PHY_APB		167</div><div class='add'>+#define CLK_TREE_PCIE_X4_PHY_APB		168</div><div class='add'>+#define CLK_TREE_PCIE_X211_PHY_APB		169</div><div class='add'>+#define CLK_TREE_PCIE_NI700_CLK			170</div><div class='add'>+#define CLK_TREE_PCIE_CTRL0_CLK			171</div><div class='add'>+#define CLK_TREE_PCIE_CTRL1_CLK			172</div><div class='add'>+#define CLK_TREE_PCIE_CTRL2_CLK			173</div><div class='add'>+#define CLK_TREE_PCIE_CTRL3_CLK			174</div><div class='add'>+#define CLK_TREE_PCIE_CTRL4_CLK			175</div><div class='add'>+#define CLK_TREE_CSI_CTRL0_SYSCLK		176</div><div class='add'>+#define CLK_TREE_CSI_CTRL1_SYSCLK		177</div><div class='add'>+#define CLK_TREE_CSI_CTRL2_SYSCLK		178</div><div class='add'>+#define CLK_TREE_CSI_CTRL3_SYSCLK		179</div><div class='add'>+#define CLK_TREE_CSI_CTRL0_PIXEL0_CLK		180</div><div class='add'>+#define CLK_TREE_CSI_CTRL0_PIXEL1_CLK		181</div><div class='add'>+#define CLK_TREE_CSI_CTRL0_PIXEL2_CLK		182</div><div class='add'>+#define CLK_TREE_CSI_CTRL0_PIXEL3_CLK		183</div><div class='add'>+#define CLK_TREE_CSI_CTRL1_PIXEL0_CLK		184</div><div class='add'>+#define CLK_TREE_CSI_CTRL2_PIXEL0_CLK		185</div><div class='add'>+#define CLK_TREE_CSI_CTRL2_PIXEL1_CLK		186</div><div class='add'>+#define CLK_TREE_CSI_CTRL2_PIXEL2_CLK		187</div><div class='add'>+#define CLK_TREE_CSI_CTRL2_PIXEL3_CLK		188</div><div class='add'>+#define CLK_TREE_CSI_CTRL3_PIXEL0_CLK		189</div><div class='add'>+#define CLK_TREE_CI700_GCLK0			190</div><div class='add'>+#define CLK_TREE_DDRC0_ACLK_CLK			191</div><div class='add'>+#define CLK_TREE_DDRC1_ACLK_CLK			192</div><div class='add'>+#define CLK_TREE_DDRC2_ACLK_CLK			193</div><div class='add'>+#define CLK_TREE_DDRC3_ACLK_CLK			194</div><div class='add'>+#define CLK_TREE_DDRC0_DFICLK_CLK		195</div><div class='add'>+#define CLK_TREE_DDRC1_DFICLK_CLK		196</div><div class='add'>+#define CLK_TREE_DDRC2_DFICLK_CLK		197</div><div class='add'>+#define CLK_TREE_DDRC3_DFICLK_CLK		198</div><div class='add'>+#define CLK_TREE_PHY0_SYNC_CLK			199</div><div class='add'>+#define CLK_TREE_PHY1_SYNC_CLK			200</div><div class='add'>+#define CLK_TREE_PHY2_SYNC_CLK			201</div><div class='add'>+#define CLK_TREE_PHY3_SYNC_CLK			202</div><div class='add'>+#define CLK_TREE_PHY0_BYPASS_CLK		203</div><div class='add'>+#define CLK_TREE_PHY1_BYPASS_CLK		204</div><div class='add'>+#define CLK_TREE_PHY2_BYPASS_CLK		205</div><div class='add'>+#define CLK_TREE_PHY3_BYPASS_CLK		206</div><div class='add'>+#define CLK_TREE_DDRC_0_APB			207</div><div class='add'>+#define CLK_TREE_DDRC_1_APB			208</div><div class='add'>+#define CLK_TREE_DDRC_2_APB			209</div><div class='add'>+#define CLK_TREE_DDRC_3_APB			210</div><div class='add'>+#define CLK_TREE_TZC400_0_APB			211</div><div class='add'>+#define CLK_TREE_TZC400_1_APB			212</div><div class='add'>+#define CLK_TREE_TZC400_2_APB			213</div><div class='add'>+#define CLK_TREE_TZC400_3_APB			214</div><div class='add'>+#define CLK_TREE_S5_SENSOR_HUB_25M		215</div><div class='add'>+#define CLK_TREE_S5_SENSOR_HUB_400M		216</div><div class='add'>+#define CLK_TREE_S5_CSS600_100M			217</div><div class='add'>+#define CLK_TREE_S5_DFD_800M			218</div><div class='add'>+#define CLK_TREE_S5_CSU_SE_800M			219</div><div class='add'>+#define CLK_TREE_S5_CSU_PM_800M			220</div><div class='add'>+#define CLK_TREE_PCIE_REF_B0			221</div><div class='add'>+#define CLK_TREE_PCIE_REF_B1			222</div><div class='add'>+#define CLK_TREE_PCIE_REF_B2			223</div><div class='add'>+#define CLK_TREE_PCIE_REF_B3			224</div><div class='add'>+#define CLK_TREE_PCIE_REF_B4			225</div><div class='add'>+#define CLK_TREE_PCIE_REF_PHY_X8		226</div><div class='add'>+#define CLK_TREE_PCIE_REF_PHY_X4		227</div><div class='add'>+#define CLK_TREE_PCIE_REF_PHY_X211		228</div><div class='add'>+#define CLK_TREE_GMAC_REC_CLK			229</div><div class='add'>+#define CLK_TREE_GPUTOP_PLL			230</div><div class='add'>+#define CLK_TREE_GPUCORE_PLL			231</div><div class='add'>+#define CLK_TREE_CPU_PLL_LIT			232</div><div class='add'>+#define CLK_TREE_CPU_PLL0			233</div><div class='add'>+#define CLK_TREE_CPU_PLL1			234</div><div class='add'>+#define CLK_TREE_CPU_PLL2			235</div><div class='add'>+#define CLK_TREE_CPU_PLL3			236</div><div class='add'>+#define CLK_TREE_FCH_I3C0_FUNC			237</div><div class='add'>+#define CLK_TREE_FCH_I3C1_FUNC			238</div><div class='add'>+#define CLK_TREE_FCH_DMA_ACLK			239</div><div class='add'>+#define CLK_TREE_FCH_XSPI_FUNC			240</div><div class='add'>+#define CLK_TREE_FCH_XSPI_MACLK			241</div><div class='add'>+#define CLK_TREE_FCH_TIMER_FUN			242</div><div class='add'>+#define CLK_TREE_FCH_APB_IO_S0			243</div><div class='add'>+#define CLK_TREE_FCH_I3C0_APB			244</div><div class='add'>+#define CLK_TREE_FCH_I3C1_APB			245</div><div class='add'>+#define CLK_TREE_FCH_UART0_APB			246</div><div class='add'>+#define CLK_TREE_FCH_UART1_APB			247</div><div class='add'>+#define CLK_TREE_FCH_UART2_APB			248</div><div class='add'>+#define CLK_TREE_FCH_UART3_APB			249</div><div class='add'>+#define CLK_TREE_FCH_SPI0_APB			250</div><div class='add'>+#define CLK_TREE_FCH_SPI1_APB			251</div><div class='add'>+#define CLK_TREE_FCH_XSPI_APB			252</div><div class='add'>+#define CLK_TREE_FCH_I2C0_APB			253</div><div class='add'>+#define CLK_TREE_FCH_I2C1_APB			254</div><div class='add'>+#define CLK_TREE_FCH_I2C2_APB			255</div><div class='add'>+#define CLK_TREE_FCH_I2C3_APB			256</div><div class='add'>+#define CLK_TREE_FCH_I2C4_APB			257</div><div class='add'>+#define CLK_TREE_FCH_I2C5_APB			258</div><div class='add'>+#define CLK_TREE_FCH_I2C6_APB			259</div><div class='add'>+#define CLK_TREE_FCH_I2C7_APB			260</div><div class='add'>+#define CLK_TREE_FCH_TIMER_APB			261</div><div class='add'>+#define CLK_TREE_FCH_GPIO_APB			262</div><div class='add'>+#define CLK_TREE_FCH_UART0_FUNC			263</div><div class='add'>+#define CLK_TREE_FCH_UART1_FUNC			264</div><div class='add'>+#define CLK_TREE_FCH_UART2_FUNC			265</div><div class='add'>+#define CLK_TREE_FCH_UART3_FUNC			266</div><div class='add'>+/* 267~271 not used by AP, skip */</div><div class='add'>+#define CLK_TREE_GPU_CLK_200M			272</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/en7523-clk.h b/include/dt-bindings/clock/en7523-clk.h<br/>index 717d23a5e5ae..edfa64045f52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/en7523-clk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/en7523-clk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/en7523-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/en7523-clk.h</a></div><div class='hunk'>@@ -12,6 +12,6 @@</div><div class='ctx'> #define EN7523_CLK_CRYPTO	6</div><div class='ctx'> #define EN7523_CLK_PCIE		7</div><div class='ctx'> </div><div class='del'>-#define EN7523_NUM_CLOCKS	8</div><div class='add'>+#define EN7581_CLK_EMMC		8</div><div class='ctx'> </div><div class='ctx'> #endif /* _DT_BINDINGS_CLOCK_AIROHA_EN7523_H_ */</div><div class='head'>diff --git a/include/dt-bindings/clock/exynos7885.h b/include/dt-bindings/clock/exynos7885.h<br/>index 255e3aa94323..cfede84b46b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/exynos7885.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/exynos7885.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/exynos7885.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/exynos7885.h</a></div><div class='hunk'>@@ -69,6 +69,8 @@</div><div class='ctx'> #define CLK_GOUT_FSYS_MMC_EMBD		58</div><div class='ctx'> #define CLK_GOUT_FSYS_MMC_SDIO		59</div><div class='ctx'> #define CLK_GOUT_FSYS_USB30DRD		60</div><div class='add'>+#define CLK_MOUT_SHARED0_PLL		61</div><div class='add'>+#define CLK_MOUT_SHARED1_PLL		62</div><div class='ctx'> </div><div class='ctx'> /* CMU_CORE */</div><div class='ctx'> #define CLK_MOUT_CORE_BUS_USER			1</div><div class='hunk'>@@ -132,16 +134,24 @@</div><div class='ctx'> #define CLK_GOUT_WDT1_PCLK		43</div><div class='ctx'> </div><div class='ctx'> /* CMU_FSYS */</div><div class='del'>-#define CLK_MOUT_FSYS_BUS_USER		1</div><div class='del'>-#define CLK_MOUT_FSYS_MMC_CARD_USER	2</div><div class='del'>-#define CLK_MOUT_FSYS_MMC_EMBD_USER	3</div><div class='del'>-#define CLK_MOUT_FSYS_MMC_SDIO_USER	4</div><div class='del'>-#define CLK_MOUT_FSYS_USB30DRD_USER	4</div><div class='del'>-#define CLK_GOUT_MMC_CARD_ACLK		5</div><div class='del'>-#define CLK_GOUT_MMC_CARD_SDCLKIN	6</div><div class='del'>-#define CLK_GOUT_MMC_EMBD_ACLK		7</div><div class='del'>-#define CLK_GOUT_MMC_EMBD_SDCLKIN	8</div><div class='del'>-#define CLK_GOUT_MMC_SDIO_ACLK		9</div><div class='del'>-#define CLK_GOUT_MMC_SDIO_SDCLKIN	10</div><div class='add'>+#define CLK_MOUT_FSYS_BUS_USER			1</div><div class='add'>+#define CLK_MOUT_FSYS_MMC_CARD_USER		2</div><div class='add'>+#define CLK_MOUT_FSYS_MMC_EMBD_USER		3</div><div class='add'>+#define CLK_MOUT_FSYS_MMC_SDIO_USER		4</div><div class='add'>+#define CLK_GOUT_MMC_CARD_ACLK			5</div><div class='add'>+#define CLK_GOUT_MMC_CARD_SDCLKIN		6</div><div class='add'>+#define CLK_GOUT_MMC_EMBD_ACLK			7</div><div class='add'>+#define CLK_GOUT_MMC_EMBD_SDCLKIN		8</div><div class='add'>+#define CLK_GOUT_MMC_SDIO_ACLK			9</div><div class='add'>+#define CLK_GOUT_MMC_SDIO_SDCLKIN		10</div><div class='add'>+#define CLK_MOUT_FSYS_USB30DRD_USER		11</div><div class='add'>+#define CLK_MOUT_USB_PLL			12</div><div class='add'>+#define CLK_FOUT_USB_PLL			13</div><div class='add'>+#define CLK_FSYS_USB20PHY_CLKCORE		14</div><div class='add'>+#define CLK_FSYS_USB30DRD_ACLK_20PHYCTRL	15</div><div class='add'>+#define CLK_FSYS_USB30DRD_ACLK_30PHYCTRL_0	16</div><div class='add'>+#define CLK_FSYS_USB30DRD_ACLK_30PHYCTRL_1	17</div><div class='add'>+#define CLK_FSYS_USB30DRD_BUS_CLK_EARLY		18</div><div class='add'>+#define CLK_FSYS_USB30DRD_REF_CLK		19</div><div class='ctx'> </div><div class='ctx'> #endif /* _DT_BINDINGS_CLOCK_EXYNOS_7885_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/exynos850.h b/include/dt-bindings/clock/exynos850.h<br/>index bc15108aa3c2..80dacda57229 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/exynos850.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/exynos850.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/exynos850.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/exynos850.h</a></div><div class='hunk'>@@ -88,6 +88,18 @@</div><div class='ctx'> #define CLK_MOUT_G3D_SWITCH		76</div><div class='ctx'> #define CLK_GOUT_G3D_SWITCH		77</div><div class='ctx'> #define CLK_DOUT_G3D_SWITCH		78</div><div class='add'>+#define CLK_MOUT_CPUCL0_DBG		79</div><div class='add'>+#define CLK_MOUT_CPUCL0_SWITCH		80</div><div class='add'>+#define CLK_GOUT_CPUCL0_DBG		81</div><div class='add'>+#define CLK_GOUT_CPUCL0_SWITCH		82</div><div class='add'>+#define CLK_DOUT_CPUCL0_DBG		83</div><div class='add'>+#define CLK_DOUT_CPUCL0_SWITCH		84</div><div class='add'>+#define CLK_MOUT_CPUCL1_DBG		85</div><div class='add'>+#define CLK_MOUT_CPUCL1_SWITCH		86</div><div class='add'>+#define CLK_GOUT_CPUCL1_DBG		87</div><div class='add'>+#define CLK_GOUT_CPUCL1_SWITCH		88</div><div class='add'>+#define CLK_DOUT_CPUCL1_DBG		89</div><div class='add'>+#define CLK_DOUT_CPUCL1_SWITCH		90</div><div class='ctx'> </div><div class='ctx'> /* CMU_APM */</div><div class='ctx'> #define CLK_RCO_I3C_PMIC		1</div><div class='hunk'>@@ -195,6 +207,48 @@</div><div class='ctx'> #define CLK_GOUT_CMGP_USI1_PCLK		14</div><div class='ctx'> #define CLK_GOUT_SYSREG_CMGP_PCLK	15</div><div class='ctx'> </div><div class='add'>+/* CMU_CPUCL0 */</div><div class='add'>+#define CLK_FOUT_CPUCL0_PLL		1</div><div class='add'>+#define CLK_MOUT_PLL_CPUCL0		2</div><div class='add'>+#define CLK_MOUT_CPUCL0_SWITCH_USER	3</div><div class='add'>+#define CLK_MOUT_CPUCL0_DBG_USER	4</div><div class='add'>+#define CLK_MOUT_CPUCL0_PLL		5</div><div class='add'>+#define CLK_DOUT_CPUCL0_CPU		6</div><div class='add'>+#define CLK_DOUT_CPUCL0_CMUREF		7</div><div class='add'>+#define CLK_DOUT_CPUCL0_PCLK		8</div><div class='add'>+#define CLK_DOUT_CLUSTER0_ACLK		9</div><div class='add'>+#define CLK_DOUT_CLUSTER0_ATCLK		10</div><div class='add'>+#define CLK_DOUT_CLUSTER0_PCLKDBG	11</div><div class='add'>+#define CLK_DOUT_CLUSTER0_PERIPHCLK	12</div><div class='add'>+#define CLK_GOUT_CLUSTER0_ATCLK		13</div><div class='add'>+#define CLK_GOUT_CLUSTER0_PCLK		14</div><div class='add'>+#define CLK_GOUT_CLUSTER0_PERIPHCLK	15</div><div class='add'>+#define CLK_GOUT_CLUSTER0_SCLK		16</div><div class='add'>+#define CLK_GOUT_CPUCL0_CMU_CPUCL0_PCLK	17</div><div class='add'>+#define CLK_GOUT_CLUSTER0_CPU		18</div><div class='add'>+#define CLK_CLUSTER0_SCLK		19</div><div class='add'>+</div><div class='add'>+/* CMU_CPUCL1 */</div><div class='add'>+#define CLK_FOUT_CPUCL1_PLL		1</div><div class='add'>+#define CLK_MOUT_PLL_CPUCL1		2</div><div class='add'>+#define CLK_MOUT_CPUCL1_SWITCH_USER	3</div><div class='add'>+#define CLK_MOUT_CPUCL1_DBG_USER	4</div><div class='add'>+#define CLK_MOUT_CPUCL1_PLL		5</div><div class='add'>+#define CLK_DOUT_CPUCL1_CPU		6</div><div class='add'>+#define CLK_DOUT_CPUCL1_CMUREF		7</div><div class='add'>+#define CLK_DOUT_CPUCL1_PCLK		8</div><div class='add'>+#define CLK_DOUT_CLUSTER1_ACLK		9</div><div class='add'>+#define CLK_DOUT_CLUSTER1_ATCLK		10</div><div class='add'>+#define CLK_DOUT_CLUSTER1_PCLKDBG	11</div><div class='add'>+#define CLK_DOUT_CLUSTER1_PERIPHCLK	12</div><div class='add'>+#define CLK_GOUT_CLUSTER1_ATCLK		13</div><div class='add'>+#define CLK_GOUT_CLUSTER1_PCLK		14</div><div class='add'>+#define CLK_GOUT_CLUSTER1_PERIPHCLK	15</div><div class='add'>+#define CLK_GOUT_CLUSTER1_SCLK		16</div><div class='add'>+#define CLK_GOUT_CPUCL1_CMU_CPUCL1_PCLK	17</div><div class='add'>+#define CLK_GOUT_CLUSTER1_CPU		18</div><div class='add'>+#define CLK_CLUSTER1_SCLK		19</div><div class='add'>+</div><div class='ctx'> /* CMU_G3D */</div><div class='ctx'> #define CLK_FOUT_G3D_PLL		1</div><div class='ctx'> #define CLK_MOUT_G3D_PLL		2</div><div class='hunk'>@@ -304,6 +358,7 @@</div><div class='ctx'> #define CLK_GOUT_UART_PCLK		32</div><div class='ctx'> #define CLK_GOUT_WDT0_PCLK		33</div><div class='ctx'> #define CLK_GOUT_WDT1_PCLK		34</div><div class='add'>+#define CLK_GOUT_BUSIF_TMU_PCLK		35</div><div class='ctx'> </div><div class='ctx'> /* CMU_CORE */</div><div class='ctx'> #define CLK_MOUT_CORE_BUS_USER		1</div><div class='head'>diff --git a/include/dt-bindings/clock/fsd-clk.h b/include/dt-bindings/clock/fsd-clk.h<br/>index c8a2af1dd1ad..58fdec8f4c2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/fsd-clk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/fsd-clk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/fsd-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/fsd-clk.h</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #define DOUT_CMU_IMEM_ACLK			13</div><div class='ctx'> #define DOUT_CMU_IMEM_DMACLK			14</div><div class='ctx'> #define GAT_CMU_FSYS0_SHARED0DIV4		15</div><div class='del'>-#define CMU_NR_CLK				16</div><div class='ctx'> </div><div class='ctx'> /* PERIC */</div><div class='ctx'> #define PERIC_SCLK_UART0			1</div><div class='hunk'>@@ -76,7 +75,6 @@</div><div class='ctx'> #define PERIC_EQOS_PHYRXCLK_MUX			43</div><div class='ctx'> #define PERIC_EQOS_PHYRXCLK			44</div><div class='ctx'> #define PERIC_DOUT_RGMII_CLK			45</div><div class='del'>-#define PERIC_NR_CLK				46</div><div class='ctx'> </div><div class='ctx'> /* FSYS0 */</div><div class='ctx'> #define UFS0_MPHY_REFCLK_IXTAL24		1</div><div class='hunk'>@@ -101,7 +99,6 @@</div><div class='ctx'> #define FSYS0_EQOS_TOP0_IPCLKPORT_RGMII_CLK_I	20</div><div class='ctx'> #define FSYS0_EQOS_TOP0_IPCLKPORT_CLK_RX_I	21</div><div class='ctx'> #define FSYS0_DOUT_FSYS0_PERIBUS_GRP		22</div><div class='del'>-#define FSYS0_NR_CLK				23</div><div class='ctx'> </div><div class='ctx'> /* FSYS1 */</div><div class='ctx'> #define PCIE_LINK0_IPCLKPORT_DBI_ACLK		1</div><div class='hunk'>@@ -112,7 +109,6 @@</div><div class='ctx'> #define PCIE_LINK1_IPCLKPORT_AUX_ACLK		6</div><div class='ctx'> #define PCIE_LINK1_IPCLKPORT_MSTR_ACLK		7</div><div class='ctx'> #define PCIE_LINK1_IPCLKPORT_SLV_ACLK		8</div><div class='del'>-#define FSYS1_NR_CLK				9</div><div class='ctx'> </div><div class='ctx'> /* IMEM */</div><div class='ctx'> #define IMEM_DMA0_IPCLKPORT_ACLK		1</div><div class='hunk'>@@ -126,11 +122,9 @@</div><div class='ctx'> #define IMEM_TMU_TOP_IPCLKPORT_I_CLK_TS		9</div><div class='ctx'> #define IMEM_TMU_GPU_IPCLKPORT_I_CLK_TS		10</div><div class='ctx'> #define IMEM_TMU_GT_IPCLKPORT_I_CLK_TS		11</div><div class='del'>-#define IMEM_NR_CLK				12</div><div class='ctx'> </div><div class='ctx'> /* MFC */</div><div class='ctx'> #define MFC_MFC_IPCLKPORT_ACLK			1</div><div class='del'>-#define MFC_NR_CLK				2</div><div class='ctx'> </div><div class='ctx'> /* CAM_CSI */</div><div class='ctx'> #define CAM_CSI0_0_IPCLKPORT_I_ACLK		1</div><div class='hunk'>@@ -145,6 +139,18 @@</div><div class='ctx'> #define CAM_CSI2_1_IPCLKPORT_I_ACLK		10</div><div class='ctx'> #define CAM_CSI2_2_IPCLKPORT_I_ACLK		11</div><div class='ctx'> #define CAM_CSI2_3_IPCLKPORT_I_ACLK		12</div><div class='del'>-#define CAM_CSI_NR_CLK				13</div><div class='add'>+#define CAM_CSI_PLL				13</div><div class='add'>+#define CAM_CSI0_0_IPCLKPORT_I_PCLK		14</div><div class='add'>+#define CAM_CSI0_1_IPCLKPORT_I_PCLK		15</div><div class='add'>+#define CAM_CSI0_2_IPCLKPORT_I_PCLK		16</div><div class='add'>+#define CAM_CSI0_3_IPCLKPORT_I_PCLK		17</div><div class='add'>+#define CAM_CSI1_0_IPCLKPORT_I_PCLK		18</div><div class='add'>+#define CAM_CSI1_1_IPCLKPORT_I_PCLK		19</div><div class='add'>+#define CAM_CSI1_2_IPCLKPORT_I_PCLK		20</div><div class='add'>+#define CAM_CSI1_3_IPCLKPORT_I_PCLK		21</div><div class='add'>+#define CAM_CSI2_0_IPCLKPORT_I_PCLK		22</div><div class='add'>+#define CAM_CSI2_1_IPCLKPORT_I_PCLK		23</div><div class='add'>+#define CAM_CSI2_2_IPCLKPORT_I_PCLK		24</div><div class='add'>+#define CAM_CSI2_3_IPCLKPORT_I_PCLK		25</div><div class='ctx'> </div><div class='ctx'> #endif /*_DT_BINDINGS_CLOCK_FSD_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/google,gs101-acpm.h b/include/dt-bindings/clock/google,gs101-acpm.h<br/>new file mode 100644<br/>index 000000000000..e2ba89e09fa6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/google,gs101-acpm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/google,gs101-acpm.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2025 Linaro Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Device Tree binding constants for Google gs101 ACPM clock controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_GOOGLE_GS101_ACPM_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_GOOGLE_GS101_ACPM_H</div><div class='add'>+</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_MIF				0</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_INT				1</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_CPUCL0			2</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_CPUCL1			3</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_CPUCL2			4</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_G3D				5</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_G3DL2			6</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_TPU				7</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_INTCAM			8</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_TNR				9</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_CAM				10</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_MFC				11</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_DISP			12</div><div class='add'>+#define GS101_CLK_ACPM_DVFS_BO				13</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLOCK_GOOGLE_GS101_ACPM_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/google,gs101.h b/include/dt-bindings/clock/google,gs101.h<br/>index 3dac3577788a..442f9e9037dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/google,gs101.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/google,gs101.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/google,gs101.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/google,gs101.h</a></div><div class='hunk'>@@ -313,6 +313,122 @@</div><div class='ctx'> #define CLK_APM_PLL_DIV4_APM				70</div><div class='ctx'> #define CLK_APM_PLL_DIV16_APM				71</div><div class='ctx'> </div><div class='add'>+/* CMU_HSI0 */</div><div class='add'>+#define CLK_FOUT_USB_PLL					1</div><div class='add'>+#define CLK_MOUT_PLL_USB					2</div><div class='add'>+#define CLK_MOUT_HSI0_ALT_USER					3</div><div class='add'>+#define CLK_MOUT_HSI0_BUS_USER					4</div><div class='add'>+#define CLK_MOUT_HSI0_DPGTC_USER				5</div><div class='add'>+#define CLK_MOUT_HSI0_TCXO_USER					6</div><div class='add'>+#define CLK_MOUT_HSI0_USB20_USER				7</div><div class='add'>+#define CLK_MOUT_HSI0_USB31DRD_USER				8</div><div class='add'>+#define CLK_MOUT_HSI0_USBDPDBG_USER				9</div><div class='add'>+#define CLK_MOUT_HSI0_BUS					10</div><div class='add'>+#define CLK_MOUT_HSI0_USB20_REF					11</div><div class='add'>+#define CLK_MOUT_HSI0_USB31DRD					12</div><div class='add'>+#define CLK_DOUT_HSI0_USB31DRD					13</div><div class='add'>+#define CLK_GOUT_HSI0_PCLK					14</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_I_USB31DRD_SUSPEND_CLK_26	15</div><div class='add'>+#define CLK_GOUT_HSI0_CLK_HSI0_ALT				16</div><div class='add'>+#define CLK_GOUT_HSI0_DP_LINK_I_DP_GTC_CLK			17</div><div class='add'>+#define CLK_GOUT_HSI0_DP_LINK_I_PCLK				18</div><div class='add'>+#define CLK_GOUT_HSI0_D_TZPC_HSI0_PCLK				19</div><div class='add'>+#define CLK_GOUT_HSI0_ETR_MIU_I_ACLK				20</div><div class='add'>+#define CLK_GOUT_HSI0_ETR_MIU_I_PCLK				21</div><div class='add'>+#define CLK_GOUT_HSI0_GPC_HSI0_PCLK				22</div><div class='add'>+#define CLK_GOUT_HSI0_LHM_AXI_G_ETR_HSI0_I_CLK			23</div><div class='add'>+#define CLK_GOUT_HSI0_LHM_AXI_P_AOCHSI0_I_CLK			24</div><div class='add'>+#define CLK_GOUT_HSI0_LHM_AXI_P_HSI0_I_CLK			25</div><div class='add'>+#define CLK_GOUT_HSI0_LHS_ACEL_D_HSI0_I_CLK			26</div><div class='add'>+#define CLK_GOUT_HSI0_LHS_AXI_D_HSI0AOC_I_CLK			27</div><div class='add'>+#define CLK_GOUT_HSI0_PPMU_HSI0_AOC_ACLK			28</div><div class='add'>+#define CLK_GOUT_HSI0_PPMU_HSI0_AOC_PCLK			29</div><div class='add'>+#define CLK_GOUT_HSI0_PPMU_HSI0_BUS0_ACLK			30</div><div class='add'>+#define CLK_GOUT_HSI0_PPMU_HSI0_BUS0_PCLK			31</div><div class='add'>+#define CLK_GOUT_HSI0_CLK_HSI0_BUS_CLK				32</div><div class='add'>+#define CLK_GOUT_HSI0_SSMT_USB_ACLK				33</div><div class='add'>+#define CLK_GOUT_HSI0_SSMT_USB_PCLK				34</div><div class='add'>+#define CLK_GOUT_HSI0_SYSMMU_USB_CLK_S2				35</div><div class='add'>+#define CLK_GOUT_HSI0_SYSREG_HSI0_PCLK				36</div><div class='add'>+#define CLK_GOUT_HSI0_UASC_HSI0_CTRL_ACLK			37</div><div class='add'>+#define CLK_GOUT_HSI0_UASC_HSI0_CTRL_PCLK			38</div><div class='add'>+#define CLK_GOUT_HSI0_UASC_HSI0_LINK_ACLK			39</div><div class='add'>+#define CLK_GOUT_HSI0_UASC_HSI0_LINK_PCLK			40</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_ACLK_PHYCTRL			41</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_BUS_CLK_EARLY			42</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_I_USB20_PHY_REFCLK_26		43</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_I_USB31DRD_REF_CLK_40		44</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_I_USBDPPHY_REF_SOC_PLL		45</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_I_USBDPPHY_SCL_APB_PCLK		46</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_I_USBPCS_APB_CLK			47</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_USBDPPHY_I_ACLK			48</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_USBDPPHY_UDBG_I_APB_PCLK		49</div><div class='add'>+#define CLK_GOUT_HSI0_XIU_D0_HSI0_ACLK				50</div><div class='add'>+#define CLK_GOUT_HSI0_XIU_D1_HSI0_ACLK				51</div><div class='add'>+#define CLK_GOUT_HSI0_XIU_P_HSI0_ACLK				52</div><div class='add'>+</div><div class='add'>+/* CMU_HSI2 */</div><div class='add'>+#define CLK_MOUT_HSI2_BUS_USER						1</div><div class='add'>+#define CLK_MOUT_HSI2_MMC_CARD_USER					2</div><div class='add'>+#define CLK_MOUT_HSI2_PCIE_USER						3</div><div class='add'>+#define CLK_MOUT_HSI2_UFS_EMBD_USER					4</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_003_PHY_REFCLK_IN		5</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_004_PHY_REFCLK_IN		6</div><div class='add'>+#define CLK_GOUT_HSI2_SSMT_PCIE_IA_GEN4A_1_ACLK				7</div><div class='add'>+#define CLK_GOUT_HSI2_SSMT_PCIE_IA_GEN4A_1_PCLK				8</div><div class='add'>+#define CLK_GOUT_HSI2_SSMT_PCIE_IA_GEN4B_1_ACLK				9</div><div class='add'>+#define CLK_GOUT_HSI2_SSMT_PCIE_IA_GEN4B_1_PCLK				10</div><div class='add'>+#define CLK_GOUT_HSI2_D_TZPC_HSI2_PCLK					11</div><div class='add'>+#define CLK_GOUT_HSI2_GPC_HSI2_PCLK					12</div><div class='add'>+#define CLK_GOUT_HSI2_GPIO_HSI2_PCLK					13</div><div class='add'>+#define CLK_GOUT_HSI2_HSI2_CMU_HSI2_PCLK				14</div><div class='add'>+#define CLK_GOUT_HSI2_LHM_AXI_P_HSI2_I_CLK				15</div><div class='add'>+#define CLK_GOUT_HSI2_LHS_ACEL_D_HSI2_I_CLK				16</div><div class='add'>+#define CLK_GOUT_HSI2_MMC_CARD_I_ACLK					17</div><div class='add'>+#define CLK_GOUT_HSI2_MMC_CARD_SDCLKIN					18</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_003_DBI_ACLK_UG			19</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_003_MSTR_ACLK_UG			20</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_003_SLV_ACLK_UG			21</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_003_I_DRIVER_APB_CLK		22</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_004_DBI_ACLK_UG			23</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_004_MSTR_ACLK_UG			24</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_004_SLV_ACLK_UG			25</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCIE_004_I_DRIVER_APB_CLK		26</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCS_PMA_PHY_UDBG_I_APB_PCLK		27</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCS_PMA_PIPE_PAL_PCIE_I_APB_PCLK	28</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_GEN4_1_PCS_PMA_PCIEPHY210X2_QCH_I_APB_PCLK	29</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_IA_GEN4A_1_I_CLK				30</div><div class='add'>+#define CLK_GOUT_HSI2_PCIE_IA_GEN4B_1_I_CLK				31</div><div class='add'>+#define CLK_GOUT_HSI2_PPMU_HSI2_ACLK					32</div><div class='add'>+#define CLK_GOUT_HSI2_PPMU_HSI2_PCLK					33</div><div class='add'>+#define CLK_GOUT_HSI2_QE_MMC_CARD_HSI2_ACLK				34</div><div class='add'>+#define CLK_GOUT_HSI2_QE_MMC_CARD_HSI2_PCLK				35</div><div class='add'>+#define CLK_GOUT_HSI2_QE_PCIE_GEN4A_HSI2_ACLK				36</div><div class='add'>+#define CLK_GOUT_HSI2_QE_PCIE_GEN4A_HSI2_PCLK				37</div><div class='add'>+#define CLK_GOUT_HSI2_QE_PCIE_GEN4B_HSI2_ACLK				38</div><div class='add'>+#define CLK_GOUT_HSI2_QE_PCIE_GEN4B_HSI2_PCLK				39</div><div class='add'>+#define CLK_GOUT_HSI2_QE_UFS_EMBD_HSI2_ACLK				40</div><div class='add'>+#define CLK_GOUT_HSI2_QE_UFS_EMBD_HSI2_PCLK				41</div><div class='add'>+#define CLK_GOUT_HSI2_CLK_HSI2_BUS_CLK					42</div><div class='add'>+#define CLK_GOUT_HSI2_CLK_HSI2_OSCCLK_CLK				43</div><div class='add'>+#define CLK_GOUT_HSI2_SSMT_HSI2_ACLK					44</div><div class='add'>+#define CLK_GOUT_HSI2_SSMT_HSI2_PCLK					45</div><div class='add'>+#define CLK_GOUT_HSI2_SYSMMU_HSI2_CLK_S2				46</div><div class='add'>+#define CLK_GOUT_HSI2_SYSREG_HSI2_PCLK					47</div><div class='add'>+#define CLK_GOUT_HSI2_UASC_PCIE_GEN4A_DBI_1_ACLK			48</div><div class='add'>+#define CLK_GOUT_HSI2_UASC_PCIE_GEN4A_DBI_1_PCLK			49</div><div class='add'>+#define CLK_GOUT_HSI2_UASC_PCIE_GEN4A_SLV_1_ACLK			50</div><div class='add'>+#define CLK_GOUT_HSI2_UASC_PCIE_GEN4A_SLV_1_PCLK			51</div><div class='add'>+#define CLK_GOUT_HSI2_UASC_PCIE_GEN4B_DBI_1_ACLK			52</div><div class='add'>+#define CLK_GOUT_HSI2_UASC_PCIE_GEN4B_DBI_1_PCLK			53</div><div class='add'>+#define CLK_GOUT_HSI2_UASC_PCIE_GEN4B_SLV_1_ACLK			54</div><div class='add'>+#define CLK_GOUT_HSI2_UASC_PCIE_GEN4B_SLV_1_PCLK			55</div><div class='add'>+#define CLK_GOUT_HSI2_UFS_EMBD_I_ACLK					56</div><div class='add'>+#define CLK_GOUT_HSI2_UFS_EMBD_I_CLK_UNIPRO				57</div><div class='add'>+#define CLK_GOUT_HSI2_UFS_EMBD_I_FMP_CLK				58</div><div class='add'>+#define CLK_GOUT_HSI2_XIU_D_HSI2_ACLK					59</div><div class='add'>+#define CLK_GOUT_HSI2_XIU_P_HSI2_ACLK					60</div><div class='add'>+</div><div class='ctx'> /* CMU_MISC */</div><div class='ctx'> #define CLK_MOUT_MISC_BUS_USER				1</div><div class='ctx'> #define CLK_MOUT_MISC_SSS_USER				2</div><div class='head'>diff --git a/include/dt-bindings/clock/imx8ulp-clock.h b/include/dt-bindings/clock/imx8ulp-clock.h<br/>index 827404fadf5c..c62d84d093a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/imx8ulp-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/imx8ulp-clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/imx8ulp-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/imx8ulp-clock.h</a></div><div class='hunk'>@@ -255,4 +255,9 @@</div><div class='ctx'> </div><div class='ctx'> #define IMX8ULP_CLK_PCC5_END		56</div><div class='ctx'> </div><div class='add'>+/* LPAV SIM */</div><div class='add'>+#define IMX8ULP_CLK_SIM_LPAV_HIFI_CORE		0</div><div class='add'>+#define IMX8ULP_CLK_SIM_LPAV_HIFI_PBCLK		1</div><div class='add'>+#define IMX8ULP_CLK_SIM_LPAV_HIFI_PLAT		2</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/imx93-clock.h b/include/dt-bindings/clock/imx93-clock.h<br/>index 787c9e74dc96..c393fad3a346 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/imx93-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/imx93-clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/imx93-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/imx93-clock.h</a></div><div class='hunk'>@@ -204,6 +204,11 @@</div><div class='ctx'> #define IMX93_CLK_A55_SEL		199</div><div class='ctx'> #define IMX93_CLK_A55_CORE		200</div><div class='ctx'> #define IMX93_CLK_PDM_IPG		201</div><div class='del'>-#define IMX93_CLK_END			202</div><div class='add'>+#define IMX91_CLK_ENET1_QOS_TSN     202</div><div class='add'>+#define IMX91_CLK_ENET_TIMER        203</div><div class='add'>+#define IMX91_CLK_ENET2_REGULAR     204</div><div class='add'>+#define IMX91_CLK_ENET2_REGULAR_GATE		205</div><div class='add'>+#define IMX91_CLK_ENET1_QOS_TSN_GATE		206</div><div class='add'>+#define IMX93_CLK_SPDIF_IPG		207</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/loongson,ls2k-clk.h b/include/dt-bindings/clock/loongson,ls2k-clk.h<br/>index 3bc4dfc193c2..8cbb86b2cf1e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/loongson,ls2k-clk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/loongson,ls2k-clk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/loongson,ls2k-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/loongson,ls2k-clk.h</a></div><div class='hunk'>@@ -7,24 +7,76 @@</div><div class='ctx'> #ifndef __DT_BINDINGS_CLOCK_LOONGSON2_H</div><div class='ctx'> #define __DT_BINDINGS_CLOCK_LOONGSON2_H</div><div class='ctx'> </div><div class='del'>-#define LOONGSON2_REF_100M				0</div><div class='del'>-#define LOONGSON2_NODE_PLL				1</div><div class='del'>-#define LOONGSON2_DDR_PLL				2</div><div class='del'>-#define LOONGSON2_DC_PLL				3</div><div class='del'>-#define LOONGSON2_PIX0_PLL				4</div><div class='del'>-#define LOONGSON2_PIX1_PLL				5</div><div class='del'>-#define LOONGSON2_NODE_CLK				6</div><div class='del'>-#define LOONGSON2_HDA_CLK				7</div><div class='del'>-#define LOONGSON2_GPU_CLK				8</div><div class='del'>-#define LOONGSON2_DDR_CLK				9</div><div class='del'>-#define LOONGSON2_GMAC_CLK				10</div><div class='del'>-#define LOONGSON2_DC_CLK				11</div><div class='del'>-#define LOONGSON2_APB_CLK				12</div><div class='del'>-#define LOONGSON2_USB_CLK				13</div><div class='del'>-#define LOONGSON2_SATA_CLK				14</div><div class='del'>-#define LOONGSON2_PIX0_CLK				15</div><div class='del'>-#define LOONGSON2_PIX1_CLK				16</div><div class='del'>-#define LOONGSON2_BOOT_CLK				17</div><div class='del'>-#define LOONGSON2_CLK_END				18</div><div class='add'>+#define LOONGSON2_REF_100M	0</div><div class='add'>+#define LOONGSON2_NODE_PLL	1</div><div class='add'>+#define LOONGSON2_DDR_PLL	2</div><div class='add'>+#define LOONGSON2_DC_PLL	3</div><div class='add'>+#define LOONGSON2_PIX0_PLL	4</div><div class='add'>+#define LOONGSON2_PIX1_PLL	5</div><div class='add'>+#define LOONGSON2_NODE_CLK	6</div><div class='add'>+#define LOONGSON2_HDA_CLK	7</div><div class='add'>+#define LOONGSON2_GPU_CLK	8</div><div class='add'>+#define LOONGSON2_DDR_CLK	9</div><div class='add'>+#define LOONGSON2_GMAC_CLK	10</div><div class='add'>+#define LOONGSON2_DC_CLK	11</div><div class='add'>+#define LOONGSON2_APB_CLK	12</div><div class='add'>+#define LOONGSON2_USB_CLK	13</div><div class='add'>+#define LOONGSON2_SATA_CLK	14</div><div class='add'>+#define LOONGSON2_PIX0_CLK	15</div><div class='add'>+#define LOONGSON2_PIX1_CLK	16</div><div class='add'>+#define LOONGSON2_BOOT_CLK	17</div><div class='add'>+#define LOONGSON2_OUT0_GATE	18</div><div class='add'>+#define LOONGSON2_GMAC_GATE	19</div><div class='add'>+#define LOONGSON2_RIO_GATE	20</div><div class='add'>+#define LOONGSON2_DC_GATE	21</div><div class='add'>+#define LOONGSON2_GPU_GATE	22</div><div class='add'>+#define LOONGSON2_DDR_GATE	23</div><div class='add'>+#define LOONGSON2_HDA_GATE	24</div><div class='add'>+#define LOONGSON2_NODE_GATE	25</div><div class='add'>+#define LOONGSON2_EMMC_GATE	26</div><div class='add'>+#define LOONGSON2_PIX0_GATE	27</div><div class='add'>+#define LOONGSON2_PIX1_GATE	28</div><div class='add'>+#define LOONGSON2_OUT0_CLK	29</div><div class='add'>+#define LOONGSON2_RIO_CLK	30</div><div class='add'>+#define LOONGSON2_EMMC_CLK	31</div><div class='add'>+#define LOONGSON2_DES_CLK	32</div><div class='add'>+#define LOONGSON2_I2S_CLK	33</div><div class='add'>+#define LOONGSON2_MISC_CLK	34</div><div class='add'>+</div><div class='add'>+#define LS2K0300_CLK_STABLE		0</div><div class='add'>+#define LS2K0300_NODE_PLL		1</div><div class='add'>+#define LS2K0300_DDR_PLL		2</div><div class='add'>+#define LS2K0300_PIX_PLL		3</div><div class='add'>+#define LS2K0300_CLK_THSENS		4</div><div class='add'>+#define LS2K0300_CLK_NODE_DIV		5</div><div class='add'>+#define LS2K0300_CLK_NODE_PLL_GATE	6</div><div class='add'>+#define LS2K0300_CLK_NODE_SCALE		7</div><div class='add'>+#define LS2K0300_CLK_NODE_GATE		8</div><div class='add'>+#define LS2K0300_CLK_GMAC_DIV		9</div><div class='add'>+#define LS2K0300_CLK_GMAC_GATE		10</div><div class='add'>+#define LS2K0300_CLK_I2S_DIV		11</div><div class='add'>+#define LS2K0300_CLK_I2S_SCALE		12</div><div class='add'>+#define LS2K0300_CLK_I2S_GATE		13</div><div class='add'>+#define LS2K0300_CLK_DDR_DIV		14</div><div class='add'>+#define LS2K0300_CLK_DDR_GATE		15</div><div class='add'>+#define LS2K0300_CLK_NET_DIV		16</div><div class='add'>+#define LS2K0300_CLK_NET_GATE		17</div><div class='add'>+#define LS2K0300_CLK_DEV_DIV		18</div><div class='add'>+#define LS2K0300_CLK_DEV_GATE		19</div><div class='add'>+#define LS2K0300_CLK_PIX_DIV		20</div><div class='add'>+#define LS2K0300_CLK_PIX_PLL_GATE	21</div><div class='add'>+#define LS2K0300_CLK_PIX_SCALE		22</div><div class='add'>+#define LS2K0300_CLK_PIX_GATE		23</div><div class='add'>+#define LS2K0300_CLK_GMACBP_DIV		24</div><div class='add'>+#define LS2K0300_CLK_GMACBP_GATE	25</div><div class='add'>+#define LS2K0300_CLK_USB_SCALE		26</div><div class='add'>+#define LS2K0300_CLK_USB_GATE		27</div><div class='add'>+#define LS2K0300_CLK_APB_SCALE		28</div><div class='add'>+#define LS2K0300_CLK_APB_GATE		29</div><div class='add'>+#define LS2K0300_CLK_BOOT_SCALE		30</div><div class='add'>+#define LS2K0300_CLK_BOOT_GATE		31</div><div class='add'>+#define LS2K0300_CLK_SDIO_SCALE		32</div><div class='add'>+#define LS2K0300_CLK_SDIO_GATE		33</div><div class='add'>+#define LS2K0300_CLK_GMAC_IN		34</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/marvell,pxa1908.h b/include/dt-bindings/clock/marvell,pxa1908.h<br/>new file mode 100644<br/>index 000000000000..fb15b0d0cd4c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/marvell,pxa1908.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/marvell,pxa1908.h</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+#ifndef __DTS_MARVELL_PXA1908_CLOCK_H</div><div class='add'>+#define __DTS_MARVELL_PXA1908_CLOCK_H</div><div class='add'>+</div><div class='add'>+/* plls */</div><div class='add'>+#define PXA1908_CLK_CLK32		1</div><div class='add'>+#define PXA1908_CLK_VCTCXO		2</div><div class='add'>+#define PXA1908_CLK_PLL1_624		3</div><div class='add'>+#define PXA1908_CLK_PLL1_416		4</div><div class='add'>+#define PXA1908_CLK_PLL1_499		5</div><div class='add'>+#define PXA1908_CLK_PLL1_832		6</div><div class='add'>+#define PXA1908_CLK_PLL1_1248		7</div><div class='add'>+#define PXA1908_CLK_PLL1_D2		8</div><div class='add'>+#define PXA1908_CLK_PLL1_D4		9</div><div class='add'>+#define PXA1908_CLK_PLL1_D8		10</div><div class='add'>+#define PXA1908_CLK_PLL1_D16		11</div><div class='add'>+#define PXA1908_CLK_PLL1_D6		12</div><div class='add'>+#define PXA1908_CLK_PLL1_D12		13</div><div class='add'>+#define PXA1908_CLK_PLL1_D24		14</div><div class='add'>+#define PXA1908_CLK_PLL1_D48		15</div><div class='add'>+#define PXA1908_CLK_PLL1_D96		16</div><div class='add'>+#define PXA1908_CLK_PLL1_D13		17</div><div class='add'>+#define PXA1908_CLK_PLL1_32		18</div><div class='add'>+#define PXA1908_CLK_PLL1_208		19</div><div class='add'>+#define PXA1908_CLK_PLL1_117		20</div><div class='add'>+#define PXA1908_CLK_PLL1_416_GATE	21</div><div class='add'>+#define PXA1908_CLK_PLL1_624_GATE	22</div><div class='add'>+#define PXA1908_CLK_PLL1_832_GATE	23</div><div class='add'>+#define PXA1908_CLK_PLL1_1248_GATE	24</div><div class='add'>+#define PXA1908_CLK_PLL1_D2_GATE	25</div><div class='add'>+#define PXA1908_CLK_PLL1_499_EN		26</div><div class='add'>+#define PXA1908_CLK_PLL2VCO		27</div><div class='add'>+#define PXA1908_CLK_PLL2		28</div><div class='add'>+#define PXA1908_CLK_PLL2P		29</div><div class='add'>+#define PXA1908_CLK_PLL2VCODIV3		30</div><div class='add'>+#define PXA1908_CLK_PLL3VCO		31</div><div class='add'>+#define PXA1908_CLK_PLL3		32</div><div class='add'>+#define PXA1908_CLK_PLL3P		33</div><div class='add'>+#define PXA1908_CLK_PLL3VCODIV3		34</div><div class='add'>+#define PXA1908_CLK_PLL4VCO		35</div><div class='add'>+#define PXA1908_CLK_PLL4		36</div><div class='add'>+#define PXA1908_CLK_PLL4P		37</div><div class='add'>+#define PXA1908_CLK_PLL4VCODIV3		38</div><div class='add'>+</div><div class='add'>+/* apb (apbc) peripherals */</div><div class='add'>+#define PXA1908_CLK_UART0		1</div><div class='add'>+#define PXA1908_CLK_UART1		2</div><div class='add'>+#define PXA1908_CLK_GPIO		3</div><div class='add'>+#define PXA1908_CLK_PWM0		4</div><div class='add'>+#define PXA1908_CLK_PWM1		5</div><div class='add'>+#define PXA1908_CLK_PWM2		6</div><div class='add'>+#define PXA1908_CLK_PWM3		7</div><div class='add'>+#define PXA1908_CLK_SSP0		8</div><div class='add'>+#define PXA1908_CLK_SSP1		9</div><div class='add'>+#define PXA1908_CLK_IPC_RST		10</div><div class='add'>+#define PXA1908_CLK_RTC			11</div><div class='add'>+#define PXA1908_CLK_TWSI0		12</div><div class='add'>+#define PXA1908_CLK_KPC			13</div><div class='add'>+#define PXA1908_CLK_SWJTAG		14</div><div class='add'>+#define PXA1908_CLK_SSP2		15</div><div class='add'>+#define PXA1908_CLK_TWSI1		16</div><div class='add'>+#define PXA1908_CLK_THERMAL		17</div><div class='add'>+#define PXA1908_CLK_TWSI3		18</div><div class='add'>+</div><div class='add'>+/* apb (apbcp) peripherals */</div><div class='add'>+#define PXA1908_CLK_UART2		1</div><div class='add'>+#define PXA1908_CLK_TWSI2		2</div><div class='add'>+#define PXA1908_CLK_AICER		3</div><div class='add'>+</div><div class='add'>+/* axi (apmu) peripherals */</div><div class='add'>+#define PXA1908_CLK_CCIC1		1</div><div class='add'>+#define PXA1908_CLK_ISP			2</div><div class='add'>+#define PXA1908_CLK_DSI1		3</div><div class='add'>+#define PXA1908_CLK_DISP1		4</div><div class='add'>+#define PXA1908_CLK_CCIC0		5</div><div class='add'>+#define PXA1908_CLK_SDH0		6</div><div class='add'>+#define PXA1908_CLK_SDH1		7</div><div class='add'>+#define PXA1908_CLK_USB			8</div><div class='add'>+#define PXA1908_CLK_NF			9</div><div class='add'>+#define PXA1908_CLK_CORE_DEBUG		10</div><div class='add'>+#define PXA1908_CLK_VPU			11</div><div class='add'>+#define PXA1908_CLK_GC			12</div><div class='add'>+#define PXA1908_CLK_SDH2		13</div><div class='add'>+#define PXA1908_CLK_GC2D		14</div><div class='add'>+#define PXA1908_CLK_TRACE		15</div><div class='add'>+#define PXA1908_CLK_DVC_DFC_DEBUG	16</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt6735-apmixedsys.h b/include/dt-bindings/clock/mediatek,mt6735-apmixedsys.h<br/>new file mode 100644<br/>index 000000000000..b4705204409c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt6735-apmixedsys.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt6735-apmixedsys.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT6735_APMIXEDSYS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT6735_APMIXEDSYS_H</div><div class='add'>+</div><div class='add'>+#define CLK_APMIXED_ARMPLL		0</div><div class='add'>+#define CLK_APMIXED_MAINPLL		1</div><div class='add'>+#define CLK_APMIXED_UNIVPLL		2</div><div class='add'>+#define CLK_APMIXED_MMPLL		3</div><div class='add'>+#define CLK_APMIXED_MSDCPLL		4</div><div class='add'>+#define CLK_APMIXED_VENCPLL		5</div><div class='add'>+#define CLK_APMIXED_TVDPLL		6</div><div class='add'>+#define CLK_APMIXED_APLL1		7</div><div class='add'>+#define CLK_APMIXED_APLL2		8</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt6735-imgsys.h b/include/dt-bindings/clock/mediatek,mt6735-imgsys.h<br/>new file mode 100644<br/>index 000000000000..f250c26c5eb4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt6735-imgsys.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt6735-imgsys.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT6735_IMGSYS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT6735_IMGSYS_H</div><div class='add'>+</div><div class='add'>+#define CLK_IMG_SMI_LARB2		0</div><div class='add'>+#define CLK_IMG_CAM_SMI			1</div><div class='add'>+#define CLK_IMG_CAM_CAM			2</div><div class='add'>+#define CLK_IMG_SEN_TG			3</div><div class='add'>+#define CLK_IMG_SEN_CAM			4</div><div class='add'>+#define CLK_IMG_CAM_SV			5</div><div class='add'>+#define CLK_IMG_SUFOD			6</div><div class='add'>+#define CLK_IMG_FD			7</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_MT6735_IMGSYS_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt6735-infracfg.h b/include/dt-bindings/clock/mediatek,mt6735-infracfg.h<br/>new file mode 100644<br/>index 000000000000..d8dd51e15637<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt6735-infracfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt6735-infracfg.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT6735_INFRACFG_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT6735_INFRACFG_H</div><div class='add'>+</div><div class='add'>+#define CLK_INFRA_DBG			0</div><div class='add'>+#define CLK_INFRA_GCE			1</div><div class='add'>+#define CLK_INFRA_TRBG			2</div><div class='add'>+#define CLK_INFRA_CPUM			3</div><div class='add'>+#define CLK_INFRA_DEVAPC		4</div><div class='add'>+#define CLK_INFRA_AUDIO			5</div><div class='add'>+#define CLK_INFRA_GCPU			6</div><div class='add'>+#define CLK_INFRA_L2C_SRAM		7</div><div class='add'>+#define CLK_INFRA_M4U			8</div><div class='add'>+#define CLK_INFRA_CLDMA			9</div><div class='add'>+#define CLK_INFRA_CONNMCU_BUS		10</div><div class='add'>+#define CLK_INFRA_KP			11</div><div class='add'>+#define CLK_INFRA_APXGPT		12</div><div class='add'>+#define CLK_INFRA_SEJ			13</div><div class='add'>+#define CLK_INFRA_CCIF0_AP		14</div><div class='add'>+#define CLK_INFRA_CCIF1_AP		15</div><div class='add'>+#define CLK_INFRA_PMIC_SPI		16</div><div class='add'>+#define CLK_INFRA_PMIC_WRAP		17</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt6735-mfgcfg.h b/include/dt-bindings/clock/mediatek,mt6735-mfgcfg.h<br/>new file mode 100644<br/>index 000000000000..d2d99a48348a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt6735-mfgcfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt6735-mfgcfg.h</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT6735_MFGCFG_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT6735_MFGCFG_H</div><div class='add'>+</div><div class='add'>+#define CLK_MFG_BG3D			0</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_MT6735_MFGCFG_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt6735-pericfg.h b/include/dt-bindings/clock/mediatek,mt6735-pericfg.h<br/>new file mode 100644<br/>index 000000000000..16bc21bbd95b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt6735-pericfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt6735-pericfg.h</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT6735_PERICFG_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT6735_PERICFG_H</div><div class='add'>+</div><div class='add'>+#define CLK_PERI_DISP_PWM		0</div><div class='add'>+#define CLK_PERI_THERM			1</div><div class='add'>+#define CLK_PERI_PWM1			2</div><div class='add'>+#define CLK_PERI_PWM2			3</div><div class='add'>+#define CLK_PERI_PWM3			4</div><div class='add'>+#define CLK_PERI_PWM4			5</div><div class='add'>+#define CLK_PERI_PWM5			6</div><div class='add'>+#define CLK_PERI_PWM6			7</div><div class='add'>+#define CLK_PERI_PWM7			8</div><div class='add'>+#define CLK_PERI_PWM			9</div><div class='add'>+#define CLK_PERI_USB0			10</div><div class='add'>+#define CLK_PERI_IRDA			11</div><div class='add'>+#define CLK_PERI_APDMA			12</div><div class='add'>+#define CLK_PERI_MSDC30_0		13</div><div class='add'>+#define CLK_PERI_MSDC30_1		14</div><div class='add'>+#define CLK_PERI_MSDC30_2		15</div><div class='add'>+#define CLK_PERI_MSDC30_3		16</div><div class='add'>+#define CLK_PERI_UART0			17</div><div class='add'>+#define CLK_PERI_UART1			18</div><div class='add'>+#define CLK_PERI_UART2			19</div><div class='add'>+#define CLK_PERI_UART3			20</div><div class='add'>+#define CLK_PERI_UART4			21</div><div class='add'>+#define CLK_PERI_BTIF			22</div><div class='add'>+#define CLK_PERI_I2C0			23</div><div class='add'>+#define CLK_PERI_I2C1			24</div><div class='add'>+#define CLK_PERI_I2C2			25</div><div class='add'>+#define CLK_PERI_I2C3			26</div><div class='add'>+#define CLK_PERI_AUXADC			27</div><div class='add'>+#define CLK_PERI_SPI0			28</div><div class='add'>+#define CLK_PERI_IRTX			29</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt6735-topckgen.h b/include/dt-bindings/clock/mediatek,mt6735-topckgen.h<br/>new file mode 100644<br/>index 000000000000..d4b1e113cc0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt6735-topckgen.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt6735-topckgen.h</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT6735_TOPCKGEN_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT6735_TOPCKGEN_H</div><div class='add'>+</div><div class='add'>+#define CLK_TOP_AD_SYS_26M_CK		0</div><div class='add'>+#define CLK_TOP_CLKPH_MCK_O		1</div><div class='add'>+#define CLK_TOP_DMPLL			2</div><div class='add'>+#define CLK_TOP_DPI_CK			3</div><div class='add'>+#define CLK_TOP_WHPLL_AUDIO_CK		4</div><div class='add'>+</div><div class='add'>+#define CLK_TOP_SYSPLL_D2		5</div><div class='add'>+#define CLK_TOP_SYSPLL_D3		6</div><div class='add'>+#define CLK_TOP_SYSPLL_D5		7</div><div class='add'>+#define CLK_TOP_SYSPLL1_D2		8</div><div class='add'>+#define CLK_TOP_SYSPLL1_D4		9</div><div class='add'>+#define CLK_TOP_SYSPLL1_D8		10</div><div class='add'>+#define CLK_TOP_SYSPLL1_D16		11</div><div class='add'>+#define CLK_TOP_SYSPLL2_D2		12</div><div class='add'>+#define CLK_TOP_SYSPLL2_D4		13</div><div class='add'>+#define CLK_TOP_SYSPLL3_D2		14</div><div class='add'>+#define CLK_TOP_SYSPLL3_D4		15</div><div class='add'>+#define CLK_TOP_SYSPLL4_D2		16</div><div class='add'>+#define CLK_TOP_SYSPLL4_D4		17</div><div class='add'>+#define CLK_TOP_UNIVPLL_D2		18</div><div class='add'>+#define CLK_TOP_UNIVPLL_D3		19</div><div class='add'>+#define CLK_TOP_UNIVPLL_D5		20</div><div class='add'>+#define CLK_TOP_UNIVPLL_D26		21</div><div class='add'>+#define CLK_TOP_UNIVPLL1_D2		22</div><div class='add'>+#define CLK_TOP_UNIVPLL1_D4		23</div><div class='add'>+#define CLK_TOP_UNIVPLL1_D8		24</div><div class='add'>+#define CLK_TOP_UNIVPLL2_D2		25</div><div class='add'>+#define CLK_TOP_UNIVPLL2_D4		26</div><div class='add'>+#define CLK_TOP_UNIVPLL2_D8		27</div><div class='add'>+#define CLK_TOP_UNIVPLL3_D2		28</div><div class='add'>+#define CLK_TOP_UNIVPLL3_D4		29</div><div class='add'>+#define CLK_TOP_MSDCPLL_D2		30</div><div class='add'>+#define CLK_TOP_MSDCPLL_D4		31</div><div class='add'>+#define CLK_TOP_MSDCPLL_D8		32</div><div class='add'>+#define CLK_TOP_MSDCPLL_D16		33</div><div class='add'>+#define CLK_TOP_VENCPLL_D3		34</div><div class='add'>+#define CLK_TOP_TVDPLL_D2		35</div><div class='add'>+#define CLK_TOP_TVDPLL_D4		36</div><div class='add'>+#define CLK_TOP_DMPLL_D2		37</div><div class='add'>+#define CLK_TOP_DMPLL_D4		38</div><div class='add'>+#define CLK_TOP_DMPLL_D8		39</div><div class='add'>+#define CLK_TOP_AD_SYS_26M_D2		40</div><div class='add'>+</div><div class='add'>+#define CLK_TOP_AXI_SEL			41</div><div class='add'>+#define CLK_TOP_MEM_SEL			42</div><div class='add'>+#define CLK_TOP_DDRPHY_SEL		43</div><div class='add'>+#define CLK_TOP_MM_SEL			44</div><div class='add'>+#define CLK_TOP_PWM_SEL			45</div><div class='add'>+#define CLK_TOP_VDEC_SEL		46</div><div class='add'>+#define CLK_TOP_MFG_SEL			47</div><div class='add'>+#define CLK_TOP_CAMTG_SEL		48</div><div class='add'>+#define CLK_TOP_UART_SEL		49</div><div class='add'>+#define CLK_TOP_SPI_SEL			50</div><div class='add'>+#define CLK_TOP_USB20_SEL		51</div><div class='add'>+#define CLK_TOP_MSDC50_0_SEL		52</div><div class='add'>+#define CLK_TOP_MSDC30_0_SEL		53</div><div class='add'>+#define CLK_TOP_MSDC30_1_SEL		54</div><div class='add'>+#define CLK_TOP_MSDC30_2_SEL		55</div><div class='add'>+#define CLK_TOP_MSDC30_3_SEL		56</div><div class='add'>+#define CLK_TOP_AUDIO_SEL		57</div><div class='add'>+#define CLK_TOP_AUDINTBUS_SEL		58</div><div class='add'>+#define CLK_TOP_PMICSPI_SEL		59</div><div class='add'>+#define CLK_TOP_SCP_SEL			60</div><div class='add'>+#define CLK_TOP_ATB_SEL			61</div><div class='add'>+#define CLK_TOP_DPI0_SEL		62</div><div class='add'>+#define CLK_TOP_SCAM_SEL		63</div><div class='add'>+#define CLK_TOP_MFG13M_SEL		64</div><div class='add'>+#define CLK_TOP_AUD1_SEL		65</div><div class='add'>+#define CLK_TOP_AUD2_SEL		66</div><div class='add'>+#define CLK_TOP_IRDA_SEL		67</div><div class='add'>+#define CLK_TOP_IRTX_SEL		68</div><div class='add'>+#define CLK_TOP_DISPPWM_SEL		69</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt6735-vdecsys.h b/include/dt-bindings/clock/mediatek,mt6735-vdecsys.h<br/>new file mode 100644<br/>index 000000000000..f94cec10c89f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt6735-vdecsys.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt6735-vdecsys.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT6735_VDECSYS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT6735_VDECSYS_H</div><div class='add'>+</div><div class='add'>+#define CLK_VDEC_VDEC			0</div><div class='add'>+#define CLK_VDEC_SMI_LARB1		1</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_MT6735_VDECSYS_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt6735-vencsys.h b/include/dt-bindings/clock/mediatek,mt6735-vencsys.h<br/>new file mode 100644<br/>index 000000000000..e5a9cb4f269f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt6735-vencsys.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt6735-vencsys.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT6735_VENCSYS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT6735_VENCSYS_H</div><div class='add'>+</div><div class='add'>+#define CLK_VENC_SMI_LARB3			0</div><div class='add'>+#define CLK_VENC_VENC			1</div><div class='add'>+#define CLK_VENC_JPGENC			2</div><div class='add'>+#define CLK_VENC_JPGDEC			3</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_MT6735_VENCSYS_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt8188-clk.h b/include/dt-bindings/clock/mediatek,mt8188-clk.h<br/>index bd5cd100b796..0e87f61c90f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt8188-clk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mediatek,mt8188-clk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt8188-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt8188-clk.h</a></div><div class='hunk'>@@ -721,6 +721,6 @@</div><div class='ctx'> #define CLK_VDO1_DPINTF				58</div><div class='ctx'> #define CLK_VDO1_DISP_MONITOR_DPINTF		59</div><div class='ctx'> #define CLK_VDO1_26M_SLOW			60</div><div class='del'>-#define CLK_VDO1_NR_CLK				61</div><div class='add'>+#define CLK_VDO1_DPI1_HDMI			61</div><div class='ctx'> </div><div class='ctx'> #endif /* _DT_BINDINGS_CLK_MT8188_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mt8196-clock.h b/include/dt-bindings/clock/mediatek,mt8196-clock.h<br/>new file mode 100644<br/>index 000000000000..ae0946ab7621<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mt8196-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mt8196-clock.h</a></div><div class='hunk'>@@ -0,0 +1,803 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 MediaTek Inc.</div><div class='add'>+ *                    Guangjie Song &lt;guangjie.song@mediatek.com&gt;</div><div class='add'>+ * Copyright (c) 2025 Collabora Ltd.</div><div class='add'>+ *                    Laura Nao &lt;laura.nao@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MT8196_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MT8196_H</div><div class='add'>+</div><div class='add'>+/* CKSYS */</div><div class='add'>+#define CLK_TOP_AXI					0</div><div class='add'>+#define CLK_TOP_MEM_SUB					1</div><div class='add'>+#define CLK_TOP_IO_NOC					2</div><div class='add'>+#define CLK_TOP_P_AXI					3</div><div class='add'>+#define CLK_TOP_UFS_PEXTP0_AXI				4</div><div class='add'>+#define CLK_TOP_PEXTP1_USB_AXI				5</div><div class='add'>+#define CLK_TOP_P_FMEM_SUB				6</div><div class='add'>+#define CLK_TOP_PEXPT0_MEM_SUB				7</div><div class='add'>+#define CLK_TOP_PEXTP1_USB_MEM_SUB			8</div><div class='add'>+#define CLK_TOP_P_NOC					9</div><div class='add'>+#define CLK_TOP_EMI_N					10</div><div class='add'>+#define CLK_TOP_EMI_S					11</div><div class='add'>+#define CLK_TOP_AP2CONN_HOST				12</div><div class='add'>+#define CLK_TOP_ATB					13</div><div class='add'>+#define CLK_TOP_CIRQ					14</div><div class='add'>+#define CLK_TOP_PBUS_156M				15</div><div class='add'>+#define CLK_TOP_EFUSE					16</div><div class='add'>+#define CLK_TOP_MCL3GIC					17</div><div class='add'>+#define CLK_TOP_MCINFRA					18</div><div class='add'>+#define CLK_TOP_DSP					19</div><div class='add'>+#define CLK_TOP_MFG_REF					20</div><div class='add'>+#define CLK_TOP_MFG_EB					21</div><div class='add'>+#define CLK_TOP_UART					22</div><div class='add'>+#define CLK_TOP_SPI0_BCLK				23</div><div class='add'>+#define CLK_TOP_SPI1_BCLK				24</div><div class='add'>+#define CLK_TOP_SPI2_BCLK				25</div><div class='add'>+#define CLK_TOP_SPI3_BCLK				26</div><div class='add'>+#define CLK_TOP_SPI4_BCLK				27</div><div class='add'>+#define CLK_TOP_SPI5_BCLK				28</div><div class='add'>+#define CLK_TOP_SPI6_BCLK				29</div><div class='add'>+#define CLK_TOP_SPI7_BCLK				30</div><div class='add'>+#define CLK_TOP_MSDC30_1				31</div><div class='add'>+#define CLK_TOP_MSDC30_2				32</div><div class='add'>+#define CLK_TOP_DISP_PWM				33</div><div class='add'>+#define CLK_TOP_USB_TOP_1P				34</div><div class='add'>+#define CLK_TOP_USB_XHCI_1P				35</div><div class='add'>+#define CLK_TOP_USB_FMCNT_P1				36</div><div class='add'>+#define CLK_TOP_I2C_P					37</div><div class='add'>+#define CLK_TOP_I2C_EAST				38</div><div class='add'>+#define CLK_TOP_I2C_WEST				39</div><div class='add'>+#define CLK_TOP_I2C_NORTH				40</div><div class='add'>+#define CLK_TOP_AES_UFSFDE				41</div><div class='add'>+#define CLK_TOP_UFS					42</div><div class='add'>+#define CLK_TOP_AUD_1					43</div><div class='add'>+#define CLK_TOP_AUD_2					44</div><div class='add'>+#define CLK_TOP_ADSP					45</div><div class='add'>+#define CLK_TOP_ADSP_UARTHUB_B				46</div><div class='add'>+#define CLK_TOP_DPMAIF_MAIN				47</div><div class='add'>+#define CLK_TOP_PWM					48</div><div class='add'>+#define CLK_TOP_MCUPM					49</div><div class='add'>+#define CLK_TOP_IPSEAST					50</div><div class='add'>+#define CLK_TOP_TL					51</div><div class='add'>+#define CLK_TOP_TL_P1					52</div><div class='add'>+#define CLK_TOP_TL_P2					53</div><div class='add'>+#define CLK_TOP_EMI_INTERFACE_546			54</div><div class='add'>+#define CLK_TOP_SDF					55</div><div class='add'>+#define CLK_TOP_UARTHUB_BCLK				56</div><div class='add'>+#define CLK_TOP_DPSW_CMP_26M				57</div><div class='add'>+#define CLK_TOP_SMAP					58</div><div class='add'>+#define CLK_TOP_SSR_PKA					59</div><div class='add'>+#define CLK_TOP_SSR_DMA					60</div><div class='add'>+#define CLK_TOP_SSR_KDF					61</div><div class='add'>+#define CLK_TOP_SSR_RNG					62</div><div class='add'>+#define CLK_TOP_SPU0					63</div><div class='add'>+#define CLK_TOP_SPU1					64</div><div class='add'>+#define CLK_TOP_DXCC					65</div><div class='add'>+#define CLK_TOP_APLL_I2SIN0				66</div><div class='add'>+#define CLK_TOP_APLL_I2SIN1				67</div><div class='add'>+#define CLK_TOP_APLL_I2SIN2				68</div><div class='add'>+#define CLK_TOP_APLL_I2SIN3				69</div><div class='add'>+#define CLK_TOP_APLL_I2SIN4				70</div><div class='add'>+#define CLK_TOP_APLL_I2SIN6				71</div><div class='add'>+#define CLK_TOP_APLL_I2SOUT0				72</div><div class='add'>+#define CLK_TOP_APLL_I2SOUT1				73</div><div class='add'>+#define CLK_TOP_APLL_I2SOUT2				74</div><div class='add'>+#define CLK_TOP_APLL_I2SOUT3				75</div><div class='add'>+#define CLK_TOP_APLL_I2SOUT4				76</div><div class='add'>+#define CLK_TOP_APLL_I2SOUT6				77</div><div class='add'>+#define CLK_TOP_APLL_FMI2S				78</div><div class='add'>+#define CLK_TOP_APLL_TDMOUT				79</div><div class='add'>+#define CLK_TOP_APLL12_DIV_TDMOUT_M			80</div><div class='add'>+#define CLK_TOP_APLL12_DIV_TDMOUT_B			81</div><div class='add'>+#define CLK_TOP_MAINPLL_D3				82</div><div class='add'>+#define CLK_TOP_MAINPLL_D4				83</div><div class='add'>+#define CLK_TOP_MAINPLL_D4_D2				84</div><div class='add'>+#define CLK_TOP_MAINPLL_D4_D4				85</div><div class='add'>+#define CLK_TOP_MAINPLL_D4_D8				86</div><div class='add'>+#define CLK_TOP_MAINPLL_D5				87</div><div class='add'>+#define CLK_TOP_MAINPLL_D5_D2				88</div><div class='add'>+#define CLK_TOP_MAINPLL_D5_D4				89</div><div class='add'>+#define CLK_TOP_MAINPLL_D5_D8				90</div><div class='add'>+#define CLK_TOP_MAINPLL_D6				91</div><div class='add'>+#define CLK_TOP_MAINPLL_D6_D2				92</div><div class='add'>+#define CLK_TOP_MAINPLL_D7				93</div><div class='add'>+#define CLK_TOP_MAINPLL_D7_D2				94</div><div class='add'>+#define CLK_TOP_MAINPLL_D7_D4				95</div><div class='add'>+#define CLK_TOP_MAINPLL_D7_D8				96</div><div class='add'>+#define CLK_TOP_MAINPLL_D9				97</div><div class='add'>+#define CLK_TOP_UNIVPLL_D4				98</div><div class='add'>+#define CLK_TOP_UNIVPLL_D4_D2				99</div><div class='add'>+#define CLK_TOP_UNIVPLL_D4_D4				100</div><div class='add'>+#define CLK_TOP_UNIVPLL_D4_D8				101</div><div class='add'>+#define CLK_TOP_UNIVPLL_D5				102</div><div class='add'>+#define CLK_TOP_UNIVPLL_D5_D2				103</div><div class='add'>+#define CLK_TOP_UNIVPLL_D5_D4				104</div><div class='add'>+#define CLK_TOP_UNIVPLL_D6				105</div><div class='add'>+#define CLK_TOP_UNIVPLL_D6_D2				106</div><div class='add'>+#define CLK_TOP_UNIVPLL_D6_D4				107</div><div class='add'>+#define CLK_TOP_UNIVPLL_D6_D8				108</div><div class='add'>+#define CLK_TOP_UNIVPLL_D6_D16				109</div><div class='add'>+#define CLK_TOP_UNIVPLL_192M				110</div><div class='add'>+#define CLK_TOP_UNIVPLL_192M_D4				111</div><div class='add'>+#define CLK_TOP_UNIVPLL_192M_D8				112</div><div class='add'>+#define CLK_TOP_UNIVPLL_192M_D16			113</div><div class='add'>+#define CLK_TOP_UNIVPLL_192M_D32			114</div><div class='add'>+#define CLK_TOP_UNIVPLL_192M_D10			115</div><div class='add'>+#define CLK_TOP_TVDPLL1_D2				116</div><div class='add'>+#define CLK_TOP_MSDCPLL_D2				117</div><div class='add'>+#define CLK_TOP_OSC_D2					118</div><div class='add'>+#define CLK_TOP_OSC_D3					119</div><div class='add'>+#define CLK_TOP_OSC_D4					120</div><div class='add'>+#define CLK_TOP_OSC_D5					121</div><div class='add'>+#define CLK_TOP_OSC_D7					122</div><div class='add'>+#define CLK_TOP_OSC_D8					123</div><div class='add'>+#define CLK_TOP_OSC_D10					124</div><div class='add'>+#define CLK_TOP_OSC_D14					125</div><div class='add'>+#define CLK_TOP_OSC_D20					126</div><div class='add'>+#define CLK_TOP_OSC_D32					127</div><div class='add'>+#define CLK_TOP_OSC_D40					128</div><div class='add'>+#define CLK_TOP_SFLASH					129</div><div class='add'>+</div><div class='add'>+/* APMIXEDSYS */</div><div class='add'>+#define CLK_APMIXED_MAINPLL				0</div><div class='add'>+#define CLK_APMIXED_UNIVPLL				1</div><div class='add'>+#define CLK_APMIXED_MSDCPLL				2</div><div class='add'>+#define CLK_APMIXED_ADSPPLL				3</div><div class='add'>+#define CLK_APMIXED_EMIPLL				4</div><div class='add'>+#define CLK_APMIXED_EMIPLL2				5</div><div class='add'>+#define CLK_APMIXED_NET1PLL				6</div><div class='add'>+#define CLK_APMIXED_SGMIIPLL				7</div><div class='add'>+</div><div class='add'>+/* CKSYS_GP2 */</div><div class='add'>+#define CLK_TOP2_SENINF0				0</div><div class='add'>+#define CLK_TOP2_SENINF1				1</div><div class='add'>+#define CLK_TOP2_SENINF2				2</div><div class='add'>+#define CLK_TOP2_SENINF3				3</div><div class='add'>+#define CLK_TOP2_SENINF4				4</div><div class='add'>+#define CLK_TOP2_SENINF5				5</div><div class='add'>+#define CLK_TOP2_IMG1					6</div><div class='add'>+#define CLK_TOP2_IPE					7</div><div class='add'>+#define CLK_TOP2_CAM					8</div><div class='add'>+#define CLK_TOP2_CAMTM					9</div><div class='add'>+#define CLK_TOP2_DPE					10</div><div class='add'>+#define CLK_TOP2_VDEC					11</div><div class='add'>+#define CLK_TOP2_CCUSYS					12</div><div class='add'>+#define CLK_TOP2_CCUTM					13</div><div class='add'>+#define CLK_TOP2_VENC					14</div><div class='add'>+#define CLK_TOP2_DP1					15</div><div class='add'>+#define CLK_TOP2_DP0					16</div><div class='add'>+#define CLK_TOP2_DISP					17</div><div class='add'>+#define CLK_TOP2_MDP					18</div><div class='add'>+#define CLK_TOP2_MMINFRA				19</div><div class='add'>+#define CLK_TOP2_MMINFRA_SNOC				20</div><div class='add'>+#define CLK_TOP2_MMUP					21</div><div class='add'>+#define CLK_TOP2_MMINFRA_AO				22</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D2				23</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D3				24</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D4				25</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D4_D2				26</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D4_D4				27</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D5				28</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D5_D2				29</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D6				30</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D6_D2				31</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D7				32</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D7_D2				33</div><div class='add'>+#define CLK_TOP2_MAINPLL2_D9				34</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D3				35</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D4				36</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D4_D2				37</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D5				38</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D5_D2				39</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D6				40</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D6_D2				41</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D6_D4				42</div><div class='add'>+#define CLK_TOP2_UNIVPLL2_D7				43</div><div class='add'>+#define CLK_TOP2_IMGPLL_D2				44</div><div class='add'>+#define CLK_TOP2_IMGPLL_D4				45</div><div class='add'>+#define CLK_TOP2_IMGPLL_D5				46</div><div class='add'>+#define CLK_TOP2_IMGPLL_D5_D2				47</div><div class='add'>+#define CLK_TOP2_MMPLL2_D3				48</div><div class='add'>+#define CLK_TOP2_MMPLL2_D4				49</div><div class='add'>+#define CLK_TOP2_MMPLL2_D4_D2				50</div><div class='add'>+#define CLK_TOP2_MMPLL2_D5				51</div><div class='add'>+#define CLK_TOP2_MMPLL2_D5_D2				52</div><div class='add'>+#define CLK_TOP2_MMPLL2_D6				53</div><div class='add'>+#define CLK_TOP2_MMPLL2_D6_D2				54</div><div class='add'>+#define CLK_TOP2_MMPLL2_D7				55</div><div class='add'>+#define CLK_TOP2_MMPLL2_D9				56</div><div class='add'>+#define CLK_TOP2_TVDPLL1_D4				57</div><div class='add'>+#define CLK_TOP2_TVDPLL1_D8				58</div><div class='add'>+#define CLK_TOP2_TVDPLL1_D16				59</div><div class='add'>+#define CLK_TOP2_TVDPLL2_D2				60</div><div class='add'>+#define CLK_TOP2_TVDPLL2_D4				61</div><div class='add'>+#define CLK_TOP2_TVDPLL2_D8				62</div><div class='add'>+#define CLK_TOP2_TVDPLL2_D16				63</div><div class='add'>+#define CLK_TOP2_DVO					64</div><div class='add'>+#define CLK_TOP2_DVO_FAVT				65</div><div class='add'>+#define CLK_TOP2_TVDPLL3_D2				66</div><div class='add'>+#define CLK_TOP2_TVDPLL3_D4				67</div><div class='add'>+#define CLK_TOP2_TVDPLL3_D8				68</div><div class='add'>+#define CLK_TOP2_TVDPLL3_D16				69</div><div class='add'>+</div><div class='add'>+/* APMIXEDSYS_GP2 */</div><div class='add'>+#define CLK_APMIXED2_MAINPLL2				0</div><div class='add'>+#define CLK_APMIXED2_UNIVPLL2				1</div><div class='add'>+#define CLK_APMIXED2_MMPLL2				2</div><div class='add'>+#define CLK_APMIXED2_IMGPLL				3</div><div class='add'>+#define CLK_APMIXED2_TVDPLL1				4</div><div class='add'>+#define CLK_APMIXED2_TVDPLL2				5</div><div class='add'>+#define CLK_APMIXED2_TVDPLL3				6</div><div class='add'>+</div><div class='add'>+/* IMP_IIC_WRAP_E */</div><div class='add'>+#define CLK_IMPE_I2C5					0</div><div class='add'>+</div><div class='add'>+/* IMP_IIC_WRAP_W */</div><div class='add'>+#define CLK_IMPW_I2C0					0</div><div class='add'>+#define CLK_IMPW_I2C3					1</div><div class='add'>+#define CLK_IMPW_I2C6					2</div><div class='add'>+#define CLK_IMPW_I2C10					3</div><div class='add'>+</div><div class='add'>+/* IMP_IIC_WRAP_N */</div><div class='add'>+#define CLK_IMPN_I2C1					0</div><div class='add'>+#define CLK_IMPN_I2C2					1</div><div class='add'>+#define CLK_IMPN_I2C4					2</div><div class='add'>+#define CLK_IMPN_I2C7					3</div><div class='add'>+#define CLK_IMPN_I2C8					4</div><div class='add'>+#define CLK_IMPN_I2C9					5</div><div class='add'>+</div><div class='add'>+/* IMP_IIC_WRAP_C */</div><div class='add'>+#define CLK_IMPC_I2C11					0</div><div class='add'>+#define CLK_IMPC_I2C12					1</div><div class='add'>+#define CLK_IMPC_I2C13					2</div><div class='add'>+#define CLK_IMPC_I2C14					3</div><div class='add'>+</div><div class='add'>+/* PERICFG_AO */</div><div class='add'>+#define CLK_PERI_AO_UART0_BCLK				0</div><div class='add'>+#define CLK_PERI_AO_UART1_BCLK				1</div><div class='add'>+#define CLK_PERI_AO_UART2_BCLK				2</div><div class='add'>+#define CLK_PERI_AO_UART3_BCLK				3</div><div class='add'>+#define CLK_PERI_AO_UART4_BCLK				4</div><div class='add'>+#define CLK_PERI_AO_UART5_BCLK				5</div><div class='add'>+#define CLK_PERI_AO_PWM_X16W_HCLK			6</div><div class='add'>+#define CLK_PERI_AO_PWM_X16W_BCLK			7</div><div class='add'>+#define CLK_PERI_AO_PWM_PWM_BCLK0			8</div><div class='add'>+#define CLK_PERI_AO_PWM_PWM_BCLK1			9</div><div class='add'>+#define CLK_PERI_AO_PWM_PWM_BCLK2			10</div><div class='add'>+#define CLK_PERI_AO_PWM_PWM_BCLK3			11</div><div class='add'>+#define CLK_PERI_AO_SPI0_BCLK				12</div><div class='add'>+#define CLK_PERI_AO_SPI1_BCLK				13</div><div class='add'>+#define CLK_PERI_AO_SPI2_BCLK				14</div><div class='add'>+#define CLK_PERI_AO_SPI3_BCLK				15</div><div class='add'>+#define CLK_PERI_AO_SPI4_BCLK				16</div><div class='add'>+#define CLK_PERI_AO_SPI5_BCLK				17</div><div class='add'>+#define CLK_PERI_AO_SPI6_BCLK				18</div><div class='add'>+#define CLK_PERI_AO_SPI7_BCLK				19</div><div class='add'>+#define CLK_PERI_AO_AP_DMA_X32W_BCLK			20</div><div class='add'>+#define CLK_PERI_AO_MSDC1_MSDC_SRC			21</div><div class='add'>+#define CLK_PERI_AO_MSDC1_HCLK				22</div><div class='add'>+#define CLK_PERI_AO_MSDC1_AXI				23</div><div class='add'>+#define CLK_PERI_AO_MSDC1_HCLK_WRAP			24</div><div class='add'>+#define CLK_PERI_AO_MSDC2_MSDC_SRC			25</div><div class='add'>+#define CLK_PERI_AO_MSDC2_HCLK				26</div><div class='add'>+#define CLK_PERI_AO_MSDC2_AXI				27</div><div class='add'>+#define CLK_PERI_AO_MSDC2_HCLK_WRAP			28</div><div class='add'>+#define CLK_PERI_AO_FLASHIF_FLASH			29</div><div class='add'>+#define CLK_PERI_AO_FLASHIF_27M				30</div><div class='add'>+#define CLK_PERI_AO_FLASHIF_DRAM			31</div><div class='add'>+#define CLK_PERI_AO_FLASHIF_AXI				32</div><div class='add'>+#define CLK_PERI_AO_FLASHIF_BCLK			33</div><div class='add'>+</div><div class='add'>+/* UFSCFG_AO */</div><div class='add'>+#define CLK_UFSAO_UNIPRO_TX_SYM				0</div><div class='add'>+#define CLK_UFSAO_UNIPRO_RX_SYM0			1</div><div class='add'>+#define CLK_UFSAO_UNIPRO_RX_SYM1			2</div><div class='add'>+#define CLK_UFSAO_UNIPRO_SYS				3</div><div class='add'>+#define CLK_UFSAO_UNIPRO_SAP				4</div><div class='add'>+#define CLK_UFSAO_PHY_SAP				5</div><div class='add'>+#define CLK_UFSAO_UFSHCI_UFS				6</div><div class='add'>+#define CLK_UFSAO_UFSHCI_AES				7</div><div class='add'>+</div><div class='add'>+/* PEXTP0CFG_AO */</div><div class='add'>+#define CLK_PEXT_PEXTP_MAC_P0_TL			0</div><div class='add'>+#define CLK_PEXT_PEXTP_MAC_P0_REF			1</div><div class='add'>+#define CLK_PEXT_PEXTP_PHY_P0_MCU_BUS			2</div><div class='add'>+#define CLK_PEXT_PEXTP_PHY_P0_PEXTP_REF			3</div><div class='add'>+#define CLK_PEXT_PEXTP_MAC_P0_AXI_250			4</div><div class='add'>+#define CLK_PEXT_PEXTP_MAC_P0_AHB_APB			5</div><div class='add'>+#define CLK_PEXT_PEXTP_MAC_P0_PL_P			6</div><div class='add'>+#define CLK_PEXT_PEXTP_VLP_AO_P0_LP			7</div><div class='add'>+</div><div class='add'>+/* PEXTP1CFG_AO */</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P1_TL			0</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P1_REF			1</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P2_TL			2</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P2_REF			3</div><div class='add'>+#define CLK_PEXT1_PEXTP_PHY_P1_MCU_BUS			4</div><div class='add'>+#define CLK_PEXT1_PEXTP_PHY_P1_PEXTP_REF		5</div><div class='add'>+#define CLK_PEXT1_PEXTP_PHY_P2_MCU_BUS			6</div><div class='add'>+#define CLK_PEXT1_PEXTP_PHY_P2_PEXTP_REF		7</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P1_AXI_250			8</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P1_AHB_APB			9</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P1_PL_P			10</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P2_AXI_250			11</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P2_AHB_APB			12</div><div class='add'>+#define CLK_PEXT1_PEXTP_MAC_P2_PL_P			13</div><div class='add'>+#define CLK_PEXT1_PEXTP_VLP_AO_P1_LP			14</div><div class='add'>+#define CLK_PEXT1_PEXTP_VLP_AO_P2_LP			15</div><div class='add'>+</div><div class='add'>+/* VLP_CKSYS */</div><div class='add'>+#define CLK_VLP_APLL1					0</div><div class='add'>+#define CLK_VLP_APLL2					1</div><div class='add'>+#define CLK_VLP_SCP					2</div><div class='add'>+#define CLK_VLP_SCP_SPI					3</div><div class='add'>+#define CLK_VLP_SCP_IIC					4</div><div class='add'>+#define CLK_VLP_SCP_IIC_HS				5</div><div class='add'>+#define CLK_VLP_PWRAP_ULPOSC				6</div><div class='add'>+#define CLK_VLP_SPMI_M_TIA_32K				7</div><div class='add'>+#define CLK_VLP_APXGPT_26M_B				8</div><div class='add'>+#define CLK_VLP_DPSW					9</div><div class='add'>+#define CLK_VLP_DPSW_CENTRAL				10</div><div class='add'>+#define CLK_VLP_SPMI_M_MST				11</div><div class='add'>+#define CLK_VLP_DVFSRC					12</div><div class='add'>+#define CLK_VLP_PWM_VLP					13</div><div class='add'>+#define CLK_VLP_AXI_VLP					14</div><div class='add'>+#define CLK_VLP_SYSTIMER_26M				15</div><div class='add'>+#define CLK_VLP_SSPM					16</div><div class='add'>+#define CLK_VLP_SRCK					17</div><div class='add'>+#define CLK_VLP_CAMTG0					18</div><div class='add'>+#define CLK_VLP_CAMTG1					19</div><div class='add'>+#define CLK_VLP_CAMTG2					20</div><div class='add'>+#define CLK_VLP_CAMTG3					21</div><div class='add'>+#define CLK_VLP_CAMTG4					22</div><div class='add'>+#define CLK_VLP_CAMTG5					23</div><div class='add'>+#define CLK_VLP_CAMTG6					24</div><div class='add'>+#define CLK_VLP_CAMTG7					25</div><div class='add'>+#define CLK_VLP_SSPM_26M				26</div><div class='add'>+#define CLK_VLP_ULPOSC_SSPM				27</div><div class='add'>+#define CLK_VLP_VLP_PBUS_26M				28</div><div class='add'>+#define CLK_VLP_DEBUG_ERR_FLAG				29</div><div class='add'>+#define CLK_VLP_DPMSRDMA				30</div><div class='add'>+#define CLK_VLP_VLP_PBUS_156M				31</div><div class='add'>+#define CLK_VLP_SPM					32</div><div class='add'>+#define CLK_VLP_MMINFRA					33</div><div class='add'>+#define CLK_VLP_USB_TOP					34</div><div class='add'>+#define CLK_VLP_USB_XHCI				35</div><div class='add'>+#define CLK_VLP_NOC_VLP					36</div><div class='add'>+#define CLK_VLP_AUDIO_H					37</div><div class='add'>+#define CLK_VLP_AUD_ENGEN1				38</div><div class='add'>+#define CLK_VLP_AUD_ENGEN2				39</div><div class='add'>+#define CLK_VLP_AUD_INTBUS				40</div><div class='add'>+#define CLK_VLP_SPVLP_26M				41</div><div class='add'>+#define CLK_VLP_SPU0_VLP				42</div><div class='add'>+#define CLK_VLP_SPU1_VLP				43</div><div class='add'>+#define CLK_VLP_CLK26M                                  44</div><div class='add'>+#define CLK_VLP_APLL1_D4				45</div><div class='add'>+#define CLK_VLP_APLL1_D8				46</div><div class='add'>+#define CLK_VLP_APLL2_D4				47</div><div class='add'>+#define CLK_VLP_APLL2_D8				48</div><div class='add'>+</div><div class='add'>+/* DISPSYS_CONFIG */</div><div class='add'>+#define CLK_MM_CONFIG					0</div><div class='add'>+#define CLK_MM_DISP_MUTEX0				1</div><div class='add'>+#define CLK_MM_DISP_AAL0				2</div><div class='add'>+#define CLK_MM_DISP_AAL1				3</div><div class='add'>+#define CLK_MM_DISP_C3D0				4</div><div class='add'>+#define CLK_MM_DISP_C3D1				5</div><div class='add'>+#define CLK_MM_DISP_C3D2				6</div><div class='add'>+#define CLK_MM_DISP_C3D3				7</div><div class='add'>+#define CLK_MM_DISP_CCORR0				8</div><div class='add'>+#define CLK_MM_DISP_CCORR1				9</div><div class='add'>+#define CLK_MM_DISP_CCORR2				10</div><div class='add'>+#define CLK_MM_DISP_CCORR3				11</div><div class='add'>+#define CLK_MM_DISP_CHIST0				12</div><div class='add'>+#define CLK_MM_DISP_CHIST1				13</div><div class='add'>+#define CLK_MM_DISP_COLOR0				14</div><div class='add'>+#define CLK_MM_DISP_COLOR1				15</div><div class='add'>+#define CLK_MM_DISP_DITHER0				16</div><div class='add'>+#define CLK_MM_DISP_DITHER1				17</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC0				18</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC1				19</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC2				20</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC3				21</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC4				22</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC5				23</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC6				24</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC7				25</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC8				26</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC9				27</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC10				28</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC11				29</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC12				30</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC13				31</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC14				32</div><div class='add'>+#define CLK_MM_DISP_DLI_ASYNC15				33</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC0				34</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC1				35</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC2				36</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC3				37</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC4				38</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC5				39</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC6				40</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC7				41</div><div class='add'>+#define CLK_MM_DISP_DLO_ASYNC8				42</div><div class='add'>+#define CLK_MM_DISP_GAMMA0				43</div><div class='add'>+#define CLK_MM_DISP_GAMMA1				44</div><div class='add'>+#define CLK_MM_MDP_AAL0					45</div><div class='add'>+#define CLK_MM_MDP_AAL1					46</div><div class='add'>+#define CLK_MM_MDP_RDMA0				47</div><div class='add'>+#define CLK_MM_DISP_POSTMASK0				48</div><div class='add'>+#define CLK_MM_DISP_POSTMASK1				49</div><div class='add'>+#define CLK_MM_MDP_RSZ0					50</div><div class='add'>+#define CLK_MM_MDP_RSZ1					51</div><div class='add'>+#define CLK_MM_DISP_SPR0				52</div><div class='add'>+#define CLK_MM_DISP_TDSHP0				53</div><div class='add'>+#define CLK_MM_DISP_TDSHP1				54</div><div class='add'>+#define CLK_MM_DISP_WDMA0				55</div><div class='add'>+#define CLK_MM_DISP_Y2R0				56</div><div class='add'>+#define CLK_MM_SMI_SUB_COMM0				57</div><div class='add'>+#define CLK_MM_DISP_FAKE_ENG0				58</div><div class='add'>+</div><div class='add'>+/* DISPSYS1_CONFIG */</div><div class='add'>+#define CLK_MM1_DISPSYS1_CONFIG				0</div><div class='add'>+#define CLK_MM1_DISPSYS1_S_CONFIG			1</div><div class='add'>+#define CLK_MM1_DISP_MUTEX0				2</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC20			3</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC21			4</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC22			5</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC23			6</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC24			7</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC25			8</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC26			9</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC27			10</div><div class='add'>+#define CLK_MM1_DISP_DLI_ASYNC28			11</div><div class='add'>+#define CLK_MM1_DISP_RELAY0				12</div><div class='add'>+#define CLK_MM1_DISP_RELAY1				13</div><div class='add'>+#define CLK_MM1_DISP_RELAY2				14</div><div class='add'>+#define CLK_MM1_DISP_RELAY3				15</div><div class='add'>+#define CLK_MM1_DISP_DP_INTF0				16</div><div class='add'>+#define CLK_MM1_DISP_DP_INTF1				17</div><div class='add'>+#define CLK_MM1_DISP_DSC_WRAP0				18</div><div class='add'>+#define CLK_MM1_DISP_DSC_WRAP1				19</div><div class='add'>+#define CLK_MM1_DISP_DSC_WRAP2				20</div><div class='add'>+#define CLK_MM1_DISP_DSC_WRAP3				21</div><div class='add'>+#define CLK_MM1_DISP_DSI0				22</div><div class='add'>+#define CLK_MM1_DISP_DSI1				23</div><div class='add'>+#define CLK_MM1_DISP_DSI2				24</div><div class='add'>+#define CLK_MM1_DISP_DVO0				25</div><div class='add'>+#define CLK_MM1_DISP_GDMA0				26</div><div class='add'>+#define CLK_MM1_DISP_MERGE0				27</div><div class='add'>+#define CLK_MM1_DISP_MERGE1				28</div><div class='add'>+#define CLK_MM1_DISP_MERGE2				29</div><div class='add'>+#define CLK_MM1_DISP_ODDMR0				30</div><div class='add'>+#define CLK_MM1_DISP_POSTALIGN0				31</div><div class='add'>+#define CLK_MM1_DISP_DITHER2				32</div><div class='add'>+#define CLK_MM1_DISP_R2Y0				33</div><div class='add'>+#define CLK_MM1_DISP_SPLITTER0				34</div><div class='add'>+#define CLK_MM1_DISP_SPLITTER1				35</div><div class='add'>+#define CLK_MM1_DISP_SPLITTER2				36</div><div class='add'>+#define CLK_MM1_DISP_SPLITTER3				37</div><div class='add'>+#define CLK_MM1_DISP_VDCM0				38</div><div class='add'>+#define CLK_MM1_DISP_WDMA1				39</div><div class='add'>+#define CLK_MM1_DISP_WDMA2				40</div><div class='add'>+#define CLK_MM1_DISP_WDMA3				41</div><div class='add'>+#define CLK_MM1_DISP_WDMA4				42</div><div class='add'>+#define CLK_MM1_MDP_RDMA1				43</div><div class='add'>+#define CLK_MM1_SMI_LARB0				44</div><div class='add'>+#define CLK_MM1_MOD1					45</div><div class='add'>+#define CLK_MM1_MOD2					46</div><div class='add'>+#define CLK_MM1_MOD3					47</div><div class='add'>+#define CLK_MM1_MOD4					48</div><div class='add'>+#define CLK_MM1_MOD5					49</div><div class='add'>+#define CLK_MM1_MOD6					50</div><div class='add'>+#define CLK_MM1_CG0					51</div><div class='add'>+#define CLK_MM1_CG1					52</div><div class='add'>+#define CLK_MM1_CG2					53</div><div class='add'>+#define CLK_MM1_CG3					54</div><div class='add'>+#define CLK_MM1_CG4					55</div><div class='add'>+#define CLK_MM1_CG5					56</div><div class='add'>+#define CLK_MM1_CG6					57</div><div class='add'>+#define CLK_MM1_CG7					58</div><div class='add'>+#define CLK_MM1_F26M					59</div><div class='add'>+</div><div class='add'>+/* OVLSYS_CONFIG */</div><div class='add'>+#define CLK_OVLSYS_CONFIG				0</div><div class='add'>+#define CLK_OVL_FAKE_ENG0				1</div><div class='add'>+#define CLK_OVL_FAKE_ENG1				2</div><div class='add'>+#define CLK_OVL_MUTEX0					3</div><div class='add'>+#define CLK_OVL_EXDMA0					4</div><div class='add'>+#define CLK_OVL_EXDMA1					5</div><div class='add'>+#define CLK_OVL_EXDMA2					6</div><div class='add'>+#define CLK_OVL_EXDMA3					7</div><div class='add'>+#define CLK_OVL_EXDMA4					8</div><div class='add'>+#define CLK_OVL_EXDMA5					9</div><div class='add'>+#define CLK_OVL_EXDMA6					10</div><div class='add'>+#define CLK_OVL_EXDMA7					11</div><div class='add'>+#define CLK_OVL_EXDMA8					12</div><div class='add'>+#define CLK_OVL_EXDMA9					13</div><div class='add'>+#define CLK_OVL_BLENDER0				14</div><div class='add'>+#define CLK_OVL_BLENDER1				15</div><div class='add'>+#define CLK_OVL_BLENDER2				16</div><div class='add'>+#define CLK_OVL_BLENDER3				17</div><div class='add'>+#define CLK_OVL_BLENDER4				18</div><div class='add'>+#define CLK_OVL_BLENDER5				19</div><div class='add'>+#define CLK_OVL_BLENDER6				20</div><div class='add'>+#define CLK_OVL_BLENDER7				21</div><div class='add'>+#define CLK_OVL_BLENDER8				22</div><div class='add'>+#define CLK_OVL_BLENDER9				23</div><div class='add'>+#define CLK_OVL_OUTPROC0				24</div><div class='add'>+#define CLK_OVL_OUTPROC1				25</div><div class='add'>+#define CLK_OVL_OUTPROC2				26</div><div class='add'>+#define CLK_OVL_OUTPROC3				27</div><div class='add'>+#define CLK_OVL_OUTPROC4				28</div><div class='add'>+#define CLK_OVL_OUTPROC5				29</div><div class='add'>+#define CLK_OVL_MDP_RSZ0				30</div><div class='add'>+#define CLK_OVL_MDP_RSZ1				31</div><div class='add'>+#define CLK_OVL_DISP_WDMA0				32</div><div class='add'>+#define CLK_OVL_DISP_WDMA1				33</div><div class='add'>+#define CLK_OVL_UFBC_WDMA0				34</div><div class='add'>+#define CLK_OVL_MDP_RDMA0				35</div><div class='add'>+#define CLK_OVL_MDP_RDMA1				36</div><div class='add'>+#define CLK_OVL_BWM0					37</div><div class='add'>+#define CLK_OVL_DLI0					38</div><div class='add'>+#define CLK_OVL_DLI1					39</div><div class='add'>+#define CLK_OVL_DLI2					40</div><div class='add'>+#define CLK_OVL_DLI3					41</div><div class='add'>+#define CLK_OVL_DLI4					42</div><div class='add'>+#define CLK_OVL_DLI5					43</div><div class='add'>+#define CLK_OVL_DLI6					44</div><div class='add'>+#define CLK_OVL_DLI7					45</div><div class='add'>+#define CLK_OVL_DLI8					46</div><div class='add'>+#define CLK_OVL_DLO0					47</div><div class='add'>+#define CLK_OVL_DLO1					48</div><div class='add'>+#define CLK_OVL_DLO2					49</div><div class='add'>+#define CLK_OVL_DLO3					50</div><div class='add'>+#define CLK_OVL_DLO4					51</div><div class='add'>+#define CLK_OVL_DLO5					52</div><div class='add'>+#define CLK_OVL_DLO6					53</div><div class='add'>+#define CLK_OVL_DLO7					54</div><div class='add'>+#define CLK_OVL_DLO8					55</div><div class='add'>+#define CLK_OVL_DLO9					56</div><div class='add'>+#define CLK_OVL_DLO10					57</div><div class='add'>+#define CLK_OVL_DLO11					58</div><div class='add'>+#define CLK_OVL_DLO12					59</div><div class='add'>+#define CLK_OVLSYS_RELAY0				60</div><div class='add'>+#define CLK_OVL_INLINEROT0				61</div><div class='add'>+#define CLK_OVL_SMI					62</div><div class='add'>+#define CLK_OVL_SMI_SMI					63</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* OVLSYS1_CONFIG */</div><div class='add'>+#define CLK_OVL1_OVLSYS_CONFIG				0</div><div class='add'>+#define CLK_OVL1_OVL_FAKE_ENG0				1</div><div class='add'>+#define CLK_OVL1_OVL_FAKE_ENG1				2</div><div class='add'>+#define CLK_OVL1_OVL_MUTEX0				3</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA0				4</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA1				5</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA2				6</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA3				7</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA4				8</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA5				9</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA6				10</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA7				11</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA8				12</div><div class='add'>+#define CLK_OVL1_OVL_EXDMA9				13</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER0				14</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER1				15</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER2				16</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER3				17</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER4				18</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER5				19</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER6				20</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER7				21</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER8				22</div><div class='add'>+#define CLK_OVL1_OVL_BLENDER9				23</div><div class='add'>+#define CLK_OVL1_OVL_OUTPROC0				24</div><div class='add'>+#define CLK_OVL1_OVL_OUTPROC1				25</div><div class='add'>+#define CLK_OVL1_OVL_OUTPROC2				26</div><div class='add'>+#define CLK_OVL1_OVL_OUTPROC3				27</div><div class='add'>+#define CLK_OVL1_OVL_OUTPROC4				28</div><div class='add'>+#define CLK_OVL1_OVL_OUTPROC5				29</div><div class='add'>+#define CLK_OVL1_OVL_MDP_RSZ0				30</div><div class='add'>+#define CLK_OVL1_OVL_MDP_RSZ1				31</div><div class='add'>+#define CLK_OVL1_OVL_DISP_WDMA0				32</div><div class='add'>+#define CLK_OVL1_OVL_DISP_WDMA1				33</div><div class='add'>+#define CLK_OVL1_OVL_UFBC_WDMA0				34</div><div class='add'>+#define CLK_OVL1_OVL_MDP_RDMA0				35</div><div class='add'>+#define CLK_OVL1_OVL_MDP_RDMA1				36</div><div class='add'>+#define CLK_OVL1_OVL_BWM0				37</div><div class='add'>+#define CLK_OVL1_DLI0					38</div><div class='add'>+#define CLK_OVL1_DLI1					39</div><div class='add'>+#define CLK_OVL1_DLI2					40</div><div class='add'>+#define CLK_OVL1_DLI3					41</div><div class='add'>+#define CLK_OVL1_DLI4					42</div><div class='add'>+#define CLK_OVL1_DLI5					43</div><div class='add'>+#define CLK_OVL1_DLI6					44</div><div class='add'>+#define CLK_OVL1_DLI7					45</div><div class='add'>+#define CLK_OVL1_DLI8					46</div><div class='add'>+#define CLK_OVL1_DLO0					47</div><div class='add'>+#define CLK_OVL1_DLO1					48</div><div class='add'>+#define CLK_OVL1_DLO2					49</div><div class='add'>+#define CLK_OVL1_DLO3					50</div><div class='add'>+#define CLK_OVL1_DLO4					51</div><div class='add'>+#define CLK_OVL1_DLO5					52</div><div class='add'>+#define CLK_OVL1_DLO6					53</div><div class='add'>+#define CLK_OVL1_DLO7					54</div><div class='add'>+#define CLK_OVL1_DLO8					55</div><div class='add'>+#define CLK_OVL1_DLO9					56</div><div class='add'>+#define CLK_OVL1_DLO10					57</div><div class='add'>+#define CLK_OVL1_DLO11					58</div><div class='add'>+#define CLK_OVL1_DLO12					59</div><div class='add'>+#define CLK_OVL1_OVLSYS_RELAY0				60</div><div class='add'>+#define CLK_OVL1_OVL_INLINEROT0				61</div><div class='add'>+#define CLK_OVL1_SMI					62</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* VDEC_SOC_GCON_BASE */</div><div class='add'>+#define CLK_VDE1_LARB1_CKEN				0</div><div class='add'>+#define CLK_VDE1_LAT_CKEN				1</div><div class='add'>+#define CLK_VDE1_LAT_ACTIVE				2</div><div class='add'>+#define CLK_VDE1_LAT_CKEN_ENG				3</div><div class='add'>+#define CLK_VDE1_VDEC_CKEN				4</div><div class='add'>+#define CLK_VDE1_VDEC_ACTIVE				5</div><div class='add'>+#define CLK_VDE1_VDEC_CKEN_ENG				6</div><div class='add'>+#define CLK_VDE1_VDEC_SOC_APTV_EN			7</div><div class='add'>+#define CLK_VDE1_VDEC_SOC_APTV_TOP_EN			8</div><div class='add'>+#define CLK_VDE1_VDEC_SOC_IPS_EN			9</div><div class='add'>+</div><div class='add'>+/* VDEC_GCON_BASE */</div><div class='add'>+#define CLK_VDE2_LARB1_CKEN				0</div><div class='add'>+#define CLK_VDE2_LAT_CKEN				1</div><div class='add'>+#define CLK_VDE2_LAT_ACTIVE				2</div><div class='add'>+#define CLK_VDE2_LAT_CKEN_ENG				3</div><div class='add'>+#define CLK_VDE2_VDEC_CKEN				4</div><div class='add'>+#define CLK_VDE2_VDEC_ACTIVE				5</div><div class='add'>+#define CLK_VDE2_VDEC_CKEN_ENG				6</div><div class='add'>+</div><div class='add'>+/* VENC_GCON */</div><div class='add'>+#define CLK_VEN1_CKE0_LARB				0</div><div class='add'>+#define CLK_VEN1_CKE1_VENC				1</div><div class='add'>+#define CLK_VEN1_CKE2_JPGENC				2</div><div class='add'>+#define CLK_VEN1_CKE3_JPGDEC				3</div><div class='add'>+#define CLK_VEN1_CKE4_JPGDEC_C1				4</div><div class='add'>+#define CLK_VEN1_CKE5_GALS				5</div><div class='add'>+#define CLK_VEN1_CKE29_VENC_ADAB_CTRL			6</div><div class='add'>+#define CLK_VEN1_CKE29_VENC_XPC_CTRL			7</div><div class='add'>+#define CLK_VEN1_CKE6_GALS_SRAM				8</div><div class='add'>+#define CLK_VEN1_RES_FLAT				9</div><div class='add'>+</div><div class='add'>+/* VENC_GCON_CORE1 */</div><div class='add'>+#define CLK_VEN2_CKE0_LARB				0</div><div class='add'>+#define CLK_VEN2_CKE1_VENC				1</div><div class='add'>+#define CLK_VEN2_CKE2_JPGENC				2</div><div class='add'>+#define CLK_VEN2_CKE3_JPGDEC				3</div><div class='add'>+#define CLK_VEN2_CKE5_GALS				4</div><div class='add'>+#define CLK_VEN2_CKE29_VENC_XPC_CTRL			5</div><div class='add'>+#define CLK_VEN2_CKE6_GALS_SRAM				6</div><div class='add'>+#define CLK_VEN2_RES_FLAT				7</div><div class='add'>+</div><div class='add'>+/* VENC_GCON_CORE2 */</div><div class='add'>+#define CLK_VEN_C2_CKE0_LARB				0</div><div class='add'>+#define CLK_VEN_C2_CKE1_VENC				1</div><div class='add'>+#define CLK_VEN_C2_CKE5_GALS				2</div><div class='add'>+#define CLK_VEN_C2_CKE29_VENC_XPC_CTRL			3</div><div class='add'>+#define CLK_VEN_C2_CKE6_GALS_SRAM			4</div><div class='add'>+#define CLK_VEN_C2_RES_FLAT				5</div><div class='add'>+</div><div class='add'>+/* MDPSYS_CONFIG */</div><div class='add'>+#define CLK_MDP_MDP_MUTEX0				0</div><div class='add'>+#define CLK_MDP_SMI0					1</div><div class='add'>+#define CLK_MDP_SMI0_SMI				2</div><div class='add'>+#define CLK_MDP_APB_BUS					3</div><div class='add'>+#define CLK_MDP_MDP_RDMA0				4</div><div class='add'>+#define CLK_MDP_MDP_RDMA1				5</div><div class='add'>+#define CLK_MDP_MDP_RDMA2				6</div><div class='add'>+#define CLK_MDP_MDP_BIRSZ0				7</div><div class='add'>+#define CLK_MDP_MDP_HDR0				8</div><div class='add'>+#define CLK_MDP_MDP_AAL0				9</div><div class='add'>+#define CLK_MDP_MDP_RSZ0				10</div><div class='add'>+#define CLK_MDP_MDP_RSZ2				11</div><div class='add'>+#define CLK_MDP_MDP_TDSHP0				12</div><div class='add'>+#define CLK_MDP_MDP_COLOR0				13</div><div class='add'>+#define CLK_MDP_MDP_WROT0				14</div><div class='add'>+#define CLK_MDP_MDP_WROT1				15</div><div class='add'>+#define CLK_MDP_MDP_WROT2				16</div><div class='add'>+#define CLK_MDP_MDP_FAKE_ENG0				17</div><div class='add'>+#define CLK_MDP_APB_DB					18</div><div class='add'>+#define CLK_MDP_MDP_DLI_ASYNC0				19</div><div class='add'>+#define CLK_MDP_MDP_DLI_ASYNC1				20</div><div class='add'>+#define CLK_MDP_MDP_DLO_ASYNC0				21</div><div class='add'>+#define CLK_MDP_MDP_DLO_ASYNC1				22</div><div class='add'>+#define CLK_MDP_MDP_DLI_ASYNC2				23</div><div class='add'>+#define CLK_MDP_MDP_DLO_ASYNC2				24</div><div class='add'>+#define CLK_MDP_MDP_DLO_ASYNC3				25</div><div class='add'>+#define CLK_MDP_IMG_DL_ASYNC0				26</div><div class='add'>+#define CLK_MDP_MDP_RROT0				27</div><div class='add'>+#define CLK_MDP_MDP_MERGE0				28</div><div class='add'>+#define CLK_MDP_MDP_C3D0				29</div><div class='add'>+#define CLK_MDP_MDP_FG0					30</div><div class='add'>+#define CLK_MDP_MDP_CLA2				31</div><div class='add'>+#define CLK_MDP_MDP_DLO_ASYNC4				32</div><div class='add'>+#define CLK_MDP_VPP_RSZ0				33</div><div class='add'>+#define CLK_MDP_VPP_RSZ1				34</div><div class='add'>+#define CLK_MDP_MDP_DLO_ASYNC5				35</div><div class='add'>+#define CLK_MDP_IMG0					36</div><div class='add'>+#define CLK_MDP_F26M					37</div><div class='add'>+#define CLK_MDP_IMG_DL_RELAY0				38</div><div class='add'>+#define CLK_MDP_IMG_DL_RELAY1				39</div><div class='add'>+</div><div class='add'>+/* MDPSYS1_CONFIG */</div><div class='add'>+#define CLK_MDP1_MDP_MUTEX0				0</div><div class='add'>+#define CLK_MDP1_SMI0					1</div><div class='add'>+#define CLK_MDP1_SMI0_SMI				2</div><div class='add'>+#define CLK_MDP1_APB_BUS				3</div><div class='add'>+#define CLK_MDP1_MDP_RDMA0				4</div><div class='add'>+#define CLK_MDP1_MDP_RDMA1				5</div><div class='add'>+#define CLK_MDP1_MDP_RDMA2				6</div><div class='add'>+#define CLK_MDP1_MDP_BIRSZ0				7</div><div class='add'>+#define CLK_MDP1_MDP_HDR0				8</div><div class='add'>+#define CLK_MDP1_MDP_AAL0				9</div><div class='add'>+#define CLK_MDP1_MDP_RSZ0				10</div><div class='add'>+#define CLK_MDP1_MDP_RSZ2				11</div><div class='add'>+#define CLK_MDP1_MDP_TDSHP0				12</div><div class='add'>+#define CLK_MDP1_MDP_COLOR0				13</div><div class='add'>+#define CLK_MDP1_MDP_WROT0				14</div><div class='add'>+#define CLK_MDP1_MDP_WROT1				15</div><div class='add'>+#define CLK_MDP1_MDP_WROT2				16</div><div class='add'>+#define CLK_MDP1_MDP_FAKE_ENG0				17</div><div class='add'>+#define CLK_MDP1_APB_DB					18</div><div class='add'>+#define CLK_MDP1_MDP_DLI_ASYNC0				19</div><div class='add'>+#define CLK_MDP1_MDP_DLI_ASYNC1				20</div><div class='add'>+#define CLK_MDP1_MDP_DLO_ASYNC0				21</div><div class='add'>+#define CLK_MDP1_MDP_DLO_ASYNC1				22</div><div class='add'>+#define CLK_MDP1_MDP_DLI_ASYNC2				23</div><div class='add'>+#define CLK_MDP1_MDP_DLO_ASYNC2				24</div><div class='add'>+#define CLK_MDP1_MDP_DLO_ASYNC3				25</div><div class='add'>+#define CLK_MDP1_IMG_DL_ASYNC0				26</div><div class='add'>+#define CLK_MDP1_MDP_RROT0				27</div><div class='add'>+#define CLK_MDP1_MDP_MERGE0				28</div><div class='add'>+#define CLK_MDP1_MDP_C3D0				29</div><div class='add'>+#define CLK_MDP1_MDP_FG0				30</div><div class='add'>+#define CLK_MDP1_MDP_CLA2				31</div><div class='add'>+#define CLK_MDP1_MDP_DLO_ASYNC4				32</div><div class='add'>+#define CLK_MDP1_VPP_RSZ0				33</div><div class='add'>+#define CLK_MDP1_VPP_RSZ1				34</div><div class='add'>+#define CLK_MDP1_MDP_DLO_ASYNC5				35</div><div class='add'>+#define CLK_MDP1_IMG0					36</div><div class='add'>+#define CLK_MDP1_F26M					37</div><div class='add'>+#define CLK_MDP1_IMG_DL_RELAY0				38</div><div class='add'>+#define CLK_MDP1_IMG_DL_RELAY1				39</div><div class='add'>+</div><div class='add'>+/* DISP_VDISP_AO_CONFIG */</div><div class='add'>+#define CLK_MM_V_DISP_VDISP_AO_CONFIG			0</div><div class='add'>+#define CLK_MM_V_DISP_DPC				1</div><div class='add'>+#define CLK_MM_V_SMI_SUB_SOMM0				2</div><div class='add'>+</div><div class='add'>+/* MFGPLL_PLL_CTRL */</div><div class='add'>+#define CLK_MFG_AO_MFGPLL				0</div><div class='add'>+</div><div class='add'>+/* MFGPLL_SC0_PLL_CTRL */</div><div class='add'>+#define CLK_MFGSC0_AO_MFGPLL_SC0			0</div><div class='add'>+</div><div class='add'>+/* MFGPLL_SC1_PLL_CTRL */</div><div class='add'>+#define CLK_MFGSC1_AO_MFGPLL_SC1			0</div><div class='add'>+</div><div class='add'>+/* CCIPLL_PLL_CTRL */</div><div class='add'>+#define CLK_CCIPLL					0</div><div class='add'>+</div><div class='add'>+/* ARMPLL_LL_PLL_CTRL */</div><div class='add'>+#define CLK_CPLL_ARMPLL_LL				0</div><div class='add'>+</div><div class='add'>+/* ARMPLL_BL_PLL_CTRL */</div><div class='add'>+#define CLK_CPBL_ARMPLL_BL				0</div><div class='add'>+</div><div class='add'>+/* ARMPLL_B_PLL_CTRL */</div><div class='add'>+#define CLK_CPB_ARMPLL_B				0</div><div class='add'>+</div><div class='add'>+/* PTPPLL_PLL_CTRL */</div><div class='add'>+#define CLK_PTPPLL					0</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_MT8196_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/mediatek,mtmips-sysc.h b/include/dt-bindings/clock/mediatek,mtmips-sysc.h<br/>new file mode 100644<br/>index 000000000000..a03335b0e077<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mediatek,mtmips-sysc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mediatek,mtmips-sysc.h</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Author: Sergio Paracuellos &lt;sergio.paracuellos@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_MTMIPS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_MTMIPS_H</div><div class='add'>+</div><div class='add'>+/* Ralink RT-2880 clocks */</div><div class='add'>+</div><div class='add'>+#define RT2880_CLK_XTAL		0</div><div class='add'>+#define RT2880_CLK_CPU		1</div><div class='add'>+#define RT2880_CLK_BUS		2</div><div class='add'>+#define RT2880_CLK_TIMER	3</div><div class='add'>+#define RT2880_CLK_WATCHDOG	4</div><div class='add'>+#define RT2880_CLK_UART		5</div><div class='add'>+#define RT2880_CLK_I2C		6</div><div class='add'>+#define RT2880_CLK_UARTLITE	7</div><div class='add'>+#define RT2880_CLK_ETHERNET	8</div><div class='add'>+#define RT2880_CLK_WMAC		9</div><div class='add'>+</div><div class='add'>+/* Ralink RT-305X clocks */</div><div class='add'>+</div><div class='add'>+#define RT305X_CLK_XTAL		0</div><div class='add'>+#define RT305X_CLK_CPU		1</div><div class='add'>+#define RT305X_CLK_BUS		2</div><div class='add'>+#define RT305X_CLK_TIMER	3</div><div class='add'>+#define RT305X_CLK_WATCHDOG	4</div><div class='add'>+#define RT305X_CLK_UART		5</div><div class='add'>+#define RT305X_CLK_I2C		6</div><div class='add'>+#define RT305X_CLK_I2S		7</div><div class='add'>+#define RT305X_CLK_SPI1		8</div><div class='add'>+#define RT305X_CLK_SPI2		9</div><div class='add'>+#define RT305X_CLK_UARTLITE	10</div><div class='add'>+#define RT305X_CLK_ETHERNET	11</div><div class='add'>+#define RT305X_CLK_WMAC		12</div><div class='add'>+</div><div class='add'>+/* Ralink RT-3352 clocks */</div><div class='add'>+</div><div class='add'>+#define RT3352_CLK_XTAL		0</div><div class='add'>+#define RT3352_CLK_CPU		1</div><div class='add'>+#define RT3352_CLK_PERIPH	2</div><div class='add'>+#define RT3352_CLK_BUS		3</div><div class='add'>+#define RT3352_CLK_TIMER	4</div><div class='add'>+#define RT3352_CLK_WATCHDOG	5</div><div class='add'>+#define RT3352_CLK_UART		6</div><div class='add'>+#define RT3352_CLK_I2C		7</div><div class='add'>+#define RT3352_CLK_I2S		8</div><div class='add'>+#define RT3352_CLK_SPI1		9</div><div class='add'>+#define RT3352_CLK_SPI2		10</div><div class='add'>+#define RT3352_CLK_UARTLITE	11</div><div class='add'>+#define RT3352_CLK_ETHERNET	12</div><div class='add'>+#define RT3352_CLK_WMAC		13</div><div class='add'>+</div><div class='add'>+/* Ralink RT-3883 clocks */</div><div class='add'>+</div><div class='add'>+#define RT3883_CLK_XTAL		0</div><div class='add'>+#define RT3883_CLK_CPU		1</div><div class='add'>+#define RT3883_CLK_BUS		2</div><div class='add'>+#define RT3883_CLK_PERIPH	3</div><div class='add'>+#define RT3883_CLK_TIMER	4</div><div class='add'>+#define RT3883_CLK_WATCHDOG	5</div><div class='add'>+#define RT3883_CLK_UART		6</div><div class='add'>+#define RT3883_CLK_I2C		7</div><div class='add'>+#define RT3883_CLK_I2S		8</div><div class='add'>+#define RT3883_CLK_SPI1		9</div><div class='add'>+#define RT3883_CLK_SPI2		10</div><div class='add'>+#define RT3883_CLK_UARTLITE	11</div><div class='add'>+#define RT3883_CLK_ETHERNET	12</div><div class='add'>+#define RT3883_CLK_WMAC		13</div><div class='add'>+</div><div class='add'>+/* Ralink RT-5350 clocks */</div><div class='add'>+</div><div class='add'>+#define RT5350_CLK_XTAL		0</div><div class='add'>+#define RT5350_CLK_CPU		1</div><div class='add'>+#define RT5350_CLK_BUS		2</div><div class='add'>+#define RT5350_CLK_PERIPH	3</div><div class='add'>+#define RT5350_CLK_TIMER	4</div><div class='add'>+#define RT5350_CLK_WATCHDOG	5</div><div class='add'>+#define RT5350_CLK_UART		6</div><div class='add'>+#define RT5350_CLK_I2C		7</div><div class='add'>+#define RT5350_CLK_I2S		8</div><div class='add'>+#define RT5350_CLK_SPI1		9</div><div class='add'>+#define RT5350_CLK_SPI2		10</div><div class='add'>+#define RT5350_CLK_UARTLITE	11</div><div class='add'>+#define RT5350_CLK_ETHERNET	12</div><div class='add'>+#define RT5350_CLK_WMAC		13</div><div class='add'>+</div><div class='add'>+/* Ralink MT-7620 clocks */</div><div class='add'>+</div><div class='add'>+#define MT7620_CLK_XTAL		0</div><div class='add'>+#define MT7620_CLK_PLL		1</div><div class='add'>+#define MT7620_CLK_CPU		2</div><div class='add'>+#define MT7620_CLK_PERIPH	3</div><div class='add'>+#define MT7620_CLK_BUS		4</div><div class='add'>+#define MT7620_CLK_BBPPLL	5</div><div class='add'>+#define MT7620_CLK_SDHC		6</div><div class='add'>+#define MT7620_CLK_TIMER	7</div><div class='add'>+#define MT7620_CLK_WATCHDOG	8</div><div class='add'>+#define MT7620_CLK_UART		9</div><div class='add'>+#define MT7620_CLK_I2C		10</div><div class='add'>+#define MT7620_CLK_I2S		11</div><div class='add'>+#define MT7620_CLK_SPI1		12</div><div class='add'>+#define MT7620_CLK_SPI2		13</div><div class='add'>+#define MT7620_CLK_UARTLITE	14</div><div class='add'>+#define MT7620_CLK_MMC		15</div><div class='add'>+#define MT7620_CLK_WMAC		16</div><div class='add'>+</div><div class='add'>+/* Ralink MT-76X8 clocks */</div><div class='add'>+</div><div class='add'>+#define MT76X8_CLK_XTAL		0</div><div class='add'>+#define MT76X8_CLK_CPU		1</div><div class='add'>+#define MT76X8_CLK_BBPPLL	2</div><div class='add'>+#define MT76X8_CLK_PCMI2S	3</div><div class='add'>+#define MT76X8_CLK_PERIPH	4</div><div class='add'>+#define MT76X8_CLK_BUS		5</div><div class='add'>+#define MT76X8_CLK_SDHC		6</div><div class='add'>+#define MT76X8_CLK_TIMER	7</div><div class='add'>+#define MT76X8_CLK_WATCHDOG	8</div><div class='add'>+#define MT76X8_CLK_I2C		9</div><div class='add'>+#define MT76X8_CLK_I2S		10</div><div class='add'>+#define MT76X8_CLK_SPI1		11</div><div class='add'>+#define MT76X8_CLK_SPI2		12</div><div class='add'>+#define MT76X8_CLK_UART0	13</div><div class='add'>+#define MT76X8_CLK_UART1	14</div><div class='add'>+#define MT76X8_CLK_UART2	15</div><div class='add'>+#define MT76X8_CLK_MMC		16</div><div class='add'>+#define MT76X8_CLK_WMAC		17</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_MTMIPS_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/microchip,mpfs-clock.h b/include/dt-bindings/clock/microchip,mpfs-clock.h<br/>index 79775a5134ca..b52f19a2b480 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/microchip,mpfs-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/microchip,mpfs-clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/microchip,mpfs-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/microchip,mpfs-clock.h</a></div><div class='hunk'>@@ -44,6 +44,11 @@</div><div class='ctx'> </div><div class='ctx'> #define CLK_RTCREF	33</div><div class='ctx'> #define CLK_MSSPLL	34</div><div class='add'>+#define CLK_MSSPLL0	34</div><div class='add'>+#define CLK_MSSPLL1	35</div><div class='add'>+#define CLK_MSSPLL2	36</div><div class='add'>+#define CLK_MSSPLL3	37</div><div class='add'>+/* 38 is reserved for MSS PLL internals */</div><div class='ctx'> </div><div class='ctx'> /* Clock Conditioning Circuitry Clock IDs */</div><div class='ctx'> </div><div class='head'>diff --git a/include/dt-bindings/clock/mobileye,eyeq5-clk.h b/include/dt-bindings/clock/mobileye,eyeq5-clk.h<br/>new file mode 100644<br/>index 000000000000..f353c2988035<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mobileye,eyeq5-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mobileye,eyeq5-clk.h</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Mobileye Vision Technologies Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_MOBILEYE_EYEQ5_CLK_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_MOBILEYE_EYEQ5_CLK_H</div><div class='add'>+</div><div class='add'>+#define EQ5C_PLL_CPU		0</div><div class='add'>+#define EQ5C_PLL_VMP		1</div><div class='add'>+#define EQ5C_PLL_PMA		2</div><div class='add'>+#define EQ5C_PLL_VDI		3</div><div class='add'>+#define EQ5C_PLL_DDR0		4</div><div class='add'>+#define EQ5C_PLL_PCI		5</div><div class='add'>+#define EQ5C_PLL_PER		6</div><div class='add'>+#define EQ5C_PLL_PMAC		7</div><div class='add'>+#define EQ5C_PLL_MPC		8</div><div class='add'>+#define EQ5C_PLL_DDR1		9</div><div class='add'>+</div><div class='add'>+#define EQ5C_DIV_OSPI		10</div><div class='add'>+</div><div class='add'>+/* EQ5C_PLL_CPU children */</div><div class='add'>+#define EQ5C_CPU_CORE0		11</div><div class='add'>+#define EQ5C_CPU_CORE1		12</div><div class='add'>+#define EQ5C_CPU_CORE2		13</div><div class='add'>+#define EQ5C_CPU_CORE3		14</div><div class='add'>+</div><div class='add'>+/* EQ5C_PLL_PER children */</div><div class='add'>+#define EQ5C_PER_OCC		15</div><div class='add'>+#define EQ5C_PER_UART		16</div><div class='add'>+#define EQ5C_PER_SPI		17</div><div class='add'>+#define EQ5C_PER_I2C		18</div><div class='add'>+#define EQ5C_PER_GPIO		19</div><div class='add'>+#define EQ5C_PER_EMMC		20</div><div class='add'>+#define EQ5C_PER_OCC_PCI	21</div><div class='add'>+</div><div class='add'>+#define EQ6LC_PLL_DDR		0</div><div class='add'>+#define EQ6LC_PLL_CPU		1</div><div class='add'>+#define EQ6LC_PLL_PER		2</div><div class='add'>+#define EQ6LC_PLL_VDI		3</div><div class='add'>+</div><div class='add'>+#define EQ6HC_CENTRAL_PLL_CPU	0</div><div class='add'>+#define EQ6HC_CENTRAL_CPU_OCC	1</div><div class='add'>+</div><div class='add'>+#define EQ6HC_WEST_PLL_PER	0</div><div class='add'>+#define EQ6HC_WEST_PER_OCC	1</div><div class='add'>+#define EQ6HC_WEST_PER_UART	2</div><div class='add'>+</div><div class='add'>+#define EQ6HC_SOUTH_PLL_VDI		0</div><div class='add'>+#define EQ6HC_SOUTH_PLL_PCIE		1</div><div class='add'>+#define EQ6HC_SOUTH_PLL_PER		2</div><div class='add'>+#define EQ6HC_SOUTH_PLL_ISP		3</div><div class='add'>+</div><div class='add'>+#define EQ6HC_SOUTH_DIV_EMMC		4</div><div class='add'>+#define EQ6HC_SOUTH_DIV_OSPI_REF	5</div><div class='add'>+#define EQ6HC_SOUTH_DIV_OSPI_SYS	6</div><div class='add'>+#define EQ6HC_SOUTH_DIV_TSU		7</div><div class='add'>+</div><div class='add'>+#define EQ6HC_ACC_PLL_XNN		0</div><div class='add'>+#define EQ6HC_ACC_PLL_VMP		1</div><div class='add'>+#define EQ6HC_ACC_PLL_PMA		2</div><div class='add'>+#define EQ6HC_ACC_PLL_MPC		3</div><div class='add'>+#define EQ6HC_ACC_PLL_NOC		4</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/mt7622-clk.h b/include/dt-bindings/clock/mt7622-clk.h<br/>index c12e7eab0788..a173eb132892 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mt7622-clk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/mt7622-clk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/mt7622-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/mt7622-clk.h</a></div><div class='hunk'>@@ -228,7 +228,7 @@</div><div class='ctx'> #define CLK_AUDIO_MEM_ASRC4		44</div><div class='ctx'> #define CLK_AUDIO_MEM_ASRC5		45</div><div class='ctx'> #define CLK_AUDIO_AFE_CONN		46</div><div class='del'>-#define CLK_AUDIO_NR_CLK		47</div><div class='add'>+#define CLK_AUDIO_AFE_MRGIF		47</div><div class='ctx'> </div><div class='ctx'> /* SSUSBSYS */</div><div class='ctx'> </div><div class='head'>diff --git a/include/dt-bindings/clock/nvidia,tegra264.h b/include/dt-bindings/clock/nvidia,tegra264.h<br/>new file mode 100644<br/>index 000000000000..0fc2ad5e6cef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/nvidia,tegra264.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/nvidia,tegra264.h</a></div><div class='hunk'>@@ -0,0 +1,466 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/* Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef DT_BINDINGS_CLOCK_NVIDIA_TEGRA264_H</div><div class='add'>+#define DT_BINDINGS_CLOCK_NVIDIA_TEGRA264_H</div><div class='add'>+</div><div class='add'>+#define TEGRA264_CLK_OSC				1</div><div class='add'>+#define TEGRA264_CLK_CLK_S				2</div><div class='add'>+#define TEGRA264_CLK_JTAG_REG				3</div><div class='add'>+#define TEGRA264_CLK_SPLL				4</div><div class='add'>+#define TEGRA264_CLK_SPLL_OUT0				5</div><div class='add'>+#define TEGRA264_CLK_SPLL_OUT1				6</div><div class='add'>+#define TEGRA264_CLK_SPLL_OUT2				7</div><div class='add'>+#define TEGRA264_CLK_SPLL_OUT3				8</div><div class='add'>+#define TEGRA264_CLK_SPLL_OUT4				9</div><div class='add'>+#define TEGRA264_CLK_SPLL_OUT5				10</div><div class='add'>+#define TEGRA264_CLK_SPLL_OUT6				11</div><div class='add'>+#define TEGRA264_CLK_SPLL_OUT7				12</div><div class='add'>+#define TEGRA264_CLK_AON_I2C				13</div><div class='add'>+#define TEGRA264_CLK_HOST1X				14</div><div class='add'>+#define TEGRA264_CLK_ISP				15</div><div class='add'>+#define TEGRA264_CLK_ISP1				16</div><div class='add'>+#define TEGRA264_CLK_ISP_ROOT				17</div><div class='add'>+#define TEGRA264_CLK_NAFLL_PVA0_CORE			18</div><div class='add'>+#define TEGRA264_CLK_NAFLL_PVA0_VPS			19</div><div class='add'>+#define TEGRA264_CLK_NVCSI				20</div><div class='add'>+#define TEGRA264_CLK_NVCSILP				21</div><div class='add'>+#define TEGRA264_CLK_PLLP_OUT0				22</div><div class='add'>+#define TEGRA264_CLK_PVA0_CPU_AXI			23</div><div class='add'>+#define TEGRA264_CLK_PVA0_VPS				24</div><div class='add'>+#define TEGRA264_CLK_PWM10				25</div><div class='add'>+#define TEGRA264_CLK_PWM2				26</div><div class='add'>+#define TEGRA264_CLK_PWM3				27</div><div class='add'>+#define TEGRA264_CLK_PWM4				28</div><div class='add'>+#define TEGRA264_CLK_PWM5				29</div><div class='add'>+#define TEGRA264_CLK_PWM9				30</div><div class='add'>+#define TEGRA264_CLK_QSPI0				31</div><div class='add'>+#define TEGRA264_CLK_QSPI0_2X_PM			32</div><div class='add'>+#define TEGRA264_CLK_RCE1_CPU				33</div><div class='add'>+#define TEGRA264_CLK_RCE1_NIC				34</div><div class='add'>+#define TEGRA264_CLK_RCE_CPU				35</div><div class='add'>+#define TEGRA264_CLK_RCE_NIC				36</div><div class='add'>+#define TEGRA264_CLK_SE					37</div><div class='add'>+#define TEGRA264_CLK_SEU1				38</div><div class='add'>+#define TEGRA264_CLK_SEU2				39</div><div class='add'>+#define TEGRA264_CLK_SEU3				40</div><div class='add'>+#define TEGRA264_CLK_SE_ROOT				41</div><div class='add'>+#define TEGRA264_CLK_SPI1				42</div><div class='add'>+#define TEGRA264_CLK_SPI2				43</div><div class='add'>+#define TEGRA264_CLK_SPI3				44</div><div class='add'>+#define TEGRA264_CLK_SPI4				45</div><div class='add'>+#define TEGRA264_CLK_SPI5				46</div><div class='add'>+#define TEGRA264_CLK_TOP_I2C				47</div><div class='add'>+#define TEGRA264_CLK_TSEC				48</div><div class='add'>+#define TEGRA264_CLK_TSEC_PKA				49</div><div class='add'>+#define TEGRA264_CLK_UART0				50</div><div class='add'>+#define TEGRA264_CLK_UART10				51</div><div class='add'>+#define TEGRA264_CLK_UART11				52</div><div class='add'>+#define TEGRA264_CLK_UART4				53</div><div class='add'>+#define TEGRA264_CLK_UART5				54</div><div class='add'>+#define TEGRA264_CLK_UART8				55</div><div class='add'>+#define TEGRA264_CLK_UART9				56</div><div class='add'>+#define TEGRA264_CLK_VI					57</div><div class='add'>+#define TEGRA264_CLK_VI1				58</div><div class='add'>+#define TEGRA264_CLK_VIC				59</div><div class='add'>+#define TEGRA264_CLK_VI_ROOT				60</div><div class='add'>+#define TEGRA264_CLK_DISPPLL				61</div><div class='add'>+#define TEGRA264_CLK_SPPLL0				62</div><div class='add'>+#define TEGRA264_CLK_SPPLL0_CLKOUT1A			63</div><div class='add'>+#define TEGRA264_CLK_SPPLL0_CLKOUT2A			64</div><div class='add'>+#define TEGRA264_CLK_SPPLL1				65</div><div class='add'>+#define TEGRA264_CLK_VPLL0				66</div><div class='add'>+#define TEGRA264_CLK_VPLL1				67</div><div class='add'>+#define TEGRA264_CLK_VPLL2				68</div><div class='add'>+#define TEGRA264_CLK_VPLL3				69</div><div class='add'>+#define TEGRA264_CLK_VPLL4				70</div><div class='add'>+#define TEGRA264_CLK_VPLL5				71</div><div class='add'>+#define TEGRA264_CLK_VPLL6				72</div><div class='add'>+#define TEGRA264_CLK_VPLL7				73</div><div class='add'>+#define TEGRA264_CLK_RG0_DIV				74</div><div class='add'>+#define TEGRA264_CLK_RG1_DIV				75</div><div class='add'>+#define TEGRA264_CLK_RG2_DIV				76</div><div class='add'>+#define TEGRA264_CLK_RG3_DIV				77</div><div class='add'>+#define TEGRA264_CLK_RG4_DIV				78</div><div class='add'>+#define TEGRA264_CLK_RG5_DIV				79</div><div class='add'>+#define TEGRA264_CLK_RG6_DIV				80</div><div class='add'>+#define TEGRA264_CLK_RG7_DIV				81</div><div class='add'>+#define TEGRA264_CLK_RG0				82</div><div class='add'>+#define TEGRA264_CLK_RG1				83</div><div class='add'>+#define TEGRA264_CLK_RG2				84</div><div class='add'>+#define TEGRA264_CLK_RG3				85</div><div class='add'>+#define TEGRA264_CLK_RG4				86</div><div class='add'>+#define TEGRA264_CLK_RG5				87</div><div class='add'>+#define TEGRA264_CLK_RG6				88</div><div class='add'>+#define TEGRA264_CLK_RG7				89</div><div class='add'>+#define TEGRA264_CLK_DISP				90</div><div class='add'>+#define TEGRA264_CLK_DSC				91</div><div class='add'>+#define TEGRA264_CLK_DSC_ROOT				92</div><div class='add'>+#define TEGRA264_CLK_HUB				93</div><div class='add'>+#define TEGRA264_CLK_VPLLX_SOR0_MUXED			94</div><div class='add'>+#define TEGRA264_CLK_VPLLX_SOR1_MUXED			95</div><div class='add'>+#define TEGRA264_CLK_VPLLX_SOR2_MUXED			96</div><div class='add'>+#define TEGRA264_CLK_VPLLX_SOR3_MUXED			97</div><div class='add'>+#define TEGRA264_CLK_LINKA_SYM				98</div><div class='add'>+#define TEGRA264_CLK_LINKB_SYM				99</div><div class='add'>+#define TEGRA264_CLK_LINKC_SYM				100</div><div class='add'>+#define TEGRA264_CLK_LINKD_SYM				101</div><div class='add'>+#define TEGRA264_CLK_PRE_SOR0				102</div><div class='add'>+#define TEGRA264_CLK_PRE_SOR1				103</div><div class='add'>+#define TEGRA264_CLK_PRE_SOR2				104</div><div class='add'>+#define TEGRA264_CLK_PRE_SOR3				105</div><div class='add'>+#define TEGRA264_CLK_SOR0_PLL_REF			106</div><div class='add'>+#define TEGRA264_CLK_SOR1_PLL_REF			107</div><div class='add'>+#define TEGRA264_CLK_SOR2_PLL_REF			108</div><div class='add'>+#define TEGRA264_CLK_SOR3_PLL_REF			109</div><div class='add'>+#define TEGRA264_CLK_SOR0_PAD				110</div><div class='add'>+#define TEGRA264_CLK_SOR1_PAD				111</div><div class='add'>+#define TEGRA264_CLK_SOR2_PAD				112</div><div class='add'>+#define TEGRA264_CLK_SOR3_PAD				113</div><div class='add'>+#define TEGRA264_CLK_SOR0_REF				114</div><div class='add'>+#define TEGRA264_CLK_SOR1_REF				115</div><div class='add'>+#define TEGRA264_CLK_SOR2_REF				116</div><div class='add'>+#define TEGRA264_CLK_SOR3_REF				117</div><div class='add'>+#define TEGRA264_CLK_SOR0_DIV				118</div><div class='add'>+#define TEGRA264_CLK_SOR1_DIV				119</div><div class='add'>+#define TEGRA264_CLK_SOR2_DIV				120</div><div class='add'>+#define TEGRA264_CLK_SOR3_DIV				121</div><div class='add'>+#define TEGRA264_CLK_SOR0				122</div><div class='add'>+#define TEGRA264_CLK_SOR1				123</div><div class='add'>+#define TEGRA264_CLK_SOR2				124</div><div class='add'>+#define TEGRA264_CLK_SOR3				125</div><div class='add'>+#define TEGRA264_CLK_SF0_SOR				126</div><div class='add'>+#define TEGRA264_CLK_SF1_SOR				127</div><div class='add'>+#define TEGRA264_CLK_SF2_SOR				128</div><div class='add'>+#define TEGRA264_CLK_SF3_SOR				129</div><div class='add'>+#define TEGRA264_CLK_SF4_SOR				130</div><div class='add'>+#define TEGRA264_CLK_SF5_SOR				131</div><div class='add'>+#define TEGRA264_CLK_SF6_SOR				132</div><div class='add'>+#define TEGRA264_CLK_SF7_SOR				133</div><div class='add'>+#define TEGRA264_CLK_SF0				134</div><div class='add'>+#define TEGRA264_CLK_SF1				135</div><div class='add'>+#define TEGRA264_CLK_SF2				136</div><div class='add'>+#define TEGRA264_CLK_SF3				137</div><div class='add'>+#define TEGRA264_CLK_SF4				138</div><div class='add'>+#define TEGRA264_CLK_SF5				139</div><div class='add'>+#define TEGRA264_CLK_SF6				140</div><div class='add'>+#define TEGRA264_CLK_SF7				141</div><div class='add'>+#define TEGRA264_CLK_MAUD				142</div><div class='add'>+#define TEGRA264_CLK_AZA_2XBIT				143</div><div class='add'>+#define TEGRA264_CLK_DCE_CPU				144</div><div class='add'>+#define TEGRA264_CLK_DCE_NIC				145</div><div class='add'>+#define TEGRA264_CLK_PLLC4				146</div><div class='add'>+#define TEGRA264_CLK_PLLC4_OUT0				147</div><div class='add'>+#define TEGRA264_CLK_PLLC4_OUT1				148</div><div class='add'>+#define TEGRA264_CLK_PLLC4_MUXED			149</div><div class='add'>+#define TEGRA264_CLK_SDMMC1				150</div><div class='add'>+#define TEGRA264_CLK_SDMMC_LEGACY_TM			151</div><div class='add'>+#define TEGRA264_CLK_PLLC0				152</div><div class='add'>+#define TEGRA264_CLK_NAFLL_BPMP				153</div><div class='add'>+#define TEGRA264_CLK_PLLP_OUT_PDIV			154</div><div class='add'>+#define TEGRA264_CLK_DISP_ROOT				155</div><div class='add'>+#define TEGRA264_CLK_ADSP				156</div><div class='add'>+#define TEGRA264_CLK_PLLA				157</div><div class='add'>+#define TEGRA264_CLK_PLLA1				158</div><div class='add'>+#define TEGRA264_CLK_PLLA1_OUT1				159</div><div class='add'>+#define TEGRA264_CLK_PLLAON				160</div><div class='add'>+#define TEGRA264_CLK_PLLAON_APE				161</div><div class='add'>+#define TEGRA264_CLK_PLLA_OUT0				162</div><div class='add'>+#define TEGRA264_CLK_AHUB				163</div><div class='add'>+#define TEGRA264_CLK_APE				164</div><div class='add'>+#define TEGRA264_CLK_I2S1_SCLK_IN			165</div><div class='add'>+#define TEGRA264_CLK_I2S2_SCLK_IN			166</div><div class='add'>+#define TEGRA264_CLK_I2S3_SCLK_IN			167</div><div class='add'>+#define TEGRA264_CLK_I2S4_SCLK_IN			168</div><div class='add'>+#define TEGRA264_CLK_I2S5_SCLK_IN			169</div><div class='add'>+#define TEGRA264_CLK_I2S6_SCLK_IN			170</div><div class='add'>+#define TEGRA264_CLK_I2S7_SCLK_IN			171</div><div class='add'>+#define TEGRA264_CLK_I2S8_SCLK_IN			172</div><div class='add'>+#define TEGRA264_CLK_I2S9_SCLK_IN			173</div><div class='add'>+#define TEGRA264_CLK_I2S1_AUDIO_SYNC			174</div><div class='add'>+#define TEGRA264_CLK_I2S2_AUDIO_SYNC			175</div><div class='add'>+#define TEGRA264_CLK_I2S3_AUDIO_SYNC			176</div><div class='add'>+#define TEGRA264_CLK_I2S4_AUDIO_SYNC			177</div><div class='add'>+#define TEGRA264_CLK_I2S5_AUDIO_SYNC			178</div><div class='add'>+#define TEGRA264_CLK_I2S6_AUDIO_SYNC			179</div><div class='add'>+#define TEGRA264_CLK_I2S7_AUDIO_SYNC			180</div><div class='add'>+#define TEGRA264_CLK_I2S8_AUDIO_SYNC			181</div><div class='add'>+#define TEGRA264_CLK_DMIC1_AUDIO_SYNC			182</div><div class='add'>+#define TEGRA264_CLK_DSPK1_AUDIO_SYNC			183</div><div class='add'>+#define TEGRA264_CLK_I2S1				184</div><div class='add'>+#define TEGRA264_CLK_I2S2				185</div><div class='add'>+#define TEGRA264_CLK_I2S3				186</div><div class='add'>+#define TEGRA264_CLK_I2S4				187</div><div class='add'>+#define TEGRA264_CLK_I2S5				188</div><div class='add'>+#define TEGRA264_CLK_I2S6				189</div><div class='add'>+#define TEGRA264_CLK_I2S7				190</div><div class='add'>+#define TEGRA264_CLK_I2S8				191</div><div class='add'>+#define TEGRA264_CLK_I2S9				192</div><div class='add'>+#define TEGRA264_CLK_DMIC1				193</div><div class='add'>+#define TEGRA264_CLK_DMIC5				194</div><div class='add'>+#define TEGRA264_CLK_DSPK1				195</div><div class='add'>+#define TEGRA264_CLK_AON_CPU				196</div><div class='add'>+#define TEGRA264_CLK_AON_NIC				197</div><div class='add'>+#define TEGRA264_CLK_BPMP				198</div><div class='add'>+#define TEGRA264_CLK_AXI_CBB				199</div><div class='add'>+#define TEGRA264_CLK_FUSE				200</div><div class='add'>+#define TEGRA264_CLK_TSENSE				201</div><div class='add'>+#define TEGRA264_CLK_CSITE				202</div><div class='add'>+#define TEGRA264_CLK_HCSITE				203</div><div class='add'>+#define TEGRA264_CLK_DBGAPB				204</div><div class='add'>+#define TEGRA264_CLK_LA					205</div><div class='add'>+#define TEGRA264_CLK_PLLREFGP				206</div><div class='add'>+#define TEGRA264_CLK_PLLE0				207</div><div class='add'>+#define TEGRA264_CLK_UPHY0_PLL0_XDIG			208</div><div class='add'>+#define TEGRA264_CLK_EQOS_APP				209</div><div class='add'>+#define TEGRA264_CLK_EQOS_MAC				210</div><div class='add'>+#define TEGRA264_CLK_EQOS_MACSEC			211</div><div class='add'>+#define TEGRA264_CLK_EQOS_TX_PCS			212</div><div class='add'>+#define TEGRA264_CLK_MGBES_PTP_REF			213</div><div class='add'>+#define TEGRA264_CLK_MGBE0_UPHY1_PLL_XDIG		214</div><div class='add'>+#define TEGRA264_CLK_MGBE0_TX_PCS			215</div><div class='add'>+#define TEGRA264_CLK_MGBE0_MAC				216</div><div class='add'>+#define TEGRA264_CLK_MGBE0_MACSEC			217</div><div class='add'>+#define TEGRA264_CLK_MGBE0_APP				218</div><div class='add'>+#define TEGRA264_CLK_MGBE1_UPHY1_PLL_XDIG		219</div><div class='add'>+#define TEGRA264_CLK_MGBE1_TX_PCS			220</div><div class='add'>+#define TEGRA264_CLK_MGBE1_MAC				221</div><div class='add'>+#define TEGRA264_CLK_MGBE1_MACSEC			222</div><div class='add'>+#define TEGRA264_CLK_MGBE1_APP				223</div><div class='add'>+#define TEGRA264_CLK_MGBE2_UPHY1_PLL_XDIG		224</div><div class='add'>+#define TEGRA264_CLK_MGBE2_TX_PCS			225</div><div class='add'>+#define TEGRA264_CLK_MGBE2_MAC				226</div><div class='add'>+#define TEGRA264_CLK_MGBE2_MACSEC			227</div><div class='add'>+#define TEGRA264_CLK_MGBE2_APP				228</div><div class='add'>+#define TEGRA264_CLK_MGBE3_UPHY1_PLL_XDIG		229</div><div class='add'>+#define TEGRA264_CLK_MGBE3_TX_PCS			230</div><div class='add'>+#define TEGRA264_CLK_MGBE3_MAC				231</div><div class='add'>+#define TEGRA264_CLK_MGBE3_MACSEC			232</div><div class='add'>+#define TEGRA264_CLK_MGBE3_APP				233</div><div class='add'>+#define TEGRA264_CLK_PLLREFUFS				234</div><div class='add'>+#define TEGRA264_CLK_PLLREFUFS_CLKOUT624		235</div><div class='add'>+#define TEGRA264_CLK_PLLREFUFS_REFCLKOUT		236</div><div class='add'>+#define TEGRA264_CLK_PLLREFUFS_UFSDEV_REFCLKOUT		237</div><div class='add'>+#define TEGRA264_CLK_UFSHC_CG_SYS			238</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_RX_LS_BIT_DIV		239</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_RX_LS_BIT			240</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_RX_LS_SYMB_DIV		241</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_RX_HS_SYMB_DIV		242</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_RX_SYMB			243</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_UPHY_TX_FIFO		244</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_TX_LS_3XBIT_DIV		245</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_TX_LS_SYMB_DIV		246</div><div class='add'>+#define TEGRA264_CLK_UPHY0_PLL4_XDIG			247</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_TX_HS_SYMB_DIV		248</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_TX_SYMB			249</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_TX_LS_3XBIT		250</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_RX_ANA			251</div><div class='add'>+#define TEGRA264_CLK_MPHY_L1_RX_ANA			252</div><div class='add'>+#define TEGRA264_CLK_MPHY_TX_1MHZ_REF			253</div><div class='add'>+#define TEGRA264_CLK_MPHY_CORE_PLL_FIXED		254</div><div class='add'>+#define TEGRA264_CLK_MPHY_IOBIST			255</div><div class='add'>+#define TEGRA264_CLK_UFSHC_CG_SYS_DIV			256</div><div class='add'>+#define TEGRA264_CLK_XUSB1_CORE				257</div><div class='add'>+#define TEGRA264_CLK_XUSB1_FALCON			258</div><div class='add'>+#define TEGRA264_CLK_XUSB1_FS				259</div><div class='add'>+#define TEGRA264_CLK_XUSB1_SS				260</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P0_RX_CORE		261</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P1_RX_CORE		262</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P2_RX_CORE		263</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P3_RX_CORE		264</div><div class='add'>+#define TEGRA264_CLK_XUSB1_CLK480M_NVWRAP_CORE		265</div><div class='add'>+#define TEGRA264_CLK_XUSB1_CORE_HOST			266</div><div class='add'>+#define TEGRA264_CLK_XUSB1_CORE_DEV			267</div><div class='add'>+#define TEGRA264_CLK_XUSB1_CORE_SUPERSPEED		268</div><div class='add'>+#define TEGRA264_CLK_XUSB1_FALCON_HOST			269</div><div class='add'>+#define TEGRA264_CLK_XUSB1_FALCON_SUPERSPEED		270</div><div class='add'>+#define TEGRA264_CLK_XUSB1_FS_HOST			271</div><div class='add'>+#define TEGRA264_CLK_XUSB1_FS_DEV			272</div><div class='add'>+#define TEGRA264_CLK_XUSB1_HS_HSICP			273</div><div class='add'>+#define TEGRA264_CLK_XUSB1_SS_DEV			274</div><div class='add'>+#define TEGRA264_CLK_XUSB1_SS_SUPERSPEED		275</div><div class='add'>+#define TEGRA264_CLK_AON_TOUCH				276</div><div class='add'>+#define TEGRA264_CLK_AUD_MCLK				277</div><div class='add'>+#define TEGRA264_CLK_EXTPERIPH1				278</div><div class='add'>+#define TEGRA264_CLK_EXTPERIPH2				279</div><div class='add'>+#define TEGRA264_CLK_EXTPERIPH3				280</div><div class='add'>+#define TEGRA264_CLK_EXTPERIPH4				281</div><div class='add'>+#define TEGRA264_CLK_JTAG_REG_UNGATED			282</div><div class='add'>+#define TEGRA264_CLK_IST_BUS				283</div><div class='add'>+#define TEGRA264_CLK_IST_BUS_RIST_MCC			284</div><div class='add'>+#define TEGRA264_CLK_MATHS_SEC_RIST			285</div><div class='add'>+#define TEGRA264_CLK_NAFLL_IST				286</div><div class='add'>+#define TEGRA264_CLK_RIST_ROOT				287</div><div class='add'>+#define TEGRA264_CLK_IST_CONTROLLER_RIST		288</div><div class='add'>+#define TEGRA264_CLK_MSS_ENCRYPT			289</div><div class='add'>+#define TEGRA264_CLK_EMC				290</div><div class='add'>+#define TEGRA264_CLK_SPPLL0_CLKOUT100			291</div><div class='add'>+#define TEGRA264_CLK_SPPLL0_CLKOUT270			292</div><div class='add'>+#define TEGRA264_CLK_SPPLL1_CLKOUT100			293</div><div class='add'>+#define TEGRA264_CLK_SPPLL1_CLKOUT270			294</div><div class='add'>+#define TEGRA264_CLK_DP_LINKA_REF			295</div><div class='add'>+#define TEGRA264_CLK_DP_LINKB_REF			296</div><div class='add'>+#define TEGRA264_CLK_DP_LINKC_REF			297</div><div class='add'>+#define TEGRA264_CLK_DP_LINKD_REF			298</div><div class='add'>+#define TEGRA264_CLK_PLLNVCSI				299</div><div class='add'>+#define TEGRA264_CLK_PLLBPMPCAM				300</div><div class='add'>+#define TEGRA264_CLK_UTMI_PLL1				301</div><div class='add'>+#define TEGRA264_CLK_UTMI_PLL1_CLKOUT48			302</div><div class='add'>+#define TEGRA264_CLK_UTMI_PLL1_CLKOUT60			303</div><div class='add'>+#define TEGRA264_CLK_UTMI_PLL1_CLKOUT480		304</div><div class='add'>+#define TEGRA264_CLK_NAFLL_ISP				305</div><div class='add'>+#define TEGRA264_CLK_NAFLL_RCE				306</div><div class='add'>+#define TEGRA264_CLK_NAFLL_RCE1				307</div><div class='add'>+#define TEGRA264_CLK_NAFLL_SE				308</div><div class='add'>+#define TEGRA264_CLK_NAFLL_VI				309</div><div class='add'>+#define TEGRA264_CLK_NAFLL_VIC				310</div><div class='add'>+#define TEGRA264_CLK_NAFLL_DCE				311</div><div class='add'>+#define TEGRA264_CLK_NAFLL_TSEC				312</div><div class='add'>+#define TEGRA264_CLK_NAFLL_CPAIR0			313</div><div class='add'>+#define TEGRA264_CLK_NAFLL_CPAIR1			314</div><div class='add'>+#define TEGRA264_CLK_NAFLL_CPAIR2			315</div><div class='add'>+#define TEGRA264_CLK_NAFLL_CPAIR3			316</div><div class='add'>+#define TEGRA264_CLK_NAFLL_CPAIR4			317</div><div class='add'>+#define TEGRA264_CLK_NAFLL_CPAIR5			318</div><div class='add'>+#define TEGRA264_CLK_NAFLL_CPAIR6			319</div><div class='add'>+#define TEGRA264_CLK_NAFLL_GPU_SYS			320</div><div class='add'>+#define TEGRA264_CLK_NAFLL_GPU_NVD			321</div><div class='add'>+#define TEGRA264_CLK_NAFLL_GPU_UPROC			322</div><div class='add'>+#define TEGRA264_CLK_NAFLL_GPU_GPC0			323</div><div class='add'>+#define TEGRA264_CLK_NAFLL_GPU_GPC1			324</div><div class='add'>+#define TEGRA264_CLK_NAFLL_GPU_GPC2			325</div><div class='add'>+#define TEGRA264_CLK_SOR_LINKA_INPUT			326</div><div class='add'>+#define TEGRA264_CLK_SOR_LINKB_INPUT			327</div><div class='add'>+#define TEGRA264_CLK_SOR_LINKC_INPUT			328</div><div class='add'>+#define TEGRA264_CLK_SOR_LINKD_INPUT			329</div><div class='add'>+#define TEGRA264_CLK_SOR_LINKA_AFIFO			330</div><div class='add'>+#define TEGRA264_CLK_SOR_LINKB_AFIFO			331</div><div class='add'>+#define TEGRA264_CLK_SOR_LINKC_AFIFO			332</div><div class='add'>+#define TEGRA264_CLK_SOR_LINKD_AFIFO			333</div><div class='add'>+#define TEGRA264_CLK_I2S1_PAD_M				334</div><div class='add'>+#define TEGRA264_CLK_I2S2_PAD_M				335</div><div class='add'>+#define TEGRA264_CLK_I2S3_PAD_M				336</div><div class='add'>+#define TEGRA264_CLK_I2S4_PAD_M				337</div><div class='add'>+#define TEGRA264_CLK_I2S5_PAD_M				338</div><div class='add'>+#define TEGRA264_CLK_I2S6_PAD_M				339</div><div class='add'>+#define TEGRA264_CLK_I2S7_PAD_M				340</div><div class='add'>+#define TEGRA264_CLK_I2S8_PAD_M				341</div><div class='add'>+#define TEGRA264_CLK_I2S9_PAD_M				342</div><div class='add'>+#define TEGRA264_CLK_BPMP_NIC				343</div><div class='add'>+#define TEGRA264_CLK_CLK1M				344</div><div class='add'>+#define TEGRA264_CLK_RDET				345</div><div class='add'>+#define TEGRA264_CLK_ADC_SOC_REF			346</div><div class='add'>+#define TEGRA264_CLK_UPHY0_PLL0_TXREF			347</div><div class='add'>+#define TEGRA264_CLK_EQOS_TX				348</div><div class='add'>+#define TEGRA264_CLK_EQOS_TX_M				349</div><div class='add'>+#define TEGRA264_CLK_EQOS_RX_PCS_IN			350</div><div class='add'>+#define TEGRA264_CLK_EQOS_RX_PCS_M			351</div><div class='add'>+#define TEGRA264_CLK_EQOS_RX_IN				352</div><div class='add'>+#define TEGRA264_CLK_EQOS_RX				353</div><div class='add'>+#define TEGRA264_CLK_EQOS_RX_M				354</div><div class='add'>+#define TEGRA264_CLK_MGBE0_UPHY1_PLL_TXREF		355</div><div class='add'>+#define TEGRA264_CLK_MGBE0_TX				356</div><div class='add'>+#define TEGRA264_CLK_MGBE0_TX_M				357</div><div class='add'>+#define TEGRA264_CLK_MGBE0_RX_PCS_IN			358</div><div class='add'>+#define TEGRA264_CLK_MGBE0_RX_PCS_M			359</div><div class='add'>+#define TEGRA264_CLK_MGBE0_RX_IN			360</div><div class='add'>+#define TEGRA264_CLK_MGBE0_RX_M				361</div><div class='add'>+#define TEGRA264_CLK_MGBE1_UPHY1_PLL_TXREF		362</div><div class='add'>+#define TEGRA264_CLK_MGBE1_TX				363</div><div class='add'>+#define TEGRA264_CLK_MGBE1_TX_M				364</div><div class='add'>+#define TEGRA264_CLK_MGBE1_RX_PCS_IN			365</div><div class='add'>+#define TEGRA264_CLK_MGBE1_RX_PCS_M			366</div><div class='add'>+#define TEGRA264_CLK_MGBE1_RX_IN			367</div><div class='add'>+#define TEGRA264_CLK_MGBE1_RX_M				368</div><div class='add'>+#define TEGRA264_CLK_MGBE2_UPHY1_PLL_TXREF		369</div><div class='add'>+#define TEGRA264_CLK_MGBE2_TX				370</div><div class='add'>+#define TEGRA264_CLK_MGBE2_TX_M				371</div><div class='add'>+#define TEGRA264_CLK_MGBE2_RX_PCS_IN			372</div><div class='add'>+#define TEGRA264_CLK_MGBE2_RX_PCS_M			373</div><div class='add'>+#define TEGRA264_CLK_MGBE2_RX_IN			374</div><div class='add'>+#define TEGRA264_CLK_MGBE2_RX_M				375</div><div class='add'>+#define TEGRA264_CLK_MGBE3_UPHY1_PLL_TXREF		376</div><div class='add'>+#define TEGRA264_CLK_MGBE3_TX				377</div><div class='add'>+#define TEGRA264_CLK_MGBE3_TX_M				378</div><div class='add'>+#define TEGRA264_CLK_MGBE3_RX_PCS_IN			379</div><div class='add'>+#define TEGRA264_CLK_MGBE3_RX_PCS_M			380</div><div class='add'>+#define TEGRA264_CLK_MGBE3_RX_IN			381</div><div class='add'>+#define TEGRA264_CLK_MGBE3_RX_M				382</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P0_TX_CORE		383</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P1_TX_CORE		384</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P2_TX_CORE		385</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P3_TX_CORE		386</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P0_TX			387</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P1_TX			388</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P2_TX			389</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P3_TX			390</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P0_RX_IN			391</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P1_RX_IN			392</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P2_RX_IN			393</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P3_RX_IN			394</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P0_RX_M			395</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P1_RX_M			396</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P2_RX_M			397</div><div class='add'>+#define TEGRA264_CLK_UPHY0_USB_P3_RX_M			398</div><div class='add'>+#define TEGRA264_CLK_UPHY0_LANE0_TX_M			399</div><div class='add'>+#define TEGRA264_CLK_PCIE_C1_XCLK_NOBG_M		400</div><div class='add'>+#define TEGRA264_CLK_PCIE_C2_XCLK_NOBG_M		401</div><div class='add'>+#define TEGRA264_CLK_PCIE_C3_XCLK_NOBG_M		402</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_XCLK_NOBG_M		403</div><div class='add'>+#define TEGRA264_CLK_PCIE_C5_XCLK_NOBG_M		404</div><div class='add'>+#define TEGRA264_CLK_PCIE_C1_L0_RX_M			405</div><div class='add'>+#define TEGRA264_CLK_PCIE_C1_L1_RX_M			406</div><div class='add'>+#define TEGRA264_CLK_PCIE_C1_L2_RX_M			407</div><div class='add'>+#define TEGRA264_CLK_PCIE_C1_L3_RX_M			408</div><div class='add'>+#define TEGRA264_CLK_PCIE_C2_L0_RX_M			409</div><div class='add'>+#define TEGRA264_CLK_PCIE_C2_L1_RX_M			410</div><div class='add'>+#define TEGRA264_CLK_PCIE_C2_L2_RX_M			411</div><div class='add'>+#define TEGRA264_CLK_PCIE_C2_L3_RX_M			412</div><div class='add'>+#define TEGRA264_CLK_PCIE_C3_L0_RX_M			413</div><div class='add'>+#define TEGRA264_CLK_PCIE_C3_L1_RX_M			414</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_L0_RX_M			415</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_L1_RX_M			416</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_L2_RX_M			417</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_L3_RX_M			418</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_L4_RX_M			419</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_L5_RX_M			420</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_L6_RX_M			421</div><div class='add'>+#define TEGRA264_CLK_PCIE_C4_L7_RX_M			422</div><div class='add'>+#define TEGRA264_CLK_PCIE_C5_L0_RX_M			423</div><div class='add'>+#define TEGRA264_CLK_PCIE_C5_L1_RX_M			424</div><div class='add'>+#define TEGRA264_CLK_PCIE_C5_L2_RX_M			425</div><div class='add'>+#define TEGRA264_CLK_PCIE_C5_L3_RX_M			426</div><div class='add'>+#define TEGRA264_CLK_MPHY_L0_RX_PWM_BIT_M		427</div><div class='add'>+#define TEGRA264_CLK_MPHY_L1_RX_PWM_BIT_M		428</div><div class='add'>+#define TEGRA264_CLK_DBB_UPHY0				429</div><div class='add'>+#define TEGRA264_CLK_UPHY0_UXL_CORE			430</div><div class='add'>+#define TEGRA264_CLK_ISC_CPU_ROOT			431</div><div class='add'>+#define TEGRA264_CLK_ISC_NIC				432</div><div class='add'>+#define TEGRA264_CLK_CTC_TXCLK0_M			433</div><div class='add'>+#define TEGRA264_CLK_CTC_TXCLK1_M			434</div><div class='add'>+#define TEGRA264_CLK_CTC_RXCLK0_M			435</div><div class='add'>+#define TEGRA264_CLK_CTC_RXCLK1_M			436</div><div class='add'>+#define TEGRA264_CLK_PLLREFGP_OUT			437</div><div class='add'>+#define TEGRA264_CLK_PLLREFGP_OUT1			438</div><div class='add'>+#define TEGRA264_CLK_GPU_SYS				439</div><div class='add'>+#define TEGRA264_CLK_GPU_NVD				440</div><div class='add'>+#define TEGRA264_CLK_GPU_UPROC				441</div><div class='add'>+#define TEGRA264_CLK_GPU_GPC0				442</div><div class='add'>+#define TEGRA264_CLK_GPU_GPC1				443</div><div class='add'>+#define TEGRA264_CLK_GPU_GPC2				444</div><div class='add'>+#define TEGRA264_CLK_PLLX				445</div><div class='add'>+#define TEGRA264_CLK_APE_SOUNDWIRE_MSRC0		446</div><div class='add'>+#define TEGRA264_CLK_APE_SOUNDWIRE_DATA_EN_SHAPER	447</div><div class='add'>+#define TEGRA264_CLK_AO_SOUNDWIRE_MSRC0			448</div><div class='add'>+#define TEGRA264_CLK_AO_SOUNDWIRE_DATA_EN_SHAPER	449</div><div class='add'>+#define TEGRA264_CLK_MGBE0_TX_SER			459</div><div class='add'>+#define TEGRA264_CLK_MGBE1_TX_SER			460</div><div class='add'>+#define TEGRA264_CLK_MGBE2_TX_SER			461</div><div class='add'>+#define TEGRA264_CLK_MGBE3_TX_SER			462</div><div class='add'>+#define TEGRA264_CLK_MGBE0_RX_SER			463</div><div class='add'>+#define TEGRA264_CLK_MGBE1_RX_SER			464</div><div class='add'>+#define TEGRA264_CLK_MGBE2_RX_SER			465</div><div class='add'>+#define TEGRA264_CLK_MGBE3_RX_SER			466</div><div class='add'>+#define TEGRA264_CLK_DPAUX				467</div><div class='add'>+</div><div class='add'>+#endif /* DT_BINDINGS_CLOCK_NVIDIA_TEGRA264_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/nxp,imx94-clock.h b/include/dt-bindings/clock/nxp,imx94-clock.h<br/>new file mode 100644<br/>index 000000000000..c4ba13352b99<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/nxp,imx94-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/nxp,imx94-clock.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2025 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_IMX94_H</div><div class='add'>+#define __DT_BINDINGS_CLOCK_IMX94_H</div><div class='add'>+</div><div class='add'>+#define IMX94_CLK_DISPMIX_CLK_SEL	0</div><div class='add'>+</div><div class='add'>+#define IMX94_CLK_DISPMIX_LVDS_CLK_GATE	0</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_CLOCK_IMX94_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/nxp,imx95-clock.h b/include/dt-bindings/clock/nxp,imx95-clock.h<br/>new file mode 100644<br/>index 000000000000..b7a713a9ac8c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/nxp,imx95-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/nxp,imx95-clock.h</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2024 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_IMX95_H</div><div class='add'>+#define __DT_BINDINGS_CLOCK_IMX95_H</div><div class='add'>+</div><div class='add'>+#define IMX95_CLK_VPUBLK_WAVE			0</div><div class='add'>+#define IMX95_CLK_VPUBLK_JPEG_ENC		1</div><div class='add'>+#define IMX95_CLK_VPUBLK_JPEG_DEC		2</div><div class='add'>+</div><div class='add'>+#define IMX95_CLK_CAMBLK_CSI2_FOR0		0</div><div class='add'>+#define IMX95_CLK_CAMBLK_CSI2_FOR1		1</div><div class='add'>+#define IMX95_CLK_CAMBLK_ISP_AXI		2</div><div class='add'>+#define IMX95_CLK_CAMBLK_ISP_PIXEL		3</div><div class='add'>+#define IMX95_CLK_CAMBLK_ISP			4</div><div class='add'>+</div><div class='add'>+#define IMX95_CLK_DISPMIX_LVDS_PHY_DIV		0</div><div class='add'>+#define IMX95_CLK_DISPMIX_LVDS_CH0_GATE		1</div><div class='add'>+#define IMX95_CLK_DISPMIX_LVDS_CH1_GATE		2</div><div class='add'>+#define IMX95_CLK_DISPMIX_PIX_DI0_GATE		3</div><div class='add'>+#define IMX95_CLK_DISPMIX_PIX_DI1_GATE		4</div><div class='add'>+</div><div class='add'>+#define IMX95_CLK_DISPMIX_ENG0_SEL		0</div><div class='add'>+#define IMX95_CLK_DISPMIX_ENG1_SEL		1</div><div class='add'>+</div><div class='add'>+#define IMX95_CLK_NETCMIX_ENETC0_RMII		0</div><div class='add'>+#define IMX95_CLK_NETCMIX_ENETC1_RMII		1</div><div class='add'>+</div><div class='add'>+#endif	/* __DT_BINDINGS_CLOCK_IMX95_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/px30-cru.h b/include/dt-bindings/clock/px30-cru.h<br/>index 5b1416fcde6f..a2abf1995c34 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/px30-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/px30-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/px30-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/px30-cru.h</a></div><div class='hunk'>@@ -175,8 +175,6 @@</div><div class='ctx'> #define PCLK_CIF		352</div><div class='ctx'> #define PCLK_OTP_PHY		353</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(PCLK_OTP_PHY + 1)</div><div class='del'>-</div><div class='ctx'> /* pmu-clocks indices */</div><div class='ctx'> </div><div class='ctx'> #define PLL_GPLL		1</div><div class='hunk'>@@ -195,8 +193,6 @@</div><div class='ctx'> #define PCLK_GPIO0_PMU		20</div><div class='ctx'> #define PCLK_UART0_PMU		21</div><div class='ctx'> </div><div class='del'>-#define CLKPMU_NR_CLKS		(PCLK_UART0_PMU + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> #define SRST_CORE0_PO		0</div><div class='ctx'> #define SRST_CORE1_PO		1</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,apss-ipq.h b/include/dt-bindings/clock/qcom,apss-ipq.h<br/>index 77b6e05492e2..0bb41e5efdef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,apss-ipq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,apss-ipq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,apss-ipq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,apss-ipq.h</a></div><div class='hunk'>@@ -8,5 +8,11 @@</div><div class='ctx'> </div><div class='ctx'> #define APCS_ALIAS0_CLK_SRC			0</div><div class='ctx'> #define APCS_ALIAS0_CORE_CLK			1</div><div class='add'>+#define APSS_PLL_EARLY				2</div><div class='add'>+#define APSS_SILVER_CLK_SRC			3</div><div class='add'>+#define APSS_SILVER_CORE_CLK			4</div><div class='add'>+#define L3_PLL					5</div><div class='add'>+#define L3_CLK_SRC				6</div><div class='add'>+#define L3_CORE_CLK				7</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,dispcc-sc7280.h b/include/dt-bindings/clock/qcom,dispcc-sc7280.h<br/>index a4a692c20acf..9f113f346be8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,dispcc-sc7280.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,dispcc-sc7280.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,dispcc-sc7280.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,dispcc-sc7280.h</a></div><div class='hunk'>@@ -52,4 +52,8 @@</div><div class='ctx'> /* DISP_CC power domains */</div><div class='ctx'> #define DISP_CC_MDSS_CORE_GDSC				0</div><div class='ctx'> </div><div class='add'>+/* DISPCC resets */</div><div class='add'>+#define DISP_CC_MDSS_CORE_BCR				0</div><div class='add'>+#define DISP_CC_MDSS_RSCC_BCR				1</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,dispcc-sm6350.h b/include/dt-bindings/clock/qcom,dispcc-sm6350.h<br/>index cb54aae2723e..61426a80e620 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,dispcc-sm6350.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,dispcc-sm6350.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,dispcc-sm6350.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,dispcc-sm6350.h</a></div><div class='hunk'>@@ -42,6 +42,10 @@</div><div class='ctx'> #define DISP_CC_SLEEP_CLK			31</div><div class='ctx'> #define DISP_CC_XO_CLK				32</div><div class='ctx'> </div><div class='add'>+/* Resets */</div><div class='add'>+#define DISP_CC_MDSS_CORE_BCR			0</div><div class='add'>+#define DISP_CC_MDSS_RSCC_BCR			1</div><div class='add'>+</div><div class='ctx'> /* GDSCs */</div><div class='ctx'> #define MDSS_GDSC				0</div><div class='ctx'> </div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,dsi-phy-28nm.h b/include/dt-bindings/clock/qcom,dsi-phy-28nm.h<br/>new file mode 100644<br/>index 000000000000..ab94d58377a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,dsi-phy-28nm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,dsi-phy-28nm.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_DSI_PHY_28NM_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_DSI_PHY_28NM_H</div><div class='add'>+</div><div class='add'>+#define DSI_BYTE_PLL_CLK		0</div><div class='add'>+#define DSI_PIXEL_PLL_CLK		1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,gcc-msm8917.h b/include/dt-bindings/clock/qcom,gcc-msm8917.h<br/>index 4b421e7414b5..4e3897b3669d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-msm8917.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-msm8917.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-msm8917.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,gcc-msm8917.h</a></div><div class='hunk'>@@ -170,6 +170,23 @@</div><div class='ctx'> #define VFE1_CLK_SRC				163</div><div class='ctx'> #define VSYNC_CLK_SRC				164</div><div class='ctx'> #define GPLL0_SLEEP_CLK_SRC			165</div><div class='add'>+/* Addtional MSM8937-specific clocks */</div><div class='add'>+#define MSM8937_BLSP1_QUP1_I2C_APPS_CLK_SRC		166</div><div class='add'>+#define MSM8937_BLSP1_QUP1_SPI_APPS_CLK_SRC		167</div><div class='add'>+#define MSM8937_BLSP2_QUP4_I2C_APPS_CLK_SRC		168</div><div class='add'>+#define MSM8937_BLSP2_QUP4_SPI_APPS_CLK_SRC		169</div><div class='add'>+#define MSM8937_BYTE1_CLK_SRC				170</div><div class='add'>+#define MSM8937_ESC1_CLK_SRC				171</div><div class='add'>+#define MSM8937_PCLK1_CLK_SRC				172</div><div class='add'>+#define MSM8937_GCC_BLSP1_QUP1_I2C_APPS_CLK		173</div><div class='add'>+#define MSM8937_GCC_BLSP1_QUP1_SPI_APPS_CLK		174</div><div class='add'>+#define MSM8937_GCC_BLSP2_QUP4_I2C_APPS_CLK		175</div><div class='add'>+#define MSM8937_GCC_BLSP2_QUP4_SPI_APPS_CLK		176</div><div class='add'>+#define MSM8937_GCC_MDSS_BYTE1_CLK			177</div><div class='add'>+#define MSM8937_GCC_MDSS_ESC1_CLK			178</div><div class='add'>+#define MSM8937_GCC_MDSS_PCLK1_CLK			179</div><div class='add'>+#define MSM8937_GCC_OXILI_AON_CLK			180</div><div class='add'>+#define MSM8937_GCC_OXILI_TIMER_CLK			181</div><div class='ctx'> </div><div class='ctx'> /* GCC block resets */</div><div class='ctx'> #define GCC_CAMSS_MICRO_BCR			0</div><div class='hunk'>@@ -187,5 +204,7 @@</div><div class='ctx'> #define VENUS_GDSC				5</div><div class='ctx'> #define VFE0_GDSC				6</div><div class='ctx'> #define VFE1_GDSC				7</div><div class='add'>+/* Additional MSM8937-specific GDSCs */</div><div class='add'>+#define MSM8937_OXILI_CX_GDSC				8</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,gcc-msm8998.h b/include/dt-bindings/clock/qcom,gcc-msm8998.h<br/>index b5456a64d421..5b0dde080900 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-msm8998.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-msm8998.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-msm8998.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,gcc-msm8998.h</a></div><div class='hunk'>@@ -193,10 +193,15 @@</div><div class='ctx'> #define GCC_MMSS_GPLL0_DIV_CLK					184</div><div class='ctx'> #define GCC_GPU_GPLL0_DIV_CLK					185</div><div class='ctx'> #define GCC_GPU_GPLL0_CLK					186</div><div class='add'>+#define HLOS1_VOTE_LPASS_CORE_SMMU_CLK				187</div><div class='add'>+#define HLOS1_VOTE_LPASS_ADSP_SMMU_CLK				188</div><div class='add'>+#define GCC_MSS_Q6_BIMC_AXI_CLK					189</div><div class='ctx'> </div><div class='ctx'> #define PCIE_0_GDSC						0</div><div class='ctx'> #define UFS_GDSC						1</div><div class='ctx'> #define USB_30_GDSC						2</div><div class='add'>+#define LPASS_ADSP_GDSC						3</div><div class='add'>+#define LPASS_CORE_GDSC						4</div><div class='ctx'> </div><div class='ctx'> #define GCC_BLSP1_QUP1_BCR					0</div><div class='ctx'> #define GCC_BLSP1_QUP2_BCR					1</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,gcc-sc8180x.h b/include/dt-bindings/clock/qcom,gcc-sc8180x.h<br/>index 90c6e021a035..b9d8438a15ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-sc8180x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-sc8180x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-sc8180x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,gcc-sc8180x.h</a></div><div class='hunk'>@@ -248,6 +248,17 @@</div><div class='ctx'> #define GCC_USB3_SEC_CLKREF_CLK					238</div><div class='ctx'> #define GCC_UFS_MEM_CLKREF_EN					239</div><div class='ctx'> #define GCC_UFS_CARD_CLKREF_EN					240</div><div class='add'>+#define GPLL9							241</div><div class='add'>+#define GCC_CAMERA_AHB_CLK					242</div><div class='add'>+#define GCC_CAMERA_XO_CLK					243</div><div class='add'>+#define GCC_CPUSS_DVM_BUS_CLK					244</div><div class='add'>+#define GCC_CPUSS_GNOC_CLK					245</div><div class='add'>+#define GCC_DISP_AHB_CLK					246</div><div class='add'>+#define GCC_DISP_XO_CLK						247</div><div class='add'>+#define GCC_GPU_CFG_AHB_CLK					248</div><div class='add'>+#define GCC_NPU_CFG_AHB_CLK					249</div><div class='add'>+#define GCC_VIDEO_AHB_CLK					250</div><div class='add'>+#define GCC_VIDEO_XO_CLK					251</div><div class='ctx'> </div><div class='ctx'> #define GCC_EMAC_BCR						0</div><div class='ctx'> #define GCC_GPU_BCR						1</div><div class='hunk'>@@ -294,6 +305,10 @@</div><div class='ctx'> #define GCC_VIDEO_AXI0_CLK_BCR					42</div><div class='ctx'> #define GCC_VIDEO_AXI1_CLK_BCR					43</div><div class='ctx'> #define GCC_USB3_DP_PHY_SEC_BCR					44</div><div class='add'>+#define GCC_USB3_UNIPHY_MP0_BCR					45</div><div class='add'>+#define GCC_USB3_UNIPHY_MP1_BCR					46</div><div class='add'>+#define GCC_USB3UNIPHY_PHY_MP0_BCR				47</div><div class='add'>+#define GCC_USB3UNIPHY_PHY_MP1_BCR				48</div><div class='ctx'> </div><div class='ctx'> /* GCC GDSCRs */</div><div class='ctx'> #define EMAC_GDSC						0</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,gcc-sdm660.h b/include/dt-bindings/clock/qcom,gcc-sdm660.h<br/>index df8a6f3d367e..f19018b742f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-sdm660.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-sdm660.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-sdm660.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,gcc-sdm660.h</a></div><div class='hunk'>@@ -138,10 +138,16 @@</div><div class='ctx'> #define GCC_UFS_UNIPRO_CORE_HW_CTL_CLK		128</div><div class='ctx'> #define GCC_RX0_USB2_CLKREF_CLK			129</div><div class='ctx'> #define GCC_RX1_USB2_CLKREF_CLK			130</div><div class='add'>+#define GCC_HLOS1_VOTE_LPASS_ADSP_SMMU_CLK	131</div><div class='add'>+#define GCC_HLOS1_VOTE_TURING_ADSP_SMMU_CLK	132</div><div class='add'>+#define GCC_HLOS2_VOTE_TURING_ADSP_SMMU_CLK	133</div><div class='ctx'> </div><div class='ctx'> #define PCIE_0_GDSC	0</div><div class='ctx'> #define UFS_GDSC	1</div><div class='ctx'> #define USB_30_GDSC	2</div><div class='add'>+#define HLOS1_VOTE_TURING_ADSP_GDSC 3</div><div class='add'>+#define HLOS2_VOTE_TURING_ADSP_GDSC 4</div><div class='add'>+#define HLOS1_VOTE_LPASS_ADSP_GDSC 5</div><div class='ctx'> </div><div class='ctx'> #define GCC_QUSB2PHY_PRIM_BCR		0</div><div class='ctx'> #define GCC_QUSB2PHY_SEC_BCR		1</div><div class='hunk'>@@ -153,5 +159,7 @@</div><div class='ctx'> #define GCC_USB_30_BCR			7</div><div class='ctx'> #define GCC_USB_PHY_CFG_AHB2PHY_BCR	8</div><div class='ctx'> #define GCC_MSS_RESTART			9</div><div class='add'>+#define GCC_SDCC1_BCR			10</div><div class='add'>+#define GCC_SDCC2_BCR			11</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,gcc-sm8150.h b/include/dt-bindings/clock/qcom,gcc-sm8150.h<br/>index dfefd5e8bf6e..921a33f24d33 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-sm8150.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-sm8150.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-sm8150.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,gcc-sm8150.h</a></div><div class='hunk'>@@ -239,6 +239,9 @@</div><div class='ctx'> #define GCC_USB30_PRIM_BCR					26</div><div class='ctx'> #define GCC_USB30_SEC_BCR					27</div><div class='ctx'> #define GCC_USB_PHY_CFG_AHB2PHY_BCR				28</div><div class='add'>+#define GCC_VIDEO_AXIC_CLK_BCR					29</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK_BCR					30</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK_BCR					31</div><div class='ctx'> </div><div class='ctx'> /* GCC GDSCRs */</div><div class='ctx'> #define PCIE_0_GDSC						0</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,gcc-sm8450.h b/include/dt-bindings/clock/qcom,gcc-sm8450.h<br/>index 9679410843a0..7320e63c3a2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-sm8450.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,gcc-sm8450.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,gcc-sm8450.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,gcc-sm8450.h</a></div><div class='hunk'>@@ -194,6 +194,9 @@</div><div class='ctx'> #define GCC_VIDEO_AXI0_CLK					182</div><div class='ctx'> #define GCC_VIDEO_AXI1_CLK					183</div><div class='ctx'> #define GCC_VIDEO_XO_CLK					184</div><div class='add'>+/* Additional SM8475-specific clocks */</div><div class='add'>+#define SM8475_GCC_GPLL2					185</div><div class='add'>+#define SM8475_GCC_GPLL3					186</div><div class='ctx'> </div><div class='ctx'> /* GCC resets */</div><div class='ctx'> #define GCC_CAMERA_BCR						0</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,glymur-dispcc.h b/include/dt-bindings/clock/qcom,glymur-dispcc.h<br/>new file mode 100644<br/>index 000000000000..a845d76defe2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,glymur-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,glymur-dispcc.h</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_DISP_CC_GLYMUR_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_DISP_CC_GLYMUR_H</div><div class='add'>+</div><div class='add'>+/* DISP_CC clocks */</div><div class='add'>+#define DISP_CC_ESYNC0_CLK					0</div><div class='add'>+#define DISP_CC_ESYNC0_CLK_SRC					1</div><div class='add'>+#define DISP_CC_ESYNC1_CLK					2</div><div class='add'>+#define DISP_CC_ESYNC1_CLK_SRC					3</div><div class='add'>+#define DISP_CC_MDSS_ACCU_SHIFT_CLK				4</div><div class='add'>+#define DISP_CC_MDSS_AHB1_CLK					5</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK					6</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK_SRC				7</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK					8</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK_SRC				9</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_DIV_CLK_SRC				10</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_INTF_CLK				11</div><div class='add'>+#define DISP_CC_MDSS_BYTE1_CLK					12</div><div class='add'>+#define DISP_CC_MDSS_BYTE1_CLK_SRC				13</div><div class='add'>+#define DISP_CC_MDSS_BYTE1_DIV_CLK_SRC				14</div><div class='add'>+#define DISP_CC_MDSS_BYTE1_INTF_CLK				15</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_AUX_CLK				16</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_AUX_CLK_SRC				17</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_CLK				18</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_CLK_SRC				19</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_DIV_CLK_SRC			20</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_DPIN_CLK			21</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_DPIN_DIV_CLK_SRC		22</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_INTF_CLK			23</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL0_CLK				24</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC			25</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL1_CLK				26</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL1_CLK_SRC			27</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_USB_ROUTER_LINK_INTF_CLK		28</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_AUX_CLK				29</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_AUX_CLK_SRC				30</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_CLK				31</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_CLK_SRC				32</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_DIV_CLK_SRC			33</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_DPIN_CLK			34</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_DPIN_DIV_CLK_SRC		35</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_INTF_CLK			36</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_PIXEL0_CLK				37</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_PIXEL0_CLK_SRC			38</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_PIXEL1_CLK				39</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_PIXEL1_CLK_SRC			40</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_USB_ROUTER_LINK_INTF_CLK		41</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_AUX_CLK				42</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_AUX_CLK_SRC				43</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_CLK				44</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_CLK_SRC				45</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_DIV_CLK_SRC			46</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_DPIN_CLK			47</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_DPIN_DIV_CLK_SRC		48</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_INTF_CLK			49</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_PIXEL0_CLK				50</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_PIXEL0_CLK_SRC			51</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_PIXEL1_CLK				52</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_PIXEL1_CLK_SRC			53</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_USB_ROUTER_LINK_INTF_CLK		54</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_AUX_CLK				55</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_AUX_CLK_SRC				56</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_CLK				57</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_CLK_SRC				58</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_DIV_CLK_SRC			59</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_DPIN_CLK			60</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_DPIN_DIV_CLK_SRC		61</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_INTF_CLK			62</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_PIXEL0_CLK				63</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_PIXEL0_CLK_SRC			64</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK					65</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK_SRC				66</div><div class='add'>+#define DISP_CC_MDSS_ESC1_CLK					67</div><div class='add'>+#define DISP_CC_MDSS_ESC1_CLK_SRC				68</div><div class='add'>+#define DISP_CC_MDSS_MDP1_CLK					69</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK					70</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK_SRC				71</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT1_CLK				72</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT_CLK				73</div><div class='add'>+#define DISP_CC_MDSS_NON_GDSC_AHB_CLK				74</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK					75</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK_SRC				76</div><div class='add'>+#define DISP_CC_MDSS_PCLK1_CLK					77</div><div class='add'>+#define DISP_CC_MDSS_PCLK1_CLK_SRC				78</div><div class='add'>+#define DISP_CC_MDSS_PCLK2_CLK					79</div><div class='add'>+#define DISP_CC_MDSS_PCLK2_CLK_SRC				80</div><div class='add'>+#define DISP_CC_MDSS_RSCC_AHB_CLK				81</div><div class='add'>+#define DISP_CC_MDSS_RSCC_VSYNC_CLK				82</div><div class='add'>+#define DISP_CC_MDSS_VSYNC1_CLK					83</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK					84</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK_SRC				85</div><div class='add'>+#define DISP_CC_OSC_CLK						86</div><div class='add'>+#define DISP_CC_OSC_CLK_SRC					87</div><div class='add'>+#define DISP_CC_PLL0						88</div><div class='add'>+#define DISP_CC_PLL1						89</div><div class='add'>+#define DISP_CC_SLEEP_CLK					90</div><div class='add'>+#define DISP_CC_SLEEP_CLK_SRC					91</div><div class='add'>+#define DISP_CC_XO_CLK						92</div><div class='add'>+#define DISP_CC_XO_CLK_SRC					93</div><div class='add'>+</div><div class='add'>+/* DISP_CC power domains */</div><div class='add'>+#define DISP_CC_MDSS_CORE_GDSC					0</div><div class='add'>+#define DISP_CC_MDSS_CORE_INT2_GDSC				1</div><div class='add'>+</div><div class='add'>+/* DISP_CC resets */</div><div class='add'>+#define DISP_CC_MDSS_CORE_BCR					0</div><div class='add'>+#define DISP_CC_MDSS_CORE_INT2_BCR				1</div><div class='add'>+#define DISP_CC_MDSS_RSCC_BCR					2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,glymur-gcc.h b/include/dt-bindings/clock/qcom,glymur-gcc.h<br/>new file mode 100644<br/>index 000000000000..10c12b8c51c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,glymur-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,glymur-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,578 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GCC_GLYMUR_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GCC_GLYMUR_H</div><div class='add'>+</div><div class='add'>+/* GCC clocks */</div><div class='add'>+#define GCC_GPLL0						0</div><div class='add'>+#define GCC_GPLL0_OUT_EVEN					1</div><div class='add'>+#define GCC_GPLL1						2</div><div class='add'>+#define GCC_GPLL14						3</div><div class='add'>+#define GCC_GPLL14_OUT_EVEN					4</div><div class='add'>+#define GCC_GPLL4						5</div><div class='add'>+#define GCC_GPLL5						6</div><div class='add'>+#define GCC_GPLL7						7</div><div class='add'>+#define GCC_GPLL8						8</div><div class='add'>+#define GCC_GPLL9						9</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_3A_WEST_SF_AXI_CLK			10</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_3B_WEST_SF_AXI_CLK			11</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_4_WEST_SF_AXI_CLK			12</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_5_EAST_SF_AXI_CLK			13</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_6_WEST_SF_AXI_CLK			14</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_CLK				15</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_HW_CTL_CLK			16</div><div class='add'>+#define GCC_AGGRE_USB2_PRIM_AXI_CLK				17</div><div class='add'>+#define GCC_AGGRE_USB3_MP_AXI_CLK				18</div><div class='add'>+#define GCC_AGGRE_USB3_PRIM_AXI_CLK				19</div><div class='add'>+#define GCC_AGGRE_USB3_SEC_AXI_CLK				20</div><div class='add'>+#define GCC_AGGRE_USB3_TERT_AXI_CLK				21</div><div class='add'>+#define GCC_AGGRE_USB4_0_AXI_CLK				22</div><div class='add'>+#define GCC_AGGRE_USB4_1_AXI_CLK				23</div><div class='add'>+#define GCC_AGGRE_USB4_2_AXI_CLK				24</div><div class='add'>+#define GCC_AV1E_AHB_CLK					25</div><div class='add'>+#define GCC_AV1E_AXI_CLK					26</div><div class='add'>+#define GCC_AV1E_XO_CLK						27</div><div class='add'>+#define GCC_BOOT_ROM_AHB_CLK					28</div><div class='add'>+#define GCC_CAMERA_AHB_CLK					29</div><div class='add'>+#define GCC_CAMERA_HF_AXI_CLK					30</div><div class='add'>+#define GCC_CAMERA_SF_AXI_CLK					31</div><div class='add'>+#define GCC_CAMERA_XO_CLK					32</div><div class='add'>+#define GCC_CFG_NOC_PCIE_ANOC_AHB_CLK				33</div><div class='add'>+#define GCC_CFG_NOC_PCIE_ANOC_SOUTH_AHB_CLK			34</div><div class='add'>+#define GCC_CFG_NOC_USB2_PRIM_AXI_CLK				35</div><div class='add'>+#define GCC_CFG_NOC_USB3_MP_AXI_CLK				36</div><div class='add'>+#define GCC_CFG_NOC_USB3_PRIM_AXI_CLK				37</div><div class='add'>+#define GCC_CFG_NOC_USB3_SEC_AXI_CLK				38</div><div class='add'>+#define GCC_CFG_NOC_USB3_TERT_AXI_CLK				39</div><div class='add'>+#define GCC_CFG_NOC_USB_ANOC_AHB_CLK				40</div><div class='add'>+#define GCC_CFG_NOC_USB_ANOC_SOUTH_AHB_CLK			41</div><div class='add'>+#define GCC_DISP_AHB_CLK					42</div><div class='add'>+#define GCC_DISP_HF_AXI_CLK					43</div><div class='add'>+#define GCC_EVA_AHB_CLK						44</div><div class='add'>+#define GCC_EVA_AXI0_CLK					45</div><div class='add'>+#define GCC_EVA_AXI0C_CLK					46</div><div class='add'>+#define GCC_EVA_XO_CLK						47</div><div class='add'>+#define GCC_GP1_CLK						48</div><div class='add'>+#define GCC_GP1_CLK_SRC						49</div><div class='add'>+#define GCC_GP2_CLK						50</div><div class='add'>+#define GCC_GP2_CLK_SRC						51</div><div class='add'>+#define GCC_GP3_CLK						52</div><div class='add'>+#define GCC_GP3_CLK_SRC						53</div><div class='add'>+#define GCC_GPU_CFG_AHB_CLK					54</div><div class='add'>+#define GCC_GPU_GEMNOC_GFX_CLK					55</div><div class='add'>+#define GCC_GPU_GPLL0_CLK_SRC					56</div><div class='add'>+#define GCC_GPU_GPLL0_DIV_CLK_SRC				57</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK					58</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK_SRC					59</div><div class='add'>+#define GCC_PCIE_0_CFG_AHB_CLK					60</div><div class='add'>+#define GCC_PCIE_0_MSTR_AXI_CLK					61</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK				62</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK_SRC				63</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK					64</div><div class='add'>+#define GCC_PCIE_0_SLV_AXI_CLK					65</div><div class='add'>+#define GCC_PCIE_0_SLV_Q2A_AXI_CLK				66</div><div class='add'>+#define GCC_PCIE_1_AUX_CLK					67</div><div class='add'>+#define GCC_PCIE_1_AUX_CLK_SRC					68</div><div class='add'>+#define GCC_PCIE_1_CFG_AHB_CLK					69</div><div class='add'>+#define GCC_PCIE_1_MSTR_AXI_CLK					70</div><div class='add'>+#define GCC_PCIE_1_PHY_RCHNG_CLK				71</div><div class='add'>+#define GCC_PCIE_1_PHY_RCHNG_CLK_SRC				72</div><div class='add'>+#define GCC_PCIE_1_PIPE_CLK					73</div><div class='add'>+#define GCC_PCIE_1_SLV_AXI_CLK					74</div><div class='add'>+#define GCC_PCIE_1_SLV_Q2A_AXI_CLK				75</div><div class='add'>+#define GCC_PCIE_2_AUX_CLK					76</div><div class='add'>+#define GCC_PCIE_2_AUX_CLK_SRC					77</div><div class='add'>+#define GCC_PCIE_2_CFG_AHB_CLK					78</div><div class='add'>+#define GCC_PCIE_2_MSTR_AXI_CLK					79</div><div class='add'>+#define GCC_PCIE_2_PHY_RCHNG_CLK				80</div><div class='add'>+#define GCC_PCIE_2_PHY_RCHNG_CLK_SRC				81</div><div class='add'>+#define GCC_PCIE_2_PIPE_CLK					82</div><div class='add'>+#define GCC_PCIE_2_SLV_AXI_CLK					83</div><div class='add'>+#define GCC_PCIE_2_SLV_Q2A_AXI_CLK				84</div><div class='add'>+#define GCC_PCIE_3A_AUX_CLK					85</div><div class='add'>+#define GCC_PCIE_3A_AUX_CLK_SRC					86</div><div class='add'>+#define GCC_PCIE_3A_CFG_AHB_CLK					87</div><div class='add'>+#define GCC_PCIE_3A_MSTR_AXI_CLK				88</div><div class='add'>+#define GCC_PCIE_3A_PHY_RCHNG_CLK				89</div><div class='add'>+#define GCC_PCIE_3A_PHY_RCHNG_CLK_SRC				90</div><div class='add'>+#define GCC_PCIE_3A_PIPE_CLK					91</div><div class='add'>+#define GCC_PCIE_3A_PIPE_CLK_SRC				92</div><div class='add'>+#define GCC_PCIE_3A_SLV_AXI_CLK					93</div><div class='add'>+#define GCC_PCIE_3A_SLV_Q2A_AXI_CLK				94</div><div class='add'>+#define GCC_PCIE_3B_AUX_CLK					95</div><div class='add'>+#define GCC_PCIE_3B_AUX_CLK_SRC					96</div><div class='add'>+#define GCC_PCIE_3B_CFG_AHB_CLK					97</div><div class='add'>+#define GCC_PCIE_3B_MSTR_AXI_CLK				98</div><div class='add'>+#define GCC_PCIE_3B_PHY_RCHNG_CLK				99</div><div class='add'>+#define GCC_PCIE_3B_PHY_RCHNG_CLK_SRC				100</div><div class='add'>+#define GCC_PCIE_3B_PIPE_CLK					101</div><div class='add'>+#define GCC_PCIE_3B_PIPE_CLK_SRC				102</div><div class='add'>+#define GCC_PCIE_3B_PIPE_DIV2_CLK				103</div><div class='add'>+#define GCC_PCIE_3B_PIPE_DIV_CLK_SRC				104</div><div class='add'>+#define GCC_PCIE_3B_SLV_AXI_CLK					105</div><div class='add'>+#define GCC_PCIE_3B_SLV_Q2A_AXI_CLK				106</div><div class='add'>+#define GCC_PCIE_4_AUX_CLK					107</div><div class='add'>+#define GCC_PCIE_4_AUX_CLK_SRC					108</div><div class='add'>+#define GCC_PCIE_4_CFG_AHB_CLK					109</div><div class='add'>+#define GCC_PCIE_4_MSTR_AXI_CLK					110</div><div class='add'>+#define GCC_PCIE_4_PHY_RCHNG_CLK				111</div><div class='add'>+#define GCC_PCIE_4_PHY_RCHNG_CLK_SRC				112</div><div class='add'>+#define GCC_PCIE_4_PIPE_CLK					113</div><div class='add'>+#define GCC_PCIE_4_PIPE_CLK_SRC					114</div><div class='add'>+#define GCC_PCIE_4_PIPE_DIV2_CLK				115</div><div class='add'>+#define GCC_PCIE_4_PIPE_DIV_CLK_SRC				116</div><div class='add'>+#define GCC_PCIE_4_SLV_AXI_CLK					117</div><div class='add'>+#define GCC_PCIE_4_SLV_Q2A_AXI_CLK				118</div><div class='add'>+#define GCC_PCIE_5_AUX_CLK					119</div><div class='add'>+#define GCC_PCIE_5_AUX_CLK_SRC					120</div><div class='add'>+#define GCC_PCIE_5_CFG_AHB_CLK					121</div><div class='add'>+#define GCC_PCIE_5_MSTR_AXI_CLK					122</div><div class='add'>+#define GCC_PCIE_5_PHY_RCHNG_CLK				123</div><div class='add'>+#define GCC_PCIE_5_PHY_RCHNG_CLK_SRC				124</div><div class='add'>+#define GCC_PCIE_5_PIPE_CLK					125</div><div class='add'>+#define GCC_PCIE_5_PIPE_CLK_SRC					126</div><div class='add'>+#define GCC_PCIE_5_PIPE_DIV2_CLK				127</div><div class='add'>+#define GCC_PCIE_5_PIPE_DIV_CLK_SRC				128</div><div class='add'>+#define GCC_PCIE_5_SLV_AXI_CLK					129</div><div class='add'>+#define GCC_PCIE_5_SLV_Q2A_AXI_CLK				130</div><div class='add'>+#define GCC_PCIE_6_AUX_CLK					131</div><div class='add'>+#define GCC_PCIE_6_AUX_CLK_SRC					132</div><div class='add'>+#define GCC_PCIE_6_CFG_AHB_CLK					133</div><div class='add'>+#define GCC_PCIE_6_MSTR_AXI_CLK					134</div><div class='add'>+#define GCC_PCIE_6_PHY_RCHNG_CLK				135</div><div class='add'>+#define GCC_PCIE_6_PHY_RCHNG_CLK_SRC				136</div><div class='add'>+#define GCC_PCIE_6_PIPE_CLK					137</div><div class='add'>+#define GCC_PCIE_6_PIPE_CLK_SRC					138</div><div class='add'>+#define GCC_PCIE_6_PIPE_DIV2_CLK				139</div><div class='add'>+#define GCC_PCIE_6_PIPE_DIV_CLK_SRC				140</div><div class='add'>+#define GCC_PCIE_6_SLV_AXI_CLK					141</div><div class='add'>+#define GCC_PCIE_6_SLV_Q2A_AXI_CLK				142</div><div class='add'>+#define GCC_PCIE_NOC_PWRCTL_CLK					143</div><div class='add'>+#define GCC_PCIE_NOC_QOSGEN_EXTREF_CLK				144</div><div class='add'>+#define GCC_PCIE_NOC_SF_CENTER_CLK				145</div><div class='add'>+#define GCC_PCIE_NOC_SLAVE_SF_EAST_CLK				146</div><div class='add'>+#define GCC_PCIE_NOC_SLAVE_SF_WEST_CLK				147</div><div class='add'>+#define GCC_PCIE_NOC_TSCTR_CLK					148</div><div class='add'>+#define GCC_PCIE_PHY_3A_AUX_CLK					149</div><div class='add'>+#define GCC_PCIE_PHY_3A_AUX_CLK_SRC				150</div><div class='add'>+#define GCC_PCIE_PHY_3B_AUX_CLK					151</div><div class='add'>+#define GCC_PCIE_PHY_3B_AUX_CLK_SRC				152</div><div class='add'>+#define GCC_PCIE_PHY_4_AUX_CLK					153</div><div class='add'>+#define GCC_PCIE_PHY_4_AUX_CLK_SRC				154</div><div class='add'>+#define GCC_PCIE_PHY_5_AUX_CLK					155</div><div class='add'>+#define GCC_PCIE_PHY_5_AUX_CLK_SRC				156</div><div class='add'>+#define GCC_PCIE_PHY_6_AUX_CLK					157</div><div class='add'>+#define GCC_PCIE_PHY_6_AUX_CLK_SRC				158</div><div class='add'>+#define GCC_PCIE_RSCC_CFG_AHB_CLK				159</div><div class='add'>+#define GCC_PCIE_RSCC_XO_CLK					160</div><div class='add'>+#define GCC_PDM2_CLK						161</div><div class='add'>+#define GCC_PDM2_CLK_SRC					162</div><div class='add'>+#define GCC_PDM_AHB_CLK						163</div><div class='add'>+#define GCC_PDM_XO4_CLK						164</div><div class='add'>+#define GCC_QMIP_AV1E_AHB_CLK					165</div><div class='add'>+#define GCC_QMIP_CAMERA_CMD_AHB_CLK				166</div><div class='add'>+#define GCC_QMIP_CAMERA_NRT_AHB_CLK				167</div><div class='add'>+#define GCC_QMIP_CAMERA_RT_AHB_CLK				168</div><div class='add'>+#define GCC_QMIP_GPU_AHB_CLK					169</div><div class='add'>+#define GCC_QMIP_PCIE_3A_AHB_CLK				170</div><div class='add'>+#define GCC_QMIP_PCIE_3B_AHB_CLK				171</div><div class='add'>+#define GCC_QMIP_PCIE_4_AHB_CLK					172</div><div class='add'>+#define GCC_QMIP_PCIE_5_AHB_CLK					173</div><div class='add'>+#define GCC_QMIP_PCIE_6_AHB_CLK					174</div><div class='add'>+#define GCC_QMIP_VIDEO_CV_CPU_AHB_CLK				175</div><div class='add'>+#define GCC_QMIP_VIDEO_CVP_AHB_CLK				176</div><div class='add'>+#define GCC_QMIP_VIDEO_V_CPU_AHB_CLK				177</div><div class='add'>+#define GCC_QMIP_VIDEO_VCODEC1_AHB_CLK				178</div><div class='add'>+#define GCC_QMIP_VIDEO_VCODEC_AHB_CLK				179</div><div class='add'>+#define GCC_QUPV3_OOB_CORE_2X_CLK				180</div><div class='add'>+#define GCC_QUPV3_OOB_CORE_CLK					181</div><div class='add'>+#define GCC_QUPV3_OOB_M_AHB_CLK					182</div><div class='add'>+#define GCC_QUPV3_OOB_QSPI_S0_CLK				183</div><div class='add'>+#define GCC_QUPV3_OOB_QSPI_S0_CLK_SRC				184</div><div class='add'>+#define GCC_QUPV3_OOB_QSPI_S1_CLK				185</div><div class='add'>+#define GCC_QUPV3_OOB_QSPI_S1_CLK_SRC				186</div><div class='add'>+#define GCC_QUPV3_OOB_S0_CLK					187</div><div class='add'>+#define GCC_QUPV3_OOB_S0_CLK_SRC				188</div><div class='add'>+#define GCC_QUPV3_OOB_S1_CLK					189</div><div class='add'>+#define GCC_QUPV3_OOB_S1_CLK_SRC				190</div><div class='add'>+#define GCC_QUPV3_OOB_S_AHB_CLK					191</div><div class='add'>+#define GCC_QUPV3_OOB_TCXO_CLK					192</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_2X_CLK				193</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_CLK				194</div><div class='add'>+#define GCC_QUPV3_WRAP0_QSPI_S2_CLK				195</div><div class='add'>+#define GCC_QUPV3_WRAP0_QSPI_S2_CLK_SRC				196</div><div class='add'>+#define GCC_QUPV3_WRAP0_QSPI_S3_CLK				197</div><div class='add'>+#define GCC_QUPV3_WRAP0_QSPI_S3_CLK_SRC				198</div><div class='add'>+#define GCC_QUPV3_WRAP0_QSPI_S6_CLK				199</div><div class='add'>+#define GCC_QUPV3_WRAP0_QSPI_S6_CLK_SRC				200</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK					201</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK_SRC				202</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK					203</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK_SRC				204</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK					205</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK_SRC				206</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK					207</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK_SRC				208</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK					209</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK_SRC				210</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK					211</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK_SRC				212</div><div class='add'>+#define GCC_QUPV3_WRAP0_S6_CLK					213</div><div class='add'>+#define GCC_QUPV3_WRAP0_S6_CLK_SRC				214</div><div class='add'>+#define GCC_QUPV3_WRAP0_S7_CLK					215</div><div class='add'>+#define GCC_QUPV3_WRAP0_S7_CLK_SRC				216</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_2X_CLK				217</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_CLK				218</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_S2_CLK				219</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_S2_CLK_SRC				220</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_S3_CLK				221</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_S3_CLK_SRC				222</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_S6_CLK				223</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_S6_CLK_SRC				224</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK					225</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK_SRC				226</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK					227</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK_SRC				228</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK					229</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK_SRC				230</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK					231</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK_SRC				232</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK					233</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK_SRC				234</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK					235</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK_SRC				236</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK					237</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK_SRC				238</div><div class='add'>+#define GCC_QUPV3_WRAP1_S7_CLK					239</div><div class='add'>+#define GCC_QUPV3_WRAP1_S7_CLK_SRC				240</div><div class='add'>+#define GCC_QUPV3_WRAP2_CORE_2X_CLK				241</div><div class='add'>+#define GCC_QUPV3_WRAP2_CORE_CLK				242</div><div class='add'>+#define GCC_QUPV3_WRAP2_QSPI_S2_CLK				243</div><div class='add'>+#define GCC_QUPV3_WRAP2_QSPI_S2_CLK_SRC				244</div><div class='add'>+#define GCC_QUPV3_WRAP2_QSPI_S3_CLK				245</div><div class='add'>+#define GCC_QUPV3_WRAP2_QSPI_S3_CLK_SRC				246</div><div class='add'>+#define GCC_QUPV3_WRAP2_QSPI_S6_CLK				247</div><div class='add'>+#define GCC_QUPV3_WRAP2_QSPI_S6_CLK_SRC				248</div><div class='add'>+#define GCC_QUPV3_WRAP2_S0_CLK					249</div><div class='add'>+#define GCC_QUPV3_WRAP2_S0_CLK_SRC				250</div><div class='add'>+#define GCC_QUPV3_WRAP2_S1_CLK					251</div><div class='add'>+#define GCC_QUPV3_WRAP2_S1_CLK_SRC				252</div><div class='add'>+#define GCC_QUPV3_WRAP2_S2_CLK					253</div><div class='add'>+#define GCC_QUPV3_WRAP2_S2_CLK_SRC				254</div><div class='add'>+#define GCC_QUPV3_WRAP2_S3_CLK					255</div><div class='add'>+#define GCC_QUPV3_WRAP2_S3_CLK_SRC				256</div><div class='add'>+#define GCC_QUPV3_WRAP2_S4_CLK					257</div><div class='add'>+#define GCC_QUPV3_WRAP2_S4_CLK_SRC				258</div><div class='add'>+#define GCC_QUPV3_WRAP2_S5_CLK					259</div><div class='add'>+#define GCC_QUPV3_WRAP2_S5_CLK_SRC				260</div><div class='add'>+#define GCC_QUPV3_WRAP2_S6_CLK					261</div><div class='add'>+#define GCC_QUPV3_WRAP2_S6_CLK_SRC				262</div><div class='add'>+#define GCC_QUPV3_WRAP2_S7_CLK					263</div><div class='add'>+#define GCC_QUPV3_WRAP2_S7_CLK_SRC				264</div><div class='add'>+#define GCC_QUPV3_WRAP_0_M_AHB_CLK				265</div><div class='add'>+#define GCC_QUPV3_WRAP_0_S_AHB_CLK				266</div><div class='add'>+#define GCC_QUPV3_WRAP_1_M_AHB_CLK				267</div><div class='add'>+#define GCC_QUPV3_WRAP_1_S_AHB_CLK				268</div><div class='add'>+#define GCC_QUPV3_WRAP_2_M_AHB_CLK				269</div><div class='add'>+#define GCC_QUPV3_WRAP_2_S_AHB_CLK				270</div><div class='add'>+#define GCC_SDCC2_AHB_CLK					271</div><div class='add'>+#define GCC_SDCC2_APPS_CLK					272</div><div class='add'>+#define GCC_SDCC2_APPS_CLK_SRC					273</div><div class='add'>+#define GCC_SDCC4_AHB_CLK					274</div><div class='add'>+#define GCC_SDCC4_APPS_CLK					275</div><div class='add'>+#define GCC_SDCC4_APPS_CLK_SRC					276</div><div class='add'>+#define GCC_UFS_PHY_AHB_CLK					277</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK					278</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK_SRC					279</div><div class='add'>+#define GCC_UFS_PHY_AXI_HW_CTL_CLK				280</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK				281</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK_SRC				282</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_HW_CTL_CLK				283</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK					284</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK_SRC				285</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_HW_CTL_CLK				286</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK				287</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK_SRC				288</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK				289</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK_SRC				290</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK				291</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK_SRC				292</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK				293</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK_SRC				294</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_HW_CTL_CLK			295</div><div class='add'>+#define GCC_USB20_MASTER_CLK					296</div><div class='add'>+#define GCC_USB20_MASTER_CLK_SRC				297</div><div class='add'>+#define GCC_USB20_MOCK_UTMI_CLK					298</div><div class='add'>+#define GCC_USB20_MOCK_UTMI_CLK_SRC				299</div><div class='add'>+#define GCC_USB20_MOCK_UTMI_POSTDIV_CLK_SRC			300</div><div class='add'>+#define GCC_USB20_SLEEP_CLK					301</div><div class='add'>+#define GCC_USB30_MP_MASTER_CLK					302</div><div class='add'>+#define GCC_USB30_MP_MASTER_CLK_SRC				303</div><div class='add'>+#define GCC_USB30_MP_MOCK_UTMI_CLK				304</div><div class='add'>+#define GCC_USB30_MP_MOCK_UTMI_CLK_SRC				305</div><div class='add'>+#define GCC_USB30_MP_MOCK_UTMI_POSTDIV_CLK_SRC			306</div><div class='add'>+#define GCC_USB30_MP_SLEEP_CLK					307</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK				308</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK_SRC				309</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK				310</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC			311</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_POSTDIV_CLK_SRC		312</div><div class='add'>+#define GCC_USB30_PRIM_SLEEP_CLK				313</div><div class='add'>+#define GCC_USB30_SEC_MASTER_CLK				314</div><div class='add'>+#define GCC_USB30_SEC_MASTER_CLK_SRC				315</div><div class='add'>+#define GCC_USB30_SEC_MOCK_UTMI_CLK				316</div><div class='add'>+#define GCC_USB30_SEC_MOCK_UTMI_CLK_SRC				317</div><div class='add'>+#define GCC_USB30_SEC_MOCK_UTMI_POSTDIV_CLK_SRC			318</div><div class='add'>+#define GCC_USB30_SEC_SLEEP_CLK					319</div><div class='add'>+#define GCC_USB30_TERT_MASTER_CLK				320</div><div class='add'>+#define GCC_USB30_TERT_MASTER_CLK_SRC				321</div><div class='add'>+#define GCC_USB30_TERT_MOCK_UTMI_CLK				322</div><div class='add'>+#define GCC_USB30_TERT_MOCK_UTMI_CLK_SRC			323</div><div class='add'>+#define GCC_USB30_TERT_MOCK_UTMI_POSTDIV_CLK_SRC		324</div><div class='add'>+#define GCC_USB30_TERT_SLEEP_CLK				325</div><div class='add'>+#define GCC_USB34_PRIM_PHY_PIPE_CLK_SRC				326</div><div class='add'>+#define GCC_USB34_SEC_PHY_PIPE_CLK_SRC				327</div><div class='add'>+#define GCC_USB34_TERT_PHY_PIPE_CLK_SRC				328</div><div class='add'>+#define GCC_USB3_MP_PHY_AUX_CLK					329</div><div class='add'>+#define GCC_USB3_MP_PHY_AUX_CLK_SRC				330</div><div class='add'>+#define GCC_USB3_MP_PHY_COM_AUX_CLK				331</div><div class='add'>+#define GCC_USB3_MP_PHY_PIPE_0_CLK				332</div><div class='add'>+#define GCC_USB3_MP_PHY_PIPE_0_CLK_SRC				333</div><div class='add'>+#define GCC_USB3_MP_PHY_PIPE_1_CLK				334</div><div class='add'>+#define GCC_USB3_MP_PHY_PIPE_1_CLK_SRC				335</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK				336</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK_SRC				337</div><div class='add'>+#define GCC_USB3_PRIM_PHY_COM_AUX_CLK				338</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK				339</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK_SRC				340</div><div class='add'>+#define GCC_USB3_SEC_PHY_AUX_CLK				341</div><div class='add'>+#define GCC_USB3_SEC_PHY_AUX_CLK_SRC				342</div><div class='add'>+#define GCC_USB3_SEC_PHY_COM_AUX_CLK				343</div><div class='add'>+#define GCC_USB3_SEC_PHY_PIPE_CLK				344</div><div class='add'>+#define GCC_USB3_SEC_PHY_PIPE_CLK_SRC				345</div><div class='add'>+#define GCC_USB3_TERT_PHY_AUX_CLK				346</div><div class='add'>+#define GCC_USB3_TERT_PHY_AUX_CLK_SRC				347</div><div class='add'>+#define GCC_USB3_TERT_PHY_COM_AUX_CLK				348</div><div class='add'>+#define GCC_USB3_TERT_PHY_PIPE_CLK				349</div><div class='add'>+#define GCC_USB3_TERT_PHY_PIPE_CLK_SRC				350</div><div class='add'>+#define GCC_USB4_0_CFG_AHB_CLK					351</div><div class='add'>+#define GCC_USB4_0_DP0_CLK					352</div><div class='add'>+#define GCC_USB4_0_DP1_CLK					353</div><div class='add'>+#define GCC_USB4_0_MASTER_CLK					354</div><div class='add'>+#define GCC_USB4_0_MASTER_CLK_SRC				355</div><div class='add'>+#define GCC_USB4_0_PHY_DP0_CLK_SRC				356</div><div class='add'>+#define GCC_USB4_0_PHY_DP0_GMUX_CLK_SRC				357</div><div class='add'>+#define GCC_USB4_0_PHY_DP1_CLK_SRC				358</div><div class='add'>+#define GCC_USB4_0_PHY_DP1_GMUX_CLK_SRC				359</div><div class='add'>+#define GCC_USB4_0_PHY_P2RR2P_PIPE_CLK				360</div><div class='add'>+#define GCC_USB4_0_PHY_P2RR2P_PIPE_CLK_SRC			361</div><div class='add'>+#define GCC_USB4_0_PHY_PCIE_PIPE_CLK				362</div><div class='add'>+#define GCC_USB4_0_PHY_PCIE_PIPE_CLK_SRC			363</div><div class='add'>+#define GCC_USB4_0_PHY_PCIE_PIPE_MUX_CLK_SRC			364</div><div class='add'>+#define GCC_USB4_0_PHY_PCIE_PIPEGMUX_CLK_SRC			365</div><div class='add'>+#define GCC_USB4_0_PHY_PIPEGMUX_CLK_SRC				366</div><div class='add'>+#define GCC_USB4_0_PHY_RX0_CLK					367</div><div class='add'>+#define GCC_USB4_0_PHY_RX0_CLK_SRC				368</div><div class='add'>+#define GCC_USB4_0_PHY_RX1_CLK					369</div><div class='add'>+#define GCC_USB4_0_PHY_RX1_CLK_SRC				370</div><div class='add'>+#define GCC_USB4_0_PHY_SYS_CLK_SRC				371</div><div class='add'>+#define GCC_USB4_0_PHY_SYS_PIPEGMUX_CLK_SRC			372</div><div class='add'>+#define GCC_USB4_0_PHY_USB_PIPE_CLK				373</div><div class='add'>+#define GCC_USB4_0_SB_IF_CLK					374</div><div class='add'>+#define GCC_USB4_0_SB_IF_CLK_SRC				375</div><div class='add'>+#define GCC_USB4_0_SYS_CLK					376</div><div class='add'>+#define GCC_USB4_0_TMU_CLK					377</div><div class='add'>+#define GCC_USB4_0_TMU_CLK_SRC					378</div><div class='add'>+#define GCC_USB4_0_UC_HRR_CLK					379</div><div class='add'>+#define GCC_USB4_1_CFG_AHB_CLK					380</div><div class='add'>+#define GCC_USB4_1_DP0_CLK					381</div><div class='add'>+#define GCC_USB4_1_DP1_CLK					382</div><div class='add'>+#define GCC_USB4_1_MASTER_CLK					383</div><div class='add'>+#define GCC_USB4_1_MASTER_CLK_SRC				384</div><div class='add'>+#define GCC_USB4_1_PHY_DP0_CLK_SRC				385</div><div class='add'>+#define GCC_USB4_1_PHY_DP0_GMUX_2_CLK_SRC			386</div><div class='add'>+#define GCC_USB4_1_PHY_DP1_CLK_SRC				387</div><div class='add'>+#define GCC_USB4_1_PHY_DP1_GMUX_2_CLK_SRC			388</div><div class='add'>+#define GCC_USB4_1_PHY_P2RR2P_PIPE_CLK				389</div><div class='add'>+#define GCC_USB4_1_PHY_P2RR2P_PIPE_CLK_SRC			390</div><div class='add'>+#define GCC_USB4_1_PHY_PCIE_PIPE_CLK				391</div><div class='add'>+#define GCC_USB4_1_PHY_PCIE_PIPE_CLK_SRC			392</div><div class='add'>+#define GCC_USB4_1_PHY_PCIE_PIPE_MUX_CLK_SRC			393</div><div class='add'>+#define GCC_USB4_1_PHY_PCIE_PIPEGMUX_CLK_SRC			394</div><div class='add'>+#define GCC_USB4_1_PHY_PIPEGMUX_CLK_SRC				395</div><div class='add'>+#define GCC_USB4_1_PHY_PLL_PIPE_CLK_SRC				396</div><div class='add'>+#define GCC_USB4_1_PHY_RX0_CLK					397</div><div class='add'>+#define GCC_USB4_1_PHY_RX0_CLK_SRC				398</div><div class='add'>+#define GCC_USB4_1_PHY_RX1_CLK					399</div><div class='add'>+#define GCC_USB4_1_PHY_RX1_CLK_SRC				400</div><div class='add'>+#define GCC_USB4_1_PHY_SYS_CLK_SRC				401</div><div class='add'>+#define GCC_USB4_1_PHY_SYS_PIPEGMUX_CLK_SRC			402</div><div class='add'>+#define GCC_USB4_1_PHY_USB_PIPE_CLK				403</div><div class='add'>+#define GCC_USB4_1_SB_IF_CLK					404</div><div class='add'>+#define GCC_USB4_1_SB_IF_CLK_SRC				405</div><div class='add'>+#define GCC_USB4_1_SYS_CLK					406</div><div class='add'>+#define GCC_USB4_1_TMU_CLK					407</div><div class='add'>+#define GCC_USB4_1_TMU_CLK_SRC					408</div><div class='add'>+#define GCC_USB4_1_UC_HRR_CLK					409</div><div class='add'>+#define GCC_USB4_2_CFG_AHB_CLK					410</div><div class='add'>+#define GCC_USB4_2_DP0_CLK					411</div><div class='add'>+#define GCC_USB4_2_DP1_CLK					412</div><div class='add'>+#define GCC_USB4_2_MASTER_CLK					413</div><div class='add'>+#define GCC_USB4_2_MASTER_CLK_SRC				414</div><div class='add'>+#define GCC_USB4_2_PHY_DP0_CLK_SRC				415</div><div class='add'>+#define GCC_USB4_2_PHY_DP0_GMUX_CLK_SRC				416</div><div class='add'>+#define GCC_USB4_2_PHY_DP1_CLK_SRC				417</div><div class='add'>+#define GCC_USB4_2_PHY_DP1_GMUX_CLK_SRC				418</div><div class='add'>+#define GCC_USB4_2_PHY_P2RR2P_PIPE_CLK				419</div><div class='add'>+#define GCC_USB4_2_PHY_P2RR2P_PIPE_CLK_SRC			420</div><div class='add'>+#define GCC_USB4_2_PHY_PCIE_PIPE_CLK				421</div><div class='add'>+#define GCC_USB4_2_PHY_PCIE_PIPE_CLK_SRC			422</div><div class='add'>+#define GCC_USB4_2_PHY_PCIE_PIPE_MUX_CLK_SRC			423</div><div class='add'>+#define GCC_USB4_2_PHY_PCIE_PIPEGMUX_CLK_SRC			424</div><div class='add'>+#define GCC_USB4_2_PHY_PIPEGMUX_CLK_SRC				425</div><div class='add'>+#define GCC_USB4_2_PHY_RX0_CLK					426</div><div class='add'>+#define GCC_USB4_2_PHY_RX0_CLK_SRC				427</div><div class='add'>+#define GCC_USB4_2_PHY_RX1_CLK					428</div><div class='add'>+#define GCC_USB4_2_PHY_RX1_CLK_SRC				429</div><div class='add'>+#define GCC_USB4_2_PHY_SYS_CLK_SRC				430</div><div class='add'>+#define GCC_USB4_2_PHY_SYS_PIPEGMUX_CLK_SRC			431</div><div class='add'>+#define GCC_USB4_2_PHY_USB_PIPE_CLK				432</div><div class='add'>+#define GCC_USB4_2_SB_IF_CLK					433</div><div class='add'>+#define GCC_USB4_2_SB_IF_CLK_SRC				434</div><div class='add'>+#define GCC_USB4_2_SYS_CLK					435</div><div class='add'>+#define GCC_USB4_2_TMU_CLK					436</div><div class='add'>+#define GCC_USB4_2_TMU_CLK_SRC					437</div><div class='add'>+#define GCC_USB4_2_UC_HRR_CLK					438</div><div class='add'>+#define GCC_VIDEO_AHB_CLK					439</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK					440</div><div class='add'>+#define GCC_VIDEO_AXI0C_CLK					441</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK					442</div><div class='add'>+#define GCC_VIDEO_XO_CLK					443</div><div class='add'>+</div><div class='add'>+/* GCC power domains */</div><div class='add'>+#define GCC_PCIE_0_TUNNEL_GDSC					0</div><div class='add'>+#define GCC_PCIE_1_TUNNEL_GDSC					1</div><div class='add'>+#define GCC_PCIE_2_TUNNEL_GDSC					2</div><div class='add'>+#define GCC_PCIE_3A_GDSC					3</div><div class='add'>+#define GCC_PCIE_3A_PHY_GDSC					4</div><div class='add'>+#define GCC_PCIE_3B_GDSC					5</div><div class='add'>+#define GCC_PCIE_3B_PHY_GDSC					6</div><div class='add'>+#define GCC_PCIE_4_GDSC						7</div><div class='add'>+#define GCC_PCIE_4_PHY_GDSC					8</div><div class='add'>+#define GCC_PCIE_5_GDSC						9</div><div class='add'>+#define GCC_PCIE_5_PHY_GDSC					10</div><div class='add'>+#define GCC_PCIE_6_GDSC						11</div><div class='add'>+#define GCC_PCIE_6_PHY_GDSC					12</div><div class='add'>+#define GCC_UFS_PHY_GDSC					13</div><div class='add'>+#define GCC_USB20_PRIM_GDSC					14</div><div class='add'>+#define GCC_USB30_MP_GDSC					15</div><div class='add'>+#define GCC_USB30_PRIM_GDSC					16</div><div class='add'>+#define GCC_USB30_SEC_GDSC					17</div><div class='add'>+#define GCC_USB30_TERT_GDSC					18</div><div class='add'>+#define GCC_USB3_MP_SS0_PHY_GDSC				19</div><div class='add'>+#define GCC_USB3_MP_SS1_PHY_GDSC				20</div><div class='add'>+#define GCC_USB4_0_GDSC						21</div><div class='add'>+#define GCC_USB4_1_GDSC						22</div><div class='add'>+#define GCC_USB4_2_GDSC						23</div><div class='add'>+#define GCC_USB_0_PHY_GDSC					24</div><div class='add'>+#define GCC_USB_1_PHY_GDSC					25</div><div class='add'>+#define GCC_USB_2_PHY_GDSC					26</div><div class='add'>+</div><div class='add'>+/* GCC resets */</div><div class='add'>+#define GCC_AV1E_BCR						0</div><div class='add'>+#define GCC_CAMERA_BCR						1</div><div class='add'>+#define GCC_DISPLAY_BCR						2</div><div class='add'>+#define GCC_EVA_BCR						3</div><div class='add'>+#define GCC_GPU_BCR						4</div><div class='add'>+#define GCC_PCIE_0_LINK_DOWN_BCR				5</div><div class='add'>+#define GCC_PCIE_0_NOCSR_COM_PHY_BCR				6</div><div class='add'>+#define GCC_PCIE_0_PHY_BCR					7</div><div class='add'>+#define GCC_PCIE_0_PHY_NOCSR_COM_PHY_BCR			8</div><div class='add'>+#define GCC_PCIE_0_TUNNEL_BCR					9</div><div class='add'>+#define GCC_PCIE_1_LINK_DOWN_BCR				10</div><div class='add'>+#define GCC_PCIE_1_NOCSR_COM_PHY_BCR				11</div><div class='add'>+#define GCC_PCIE_1_PHY_BCR					12</div><div class='add'>+#define GCC_PCIE_1_PHY_NOCSR_COM_PHY_BCR			13</div><div class='add'>+#define GCC_PCIE_1_TUNNEL_BCR					14</div><div class='add'>+#define GCC_PCIE_2_LINK_DOWN_BCR				15</div><div class='add'>+#define GCC_PCIE_2_NOCSR_COM_PHY_BCR				16</div><div class='add'>+#define GCC_PCIE_2_PHY_BCR					17</div><div class='add'>+#define GCC_PCIE_2_PHY_NOCSR_COM_PHY_BCR			18</div><div class='add'>+#define GCC_PCIE_2_TUNNEL_BCR					19</div><div class='add'>+#define GCC_PCIE_3A_BCR						20</div><div class='add'>+#define GCC_PCIE_3A_LINK_DOWN_BCR				21</div><div class='add'>+#define GCC_PCIE_3A_NOCSR_COM_PHY_BCR				22</div><div class='add'>+#define GCC_PCIE_3A_PHY_BCR					23</div><div class='add'>+#define GCC_PCIE_3A_PHY_NOCSR_COM_PHY_BCR			24</div><div class='add'>+#define GCC_PCIE_3B_BCR						25</div><div class='add'>+#define GCC_PCIE_3B_LINK_DOWN_BCR				26</div><div class='add'>+#define GCC_PCIE_3B_NOCSR_COM_PHY_BCR				27</div><div class='add'>+#define GCC_PCIE_3B_PHY_BCR					28</div><div class='add'>+#define GCC_PCIE_3B_PHY_NOCSR_COM_PHY_BCR			29</div><div class='add'>+#define GCC_PCIE_4_BCR						30</div><div class='add'>+#define GCC_PCIE_4_LINK_DOWN_BCR				31</div><div class='add'>+#define GCC_PCIE_4_NOCSR_COM_PHY_BCR				32</div><div class='add'>+#define GCC_PCIE_4_PHY_BCR					33</div><div class='add'>+#define GCC_PCIE_4_PHY_NOCSR_COM_PHY_BCR			34</div><div class='add'>+#define GCC_PCIE_5_BCR						35</div><div class='add'>+#define GCC_PCIE_5_LINK_DOWN_BCR				36</div><div class='add'>+#define GCC_PCIE_5_NOCSR_COM_PHY_BCR				37</div><div class='add'>+#define GCC_PCIE_5_PHY_BCR					38</div><div class='add'>+#define GCC_PCIE_5_PHY_NOCSR_COM_PHY_BCR			39</div><div class='add'>+#define GCC_PCIE_6_BCR						40</div><div class='add'>+#define GCC_PCIE_6_LINK_DOWN_BCR				41</div><div class='add'>+#define GCC_PCIE_6_NOCSR_COM_PHY_BCR				42</div><div class='add'>+#define GCC_PCIE_6_PHY_BCR					43</div><div class='add'>+#define GCC_PCIE_6_PHY_NOCSR_COM_PHY_BCR			44</div><div class='add'>+#define GCC_PCIE_NOC_BCR					45</div><div class='add'>+#define GCC_PCIE_PHY_BCR					46</div><div class='add'>+#define GCC_PCIE_PHY_CFG_AHB_BCR				47</div><div class='add'>+#define GCC_PCIE_PHY_COM_BCR					48</div><div class='add'>+#define GCC_PCIE_RSCC_BCR					49</div><div class='add'>+#define GCC_PDM_BCR						50</div><div class='add'>+#define GCC_QUPV3_WRAPPER_0_BCR					51</div><div class='add'>+#define GCC_QUPV3_WRAPPER_1_BCR					52</div><div class='add'>+#define GCC_QUPV3_WRAPPER_2_BCR					53</div><div class='add'>+#define GCC_QUPV3_WRAPPER_OOB_BCR				54</div><div class='add'>+#define GCC_QUSB2PHY_HS0_MP_BCR					55</div><div class='add'>+#define GCC_QUSB2PHY_HS1_MP_BCR					56</div><div class='add'>+#define GCC_QUSB2PHY_PRIM_BCR					57</div><div class='add'>+#define GCC_QUSB2PHY_SEC_BCR					58</div><div class='add'>+#define GCC_QUSB2PHY_TERT_BCR					59</div><div class='add'>+#define GCC_QUSB2PHY_USB20_HS_BCR				60</div><div class='add'>+#define GCC_SDCC2_BCR						61</div><div class='add'>+#define GCC_SDCC4_BCR						62</div><div class='add'>+#define GCC_TCSR_PCIE_BCR					63</div><div class='add'>+#define GCC_UFS_PHY_BCR						64</div><div class='add'>+#define GCC_USB20_PRIM_BCR					65</div><div class='add'>+#define GCC_USB30_MP_BCR					66</div><div class='add'>+#define GCC_USB30_PRIM_BCR					67</div><div class='add'>+#define GCC_USB30_SEC_BCR					68</div><div class='add'>+#define GCC_USB30_TERT_BCR					69</div><div class='add'>+#define GCC_USB3_MP_SS0_PHY_BCR					70</div><div class='add'>+#define GCC_USB3_MP_SS1_PHY_BCR					71</div><div class='add'>+#define GCC_USB3_PHY_PRIM_BCR					72</div><div class='add'>+#define GCC_USB3_PHY_SEC_BCR					73</div><div class='add'>+#define GCC_USB3_PHY_TERT_BCR					74</div><div class='add'>+#define GCC_USB3_UNIPHY_MP0_BCR					75</div><div class='add'>+#define GCC_USB3_UNIPHY_MP1_BCR					76</div><div class='add'>+#define GCC_USB3PHY_PHY_PRIM_BCR				77</div><div class='add'>+#define GCC_USB3PHY_PHY_SEC_BCR					78</div><div class='add'>+#define GCC_USB3PHY_PHY_TERT_BCR				79</div><div class='add'>+#define GCC_USB3UNIPHY_PHY_MP0_BCR				80</div><div class='add'>+#define GCC_USB3UNIPHY_PHY_MP1_BCR				81</div><div class='add'>+#define GCC_USB4_0_BCR						82</div><div class='add'>+#define GCC_USB4_0_DP0_PHY_PRIM_BCR				83</div><div class='add'>+#define GCC_USB4_1_BCR						84</div><div class='add'>+#define GCC_USB4_2_BCR						85</div><div class='add'>+#define GCC_USB_0_PHY_BCR					86</div><div class='add'>+#define GCC_USB_1_PHY_BCR					87</div><div class='add'>+#define GCC_USB_2_PHY_BCR					88</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK_ARES					89</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK_ARES					90</div><div class='add'>+#define GCC_VIDEO_BCR						91</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,glymur-tcsr.h b/include/dt-bindings/clock/qcom,glymur-tcsr.h<br/>new file mode 100644<br/>index 000000000000..72614226b113<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,glymur-tcsr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,glymur-tcsr.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_TCSR_CC_GLYMUR_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_TCSR_CC_GLYMUR_H</div><div class='add'>+</div><div class='add'>+/* TCSR_CC clocks */</div><div class='add'>+#define TCSR_EDP_CLKREF_EN					0</div><div class='add'>+#define TCSR_PCIE_1_CLKREF_EN					1</div><div class='add'>+#define TCSR_PCIE_2_CLKREF_EN					2</div><div class='add'>+#define TCSR_PCIE_3_CLKREF_EN					3</div><div class='add'>+#define TCSR_PCIE_4_CLKREF_EN					4</div><div class='add'>+#define TCSR_USB2_1_CLKREF_EN					5</div><div class='add'>+#define TCSR_USB2_2_CLKREF_EN					6</div><div class='add'>+#define TCSR_USB2_3_CLKREF_EN					7</div><div class='add'>+#define TCSR_USB2_4_CLKREF_EN					8</div><div class='add'>+#define TCSR_USB3_0_CLKREF_EN					9</div><div class='add'>+#define TCSR_USB3_1_CLKREF_EN					10</div><div class='add'>+#define TCSR_USB4_1_CLKREF_EN					11</div><div class='add'>+#define TCSR_USB4_2_CLKREF_EN					12</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,ipq-cmn-pll.h b/include/dt-bindings/clock/qcom,ipq-cmn-pll.h<br/>new file mode 100644<br/>index 000000000000..936e92b3b62c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq-cmn-pll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,ipq-cmn-pll.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_IPQ_CMN_PLL_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_IPQ_CMN_PLL_H</div><div class='add'>+</div><div class='add'>+/* CMN PLL core clock. */</div><div class='add'>+#define CMN_PLL_CLK			0</div><div class='add'>+</div><div class='add'>+/* The output clocks from CMN PLL of IPQ9574. */</div><div class='add'>+#define XO_24MHZ_CLK			1</div><div class='add'>+#define SLEEP_32KHZ_CLK			2</div><div class='add'>+#define PCS_31P25MHZ_CLK		3</div><div class='add'>+#define NSS_1200MHZ_CLK			4</div><div class='add'>+#define PPE_353MHZ_CLK			5</div><div class='add'>+#define ETH0_50MHZ_CLK			6</div><div class='add'>+#define ETH1_50MHZ_CLK			7</div><div class='add'>+#define ETH2_50MHZ_CLK			8</div><div class='add'>+#define ETH_25MHZ_CLK			9</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h b/include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h<br/>new file mode 100644<br/>index 000000000000..586d1c9b33b3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_IPQ5018_CMN_PLL_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_IPQ5018_CMN_PLL_H</div><div class='add'>+</div><div class='add'>+/* CMN PLL core clock. */</div><div class='add'>+#define IPQ5018_CMN_PLL_CLK			0</div><div class='add'>+</div><div class='add'>+/* The output clocks from CMN PLL of IPQ5018. */</div><div class='add'>+#define IPQ5018_XO_24MHZ_CLK			1</div><div class='add'>+#define IPQ5018_SLEEP_32KHZ_CLK			2</div><div class='add'>+#define IPQ5018_ETH_50MHZ_CLK			3</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,ipq5332-gcc.h b/include/dt-bindings/clock/qcom,ipq5332-gcc.h<br/>index 8a405a0a96d0..da9b507c30bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq5332-gcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq5332-gcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq5332-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,ipq5332-gcc.h</a></div><div class='hunk'>@@ -96,15 +96,7 @@</div><div class='ctx'> #define GCC_PCNOC_BFDCD_CLK_SRC				87</div><div class='ctx'> #define GCC_PCNOC_LPASS_CLK				88</div><div class='ctx'> #define GCC_PRNG_AHB_CLK				89</div><div class='del'>-#define GCC_Q6_AHB_CLK					90</div><div class='del'>-#define GCC_Q6_AHB_S_CLK				91</div><div class='del'>-#define GCC_Q6_AXIM_CLK					92</div><div class='ctx'> #define GCC_Q6_AXIM_CLK_SRC				93</div><div class='del'>-#define GCC_Q6_AXIS_CLK					94</div><div class='del'>-#define GCC_Q6_TSCTR_1TO2_CLK				95</div><div class='del'>-#define GCC_Q6SS_ATBM_CLK				96</div><div class='del'>-#define GCC_Q6SS_PCLKDBG_CLK				97</div><div class='del'>-#define GCC_Q6SS_TRIG_CLK				98</div><div class='ctx'> #define GCC_QDSS_AT_CLK					99</div><div class='ctx'> #define GCC_QDSS_AT_CLK_SRC				100</div><div class='ctx'> #define GCC_QDSS_CFG_AHB_CLK				101</div><div class='hunk'>@@ -134,7 +126,6 @@</div><div class='ctx'> #define GCC_SNOC_PCIE3_2LANE_S_CLK			125</div><div class='ctx'> #define GCC_SNOC_USB_CLK				126</div><div class='ctx'> #define GCC_SYS_NOC_AT_CLK				127</div><div class='del'>-#define GCC_SYS_NOC_WCSS_AHB_CLK			128</div><div class='ctx'> #define GCC_SYSTEM_NOC_BFDCD_CLK_SRC			129</div><div class='ctx'> #define GCC_UNIPHY0_AHB_CLK				130</div><div class='ctx'> #define GCC_UNIPHY0_SYS_CLK				131</div><div class='hunk'>@@ -155,17 +146,6 @@</div><div class='ctx'> #define GCC_USB0_PIPE_CLK				146</div><div class='ctx'> #define GCC_USB0_SLEEP_CLK				147</div><div class='ctx'> #define GCC_WCSS_AHB_CLK_SRC				148</div><div class='del'>-#define GCC_WCSS_AXIM_CLK				149</div><div class='del'>-#define GCC_WCSS_AXIS_CLK				150</div><div class='del'>-#define GCC_WCSS_DBG_IFC_APB_BDG_CLK			151</div><div class='del'>-#define GCC_WCSS_DBG_IFC_APB_CLK			152</div><div class='del'>-#define GCC_WCSS_DBG_IFC_ATB_BDG_CLK			153</div><div class='del'>-#define GCC_WCSS_DBG_IFC_ATB_CLK			154</div><div class='del'>-#define GCC_WCSS_DBG_IFC_NTS_BDG_CLK			155</div><div class='del'>-#define GCC_WCSS_DBG_IFC_NTS_CLK			156</div><div class='del'>-#define GCC_WCSS_ECAHB_CLK				157</div><div class='del'>-#define GCC_WCSS_MST_ASYNC_BDG_CLK			158</div><div class='del'>-#define GCC_WCSS_SLV_ASYNC_BDG_CLK			159</div><div class='ctx'> #define GCC_XO_CLK					160</div><div class='ctx'> #define GCC_XO_CLK_SRC					161</div><div class='ctx'> #define GCC_XO_DIV4_CLK					162</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h b/include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h<br/>new file mode 100644<br/>index 000000000000..f643c2668c04<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_IPQ5424_CMN_PLL_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_IPQ5424_CMN_PLL_H</div><div class='add'>+</div><div class='add'>+/* CMN PLL core clock. */</div><div class='add'>+#define IPQ5424_CMN_PLL_CLK			0</div><div class='add'>+</div><div class='add'>+/* The output clocks from CMN PLL of IPQ5424. */</div><div class='add'>+#define IPQ5424_XO_24MHZ_CLK			1</div><div class='add'>+#define IPQ5424_SLEEP_32KHZ_CLK			2</div><div class='add'>+#define IPQ5424_PCS_31P25MHZ_CLK		3</div><div class='add'>+#define IPQ5424_NSS_300MHZ_CLK			4</div><div class='add'>+#define IPQ5424_PPE_375MHZ_CLK			5</div><div class='add'>+#define IPQ5424_ETH0_50MHZ_CLK			6</div><div class='add'>+#define IPQ5424_ETH1_50MHZ_CLK			7</div><div class='add'>+#define IPQ5424_ETH2_50MHZ_CLK			8</div><div class='add'>+#define IPQ5424_ETH_25MHZ_CLK			9</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,ipq5424-gcc.h b/include/dt-bindings/clock/qcom,ipq5424-gcc.h<br/>new file mode 100644<br/>index 000000000000..3ae33a0fa002<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq5424-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,ipq5424-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,157 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018,2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_IPQ_GCC_IPQ5424_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_IPQ_GCC_IPQ5424_H</div><div class='add'>+</div><div class='add'>+#define GPLL0					0</div><div class='add'>+#define GPLL4					1</div><div class='add'>+#define GPLL2					2</div><div class='add'>+#define GPLL2_OUT_MAIN                          3</div><div class='add'>+#define GCC_SLEEP_CLK_SRC			4</div><div class='add'>+#define GCC_USB0_EUD_AT_CLK			6</div><div class='add'>+#define GCC_PCIE0_AXI_M_CLK_SRC			7</div><div class='add'>+#define GCC_PCIE0_AXI_M_CLK			8</div><div class='add'>+#define GCC_PCIE1_AXI_M_CLK_SRC			9</div><div class='add'>+#define GCC_PCIE1_AXI_M_CLK			10</div><div class='add'>+#define GCC_PCIE2_AXI_M_CLK_SRC			11</div><div class='add'>+#define GCC_PCIE2_AXI_M_CLK			12</div><div class='add'>+#define GCC_PCIE3_AXI_M_CLK_SRC			13</div><div class='add'>+#define GCC_PCIE3_AXI_M_CLK			14</div><div class='add'>+#define GCC_PCIE0_AXI_S_CLK_SRC			15</div><div class='add'>+#define GCC_PCIE0_AXI_S_BRIDGE_CLK		16</div><div class='add'>+#define GCC_PCIE0_AXI_S_CLK			17</div><div class='add'>+#define GCC_PCIE1_AXI_S_CLK_SRC			18</div><div class='add'>+#define GCC_PCIE1_AXI_S_BRIDGE_CLK		19</div><div class='add'>+#define GCC_PCIE1_AXI_S_CLK			20</div><div class='add'>+#define GCC_PCIE2_AXI_S_CLK_SRC			21</div><div class='add'>+#define GCC_PCIE2_AXI_S_BRIDGE_CLK		22</div><div class='add'>+#define GCC_PCIE2_AXI_S_CLK			23</div><div class='add'>+#define GCC_PCIE3_AXI_S_CLK_SRC			24</div><div class='add'>+#define GCC_PCIE3_AXI_S_BRIDGE_CLK		25</div><div class='add'>+#define GCC_PCIE3_AXI_S_CLK			26</div><div class='add'>+#define GCC_PCIE0_PIPE_CLK_SRC			27</div><div class='add'>+#define GCC_PCIE0_PIPE_CLK			28</div><div class='add'>+#define GCC_PCIE1_PIPE_CLK_SRC			29</div><div class='add'>+#define GCC_PCIE1_PIPE_CLK			30</div><div class='add'>+#define GCC_PCIE2_PIPE_CLK_SRC			31</div><div class='add'>+#define GCC_PCIE2_PIPE_CLK			32</div><div class='add'>+#define GCC_PCIE3_PIPE_CLK_SRC			33</div><div class='add'>+#define GCC_PCIE3_PIPE_CLK			34</div><div class='add'>+#define GCC_PCIE_AUX_CLK_SRC			35</div><div class='add'>+#define GCC_PCIE0_AUX_CLK			36</div><div class='add'>+#define GCC_PCIE1_AUX_CLK			37</div><div class='add'>+#define GCC_PCIE2_AUX_CLK			38</div><div class='add'>+#define GCC_PCIE3_AUX_CLK			39</div><div class='add'>+#define GCC_PCIE0_AHB_CLK			40</div><div class='add'>+#define GCC_PCIE1_AHB_CLK			41</div><div class='add'>+#define GCC_PCIE2_AHB_CLK			42</div><div class='add'>+#define GCC_PCIE3_AHB_CLK			43</div><div class='add'>+#define GCC_USB0_AUX_CLK_SRC			44</div><div class='add'>+#define GCC_USB0_AUX_CLK			45</div><div class='add'>+#define GCC_USB0_MASTER_CLK			46</div><div class='add'>+#define GCC_USB0_MOCK_UTMI_CLK_SRC		47</div><div class='add'>+#define GCC_USB0_MOCK_UTMI_DIV_CLK_SRC		48</div><div class='add'>+#define GCC_USB0_MOCK_UTMI_CLK			49</div><div class='add'>+#define GCC_USB0_PIPE_CLK_SRC			50</div><div class='add'>+#define GCC_USB0_PIPE_CLK			51</div><div class='add'>+#define GCC_USB0_PHY_CFG_AHB_CLK		52</div><div class='add'>+#define GCC_USB0_SLEEP_CLK			53</div><div class='add'>+#define GCC_SDCC1_APPS_CLK_SRC			54</div><div class='add'>+#define GCC_SDCC1_APPS_CLK			55</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK_SRC		56</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK			57</div><div class='add'>+#define GCC_SDCC1_AHB_CLK			58</div><div class='add'>+#define GCC_PCNOC_BFDCD_CLK_SRC			59</div><div class='add'>+#define GCC_NSSCFG_CLK				60</div><div class='add'>+#define GCC_NSSNOC_NSSCC_CLK			61</div><div class='add'>+#define GCC_NSSCC_CLK				62</div><div class='add'>+#define GCC_NSSNOC_PCNOC_1_CLK			63</div><div class='add'>+#define GCC_QPIC_AHB_CLK			64</div><div class='add'>+#define GCC_QPIC_CLK				65</div><div class='add'>+#define GCC_MDIO_AHB_CLK			66</div><div class='add'>+#define GCC_PRNG_AHB_CLK			67</div><div class='add'>+#define GCC_UNIPHY0_AHB_CLK			68</div><div class='add'>+#define GCC_UNIPHY1_AHB_CLK			69</div><div class='add'>+#define GCC_UNIPHY2_AHB_CLK			70</div><div class='add'>+#define GCC_CMN_12GPLL_AHB_CLK			71</div><div class='add'>+#define GCC_SYSTEM_NOC_BFDCD_CLK_SRC		72</div><div class='add'>+#define GCC_NSSNOC_SNOC_CLK			73</div><div class='add'>+#define GCC_NSSNOC_SNOC_1_CLK			74</div><div class='add'>+#define GCC_WCSS_AHB_CLK_SRC			75</div><div class='add'>+#define GCC_QDSS_AT_CLK_SRC			76</div><div class='add'>+#define GCC_NSSNOC_ATB_CLK			77</div><div class='add'>+#define GCC_QDSS_AT_CLK				78</div><div class='add'>+#define GCC_QDSS_TSCTR_CLK_SRC			79</div><div class='add'>+#define GCC_NSS_TS_CLK				80</div><div class='add'>+#define GCC_QPIC_IO_MACRO_CLK_SRC		81</div><div class='add'>+#define GCC_QPIC_IO_MACRO_CLK			82</div><div class='add'>+#define GCC_LPASS_AXIM_CLK_SRC			83</div><div class='add'>+#define GCC_LPASS_CORE_AXIM_CLK			84</div><div class='add'>+#define GCC_LPASS_SWAY_CLK_SRC			85</div><div class='add'>+#define GCC_LPASS_SWAY_CLK			86</div><div class='add'>+#define GCC_CNOC_LPASS_CFG_CLK                  87</div><div class='add'>+#define GCC_SNOC_LPASS_CLK                      88</div><div class='add'>+#define GCC_ADSS_PWM_CLK_SRC			89</div><div class='add'>+#define GCC_ADSS_PWM_CLK			90</div><div class='add'>+#define GCC_XO_CLK_SRC				91</div><div class='add'>+#define GCC_NSSNOC_XO_DCD_CLK			92</div><div class='add'>+#define GCC_NSSNOC_QOSGEN_REF_CLK		93</div><div class='add'>+#define GCC_NSSNOC_TIMEOUT_REF_CLK		94</div><div class='add'>+#define GCC_UNIPHY0_SYS_CLK			95</div><div class='add'>+#define GCC_UNIPHY1_SYS_CLK			96</div><div class='add'>+#define GCC_UNIPHY2_SYS_CLK			97</div><div class='add'>+#define GCC_CMN_12GPLL_SYS_CLK			98</div><div class='add'>+#define GCC_UNIPHY_SYS_CLK_SRC			99</div><div class='add'>+#define GCC_NSS_TS_CLK_SRC			100</div><div class='add'>+#define GCC_ANOC_PCIE0_1LANE_M_CLK		101</div><div class='add'>+#define GCC_ANOC_PCIE1_1LANE_M_CLK		102</div><div class='add'>+#define GCC_ANOC_PCIE2_2LANE_M_CLK		103</div><div class='add'>+#define GCC_ANOC_PCIE3_2LANE_M_CLK		104</div><div class='add'>+#define GCC_CNOC_PCIE0_1LANE_S_CLK		105</div><div class='add'>+#define GCC_CNOC_PCIE1_1LANE_S_CLK		106</div><div class='add'>+#define GCC_CNOC_PCIE2_2LANE_S_CLK		107</div><div class='add'>+#define GCC_CNOC_PCIE3_2LANE_S_CLK		108</div><div class='add'>+#define GCC_CNOC_USB_CLK			109</div><div class='add'>+#define GCC_CNOC_WCSS_AHB_CLK			110</div><div class='add'>+#define GCC_QUPV3_AHB_MST_CLK			111</div><div class='add'>+#define GCC_QUPV3_AHB_SLV_CLK			112</div><div class='add'>+#define GCC_QUPV3_I2C0_CLK			113</div><div class='add'>+#define GCC_QUPV3_I2C1_CLK			114</div><div class='add'>+#define GCC_QUPV3_SPI0_CLK			115</div><div class='add'>+#define GCC_QUPV3_SPI1_CLK			116</div><div class='add'>+#define GCC_QUPV3_UART0_CLK			117</div><div class='add'>+#define GCC_QUPV3_UART1_CLK			118</div><div class='add'>+#define GCC_QPIC_CLK_SRC			119</div><div class='add'>+#define GCC_QUPV3_I2C0_CLK_SRC			120</div><div class='add'>+#define GCC_QUPV3_I2C1_CLK_SRC			121</div><div class='add'>+#define GCC_QUPV3_I2C0_DIV_CLK_SRC              122</div><div class='add'>+#define GCC_QUPV3_I2C1_DIV_CLK_SRC              123</div><div class='add'>+#define GCC_QUPV3_SPI0_CLK_SRC			124</div><div class='add'>+#define GCC_QUPV3_SPI1_CLK_SRC			125</div><div class='add'>+#define GCC_QUPV3_UART0_CLK_SRC			126</div><div class='add'>+#define GCC_QUPV3_UART1_CLK_SRC			127</div><div class='add'>+#define GCC_USB1_MASTER_CLK			128</div><div class='add'>+#define GCC_USB1_MOCK_UTMI_CLK_SRC		129</div><div class='add'>+#define GCC_USB1_MOCK_UTMI_DIV_CLK_SRC		130</div><div class='add'>+#define GCC_USB1_MOCK_UTMI_CLK			131</div><div class='add'>+#define GCC_USB1_SLEEP_CLK			132</div><div class='add'>+#define GCC_USB1_PHY_CFG_AHB_CLK		133</div><div class='add'>+#define GCC_USB0_MASTER_CLK_SRC			134</div><div class='add'>+#define GCC_QDSS_DAP_CLK			135</div><div class='add'>+#define GCC_PCIE0_RCHNG_CLK_SRC			136</div><div class='add'>+#define GCC_PCIE0_RCHNG_CLK			137</div><div class='add'>+#define GCC_PCIE1_RCHNG_CLK_SRC			138</div><div class='add'>+#define GCC_PCIE1_RCHNG_CLK			139</div><div class='add'>+#define GCC_PCIE2_RCHNG_CLK_SRC			140</div><div class='add'>+#define GCC_PCIE2_RCHNG_CLK			141</div><div class='add'>+#define GCC_PCIE3_RCHNG_CLK_SRC			142</div><div class='add'>+#define GCC_PCIE3_RCHNG_CLK			143</div><div class='add'>+#define GCC_IM_SLEEP_CLK			144</div><div class='add'>+#define GCC_XO_CLK				145</div><div class='add'>+#define GPLL0_OUT_AUX				146</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,ipq5424-nsscc.h b/include/dt-bindings/clock/qcom,ipq5424-nsscc.h<br/>new file mode 100644<br/>index 000000000000..eeae0dc38042<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq5424-nsscc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,ipq5424-nsscc.h</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_QCOM_IPQ5424_NSSCC_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_QCOM_IPQ5424_NSSCC_H</div><div class='add'>+</div><div class='add'>+/* NSS_CC clocks */</div><div class='add'>+#define NSS_CC_CE_APB_CLK					0</div><div class='add'>+#define NSS_CC_CE_AXI_CLK					1</div><div class='add'>+#define NSS_CC_CE_CLK_SRC					2</div><div class='add'>+#define NSS_CC_CFG_CLK_SRC					3</div><div class='add'>+#define NSS_CC_DEBUG_CLK					4</div><div class='add'>+#define NSS_CC_EIP_BFDCD_CLK_SRC				5</div><div class='add'>+#define NSS_CC_EIP_CLK						6</div><div class='add'>+#define NSS_CC_NSS_CSR_CLK					7</div><div class='add'>+#define NSS_CC_NSSNOC_CE_APB_CLK				8</div><div class='add'>+#define NSS_CC_NSSNOC_CE_AXI_CLK				9</div><div class='add'>+#define NSS_CC_NSSNOC_EIP_CLK					10</div><div class='add'>+#define NSS_CC_NSSNOC_NSS_CSR_CLK				11</div><div class='add'>+#define NSS_CC_NSSNOC_PPE_CFG_CLK				12</div><div class='add'>+#define NSS_CC_NSSNOC_PPE_CLK					13</div><div class='add'>+#define NSS_CC_PORT1_MAC_CLK					14</div><div class='add'>+#define NSS_CC_PORT1_RX_CLK					15</div><div class='add'>+#define NSS_CC_PORT1_RX_CLK_SRC					16</div><div class='add'>+#define NSS_CC_PORT1_RX_DIV_CLK_SRC				17</div><div class='add'>+#define NSS_CC_PORT1_TX_CLK					18</div><div class='add'>+#define NSS_CC_PORT1_TX_CLK_SRC					19</div><div class='add'>+#define NSS_CC_PORT1_TX_DIV_CLK_SRC				20</div><div class='add'>+#define NSS_CC_PORT2_MAC_CLK					21</div><div class='add'>+#define NSS_CC_PORT2_RX_CLK					22</div><div class='add'>+#define NSS_CC_PORT2_RX_CLK_SRC					23</div><div class='add'>+#define NSS_CC_PORT2_RX_DIV_CLK_SRC				24</div><div class='add'>+#define NSS_CC_PORT2_TX_CLK					25</div><div class='add'>+#define NSS_CC_PORT2_TX_CLK_SRC					26</div><div class='add'>+#define NSS_CC_PORT2_TX_DIV_CLK_SRC				27</div><div class='add'>+#define NSS_CC_PORT3_MAC_CLK					28</div><div class='add'>+#define NSS_CC_PORT3_RX_CLK					29</div><div class='add'>+#define NSS_CC_PORT3_RX_CLK_SRC					30</div><div class='add'>+#define NSS_CC_PORT3_RX_DIV_CLK_SRC				31</div><div class='add'>+#define NSS_CC_PORT3_TX_CLK					32</div><div class='add'>+#define NSS_CC_PORT3_TX_CLK_SRC					33</div><div class='add'>+#define NSS_CC_PORT3_TX_DIV_CLK_SRC				34</div><div class='add'>+#define NSS_CC_PPE_CLK_SRC					35</div><div class='add'>+#define NSS_CC_PPE_EDMA_CFG_CLK					36</div><div class='add'>+#define NSS_CC_PPE_EDMA_CLK					37</div><div class='add'>+#define NSS_CC_PPE_SWITCH_BTQ_CLK				38</div><div class='add'>+#define NSS_CC_PPE_SWITCH_CFG_CLK				39</div><div class='add'>+#define NSS_CC_PPE_SWITCH_CLK					40</div><div class='add'>+#define NSS_CC_PPE_SWITCH_IPE_CLK				41</div><div class='add'>+#define NSS_CC_UNIPHY_PORT1_RX_CLK				42</div><div class='add'>+#define NSS_CC_UNIPHY_PORT1_TX_CLK				43</div><div class='add'>+#define NSS_CC_UNIPHY_PORT2_RX_CLK				44</div><div class='add'>+#define NSS_CC_UNIPHY_PORT2_TX_CLK				45</div><div class='add'>+#define NSS_CC_UNIPHY_PORT3_RX_CLK				46</div><div class='add'>+#define NSS_CC_UNIPHY_PORT3_TX_CLK				47</div><div class='add'>+#define NSS_CC_XGMAC0_PTP_REF_CLK				48</div><div class='add'>+#define NSS_CC_XGMAC0_PTP_REF_DIV_CLK_SRC			49</div><div class='add'>+#define NSS_CC_XGMAC1_PTP_REF_CLK				50</div><div class='add'>+#define NSS_CC_XGMAC1_PTP_REF_DIV_CLK_SRC			51</div><div class='add'>+#define NSS_CC_XGMAC2_PTP_REF_CLK				52</div><div class='add'>+#define NSS_CC_XGMAC2_PTP_REF_DIV_CLK_SRC			53</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,ipq9574-gcc.h b/include/dt-bindings/clock/qcom,ipq9574-gcc.h<br/>index 08fd3a37acaa..0e7c319897f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq9574-gcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,ipq9574-gcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq9574-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,ipq9574-gcc.h</a></div><div class='hunk'>@@ -132,16 +132,8 @@</div><div class='ctx'> #define GCC_NSSNOC_SNOC_1_CLK				123</div><div class='ctx'> #define GCC_QDSS_ETR_USB_CLK				124</div><div class='ctx'> #define WCSS_AHB_CLK_SRC				125</div><div class='del'>-#define GCC_Q6_AHB_CLK					126</div><div class='del'>-#define GCC_Q6_AHB_S_CLK				127</div><div class='del'>-#define GCC_WCSS_ECAHB_CLK				128</div><div class='del'>-#define GCC_WCSS_ACMT_CLK				129</div><div class='del'>-#define GCC_SYS_NOC_WCSS_AHB_CLK			130</div><div class='ctx'> #define WCSS_AXI_M_CLK_SRC				131</div><div class='del'>-#define GCC_ANOC_WCSS_AXI_M_CLK				132</div><div class='ctx'> #define QDSS_AT_CLK_SRC					133</div><div class='del'>-#define GCC_Q6SS_ATBM_CLK				134</div><div class='del'>-#define GCC_WCSS_DBG_IFC_ATB_CLK			135</div><div class='ctx'> #define GCC_NSSNOC_ATB_CLK				136</div><div class='ctx'> #define GCC_QDSS_AT_CLK					137</div><div class='ctx'> #define GCC_SYS_NOC_AT_CLK				138</div><div class='hunk'>@@ -154,27 +146,18 @@</div><div class='ctx'> #define QDSS_TRACECLKIN_CLK_SRC				145</div><div class='ctx'> #define GCC_QDSS_TRACECLKIN_CLK				146</div><div class='ctx'> #define QDSS_TSCTR_CLK_SRC				147</div><div class='del'>-#define GCC_Q6_TSCTR_1TO2_CLK				148</div><div class='del'>-#define GCC_WCSS_DBG_IFC_NTS_CLK			149</div><div class='ctx'> #define GCC_QDSS_TSCTR_DIV2_CLK				150</div><div class='ctx'> #define GCC_QDSS_TS_CLK					151</div><div class='ctx'> #define GCC_QDSS_TSCTR_DIV4_CLK				152</div><div class='ctx'> #define GCC_NSS_TS_CLK					153</div><div class='ctx'> #define GCC_QDSS_TSCTR_DIV8_CLK				154</div><div class='ctx'> #define GCC_QDSS_TSCTR_DIV16_CLK			155</div><div class='del'>-#define GCC_Q6SS_PCLKDBG_CLK				156</div><div class='del'>-#define GCC_Q6SS_TRIG_CLK				157</div><div class='del'>-#define GCC_WCSS_DBG_IFC_APB_CLK			158</div><div class='del'>-#define GCC_WCSS_DBG_IFC_DAPBUS_CLK			159</div><div class='ctx'> #define GCC_QDSS_DAP_CLK				160</div><div class='ctx'> #define GCC_QDSS_APB2JTAG_CLK				161</div><div class='ctx'> #define GCC_QDSS_TSCTR_DIV3_CLK				162</div><div class='ctx'> #define QPIC_IO_MACRO_CLK_SRC				163</div><div class='ctx'> #define GCC_QPIC_IO_MACRO_CLK                           164</div><div class='ctx'> #define Q6_AXI_CLK_SRC					165</div><div class='del'>-#define GCC_Q6_AXIM_CLK					166</div><div class='del'>-#define GCC_WCSS_Q6_TBU_CLK				167</div><div class='del'>-#define GCC_MEM_NOC_Q6_AXI_CLK				168</div><div class='ctx'> #define Q6_AXIM2_CLK_SRC				169</div><div class='ctx'> #define NSSNOC_MEMNOC_BFDCD_CLK_SRC			170</div><div class='ctx'> #define GCC_NSSNOC_MEMNOC_CLK				171</div><div class='hunk'>@@ -199,7 +182,6 @@</div><div class='ctx'> #define GCC_UNIPHY2_SYS_CLK				190</div><div class='ctx'> #define GCC_CMN_12GPLL_SYS_CLK				191</div><div class='ctx'> #define GCC_NSSNOC_XO_DCD_CLK				192</div><div class='del'>-#define GCC_Q6SS_BOOT_CLK				193</div><div class='ctx'> #define UNIPHY_SYS_CLK_SRC				194</div><div class='ctx'> #define NSS_TS_CLK_SRC					195</div><div class='ctx'> #define GCC_ANOC_PCIE0_1LANE_M_CLK			196</div><div class='hunk'>@@ -216,4 +198,9 @@</div><div class='ctx'> #define GCC_CRYPTO_AHB_CLK				207</div><div class='ctx'> #define GCC_USB0_PIPE_CLK				208</div><div class='ctx'> #define GCC_USB0_SLEEP_CLK				209</div><div class='add'>+#define GCC_PCIE0_PIPE_CLK				210</div><div class='add'>+#define GCC_PCIE1_PIPE_CLK				211</div><div class='add'>+#define GCC_PCIE2_PIPE_CLK				212</div><div class='add'>+#define GCC_PCIE3_PIPE_CLK				213</div><div class='add'>+#define GPLL0_OUT_AUX					214</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,ipq9574-nsscc.h b/include/dt-bindings/clock/qcom,ipq9574-nsscc.h<br/>new file mode 100644<br/>index 000000000000..21a16dc0e64c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,ipq9574-nsscc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,ipq9574-nsscc.h</a></div><div class='hunk'>@@ -0,0 +1,152 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023, 2025 The Linux Foundation. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_IPQ_NSSCC_9574_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_IPQ_NSSCC_9574_H</div><div class='add'>+</div><div class='add'>+#define NSS_CC_CE_APB_CLK					0</div><div class='add'>+#define NSS_CC_CE_AXI_CLK					1</div><div class='add'>+#define NSS_CC_CE_CLK_SRC					2</div><div class='add'>+#define NSS_CC_CFG_CLK_SRC					3</div><div class='add'>+#define NSS_CC_CLC_AXI_CLK					4</div><div class='add'>+#define NSS_CC_CLC_CLK_SRC					5</div><div class='add'>+#define NSS_CC_CRYPTO_CLK					6</div><div class='add'>+#define NSS_CC_CRYPTO_CLK_SRC					7</div><div class='add'>+#define NSS_CC_CRYPTO_PPE_CLK					8</div><div class='add'>+#define NSS_CC_HAQ_AHB_CLK					9</div><div class='add'>+#define NSS_CC_HAQ_AXI_CLK					10</div><div class='add'>+#define NSS_CC_HAQ_CLK_SRC					11</div><div class='add'>+#define NSS_CC_IMEM_AHB_CLK					12</div><div class='add'>+#define NSS_CC_IMEM_CLK_SRC					13</div><div class='add'>+#define NSS_CC_IMEM_QSB_CLK					14</div><div class='add'>+#define NSS_CC_INT_CFG_CLK_SRC					15</div><div class='add'>+#define NSS_CC_NSS_CSR_CLK					16</div><div class='add'>+#define NSS_CC_NSSNOC_CE_APB_CLK				17</div><div class='add'>+#define NSS_CC_NSSNOC_CE_AXI_CLK				18</div><div class='add'>+#define NSS_CC_NSSNOC_CLC_AXI_CLK				19</div><div class='add'>+#define NSS_CC_NSSNOC_CRYPTO_CLK				20</div><div class='add'>+#define NSS_CC_NSSNOC_HAQ_AHB_CLK				21</div><div class='add'>+#define NSS_CC_NSSNOC_HAQ_AXI_CLK				22</div><div class='add'>+#define NSS_CC_NSSNOC_IMEM_AHB_CLK				23</div><div class='add'>+#define NSS_CC_NSSNOC_IMEM_QSB_CLK				24</div><div class='add'>+#define NSS_CC_NSSNOC_NSS_CSR_CLK				25</div><div class='add'>+#define NSS_CC_NSSNOC_PPE_CFG_CLK				26</div><div class='add'>+#define NSS_CC_NSSNOC_PPE_CLK					27</div><div class='add'>+#define NSS_CC_NSSNOC_UBI32_AHB0_CLK				28</div><div class='add'>+#define NSS_CC_NSSNOC_UBI32_AXI0_CLK				29</div><div class='add'>+#define NSS_CC_NSSNOC_UBI32_INT0_AHB_CLK			30</div><div class='add'>+#define NSS_CC_NSSNOC_UBI32_NC_AXI0_1_CLK			31</div><div class='add'>+#define NSS_CC_NSSNOC_UBI32_NC_AXI0_CLK				32</div><div class='add'>+#define NSS_CC_PORT1_MAC_CLK					33</div><div class='add'>+#define NSS_CC_PORT1_RX_CLK					34</div><div class='add'>+#define NSS_CC_PORT1_RX_CLK_SRC					35</div><div class='add'>+#define NSS_CC_PORT1_RX_DIV_CLK_SRC				36</div><div class='add'>+#define NSS_CC_PORT1_TX_CLK					37</div><div class='add'>+#define NSS_CC_PORT1_TX_CLK_SRC					38</div><div class='add'>+#define NSS_CC_PORT1_TX_DIV_CLK_SRC				39</div><div class='add'>+#define NSS_CC_PORT2_MAC_CLK					40</div><div class='add'>+#define NSS_CC_PORT2_RX_CLK					41</div><div class='add'>+#define NSS_CC_PORT2_RX_CLK_SRC					42</div><div class='add'>+#define NSS_CC_PORT2_RX_DIV_CLK_SRC				43</div><div class='add'>+#define NSS_CC_PORT2_TX_CLK					44</div><div class='add'>+#define NSS_CC_PORT2_TX_CLK_SRC					45</div><div class='add'>+#define NSS_CC_PORT2_TX_DIV_CLK_SRC				46</div><div class='add'>+#define NSS_CC_PORT3_MAC_CLK					47</div><div class='add'>+#define NSS_CC_PORT3_RX_CLK					48</div><div class='add'>+#define NSS_CC_PORT3_RX_CLK_SRC					49</div><div class='add'>+#define NSS_CC_PORT3_RX_DIV_CLK_SRC				50</div><div class='add'>+#define NSS_CC_PORT3_TX_CLK					51</div><div class='add'>+#define NSS_CC_PORT3_TX_CLK_SRC					52</div><div class='add'>+#define NSS_CC_PORT3_TX_DIV_CLK_SRC				53</div><div class='add'>+#define NSS_CC_PORT4_MAC_CLK					54</div><div class='add'>+#define NSS_CC_PORT4_RX_CLK					55</div><div class='add'>+#define NSS_CC_PORT4_RX_CLK_SRC					56</div><div class='add'>+#define NSS_CC_PORT4_RX_DIV_CLK_SRC				57</div><div class='add'>+#define NSS_CC_PORT4_TX_CLK					58</div><div class='add'>+#define NSS_CC_PORT4_TX_CLK_SRC					59</div><div class='add'>+#define NSS_CC_PORT4_TX_DIV_CLK_SRC				60</div><div class='add'>+#define NSS_CC_PORT5_MAC_CLK					61</div><div class='add'>+#define NSS_CC_PORT5_RX_CLK					62</div><div class='add'>+#define NSS_CC_PORT5_RX_CLK_SRC					63</div><div class='add'>+#define NSS_CC_PORT5_RX_DIV_CLK_SRC				64</div><div class='add'>+#define NSS_CC_PORT5_TX_CLK					65</div><div class='add'>+#define NSS_CC_PORT5_TX_CLK_SRC					66</div><div class='add'>+#define NSS_CC_PORT5_TX_DIV_CLK_SRC				67</div><div class='add'>+#define NSS_CC_PORT6_MAC_CLK					68</div><div class='add'>+#define NSS_CC_PORT6_RX_CLK					69</div><div class='add'>+#define NSS_CC_PORT6_RX_CLK_SRC					70</div><div class='add'>+#define NSS_CC_PORT6_RX_DIV_CLK_SRC				71</div><div class='add'>+#define NSS_CC_PORT6_TX_CLK					72</div><div class='add'>+#define NSS_CC_PORT6_TX_CLK_SRC					73</div><div class='add'>+#define NSS_CC_PORT6_TX_DIV_CLK_SRC				74</div><div class='add'>+#define NSS_CC_PPE_CLK_SRC					75</div><div class='add'>+#define NSS_CC_PPE_EDMA_CFG_CLK					76</div><div class='add'>+#define NSS_CC_PPE_EDMA_CLK					77</div><div class='add'>+#define NSS_CC_PPE_SWITCH_BTQ_CLK				78</div><div class='add'>+#define NSS_CC_PPE_SWITCH_CFG_CLK				79</div><div class='add'>+#define NSS_CC_PPE_SWITCH_CLK					80</div><div class='add'>+#define NSS_CC_PPE_SWITCH_IPE_CLK				81</div><div class='add'>+#define NSS_CC_UBI0_CLK_SRC					82</div><div class='add'>+#define NSS_CC_UBI0_DIV_CLK_SRC					83</div><div class='add'>+#define NSS_CC_UBI1_CLK_SRC					84</div><div class='add'>+#define NSS_CC_UBI1_DIV_CLK_SRC					85</div><div class='add'>+#define NSS_CC_UBI2_CLK_SRC					86</div><div class='add'>+#define NSS_CC_UBI2_DIV_CLK_SRC					87</div><div class='add'>+#define NSS_CC_UBI32_AHB0_CLK					88</div><div class='add'>+#define NSS_CC_UBI32_AHB1_CLK					89</div><div class='add'>+#define NSS_CC_UBI32_AHB2_CLK					90</div><div class='add'>+#define NSS_CC_UBI32_AHB3_CLK					91</div><div class='add'>+#define NSS_CC_UBI32_AXI0_CLK					92</div><div class='add'>+#define NSS_CC_UBI32_AXI1_CLK					93</div><div class='add'>+#define NSS_CC_UBI32_AXI2_CLK					94</div><div class='add'>+#define NSS_CC_UBI32_AXI3_CLK					95</div><div class='add'>+#define NSS_CC_UBI32_CORE0_CLK					96</div><div class='add'>+#define NSS_CC_UBI32_CORE1_CLK					97</div><div class='add'>+#define NSS_CC_UBI32_CORE2_CLK					98</div><div class='add'>+#define NSS_CC_UBI32_CORE3_CLK					99</div><div class='add'>+#define NSS_CC_UBI32_INTR0_AHB_CLK				100</div><div class='add'>+#define NSS_CC_UBI32_INTR1_AHB_CLK				101</div><div class='add'>+#define NSS_CC_UBI32_INTR2_AHB_CLK				102</div><div class='add'>+#define NSS_CC_UBI32_INTR3_AHB_CLK				103</div><div class='add'>+#define NSS_CC_UBI32_NC_AXI0_CLK				104</div><div class='add'>+#define NSS_CC_UBI32_NC_AXI1_CLK				105</div><div class='add'>+#define NSS_CC_UBI32_NC_AXI2_CLK				106</div><div class='add'>+#define NSS_CC_UBI32_NC_AXI3_CLK				107</div><div class='add'>+#define NSS_CC_UBI32_UTCM0_CLK					108</div><div class='add'>+#define NSS_CC_UBI32_UTCM1_CLK					109</div><div class='add'>+#define NSS_CC_UBI32_UTCM2_CLK					110</div><div class='add'>+#define NSS_CC_UBI32_UTCM3_CLK					111</div><div class='add'>+#define NSS_CC_UBI3_CLK_SRC					112</div><div class='add'>+#define NSS_CC_UBI3_DIV_CLK_SRC					113</div><div class='add'>+#define NSS_CC_UBI_AXI_CLK_SRC					114</div><div class='add'>+#define NSS_CC_UBI_NC_AXI_BFDCD_CLK_SRC				115</div><div class='add'>+#define NSS_CC_UNIPHY_PORT1_RX_CLK				116</div><div class='add'>+#define NSS_CC_UNIPHY_PORT1_TX_CLK				117</div><div class='add'>+#define NSS_CC_UNIPHY_PORT2_RX_CLK				118</div><div class='add'>+#define NSS_CC_UNIPHY_PORT2_TX_CLK				119</div><div class='add'>+#define NSS_CC_UNIPHY_PORT3_RX_CLK				120</div><div class='add'>+#define NSS_CC_UNIPHY_PORT3_TX_CLK				121</div><div class='add'>+#define NSS_CC_UNIPHY_PORT4_RX_CLK				122</div><div class='add'>+#define NSS_CC_UNIPHY_PORT4_TX_CLK				123</div><div class='add'>+#define NSS_CC_UNIPHY_PORT5_RX_CLK				124</div><div class='add'>+#define NSS_CC_UNIPHY_PORT5_TX_CLK				125</div><div class='add'>+#define NSS_CC_UNIPHY_PORT6_RX_CLK				126</div><div class='add'>+#define NSS_CC_UNIPHY_PORT6_TX_CLK				127</div><div class='add'>+#define NSS_CC_XGMAC0_PTP_REF_CLK				128</div><div class='add'>+#define NSS_CC_XGMAC0_PTP_REF_DIV_CLK_SRC			129</div><div class='add'>+#define NSS_CC_XGMAC1_PTP_REF_CLK				130</div><div class='add'>+#define NSS_CC_XGMAC1_PTP_REF_DIV_CLK_SRC			131</div><div class='add'>+#define NSS_CC_XGMAC2_PTP_REF_CLK				132</div><div class='add'>+#define NSS_CC_XGMAC2_PTP_REF_DIV_CLK_SRC			133</div><div class='add'>+#define NSS_CC_XGMAC3_PTP_REF_CLK				134</div><div class='add'>+#define NSS_CC_XGMAC3_PTP_REF_DIV_CLK_SRC			135</div><div class='add'>+#define NSS_CC_XGMAC4_PTP_REF_CLK				136</div><div class='add'>+#define NSS_CC_XGMAC4_PTP_REF_DIV_CLK_SRC			137</div><div class='add'>+#define NSS_CC_XGMAC5_PTP_REF_CLK				138</div><div class='add'>+#define NSS_CC_XGMAC5_PTP_REF_DIV_CLK_SRC			139</div><div class='add'>+#define UBI32_PLL						140</div><div class='add'>+#define UBI32_PLL_MAIN						141</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,kaanapali-gcc.h b/include/dt-bindings/clock/qcom,kaanapali-gcc.h<br/>new file mode 100644<br/>index 000000000000..890e48709f09<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,kaanapali-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,kaanapali-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,241 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GCC_KAANAPALI_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GCC_KAANAPALI_H</div><div class='add'>+</div><div class='add'>+/* GCC clocks */</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_AXI_CLK				0</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_CLK				1</div><div class='add'>+#define GCC_AGGRE_USB3_PRIM_AXI_CLK				2</div><div class='add'>+#define GCC_BOOT_ROM_AHB_CLK					3</div><div class='add'>+#define GCC_CAM_BIST_MCLK_AHB_CLK				4</div><div class='add'>+#define GCC_CAMERA_AHB_CLK					5</div><div class='add'>+#define GCC_CAMERA_HF_AXI_CLK					6</div><div class='add'>+#define GCC_CAMERA_SF_AXI_CLK					7</div><div class='add'>+#define GCC_CAMERA_XO_CLK					8</div><div class='add'>+#define GCC_CFG_NOC_PCIE_ANOC_AHB_CLK				9</div><div class='add'>+#define GCC_CFG_NOC_USB3_PRIM_AXI_CLK				10</div><div class='add'>+#define GCC_CNOC_PCIE_SF_AXI_CLK				11</div><div class='add'>+#define GCC_DDRSS_PCIE_SF_QTB_CLK				12</div><div class='add'>+#define GCC_QMIP_CAMERA_CMD_AHB_CLK				13</div><div class='add'>+#define GCC_DISP_HF_AXI_CLK					14</div><div class='add'>+#define GCC_DISP_SF_AXI_CLK					15</div><div class='add'>+#define GCC_EVA_AHB_CLK						16</div><div class='add'>+#define GCC_EVA_AXI0_CLK					17</div><div class='add'>+#define GCC_EVA_AXI0C_CLK					18</div><div class='add'>+#define GCC_EVA_XO_CLK						19</div><div class='add'>+#define GCC_GP1_CLK						20</div><div class='add'>+#define GCC_GP1_CLK_SRC						21</div><div class='add'>+#define GCC_GP2_CLK						22</div><div class='add'>+#define GCC_GP2_CLK_SRC						23</div><div class='add'>+#define GCC_GP3_CLK						24</div><div class='add'>+#define GCC_GP3_CLK_SRC						25</div><div class='add'>+#define GCC_GPLL0						26</div><div class='add'>+#define GCC_GPLL0_OUT_EVEN					27</div><div class='add'>+#define GCC_GPLL1						28</div><div class='add'>+#define GCC_GPLL4						29</div><div class='add'>+#define GCC_GPLL7						30</div><div class='add'>+#define GCC_GPLL9						31</div><div class='add'>+#define GCC_GPU_CFG_AHB_CLK					32</div><div class='add'>+#define GCC_GPU_GEMNOC_GFX_CLK					33</div><div class='add'>+#define GCC_GPU_GPLL0_CLK_SRC					34</div><div class='add'>+#define GCC_GPU_GPLL0_DIV_CLK_SRC				35</div><div class='add'>+#define GCC_QMIP_VIDEO_VCODEC_AHB_CLK				36</div><div class='add'>+#define GCC_QMIP_GPU_AHB_CLK					37</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK					38</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK_SRC					39</div><div class='add'>+#define GCC_PCIE_0_CFG_AHB_CLK					40</div><div class='add'>+#define GCC_PCIE_0_MSTR_AXI_CLK					41</div><div class='add'>+#define GCC_PCIE_0_PHY_AUX_CLK					42</div><div class='add'>+#define GCC_PCIE_0_PHY_AUX_CLK_SRC				43</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK				44</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK_SRC				45</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK					46</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK_SRC					47</div><div class='add'>+#define GCC_PCIE_0_SLV_AXI_CLK					48</div><div class='add'>+#define GCC_PCIE_0_SLV_Q2A_AXI_CLK				49</div><div class='add'>+#define GCC_PCIE_RSCC_CFG_AHB_CLK				50</div><div class='add'>+#define GCC_PCIE_RSCC_XO_CLK					51</div><div class='add'>+#define GCC_PDM2_CLK						52</div><div class='add'>+#define GCC_PDM2_CLK_SRC					53</div><div class='add'>+#define GCC_PDM_AHB_CLK						54</div><div class='add'>+#define GCC_PDM_XO4_CLK						55</div><div class='add'>+#define GCC_QUPV3_I2C_CORE_CLK					56</div><div class='add'>+#define GCC_QUPV3_I2C_S0_CLK					57</div><div class='add'>+#define GCC_QUPV3_I2C_S0_CLK_SRC				58</div><div class='add'>+#define GCC_QUPV3_I2C_S1_CLK					59</div><div class='add'>+#define GCC_QUPV3_I2C_S1_CLK_SRC				60</div><div class='add'>+#define GCC_QUPV3_I2C_S2_CLK					61</div><div class='add'>+#define GCC_QUPV3_I2C_S2_CLK_SRC				62</div><div class='add'>+#define GCC_QUPV3_I2C_S3_CLK					63</div><div class='add'>+#define GCC_QUPV3_I2C_S3_CLK_SRC				64</div><div class='add'>+#define GCC_QUPV3_I2C_S4_CLK					65</div><div class='add'>+#define GCC_QUPV3_I2C_S4_CLK_SRC				66</div><div class='add'>+#define GCC_QUPV3_I2C_S_AHB_CLK					67</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_2X_CLK				68</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_CLK				69</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_REF_CLK				70</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_REF_CLK_SRC			71</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK					72</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK_SRC				73</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK					74</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK_SRC				75</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK					76</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK_SRC				77</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK					78</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK_SRC				79</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK					80</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK_SRC				81</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK					82</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK_SRC				83</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK					84</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK_SRC				85</div><div class='add'>+#define GCC_QUPV3_WRAP1_S7_CLK					86</div><div class='add'>+#define GCC_QUPV3_WRAP1_S7_CLK_SRC				87</div><div class='add'>+#define GCC_QUPV3_WRAP2_CORE_2X_CLK				88</div><div class='add'>+#define GCC_QUPV3_WRAP2_CORE_CLK				89</div><div class='add'>+#define GCC_QUPV3_WRAP2_S0_CLK					90</div><div class='add'>+#define GCC_QUPV3_WRAP2_S0_CLK_SRC				91</div><div class='add'>+#define GCC_QUPV3_WRAP2_S1_CLK					92</div><div class='add'>+#define GCC_QUPV3_WRAP2_S1_CLK_SRC				93</div><div class='add'>+#define GCC_QUPV3_WRAP2_S2_CLK					94</div><div class='add'>+#define GCC_QUPV3_WRAP2_S2_CLK_SRC				95</div><div class='add'>+#define GCC_QUPV3_WRAP2_S3_CLK					96</div><div class='add'>+#define GCC_QUPV3_WRAP2_S3_CLK_SRC				97</div><div class='add'>+#define GCC_QUPV3_WRAP2_S4_CLK					98</div><div class='add'>+#define GCC_QUPV3_WRAP2_S4_CLK_SRC				99</div><div class='add'>+#define GCC_QUPV3_WRAP3_CORE_2X_CLK				100</div><div class='add'>+#define GCC_QUPV3_WRAP3_CORE_CLK				101</div><div class='add'>+#define GCC_QUPV3_WRAP3_IBI_CTRL_0_CLK_SRC			102</div><div class='add'>+#define GCC_QUPV3_WRAP3_IBI_CTRL_1_CLK				103</div><div class='add'>+#define GCC_QUPV3_WRAP3_IBI_CTRL_2_CLK				104</div><div class='add'>+#define GCC_QUPV3_WRAP3_S0_CLK					105</div><div class='add'>+#define GCC_QUPV3_WRAP3_S0_CLK_SRC				106</div><div class='add'>+#define GCC_QUPV3_WRAP3_S1_CLK					107</div><div class='add'>+#define GCC_QUPV3_WRAP3_S1_CLK_SRC				108</div><div class='add'>+#define GCC_QUPV3_WRAP3_S2_CLK					109</div><div class='add'>+#define GCC_QUPV3_WRAP3_S2_CLK_SRC				110</div><div class='add'>+#define GCC_QUPV3_WRAP3_S3_CLK					111</div><div class='add'>+#define GCC_QUPV3_WRAP3_S3_CLK_SRC				112</div><div class='add'>+#define GCC_QUPV3_WRAP3_S4_CLK					113</div><div class='add'>+#define GCC_QUPV3_WRAP3_S4_CLK_SRC				114</div><div class='add'>+#define GCC_QUPV3_WRAP3_S5_CLK					115</div><div class='add'>+#define GCC_QUPV3_WRAP3_S5_CLK_SRC				116</div><div class='add'>+#define GCC_QUPV3_WRAP4_CORE_2X_CLK				117</div><div class='add'>+#define GCC_QUPV3_WRAP4_CORE_CLK				118</div><div class='add'>+#define GCC_QUPV3_WRAP4_S0_CLK					119</div><div class='add'>+#define GCC_QUPV3_WRAP4_S0_CLK_SRC				120</div><div class='add'>+#define GCC_QUPV3_WRAP4_S1_CLK					121</div><div class='add'>+#define GCC_QUPV3_WRAP4_S1_CLK_SRC				122</div><div class='add'>+#define GCC_QUPV3_WRAP4_S2_CLK					123</div><div class='add'>+#define GCC_QUPV3_WRAP4_S2_CLK_SRC				124</div><div class='add'>+#define GCC_QUPV3_WRAP4_S3_CLK					125</div><div class='add'>+#define GCC_QUPV3_WRAP4_S3_CLK_SRC				126</div><div class='add'>+#define GCC_QUPV3_WRAP4_S4_CLK					127</div><div class='add'>+#define GCC_QUPV3_WRAP4_S4_CLK_SRC				128</div><div class='add'>+#define GCC_QUPV3_WRAP_1_M_AXI_CLK				129</div><div class='add'>+#define GCC_QUPV3_WRAP_1_S_AHB_CLK				130</div><div class='add'>+#define GCC_QUPV3_WRAP_2_M_AHB_CLK				131</div><div class='add'>+#define GCC_QUPV3_WRAP_2_S_AHB_CLK				132</div><div class='add'>+#define GCC_QUPV3_WRAP_3_IBI_1_AHB_CLK				133</div><div class='add'>+#define GCC_QUPV3_WRAP_3_IBI_2_AHB_CLK				134</div><div class='add'>+#define GCC_QUPV3_WRAP_3_M_AHB_CLK				135</div><div class='add'>+#define GCC_QUPV3_WRAP_3_S_AHB_CLK				136</div><div class='add'>+#define GCC_QUPV3_WRAP_4_M_AHB_CLK				137</div><div class='add'>+#define GCC_QUPV3_WRAP_4_S_AHB_CLK				138</div><div class='add'>+#define GCC_SDCC2_AHB_CLK					139</div><div class='add'>+#define GCC_SDCC2_APPS_CLK					140</div><div class='add'>+#define GCC_SDCC2_APPS_CLK_SRC					141</div><div class='add'>+#define GCC_SDCC4_AHB_CLK					142</div><div class='add'>+#define GCC_SDCC4_APPS_CLK					143</div><div class='add'>+#define GCC_SDCC4_APPS_CLK_SRC					144</div><div class='add'>+#define GCC_UFS_PHY_AHB_CLK					145</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK					146</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK_SRC					147</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK				148</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK_SRC				149</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK					150</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK_SRC				151</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK				152</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK_SRC				153</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK				154</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK_SRC				155</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK				156</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK_SRC				157</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK				158</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK_SRC				159</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK				160</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK_SRC				161</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK				162</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC			163</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_POSTDIV_CLK_SRC		164</div><div class='add'>+#define GCC_USB30_PRIM_SLEEP_CLK				165</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK				166</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK_SRC				167</div><div class='add'>+#define GCC_USB3_PRIM_PHY_COM_AUX_CLK				168</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK				169</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK_SRC				170</div><div class='add'>+#define GCC_VIDEO_AHB_CLK					171</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK					172</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK					173</div><div class='add'>+#define GCC_VIDEO_XO_CLK					174</div><div class='add'>+#define GCC_QMIP_CAMERA_NRT_AHB_CLK				175</div><div class='add'>+#define GCC_QMIP_CAMERA_RT_AHB_CLK				176</div><div class='add'>+#define GCC_QMIP_DISP_DCP_SF_AHB_CLK				177</div><div class='add'>+#define GCC_QMIP_PCIE_AHB_CLK					178</div><div class='add'>+#define GCC_QMIP_VIDEO_CV_CPU_AHB_CLK				179</div><div class='add'>+#define GCC_QMIP_VIDEO_CVP_AHB_CLK				180</div><div class='add'>+#define GCC_QMIP_VIDEO_V_CPU_AHB_CLK				181</div><div class='add'>+#define GCC_DISP_AHB_CLK					182</div><div class='add'>+</div><div class='add'>+/* GCC power domains */</div><div class='add'>+#define GCC_PCIE_0_GDSC						0</div><div class='add'>+#define GCC_PCIE_0_PHY_GDSC					1</div><div class='add'>+#define GCC_UFS_MEM_PHY_GDSC					2</div><div class='add'>+#define GCC_UFS_PHY_GDSC					3</div><div class='add'>+#define GCC_USB30_PRIM_GDSC					4</div><div class='add'>+#define GCC_USB3_PHY_GDSC					5</div><div class='add'>+</div><div class='add'>+/* GCC resets */</div><div class='add'>+#define GCC_CAMERA_BCR						0</div><div class='add'>+#define GCC_DISPLAY_BCR						1</div><div class='add'>+#define GCC_EVA_AXI0_CLK_ARES					2</div><div class='add'>+#define GCC_EVA_AXI0C_CLK_ARES					3</div><div class='add'>+#define GCC_EVA_BCR						4</div><div class='add'>+#define GCC_GPU_BCR						5</div><div class='add'>+#define GCC_PCIE_0_BCR						6</div><div class='add'>+#define GCC_PCIE_0_LINK_DOWN_BCR				7</div><div class='add'>+#define GCC_PCIE_0_NOCSR_COM_PHY_BCR				8</div><div class='add'>+#define GCC_PCIE_0_PHY_BCR					9</div><div class='add'>+#define GCC_PCIE_0_PHY_NOCSR_COM_PHY_BCR			10</div><div class='add'>+#define GCC_PCIE_PHY_BCR					11</div><div class='add'>+#define GCC_PCIE_PHY_CFG_AHB_BCR				12</div><div class='add'>+#define GCC_PCIE_PHY_COM_BCR					13</div><div class='add'>+#define GCC_PCIE_RSCC_BCR					14</div><div class='add'>+#define GCC_PDM_BCR						15</div><div class='add'>+#define GCC_QUPV3_WRAPPER_1_BCR					16</div><div class='add'>+#define GCC_QUPV3_WRAPPER_2_BCR					17</div><div class='add'>+#define GCC_QUPV3_WRAPPER_3_BCR					18</div><div class='add'>+#define GCC_QUPV3_WRAPPER_4_BCR					19</div><div class='add'>+#define GCC_QUPV3_WRAPPER_I2C_BCR				20</div><div class='add'>+#define GCC_QUSB2PHY_PRIM_BCR					21</div><div class='add'>+#define GCC_QUSB2PHY_SEC_BCR					22</div><div class='add'>+#define GCC_SDCC2_BCR						23</div><div class='add'>+#define GCC_SDCC4_BCR						24</div><div class='add'>+#define GCC_UFS_PHY_BCR						25</div><div class='add'>+#define GCC_USB30_PRIM_BCR					26</div><div class='add'>+#define GCC_USB3_DP_PHY_PRIM_BCR				27</div><div class='add'>+#define GCC_USB3_DP_PHY_SEC_BCR					28</div><div class='add'>+#define GCC_USB3_PHY_PRIM_BCR					29</div><div class='add'>+#define GCC_USB3_PHY_SEC_BCR					30</div><div class='add'>+#define GCC_USB3PHY_PHY_PRIM_BCR				31</div><div class='add'>+#define GCC_USB3PHY_PHY_SEC_BCR					32</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK_ARES					33</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK_ARES					34</div><div class='add'>+#define GCC_VIDEO_BCR						35</div><div class='add'>+#define GCC_VIDEO_XO_CLK_ARES					36</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,milos-camcc.h b/include/dt-bindings/clock/qcom,milos-camcc.h<br/>new file mode 100644<br/>index 000000000000..21925dca9a20<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,milos-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,milos-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,131 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2025, Luca Weiss &lt;luca.weiss@fairphone.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_CAM_CC_MILOS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_CAM_CC_MILOS_H</div><div class='add'>+</div><div class='add'>+/* CAM_CC clocks */</div><div class='add'>+#define CAM_CC_PLL0						0</div><div class='add'>+#define CAM_CC_PLL0_OUT_EVEN					1</div><div class='add'>+#define CAM_CC_PLL0_OUT_ODD					2</div><div class='add'>+#define CAM_CC_PLL1						3</div><div class='add'>+#define CAM_CC_PLL1_OUT_EVEN					4</div><div class='add'>+#define CAM_CC_PLL2						5</div><div class='add'>+#define CAM_CC_PLL2_OUT_EVEN					6</div><div class='add'>+#define CAM_CC_PLL3						7</div><div class='add'>+#define CAM_CC_PLL3_OUT_EVEN					8</div><div class='add'>+#define CAM_CC_PLL4						9</div><div class='add'>+#define CAM_CC_PLL4_OUT_EVEN					10</div><div class='add'>+#define CAM_CC_PLL5						11</div><div class='add'>+#define CAM_CC_PLL5_OUT_EVEN					12</div><div class='add'>+#define CAM_CC_PLL6						13</div><div class='add'>+#define CAM_CC_PLL6_OUT_EVEN					14</div><div class='add'>+#define CAM_CC_BPS_AHB_CLK					15</div><div class='add'>+#define CAM_CC_BPS_AREG_CLK					16</div><div class='add'>+#define CAM_CC_BPS_CLK						17</div><div class='add'>+#define CAM_CC_BPS_CLK_SRC					18</div><div class='add'>+#define CAM_CC_CAMNOC_ATB_CLK					19</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK_SRC				20</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_HF_CLK				21</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_SF_CLK				22</div><div class='add'>+#define CAM_CC_CAMNOC_NRT_AXI_CLK				23</div><div class='add'>+#define CAM_CC_CAMNOC_RT_AXI_CLK				24</div><div class='add'>+#define CAM_CC_CCI_0_CLK					25</div><div class='add'>+#define CAM_CC_CCI_0_CLK_SRC					26</div><div class='add'>+#define CAM_CC_CCI_1_CLK					27</div><div class='add'>+#define CAM_CC_CCI_1_CLK_SRC					28</div><div class='add'>+#define CAM_CC_CORE_AHB_CLK					29</div><div class='add'>+#define CAM_CC_CPAS_AHB_CLK					30</div><div class='add'>+#define CAM_CC_CPHY_RX_CLK_SRC					31</div><div class='add'>+#define CAM_CC_CRE_AHB_CLK					32</div><div class='add'>+#define CAM_CC_CRE_CLK						33</div><div class='add'>+#define CAM_CC_CRE_CLK_SRC					34</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK					35</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK_SRC				36</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK					37</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK_SRC				38</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK					39</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK_SRC				40</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK					41</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK_SRC				42</div><div class='add'>+#define CAM_CC_CSIPHY0_CLK					43</div><div class='add'>+#define CAM_CC_CSIPHY1_CLK					44</div><div class='add'>+#define CAM_CC_CSIPHY2_CLK					45</div><div class='add'>+#define CAM_CC_CSIPHY3_CLK					46</div><div class='add'>+#define CAM_CC_FAST_AHB_CLK_SRC					47</div><div class='add'>+#define CAM_CC_GDSC_CLK						48</div><div class='add'>+#define CAM_CC_ICP_ATB_CLK					49</div><div class='add'>+#define CAM_CC_ICP_CLK						50</div><div class='add'>+#define CAM_CC_ICP_CLK_SRC					51</div><div class='add'>+#define CAM_CC_ICP_CTI_CLK					52</div><div class='add'>+#define CAM_CC_ICP_TS_CLK					53</div><div class='add'>+#define CAM_CC_MCLK0_CLK					54</div><div class='add'>+#define CAM_CC_MCLK0_CLK_SRC					55</div><div class='add'>+#define CAM_CC_MCLK1_CLK					56</div><div class='add'>+#define CAM_CC_MCLK1_CLK_SRC					57</div><div class='add'>+#define CAM_CC_MCLK2_CLK					58</div><div class='add'>+#define CAM_CC_MCLK2_CLK_SRC					59</div><div class='add'>+#define CAM_CC_MCLK3_CLK					60</div><div class='add'>+#define CAM_CC_MCLK3_CLK_SRC					61</div><div class='add'>+#define CAM_CC_MCLK4_CLK					62</div><div class='add'>+#define CAM_CC_MCLK4_CLK_SRC					63</div><div class='add'>+#define CAM_CC_OPE_0_AHB_CLK					64</div><div class='add'>+#define CAM_CC_OPE_0_AREG_CLK					65</div><div class='add'>+#define CAM_CC_OPE_0_CLK					66</div><div class='add'>+#define CAM_CC_OPE_0_CLK_SRC					67</div><div class='add'>+#define CAM_CC_SLEEP_CLK					68</div><div class='add'>+#define CAM_CC_SLEEP_CLK_SRC					69</div><div class='add'>+#define CAM_CC_SLOW_AHB_CLK_SRC					70</div><div class='add'>+#define CAM_CC_SOC_AHB_CLK					71</div><div class='add'>+#define CAM_CC_SYS_TMR_CLK					72</div><div class='add'>+#define CAM_CC_TFE_0_AHB_CLK					73</div><div class='add'>+#define CAM_CC_TFE_0_CLK					74</div><div class='add'>+#define CAM_CC_TFE_0_CLK_SRC					75</div><div class='add'>+#define CAM_CC_TFE_0_CPHY_RX_CLK				76</div><div class='add'>+#define CAM_CC_TFE_0_CSID_CLK					77</div><div class='add'>+#define CAM_CC_TFE_0_CSID_CLK_SRC				78</div><div class='add'>+#define CAM_CC_TFE_1_AHB_CLK					79</div><div class='add'>+#define CAM_CC_TFE_1_CLK					80</div><div class='add'>+#define CAM_CC_TFE_1_CLK_SRC					81</div><div class='add'>+#define CAM_CC_TFE_1_CPHY_RX_CLK				82</div><div class='add'>+#define CAM_CC_TFE_1_CSID_CLK					83</div><div class='add'>+#define CAM_CC_TFE_1_CSID_CLK_SRC				84</div><div class='add'>+#define CAM_CC_TFE_2_AHB_CLK					85</div><div class='add'>+#define CAM_CC_TFE_2_CLK					86</div><div class='add'>+#define CAM_CC_TFE_2_CLK_SRC					87</div><div class='add'>+#define CAM_CC_TFE_2_CPHY_RX_CLK				88</div><div class='add'>+#define CAM_CC_TFE_2_CSID_CLK					89</div><div class='add'>+#define CAM_CC_TFE_2_CSID_CLK_SRC				90</div><div class='add'>+#define CAM_CC_TOP_SHIFT_CLK					91</div><div class='add'>+#define CAM_CC_XO_CLK_SRC					92</div><div class='add'>+</div><div class='add'>+/* CAM_CC resets */</div><div class='add'>+#define CAM_CC_BPS_BCR						0</div><div class='add'>+#define CAM_CC_CAMNOC_BCR					1</div><div class='add'>+#define CAM_CC_CAMSS_TOP_BCR					2</div><div class='add'>+#define CAM_CC_CCI_0_BCR					3</div><div class='add'>+#define CAM_CC_CCI_1_BCR					4</div><div class='add'>+#define CAM_CC_CPAS_BCR						5</div><div class='add'>+#define CAM_CC_CRE_BCR						6</div><div class='add'>+#define CAM_CC_CSI0PHY_BCR					7</div><div class='add'>+#define CAM_CC_CSI1PHY_BCR					8</div><div class='add'>+#define CAM_CC_CSI2PHY_BCR					9</div><div class='add'>+#define CAM_CC_CSI3PHY_BCR					10</div><div class='add'>+#define CAM_CC_ICP_BCR						11</div><div class='add'>+#define CAM_CC_MCLK0_BCR					12</div><div class='add'>+#define CAM_CC_MCLK1_BCR					13</div><div class='add'>+#define CAM_CC_MCLK2_BCR					14</div><div class='add'>+#define CAM_CC_MCLK3_BCR					15</div><div class='add'>+#define CAM_CC_MCLK4_BCR					16</div><div class='add'>+#define CAM_CC_OPE_0_BCR					17</div><div class='add'>+#define CAM_CC_TFE_0_BCR					18</div><div class='add'>+#define CAM_CC_TFE_1_BCR					19</div><div class='add'>+#define CAM_CC_TFE_2_BCR					20</div><div class='add'>+</div><div class='add'>+/* CAM_CC power domains */</div><div class='add'>+#define CAM_CC_CAMSS_TOP_GDSC					0</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,milos-dispcc.h b/include/dt-bindings/clock/qcom,milos-dispcc.h<br/>new file mode 100644<br/>index 000000000000..c70f23f32f0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,milos-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,milos-dispcc.h</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2025, Luca Weiss &lt;luca.weiss@fairphone.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_DISP_CC_MILOS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_DISP_CC_MILOS_H</div><div class='add'>+</div><div class='add'>+/* DISP_CC clocks */</div><div class='add'>+#define DISP_CC_PLL0						0</div><div class='add'>+#define DISP_CC_MDSS_ACCU_CLK					1</div><div class='add'>+#define DISP_CC_MDSS_AHB1_CLK					2</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK					3</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK_SRC				4</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK					5</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK_SRC				6</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_DIV_CLK_SRC				7</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_INTF_CLK				8</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_AUX_CLK				9</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_AUX_CLK_SRC				10</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_CRYPTO_CLK				11</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_CLK				12</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_CLK_SRC				13</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_DIV_CLK_SRC			14</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_INTF_CLK			15</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL0_CLK				16</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC			17</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL1_CLK				18</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL1_CLK_SRC			19</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_USB_ROUTER_LINK_INTF_CLK		20</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK					21</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK_SRC				22</div><div class='add'>+#define DISP_CC_MDSS_MDP1_CLK					23</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK					24</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK_SRC				25</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT1_CLK				26</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT_CLK				27</div><div class='add'>+#define DISP_CC_MDSS_NON_GDSC_AHB_CLK				28</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK					29</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK_SRC				30</div><div class='add'>+#define DISP_CC_MDSS_RSCC_AHB_CLK				31</div><div class='add'>+#define DISP_CC_MDSS_RSCC_VSYNC_CLK				32</div><div class='add'>+#define DISP_CC_MDSS_VSYNC1_CLK					33</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK					34</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK_SRC				35</div><div class='add'>+#define DISP_CC_SLEEP_CLK					36</div><div class='add'>+#define DISP_CC_SLEEP_CLK_SRC					37</div><div class='add'>+#define DISP_CC_XO_CLK						38</div><div class='add'>+#define DISP_CC_XO_CLK_SRC					39</div><div class='add'>+</div><div class='add'>+/* DISP_CC resets */</div><div class='add'>+#define DISP_CC_MDSS_CORE_BCR					0</div><div class='add'>+#define DISP_CC_MDSS_CORE_INT2_BCR				1</div><div class='add'>+#define DISP_CC_MDSS_RSCC_BCR					2</div><div class='add'>+</div><div class='add'>+/* DISP_CC power domains */</div><div class='add'>+#define DISP_CC_MDSS_CORE_GDSC					0</div><div class='add'>+#define DISP_CC_MDSS_CORE_INT2_GDSC				1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,milos-gcc.h b/include/dt-bindings/clock/qcom,milos-gcc.h<br/>new file mode 100644<br/>index 000000000000..a530ca39e1ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,milos-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,milos-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,210 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2025, Luca Weiss &lt;luca.weiss@fairphone.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GCC_MILOS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GCC_MILOS_H</div><div class='add'>+</div><div class='add'>+/* GCC clocks */</div><div class='add'>+#define GCC_GPLL0						0</div><div class='add'>+#define GCC_GPLL0_OUT_EVEN					1</div><div class='add'>+#define GCC_GPLL2						2</div><div class='add'>+#define GCC_GPLL4						3</div><div class='add'>+#define GCC_GPLL6						4</div><div class='add'>+#define GCC_GPLL7						5</div><div class='add'>+#define GCC_GPLL9						6</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_AXI_CLK				7</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_CLK				8</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_HW_CTL_CLK			9</div><div class='add'>+#define GCC_AGGRE_USB3_PRIM_AXI_CLK				10</div><div class='add'>+#define GCC_BOOT_ROM_AHB_CLK					11</div><div class='add'>+#define GCC_CAMERA_AHB_CLK					12</div><div class='add'>+#define GCC_CAMERA_HF_AXI_CLK					13</div><div class='add'>+#define GCC_CAMERA_HF_XO_CLK					14</div><div class='add'>+#define GCC_CAMERA_SF_AXI_CLK					15</div><div class='add'>+#define GCC_CAMERA_SF_XO_CLK					16</div><div class='add'>+#define GCC_CFG_NOC_PCIE_ANOC_AHB_CLK				17</div><div class='add'>+#define GCC_CFG_NOC_USB3_PRIM_AXI_CLK				18</div><div class='add'>+#define GCC_CNOC_PCIE_SF_AXI_CLK				19</div><div class='add'>+#define GCC_DDRSS_GPU_AXI_CLK					20</div><div class='add'>+#define GCC_DDRSS_PCIE_SF_QTB_CLK				21</div><div class='add'>+#define GCC_DISP_AHB_CLK					22</div><div class='add'>+#define GCC_DISP_GPLL0_DIV_CLK_SRC				23</div><div class='add'>+#define GCC_DISP_HF_AXI_CLK					24</div><div class='add'>+#define GCC_DISP_XO_CLK						25</div><div class='add'>+#define GCC_GP1_CLK						26</div><div class='add'>+#define GCC_GP1_CLK_SRC						27</div><div class='add'>+#define GCC_GP2_CLK						28</div><div class='add'>+#define GCC_GP2_CLK_SRC						29</div><div class='add'>+#define GCC_GP3_CLK						30</div><div class='add'>+#define GCC_GP3_CLK_SRC						31</div><div class='add'>+#define GCC_GPU_CFG_AHB_CLK					32</div><div class='add'>+#define GCC_GPU_GPLL0_CLK_SRC					33</div><div class='add'>+#define GCC_GPU_GPLL0_DIV_CLK_SRC				34</div><div class='add'>+#define GCC_GPU_MEMNOC_GFX_CLK					35</div><div class='add'>+#define GCC_GPU_SNOC_DVM_GFX_CLK				36</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK					37</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK_SRC					38</div><div class='add'>+#define GCC_PCIE_0_CFG_AHB_CLK					39</div><div class='add'>+#define GCC_PCIE_0_MSTR_AXI_CLK					40</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK				41</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK_SRC				42</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK					43</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK_SRC					44</div><div class='add'>+#define GCC_PCIE_0_PIPE_DIV2_CLK				45</div><div class='add'>+#define GCC_PCIE_0_PIPE_DIV2_CLK_SRC				46</div><div class='add'>+#define GCC_PCIE_0_SLV_AXI_CLK					47</div><div class='add'>+#define GCC_PCIE_0_SLV_Q2A_AXI_CLK				48</div><div class='add'>+#define GCC_PCIE_1_AUX_CLK					49</div><div class='add'>+#define GCC_PCIE_1_AUX_CLK_SRC					50</div><div class='add'>+#define GCC_PCIE_1_CFG_AHB_CLK					51</div><div class='add'>+#define GCC_PCIE_1_MSTR_AXI_CLK					52</div><div class='add'>+#define GCC_PCIE_1_PHY_RCHNG_CLK				53</div><div class='add'>+#define GCC_PCIE_1_PHY_RCHNG_CLK_SRC				54</div><div class='add'>+#define GCC_PCIE_1_PIPE_CLK					55</div><div class='add'>+#define GCC_PCIE_1_PIPE_CLK_SRC					56</div><div class='add'>+#define GCC_PCIE_1_PIPE_DIV2_CLK				57</div><div class='add'>+#define GCC_PCIE_1_PIPE_DIV2_CLK_SRC				58</div><div class='add'>+#define GCC_PCIE_1_SLV_AXI_CLK					59</div><div class='add'>+#define GCC_PCIE_1_SLV_Q2A_AXI_CLK				60</div><div class='add'>+#define GCC_PCIE_RSCC_CFG_AHB_CLK				61</div><div class='add'>+#define GCC_PCIE_RSCC_XO_CLK					62</div><div class='add'>+#define GCC_PDM2_CLK						63</div><div class='add'>+#define GCC_PDM2_CLK_SRC					64</div><div class='add'>+#define GCC_PDM_AHB_CLK						65</div><div class='add'>+#define GCC_PDM_XO4_CLK						66</div><div class='add'>+#define GCC_QMIP_CAMERA_NRT_AHB_CLK				67</div><div class='add'>+#define GCC_QMIP_CAMERA_RT_AHB_CLK				68</div><div class='add'>+#define GCC_QMIP_DISP_AHB_CLK					69</div><div class='add'>+#define GCC_QMIP_GPU_AHB_CLK					70</div><div class='add'>+#define GCC_QMIP_PCIE_AHB_CLK					71</div><div class='add'>+#define GCC_QMIP_VIDEO_CV_CPU_AHB_CLK				72</div><div class='add'>+#define GCC_QMIP_VIDEO_CVP_AHB_CLK				73</div><div class='add'>+#define GCC_QMIP_VIDEO_V_CPU_AHB_CLK				74</div><div class='add'>+#define GCC_QMIP_VIDEO_VCODEC_AHB_CLK				75</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_2X_CLK				76</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_CLK				77</div><div class='add'>+#define GCC_QUPV3_WRAP0_QSPI_REF_CLK				78</div><div class='add'>+#define GCC_QUPV3_WRAP0_QSPI_REF_CLK_SRC			79</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK					80</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK_SRC				81</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK					82</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK_SRC				83</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK					84</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK_SRC				85</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK					86</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK_SRC				87</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK					88</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK_SRC				89</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK					90</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK_SRC				91</div><div class='add'>+#define GCC_QUPV3_WRAP0_S6_CLK					92</div><div class='add'>+#define GCC_QUPV3_WRAP0_S6_CLK_SRC				93</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_2X_CLK				94</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_CLK				95</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_REF_CLK				96</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_REF_CLK_SRC			97</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK					98</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK_SRC				99</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK					100</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK_SRC				101</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK					102</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK_SRC				103</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK					104</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK_SRC				105</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK					106</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK_SRC				107</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK					108</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK_SRC				109</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK					110</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK_SRC				111</div><div class='add'>+#define GCC_QUPV3_WRAP_0_M_AHB_CLK				112</div><div class='add'>+#define GCC_QUPV3_WRAP_0_S_AHB_CLK				113</div><div class='add'>+#define GCC_QUPV3_WRAP_1_M_AHB_CLK				114</div><div class='add'>+#define GCC_QUPV3_WRAP_1_S_AHB_CLK				115</div><div class='add'>+#define GCC_SDCC1_AHB_CLK					116</div><div class='add'>+#define GCC_SDCC1_APPS_CLK					117</div><div class='add'>+#define GCC_SDCC1_APPS_CLK_SRC					118</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK					119</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK_SRC				120</div><div class='add'>+#define GCC_SDCC2_AHB_CLK					121</div><div class='add'>+#define GCC_SDCC2_APPS_CLK					122</div><div class='add'>+#define GCC_SDCC2_APPS_CLK_SRC					123</div><div class='add'>+#define GCC_UFS_PHY_AHB_CLK					124</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK					125</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK_SRC					126</div><div class='add'>+#define GCC_UFS_PHY_AXI_HW_CTL_CLK				127</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK				128</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK_SRC				129</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_HW_CTL_CLK				130</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK					131</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK_SRC				132</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_HW_CTL_CLK				133</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK				134</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK_SRC				135</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK				136</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK_SRC				137</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK				138</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK_SRC				139</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK				140</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK_SRC				141</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_HW_CTL_CLK			142</div><div class='add'>+#define GCC_USB30_PRIM_ATB_CLK					143</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK				144</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK_SRC				145</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK				146</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC			147</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_POSTDIV_CLK_SRC		148</div><div class='add'>+#define GCC_USB30_PRIM_SLEEP_CLK				149</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK				150</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK_SRC				151</div><div class='add'>+#define GCC_USB3_PRIM_PHY_COM_AUX_CLK				152</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK				153</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK_SRC				154</div><div class='add'>+#define GCC_VIDEO_AHB_CLK					155</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK					156</div><div class='add'>+#define GCC_VIDEO_XO_CLK					157</div><div class='add'>+</div><div class='add'>+/* GCC resets */</div><div class='add'>+#define GCC_CAMERA_BCR						0</div><div class='add'>+#define GCC_DISPLAY_BCR						1</div><div class='add'>+#define GCC_GPU_BCR						2</div><div class='add'>+#define GCC_PCIE_0_BCR						3</div><div class='add'>+#define GCC_PCIE_0_LINK_DOWN_BCR				4</div><div class='add'>+#define GCC_PCIE_0_NOCSR_COM_PHY_BCR				5</div><div class='add'>+#define GCC_PCIE_0_PHY_BCR					6</div><div class='add'>+#define GCC_PCIE_0_PHY_NOCSR_COM_PHY_BCR			7</div><div class='add'>+#define GCC_PCIE_1_BCR						8</div><div class='add'>+#define GCC_PCIE_1_LINK_DOWN_BCR				9</div><div class='add'>+#define GCC_PCIE_1_NOCSR_COM_PHY_BCR				10</div><div class='add'>+#define GCC_PCIE_1_PHY_BCR					11</div><div class='add'>+#define GCC_PCIE_1_PHY_NOCSR_COM_PHY_BCR			12</div><div class='add'>+#define GCC_PCIE_RSCC_BCR					13</div><div class='add'>+#define GCC_PDM_BCR						14</div><div class='add'>+#define GCC_QUPV3_WRAPPER_0_BCR					15</div><div class='add'>+#define GCC_QUPV3_WRAPPER_1_BCR					16</div><div class='add'>+#define GCC_QUSB2PHY_PRIM_BCR					17</div><div class='add'>+#define GCC_QUSB2PHY_SEC_BCR					18</div><div class='add'>+#define GCC_SDCC1_BCR						19</div><div class='add'>+#define GCC_SDCC2_BCR						20</div><div class='add'>+#define GCC_UFS_PHY_BCR						21</div><div class='add'>+#define GCC_USB30_PRIM_BCR					22</div><div class='add'>+#define GCC_USB3_DP_PHY_PRIM_BCR				23</div><div class='add'>+#define GCC_USB3_PHY_PRIM_BCR					24</div><div class='add'>+#define GCC_USB3PHY_PHY_PRIM_BCR				25</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK_ARES					26</div><div class='add'>+#define GCC_VIDEO_BCR						27</div><div class='add'>+</div><div class='add'>+/* GCC power domains */</div><div class='add'>+#define PCIE_0_GDSC						0</div><div class='add'>+#define PCIE_0_PHY_GDSC						1</div><div class='add'>+#define PCIE_1_GDSC						2</div><div class='add'>+#define PCIE_1_PHY_GDSC						3</div><div class='add'>+#define UFS_PHY_GDSC						4</div><div class='add'>+#define UFS_MEM_PHY_GDSC					5</div><div class='add'>+#define USB30_PRIM_GDSC						6</div><div class='add'>+#define USB3_PHY_GDSC						7</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,milos-gpucc.h b/include/dt-bindings/clock/qcom,milos-gpucc.h<br/>new file mode 100644<br/>index 000000000000..6ff1925d409f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,milos-gpucc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,milos-gpucc.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2025, Luca Weiss &lt;luca.weiss@fairphone.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GPU_CC_MILOS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GPU_CC_MILOS_H</div><div class='add'>+</div><div class='add'>+/* GPU_CC clocks */</div><div class='add'>+#define GPU_CC_PLL0						0</div><div class='add'>+#define GPU_CC_PLL0_OUT_EVEN					1</div><div class='add'>+#define GPU_CC_AHB_CLK						2</div><div class='add'>+#define GPU_CC_CB_CLK						3</div><div class='add'>+#define GPU_CC_CX_ACCU_SHIFT_CLK				4</div><div class='add'>+#define GPU_CC_CX_FF_CLK					5</div><div class='add'>+#define GPU_CC_CX_GMU_CLK					6</div><div class='add'>+#define GPU_CC_CXO_AON_CLK					7</div><div class='add'>+#define GPU_CC_CXO_CLK						8</div><div class='add'>+#define GPU_CC_DEMET_CLK					9</div><div class='add'>+#define GPU_CC_DEMET_DIV_CLK_SRC				10</div><div class='add'>+#define GPU_CC_DPM_CLK						11</div><div class='add'>+#define GPU_CC_FF_CLK_SRC					12</div><div class='add'>+#define GPU_CC_FREQ_MEASURE_CLK					13</div><div class='add'>+#define GPU_CC_GMU_CLK_SRC					14</div><div class='add'>+#define GPU_CC_GX_ACCU_SHIFT_CLK				15</div><div class='add'>+#define GPU_CC_GX_ACD_AHB_FF_CLK				16</div><div class='add'>+#define GPU_CC_GX_AHB_FF_CLK					17</div><div class='add'>+#define GPU_CC_GX_GMU_CLK					18</div><div class='add'>+#define GPU_CC_GX_RCG_AHB_FF_CLK				19</div><div class='add'>+#define GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK				20</div><div class='add'>+#define GPU_CC_HUB_AON_CLK					21</div><div class='add'>+#define GPU_CC_HUB_CLK_SRC					22</div><div class='add'>+#define GPU_CC_HUB_CX_INT_CLK					23</div><div class='add'>+#define GPU_CC_HUB_DIV_CLK_SRC					24</div><div class='add'>+#define GPU_CC_MEMNOC_GFX_CLK					25</div><div class='add'>+#define GPU_CC_RSCC_HUB_AON_CLK					26</div><div class='add'>+#define GPU_CC_RSCC_XO_AON_CLK					27</div><div class='add'>+#define GPU_CC_SLEEP_CLK					28</div><div class='add'>+#define GPU_CC_XO_CLK_SRC					29</div><div class='add'>+#define GPU_CC_XO_DIV_CLK_SRC					30</div><div class='add'>+</div><div class='add'>+/* GPU_CC resets */</div><div class='add'>+#define GPU_CC_CB_BCR						0</div><div class='add'>+#define GPU_CC_CX_BCR						1</div><div class='add'>+#define GPU_CC_FAST_HUB_BCR					2</div><div class='add'>+#define GPU_CC_FF_BCR						3</div><div class='add'>+#define GPU_CC_GMU_BCR						4</div><div class='add'>+#define GPU_CC_GX_BCR						5</div><div class='add'>+#define GPU_CC_RBCPR_BCR					6</div><div class='add'>+#define GPU_CC_XO_BCR						7</div><div class='add'>+</div><div class='add'>+/* GPU_CC power domains */</div><div class='add'>+#define GPU_CC_CX_GDSC						0</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,milos-videocc.h b/include/dt-bindings/clock/qcom,milos-videocc.h<br/>new file mode 100644<br/>index 000000000000..3544db81ffae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,milos-videocc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,milos-videocc.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2025, Luca Weiss &lt;luca.weiss@fairphone.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_VIDEO_CC_MILOS_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_VIDEO_CC_MILOS_H</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC clocks */</div><div class='add'>+#define VIDEO_CC_PLL0						0</div><div class='add'>+#define VIDEO_CC_AHB_CLK					1</div><div class='add'>+#define VIDEO_CC_AHB_CLK_SRC					2</div><div class='add'>+#define VIDEO_CC_MVS0_CLK					3</div><div class='add'>+#define VIDEO_CC_MVS0_CLK_SRC					4</div><div class='add'>+#define VIDEO_CC_MVS0_DIV_CLK_SRC				5</div><div class='add'>+#define VIDEO_CC_MVS0_SHIFT_CLK					6</div><div class='add'>+#define VIDEO_CC_MVS0C_CLK					7</div><div class='add'>+#define VIDEO_CC_MVS0C_DIV2_DIV_CLK_SRC				8</div><div class='add'>+#define VIDEO_CC_MVS0C_SHIFT_CLK				9</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK					10</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK_SRC					11</div><div class='add'>+#define VIDEO_CC_XO_CLK						12</div><div class='add'>+#define VIDEO_CC_XO_CLK_SRC					13</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC resets */</div><div class='add'>+#define VIDEO_CC_INTERFACE_BCR					0</div><div class='add'>+#define VIDEO_CC_MVS0_BCR					1</div><div class='add'>+#define VIDEO_CC_MVS0C_CLK_ARES					2</div><div class='add'>+#define VIDEO_CC_MVS0C_BCR					3</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC power domains */</div><div class='add'>+#define VIDEO_CC_MVS0_GDSC					0</div><div class='add'>+#define VIDEO_CC_MVS0C_GDSC					1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,mmcc-msm8960.h b/include/dt-bindings/clock/qcom,mmcc-msm8960.h<br/>index 81714fc859c5..717431d735c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,mmcc-msm8960.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,mmcc-msm8960.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,mmcc-msm8960.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,mmcc-msm8960.h</a></div><div class='hunk'>@@ -133,5 +133,7 @@</div><div class='ctx'> #define VCAP_CLK					124</div><div class='ctx'> #define VCAP_NPL_CLK					125</div><div class='ctx'> #define PLL15						126</div><div class='add'>+#define DSI2_PIXEL_LVDS_SRC				127</div><div class='add'>+#define LVDS_CLK					128</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,mmcc-sdm660.h b/include/dt-bindings/clock/qcom,mmcc-sdm660.h<br/>index f9dbc21cb5c7..ee2a89dae72d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,mmcc-sdm660.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,mmcc-sdm660.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,mmcc-sdm660.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,mmcc-sdm660.h</a></div><div class='hunk'>@@ -157,6 +157,7 @@</div><div class='ctx'> #define BIMC_SMMU_GDSC							7</div><div class='ctx'> </div><div class='ctx'> #define CAMSS_MICRO_BCR				 0</div><div class='add'>+#define MDSS_BCR				1</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qca8k-nsscc.h b/include/dt-bindings/clock/qcom,qca8k-nsscc.h<br/>new file mode 100644<br/>index 000000000000..0ac3e4c69a1a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qca8k-nsscc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qca8k-nsscc.h</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_QCA8K_NSS_CC_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_QCA8K_NSS_CC_H</div><div class='add'>+</div><div class='add'>+#define NSS_CC_SWITCH_CORE_CLK_SRC				0</div><div class='add'>+#define NSS_CC_SWITCH_CORE_CLK					1</div><div class='add'>+#define NSS_CC_APB_BRIDGE_CLK					2</div><div class='add'>+#define NSS_CC_MAC0_TX_CLK_SRC					3</div><div class='add'>+#define NSS_CC_MAC0_TX_DIV_CLK_SRC				4</div><div class='add'>+#define NSS_CC_MAC0_TX_CLK					5</div><div class='add'>+#define NSS_CC_MAC0_TX_SRDS1_CLK				6</div><div class='add'>+#define NSS_CC_MAC0_RX_CLK_SRC					7</div><div class='add'>+#define NSS_CC_MAC0_RX_DIV_CLK_SRC				8</div><div class='add'>+#define NSS_CC_MAC0_RX_CLK					9</div><div class='add'>+#define NSS_CC_MAC0_RX_SRDS1_CLK				10</div><div class='add'>+#define NSS_CC_MAC1_TX_CLK_SRC					11</div><div class='add'>+#define NSS_CC_MAC1_TX_DIV_CLK_SRC				12</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_XGMII_RX_DIV_CLK_SRC		13</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_RX_CLK				14</div><div class='add'>+#define NSS_CC_MAC1_TX_CLK					15</div><div class='add'>+#define NSS_CC_MAC1_GEPHY0_TX_CLK				16</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_XGMII_RX_CLK			17</div><div class='add'>+#define NSS_CC_MAC1_RX_CLK_SRC					18</div><div class='add'>+#define NSS_CC_MAC1_RX_DIV_CLK_SRC				19</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_XGMII_TX_DIV_CLK_SRC		20</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_TX_CLK				21</div><div class='add'>+#define NSS_CC_MAC1_RX_CLK					22</div><div class='add'>+#define NSS_CC_MAC1_GEPHY0_RX_CLK				23</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_XGMII_TX_CLK			24</div><div class='add'>+#define NSS_CC_MAC2_TX_CLK_SRC					25</div><div class='add'>+#define NSS_CC_MAC2_TX_DIV_CLK_SRC				26</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_XGMII_RX_DIV_CLK_SRC		27</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_RX_CLK				28</div><div class='add'>+#define NSS_CC_MAC2_TX_CLK					29</div><div class='add'>+#define NSS_CC_MAC2_GEPHY1_TX_CLK				30</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_XGMII_RX_CLK			31</div><div class='add'>+#define NSS_CC_MAC2_RX_CLK_SRC					32</div><div class='add'>+#define NSS_CC_MAC2_RX_DIV_CLK_SRC				33</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_XGMII_TX_DIV_CLK_SRC		34</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_TX_CLK				35</div><div class='add'>+#define NSS_CC_MAC2_RX_CLK					36</div><div class='add'>+#define NSS_CC_MAC2_GEPHY1_RX_CLK				37</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_XGMII_TX_CLK			38</div><div class='add'>+#define NSS_CC_MAC3_TX_CLK_SRC					39</div><div class='add'>+#define NSS_CC_MAC3_TX_DIV_CLK_SRC				40</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_XGMII_RX_DIV_CLK_SRC		41</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_RX_CLK				42</div><div class='add'>+#define NSS_CC_MAC3_TX_CLK					43</div><div class='add'>+#define NSS_CC_MAC3_GEPHY2_TX_CLK				44</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_XGMII_RX_CLK			45</div><div class='add'>+#define NSS_CC_MAC3_RX_CLK_SRC					46</div><div class='add'>+#define NSS_CC_MAC3_RX_DIV_CLK_SRC				47</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_XGMII_TX_DIV_CLK_SRC		48</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_TX_CLK				49</div><div class='add'>+#define NSS_CC_MAC3_RX_CLK					50</div><div class='add'>+#define NSS_CC_MAC3_GEPHY2_RX_CLK				51</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_XGMII_TX_CLK			52</div><div class='add'>+#define NSS_CC_MAC4_TX_CLK_SRC					53</div><div class='add'>+#define NSS_CC_MAC4_TX_DIV_CLK_SRC				54</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_XGMII_RX_DIV_CLK_SRC		55</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_RX_CLK				56</div><div class='add'>+#define NSS_CC_MAC4_TX_CLK					57</div><div class='add'>+#define NSS_CC_MAC4_GEPHY3_TX_CLK				58</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_XGMII_RX_CLK			59</div><div class='add'>+#define NSS_CC_MAC4_RX_CLK_SRC					60</div><div class='add'>+#define NSS_CC_MAC4_RX_DIV_CLK_SRC				61</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_XGMII_TX_DIV_CLK_SRC		62</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_TX_CLK				63</div><div class='add'>+#define NSS_CC_MAC4_RX_CLK					64</div><div class='add'>+#define NSS_CC_MAC4_GEPHY3_RX_CLK				65</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_XGMII_TX_CLK			66</div><div class='add'>+#define NSS_CC_MAC5_TX_CLK_SRC					67</div><div class='add'>+#define NSS_CC_MAC5_TX_DIV_CLK_SRC				68</div><div class='add'>+#define NSS_CC_MAC5_TX_SRDS0_CLK				69</div><div class='add'>+#define NSS_CC_MAC5_TX_CLK					70</div><div class='add'>+#define NSS_CC_MAC5_RX_CLK_SRC					71</div><div class='add'>+#define NSS_CC_MAC5_RX_DIV_CLK_SRC				72</div><div class='add'>+#define NSS_CC_MAC5_RX_SRDS0_CLK				73</div><div class='add'>+#define NSS_CC_MAC5_RX_CLK					74</div><div class='add'>+#define NSS_CC_MAC5_TX_SRDS0_CLK_SRC				75</div><div class='add'>+#define NSS_CC_MAC5_RX_SRDS0_CLK_SRC				76</div><div class='add'>+#define NSS_CC_AHB_CLK_SRC					77</div><div class='add'>+#define NSS_CC_AHB_CLK						78</div><div class='add'>+#define NSS_CC_SEC_CTRL_AHB_CLK					79</div><div class='add'>+#define NSS_CC_TLMM_CLK						80</div><div class='add'>+#define NSS_CC_TLMM_AHB_CLK					81</div><div class='add'>+#define NSS_CC_CNOC_AHB_CLK					82</div><div class='add'>+#define NSS_CC_MDIO_AHB_CLK					83</div><div class='add'>+#define NSS_CC_MDIO_MASTER_AHB_CLK				84</div><div class='add'>+#define NSS_CC_SYS_CLK_SRC					85</div><div class='add'>+#define NSS_CC_SRDS0_SYS_CLK					86</div><div class='add'>+#define NSS_CC_SRDS1_SYS_CLK					87</div><div class='add'>+#define NSS_CC_GEPHY0_SYS_CLK					88</div><div class='add'>+#define NSS_CC_GEPHY1_SYS_CLK					89</div><div class='add'>+#define NSS_CC_GEPHY2_SYS_CLK					90</div><div class='add'>+#define NSS_CC_GEPHY3_SYS_CLK					91</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcm2290-gpucc.h b/include/dt-bindings/clock/qcom,qcm2290-gpucc.h<br/>new file mode 100644<br/>index 000000000000..7c76dd05278f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcm2290-gpucc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcm2290-gpucc.h</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024, Linaro Limited</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GPU_CC_QCM2290_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GPU_CC_QCM2290_H</div><div class='add'>+</div><div class='add'>+/* GPU_CC clocks */</div><div class='add'>+#define GPU_CC_AHB_CLK			0</div><div class='add'>+#define GPU_CC_CRC_AHB_CLK		1</div><div class='add'>+#define GPU_CC_CX_GFX3D_CLK		2</div><div class='add'>+#define GPU_CC_CX_GMU_CLK		3</div><div class='add'>+#define GPU_CC_CX_SNOC_DVM_CLK		4</div><div class='add'>+#define GPU_CC_CXO_AON_CLK		5</div><div class='add'>+#define GPU_CC_CXO_CLK			6</div><div class='add'>+#define GPU_CC_GMU_CLK_SRC		7</div><div class='add'>+#define GPU_CC_GX_GFX3D_CLK		8</div><div class='add'>+#define GPU_CC_GX_GFX3D_CLK_SRC		9</div><div class='add'>+#define GPU_CC_PLL0			10</div><div class='add'>+#define GPU_CC_SLEEP_CLK		11</div><div class='add'>+#define GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK	12</div><div class='add'>+</div><div class='add'>+/* Resets */</div><div class='add'>+#define GPU_GX_BCR			0</div><div class='add'>+</div><div class='add'>+/* GDSCs */</div><div class='add'>+#define GPU_CX_GDSC			0</div><div class='add'>+#define GPU_GX_GDSC			1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcs615-camcc.h b/include/dt-bindings/clock/qcom,qcs615-camcc.h<br/>new file mode 100644<br/>index 000000000000..aec57dddc067<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcs615-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcs615-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_CAM_CC_QCS615_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_CAM_CC_QCS615_H</div><div class='add'>+</div><div class='add'>+/* CAM_CC clocks */</div><div class='add'>+#define CAM_CC_BPS_AHB_CLK					0</div><div class='add'>+#define CAM_CC_BPS_AREG_CLK					1</div><div class='add'>+#define CAM_CC_BPS_AXI_CLK					2</div><div class='add'>+#define CAM_CC_BPS_CLK						3</div><div class='add'>+#define CAM_CC_BPS_CLK_SRC					4</div><div class='add'>+#define CAM_CC_CAMNOC_ATB_CLK					5</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK					6</div><div class='add'>+#define CAM_CC_CCI_CLK						7</div><div class='add'>+#define CAM_CC_CCI_CLK_SRC					8</div><div class='add'>+#define CAM_CC_CORE_AHB_CLK					9</div><div class='add'>+#define CAM_CC_CPAS_AHB_CLK					10</div><div class='add'>+#define CAM_CC_CPHY_RX_CLK_SRC					11</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK					12</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK_SRC				13</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK					14</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK_SRC				15</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK					16</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK_SRC				17</div><div class='add'>+#define CAM_CC_CSIPHY0_CLK					18</div><div class='add'>+#define CAM_CC_CSIPHY1_CLK					19</div><div class='add'>+#define CAM_CC_CSIPHY2_CLK					20</div><div class='add'>+#define CAM_CC_FAST_AHB_CLK_SRC					21</div><div class='add'>+#define CAM_CC_ICP_ATB_CLK					22</div><div class='add'>+#define CAM_CC_ICP_CLK						23</div><div class='add'>+#define CAM_CC_ICP_CLK_SRC					24</div><div class='add'>+#define CAM_CC_ICP_CTI_CLK					25</div><div class='add'>+#define CAM_CC_ICP_TS_CLK					26</div><div class='add'>+#define CAM_CC_IFE_0_AXI_CLK					27</div><div class='add'>+#define CAM_CC_IFE_0_CLK					28</div><div class='add'>+#define CAM_CC_IFE_0_CLK_SRC					29</div><div class='add'>+#define CAM_CC_IFE_0_CPHY_RX_CLK				30</div><div class='add'>+#define CAM_CC_IFE_0_CSID_CLK					31</div><div class='add'>+#define CAM_CC_IFE_0_CSID_CLK_SRC				32</div><div class='add'>+#define CAM_CC_IFE_0_DSP_CLK					33</div><div class='add'>+#define CAM_CC_IFE_1_AXI_CLK					34</div><div class='add'>+#define CAM_CC_IFE_1_CLK					35</div><div class='add'>+#define CAM_CC_IFE_1_CLK_SRC					36</div><div class='add'>+#define CAM_CC_IFE_1_CPHY_RX_CLK				37</div><div class='add'>+#define CAM_CC_IFE_1_CSID_CLK					38</div><div class='add'>+#define CAM_CC_IFE_1_CSID_CLK_SRC				39</div><div class='add'>+#define CAM_CC_IFE_1_DSP_CLK					40</div><div class='add'>+#define CAM_CC_IFE_LITE_CLK					41</div><div class='add'>+#define CAM_CC_IFE_LITE_CLK_SRC					42</div><div class='add'>+#define CAM_CC_IFE_LITE_CPHY_RX_CLK				43</div><div class='add'>+#define CAM_CC_IFE_LITE_CSID_CLK				44</div><div class='add'>+#define CAM_CC_IFE_LITE_CSID_CLK_SRC				45</div><div class='add'>+#define CAM_CC_IPE_0_AHB_CLK					46</div><div class='add'>+#define CAM_CC_IPE_0_AREG_CLK					47</div><div class='add'>+#define CAM_CC_IPE_0_AXI_CLK					48</div><div class='add'>+#define CAM_CC_IPE_0_CLK					49</div><div class='add'>+#define CAM_CC_IPE_0_CLK_SRC					50</div><div class='add'>+#define CAM_CC_JPEG_CLK						51</div><div class='add'>+#define CAM_CC_JPEG_CLK_SRC					52</div><div class='add'>+#define CAM_CC_LRME_CLK						53</div><div class='add'>+#define CAM_CC_LRME_CLK_SRC					54</div><div class='add'>+#define CAM_CC_MCLK0_CLK					55</div><div class='add'>+#define CAM_CC_MCLK0_CLK_SRC					56</div><div class='add'>+#define CAM_CC_MCLK1_CLK					57</div><div class='add'>+#define CAM_CC_MCLK1_CLK_SRC					58</div><div class='add'>+#define CAM_CC_MCLK2_CLK					59</div><div class='add'>+#define CAM_CC_MCLK2_CLK_SRC					60</div><div class='add'>+#define CAM_CC_MCLK3_CLK					61</div><div class='add'>+#define CAM_CC_MCLK3_CLK_SRC					62</div><div class='add'>+#define CAM_CC_PLL0						63</div><div class='add'>+#define CAM_CC_PLL1						64</div><div class='add'>+#define CAM_CC_PLL2						65</div><div class='add'>+#define CAM_CC_PLL2_OUT_AUX2					66</div><div class='add'>+#define CAM_CC_PLL3						67</div><div class='add'>+#define CAM_CC_SLOW_AHB_CLK_SRC					68</div><div class='add'>+#define CAM_CC_SOC_AHB_CLK					69</div><div class='add'>+#define CAM_CC_SYS_TMR_CLK					70</div><div class='add'>+</div><div class='add'>+/* CAM_CC power domains */</div><div class='add'>+#define BPS_GDSC						0</div><div class='add'>+#define IFE_0_GDSC						1</div><div class='add'>+#define IFE_1_GDSC						2</div><div class='add'>+#define IPE_0_GDSC						3</div><div class='add'>+#define TITAN_TOP_GDSC						4</div><div class='add'>+</div><div class='add'>+/* CAM_CC resets */</div><div class='add'>+#define CAM_CC_BPS_BCR						0</div><div class='add'>+#define CAM_CC_CAMNOC_BCR					1</div><div class='add'>+#define CAM_CC_CCI_BCR						2</div><div class='add'>+#define CAM_CC_CPAS_BCR						3</div><div class='add'>+#define CAM_CC_CSI0PHY_BCR					4</div><div class='add'>+#define CAM_CC_CSI1PHY_BCR					5</div><div class='add'>+#define CAM_CC_CSI2PHY_BCR					6</div><div class='add'>+#define CAM_CC_ICP_BCR						7</div><div class='add'>+#define CAM_CC_IFE_0_BCR					8</div><div class='add'>+#define CAM_CC_IFE_1_BCR					9</div><div class='add'>+#define CAM_CC_IFE_LITE_BCR					10</div><div class='add'>+#define CAM_CC_IPE_0_BCR					11</div><div class='add'>+#define CAM_CC_JPEG_BCR						12</div><div class='add'>+#define CAM_CC_LRME_BCR						13</div><div class='add'>+#define CAM_CC_MCLK0_BCR					14</div><div class='add'>+#define CAM_CC_MCLK1_BCR					15</div><div class='add'>+#define CAM_CC_MCLK2_BCR					16</div><div class='add'>+#define CAM_CC_MCLK3_BCR					17</div><div class='add'>+#define CAM_CC_TITAN_TOP_BCR					18</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcs615-dispcc.h b/include/dt-bindings/clock/qcom,qcs615-dispcc.h<br/>new file mode 100644<br/>index 000000000000..9a29945c5762<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcs615-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcs615-dispcc.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_DISP_CC_QCS615_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_DISP_CC_QCS615_H</div><div class='add'>+</div><div class='add'>+/* DISP_CC clocks */</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK					0</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK_SRC				1</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK					2</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK_SRC				3</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_DIV_CLK_SRC				4</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_INTF_CLK				5</div><div class='add'>+#define DISP_CC_MDSS_DP_AUX_CLK					6</div><div class='add'>+#define DISP_CC_MDSS_DP_AUX_CLK_SRC				7</div><div class='add'>+#define DISP_CC_MDSS_DP_CRYPTO_CLK				8</div><div class='add'>+#define DISP_CC_MDSS_DP_CRYPTO_CLK_SRC				9</div><div class='add'>+#define DISP_CC_MDSS_DP_LINK_CLK				10</div><div class='add'>+#define DISP_CC_MDSS_DP_LINK_CLK_SRC				11</div><div class='add'>+#define DISP_CC_MDSS_DP_LINK_DIV_CLK_SRC			12</div><div class='add'>+#define DISP_CC_MDSS_DP_LINK_INTF_CLK				13</div><div class='add'>+#define DISP_CC_MDSS_DP_PIXEL1_CLK				14</div><div class='add'>+#define DISP_CC_MDSS_DP_PIXEL1_CLK_SRC				15</div><div class='add'>+#define DISP_CC_MDSS_DP_PIXEL_CLK				16</div><div class='add'>+#define DISP_CC_MDSS_DP_PIXEL_CLK_SRC				17</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK					18</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK_SRC				19</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK					20</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK_SRC				21</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT_CLK				22</div><div class='add'>+#define DISP_CC_MDSS_NON_GDSC_AHB_CLK				23</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK					24</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK_SRC				25</div><div class='add'>+#define DISP_CC_MDSS_ROT_CLK					26</div><div class='add'>+#define DISP_CC_MDSS_ROT_CLK_SRC				27</div><div class='add'>+#define DISP_CC_MDSS_RSCC_AHB_CLK				28</div><div class='add'>+#define DISP_CC_MDSS_RSCC_VSYNC_CLK				29</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK					30</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK_SRC				31</div><div class='add'>+#define DISP_CC_PLL0						32</div><div class='add'>+#define DISP_CC_XO_CLK						33</div><div class='add'>+</div><div class='add'>+/* DISP_CC power domains */</div><div class='add'>+#define MDSS_CORE_GDSC						0</div><div class='add'>+</div><div class='add'>+/* DISP_CC resets */</div><div class='add'>+#define DISP_CC_MDSS_CORE_BCR					0</div><div class='add'>+#define DISP_CC_MDSS_RSCC_BCR					1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcs615-gcc.h b/include/dt-bindings/clock/qcom,qcs615-gcc.h<br/>new file mode 100644<br/>index 000000000000..9704091636b8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcs615-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcs615-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GCC_QCS615_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GCC_QCS615_H</div><div class='add'>+</div><div class='add'>+/* GCC clocks */</div><div class='add'>+#define GPLL0_OUT_AUX2_DIV					0</div><div class='add'>+#define GPLL3_OUT_AUX2_DIV					1</div><div class='add'>+#define GPLL0							2</div><div class='add'>+#define GPLL3							3</div><div class='add'>+#define GPLL4							4</div><div class='add'>+#define GPLL6							5</div><div class='add'>+#define GPLL6_OUT_MAIN						6</div><div class='add'>+#define GPLL7							7</div><div class='add'>+#define GPLL8							8</div><div class='add'>+#define GPLL8_OUT_MAIN						9</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_CLK				10</div><div class='add'>+#define GCC_AGGRE_USB2_SEC_AXI_CLK				11</div><div class='add'>+#define GCC_AGGRE_USB3_PRIM_AXI_CLK				12</div><div class='add'>+#define GCC_AHB2PHY_EAST_CLK					13</div><div class='add'>+#define GCC_AHB2PHY_WEST_CLK					14</div><div class='add'>+#define GCC_BOOT_ROM_AHB_CLK					15</div><div class='add'>+#define GCC_CAMERA_AHB_CLK					16</div><div class='add'>+#define GCC_CAMERA_HF_AXI_CLK					17</div><div class='add'>+#define GCC_CAMERA_XO_CLK					18</div><div class='add'>+#define GCC_CE1_AHB_CLK						19</div><div class='add'>+#define GCC_CE1_AXI_CLK						20</div><div class='add'>+#define GCC_CE1_CLK						21</div><div class='add'>+#define GCC_CFG_NOC_USB2_SEC_AXI_CLK				22</div><div class='add'>+#define GCC_CFG_NOC_USB3_PRIM_AXI_CLK				23</div><div class='add'>+#define GCC_CPUSS_AHB_CLK					24</div><div class='add'>+#define GCC_CPUSS_AHB_CLK_SRC					25</div><div class='add'>+#define GCC_CPUSS_GNOC_CLK					26</div><div class='add'>+#define GCC_DDRSS_GPU_AXI_CLK					27</div><div class='add'>+#define GCC_DISP_AHB_CLK					28</div><div class='add'>+#define GCC_DISP_GPLL0_DIV_CLK_SRC				29</div><div class='add'>+#define GCC_DISP_HF_AXI_CLK					30</div><div class='add'>+#define GCC_DISP_XO_CLK						31</div><div class='add'>+#define GCC_EMAC_AXI_CLK					32</div><div class='add'>+#define GCC_EMAC_PTP_CLK					33</div><div class='add'>+#define GCC_EMAC_PTP_CLK_SRC					34</div><div class='add'>+#define GCC_EMAC_RGMII_CLK					35</div><div class='add'>+#define GCC_EMAC_RGMII_CLK_SRC					36</div><div class='add'>+#define GCC_EMAC_SLV_AHB_CLK					37</div><div class='add'>+#define GCC_GP1_CLK						38</div><div class='add'>+#define GCC_GP1_CLK_SRC						39</div><div class='add'>+#define GCC_GP2_CLK						40</div><div class='add'>+#define GCC_GP2_CLK_SRC						41</div><div class='add'>+#define GCC_GP3_CLK						42</div><div class='add'>+#define GCC_GP3_CLK_SRC						43</div><div class='add'>+#define GCC_GPU_CFG_AHB_CLK					44</div><div class='add'>+#define GCC_GPU_GPLL0_CLK_SRC					45</div><div class='add'>+#define GCC_GPU_GPLL0_DIV_CLK_SRC				46</div><div class='add'>+#define GCC_GPU_IREF_CLK					47</div><div class='add'>+#define GCC_GPU_MEMNOC_GFX_CLK					48</div><div class='add'>+#define GCC_GPU_SNOC_DVM_GFX_CLK				49</div><div class='add'>+#define GCC_PCIE0_PHY_REFGEN_CLK				50</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK					51</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK_SRC					52</div><div class='add'>+#define GCC_PCIE_0_CFG_AHB_CLK					53</div><div class='add'>+#define GCC_PCIE_0_CLKREF_CLK					54</div><div class='add'>+#define GCC_PCIE_0_MSTR_AXI_CLK					55</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK					56</div><div class='add'>+#define GCC_PCIE_0_SLV_AXI_CLK					57</div><div class='add'>+#define GCC_PCIE_0_SLV_Q2A_AXI_CLK				58</div><div class='add'>+#define GCC_PCIE_PHY_AUX_CLK					59</div><div class='add'>+#define GCC_PCIE_PHY_REFGEN_CLK_SRC				60</div><div class='add'>+#define GCC_PDM2_CLK						61</div><div class='add'>+#define GCC_PDM2_CLK_SRC					62</div><div class='add'>+#define GCC_PDM_AHB_CLK						63</div><div class='add'>+#define GCC_PDM_XO4_CLK						64</div><div class='add'>+#define GCC_PRNG_AHB_CLK					65</div><div class='add'>+#define GCC_QMIP_CAMERA_NRT_AHB_CLK				66</div><div class='add'>+#define GCC_QMIP_DISP_AHB_CLK					67</div><div class='add'>+#define GCC_QMIP_PCIE_AHB_CLK					68</div><div class='add'>+#define GCC_QMIP_VIDEO_VCODEC_AHB_CLK				69</div><div class='add'>+#define GCC_QSPI_CNOC_PERIPH_AHB_CLK				70</div><div class='add'>+#define GCC_QSPI_CORE_CLK					71</div><div class='add'>+#define GCC_QSPI_CORE_CLK_SRC					72</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_2X_CLK				73</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_CLK				74</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK					75</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK_SRC				76</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK					77</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK_SRC				78</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK					79</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK_SRC				80</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK					81</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK_SRC				82</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK					83</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK_SRC				84</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK					85</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK_SRC				86</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_2X_CLK				87</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_CLK				88</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK					89</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK_SRC				90</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK					91</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK_SRC				92</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK					93</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK_SRC				94</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK					95</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK_SRC				96</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK					97</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK_SRC				98</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK					99</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK_SRC				100</div><div class='add'>+#define GCC_QUPV3_WRAP_0_M_AHB_CLK				101</div><div class='add'>+#define GCC_QUPV3_WRAP_0_S_AHB_CLK				102</div><div class='add'>+#define GCC_QUPV3_WRAP_1_M_AHB_CLK				103</div><div class='add'>+#define GCC_QUPV3_WRAP_1_S_AHB_CLK				104</div><div class='add'>+#define GCC_RX1_USB2_CLKREF_CLK					105</div><div class='add'>+#define GCC_RX3_USB2_CLKREF_CLK					106</div><div class='add'>+#define GCC_SDCC1_AHB_CLK					107</div><div class='add'>+#define GCC_SDCC1_APPS_CLK					108</div><div class='add'>+#define GCC_SDCC1_APPS_CLK_SRC					109</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK					110</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK_SRC				111</div><div class='add'>+#define GCC_SDCC2_AHB_CLK					112</div><div class='add'>+#define GCC_SDCC2_APPS_CLK					113</div><div class='add'>+#define GCC_SDCC2_APPS_CLK_SRC					114</div><div class='add'>+#define GCC_SDR_CORE_CLK					115</div><div class='add'>+#define GCC_SDR_CSR_HCLK					116</div><div class='add'>+#define GCC_SDR_PRI_MI2S_CLK					117</div><div class='add'>+#define GCC_SDR_SEC_MI2S_CLK					118</div><div class='add'>+#define GCC_SDR_WR0_MEM_CLK					119</div><div class='add'>+#define GCC_SDR_WR1_MEM_CLK					120</div><div class='add'>+#define GCC_SDR_WR2_MEM_CLK					121</div><div class='add'>+#define GCC_SYS_NOC_CPUSS_AHB_CLK				122</div><div class='add'>+#define GCC_UFS_CARD_CLKREF_CLK					123</div><div class='add'>+#define GCC_UFS_MEM_CLKREF_CLK					124</div><div class='add'>+#define GCC_UFS_PHY_AHB_CLK					125</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK					126</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK_SRC					127</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK				128</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK_SRC				129</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK					130</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK_SRC				131</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK				132</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK				133</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK				134</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK_SRC				135</div><div class='add'>+#define GCC_USB20_SEC_MASTER_CLK				136</div><div class='add'>+#define GCC_USB20_SEC_MASTER_CLK_SRC				137</div><div class='add'>+#define GCC_USB20_SEC_MOCK_UTMI_CLK				138</div><div class='add'>+#define GCC_USB20_SEC_MOCK_UTMI_CLK_SRC				139</div><div class='add'>+#define GCC_USB20_SEC_SLEEP_CLK					140</div><div class='add'>+#define GCC_USB2_PRIM_CLKREF_CLK				141</div><div class='add'>+#define GCC_USB2_SEC_CLKREF_CLK					142</div><div class='add'>+#define GCC_USB2_SEC_PHY_AUX_CLK				143</div><div class='add'>+#define GCC_USB2_SEC_PHY_AUX_CLK_SRC				144</div><div class='add'>+#define GCC_USB2_SEC_PHY_COM_AUX_CLK				145</div><div class='add'>+#define GCC_USB2_SEC_PHY_PIPE_CLK				146</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK				147</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK_SRC				148</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK				149</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC			150</div><div class='add'>+#define GCC_USB30_PRIM_SLEEP_CLK				151</div><div class='add'>+#define GCC_USB3_PRIM_CLKREF_CLK				152</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK				153</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK_SRC				154</div><div class='add'>+#define GCC_USB3_PRIM_PHY_COM_AUX_CLK				155</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK				156</div><div class='add'>+#define GCC_USB3_SEC_CLKREF_CLK					157</div><div class='add'>+#define GCC_VIDEO_AHB_CLK					158</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK					159</div><div class='add'>+#define GCC_VIDEO_XO_CLK					160</div><div class='add'>+#define GCC_VSENSOR_CLK_SRC					161</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_HW_CTL_CLK			162</div><div class='add'>+#define GCC_UFS_PHY_AXI_HW_CTL_CLK				163</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_HW_CTL_CLK				164</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_HW_CTL_CLK				165</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_HW_CTL_CLK			166</div><div class='add'>+</div><div class='add'>+/* GCC Resets */</div><div class='add'>+#define GCC_EMAC_BCR                                            0</div><div class='add'>+#define GCC_QUSB2PHY_PRIM_BCR                                   1</div><div class='add'>+#define GCC_QUSB2PHY_SEC_BCR                                    2</div><div class='add'>+#define GCC_USB30_PRIM_BCR                                      3</div><div class='add'>+#define GCC_USB2_PHY_SEC_BCR                                    4</div><div class='add'>+#define GCC_USB3_DP_PHY_SEC_BCR                                 5</div><div class='add'>+#define GCC_USB3PHY_PHY_SEC_BCR                                 6</div><div class='add'>+#define GCC_PCIE_0_BCR                                          7</div><div class='add'>+#define GCC_PCIE_0_PHY_BCR                                      8</div><div class='add'>+#define GCC_PCIE_PHY_BCR                                        9</div><div class='add'>+#define GCC_PCIE_PHY_COM_BCR                                    10</div><div class='add'>+#define GCC_UFS_PHY_BCR                                         11</div><div class='add'>+#define GCC_USB20_SEC_BCR                                       12</div><div class='add'>+#define GCC_USB3_PHY_PRIM_SP0_BCR                               13</div><div class='add'>+#define GCC_USB3PHY_PHY_PRIM_SP0_BCR                            14</div><div class='add'>+#define GCC_SDCC1_BCR                                           15</div><div class='add'>+#define GCC_SDCC2_BCR                                           16</div><div class='add'>+</div><div class='add'>+/* GCC power domains */</div><div class='add'>+#define EMAC_GDSC						0</div><div class='add'>+#define PCIE_0_GDSC						1</div><div class='add'>+#define UFS_PHY_GDSC						2</div><div class='add'>+#define USB20_SEC_GDSC						3</div><div class='add'>+#define USB30_PRIM_GDSC						4</div><div class='add'>+#define HLOS1_VOTE_AGGRE_NOC_MMU_AUDIO_TBU_GDSC			5</div><div class='add'>+#define HLOS1_VOTE_AGGRE_NOC_MMU_TBU1_GDSC			6</div><div class='add'>+#define HLOS1_VOTE_AGGRE_NOC_MMU_TBU2_GDSC			7</div><div class='add'>+#define HLOS1_VOTE_AGGRE_NOC_MMU_PCIE_TBU_GDSC			8</div><div class='add'>+#define HLOS1_VOTE_MMNOC_MMU_TBU_HF0_GDSC			9</div><div class='add'>+#define HLOS1_VOTE_MMNOC_MMU_TBU_SF_GDSC			10</div><div class='add'>+#define HLOS1_VOTE_MMNOC_MMU_TBU_HF1_GDSC			11</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcs615-gpucc.h b/include/dt-bindings/clock/qcom,qcs615-gpucc.h<br/>new file mode 100644<br/>index 000000000000..6d8394b90d59<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcs615-gpucc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcs615-gpucc.h</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GPU_CC_QCS615_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GPU_CC_QCS615_H</div><div class='add'>+</div><div class='add'>+/* GPU_CC clocks */</div><div class='add'>+#define CRC_DIV_PLL0						0</div><div class='add'>+#define CRC_DIV_PLL1						1</div><div class='add'>+#define GPU_CC_PLL0						2</div><div class='add'>+#define GPU_CC_PLL1						3</div><div class='add'>+#define GPU_CC_CRC_AHB_CLK					4</div><div class='add'>+#define GPU_CC_CX_GFX3D_CLK					5</div><div class='add'>+#define GPU_CC_CX_GFX3D_SLV_CLK					6</div><div class='add'>+#define GPU_CC_CX_GMU_CLK					7</div><div class='add'>+#define GPU_CC_CX_SNOC_DVM_CLK					8</div><div class='add'>+#define GPU_CC_CXO_AON_CLK					9</div><div class='add'>+#define GPU_CC_CXO_CLK						10</div><div class='add'>+#define GPU_CC_GMU_CLK_SRC					11</div><div class='add'>+#define GPU_CC_GX_GFX3D_CLK					12</div><div class='add'>+#define GPU_CC_GX_GFX3D_CLK_SRC					13</div><div class='add'>+#define GPU_CC_GX_GMU_CLK					14</div><div class='add'>+#define GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK				15</div><div class='add'>+#define GPU_CC_SLEEP_CLK					16</div><div class='add'>+</div><div class='add'>+/* GPU_CC power domains */</div><div class='add'>+#define CX_GDSC							0</div><div class='add'>+#define GX_GDSC							1</div><div class='add'>+</div><div class='add'>+/* GPU_CC resets */</div><div class='add'>+#define GPU_CC_CX_BCR						0</div><div class='add'>+#define GPU_CC_GFX3D_AON_BCR					1</div><div class='add'>+#define GPU_CC_GMU_BCR						2</div><div class='add'>+#define GPU_CC_GX_BCR						3</div><div class='add'>+#define GPU_CC_XO_BCR						4</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcs615-videocc.h b/include/dt-bindings/clock/qcom,qcs615-videocc.h<br/>new file mode 100644<br/>index 000000000000..0ca3efb21103<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcs615-videocc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcs615-videocc.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_VIDEO_CC_QCS615_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_VIDEO_CC_QCS615_H</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC clocks */</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK					0</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK_SRC					1</div><div class='add'>+#define VIDEO_CC_VCODEC0_AXI_CLK				2</div><div class='add'>+#define VIDEO_CC_VCODEC0_CORE_CLK				3</div><div class='add'>+#define VIDEO_CC_VENUS_AHB_CLK					4</div><div class='add'>+#define VIDEO_CC_VENUS_CLK_SRC					5</div><div class='add'>+#define VIDEO_CC_VENUS_CTL_AXI_CLK				6</div><div class='add'>+#define VIDEO_CC_VENUS_CTL_CORE_CLK				7</div><div class='add'>+#define VIDEO_CC_XO_CLK						8</div><div class='add'>+#define VIDEO_PLL0						9</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC power domains */</div><div class='add'>+#define VCODEC0_GDSC						0</div><div class='add'>+#define VENUS_GDSC						1</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC resets */</div><div class='add'>+#define VIDEO_CC_INTERFACE_BCR					0</div><div class='add'>+#define VIDEO_CC_VCODEC0_BCR					1</div><div class='add'>+#define VIDEO_CC_VENUS_BCR					2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcs8300-camcc.h b/include/dt-bindings/clock/qcom,qcs8300-camcc.h<br/>new file mode 100644<br/>index 000000000000..fc535c847859<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcs8300-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcs8300-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_QCS8300_CAM_CC_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_QCS8300_CAM_CC_H</div><div class='add'>+</div><div class='add'>+#include "qcom,sa8775p-camcc.h"</div><div class='add'>+</div><div class='add'>+/* QCS8300 introduces below new clocks compared to SA8775P */</div><div class='add'>+</div><div class='add'>+/* CAM_CC clocks */</div><div class='add'>+#define CAM_CC_TITAN_TOP_ACCU_SHIFT_CLK				86</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcs8300-gcc.h b/include/dt-bindings/clock/qcom,qcs8300-gcc.h<br/>new file mode 100644<br/>index 000000000000..a0083b1d2126<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcs8300-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcs8300-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,234 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GCC_QCS8300_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GCC_QCS8300_H</div><div class='add'>+</div><div class='add'>+/* GCC clocks */</div><div class='add'>+#define GCC_GPLL0						0</div><div class='add'>+#define GCC_GPLL0_OUT_EVEN					1</div><div class='add'>+#define GCC_GPLL1						2</div><div class='add'>+#define GCC_GPLL4						3</div><div class='add'>+#define GCC_GPLL7						4</div><div class='add'>+#define GCC_GPLL9						5</div><div class='add'>+#define GCC_AGGRE_NOC_QUPV3_AXI_CLK				6</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_CLK				7</div><div class='add'>+#define GCC_AGGRE_USB2_PRIM_AXI_CLK				8</div><div class='add'>+#define GCC_AGGRE_USB3_PRIM_AXI_CLK				9</div><div class='add'>+#define GCC_AHB2PHY0_CLK					10</div><div class='add'>+#define GCC_AHB2PHY2_CLK					11</div><div class='add'>+#define GCC_AHB2PHY3_CLK					12</div><div class='add'>+#define GCC_BOOT_ROM_AHB_CLK					13</div><div class='add'>+#define GCC_CAMERA_AHB_CLK					14</div><div class='add'>+#define GCC_CAMERA_HF_AXI_CLK					15</div><div class='add'>+#define GCC_CAMERA_SF_AXI_CLK					16</div><div class='add'>+#define GCC_CAMERA_THROTTLE_XO_CLK				17</div><div class='add'>+#define GCC_CAMERA_XO_CLK					18</div><div class='add'>+#define GCC_CFG_NOC_USB2_PRIM_AXI_CLK				19</div><div class='add'>+#define GCC_CFG_NOC_USB3_PRIM_AXI_CLK				20</div><div class='add'>+#define GCC_DDRSS_GPU_AXI_CLK					21</div><div class='add'>+#define GCC_DISP_AHB_CLK					22</div><div class='add'>+#define GCC_DISP_HF_AXI_CLK					23</div><div class='add'>+#define GCC_DISP_XO_CLK						24</div><div class='add'>+#define GCC_EDP_REF_CLKREF_EN					25</div><div class='add'>+#define GCC_EMAC0_AXI_CLK					26</div><div class='add'>+#define GCC_EMAC0_PHY_AUX_CLK					27</div><div class='add'>+#define GCC_EMAC0_PHY_AUX_CLK_SRC				28</div><div class='add'>+#define GCC_EMAC0_PTP_CLK					29</div><div class='add'>+#define GCC_EMAC0_PTP_CLK_SRC					30</div><div class='add'>+#define GCC_EMAC0_RGMII_CLK					31</div><div class='add'>+#define GCC_EMAC0_RGMII_CLK_SRC					32</div><div class='add'>+#define GCC_EMAC0_SLV_AHB_CLK					33</div><div class='add'>+#define GCC_GP1_CLK						34</div><div class='add'>+#define GCC_GP1_CLK_SRC						35</div><div class='add'>+#define GCC_GP2_CLK						36</div><div class='add'>+#define GCC_GP2_CLK_SRC						37</div><div class='add'>+#define GCC_GP3_CLK						38</div><div class='add'>+#define GCC_GP3_CLK_SRC						39</div><div class='add'>+#define GCC_GP4_CLK						40</div><div class='add'>+#define GCC_GP4_CLK_SRC						41</div><div class='add'>+#define GCC_GP5_CLK						42</div><div class='add'>+#define GCC_GP5_CLK_SRC						43</div><div class='add'>+#define GCC_GPU_CFG_AHB_CLK					44</div><div class='add'>+#define GCC_GPU_GPLL0_CLK_SRC					45</div><div class='add'>+#define GCC_GPU_GPLL0_DIV_CLK_SRC				46</div><div class='add'>+#define GCC_GPU_MEMNOC_GFX_CENTER_PIPELINE_CLK			47</div><div class='add'>+#define GCC_GPU_MEMNOC_GFX_CLK					48</div><div class='add'>+#define GCC_GPU_SNOC_DVM_GFX_CLK				49</div><div class='add'>+#define GCC_GPU_TCU_THROTTLE_AHB_CLK				50</div><div class='add'>+#define GCC_GPU_TCU_THROTTLE_CLK				51</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK					52</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK_SRC					53</div><div class='add'>+#define GCC_PCIE_0_CFG_AHB_CLK					54</div><div class='add'>+#define GCC_PCIE_0_MSTR_AXI_CLK					55</div><div class='add'>+#define GCC_PCIE_0_PHY_AUX_CLK					56</div><div class='add'>+#define GCC_PCIE_0_PHY_AUX_CLK_SRC				57</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK				58</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK_SRC				59</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK					60</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK_SRC					61</div><div class='add'>+#define GCC_PCIE_0_PIPE_DIV_CLK_SRC				62</div><div class='add'>+#define GCC_PCIE_0_PIPEDIV2_CLK					63</div><div class='add'>+#define GCC_PCIE_0_SLV_AXI_CLK					64</div><div class='add'>+#define GCC_PCIE_0_SLV_Q2A_AXI_CLK				65</div><div class='add'>+#define GCC_PCIE_1_AUX_CLK					66</div><div class='add'>+#define GCC_PCIE_1_AUX_CLK_SRC					67</div><div class='add'>+#define GCC_PCIE_1_CFG_AHB_CLK					68</div><div class='add'>+#define GCC_PCIE_1_MSTR_AXI_CLK					69</div><div class='add'>+#define GCC_PCIE_1_PHY_AUX_CLK					70</div><div class='add'>+#define GCC_PCIE_1_PHY_AUX_CLK_SRC				71</div><div class='add'>+#define GCC_PCIE_1_PHY_RCHNG_CLK				72</div><div class='add'>+#define GCC_PCIE_1_PHY_RCHNG_CLK_SRC				73</div><div class='add'>+#define GCC_PCIE_1_PIPE_CLK					74</div><div class='add'>+#define GCC_PCIE_1_PIPE_CLK_SRC					75</div><div class='add'>+#define GCC_PCIE_1_PIPE_DIV_CLK_SRC				76</div><div class='add'>+#define GCC_PCIE_1_PIPEDIV2_CLK					77</div><div class='add'>+#define GCC_PCIE_1_SLV_AXI_CLK					78</div><div class='add'>+#define GCC_PCIE_1_SLV_Q2A_AXI_CLK				79</div><div class='add'>+#define GCC_PCIE_CLKREF_EN					80</div><div class='add'>+#define GCC_PCIE_THROTTLE_CFG_CLK				81</div><div class='add'>+#define GCC_PDM2_CLK						82</div><div class='add'>+#define GCC_PDM2_CLK_SRC					83</div><div class='add'>+#define GCC_PDM_AHB_CLK						84</div><div class='add'>+#define GCC_PDM_XO4_CLK						85</div><div class='add'>+#define GCC_QMIP_CAMERA_NRT_AHB_CLK				86</div><div class='add'>+#define GCC_QMIP_CAMERA_RT_AHB_CLK				87</div><div class='add'>+#define GCC_QMIP_DISP_AHB_CLK					88</div><div class='add'>+#define GCC_QMIP_DISP_ROT_AHB_CLK				89</div><div class='add'>+#define GCC_QMIP_VIDEO_CVP_AHB_CLK				90</div><div class='add'>+#define GCC_QMIP_VIDEO_VCODEC_AHB_CLK				91</div><div class='add'>+#define GCC_QMIP_VIDEO_VCPU_AHB_CLK				92</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_2X_CLK				93</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_CLK				94</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK					95</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK_SRC				96</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK					97</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK_SRC				98</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK					99</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK_SRC				100</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK					101</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK_SRC				102</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK					103</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK_SRC				104</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK					105</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK_SRC				106</div><div class='add'>+#define GCC_QUPV3_WRAP0_S6_CLK					107</div><div class='add'>+#define GCC_QUPV3_WRAP0_S6_CLK_SRC				108</div><div class='add'>+#define GCC_QUPV3_WRAP0_S7_CLK					109</div><div class='add'>+#define GCC_QUPV3_WRAP0_S7_CLK_SRC				110</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_2X_CLK				111</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_CLK				112</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK					113</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK_SRC				114</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK					115</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK_SRC				116</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK					117</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK_SRC				118</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK					119</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK_SRC				120</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK					121</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK_SRC				122</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK					123</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK_SRC				124</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK					125</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK_SRC				126</div><div class='add'>+#define GCC_QUPV3_WRAP1_S7_CLK					127</div><div class='add'>+#define GCC_QUPV3_WRAP1_S7_CLK_SRC				128</div><div class='add'>+#define GCC_QUPV3_WRAP3_CORE_2X_CLK				129</div><div class='add'>+#define GCC_QUPV3_WRAP3_CORE_CLK				130</div><div class='add'>+#define GCC_QUPV3_WRAP3_QSPI_CLK				131</div><div class='add'>+#define GCC_QUPV3_WRAP3_S0_CLK					132</div><div class='add'>+#define GCC_QUPV3_WRAP3_S0_CLK_SRC				133</div><div class='add'>+#define GCC_QUPV3_WRAP3_S0_DIV_CLK_SRC				134</div><div class='add'>+#define GCC_QUPV3_WRAP_0_M_AHB_CLK				135</div><div class='add'>+#define GCC_QUPV3_WRAP_0_S_AHB_CLK				136</div><div class='add'>+#define GCC_QUPV3_WRAP_1_M_AHB_CLK				137</div><div class='add'>+#define GCC_QUPV3_WRAP_1_S_AHB_CLK				138</div><div class='add'>+#define GCC_QUPV3_WRAP_3_M_AHB_CLK				139</div><div class='add'>+#define GCC_QUPV3_WRAP_3_S_AHB_CLK				140</div><div class='add'>+#define GCC_SDCC1_AHB_CLK					141</div><div class='add'>+#define GCC_SDCC1_APPS_CLK					142</div><div class='add'>+#define GCC_SDCC1_APPS_CLK_SRC					143</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK					144</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK_SRC				145</div><div class='add'>+#define GCC_SGMI_CLKREF_EN					146</div><div class='add'>+#define GCC_UFS_PHY_AHB_CLK					147</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK					148</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK_SRC					149</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK				150</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK_SRC				151</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK					152</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK_SRC				153</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK				154</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK_SRC				155</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK				156</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK_SRC				157</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK				158</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK_SRC				159</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK				160</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK_SRC				161</div><div class='add'>+#define GCC_USB20_MASTER_CLK					162</div><div class='add'>+#define GCC_USB20_MASTER_CLK_SRC				163</div><div class='add'>+#define GCC_USB20_MOCK_UTMI_CLK					164</div><div class='add'>+#define GCC_USB20_MOCK_UTMI_CLK_SRC				165</div><div class='add'>+#define GCC_USB20_MOCK_UTMI_POSTDIV_CLK_SRC			166</div><div class='add'>+#define GCC_USB20_SLEEP_CLK					167</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK				168</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK_SRC				169</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK				170</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC			171</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_POSTDIV_CLK_SRC		172</div><div class='add'>+#define GCC_USB30_PRIM_SLEEP_CLK				173</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK				174</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK_SRC				175</div><div class='add'>+#define GCC_USB3_PRIM_PHY_COM_AUX_CLK				176</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK				177</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK_SRC				178</div><div class='add'>+#define GCC_USB_CLKREF_EN					179</div><div class='add'>+#define GCC_VIDEO_AHB_CLK					180</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK					181</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK					182</div><div class='add'>+#define GCC_VIDEO_XO_CLK					183</div><div class='add'>+</div><div class='add'>+/* GCC power domains */</div><div class='add'>+#define GCC_EMAC0_GDSC						0</div><div class='add'>+#define GCC_PCIE_0_GDSC						1</div><div class='add'>+#define GCC_PCIE_1_GDSC						2</div><div class='add'>+#define GCC_UFS_PHY_GDSC					3</div><div class='add'>+#define GCC_USB20_PRIM_GDSC					4</div><div class='add'>+#define GCC_USB30_PRIM_GDSC					5</div><div class='add'>+</div><div class='add'>+/* GCC resets */</div><div class='add'>+#define GCC_EMAC0_BCR						0</div><div class='add'>+#define GCC_PCIE_0_BCR						1</div><div class='add'>+#define GCC_PCIE_0_LINK_DOWN_BCR				2</div><div class='add'>+#define GCC_PCIE_0_NOCSR_COM_PHY_BCR				3</div><div class='add'>+#define GCC_PCIE_0_PHY_BCR					4</div><div class='add'>+#define GCC_PCIE_0_PHY_NOCSR_COM_PHY_BCR			5</div><div class='add'>+#define GCC_PCIE_1_BCR						6</div><div class='add'>+#define GCC_PCIE_1_LINK_DOWN_BCR				7</div><div class='add'>+#define GCC_PCIE_1_NOCSR_COM_PHY_BCR				8</div><div class='add'>+#define GCC_PCIE_1_PHY_BCR					9</div><div class='add'>+#define GCC_PCIE_1_PHY_NOCSR_COM_PHY_BCR			10</div><div class='add'>+#define GCC_SDCC1_BCR						11</div><div class='add'>+#define GCC_UFS_PHY_BCR						12</div><div class='add'>+#define GCC_USB20_PRIM_BCR					13</div><div class='add'>+#define GCC_USB2_PHY_PRIM_BCR					14</div><div class='add'>+#define GCC_USB2_PHY_SEC_BCR					15</div><div class='add'>+#define GCC_USB30_PRIM_BCR					16</div><div class='add'>+#define GCC_USB3_DP_PHY_PRIM_BCR				17</div><div class='add'>+#define GCC_USB3_PHY_PRIM_BCR					18</div><div class='add'>+#define GCC_USB3_PHY_TERT_BCR					19</div><div class='add'>+#define GCC_USB3_UNIPHY_MP0_BCR					20</div><div class='add'>+#define GCC_USB3_UNIPHY_MP1_BCR					21</div><div class='add'>+#define GCC_USB3PHY_PHY_PRIM_BCR				22</div><div class='add'>+#define GCC_USB3UNIPHY_PHY_MP0_BCR				23</div><div class='add'>+#define GCC_USB3UNIPHY_PHY_MP1_BCR				24</div><div class='add'>+#define GCC_USB_PHY_CFG_AHB2PHY_BCR				25</div><div class='add'>+#define GCC_VIDEO_BCR						26</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK_ARES					27</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK_ARES					28</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,qcs8300-gpucc.h b/include/dt-bindings/clock/qcom,qcs8300-gpucc.h<br/>new file mode 100644<br/>index 000000000000..afa187467b4c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,qcs8300-gpucc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,qcs8300-gpucc.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GPUCC_QCS8300_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GPUCC_QCS8300_H</div><div class='add'>+</div><div class='add'>+#include "qcom,sa8775p-gpucc.h"</div><div class='add'>+</div><div class='add'>+/* QCS8300 introduces below new clocks compared to SA8775P */</div><div class='add'>+</div><div class='add'>+/* GPU_CC clocks */</div><div class='add'>+#define GPU_CC_CX_ACCU_SHIFT_CLK		23</div><div class='add'>+#define GPU_CC_GX_ACCU_SHIFT_CLK		24</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,rpmcc.h b/include/dt-bindings/clock/qcom,rpmcc.h<br/>index 46309c9953b2..1477a75e7f6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,rpmcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,rpmcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,rpmcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,rpmcc.h</a></div><div class='hunk'>@@ -170,5 +170,9 @@</div><div class='ctx'> #define RPM_SMD_BIMC_FREQ_LOG			124</div><div class='ctx'> #define RPM_SMD_LN_BB_CLK_PIN			125</div><div class='ctx'> #define RPM_SMD_LN_BB_A_CLK_PIN			126</div><div class='add'>+#define RPM_SMD_BB_CLK3				127</div><div class='add'>+#define RPM_SMD_BB_CLK3_A			128</div><div class='add'>+#define RPM_SMD_BB_CLK3_PIN			129</div><div class='add'>+#define RPM_SMD_BB_CLK3_A_PIN			130</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sa8775p-camcc.h b/include/dt-bindings/clock/qcom,sa8775p-camcc.h<br/>new file mode 100644<br/>index 000000000000..38531acd699f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sa8775p-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sa8775p-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_SA8775P_CAM_CC_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_SA8775P_CAM_CC_H</div><div class='add'>+</div><div class='add'>+/* CAM_CC clocks */</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK					0</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK_SRC				1</div><div class='add'>+#define CAM_CC_CAMNOC_DCD_XO_CLK				2</div><div class='add'>+#define CAM_CC_CAMNOC_XO_CLK					3</div><div class='add'>+#define CAM_CC_CCI_0_CLK					4</div><div class='add'>+#define CAM_CC_CCI_0_CLK_SRC					5</div><div class='add'>+#define CAM_CC_CCI_1_CLK					6</div><div class='add'>+#define CAM_CC_CCI_1_CLK_SRC					7</div><div class='add'>+#define CAM_CC_CCI_2_CLK					8</div><div class='add'>+#define CAM_CC_CCI_2_CLK_SRC					9</div><div class='add'>+#define CAM_CC_CCI_3_CLK					10</div><div class='add'>+#define CAM_CC_CCI_3_CLK_SRC					11</div><div class='add'>+#define CAM_CC_CORE_AHB_CLK					12</div><div class='add'>+#define CAM_CC_CPAS_AHB_CLK					13</div><div class='add'>+#define CAM_CC_CPAS_FAST_AHB_CLK				14</div><div class='add'>+#define CAM_CC_CPAS_IFE_0_CLK					15</div><div class='add'>+#define CAM_CC_CPAS_IFE_1_CLK					16</div><div class='add'>+#define CAM_CC_CPAS_IFE_LITE_CLK				17</div><div class='add'>+#define CAM_CC_CPAS_IPE_CLK					18</div><div class='add'>+#define CAM_CC_CPAS_SFE_LITE_0_CLK				19</div><div class='add'>+#define CAM_CC_CPAS_SFE_LITE_1_CLK				20</div><div class='add'>+#define CAM_CC_CPHY_RX_CLK_SRC					21</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK					22</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK_SRC				23</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK					24</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK_SRC				25</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK					26</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK_SRC				27</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK					28</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK_SRC				29</div><div class='add'>+#define CAM_CC_CSID_CLK						30</div><div class='add'>+#define CAM_CC_CSID_CLK_SRC					31</div><div class='add'>+#define CAM_CC_CSID_CSIPHY_RX_CLK				32</div><div class='add'>+#define CAM_CC_CSIPHY0_CLK					33</div><div class='add'>+#define CAM_CC_CSIPHY1_CLK					34</div><div class='add'>+#define CAM_CC_CSIPHY2_CLK					35</div><div class='add'>+#define CAM_CC_CSIPHY3_CLK					36</div><div class='add'>+#define CAM_CC_FAST_AHB_CLK_SRC					37</div><div class='add'>+#define CAM_CC_GDSC_CLK						38</div><div class='add'>+#define CAM_CC_ICP_AHB_CLK					39</div><div class='add'>+#define CAM_CC_ICP_CLK						40</div><div class='add'>+#define CAM_CC_ICP_CLK_SRC					41</div><div class='add'>+#define CAM_CC_IFE_0_CLK					42</div><div class='add'>+#define CAM_CC_IFE_0_CLK_SRC					43</div><div class='add'>+#define CAM_CC_IFE_0_FAST_AHB_CLK				44</div><div class='add'>+#define CAM_CC_IFE_1_CLK					45</div><div class='add'>+#define CAM_CC_IFE_1_CLK_SRC					46</div><div class='add'>+#define CAM_CC_IFE_1_FAST_AHB_CLK				47</div><div class='add'>+#define CAM_CC_IFE_LITE_AHB_CLK					48</div><div class='add'>+#define CAM_CC_IFE_LITE_CLK					49</div><div class='add'>+#define CAM_CC_IFE_LITE_CLK_SRC					50</div><div class='add'>+#define CAM_CC_IFE_LITE_CPHY_RX_CLK				51</div><div class='add'>+#define CAM_CC_IFE_LITE_CSID_CLK				52</div><div class='add'>+#define CAM_CC_IFE_LITE_CSID_CLK_SRC				53</div><div class='add'>+#define CAM_CC_IPE_AHB_CLK					54</div><div class='add'>+#define CAM_CC_IPE_CLK						55</div><div class='add'>+#define CAM_CC_IPE_CLK_SRC					56</div><div class='add'>+#define CAM_CC_IPE_FAST_AHB_CLK					57</div><div class='add'>+#define CAM_CC_MCLK0_CLK					58</div><div class='add'>+#define CAM_CC_MCLK0_CLK_SRC					59</div><div class='add'>+#define CAM_CC_MCLK1_CLK					60</div><div class='add'>+#define CAM_CC_MCLK1_CLK_SRC					61</div><div class='add'>+#define CAM_CC_MCLK2_CLK					62</div><div class='add'>+#define CAM_CC_MCLK2_CLK_SRC					63</div><div class='add'>+#define CAM_CC_MCLK3_CLK					64</div><div class='add'>+#define CAM_CC_MCLK3_CLK_SRC					65</div><div class='add'>+#define CAM_CC_PLL0						66</div><div class='add'>+#define CAM_CC_PLL0_OUT_EVEN					67</div><div class='add'>+#define CAM_CC_PLL0_OUT_ODD					68</div><div class='add'>+#define CAM_CC_PLL2						69</div><div class='add'>+#define CAM_CC_PLL3						70</div><div class='add'>+#define CAM_CC_PLL3_OUT_EVEN					71</div><div class='add'>+#define CAM_CC_PLL4						72</div><div class='add'>+#define CAM_CC_PLL4_OUT_EVEN					73</div><div class='add'>+#define CAM_CC_PLL5						74</div><div class='add'>+#define CAM_CC_PLL5_OUT_EVEN					75</div><div class='add'>+#define CAM_CC_SFE_LITE_0_CLK					76</div><div class='add'>+#define CAM_CC_SFE_LITE_0_FAST_AHB_CLK				77</div><div class='add'>+#define CAM_CC_SFE_LITE_1_CLK					78</div><div class='add'>+#define CAM_CC_SFE_LITE_1_FAST_AHB_CLK				79</div><div class='add'>+#define CAM_CC_SLEEP_CLK					80</div><div class='add'>+#define CAM_CC_SLEEP_CLK_SRC					81</div><div class='add'>+#define CAM_CC_SLOW_AHB_CLK_SRC					82</div><div class='add'>+#define CAM_CC_SM_OBS_CLK					83</div><div class='add'>+#define CAM_CC_XO_CLK_SRC					84</div><div class='add'>+#define CAM_CC_QDSS_DEBUG_XO_CLK				85</div><div class='add'>+</div><div class='add'>+/* CAM_CC power domains */</div><div class='add'>+#define CAM_CC_TITAN_TOP_GDSC					0</div><div class='add'>+</div><div class='add'>+/* CAM_CC resets */</div><div class='add'>+#define CAM_CC_ICP_BCR						0</div><div class='add'>+#define CAM_CC_IFE_0_BCR					1</div><div class='add'>+#define CAM_CC_IFE_1_BCR					2</div><div class='add'>+#define CAM_CC_IPE_0_BCR					3</div><div class='add'>+#define CAM_CC_SFE_LITE_0_BCR					4</div><div class='add'>+#define CAM_CC_SFE_LITE_1_BCR					5</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sa8775p-dispcc.h b/include/dt-bindings/clock/qcom,sa8775p-dispcc.h<br/>new file mode 100644<br/>index 000000000000..e2049e510658<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sa8775p-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sa8775p-dispcc.h</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_SA8775P_DISP_CC_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_SA8775P_DISP_CC_H</div><div class='add'>+</div><div class='add'>+/* DISP_CC_0/1 clocks */</div><div class='add'>+#define MDSS_DISP_CC_MDSS_AHB1_CLK				0</div><div class='add'>+#define MDSS_DISP_CC_MDSS_AHB_CLK				1</div><div class='add'>+#define MDSS_DISP_CC_MDSS_AHB_CLK_SRC				2</div><div class='add'>+#define MDSS_DISP_CC_MDSS_BYTE0_CLK				3</div><div class='add'>+#define MDSS_DISP_CC_MDSS_BYTE0_CLK_SRC				4</div><div class='add'>+#define MDSS_DISP_CC_MDSS_BYTE0_DIV_CLK_SRC			5</div><div class='add'>+#define MDSS_DISP_CC_MDSS_BYTE0_INTF_CLK			6</div><div class='add'>+#define MDSS_DISP_CC_MDSS_BYTE1_CLK				7</div><div class='add'>+#define MDSS_DISP_CC_MDSS_BYTE1_CLK_SRC				8</div><div class='add'>+#define MDSS_DISP_CC_MDSS_BYTE1_DIV_CLK_SRC			9</div><div class='add'>+#define MDSS_DISP_CC_MDSS_BYTE1_INTF_CLK			10</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_AUX_CLK				11</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_AUX_CLK_SRC			12</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_CRYPTO_CLK			13</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_CRYPTO_CLK_SRC			14</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_LINK_CLK			15</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_LINK_CLK_SRC			16</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_LINK_DIV_CLK_SRC		17</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_LINK_INTF_CLK			18</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_PIXEL0_CLK			19</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC			20</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_PIXEL1_CLK			21</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_PIXEL1_CLK_SRC			22</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_PIXEL2_CLK			23</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_PIXEL2_CLK_SRC			24</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_PIXEL3_CLK			25</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_PIXEL3_CLK_SRC			26</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX0_USB_ROUTER_LINK_INTF_CLK	27</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_AUX_CLK				28</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_AUX_CLK_SRC			29</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_CRYPTO_CLK			30</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_CRYPTO_CLK_SRC			31</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_LINK_CLK			32</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_LINK_CLK_SRC			33</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_LINK_DIV_CLK_SRC		34</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_LINK_INTF_CLK			35</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_PIXEL0_CLK			36</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_PIXEL0_CLK_SRC			37</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_PIXEL1_CLK			38</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_PIXEL1_CLK_SRC			39</div><div class='add'>+#define MDSS_DISP_CC_MDSS_DPTX1_USB_ROUTER_LINK_INTF_CLK	40</div><div class='add'>+#define MDSS_DISP_CC_MDSS_ESC0_CLK				41</div><div class='add'>+#define MDSS_DISP_CC_MDSS_ESC0_CLK_SRC				42</div><div class='add'>+#define MDSS_DISP_CC_MDSS_ESC1_CLK				43</div><div class='add'>+#define MDSS_DISP_CC_MDSS_ESC1_CLK_SRC				44</div><div class='add'>+#define MDSS_DISP_CC_MDSS_MDP1_CLK				45</div><div class='add'>+#define MDSS_DISP_CC_MDSS_MDP_CLK				46</div><div class='add'>+#define MDSS_DISP_CC_MDSS_MDP_CLK_SRC				47</div><div class='add'>+#define MDSS_DISP_CC_MDSS_MDP_LUT1_CLK				48</div><div class='add'>+#define MDSS_DISP_CC_MDSS_MDP_LUT_CLK				49</div><div class='add'>+#define MDSS_DISP_CC_MDSS_NON_GDSC_AHB_CLK			50</div><div class='add'>+#define MDSS_DISP_CC_MDSS_PCLK0_CLK				51</div><div class='add'>+#define MDSS_DISP_CC_MDSS_PCLK0_CLK_SRC				52</div><div class='add'>+#define MDSS_DISP_CC_MDSS_PCLK1_CLK				53</div><div class='add'>+#define MDSS_DISP_CC_MDSS_PCLK1_CLK_SRC				54</div><div class='add'>+#define MDSS_DISP_CC_MDSS_PLL_LOCK_MONITOR_CLK			55</div><div class='add'>+#define MDSS_DISP_CC_MDSS_RSCC_AHB_CLK				56</div><div class='add'>+#define MDSS_DISP_CC_MDSS_RSCC_VSYNC_CLK			57</div><div class='add'>+#define MDSS_DISP_CC_MDSS_VSYNC1_CLK				58</div><div class='add'>+#define MDSS_DISP_CC_MDSS_VSYNC_CLK				59</div><div class='add'>+#define MDSS_DISP_CC_MDSS_VSYNC_CLK_SRC				60</div><div class='add'>+#define MDSS_DISP_CC_PLL0					61</div><div class='add'>+#define MDSS_DISP_CC_PLL1					62</div><div class='add'>+#define MDSS_DISP_CC_SLEEP_CLK					63</div><div class='add'>+#define MDSS_DISP_CC_SLEEP_CLK_SRC				64</div><div class='add'>+#define MDSS_DISP_CC_SM_OBS_CLK					65</div><div class='add'>+#define MDSS_DISP_CC_XO_CLK					66</div><div class='add'>+#define MDSS_DISP_CC_XO_CLK_SRC					67</div><div class='add'>+</div><div class='add'>+/* DISP_CC_0/1 power domains */</div><div class='add'>+#define MDSS_DISP_CC_MDSS_CORE_GDSC				0</div><div class='add'>+#define MDSS_DISP_CC_MDSS_CORE_INT2_GDSC			1</div><div class='add'>+</div><div class='add'>+/* DISP_CC_0/1 resets */</div><div class='add'>+#define MDSS_DISP_CC_MDSS_CORE_BCR				0</div><div class='add'>+#define MDSS_DISP_CC_MDSS_RSCC_BCR				1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sa8775p-videocc.h b/include/dt-bindings/clock/qcom,sa8775p-videocc.h<br/>new file mode 100644<br/>index 000000000000..e6325f68c317<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sa8775p-videocc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sa8775p-videocc.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_SA8775P_VIDEO_CC_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_SA8775P_VIDEO_CC_H</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC clocks */</div><div class='add'>+#define VIDEO_CC_AHB_CLK					0</div><div class='add'>+#define VIDEO_CC_AHB_CLK_SRC					1</div><div class='add'>+#define VIDEO_CC_MVS0_CLK					2</div><div class='add'>+#define VIDEO_CC_MVS0_CLK_SRC					3</div><div class='add'>+#define VIDEO_CC_MVS0_DIV_CLK_SRC				4</div><div class='add'>+#define VIDEO_CC_MVS0C_CLK					5</div><div class='add'>+#define VIDEO_CC_MVS0C_DIV2_DIV_CLK_SRC				6</div><div class='add'>+#define VIDEO_CC_MVS1_CLK					7</div><div class='add'>+#define VIDEO_CC_MVS1_CLK_SRC					8</div><div class='add'>+#define VIDEO_CC_MVS1_DIV_CLK_SRC				9</div><div class='add'>+#define VIDEO_CC_MVS1C_CLK					10</div><div class='add'>+#define VIDEO_CC_MVS1C_DIV2_DIV_CLK_SRC				11</div><div class='add'>+#define VIDEO_CC_PLL_LOCK_MONITOR_CLK				12</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK					13</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK_SRC					14</div><div class='add'>+#define VIDEO_CC_SM_DIV_CLK_SRC					15</div><div class='add'>+#define VIDEO_CC_SM_OBS_CLK					16</div><div class='add'>+#define VIDEO_CC_XO_CLK						17</div><div class='add'>+#define VIDEO_CC_XO_CLK_SRC					18</div><div class='add'>+#define VIDEO_PLL0						19</div><div class='add'>+#define VIDEO_PLL1						20</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC power domains */</div><div class='add'>+#define VIDEO_CC_MVS0C_GDSC					0</div><div class='add'>+#define VIDEO_CC_MVS0_GDSC					1</div><div class='add'>+#define VIDEO_CC_MVS1C_GDSC					2</div><div class='add'>+#define VIDEO_CC_MVS1_GDSC					3</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC resets */</div><div class='add'>+#define VIDEO_CC_INTERFACE_BCR					0</div><div class='add'>+#define VIDEO_CC_MVS0_BCR					1</div><div class='add'>+#define VIDEO_CC_MVS0C_CLK_ARES					2</div><div class='add'>+#define VIDEO_CC_MVS0C_BCR					3</div><div class='add'>+#define VIDEO_CC_MVS1_BCR					4</div><div class='add'>+#define VIDEO_CC_MVS1C_CLK_ARES					5</div><div class='add'>+#define VIDEO_CC_MVS1C_BCR					6</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sar2130p-gcc.h b/include/dt-bindings/clock/qcom,sar2130p-gcc.h<br/>new file mode 100644<br/>index 000000000000..69d2dd2538a6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sar2130p-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sar2130p-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,185 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GCC_SAR2130P_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GCC_SAR2130P_H</div><div class='add'>+</div><div class='add'>+/* GCC clocks */</div><div class='add'>+#define GCC_GPLL0						0</div><div class='add'>+#define GCC_GPLL0_OUT_EVEN					1</div><div class='add'>+#define GCC_GPLL1						2</div><div class='add'>+#define GCC_GPLL9						3</div><div class='add'>+#define GCC_GPLL9_OUT_EVEN					4</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_1_AXI_CLK				5</div><div class='add'>+#define GCC_AGGRE_USB3_PRIM_AXI_CLK				6</div><div class='add'>+#define GCC_BOOT_ROM_AHB_CLK					7</div><div class='add'>+#define GCC_CAMERA_AHB_CLK					8</div><div class='add'>+#define GCC_CAMERA_HF_AXI_CLK					9</div><div class='add'>+#define GCC_CAMERA_SF_AXI_CLK					10</div><div class='add'>+#define GCC_CAMERA_XO_CLK					11</div><div class='add'>+#define GCC_CFG_NOC_PCIE_ANOC_AHB_CLK				12</div><div class='add'>+#define GCC_CFG_NOC_USB3_PRIM_AXI_CLK				13</div><div class='add'>+#define GCC_DDRSS_GPU_AXI_CLK					14</div><div class='add'>+#define GCC_DDRSS_PCIE_SF_CLK					15</div><div class='add'>+#define GCC_DISP_AHB_CLK					16</div><div class='add'>+#define GCC_DISP_HF_AXI_CLK					17</div><div class='add'>+#define GCC_GP1_CLK						18</div><div class='add'>+#define GCC_GP1_CLK_SRC						19</div><div class='add'>+#define GCC_GP2_CLK						20</div><div class='add'>+#define GCC_GP2_CLK_SRC						21</div><div class='add'>+#define GCC_GP3_CLK						22</div><div class='add'>+#define GCC_GP3_CLK_SRC						23</div><div class='add'>+#define GCC_GPU_CFG_AHB_CLK					24</div><div class='add'>+#define GCC_GPU_GPLL0_CLK_SRC					25</div><div class='add'>+#define GCC_GPU_GPLL0_DIV_CLK_SRC				26</div><div class='add'>+#define GCC_GPU_MEMNOC_GFX_CLK					27</div><div class='add'>+#define GCC_GPU_SNOC_DVM_GFX_CLK				28</div><div class='add'>+#define GCC_IRIS_SS_HF_AXI1_CLK					29</div><div class='add'>+#define GCC_IRIS_SS_SPD_AXI1_CLK				30</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK					31</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK_SRC					32</div><div class='add'>+#define GCC_PCIE_0_CFG_AHB_CLK					33</div><div class='add'>+#define GCC_PCIE_0_MSTR_AXI_CLK					34</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK				35</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK_SRC				36</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK					37</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK_SRC					38</div><div class='add'>+#define GCC_PCIE_0_SLV_AXI_CLK					39</div><div class='add'>+#define GCC_PCIE_0_SLV_Q2A_AXI_CLK				40</div><div class='add'>+#define GCC_PCIE_1_AUX_CLK					41</div><div class='add'>+#define GCC_PCIE_1_AUX_CLK_SRC					42</div><div class='add'>+#define GCC_PCIE_1_CFG_AHB_CLK					43</div><div class='add'>+#define GCC_PCIE_1_MSTR_AXI_CLK					44</div><div class='add'>+#define GCC_PCIE_1_PHY_RCHNG_CLK				45</div><div class='add'>+#define GCC_PCIE_1_PHY_RCHNG_CLK_SRC				46</div><div class='add'>+#define GCC_PCIE_1_PIPE_CLK					47</div><div class='add'>+#define GCC_PCIE_1_PIPE_CLK_SRC					48</div><div class='add'>+#define GCC_PCIE_1_SLV_AXI_CLK					49</div><div class='add'>+#define GCC_PCIE_1_SLV_Q2A_AXI_CLK				50</div><div class='add'>+#define GCC_PDM2_CLK						51</div><div class='add'>+#define GCC_PDM2_CLK_SRC					52</div><div class='add'>+#define GCC_PDM_AHB_CLK						53</div><div class='add'>+#define GCC_PDM_XO4_CLK						54</div><div class='add'>+#define GCC_QMIP_CAMERA_NRT_AHB_CLK				55</div><div class='add'>+#define GCC_QMIP_CAMERA_RT_AHB_CLK				56</div><div class='add'>+#define GCC_QMIP_GPU_AHB_CLK					57</div><div class='add'>+#define GCC_QMIP_PCIE_AHB_CLK					58</div><div class='add'>+#define GCC_QMIP_VIDEO_CV_CPU_AHB_CLK				59</div><div class='add'>+#define GCC_QMIP_VIDEO_CVP_AHB_CLK				60</div><div class='add'>+#define GCC_QMIP_VIDEO_LSR_AHB_CLK				61</div><div class='add'>+#define GCC_QMIP_VIDEO_V_CPU_AHB_CLK				62</div><div class='add'>+#define GCC_QMIP_VIDEO_VCODEC_AHB_CLK				63</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_2X_CLK				64</div><div class='add'>+#define GCC_QUPV3_WRAP0_CORE_CLK				65</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK					66</div><div class='add'>+#define GCC_QUPV3_WRAP0_S0_CLK_SRC				67</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK					68</div><div class='add'>+#define GCC_QUPV3_WRAP0_S1_CLK_SRC				69</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK					70</div><div class='add'>+#define GCC_QUPV3_WRAP0_S2_CLK_SRC				71</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK					72</div><div class='add'>+#define GCC_QUPV3_WRAP0_S3_CLK_SRC				73</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK					74</div><div class='add'>+#define GCC_QUPV3_WRAP0_S4_CLK_SRC				75</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK					76</div><div class='add'>+#define GCC_QUPV3_WRAP0_S5_CLK_SRC				77</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_2X_CLK				78</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_CLK				79</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK					80</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK_SRC				81</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK					82</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK_SRC				83</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK					84</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK_SRC				85</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK					86</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK_SRC				87</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK					88</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK_SRC				89</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK					90</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK_SRC				91</div><div class='add'>+#define GCC_QUPV3_WRAP_0_M_AHB_CLK				92</div><div class='add'>+#define GCC_QUPV3_WRAP_0_S_AHB_CLK				93</div><div class='add'>+#define GCC_QUPV3_WRAP_1_M_AHB_CLK				94</div><div class='add'>+#define GCC_QUPV3_WRAP_1_S_AHB_CLK				95</div><div class='add'>+#define GCC_SDCC1_AHB_CLK					96</div><div class='add'>+#define GCC_SDCC1_APPS_CLK					97</div><div class='add'>+#define GCC_SDCC1_APPS_CLK_SRC					98</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK					99</div><div class='add'>+#define GCC_SDCC1_ICE_CORE_CLK_SRC				100</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK				101</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK_SRC				102</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK				103</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC			104</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_POSTDIV_CLK_SRC		105</div><div class='add'>+#define GCC_USB30_PRIM_SLEEP_CLK				106</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK				107</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK_SRC				108</div><div class='add'>+#define GCC_USB3_PRIM_PHY_COM_AUX_CLK				109</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK				110</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK_SRC				111</div><div class='add'>+#define GCC_VIDEO_AHB_CLK					112</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK					113</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK					114</div><div class='add'>+#define GCC_VIDEO_XO_CLK					115</div><div class='add'>+#define GCC_GPLL4						116</div><div class='add'>+#define GCC_GPLL5						117</div><div class='add'>+#define GCC_GPLL7						118</div><div class='add'>+#define GCC_DDRSS_SPAD_CLK					119</div><div class='add'>+#define GCC_DDRSS_SPAD_CLK_SRC					120</div><div class='add'>+#define GCC_VIDEO_AXI0_SREG					121</div><div class='add'>+#define GCC_VIDEO_AXI1_SREG					122</div><div class='add'>+#define GCC_IRIS_SS_HF_AXI1_SREG				123</div><div class='add'>+#define GCC_IRIS_SS_SPD_AXI1_SREG				124</div><div class='add'>+</div><div class='add'>+/* GCC resets */</div><div class='add'>+#define GCC_CAMERA_BCR						0</div><div class='add'>+#define GCC_DISPLAY_BCR						1</div><div class='add'>+#define GCC_GPU_BCR						2</div><div class='add'>+#define GCC_PCIE_0_BCR						3</div><div class='add'>+#define GCC_PCIE_0_LINK_DOWN_BCR				4</div><div class='add'>+#define GCC_PCIE_0_NOCSR_COM_PHY_BCR				5</div><div class='add'>+#define GCC_PCIE_0_PHY_BCR					6</div><div class='add'>+#define GCC_PCIE_0_PHY_NOCSR_COM_PHY_BCR			7</div><div class='add'>+#define GCC_PCIE_1_BCR						8</div><div class='add'>+#define GCC_PCIE_1_LINK_DOWN_BCR				9</div><div class='add'>+#define GCC_PCIE_1_NOCSR_COM_PHY_BCR				10</div><div class='add'>+#define GCC_PCIE_1_PHY_BCR					11</div><div class='add'>+#define GCC_PCIE_1_PHY_NOCSR_COM_PHY_BCR			12</div><div class='add'>+#define GCC_PCIE_PHY_BCR					13</div><div class='add'>+#define GCC_PCIE_PHY_CFG_AHB_BCR				14</div><div class='add'>+#define GCC_PCIE_PHY_COM_BCR					15</div><div class='add'>+#define GCC_PDM_BCR						16</div><div class='add'>+#define GCC_QUPV3_WRAPPER_0_BCR					17</div><div class='add'>+#define GCC_QUPV3_WRAPPER_1_BCR					18</div><div class='add'>+#define GCC_QUSB2PHY_PRIM_BCR					19</div><div class='add'>+#define GCC_QUSB2PHY_SEC_BCR					20</div><div class='add'>+#define GCC_SDCC1_BCR						21</div><div class='add'>+#define GCC_USB30_PRIM_BCR					22</div><div class='add'>+#define GCC_USB3_DP_PHY_PRIM_BCR				23</div><div class='add'>+#define GCC_USB3_DP_PHY_SEC_BCR					24</div><div class='add'>+#define GCC_USB3_PHY_PRIM_BCR					25</div><div class='add'>+#define GCC_USB3_PHY_SEC_BCR					26</div><div class='add'>+#define GCC_USB3PHY_PHY_PRIM_BCR				27</div><div class='add'>+#define GCC_USB3PHY_PHY_SEC_BCR					28</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK_ARES					29</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK_ARES					30</div><div class='add'>+#define GCC_VIDEO_BCR						31</div><div class='add'>+#define GCC_IRIS_SS_HF_AXI_CLK_ARES				32</div><div class='add'>+#define GCC_IRIS_SS_SPD_AXI_CLK_ARES				33</div><div class='add'>+#define GCC_DDRSS_SPAD_CLK_ARES					34</div><div class='add'>+</div><div class='add'>+/* GCC power domains */</div><div class='add'>+#define PCIE_0_GDSC						0</div><div class='add'>+#define PCIE_0_PHY_GDSC						1</div><div class='add'>+#define PCIE_1_GDSC						2</div><div class='add'>+#define PCIE_1_PHY_GDSC						3</div><div class='add'>+#define USB30_PRIM_GDSC						4</div><div class='add'>+#define USB3_PHY_GDSC						5</div><div class='add'>+#define HLOS1_VOTE_MM_SNOC_MMU_TBU_HF0_GDSC			6</div><div class='add'>+#define HLOS1_VOTE_MM_SNOC_MMU_TBU_SF0_GDSC			7</div><div class='add'>+#define HLOS1_VOTE_TURING_MMU_TBU0_GDSC				8</div><div class='add'>+#define HLOS1_VOTE_TURING_MMU_TBU1_GDSC				9</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sar2130p-gpucc.h b/include/dt-bindings/clock/qcom,sar2130p-gpucc.h<br/>new file mode 100644<br/>index 000000000000..a2204369110a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sar2130p-gpucc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sar2130p-gpucc.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved</div><div class='add'>+ * Copyright (c) 2024, Linaro Limited</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GPU_CC_SAR2130P_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GPU_CC_SAR2130P_H</div><div class='add'>+</div><div class='add'>+/* GPU_CC clocks */</div><div class='add'>+#define GPU_CC_AHB_CLK				0</div><div class='add'>+#define GPU_CC_CRC_AHB_CLK			1</div><div class='add'>+#define GPU_CC_CX_FF_CLK			2</div><div class='add'>+#define GPU_CC_CX_GMU_CLK			3</div><div class='add'>+#define GPU_CC_CXO_AON_CLK			4</div><div class='add'>+#define GPU_CC_CXO_CLK				5</div><div class='add'>+#define GPU_CC_FF_CLK_SRC			6</div><div class='add'>+#define GPU_CC_GMU_CLK_SRC			7</div><div class='add'>+#define GPU_CC_GX_GMU_CLK			8</div><div class='add'>+#define GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK		9</div><div class='add'>+#define GPU_CC_HUB_AON_CLK			10</div><div class='add'>+#define GPU_CC_HUB_CLK_SRC			11</div><div class='add'>+#define GPU_CC_HUB_CX_INT_CLK			12</div><div class='add'>+#define GPU_CC_MEMNOC_GFX_CLK			13</div><div class='add'>+#define GPU_CC_PLL0				14</div><div class='add'>+#define GPU_CC_PLL1				15</div><div class='add'>+#define GPU_CC_SLEEP_CLK			16</div><div class='add'>+</div><div class='add'>+/* GDSCs */</div><div class='add'>+#define GPU_GX_GDSC				0</div><div class='add'>+#define GPU_CX_GDSC				1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sc8180x-camcc.h b/include/dt-bindings/clock/qcom,sc8180x-camcc.h<br/>new file mode 100644<br/>index 000000000000..3e57b80f65e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sc8180x-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sc8180x-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_CAM_CC_SC8180X_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_CAM_CC_SC8180X_H</div><div class='add'>+</div><div class='add'>+/* CAM_CC clocks */</div><div class='add'>+#define CAM_CC_BPS_AHB_CLK					0</div><div class='add'>+#define CAM_CC_BPS_AREG_CLK					1</div><div class='add'>+#define CAM_CC_BPS_AXI_CLK					2</div><div class='add'>+#define CAM_CC_BPS_CLK						3</div><div class='add'>+#define CAM_CC_BPS_CLK_SRC					4</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK					5</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK_SRC				6</div><div class='add'>+#define CAM_CC_CAMNOC_DCD_XO_CLK				7</div><div class='add'>+#define CAM_CC_CCI_0_CLK					8</div><div class='add'>+#define CAM_CC_CCI_0_CLK_SRC					9</div><div class='add'>+#define CAM_CC_CCI_1_CLK					10</div><div class='add'>+#define CAM_CC_CCI_1_CLK_SRC					11</div><div class='add'>+#define CAM_CC_CCI_2_CLK					12</div><div class='add'>+#define CAM_CC_CCI_2_CLK_SRC					13</div><div class='add'>+#define CAM_CC_CCI_3_CLK					14</div><div class='add'>+#define CAM_CC_CCI_3_CLK_SRC					15</div><div class='add'>+#define CAM_CC_CORE_AHB_CLK					16</div><div class='add'>+#define CAM_CC_CPAS_AHB_CLK					17</div><div class='add'>+#define CAM_CC_CPHY_RX_CLK_SRC					18</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK					19</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK_SRC				20</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK					21</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK_SRC				22</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK					23</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK_SRC				24</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK					25</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK_SRC				26</div><div class='add'>+#define CAM_CC_CSIPHY0_CLK					27</div><div class='add'>+#define CAM_CC_CSIPHY1_CLK					28</div><div class='add'>+#define CAM_CC_CSIPHY2_CLK					29</div><div class='add'>+#define CAM_CC_CSIPHY3_CLK					30</div><div class='add'>+#define CAM_CC_FAST_AHB_CLK_SRC					31</div><div class='add'>+#define CAM_CC_FD_CORE_CLK					32</div><div class='add'>+#define CAM_CC_FD_CORE_CLK_SRC					33</div><div class='add'>+#define CAM_CC_FD_CORE_UAR_CLK					34</div><div class='add'>+#define CAM_CC_ICP_AHB_CLK					35</div><div class='add'>+#define CAM_CC_ICP_CLK						36</div><div class='add'>+#define CAM_CC_ICP_CLK_SRC					37</div><div class='add'>+#define CAM_CC_IFE_0_AXI_CLK					38</div><div class='add'>+#define CAM_CC_IFE_0_CLK					39</div><div class='add'>+#define CAM_CC_IFE_0_CLK_SRC					40</div><div class='add'>+#define CAM_CC_IFE_0_CPHY_RX_CLK				41</div><div class='add'>+#define CAM_CC_IFE_0_CSID_CLK					42</div><div class='add'>+#define CAM_CC_IFE_0_CSID_CLK_SRC				43</div><div class='add'>+#define CAM_CC_IFE_0_DSP_CLK					44</div><div class='add'>+#define CAM_CC_IFE_1_AXI_CLK					45</div><div class='add'>+#define CAM_CC_IFE_1_CLK					46</div><div class='add'>+#define CAM_CC_IFE_1_CLK_SRC					47</div><div class='add'>+#define CAM_CC_IFE_1_CPHY_RX_CLK				48</div><div class='add'>+#define CAM_CC_IFE_1_CSID_CLK					49</div><div class='add'>+#define CAM_CC_IFE_1_CSID_CLK_SRC				50</div><div class='add'>+#define CAM_CC_IFE_1_DSP_CLK					51</div><div class='add'>+#define CAM_CC_IFE_2_AXI_CLK					52</div><div class='add'>+#define CAM_CC_IFE_2_CLK					53</div><div class='add'>+#define CAM_CC_IFE_2_CLK_SRC					54</div><div class='add'>+#define CAM_CC_IFE_2_CPHY_RX_CLK				55</div><div class='add'>+#define CAM_CC_IFE_2_CSID_CLK					56</div><div class='add'>+#define CAM_CC_IFE_2_CSID_CLK_SRC				57</div><div class='add'>+#define CAM_CC_IFE_2_DSP_CLK					58</div><div class='add'>+#define CAM_CC_IFE_3_AXI_CLK					59</div><div class='add'>+#define CAM_CC_IFE_3_CLK					60</div><div class='add'>+#define CAM_CC_IFE_3_CLK_SRC					61</div><div class='add'>+#define CAM_CC_IFE_3_CPHY_RX_CLK				62</div><div class='add'>+#define CAM_CC_IFE_3_CSID_CLK					63</div><div class='add'>+#define CAM_CC_IFE_3_CSID_CLK_SRC				64</div><div class='add'>+#define CAM_CC_IFE_3_DSP_CLK					65</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CLK					66</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CLK_SRC				67</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CPHY_RX_CLK				68</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CSID_CLK				69</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CSID_CLK_SRC				70</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CLK					71</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CLK_SRC				72</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CPHY_RX_CLK				73</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CSID_CLK				74</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CSID_CLK_SRC				75</div><div class='add'>+#define CAM_CC_IFE_LITE_2_CLK					76</div><div class='add'>+#define CAM_CC_IFE_LITE_2_CLK_SRC				77</div><div class='add'>+#define CAM_CC_IFE_LITE_2_CPHY_RX_CLK				78</div><div class='add'>+#define CAM_CC_IFE_LITE_2_CSID_CLK				79</div><div class='add'>+#define CAM_CC_IFE_LITE_2_CSID_CLK_SRC				80</div><div class='add'>+#define CAM_CC_IFE_LITE_3_CLK					81</div><div class='add'>+#define CAM_CC_IFE_LITE_3_CLK_SRC				82</div><div class='add'>+#define CAM_CC_IFE_LITE_3_CPHY_RX_CLK				83</div><div class='add'>+#define CAM_CC_IFE_LITE_3_CSID_CLK				84</div><div class='add'>+#define CAM_CC_IFE_LITE_3_CSID_CLK_SRC				85</div><div class='add'>+#define CAM_CC_IPE_0_AHB_CLK					86</div><div class='add'>+#define CAM_CC_IPE_0_AREG_CLK					87</div><div class='add'>+#define CAM_CC_IPE_0_AXI_CLK					88</div><div class='add'>+#define CAM_CC_IPE_0_CLK					89</div><div class='add'>+#define CAM_CC_IPE_0_CLK_SRC					90</div><div class='add'>+#define CAM_CC_IPE_1_AHB_CLK					91</div><div class='add'>+#define CAM_CC_IPE_1_AREG_CLK					92</div><div class='add'>+#define CAM_CC_IPE_1_AXI_CLK					93</div><div class='add'>+#define CAM_CC_IPE_1_CLK					94</div><div class='add'>+#define CAM_CC_JPEG_CLK						95</div><div class='add'>+#define CAM_CC_JPEG_CLK_SRC					96</div><div class='add'>+#define CAM_CC_LRME_CLK						97</div><div class='add'>+#define CAM_CC_LRME_CLK_SRC					98</div><div class='add'>+#define CAM_CC_MCLK0_CLK					99</div><div class='add'>+#define CAM_CC_MCLK0_CLK_SRC					100</div><div class='add'>+#define CAM_CC_MCLK1_CLK					101</div><div class='add'>+#define CAM_CC_MCLK1_CLK_SRC					102</div><div class='add'>+#define CAM_CC_MCLK2_CLK					103</div><div class='add'>+#define CAM_CC_MCLK2_CLK_SRC					104</div><div class='add'>+#define CAM_CC_MCLK3_CLK					105</div><div class='add'>+#define CAM_CC_MCLK3_CLK_SRC					106</div><div class='add'>+#define CAM_CC_MCLK4_CLK					107</div><div class='add'>+#define CAM_CC_MCLK4_CLK_SRC					108</div><div class='add'>+#define CAM_CC_MCLK5_CLK					109</div><div class='add'>+#define CAM_CC_MCLK5_CLK_SRC					110</div><div class='add'>+#define CAM_CC_MCLK6_CLK					111</div><div class='add'>+#define CAM_CC_MCLK6_CLK_SRC					112</div><div class='add'>+#define CAM_CC_MCLK7_CLK					113</div><div class='add'>+#define CAM_CC_MCLK7_CLK_SRC					114</div><div class='add'>+#define CAM_CC_PLL0						115</div><div class='add'>+#define CAM_CC_PLL0_OUT_EVEN					116</div><div class='add'>+#define CAM_CC_PLL0_OUT_ODD					117</div><div class='add'>+#define CAM_CC_PLL1						118</div><div class='add'>+#define CAM_CC_PLL2						119</div><div class='add'>+#define CAM_CC_PLL2_OUT_MAIN					120</div><div class='add'>+#define CAM_CC_PLL3						121</div><div class='add'>+#define CAM_CC_PLL4						122</div><div class='add'>+#define CAM_CC_PLL5						123</div><div class='add'>+#define CAM_CC_PLL6						124</div><div class='add'>+#define CAM_CC_SLOW_AHB_CLK_SRC					125</div><div class='add'>+#define CAM_CC_XO_CLK_SRC					126</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* CAM_CC power domains */</div><div class='add'>+#define BPS_GDSC						0</div><div class='add'>+#define IFE_0_GDSC						1</div><div class='add'>+#define IFE_1_GDSC						2</div><div class='add'>+#define IFE_2_GDSC						3</div><div class='add'>+#define IFE_3_GDSC						4</div><div class='add'>+#define IPE_0_GDSC						5</div><div class='add'>+#define IPE_1_GDSC						6</div><div class='add'>+#define TITAN_TOP_GDSC						7</div><div class='add'>+</div><div class='add'>+/* CAM_CC resets */</div><div class='add'>+#define CAM_CC_BPS_BCR						0</div><div class='add'>+#define CAM_CC_CAMNOC_BCR					1</div><div class='add'>+#define CAM_CC_CCI_BCR						2</div><div class='add'>+#define CAM_CC_CPAS_BCR						3</div><div class='add'>+#define CAM_CC_CSI0PHY_BCR					4</div><div class='add'>+#define CAM_CC_CSI1PHY_BCR					5</div><div class='add'>+#define CAM_CC_CSI2PHY_BCR					6</div><div class='add'>+#define CAM_CC_CSI3PHY_BCR					7</div><div class='add'>+#define CAM_CC_FD_BCR						8</div><div class='add'>+#define CAM_CC_ICP_BCR						9</div><div class='add'>+#define CAM_CC_IFE_0_BCR					10</div><div class='add'>+#define CAM_CC_IFE_1_BCR					11</div><div class='add'>+#define CAM_CC_IFE_2_BCR					12</div><div class='add'>+#define CAM_CC_IFE_3_BCR					13</div><div class='add'>+#define CAM_CC_IFE_LITE_0_BCR					14</div><div class='add'>+#define CAM_CC_IFE_LITE_1_BCR					15</div><div class='add'>+#define CAM_CC_IFE_LITE_2_BCR					16</div><div class='add'>+#define CAM_CC_IFE_LITE_3_BCR					17</div><div class='add'>+#define CAM_CC_IPE_0_BCR					18</div><div class='add'>+#define CAM_CC_IPE_1_BCR					19</div><div class='add'>+#define CAM_CC_JPEG_BCR						20</div><div class='add'>+#define CAM_CC_LRME_BCR						21</div><div class='add'>+#define CAM_CC_MCLK0_BCR					22</div><div class='add'>+#define CAM_CC_MCLK1_BCR					23</div><div class='add'>+#define CAM_CC_MCLK2_BCR					24</div><div class='add'>+#define CAM_CC_MCLK3_BCR					25</div><div class='add'>+#define CAM_CC_MCLK4_BCR					26</div><div class='add'>+#define CAM_CC_MCLK5_BCR					27</div><div class='add'>+#define CAM_CC_MCLK6_BCR					28</div><div class='add'>+#define CAM_CC_MCLK7_BCR					29</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm4450-camcc.h b/include/dt-bindings/clock/qcom,sm4450-camcc.h<br/>new file mode 100644<br/>index 000000000000..bf077951bf1c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm4450-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm4450-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,106 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_CAM_CC_SM4450_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_CAM_CC_SM4450_H</div><div class='add'>+</div><div class='add'>+/* CAM_CC clocks */</div><div class='add'>+#define CAM_CC_BPS_AHB_CLK					0</div><div class='add'>+#define CAM_CC_BPS_AREG_CLK					1</div><div class='add'>+#define CAM_CC_BPS_CLK						2</div><div class='add'>+#define CAM_CC_BPS_CLK_SRC					3</div><div class='add'>+#define CAM_CC_CAMNOC_ATB_CLK					4</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK					5</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK_SRC				6</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_HF_CLK				7</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_SF_CLK				8</div><div class='add'>+#define CAM_CC_CCI_0_CLK					9</div><div class='add'>+#define CAM_CC_CCI_0_CLK_SRC					10</div><div class='add'>+#define CAM_CC_CCI_1_CLK					11</div><div class='add'>+#define CAM_CC_CCI_1_CLK_SRC					12</div><div class='add'>+#define CAM_CC_CORE_AHB_CLK					13</div><div class='add'>+#define CAM_CC_CPAS_AHB_CLK					14</div><div class='add'>+#define CAM_CC_CPHY_RX_CLK_SRC					15</div><div class='add'>+#define CAM_CC_CRE_AHB_CLK					16</div><div class='add'>+#define CAM_CC_CRE_CLK						17</div><div class='add'>+#define CAM_CC_CRE_CLK_SRC					18</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK					19</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK_SRC				20</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK					21</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK_SRC				22</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK					23</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK_SRC				24</div><div class='add'>+#define CAM_CC_CSIPHY0_CLK					25</div><div class='add'>+#define CAM_CC_CSIPHY1_CLK					26</div><div class='add'>+#define CAM_CC_CSIPHY2_CLK					27</div><div class='add'>+#define CAM_CC_FAST_AHB_CLK_SRC					28</div><div class='add'>+#define CAM_CC_ICP_ATB_CLK					29</div><div class='add'>+#define CAM_CC_ICP_CLK						30</div><div class='add'>+#define CAM_CC_ICP_CLK_SRC					31</div><div class='add'>+#define CAM_CC_ICP_CTI_CLK					32</div><div class='add'>+#define CAM_CC_ICP_TS_CLK					33</div><div class='add'>+#define CAM_CC_MCLK0_CLK					34</div><div class='add'>+#define CAM_CC_MCLK0_CLK_SRC					35</div><div class='add'>+#define CAM_CC_MCLK1_CLK					36</div><div class='add'>+#define CAM_CC_MCLK1_CLK_SRC					37</div><div class='add'>+#define CAM_CC_MCLK2_CLK					38</div><div class='add'>+#define CAM_CC_MCLK2_CLK_SRC					39</div><div class='add'>+#define CAM_CC_MCLK3_CLK					40</div><div class='add'>+#define CAM_CC_MCLK3_CLK_SRC					41</div><div class='add'>+#define CAM_CC_OPE_0_AHB_CLK					42</div><div class='add'>+#define CAM_CC_OPE_0_AREG_CLK					43</div><div class='add'>+#define CAM_CC_OPE_0_CLK					44</div><div class='add'>+#define CAM_CC_OPE_0_CLK_SRC					45</div><div class='add'>+#define CAM_CC_PLL0						46</div><div class='add'>+#define CAM_CC_PLL0_OUT_EVEN					47</div><div class='add'>+#define CAM_CC_PLL0_OUT_ODD					48</div><div class='add'>+#define CAM_CC_PLL1						49</div><div class='add'>+#define CAM_CC_PLL1_OUT_EVEN					50</div><div class='add'>+#define CAM_CC_PLL2						51</div><div class='add'>+#define CAM_CC_PLL2_OUT_EVEN					52</div><div class='add'>+#define CAM_CC_PLL3						53</div><div class='add'>+#define CAM_CC_PLL3_OUT_EVEN					54</div><div class='add'>+#define CAM_CC_PLL4						55</div><div class='add'>+#define CAM_CC_PLL4_OUT_EVEN					56</div><div class='add'>+#define CAM_CC_SLOW_AHB_CLK_SRC					57</div><div class='add'>+#define CAM_CC_SOC_AHB_CLK					58</div><div class='add'>+#define CAM_CC_SYS_TMR_CLK					59</div><div class='add'>+#define CAM_CC_TFE_0_AHB_CLK					60</div><div class='add'>+#define CAM_CC_TFE_0_CLK					61</div><div class='add'>+#define CAM_CC_TFE_0_CLK_SRC					62</div><div class='add'>+#define CAM_CC_TFE_0_CPHY_RX_CLK				63</div><div class='add'>+#define CAM_CC_TFE_0_CSID_CLK					64</div><div class='add'>+#define CAM_CC_TFE_0_CSID_CLK_SRC				65</div><div class='add'>+#define CAM_CC_TFE_1_AHB_CLK					66</div><div class='add'>+#define CAM_CC_TFE_1_CLK					67</div><div class='add'>+#define CAM_CC_TFE_1_CLK_SRC					68</div><div class='add'>+#define CAM_CC_TFE_1_CPHY_RX_CLK				69</div><div class='add'>+#define CAM_CC_TFE_1_CSID_CLK					70</div><div class='add'>+#define CAM_CC_TFE_1_CSID_CLK_SRC				71</div><div class='add'>+</div><div class='add'>+/* CAM_CC power domains */</div><div class='add'>+#define CAM_CC_CAMSS_TOP_GDSC					0</div><div class='add'>+</div><div class='add'>+/* CAM_CC resets */</div><div class='add'>+#define CAM_CC_BPS_BCR						0</div><div class='add'>+#define CAM_CC_CAMNOC_BCR					1</div><div class='add'>+#define CAM_CC_CAMSS_TOP_BCR					2</div><div class='add'>+#define CAM_CC_CCI_0_BCR					3</div><div class='add'>+#define CAM_CC_CCI_1_BCR					4</div><div class='add'>+#define CAM_CC_CPAS_BCR						5</div><div class='add'>+#define CAM_CC_CRE_BCR						6</div><div class='add'>+#define CAM_CC_CSI0PHY_BCR					7</div><div class='add'>+#define CAM_CC_CSI1PHY_BCR					8</div><div class='add'>+#define CAM_CC_CSI2PHY_BCR					9</div><div class='add'>+#define CAM_CC_ICP_BCR						10</div><div class='add'>+#define CAM_CC_MCLK0_BCR					11</div><div class='add'>+#define CAM_CC_MCLK1_BCR					12</div><div class='add'>+#define CAM_CC_MCLK2_BCR					13</div><div class='add'>+#define CAM_CC_MCLK3_BCR					14</div><div class='add'>+#define CAM_CC_OPE_0_BCR					15</div><div class='add'>+#define CAM_CC_TFE_0_BCR					16</div><div class='add'>+#define CAM_CC_TFE_1_BCR					17</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm4450-dispcc.h b/include/dt-bindings/clock/qcom,sm4450-dispcc.h<br/>new file mode 100644<br/>index 000000000000..ca6f2ef90157<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm4450-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm4450-dispcc.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_DISP_CC_SM4450_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_DISP_CC_SM4450_H</div><div class='add'>+</div><div class='add'>+/* DISP_CC clocks */</div><div class='add'>+#define DISP_CC_MDSS_AHB1_CLK					0</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK					1</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK_SRC				2</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK					3</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK_SRC				4</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_DIV_CLK_SRC				5</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_INTF_CLK				6</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK					7</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK_SRC				8</div><div class='add'>+#define DISP_CC_MDSS_MDP1_CLK					9</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK					10</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK_SRC				11</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT1_CLK				12</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT_CLK				13</div><div class='add'>+#define DISP_CC_MDSS_NON_GDSC_AHB_CLK				14</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK					15</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK_SRC				16</div><div class='add'>+#define DISP_CC_MDSS_ROT1_CLK					17</div><div class='add'>+#define DISP_CC_MDSS_ROT_CLK					18</div><div class='add'>+#define DISP_CC_MDSS_ROT_CLK_SRC				19</div><div class='add'>+#define DISP_CC_MDSS_RSCC_AHB_CLK				20</div><div class='add'>+#define DISP_CC_MDSS_RSCC_VSYNC_CLK				21</div><div class='add'>+#define DISP_CC_MDSS_VSYNC1_CLK					22</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK					23</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK_SRC				24</div><div class='add'>+#define DISP_CC_PLL0						25</div><div class='add'>+#define DISP_CC_PLL1						26</div><div class='add'>+#define DISP_CC_SLEEP_CLK					27</div><div class='add'>+#define DISP_CC_SLEEP_CLK_SRC					28</div><div class='add'>+#define DISP_CC_XO_CLK						29</div><div class='add'>+#define DISP_CC_XO_CLK_SRC					30</div><div class='add'>+</div><div class='add'>+/* DISP_CC power domains */</div><div class='add'>+#define DISP_CC_MDSS_CORE_GDSC					0</div><div class='add'>+#define DISP_CC_MDSS_CORE_INT2_GDSC				1</div><div class='add'>+</div><div class='add'>+/* DISP_CC resets */</div><div class='add'>+#define DISP_CC_MDSS_CORE_BCR					0</div><div class='add'>+#define DISP_CC_MDSS_CORE_INT2_BCR				1</div><div class='add'>+#define DISP_CC_MDSS_RSCC_BCR					2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm4450-gpucc.h b/include/dt-bindings/clock/qcom,sm4450-gpucc.h<br/>new file mode 100644<br/>index 000000000000..304f83e5f645<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm4450-gpucc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm4450-gpucc.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GPU_CC_SM4450_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GPU_CC_SM4450_H</div><div class='add'>+</div><div class='add'>+/* GPU_CC clocks */</div><div class='add'>+#define GPU_CC_AHB_CLK						0</div><div class='add'>+#define GPU_CC_CB_CLK						1</div><div class='add'>+#define GPU_CC_CRC_AHB_CLK					2</div><div class='add'>+#define GPU_CC_CX_FF_CLK					3</div><div class='add'>+#define GPU_CC_CX_GFX3D_CLK					4</div><div class='add'>+#define GPU_CC_CX_GFX3D_SLV_CLK					5</div><div class='add'>+#define GPU_CC_CX_GMU_CLK					6</div><div class='add'>+#define GPU_CC_CX_SNOC_DVM_CLK					7</div><div class='add'>+#define GPU_CC_CXO_AON_CLK					8</div><div class='add'>+#define GPU_CC_CXO_CLK						9</div><div class='add'>+#define GPU_CC_DEMET_CLK					10</div><div class='add'>+#define GPU_CC_DEMET_DIV_CLK_SRC				11</div><div class='add'>+#define GPU_CC_FF_CLK_SRC					12</div><div class='add'>+#define GPU_CC_FREQ_MEASURE_CLK					13</div><div class='add'>+#define GPU_CC_GMU_CLK_SRC					14</div><div class='add'>+#define GPU_CC_GX_CXO_CLK					15</div><div class='add'>+#define GPU_CC_GX_FF_CLK					16</div><div class='add'>+#define GPU_CC_GX_GFX3D_CLK					17</div><div class='add'>+#define GPU_CC_GX_GFX3D_CLK_SRC					18</div><div class='add'>+#define GPU_CC_GX_GFX3D_RDVM_CLK				19</div><div class='add'>+#define GPU_CC_GX_GMU_CLK					20</div><div class='add'>+#define GPU_CC_GX_VSENSE_CLK					21</div><div class='add'>+#define GPU_CC_HUB_AHB_DIV_CLK_SRC				22</div><div class='add'>+#define GPU_CC_HUB_AON_CLK					23</div><div class='add'>+#define GPU_CC_HUB_CLK_SRC					24</div><div class='add'>+#define GPU_CC_HUB_CX_INT_CLK					25</div><div class='add'>+#define GPU_CC_HUB_CX_INT_DIV_CLK_SRC				26</div><div class='add'>+#define GPU_CC_MEMNOC_GFX_CLK					27</div><div class='add'>+#define GPU_CC_MND1X_0_GFX3D_CLK				28</div><div class='add'>+#define GPU_CC_PLL0						29</div><div class='add'>+#define GPU_CC_PLL1						30</div><div class='add'>+#define GPU_CC_SLEEP_CLK					31</div><div class='add'>+#define GPU_CC_XO_CLK_SRC					32</div><div class='add'>+#define GPU_CC_XO_DIV_CLK_SRC					33</div><div class='add'>+</div><div class='add'>+/* GPU_CC power domains */</div><div class='add'>+#define GPU_CC_CX_GDSC						0</div><div class='add'>+#define GPU_CC_GX_GDSC						1</div><div class='add'>+</div><div class='add'>+/* GPU_CC resets */</div><div class='add'>+#define GPU_CC_ACD_BCR						0</div><div class='add'>+#define GPU_CC_CB_BCR						1</div><div class='add'>+#define GPU_CC_CX_BCR						2</div><div class='add'>+#define GPU_CC_FAST_HUB_BCR					3</div><div class='add'>+#define GPU_CC_FF_BCR						4</div><div class='add'>+#define GPU_CC_GFX3D_AON_BCR					5</div><div class='add'>+#define GPU_CC_GMU_BCR						6</div><div class='add'>+#define GPU_CC_GX_BCR						7</div><div class='add'>+#define GPU_CC_XO_BCR						8</div><div class='add'>+#define GPU_CC_GX_ACD_IROOT_BCR					9</div><div class='add'>+#define GPU_CC_RBCPR_BCR					10</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm6115-lpasscc.h b/include/dt-bindings/clock/qcom,sm6115-lpasscc.h<br/>new file mode 100644<br/>index 000000000000..799274517c9a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm6115-lpasscc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm6115-lpasscc.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023, Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_LPASSCC_SM6115_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_LPASSCC_SM6115_H</div><div class='add'>+</div><div class='add'>+/* LPASS CC */</div><div class='add'>+#define LPASS_SWR_TX_CONFIG_CGCR		0</div><div class='add'>+</div><div class='add'>+/* LPASS_AUDIO CC */</div><div class='add'>+#define LPASS_AUDIO_SWR_RX_CGCR			0</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm6350-videocc.h b/include/dt-bindings/clock/qcom,sm6350-videocc.h<br/>new file mode 100644<br/>index 000000000000..2af7f91fa023<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm6350-videocc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm6350-videocc.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2021, Konrad Dybcio &lt;konrad.dybcio@somainline.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM6350_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM6350_H</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC clocks */</div><div class='add'>+#define VIDEO_PLL0			0</div><div class='add'>+#define VIDEO_PLL0_OUT_EVEN             1</div><div class='add'>+#define VIDEO_CC_IRIS_AHB_CLK		2</div><div class='add'>+#define VIDEO_CC_IRIS_CLK_SRC		3</div><div class='add'>+#define VIDEO_CC_MVS0_AXI_CLK		4</div><div class='add'>+#define VIDEO_CC_MVS0_CORE_CLK		5</div><div class='add'>+#define VIDEO_CC_MVSC_CORE_CLK		6</div><div class='add'>+#define VIDEO_CC_MVSC_CTL_AXI_CLK	7</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK		8</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK_SRC		9</div><div class='add'>+#define VIDEO_CC_VENUS_AHB_CLK		10</div><div class='add'>+</div><div class='add'>+/* GDSCs */</div><div class='add'>+#define MVSC_GDSC			0</div><div class='add'>+#define MVS0_GDSC			1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm7150-camcc.h b/include/dt-bindings/clock/qcom,sm7150-camcc.h<br/>new file mode 100644<br/>index 000000000000..ce73ef0fe95d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm7150-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm7150-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024, Danila Tikhonov &lt;danila@jiaxyga.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_CAMCC_SM7150_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_CAMCC_SM7150_H</div><div class='add'>+</div><div class='add'>+/* Hardware clocks */</div><div class='add'>+#define CAMCC_PLL0_OUT_EVEN					0</div><div class='add'>+#define CAMCC_PLL0_OUT_ODD					1</div><div class='add'>+#define CAMCC_PLL1_OUT_EVEN					2</div><div class='add'>+#define CAMCC_PLL2_OUT_EARLY					3</div><div class='add'>+#define CAMCC_PLL3_OUT_EVEN					4</div><div class='add'>+#define CAMCC_PLL4_OUT_EVEN					5</div><div class='add'>+</div><div class='add'>+/* CAMCC clock registers */</div><div class='add'>+#define CAMCC_PLL0						6</div><div class='add'>+#define CAMCC_PLL1						7</div><div class='add'>+#define CAMCC_PLL2						8</div><div class='add'>+#define CAMCC_PLL2_OUT_AUX					9</div><div class='add'>+#define CAMCC_PLL2_OUT_MAIN					10</div><div class='add'>+#define CAMCC_PLL3						11</div><div class='add'>+#define CAMCC_PLL4						12</div><div class='add'>+#define CAMCC_BPS_AHB_CLK					13</div><div class='add'>+#define CAMCC_BPS_AREG_CLK					14</div><div class='add'>+#define CAMCC_BPS_AXI_CLK					15</div><div class='add'>+#define CAMCC_BPS_CLK						16</div><div class='add'>+#define CAMCC_BPS_CLK_SRC					17</div><div class='add'>+#define CAMCC_CAMNOC_AXI_CLK					18</div><div class='add'>+#define CAMCC_CAMNOC_AXI_CLK_SRC				19</div><div class='add'>+#define CAMCC_CAMNOC_DCD_XO_CLK					20</div><div class='add'>+#define CAMCC_CCI_0_CLK						21</div><div class='add'>+#define CAMCC_CCI_0_CLK_SRC					22</div><div class='add'>+#define CAMCC_CCI_1_CLK						23</div><div class='add'>+#define CAMCC_CCI_1_CLK_SRC					24</div><div class='add'>+#define CAMCC_CORE_AHB_CLK					25</div><div class='add'>+#define CAMCC_CPAS_AHB_CLK					26</div><div class='add'>+#define CAMCC_CPHY_RX_CLK_SRC					27</div><div class='add'>+#define CAMCC_CSI0PHYTIMER_CLK					28</div><div class='add'>+#define CAMCC_CSI0PHYTIMER_CLK_SRC				29</div><div class='add'>+#define CAMCC_CSI1PHYTIMER_CLK					30</div><div class='add'>+#define CAMCC_CSI1PHYTIMER_CLK_SRC				31</div><div class='add'>+#define CAMCC_CSI2PHYTIMER_CLK					32</div><div class='add'>+#define CAMCC_CSI2PHYTIMER_CLK_SRC				33</div><div class='add'>+#define CAMCC_CSI3PHYTIMER_CLK					34</div><div class='add'>+#define CAMCC_CSI3PHYTIMER_CLK_SRC				35</div><div class='add'>+#define CAMCC_CSIPHY0_CLK					36</div><div class='add'>+#define CAMCC_CSIPHY1_CLK					37</div><div class='add'>+#define CAMCC_CSIPHY2_CLK					38</div><div class='add'>+#define CAMCC_CSIPHY3_CLK					39</div><div class='add'>+#define CAMCC_FAST_AHB_CLK_SRC					40</div><div class='add'>+#define CAMCC_FD_CORE_CLK					41</div><div class='add'>+#define CAMCC_FD_CORE_CLK_SRC					42</div><div class='add'>+#define CAMCC_FD_CORE_UAR_CLK					43</div><div class='add'>+#define CAMCC_ICP_AHB_CLK					44</div><div class='add'>+#define CAMCC_ICP_CLK						45</div><div class='add'>+#define CAMCC_ICP_CLK_SRC					46</div><div class='add'>+#define CAMCC_IFE_0_AXI_CLK					47</div><div class='add'>+#define CAMCC_IFE_0_CLK						48</div><div class='add'>+#define CAMCC_IFE_0_CLK_SRC					49</div><div class='add'>+#define CAMCC_IFE_0_CPHY_RX_CLK					50</div><div class='add'>+#define CAMCC_IFE_0_CSID_CLK					51</div><div class='add'>+#define CAMCC_IFE_0_CSID_CLK_SRC				52</div><div class='add'>+#define CAMCC_IFE_0_DSP_CLK					53</div><div class='add'>+#define CAMCC_IFE_1_AXI_CLK					54</div><div class='add'>+#define CAMCC_IFE_1_CLK						55</div><div class='add'>+#define CAMCC_IFE_1_CLK_SRC					56</div><div class='add'>+#define CAMCC_IFE_1_CPHY_RX_CLK					57</div><div class='add'>+#define CAMCC_IFE_1_CSID_CLK					58</div><div class='add'>+#define CAMCC_IFE_1_CSID_CLK_SRC				59</div><div class='add'>+#define CAMCC_IFE_1_DSP_CLK					60</div><div class='add'>+#define CAMCC_IFE_LITE_CLK					61</div><div class='add'>+#define CAMCC_IFE_LITE_CLK_SRC					62</div><div class='add'>+#define CAMCC_IFE_LITE_CPHY_RX_CLK				63</div><div class='add'>+#define CAMCC_IFE_LITE_CSID_CLK					64</div><div class='add'>+#define CAMCC_IFE_LITE_CSID_CLK_SRC				65</div><div class='add'>+#define CAMCC_IPE_0_AHB_CLK					66</div><div class='add'>+#define CAMCC_IPE_0_AREG_CLK					67</div><div class='add'>+#define CAMCC_IPE_0_AXI_CLK					68</div><div class='add'>+#define CAMCC_IPE_0_CLK						69</div><div class='add'>+#define CAMCC_IPE_0_CLK_SRC					70</div><div class='add'>+#define CAMCC_IPE_1_AHB_CLK					71</div><div class='add'>+#define CAMCC_IPE_1_AREG_CLK					72</div><div class='add'>+#define CAMCC_IPE_1_AXI_CLK					73</div><div class='add'>+#define CAMCC_IPE_1_CLK						74</div><div class='add'>+#define CAMCC_JPEG_CLK						75</div><div class='add'>+#define CAMCC_JPEG_CLK_SRC					76</div><div class='add'>+#define CAMCC_LRME_CLK						77</div><div class='add'>+#define CAMCC_LRME_CLK_SRC					78</div><div class='add'>+#define CAMCC_MCLK0_CLK						79</div><div class='add'>+#define CAMCC_MCLK0_CLK_SRC					80</div><div class='add'>+#define CAMCC_MCLK1_CLK						81</div><div class='add'>+#define CAMCC_MCLK1_CLK_SRC					82</div><div class='add'>+#define CAMCC_MCLK2_CLK						83</div><div class='add'>+#define CAMCC_MCLK2_CLK_SRC					84</div><div class='add'>+#define CAMCC_MCLK3_CLK						85</div><div class='add'>+#define CAMCC_MCLK3_CLK_SRC					86</div><div class='add'>+#define CAMCC_SLEEP_CLK						87</div><div class='add'>+#define CAMCC_SLEEP_CLK_SRC					88</div><div class='add'>+#define CAMCC_SLOW_AHB_CLK_SRC					89</div><div class='add'>+#define CAMCC_XO_CLK_SRC					90</div><div class='add'>+</div><div class='add'>+/* CAMCC GDSCRs */</div><div class='add'>+#define BPS_GDSC						0</div><div class='add'>+#define IFE_0_GDSC						1</div><div class='add'>+#define IFE_1_GDSC						2</div><div class='add'>+#define IPE_0_GDSC						3</div><div class='add'>+#define IPE_1_GDSC						4</div><div class='add'>+#define TITAN_TOP_GDSC						5</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm7150-dispcc.h b/include/dt-bindings/clock/qcom,sm7150-dispcc.h<br/>new file mode 100644<br/>index 000000000000..1e4e6432d506<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm7150-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm7150-dispcc.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024, Danila Tikhonov &lt;danila@jiaxyga.com&gt;</div><div class='add'>+ * Copyright (c) 2024, David Wronek &lt;david@mainlining.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_DISPCC_SM7150_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_DISPCC_SM7150_H</div><div class='add'>+</div><div class='add'>+/* DISPCC clock registers */</div><div class='add'>+#define DISPCC_PLL0				0</div><div class='add'>+#define DISPCC_MDSS_AHB_CLK			1</div><div class='add'>+#define DISPCC_MDSS_AHB_CLK_SRC			2</div><div class='add'>+#define DISPCC_MDSS_BYTE0_CLK			3</div><div class='add'>+#define DISPCC_MDSS_BYTE0_CLK_SRC		4</div><div class='add'>+#define DISPCC_MDSS_BYTE0_DIV_CLK_SRC		5</div><div class='add'>+#define DISPCC_MDSS_BYTE0_INTF_CLK		6</div><div class='add'>+#define DISPCC_MDSS_BYTE1_CLK			7</div><div class='add'>+#define DISPCC_MDSS_BYTE1_CLK_SRC		8</div><div class='add'>+#define DISPCC_MDSS_BYTE1_DIV_CLK_SRC		9</div><div class='add'>+#define DISPCC_MDSS_BYTE1_INTF_CLK		10</div><div class='add'>+#define DISPCC_MDSS_DP_AUX_CLK			11</div><div class='add'>+#define DISPCC_MDSS_DP_AUX_CLK_SRC		12</div><div class='add'>+#define DISPCC_MDSS_DP_CRYPTO_CLK		13</div><div class='add'>+#define DISPCC_MDSS_DP_CRYPTO_CLK_SRC		14</div><div class='add'>+#define DISPCC_MDSS_DP_LINK_CLK			15</div><div class='add'>+#define DISPCC_MDSS_DP_LINK_CLK_SRC		16</div><div class='add'>+#define DISPCC_MDSS_DP_LINK_INTF_CLK		17</div><div class='add'>+#define DISPCC_MDSS_DP_PIXEL1_CLK		18</div><div class='add'>+#define DISPCC_MDSS_DP_PIXEL1_CLK_SRC		19</div><div class='add'>+#define DISPCC_MDSS_DP_PIXEL_CLK		20</div><div class='add'>+#define DISPCC_MDSS_DP_PIXEL_CLK_SRC		21</div><div class='add'>+#define DISPCC_MDSS_ESC0_CLK			22</div><div class='add'>+#define DISPCC_MDSS_ESC0_CLK_SRC		23</div><div class='add'>+#define DISPCC_MDSS_ESC1_CLK			24</div><div class='add'>+#define DISPCC_MDSS_ESC1_CLK_SRC		25</div><div class='add'>+#define DISPCC_MDSS_MDP_CLK			26</div><div class='add'>+#define DISPCC_MDSS_MDP_CLK_SRC			27</div><div class='add'>+#define DISPCC_MDSS_MDP_LUT_CLK			28</div><div class='add'>+#define DISPCC_MDSS_NON_GDSC_AHB_CLK		29</div><div class='add'>+#define DISPCC_MDSS_PCLK0_CLK			30</div><div class='add'>+#define DISPCC_MDSS_PCLK0_CLK_SRC		31</div><div class='add'>+#define DISPCC_MDSS_PCLK1_CLK			32</div><div class='add'>+#define DISPCC_MDSS_PCLK1_CLK_SRC		33</div><div class='add'>+#define DISPCC_MDSS_ROT_CLK			34</div><div class='add'>+#define DISPCC_MDSS_ROT_CLK_SRC			35</div><div class='add'>+#define DISPCC_MDSS_RSCC_AHB_CLK		36</div><div class='add'>+#define DISPCC_MDSS_RSCC_VSYNC_CLK		37</div><div class='add'>+#define DISPCC_MDSS_VSYNC_CLK			38</div><div class='add'>+#define DISPCC_MDSS_VSYNC_CLK_SRC		39</div><div class='add'>+#define DISPCC_XO_CLK_SRC			40</div><div class='add'>+#define DISPCC_SLEEP_CLK			41</div><div class='add'>+#define DISPCC_SLEEP_CLK_SRC			42</div><div class='add'>+</div><div class='add'>+/* DISPCC resets */</div><div class='add'>+#define DISPCC_MDSS_CORE_BCR			0</div><div class='add'>+</div><div class='add'>+/* DISPCC GDSCR */</div><div class='add'>+#define MDSS_GDSC				0</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm7150-videocc.h b/include/dt-bindings/clock/qcom,sm7150-videocc.h<br/>new file mode 100644<br/>index 000000000000..d86e0fbb159a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm7150-videocc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm7150-videocc.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024, Danila Tikhonov &lt;danila@jiaxyga.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_VIDEOCC_SM7150_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_VIDEOCC_SM7150_H</div><div class='add'>+</div><div class='add'>+#define VIDEOCC_PLL0			0</div><div class='add'>+#define VIDEOCC_IRIS_AHB_CLK		1</div><div class='add'>+#define VIDEOCC_IRIS_CLK_SRC		2</div><div class='add'>+#define VIDEOCC_MVS0_AXI_CLK		3</div><div class='add'>+#define VIDEOCC_MVS0_CORE_CLK		4</div><div class='add'>+#define VIDEOCC_MVS1_AXI_CLK		5</div><div class='add'>+#define VIDEOCC_MVS1_CORE_CLK		6</div><div class='add'>+#define VIDEOCC_MVSC_CORE_CLK		7</div><div class='add'>+#define VIDEOCC_MVSC_CTL_AXI_CLK	8</div><div class='add'>+#define VIDEOCC_VENUS_AHB_CLK		9</div><div class='add'>+#define VIDEOCC_XO_CLK			10</div><div class='add'>+#define VIDEOCC_XO_CLK_SRC		11</div><div class='add'>+</div><div class='add'>+/* VIDEOCC GDSCRs */</div><div class='add'>+#define VENUS_GDSC			0</div><div class='add'>+#define VCODEC0_GDSC			1</div><div class='add'>+#define VCODEC1_GDSC			2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm8150-camcc.h b/include/dt-bindings/clock/qcom,sm8150-camcc.h<br/>new file mode 100644<br/>index 000000000000..5444035efa93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8150-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm8150-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_CAM_CC_SM8150_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_CAM_CC_SM8150_H</div><div class='add'>+</div><div class='add'>+/* CAM_CC clocks */</div><div class='add'>+#define CAM_CC_PLL0					0</div><div class='add'>+#define CAM_CC_PLL0_OUT_EVEN				1</div><div class='add'>+#define CAM_CC_PLL0_OUT_ODD				2</div><div class='add'>+#define CAM_CC_PLL1					3</div><div class='add'>+#define CAM_CC_PLL1_OUT_EVEN				4</div><div class='add'>+#define CAM_CC_PLL2					5</div><div class='add'>+#define CAM_CC_PLL2_OUT_MAIN				6</div><div class='add'>+#define CAM_CC_PLL3					7</div><div class='add'>+#define CAM_CC_PLL3_OUT_EVEN				8</div><div class='add'>+#define CAM_CC_PLL4					9</div><div class='add'>+#define CAM_CC_PLL4_OUT_EVEN				10</div><div class='add'>+#define CAM_CC_BPS_AHB_CLK				11</div><div class='add'>+#define CAM_CC_BPS_AREG_CLK				12</div><div class='add'>+#define CAM_CC_BPS_AXI_CLK				13</div><div class='add'>+#define CAM_CC_BPS_CLK					14</div><div class='add'>+#define CAM_CC_BPS_CLK_SRC				15</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK				16</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_CLK_SRC			17</div><div class='add'>+#define CAM_CC_CAMNOC_DCD_XO_CLK			18</div><div class='add'>+#define CAM_CC_CCI_0_CLK				19</div><div class='add'>+#define CAM_CC_CCI_0_CLK_SRC				20</div><div class='add'>+#define CAM_CC_CCI_1_CLK				21</div><div class='add'>+#define CAM_CC_CCI_1_CLK_SRC				22</div><div class='add'>+#define CAM_CC_CORE_AHB_CLK				23</div><div class='add'>+#define CAM_CC_CPAS_AHB_CLK				24</div><div class='add'>+#define CAM_CC_CPHY_RX_CLK_SRC				25</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK				26</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK_SRC			27</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK				28</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK_SRC			29</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK				30</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK_SRC			31</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK				32</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK_SRC			33</div><div class='add'>+#define CAM_CC_CSIPHY0_CLK				34</div><div class='add'>+#define CAM_CC_CSIPHY1_CLK				35</div><div class='add'>+#define CAM_CC_CSIPHY2_CLK				36</div><div class='add'>+#define CAM_CC_CSIPHY3_CLK				37</div><div class='add'>+#define CAM_CC_FAST_AHB_CLK_SRC				38</div><div class='add'>+#define CAM_CC_FD_CORE_CLK				39</div><div class='add'>+#define CAM_CC_FD_CORE_CLK_SRC				40</div><div class='add'>+#define CAM_CC_FD_CORE_UAR_CLK				41</div><div class='add'>+#define CAM_CC_GDSC_CLK					42</div><div class='add'>+#define CAM_CC_ICP_AHB_CLK				43</div><div class='add'>+#define CAM_CC_ICP_CLK					44</div><div class='add'>+#define CAM_CC_ICP_CLK_SRC				45</div><div class='add'>+#define CAM_CC_IFE_0_AXI_CLK				46</div><div class='add'>+#define CAM_CC_IFE_0_CLK				47</div><div class='add'>+#define CAM_CC_IFE_0_CLK_SRC				48</div><div class='add'>+#define CAM_CC_IFE_0_CPHY_RX_CLK			49</div><div class='add'>+#define CAM_CC_IFE_0_CSID_CLK				50</div><div class='add'>+#define CAM_CC_IFE_0_CSID_CLK_SRC			51</div><div class='add'>+#define CAM_CC_IFE_0_DSP_CLK				52</div><div class='add'>+#define CAM_CC_IFE_1_AXI_CLK				53</div><div class='add'>+#define CAM_CC_IFE_1_CLK				54</div><div class='add'>+#define CAM_CC_IFE_1_CLK_SRC				55</div><div class='add'>+#define CAM_CC_IFE_1_CPHY_RX_CLK			56</div><div class='add'>+#define CAM_CC_IFE_1_CSID_CLK				57</div><div class='add'>+#define CAM_CC_IFE_1_CSID_CLK_SRC			58</div><div class='add'>+#define CAM_CC_IFE_1_DSP_CLK				59</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CLK				60</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CLK_SRC			61</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CPHY_RX_CLK			62</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CSID_CLK			63</div><div class='add'>+#define CAM_CC_IFE_LITE_0_CSID_CLK_SRC			64</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CLK				65</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CLK_SRC			66</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CPHY_RX_CLK			67</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CSID_CLK			68</div><div class='add'>+#define CAM_CC_IFE_LITE_1_CSID_CLK_SRC			69</div><div class='add'>+#define CAM_CC_IPE_0_AHB_CLK				70</div><div class='add'>+#define CAM_CC_IPE_0_AREG_CLK				71</div><div class='add'>+#define CAM_CC_IPE_0_AXI_CLK				72</div><div class='add'>+#define CAM_CC_IPE_0_CLK				73</div><div class='add'>+#define CAM_CC_IPE_0_CLK_SRC				74</div><div class='add'>+#define CAM_CC_IPE_1_AHB_CLK				75</div><div class='add'>+#define CAM_CC_IPE_1_AREG_CLK				76</div><div class='add'>+#define CAM_CC_IPE_1_AXI_CLK				77</div><div class='add'>+#define CAM_CC_IPE_1_CLK				78</div><div class='add'>+#define CAM_CC_JPEG_CLK					79</div><div class='add'>+#define CAM_CC_JPEG_CLK_SRC				80</div><div class='add'>+#define CAM_CC_LRME_CLK					81</div><div class='add'>+#define CAM_CC_LRME_CLK_SRC				82</div><div class='add'>+#define CAM_CC_MCLK0_CLK				83</div><div class='add'>+#define CAM_CC_MCLK0_CLK_SRC				84</div><div class='add'>+#define CAM_CC_MCLK1_CLK				85</div><div class='add'>+#define CAM_CC_MCLK1_CLK_SRC				86</div><div class='add'>+#define CAM_CC_MCLK2_CLK				87</div><div class='add'>+#define CAM_CC_MCLK2_CLK_SRC				88</div><div class='add'>+#define CAM_CC_MCLK3_CLK				89</div><div class='add'>+#define CAM_CC_MCLK3_CLK_SRC				90</div><div class='add'>+#define CAM_CC_SLOW_AHB_CLK_SRC				91</div><div class='add'>+</div><div class='add'>+/* CAM_CC power domains */</div><div class='add'>+#define TITAN_TOP_GDSC					0</div><div class='add'>+#define BPS_GDSC					1</div><div class='add'>+#define IFE_0_GDSC					2</div><div class='add'>+#define IFE_1_GDSC					3</div><div class='add'>+#define IPE_0_GDSC					4</div><div class='add'>+#define IPE_1_GDSC					5</div><div class='add'>+</div><div class='add'>+/* CAM_CC resets */</div><div class='add'>+#define CAM_CC_BPS_BCR					0</div><div class='add'>+#define CAM_CC_CAMNOC_BCR				1</div><div class='add'>+#define CAM_CC_CCI_BCR					2</div><div class='add'>+#define CAM_CC_CPAS_BCR					3</div><div class='add'>+#define CAM_CC_CSI0PHY_BCR				4</div><div class='add'>+#define CAM_CC_CSI1PHY_BCR				5</div><div class='add'>+#define CAM_CC_CSI2PHY_BCR				6</div><div class='add'>+#define CAM_CC_CSI3PHY_BCR				7</div><div class='add'>+#define CAM_CC_FD_BCR					8</div><div class='add'>+#define CAM_CC_ICP_BCR					9</div><div class='add'>+#define CAM_CC_IFE_0_BCR				10</div><div class='add'>+#define CAM_CC_IFE_1_BCR				11</div><div class='add'>+#define CAM_CC_IFE_LITE_0_BCR				12</div><div class='add'>+#define CAM_CC_IFE_LITE_1_BCR				13</div><div class='add'>+#define CAM_CC_IPE_0_BCR				14</div><div class='add'>+#define CAM_CC_IPE_1_BCR				15</div><div class='add'>+#define CAM_CC_JPEG_BCR					16</div><div class='add'>+#define CAM_CC_LRME_BCR					17</div><div class='add'>+#define CAM_CC_MCLK0_BCR				18</div><div class='add'>+#define CAM_CC_MCLK1_BCR				19</div><div class='add'>+#define CAM_CC_MCLK2_BCR				20</div><div class='add'>+#define CAM_CC_MCLK3_BCR				21</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm8650-camcc.h b/include/dt-bindings/clock/qcom,sm8650-camcc.h<br/>new file mode 100644<br/>index 000000000000..df73bf35f4bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8650-camcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm8650-camcc.h</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_CAM_CC_SM8650_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_CAM_CC_SM8650_H</div><div class='add'>+</div><div class='add'>+/* CAM_CC clocks */</div><div class='add'>+#define CAM_CC_BPS_AHB_CLK					0</div><div class='add'>+#define CAM_CC_BPS_CLK						1</div><div class='add'>+#define CAM_CC_BPS_CLK_SRC					2</div><div class='add'>+#define CAM_CC_BPS_FAST_AHB_CLK					3</div><div class='add'>+#define CAM_CC_BPS_SHIFT_CLK					4</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_NRT_CLK				5</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_RT_CLK				6</div><div class='add'>+#define CAM_CC_CAMNOC_AXI_RT_CLK_SRC				7</div><div class='add'>+#define CAM_CC_CAMNOC_DCD_XO_CLK				8</div><div class='add'>+#define CAM_CC_CAMNOC_XO_CLK					9</div><div class='add'>+#define CAM_CC_CCI_0_CLK					10</div><div class='add'>+#define CAM_CC_CCI_0_CLK_SRC					11</div><div class='add'>+#define CAM_CC_CCI_1_CLK					12</div><div class='add'>+#define CAM_CC_CCI_1_CLK_SRC					13</div><div class='add'>+#define CAM_CC_CCI_2_CLK					14</div><div class='add'>+#define CAM_CC_CCI_2_CLK_SRC					15</div><div class='add'>+#define CAM_CC_CORE_AHB_CLK					16</div><div class='add'>+#define CAM_CC_CPAS_AHB_CLK					17</div><div class='add'>+#define CAM_CC_CPAS_BPS_CLK					18</div><div class='add'>+#define CAM_CC_CPAS_CRE_CLK					19</div><div class='add'>+#define CAM_CC_CPAS_FAST_AHB_CLK				20</div><div class='add'>+#define CAM_CC_CPAS_IFE_0_CLK					21</div><div class='add'>+#define CAM_CC_CPAS_IFE_1_CLK					22</div><div class='add'>+#define CAM_CC_CPAS_IFE_2_CLK					23</div><div class='add'>+#define CAM_CC_CPAS_IFE_LITE_CLK				24</div><div class='add'>+#define CAM_CC_CPAS_IPE_NPS_CLK					25</div><div class='add'>+#define CAM_CC_CPAS_SBI_CLK					26</div><div class='add'>+#define CAM_CC_CPAS_SFE_0_CLK					27</div><div class='add'>+#define CAM_CC_CPAS_SFE_1_CLK					28</div><div class='add'>+#define CAM_CC_CPAS_SFE_2_CLK					29</div><div class='add'>+#define CAM_CC_CPHY_RX_CLK_SRC					30</div><div class='add'>+#define CAM_CC_CRE_AHB_CLK					31</div><div class='add'>+#define CAM_CC_CRE_CLK						32</div><div class='add'>+#define CAM_CC_CRE_CLK_SRC					33</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK					34</div><div class='add'>+#define CAM_CC_CSI0PHYTIMER_CLK_SRC				35</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK					36</div><div class='add'>+#define CAM_CC_CSI1PHYTIMER_CLK_SRC				37</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK					38</div><div class='add'>+#define CAM_CC_CSI2PHYTIMER_CLK_SRC				39</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK					40</div><div class='add'>+#define CAM_CC_CSI3PHYTIMER_CLK_SRC				41</div><div class='add'>+#define CAM_CC_CSI4PHYTIMER_CLK					42</div><div class='add'>+#define CAM_CC_CSI4PHYTIMER_CLK_SRC				43</div><div class='add'>+#define CAM_CC_CSI5PHYTIMER_CLK					44</div><div class='add'>+#define CAM_CC_CSI5PHYTIMER_CLK_SRC				45</div><div class='add'>+#define CAM_CC_CSI6PHYTIMER_CLK					46</div><div class='add'>+#define CAM_CC_CSI6PHYTIMER_CLK_SRC				47</div><div class='add'>+#define CAM_CC_CSI7PHYTIMER_CLK					48</div><div class='add'>+#define CAM_CC_CSI7PHYTIMER_CLK_SRC				49</div><div class='add'>+#define CAM_CC_CSID_CLK						50</div><div class='add'>+#define CAM_CC_CSID_CLK_SRC					51</div><div class='add'>+#define CAM_CC_CSID_CSIPHY_RX_CLK				52</div><div class='add'>+#define CAM_CC_CSIPHY0_CLK					53</div><div class='add'>+#define CAM_CC_CSIPHY1_CLK					54</div><div class='add'>+#define CAM_CC_CSIPHY2_CLK					55</div><div class='add'>+#define CAM_CC_CSIPHY3_CLK					56</div><div class='add'>+#define CAM_CC_CSIPHY4_CLK					57</div><div class='add'>+#define CAM_CC_CSIPHY5_CLK					58</div><div class='add'>+#define CAM_CC_CSIPHY6_CLK					59</div><div class='add'>+#define CAM_CC_CSIPHY7_CLK					60</div><div class='add'>+#define CAM_CC_DRV_AHB_CLK					61</div><div class='add'>+#define CAM_CC_DRV_XO_CLK					62</div><div class='add'>+#define CAM_CC_FAST_AHB_CLK_SRC					63</div><div class='add'>+#define CAM_CC_GDSC_CLK						64</div><div class='add'>+#define CAM_CC_ICP_AHB_CLK					65</div><div class='add'>+#define CAM_CC_ICP_CLK						66</div><div class='add'>+#define CAM_CC_ICP_CLK_SRC					67</div><div class='add'>+#define CAM_CC_IFE_0_CLK					68</div><div class='add'>+#define CAM_CC_IFE_0_CLK_SRC					69</div><div class='add'>+#define CAM_CC_IFE_0_FAST_AHB_CLK				70</div><div class='add'>+#define CAM_CC_IFE_0_SHIFT_CLK					71</div><div class='add'>+#define CAM_CC_IFE_1_CLK					72</div><div class='add'>+#define CAM_CC_IFE_1_CLK_SRC					73</div><div class='add'>+#define CAM_CC_IFE_1_FAST_AHB_CLK				74</div><div class='add'>+#define CAM_CC_IFE_1_SHIFT_CLK					75</div><div class='add'>+#define CAM_CC_IFE_2_CLK					76</div><div class='add'>+#define CAM_CC_IFE_2_CLK_SRC					77</div><div class='add'>+#define CAM_CC_IFE_2_FAST_AHB_CLK				78</div><div class='add'>+#define CAM_CC_IFE_2_SHIFT_CLK					79</div><div class='add'>+#define CAM_CC_IFE_LITE_AHB_CLK					80</div><div class='add'>+#define CAM_CC_IFE_LITE_CLK					81</div><div class='add'>+#define CAM_CC_IFE_LITE_CLK_SRC					82</div><div class='add'>+#define CAM_CC_IFE_LITE_CPHY_RX_CLK				83</div><div class='add'>+#define CAM_CC_IFE_LITE_CSID_CLK				84</div><div class='add'>+#define CAM_CC_IFE_LITE_CSID_CLK_SRC				85</div><div class='add'>+#define CAM_CC_IPE_NPS_AHB_CLK					86</div><div class='add'>+#define CAM_CC_IPE_NPS_CLK					87</div><div class='add'>+#define CAM_CC_IPE_NPS_CLK_SRC					88</div><div class='add'>+#define CAM_CC_IPE_NPS_FAST_AHB_CLK				89</div><div class='add'>+#define CAM_CC_IPE_PPS_CLK					90</div><div class='add'>+#define CAM_CC_IPE_PPS_FAST_AHB_CLK				91</div><div class='add'>+#define CAM_CC_IPE_SHIFT_CLK					92</div><div class='add'>+#define CAM_CC_JPEG_1_CLK					93</div><div class='add'>+#define CAM_CC_JPEG_CLK						94</div><div class='add'>+#define CAM_CC_JPEG_CLK_SRC					95</div><div class='add'>+#define CAM_CC_MCLK0_CLK					96</div><div class='add'>+#define CAM_CC_MCLK0_CLK_SRC					97</div><div class='add'>+#define CAM_CC_MCLK1_CLK					98</div><div class='add'>+#define CAM_CC_MCLK1_CLK_SRC					99</div><div class='add'>+#define CAM_CC_MCLK2_CLK					100</div><div class='add'>+#define CAM_CC_MCLK2_CLK_SRC					101</div><div class='add'>+#define CAM_CC_MCLK3_CLK					102</div><div class='add'>+#define CAM_CC_MCLK3_CLK_SRC					103</div><div class='add'>+#define CAM_CC_MCLK4_CLK					104</div><div class='add'>+#define CAM_CC_MCLK4_CLK_SRC					105</div><div class='add'>+#define CAM_CC_MCLK5_CLK					106</div><div class='add'>+#define CAM_CC_MCLK5_CLK_SRC					107</div><div class='add'>+#define CAM_CC_MCLK6_CLK					108</div><div class='add'>+#define CAM_CC_MCLK6_CLK_SRC					109</div><div class='add'>+#define CAM_CC_MCLK7_CLK					110</div><div class='add'>+#define CAM_CC_MCLK7_CLK_SRC					111</div><div class='add'>+#define CAM_CC_PLL0						112</div><div class='add'>+#define CAM_CC_PLL0_OUT_EVEN					113</div><div class='add'>+#define CAM_CC_PLL0_OUT_ODD					114</div><div class='add'>+#define CAM_CC_PLL1						115</div><div class='add'>+#define CAM_CC_PLL1_OUT_EVEN					116</div><div class='add'>+#define CAM_CC_PLL2						117</div><div class='add'>+#define CAM_CC_PLL3						118</div><div class='add'>+#define CAM_CC_PLL3_OUT_EVEN					119</div><div class='add'>+#define CAM_CC_PLL4						120</div><div class='add'>+#define CAM_CC_PLL4_OUT_EVEN					121</div><div class='add'>+#define CAM_CC_PLL5						122</div><div class='add'>+#define CAM_CC_PLL5_OUT_EVEN					123</div><div class='add'>+#define CAM_CC_PLL6						124</div><div class='add'>+#define CAM_CC_PLL6_OUT_EVEN					125</div><div class='add'>+#define CAM_CC_PLL7						126</div><div class='add'>+#define CAM_CC_PLL7_OUT_EVEN					127</div><div class='add'>+#define CAM_CC_PLL8						128</div><div class='add'>+#define CAM_CC_PLL8_OUT_EVEN					129</div><div class='add'>+#define CAM_CC_PLL9						130</div><div class='add'>+#define CAM_CC_PLL9_OUT_EVEN					131</div><div class='add'>+#define CAM_CC_PLL9_OUT_ODD					132</div><div class='add'>+#define CAM_CC_PLL10						133</div><div class='add'>+#define CAM_CC_PLL10_OUT_EVEN					134</div><div class='add'>+#define CAM_CC_QDSS_DEBUG_CLK					135</div><div class='add'>+#define CAM_CC_QDSS_DEBUG_CLK_SRC				136</div><div class='add'>+#define CAM_CC_QDSS_DEBUG_XO_CLK				137</div><div class='add'>+#define CAM_CC_SBI_CLK						138</div><div class='add'>+#define CAM_CC_SBI_FAST_AHB_CLK					139</div><div class='add'>+#define CAM_CC_SBI_SHIFT_CLK					140</div><div class='add'>+#define CAM_CC_SFE_0_CLK					141</div><div class='add'>+#define CAM_CC_SFE_0_CLK_SRC					142</div><div class='add'>+#define CAM_CC_SFE_0_FAST_AHB_CLK				143</div><div class='add'>+#define CAM_CC_SFE_0_SHIFT_CLK					144</div><div class='add'>+#define CAM_CC_SFE_1_CLK					145</div><div class='add'>+#define CAM_CC_SFE_1_CLK_SRC					146</div><div class='add'>+#define CAM_CC_SFE_1_FAST_AHB_CLK				147</div><div class='add'>+#define CAM_CC_SFE_1_SHIFT_CLK					148</div><div class='add'>+#define CAM_CC_SFE_2_CLK					149</div><div class='add'>+#define CAM_CC_SFE_2_CLK_SRC					150</div><div class='add'>+#define CAM_CC_SFE_2_FAST_AHB_CLK				151</div><div class='add'>+#define CAM_CC_SFE_2_SHIFT_CLK					152</div><div class='add'>+#define CAM_CC_SLEEP_CLK					153</div><div class='add'>+#define CAM_CC_SLEEP_CLK_SRC					154</div><div class='add'>+#define CAM_CC_SLOW_AHB_CLK_SRC					155</div><div class='add'>+#define CAM_CC_TITAN_TOP_SHIFT_CLK				156</div><div class='add'>+#define CAM_CC_XO_CLK_SRC					157</div><div class='add'>+</div><div class='add'>+/* CAM_CC power domains */</div><div class='add'>+#define CAM_CC_TITAN_TOP_GDSC					0</div><div class='add'>+#define CAM_CC_BPS_GDSC						1</div><div class='add'>+#define CAM_CC_IFE_0_GDSC					2</div><div class='add'>+#define CAM_CC_IFE_1_GDSC					3</div><div class='add'>+#define CAM_CC_IFE_2_GDSC					4</div><div class='add'>+#define CAM_CC_IPE_0_GDSC					5</div><div class='add'>+#define CAM_CC_SBI_GDSC						6</div><div class='add'>+#define CAM_CC_SFE_0_GDSC					7</div><div class='add'>+#define CAM_CC_SFE_1_GDSC					8</div><div class='add'>+#define CAM_CC_SFE_2_GDSC					9</div><div class='add'>+</div><div class='add'>+/* CAM_CC resets */</div><div class='add'>+#define CAM_CC_BPS_BCR						0</div><div class='add'>+#define CAM_CC_DRV_BCR						1</div><div class='add'>+#define CAM_CC_ICP_BCR						2</div><div class='add'>+#define CAM_CC_IFE_0_BCR					3</div><div class='add'>+#define CAM_CC_IFE_1_BCR					4</div><div class='add'>+#define CAM_CC_IFE_2_BCR					5</div><div class='add'>+#define CAM_CC_IPE_0_BCR					6</div><div class='add'>+#define CAM_CC_QDSS_DEBUG_BCR					7</div><div class='add'>+#define CAM_CC_SBI_BCR						8</div><div class='add'>+#define CAM_CC_SFE_0_BCR					9</div><div class='add'>+#define CAM_CC_SFE_1_BCR					10</div><div class='add'>+#define CAM_CC_SFE_2_BCR					11</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm8650-dispcc.h b/include/dt-bindings/clock/qcom,sm8650-dispcc.h<br/>index b0a668b395a5..c0a291188f28 100644..120000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8650-dispcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,sm8650-dispcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8650-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm8650-dispcc.h</a></div><div class='hunk'>@@ -1,102 +1 @@</div><div class='del'>-/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved</div><div class='del'>- * Copyright (c) 2023, Linaro Ltd.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _DT_BINDINGS_CLK_QCOM_SM8650_DISP_CC_H</div><div class='del'>-#define _DT_BINDINGS_CLK_QCOM_SM8650_DISP_CC_H</div><div class='del'>-</div><div class='del'>-/* DISP_CC clocks */</div><div class='del'>-#define DISP_CC_MDSS_ACCU_CLK					0</div><div class='del'>-#define DISP_CC_MDSS_AHB1_CLK					1</div><div class='del'>-#define DISP_CC_MDSS_AHB_CLK					2</div><div class='del'>-#define DISP_CC_MDSS_AHB_CLK_SRC				3</div><div class='del'>-#define DISP_CC_MDSS_BYTE0_CLK					4</div><div class='del'>-#define DISP_CC_MDSS_BYTE0_CLK_SRC				5</div><div class='del'>-#define DISP_CC_MDSS_BYTE0_DIV_CLK_SRC				6</div><div class='del'>-#define DISP_CC_MDSS_BYTE0_INTF_CLK				7</div><div class='del'>-#define DISP_CC_MDSS_BYTE1_CLK					8</div><div class='del'>-#define DISP_CC_MDSS_BYTE1_CLK_SRC				9</div><div class='del'>-#define DISP_CC_MDSS_BYTE1_DIV_CLK_SRC				10</div><div class='del'>-#define DISP_CC_MDSS_BYTE1_INTF_CLK				11</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_AUX_CLK				12</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_AUX_CLK_SRC				13</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_CRYPTO_CLK				14</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_LINK_CLK				15</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_LINK_CLK_SRC				16</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_LINK_DIV_CLK_SRC			17</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_LINK_INTF_CLK			18</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_PIXEL0_CLK				19</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC			20</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_PIXEL1_CLK				21</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_PIXEL1_CLK_SRC			22</div><div class='del'>-#define DISP_CC_MDSS_DPTX0_USB_ROUTER_LINK_INTF_CLK		23</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_AUX_CLK				24</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_AUX_CLK_SRC				25</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_CRYPTO_CLK				26</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_LINK_CLK				27</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_LINK_CLK_SRC				28</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_LINK_DIV_CLK_SRC			29</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_LINK_INTF_CLK			30</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_PIXEL0_CLK				31</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_PIXEL0_CLK_SRC			32</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_PIXEL1_CLK				33</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_PIXEL1_CLK_SRC			34</div><div class='del'>-#define DISP_CC_MDSS_DPTX1_USB_ROUTER_LINK_INTF_CLK		35</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_AUX_CLK				36</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_AUX_CLK_SRC				37</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_CRYPTO_CLK				38</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_LINK_CLK				39</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_LINK_CLK_SRC				40</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_LINK_DIV_CLK_SRC			41</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_LINK_INTF_CLK			42</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_PIXEL0_CLK				43</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_PIXEL0_CLK_SRC			44</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_PIXEL1_CLK				45</div><div class='del'>-#define DISP_CC_MDSS_DPTX2_PIXEL1_CLK_SRC			46</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_AUX_CLK				47</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_AUX_CLK_SRC				48</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_CRYPTO_CLK				49</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_LINK_CLK				50</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_LINK_CLK_SRC				51</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_LINK_DIV_CLK_SRC			52</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_LINK_INTF_CLK			53</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_PIXEL0_CLK				54</div><div class='del'>-#define DISP_CC_MDSS_DPTX3_PIXEL0_CLK_SRC			55</div><div class='del'>-#define DISP_CC_MDSS_ESC0_CLK					56</div><div class='del'>-#define DISP_CC_MDSS_ESC0_CLK_SRC				57</div><div class='del'>-#define DISP_CC_MDSS_ESC1_CLK					58</div><div class='del'>-#define DISP_CC_MDSS_ESC1_CLK_SRC				59</div><div class='del'>-#define DISP_CC_MDSS_MDP1_CLK					60</div><div class='del'>-#define DISP_CC_MDSS_MDP_CLK					61</div><div class='del'>-#define DISP_CC_MDSS_MDP_CLK_SRC				62</div><div class='del'>-#define DISP_CC_MDSS_MDP_LUT1_CLK				63</div><div class='del'>-#define DISP_CC_MDSS_MDP_LUT_CLK				64</div><div class='del'>-#define DISP_CC_MDSS_NON_GDSC_AHB_CLK				65</div><div class='del'>-#define DISP_CC_MDSS_PCLK0_CLK					66</div><div class='del'>-#define DISP_CC_MDSS_PCLK0_CLK_SRC				67</div><div class='del'>-#define DISP_CC_MDSS_PCLK1_CLK					68</div><div class='del'>-#define DISP_CC_MDSS_PCLK1_CLK_SRC				69</div><div class='del'>-#define DISP_CC_MDSS_RSCC_AHB_CLK				70</div><div class='del'>-#define DISP_CC_MDSS_RSCC_VSYNC_CLK				71</div><div class='del'>-#define DISP_CC_MDSS_VSYNC1_CLK					72</div><div class='del'>-#define DISP_CC_MDSS_VSYNC_CLK					73</div><div class='del'>-#define DISP_CC_MDSS_VSYNC_CLK_SRC				74</div><div class='del'>-#define DISP_CC_PLL0						75</div><div class='del'>-#define DISP_CC_PLL1						76</div><div class='del'>-#define DISP_CC_SLEEP_CLK					77</div><div class='del'>-#define DISP_CC_SLEEP_CLK_SRC					78</div><div class='del'>-#define DISP_CC_XO_CLK						79</div><div class='del'>-#define DISP_CC_XO_CLK_SRC					80</div><div class='del'>-</div><div class='del'>-/* DISP_CC resets */</div><div class='del'>-#define DISP_CC_MDSS_CORE_BCR					0</div><div class='del'>-#define DISP_CC_MDSS_CORE_INT2_BCR				1</div><div class='del'>-#define DISP_CC_MDSS_RSCC_BCR					2</div><div class='del'>-</div><div class='del'>-/* DISP_CC GDSCR */</div><div class='del'>-#define MDSS_GDSC						0</div><div class='del'>-#define MDSS_INT2_GDSC						1</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+qcom,sm8550-dispcc.h
\ No newline at end of file</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm8650-videocc.h b/include/dt-bindings/clock/qcom,sm8650-videocc.h<br/>new file mode 100644<br/>index 000000000000..4e3c2d87280f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8650-videocc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm8650-videocc.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM8650_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM8650_H</div><div class='add'>+</div><div class='add'>+#include "qcom,sm8450-videocc.h"</div><div class='add'>+</div><div class='add'>+/* SM8650 introduces below new clocks and resets compared to SM8450 */</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC clocks */</div><div class='add'>+#define VIDEO_CC_MVS0_SHIFT_CLK					12</div><div class='add'>+#define VIDEO_CC_MVS0C_SHIFT_CLK				13</div><div class='add'>+#define VIDEO_CC_MVS1_SHIFT_CLK					14</div><div class='add'>+#define VIDEO_CC_MVS1C_SHIFT_CLK				15</div><div class='add'>+#define VIDEO_CC_XO_CLK_SRC					16</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC resets */</div><div class='add'>+#define VIDEO_CC_XO_CLK_ARES					7</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm8750-dispcc.h b/include/dt-bindings/clock/qcom,sm8750-dispcc.h<br/>new file mode 100644<br/>index 000000000000..dafb5069c96a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8750-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm8750-dispcc.h</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024, Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_SM8750_DISP_CC_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_SM8750_DISP_CC_H</div><div class='add'>+</div><div class='add'>+/* DISP_CC clocks */</div><div class='add'>+#define DISP_CC_ESYNC0_CLK					0</div><div class='add'>+#define DISP_CC_ESYNC0_CLK_SRC					1</div><div class='add'>+#define DISP_CC_ESYNC1_CLK					2</div><div class='add'>+#define DISP_CC_ESYNC1_CLK_SRC					3</div><div class='add'>+#define DISP_CC_MDSS_ACCU_SHIFT_CLK				4</div><div class='add'>+#define DISP_CC_MDSS_AHB1_CLK					5</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK					6</div><div class='add'>+#define DISP_CC_MDSS_AHB_CLK_SRC				7</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK					8</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_CLK_SRC				9</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_DIV_CLK_SRC				10</div><div class='add'>+#define DISP_CC_MDSS_BYTE0_INTF_CLK				11</div><div class='add'>+#define DISP_CC_MDSS_BYTE1_CLK					12</div><div class='add'>+#define DISP_CC_MDSS_BYTE1_CLK_SRC				13</div><div class='add'>+#define DISP_CC_MDSS_BYTE1_DIV_CLK_SRC				14</div><div class='add'>+#define DISP_CC_MDSS_BYTE1_INTF_CLK				15</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_AUX_CLK				16</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_AUX_CLK_SRC				17</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_CRYPTO_CLK				18</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_CLK				19</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_CLK_SRC				20</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_DIV_CLK_SRC			21</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_LINK_INTF_CLK			22</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL0_CLK				23</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC			24</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL1_CLK				25</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_PIXEL1_CLK_SRC			26</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_USB_ROUTER_LINK_INTF_CLK		27</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_AUX_CLK				28</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_AUX_CLK_SRC				29</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_CRYPTO_CLK				30</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_CLK				31</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_CLK_SRC				32</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_DIV_CLK_SRC			33</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_LINK_INTF_CLK			34</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_PIXEL0_CLK				35</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_PIXEL0_CLK_SRC			36</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_PIXEL1_CLK				37</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_PIXEL1_CLK_SRC			38</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_USB_ROUTER_LINK_INTF_CLK		39</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_AUX_CLK				40</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_AUX_CLK_SRC				41</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_CRYPTO_CLK				42</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_CLK				43</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_CLK_SRC				44</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_DIV_CLK_SRC			45</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_LINK_INTF_CLK			46</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_PIXEL0_CLK				47</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_PIXEL0_CLK_SRC			48</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_PIXEL1_CLK				49</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_PIXEL1_CLK_SRC			50</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_AUX_CLK				51</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_AUX_CLK_SRC				52</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_CRYPTO_CLK				53</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_CLK				54</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_CLK_SRC				55</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_DIV_CLK_SRC			56</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_LINK_INTF_CLK			57</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_PIXEL0_CLK				58</div><div class='add'>+#define DISP_CC_MDSS_DPTX3_PIXEL0_CLK_SRC			59</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK					60</div><div class='add'>+#define DISP_CC_MDSS_ESC0_CLK_SRC				61</div><div class='add'>+#define DISP_CC_MDSS_ESC1_CLK					62</div><div class='add'>+#define DISP_CC_MDSS_ESC1_CLK_SRC				63</div><div class='add'>+#define DISP_CC_MDSS_MDP1_CLK					64</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK					65</div><div class='add'>+#define DISP_CC_MDSS_MDP_CLK_SRC				66</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT1_CLK				67</div><div class='add'>+#define DISP_CC_MDSS_MDP_LUT_CLK				68</div><div class='add'>+#define DISP_CC_MDSS_NON_GDSC_AHB_CLK				69</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK					70</div><div class='add'>+#define DISP_CC_MDSS_PCLK0_CLK_SRC				71</div><div class='add'>+#define DISP_CC_MDSS_PCLK1_CLK					72</div><div class='add'>+#define DISP_CC_MDSS_PCLK1_CLK_SRC				73</div><div class='add'>+#define DISP_CC_MDSS_PCLK2_CLK					74</div><div class='add'>+#define DISP_CC_MDSS_PCLK2_CLK_SRC				75</div><div class='add'>+#define DISP_CC_MDSS_RSCC_AHB_CLK				76</div><div class='add'>+#define DISP_CC_MDSS_RSCC_VSYNC_CLK				77</div><div class='add'>+#define DISP_CC_MDSS_VSYNC1_CLK					78</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK					79</div><div class='add'>+#define DISP_CC_MDSS_VSYNC_CLK_SRC				80</div><div class='add'>+#define DISP_CC_OSC_CLK						81</div><div class='add'>+#define DISP_CC_OSC_CLK_SRC					82</div><div class='add'>+#define DISP_CC_PLL0						83</div><div class='add'>+#define DISP_CC_PLL1						84</div><div class='add'>+#define DISP_CC_PLL2						85</div><div class='add'>+#define DISP_CC_SLEEP_CLK					86</div><div class='add'>+#define DISP_CC_SLEEP_CLK_SRC					87</div><div class='add'>+#define DISP_CC_XO_CLK						88</div><div class='add'>+#define DISP_CC_XO_CLK_SRC					89</div><div class='add'>+</div><div class='add'>+/* DISP_CC resets */</div><div class='add'>+#define DISP_CC_MDSS_CORE_BCR					0</div><div class='add'>+#define DISP_CC_MDSS_CORE_INT2_BCR				1</div><div class='add'>+#define DISP_CC_MDSS_RSCC_BCR					2</div><div class='add'>+</div><div class='add'>+/* DISP_CC GDSCR */</div><div class='add'>+#define MDSS_GDSC						0</div><div class='add'>+#define MDSS_INT2_GDSC						1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm8750-gcc.h b/include/dt-bindings/clock/qcom,sm8750-gcc.h<br/>new file mode 100644<br/>index 000000000000..e234595d7f42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8750-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm8750-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,226 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_GCC_SM8750_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_GCC_SM8750_H</div><div class='add'>+</div><div class='add'>+/* GCC clocks */</div><div class='add'>+#define GCC_AGGRE_NOC_PCIE_AXI_CLK				0</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_CLK				1</div><div class='add'>+#define GCC_AGGRE_UFS_PHY_AXI_HW_CTL_CLK			2</div><div class='add'>+#define GCC_AGGRE_USB3_PRIM_AXI_CLK				3</div><div class='add'>+#define GCC_BOOT_ROM_AHB_CLK					4</div><div class='add'>+#define GCC_CAM_BIST_MCLK_AHB_CLK				5</div><div class='add'>+#define GCC_CAMERA_AHB_CLK					6</div><div class='add'>+#define GCC_CAMERA_HF_AXI_CLK					7</div><div class='add'>+#define GCC_CAMERA_SF_AXI_CLK					8</div><div class='add'>+#define GCC_CAMERA_XO_CLK					9</div><div class='add'>+#define GCC_CFG_NOC_PCIE_ANOC_AHB_CLK				10</div><div class='add'>+#define GCC_CFG_NOC_USB3_PRIM_AXI_CLK				11</div><div class='add'>+#define GCC_CNOC_PCIE_SF_AXI_CLK				12</div><div class='add'>+#define GCC_DDRSS_GPU_AXI_CLK					13</div><div class='add'>+#define GCC_DDRSS_PCIE_SF_QTB_CLK				14</div><div class='add'>+#define GCC_DISP_AHB_CLK					15</div><div class='add'>+#define GCC_DISP_HF_AXI_CLK					16</div><div class='add'>+#define GCC_EVA_AHB_CLK						17</div><div class='add'>+#define GCC_EVA_AXI0_CLK					18</div><div class='add'>+#define GCC_EVA_AXI0C_CLK					19</div><div class='add'>+#define GCC_EVA_XO_CLK						20</div><div class='add'>+#define GCC_GP1_CLK						21</div><div class='add'>+#define GCC_GP1_CLK_SRC						22</div><div class='add'>+#define GCC_GP2_CLK						23</div><div class='add'>+#define GCC_GP2_CLK_SRC						24</div><div class='add'>+#define GCC_GP3_CLK						25</div><div class='add'>+#define GCC_GP3_CLK_SRC						26</div><div class='add'>+#define GCC_GPLL0						27</div><div class='add'>+#define GCC_GPLL0_OUT_EVEN					28</div><div class='add'>+#define GCC_GPLL1						29</div><div class='add'>+#define GCC_GPLL4						30</div><div class='add'>+#define GCC_GPLL7						31</div><div class='add'>+#define GCC_GPLL9						32</div><div class='add'>+#define GCC_GPU_CFG_AHB_CLK					33</div><div class='add'>+#define GCC_GPU_GEMNOC_GFX_CLK					34</div><div class='add'>+#define GCC_GPU_GPLL0_CLK_SRC					35</div><div class='add'>+#define GCC_GPU_GPLL0_DIV_CLK_SRC				36</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK					37</div><div class='add'>+#define GCC_PCIE_0_AUX_CLK_SRC					38</div><div class='add'>+#define GCC_PCIE_0_CFG_AHB_CLK					39</div><div class='add'>+#define GCC_PCIE_0_MSTR_AXI_CLK					40</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK				41</div><div class='add'>+#define GCC_PCIE_0_PHY_RCHNG_CLK_SRC				42</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK					43</div><div class='add'>+#define GCC_PCIE_0_PIPE_CLK_SRC					44</div><div class='add'>+#define GCC_PCIE_0_SLV_AXI_CLK					45</div><div class='add'>+#define GCC_PCIE_0_SLV_Q2A_AXI_CLK				46</div><div class='add'>+#define GCC_PCIE_RSCC_CFG_AHB_CLK				47</div><div class='add'>+#define GCC_PCIE_RSCC_XO_CLK					48</div><div class='add'>+#define GCC_PDM2_CLK						49</div><div class='add'>+#define GCC_PDM2_CLK_SRC					50</div><div class='add'>+#define GCC_PDM_AHB_CLK						51</div><div class='add'>+#define GCC_PDM_XO4_CLK						52</div><div class='add'>+#define GCC_QMIP_CAMERA_CMD_AHB_CLK				53</div><div class='add'>+#define GCC_QMIP_CAMERA_NRT_AHB_CLK				54</div><div class='add'>+#define GCC_QMIP_CAMERA_RT_AHB_CLK				55</div><div class='add'>+#define GCC_QMIP_GPU_AHB_CLK					56</div><div class='add'>+#define GCC_QMIP_PCIE_AHB_CLK					57</div><div class='add'>+#define GCC_QMIP_VIDEO_CV_CPU_AHB_CLK				58</div><div class='add'>+#define GCC_QMIP_VIDEO_CVP_AHB_CLK				59</div><div class='add'>+#define GCC_QMIP_VIDEO_V_CPU_AHB_CLK				60</div><div class='add'>+#define GCC_QMIP_VIDEO_VCODEC_AHB_CLK				61</div><div class='add'>+#define GCC_QUPV3_I2C_CORE_CLK					62</div><div class='add'>+#define GCC_QUPV3_I2C_S0_CLK					63</div><div class='add'>+#define GCC_QUPV3_I2C_S0_CLK_SRC				64</div><div class='add'>+#define GCC_QUPV3_I2C_S1_CLK					65</div><div class='add'>+#define GCC_QUPV3_I2C_S1_CLK_SRC				66</div><div class='add'>+#define GCC_QUPV3_I2C_S2_CLK					67</div><div class='add'>+#define GCC_QUPV3_I2C_S2_CLK_SRC				68</div><div class='add'>+#define GCC_QUPV3_I2C_S3_CLK					69</div><div class='add'>+#define GCC_QUPV3_I2C_S3_CLK_SRC				70</div><div class='add'>+#define GCC_QUPV3_I2C_S4_CLK					71</div><div class='add'>+#define GCC_QUPV3_I2C_S4_CLK_SRC				72</div><div class='add'>+#define GCC_QUPV3_I2C_S5_CLK					73</div><div class='add'>+#define GCC_QUPV3_I2C_S5_CLK_SRC				74</div><div class='add'>+#define GCC_QUPV3_I2C_S6_CLK					75</div><div class='add'>+#define GCC_QUPV3_I2C_S6_CLK_SRC				76</div><div class='add'>+#define GCC_QUPV3_I2C_S7_CLK					77</div><div class='add'>+#define GCC_QUPV3_I2C_S7_CLK_SRC				78</div><div class='add'>+#define GCC_QUPV3_I2C_S8_CLK					79</div><div class='add'>+#define GCC_QUPV3_I2C_S8_CLK_SRC				80</div><div class='add'>+#define GCC_QUPV3_I2C_S9_CLK					81</div><div class='add'>+#define GCC_QUPV3_I2C_S9_CLK_SRC				82</div><div class='add'>+#define GCC_QUPV3_I2C_S_AHB_CLK					83</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_2X_CLK				84</div><div class='add'>+#define GCC_QUPV3_WRAP1_CORE_CLK				85</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_REF_CLK				86</div><div class='add'>+#define GCC_QUPV3_WRAP1_QSPI_REF_CLK_SRC			87</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK					88</div><div class='add'>+#define GCC_QUPV3_WRAP1_S0_CLK_SRC				89</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK					90</div><div class='add'>+#define GCC_QUPV3_WRAP1_S1_CLK_SRC				91</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK					92</div><div class='add'>+#define GCC_QUPV3_WRAP1_S2_CLK_SRC				93</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK					94</div><div class='add'>+#define GCC_QUPV3_WRAP1_S3_CLK_SRC				95</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK					96</div><div class='add'>+#define GCC_QUPV3_WRAP1_S4_CLK_SRC				97</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK					98</div><div class='add'>+#define GCC_QUPV3_WRAP1_S5_CLK_SRC				99</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK					100</div><div class='add'>+#define GCC_QUPV3_WRAP1_S6_CLK_SRC				101</div><div class='add'>+#define GCC_QUPV3_WRAP1_S7_CLK					102</div><div class='add'>+#define GCC_QUPV3_WRAP1_S7_CLK_SRC				103</div><div class='add'>+#define GCC_QUPV3_WRAP2_CORE_2X_CLK				104</div><div class='add'>+#define GCC_QUPV3_WRAP2_CORE_CLK				105</div><div class='add'>+#define GCC_QUPV3_WRAP2_IBI_CTRL_0_CLK_SRC			106</div><div class='add'>+#define GCC_QUPV3_WRAP2_IBI_CTRL_2_CLK				107</div><div class='add'>+#define GCC_QUPV3_WRAP2_IBI_CTRL_3_CLK				108</div><div class='add'>+#define GCC_QUPV3_WRAP2_S0_CLK					109</div><div class='add'>+#define GCC_QUPV3_WRAP2_S0_CLK_SRC				110</div><div class='add'>+#define GCC_QUPV3_WRAP2_S1_CLK					111</div><div class='add'>+#define GCC_QUPV3_WRAP2_S1_CLK_SRC				112</div><div class='add'>+#define GCC_QUPV3_WRAP2_S2_CLK					113</div><div class='add'>+#define GCC_QUPV3_WRAP2_S2_CLK_SRC				114</div><div class='add'>+#define GCC_QUPV3_WRAP2_S3_CLK					115</div><div class='add'>+#define GCC_QUPV3_WRAP2_S3_CLK_SRC				116</div><div class='add'>+#define GCC_QUPV3_WRAP2_S4_CLK					117</div><div class='add'>+#define GCC_QUPV3_WRAP2_S4_CLK_SRC				118</div><div class='add'>+#define GCC_QUPV3_WRAP2_S5_CLK					119</div><div class='add'>+#define GCC_QUPV3_WRAP2_S5_CLK_SRC				120</div><div class='add'>+#define GCC_QUPV3_WRAP2_S6_CLK					121</div><div class='add'>+#define GCC_QUPV3_WRAP2_S6_CLK_SRC				122</div><div class='add'>+#define GCC_QUPV3_WRAP2_S7_CLK					123</div><div class='add'>+#define GCC_QUPV3_WRAP2_S7_CLK_SRC				124</div><div class='add'>+#define GCC_QUPV3_WRAP_1_M_AHB_CLK				125</div><div class='add'>+#define GCC_QUPV3_WRAP_1_S_AHB_CLK				126</div><div class='add'>+#define GCC_QUPV3_WRAP_2_IBI_2_AHB_CLK				127</div><div class='add'>+#define GCC_QUPV3_WRAP_2_IBI_3_AHB_CLK				128</div><div class='add'>+#define GCC_QUPV3_WRAP_2_M_AHB_CLK				129</div><div class='add'>+#define GCC_QUPV3_WRAP_2_S_AHB_CLK				130</div><div class='add'>+#define GCC_SDCC2_AHB_CLK					131</div><div class='add'>+#define GCC_SDCC2_APPS_CLK					132</div><div class='add'>+#define GCC_SDCC2_APPS_CLK_SRC					133</div><div class='add'>+#define GCC_SDCC4_AHB_CLK					134</div><div class='add'>+#define GCC_SDCC4_APPS_CLK					135</div><div class='add'>+#define GCC_SDCC4_APPS_CLK_SRC					136</div><div class='add'>+#define GCC_UFS_PHY_AHB_CLK					137</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK					138</div><div class='add'>+#define GCC_UFS_PHY_AXI_CLK_SRC					139</div><div class='add'>+#define GCC_UFS_PHY_AXI_HW_CTL_CLK				140</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK				141</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_CLK_SRC				142</div><div class='add'>+#define GCC_UFS_PHY_ICE_CORE_HW_CTL_CLK				143</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK					144</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_CLK_SRC				145</div><div class='add'>+#define GCC_UFS_PHY_PHY_AUX_HW_CTL_CLK				146</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK				147</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_0_CLK_SRC				148</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK				149</div><div class='add'>+#define GCC_UFS_PHY_RX_SYMBOL_1_CLK_SRC				150</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK				151</div><div class='add'>+#define GCC_UFS_PHY_TX_SYMBOL_0_CLK_SRC				152</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK				153</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_CLK_SRC				154</div><div class='add'>+#define GCC_UFS_PHY_UNIPRO_CORE_HW_CTL_CLK			155</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK				156</div><div class='add'>+#define GCC_USB30_PRIM_MASTER_CLK_SRC				157</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK				158</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_CLK_SRC			159</div><div class='add'>+#define GCC_USB30_PRIM_MOCK_UTMI_POSTDIV_CLK_SRC		160</div><div class='add'>+#define GCC_USB30_PRIM_SLEEP_CLK				161</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK				162</div><div class='add'>+#define GCC_USB3_PRIM_PHY_AUX_CLK_SRC				163</div><div class='add'>+#define GCC_USB3_PRIM_PHY_COM_AUX_CLK				164</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK				165</div><div class='add'>+#define GCC_USB3_PRIM_PHY_PIPE_CLK_SRC				166</div><div class='add'>+#define GCC_VIDEO_AHB_CLK					167</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK					168</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK					169</div><div class='add'>+#define GCC_VIDEO_XO_CLK					170</div><div class='add'>+</div><div class='add'>+/* GCC power domains */</div><div class='add'>+#define GCC_PCIE_0_GDSC						0</div><div class='add'>+#define GCC_PCIE_0_PHY_GDSC					1</div><div class='add'>+#define GCC_UFS_MEM_PHY_GDSC					2</div><div class='add'>+#define GCC_UFS_PHY_GDSC					3</div><div class='add'>+#define GCC_USB30_PRIM_GDSC					4</div><div class='add'>+#define GCC_USB3_PHY_GDSC					5</div><div class='add'>+</div><div class='add'>+/* GCC resets */</div><div class='add'>+#define GCC_CAMERA_BCR						0</div><div class='add'>+#define GCC_DISPLAY_BCR						1</div><div class='add'>+#define GCC_EVA_BCR						2</div><div class='add'>+#define GCC_GPU_BCR						3</div><div class='add'>+#define GCC_PCIE_0_BCR						4</div><div class='add'>+#define GCC_PCIE_0_LINK_DOWN_BCR				5</div><div class='add'>+#define GCC_PCIE_0_NOCSR_COM_PHY_BCR				6</div><div class='add'>+#define GCC_PCIE_0_PHY_BCR					7</div><div class='add'>+#define GCC_PCIE_0_PHY_NOCSR_COM_PHY_BCR			8</div><div class='add'>+#define GCC_PCIE_PHY_BCR					9</div><div class='add'>+#define GCC_PCIE_PHY_CFG_AHB_BCR				10</div><div class='add'>+#define GCC_PCIE_PHY_COM_BCR					11</div><div class='add'>+#define GCC_PCIE_RSCC_BCR					12</div><div class='add'>+#define GCC_PDM_BCR						13</div><div class='add'>+#define GCC_QUPV3_WRAPPER_1_BCR					14</div><div class='add'>+#define GCC_QUPV3_WRAPPER_2_BCR					15</div><div class='add'>+#define GCC_QUPV3_WRAPPER_I2C_BCR				16</div><div class='add'>+#define GCC_QUSB2PHY_PRIM_BCR					17</div><div class='add'>+#define GCC_QUSB2PHY_SEC_BCR					18</div><div class='add'>+#define GCC_SDCC2_BCR						19</div><div class='add'>+#define GCC_SDCC4_BCR						20</div><div class='add'>+#define GCC_UFS_PHY_BCR						21</div><div class='add'>+#define GCC_USB30_PRIM_BCR					22</div><div class='add'>+#define GCC_USB3_DP_PHY_PRIM_BCR				23</div><div class='add'>+#define GCC_USB3_DP_PHY_SEC_BCR					24</div><div class='add'>+#define GCC_USB3_PHY_PRIM_BCR					25</div><div class='add'>+#define GCC_USB3_PHY_SEC_BCR					26</div><div class='add'>+#define GCC_USB3PHY_PHY_PRIM_BCR				27</div><div class='add'>+#define GCC_USB3PHY_PHY_SEC_BCR					28</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK_ARES					29</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK_ARES					30</div><div class='add'>+#define GCC_VIDEO_BCR						31</div><div class='add'>+#define GCC_EVA_AXI0_CLK_ARES					32</div><div class='add'>+#define GCC_EVA_AXI0C_CLK_ARES					33</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm8750-tcsr.h b/include/dt-bindings/clock/qcom,sm8750-tcsr.h<br/>new file mode 100644<br/>index 000000000000..1c502ac7c7f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8750-tcsr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm8750-tcsr.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_TCSR_CC_SM8750_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_TCSR_CC_SM8750_H</div><div class='add'>+</div><div class='add'>+/* TCSR_CC clocks */</div><div class='add'>+#define TCSR_PCIE_0_CLKREF_EN				0</div><div class='add'>+#define TCSR_UFS_CLKREF_EN				1</div><div class='add'>+#define TCSR_USB2_CLKREF_EN				2</div><div class='add'>+#define TCSR_USB3_CLKREF_EN				3</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,sm8750-videocc.h b/include/dt-bindings/clock/qcom,sm8750-videocc.h<br/>new file mode 100644<br/>index 000000000000..f3bfa2ba5160<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,sm8750-videocc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,sm8750-videocc.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM8750_H</div><div class='add'>+#define _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM8750_H</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC clocks */</div><div class='add'>+#define VIDEO_CC_AHB_CLK					0</div><div class='add'>+#define VIDEO_CC_AHB_CLK_SRC					1</div><div class='add'>+#define VIDEO_CC_MVS0_CLK					2</div><div class='add'>+#define VIDEO_CC_MVS0_CLK_SRC					3</div><div class='add'>+#define VIDEO_CC_MVS0_DIV_CLK_SRC				4</div><div class='add'>+#define VIDEO_CC_MVS0_FREERUN_CLK				5</div><div class='add'>+#define VIDEO_CC_MVS0_SHIFT_CLK					6</div><div class='add'>+#define VIDEO_CC_MVS0C_CLK					7</div><div class='add'>+#define VIDEO_CC_MVS0C_DIV2_DIV_CLK_SRC				8</div><div class='add'>+#define VIDEO_CC_MVS0C_FREERUN_CLK				9</div><div class='add'>+#define VIDEO_CC_MVS0C_SHIFT_CLK				10</div><div class='add'>+#define VIDEO_CC_PLL0						11</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK					12</div><div class='add'>+#define VIDEO_CC_SLEEP_CLK_SRC					13</div><div class='add'>+#define VIDEO_CC_XO_CLK						14</div><div class='add'>+#define VIDEO_CC_XO_CLK_SRC					15</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC power domains */</div><div class='add'>+#define VIDEO_CC_MVS0_GDSC					0</div><div class='add'>+#define VIDEO_CC_MVS0C_GDSC					1</div><div class='add'>+</div><div class='add'>+/* VIDEO_CC resets */</div><div class='add'>+#define VIDEO_CC_INTERFACE_BCR					0</div><div class='add'>+#define VIDEO_CC_MVS0_BCR					1</div><div class='add'>+#define VIDEO_CC_MVS0C_CLK_ARES					2</div><div class='add'>+#define VIDEO_CC_MVS0C_BCR					3</div><div class='add'>+#define VIDEO_CC_MVS0_FREERUN_CLK_ARES				4</div><div class='add'>+#define VIDEO_CC_MVS0C_FREERUN_CLK_ARES				5</div><div class='add'>+#define VIDEO_CC_XO_CLK_ARES					6</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,x1e80100-dispcc.h b/include/dt-bindings/clock/qcom,x1e80100-dispcc.h<br/>index d4a83e4fd0d1..49b3a9e5ce4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,x1e80100-dispcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,x1e80100-dispcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,x1e80100-dispcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,x1e80100-dispcc.h</a></div><div class='hunk'>@@ -90,6 +90,9 @@</div><div class='ctx'> #define DISP_CC_MDSS_CORE_BCR					0</div><div class='ctx'> #define DISP_CC_MDSS_CORE_INT2_BCR				1</div><div class='ctx'> #define DISP_CC_MDSS_RSCC_BCR					2</div><div class='add'>+#define DISP_CC_MDSS_DPTX0_USB_ROUTER_LINK_INTF_CLK_ARES	3</div><div class='add'>+#define DISP_CC_MDSS_DPTX1_USB_ROUTER_LINK_INTF_CLK_ARES	4</div><div class='add'>+#define DISP_CC_MDSS_DPTX2_USB_ROUTER_LINK_INTF_CLK_ARES	5</div><div class='ctx'> </div><div class='ctx'> /* DISP_CC GDSCR */</div><div class='ctx'> #define MDSS_GDSC						0</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,x1e80100-gcc.h b/include/dt-bindings/clock/qcom,x1e80100-gcc.h<br/>index 24ba9e2a5cf6..62aa12425592 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,x1e80100-gcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,x1e80100-gcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,x1e80100-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,x1e80100-gcc.h</a></div><div class='hunk'>@@ -363,6 +363,30 @@</div><div class='ctx'> #define GCC_USB3_PRIM_PHY_PIPE_CLK_SRC				353</div><div class='ctx'> #define GCC_USB3_SEC_PHY_PIPE_CLK_SRC				354</div><div class='ctx'> #define GCC_USB3_TERT_PHY_PIPE_CLK_SRC				355</div><div class='add'>+#define GCC_USB34_PRIM_PHY_PIPE_CLK_SRC				356</div><div class='add'>+#define GCC_USB34_SEC_PHY_PIPE_CLK_SRC				357</div><div class='add'>+#define GCC_USB34_TERT_PHY_PIPE_CLK_SRC				358</div><div class='add'>+#define GCC_USB4_0_PHY_DP0_CLK_SRC				359</div><div class='add'>+#define GCC_USB4_0_PHY_DP1_CLK_SRC				360</div><div class='add'>+#define GCC_USB4_0_PHY_P2RR2P_PIPE_CLK_SRC			361</div><div class='add'>+#define GCC_USB4_0_PHY_PCIE_PIPE_MUX_CLK_SRC			362</div><div class='add'>+#define GCC_USB4_0_PHY_RX0_CLK_SRC				363</div><div class='add'>+#define GCC_USB4_0_PHY_RX1_CLK_SRC				364</div><div class='add'>+#define GCC_USB4_0_PHY_SYS_CLK_SRC				365</div><div class='add'>+#define GCC_USB4_1_PHY_DP0_CLK_SRC				366</div><div class='add'>+#define GCC_USB4_1_PHY_DP1_CLK_SRC				367</div><div class='add'>+#define GCC_USB4_1_PHY_P2RR2P_PIPE_CLK_SRC			368</div><div class='add'>+#define GCC_USB4_1_PHY_PCIE_PIPE_MUX_CLK_SRC			369</div><div class='add'>+#define GCC_USB4_1_PHY_RX0_CLK_SRC				370</div><div class='add'>+#define GCC_USB4_1_PHY_RX1_CLK_SRC				371</div><div class='add'>+#define GCC_USB4_1_PHY_SYS_CLK_SRC				372</div><div class='add'>+#define GCC_USB4_2_PHY_DP0_CLK_SRC				373</div><div class='add'>+#define GCC_USB4_2_PHY_DP1_CLK_SRC				374</div><div class='add'>+#define GCC_USB4_2_PHY_P2RR2P_PIPE_CLK_SRC			375</div><div class='add'>+#define GCC_USB4_2_PHY_PCIE_PIPE_MUX_CLK_SRC			376</div><div class='add'>+#define GCC_USB4_2_PHY_RX0_CLK_SRC				377</div><div class='add'>+#define GCC_USB4_2_PHY_RX1_CLK_SRC				378</div><div class='add'>+#define GCC_USB4_2_PHY_SYS_CLK_SRC				379</div><div class='ctx'> </div><div class='ctx'> /* GCC power domains */</div><div class='ctx'> #define GCC_PCIE_0_TUNNEL_GDSC					0</div><div class='hunk'>@@ -482,4 +506,43 @@</div><div class='ctx'> #define GCC_USB_1_PHY_BCR					85</div><div class='ctx'> #define GCC_USB_2_PHY_BCR					86</div><div class='ctx'> #define GCC_VIDEO_BCR						87</div><div class='add'>+#define GCC_VIDEO_AXI0_CLK_ARES					88</div><div class='add'>+#define GCC_VIDEO_AXI1_CLK_ARES					89</div><div class='add'>+#define GCC_USB4_0_MISC_USB4_SYS_BCR				90</div><div class='add'>+#define GCC_USB4_0_MISC_RX_CLK_0_BCR				91</div><div class='add'>+#define GCC_USB4_0_MISC_RX_CLK_1_BCR				92</div><div class='add'>+#define GCC_USB4_0_MISC_USB_PIPE_BCR				93</div><div class='add'>+#define GCC_USB4_0_MISC_PCIE_PIPE_BCR				94</div><div class='add'>+#define GCC_USB4_0_MISC_TMU_BCR					95</div><div class='add'>+#define GCC_USB4_0_MISC_SB_IF_BCR				96</div><div class='add'>+#define GCC_USB4_0_MISC_HIA_MSTR_BCR				97</div><div class='add'>+#define GCC_USB4_0_MISC_AHB_BCR					98</div><div class='add'>+#define GCC_USB4_0_MISC_DP0_MAX_PCLK_BCR			99</div><div class='add'>+#define GCC_USB4_0_MISC_DP1_MAX_PCLK_BCR			100</div><div class='add'>+#define GCC_USB4_1_MISC_USB4_SYS_BCR				101</div><div class='add'>+#define GCC_USB4_1_MISC_RX_CLK_0_BCR				102</div><div class='add'>+#define GCC_USB4_1_MISC_RX_CLK_1_BCR				103</div><div class='add'>+#define GCC_USB4_1_MISC_USB_PIPE_BCR				104</div><div class='add'>+#define GCC_USB4_1_MISC_PCIE_PIPE_BCR				105</div><div class='add'>+#define GCC_USB4_1_MISC_TMU_BCR					106</div><div class='add'>+#define GCC_USB4_1_MISC_SB_IF_BCR				107</div><div class='add'>+#define GCC_USB4_1_MISC_HIA_MSTR_BCR				108</div><div class='add'>+#define GCC_USB4_1_MISC_AHB_BCR					109</div><div class='add'>+#define GCC_USB4_1_MISC_DP0_MAX_PCLK_BCR			110</div><div class='add'>+#define GCC_USB4_1_MISC_DP1_MAX_PCLK_BCR			111</div><div class='add'>+#define GCC_USB4_2_MISC_USB4_SYS_BCR				112</div><div class='add'>+#define GCC_USB4_2_MISC_RX_CLK_0_BCR				113</div><div class='add'>+#define GCC_USB4_2_MISC_RX_CLK_1_BCR				114</div><div class='add'>+#define GCC_USB4_2_MISC_USB_PIPE_BCR				115</div><div class='add'>+#define GCC_USB4_2_MISC_PCIE_PIPE_BCR				116</div><div class='add'>+#define GCC_USB4_2_MISC_TMU_BCR					117</div><div class='add'>+#define GCC_USB4_2_MISC_SB_IF_BCR				118</div><div class='add'>+#define GCC_USB4_2_MISC_HIA_MSTR_BCR				119</div><div class='add'>+#define GCC_USB4_2_MISC_AHB_BCR					120</div><div class='add'>+#define GCC_USB4_2_MISC_DP0_MAX_PCLK_BCR			121</div><div class='add'>+#define GCC_USB4_2_MISC_DP1_MAX_PCLK_BCR			122</div><div class='add'>+#define GCC_USB4PHY_PHY_PRIM_BCR				123</div><div class='add'>+#define GCC_USB4PHY_PHY_SEC_BCR					124</div><div class='add'>+#define GCC_USB4PHY_PHY_TERT_BCR				125</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/qcom,x1e80100-gpucc.h b/include/dt-bindings/clock/qcom,x1e80100-gpucc.h<br/>index 61a3a8f3ac43..27b8f50541fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,x1e80100-gpucc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/qcom,x1e80100-gpucc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/qcom,x1e80100-gpucc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/qcom,x1e80100-gpucc.h</a></div><div class='hunk'>@@ -33,9 +33,22 @@</div><div class='ctx'> #define GPU_CC_SLEEP_CLK					23</div><div class='ctx'> #define GPU_CC_XO_CLK_SRC					24</div><div class='ctx'> #define GPU_CC_XO_DIV_CLK_SRC					25</div><div class='add'>+#define GPU_CC_CX_ACCU_SHIFT_CLK				26</div><div class='add'>+#define GPU_CC_GX_ACCU_SHIFT_CLK				27</div><div class='ctx'> </div><div class='ctx'> /* GDSCs */</div><div class='ctx'> #define GPU_CX_GDSC						0</div><div class='ctx'> #define GPU_GX_GDSC						1</div><div class='ctx'> </div><div class='add'>+/* GPU_CC resets */</div><div class='add'>+#define GPU_CC_ACD_BCR                                          0</div><div class='add'>+#define GPU_CC_CB_BCR                                           1</div><div class='add'>+#define GPU_CC_CX_BCR                                           2</div><div class='add'>+#define GPU_CC_FAST_HUB_BCR                                     3</div><div class='add'>+#define GPU_CC_FF_BCR                                           4</div><div class='add'>+#define GPU_CC_GFX3D_AON_BCR                                    5</div><div class='add'>+#define GPU_CC_GMU_BCR                                          6</div><div class='add'>+#define GPU_CC_GX_BCR                                           7</div><div class='add'>+#define GPU_CC_XO_BCR                                           8</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a73a4-clock.h b/include/dt-bindings/clock/r8a73a4-clock.h<br/>index 1ec4827b8091..655440a3e7c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a73a4-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a73a4-clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a73a4-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/r8a73a4-clock.h</a></div><div class='hunk'>@@ -24,6 +24,10 @@</div><div class='ctx'> #define R8A73A4_CLK_ZS		14</div><div class='ctx'> #define R8A73A4_CLK_HP		15</div><div class='ctx'> </div><div class='add'>+/* MSTP1 */</div><div class='add'>+#define R8A73A4_CLK_TMU0	25</div><div class='add'>+#define R8A73A4_CLK_TMU3	21</div><div class='add'>+</div><div class='ctx'> /* MSTP2 */</div><div class='ctx'> #define R8A73A4_CLK_DMAC	18</div><div class='ctx'> #define R8A73A4_CLK_SCIFB3	17</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a7779-clock.h b/include/dt-bindings/clock/r8a7779-clock.h<br/>index 342a60b11934..e39acdc6499c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a7779-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7779-clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a7779-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/r8a7779-clock.h</a></div><div class='hunk'>@@ -57,5 +57,4 @@</div><div class='ctx'> #define R8A7779_CLK_MMC1	30</div><div class='ctx'> #define R8A7779_CLK_MMC0	31</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #endif /* __DT_BINDINGS_CLOCK_R8A7779_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h<br/>deleted file mode 100644<br/>index c92ff1e60223..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a7790-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7790-clock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,158 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright 2013 Ideas On Board SPRL</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DT_BINDINGS_CLOCK_R8A7790_H__</div><div class='del'>-#define __DT_BINDINGS_CLOCK_R8A7790_H__</div><div class='del'>-</div><div class='del'>-/* CPG */</div><div class='del'>-#define R8A7790_CLK_MAIN		0</div><div class='del'>-#define R8A7790_CLK_PLL0		1</div><div class='del'>-#define R8A7790_CLK_PLL1		2</div><div class='del'>-#define R8A7790_CLK_PLL3		3</div><div class='del'>-#define R8A7790_CLK_LB			4</div><div class='del'>-#define R8A7790_CLK_QSPI		5</div><div class='del'>-#define R8A7790_CLK_SDH			6</div><div class='del'>-#define R8A7790_CLK_SD0			7</div><div class='del'>-#define R8A7790_CLK_SD1			8</div><div class='del'>-#define R8A7790_CLK_Z			9</div><div class='del'>-#define R8A7790_CLK_RCAN		10</div><div class='del'>-#define R8A7790_CLK_ADSP		11</div><div class='del'>-</div><div class='del'>-/* MSTP0 */</div><div class='del'>-#define R8A7790_CLK_MSIOF0		0</div><div class='del'>-</div><div class='del'>-/* MSTP1 */</div><div class='del'>-#define R8A7790_CLK_VCP1		0</div><div class='del'>-#define R8A7790_CLK_VCP0		1</div><div class='del'>-#define R8A7790_CLK_VPC1		2</div><div class='del'>-#define R8A7790_CLK_VPC0		3</div><div class='del'>-#define R8A7790_CLK_JPU			6</div><div class='del'>-#define R8A7790_CLK_SSP1		9</div><div class='del'>-#define R8A7790_CLK_TMU1		11</div><div class='del'>-#define R8A7790_CLK_3DG			12</div><div class='del'>-#define R8A7790_CLK_2DDMAC		15</div><div class='del'>-#define R8A7790_CLK_FDP1_2		17</div><div class='del'>-#define R8A7790_CLK_FDP1_1		18</div><div class='del'>-#define R8A7790_CLK_FDP1_0		19</div><div class='del'>-#define R8A7790_CLK_TMU3		21</div><div class='del'>-#define R8A7790_CLK_TMU2		22</div><div class='del'>-#define R8A7790_CLK_CMT0		24</div><div class='del'>-#define R8A7790_CLK_TMU0		25</div><div class='del'>-#define R8A7790_CLK_VSP1_DU1		27</div><div class='del'>-#define R8A7790_CLK_VSP1_DU0		28</div><div class='del'>-#define R8A7790_CLK_VSP1_R		30</div><div class='del'>-#define R8A7790_CLK_VSP1_S		31</div><div class='del'>-</div><div class='del'>-/* MSTP2 */</div><div class='del'>-#define R8A7790_CLK_SCIFA2		2</div><div class='del'>-#define R8A7790_CLK_SCIFA1		3</div><div class='del'>-#define R8A7790_CLK_SCIFA0		4</div><div class='del'>-#define R8A7790_CLK_MSIOF2		5</div><div class='del'>-#define R8A7790_CLK_SCIFB0		6</div><div class='del'>-#define R8A7790_CLK_SCIFB1		7</div><div class='del'>-#define R8A7790_CLK_MSIOF1		8</div><div class='del'>-#define R8A7790_CLK_MSIOF3		15</div><div class='del'>-#define R8A7790_CLK_SCIFB2		16</div><div class='del'>-#define R8A7790_CLK_SYS_DMAC1		18</div><div class='del'>-#define R8A7790_CLK_SYS_DMAC0		19</div><div class='del'>-</div><div class='del'>-/* MSTP3 */</div><div class='del'>-#define R8A7790_CLK_IIC2		0</div><div class='del'>-#define R8A7790_CLK_TPU0		4</div><div class='del'>-#define R8A7790_CLK_MMCIF1		5</div><div class='del'>-#define R8A7790_CLK_SCIF2		10</div><div class='del'>-#define R8A7790_CLK_SDHI3		11</div><div class='del'>-#define R8A7790_CLK_SDHI2		12</div><div class='del'>-#define R8A7790_CLK_SDHI1		13</div><div class='del'>-#define R8A7790_CLK_SDHI0		14</div><div class='del'>-#define R8A7790_CLK_MMCIF0		15</div><div class='del'>-#define R8A7790_CLK_IIC0		18</div><div class='del'>-#define R8A7790_CLK_PCIEC		19</div><div class='del'>-#define R8A7790_CLK_IIC1		23</div><div class='del'>-#define R8A7790_CLK_SSUSB		28</div><div class='del'>-#define R8A7790_CLK_CMT1		29</div><div class='del'>-#define R8A7790_CLK_USBDMAC0		30</div><div class='del'>-#define R8A7790_CLK_USBDMAC1		31</div><div class='del'>-</div><div class='del'>-/* MSTP4 */</div><div class='del'>-#define R8A7790_CLK_IRQC		7</div><div class='del'>-#define R8A7790_CLK_INTC_SYS		8</div><div class='del'>-</div><div class='del'>-/* MSTP5 */</div><div class='del'>-#define R8A7790_CLK_AUDIO_DMAC1		1</div><div class='del'>-#define R8A7790_CLK_AUDIO_DMAC0		2</div><div class='del'>-#define R8A7790_CLK_ADSP_MOD		6</div><div class='del'>-#define R8A7790_CLK_THERMAL		22</div><div class='del'>-#define R8A7790_CLK_PWM			23</div><div class='del'>-</div><div class='del'>-/* MSTP7 */</div><div class='del'>-#define R8A7790_CLK_EHCI		3</div><div class='del'>-#define R8A7790_CLK_HSUSB		4</div><div class='del'>-#define R8A7790_CLK_HSCIF1		16</div><div class='del'>-#define R8A7790_CLK_HSCIF0		17</div><div class='del'>-#define R8A7790_CLK_SCIF1		20</div><div class='del'>-#define R8A7790_CLK_SCIF0		21</div><div class='del'>-#define R8A7790_CLK_DU2			22</div><div class='del'>-#define R8A7790_CLK_DU1			23</div><div class='del'>-#define R8A7790_CLK_DU0			24</div><div class='del'>-#define R8A7790_CLK_LVDS1		25</div><div class='del'>-#define R8A7790_CLK_LVDS0		26</div><div class='del'>-</div><div class='del'>-/* MSTP8 */</div><div class='del'>-#define R8A7790_CLK_MLB			2</div><div class='del'>-#define R8A7790_CLK_VIN3		8</div><div class='del'>-#define R8A7790_CLK_VIN2		9</div><div class='del'>-#define R8A7790_CLK_VIN1		10</div><div class='del'>-#define R8A7790_CLK_VIN0		11</div><div class='del'>-#define R8A7790_CLK_ETHERAVB		12</div><div class='del'>-#define R8A7790_CLK_ETHER		13</div><div class='del'>-#define R8A7790_CLK_SATA1		14</div><div class='del'>-#define R8A7790_CLK_SATA0		15</div><div class='del'>-</div><div class='del'>-/* MSTP9 */</div><div class='del'>-#define R8A7790_CLK_GPIO5		7</div><div class='del'>-#define R8A7790_CLK_GPIO4		8</div><div class='del'>-#define R8A7790_CLK_GPIO3		9</div><div class='del'>-#define R8A7790_CLK_GPIO2		10</div><div class='del'>-#define R8A7790_CLK_GPIO1		11</div><div class='del'>-#define R8A7790_CLK_GPIO0		12</div><div class='del'>-#define R8A7790_CLK_RCAN1		15</div><div class='del'>-#define R8A7790_CLK_RCAN0		16</div><div class='del'>-#define R8A7790_CLK_QSPI_MOD		17</div><div class='del'>-#define R8A7790_CLK_IICDVFS		26</div><div class='del'>-#define R8A7790_CLK_I2C3		28</div><div class='del'>-#define R8A7790_CLK_I2C2		29</div><div class='del'>-#define R8A7790_CLK_I2C1		30</div><div class='del'>-#define R8A7790_CLK_I2C0		31</div><div class='del'>-</div><div class='del'>-/* MSTP10 */</div><div class='del'>-#define R8A7790_CLK_SSI_ALL		5</div><div class='del'>-#define R8A7790_CLK_SSI9		6</div><div class='del'>-#define R8A7790_CLK_SSI8		7</div><div class='del'>-#define R8A7790_CLK_SSI7		8</div><div class='del'>-#define R8A7790_CLK_SSI6		9</div><div class='del'>-#define R8A7790_CLK_SSI5		10</div><div class='del'>-#define R8A7790_CLK_SSI4		11</div><div class='del'>-#define R8A7790_CLK_SSI3		12</div><div class='del'>-#define R8A7790_CLK_SSI2		13</div><div class='del'>-#define R8A7790_CLK_SSI1		14</div><div class='del'>-#define R8A7790_CLK_SSI0		15</div><div class='del'>-#define R8A7790_CLK_SCU_ALL		17</div><div class='del'>-#define R8A7790_CLK_SCU_DVC1		18</div><div class='del'>-#define R8A7790_CLK_SCU_DVC0		19</div><div class='del'>-#define R8A7790_CLK_SCU_CTU1_MIX1	20</div><div class='del'>-#define R8A7790_CLK_SCU_CTU0_MIX0	21</div><div class='del'>-#define R8A7790_CLK_SCU_SRC9		22</div><div class='del'>-#define R8A7790_CLK_SCU_SRC8		23</div><div class='del'>-#define R8A7790_CLK_SCU_SRC7		24</div><div class='del'>-#define R8A7790_CLK_SCU_SRC6		25</div><div class='del'>-#define R8A7790_CLK_SCU_SRC5		26</div><div class='del'>-#define R8A7790_CLK_SCU_SRC4		27</div><div class='del'>-#define R8A7790_CLK_SCU_SRC3		28</div><div class='del'>-#define R8A7790_CLK_SCU_SRC2		29</div><div class='del'>-#define R8A7790_CLK_SCU_SRC1		30</div><div class='del'>-#define R8A7790_CLK_SCU_SRC0		31</div><div class='del'>-</div><div class='del'>-#endif /* __DT_BINDINGS_CLOCK_R8A7790_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h<br/>deleted file mode 100644<br/>index bb4f18b1b3d5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a7791-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7791-clock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright 2013 Ideas On Board SPRL</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DT_BINDINGS_CLOCK_R8A7791_H__</div><div class='del'>-#define __DT_BINDINGS_CLOCK_R8A7791_H__</div><div class='del'>-</div><div class='del'>-/* CPG */</div><div class='del'>-#define R8A7791_CLK_MAIN		0</div><div class='del'>-#define R8A7791_CLK_PLL0		1</div><div class='del'>-#define R8A7791_CLK_PLL1		2</div><div class='del'>-#define R8A7791_CLK_PLL3		3</div><div class='del'>-#define R8A7791_CLK_LB			4</div><div class='del'>-#define R8A7791_CLK_QSPI		5</div><div class='del'>-#define R8A7791_CLK_SDH			6</div><div class='del'>-#define R8A7791_CLK_SD0			7</div><div class='del'>-#define R8A7791_CLK_Z			8</div><div class='del'>-#define R8A7791_CLK_RCAN		9</div><div class='del'>-#define R8A7791_CLK_ADSP		10</div><div class='del'>-</div><div class='del'>-/* MSTP0 */</div><div class='del'>-#define R8A7791_CLK_MSIOF0		0</div><div class='del'>-</div><div class='del'>-/* MSTP1 */</div><div class='del'>-#define R8A7791_CLK_VCP0		1</div><div class='del'>-#define R8A7791_CLK_VPC0		3</div><div class='del'>-#define R8A7791_CLK_JPU			6</div><div class='del'>-#define R8A7791_CLK_SSP1		9</div><div class='del'>-#define R8A7791_CLK_TMU1		11</div><div class='del'>-#define R8A7791_CLK_3DG			12</div><div class='del'>-#define R8A7791_CLK_2DDMAC		15</div><div class='del'>-#define R8A7791_CLK_FDP1_1		18</div><div class='del'>-#define R8A7791_CLK_FDP1_0		19</div><div class='del'>-#define R8A7791_CLK_TMU3		21</div><div class='del'>-#define R8A7791_CLK_TMU2		22</div><div class='del'>-#define R8A7791_CLK_CMT0		24</div><div class='del'>-#define R8A7791_CLK_TMU0		25</div><div class='del'>-#define R8A7791_CLK_VSP1_DU1		27</div><div class='del'>-#define R8A7791_CLK_VSP1_DU0		28</div><div class='del'>-#define R8A7791_CLK_VSP1_S		31</div><div class='del'>-</div><div class='del'>-/* MSTP2 */</div><div class='del'>-#define R8A7791_CLK_SCIFA2		2</div><div class='del'>-#define R8A7791_CLK_SCIFA1		3</div><div class='del'>-#define R8A7791_CLK_SCIFA0		4</div><div class='del'>-#define R8A7791_CLK_MSIOF2		5</div><div class='del'>-#define R8A7791_CLK_SCIFB0		6</div><div class='del'>-#define R8A7791_CLK_SCIFB1		7</div><div class='del'>-#define R8A7791_CLK_MSIOF1		8</div><div class='del'>-#define R8A7791_CLK_SCIFB2		16</div><div class='del'>-#define R8A7791_CLK_SYS_DMAC1		18</div><div class='del'>-#define R8A7791_CLK_SYS_DMAC0		19</div><div class='del'>-</div><div class='del'>-/* MSTP3 */</div><div class='del'>-#define R8A7791_CLK_TPU0		4</div><div class='del'>-#define R8A7791_CLK_SDHI2		11</div><div class='del'>-#define R8A7791_CLK_SDHI1		12</div><div class='del'>-#define R8A7791_CLK_SDHI0		14</div><div class='del'>-#define R8A7791_CLK_MMCIF0		15</div><div class='del'>-#define R8A7791_CLK_IIC0		18</div><div class='del'>-#define R8A7791_CLK_PCIEC		19</div><div class='del'>-#define R8A7791_CLK_IIC1		23</div><div class='del'>-#define R8A7791_CLK_SSUSB		28</div><div class='del'>-#define R8A7791_CLK_CMT1		29</div><div class='del'>-#define R8A7791_CLK_USBDMAC0		30</div><div class='del'>-#define R8A7791_CLK_USBDMAC1		31</div><div class='del'>-</div><div class='del'>-/* MSTP4 */</div><div class='del'>-#define R8A7791_CLK_IRQC		7</div><div class='del'>-#define R8A7791_CLK_INTC_SYS		8</div><div class='del'>-</div><div class='del'>-/* MSTP5 */</div><div class='del'>-#define R8A7791_CLK_AUDIO_DMAC1		1</div><div class='del'>-#define R8A7791_CLK_AUDIO_DMAC0		2</div><div class='del'>-#define R8A7791_CLK_ADSP_MOD		6</div><div class='del'>-#define R8A7791_CLK_THERMAL		22</div><div class='del'>-#define R8A7791_CLK_PWM			23</div><div class='del'>-</div><div class='del'>-/* MSTP7 */</div><div class='del'>-#define R8A7791_CLK_EHCI		3</div><div class='del'>-#define R8A7791_CLK_HSUSB		4</div><div class='del'>-#define R8A7791_CLK_HSCIF2		13</div><div class='del'>-#define R8A7791_CLK_SCIF5		14</div><div class='del'>-#define R8A7791_CLK_SCIF4		15</div><div class='del'>-#define R8A7791_CLK_HSCIF1		16</div><div class='del'>-#define R8A7791_CLK_HSCIF0		17</div><div class='del'>-#define R8A7791_CLK_SCIF3		18</div><div class='del'>-#define R8A7791_CLK_SCIF2		19</div><div class='del'>-#define R8A7791_CLK_SCIF1		20</div><div class='del'>-#define R8A7791_CLK_SCIF0		21</div><div class='del'>-#define R8A7791_CLK_DU1			23</div><div class='del'>-#define R8A7791_CLK_DU0			24</div><div class='del'>-#define R8A7791_CLK_LVDS0		26</div><div class='del'>-</div><div class='del'>-/* MSTP8 */</div><div class='del'>-#define R8A7791_CLK_IPMMU_SGX		0</div><div class='del'>-#define R8A7791_CLK_MLB			2</div><div class='del'>-#define R8A7791_CLK_VIN2		9</div><div class='del'>-#define R8A7791_CLK_VIN1		10</div><div class='del'>-#define R8A7791_CLK_VIN0		11</div><div class='del'>-#define R8A7791_CLK_ETHERAVB		12</div><div class='del'>-#define R8A7791_CLK_ETHER		13</div><div class='del'>-#define R8A7791_CLK_SATA1		14</div><div class='del'>-#define R8A7791_CLK_SATA0		15</div><div class='del'>-</div><div class='del'>-/* MSTP9 */</div><div class='del'>-#define R8A7791_CLK_GYROADC		1</div><div class='del'>-#define R8A7791_CLK_GPIO7		4</div><div class='del'>-#define R8A7791_CLK_GPIO6		5</div><div class='del'>-#define R8A7791_CLK_GPIO5		7</div><div class='del'>-#define R8A7791_CLK_GPIO4		8</div><div class='del'>-#define R8A7791_CLK_GPIO3		9</div><div class='del'>-#define R8A7791_CLK_GPIO2		10</div><div class='del'>-#define R8A7791_CLK_GPIO1		11</div><div class='del'>-#define R8A7791_CLK_GPIO0		12</div><div class='del'>-#define R8A7791_CLK_RCAN1		15</div><div class='del'>-#define R8A7791_CLK_RCAN0		16</div><div class='del'>-#define R8A7791_CLK_QSPI_MOD		17</div><div class='del'>-#define R8A7791_CLK_I2C5		25</div><div class='del'>-#define R8A7791_CLK_IICDVFS		26</div><div class='del'>-#define R8A7791_CLK_I2C4		27</div><div class='del'>-#define R8A7791_CLK_I2C3		28</div><div class='del'>-#define R8A7791_CLK_I2C2		29</div><div class='del'>-#define R8A7791_CLK_I2C1		30</div><div class='del'>-#define R8A7791_CLK_I2C0		31</div><div class='del'>-</div><div class='del'>-/* MSTP10 */</div><div class='del'>-#define R8A7791_CLK_SSI_ALL		5</div><div class='del'>-#define R8A7791_CLK_SSI9		6</div><div class='del'>-#define R8A7791_CLK_SSI8		7</div><div class='del'>-#define R8A7791_CLK_SSI7		8</div><div class='del'>-#define R8A7791_CLK_SSI6		9</div><div class='del'>-#define R8A7791_CLK_SSI5		10</div><div class='del'>-#define R8A7791_CLK_SSI4		11</div><div class='del'>-#define R8A7791_CLK_SSI3		12</div><div class='del'>-#define R8A7791_CLK_SSI2		13</div><div class='del'>-#define R8A7791_CLK_SSI1		14</div><div class='del'>-#define R8A7791_CLK_SSI0		15</div><div class='del'>-#define R8A7791_CLK_SCU_ALL		17</div><div class='del'>-#define R8A7791_CLK_SCU_DVC1		18</div><div class='del'>-#define R8A7791_CLK_SCU_DVC0		19</div><div class='del'>-#define R8A7791_CLK_SCU_CTU1_MIX1	20</div><div class='del'>-#define R8A7791_CLK_SCU_CTU0_MIX0	21</div><div class='del'>-#define R8A7791_CLK_SCU_SRC9		22</div><div class='del'>-#define R8A7791_CLK_SCU_SRC8		23</div><div class='del'>-#define R8A7791_CLK_SCU_SRC7		24</div><div class='del'>-#define R8A7791_CLK_SCU_SRC6		25</div><div class='del'>-#define R8A7791_CLK_SCU_SRC5		26</div><div class='del'>-#define R8A7791_CLK_SCU_SRC4		27</div><div class='del'>-#define R8A7791_CLK_SCU_SRC3		28</div><div class='del'>-#define R8A7791_CLK_SCU_SRC2		29</div><div class='del'>-#define R8A7791_CLK_SCU_SRC1		30</div><div class='del'>-#define R8A7791_CLK_SCU_SRC0		31</div><div class='del'>-</div><div class='del'>-/* MSTP11 */</div><div class='del'>-#define R8A7791_CLK_SCIFA3		6</div><div class='del'>-#define R8A7791_CLK_SCIFA4		7</div><div class='del'>-#define R8A7791_CLK_SCIFA5		8</div><div class='del'>-</div><div class='del'>-#endif /* __DT_BINDINGS_CLOCK_R8A7791_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a7792-clock.h b/include/dt-bindings/clock/r8a7792-clock.h<br/>deleted file mode 100644<br/>index 2948d9ce3a14..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a7792-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7792-clock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2016 Cogent Embedded, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DT_BINDINGS_CLOCK_R8A7792_H__</div><div class='del'>-#define __DT_BINDINGS_CLOCK_R8A7792_H__</div><div class='del'>-</div><div class='del'>-/* CPG */</div><div class='del'>-#define R8A7792_CLK_MAIN		0</div><div class='del'>-#define R8A7792_CLK_PLL0		1</div><div class='del'>-#define R8A7792_CLK_PLL1		2</div><div class='del'>-#define R8A7792_CLK_PLL3		3</div><div class='del'>-#define R8A7792_CLK_LB			4</div><div class='del'>-#define R8A7792_CLK_QSPI		5</div><div class='del'>-</div><div class='del'>-/* MSTP0 */</div><div class='del'>-#define R8A7792_CLK_MSIOF0		0</div><div class='del'>-</div><div class='del'>-/* MSTP1 */</div><div class='del'>-#define R8A7792_CLK_JPU			6</div><div class='del'>-#define R8A7792_CLK_TMU1		11</div><div class='del'>-#define R8A7792_CLK_TMU3		21</div><div class='del'>-#define R8A7792_CLK_TMU2		22</div><div class='del'>-#define R8A7792_CLK_CMT0		24</div><div class='del'>-#define R8A7792_CLK_TMU0		25</div><div class='del'>-#define R8A7792_CLK_VSP1DU1		27</div><div class='del'>-#define R8A7792_CLK_VSP1DU0		28</div><div class='del'>-#define R8A7792_CLK_VSP1_SY		31</div><div class='del'>-</div><div class='del'>-/* MSTP2 */</div><div class='del'>-#define R8A7792_CLK_MSIOF1		8</div><div class='del'>-#define R8A7792_CLK_SYS_DMAC1		18</div><div class='del'>-#define R8A7792_CLK_SYS_DMAC0		19</div><div class='del'>-</div><div class='del'>-/* MSTP3 */</div><div class='del'>-#define R8A7792_CLK_TPU0		4</div><div class='del'>-#define R8A7792_CLK_SDHI0		14</div><div class='del'>-#define R8A7792_CLK_CMT1		29</div><div class='del'>-</div><div class='del'>-/* MSTP4 */</div><div class='del'>-#define R8A7792_CLK_IRQC		7</div><div class='del'>-#define R8A7792_CLK_INTC_SYS		8</div><div class='del'>-</div><div class='del'>-/* MSTP5 */</div><div class='del'>-#define R8A7792_CLK_AUDIO_DMAC0		2</div><div class='del'>-#define R8A7792_CLK_THERMAL		22</div><div class='del'>-#define R8A7792_CLK_PWM			23</div><div class='del'>-</div><div class='del'>-/* MSTP7 */</div><div class='del'>-#define R8A7792_CLK_HSCIF1		16</div><div class='del'>-#define R8A7792_CLK_HSCIF0		17</div><div class='del'>-#define R8A7792_CLK_SCIF3		18</div><div class='del'>-#define R8A7792_CLK_SCIF2		19</div><div class='del'>-#define R8A7792_CLK_SCIF1		20</div><div class='del'>-#define R8A7792_CLK_SCIF0		21</div><div class='del'>-#define R8A7792_CLK_DU1			23</div><div class='del'>-#define R8A7792_CLK_DU0			24</div><div class='del'>-</div><div class='del'>-/* MSTP8 */</div><div class='del'>-#define R8A7792_CLK_VIN5		4</div><div class='del'>-#define R8A7792_CLK_VIN4		5</div><div class='del'>-#define R8A7792_CLK_VIN3		8</div><div class='del'>-#define R8A7792_CLK_VIN2		9</div><div class='del'>-#define R8A7792_CLK_VIN1		10</div><div class='del'>-#define R8A7792_CLK_VIN0		11</div><div class='del'>-#define R8A7792_CLK_ETHERAVB		12</div><div class='del'>-</div><div class='del'>-/* MSTP9 */</div><div class='del'>-#define R8A7792_CLK_GPIO7		4</div><div class='del'>-#define R8A7792_CLK_GPIO6		5</div><div class='del'>-#define R8A7792_CLK_GPIO5		7</div><div class='del'>-#define R8A7792_CLK_GPIO4		8</div><div class='del'>-#define R8A7792_CLK_GPIO3		9</div><div class='del'>-#define R8A7792_CLK_GPIO2		10</div><div class='del'>-#define R8A7792_CLK_GPIO1		11</div><div class='del'>-#define R8A7792_CLK_GPIO0		12</div><div class='del'>-#define R8A7792_CLK_GPIO11		13</div><div class='del'>-#define R8A7792_CLK_GPIO10		14</div><div class='del'>-#define R8A7792_CLK_CAN1		15</div><div class='del'>-#define R8A7792_CLK_CAN0		16</div><div class='del'>-#define R8A7792_CLK_QSPI_MOD		17</div><div class='del'>-#define R8A7792_CLK_GPIO9		19</div><div class='del'>-#define R8A7792_CLK_GPIO8		21</div><div class='del'>-#define R8A7792_CLK_I2C5		25</div><div class='del'>-#define R8A7792_CLK_IICDVFS		26</div><div class='del'>-#define R8A7792_CLK_I2C4		27</div><div class='del'>-#define R8A7792_CLK_I2C3		28</div><div class='del'>-#define R8A7792_CLK_I2C2		29</div><div class='del'>-#define R8A7792_CLK_I2C1		30</div><div class='del'>-#define R8A7792_CLK_I2C0		31</div><div class='del'>-</div><div class='del'>-/* MSTP10 */</div><div class='del'>-#define R8A7792_CLK_SSI_ALL		5</div><div class='del'>-#define R8A7792_CLK_SSI4		11</div><div class='del'>-#define R8A7792_CLK_SSI3		12</div><div class='del'>-</div><div class='del'>-#endif /* __DT_BINDINGS_CLOCK_R8A7792_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a7793-clock.h b/include/dt-bindings/clock/r8a7793-clock.h<br/>deleted file mode 100644<br/>index 49c66d8ed178..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a7793-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7793-clock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0</div><div class='del'>- *</div><div class='del'>- * r8a7793 clock definition</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2014  Renesas Electronics Corporation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DT_BINDINGS_CLOCK_R8A7793_H__</div><div class='del'>-#define __DT_BINDINGS_CLOCK_R8A7793_H__</div><div class='del'>-</div><div class='del'>-/* CPG */</div><div class='del'>-#define R8A7793_CLK_MAIN		0</div><div class='del'>-#define R8A7793_CLK_PLL0		1</div><div class='del'>-#define R8A7793_CLK_PLL1		2</div><div class='del'>-#define R8A7793_CLK_PLL3		3</div><div class='del'>-#define R8A7793_CLK_LB			4</div><div class='del'>-#define R8A7793_CLK_QSPI		5</div><div class='del'>-#define R8A7793_CLK_SDH			6</div><div class='del'>-#define R8A7793_CLK_SD0			7</div><div class='del'>-#define R8A7793_CLK_Z			8</div><div class='del'>-#define R8A7793_CLK_RCAN		9</div><div class='del'>-#define R8A7793_CLK_ADSP		10</div><div class='del'>-</div><div class='del'>-/* MSTP0 */</div><div class='del'>-#define R8A7793_CLK_MSIOF0		0</div><div class='del'>-</div><div class='del'>-/* MSTP1 */</div><div class='del'>-#define R8A7793_CLK_VCP0		1</div><div class='del'>-#define R8A7793_CLK_VPC0		3</div><div class='del'>-#define R8A7793_CLK_SSP1		9</div><div class='del'>-#define R8A7793_CLK_TMU1		11</div><div class='del'>-#define R8A7793_CLK_3DG			12</div><div class='del'>-#define R8A7793_CLK_2DDMAC		15</div><div class='del'>-#define R8A7793_CLK_FDP1_1		18</div><div class='del'>-#define R8A7793_CLK_FDP1_0		19</div><div class='del'>-#define R8A7793_CLK_TMU3		21</div><div class='del'>-#define R8A7793_CLK_TMU2		22</div><div class='del'>-#define R8A7793_CLK_CMT0		24</div><div class='del'>-#define R8A7793_CLK_TMU0		25</div><div class='del'>-#define R8A7793_CLK_VSP1_DU1		27</div><div class='del'>-#define R8A7793_CLK_VSP1_DU0		28</div><div class='del'>-#define R8A7793_CLK_VSP1_S		31</div><div class='del'>-</div><div class='del'>-/* MSTP2 */</div><div class='del'>-#define R8A7793_CLK_SCIFA2		2</div><div class='del'>-#define R8A7793_CLK_SCIFA1		3</div><div class='del'>-#define R8A7793_CLK_SCIFA0		4</div><div class='del'>-#define R8A7793_CLK_MSIOF2		5</div><div class='del'>-#define R8A7793_CLK_SCIFB0		6</div><div class='del'>-#define R8A7793_CLK_SCIFB1		7</div><div class='del'>-#define R8A7793_CLK_MSIOF1		8</div><div class='del'>-#define R8A7793_CLK_SCIFB2		16</div><div class='del'>-#define R8A7793_CLK_SYS_DMAC1		18</div><div class='del'>-#define R8A7793_CLK_SYS_DMAC0		19</div><div class='del'>-</div><div class='del'>-/* MSTP3 */</div><div class='del'>-#define R8A7793_CLK_TPU0		4</div><div class='del'>-#define R8A7793_CLK_SDHI2		11</div><div class='del'>-#define R8A7793_CLK_SDHI1		12</div><div class='del'>-#define R8A7793_CLK_SDHI0		14</div><div class='del'>-#define R8A7793_CLK_MMCIF0		15</div><div class='del'>-#define R8A7793_CLK_IIC0		18</div><div class='del'>-#define R8A7793_CLK_PCIEC		19</div><div class='del'>-#define R8A7793_CLK_IIC1		23</div><div class='del'>-#define R8A7793_CLK_SSUSB		28</div><div class='del'>-#define R8A7793_CLK_CMT1		29</div><div class='del'>-#define R8A7793_CLK_USBDMAC0		30</div><div class='del'>-#define R8A7793_CLK_USBDMAC1		31</div><div class='del'>-</div><div class='del'>-/* MSTP4 */</div><div class='del'>-#define R8A7793_CLK_IRQC		7</div><div class='del'>-#define R8A7793_CLK_INTC_SYS		8</div><div class='del'>-</div><div class='del'>-/* MSTP5 */</div><div class='del'>-#define R8A7793_CLK_AUDIO_DMAC1		1</div><div class='del'>-#define R8A7793_CLK_AUDIO_DMAC0		2</div><div class='del'>-#define R8A7793_CLK_ADSP_MOD		6</div><div class='del'>-#define R8A7793_CLK_THERMAL		22</div><div class='del'>-#define R8A7793_CLK_PWM			23</div><div class='del'>-</div><div class='del'>-/* MSTP7 */</div><div class='del'>-#define R8A7793_CLK_EHCI		3</div><div class='del'>-#define R8A7793_CLK_HSUSB		4</div><div class='del'>-#define R8A7793_CLK_HSCIF2		13</div><div class='del'>-#define R8A7793_CLK_SCIF5		14</div><div class='del'>-#define R8A7793_CLK_SCIF4		15</div><div class='del'>-#define R8A7793_CLK_HSCIF1		16</div><div class='del'>-#define R8A7793_CLK_HSCIF0		17</div><div class='del'>-#define R8A7793_CLK_SCIF3		18</div><div class='del'>-#define R8A7793_CLK_SCIF2		19</div><div class='del'>-#define R8A7793_CLK_SCIF1		20</div><div class='del'>-#define R8A7793_CLK_SCIF0		21</div><div class='del'>-#define R8A7793_CLK_DU1			23</div><div class='del'>-#define R8A7793_CLK_DU0			24</div><div class='del'>-#define R8A7793_CLK_LVDS0		26</div><div class='del'>-</div><div class='del'>-/* MSTP8 */</div><div class='del'>-#define R8A7793_CLK_IPMMU_SGX		0</div><div class='del'>-#define R8A7793_CLK_VIN2		9</div><div class='del'>-#define R8A7793_CLK_VIN1		10</div><div class='del'>-#define R8A7793_CLK_VIN0		11</div><div class='del'>-#define R8A7793_CLK_ETHER		13</div><div class='del'>-#define R8A7793_CLK_SATA1		14</div><div class='del'>-#define R8A7793_CLK_SATA0		15</div><div class='del'>-</div><div class='del'>-/* MSTP9 */</div><div class='del'>-#define R8A7793_CLK_GPIO7		4</div><div class='del'>-#define R8A7793_CLK_GPIO6		5</div><div class='del'>-#define R8A7793_CLK_GPIO5		7</div><div class='del'>-#define R8A7793_CLK_GPIO4		8</div><div class='del'>-#define R8A7793_CLK_GPIO3		9</div><div class='del'>-#define R8A7793_CLK_GPIO2		10</div><div class='del'>-#define R8A7793_CLK_GPIO1		11</div><div class='del'>-#define R8A7793_CLK_GPIO0		12</div><div class='del'>-#define R8A7793_CLK_RCAN1		15</div><div class='del'>-#define R8A7793_CLK_RCAN0		16</div><div class='del'>-#define R8A7793_CLK_QSPI_MOD		17</div><div class='del'>-#define R8A7793_CLK_I2C5		25</div><div class='del'>-#define R8A7793_CLK_IICDVFS		26</div><div class='del'>-#define R8A7793_CLK_I2C4		27</div><div class='del'>-#define R8A7793_CLK_I2C3		28</div><div class='del'>-#define R8A7793_CLK_I2C2		29</div><div class='del'>-#define R8A7793_CLK_I2C1		30</div><div class='del'>-#define R8A7793_CLK_I2C0		31</div><div class='del'>-</div><div class='del'>-/* MSTP10 */</div><div class='del'>-#define R8A7793_CLK_SSI_ALL		5</div><div class='del'>-#define R8A7793_CLK_SSI9		6</div><div class='del'>-#define R8A7793_CLK_SSI8		7</div><div class='del'>-#define R8A7793_CLK_SSI7		8</div><div class='del'>-#define R8A7793_CLK_SSI6		9</div><div class='del'>-#define R8A7793_CLK_SSI5		10</div><div class='del'>-#define R8A7793_CLK_SSI4		11</div><div class='del'>-#define R8A7793_CLK_SSI3		12</div><div class='del'>-#define R8A7793_CLK_SSI2		13</div><div class='del'>-#define R8A7793_CLK_SSI1		14</div><div class='del'>-#define R8A7793_CLK_SSI0		15</div><div class='del'>-#define R8A7793_CLK_SCU_ALL		17</div><div class='del'>-#define R8A7793_CLK_SCU_DVC1		18</div><div class='del'>-#define R8A7793_CLK_SCU_DVC0		19</div><div class='del'>-#define R8A7793_CLK_SCU_CTU1_MIX1	20</div><div class='del'>-#define R8A7793_CLK_SCU_CTU0_MIX0	21</div><div class='del'>-#define R8A7793_CLK_SCU_SRC9		22</div><div class='del'>-#define R8A7793_CLK_SCU_SRC8		23</div><div class='del'>-#define R8A7793_CLK_SCU_SRC7		24</div><div class='del'>-#define R8A7793_CLK_SCU_SRC6		25</div><div class='del'>-#define R8A7793_CLK_SCU_SRC5		26</div><div class='del'>-#define R8A7793_CLK_SCU_SRC4		27</div><div class='del'>-#define R8A7793_CLK_SCU_SRC3		28</div><div class='del'>-#define R8A7793_CLK_SCU_SRC2		29</div><div class='del'>-#define R8A7793_CLK_SCU_SRC1		30</div><div class='del'>-#define R8A7793_CLK_SCU_SRC0		31</div><div class='del'>-</div><div class='del'>-/* MSTP11 */</div><div class='del'>-#define R8A7793_CLK_SCIFA3		6</div><div class='del'>-#define R8A7793_CLK_SCIFA4		7</div><div class='del'>-#define R8A7793_CLK_SCIFA5		8</div><div class='del'>-</div><div class='del'>-#endif /* __DT_BINDINGS_CLOCK_R8A7793_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h<br/>deleted file mode 100644<br/>index 649f005782d0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a7794-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a7794-clock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,137 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0+</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2014 Renesas Electronics Corporation</div><div class='del'>- * Copyright 2013 Ideas On Board SPRL</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DT_BINDINGS_CLOCK_R8A7794_H__</div><div class='del'>-#define __DT_BINDINGS_CLOCK_R8A7794_H__</div><div class='del'>-</div><div class='del'>-/* CPG */</div><div class='del'>-#define R8A7794_CLK_MAIN		0</div><div class='del'>-#define R8A7794_CLK_PLL0		1</div><div class='del'>-#define R8A7794_CLK_PLL1		2</div><div class='del'>-#define R8A7794_CLK_PLL3		3</div><div class='del'>-#define R8A7794_CLK_LB			4</div><div class='del'>-#define R8A7794_CLK_QSPI		5</div><div class='del'>-#define R8A7794_CLK_SDH			6</div><div class='del'>-#define R8A7794_CLK_SD0			7</div><div class='del'>-#define R8A7794_CLK_RCAN		8</div><div class='del'>-</div><div class='del'>-/* MSTP0 */</div><div class='del'>-#define R8A7794_CLK_MSIOF0		0</div><div class='del'>-</div><div class='del'>-/* MSTP1 */</div><div class='del'>-#define R8A7794_CLK_VCP0		1</div><div class='del'>-#define R8A7794_CLK_VPC0		3</div><div class='del'>-#define R8A7794_CLK_TMU1		11</div><div class='del'>-#define R8A7794_CLK_3DG			12</div><div class='del'>-#define R8A7794_CLK_2DDMAC		15</div><div class='del'>-#define R8A7794_CLK_FDP1_0		19</div><div class='del'>-#define R8A7794_CLK_TMU3		21</div><div class='del'>-#define R8A7794_CLK_TMU2		22</div><div class='del'>-#define R8A7794_CLK_CMT0		24</div><div class='del'>-#define R8A7794_CLK_TMU0		25</div><div class='del'>-#define R8A7794_CLK_VSP1_DU0		28</div><div class='del'>-#define R8A7794_CLK_VSP1_S		31</div><div class='del'>-</div><div class='del'>-/* MSTP2 */</div><div class='del'>-#define R8A7794_CLK_SCIFA2		2</div><div class='del'>-#define R8A7794_CLK_SCIFA1		3</div><div class='del'>-#define R8A7794_CLK_SCIFA0		4</div><div class='del'>-#define R8A7794_CLK_MSIOF2		5</div><div class='del'>-#define R8A7794_CLK_SCIFB0		6</div><div class='del'>-#define R8A7794_CLK_SCIFB1		7</div><div class='del'>-#define R8A7794_CLK_MSIOF1		8</div><div class='del'>-#define R8A7794_CLK_SCIFB2		16</div><div class='del'>-#define R8A7794_CLK_SYS_DMAC1		18</div><div class='del'>-#define R8A7794_CLK_SYS_DMAC0		19</div><div class='del'>-</div><div class='del'>-/* MSTP3 */</div><div class='del'>-#define R8A7794_CLK_SDHI2		11</div><div class='del'>-#define R8A7794_CLK_SDHI1		12</div><div class='del'>-#define R8A7794_CLK_SDHI0		14</div><div class='del'>-#define R8A7794_CLK_MMCIF0		15</div><div class='del'>-#define R8A7794_CLK_IIC0		18</div><div class='del'>-#define R8A7794_CLK_IIC1		23</div><div class='del'>-#define R8A7794_CLK_CMT1		29</div><div class='del'>-#define R8A7794_CLK_USBDMAC0		30</div><div class='del'>-#define R8A7794_CLK_USBDMAC1		31</div><div class='del'>-</div><div class='del'>-/* MSTP4 */</div><div class='del'>-#define R8A7794_CLK_IRQC		7</div><div class='del'>-#define R8A7794_CLK_INTC_SYS		8</div><div class='del'>-</div><div class='del'>-/* MSTP5 */</div><div class='del'>-#define R8A7794_CLK_AUDIO_DMAC0		2</div><div class='del'>-#define R8A7794_CLK_PWM			23</div><div class='del'>-</div><div class='del'>-/* MSTP7 */</div><div class='del'>-#define R8A7794_CLK_EHCI		3</div><div class='del'>-#define R8A7794_CLK_HSUSB		4</div><div class='del'>-#define R8A7794_CLK_HSCIF2		13</div><div class='del'>-#define R8A7794_CLK_SCIF5		14</div><div class='del'>-#define R8A7794_CLK_SCIF4		15</div><div class='del'>-#define R8A7794_CLK_HSCIF1		16</div><div class='del'>-#define R8A7794_CLK_HSCIF0		17</div><div class='del'>-#define R8A7794_CLK_SCIF3		18</div><div class='del'>-#define R8A7794_CLK_SCIF2		19</div><div class='del'>-#define R8A7794_CLK_SCIF1		20</div><div class='del'>-#define R8A7794_CLK_SCIF0		21</div><div class='del'>-#define R8A7794_CLK_DU1			23</div><div class='del'>-#define R8A7794_CLK_DU0			24</div><div class='del'>-</div><div class='del'>-/* MSTP8 */</div><div class='del'>-#define R8A7794_CLK_VIN1		10</div><div class='del'>-#define R8A7794_CLK_VIN0		11</div><div class='del'>-#define R8A7794_CLK_ETHERAVB		12</div><div class='del'>-#define R8A7794_CLK_ETHER		13</div><div class='del'>-</div><div class='del'>-/* MSTP9 */</div><div class='del'>-#define R8A7794_CLK_GPIO6		5</div><div class='del'>-#define R8A7794_CLK_GPIO5		7</div><div class='del'>-#define R8A7794_CLK_GPIO4		8</div><div class='del'>-#define R8A7794_CLK_GPIO3		9</div><div class='del'>-#define R8A7794_CLK_GPIO2		10</div><div class='del'>-#define R8A7794_CLK_GPIO1		11</div><div class='del'>-#define R8A7794_CLK_GPIO0		12</div><div class='del'>-#define R8A7794_CLK_RCAN1		15</div><div class='del'>-#define R8A7794_CLK_RCAN0		16</div><div class='del'>-#define R8A7794_CLK_QSPI_MOD		17</div><div class='del'>-#define R8A7794_CLK_I2C5		25</div><div class='del'>-#define R8A7794_CLK_I2C4		27</div><div class='del'>-#define R8A7794_CLK_I2C3		28</div><div class='del'>-#define R8A7794_CLK_I2C2		29</div><div class='del'>-#define R8A7794_CLK_I2C1		30</div><div class='del'>-#define R8A7794_CLK_I2C0		31</div><div class='del'>-</div><div class='del'>-/* MSTP10 */</div><div class='del'>-#define R8A7794_CLK_SSI_ALL		5</div><div class='del'>-#define R8A7794_CLK_SSI9		6</div><div class='del'>-#define R8A7794_CLK_SSI8		7</div><div class='del'>-#define R8A7794_CLK_SSI7		8</div><div class='del'>-#define R8A7794_CLK_SSI6		9</div><div class='del'>-#define R8A7794_CLK_SSI5		10</div><div class='del'>-#define R8A7794_CLK_SSI4		11</div><div class='del'>-#define R8A7794_CLK_SSI3		12</div><div class='del'>-#define R8A7794_CLK_SSI2		13</div><div class='del'>-#define R8A7794_CLK_SSI1		14</div><div class='del'>-#define R8A7794_CLK_SSI0		15</div><div class='del'>-#define R8A7794_CLK_SCU_ALL		17</div><div class='del'>-#define R8A7794_CLK_SCU_DVC1		18</div><div class='del'>-#define R8A7794_CLK_SCU_DVC0		19</div><div class='del'>-#define R8A7794_CLK_SCU_CTU1_MIX1	20</div><div class='del'>-#define R8A7794_CLK_SCU_CTU0_MIX0	21</div><div class='del'>-#define R8A7794_CLK_SCU_SRC6		25</div><div class='del'>-#define R8A7794_CLK_SCU_SRC5		26</div><div class='del'>-#define R8A7794_CLK_SCU_SRC4		27</div><div class='del'>-#define R8A7794_CLK_SCU_SRC3		28</div><div class='del'>-#define R8A7794_CLK_SCU_SRC2		29</div><div class='del'>-#define R8A7794_CLK_SCU_SRC1		30</div><div class='del'>-</div><div class='del'>-/* MSTP11 */</div><div class='del'>-#define R8A7794_CLK_SCIFA3		6</div><div class='del'>-#define R8A7794_CLK_SCIFA4		7</div><div class='del'>-#define R8A7794_CLK_SCIFA5		8</div><div class='del'>-</div><div class='del'>-#endif /* __DT_BINDINGS_CLOCK_R8A7794_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a779a0-cpg-mssr.h b/include/dt-bindings/clock/r8a779a0-cpg-mssr.h<br/>index f1d737ca7ca1..124a6b8856df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a779a0-cpg-mssr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a779a0-cpg-mssr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a779a0-cpg-mssr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/r8a779a0-cpg-mssr.h</a></div><div class='hunk'>@@ -51,5 +51,6 @@</div><div class='ctx'> #define R8A779A0_CLK_CBFUSA		40</div><div class='ctx'> #define R8A779A0_CLK_R			41</div><div class='ctx'> #define R8A779A0_CLK_OSC		42</div><div class='add'>+#define R8A779A0_CLK_ZG			43</div><div class='ctx'> </div><div class='ctx'> #endif /* __DT_BINDINGS_CLOCK_R8A779A0_CPG_MSSR_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/r8a779g0-cpg-mssr.h b/include/dt-bindings/clock/r8a779g0-cpg-mssr.h<br/>index 754c54a6eb06..7850cdc62e28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a779g0-cpg-mssr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r8a779g0-cpg-mssr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r8a779g0-cpg-mssr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/r8a779g0-cpg-mssr.h</a></div><div class='hunk'>@@ -86,5 +86,6 @@</div><div class='ctx'> #define R8A779G0_CLK_CPEX		74</div><div class='ctx'> #define R8A779G0_CLK_CBFUSA		75</div><div class='ctx'> #define R8A779G0_CLK_R			76</div><div class='add'>+#define R8A779G0_CLK_CP			77</div><div class='ctx'> </div><div class='ctx'> #endif /* __DT_BINDINGS_CLOCK_R8A779G0_CPG_MSSR_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/r9a07g043-cpg.h b/include/dt-bindings/clock/r9a07g043-cpg.h<br/>index 77cde8effdc7..e1f65f1928cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r9a07g043-cpg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/r9a07g043-cpg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/r9a07g043-cpg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/r9a07g043-cpg.h</a></div><div class='hunk'>@@ -16,15 +16,15 @@</div><div class='ctx'> #define R9A07G043_CLK_SD0		5</div><div class='ctx'> #define R9A07G043_CLK_SD1		6</div><div class='ctx'> #define R9A07G043_CLK_M0		7</div><div class='del'>-#define R9A07G043_CLK_M2		8</div><div class='del'>-#define R9A07G043_CLK_M3		9</div><div class='add'>+#define R9A07G043_CLK_M2		8	/* RZ/G2UL Only */</div><div class='add'>+#define R9A07G043_CLK_M3		9	/* RZ/G2UL Only */</div><div class='ctx'> #define R9A07G043_CLK_HP		10</div><div class='ctx'> #define R9A07G043_CLK_TSU		11</div><div class='ctx'> #define R9A07G043_CLK_ZT		12</div><div class='ctx'> #define R9A07G043_CLK_P0		13</div><div class='ctx'> #define R9A07G043_CLK_P1		14</div><div class='ctx'> #define R9A07G043_CLK_P2		15</div><div class='del'>-#define R9A07G043_CLK_AT		16</div><div class='add'>+#define R9A07G043_CLK_AT		16	/* RZ/G2UL Only */</div><div class='ctx'> #define R9A07G043_OSCCLK		17</div><div class='ctx'> #define R9A07G043_CLK_P0_DIV2		18</div><div class='ctx'> </div><div class='hunk'>@@ -200,5 +200,4 @@</div><div class='ctx'> #define R9A07G043_AX45MP_CORE0_RESETN	78	/* RZ/Five Only */</div><div class='ctx'> #define R9A07G043_IAX45_RESETN		79	/* RZ/Five Only */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #endif /* __DT_BINDINGS_CLOCK_R9A07G043_CPG_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/raspberrypi,rp1-clocks.h b/include/dt-bindings/clock/raspberrypi,rp1-clocks.h<br/>new file mode 100644<br/>index 000000000000..7915fb8197bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/raspberrypi,rp1-clocks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/raspberrypi,rp1-clocks.h</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Raspberry Pi Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_RASPBERRYPI_RP1</div><div class='add'>+#define __DT_BINDINGS_CLOCK_RASPBERRYPI_RP1</div><div class='add'>+</div><div class='add'>+#define RP1_PLL_SYS_CORE		0</div><div class='add'>+#define RP1_PLL_AUDIO_CORE		1</div><div class='add'>+#define RP1_PLL_VIDEO_CORE		2</div><div class='add'>+</div><div class='add'>+#define RP1_PLL_SYS			3</div><div class='add'>+#define RP1_PLL_AUDIO			4</div><div class='add'>+#define RP1_PLL_VIDEO			5</div><div class='add'>+</div><div class='add'>+#define RP1_PLL_SYS_PRI_PH		6</div><div class='add'>+#define RP1_PLL_SYS_SEC_PH		7</div><div class='add'>+#define RP1_PLL_AUDIO_PRI_PH		8</div><div class='add'>+</div><div class='add'>+#define RP1_PLL_SYS_SEC			9</div><div class='add'>+#define RP1_PLL_AUDIO_SEC		10</div><div class='add'>+#define RP1_PLL_VIDEO_SEC		11</div><div class='add'>+</div><div class='add'>+#define RP1_CLK_SYS			12</div><div class='add'>+#define RP1_CLK_SLOW_SYS		13</div><div class='add'>+#define RP1_CLK_DMA			14</div><div class='add'>+#define RP1_CLK_UART			15</div><div class='add'>+#define RP1_CLK_ETH			16</div><div class='add'>+#define RP1_CLK_PWM0			17</div><div class='add'>+#define RP1_CLK_PWM1			18</div><div class='add'>+#define RP1_CLK_AUDIO_IN		19</div><div class='add'>+#define RP1_CLK_AUDIO_OUT		20</div><div class='add'>+#define RP1_CLK_I2S			21</div><div class='add'>+#define RP1_CLK_MIPI0_CFG		22</div><div class='add'>+#define RP1_CLK_MIPI1_CFG		23</div><div class='add'>+#define RP1_CLK_PCIE_AUX		24</div><div class='add'>+#define RP1_CLK_USBH0_MICROFRAME	25</div><div class='add'>+#define RP1_CLK_USBH1_MICROFRAME	26</div><div class='add'>+#define RP1_CLK_USBH0_SUSPEND		27</div><div class='add'>+#define RP1_CLK_USBH1_SUSPEND		28</div><div class='add'>+#define RP1_CLK_ETH_TSU			29</div><div class='add'>+#define RP1_CLK_ADC			30</div><div class='add'>+#define RP1_CLK_SDIO_TIMER		31</div><div class='add'>+#define RP1_CLK_SDIO_ALT_SRC		32</div><div class='add'>+#define RP1_CLK_GP0			33</div><div class='add'>+#define RP1_CLK_GP1			34</div><div class='add'>+#define RP1_CLK_GP2			35</div><div class='add'>+#define RP1_CLK_GP3			36</div><div class='add'>+#define RP1_CLK_GP4			37</div><div class='add'>+#define RP1_CLK_GP5			38</div><div class='add'>+#define RP1_CLK_VEC			39</div><div class='add'>+#define RP1_CLK_DPI			40</div><div class='add'>+#define RP1_CLK_MIPI0_DPI		41</div><div class='add'>+#define RP1_CLK_MIPI1_DPI		42</div><div class='add'>+</div><div class='add'>+/* Extra PLL output channels - RP1B0 only */</div><div class='add'>+#define RP1_PLL_VIDEO_PRI_PH		43</div><div class='add'>+#define RP1_PLL_AUDIO_TERN		44</div><div class='add'>+</div><div class='add'>+/* MIPI clocks managed by the DSI driver */</div><div class='add'>+#define RP1_CLK_MIPI0_DSI_BYTECLOCK	45</div><div class='add'>+#define RP1_CLK_MIPI1_DSI_BYTECLOCK	46</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/renesas,r9a08g045-vbattb.h b/include/dt-bindings/clock/renesas,r9a08g045-vbattb.h<br/>new file mode 100644<br/>index 000000000000..4cc8fc34b23c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/renesas,r9a08g045-vbattb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/renesas,r9a08g045-vbattb.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Renesas Electronics Corp.</div><div class='add'>+ */</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_RENESAS_R9A08G045_VBATTB_H__</div><div class='add'>+#define __DT_BINDINGS_CLOCK_RENESAS_R9A08G045_VBATTB_H__</div><div class='add'>+</div><div class='add'>+#define VBATTB_XC		0</div><div class='add'>+#define VBATTB_XBYP		1</div><div class='add'>+#define VBATTB_MUX		2</div><div class='add'>+#define VBATTB_VBATTCLK		3</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_CLOCK_RENESAS_R9A08G045_VBATTB_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/renesas,r9a09g047-cpg.h b/include/dt-bindings/clock/renesas,r9a09g047-cpg.h<br/>new file mode 100644<br/>index 000000000000..dab24740de3c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/renesas,r9a09g047-cpg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/renesas,r9a09g047-cpg.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Renesas Electronics Corp.</div><div class='add'>+ */</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_RENESAS_R9A09G047_CPG_H__</div><div class='add'>+#define __DT_BINDINGS_CLOCK_RENESAS_R9A09G047_CPG_H__</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/renesas-cpg-mssr.h&gt;</div><div class='add'>+</div><div class='add'>+/* Core Clock list */</div><div class='add'>+#define R9A09G047_SYS_0_PCLK			0</div><div class='add'>+#define R9A09G047_CA55_0_CORECLK0		1</div><div class='add'>+#define R9A09G047_CA55_0_CORECLK1		2</div><div class='add'>+#define R9A09G047_CA55_0_CORECLK2		3</div><div class='add'>+#define R9A09G047_CA55_0_CORECLK3		4</div><div class='add'>+#define R9A09G047_CA55_0_PERIPHCLK		5</div><div class='add'>+#define R9A09G047_CM33_CLK0			6</div><div class='add'>+#define R9A09G047_CST_0_SWCLKTCK		7</div><div class='add'>+#define R9A09G047_IOTOP_0_SHCLK			8</div><div class='add'>+#define R9A09G047_SPI_CLK_SPI			9</div><div class='add'>+#define R9A09G047_GBETH_0_CLK_PTP_REF_I		10</div><div class='add'>+#define R9A09G047_GBETH_1_CLK_PTP_REF_I		11</div><div class='add'>+#define R9A09G047_USB3_0_REF_ALT_CLK_P		12</div><div class='add'>+#define R9A09G047_USB3_0_CLKCORE		13</div><div class='add'>+#define R9A09G047_USB2_0_CLK_CORE0		14</div><div class='add'>+#define R9A09G047_USB2_0_CLK_CORE1		15</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_CLOCK_RENESAS_R9A09G047_CPG_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/renesas,r9a09g056-cpg.h b/include/dt-bindings/clock/renesas,r9a09g056-cpg.h<br/>new file mode 100644<br/>index 000000000000..234dcf4f0f91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/renesas,r9a09g056-cpg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/renesas,r9a09g056-cpg.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Renesas Electronics Corp.</div><div class='add'>+ */</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_RENESAS_R9A09G056_CPG_H__</div><div class='add'>+#define __DT_BINDINGS_CLOCK_RENESAS_R9A09G056_CPG_H__</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/renesas-cpg-mssr.h&gt;</div><div class='add'>+</div><div class='add'>+/* Core Clock list */</div><div class='add'>+#define R9A09G056_SYS_0_PCLK			0</div><div class='add'>+#define R9A09G056_CA55_0_CORE_CLK0		1</div><div class='add'>+#define R9A09G056_CA55_0_CORE_CLK1		2</div><div class='add'>+#define R9A09G056_CA55_0_CORE_CLK2		3</div><div class='add'>+#define R9A09G056_CA55_0_CORE_CLK3		4</div><div class='add'>+#define R9A09G056_CA55_0_PERIPHCLK		5</div><div class='add'>+#define R9A09G056_CM33_CLK0			6</div><div class='add'>+#define R9A09G056_CST_0_SWCLKTCK		7</div><div class='add'>+#define R9A09G056_IOTOP_0_SHCLK			8</div><div class='add'>+#define R9A09G056_USB2_0_CLK_CORE0		9</div><div class='add'>+#define R9A09G056_GBETH_0_CLK_PTP_REF_I		10</div><div class='add'>+#define R9A09G056_GBETH_1_CLK_PTP_REF_I		11</div><div class='add'>+#define R9A09G056_SPI_CLK_SPI			12</div><div class='add'>+#define R9A09G056_USB3_0_REF_ALT_CLK_P		13</div><div class='add'>+#define R9A09G056_USB3_0_CLKCORE		14</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_CLOCK_RENESAS_R9A09G056_CPG_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/renesas,r9a09g057-cpg.h b/include/dt-bindings/clock/renesas,r9a09g057-cpg.h<br/>new file mode 100644<br/>index 000000000000..f91d7f72922a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/renesas,r9a09g057-cpg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/renesas,r9a09g057-cpg.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Renesas Electronics Corp.</div><div class='add'>+ */</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_RENESAS_R9A09G057_CPG_H__</div><div class='add'>+#define __DT_BINDINGS_CLOCK_RENESAS_R9A09G057_CPG_H__</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/renesas-cpg-mssr.h&gt;</div><div class='add'>+</div><div class='add'>+/* Core Clock list */</div><div class='add'>+#define R9A09G057_SYS_0_PCLK			0</div><div class='add'>+#define R9A09G057_CA55_0_CORE_CLK0		1</div><div class='add'>+#define R9A09G057_CA55_0_CORE_CLK1		2</div><div class='add'>+#define R9A09G057_CA55_0_CORE_CLK2		3</div><div class='add'>+#define R9A09G057_CA55_0_CORE_CLK3		4</div><div class='add'>+#define R9A09G057_CA55_0_PERIPHCLK		5</div><div class='add'>+#define R9A09G057_CM33_CLK0			6</div><div class='add'>+#define R9A09G057_CST_0_SWCLKTCK		7</div><div class='add'>+#define R9A09G057_IOTOP_0_SHCLK			8</div><div class='add'>+#define R9A09G057_USB2_0_CLK_CORE0		9</div><div class='add'>+#define R9A09G057_USB2_0_CLK_CORE1		10</div><div class='add'>+#define R9A09G057_GBETH_0_CLK_PTP_REF_I		11</div><div class='add'>+#define R9A09G057_GBETH_1_CLK_PTP_REF_I		12</div><div class='add'>+#define R9A09G057_SPI_CLK_SPI			13</div><div class='add'>+#define R9A09G057_USB3_0_REF_ALT_CLK_P		14</div><div class='add'>+#define R9A09G057_USB3_0_CLKCORE		15</div><div class='add'>+#define R9A09G057_USB3_1_REF_ALT_CLK_P		16</div><div class='add'>+#define R9A09G057_USB3_1_CLKCORE		17</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_CLOCK_RENESAS_R9A09G057_CPG_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h b/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h<br/>new file mode 100644<br/>index 000000000000..2a805e06487b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Renesas Electronics Corp.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_RENESAS_R9A09G077_CPG_H__</div><div class='add'>+#define __DT_BINDINGS_CLOCK_RENESAS_R9A09G077_CPG_H__</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/renesas-cpg-mssr.h&gt;</div><div class='add'>+</div><div class='add'>+/* R9A09G077 CPG Core Clocks */</div><div class='add'>+#define R9A09G077_CLK_CA55C0		0</div><div class='add'>+#define R9A09G077_CLK_CA55C1		1</div><div class='add'>+#define R9A09G077_CLK_CA55C2		2</div><div class='add'>+#define R9A09G077_CLK_CA55C3		3</div><div class='add'>+#define R9A09G077_CLK_CA55S		4</div><div class='add'>+#define R9A09G077_CLK_CR52_CPU0		5</div><div class='add'>+#define R9A09G077_CLK_CR52_CPU1		6</div><div class='add'>+#define R9A09G077_CLK_CKIO		7</div><div class='add'>+#define R9A09G077_CLK_PCLKAH		8</div><div class='add'>+#define R9A09G077_CLK_PCLKAM		9</div><div class='add'>+#define R9A09G077_CLK_PCLKAL		10</div><div class='add'>+#define R9A09G077_CLK_PCLKGPTL		11</div><div class='add'>+#define R9A09G077_CLK_PCLKH		12</div><div class='add'>+#define R9A09G077_CLK_PCLKM		13</div><div class='add'>+#define R9A09G077_CLK_PCLKL		14</div><div class='add'>+#define R9A09G077_SDHI_CLKHS		15</div><div class='add'>+#define R9A09G077_USB_CLK		16</div><div class='add'>+#define R9A09G077_ETCLKA		17</div><div class='add'>+#define R9A09G077_ETCLKB		18</div><div class='add'>+#define R9A09G077_ETCLKC		19</div><div class='add'>+#define R9A09G077_ETCLKD		20</div><div class='add'>+#define R9A09G077_ETCLKE		21</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_CLOCK_RENESAS_R9A09G077_CPG_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h b/include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h<br/>new file mode 100644<br/>index 000000000000..09da0ad33be6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Renesas Electronics Corp.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_CLOCK_RENESAS_R9A09G087_CPG_H__</div><div class='add'>+#define __DT_BINDINGS_CLOCK_RENESAS_R9A09G087_CPG_H__</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/clock/renesas-cpg-mssr.h&gt;</div><div class='add'>+</div><div class='add'>+/* R9A09G087 CPG Core Clocks */</div><div class='add'>+#define R9A09G087_CLK_CA55C0		0</div><div class='add'>+#define R9A09G087_CLK_CA55C1		1</div><div class='add'>+#define R9A09G087_CLK_CA55C2		2</div><div class='add'>+#define R9A09G087_CLK_CA55C3		3</div><div class='add'>+#define R9A09G087_CLK_CA55S		4</div><div class='add'>+#define R9A09G087_CLK_CR52_CPU0		5</div><div class='add'>+#define R9A09G087_CLK_CR52_CPU1		6</div><div class='add'>+#define R9A09G087_CLK_CKIO		7</div><div class='add'>+#define R9A09G087_CLK_PCLKAH		8</div><div class='add'>+#define R9A09G087_CLK_PCLKAM		9</div><div class='add'>+#define R9A09G087_CLK_PCLKAL		10</div><div class='add'>+#define R9A09G087_CLK_PCLKGPTL		11</div><div class='add'>+#define R9A09G087_CLK_PCLKH		12</div><div class='add'>+#define R9A09G087_CLK_PCLKM		13</div><div class='add'>+#define R9A09G087_CLK_PCLKL		14</div><div class='add'>+#define R9A09G087_SDHI_CLKHS		15</div><div class='add'>+#define R9A09G087_USB_CLK		16</div><div class='add'>+#define R9A09G087_ETCLKA		17</div><div class='add'>+#define R9A09G087_ETCLKB		18</div><div class='add'>+#define R9A09G087_ETCLKC		19</div><div class='add'>+#define R9A09G087_ETCLKD		20</div><div class='add'>+#define R9A09G087_ETCLKE		21</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_CLOCK_RENESAS_R9A09G087_CPG_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3036-cru.h b/include/dt-bindings/clock/rk3036-cru.h<br/>index a96a9870ad59..5cbc0e2b08ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3036-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3036-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3036-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3036-cru.h</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> #define SCLK_MACREF		152</div><div class='ctx'> #define SCLK_MACPLL		153</div><div class='ctx'> #define SCLK_SFC		160</div><div class='add'>+#define SCLK_USB480M		161</div><div class='ctx'> </div><div class='ctx'> /* aclk gates */</div><div class='ctx'> #define ACLK_DMAC2		194</div><div class='hunk'>@@ -94,8 +95,6 @@</div><div class='ctx'> #define HCLK_CPU		477</div><div class='ctx'> #define HCLK_PERI		478</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(HCLK_PERI + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> #define SRST_CORE0		0</div><div class='ctx'> #define SRST_CORE1		1</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3128-cru.h b/include/dt-bindings/clock/rk3128-cru.h<br/>index 6a47825dac5d..b609fcf96508 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3128-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3128-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3128-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3128-cru.h</a></div><div class='hunk'>@@ -116,6 +116,7 @@</div><div class='ctx'> #define PCLK_GMAC		367</div><div class='ctx'> #define PCLK_PMU_PRE		368</div><div class='ctx'> #define PCLK_SIM_CARD		369</div><div class='add'>+#define PCLK_MIPIPHY		370</div><div class='ctx'> </div><div class='ctx'> /* hclk gates */</div><div class='ctx'> #define HCLK_SPDIF		440</div><div class='hunk'>@@ -143,8 +144,7 @@</div><div class='ctx'> #define HCLK_TSP		475</div><div class='ctx'> #define HCLK_CRYPTO		476</div><div class='ctx'> #define HCLK_PERI		478</div><div class='del'>-</div><div class='del'>-#define CLK_NR_CLKS		(HCLK_PERI + 1)</div><div class='add'>+#define HCLK_SFC		479</div><div class='ctx'> </div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> #define SRST_CORE0_PO		0</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h<br/>index afad90680fce..dd988cc9d582 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3188-cru-common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3188-cru-common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3188-cru-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3188-cru-common.h</a></div><div class='hunk'>@@ -103,6 +103,8 @@</div><div class='ctx'> #define PCLK_PERI		351</div><div class='ctx'> #define PCLK_DDRUPCTL		352</div><div class='ctx'> #define PCLK_PUBL		353</div><div class='add'>+#define PCLK_CIF0		354</div><div class='add'>+#define PCLK_CIF1		355</div><div class='ctx'> </div><div class='ctx'> /* hclk gates */</div><div class='ctx'> #define HCLK_SDMMC		448</div><div class='hunk'>@@ -132,8 +134,6 @@</div><div class='ctx'> #define HCLK_VDPU		472</div><div class='ctx'> #define HCLK_HDMI		473</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(HCLK_HDMI + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> #define SRST_MCORE		2</div><div class='ctx'> #define SRST_CORE0		3</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h<br/>index de550ea56eeb..138b6ce514dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3228-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3228-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3228-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3228-cru.h</a></div><div class='hunk'>@@ -146,8 +146,6 @@</div><div class='ctx'> #define HCLK_S_CRYPTO		477</div><div class='ctx'> #define HCLK_PERI		478</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(HCLK_PERI + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> #define SRST_CORE0_PO		0</div><div class='ctx'> #define SRST_CORE1_PO		1</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h<br/>index 33819acbfc56..c6034b01b050 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3288-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3288-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3288-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3288-cru.h</a></div><div class='hunk'>@@ -195,8 +195,6 @@</div><div class='ctx'> #define HCLK_CPU		477</div><div class='ctx'> #define HCLK_PERI		478</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(HCLK_PERI + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> #define SRST_CORE0		0</div><div class='ctx'> #define SRST_CORE1		1</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3308-cru.h b/include/dt-bindings/clock/rk3308-cru.h<br/>index d97840f9ee2e..ce4cd72b9d3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3308-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3308-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3308-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3308-cru.h</a></div><div class='hunk'>@@ -212,8 +212,6 @@</div><div class='ctx'> #define PCLK_CAN		233</div><div class='ctx'> #define PCLK_OWIRE		234</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(PCLK_OWIRE + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> </div><div class='ctx'> /* cru_softrst_con0 */</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3328-cru.h b/include/dt-bindings/clock/rk3328-cru.h<br/>index 555b4ff660ae..8885a2e98c65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3328-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3328-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3328-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3328-cru.h</a></div><div class='hunk'>@@ -201,8 +201,6 @@</div><div class='ctx'> #define HCLK_RGA		340</div><div class='ctx'> #define HCLK_HDCP		341</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(HCLK_HDCP + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> #define SRST_CORE0_PO		0</div><div class='ctx'> #define SRST_CORE1_PO		1</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3368-cru.h b/include/dt-bindings/clock/rk3368-cru.h<br/>index 83c72a163fd3..b951e2906948 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3368-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3368-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3368-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3368-cru.h</a></div><div class='hunk'>@@ -72,6 +72,7 @@</div><div class='ctx'> #define SCLK_SFC		126</div><div class='ctx'> #define SCLK_MAC		127</div><div class='ctx'> #define SCLK_MACREF_OUT		128</div><div class='add'>+#define SCLK_MIPIDSI_24M	129</div><div class='ctx'> #define SCLK_TIMER10		133</div><div class='ctx'> #define SCLK_TIMER11		134</div><div class='ctx'> #define SCLK_TIMER12		135</div><div class='hunk'>@@ -182,8 +183,6 @@</div><div class='ctx'> #define HCLK_BUS		477</div><div class='ctx'> #define HCLK_PERI		478</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(HCLK_PERI + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> #define SRST_CORE_B0		0</div><div class='ctx'> #define SRST_CORE_B1		1</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h<br/>index 39169d94a44e..4c90c7703a83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3399-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3399-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3399-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3399-cru.h</a></div><div class='hunk'>@@ -335,8 +335,6 @@</div><div class='ctx'> #define HCLK_SDIO_NOC			495</div><div class='ctx'> #define HCLK_SDIOAUDIO_NOC		496</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS			(HCLK_SDIOAUDIO_NOC + 1)</div><div class='del'>-</div><div class='ctx'> /* pmu-clocks indices */</div><div class='ctx'> </div><div class='ctx'> #define PLL_PPLL			1</div><div class='hunk'>@@ -378,8 +376,6 @@</div><div class='ctx'> #define PCLK_INTR_ARB_PMU		49</div><div class='ctx'> #define HCLK_NOC_PMU			50</div><div class='ctx'> </div><div class='del'>-#define CLKPMU_NR_CLKS			(HCLK_NOC_PMU + 1)</div><div class='del'>-</div><div class='ctx'> /* soft-reset indices */</div><div class='ctx'> </div><div class='ctx'> /* cru_softrst_con0 */</div><div class='head'>diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h<br/>index d29890865150..1e0aef8a645d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3568-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/rk3568-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rk3568-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rk3568-cru.h</a></div><div class='hunk'>@@ -78,6 +78,7 @@</div><div class='ctx'> #define CPLL_333M		9</div><div class='ctx'> #define ARMCLK			10</div><div class='ctx'> #define USB480M			11</div><div class='add'>+#define USB480M_PHY		12</div><div class='ctx'> #define ACLK_CORE_NIU2BUS	18</div><div class='ctx'> #define CLK_CORE_PVTM		19</div><div class='ctx'> #define CLK_CORE_PVTM_CORE	20</div><div class='hunk'>@@ -482,7 +483,11 @@</div><div class='ctx'> </div><div class='ctx'> #define PCLK_CORE_PVTM		450</div><div class='ctx'> </div><div class='del'>-#define CLK_NR_CLKS		(PCLK_CORE_PVTM + 1)</div><div class='add'>+/* scmi-clocks indices */</div><div class='add'>+</div><div class='add'>+#define SCMI_CLK_CPU		0</div><div class='add'>+#define SCMI_CLK_GPU		1</div><div class='add'>+#define SCMI_CLK_NPU		2</div><div class='ctx'> </div><div class='ctx'> /* pmu soft-reset indices */</div><div class='ctx'> /* pmucru_softrst_con0 */</div><div class='head'>diff --git a/include/dt-bindings/clock/rockchip,rk3506-cru.h b/include/dt-bindings/clock/rockchip,rk3506-cru.h<br/>new file mode 100644<br/>index 000000000000..71d7dda23cc9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rockchip,rk3506-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rockchip,rk3506-cru.h</a></div><div class='hunk'>@@ -0,0 +1,285 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023-2025 Rockchip Electronics Co., Ltd.</div><div class='add'>+ * Author: Finley Xiao &lt;finley.xiao@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3506_H</div><div class='add'>+#define _DT_BINDINGS_CLK_ROCKCHIP_RK3506_H</div><div class='add'>+</div><div class='add'>+/* cru plls */</div><div class='add'>+#define PLL_GPLL			0</div><div class='add'>+#define PLL_V0PLL			1</div><div class='add'>+#define PLL_V1PLL			2</div><div class='add'>+</div><div class='add'>+/* cru-clocks indices */</div><div class='add'>+#define ARMCLK				3</div><div class='add'>+#define CLK_DDR				4</div><div class='add'>+#define XIN24M_GATE			5</div><div class='add'>+#define CLK_GPLL_GATE			6</div><div class='add'>+#define CLK_V0PLL_GATE			7</div><div class='add'>+#define CLK_V1PLL_GATE			8</div><div class='add'>+#define CLK_GPLL_DIV			9</div><div class='add'>+#define CLK_GPLL_DIV_100M		10</div><div class='add'>+#define CLK_V0PLL_DIV			11</div><div class='add'>+#define CLK_V1PLL_DIV			12</div><div class='add'>+#define CLK_INT_VOICE_MATRIX0		13</div><div class='add'>+#define CLK_INT_VOICE_MATRIX1		14</div><div class='add'>+#define CLK_INT_VOICE_MATRIX2		15</div><div class='add'>+#define CLK_FRAC_UART_MATRIX0_MUX	16</div><div class='add'>+#define CLK_FRAC_UART_MATRIX1_MUX	17</div><div class='add'>+#define CLK_FRAC_VOICE_MATRIX0_MUX	18</div><div class='add'>+#define CLK_FRAC_VOICE_MATRIX1_MUX	19</div><div class='add'>+#define CLK_FRAC_COMMON_MATRIX0_MUX	20</div><div class='add'>+#define CLK_FRAC_COMMON_MATRIX1_MUX	21</div><div class='add'>+#define CLK_FRAC_COMMON_MATRIX2_MUX	22</div><div class='add'>+#define CLK_FRAC_UART_MATRIX0		23</div><div class='add'>+#define CLK_FRAC_UART_MATRIX1		24</div><div class='add'>+#define CLK_FRAC_VOICE_MATRIX0		25</div><div class='add'>+#define CLK_FRAC_VOICE_MATRIX1		26</div><div class='add'>+#define CLK_FRAC_COMMON_MATRIX0		27</div><div class='add'>+#define CLK_FRAC_COMMON_MATRIX1		28</div><div class='add'>+#define CLK_FRAC_COMMON_MATRIX2		29</div><div class='add'>+#define CLK_REF_USBPHY_TOP		30</div><div class='add'>+#define CLK_REF_DPHY_TOP		31</div><div class='add'>+#define ACLK_CORE_ROOT			32</div><div class='add'>+#define PCLK_CORE_ROOT			33</div><div class='add'>+#define PCLK_DBG			34</div><div class='add'>+#define PCLK_CORE_GRF			35</div><div class='add'>+#define PCLK_CORE_CRU			36</div><div class='add'>+#define CLK_CORE_EMA_DETECT		37</div><div class='add'>+#define CLK_REF_PVTPLL_CORE		38</div><div class='add'>+#define PCLK_GPIO1			39</div><div class='add'>+#define DBCLK_GPIO1			40</div><div class='add'>+#define ACLK_CORE_PERI_ROOT		41</div><div class='add'>+#define HCLK_CORE_PERI_ROOT		42</div><div class='add'>+#define PCLK_CORE_PERI_ROOT		43</div><div class='add'>+#define CLK_DSMC			44</div><div class='add'>+#define ACLK_DSMC			45</div><div class='add'>+#define PCLK_DSMC			46</div><div class='add'>+#define CLK_FLEXBUS_TX			47</div><div class='add'>+#define CLK_FLEXBUS_RX			48</div><div class='add'>+#define ACLK_FLEXBUS			49</div><div class='add'>+#define HCLK_FLEXBUS			50</div><div class='add'>+#define ACLK_DSMC_SLV			51</div><div class='add'>+#define HCLK_DSMC_SLV			52</div><div class='add'>+#define ACLK_BUS_ROOT			53</div><div class='add'>+#define HCLK_BUS_ROOT			54</div><div class='add'>+#define PCLK_BUS_ROOT			55</div><div class='add'>+#define ACLK_SYSRAM			56</div><div class='add'>+#define HCLK_SYSRAM			57</div><div class='add'>+#define ACLK_DMAC0			58</div><div class='add'>+#define ACLK_DMAC1			59</div><div class='add'>+#define HCLK_M0				60</div><div class='add'>+#define PCLK_BUS_GRF			61</div><div class='add'>+#define PCLK_TIMER			62</div><div class='add'>+#define CLK_TIMER0_CH0			63</div><div class='add'>+#define CLK_TIMER0_CH1			64</div><div class='add'>+#define CLK_TIMER0_CH2			65</div><div class='add'>+#define CLK_TIMER0_CH3			66</div><div class='add'>+#define CLK_TIMER0_CH4			67</div><div class='add'>+#define CLK_TIMER0_CH5			68</div><div class='add'>+#define PCLK_WDT0			69</div><div class='add'>+#define TCLK_WDT0			70</div><div class='add'>+#define PCLK_WDT1			71</div><div class='add'>+#define TCLK_WDT1			72</div><div class='add'>+#define PCLK_MAILBOX			73</div><div class='add'>+#define PCLK_INTMUX			74</div><div class='add'>+#define PCLK_SPINLOCK			75</div><div class='add'>+#define PCLK_DDRC			76</div><div class='add'>+#define HCLK_DDRPHY			77</div><div class='add'>+#define PCLK_DDRMON			78</div><div class='add'>+#define CLK_DDRMON_OSC			79</div><div class='add'>+#define PCLK_STDBY			80</div><div class='add'>+#define HCLK_USBOTG0			81</div><div class='add'>+#define HCLK_USBOTG0_PMU		82</div><div class='add'>+#define CLK_USBOTG0_ADP			83</div><div class='add'>+#define HCLK_USBOTG1			84</div><div class='add'>+#define HCLK_USBOTG1_PMU		85</div><div class='add'>+#define CLK_USBOTG1_ADP			86</div><div class='add'>+#define PCLK_USBPHY			87</div><div class='add'>+#define ACLK_DMA2DDR			88</div><div class='add'>+#define PCLK_DMA2DDR			89</div><div class='add'>+#define STCLK_M0			90</div><div class='add'>+#define CLK_DDRPHY			91</div><div class='add'>+#define CLK_DDRC_SRC			92</div><div class='add'>+#define ACLK_DDRC_0			93</div><div class='add'>+#define ACLK_DDRC_1			94</div><div class='add'>+#define CLK_DDRC			95</div><div class='add'>+#define CLK_DDRMON			96</div><div class='add'>+#define HCLK_LSPERI_ROOT		97</div><div class='add'>+#define PCLK_LSPERI_ROOT		98</div><div class='add'>+#define PCLK_UART0			99</div><div class='add'>+#define PCLK_UART1			100</div><div class='add'>+#define PCLK_UART2			101</div><div class='add'>+#define PCLK_UART3			102</div><div class='add'>+#define PCLK_UART4			103</div><div class='add'>+#define SCLK_UART0			104</div><div class='add'>+#define SCLK_UART1			105</div><div class='add'>+#define SCLK_UART2			106</div><div class='add'>+#define SCLK_UART3			107</div><div class='add'>+#define SCLK_UART4			108</div><div class='add'>+#define PCLK_I2C0			109</div><div class='add'>+#define CLK_I2C0			110</div><div class='add'>+#define PCLK_I2C1			111</div><div class='add'>+#define CLK_I2C1			112</div><div class='add'>+#define PCLK_I2C2			113</div><div class='add'>+#define CLK_I2C2			114</div><div class='add'>+#define PCLK_PWM1			115</div><div class='add'>+#define CLK_PWM1			116</div><div class='add'>+#define CLK_OSC_PWM1			117</div><div class='add'>+#define CLK_RC_PWM1			118</div><div class='add'>+#define CLK_FREQ_PWM1			119</div><div class='add'>+#define CLK_COUNTER_PWM1		120</div><div class='add'>+#define PCLK_SPI0			121</div><div class='add'>+#define CLK_SPI0			122</div><div class='add'>+#define PCLK_SPI1			123</div><div class='add'>+#define CLK_SPI1			124</div><div class='add'>+#define PCLK_GPIO2			125</div><div class='add'>+#define DBCLK_GPIO2			126</div><div class='add'>+#define PCLK_GPIO3			127</div><div class='add'>+#define DBCLK_GPIO3			128</div><div class='add'>+#define PCLK_GPIO4			129</div><div class='add'>+#define DBCLK_GPIO4			130</div><div class='add'>+#define HCLK_CAN0			131</div><div class='add'>+#define CLK_CAN0			132</div><div class='add'>+#define HCLK_CAN1			133</div><div class='add'>+#define CLK_CAN1			134</div><div class='add'>+#define HCLK_PDM			135</div><div class='add'>+#define MCLK_PDM			136</div><div class='add'>+#define CLKOUT_PDM			137</div><div class='add'>+#define MCLK_SPDIFTX			138</div><div class='add'>+#define HCLK_SPDIFTX			139</div><div class='add'>+#define HCLK_SPDIFRX			140</div><div class='add'>+#define MCLK_SPDIFRX			141</div><div class='add'>+#define MCLK_SAI0			142</div><div class='add'>+#define HCLK_SAI0			143</div><div class='add'>+#define MCLK_OUT_SAI0			144</div><div class='add'>+#define MCLK_SAI1			145</div><div class='add'>+#define HCLK_SAI1			146</div><div class='add'>+#define MCLK_OUT_SAI1			147</div><div class='add'>+#define HCLK_ASRC0			148</div><div class='add'>+#define CLK_ASRC0			149</div><div class='add'>+#define HCLK_ASRC1			150</div><div class='add'>+#define CLK_ASRC1			151</div><div class='add'>+#define PCLK_CRU			152</div><div class='add'>+#define PCLK_PMU_ROOT			153</div><div class='add'>+#define MCLK_ASRC0			154</div><div class='add'>+#define MCLK_ASRC1			155</div><div class='add'>+#define MCLK_ASRC2			156</div><div class='add'>+#define MCLK_ASRC3			157</div><div class='add'>+#define LRCK_ASRC0_SRC			158</div><div class='add'>+#define LRCK_ASRC0_DST			159</div><div class='add'>+#define LRCK_ASRC1_SRC			160</div><div class='add'>+#define LRCK_ASRC1_DST			161</div><div class='add'>+#define ACLK_HSPERI_ROOT		162</div><div class='add'>+#define HCLK_HSPERI_ROOT		163</div><div class='add'>+#define PCLK_HSPERI_ROOT		164</div><div class='add'>+#define CCLK_SRC_SDMMC			165</div><div class='add'>+#define HCLK_SDMMC			166</div><div class='add'>+#define HCLK_FSPI			167</div><div class='add'>+#define SCLK_FSPI			168</div><div class='add'>+#define PCLK_SPI2			169</div><div class='add'>+#define ACLK_MAC0			170</div><div class='add'>+#define ACLK_MAC1			171</div><div class='add'>+#define PCLK_MAC0			172</div><div class='add'>+#define PCLK_MAC1			173</div><div class='add'>+#define CLK_MAC_ROOT			174</div><div class='add'>+#define CLK_MAC0			175</div><div class='add'>+#define CLK_MAC1			176</div><div class='add'>+#define MCLK_SAI2			177</div><div class='add'>+#define HCLK_SAI2			178</div><div class='add'>+#define MCLK_OUT_SAI2			179</div><div class='add'>+#define MCLK_SAI3_SRC			180</div><div class='add'>+#define HCLK_SAI3			181</div><div class='add'>+#define MCLK_SAI3			182</div><div class='add'>+#define MCLK_OUT_SAI3			183</div><div class='add'>+#define MCLK_SAI4_SRC			184</div><div class='add'>+#define HCLK_SAI4			185</div><div class='add'>+#define MCLK_SAI4			186</div><div class='add'>+#define HCLK_DSM			187</div><div class='add'>+#define MCLK_DSM			188</div><div class='add'>+#define PCLK_AUDIO_ADC			189</div><div class='add'>+#define MCLK_AUDIO_ADC			190</div><div class='add'>+#define MCLK_AUDIO_ADC_DIV4		191</div><div class='add'>+#define PCLK_SARADC			192</div><div class='add'>+#define CLK_SARADC			193</div><div class='add'>+#define PCLK_OTPC_NS			194</div><div class='add'>+#define CLK_SBPI_OTPC_NS		195</div><div class='add'>+#define CLK_USER_OTPC_NS		196</div><div class='add'>+#define PCLK_UART5			197</div><div class='add'>+#define SCLK_UART5			198</div><div class='add'>+#define PCLK_GPIO234_IOC		199</div><div class='add'>+#define CLK_MAC_PTP_ROOT		200</div><div class='add'>+#define CLK_MAC0_PTP			201</div><div class='add'>+#define CLK_MAC1_PTP			202</div><div class='add'>+#define CLK_SPI2			203</div><div class='add'>+#define ACLK_VIO_ROOT			204</div><div class='add'>+#define HCLK_VIO_ROOT			205</div><div class='add'>+#define PCLK_VIO_ROOT			206</div><div class='add'>+#define HCLK_RGA			207</div><div class='add'>+#define ACLK_RGA			208</div><div class='add'>+#define CLK_CORE_RGA			209</div><div class='add'>+#define ACLK_VOP			210</div><div class='add'>+#define HCLK_VOP			211</div><div class='add'>+#define DCLK_VOP			212</div><div class='add'>+#define PCLK_DPHY			213</div><div class='add'>+#define PCLK_DSI_HOST			214</div><div class='add'>+#define PCLK_TSADC			215</div><div class='add'>+#define CLK_TSADC			216</div><div class='add'>+#define CLK_TSADC_TSEN			217</div><div class='add'>+#define PCLK_GPIO1_IOC			218</div><div class='add'>+#define PCLK_OTPC_S			219</div><div class='add'>+#define CLK_SBPI_OTPC_S			220</div><div class='add'>+#define CLK_USER_OTPC_S			221</div><div class='add'>+#define PCLK_OTP_MASK			222</div><div class='add'>+#define PCLK_KEYREADER			223</div><div class='add'>+#define HCLK_BOOTROM			224</div><div class='add'>+#define PCLK_DDR_SERVICE		225</div><div class='add'>+#define HCLK_CRYPTO_S			226</div><div class='add'>+#define HCLK_KEYLAD			227</div><div class='add'>+#define CLK_CORE_CRYPTO			228</div><div class='add'>+#define CLK_PKA_CRYPTO			229</div><div class='add'>+#define CLK_CORE_CRYPTO_S		230</div><div class='add'>+#define CLK_PKA_CRYPTO_S		231</div><div class='add'>+#define ACLK_CRYPTO_S			232</div><div class='add'>+#define HCLK_RNG_S			233</div><div class='add'>+#define CLK_CORE_CRYPTO_NS		234</div><div class='add'>+#define CLK_PKA_CRYPTO_NS		235</div><div class='add'>+#define ACLK_CRYPTO_NS			236</div><div class='add'>+#define HCLK_CRYPTO_NS			237</div><div class='add'>+#define HCLK_RNG			238</div><div class='add'>+#define CLK_PMU				239</div><div class='add'>+#define PCLK_PMU			240</div><div class='add'>+#define CLK_PMU_32K			241</div><div class='add'>+#define PCLK_PMU_CRU			242</div><div class='add'>+#define PCLK_PMU_GRF			243</div><div class='add'>+#define PCLK_GPIO0_IOC			244</div><div class='add'>+#define PCLK_GPIO0			245</div><div class='add'>+#define DBCLK_GPIO0			246</div><div class='add'>+#define PCLK_GPIO1_SHADOW		247</div><div class='add'>+#define DBCLK_GPIO1_SHADOW		248</div><div class='add'>+#define PCLK_PMU_HP_TIMER		249</div><div class='add'>+#define CLK_PMU_HP_TIMER		250</div><div class='add'>+#define CLK_PMU_HP_TIMER_32K		251</div><div class='add'>+#define PCLK_PWM0			252</div><div class='add'>+#define CLK_PWM0			253</div><div class='add'>+#define CLK_OSC_PWM0			254</div><div class='add'>+#define CLK_RC_PWM0			255</div><div class='add'>+#define CLK_MAC_OUT			256</div><div class='add'>+#define CLK_REF_OUT0			257</div><div class='add'>+#define CLK_REF_OUT1			258</div><div class='add'>+#define CLK_32K_FRAC			259</div><div class='add'>+#define CLK_32K_RC			260</div><div class='add'>+#define CLK_32K				261</div><div class='add'>+#define CLK_32K_PMU			262</div><div class='add'>+#define PCLK_TOUCH_KEY			263</div><div class='add'>+#define CLK_TOUCH_KEY			264</div><div class='add'>+#define CLK_REF_PHY_PLL			265</div><div class='add'>+#define CLK_REF_PHY_PMU_MUX		266</div><div class='add'>+#define CLK_WIFI_OUT			267</div><div class='add'>+#define CLK_V0PLL_REF			268</div><div class='add'>+#define CLK_V1PLL_REF			269</div><div class='add'>+#define CLK_32K_FRAC_MUX		270</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/rockchip,rk3528-cru.h b/include/dt-bindings/clock/rockchip,rk3528-cru.h<br/>new file mode 100644<br/>index 000000000000..0245a53fc334<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rockchip,rk3528-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rockchip,rk3528-cru.h</a></div><div class='hunk'>@@ -0,0 +1,459 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Rockchip Electronics Co. Ltd.</div><div class='add'>+ * Copyright (c) 2024 Yao Zi &lt;ziyao@disroot.org&gt;</div><div class='add'>+ * Author: Joseph Chen &lt;chenjh@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3528_H</div><div class='add'>+#define _DT_BINDINGS_CLK_ROCKCHIP_RK3528_H</div><div class='add'>+</div><div class='add'>+/* cru-clocks indices */</div><div class='add'>+#define PLL_APLL			0</div><div class='add'>+#define PLL_CPLL			1</div><div class='add'>+#define PLL_GPLL			2</div><div class='add'>+#define PLL_PPLL			3</div><div class='add'>+#define PLL_DPLL			4</div><div class='add'>+#define ARMCLK				5</div><div class='add'>+#define XIN_OSC0_HALF			6</div><div class='add'>+#define CLK_MATRIX_50M_SRC		7</div><div class='add'>+#define CLK_MATRIX_100M_SRC		8</div><div class='add'>+#define CLK_MATRIX_150M_SRC		9</div><div class='add'>+#define CLK_MATRIX_200M_SRC		10</div><div class='add'>+#define CLK_MATRIX_250M_SRC		11</div><div class='add'>+#define CLK_MATRIX_300M_SRC		12</div><div class='add'>+#define CLK_MATRIX_339M_SRC		13</div><div class='add'>+#define CLK_MATRIX_400M_SRC		14</div><div class='add'>+#define CLK_MATRIX_500M_SRC		15</div><div class='add'>+#define CLK_MATRIX_600M_SRC		16</div><div class='add'>+#define CLK_UART0_SRC			17</div><div class='add'>+#define CLK_UART0_FRAC			18</div><div class='add'>+#define SCLK_UART0			19</div><div class='add'>+#define CLK_UART1_SRC			20</div><div class='add'>+#define CLK_UART1_FRAC			21</div><div class='add'>+#define SCLK_UART1			22</div><div class='add'>+#define CLK_UART2_SRC			23</div><div class='add'>+#define CLK_UART2_FRAC			24</div><div class='add'>+#define SCLK_UART2			25</div><div class='add'>+#define CLK_UART3_SRC			26</div><div class='add'>+#define CLK_UART3_FRAC			27</div><div class='add'>+#define SCLK_UART3			28</div><div class='add'>+#define CLK_UART4_SRC			29</div><div class='add'>+#define CLK_UART4_FRAC			30</div><div class='add'>+#define SCLK_UART4			31</div><div class='add'>+#define CLK_UART5_SRC			32</div><div class='add'>+#define CLK_UART5_FRAC			33</div><div class='add'>+#define SCLK_UART5			34</div><div class='add'>+#define CLK_UART6_SRC			35</div><div class='add'>+#define CLK_UART6_FRAC			36</div><div class='add'>+#define SCLK_UART6			37</div><div class='add'>+#define CLK_UART7_SRC			38</div><div class='add'>+#define CLK_UART7_FRAC			39</div><div class='add'>+#define SCLK_UART7			40</div><div class='add'>+#define CLK_I2S0_2CH_SRC		41</div><div class='add'>+#define CLK_I2S0_2CH_FRAC		42</div><div class='add'>+#define MCLK_I2S0_2CH_SAI_SRC		43</div><div class='add'>+#define CLK_I2S3_8CH_SRC		44</div><div class='add'>+#define CLK_I2S3_8CH_FRAC		45</div><div class='add'>+#define MCLK_I2S3_8CH_SAI_SRC		46</div><div class='add'>+#define CLK_I2S1_8CH_SRC		47</div><div class='add'>+#define CLK_I2S1_8CH_FRAC		48</div><div class='add'>+#define MCLK_I2S1_8CH_SAI_SRC		49</div><div class='add'>+#define CLK_I2S2_2CH_SRC		50</div><div class='add'>+#define CLK_I2S2_2CH_FRAC		51</div><div class='add'>+#define MCLK_I2S2_2CH_SAI_SRC		52</div><div class='add'>+#define CLK_SPDIF_SRC			53</div><div class='add'>+#define CLK_SPDIF_FRAC			54</div><div class='add'>+#define MCLK_SPDIF_SRC			55</div><div class='add'>+#define DCLK_VOP_SRC0			56</div><div class='add'>+#define DCLK_VOP_SRC1			57</div><div class='add'>+#define CLK_HSM				58</div><div class='add'>+#define CLK_CORE_SRC_ACS		59</div><div class='add'>+#define CLK_CORE_SRC_PVTMUX		60</div><div class='add'>+#define CLK_CORE_SRC			61</div><div class='add'>+#define CLK_CORE			62</div><div class='add'>+#define ACLK_M_CORE_BIU			63</div><div class='add'>+#define CLK_CORE_PVTPLL_SRC		64</div><div class='add'>+#define PCLK_DBG			65</div><div class='add'>+#define SWCLKTCK			66</div><div class='add'>+#define CLK_SCANHS_CORE			67</div><div class='add'>+#define CLK_SCANHS_ACLKM_CORE		68</div><div class='add'>+#define CLK_SCANHS_PCLK_DBG		69</div><div class='add'>+#define CLK_SCANHS_PCLK_CPU_BIU		70</div><div class='add'>+#define PCLK_CPU_ROOT			71</div><div class='add'>+#define PCLK_CORE_GRF			72</div><div class='add'>+#define PCLK_DAPLITE_BIU		73</div><div class='add'>+#define PCLK_CPU_BIU			74</div><div class='add'>+#define CLK_REF_PVTPLL_CORE		75</div><div class='add'>+#define ACLK_BUS_VOPGL_ROOT		76</div><div class='add'>+#define ACLK_BUS_VOPGL_BIU		77</div><div class='add'>+#define ACLK_BUS_H_ROOT			78</div><div class='add'>+#define ACLK_BUS_H_BIU			79</div><div class='add'>+#define ACLK_BUS_ROOT			80</div><div class='add'>+#define HCLK_BUS_ROOT			81</div><div class='add'>+#define PCLK_BUS_ROOT			82</div><div class='add'>+#define ACLK_BUS_M_ROOT			83</div><div class='add'>+#define ACLK_SYSMEM_BIU			84</div><div class='add'>+#define CLK_TIMER_ROOT			85</div><div class='add'>+#define ACLK_BUS_BIU			86</div><div class='add'>+#define HCLK_BUS_BIU			87</div><div class='add'>+#define PCLK_BUS_BIU			88</div><div class='add'>+#define PCLK_DFT2APB			89</div><div class='add'>+#define PCLK_BUS_GRF			90</div><div class='add'>+#define ACLK_BUS_M_BIU			91</div><div class='add'>+#define ACLK_GIC			92</div><div class='add'>+#define ACLK_SPINLOCK			93</div><div class='add'>+#define ACLK_DMAC			94</div><div class='add'>+#define PCLK_TIMER			95</div><div class='add'>+#define CLK_TIMER0			96</div><div class='add'>+#define CLK_TIMER1			97</div><div class='add'>+#define CLK_TIMER2			98</div><div class='add'>+#define CLK_TIMER3			99</div><div class='add'>+#define CLK_TIMER4			100</div><div class='add'>+#define CLK_TIMER5			101</div><div class='add'>+#define PCLK_JDBCK_DAP			102</div><div class='add'>+#define CLK_JDBCK_DAP			103</div><div class='add'>+#define PCLK_WDT_NS			104</div><div class='add'>+#define TCLK_WDT_NS			105</div><div class='add'>+#define HCLK_TRNG_NS			106</div><div class='add'>+#define PCLK_UART0			107</div><div class='add'>+#define PCLK_DMA2DDR			108</div><div class='add'>+#define ACLK_DMA2DDR			109</div><div class='add'>+#define PCLK_PWM0			110</div><div class='add'>+#define CLK_PWM0			111</div><div class='add'>+#define CLK_CAPTURE_PWM0		112</div><div class='add'>+#define PCLK_PWM1			113</div><div class='add'>+#define CLK_PWM1			114</div><div class='add'>+#define CLK_CAPTURE_PWM1		115</div><div class='add'>+#define PCLK_SCR			116</div><div class='add'>+#define ACLK_DCF			117</div><div class='add'>+#define PCLK_INTMUX			118</div><div class='add'>+#define CLK_PPLL_I			119</div><div class='add'>+#define CLK_PPLL_MUX			120</div><div class='add'>+#define CLK_PPLL_100M_MATRIX		121</div><div class='add'>+#define CLK_PPLL_50M_MATRIX		122</div><div class='add'>+#define CLK_REF_PCIE_INNER_PHY		123</div><div class='add'>+#define CLK_REF_PCIE_100M_PHY		124</div><div class='add'>+#define ACLK_VPU_L_ROOT			125</div><div class='add'>+#define CLK_GMAC1_VPU_25M		126</div><div class='add'>+#define CLK_PPLL_125M_MATRIX		127</div><div class='add'>+#define ACLK_VPU_ROOT			128</div><div class='add'>+#define HCLK_VPU_ROOT			129</div><div class='add'>+#define PCLK_VPU_ROOT			130</div><div class='add'>+#define ACLK_VPU_BIU			131</div><div class='add'>+#define HCLK_VPU_BIU			132</div><div class='add'>+#define PCLK_VPU_BIU			133</div><div class='add'>+#define ACLK_VPU			134</div><div class='add'>+#define HCLK_VPU			135</div><div class='add'>+#define PCLK_CRU_PCIE			136</div><div class='add'>+#define PCLK_VPU_GRF			137</div><div class='add'>+#define HCLK_SFC			138</div><div class='add'>+#define SCLK_SFC			139</div><div class='add'>+#define CCLK_SRC_EMMC			140</div><div class='add'>+#define HCLK_EMMC			141</div><div class='add'>+#define ACLK_EMMC			142</div><div class='add'>+#define BCLK_EMMC			143</div><div class='add'>+#define TCLK_EMMC			144</div><div class='add'>+#define PCLK_GPIO1			145</div><div class='add'>+#define DBCLK_GPIO1			146</div><div class='add'>+#define ACLK_VPU_L_BIU			147</div><div class='add'>+#define PCLK_VPU_IOC			148</div><div class='add'>+#define HCLK_SAI_I2S0			149</div><div class='add'>+#define MCLK_SAI_I2S0			150</div><div class='add'>+#define HCLK_SAI_I2S2			151</div><div class='add'>+#define MCLK_SAI_I2S2			152</div><div class='add'>+#define PCLK_ACODEC			153</div><div class='add'>+#define MCLK_ACODEC_TX			154</div><div class='add'>+#define PCLK_GPIO3			155</div><div class='add'>+#define DBCLK_GPIO3			156</div><div class='add'>+#define PCLK_SPI1			157</div><div class='add'>+#define CLK_SPI1			158</div><div class='add'>+#define SCLK_IN_SPI1			159</div><div class='add'>+#define PCLK_UART2			160</div><div class='add'>+#define PCLK_UART5			161</div><div class='add'>+#define PCLK_UART6			162</div><div class='add'>+#define PCLK_UART7			163</div><div class='add'>+#define PCLK_I2C3			164</div><div class='add'>+#define CLK_I2C3			165</div><div class='add'>+#define PCLK_I2C5			166</div><div class='add'>+#define CLK_I2C5			167</div><div class='add'>+#define PCLK_I2C6			168</div><div class='add'>+#define CLK_I2C6			169</div><div class='add'>+#define ACLK_MAC_VPU			170</div><div class='add'>+#define PCLK_MAC_VPU			171</div><div class='add'>+#define CLK_GMAC1_RMII_VPU		172</div><div class='add'>+#define CLK_GMAC1_SRC_VPU		173</div><div class='add'>+#define PCLK_PCIE			174</div><div class='add'>+#define CLK_PCIE_AUX			175</div><div class='add'>+#define ACLK_PCIE			176</div><div class='add'>+#define HCLK_PCIE_SLV			177</div><div class='add'>+#define HCLK_PCIE_DBI			178</div><div class='add'>+#define PCLK_PCIE_PHY			179</div><div class='add'>+#define PCLK_PIPE_GRF			180</div><div class='add'>+#define CLK_PIPE_USB3OTG_COMBO		181</div><div class='add'>+#define CLK_UTMI_USB3OTG		182</div><div class='add'>+#define CLK_PCIE_PIPE_PHY		183</div><div class='add'>+#define CCLK_SRC_SDIO0			184</div><div class='add'>+#define HCLK_SDIO0			185</div><div class='add'>+#define CCLK_SRC_SDIO1			186</div><div class='add'>+#define HCLK_SDIO1			187</div><div class='add'>+#define CLK_TS_0			188</div><div class='add'>+#define CLK_TS_1			189</div><div class='add'>+#define PCLK_CAN2			190</div><div class='add'>+#define CLK_CAN2			191</div><div class='add'>+#define PCLK_CAN3			192</div><div class='add'>+#define CLK_CAN3			193</div><div class='add'>+#define PCLK_SARADC			194</div><div class='add'>+#define CLK_SARADC			195</div><div class='add'>+#define PCLK_TSADC			196</div><div class='add'>+#define CLK_TSADC			197</div><div class='add'>+#define CLK_TSADC_TSEN			198</div><div class='add'>+#define ACLK_USB3OTG			199</div><div class='add'>+#define CLK_REF_USB3OTG			200</div><div class='add'>+#define CLK_SUSPEND_USB3OTG		201</div><div class='add'>+#define ACLK_GPU_ROOT			202</div><div class='add'>+#define PCLK_GPU_ROOT			203</div><div class='add'>+#define ACLK_GPU_BIU			204</div><div class='add'>+#define PCLK_GPU_BIU			205</div><div class='add'>+#define ACLK_GPU			206</div><div class='add'>+#define CLK_GPU_PVTPLL_SRC		207</div><div class='add'>+#define ACLK_GPU_MALI			208</div><div class='add'>+#define HCLK_RKVENC_ROOT		209</div><div class='add'>+#define ACLK_RKVENC_ROOT		210</div><div class='add'>+#define PCLK_RKVENC_ROOT		211</div><div class='add'>+#define HCLK_RKVENC_BIU			212</div><div class='add'>+#define ACLK_RKVENC_BIU			213</div><div class='add'>+#define PCLK_RKVENC_BIU			214</div><div class='add'>+#define HCLK_RKVENC			215</div><div class='add'>+#define ACLK_RKVENC			216</div><div class='add'>+#define CLK_CORE_RKVENC			217</div><div class='add'>+#define HCLK_SAI_I2S1			218</div><div class='add'>+#define MCLK_SAI_I2S1			219</div><div class='add'>+#define PCLK_I2C1			220</div><div class='add'>+#define CLK_I2C1			221</div><div class='add'>+#define PCLK_I2C0			222</div><div class='add'>+#define CLK_I2C0			223</div><div class='add'>+#define CLK_UART_JTAG			224</div><div class='add'>+#define PCLK_SPI0			225</div><div class='add'>+#define CLK_SPI0			226</div><div class='add'>+#define SCLK_IN_SPI0			227</div><div class='add'>+#define PCLK_GPIO4			228</div><div class='add'>+#define DBCLK_GPIO4			229</div><div class='add'>+#define PCLK_RKVENC_IOC			230</div><div class='add'>+#define HCLK_SPDIF			231</div><div class='add'>+#define MCLK_SPDIF			232</div><div class='add'>+#define HCLK_PDM			233</div><div class='add'>+#define MCLK_PDM			234</div><div class='add'>+#define PCLK_UART1			235</div><div class='add'>+#define PCLK_UART3			236</div><div class='add'>+#define PCLK_RKVENC_GRF			237</div><div class='add'>+#define PCLK_CAN0			238</div><div class='add'>+#define CLK_CAN0			239</div><div class='add'>+#define PCLK_CAN1			240</div><div class='add'>+#define CLK_CAN1			241</div><div class='add'>+#define ACLK_VO_ROOT			242</div><div class='add'>+#define HCLK_VO_ROOT			243</div><div class='add'>+#define PCLK_VO_ROOT			244</div><div class='add'>+#define ACLK_VO_BIU			245</div><div class='add'>+#define HCLK_VO_BIU			246</div><div class='add'>+#define PCLK_VO_BIU			247</div><div class='add'>+#define HCLK_RGA2E			248</div><div class='add'>+#define ACLK_RGA2E			249</div><div class='add'>+#define CLK_CORE_RGA2E			250</div><div class='add'>+#define HCLK_VDPP			251</div><div class='add'>+#define ACLK_VDPP			252</div><div class='add'>+#define CLK_CORE_VDPP			253</div><div class='add'>+#define PCLK_VO_GRF			254</div><div class='add'>+#define PCLK_CRU			255</div><div class='add'>+#define ACLK_VOP_ROOT			256</div><div class='add'>+#define ACLK_VOP_BIU			257</div><div class='add'>+#define HCLK_VOP			258</div><div class='add'>+#define DCLK_VOP0			259</div><div class='add'>+#define DCLK_VOP1			260</div><div class='add'>+#define ACLK_VOP			261</div><div class='add'>+#define PCLK_HDMI			262</div><div class='add'>+#define CLK_SFR_HDMI			263</div><div class='add'>+#define CLK_CEC_HDMI			264</div><div class='add'>+#define CLK_SPDIF_HDMI			265</div><div class='add'>+#define CLK_HDMIPHY_TMDSSRC		266</div><div class='add'>+#define CLK_HDMIPHY_PREP		267</div><div class='add'>+#define PCLK_HDMIPHY			268</div><div class='add'>+#define HCLK_HDCP_KEY			269</div><div class='add'>+#define ACLK_HDCP			270</div><div class='add'>+#define HCLK_HDCP			271</div><div class='add'>+#define PCLK_HDCP			272</div><div class='add'>+#define HCLK_CVBS			273</div><div class='add'>+#define DCLK_CVBS			274</div><div class='add'>+#define DCLK_4X_CVBS			275</div><div class='add'>+#define ACLK_JPEG_DECODER		276</div><div class='add'>+#define HCLK_JPEG_DECODER		277</div><div class='add'>+#define ACLK_VO_L_ROOT			278</div><div class='add'>+#define ACLK_VO_L_BIU			279</div><div class='add'>+#define ACLK_MAC_VO			280</div><div class='add'>+#define PCLK_MAC_VO			281</div><div class='add'>+#define CLK_GMAC0_SRC			282</div><div class='add'>+#define CLK_GMAC0_RMII_50M		283</div><div class='add'>+#define CLK_GMAC0_TX			284</div><div class='add'>+#define CLK_GMAC0_RX			285</div><div class='add'>+#define ACLK_JPEG_ROOT			286</div><div class='add'>+#define ACLK_JPEG_BIU			287</div><div class='add'>+#define HCLK_SAI_I2S3			288</div><div class='add'>+#define MCLK_SAI_I2S3			289</div><div class='add'>+#define CLK_MACPHY			290</div><div class='add'>+#define PCLK_VCDCPHY			291</div><div class='add'>+#define PCLK_GPIO2			292</div><div class='add'>+#define DBCLK_GPIO2			293</div><div class='add'>+#define PCLK_VO_IOC			294</div><div class='add'>+#define CCLK_SRC_SDMMC0			295</div><div class='add'>+#define HCLK_SDMMC0			296</div><div class='add'>+#define PCLK_OTPC_NS			297</div><div class='add'>+#define CLK_SBPI_OTPC_NS		298</div><div class='add'>+#define CLK_USER_OTPC_NS		299</div><div class='add'>+#define CLK_HDMIHDP0			300</div><div class='add'>+#define HCLK_USBHOST			301</div><div class='add'>+#define HCLK_USBHOST_ARB		302</div><div class='add'>+#define CLK_USBHOST_OHCI		303</div><div class='add'>+#define CLK_USBHOST_UTMI		304</div><div class='add'>+#define PCLK_UART4			305</div><div class='add'>+#define PCLK_I2C4			306</div><div class='add'>+#define CLK_I2C4			307</div><div class='add'>+#define PCLK_I2C7			308</div><div class='add'>+#define CLK_I2C7			309</div><div class='add'>+#define PCLK_USBPHY			310</div><div class='add'>+#define CLK_REF_USBPHY			311</div><div class='add'>+#define HCLK_RKVDEC_ROOT		312</div><div class='add'>+#define ACLK_RKVDEC_ROOT_NDFT		313</div><div class='add'>+#define PCLK_DDRPHY_CRU			314</div><div class='add'>+#define HCLK_RKVDEC_BIU			315</div><div class='add'>+#define ACLK_RKVDEC_BIU			316</div><div class='add'>+#define ACLK_RKVDEC			317</div><div class='add'>+#define HCLK_RKVDEC			318</div><div class='add'>+#define CLK_HEVC_CA_RKVDEC		319</div><div class='add'>+#define ACLK_RKVDEC_PVTMUX_ROOT		320</div><div class='add'>+#define CLK_RKVDEC_PVTPLL_SRC		321</div><div class='add'>+#define PCLK_DDR_ROOT			322</div><div class='add'>+#define PCLK_DDR_BIU			323</div><div class='add'>+#define PCLK_DDRC			324</div><div class='add'>+#define PCLK_DDRMON			325</div><div class='add'>+#define CLK_TIMER_DDRMON		326</div><div class='add'>+#define PCLK_MSCH_BIU			327</div><div class='add'>+#define PCLK_DDR_GRF			328</div><div class='add'>+#define PCLK_DDR_HWLP			329</div><div class='add'>+#define PCLK_DDRPHY			330</div><div class='add'>+#define CLK_MSCH_BIU			331</div><div class='add'>+#define ACLK_DDR_UPCTL			332</div><div class='add'>+#define CLK_DDR_UPCTL			333</div><div class='add'>+#define CLK_DDRMON			334</div><div class='add'>+#define ACLK_DDR_SCRAMBLE		335</div><div class='add'>+#define ACLK_SPLIT			336</div><div class='add'>+#define CLK_DDRC_SRC			337</div><div class='add'>+#define CLK_DDR_PHY			338</div><div class='add'>+#define PCLK_OTPC_S			339</div><div class='add'>+#define CLK_SBPI_OTPC_S			340</div><div class='add'>+#define CLK_USER_OTPC_S			341</div><div class='add'>+#define PCLK_KEYREADER			342</div><div class='add'>+#define PCLK_BUS_SGRF			343</div><div class='add'>+#define PCLK_STIMER			344</div><div class='add'>+#define CLK_STIMER0			345</div><div class='add'>+#define CLK_STIMER1			346</div><div class='add'>+#define PCLK_WDT_S			347</div><div class='add'>+#define TCLK_WDT_S			348</div><div class='add'>+#define HCLK_TRNG_S			349</div><div class='add'>+#define HCLK_BOOTROM			350</div><div class='add'>+#define PCLK_DCF			351</div><div class='add'>+#define ACLK_SYSMEM			352</div><div class='add'>+#define HCLK_TSP			353</div><div class='add'>+#define ACLK_TSP			354</div><div class='add'>+#define CLK_CORE_TSP			355</div><div class='add'>+#define CLK_OTPC_ARB			356</div><div class='add'>+#define PCLK_OTP_MASK			357</div><div class='add'>+#define CLK_PMC_OTP			358</div><div class='add'>+#define PCLK_PMU_ROOT			359</div><div class='add'>+#define HCLK_PMU_ROOT			360</div><div class='add'>+#define PCLK_I2C2			361</div><div class='add'>+#define CLK_I2C2			362</div><div class='add'>+#define HCLK_PMU_BIU			363</div><div class='add'>+#define PCLK_PMU_BIU			364</div><div class='add'>+#define FCLK_MCU			365</div><div class='add'>+#define RTC_CLK_MCU			366</div><div class='add'>+#define PCLK_OSCCHK			367</div><div class='add'>+#define CLK_PMU_MCU_JTAG		368</div><div class='add'>+#define PCLK_PMU			369</div><div class='add'>+#define PCLK_GPIO0			370</div><div class='add'>+#define DBCLK_GPIO0			371</div><div class='add'>+#define XIN_OSC0_DIV			372</div><div class='add'>+#define CLK_DEEPSLOW			373</div><div class='add'>+#define CLK_DDR_FAIL_SAFE		374</div><div class='add'>+#define PCLK_PMU_HP_TIMER		375</div><div class='add'>+#define CLK_PMU_HP_TIMER		376</div><div class='add'>+#define CLK_PMU_32K_HP_TIMER		377</div><div class='add'>+#define PCLK_PMU_IOC			378</div><div class='add'>+#define PCLK_PMU_CRU			379</div><div class='add'>+#define PCLK_PMU_GRF			380</div><div class='add'>+#define PCLK_PMU_WDT			381</div><div class='add'>+#define TCLK_PMU_WDT			382</div><div class='add'>+#define PCLK_PMU_MAILBOX		383</div><div class='add'>+#define PCLK_SCRKEYGEN			384</div><div class='add'>+#define CLK_SCRKEYGEN			385</div><div class='add'>+#define CLK_PVTM_OSCCHK			386</div><div class='add'>+#define CLK_REFOUT			387</div><div class='add'>+#define CLK_PVTM_PMU			388</div><div class='add'>+#define PCLK_PVTM_PMU			389</div><div class='add'>+#define PCLK_PMU_SGRF			390</div><div class='add'>+#define HCLK_PMU_SRAM			391</div><div class='add'>+#define CLK_UART0			392</div><div class='add'>+#define CLK_UART1			393</div><div class='add'>+#define CLK_UART2			394</div><div class='add'>+#define CLK_UART3			395</div><div class='add'>+#define CLK_UART4			396</div><div class='add'>+#define CLK_UART5			397</div><div class='add'>+#define CLK_UART6			398</div><div class='add'>+#define CLK_UART7			399</div><div class='add'>+#define MCLK_I2S0_2CH_SAI_SRC_PRE	400</div><div class='add'>+#define MCLK_I2S1_8CH_SAI_SRC_PRE	401</div><div class='add'>+#define MCLK_I2S2_2CH_SAI_SRC_PRE	402</div><div class='add'>+#define MCLK_I2S3_8CH_SAI_SRC_PRE	403</div><div class='add'>+#define MCLK_SDPDIF_SRC_PRE		404</div><div class='add'>+#define SCLK_SDMMC_DRV			405</div><div class='add'>+#define SCLK_SDMMC_SAMPLE		406</div><div class='add'>+#define SCLK_SDIO0_DRV			407</div><div class='add'>+#define SCLK_SDIO0_SAMPLE		408</div><div class='add'>+#define SCLK_SDIO1_DRV			409</div><div class='add'>+#define SCLK_SDIO1_SAMPLE		410</div><div class='add'>+</div><div class='add'>+/* scmi-clocks indices */</div><div class='add'>+#define SCMI_PCLK_KEYREADER		0</div><div class='add'>+#define SCMI_HCLK_KLAD			1</div><div class='add'>+#define SCMI_PCLK_KLAD			2</div><div class='add'>+#define SCMI_HCLK_TRNG_S		3</div><div class='add'>+#define SCMI_HCLK_CRYPTO_S		4</div><div class='add'>+#define SCMI_PCLK_WDT_S			5</div><div class='add'>+#define SCMI_TCLK_WDT_S			6</div><div class='add'>+#define SCMI_PCLK_STIMER		7</div><div class='add'>+#define SCMI_CLK_STIMER0		8</div><div class='add'>+#define SCMI_CLK_STIMER1		9</div><div class='add'>+#define SCMI_PCLK_OTP_MASK		10</div><div class='add'>+#define SCMI_PCLK_OTPC_S		11</div><div class='add'>+#define SCMI_CLK_SBPI_OTPC_S		12</div><div class='add'>+#define SCMI_CLK_USER_OTPC_S		13</div><div class='add'>+#define SCMI_CLK_PMC_OTP		14</div><div class='add'>+#define SCMI_CLK_OTPC_ARB		15</div><div class='add'>+#define SCMI_CLK_CORE_TSP		16</div><div class='add'>+#define SCMI_ACLK_TSP			17</div><div class='add'>+#define SCMI_HCLK_TSP			18</div><div class='add'>+#define SCMI_PCLK_DCF			19</div><div class='add'>+#define SCMI_CLK_DDR			20</div><div class='add'>+#define SCMI_CLK_CPU			21</div><div class='add'>+#define SCMI_CLK_GPU			22</div><div class='add'>+#define SCMI_CORE_CRYPTO		23</div><div class='add'>+#define SCMI_ACLK_CRYPTO		24</div><div class='add'>+#define SCMI_PKA_CRYPTO			25</div><div class='add'>+#define SCMI_HCLK_CRYPTO		26</div><div class='add'>+#define SCMI_CORE_CRYPTO_S		27</div><div class='add'>+#define SCMI_ACLK_CRYPTO_S		28</div><div class='add'>+#define SCMI_PKA_CRYPTO_S		29</div><div class='add'>+#define SCMI_CORE_KLAD			30</div><div class='add'>+#define SCMI_ACLK_KLAD			31</div><div class='add'>+#define SCMI_HCLK_TRNG			32</div><div class='add'>+</div><div class='add'>+#endif // _DT_BINDINGS_CLK_ROCKCHIP_RK3528_H</div><div class='head'>diff --git a/include/dt-bindings/clock/rockchip,rk3562-cru.h b/include/dt-bindings/clock/rockchip,rk3562-cru.h<br/>new file mode 100644<br/>index 000000000000..a5b0b153209c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rockchip,rk3562-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rockchip,rk3562-cru.h</a></div><div class='hunk'>@@ -0,0 +1,379 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022-2025 Rockchip Electronics Co., Ltd.</div><div class='add'>+ * Author: Finley Xiao &lt;finley.xiao@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3562_H</div><div class='add'>+#define _DT_BINDINGS_CLK_ROCKCHIP_RK3562_H</div><div class='add'>+</div><div class='add'>+/* cru-clocks indices */</div><div class='add'>+</div><div class='add'>+/* cru plls */</div><div class='add'>+#define PLL_DMPLL0			0</div><div class='add'>+#define PLL_APLL			1</div><div class='add'>+#define PLL_GPLL			2</div><div class='add'>+#define PLL_VPLL			3</div><div class='add'>+#define PLL_HPLL			4</div><div class='add'>+#define PLL_CPLL			5</div><div class='add'>+#define PLL_DPLL			6</div><div class='add'>+#define PLL_DMPLL1			7</div><div class='add'>+</div><div class='add'>+/* cru clocks */</div><div class='add'>+#define ARMCLK				8</div><div class='add'>+#define CLK_GPU				9</div><div class='add'>+#define ACLK_RKNN			10</div><div class='add'>+#define CLK_DDR				11</div><div class='add'>+#define CLK_MATRIX_50M_SRC		12</div><div class='add'>+#define CLK_MATRIX_100M_SRC		13</div><div class='add'>+#define CLK_MATRIX_125M_SRC		14</div><div class='add'>+#define CLK_MATRIX_200M_SRC		15</div><div class='add'>+#define CLK_MATRIX_300M_SRC		16</div><div class='add'>+#define ACLK_TOP			17</div><div class='add'>+#define ACLK_TOP_VIO			18</div><div class='add'>+#define CLK_CAM0_OUT2IO			19</div><div class='add'>+#define CLK_CAM1_OUT2IO			20</div><div class='add'>+#define CLK_CAM2_OUT2IO			21</div><div class='add'>+#define CLK_CAM3_OUT2IO			22</div><div class='add'>+#define ACLK_BUS			23</div><div class='add'>+#define HCLK_BUS			24</div><div class='add'>+#define PCLK_BUS			25</div><div class='add'>+#define PCLK_I2C1			26</div><div class='add'>+#define PCLK_I2C2			27</div><div class='add'>+#define PCLK_I2C3			28</div><div class='add'>+#define PCLK_I2C4			29</div><div class='add'>+#define PCLK_I2C5			30</div><div class='add'>+#define CLK_I2C				31</div><div class='add'>+#define CLK_I2C1			32</div><div class='add'>+#define CLK_I2C2			33</div><div class='add'>+#define CLK_I2C3			34</div><div class='add'>+#define CLK_I2C4			35</div><div class='add'>+#define CLK_I2C5			36</div><div class='add'>+#define DCLK_BUS_GPIO			37</div><div class='add'>+#define DCLK_BUS_GPIO3			38</div><div class='add'>+#define DCLK_BUS_GPIO4			39</div><div class='add'>+#define PCLK_TIMER			40</div><div class='add'>+#define CLK_TIMER0			41</div><div class='add'>+#define CLK_TIMER1			42</div><div class='add'>+#define CLK_TIMER2			43</div><div class='add'>+#define CLK_TIMER3			44</div><div class='add'>+#define CLK_TIMER4			45</div><div class='add'>+#define CLK_TIMER5			46</div><div class='add'>+#define PCLK_STIMER			47</div><div class='add'>+#define CLK_STIMER0			48</div><div class='add'>+#define CLK_STIMER1			49</div><div class='add'>+#define PCLK_WDTNS			50</div><div class='add'>+#define CLK_WDTNS			51</div><div class='add'>+#define PCLK_GRF			52</div><div class='add'>+#define PCLK_SGRF			53</div><div class='add'>+#define PCLK_MAILBOX			54</div><div class='add'>+#define PCLK_INTC			55</div><div class='add'>+#define ACLK_BUS_GIC400			56</div><div class='add'>+#define ACLK_BUS_SPINLOCK		57</div><div class='add'>+#define ACLK_DCF			58</div><div class='add'>+#define PCLK_DCF			59</div><div class='add'>+#define FCLK_BUS_CM0_CORE		60</div><div class='add'>+#define CLK_BUS_CM0_RTC			61</div><div class='add'>+#define HCLK_ICACHE			62</div><div class='add'>+#define HCLK_DCACHE			63</div><div class='add'>+#define PCLK_TSADC			64</div><div class='add'>+#define CLK_TSADC			65</div><div class='add'>+#define CLK_TSADC_TSEN			66</div><div class='add'>+#define PCLK_DFT2APB			67</div><div class='add'>+#define CLK_SARADC_VCCIO156		68</div><div class='add'>+#define PCLK_GMAC			69</div><div class='add'>+#define ACLK_GMAC			70</div><div class='add'>+#define CLK_GMAC_125M_CRU_I		71</div><div class='add'>+#define CLK_GMAC_50M_CRU_I		72</div><div class='add'>+#define CLK_GMAC_50M_O			73</div><div class='add'>+#define CLK_GMAC_ETH_OUT2IO		74</div><div class='add'>+#define PCLK_APB2ASB_VCCIO156		75</div><div class='add'>+#define PCLK_TO_VCCIO156		76</div><div class='add'>+#define PCLK_DSIPHY			77</div><div class='add'>+#define PCLK_DSITX			78</div><div class='add'>+#define PCLK_CPU_EMA_DET		79</div><div class='add'>+#define PCLK_HASH			80</div><div class='add'>+#define PCLK_TOPCRU			81</div><div class='add'>+#define PCLK_ASB2APB_VCCIO156		82</div><div class='add'>+#define PCLK_IOC_VCCIO156		83</div><div class='add'>+#define PCLK_GPIO3_VCCIO156		84</div><div class='add'>+#define PCLK_GPIO4_VCCIO156		85</div><div class='add'>+#define PCLK_SARADC_VCCIO156		86</div><div class='add'>+#define PCLK_MAC100			87</div><div class='add'>+#define ACLK_MAC100			89</div><div class='add'>+#define CLK_MAC100_50M_MATRIX		90</div><div class='add'>+#define HCLK_CORE			91</div><div class='add'>+#define PCLK_DDR			92</div><div class='add'>+#define CLK_MSCH_BRG_BIU		93</div><div class='add'>+#define PCLK_DDR_HWLP			94</div><div class='add'>+#define PCLK_DDR_UPCTL			95</div><div class='add'>+#define PCLK_DDR_PHY			96</div><div class='add'>+#define PCLK_DDR_DFICTL			97</div><div class='add'>+#define PCLK_DDR_DMA2DDR		98</div><div class='add'>+#define PCLK_DDR_MON			99</div><div class='add'>+#define TMCLK_DDR_MON			100</div><div class='add'>+#define PCLK_DDR_GRF			101</div><div class='add'>+#define PCLK_DDR_CRU			102</div><div class='add'>+#define PCLK_SUBDDR_CRU			103</div><div class='add'>+#define CLK_GPU_PRE			104</div><div class='add'>+#define ACLK_GPU_PRE			105</div><div class='add'>+#define CLK_GPU_BRG			107</div><div class='add'>+#define CLK_NPU_PRE			108</div><div class='add'>+#define HCLK_NPU_PRE			109</div><div class='add'>+#define HCLK_RKNN			111</div><div class='add'>+#define ACLK_PERI			112</div><div class='add'>+#define HCLK_PERI			113</div><div class='add'>+#define PCLK_PERI			114</div><div class='add'>+#define PCLK_PERICRU			115</div><div class='add'>+#define HCLK_SAI0			116</div><div class='add'>+#define CLK_SAI0_SRC			117</div><div class='add'>+#define CLK_SAI0_FRAC			118</div><div class='add'>+#define CLK_SAI0			119</div><div class='add'>+#define MCLK_SAI0			120</div><div class='add'>+#define MCLK_SAI0_OUT2IO		121</div><div class='add'>+#define HCLK_SAI1			122</div><div class='add'>+#define CLK_SAI1_SRC			123</div><div class='add'>+#define CLK_SAI1_FRAC			124</div><div class='add'>+#define CLK_SAI1			125</div><div class='add'>+#define MCLK_SAI1			126</div><div class='add'>+#define MCLK_SAI1_OUT2IO		127</div><div class='add'>+#define HCLK_SAI2			128</div><div class='add'>+#define CLK_SAI2_SRC			129</div><div class='add'>+#define CLK_SAI2_FRAC			130</div><div class='add'>+#define CLK_SAI2			131</div><div class='add'>+#define MCLK_SAI2			132</div><div class='add'>+#define MCLK_SAI2_OUT2IO		133</div><div class='add'>+#define HCLK_DSM			134</div><div class='add'>+#define CLK_DSM				135</div><div class='add'>+#define HCLK_PDM			136</div><div class='add'>+#define MCLK_PDM			137</div><div class='add'>+#define HCLK_SPDIF			138</div><div class='add'>+#define CLK_SPDIF_SRC			139</div><div class='add'>+#define CLK_SPDIF_FRAC			140</div><div class='add'>+#define CLK_SPDIF			141</div><div class='add'>+#define MCLK_SPDIF			142</div><div class='add'>+#define HCLK_SDMMC0			143</div><div class='add'>+#define CCLK_SDMMC0			144</div><div class='add'>+#define HCLK_SDMMC1			145</div><div class='add'>+#define CCLK_SDMMC1			146</div><div class='add'>+#define SCLK_SDMMC0_DRV			147</div><div class='add'>+#define SCLK_SDMMC0_SAMPLE		148</div><div class='add'>+#define SCLK_SDMMC1_DRV			149</div><div class='add'>+#define SCLK_SDMMC1_SAMPLE		150</div><div class='add'>+#define HCLK_EMMC			151</div><div class='add'>+#define ACLK_EMMC			152</div><div class='add'>+#define CCLK_EMMC			153</div><div class='add'>+#define BCLK_EMMC			154</div><div class='add'>+#define TMCLK_EMMC			155</div><div class='add'>+#define SCLK_SFC			156</div><div class='add'>+#define HCLK_SFC			157</div><div class='add'>+#define HCLK_USB2HOST			158</div><div class='add'>+#define HCLK_USB2HOST_ARB		159</div><div class='add'>+#define PCLK_SPI1			160</div><div class='add'>+#define CLK_SPI1			161</div><div class='add'>+#define SCLK_IN_SPI1			162</div><div class='add'>+#define PCLK_SPI2			163</div><div class='add'>+#define CLK_SPI2			164</div><div class='add'>+#define SCLK_IN_SPI2			165</div><div class='add'>+#define PCLK_UART1			166</div><div class='add'>+#define PCLK_UART2			167</div><div class='add'>+#define PCLK_UART3			168</div><div class='add'>+#define PCLK_UART4			169</div><div class='add'>+#define PCLK_UART5			170</div><div class='add'>+#define PCLK_UART6			171</div><div class='add'>+#define PCLK_UART7			172</div><div class='add'>+#define PCLK_UART8			173</div><div class='add'>+#define PCLK_UART9			174</div><div class='add'>+#define CLK_UART1_SRC			175</div><div class='add'>+#define CLK_UART1_FRAC			176</div><div class='add'>+#define CLK_UART1			177</div><div class='add'>+#define SCLK_UART1			178</div><div class='add'>+#define CLK_UART2_SRC			179</div><div class='add'>+#define CLK_UART2_FRAC			180</div><div class='add'>+#define CLK_UART2			181</div><div class='add'>+#define SCLK_UART2			182</div><div class='add'>+#define CLK_UART3_SRC			183</div><div class='add'>+#define CLK_UART3_FRAC			184</div><div class='add'>+#define CLK_UART3			185</div><div class='add'>+#define SCLK_UART3			186</div><div class='add'>+#define CLK_UART4_SRC			187</div><div class='add'>+#define CLK_UART4_FRAC			188</div><div class='add'>+#define CLK_UART4			189</div><div class='add'>+#define SCLK_UART4			190</div><div class='add'>+#define CLK_UART5_SRC			191</div><div class='add'>+#define CLK_UART5_FRAC			192</div><div class='add'>+#define CLK_UART5			193</div><div class='add'>+#define SCLK_UART5			194</div><div class='add'>+#define CLK_UART6_SRC			195</div><div class='add'>+#define CLK_UART6_FRAC			196</div><div class='add'>+#define CLK_UART6			197</div><div class='add'>+#define SCLK_UART6			198</div><div class='add'>+#define CLK_UART7_SRC			199</div><div class='add'>+#define CLK_UART7_FRAC			200</div><div class='add'>+#define CLK_UART7			201</div><div class='add'>+#define SCLK_UART7			202</div><div class='add'>+#define CLK_UART8_SRC			203</div><div class='add'>+#define CLK_UART8_FRAC			204</div><div class='add'>+#define CLK_UART8			205</div><div class='add'>+#define SCLK_UART8			206</div><div class='add'>+#define CLK_UART9_SRC			207</div><div class='add'>+#define CLK_UART9_FRAC			208</div><div class='add'>+#define CLK_UART9			209</div><div class='add'>+#define SCLK_UART9			210</div><div class='add'>+#define PCLK_PWM1_PERI			211</div><div class='add'>+#define CLK_PWM1_PERI			212</div><div class='add'>+#define CLK_CAPTURE_PWM1_PERI		213</div><div class='add'>+#define PCLK_PWM2_PERI			214</div><div class='add'>+#define CLK_PWM2_PERI			215</div><div class='add'>+#define CLK_CAPTURE_PWM2_PERI		216</div><div class='add'>+#define PCLK_PWM3_PERI			217</div><div class='add'>+#define CLK_PWM3_PERI			218</div><div class='add'>+#define CLK_CAPTURE_PWM3_PERI		219</div><div class='add'>+#define PCLK_CAN0			220</div><div class='add'>+#define CLK_CAN0			221</div><div class='add'>+#define PCLK_CAN1			222</div><div class='add'>+#define CLK_CAN1			223</div><div class='add'>+#define ACLK_CRYPTO			224</div><div class='add'>+#define HCLK_CRYPTO			225</div><div class='add'>+#define PCLK_CRYPTO			226</div><div class='add'>+#define CLK_CORE_CRYPTO			227</div><div class='add'>+#define CLK_PKA_CRYPTO			228</div><div class='add'>+#define HCLK_KLAD			229</div><div class='add'>+#define PCLK_KEY_READER			230</div><div class='add'>+#define HCLK_RK_RNG_NS			231</div><div class='add'>+#define HCLK_RK_RNG_S			232</div><div class='add'>+#define HCLK_TRNG_NS			233</div><div class='add'>+#define HCLK_TRNG_S			234</div><div class='add'>+#define HCLK_CRYPTO_S			235</div><div class='add'>+#define PCLK_PERI_WDT			236</div><div class='add'>+#define TCLK_PERI_WDT			237</div><div class='add'>+#define ACLK_SYSMEM			238</div><div class='add'>+#define HCLK_BOOTROM			239</div><div class='add'>+#define PCLK_PERI_GRF			240</div><div class='add'>+#define ACLK_DMAC			241</div><div class='add'>+#define ACLK_RKDMAC			242</div><div class='add'>+#define PCLK_OTPC_NS			243</div><div class='add'>+#define CLK_SBPI_OTPC_NS		244</div><div class='add'>+#define CLK_USER_OTPC_NS		245</div><div class='add'>+#define PCLK_OTPC_S			246</div><div class='add'>+#define CLK_SBPI_OTPC_S			247</div><div class='add'>+#define CLK_USER_OTPC_S			248</div><div class='add'>+#define CLK_OTPC_ARB			249</div><div class='add'>+#define PCLK_OTPPHY			250</div><div class='add'>+#define PCLK_USB2PHY			251</div><div class='add'>+#define PCLK_PIPEPHY			252</div><div class='add'>+#define PCLK_SARADC			253</div><div class='add'>+#define CLK_SARADC			254</div><div class='add'>+#define PCLK_IOC_VCCIO234		255</div><div class='add'>+#define PCLK_PERI_GPIO1			256</div><div class='add'>+#define PCLK_PERI_GPIO2			257</div><div class='add'>+#define DCLK_PERI_GPIO			258</div><div class='add'>+#define DCLK_PERI_GPIO1			259</div><div class='add'>+#define DCLK_PERI_GPIO2			260</div><div class='add'>+#define ACLK_PHP			261</div><div class='add'>+#define PCLK_PHP			262</div><div class='add'>+#define ACLK_PCIE20_MST			263</div><div class='add'>+#define ACLK_PCIE20_SLV			264</div><div class='add'>+#define ACLK_PCIE20_DBI			265</div><div class='add'>+#define PCLK_PCIE20			266</div><div class='add'>+#define CLK_PCIE20_AUX			267</div><div class='add'>+#define ACLK_USB3OTG			268</div><div class='add'>+#define CLK_USB3OTG_SUSPEND		269</div><div class='add'>+#define CLK_USB3OTG_REF			270</div><div class='add'>+#define CLK_PIPEPHY_REF_FUNC		271</div><div class='add'>+#define CLK_200M_PMU			272</div><div class='add'>+#define CLK_RTC_32K			273</div><div class='add'>+#define CLK_RTC32K_FRAC			274</div><div class='add'>+#define BUSCLK_PDPMU0			275</div><div class='add'>+#define PCLK_PMU0_CRU			276</div><div class='add'>+#define PCLK_PMU0_PMU			277</div><div class='add'>+#define CLK_PMU0_PMU			278</div><div class='add'>+#define PCLK_PMU0_HP_TIMER		279</div><div class='add'>+#define CLK_PMU0_HP_TIMER		280</div><div class='add'>+#define CLK_PMU0_32K_HP_TIMER		281</div><div class='add'>+#define PCLK_PMU0_PVTM			282</div><div class='add'>+#define CLK_PMU0_PVTM			283</div><div class='add'>+#define PCLK_IOC_PMUIO			284</div><div class='add'>+#define PCLK_PMU0_GPIO0			285</div><div class='add'>+#define DBCLK_PMU0_GPIO0		286</div><div class='add'>+#define PCLK_PMU0_GRF			287</div><div class='add'>+#define PCLK_PMU0_SGRF			288</div><div class='add'>+#define CLK_DDR_FAIL_SAFE		289</div><div class='add'>+#define PCLK_PMU0_SCRKEYGEN		290</div><div class='add'>+#define PCLK_PMU1_CRU			291</div><div class='add'>+#define HCLK_PMU1_MEM			292</div><div class='add'>+#define PCLK_PMU0_I2C0			293</div><div class='add'>+#define CLK_PMU0_I2C0			294</div><div class='add'>+#define PCLK_PMU1_UART0			295</div><div class='add'>+#define CLK_PMU1_UART0_SRC		296</div><div class='add'>+#define CLK_PMU1_UART0_FRAC		297</div><div class='add'>+#define CLK_PMU1_UART0			298</div><div class='add'>+#define SCLK_PMU1_UART0			299</div><div class='add'>+#define PCLK_PMU1_SPI0			300</div><div class='add'>+#define CLK_PMU1_SPI0			301</div><div class='add'>+#define SCLK_IN_PMU1_SPI0		302</div><div class='add'>+#define PCLK_PMU1_PWM0			303</div><div class='add'>+#define CLK_PMU1_PWM0			304</div><div class='add'>+#define CLK_CAPTURE_PMU1_PWM0		305</div><div class='add'>+#define CLK_PMU1_WIFI			306</div><div class='add'>+#define FCLK_PMU1_CM0_CORE		307</div><div class='add'>+#define CLK_PMU1_CM0_RTC		308</div><div class='add'>+#define PCLK_PMU1_WDTNS			309</div><div class='add'>+#define CLK_PMU1_WDTNS			310</div><div class='add'>+#define PCLK_PMU1_MAILBOX		311</div><div class='add'>+#define CLK_PIPEPHY_DIV			312</div><div class='add'>+#define CLK_PIPEPHY_XIN24M		313</div><div class='add'>+#define CLK_PIPEPHY_REF			314</div><div class='add'>+#define CLK_24M_SSCSRC			315</div><div class='add'>+#define CLK_USB2PHY_XIN24M		316</div><div class='add'>+#define CLK_USB2PHY_REF			317</div><div class='add'>+#define CLK_MIPIDSIPHY_XIN24M		318</div><div class='add'>+#define CLK_MIPIDSIPHY_REF		319</div><div class='add'>+#define ACLK_RGA_PRE			320</div><div class='add'>+#define HCLK_RGA_PRE			321</div><div class='add'>+#define ACLK_RGA			322</div><div class='add'>+#define HCLK_RGA			323</div><div class='add'>+#define CLK_RGA_CORE			324</div><div class='add'>+#define ACLK_JDEC			325</div><div class='add'>+#define HCLK_JDEC			326</div><div class='add'>+#define ACLK_VDPU_PRE			327</div><div class='add'>+#define CLK_RKVDEC_HEVC_CA		328</div><div class='add'>+#define HCLK_VDPU_PRE			329</div><div class='add'>+#define ACLK_RKVDEC			330</div><div class='add'>+#define HCLK_RKVDEC			331</div><div class='add'>+#define CLK_RKVENC_CORE			332</div><div class='add'>+#define ACLK_VEPU_PRE			333</div><div class='add'>+#define HCLK_VEPU_PRE			334</div><div class='add'>+#define ACLK_RKVENC			335</div><div class='add'>+#define HCLK_RKVENC			336</div><div class='add'>+#define ACLK_VI				337</div><div class='add'>+#define HCLK_VI				338</div><div class='add'>+#define PCLK_VI				339</div><div class='add'>+#define ACLK_ISP			340</div><div class='add'>+#define HCLK_ISP			341</div><div class='add'>+#define CLK_ISP				342</div><div class='add'>+#define ACLK_VICAP			343</div><div class='add'>+#define HCLK_VICAP			344</div><div class='add'>+#define DCLK_VICAP			345</div><div class='add'>+#define CSIRX0_CLK_DATA			346</div><div class='add'>+#define CSIRX1_CLK_DATA			347</div><div class='add'>+#define CSIRX2_CLK_DATA			348</div><div class='add'>+#define CSIRX3_CLK_DATA			349</div><div class='add'>+#define PCLK_CSIHOST0			350</div><div class='add'>+#define PCLK_CSIHOST1			351</div><div class='add'>+#define PCLK_CSIHOST2			352</div><div class='add'>+#define PCLK_CSIHOST3			353</div><div class='add'>+#define PCLK_CSIPHY0			354</div><div class='add'>+#define PCLK_CSIPHY1			355</div><div class='add'>+#define ACLK_VO_PRE			356</div><div class='add'>+#define HCLK_VO_PRE			357</div><div class='add'>+#define ACLK_VOP			358</div><div class='add'>+#define HCLK_VOP			359</div><div class='add'>+#define DCLK_VOP			360</div><div class='add'>+#define DCLK_VOP1			361</div><div class='add'>+#define ACLK_CRYPTO_S			362</div><div class='add'>+#define PCLK_CRYPTO_S			363</div><div class='add'>+#define CLK_CORE_CRYPTO_S		364</div><div class='add'>+#define CLK_PKA_CRYPTO_S		365</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/rockchip,rk3576-cru.h b/include/dt-bindings/clock/rockchip,rk3576-cru.h<br/>new file mode 100644<br/>index 000000000000..ded5ce42e62a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rockchip,rk3576-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rockchip,rk3576-cru.h</a></div><div class='hunk'>@@ -0,0 +1,607 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Rockchip Electronics Co. Ltd.</div><div class='add'>+ * Copyright (c) 2024 Collabora Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Author: Elaine Zhang &lt;zhangqing@rock-chips.com&gt;</div><div class='add'>+ * Author: Detlev Casanova &lt;detlev.casanova@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3576_H</div><div class='add'>+#define _DT_BINDINGS_CLK_ROCKCHIP_RK3576_H</div><div class='add'>+</div><div class='add'>+/* cru-clocks indices */</div><div class='add'>+</div><div class='add'>+/* cru plls */</div><div class='add'>+#define PLL_BPLL			0</div><div class='add'>+#define PLL_LPLL			1</div><div class='add'>+#define PLL_VPLL			2</div><div class='add'>+#define PLL_AUPLL			3</div><div class='add'>+#define PLL_CPLL			4</div><div class='add'>+#define PLL_GPLL			5</div><div class='add'>+#define PLL_PPLL			6</div><div class='add'>+#define ARMCLK_L			7</div><div class='add'>+#define ARMCLK_B			8</div><div class='add'>+</div><div class='add'>+/* cru clocks */</div><div class='add'>+#define CLK_CPLL_DIV20			9</div><div class='add'>+#define CLK_CPLL_DIV10			10</div><div class='add'>+#define CLK_GPLL_DIV8			11</div><div class='add'>+#define CLK_GPLL_DIV6			12</div><div class='add'>+#define CLK_CPLL_DIV4			13</div><div class='add'>+#define CLK_GPLL_DIV4			14</div><div class='add'>+#define CLK_SPLL_DIV2			15</div><div class='add'>+#define CLK_GPLL_DIV3			16</div><div class='add'>+#define CLK_CPLL_DIV2			17</div><div class='add'>+#define CLK_GPLL_DIV2			18</div><div class='add'>+#define CLK_SPLL_DIV1			19</div><div class='add'>+#define PCLK_TOP_ROOT			20</div><div class='add'>+#define ACLK_TOP			21</div><div class='add'>+#define HCLK_TOP			22</div><div class='add'>+#define CLK_AUDIO_FRAC_0		23</div><div class='add'>+#define CLK_AUDIO_FRAC_1		24</div><div class='add'>+#define CLK_AUDIO_FRAC_2		25</div><div class='add'>+#define CLK_AUDIO_FRAC_3		26</div><div class='add'>+#define CLK_UART_FRAC_0			27</div><div class='add'>+#define CLK_UART_FRAC_1			28</div><div class='add'>+#define CLK_UART_FRAC_2			29</div><div class='add'>+#define CLK_UART1_SRC_TOP		30</div><div class='add'>+#define CLK_AUDIO_INT_0			31</div><div class='add'>+#define CLK_AUDIO_INT_1			32</div><div class='add'>+#define CLK_AUDIO_INT_2			33</div><div class='add'>+#define CLK_PDM0_SRC_TOP		34</div><div class='add'>+#define CLK_PDM1_OUT			35</div><div class='add'>+#define CLK_GMAC0_125M_SRC		36</div><div class='add'>+#define CLK_GMAC1_125M_SRC		37</div><div class='add'>+#define LCLK_ASRC_SRC_0			38</div><div class='add'>+#define LCLK_ASRC_SRC_1			39</div><div class='add'>+#define REF_CLK0_OUT_PLL		40</div><div class='add'>+#define REF_CLK1_OUT_PLL		41</div><div class='add'>+#define REF_CLK2_OUT_PLL		42</div><div class='add'>+#define REFCLKO25M_GMAC0_OUT		43</div><div class='add'>+#define REFCLKO25M_GMAC1_OUT		44</div><div class='add'>+#define CLK_CIFOUT_OUT			45</div><div class='add'>+#define CLK_GMAC0_RMII_CRU		46</div><div class='add'>+#define CLK_GMAC1_RMII_CRU		47</div><div class='add'>+#define CLK_OTPC_AUTO_RD_G		48</div><div class='add'>+#define CLK_OTP_PHY_G			49</div><div class='add'>+#define CLK_MIPI_CAMERAOUT_M0		50</div><div class='add'>+#define CLK_MIPI_CAMERAOUT_M1		51</div><div class='add'>+#define CLK_MIPI_CAMERAOUT_M2		52</div><div class='add'>+#define MCLK_PDM0_SRC_TOP		53</div><div class='add'>+#define HCLK_AUDIO_ROOT			54</div><div class='add'>+#define HCLK_ASRC_2CH_0			55</div><div class='add'>+#define HCLK_ASRC_2CH_1			56</div><div class='add'>+#define HCLK_ASRC_4CH_0			57</div><div class='add'>+#define HCLK_ASRC_4CH_1			58</div><div class='add'>+#define CLK_ASRC_2CH_0			59</div><div class='add'>+#define CLK_ASRC_2CH_1			60</div><div class='add'>+#define CLK_ASRC_4CH_0			61</div><div class='add'>+#define CLK_ASRC_4CH_1			62</div><div class='add'>+#define MCLK_SAI0_8CH_SRC		63</div><div class='add'>+#define MCLK_SAI0_8CH			64</div><div class='add'>+#define HCLK_SAI0_8CH			65</div><div class='add'>+#define HCLK_SPDIF_RX0			66</div><div class='add'>+#define MCLK_SPDIF_RX0			67</div><div class='add'>+#define HCLK_SPDIF_RX1			68</div><div class='add'>+#define MCLK_SPDIF_RX1			69</div><div class='add'>+#define MCLK_SAI1_8CH_SRC		70</div><div class='add'>+#define MCLK_SAI1_8CH			71</div><div class='add'>+#define HCLK_SAI1_8CH			72</div><div class='add'>+#define MCLK_SAI2_2CH_SRC		73</div><div class='add'>+#define MCLK_SAI2_2CH			74</div><div class='add'>+#define HCLK_SAI2_2CH			75</div><div class='add'>+#define MCLK_SAI3_2CH_SRC		76</div><div class='add'>+#define MCLK_SAI3_2CH			77</div><div class='add'>+#define HCLK_SAI3_2CH			78</div><div class='add'>+#define MCLK_SAI4_2CH_SRC		79</div><div class='add'>+#define MCLK_SAI4_2CH			80</div><div class='add'>+#define HCLK_SAI4_2CH			81</div><div class='add'>+#define HCLK_ACDCDIG_DSM		82</div><div class='add'>+#define MCLK_ACDCDIG_DSM		83</div><div class='add'>+#define CLK_PDM1			84</div><div class='add'>+#define HCLK_PDM1			85</div><div class='add'>+#define MCLK_PDM1			86</div><div class='add'>+#define HCLK_SPDIF_TX0			87</div><div class='add'>+#define MCLK_SPDIF_TX0			88</div><div class='add'>+#define HCLK_SPDIF_TX1			89</div><div class='add'>+#define MCLK_SPDIF_TX1			90</div><div class='add'>+#define CLK_SAI1_MCLKOUT		91</div><div class='add'>+#define CLK_SAI2_MCLKOUT		92</div><div class='add'>+#define CLK_SAI3_MCLKOUT		93</div><div class='add'>+#define CLK_SAI4_MCLKOUT		94</div><div class='add'>+#define CLK_SAI0_MCLKOUT		95</div><div class='add'>+#define HCLK_BUS_ROOT			96</div><div class='add'>+#define PCLK_BUS_ROOT			97</div><div class='add'>+#define ACLK_BUS_ROOT			98</div><div class='add'>+#define HCLK_CAN0			99</div><div class='add'>+#define CLK_CAN0			100</div><div class='add'>+#define HCLK_CAN1			101</div><div class='add'>+#define CLK_CAN1			102</div><div class='add'>+#define CLK_KEY_SHIFT			103</div><div class='add'>+#define PCLK_I2C1			104</div><div class='add'>+#define PCLK_I2C2			105</div><div class='add'>+#define PCLK_I2C3			106</div><div class='add'>+#define PCLK_I2C4			107</div><div class='add'>+#define PCLK_I2C5			108</div><div class='add'>+#define PCLK_I2C6			109</div><div class='add'>+#define PCLK_I2C7			110</div><div class='add'>+#define PCLK_I2C8			111</div><div class='add'>+#define PCLK_I2C9			112</div><div class='add'>+#define PCLK_WDT_BUSMCU			113</div><div class='add'>+#define TCLK_WDT_BUSMCU			114</div><div class='add'>+#define ACLK_GIC			115</div><div class='add'>+#define CLK_I2C1			116</div><div class='add'>+#define CLK_I2C2			117</div><div class='add'>+#define CLK_I2C3			118</div><div class='add'>+#define CLK_I2C4			119</div><div class='add'>+#define CLK_I2C5			120</div><div class='add'>+#define CLK_I2C6			121</div><div class='add'>+#define CLK_I2C7			122</div><div class='add'>+#define CLK_I2C8			123</div><div class='add'>+#define CLK_I2C9			124</div><div class='add'>+#define PCLK_SARADC			125</div><div class='add'>+#define CLK_SARADC			126</div><div class='add'>+#define PCLK_TSADC			127</div><div class='add'>+#define CLK_TSADC			128</div><div class='add'>+#define PCLK_UART0			129</div><div class='add'>+#define PCLK_UART2			130</div><div class='add'>+#define PCLK_UART3			131</div><div class='add'>+#define PCLK_UART4			132</div><div class='add'>+#define PCLK_UART5			133</div><div class='add'>+#define PCLK_UART6			134</div><div class='add'>+#define PCLK_UART7			135</div><div class='add'>+#define PCLK_UART8			136</div><div class='add'>+#define PCLK_UART9			137</div><div class='add'>+#define PCLK_UART10			138</div><div class='add'>+#define PCLK_UART11			139</div><div class='add'>+#define SCLK_UART0			140</div><div class='add'>+#define SCLK_UART2			141</div><div class='add'>+#define SCLK_UART3			142</div><div class='add'>+#define SCLK_UART4			143</div><div class='add'>+#define SCLK_UART5			144</div><div class='add'>+#define SCLK_UART6			145</div><div class='add'>+#define SCLK_UART7			146</div><div class='add'>+#define SCLK_UART8			147</div><div class='add'>+#define SCLK_UART9			148</div><div class='add'>+#define SCLK_UART10			149</div><div class='add'>+#define SCLK_UART11			150</div><div class='add'>+#define PCLK_SPI0			151</div><div class='add'>+#define PCLK_SPI1			152</div><div class='add'>+#define PCLK_SPI2			153</div><div class='add'>+#define PCLK_SPI3			154</div><div class='add'>+#define PCLK_SPI4			155</div><div class='add'>+#define CLK_SPI0			156</div><div class='add'>+#define CLK_SPI1			157</div><div class='add'>+#define CLK_SPI2			158</div><div class='add'>+#define CLK_SPI3			159</div><div class='add'>+#define CLK_SPI4			160</div><div class='add'>+#define PCLK_WDT0			161</div><div class='add'>+#define TCLK_WDT0			162</div><div class='add'>+#define PCLK_PWM1			163</div><div class='add'>+#define CLK_PWM1			164</div><div class='add'>+#define CLK_OSC_PWM1			165</div><div class='add'>+#define CLK_RC_PWM1			166</div><div class='add'>+#define PCLK_BUSTIMER0			167</div><div class='add'>+#define PCLK_BUSTIMER1			168</div><div class='add'>+#define CLK_TIMER0_ROOT			169</div><div class='add'>+#define CLK_TIMER0			170</div><div class='add'>+#define CLK_TIMER1			171</div><div class='add'>+#define CLK_TIMER2			172</div><div class='add'>+#define CLK_TIMER3			173</div><div class='add'>+#define CLK_TIMER4			174</div><div class='add'>+#define CLK_TIMER5			175</div><div class='add'>+#define PCLK_MAILBOX0			176</div><div class='add'>+#define PCLK_GPIO1			177</div><div class='add'>+#define DBCLK_GPIO1			178</div><div class='add'>+#define PCLK_GPIO2			179</div><div class='add'>+#define DBCLK_GPIO2			180</div><div class='add'>+#define PCLK_GPIO3			181</div><div class='add'>+#define DBCLK_GPIO3			182</div><div class='add'>+#define PCLK_GPIO4			183</div><div class='add'>+#define DBCLK_GPIO4			184</div><div class='add'>+#define ACLK_DECOM			185</div><div class='add'>+#define PCLK_DECOM			186</div><div class='add'>+#define DCLK_DECOM			187</div><div class='add'>+#define CLK_TIMER1_ROOT			188</div><div class='add'>+#define CLK_TIMER6			189</div><div class='add'>+#define CLK_TIMER7			190</div><div class='add'>+#define CLK_TIMER8			191</div><div class='add'>+#define CLK_TIMER9			192</div><div class='add'>+#define CLK_TIMER10			193</div><div class='add'>+#define CLK_TIMER11			194</div><div class='add'>+#define ACLK_DMAC0			195</div><div class='add'>+#define ACLK_DMAC1			196</div><div class='add'>+#define ACLK_DMAC2			197</div><div class='add'>+#define ACLK_SPINLOCK			198</div><div class='add'>+#define HCLK_I3C0			199</div><div class='add'>+#define HCLK_I3C1			200</div><div class='add'>+#define HCLK_BUS_CM0_ROOT		201</div><div class='add'>+#define FCLK_BUS_CM0_CORE		202</div><div class='add'>+#define CLK_BUS_CM0_RTC			203</div><div class='add'>+#define PCLK_PMU2			204</div><div class='add'>+#define PCLK_PWM2			205</div><div class='add'>+#define CLK_PWM2			206</div><div class='add'>+#define CLK_RC_PWM2			207</div><div class='add'>+#define CLK_OSC_PWM2			208</div><div class='add'>+#define CLK_FREQ_PWM1			209</div><div class='add'>+#define CLK_COUNTER_PWM1		210</div><div class='add'>+#define SAI_SCLKIN_FREQ			211</div><div class='add'>+#define SAI_SCLKIN_COUNTER		212</div><div class='add'>+#define CLK_I3C0			213</div><div class='add'>+#define CLK_I3C1			214</div><div class='add'>+#define PCLK_CSIDPHY1			215</div><div class='add'>+#define PCLK_DDR_ROOT			216</div><div class='add'>+#define PCLK_DDR_MON_CH0		217</div><div class='add'>+#define TMCLK_DDR_MON_CH0		218</div><div class='add'>+#define ACLK_DDR_ROOT			219</div><div class='add'>+#define HCLK_DDR_ROOT			220</div><div class='add'>+#define FCLK_DDR_CM0_CORE		221</div><div class='add'>+#define CLK_DDR_TIMER_ROOT		222</div><div class='add'>+#define CLK_DDR_TIMER0			223</div><div class='add'>+#define CLK_DDR_TIMER1			224</div><div class='add'>+#define TCLK_WDT_DDR			225</div><div class='add'>+#define PCLK_WDT			226</div><div class='add'>+#define PCLK_TIMER			227</div><div class='add'>+#define CLK_DDR_CM0_RTC			228</div><div class='add'>+#define ACLK_RKNN0			229</div><div class='add'>+#define ACLK_RKNN1			230</div><div class='add'>+#define HCLK_RKNN_ROOT			231</div><div class='add'>+#define CLK_RKNN_DSU0			232</div><div class='add'>+#define PCLK_NPUTOP_ROOT		233</div><div class='add'>+#define PCLK_NPU_TIMER			234</div><div class='add'>+#define CLK_NPUTIMER_ROOT		235</div><div class='add'>+#define CLK_NPUTIMER0			236</div><div class='add'>+#define CLK_NPUTIMER1			237</div><div class='add'>+#define PCLK_NPU_WDT			238</div><div class='add'>+#define TCLK_NPU_WDT			239</div><div class='add'>+#define ACLK_RKNN_CBUF			240</div><div class='add'>+#define HCLK_NPU_CM0_ROOT		241</div><div class='add'>+#define FCLK_NPU_CM0_CORE		242</div><div class='add'>+#define CLK_NPU_CM0_RTC			243</div><div class='add'>+#define HCLK_RKNN_CBUF			244</div><div class='add'>+#define HCLK_NVM_ROOT			245</div><div class='add'>+#define ACLK_NVM_ROOT			246</div><div class='add'>+#define SCLK_FSPI_X2			247</div><div class='add'>+#define HCLK_FSPI			248</div><div class='add'>+#define CCLK_SRC_EMMC			249</div><div class='add'>+#define HCLK_EMMC			250</div><div class='add'>+#define ACLK_EMMC			251</div><div class='add'>+#define BCLK_EMMC			252</div><div class='add'>+#define TCLK_EMMC			253</div><div class='add'>+#define PCLK_PHP_ROOT			254</div><div class='add'>+#define ACLK_PHP_ROOT			255</div><div class='add'>+#define PCLK_PCIE0			256</div><div class='add'>+#define CLK_PCIE0_AUX			257</div><div class='add'>+#define ACLK_PCIE0_MST			258</div><div class='add'>+#define ACLK_PCIE0_SLV			259</div><div class='add'>+#define ACLK_PCIE0_DBI			260</div><div class='add'>+#define ACLK_USB3OTG1			261</div><div class='add'>+#define CLK_REF_USB3OTG1		262</div><div class='add'>+#define CLK_SUSPEND_USB3OTG1		263</div><div class='add'>+#define ACLK_MMU0			264</div><div class='add'>+#define ACLK_SLV_MMU0			265</div><div class='add'>+#define ACLK_MMU1			266</div><div class='add'>+#define ACLK_SLV_MMU1			267</div><div class='add'>+#define PCLK_PCIE1			268</div><div class='add'>+#define CLK_PCIE1_AUX			269</div><div class='add'>+#define ACLK_PCIE1_MST			270</div><div class='add'>+#define ACLK_PCIE1_SLV			271</div><div class='add'>+#define ACLK_PCIE1_DBI			272</div><div class='add'>+#define CLK_RXOOB0			273</div><div class='add'>+#define CLK_RXOOB1			274</div><div class='add'>+#define CLK_PMALIVE0			275</div><div class='add'>+#define CLK_PMALIVE1			276</div><div class='add'>+#define ACLK_SATA0			277</div><div class='add'>+#define ACLK_SATA1			278</div><div class='add'>+#define CLK_USB3OTG1_PIPE_PCLK		279</div><div class='add'>+#define CLK_USB3OTG1_UTMI		280</div><div class='add'>+#define CLK_USB3OTG0_PIPE_PCLK		281</div><div class='add'>+#define CLK_USB3OTG0_UTMI		282</div><div class='add'>+#define HCLK_SDGMAC_ROOT		283</div><div class='add'>+#define ACLK_SDGMAC_ROOT		284</div><div class='add'>+#define PCLK_SDGMAC_ROOT		285</div><div class='add'>+#define ACLK_GMAC0			286</div><div class='add'>+#define ACLK_GMAC1			287</div><div class='add'>+#define PCLK_GMAC0			288</div><div class='add'>+#define PCLK_GMAC1			289</div><div class='add'>+#define CCLK_SRC_SDIO			290</div><div class='add'>+#define HCLK_SDIO			291</div><div class='add'>+#define CLK_GMAC1_PTP_REF		292</div><div class='add'>+#define CLK_GMAC0_PTP_REF		293</div><div class='add'>+#define CLK_GMAC1_PTP_REF_SRC		294</div><div class='add'>+#define CLK_GMAC0_PTP_REF_SRC		295</div><div class='add'>+#define CCLK_SRC_SDMMC0			296</div><div class='add'>+#define HCLK_SDMMC0			297</div><div class='add'>+#define SCLK_FSPI1_X2			298</div><div class='add'>+#define HCLK_FSPI1			299</div><div class='add'>+#define ACLK_DSMC_ROOT			300</div><div class='add'>+#define ACLK_DSMC			301</div><div class='add'>+#define PCLK_DSMC			302</div><div class='add'>+#define CLK_DSMC_SYS			303</div><div class='add'>+#define HCLK_HSGPIO			304</div><div class='add'>+#define CLK_HSGPIO_TX			305</div><div class='add'>+#define CLK_HSGPIO_RX			306</div><div class='add'>+#define ACLK_HSGPIO			307</div><div class='add'>+#define PCLK_PHPPHY_ROOT		308</div><div class='add'>+#define PCLK_PCIE2_COMBOPHY0		309</div><div class='add'>+#define PCLK_PCIE2_COMBOPHY1		310</div><div class='add'>+#define CLK_PCIE_100M_SRC		311</div><div class='add'>+#define CLK_PCIE_100M_NDUTY_SRC		312</div><div class='add'>+#define CLK_REF_PCIE0_PHY		313</div><div class='add'>+#define CLK_REF_PCIE1_PHY		314</div><div class='add'>+#define CLK_REF_MPHY_26M		315</div><div class='add'>+#define HCLK_RKVDEC_ROOT		316</div><div class='add'>+#define ACLK_RKVDEC_ROOT		317</div><div class='add'>+#define HCLK_RKVDEC			318</div><div class='add'>+#define CLK_RKVDEC_HEVC_CA		319</div><div class='add'>+#define CLK_RKVDEC_CORE			320</div><div class='add'>+#define ACLK_UFS_ROOT			321</div><div class='add'>+#define ACLK_USB_ROOT			322</div><div class='add'>+#define PCLK_USB_ROOT			323</div><div class='add'>+#define ACLK_USB3OTG0			324</div><div class='add'>+#define CLK_REF_USB3OTG0		325</div><div class='add'>+#define CLK_SUSPEND_USB3OTG0		326</div><div class='add'>+#define ACLK_MMU2			327</div><div class='add'>+#define ACLK_SLV_MMU2			328</div><div class='add'>+#define ACLK_UFS_SYS			329</div><div class='add'>+#define ACLK_VPU_ROOT			330</div><div class='add'>+#define ACLK_VPU_MID_ROOT		331</div><div class='add'>+#define HCLK_VPU_ROOT			332</div><div class='add'>+#define ACLK_JPEG_ROOT			333</div><div class='add'>+#define ACLK_VPU_LOW_ROOT		334</div><div class='add'>+#define HCLK_RGA2E_0			335</div><div class='add'>+#define ACLK_RGA2E_0			336</div><div class='add'>+#define CLK_CORE_RGA2E_0		337</div><div class='add'>+#define ACLK_JPEG			338</div><div class='add'>+#define HCLK_JPEG			339</div><div class='add'>+#define HCLK_VDPP			340</div><div class='add'>+#define ACLK_VDPP			341</div><div class='add'>+#define CLK_CORE_VDPP			342</div><div class='add'>+#define HCLK_RGA2E_1			343</div><div class='add'>+#define ACLK_RGA2E_1			344</div><div class='add'>+#define CLK_CORE_RGA2E_1		345</div><div class='add'>+#define DCLK_EBC_FRAC_SRC		346</div><div class='add'>+#define HCLK_EBC			347</div><div class='add'>+#define ACLK_EBC			348</div><div class='add'>+#define DCLK_EBC			349</div><div class='add'>+#define HCLK_VEPU0_ROOT			350</div><div class='add'>+#define ACLK_VEPU0_ROOT			351</div><div class='add'>+#define HCLK_VEPU0			352</div><div class='add'>+#define ACLK_VEPU0			353</div><div class='add'>+#define CLK_VEPU0_CORE			354</div><div class='add'>+#define ACLK_VI_ROOT			355</div><div class='add'>+#define HCLK_VI_ROOT			356</div><div class='add'>+#define PCLK_VI_ROOT			357</div><div class='add'>+#define DCLK_VICAP			358</div><div class='add'>+#define ACLK_VICAP			359</div><div class='add'>+#define HCLK_VICAP			360</div><div class='add'>+#define CLK_ISP_CORE			361</div><div class='add'>+#define CLK_ISP_CORE_MARVIN		362</div><div class='add'>+#define CLK_ISP_CORE_VICAP		363</div><div class='add'>+#define ACLK_ISP			364</div><div class='add'>+#define HCLK_ISP			365</div><div class='add'>+#define ACLK_VPSS			366</div><div class='add'>+#define HCLK_VPSS			367</div><div class='add'>+#define CLK_CORE_VPSS			368</div><div class='add'>+#define PCLK_CSI_HOST_0			369</div><div class='add'>+#define PCLK_CSI_HOST_1			370</div><div class='add'>+#define PCLK_CSI_HOST_2			371</div><div class='add'>+#define PCLK_CSI_HOST_3			372</div><div class='add'>+#define PCLK_CSI_HOST_4			373</div><div class='add'>+#define ICLK_CSIHOST01			374</div><div class='add'>+#define ICLK_CSIHOST0			375</div><div class='add'>+#define CLK_ISP_PVTPLL_SRC		376</div><div class='add'>+#define ACLK_VI_ROOT_INTER		377</div><div class='add'>+#define CLK_VICAP_I0CLK			378</div><div class='add'>+#define CLK_VICAP_I1CLK			379</div><div class='add'>+#define CLK_VICAP_I2CLK			380</div><div class='add'>+#define CLK_VICAP_I3CLK			381</div><div class='add'>+#define CLK_VICAP_I4CLK			382</div><div class='add'>+#define ACLK_VOP_ROOT			383</div><div class='add'>+#define HCLK_VOP_ROOT			384</div><div class='add'>+#define PCLK_VOP_ROOT			385</div><div class='add'>+#define HCLK_VOP			386</div><div class='add'>+#define ACLK_VOP			387</div><div class='add'>+#define DCLK_VP0_SRC			388</div><div class='add'>+#define DCLK_VP1_SRC			389</div><div class='add'>+#define DCLK_VP2_SRC			390</div><div class='add'>+#define DCLK_VP0			391</div><div class='add'>+#define DCLK_VP1			392</div><div class='add'>+#define DCLK_VP2			393</div><div class='add'>+#define PCLK_VOPGRF			394</div><div class='add'>+#define ACLK_VO0_ROOT			395</div><div class='add'>+#define HCLK_VO0_ROOT			396</div><div class='add'>+#define PCLK_VO0_ROOT			397</div><div class='add'>+#define PCLK_VO0_GRF			398</div><div class='add'>+#define ACLK_HDCP0			399</div><div class='add'>+#define HCLK_HDCP0			400</div><div class='add'>+#define PCLK_HDCP0			401</div><div class='add'>+#define CLK_TRNG0_SKP			402</div><div class='add'>+#define PCLK_DSIHOST0			403</div><div class='add'>+#define CLK_DSIHOST0			404</div><div class='add'>+#define PCLK_HDMITX0			405</div><div class='add'>+#define CLK_HDMITX0_EARC		406</div><div class='add'>+#define CLK_HDMITX0_REF			407</div><div class='add'>+#define PCLK_EDP0			408</div><div class='add'>+#define CLK_EDP0_24M			409</div><div class='add'>+#define CLK_EDP0_200M			410</div><div class='add'>+#define MCLK_SAI5_8CH_SRC		411</div><div class='add'>+#define MCLK_SAI5_8CH			412</div><div class='add'>+#define HCLK_SAI5_8CH			413</div><div class='add'>+#define MCLK_SAI6_8CH_SRC		414</div><div class='add'>+#define MCLK_SAI6_8CH			415</div><div class='add'>+#define HCLK_SAI6_8CH			416</div><div class='add'>+#define HCLK_SPDIF_TX2			417</div><div class='add'>+#define MCLK_SPDIF_TX2			418</div><div class='add'>+#define HCLK_SPDIF_RX2			419</div><div class='add'>+#define MCLK_SPDIF_RX2			420</div><div class='add'>+#define HCLK_SAI8_8CH			421</div><div class='add'>+#define MCLK_SAI8_8CH_SRC		422</div><div class='add'>+#define MCLK_SAI8_8CH			423</div><div class='add'>+#define ACLK_VO1_ROOT			424</div><div class='add'>+#define HCLK_VO1_ROOT			425</div><div class='add'>+#define PCLK_VO1_ROOT			426</div><div class='add'>+#define MCLK_SAI7_8CH_SRC		427</div><div class='add'>+#define MCLK_SAI7_8CH			428</div><div class='add'>+#define HCLK_SAI7_8CH			429</div><div class='add'>+#define HCLK_SPDIF_TX3			430</div><div class='add'>+#define HCLK_SPDIF_TX4			431</div><div class='add'>+#define HCLK_SPDIF_TX5			432</div><div class='add'>+#define MCLK_SPDIF_TX3			433</div><div class='add'>+#define CLK_AUX16MHZ_0			434</div><div class='add'>+#define ACLK_DP0			435</div><div class='add'>+#define PCLK_DP0			436</div><div class='add'>+#define PCLK_VO1_GRF			437</div><div class='add'>+#define ACLK_HDCP1			438</div><div class='add'>+#define HCLK_HDCP1			439</div><div class='add'>+#define PCLK_HDCP1			440</div><div class='add'>+#define CLK_TRNG1_SKP			441</div><div class='add'>+#define HCLK_SAI9_8CH			442</div><div class='add'>+#define MCLK_SAI9_8CH_SRC		443</div><div class='add'>+#define MCLK_SAI9_8CH			444</div><div class='add'>+#define MCLK_SPDIF_TX4			445</div><div class='add'>+#define MCLK_SPDIF_TX5			446</div><div class='add'>+#define CLK_GPU_SRC_PRE			447</div><div class='add'>+#define CLK_GPU				448</div><div class='add'>+#define PCLK_GPU_ROOT			449</div><div class='add'>+#define ACLK_CENTER_ROOT		450</div><div class='add'>+#define ACLK_CENTER_LOW_ROOT		451</div><div class='add'>+#define HCLK_CENTER_ROOT		452</div><div class='add'>+#define PCLK_CENTER_ROOT		453</div><div class='add'>+#define ACLK_DMA2DDR			454</div><div class='add'>+#define ACLK_DDR_SHAREMEM		455</div><div class='add'>+#define PCLK_DMA2DDR			456</div><div class='add'>+#define PCLK_SHAREMEM			457</div><div class='add'>+#define HCLK_VEPU1_ROOT			458</div><div class='add'>+#define ACLK_VEPU1_ROOT			459</div><div class='add'>+#define HCLK_VEPU1			460</div><div class='add'>+#define ACLK_VEPU1			461</div><div class='add'>+#define CLK_VEPU1_CORE			462</div><div class='add'>+#define CLK_JDBCK_DAP			463</div><div class='add'>+#define PCLK_MIPI_DCPHY			464</div><div class='add'>+#define CLK_32K_USB2DEBUG		465</div><div class='add'>+#define PCLK_CSIDPHY			466</div><div class='add'>+#define PCLK_USBDPPHY			467</div><div class='add'>+#define CLK_PMUPHY_REF_SRC		468</div><div class='add'>+#define CLK_USBDP_COMBO_PHY_IMMORTAL	469</div><div class='add'>+#define CLK_HDMITXHDP			470</div><div class='add'>+#define PCLK_MPHY			471</div><div class='add'>+#define CLK_REF_OSC_MPHY		472</div><div class='add'>+#define CLK_REF_UFS_CLKOUT		473</div><div class='add'>+#define HCLK_PMU1_ROOT			474</div><div class='add'>+#define HCLK_PMU_CM0_ROOT		475</div><div class='add'>+#define CLK_200M_PMU_SRC		476</div><div class='add'>+#define CLK_100M_PMU_SRC		477</div><div class='add'>+#define CLK_50M_PMU_SRC			478</div><div class='add'>+#define FCLK_PMU_CM0_CORE		479</div><div class='add'>+#define CLK_PMU_CM0_RTC			480</div><div class='add'>+#define PCLK_PMU1			481</div><div class='add'>+#define CLK_PMU1			482</div><div class='add'>+#define PCLK_PMU1WDT			483</div><div class='add'>+#define TCLK_PMU1WDT			484</div><div class='add'>+#define PCLK_PMUTIMER			485</div><div class='add'>+#define CLK_PMUTIMER_ROOT		486</div><div class='add'>+#define CLK_PMUTIMER0			487</div><div class='add'>+#define CLK_PMUTIMER1			488</div><div class='add'>+#define PCLK_PMU1PWM			489</div><div class='add'>+#define CLK_PMU1PWM			490</div><div class='add'>+#define CLK_PMU1PWM_OSC			491</div><div class='add'>+#define PCLK_PMUPHY_ROOT		492</div><div class='add'>+#define PCLK_I2C0			493</div><div class='add'>+#define CLK_I2C0			494</div><div class='add'>+#define SCLK_UART1			495</div><div class='add'>+#define PCLK_UART1			496</div><div class='add'>+#define CLK_PMU1PWM_RC			497</div><div class='add'>+#define CLK_PDM0			498</div><div class='add'>+#define HCLK_PDM0			499</div><div class='add'>+#define MCLK_PDM0			500</div><div class='add'>+#define HCLK_VAD			501</div><div class='add'>+#define CLK_OSCCHK_PVTM			502</div><div class='add'>+#define CLK_PDM0_OUT			503</div><div class='add'>+#define CLK_HPTIMER_SRC			504</div><div class='add'>+#define PCLK_PMU0_ROOT			505</div><div class='add'>+#define PCLK_PMU0			506</div><div class='add'>+#define PCLK_GPIO0			507</div><div class='add'>+#define DBCLK_GPIO0			508</div><div class='add'>+#define CLK_OSC0_PMU1			509</div><div class='add'>+#define PCLK_PMU1_ROOT			510</div><div class='add'>+#define XIN_OSC0_DIV			511</div><div class='add'>+#define ACLK_USB			512</div><div class='add'>+#define ACLK_UFS			513</div><div class='add'>+#define ACLK_SDGMAC			514</div><div class='add'>+#define HCLK_SDGMAC			515</div><div class='add'>+#define PCLK_SDGMAC			516</div><div class='add'>+#define HCLK_VO1			517</div><div class='add'>+#define HCLK_VO0			518</div><div class='add'>+#define PCLK_CCI_ROOT			519</div><div class='add'>+#define ACLK_CCI_ROOT			520</div><div class='add'>+#define HCLK_VO0VOP_CHANNEL		521</div><div class='add'>+#define ACLK_VO0VOP_CHANNEL		522</div><div class='add'>+#define ACLK_TOP_MID			523</div><div class='add'>+#define ACLK_SECURE_HIGH		524</div><div class='add'>+#define CLK_USBPHY_REF_SRC		525</div><div class='add'>+#define CLK_PHY_REF_SRC			526</div><div class='add'>+#define CLK_CPLL_REF_SRC		527</div><div class='add'>+#define CLK_AUPLL_REF_SRC		528</div><div class='add'>+#define PCLK_SECURE_NS			529</div><div class='add'>+#define HCLK_SECURE_NS			530</div><div class='add'>+#define ACLK_SECURE_NS			531</div><div class='add'>+#define PCLK_OTPC_NS			532</div><div class='add'>+#define HCLK_CRYPTO_NS			533</div><div class='add'>+#define HCLK_TRNG_NS			534</div><div class='add'>+#define CLK_OTPC_NS			535</div><div class='add'>+#define SCLK_DSU			536</div><div class='add'>+#define SCLK_DDR			537</div><div class='add'>+#define ACLK_CRYPTO_NS			538</div><div class='add'>+#define CLK_PKA_CRYPTO_NS		539</div><div class='add'>+#define ACLK_RKVDEC_ROOT_BAK		540</div><div class='add'>+#define CLK_AUDIO_FRAC_0_SRC		541</div><div class='add'>+#define CLK_AUDIO_FRAC_1_SRC		542</div><div class='add'>+#define CLK_AUDIO_FRAC_2_SRC		543</div><div class='add'>+#define CLK_AUDIO_FRAC_3_SRC		544</div><div class='add'>+#define PCLK_HDPTX_APB			545</div><div class='add'>+</div><div class='add'>+/* secure clk */</div><div class='add'>+#define CLK_STIMER0_ROOT		546</div><div class='add'>+#define CLK_STIMER1_ROOT		547</div><div class='add'>+#define PCLK_SECURE_S			548</div><div class='add'>+#define HCLK_SECURE_S			549</div><div class='add'>+#define ACLK_SECURE_S			550</div><div class='add'>+#define CLK_PKA_CRYPTO_S		551</div><div class='add'>+#define HCLK_VO1_S			552</div><div class='add'>+#define PCLK_VO1_S			553</div><div class='add'>+#define HCLK_VO0_S			554</div><div class='add'>+#define PCLK_VO0_S			555</div><div class='add'>+#define PCLK_KLAD			556</div><div class='add'>+#define HCLK_CRYPTO_S			557</div><div class='add'>+#define HCLK_KLAD			558</div><div class='add'>+#define ACLK_CRYPTO_S			559</div><div class='add'>+#define HCLK_TRNG_S			560</div><div class='add'>+#define PCLK_OTPC_S			561</div><div class='add'>+#define CLK_OTPC_S			562</div><div class='add'>+#define PCLK_WDT_S			563</div><div class='add'>+#define TCLK_WDT_S			564</div><div class='add'>+#define PCLK_HDCP0_TRNG			565</div><div class='add'>+#define PCLK_HDCP1_TRNG			566</div><div class='add'>+#define HCLK_HDCP_KEY0			567</div><div class='add'>+#define HCLK_HDCP_KEY1			568</div><div class='add'>+#define PCLK_EDP_S			569</div><div class='add'>+#define ACLK_KLAD			570</div><div class='add'>+</div><div class='add'>+/* SCMI clocks, use these when changing clocks through SCMI */</div><div class='add'>+#define SCMI_ARMCLK_L			10</div><div class='add'>+#define SCMI_ARMCLK_B			11</div><div class='add'>+#define SCMI_CLK_GPU			456</div><div class='add'>+</div><div class='add'>+/* IOC-controlled output clocks */</div><div class='add'>+#define CLK_SAI0_MCLKOUT_TO_IO		571</div><div class='add'>+#define CLK_SAI1_MCLKOUT_TO_IO		572</div><div class='add'>+#define CLK_SAI2_MCLKOUT_TO_IO		573</div><div class='add'>+#define CLK_SAI3_MCLKOUT_TO_IO		574</div><div class='add'>+#define CLK_SAI4_MCLKOUT_TO_IO		575</div><div class='add'>+#define CLK_SAI4_MCLKOUT_TO_IO		575</div><div class='add'>+#define CLK_FSPI0_TO_IO			576</div><div class='add'>+#define CLK_FSPI1_TO_IO			577</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/rockchip,rv1126b-cru.h b/include/dt-bindings/clock/rockchip,rv1126b-cru.h<br/>new file mode 100644<br/>index 000000000000..721d50a1419f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/rockchip,rv1126b-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/rockchip,rv1126b-cru.h</a></div><div class='hunk'>@@ -0,0 +1,392 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Rockchip Electronics Co., Ltd.</div><div class='add'>+ * Author: Elaine Zhang &lt;zhangqing@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RV1126B_H</div><div class='add'>+#define _DT_BINDINGS_CLK_ROCKCHIP_RV1126B_H</div><div class='add'>+</div><div class='add'>+/* pll clocks */</div><div class='add'>+#define PLL_GPLL				0</div><div class='add'>+#define PLL_CPLL				1</div><div class='add'>+#define PLL_AUPLL				2</div><div class='add'>+#define ARMCLK					3</div><div class='add'>+#define SCLK_DDR				4</div><div class='add'>+</div><div class='add'>+/* clk (clocks) */</div><div class='add'>+#define CLK_CPLL_DIV20				5</div><div class='add'>+#define CLK_CPLL_DIV10				6</div><div class='add'>+#define CLK_CPLL_DIV8				7</div><div class='add'>+#define CLK_GPLL_DIV8				8</div><div class='add'>+#define CLK_GPLL_DIV6				9</div><div class='add'>+#define CLK_GPLL_DIV4				10</div><div class='add'>+#define CLK_CPLL_DIV3				11</div><div class='add'>+#define CLK_GPLL_DIV3				12</div><div class='add'>+#define CLK_CPLL_DIV2				13</div><div class='add'>+#define CLK_GPLL_DIV2				14</div><div class='add'>+#define CLK_CM_FRAC0				15</div><div class='add'>+#define CLK_CM_FRAC1				16</div><div class='add'>+#define CLK_CM_FRAC2				17</div><div class='add'>+#define CLK_UART_FRAC0				18</div><div class='add'>+#define CLK_UART_FRAC1				19</div><div class='add'>+#define CLK_AUDIO_FRAC0				20</div><div class='add'>+#define CLK_AUDIO_FRAC1				21</div><div class='add'>+#define CLK_AUDIO_INT0				22</div><div class='add'>+#define CLK_AUDIO_INT1				23</div><div class='add'>+#define SCLK_UART0_SRC				24</div><div class='add'>+#define SCLK_UART1				25</div><div class='add'>+#define SCLK_UART2				26</div><div class='add'>+#define SCLK_UART3				27</div><div class='add'>+#define SCLK_UART4				28</div><div class='add'>+#define SCLK_UART5				29</div><div class='add'>+#define SCLK_UART6				30</div><div class='add'>+#define SCLK_UART7				31</div><div class='add'>+#define MCLK_SAI0				32</div><div class='add'>+#define MCLK_SAI1				33</div><div class='add'>+#define MCLK_SAI2				34</div><div class='add'>+#define MCLK_PDM				35</div><div class='add'>+#define CLKOUT_PDM				36</div><div class='add'>+#define MCLK_ASRC0				37</div><div class='add'>+#define MCLK_ASRC1				38</div><div class='add'>+#define MCLK_ASRC2				39</div><div class='add'>+#define MCLK_ASRC3				40</div><div class='add'>+#define CLK_ASRC0				41</div><div class='add'>+#define CLK_ASRC1				42</div><div class='add'>+#define CLK_CORE_PLL				43</div><div class='add'>+#define CLK_NPU_PLL				44</div><div class='add'>+#define CLK_VEPU_PLL				45</div><div class='add'>+#define CLK_ISP_PLL				46</div><div class='add'>+#define CLK_AISP_PLL				47</div><div class='add'>+#define CLK_SARADC0_SRC				48</div><div class='add'>+#define CLK_SARADC1_SRC				49</div><div class='add'>+#define CLK_SARADC2_SRC				50</div><div class='add'>+#define HCLK_NPU_ROOT				51</div><div class='add'>+#define PCLK_NPU_ROOT				52</div><div class='add'>+#define ACLK_VEPU_ROOT				53</div><div class='add'>+#define HCLK_VEPU_ROOT				54</div><div class='add'>+#define PCLK_VEPU_ROOT				55</div><div class='add'>+#define CLK_CORE_RGA_SRC			56</div><div class='add'>+#define ACLK_GMAC_ROOT				57</div><div class='add'>+#define ACLK_VI_ROOT				58</div><div class='add'>+#define HCLK_VI_ROOT				59</div><div class='add'>+#define PCLK_VI_ROOT				60</div><div class='add'>+#define DCLK_VICAP_ROOT				61</div><div class='add'>+#define CLK_SYS_DSMC_ROOT			62</div><div class='add'>+#define ACLK_VDO_ROOT				63</div><div class='add'>+#define ACLK_RKVDEC_ROOT			64</div><div class='add'>+#define HCLK_VDO_ROOT				65</div><div class='add'>+#define PCLK_VDO_ROOT				66</div><div class='add'>+#define DCLK_OOC_SRC				67</div><div class='add'>+#define DCLK_VOP				68</div><div class='add'>+#define DCLK_DECOM_SRC				69</div><div class='add'>+#define PCLK_DDR_ROOT				70</div><div class='add'>+#define ACLK_SYSMEM_SRC				71</div><div class='add'>+#define ACLK_TOP_ROOT				72</div><div class='add'>+#define ACLK_BUS_ROOT				73</div><div class='add'>+#define HCLK_BUS_ROOT				74</div><div class='add'>+#define PCLK_BUS_ROOT				75</div><div class='add'>+#define CCLK_SDMMC0				76</div><div class='add'>+#define CCLK_SDMMC1				77</div><div class='add'>+#define CCLK_EMMC				78</div><div class='add'>+#define SCLK_2X_FSPI0				79</div><div class='add'>+#define CLK_GMAC_PTP_REF_SRC			80</div><div class='add'>+#define CLK_GMAC_125M				81</div><div class='add'>+#define CLK_TIMER_ROOT				82</div><div class='add'>+#define TCLK_WDT_NS_SRC				83</div><div class='add'>+#define TCLK_WDT_S_SRC				84</div><div class='add'>+#define TCLK_WDT_HPMCU				85</div><div class='add'>+#define CLK_CAN0				86</div><div class='add'>+#define CLK_CAN1				87</div><div class='add'>+#define PCLK_PERI_ROOT				88</div><div class='add'>+#define ACLK_PERI_ROOT				89</div><div class='add'>+#define CLK_I2C_BUS_SRC				90</div><div class='add'>+#define CLK_SPI0				91</div><div class='add'>+#define CLK_SPI1				92</div><div class='add'>+#define BUSCLK_PMU_SRC				93</div><div class='add'>+#define CLK_PWM0				94</div><div class='add'>+#define CLK_PWM2				95</div><div class='add'>+#define CLK_PWM3				96</div><div class='add'>+#define CLK_PKA_RKCE_SRC			97</div><div class='add'>+#define ACLK_RKCE_SRC				98</div><div class='add'>+#define ACLK_VCP_ROOT				99</div><div class='add'>+#define HCLK_VCP_ROOT				100</div><div class='add'>+#define PCLK_VCP_ROOT				101</div><div class='add'>+#define CLK_CORE_FEC_SRC			102</div><div class='add'>+#define CLK_CORE_AVSP_SRC			103</div><div class='add'>+#define CLK_50M_GMAC_IOBUF_VI			104</div><div class='add'>+#define PCLK_TOP_ROOT				105</div><div class='add'>+#define CLK_MIPI0_OUT2IO			106</div><div class='add'>+#define CLK_MIPI1_OUT2IO			107</div><div class='add'>+#define CLK_MIPI2_OUT2IO			108</div><div class='add'>+#define CLK_MIPI3_OUT2IO			109</div><div class='add'>+#define CLK_CIF_OUT2IO				110</div><div class='add'>+#define CLK_MAC_OUT2IO				111</div><div class='add'>+#define MCLK_SAI0_OUT2IO			112</div><div class='add'>+#define MCLK_SAI1_OUT2IO			113</div><div class='add'>+#define MCLK_SAI2_OUT2IO			114</div><div class='add'>+#define CLK_CM_FRAC0_SRC			115</div><div class='add'>+#define CLK_CM_FRAC1_SRC			116</div><div class='add'>+#define CLK_CM_FRAC2_SRC			117</div><div class='add'>+#define CLK_UART_FRAC0_SRC			118</div><div class='add'>+#define CLK_UART_FRAC1_SRC			119</div><div class='add'>+#define CLK_AUDIO_FRAC0_SRC			120</div><div class='add'>+#define CLK_AUDIO_FRAC1_SRC			121</div><div class='add'>+#define ACLK_NPU_ROOT				122</div><div class='add'>+#define HCLK_RKNN				123</div><div class='add'>+#define ACLK_RKNN				124</div><div class='add'>+#define PCLK_GPIO3				125</div><div class='add'>+#define DBCLK_GPIO3				126</div><div class='add'>+#define PCLK_IOC_VCCIO3				127</div><div class='add'>+#define PCLK_SARADC0				128</div><div class='add'>+#define CLK_SARADC0				129</div><div class='add'>+#define HCLK_SDMMC1				130</div><div class='add'>+#define HCLK_VEPU				131</div><div class='add'>+#define ACLK_VEPU				132</div><div class='add'>+#define CLK_CORE_VEPU				133</div><div class='add'>+#define HCLK_FEC				134</div><div class='add'>+#define ACLK_FEC				135</div><div class='add'>+#define CLK_CORE_FEC				136</div><div class='add'>+#define HCLK_AVSP				137</div><div class='add'>+#define ACLK_AVSP				138</div><div class='add'>+#define BUSCLK_PMU1_ROOT			139</div><div class='add'>+#define HCLK_AISP				140</div><div class='add'>+#define ACLK_AISP				141</div><div class='add'>+#define CLK_CORE_AISP				142</div><div class='add'>+#define CLK_CORE_ISP_ROOT			143</div><div class='add'>+#define PCLK_DSMC				144</div><div class='add'>+#define ACLK_DSMC				145</div><div class='add'>+#define HCLK_CAN0				146</div><div class='add'>+#define HCLK_CAN1				147</div><div class='add'>+#define PCLK_GPIO2				148</div><div class='add'>+#define DBCLK_GPIO2				149</div><div class='add'>+#define PCLK_GPIO4				150</div><div class='add'>+#define DBCLK_GPIO4				151</div><div class='add'>+#define PCLK_GPIO5				152</div><div class='add'>+#define DBCLK_GPIO5				153</div><div class='add'>+#define PCLK_GPIO6				154</div><div class='add'>+#define DBCLK_GPIO6				155</div><div class='add'>+#define PCLK_GPIO7				156</div><div class='add'>+#define DBCLK_GPIO7				157</div><div class='add'>+#define PCLK_IOC_VCCIO2				158</div><div class='add'>+#define PCLK_IOC_VCCIO4				159</div><div class='add'>+#define PCLK_IOC_VCCIO5				160</div><div class='add'>+#define PCLK_IOC_VCCIO6				161</div><div class='add'>+#define PCLK_IOC_VCCIO7				162</div><div class='add'>+#define HCLK_ISP				163</div><div class='add'>+#define ACLK_ISP				164</div><div class='add'>+#define CLK_CORE_ISP				165</div><div class='add'>+#define HCLK_VICAP				166</div><div class='add'>+#define ACLK_VICAP				167</div><div class='add'>+#define DCLK_VICAP				168</div><div class='add'>+#define ISP0CLK_VICAP				169</div><div class='add'>+#define HCLK_VPSS				170</div><div class='add'>+#define ACLK_VPSS				171</div><div class='add'>+#define CLK_CORE_VPSS				172</div><div class='add'>+#define PCLK_CSI2HOST0				173</div><div class='add'>+#define DCLK_CSI2HOST0				174</div><div class='add'>+#define PCLK_CSI2HOST1				175</div><div class='add'>+#define DCLK_CSI2HOST1				176</div><div class='add'>+#define PCLK_CSI2HOST2				177</div><div class='add'>+#define DCLK_CSI2HOST2				178</div><div class='add'>+#define PCLK_CSI2HOST3				179</div><div class='add'>+#define DCLK_CSI2HOST3				180</div><div class='add'>+#define HCLK_SDMMC0				181</div><div class='add'>+#define ACLK_GMAC				182</div><div class='add'>+#define PCLK_GMAC				183</div><div class='add'>+#define CLK_GMAC_PTP_REF			184</div><div class='add'>+#define PCLK_CSIPHY0				185</div><div class='add'>+#define PCLK_CSIPHY1				186</div><div class='add'>+#define PCLK_MACPHY				187</div><div class='add'>+#define PCLK_SARADC1				188</div><div class='add'>+#define CLK_SARADC1				189</div><div class='add'>+#define PCLK_SARADC2				190</div><div class='add'>+#define CLK_SARADC2				191</div><div class='add'>+#define ACLK_RKVDEC				192</div><div class='add'>+#define HCLK_RKVDEC				193</div><div class='add'>+#define CLK_HEVC_CA_RKVDEC			194</div><div class='add'>+#define ACLK_VOP				195</div><div class='add'>+#define HCLK_VOP				196</div><div class='add'>+#define HCLK_RKJPEG				197</div><div class='add'>+#define ACLK_RKJPEG				198</div><div class='add'>+#define ACLK_RKMMU_DECOM			199</div><div class='add'>+#define HCLK_RKMMU_DECOM			200</div><div class='add'>+#define DCLK_DECOM				201</div><div class='add'>+#define ACLK_DECOM				202</div><div class='add'>+#define PCLK_DECOM				203</div><div class='add'>+#define PCLK_MIPI_DSI				204</div><div class='add'>+#define PCLK_DSIPHY				205</div><div class='add'>+#define ACLK_OOC				206</div><div class='add'>+#define ACLK_SYSMEM				207</div><div class='add'>+#define PCLK_DDRC				208</div><div class='add'>+#define PCLK_DDRMON				209</div><div class='add'>+#define CLK_TIMER_DDRMON			210</div><div class='add'>+#define PCLK_DFICTRL				211</div><div class='add'>+#define PCLK_DDRPHY				212</div><div class='add'>+#define PCLK_DMA2DDR				213</div><div class='add'>+#define CLK_RCOSC_SRC				214</div><div class='add'>+#define BUSCLK_PMU_MUX				215</div><div class='add'>+#define BUSCLK_PMU_ROOT				216</div><div class='add'>+#define PCLK_PMU				217</div><div class='add'>+#define CLK_XIN_RC_DIV				218</div><div class='add'>+#define CLK_32K					219</div><div class='add'>+#define PCLK_PMU_GPIO0				220</div><div class='add'>+#define DBCLK_PMU_GPIO0				221</div><div class='add'>+#define PCLK_PMU_HP_TIMER			222</div><div class='add'>+#define CLK_PMU_HP_TIMER			223</div><div class='add'>+#define CLK_PMU_32K_HP_TIMER			224</div><div class='add'>+#define PCLK_PWM1				225</div><div class='add'>+#define CLK_PWM1				226</div><div class='add'>+#define CLK_OSC_PWM1				227</div><div class='add'>+#define CLK_RC_PWM1				228</div><div class='add'>+#define CLK_FREQ_PWM1				229</div><div class='add'>+#define CLK_COUNTER_PWM1			230</div><div class='add'>+#define PCLK_I2C2				231</div><div class='add'>+#define CLK_I2C2				232</div><div class='add'>+#define PCLK_UART0				233</div><div class='add'>+#define SCLK_UART0				234</div><div class='add'>+#define PCLK_RCOSC_CTRL				235</div><div class='add'>+#define CLK_OSC_RCOSC_CTRL			236</div><div class='add'>+#define CLK_REF_RCOSC_CTRL			237</div><div class='add'>+#define PCLK_IOC_PMUIO0				238</div><div class='add'>+#define CLK_REFOUT				239</div><div class='add'>+#define CLK_PREROLL				240</div><div class='add'>+#define CLK_PREROLL_32K				241</div><div class='add'>+#define HCLK_PMU_SRAM				242</div><div class='add'>+#define PCLK_WDT_LPMCU				243</div><div class='add'>+#define TCLK_WDT_LPMCU				244</div><div class='add'>+#define CLK_LPMCU				245</div><div class='add'>+#define CLK_LPMCU_RTC				246</div><div class='add'>+#define PCLK_LPMCU_MAILBOX			247</div><div class='add'>+#define HCLK_OOC				248</div><div class='add'>+#define PCLK_SPI2AHB				249</div><div class='add'>+#define HCLK_SPI2AHB				250</div><div class='add'>+#define HCLK_FSPI1				251</div><div class='add'>+#define HCLK_XIP_FSPI1				252</div><div class='add'>+#define SCLK_1X_FSPI1				253</div><div class='add'>+#define PCLK_IOC_PMUIO1				254</div><div class='add'>+#define PCLK_AUDIO_ADC_PMU			255</div><div class='add'>+#define MCLK_AUDIO_ADC_PMU			256</div><div class='add'>+#define MCLK_AUDIO_ADC_DIV4_PMU			257</div><div class='add'>+#define MCLK_LPSAI				258</div><div class='add'>+#define ACLK_GIC400				259</div><div class='add'>+#define PCLK_WDT_NS				260</div><div class='add'>+#define TCLK_WDT_NS				261</div><div class='add'>+#define PCLK_WDT_HPMCU				262</div><div class='add'>+#define HCLK_CACHE				263</div><div class='add'>+#define PCLK_HPMCU_MAILBOX			264</div><div class='add'>+#define PCLK_HPMCU_INTMUX			265</div><div class='add'>+#define CLK_HPMCU				266</div><div class='add'>+#define CLK_HPMCU_RTC				267</div><div class='add'>+#define PCLK_RKDMA				268</div><div class='add'>+#define ACLK_RKDMA				269</div><div class='add'>+#define PCLK_DCF				270</div><div class='add'>+#define ACLK_DCF				271</div><div class='add'>+#define HCLK_RGA				272</div><div class='add'>+#define ACLK_RGA				273</div><div class='add'>+#define CLK_CORE_RGA				274</div><div class='add'>+#define PCLK_TIMER				275</div><div class='add'>+#define CLK_TIMER0				276</div><div class='add'>+#define CLK_TIMER1				277</div><div class='add'>+#define CLK_TIMER2				278</div><div class='add'>+#define CLK_TIMER3				279</div><div class='add'>+#define CLK_TIMER4				280</div><div class='add'>+#define CLK_TIMER5				281</div><div class='add'>+#define PCLK_I2C0				282</div><div class='add'>+#define CLK_I2C0				283</div><div class='add'>+#define PCLK_I2C1				284</div><div class='add'>+#define CLK_I2C1				285</div><div class='add'>+#define PCLK_I2C3				286</div><div class='add'>+#define CLK_I2C3				287</div><div class='add'>+#define PCLK_I2C4				288</div><div class='add'>+#define CLK_I2C4				289</div><div class='add'>+#define PCLK_I2C5				290</div><div class='add'>+#define CLK_I2C5				291</div><div class='add'>+#define PCLK_SPI0				292</div><div class='add'>+#define PCLK_SPI1				293</div><div class='add'>+#define PCLK_PWM0				294</div><div class='add'>+#define CLK_OSC_PWM0				295</div><div class='add'>+#define CLK_RC_PWM0				296</div><div class='add'>+#define PCLK_PWM2				297</div><div class='add'>+#define CLK_OSC_PWM2				298</div><div class='add'>+#define CLK_RC_PWM2				299</div><div class='add'>+#define PCLK_PWM3				300</div><div class='add'>+#define CLK_OSC_PWM3				301</div><div class='add'>+#define CLK_RC_PWM3				302</div><div class='add'>+#define PCLK_UART1				303</div><div class='add'>+#define PCLK_UART2				304</div><div class='add'>+#define PCLK_UART3				305</div><div class='add'>+#define PCLK_UART4				306</div><div class='add'>+#define PCLK_UART5				307</div><div class='add'>+#define PCLK_UART6				308</div><div class='add'>+#define PCLK_UART7				309</div><div class='add'>+#define PCLK_TSADC				310</div><div class='add'>+#define CLK_TSADC				311</div><div class='add'>+#define HCLK_SAI0				312</div><div class='add'>+#define HCLK_SAI1				313</div><div class='add'>+#define HCLK_SAI2				314</div><div class='add'>+#define HCLK_RKDSM				315</div><div class='add'>+#define MCLK_RKDSM				316</div><div class='add'>+#define HCLK_PDM				317</div><div class='add'>+#define HCLK_ASRC0				318</div><div class='add'>+#define HCLK_ASRC1				319</div><div class='add'>+#define PCLK_AUDIO_ADC_BUS			320</div><div class='add'>+#define MCLK_AUDIO_ADC_BUS			321</div><div class='add'>+#define MCLK_AUDIO_ADC_DIV4_BUS			322</div><div class='add'>+#define PCLK_RKCE				323</div><div class='add'>+#define HCLK_NS_RKCE				324</div><div class='add'>+#define PCLK_OTPC_NS				325</div><div class='add'>+#define CLK_SBPI_OTPC_NS			326</div><div class='add'>+#define CLK_USER_OTPC_NS			327</div><div class='add'>+#define CLK_OTPC_ARB				328</div><div class='add'>+#define PCLK_OTP_MASK				329</div><div class='add'>+#define CLK_TSADC_PHYCTRL			330</div><div class='add'>+#define LRCK_SRC_ASRC0				331</div><div class='add'>+#define LRCK_DST_ASRC0				332</div><div class='add'>+#define LRCK_SRC_ASRC1				333</div><div class='add'>+#define LRCK_DST_ASRC1				334</div><div class='add'>+#define PCLK_KEY_READER				335</div><div class='add'>+#define ACLK_NSRKCE				336</div><div class='add'>+#define CLK_PKA_NSRKCE				337</div><div class='add'>+#define PCLK_RTC_ROOT				338</div><div class='add'>+#define PCLK_GPIO1				339</div><div class='add'>+#define DBCLK_GPIO1				340</div><div class='add'>+#define PCLK_IOC_VCCIO1				341</div><div class='add'>+#define ACLK_USB3OTG				342</div><div class='add'>+#define CLK_REF_USB3OTG				343</div><div class='add'>+#define CLK_SUSPEND_USB3OTG			344</div><div class='add'>+#define HCLK_USB2HOST				345</div><div class='add'>+#define HCLK_ARB_USB2HOST			346</div><div class='add'>+#define PCLK_RTC_TEST				347</div><div class='add'>+#define HCLK_EMMC				348</div><div class='add'>+#define HCLK_FSPI0				349</div><div class='add'>+#define HCLK_XIP_FSPI0				350</div><div class='add'>+#define PCLK_PIPEPHY				351</div><div class='add'>+#define PCLK_USB2PHY				352</div><div class='add'>+#define CLK_REF_PIPEPHY_CPLL_SRC		353</div><div class='add'>+#define CLK_REF_PIPEPHY				354</div><div class='add'>+#define HCLK_VPSL				355</div><div class='add'>+#define ACLK_VPSL				356</div><div class='add'>+#define CLK_CORE_VPSL				357</div><div class='add'>+#define CLK_MACPHY				358</div><div class='add'>+#define HCLK_RKRNG_NS				359</div><div class='add'>+#define HCLK_RKRNG_S_NS				360</div><div class='add'>+#define CLK_AISP_PLL_SRC			361</div><div class='add'>+</div><div class='add'>+/* secure clks */</div><div class='add'>+#define CLK_USER_OTPC_S				362</div><div class='add'>+#define CLK_SBPI_OTPC_S				363</div><div class='add'>+#define PCLK_OTPC_S				364</div><div class='add'>+#define PCLK_KEY_READER_S			365</div><div class='add'>+#define HCLK_KL_RKCE_S				366</div><div class='add'>+#define HCLK_RKCE_S				367</div><div class='add'>+#define PCLK_WDT_S				368</div><div class='add'>+#define TCLK_WDT_S				369</div><div class='add'>+#define CLK_STIMER0				370</div><div class='add'>+#define CLK_STIMER1				371</div><div class='add'>+#define PLK_STIMER				372</div><div class='add'>+#define HCLK_RKRNG_S				373</div><div class='add'>+#define CLK_PKA_RKCE_S				374</div><div class='add'>+#define ACLK_RKCE_S				375</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/samsung,exynos2200-cmu.h b/include/dt-bindings/clock/samsung,exynos2200-cmu.h<br/>new file mode 100644<br/>index 000000000000..310552be0c8c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/samsung,exynos2200-cmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/samsung,exynos2200-cmu.h</a></div><div class='hunk'>@@ -0,0 +1,431 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Ivaylo Ivanov &lt;ivo.ivanov.ivanov1@gmail.com&gt;</div><div class='add'>+ * Author: Ivaylo Ivanov &lt;ivo.ivanov.ivanov1@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Device Tree binding constants for Exynos2200 clock controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_EXYNOS2200_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_EXYNOS2200_H</div><div class='add'>+</div><div class='add'>+/* CMU_TOP */</div><div class='add'>+#define CLK_FOUT_SHARED0_PLL			1</div><div class='add'>+#define CLK_FOUT_SHARED1_PLL			2</div><div class='add'>+#define CLK_FOUT_SHARED2_PLL			3</div><div class='add'>+#define CLK_FOUT_SHARED3_PLL			4</div><div class='add'>+#define CLK_FOUT_SHARED4_PLL			5</div><div class='add'>+#define CLK_FOUT_MMC_PLL			6</div><div class='add'>+#define CLK_FOUT_SHARED_MIF_PLL			7</div><div class='add'>+</div><div class='add'>+#define CLK_MOUT_CMU_CP_MPLL_CLK_D2_USER	8</div><div class='add'>+#define CLK_MOUT_CMU_CP_MPLL_CLK_USER		9</div><div class='add'>+#define CLK_MOUT_CMU_AUD_AUDIF0			10</div><div class='add'>+#define CLK_MOUT_CMU_AUD_AUDIF1			11</div><div class='add'>+#define CLK_MOUT_CMU_AUD_CPU			12</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL0_DBG_NOC		13</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL0_SWITCH		14</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL1_SWITCH		15</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL2_SWITCH		16</div><div class='add'>+#define CLK_MOUT_CMU_DNC_NOC			17</div><div class='add'>+#define CLK_MOUT_CMU_DPUB_NOC			18</div><div class='add'>+#define CLK_MOUT_CMU_DPUF_NOC			19</div><div class='add'>+#define CLK_MOUT_CMU_DSP_NOC			20</div><div class='add'>+#define CLK_MOUT_CMU_DSU_SWITCH			21</div><div class='add'>+#define CLK_MOUT_CMU_G3D_SWITCH			22</div><div class='add'>+#define CLK_MOUT_CMU_GNPU_NOC			23</div><div class='add'>+#define CLK_MOUT_CMU_UFS_MMC_CARD		24</div><div class='add'>+#define CLK_MOUT_CMU_M2M_NOC			25</div><div class='add'>+#define CLK_MOUT_CMU_NOCL0_NOC			26</div><div class='add'>+#define CLK_MOUT_CMU_NOCL1A_NOC			27</div><div class='add'>+#define CLK_MOUT_CMU_NOCL1B_NOC0		28</div><div class='add'>+#define CLK_MOUT_CMU_NOCL1C_NOC			29</div><div class='add'>+#define CLK_MOUT_CMU_SDMA_NOC			30</div><div class='add'>+#define CLK_MOUT_CMU_CP_HISPEEDY_CLK		31</div><div class='add'>+#define CLK_MOUT_CMU_CP_SHARED0_CLK		32</div><div class='add'>+#define CLK_MOUT_CMU_CP_SHARED2_CLK		33</div><div class='add'>+#define CLK_MOUT_CMU_MUX_ALIVE_NOC		34</div><div class='add'>+#define CLK_MOUT_CMU_MUX_AUD_AUDIF0		35</div><div class='add'>+#define CLK_MOUT_CMU_MUX_AUD_AUDIF1		36</div><div class='add'>+#define CLK_MOUT_CMU_MUX_AUD_CPU		37</div><div class='add'>+#define CLK_MOUT_CMU_MUX_AUD_NOC		38</div><div class='add'>+#define CLK_MOUT_CMU_MUX_BRP_NOC		39</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CIS_CLK0		40</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CIS_CLK1		41</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CIS_CLK2		42</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CIS_CLK3		43</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CIS_CLK4		44</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CIS_CLK5		45</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CIS_CLK6		46</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CIS_CLK7		47</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CMU_BOOST		48</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CMU_BOOST_CAM		49</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CMU_BOOST_CPU		50</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CMU_BOOST_MIF		51</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CPUCL0_DBG_NOC		52</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CPUCL0_NOCP		53</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CPUCL0_SWITCH		54</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CPUCL1_SWITCH		55</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CPUCL2_SWITCH		56</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CSIS_DCPHY		57</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CSIS_NOC		58</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CSIS_OIS_MCU		59</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CSTAT_NOC		60</div><div class='add'>+#define CLK_MOUT_CMU_MUX_DNC_NOC		61</div><div class='add'>+#define CLK_MOUT_CMU_MUX_DPUB			62</div><div class='add'>+#define CLK_MOUT_CMU_MUX_DPUB_ALT		63</div><div class='add'>+#define CLK_MOUT_CMU_MUX_DPUB_DSIM		64</div><div class='add'>+#define CLK_MOUT_CMU_MUX_DPUF			65</div><div class='add'>+#define CLK_MOUT_CMU_MUX_DPUF_ALT		66</div><div class='add'>+#define CLK_MOUT_CMU_MUX_DSP_NOC		67</div><div class='add'>+#define CLK_MOUT_CMU_MUX_DSU_SWITCH		68</div><div class='add'>+#define CLK_MOUT_CMU_MUX_G3D_NOCP		69</div><div class='add'>+#define CLK_MOUT_CMU_MUX_G3D_SWITCH		70</div><div class='add'>+#define CLK_MOUT_CMU_MUX_GNPU_NOC		71</div><div class='add'>+#define CLK_MOUT_CMU_MUX_HSI0_DPGTC		72</div><div class='add'>+#define CLK_MOUT_CMU_MUX_HSI0_DPOSC		73</div><div class='add'>+#define CLK_MOUT_CMU_MUX_HSI0_NOC		74</div><div class='add'>+#define CLK_MOUT_CMU_MUX_HSI0_USB32DRD		75</div><div class='add'>+#define CLK_MOUT_CMU_MUX_UFS_MMC_CARD		76</div><div class='add'>+#define CLK_MOUT_CMU_MUX_HSI1_NOC		77</div><div class='add'>+#define CLK_MOUT_CMU_MUX_HSI1_PCIE		78</div><div class='add'>+#define CLK_MOUT_CMU_MUX_UFS_UFS_EMBD		79</div><div class='add'>+#define CLK_MOUT_CMU_MUX_LME_LME		80</div><div class='add'>+#define CLK_MOUT_CMU_MUX_LME_NOC		81</div><div class='add'>+#define CLK_MOUT_CMU_MUX_M2M_NOC		82</div><div class='add'>+#define CLK_MOUT_CMU_MUX_MCSC_MCSC		83</div><div class='add'>+#define CLK_MOUT_CMU_MUX_MCSC_NOC		84</div><div class='add'>+#define CLK_MOUT_CMU_MUX_MFC0_MFC0		85</div><div class='add'>+#define CLK_MOUT_CMU_MUX_MFC0_WFD		86</div><div class='add'>+#define CLK_MOUT_CMU_MUX_MFC1_MFC1		87</div><div class='add'>+#define CLK_MOUT_CMU_MUX_MIF_NOCP		88</div><div class='add'>+#define CLK_MOUT_CMU_MUX_MIF_SWITCH		89</div><div class='add'>+#define CLK_MOUT_CMU_MUX_NOCL0_NOC		90</div><div class='add'>+#define CLK_MOUT_CMU_MUX_NOCL1A_NOC		91</div><div class='add'>+#define CLK_MOUT_CMU_MUX_NOCL1B_NOC0		92</div><div class='add'>+#define CLK_MOUT_CMU_MUX_NOCL1B_NOC1		93</div><div class='add'>+#define CLK_MOUT_CMU_MUX_NOCL1C_NOC		94</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC0_IP0		95</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC0_IP1		96</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC0_NOC		97</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC1_IP0		98</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC1_IP1		99</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC1_NOC		100</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC2_IP0		101</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC2_IP1		102</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIC2_NOC		103</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIS_GIC		104</div><div class='add'>+#define CLK_MOUT_CMU_MUX_PERIS_NOC		105</div><div class='add'>+#define CLK_MOUT_CMU_MUX_SDMA_NOC		106</div><div class='add'>+#define CLK_MOUT_CMU_MUX_SSP_NOC		107</div><div class='add'>+#define CLK_MOUT_CMU_MUX_VTS_DMIC		108</div><div class='add'>+#define CLK_MOUT_CMU_MUX_YUVP_NOC		109</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CMU_CMUREF		110</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CP_HISPEEDY_CLK	111</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CP_SHARED0_CLK		112</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CP_SHARED1_CLK		113</div><div class='add'>+#define CLK_MOUT_CMU_MUX_CP_SHARED2_CLK		114</div><div class='add'>+#define CLK_MOUT_CMU_M2M_FRC			115</div><div class='add'>+#define CLK_MOUT_CMU_MCSC_MCSC			116</div><div class='add'>+#define CLK_MOUT_CMU_MCSC_NOC			117</div><div class='add'>+#define CLK_MOUT_CMU_MUX_M2M_FRC		118</div><div class='add'>+#define CLK_MOUT_CMU_MUX_UFS_NOC		119</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_CMU_ALIVE_NOC			120</div><div class='add'>+#define CLK_DOUT_CMU_AUD_NOC			121</div><div class='add'>+#define CLK_DOUT_CMU_BRP_NOC			122</div><div class='add'>+#define CLK_DOUT_CMU_CMU_BOOST			123</div><div class='add'>+#define CLK_DOUT_CMU_CMU_BOOST_CAM		124</div><div class='add'>+#define CLK_DOUT_CMU_CMU_BOOST_CPU		125</div><div class='add'>+#define CLK_DOUT_CMU_CMU_BOOST_MIF		126</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL0_NOCP		127</div><div class='add'>+#define CLK_DOUT_CMU_CSIS_DCPHY			128</div><div class='add'>+#define CLK_DOUT_CMU_CSIS_NOC			129</div><div class='add'>+#define CLK_DOUT_CMU_CSIS_OIS_MCU		130</div><div class='add'>+#define CLK_DOUT_CMU_CSTAT_NOC			131</div><div class='add'>+#define CLK_DOUT_CMU_DPUB_DSIM			132</div><div class='add'>+#define CLK_DOUT_CMU_LME_LME			133</div><div class='add'>+#define CLK_DOUT_CMU_G3D_NOCP			134</div><div class='add'>+#define CLK_DOUT_CMU_HSI0_DPGTC			135</div><div class='add'>+#define CLK_DOUT_CMU_HSI0_DPOSC			136</div><div class='add'>+#define CLK_DOUT_CMU_HSI0_NOC			137</div><div class='add'>+#define CLK_DOUT_CMU_HSI0_USB32DRD		138</div><div class='add'>+#define CLK_DOUT_CMU_HSI1_NOC			139</div><div class='add'>+#define CLK_DOUT_CMU_HSI1_PCIE			140</div><div class='add'>+#define CLK_DOUT_CMU_UFS_UFS_EMBD		141</div><div class='add'>+#define CLK_DOUT_CMU_LME_NOC			142</div><div class='add'>+#define CLK_DOUT_CMU_MFC0_MFC0			143</div><div class='add'>+#define CLK_DOUT_CMU_MFC0_WFD			144</div><div class='add'>+#define CLK_DOUT_CMU_MFC1_MFC1			145</div><div class='add'>+#define CLK_DOUT_CMU_MIF_NOCP			146</div><div class='add'>+#define CLK_DOUT_CMU_NOCL1B_NOC1		147</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_IP0			148</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_IP1			149</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_NOC			150</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_IP0			151</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_IP1			152</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_NOC			153</div><div class='add'>+#define CLK_DOUT_CMU_PERIC2_IP0			154</div><div class='add'>+#define CLK_DOUT_CMU_PERIC2_IP1			155</div><div class='add'>+#define CLK_DOUT_CMU_PERIC2_NOC			156</div><div class='add'>+#define CLK_DOUT_CMU_PERIS_GIC			157</div><div class='add'>+#define CLK_DOUT_CMU_PERIS_NOC			158</div><div class='add'>+#define CLK_DOUT_CMU_SSP_NOC			159</div><div class='add'>+#define CLK_DOUT_CMU_VTS_DMIC			160</div><div class='add'>+#define CLK_DOUT_CMU_YUVP_NOC			161</div><div class='add'>+#define CLK_DOUT_CMU_CP_SHARED1_CLK		162</div><div class='add'>+#define CLK_DOUT_CMU_DIV_AUD_AUDIF0		163</div><div class='add'>+#define CLK_DOUT_CMU_DIV_AUD_AUDIF0_SM		164</div><div class='add'>+#define CLK_DOUT_CMU_DIV_AUD_AUDIF1		165</div><div class='add'>+#define CLK_DOUT_CMU_DIV_AUD_AUDIF1_SM		166</div><div class='add'>+#define CLK_DOUT_CMU_DIV_AUD_CPU		167</div><div class='add'>+#define CLK_DOUT_CMU_DIV_AUD_CPU_SM		168</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CIS_CLK0		169</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CIS_CLK1		170</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CIS_CLK2		171</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CIS_CLK3		172</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CIS_CLK4		173</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CIS_CLK5		174</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CIS_CLK6		175</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CIS_CLK7		176</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CPUCL0_DBG_NOC		177</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CPUCL0_DBG_NOC_SM	178</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CPUCL0_SWITCH		179</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CPUCL0_SWITCH_SM	180</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CPUCL1_SWITCH		181</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CPUCL1_SWITCH_SM	182</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CPUCL2_SWITCH		183</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CPUCL2_SWITCH_SM	184</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DNC_NOC		185</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DNC_NOC_SM		186</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DPUB			187</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DPUB_ALT		188</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DPUF			189</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DPUF_ALT		190</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DSP_NOC		191</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DSP_NOC_SM		192</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DSU_SWITCH		193</div><div class='add'>+#define CLK_DOUT_CMU_DIV_DSU_SWITCH_SM		194</div><div class='add'>+#define CLK_DOUT_CMU_DIV_G3D_SWITCH		195</div><div class='add'>+#define CLK_DOUT_CMU_DIV_G3D_SWITCH_SM		196</div><div class='add'>+#define CLK_DOUT_CMU_DIV_GNPU_NOC		197</div><div class='add'>+#define CLK_DOUT_CMU_DIV_GNPU_NOC_SM		198</div><div class='add'>+#define CLK_DOUT_CMU_DIV_UFS_MMC_CARD		199</div><div class='add'>+#define CLK_DOUT_CMU_DIV_UFS_MMC_CARD_SM	200</div><div class='add'>+#define CLK_DOUT_CMU_DIV_M2M_NOC		201</div><div class='add'>+#define CLK_DOUT_CMU_DIV_M2M_NOC_SM		202</div><div class='add'>+#define CLK_DOUT_CMU_DIV_NOCL0_NOC		203</div><div class='add'>+#define CLK_DOUT_CMU_DIV_NOCL0_NOC_SM		204</div><div class='add'>+#define CLK_DOUT_CMU_DIV_NOCL1A_NOC		205</div><div class='add'>+#define CLK_DOUT_CMU_DIV_NOCL1A_NOC_SM		206</div><div class='add'>+#define CLK_DOUT_CMU_DIV_NOCL1B_NOC0		207</div><div class='add'>+#define CLK_DOUT_CMU_DIV_NOCL1B_NOC0_SM		208</div><div class='add'>+#define CLK_DOUT_CMU_DIV_NOCL1C_NOC		209</div><div class='add'>+#define CLK_DOUT_CMU_DIV_NOCL1C_NOC_SM		210</div><div class='add'>+#define CLK_DOUT_CMU_DIV_SDMA_NOC		211</div><div class='add'>+#define CLK_DOUT_CMU_DIV_SDMA_NOC_SM		212</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CP_HISPEEDY_CLK	213</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CP_HISPEEDY_CLK_SM	214</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CP_SHARED0_CLK		215</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CP_SHARED0_CLK_SM	216</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CP_SHARED2_CLK		217</div><div class='add'>+#define CLK_DOUT_CMU_DIV_CP_SHARED2_CLK_SM	218</div><div class='add'>+#define CLK_DOUT_CMU_UFS_NOC		219</div><div class='add'>+#define CLK_DOUT_CMU_DIV_M2M_FRC		220</div><div class='add'>+#define CLK_DOUT_CMU_DIV_M2M_FRC_SM		221</div><div class='add'>+#define CLK_DOUT_CMU_DIV_MCSC_MCSC		222</div><div class='add'>+#define CLK_DOUT_CMU_DIV_MCSC_MCSC_SM		223</div><div class='add'>+#define CLK_DOUT_CMU_DIV_MCSC_NOC		224</div><div class='add'>+#define CLK_DOUT_CMU_DIV_MCSC_NOC_SM		225</div><div class='add'>+#define CLK_DOUT_SHARED0_DIV1			226</div><div class='add'>+#define CLK_DOUT_SHARED0_DIV2			227</div><div class='add'>+#define CLK_DOUT_SHARED0_DIV4			228</div><div class='add'>+#define CLK_DOUT_SHARED1_DIV1			229</div><div class='add'>+#define CLK_DOUT_SHARED1_DIV2			230</div><div class='add'>+#define CLK_DOUT_SHARED1_DIV4			231</div><div class='add'>+#define CLK_DOUT_SHARED2_DIV1			232</div><div class='add'>+#define CLK_DOUT_SHARED2_DIV2			233</div><div class='add'>+#define CLK_DOUT_SHARED2_DIV4			234</div><div class='add'>+#define CLK_DOUT_SHARED3_DIV1			235</div><div class='add'>+#define CLK_DOUT_SHARED3_DIV2			236</div><div class='add'>+#define CLK_DOUT_SHARED3_DIV4			237</div><div class='add'>+#define CLK_DOUT_SHARED4_DIV1			238</div><div class='add'>+#define CLK_DOUT_SHARED4_DIV2			239</div><div class='add'>+#define CLK_DOUT_SHARED4_DIV4			240</div><div class='add'>+#define CLK_DOUT_SHARED_MIF_DIV1		241</div><div class='add'>+#define CLK_DOUT_SHARED_MIF_DIV2		242</div><div class='add'>+#define CLK_DOUT_SHARED_MIF_DIV4		243</div><div class='add'>+#define CLK_DOUT_TCXO_DIV3			244</div><div class='add'>+#define CLK_DOUT_TCXO_DIV4			245</div><div class='add'>+</div><div class='add'>+/* CMU_ALIVE */</div><div class='add'>+#define CLK_MOUT_ALIVE_NOC_USER			1</div><div class='add'>+#define CLK_MOUT_ALIVE_RCO_SPMI_USER		2</div><div class='add'>+#define CLK_MOUT_RCO_ALIVE_USER			3</div><div class='add'>+#define CLK_MOUT_ALIVE_CHUB_PERI		4</div><div class='add'>+#define CLK_MOUT_ALIVE_CMGP_NOC			5</div><div class='add'>+#define CLK_MOUT_ALIVE_CMGP_PERI		6</div><div class='add'>+#define CLK_MOUT_ALIVE_DBGCORE_NOC		7</div><div class='add'>+#define CLK_MOUT_ALIVE_DNC_NOC			8</div><div class='add'>+#define CLK_MOUT_ALIVE_CHUBVTS_NOC		9</div><div class='add'>+#define CLK_MOUT_ALIVE_GNPU_NOC			10</div><div class='add'>+#define CLK_MOUT_ALIVE_GNSS_NOC			11</div><div class='add'>+#define CLK_MOUT_ALIVE_SDMA_NOC			12</div><div class='add'>+#define CLK_MOUT_ALIVE_UFD_NOC			13</div><div class='add'>+#define CLK_MOUT_ALIVE_DBGCORE_UART		14</div><div class='add'>+#define CLK_MOUT_ALIVE_NOC			15</div><div class='add'>+#define CLK_MOUT_ALIVE_PMU_SUB			16</div><div class='add'>+#define CLK_MOUT_ALIVE_SPMI			17</div><div class='add'>+#define CLK_MOUT_ALIVE_TIMER			18</div><div class='add'>+#define CLK_MOUT_ALIVE_CSIS_NOC			19</div><div class='add'>+#define CLK_MOUT_ALIVE_DSP_NOC			20</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_ALIVE_CHUB_PERI		21</div><div class='add'>+#define CLK_DOUT_ALIVE_CMGP_NOC			22</div><div class='add'>+#define CLK_DOUT_ALIVE_CMGP_PERI		23</div><div class='add'>+#define CLK_DOUT_ALIVE_DBGCORE_NOC		24</div><div class='add'>+#define CLK_DOUT_ALIVE_DNC_NOC			25</div><div class='add'>+#define CLK_DOUT_ALIVE_CHUBVTS_NOC		26</div><div class='add'>+#define CLK_DOUT_ALIVE_GNPU_NOC			27</div><div class='add'>+#define CLK_DOUT_ALIVE_SDMA_NOC			28</div><div class='add'>+#define CLK_DOUT_ALIVE_UFD_NOC			29</div><div class='add'>+#define CLK_DOUT_ALIVE_DBGCORE_UART		30</div><div class='add'>+#define CLK_DOUT_ALIVE_NOC			31</div><div class='add'>+#define CLK_DOUT_ALIVE_PMU_SUB			32</div><div class='add'>+#define CLK_DOUT_ALIVE_SPMI			33</div><div class='add'>+#define CLK_DOUT_ALIVE_CSIS_NOC			34</div><div class='add'>+#define CLK_DOUT_ALIVE_DSP_NOC			35</div><div class='add'>+</div><div class='add'>+/* CMU_PERIS */</div><div class='add'>+#define CLK_MOUT_PERIS_GIC_USER			1</div><div class='add'>+#define CLK_MOUT_PERIS_NOC_USER			2</div><div class='add'>+#define CLK_MOUT_PERIS_GIC			3</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_PERIS_OTP			4</div><div class='add'>+#define CLK_DOUT_PERIS_DDD_CTRL			5</div><div class='add'>+</div><div class='add'>+/* CMU_CMGP */</div><div class='add'>+#define CLK_MOUT_CMGP_CLKALIVE_NOC_USER		1</div><div class='add'>+#define CLK_MOUT_CMGP_CLKALIVE_PERI_USER	2</div><div class='add'>+#define CLK_MOUT_CMGP_I2C			3</div><div class='add'>+#define CLK_MOUT_CMGP_SPI_I2C0			4</div><div class='add'>+#define CLK_MOUT_CMGP_SPI_I2C1			5</div><div class='add'>+#define CLK_MOUT_CMGP_SPI_MS_CTRL		6</div><div class='add'>+#define CLK_MOUT_CMGP_USI0			7</div><div class='add'>+#define CLK_MOUT_CMGP_USI1			8</div><div class='add'>+#define CLK_MOUT_CMGP_USI2			9</div><div class='add'>+#define CLK_MOUT_CMGP_USI3			10</div><div class='add'>+#define CLK_MOUT_CMGP_USI4			11</div><div class='add'>+#define CLK_MOUT_CMGP_USI5			12</div><div class='add'>+#define CLK_MOUT_CMGP_USI6			13</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_CMGP_I2C			14</div><div class='add'>+#define CLK_DOUT_CMGP_SPI_I2C0			15</div><div class='add'>+#define CLK_DOUT_CMGP_SPI_I2C1			16</div><div class='add'>+#define CLK_DOUT_CMGP_SPI_MS_CTRL		17</div><div class='add'>+#define CLK_DOUT_CMGP_USI0			18</div><div class='add'>+#define CLK_DOUT_CMGP_USI1			19</div><div class='add'>+#define CLK_DOUT_CMGP_USI2			20</div><div class='add'>+#define CLK_DOUT_CMGP_USI3			21</div><div class='add'>+#define CLK_DOUT_CMGP_USI4			22</div><div class='add'>+#define CLK_DOUT_CMGP_USI5			23</div><div class='add'>+#define CLK_DOUT_CMGP_USI6			24</div><div class='add'>+</div><div class='add'>+/* CMU_HSI0 */</div><div class='add'>+#define CLK_MOUT_CLKCMU_HSI0_DPGTC_USER		1</div><div class='add'>+#define CLK_MOUT_CLKCMU_HSI0_DPOSC_USER		2</div><div class='add'>+#define CLK_MOUT_CLKCMU_HSI0_NOC_USER		3</div><div class='add'>+#define CLK_MOUT_CLKCMU_HSI0_USB32DRD_USER	4</div><div class='add'>+#define CLK_MOUT_HSI0_NOC			5</div><div class='add'>+#define CLK_MOUT_HSI0_RTCCLK			6</div><div class='add'>+#define CLK_MOUT_HSI0_USB32DRD			7</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_DIV_CLK_HSI0_EUSB		8</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC0 */</div><div class='add'>+#define CLK_MOUT_PERIC0_IP0_USER		1</div><div class='add'>+#define CLK_MOUT_PERIC0_IP1_USER		2</div><div class='add'>+#define CLK_MOUT_PERIC0_NOC_USER		3</div><div class='add'>+#define CLK_MOUT_PERIC0_I2C			4</div><div class='add'>+#define CLK_MOUT_PERIC0_USI04			5</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_PERIC0_I2C			6</div><div class='add'>+#define CLK_DOUT_PERIC0_USI04			7</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC1 */</div><div class='add'>+#define CLK_MOUT_PERIC1_IP0_USER		1</div><div class='add'>+#define CLK_MOUT_PERIC1_IP1_USER		2</div><div class='add'>+#define CLK_MOUT_PERIC1_NOC_USER		3</div><div class='add'>+#define CLK_MOUT_PERIC1_I2C			4</div><div class='add'>+#define CLK_MOUT_PERIC1_SPI_MS_CTRL		5</div><div class='add'>+#define CLK_MOUT_PERIC1_UART_BT			6</div><div class='add'>+#define CLK_MOUT_PERIC1_USI07			7</div><div class='add'>+#define CLK_MOUT_PERIC1_USI07_SPI_I2C		8</div><div class='add'>+#define CLK_MOUT_PERIC1_USI08			9</div><div class='add'>+#define CLK_MOUT_PERIC1_USI08_SPI_I2C		10</div><div class='add'>+#define CLK_MOUT_PERIC1_USI09			11</div><div class='add'>+#define CLK_MOUT_PERIC1_USI10			12</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_PERIC1_I2C			13</div><div class='add'>+#define CLK_DOUT_PERIC1_SPI_MS_CTRL		14</div><div class='add'>+#define CLK_DOUT_PERIC1_UART_BT			15</div><div class='add'>+#define CLK_DOUT_PERIC1_USI07			16</div><div class='add'>+#define CLK_DOUT_PERIC1_USI07_SPI_I2C		17</div><div class='add'>+#define CLK_DOUT_PERIC1_USI08			18</div><div class='add'>+#define CLK_DOUT_PERIC1_USI08_SPI_I2C		19</div><div class='add'>+#define CLK_DOUT_PERIC1_USI09			20</div><div class='add'>+#define CLK_DOUT_PERIC1_USI10			21</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC2 */</div><div class='add'>+#define CLK_MOUT_PERIC2_IP0_USER		1</div><div class='add'>+#define CLK_MOUT_PERIC2_IP1_USER		2</div><div class='add'>+#define CLK_MOUT_PERIC2_NOC_USER		3</div><div class='add'>+#define CLK_MOUT_PERIC2_I2C			4</div><div class='add'>+#define CLK_MOUT_PERIC2_SPI_MS_CTRL		5</div><div class='add'>+#define CLK_MOUT_PERIC2_UART_DBG		6</div><div class='add'>+#define CLK_MOUT_PERIC2_USI00			7</div><div class='add'>+#define CLK_MOUT_PERIC2_USI00_SPI_I2C		8</div><div class='add'>+#define CLK_MOUT_PERIC2_USI01			9</div><div class='add'>+#define CLK_MOUT_PERIC2_USI01_SPI_I2C		10</div><div class='add'>+#define CLK_MOUT_PERIC2_USI02			11</div><div class='add'>+#define CLK_MOUT_PERIC2_USI03			12</div><div class='add'>+#define CLK_MOUT_PERIC2_USI05			13</div><div class='add'>+#define CLK_MOUT_PERIC2_USI06			14</div><div class='add'>+#define CLK_MOUT_PERIC2_USI11			15</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_PERIC2_I2C			16</div><div class='add'>+#define CLK_DOUT_PERIC2_SPI_MS_CTRL		17</div><div class='add'>+#define CLK_DOUT_PERIC2_UART_DBG		18</div><div class='add'>+#define CLK_DOUT_PERIC2_USI00			19</div><div class='add'>+#define CLK_DOUT_PERIC2_USI00_SPI_I2C		20</div><div class='add'>+#define CLK_DOUT_PERIC2_USI01			21</div><div class='add'>+#define CLK_DOUT_PERIC2_USI01_SPI_I2C		22</div><div class='add'>+#define CLK_DOUT_PERIC2_USI02			23</div><div class='add'>+#define CLK_DOUT_PERIC2_USI03			24</div><div class='add'>+#define CLK_DOUT_PERIC2_USI05			25</div><div class='add'>+#define CLK_DOUT_PERIC2_USI06			26</div><div class='add'>+#define CLK_DOUT_PERIC2_USI11			27</div><div class='add'>+</div><div class='add'>+/* CMU_UFS */</div><div class='add'>+#define CLK_MOUT_UFS_MMC_CARD_USER		1</div><div class='add'>+#define CLK_MOUT_UFS_NOC_USER			2</div><div class='add'>+#define CLK_MOUT_UFS_UFS_EMBD_USER		3</div><div class='add'>+</div><div class='add'>+/* CMU_VTS */</div><div class='add'>+#define CLK_MOUT_CLKALIVE_VTS_NOC_USER		1</div><div class='add'>+#define CLK_MOUT_CLKALIVE_VTS_RCO_USER		2</div><div class='add'>+#define CLK_MOUT_CLKCMU_VTS_DMIC_USER		3</div><div class='add'>+#define CLK_MOUT_CLKVTS_AUD_DMIC1		4</div><div class='add'>+#define CLK_MOUT_CLKVTS_NOC			5</div><div class='add'>+#define CLK_MOUT_CLKVTS_DMIC_PAD		6</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_CLKVTS_AUD_DMIC0		7</div><div class='add'>+#define CLK_DOUT_CLKVTS_AUD_DMIC1		8</div><div class='add'>+#define CLK_DOUT_CLKVTS_CPU			9</div><div class='add'>+#define CLK_DOUT_CLKVTS_DMIC_IF			10</div><div class='add'>+#define CLK_DOUT_CLKVTS_DMIC_IF_DIV2		11</div><div class='add'>+#define CLK_DOUT_CLKVTS_NOC			12</div><div class='add'>+#define CLK_DOUT_CLKVTS_SERIAL_LIF		13</div><div class='add'>+#define CLK_DOUT_CLKVTS_SERIAL_LIF_CORE		14</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/samsung,exynos7870-cmu.h b/include/dt-bindings/clock/samsung,exynos7870-cmu.h<br/>new file mode 100644<br/>index 000000000000..57d04bbe342d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/samsung,exynos7870-cmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/samsung,exynos7870-cmu.h</a></div><div class='hunk'>@@ -0,0 +1,324 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Author: Kaustabh Chakraborty &lt;kauschluss@disroot.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Device Tree binding constants for Exynos7870 clock controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_EXYNOS7870_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_EXYNOS7870_H</div><div class='add'>+</div><div class='add'>+/* CMU_MIF */</div><div class='add'>+#define CLK_DOUT_MIF_APB				1</div><div class='add'>+#define CLK_DOUT_MIF_BUSD				2</div><div class='add'>+#define CLK_DOUT_MIF_CMU_DISPAUD_BUS			3</div><div class='add'>+#define CLK_DOUT_MIF_CMU_DISPAUD_DECON_ECLK		4</div><div class='add'>+#define CLK_DOUT_MIF_CMU_DISPAUD_DECON_VCLK		5</div><div class='add'>+#define CLK_DOUT_MIF_CMU_FSYS_BUS			6</div><div class='add'>+#define CLK_DOUT_MIF_CMU_FSYS_MMC0			7</div><div class='add'>+#define CLK_DOUT_MIF_CMU_FSYS_MMC1			8</div><div class='add'>+#define CLK_DOUT_MIF_CMU_FSYS_MMC2			9</div><div class='add'>+#define CLK_DOUT_MIF_CMU_FSYS_USB20DRD_REFCLK		10</div><div class='add'>+#define CLK_DOUT_MIF_CMU_G3D_SWITCH			11</div><div class='add'>+#define CLK_DOUT_MIF_CMU_ISP_CAM			12</div><div class='add'>+#define CLK_DOUT_MIF_CMU_ISP_ISP			13</div><div class='add'>+#define CLK_DOUT_MIF_CMU_ISP_SENSOR0			14</div><div class='add'>+#define CLK_DOUT_MIF_CMU_ISP_SENSOR1			15</div><div class='add'>+#define CLK_DOUT_MIF_CMU_ISP_SENSOR2			16</div><div class='add'>+#define CLK_DOUT_MIF_CMU_ISP_VRA			17</div><div class='add'>+#define CLK_DOUT_MIF_CMU_MFCMSCL_MFC			18</div><div class='add'>+#define CLK_DOUT_MIF_CMU_MFCMSCL_MSCL			19</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_BUS			20</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_SPI0			21</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_SPI1			22</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_SPI2			23</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_SPI3			24</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_SPI4			25</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_UART0			26</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_UART1			27</div><div class='add'>+#define CLK_DOUT_MIF_CMU_PERI_UART2			28</div><div class='add'>+#define CLK_DOUT_MIF_HSI2C				29</div><div class='add'>+#define CLK_FOUT_MIF_BUS_PLL				30</div><div class='add'>+#define CLK_FOUT_MIF_MEDIA_PLL				31</div><div class='add'>+#define CLK_FOUT_MIF_MEM_PLL				32</div><div class='add'>+#define CLK_GOUT_MIF_CMU_DISPAUD_BUS			33</div><div class='add'>+#define CLK_GOUT_MIF_CMU_DISPAUD_DECON_ECLK		34</div><div class='add'>+#define CLK_GOUT_MIF_CMU_DISPAUD_DECON_VCLK		35</div><div class='add'>+#define CLK_GOUT_MIF_CMU_FSYS_BUS			36</div><div class='add'>+#define CLK_GOUT_MIF_CMU_FSYS_MMC0			37</div><div class='add'>+#define CLK_GOUT_MIF_CMU_FSYS_MMC1			38</div><div class='add'>+#define CLK_GOUT_MIF_CMU_FSYS_MMC2			39</div><div class='add'>+#define CLK_GOUT_MIF_CMU_FSYS_USB20DRD_REFCLK		40</div><div class='add'>+#define CLK_GOUT_MIF_CMU_G3D_SWITCH			41</div><div class='add'>+#define CLK_GOUT_MIF_CMU_ISP_CAM			42</div><div class='add'>+#define CLK_GOUT_MIF_CMU_ISP_ISP			43</div><div class='add'>+#define CLK_GOUT_MIF_CMU_ISP_SENSOR0			44</div><div class='add'>+#define CLK_GOUT_MIF_CMU_ISP_SENSOR1			45</div><div class='add'>+#define CLK_GOUT_MIF_CMU_ISP_SENSOR2			46</div><div class='add'>+#define CLK_GOUT_MIF_CMU_ISP_VRA			47</div><div class='add'>+#define CLK_GOUT_MIF_CMU_MFCMSCL_MFC			48</div><div class='add'>+#define CLK_GOUT_MIF_CMU_MFCMSCL_MSCL			49</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_BUS			50</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_SPI0			51</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_SPI1			52</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_SPI2			53</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_SPI3			54</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_SPI4			55</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_UART0			56</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_UART1			57</div><div class='add'>+#define CLK_GOUT_MIF_CMU_PERI_UART2			58</div><div class='add'>+#define CLK_GOUT_MIF_CP_PCLK_HSI2C			59</div><div class='add'>+#define CLK_GOUT_MIF_CP_PCLK_HSI2C_BAT_0		60</div><div class='add'>+#define CLK_GOUT_MIF_CP_PCLK_HSI2C_BAT_1		61</div><div class='add'>+#define CLK_GOUT_MIF_HSI2C_AP_PCLKM			62</div><div class='add'>+#define CLK_GOUT_MIF_HSI2C_AP_PCLKS			63</div><div class='add'>+#define CLK_GOUT_MIF_HSI2C_CP_PCLKM			64</div><div class='add'>+#define CLK_GOUT_MIF_HSI2C_CP_PCLKS			65</div><div class='add'>+#define CLK_GOUT_MIF_HSI2C_IPCLK			66</div><div class='add'>+#define CLK_GOUT_MIF_HSI2C_ITCLK			67</div><div class='add'>+#define CLK_GOUT_MIF_MUX_BUSD				68</div><div class='add'>+#define CLK_GOUT_MIF_MUX_BUS_PLL			69</div><div class='add'>+#define CLK_GOUT_MIF_MUX_BUS_PLL_CON			70</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_DISPAUD_BUS		71</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_DISPAUD_DECON_ECLK		72</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_DISPAUD_DECON_VCLK		73</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_FSYS_BUS			74</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_FSYS_MMC0			75</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_FSYS_MMC1			76</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_FSYS_MMC2			77</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_FSYS_USB20DRD_REFCLK	78</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_ISP_CAM			79</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_ISP_ISP			80</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_ISP_SENSOR0		81</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_ISP_SENSOR1		82</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_ISP_SENSOR2		83</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_ISP_VRA			84</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_MFCMSCL_MFC		85</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_MFCMSCL_MSCL		86</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_BUS			87</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_SPI0			88</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_SPI1			89</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_SPI2			90</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_SPI3			91</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_SPI4			92</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_UART0			93</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_UART1			94</div><div class='add'>+#define CLK_GOUT_MIF_MUX_CMU_PERI_UART2			95</div><div class='add'>+#define CLK_GOUT_MIF_MUX_MEDIA_PLL			96</div><div class='add'>+#define CLK_GOUT_MIF_MUX_MEDIA_PLL_CON			97</div><div class='add'>+#define CLK_GOUT_MIF_MUX_MEM_PLL			98</div><div class='add'>+#define CLK_GOUT_MIF_MUX_MEM_PLL_CON			99</div><div class='add'>+#define CLK_GOUT_MIF_WRAP_ADC_IF_OSC_SYS		100</div><div class='add'>+#define CLK_GOUT_MIF_WRAP_ADC_IF_PCLK_S0		101</div><div class='add'>+#define CLK_GOUT_MIF_WRAP_ADC_IF_PCLK_S1		102</div><div class='add'>+#define CLK_MOUT_MIF_BUSD				103</div><div class='add'>+#define CLK_MOUT_MIF_CMU_DISPAUD_BUS			104</div><div class='add'>+#define CLK_MOUT_MIF_CMU_DISPAUD_DECON_ECLK		105</div><div class='add'>+#define CLK_MOUT_MIF_CMU_DISPAUD_DECON_VCLK		106</div><div class='add'>+#define CLK_MOUT_MIF_CMU_FSYS_BUS			107</div><div class='add'>+#define CLK_MOUT_MIF_CMU_FSYS_MMC0			108</div><div class='add'>+#define CLK_MOUT_MIF_CMU_FSYS_MMC1			109</div><div class='add'>+#define CLK_MOUT_MIF_CMU_FSYS_MMC2			110</div><div class='add'>+#define CLK_MOUT_MIF_CMU_FSYS_USB20DRD_REFCLK		111</div><div class='add'>+#define CLK_MOUT_MIF_CMU_ISP_CAM			112</div><div class='add'>+#define CLK_MOUT_MIF_CMU_ISP_ISP			113</div><div class='add'>+#define CLK_MOUT_MIF_CMU_ISP_SENSOR0			114</div><div class='add'>+#define CLK_MOUT_MIF_CMU_ISP_SENSOR1			115</div><div class='add'>+#define CLK_MOUT_MIF_CMU_ISP_SENSOR2			116</div><div class='add'>+#define CLK_MOUT_MIF_CMU_ISP_VRA			117</div><div class='add'>+#define CLK_MOUT_MIF_CMU_MFCMSCL_MFC			118</div><div class='add'>+#define CLK_MOUT_MIF_CMU_MFCMSCL_MSCL			119</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_BUS			120</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_SPI0			121</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_SPI1			122</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_SPI2			123</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_SPI3			124</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_SPI4			125</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_UART0			126</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_UART1			127</div><div class='add'>+#define CLK_MOUT_MIF_CMU_PERI_UART2			128</div><div class='add'>+#define MIF_NR_CLK					129</div><div class='add'>+</div><div class='add'>+/* CMU_DISPAUD */</div><div class='add'>+#define CLK_DOUT_DISPAUD_APB					1</div><div class='add'>+#define CLK_DOUT_DISPAUD_DECON_ECLK				2</div><div class='add'>+#define CLK_DOUT_DISPAUD_DECON_VCLK				3</div><div class='add'>+#define CLK_DOUT_DISPAUD_MI2S					4</div><div class='add'>+#define CLK_DOUT_DISPAUD_MIXER					5</div><div class='add'>+#define CLK_FOUT_DISPAUD_AUD_PLL				6</div><div class='add'>+#define CLK_FOUT_DISPAUD_PLL					7</div><div class='add'>+#define CLK_GOUT_DISPAUD_APB_AUD				8</div><div class='add'>+#define CLK_GOUT_DISPAUD_APB_AUD_AMP				9</div><div class='add'>+#define CLK_GOUT_DISPAUD_APB_DISP				10</div><div class='add'>+#define CLK_GOUT_DISPAUD_BUS					11</div><div class='add'>+#define CLK_GOUT_DISPAUD_BUS_DISP				12</div><div class='add'>+#define CLK_GOUT_DISPAUD_BUS_PPMU				13</div><div class='add'>+#define CLK_GOUT_DISPAUD_CON_AUD_I2S_BCLK_BT_IN			14</div><div class='add'>+#define CLK_GOUT_DISPAUD_CON_AUD_I2S_BCLK_FM_IN			15</div><div class='add'>+#define CLK_GOUT_DISPAUD_CON_CP2AUD_BCK				16</div><div class='add'>+#define CLK_GOUT_DISPAUD_CON_EXT2AUD_BCK_GPIO_I2S		17</div><div class='add'>+#define CLK_GOUT_DISPAUD_DECON_ECLK				18</div><div class='add'>+#define CLK_GOUT_DISPAUD_DECON_VCLK				19</div><div class='add'>+#define CLK_GOUT_DISPAUD_MI2S_AMP_I2SCODCLKI			20</div><div class='add'>+#define CLK_GOUT_DISPAUD_MI2S_AUD_I2SCODCLKI			21</div><div class='add'>+#define CLK_GOUT_DISPAUD_MIXER_AUD_SYSCLK			22</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_AUD_PLL				23</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_AUD_PLL_CON			24</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_BUS_USER				25</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_DECON_ECLK				26</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_DECON_ECLK_USER			27</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_DECON_VCLK				28</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_DECON_VCLK_USER			29</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_MI2S				30</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_MIPIPHY_RXCLKESC0_USER		31</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_MIPIPHY_RXCLKESC0_USER_CON		32</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_MIPIPHY_TXBYTECLKHS_USER		33</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_MIPIPHY_TXBYTECLKHS_USER_CON	34</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_PLL				35</div><div class='add'>+#define CLK_GOUT_DISPAUD_MUX_PLL_CON				36</div><div class='add'>+#define CLK_MOUT_DISPAUD_BUS_USER				37</div><div class='add'>+#define CLK_MOUT_DISPAUD_DECON_ECLK				38</div><div class='add'>+#define CLK_MOUT_DISPAUD_DECON_ECLK_USER			39</div><div class='add'>+#define CLK_MOUT_DISPAUD_DECON_VCLK				40</div><div class='add'>+#define CLK_MOUT_DISPAUD_DECON_VCLK_USER			41</div><div class='add'>+#define CLK_MOUT_DISPAUD_MI2S					42</div><div class='add'>+#define DISPAUD_NR_CLK						43</div><div class='add'>+</div><div class='add'>+/* CMU_FSYS */</div><div class='add'>+#define CLK_FOUT_FSYS_USB_PLL				1</div><div class='add'>+#define CLK_GOUT_FSYS_BUSP3_HCLK			2</div><div class='add'>+#define CLK_GOUT_FSYS_MMC0_ACLK				3</div><div class='add'>+#define CLK_GOUT_FSYS_MMC1_ACLK				4</div><div class='add'>+#define CLK_GOUT_FSYS_MMC2_ACLK				5</div><div class='add'>+#define CLK_GOUT_FSYS_MUX_USB20DRD_PHYCLOCK_USER	6</div><div class='add'>+#define CLK_GOUT_FSYS_MUX_USB20DRD_PHYCLOCK_USER_CON	7</div><div class='add'>+#define CLK_GOUT_FSYS_MUX_USB_PLL			8</div><div class='add'>+#define CLK_GOUT_FSYS_MUX_USB_PLL_CON			9</div><div class='add'>+#define CLK_GOUT_FSYS_PDMA0_ACLK_PDMA0			10</div><div class='add'>+#define CLK_GOUT_FSYS_PPMU_ACLK				11</div><div class='add'>+#define CLK_GOUT_FSYS_PPMU_PCLK				12</div><div class='add'>+#define CLK_GOUT_FSYS_SROMC_HCLK			13</div><div class='add'>+#define CLK_GOUT_FSYS_UPSIZER_BUS1_ACLK			14</div><div class='add'>+#define CLK_GOUT_FSYS_USB20DRD_ACLK_HSDRD		15</div><div class='add'>+#define CLK_GOUT_FSYS_USB20DRD_HCLK_USB20_CTRL		16</div><div class='add'>+#define CLK_GOUT_FSYS_USB20DRD_HSDRD_REF_CLK		17</div><div class='add'>+#define FSYS_NR_CLK					18</div><div class='add'>+</div><div class='add'>+/* CMU_G3D */</div><div class='add'>+#define CLK_DOUT_G3D_APB		1</div><div class='add'>+#define CLK_DOUT_G3D_BUS		2</div><div class='add'>+#define CLK_FOUT_G3D_PLL		3</div><div class='add'>+#define CLK_GOUT_G3D_ASYNCS_D0_CLK	4</div><div class='add'>+#define CLK_GOUT_G3D_ASYNC_PCLKM	5</div><div class='add'>+#define CLK_GOUT_G3D_CLK		6</div><div class='add'>+#define CLK_GOUT_G3D_MUX		7</div><div class='add'>+#define CLK_GOUT_G3D_MUX_PLL		8</div><div class='add'>+#define CLK_GOUT_G3D_MUX_PLL_CON	9</div><div class='add'>+#define CLK_GOUT_G3D_MUX_SWITCH_USER	10</div><div class='add'>+#define CLK_GOUT_G3D_PPMU_ACLK		11</div><div class='add'>+#define CLK_GOUT_G3D_PPMU_PCLK		12</div><div class='add'>+#define CLK_GOUT_G3D_QE_ACLK		13</div><div class='add'>+#define CLK_GOUT_G3D_QE_PCLK		14</div><div class='add'>+#define CLK_GOUT_G3D_SYSREG_PCLK	15</div><div class='add'>+#define CLK_MOUT_G3D			16</div><div class='add'>+#define CLK_MOUT_G3D_SWITCH_USER	17</div><div class='add'>+#define G3D_NR_CLK			18</div><div class='add'>+</div><div class='add'>+/* CMU_ISP */</div><div class='add'>+#define CLK_DOUT_ISP_APB				1</div><div class='add'>+#define CLK_DOUT_ISP_CAM_HALF				2</div><div class='add'>+#define CLK_FOUT_ISP_PLL				3</div><div class='add'>+#define CLK_GOUT_ISP_CAM				4</div><div class='add'>+#define CLK_GOUT_ISP_CAM_HALF				5</div><div class='add'>+#define CLK_GOUT_ISP_ISPD				6</div><div class='add'>+#define CLK_GOUT_ISP_ISPD_PPMU				7</div><div class='add'>+#define CLK_GOUT_ISP_MUX_CAM				8</div><div class='add'>+#define CLK_GOUT_ISP_MUX_CAM_USER			9</div><div class='add'>+#define CLK_GOUT_ISP_MUX_ISP				10</div><div class='add'>+#define CLK_GOUT_ISP_MUX_ISPD				11</div><div class='add'>+#define CLK_GOUT_ISP_MUX_PLL				12</div><div class='add'>+#define CLK_GOUT_ISP_MUX_PLL_CON			13</div><div class='add'>+#define CLK_GOUT_ISP_MUX_RXBYTECLKHS0_SENSOR0_USER	14</div><div class='add'>+#define CLK_GOUT_ISP_MUX_RXBYTECLKHS0_SENSOR0_USER_CON	15</div><div class='add'>+#define CLK_GOUT_ISP_MUX_RXBYTECLKHS0_SENSOR1_USER	16</div><div class='add'>+#define CLK_GOUT_ISP_MUX_RXBYTECLKHS0_SENSOR1_USER_CON	17</div><div class='add'>+#define CLK_GOUT_ISP_MUX_USER				18</div><div class='add'>+#define CLK_GOUT_ISP_MUX_VRA				19</div><div class='add'>+#define CLK_GOUT_ISP_MUX_VRA_USER			20</div><div class='add'>+#define CLK_GOUT_ISP_VRA				21</div><div class='add'>+#define CLK_MOUT_ISP_CAM				22</div><div class='add'>+#define CLK_MOUT_ISP_CAM_USER				23</div><div class='add'>+#define CLK_MOUT_ISP_ISP				24</div><div class='add'>+#define CLK_MOUT_ISP_ISPD				25</div><div class='add'>+#define CLK_MOUT_ISP_USER				26</div><div class='add'>+#define CLK_MOUT_ISP_VRA				27</div><div class='add'>+#define CLK_MOUT_ISP_VRA_USER				28</div><div class='add'>+#define ISP_NR_CLK					29</div><div class='add'>+</div><div class='add'>+/* CMU_MFCMSCL */</div><div class='add'>+#define CLK_DOUT_MFCMSCL_APB		1</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MFC		2</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MSCL		3</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MSCL_BI	4</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MSCL_D		5</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MSCL_JPEG	6</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MSCL_POLY	7</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MSCL_PPMU	8</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MUX_MFC_USER	9</div><div class='add'>+#define CLK_GOUT_MFCMSCL_MUX_MSCL_USER	10</div><div class='add'>+#define CLK_MOUT_MFCMSCL_MFC_USER	11</div><div class='add'>+#define CLK_MOUT_MFCMSCL_MSCL_USER	12</div><div class='add'>+#define MFCMSCL_NR_CLK			13</div><div class='add'>+</div><div class='add'>+/* CMU_PERI */</div><div class='add'>+#define CLK_GOUT_PERI_BUSP1_PERIC0_HCLK		1</div><div class='add'>+#define CLK_GOUT_PERI_GPIO2_PCLK		2</div><div class='add'>+#define CLK_GOUT_PERI_GPIO5_PCLK		3</div><div class='add'>+#define CLK_GOUT_PERI_GPIO6_PCLK		4</div><div class='add'>+#define CLK_GOUT_PERI_GPIO7_PCLK		5</div><div class='add'>+#define CLK_GOUT_PERI_HSI2C1_IPCLK		6</div><div class='add'>+#define CLK_GOUT_PERI_HSI2C2_IPCLK		7</div><div class='add'>+#define CLK_GOUT_PERI_HSI2C3_IPCLK		8</div><div class='add'>+#define CLK_GOUT_PERI_HSI2C4_IPCLK		9</div><div class='add'>+#define CLK_GOUT_PERI_HSI2C5_IPCLK		10</div><div class='add'>+#define CLK_GOUT_PERI_HSI2C6_IPCLK		11</div><div class='add'>+#define CLK_GOUT_PERI_I2C0_PCLK			12</div><div class='add'>+#define CLK_GOUT_PERI_I2C1_PCLK			13</div><div class='add'>+#define CLK_GOUT_PERI_I2C2_PCLK			14</div><div class='add'>+#define CLK_GOUT_PERI_I2C3_PCLK			15</div><div class='add'>+#define CLK_GOUT_PERI_I2C4_PCLK			16</div><div class='add'>+#define CLK_GOUT_PERI_I2C5_PCLK			17</div><div class='add'>+#define CLK_GOUT_PERI_I2C6_PCLK			18</div><div class='add'>+#define CLK_GOUT_PERI_I2C7_PCLK			19</div><div class='add'>+#define CLK_GOUT_PERI_I2C8_PCLK			20</div><div class='add'>+#define CLK_GOUT_PERI_MCT_PCLK			21</div><div class='add'>+#define CLK_GOUT_PERI_PWM_MOTOR_OSCCLK		22</div><div class='add'>+#define CLK_GOUT_PERI_PWM_MOTOR_PCLK_S0		23</div><div class='add'>+#define CLK_GOUT_PERI_SFRIF_TMU_CPUCL0_PCLK	24</div><div class='add'>+#define CLK_GOUT_PERI_SFRIF_TMU_CPUCL1_PCLK	25</div><div class='add'>+#define CLK_GOUT_PERI_SFRIF_TMU_PCLK		26</div><div class='add'>+#define CLK_GOUT_PERI_SPI0_PCLK			27</div><div class='add'>+#define CLK_GOUT_PERI_SPI0_SPI_EXT_CLK		28</div><div class='add'>+#define CLK_GOUT_PERI_SPI1_PCLK			29</div><div class='add'>+#define CLK_GOUT_PERI_SPI1_SPI_EXT_CLK		30</div><div class='add'>+#define CLK_GOUT_PERI_SPI2_PCLK			31</div><div class='add'>+#define CLK_GOUT_PERI_SPI2_SPI_EXT_CLK		32</div><div class='add'>+#define CLK_GOUT_PERI_SPI3_PCLK			33</div><div class='add'>+#define CLK_GOUT_PERI_SPI3_SPI_EXT_CLK		34</div><div class='add'>+#define CLK_GOUT_PERI_SPI4_PCLK			35</div><div class='add'>+#define CLK_GOUT_PERI_SPI4_SPI_EXT_CLK		36</div><div class='add'>+#define CLK_GOUT_PERI_TMU_CLK			37</div><div class='add'>+#define CLK_GOUT_PERI_TMU_CPUCL0_CLK		38</div><div class='add'>+#define CLK_GOUT_PERI_TMU_CPUCL1_CLK		39</div><div class='add'>+#define CLK_GOUT_PERI_UART0_EXT_UCLK		40</div><div class='add'>+#define CLK_GOUT_PERI_UART0_PCLK		41</div><div class='add'>+#define CLK_GOUT_PERI_UART1_EXT_UCLK		42</div><div class='add'>+#define CLK_GOUT_PERI_UART1_PCLK		43</div><div class='add'>+#define CLK_GOUT_PERI_UART2_EXT_UCLK		44</div><div class='add'>+#define CLK_GOUT_PERI_UART2_PCLK		45</div><div class='add'>+#define CLK_GOUT_PERI_WDT_CPUCL0_PCLK		46</div><div class='add'>+#define CLK_GOUT_PERI_WDT_CPUCL1_PCLK		47</div><div class='add'>+#define PERI_NR_CLK				48</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLOCK_EXYNOS7870_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/samsung,exynos8895.h b/include/dt-bindings/clock/samsung,exynos8895.h<br/>new file mode 100644<br/>index 000000000000..27998c53f929<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/samsung,exynos8895.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/samsung,exynos8895.h</a></div><div class='hunk'>@@ -0,0 +1,453 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Ivaylo Ivanov &lt;ivo.ivanov.ivanov1@gmail.com&gt;</div><div class='add'>+ * Author: Ivaylo Ivanov &lt;ivo.ivanov.ivanov1@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Device Tree binding constants for Exynos8895 clock controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_EXYNOS8895_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_EXYNOS8895_H</div><div class='add'>+</div><div class='add'>+/* CMU_TOP */</div><div class='add'>+#define CLK_FOUT_SHARED0_PLL			1</div><div class='add'>+#define CLK_FOUT_SHARED1_PLL			2</div><div class='add'>+#define CLK_FOUT_SHARED2_PLL			3</div><div class='add'>+#define CLK_FOUT_SHARED3_PLL			4</div><div class='add'>+#define CLK_FOUT_SHARED4_PLL			5</div><div class='add'>+#define CLK_MOUT_PLL_SHARED0			6</div><div class='add'>+#define CLK_MOUT_PLL_SHARED1			7</div><div class='add'>+#define CLK_MOUT_PLL_SHARED2			8</div><div class='add'>+#define CLK_MOUT_PLL_SHARED3			9</div><div class='add'>+#define CLK_MOUT_PLL_SHARED4			10</div><div class='add'>+#define CLK_MOUT_CP2AP_MIF_CLK_USER		11</div><div class='add'>+#define CLK_MOUT_CMU_ABOX_CPUABOX		12</div><div class='add'>+#define CLK_MOUT_CMU_APM_BUS			13</div><div class='add'>+#define CLK_MOUT_CMU_BUS1_BUS			14</div><div class='add'>+#define CLK_MOUT_CMU_BUSC_BUS			15</div><div class='add'>+#define CLK_MOUT_CMU_BUSC_BUSPHSI2C		16</div><div class='add'>+#define CLK_MOUT_CMU_CAM_BUS			17</div><div class='add'>+#define CLK_MOUT_CMU_CAM_TPU0			18</div><div class='add'>+#define CLK_MOUT_CMU_CAM_TPU1			19</div><div class='add'>+#define CLK_MOUT_CMU_CAM_VRA			20</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK0			21</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK1			22</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK2			23</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK3			24</div><div class='add'>+#define CLK_MOUT_CMU_CORE_BUS			25</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL0_SWITCH		26</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL1_SWITCH		27</div><div class='add'>+#define CLK_MOUT_CMU_DBG_BUS			28</div><div class='add'>+#define CLK_MOUT_CMU_DCAM_BUS			29</div><div class='add'>+#define CLK_MOUT_CMU_DCAM_IMGD			30</div><div class='add'>+#define CLK_MOUT_CMU_DPU_BUS			31</div><div class='add'>+#define CLK_MOUT_CMU_DROOPDETECTOR		32</div><div class='add'>+#define CLK_MOUT_CMU_DSP_BUS			33</div><div class='add'>+#define CLK_MOUT_CMU_FSYS0_BUS			34</div><div class='add'>+#define CLK_MOUT_CMU_FSYS0_DPGTC		35</div><div class='add'>+#define CLK_MOUT_CMU_FSYS0_MMC_EMBD		36</div><div class='add'>+#define CLK_MOUT_CMU_FSYS0_UFS_EMBD		37</div><div class='add'>+#define CLK_MOUT_CMU_FSYS0_USBDRD30		38</div><div class='add'>+#define CLK_MOUT_CMU_FSYS1_BUS			39</div><div class='add'>+#define CLK_MOUT_CMU_FSYS1_MMC_CARD		40</div><div class='add'>+#define CLK_MOUT_CMU_FSYS1_PCIE			41</div><div class='add'>+#define CLK_MOUT_CMU_FSYS1_UFS_CARD		42</div><div class='add'>+#define CLK_MOUT_CMU_G2D_G2D			43</div><div class='add'>+#define CLK_MOUT_CMU_G2D_JPEG			44</div><div class='add'>+#define CLK_MOUT_CMU_HPM			45</div><div class='add'>+#define CLK_MOUT_CMU_IMEM_BUS			46</div><div class='add'>+#define CLK_MOUT_CMU_ISPHQ_BUS			47</div><div class='add'>+#define CLK_MOUT_CMU_ISPLP_BUS			48</div><div class='add'>+#define CLK_MOUT_CMU_IVA_BUS			49</div><div class='add'>+#define CLK_MOUT_CMU_MFC_BUS			50</div><div class='add'>+#define CLK_MOUT_CMU_MIF_SWITCH			51</div><div class='add'>+#define CLK_MOUT_CMU_PERIC0_BUS			52</div><div class='add'>+#define CLK_MOUT_CMU_PERIC0_UART_DBG		53</div><div class='add'>+#define CLK_MOUT_CMU_PERIC0_USI00		54</div><div class='add'>+#define CLK_MOUT_CMU_PERIC0_USI01		55</div><div class='add'>+#define CLK_MOUT_CMU_PERIC0_USI02		56</div><div class='add'>+#define CLK_MOUT_CMU_PERIC0_USI03		57</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_BUS			58</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_SPEEDY2		59</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_SPI_CAM0		60</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_SPI_CAM1		61</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_UART_BT		62</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI04		63</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI05		64</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI06		65</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI07		66</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI08		67</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI09		68</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI10		69</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI11		70</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI12		71</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_USI13		72</div><div class='add'>+#define CLK_MOUT_CMU_PERIS_BUS			73</div><div class='add'>+#define CLK_MOUT_CMU_SRDZ_BUS			74</div><div class='add'>+#define CLK_MOUT_CMU_SRDZ_IMGD			75</div><div class='add'>+#define CLK_MOUT_CMU_VPU_BUS			76</div><div class='add'>+#define CLK_DOUT_CMU_ABOX_CPUABOX		77</div><div class='add'>+#define CLK_DOUT_CMU_APM_BUS			78</div><div class='add'>+#define CLK_DOUT_CMU_BUS1_BUS			79</div><div class='add'>+#define CLK_DOUT_CMU_BUSC_BUS			80</div><div class='add'>+#define CLK_DOUT_CMU_BUSC_BUSPHSI2C		81</div><div class='add'>+#define CLK_DOUT_CMU_CAM_BUS			82</div><div class='add'>+#define CLK_DOUT_CMU_CAM_TPU0			83</div><div class='add'>+#define CLK_DOUT_CMU_CAM_TPU1			84</div><div class='add'>+#define CLK_DOUT_CMU_CAM_VRA			85</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK0			86</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK1			87</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK2			88</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK3			89</div><div class='add'>+#define CLK_DOUT_CMU_CORE_BUS			90</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL0_SWITCH		91</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL1_SWITCH		92</div><div class='add'>+#define CLK_DOUT_CMU_DBG_BUS			93</div><div class='add'>+#define CLK_DOUT_CMU_DCAM_BUS			94</div><div class='add'>+#define CLK_DOUT_CMU_DCAM_IMGD			95</div><div class='add'>+#define CLK_DOUT_CMU_DPU_BUS			96</div><div class='add'>+#define CLK_DOUT_CMU_DSP_BUS			97</div><div class='add'>+#define CLK_DOUT_CMU_FSYS0_BUS			98</div><div class='add'>+#define CLK_DOUT_CMU_FSYS0_DPGTC		99</div><div class='add'>+#define CLK_DOUT_CMU_FSYS0_MMC_EMBD		100</div><div class='add'>+#define CLK_DOUT_CMU_FSYS0_UFS_EMBD		101</div><div class='add'>+#define CLK_DOUT_CMU_FSYS0_USBDRD30		102</div><div class='add'>+#define CLK_DOUT_CMU_FSYS1_BUS			103</div><div class='add'>+#define CLK_DOUT_CMU_FSYS1_MMC_CARD		104</div><div class='add'>+#define CLK_DOUT_CMU_FSYS1_UFS_CARD		105</div><div class='add'>+#define CLK_DOUT_CMU_G2D_G2D			106</div><div class='add'>+#define CLK_DOUT_CMU_G2D_JPEG			107</div><div class='add'>+#define CLK_DOUT_CMU_G3D_SWITCH			108</div><div class='add'>+#define CLK_DOUT_CMU_HPM			109</div><div class='add'>+#define CLK_DOUT_CMU_IMEM_BUS			110</div><div class='add'>+#define CLK_DOUT_CMU_ISPHQ_BUS			111</div><div class='add'>+#define CLK_DOUT_CMU_ISPLP_BUS			112</div><div class='add'>+#define CLK_DOUT_CMU_IVA_BUS			113</div><div class='add'>+#define CLK_DOUT_CMU_MFC_BUS			114</div><div class='add'>+#define CLK_DOUT_CMU_MODEM_SHARED0		115</div><div class='add'>+#define CLK_DOUT_CMU_MODEM_SHARED1		116</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_BUS			117</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_UART_DBG		118</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_USI00		119</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_USI01		120</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_USI02		121</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_USI03		122</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_BUS			123</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_SPEEDY2		124</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_SPI_CAM0		125</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_SPI_CAM1		126</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_UART_BT		127</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI04		128</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI05		129</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI06		130</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI07		131</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI08		132</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI09		133</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI10		134</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI11		135</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI12		136</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_USI13		137</div><div class='add'>+#define CLK_DOUT_CMU_PERIS_BUS			138</div><div class='add'>+#define CLK_DOUT_CMU_SRDZ_BUS			139</div><div class='add'>+#define CLK_DOUT_CMU_SRDZ_IMGD			140</div><div class='add'>+#define CLK_DOUT_CMU_VPU_BUS			141</div><div class='add'>+#define CLK_DOUT_CMU_SHARED0_DIV2		142</div><div class='add'>+#define CLK_DOUT_CMU_SHARED0_DIV4		143</div><div class='add'>+#define CLK_DOUT_CMU_SHARED1_DIV2		144</div><div class='add'>+#define CLK_DOUT_CMU_SHARED1_DIV4		145</div><div class='add'>+#define CLK_DOUT_CMU_SHARED2_DIV2		146</div><div class='add'>+#define CLK_DOUT_CMU_SHARED3_DIV2		147</div><div class='add'>+#define CLK_DOUT_CMU_SHARED4_DIV2		148</div><div class='add'>+#define CLK_DOUT_CMU_FSYS1_PCIE			149</div><div class='add'>+#define CLK_DOUT_CMU_CP2AP_MIF_CLK_DIV2		150</div><div class='add'>+#define CLK_DOUT_CMU_CMU_OTP			151</div><div class='add'>+#define CLK_GOUT_CMU_DROOPDETECTOR		152</div><div class='add'>+#define CLK_GOUT_CMU_MIF_SWITCH			153</div><div class='add'>+#define CLK_GOUT_CMU_ABOX_CPUABOX		154</div><div class='add'>+#define CLK_GOUT_CMU_APM_BUS			155</div><div class='add'>+#define CLK_GOUT_CMU_BUS1_BUS			156</div><div class='add'>+#define CLK_GOUT_CMU_BUSC_BUS			157</div><div class='add'>+#define CLK_GOUT_CMU_BUSC_BUSPHSI2C		158</div><div class='add'>+#define CLK_GOUT_CMU_CAM_BUS			159</div><div class='add'>+#define CLK_GOUT_CMU_CAM_TPU0			160</div><div class='add'>+#define CLK_GOUT_CMU_CAM_TPU1			161</div><div class='add'>+#define CLK_GOUT_CMU_CAM_VRA			162</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK0			163</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK1			164</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK2			165</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK3			166</div><div class='add'>+#define CLK_GOUT_CMU_CORE_BUS			167</div><div class='add'>+#define CLK_GOUT_CMU_CPUCL0_SWITCH		168</div><div class='add'>+#define CLK_GOUT_CMU_CPUCL1_SWITCH		169</div><div class='add'>+#define CLK_GOUT_CMU_DBG_BUS			170</div><div class='add'>+#define CLK_GOUT_CMU_DCAM_BUS			171</div><div class='add'>+#define CLK_GOUT_CMU_DCAM_IMGD			172</div><div class='add'>+#define CLK_GOUT_CMU_DPU_BUS			173</div><div class='add'>+#define CLK_GOUT_CMU_DSP_BUS			174</div><div class='add'>+#define CLK_GOUT_CMU_FSYS0_BUS			175</div><div class='add'>+#define CLK_GOUT_CMU_FSYS0_DPGTC		176</div><div class='add'>+#define CLK_GOUT_CMU_FSYS0_MMC_EMBD		177</div><div class='add'>+#define CLK_GOUT_CMU_FSYS0_UFS_EMBD		178</div><div class='add'>+#define CLK_GOUT_CMU_FSYS0_USBDRD30		179</div><div class='add'>+#define CLK_GOUT_CMU_FSYS1_BUS			180</div><div class='add'>+#define CLK_GOUT_CMU_FSYS1_MMC_CARD		181</div><div class='add'>+#define CLK_GOUT_CMU_FSYS1_PCIE			182</div><div class='add'>+#define CLK_GOUT_CMU_FSYS1_UFS_CARD		183</div><div class='add'>+#define CLK_GOUT_CMU_G2D_G2D			184</div><div class='add'>+#define CLK_GOUT_CMU_G2D_JPEG			185</div><div class='add'>+#define CLK_GOUT_CMU_G3D_SWITCH			186</div><div class='add'>+#define CLK_GOUT_CMU_HPM			187</div><div class='add'>+#define CLK_GOUT_CMU_IMEM_BUS			188</div><div class='add'>+#define CLK_GOUT_CMU_ISPHQ_BUS			189</div><div class='add'>+#define CLK_GOUT_CMU_ISPLP_BUS			190</div><div class='add'>+#define CLK_GOUT_CMU_IVA_BUS			191</div><div class='add'>+#define CLK_GOUT_CMU_MFC_BUS			192</div><div class='add'>+#define CLK_GOUT_CMU_MODEM_SHARED0		193</div><div class='add'>+#define CLK_GOUT_CMU_MODEM_SHARED1		194</div><div class='add'>+#define CLK_GOUT_CMU_PERIC0_BUS			195</div><div class='add'>+#define CLK_GOUT_CMU_PERIC0_UART_DBG		196</div><div class='add'>+#define CLK_GOUT_CMU_PERIC0_USI00		197</div><div class='add'>+#define CLK_GOUT_CMU_PERIC0_USI01		198</div><div class='add'>+#define CLK_GOUT_CMU_PERIC0_USI02		199</div><div class='add'>+#define CLK_GOUT_CMU_PERIC0_USI03		200</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_BUS			201</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_SPEEDY2		202</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_SPI_CAM0		203</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_SPI_CAM1		204</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_UART_BT		205</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI04		206</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI05		207</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI06		208</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI07		209</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI08		210</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI09		211</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI10		212</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI11		213</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI12		214</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_USI13		215</div><div class='add'>+#define CLK_GOUT_CMU_PERIS_BUS			216</div><div class='add'>+#define CLK_GOUT_CMU_SRDZ_BUS			217</div><div class='add'>+#define CLK_GOUT_CMU_SRDZ_IMGD			218</div><div class='add'>+#define CLK_GOUT_CMU_VPU_BUS			219</div><div class='add'>+</div><div class='add'>+/* CMU_PERIS */</div><div class='add'>+#define CLK_MOUT_PERIS_BUS_USER				1</div><div class='add'>+#define CLK_MOUT_PERIS_GIC				2</div><div class='add'>+#define CLK_GOUT_PERIS_CMU_PERIS_PCLK			3</div><div class='add'>+#define CLK_GOUT_PERIS_AD_AXI_P_PERIS_ACLKM		4</div><div class='add'>+#define CLK_GOUT_PERIS_AD_AXI_P_PERIS_ACLKS		5</div><div class='add'>+#define CLK_GOUT_PERIS_AXI2APB_PERISP0_ACLK		6</div><div class='add'>+#define CLK_GOUT_PERIS_AXI2APB_PERISP1_ACLK		7</div><div class='add'>+#define CLK_GOUT_PERIS_BUSIF_TMU_PCLK			8</div><div class='add'>+#define CLK_GOUT_PERIS_GIC_CLK				9</div><div class='add'>+#define CLK_GOUT_PERIS_LHM_AXI_P_PERIS_I_CLK		10</div><div class='add'>+#define CLK_GOUT_PERIS_MCT_PCLK				11</div><div class='add'>+#define CLK_GOUT_PERIS_OTP_CON_BIRA_PCLK		12</div><div class='add'>+#define CLK_GOUT_PERIS_OTP_CON_TOP_PCLK			13</div><div class='add'>+#define CLK_GOUT_PERIS_PMU_PERIS_PCLK			14</div><div class='add'>+#define CLK_GOUT_PERIS_RSTNSYNC_CLK_PERIS_BUSP_CLK	15</div><div class='add'>+#define CLK_GOUT_PERIS_RSTNSYNC_CLK_PERIS_GIC_CLK	16</div><div class='add'>+#define CLK_GOUT_PERIS_SYSREG_PERIS_PCLK		17</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC00_PCLK			18</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC01_PCLK			19</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC02_PCLK			20</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC03_PCLK			21</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC04_PCLK			22</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC05_PCLK			23</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC06_PCLK			24</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC07_PCLK			25</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC08_PCLK			26</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC09_PCLK			27</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC10_PCLK			28</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC11_PCLK			29</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC12_PCLK			30</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC13_PCLK			31</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC14_PCLK			32</div><div class='add'>+#define CLK_GOUT_PERIS_TZPC15_PCLK			33</div><div class='add'>+#define CLK_GOUT_PERIS_WDT_CLUSTER0_PCLK		34</div><div class='add'>+#define CLK_GOUT_PERIS_WDT_CLUSTER1_PCLK		35</div><div class='add'>+#define CLK_GOUT_PERIS_XIU_P_PERIS_ACLK			36</div><div class='add'>+</div><div class='add'>+/* CMU_FSYS0 */</div><div class='add'>+#define CLK_MOUT_FSYS0_BUS_USER				1</div><div class='add'>+#define CLK_MOUT_FSYS0_DPGTC_USER			2</div><div class='add'>+#define CLK_MOUT_FSYS0_MMC_EMBD_USER			3</div><div class='add'>+#define CLK_MOUT_FSYS0_UFS_EMBD_USER			4</div><div class='add'>+#define CLK_MOUT_FSYS0_USBDRD30_USER			5</div><div class='add'>+#define CLK_GOUT_FSYS0_FSYS0_CMU_FSYS0_PCLK		6</div><div class='add'>+#define CLK_GOUT_FSYS0_AHBBR_FSYS0_HCLK			7</div><div class='add'>+#define CLK_GOUT_FSYS0_AXI2AHB_FSYS0_ACLK		8</div><div class='add'>+#define CLK_GOUT_FSYS0_AXI2AHB_USB_FSYS0_ACLK		9</div><div class='add'>+#define CLK_GOUT_FSYS0_AXI2APB_FSYS0_ACLK		10</div><div class='add'>+#define CLK_GOUT_FSYS0_BTM_FSYS0_I_ACLK			11</div><div class='add'>+#define CLK_GOUT_FSYS0_BTM_FSYS0_I_PCLK			12</div><div class='add'>+#define CLK_GOUT_FSYS0_DP_LINK_I_GTC_EXT_CLK		13</div><div class='add'>+#define CLK_GOUT_FSYS0_DP_LINK_I_PCLK			14</div><div class='add'>+#define CLK_GOUT_FSYS0_ETR_MIU_I_ACLK			15</div><div class='add'>+#define CLK_GOUT_FSYS0_ETR_MIU_I_PCLK			16</div><div class='add'>+#define CLK_GOUT_FSYS0_GPIO_FSYS0_PCLK			17</div><div class='add'>+#define CLK_GOUT_FSYS0_LHM_AXI_D_USBTV_I_CLK		18</div><div class='add'>+#define CLK_GOUT_FSYS0_LHM_AXI_G_ETR_I_CLK		19</div><div class='add'>+#define CLK_GOUT_FSYS0_LHM_AXI_P_FSYS0_I_CLK		20</div><div class='add'>+#define CLK_GOUT_FSYS0_LHS_ACEL_D_FSYS0_I_CLK		21</div><div class='add'>+#define CLK_GOUT_FSYS0_MMC_EMBD_I_ACLK			22</div><div class='add'>+#define CLK_GOUT_FSYS0_MMC_EMBD_SDCLKIN			23</div><div class='add'>+#define CLK_GOUT_FSYS0_PMU_FSYS0_PCLK			24</div><div class='add'>+#define CLK_GOUT_FSYS0_BCM_FSYS0_ACLK			25</div><div class='add'>+#define CLK_GOUT_FSYS0_BCM_FSYS0_PCLK			26</div><div class='add'>+#define CLK_GOUT_FSYS0_RSTNSYNC_CLK_FSYS0_BUS_CLK	27</div><div class='add'>+#define CLK_GOUT_FSYS0_SYSREG_FSYS0_PCLK		28</div><div class='add'>+#define CLK_GOUT_FSYS0_UFS_EMBD_I_ACLK			29</div><div class='add'>+#define CLK_GOUT_FSYS0_UFS_EMBD_I_CLK_UNIPRO		30</div><div class='add'>+#define CLK_GOUT_FSYS0_UFS_EMBD_I_FMP_CLK		31</div><div class='add'>+#define CLK_GOUT_FSYS0_USBTV_I_USB30DRD_ACLK		32</div><div class='add'>+#define CLK_GOUT_FSYS0_USBTV_I_USB30DRD_REF_CLK		33</div><div class='add'>+#define CLK_GOUT_FSYS0_USBTV_I_USB30DRD_SUSPEND_CLK	34</div><div class='add'>+#define CLK_GOUT_FSYS0_USBTV_I_USBTVH_AHB_CLK		35</div><div class='add'>+#define CLK_GOUT_FSYS0_USBTV_I_USBTVH_CORE_CLK		36</div><div class='add'>+#define CLK_GOUT_FSYS0_USBTV_I_USBTVH_XIU_CLK		37</div><div class='add'>+#define CLK_GOUT_FSYS0_US_D_FSYS0_USB_ACLK		38</div><div class='add'>+#define CLK_GOUT_FSYS0_XIU_D_FSYS0_ACLK			39</div><div class='add'>+#define CLK_GOUT_FSYS0_XIU_D_FSYS0_USB_ACLK		40</div><div class='add'>+#define CLK_GOUT_FSYS0_XIU_P_FSYS0_ACLK			41</div><div class='add'>+</div><div class='add'>+/* CMU_FSYS1 */</div><div class='add'>+#define CLK_MOUT_FSYS1_BUS_USER								1</div><div class='add'>+#define CLK_MOUT_FSYS1_MMC_CARD_USER							2</div><div class='add'>+#define CLK_MOUT_FSYS1_PCIE_USER							3</div><div class='add'>+#define CLK_MOUT_FSYS1_UFS_CARD_USER							4</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_PHY_REF_CLK_IN						5</div><div class='add'>+#define CLK_GOUT_FSYS1_ADM_AHB_SSS_HCLKM						6</div><div class='add'>+#define CLK_GOUT_FSYS1_AHBBR_FSYS1_HCLK							7</div><div class='add'>+#define CLK_GOUT_FSYS1_AXI2AHB_FSYS1_ACLK						8</div><div class='add'>+#define CLK_GOUT_FSYS1_AXI2APB_FSYS1P0_ACLK						9</div><div class='add'>+#define CLK_GOUT_FSYS1_AXI2APB_FSYS1P1_ACLK						10</div><div class='add'>+#define CLK_GOUT_FSYS1_BTM_FSYS1_I_ACLK							11</div><div class='add'>+#define CLK_GOUT_FSYS1_BTM_FSYS1_I_PCLK							12</div><div class='add'>+#define CLK_GOUT_FSYS1_FSYS1_CMU_FSYS1_PCLK						13</div><div class='add'>+#define CLK_GOUT_FSYS1_GPIO_FSYS1_PCLK							14</div><div class='add'>+#define CLK_GOUT_FSYS1_LHM_AXI_P_FSYS1_I_CLK						15</div><div class='add'>+#define CLK_GOUT_FSYS1_LHS_ACEL_D_FSYS1_I_CLK						16</div><div class='add'>+#define CLK_GOUT_FSYS1_MMC_CARD_I_ACLK							17</div><div class='add'>+#define CLK_GOUT_FSYS1_MMC_CARD_SDCLKIN							18</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_DBI_ACLK_0							19</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_DBI_ACLK_1							20</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_IEEE1500_WRAPPER_FOR_PCIE_PHY_LC_X2_INST_0_I_SCL_APB_PCLK	21</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_MSTR_ACLK_0							22</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_MSTR_ACLK_1							23</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_PCIE_SUB_CTRL_INST_0_I_DRIVER_APB_CLK			24</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_PCIE_SUB_CTRL_INST_1_I_DRIVER_APB_CLK			25</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_PIPE2_DIGITAL_X2_WRAP_INST_0_I_APB_PCLK_SCL			26</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_SLV_ACLK_0							27</div><div class='add'>+#define CLK_GOUT_FSYS1_PCIE_SLV_ACLK_1							28</div><div class='add'>+#define CLK_GOUT_FSYS1_PMU_FSYS1_PCLK							29</div><div class='add'>+#define CLK_GOUT_FSYS1_BCM_FSYS1_ACLK							30</div><div class='add'>+#define CLK_GOUT_FSYS1_BCM_FSYS1_PCLK							31</div><div class='add'>+#define CLK_GOUT_FSYS1_RSTNSYNC_CLK_FSYS1_BUS_CLK					32</div><div class='add'>+#define CLK_GOUT_FSYS1_RTIC_I_ACLK							33</div><div class='add'>+#define CLK_GOUT_FSYS1_RTIC_I_PCLK							34</div><div class='add'>+#define CLK_GOUT_FSYS1_SSS_I_ACLK							35</div><div class='add'>+#define CLK_GOUT_FSYS1_SSS_I_PCLK							36</div><div class='add'>+#define CLK_GOUT_FSYS1_SYSREG_FSYS1_PCLK						37</div><div class='add'>+#define CLK_GOUT_FSYS1_TOE_WIFI0_I_CLK							38</div><div class='add'>+#define CLK_GOUT_FSYS1_TOE_WIFI1_I_CLK							39</div><div class='add'>+#define CLK_GOUT_FSYS1_UFS_CARD_I_ACLK							40</div><div class='add'>+#define CLK_GOUT_FSYS1_UFS_CARD_I_CLK_UNIPRO						41</div><div class='add'>+#define CLK_GOUT_FSYS1_UFS_CARD_I_FMP_CLK						42</div><div class='add'>+#define CLK_GOUT_FSYS1_XIU_D_FSYS1_ACLK							43</div><div class='add'>+#define CLK_GOUT_FSYS1_XIU_P_FSYS1_ACLK							44</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC0 */</div><div class='add'>+#define CLK_MOUT_PERIC0_BUS_USER			1</div><div class='add'>+#define CLK_MOUT_PERIC0_UART_DBG_USER			2</div><div class='add'>+#define CLK_MOUT_PERIC0_USI00_USER			3</div><div class='add'>+#define CLK_MOUT_PERIC0_USI01_USER			4</div><div class='add'>+#define CLK_MOUT_PERIC0_USI02_USER			5</div><div class='add'>+#define CLK_MOUT_PERIC0_USI03_USER			6</div><div class='add'>+#define CLK_GOUT_PERIC0_PERIC0_CMU_PERIC0_PCLK		7</div><div class='add'>+#define CLK_GOUT_PERIC0_AXI2APB_PERIC0_ACLK		8</div><div class='add'>+#define CLK_GOUT_PERIC0_GPIO_PERIC0_PCLK		9</div><div class='add'>+#define CLK_GOUT_PERIC0_LHM_AXI_P_PERIC0_I_CLK		10</div><div class='add'>+#define CLK_GOUT_PERIC0_PMU_PERIC0_PCLK			11</div><div class='add'>+#define CLK_GOUT_PERIC0_PWM_I_PCLK_S0			12</div><div class='add'>+#define CLK_GOUT_PERIC0_RSTNSYNC_CLK_PERIC0_BUSP_CLK	13</div><div class='add'>+#define CLK_GOUT_PERIC0_SPEEDY2_TSP_CLK			14</div><div class='add'>+#define CLK_GOUT_PERIC0_SYSREG_PERIC0_PCLK		15</div><div class='add'>+#define CLK_GOUT_PERIC0_UART_DBG_EXT_UCLK		16</div><div class='add'>+#define CLK_GOUT_PERIC0_UART_DBG_PCLK			17</div><div class='add'>+#define CLK_GOUT_PERIC0_USI00_I_PCLK			18</div><div class='add'>+#define CLK_GOUT_PERIC0_USI00_I_SCLK_USI		19</div><div class='add'>+#define CLK_GOUT_PERIC0_USI01_I_PCLK			20</div><div class='add'>+#define CLK_GOUT_PERIC0_USI01_I_SCLK_USI		21</div><div class='add'>+#define CLK_GOUT_PERIC0_USI02_I_PCLK			22</div><div class='add'>+#define CLK_GOUT_PERIC0_USI02_I_SCLK_USI		23</div><div class='add'>+#define CLK_GOUT_PERIC0_USI03_I_PCLK			24</div><div class='add'>+#define CLK_GOUT_PERIC0_USI03_I_SCLK_USI		25</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC1 */</div><div class='add'>+#define CLK_MOUT_PERIC1_BUS_USER			1</div><div class='add'>+#define CLK_MOUT_PERIC1_SPEEDY2_USER			2</div><div class='add'>+#define CLK_MOUT_PERIC1_SPI_CAM0_USER			3</div><div class='add'>+#define CLK_MOUT_PERIC1_SPI_CAM1_USER			4</div><div class='add'>+#define CLK_MOUT_PERIC1_UART_BT_USER			5</div><div class='add'>+#define CLK_MOUT_PERIC1_USI04_USER			6</div><div class='add'>+#define CLK_MOUT_PERIC1_USI05_USER			7</div><div class='add'>+#define CLK_MOUT_PERIC1_USI06_USER			8</div><div class='add'>+#define CLK_MOUT_PERIC1_USI07_USER			9</div><div class='add'>+#define CLK_MOUT_PERIC1_USI08_USER			10</div><div class='add'>+#define CLK_MOUT_PERIC1_USI09_USER			11</div><div class='add'>+#define CLK_MOUT_PERIC1_USI10_USER			12</div><div class='add'>+#define CLK_MOUT_PERIC1_USI11_USER			13</div><div class='add'>+#define CLK_MOUT_PERIC1_USI12_USER			14</div><div class='add'>+#define CLK_MOUT_PERIC1_USI13_USER			15</div><div class='add'>+#define CLK_GOUT_PERIC1_PERIC1_CMU_PERIC1_PCLK		16</div><div class='add'>+#define CLK_GOUT_PERIC1_RSTNSYNC_CLK_PERIC1_SPEEDY2_CLK	17</div><div class='add'>+#define CLK_GOUT_PERIC1_AXI2APB_PERIC1P0_ACLK		18</div><div class='add'>+#define CLK_GOUT_PERIC1_AXI2APB_PERIC1P1_ACLK		19</div><div class='add'>+#define CLK_GOUT_PERIC1_AXI2APB_PERIC1P2_ACLK		20</div><div class='add'>+#define CLK_GOUT_PERIC1_GPIO_PERIC1_PCLK		21</div><div class='add'>+#define CLK_GOUT_PERIC1_HSI2C_CAM0_IPCLK		22</div><div class='add'>+#define CLK_GOUT_PERIC1_HSI2C_CAM1_IPCLK		23</div><div class='add'>+#define CLK_GOUT_PERIC1_HSI2C_CAM2_IPCLK		24</div><div class='add'>+#define CLK_GOUT_PERIC1_HSI2C_CAM3_IPCLK		25</div><div class='add'>+#define CLK_GOUT_PERIC1_LHM_AXI_P_PERIC1_I_CLK		26</div><div class='add'>+#define CLK_GOUT_PERIC1_PMU_PERIC1_PCLK			27</div><div class='add'>+#define CLK_GOUT_PERIC1_RSTNSYNC_CLK_PERIC1_BUSP_CLK	28</div><div class='add'>+#define CLK_GOUT_PERIC1_SPEEDY2_DDI1_CLK		29</div><div class='add'>+#define CLK_GOUT_PERIC1_SPEEDY2_DDI1_SCLK		30</div><div class='add'>+#define CLK_GOUT_PERIC1_SPEEDY2_DDI2_CLK		31</div><div class='add'>+#define CLK_GOUT_PERIC1_SPEEDY2_DDI2_SCLK		32</div><div class='add'>+#define CLK_GOUT_PERIC1_SPEEDY2_DDI_CLK			33</div><div class='add'>+#define CLK_GOUT_PERIC1_SPEEDY2_DDI_SCLK		34</div><div class='add'>+#define CLK_GOUT_PERIC1_SPEEDY2_TSP1_CLK		35</div><div class='add'>+#define CLK_GOUT_PERIC1_SPEEDY2_TSP2_CLK		36</div><div class='add'>+#define CLK_GOUT_PERIC1_SPI_CAM0_PCLK			37</div><div class='add'>+#define CLK_GOUT_PERIC1_SPI_CAM0_SPI_EXT_CLK		38</div><div class='add'>+#define CLK_GOUT_PERIC1_SPI_CAM1_PCLK			39</div><div class='add'>+#define CLK_GOUT_PERIC1_SPI_CAM1_SPI_EXT_CLK		40</div><div class='add'>+#define CLK_GOUT_PERIC1_SYSREG_PERIC1_PCLK		41</div><div class='add'>+#define CLK_GOUT_PERIC1_UART_BT_EXT_UCLK		42</div><div class='add'>+#define CLK_GOUT_PERIC1_UART_BT_PCLK			43</div><div class='add'>+#define CLK_GOUT_PERIC1_USI04_I_PCLK			44</div><div class='add'>+#define CLK_GOUT_PERIC1_USI04_I_SCLK_USI		45</div><div class='add'>+#define CLK_GOUT_PERIC1_USI05_I_PCLK			46</div><div class='add'>+#define CLK_GOUT_PERIC1_USI05_I_SCLK_USI		47</div><div class='add'>+#define CLK_GOUT_PERIC1_USI06_I_PCLK			48</div><div class='add'>+#define CLK_GOUT_PERIC1_USI06_I_SCLK_USI		49</div><div class='add'>+#define CLK_GOUT_PERIC1_USI07_I_PCLK			50</div><div class='add'>+#define CLK_GOUT_PERIC1_USI07_I_SCLK_USI		51</div><div class='add'>+#define CLK_GOUT_PERIC1_USI08_I_PCLK			52</div><div class='add'>+#define CLK_GOUT_PERIC1_USI08_I_SCLK_USI		53</div><div class='add'>+#define CLK_GOUT_PERIC1_USI09_I_PCLK			54</div><div class='add'>+#define CLK_GOUT_PERIC1_USI09_I_SCLK_USI		55</div><div class='add'>+#define CLK_GOUT_PERIC1_USI10_I_PCLK			56</div><div class='add'>+#define CLK_GOUT_PERIC1_USI10_I_SCLK_USI		57</div><div class='add'>+#define CLK_GOUT_PERIC1_USI11_I_PCLK			58</div><div class='add'>+#define CLK_GOUT_PERIC1_USI11_I_SCLK_USI		59</div><div class='add'>+#define CLK_GOUT_PERIC1_USI12_I_PCLK			60</div><div class='add'>+#define CLK_GOUT_PERIC1_USI12_I_SCLK_USI		61</div><div class='add'>+#define CLK_GOUT_PERIC1_USI13_I_PCLK			62</div><div class='add'>+#define CLK_GOUT_PERIC1_USI13_I_SCLK_USI		63</div><div class='add'>+#define CLK_GOUT_PERIC1_XIU_P_PERIC1_ACLK		64</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLOCK_EXYNOS8895_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/samsung,exynos990.h b/include/dt-bindings/clock/samsung,exynos990.h<br/>new file mode 100644<br/>index 000000000000..47540307cb52<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/samsung,exynos990.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/samsung,exynos990.h</a></div><div class='hunk'>@@ -0,0 +1,438 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Igor Belwon &lt;igor.belwon@mentallysanemainliners.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Device Tree binding constants for Exynos990 clock controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_EXYNOS_990_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_EXYNOS_990_H</div><div class='add'>+</div><div class='add'>+/* CMU_TOP */</div><div class='add'>+#define CLK_FOUT_SHARED0_PLL		1</div><div class='add'>+#define CLK_FOUT_SHARED1_PLL		2</div><div class='add'>+#define CLK_FOUT_SHARED2_PLL		3</div><div class='add'>+#define CLK_FOUT_SHARED3_PLL		4</div><div class='add'>+#define CLK_FOUT_SHARED4_PLL		5</div><div class='add'>+#define CLK_FOUT_G3D_PLL		6</div><div class='add'>+#define CLK_FOUT_MMC_PLL		7</div><div class='add'>+#define CLK_MOUT_PLL_SHARED0		8</div><div class='add'>+#define CLK_MOUT_PLL_SHARED1		9</div><div class='add'>+#define CLK_MOUT_PLL_SHARED2		10</div><div class='add'>+#define CLK_MOUT_PLL_SHARED3		11</div><div class='add'>+#define CLK_MOUT_PLL_SHARED4		12</div><div class='add'>+#define CLK_MOUT_PLL_MMC		13</div><div class='add'>+#define CLK_MOUT_PLL_G3D		14</div><div class='add'>+#define CLK_MOUT_CMU_APM_BUS		15</div><div class='add'>+#define CLK_MOUT_CMU_AUD_CPU		16</div><div class='add'>+#define CLK_MOUT_CMU_BUS0_BUS		17</div><div class='add'>+#define CLK_MOUT_CMU_BUS1_BUS		18</div><div class='add'>+#define CLK_MOUT_CMU_BUS1_SSS		19</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK0		20</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK1		21</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK2		22</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK3		23</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK4		24</div><div class='add'>+#define CLK_MOUT_CMU_CIS_CLK5		25</div><div class='add'>+#define CLK_MOUT_CMU_CMU_BOOST		26</div><div class='add'>+#define CLK_MOUT_CMU_CORE_BUS		27</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL0_DBG_BUS	28</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL0_SWITCH	29</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL1_SWITCH	30</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL2_BUSP	31</div><div class='add'>+#define CLK_MOUT_CMU_CPUCL2_SWITCH	32</div><div class='add'>+#define CLK_MOUT_CMU_CSIS_BUS		33</div><div class='add'>+#define CLK_MOUT_CMU_CSIS_OIS_MCU	34</div><div class='add'>+#define CLK_MOUT_CMU_DNC_BUS		35</div><div class='add'>+#define CLK_MOUT_CMU_DNC_BUSM		36</div><div class='add'>+#define CLK_MOUT_CMU_DNS_BUS		37</div><div class='add'>+#define CLK_MOUT_CMU_DPU		38</div><div class='add'>+#define CLK_MOUT_CMU_DPU_ALT		39</div><div class='add'>+#define CLK_MOUT_CMU_DSP_BUS		40</div><div class='add'>+#define CLK_MOUT_CMU_G2D_G2D		41</div><div class='add'>+#define CLK_MOUT_CMU_G2D_MSCL		42</div><div class='add'>+#define CLK_MOUT_CMU_HPM		43</div><div class='add'>+#define CLK_MOUT_CMU_HSI0_BUS		44</div><div class='add'>+#define CLK_MOUT_CMU_HSI0_DPGTC		45</div><div class='add'>+#define CLK_MOUT_CMU_HSI0_USB31DRD	46</div><div class='add'>+#define CLK_MOUT_CMU_HSI0_USBDP_DEBUG	47</div><div class='add'>+#define CLK_MOUT_CMU_HSI1_BUS		48</div><div class='add'>+#define CLK_MOUT_CMU_HSI1_MMC_CARD	49</div><div class='add'>+#define CLK_MOUT_CMU_HSI1_PCIE		50</div><div class='add'>+#define CLK_MOUT_CMU_HSI1_UFS_CARD	51</div><div class='add'>+#define CLK_MOUT_CMU_HSI1_UFS_EMBD	52</div><div class='add'>+#define CLK_MOUT_CMU_HSI2_BUS		53</div><div class='add'>+#define CLK_MOUT_CMU_HSI2_PCIE		54</div><div class='add'>+#define CLK_MOUT_CMU_IPP_BUS		55</div><div class='add'>+#define CLK_MOUT_CMU_ITP_BUS		56</div><div class='add'>+#define CLK_MOUT_CMU_MCSC_BUS		57</div><div class='add'>+#define CLK_MOUT_CMU_MCSC_GDC		58</div><div class='add'>+#define CLK_MOUT_CMU_CMU_BOOST_CPU	59</div><div class='add'>+#define CLK_MOUT_CMU_MFC0_MFC0		60</div><div class='add'>+#define CLK_MOUT_CMU_MFC0_WFD		61</div><div class='add'>+#define CLK_MOUT_CMU_MIF_BUSP		62</div><div class='add'>+#define CLK_MOUT_CMU_MIF_SWITCH		63</div><div class='add'>+#define CLK_MOUT_CMU_NPU_BUS		64</div><div class='add'>+#define CLK_MOUT_CMU_PERIC0_BUS		65</div><div class='add'>+#define CLK_MOUT_CMU_PERIC0_IP		66</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_BUS		67</div><div class='add'>+#define CLK_MOUT_CMU_PERIC1_IP		68</div><div class='add'>+#define CLK_MOUT_CMU_PERIS_BUS		69</div><div class='add'>+#define CLK_MOUT_CMU_SSP_BUS		70</div><div class='add'>+#define CLK_MOUT_CMU_TNR_BUS		71</div><div class='add'>+#define CLK_MOUT_CMU_VRA_BUS		72</div><div class='add'>+#define CLK_DOUT_CMU_APM_BUS		73</div><div class='add'>+#define CLK_DOUT_CMU_AUD_CPU		74</div><div class='add'>+#define CLK_DOUT_CMU_BUS0_BUS		75</div><div class='add'>+#define CLK_DOUT_CMU_BUS1_BUS		76</div><div class='add'>+#define CLK_DOUT_CMU_BUS1_SSS		77</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK0		78</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK1		79</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK2		80</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK3		81</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK4		82</div><div class='add'>+#define CLK_DOUT_CMU_CIS_CLK5		83</div><div class='add'>+#define CLK_DOUT_CMU_CMU_BOOST		84</div><div class='add'>+#define CLK_DOUT_CMU_CORE_BUS		85</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL0_DBG_BUS	86</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL0_SWITCH	87</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL1_SWITCH	88</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL2_BUSP	89</div><div class='add'>+#define CLK_DOUT_CMU_CPUCL2_SWITCH	90</div><div class='add'>+#define CLK_DOUT_CMU_CSIS_BUS		91</div><div class='add'>+#define CLK_DOUT_CMU_CSIS_OIS_MCU	92</div><div class='add'>+#define CLK_DOUT_CMU_DNC_BUS		93</div><div class='add'>+#define CLK_DOUT_CMU_DNC_BUSM		94</div><div class='add'>+#define CLK_DOUT_CMU_DNS_BUS		95</div><div class='add'>+#define CLK_DOUT_CMU_DSP_BUS		96</div><div class='add'>+#define CLK_DOUT_CMU_G2D_G2D		97</div><div class='add'>+#define CLK_DOUT_CMU_G2D_MSCL		98</div><div class='add'>+#define CLK_DOUT_CMU_G3D_SWITCH		99</div><div class='add'>+#define CLK_DOUT_CMU_HPM		100</div><div class='add'>+#define CLK_DOUT_CMU_HSI0_BUS		101</div><div class='add'>+#define CLK_DOUT_CMU_HSI0_DPGTC		102</div><div class='add'>+#define CLK_DOUT_CMU_HSI0_USB31DRD	103</div><div class='add'>+#define CLK_DOUT_CMU_HSI0_USBDP_DEBUG	104</div><div class='add'>+#define CLK_DOUT_CMU_HSI1_BUS		105</div><div class='add'>+#define CLK_DOUT_CMU_HSI1_MMC_CARD	106</div><div class='add'>+#define CLK_DOUT_CMU_HSI1_PCIE		107</div><div class='add'>+#define CLK_DOUT_CMU_HSI1_UFS_CARD	108</div><div class='add'>+#define CLK_DOUT_CMU_HSI1_UFS_EMBD	109</div><div class='add'>+#define CLK_DOUT_CMU_HSI2_BUS		110</div><div class='add'>+#define CLK_DOUT_CMU_HSI2_PCIE		111</div><div class='add'>+#define CLK_DOUT_CMU_IPP_BUS		112</div><div class='add'>+#define CLK_DOUT_CMU_ITP_BUS		113</div><div class='add'>+#define CLK_DOUT_CMU_MCSC_BUS		114</div><div class='add'>+#define CLK_DOUT_CMU_MCSC_GDC		115</div><div class='add'>+#define CLK_DOUT_CMU_CMU_BOOST_CPU	116</div><div class='add'>+#define CLK_DOUT_CMU_MFC0_MFC0		117</div><div class='add'>+#define CLK_DOUT_CMU_MFC0_WFD		118</div><div class='add'>+#define CLK_DOUT_CMU_MIF_BUSP		119</div><div class='add'>+#define CLK_DOUT_CMU_NPU_BUS		120</div><div class='add'>+#define CLK_DOUT_CMU_OTP		121</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_BUS		122</div><div class='add'>+#define CLK_DOUT_CMU_PERIC0_IP		123</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_BUS		124</div><div class='add'>+#define CLK_DOUT_CMU_PERIC1_IP		125</div><div class='add'>+#define CLK_DOUT_CMU_PERIS_BUS		126</div><div class='add'>+#define CLK_DOUT_CMU_SSP_BUS		127</div><div class='add'>+#define CLK_DOUT_CMU_TNR_BUS		128</div><div class='add'>+#define CLK_DOUT_CMU_VRA_BUS		129</div><div class='add'>+#define CLK_DOUT_CMU_DPU		130</div><div class='add'>+#define CLK_DOUT_CMU_DPU_ALT		131</div><div class='add'>+#define CLK_DOUT_CMU_SHARED0_DIV2	132</div><div class='add'>+#define CLK_DOUT_CMU_SHARED0_DIV3	133</div><div class='add'>+#define CLK_DOUT_CMU_SHARED0_DIV4	134</div><div class='add'>+#define CLK_DOUT_CMU_SHARED1_DIV2	135</div><div class='add'>+#define CLK_DOUT_CMU_SHARED1_DIV3	136</div><div class='add'>+#define CLK_DOUT_CMU_SHARED1_DIV4	137</div><div class='add'>+#define CLK_DOUT_CMU_SHARED2_DIV2	138</div><div class='add'>+#define CLK_DOUT_CMU_SHARED4_DIV2	139</div><div class='add'>+#define CLK_DOUT_CMU_SHARED4_DIV3	140</div><div class='add'>+#define CLK_DOUT_CMU_SHARED4_DIV4	141</div><div class='add'>+#define CLK_GOUT_CMU_G3D_BUS		142</div><div class='add'>+#define CLK_GOUT_CMU_MIF_SWITCH		143</div><div class='add'>+#define CLK_GOUT_CMU_APM_BUS		144</div><div class='add'>+#define CLK_GOUT_CMU_AUD_CPU		145</div><div class='add'>+#define CLK_GOUT_CMU_BUS0_BUS		146</div><div class='add'>+#define CLK_GOUT_CMU_BUS1_BUS		147</div><div class='add'>+#define CLK_GOUT_CMU_BUS1_SSS		148</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK0		149</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK1		150</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK2		151</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK3		152</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK4		153</div><div class='add'>+#define CLK_GOUT_CMU_CIS_CLK5		154</div><div class='add'>+#define CLK_GOUT_CMU_CORE_BUS		155</div><div class='add'>+#define CLK_GOUT_CMU_CPUCL0_DBG_BUS	156</div><div class='add'>+#define CLK_GOUT_CMU_CPUCL0_SWITCH	157</div><div class='add'>+#define CLK_GOUT_CMU_CPUCL1_SWITCH	158</div><div class='add'>+#define CLK_GOUT_CMU_CPUCL2_BUSP	159</div><div class='add'>+#define CLK_GOUT_CMU_CPUCL2_SWITCH	160</div><div class='add'>+#define CLK_GOUT_CMU_CSIS_BUS		161</div><div class='add'>+#define CLK_GOUT_CMU_CSIS_OIS_MCU	162</div><div class='add'>+#define CLK_GOUT_CMU_DNC_BUS		163</div><div class='add'>+#define CLK_GOUT_CMU_DNC_BUSM		164</div><div class='add'>+#define CLK_GOUT_CMU_DNS_BUS		165</div><div class='add'>+#define CLK_GOUT_CMU_DPU		166</div><div class='add'>+#define CLK_GOUT_CMU_DPU_BUS		167</div><div class='add'>+#define CLK_GOUT_CMU_DSP_BUS		168</div><div class='add'>+#define CLK_GOUT_CMU_G2D_G2D		169</div><div class='add'>+#define CLK_GOUT_CMU_G2D_MSCL		170</div><div class='add'>+#define CLK_GOUT_CMU_G3D_SWITCH		171</div><div class='add'>+#define CLK_GOUT_CMU_HPM		172</div><div class='add'>+#define CLK_GOUT_CMU_HSI0_BUS		173</div><div class='add'>+#define CLK_GOUT_CMU_HSI0_DPGTC		174</div><div class='add'>+#define CLK_GOUT_CMU_HSI0_USB31DRD	175</div><div class='add'>+#define CLK_GOUT_CMU_HSI0_USBDP_DEBUG	176</div><div class='add'>+#define CLK_GOUT_CMU_HSI1_BUS		177</div><div class='add'>+#define CLK_GOUT_CMU_HSI1_MMC_CARD	178</div><div class='add'>+#define CLK_GOUT_CMU_HSI1_PCIE		179</div><div class='add'>+#define CLK_GOUT_CMU_HSI1_UFS_CARD	180</div><div class='add'>+#define CLK_GOUT_CMU_HSI1_UFS_EMBD	181</div><div class='add'>+#define CLK_GOUT_CMU_HSI2_BUS		182</div><div class='add'>+#define CLK_GOUT_CMU_HSI2_PCIE		183</div><div class='add'>+#define CLK_GOUT_CMU_IPP_BUS		184</div><div class='add'>+#define CLK_GOUT_CMU_ITP_BUS		185</div><div class='add'>+#define CLK_GOUT_CMU_MCSC_BUS		186</div><div class='add'>+#define CLK_GOUT_CMU_MCSC_GDC		187</div><div class='add'>+#define CLK_GOUT_CMU_MFC0_MFC0		188</div><div class='add'>+#define CLK_GOUT_CMU_MFC0_WFD		189</div><div class='add'>+#define CLK_GOUT_CMU_MIF_BUSP		190</div><div class='add'>+#define CLK_GOUT_CMU_NPU_BUS		191</div><div class='add'>+#define CLK_GOUT_CMU_PERIC0_BUS		192</div><div class='add'>+#define CLK_GOUT_CMU_PERIC0_IP		193</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_BUS		194</div><div class='add'>+#define CLK_GOUT_CMU_PERIC1_IP		195</div><div class='add'>+#define CLK_GOUT_CMU_PERIS_BUS		196</div><div class='add'>+#define CLK_GOUT_CMU_SSP_BUS		197</div><div class='add'>+#define CLK_GOUT_CMU_TNR_BUS		198</div><div class='add'>+#define CLK_GOUT_CMU_VRA_BUS		199</div><div class='add'>+#define CLK_MOUT_CMU_CMUREF		200</div><div class='add'>+#define CLK_MOUT_CMU_DPU_BUS		201</div><div class='add'>+#define CLK_MOUT_CMU_CLK_CMUREF		202</div><div class='add'>+#define CLK_DOUT_CMU_CLK_CMUREF		203</div><div class='add'>+</div><div class='add'>+/* CMU_HSI0 */</div><div class='add'>+#define CLK_MOUT_HSI0_BUS_USER				1</div><div class='add'>+#define CLK_MOUT_HSI0_USB31DRD_USER			2</div><div class='add'>+#define CLK_MOUT_HSI0_USBDP_DEBUG_USER			3</div><div class='add'>+#define CLK_MOUT_HSI0_DPGTC_USER			4</div><div class='add'>+#define CLK_GOUT_HSI0_DP_LINK_DP_GTC_CLK		5</div><div class='add'>+#define CLK_GOUT_HSI0_DP_LINK_PCLK			6</div><div class='add'>+#define CLK_GOUT_HSI0_D_TZPC_HSI0_PCLK			7</div><div class='add'>+#define CLK_GOUT_HSI0_LHM_AXI_P_HSI0_CLK		8</div><div class='add'>+#define CLK_GOUT_HSI0_PPMU_HSI0_BUS1_ACLK		9</div><div class='add'>+#define CLK_GOUT_HSI0_PPMU_HSI0_BUS1_PCLK		10</div><div class='add'>+#define CLK_GOUT_HSI0_CLK_HSI0_BUS_CLK			11</div><div class='add'>+#define CLK_GOUT_HSI0_SYSMMU_USB_CLK_S2			12</div><div class='add'>+#define CLK_GOUT_HSI0_SYSREG_HSI0_PCLK			13</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_ACLK_PHYCTRL		14</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_BUS_CLK_EARLY		15</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_USB31DRD_REF_CLK_40	16</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_USBDPPHY_REF_SOC_PLL	17</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_USBDPPHY_SCL_APB		18</div><div class='add'>+#define CLK_GOUT_HSI0_USB31DRD_USBPCS_APB_CLK		19</div><div class='add'>+#define CLK_GOUT_HSI0_VGEN_LITE_HSI0_CLK		20</div><div class='add'>+#define CLK_GOUT_HSI0_CMU_HSI0_PCLK			21</div><div class='add'>+#define CLK_GOUT_HSI0_XIU_D_HSI0_ACLK			22</div><div class='add'>+#define CLK_GOUT_HSI0_LHS_ACEL_D_HSI0_CLK		23</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC0 */</div><div class='add'>+#define CLK_MOUT_PERIC0_BUS_USER		1</div><div class='add'>+#define CLK_MOUT_PERIC0_UART_DBG		2</div><div class='add'>+#define CLK_MOUT_PERIC0_USI00_USI_USER		3</div><div class='add'>+#define CLK_MOUT_PERIC0_USI01_USI_USER		4</div><div class='add'>+#define CLK_MOUT_PERIC0_USI02_USI_USER		5</div><div class='add'>+#define CLK_MOUT_PERIC0_USI03_USI_USER		6</div><div class='add'>+#define CLK_MOUT_PERIC0_USI04_USI_USER		7</div><div class='add'>+#define CLK_MOUT_PERIC0_USI05_USI_USER		8</div><div class='add'>+#define CLK_MOUT_PERIC0_USI13_USI_USER		9</div><div class='add'>+#define CLK_MOUT_PERIC0_USI14_USI_USER		10</div><div class='add'>+#define CLK_MOUT_PERIC0_USI15_USI_USER		11</div><div class='add'>+#define CLK_MOUT_PERIC0_USI_I2C_USER		12</div><div class='add'>+#define CLK_DOUT_PERIC0_UART_DBG		13</div><div class='add'>+#define CLK_DOUT_PERIC0_USI00_USI		14</div><div class='add'>+#define CLK_DOUT_PERIC0_USI01_USI		15</div><div class='add'>+#define CLK_DOUT_PERIC0_USI02_USI		16</div><div class='add'>+#define CLK_DOUT_PERIC0_USI03_USI		17</div><div class='add'>+#define CLK_DOUT_PERIC0_USI04_USI		18</div><div class='add'>+#define CLK_DOUT_PERIC0_USI05_USI		19</div><div class='add'>+#define CLK_DOUT_PERIC0_USI13_USI		20</div><div class='add'>+#define CLK_DOUT_PERIC0_USI14_USI		21</div><div class='add'>+#define CLK_DOUT_PERIC0_USI15_USI		22</div><div class='add'>+#define CLK_DOUT_PERIC0_USI_I2C			23</div><div class='add'>+#define CLK_GOUT_PERIC0_CMU_PCLK		24</div><div class='add'>+#define CLK_GOUT_PERIC0_OSCCLK_CLK		25</div><div class='add'>+#define CLK_GOUT_PERIC0_D_TZPC_PCLK		26</div><div class='add'>+#define CLK_GOUT_PERIC0_GPIO_PCLK		27</div><div class='add'>+#define CLK_GOUT_PERIC0_LHM_AXI_P_CLK		28</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_10		29</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_11		30</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_12		31</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_13		32</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_14		33</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_15		34</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_4		35</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_5		36</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_6		37</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_7		38</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_8		39</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_IPCLK_9		40</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_10		41</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_11		42</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_12		43</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_13		44</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_14		45</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_15		46</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_4		47</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_5		48</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_6		49</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_7		50</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_8		51</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP0_PCLK_9		52</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_IPCLK_0		53</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_IPCLK_3		54</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_IPCLK_4		55</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_IPCLK_5		56</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_IPCLK_6		57</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_IPCLK_7		58</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_IPCLK_8		59</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_PCLK_0		60</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_PCLK_15		61</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_PCLK_3		62</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_PCLK_4		63</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_PCLK_5		64</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_PCLK_6		65</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_PCLK_7		66</div><div class='add'>+#define CLK_GOUT_PERIC0_TOP1_PCLK_8		67</div><div class='add'>+#define CLK_GOUT_PERIC0_BUSP_CLK		68</div><div class='add'>+#define CLK_GOUT_PERIC0_UART_DBG_CLK		69</div><div class='add'>+#define CLK_GOUT_PERIC0_USI00_USI_CLK		70</div><div class='add'>+#define CLK_GOUT_PERIC0_USI01_USI_CLK		71</div><div class='add'>+#define CLK_GOUT_PERIC0_USI02_USI_CLK		72</div><div class='add'>+#define CLK_GOUT_PERIC0_USI03_USI_CLK		73</div><div class='add'>+#define CLK_GOUT_PERIC0_USI04_USI_CLK		74</div><div class='add'>+#define CLK_GOUT_PERIC0_USI05_USI_CLK		75</div><div class='add'>+#define CLK_GOUT_PERIC0_USI13_USI_CLK		76</div><div class='add'>+#define CLK_GOUT_PERIC0_USI14_USI_CLK		77</div><div class='add'>+#define CLK_GOUT_PERIC0_USI15_USI_CLK		78</div><div class='add'>+#define CLK_GOUT_PERIC0_USI_I2C_CLK		79</div><div class='add'>+#define CLK_GOUT_PERIC0_SYSREG_PCLK		80</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC1 */</div><div class='add'>+#define CLK_MOUT_PERIC1_BUS_USER		1</div><div class='add'>+#define CLK_MOUT_PERIC1_UART_BT_USER		2</div><div class='add'>+#define CLK_MOUT_PERIC1_USI06_USI_USER		3</div><div class='add'>+#define CLK_MOUT_PERIC1_USI07_USI_USER		4</div><div class='add'>+#define CLK_MOUT_PERIC1_USI08_USI_USER		5</div><div class='add'>+#define CLK_MOUT_PERIC1_USI09_USI_USER		6</div><div class='add'>+#define CLK_MOUT_PERIC1_USI10_USI_USER		7</div><div class='add'>+#define CLK_MOUT_PERIC1_USI11_USI_USER		8</div><div class='add'>+#define CLK_MOUT_PERIC1_USI12_USI_USER		9</div><div class='add'>+#define CLK_MOUT_PERIC1_USI18_USI_USER		10</div><div class='add'>+#define CLK_MOUT_PERIC1_USI16_USI_USER		11</div><div class='add'>+#define CLK_MOUT_PERIC1_USI17_USI_USER		12</div><div class='add'>+#define CLK_MOUT_PERIC1_USI_I2C_USER            13</div><div class='add'>+#define CLK_DOUT_PERIC1_UART_BT			14</div><div class='add'>+#define CLK_DOUT_PERIC1_USI06_USI		15</div><div class='add'>+#define CLK_DOUT_PERIC1_USI07_USI		16</div><div class='add'>+#define CLK_DOUT_PERIC1_USI08_USI		17</div><div class='add'>+#define CLK_DOUT_PERIC1_USI18_USI		18</div><div class='add'>+#define CLK_DOUT_PERIC1_USI12_USI		19</div><div class='add'>+#define CLK_DOUT_PERIC1_USI09_USI		20</div><div class='add'>+#define CLK_DOUT_PERIC1_USI10_USI		21</div><div class='add'>+#define CLK_DOUT_PERIC1_USI11_USI		22</div><div class='add'>+#define CLK_DOUT_PERIC1_USI16_USI		23</div><div class='add'>+#define CLK_DOUT_PERIC1_USI17_USI		24</div><div class='add'>+#define CLK_DOUT_PERIC1_USI_I2C			25</div><div class='add'>+#define CLK_GOUT_PERIC1_CMU_PCLK		26</div><div class='add'>+#define CLK_GOUT_PERIC1_UART_BT_CLK		27</div><div class='add'>+#define CLK_GOUT_PERIC1_USI12_USI_CLK		28</div><div class='add'>+#define CLK_GOUT_PERIC1_USI18_USI_CLK		29</div><div class='add'>+#define CLK_GOUT_PERIC1_D_TZPC_PCLK		30</div><div class='add'>+#define CLK_GOUT_PERIC1_GPIO_PCLK		31</div><div class='add'>+#define CLK_GOUT_PERIC1_LHM_AXI_P_CSIS_CLK	32</div><div class='add'>+#define CLK_GOUT_PERIC1_LHM_AXI_P_CLK		33</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_IPCLK_10		34</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_IPCLK_11		35</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_IPCLK_12		36</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_IPCLK_13		37</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_IPCLK_14		38</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_IPCLK_15		39</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_IPCLK_4		40</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_PCLK_10		41</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_PCLK_11		42</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_PCLK_12		43</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_PCLK_13		44</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_PCLK_14		45</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_PCLK_15		46</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP0_PCLK_4		47</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_0		48</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_1		49</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_10		50</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_12		51</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_13		52</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_14		53</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_15		54</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_2		55</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_3		56</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_4		57</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_5		58</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_6		59</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_7		60</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_IPCLK_9		61</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_0		62</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_1		63</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_10		64</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_12		65</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_13		66</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_14		67</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_15		68</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_2		69</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_3		70</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_4		71</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_5		72</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_6		73</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_7		74</div><div class='add'>+#define CLK_GOUT_PERIC1_TOP1_PCLK_9		75</div><div class='add'>+#define CLK_GOUT_PERIC1_BUSP_CLK		76</div><div class='add'>+#define CLK_GOUT_PERIC1_OSCCLK_CLK		77</div><div class='add'>+#define CLK_GOUT_PERIC1_USI06_USI_CLK		78</div><div class='add'>+#define CLK_GOUT_PERIC1_USI07_USI_CLK		79</div><div class='add'>+#define CLK_GOUT_PERIC1_USI08_USI_CLK		80</div><div class='add'>+#define CLK_GOUT_PERIC1_USI09_USI_CLK		81</div><div class='add'>+#define CLK_GOUT_PERIC1_USI10_USI_CLK		82</div><div class='add'>+#define CLK_GOUT_PERIC1_USI11_USI_CLK		83</div><div class='add'>+#define CLK_GOUT_PERIC1_USI16_USI_CLK		84</div><div class='add'>+#define CLK_GOUT_PERIC1_USI17_USI_CLK		85</div><div class='add'>+#define CLK_GOUT_PERIC1_USI_I2C_CLK		86</div><div class='add'>+#define CLK_GOUT_PERIC1_SYSREG_PCLK		87</div><div class='add'>+#define CLK_GOUT_PERIC1_USI16_I3C_PCLK		88</div><div class='add'>+#define CLK_GOUT_PERIC1_USI16_I3C_SCLK		89</div><div class='add'>+#define CLK_GOUT_PERIC1_USI17_I3C_PCLK		90</div><div class='add'>+#define CLK_GOUT_PERIC1_USI17_I3C_SCLK		91</div><div class='add'>+#define CLK_GOUT_PERIC1_XIU_P_ACLK		92</div><div class='add'>+</div><div class='add'>+/* CMU_PERIS */</div><div class='add'>+#define CLK_MOUT_PERIS_BUS_USER			1</div><div class='add'>+#define CLK_MOUT_PERIS_CLK_PERIS_GIC		2</div><div class='add'>+#define CLK_GOUT_PERIS_SYSREG_PERIS_PCLK	3</div><div class='add'>+#define CLK_GOUT_PERIS_WDT_CLUSTER2_PCLK	4</div><div class='add'>+#define CLK_GOUT_PERIS_WDT_CLUSTER0_PCLK	5</div><div class='add'>+#define CLK_CLK_PERIS_PERIS_CMU_PERIS_PCLK	6</div><div class='add'>+#define CLK_GOUT_PERIS_CLK_PERIS_BUSP_CLK	7</div><div class='add'>+#define CLK_GOUT_PERIS_CLK_PERIS_OSCCLK_CLK	8</div><div class='add'>+#define CLK_GOUT_PERIS_CLK_PERIS_GIC_CLK	9</div><div class='add'>+#define CLK_GOUT_PERIS_AD_AXI_P_PERIS_ACLKM	10</div><div class='add'>+#define CLK_GOUT_PERIS_OTP_CON_BIRA_PCLK	11</div><div class='add'>+#define CLK_GOUT_PERIS_GIC_CLK			12</div><div class='add'>+#define CLK_GOUT_PERIS_LHM_AXI_P_PERIS_CLK	13</div><div class='add'>+#define CLK_GOUT_PERIS_MCT_PCLK			14</div><div class='add'>+#define CLK_GOUT_PERIS_OTP_CON_TOP_PCLK		15</div><div class='add'>+#define CLK_GOUT_PERIS_D_TZPC_PERIS_PCLK	16</div><div class='add'>+#define CLK_GOUT_PERIS_TMU_TOP_PCLK		17</div><div class='add'>+#define CLK_GOUT_PERIS_OTP_CON_BIRA_OSCCLK	18</div><div class='add'>+#define CLK_GOUT_PERIS_OTP_CON_TOP_OSCCLK	19</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/samsung,exynosautov9.h b/include/dt-bindings/clock/samsung,exynosautov9.h<br/>index 3065375c2d8b..ce8fb8f7d718 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/samsung,exynosautov9.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/samsung,exynosautov9.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/samsung,exynosautov9.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/samsung,exynosautov9.h</a></div><div class='hunk'>@@ -179,6 +179,17 @@</div><div class='ctx'> #define CLK_GOUT_CORE_CCI_PCLK		4</div><div class='ctx'> #define CLK_GOUT_CORE_CMU_CORE_PCLK	5</div><div class='ctx'> </div><div class='add'>+/* CMU_DPUM */</div><div class='add'>+#define CLK_MOUT_DPUM_BUS_USER		1</div><div class='add'>+#define CLK_DOUT_DPUM_BUSP		2</div><div class='add'>+#define CLK_GOUT_DPUM_ACLK_DECON	3</div><div class='add'>+#define CLK_GOUT_DPUM_ACLK_DMA		4</div><div class='add'>+#define CLK_GOUT_DPUM_ACLK_DPP		5</div><div class='add'>+#define CLK_GOUT_DPUM_SYSMMU_D0_CLK	6</div><div class='add'>+#define CLK_GOUT_DPUM_SYSMMU_D1_CLK	7</div><div class='add'>+#define CLK_GOUT_DPUM_SYSMMU_D2_CLK	8</div><div class='add'>+#define CLK_GOUT_DPUM_SYSMMU_D3_CLK	9</div><div class='add'>+</div><div class='ctx'> /* CMU_FSYS0 */</div><div class='ctx'> #define CLK_MOUT_FSYS0_BUS_USER		1</div><div class='ctx'> #define CLK_MOUT_FSYS0_PCIE_USER	2</div><div class='head'>diff --git a/include/dt-bindings/clock/samsung,exynosautov920.h b/include/dt-bindings/clock/samsung,exynosautov920.h<br/>new file mode 100644<br/>index 000000000000..970d05167fc6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/samsung,exynosautov920.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/samsung,exynosautov920.h</a></div><div class='hunk'>@@ -0,0 +1,308 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Author: Sunyeal Hong &lt;sunyeal.hong@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Device Tree binding constants for ExynosAuto v920 clock controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLOCK_EXYNOSAUTOV920_H</div><div class='add'>+#define _DT_BINDINGS_CLOCK_EXYNOSAUTOV920_H</div><div class='add'>+</div><div class='add'>+/* CMU_TOP */</div><div class='add'>+#define FOUT_SHARED0_PLL		1</div><div class='add'>+#define FOUT_SHARED1_PLL		2</div><div class='add'>+#define FOUT_SHARED2_PLL		3</div><div class='add'>+#define FOUT_SHARED3_PLL		4</div><div class='add'>+#define FOUT_SHARED4_PLL		5</div><div class='add'>+#define FOUT_SHARED5_PLL		6</div><div class='add'>+#define FOUT_MMC_PLL			7</div><div class='add'>+</div><div class='add'>+/* MUX in CMU_TOP */</div><div class='add'>+#define MOUT_SHARED0_PLL		8</div><div class='add'>+#define MOUT_SHARED1_PLL		9</div><div class='add'>+#define MOUT_SHARED2_PLL		10</div><div class='add'>+#define MOUT_SHARED3_PLL		11</div><div class='add'>+#define MOUT_SHARED4_PLL		12</div><div class='add'>+#define MOUT_SHARED5_PLL		13</div><div class='add'>+#define MOUT_MMC_PLL			14</div><div class='add'>+#define MOUT_CLKCMU_CMU_BOOST		15</div><div class='add'>+#define MOUT_CLKCMU_CMU_CMUREF		16</div><div class='add'>+#define MOUT_CLKCMU_ACC_NOC		17</div><div class='add'>+#define MOUT_CLKCMU_ACC_ORB		18</div><div class='add'>+#define MOUT_CLKCMU_APM_NOC		19</div><div class='add'>+#define MOUT_CLKCMU_AUD_CPU		20</div><div class='add'>+#define MOUT_CLKCMU_AUD_NOC		21</div><div class='add'>+#define MOUT_CLKCMU_CPUCL0_SWITCH	22</div><div class='add'>+#define MOUT_CLKCMU_CPUCL0_CLUSTER	23</div><div class='add'>+#define MOUT_CLKCMU_CPUCL0_DBG		24</div><div class='add'>+#define MOUT_CLKCMU_CPUCL1_SWITCH	25</div><div class='add'>+#define MOUT_CLKCMU_CPUCL1_CLUSTER	26</div><div class='add'>+#define MOUT_CLKCMU_CPUCL2_SWITCH	27</div><div class='add'>+#define MOUT_CLKCMU_CPUCL2_CLUSTER	28</div><div class='add'>+#define MOUT_CLKCMU_DNC_NOC		29</div><div class='add'>+#define MOUT_CLKCMU_DPTX_NOC		30</div><div class='add'>+#define MOUT_CLKCMU_DPTX_DPGTC		31</div><div class='add'>+#define MOUT_CLKCMU_DPTX_DPOSC		32</div><div class='add'>+#define MOUT_CLKCMU_DPUB_NOC		33</div><div class='add'>+#define MOUT_CLKCMU_DPUB_DSIM		34</div><div class='add'>+#define MOUT_CLKCMU_DPUF0_NOC		35</div><div class='add'>+#define MOUT_CLKCMU_DPUF1_NOC		36</div><div class='add'>+#define MOUT_CLKCMU_DPUF2_NOC		37</div><div class='add'>+#define MOUT_CLKCMU_DSP_NOC		38</div><div class='add'>+#define MOUT_CLKCMU_G3D_SWITCH		39</div><div class='add'>+#define MOUT_CLKCMU_G3D_NOCP		40</div><div class='add'>+#define MOUT_CLKCMU_GNPU_NOC		41</div><div class='add'>+#define MOUT_CLKCMU_HSI0_NOC		42</div><div class='add'>+#define MOUT_CLKCMU_HSI1_NOC		43</div><div class='add'>+#define MOUT_CLKCMU_HSI1_USBDRD		44</div><div class='add'>+#define MOUT_CLKCMU_HSI1_MMC_CARD	45</div><div class='add'>+#define MOUT_CLKCMU_HSI2_NOC		46</div><div class='add'>+#define MOUT_CLKCMU_HSI2_NOC_UFS	47</div><div class='add'>+#define MOUT_CLKCMU_HSI2_UFS_EMBD	48</div><div class='add'>+#define MOUT_CLKCMU_HSI2_ETHERNET	49</div><div class='add'>+#define MOUT_CLKCMU_ISP_NOC		50</div><div class='add'>+#define MOUT_CLKCMU_M2M_NOC		51</div><div class='add'>+#define MOUT_CLKCMU_M2M_JPEG		52</div><div class='add'>+#define MOUT_CLKCMU_MFC_MFC		53</div><div class='add'>+#define MOUT_CLKCMU_MFC_WFD		54</div><div class='add'>+#define MOUT_CLKCMU_MFD_NOC		55</div><div class='add'>+#define MOUT_CLKCMU_MIF_SWITCH		56</div><div class='add'>+#define MOUT_CLKCMU_MIF_NOCP		57</div><div class='add'>+#define MOUT_CLKCMU_MISC_NOC		58</div><div class='add'>+#define MOUT_CLKCMU_NOCL0_NOC		59</div><div class='add'>+#define MOUT_CLKCMU_NOCL1_NOC		60</div><div class='add'>+#define MOUT_CLKCMU_NOCL2_NOC		61</div><div class='add'>+#define MOUT_CLKCMU_PERIC0_NOC		62</div><div class='add'>+#define MOUT_CLKCMU_PERIC0_IP		63</div><div class='add'>+#define MOUT_CLKCMU_PERIC1_NOC		64</div><div class='add'>+#define MOUT_CLKCMU_PERIC1_IP		65</div><div class='add'>+#define MOUT_CLKCMU_SDMA_NOC		66</div><div class='add'>+#define MOUT_CLKCMU_SNW_NOC		67</div><div class='add'>+#define MOUT_CLKCMU_SSP_NOC		68</div><div class='add'>+#define MOUT_CLKCMU_TAA_NOC		69</div><div class='add'>+</div><div class='add'>+/* DIV in CMU_TOP */</div><div class='add'>+#define DOUT_SHARED0_DIV1		70</div><div class='add'>+#define DOUT_SHARED0_DIV2		71</div><div class='add'>+#define DOUT_SHARED0_DIV3		72</div><div class='add'>+#define DOUT_SHARED0_DIV4		73</div><div class='add'>+#define DOUT_SHARED1_DIV1		74</div><div class='add'>+#define DOUT_SHARED1_DIV2		75</div><div class='add'>+#define DOUT_SHARED1_DIV3		76</div><div class='add'>+#define DOUT_SHARED1_DIV4		77</div><div class='add'>+#define DOUT_SHARED2_DIV1		78</div><div class='add'>+#define DOUT_SHARED2_DIV2		79</div><div class='add'>+#define DOUT_SHARED2_DIV3		80</div><div class='add'>+#define DOUT_SHARED2_DIV4		81</div><div class='add'>+#define DOUT_SHARED3_DIV1		82</div><div class='add'>+#define DOUT_SHARED3_DIV2		83</div><div class='add'>+#define DOUT_SHARED3_DIV3		84</div><div class='add'>+#define DOUT_SHARED3_DIV4		85</div><div class='add'>+#define DOUT_SHARED4_DIV1		86</div><div class='add'>+#define DOUT_SHARED4_DIV2		87</div><div class='add'>+#define DOUT_SHARED4_DIV3		88</div><div class='add'>+#define DOUT_SHARED4_DIV4		89</div><div class='add'>+#define DOUT_SHARED5_DIV1		90</div><div class='add'>+#define DOUT_SHARED5_DIV2		91</div><div class='add'>+#define DOUT_SHARED5_DIV3		92</div><div class='add'>+#define DOUT_SHARED5_DIV4		93</div><div class='add'>+#define DOUT_CLKCMU_CMU_BOOST		94</div><div class='add'>+#define DOUT_CLKCMU_ACC_NOC		95</div><div class='add'>+#define DOUT_CLKCMU_ACC_ORB		96</div><div class='add'>+#define DOUT_CLKCMU_APM_NOC		97</div><div class='add'>+#define DOUT_CLKCMU_AUD_CPU		98</div><div class='add'>+#define DOUT_CLKCMU_AUD_NOC		99</div><div class='add'>+#define DOUT_CLKCMU_CPUCL0_SWITCH	100</div><div class='add'>+#define DOUT_CLKCMU_CPUCL0_CLUSTER	101</div><div class='add'>+#define DOUT_CLKCMU_CPUCL0_DBG		102</div><div class='add'>+#define DOUT_CLKCMU_CPUCL1_SWITCH	103</div><div class='add'>+#define DOUT_CLKCMU_CPUCL1_CLUSTER	104</div><div class='add'>+#define DOUT_CLKCMU_CPUCL2_SWITCH	105</div><div class='add'>+#define DOUT_CLKCMU_CPUCL2_CLUSTER	106</div><div class='add'>+#define DOUT_CLKCMU_DNC_NOC		107</div><div class='add'>+#define DOUT_CLKCMU_DPTX_NOC		108</div><div class='add'>+#define DOUT_CLKCMU_DPTX_DPGTC		109</div><div class='add'>+#define DOUT_CLKCMU_DPTX_DPOSC		110</div><div class='add'>+#define DOUT_CLKCMU_DPUB_NOC		111</div><div class='add'>+#define DOUT_CLKCMU_DPUB_DSIM		112</div><div class='add'>+#define DOUT_CLKCMU_DPUF0_NOC		113</div><div class='add'>+#define DOUT_CLKCMU_DPUF1_NOC		114</div><div class='add'>+#define DOUT_CLKCMU_DPUF2_NOC		115</div><div class='add'>+#define DOUT_CLKCMU_DSP_NOC		116</div><div class='add'>+#define DOUT_CLKCMU_G3D_SWITCH		117</div><div class='add'>+#define DOUT_CLKCMU_G3D_NOCP		118</div><div class='add'>+#define DOUT_CLKCMU_GNPU_NOC		119</div><div class='add'>+#define DOUT_CLKCMU_HSI0_NOC		120</div><div class='add'>+#define DOUT_CLKCMU_HSI1_NOC		121</div><div class='add'>+#define DOUT_CLKCMU_HSI1_USBDRD		122</div><div class='add'>+#define DOUT_CLKCMU_HSI1_MMC_CARD	123</div><div class='add'>+#define DOUT_CLKCMU_HSI2_NOC		124</div><div class='add'>+#define DOUT_CLKCMU_HSI2_NOC_UFS	125</div><div class='add'>+#define DOUT_CLKCMU_HSI2_UFS_EMBD	126</div><div class='add'>+#define DOUT_CLKCMU_HSI2_ETHERNET	127</div><div class='add'>+#define DOUT_CLKCMU_ISP_NOC		128</div><div class='add'>+#define DOUT_CLKCMU_M2M_NOC		129</div><div class='add'>+#define DOUT_CLKCMU_M2M_JPEG		130</div><div class='add'>+#define DOUT_CLKCMU_MFC_MFC		131</div><div class='add'>+#define DOUT_CLKCMU_MFC_WFD		132</div><div class='add'>+#define DOUT_CLKCMU_MFD_NOC		133</div><div class='add'>+#define DOUT_CLKCMU_MIF_NOCP		134</div><div class='add'>+#define DOUT_CLKCMU_MISC_NOC		135</div><div class='add'>+#define DOUT_CLKCMU_NOCL0_NOC		136</div><div class='add'>+#define DOUT_CLKCMU_NOCL1_NOC		137</div><div class='add'>+#define DOUT_CLKCMU_NOCL2_NOC		138</div><div class='add'>+#define DOUT_CLKCMU_PERIC0_NOC		139</div><div class='add'>+#define DOUT_CLKCMU_PERIC0_IP		140</div><div class='add'>+#define DOUT_CLKCMU_PERIC1_NOC		141</div><div class='add'>+#define DOUT_CLKCMU_PERIC1_IP		142</div><div class='add'>+#define DOUT_CLKCMU_SDMA_NOC		143</div><div class='add'>+#define DOUT_CLKCMU_SNW_NOC		144</div><div class='add'>+#define DOUT_CLKCMU_SSP_NOC		145</div><div class='add'>+#define DOUT_CLKCMU_TAA_NOC		146</div><div class='add'>+#define DOUT_TCXO_DIV2			147</div><div class='add'>+</div><div class='add'>+/* CMU_CPUCL0 */</div><div class='add'>+#define CLK_FOUT_CPUCL0_PLL		1</div><div class='add'>+</div><div class='add'>+#define CLK_MOUT_PLL_CPUCL0		2</div><div class='add'>+#define CLK_MOUT_CPUCL0_CLUSTER_USER	3</div><div class='add'>+#define CLK_MOUT_CPUCL0_DBG_USER	4</div><div class='add'>+#define CLK_MOUT_CPUCL0_SWITCH_USER	5</div><div class='add'>+#define CLK_MOUT_CPUCL0_CLUSTER		6</div><div class='add'>+#define CLK_MOUT_CPUCL0_CORE		7</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_CLUSTER0_ACLK		8</div><div class='add'>+#define CLK_DOUT_CLUSTER0_ATCLK		9</div><div class='add'>+#define CLK_DOUT_CLUSTER0_MPCLK		10</div><div class='add'>+#define CLK_DOUT_CLUSTER0_PCLK		11</div><div class='add'>+#define CLK_DOUT_CLUSTER0_PERIPHCLK	12</div><div class='add'>+#define CLK_DOUT_CPUCL0_DBG_NOC		13</div><div class='add'>+#define CLK_DOUT_CPUCL0_DBG_PCLKDBG	14</div><div class='add'>+#define CLK_DOUT_CPUCL0_NOCP		15</div><div class='add'>+</div><div class='add'>+/* CMU_CPUCL1 */</div><div class='add'>+#define CLK_FOUT_CPUCL1_PLL		1</div><div class='add'>+</div><div class='add'>+#define CLK_MOUT_PLL_CPUCL1		2</div><div class='add'>+#define CLK_MOUT_CPUCL1_CLUSTER_USER	3</div><div class='add'>+#define CLK_MOUT_CPUCL1_SWITCH_USER	4</div><div class='add'>+#define CLK_MOUT_CPUCL1_CLUSTER		5</div><div class='add'>+#define CLK_MOUT_CPUCL1_CORE		6</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_CLUSTER1_ACLK		7</div><div class='add'>+#define CLK_DOUT_CLUSTER1_ATCLK		8</div><div class='add'>+#define CLK_DOUT_CLUSTER1_MPCLK		9</div><div class='add'>+#define CLK_DOUT_CLUSTER1_PCLK		10</div><div class='add'>+#define CLK_DOUT_CLUSTER1_PERIPHCLK	11</div><div class='add'>+#define CLK_DOUT_CPUCL1_NOCP		12</div><div class='add'>+</div><div class='add'>+/* CMU_CPUCL2 */</div><div class='add'>+#define CLK_FOUT_CPUCL2_PLL		1</div><div class='add'>+</div><div class='add'>+#define CLK_MOUT_PLL_CPUCL2		2</div><div class='add'>+#define CLK_MOUT_CPUCL2_CLUSTER_USER	3</div><div class='add'>+#define CLK_MOUT_CPUCL2_SWITCH_USER	4</div><div class='add'>+#define CLK_MOUT_CPUCL2_CLUSTER		5</div><div class='add'>+#define CLK_MOUT_CPUCL2_CORE		6</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_CLUSTER2_ACLK		7</div><div class='add'>+#define CLK_DOUT_CLUSTER2_ATCLK		8</div><div class='add'>+#define CLK_DOUT_CLUSTER2_MPCLK		9</div><div class='add'>+#define CLK_DOUT_CLUSTER2_PCLK		10</div><div class='add'>+#define CLK_DOUT_CLUSTER2_PERIPHCLK	11</div><div class='add'>+#define CLK_DOUT_CPUCL2_NOCP		12</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC0 */</div><div class='add'>+#define CLK_MOUT_PERIC0_IP_USER		1</div><div class='add'>+#define CLK_MOUT_PERIC0_NOC_USER	2</div><div class='add'>+#define CLK_MOUT_PERIC0_USI00_USI	3</div><div class='add'>+#define CLK_MOUT_PERIC0_USI01_USI	4</div><div class='add'>+#define CLK_MOUT_PERIC0_USI02_USI	5</div><div class='add'>+#define CLK_MOUT_PERIC0_USI03_USI	6</div><div class='add'>+#define CLK_MOUT_PERIC0_USI04_USI	7</div><div class='add'>+#define CLK_MOUT_PERIC0_USI05_USI	8</div><div class='add'>+#define CLK_MOUT_PERIC0_USI06_USI	9</div><div class='add'>+#define CLK_MOUT_PERIC0_USI07_USI	10</div><div class='add'>+#define CLK_MOUT_PERIC0_USI08_USI	11</div><div class='add'>+#define CLK_MOUT_PERIC0_USI_I2C		12</div><div class='add'>+#define CLK_MOUT_PERIC0_I3C		13</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_PERIC0_USI00_USI	14</div><div class='add'>+#define CLK_DOUT_PERIC0_USI01_USI	15</div><div class='add'>+#define CLK_DOUT_PERIC0_USI02_USI	16</div><div class='add'>+#define CLK_DOUT_PERIC0_USI03_USI	17</div><div class='add'>+#define CLK_DOUT_PERIC0_USI04_USI	18</div><div class='add'>+#define CLK_DOUT_PERIC0_USI05_USI	19</div><div class='add'>+#define CLK_DOUT_PERIC0_USI06_USI	20</div><div class='add'>+#define CLK_DOUT_PERIC0_USI07_USI	21</div><div class='add'>+#define CLK_DOUT_PERIC0_USI08_USI	22</div><div class='add'>+#define CLK_DOUT_PERIC0_USI_I2C		23</div><div class='add'>+#define CLK_DOUT_PERIC0_I3C		24</div><div class='add'>+</div><div class='add'>+/* CMU_PERIC1 */</div><div class='add'>+#define CLK_MOUT_PERIC1_IP_USER		1</div><div class='add'>+#define CLK_MOUT_PERIC1_NOC_USER	2</div><div class='add'>+#define CLK_MOUT_PERIC1_USI09_USI	3</div><div class='add'>+#define CLK_MOUT_PERIC1_USI10_USI	4</div><div class='add'>+#define CLK_MOUT_PERIC1_USI11_USI	5</div><div class='add'>+#define CLK_MOUT_PERIC1_USI12_USI	6</div><div class='add'>+#define CLK_MOUT_PERIC1_USI13_USI	7</div><div class='add'>+#define CLK_MOUT_PERIC1_USI14_USI	8</div><div class='add'>+#define CLK_MOUT_PERIC1_USI15_USI	9</div><div class='add'>+#define CLK_MOUT_PERIC1_USI16_USI	10</div><div class='add'>+#define CLK_MOUT_PERIC1_USI17_USI	11</div><div class='add'>+#define CLK_MOUT_PERIC1_USI_I2C		12</div><div class='add'>+#define CLK_MOUT_PERIC1_I3C		13</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_PERIC1_USI09_USI	14</div><div class='add'>+#define CLK_DOUT_PERIC1_USI10_USI	15</div><div class='add'>+#define CLK_DOUT_PERIC1_USI11_USI	16</div><div class='add'>+#define CLK_DOUT_PERIC1_USI12_USI	17</div><div class='add'>+#define CLK_DOUT_PERIC1_USI13_USI	18</div><div class='add'>+#define CLK_DOUT_PERIC1_USI14_USI	19</div><div class='add'>+#define CLK_DOUT_PERIC1_USI15_USI	20</div><div class='add'>+#define CLK_DOUT_PERIC1_USI16_USI	21</div><div class='add'>+#define CLK_DOUT_PERIC1_USI17_USI	22</div><div class='add'>+#define CLK_DOUT_PERIC1_USI_I2C		23</div><div class='add'>+#define CLK_DOUT_PERIC1_I3C		24</div><div class='add'>+</div><div class='add'>+/* CMU_MISC */</div><div class='add'>+#define CLK_MOUT_MISC_NOC_USER		1</div><div class='add'>+#define CLK_MOUT_MISC_GIC		2</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_MISC_OTP		3</div><div class='add'>+#define CLK_DOUT_MISC_NOCP		4</div><div class='add'>+#define CLK_DOUT_MISC_OSC_DIV2		5</div><div class='add'>+</div><div class='add'>+/* CMU_HSI0 */</div><div class='add'>+#define CLK_MOUT_HSI0_NOC_USER		1</div><div class='add'>+</div><div class='add'>+#define CLK_DOUT_HSI0_PCIE_APB		2</div><div class='add'>+</div><div class='add'>+/* CMU_HSI1 */</div><div class='add'>+#define CLK_MOUT_HSI1_MMC_CARD_USER	1</div><div class='add'>+#define CLK_MOUT_HSI1_NOC_USER		2</div><div class='add'>+#define CLK_MOUT_HSI1_USBDRD_USER	3</div><div class='add'>+#define CLK_MOUT_HSI1_USBDRD		4</div><div class='add'>+</div><div class='add'>+/* CMU_HSI2 */</div><div class='add'>+#define FOUT_PLL_ETH                    1</div><div class='add'>+#define CLK_MOUT_HSI2_NOC_UFS_USER      2</div><div class='add'>+#define CLK_MOUT_HSI2_UFS_EMBD_USER     3</div><div class='add'>+#define CLK_MOUT_HSI2_ETHERNET          4</div><div class='add'>+#define CLK_MOUT_HSI2_ETHERNET_USER     5</div><div class='add'>+#define CLK_DOUT_HSI2_ETHERNET          6</div><div class='add'>+#define CLK_DOUT_HSI2_ETHERNET_PTP      7</div><div class='add'>+</div><div class='add'>+/* CMU_M2M */</div><div class='add'>+#define CLK_MOUT_M2M_JPEG_USER          1</div><div class='add'>+#define CLK_MOUT_M2M_NOC_USER           2</div><div class='add'>+#define CLK_DOUT_M2M_NOCP               3</div><div class='add'>+</div><div class='add'>+/* CMU_MFC */</div><div class='add'>+#define CLK_MOUT_MFC_MFC_USER           1</div><div class='add'>+#define CLK_MOUT_MFC_WFD_USER           2</div><div class='add'>+#define CLK_DOUT_MFC_NOCP               3</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLOCK_EXYNOSAUTOV920_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/sophgo,sg2042-clkgen.h b/include/dt-bindings/clock/sophgo,sg2042-clkgen.h<br/>new file mode 100644<br/>index 000000000000..84f7857317a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sophgo,sg2042-clkgen.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sophgo,sg2042-clkgen.h</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Sophgo Technology Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_SOPHGO_SG2042_CLKGEN_H__</div><div class='add'>+#define __DT_BINDINGS_SOPHGO_SG2042_CLKGEN_H__</div><div class='add'>+</div><div class='add'>+#define DIV_CLK_MPLL_RP_CPU_NORMAL_0	0</div><div class='add'>+#define DIV_CLK_MPLL_AXI_DDR_0		1</div><div class='add'>+#define DIV_CLK_FPLL_DDR01_1		2</div><div class='add'>+#define DIV_CLK_FPLL_DDR23_1		3</div><div class='add'>+#define DIV_CLK_FPLL_RP_CPU_NORMAL_1	4</div><div class='add'>+#define DIV_CLK_FPLL_50M_A53		5</div><div class='add'>+#define DIV_CLK_FPLL_TOP_RP_CMN_DIV2	6</div><div class='add'>+#define DIV_CLK_FPLL_UART_500M		7</div><div class='add'>+#define DIV_CLK_FPLL_AHB_LPC		8</div><div class='add'>+#define DIV_CLK_FPLL_EFUSE		9</div><div class='add'>+#define DIV_CLK_FPLL_TX_ETH0		10</div><div class='add'>+#define DIV_CLK_FPLL_PTP_REF_I_ETH0	11</div><div class='add'>+#define DIV_CLK_FPLL_REF_ETH0		12</div><div class='add'>+#define DIV_CLK_FPLL_EMMC		13</div><div class='add'>+#define DIV_CLK_FPLL_SD			14</div><div class='add'>+#define DIV_CLK_FPLL_TOP_AXI0		15</div><div class='add'>+#define DIV_CLK_FPLL_TOP_AXI_HSPERI	16</div><div class='add'>+#define DIV_CLK_FPLL_AXI_DDR_1		17</div><div class='add'>+#define DIV_CLK_FPLL_DIV_TIMER1		18</div><div class='add'>+#define DIV_CLK_FPLL_DIV_TIMER2		19</div><div class='add'>+#define DIV_CLK_FPLL_DIV_TIMER3		20</div><div class='add'>+#define DIV_CLK_FPLL_DIV_TIMER4		21</div><div class='add'>+#define DIV_CLK_FPLL_DIV_TIMER5		22</div><div class='add'>+#define DIV_CLK_FPLL_DIV_TIMER6		23</div><div class='add'>+#define DIV_CLK_FPLL_DIV_TIMER7		24</div><div class='add'>+#define DIV_CLK_FPLL_DIV_TIMER8		25</div><div class='add'>+#define DIV_CLK_FPLL_100K_EMMC		26</div><div class='add'>+#define DIV_CLK_FPLL_100K_SD		27</div><div class='add'>+#define DIV_CLK_FPLL_GPIO_DB		28</div><div class='add'>+#define DIV_CLK_DPLL0_DDR01_0		29</div><div class='add'>+#define DIV_CLK_DPLL1_DDR23_0		30</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_RP_CPU_NORMAL_DIV0	31</div><div class='add'>+#define GATE_CLK_AXI_DDR_DIV0		32</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_RP_CPU_NORMAL_DIV1	33</div><div class='add'>+#define GATE_CLK_A53_50M		34</div><div class='add'>+#define GATE_CLK_TOP_RP_CMN_DIV2	35</div><div class='add'>+#define GATE_CLK_HSDMA			36</div><div class='add'>+#define GATE_CLK_EMMC_100M		37</div><div class='add'>+#define GATE_CLK_SD_100M		38</div><div class='add'>+#define GATE_CLK_TX_ETH0		39</div><div class='add'>+#define GATE_CLK_PTP_REF_I_ETH0		40</div><div class='add'>+#define GATE_CLK_REF_ETH0		41</div><div class='add'>+#define GATE_CLK_UART_500M		42</div><div class='add'>+#define GATE_CLK_EFUSE			43</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_AHB_LPC		44</div><div class='add'>+#define GATE_CLK_AHB_ROM		45</div><div class='add'>+#define GATE_CLK_AHB_SF			46</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_APB_UART		47</div><div class='add'>+#define GATE_CLK_APB_TIMER		48</div><div class='add'>+#define GATE_CLK_APB_EFUSE		49</div><div class='add'>+#define GATE_CLK_APB_GPIO		50</div><div class='add'>+#define GATE_CLK_APB_GPIO_INTR		51</div><div class='add'>+#define GATE_CLK_APB_SPI		52</div><div class='add'>+#define GATE_CLK_APB_I2C		53</div><div class='add'>+#define GATE_CLK_APB_WDT		54</div><div class='add'>+#define GATE_CLK_APB_PWM		55</div><div class='add'>+#define GATE_CLK_APB_RTC		56</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_AXI_PCIE0		57</div><div class='add'>+#define GATE_CLK_AXI_PCIE1		58</div><div class='add'>+#define GATE_CLK_SYSDMA_AXI		59</div><div class='add'>+#define GATE_CLK_AXI_DBG_I2C		60</div><div class='add'>+#define GATE_CLK_AXI_SRAM		61</div><div class='add'>+#define GATE_CLK_AXI_ETH0		62</div><div class='add'>+#define GATE_CLK_AXI_EMMC		63</div><div class='add'>+#define GATE_CLK_AXI_SD			64</div><div class='add'>+#define GATE_CLK_TOP_AXI0		65</div><div class='add'>+#define GATE_CLK_TOP_AXI_HSPERI		66</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_TIMER1			67</div><div class='add'>+#define GATE_CLK_TIMER2			68</div><div class='add'>+#define GATE_CLK_TIMER3			69</div><div class='add'>+#define GATE_CLK_TIMER4			70</div><div class='add'>+#define GATE_CLK_TIMER5			71</div><div class='add'>+#define GATE_CLK_TIMER6			72</div><div class='add'>+#define GATE_CLK_TIMER7			73</div><div class='add'>+#define GATE_CLK_TIMER8			74</div><div class='add'>+#define GATE_CLK_100K_EMMC		75</div><div class='add'>+#define GATE_CLK_100K_SD		76</div><div class='add'>+#define GATE_CLK_GPIO_DB		77</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_AXI_DDR_DIV1		78</div><div class='add'>+#define GATE_CLK_DDR01_DIV1		79</div><div class='add'>+#define GATE_CLK_DDR23_DIV1		80</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_DDR01_DIV0		81</div><div class='add'>+#define GATE_CLK_DDR23_DIV0		82</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_DDR01			83</div><div class='add'>+#define GATE_CLK_DDR23			84</div><div class='add'>+#define GATE_CLK_RP_CPU_NORMAL		85</div><div class='add'>+#define GATE_CLK_AXI_DDR		86</div><div class='add'>+</div><div class='add'>+#define MUX_CLK_DDR01			87</div><div class='add'>+#define MUX_CLK_DDR23			88</div><div class='add'>+#define MUX_CLK_RP_CPU_NORMAL		89</div><div class='add'>+#define MUX_CLK_AXI_DDR			90</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_SOPHGO_SG2042_CLKGEN_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/sophgo,sg2042-pll.h b/include/dt-bindings/clock/sophgo,sg2042-pll.h<br/>new file mode 100644<br/>index 000000000000..2d519b3bf51c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sophgo,sg2042-pll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sophgo,sg2042-pll.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Sophgo Technology Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_SOPHGO_SG2042_PLL_H__</div><div class='add'>+#define __DT_BINDINGS_SOPHGO_SG2042_PLL_H__</div><div class='add'>+</div><div class='add'>+#define MPLL_CLK			0</div><div class='add'>+#define FPLL_CLK			1</div><div class='add'>+#define DPLL0_CLK			2</div><div class='add'>+#define DPLL1_CLK			3</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_SOPHGO_SG2042_PLL_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/sophgo,sg2042-rpgate.h b/include/dt-bindings/clock/sophgo,sg2042-rpgate.h<br/>new file mode 100644<br/>index 000000000000..8b4522d5f559<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sophgo,sg2042-rpgate.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sophgo,sg2042-rpgate.h</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Sophgo Technology Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_SOPHGO_SG2042_RPGATE_H__</div><div class='add'>+#define __DT_BINDINGS_SOPHGO_SG2042_RPGATE_H__</div><div class='add'>+</div><div class='add'>+#define GATE_CLK_RXU0			0</div><div class='add'>+#define GATE_CLK_RXU1			1</div><div class='add'>+#define GATE_CLK_RXU2			2</div><div class='add'>+#define GATE_CLK_RXU3			3</div><div class='add'>+#define GATE_CLK_RXU4			4</div><div class='add'>+#define GATE_CLK_RXU5			5</div><div class='add'>+#define GATE_CLK_RXU6			6</div><div class='add'>+#define GATE_CLK_RXU7			7</div><div class='add'>+#define GATE_CLK_RXU8			8</div><div class='add'>+#define GATE_CLK_RXU9			9</div><div class='add'>+#define GATE_CLK_RXU10			10</div><div class='add'>+#define GATE_CLK_RXU11			11</div><div class='add'>+#define GATE_CLK_RXU12			12</div><div class='add'>+#define GATE_CLK_RXU13			13</div><div class='add'>+#define GATE_CLK_RXU14			14</div><div class='add'>+#define GATE_CLK_RXU15			15</div><div class='add'>+#define GATE_CLK_RXU16			16</div><div class='add'>+#define GATE_CLK_RXU17			17</div><div class='add'>+#define GATE_CLK_RXU18			18</div><div class='add'>+#define GATE_CLK_RXU19			19</div><div class='add'>+#define GATE_CLK_RXU20			20</div><div class='add'>+#define GATE_CLK_RXU21			21</div><div class='add'>+#define GATE_CLK_RXU22			22</div><div class='add'>+#define GATE_CLK_RXU23			23</div><div class='add'>+#define GATE_CLK_RXU24			24</div><div class='add'>+#define GATE_CLK_RXU25			25</div><div class='add'>+#define GATE_CLK_RXU26			26</div><div class='add'>+#define GATE_CLK_RXU27			27</div><div class='add'>+#define GATE_CLK_RXU28			28</div><div class='add'>+#define GATE_CLK_RXU29			29</div><div class='add'>+#define GATE_CLK_RXU30			30</div><div class='add'>+#define GATE_CLK_RXU31			31</div><div class='add'>+#define GATE_CLK_MP0			32</div><div class='add'>+#define GATE_CLK_MP1			33</div><div class='add'>+#define GATE_CLK_MP2			34</div><div class='add'>+#define GATE_CLK_MP3			35</div><div class='add'>+#define GATE_CLK_MP4			36</div><div class='add'>+#define GATE_CLK_MP5			37</div><div class='add'>+#define GATE_CLK_MP6			38</div><div class='add'>+#define GATE_CLK_MP7			39</div><div class='add'>+#define GATE_CLK_MP8			40</div><div class='add'>+#define GATE_CLK_MP9			41</div><div class='add'>+#define GATE_CLK_MP10			42</div><div class='add'>+#define GATE_CLK_MP11			43</div><div class='add'>+#define GATE_CLK_MP12			44</div><div class='add'>+#define GATE_CLK_MP13			45</div><div class='add'>+#define GATE_CLK_MP14			46</div><div class='add'>+#define GATE_CLK_MP15			47</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_SOPHGO_SG2042_RPGATE_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/sophgo,sg2044-clk.h b/include/dt-bindings/clock/sophgo,sg2044-clk.h<br/>new file mode 100644<br/>index 000000000000..d9adca42548e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sophgo,sg2044-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sophgo,sg2044-clk.h</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Inochi Amaoto &lt;inochiama@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_SOPHGO_SG2044_CLK_H__</div><div class='add'>+#define __DT_BINDINGS_SOPHGO_SG2044_CLK_H__</div><div class='add'>+</div><div class='add'>+#define CLK_DIV_AP_SYS_FIXED		0</div><div class='add'>+#define CLK_DIV_AP_SYS_MAIN		1</div><div class='add'>+#define CLK_DIV_RP_SYS_FIXED		2</div><div class='add'>+#define CLK_DIV_RP_SYS_MAIN		3</div><div class='add'>+#define CLK_DIV_TPU_SYS_FIXED		4</div><div class='add'>+#define CLK_DIV_TPU_SYS_MAIN		5</div><div class='add'>+#define CLK_DIV_NOC_SYS_FIXED		6</div><div class='add'>+#define CLK_DIV_NOC_SYS_MAIN		7</div><div class='add'>+#define CLK_DIV_VC_SRC0_FIXED		8</div><div class='add'>+#define CLK_DIV_VC_SRC0_MAIN		9</div><div class='add'>+#define CLK_DIV_VC_SRC1_FIXED		10</div><div class='add'>+#define CLK_DIV_VC_SRC1_MAIN		11</div><div class='add'>+#define CLK_DIV_CXP_MAC_FIXED		12</div><div class='add'>+#define CLK_DIV_CXP_MAC_MAIN		13</div><div class='add'>+#define CLK_DIV_DDR0_FIXED		14</div><div class='add'>+#define CLK_DIV_DDR0_MAIN		15</div><div class='add'>+#define CLK_DIV_DDR1_FIXED		16</div><div class='add'>+#define CLK_DIV_DDR1_MAIN		17</div><div class='add'>+#define CLK_DIV_DDR2_FIXED		18</div><div class='add'>+#define CLK_DIV_DDR2_MAIN		19</div><div class='add'>+#define CLK_DIV_DDR3_FIXED		20</div><div class='add'>+#define CLK_DIV_DDR3_MAIN		21</div><div class='add'>+#define CLK_DIV_DDR4_FIXED		22</div><div class='add'>+#define CLK_DIV_DDR4_MAIN		23</div><div class='add'>+#define CLK_DIV_DDR5_FIXED		24</div><div class='add'>+#define CLK_DIV_DDR5_MAIN		25</div><div class='add'>+#define CLK_DIV_DDR6_FIXED		26</div><div class='add'>+#define CLK_DIV_DDR6_MAIN		27</div><div class='add'>+#define CLK_DIV_DDR7_FIXED		28</div><div class='add'>+#define CLK_DIV_DDR7_MAIN		29</div><div class='add'>+#define CLK_DIV_TOP_50M			30</div><div class='add'>+#define CLK_DIV_TOP_AXI0		31</div><div class='add'>+#define CLK_DIV_TOP_AXI_HSPERI		32</div><div class='add'>+#define CLK_DIV_TIMER0			33</div><div class='add'>+#define CLK_DIV_TIMER1			34</div><div class='add'>+#define CLK_DIV_TIMER2			35</div><div class='add'>+#define CLK_DIV_TIMER3			36</div><div class='add'>+#define CLK_DIV_TIMER4			37</div><div class='add'>+#define CLK_DIV_TIMER5			38</div><div class='add'>+#define CLK_DIV_TIMER6			39</div><div class='add'>+#define CLK_DIV_TIMER7			40</div><div class='add'>+#define CLK_DIV_CXP_TEST_PHY		41</div><div class='add'>+#define CLK_DIV_CXP_TEST_ETH_PHY	42</div><div class='add'>+#define CLK_DIV_C2C0_TEST_PHY		43</div><div class='add'>+#define CLK_DIV_C2C1_TEST_PHY		44</div><div class='add'>+#define CLK_DIV_PCIE_1G			45</div><div class='add'>+#define CLK_DIV_UART_500M		46</div><div class='add'>+#define CLK_DIV_GPIO_DB			47</div><div class='add'>+#define CLK_DIV_SD			48</div><div class='add'>+#define CLK_DIV_SD_100K			49</div><div class='add'>+#define CLK_DIV_EMMC			50</div><div class='add'>+#define CLK_DIV_EMMC_100K		51</div><div class='add'>+#define CLK_DIV_EFUSE			52</div><div class='add'>+#define CLK_DIV_TX_ETH0			53</div><div class='add'>+#define CLK_DIV_PTP_REF_I_ETH0		54</div><div class='add'>+#define CLK_DIV_REF_ETH0		55</div><div class='add'>+#define CLK_DIV_PKA			56</div><div class='add'>+#define CLK_MUX_DDR0			57</div><div class='add'>+#define CLK_MUX_DDR1			58</div><div class='add'>+#define CLK_MUX_DDR2			59</div><div class='add'>+#define CLK_MUX_DDR3			60</div><div class='add'>+#define CLK_MUX_DDR4			61</div><div class='add'>+#define CLK_MUX_DDR5			62</div><div class='add'>+#define CLK_MUX_DDR6			63</div><div class='add'>+#define CLK_MUX_DDR7			64</div><div class='add'>+#define CLK_MUX_NOC_SYS			65</div><div class='add'>+#define CLK_MUX_TPU_SYS			66</div><div class='add'>+#define CLK_MUX_RP_SYS			67</div><div class='add'>+#define CLK_MUX_AP_SYS			68</div><div class='add'>+#define CLK_MUX_VC_SRC0			69</div><div class='add'>+#define CLK_MUX_VC_SRC1			70</div><div class='add'>+#define CLK_MUX_CXP_MAC			71</div><div class='add'>+#define CLK_GATE_AP_SYS			72</div><div class='add'>+#define CLK_GATE_RP_SYS			73</div><div class='add'>+#define CLK_GATE_TPU_SYS		74</div><div class='add'>+#define CLK_GATE_NOC_SYS		75</div><div class='add'>+#define CLK_GATE_VC_SRC0		76</div><div class='add'>+#define CLK_GATE_VC_SRC1		77</div><div class='add'>+#define CLK_GATE_DDR0			78</div><div class='add'>+#define CLK_GATE_DDR1			79</div><div class='add'>+#define CLK_GATE_DDR2			80</div><div class='add'>+#define CLK_GATE_DDR3			81</div><div class='add'>+#define CLK_GATE_DDR4			82</div><div class='add'>+#define CLK_GATE_DDR5			83</div><div class='add'>+#define CLK_GATE_DDR6			84</div><div class='add'>+#define CLK_GATE_DDR7			85</div><div class='add'>+#define CLK_GATE_TOP_50M		86</div><div class='add'>+#define CLK_GATE_SC_RX			87</div><div class='add'>+#define CLK_GATE_SC_RX_X0Y1		88</div><div class='add'>+#define CLK_GATE_TOP_AXI0		89</div><div class='add'>+#define CLK_GATE_INTC0			90</div><div class='add'>+#define CLK_GATE_INTC1			91</div><div class='add'>+#define CLK_GATE_INTC2			92</div><div class='add'>+#define CLK_GATE_INTC3			93</div><div class='add'>+#define CLK_GATE_MAILBOX0		94</div><div class='add'>+#define CLK_GATE_MAILBOX1		95</div><div class='add'>+#define CLK_GATE_MAILBOX2		96</div><div class='add'>+#define CLK_GATE_MAILBOX3		97</div><div class='add'>+#define CLK_GATE_TOP_AXI_HSPERI		98</div><div class='add'>+#define CLK_GATE_APB_TIMER		99</div><div class='add'>+#define CLK_GATE_TIMER0			100</div><div class='add'>+#define CLK_GATE_TIMER1			101</div><div class='add'>+#define CLK_GATE_TIMER2			102</div><div class='add'>+#define CLK_GATE_TIMER3			103</div><div class='add'>+#define CLK_GATE_TIMER4			104</div><div class='add'>+#define CLK_GATE_TIMER5			105</div><div class='add'>+#define CLK_GATE_TIMER6			106</div><div class='add'>+#define CLK_GATE_TIMER7			107</div><div class='add'>+#define CLK_GATE_CXP_CFG		108</div><div class='add'>+#define CLK_GATE_CXP_MAC		109</div><div class='add'>+#define CLK_GATE_CXP_TEST_PHY		110</div><div class='add'>+#define CLK_GATE_CXP_TEST_ETH_PHY	111</div><div class='add'>+#define CLK_GATE_PCIE_1G		112</div><div class='add'>+#define CLK_GATE_C2C0_TEST_PHY		113</div><div class='add'>+#define CLK_GATE_C2C1_TEST_PHY		114</div><div class='add'>+#define CLK_GATE_UART_500M		115</div><div class='add'>+#define CLK_GATE_APB_UART		116</div><div class='add'>+#define CLK_GATE_APB_SPI		117</div><div class='add'>+#define CLK_GATE_AHB_SPIFMC		118</div><div class='add'>+#define CLK_GATE_APB_I2C		119</div><div class='add'>+#define CLK_GATE_AXI_DBG_I2C		120</div><div class='add'>+#define CLK_GATE_GPIO_DB		121</div><div class='add'>+#define CLK_GATE_APB_GPIO_INTR		122</div><div class='add'>+#define CLK_GATE_APB_GPIO		123</div><div class='add'>+#define CLK_GATE_SD			124</div><div class='add'>+#define CLK_GATE_AXI_SD			125</div><div class='add'>+#define CLK_GATE_SD_100K		126</div><div class='add'>+#define CLK_GATE_EMMC			127</div><div class='add'>+#define CLK_GATE_AXI_EMMC		128</div><div class='add'>+#define CLK_GATE_EMMC_100K		129</div><div class='add'>+#define CLK_GATE_EFUSE			130</div><div class='add'>+#define CLK_GATE_APB_EFUSE		131</div><div class='add'>+#define CLK_GATE_SYSDMA_AXI		132</div><div class='add'>+#define CLK_GATE_TX_ETH0		133</div><div class='add'>+#define CLK_GATE_AXI_ETH0		134</div><div class='add'>+#define CLK_GATE_PTP_REF_I_ETH0		135</div><div class='add'>+#define CLK_GATE_REF_ETH0		136</div><div class='add'>+#define CLK_GATE_APB_RTC		137</div><div class='add'>+#define CLK_GATE_APB_PWM		138</div><div class='add'>+#define CLK_GATE_APB_WDT		139</div><div class='add'>+#define CLK_GATE_AXI_SRAM		140</div><div class='add'>+#define CLK_GATE_AHB_ROM		141</div><div class='add'>+#define CLK_GATE_PKA			142</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_SOPHGO_SG2044_CLK_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/sophgo,sg2044-pll.h b/include/dt-bindings/clock/sophgo,sg2044-pll.h<br/>new file mode 100644<br/>index 000000000000..817d45e700cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sophgo,sg2044-pll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sophgo,sg2044-pll.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Inochi Amaoto &lt;inochiama@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_SOPHGO_SG2044_PLL_H__</div><div class='add'>+#define __DT_BINDINGS_SOPHGO_SG2044_PLL_H__</div><div class='add'>+</div><div class='add'>+#define CLK_FPLL0			0</div><div class='add'>+#define CLK_FPLL1			1</div><div class='add'>+#define CLK_FPLL2			2</div><div class='add'>+#define CLK_DPLL0			3</div><div class='add'>+#define CLK_DPLL1			4</div><div class='add'>+#define CLK_DPLL2			5</div><div class='add'>+#define CLK_DPLL3			6</div><div class='add'>+#define CLK_DPLL4			7</div><div class='add'>+#define CLK_DPLL5			8</div><div class='add'>+#define CLK_DPLL6			9</div><div class='add'>+#define CLK_DPLL7			10</div><div class='add'>+#define CLK_MPLL0			11</div><div class='add'>+#define CLK_MPLL1			12</div><div class='add'>+#define CLK_MPLL2			13</div><div class='add'>+#define CLK_MPLL3			14</div><div class='add'>+#define CLK_MPLL4			15</div><div class='add'>+#define CLK_MPLL5			16</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_SOPHGO_SG2044_PLL_H__ */</div><div class='head'>diff --git a/include/dt-bindings/clock/spacemit,k1-syscon.h b/include/dt-bindings/clock/spacemit,k1-syscon.h<br/>new file mode 100644<br/>index 000000000000..0f8b59d6753c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/spacemit,k1-syscon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/spacemit,k1-syscon.h</a></div><div class='hunk'>@@ -0,0 +1,394 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024-2025 Haylen Chu &lt;heylenay@outlook.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_SPACEMIT_CCU_H_</div><div class='add'>+#define _DT_BINDINGS_SPACEMIT_CCU_H_</div><div class='add'>+</div><div class='add'>+/* APBS (PLL) clocks */</div><div class='add'>+#define CLK_PLL1		0</div><div class='add'>+#define CLK_PLL2		1</div><div class='add'>+#define CLK_PLL3		2</div><div class='add'>+#define CLK_PLL1_D2		3</div><div class='add'>+#define CLK_PLL1_D3		4</div><div class='add'>+#define CLK_PLL1_D4		5</div><div class='add'>+#define CLK_PLL1_D5		6</div><div class='add'>+#define CLK_PLL1_D6		7</div><div class='add'>+#define CLK_PLL1_D7		8</div><div class='add'>+#define CLK_PLL1_D8		9</div><div class='add'>+#define CLK_PLL1_D11		10</div><div class='add'>+#define CLK_PLL1_D13		11</div><div class='add'>+#define CLK_PLL1_D23		12</div><div class='add'>+#define CLK_PLL1_D64		13</div><div class='add'>+#define CLK_PLL1_D10_AUD	14</div><div class='add'>+#define CLK_PLL1_D100_AUD	15</div><div class='add'>+#define CLK_PLL2_D1		16</div><div class='add'>+#define CLK_PLL2_D2		17</div><div class='add'>+#define CLK_PLL2_D3		18</div><div class='add'>+#define CLK_PLL2_D4		19</div><div class='add'>+#define CLK_PLL2_D5		20</div><div class='add'>+#define CLK_PLL2_D6		21</div><div class='add'>+#define CLK_PLL2_D7		22</div><div class='add'>+#define CLK_PLL2_D8		23</div><div class='add'>+#define CLK_PLL3_D1		24</div><div class='add'>+#define CLK_PLL3_D2		25</div><div class='add'>+#define CLK_PLL3_D3		26</div><div class='add'>+#define CLK_PLL3_D4		27</div><div class='add'>+#define CLK_PLL3_D5		28</div><div class='add'>+#define CLK_PLL3_D6		29</div><div class='add'>+#define CLK_PLL3_D7		30</div><div class='add'>+#define CLK_PLL3_D8		31</div><div class='add'>+#define CLK_PLL3_80		32</div><div class='add'>+#define CLK_PLL3_40		33</div><div class='add'>+#define CLK_PLL3_20		34</div><div class='add'>+</div><div class='add'>+/* MPMU clocks */</div><div class='add'>+#define CLK_PLL1_307P2		0</div><div class='add'>+#define CLK_PLL1_76P8		1</div><div class='add'>+#define CLK_PLL1_61P44		2</div><div class='add'>+#define CLK_PLL1_153P6		3</div><div class='add'>+#define CLK_PLL1_102P4		4</div><div class='add'>+#define CLK_PLL1_51P2		5</div><div class='add'>+#define CLK_PLL1_51P2_AP	6</div><div class='add'>+#define CLK_PLL1_57P6		7</div><div class='add'>+#define CLK_PLL1_25P6		8</div><div class='add'>+#define CLK_PLL1_12P8		9</div><div class='add'>+#define CLK_PLL1_12P8_WDT	10</div><div class='add'>+#define CLK_PLL1_6P4		11</div><div class='add'>+#define CLK_PLL1_3P2		12</div><div class='add'>+#define CLK_PLL1_1P6		13</div><div class='add'>+#define CLK_PLL1_0P8		14</div><div class='add'>+#define CLK_PLL1_409P6		15</div><div class='add'>+#define CLK_PLL1_204P8		16</div><div class='add'>+#define CLK_PLL1_491		17</div><div class='add'>+#define CLK_PLL1_245P76		18</div><div class='add'>+#define CLK_PLL1_614		19</div><div class='add'>+#define CLK_PLL1_47P26		20</div><div class='add'>+#define CLK_PLL1_31P5		21</div><div class='add'>+#define CLK_PLL1_819		22</div><div class='add'>+#define CLK_PLL1_1228		23</div><div class='add'>+#define CLK_SLOW_UART		24</div><div class='add'>+#define CLK_SLOW_UART1		25</div><div class='add'>+#define CLK_SLOW_UART2		26</div><div class='add'>+#define CLK_WDT			27</div><div class='add'>+#define CLK_RIPC		28</div><div class='add'>+#define CLK_I2S_SYSCLK		29</div><div class='add'>+#define CLK_I2S_BCLK		30</div><div class='add'>+#define CLK_APB			31</div><div class='add'>+#define CLK_WDT_BUS		32</div><div class='add'>+#define CLK_I2S_153P6		33</div><div class='add'>+#define CLK_I2S_153P6_BASE	34</div><div class='add'>+#define CLK_I2S_SYSCLK_SRC	35</div><div class='add'>+#define CLK_I2S_BCLK_FACTOR	36</div><div class='add'>+</div><div class='add'>+/* MPMU resets */</div><div class='add'>+#define RESET_WDT		0</div><div class='add'>+</div><div class='add'>+/* APBC clocks */</div><div class='add'>+#define CLK_UART0		0</div><div class='add'>+#define CLK_UART2		1</div><div class='add'>+#define CLK_UART3		2</div><div class='add'>+#define CLK_UART4		3</div><div class='add'>+#define CLK_UART5		4</div><div class='add'>+#define CLK_UART6		5</div><div class='add'>+#define CLK_UART7		6</div><div class='add'>+#define CLK_UART8		7</div><div class='add'>+#define CLK_UART9		8</div><div class='add'>+#define CLK_GPIO		9</div><div class='add'>+#define CLK_PWM0		10</div><div class='add'>+#define CLK_PWM1		11</div><div class='add'>+#define CLK_PWM2		12</div><div class='add'>+#define CLK_PWM3		13</div><div class='add'>+#define CLK_PWM4		14</div><div class='add'>+#define CLK_PWM5		15</div><div class='add'>+#define CLK_PWM6		16</div><div class='add'>+#define CLK_PWM7		17</div><div class='add'>+#define CLK_PWM8		18</div><div class='add'>+#define CLK_PWM9		19</div><div class='add'>+#define CLK_PWM10		20</div><div class='add'>+#define CLK_PWM11		21</div><div class='add'>+#define CLK_PWM12		22</div><div class='add'>+#define CLK_PWM13		23</div><div class='add'>+#define CLK_PWM14		24</div><div class='add'>+#define CLK_PWM15		25</div><div class='add'>+#define CLK_PWM16		26</div><div class='add'>+#define CLK_PWM17		27</div><div class='add'>+#define CLK_PWM18		28</div><div class='add'>+#define CLK_PWM19		29</div><div class='add'>+#define CLK_SSP3		30</div><div class='add'>+#define CLK_RTC			31</div><div class='add'>+#define CLK_TWSI0		32</div><div class='add'>+#define CLK_TWSI1		33</div><div class='add'>+#define CLK_TWSI2		34</div><div class='add'>+#define CLK_TWSI4		35</div><div class='add'>+#define CLK_TWSI5		36</div><div class='add'>+#define CLK_TWSI6		37</div><div class='add'>+#define CLK_TWSI7		38</div><div class='add'>+#define CLK_TWSI8		39</div><div class='add'>+#define CLK_TIMERS1		40</div><div class='add'>+#define CLK_TIMERS2		41</div><div class='add'>+#define CLK_AIB			42</div><div class='add'>+#define CLK_ONEWIRE		43</div><div class='add'>+#define CLK_SSPA0		44</div><div class='add'>+#define CLK_SSPA1		45</div><div class='add'>+#define CLK_DRO			46</div><div class='add'>+#define CLK_IR			47</div><div class='add'>+#define CLK_TSEN		48</div><div class='add'>+#define CLK_IPC_AP2AUD		49</div><div class='add'>+#define CLK_CAN0		50</div><div class='add'>+#define CLK_CAN0_BUS		51</div><div class='add'>+#define CLK_UART0_BUS		52</div><div class='add'>+#define CLK_UART2_BUS		53</div><div class='add'>+#define CLK_UART3_BUS		54</div><div class='add'>+#define CLK_UART4_BUS		55</div><div class='add'>+#define CLK_UART5_BUS		56</div><div class='add'>+#define CLK_UART6_BUS		57</div><div class='add'>+#define CLK_UART7_BUS		58</div><div class='add'>+#define CLK_UART8_BUS		59</div><div class='add'>+#define CLK_UART9_BUS		60</div><div class='add'>+#define CLK_GPIO_BUS		61</div><div class='add'>+#define CLK_PWM0_BUS		62</div><div class='add'>+#define CLK_PWM1_BUS		63</div><div class='add'>+#define CLK_PWM2_BUS		64</div><div class='add'>+#define CLK_PWM3_BUS		65</div><div class='add'>+#define CLK_PWM4_BUS		66</div><div class='add'>+#define CLK_PWM5_BUS		67</div><div class='add'>+#define CLK_PWM6_BUS		68</div><div class='add'>+#define CLK_PWM7_BUS		69</div><div class='add'>+#define CLK_PWM8_BUS		70</div><div class='add'>+#define CLK_PWM9_BUS		71</div><div class='add'>+#define CLK_PWM10_BUS		72</div><div class='add'>+#define CLK_PWM11_BUS		73</div><div class='add'>+#define CLK_PWM12_BUS		74</div><div class='add'>+#define CLK_PWM13_BUS		75</div><div class='add'>+#define CLK_PWM14_BUS		76</div><div class='add'>+#define CLK_PWM15_BUS		77</div><div class='add'>+#define CLK_PWM16_BUS		78</div><div class='add'>+#define CLK_PWM17_BUS		79</div><div class='add'>+#define CLK_PWM18_BUS		80</div><div class='add'>+#define CLK_PWM19_BUS		81</div><div class='add'>+#define CLK_SSP3_BUS		82</div><div class='add'>+#define CLK_RTC_BUS		83</div><div class='add'>+#define CLK_TWSI0_BUS		84</div><div class='add'>+#define CLK_TWSI1_BUS		85</div><div class='add'>+#define CLK_TWSI2_BUS		86</div><div class='add'>+#define CLK_TWSI4_BUS		87</div><div class='add'>+#define CLK_TWSI5_BUS		88</div><div class='add'>+#define CLK_TWSI6_BUS		89</div><div class='add'>+#define CLK_TWSI7_BUS		90</div><div class='add'>+#define CLK_TWSI8_BUS		91</div><div class='add'>+#define CLK_TIMERS1_BUS		92</div><div class='add'>+#define CLK_TIMERS2_BUS		93</div><div class='add'>+#define CLK_AIB_BUS		94</div><div class='add'>+#define CLK_ONEWIRE_BUS		95</div><div class='add'>+#define CLK_SSPA0_BUS		96</div><div class='add'>+#define CLK_SSPA1_BUS		97</div><div class='add'>+#define CLK_TSEN_BUS		98</div><div class='add'>+#define CLK_IPC_AP2AUD_BUS	99</div><div class='add'>+#define CLK_SSPA0_I2S_BCLK	100</div><div class='add'>+#define CLK_SSPA1_I2S_BCLK	101</div><div class='add'>+</div><div class='add'>+/* APBC resets */</div><div class='add'>+#define RESET_UART0		0</div><div class='add'>+#define RESET_UART2		1</div><div class='add'>+#define RESET_UART3		2</div><div class='add'>+#define RESET_UART4		3</div><div class='add'>+#define RESET_UART5		4</div><div class='add'>+#define RESET_UART6		5</div><div class='add'>+#define RESET_UART7		6</div><div class='add'>+#define RESET_UART8		7</div><div class='add'>+#define RESET_UART9		8</div><div class='add'>+#define RESET_GPIO		9</div><div class='add'>+#define RESET_PWM0		10</div><div class='add'>+#define RESET_PWM1		11</div><div class='add'>+#define RESET_PWM2		12</div><div class='add'>+#define RESET_PWM3		13</div><div class='add'>+#define RESET_PWM4		14</div><div class='add'>+#define RESET_PWM5		15</div><div class='add'>+#define RESET_PWM6		16</div><div class='add'>+#define RESET_PWM7		17</div><div class='add'>+#define RESET_PWM8		18</div><div class='add'>+#define RESET_PWM9		19</div><div class='add'>+#define RESET_PWM10		20</div><div class='add'>+#define RESET_PWM11		21</div><div class='add'>+#define RESET_PWM12		22</div><div class='add'>+#define RESET_PWM13		23</div><div class='add'>+#define RESET_PWM14		24</div><div class='add'>+#define RESET_PWM15		25</div><div class='add'>+#define RESET_PWM16		26</div><div class='add'>+#define RESET_PWM17		27</div><div class='add'>+#define RESET_PWM18		28</div><div class='add'>+#define RESET_PWM19		29</div><div class='add'>+#define RESET_SSP3		30</div><div class='add'>+#define RESET_RTC		31</div><div class='add'>+#define RESET_TWSI0		32</div><div class='add'>+#define RESET_TWSI1		33</div><div class='add'>+#define RESET_TWSI2		34</div><div class='add'>+#define RESET_TWSI4		35</div><div class='add'>+#define RESET_TWSI5		36</div><div class='add'>+#define RESET_TWSI6		37</div><div class='add'>+#define RESET_TWSI7		38</div><div class='add'>+#define RESET_TWSI8		39</div><div class='add'>+#define RESET_TIMERS1		40</div><div class='add'>+#define RESET_TIMERS2		41</div><div class='add'>+#define RESET_AIB		42</div><div class='add'>+#define RESET_ONEWIRE		43</div><div class='add'>+#define RESET_SSPA0		44</div><div class='add'>+#define RESET_SSPA1		45</div><div class='add'>+#define RESET_DRO		46</div><div class='add'>+#define RESET_IR		47</div><div class='add'>+#define RESET_TSEN		48</div><div class='add'>+#define RESET_IPC_AP2AUD	49</div><div class='add'>+#define RESET_CAN0		50</div><div class='add'>+</div><div class='add'>+/* APMU clocks */</div><div class='add'>+#define CLK_CCI550		0</div><div class='add'>+#define CLK_CPU_C0_HI		1</div><div class='add'>+#define CLK_CPU_C0_CORE		2</div><div class='add'>+#define CLK_CPU_C0_ACE		3</div><div class='add'>+#define CLK_CPU_C0_TCM		4</div><div class='add'>+#define CLK_CPU_C1_HI		5</div><div class='add'>+#define CLK_CPU_C1_CORE		6</div><div class='add'>+#define CLK_CPU_C1_ACE		7</div><div class='add'>+#define CLK_CCIC_4X		8</div><div class='add'>+#define CLK_CCIC1PHY		9</div><div class='add'>+#define CLK_SDH_AXI		10</div><div class='add'>+#define CLK_SDH0		11</div><div class='add'>+#define CLK_SDH1		12</div><div class='add'>+#define CLK_SDH2		13</div><div class='add'>+#define CLK_USB_P1		14</div><div class='add'>+#define CLK_USB_AXI		15</div><div class='add'>+#define CLK_USB30		16</div><div class='add'>+#define CLK_QSPI		17</div><div class='add'>+#define CLK_QSPI_BUS		18</div><div class='add'>+#define CLK_DMA			19</div><div class='add'>+#define CLK_AES			20</div><div class='add'>+#define CLK_VPU			21</div><div class='add'>+#define CLK_GPU			22</div><div class='add'>+#define CLK_EMMC		23</div><div class='add'>+#define CLK_EMMC_X		24</div><div class='add'>+#define CLK_AUDIO		25</div><div class='add'>+#define CLK_HDMI		26</div><div class='add'>+#define CLK_PMUA_ACLK		27</div><div class='add'>+#define CLK_PCIE0_MASTER	28</div><div class='add'>+#define CLK_PCIE0_SLAVE		29</div><div class='add'>+#define CLK_PCIE0_DBI		30</div><div class='add'>+#define CLK_PCIE1_MASTER	31</div><div class='add'>+#define CLK_PCIE1_SLAVE		32</div><div class='add'>+#define CLK_PCIE1_DBI		33</div><div class='add'>+#define CLK_PCIE2_MASTER	34</div><div class='add'>+#define CLK_PCIE2_SLAVE		35</div><div class='add'>+#define CLK_PCIE2_DBI		36</div><div class='add'>+#define CLK_EMAC0_BUS		37</div><div class='add'>+#define CLK_EMAC0_PTP		38</div><div class='add'>+#define CLK_EMAC1_BUS		39</div><div class='add'>+#define CLK_EMAC1_PTP		40</div><div class='add'>+#define CLK_JPG			41</div><div class='add'>+#define CLK_CCIC2PHY		42</div><div class='add'>+#define CLK_CCIC3PHY		43</div><div class='add'>+#define CLK_CSI			44</div><div class='add'>+#define CLK_CAMM0		45</div><div class='add'>+#define CLK_CAMM1		46</div><div class='add'>+#define CLK_CAMM2		47</div><div class='add'>+#define CLK_ISP_CPP		48</div><div class='add'>+#define CLK_ISP_BUS		49</div><div class='add'>+#define CLK_ISP			50</div><div class='add'>+#define CLK_DPU_MCLK		51</div><div class='add'>+#define CLK_DPU_ESC		52</div><div class='add'>+#define CLK_DPU_BIT		53</div><div class='add'>+#define CLK_DPU_PXCLK		54</div><div class='add'>+#define CLK_DPU_HCLK		55</div><div class='add'>+#define CLK_DPU_SPI		56</div><div class='add'>+#define CLK_DPU_SPI_HBUS	57</div><div class='add'>+#define CLK_DPU_SPIBUS		58</div><div class='add'>+#define CLK_DPU_SPI_ACLK	59</div><div class='add'>+#define CLK_V2D			60</div><div class='add'>+#define CLK_EMMC_BUS		61</div><div class='add'>+</div><div class='add'>+/* APMU resets */</div><div class='add'>+#define RESET_CCIC_4X		0</div><div class='add'>+#define RESET_CCIC1_PHY		1</div><div class='add'>+#define RESET_SDH_AXI		2</div><div class='add'>+#define RESET_SDH0		3</div><div class='add'>+#define RESET_SDH1		4</div><div class='add'>+#define RESET_SDH2		5</div><div class='add'>+#define RESET_USBP1_AXI		6</div><div class='add'>+#define RESET_USB_AXI		7</div><div class='add'>+#define RESET_USB30_AHB		8</div><div class='add'>+#define RESET_USB30_VCC		9</div><div class='add'>+#define RESET_USB30_PHY		10</div><div class='add'>+#define RESET_QSPI		11</div><div class='add'>+#define RESET_QSPI_BUS		12</div><div class='add'>+#define RESET_DMA		13</div><div class='add'>+#define RESET_AES		14</div><div class='add'>+#define RESET_VPU		15</div><div class='add'>+#define RESET_GPU		16</div><div class='add'>+#define RESET_EMMC		17</div><div class='add'>+#define RESET_EMMC_X		18</div><div class='add'>+#define RESET_AUDIO_SYS		19</div><div class='add'>+#define RESET_AUDIO_MCU		20</div><div class='add'>+#define RESET_AUDIO_APMU	21</div><div class='add'>+#define RESET_HDMI		22</div><div class='add'>+#define RESET_PCIE0_MASTER	23</div><div class='add'>+#define RESET_PCIE0_SLAVE	24</div><div class='add'>+#define RESET_PCIE0_DBI		25</div><div class='add'>+#define RESET_PCIE0_GLOBAL	26</div><div class='add'>+#define RESET_PCIE1_MASTER	27</div><div class='add'>+#define RESET_PCIE1_SLAVE	28</div><div class='add'>+#define RESET_PCIE1_DBI		29</div><div class='add'>+#define RESET_PCIE1_GLOBAL	30</div><div class='add'>+#define RESET_PCIE2_MASTER	31</div><div class='add'>+#define RESET_PCIE2_SLAVE	32</div><div class='add'>+#define RESET_PCIE2_DBI		33</div><div class='add'>+#define RESET_PCIE2_GLOBAL	34</div><div class='add'>+#define RESET_EMAC0		35</div><div class='add'>+#define RESET_EMAC1		36</div><div class='add'>+#define RESET_JPG		37</div><div class='add'>+#define RESET_CCIC2PHY		38</div><div class='add'>+#define RESET_CCIC3PHY		39</div><div class='add'>+#define RESET_CSI		40</div><div class='add'>+#define RESET_ISP_CPP		41</div><div class='add'>+#define RESET_ISP_BUS		42</div><div class='add'>+#define RESET_ISP		43</div><div class='add'>+#define RESET_ISP_CI		44</div><div class='add'>+#define RESET_DPU_MCLK		45</div><div class='add'>+#define RESET_DPU_ESC		46</div><div class='add'>+#define RESET_DPU_HCLK		47</div><div class='add'>+#define RESET_DPU_SPIBUS	48</div><div class='add'>+#define RESET_DPU_SPI_HBUS	49</div><div class='add'>+#define RESET_V2D		50</div><div class='add'>+#define RESET_MIPI		51</div><div class='add'>+#define RESET_MC		52</div><div class='add'>+</div><div class='add'>+/*	RCPU resets	*/</div><div class='add'>+#define RESET_RCPU_SSP0		0</div><div class='add'>+#define RESET_RCPU_I2C0		1</div><div class='add'>+#define RESET_RCPU_UART1	2</div><div class='add'>+#define RESET_RCPU_IR		3</div><div class='add'>+#define RESET_RCPU_CAN		4</div><div class='add'>+#define RESET_RCPU_UART0	5</div><div class='add'>+#define RESET_RCPU_HDMI_AUDIO	6</div><div class='add'>+</div><div class='add'>+/*	RCPU2 resets	*/</div><div class='add'>+#define RESET_RCPU2_PWM0	0</div><div class='add'>+#define RESET_RCPU2_PWM1	1</div><div class='add'>+#define RESET_RCPU2_PWM2	2</div><div class='add'>+#define RESET_RCPU2_PWM3	3</div><div class='add'>+#define RESET_RCPU2_PWM4	4</div><div class='add'>+#define RESET_RCPU2_PWM5	5</div><div class='add'>+#define RESET_RCPU2_PWM6	6</div><div class='add'>+#define RESET_RCPU2_PWM7	7</div><div class='add'>+#define RESET_RCPU2_PWM8	8</div><div class='add'>+#define RESET_RCPU2_PWM9	9</div><div class='add'>+</div><div class='add'>+/*	APBC2 resets	*/</div><div class='add'>+#define RESET_APBC2_UART1	0</div><div class='add'>+#define RESET_APBC2_SSP2	1</div><div class='add'>+#define RESET_APBC2_TWSI3	2</div><div class='add'>+#define RESET_APBC2_RTC		3</div><div class='add'>+#define RESET_APBC2_TIMERS0	4</div><div class='add'>+#define RESET_APBC2_KPC		5</div><div class='add'>+#define RESET_APBC2_GPIO	6</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_SPACEMIT_CCU_H_ */</div><div class='head'>diff --git a/include/dt-bindings/clock/st,stm32mp21-rcc.h b/include/dt-bindings/clock/st,stm32mp21-rcc.h<br/>new file mode 100644<br/>index 000000000000..054b785f2796<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/st,stm32mp21-rcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/st,stm32mp21-rcc.h</a></div><div class='hunk'>@@ -0,0 +1,426 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) STMicroelectronics 2025 - All Rights Reserved</div><div class='add'>+ * Author: Gabriel Fernandez &lt;gabriel.fernandez@foss.st.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_STM32MP21_CLKS_H_</div><div class='add'>+#define _DT_BINDINGS_STM32MP21_CLKS_H_</div><div class='add'>+</div><div class='add'>+/* INTERNAL/EXTERNAL OSCILLATORS */</div><div class='add'>+#define HSI_CK			0</div><div class='add'>+#define HSE_CK			1</div><div class='add'>+#define MSI_CK			2</div><div class='add'>+#define LSI_CK			3</div><div class='add'>+#define LSE_CK			4</div><div class='add'>+#define I2S_CK			5</div><div class='add'>+#define RTC_CK			6</div><div class='add'>+#define SPDIF_CK_SYMB		7</div><div class='add'>+</div><div class='add'>+/* PLL CLOCKS */</div><div class='add'>+#define PLL1_CK			8</div><div class='add'>+#define PLL2_CK			9</div><div class='add'>+#define PLL4_CK			10</div><div class='add'>+#define PLL5_CK			11</div><div class='add'>+#define PLL6_CK			12</div><div class='add'>+#define PLL7_CK			13</div><div class='add'>+#define PLL8_CK			14</div><div class='add'>+</div><div class='add'>+#define CK_CPU1			15</div><div class='add'>+</div><div class='add'>+/* APB DIV CLOCKS */</div><div class='add'>+#define CK_ICN_APB1		16</div><div class='add'>+#define CK_ICN_APB2		17</div><div class='add'>+#define CK_ICN_APB3		18</div><div class='add'>+#define CK_ICN_APB4		19</div><div class='add'>+#define CK_ICN_APB5		20</div><div class='add'>+#define CK_ICN_APBDBG		21</div><div class='add'>+</div><div class='add'>+/* GLOBAL TIMER */</div><div class='add'>+#define TIMG1_CK		22</div><div class='add'>+#define TIMG2_CK		23</div><div class='add'>+</div><div class='add'>+/* FLEXGEN CLOCKS */</div><div class='add'>+#define CK_ICN_HS_MCU		24</div><div class='add'>+#define CK_ICN_SDMMC		25</div><div class='add'>+#define CK_ICN_DDR		26</div><div class='add'>+#define CK_ICN_DISPLAY		27</div><div class='add'>+#define CK_ICN_HSL		28</div><div class='add'>+#define CK_ICN_NIC		29</div><div class='add'>+#define CK_ICN_VID		30</div><div class='add'>+#define CK_FLEXGEN_07		31</div><div class='add'>+#define CK_FLEXGEN_08		32</div><div class='add'>+#define CK_FLEXGEN_09		33</div><div class='add'>+#define CK_FLEXGEN_10		34</div><div class='add'>+#define CK_FLEXGEN_11		35</div><div class='add'>+#define CK_FLEXGEN_12		36</div><div class='add'>+#define CK_FLEXGEN_13		37</div><div class='add'>+#define CK_FLEXGEN_14		38</div><div class='add'>+#define CK_FLEXGEN_15		39</div><div class='add'>+#define CK_FLEXGEN_16		40</div><div class='add'>+#define CK_FLEXGEN_17		41</div><div class='add'>+#define CK_FLEXGEN_18		42</div><div class='add'>+#define CK_FLEXGEN_19		43</div><div class='add'>+#define CK_FLEXGEN_20		44</div><div class='add'>+#define CK_FLEXGEN_21		45</div><div class='add'>+#define CK_FLEXGEN_22		46</div><div class='add'>+#define CK_FLEXGEN_23		47</div><div class='add'>+#define CK_FLEXGEN_24		48</div><div class='add'>+#define CK_FLEXGEN_25		49</div><div class='add'>+#define CK_FLEXGEN_26		50</div><div class='add'>+#define CK_FLEXGEN_27		51</div><div class='add'>+#define CK_FLEXGEN_28		52</div><div class='add'>+#define CK_FLEXGEN_29		53</div><div class='add'>+#define CK_FLEXGEN_30		54</div><div class='add'>+#define CK_FLEXGEN_31		55</div><div class='add'>+#define CK_FLEXGEN_32		56</div><div class='add'>+#define CK_FLEXGEN_33		57</div><div class='add'>+#define CK_FLEXGEN_34		58</div><div class='add'>+#define CK_FLEXGEN_35		59</div><div class='add'>+#define CK_FLEXGEN_36		60</div><div class='add'>+#define CK_FLEXGEN_37		61</div><div class='add'>+#define CK_FLEXGEN_38		62</div><div class='add'>+#define CK_FLEXGEN_39		63</div><div class='add'>+#define CK_FLEXGEN_40		64</div><div class='add'>+#define CK_FLEXGEN_41		65</div><div class='add'>+#define CK_FLEXGEN_42		66</div><div class='add'>+#define CK_FLEXGEN_43		67</div><div class='add'>+#define CK_FLEXGEN_44		68</div><div class='add'>+#define CK_FLEXGEN_45		69</div><div class='add'>+#define CK_FLEXGEN_46		70</div><div class='add'>+#define CK_FLEXGEN_47		71</div><div class='add'>+#define CK_FLEXGEN_48		72</div><div class='add'>+#define CK_FLEXGEN_49		73</div><div class='add'>+#define CK_FLEXGEN_50		74</div><div class='add'>+#define CK_FLEXGEN_51		75</div><div class='add'>+#define CK_FLEXGEN_52		76</div><div class='add'>+#define CK_FLEXGEN_53		77</div><div class='add'>+#define CK_FLEXGEN_54		78</div><div class='add'>+#define CK_FLEXGEN_55		79</div><div class='add'>+#define CK_FLEXGEN_56		80</div><div class='add'>+#define CK_FLEXGEN_57		81</div><div class='add'>+#define CK_FLEXGEN_58		82</div><div class='add'>+#define CK_FLEXGEN_59		83</div><div class='add'>+#define CK_FLEXGEN_60		84</div><div class='add'>+#define CK_FLEXGEN_61		85</div><div class='add'>+#define CK_FLEXGEN_62		86</div><div class='add'>+#define CK_FLEXGEN_63		87</div><div class='add'>+</div><div class='add'>+/* LOW SPEED MCU CLOCK */</div><div class='add'>+#define CK_ICN_LS_MCU		88</div><div class='add'>+</div><div class='add'>+#define CK_BUS_STM		89</div><div class='add'>+#define CK_BUS_FMC		90</div><div class='add'>+#define CK_BUS_ETH1		91</div><div class='add'>+#define CK_BUS_ETH2		92</div><div class='add'>+#define CK_BUS_DDRPHYC		93</div><div class='add'>+#define CK_BUS_SYSCPU1		94</div><div class='add'>+#define CK_BUS_HPDMA1		95</div><div class='add'>+#define CK_BUS_HPDMA2		96</div><div class='add'>+#define CK_BUS_HPDMA3		97</div><div class='add'>+#define CK_BUS_ADC1		98</div><div class='add'>+#define CK_BUS_ADC2		99</div><div class='add'>+#define CK_BUS_IPCC1		100</div><div class='add'>+#define CK_BUS_DCMIPSSI		101</div><div class='add'>+#define CK_BUS_CRC		102</div><div class='add'>+#define CK_BUS_MDF1		103</div><div class='add'>+#define CK_BUS_BKPSRAM		104</div><div class='add'>+#define CK_BUS_HASH1		105</div><div class='add'>+#define CK_BUS_HASH2		106</div><div class='add'>+#define CK_BUS_RNG1		107</div><div class='add'>+#define CK_BUS_RNG2		108</div><div class='add'>+#define CK_BUS_CRYP1		109</div><div class='add'>+#define CK_BUS_CRYP2		110</div><div class='add'>+#define CK_BUS_SAES		111</div><div class='add'>+#define CK_BUS_PKA		112</div><div class='add'>+#define CK_BUS_GPIOA		113</div><div class='add'>+#define CK_BUS_GPIOB		114</div><div class='add'>+#define CK_BUS_GPIOC		115</div><div class='add'>+#define CK_BUS_GPIOD		116</div><div class='add'>+#define CK_BUS_GPIOE		117</div><div class='add'>+#define CK_BUS_GPIOF		118</div><div class='add'>+#define CK_BUS_GPIOG		119</div><div class='add'>+#define CK_BUS_GPIOH		120</div><div class='add'>+#define CK_BUS_GPIOI		121</div><div class='add'>+#define CK_BUS_GPIOZ		122</div><div class='add'>+#define CK_BUS_RTC		124</div><div class='add'>+#define CK_BUS_LPUART1		125</div><div class='add'>+#define CK_BUS_LPTIM3		126</div><div class='add'>+#define CK_BUS_LPTIM4		127</div><div class='add'>+#define CK_BUS_LPTIM5		128</div><div class='add'>+#define CK_BUS_TIM2		129</div><div class='add'>+#define CK_BUS_TIM3		130</div><div class='add'>+#define CK_BUS_TIM4		131</div><div class='add'>+#define CK_BUS_TIM5		132</div><div class='add'>+#define CK_BUS_TIM6		133</div><div class='add'>+#define CK_BUS_TIM7		134</div><div class='add'>+#define CK_BUS_TIM10		135</div><div class='add'>+#define CK_BUS_TIM11		136</div><div class='add'>+#define CK_BUS_TIM12		137</div><div class='add'>+#define CK_BUS_TIM13		138</div><div class='add'>+#define CK_BUS_TIM14		139</div><div class='add'>+#define CK_BUS_LPTIM1		140</div><div class='add'>+#define CK_BUS_LPTIM2		141</div><div class='add'>+#define CK_BUS_SPI2		142</div><div class='add'>+#define CK_BUS_SPI3		143</div><div class='add'>+#define CK_BUS_SPDIFRX		144</div><div class='add'>+#define CK_BUS_USART2		145</div><div class='add'>+#define CK_BUS_USART3		146</div><div class='add'>+#define CK_BUS_UART4		147</div><div class='add'>+#define CK_BUS_UART5		148</div><div class='add'>+#define CK_BUS_I2C1		149</div><div class='add'>+#define CK_BUS_I2C2		150</div><div class='add'>+#define CK_BUS_I2C3		151</div><div class='add'>+#define CK_BUS_I3C1		152</div><div class='add'>+#define CK_BUS_I3C2		153</div><div class='add'>+#define CK_BUS_I3C3		154</div><div class='add'>+#define CK_BUS_TIM1		155</div><div class='add'>+#define CK_BUS_TIM8		156</div><div class='add'>+#define CK_BUS_TIM15		157</div><div class='add'>+#define CK_BUS_TIM16		158</div><div class='add'>+#define CK_BUS_TIM17		159</div><div class='add'>+#define CK_BUS_SAI1		160</div><div class='add'>+#define CK_BUS_SAI2		161</div><div class='add'>+#define CK_BUS_SAI3		162</div><div class='add'>+#define CK_BUS_SAI4		163</div><div class='add'>+#define CK_BUS_USART1		164</div><div class='add'>+#define CK_BUS_USART6		165</div><div class='add'>+#define CK_BUS_UART7		166</div><div class='add'>+#define CK_BUS_FDCAN		167</div><div class='add'>+#define CK_BUS_SPI1		168</div><div class='add'>+#define CK_BUS_SPI4		169</div><div class='add'>+#define CK_BUS_SPI5		170</div><div class='add'>+#define CK_BUS_SPI6		171</div><div class='add'>+#define CK_BUS_BSEC		172</div><div class='add'>+#define CK_BUS_IWDG1		173</div><div class='add'>+#define CK_BUS_IWDG2		174</div><div class='add'>+#define CK_BUS_IWDG3		175</div><div class='add'>+#define CK_BUS_IWDG4		176</div><div class='add'>+#define CK_BUS_WWDG1		177</div><div class='add'>+#define CK_BUS_VREF		178</div><div class='add'>+#define CK_BUS_DTS		179</div><div class='add'>+#define CK_BUS_SERC		180</div><div class='add'>+#define CK_BUS_HDP		181</div><div class='add'>+#define CK_BUS_DDRPERFM		182</div><div class='add'>+#define CK_BUS_OTG		183</div><div class='add'>+#define CK_BUS_LTDC		184</div><div class='add'>+#define CK_BUS_CSI		185</div><div class='add'>+#define CK_BUS_DCMIPP		186</div><div class='add'>+#define CK_BUS_DDRC		187</div><div class='add'>+#define CK_BUS_DDRCFG		188</div><div class='add'>+#define CK_BUS_STGEN		189</div><div class='add'>+#define CK_SYSDBG		190</div><div class='add'>+#define CK_KER_TIM2		191</div><div class='add'>+#define CK_KER_TIM3		192</div><div class='add'>+#define CK_KER_TIM4		193</div><div class='add'>+#define CK_KER_TIM5		194</div><div class='add'>+#define CK_KER_TIM6		195</div><div class='add'>+#define CK_KER_TIM7		196</div><div class='add'>+#define CK_KER_TIM10		197</div><div class='add'>+#define CK_KER_TIM11		198</div><div class='add'>+#define CK_KER_TIM12		199</div><div class='add'>+#define CK_KER_TIM13		200</div><div class='add'>+#define CK_KER_TIM14		201</div><div class='add'>+#define CK_KER_TIM1		202</div><div class='add'>+#define CK_KER_TIM8		203</div><div class='add'>+#define CK_KER_TIM15		204</div><div class='add'>+#define CK_KER_TIM16		205</div><div class='add'>+#define CK_KER_TIM17		206</div><div class='add'>+#define CK_BUS_SYSRAM		207</div><div class='add'>+#define CK_BUS_RETRAM		208</div><div class='add'>+#define CK_BUS_OSPI1		209</div><div class='add'>+#define CK_BUS_OTFD1		210</div><div class='add'>+#define CK_BUS_SRAM1		211</div><div class='add'>+#define CK_BUS_SDMMC1		212</div><div class='add'>+#define CK_BUS_SDMMC2		213</div><div class='add'>+#define CK_BUS_SDMMC3		214</div><div class='add'>+#define CK_BUS_DDR		215</div><div class='add'>+#define CK_BUS_RISAF4		216</div><div class='add'>+#define CK_BUS_USBHOHCI		217</div><div class='add'>+#define CK_BUS_USBHEHCI		218</div><div class='add'>+#define CK_KER_LPTIM1		219</div><div class='add'>+#define CK_KER_LPTIM2		220</div><div class='add'>+#define CK_KER_USART2		221</div><div class='add'>+#define CK_KER_UART4		222</div><div class='add'>+#define CK_KER_USART3		223</div><div class='add'>+#define CK_KER_UART5		224</div><div class='add'>+#define CK_KER_SPI2		225</div><div class='add'>+#define CK_KER_SPI3		226</div><div class='add'>+#define CK_KER_SPDIFRX		227</div><div class='add'>+#define CK_KER_I2C1		228</div><div class='add'>+#define CK_KER_I2C2		229</div><div class='add'>+#define CK_KER_I3C1		230</div><div class='add'>+#define CK_KER_I3C2		231</div><div class='add'>+#define CK_KER_I2C3		232</div><div class='add'>+#define CK_KER_I3C3		233</div><div class='add'>+#define CK_KER_SPI1		234</div><div class='add'>+#define CK_KER_SPI4		235</div><div class='add'>+#define CK_KER_SPI5		236</div><div class='add'>+#define CK_KER_SPI6		237</div><div class='add'>+#define CK_KER_USART1		238</div><div class='add'>+#define CK_KER_USART6		239</div><div class='add'>+#define CK_KER_UART7		240</div><div class='add'>+#define CK_KER_MDF1		241</div><div class='add'>+#define CK_KER_SAI1		242</div><div class='add'>+#define CK_KER_SAI2		243</div><div class='add'>+#define CK_KER_SAI3		244</div><div class='add'>+#define CK_KER_SAI4		245</div><div class='add'>+#define CK_KER_FDCAN		246</div><div class='add'>+#define CK_KER_CSI		247</div><div class='add'>+#define CK_KER_CSITXESC		248</div><div class='add'>+#define CK_KER_CSIPHY		249</div><div class='add'>+#define CK_KER_STGEN		250</div><div class='add'>+#define CK_KER_USB2PHY2EN	251</div><div class='add'>+#define CK_KER_LPUART1		252</div><div class='add'>+#define CK_KER_LPTIM3		253</div><div class='add'>+#define CK_KER_LPTIM4		254</div><div class='add'>+#define CK_KER_LPTIM5		255</div><div class='add'>+#define CK_KER_TSDBG		256</div><div class='add'>+#define CK_KER_TPIU		257</div><div class='add'>+#define CK_BUS_ETR		258</div><div class='add'>+#define CK_BUS_SYSATB		259</div><div class='add'>+#define CK_KER_ADC1		260</div><div class='add'>+#define CK_KER_ADC2		261</div><div class='add'>+#define CK_KER_OSPI1		262</div><div class='add'>+#define CK_KER_FMC		263</div><div class='add'>+#define CK_KER_SDMMC1		264</div><div class='add'>+#define CK_KER_SDMMC2		265</div><div class='add'>+#define CK_KER_SDMMC3		266</div><div class='add'>+#define CK_KER_ETH1		267</div><div class='add'>+#define CK_KER_ETH2		268</div><div class='add'>+#define CK_KER_ETH1PTP		269</div><div class='add'>+#define CK_KER_ETH2PTP		270</div><div class='add'>+#define CK_KER_USB2PHY1		271</div><div class='add'>+#define CK_KER_USB2PHY2		272</div><div class='add'>+#define CK_MCO1			273</div><div class='add'>+#define CK_MCO2			274</div><div class='add'>+#define CK_KER_DTS		275</div><div class='add'>+#define CK_ETH1_RX		276</div><div class='add'>+#define CK_ETH1_TX		277</div><div class='add'>+#define CK_ETH1_MAC		278</div><div class='add'>+#define CK_ETH2_RX		279</div><div class='add'>+#define CK_ETH2_TX		280</div><div class='add'>+#define CK_ETH2_MAC		281</div><div class='add'>+#define CK_ETH1_STP		282</div><div class='add'>+#define CK_ETH2_STP		283</div><div class='add'>+#define CK_KER_LTDC		284</div><div class='add'>+#define HSE_DIV2_CK		285</div><div class='add'>+#define CK_DBGMCU		286</div><div class='add'>+#define CK_DAP			287</div><div class='add'>+#define CK_KER_ETR		288</div><div class='add'>+#define CK_KER_STM		289</div><div class='add'>+</div><div class='add'>+#define CK_SCMI_ICN_HS_MCU	0</div><div class='add'>+#define CK_SCMI_ICN_SDMMC	1</div><div class='add'>+#define CK_SCMI_ICN_DDR		2</div><div class='add'>+#define CK_SCMI_ICN_DISPLAY	3</div><div class='add'>+#define CK_SCMI_ICN_HSL		4</div><div class='add'>+#define CK_SCMI_ICN_NIC		5</div><div class='add'>+#define CK_SCMI_FLEXGEN_07	7</div><div class='add'>+#define CK_SCMI_FLEXGEN_08	8</div><div class='add'>+#define CK_SCMI_FLEXGEN_09	9</div><div class='add'>+#define CK_SCMI_FLEXGEN_10	10</div><div class='add'>+#define CK_SCMI_FLEXGEN_11	11</div><div class='add'>+#define CK_SCMI_FLEXGEN_12	12</div><div class='add'>+#define CK_SCMI_FLEXGEN_13	13</div><div class='add'>+#define CK_SCMI_FLEXGEN_14	14</div><div class='add'>+#define CK_SCMI_FLEXGEN_15	15</div><div class='add'>+#define CK_SCMI_FLEXGEN_16	16</div><div class='add'>+#define CK_SCMI_FLEXGEN_17	17</div><div class='add'>+#define CK_SCMI_FLEXGEN_18	18</div><div class='add'>+#define CK_SCMI_FLEXGEN_19	19</div><div class='add'>+#define CK_SCMI_FLEXGEN_20	20</div><div class='add'>+#define CK_SCMI_FLEXGEN_21	21</div><div class='add'>+#define CK_SCMI_FLEXGEN_22	22</div><div class='add'>+#define CK_SCMI_FLEXGEN_23	23</div><div class='add'>+#define CK_SCMI_FLEXGEN_24	24</div><div class='add'>+#define CK_SCMI_FLEXGEN_25	25</div><div class='add'>+#define CK_SCMI_FLEXGEN_26	26</div><div class='add'>+#define CK_SCMI_FLEXGEN_27	27</div><div class='add'>+#define CK_SCMI_FLEXGEN_28	28</div><div class='add'>+#define CK_SCMI_FLEXGEN_29	29</div><div class='add'>+#define CK_SCMI_FLEXGEN_30	30</div><div class='add'>+#define CK_SCMI_FLEXGEN_31	31</div><div class='add'>+#define CK_SCMI_FLEXGEN_32	32</div><div class='add'>+#define CK_SCMI_FLEXGEN_33	33</div><div class='add'>+#define CK_SCMI_FLEXGEN_34	34</div><div class='add'>+#define CK_SCMI_FLEXGEN_35	35</div><div class='add'>+#define CK_SCMI_FLEXGEN_36	36</div><div class='add'>+#define CK_SCMI_FLEXGEN_37	37</div><div class='add'>+#define CK_SCMI_FLEXGEN_38	38</div><div class='add'>+#define CK_SCMI_FLEXGEN_39	39</div><div class='add'>+#define CK_SCMI_FLEXGEN_40	40</div><div class='add'>+#define CK_SCMI_FLEXGEN_41	41</div><div class='add'>+#define CK_SCMI_FLEXGEN_42	42</div><div class='add'>+#define CK_SCMI_FLEXGEN_43	43</div><div class='add'>+#define CK_SCMI_FLEXGEN_44	44</div><div class='add'>+#define CK_SCMI_FLEXGEN_45	45</div><div class='add'>+#define CK_SCMI_FLEXGEN_46	46</div><div class='add'>+#define CK_SCMI_FLEXGEN_47	47</div><div class='add'>+#define CK_SCMI_FLEXGEN_48	48</div><div class='add'>+#define CK_SCMI_FLEXGEN_49	49</div><div class='add'>+#define CK_SCMI_FLEXGEN_50	50</div><div class='add'>+#define CK_SCMI_FLEXGEN_51	51</div><div class='add'>+#define CK_SCMI_FLEXGEN_52	52</div><div class='add'>+#define CK_SCMI_FLEXGEN_53	53</div><div class='add'>+#define CK_SCMI_FLEXGEN_54	54</div><div class='add'>+#define CK_SCMI_FLEXGEN_55	55</div><div class='add'>+#define CK_SCMI_FLEXGEN_56	56</div><div class='add'>+#define CK_SCMI_FLEXGEN_57	57</div><div class='add'>+#define CK_SCMI_FLEXGEN_58	58</div><div class='add'>+#define CK_SCMI_FLEXGEN_59	59</div><div class='add'>+#define CK_SCMI_FLEXGEN_60	60</div><div class='add'>+#define CK_SCMI_FLEXGEN_61	61</div><div class='add'>+#define CK_SCMI_FLEXGEN_62	62</div><div class='add'>+#define CK_SCMI_FLEXGEN_63	63</div><div class='add'>+#define CK_SCMI_ICN_LS_MCU	64</div><div class='add'>+#define CK_SCMI_HSE		65</div><div class='add'>+#define CK_SCMI_LSE		66</div><div class='add'>+#define CK_SCMI_HSI		67</div><div class='add'>+#define CK_SCMI_LSI		68</div><div class='add'>+#define CK_SCMI_MSI		69</div><div class='add'>+#define CK_SCMI_HSE_DIV2	70</div><div class='add'>+#define CK_SCMI_CPU1		71</div><div class='add'>+#define CK_SCMI_SYSCPU1		72</div><div class='add'>+#define CK_SCMI_PLL2		73</div><div class='add'>+#define CK_SCMI_RTC		74</div><div class='add'>+#define CK_SCMI_RTCCK		75</div><div class='add'>+#define CK_SCMI_ICN_APB1	76</div><div class='add'>+#define CK_SCMI_ICN_APB2	77</div><div class='add'>+#define CK_SCMI_ICN_APB3	78</div><div class='add'>+#define CK_SCMI_ICN_APB4	79</div><div class='add'>+#define CK_SCMI_ICN_APB5	80</div><div class='add'>+#define CK_SCMI_ICN_APBDBG	81</div><div class='add'>+#define CK_SCMI_TIMG1		82</div><div class='add'>+#define CK_SCMI_TIMG2		83</div><div class='add'>+#define CK_SCMI_BKPSRAM		84</div><div class='add'>+#define CK_SCMI_BSEC		85</div><div class='add'>+#define CK_SCMI_BUS_ETR		86</div><div class='add'>+#define CK_SCMI_FMC		87</div><div class='add'>+#define CK_SCMI_GPIOA		88</div><div class='add'>+#define CK_SCMI_GPIOB		89</div><div class='add'>+#define CK_SCMI_GPIOC		90</div><div class='add'>+#define CK_SCMI_GPIOD		91</div><div class='add'>+#define CK_SCMI_GPIOE		92</div><div class='add'>+#define CK_SCMI_GPIOF		93</div><div class='add'>+#define CK_SCMI_GPIOG		94</div><div class='add'>+#define CK_SCMI_GPIOH		95</div><div class='add'>+#define CK_SCMI_GPIOI		96</div><div class='add'>+#define CK_SCMI_GPIOZ		97</div><div class='add'>+#define CK_SCMI_HPDMA1		98</div><div class='add'>+#define CK_SCMI_HPDMA2		99</div><div class='add'>+#define CK_SCMI_HPDMA3		100</div><div class='add'>+#define CK_SCMI_IPCC1		101</div><div class='add'>+#define CK_SCMI_RETRAM		102</div><div class='add'>+#define CK_SCMI_SRAM1		103</div><div class='add'>+#define CK_SCMI_SYSRAM		104</div><div class='add'>+#define CK_SCMI_OSPI1		105</div><div class='add'>+#define CK_SCMI_TPIU		106</div><div class='add'>+#define CK_SCMI_SYSDBG		107</div><div class='add'>+#define CK_SCMI_SYSATB		108</div><div class='add'>+#define CK_SCMI_TSDBG		109</div><div class='add'>+#define CK_SCMI_BUS_STM		110</div><div class='add'>+#define CK_SCMI_KER_STM		111</div><div class='add'>+#define CK_SCMI_KER_ETR		112</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_STM32MP21_CLKS_H_ */</div><div class='head'>diff --git a/include/dt-bindings/clock/stm32fx-clock.h b/include/dt-bindings/clock/stm32fx-clock.h<br/>index e5dad050d518..b6ff9c68cb3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/stm32fx-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/stm32fx-clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/stm32fx-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/stm32fx-clock.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * List of clocks which are not derived from system clock (SYSCLOCK)</div><div class='ctx'>  *</div><div class='ctx'>  * The index of these clocks is the secondary index of DT bindings</div><div class='del'>- * (see Documentation/devicetree/bindings/clock/st,stm32-rcc.txt)</div><div class='add'>+ * (see Documentation/devicetree/bindings/clock/st,stm32-rcc.yaml)</div><div class='ctx'>  *</div><div class='ctx'>  * e.g:</div><div class='ctx'> 	&lt;assigned-clocks = &lt;&amp;rcc 1 CLK_LSE&gt;;</div><div class='head'>diff --git a/include/dt-bindings/clock/stm32h7-clks.h b/include/dt-bindings/clock/stm32h7-clks.h<br/>index 6637272b3242..330b39c2c303 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/stm32h7-clks.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/stm32h7-clks.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/stm32h7-clks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/stm32h7-clks.h</a></div><div class='hunk'>@@ -126,8 +126,8 @@</div><div class='ctx'> #define ADC3_CK 128</div><div class='ctx'> #define DSI_CK 129</div><div class='ctx'> #define LTDC_CK 130</div><div class='del'>-#define USART8_CK 131</div><div class='del'>-#define USART7_CK 132</div><div class='add'>+#define UART8_CK 131</div><div class='add'>+#define UART7_CK 132</div><div class='ctx'> #define HDMICEC_CK 133</div><div class='ctx'> #define I2C3_CK 134</div><div class='ctx'> #define I2C2_CK 135</div><div class='head'>diff --git a/include/dt-bindings/clock/sun50i-a64-ccu.h b/include/dt-bindings/clock/sun50i-a64-ccu.h<br/>index 175892189e9d..4f220ea7a23c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun50i-a64-ccu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun50i-a64-ccu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun50i-a64-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sun50i-a64-ccu.h</a></div><div class='hunk'>@@ -44,7 +44,9 @@</div><div class='ctx'> #define _DT_BINDINGS_CLK_SUN50I_A64_H_</div><div class='ctx'> </div><div class='ctx'> #define CLK_PLL_VIDEO0		7</div><div class='add'>+#define CLK_PLL_VIDEO0_2X	8</div><div class='ctx'> #define CLK_PLL_PERIPH0		11</div><div class='add'>+#define CLK_PLL_MIPI		17</div><div class='ctx'> </div><div class='ctx'> #define CLK_CPUX		21</div><div class='ctx'> #define CLK_BUS_MIPI_DSI	28</div><div class='head'>diff --git a/include/dt-bindings/clock/sun50i-h616-ccu.h b/include/dt-bindings/clock/sun50i-h616-ccu.h<br/>index 6f8f01e67628..6889405f9fec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun50i-h616-ccu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun50i-h616-ccu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun50i-h616-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sun50i-h616-ccu.h</a></div><div class='hunk'>@@ -112,5 +112,10 @@</div><div class='ctx'> #define CLK_HDCP		126</div><div class='ctx'> #define CLK_BUS_HDCP		127</div><div class='ctx'> #define CLK_PLL_SYSTEM_32K	128</div><div class='add'>+#define CLK_BUS_GPADC		129</div><div class='add'>+#define CLK_TCON_LCD0		130</div><div class='add'>+#define CLK_BUS_TCON_LCD0	131</div><div class='add'>+#define CLK_TCON_LCD1		132</div><div class='add'>+#define CLK_BUS_TCON_LCD1	133</div><div class='ctx'> </div><div class='ctx'> #endif /* _DT_BINDINGS_CLK_SUN50I_H616_H_ */</div><div class='head'>diff --git a/include/dt-bindings/clock/sun55i-a523-ccu.h b/include/dt-bindings/clock/sun55i-a523-ccu.h<br/>new file mode 100644<br/>index 000000000000..54808fcfd556<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun55i-a523-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sun55i-a523-ccu.h</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Arm Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_SUN55I_A523_CCU_H_</div><div class='add'>+#define _DT_BINDINGS_CLK_SUN55I_A523_CCU_H_</div><div class='add'>+</div><div class='add'>+#define CLK_PLL_DDR0		0</div><div class='add'>+#define CLK_PLL_PERIPH0_4X	1</div><div class='add'>+#define CLK_PLL_PERIPH0_2X	2</div><div class='add'>+#define CLK_PLL_PERIPH0_800M	3</div><div class='add'>+#define CLK_PLL_PERIPH0_480M	4</div><div class='add'>+#define CLK_PLL_PERIPH0_600M	5</div><div class='add'>+#define CLK_PLL_PERIPH0_400M	6</div><div class='add'>+#define CLK_PLL_PERIPH0_300M	7</div><div class='add'>+#define CLK_PLL_PERIPH0_200M	8</div><div class='add'>+#define CLK_PLL_PERIPH0_160M	9</div><div class='add'>+#define CLK_PLL_PERIPH0_150M	10</div><div class='add'>+#define CLK_PLL_PERIPH1_4X	11</div><div class='add'>+#define CLK_PLL_PERIPH1_2X	12</div><div class='add'>+#define CLK_PLL_PERIPH1_800M	13</div><div class='add'>+#define CLK_PLL_PERIPH1_480M	14</div><div class='add'>+#define CLK_PLL_PERIPH1_600M	15</div><div class='add'>+#define CLK_PLL_PERIPH1_400M	16</div><div class='add'>+#define CLK_PLL_PERIPH1_300M	17</div><div class='add'>+#define CLK_PLL_PERIPH1_200M	18</div><div class='add'>+#define CLK_PLL_PERIPH1_160M	19</div><div class='add'>+#define CLK_PLL_PERIPH1_150M	20</div><div class='add'>+#define CLK_PLL_GPU		21</div><div class='add'>+#define CLK_PLL_VIDEO0_8X	22</div><div class='add'>+#define CLK_PLL_VIDEO0_4X	23</div><div class='add'>+#define CLK_PLL_VIDEO0_3X	24</div><div class='add'>+#define CLK_PLL_VIDEO1_8X	25</div><div class='add'>+#define CLK_PLL_VIDEO1_4X	26</div><div class='add'>+#define CLK_PLL_VIDEO1_3X	27</div><div class='add'>+#define CLK_PLL_VIDEO2_8X	28</div><div class='add'>+#define CLK_PLL_VIDEO2_4X	29</div><div class='add'>+#define CLK_PLL_VIDEO2_3X	30</div><div class='add'>+#define CLK_PLL_VIDEO3_8X	31</div><div class='add'>+#define CLK_PLL_VIDEO3_4X	32</div><div class='add'>+#define CLK_PLL_VIDEO3_3X	33</div><div class='add'>+#define CLK_PLL_VE		34</div><div class='add'>+#define CLK_PLL_AUDIO0_4X	35</div><div class='add'>+#define CLK_PLL_AUDIO0_2X	36</div><div class='add'>+#define CLK_PLL_AUDIO0		37</div><div class='add'>+#define CLK_PLL_NPU_4X		38</div><div class='add'>+#define CLK_PLL_NPU_2X		39</div><div class='add'>+#define CLK_PLL_NPU		40</div><div class='add'>+#define CLK_AHB			41</div><div class='add'>+#define CLK_APB0		42</div><div class='add'>+#define CLK_APB1		43</div><div class='add'>+#define CLK_MBUS		44</div><div class='add'>+#define CLK_DE			45</div><div class='add'>+#define CLK_BUS_DE		46</div><div class='add'>+#define CLK_DI			47</div><div class='add'>+#define CLK_BUS_DI		48</div><div class='add'>+#define CLK_G2D			49</div><div class='add'>+#define CLK_BUS_G2D		50</div><div class='add'>+#define CLK_GPU			51</div><div class='add'>+#define CLK_BUS_GPU		52</div><div class='add'>+#define CLK_CE			53</div><div class='add'>+#define CLK_BUS_CE		54</div><div class='add'>+#define CLK_BUS_CE_SYS		55</div><div class='add'>+#define CLK_VE			56</div><div class='add'>+#define CLK_BUS_VE		57</div><div class='add'>+#define CLK_BUS_DMA		58</div><div class='add'>+#define CLK_BUS_MSGBOX		59</div><div class='add'>+#define CLK_BUS_SPINLOCK	60</div><div class='add'>+#define CLK_HSTIMER0		61</div><div class='add'>+#define CLK_HSTIMER1		62</div><div class='add'>+#define CLK_HSTIMER2		63</div><div class='add'>+#define CLK_HSTIMER3		64</div><div class='add'>+#define CLK_HSTIMER4		65</div><div class='add'>+#define CLK_HSTIMER5		66</div><div class='add'>+#define CLK_BUS_HSTIMER		67</div><div class='add'>+#define CLK_BUS_DBG		68</div><div class='add'>+#define CLK_BUS_PWM0		69</div><div class='add'>+#define CLK_BUS_PWM1		70</div><div class='add'>+#define CLK_IOMMU		71</div><div class='add'>+#define CLK_BUS_IOMMU		72</div><div class='add'>+#define CLK_DRAM		73</div><div class='add'>+#define CLK_MBUS_DMA		74</div><div class='add'>+#define CLK_MBUS_VE		75</div><div class='add'>+#define CLK_MBUS_CE		76</div><div class='add'>+#define CLK_MBUS_CSI		77</div><div class='add'>+#define CLK_MBUS_ISP		78</div><div class='add'>+#define CLK_MBUS_EMAC1		79</div><div class='add'>+#define CLK_BUS_DRAM		80</div><div class='add'>+#define CLK_NAND0		81</div><div class='add'>+#define CLK_NAND1		82</div><div class='add'>+#define CLK_BUS_NAND		83</div><div class='add'>+#define CLK_MMC0		84</div><div class='add'>+#define CLK_MMC1		85</div><div class='add'>+#define CLK_MMC2		86</div><div class='add'>+#define CLK_BUS_SYSDAP		87</div><div class='add'>+#define CLK_BUS_MMC0		88</div><div class='add'>+#define CLK_BUS_MMC1		89</div><div class='add'>+#define CLK_BUS_MMC2		90</div><div class='add'>+#define CLK_BUS_UART0		91</div><div class='add'>+#define CLK_BUS_UART1		92</div><div class='add'>+#define CLK_BUS_UART2		93</div><div class='add'>+#define CLK_BUS_UART3		94</div><div class='add'>+#define CLK_BUS_UART4		95</div><div class='add'>+#define CLK_BUS_UART5		96</div><div class='add'>+#define CLK_BUS_UART6		97</div><div class='add'>+#define CLK_BUS_UART7		98</div><div class='add'>+#define CLK_BUS_I2C0		99</div><div class='add'>+#define CLK_BUS_I2C1		100</div><div class='add'>+#define CLK_BUS_I2C2		101</div><div class='add'>+#define CLK_BUS_I2C3		102</div><div class='add'>+#define CLK_BUS_I2C4		103</div><div class='add'>+#define CLK_BUS_I2C5		104</div><div class='add'>+#define CLK_BUS_CAN		105</div><div class='add'>+#define CLK_SPI0		106</div><div class='add'>+#define CLK_SPI1		107</div><div class='add'>+#define CLK_SPI2		108</div><div class='add'>+#define CLK_SPIFC		109</div><div class='add'>+#define CLK_BUS_SPI0		110</div><div class='add'>+#define CLK_BUS_SPI1		111</div><div class='add'>+#define CLK_BUS_SPI2		112</div><div class='add'>+#define CLK_BUS_SPIFC		113</div><div class='add'>+#define CLK_EMAC0_25M		114</div><div class='add'>+#define CLK_EMAC1_25M		115</div><div class='add'>+#define CLK_BUS_EMAC0		116</div><div class='add'>+#define CLK_BUS_EMAC1		117</div><div class='add'>+#define CLK_IR_RX		118</div><div class='add'>+#define CLK_BUS_IR_RX		119</div><div class='add'>+#define CLK_IR_TX		120</div><div class='add'>+#define CLK_BUS_IR_TX		121</div><div class='add'>+#define CLK_GPADC0		122</div><div class='add'>+#define CLK_GPADC1		123</div><div class='add'>+#define CLK_BUS_GPADC0		124</div><div class='add'>+#define CLK_BUS_GPADC1		125</div><div class='add'>+#define CLK_BUS_THS		126</div><div class='add'>+#define CLK_USB_OHCI0		127</div><div class='add'>+#define CLK_USB_OHCI1		128</div><div class='add'>+#define CLK_BUS_OHCI0		129</div><div class='add'>+#define CLK_BUS_OHCI1		130</div><div class='add'>+#define CLK_BUS_EHCI0		131</div><div class='add'>+#define CLK_BUS_EHCI1		132</div><div class='add'>+#define CLK_BUS_OTG		133</div><div class='add'>+#define CLK_BUS_LRADC		134</div><div class='add'>+#define CLK_PCIE_AUX		135</div><div class='add'>+#define CLK_BUS_DISPLAY0_TOP	136</div><div class='add'>+#define CLK_BUS_DISPLAY1_TOP	137</div><div class='add'>+#define CLK_HDMI_24M		138</div><div class='add'>+#define CLK_HDMI_CEC_32K	139</div><div class='add'>+#define CLK_HDMI_CEC		140</div><div class='add'>+#define CLK_BUS_HDMI		141</div><div class='add'>+#define CLK_MIPI_DSI0		142</div><div class='add'>+#define CLK_MIPI_DSI1		143</div><div class='add'>+#define CLK_BUS_MIPI_DSI0	144</div><div class='add'>+#define CLK_BUS_MIPI_DSI1	145</div><div class='add'>+#define CLK_TCON_LCD0		146</div><div class='add'>+#define CLK_TCON_LCD1		147</div><div class='add'>+#define CLK_TCON_LCD2		148</div><div class='add'>+#define CLK_COMBOPHY_DSI0	149</div><div class='add'>+#define CLK_COMBOPHY_DSI1	150</div><div class='add'>+#define CLK_BUS_TCON_LCD0	151</div><div class='add'>+#define CLK_BUS_TCON_LCD1	152</div><div class='add'>+#define CLK_BUS_TCON_LCD2	153</div><div class='add'>+#define CLK_TCON_TV0		154</div><div class='add'>+#define CLK_TCON_TV1		155</div><div class='add'>+#define CLK_BUS_TCON_TV0	156</div><div class='add'>+#define CLK_BUS_TCON_TV1	157</div><div class='add'>+#define CLK_EDP			158</div><div class='add'>+#define CLK_BUS_EDP		159</div><div class='add'>+#define CLK_LEDC		160</div><div class='add'>+#define CLK_BUS_LEDC		161</div><div class='add'>+#define CLK_CSI_TOP		162</div><div class='add'>+#define CLK_CSI_MCLK0		163</div><div class='add'>+#define CLK_CSI_MCLK1		164</div><div class='add'>+#define CLK_CSI_MCLK2		165</div><div class='add'>+#define CLK_CSI_MCLK3		166</div><div class='add'>+#define CLK_BUS_CSI		167</div><div class='add'>+#define CLK_ISP			168</div><div class='add'>+#define CLK_DSP			169</div><div class='add'>+#define CLK_FANOUT_24M		170</div><div class='add'>+#define CLK_FANOUT_12M		171</div><div class='add'>+#define CLK_FANOUT_16M		172</div><div class='add'>+#define CLK_FANOUT_25M		173</div><div class='add'>+#define CLK_FANOUT_27M		174</div><div class='add'>+#define CLK_FANOUT_PCLK		175</div><div class='add'>+#define CLK_FANOUT0		176</div><div class='add'>+#define CLK_FANOUT1		177</div><div class='add'>+#define CLK_FANOUT2		178</div><div class='add'>+#define CLK_NPU			179</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_SUN55I_A523_CCU_H_ */</div><div class='head'>diff --git a/include/dt-bindings/clock/sun55i-a523-mcu-ccu.h b/include/dt-bindings/clock/sun55i-a523-mcu-ccu.h<br/>new file mode 100644<br/>index 000000000000..6efc6bc7e11a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun55i-a523-mcu-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sun55i-a523-mcu-ccu.h</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Chen-Yu Tsai &lt;wens@csie.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_SUN55I_A523_MCU_CCU_H_</div><div class='add'>+#define _DT_BINDINGS_CLK_SUN55I_A523_MCU_CCU_H_</div><div class='add'>+</div><div class='add'>+#define CLK_MCU_PLL_AUDIO1	0</div><div class='add'>+#define CLK_MCU_PLL_AUDIO1_DIV2	1</div><div class='add'>+#define CLK_MCU_PLL_AUDIO1_DIV5	2</div><div class='add'>+#define CLK_MCU_AUDIO_OUT	3</div><div class='add'>+#define CLK_MCU_DSP		4</div><div class='add'>+#define CLK_MCU_I2S0		5</div><div class='add'>+#define CLK_MCU_I2S1		6</div><div class='add'>+#define CLK_MCU_I2S2		7</div><div class='add'>+#define CLK_MCU_I2S3		8</div><div class='add'>+#define CLK_MCU_I2S3_ASRC	9</div><div class='add'>+#define CLK_BUS_MCU_I2S0	10</div><div class='add'>+#define CLK_BUS_MCU_I2S1	11</div><div class='add'>+#define CLK_BUS_MCU_I2S2	12</div><div class='add'>+#define CLK_BUS_MCU_I2S3	13</div><div class='add'>+#define CLK_MCU_SPDIF_TX	14</div><div class='add'>+#define CLK_MCU_SPDIF_RX	15</div><div class='add'>+#define CLK_BUS_MCU_SPDIF	16</div><div class='add'>+#define CLK_MCU_DMIC		17</div><div class='add'>+#define CLK_BUS_MCU_DMIC	18</div><div class='add'>+#define CLK_MCU_AUDIO_CODEC_DAC	19</div><div class='add'>+#define CLK_MCU_AUDIO_CODEC_ADC	20</div><div class='add'>+#define CLK_BUS_MCU_AUDIO_CODEC	21</div><div class='add'>+#define CLK_BUS_MCU_DSP_MSGBOX	22</div><div class='add'>+#define CLK_BUS_MCU_DSP_CFG	23</div><div class='add'>+#define CLK_BUS_MCU_NPU_HCLK	24</div><div class='add'>+#define CLK_BUS_MCU_NPU_ACLK	25</div><div class='add'>+#define CLK_MCU_TIMER0		26</div><div class='add'>+#define CLK_MCU_TIMER1		27</div><div class='add'>+#define CLK_MCU_TIMER2		28</div><div class='add'>+#define CLK_MCU_TIMER3		29</div><div class='add'>+#define CLK_MCU_TIMER4		30</div><div class='add'>+#define CLK_MCU_TIMER5		31</div><div class='add'>+#define CLK_BUS_MCU_TIMER	32</div><div class='add'>+#define CLK_BUS_MCU_DMA		33</div><div class='add'>+#define CLK_MCU_TZMA0		34</div><div class='add'>+#define CLK_MCU_TZMA1		35</div><div class='add'>+#define CLK_BUS_MCU_PUBSRAM	36</div><div class='add'>+#define CLK_MCU_MBUS_DMA	37</div><div class='add'>+#define CLK_MCU_MBUS		38</div><div class='add'>+#define CLK_MCU_RISCV		39</div><div class='add'>+#define CLK_BUS_MCU_RISCV_CFG	40</div><div class='add'>+#define CLK_BUS_MCU_RISCV_MSGBOX	41</div><div class='add'>+#define CLK_MCU_PWM0		42</div><div class='add'>+#define CLK_BUS_MCU_PWM0	43</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_SUN55I_A523_MCU_CCU_H_ */</div><div class='head'>diff --git a/include/dt-bindings/clock/sun55i-a523-r-ccu.h b/include/dt-bindings/clock/sun55i-a523-r-ccu.h<br/>new file mode 100644<br/>index 000000000000..365647499b9a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun55i-a523-r-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sun55i-a523-r-ccu.h</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Arm Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_SUN55I_A523_R_CCU_H_</div><div class='add'>+#define _DT_BINDINGS_CLK_SUN55I_A523_R_CCU_H_</div><div class='add'>+</div><div class='add'>+#define CLK_R_AHB		0</div><div class='add'>+#define CLK_R_APB0		1</div><div class='add'>+#define CLK_R_APB1		2</div><div class='add'>+#define CLK_R_TIMER0		3</div><div class='add'>+#define CLK_R_TIMER1		4</div><div class='add'>+#define CLK_R_TIMER2		5</div><div class='add'>+#define CLK_BUS_R_TIMER		6</div><div class='add'>+#define CLK_BUS_R_TWD		7</div><div class='add'>+#define CLK_R_PWMCTRL		8</div><div class='add'>+#define CLK_BUS_R_PWMCTRL	9</div><div class='add'>+#define CLK_R_SPI		10</div><div class='add'>+#define CLK_BUS_R_SPI		11</div><div class='add'>+#define CLK_BUS_R_SPINLOCK	12</div><div class='add'>+#define CLK_BUS_R_MSGBOX	13</div><div class='add'>+#define CLK_BUS_R_UART0		14</div><div class='add'>+#define CLK_BUS_R_UART1		15</div><div class='add'>+#define CLK_BUS_R_I2C0		16</div><div class='add'>+#define CLK_BUS_R_I2C1		17</div><div class='add'>+#define CLK_BUS_R_I2C2		18</div><div class='add'>+#define CLK_BUS_R_PPU0		19</div><div class='add'>+#define CLK_BUS_R_PPU1		20</div><div class='add'>+#define CLK_BUS_R_CPU_BIST	21</div><div class='add'>+#define CLK_R_IR_RX		22</div><div class='add'>+#define CLK_BUS_R_IR_RX		23</div><div class='add'>+#define CLK_BUS_R_DMA		24</div><div class='add'>+#define CLK_BUS_R_RTC		25</div><div class='add'>+#define CLK_BUS_R_CPUCFG	26</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_CLK_SUN55I_A523_R_CCU_H_ */</div><div class='head'>diff --git a/include/dt-bindings/clock/sun8i-v3s-ccu.h b/include/dt-bindings/clock/sun8i-v3s-ccu.h<br/>index 014ac6123d17..c4055629c9f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun8i-v3s-ccu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/sun8i-v3s-ccu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/sun8i-v3s-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/sun8i-v3s-ccu.h</a></div><div class='hunk'>@@ -96,7 +96,7 @@</div><div class='ctx'> #define CLK_TCON0		64</div><div class='ctx'> #define CLK_CSI_MISC		65</div><div class='ctx'> #define CLK_CSI0_MCLK		66</div><div class='del'>-#define CLK_CSI1_SCLK		67</div><div class='add'>+#define CLK_CSI_SCLK		67</div><div class='ctx'> #define CLK_CSI1_MCLK		68</div><div class='ctx'> #define CLK_VE			69</div><div class='ctx'> #define CLK_AC_DIG		70</div><div class='head'>diff --git a/include/dt-bindings/clock/tegra30-car.h b/include/dt-bindings/clock/tegra30-car.h<br/>index f193663e6f28..763b81f80908 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/tegra30-car.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/tegra30-car.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/tegra30-car.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/tegra30-car.h</a></div><div class='hunk'>@@ -271,6 +271,7 @@</div><div class='ctx'> #define TEGRA30_CLK_AUDIO3_MUX 306</div><div class='ctx'> #define TEGRA30_CLK_AUDIO4_MUX 307</div><div class='ctx'> #define TEGRA30_CLK_SPDIF_MUX 308</div><div class='del'>-#define TEGRA30_CLK_CLK_MAX 309</div><div class='add'>+#define TEGRA30_CLK_CSIA_PAD 309</div><div class='add'>+#define TEGRA30_CLK_CSIB_PAD 310</div><div class='ctx'> </div><div class='ctx'> #endif	/* _DT_BINDINGS_CLOCK_TEGRA30_CAR_H */</div><div class='head'>diff --git a/include/dt-bindings/clock/thead,th1520-clk-ap.h b/include/dt-bindings/clock/thead,th1520-clk-ap.h<br/>new file mode 100644<br/>index 000000000000..09a9aa7b3ab1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/thead,th1520-clk-ap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/thead,th1520-clk-ap.h</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Vivo Communication Technology Co. Ltd.</div><div class='add'>+ * Authors: Yangtao Li &lt;frank.li@vivo.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_CLK_TH1520_H_</div><div class='add'>+#define _DT_BINDINGS_CLK_TH1520_H_</div><div class='add'>+</div><div class='add'>+#define CLK_CPU_PLL0		0</div><div class='add'>+#define CLK_CPU_PLL1		1</div><div class='add'>+#define CLK_GMAC_PLL		2</div><div class='add'>+#define CLK_VIDEO_PLL		3</div><div class='add'>+#define CLK_DPU0_PLL		4</div><div class='add'>+#define CLK_DPU1_PLL		5</div><div class='add'>+#define CLK_TEE_PLL		6</div><div class='add'>+#define CLK_C910_I0		7</div><div class='add'>+#define CLK_C910		8</div><div class='add'>+#define CLK_BROM		9</div><div class='add'>+#define CLK_BMU			10</div><div class='add'>+#define CLK_AHB2_CPUSYS_HCLK	11</div><div class='add'>+#define CLK_APB3_CPUSYS_PCLK	12</div><div class='add'>+#define CLK_AXI4_CPUSYS2_ACLK	13</div><div class='add'>+#define CLK_AON2CPU_A2X		14</div><div class='add'>+#define CLK_X2X_CPUSYS		15</div><div class='add'>+#define CLK_AXI_ACLK		16</div><div class='add'>+#define CLK_CPU2AON_X2H		17</div><div class='add'>+#define CLK_PERI_AHB_HCLK	18</div><div class='add'>+#define CLK_CPU2PERI_X2H	19</div><div class='add'>+#define CLK_PERI_APB_PCLK	20</div><div class='add'>+#define CLK_PERI2APB_PCLK	21</div><div class='add'>+#define CLK_PERISYS_APB1_HCLK	22</div><div class='add'>+#define CLK_PERISYS_APB2_HCLK	23</div><div class='add'>+#define CLK_PERISYS_APB3_HCLK	24</div><div class='add'>+#define CLK_PERISYS_APB4_HCLK	25</div><div class='add'>+#define CLK_OSC12M		26</div><div class='add'>+#define CLK_OUT1		27</div><div class='add'>+#define CLK_OUT2		28</div><div class='add'>+#define CLK_OUT3		29</div><div class='add'>+#define CLK_OUT4		30</div><div class='add'>+#define CLK_APB_PCLK		31</div><div class='add'>+#define CLK_NPU			32</div><div class='add'>+#define CLK_NPU_AXI		33</div><div class='add'>+#define CLK_VI			34</div><div class='add'>+#define CLK_VI_AHB		35</div><div class='add'>+#define CLK_VO_AXI		36</div><div class='add'>+#define CLK_VP_APB		37</div><div class='add'>+#define CLK_VP_AXI		38</div><div class='add'>+#define CLK_CPU2VP		39</div><div class='add'>+#define CLK_VENC		40</div><div class='add'>+#define CLK_DPU0		41</div><div class='add'>+#define CLK_DPU1		42</div><div class='add'>+#define CLK_EMMC_SDIO		43</div><div class='add'>+#define CLK_GMAC1		44</div><div class='add'>+#define CLK_PADCTRL1		45</div><div class='add'>+#define CLK_DSMART		46</div><div class='add'>+#define CLK_PADCTRL0		47</div><div class='add'>+#define CLK_GMAC_AXI		48</div><div class='add'>+#define CLK_GPIO3		49</div><div class='add'>+#define CLK_GMAC0		50</div><div class='add'>+#define CLK_PWM			51</div><div class='add'>+#define CLK_QSPI0		52</div><div class='add'>+#define CLK_QSPI1		53</div><div class='add'>+#define CLK_SPI			54</div><div class='add'>+#define CLK_UART0_PCLK		55</div><div class='add'>+#define CLK_UART1_PCLK		56</div><div class='add'>+#define CLK_UART2_PCLK		57</div><div class='add'>+#define CLK_UART3_PCLK		58</div><div class='add'>+#define CLK_UART4_PCLK		59</div><div class='add'>+#define CLK_UART5_PCLK		60</div><div class='add'>+#define CLK_GPIO0		61</div><div class='add'>+#define CLK_GPIO1		62</div><div class='add'>+#define CLK_GPIO2		63</div><div class='add'>+#define CLK_I2C0		64</div><div class='add'>+#define CLK_I2C1		65</div><div class='add'>+#define CLK_I2C2		66</div><div class='add'>+#define CLK_I2C3		67</div><div class='add'>+#define CLK_I2C4		68</div><div class='add'>+#define CLK_I2C5		69</div><div class='add'>+#define CLK_SPINLOCK		70</div><div class='add'>+#define CLK_DMA			71</div><div class='add'>+#define CLK_MBOX0		72</div><div class='add'>+#define CLK_MBOX1		73</div><div class='add'>+#define CLK_MBOX2		74</div><div class='add'>+#define CLK_MBOX3		75</div><div class='add'>+#define CLK_WDT0		76</div><div class='add'>+#define CLK_WDT1		77</div><div class='add'>+#define CLK_TIMER0		78</div><div class='add'>+#define CLK_TIMER1		79</div><div class='add'>+#define CLK_SRAM0		80</div><div class='add'>+#define CLK_SRAM1		81</div><div class='add'>+#define CLK_SRAM2		82</div><div class='add'>+#define CLK_SRAM3		83</div><div class='add'>+#define CLK_PLL_GMAC_100M	84</div><div class='add'>+#define CLK_UART_SCLK		85</div><div class='add'>+</div><div class='add'>+/* VO clocks */</div><div class='add'>+#define CLK_AXI4_VO_ACLK		0</div><div class='add'>+#define CLK_GPU_MEM			1</div><div class='add'>+#define CLK_GPU_CORE			2</div><div class='add'>+#define CLK_GPU_CFG_ACLK		3</div><div class='add'>+#define CLK_DPU_PIXELCLK0		4</div><div class='add'>+#define CLK_DPU_PIXELCLK1		5</div><div class='add'>+#define CLK_DPU_HCLK			6</div><div class='add'>+#define CLK_DPU_ACLK			7</div><div class='add'>+#define CLK_DPU_CCLK			8</div><div class='add'>+#define CLK_HDMI_SFR			9</div><div class='add'>+#define CLK_HDMI_PCLK			10</div><div class='add'>+#define CLK_HDMI_CEC			11</div><div class='add'>+#define CLK_MIPI_DSI0_PCLK		12</div><div class='add'>+#define CLK_MIPI_DSI1_PCLK		13</div><div class='add'>+#define CLK_MIPI_DSI0_CFG		14</div><div class='add'>+#define CLK_MIPI_DSI1_CFG		15</div><div class='add'>+#define CLK_MIPI_DSI0_REFCLK		16</div><div class='add'>+#define CLK_MIPI_DSI1_REFCLK		17</div><div class='add'>+#define CLK_HDMI_I2S			18</div><div class='add'>+#define CLK_X2H_DPU1_ACLK		19</div><div class='add'>+#define CLK_X2H_DPU_ACLK		20</div><div class='add'>+#define CLK_AXI4_VO_PCLK		21</div><div class='add'>+#define CLK_IOPMP_VOSYS_DPU_PCLK	22</div><div class='add'>+#define CLK_IOPMP_VOSYS_DPU1_PCLK	23</div><div class='add'>+#define CLK_IOPMP_VOSYS_GPU_PCLK	24</div><div class='add'>+#define CLK_IOPMP_DPU1_ACLK		25</div><div class='add'>+#define CLK_IOPMP_DPU_ACLK		26</div><div class='add'>+#define CLK_IOPMP_GPU_ACLK		27</div><div class='add'>+#define CLK_MIPIDSI0_PIXCLK		28</div><div class='add'>+#define CLK_MIPIDSI1_PIXCLK		29</div><div class='add'>+#define CLK_HDMI_PIXCLK			30</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/clock/toshiba,tmpv770x.h b/include/dt-bindings/clock/toshiba,tmpv770x.h<br/>index 5fce713001fd..a36c89266686 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/toshiba,tmpv770x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/toshiba,tmpv770x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/toshiba,tmpv770x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/toshiba,tmpv770x.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #define TMPV770X_PLL_PIDDRCPLL		4</div><div class='ctx'> #define TMPV770X_PLL_PIVOIFPLL		5</div><div class='ctx'> #define TMPV770X_PLL_PIIMGERPLL		6</div><div class='del'>-#define TMPV770X_NR_PLL		7</div><div class='ctx'> </div><div class='ctx'> /* Clocks */</div><div class='ctx'> #define TMPV770X_CLK_PIPLL1_DIV1	0</div><div class='hunk'>@@ -141,7 +140,9 @@</div><div class='ctx'> #define TMPV770X_CLK_PIREFCLK		124</div><div class='ctx'> #define TMPV770X_CLK_SBUS		125</div><div class='ctx'> #define TMPV770X_CLK_BUSLCK		126</div><div class='del'>-#define TMPV770X_NR_CLK			127</div><div class='add'>+#define TMPV770X_CLK_VIIFBS1_L2ISP	127</div><div class='add'>+#define TMPV770X_CLK_VIIFBS1_L1ISP	128</div><div class='add'>+#define TMPV770X_CLK_VIIFBS1_PROC	129</div><div class='ctx'> </div><div class='ctx'> /* Reset */</div><div class='ctx'> #define TMPV770X_RESET_PIETHER_2P5M	0</div><div class='hunk'>@@ -176,6 +177,13 @@</div><div class='ctx'> #define TMPV770X_RESET_PIPCMIF		29</div><div class='ctx'> #define TMPV770X_RESET_PICKMON		30</div><div class='ctx'> #define TMPV770X_RESET_SBUSCLK		31</div><div class='del'>-#define TMPV770X_NR_RESET		32</div><div class='add'>+#define TMPV770X_RESET_VIIFBS0		32</div><div class='add'>+#define TMPV770X_RESET_VIIFBS0_APB	33</div><div class='add'>+#define TMPV770X_RESET_VIIFBS0_L2ISP	34</div><div class='add'>+#define TMPV770X_RESET_VIIFBS0_L1ISP	35</div><div class='add'>+#define TMPV770X_RESET_VIIFBS1		36</div><div class='add'>+#define TMPV770X_RESET_VIIFBS1_APB	37</div><div class='add'>+#define TMPV770X_RESET_VIIFBS1_L2ISP	38</div><div class='add'>+#define TMPV770X_RESET_VIIFBS1_L1ISP	39</div><div class='ctx'> </div><div class='ctx'> #endif /*_DT_BINDINGS_CLOCK_TOSHIBA_TMPV770X_H_ */</div><div class='head'>diff --git a/include/dt-bindings/clock/xlnx-zynqmp-clk.h b/include/dt-bindings/clock/xlnx-zynqmp-clk.h<br/>index cdc4c0b9a374..f0f7ddd3dcbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/xlnx-zynqmp-clk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/clock/xlnx-zynqmp-clk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/clock/xlnx-zynqmp-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/clock/xlnx-zynqmp-clk.h</a></div><div class='hunk'>@@ -9,6 +9,13 @@</div><div class='ctx'> #ifndef _DT_BINDINGS_CLK_ZYNQMP_H</div><div class='ctx'> #define _DT_BINDINGS_CLK_ZYNQMP_H</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * These bindings are deprecated, because they do not match the actual</div><div class='add'>+ * concept of bindings but rather contain pure firmware values.</div><div class='add'>+ * Instead include the header in the DTS source directory.</div><div class='add'>+ */</div><div class='add'>+#warning "These bindings are deprecated. Instead use the header in the DTS source directory."</div><div class='add'>+</div><div class='ctx'> #define IOPLL			0</div><div class='ctx'> #define RPLL			1</div><div class='ctx'> #define APLL			2</div><div class='head'>diff --git a/include/dt-bindings/gpio/tegra256-gpio.h b/include/dt-bindings/gpio/tegra256-gpio.h<br/>new file mode 100644<br/>index 000000000000..a0353a302aeb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/gpio/tegra256-gpio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/gpio/tegra256-gpio.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved. */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This header provides constants for the nvidia,tegra256-gpio DT binding.</div><div class='add'>+ *</div><div class='add'>+ * The first cell in Tegra's GPIO specifier is the GPIO ID.</div><div class='add'>+ * The macros below provide names for this.</div><div class='add'>+ *</div><div class='add'>+ * The second cell contains standard flag values specified in gpio.h.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_GPIO_TEGRA256_GPIO_H</div><div class='add'>+#define _DT_BINDINGS_GPIO_TEGRA256_GPIO_H</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/gpio/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/* GPIOs implemented by main GPIO controller */</div><div class='add'>+#define TEGRA256_MAIN_GPIO_PORT_A 0</div><div class='add'>+#define TEGRA256_MAIN_GPIO_PORT_B 1</div><div class='add'>+#define TEGRA256_MAIN_GPIO_PORT_C 2</div><div class='add'>+#define TEGRA256_MAIN_GPIO_PORT_D 3</div><div class='add'>+</div><div class='add'>+#define TEGRA256_MAIN_GPIO(port, offset) \</div><div class='add'>+		((TEGRA256_MAIN_GPIO_PORT_##port * 8) + (offset))</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/include/dt-bindings/i3c/i3c.h b/include/dt-bindings/i3c/i3c.h<br/>new file mode 100644<br/>index 000000000000..373439218bba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/i3c/i3c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/i3c/i3c.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2024 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_I3C_I3C_H</div><div class='add'>+#define _DT_BINDINGS_I3C_I3C_H</div><div class='add'>+</div><div class='add'>+#define I2C_FM      (1 &lt;&lt; 4)</div><div class='add'>+#define I2C_FM_PLUS (0 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define I2C_FILTER  (0 &lt;&lt; 5)</div><div class='add'>+#define I2C_NO_FILTER_HIGH_FREQUENCY    (1 &lt;&lt; 5)</div><div class='add'>+#define I2C_NO_FILTER_LOW_FREQUENCY     (2 &lt;&lt; 5)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/adi,ad4695.h b/include/dt-bindings/iio/adc/adi,ad4695.h<br/>new file mode 100644<br/>index 000000000000..fea4525d2710<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/adi,ad4695.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/adi,ad4695.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_ADI_AD4695_H</div><div class='add'>+#define _DT_BINDINGS_ADI_AD4695_H</div><div class='add'>+</div><div class='add'>+#define AD4695_COMMON_MODE_REFGND	0xFF</div><div class='add'>+#define AD4695_COMMON_MODE_COM		0xFE</div><div class='add'>+</div><div class='add'>+#define AD4695_TRIGGER_EVENT_BUSY	0</div><div class='add'>+#define AD4695_TRIGGER_EVENT_ALERT	1</div><div class='add'>+</div><div class='add'>+#define AD4695_TRIGGER_PIN_GP0		0</div><div class='add'>+#define AD4695_TRIGGER_PIN_GP2		2</div><div class='add'>+#define AD4695_TRIGGER_PIN_GP3		3</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_ADI_AD4695_H */</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/adi,ad7606.h b/include/dt-bindings/iio/adc/adi,ad7606.h<br/>new file mode 100644<br/>index 000000000000..f38a6d72b6dc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/adi,ad7606.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/adi,ad7606.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_ADI_AD7606_H</div><div class='add'>+#define _DT_BINDINGS_ADI_AD7606_H</div><div class='add'>+</div><div class='add'>+#define AD7606_TRIGGER_EVENT_BUSY	0</div><div class='add'>+#define AD7606_TRIGGER_EVENT_FRSTDATA	1</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_ADI_AD7606_H */</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/adi,ad7768-1.h b/include/dt-bindings/iio/adc/adi,ad7768-1.h<br/>new file mode 100644<br/>index 000000000000..34d92856a50b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/adi,ad7768-1.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/adi,ad7768-1.h</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_ADI_AD7768_1_H</div><div class='add'>+#define _DT_BINDINGS_ADI_AD7768_1_H</div><div class='add'>+</div><div class='add'>+#define AD7768_TRIGGER_SOURCE_SYNC_OUT  0</div><div class='add'>+#define AD7768_TRIGGER_SOURCE_GPIO3     1</div><div class='add'>+#define AD7768_TRIGGER_SOURCE_DRDY      2</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_ADI_AD7768_1_H */</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/gehc,pmc-adc.h b/include/dt-bindings/iio/adc/gehc,pmc-adc.h<br/>new file mode 100644<br/>index 000000000000..2f291e3c76ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/gehc,pmc-adc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/gehc,pmc-adc.h</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_IIO_ADC_GEHC_PMC_ADC_H</div><div class='add'>+#define _DT_BINDINGS_IIO_ADC_GEHC_PMC_ADC_H</div><div class='add'>+</div><div class='add'>+/* ADC channel type */</div><div class='add'>+#define GEHC_PMC_ADC_VOLTAGE	0</div><div class='add'>+#define GEHC_PMC_ADC_CURRENT	1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/mediatek,mt6357-auxadc.h b/include/dt-bindings/iio/adc/mediatek,mt6357-auxadc.h<br/>new file mode 100644<br/>index 000000000000..03ebb1d23953<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/mediatek,mt6357-auxadc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/mediatek,mt6357-auxadc.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_MEDIATEK_MT6357_AUXADC_H</div><div class='add'>+#define _DT_BINDINGS_MEDIATEK_MT6357_AUXADC_H</div><div class='add'>+</div><div class='add'>+/* ADC Channel Index */</div><div class='add'>+#define MT6357_AUXADC_BATADC		0</div><div class='add'>+#define MT6357_AUXADC_ISENSE		1</div><div class='add'>+#define MT6357_AUXADC_VCDT		2</div><div class='add'>+#define MT6357_AUXADC_BAT_TEMP		3</div><div class='add'>+#define MT6357_AUXADC_CHIP_TEMP		4</div><div class='add'>+#define MT6357_AUXADC_ACCDET		5</div><div class='add'>+#define MT6357_AUXADC_VDCXO		6</div><div class='add'>+#define MT6357_AUXADC_TSX_TEMP		7</div><div class='add'>+#define MT6357_AUXADC_HPOFS_CAL		8</div><div class='add'>+#define MT6357_AUXADC_DCXO_TEMP		9</div><div class='add'>+#define MT6357_AUXADC_VCORE_TEMP	10</div><div class='add'>+#define MT6357_AUXADC_VPROC_TEMP	11</div><div class='add'>+#define MT6357_AUXADC_VBAT		12</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/mediatek,mt6358-auxadc.h b/include/dt-bindings/iio/adc/mediatek,mt6358-auxadc.h<br/>new file mode 100644<br/>index 000000000000..efa08398fafd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/mediatek,mt6358-auxadc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/mediatek,mt6358-auxadc.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_MEDIATEK_MT6358_AUXADC_H</div><div class='add'>+#define _DT_BINDINGS_MEDIATEK_MT6358_AUXADC_H</div><div class='add'>+</div><div class='add'>+/* ADC Channel Index */</div><div class='add'>+#define MT6358_AUXADC_BATADC		0</div><div class='add'>+#define MT6358_AUXADC_VCDT		1</div><div class='add'>+#define MT6358_AUXADC_BAT_TEMP		2</div><div class='add'>+#define MT6358_AUXADC_CHIP_TEMP		3</div><div class='add'>+#define MT6358_AUXADC_ACCDET		4</div><div class='add'>+#define MT6358_AUXADC_VDCXO		5</div><div class='add'>+#define MT6358_AUXADC_TSX_TEMP		6</div><div class='add'>+#define MT6358_AUXADC_HPOFS_CAL		7</div><div class='add'>+#define MT6358_AUXADC_DCXO_TEMP		8</div><div class='add'>+#define MT6358_AUXADC_VBIF		9</div><div class='add'>+#define MT6358_AUXADC_VCORE_TEMP	10</div><div class='add'>+#define MT6358_AUXADC_VPROC_TEMP	11</div><div class='add'>+#define MT6358_AUXADC_VGPU_TEMP		12</div><div class='add'>+#define MT6358_AUXADC_VBAT		13</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/mediatek,mt6359-auxadc.h b/include/dt-bindings/iio/adc/mediatek,mt6359-auxadc.h<br/>new file mode 100644<br/>index 000000000000..59826393ee7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/mediatek,mt6359-auxadc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/mediatek,mt6359-auxadc.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_MEDIATEK_MT6359_AUXADC_H</div><div class='add'>+#define _DT_BINDINGS_MEDIATEK_MT6359_AUXADC_H</div><div class='add'>+</div><div class='add'>+/* ADC Channel Index */</div><div class='add'>+#define MT6359_AUXADC_BATADC		0</div><div class='add'>+#define MT6359_AUXADC_BAT_TEMP		1</div><div class='add'>+#define MT6359_AUXADC_CHIP_TEMP		2</div><div class='add'>+#define MT6359_AUXADC_ACCDET		3</div><div class='add'>+#define MT6359_AUXADC_VDCXO		4</div><div class='add'>+#define MT6359_AUXADC_TSX_TEMP		5</div><div class='add'>+#define MT6359_AUXADC_HPOFS_CAL		6</div><div class='add'>+#define MT6359_AUXADC_DCXO_TEMP		7</div><div class='add'>+#define MT6359_AUXADC_VBIF		8</div><div class='add'>+#define MT6359_AUXADC_VCORE_TEMP	9</div><div class='add'>+#define MT6359_AUXADC_VPROC_TEMP	10</div><div class='add'>+#define MT6359_AUXADC_VGPU_TEMP		11</div><div class='add'>+#define MT6359_AUXADC_VBAT		12</div><div class='add'>+#define MT6359_AUXADC_IBAT		13</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h b/include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h<br/>new file mode 100644<br/>index 000000000000..92d135477d0e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_MEDIATEK_MT6363_AUXADC_H</div><div class='add'>+#define _DT_BINDINGS_MEDIATEK_MT6363_AUXADC_H</div><div class='add'>+</div><div class='add'>+/* ADC Channel Index */</div><div class='add'>+#define MT6363_AUXADC_BATADC		0</div><div class='add'>+#define MT6363_AUXADC_VCDT		1</div><div class='add'>+#define MT6363_AUXADC_BAT_TEMP		2</div><div class='add'>+#define MT6363_AUXADC_CHIP_TEMP		3</div><div class='add'>+#define MT6363_AUXADC_VSYSSNS		4</div><div class='add'>+#define MT6363_AUXADC_VTREF		5</div><div class='add'>+#define MT6363_AUXADC_VCORE_TEMP	6</div><div class='add'>+#define MT6363_AUXADC_VPROC_TEMP	7</div><div class='add'>+#define MT6363_AUXADC_VGPU_TEMP		8</div><div class='add'>+#define MT6363_AUXADC_VIN1		9</div><div class='add'>+#define MT6363_AUXADC_VIN2		10</div><div class='add'>+#define MT6363_AUXADC_VIN3		11</div><div class='add'>+#define MT6363_AUXADC_VIN4		12</div><div class='add'>+#define MT6363_AUXADC_VIN5		13</div><div class='add'>+#define MT6363_AUXADC_VIN6		14</div><div class='add'>+#define MT6363_AUXADC_VIN7		15</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h b/include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h<br/>new file mode 100644<br/>index 000000000000..17cab86d355e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_MEDIATEK_MT6373_AUXADC_H</div><div class='add'>+#define _DT_BINDINGS_MEDIATEK_MT6373_AUXADC_H</div><div class='add'>+</div><div class='add'>+/* ADC Channel Index */</div><div class='add'>+#define MT6373_AUXADC_CHIP_TEMP		0</div><div class='add'>+#define MT6373_AUXADC_VCORE_TEMP	1</div><div class='add'>+#define MT6373_AUXADC_VPROC_TEMP	2</div><div class='add'>+#define MT6373_AUXADC_VGPU_TEMP		3</div><div class='add'>+#define MT6373_AUXADC_VIN1		4</div><div class='add'>+#define MT6373_AUXADC_VIN2		5</div><div class='add'>+#define MT6373_AUXADC_VIN3		6</div><div class='add'>+#define MT6373_AUXADC_VIN4		7</div><div class='add'>+#define MT6373_AUXADC_VIN5		8</div><div class='add'>+#define MT6373_AUXADC_VIN6		9</div><div class='add'>+#define MT6373_AUXADC_VIN7		10</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/input/cros-ec-keyboard.h b/include/dt-bindings/input/cros-ec-keyboard.h<br/>index f0ae03634a96..afc12f6aa642 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/input/cros-ec-keyboard.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/input/cros-ec-keyboard.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/input/cros-ec-keyboard.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/input/cros-ec-keyboard.h</a></div><div class='hunk'>@@ -100,4 +100,108 @@</div><div class='ctx'> 	MATRIX_KEY(0x07, 0x0b, KEY_UP)		\</div><div class='ctx'> 	MATRIX_KEY(0x07, 0x0c, KEY_LEFT)</div><div class='ctx'> </div><div class='add'>+/* No numpad */</div><div class='add'>+#define CROS_TOP_ROW_KEYMAP_V30 \</div><div class='add'>+	MATRIX_KEY(0x00, 0x01, KEY_F11)		/* T11 */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x02, KEY_F1)		/* T1 */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x04, KEY_F10)		/* T10 */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x0b, KEY_F14)		/* T14 */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x0c, KEY_F15)		/* T15 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x02, KEY_F4)		/* T4 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x04, KEY_F7)		/* T7 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x05, KEY_F12)		/* T12 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x09, KEY_F9)		/* T9 */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x02, KEY_F3)		/* T3 */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x04, KEY_F6)		/* T6 */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x0b, KEY_F8)		/* T8 */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x02, KEY_F2)		/* T2 */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x05, KEY_F13)		/* T13 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x04, KEY_F5)		/* T5 */</div><div class='add'>+</div><div class='add'>+#define CROS_MAIN_KEYMAP_V30			/* Keycode */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x03, KEY_B)		/* 50 */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x05, KEY_N)		/* 51 */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x06, KEY_RO)		/* 56 (JIS) */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x08, KEY_EQUAL)	/* 13 */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x09, KEY_HOME)	/* 80 (Numpad) */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT)	/* 62 */	\</div><div class='add'>+	MATRIX_KEY(0x00, 0x10, KEY_FN)		/* 127 */	\</div><div class='add'>+								\</div><div class='add'>+	MATRIX_KEY(0x01, 0x01, KEY_ESC)		/* 110 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x03, KEY_G)		/* 35 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x06, KEY_H)		/* 36 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE)	/* 41 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE)	/* 15 */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x0c, KEY_HENKAN)	/* 65 (JIS) */	\</div><div class='add'>+	MATRIX_KEY(0x01, 0x0e, KEY_LEFTCTRL)	/* 58 */	\</div><div class='add'>+								\</div><div class='add'>+	MATRIX_KEY(0x02, 0x01, KEY_TAB)		/* 16 */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x03, KEY_T)		/* 21 */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE)	/* 28 */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x06, KEY_Y)		/* 22 */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)	/* 27 */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x09, KEY_DELETE)	/* 76 (Numpad) */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x0c, KEY_PAGEUP)	/* 85 (Numpad) */	\</div><div class='add'>+	MATRIX_KEY(0x02, 0x011, KEY_YEN)	/* 14 (JIS) */	\</div><div class='add'>+								\</div><div class='add'>+	MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA)	/* Launcher */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x01, KEY_GRAVE)	/* 1 */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x03, KEY_5)		/* 6 */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x04, KEY_S)		/* 32 */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x06, KEY_MINUS)	/* 12 */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x08, KEY_6)		/* 7 */		\</div><div class='add'>+	MATRIX_KEY(0x03, 0x09, KEY_SLEEP)	/* Lock */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)	/* 29 */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN)	/* 63 (JIS) */	\</div><div class='add'>+	MATRIX_KEY(0x03, 0x0e, KEY_RIGHTCTRL)	/* 64 */	\</div><div class='add'>+								\</div><div class='add'>+	MATRIX_KEY(0x04, 0x01, KEY_A)		/* 31 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x02, KEY_D)		/* 33 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x03, KEY_F)		/* 34 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x05, KEY_K)		/* 38 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x06, KEY_J)		/* 37 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON)	/* 40 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x09, KEY_L)		/* 39 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x0b, KEY_ENTER)	/* 43 */	\</div><div class='add'>+	MATRIX_KEY(0x04, 0x0c, KEY_END)		/* 81 (Numpad) */	\</div><div class='add'>+								\</div><div class='add'>+	MATRIX_KEY(0x05, 0x01, KEY_1)		/* 2 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x02, KEY_COMMA)	/* 53 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x03, KEY_DOT)		/* 54 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x04, KEY_SLASH)	/* 55 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x05, KEY_C)		/* 48 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x06, KEY_SPACE)	/* 61 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT)	/* 44 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x08, KEY_X)		/* 47 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x09, KEY_V)		/* 49 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x0b, KEY_M)		/* 52 */	\</div><div class='add'>+	MATRIX_KEY(0x05, 0x0c, KEY_PAGEDOWN)	/* 86 (Numpad) */	\</div><div class='add'>+								\</div><div class='add'>+	MATRIX_KEY(0x06, 0x01, KEY_Z)		/* 46 */	\</div><div class='add'>+	MATRIX_KEY(0x06, 0x02, KEY_3)		/* 4 */		\</div><div class='add'>+	MATRIX_KEY(0x06, 0x03, KEY_4)		/* 5 */		\</div><div class='add'>+	MATRIX_KEY(0x06, 0x04, KEY_2)		/* 3 */		\</div><div class='add'>+	MATRIX_KEY(0x06, 0x05, KEY_8)		/* 9 */		\</div><div class='add'>+	MATRIX_KEY(0x06, 0x06, KEY_0)		/* 11 */	\</div><div class='add'>+	MATRIX_KEY(0x06, 0x08, KEY_7)		/* 8 */		\</div><div class='add'>+	MATRIX_KEY(0x06, 0x09, KEY_9)		/* 10 */	\</div><div class='add'>+	MATRIX_KEY(0x06, 0x0b, KEY_DOWN)	/* 84 */	\</div><div class='add'>+	MATRIX_KEY(0x06, 0x0c, KEY_RIGHT)	/* 89 */	\</div><div class='add'>+	MATRIX_KEY(0x06, 0x0d, KEY_LEFTALT)	/* 60 */	\</div><div class='add'>+	MATRIX_KEY(0x06, 0x0f, KEY_ASSISTANT)	/* 128 */	\</div><div class='add'>+	MATRIX_KEY(0x06, 0x11, KEY_BACKSLASH)	/* 42 (JIS, ISO) */	\</div><div class='add'>+								\</div><div class='add'>+	MATRIX_KEY(0x07, 0x01, KEY_U)		/* 23 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x02, KEY_I)		/* 24 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x03, KEY_O)		/* 25 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x04, KEY_P)		/* 26 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x05, KEY_Q)		/* 17 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x06, KEY_W)		/* 18 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT)	/* 57 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x08, KEY_E)		/* 19 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x09, KEY_R)		/* 20 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x0b, KEY_UP)		/* 83 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x0c, KEY_LEFT)	/* 79 */	\</div><div class='add'>+	MATRIX_KEY(0x07, 0x11, KEY_102ND)	/* 45 (ISO) */</div><div class='add'>+</div><div class='ctx'> #endif /* _CROS_EC_KEYBOARD_H */</div><div class='head'>diff --git a/include/dt-bindings/interconnect/mediatek,mt8183.h b/include/dt-bindings/interconnect/mediatek,mt8183.h<br/>new file mode 100644<br/>index 000000000000..1088c350258d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/mediatek,mt8183.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/mediatek,mt8183.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2021 MediaTek Inc.</div><div class='add'>+ * Copyright (c) 2024 Collabora Ltd.</div><div class='add'>+ *                    AngeloGioacchino Del Regno &lt;angelogioacchino.delregno@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_MEDIATEK_MT8183_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_MEDIATEK_MT8183_H</div><div class='add'>+</div><div class='add'>+#define SLAVE_DDR_EMI		0</div><div class='add'>+#define MASTER_MCUSYS		1</div><div class='add'>+#define MASTER_MFG		2</div><div class='add'>+#define MASTER_MMSYS		3</div><div class='add'>+#define MASTER_MM_VPU		4</div><div class='add'>+#define MASTER_MM_DISP		5</div><div class='add'>+#define MASTER_MM_VDEC		6</div><div class='add'>+#define MASTER_MM_VENC		7</div><div class='add'>+#define MASTER_MM_CAM		8</div><div class='add'>+#define MASTER_MM_IMG		9</div><div class='add'>+#define MASTER_MM_MDP		10</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/mediatek,mt8195.h b/include/dt-bindings/interconnect/mediatek,mt8195.h<br/>new file mode 100644<br/>index 000000000000..33e0e6cde732<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/mediatek,mt8195.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/mediatek,mt8195.h</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 MediaTek Inc.</div><div class='add'>+ * Copyright (c) 2024 Collabora Ltd.</div><div class='add'>+ *                    AngeloGioacchino Del Regno &lt;angelogioacchino.delregno@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_MEDIATEK_MT8195_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_MEDIATEK_MT8195_H</div><div class='add'>+</div><div class='add'>+#define SLAVE_DDR_EMI		0</div><div class='add'>+#define MASTER_MCUSYS		1</div><div class='add'>+#define MASTER_GPUSYS		2</div><div class='add'>+#define MASTER_MMSYS		3</div><div class='add'>+#define MASTER_MM_VPU		4</div><div class='add'>+#define MASTER_MM_DISP		5</div><div class='add'>+#define MASTER_MM_VDEC		6</div><div class='add'>+#define MASTER_MM_VENC		7</div><div class='add'>+#define MASTER_MM_CAM		8</div><div class='add'>+#define MASTER_MM_IMG		9</div><div class='add'>+#define MASTER_MM_MDP		10</div><div class='add'>+#define MASTER_VPUSYS		11</div><div class='add'>+#define MASTER_VPU_0		12</div><div class='add'>+#define MASTER_VPU_1		13</div><div class='add'>+#define MASTER_MDLASYS		14</div><div class='add'>+#define MASTER_MDLA_0		15</div><div class='add'>+#define MASTER_UFS		16</div><div class='add'>+#define MASTER_PCIE_0		17</div><div class='add'>+#define MASTER_PCIE_1		18</div><div class='add'>+#define MASTER_USB		19</div><div class='add'>+#define MASTER_DBGIF		20</div><div class='add'>+#define SLAVE_HRT_DDR_EMI	21</div><div class='add'>+#define MASTER_HRT_MMSYS	22</div><div class='add'>+#define MASTER_HRT_MM_DISP	23</div><div class='add'>+#define MASTER_HRT_MM_VDEC	24</div><div class='add'>+#define MASTER_HRT_MM_VENC	25</div><div class='add'>+#define MASTER_HRT_MM_CAM	26</div><div class='add'>+#define MASTER_HRT_MM_IMG	27</div><div class='add'>+#define MASTER_HRT_MM_MDP	28</div><div class='add'>+#define MASTER_HRT_DBGIF	29</div><div class='add'>+#define MASTER_WIFI		30</div><div class='add'>+#define MASTER_BT		31</div><div class='add'>+#define MASTER_NETSYS		32</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,glymur-rpmh.h b/include/dt-bindings/interconnect/qcom,glymur-rpmh.h<br/>new file mode 100644<br/>index 000000000000..6a0e754345e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,glymur-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,glymur-rpmh.h</a></div><div class='hunk'>@@ -0,0 +1,205 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_GLYMUR_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_GLYMUR_H</div><div class='add'>+</div><div class='add'>+#define MASTER_CRYPTO				0</div><div class='add'>+#define MASTER_SOCCP_PROC			1</div><div class='add'>+#define MASTER_QDSS_ETR				2</div><div class='add'>+#define MASTER_QDSS_ETR_1			3</div><div class='add'>+#define SLAVE_A1NOC_SNOC			4</div><div class='add'>+</div><div class='add'>+#define MASTER_UFS_MEM				0</div><div class='add'>+#define MASTER_USB3_2				1</div><div class='add'>+#define MASTER_USB4_2				2</div><div class='add'>+#define SLAVE_A2NOC_SNOC			3</div><div class='add'>+</div><div class='add'>+#define MASTER_QSPI_0				0</div><div class='add'>+#define MASTER_QUP_0				1</div><div class='add'>+#define MASTER_QUP_1				2</div><div class='add'>+#define MASTER_QUP_2				3</div><div class='add'>+#define MASTER_SP				4</div><div class='add'>+#define MASTER_SDCC_2				5</div><div class='add'>+#define MASTER_SDCC_4				6</div><div class='add'>+#define MASTER_USB2				7</div><div class='add'>+#define MASTER_USB3_MP				8</div><div class='add'>+#define SLAVE_A3NOC_SNOC			9</div><div class='add'>+</div><div class='add'>+#define MASTER_USB3_0				0</div><div class='add'>+#define MASTER_USB3_1				1</div><div class='add'>+#define MASTER_USB4_0				2</div><div class='add'>+#define MASTER_USB4_1				3</div><div class='add'>+#define SLAVE_A4NOC_HSCNOC			4</div><div class='add'>+</div><div class='add'>+#define MASTER_QUP_CORE_0			0</div><div class='add'>+#define MASTER_QUP_CORE_1			1</div><div class='add'>+#define MASTER_QUP_CORE_2			2</div><div class='add'>+#define SLAVE_QUP_CORE_0			3</div><div class='add'>+#define SLAVE_QUP_CORE_1			4</div><div class='add'>+#define SLAVE_QUP_CORE_2			5</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_CFG				0</div><div class='add'>+#define SLAVE_AHB2PHY_SOUTH			1</div><div class='add'>+#define SLAVE_AHB2PHY_NORTH			2</div><div class='add'>+#define SLAVE_AHB2PHY_2				3</div><div class='add'>+#define SLAVE_AHB2PHY_3				4</div><div class='add'>+#define SLAVE_AV1_ENC_CFG			5</div><div class='add'>+#define SLAVE_CAMERA_CFG			6</div><div class='add'>+#define SLAVE_CLK_CTL				7</div><div class='add'>+#define SLAVE_CRYPTO_0_CFG			8</div><div class='add'>+#define SLAVE_DISPLAY_CFG			9</div><div class='add'>+#define SLAVE_GFX3D_CFG				10</div><div class='add'>+#define SLAVE_IMEM_CFG				11</div><div class='add'>+#define SLAVE_PCIE_0_CFG			12</div><div class='add'>+#define SLAVE_PCIE_1_CFG			13</div><div class='add'>+#define SLAVE_PCIE_2_CFG			14</div><div class='add'>+#define SLAVE_PCIE_3A_CFG			15</div><div class='add'>+#define SLAVE_PCIE_3B_CFG			16</div><div class='add'>+#define SLAVE_PCIE_4_CFG			17</div><div class='add'>+#define SLAVE_PCIE_5_CFG			18</div><div class='add'>+#define SLAVE_PCIE_6_CFG			19</div><div class='add'>+#define SLAVE_PCIE_RSCC				20</div><div class='add'>+#define SLAVE_PDM				21</div><div class='add'>+#define SLAVE_PRNG				22</div><div class='add'>+#define SLAVE_QDSS_CFG				23</div><div class='add'>+#define SLAVE_QSPI_0				24</div><div class='add'>+#define SLAVE_QUP_0				25</div><div class='add'>+#define SLAVE_QUP_1				26</div><div class='add'>+#define SLAVE_QUP_2				27</div><div class='add'>+#define SLAVE_SDCC_2				28</div><div class='add'>+#define SLAVE_SDCC_4				29</div><div class='add'>+#define SLAVE_SMMUV3_CFG			30</div><div class='add'>+#define SLAVE_TCSR				31</div><div class='add'>+#define SLAVE_TLMM				32</div><div class='add'>+#define SLAVE_UFS_MEM_CFG			33</div><div class='add'>+#define SLAVE_USB2				34</div><div class='add'>+#define SLAVE_USB3_0				35</div><div class='add'>+#define SLAVE_USB3_1				36</div><div class='add'>+#define SLAVE_USB3_2				37</div><div class='add'>+#define SLAVE_USB3_MP				38</div><div class='add'>+#define SLAVE_USB4_0				39</div><div class='add'>+#define SLAVE_USB4_1				40</div><div class='add'>+#define SLAVE_USB4_2				41</div><div class='add'>+#define SLAVE_VENUS_CFG				42</div><div class='add'>+#define SLAVE_CNOC_PCIE_SLAVE_EAST_CFG		43</div><div class='add'>+#define SLAVE_CNOC_PCIE_SLAVE_WEST_CFG		44</div><div class='add'>+#define SLAVE_LPASS_QTB_CFG			45</div><div class='add'>+#define SLAVE_CNOC_MNOC_CFG			46</div><div class='add'>+#define SLAVE_NSP_QTB_CFG			47</div><div class='add'>+#define SLAVE_PCIE_EAST_ANOC_CFG		48</div><div class='add'>+#define SLAVE_PCIE_WEST_ANOC_CFG		49</div><div class='add'>+#define SLAVE_QDSS_STM				50</div><div class='add'>+#define SLAVE_TCU				51</div><div class='add'>+</div><div class='add'>+#define MASTER_HSCNOC_CNOC			0</div><div class='add'>+#define SLAVE_AOSS				1</div><div class='add'>+#define SLAVE_IPC_ROUTER_CFG			2</div><div class='add'>+#define SLAVE_SOCCP				3</div><div class='add'>+#define SLAVE_TME_CFG				4</div><div class='add'>+#define SLAVE_APPSS				5</div><div class='add'>+#define SLAVE_CNOC_CFG				6</div><div class='add'>+#define SLAVE_BOOT_IMEM				7</div><div class='add'>+#define SLAVE_IMEM				8</div><div class='add'>+</div><div class='add'>+#define MASTER_GPU_TCU				0</div><div class='add'>+#define MASTER_PCIE_TCU				1</div><div class='add'>+#define MASTER_SYS_TCU				2</div><div class='add'>+#define MASTER_APPSS_PROC			3</div><div class='add'>+#define MASTER_AGGRE_NOC_EAST			4</div><div class='add'>+#define MASTER_GFX3D				5</div><div class='add'>+#define MASTER_LPASS_GEM_NOC			6</div><div class='add'>+#define MASTER_MNOC_HF_MEM_NOC			7</div><div class='add'>+#define MASTER_MNOC_SF_MEM_NOC			8</div><div class='add'>+#define MASTER_COMPUTE_NOC			9</div><div class='add'>+#define MASTER_PCIE_EAST			10</div><div class='add'>+#define MASTER_PCIE_WEST			11</div><div class='add'>+#define MASTER_SNOC_SF_MEM_NOC			12</div><div class='add'>+#define MASTER_WLAN_Q6				13</div><div class='add'>+#define MASTER_GIC				14</div><div class='add'>+#define SLAVE_HSCNOC_CNOC			15</div><div class='add'>+#define SLAVE_LLCC				16</div><div class='add'>+#define SLAVE_PCIE_EAST				17</div><div class='add'>+#define SLAVE_PCIE_WEST				18</div><div class='add'>+</div><div class='add'>+#define MASTER_LPIAON_NOC			0</div><div class='add'>+#define SLAVE_LPASS_GEM_NOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_LPASS_LPINOC			0</div><div class='add'>+#define SLAVE_LPIAON_NOC_LPASS_AG_NOC		1</div><div class='add'>+</div><div class='add'>+#define MASTER_LPASS_PROC			0</div><div class='add'>+#define SLAVE_LPICX_NOC_LPIAON_NOC		1</div><div class='add'>+</div><div class='add'>+#define MASTER_LLCC				0</div><div class='add'>+#define SLAVE_EBI1				1</div><div class='add'>+</div><div class='add'>+#define MASTER_AV1_ENC				0</div><div class='add'>+#define MASTER_CAMNOC_HF			1</div><div class='add'>+#define MASTER_CAMNOC_ICP			2</div><div class='add'>+#define MASTER_CAMNOC_SF			3</div><div class='add'>+#define MASTER_EVA				4</div><div class='add'>+#define MASTER_MDP				5</div><div class='add'>+#define MASTER_CDSP_HCP				6</div><div class='add'>+#define MASTER_VIDEO				7</div><div class='add'>+#define MASTER_VIDEO_CV_PROC			8</div><div class='add'>+#define MASTER_VIDEO_V_PROC			9</div><div class='add'>+#define MASTER_CNOC_MNOC_CFG			10</div><div class='add'>+#define SLAVE_MNOC_HF_MEM_NOC			11</div><div class='add'>+#define SLAVE_MNOC_SF_MEM_NOC			12</div><div class='add'>+#define SLAVE_SERVICE_MNOC			13</div><div class='add'>+</div><div class='add'>+#define MASTER_CPUCP				0</div><div class='add'>+#define SLAVE_NSINOC_SYSTEM_NOC			1</div><div class='add'>+#define SLAVE_SERVICE_NSINOC			2</div><div class='add'>+</div><div class='add'>+#define MASTER_CDSP_PROC			0</div><div class='add'>+#define SLAVE_NSP0_HSC_NOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_OOBMSS_SP_PROC			0</div><div class='add'>+#define SLAVE_OOBMSS_SNOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_PCIE_EAST_ANOC_CFG		0</div><div class='add'>+#define MASTER_PCIE_0				1</div><div class='add'>+#define MASTER_PCIE_1				2</div><div class='add'>+#define MASTER_PCIE_5				3</div><div class='add'>+#define SLAVE_PCIE_EAST_MEM_NOC			4</div><div class='add'>+#define SLAVE_SERVICE_PCIE_EAST_AGGRE_NOC	5</div><div class='add'>+</div><div class='add'>+#define MASTER_HSCNOC_PCIE_EAST			0</div><div class='add'>+#define MASTER_CNOC_PCIE_EAST_SLAVE_CFG		1</div><div class='add'>+#define SLAVE_HSCNOC_PCIE_EAST_MS_MPU_CFG	2</div><div class='add'>+#define SLAVE_SERVICE_PCIE_EAST			3</div><div class='add'>+#define SLAVE_PCIE_0				4</div><div class='add'>+#define SLAVE_PCIE_1				5</div><div class='add'>+#define SLAVE_PCIE_5				6</div><div class='add'>+</div><div class='add'>+#define MASTER_PCIE_WEST_ANOC_CFG		0</div><div class='add'>+#define MASTER_PCIE_2				1</div><div class='add'>+#define MASTER_PCIE_3A				2</div><div class='add'>+#define MASTER_PCIE_3B				3</div><div class='add'>+#define MASTER_PCIE_4				4</div><div class='add'>+#define MASTER_PCIE_6				5</div><div class='add'>+#define SLAVE_PCIE_WEST_MEM_NOC			6</div><div class='add'>+#define SLAVE_SERVICE_PCIE_WEST_AGGRE_NOC	7</div><div class='add'>+</div><div class='add'>+#define MASTER_HSCNOC_PCIE_WEST			0</div><div class='add'>+#define MASTER_CNOC_PCIE_WEST_SLAVE_CFG		1</div><div class='add'>+#define SLAVE_HSCNOC_PCIE_WEST_MS_MPU_CFG	2</div><div class='add'>+#define SLAVE_SERVICE_PCIE_WEST			3</div><div class='add'>+#define SLAVE_PCIE_2				4</div><div class='add'>+#define SLAVE_PCIE_3A				5</div><div class='add'>+#define SLAVE_PCIE_3B				6</div><div class='add'>+#define SLAVE_PCIE_4				7</div><div class='add'>+#define SLAVE_PCIE_6				8</div><div class='add'>+</div><div class='add'>+#define MASTER_A1NOC_SNOC			0</div><div class='add'>+#define MASTER_A2NOC_SNOC			1</div><div class='add'>+#define MASTER_A3NOC_SNOC			2</div><div class='add'>+#define MASTER_NSINOC_SNOC			3</div><div class='add'>+#define MASTER_OOBMSS				4</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_SF			5</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,ipq5332.h b/include/dt-bindings/interconnect/qcom,ipq5332.h<br/>new file mode 100644<br/>index 000000000000..16475bb07a48<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,ipq5332.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,ipq5332.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+#ifndef INTERCONNECT_QCOM_IPQ5332_H</div><div class='add'>+#define INTERCONNECT_QCOM_IPQ5332_H</div><div class='add'>+</div><div class='add'>+#define MASTER_SNOC_PCIE3_1_M		0</div><div class='add'>+#define SLAVE_SNOC_PCIE3_1_M		1</div><div class='add'>+#define MASTER_ANOC_PCIE3_1_S		2</div><div class='add'>+#define SLAVE_ANOC_PCIE3_1_S		3</div><div class='add'>+#define MASTER_SNOC_PCIE3_2_M		4</div><div class='add'>+#define SLAVE_SNOC_PCIE3_2_M		5</div><div class='add'>+#define MASTER_ANOC_PCIE3_2_S		6</div><div class='add'>+#define SLAVE_ANOC_PCIE3_2_S		7</div><div class='add'>+#define MASTER_SNOC_USB			8</div><div class='add'>+#define SLAVE_SNOC_USB			9</div><div class='add'>+#define MASTER_NSSNOC_NSSCC		10</div><div class='add'>+#define SLAVE_NSSNOC_NSSCC		11</div><div class='add'>+#define MASTER_NSSNOC_SNOC_0		12</div><div class='add'>+#define SLAVE_NSSNOC_SNOC_0		13</div><div class='add'>+#define MASTER_NSSNOC_SNOC_1		14</div><div class='add'>+#define SLAVE_NSSNOC_SNOC_1		15</div><div class='add'>+#define MASTER_NSSNOC_ATB		16</div><div class='add'>+#define SLAVE_NSSNOC_ATB		17</div><div class='add'>+#define MASTER_NSSNOC_PCNOC_1		18</div><div class='add'>+#define SLAVE_NSSNOC_PCNOC_1		19</div><div class='add'>+#define MASTER_NSSNOC_QOSGEN_REF	20</div><div class='add'>+#define SLAVE_NSSNOC_QOSGEN_REF		21</div><div class='add'>+#define MASTER_NSSNOC_TIMEOUT_REF	22</div><div class='add'>+#define SLAVE_NSSNOC_TIMEOUT_REF	23</div><div class='add'>+#define MASTER_NSSNOC_XO_DCD		24</div><div class='add'>+#define SLAVE_NSSNOC_XO_DCD		25</div><div class='add'>+</div><div class='add'>+#define MASTER_NSSNOC_PPE		0</div><div class='add'>+#define SLAVE_NSSNOC_PPE		1</div><div class='add'>+#define MASTER_NSSNOC_PPE_CFG		2</div><div class='add'>+#define SLAVE_NSSNOC_PPE_CFG		3</div><div class='add'>+#define MASTER_NSSNOC_NSS_CSR		4</div><div class='add'>+#define SLAVE_NSSNOC_NSS_CSR		5</div><div class='add'>+#define MASTER_NSSNOC_CE_APB		6</div><div class='add'>+#define SLAVE_NSSNOC_CE_APB		7</div><div class='add'>+#define MASTER_NSSNOC_CE_AXI		8</div><div class='add'>+#define SLAVE_NSSNOC_CE_AXI		9</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_AHB			0</div><div class='add'>+#define SLAVE_CNOC_AHB			1</div><div class='add'>+</div><div class='add'>+#endif /* INTERCONNECT_QCOM_IPQ5332_H */</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,ipq5424.h b/include/dt-bindings/interconnect/qcom,ipq5424.h<br/>new file mode 100644<br/>index 000000000000..07b786bee7d6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,ipq5424.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,ipq5424.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+#ifndef INTERCONNECT_QCOM_IPQ5424_H</div><div class='add'>+#define INTERCONNECT_QCOM_IPQ5424_H</div><div class='add'>+</div><div class='add'>+#define MASTER_ANOC_PCIE0		0</div><div class='add'>+#define SLAVE_ANOC_PCIE0		1</div><div class='add'>+#define MASTER_CNOC_PCIE0		2</div><div class='add'>+#define SLAVE_CNOC_PCIE0		3</div><div class='add'>+#define MASTER_ANOC_PCIE1		4</div><div class='add'>+#define SLAVE_ANOC_PCIE1		5</div><div class='add'>+#define MASTER_CNOC_PCIE1		6</div><div class='add'>+#define SLAVE_CNOC_PCIE1		7</div><div class='add'>+#define MASTER_ANOC_PCIE2		8</div><div class='add'>+#define SLAVE_ANOC_PCIE2		9</div><div class='add'>+#define MASTER_CNOC_PCIE2		10</div><div class='add'>+#define SLAVE_CNOC_PCIE2		11</div><div class='add'>+#define MASTER_ANOC_PCIE3		12</div><div class='add'>+#define SLAVE_ANOC_PCIE3		13</div><div class='add'>+#define MASTER_CNOC_PCIE3		14</div><div class='add'>+#define SLAVE_CNOC_PCIE3		15</div><div class='add'>+#define MASTER_CNOC_USB			16</div><div class='add'>+#define SLAVE_CNOC_USB			17</div><div class='add'>+#define MASTER_NSSNOC_NSSCC		18</div><div class='add'>+#define SLAVE_NSSNOC_NSSCC		19</div><div class='add'>+#define MASTER_NSSNOC_SNOC_0		20</div><div class='add'>+#define SLAVE_NSSNOC_SNOC_0		21</div><div class='add'>+#define MASTER_NSSNOC_SNOC_1		22</div><div class='add'>+#define SLAVE_NSSNOC_SNOC_1		23</div><div class='add'>+#define MASTER_NSSNOC_PCNOC_1		24</div><div class='add'>+#define SLAVE_NSSNOC_PCNOC_1		25</div><div class='add'>+#define MASTER_NSSNOC_QOSGEN_REF	26</div><div class='add'>+#define SLAVE_NSSNOC_QOSGEN_REF		27</div><div class='add'>+#define MASTER_NSSNOC_TIMEOUT_REF	28</div><div class='add'>+#define SLAVE_NSSNOC_TIMEOUT_REF	29</div><div class='add'>+#define MASTER_NSSNOC_XO_DCD		30</div><div class='add'>+#define SLAVE_NSSNOC_XO_DCD		31</div><div class='add'>+#define MASTER_NSSNOC_ATB		32</div><div class='add'>+#define SLAVE_NSSNOC_ATB		33</div><div class='add'>+#define MASTER_CNOC_LPASS_CFG		34</div><div class='add'>+#define SLAVE_CNOC_LPASS_CFG		35</div><div class='add'>+#define MASTER_SNOC_LPASS		36</div><div class='add'>+#define SLAVE_SNOC_LPASS		37</div><div class='add'>+</div><div class='add'>+#define MASTER_CPU			0</div><div class='add'>+#define SLAVE_L3			1</div><div class='add'>+</div><div class='add'>+#define MASTER_NSSNOC_PPE		0</div><div class='add'>+#define SLAVE_NSSNOC_PPE		1</div><div class='add'>+#define MASTER_NSSNOC_PPE_CFG		2</div><div class='add'>+#define SLAVE_NSSNOC_PPE_CFG		3</div><div class='add'>+#define MASTER_NSSNOC_NSS_CSR		4</div><div class='add'>+#define SLAVE_NSSNOC_NSS_CSR		5</div><div class='add'>+#define MASTER_NSSNOC_CE_AXI		6</div><div class='add'>+#define SLAVE_NSSNOC_CE_AXI		7</div><div class='add'>+#define MASTER_NSSNOC_CE_APB		8</div><div class='add'>+#define SLAVE_NSSNOC_CE_APB		9</div><div class='add'>+#define MASTER_NSSNOC_EIP		10</div><div class='add'>+#define SLAVE_NSSNOC_EIP		11</div><div class='add'>+</div><div class='add'>+#endif /* INTERCONNECT_QCOM_IPQ5424_H */</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,ipq9574.h b/include/dt-bindings/interconnect/qcom,ipq9574.h<br/>new file mode 100644<br/>index 000000000000..42019335c7dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,ipq9574.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,ipq9574.h</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+#ifndef INTERCONNECT_QCOM_IPQ9574_H</div><div class='add'>+#define INTERCONNECT_QCOM_IPQ9574_H</div><div class='add'>+</div><div class='add'>+#define MASTER_ANOC_PCIE0		0</div><div class='add'>+#define SLAVE_ANOC_PCIE0		1</div><div class='add'>+#define MASTER_SNOC_PCIE0		2</div><div class='add'>+#define SLAVE_SNOC_PCIE0		3</div><div class='add'>+#define MASTER_ANOC_PCIE1		4</div><div class='add'>+#define SLAVE_ANOC_PCIE1		5</div><div class='add'>+#define MASTER_SNOC_PCIE1		6</div><div class='add'>+#define SLAVE_SNOC_PCIE1		7</div><div class='add'>+#define MASTER_ANOC_PCIE2		8</div><div class='add'>+#define SLAVE_ANOC_PCIE2		9</div><div class='add'>+#define MASTER_SNOC_PCIE2		10</div><div class='add'>+#define SLAVE_SNOC_PCIE2		11</div><div class='add'>+#define MASTER_ANOC_PCIE3		12</div><div class='add'>+#define SLAVE_ANOC_PCIE3		13</div><div class='add'>+#define MASTER_SNOC_PCIE3		14</div><div class='add'>+#define SLAVE_SNOC_PCIE3		15</div><div class='add'>+#define MASTER_USB			16</div><div class='add'>+#define SLAVE_USB			17</div><div class='add'>+#define MASTER_USB_AXI			18</div><div class='add'>+#define SLAVE_USB_AXI			19</div><div class='add'>+#define MASTER_NSSNOC_NSSCC		20</div><div class='add'>+#define SLAVE_NSSNOC_NSSCC		21</div><div class='add'>+#define MASTER_NSSNOC_SNOC_0		22</div><div class='add'>+#define SLAVE_NSSNOC_SNOC_0		23</div><div class='add'>+#define MASTER_NSSNOC_SNOC_1		24</div><div class='add'>+#define SLAVE_NSSNOC_SNOC_1		25</div><div class='add'>+#define MASTER_NSSNOC_PCNOC_1		26</div><div class='add'>+#define SLAVE_NSSNOC_PCNOC_1		27</div><div class='add'>+#define MASTER_NSSNOC_QOSGEN_REF	28</div><div class='add'>+#define SLAVE_NSSNOC_QOSGEN_REF		29</div><div class='add'>+#define MASTER_NSSNOC_TIMEOUT_REF	30</div><div class='add'>+#define SLAVE_NSSNOC_TIMEOUT_REF	31</div><div class='add'>+#define MASTER_NSSNOC_XO_DCD		32</div><div class='add'>+#define SLAVE_NSSNOC_XO_DCD		33</div><div class='add'>+#define MASTER_NSSNOC_ATB		34</div><div class='add'>+#define SLAVE_NSSNOC_ATB		35</div><div class='add'>+#define MASTER_MEM_NOC_NSSNOC		36</div><div class='add'>+#define SLAVE_MEM_NOC_NSSNOC		37</div><div class='add'>+#define MASTER_NSSNOC_MEMNOC		38</div><div class='add'>+#define SLAVE_NSSNOC_MEMNOC		39</div><div class='add'>+#define MASTER_NSSNOC_MEM_NOC_1		40</div><div class='add'>+#define SLAVE_NSSNOC_MEM_NOC_1		41</div><div class='add'>+</div><div class='add'>+#define MASTER_NSSNOC_PPE		0</div><div class='add'>+#define SLAVE_NSSNOC_PPE		1</div><div class='add'>+#define MASTER_NSSNOC_PPE_CFG		2</div><div class='add'>+#define SLAVE_NSSNOC_PPE_CFG		3</div><div class='add'>+#define MASTER_NSSNOC_NSS_CSR		4</div><div class='add'>+#define SLAVE_NSSNOC_NSS_CSR		5</div><div class='add'>+#define MASTER_NSSNOC_IMEM_QSB		6</div><div class='add'>+#define SLAVE_NSSNOC_IMEM_QSB		7</div><div class='add'>+#define MASTER_NSSNOC_IMEM_AHB		8</div><div class='add'>+#define SLAVE_NSSNOC_IMEM_AHB		9</div><div class='add'>+</div><div class='add'>+#endif /* INTERCONNECT_QCOM_IPQ9574_H */</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h b/include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h<br/>new file mode 100644<br/>index 000000000000..dde3f9abd677<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,kaanapali-rpmh.h</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_KAANAPALI_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_KAANAPALI_H</div><div class='add'>+</div><div class='add'>+#define MASTER_QSPI_0				0</div><div class='add'>+#define MASTER_CRYPTO				1</div><div class='add'>+#define MASTER_QUP_1				2</div><div class='add'>+#define MASTER_SDCC_4				3</div><div class='add'>+#define MASTER_UFS_MEM				4</div><div class='add'>+#define MASTER_USB3				5</div><div class='add'>+#define MASTER_QUP_2				6</div><div class='add'>+#define MASTER_QUP_3				7</div><div class='add'>+#define MASTER_QUP_4				8</div><div class='add'>+#define MASTER_IPA				9</div><div class='add'>+#define MASTER_SOCCP_PROC			10</div><div class='add'>+#define MASTER_SP				11</div><div class='add'>+#define MASTER_QDSS_ETR				12</div><div class='add'>+#define MASTER_QDSS_ETR_1			13</div><div class='add'>+#define MASTER_SDCC_2				14</div><div class='add'>+#define SLAVE_A1NOC_SNOC			15</div><div class='add'>+#define SLAVE_A2NOC_SNOC			16</div><div class='add'>+</div><div class='add'>+#define MASTER_QUP_CORE_0			0</div><div class='add'>+#define MASTER_QUP_CORE_1			1</div><div class='add'>+#define MASTER_QUP_CORE_2			2</div><div class='add'>+#define MASTER_QUP_CORE_3			3</div><div class='add'>+#define MASTER_QUP_CORE_4			4</div><div class='add'>+#define SLAVE_QUP_CORE_0			5</div><div class='add'>+#define SLAVE_QUP_CORE_1			6</div><div class='add'>+#define SLAVE_QUP_CORE_2			7</div><div class='add'>+#define SLAVE_QUP_CORE_3			8</div><div class='add'>+#define SLAVE_QUP_CORE_4			9</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_CFG				0</div><div class='add'>+#define SLAVE_AHB2PHY_SOUTH			1</div><div class='add'>+#define SLAVE_AHB2PHY_NORTH			2</div><div class='add'>+#define SLAVE_CAMERA_CFG			3</div><div class='add'>+#define SLAVE_CLK_CTL				4</div><div class='add'>+#define SLAVE_CRYPTO_0_CFG			5</div><div class='add'>+#define SLAVE_DISPLAY_CFG			6</div><div class='add'>+#define SLAVE_EVA_CFG				7</div><div class='add'>+#define SLAVE_GFX3D_CFG				8</div><div class='add'>+#define SLAVE_I2C				9</div><div class='add'>+#define SLAVE_I3C_IBI0_CFG			10</div><div class='add'>+#define SLAVE_I3C_IBI1_CFG			11</div><div class='add'>+#define SLAVE_IMEM_CFG				12</div><div class='add'>+#define SLAVE_IPC_ROUTER_CFG			13</div><div class='add'>+#define SLAVE_CNOC_MSS				14</div><div class='add'>+#define SLAVE_PCIE_CFG				15</div><div class='add'>+#define SLAVE_PRNG				16</div><div class='add'>+#define SLAVE_QDSS_CFG				17</div><div class='add'>+#define SLAVE_QSPI_0				18</div><div class='add'>+#define SLAVE_QUP_1				19</div><div class='add'>+#define SLAVE_QUP_2				20</div><div class='add'>+#define SLAVE_QUP_3				21</div><div class='add'>+#define SLAVE_QUP_4				22</div><div class='add'>+#define SLAVE_SDCC_2				23</div><div class='add'>+#define SLAVE_SDCC_4				24</div><div class='add'>+#define SLAVE_SPSS_CFG				25</div><div class='add'>+#define SLAVE_TCSR				26</div><div class='add'>+#define SLAVE_TLMM				27</div><div class='add'>+#define SLAVE_UFS_MEM_CFG			28</div><div class='add'>+#define SLAVE_USB3				29</div><div class='add'>+#define SLAVE_VENUS_CFG				30</div><div class='add'>+#define SLAVE_VSENSE_CTRL_CFG			31</div><div class='add'>+#define SLAVE_CNOC_MNOC_CFG			32</div><div class='add'>+#define SLAVE_PCIE_ANOC_CFG			33</div><div class='add'>+#define SLAVE_QDSS_STM				34</div><div class='add'>+#define SLAVE_TCU				35</div><div class='add'>+</div><div class='add'>+#define MASTER_GEM_NOC_CNOC			0</div><div class='add'>+#define MASTER_GEM_NOC_PCIE_SNOC		1</div><div class='add'>+#define SLAVE_AOSS				2</div><div class='add'>+#define SLAVE_IPA_CFG				3</div><div class='add'>+#define SLAVE_IPC_ROUTER_FENCE			4</div><div class='add'>+#define SLAVE_SOCCP				5</div><div class='add'>+#define SLAVE_TME_CFG				6</div><div class='add'>+#define SLAVE_APPSS				7</div><div class='add'>+#define SLAVE_CNOC_CFG				8</div><div class='add'>+#define SLAVE_DDRSS_CFG				9</div><div class='add'>+#define SLAVE_BOOT_IMEM				10</div><div class='add'>+#define SLAVE_IMEM				11</div><div class='add'>+#define SLAVE_PCIE_0				12</div><div class='add'>+</div><div class='add'>+#define MASTER_GPU_TCU				0</div><div class='add'>+#define MASTER_SYS_TCU				1</div><div class='add'>+#define MASTER_APPSS_PROC			2</div><div class='add'>+#define MASTER_GFX3D				3</div><div class='add'>+#define MASTER_LPASS_GEM_NOC			4</div><div class='add'>+#define MASTER_MSS_PROC				5</div><div class='add'>+#define MASTER_MNOC_HF_MEM_NOC			6</div><div class='add'>+#define MASTER_MNOC_SF_MEM_NOC			7</div><div class='add'>+#define MASTER_COMPUTE_NOC			8</div><div class='add'>+#define MASTER_ANOC_PCIE_GEM_NOC		9</div><div class='add'>+#define MASTER_QPACE				10</div><div class='add'>+#define MASTER_SNOC_SF_MEM_NOC			11</div><div class='add'>+#define MASTER_WLAN_Q6				12</div><div class='add'>+#define MASTER_GIC				13</div><div class='add'>+#define SLAVE_GEM_NOC_CNOC			14</div><div class='add'>+#define SLAVE_LLCC				15</div><div class='add'>+#define SLAVE_MEM_NOC_PCIE_SNOC			16</div><div class='add'>+</div><div class='add'>+#define MASTER_LPIAON_NOC			0</div><div class='add'>+#define SLAVE_LPASS_GEM_NOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_LPASS_LPINOC			0</div><div class='add'>+#define SLAVE_LPIAON_NOC_LPASS_AG_NOC		1</div><div class='add'>+</div><div class='add'>+#define MASTER_LPASS_PROC			0</div><div class='add'>+#define SLAVE_LPICX_NOC_LPIAON_NOC		1</div><div class='add'>+</div><div class='add'>+#define MASTER_LLCC				0</div><div class='add'>+#define SLAVE_EBI1				1</div><div class='add'>+</div><div class='add'>+#define MASTER_CAMNOC_HF			0</div><div class='add'>+#define MASTER_CAMNOC_NRT_ICP_SF		1</div><div class='add'>+#define MASTER_CAMNOC_RT_CDM_SF			2</div><div class='add'>+#define MASTER_CAMNOC_SF			3</div><div class='add'>+#define MASTER_MDP				4</div><div class='add'>+#define MASTER_MDSS_DCP				5</div><div class='add'>+#define MASTER_CDSP_HCP				6</div><div class='add'>+#define MASTER_VIDEO_CV_PROC			7</div><div class='add'>+#define MASTER_VIDEO_EVA			8</div><div class='add'>+#define MASTER_VIDEO_MVP			9</div><div class='add'>+#define MASTER_VIDEO_V_PROC			10</div><div class='add'>+#define MASTER_CNOC_MNOC_CFG			11</div><div class='add'>+#define SLAVE_MNOC_HF_MEM_NOC			12</div><div class='add'>+#define SLAVE_MNOC_SF_MEM_NOC			13</div><div class='add'>+#define SLAVE_SERVICE_MNOC			14</div><div class='add'>+</div><div class='add'>+#define MASTER_CDSP_PROC			0</div><div class='add'>+#define SLAVE_CDSP_MEM_NOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_PCIE_ANOC_CFG			0</div><div class='add'>+#define MASTER_PCIE_0				1</div><div class='add'>+#define SLAVE_ANOC_PCIE_GEM_NOC			2</div><div class='add'>+#define SLAVE_SERVICE_PCIE_ANOC			3</div><div class='add'>+</div><div class='add'>+#define MASTER_A1NOC_SNOC			0</div><div class='add'>+#define MASTER_A2NOC_SNOC			1</div><div class='add'>+#define MASTER_APSS_NOC				2</div><div class='add'>+#define MASTER_CNOC_SNOC			3</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_SF			4</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,milos-rpmh.h b/include/dt-bindings/interconnect/qcom,milos-rpmh.h<br/>new file mode 100644<br/>index 000000000000..9326d7d9c2a3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,milos-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,milos-rpmh.h</a></div><div class='hunk'>@@ -0,0 +1,141 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2025, Luca Weiss &lt;luca.weiss@fairphone.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_MILOS_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_MILOS_H</div><div class='add'>+</div><div class='add'>+#define MASTER_QUP_1				0</div><div class='add'>+#define MASTER_UFS_MEM				1</div><div class='add'>+#define MASTER_USB3_0				2</div><div class='add'>+#define SLAVE_A1NOC_SNOC			3</div><div class='add'>+</div><div class='add'>+#define MASTER_QDSS_BAM				0</div><div class='add'>+#define MASTER_QSPI_0				1</div><div class='add'>+#define MASTER_QUP_0				2</div><div class='add'>+#define MASTER_CRYPTO				3</div><div class='add'>+#define MASTER_IPA				4</div><div class='add'>+#define MASTER_QDSS_ETR				5</div><div class='add'>+#define MASTER_QDSS_ETR_1			6</div><div class='add'>+#define MASTER_SDCC_1				7</div><div class='add'>+#define MASTER_SDCC_2				8</div><div class='add'>+#define SLAVE_A2NOC_SNOC			9</div><div class='add'>+</div><div class='add'>+#define MASTER_QUP_CORE_0			0</div><div class='add'>+#define MASTER_QUP_CORE_1			1</div><div class='add'>+#define SLAVE_QUP_CORE_0			2</div><div class='add'>+#define SLAVE_QUP_CORE_1			3</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_CFG				0</div><div class='add'>+#define SLAVE_AHB2PHY_SOUTH			1</div><div class='add'>+#define SLAVE_AHB2PHY_NORTH			2</div><div class='add'>+#define SLAVE_CAMERA_CFG			3</div><div class='add'>+#define SLAVE_CLK_CTL				4</div><div class='add'>+#define SLAVE_RBCPR_CX_CFG			5</div><div class='add'>+#define SLAVE_RBCPR_MXA_CFG			6</div><div class='add'>+#define SLAVE_CRYPTO_0_CFG			7</div><div class='add'>+#define SLAVE_CX_RDPM				8</div><div class='add'>+#define SLAVE_GFX3D_CFG				9</div><div class='add'>+#define SLAVE_IMEM_CFG				10</div><div class='add'>+#define SLAVE_CNOC_MSS				11</div><div class='add'>+#define SLAVE_MX_2_RDPM				12</div><div class='add'>+#define SLAVE_MX_RDPM				13</div><div class='add'>+#define SLAVE_PDM				14</div><div class='add'>+#define SLAVE_QDSS_CFG				15</div><div class='add'>+#define SLAVE_QSPI_0				16</div><div class='add'>+#define SLAVE_QUP_0				17</div><div class='add'>+#define SLAVE_QUP_1				18</div><div class='add'>+#define SLAVE_SDC1				19</div><div class='add'>+#define SLAVE_SDCC_2				20</div><div class='add'>+#define SLAVE_TCSR				21</div><div class='add'>+#define SLAVE_TLMM				22</div><div class='add'>+#define SLAVE_UFS_MEM_CFG			23</div><div class='add'>+#define SLAVE_USB3_0				24</div><div class='add'>+#define SLAVE_VENUS_CFG				25</div><div class='add'>+#define SLAVE_VSENSE_CTRL_CFG			26</div><div class='add'>+#define SLAVE_WLAN				27</div><div class='add'>+#define SLAVE_CNOC_MNOC_HF_CFG			28</div><div class='add'>+#define SLAVE_CNOC_MNOC_SF_CFG			29</div><div class='add'>+#define SLAVE_NSP_QTB_CFG			30</div><div class='add'>+#define SLAVE_PCIE_ANOC_CFG			31</div><div class='add'>+#define SLAVE_WLAN_Q6_THROTTLE_CFG		32</div><div class='add'>+#define SLAVE_SERVICE_CNOC_CFG			33</div><div class='add'>+#define SLAVE_QDSS_STM				34</div><div class='add'>+#define SLAVE_TCU				35</div><div class='add'>+</div><div class='add'>+#define MASTER_GEM_NOC_CNOC			0</div><div class='add'>+#define MASTER_GEM_NOC_PCIE_SNOC		1</div><div class='add'>+#define SLAVE_AOSS				2</div><div class='add'>+#define SLAVE_DISPLAY_CFG			3</div><div class='add'>+#define SLAVE_IPA_CFG				4</div><div class='add'>+#define SLAVE_IPC_ROUTER_CFG			5</div><div class='add'>+#define SLAVE_PCIE_0_CFG			6</div><div class='add'>+#define SLAVE_PCIE_1_CFG			7</div><div class='add'>+#define SLAVE_PRNG				8</div><div class='add'>+#define SLAVE_TME_CFG				9</div><div class='add'>+#define SLAVE_APPSS				10</div><div class='add'>+#define SLAVE_CNOC_CFG				11</div><div class='add'>+#define SLAVE_DDRSS_CFG				12</div><div class='add'>+#define SLAVE_IMEM				13</div><div class='add'>+#define SLAVE_PIMEM				14</div><div class='add'>+#define SLAVE_SERVICE_CNOC			15</div><div class='add'>+#define SLAVE_PCIE_0				16</div><div class='add'>+#define SLAVE_PCIE_1				17</div><div class='add'>+</div><div class='add'>+#define MASTER_GPU_TCU				0</div><div class='add'>+#define MASTER_SYS_TCU				1</div><div class='add'>+#define MASTER_APPSS_PROC			2</div><div class='add'>+#define MASTER_GFX3D				3</div><div class='add'>+#define MASTER_LPASS_GEM_NOC			4</div><div class='add'>+#define MASTER_MSS_PROC				5</div><div class='add'>+#define MASTER_MNOC_HF_MEM_NOC			6</div><div class='add'>+#define MASTER_MNOC_SF_MEM_NOC			7</div><div class='add'>+#define MASTER_COMPUTE_NOC			8</div><div class='add'>+#define MASTER_ANOC_PCIE_GEM_NOC		9</div><div class='add'>+#define MASTER_SNOC_GC_MEM_NOC			10</div><div class='add'>+#define MASTER_SNOC_SF_MEM_NOC			11</div><div class='add'>+#define MASTER_WLAN_Q6				12</div><div class='add'>+#define SLAVE_GEM_NOC_CNOC			13</div><div class='add'>+#define SLAVE_LLCC				14</div><div class='add'>+#define SLAVE_MEM_NOC_PCIE_SNOC			15</div><div class='add'>+</div><div class='add'>+#define MASTER_LPASS_PROC			0</div><div class='add'>+#define SLAVE_LPASS_GEM_NOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_LLCC				0</div><div class='add'>+#define SLAVE_EBI1				1</div><div class='add'>+</div><div class='add'>+#define MASTER_CAMNOC_HF			0</div><div class='add'>+#define MASTER_CAMNOC_ICP			1</div><div class='add'>+#define MASTER_CAMNOC_SF			2</div><div class='add'>+#define MASTER_MDP				3</div><div class='add'>+#define MASTER_VIDEO				4</div><div class='add'>+#define MASTER_CNOC_MNOC_HF_CFG			5</div><div class='add'>+#define MASTER_CNOC_MNOC_SF_CFG			6</div><div class='add'>+#define SLAVE_MNOC_HF_MEM_NOC			7</div><div class='add'>+#define SLAVE_MNOC_SF_MEM_NOC			8</div><div class='add'>+#define SLAVE_SERVICE_MNOC_HF			9</div><div class='add'>+#define SLAVE_SERVICE_MNOC_SF			10</div><div class='add'>+</div><div class='add'>+#define MASTER_CDSP_PROC			0</div><div class='add'>+#define SLAVE_CDSP_MEM_NOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_PCIE_ANOC_CFG			0</div><div class='add'>+#define MASTER_PCIE_0				1</div><div class='add'>+#define MASTER_PCIE_1				2</div><div class='add'>+#define SLAVE_ANOC_PCIE_GEM_NOC			3</div><div class='add'>+#define SLAVE_SERVICE_PCIE_ANOC			4</div><div class='add'>+</div><div class='add'>+#define MASTER_A1NOC_SNOC			0</div><div class='add'>+#define MASTER_A2NOC_SNOC			1</div><div class='add'>+#define MASTER_APSS_NOC				2</div><div class='add'>+#define MASTER_CNOC_SNOC			3</div><div class='add'>+#define MASTER_PIMEM				4</div><div class='add'>+#define MASTER_GIC				5</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_GC			6</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_SF			7</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,msm8909.h b/include/dt-bindings/interconnect/qcom,msm8909.h<br/>new file mode 100644<br/>index 000000000000..76365d8aec21<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,msm8909.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,msm8909.h</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Qualcomm MSM8909 interconnect IDs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_MSM8909_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_MSM8909_H</div><div class='add'>+</div><div class='add'>+/* BIMC fabric */</div><div class='add'>+#define MAS_APPS_PROC			0</div><div class='add'>+#define MAS_OXILI			1</div><div class='add'>+#define MAS_SNOC_BIMC_0			2</div><div class='add'>+#define MAS_SNOC_BIMC_1			3</div><div class='add'>+#define MAS_TCU_0			4</div><div class='add'>+#define MAS_TCU_1			5</div><div class='add'>+#define SLV_EBI				6</div><div class='add'>+#define SLV_BIMC_SNOC			7</div><div class='add'>+</div><div class='add'>+/* PCNOC fabric */</div><div class='add'>+#define MAS_AUDIO			0</div><div class='add'>+#define MAS_SPDM			1</div><div class='add'>+#define MAS_DEHR			2</div><div class='add'>+#define MAS_QPIC			3</div><div class='add'>+#define MAS_BLSP_1			4</div><div class='add'>+#define MAS_USB_HS			5</div><div class='add'>+#define MAS_CRYPTO			6</div><div class='add'>+#define MAS_SDCC_1			7</div><div class='add'>+#define MAS_SDCC_2			8</div><div class='add'>+#define MAS_SNOC_PCNOC			9</div><div class='add'>+#define PCNOC_M_0			10</div><div class='add'>+#define PCNOC_M_1			11</div><div class='add'>+#define PCNOC_INT_0			12</div><div class='add'>+#define PCNOC_INT_1			13</div><div class='add'>+#define PCNOC_S_0			14</div><div class='add'>+#define PCNOC_S_1			15</div><div class='add'>+#define PCNOC_S_2			16</div><div class='add'>+#define PCNOC_S_3			17</div><div class='add'>+#define PCNOC_S_4			18</div><div class='add'>+#define PCNOC_S_5			19</div><div class='add'>+#define PCNOC_S_7			20</div><div class='add'>+#define SLV_TCSR			21</div><div class='add'>+#define SLV_SDCC_1			22</div><div class='add'>+#define SLV_BLSP_1			23</div><div class='add'>+#define SLV_CRYPTO_0_CFG		24</div><div class='add'>+#define SLV_MESSAGE_RAM			25</div><div class='add'>+#define SLV_PDM				26</div><div class='add'>+#define SLV_PRNG			27</div><div class='add'>+#define SLV_USB_HS			28</div><div class='add'>+#define SLV_QPIC			29</div><div class='add'>+#define SLV_SPDM			30</div><div class='add'>+#define SLV_SDCC_2			31</div><div class='add'>+#define SLV_AUDIO			32</div><div class='add'>+#define SLV_DEHR_CFG			33</div><div class='add'>+#define SLV_SNOC_CFG			34</div><div class='add'>+#define SLV_QDSS_CFG			35</div><div class='add'>+#define SLV_USB_PHY			36</div><div class='add'>+#define SLV_CAMERA_SS_CFG		37</div><div class='add'>+#define SLV_DISP_SS_CFG			38</div><div class='add'>+#define SLV_VENUS_CFG			39</div><div class='add'>+#define SLV_TLMM			40</div><div class='add'>+#define SLV_GPU_CFG			41</div><div class='add'>+#define SLV_IMEM_CFG			42</div><div class='add'>+#define SLV_BIMC_CFG			43</div><div class='add'>+#define SLV_PMIC_ARB			44</div><div class='add'>+#define SLV_TCU				45</div><div class='add'>+#define SLV_PCNOC_SNOC			46</div><div class='add'>+</div><div class='add'>+/* SNOC fabric */</div><div class='add'>+#define MAS_QDSS_BAM			0</div><div class='add'>+#define MAS_BIMC_SNOC			1</div><div class='add'>+#define MAS_MDP				2</div><div class='add'>+#define MAS_PCNOC_SNOC			3</div><div class='add'>+#define MAS_VENUS			4</div><div class='add'>+#define MAS_VFE				5</div><div class='add'>+#define MAS_QDSS_ETR			6</div><div class='add'>+#define MM_INT_0			7</div><div class='add'>+#define MM_INT_1			8</div><div class='add'>+#define MM_INT_2			9</div><div class='add'>+#define MM_INT_BIMC			10</div><div class='add'>+#define QDSS_INT			11</div><div class='add'>+#define SNOC_INT_0			12</div><div class='add'>+#define SNOC_INT_1			13</div><div class='add'>+#define SNOC_INT_BIMC			14</div><div class='add'>+#define SLV_KPSS_AHB			15</div><div class='add'>+#define SLV_SNOC_BIMC_0			16</div><div class='add'>+#define SLV_SNOC_BIMC_1			17</div><div class='add'>+#define SLV_IMEM			18</div><div class='add'>+#define SLV_SNOC_PCNOC			19</div><div class='add'>+#define SLV_QDSS_STM			20</div><div class='add'>+#define SLV_CATS_0			21</div><div class='add'>+#define SLV_CATS_1			22</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_INTERCONNECT_QCOM_MSM8909_H */</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,msm8937.h b/include/dt-bindings/interconnect/qcom,msm8937.h<br/>new file mode 100644<br/>index 000000000000..98b8a4637aab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,msm8937.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,msm8937.h</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Qualcomm MSM8937 interconnect IDs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_MSM8937_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_MSM8937_H</div><div class='add'>+</div><div class='add'>+/* BIMC fabric */</div><div class='add'>+#define MAS_APPS_PROC		0</div><div class='add'>+#define MAS_OXILI		1</div><div class='add'>+#define MAS_SNOC_BIMC_0		2</div><div class='add'>+#define MAS_SNOC_BIMC_2		3</div><div class='add'>+#define MAS_SNOC_BIMC_1		4</div><div class='add'>+#define MAS_TCU_0		5</div><div class='add'>+#define SLV_EBI			6</div><div class='add'>+#define SLV_BIMC_SNOC		7</div><div class='add'>+</div><div class='add'>+/* PCNOC fabric */</div><div class='add'>+#define MAS_SPDM		0</div><div class='add'>+#define MAS_BLSP_1		1</div><div class='add'>+#define MAS_BLSP_2		2</div><div class='add'>+#define MAS_USB_HS1		3</div><div class='add'>+#define MAS_XI_USB_HS1		4</div><div class='add'>+#define MAS_CRYPTO		5</div><div class='add'>+#define MAS_SDCC_1		6</div><div class='add'>+#define MAS_SDCC_2		7</div><div class='add'>+#define MAS_SNOC_PCNOC		8</div><div class='add'>+#define PCNOC_M_0		9</div><div class='add'>+#define PCNOC_M_1		10</div><div class='add'>+#define PCNOC_INT_0		11</div><div class='add'>+#define PCNOC_INT_1		12</div><div class='add'>+#define PCNOC_INT_2		13</div><div class='add'>+#define PCNOC_INT_3		14</div><div class='add'>+#define PCNOC_S_0		15</div><div class='add'>+#define PCNOC_S_1		16</div><div class='add'>+#define PCNOC_S_2		17</div><div class='add'>+#define PCNOC_S_3		18</div><div class='add'>+#define PCNOC_S_4		19</div><div class='add'>+#define PCNOC_S_6		20</div><div class='add'>+#define PCNOC_S_7		21</div><div class='add'>+#define PCNOC_S_8		22</div><div class='add'>+#define SLV_SDCC_2		23</div><div class='add'>+#define SLV_SPDM		24</div><div class='add'>+#define SLV_PDM			25</div><div class='add'>+#define SLV_PRNG		26</div><div class='add'>+#define SLV_TCSR		27</div><div class='add'>+#define SLV_SNOC_CFG		28</div><div class='add'>+#define SLV_MESSAGE_RAM		29</div><div class='add'>+#define SLV_CAMERA_SS_CFG	30</div><div class='add'>+#define SLV_DISP_SS_CFG		31</div><div class='add'>+#define SLV_VENUS_CFG		32</div><div class='add'>+#define SLV_GPU_CFG		33</div><div class='add'>+#define SLV_TLMM		34</div><div class='add'>+#define SLV_BLSP_1		35</div><div class='add'>+#define SLV_BLSP_2		36</div><div class='add'>+#define SLV_PMIC_ARB		37</div><div class='add'>+#define SLV_SDCC_1		38</div><div class='add'>+#define SLV_CRYPTO_0_CFG	39</div><div class='add'>+#define SLV_USB_HS		40</div><div class='add'>+#define SLV_TCU			41</div><div class='add'>+#define SLV_PCNOC_SNOC		42</div><div class='add'>+</div><div class='add'>+/* SNOC fabric */</div><div class='add'>+#define MAS_QDSS_BAM		0</div><div class='add'>+#define MAS_BIMC_SNOC		1</div><div class='add'>+#define MAS_PCNOC_SNOC		2</div><div class='add'>+#define MAS_QDSS_ETR		3</div><div class='add'>+#define QDSS_INT		4</div><div class='add'>+#define SNOC_INT_0		5</div><div class='add'>+#define SNOC_INT_1		6</div><div class='add'>+#define SNOC_INT_2		7</div><div class='add'>+#define SLV_KPSS_AHB		8</div><div class='add'>+#define SLV_WCSS		9</div><div class='add'>+#define SLV_SNOC_BIMC_1		10</div><div class='add'>+#define SLV_IMEM		11</div><div class='add'>+#define SLV_SNOC_PCNOC		12</div><div class='add'>+#define SLV_QDSS_STM		13</div><div class='add'>+#define SLV_CATS_1		14</div><div class='add'>+#define SLV_LPASS		15</div><div class='add'>+</div><div class='add'>+/* SNOC-MM fabric */</div><div class='add'>+#define MAS_JPEG		0</div><div class='add'>+#define MAS_MDP			1</div><div class='add'>+#define MAS_VENUS		2</div><div class='add'>+#define MAS_VFE0		3</div><div class='add'>+#define MAS_VFE1		4</div><div class='add'>+#define MAS_CPP			5</div><div class='add'>+#define SLV_SNOC_BIMC_0		6</div><div class='add'>+#define SLV_SNOC_BIMC_2		7</div><div class='add'>+#define SLV_CATS_0		8</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_INTERCONNECT_QCOM_MSM8937_H */</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,msm8953.h b/include/dt-bindings/interconnect/qcom,msm8953.h<br/>new file mode 100644<br/>index 000000000000..12564c434af7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,msm8953.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,msm8953.h</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Qualcomm MSM8953 interconnect IDs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_MSM8953_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_MSM8953_H</div><div class='add'>+</div><div class='add'>+/* BIMC fabric */</div><div class='add'>+#define MAS_APPS_PROC		0</div><div class='add'>+#define MAS_OXILI		1</div><div class='add'>+#define MAS_SNOC_BIMC_0		2</div><div class='add'>+#define MAS_SNOC_BIMC_2		3</div><div class='add'>+#define MAS_SNOC_BIMC_1		4</div><div class='add'>+#define MAS_TCU_0		5</div><div class='add'>+#define SLV_EBI			6</div><div class='add'>+#define SLV_BIMC_SNOC		7</div><div class='add'>+</div><div class='add'>+/* PCNOC fabric */</div><div class='add'>+#define MAS_SPDM		0</div><div class='add'>+#define MAS_BLSP_1		1</div><div class='add'>+#define MAS_BLSP_2		2</div><div class='add'>+#define MAS_USB3		3</div><div class='add'>+#define MAS_CRYPTO		4</div><div class='add'>+#define MAS_SDCC_1		5</div><div class='add'>+#define MAS_SDCC_2		6</div><div class='add'>+#define MAS_SNOC_PCNOC		7</div><div class='add'>+#define PCNOC_M_0		8</div><div class='add'>+#define PCNOC_M_1		9</div><div class='add'>+#define PCNOC_INT_1		10</div><div class='add'>+#define PCNOC_INT_2		11</div><div class='add'>+#define PCNOC_S_0		12</div><div class='add'>+#define PCNOC_S_1		13</div><div class='add'>+#define PCNOC_S_2		14</div><div class='add'>+#define PCNOC_S_3		15</div><div class='add'>+#define PCNOC_S_4		16</div><div class='add'>+#define PCNOC_S_6		17</div><div class='add'>+#define PCNOC_S_7		18</div><div class='add'>+#define PCNOC_S_8		19</div><div class='add'>+#define PCNOC_S_9		20</div><div class='add'>+#define SLV_SPDM		21</div><div class='add'>+#define SLV_PDM			22</div><div class='add'>+#define SLV_TCSR		23</div><div class='add'>+#define SLV_SNOC_CFG		24</div><div class='add'>+#define SLV_TLMM		25</div><div class='add'>+#define SLV_MESSAGE_RAM		26</div><div class='add'>+#define SLV_BLSP_1		27</div><div class='add'>+#define SLV_BLSP_2		28</div><div class='add'>+#define SLV_PRNG		29</div><div class='add'>+#define SLV_CAMERA_SS_CFG	30</div><div class='add'>+#define SLV_DISP_SS_CFG		31</div><div class='add'>+#define SLV_VENUS_CFG		32</div><div class='add'>+#define SLV_GPU_CFG		33</div><div class='add'>+#define SLV_SDCC_1		34</div><div class='add'>+#define SLV_SDCC_2		35</div><div class='add'>+#define SLV_CRYPTO_0_CFG	36</div><div class='add'>+#define SLV_PMIC_ARB		37</div><div class='add'>+#define SLV_USB3		38</div><div class='add'>+#define SLV_IPA_CFG		39</div><div class='add'>+#define SLV_TCU			40</div><div class='add'>+#define SLV_PCNOC_SNOC		41</div><div class='add'>+</div><div class='add'>+/* SNOC fabric */</div><div class='add'>+#define MAS_QDSS_BAM		0</div><div class='add'>+#define MAS_BIMC_SNOC		1</div><div class='add'>+#define MAS_PCNOC_SNOC		2</div><div class='add'>+#define MAS_IPA			3</div><div class='add'>+#define MAS_QDSS_ETR		4</div><div class='add'>+#define QDSS_INT		5</div><div class='add'>+#define SNOC_INT_0		6</div><div class='add'>+#define SNOC_INT_1		7</div><div class='add'>+#define SNOC_INT_2		8</div><div class='add'>+#define SLV_KPSS_AHB		9</div><div class='add'>+#define SLV_WCSS		10</div><div class='add'>+#define SLV_SNOC_BIMC_1		11</div><div class='add'>+#define SLV_IMEM		12</div><div class='add'>+#define SLV_SNOC_PCNOC		13</div><div class='add'>+#define SLV_QDSS_STM		14</div><div class='add'>+#define SLV_CATS_1		15</div><div class='add'>+#define SLV_LPASS		16</div><div class='add'>+</div><div class='add'>+/* SNOC-MM fabric */</div><div class='add'>+#define MAS_JPEG		0</div><div class='add'>+#define MAS_MDP			1</div><div class='add'>+#define MAS_VENUS		2</div><div class='add'>+#define MAS_VFE0		3</div><div class='add'>+#define MAS_VFE1		4</div><div class='add'>+#define MAS_CPP			5</div><div class='add'>+#define SLV_SNOC_BIMC_0		6</div><div class='add'>+#define SLV_SNOC_BIMC_2		7</div><div class='add'>+#define SLV_CATS_0		8</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_INTERCONNECT_QCOM_MSM8953_H */</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,msm8976.h b/include/dt-bindings/interconnect/qcom,msm8976.h<br/>new file mode 100644<br/>index 000000000000..4ea90f22320e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,msm8976.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,msm8976.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Qualcomm MSM8976 interconnect IDs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_MSM8976_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_MSM8976_H</div><div class='add'>+</div><div class='add'>+/* BIMC fabric */</div><div class='add'>+#define MAS_APPS_PROC		0</div><div class='add'>+#define MAS_SMMNOC_BIMC	        1</div><div class='add'>+#define MAS_SNOC_BIMC		2</div><div class='add'>+#define MAS_TCU_0		3</div><div class='add'>+#define SLV_EBI		        4</div><div class='add'>+#define SLV_BIMC_SNOC		5</div><div class='add'>+</div><div class='add'>+/* PCNOC fabric */</div><div class='add'>+#define MAS_USB_HS2		0</div><div class='add'>+#define MAS_BLSP_1		1</div><div class='add'>+#define MAS_USB_HS1		2</div><div class='add'>+#define MAS_BLSP_2		3</div><div class='add'>+#define MAS_CRYPTO		4</div><div class='add'>+#define MAS_SDCC_1		5</div><div class='add'>+#define MAS_SDCC_2		6</div><div class='add'>+#define MAS_SDCC_3		7</div><div class='add'>+#define MAS_SNOC_PCNOC		8</div><div class='add'>+#define MAS_LPASS_AHB		9</div><div class='add'>+#define MAS_SPDM		10</div><div class='add'>+#define MAS_DEHR		11</div><div class='add'>+#define MAS_XM_USB_HS1		12</div><div class='add'>+#define PCNOC_M_0		13</div><div class='add'>+#define PCNOC_M_1		14</div><div class='add'>+#define PCNOC_INT_0		15</div><div class='add'>+#define PCNOC_INT_1		16</div><div class='add'>+#define PCNOC_INT_2		17</div><div class='add'>+#define PCNOC_S_1		18</div><div class='add'>+#define PCNOC_S_2		19</div><div class='add'>+#define PCNOC_S_3		20</div><div class='add'>+#define PCNOC_S_4		21</div><div class='add'>+#define PCNOC_S_8		22</div><div class='add'>+#define PCNOC_S_9		23</div><div class='add'>+#define SLV_TCSR		24</div><div class='add'>+#define SLV_TLMM		25</div><div class='add'>+#define SLV_CRYPTO_0_CFG	26</div><div class='add'>+#define SLV_MESSAGE_RAM	        27</div><div class='add'>+#define SLV_PDM		        28</div><div class='add'>+#define SLV_PRNG		29</div><div class='add'>+#define SLV_PMIC_ARB		30</div><div class='add'>+#define SLV_SNOC_CFG		31</div><div class='add'>+#define SLV_DCC_CFG		32</div><div class='add'>+#define SLV_CAMERA_SS_CFG	33</div><div class='add'>+#define SLV_DISP_SS_CFG	        34</div><div class='add'>+#define SLV_VENUS_CFG		35</div><div class='add'>+#define SLV_SDCC_1		36</div><div class='add'>+#define SLV_BLSP_1		37</div><div class='add'>+#define SLV_USB_HS		38</div><div class='add'>+#define SLV_SDCC_3		39</div><div class='add'>+#define SLV_SDCC_2		40</div><div class='add'>+#define SLV_GPU_CFG		41</div><div class='add'>+#define SLV_USB_HS2		42</div><div class='add'>+#define SLV_BLSP_2		43</div><div class='add'>+#define SLV_PCNOC_SNOC		44</div><div class='add'>+</div><div class='add'>+/* SNOC fabric */</div><div class='add'>+#define MAS_QDSS_BAM		0</div><div class='add'>+#define MAS_BIMC_SNOC		1</div><div class='add'>+#define MAS_PCNOC_SNOC		2</div><div class='add'>+#define MAS_QDSS_ETR		3</div><div class='add'>+#define MAS_LPASS_PROC		4</div><div class='add'>+#define MAS_IPA		        5</div><div class='add'>+#define QDSS_INT		6</div><div class='add'>+#define SNOC_INT_0		7</div><div class='add'>+#define SNOC_INT_1		8</div><div class='add'>+#define SNOC_INT_2		9</div><div class='add'>+#define SLV_KPSS_AHB		10</div><div class='add'>+#define SLV_SNOC_BIMC		11</div><div class='add'>+#define SLV_IMEM		12</div><div class='add'>+#define SLV_SNOC_PCNOC		13</div><div class='add'>+#define SLV_QDSS_STM		14</div><div class='add'>+#define SLV_CATS_0		15</div><div class='add'>+#define SLV_CATS_1		16</div><div class='add'>+#define SLV_LPASS		17</div><div class='add'>+</div><div class='add'>+/* SNOC-MM fabric */</div><div class='add'>+#define MAS_JPEG		0</div><div class='add'>+#define MAS_OXILI		1</div><div class='add'>+#define MAS_MDP0		2</div><div class='add'>+#define MAS_MDP1		3</div><div class='add'>+#define MAS_VENUS_0		4</div><div class='add'>+#define MAS_VENUS_1		5</div><div class='add'>+#define MAS_VFE_0		6</div><div class='add'>+#define MAS_VFE_1		7</div><div class='add'>+#define MAS_CPP		        8</div><div class='add'>+#define MM_INT_0		9</div><div class='add'>+#define SLV_SMMNOC_BIMC		10</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_INTERCONNECT_QCOM_MSM8976_H */</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,qcs615-rpmh.h b/include/dt-bindings/interconnect/qcom,qcs615-rpmh.h<br/>new file mode 100644<br/>index 000000000000..84ae0d39e73c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,qcs615-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,qcs615-rpmh.h</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_QCS615_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_QCS615_H</div><div class='add'>+</div><div class='add'>+#define MASTER_A1NOC_CFG		1</div><div class='add'>+#define MASTER_QDSS_BAM			2</div><div class='add'>+#define MASTER_QSPI			3</div><div class='add'>+#define MASTER_QUP_0			4</div><div class='add'>+#define MASTER_BLSP_1			5</div><div class='add'>+#define MASTER_CNOC_A2NOC		6</div><div class='add'>+#define MASTER_CRYPTO			7</div><div class='add'>+#define MASTER_IPA			8</div><div class='add'>+#define MASTER_EMAC_EVB			9</div><div class='add'>+#define MASTER_PCIE			10</div><div class='add'>+#define MASTER_QDSS_ETR			11</div><div class='add'>+#define MASTER_SDCC_1			12</div><div class='add'>+#define MASTER_SDCC_2			13</div><div class='add'>+#define MASTER_UFS_MEM			14</div><div class='add'>+#define MASTER_USB2			15</div><div class='add'>+#define MASTER_USB3_0			16</div><div class='add'>+#define SLAVE_A1NOC_SNOC		17</div><div class='add'>+#define SLAVE_LPASS_SNOC		18</div><div class='add'>+#define SLAVE_ANOC_PCIE_SNOC		19</div><div class='add'>+#define SLAVE_SERVICE_A2NOC		20</div><div class='add'>+</div><div class='add'>+#define MASTER_CAMNOC_HF0_UNCOMP	1</div><div class='add'>+#define MASTER_CAMNOC_HF1_UNCOMP	2</div><div class='add'>+#define MASTER_CAMNOC_SF_UNCOMP		3</div><div class='add'>+#define SLAVE_CAMNOC_UNCOMP		4</div><div class='add'>+</div><div class='add'>+#define MASTER_SPDM			1</div><div class='add'>+#define MASTER_SNOC_CNOC		2</div><div class='add'>+#define MASTER_QDSS_DAP			3</div><div class='add'>+#define SLAVE_A1NOC_CFG			4</div><div class='add'>+#define SLAVE_AHB2PHY_EAST		5</div><div class='add'>+#define SLAVE_AHB2PHY_WEST		6</div><div class='add'>+#define SLAVE_AOP			7</div><div class='add'>+#define SLAVE_AOSS			8</div><div class='add'>+#define SLAVE_CAMERA_CFG		9</div><div class='add'>+#define SLAVE_CLK_CTL			10</div><div class='add'>+#define SLAVE_RBCPR_CX_CFG		11</div><div class='add'>+#define SLAVE_RBCPR_MX_CFG		12</div><div class='add'>+#define SLAVE_CRYPTO_0_CFG		13</div><div class='add'>+#define SLAVE_CNOC_DDRSS		14</div><div class='add'>+#define SLAVE_DISPLAY_CFG		15</div><div class='add'>+#define SLAVE_EMAC_AVB_CFG		16</div><div class='add'>+#define SLAVE_GLM			17</div><div class='add'>+#define SLAVE_GFX3D_CFG			18</div><div class='add'>+#define SLAVE_IMEM_CFG			19</div><div class='add'>+#define SLAVE_IPA_CFG			20</div><div class='add'>+#define SLAVE_CNOC_MNOC_CFG		21</div><div class='add'>+#define SLAVE_PCIE_CFG			22</div><div class='add'>+#define SLAVE_PIMEM_CFG			23</div><div class='add'>+#define SLAVE_PRNG			24</div><div class='add'>+#define SLAVE_QDSS_CFG			25</div><div class='add'>+#define SLAVE_QSPI			26</div><div class='add'>+#define SLAVE_QUP_0			27</div><div class='add'>+#define SLAVE_QUP_1			28</div><div class='add'>+#define SLAVE_SDCC_1			29</div><div class='add'>+#define SLAVE_SDCC_2			30</div><div class='add'>+#define SLAVE_SNOC_CFG			31</div><div class='add'>+#define SLAVE_SPDM_WRAPPER		32</div><div class='add'>+#define SLAVE_TCSR			33</div><div class='add'>+#define SLAVE_TLMM_EAST			34</div><div class='add'>+#define SLAVE_TLMM_SOUTH		35</div><div class='add'>+#define SLAVE_TLMM_WEST			36</div><div class='add'>+#define SLAVE_UFS_MEM_CFG		37</div><div class='add'>+#define SLAVE_USB2			38</div><div class='add'>+#define SLAVE_USB3			39</div><div class='add'>+#define SLAVE_VENUS_CFG			40</div><div class='add'>+#define SLAVE_VSENSE_CTRL_CFG		41</div><div class='add'>+#define SLAVE_CNOC_A2NOC		42</div><div class='add'>+#define SLAVE_SERVICE_CNOC		43</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_DC_NOC		1</div><div class='add'>+#define SLAVE_DC_NOC_GEMNOC		2</div><div class='add'>+#define SLAVE_LLCC_CFG			3</div><div class='add'>+</div><div class='add'>+#define MASTER_APPSS_PROC		1</div><div class='add'>+#define MASTER_GPU_TCU			2</div><div class='add'>+#define MASTER_SYS_TCU			3</div><div class='add'>+#define MASTER_GEM_NOC_CFG		4</div><div class='add'>+#define MASTER_GFX3D			5</div><div class='add'>+#define MASTER_MNOC_HF_MEM_NOC		6</div><div class='add'>+#define MASTER_MNOC_SF_MEM_NOC		7</div><div class='add'>+#define MASTER_SNOC_GC_MEM_NOC		8</div><div class='add'>+#define MASTER_SNOC_SF_MEM_NOC		9</div><div class='add'>+#define SLAVE_MSS_PROC_MS_MPU_CFG	10</div><div class='add'>+#define SLAVE_GEM_NOC_SNOC		11</div><div class='add'>+#define SLAVE_LLCC			12</div><div class='add'>+#define SLAVE_MEM_NOC_PCIE_SNOC		13</div><div class='add'>+#define SLAVE_SERVICE_GEM_NOC		14</div><div class='add'>+</div><div class='add'>+#define MASTER_IPA_CORE			1</div><div class='add'>+#define SLAVE_IPA_CORE			2</div><div class='add'>+</div><div class='add'>+#define MASTER_LLCC			1</div><div class='add'>+#define SLAVE_EBI1			2</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_MNOC_CFG		1</div><div class='add'>+#define MASTER_CAMNOC_HF0		2</div><div class='add'>+#define MASTER_CAMNOC_HF1		3</div><div class='add'>+#define MASTER_CAMNOC_SF		4</div><div class='add'>+#define MASTER_MDP0			5</div><div class='add'>+#define MASTER_ROTATOR			6</div><div class='add'>+#define MASTER_VIDEO_P0			7</div><div class='add'>+#define MASTER_VIDEO_PROC		8</div><div class='add'>+#define SLAVE_MNOC_SF_MEM_NOC		9</div><div class='add'>+#define SLAVE_MNOC_HF_MEM_NOC		10</div><div class='add'>+#define SLAVE_SERVICE_MNOC		11</div><div class='add'>+</div><div class='add'>+#define MASTER_SNOC_CFG			1</div><div class='add'>+#define MASTER_A1NOC_SNOC		2</div><div class='add'>+#define MASTER_GEM_NOC_SNOC		3</div><div class='add'>+#define MASTER_GEM_NOC_PCIE_SNOC	4</div><div class='add'>+#define MASTER_LPASS_ANOC		5</div><div class='add'>+#define MASTER_ANOC_PCIE_SNOC		6</div><div class='add'>+#define MASTER_PIMEM			7</div><div class='add'>+#define MASTER_GIC			8</div><div class='add'>+#define SLAVE_APPSS			9</div><div class='add'>+#define SLAVE_SNOC_CNOC			10</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_SF		11</div><div class='add'>+#define SLAVE_SNOC_MEM_NOC_GC		12</div><div class='add'>+#define SLAVE_IMEM			13</div><div class='add'>+#define SLAVE_PIMEM			14</div><div class='add'>+#define SLAVE_SERVICE_SNOC		15</div><div class='add'>+#define SLAVE_PCIE_0			16</div><div class='add'>+#define SLAVE_QDSS_STM			17</div><div class='add'>+#define SLAVE_TCU			18</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,qcs8300-rpmh.h b/include/dt-bindings/interconnect/qcom,qcs8300-rpmh.h<br/>new file mode 100644<br/>index 000000000000..c5eeafa1b1dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,qcs8300-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,qcs8300-rpmh.h</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_QCS8300_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_QCS8300_H</div><div class='add'>+</div><div class='add'>+#define MASTER_QUP_3				0</div><div class='add'>+#define MASTER_EMAC				1</div><div class='add'>+#define MASTER_SDC				2</div><div class='add'>+#define MASTER_UFS_MEM				3</div><div class='add'>+#define MASTER_USB2				4</div><div class='add'>+#define MASTER_USB3_0				5</div><div class='add'>+#define SLAVE_A1NOC_SNOC			6</div><div class='add'>+</div><div class='add'>+#define MASTER_QDSS_BAM				0</div><div class='add'>+#define MASTER_QUP_0				1</div><div class='add'>+#define MASTER_QUP_1				2</div><div class='add'>+#define MASTER_CNOC_A2NOC			3</div><div class='add'>+#define MASTER_CRYPTO_CORE0			4</div><div class='add'>+#define MASTER_CRYPTO_CORE1			5</div><div class='add'>+#define MASTER_IPA				6</div><div class='add'>+#define MASTER_QDSS_ETR_0			7</div><div class='add'>+#define MASTER_QDSS_ETR_1			8</div><div class='add'>+#define SLAVE_A2NOC_SNOC			9</div><div class='add'>+</div><div class='add'>+#define MASTER_QUP_CORE_0			0</div><div class='add'>+#define MASTER_QUP_CORE_1			1</div><div class='add'>+#define MASTER_QUP_CORE_3			2</div><div class='add'>+#define SLAVE_QUP_CORE_0			3</div><div class='add'>+#define SLAVE_QUP_CORE_1			4</div><div class='add'>+#define SLAVE_QUP_CORE_3			5</div><div class='add'>+</div><div class='add'>+#define MASTER_GEM_NOC_CNOC			0</div><div class='add'>+#define MASTER_GEM_NOC_PCIE_SNOC		1</div><div class='add'>+#define SLAVE_AHB2PHY_2				2</div><div class='add'>+#define SLAVE_AHB2PHY_3				3</div><div class='add'>+#define SLAVE_ANOC_THROTTLE_CFG			4</div><div class='add'>+#define SLAVE_AOSS				5</div><div class='add'>+#define SLAVE_APPSS				6</div><div class='add'>+#define SLAVE_BOOT_ROM				7</div><div class='add'>+#define SLAVE_CAMERA_CFG			8</div><div class='add'>+#define SLAVE_CAMERA_NRT_THROTTLE_CFG		9</div><div class='add'>+#define SLAVE_CAMERA_RT_THROTTLE_CFG		10</div><div class='add'>+#define SLAVE_CLK_CTL				11</div><div class='add'>+#define SLAVE_CDSP_CFG				12</div><div class='add'>+#define SLAVE_RBCPR_CX_CFG			13</div><div class='add'>+#define SLAVE_RBCPR_MMCX_CFG			14</div><div class='add'>+#define SLAVE_RBCPR_MX_CFG			15</div><div class='add'>+#define SLAVE_CPR_NSPCX				16</div><div class='add'>+#define SLAVE_CPR_NSPHMX			17</div><div class='add'>+#define SLAVE_CRYPTO_0_CFG			18</div><div class='add'>+#define SLAVE_CX_RDPM				19</div><div class='add'>+#define SLAVE_DISPLAY_CFG			20</div><div class='add'>+#define SLAVE_DISPLAY_RT_THROTTLE_CFG		21</div><div class='add'>+#define SLAVE_EMAC_CFG				22</div><div class='add'>+#define SLAVE_GP_DSP0_CFG			23</div><div class='add'>+#define SLAVE_GPDSP0_THROTTLE_CFG		24</div><div class='add'>+#define SLAVE_GPU_TCU_THROTTLE_CFG		25</div><div class='add'>+#define SLAVE_GFX3D_CFG				26</div><div class='add'>+#define SLAVE_HWKM				27</div><div class='add'>+#define SLAVE_IMEM_CFG				28</div><div class='add'>+#define SLAVE_IPA_CFG				29</div><div class='add'>+#define SLAVE_IPC_ROUTER_CFG			30</div><div class='add'>+#define SLAVE_LPASS				31</div><div class='add'>+#define SLAVE_LPASS_THROTTLE_CFG		32</div><div class='add'>+#define SLAVE_MX_RDPM				33</div><div class='add'>+#define SLAVE_MXC_RDPM				34</div><div class='add'>+#define SLAVE_PCIE_0_CFG			35</div><div class='add'>+#define SLAVE_PCIE_1_CFG			36</div><div class='add'>+#define SLAVE_PCIE_TCU_THROTTLE_CFG		37</div><div class='add'>+#define SLAVE_PCIE_THROTTLE_CFG			38</div><div class='add'>+#define SLAVE_PDM				39</div><div class='add'>+#define SLAVE_PIMEM_CFG				40</div><div class='add'>+#define SLAVE_PKA_WRAPPER_CFG			41</div><div class='add'>+#define SLAVE_QDSS_CFG				42</div><div class='add'>+#define SLAVE_QM_CFG				43</div><div class='add'>+#define SLAVE_QM_MPU_CFG			44</div><div class='add'>+#define SLAVE_QUP_0				45</div><div class='add'>+#define SLAVE_QUP_1				46</div><div class='add'>+#define SLAVE_QUP_3				47</div><div class='add'>+#define SLAVE_SAIL_THROTTLE_CFG			48</div><div class='add'>+#define SLAVE_SDC1				49</div><div class='add'>+#define SLAVE_SECURITY				50</div><div class='add'>+#define SLAVE_SNOC_THROTTLE_CFG			51</div><div class='add'>+#define SLAVE_TCSR				52</div><div class='add'>+#define SLAVE_TLMM				53</div><div class='add'>+#define SLAVE_TSC_CFG				54</div><div class='add'>+#define SLAVE_UFS_MEM_CFG			55</div><div class='add'>+#define SLAVE_USB2				56</div><div class='add'>+#define SLAVE_USB3_0				57</div><div class='add'>+#define SLAVE_VENUS_CFG				58</div><div class='add'>+#define SLAVE_VENUS_CVP_THROTTLE_CFG		59</div><div class='add'>+#define SLAVE_VENUS_V_CPU_THROTTLE_CFG		60</div><div class='add'>+#define SLAVE_VENUS_VCODEC_THROTTLE_CFG		61</div><div class='add'>+#define SLAVE_DDRSS_CFG				62</div><div class='add'>+#define SLAVE_GPDSP_NOC_CFG			63</div><div class='add'>+#define SLAVE_CNOC_MNOC_HF_CFG			64</div><div class='add'>+#define SLAVE_CNOC_MNOC_SF_CFG			65</div><div class='add'>+#define SLAVE_PCIE_ANOC_CFG			66</div><div class='add'>+#define SLAVE_SNOC_CFG				67</div><div class='add'>+#define SLAVE_BOOT_IMEM				68</div><div class='add'>+#define SLAVE_IMEM				69</div><div class='add'>+#define SLAVE_PIMEM				70</div><div class='add'>+#define SLAVE_PCIE_0				71</div><div class='add'>+#define SLAVE_PCIE_1				72</div><div class='add'>+#define SLAVE_QDSS_STM				73</div><div class='add'>+#define SLAVE_TCU				74</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_DC_NOC			0</div><div class='add'>+#define SLAVE_LLCC_CFG				1</div><div class='add'>+#define SLAVE_GEM_NOC_CFG			2</div><div class='add'>+</div><div class='add'>+#define MASTER_GPU_TCU				0</div><div class='add'>+#define MASTER_PCIE_TCU				1</div><div class='add'>+#define MASTER_SYS_TCU				2</div><div class='add'>+#define MASTER_APPSS_PROC			3</div><div class='add'>+#define MASTER_COMPUTE_NOC			4</div><div class='add'>+#define MASTER_GEM_NOC_CFG			5</div><div class='add'>+#define MASTER_GPDSP_SAIL			6</div><div class='add'>+#define MASTER_GFX3D				7</div><div class='add'>+#define MASTER_MNOC_HF_MEM_NOC			8</div><div class='add'>+#define MASTER_MNOC_SF_MEM_NOC			9</div><div class='add'>+#define MASTER_ANOC_PCIE_GEM_NOC		10</div><div class='add'>+#define MASTER_SNOC_GC_MEM_NOC			11</div><div class='add'>+#define MASTER_SNOC_SF_MEM_NOC			12</div><div class='add'>+#define SLAVE_GEM_NOC_CNOC			13</div><div class='add'>+#define SLAVE_LLCC				14</div><div class='add'>+#define SLAVE_GEM_NOC_PCIE_CNOC			15</div><div class='add'>+#define SLAVE_SERVICE_GEM_NOC_1			16</div><div class='add'>+#define SLAVE_SERVICE_GEM_NOC_2			17</div><div class='add'>+#define SLAVE_SERVICE_GEM_NOC			18</div><div class='add'>+#define SLAVE_SERVICE_GEM_NOC2			19</div><div class='add'>+</div><div class='add'>+#define MASTER_SAILSS_MD0			0</div><div class='add'>+#define MASTER_DSP0				1</div><div class='add'>+#define SLAVE_GP_DSP_SAIL_NOC			2</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_LPASS_AG_NOC		0</div><div class='add'>+#define MASTER_LPASS_PROC			1</div><div class='add'>+#define SLAVE_LPASS_CORE_CFG			2</div><div class='add'>+#define SLAVE_LPASS_LPI_CFG			3</div><div class='add'>+#define SLAVE_LPASS_MPU_CFG			4</div><div class='add'>+#define SLAVE_LPASS_TOP_CFG			5</div><div class='add'>+#define SLAVE_LPASS_SNOC			6</div><div class='add'>+#define SLAVE_SERVICES_LPASS_AML_NOC		7</div><div class='add'>+#define SLAVE_SERVICE_LPASS_AG_NOC		8</div><div class='add'>+</div><div class='add'>+#define MASTER_LLCC				0</div><div class='add'>+#define SLAVE_EBI1				1</div><div class='add'>+</div><div class='add'>+#define MASTER_CAMNOC_HF			0</div><div class='add'>+#define MASTER_CAMNOC_ICP			1</div><div class='add'>+#define MASTER_CAMNOC_SF			2</div><div class='add'>+#define MASTER_MDP0				3</div><div class='add'>+#define MASTER_MDP1				4</div><div class='add'>+#define MASTER_CNOC_MNOC_HF_CFG			5</div><div class='add'>+#define MASTER_CNOC_MNOC_SF_CFG			6</div><div class='add'>+#define MASTER_VIDEO_P0				7</div><div class='add'>+#define MASTER_VIDEO_PROC			8</div><div class='add'>+#define MASTER_VIDEO_V_PROC			9</div><div class='add'>+#define SLAVE_MNOC_HF_MEM_NOC			10</div><div class='add'>+#define SLAVE_MNOC_SF_MEM_NOC			11</div><div class='add'>+#define SLAVE_SERVICE_MNOC_HF			12</div><div class='add'>+#define SLAVE_SERVICE_MNOC_SF			13</div><div class='add'>+</div><div class='add'>+#define MASTER_CDSP_NOC_CFG			0</div><div class='add'>+#define MASTER_CDSP_PROC			1</div><div class='add'>+#define SLAVE_HCP_A				2</div><div class='add'>+#define SLAVE_CDSP_MEM_NOC			3</div><div class='add'>+#define SLAVE_SERVICE_NSP_NOC			4</div><div class='add'>+</div><div class='add'>+#define MASTER_PCIE_0				0</div><div class='add'>+#define MASTER_PCIE_1				1</div><div class='add'>+#define SLAVE_ANOC_PCIE_GEM_NOC			2</div><div class='add'>+</div><div class='add'>+#define MASTER_GIC_AHB				0</div><div class='add'>+#define MASTER_A1NOC_SNOC			1</div><div class='add'>+#define MASTER_A2NOC_SNOC			2</div><div class='add'>+#define MASTER_LPASS_ANOC			3</div><div class='add'>+#define MASTER_SNOC_CFG				4</div><div class='add'>+#define MASTER_PIMEM				5</div><div class='add'>+#define MASTER_GIC				6</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_GC			7</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_SF			8</div><div class='add'>+#define SLAVE_SERVICE_SNOC			9</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,sar2130p-rpmh.h b/include/dt-bindings/interconnect/qcom,sar2130p-rpmh.h<br/>new file mode 100644<br/>index 000000000000..aec7cbb7cd70<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sar2130p-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,sar2130p-rpmh.h</a></div><div class='hunk'>@@ -0,0 +1,137 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024, Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_SAR2130P_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_SAR2130P_H</div><div class='add'>+</div><div class='add'>+#define MASTER_QUP_CORE_0			0</div><div class='add'>+#define MASTER_QUP_CORE_1			1</div><div class='add'>+#define SLAVE_QUP_CORE_0			2</div><div class='add'>+#define SLAVE_QUP_CORE_1			3</div><div class='add'>+</div><div class='add'>+#define MASTER_GEM_NOC_CNOC			0</div><div class='add'>+#define MASTER_GEM_NOC_PCIE_SNOC		1</div><div class='add'>+#define MASTER_QDSS_DAP				2</div><div class='add'>+#define SLAVE_AHB2PHY_SOUTH			3</div><div class='add'>+#define SLAVE_AOSS				4</div><div class='add'>+#define SLAVE_CAMERA_CFG			5</div><div class='add'>+#define SLAVE_CLK_CTL				6</div><div class='add'>+#define SLAVE_CDSP_CFG				7</div><div class='add'>+#define SLAVE_RBCPR_CX_CFG			8</div><div class='add'>+#define SLAVE_RBCPR_MMCX_CFG			9</div><div class='add'>+#define SLAVE_RBCPR_MXA_CFG			10</div><div class='add'>+#define SLAVE_RBCPR_MXC_CFG			11</div><div class='add'>+#define SLAVE_CPR_NSPCX				12</div><div class='add'>+#define SLAVE_CRYPTO_0_CFG			13</div><div class='add'>+#define SLAVE_CX_RDPM				14</div><div class='add'>+#define SLAVE_DISPLAY_CFG			15</div><div class='add'>+#define SLAVE_GFX3D_CFG				16</div><div class='add'>+#define SLAVE_IMEM_CFG				17</div><div class='add'>+#define SLAVE_IPC_ROUTER_CFG			18</div><div class='add'>+#define SLAVE_LPASS				19</div><div class='add'>+#define SLAVE_MX_RDPM				20</div><div class='add'>+#define SLAVE_PCIE_0_CFG			21</div><div class='add'>+#define SLAVE_PCIE_1_CFG			22</div><div class='add'>+#define SLAVE_PDM				23</div><div class='add'>+#define SLAVE_PIMEM_CFG				24</div><div class='add'>+#define SLAVE_PRNG				25</div><div class='add'>+#define SLAVE_QDSS_CFG				26</div><div class='add'>+#define SLAVE_QSPI_0				27</div><div class='add'>+#define SLAVE_QUP_0				28</div><div class='add'>+#define SLAVE_QUP_1				29</div><div class='add'>+#define SLAVE_SDCC_1				30</div><div class='add'>+#define SLAVE_TCSR				31</div><div class='add'>+#define SLAVE_TLMM				32</div><div class='add'>+#define SLAVE_TME_CFG				33</div><div class='add'>+#define SLAVE_USB3_0				34</div><div class='add'>+#define SLAVE_VENUS_CFG				35</div><div class='add'>+#define SLAVE_VSENSE_CTRL_CFG			36</div><div class='add'>+#define SLAVE_WLAN_Q6_CFG			37</div><div class='add'>+#define SLAVE_DDRSS_CFG				38</div><div class='add'>+#define SLAVE_CNOC_MNOC_CFG			39</div><div class='add'>+#define SLAVE_SNOC_CFG				40</div><div class='add'>+#define SLAVE_IMEM				41</div><div class='add'>+#define SLAVE_PIMEM				42</div><div class='add'>+#define SLAVE_SERVICE_CNOC			43</div><div class='add'>+#define SLAVE_PCIE_0				44</div><div class='add'>+#define SLAVE_PCIE_1				45</div><div class='add'>+#define SLAVE_QDSS_STM				46</div><div class='add'>+#define SLAVE_TCU				47</div><div class='add'>+</div><div class='add'>+#define MASTER_GPU_TCU				0</div><div class='add'>+#define MASTER_SYS_TCU				1</div><div class='add'>+#define MASTER_APPSS_PROC			2</div><div class='add'>+#define MASTER_GFX3D				3</div><div class='add'>+#define MASTER_MNOC_HF_MEM_NOC			4</div><div class='add'>+#define MASTER_MNOC_SF_MEM_NOC			5</div><div class='add'>+#define MASTER_COMPUTE_NOC			6</div><div class='add'>+#define MASTER_ANOC_PCIE_GEM_NOC		7</div><div class='add'>+#define MASTER_SNOC_GC_MEM_NOC			8</div><div class='add'>+#define MASTER_SNOC_SF_MEM_NOC			9</div><div class='add'>+#define MASTER_WLAN_Q6				10</div><div class='add'>+#define SLAVE_GEM_NOC_CNOC			11</div><div class='add'>+#define SLAVE_LLCC				12</div><div class='add'>+#define SLAVE_MEM_NOC_PCIE_SNOC			13</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_LPASS_AG_NOC		0</div><div class='add'>+#define MASTER_LPASS_PROC			1</div><div class='add'>+#define SLAVE_LPASS_CORE_CFG			2</div><div class='add'>+#define SLAVE_LPASS_LPI_CFG			3</div><div class='add'>+#define SLAVE_LPASS_MPU_CFG			4</div><div class='add'>+#define SLAVE_LPASS_TOP_CFG			5</div><div class='add'>+#define SLAVE_LPASS_SNOC			6</div><div class='add'>+#define SLAVE_SERVICES_LPASS_AML_NOC		7</div><div class='add'>+#define SLAVE_SERVICE_LPASS_AG_NOC		8</div><div class='add'>+</div><div class='add'>+#define MASTER_LLCC				0</div><div class='add'>+#define SLAVE_EBI1				1</div><div class='add'>+</div><div class='add'>+#define MASTER_CAMNOC_HF			0</div><div class='add'>+#define MASTER_CAMNOC_ICP			1</div><div class='add'>+#define MASTER_CAMNOC_SF			2</div><div class='add'>+#define MASTER_LSR				3</div><div class='add'>+#define MASTER_MDP				4</div><div class='add'>+#define MASTER_CNOC_MNOC_CFG			5</div><div class='add'>+#define MASTER_VIDEO				6</div><div class='add'>+#define MASTER_VIDEO_CV_PROC			7</div><div class='add'>+#define MASTER_VIDEO_PROC			8</div><div class='add'>+#define MASTER_VIDEO_V_PROC			9</div><div class='add'>+#define SLAVE_MNOC_HF_MEM_NOC			10</div><div class='add'>+#define SLAVE_MNOC_SF_MEM_NOC			11</div><div class='add'>+#define SLAVE_SERVICE_MNOC			12</div><div class='add'>+</div><div class='add'>+#define MASTER_CDSP_NOC_CFG			0</div><div class='add'>+#define MASTER_CDSP_PROC			1</div><div class='add'>+#define SLAVE_CDSP_MEM_NOC			2</div><div class='add'>+#define SLAVE_SERVICE_NSP_NOC			3</div><div class='add'>+</div><div class='add'>+#define MASTER_PCIE_0				0</div><div class='add'>+#define MASTER_PCIE_1				1</div><div class='add'>+#define SLAVE_ANOC_PCIE_GEM_NOC			2</div><div class='add'>+</div><div class='add'>+#define MASTER_GIC_AHB				0</div><div class='add'>+#define MASTER_QDSS_BAM				1</div><div class='add'>+#define MASTER_QSPI_0				2</div><div class='add'>+#define MASTER_QUP_0				3</div><div class='add'>+#define MASTER_QUP_1				4</div><div class='add'>+#define MASTER_A2NOC_SNOC			5</div><div class='add'>+#define MASTER_CNOC_DATAPATH			6</div><div class='add'>+#define MASTER_LPASS_ANOC			7</div><div class='add'>+#define MASTER_SNOC_CFG				8</div><div class='add'>+#define MASTER_CRYPTO				9</div><div class='add'>+#define MASTER_PIMEM				10</div><div class='add'>+#define MASTER_GIC				11</div><div class='add'>+#define MASTER_QDSS_ETR				12</div><div class='add'>+#define MASTER_QDSS_ETR_1			13</div><div class='add'>+#define MASTER_SDCC_1				14</div><div class='add'>+#define MASTER_USB3_0				15</div><div class='add'>+#define SLAVE_A2NOC_SNOC			16</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_GC			17</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_SF			18</div><div class='add'>+#define SLAVE_SERVICE_SNOC			19</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,sdx75.h b/include/dt-bindings/interconnect/qcom,sdx75.h<br/>index e903f5f3dd8f..0e19ee8f1687 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sdx75.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sdx75.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sdx75.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,sdx75.h</a></div><div class='hunk'>@@ -6,9 +6,7 @@</div><div class='ctx'> #ifndef __DT_BINDINGS_INTERCONNECT_QCOM_SDX75_H</div><div class='ctx'> #define __DT_BINDINGS_INTERCONNECT_QCOM_SDX75_H</div><div class='ctx'> </div><div class='del'>-#define MASTER_QPIC_CORE		0</div><div class='ctx'> #define MASTER_QUP_CORE_0		1</div><div class='del'>-#define SLAVE_QPIC_CORE			2</div><div class='ctx'> #define SLAVE_QUP_CORE_0		3</div><div class='ctx'> </div><div class='ctx'> #define MASTER_LLCC			0</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,sm7150-rpmh.h b/include/dt-bindings/interconnect/qcom,sm7150-rpmh.h<br/>new file mode 100644<br/>index 000000000000..1f610eb832aa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sm7150-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,sm7150-rpmh.h</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Qualcomm SM7150 interconnect IDs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024, Danila Tikhonov &lt;danila@jiaxyga.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_SM7150_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_SM7150_H</div><div class='add'>+</div><div class='add'>+#define MASTER_A1NOC_CFG		0</div><div class='add'>+#define MASTER_QUP_0			1</div><div class='add'>+#define MASTER_TSIF			2</div><div class='add'>+#define MASTER_EMMC			3</div><div class='add'>+#define MASTER_SDCC_2			4</div><div class='add'>+#define MASTER_SDCC_4			5</div><div class='add'>+#define MASTER_UFS_MEM			6</div><div class='add'>+#define A1NOC_SNOC_SLV			7</div><div class='add'>+#define SLAVE_SERVICE_A1NOC		8</div><div class='add'>+</div><div class='add'>+#define MASTER_A2NOC_CFG		0</div><div class='add'>+#define MASTER_QDSS_BAM			1</div><div class='add'>+#define MASTER_QUP_1			2</div><div class='add'>+#define MASTER_CNOC_A2NOC		3</div><div class='add'>+#define MASTER_CRYPTO_CORE_0		4</div><div class='add'>+#define MASTER_IPA			5</div><div class='add'>+#define MASTER_PCIE			6</div><div class='add'>+#define MASTER_QDSS_ETR			7</div><div class='add'>+#define MASTER_USB3			8</div><div class='add'>+#define A2NOC_SNOC_SLV			9</div><div class='add'>+#define SLAVE_ANOC_PCIE_GEM_NOC		10</div><div class='add'>+#define SLAVE_SERVICE_A2NOC		11</div><div class='add'>+</div><div class='add'>+#define MASTER_CAMNOC_HF0_UNCOMP	0</div><div class='add'>+#define MASTER_CAMNOC_RT_UNCOMP		1</div><div class='add'>+#define MASTER_CAMNOC_SF_UNCOMP		2</div><div class='add'>+#define MASTER_CAMNOC_NRT_UNCOMP	3</div><div class='add'>+#define SLAVE_CAMNOC_UNCOMP		4</div><div class='add'>+</div><div class='add'>+#define MASTER_NPU			0</div><div class='add'>+#define SLAVE_CDSP_GEM_NOC		1</div><div class='add'>+</div><div class='add'>+#define MASTER_SPDM			0</div><div class='add'>+#define SNOC_CNOC_MAS			1</div><div class='add'>+#define MASTER_QDSS_DAP			2</div><div class='add'>+#define SLAVE_A1NOC_CFG			3</div><div class='add'>+#define SLAVE_A2NOC_CFG			4</div><div class='add'>+#define SLAVE_AHB2PHY_NORTH		5</div><div class='add'>+#define SLAVE_AHB2PHY_SOUTH		6</div><div class='add'>+#define SLAVE_AHB2PHY_WEST		7</div><div class='add'>+#define SLAVE_AOP			8</div><div class='add'>+#define SLAVE_AOSS			9</div><div class='add'>+#define SLAVE_CAMERA_CFG		10</div><div class='add'>+#define SLAVE_CAMERA_NRT_THROTTLE_CFG	11</div><div class='add'>+#define SLAVE_CAMERA_RT_THROTTLE_CFG	12</div><div class='add'>+#define SLAVE_CLK_CTL			13</div><div class='add'>+#define SLAVE_CDSP_CFG			14</div><div class='add'>+#define SLAVE_RBCPR_CX_CFG		15</div><div class='add'>+#define SLAVE_RBCPR_MX_CFG		16</div><div class='add'>+#define SLAVE_CRYPTO_0_CFG		17</div><div class='add'>+#define SLAVE_CNOC_DDRSS		18</div><div class='add'>+#define SLAVE_DISPLAY_CFG		19</div><div class='add'>+#define SLAVE_DISPLAY_THROTTLE_CFG	20</div><div class='add'>+#define SLAVE_EMMC_CFG			21</div><div class='add'>+#define SLAVE_GLM			22</div><div class='add'>+#define SLAVE_GRAPHICS_3D_CFG		23</div><div class='add'>+#define SLAVE_IMEM_CFG			24</div><div class='add'>+#define SLAVE_IPA_CFG			25</div><div class='add'>+#define SLAVE_CNOC_MNOC_CFG		26</div><div class='add'>+#define SLAVE_PCIE_CFG			27</div><div class='add'>+#define SLAVE_PDM			28</div><div class='add'>+#define SLAVE_PIMEM_CFG			29</div><div class='add'>+#define SLAVE_PRNG			30</div><div class='add'>+#define SLAVE_QDSS_CFG			31</div><div class='add'>+#define SLAVE_QUP_0			32</div><div class='add'>+#define SLAVE_QUP_1			33</div><div class='add'>+#define SLAVE_SDCC_2			34</div><div class='add'>+#define SLAVE_SDCC_4			35</div><div class='add'>+#define SLAVE_SNOC_CFG			36</div><div class='add'>+#define SLAVE_SPDM_WRAPPER		37</div><div class='add'>+#define SLAVE_TCSR			38</div><div class='add'>+#define SLAVE_TLMM_NORTH		39</div><div class='add'>+#define SLAVE_TLMM_SOUTH		40</div><div class='add'>+#define SLAVE_TLMM_WEST			41</div><div class='add'>+#define SLAVE_TSIF			42</div><div class='add'>+#define SLAVE_UFS_MEM_CFG		43</div><div class='add'>+#define SLAVE_USB3			44</div><div class='add'>+#define SLAVE_VENUS_CFG			45</div><div class='add'>+#define SLAVE_VENUS_CVP_THROTTLE_CFG	46</div><div class='add'>+#define SLAVE_VENUS_THROTTLE_CFG	47</div><div class='add'>+#define SLAVE_VSENSE_CTRL_CFG		48</div><div class='add'>+#define SLAVE_CNOC_A2NOC		49</div><div class='add'>+#define SLAVE_SERVICE_CNOC		50</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_DC_NOC		0</div><div class='add'>+#define SLAVE_GEM_NOC_CFG		1</div><div class='add'>+#define SLAVE_LLCC_CFG			2</div><div class='add'>+</div><div class='add'>+#define MASTER_AMPSS_M0			0</div><div class='add'>+#define MASTER_SYS_TCU			1</div><div class='add'>+#define MASTER_GEM_NOC_CFG		2</div><div class='add'>+#define MASTER_COMPUTE_NOC		3</div><div class='add'>+#define MASTER_MNOC_HF_MEM_NOC		4</div><div class='add'>+#define MASTER_MNOC_SF_MEM_NOC		5</div><div class='add'>+#define MASTER_GEM_NOC_PCIE_SNOC	6</div><div class='add'>+#define MASTER_SNOC_GC_MEM_NOC		7</div><div class='add'>+#define MASTER_SNOC_SF_MEM_NOC		8</div><div class='add'>+#define MASTER_GRAPHICS_3D		9</div><div class='add'>+#define SLAVE_MSS_PROC_MS_MPU_CFG	10</div><div class='add'>+#define SLAVE_GEM_NOC_SNOC		11</div><div class='add'>+#define SLAVE_LLCC			12</div><div class='add'>+#define SLAVE_SERVICE_GEM_NOC		13</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define MASTER_LLCC			0</div><div class='add'>+#define SLAVE_EBI_CH0			1</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_MNOC_CFG		0</div><div class='add'>+#define MASTER_CAMNOC_HF0		1</div><div class='add'>+#define MASTER_CAMNOC_NRT		2</div><div class='add'>+#define MASTER_CAMNOC_RT		3</div><div class='add'>+#define MASTER_CAMNOC_SF		4</div><div class='add'>+#define MASTER_MDP_PORT0		5</div><div class='add'>+#define MASTER_MDP_PORT1		6</div><div class='add'>+#define MASTER_ROTATOR			7</div><div class='add'>+#define MASTER_VIDEO_P0			8</div><div class='add'>+#define MASTER_VIDEO_P1			9</div><div class='add'>+#define MASTER_VIDEO_PROC		10</div><div class='add'>+#define SLAVE_MNOC_SF_MEM_NOC		11</div><div class='add'>+#define SLAVE_MNOC_HF_MEM_NOC		12</div><div class='add'>+#define SLAVE_SERVICE_MNOC		13</div><div class='add'>+</div><div class='add'>+#define MASTER_SNOC_CFG			0</div><div class='add'>+#define A1NOC_SNOC_MAS			1</div><div class='add'>+#define A2NOC_SNOC_MAS			2</div><div class='add'>+#define MASTER_GEM_NOC_SNOC		3</div><div class='add'>+#define MASTER_PIMEM			4</div><div class='add'>+#define MASTER_GIC			5</div><div class='add'>+#define SLAVE_APPSS			6</div><div class='add'>+#define SNOC_CNOC_SLV			7</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_GC		8</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_SF		9</div><div class='add'>+#define SLAVE_OCIMEM			10</div><div class='add'>+#define SLAVE_PIMEM			11</div><div class='add'>+#define SLAVE_SERVICE_SNOC		12</div><div class='add'>+#define SLAVE_QDSS_STM			13</div><div class='add'>+#define SLAVE_TCU			14</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,sm8350.h b/include/dt-bindings/interconnect/qcom,sm8350.h<br/>index c7f7ed315aeb..2282f93607bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sm8350.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sm8350.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sm8350.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,sm8350.h</a></div><div class='hunk'>@@ -119,9 +119,6 @@</div><div class='ctx'> #define SLAVE_SERVICE_GEM_NOC_1		16</div><div class='ctx'> #define SLAVE_SERVICE_GEM_NOC_2		17</div><div class='ctx'> #define SLAVE_SERVICE_GEM_NOC		18</div><div class='del'>-#define MASTER_MNOC_HF_MEM_NOC_DISP	19</div><div class='del'>-#define MASTER_MNOC_SF_MEM_NOC_DISP	20</div><div class='del'>-#define SLAVE_LLCC_DISP			21</div><div class='ctx'> </div><div class='ctx'> #define MASTER_CNOC_LPASS_AG_NOC	0</div><div class='ctx'> #define SLAVE_LPASS_CORE_CFG		1</div><div class='hunk'>@@ -133,8 +130,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MASTER_LLCC			0</div><div class='ctx'> #define SLAVE_EBI1			1</div><div class='del'>-#define MASTER_LLCC_DISP		2</div><div class='del'>-#define SLAVE_EBI1_DISP			3</div><div class='ctx'> </div><div class='ctx'> #define MASTER_CAMNOC_HF		0</div><div class='ctx'> #define MASTER_CAMNOC_ICP		1</div><div class='hunk'>@@ -149,11 +144,6 @@</div><div class='ctx'> #define SLAVE_MNOC_HF_MEM_NOC		10</div><div class='ctx'> #define SLAVE_MNOC_SF_MEM_NOC		11</div><div class='ctx'> #define SLAVE_SERVICE_MNOC		12</div><div class='del'>-#define MASTER_MDP0_DISP		13</div><div class='del'>-#define MASTER_MDP1_DISP		14</div><div class='del'>-#define MASTER_ROTATOR_DISP		15</div><div class='del'>-#define SLAVE_MNOC_HF_MEM_NOC_DISP	16</div><div class='del'>-#define SLAVE_MNOC_SF_MEM_NOC_DISP	17</div><div class='ctx'> </div><div class='ctx'> #define MASTER_CDSP_NOC_CFG		0</div><div class='ctx'> #define MASTER_CDSP_PROC		1</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,sm8650-rpmh.h b/include/dt-bindings/interconnect/qcom,sm8650-rpmh.h<br/>index 6c1eaf04e241..1216aa352d55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sm8650-rpmh.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,sm8650-rpmh.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sm8650-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,sm8650-rpmh.h</a></div><div class='hunk'>@@ -150,5 +150,6 @@</div><div class='ctx'> #define MASTER_A1NOC_SNOC			0</div><div class='ctx'> #define MASTER_A2NOC_SNOC			1</div><div class='ctx'> #define SLAVE_SNOC_GEM_NOC_SF			2</div><div class='add'>+#define MASTER_APSS_NOC				3</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,sm8750-rpmh.h b/include/dt-bindings/interconnect/qcom,sm8750-rpmh.h<br/>new file mode 100644<br/>index 000000000000..30563952a646<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,sm8750-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,sm8750-rpmh.h</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_INTERCONNECT_QCOM_SM8750_H</div><div class='add'>+#define __DT_BINDINGS_INTERCONNECT_QCOM_SM8750_H</div><div class='add'>+</div><div class='add'>+#define MASTER_QSPI_0				0</div><div class='add'>+#define MASTER_QUP_1				1</div><div class='add'>+#define MASTER_QUP_3				2</div><div class='add'>+#define MASTER_SDCC_4				3</div><div class='add'>+#define MASTER_UFS_MEM				4</div><div class='add'>+#define MASTER_USB3_0				5</div><div class='add'>+#define SLAVE_A1NOC_SNOC			6</div><div class='add'>+</div><div class='add'>+#define MASTER_QDSS_BAM				0</div><div class='add'>+#define MASTER_QUP_2				1</div><div class='add'>+#define MASTER_CRYPTO				2</div><div class='add'>+#define MASTER_IPA				3</div><div class='add'>+#define MASTER_SOCCP_AGGR_NOC			4</div><div class='add'>+#define MASTER_SP				5</div><div class='add'>+#define MASTER_QDSS_ETR				6</div><div class='add'>+#define MASTER_QDSS_ETR_1			7</div><div class='add'>+#define MASTER_SDCC_2				8</div><div class='add'>+#define SLAVE_A2NOC_SNOC			9</div><div class='add'>+</div><div class='add'>+#define MASTER_QUP_CORE_0			0</div><div class='add'>+#define MASTER_QUP_CORE_1			1</div><div class='add'>+#define MASTER_QUP_CORE_2			2</div><div class='add'>+#define SLAVE_QUP_CORE_0			3</div><div class='add'>+#define SLAVE_QUP_CORE_1			4</div><div class='add'>+#define SLAVE_QUP_CORE_2			5</div><div class='add'>+</div><div class='add'>+#define MASTER_CNOC_CFG				0</div><div class='add'>+#define SLAVE_AHB2PHY_SOUTH			1</div><div class='add'>+#define SLAVE_AHB2PHY_NORTH			2</div><div class='add'>+#define SLAVE_CAMERA_CFG			3</div><div class='add'>+#define SLAVE_CLK_CTL				4</div><div class='add'>+#define SLAVE_CRYPTO_0_CFG			5</div><div class='add'>+#define SLAVE_DISPLAY_CFG			6</div><div class='add'>+#define SLAVE_EVA_CFG				7</div><div class='add'>+#define SLAVE_GFX3D_CFG				8</div><div class='add'>+#define SLAVE_I2C				9</div><div class='add'>+#define SLAVE_I3C_IBI0_CFG			10</div><div class='add'>+#define SLAVE_I3C_IBI1_CFG			11</div><div class='add'>+#define SLAVE_IMEM_CFG				12</div><div class='add'>+#define SLAVE_CNOC_MSS				13</div><div class='add'>+#define SLAVE_PCIE_CFG				14</div><div class='add'>+#define SLAVE_PRNG				15</div><div class='add'>+#define SLAVE_QDSS_CFG				16</div><div class='add'>+#define SLAVE_QSPI_0				17</div><div class='add'>+#define SLAVE_QUP_3				18</div><div class='add'>+#define SLAVE_QUP_1				19</div><div class='add'>+#define SLAVE_QUP_2				20</div><div class='add'>+#define SLAVE_SDCC_2				21</div><div class='add'>+#define SLAVE_SDCC_4				22</div><div class='add'>+#define SLAVE_SPSS_CFG				23</div><div class='add'>+#define SLAVE_TCSR				24</div><div class='add'>+#define SLAVE_TLMM				25</div><div class='add'>+#define SLAVE_UFS_MEM_CFG			26</div><div class='add'>+#define SLAVE_USB3_0				27</div><div class='add'>+#define SLAVE_VENUS_CFG				28</div><div class='add'>+#define SLAVE_VSENSE_CTRL_CFG			29</div><div class='add'>+#define SLAVE_CNOC_MNOC_CFG			30</div><div class='add'>+#define SLAVE_PCIE_ANOC_CFG			31</div><div class='add'>+#define SLAVE_QDSS_STM				32</div><div class='add'>+#define SLAVE_TCU				33</div><div class='add'>+</div><div class='add'>+#define MASTER_GEM_NOC_CNOC			0</div><div class='add'>+#define MASTER_GEM_NOC_PCIE_SNOC		1</div><div class='add'>+#define SLAVE_AOSS				2</div><div class='add'>+#define SLAVE_IPA_CFG				3</div><div class='add'>+#define SLAVE_IPC_ROUTER_CFG			4</div><div class='add'>+#define SLAVE_SOCCP				5</div><div class='add'>+#define SLAVE_TME_CFG				6</div><div class='add'>+#define SLAVE_APPSS				7</div><div class='add'>+#define SLAVE_CNOC_CFG				8</div><div class='add'>+#define SLAVE_DDRSS_CFG				9</div><div class='add'>+#define SLAVE_BOOT_IMEM				10</div><div class='add'>+#define SLAVE_IMEM				11</div><div class='add'>+#define SLAVE_BOOT_IMEM_2			12</div><div class='add'>+#define SLAVE_SERVICE_CNOC			13</div><div class='add'>+#define SLAVE_PCIE_0				14</div><div class='add'>+</div><div class='add'>+#define MASTER_GPU_TCU				0</div><div class='add'>+#define MASTER_SYS_TCU				1</div><div class='add'>+#define MASTER_APPSS_PROC			2</div><div class='add'>+#define MASTER_GFX3D				3</div><div class='add'>+#define MASTER_LPASS_GEM_NOC			4</div><div class='add'>+#define MASTER_MSS_PROC				5</div><div class='add'>+#define MASTER_MNOC_HF_MEM_NOC			6</div><div class='add'>+#define MASTER_MNOC_SF_MEM_NOC			7</div><div class='add'>+#define MASTER_COMPUTE_NOC			8</div><div class='add'>+#define MASTER_ANOC_PCIE_GEM_NOC		9</div><div class='add'>+#define MASTER_SNOC_SF_MEM_NOC			10</div><div class='add'>+#define MASTER_UBWC_P				11</div><div class='add'>+#define MASTER_GIC				12</div><div class='add'>+#define SLAVE_UBWC_P				13</div><div class='add'>+#define SLAVE_GEM_NOC_CNOC			14</div><div class='add'>+#define SLAVE_LLCC				15</div><div class='add'>+#define SLAVE_MEM_NOC_PCIE_SNOC			16</div><div class='add'>+</div><div class='add'>+#define MASTER_LPIAON_NOC			0</div><div class='add'>+#define SLAVE_LPASS_GEM_NOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_LPASS_LPINOC			0</div><div class='add'>+#define SLAVE_LPIAON_NOC_LPASS_AG_NOC		1</div><div class='add'>+</div><div class='add'>+#define MASTER_LPASS_PROC			0</div><div class='add'>+#define SLAVE_LPICX_NOC_LPIAON_NOC		1</div><div class='add'>+</div><div class='add'>+#define MASTER_LLCC				0</div><div class='add'>+#define SLAVE_EBI1				1</div><div class='add'>+</div><div class='add'>+#define MASTER_CAMNOC_HF			0</div><div class='add'>+#define MASTER_CAMNOC_NRT_ICP_SF		1</div><div class='add'>+#define MASTER_CAMNOC_RT_CDM_SF			2</div><div class='add'>+#define MASTER_CAMNOC_SF			3</div><div class='add'>+#define MASTER_MDP				4</div><div class='add'>+#define MASTER_CDSP_HCP				5</div><div class='add'>+#define MASTER_VIDEO_CV_PROC			6</div><div class='add'>+#define MASTER_VIDEO_EVA			7</div><div class='add'>+#define MASTER_VIDEO_MVP			8</div><div class='add'>+#define MASTER_VIDEO_V_PROC			9</div><div class='add'>+#define MASTER_CNOC_MNOC_CFG			10</div><div class='add'>+#define SLAVE_MNOC_HF_MEM_NOC			11</div><div class='add'>+#define SLAVE_MNOC_SF_MEM_NOC			12</div><div class='add'>+#define SLAVE_SERVICE_MNOC			13</div><div class='add'>+</div><div class='add'>+#define MASTER_CDSP_PROC			0</div><div class='add'>+#define SLAVE_CDSP_MEM_NOC			1</div><div class='add'>+</div><div class='add'>+#define MASTER_PCIE_ANOC_CFG			0</div><div class='add'>+#define MASTER_PCIE_0				1</div><div class='add'>+#define SLAVE_ANOC_PCIE_GEM_NOC			2</div><div class='add'>+#define SLAVE_SERVICE_PCIE_ANOC			3</div><div class='add'>+</div><div class='add'>+#define MASTER_A1NOC_SNOC			0</div><div class='add'>+#define MASTER_A2NOC_SNOC			1</div><div class='add'>+#define SLAVE_SNOC_GEM_NOC_SF			2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h b/include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h<br/>index a38c3472698a..7d9710881149 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h</a></div><div class='hunk'>@@ -112,11 +112,6 @@</div><div class='ctx'> #define SLAVE_GEM_NOC_CNOC			12</div><div class='ctx'> #define SLAVE_LLCC				13</div><div class='ctx'> #define SLAVE_MEM_NOC_PCIE_SNOC			14</div><div class='del'>-#define MASTER_MNOC_HF_MEM_NOC_DISP		15</div><div class='del'>-#define MASTER_ANOC_PCIE_GEM_NOC_DISP		16</div><div class='del'>-#define SLAVE_LLCC_DISP				17</div><div class='del'>-#define MASTER_ANOC_PCIE_GEM_NOC_PCIE		18</div><div class='del'>-#define SLAVE_LLCC_PCIE				19</div><div class='ctx'> </div><div class='ctx'> #define MASTER_LPIAON_NOC			0</div><div class='ctx'> #define SLAVE_LPASS_GEM_NOC			1</div><div class='hunk'>@@ -129,10 +124,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MASTER_LLCC				0</div><div class='ctx'> #define SLAVE_EBI1				1</div><div class='del'>-#define MASTER_LLCC_DISP			2</div><div class='del'>-#define SLAVE_EBI1_DISP				3</div><div class='del'>-#define MASTER_LLCC_PCIE			4</div><div class='del'>-#define SLAVE_EBI1_PCIE				5</div><div class='ctx'> </div><div class='ctx'> #define MASTER_AV1_ENC				0</div><div class='ctx'> #define MASTER_CAMNOC_HF			1</div><div class='hunk'>@@ -147,8 +138,6 @@</div><div class='ctx'> #define SLAVE_MNOC_HF_MEM_NOC			10</div><div class='ctx'> #define SLAVE_MNOC_SF_MEM_NOC			11</div><div class='ctx'> #define SLAVE_SERVICE_MNOC			12</div><div class='del'>-#define MASTER_MDP_DISP				13</div><div class='del'>-#define SLAVE_MNOC_HF_MEM_NOC_DISP		14</div><div class='ctx'> </div><div class='ctx'> #define MASTER_CDSP_PROC			0</div><div class='ctx'> #define SLAVE_CDSP_MEM_NOC			1</div><div class='hunk'>@@ -156,18 +145,11 @@</div><div class='ctx'> #define MASTER_PCIE_NORTH			0</div><div class='ctx'> #define MASTER_PCIE_SOUTH			1</div><div class='ctx'> #define SLAVE_ANOC_PCIE_GEM_NOC			2</div><div class='del'>-#define MASTER_PCIE_NORTH_PCIE			3</div><div class='del'>-#define MASTER_PCIE_SOUTH_PCIE			4</div><div class='del'>-#define SLAVE_ANOC_PCIE_GEM_NOC_PCIE		5</div><div class='ctx'> </div><div class='ctx'> #define MASTER_PCIE_3				0</div><div class='ctx'> #define MASTER_PCIE_4				1</div><div class='ctx'> #define MASTER_PCIE_5				2</div><div class='ctx'> #define SLAVE_PCIE_NORTH			3</div><div class='del'>-#define MASTER_PCIE_3_PCIE			4</div><div class='del'>-#define MASTER_PCIE_4_PCIE			5</div><div class='del'>-#define MASTER_PCIE_5_PCIE			6</div><div class='del'>-#define SLAVE_PCIE_NORTH_PCIE			7</div><div class='ctx'> </div><div class='ctx'> #define MASTER_PCIE_0				0</div><div class='ctx'> #define MASTER_PCIE_1				1</div><div class='hunk'>@@ -175,12 +157,6 @@</div><div class='ctx'> #define MASTER_PCIE_6A				3</div><div class='ctx'> #define MASTER_PCIE_6B				4</div><div class='ctx'> #define SLAVE_PCIE_SOUTH			5</div><div class='del'>-#define MASTER_PCIE_0_PCIE			6</div><div class='del'>-#define MASTER_PCIE_1_PCIE			7</div><div class='del'>-#define MASTER_PCIE_2_PCIE			8</div><div class='del'>-#define MASTER_PCIE_6A_PCIE			9</div><div class='del'>-#define MASTER_PCIE_6B_PCIE			10</div><div class='del'>-#define SLAVE_PCIE_SOUTH_PCIE			11</div><div class='ctx'> </div><div class='ctx'> #define MASTER_A1NOC_SNOC			0</div><div class='ctx'> #define MASTER_A2NOC_SNOC			1</div><div class='head'>diff --git a/include/dt-bindings/interrupt-controller/arm-gic.h b/include/dt-bindings/interrupt-controller/arm-gic.h<br/>index 35b6f69b7db6..887f53363e8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interrupt-controller/arm-gic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interrupt-controller/arm-gic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interrupt-controller/arm-gic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interrupt-controller/arm-gic.h</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> </div><div class='ctx'> #define GIC_SPI 0</div><div class='ctx'> #define GIC_PPI 1</div><div class='add'>+#define GIC_ESPI 2</div><div class='add'>+#define GIC_EPPI 3</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Interrupt specifier cell 2.</div><div class='head'>diff --git a/include/dt-bindings/interrupt-controller/aspeed-scu-ic.h b/include/dt-bindings/interrupt-controller/aspeed-scu-ic.h<br/>index f315d5a7f5ee..7dd04424afcc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interrupt-controller/aspeed-scu-ic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/interrupt-controller/aspeed-scu-ic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/interrupt-controller/aspeed-scu-ic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/interrupt-controller/aspeed-scu-ic.h</a></div><div class='hunk'>@@ -20,4 +20,18 @@</div><div class='ctx'> #define ASPEED_AST2600_SCU_IC1_LPC_RESET_LO_TO_HI	0</div><div class='ctx'> #define ASPEED_AST2600_SCU_IC1_LPC_RESET_HI_TO_LO	1</div><div class='ctx'> </div><div class='add'>+#define ASPEED_AST2700_SCU_IC0_PCIE_PERST_LO_TO_HI	3</div><div class='add'>+#define ASPEED_AST2700_SCU_IC0_PCIE_PERST_HI_TO_LO	2</div><div class='add'>+</div><div class='add'>+#define ASPEED_AST2700_SCU_IC1_PCIE_RCRST_LO_TO_HI	3</div><div class='add'>+#define ASPEED_AST2700_SCU_IC1_PCIE_RCRST_HI_TO_LO	2</div><div class='add'>+</div><div class='add'>+#define ASPEED_AST2700_SCU_IC2_PCIE_PERST_LO_TO_HI	3</div><div class='add'>+#define ASPEED_AST2700_SCU_IC2_PCIE_PERST_HI_TO_LO	2</div><div class='add'>+#define ASPEED_AST2700_SCU_IC2_LPC_RESET_LO_TO_HI	1</div><div class='add'>+#define ASPEED_AST2700_SCU_IC2_LPC_RESET_HI_TO_LO	0</div><div class='add'>+</div><div class='add'>+#define ASPEED_AST2700_SCU_IC3_LPC_RESET_LO_TO_HI	1</div><div class='add'>+#define ASPEED_AST2700_SCU_IC3_LPC_RESET_HI_TO_LO	0</div><div class='add'>+</div><div class='ctx'> #endif /* _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ */</div><div class='head'>diff --git a/include/dt-bindings/leds/common.h b/include/dt-bindings/leds/common.h<br/>index 9a0d33d027ff..4f017bea0123 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/leds/common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/leds/common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/leds/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/leds/common.h</a></div><div class='hunk'>@@ -46,6 +46,7 @@</div><div class='ctx'> #define LED_FUNCTION_CAPSLOCK "capslock"</div><div class='ctx'> #define LED_FUNCTION_SCROLLLOCK "scrolllock"</div><div class='ctx'> #define LED_FUNCTION_NUMLOCK "numlock"</div><div class='add'>+#define LED_FUNCTION_FNLOCK "fnlock"</div><div class='ctx'> /*   Obsolete equivalents: "tpacpi::thinklight" (IBM/Lenovo Thinkpads),</div><div class='ctx'>      "lp5523:kb{1,2,3,4,5,6}" (Nokia N900) */</div><div class='ctx'> #define LED_FUNCTION_KBD_BACKLIGHT "kbd_backlight"</div><div class='hunk'>@@ -90,17 +91,24 @@</div><div class='ctx'> #define LED_FUNCTION_INDICATOR "indicator"</div><div class='ctx'> #define LED_FUNCTION_LAN "lan"</div><div class='ctx'> #define LED_FUNCTION_MAIL "mail"</div><div class='add'>+#define LED_FUNCTION_MOBILE "mobile"</div><div class='ctx'> #define LED_FUNCTION_MTD "mtd"</div><div class='ctx'> #define LED_FUNCTION_PANIC "panic"</div><div class='ctx'> #define LED_FUNCTION_PROGRAMMING "programming"</div><div class='ctx'> #define LED_FUNCTION_RX "rx"</div><div class='ctx'> #define LED_FUNCTION_SD "sd"</div><div class='add'>+#define LED_FUNCTION_SPEED_LAN "speed-lan"</div><div class='add'>+#define LED_FUNCTION_SPEED_WAN "speed-wan"</div><div class='ctx'> #define LED_FUNCTION_STANDBY "standby"</div><div class='ctx'> #define LED_FUNCTION_TORCH "torch"</div><div class='ctx'> #define LED_FUNCTION_TX "tx"</div><div class='ctx'> #define LED_FUNCTION_USB "usb"</div><div class='ctx'> #define LED_FUNCTION_WAN "wan"</div><div class='add'>+#define LED_FUNCTION_WAN_ONLINE "wan-online"</div><div class='ctx'> #define LED_FUNCTION_WLAN "wlan"</div><div class='add'>+#define LED_FUNCTION_WLAN_2GHZ "wlan-2ghz"</div><div class='add'>+#define LED_FUNCTION_WLAN_5GHZ "wlan-5ghz"</div><div class='add'>+#define LED_FUNCTION_WLAN_6GHZ "wlan-6ghz"</div><div class='ctx'> #define LED_FUNCTION_WPS "wps"</div><div class='ctx'> </div><div class='ctx'> #endif /* __DT_BINDINGS_LEDS_H */</div><div class='head'>diff --git a/include/dt-bindings/mailbox/qcom-ipcc.h b/include/dt-bindings/mailbox/qcom-ipcc.h<br/>index fbfa3febc66d..fd85a79381b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/mailbox/qcom-ipcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/mailbox/qcom-ipcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/mailbox/qcom-ipcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/mailbox/qcom-ipcc.h</a></div><div class='hunk'>@@ -33,5 +33,7 @@</div><div class='ctx'> #define IPCC_CLIENT_NSP1		18</div><div class='ctx'> #define IPCC_CLIENT_TME			23</div><div class='ctx'> #define IPCC_CLIENT_WPSS		24</div><div class='add'>+#define IPCC_CLIENT_GPDSP0		31</div><div class='add'>+#define IPCC_CLIENT_GPDSP1		32</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/media/c8sectpfe.h b/include/dt-bindings/media/c8sectpfe.h<br/>deleted file mode 100644<br/>index 6b1fb6f5413b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/media/c8sectpfe.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/media/c8sectpfe.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __DT_C8SECTPFE_H</div><div class='del'>-#define __DT_C8SECTPFE_H</div><div class='del'>-</div><div class='del'>-#define STV0367_TDA18212_NIMA_1	0</div><div class='del'>-#define STV0367_TDA18212_NIMA_2	1</div><div class='del'>-#define STV0367_TDA18212_NIMB_1	2</div><div class='del'>-#define STV0367_TDA18212_NIMB_2	3</div><div class='del'>-</div><div class='del'>-#define STV0903_6110_LNB24_NIMA	4</div><div class='del'>-#define STV0903_6110_LNB24_NIMB	5</div><div class='del'>-</div><div class='del'>-#endif /* __DT_C8SECTPFE_H */</div><div class='head'>diff --git a/include/dt-bindings/media/tvp5150.h b/include/dt-bindings/media/tvp5150.h<br/>index dda00c038530..ba34c420c303 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/media/tvp5150.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/media/tvp5150.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/media/tvp5150.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/media/tvp5150.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>     tvp5150.h - definition for tvp5150 inputs</div><div class='ctx'> </div><div class='del'>-    Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl)</div><div class='add'>+    Copyright (C) 2006 Hans Verkuil (hverkuil@kernel.org)</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='head'>diff --git a/include/dt-bindings/media/video-interfaces.h b/include/dt-bindings/media/video-interfaces.h<br/>index 68ac4e05e37f..0b19c9b2e627 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/media/video-interfaces.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/media/video-interfaces.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/media/video-interfaces.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/media/video-interfaces.h</a></div><div class='hunk'>@@ -13,4 +13,15 @@</div><div class='ctx'> #define MEDIA_BUS_TYPE_PARALLEL			5</div><div class='ctx'> #define MEDIA_BUS_TYPE_BT656			6</div><div class='ctx'> </div><div class='add'>+#define MEDIA_BUS_CSI2_CPHY_LINE_ORDER_ABC	0</div><div class='add'>+#define MEDIA_BUS_CSI2_CPHY_LINE_ORDER_ACB	1</div><div class='add'>+#define MEDIA_BUS_CSI2_CPHY_LINE_ORDER_BAC	2</div><div class='add'>+#define MEDIA_BUS_CSI2_CPHY_LINE_ORDER_BCA	3</div><div class='add'>+#define MEDIA_BUS_CSI2_CPHY_LINE_ORDER_CAB	4</div><div class='add'>+#define MEDIA_BUS_CSI2_CPHY_LINE_ORDER_CBA	5</div><div class='add'>+</div><div class='add'>+#define MEDIA_PCLK_SAMPLE_FALLING_EDGE		0</div><div class='add'>+#define MEDIA_PCLK_SAMPLE_RISING_EDGE		1</div><div class='add'>+#define MEDIA_PCLK_SAMPLE_DUAL_EDGE		2</div><div class='add'>+</div><div class='ctx'> #endif /* __DT_BINDINGS_MEDIA_VIDEO_INTERFACES_H__ */</div><div class='head'>diff --git a/include/dt-bindings/memory/mediatek,mt6893-memory-port.h b/include/dt-bindings/memory/mediatek,mt6893-memory-port.h<br/>new file mode 100644<br/>index 000000000000..26e8b400db0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/memory/mediatek,mt6893-memory-port.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/memory/mediatek,mt6893-memory-port.h</a></div><div class='hunk'>@@ -0,0 +1,288 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2020 MediaTek Inc.</div><div class='add'>+ * Copyright (c) 2025 Collabora Ltd</div><div class='add'>+ *                    AngeloGioacchino Del Regno &lt;angelogioacchino.delregno@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _DT_BINDINGS_MEMORY_MT6893_LARB_PORT_H_</div><div class='add'>+#define _DT_BINDINGS_MEMORY_MT6893_LARB_PORT_H_</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/memory/mtk-memory-port.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MM IOMMU supports 16GB dma address.</div><div class='add'>+ *</div><div class='add'>+ * The address will preassign like this:</div><div class='add'>+ *</div><div class='add'>+ * modules    dma-address-region	larbs-ports</div><div class='add'>+ * disp         0 ~ 4G                  larb0/2</div><div class='add'>+ * vcodec      4G ~ 8G                  larb4/5/7</div><div class='add'>+ * cam/mdp     8G ~ 12G                 larb9/11/13/14/16/17/18/19/20</div><div class='add'>+ * CCU0    0x4000_0000 ~ 0x43ff_ffff    larb13: port 9/10</div><div class='add'>+ * CCU1    0x4400_0000 ~ 0x47ff_ffff    larb14: port 4/5</div><div class='add'>+ *</div><div class='add'>+ * larb3/6/8/10/12/15 are null.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* larb0 */</div><div class='add'>+#define M4U_PORT_L0_DISP_POSTMASK0		MTK_M4U_DOM_ID(0, 0)</div><div class='add'>+#define M4U_PORT_L0_MDP_RDMA4			MTK_M4U_DOM_ID(0, 1)</div><div class='add'>+#define M4U_PORT_L0_OVL_RDMA0_HDR		MTK_M4U_DOM_ID(0, 2)</div><div class='add'>+#define M4U_PORT_L0_OVL_2L_RDMA1_HDR		MTK_M4U_DOM_ID(0, 3)</div><div class='add'>+#define M4U_PORT_L0_OVL_2L_RDMA3_HDR		MTK_M4U_DOM_ID(0, 4)</div><div class='add'>+#define M4U_PORT_L0_OVL_RDMA0			MTK_M4U_DOM_ID(0, 5)</div><div class='add'>+#define M4U_PORT_L0_OVL_2L_RDMA1		MTK_M4U_DOM_ID(0, 6)</div><div class='add'>+#define M4U_PORT_L0_OVL_2L_RDMA3		MTK_M4U_DOM_ID(0, 7)</div><div class='add'>+#define M4U_PORT_L0_OVL_RDMA1_SYSRAM		MTK_M4U_DOM_ID(0, 8)</div><div class='add'>+#define M4U_PORT_L0_OVL_2L_RDMA0_SYSRAM		MTK_M4U_DOM_ID(0, 9)</div><div class='add'>+#define M4U_PORT_L0_OVL_2L_RDMA2_SYSRAM		MTK_M4U_DOM_ID(0, 10)</div><div class='add'>+#define M4U_PORT_L0_DISP_WDMA0			MTK_M4U_DOM_ID(0, 11)</div><div class='add'>+#define M4U_PORT_L0_DISP_RDMA0			MTK_M4U_DOM_ID(0, 12)</div><div class='add'>+#define M4U_PORT_L0_DISP_UFBC_WDMA0		MTK_M4U_DOM_ID(0, 13)</div><div class='add'>+#define M4U_PORT_L0_DISP_FAKE0			MTK_M4U_DOM_ID(0, 14)</div><div class='add'>+</div><div class='add'>+/* larb1 */</div><div class='add'>+#define M4U_PORT_L1_DISP_POSTMASK1		MTK_M4U_DOM_ID(1, 0)</div><div class='add'>+#define M4U_PORT_L1_MDP_RDMA5			MTK_M4U_DOM_ID(1, 1)</div><div class='add'>+#define M4U_PORT_L1_OVL_RDMA1_HDR		MTK_M4U_DOM_ID(1, 2)</div><div class='add'>+#define M4U_PORT_L1_OVL_2L_RDMA0_HDR		MTK_M4U_DOM_ID(1, 3)</div><div class='add'>+#define M4U_PORT_L1_OVL_2L_RDMA2_HDR		MTK_M4U_DOM_ID(1, 4)</div><div class='add'>+#define M4U_PORT_L1_OVL_RDMA1			MTK_M4U_DOM_ID(1, 5)</div><div class='add'>+#define M4U_PORT_L1_OVL_2L_RDMA0		MTK_M4U_DOM_ID(1, 6)</div><div class='add'>+#define M4U_PORT_L1_OVL_2L_RDMA2		MTK_M4U_DOM_ID(1, 7)</div><div class='add'>+#define M4U_PORT_L1_OVL_RDMA0_SYSRAM		MTK_M4U_DOM_ID(1, 8)</div><div class='add'>+#define M4U_PORT_L1_OVL_2L_RDMA1_SYSRAM		MTK_M4U_DOM_ID(1, 9)</div><div class='add'>+#define M4U_PORT_L1_OVL_2L_RDMA3_SYSRAM		MTK_M4U_DOM_ID(1, 10)</div><div class='add'>+#define M4U_PORT_L1_DISP_WDMA1			MTK_M4U_DOM_ID(1, 11)</div><div class='add'>+#define M4U_PORT_L1_DISP_RDMA1			MTK_M4U_DOM_ID(1, 12)</div><div class='add'>+#define M4U_PORT_L1_DISP_UFBC_WDMA1		MTK_M4U_DOM_ID(1, 13)</div><div class='add'>+#define M4U_PORT_L1_DISP_FAKE1			MTK_M4U_DOM_ID(1, 14)</div><div class='add'>+</div><div class='add'>+/* larb2 */</div><div class='add'>+#define M4U_PORT_L2_MDP_RDMA0			MTK_M4U_DOM_ID(2, 0)</div><div class='add'>+#define M4U_PORT_L2_MDP_RDMA2			MTK_M4U_DOM_ID(2, 1)</div><div class='add'>+#define M4U_PORT_L2_MDP_WROT0			MTK_M4U_DOM_ID(2, 2)</div><div class='add'>+#define M4U_PORT_L2_MDP_WROT2			MTK_M4U_DOM_ID(2, 3)</div><div class='add'>+#define M4U_PORT_L2_MDP_FILMGRAIN0		MTK_M4U_DOM_ID(2, 4)</div><div class='add'>+#define M4U_PORT_L2_MDP_FAKE0			MTK_M4U_DOM_ID(2, 5)</div><div class='add'>+</div><div class='add'>+/* larb3: null */</div><div class='add'>+</div><div class='add'>+/* larb4 */</div><div class='add'>+#define M4U_PORT_L4_VDEC_MC_EXT_MDP		MTK_M4U_DOM_ID(4, 0)</div><div class='add'>+#define M4U_PORT_L4_VDEC_UFO_EXT_MDP		MTK_M4U_DOM_ID(4, 1)</div><div class='add'>+#define M4U_PORT_L4_VDEC_PP_EXT_MDP		MTK_M4U_DOM_ID(4, 2)</div><div class='add'>+#define M4U_PORT_L4_VDEC_PRED_RD_EXT_MDP	MTK_M4U_DOM_ID(4, 3)</div><div class='add'>+#define M4U_PORT_L4_VDEC_PRED_WR_EXT_MDP	MTK_M4U_DOM_ID(4, 4)</div><div class='add'>+#define M4U_PORT_L4_VDEC_PPWRAP_EXT_MDP		MTK_M4U_DOM_ID(4, 5)</div><div class='add'>+#define M4U_PORT_L4_VDEC_TILE_EXT_MDP		MTK_M4U_DOM_ID(4, 6)</div><div class='add'>+#define M4U_PORT_L4_VDEC_VLD_EXT_MDP		MTK_M4U_DOM_ID(4, 7)</div><div class='add'>+#define M4U_PORT_L4_VDEC_VLD2_EXT_MDP		MTK_M4U_DOM_ID(4, 8)</div><div class='add'>+#define M4U_PORT_L4_VDEC_AVC_MV_EXT_MDP		MTK_M4U_DOM_ID(4, 9)</div><div class='add'>+#define M4U_PORT_L4_VDEC_RG_CTRL_DMA_EXT_MDP	MTK_M4U_DOM_ID(4, 10)</div><div class='add'>+</div><div class='add'>+/* larb5 */</div><div class='add'>+#define M4U_PORT_L5_VDEC_LAT0_VLD_EXT_DISP	MTK_M4U_DOM_ID(5, 0)</div><div class='add'>+#define M4U_PORT_L5_VDEC_LAT0_VLD2_EXT_DISP	MTK_M4U_DOM_ID(5, 1)</div><div class='add'>+#define M4U_PORT_L5_VDEC_LAT0_AVC_MV_EXT_DISP	MTK_M4U_DOM_ID(5, 2)</div><div class='add'>+#define M4U_PORT_L5_VDEC_LAT0_PRED_RD_EXT_DISP	MTK_M4U_DOM_ID(5, 3)</div><div class='add'>+#define M4U_PORT_L5_VDEC_LAT0_TILE_EXT_DISP	MTK_M4U_DOM_ID(5, 4)</div><div class='add'>+#define M4U_PORT_L5_VDEC_LAT0_WDMA_EXT_DISP	MTK_M4U_DOM_ID(5, 5)</div><div class='add'>+#define M4U_PORT_L5_VDEC_LAT0_RG_CTRL_DMA_EXT_DISP MTK_M4U_DOM_ID(5, 6)</div><div class='add'>+#define M4U_PORT_L5_VDEC_UFO_ENC_EXT_DISP	MTK_M4U_DOM_ID(5, 7)</div><div class='add'>+</div><div class='add'>+/* larb6: null */</div><div class='add'>+</div><div class='add'>+/* larb7 */</div><div class='add'>+#define M4U_PORT_L7_VENC_RCPU_DISP		MTK_M4U_DOM_ID(7, 0)</div><div class='add'>+#define M4U_PORT_L7_VENC_REC_DISP		MTK_M4U_DOM_ID(7, 1)</div><div class='add'>+#define M4U_PORT_L7_VENC_BSDMA_DISP		MTK_M4U_DOM_ID(7, 2)</div><div class='add'>+#define M4U_PORT_L7_VENC_SV_COMV_DISP		MTK_M4U_DOM_ID(7, 3)</div><div class='add'>+#define M4U_PORT_L7_VENC_RD_COMV_DISP		MTK_M4U_DOM_ID(7, 4)</div><div class='add'>+#define M4U_PORT_L7_VENC_NBM_RDMA_DISP		MTK_M4U_DOM_ID(7, 5)</div><div class='add'>+#define M4U_PORT_L7_VENC_NBM_RDMA_LITE_DISP	MTK_M4U_DOM_ID(7, 6)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_Y_RDMA_DISP		MTK_M4U_DOM_ID(7, 7)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_C_RDMA_DISP		MTK_M4U_DOM_ID(7, 8)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_Q_TABLE_DISP		MTK_M4U_DOM_ID(7, 9)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_BSDMA_DISP		MTK_M4U_DOM_ID(7, 10)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_WDMA0_DISP		MTK_M4U_DOM_ID(7, 11)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_BSDMA0_DISP		MTK_M4U_DOM_ID(7, 12)</div><div class='add'>+#define M4U_PORT_L7_VENC_NBM_WDMA_DISP		MTK_M4U_DOM_ID(7, 13)</div><div class='add'>+#define M4U_PORT_L7_VENC_NBM_WDMA_LITE_DISP	MTK_M4U_DOM_ID(7, 14)</div><div class='add'>+#define M4U_PORT_L7_VENC_CUR_LUMA_DISP		MTK_M4U_DOM_ID(7, 15)</div><div class='add'>+#define M4U_PORT_L7_VENC_CUR_CHROMA_DISP	MTK_M4U_DOM_ID(7, 16)</div><div class='add'>+#define M4U_PORT_L7_VENC_REF_LUMA_DISP		MTK_M4U_DOM_ID(7, 17)</div><div class='add'>+#define M4U_PORT_L7_VENC_REF_CHROMA_DISP	MTK_M4U_DOM_ID(7, 18)</div><div class='add'>+#define M4U_PORT_L7_VENC_SUB_R_LUMA_DISP	MTK_M4U_DOM_ID(7, 19)</div><div class='add'>+#define M4U_PORT_L7_VENC_SUB_W_LUMA_DISP	MTK_M4U_DOM_ID(7, 20)</div><div class='add'>+#define M4U_PORT_L7_VENC_FCS_NBM_RDMA_DISP	MTK_M4U_DOM_ID(7, 21)</div><div class='add'>+#define M4U_PORT_L7_VENC_FCS_NBM_WDMA_DISP	MTK_M4U_DOM_ID(7, 22)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_WDMA1_DISP		MTK_M4U_DOM_ID(7, 23)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_BSDMA1_DISP		MTK_M4U_DOM_ID(7, 24)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_HUFF_OFFSET1_DISP	MTK_M4U_DOM_ID(7, 25)</div><div class='add'>+#define M4U_PORT_L7_JPGENC_HUFF_OFFSET0_DISP	MTK_M4U_DOM_ID(7, 26)</div><div class='add'>+</div><div class='add'>+/* larb8: null */</div><div class='add'>+</div><div class='add'>+/* larb9 */</div><div class='add'>+#define M4U_PORT_L9_IMG_IMGI_D1_MDP		MTK_M4U_DOM_ID(9, 0)</div><div class='add'>+#define M4U_PORT_L9_IMG_IMGBI_D1_MDP		MTK_M4U_DOM_ID(9, 1)</div><div class='add'>+#define M4U_PORT_L9_IMG_DMGI_D1_MDP		MTK_M4U_DOM_ID(9, 2)</div><div class='add'>+#define M4U_PORT_L9_IMG_DEPI_D1_MDP		MTK_M4U_DOM_ID(9, 3)</div><div class='add'>+#define M4U_PORT_L9_IMG_ICE_D1_MDP		MTK_M4U_DOM_ID(9, 4)</div><div class='add'>+#define M4U_PORT_L9_IMG_SMTI_D1_MDP		MTK_M4U_DOM_ID(9, 5)</div><div class='add'>+#define M4U_PORT_L9_IMG_SMTO_D2_MDP		MTK_M4U_DOM_ID(9, 6)</div><div class='add'>+#define M4U_PORT_L9_IMG_SMTO_D1_MDP		MTK_M4U_DOM_ID(9, 7)</div><div class='add'>+#define M4U_PORT_L9_IMG_CRZO_D1_MDP		MTK_M4U_DOM_ID(9, 8)</div><div class='add'>+#define M4U_PORT_L9_IMG_IMG3O_D1_MDP		MTK_M4U_DOM_ID(9, 9)</div><div class='add'>+#define M4U_PORT_L9_IMG_VIPI_D1_MDP		MTK_M4U_DOM_ID(9, 10)</div><div class='add'>+#define M4U_PORT_L9_IMG_SMTI_D5_MDP		MTK_M4U_DOM_ID(9, 11)</div><div class='add'>+#define M4U_PORT_L9_IMG_TIMGO_D1_MDP		MTK_M4U_DOM_ID(9, 12)</div><div class='add'>+#define M4U_PORT_L9_IMG_UFBC_W0_MDP		MTK_M4U_DOM_ID(9, 13)</div><div class='add'>+#define M4U_PORT_L9_IMG_UFBC_R0_MDP		MTK_M4U_DOM_ID(9, 14)</div><div class='add'>+#define M4U_PORT_L9_IMG_WPE_RDMA1_MDP		MTK_M4U_DOM_ID(9, 15)</div><div class='add'>+#define M4U_PORT_L9_IMG_WPE_RDMA0_MDP		MTK_M4U_DOM_ID(9, 16)</div><div class='add'>+#define M4U_PORT_L9_IMG_WPE_WDMA_MDP		MTK_M4U_DOM_ID(9, 17)</div><div class='add'>+#define M4U_PORT_L9_IMG_MFB_RDMA0_MDP		MTK_M4U_DOM_ID(9, 18)</div><div class='add'>+#define M4U_PORT_L9_IMG_MFB_RDMA1_MDP		MTK_M4U_DOM_ID(9, 19)</div><div class='add'>+#define M4U_PORT_L9_IMG_MFB_RDMA2_MDP		MTK_M4U_DOM_ID(9, 20)</div><div class='add'>+#define M4U_PORT_L9_IMG_MFB_RDMA3_MDP		MTK_M4U_DOM_ID(9, 21)</div><div class='add'>+#define M4U_PORT_L9_IMG_MFB_RDMA4_MDP		MTK_M4U_DOM_ID(9, 22)</div><div class='add'>+#define M4U_PORT_L9_IMG_MFB_RDMA5_MDP		MTK_M4U_DOM_ID(9, 23)</div><div class='add'>+#define M4U_PORT_L9_IMG_MFB_WDMA0_MDP		MTK_M4U_DOM_ID(9, 24)</div><div class='add'>+#define M4U_PORT_L9_IMG_MFB_WDMA1_MDP		MTK_M4U_DOM_ID(9, 25)</div><div class='add'>+#define M4U_PORT_L9_IMG_RESERVE6_MDP		MTK_M4U_DOM_ID(9, 26)</div><div class='add'>+#define M4U_PORT_L9_IMG_RESERVE7_MDP		MTK_M4U_DOM_ID(9, 27)</div><div class='add'>+#define M4U_PORT_L9_IMG_RESERVE8_MDP		MTK_M4U_DOM_ID(9, 28)</div><div class='add'>+</div><div class='add'>+/* larb10: null */</div><div class='add'>+</div><div class='add'>+/* larb11 */</div><div class='add'>+#define M4U_PORT_L11_IMG_IMGI_D1_DISP		MTK_M4U_DOM_ID(11, 0)</div><div class='add'>+#define M4U_PORT_L11_IMG_IMGBI_D1_DISP		MTK_M4U_DOM_ID(11, 1)</div><div class='add'>+#define M4U_PORT_L11_IMG_DMGI_D1_DISP		MTK_M4U_DOM_ID(11, 2)</div><div class='add'>+#define M4U_PORT_L11_IMG_DEPI_D1_DISP		MTK_M4U_DOM_ID(11, 3)</div><div class='add'>+#define M4U_PORT_L11_IMG_ICE_D1_DISP		MTK_M4U_DOM_ID(11, 4)</div><div class='add'>+#define M4U_PORT_L11_IMG_SMTI_D1_DISP		MTK_M4U_DOM_ID(11, 5)</div><div class='add'>+#define M4U_PORT_L11_IMG_SMTO_D2_DISP		MTK_M4U_DOM_ID(11, 6)</div><div class='add'>+#define M4U_PORT_L11_IMG_SMTO_D1_DISP		MTK_M4U_DOM_ID(11, 7)</div><div class='add'>+#define M4U_PORT_L11_IMG_CRZO_D1_DISP		MTK_M4U_DOM_ID(11, 8)</div><div class='add'>+#define M4U_PORT_L11_IMG_IMG3O_D1_DISP		MTK_M4U_DOM_ID(11, 9)</div><div class='add'>+#define M4U_PORT_L11_IMG_VIPI_D1_DISP		MTK_M4U_DOM_ID(11, 10)</div><div class='add'>+#define M4U_PORT_L11_IMG_SMTI_D5_DISP		MTK_M4U_DOM_ID(11, 11)</div><div class='add'>+#define M4U_PORT_L11_IMG_TIMGO_D1_DISP		MTK_M4U_DOM_ID(11, 12)</div><div class='add'>+#define M4U_PORT_L11_IMG_UFBC_W0_DISP		MTK_M4U_DOM_ID(11, 13)</div><div class='add'>+#define M4U_PORT_L11_IMG_UFBC_R0_DISP		MTK_M4U_DOM_ID(11, 14)</div><div class='add'>+#define M4U_PORT_L11_IMG_WPE_RDMA1_DISP		MTK_M4U_DOM_ID(11, 15)</div><div class='add'>+#define M4U_PORT_L11_IMG_WPE_RDMA0_DISP		MTK_M4U_DOM_ID(11, 16)</div><div class='add'>+#define M4U_PORT_L11_IMG_WPE_WDMA_DISP		MTK_M4U_DOM_ID(11, 17)</div><div class='add'>+#define M4U_PORT_L11_IMG_MFB_RDMA0_DISP		MTK_M4U_DOM_ID(11, 18)</div><div class='add'>+#define M4U_PORT_L11_IMG_MFB_RDMA1_DISP		MTK_M4U_DOM_ID(11, 19)</div><div class='add'>+#define M4U_PORT_L11_IMG_MFB_RDMA2_DISP		MTK_M4U_DOM_ID(11, 20)</div><div class='add'>+#define M4U_PORT_L11_IMG_MFB_RDMA3_DISP		MTK_M4U_DOM_ID(11, 21)</div><div class='add'>+#define M4U_PORT_L11_IMG_MFB_RDMA4_DISP		MTK_M4U_DOM_ID(11, 22)</div><div class='add'>+#define M4U_PORT_L11_IMG_MFB_RDMA5_DISP		MTK_M4U_DOM_ID(11, 23)</div><div class='add'>+#define M4U_PORT_L11_IMG_MFB_WDMA0_DISP		MTK_M4U_DOM_ID(11, 24)</div><div class='add'>+#define M4U_PORT_L11_IMG_MFB_WDMA1_DISP		MTK_M4U_DOM_ID(11, 25)</div><div class='add'>+#define M4U_PORT_L11_IMG_RESERVE6_DISP		MTK_M4U_DOM_ID(11, 26)</div><div class='add'>+#define M4U_PORT_L11_IMG_RESERVE7_DISP		MTK_M4U_DOM_ID(11, 27)</div><div class='add'>+#define M4U_PORT_L11_IMG_RESERVE8_DISP		MTK_M4U_DOM_ID(11, 28)</div><div class='add'>+</div><div class='add'>+/* larb12: null */</div><div class='add'>+</div><div class='add'>+/* larb13 */</div><div class='add'>+#define M4U_PORT_L13_CAM_MRAWI_MDP		MTK_M4U_DOM_ID(13, 0)</div><div class='add'>+#define M4U_PORT_L13_CAM_MRAWO0_MDP		MTK_M4U_DOM_ID(13, 1)</div><div class='add'>+#define M4U_PORT_L13_CAM_MRAWO1_MDP		MTK_M4U_DOM_ID(13, 2)</div><div class='add'>+#define M4U_PORT_L13_CAM_CAMSV1_MDP		MTK_M4U_DOM_ID(13, 3)</div><div class='add'>+#define M4U_PORT_L13_CAM_CAMSV2_MDP		MTK_M4U_DOM_ID(13, 4)</div><div class='add'>+#define M4U_PORT_L13_CAM_CAMSV3_MDP		MTK_M4U_DOM_ID(13, 5)</div><div class='add'>+#define M4U_PORT_L13_CAM_CAMSV4_MDP		MTK_M4U_DOM_ID(13, 6)</div><div class='add'>+#define M4U_PORT_L13_CAM_CAMSV5_MDP		MTK_M4U_DOM_ID(13, 7)</div><div class='add'>+#define M4U_PORT_L13_CAM_CAMSV6_MDP		MTK_M4U_DOM_ID(13, 8)</div><div class='add'>+#define M4U_PORT_L13_CAM_CCUI_MDP		MTK_M4U_DOM_ID(13, 9)</div><div class='add'>+#define M4U_PORT_L13_CAM_CCUO_MDP		MTK_M4U_DOM_ID(13, 10)</div><div class='add'>+#define M4U_PORT_L13_CAM_FAKE_MDP		MTK_M4U_DOM_ID(13, 11)</div><div class='add'>+</div><div class='add'>+/* larb14 */</div><div class='add'>+#define M4U_PORT_L14_CAM_MRAWI_DISP		MTK_M4U_DOM_ID(14, 0)</div><div class='add'>+#define M4U_PORT_L14_CAM_MRAWO0_DISP		MTK_M4U_DOM_ID(14, 1)</div><div class='add'>+#define M4U_PORT_L14_CAM_MRAWO1_DISP		MTK_M4U_DOM_ID(14, 2)</div><div class='add'>+#define M4U_PORT_L14_CAM_CAMSV0_DISP		MTK_M4U_DOM_ID(14, 3)</div><div class='add'>+#define M4U_PORT_L14_CAM_CCUI_DISP		MTK_M4U_DOM_ID(14, 4)</div><div class='add'>+#define M4U_PORT_L14_CAM_CCUO_DISP		MTK_M4U_DOM_ID(14, 5)</div><div class='add'>+</div><div class='add'>+/* larb15: null */</div><div class='add'>+</div><div class='add'>+/* larb16 */</div><div class='add'>+#define M4U_PORT_L16_CAM_IMGO_R1_A_MDP		MTK_M4U_DOM_ID(16, 0)</div><div class='add'>+#define M4U_PORT_L16_CAM_RRZO_R1_A_MDP		MTK_M4U_DOM_ID(16, 1)</div><div class='add'>+#define M4U_PORT_L16_CAM_CQI_R1_A_MDP		MTK_M4U_DOM_ID(16, 2)</div><div class='add'>+#define M4U_PORT_L16_CAM_BPCI_R1_A_MDP		MTK_M4U_DOM_ID(16, 3)</div><div class='add'>+#define M4U_PORT_L16_CAM_YUVO_R1_A_MDP		MTK_M4U_DOM_ID(16, 4)</div><div class='add'>+#define M4U_PORT_L16_CAM_UFDI_R2_A_MDP		MTK_M4U_DOM_ID(16, 5)</div><div class='add'>+#define M4U_PORT_L16_CAM_RAWI_R2_A_MDP		MTK_M4U_DOM_ID(16, 6)</div><div class='add'>+#define M4U_PORT_L16_CAM_RAWI_R3_A_MDP		MTK_M4U_DOM_ID(16, 7)</div><div class='add'>+#define M4U_PORT_L16_CAM_AAO_R1_A_MDP		MTK_M4U_DOM_ID(16, 8)</div><div class='add'>+#define M4U_PORT_L16_CAM_AFO_R1_A_MDP		MTK_M4U_DOM_ID(16, 9)</div><div class='add'>+#define M4U_PORT_L16_CAM_FLKO_R1_A_MDP		MTK_M4U_DOM_ID(16, 10)</div><div class='add'>+#define M4U_PORT_L16_CAM_LCESO_R1_A_MDP		MTK_M4U_DOM_ID(16, 11)</div><div class='add'>+#define M4U_PORT_L16_CAM_CRZO_R1_A_MDP		MTK_M4U_DOM_ID(16, 12)</div><div class='add'>+#define M4U_PORT_L16_CAM_LTMSO_R1_A_MDP		MTK_M4U_DOM_ID(16, 13)</div><div class='add'>+#define M4U_PORT_L16_CAM_RSSO_R1_A_MDP		MTK_M4U_DOM_ID(16, 14)</div><div class='add'>+#define M4U_PORT_L16_CAM_AAHO_R1_A_MDP		MTK_M4U_DOM_ID(16, 15)</div><div class='add'>+#define M4U_PORT_L16_CAM_LSCI_R1_A_MDP		MTK_M4U_DOM_ID(16, 16)</div><div class='add'>+</div><div class='add'>+/* larb17 */</div><div class='add'>+#define M4U_PORT_L17_CAM_IMGO_R1_B_DISP		MTK_M4U_DOM_ID(17, 0)</div><div class='add'>+#define M4U_PORT_L17_CAM_RRZO_R1_B_DISP		MTK_M4U_DOM_ID(17, 1)</div><div class='add'>+#define M4U_PORT_L17_CAM_CQI_R1_B_DISP		MTK_M4U_DOM_ID(17, 2)</div><div class='add'>+#define M4U_PORT_L17_CAM_BPCI_R1_B_DISP		MTK_M4U_DOM_ID(17, 3)</div><div class='add'>+#define M4U_PORT_L17_CAM_YUVO_R1_B_DISP		MTK_M4U_DOM_ID(17, 4)</div><div class='add'>+#define M4U_PORT_L17_CAM_UFDI_R2_B_DISP		MTK_M4U_DOM_ID(17, 5)</div><div class='add'>+#define M4U_PORT_L17_CAM_RAWI_R2_B_DISP		MTK_M4U_DOM_ID(17, 6)</div><div class='add'>+#define M4U_PORT_L17_CAM_RAWI_R3_B_DISP		MTK_M4U_DOM_ID(17, 7)</div><div class='add'>+#define M4U_PORT_L17_CAM_AAO_R1_B_DISP		MTK_M4U_DOM_ID(17, 8)</div><div class='add'>+#define M4U_PORT_L17_CAM_AFO_R1_B_DISP		MTK_M4U_DOM_ID(17, 9)</div><div class='add'>+#define M4U_PORT_L17_CAM_FLKO_R1_B_DISP		MTK_M4U_DOM_ID(17, 10)</div><div class='add'>+#define M4U_PORT_L17_CAM_LCESO_R1_B_DISP	MTK_M4U_DOM_ID(17, 11)</div><div class='add'>+#define M4U_PORT_L17_CAM_CRZO_R1_B_DISP		MTK_M4U_DOM_ID(17, 12)</div><div class='add'>+#define M4U_PORT_L17_CAM_LTMSO_R1_B_DISP	MTK_M4U_DOM_ID(17, 13)</div><div class='add'>+#define M4U_PORT_L17_CAM_RSSO_R1_B_DISP		MTK_M4U_DOM_ID(17, 14)</div><div class='add'>+#define M4U_PORT_L17_CAM_AAHO_R1_B_DISP		MTK_M4U_DOM_ID(17, 15)</div><div class='add'>+#define M4U_PORT_L17_CAM_LSCI_R1_B_DISP		MTK_M4U_DOM_ID(17, 16)</div><div class='add'>+</div><div class='add'>+/* larb18 */</div><div class='add'>+#define M4U_PORT_L18_CAM_IMGO_R1_C_MDP		MTK_M4U_DOM_ID(18, 0)</div><div class='add'>+#define M4U_PORT_L18_CAM_RRZO_R1_C_MDP		MTK_M4U_DOM_ID(18, 1)</div><div class='add'>+#define M4U_PORT_L18_CAM_CQI_R1_C_MDP		MTK_M4U_DOM_ID(18, 2)</div><div class='add'>+#define M4U_PORT_L18_CAM_BPCI_R1_C_MDP		MTK_M4U_DOM_ID(18, 3)</div><div class='add'>+#define M4U_PORT_L18_CAM_YUVO_R1_C_MDP		MTK_M4U_DOM_ID(18, 4)</div><div class='add'>+#define M4U_PORT_L18_CAM_UFDI_R2_C_MDP		MTK_M4U_DOM_ID(18, 5)</div><div class='add'>+#define M4U_PORT_L18_CAM_RAWI_R2_C_MDP		MTK_M4U_DOM_ID(18, 6)</div><div class='add'>+#define M4U_PORT_L18_CAM_RAWI_R3_C_MDP		MTK_M4U_DOM_ID(18, 7)</div><div class='add'>+#define M4U_PORT_L18_CAM_AAO_R1_C_MDP		MTK_M4U_DOM_ID(18, 8)</div><div class='add'>+#define M4U_PORT_L18_CAM_AFO_R1_C_MDP		MTK_M4U_DOM_ID(18, 9)</div><div class='add'>+#define M4U_PORT_L18_CAM_FLKO_R1_C_MDP		MTK_M4U_DOM_ID(18, 10)</div><div class='add'>+#define M4U_PORT_L18_CAM_LCESO_R1_C_MDP		MTK_M4U_DOM_ID(18, 11)</div><div class='add'>+#define M4U_PORT_L18_CAM_CRZO_R1_C_MDP		MTK_M4U_DOM_ID(18, 12)</div><div class='add'>+#define M4U_PORT_L18_CAM_LTMSO_R1_C_MDP		MTK_M4U_DOM_ID(18, 13)</div><div class='add'>+#define M4U_PORT_L18_CAM_RSSO_R1_C_MDP		MTK_M4U_DOM_ID(18, 14)</div><div class='add'>+#define M4U_PORT_L18_CAM_AAHO_R1_C_MDP		MTK_M4U_DOM_ID(18, 15)</div><div class='add'>+#define M4U_PORT_L18_CAM_LSCI_R1_C_MDP		MTK_M4U_DOM_ID(18, 16)</div><div class='add'>+</div><div class='add'>+/* larb19 */</div><div class='add'>+#define M4U_PORT_L19_IPE_DVS_RDMA_DISP		MTK_M4U_DOM_ID(19, 0)</div><div class='add'>+#define M4U_PORT_L19_IPE_DVS_WDMA_DISP		MTK_M4U_DOM_ID(19, 1)</div><div class='add'>+#define M4U_PORT_L19_IPE_DVP_RDMA_DISP		MTK_M4U_DOM_ID(19, 2)</div><div class='add'>+#define M4U_PORT_L19_IPE_DVP_WDMA_DISP		MTK_M4U_DOM_ID(19, 3)</div><div class='add'>+</div><div class='add'>+/* larb20 */</div><div class='add'>+#define M4U_PORT_L20_IPE_FDVT_RDA_DISP		MTK_M4U_DOM_ID(20, 0)</div><div class='add'>+#define M4U_PORT_L20_IPE_FDVT_RDB_DISP		MTK_M4U_DOM_ID(20, 1)</div><div class='add'>+#define M4U_PORT_L20_IPE_FDVT_WRA_DISP		MTK_M4U_DOM_ID(20, 2)</div><div class='add'>+#define M4U_PORT_L20_IPE_FDVT_WRB_DISP		MTK_M4U_DOM_ID(20, 3)</div><div class='add'>+#define M4U_PORT_L20_IPE_RSC_RDMA0_DISP		MTK_M4U_DOM_ID(20, 4)</div><div class='add'>+#define M4U_PORT_L20_IPE_RSC_WDMA_DISP		MTK_M4U_DOM_ID(20, 5)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/memory/mediatek,mt8189-memory-port.h b/include/dt-bindings/memory/mediatek,mt8189-memory-port.h<br/>new file mode 100644<br/>index 000000000000..849fead3d0f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/memory/mediatek,mt8189-memory-port.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/memory/mediatek,mt8189-memory-port.h</a></div><div class='hunk'>@@ -0,0 +1,283 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 MediaTek Inc.</div><div class='add'>+ * Author: Zhengnan chen &lt;zhengnan.chen@mediatek.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _DT_BINDINGS_MEMORY_MEDIATEK_MT8189_MEMORY_PORT_H_</div><div class='add'>+#define _DT_BINDINGS_MEMORY_MEDIATEK_MT8189_MEMORY_PORT_H_</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/memory/mtk-memory-port.h&gt;</div><div class='add'>+</div><div class='add'>+#define SMI_L0_ID		(0)</div><div class='add'>+#define SMI_L1_ID		(1)</div><div class='add'>+#define SMI_L2_ID		(2)</div><div class='add'>+#define SMI_L4_ID		(3)</div><div class='add'>+#define SMI_L7_ID		(4)</div><div class='add'>+#define SMI_L9_ID		(5)</div><div class='add'>+#define SMI_L11_ID		(6)</div><div class='add'>+#define SMI_L13_ID		(7)</div><div class='add'>+#define SMI_L14_ID		(8)</div><div class='add'>+#define SMI_L16_ID		(9)</div><div class='add'>+#define SMI_L17_ID		(10)</div><div class='add'>+#define SMI_L19_ID		(11)</div><div class='add'>+#define SMI_L20_ID		(12)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MM IOMMU supports 16GB dma address. We separate it to four ranges:</div><div class='add'>+ * 0 ~ 4G; 4G ~ 8G; 8G ~ 12G; 12G ~ 16G, we could adjust these masters</div><div class='add'>+ * locate in anyone region. BUT:</div><div class='add'>+ * a) Make sure all the ports inside a larb are in one range.</div><div class='add'>+ * b) The iova of any master can NOT cross the 4G/8G/12G boundary.</div><div class='add'>+ *</div><div class='add'>+ * This is the suggested mapping in this SoC:</div><div class='add'>+ *</div><div class='add'>+ * modules		dma-address-region	larbs-ports</div><div class='add'>+ * disp/mdp		0 ~ 4G			larb0/1/2</div><div class='add'>+ * vcodec		4G ~ 8G                 larb4/7</div><div class='add'>+ * imgsys/cam/ipesys	8G ~ 12G                the other larbs.</div><div class='add'>+ * N/A			12G ~ 16G</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Larb0 -- disp */</div><div class='add'>+#define M4U_L0_P0_DISP_OVL0_4L_HDR		MTK_M4U_ID(SMI_L0_ID, 0)</div><div class='add'>+#define M4U_L0_P1_DISP_OVL0_4L_RDMA0		MTK_M4U_ID(SMI_L0_ID, 1)</div><div class='add'>+#define M4U_L0_P2_DISP_OVL1_4L_RDMA1		MTK_M4U_ID(SMI_L0_ID, 2)</div><div class='add'>+#define M4U_L0_P3_DISP_OVL0_4L_RDMA2		MTK_M4U_ID(SMI_L0_ID, 3)</div><div class='add'>+#define M4U_L0_P4_DISP_OVL1_4L_RDMA3		MTK_M4U_ID(SMI_L0_ID, 4)</div><div class='add'>+#define M4U_L0_P5_DISP_RDMA0			MTK_M4U_ID(SMI_L0_ID, 5)</div><div class='add'>+#define M4U_L0_P6_DISP_WDMA0			MTK_M4U_ID(SMI_L0_ID, 6)</div><div class='add'>+#define M4U_L0_P7_DISP_FAKE_ENG0		MTK_M4U_ID(SMI_L0_ID, 7)</div><div class='add'>+</div><div class='add'>+/* Larb1 -- disp */</div><div class='add'>+#define M4U_L1_P0_DISP_OVL1_4L_HDR		MTK_M4U_ID(SMI_L1_ID, 0)</div><div class='add'>+#define M4U_L1_P1_DISP_OVL1_4L_RDMA0		MTK_M4U_ID(SMI_L1_ID, 1)</div><div class='add'>+#define M4U_L1_P2_DISP_OVL0_4L_RDMA1		MTK_M4U_ID(SMI_L1_ID, 2)</div><div class='add'>+#define M4U_L1_P3_DISP_OVL1_4L_RDMA2		MTK_M4U_ID(SMI_L1_ID, 3)</div><div class='add'>+#define M4U_L1_P4_DISP_OVL0_4L_RDMA3		MTK_M4U_ID(SMI_L1_ID, 4)</div><div class='add'>+#define M4U_L1_P5_DISP_RDMA1			MTK_M4U_ID(SMI_L1_ID, 5)</div><div class='add'>+#define M4U_L1_P6_DISP_WDMA1			MTK_M4U_ID(SMI_L1_ID, 6)</div><div class='add'>+#define M4U_L1_P7_DISP_FAKE_ENG1		MTK_M4U_ID(SMI_L1_ID, 7)</div><div class='add'>+</div><div class='add'>+/* Larb2 -- mmlsys(mdp) */</div><div class='add'>+#define M4U_L2_P0_MDP_RDMA0			MTK_M4U_ID(SMI_L2_ID, 0)</div><div class='add'>+#define M4U_L2_P1_MDP_RDMA1			MTK_M4U_ID(SMI_L2_ID, 1)</div><div class='add'>+#define M4U_L2_P2_MDP_WROT0			MTK_M4U_ID(SMI_L2_ID, 2)</div><div class='add'>+#define M4U_L2_P3_MDP_WROT1			MTK_M4U_ID(SMI_L2_ID, 3)</div><div class='add'>+#define M4U_L2_P4_MDP_DUMMY0			MTK_M4U_ID(SMI_L2_ID, 4)</div><div class='add'>+#define M4U_L2_P5_MDP_DUMMY1			MTK_M4U_ID(SMI_L2_ID, 5)</div><div class='add'>+#define M4U_L2_P6_MDP_RDMA2			MTK_M4U_ID(SMI_L2_ID, 6)</div><div class='add'>+#define M4U_L2_P7_MDP_RDMA3			MTK_M4U_ID(SMI_L2_ID, 7)</div><div class='add'>+#define M4U_L2_P8_MDP_WROT2			MTK_M4U_ID(SMI_L2_ID, 8)</div><div class='add'>+#define M4U_L2_P9_MDP_WROT3			MTK_M4U_ID(SMI_L2_ID, 9)</div><div class='add'>+#define M4U_L2_P10_DISP_FAKE0			MTK_M4U_ID(SMI_L2_ID, 10)</div><div class='add'>+</div><div class='add'>+/* Larb3: null */</div><div class='add'>+</div><div class='add'>+/* Larb4 -- vdec */</div><div class='add'>+#define M4U_L4_P0_HW_VDEC_MC_EXT		MTK_M4U_ID(SMI_L4_ID, 0)</div><div class='add'>+#define M4U_L4_P1_HW_VDEC_UFO_EXT		MTK_M4U_ID(SMI_L4_ID, 1)</div><div class='add'>+#define M4U_L4_P2_HW_VDEC_PP_EXT		MTK_M4U_ID(SMI_L4_ID, 2)</div><div class='add'>+#define M4U_L4_P3_HW_VDEC_PRED_RD_EXT		MTK_M4U_ID(SMI_L4_ID, 3)</div><div class='add'>+#define M4U_L4_P4_HW_VDEC_PRED_WR_EXT		MTK_M4U_ID(SMI_L4_ID, 4)</div><div class='add'>+#define M4U_L4_P5_HW_VDEC_PPWRAP_EXT		MTK_M4U_ID(SMI_L4_ID, 5)</div><div class='add'>+#define M4U_L4_P6_HW_VDEC_TILE_EXT		MTK_M4U_ID(SMI_L4_ID, 6)</div><div class='add'>+#define M4U_L4_P7_HW_VDEC_VLD_EXT		MTK_M4U_ID(SMI_L4_ID, 7)</div><div class='add'>+#define M4U_L4_P8_HW_VDEC_VLD2_EXT		MTK_M4U_ID(SMI_L4_ID, 8)</div><div class='add'>+#define M4U_L4_P9_HW_VDEC_AVC_MV_EXT		MTK_M4U_ID(SMI_L4_ID, 9)</div><div class='add'>+#define M4U_L4_P10_HW_VDEC_RG_CTRL_DMA_EXT	MTK_M4U_ID(SMI_L4_ID, 10)</div><div class='add'>+#define M4U_L4_P11_HW_VDEC_UFO_ENC_EXT		MTK_M4U_ID(SMI_L4_ID, 11)</div><div class='add'>+</div><div class='add'>+/* Larb5: null */</div><div class='add'>+</div><div class='add'>+/* Larb6: null */</div><div class='add'>+</div><div class='add'>+/* Larb7 -- venc */</div><div class='add'>+#define M4U_L7_P0_VENC_RCPU			MTK_M4U_ID(SMI_L7_ID, 0)</div><div class='add'>+#define M4U_L7_P1_VENC_REC			MTK_M4U_ID(SMI_L7_ID, 1)</div><div class='add'>+#define M4U_L7_P2_VENC_BSDMA			MTK_M4U_ID(SMI_L7_ID, 2)</div><div class='add'>+#define M4U_L7_P3_VENC_SV_COMV			MTK_M4U_ID(SMI_L7_ID, 3)</div><div class='add'>+#define M4U_L7_P4_VENC_RD_COMV			MTK_M4U_ID(SMI_L7_ID, 4)</div><div class='add'>+#define M4U_L7_P5_JPGENC_Y_RDMA			MTK_M4U_ID(SMI_L7_ID, 5)</div><div class='add'>+#define M4U_L7_P6_JPGENC_C_RDMA			MTK_M4U_ID(SMI_L7_ID, 6)</div><div class='add'>+#define M4U_L7_P7_JPGENC_Q_RDMA			MTK_M4U_ID(SMI_L7_ID, 7)</div><div class='add'>+#define M4U_L7_P8_VENC_SUB_W_LUMA		MTK_M4U_ID(SMI_L7_ID, 8)</div><div class='add'>+#define M4U_L7_P9_JPGENC_BSDMA			MTK_M4U_ID(SMI_L7_ID, 9)</div><div class='add'>+#define M4U_L7_P10_VENC_CUR_LUMA		MTK_M4U_ID(SMI_L7_ID, 10)</div><div class='add'>+#define M4U_L7_P11_VENC_CUR_CHROMA		MTK_M4U_ID(SMI_L7_ID, 11)</div><div class='add'>+#define M4U_L7_P12_VENC_REF_LUMA		MTK_M4U_ID(SMI_L7_ID, 12)</div><div class='add'>+#define M4U_L7_P13_VENC_REF_CHROMA		MTK_M4U_ID(SMI_L7_ID, 13)</div><div class='add'>+#define M4U_L7_P14_VENC_SUB_R_LUMA		MTK_M4U_ID(SMI_L7_ID, 14)</div><div class='add'>+#define M4U_L7_P15_JPGDEC_WDMA			MTK_M4U_ID(SMI_L7_ID, 15)</div><div class='add'>+#define M4U_L7_P16_JPGDEC_BSDMA			MTK_M4U_ID(SMI_L7_ID, 16)</div><div class='add'>+#define M4U_L7_P17_JPGDEC_HUFF_OFFSET		MTK_M4U_ID(SMI_L7_ID, 17)</div><div class='add'>+</div><div class='add'>+/* Larb8: null */</div><div class='add'>+</div><div class='add'>+/* Larb9 --imgsys */</div><div class='add'>+#define M4U_L9_P0_IMGI_D1			MTK_M4U_ID(SMI_L9_ID, 0)</div><div class='add'>+#define M4U_L9_P1_IMGBI_D1			MTK_M4U_ID(SMI_L9_ID, 1)</div><div class='add'>+#define M4U_L9_P2_DMGI_D1			MTK_M4U_ID(SMI_L9_ID, 2)</div><div class='add'>+#define M4U_L9_P3_DEPI_D1			MTK_M4U_ID(SMI_L9_ID, 3)</div><div class='add'>+#define M4U_L9_P4_LCE_D1			MTK_M4U_ID(SMI_L9_ID, 4)</div><div class='add'>+#define M4U_L9_P5_SMTI_D1			MTK_M4U_ID(SMI_L9_ID, 5)</div><div class='add'>+#define M4U_L9_P6_SMTO_D2			MTK_M4U_ID(SMI_L9_ID, 6)</div><div class='add'>+#define M4U_L9_P7_SMTO_D1			MTK_M4U_ID(SMI_L9_ID, 7)</div><div class='add'>+#define M4U_L9_P8_CRZO_D1			MTK_M4U_ID(SMI_L9_ID, 8)</div><div class='add'>+#define M4U_L9_P9_IMG3O_D1			MTK_M4U_ID(SMI_L9_ID, 9)</div><div class='add'>+#define M4U_L9_P10_VIPI_D1			MTK_M4U_ID(SMI_L9_ID, 10)</div><div class='add'>+#define M4U_L9_P11_SMTI_D5			MTK_M4U_ID(SMI_L9_ID, 11)</div><div class='add'>+#define M4U_L9_P12_TIMGO_D1			MTK_M4U_ID(SMI_L9_ID, 12)</div><div class='add'>+#define M4U_L9_P13_UFBC_W0			MTK_M4U_ID(SMI_L9_ID, 13)</div><div class='add'>+#define M4U_L9_P14_UFBC_R0			MTK_M4U_ID(SMI_L9_ID, 14)</div><div class='add'>+#define M4U_L9_P15_WPE_RDMA1			MTK_M4U_ID(SMI_L9_ID, 15)</div><div class='add'>+#define M4U_L9_P16_WPE_RDMA0			MTK_M4U_ID(SMI_L9_ID, 16)</div><div class='add'>+#define M4U_L9_P17_WPE_WDMA			MTK_M4U_ID(SMI_L9_ID, 17)</div><div class='add'>+#define M4U_L9_P18_MFB_RDMA0			MTK_M4U_ID(SMI_L9_ID, 18)</div><div class='add'>+#define M4U_L9_P19_MFB_RDMA1			MTK_M4U_ID(SMI_L9_ID, 19)</div><div class='add'>+#define M4U_L9_P20_MFB_RDMA2			MTK_M4U_ID(SMI_L9_ID, 20)</div><div class='add'>+#define M4U_L9_P21_MFB_RDMA3			MTK_M4U_ID(SMI_L9_ID, 21)</div><div class='add'>+#define M4U_L9_P22_MFB_RDMA4			MTK_M4U_ID(SMI_L9_ID, 22)</div><div class='add'>+#define M4U_L9_P23_MFB_RDMA5			MTK_M4U_ID(SMI_L9_ID, 23)</div><div class='add'>+#define M4U_L9_P24_MFB_WDMA0			MTK_M4U_ID(SMI_L9_ID, 24)</div><div class='add'>+#define M4U_L9_P25_MFB_WDMA1			MTK_M4U_ID(SMI_L9_ID, 25)</div><div class='add'>+#define M4U_L9_P26_RESERVE6			MTK_M4U_ID(SMI_L9_ID, 26)</div><div class='add'>+#define M4U_L9_P27_RESERVE7			MTK_M4U_ID(SMI_L9_ID, 27)</div><div class='add'>+#define M4U_L9_P28_RESERVE8			MTK_M4U_ID(SMI_L9_ID, 28)</div><div class='add'>+</div><div class='add'>+/* Larb10: null */</div><div class='add'>+</div><div class='add'>+/* Larb11 -- imgsys */</div><div class='add'>+#define M4U_L11_P0_IMGI_D1			MTK_M4U_ID(SMI_L11_ID, 0)</div><div class='add'>+#define M4U_L11_P1_IMGBI_D1			MTK_M4U_ID(SMI_L11_ID, 1)</div><div class='add'>+#define M4U_L11_P2_DMGI_D1			MTK_M4U_ID(SMI_L11_ID, 2)</div><div class='add'>+#define M4U_L11_P3_DEPI_D1			MTK_M4U_ID(SMI_L11_ID, 3)</div><div class='add'>+#define M4U_L11_P4_LCE_D1			MTK_M4U_ID(SMI_L11_ID, 4)</div><div class='add'>+#define M4U_L11_P5_SMTI_D1			MTK_M4U_ID(SMI_L11_ID, 5)</div><div class='add'>+#define M4U_L11_P6_SMTO_D2			MTK_M4U_ID(SMI_L11_ID, 6)</div><div class='add'>+#define M4U_L11_P7_SMTO_D1			MTK_M4U_ID(SMI_L11_ID, 7)</div><div class='add'>+#define M4U_L11_P8_CRZO_D1			MTK_M4U_ID(SMI_L11_ID, 8)</div><div class='add'>+#define M4U_L11_P9_IMG3O_D1			MTK_M4U_ID(SMI_L11_ID, 9)</div><div class='add'>+#define M4U_L11_P10_VIPI_D1			MTK_M4U_ID(SMI_L11_ID, 10)</div><div class='add'>+#define M4U_L11_P11_SMTI_D5			MTK_M4U_ID(SMI_L11_ID, 11)</div><div class='add'>+#define M4U_L11_P12_TIMGO_D1			MTK_M4U_ID(SMI_L11_ID, 12)</div><div class='add'>+#define M4U_L11_P13_UFBC_W0			MTK_M4U_ID(SMI_L11_ID, 13)</div><div class='add'>+#define M4U_L11_P14_UFBC_R0			MTK_M4U_ID(SMI_L11_ID, 14)</div><div class='add'>+#define M4U_L11_P15_WPE_RDMA1			MTK_M4U_ID(SMI_L11_ID, 15)</div><div class='add'>+#define M4U_L11_P16_WPE_RDMA0			MTK_M4U_ID(SMI_L11_ID, 16)</div><div class='add'>+#define M4U_L11_P17_WPE_WDMA			MTK_M4U_ID(SMI_L11_ID, 17)</div><div class='add'>+#define M4U_L11_P18_MFB_RDMA0			MTK_M4U_ID(SMI_L11_ID, 18)</div><div class='add'>+#define M4U_L11_P19_MFB_RDMA1			MTK_M4U_ID(SMI_L11_ID, 19)</div><div class='add'>+#define M4U_L11_P20_MFB_RDMA2			MTK_M4U_ID(SMI_L11_ID, 20)</div><div class='add'>+#define M4U_L11_P21_MFB_RDMA3			MTK_M4U_ID(SMI_L11_ID, 21)</div><div class='add'>+#define M4U_L11_P22_MFB_RDMA4			MTK_M4U_ID(SMI_L11_ID, 22)</div><div class='add'>+#define M4U_L11_P23_MFB_RDMA5			MTK_M4U_ID(SMI_L11_ID, 23)</div><div class='add'>+#define M4U_L11_P24_MFB_WDMA0			MTK_M4U_ID(SMI_L11_ID, 24)</div><div class='add'>+#define M4U_L11_P25_MFB_WDMA1			MTK_M4U_ID(SMI_L11_ID, 25)</div><div class='add'>+#define M4U_L11_P26_RESERVE6			MTK_M4U_ID(SMI_L11_ID, 26)</div><div class='add'>+#define M4U_L11_P27_RESERVE7			MTK_M4U_ID(SMI_L11_ID, 27)</div><div class='add'>+#define M4U_L11_P28_RESERVE8			MTK_M4U_ID(SMI_L11_ID, 28)</div><div class='add'>+</div><div class='add'>+/* Larb12: null */</div><div class='add'>+</div><div class='add'>+/* Larb13 -- cam */</div><div class='add'>+#define M4U_L13_P0_MRAWI			MTK_M4U_ID(SMI_L13_ID, 0)</div><div class='add'>+#define M4U_L13_P1_MRAWO_0			MTK_M4U_ID(SMI_L13_ID, 1)</div><div class='add'>+#define M4U_L13_P2_MRAWO_1			MTK_M4U_ID(SMI_L13_ID, 2)</div><div class='add'>+#define M4U_L13_P3_CAMSV_1			MTK_M4U_ID(SMI_L13_ID, 3)</div><div class='add'>+#define M4U_L13_P4_CAMSV_2			MTK_M4U_ID(SMI_L13_ID, 4)</div><div class='add'>+#define M4U_L13_P5_CAMSV_3			MTK_M4U_ID(SMI_L13_ID, 5)</div><div class='add'>+#define M4U_L13_P6_CAMSV_4			MTK_M4U_ID(SMI_L13_ID, 6)</div><div class='add'>+#define M4U_L13_P7_CAMSV_5			MTK_M4U_ID(SMI_L13_ID, 7)</div><div class='add'>+#define M4U_L13_P8_CAMSV_6			MTK_M4U_ID(SMI_L13_ID, 8)</div><div class='add'>+#define M4U_L13_P9_CCUI				MTK_M4U_ID(SMI_L13_ID, 9)</div><div class='add'>+#define M4U_L13_P10_CCUO			MTK_M4U_ID(SMI_L13_ID, 10)</div><div class='add'>+#define M4U_L13_P11_FAKE			MTK_M4U_ID(SMI_L13_ID, 11)</div><div class='add'>+#define M4U_L13_P12_PDAI_0			MTK_M4U_ID(SMI_L13_ID, 12)</div><div class='add'>+#define M4U_L13_P13_PDAI_1			MTK_M4U_ID(SMI_L13_ID, 13)</div><div class='add'>+#define M4U_L13_P14_PDAO			MTK_M4U_ID(SMI_L13_ID, 14)</div><div class='add'>+</div><div class='add'>+/* Larb14 -- cam */</div><div class='add'>+#define M4U_L14_P0_RESERVE			MTK_M4U_ID(SMI_L14_ID, 0)</div><div class='add'>+#define M4U_L14_P1_RESERVE			MTK_M4U_ID(SMI_L14_ID, 1)</div><div class='add'>+#define M4U_L14_P2_RESERVE			MTK_M4U_ID(SMI_L14_ID, 2)</div><div class='add'>+#define M4U_L14_P3_CAMSV_0			MTK_M4U_ID(SMI_L14_ID, 3)</div><div class='add'>+#define M4U_L14_P4_CCUI				MTK_M4U_ID(SMI_L14_ID, 4)</div><div class='add'>+#define M4U_L14_P5_CCUO				MTK_M4U_ID(SMI_L14_ID, 5)</div><div class='add'>+#define M4U_L14_P6_CAMSV_7			MTK_M4U_ID(SMI_L14_ID, 6)</div><div class='add'>+#define M4U_L14_P7_CAMSV_8			MTK_M4U_ID(SMI_L14_ID, 7)</div><div class='add'>+#define M4U_L14_P8_CAMSV_9			MTK_M4U_ID(SMI_L14_ID, 8)</div><div class='add'>+#define M4U_L14_P9_CAMSV_10			MTK_M4U_ID(SMI_L14_ID, 9)</div><div class='add'>+</div><div class='add'>+/* Larb15: null */</div><div class='add'>+</div><div class='add'>+/* Larb16 -- cam */</div><div class='add'>+#define M4U_L16_P0_IMGO_R1_A			MTK_M4U_ID(SMI_L16_ID, 0)</div><div class='add'>+#define M4U_L16_P1_RRZO_R1_A			MTK_M4U_ID(SMI_L16_ID, 1)</div><div class='add'>+#define M4U_L16_P2_CQI_R1_A			MTK_M4U_ID(SMI_L16_ID, 2)</div><div class='add'>+#define M4U_L16_P3_BPCI_R1_A			MTK_M4U_ID(SMI_L16_ID, 3)</div><div class='add'>+#define M4U_L16_P4_YUVO_R1_A			MTK_M4U_ID(SMI_L16_ID, 4)</div><div class='add'>+#define M4U_L16_P5_UFDI_R2_A			MTK_M4U_ID(SMI_L16_ID, 5)</div><div class='add'>+#define M4U_L16_P6_RAWI_R2_A			MTK_M4U_ID(SMI_L16_ID, 6)</div><div class='add'>+#define M4U_L16_P7_RAWI_R3_A			MTK_M4U_ID(SMI_L16_ID, 7)</div><div class='add'>+#define M4U_L16_P8_AAO_R1_A			MTK_M4U_ID(SMI_L16_ID, 8)</div><div class='add'>+#define M4U_L16_P9_AFO_R1_A			MTK_M4U_ID(SMI_L16_ID, 9)</div><div class='add'>+#define M4U_L16_P10_FLKO_R1_A			MTK_M4U_ID(SMI_L16_ID, 10)</div><div class='add'>+#define M4U_L16_P11_LCESO_R1_A			MTK_M4U_ID(SMI_L16_ID, 11)</div><div class='add'>+#define M4U_L16_P12_CRZO_R1_A			MTK_M4U_ID(SMI_L16_ID, 12)</div><div class='add'>+#define M4U_L16_P13_LTMSO_R1_A			MTK_M4U_ID(SMI_L16_ID, 13)</div><div class='add'>+#define M4U_L16_P14_RSSO_R1_A			MTK_M4U_ID(SMI_L16_ID, 14)</div><div class='add'>+#define M4U_L16_P15_AAHO_R1_A			MTK_M4U_ID(SMI_L16_ID, 15)</div><div class='add'>+#define M4U_L16_P16_LSCI_R1_A			MTK_M4U_ID(SMI_L16_ID, 16)</div><div class='add'>+</div><div class='add'>+/* Larb17 -- cam */</div><div class='add'>+#define M4U_L17_P0_IMGO_R1_B			MTK_M4U_ID(SMI_L17_ID, 0)</div><div class='add'>+#define M4U_L17_P1_RRZO_R1_B			MTK_M4U_ID(SMI_L17_ID, 1)</div><div class='add'>+#define M4U_L17_P2_CQI_R1_B			MTK_M4U_ID(SMI_L17_ID, 2)</div><div class='add'>+#define M4U_L17_P3_BPCI_R1_B			MTK_M4U_ID(SMI_L17_ID, 3)</div><div class='add'>+#define M4U_L17_P4_YUVO_R1_B			MTK_M4U_ID(SMI_L17_ID, 4)</div><div class='add'>+#define M4U_L17_P5_UFDI_R2_B			MTK_M4U_ID(SMI_L17_ID, 5)</div><div class='add'>+#define M4U_L17_P6_RAWI_R2_B			MTK_M4U_ID(SMI_L17_ID, 6)</div><div class='add'>+#define M4U_L17_P7_RAWI_R3_B			MTK_M4U_ID(SMI_L17_ID, 7)</div><div class='add'>+#define M4U_L17_P8_AAO_R1_B			MTK_M4U_ID(SMI_L17_ID, 8)</div><div class='add'>+#define M4U_L17_P9_AFO_R1_B			MTK_M4U_ID(SMI_L17_ID, 9)</div><div class='add'>+#define M4U_L17_P10_FLKO_R1_B			MTK_M4U_ID(SMI_L17_ID, 10)</div><div class='add'>+#define M4U_L17_P11_LCESO_R1_B			MTK_M4U_ID(SMI_L17_ID, 11)</div><div class='add'>+#define M4U_L17_P12_CRZO_R1_B			MTK_M4U_ID(SMI_L17_ID, 12)</div><div class='add'>+#define M4U_L17_P13_LTMSO_R1_B			MTK_M4U_ID(SMI_L17_ID, 13)</div><div class='add'>+#define M4U_L17_P14_RSSO_R1_B			MTK_M4U_ID(SMI_L17_ID, 14)</div><div class='add'>+#define M4U_L17_P15_AAHO_R1_B			MTK_M4U_ID(SMI_L17_ID, 15)</div><div class='add'>+#define M4U_L17_P16_LSCI_R1_B			MTK_M4U_ID(SMI_L17_ID, 16)</div><div class='add'>+</div><div class='add'>+/* Larb19 -- ipesys */</div><div class='add'>+#define M4U_L19_P0_DVS_RDMA			MTK_M4U_ID(SMI_L19_ID, 0)</div><div class='add'>+#define M4U_L19_P1_DVS_WDMA			MTK_M4U_ID(SMI_L19_ID, 1)</div><div class='add'>+#define M4U_L19_P2_DVP_RDMA			MTK_M4U_ID(SMI_L19_ID, 2)</div><div class='add'>+#define M4U_L19_P3_DVP_WDMA			MTK_M4U_ID(SMI_L19_ID, 3)</div><div class='add'>+</div><div class='add'>+/* Larb20 -- ipesys */</div><div class='add'>+#define M4U_L20_P0_FDVT_RDA_0			MTK_M4U_ID(SMI_L20_ID, 0)</div><div class='add'>+#define M4U_L20_P1_FDVT_RDB_0			MTK_M4U_ID(SMI_L20_ID, 1)</div><div class='add'>+#define M4U_L20_P2_FDVT_WRA_0			MTK_M4U_ID(SMI_L20_ID, 2)</div><div class='add'>+#define M4U_L20_P3_FDVT_WRB_0			MTK_M4U_ID(SMI_L20_ID, 3)</div><div class='add'>+#define M4U_L20_P4_RSC_RDMA			MTK_M4U_ID(SMI_L20_ID, 4)</div><div class='add'>+#define M4U_L20_P5_RSC_WDMA			MTK_M4U_ID(SMI_L20_ID, 5)</div><div class='add'>+</div><div class='add'>+/* fake larb21 for gce */</div><div class='add'>+#define M4U_L21_GCE_DM				MTK_M4U_ID(21, 0)</div><div class='add'>+#define M4U_L21_GCE_MM				MTK_M4U_ID(21, 1)</div><div class='add'>+</div><div class='add'>+/* fake larb &amp; port for svp and dual svp and wfd */</div><div class='add'>+#define M4U_PORT_SVP_HEAP			MTK_M4U_ID(22, 0)</div><div class='add'>+#define M4U_PORT_DUAL_SVP_HEAP			MTK_M4U_ID(22, 1)</div><div class='add'>+#define M4U_PORT_WFD_HEAP			MTK_M4U_ID(22, 2)</div><div class='add'>+</div><div class='add'>+/* fake larb0 for apu */</div><div class='add'>+#define M4U_L0_APU_DATA				MTK_M4U_ID(0, 0)</div><div class='add'>+#define M4U_L0_APU_CODE				MTK_M4U_ID(0, 1)</div><div class='add'>+#define M4U_L0_APU_SECURE			MTK_M4U_ID(0, 2)</div><div class='add'>+#define M4U_L0_APU_VLM				MTK_M4U_ID(0, 3)</div><div class='add'>+</div><div class='add'>+/* infra/peri */</div><div class='add'>+#define IFR_IOMMU_PORT_PCIE_0			MTK_IFAIOMMU_PERI_ID(0, 26)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/memory/nvidia,tegra264.h b/include/dt-bindings/memory/nvidia,tegra264.h<br/>new file mode 100644<br/>index 000000000000..521405c01f84<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/memory/nvidia,tegra264.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/memory/nvidia,tegra264.h</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/* Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef DT_BINDINGS_MEMORY_NVIDIA_TEGRA264_H</div><div class='add'>+#define DT_BINDINGS_MEMORY_NVIDIA_TEGRA264_H</div><div class='add'>+</div><div class='add'>+#define TEGRA264_SID(x) ((x) &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SMMU stream IDs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define TEGRA264_SID_AON       TEGRA264_SID(0x01)</div><div class='add'>+#define TEGRA264_SID_APE       TEGRA264_SID(0x02)</div><div class='add'>+#define TEGRA264_SID_ETR       TEGRA264_SID(0x03)</div><div class='add'>+#define TEGRA264_SID_BPMP      TEGRA264_SID(0x04)</div><div class='add'>+#define TEGRA264_SID_DCE       TEGRA264_SID(0x05)</div><div class='add'>+#define TEGRA264_SID_EQOS      TEGRA264_SID(0x06)</div><div class='add'>+#define TEGRA264_SID_GPCDMA    TEGRA264_SID(0x08)</div><div class='add'>+#define TEGRA264_SID_DISP      TEGRA264_SID(0x09)</div><div class='add'>+#define TEGRA264_SID_HDA       TEGRA264_SID(0x0a)</div><div class='add'>+#define TEGRA264_SID_HOST1X    TEGRA264_SID(0x0b)</div><div class='add'>+#define TEGRA264_SID_ISP0      TEGRA264_SID(0x0c)</div><div class='add'>+#define TEGRA264_SID_ISP1      TEGRA264_SID(0x0d)</div><div class='add'>+#define TEGRA264_SID_PMA0      TEGRA264_SID(0x0e)</div><div class='add'>+#define TEGRA264_SID_FSI0      TEGRA264_SID(0x0f)</div><div class='add'>+#define TEGRA264_SID_FSI1      TEGRA264_SID(0x10)</div><div class='add'>+#define TEGRA264_SID_PVA       TEGRA264_SID(0x11)</div><div class='add'>+#define TEGRA264_SID_SDMMC0    TEGRA264_SID(0x12)</div><div class='add'>+#define TEGRA264_SID_MGBE0     TEGRA264_SID(0x13)</div><div class='add'>+#define TEGRA264_SID_MGBE1     TEGRA264_SID(0x14)</div><div class='add'>+#define TEGRA264_SID_MGBE2     TEGRA264_SID(0x15)</div><div class='add'>+#define TEGRA264_SID_MGBE3     TEGRA264_SID(0x16)</div><div class='add'>+#define TEGRA264_SID_MSSSEQ    TEGRA264_SID(0x17)</div><div class='add'>+#define TEGRA264_SID_SE        TEGRA264_SID(0x18)</div><div class='add'>+#define TEGRA264_SID_SEU1      TEGRA264_SID(0x19)</div><div class='add'>+#define TEGRA264_SID_SEU2      TEGRA264_SID(0x1a)</div><div class='add'>+#define TEGRA264_SID_SEU3      TEGRA264_SID(0x1b)</div><div class='add'>+#define TEGRA264_SID_PSC       TEGRA264_SID(0x1c)</div><div class='add'>+#define TEGRA264_SID_OESP      TEGRA264_SID(0x23)</div><div class='add'>+#define TEGRA264_SID_SB        TEGRA264_SID(0x24)</div><div class='add'>+#define TEGRA264_SID_XSPI0     TEGRA264_SID(0x25)</div><div class='add'>+#define TEGRA264_SID_TSEC      TEGRA264_SID(0x29)</div><div class='add'>+#define TEGRA264_SID_UFS       TEGRA264_SID(0x2a)</div><div class='add'>+#define TEGRA264_SID_RCE       TEGRA264_SID(0x2b)</div><div class='add'>+#define TEGRA264_SID_RCE1      TEGRA264_SID(0x2c)</div><div class='add'>+#define TEGRA264_SID_VI        TEGRA264_SID(0x2e)</div><div class='add'>+#define TEGRA264_SID_VI1       TEGRA264_SID(0x2f)</div><div class='add'>+#define TEGRA264_SID_VIC       TEGRA264_SID(0x30)</div><div class='add'>+#define TEGRA264_SID_XUSB_DEV  TEGRA264_SID(0x32)</div><div class='add'>+#define TEGRA264_SID_XUSB_DEV1 TEGRA264_SID(0x33)</div><div class='add'>+#define TEGRA264_SID_XUSB_DEV2 TEGRA264_SID(0x34)</div><div class='add'>+#define TEGRA264_SID_XUSB_DEV3 TEGRA264_SID(0x35)</div><div class='add'>+#define TEGRA264_SID_XUSB_DEV4 TEGRA264_SID(0x36)</div><div class='add'>+#define TEGRA264_SID_XUSB_DEV5 TEGRA264_SID(0x37)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * memory client IDs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* HOST1X read client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_HOST1XR		0x16</div><div class='add'>+/* VIC read client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_VICR		0x6c</div><div class='add'>+/* VIC Write client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_VICW		0x6d</div><div class='add'>+/* VI R5 Write client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_VIW		0x72</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_NVDECSRD2MC	0x78</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_NVDECSWR2MC	0x79</div><div class='add'>+/* Audio processor(APE) Read client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_APER		0x7a</div><div class='add'>+/* Audio processor(APE) Write client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_APEW		0x7b</div><div class='add'>+/* Audio DMA Read client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_APEDMAR		0x9f</div><div class='add'>+/* Audio DMA Write client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_APEDMAW		0xa0</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_GPUR02MC		0xb6</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_GPUW02MC		0xb7</div><div class='add'>+/* VI Falcon Read client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_VIFALCONR	0xbc</div><div class='add'>+/* VI Falcon Write client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_VIFALCONW	0xbd</div><div class='add'>+/* Read Client of RCE */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_RCER		0xd2</div><div class='add'>+/* Write client of RCE */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_RCEW		0xd3</div><div class='add'>+/* PCIE0/MSI Write clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE0W		0xd9</div><div class='add'>+/* PCIE1/RPX4 Read clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE1R		0xda</div><div class='add'>+/* PCIE1/RPX4 Write clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE1W		0xdb</div><div class='add'>+/* PCIE2/DMX4 Read clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE2AR		0xdc</div><div class='add'>+/* PCIE2/DMX4 Write clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE2AW		0xdd</div><div class='add'>+/* PCIE3/RPX4 Read clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE3R		0xde</div><div class='add'>+/* PCIE3/RPX4 Write clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE3W		0xdf</div><div class='add'>+/* PCIE4/DMX8 Read clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE4R		0xe0</div><div class='add'>+/* PCIE4/DMX8 Write clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE4W		0xe1</div><div class='add'>+/* PCIE5/DMX4 Read clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE5R		0xe2</div><div class='add'>+/* PCIE5/DMX4 Write clients */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_PCIE5W		0xe3</div><div class='add'>+/* UFS Read client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_UFSR		0x15c</div><div class='add'>+/* UFS write client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_UFSW		0x15d</div><div class='add'>+/* HDA Read client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_HDAR		0x17c</div><div class='add'>+/* HDA Write client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_HDAW		0x17d</div><div class='add'>+/* Disp ISO Read Client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_DISPR		0x182</div><div class='add'>+/* MGBE0 Read mccif */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_MGBE0R		0x1a2</div><div class='add'>+/* MGBE0 Write mccif */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_MGBE0W		0x1a3</div><div class='add'>+/* MGBE1 Read mccif */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_MGBE1R		0x1a4</div><div class='add'>+/* MGBE1 Write mccif */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_MGBE1W		0x1a5</div><div class='add'>+/* VI1 R5 Write client */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_VI1W		0x1a6</div><div class='add'>+/* SDMMC0 Read mccif */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_SDMMC0R		0x1c2</div><div class='add'>+/* SDMMC0 Write mccif */</div><div class='add'>+#define TEGRA264_MEMORY_CLIENT_SDMMC0W		0x1c3</div><div class='add'>+</div><div class='add'>+#endif /* DT_BINDINGS_MEMORY_NVIDIA_TEGRA264_H */</div><div class='head'>diff --git a/include/dt-bindings/memory/tegra210-mc.h b/include/dt-bindings/memory/tegra210-mc.h<br/>index 5e082547f179..881bf78aa8b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/memory/tegra210-mc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/memory/tegra210-mc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/memory/tegra210-mc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/memory/tegra210-mc.h</a></div><div class='hunk'>@@ -75,4 +75,78 @@</div><div class='ctx'> #define TEGRA210_MC_RESET_ETR		28</div><div class='ctx'> #define TEGRA210_MC_RESET_TSECB		29</div><div class='ctx'> </div><div class='add'>+#define TEGRA210_MC_PTCR		0</div><div class='add'>+#define TEGRA210_MC_DISPLAY0A		1</div><div class='add'>+#define TEGRA210_MC_DISPLAY0AB		2</div><div class='add'>+#define TEGRA210_MC_DISPLAY0B		3</div><div class='add'>+#define TEGRA210_MC_DISPLAY0BB		4</div><div class='add'>+#define TEGRA210_MC_DISPLAY0C		5</div><div class='add'>+#define TEGRA210_MC_DISPLAY0CB		6</div><div class='add'>+#define TEGRA210_MC_AFIR		14</div><div class='add'>+#define TEGRA210_MC_AVPCARM7R		15</div><div class='add'>+#define TEGRA210_MC_DISPLAYHC		16</div><div class='add'>+#define TEGRA210_MC_DISPLAYHCB		17</div><div class='add'>+#define TEGRA210_MC_HDAR		21</div><div class='add'>+#define TEGRA210_MC_HOST1XDMAR		22</div><div class='add'>+#define TEGRA210_MC_HOST1XR		23</div><div class='add'>+#define TEGRA210_MC_NVENCSRD		28</div><div class='add'>+#define TEGRA210_MC_PPCSAHBDMAR		29</div><div class='add'>+#define TEGRA210_MC_PPCSAHBSLVR		30</div><div class='add'>+#define TEGRA210_MC_SATAR		31</div><div class='add'>+#define TEGRA210_MC_MPCORER		39</div><div class='add'>+#define TEGRA210_MC_NVENCSWR		43</div><div class='add'>+#define TEGRA210_MC_AFIW		49</div><div class='add'>+#define TEGRA210_MC_AVPCARM7W		50</div><div class='add'>+#define TEGRA210_MC_HDAW		53</div><div class='add'>+#define TEGRA210_MC_HOST1XW		54</div><div class='add'>+#define TEGRA210_MC_MPCOREW		57</div><div class='add'>+#define TEGRA210_MC_PPCSAHBDMAW		59</div><div class='add'>+#define TEGRA210_MC_PPCSAHBSLVW		60</div><div class='add'>+#define TEGRA210_MC_SATAW		61</div><div class='add'>+#define TEGRA210_MC_ISPRA		68</div><div class='add'>+#define TEGRA210_MC_ISPWA		70</div><div class='add'>+#define TEGRA210_MC_ISPWB		71</div><div class='add'>+#define TEGRA210_MC_XUSB_HOSTR		74</div><div class='add'>+#define TEGRA210_MC_XUSB_HOSTW		75</div><div class='add'>+#define TEGRA210_MC_XUSB_DEVR		76</div><div class='add'>+#define TEGRA210_MC_XUSB_DEVW		77</div><div class='add'>+#define TEGRA210_MC_ISPRAB		78</div><div class='add'>+#define TEGRA210_MC_ISPWAB		80</div><div class='add'>+#define TEGRA210_MC_ISPWBB		81</div><div class='add'>+#define TEGRA210_MC_TSECSRD		84</div><div class='add'>+#define TEGRA210_MC_TSECSWR		85</div><div class='add'>+#define TEGRA210_MC_A9AVPSCR		86</div><div class='add'>+#define TEGRA210_MC_A9AVPSCW		87</div><div class='add'>+#define TEGRA210_MC_GPUSRD		88</div><div class='add'>+#define TEGRA210_MC_GPUSWR		89</div><div class='add'>+#define TEGRA210_MC_DISPLAYT		90</div><div class='add'>+#define TEGRA210_MC_SDMMCRA		96</div><div class='add'>+#define TEGRA210_MC_SDMMCRAA		97</div><div class='add'>+#define TEGRA210_MC_SDMMCR		98</div><div class='add'>+#define TEGRA210_MC_SDMMCRAB		99</div><div class='add'>+#define TEGRA210_MC_SDMMCWA		100</div><div class='add'>+#define TEGRA210_MC_SDMMCWAA		101</div><div class='add'>+#define TEGRA210_MC_SDMMCW		102</div><div class='add'>+#define TEGRA210_MC_SDMMCWAB		103</div><div class='add'>+#define TEGRA210_MC_VICSRD		108</div><div class='add'>+#define TEGRA210_MC_VICSWR		109</div><div class='add'>+#define TEGRA210_MC_VIW			114</div><div class='add'>+#define TEGRA210_MC_DISPLAYD		115</div><div class='add'>+#define TEGRA210_MC_NVDECSRD		120</div><div class='add'>+#define TEGRA210_MC_NVDECSWR		121</div><div class='add'>+#define TEGRA210_MC_APER		122</div><div class='add'>+#define TEGRA210_MC_APEW		123</div><div class='add'>+#define TEGRA210_MC_NVJPGRD		126</div><div class='add'>+#define TEGRA210_MC_NVJPGWR		127</div><div class='add'>+#define TEGRA210_MC_SESRD		128</div><div class='add'>+#define TEGRA210_MC_SESWR		129</div><div class='add'>+#define TEGRA210_MC_AXIAPR		130</div><div class='add'>+#define TEGRA210_MC_AXIAPW		131</div><div class='add'>+#define TEGRA210_MC_ETRR		132</div><div class='add'>+#define TEGRA210_MC_ETRW		133</div><div class='add'>+#define TEGRA210_MC_TSECSRDB		134</div><div class='add'>+#define TEGRA210_MC_TSECSWRB		135</div><div class='add'>+#define TEGRA210_MC_GPUSRD2		136</div><div class='add'>+#define TEGRA210_MC_GPUSWR2		137</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/mfd/qcom-pm8008.h b/include/dt-bindings/mfd/qcom-pm8008.h<br/>deleted file mode 100644<br/>index eca9448df228..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/mfd/qcom-pm8008.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/mfd/qcom-pm8008.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2021 The Linux Foundation. All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DT_BINDINGS_MFD_QCOM_PM8008_H</div><div class='del'>-#define __DT_BINDINGS_MFD_QCOM_PM8008_H</div><div class='del'>-</div><div class='del'>-/* PM8008 IRQ numbers */</div><div class='del'>-#define PM8008_IRQ_MISC_UVLO	0</div><div class='del'>-#define PM8008_IRQ_MISC_OVLO	1</div><div class='del'>-#define PM8008_IRQ_MISC_OTST2	2</div><div class='del'>-#define PM8008_IRQ_MISC_OTST3	3</div><div class='del'>-#define PM8008_IRQ_MISC_LDO_OCP	4</div><div class='del'>-#define PM8008_IRQ_TEMP_ALARM	5</div><div class='del'>-#define PM8008_IRQ_GPIO1	6</div><div class='del'>-#define PM8008_IRQ_GPIO2	7</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/dt-bindings/mfd/st,stpmic1.h b/include/dt-bindings/mfd/st,stpmic1.h<br/>index 321cd08797d9..9dd15b9c743e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/mfd/st,stpmic1.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/mfd/st,stpmic1.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/mfd/st,stpmic1.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/mfd/st,stpmic1.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) STMicroelectronics 2018 - All Rights Reserved</div><div class='ctx'>  * Author: Philippe Peurichard &lt;philippe.peurichard@st.com&gt;,</div><div class='head'>diff --git a/include/dt-bindings/net/renesas,r9a09g077-pcs-miic.h b/include/dt-bindings/net/renesas,r9a09g077-pcs-miic.h<br/>new file mode 100644<br/>index 000000000000..43a2b5743a63<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/net/renesas,r9a09g077-pcs-miic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/net/renesas,r9a09g077-pcs-miic.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Renesas Electronics Corporation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RENASAS_R9A09G077_PCS_MIIC_H</div><div class='add'>+#define _DT_BINDINGS_RENASAS_R9A09G077_PCS_MIIC_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Media Interface Connection Matrix</div><div class='add'>+ * ===========================================================</div><div class='add'>+ *</div><div class='add'>+ * Selects the function of the Media interface of the MAC to be used</div><div class='add'>+ *</div><div class='add'>+ * SW_MODE[2:0] | Port 0      | Port 1      | Port 2      | Port 3</div><div class='add'>+ * -------------|-------------|-------------|-------------|-------------</div><div class='add'>+ * 000b         | ETHSW Port0 | ETHSW Port1 | ETHSW Port2 | GMAC1</div><div class='add'>+ * 001b         | ESC Port0   | ESC Port1   | GMAC2       | GMAC1</div><div class='add'>+ * 010b         | ESC Port0   | ESC Port1   | ETHSW Port2 | GMAC1</div><div class='add'>+ * 011b         | ESC Port0   | ESC Port1   | ESC Port2   | GMAC1</div><div class='add'>+ * 100b         | ETHSW Port0 | ESC Port1   | ESC Port2   | GMAC1</div><div class='add'>+ * 101b         | ETHSW Port0 | ESC Port1   | ETHSW Port2 | GMAC1</div><div class='add'>+ * 110b         | ETHSW Port0 | ETHSW Port1 | GMAC2       | GMAC1</div><div class='add'>+ * 111b         | GMAC0       | GMAC1       | GMAC2       | -</div><div class='add'>+ */</div><div class='add'>+#define ETHSS_GMAC0_PORT		0</div><div class='add'>+#define ETHSS_GMAC1_PORT		1</div><div class='add'>+#define ETHSS_GMAC2_PORT		2</div><div class='add'>+#define ETHSS_ESC_PORT0			3</div><div class='add'>+#define ETHSS_ESC_PORT1			4</div><div class='add'>+#define ETHSS_ESC_PORT2			5</div><div class='add'>+#define ETHSS_ETHSW_PORT0		6</div><div class='add'>+#define ETHSS_ETHSW_PORT1		7</div><div class='add'>+#define ETHSS_ETHSW_PORT2		8</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/net/ti-dp83867.h b/include/dt-bindings/net/ti-dp83867.h<br/>index 6fc4b445d3a1..b8a4f3ff4a3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/net/ti-dp83867.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/net/ti-dp83867.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/net/ti-dp83867.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/net/ti-dp83867.h</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR MIT */</div><div class='ctx'> /*</div><div class='ctx'>  * Device Tree constants for the Texas Instruments DP83867 PHY</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Dan Murphy &lt;dmurphy@ti.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * Copyright:   (C) 2015 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2015-2024 Texas Instruments Incorporated - https://www.ti.com/</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _DT_BINDINGS_TI_DP83867_H</div><div class='head'>diff --git a/include/dt-bindings/net/ti-dp83869.h b/include/dt-bindings/net/ti-dp83869.h<br/>index 218b1a64e975..917114aad7d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/net/ti-dp83869.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/net/ti-dp83869.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/net/ti-dp83869.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/net/ti-dp83869.h</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR MIT */</div><div class='ctx'> /*</div><div class='ctx'>  * Device Tree constants for the Texas Instruments DP83869 PHY</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Dan Murphy &lt;dmurphy@ti.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * Copyright:   (C) 2019 Texas Instruments, Inc.</div><div class='add'>+ * Copyright (C) 2015-2024 Texas Instruments Incorporated - https://www.ti.com/</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _DT_BINDINGS_TI_DP83869_H</div><div class='head'>diff --git a/include/dt-bindings/phy/phy-qcom-qmp.h b/include/dt-bindings/phy/phy-qcom-qmp.h<br/>index 4edec4c5b224..6b43ea9e0051 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/phy/phy-qcom-qmp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/phy/phy-qcom-qmp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/phy/phy-qcom-qmp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/phy/phy-qcom-qmp.h</a></div><div class='hunk'>@@ -17,4 +17,8 @@</div><div class='ctx'> #define QMP_USB43DP_USB3_PHY		0</div><div class='ctx'> #define QMP_USB43DP_DP_PHY		1</div><div class='ctx'> </div><div class='add'>+/* QMP PCIE PHYs */</div><div class='add'>+#define QMP_PCIE_PIPE_CLK		0</div><div class='add'>+#define QMP_PCIE_PHY_AUX_CLK		1</div><div class='add'>+</div><div class='ctx'> #endif /* _DT_BINDINGS_PHY_QMP */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/amlogic,pinctrl.h b/include/dt-bindings/pinctrl/amlogic,pinctrl.h<br/>new file mode 100644<br/>index 000000000000..7d40aecc7147<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/amlogic,pinctrl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/amlogic,pinctrl.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Amlogic, Inc. All rights reserved.</div><div class='add'>+ * Author: Xianwei Zhao &lt;xianwei.zhao@amlogic.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_AMLOGIC_PINCTRL_H</div><div class='add'>+#define _DT_BINDINGS_AMLOGIC_PINCTRL_H</div><div class='add'>+/* Normal PIN bank */</div><div class='add'>+#define AMLOGIC_GPIO_A		0</div><div class='add'>+#define AMLOGIC_GPIO_B		1</div><div class='add'>+#define AMLOGIC_GPIO_C		2</div><div class='add'>+#define AMLOGIC_GPIO_D		3</div><div class='add'>+#define AMLOGIC_GPIO_E		4</div><div class='add'>+#define AMLOGIC_GPIO_F		5</div><div class='add'>+#define AMLOGIC_GPIO_G		6</div><div class='add'>+#define AMLOGIC_GPIO_H		7</div><div class='add'>+#define AMLOGIC_GPIO_I		8</div><div class='add'>+#define AMLOGIC_GPIO_J		9</div><div class='add'>+#define AMLOGIC_GPIO_K		10</div><div class='add'>+#define AMLOGIC_GPIO_L		11</div><div class='add'>+#define AMLOGIC_GPIO_M		12</div><div class='add'>+#define AMLOGIC_GPIO_N		13</div><div class='add'>+#define AMLOGIC_GPIO_O		14</div><div class='add'>+#define AMLOGIC_GPIO_P		15</div><div class='add'>+#define AMLOGIC_GPIO_Q		16</div><div class='add'>+#define AMLOGIC_GPIO_R		17</div><div class='add'>+#define AMLOGIC_GPIO_S		18</div><div class='add'>+#define AMLOGIC_GPIO_T		19</div><div class='add'>+#define AMLOGIC_GPIO_U		20</div><div class='add'>+#define AMLOGIC_GPIO_V		21</div><div class='add'>+#define AMLOGIC_GPIO_W		22</div><div class='add'>+#define AMLOGIC_GPIO_X		23</div><div class='add'>+#define AMLOGIC_GPIO_Y		24</div><div class='add'>+#define AMLOGIC_GPIO_Z		25</div><div class='add'>+</div><div class='add'>+/* Special PIN bank */</div><div class='add'>+#define AMLOGIC_GPIO_DV		26</div><div class='add'>+#define AMLOGIC_GPIO_AO		27</div><div class='add'>+#define AMLOGIC_GPIO_CC		28</div><div class='add'>+#define AMLOGIC_GPIO_TEST_N	29</div><div class='add'>+#define AMLOGIC_GPIO_ANALOG	30</div><div class='add'>+</div><div class='add'>+#define AML_PINMUX(bank, offset, mode)	(((((bank) &lt;&lt; 8) + (offset)) &lt;&lt; 8) | (mode))</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_AMLOGIC_PINCTRL_H */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/pinctrl-cv1800b.h b/include/dt-bindings/pinctrl/pinctrl-cv1800b.h<br/>new file mode 100644<br/>index 000000000000..0593fc33d470<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/pinctrl-cv1800b.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/pinctrl-cv1800b.h</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Inochi Amaoto &lt;inochiama@outlook.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is generated from vendor pinout definition.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_PINCTRL_CV1800B_H</div><div class='add'>+#define _DT_BINDINGS_PINCTRL_CV1800B_H</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/pinctrl-cv18xx.h&gt;</div><div class='add'>+</div><div class='add'>+#define PIN_AUD_AOUTR			1</div><div class='add'>+#define PIN_SD0_CLK			3</div><div class='add'>+#define PIN_SD0_CMD			4</div><div class='add'>+#define PIN_SD0_D0			5</div><div class='add'>+#define PIN_SD0_D1			7</div><div class='add'>+#define PIN_SD0_D2			8</div><div class='add'>+#define PIN_SD0_D3			9</div><div class='add'>+#define PIN_SD0_CD			11</div><div class='add'>+#define PIN_SD0_PWR_EN			12</div><div class='add'>+#define PIN_SPK_EN			14</div><div class='add'>+#define PIN_UART0_TX			15</div><div class='add'>+#define PIN_UART0_RX			16</div><div class='add'>+#define PIN_SPINOR_HOLD_X		17</div><div class='add'>+#define PIN_SPINOR_SCK			18</div><div class='add'>+#define PIN_SPINOR_MOSI			19</div><div class='add'>+#define PIN_SPINOR_WP_X			20</div><div class='add'>+#define PIN_SPINOR_MISO			21</div><div class='add'>+#define PIN_SPINOR_CS_X			22</div><div class='add'>+#define PIN_IIC0_SCL			23</div><div class='add'>+#define PIN_IIC0_SDA			24</div><div class='add'>+#define PIN_AUX0			25</div><div class='add'>+#define PIN_PWR_VBAT_DET		30</div><div class='add'>+#define PIN_PWR_SEQ2			31</div><div class='add'>+#define PIN_XTAL_XIN			33</div><div class='add'>+#define PIN_SD1_GPIO0			35</div><div class='add'>+#define PIN_SD1_GPIO1			36</div><div class='add'>+#define PIN_SD1_D3			38</div><div class='add'>+#define PIN_SD1_D2			39</div><div class='add'>+#define PIN_SD1_D1			40</div><div class='add'>+#define PIN_SD1_D0			41</div><div class='add'>+#define PIN_SD1_CMD			42</div><div class='add'>+#define PIN_SD1_CLK			43</div><div class='add'>+#define PIN_ADC1			44</div><div class='add'>+#define PIN_USB_VBUS_DET		45</div><div class='add'>+#define PIN_ETH_TXP			47</div><div class='add'>+#define PIN_ETH_TXM			48</div><div class='add'>+#define PIN_ETH_RXP			49</div><div class='add'>+#define PIN_ETH_RXM			50</div><div class='add'>+#define PIN_MIPIRX4N			56</div><div class='add'>+#define PIN_MIPIRX4P			57</div><div class='add'>+#define PIN_MIPIRX3N			58</div><div class='add'>+#define PIN_MIPIRX3P			59</div><div class='add'>+#define PIN_MIPIRX2N			60</div><div class='add'>+#define PIN_MIPIRX2P			61</div><div class='add'>+#define PIN_MIPIRX1N			62</div><div class='add'>+#define PIN_MIPIRX1P			63</div><div class='add'>+#define PIN_MIPIRX0N			64</div><div class='add'>+#define PIN_MIPIRX0P			65</div><div class='add'>+#define PIN_AUD_AINL_MIC		67</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_PINCTRL_CV1800B_H */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/pinctrl-cv1812h.h b/include/dt-bindings/pinctrl/pinctrl-cv1812h.h<br/>new file mode 100644<br/>index 000000000000..2908de347919<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/pinctrl-cv1812h.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/pinctrl-cv1812h.h</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Inochi Amaoto &lt;inochiama@outlook.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is generated from vendor pinout definition.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_PINCTRL_CV1812H_H</div><div class='add'>+#define _DT_BINDINGS_PINCTRL_CV1812H_H</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/pinctrl-cv18xx.h&gt;</div><div class='add'>+</div><div class='add'>+#define PINPOS(row, col)			\</div><div class='add'>+	((((row) - 'A' + 1) &lt;&lt; 8) + ((col) - 1))</div><div class='add'>+</div><div class='add'>+#define PIN_MIPI_TXM4			PINPOS('A', 2)</div><div class='add'>+#define PIN_MIPIRX0N			PINPOS('A', 4)</div><div class='add'>+#define PIN_MIPIRX3P			PINPOS('A', 6)</div><div class='add'>+#define PIN_MIPIRX4P			PINPOS('A', 7)</div><div class='add'>+#define PIN_VIVO_D2			PINPOS('A', 9)</div><div class='add'>+#define PIN_VIVO_D3			PINPOS('A', 10)</div><div class='add'>+#define PIN_VIVO_D10			PINPOS('A', 12)</div><div class='add'>+#define PIN_USB_VBUS_DET		PINPOS('A', 13)</div><div class='add'>+#define PIN_MIPI_TXP3			PINPOS('B', 1)</div><div class='add'>+#define PIN_MIPI_TXM3			PINPOS('B', 2)</div><div class='add'>+#define PIN_MIPI_TXP4			PINPOS('B', 3)</div><div class='add'>+#define PIN_MIPIRX0P			PINPOS('B', 4)</div><div class='add'>+#define PIN_MIPIRX1N			PINPOS('B', 5)</div><div class='add'>+#define PIN_MIPIRX2N			PINPOS('B', 6)</div><div class='add'>+#define PIN_MIPIRX4N			PINPOS('B', 7)</div><div class='add'>+#define PIN_MIPIRX5N			PINPOS('B', 8)</div><div class='add'>+#define PIN_VIVO_D1			PINPOS('B', 9)</div><div class='add'>+#define PIN_VIVO_D5			PINPOS('B', 10)</div><div class='add'>+#define PIN_VIVO_D7			PINPOS('B', 11)</div><div class='add'>+#define PIN_VIVO_D9			PINPOS('B', 12)</div><div class='add'>+#define PIN_USB_ID			PINPOS('B', 13)</div><div class='add'>+#define PIN_ETH_RXM			PINPOS('B', 15)</div><div class='add'>+#define PIN_MIPI_TXP2			PINPOS('C', 1)</div><div class='add'>+#define PIN_MIPI_TXM2			PINPOS('C', 2)</div><div class='add'>+#define PIN_CAM_PD0			PINPOS('C', 3)</div><div class='add'>+#define PIN_CAM_MCLK0			PINPOS('C', 4)</div><div class='add'>+#define PIN_MIPIRX1P			PINPOS('C', 5)</div><div class='add'>+#define PIN_MIPIRX2P			PINPOS('C', 6)</div><div class='add'>+#define PIN_MIPIRX3N			PINPOS('C', 7)</div><div class='add'>+#define PIN_MIPIRX5P			PINPOS('C', 8)</div><div class='add'>+#define PIN_VIVO_CLK			PINPOS('C', 9)</div><div class='add'>+#define PIN_VIVO_D6			PINPOS('C', 10)</div><div class='add'>+#define PIN_VIVO_D8			PINPOS('C', 11)</div><div class='add'>+#define PIN_USB_VBUS_EN			PINPOS('C', 12)</div><div class='add'>+#define PIN_ETH_RXP			PINPOS('C', 14)</div><div class='add'>+#define PIN_GPIO_RTX			PINPOS('C', 15)</div><div class='add'>+#define PIN_MIPI_TXP1			PINPOS('D', 1)</div><div class='add'>+#define PIN_MIPI_TXM1			PINPOS('D', 2)</div><div class='add'>+#define PIN_CAM_MCLK1			PINPOS('D', 3)</div><div class='add'>+#define PIN_IIC3_SCL			PINPOS('D', 4)</div><div class='add'>+#define PIN_VIVO_D4			PINPOS('D', 10)</div><div class='add'>+#define PIN_ETH_TXM			PINPOS('D', 14)</div><div class='add'>+#define PIN_ETH_TXP			PINPOS('D', 15)</div><div class='add'>+#define PIN_MIPI_TXP0			PINPOS('E', 1)</div><div class='add'>+#define PIN_MIPI_TXM0			PINPOS('E', 2)</div><div class='add'>+#define PIN_CAM_PD1			PINPOS('E', 4)</div><div class='add'>+#define PIN_CAM_RST0			PINPOS('E', 5)</div><div class='add'>+#define PIN_VIVO_D0			PINPOS('E', 10)</div><div class='add'>+#define PIN_ADC1			PINPOS('E', 13)</div><div class='add'>+#define PIN_ADC2			PINPOS('E', 14)</div><div class='add'>+#define PIN_ADC3			PINPOS('E', 15)</div><div class='add'>+#define PIN_AUD_AOUTL			PINPOS('F', 2)</div><div class='add'>+#define PIN_IIC3_SDA			PINPOS('F', 4)</div><div class='add'>+#define PIN_SD1_D2			PINPOS('F', 14)</div><div class='add'>+#define PIN_AUD_AOUTR			PINPOS('G', 2)</div><div class='add'>+#define PIN_SD1_D3			PINPOS('G', 13)</div><div class='add'>+#define PIN_SD1_CLK			PINPOS('G', 14)</div><div class='add'>+#define PIN_SD1_CMD			PINPOS('G', 15)</div><div class='add'>+#define PIN_AUD_AINL_MIC		PINPOS('H', 1)</div><div class='add'>+#define PIN_RSTN			PINPOS('H', 12)</div><div class='add'>+#define PIN_PWM0_BUCK			PINPOS('H', 13)</div><div class='add'>+#define PIN_SD1_D1			PINPOS('H', 14)</div><div class='add'>+#define PIN_SD1_D0			PINPOS('H', 15)</div><div class='add'>+#define PIN_AUD_AINR_MIC		PINPOS('J', 1)</div><div class='add'>+#define PIN_IIC2_SCL			PINPOS('J', 13)</div><div class='add'>+#define PIN_IIC2_SDA			PINPOS('J', 14)</div><div class='add'>+#define PIN_SD0_CD			PINPOS('K', 2)</div><div class='add'>+#define PIN_SD0_D1			PINPOS('K', 3)</div><div class='add'>+#define PIN_UART2_RX			PINPOS('K', 13)</div><div class='add'>+#define PIN_UART2_CTS			PINPOS('K', 14)</div><div class='add'>+#define PIN_UART2_TX			PINPOS('K', 15)</div><div class='add'>+#define PIN_SD0_CLK			PINPOS('L', 1)</div><div class='add'>+#define PIN_SD0_D0			PINPOS('L', 2)</div><div class='add'>+#define PIN_SD0_CMD			PINPOS('L', 3)</div><div class='add'>+#define PIN_CLK32K			PINPOS('L', 14)</div><div class='add'>+#define PIN_UART2_RTS			PINPOS('L', 15)</div><div class='add'>+#define PIN_SD0_D3			PINPOS('M', 1)</div><div class='add'>+#define PIN_SD0_D2			PINPOS('M', 2)</div><div class='add'>+#define PIN_UART0_RX			PINPOS('M', 4)</div><div class='add'>+#define PIN_UART0_TX			PINPOS('M', 5)</div><div class='add'>+#define PIN_JTAG_CPU_TRST		PINPOS('M', 6)</div><div class='add'>+#define PIN_PWR_ON			PINPOS('M', 11)</div><div class='add'>+#define PIN_PWR_GPIO2			PINPOS('M', 12)</div><div class='add'>+#define PIN_PWR_GPIO0			PINPOS('M', 13)</div><div class='add'>+#define PIN_CLK25M			PINPOS('M', 14)</div><div class='add'>+#define PIN_SD0_PWR_EN			PINPOS('N', 1)</div><div class='add'>+#define PIN_SPK_EN			PINPOS('N', 3)</div><div class='add'>+#define PIN_JTAG_CPU_TCK		PINPOS('N', 4)</div><div class='add'>+#define PIN_JTAG_CPU_TMS		PINPOS('N', 6)</div><div class='add'>+#define PIN_PWR_WAKEUP1			PINPOS('N', 11)</div><div class='add'>+#define PIN_PWR_WAKEUP0			PINPOS('N', 12)</div><div class='add'>+#define PIN_PWR_GPIO1			PINPOS('N', 13)</div><div class='add'>+#define PIN_EMMC_DAT3			PINPOS('P', 1)</div><div class='add'>+#define PIN_EMMC_DAT0			PINPOS('P', 2)</div><div class='add'>+#define PIN_EMMC_DAT2			PINPOS('P', 3)</div><div class='add'>+#define PIN_EMMC_RSTN			PINPOS('P', 4)</div><div class='add'>+#define PIN_AUX0			PINPOS('P', 5)</div><div class='add'>+#define PIN_IIC0_SDA			PINPOS('P', 6)</div><div class='add'>+#define PIN_PWR_SEQ3			PINPOS('P', 10)</div><div class='add'>+#define PIN_PWR_VBAT_DET		PINPOS('P', 11)</div><div class='add'>+#define PIN_PWR_SEQ1			PINPOS('P', 12)</div><div class='add'>+#define PIN_PWR_BUTTON1			PINPOS('P', 13)</div><div class='add'>+#define PIN_EMMC_DAT1			PINPOS('R', 2)</div><div class='add'>+#define PIN_EMMC_CMD			PINPOS('R', 3)</div><div class='add'>+#define PIN_EMMC_CLK			PINPOS('R', 4)</div><div class='add'>+#define PIN_IIC0_SCL			PINPOS('R', 6)</div><div class='add'>+#define PIN_GPIO_ZQ			PINPOS('R', 10)</div><div class='add'>+#define PIN_PWR_RSTN			PINPOS('R', 11)</div><div class='add'>+#define PIN_PWR_SEQ2			PINPOS('R', 12)</div><div class='add'>+#define PIN_XTAL_XIN			PINPOS('R', 13)</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_PINCTRL_CV1812H_H */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/pinctrl-cv18xx.h b/include/dt-bindings/pinctrl/pinctrl-cv18xx.h<br/>new file mode 100644<br/>index 000000000000..bc92ad1067ec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/pinctrl-cv18xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/pinctrl-cv18xx.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Sophgo Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Author: Inochi Amaoto &lt;inochiama@outlook.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_PINCTRL_CV18XX_H</div><div class='add'>+#define _DT_BINDINGS_PINCTRL_CV18XX_H</div><div class='add'>+</div><div class='add'>+#define PIN_MUX_INVALD				0xff</div><div class='add'>+</div><div class='add'>+#define PINMUX2(pin, mux, mux2)	\</div><div class='add'>+	(((pin) &amp; 0xffff) | (((mux) &amp; 0xff) &lt;&lt; 16) | (((mux2) &amp; 0xff) &lt;&lt; 24))</div><div class='add'>+</div><div class='add'>+#define PINMUX(pin, mux) \</div><div class='add'>+	PINMUX2(pin, mux, PIN_MUX_INVALD)</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_PINCTRL_CV18XX_H */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/pinctrl-sg2000.h b/include/dt-bindings/pinctrl/pinctrl-sg2000.h<br/>new file mode 100644<br/>index 000000000000..4871f9a7c6c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/pinctrl-sg2000.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/pinctrl-sg2000.h</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Inochi Amaoto &lt;inochiama@outlook.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is generated from vendor pinout definition.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_PINCTRL_SG2000_H</div><div class='add'>+#define _DT_BINDINGS_PINCTRL_SG2000_H</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/pinctrl-cv18xx.h&gt;</div><div class='add'>+</div><div class='add'>+#define PINPOS(row, col)			\</div><div class='add'>+	((((row) - 'A' + 1) &lt;&lt; 8) + ((col) - 1))</div><div class='add'>+</div><div class='add'>+#define PIN_MIPI_TXM4			PINPOS('A', 2)</div><div class='add'>+#define PIN_MIPIRX0N			PINPOS('A', 4)</div><div class='add'>+#define PIN_MIPIRX3P			PINPOS('A', 6)</div><div class='add'>+#define PIN_MIPIRX4P			PINPOS('A', 7)</div><div class='add'>+#define PIN_VIVO_D2			PINPOS('A', 9)</div><div class='add'>+#define PIN_VIVO_D3			PINPOS('A', 10)</div><div class='add'>+#define PIN_VIVO_D10			PINPOS('A', 12)</div><div class='add'>+#define PIN_USB_VBUS_DET		PINPOS('A', 13)</div><div class='add'>+#define PIN_MIPI_TXP3			PINPOS('B', 1)</div><div class='add'>+#define PIN_MIPI_TXM3			PINPOS('B', 2)</div><div class='add'>+#define PIN_MIPI_TXP4			PINPOS('B', 3)</div><div class='add'>+#define PIN_MIPIRX0P			PINPOS('B', 4)</div><div class='add'>+#define PIN_MIPIRX1N			PINPOS('B', 5)</div><div class='add'>+#define PIN_MIPIRX2N			PINPOS('B', 6)</div><div class='add'>+#define PIN_MIPIRX4N			PINPOS('B', 7)</div><div class='add'>+#define PIN_MIPIRX5N			PINPOS('B', 8)</div><div class='add'>+#define PIN_VIVO_D1			PINPOS('B', 9)</div><div class='add'>+#define PIN_VIVO_D5			PINPOS('B', 10)</div><div class='add'>+#define PIN_VIVO_D7			PINPOS('B', 11)</div><div class='add'>+#define PIN_VIVO_D9			PINPOS('B', 12)</div><div class='add'>+#define PIN_USB_ID			PINPOS('B', 13)</div><div class='add'>+#define PIN_ETH_RXM			PINPOS('B', 15)</div><div class='add'>+#define PIN_MIPI_TXP2			PINPOS('C', 1)</div><div class='add'>+#define PIN_MIPI_TXM2			PINPOS('C', 2)</div><div class='add'>+#define PIN_CAM_PD0			PINPOS('C', 3)</div><div class='add'>+#define PIN_CAM_MCLK0			PINPOS('C', 4)</div><div class='add'>+#define PIN_MIPIRX1P			PINPOS('C', 5)</div><div class='add'>+#define PIN_MIPIRX2P			PINPOS('C', 6)</div><div class='add'>+#define PIN_MIPIRX3N			PINPOS('C', 7)</div><div class='add'>+#define PIN_MIPIRX5P			PINPOS('C', 8)</div><div class='add'>+#define PIN_VIVO_CLK			PINPOS('C', 9)</div><div class='add'>+#define PIN_VIVO_D6			PINPOS('C', 10)</div><div class='add'>+#define PIN_VIVO_D8			PINPOS('C', 11)</div><div class='add'>+#define PIN_USB_VBUS_EN			PINPOS('C', 12)</div><div class='add'>+#define PIN_ETH_RXP			PINPOS('C', 14)</div><div class='add'>+#define PIN_GPIO_RTX			PINPOS('C', 15)</div><div class='add'>+#define PIN_MIPI_TXP1			PINPOS('D', 1)</div><div class='add'>+#define PIN_MIPI_TXM1			PINPOS('D', 2)</div><div class='add'>+#define PIN_CAM_MCLK1			PINPOS('D', 3)</div><div class='add'>+#define PIN_IIC3_SCL			PINPOS('D', 4)</div><div class='add'>+#define PIN_VIVO_D4			PINPOS('D', 10)</div><div class='add'>+#define PIN_ETH_TXM			PINPOS('D', 14)</div><div class='add'>+#define PIN_ETH_TXP			PINPOS('D', 15)</div><div class='add'>+#define PIN_MIPI_TXP0			PINPOS('E', 1)</div><div class='add'>+#define PIN_MIPI_TXM0			PINPOS('E', 2)</div><div class='add'>+#define PIN_CAM_PD1			PINPOS('E', 4)</div><div class='add'>+#define PIN_CAM_RST0			PINPOS('E', 5)</div><div class='add'>+#define PIN_VIVO_D0			PINPOS('E', 10)</div><div class='add'>+#define PIN_ADC1			PINPOS('E', 13)</div><div class='add'>+#define PIN_ADC2			PINPOS('E', 14)</div><div class='add'>+#define PIN_ADC3			PINPOS('E', 15)</div><div class='add'>+#define PIN_AUD_AOUTL			PINPOS('F', 2)</div><div class='add'>+#define PIN_IIC3_SDA			PINPOS('F', 4)</div><div class='add'>+#define PIN_SD1_D2			PINPOS('F', 14)</div><div class='add'>+#define PIN_AUD_AOUTR			PINPOS('G', 2)</div><div class='add'>+#define PIN_SD1_D3			PINPOS('G', 13)</div><div class='add'>+#define PIN_SD1_CLK			PINPOS('G', 14)</div><div class='add'>+#define PIN_SD1_CMD			PINPOS('G', 15)</div><div class='add'>+#define PIN_AUD_AINL_MIC		PINPOS('H', 1)</div><div class='add'>+#define PIN_RSTN			PINPOS('H', 12)</div><div class='add'>+#define PIN_PWM0_BUCK			PINPOS('H', 13)</div><div class='add'>+#define PIN_SD1_D1			PINPOS('H', 14)</div><div class='add'>+#define PIN_SD1_D0			PINPOS('H', 15)</div><div class='add'>+#define PIN_AUD_AINR_MIC		PINPOS('J', 1)</div><div class='add'>+#define PIN_IIC2_SCL			PINPOS('J', 13)</div><div class='add'>+#define PIN_IIC2_SDA			PINPOS('J', 14)</div><div class='add'>+#define PIN_SD0_CD			PINPOS('K', 2)</div><div class='add'>+#define PIN_SD0_D1			PINPOS('K', 3)</div><div class='add'>+#define PIN_UART2_RX			PINPOS('K', 13)</div><div class='add'>+#define PIN_UART2_CTS			PINPOS('K', 14)</div><div class='add'>+#define PIN_UART2_TX			PINPOS('K', 15)</div><div class='add'>+#define PIN_SD0_CLK			PINPOS('L', 1)</div><div class='add'>+#define PIN_SD0_D0			PINPOS('L', 2)</div><div class='add'>+#define PIN_SD0_CMD			PINPOS('L', 3)</div><div class='add'>+#define PIN_CLK32K			PINPOS('L', 14)</div><div class='add'>+#define PIN_UART2_RTS			PINPOS('L', 15)</div><div class='add'>+#define PIN_SD0_D3			PINPOS('M', 1)</div><div class='add'>+#define PIN_SD0_D2			PINPOS('M', 2)</div><div class='add'>+#define PIN_UART0_RX			PINPOS('M', 4)</div><div class='add'>+#define PIN_UART0_TX			PINPOS('M', 5)</div><div class='add'>+#define PIN_JTAG_CPU_TRST		PINPOS('M', 6)</div><div class='add'>+#define PIN_PWR_ON			PINPOS('M', 11)</div><div class='add'>+#define PIN_PWR_GPIO2			PINPOS('M', 12)</div><div class='add'>+#define PIN_PWR_GPIO0			PINPOS('M', 13)</div><div class='add'>+#define PIN_CLK25M			PINPOS('M', 14)</div><div class='add'>+#define PIN_SD0_PWR_EN			PINPOS('N', 1)</div><div class='add'>+#define PIN_SPK_EN			PINPOS('N', 3)</div><div class='add'>+#define PIN_JTAG_CPU_TCK		PINPOS('N', 4)</div><div class='add'>+#define PIN_JTAG_CPU_TMS		PINPOS('N', 6)</div><div class='add'>+#define PIN_PWR_WAKEUP1			PINPOS('N', 11)</div><div class='add'>+#define PIN_PWR_WAKEUP0			PINPOS('N', 12)</div><div class='add'>+#define PIN_PWR_GPIO1			PINPOS('N', 13)</div><div class='add'>+#define PIN_EMMC_DAT3			PINPOS('P', 1)</div><div class='add'>+#define PIN_EMMC_DAT0			PINPOS('P', 2)</div><div class='add'>+#define PIN_EMMC_DAT2			PINPOS('P', 3)</div><div class='add'>+#define PIN_EMMC_RSTN			PINPOS('P', 4)</div><div class='add'>+#define PIN_AUX0			PINPOS('P', 5)</div><div class='add'>+#define PIN_IIC0_SDA			PINPOS('P', 6)</div><div class='add'>+#define PIN_PWR_SEQ3			PINPOS('P', 10)</div><div class='add'>+#define PIN_PWR_VBAT_DET		PINPOS('P', 11)</div><div class='add'>+#define PIN_PWR_SEQ1			PINPOS('P', 12)</div><div class='add'>+#define PIN_PWR_BUTTON1			PINPOS('P', 13)</div><div class='add'>+#define PIN_EMMC_DAT1			PINPOS('R', 2)</div><div class='add'>+#define PIN_EMMC_CMD			PINPOS('R', 3)</div><div class='add'>+#define PIN_EMMC_CLK			PINPOS('R', 4)</div><div class='add'>+#define PIN_IIC0_SCL			PINPOS('R', 6)</div><div class='add'>+#define PIN_GPIO_ZQ			PINPOS('R', 10)</div><div class='add'>+#define PIN_PWR_RSTN			PINPOS('R', 11)</div><div class='add'>+#define PIN_PWR_SEQ2			PINPOS('R', 12)</div><div class='add'>+#define PIN_XTAL_XIN			PINPOS('R', 13)</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_PINCTRL_SG2000_H */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/pinctrl-sg2002.h b/include/dt-bindings/pinctrl/pinctrl-sg2002.h<br/>new file mode 100644<br/>index 000000000000..3c36cfa0a550<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/pinctrl-sg2002.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/pinctrl-sg2002.h</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Inochi Amaoto &lt;inochiama@outlook.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is generated from vendor pinout definition.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_PINCTRL_SG2002_H</div><div class='add'>+#define _DT_BINDINGS_PINCTRL_SG2002_H</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/pinctrl-cv18xx.h&gt;</div><div class='add'>+</div><div class='add'>+#define PIN_AUD_AINL_MIC		2</div><div class='add'>+#define PIN_AUD_AOUTR			4</div><div class='add'>+#define PIN_SD0_CLK			6</div><div class='add'>+#define PIN_SD0_CMD			7</div><div class='add'>+#define PIN_SD0_D0			8</div><div class='add'>+#define PIN_SD0_D1			10</div><div class='add'>+#define PIN_SD0_D2			11</div><div class='add'>+#define PIN_SD0_D3			12</div><div class='add'>+#define PIN_SD0_CD			14</div><div class='add'>+#define PIN_SD0_PWR_EN			15</div><div class='add'>+#define PIN_SPK_EN			17</div><div class='add'>+#define PIN_UART0_TX			18</div><div class='add'>+#define PIN_UART0_RX			19</div><div class='add'>+#define PIN_EMMC_DAT2			20</div><div class='add'>+#define PIN_EMMC_CLK			21</div><div class='add'>+#define PIN_EMMC_DAT0			22</div><div class='add'>+#define PIN_EMMC_DAT3			23</div><div class='add'>+#define PIN_EMMC_CMD			24</div><div class='add'>+#define PIN_EMMC_DAT1			25</div><div class='add'>+#define PIN_JTAG_CPU_TMS		26</div><div class='add'>+#define PIN_JTAG_CPU_TCK		27</div><div class='add'>+#define PIN_IIC0_SCL			28</div><div class='add'>+#define PIN_IIC0_SDA			29</div><div class='add'>+#define PIN_AUX0			30</div><div class='add'>+#define PIN_GPIO_ZQ			35</div><div class='add'>+#define PIN_PWR_VBAT_DET		38</div><div class='add'>+#define PIN_PWR_RSTN			39</div><div class='add'>+#define PIN_PWR_SEQ1			40</div><div class='add'>+#define PIN_PWR_SEQ2			41</div><div class='add'>+#define PIN_PWR_WAKEUP0			43</div><div class='add'>+#define PIN_PWR_BUTTON1			44</div><div class='add'>+#define PIN_XTAL_XIN			45</div><div class='add'>+#define PIN_PWR_GPIO0			47</div><div class='add'>+#define PIN_PWR_GPIO1			48</div><div class='add'>+#define PIN_PWR_GPIO2			49</div><div class='add'>+#define PIN_SD1_D3			51</div><div class='add'>+#define PIN_SD1_D2			52</div><div class='add'>+#define PIN_SD1_D1			53</div><div class='add'>+#define PIN_SD1_D0			54</div><div class='add'>+#define PIN_SD1_CMD			55</div><div class='add'>+#define PIN_SD1_CLK			56</div><div class='add'>+#define PIN_PWM0_BUCK			58</div><div class='add'>+#define PIN_ADC1			59</div><div class='add'>+#define PIN_USB_VBUS_DET		60</div><div class='add'>+#define PIN_ETH_TXP			62</div><div class='add'>+#define PIN_ETH_TXM			63</div><div class='add'>+#define PIN_ETH_RXP			64</div><div class='add'>+#define PIN_ETH_RXM			65</div><div class='add'>+#define PIN_GPIO_RTX			67</div><div class='add'>+#define PIN_MIPIRX4N			72</div><div class='add'>+#define PIN_MIPIRX4P			73</div><div class='add'>+#define PIN_MIPIRX3N			74</div><div class='add'>+#define PIN_MIPIRX3P			75</div><div class='add'>+#define PIN_MIPIRX2N			76</div><div class='add'>+#define PIN_MIPIRX2P			77</div><div class='add'>+#define PIN_MIPIRX1N			78</div><div class='add'>+#define PIN_MIPIRX1P			79</div><div class='add'>+#define PIN_MIPIRX0N			80</div><div class='add'>+#define PIN_MIPIRX0P			81</div><div class='add'>+#define PIN_MIPI_TXM2			83</div><div class='add'>+#define PIN_MIPI_TXP2			84</div><div class='add'>+#define PIN_MIPI_TXM1			85</div><div class='add'>+#define PIN_MIPI_TXP1			86</div><div class='add'>+#define PIN_MIPI_TXM0			87</div><div class='add'>+#define PIN_MIPI_TXP0			88</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_PINCTRL_SG2002_H */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/pinctrl-sg2042.h b/include/dt-bindings/pinctrl/pinctrl-sg2042.h<br/>new file mode 100644<br/>index 000000000000..79d5bb8e04f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/pinctrl-sg2042.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/pinctrl-sg2042.h</a></div><div class='hunk'>@@ -0,0 +1,196 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Inochi Amaoto &lt;inochiama@outlook.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_PINCTRL_SG2042_H</div><div class='add'>+#define _DT_BINDINGS_PINCTRL_SG2042_H</div><div class='add'>+</div><div class='add'>+#define PINMUX(pin, mux) \</div><div class='add'>+	(((pin) &amp; 0xffff) | (((mux) &amp; 0xff) &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+#define PIN_LPC_LCLK			0</div><div class='add'>+#define PIN_LPC_LFRAME			1</div><div class='add'>+#define PIN_LPC_LAD0			2</div><div class='add'>+#define PIN_LPC_LAD1			3</div><div class='add'>+#define PIN_LPC_LAD2			4</div><div class='add'>+#define PIN_LPC_LAD3			5</div><div class='add'>+#define PIN_LPC_LDRQ0			6</div><div class='add'>+#define PIN_LPC_LDRQ1			7</div><div class='add'>+#define PIN_LPC_SERIRQ			8</div><div class='add'>+#define PIN_LPC_CLKRUN			9</div><div class='add'>+#define PIN_LPC_LPME			10</div><div class='add'>+#define PIN_LPC_LPCPD			11</div><div class='add'>+#define PIN_LPC_LSMI			12</div><div class='add'>+#define PIN_PCIE0_L0_RESET		13</div><div class='add'>+#define PIN_PCIE0_L1_RESET		14</div><div class='add'>+#define PIN_PCIE0_L0_WAKEUP		15</div><div class='add'>+#define PIN_PCIE0_L1_WAKEUP		16</div><div class='add'>+#define PIN_PCIE0_L0_CLKREQ_IN		17</div><div class='add'>+#define PIN_PCIE0_L1_CLKREQ_IN		18</div><div class='add'>+#define PIN_PCIE1_L0_RESET		19</div><div class='add'>+#define PIN_PCIE1_L1_RESET		20</div><div class='add'>+#define PIN_PCIE1_L0_WAKEUP		21</div><div class='add'>+#define PIN_PCIE1_L1_WAKEUP		22</div><div class='add'>+#define PIN_PCIE1_L0_CLKREQ_IN		23</div><div class='add'>+#define PIN_PCIE1_L1_CLKREQ_IN		24</div><div class='add'>+#define PIN_SPIF0_CLK_SEL1		25</div><div class='add'>+#define PIN_SPIF0_CLK_SEL0		26</div><div class='add'>+#define PIN_SPIF0_WP			27</div><div class='add'>+#define PIN_SPIF0_HOLD			28</div><div class='add'>+#define PIN_SPIF0_SDI			29</div><div class='add'>+#define PIN_SPIF0_CS			30</div><div class='add'>+#define PIN_SPIF0_SCK			31</div><div class='add'>+#define PIN_SPIF0_SDO			32</div><div class='add'>+#define PIN_SPIF1_CLK_SEL1		33</div><div class='add'>+#define PIN_SPIF1_CLK_SEL0		34</div><div class='add'>+#define PIN_SPIF1_WP			35</div><div class='add'>+#define PIN_SPIF1_HOLD			36</div><div class='add'>+#define PIN_SPIF1_SDI			37</div><div class='add'>+#define PIN_SPIF1_CS			38</div><div class='add'>+#define PIN_SPIF1_SCK			39</div><div class='add'>+#define PIN_SPIF1_SDO			40</div><div class='add'>+#define PIN_EMMC_WP			41</div><div class='add'>+#define PIN_EMMC_CD			42</div><div class='add'>+#define PIN_EMMC_RST			43</div><div class='add'>+#define PIN_EMMC_PWR_EN			44</div><div class='add'>+#define PIN_SDIO_CD			45</div><div class='add'>+#define PIN_SDIO_WP			46</div><div class='add'>+#define PIN_SDIO_RST			47</div><div class='add'>+#define PIN_SDIO_PWR_EN			48</div><div class='add'>+#define PIN_RGMII0_TXD0			49</div><div class='add'>+#define PIN_RGMII0_TXD1			50</div><div class='add'>+#define PIN_RGMII0_TXD2			51</div><div class='add'>+#define PIN_RGMII0_TXD3			52</div><div class='add'>+#define PIN_RGMII0_TXCTRL		53</div><div class='add'>+#define PIN_RGMII0_RXD0			54</div><div class='add'>+#define PIN_RGMII0_RXD1			55</div><div class='add'>+#define PIN_RGMII0_RXD2			56</div><div class='add'>+#define PIN_RGMII0_RXD3			57</div><div class='add'>+#define PIN_RGMII0_RXCTRL		58</div><div class='add'>+#define PIN_RGMII0_TXC			59</div><div class='add'>+#define PIN_RGMII0_RXC			60</div><div class='add'>+#define PIN_RGMII0_REFCLKO		61</div><div class='add'>+#define PIN_RGMII0_IRQ			62</div><div class='add'>+#define PIN_RGMII0_MDC			63</div><div class='add'>+#define PIN_RGMII0_MDIO			64</div><div class='add'>+#define PIN_PWM0			65</div><div class='add'>+#define PIN_PWM1			66</div><div class='add'>+#define PIN_PWM2			67</div><div class='add'>+#define PIN_PWM3			68</div><div class='add'>+#define PIN_FAN0			69</div><div class='add'>+#define PIN_FAN1			70</div><div class='add'>+#define PIN_FAN2			71</div><div class='add'>+#define PIN_FAN3			72</div><div class='add'>+#define PIN_IIC0_SDA			73</div><div class='add'>+#define PIN_IIC0_SCL			74</div><div class='add'>+#define PIN_IIC1_SDA			75</div><div class='add'>+#define PIN_IIC1_SCL			76</div><div class='add'>+#define PIN_IIC2_SDA			77</div><div class='add'>+#define PIN_IIC2_SCL			78</div><div class='add'>+#define PIN_IIC3_SDA			79</div><div class='add'>+#define PIN_IIC3_SCL			80</div><div class='add'>+#define PIN_UART0_TX			81</div><div class='add'>+#define PIN_UART0_RX			82</div><div class='add'>+#define PIN_UART0_RTS			83</div><div class='add'>+#define PIN_UART0_CTS			84</div><div class='add'>+#define PIN_UART1_TX			85</div><div class='add'>+#define PIN_UART1_RX			86</div><div class='add'>+#define PIN_UART1_RTS			87</div><div class='add'>+#define PIN_UART1_CTS			88</div><div class='add'>+#define PIN_UART2_TX			89</div><div class='add'>+#define PIN_UART2_RX			90</div><div class='add'>+#define PIN_UART2_RTS			91</div><div class='add'>+#define PIN_UART2_CTS			92</div><div class='add'>+#define PIN_UART3_TX			93</div><div class='add'>+#define PIN_UART3_RX			94</div><div class='add'>+#define PIN_UART3_RTS			95</div><div class='add'>+#define PIN_UART3_CTS			96</div><div class='add'>+#define PIN_SPI0_CS0			97</div><div class='add'>+#define PIN_SPI0_CS1			98</div><div class='add'>+#define PIN_SPI0_SDI			99</div><div class='add'>+#define PIN_SPI0_SDO			100</div><div class='add'>+#define PIN_SPI0_SCK			101</div><div class='add'>+#define PIN_SPI1_CS0			102</div><div class='add'>+#define PIN_SPI1_CS1			103</div><div class='add'>+#define PIN_SPI1_SDI			104</div><div class='add'>+#define PIN_SPI1_SDO			105</div><div class='add'>+#define PIN_SPI1_SCK			106</div><div class='add'>+#define PIN_JTAG0_TDO			107</div><div class='add'>+#define PIN_JTAG0_TCK			108</div><div class='add'>+#define PIN_JTAG0_TDI			109</div><div class='add'>+#define PIN_JTAG0_TMS			110</div><div class='add'>+#define PIN_JTAG0_TRST			111</div><div class='add'>+#define PIN_JTAG0_SRST			112</div><div class='add'>+#define PIN_JTAG1_TDO			113</div><div class='add'>+#define PIN_JTAG1_TCK			114</div><div class='add'>+#define PIN_JTAG1_TDI			115</div><div class='add'>+#define PIN_JTAG1_TMS			116</div><div class='add'>+#define PIN_JTAG1_TRST			117</div><div class='add'>+#define PIN_JTAG1_SRST			118</div><div class='add'>+#define PIN_JTAG2_TDO			119</div><div class='add'>+#define PIN_JTAG2_TCK			120</div><div class='add'>+#define PIN_JTAG2_TDI			121</div><div class='add'>+#define PIN_JTAG2_TMS			122</div><div class='add'>+#define PIN_JTAG2_TRST			123</div><div class='add'>+#define PIN_JTAG2_SRST			124</div><div class='add'>+#define PIN_GPIO0			125</div><div class='add'>+#define PIN_GPIO1			126</div><div class='add'>+#define PIN_GPIO2			127</div><div class='add'>+#define PIN_GPIO3			128</div><div class='add'>+#define PIN_GPIO4			129</div><div class='add'>+#define PIN_GPIO5			130</div><div class='add'>+#define PIN_GPIO6			131</div><div class='add'>+#define PIN_GPIO7			132</div><div class='add'>+#define PIN_GPIO8			133</div><div class='add'>+#define PIN_GPIO9			134</div><div class='add'>+#define PIN_GPIO10			135</div><div class='add'>+#define PIN_GPIO11			136</div><div class='add'>+#define PIN_GPIO12			137</div><div class='add'>+#define PIN_GPIO13			138</div><div class='add'>+#define PIN_GPIO14			139</div><div class='add'>+#define PIN_GPIO15			140</div><div class='add'>+#define PIN_GPIO16			141</div><div class='add'>+#define PIN_GPIO17			142</div><div class='add'>+#define PIN_GPIO18			143</div><div class='add'>+#define PIN_GPIO19			144</div><div class='add'>+#define PIN_GPIO20			145</div><div class='add'>+#define PIN_GPIO21			146</div><div class='add'>+#define PIN_GPIO22			147</div><div class='add'>+#define PIN_GPIO23			148</div><div class='add'>+#define PIN_GPIO24			149</div><div class='add'>+#define PIN_GPIO25			150</div><div class='add'>+#define PIN_GPIO26			151</div><div class='add'>+#define PIN_GPIO27			152</div><div class='add'>+#define PIN_GPIO28			153</div><div class='add'>+#define PIN_GPIO29			154</div><div class='add'>+#define PIN_GPIO30			155</div><div class='add'>+#define PIN_GPIO31			156</div><div class='add'>+#define PIN_MODE_SEL0			157</div><div class='add'>+#define PIN_MODE_SEL1			158</div><div class='add'>+#define PIN_MODE_SEL2			159</div><div class='add'>+#define PIN_BOOT_SEL0			160</div><div class='add'>+#define PIN_BOOT_SEL1			161</div><div class='add'>+#define PIN_BOOT_SEL2			162</div><div class='add'>+#define PIN_BOOT_SEL3			163</div><div class='add'>+#define PIN_BOOT_SEL4			164</div><div class='add'>+#define PIN_BOOT_SEL5			165</div><div class='add'>+#define PIN_BOOT_SEL6			166</div><div class='add'>+#define PIN_BOOT_SEL7			167</div><div class='add'>+#define PIN_MULTI_SCKT			168</div><div class='add'>+#define PIN_SCKT_ID0			169</div><div class='add'>+#define PIN_SCKT_ID1			170</div><div class='add'>+#define PIN_PLL_CLK_IN_MAIN		171</div><div class='add'>+#define PIN_PLL_CLK_IN_DDR_L		172</div><div class='add'>+#define PIN_PLL_CLK_IN_DDR_R		173</div><div class='add'>+#define PIN_XTAL_32K			174</div><div class='add'>+#define PIN_SYS_RST			175</div><div class='add'>+#define PIN_PWR_BUTTON			176</div><div class='add'>+#define PIN_TEST_EN			177</div><div class='add'>+#define PIN_TEST_MODE_MBIST		178</div><div class='add'>+#define PIN_TEST_MODE_SCAN		179</div><div class='add'>+#define PIN_TEST_MODE_BSD		180</div><div class='add'>+#define PIN_BISR_BYP			181</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_PINCTRL_SG2042_H */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/pinctrl-sg2044.h b/include/dt-bindings/pinctrl/pinctrl-sg2044.h<br/>new file mode 100644<br/>index 000000000000..2a619f681c39<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/pinctrl-sg2044.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/pinctrl-sg2044.h</a></div><div class='hunk'>@@ -0,0 +1,221 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Inochi Amaoto &lt;inochiama@outlook.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_PINCTRL_SG2044_H</div><div class='add'>+#define _DT_BINDINGS_PINCTRL_SG2044_H</div><div class='add'>+</div><div class='add'>+#define PINMUX(pin, mux) \</div><div class='add'>+	(((pin) &amp; 0xffff) | (((mux) &amp; 0xff) &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+#define PIN_IIC0_SMBSUS_IN		0</div><div class='add'>+#define PIN_IIC0_SMBSUS_OUT		1</div><div class='add'>+#define PIN_IIC0_SMBALERT		2</div><div class='add'>+#define PIN_IIC1_SMBSUS_IN		3</div><div class='add'>+#define PIN_IIC1_SMBSUS_OUT		4</div><div class='add'>+#define PIN_IIC1_SMBALERT		5</div><div class='add'>+#define PIN_IIC2_SMBSUS_IN		6</div><div class='add'>+#define PIN_IIC2_SMBSUS_OUT		7</div><div class='add'>+#define PIN_IIC2_SMBALERT		8</div><div class='add'>+#define PIN_IIC3_SMBSUS_IN		9</div><div class='add'>+#define PIN_IIC3_SMBSUS_OUT		10</div><div class='add'>+#define PIN_IIC3_SMBALERT		11</div><div class='add'>+#define PIN_PCIE0_L0_RESET		12</div><div class='add'>+#define PIN_PCIE0_L1_RESET		13</div><div class='add'>+#define PIN_PCIE0_L0_WAKEUP		14</div><div class='add'>+#define PIN_PCIE0_L1_WAKEUP		15</div><div class='add'>+#define PIN_PCIE0_L0_CLKREQ_IN		16</div><div class='add'>+#define PIN_PCIE0_L1_CLKREQ_IN		17</div><div class='add'>+#define PIN_PCIE1_L0_RESET		18</div><div class='add'>+#define PIN_PCIE1_L1_RESET		19</div><div class='add'>+#define PIN_PCIE1_L0_WAKEUP		20</div><div class='add'>+#define PIN_PCIE1_L1_WAKEUP		21</div><div class='add'>+#define PIN_PCIE1_L0_CLKREQ_IN		22</div><div class='add'>+#define PIN_PCIE1_L1_CLKREQ_IN		23</div><div class='add'>+#define PIN_PCIE2_L0_RESET		24</div><div class='add'>+#define PIN_PCIE2_L1_RESET		25</div><div class='add'>+#define PIN_PCIE2_L0_WAKEUP		26</div><div class='add'>+#define PIN_PCIE2_L1_WAKEUP		27</div><div class='add'>+#define PIN_PCIE2_L0_CLKREQ_IN		28</div><div class='add'>+#define PIN_PCIE2_L1_CLKREQ_IN		29</div><div class='add'>+#define PIN_PCIE3_L0_RESET		30</div><div class='add'>+#define PIN_PCIE3_L1_RESET		31</div><div class='add'>+#define PIN_PCIE3_L0_WAKEUP		32</div><div class='add'>+#define PIN_PCIE3_L1_WAKEUP		33</div><div class='add'>+#define PIN_PCIE3_L0_CLKREQ_IN		34</div><div class='add'>+#define PIN_PCIE3_L1_CLKREQ_IN		35</div><div class='add'>+#define PIN_PCIE4_L0_RESET		36</div><div class='add'>+#define PIN_PCIE4_L1_RESET		37</div><div class='add'>+#define PIN_PCIE4_L0_WAKEUP		38</div><div class='add'>+#define PIN_PCIE4_L1_WAKEUP		39</div><div class='add'>+#define PIN_PCIE4_L0_CLKREQ_IN		40</div><div class='add'>+#define PIN_PCIE4_L1_CLKREQ_IN		41</div><div class='add'>+#define PIN_SPIF0_CLK_SEL1		42</div><div class='add'>+#define PIN_SPIF0_CLK_SEL0		43</div><div class='add'>+#define PIN_SPIF0_WP			44</div><div class='add'>+#define PIN_SPIF0_HOLD			45</div><div class='add'>+#define PIN_SPIF0_SDI			46</div><div class='add'>+#define PIN_SPIF0_CS			47</div><div class='add'>+#define PIN_SPIF0_SCK			48</div><div class='add'>+#define PIN_SPIF0_SDO			49</div><div class='add'>+#define PIN_SPIF1_CLK_SEL1		50</div><div class='add'>+#define PIN_SPIF1_CLK_SEL0		51</div><div class='add'>+#define PIN_SPIF1_WP			52</div><div class='add'>+#define PIN_SPIF1_HOLD			53</div><div class='add'>+#define PIN_SPIF1_SDI			54</div><div class='add'>+#define PIN_SPIF1_CS			55</div><div class='add'>+#define PIN_SPIF1_SCK			56</div><div class='add'>+#define PIN_SPIF1_SDO			57</div><div class='add'>+#define PIN_EMMC_WP			58</div><div class='add'>+#define PIN_EMMC_CD			59</div><div class='add'>+#define PIN_EMMC_RST			60</div><div class='add'>+#define PIN_EMMC_PWR_EN			61</div><div class='add'>+#define PIN_SDIO_CD			62</div><div class='add'>+#define PIN_SDIO_WP			63</div><div class='add'>+#define PIN_SDIO_RST			64</div><div class='add'>+#define PIN_SDIO_PWR_EN			65</div><div class='add'>+#define PIN_RGMII0_TXD0			66</div><div class='add'>+#define PIN_RGMII0_TXD1			67</div><div class='add'>+#define PIN_RGMII0_TXD2			68</div><div class='add'>+#define PIN_RGMII0_TXD3			69</div><div class='add'>+#define PIN_RGMII0_TXCTRL		70</div><div class='add'>+#define PIN_RGMII0_RXD0			71</div><div class='add'>+#define PIN_RGMII0_RXD1			72</div><div class='add'>+#define PIN_RGMII0_RXD2			73</div><div class='add'>+#define PIN_RGMII0_RXD3			74</div><div class='add'>+#define PIN_RGMII0_RXCTRL		75</div><div class='add'>+#define PIN_RGMII0_TXC			76</div><div class='add'>+#define PIN_RGMII0_RXC			77</div><div class='add'>+#define PIN_RGMII0_REFCLKO		78</div><div class='add'>+#define PIN_RGMII0_IRQ			79</div><div class='add'>+#define PIN_RGMII0_MDC			80</div><div class='add'>+#define PIN_RGMII0_MDIO			81</div><div class='add'>+#define PIN_PWM0			82</div><div class='add'>+#define PIN_PWM1			83</div><div class='add'>+#define PIN_PWM2			84</div><div class='add'>+#define PIN_PWM3			85</div><div class='add'>+#define PIN_FAN0			86</div><div class='add'>+#define PIN_FAN1			87</div><div class='add'>+#define PIN_FAN2			88</div><div class='add'>+#define PIN_FAN3			89</div><div class='add'>+#define PIN_IIC0_SDA			90</div><div class='add'>+#define PIN_IIC0_SCL			91</div><div class='add'>+#define PIN_IIC1_SDA			92</div><div class='add'>+#define PIN_IIC1_SCL			93</div><div class='add'>+#define PIN_IIC2_SDA			94</div><div class='add'>+#define PIN_IIC2_SCL			95</div><div class='add'>+#define PIN_IIC3_SDA			96</div><div class='add'>+#define PIN_IIC3_SCL			97</div><div class='add'>+#define PIN_UART0_TX			98</div><div class='add'>+#define PIN_UART0_RX			99</div><div class='add'>+#define PIN_UART0_RTS			100</div><div class='add'>+#define PIN_UART0_CTS			101</div><div class='add'>+#define PIN_UART1_TX			102</div><div class='add'>+#define PIN_UART1_RX			103</div><div class='add'>+#define PIN_UART1_RTS			104</div><div class='add'>+#define PIN_UART1_CTS			105</div><div class='add'>+#define PIN_UART2_TX			106</div><div class='add'>+#define PIN_UART2_RX			107</div><div class='add'>+#define PIN_UART2_RTS			108</div><div class='add'>+#define PIN_UART2_CTS			109</div><div class='add'>+#define PIN_UART3_TX			110</div><div class='add'>+#define PIN_UART3_RX			111</div><div class='add'>+#define PIN_UART3_RTS			112</div><div class='add'>+#define PIN_UART3_CTS			113</div><div class='add'>+#define PIN_SPI0_CS0			114</div><div class='add'>+#define PIN_SPI0_CS1			115</div><div class='add'>+#define PIN_SPI0_SDI			116</div><div class='add'>+#define PIN_SPI0_SDO			117</div><div class='add'>+#define PIN_SPI0_SCK			118</div><div class='add'>+#define PIN_SPI1_CS0			119</div><div class='add'>+#define PIN_SPI1_CS1			120</div><div class='add'>+#define PIN_SPI1_SDI			121</div><div class='add'>+#define PIN_SPI1_SDO			122</div><div class='add'>+#define PIN_SPI1_SCK			123</div><div class='add'>+#define PIN_JTAG0_TDO			124</div><div class='add'>+#define PIN_JTAG0_TCK			125</div><div class='add'>+#define PIN_JTAG0_TDI			126</div><div class='add'>+#define PIN_JTAG0_TMS			127</div><div class='add'>+#define PIN_JTAG0_TRST			128</div><div class='add'>+#define PIN_JTAG0_SRST			129</div><div class='add'>+#define PIN_JTAG1_TDO			130</div><div class='add'>+#define PIN_JTAG1_TCK			131</div><div class='add'>+#define PIN_JTAG1_TDI			132</div><div class='add'>+#define PIN_JTAG1_TMS			133</div><div class='add'>+#define PIN_JTAG1_TRST			134</div><div class='add'>+#define PIN_JTAG1_SRST			135</div><div class='add'>+#define PIN_JTAG2_TDO			136</div><div class='add'>+#define PIN_JTAG2_TCK			137</div><div class='add'>+#define PIN_JTAG2_TDI			138</div><div class='add'>+#define PIN_JTAG2_TMS			139</div><div class='add'>+#define PIN_JTAG2_TRST			140</div><div class='add'>+#define PIN_JTAG2_SRST			141</div><div class='add'>+#define PIN_JTAG3_TDO			142</div><div class='add'>+#define PIN_JTAG3_TCK			143</div><div class='add'>+#define PIN_JTAG3_TDI			144</div><div class='add'>+#define PIN_JTAG3_TMS			145</div><div class='add'>+#define PIN_JTAG3_TRST			146</div><div class='add'>+#define PIN_JTAG3_SRST			147</div><div class='add'>+#define PIN_GPIO0			148</div><div class='add'>+#define PIN_GPIO1			149</div><div class='add'>+#define PIN_GPIO2			150</div><div class='add'>+#define PIN_GPIO3			151</div><div class='add'>+#define PIN_GPIO4			152</div><div class='add'>+#define PIN_GPIO5			153</div><div class='add'>+#define PIN_GPIO6			154</div><div class='add'>+#define PIN_GPIO7			155</div><div class='add'>+#define PIN_GPIO8			156</div><div class='add'>+#define PIN_GPIO9			157</div><div class='add'>+#define PIN_GPIO10			158</div><div class='add'>+#define PIN_GPIO11			159</div><div class='add'>+#define PIN_GPIO12			160</div><div class='add'>+#define PIN_GPIO13			161</div><div class='add'>+#define PIN_GPIO14			162</div><div class='add'>+#define PIN_GPIO15			163</div><div class='add'>+#define PIN_GPIO16			164</div><div class='add'>+#define PIN_GPIO17			165</div><div class='add'>+#define PIN_GPIO18			166</div><div class='add'>+#define PIN_GPIO19			167</div><div class='add'>+#define PIN_GPIO20			168</div><div class='add'>+#define PIN_GPIO21			169</div><div class='add'>+#define PIN_GPIO22			170</div><div class='add'>+#define PIN_GPIO23			171</div><div class='add'>+#define PIN_GPIO24			172</div><div class='add'>+#define PIN_GPIO25			173</div><div class='add'>+#define PIN_GPIO26			174</div><div class='add'>+#define PIN_GPIO27			175</div><div class='add'>+#define PIN_GPIO28			176</div><div class='add'>+#define PIN_GPIO29			177</div><div class='add'>+#define PIN_GPIO30			178</div><div class='add'>+#define PIN_GPIO31			179</div><div class='add'>+#define PIN_MODE_SEL0			180</div><div class='add'>+#define PIN_MODE_SEL1			181</div><div class='add'>+#define PIN_MODE_SEL2			182</div><div class='add'>+#define PIN_BOOT_SEL0			183</div><div class='add'>+#define PIN_BOOT_SEL1			184</div><div class='add'>+#define PIN_BOOT_SEL2			185</div><div class='add'>+#define PIN_BOOT_SEL3			186</div><div class='add'>+#define PIN_BOOT_SEL4			187</div><div class='add'>+#define PIN_BOOT_SEL5			188</div><div class='add'>+#define PIN_BOOT_SEL6			189</div><div class='add'>+#define PIN_BOOT_SEL7			190</div><div class='add'>+#define PIN_MULTI_SCKT			191</div><div class='add'>+#define PIN_SCKT_ID0			192</div><div class='add'>+#define PIN_SCKT_ID1			193</div><div class='add'>+#define PIN_PLL_CLK_IN_MAIN		194</div><div class='add'>+#define PIN_PLL_CLK_IN_DDR_0		195</div><div class='add'>+#define PIN_PLL_CLK_IN_DDR_1		196</div><div class='add'>+#define PIN_PLL_CLK_IN_DDR_2		197</div><div class='add'>+#define PIN_PLL_CLK_IN_DDR_3		198</div><div class='add'>+#define PIN_XTAL_32K			199</div><div class='add'>+#define PIN_SYS_RST			200</div><div class='add'>+#define PIN_PWR_BUTTON			201</div><div class='add'>+#define PIN_TEST_EN			202</div><div class='add'>+#define PIN_TEST_MODE_MBIST		203</div><div class='add'>+#define PIN_TEST_MODE_SCAN		204</div><div class='add'>+#define PIN_TEST_MODE_BSD		205</div><div class='add'>+#define PIN_BISR_BYP			206</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_PINCTRL_SG2044_H */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/renesas,r9a09g047-pinctrl.h b/include/dt-bindings/pinctrl/renesas,r9a09g047-pinctrl.h<br/>new file mode 100644<br/>index 000000000000..5917096720bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/renesas,r9a09g047-pinctrl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/renesas,r9a09g047-pinctrl.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * This header provides constants for Renesas RZ/G3E family pinctrl bindings.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Renesas Electronics Corp.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_PINCTRL_RENESAS_R9A09G047_PINCTRL_H__</div><div class='add'>+#define __DT_BINDINGS_PINCTRL_RENESAS_R9A09G047_PINCTRL_H__</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/rzg2l-pinctrl.h&gt;</div><div class='add'>+</div><div class='add'>+/* RZG3E_Px = Offset address of PFC_P_mn  - 0x20 */</div><div class='add'>+#define RZG3E_P0	0</div><div class='add'>+#define RZG3E_P1	1</div><div class='add'>+#define RZG3E_P2	2</div><div class='add'>+#define RZG3E_P3	3</div><div class='add'>+#define RZG3E_P4	4</div><div class='add'>+#define RZG3E_P5	5</div><div class='add'>+#define RZG3E_P6	6</div><div class='add'>+#define RZG3E_P7	7</div><div class='add'>+#define RZG3E_P8	8</div><div class='add'>+#define RZG3E_PA	10</div><div class='add'>+#define RZG3E_PB	11</div><div class='add'>+#define RZG3E_PC	12</div><div class='add'>+#define RZG3E_PD	13</div><div class='add'>+#define RZG3E_PE	14</div><div class='add'>+#define RZG3E_PF	15</div><div class='add'>+#define RZG3E_PG	16</div><div class='add'>+#define RZG3E_PH	17</div><div class='add'>+#define RZG3E_PJ	19</div><div class='add'>+#define RZG3E_PK	20</div><div class='add'>+#define RZG3E_PL	21</div><div class='add'>+#define RZG3E_PM	22</div><div class='add'>+#define RZG3E_PS	28</div><div class='add'>+</div><div class='add'>+#define RZG3E_PORT_PINMUX(b, p, f)	RZG2L_PORT_PINMUX(RZG3E_P##b, p, f)</div><div class='add'>+#define RZG3E_GPIO(port, pin)		RZG2L_GPIO(RZG3E_P##port, pin)</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_PINCTRL_RENESAS_R9A09G047_PINCTRL_H__ */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/renesas,r9a09g057-pinctrl.h b/include/dt-bindings/pinctrl/renesas,r9a09g057-pinctrl.h<br/>new file mode 100644<br/>index 000000000000..2e83bf43160b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/renesas,r9a09g057-pinctrl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/renesas,r9a09g057-pinctrl.h</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * This header provides constants for Renesas RZ/V2H family pinctrl bindings.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Renesas Electronics Corp.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_PINCTRL_RENESAS_R9A09G057_PINCTRL_H__</div><div class='add'>+#define __DT_BINDINGS_PINCTRL_RENESAS_R9A09G057_PINCTRL_H__</div><div class='add'>+</div><div class='add'>+#include &lt;dt-bindings/pinctrl/rzg2l-pinctrl.h&gt;</div><div class='add'>+</div><div class='add'>+/* RZV2H_Px = Offset address of PFC_P_mn  - 0x20 */</div><div class='add'>+#define RZV2H_P0	0</div><div class='add'>+#define RZV2H_P1	1</div><div class='add'>+#define RZV2H_P2	2</div><div class='add'>+#define RZV2H_P3	3</div><div class='add'>+#define RZV2H_P4	4</div><div class='add'>+#define RZV2H_P5	5</div><div class='add'>+#define RZV2H_P6	6</div><div class='add'>+#define RZV2H_P7	7</div><div class='add'>+#define RZV2H_P8	8</div><div class='add'>+#define RZV2H_P9	9</div><div class='add'>+#define RZV2H_PA	10</div><div class='add'>+#define RZV2H_PB	11</div><div class='add'>+</div><div class='add'>+#define RZV2H_PORT_PINMUX(b, p, f)	RZG2L_PORT_PINMUX(RZV2H_P##b, p, f)</div><div class='add'>+#define RZV2H_GPIO(port, pin)		RZG2L_GPIO(RZV2H_P##port, pin)</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_PINCTRL_RENESAS_R9A09G057_PINCTRL_H__ */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h b/include/dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h<br/>new file mode 100644<br/>index 000000000000..f088793f23ee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * This header provides constants for Renesas RZ/T2H family pinctrl bindings.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Renesas Electronics Corp.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_PINCTRL_RENESAS_R9A09G077_PINCTRL_H__</div><div class='add'>+#define __DT_BINDINGS_PINCTRL_RENESAS_R9A09G077_PINCTRL_H__</div><div class='add'>+</div><div class='add'>+#define RZT2H_PINS_PER_PORT	8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create the pin index from its bank and position numbers and store in</div><div class='add'>+ * the upper 16 bits the alternate function identifier</div><div class='add'>+ */</div><div class='add'>+#define RZT2H_PORT_PINMUX(b, p, f)	((b) * RZT2H_PINS_PER_PORT + (p) | ((f) &lt;&lt; 16))</div><div class='add'>+</div><div class='add'>+/* Convert a port and pin label to its global pin index */</div><div class='add'>+#define RZT2H_GPIO(port, pin)	((port) * RZT2H_PINS_PER_PORT + (pin))</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_PINCTRL_RENESAS_R9A09G077_PINCTRL_H__ */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/samsung.h b/include/dt-bindings/pinctrl/samsung.h<br/>deleted file mode 100644<br/>index d1da5ff68d0c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/samsung.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/samsung.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- * Samsung's Exynos pinctrl bindings</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Samsung Electronics Co., Ltd.</div><div class='del'>- *		http://www.samsung.com</div><div class='del'>- * Author: Krzysztof Kozlowski &lt;krzk@kernel.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DT_BINDINGS_PINCTRL_SAMSUNG_H__</div><div class='del'>-#define __DT_BINDINGS_PINCTRL_SAMSUNG_H__</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These bindings are deprecated, because they do not match the actual</div><div class='del'>- * concept of bindings but rather contain pure register values.</div><div class='del'>- * Instead include the header in the DTS source directory.</div><div class='del'>- */</div><div class='del'>-#warning "These bindings are deprecated. Instead use the header in the DTS source directory."</div><div class='del'>-</div><div class='del'>-#define EXYNOS_PIN_PULL_NONE		0</div><div class='del'>-#define EXYNOS_PIN_PULL_DOWN		1</div><div class='del'>-#define EXYNOS_PIN_PULL_UP		3</div><div class='del'>-</div><div class='del'>-#define S3C64XX_PIN_PULL_NONE		0</div><div class='del'>-#define S3C64XX_PIN_PULL_DOWN		1</div><div class='del'>-#define S3C64XX_PIN_PULL_UP		2</div><div class='del'>-</div><div class='del'>-/* Pin function in power down mode */</div><div class='del'>-#define EXYNOS_PIN_PDN_OUT0		0</div><div class='del'>-#define EXYNOS_PIN_PDN_OUT1		1</div><div class='del'>-#define EXYNOS_PIN_PDN_INPUT		2</div><div class='del'>-#define EXYNOS_PIN_PDN_PREV		3</div><div class='del'>-</div><div class='del'>-/* Drive strengths for Exynos3250, Exynos4 (all) and Exynos5250 */</div><div class='del'>-#define EXYNOS4_PIN_DRV_LV1		0</div><div class='del'>-#define EXYNOS4_PIN_DRV_LV2		2</div><div class='del'>-#define EXYNOS4_PIN_DRV_LV3		1</div><div class='del'>-#define EXYNOS4_PIN_DRV_LV4		3</div><div class='del'>-</div><div class='del'>-/* Drive strengths for Exynos5260 */</div><div class='del'>-#define EXYNOS5260_PIN_DRV_LV1		0</div><div class='del'>-#define EXYNOS5260_PIN_DRV_LV2		1</div><div class='del'>-#define EXYNOS5260_PIN_DRV_LV4		2</div><div class='del'>-#define EXYNOS5260_PIN_DRV_LV6		3</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Drive strengths for Exynos5410, Exynos542x, Exynos5800 and Exynos850 (except</div><div class='del'>- * GPIO_HSI block)</div><div class='del'>- */</div><div class='del'>-#define EXYNOS5420_PIN_DRV_LV1		0</div><div class='del'>-#define EXYNOS5420_PIN_DRV_LV2		1</div><div class='del'>-#define EXYNOS5420_PIN_DRV_LV3		2</div><div class='del'>-#define EXYNOS5420_PIN_DRV_LV4		3</div><div class='del'>-</div><div class='del'>-/* Drive strengths for Exynos5433 */</div><div class='del'>-#define EXYNOS5433_PIN_DRV_FAST_SR1	0</div><div class='del'>-#define EXYNOS5433_PIN_DRV_FAST_SR2	1</div><div class='del'>-#define EXYNOS5433_PIN_DRV_FAST_SR3	2</div><div class='del'>-#define EXYNOS5433_PIN_DRV_FAST_SR4	3</div><div class='del'>-#define EXYNOS5433_PIN_DRV_FAST_SR5	4</div><div class='del'>-#define EXYNOS5433_PIN_DRV_FAST_SR6	5</div><div class='del'>-#define EXYNOS5433_PIN_DRV_SLOW_SR1	8</div><div class='del'>-#define EXYNOS5433_PIN_DRV_SLOW_SR2	9</div><div class='del'>-#define EXYNOS5433_PIN_DRV_SLOW_SR3	0xa</div><div class='del'>-#define EXYNOS5433_PIN_DRV_SLOW_SR4	0xb</div><div class='del'>-#define EXYNOS5433_PIN_DRV_SLOW_SR5	0xc</div><div class='del'>-#define EXYNOS5433_PIN_DRV_SLOW_SR6	0xf</div><div class='del'>-</div><div class='del'>-/* Drive strengths for Exynos850 GPIO_HSI block */</div><div class='del'>-#define EXYNOS850_HSI_PIN_DRV_LV1	0	/* 1x   */</div><div class='del'>-#define EXYNOS850_HSI_PIN_DRV_LV1_5	1	/* 1.5x */</div><div class='del'>-#define EXYNOS850_HSI_PIN_DRV_LV2	2	/* 2x   */</div><div class='del'>-#define EXYNOS850_HSI_PIN_DRV_LV2_5	3	/* 2.5x */</div><div class='del'>-#define EXYNOS850_HSI_PIN_DRV_LV3	4	/* 3x   */</div><div class='del'>-#define EXYNOS850_HSI_PIN_DRV_LV4	5	/* 4x   */</div><div class='del'>-</div><div class='del'>-#define EXYNOS_PIN_FUNC_INPUT		0</div><div class='del'>-#define EXYNOS_PIN_FUNC_OUTPUT		1</div><div class='del'>-#define EXYNOS_PIN_FUNC_2		2</div><div class='del'>-#define EXYNOS_PIN_FUNC_3		3</div><div class='del'>-#define EXYNOS_PIN_FUNC_4		4</div><div class='del'>-#define EXYNOS_PIN_FUNC_5		5</div><div class='del'>-#define EXYNOS_PIN_FUNC_6		6</div><div class='del'>-#define EXYNOS_PIN_FUNC_EINT		0xf</div><div class='del'>-#define EXYNOS_PIN_FUNC_F		EXYNOS_PIN_FUNC_EINT</div><div class='del'>-</div><div class='del'>-/* Drive strengths for Exynos7 FSYS1 block */</div><div class='del'>-#define EXYNOS7_FSYS1_PIN_DRV_LV1	0</div><div class='del'>-#define EXYNOS7_FSYS1_PIN_DRV_LV2	4</div><div class='del'>-#define EXYNOS7_FSYS1_PIN_DRV_LV3	2</div><div class='del'>-#define EXYNOS7_FSYS1_PIN_DRV_LV4	6</div><div class='del'>-#define EXYNOS7_FSYS1_PIN_DRV_LV5	1</div><div class='del'>-#define EXYNOS7_FSYS1_PIN_DRV_LV6	5</div><div class='del'>-</div><div class='del'>-#endif /* __DT_BINDINGS_PINCTRL_SAMSUNG_H__ */</div><div class='head'>diff --git a/include/dt-bindings/pinctrl/stm32-pinfunc.h b/include/dt-bindings/pinctrl/stm32-pinfunc.h<br/>index 28ad0235086a..af3fd388329a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/stm32-pinfunc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/pinctrl/stm32-pinfunc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/pinctrl/stm32-pinfunc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/pinctrl/stm32-pinfunc.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #define AF14	0xf</div><div class='ctx'> #define AF15	0x10</div><div class='ctx'> #define ANALOG	0x11</div><div class='add'>+#define RSVD	0x12</div><div class='ctx'> </div><div class='ctx'> /* define Pins number*/</div><div class='ctx'> #define PIN_NO(port, line)	(((port) - 'A') * 0x10 + (line))</div><div class='head'>diff --git a/include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h b/include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h<br/>new file mode 100644<br/>index 000000000000..6b3d8ea7bb69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_POWER_SUN55I_A523_PCK600_H_</div><div class='add'>+#define _DT_BINDINGS_POWER_SUN55I_A523_PCK600_H_</div><div class='add'>+</div><div class='add'>+#define PD_VE			0</div><div class='add'>+#define PD_GPU			1</div><div class='add'>+#define PD_VI			2</div><div class='add'>+#define PD_VO0			3</div><div class='add'>+#define PD_VO1			4</div><div class='add'>+#define PD_DE			5</div><div class='add'>+#define PD_NAND			6</div><div class='add'>+#define PD_PCIE			7</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_POWER_SUN55I_A523_PCK600_H_ */</div><div class='head'>diff --git a/include/dt-bindings/power/allwinner,sun55i-a523-ppu.h b/include/dt-bindings/power/allwinner,sun55i-a523-ppu.h<br/>new file mode 100644<br/>index 000000000000..bc9aba73c19a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/allwinner,sun55i-a523-ppu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/allwinner,sun55i-a523-ppu.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_POWER_SUN55I_A523_PPU_H_</div><div class='add'>+#define _DT_BINDINGS_POWER_SUN55I_A523_PPU_H_</div><div class='add'>+</div><div class='add'>+#define PD_DSP			0</div><div class='add'>+#define PD_NPU			1</div><div class='add'>+#define PD_AUDIO		2</div><div class='add'>+#define PD_SRAM			3</div><div class='add'>+#define PD_RISCV		4</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_POWER_SUN55I_A523_PPU_H_ */</div><div class='head'>diff --git a/include/dt-bindings/power/allwinner,sun8i-v853-ppu.h b/include/dt-bindings/power/allwinner,sun8i-v853-ppu.h<br/>new file mode 100644<br/>index 000000000000..b1c18a490613<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/allwinner,sun8i-v853-ppu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/allwinner,sun8i-v853-ppu.h</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_POWER_SUN8I_V853_PPU_H_</div><div class='add'>+#define _DT_BINDINGS_POWER_SUN8I_V853_PPU_H_</div><div class='add'>+</div><div class='add'>+#define PD_RISCV		0</div><div class='add'>+#define PD_NPU			1</div><div class='add'>+#define PD_VE			2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/amlogic,a4-pwrc.h b/include/dt-bindings/power/amlogic,a4-pwrc.h<br/>new file mode 100644<br/>index 000000000000..bd2f9c558d22<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/amlogic,a4-pwrc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/amlogic,a4-pwrc.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Amlogic, Inc. All rights reserved</div><div class='add'>+ */</div><div class='add'>+#ifndef _DT_BINDINGS_AMLOGIC_A4_POWER_H</div><div class='add'>+#define _DT_BINDINGS_AMLOGIC_A4_POWER_H</div><div class='add'>+</div><div class='add'>+#define PWRC_A4_AUDIO_ID				0</div><div class='add'>+#define PWRC_A4_SDIOA_ID				1</div><div class='add'>+#define PWRC_A4_EMMC_ID					2</div><div class='add'>+#define PWRC_A4_USB_COMB_ID				3</div><div class='add'>+#define PWRC_A4_ETH_ID					4</div><div class='add'>+#define PWRC_A4_VOUT_ID					5</div><div class='add'>+#define PWRC_A4_AUDIO_PDM_ID				6</div><div class='add'>+#define PWRC_A4_DMC_ID					7</div><div class='add'>+#define PWRC_A4_SYS_WRAP_ID				8</div><div class='add'>+#define PWRC_A4_AO_I2C_S_ID				9</div><div class='add'>+#define PWRC_A4_AO_UART_ID				10</div><div class='add'>+#define PWRC_A4_AO_IR_ID				11</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/amlogic,a5-pwrc.h b/include/dt-bindings/power/amlogic,a5-pwrc.h<br/>new file mode 100644<br/>index 000000000000..3a6f53eb959f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/amlogic,a5-pwrc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/amlogic,a5-pwrc.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Amlogic, Inc. All rights reserved</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_AMLOGIC_A5_POWER_H</div><div class='add'>+#define _DT_BINDINGS_AMLOGIC_A5_POWER_H</div><div class='add'>+</div><div class='add'>+#define PWRC_A5_NNA_ID			0</div><div class='add'>+#define PWRC_A5_AUDIO_ID		1</div><div class='add'>+#define PWRC_A5_SDIOA_ID		2</div><div class='add'>+#define PWRC_A5_EMMC_ID			3</div><div class='add'>+#define PWRC_A5_USB_COMB_ID		4</div><div class='add'>+#define PWRC_A5_ETH_ID			5</div><div class='add'>+#define PWRC_A5_RSA_ID			6</div><div class='add'>+#define PWRC_A5_AUDIO_PDM_ID		7</div><div class='add'>+#define PWRC_A5_DMC_ID			8</div><div class='add'>+#define PWRC_A5_SYS_WRAP_ID		9</div><div class='add'>+#define PWRC_A5_DSPA_ID			10</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/amlogic,c3-pwrc.h b/include/dt-bindings/power/amlogic,c3-pwrc.h<br/>index 1d98a25b08a4..61759df4b2e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/amlogic,c3-pwrc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/amlogic,c3-pwrc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/amlogic,c3-pwrc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/amlogic,c3-pwrc.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2023 Amlogic, Inc.</div><div class='ctx'>  * Author: hongyu chen1 &lt;hongyu.chen1@amlogic.com&gt;</div><div class='head'>diff --git a/include/dt-bindings/power/amlogic,s6-pwrc.h b/include/dt-bindings/power/amlogic,s6-pwrc.h<br/>new file mode 100644<br/>index 000000000000..2c005864ae73<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/amlogic,s6-pwrc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/amlogic,s6-pwrc.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Amlogic, Inc. All rights reserved</div><div class='add'>+ */</div><div class='add'>+#ifndef _DT_BINDINGS_AMLOGIC_S6_POWER_H</div><div class='add'>+#define _DT_BINDINGS_AMLOGIC_S6_POWER_H</div><div class='add'>+</div><div class='add'>+#define PWRC_S6_DSPA_ID				0</div><div class='add'>+#define PWRC_S6_DOS_HEVC_ID			1</div><div class='add'>+#define PWRC_S6_DOS_VDEC_ID			2</div><div class='add'>+#define PWRC_S6_VPU_HDMI_ID			3</div><div class='add'>+#define PWRC_S6_U2DRD_ID			4</div><div class='add'>+#define PWRC_S6_U3DRD_ID			5</div><div class='add'>+#define PWRC_S6_SD_EMMC_C_ID			6</div><div class='add'>+#define PWRC_S6_GE2D_ID				7</div><div class='add'>+#define PWRC_S6_AMFC_ID				8</div><div class='add'>+#define PWRC_S6_VC9000E_ID			9</div><div class='add'>+#define PWRC_S6_DEWARP_ID			10</div><div class='add'>+#define PWRC_S6_VICP_ID				11</div><div class='add'>+#define PWRC_S6_SD_EMMC_A_ID			12</div><div class='add'>+#define PWRC_S6_SD_EMMC_B_ID			13</div><div class='add'>+#define PWRC_S6_ETH_ID				14</div><div class='add'>+#define PWRC_S6_PCIE_ID				15</div><div class='add'>+#define PWRC_S6_NNA_4T_ID			16</div><div class='add'>+#define PWRC_S6_AUDIO_ID			17</div><div class='add'>+#define PWRC_S6_AUCPU_ID			18</div><div class='add'>+#define PWRC_S6_ADAPT_ID			19</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/amlogic,s7-pwrc.h b/include/dt-bindings/power/amlogic,s7-pwrc.h<br/>new file mode 100644<br/>index 000000000000..3f21d095f784<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/amlogic,s7-pwrc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/amlogic,s7-pwrc.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Amlogic, Inc. All rights reserved</div><div class='add'>+ */</div><div class='add'>+#ifndef _DT_BINDINGS_AMLOGIC_S7_POWER_H</div><div class='add'>+#define _DT_BINDINGS_AMLOGIC_S7_POWER_H</div><div class='add'>+</div><div class='add'>+#define PWRC_S7_DOS_HEVC_ID			0</div><div class='add'>+#define PWRC_S7_DOS_VDEC_ID		        1</div><div class='add'>+#define PWRC_S7_VPU_HDMI_ID		        2</div><div class='add'>+#define PWRC_S7_USB_COMB_ID		        3</div><div class='add'>+#define PWRC_S7_SD_EMMC_C_ID			4</div><div class='add'>+#define PWRC_S7_GE2D_ID				5</div><div class='add'>+#define PWRC_S7_SD_EMMC_A_ID			6</div><div class='add'>+#define PWRC_S7_SD_EMMC_B_ID			7</div><div class='add'>+#define PWRC_S7_ETH_ID				8</div><div class='add'>+#define PWRC_S7_AUCPU_ID			9</div><div class='add'>+#define PWRC_S7_AUDIO_ID			10</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/amlogic,s7d-pwrc.h b/include/dt-bindings/power/amlogic,s7d-pwrc.h<br/>new file mode 100644<br/>index 000000000000..c6998553670a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/amlogic,s7d-pwrc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/amlogic,s7d-pwrc.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Amlogic, Inc. All rights reserved</div><div class='add'>+ */</div><div class='add'>+#ifndef _DT_BINDINGS_AMLOGIC_S7D_POWER_H</div><div class='add'>+#define _DT_BINDINGS_AMLOGIC_S7D_POWER_H</div><div class='add'>+</div><div class='add'>+#define PWRC_S7D_DOS_HCODEC_ID			0</div><div class='add'>+#define PWRC_S7D_DOS_HEVC_ID			1</div><div class='add'>+#define PWRC_S7D_DOS_VDEC_ID			2</div><div class='add'>+#define PWRC_S7D_VPU_HDMI_ID			3</div><div class='add'>+#define PWRC_S7D_USB_U2DRD_ID			4</div><div class='add'>+#define PWRC_S7D_USB_U2H_ID			5</div><div class='add'>+#define PWRC_S7D_SSD_EMMC_C_ID			6</div><div class='add'>+#define PWRC_S7D_GE2D_ID			7</div><div class='add'>+#define PWRC_S7D_AMFC_ID			8</div><div class='add'>+#define PWRC_S7D_EMMC_A_ID			9</div><div class='add'>+#define PWRC_S7D_EMMC_B_ID			10</div><div class='add'>+#define PWRC_S7D_ETH_ID				11</div><div class='add'>+#define PWRC_S7D_AUCPU_ID			12</div><div class='add'>+#define PWRC_S7D_AUDIO_ID			13</div><div class='add'>+#define PWRC_S7D_SRAMA_ID			14</div><div class='add'>+#define PWRC_S7D_DMC0_ID			15</div><div class='add'>+#define PWRC_S7D_DMC1_ID			16</div><div class='add'>+#define PWRC_S7D_DDR_ID				17</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/marvell,pxa1908-power.h b/include/dt-bindings/power/marvell,pxa1908-power.h<br/>new file mode 100644<br/>index 000000000000..19b088351af1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/marvell,pxa1908-power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/marvell,pxa1908-power.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Marvell PXA1908 power domains</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2025, Duje Mihanović &lt;duje@dujemihanovic.xyz&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DTS_MARVELL_PXA1908_POWER_H</div><div class='add'>+#define __DTS_MARVELL_PXA1908_POWER_H</div><div class='add'>+</div><div class='add'>+#define PXA1908_POWER_DOMAIN_VPU	0</div><div class='add'>+#define PXA1908_POWER_DOMAIN_GPU	1</div><div class='add'>+#define PXA1908_POWER_DOMAIN_GPU2D	2</div><div class='add'>+#define PXA1908_POWER_DOMAIN_DSI	3</div><div class='add'>+#define PXA1908_POWER_DOMAIN_ISP	4</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/mediatek,mt6735-power-controller.h b/include/dt-bindings/power/mediatek,mt6735-power-controller.h<br/>new file mode 100644<br/>index 000000000000..6957075fcb9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/mediatek,mt6735-power-controller.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/mediatek,mt6735-power-controller.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_POWER_MT6735_POWER_CONTROLLER_H</div><div class='add'>+#define _DT_BINDINGS_POWER_MT6735_POWER_CONTROLLER_H</div><div class='add'>+</div><div class='add'>+#define MT6735_POWER_DOMAIN_MD1		0</div><div class='add'>+#define MT6735_POWER_DOMAIN_CONN	1</div><div class='add'>+#define MT6735_POWER_DOMAIN_DIS		2</div><div class='add'>+#define MT6735_POWER_DOMAIN_MFG		3</div><div class='add'>+#define MT6735_POWER_DOMAIN_ISP		4</div><div class='add'>+#define MT6735_POWER_DOMAIN_VDE		5</div><div class='add'>+#define MT6735_POWER_DOMAIN_VEN		6</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/mediatek,mt6893-power.h b/include/dt-bindings/power/mediatek,mt6893-power.h<br/>new file mode 100644<br/>index 000000000000..aeab51bb2ad8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/mediatek,mt6893-power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/mediatek,mt6893-power.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Collabora Ltd</div><div class='add'>+ *                    AngeloGioacchino Del Regno &lt;angelogioacchino.delregno@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_POWER_MT6893_POWER_H</div><div class='add'>+#define _DT_BINDINGS_POWER_MT6893_POWER_H</div><div class='add'>+</div><div class='add'>+#define MT6893_POWER_DOMAIN_CONN		0</div><div class='add'>+#define MT6893_POWER_DOMAIN_MFG0		1</div><div class='add'>+#define MT6893_POWER_DOMAIN_MFG1		2</div><div class='add'>+#define MT6893_POWER_DOMAIN_MFG2		3</div><div class='add'>+#define MT6893_POWER_DOMAIN_MFG3		4</div><div class='add'>+#define MT6893_POWER_DOMAIN_MFG4		5</div><div class='add'>+#define MT6893_POWER_DOMAIN_MFG5		6</div><div class='add'>+#define MT6893_POWER_DOMAIN_MFG6		7</div><div class='add'>+#define MT6893_POWER_DOMAIN_ISP			8</div><div class='add'>+#define MT6893_POWER_DOMAIN_ISP2		9</div><div class='add'>+#define MT6893_POWER_DOMAIN_IPE			10</div><div class='add'>+#define MT6893_POWER_DOMAIN_VDEC0		11</div><div class='add'>+#define MT6893_POWER_DOMAIN_VDEC1		12</div><div class='add'>+#define MT6893_POWER_DOMAIN_VENC0		13</div><div class='add'>+#define MT6893_POWER_DOMAIN_VENC1		14</div><div class='add'>+#define MT6893_POWER_DOMAIN_MDP			15</div><div class='add'>+#define MT6893_POWER_DOMAIN_DISP		16</div><div class='add'>+#define MT6893_POWER_DOMAIN_AUDIO		17</div><div class='add'>+#define MT6893_POWER_DOMAIN_ADSP		18</div><div class='add'>+#define MT6893_POWER_DOMAIN_CAM			19</div><div class='add'>+#define MT6893_POWER_DOMAIN_CAM_RAWA		20</div><div class='add'>+#define MT6893_POWER_DOMAIN_CAM_RAWB		21</div><div class='add'>+#define MT6893_POWER_DOMAIN_CAM_RAWC		22</div><div class='add'>+#define MT6893_POWER_DOMAIN_DP_TX		23</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_POWER_MT6893_POWER_H */</div><div class='head'>diff --git a/include/dt-bindings/power/mediatek,mt8196-power.h b/include/dt-bindings/power/mediatek,mt8196-power.h<br/>new file mode 100644<br/>index 000000000000..0f622a93c807<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/mediatek,mt8196-power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/mediatek,mt8196-power.h</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Collabora Ltd</div><div class='add'>+ *                    AngeloGioacchino Del Regno &lt;angelogioacchino.delregno@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_POWER_MT8196_POWER_H</div><div class='add'>+#define _DT_BINDINGS_POWER_MT8196_POWER_H</div><div class='add'>+</div><div class='add'>+/* SCPSYS Secure Power Manager - Direct Control */</div><div class='add'>+#define MT8196_POWER_DOMAIN_MD				0</div><div class='add'>+#define MT8196_POWER_DOMAIN_CONN			1</div><div class='add'>+#define MT8196_POWER_DOMAIN_SSUSB_P0			2</div><div class='add'>+#define MT8196_POWER_DOMAIN_SSUSB_DP_PHY_P0		3</div><div class='add'>+#define MT8196_POWER_DOMAIN_SSUSB_P1			4</div><div class='add'>+#define MT8196_POWER_DOMAIN_SSUSB_P23			5</div><div class='add'>+#define MT8196_POWER_DOMAIN_SSUSB_PHY_P2		6</div><div class='add'>+#define MT8196_POWER_DOMAIN_PEXTP_MAC0			7</div><div class='add'>+#define MT8196_POWER_DOMAIN_PEXTP_MAC1			8</div><div class='add'>+#define MT8196_POWER_DOMAIN_PEXTP_MAC2			9</div><div class='add'>+#define MT8196_POWER_DOMAIN_PEXTP_PHY0			10</div><div class='add'>+#define MT8196_POWER_DOMAIN_PEXTP_PHY1			11</div><div class='add'>+#define MT8196_POWER_DOMAIN_PEXTP_PHY2			12</div><div class='add'>+#define MT8196_POWER_DOMAIN_AUDIO			13</div><div class='add'>+#define MT8196_POWER_DOMAIN_ADSP_TOP_DORMANT		14</div><div class='add'>+#define MT8196_POWER_DOMAIN_ADSP_INFRA			15</div><div class='add'>+#define MT8196_POWER_DOMAIN_ADSP_AO			16</div><div class='add'>+</div><div class='add'>+/* SCPSYS Secure Power Manager - HW Voter */</div><div class='add'>+#define MT8196_POWER_DOMAIN_MM_PROC_DORMANT		0</div><div class='add'>+#define MT8196_POWER_DOMAIN_SSR				1</div><div class='add'>+</div><div class='add'>+/* HFRPSYS MultiMedia Power Control (MMPC) - HW Voter */</div><div class='add'>+#define MT8196_POWER_DOMAIN_VDE0			0</div><div class='add'>+#define MT8196_POWER_DOMAIN_VDE1			1</div><div class='add'>+#define MT8196_POWER_DOMAIN_VDE_VCORE0			2</div><div class='add'>+#define MT8196_POWER_DOMAIN_VEN0			3</div><div class='add'>+#define MT8196_POWER_DOMAIN_VEN1			4</div><div class='add'>+#define MT8196_POWER_DOMAIN_VEN2			5</div><div class='add'>+#define MT8196_POWER_DOMAIN_DISP_VCORE			6</div><div class='add'>+#define MT8196_POWER_DOMAIN_DIS0_DORMANT		7</div><div class='add'>+#define MT8196_POWER_DOMAIN_DIS1_DORMANT		8</div><div class='add'>+#define MT8196_POWER_DOMAIN_OVL0_DORMANT		9</div><div class='add'>+#define MT8196_POWER_DOMAIN_OVL1_DORMANT		10</div><div class='add'>+#define MT8196_POWER_DOMAIN_DISP_EDPTX_DORMANT		11</div><div class='add'>+#define MT8196_POWER_DOMAIN_DISP_DPTX_DORMANT		12</div><div class='add'>+#define MT8196_POWER_DOMAIN_MML0_SHUTDOWN		13</div><div class='add'>+#define MT8196_POWER_DOMAIN_MML1_SHUTDOWN		14</div><div class='add'>+#define MT8196_POWER_DOMAIN_MM_INFRA0			15</div><div class='add'>+#define MT8196_POWER_DOMAIN_MM_INFRA1			16</div><div class='add'>+#define MT8196_POWER_DOMAIN_MM_INFRA_AO			17</div><div class='add'>+#define MT8196_POWER_DOMAIN_CSI_BS_RX			18</div><div class='add'>+#define MT8196_POWER_DOMAIN_CSI_LS_RX			19</div><div class='add'>+#define MT8196_POWER_DOMAIN_DSI_PHY0			20</div><div class='add'>+#define MT8196_POWER_DOMAIN_DSI_PHY1			21</div><div class='add'>+#define MT8196_POWER_DOMAIN_DSI_PHY2			22</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_POWER_MT8196_POWER_H */</div><div class='head'>diff --git a/include/dt-bindings/power/nvidia,tegra264-bpmp.h b/include/dt-bindings/power/nvidia,tegra264-bpmp.h<br/>new file mode 100644<br/>index 000000000000..2eef4a2a02b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/nvidia,tegra264-bpmp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/nvidia,tegra264-bpmp.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)  */</div><div class='add'>+/* Copyright (c) 2022-2024, NVIDIA CORPORATION.  All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef DT_BINDINGS_POWER_NVIDIA_TEGRA264_BPMP_H</div><div class='add'>+#define DT_BINDINGS_POWER_NVIDIA_TEGRA264_BPMP_H</div><div class='add'>+</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_DISP	1</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_AUD	2</div><div class='add'>+/* reserved 3:9 */</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_XUSB_SS	10</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_XUSB_DEV	11</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_XUSB_HOST	12</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_MGBE0	13</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_MGBE1	14</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_MGBE2	15</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_MGBE3	16</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_VI	17</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_VIC	18</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_ISP0	19</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_ISP1	20</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_PVA0	21</div><div class='add'>+#define TEGRA264_POWER_DOMAIN_GPU	22</div><div class='add'>+</div><div class='add'>+#endif /* DT_BINDINGS_POWER_NVIDIA_TEGRA264_BPMP_H */</div><div class='head'>diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h<br/>index e54ffa361451..50e7c886709d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/qcom,rpmhpd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/qcom,rpmhpd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/qcom,rpmhpd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/qcom,rpmhpd.h</a></div><div class='hunk'>@@ -29,4 +29,240 @@</div><div class='ctx'> #define RPMHPD_NSP2             19</div><div class='ctx'> #define RPMHPD_GMXC		20</div><div class='ctx'> </div><div class='add'>+/* RPMh Power Domain performance levels */</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_RETENTION		16</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_MIN_SVS		48</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_D3		50</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_D2_1	51</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_D2		52</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_D1_1	54</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_D1		56</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_D0		60</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS		64</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_P1		72</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_L0		76</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_L1		80</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_LOW_SVS_L2		96</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_SVS		128</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_SVS_L0		144</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_SVS_L1		192</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_SVS_L2		224</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_NOM		256</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_NOM_L0		288</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_NOM_L1		320</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_NOM_L2		336</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_TURBO		384</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_TURBO_L0		400</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_TURBO_L1		416</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_TURBO_L2		432</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_TURBO_L3		448</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_TURBO_L4		452</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_TURBO_L5		456</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_SUPER_TURBO	464</div><div class='add'>+#define RPMH_REGULATOR_LEVEL_SUPER_TURBO_NO_CPR	480</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Platform-specific power domain bindings. Don't add new entries here, use</div><div class='add'>+ * RPMHPD_* above.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* SA8775P Power Domain Indexes */</div><div class='add'>+#define SA8775P_CX	0</div><div class='add'>+#define SA8775P_CX_AO	1</div><div class='add'>+#define SA8775P_DDR	2</div><div class='add'>+#define SA8775P_EBI	3</div><div class='add'>+#define SA8775P_GFX	4</div><div class='add'>+#define SA8775P_LCX	5</div><div class='add'>+#define SA8775P_LMX	6</div><div class='add'>+#define SA8775P_MMCX	7</div><div class='add'>+#define SA8775P_MMCX_AO	8</div><div class='add'>+#define SA8775P_MSS	9</div><div class='add'>+#define SA8775P_MX	10</div><div class='add'>+#define SA8775P_MX_AO	11</div><div class='add'>+#define SA8775P_MXC	12</div><div class='add'>+#define SA8775P_MXC_AO	13</div><div class='add'>+#define SA8775P_NSP0	14</div><div class='add'>+#define SA8775P_NSP1	15</div><div class='add'>+#define SA8775P_XO	16</div><div class='add'>+</div><div class='add'>+/* SDM670 Power Domain Indexes */</div><div class='add'>+#define SDM670_MX	0</div><div class='add'>+#define SDM670_MX_AO	1</div><div class='add'>+#define SDM670_CX	2</div><div class='add'>+#define SDM670_CX_AO	3</div><div class='add'>+#define SDM670_LMX	4</div><div class='add'>+#define SDM670_LCX	5</div><div class='add'>+#define SDM670_GFX	6</div><div class='add'>+#define SDM670_MSS	7</div><div class='add'>+</div><div class='add'>+/* SDM845 Power Domain Indexes */</div><div class='add'>+#define SDM845_EBI	0</div><div class='add'>+#define SDM845_MX	1</div><div class='add'>+#define SDM845_MX_AO	2</div><div class='add'>+#define SDM845_CX	3</div><div class='add'>+#define SDM845_CX_AO	4</div><div class='add'>+#define SDM845_LMX	5</div><div class='add'>+#define SDM845_LCX	6</div><div class='add'>+#define SDM845_GFX	7</div><div class='add'>+#define SDM845_MSS	8</div><div class='add'>+</div><div class='add'>+/* SDX55 Power Domain Indexes */</div><div class='add'>+#define SDX55_MSS	0</div><div class='add'>+#define SDX55_MX	1</div><div class='add'>+#define SDX55_CX	2</div><div class='add'>+</div><div class='add'>+/* SDX65 Power Domain Indexes */</div><div class='add'>+#define SDX65_MSS	0</div><div class='add'>+#define SDX65_MX	1</div><div class='add'>+#define SDX65_MX_AO	2</div><div class='add'>+#define SDX65_CX	3</div><div class='add'>+#define SDX65_CX_AO	4</div><div class='add'>+#define SDX65_MXC	5</div><div class='add'>+</div><div class='add'>+/* SM6350 Power Domain Indexes */</div><div class='add'>+#define SM6350_CX	0</div><div class='add'>+#define SM6350_GFX	1</div><div class='add'>+#define SM6350_LCX	2</div><div class='add'>+#define SM6350_LMX	3</div><div class='add'>+#define SM6350_MSS	4</div><div class='add'>+#define SM6350_MX	5</div><div class='add'>+</div><div class='add'>+/* SM8150 Power Domain Indexes */</div><div class='add'>+#define SM8150_MSS	0</div><div class='add'>+#define SM8150_EBI	1</div><div class='add'>+#define SM8150_LMX	2</div><div class='add'>+#define SM8150_LCX	3</div><div class='add'>+#define SM8150_GFX	4</div><div class='add'>+#define SM8150_MX	5</div><div class='add'>+#define SM8150_MX_AO	6</div><div class='add'>+#define SM8150_CX	7</div><div class='add'>+#define SM8150_CX_AO	8</div><div class='add'>+#define SM8150_MMCX	9</div><div class='add'>+#define SM8150_MMCX_AO	10</div><div class='add'>+</div><div class='add'>+/* SA8155P is a special case, kept for backwards compatibility */</div><div class='add'>+#define SA8155P_CX	SM8150_CX</div><div class='add'>+#define SA8155P_CX_AO	SM8150_CX_AO</div><div class='add'>+#define SA8155P_EBI	SM8150_EBI</div><div class='add'>+#define SA8155P_GFX	SM8150_GFX</div><div class='add'>+#define SA8155P_MSS	SM8150_MSS</div><div class='add'>+#define SA8155P_MX	SM8150_MX</div><div class='add'>+#define SA8155P_MX_AO	SM8150_MX_AO</div><div class='add'>+</div><div class='add'>+/* SM8250 Power Domain Indexes */</div><div class='add'>+#define SM8250_CX	0</div><div class='add'>+#define SM8250_CX_AO	1</div><div class='add'>+#define SM8250_EBI	2</div><div class='add'>+#define SM8250_GFX	3</div><div class='add'>+#define SM8250_LCX	4</div><div class='add'>+#define SM8250_LMX	5</div><div class='add'>+#define SM8250_MMCX	6</div><div class='add'>+#define SM8250_MMCX_AO	7</div><div class='add'>+#define SM8250_MX	8</div><div class='add'>+#define SM8250_MX_AO	9</div><div class='add'>+</div><div class='add'>+/* SM8350 Power Domain Indexes */</div><div class='add'>+#define SM8350_CX	0</div><div class='add'>+#define SM8350_CX_AO	1</div><div class='add'>+#define SM8350_EBI	2</div><div class='add'>+#define SM8350_GFX	3</div><div class='add'>+#define SM8350_LCX	4</div><div class='add'>+#define SM8350_LMX	5</div><div class='add'>+#define SM8350_MMCX	6</div><div class='add'>+#define SM8350_MMCX_AO	7</div><div class='add'>+#define SM8350_MX	8</div><div class='add'>+#define SM8350_MX_AO	9</div><div class='add'>+#define SM8350_MXC	10</div><div class='add'>+#define SM8350_MXC_AO	11</div><div class='add'>+#define SM8350_MSS	12</div><div class='add'>+</div><div class='add'>+/* SM8450 Power Domain Indexes */</div><div class='add'>+#define SM8450_CX	0</div><div class='add'>+#define SM8450_CX_AO	1</div><div class='add'>+#define SM8450_EBI	2</div><div class='add'>+#define SM8450_GFX	3</div><div class='add'>+#define SM8450_LCX	4</div><div class='add'>+#define SM8450_LMX	5</div><div class='add'>+#define SM8450_MMCX	6</div><div class='add'>+#define SM8450_MMCX_AO	7</div><div class='add'>+#define SM8450_MX	8</div><div class='add'>+#define SM8450_MX_AO	9</div><div class='add'>+#define SM8450_MXC	10</div><div class='add'>+#define SM8450_MXC_AO	11</div><div class='add'>+#define SM8450_MSS	12</div><div class='add'>+</div><div class='add'>+/* SM8550 Power Domain Indexes */</div><div class='add'>+#define SM8550_CX	0</div><div class='add'>+#define SM8550_CX_AO	1</div><div class='add'>+#define SM8550_EBI	2</div><div class='add'>+#define SM8550_GFX	3</div><div class='add'>+#define SM8550_LCX	4</div><div class='add'>+#define SM8550_LMX	5</div><div class='add'>+#define SM8550_MMCX	6</div><div class='add'>+#define SM8550_MMCX_AO	7</div><div class='add'>+#define SM8550_MX	8</div><div class='add'>+#define SM8550_MX_AO	9</div><div class='add'>+#define SM8550_MXC	10</div><div class='add'>+#define SM8550_MXC_AO	11</div><div class='add'>+#define SM8550_MSS	12</div><div class='add'>+#define SM8550_NSP	13</div><div class='add'>+</div><div class='add'>+/* QDU1000/QRU1000 Power Domain Indexes */</div><div class='add'>+#define QDU1000_EBI	0</div><div class='add'>+#define QDU1000_MSS	1</div><div class='add'>+#define QDU1000_CX	2</div><div class='add'>+#define QDU1000_MX	3</div><div class='add'>+</div><div class='add'>+/* SC7180 Power Domain Indexes */</div><div class='add'>+#define SC7180_CX	0</div><div class='add'>+#define SC7180_CX_AO	1</div><div class='add'>+#define SC7180_GFX	2</div><div class='add'>+#define SC7180_MX	3</div><div class='add'>+#define SC7180_MX_AO	4</div><div class='add'>+#define SC7180_LMX	5</div><div class='add'>+#define SC7180_LCX	6</div><div class='add'>+#define SC7180_MSS	7</div><div class='add'>+</div><div class='add'>+/* SC7280 Power Domain Indexes */</div><div class='add'>+#define SC7280_CX	0</div><div class='add'>+#define SC7280_CX_AO	1</div><div class='add'>+#define SC7280_EBI	2</div><div class='add'>+#define SC7280_GFX	3</div><div class='add'>+#define SC7280_MX	4</div><div class='add'>+#define SC7280_MX_AO	5</div><div class='add'>+#define SC7280_LMX	6</div><div class='add'>+#define SC7280_LCX	7</div><div class='add'>+#define SC7280_MSS	8</div><div class='add'>+</div><div class='add'>+/* SC8180X Power Domain Indexes */</div><div class='add'>+#define SC8180X_CX	0</div><div class='add'>+#define SC8180X_CX_AO	1</div><div class='add'>+#define SC8180X_EBI	2</div><div class='add'>+#define SC8180X_GFX	3</div><div class='add'>+#define SC8180X_LCX	4</div><div class='add'>+#define SC8180X_LMX	5</div><div class='add'>+#define SC8180X_MMCX	6</div><div class='add'>+#define SC8180X_MMCX_AO	7</div><div class='add'>+#define SC8180X_MSS	8</div><div class='add'>+#define SC8180X_MX	9</div><div class='add'>+#define SC8180X_MX_AO	10</div><div class='add'>+</div><div class='add'>+/* SC8280XP Power Domain Indexes */</div><div class='add'>+#define SC8280XP_CX		0</div><div class='add'>+#define SC8280XP_CX_AO		1</div><div class='add'>+#define SC8280XP_DDR		2</div><div class='add'>+#define SC8280XP_EBI		3</div><div class='add'>+#define SC8280XP_GFX		4</div><div class='add'>+#define SC8280XP_LCX		5</div><div class='add'>+#define SC8280XP_LMX		6</div><div class='add'>+#define SC8280XP_MMCX		7</div><div class='add'>+#define SC8280XP_MMCX_AO	8</div><div class='add'>+#define SC8280XP_MSS		9</div><div class='add'>+#define SC8280XP_MX		10</div><div class='add'>+#define SC8280XP_MXC		12</div><div class='add'>+#define SC8280XP_MX_AO		11</div><div class='add'>+#define SC8280XP_NSP		13</div><div class='add'>+#define SC8280XP_QPHY		14</div><div class='add'>+#define SC8280XP_XO		15</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h<br/>index 608087fb9a3d..4371ac941f29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/qcom-rpmpd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/power/qcom-rpmpd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/qcom-rpmpd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/qcom-rpmpd.h</a></div><div class='hunk'>@@ -4,255 +4,39 @@</div><div class='ctx'> #ifndef _DT_BINDINGS_POWER_QCOM_RPMPD_H</div><div class='ctx'> #define _DT_BINDINGS_POWER_QCOM_RPMPD_H</div><div class='ctx'> </div><div class='del'>-/* SA8775P Power Domain Indexes */</div><div class='del'>-#define SA8775P_CX	0</div><div class='del'>-#define SA8775P_CX_AO	1</div><div class='del'>-#define SA8775P_DDR	2</div><div class='del'>-#define SA8775P_EBI	3</div><div class='del'>-#define SA8775P_GFX	4</div><div class='del'>-#define SA8775P_LCX	5</div><div class='del'>-#define SA8775P_LMX	6</div><div class='del'>-#define SA8775P_MMCX	7</div><div class='del'>-#define SA8775P_MMCX_AO	8</div><div class='del'>-#define SA8775P_MSS	9</div><div class='del'>-#define SA8775P_MX	10</div><div class='del'>-#define SA8775P_MX_AO	11</div><div class='del'>-#define SA8775P_MXC	12</div><div class='del'>-#define SA8775P_MXC_AO	13</div><div class='del'>-#define SA8775P_NSP0	14</div><div class='del'>-#define SA8775P_NSP1	15</div><div class='del'>-#define SA8775P_XO	16</div><div class='del'>-</div><div class='del'>-/* SDM670 Power Domain Indexes */</div><div class='del'>-#define SDM670_MX	0</div><div class='del'>-#define SDM670_MX_AO	1</div><div class='del'>-#define SDM670_CX	2</div><div class='del'>-#define SDM670_CX_AO	3</div><div class='del'>-#define SDM670_LMX	4</div><div class='del'>-#define SDM670_LCX	5</div><div class='del'>-#define SDM670_GFX	6</div><div class='del'>-#define SDM670_MSS	7</div><div class='del'>-</div><div class='del'>-/* SDM845 Power Domain Indexes */</div><div class='del'>-#define SDM845_EBI	0</div><div class='del'>-#define SDM845_MX	1</div><div class='del'>-#define SDM845_MX_AO	2</div><div class='del'>-#define SDM845_CX	3</div><div class='del'>-#define SDM845_CX_AO	4</div><div class='del'>-#define SDM845_LMX	5</div><div class='del'>-#define SDM845_LCX	6</div><div class='del'>-#define SDM845_GFX	7</div><div class='del'>-#define SDM845_MSS	8</div><div class='del'>-</div><div class='del'>-/* SDX55 Power Domain Indexes */</div><div class='del'>-#define SDX55_MSS	0</div><div class='del'>-#define SDX55_MX	1</div><div class='del'>-#define SDX55_CX	2</div><div class='del'>-</div><div class='del'>-/* SDX65 Power Domain Indexes */</div><div class='del'>-#define SDX65_MSS	0</div><div class='del'>-#define SDX65_MX	1</div><div class='del'>-#define SDX65_MX_AO	2</div><div class='del'>-#define SDX65_CX	3</div><div class='del'>-#define SDX65_CX_AO	4</div><div class='del'>-#define SDX65_MXC	5</div><div class='del'>-</div><div class='del'>-/* SM6350 Power Domain Indexes */</div><div class='del'>-#define SM6350_CX	0</div><div class='del'>-#define SM6350_GFX	1</div><div class='del'>-#define SM6350_LCX	2</div><div class='del'>-#define SM6350_LMX	3</div><div class='del'>-#define SM6350_MSS	4</div><div class='del'>-#define SM6350_MX	5</div><div class='del'>-</div><div class='del'>-/* SM6350 Power Domain Indexes */</div><div class='del'>-#define SM6375_VDDCX		0</div><div class='del'>-#define SM6375_VDDCX_AO	1</div><div class='del'>-#define SM6375_VDDCX_VFL	2</div><div class='del'>-#define SM6375_VDDMX		3</div><div class='del'>-#define SM6375_VDDMX_AO	4</div><div class='del'>-#define SM6375_VDDMX_VFL	5</div><div class='del'>-#define SM6375_VDDGX		6</div><div class='del'>-#define SM6375_VDDGX_AO	7</div><div class='del'>-#define SM6375_VDD_LPI_CX	8</div><div class='del'>-#define SM6375_VDD_LPI_MX	9</div><div class='del'>-</div><div class='del'>-/* SM8150 Power Domain Indexes */</div><div class='del'>-#define SM8150_MSS	0</div><div class='del'>-#define SM8150_EBI	1</div><div class='del'>-#define SM8150_LMX	2</div><div class='del'>-#define SM8150_LCX	3</div><div class='del'>-#define SM8150_GFX	4</div><div class='del'>-#define SM8150_MX	5</div><div class='del'>-#define SM8150_MX_AO	6</div><div class='del'>-#define SM8150_CX	7</div><div class='del'>-#define SM8150_CX_AO	8</div><div class='del'>-#define SM8150_MMCX	9</div><div class='del'>-#define SM8150_MMCX_AO	10</div><div class='del'>-</div><div class='del'>-/* SA8155P is a special case, kept for backwards compatibility */</div><div class='del'>-#define SA8155P_CX	SM8150_CX</div><div class='del'>-#define SA8155P_CX_AO	SM8150_CX_AO</div><div class='del'>-#define SA8155P_EBI	SM8150_EBI</div><div class='del'>-#define SA8155P_GFX	SM8150_GFX</div><div class='del'>-#define SA8155P_MSS	SM8150_MSS</div><div class='del'>-#define SA8155P_MX	SM8150_MX</div><div class='del'>-#define SA8155P_MX_AO	SM8150_MX_AO</div><div class='del'>-</div><div class='del'>-/* SM8250 Power Domain Indexes */</div><div class='del'>-#define SM8250_CX	0</div><div class='del'>-#define SM8250_CX_AO	1</div><div class='del'>-#define SM8250_EBI	2</div><div class='del'>-#define SM8250_GFX	3</div><div class='del'>-#define SM8250_LCX	4</div><div class='del'>-#define SM8250_LMX	5</div><div class='del'>-#define SM8250_MMCX	6</div><div class='del'>-#define SM8250_MMCX_AO	7</div><div class='del'>-#define SM8250_MX	8</div><div class='del'>-#define SM8250_MX_AO	9</div><div class='del'>-</div><div class='del'>-/* SM8350 Power Domain Indexes */</div><div class='del'>-#define SM8350_CX	0</div><div class='del'>-#define SM8350_CX_AO	1</div><div class='del'>-#define SM8350_EBI	2</div><div class='del'>-#define SM8350_GFX	3</div><div class='del'>-#define SM8350_LCX	4</div><div class='del'>-#define SM8350_LMX	5</div><div class='del'>-#define SM8350_MMCX	6</div><div class='del'>-#define SM8350_MMCX_AO	7</div><div class='del'>-#define SM8350_MX	8</div><div class='del'>-#define SM8350_MX_AO	9</div><div class='del'>-#define SM8350_MXC	10</div><div class='del'>-#define SM8350_MXC_AO	11</div><div class='del'>-#define SM8350_MSS	12</div><div class='del'>-</div><div class='del'>-/* SM8450 Power Domain Indexes */</div><div class='del'>-#define SM8450_CX	0</div><div class='del'>-#define SM8450_CX_AO	1</div><div class='del'>-#define SM8450_EBI	2</div><div class='del'>-#define SM8450_GFX	3</div><div class='del'>-#define SM8450_LCX	4</div><div class='del'>-#define SM8450_LMX	5</div><div class='del'>-#define SM8450_MMCX	6</div><div class='del'>-#define SM8450_MMCX_AO	7</div><div class='del'>-#define SM8450_MX	8</div><div class='del'>-#define SM8450_MX_AO	9</div><div class='del'>-#define SM8450_MXC	10</div><div class='del'>-#define SM8450_MXC_AO	11</div><div class='del'>-#define SM8450_MSS	12</div><div class='del'>-</div><div class='del'>-/* SM8550 Power Domain Indexes */</div><div class='del'>-#define SM8550_CX	0</div><div class='del'>-#define SM8550_CX_AO	1</div><div class='del'>-#define SM8550_EBI	2</div><div class='del'>-#define SM8550_GFX	3</div><div class='del'>-#define SM8550_LCX	4</div><div class='del'>-#define SM8550_LMX	5</div><div class='del'>-#define SM8550_MMCX	6</div><div class='del'>-#define SM8550_MMCX_AO	7</div><div class='del'>-#define SM8550_MX	8</div><div class='del'>-#define SM8550_MX_AO	9</div><div class='del'>-#define SM8550_MXC	10</div><div class='del'>-#define SM8550_MXC_AO	11</div><div class='del'>-#define SM8550_MSS	12</div><div class='del'>-#define SM8550_NSP	13</div><div class='del'>-</div><div class='del'>-/* QDU1000/QRU1000 Power Domain Indexes */</div><div class='del'>-#define QDU1000_EBI	0</div><div class='del'>-#define QDU1000_MSS	1</div><div class='del'>-#define QDU1000_CX	2</div><div class='del'>-#define QDU1000_MX	3</div><div class='del'>-</div><div class='del'>-/* SC7180 Power Domain Indexes */</div><div class='del'>-#define SC7180_CX	0</div><div class='del'>-#define SC7180_CX_AO	1</div><div class='del'>-#define SC7180_GFX	2</div><div class='del'>-#define SC7180_MX	3</div><div class='del'>-#define SC7180_MX_AO	4</div><div class='del'>-#define SC7180_LMX	5</div><div class='del'>-#define SC7180_LCX	6</div><div class='del'>-#define SC7180_MSS	7</div><div class='del'>-</div><div class='del'>-/* SC7280 Power Domain Indexes */</div><div class='del'>-#define SC7280_CX	0</div><div class='del'>-#define SC7280_CX_AO	1</div><div class='del'>-#define SC7280_EBI	2</div><div class='del'>-#define SC7280_GFX	3</div><div class='del'>-#define SC7280_MX	4</div><div class='del'>-#define SC7280_MX_AO	5</div><div class='del'>-#define SC7280_LMX	6</div><div class='del'>-#define SC7280_LCX	7</div><div class='del'>-#define SC7280_MSS	8</div><div class='del'>-</div><div class='del'>-/* SC8180X Power Domain Indexes */</div><div class='del'>-#define SC8180X_CX	0</div><div class='del'>-#define SC8180X_CX_AO	1</div><div class='del'>-#define SC8180X_EBI	2</div><div class='del'>-#define SC8180X_GFX	3</div><div class='del'>-#define SC8180X_LCX	4</div><div class='del'>-#define SC8180X_LMX	5</div><div class='del'>-#define SC8180X_MMCX	6</div><div class='del'>-#define SC8180X_MMCX_AO	7</div><div class='del'>-#define SC8180X_MSS	8</div><div class='del'>-#define SC8180X_MX	9</div><div class='del'>-#define SC8180X_MX_AO	10</div><div class='del'>-</div><div class='del'>-/* SC8280XP Power Domain Indexes */</div><div class='del'>-#define SC8280XP_CX		0</div><div class='del'>-#define SC8280XP_CX_AO		1</div><div class='del'>-#define SC8280XP_DDR		2</div><div class='del'>-#define SC8280XP_EBI		3</div><div class='del'>-#define SC8280XP_GFX		4</div><div class='del'>-#define SC8280XP_LCX		5</div><div class='del'>-#define SC8280XP_LMX		6</div><div class='del'>-#define SC8280XP_MMCX		7</div><div class='del'>-#define SC8280XP_MMCX_AO	8</div><div class='del'>-#define SC8280XP_MSS		9</div><div class='del'>-#define SC8280XP_MX		10</div><div class='del'>-#define SC8280XP_MXC		12</div><div class='del'>-#define SC8280XP_MX_AO		11</div><div class='del'>-#define SC8280XP_NSP		13</div><div class='del'>-#define SC8280XP_QPHY		14</div><div class='del'>-#define SC8280XP_XO		15</div><div class='del'>-</div><div class='del'>-/* SDM845 Power Domain performance levels */</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_RETENTION		16</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_MIN_SVS		48</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_LOW_SVS_D2		52</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_LOW_SVS_D1		56</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_LOW_SVS_D0		60</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_LOW_SVS		64</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_LOW_SVS_P1		72</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_LOW_SVS_L1		80</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_LOW_SVS_L2		96</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_SVS		128</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_SVS_L0		144</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_SVS_L1		192</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_SVS_L2		224</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_NOM		256</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_NOM_L0		288</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_NOM_L1		320</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_NOM_L2		336</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_TURBO		384</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_TURBO_L0		400</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_TURBO_L1		416</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_TURBO_L2		432</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_TURBO_L3		448</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_SUPER_TURBO 	464</div><div class='del'>-#define RPMH_REGULATOR_LEVEL_SUPER_TURBO_NO_CPR	480</div><div class='add'>+#include &lt;dt-bindings/power/qcom,rpmhpd.h&gt;</div><div class='add'>+</div><div class='add'>+/* Generic RPM Power Domain Indexes */</div><div class='add'>+#define RPMPD_VDDCX		0</div><div class='add'>+#define RPMPD_VDDCX_AO		1</div><div class='add'>+/* VFC and VFL are mutually exclusive and can not be present on the same platform */</div><div class='add'>+#define RPMPD_VDDCX_VFC		2</div><div class='add'>+#define RPMPD_VDDCX_VFL		2</div><div class='add'>+#define RPMPD_VDDMX		3</div><div class='add'>+#define RPMPD_VDDMX_AO		4</div><div class='add'>+#define RPMPD_VDDMX_VFL		5</div><div class='add'>+#define RPMPD_SSCCX		6</div><div class='add'>+#define RPMPD_SSCCX_VFL		7</div><div class='add'>+#define RPMPD_SSCMX		8</div><div class='add'>+#define RPMPD_SSCMX_VFL		9</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Platform-specific power domain bindings. Don't add new entries here, use</div><div class='add'>+ * RPMPD_* above.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /* MDM9607 Power Domains */</div><div class='del'>-#define MDM9607_VDDCX		0</div><div class='del'>-#define MDM9607_VDDCX_AO	1</div><div class='del'>-#define MDM9607_VDDCX_VFL	2</div><div class='del'>-#define MDM9607_VDDMX		3</div><div class='del'>-#define MDM9607_VDDMX_AO	4</div><div class='del'>-#define MDM9607_VDDMX_VFL	5</div><div class='add'>+#define MDM9607_VDDCX		RPMPD_VDDCX</div><div class='add'>+#define MDM9607_VDDCX_AO	RPMPD_VDDCX_AO</div><div class='add'>+#define MDM9607_VDDCX_VFL	RPMPD_VDDCX_VFL</div><div class='add'>+#define MDM9607_VDDMX		RPMPD_VDDMX</div><div class='add'>+#define MDM9607_VDDMX_AO	RPMPD_VDDMX_AO</div><div class='add'>+#define MDM9607_VDDMX_VFL	RPMPD_VDDMX_VFL</div><div class='ctx'> </div><div class='ctx'> /* MSM8226 Power Domain Indexes */</div><div class='del'>-#define MSM8226_VDDCX		0</div><div class='del'>-#define MSM8226_VDDCX_AO	1</div><div class='del'>-#define MSM8226_VDDCX_VFC	2</div><div class='add'>+#define MSM8226_VDDCX		RPMPD_VDDCX</div><div class='add'>+#define MSM8226_VDDCX_AO	RPMPD_VDDCX_AO</div><div class='add'>+#define MSM8226_VDDCX_VFC	RPMPD_VDDCX_VFC</div><div class='ctx'> </div><div class='ctx'> /* MSM8939 Power Domains */</div><div class='ctx'> #define MSM8939_VDDMDCX		0</div><div class='hunk'>@@ -265,11 +49,11 @@</div><div class='ctx'> #define MSM8939_VDDMX_AO	7</div><div class='ctx'> </div><div class='ctx'> /* MSM8916 Power Domain Indexes */</div><div class='del'>-#define MSM8916_VDDCX		0</div><div class='del'>-#define MSM8916_VDDCX_AO	1</div><div class='del'>-#define MSM8916_VDDCX_VFC	2</div><div class='del'>-#define MSM8916_VDDMX		3</div><div class='del'>-#define MSM8916_VDDMX_AO	4</div><div class='add'>+#define MSM8916_VDDCX		RPMPD_VDDCX</div><div class='add'>+#define MSM8916_VDDCX_AO	RPMPD_VDDCX_AO</div><div class='add'>+#define MSM8916_VDDCX_VFC	RPMPD_VDDCX_VFC</div><div class='add'>+#define MSM8916_VDDMX		RPMPD_VDDMX</div><div class='add'>+#define MSM8916_VDDMX_AO	RPMPD_VDDMX_AO</div><div class='ctx'> </div><div class='ctx'> /* MSM8909 Power Domain Indexes */</div><div class='ctx'> #define MSM8909_VDDCX		MSM8916_VDDCX</div><div class='hunk'>@@ -279,11 +63,11 @@</div><div class='ctx'> #define MSM8909_VDDMX_AO	MSM8916_VDDMX_AO</div><div class='ctx'> </div><div class='ctx'> /* MSM8917 Power Domain Indexes */</div><div class='del'>-#define MSM8917_VDDCX		0</div><div class='del'>-#define MSM8917_VDDCX_AO	1</div><div class='del'>-#define MSM8917_VDDCX_VFL	2</div><div class='del'>-#define MSM8917_VDDMX		3</div><div class='del'>-#define MSM8917_VDDMX_AO	4</div><div class='add'>+#define MSM8917_VDDCX		RPMPD_VDDCX</div><div class='add'>+#define MSM8917_VDDCX_AO	RPMPD_VDDCX_AO</div><div class='add'>+#define MSM8917_VDDCX_VFL	RPMPD_VDDCX_VFL</div><div class='add'>+#define MSM8917_VDDMX		RPMPD_VDDMX</div><div class='add'>+#define MSM8917_VDDMX_AO	RPMPD_VDDMX_AO</div><div class='ctx'> </div><div class='ctx'> /* MSM8937 Power Domain Indexes */</div><div class='ctx'> #define MSM8937_VDDCX		MSM8917_VDDCX</div><div class='hunk'>@@ -316,12 +100,12 @@</div><div class='ctx'> #define MSM8974_VDDGFX_VFC	4</div><div class='ctx'> </div><div class='ctx'> /* MSM8976 Power Domain Indexes */</div><div class='del'>-#define MSM8976_VDDCX		0</div><div class='del'>-#define MSM8976_VDDCX_AO	1</div><div class='del'>-#define MSM8976_VDDCX_VFL	2</div><div class='del'>-#define MSM8976_VDDMX		3</div><div class='del'>-#define MSM8976_VDDMX_AO	4</div><div class='del'>-#define MSM8976_VDDMX_VFL	5</div><div class='add'>+#define MSM8976_VDDCX		RPMPD_VDDCX</div><div class='add'>+#define MSM8976_VDDCX_AO	RPMPD_VDDCX_AO</div><div class='add'>+#define MSM8976_VDDCX_VFL	RPMPD_VDDCX_VFL</div><div class='add'>+#define MSM8976_VDDMX		RPMPD_VDDMX</div><div class='add'>+#define MSM8976_VDDMX_AO	RPMPD_VDDMX_AO</div><div class='add'>+#define MSM8976_VDDMX_VFL	RPMPD_VDDMX_VFL</div><div class='ctx'> </div><div class='ctx'> /* MSM8994 Power Domain Indexes */</div><div class='ctx'> #define MSM8994_VDDCX		0</div><div class='hunk'>@@ -342,16 +126,26 @@</div><div class='ctx'> #define MSM8996_VDDSSCX_VFC	6</div><div class='ctx'> </div><div class='ctx'> /* MSM8998 Power Domain Indexes */</div><div class='del'>-#define MSM8998_VDDCX		0</div><div class='del'>-#define MSM8998_VDDCX_AO	1</div><div class='del'>-#define MSM8998_VDDCX_VFL	2</div><div class='del'>-#define MSM8998_VDDMX		3</div><div class='del'>-#define MSM8998_VDDMX_AO	4</div><div class='del'>-#define MSM8998_VDDMX_VFL	5</div><div class='del'>-#define MSM8998_SSCCX		6</div><div class='del'>-#define MSM8998_SSCCX_VFL	7</div><div class='del'>-#define MSM8998_SSCMX		8</div><div class='del'>-#define MSM8998_SSCMX_VFL	9</div><div class='add'>+#define MSM8998_VDDCX		RPMPD_VDDCX</div><div class='add'>+#define MSM8998_VDDCX_AO	RPMPD_VDDCX_AO</div><div class='add'>+#define MSM8998_VDDCX_VFL	RPMPD_VDDCX_VFL</div><div class='add'>+#define MSM8998_VDDMX		RPMPD_VDDMX</div><div class='add'>+#define MSM8998_VDDMX_AO	RPMPD_VDDMX_AO</div><div class='add'>+#define MSM8998_VDDMX_VFL	RPMPD_VDDMX_VFL</div><div class='add'>+#define MSM8998_SSCCX		RPMPD_SSCCX</div><div class='add'>+#define MSM8998_SSCCX_VFL	RPMPD_SSCCX_VFL</div><div class='add'>+#define MSM8998_SSCMX		RPMPD_SSCMX</div><div class='add'>+#define MSM8998_SSCMX_VFL	RPMPD_SSCMX_VFL</div><div class='add'>+</div><div class='add'>+/* QCM2290 Power Domains */</div><div class='add'>+#define QCM2290_VDDCX		0</div><div class='add'>+#define QCM2290_VDDCX_AO	1</div><div class='add'>+#define QCM2290_VDDCX_VFL	2</div><div class='add'>+#define QCM2290_VDDMX		3</div><div class='add'>+#define QCM2290_VDDMX_AO	4</div><div class='add'>+#define QCM2290_VDDMX_VFL	5</div><div class='add'>+#define QCM2290_VDD_LPI_CX	6</div><div class='add'>+#define QCM2290_VDD_LPI_MX	7</div><div class='ctx'> </div><div class='ctx'> /* QCS404 Power Domains */</div><div class='ctx'> #define QCS404_VDDMX		0</div><div class='hunk'>@@ -363,16 +157,16 @@</div><div class='ctx'> #define QCS404_LPIMX_VFL	6</div><div class='ctx'> </div><div class='ctx'> /* SDM660 Power Domains */</div><div class='del'>-#define SDM660_VDDCX		0</div><div class='del'>-#define SDM660_VDDCX_AO		1</div><div class='del'>-#define SDM660_VDDCX_VFL	2</div><div class='del'>-#define SDM660_VDDMX		3</div><div class='del'>-#define SDM660_VDDMX_AO		4</div><div class='del'>-#define SDM660_VDDMX_VFL	5</div><div class='del'>-#define SDM660_SSCCX		6</div><div class='del'>-#define SDM660_SSCCX_VFL	7</div><div class='del'>-#define SDM660_SSCMX		8</div><div class='del'>-#define SDM660_SSCMX_VFL	9</div><div class='add'>+#define SDM660_VDDCX		RPMPD_VDDCX</div><div class='add'>+#define SDM660_VDDCX_AO		RPMPD_VDDCX_AO</div><div class='add'>+#define SDM660_VDDCX_VFL	RPMPD_VDDCX_VFL</div><div class='add'>+#define SDM660_VDDMX		RPMPD_VDDMX</div><div class='add'>+#define SDM660_VDDMX_AO		RPMPD_VDDMX_AO</div><div class='add'>+#define SDM660_VDDMX_VFL	RPMPD_VDDMX_VFL</div><div class='add'>+#define SDM660_SSCCX		RPMPD_SSCCX</div><div class='add'>+#define SDM660_SSCCX_VFL	RPMPD_SSCCX_VFL</div><div class='add'>+#define SDM660_SSCMX		RPMPD_SSCMX</div><div class='add'>+#define SDM660_SSCMX_VFL	RPMPD_SSCMX_VFL</div><div class='ctx'> </div><div class='ctx'> /* SM6115 Power Domains */</div><div class='ctx'> #define SM6115_VDDCX		0</div><div class='hunk'>@@ -385,22 +179,24 @@</div><div class='ctx'> #define SM6115_VDD_LPI_MX	7</div><div class='ctx'> </div><div class='ctx'> /* SM6125 Power Domains */</div><div class='del'>-#define SM6125_VDDCX		0</div><div class='del'>-#define SM6125_VDDCX_AO		1</div><div class='del'>-#define SM6125_VDDCX_VFL	2</div><div class='del'>-#define SM6125_VDDMX		3</div><div class='del'>-#define SM6125_VDDMX_AO		4</div><div class='del'>-#define SM6125_VDDMX_VFL	5</div><div class='del'>-</div><div class='del'>-/* QCM2290 Power Domains */</div><div class='del'>-#define QCM2290_VDDCX		0</div><div class='del'>-#define QCM2290_VDDCX_AO	1</div><div class='del'>-#define QCM2290_VDDCX_VFL	2</div><div class='del'>-#define QCM2290_VDDMX		3</div><div class='del'>-#define QCM2290_VDDMX_AO	4</div><div class='del'>-#define QCM2290_VDDMX_VFL	5</div><div class='del'>-#define QCM2290_VDD_LPI_CX	6</div><div class='del'>-#define QCM2290_VDD_LPI_MX	7</div><div class='add'>+#define SM6125_VDDCX		RPMPD_VDDCX</div><div class='add'>+#define SM6125_VDDCX_AO		RPMPD_VDDCX_AO</div><div class='add'>+#define SM6125_VDDCX_VFL	RPMPD_VDDCX_VFL</div><div class='add'>+#define SM6125_VDDMX		RPMPD_VDDMX</div><div class='add'>+#define SM6125_VDDMX_AO		RPMPD_VDDMX_AO</div><div class='add'>+#define SM6125_VDDMX_VFL	RPMPD_VDDMX_VFL</div><div class='add'>+</div><div class='add'>+/* SM6375 Power Domain Indexes */</div><div class='add'>+#define SM6375_VDDCX		0</div><div class='add'>+#define SM6375_VDDCX_AO	1</div><div class='add'>+#define SM6375_VDDCX_VFL	2</div><div class='add'>+#define SM6375_VDDMX		3</div><div class='add'>+#define SM6375_VDDMX_AO	4</div><div class='add'>+#define SM6375_VDDMX_VFL	5</div><div class='add'>+#define SM6375_VDDGX		6</div><div class='add'>+#define SM6375_VDDGX_AO	7</div><div class='add'>+#define SM6375_VDD_LPI_CX	8</div><div class='add'>+#define SM6375_VDD_LPI_MX	9</div><div class='ctx'> </div><div class='ctx'> /* RPM SMD Power Domain performance levels */</div><div class='ctx'> #define RPM_SMD_LEVEL_RETENTION       16</div><div class='head'>diff --git a/include/dt-bindings/power/rockchip,rk3528-power.h b/include/dt-bindings/power/rockchip,rk3528-power.h<br/>new file mode 100644<br/>index 000000000000..318923cdaaf6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/rockchip,rk3528-power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/rockchip,rk3528-power.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */</div><div class='add'>+#ifndef __DT_BINDINGS_POWER_RK3528_POWER_H__</div><div class='add'>+#define __DT_BINDINGS_POWER_RK3528_POWER_H__</div><div class='add'>+</div><div class='add'>+#define RK3528_PD_PMU		0</div><div class='add'>+#define RK3528_PD_BUS		1</div><div class='add'>+#define RK3528_PD_DDR		2</div><div class='add'>+#define RK3528_PD_MSCH		3</div><div class='add'>+</div><div class='add'>+/* VD_GPU */</div><div class='add'>+#define RK3528_PD_GPU		4</div><div class='add'>+</div><div class='add'>+/* VD_LOGIC */</div><div class='add'>+#define RK3528_PD_RKVDEC	5</div><div class='add'>+#define RK3528_PD_RKVENC	6</div><div class='add'>+#define RK3528_PD_VO		7</div><div class='add'>+#define RK3528_PD_VPU		8</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/rockchip,rk3562-power.h b/include/dt-bindings/power/rockchip,rk3562-power.h<br/>new file mode 100644<br/>index 000000000000..5182c2427a55<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/rockchip,rk3562-power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/rockchip,rk3562-power.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022-2024 Rockchip Electronics Co., Ltd.</div><div class='add'>+ */</div><div class='add'>+#ifndef __DT_BINDINGS_POWER_RK3562_POWER_H__</div><div class='add'>+#define __DT_BINDINGS_POWER_RK3562_POWER_H__</div><div class='add'>+</div><div class='add'>+/* VD_CORE */</div><div class='add'>+#define RK3562_PD_CPU_0		0</div><div class='add'>+#define RK3562_PD_CPU_1		1</div><div class='add'>+#define RK3562_PD_CPU_2		2</div><div class='add'>+#define RK3562_PD_CPU_3		3</div><div class='add'>+#define RK3562_PD_CORE_ALIVE	4</div><div class='add'>+</div><div class='add'>+/* VD_PMU */</div><div class='add'>+#define RK3562_PD_PMU		5</div><div class='add'>+#define RK3562_PD_PMU_ALIVE	6</div><div class='add'>+</div><div class='add'>+/* VD_NPU */</div><div class='add'>+#define RK3562_PD_NPU		7</div><div class='add'>+</div><div class='add'>+/* VD_GPU */</div><div class='add'>+#define RK3562_PD_GPU		8</div><div class='add'>+</div><div class='add'>+/* VD_LOGIC */</div><div class='add'>+#define RK3562_PD_DDR		9</div><div class='add'>+#define RK3562_PD_VEPU		10</div><div class='add'>+#define RK3562_PD_VDPU		11</div><div class='add'>+#define RK3562_PD_VI		12</div><div class='add'>+#define RK3562_PD_VO		13</div><div class='add'>+#define RK3562_PD_RGA		14</div><div class='add'>+#define RK3562_PD_PHP		15</div><div class='add'>+#define RK3562_PD_LOGIC_ALIVE	16</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/rockchip,rk3576-power.h b/include/dt-bindings/power/rockchip,rk3576-power.h<br/>new file mode 100644<br/>index 000000000000..324a056aa851<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/rockchip,rk3576-power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/rockchip,rk3576-power.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+#ifndef __DT_BINDINGS_POWER_RK3576_POWER_H__</div><div class='add'>+#define __DT_BINDINGS_POWER_RK3576_POWER_H__</div><div class='add'>+</div><div class='add'>+/* VD_NPU */</div><div class='add'>+#define RK3576_PD_NPU		0</div><div class='add'>+#define RK3576_PD_NPUTOP	1</div><div class='add'>+#define RK3576_PD_NPU0		2</div><div class='add'>+#define RK3576_PD_NPU1		3</div><div class='add'>+</div><div class='add'>+/* VD_GPU */</div><div class='add'>+#define RK3576_PD_GPU		4</div><div class='add'>+</div><div class='add'>+/* VD_LOGIC */</div><div class='add'>+#define RK3576_PD_NVM		5</div><div class='add'>+#define RK3576_PD_SDGMAC	6</div><div class='add'>+#define RK3576_PD_USB		7</div><div class='add'>+#define RK3576_PD_PHP		8</div><div class='add'>+#define RK3576_PD_SUBPHP	9</div><div class='add'>+#define RK3576_PD_AUDIO		10</div><div class='add'>+#define RK3576_PD_VEPU0		11</div><div class='add'>+#define RK3576_PD_VEPU1		12</div><div class='add'>+#define RK3576_PD_VPU		13</div><div class='add'>+#define RK3576_PD_VDEC		14</div><div class='add'>+#define RK3576_PD_VI		15</div><div class='add'>+#define RK3576_PD_VO0		16</div><div class='add'>+#define RK3576_PD_VO1		17</div><div class='add'>+#define RK3576_PD_VOP		18</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/rockchip,rv1126b-power-controller.h b/include/dt-bindings/power/rockchip,rv1126b-power-controller.h<br/>new file mode 100644<br/>index 000000000000..48ea87a4423c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/rockchip,rv1126b-power-controller.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/rockchip,rv1126b-power-controller.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Rockchip Electronics Co., Ltd.</div><div class='add'>+ * Author: Finley Xiao &lt;finley.xiao@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_POWER_RV1126B_POWER_CONTROLLER_H__</div><div class='add'>+#define __DT_BINDINGS_POWER_RV1126B_POWER_CONTROLLER_H__</div><div class='add'>+</div><div class='add'>+/* VD_NPU */</div><div class='add'>+#define RV1126B_PD_NPU		0</div><div class='add'>+</div><div class='add'>+/* VD_LOGIC */</div><div class='add'>+#define RV1126B_PD_VDO		1</div><div class='add'>+#define RV1126B_PD_AIISP	2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/power/thead,th1520-power.h b/include/dt-bindings/power/thead,th1520-power.h<br/>new file mode 100644<br/>index 000000000000..8395bd1459f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/power/thead,th1520-power.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/power/thead,th1520-power.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 Alibaba Group Holding Limited.</div><div class='add'>+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Author: Michal Wilczynski &lt;m.wilczynski@samsung.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_POWER_TH1520_H</div><div class='add'>+#define __DT_BINDINGS_POWER_TH1520_H</div><div class='add'>+</div><div class='add'>+#define TH1520_AUDIO_PD		0</div><div class='add'>+#define TH1520_VDEC_PD		1</div><div class='add'>+#define TH1520_NPU_PD		2</div><div class='add'>+#define TH1520_VENC_PD		3</div><div class='add'>+#define TH1520_GPU_PD		4</div><div class='add'>+#define TH1520_DSP0_PD		5</div><div class='add'>+#define TH1520_DSP1_PD		6</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/regulator/nxp,pca9450-regulator.h b/include/dt-bindings/regulator/nxp,pca9450-regulator.h<br/>new file mode 100644<br/>index 000000000000..08434caef429<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/regulator/nxp,pca9450-regulator.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/regulator/nxp,pca9450-regulator.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Device Tree binding constants for the NXP PCA9450A/B/C PMIC regulators</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_REGULATORS_NXP_PCA9450_H</div><div class='add'>+#define _DT_BINDINGS_REGULATORS_NXP_PCA9450_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Buck mode constants which may be used in devicetree properties (eg.</div><div class='add'>+ * regulator-initial-mode, regulator-allowed-modes).</div><div class='add'>+ * See the manufacturer's datasheet for more information on these modes.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PCA9450_BUCK_MODE_AUTO		0</div><div class='add'>+#define PCA9450_BUCK_MODE_FORCE_PWM	1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/regulator/st,stm32mp15-regulator.h b/include/dt-bindings/regulator/st,stm32mp15-regulator.h<br/>new file mode 100644<br/>index 000000000000..7052507cb3e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/regulator/st,stm32mp15-regulator.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/regulator/st,stm32mp15-regulator.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025, STMicroelectronics - All Rights Reserved</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_REGULATOR_ST_STM32MP15_REGULATOR_H</div><div class='add'>+#define __DT_BINDINGS_REGULATOR_ST_STM32MP15_REGULATOR_H</div><div class='add'>+</div><div class='add'>+/* SCMI voltage domain identifiers */</div><div class='add'>+</div><div class='add'>+/* SOC Internal regulators */</div><div class='add'>+#define VOLTD_SCMI_REG11		0</div><div class='add'>+#define VOLTD_SCMI_REG18		1</div><div class='add'>+#define VOLTD_SCMI_USB33		2</div><div class='add'>+</div><div class='add'>+/* STPMIC1 regulators */</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_BUCK1	3</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_BUCK2	4</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_BUCK3	5</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_BUCK4	6</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_LDO1		7</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_LDO2		8</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_LDO3		9</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_LDO4		10</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_LDO5		11</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_LDO6		12</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_VREFDDR	13</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_BOOST	14</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_PWR_SW1	15</div><div class='add'>+#define VOLTD_SCMI_STPMIC1_PWR_SW2	16</div><div class='add'>+#define VOLTD_SCMI_VREFBUF		17</div><div class='add'>+</div><div class='add'>+/* External regulators */</div><div class='add'>+#define VOLTD_SCMI_REGU0		18</div><div class='add'>+#define VOLTD_SCMI_REGU1		19</div><div class='add'>+#define VOLTD_SCMI_REGU2		20</div><div class='add'>+#define VOLTD_SCMI_REGU3		21</div><div class='add'>+#define VOLTD_SCMI_REGU4		22</div><div class='add'>+</div><div class='add'>+#endif /*__DT_BINDINGS_REGULATOR_ST_STM32MP15_REGULATOR_H */</div><div class='head'>diff --git a/include/dt-bindings/regulator/st,stm32mp25-regulator.h b/include/dt-bindings/regulator/st,stm32mp25-regulator.h<br/>new file mode 100644<br/>index 000000000000..3c3d30911dd0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/regulator/st,stm32mp25-regulator.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/regulator/st,stm32mp25-regulator.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024, STMicroelectronics - All Rights Reserved</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_REGULATOR_ST_STM32MP25_REGULATOR_H</div><div class='add'>+#define __DT_BINDINGS_REGULATOR_ST_STM32MP25_REGULATOR_H</div><div class='add'>+</div><div class='add'>+/* SCMI voltage domains identifiers */</div><div class='add'>+</div><div class='add'>+/* SOC Internal regulators */</div><div class='add'>+#define VOLTD_SCMI_VDDIO1		0</div><div class='add'>+#define VOLTD_SCMI_VDDIO2		1</div><div class='add'>+#define VOLTD_SCMI_VDDIO3		2</div><div class='add'>+#define VOLTD_SCMI_VDDIO4		3</div><div class='add'>+#define VOLTD_SCMI_VDDIO		4</div><div class='add'>+#define VOLTD_SCMI_UCPD			5</div><div class='add'>+#define VOLTD_SCMI_USB33		6</div><div class='add'>+#define VOLTD_SCMI_ADC			7</div><div class='add'>+#define VOLTD_SCMI_GPU			8</div><div class='add'>+#define VOLTD_SCMI_VREFBUF		9</div><div class='add'>+</div><div class='add'>+/* STPMIC2 regulators */</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_BUCK1	10</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_BUCK2	11</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_BUCK3	12</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_BUCK4	13</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_BUCK5	14</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_BUCK6	15</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_BUCK7	16</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_LDO1		17</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_LDO2		18</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_LDO3		19</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_LDO4		20</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_LDO5		21</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_LDO6		22</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_LDO7		23</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_LDO8		24</div><div class='add'>+#define VOLTD_SCMI_STPMIC2_REFDDR	25</div><div class='add'>+</div><div class='add'>+/* External regulators */</div><div class='add'>+#define VOLTD_SCMI_REGU0		26</div><div class='add'>+#define VOLTD_SCMI_REGU1		27</div><div class='add'>+#define VOLTD_SCMI_REGU2		28</div><div class='add'>+#define VOLTD_SCMI_REGU3		29</div><div class='add'>+#define VOLTD_SCMI_REGU4		30</div><div class='add'>+</div><div class='add'>+#endif /*__DT_BINDINGS_REGULATOR_ST_STM32MP25_REGULATOR_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/airoha,en7523-reset.h b/include/dt-bindings/reset/airoha,en7523-reset.h<br/>new file mode 100644<br/>index 000000000000..211e8a23a21c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/airoha,en7523-reset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/airoha,en7523-reset.h</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 iopsys Software Solutions AB.</div><div class='add'>+ * Copyright (C) 2025 Genexis AB.</div><div class='add'>+ *</div><div class='add'>+ * Author: Mikhail Kshevetskiy &lt;mikhail.kshevetskiy@iopsys.eu&gt;</div><div class='add'>+ *</div><div class='add'>+ * based on</div><div class='add'>+ *   include/dt-bindings/reset/airoha,en7581-reset.h</div><div class='add'>+ * by Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_RESET_CONTROLLER_AIROHA_EN7523_H_</div><div class='add'>+#define __DT_BINDINGS_RESET_CONTROLLER_AIROHA_EN7523_H_</div><div class='add'>+</div><div class='add'>+/* RST_CTRL2 */</div><div class='add'>+#define EN7523_XPON_PHY_RST		 0</div><div class='add'>+#define EN7523_XSI_MAC_RST		 1</div><div class='add'>+#define EN7523_XSI_PHY_RST		 2</div><div class='add'>+#define EN7523_NPU_RST			 3</div><div class='add'>+#define EN7523_I2S_RST			 4</div><div class='add'>+#define EN7523_TRNG_RST			 5</div><div class='add'>+#define EN7523_TRNG_MSTART_RST		 6</div><div class='add'>+#define EN7523_DUAL_HSI0_RST		 7</div><div class='add'>+#define EN7523_DUAL_HSI1_RST		 8</div><div class='add'>+#define EN7523_HSI_RST			 9</div><div class='add'>+#define EN7523_DUAL_HSI0_MAC_RST	10</div><div class='add'>+#define EN7523_DUAL_HSI1_MAC_RST	11</div><div class='add'>+#define EN7523_HSI_MAC_RST		12</div><div class='add'>+#define EN7523_WDMA_RST			13</div><div class='add'>+#define EN7523_WOE0_RST			14</div><div class='add'>+#define EN7523_WOE1_RST			15</div><div class='add'>+#define EN7523_HSDMA_RST		16</div><div class='add'>+#define EN7523_I2C2RBUS_RST		17</div><div class='add'>+#define EN7523_TDMA_RST			18</div><div class='add'>+/* RST_CTRL1 */</div><div class='add'>+#define EN7523_PCM1_ZSI_ISI_RST		19</div><div class='add'>+#define EN7523_FE_PDMA_RST		20</div><div class='add'>+#define EN7523_FE_QDMA_RST		21</div><div class='add'>+#define EN7523_PCM_SPIWP_RST		22</div><div class='add'>+#define EN7523_CRYPTO_RST		23</div><div class='add'>+#define EN7523_TIMER_RST		24</div><div class='add'>+#define EN7523_PCM1_RST			25</div><div class='add'>+#define EN7523_UART_RST			26</div><div class='add'>+#define EN7523_GPIO_RST			27</div><div class='add'>+#define EN7523_GDMA_RST			28</div><div class='add'>+#define EN7523_I2C_MASTER_RST		29</div><div class='add'>+#define EN7523_PCM2_ZSI_ISI_RST		30</div><div class='add'>+#define EN7523_SFC_RST			31</div><div class='add'>+#define EN7523_UART2_RST		32</div><div class='add'>+#define EN7523_GDMP_RST			33</div><div class='add'>+#define EN7523_FE_RST			34</div><div class='add'>+#define EN7523_USB_HOST_P0_RST		35</div><div class='add'>+#define EN7523_GSW_RST			36</div><div class='add'>+#define EN7523_SFC2_PCM_RST		37</div><div class='add'>+#define EN7523_PCIE0_RST		38</div><div class='add'>+#define EN7523_PCIE1_RST		39</div><div class='add'>+#define EN7523_PCIE_HB_RST		40</div><div class='add'>+#define EN7523_XPON_MAC_RST		41</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_RESET_CONTROLLER_AIROHA_EN7523_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/airoha,en7581-reset.h b/include/dt-bindings/reset/airoha,en7581-reset.h<br/>new file mode 100644<br/>index 000000000000..6544a1790b83<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/airoha,en7581-reset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/airoha,en7581-reset.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 AIROHA Inc</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_RESET_CONTROLLER_AIROHA_EN7581_H_</div><div class='add'>+#define __DT_BINDINGS_RESET_CONTROLLER_AIROHA_EN7581_H_</div><div class='add'>+</div><div class='add'>+/* RST_CTRL2 */</div><div class='add'>+#define EN7581_XPON_PHY_RST		 0</div><div class='add'>+#define EN7581_CPU_TIMER2_RST		 1</div><div class='add'>+#define EN7581_HSUART_RST		 2</div><div class='add'>+#define EN7581_UART4_RST		 3</div><div class='add'>+#define EN7581_UART5_RST		 4</div><div class='add'>+#define EN7581_I2C2_RST			 5</div><div class='add'>+#define EN7581_XSI_MAC_RST		 6</div><div class='add'>+#define EN7581_XSI_PHY_RST		 7</div><div class='add'>+#define EN7581_NPU_RST			 8</div><div class='add'>+#define EN7581_I2S_RST			 9</div><div class='add'>+#define EN7581_TRNG_RST			10</div><div class='add'>+#define EN7581_TRNG_MSTART_RST		11</div><div class='add'>+#define EN7581_DUAL_HSI0_RST		12</div><div class='add'>+#define EN7581_DUAL_HSI1_RST		13</div><div class='add'>+#define EN7581_HSI_RST			14</div><div class='add'>+#define EN7581_DUAL_HSI0_MAC_RST	15</div><div class='add'>+#define EN7581_DUAL_HSI1_MAC_RST	16</div><div class='add'>+#define EN7581_HSI_MAC_RST		17</div><div class='add'>+#define EN7581_WDMA_RST			18</div><div class='add'>+#define EN7581_WOE0_RST			19</div><div class='add'>+#define EN7581_WOE1_RST			20</div><div class='add'>+#define EN7581_HSDMA_RST		21</div><div class='add'>+#define EN7581_TDMA_RST			22</div><div class='add'>+#define EN7581_EMMC_RST			23</div><div class='add'>+#define EN7581_SOE_RST			24</div><div class='add'>+#define EN7581_PCIE2_RST		25</div><div class='add'>+#define EN7581_XFP_MAC_RST		26</div><div class='add'>+#define EN7581_USB_HOST_P1_RST		27</div><div class='add'>+#define EN7581_USB_HOST_P1_U3_PHY_RST	28</div><div class='add'>+/* RST_CTRL1 */</div><div class='add'>+#define EN7581_PCM1_ZSI_ISI_RST		29</div><div class='add'>+#define EN7581_FE_PDMA_RST		30</div><div class='add'>+#define EN7581_FE_QDMA_RST		31</div><div class='add'>+#define EN7581_PCM_SPIWP_RST		32</div><div class='add'>+#define EN7581_CRYPTO_RST		33</div><div class='add'>+#define EN7581_TIMER_RST		34</div><div class='add'>+#define EN7581_PCM1_RST			35</div><div class='add'>+#define EN7581_UART_RST			36</div><div class='add'>+#define EN7581_GPIO_RST			37</div><div class='add'>+#define EN7581_GDMA_RST			38</div><div class='add'>+#define EN7581_I2C_MASTER_RST		39</div><div class='add'>+#define EN7581_PCM2_ZSI_ISI_RST		40</div><div class='add'>+#define EN7581_SFC_RST			41</div><div class='add'>+#define EN7581_UART2_RST		42</div><div class='add'>+#define EN7581_GDMP_RST			43</div><div class='add'>+#define EN7581_FE_RST			44</div><div class='add'>+#define EN7581_USB_HOST_P0_RST		45</div><div class='add'>+#define EN7581_GSW_RST			46</div><div class='add'>+#define EN7581_SFC2_PCM_RST		47</div><div class='add'>+#define EN7581_PCIE0_RST		48</div><div class='add'>+#define EN7581_PCIE1_RST		49</div><div class='add'>+#define EN7581_CPU_TIMER_RST		50</div><div class='add'>+#define EN7581_PCIE_HB_RST		51</div><div class='add'>+#define EN7581_XPON_MAC_RST		52</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_RESET_CONTROLLER_AIROHA_EN7581_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h b/include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h<br/>new file mode 100644<br/>index 000000000000..7693552f1507<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, SaluteDevices. All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Author: Jan Dakinevich &lt;jan.dakinevich@salutedevices.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_AMLOGIC_MESON_A1_AUDIO_RESET_H</div><div class='add'>+#define _DT_BINDINGS_AMLOGIC_MESON_A1_AUDIO_RESET_H</div><div class='add'>+</div><div class='add'>+#define AUD_RESET_DDRARB	0</div><div class='add'>+#define AUD_RESET_TDMIN_A	1</div><div class='add'>+#define AUD_RESET_TDMIN_B	2</div><div class='add'>+#define AUD_RESET_TDMIN_LB	3</div><div class='add'>+#define AUD_RESET_LOOPBACK	4</div><div class='add'>+#define AUD_RESET_TDMOUT_A	5</div><div class='add'>+#define AUD_RESET_TDMOUT_B	6</div><div class='add'>+#define AUD_RESET_FRDDR_A	7</div><div class='add'>+#define AUD_RESET_FRDDR_B	8</div><div class='add'>+#define AUD_RESET_TODDR_A	9</div><div class='add'>+#define AUD_RESET_TODDR_B	10</div><div class='add'>+#define AUD_RESET_SPDIFIN	11</div><div class='add'>+#define AUD_RESET_RESAMPLE	12</div><div class='add'>+#define AUD_RESET_EQDRC		13</div><div class='add'>+#define AUD_RESET_LOCKER	14</div><div class='add'>+#define AUD_RESET_TOACODEC	30</div><div class='add'>+#define AUD_RESET_CLKTREE	31</div><div class='add'>+</div><div class='add'>+#define AUD_VAD_RESET_DDRARB	0</div><div class='add'>+#define AUD_VAD_RESET_PDM	1</div><div class='add'>+#define AUD_VAD_RESET_TDMIN_VAD	2</div><div class='add'>+#define AUD_VAD_RESET_TODDR_VAD	3</div><div class='add'>+#define AUD_VAD_RESET_TOVAD	4</div><div class='add'>+#define AUD_VAD_RESET_CLKTREE	5</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_AMLOGIC_MESON_A1_AUDIO_RESET_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/aspeed,ast2700-scu.h b/include/dt-bindings/reset/aspeed,ast2700-scu.h<br/>new file mode 100644<br/>index 000000000000..d53c719b7a66<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/aspeed,ast2700-scu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/aspeed,ast2700-scu.h</a></div><div class='hunk'>@@ -0,0 +1,124 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Device Tree binding constants for AST2700 reset controller.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2024 Aspeed Technology Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _MACH_ASPEED_AST2700_RESET_H_</div><div class='add'>+#define _MACH_ASPEED_AST2700_RESET_H_</div><div class='add'>+</div><div class='add'>+/* SOC0 */</div><div class='add'>+#define SCU0_RESET_SDRAM	0</div><div class='add'>+#define SCU0_RESET_DDRPHY	1</div><div class='add'>+#define SCU0_RESET_RSA		2</div><div class='add'>+#define SCU0_RESET_SHA3		3</div><div class='add'>+#define SCU0_RESET_HACE		4</div><div class='add'>+#define SCU0_RESET_SOC		5</div><div class='add'>+#define SCU0_RESET_VIDEO	6</div><div class='add'>+#define SCU0_RESET_2D		7</div><div class='add'>+#define SCU0_RESET_PCIS		8</div><div class='add'>+#define SCU0_RESET_RVAS0	9</div><div class='add'>+#define SCU0_RESET_RVAS1	10</div><div class='add'>+#define SCU0_RESET_SM3		11</div><div class='add'>+#define SCU0_RESET_SM4		12</div><div class='add'>+#define SCU0_RESET_CRT0		13</div><div class='add'>+#define SCU0_RESET_ECC		14</div><div class='add'>+#define SCU0_RESET_DP_PCI	15</div><div class='add'>+#define SCU0_RESET_UFS		16</div><div class='add'>+#define SCU0_RESET_EMMC		17</div><div class='add'>+#define SCU0_RESET_PCIE1RST	18</div><div class='add'>+#define SCU0_RESET_PCIE1RSTOE	19</div><div class='add'>+#define SCU0_RESET_PCIE0RST	20</div><div class='add'>+#define SCU0_RESET_PCIE0RSTOE	21</div><div class='add'>+#define SCU0_RESET_JTAG		22</div><div class='add'>+#define SCU0_RESET_MCTP0	23</div><div class='add'>+#define SCU0_RESET_MCTP1	24</div><div class='add'>+#define SCU0_RESET_XDMA0	25</div><div class='add'>+#define SCU0_RESET_XDMA1	26</div><div class='add'>+#define SCU0_RESET_H2X1		27</div><div class='add'>+#define SCU0_RESET_DP		28</div><div class='add'>+#define SCU0_RESET_DP_MCU	29</div><div class='add'>+#define SCU0_RESET_SSP		30</div><div class='add'>+#define SCU0_RESET_H2X0		31</div><div class='add'>+#define SCU0_RESET_PORTA_VHUB	32</div><div class='add'>+#define SCU0_RESET_PORTA_PHY3	33</div><div class='add'>+#define SCU0_RESET_PORTA_XHCI	34</div><div class='add'>+#define SCU0_RESET_PORTB_VHUB	35</div><div class='add'>+#define SCU0_RESET_PORTB_PHY3	36</div><div class='add'>+#define SCU0_RESET_PORTB_XHCI	37</div><div class='add'>+#define SCU0_RESET_PORTA_VHUB_EHCI	38</div><div class='add'>+#define SCU0_RESET_PORTB_VHUB_EHCI	39</div><div class='add'>+#define SCU0_RESET_UHCI		40</div><div class='add'>+#define SCU0_RESET_TSP		41</div><div class='add'>+#define SCU0_RESET_E2M0		42</div><div class='add'>+#define SCU0_RESET_E2M1		43</div><div class='add'>+#define SCU0_RESET_VLINK	44</div><div class='add'>+</div><div class='add'>+/* SOC1 */</div><div class='add'>+#define SCU1_RESET_LPC0		0</div><div class='add'>+#define SCU1_RESET_LPC1		1</div><div class='add'>+#define SCU1_RESET_MII		2</div><div class='add'>+#define SCU1_RESET_PECI		3</div><div class='add'>+#define SCU1_RESET_PWM		4</div><div class='add'>+#define SCU1_RESET_MAC0		5</div><div class='add'>+#define SCU1_RESET_MAC1		6</div><div class='add'>+#define SCU1_RESET_MAC2		7</div><div class='add'>+#define SCU1_RESET_ADC		8</div><div class='add'>+#define SCU1_RESET_SD		9</div><div class='add'>+#define SCU1_RESET_ESPI0	10</div><div class='add'>+#define SCU1_RESET_ESPI1	11</div><div class='add'>+#define SCU1_RESET_JTAG1	12</div><div class='add'>+#define SCU1_RESET_SPI0		13</div><div class='add'>+#define SCU1_RESET_SPI1		14</div><div class='add'>+#define SCU1_RESET_SPI2		15</div><div class='add'>+#define SCU1_RESET_I3C0		16</div><div class='add'>+#define SCU1_RESET_I3C1		17</div><div class='add'>+#define SCU1_RESET_I3C2		18</div><div class='add'>+#define SCU1_RESET_I3C3		19</div><div class='add'>+#define SCU1_RESET_I3C4		20</div><div class='add'>+#define SCU1_RESET_I3C5		21</div><div class='add'>+#define SCU1_RESET_I3C6		22</div><div class='add'>+#define SCU1_RESET_I3C7		23</div><div class='add'>+#define SCU1_RESET_I3C8		24</div><div class='add'>+#define SCU1_RESET_I3C9		25</div><div class='add'>+#define SCU1_RESET_I3C10	26</div><div class='add'>+#define SCU1_RESET_I3C11	27</div><div class='add'>+#define SCU1_RESET_I3C12	28</div><div class='add'>+#define SCU1_RESET_I3C13	29</div><div class='add'>+#define SCU1_RESET_I3C14	30</div><div class='add'>+#define SCU1_RESET_I3C15	31</div><div class='add'>+#define SCU1_RESET_MCU0		32</div><div class='add'>+#define SCU1_RESET_MCU1		33</div><div class='add'>+#define SCU1_RESET_H2A_SPI1	34</div><div class='add'>+#define SCU1_RESET_H2A_SPI2	35</div><div class='add'>+#define SCU1_RESET_UART0	36</div><div class='add'>+#define SCU1_RESET_UART1	37</div><div class='add'>+#define SCU1_RESET_UART2	38</div><div class='add'>+#define SCU1_RESET_UART3	39</div><div class='add'>+#define SCU1_RESET_I2C_FILTER	40</div><div class='add'>+#define SCU1_RESET_CALIPTRA	41</div><div class='add'>+#define SCU1_RESET_XDMA		42</div><div class='add'>+#define SCU1_RESET_FSI		43</div><div class='add'>+#define SCU1_RESET_CAN		44</div><div class='add'>+#define SCU1_RESET_MCTP		45</div><div class='add'>+#define SCU1_RESET_I2C		46</div><div class='add'>+#define SCU1_RESET_UART6	47</div><div class='add'>+#define SCU1_RESET_UART7	48</div><div class='add'>+#define SCU1_RESET_UART8	49</div><div class='add'>+#define SCU1_RESET_UART9	50</div><div class='add'>+#define SCU1_RESET_LTPI0	51</div><div class='add'>+#define SCU1_RESET_VGAL		52</div><div class='add'>+#define SCU1_RESET_LTPI1	53</div><div class='add'>+#define SCU1_RESET_ACE		54</div><div class='add'>+#define SCU1_RESET_E2M		55</div><div class='add'>+#define SCU1_RESET_UHCI		56</div><div class='add'>+#define SCU1_RESET_PORTC_USB2UART	57</div><div class='add'>+#define SCU1_RESET_PORTC_VHUB_EHCI	58</div><div class='add'>+#define SCU1_RESET_PORTD_USB2UART	59</div><div class='add'>+#define SCU1_RESET_PORTD_VHUB_EHCI	60</div><div class='add'>+#define SCU1_RESET_H2X		61</div><div class='add'>+#define SCU1_RESET_I3CDMA	62</div><div class='add'>+#define SCU1_RESET_PCIE2RST	63</div><div class='add'>+</div><div class='add'>+#endif  /* _MACH_ASPEED_AST2700_RESET_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/canaan,k230-rst.h b/include/dt-bindings/reset/canaan,k230-rst.h<br/>new file mode 100644<br/>index 000000000000..e4f6612607fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/canaan,k230-rst.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/canaan,k230-rst.h</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023-2024 Canaan Bright Sight Co., Ltd</div><div class='add'>+ * Copyright (C) 2024-2025 Junhui Liu &lt;junhui.liu@pigmoral.tech&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _DT_BINDINGS_CANAAN_K230_RST_H_</div><div class='add'>+#define _DT_BINDINGS_CANAAN_K230_RST_H_</div><div class='add'>+</div><div class='add'>+#define RST_CPU0		0</div><div class='add'>+#define RST_CPU1		1</div><div class='add'>+#define RST_CPU0_FLUSH		2</div><div class='add'>+#define RST_CPU1_FLUSH		3</div><div class='add'>+#define RST_AI			4</div><div class='add'>+#define RST_VPU			5</div><div class='add'>+#define RST_HISYS		6</div><div class='add'>+#define RST_HISYS_AHB		7</div><div class='add'>+#define RST_SDIO0		8</div><div class='add'>+#define RST_SDIO1		9</div><div class='add'>+#define RST_SDIO_AXI		10</div><div class='add'>+#define RST_USB0		11</div><div class='add'>+#define RST_USB1		12</div><div class='add'>+#define RST_USB0_AHB		13</div><div class='add'>+#define RST_USB1_AHB		14</div><div class='add'>+#define RST_SPI0		15</div><div class='add'>+#define RST_SPI1		16</div><div class='add'>+#define RST_SPI2		17</div><div class='add'>+#define RST_SEC			18</div><div class='add'>+#define RST_PDMA		19</div><div class='add'>+#define RST_SDMA		20</div><div class='add'>+#define RST_DECOMPRESS		21</div><div class='add'>+#define RST_SRAM		22</div><div class='add'>+#define RST_SHRM_AXIM		23</div><div class='add'>+#define RST_SHRM_AXIS		24</div><div class='add'>+#define RST_NONAI2D		25</div><div class='add'>+#define RST_MCTL		26</div><div class='add'>+#define RST_ISP			27</div><div class='add'>+#define RST_ISP_DW		28</div><div class='add'>+#define RST_DPU			29</div><div class='add'>+#define RST_DISP		30</div><div class='add'>+#define RST_GPU			31</div><div class='add'>+#define RST_AUDIO		32</div><div class='add'>+#define RST_TIMER0		33</div><div class='add'>+#define RST_TIMER1		34</div><div class='add'>+#define RST_TIMER2		35</div><div class='add'>+#define RST_TIMER3		36</div><div class='add'>+#define RST_TIMER4		37</div><div class='add'>+#define RST_TIMER5		38</div><div class='add'>+#define RST_TIMER_APB		39</div><div class='add'>+#define RST_HDI			40</div><div class='add'>+#define RST_WDT0		41</div><div class='add'>+#define RST_WDT1		42</div><div class='add'>+#define RST_WDT0_APB		43</div><div class='add'>+#define RST_WDT1_APB		44</div><div class='add'>+#define RST_TS_APB		45</div><div class='add'>+#define RST_MAILBOX		46</div><div class='add'>+#define RST_STC			47</div><div class='add'>+#define RST_PMU			48</div><div class='add'>+#define RST_LOSYS_APB		49</div><div class='add'>+#define RST_UART0		50</div><div class='add'>+#define RST_UART1		51</div><div class='add'>+#define RST_UART2		52</div><div class='add'>+#define RST_UART3		53</div><div class='add'>+#define RST_UART4		54</div><div class='add'>+#define RST_I2C0		55</div><div class='add'>+#define RST_I2C1		56</div><div class='add'>+#define RST_I2C2		57</div><div class='add'>+#define RST_I2C3		58</div><div class='add'>+#define RST_I2C4		59</div><div class='add'>+#define RST_JAMLINK0_APB	60</div><div class='add'>+#define RST_JAMLINK1_APB	61</div><div class='add'>+#define RST_JAMLINK2_APB	62</div><div class='add'>+#define RST_JAMLINK3_APB	63</div><div class='add'>+#define RST_CODEC_APB		64</div><div class='add'>+#define RST_GPIO_DB		65</div><div class='add'>+#define RST_GPIO_APB		66</div><div class='add'>+#define RST_ADC			67</div><div class='add'>+#define RST_ADC_APB		68</div><div class='add'>+#define RST_PWM_APB		69</div><div class='add'>+#define RST_SHRM_APB		70</div><div class='add'>+#define RST_CSI0		71</div><div class='add'>+#define RST_CSI1		72</div><div class='add'>+#define RST_CSI2		73</div><div class='add'>+#define RST_CSI_DPHY		74</div><div class='add'>+#define RST_ISP_AHB		75</div><div class='add'>+#define RST_M0			76</div><div class='add'>+#define RST_M1			77</div><div class='add'>+#define RST_M2			78</div><div class='add'>+#define RST_SPI2AXI		79</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/eswin,eic7700-reset.h b/include/dt-bindings/reset/eswin,eic7700-reset.h<br/>new file mode 100644<br/>index 000000000000..a370c9f74307<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/eswin,eic7700-reset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/eswin,eic7700-reset.h</a></div><div class='hunk'>@@ -0,0 +1,298 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2025, Beijing ESWIN Computing Technology Co., Ltd..</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Device Tree binding constants for EIC7700 reset controller.</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	Yifeng Huang &lt;huangyifeng@eswincomputing.com&gt;</div><div class='add'>+ *	Xuyang Dong &lt;dongxuyang@eswincomputing.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_ESWIN_EIC7700_RESET_H__</div><div class='add'>+#define __DT_ESWIN_EIC7700_RESET_H__</div><div class='add'>+</div><div class='add'>+#define EIC7700_RESET_NOC_NSP		0</div><div class='add'>+#define EIC7700_RESET_NOC_CFG		1</div><div class='add'>+#define EIC7700_RESET_RNOC_NSP		2</div><div class='add'>+#define EIC7700_RESET_SNOC_TCU		3</div><div class='add'>+#define EIC7700_RESET_SNOC_U84		4</div><div class='add'>+#define EIC7700_RESET_SNOC_PCIE_XSR	5</div><div class='add'>+#define EIC7700_RESET_SNOC_PCIE_XMR	6</div><div class='add'>+#define EIC7700_RESET_SNOC_PCIE_PR	7</div><div class='add'>+#define EIC7700_RESET_SNOC_NPU		8</div><div class='add'>+#define EIC7700_RESET_SNOC_JTAG		9</div><div class='add'>+#define EIC7700_RESET_SNOC_DSP		10</div><div class='add'>+#define EIC7700_RESET_SNOC_DDRC1_P2	11</div><div class='add'>+#define EIC7700_RESET_SNOC_DDRC1_P1	12</div><div class='add'>+#define EIC7700_RESET_SNOC_DDRC0_P2	13</div><div class='add'>+#define EIC7700_RESET_SNOC_DDRC0_P1	14</div><div class='add'>+#define EIC7700_RESET_SNOC_D2D		15</div><div class='add'>+#define EIC7700_RESET_SNOC_AON		16</div><div class='add'>+#define EIC7700_RESET_GPU_AXI		17</div><div class='add'>+#define EIC7700_RESET_GPU_CFG		18</div><div class='add'>+#define EIC7700_RESET_GPU_GRAY		19</div><div class='add'>+#define EIC7700_RESET_GPU_JONES		20</div><div class='add'>+#define EIC7700_RESET_GPU_SPU		21</div><div class='add'>+#define EIC7700_RESET_DSP_AXI		22</div><div class='add'>+#define EIC7700_RESET_DSP_CFG		23</div><div class='add'>+#define EIC7700_RESET_DSP_DIV4		24</div><div class='add'>+#define EIC7700_RESET_DSP_DIV0		25</div><div class='add'>+#define EIC7700_RESET_DSP_DIV1		26</div><div class='add'>+#define EIC7700_RESET_DSP_DIV2		27</div><div class='add'>+#define EIC7700_RESET_DSP_DIV3		28</div><div class='add'>+#define EIC7700_RESET_D2D_AXI		29</div><div class='add'>+#define EIC7700_RESET_D2D_CFG		30</div><div class='add'>+#define EIC7700_RESET_D2D_PRST		31</div><div class='add'>+#define EIC7700_RESET_D2D_RAW_PCS	32</div><div class='add'>+#define EIC7700_RESET_D2D_RX		33</div><div class='add'>+#define EIC7700_RESET_D2D_TX		34</div><div class='add'>+#define EIC7700_RESET_D2D_CORE		35</div><div class='add'>+#define EIC7700_RESET_DDR1_ARST		36</div><div class='add'>+#define EIC7700_RESET_DDR1_TRACE	37</div><div class='add'>+#define EIC7700_RESET_DDR0_ARST		38</div><div class='add'>+#define EIC7700_RESET_DDR_CFG		39</div><div class='add'>+#define EIC7700_RESET_DDR0_TRACE	40</div><div class='add'>+#define EIC7700_RESET_DDR_CORE		41</div><div class='add'>+#define EIC7700_RESET_DDR_PRST		42</div><div class='add'>+#define EIC7700_RESET_TCU_AXI		43</div><div class='add'>+#define EIC7700_RESET_TCU_CFG		44</div><div class='add'>+#define EIC7700_RESET_TCU_TBU0		45</div><div class='add'>+#define EIC7700_RESET_TCU_TBU1		46</div><div class='add'>+#define EIC7700_RESET_TCU_TBU2		47</div><div class='add'>+#define EIC7700_RESET_TCU_TBU3		48</div><div class='add'>+#define EIC7700_RESET_TCU_TBU4		49</div><div class='add'>+#define EIC7700_RESET_TCU_TBU5		50</div><div class='add'>+#define EIC7700_RESET_TCU_TBU6		51</div><div class='add'>+#define EIC7700_RESET_TCU_TBU7		52</div><div class='add'>+#define EIC7700_RESET_TCU_TBU8		53</div><div class='add'>+#define EIC7700_RESET_TCU_TBU9		54</div><div class='add'>+#define EIC7700_RESET_TCU_TBU10		55</div><div class='add'>+#define EIC7700_RESET_TCU_TBU11		56</div><div class='add'>+#define EIC7700_RESET_TCU_TBU12		57</div><div class='add'>+#define EIC7700_RESET_TCU_TBU13		58</div><div class='add'>+#define EIC7700_RESET_TCU_TBU14		59</div><div class='add'>+#define EIC7700_RESET_TCU_TBU15		60</div><div class='add'>+#define EIC7700_RESET_TCU_TBU16		61</div><div class='add'>+#define EIC7700_RESET_NPU_AXI		62</div><div class='add'>+#define EIC7700_RESET_NPU_CFG		63</div><div class='add'>+#define EIC7700_RESET_NPU_CORE		64</div><div class='add'>+#define EIC7700_RESET_NPU_E31CORE	65</div><div class='add'>+#define EIC7700_RESET_NPU_E31BUS	66</div><div class='add'>+#define EIC7700_RESET_NPU_E31DBG	67</div><div class='add'>+#define EIC7700_RESET_NPU_LLC		68</div><div class='add'>+#define EIC7700_RESET_HSP_AXI		69</div><div class='add'>+#define EIC7700_RESET_HSP_CFG		70</div><div class='add'>+#define EIC7700_RESET_HSP_POR		71</div><div class='add'>+#define EIC7700_RESET_MSHC0_PHY		72</div><div class='add'>+#define EIC7700_RESET_MSHC1_PHY		73</div><div class='add'>+#define EIC7700_RESET_MSHC2_PHY		74</div><div class='add'>+#define EIC7700_RESET_MSHC0_TXRX	75</div><div class='add'>+#define EIC7700_RESET_MSHC1_TXRX	76</div><div class='add'>+#define EIC7700_RESET_MSHC2_TXRX	77</div><div class='add'>+#define EIC7700_RESET_SATA_ASIC0	78</div><div class='add'>+#define EIC7700_RESET_SATA_OOB		79</div><div class='add'>+#define EIC7700_RESET_SATA_PMALIVE	80</div><div class='add'>+#define EIC7700_RESET_SATA_RBC		81</div><div class='add'>+#define EIC7700_RESET_DMA0		82</div><div class='add'>+#define EIC7700_RESET_HSP_DMA		83</div><div class='add'>+#define EIC7700_RESET_USB0_VAUX		84</div><div class='add'>+#define EIC7700_RESET_USB1_VAUX		85</div><div class='add'>+#define EIC7700_RESET_HSP_SD1_PRST	86</div><div class='add'>+#define EIC7700_RESET_HSP_SD0_PRST	87</div><div class='add'>+#define EIC7700_RESET_HSP_EMMC_PRST	88</div><div class='add'>+#define EIC7700_RESET_HSP_DMA_PRST	89</div><div class='add'>+#define EIC7700_RESET_HSP_SD1_ARST	90</div><div class='add'>+#define EIC7700_RESET_HSP_SD0_ARST	91</div><div class='add'>+#define EIC7700_RESET_HSP_EMMC_ARST	92</div><div class='add'>+#define EIC7700_RESET_HSP_DMA_ARST	93</div><div class='add'>+#define EIC7700_RESET_HSP_ETH1_ARST	94</div><div class='add'>+#define EIC7700_RESET_HSP_ETH0_ARST	95</div><div class='add'>+#define EIC7700_RESET_SATA_ARST		96</div><div class='add'>+#define EIC7700_RESET_PCIE_CFG		97</div><div class='add'>+#define EIC7700_RESET_PCIE_POWEUP	98</div><div class='add'>+#define EIC7700_RESET_PCIE_PERST	99</div><div class='add'>+#define EIC7700_RESET_I2C0		100</div><div class='add'>+#define EIC7700_RESET_I2C1		101</div><div class='add'>+#define EIC7700_RESET_I2C2		102</div><div class='add'>+#define EIC7700_RESET_I2C3		103</div><div class='add'>+#define EIC7700_RESET_I2C4		104</div><div class='add'>+#define EIC7700_RESET_I2C5		105</div><div class='add'>+#define EIC7700_RESET_I2C6		106</div><div class='add'>+#define EIC7700_RESET_I2C7		107</div><div class='add'>+#define EIC7700_RESET_I2C8		108</div><div class='add'>+#define EIC7700_RESET_I2C9		109</div><div class='add'>+#define EIC7700_RESET_FAN		110</div><div class='add'>+#define EIC7700_RESET_PVT0		111</div><div class='add'>+#define EIC7700_RESET_PVT1		112</div><div class='add'>+#define EIC7700_RESET_MBOX0		113</div><div class='add'>+#define EIC7700_RESET_MBOX1		114</div><div class='add'>+#define EIC7700_RESET_MBOX2		115</div><div class='add'>+#define EIC7700_RESET_MBOX3		116</div><div class='add'>+#define EIC7700_RESET_MBOX4		117</div><div class='add'>+#define EIC7700_RESET_MBOX5		118</div><div class='add'>+#define EIC7700_RESET_MBOX6		119</div><div class='add'>+#define EIC7700_RESET_MBOX7		120</div><div class='add'>+#define EIC7700_RESET_MBOX8		121</div><div class='add'>+#define EIC7700_RESET_MBOX9		122</div><div class='add'>+#define EIC7700_RESET_MBOX10		123</div><div class='add'>+#define EIC7700_RESET_MBOX11		124</div><div class='add'>+#define EIC7700_RESET_MBOX12		125</div><div class='add'>+#define EIC7700_RESET_MBOX13		126</div><div class='add'>+#define EIC7700_RESET_MBOX14		127</div><div class='add'>+#define EIC7700_RESET_MBOX15		128</div><div class='add'>+#define EIC7700_RESET_UART0		129</div><div class='add'>+#define EIC7700_RESET_UART1		130</div><div class='add'>+#define EIC7700_RESET_UART2		131</div><div class='add'>+#define EIC7700_RESET_UART3		132</div><div class='add'>+#define EIC7700_RESET_UART4		133</div><div class='add'>+#define EIC7700_RESET_GPIO0		134</div><div class='add'>+#define EIC7700_RESET_GPIO1		135</div><div class='add'>+#define EIC7700_RESET_TIMER		136</div><div class='add'>+#define EIC7700_RESET_SSI0		137</div><div class='add'>+#define EIC7700_RESET_SSI1		138</div><div class='add'>+#define EIC7700_RESET_WDT0		139</div><div class='add'>+#define EIC7700_RESET_WDT1		140</div><div class='add'>+#define EIC7700_RESET_WDT2		141</div><div class='add'>+#define EIC7700_RESET_WDT3		142</div><div class='add'>+#define EIC7700_RESET_LSP_CFG		143</div><div class='add'>+#define EIC7700_RESET_U84_CORE0		144</div><div class='add'>+#define EIC7700_RESET_U84_CORE1		145</div><div class='add'>+#define EIC7700_RESET_U84_CORE2		146</div><div class='add'>+#define EIC7700_RESET_U84_CORE3		147</div><div class='add'>+#define EIC7700_RESET_U84_BUS		148</div><div class='add'>+#define EIC7700_RESET_U84_DBG		149</div><div class='add'>+#define EIC7700_RESET_U84_TRACECOM	150</div><div class='add'>+#define EIC7700_RESET_U84_TRACE0	151</div><div class='add'>+#define EIC7700_RESET_U84_TRACE1	152</div><div class='add'>+#define EIC7700_RESET_U84_TRACE2	153</div><div class='add'>+#define EIC7700_RESET_U84_TRACE3	154</div><div class='add'>+#define EIC7700_RESET_SCPU_CORE		155</div><div class='add'>+#define EIC7700_RESET_SCPU_BUS		156</div><div class='add'>+#define EIC7700_RESET_SCPU_DBG		157</div><div class='add'>+#define EIC7700_RESET_LPCPU_CORE	158</div><div class='add'>+#define EIC7700_RESET_LPCPU_BUS		159</div><div class='add'>+#define EIC7700_RESET_LPCPU_DBG		160</div><div class='add'>+#define EIC7700_RESET_VC_CFG		161</div><div class='add'>+#define EIC7700_RESET_VC_AXI		162</div><div class='add'>+#define EIC7700_RESET_VC_MONCFG		163</div><div class='add'>+#define EIC7700_RESET_JD_CFG		164</div><div class='add'>+#define EIC7700_RESET_JD_AXI		165</div><div class='add'>+#define EIC7700_RESET_JE_CFG		166</div><div class='add'>+#define EIC7700_RESET_JE_AXI		167</div><div class='add'>+#define EIC7700_RESET_VD_CFG		168</div><div class='add'>+#define EIC7700_RESET_VD_AXI		169</div><div class='add'>+#define EIC7700_RESET_VE_AXI		170</div><div class='add'>+#define EIC7700_RESET_VE_CFG		171</div><div class='add'>+#define EIC7700_RESET_G2D_CORE		172</div><div class='add'>+#define EIC7700_RESET_G2D_CFG		173</div><div class='add'>+#define EIC7700_RESET_G2D_AXI		174</div><div class='add'>+#define EIC7700_RESET_VI_AXI		175</div><div class='add'>+#define EIC7700_RESET_VI_CFG		176</div><div class='add'>+#define EIC7700_RESET_VI_DWE		177</div><div class='add'>+#define EIC7700_RESET_DVP		178</div><div class='add'>+#define EIC7700_RESET_ISP0		179</div><div class='add'>+#define EIC7700_RESET_ISP1		180</div><div class='add'>+#define EIC7700_RESET_SHUTTR0		181</div><div class='add'>+#define EIC7700_RESET_SHUTTR1		182</div><div class='add'>+#define EIC7700_RESET_SHUTTR2		183</div><div class='add'>+#define EIC7700_RESET_SHUTTR3		184</div><div class='add'>+#define EIC7700_RESET_SHUTTR4		185</div><div class='add'>+#define EIC7700_RESET_SHUTTR5		186</div><div class='add'>+#define EIC7700_RESET_VO_MIPI		187</div><div class='add'>+#define EIC7700_RESET_VO_PRST		188</div><div class='add'>+#define EIC7700_RESET_VO_HDMI_PRST	189</div><div class='add'>+#define EIC7700_RESET_VO_HDMI_PHY	190</div><div class='add'>+#define EIC7700_RESET_VO_HDMI		191</div><div class='add'>+#define EIC7700_RESET_VO_I2S		192</div><div class='add'>+#define EIC7700_RESET_VO_I2S_PRST	193</div><div class='add'>+#define EIC7700_RESET_VO_AXI		194</div><div class='add'>+#define EIC7700_RESET_VO_CFG		195</div><div class='add'>+#define EIC7700_RESET_VO_DC		196</div><div class='add'>+#define EIC7700_RESET_VO_DC_PRST	197</div><div class='add'>+#define EIC7700_RESET_BOOTSPI_HRST	198</div><div class='add'>+#define EIC7700_RESET_BOOTSPI		199</div><div class='add'>+#define EIC7700_RESET_ANO1		200</div><div class='add'>+#define EIC7700_RESET_ANO0		201</div><div class='add'>+#define EIC7700_RESET_DMA1_ARST		202</div><div class='add'>+#define EIC7700_RESET_DMA1_HRST		203</div><div class='add'>+#define EIC7700_RESET_FPRT		204</div><div class='add'>+#define EIC7700_RESET_HBLOCK		205</div><div class='add'>+#define EIC7700_RESET_SECSR		206</div><div class='add'>+#define EIC7700_RESET_OTP		207</div><div class='add'>+#define EIC7700_RESET_PKA		208</div><div class='add'>+#define EIC7700_RESET_SPACC		209</div><div class='add'>+#define EIC7700_RESET_TRNG		210</div><div class='add'>+#define EIC7700_RESET_TIMER0_0		211</div><div class='add'>+#define EIC7700_RESET_TIMER0_1		212</div><div class='add'>+#define EIC7700_RESET_TIMER0_2		213</div><div class='add'>+#define EIC7700_RESET_TIMER0_3		214</div><div class='add'>+#define EIC7700_RESET_TIMER0_4		215</div><div class='add'>+#define EIC7700_RESET_TIMER0_5		216</div><div class='add'>+#define EIC7700_RESET_TIMER0_6		217</div><div class='add'>+#define EIC7700_RESET_TIMER0_7		218</div><div class='add'>+#define EIC7700_RESET_TIMER0_N		219</div><div class='add'>+#define EIC7700_RESET_TIMER1_0		220</div><div class='add'>+#define EIC7700_RESET_TIMER1_1		221</div><div class='add'>+#define EIC7700_RESET_TIMER1_2		222</div><div class='add'>+#define EIC7700_RESET_TIMER1_3		223</div><div class='add'>+#define EIC7700_RESET_TIMER1_4		224</div><div class='add'>+#define EIC7700_RESET_TIMER1_5		225</div><div class='add'>+#define EIC7700_RESET_TIMER1_6		226</div><div class='add'>+#define EIC7700_RESET_TIMER1_7		227</div><div class='add'>+#define EIC7700_RESET_TIMER1_N		228</div><div class='add'>+#define EIC7700_RESET_TIMER2_0		229</div><div class='add'>+#define EIC7700_RESET_TIMER2_1		230</div><div class='add'>+#define EIC7700_RESET_TIMER2_2		231</div><div class='add'>+#define EIC7700_RESET_TIMER2_3		232</div><div class='add'>+#define EIC7700_RESET_TIMER2_4		233</div><div class='add'>+#define EIC7700_RESET_TIMER2_5		234</div><div class='add'>+#define EIC7700_RESET_TIMER2_6		235</div><div class='add'>+#define EIC7700_RESET_TIMER2_7		236</div><div class='add'>+#define EIC7700_RESET_TIMER2_N		237</div><div class='add'>+#define EIC7700_RESET_TIMER3_0		238</div><div class='add'>+#define EIC7700_RESET_TIMER3_1		239</div><div class='add'>+#define EIC7700_RESET_TIMER3_2		240</div><div class='add'>+#define EIC7700_RESET_TIMER3_3		241</div><div class='add'>+#define EIC7700_RESET_TIMER3_4		242</div><div class='add'>+#define EIC7700_RESET_TIMER3_5		243</div><div class='add'>+#define EIC7700_RESET_TIMER3_6		244</div><div class='add'>+#define EIC7700_RESET_TIMER3_7		245</div><div class='add'>+#define EIC7700_RESET_TIMER3_N		246</div><div class='add'>+#define EIC7700_RESET_RTC		247</div><div class='add'>+#define EIC7700_RESET_MNOC_SNOC_NSP	248</div><div class='add'>+#define EIC7700_RESET_MNOC_VC		249</div><div class='add'>+#define EIC7700_RESET_MNOC_CFG		250</div><div class='add'>+#define EIC7700_RESET_MNOC_HSP		251</div><div class='add'>+#define EIC7700_RESET_MNOC_GPU		252</div><div class='add'>+#define EIC7700_RESET_MNOC_DDRC1_P3	253</div><div class='add'>+#define EIC7700_RESET_MNOC_DDRC0_P3	254</div><div class='add'>+#define EIC7700_RESET_RNOC_VO		255</div><div class='add'>+#define EIC7700_RESET_RNOC_VI		256</div><div class='add'>+#define EIC7700_RESET_RNOC_SNOC_NSP	257</div><div class='add'>+#define EIC7700_RESET_RNOC_CFG		258</div><div class='add'>+#define EIC7700_RESET_MNOC_DDRC1_P4	259</div><div class='add'>+#define EIC7700_RESET_MNOC_DDRC0_P4	260</div><div class='add'>+#define EIC7700_RESET_CNOC_VO_CFG	261</div><div class='add'>+#define EIC7700_RESET_CNOC_VI_CFG	262</div><div class='add'>+#define EIC7700_RESET_CNOC_VC_CFG	263</div><div class='add'>+#define EIC7700_RESET_CNOC_TCU_CFG	264</div><div class='add'>+#define EIC7700_RESET_CNOC_PCIE_CFG	265</div><div class='add'>+#define EIC7700_RESET_CNOC_NPU_CFG	266</div><div class='add'>+#define EIC7700_RESET_CNOC_LSP_CFG	267</div><div class='add'>+#define EIC7700_RESET_CNOC_HSP_CFG	268</div><div class='add'>+#define EIC7700_RESET_CNOC_GPU_CFG	269</div><div class='add'>+#define EIC7700_RESET_CNOC_DSPT_CFG	270</div><div class='add'>+#define EIC7700_RESET_CNOC_DDRT1_CFG	271</div><div class='add'>+#define EIC7700_RESET_CNOC_DDRT0_CFG	272</div><div class='add'>+#define EIC7700_RESET_CNOC_D2D_CFG	273</div><div class='add'>+#define EIC7700_RESET_CNOC_CFG		274</div><div class='add'>+#define EIC7700_RESET_CNOC_CLMM_CFG	275</div><div class='add'>+#define EIC7700_RESET_CNOC_AON_CFG	276</div><div class='add'>+#define EIC7700_RESET_LNOC_CFG		277</div><div class='add'>+#define EIC7700_RESET_LNOC_NPU_LLC	278</div><div class='add'>+#define EIC7700_RESET_LNOC_DDRC1_P0	279</div><div class='add'>+#define EIC7700_RESET_LNOC_DDRC0_P0	280</div><div class='add'>+</div><div class='add'>+#endif /* __DT_ESWIN_EIC7700_RESET_H__ */</div><div class='head'>diff --git a/include/dt-bindings/reset/fsl,imx8ulp-sim-lpav.h b/include/dt-bindings/reset/fsl,imx8ulp-sim-lpav.h<br/>new file mode 100644<br/>index 000000000000..adf95bb26d21<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/fsl,imx8ulp-sim-lpav.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/fsl,imx8ulp-sim-lpav.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2025 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef DT_BINDING_RESET_IMX8ULP_SIM_LPAV_H</div><div class='add'>+#define DT_BINDING_RESET_IMX8ULP_SIM_LPAV_H</div><div class='add'>+</div><div class='add'>+#define IMX8ULP_SIM_LPAV_HIFI4_DSP_DBG_RST	0</div><div class='add'>+#define IMX8ULP_SIM_LPAV_HIFI4_DSP_RST		1</div><div class='add'>+#define IMX8ULP_SIM_LPAV_HIFI4_DSP_STALL	2</div><div class='add'>+#define IMX8ULP_SIM_LPAV_DSI_RST_BYTE_N		3</div><div class='add'>+#define IMX8ULP_SIM_LPAV_DSI_RST_ESC_N		4</div><div class='add'>+#define IMX8ULP_SIM_LPAV_DSI_RST_DPI_N		5</div><div class='add'>+</div><div class='add'>+#endif /* DT_BINDING_RESET_IMX8ULP_SIM_LPAV_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/imx8mp-reset-audiomix.h b/include/dt-bindings/reset/imx8mp-reset-audiomix.h<br/>new file mode 100644<br/>index 000000000000..746c1337ed99<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/imx8mp-reset-audiomix.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/imx8mp-reset-audiomix.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2025 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef DT_BINDING_RESET_IMX8MP_AUDIOMIX_H</div><div class='add'>+#define DT_BINDING_RESET_IMX8MP_AUDIOMIX_H</div><div class='add'>+</div><div class='add'>+#define IMX8MP_AUDIOMIX_EARC_RESET	0</div><div class='add'>+#define IMX8MP_AUDIOMIX_EARC_PHY_RESET	1</div><div class='add'>+#define IMX8MP_AUDIOMIX_DSP_RUNSTALL	2</div><div class='add'>+</div><div class='add'>+#endif /* DT_BINDING_RESET_IMX8MP_AUDIOMIX_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/mediatek,mt6735-infracfg.h b/include/dt-bindings/reset/mediatek,mt6735-infracfg.h<br/>new file mode 100644<br/>index 000000000000..9df969090377<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/mediatek,mt6735-infracfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/mediatek,mt6735-infracfg.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_MT6735_INFRACFG_H</div><div class='add'>+#define _DT_BINDINGS_RESET_MT6735_INFRACFG_H</div><div class='add'>+</div><div class='add'>+#define MT6735_INFRA_RST0_EMI_REG		0</div><div class='add'>+#define MT6735_INFRA_RST0_DRAMC0_AO		1</div><div class='add'>+#define MT6735_INFRA_RST0_AP_CIRQ_EINT		2</div><div class='add'>+#define MT6735_INFRA_RST0_APXGPT		3</div><div class='add'>+#define MT6735_INFRA_RST0_SCPSYS		4</div><div class='add'>+#define MT6735_INFRA_RST0_KP			5</div><div class='add'>+#define MT6735_INFRA_RST0_PMIC_WRAP		6</div><div class='add'>+#define MT6735_INFRA_RST0_CLDMA_AO_TOP		7</div><div class='add'>+#define MT6735_INFRA_RST0_USBSIF_TOP		8</div><div class='add'>+#define MT6735_INFRA_RST0_EMI			9</div><div class='add'>+#define MT6735_INFRA_RST0_CCIF			10</div><div class='add'>+#define MT6735_INFRA_RST0_DRAMC0		11</div><div class='add'>+#define MT6735_INFRA_RST0_EMI_AO_REG		12</div><div class='add'>+#define MT6735_INFRA_RST0_CCIF_AO		13</div><div class='add'>+#define MT6735_INFRA_RST0_TRNG			14</div><div class='add'>+#define MT6735_INFRA_RST0_SYS_CIRQ		15</div><div class='add'>+#define MT6735_INFRA_RST0_GCE			16</div><div class='add'>+#define MT6735_INFRA_RST0_M4U			17</div><div class='add'>+#define MT6735_INFRA_RST0_CCIF1			18</div><div class='add'>+#define MT6735_INFRA_RST0_CLDMA_TOP_PD		19</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/mediatek,mt6735-mfgcfg.h b/include/dt-bindings/reset/mediatek,mt6735-mfgcfg.h<br/>new file mode 100644<br/>index 000000000000..c489242b226e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/mediatek,mt6735-mfgcfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/mediatek,mt6735-mfgcfg.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_MT6735_MFGCFG_H</div><div class='add'>+#define _DT_BINDINGS_RESET_MT6735_MFGCFG_H</div><div class='add'>+</div><div class='add'>+#define MT6735_MFG_RST0_AXI		0</div><div class='add'>+#define MT6735_MFG_RST0_G3D		1</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_RESET_MT6735_MFGCFG_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/mediatek,mt6735-pericfg.h b/include/dt-bindings/reset/mediatek,mt6735-pericfg.h<br/>new file mode 100644<br/>index 000000000000..a62bb192835a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/mediatek,mt6735-pericfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/mediatek,mt6735-pericfg.h</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_MT6735_PERICFG_H</div><div class='add'>+#define _DT_BINDINGS_RESET_MT6735_PERICFG_H</div><div class='add'>+</div><div class='add'>+#define MT6735_PERI_RST0_UART0			0</div><div class='add'>+#define MT6735_PERI_RST0_UART1			1</div><div class='add'>+#define MT6735_PERI_RST0_UART2			2</div><div class='add'>+#define MT6735_PERI_RST0_UART3			3</div><div class='add'>+#define MT6735_PERI_RST0_UART4			4</div><div class='add'>+#define MT6735_PERI_RST0_BTIF			5</div><div class='add'>+#define MT6735_PERI_RST0_DISP_PWM_PERI		6</div><div class='add'>+#define MT6735_PERI_RST0_PWM			7</div><div class='add'>+#define MT6735_PERI_RST0_AUXADC			8</div><div class='add'>+#define MT6735_PERI_RST0_DMA			9</div><div class='add'>+#define MT6735_PERI_RST0_IRDA			10</div><div class='add'>+#define MT6735_PERI_RST0_IRTX			11</div><div class='add'>+#define MT6735_PERI_RST0_THERM			12</div><div class='add'>+#define MT6735_PERI_RST0_MSDC2			13</div><div class='add'>+#define MT6735_PERI_RST0_MSDC3			14</div><div class='add'>+#define MT6735_PERI_RST0_MSDC0			15</div><div class='add'>+#define MT6735_PERI_RST0_MSDC1			16</div><div class='add'>+#define MT6735_PERI_RST0_I2C0			17</div><div class='add'>+#define MT6735_PERI_RST0_I2C1			18</div><div class='add'>+#define MT6735_PERI_RST0_I2C2			19</div><div class='add'>+#define MT6735_PERI_RST0_I2C3			20</div><div class='add'>+#define MT6735_PERI_RST0_USB			21</div><div class='add'>+</div><div class='add'>+#define MT6735_PERI_RST1_SPI0			22</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/mediatek,mt6735-vdecsys.h b/include/dt-bindings/reset/mediatek,mt6735-vdecsys.h<br/>new file mode 100644<br/>index 000000000000..b6ae5d249192<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/mediatek,mt6735-vdecsys.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/mediatek,mt6735-vdecsys.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_MT6735_VDECSYS_H</div><div class='add'>+#define _DT_BINDINGS_RESET_MT6735_VDECSYS_H</div><div class='add'>+</div><div class='add'>+#define MT6735_VDEC_RST0_VDEC			0</div><div class='add'>+#define MT6735_VDEC_RST1_SMI_LARB1		1</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_RESET_MT6735_VDECSYS_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/mediatek,mt7988-resets.h b/include/dt-bindings/reset/mediatek,mt7988-resets.h<br/>index 493301971367..0eb152889a89 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/mediatek,mt7988-resets.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/mediatek,mt7988-resets.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/mediatek,mt7988-resets.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/mediatek,mt7988-resets.h</a></div><div class='hunk'>@@ -10,4 +10,10 @@</div><div class='ctx'> /* ETHWARP resets */</div><div class='ctx'> #define MT7988_ETHWARP_RST_SWITCH		0</div><div class='ctx'> </div><div class='add'>+/* INFRA resets */</div><div class='add'>+#define MT7988_INFRA_RST0_PEXTP_MAC_SWRST	0</div><div class='add'>+#define MT7988_INFRA_RST1_THERM_CTRL_SWRST	1</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT7988 */</div><div class='add'>+</div><div class='head'>diff --git a/include/dt-bindings/reset/mediatek,mt8196-resets.h b/include/dt-bindings/reset/mediatek,mt8196-resets.h<br/>new file mode 100644<br/>index 000000000000..46ced0850d91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/mediatek,mt8196-resets.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/mediatek,mt8196-resets.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Collabora Ltd.</div><div class='add'>+ * Author: AngeloGioacchino Del Regno &lt;angelogioacchino.delregno@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8196</div><div class='add'>+#define _DT_BINDINGS_RESET_CONTROLLER_MT8196</div><div class='add'>+</div><div class='add'>+/* PEXTP0 resets */</div><div class='add'>+#define MT8196_PEXTP0_RST0_PCIE0_MAC		0</div><div class='add'>+#define MT8196_PEXTP0_RST0_PCIE0_PHY		1</div><div class='add'>+</div><div class='add'>+/* PEXTP1 resets */</div><div class='add'>+#define MT8196_PEXTP1_RST0_PCIE1_MAC		0</div><div class='add'>+#define MT8196_PEXTP1_RST0_PCIE1_PHY		1</div><div class='add'>+#define MT8196_PEXTP1_RST0_PCIE2_MAC		2</div><div class='add'>+#define MT8196_PEXTP1_RST0_PCIE2_PHY		3</div><div class='add'>+</div><div class='add'>+/* UFS resets */</div><div class='add'>+#define MT8196_UFSAO_RST0_UFS_MPHY		0</div><div class='add'>+#define MT8196_UFSAO_RST1_UFS_UNIPRO		1</div><div class='add'>+#define MT8196_UFSAO_RST1_UFS_CRYPTO		2</div><div class='add'>+#define MT8196_UFSAO_RST1_UFSHCI		3</div><div class='add'>+</div><div class='add'>+#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT8196 */</div><div class='head'>diff --git a/include/dt-bindings/reset/nvidia,tegra114-car.h b/include/dt-bindings/reset/nvidia,tegra114-car.h<br/>new file mode 100644<br/>index 000000000000..9b8c320402db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/nvidia,tegra114-car.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/nvidia,tegra114-car.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * This header provides Tegra114-specific constants for binding</div><div class='add'>+ * nvidia,tegra114-car.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_NVIDIA_TEGRA114_CAR_H</div><div class='add'>+#define _DT_BINDINGS_RESET_NVIDIA_TEGRA114_CAR_H</div><div class='add'>+</div><div class='add'>+#define TEGRA114_RESET(x)		(5 * 32 + (x))</div><div class='add'>+#define TEGRA114_RST_DFLL_DVCO		TEGRA114_RESET(0)</div><div class='add'>+</div><div class='add'>+#endif	/* _DT_BINDINGS_RESET_NVIDIA_TEGRA114_CAR_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/nvidia,tegra264.h b/include/dt-bindings/reset/nvidia,tegra264.h<br/>new file mode 100644<br/>index 000000000000..a61a56bb232b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/nvidia,tegra264.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/nvidia,tegra264.h</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/* Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef DT_BINDINGS_RESET_NVIDIA_TEGRA264_H</div><div class='add'>+#define DT_BINDINGS_RESET_NVIDIA_TEGRA264_H</div><div class='add'>+</div><div class='add'>+#define TEGRA264_RESET_APE_TKE			1</div><div class='add'>+#define TEGRA264_RESET_CEC			2</div><div class='add'>+#define TEGRA264_RESET_ADSP_ALL			3</div><div class='add'>+#define TEGRA264_RESET_RCE_ALL			4</div><div class='add'>+#define TEGRA264_RESET_UFSHC			5</div><div class='add'>+#define TEGRA264_RESET_UFSHC_AXI_M		6</div><div class='add'>+#define TEGRA264_RESET_UFSHC_LP_SEQ		7</div><div class='add'>+#define TEGRA264_RESET_DPAUX			8</div><div class='add'>+#define TEGRA264_RESET_EQOS_PCS			9</div><div class='add'>+#define TEGRA264_RESET_HWPM			10</div><div class='add'>+#define TEGRA264_RESET_I2C1			11</div><div class='add'>+#define TEGRA264_RESET_I2C2			12</div><div class='add'>+#define TEGRA264_RESET_I2C3			13</div><div class='add'>+#define TEGRA264_RESET_I2C4			14</div><div class='add'>+#define TEGRA264_RESET_I2C6			15</div><div class='add'>+#define TEGRA264_RESET_I2C7			16</div><div class='add'>+#define TEGRA264_RESET_I2C8			17</div><div class='add'>+#define TEGRA264_RESET_I2C9			18</div><div class='add'>+#define TEGRA264_RESET_ISP			19</div><div class='add'>+#define TEGRA264_RESET_LA			20</div><div class='add'>+#define TEGRA264_RESET_NVCSI			21</div><div class='add'>+#define TEGRA264_RESET_EQOS_MAC			22</div><div class='add'>+#define TEGRA264_RESET_PWM10			23</div><div class='add'>+#define TEGRA264_RESET_PWM2			24</div><div class='add'>+#define TEGRA264_RESET_PWM3			25</div><div class='add'>+#define TEGRA264_RESET_PWM4			26</div><div class='add'>+#define TEGRA264_RESET_PWM5			27</div><div class='add'>+#define TEGRA264_RESET_PWM9			28</div><div class='add'>+#define TEGRA264_RESET_QSPI0			29</div><div class='add'>+#define TEGRA264_RESET_HDA			30</div><div class='add'>+#define TEGRA264_RESET_HDACODEC			31</div><div class='add'>+#define TEGRA264_RESET_I2C0			32</div><div class='add'>+#define TEGRA264_RESET_I2C10			33</div><div class='add'>+#define TEGRA264_RESET_SDMMC1			34</div><div class='add'>+#define TEGRA264_RESET_MIPI_CAL			35</div><div class='add'>+#define TEGRA264_RESET_SPI1			36</div><div class='add'>+#define TEGRA264_RESET_SPI2			37</div><div class='add'>+#define TEGRA264_RESET_SPI3			38</div><div class='add'>+#define TEGRA264_RESET_SPI4			39</div><div class='add'>+#define TEGRA264_RESET_SPI5			40</div><div class='add'>+#define TEGRA264_RESET_SPI7			41</div><div class='add'>+#define TEGRA264_RESET_SPI8			42</div><div class='add'>+#define TEGRA264_RESET_SPI9			43</div><div class='add'>+#define TEGRA264_RESET_TACH0			44</div><div class='add'>+#define TEGRA264_RESET_TSEC			45</div><div class='add'>+#define TEGRA264_RESET_VI			46</div><div class='add'>+#define TEGRA264_RESET_VI1			47</div><div class='add'>+#define TEGRA264_RESET_PVA0_ALL			48</div><div class='add'>+#define TEGRA264_RESET_VIC			49</div><div class='add'>+#define TEGRA264_RESET_MPHY_CLK_CTL		50</div><div class='add'>+#define TEGRA264_RESET_MPHY_L0_RX		51</div><div class='add'>+#define TEGRA264_RESET_MPHY_L0_TX		52</div><div class='add'>+#define TEGRA264_RESET_MPHY_L1_RX		53</div><div class='add'>+#define TEGRA264_RESET_MPHY_L1_TX		54</div><div class='add'>+#define TEGRA264_RESET_ISP1			55</div><div class='add'>+#define TEGRA264_RESET_I2C11			56</div><div class='add'>+#define TEGRA264_RESET_I2C12			57</div><div class='add'>+#define TEGRA264_RESET_I2C14			58</div><div class='add'>+#define TEGRA264_RESET_I2C15			59</div><div class='add'>+#define TEGRA264_RESET_I2C16			60</div><div class='add'>+#define TEGRA264_RESET_EQOS_MACSEC		61</div><div class='add'>+#define TEGRA264_RESET_MGBE0_PCS		62</div><div class='add'>+#define TEGRA264_RESET_MGBE0_MAC		63</div><div class='add'>+#define TEGRA264_RESET_MGBE0_MACSEC		64</div><div class='add'>+#define TEGRA264_RESET_MGBE1_PCS		65</div><div class='add'>+#define TEGRA264_RESET_MGBE1_MAC		66</div><div class='add'>+#define TEGRA264_RESET_MGBE1_MACSEC		67</div><div class='add'>+#define TEGRA264_RESET_MGBE2_PCS		68</div><div class='add'>+#define TEGRA264_RESET_MGBE2_MAC		69</div><div class='add'>+#define TEGRA264_RESET_MGBE2_MACSEC		70</div><div class='add'>+#define TEGRA264_RESET_MGBE3_PCS		71</div><div class='add'>+#define TEGRA264_RESET_MGBE3_MAC		72</div><div class='add'>+#define TEGRA264_RESET_MGBE3_MACSEC		73</div><div class='add'>+#define TEGRA264_RESET_ADSP_CORE0		74</div><div class='add'>+#define TEGRA264_RESET_ADSP_CORE1		75</div><div class='add'>+#define TEGRA264_RESET_APE			76</div><div class='add'>+#define TEGRA264_RESET_XUSB1_PADCTL		77</div><div class='add'>+#define TEGRA264_RESET_AON_CPU_ALL		78</div><div class='add'>+#define TEGRA264_RESET_AON_HSP			79</div><div class='add'>+#define TEGRA264_RESET_UART4			80</div><div class='add'>+#define TEGRA264_RESET_UART5			81</div><div class='add'>+#define TEGRA264_RESET_UART9			82</div><div class='add'>+#define TEGRA264_RESET_UART10			83</div><div class='add'>+#define TEGRA264_RESET_UART8			84</div><div class='add'>+</div><div class='add'>+#endif /* DT_BINDINGS_RESET_NVIDIA_TEGRA264_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/qcom,ipq5424-gcc.h b/include/dt-bindings/reset/qcom,ipq5424-gcc.h<br/>new file mode 100644<br/>index 000000000000..16a72771c79a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/qcom,ipq5424-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/qcom,ipq5424-gcc.h</a></div><div class='hunk'>@@ -0,0 +1,310 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018,2020 The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_IPQ_GCC_IPQ5424_H</div><div class='add'>+#define _DT_BINDINGS_RESET_IPQ_GCC_IPQ5424_H</div><div class='add'>+</div><div class='add'>+#define GCC_QUPV3_BCR				0</div><div class='add'>+#define GCC_QUPV3_I2C0_BCR			1</div><div class='add'>+#define GCC_QUPV3_UART0_BCR			2</div><div class='add'>+#define GCC_QUPV3_I2C1_BCR			3</div><div class='add'>+#define GCC_QUPV3_UART1_BCR			4</div><div class='add'>+#define GCC_QUPV3_SPI0_BCR			5</div><div class='add'>+#define GCC_QUPV3_SPI1_BCR			6</div><div class='add'>+#define GCC_IMEM_BCR				7</div><div class='add'>+#define GCC_TME_BCR				8</div><div class='add'>+#define GCC_DDRSS_BCR				9</div><div class='add'>+#define GCC_PRNG_BCR				10</div><div class='add'>+#define GCC_BOOT_ROM_BCR			11</div><div class='add'>+#define GCC_NSS_BCR				12</div><div class='add'>+#define GCC_MDIO_BCR				13</div><div class='add'>+#define GCC_UNIPHY0_BCR				14</div><div class='add'>+#define GCC_UNIPHY1_BCR				15</div><div class='add'>+#define GCC_UNIPHY2_BCR				16</div><div class='add'>+#define GCC_WCSS_BCR				17</div><div class='add'>+#define GCC_SEC_CTRL_BCR			19</div><div class='add'>+#define GCC_TME_SEC_BUS_BCR			20</div><div class='add'>+#define GCC_ADSS_BCR				21</div><div class='add'>+#define GCC_LPASS_BCR				22</div><div class='add'>+#define GCC_PCIE0_BCR				23</div><div class='add'>+#define GCC_PCIE0_LINK_DOWN_BCR			24</div><div class='add'>+#define GCC_PCIE0PHY_PHY_BCR			25</div><div class='add'>+#define GCC_PCIE0_PHY_BCR			26</div><div class='add'>+#define GCC_PCIE1_BCR				27</div><div class='add'>+#define GCC_PCIE1_LINK_DOWN_BCR			28</div><div class='add'>+#define GCC_PCIE1PHY_PHY_BCR			29</div><div class='add'>+#define GCC_PCIE1_PHY_BCR			30</div><div class='add'>+#define GCC_PCIE2_BCR				31</div><div class='add'>+#define GCC_PCIE2_LINK_DOWN_BCR			32</div><div class='add'>+#define GCC_PCIE2PHY_PHY_BCR			33</div><div class='add'>+#define GCC_PCIE2_PHY_BCR			34</div><div class='add'>+#define GCC_PCIE3_BCR				35</div><div class='add'>+#define GCC_PCIE3_LINK_DOWN_BCR			36</div><div class='add'>+#define GCC_PCIE3PHY_PHY_BCR			37</div><div class='add'>+#define GCC_PCIE3_PHY_BCR			38</div><div class='add'>+#define GCC_USB_BCR				39</div><div class='add'>+#define GCC_QUSB2_0_PHY_BCR			40</div><div class='add'>+#define GCC_USB0_PHY_BCR			41</div><div class='add'>+#define GCC_USB3PHY_0_PHY_BCR			42</div><div class='add'>+#define GCC_QDSS_BCR				43</div><div class='add'>+#define GCC_SNOC_BCR				44</div><div class='add'>+#define GCC_ANOC_BCR				45</div><div class='add'>+#define GCC_PCNOC_BCR				46</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT0_BCR		47</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT1_BCR		48</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT2_BCR		49</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT3_BCR		50</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT4_BCR		51</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT5_BCR		52</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT6_BCR		53</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT7_BCR		54</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT8_BCR		55</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT9_BCR		56</div><div class='add'>+#define GCC_QPIC_BCR				57</div><div class='add'>+#define GCC_SDCC_BCR				58</div><div class='add'>+#define GCC_DCC_BCR				59</div><div class='add'>+#define GCC_SPDM_BCR				60</div><div class='add'>+#define GCC_MPM_BCR				61</div><div class='add'>+#define GCC_APC0_VOLTAGE_DROOP_DETECTOR_BCR	62</div><div class='add'>+#define GCC_RBCPR_BCR				63</div><div class='add'>+#define GCC_CMN_BLK_BCR				64</div><div class='add'>+#define GCC_TCSR_BCR				65</div><div class='add'>+#define GCC_TLMM_BCR				66</div><div class='add'>+#define GCC_QUPV3_AHB_MST_ARES			67</div><div class='add'>+#define GCC_QUPV3_CORE_ARES			68</div><div class='add'>+#define GCC_QUPV3_2X_CORE_ARES			69</div><div class='add'>+#define GCC_QUPV3_SLEEP_ARES			70</div><div class='add'>+#define GCC_QUPV3_AHB_SLV_ARES			71</div><div class='add'>+#define GCC_QUPV3_I2C0_ARES			72</div><div class='add'>+#define GCC_QUPV3_UART0_ARES			73</div><div class='add'>+#define GCC_QUPV3_I2C1_ARES			74</div><div class='add'>+#define GCC_QUPV3_UART1_ARES			75</div><div class='add'>+#define GCC_QUPV3_SPI0_ARES			76</div><div class='add'>+#define GCC_QUPV3_SPI1_ARES			77</div><div class='add'>+#define GCC_DEBUG_ARES				78</div><div class='add'>+#define GCC_GP1_ARES				79</div><div class='add'>+#define GCC_GP2_ARES				80</div><div class='add'>+#define GCC_GP3_ARES				81</div><div class='add'>+#define GCC_IMEM_AXI_ARES			82</div><div class='add'>+#define GCC_IMEM_CFG_AHB_ARES			83</div><div class='add'>+#define GCC_TME_ARES				84</div><div class='add'>+#define GCC_TME_TS_ARES				85</div><div class='add'>+#define GCC_TME_SLOW_ARES			86</div><div class='add'>+#define GCC_TME_RTC_TOGGLE_ARES			87</div><div class='add'>+#define GCC_TIC_ARES				88</div><div class='add'>+#define GCC_PRNG_AHB_ARES			89</div><div class='add'>+#define GCC_BOOT_ROM_AHB_ARES			90</div><div class='add'>+#define GCC_NSSNOC_ATB_ARES			91</div><div class='add'>+#define GCC_NSS_TS_ARES				92</div><div class='add'>+#define GCC_NSSNOC_QOSGEN_REF_ARES		93</div><div class='add'>+#define GCC_NSSNOC_TIMEOUT_REF_ARES		94</div><div class='add'>+#define GCC_NSSNOC_MEMNOC_ARES			95</div><div class='add'>+#define GCC_NSSNOC_SNOC_ARES			96</div><div class='add'>+#define GCC_NSSCFG_ARES				97</div><div class='add'>+#define GCC_NSSNOC_NSSCC_ARES			98</div><div class='add'>+#define GCC_NSSCC_ARES				99</div><div class='add'>+#define GCC_MDIO_AHB_ARES			100</div><div class='add'>+#define GCC_UNIPHY0_SYS_ARES			101</div><div class='add'>+#define GCC_UNIPHY0_AHB_ARES			102</div><div class='add'>+#define GCC_UNIPHY1_SYS_ARES			103</div><div class='add'>+#define GCC_UNIPHY1_AHB_ARES			104</div><div class='add'>+#define GCC_UNIPHY2_SYS_ARES			105</div><div class='add'>+#define GCC_UNIPHY2_AHB_ARES			106</div><div class='add'>+#define GCC_NSSNOC_XO_DCD_ARES			107</div><div class='add'>+#define GCC_NSSNOC_SNOC_1_ARES			108</div><div class='add'>+#define GCC_NSSNOC_PCNOC_1_ARES			109</div><div class='add'>+#define GCC_NSSNOC_MEMNOC_1_ARES		110</div><div class='add'>+#define GCC_DDRSS_ATB_ARES			111</div><div class='add'>+#define GCC_DDRSS_AHB_ARES			112</div><div class='add'>+#define GCC_GEMNOC_AHB_ARES			113</div><div class='add'>+#define GCC_GEMNOC_Q6_AXI_ARES			114</div><div class='add'>+#define GCC_GEMNOC_NSSNOC_ARES			115</div><div class='add'>+#define GCC_GEMNOC_SNOC_ARES			116</div><div class='add'>+#define GCC_GEMNOC_APSS_ARES			117</div><div class='add'>+#define GCC_GEMNOC_QOSGEN_EXTREF_ARES		118</div><div class='add'>+#define GCC_GEMNOC_TS_ARES			119</div><div class='add'>+#define GCC_DDRSS_SMS_SLOW_ARES			120</div><div class='add'>+#define GCC_GEMNOC_CNOC_ARES			121</div><div class='add'>+#define GCC_GEMNOC_XO_DBG_ARES			122</div><div class='add'>+#define GCC_GEMNOC_ANOC_ARES			123</div><div class='add'>+#define GCC_DDRSS_LLCC_ATB_ARES			124</div><div class='add'>+#define GCC_LLCC_TPDM_CFG_ARES			125</div><div class='add'>+#define GCC_TME_BUS_ARES			126</div><div class='add'>+#define GCC_SEC_CTRL_ACC_ARES			127</div><div class='add'>+#define GCC_SEC_CTRL_ARES			128</div><div class='add'>+#define GCC_SEC_CTRL_SENSE_ARES			129</div><div class='add'>+#define GCC_SEC_CTRL_AHB_ARES			130</div><div class='add'>+#define GCC_SEC_CTRL_BOOT_ROM_PATCH_ARES	131</div><div class='add'>+#define GCC_ADSS_PWM_ARES			132</div><div class='add'>+#define GCC_TME_ATB_ARES			133</div><div class='add'>+#define GCC_TME_DBGAPB_ARES			134</div><div class='add'>+#define GCC_TME_DEBUG_ARES			135</div><div class='add'>+#define GCC_TME_AT_ARES				136</div><div class='add'>+#define GCC_TME_APB_ARES			137</div><div class='add'>+#define GCC_TME_DMI_DBG_HS_ARES			138</div><div class='add'>+#define GCC_APSS_AHB_ARES			139</div><div class='add'>+#define GCC_APSS_AXI_ARES			140</div><div class='add'>+#define GCC_CPUSS_TRIG_ARES			141</div><div class='add'>+#define GCC_APSS_DBG_ARES			142</div><div class='add'>+#define GCC_APSS_TS_ARES			143</div><div class='add'>+#define GCC_APSS_ATB_ARES			144</div><div class='add'>+#define GCC_Q6_AXIM_ARES			145</div><div class='add'>+#define GCC_Q6_AXIS_ARES			146</div><div class='add'>+#define GCC_Q6_AHB_ARES				147</div><div class='add'>+#define GCC_Q6_AHB_S_ARES			148</div><div class='add'>+#define GCC_Q6SS_ATBM_ARES			149</div><div class='add'>+#define GCC_Q6_TSCTR_1TO2_ARES			150</div><div class='add'>+#define GCC_Q6SS_PCLKDBG_ARES			151</div><div class='add'>+#define GCC_Q6SS_TRIG_ARES			152</div><div class='add'>+#define GCC_Q6SS_BOOT_CBCR_ARES			153</div><div class='add'>+#define GCC_WCSS_DBG_IFC_APB_ARES		154</div><div class='add'>+#define GCC_WCSS_DBG_IFC_ATB_ARES		155</div><div class='add'>+#define GCC_WCSS_DBG_IFC_NTS_ARES		156</div><div class='add'>+#define GCC_WCSS_DBG_IFC_DAPBUS_ARES		157</div><div class='add'>+#define GCC_WCSS_DBG_IFC_APB_BDG_ARES		158</div><div class='add'>+#define GCC_WCSS_DBG_IFC_NTS_BDG_ARES		159</div><div class='add'>+#define GCC_WCSS_DBG_IFC_DAPBUS_BDG_ARES	160</div><div class='add'>+#define GCC_WCSS_ECAHB_ARES			161</div><div class='add'>+#define GCC_WCSS_ACMT_ARES			162</div><div class='add'>+#define GCC_WCSS_AHB_S_ARES			163</div><div class='add'>+#define GCC_WCSS_AXI_M_ARES			164</div><div class='add'>+#define GCC_PCNOC_WAPSS_ARES			165</div><div class='add'>+#define GCC_SNOC_WAPSS_ARES			166</div><div class='add'>+#define GCC_LPASS_SWAY_ARES			167</div><div class='add'>+#define GCC_LPASS_CORE_AXIM_ARES		168</div><div class='add'>+#define GCC_PCIE0_AHB_ARES			169</div><div class='add'>+#define GCC_PCIE0_AXI_M_ARES			170</div><div class='add'>+#define GCC_PCIE0_AXI_S_ARES			171</div><div class='add'>+#define GCC_PCIE0_AXI_S_BRIDGE_ARES		172</div><div class='add'>+#define GCC_PCIE0_PIPE_ARES			173</div><div class='add'>+#define GCC_PCIE0_AUX_ARES			174</div><div class='add'>+#define GCC_PCIE1_AHB_ARES			175</div><div class='add'>+#define GCC_PCIE1_AXI_M_ARES			176</div><div class='add'>+#define GCC_PCIE1_AXI_S_ARES			177</div><div class='add'>+#define GCC_PCIE1_AXI_S_BRIDGE_ARES		178</div><div class='add'>+#define GCC_PCIE1_PIPE_ARES			179</div><div class='add'>+#define GCC_PCIE1_AUX_ARES			180</div><div class='add'>+#define GCC_PCIE2_AHB_ARES			181</div><div class='add'>+#define GCC_PCIE2_AXI_M_ARES			182</div><div class='add'>+#define GCC_PCIE2_AXI_S_ARES			183</div><div class='add'>+#define GCC_PCIE2_AXI_S_BRIDGE_ARES		184</div><div class='add'>+#define GCC_PCIE2_PIPE_ARES			185</div><div class='add'>+#define GCC_PCIE2_AUX_ARES			186</div><div class='add'>+#define GCC_PCIE3_AHB_ARES			187</div><div class='add'>+#define GCC_PCIE3_AXI_M_ARES			188</div><div class='add'>+#define GCC_PCIE3_AXI_S_ARES			189</div><div class='add'>+#define GCC_PCIE3_AXI_S_BRIDGE_ARES		190</div><div class='add'>+#define GCC_PCIE3_PIPE_ARES			191</div><div class='add'>+#define GCC_PCIE3_AUX_ARES			192</div><div class='add'>+#define GCC_USB0_MASTER_ARES			193</div><div class='add'>+#define GCC_USB0_AUX_ARES			194</div><div class='add'>+#define GCC_USB0_MOCK_UTMI_ARES			195</div><div class='add'>+#define GCC_USB0_PIPE_ARES			196</div><div class='add'>+#define GCC_USB0_SLEEP_ARES			197</div><div class='add'>+#define GCC_USB0_PHY_CFG_AHB_ARES		198</div><div class='add'>+#define GCC_QDSS_AT_ARES			199</div><div class='add'>+#define GCC_QDSS_STM_ARES			200</div><div class='add'>+#define GCC_QDSS_TRACECLKIN_ARES		201</div><div class='add'>+#define GCC_QDSS_TSCTR_DIV2_ARES		202</div><div class='add'>+#define GCC_QDSS_TSCTR_DIV3_ARES		203</div><div class='add'>+#define GCC_QDSS_TSCTR_DIV4_ARES		204</div><div class='add'>+#define GCC_QDSS_TSCTR_DIV8_ARES		205</div><div class='add'>+#define GCC_QDSS_TSCTR_DIV16_ARES		206</div><div class='add'>+#define GCC_QDSS_DAP_ARES			207</div><div class='add'>+#define GCC_QDSS_APB2JTAG_ARES			208</div><div class='add'>+#define GCC_QDSS_ETR_USB_ARES			209</div><div class='add'>+#define GCC_QDSS_DAP_AHB_ARES			210</div><div class='add'>+#define GCC_QDSS_CFG_AHB_ARES			211</div><div class='add'>+#define GCC_QDSS_EUD_AT_ARES			212</div><div class='add'>+#define GCC_QDSS_TS_ARES			213</div><div class='add'>+#define GCC_QDSS_USB_ARES			214</div><div class='add'>+#define GCC_SYS_NOC_AXI_ARES			215</div><div class='add'>+#define GCC_SNOC_QOSGEN_EXTREF_ARES		216</div><div class='add'>+#define GCC_CNOC_LPASS_CFG_ARES			217</div><div class='add'>+#define GCC_SYS_NOC_AT_ARES			218</div><div class='add'>+#define GCC_SNOC_PCNOC_AHB_ARES			219</div><div class='add'>+#define GCC_SNOC_TME_ARES			220</div><div class='add'>+#define GCC_SNOC_XO_DCD_ARES			221</div><div class='add'>+#define GCC_SNOC_TS_ARES			222</div><div class='add'>+#define GCC_ANOC0_AXI_ARES			223</div><div class='add'>+#define GCC_ANOC_PCIE0_1LANE_M_ARES		224</div><div class='add'>+#define GCC_ANOC_PCIE2_2LANE_M_ARES		225</div><div class='add'>+#define GCC_ANOC_PCIE1_1LANE_M_ARES		226</div><div class='add'>+#define GCC_ANOC_PCIE3_2LANE_M_ARES		227</div><div class='add'>+#define GCC_ANOC_PCNOC_AHB_ARES			228</div><div class='add'>+#define GCC_ANOC_QOSGEN_EXTREF_ARES		229</div><div class='add'>+#define GCC_ANOC_XO_DCD_ARES			230</div><div class='add'>+#define GCC_SNOC_XO_DBG_ARES			231</div><div class='add'>+#define GCC_AGGRNOC_ATB_ARES			232</div><div class='add'>+#define GCC_AGGRNOC_TS_ARES			233</div><div class='add'>+#define GCC_USB0_EUD_AT_ARES			234</div><div class='add'>+#define GCC_PCNOC_TIC_ARES			235</div><div class='add'>+#define GCC_PCNOC_AHB_ARES			236</div><div class='add'>+#define GCC_PCNOC_XO_DBG_ARES			237</div><div class='add'>+#define GCC_SNOC_LPASS_ARES			238</div><div class='add'>+#define GCC_PCNOC_AT_ARES			239</div><div class='add'>+#define GCC_PCNOC_XO_DCD_ARES			240</div><div class='add'>+#define GCC_PCNOC_TS_ARES			241</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT0_AHB_ARES		242</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT1_AHB_ARES		243</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT2_AHB_ARES		244</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT3_AHB_ARES		245</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT4_AHB_ARES		246</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT5_AHB_ARES		247</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT6_AHB_ARES		248</div><div class='add'>+#define GCC_PCNOC_BUS_TIMEOUT7_AHB_ARES		249</div><div class='add'>+#define GCC_Q6_AXIM_RESET			250</div><div class='add'>+#define GCC_Q6_AXIS_RESET			251</div><div class='add'>+#define GCC_Q6_AHB_S_RESET			252</div><div class='add'>+#define GCC_Q6_AHB_RESET			253</div><div class='add'>+#define GCC_Q6SS_DBG_RESET			254</div><div class='add'>+#define GCC_WCSS_ECAHB_RESET			255</div><div class='add'>+#define GCC_WCSS_DBG_BDG_RESET			256</div><div class='add'>+#define GCC_WCSS_DBG_RESET			257</div><div class='add'>+#define GCC_WCSS_AXI_M_RESET			258</div><div class='add'>+#define GCC_WCSS_AHB_S_RESET			259</div><div class='add'>+#define GCC_WCSS_ACMT_RESET			260</div><div class='add'>+#define GCC_WCSSAON_RESET			261</div><div class='add'>+#define GCC_PCIE0_PIPE_RESET			262</div><div class='add'>+#define GCC_PCIE0_CORE_STICKY_RESET		263</div><div class='add'>+#define GCC_PCIE0_AXI_S_STICKY_RESET		264</div><div class='add'>+#define GCC_PCIE0_AXI_S_RESET			265</div><div class='add'>+#define GCC_PCIE0_AXI_M_STICKY_RESET		266</div><div class='add'>+#define GCC_PCIE0_AXI_M_RESET			267</div><div class='add'>+#define GCC_PCIE0_AUX_RESET			268</div><div class='add'>+#define GCC_PCIE0_AHB_RESET			269</div><div class='add'>+#define GCC_PCIE1_PIPE_RESET			270</div><div class='add'>+#define GCC_PCIE1_CORE_STICKY_RESET		271</div><div class='add'>+#define GCC_PCIE1_AXI_S_STICKY_RESET		272</div><div class='add'>+#define GCC_PCIE1_AXI_S_RESET			273</div><div class='add'>+#define GCC_PCIE1_AXI_M_STICKY_RESET		274</div><div class='add'>+#define GCC_PCIE1_AXI_M_RESET			275</div><div class='add'>+#define GCC_PCIE1_AUX_RESET			276</div><div class='add'>+#define GCC_PCIE1_AHB_RESET			277</div><div class='add'>+#define GCC_PCIE2_PIPE_RESET			278</div><div class='add'>+#define GCC_PCIE2_CORE_STICKY_RESET		279</div><div class='add'>+#define GCC_PCIE2_AXI_S_STICKY_RESET		280</div><div class='add'>+#define GCC_PCIE2_AXI_S_RESET			281</div><div class='add'>+#define GCC_PCIE2_AXI_M_STICKY_RESET		282</div><div class='add'>+#define GCC_PCIE2_AXI_M_RESET			283</div><div class='add'>+#define GCC_PCIE2_AUX_RESET			284</div><div class='add'>+#define GCC_PCIE2_AHB_RESET			285</div><div class='add'>+#define GCC_PCIE3_PIPE_RESET			286</div><div class='add'>+#define GCC_PCIE3_CORE_STICKY_RESET		287</div><div class='add'>+#define GCC_PCIE3_AXI_S_STICKY_RESET		288</div><div class='add'>+#define GCC_PCIE3_AXI_S_RESET			289</div><div class='add'>+#define GCC_PCIE3_AXI_M_STICKY_RESET		290</div><div class='add'>+#define GCC_PCIE3_AXI_M_RESET			291</div><div class='add'>+#define GCC_PCIE3_AUX_RESET			292</div><div class='add'>+#define GCC_PCIE3_AHB_RESET			293</div><div class='add'>+#define GCC_NSS_PARTIAL_RESET			294</div><div class='add'>+#define GCC_UNIPHY0_XPCS_ARES			295</div><div class='add'>+#define GCC_UNIPHY1_XPCS_ARES			296</div><div class='add'>+#define GCC_UNIPHY2_XPCS_ARES			297</div><div class='add'>+#define GCC_USB1_BCR				298</div><div class='add'>+#define GCC_QUSB2_1_PHY_BCR			299</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/qcom,ipq5424-nsscc.h b/include/dt-bindings/reset/qcom,ipq5424-nsscc.h<br/>new file mode 100644<br/>index 000000000000..9627e3b0ad30<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/qcom,ipq5424-nsscc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/qcom,ipq5424-nsscc.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_QCOM_IPQ5424_NSSCC_H</div><div class='add'>+#define _DT_BINDINGS_RESET_QCOM_IPQ5424_NSSCC_H</div><div class='add'>+</div><div class='add'>+#define NSS_CC_CE_APB_CLK_ARES					0</div><div class='add'>+#define NSS_CC_CE_AXI_CLK_ARES					1</div><div class='add'>+#define NSS_CC_DEBUG_CLK_ARES					2</div><div class='add'>+#define NSS_CC_EIP_CLK_ARES					3</div><div class='add'>+#define NSS_CC_NSS_CSR_CLK_ARES					4</div><div class='add'>+#define NSS_CC_NSSNOC_CE_APB_CLK_ARES				5</div><div class='add'>+#define NSS_CC_NSSNOC_CE_AXI_CLK_ARES				6</div><div class='add'>+#define NSS_CC_NSSNOC_EIP_CLK_ARES				7</div><div class='add'>+#define NSS_CC_NSSNOC_NSS_CSR_CLK_ARES				8</div><div class='add'>+#define NSS_CC_NSSNOC_PPE_CLK_ARES				9</div><div class='add'>+#define NSS_CC_NSSNOC_PPE_CFG_CLK_ARES				10</div><div class='add'>+#define NSS_CC_PORT1_MAC_CLK_ARES				11</div><div class='add'>+#define NSS_CC_PORT1_RX_CLK_ARES				12</div><div class='add'>+#define NSS_CC_PORT1_TX_CLK_ARES				13</div><div class='add'>+#define NSS_CC_PORT2_MAC_CLK_ARES				14</div><div class='add'>+#define NSS_CC_PORT2_RX_CLK_ARES				15</div><div class='add'>+#define NSS_CC_PORT2_TX_CLK_ARES				16</div><div class='add'>+#define NSS_CC_PORT3_MAC_CLK_ARES				17</div><div class='add'>+#define NSS_CC_PORT3_RX_CLK_ARES				18</div><div class='add'>+#define NSS_CC_PORT3_TX_CLK_ARES				19</div><div class='add'>+#define NSS_CC_PPE_BCR						20</div><div class='add'>+#define NSS_CC_PPE_EDMA_CLK_ARES				21</div><div class='add'>+#define NSS_CC_PPE_EDMA_CFG_CLK_ARES				22</div><div class='add'>+#define NSS_CC_PPE_SWITCH_BTQ_CLK_ARES				23</div><div class='add'>+#define NSS_CC_PPE_SWITCH_CLK_ARES				24</div><div class='add'>+#define NSS_CC_PPE_SWITCH_CFG_CLK_ARES				25</div><div class='add'>+#define NSS_CC_PPE_SWITCH_IPE_CLK_ARES				26</div><div class='add'>+#define NSS_CC_UNIPHY_PORT1_RX_CLK_ARES				27</div><div class='add'>+#define NSS_CC_UNIPHY_PORT1_TX_CLK_ARES				28</div><div class='add'>+#define NSS_CC_UNIPHY_PORT2_RX_CLK_ARES				29</div><div class='add'>+#define NSS_CC_UNIPHY_PORT2_TX_CLK_ARES				30</div><div class='add'>+#define NSS_CC_UNIPHY_PORT3_RX_CLK_ARES				31</div><div class='add'>+#define NSS_CC_UNIPHY_PORT3_TX_CLK_ARES				32</div><div class='add'>+#define NSS_CC_XGMAC0_PTP_REF_CLK_ARES				33</div><div class='add'>+#define NSS_CC_XGMAC1_PTP_REF_CLK_ARES				34</div><div class='add'>+#define NSS_CC_XGMAC2_PTP_REF_CLK_ARES				35</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/qcom,ipq9574-nsscc.h b/include/dt-bindings/reset/qcom,ipq9574-nsscc.h<br/>new file mode 100644<br/>index 000000000000..7f152e98b99c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/qcom,ipq9574-nsscc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/qcom,ipq9574-nsscc.h</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023, 2025 The Linux Foundation. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_IPQ_NSSCC_9574_H</div><div class='add'>+#define _DT_BINDINGS_RESET_IPQ_NSSCC_9574_H</div><div class='add'>+</div><div class='add'>+#define EDMA_HW_RESET                   0</div><div class='add'>+#define NSS_CC_CE_BCR			1</div><div class='add'>+#define NSS_CC_CLC_BCR			2</div><div class='add'>+#define NSS_CC_EIP197_BCR		3</div><div class='add'>+#define NSS_CC_HAQ_BCR			4</div><div class='add'>+#define NSS_CC_IMEM_BCR			5</div><div class='add'>+#define NSS_CC_MAC_BCR			6</div><div class='add'>+#define NSS_CC_PPE_BCR			7</div><div class='add'>+#define NSS_CC_UBI_BCR			8</div><div class='add'>+#define NSS_CC_UNIPHY_BCR		9</div><div class='add'>+#define UBI3_CLKRST_CLAMP_ENABLE	10</div><div class='add'>+#define UBI3_CORE_CLAMP_ENABLE		11</div><div class='add'>+#define UBI2_CLKRST_CLAMP_ENABLE	12</div><div class='add'>+#define UBI2_CORE_CLAMP_ENABLE		13</div><div class='add'>+#define UBI1_CLKRST_CLAMP_ENABLE	14</div><div class='add'>+#define UBI1_CORE_CLAMP_ENABLE		15</div><div class='add'>+#define UBI0_CLKRST_CLAMP_ENABLE	16</div><div class='add'>+#define UBI0_CORE_CLAMP_ENABLE		17</div><div class='add'>+#define NSSNOC_NSS_CSR_ARES		18</div><div class='add'>+#define NSS_CSR_ARES			19</div><div class='add'>+#define PPE_BTQ_ARES			20</div><div class='add'>+#define PPE_IPE_ARES			21</div><div class='add'>+#define PPE_ARES			22</div><div class='add'>+#define PPE_CFG_ARES			23</div><div class='add'>+#define PPE_EDMA_ARES			24</div><div class='add'>+#define PPE_EDMA_CFG_ARES		25</div><div class='add'>+#define CRY_PPE_ARES			26</div><div class='add'>+#define NSSNOC_PPE_ARES			27</div><div class='add'>+#define NSSNOC_PPE_CFG_ARES		28</div><div class='add'>+#define PORT1_MAC_ARES			29</div><div class='add'>+#define PORT2_MAC_ARES			30</div><div class='add'>+#define PORT3_MAC_ARES			31</div><div class='add'>+#define PORT4_MAC_ARES			32</div><div class='add'>+#define PORT5_MAC_ARES			33</div><div class='add'>+#define PORT6_MAC_ARES			34</div><div class='add'>+#define XGMAC0_PTP_REF_ARES		35</div><div class='add'>+#define XGMAC1_PTP_REF_ARES		36</div><div class='add'>+#define XGMAC2_PTP_REF_ARES		37</div><div class='add'>+#define XGMAC3_PTP_REF_ARES		38</div><div class='add'>+#define XGMAC4_PTP_REF_ARES		39</div><div class='add'>+#define XGMAC5_PTP_REF_ARES		40</div><div class='add'>+#define HAQ_AHB_ARES			41</div><div class='add'>+#define HAQ_AXI_ARES			42</div><div class='add'>+#define NSSNOC_HAQ_AHB_ARES		43</div><div class='add'>+#define NSSNOC_HAQ_AXI_ARES		44</div><div class='add'>+#define CE_APB_ARES			45</div><div class='add'>+#define CE_AXI_ARES			46</div><div class='add'>+#define NSSNOC_CE_APB_ARES		47</div><div class='add'>+#define NSSNOC_CE_AXI_ARES		48</div><div class='add'>+#define CRYPTO_ARES			49</div><div class='add'>+#define NSSNOC_CRYPTO_ARES		50</div><div class='add'>+#define NSSNOC_NC_AXI0_1_ARES		51</div><div class='add'>+#define UBI0_CORE_ARES			52</div><div class='add'>+#define UBI1_CORE_ARES			53</div><div class='add'>+#define UBI2_CORE_ARES			54</div><div class='add'>+#define UBI3_CORE_ARES			55</div><div class='add'>+#define NC_AXI0_ARES			56</div><div class='add'>+#define UTCM0_ARES			57</div><div class='add'>+#define NC_AXI1_ARES			58</div><div class='add'>+#define UTCM1_ARES			59</div><div class='add'>+#define NC_AXI2_ARES			60</div><div class='add'>+#define UTCM2_ARES			61</div><div class='add'>+#define NC_AXI3_ARES			62</div><div class='add'>+#define UTCM3_ARES			63</div><div class='add'>+#define NSSNOC_NC_AXI0_ARES		64</div><div class='add'>+#define AHB0_ARES			65</div><div class='add'>+#define INTR0_AHB_ARES			66</div><div class='add'>+#define AHB1_ARES			67</div><div class='add'>+#define INTR1_AHB_ARES			68</div><div class='add'>+#define AHB2_ARES			69</div><div class='add'>+#define INTR2_AHB_ARES			70</div><div class='add'>+#define AHB3_ARES			71</div><div class='add'>+#define INTR3_AHB_ARES			72</div><div class='add'>+#define NSSNOC_AHB0_ARES		73</div><div class='add'>+#define NSSNOC_INT0_AHB_ARES		74</div><div class='add'>+#define AXI0_ARES			75</div><div class='add'>+#define AXI1_ARES			76</div><div class='add'>+#define AXI2_ARES			77</div><div class='add'>+#define AXI3_ARES			78</div><div class='add'>+#define NSSNOC_AXI0_ARES		79</div><div class='add'>+#define IMEM_QSB_ARES			80</div><div class='add'>+#define NSSNOC_IMEM_QSB_ARES		81</div><div class='add'>+#define IMEM_AHB_ARES			82</div><div class='add'>+#define NSSNOC_IMEM_AHB_ARES		83</div><div class='add'>+#define UNIPHY_PORT1_RX_ARES		84</div><div class='add'>+#define UNIPHY_PORT1_TX_ARES		85</div><div class='add'>+#define UNIPHY_PORT2_RX_ARES		86</div><div class='add'>+#define UNIPHY_PORT2_TX_ARES		87</div><div class='add'>+#define UNIPHY_PORT3_RX_ARES		88</div><div class='add'>+#define UNIPHY_PORT3_TX_ARES		89</div><div class='add'>+#define UNIPHY_PORT4_RX_ARES		90</div><div class='add'>+#define UNIPHY_PORT4_TX_ARES		91</div><div class='add'>+#define UNIPHY_PORT5_RX_ARES		92</div><div class='add'>+#define UNIPHY_PORT5_TX_ARES		93</div><div class='add'>+#define UNIPHY_PORT6_RX_ARES		94</div><div class='add'>+#define UNIPHY_PORT6_TX_ARES		95</div><div class='add'>+#define PORT1_RX_ARES			96</div><div class='add'>+#define PORT1_TX_ARES			97</div><div class='add'>+#define PORT2_RX_ARES			98</div><div class='add'>+#define PORT2_TX_ARES			99</div><div class='add'>+#define PORT3_RX_ARES			100</div><div class='add'>+#define PORT3_TX_ARES			101</div><div class='add'>+#define PORT4_RX_ARES			102</div><div class='add'>+#define PORT4_TX_ARES			103</div><div class='add'>+#define PORT5_RX_ARES			104</div><div class='add'>+#define PORT5_TX_ARES			105</div><div class='add'>+#define PORT6_RX_ARES			106</div><div class='add'>+#define PORT6_TX_ARES			107</div><div class='add'>+#define PPE_FULL_RESET			108</div><div class='add'>+#define UNIPHY0_SOFT_RESET		109</div><div class='add'>+#define UNIPHY1_SOFT_RESET		110</div><div class='add'>+#define UNIPHY2_SOFT_RESET		111</div><div class='add'>+#define UNIPHY_PORT1_ARES		112</div><div class='add'>+#define UNIPHY_PORT2_ARES		113</div><div class='add'>+#define UNIPHY_PORT3_ARES		114</div><div class='add'>+#define UNIPHY_PORT4_ARES		115</div><div class='add'>+#define UNIPHY_PORT5_ARES		116</div><div class='add'>+#define UNIPHY_PORT6_ARES		117</div><div class='add'>+#define NSSPORT1_RESET			118</div><div class='add'>+#define NSSPORT2_RESET			119</div><div class='add'>+#define NSSPORT3_RESET			120</div><div class='add'>+#define NSSPORT4_RESET			121</div><div class='add'>+#define NSSPORT5_RESET			122</div><div class='add'>+#define NSSPORT6_RESET			123</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/qcom,qca8k-nsscc.h b/include/dt-bindings/reset/qcom,qca8k-nsscc.h<br/>new file mode 100644<br/>index 000000000000..c71167a3bd41<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/qcom,qca8k-nsscc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/qcom,qca8k-nsscc.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_QCOM_QCA8K_NSS_CC_H</div><div class='add'>+#define _DT_BINDINGS_RESET_QCOM_QCA8K_NSS_CC_H</div><div class='add'>+</div><div class='add'>+#define NSS_CC_SWITCH_CORE_ARES				1</div><div class='add'>+#define NSS_CC_APB_BRIDGE_ARES				2</div><div class='add'>+#define NSS_CC_MAC0_TX_ARES				3</div><div class='add'>+#define NSS_CC_MAC0_TX_SRDS1_ARES			4</div><div class='add'>+#define NSS_CC_MAC0_RX_ARES				5</div><div class='add'>+#define NSS_CC_MAC0_RX_SRDS1_ARES			6</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_RX_ARES			7</div><div class='add'>+#define NSS_CC_MAC1_TX_ARES				8</div><div class='add'>+#define NSS_CC_MAC1_GEPHY0_TX_ARES			9</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_XGMII_RX_ARES		10</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_TX_ARES			11</div><div class='add'>+#define NSS_CC_MAC1_RX_ARES				12</div><div class='add'>+#define NSS_CC_MAC1_GEPHY0_RX_ARES			13</div><div class='add'>+#define NSS_CC_MAC1_SRDS1_CH0_XGMII_TX_ARES		14</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_RX_ARES			15</div><div class='add'>+#define NSS_CC_MAC2_TX_ARES				16</div><div class='add'>+#define NSS_CC_MAC2_GEPHY1_TX_ARES			17</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_XGMII_RX_ARES		18</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_TX_ARES			19</div><div class='add'>+#define NSS_CC_MAC2_RX_ARES				20</div><div class='add'>+#define NSS_CC_MAC2_GEPHY1_RX_ARES			21</div><div class='add'>+#define NSS_CC_MAC2_SRDS1_CH1_XGMII_TX_ARES		22</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_RX_ARES			23</div><div class='add'>+#define NSS_CC_MAC3_TX_ARES				24</div><div class='add'>+#define NSS_CC_MAC3_GEPHY2_TX_ARES			25</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_XGMII_RX_ARES		26</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_TX_ARES			27</div><div class='add'>+#define NSS_CC_MAC3_RX_ARES				28</div><div class='add'>+#define NSS_CC_MAC3_GEPHY2_RX_ARES			29</div><div class='add'>+#define NSS_CC_MAC3_SRDS1_CH2_XGMII_TX_ARES		30</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_RX_ARES			31</div><div class='add'>+#define NSS_CC_MAC4_TX_ARES				32</div><div class='add'>+#define NSS_CC_MAC4_GEPHY3_TX_ARES			33</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_XGMII_RX_ARES		34</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_TX_ARES			35</div><div class='add'>+#define NSS_CC_MAC4_RX_ARES				36</div><div class='add'>+#define NSS_CC_MAC4_GEPHY3_RX_ARES			37</div><div class='add'>+#define NSS_CC_MAC4_SRDS1_CH3_XGMII_TX_ARES		38</div><div class='add'>+#define NSS_CC_MAC5_TX_ARES				39</div><div class='add'>+#define NSS_CC_MAC5_TX_SRDS0_ARES			40</div><div class='add'>+#define NSS_CC_MAC5_RX_ARES				41</div><div class='add'>+#define NSS_CC_MAC5_RX_SRDS0_ARES			42</div><div class='add'>+#define NSS_CC_AHB_ARES					43</div><div class='add'>+#define NSS_CC_SEC_CTRL_AHB_ARES			44</div><div class='add'>+#define NSS_CC_TLMM_ARES				45</div><div class='add'>+#define NSS_CC_TLMM_AHB_ARES				46</div><div class='add'>+#define NSS_CC_CNOC_AHB_ARES				47</div><div class='add'>+#define NSS_CC_MDIO_AHB_ARES				48</div><div class='add'>+#define NSS_CC_MDIO_MASTER_AHB_ARES			49</div><div class='add'>+#define NSS_CC_SRDS0_SYS_ARES				50</div><div class='add'>+#define NSS_CC_SRDS1_SYS_ARES				51</div><div class='add'>+#define NSS_CC_GEPHY0_SYS_ARES				52</div><div class='add'>+#define NSS_CC_GEPHY1_SYS_ARES				53</div><div class='add'>+#define NSS_CC_GEPHY2_SYS_ARES				54</div><div class='add'>+#define NSS_CC_GEPHY3_SYS_ARES				55</div><div class='add'>+#define NSS_CC_SEC_CTRL_ARES				56</div><div class='add'>+#define NSS_CC_SEC_CTRL_SENSE_ARES			57</div><div class='add'>+#define NSS_CC_SLEEP_ARES				58</div><div class='add'>+#define NSS_CC_DEBUG_ARES				59</div><div class='add'>+#define NSS_CC_GEPHY0_ARES				60</div><div class='add'>+#define NSS_CC_GEPHY1_ARES				61</div><div class='add'>+#define NSS_CC_GEPHY2_ARES				62</div><div class='add'>+#define NSS_CC_GEPHY3_ARES				63</div><div class='add'>+#define NSS_CC_DSP_ARES					64</div><div class='add'>+#define NSS_CC_GEPHY_FULL_ARES				65</div><div class='add'>+#define NSS_CC_GLOBAL_ARES				66</div><div class='add'>+#define NSS_CC_XPCS_ARES				67</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/qcom,sar2130p-gpucc.h b/include/dt-bindings/reset/qcom,sar2130p-gpucc.h<br/>new file mode 100644<br/>index 000000000000..99ba5f092e2a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/qcom,sar2130p-gpucc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/qcom,sar2130p-gpucc.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2024, Linaro Limited</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_QCOM_GPU_CC_SAR2130P_H</div><div class='add'>+#define _DT_BINDINGS_RESET_QCOM_GPU_CC_SAR2130P_H</div><div class='add'>+</div><div class='add'>+#define GPUCC_GPU_CC_GX_BCR			0</div><div class='add'>+#define GPUCC_GPU_CC_ACD_BCR			1</div><div class='add'>+#define GPUCC_GPU_CC_GX_ACD_IROOT_BCR		2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/rockchip,rk3506-cru.h b/include/dt-bindings/reset/rockchip,rk3506-cru.h<br/>new file mode 100644<br/>index 000000000000..31c0d4aa410f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/rockchip,rk3506-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/rockchip,rk3506-cru.h</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023-2025 Rockchip Electronics Co., Ltd.</div><div class='add'>+ * Author: Finley Xiao &lt;finley.xiao@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_REST_ROCKCHIP_RK3506_H</div><div class='add'>+#define _DT_BINDINGS_REST_ROCKCHIP_RK3506_H</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_NCOREPORESET0_AC	0</div><div class='add'>+#define SRST_NCOREPORESET1_AC	1</div><div class='add'>+#define SRST_NCOREPORESET2_AC	2</div><div class='add'>+#define SRST_NCORESET0_AC	3</div><div class='add'>+#define SRST_NCORESET1_AC	4</div><div class='add'>+#define SRST_NCORESET2_AC	5</div><div class='add'>+#define SRST_NL2RESET_AC	6</div><div class='add'>+#define SRST_A_CORE_BIU_AC	7</div><div class='add'>+#define SRST_H_M0_AC		8</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON02 */</div><div class='add'>+#define SRST_NDBGRESET		9</div><div class='add'>+#define SRST_P_CORE_BIU		10</div><div class='add'>+#define SRST_PMU		11</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON03 */</div><div class='add'>+#define SRST_P_DBG		12</div><div class='add'>+#define SRST_POT_DBG		13</div><div class='add'>+#define SRST_P_CORE_GRF		14</div><div class='add'>+#define SRST_CORE_EMA_DETECT	15</div><div class='add'>+#define SRST_REF_PVTPLL_CORE	16</div><div class='add'>+#define SRST_P_GPIO1		17</div><div class='add'>+#define SRST_DB_GPIO1		18</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON04 */</div><div class='add'>+#define SRST_A_CORE_PERI_BIU	19</div><div class='add'>+#define SRST_A_DSMC		20</div><div class='add'>+#define SRST_P_DSMC		21</div><div class='add'>+#define SRST_FLEXBUS		22</div><div class='add'>+#define SRST_A_FLEXBUS		23</div><div class='add'>+#define SRST_H_FLEXBUS		24</div><div class='add'>+#define SRST_A_DSMC_SLV		25</div><div class='add'>+#define SRST_H_DSMC_SLV		26</div><div class='add'>+#define SRST_DSMC_SLV		27</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON05 */</div><div class='add'>+#define SRST_A_BUS_BIU		28</div><div class='add'>+#define SRST_H_BUS_BIU		29</div><div class='add'>+#define SRST_P_BUS_BIU		30</div><div class='add'>+#define SRST_A_SYSRAM		31</div><div class='add'>+#define SRST_H_SYSRAM		32</div><div class='add'>+#define SRST_A_DMAC0		33</div><div class='add'>+#define SRST_A_DMAC1		34</div><div class='add'>+#define SRST_H_M0		35</div><div class='add'>+#define SRST_M0_JTAG		36</div><div class='add'>+#define SRST_H_CRYPTO		37</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON06 */</div><div class='add'>+#define SRST_H_RNG		38</div><div class='add'>+#define SRST_P_BUS_GRF		39</div><div class='add'>+#define SRST_P_TIMER0		40</div><div class='add'>+#define SRST_TIMER0_CH0		41</div><div class='add'>+#define SRST_TIMER0_CH1		42</div><div class='add'>+#define SRST_TIMER0_CH2		43</div><div class='add'>+#define SRST_TIMER0_CH3		44</div><div class='add'>+#define SRST_TIMER0_CH4		45</div><div class='add'>+#define SRST_TIMER0_CH5		46</div><div class='add'>+#define SRST_P_WDT0		47</div><div class='add'>+#define SRST_T_WDT0		48</div><div class='add'>+#define SRST_P_WDT1		49</div><div class='add'>+#define SRST_T_WDT1		50</div><div class='add'>+#define SRST_P_MAILBOX		51</div><div class='add'>+#define SRST_P_INTMUX		52</div><div class='add'>+#define SRST_P_SPINLOCK		53</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON07 */</div><div class='add'>+#define SRST_P_DDRC		54</div><div class='add'>+#define SRST_H_DDRPHY		55</div><div class='add'>+#define SRST_P_DDRMON		56</div><div class='add'>+#define SRST_DDRMON_OSC		57</div><div class='add'>+#define SRST_P_DDR_LPC		58</div><div class='add'>+#define SRST_H_USBOTG0		59</div><div class='add'>+#define SRST_USBOTG0_ADP	60</div><div class='add'>+#define SRST_H_USBOTG1		61</div><div class='add'>+#define SRST_USBOTG1_ADP	62</div><div class='add'>+#define SRST_P_USBPHY		63</div><div class='add'>+#define SRST_USBPHY_POR		64</div><div class='add'>+#define SRST_USBPHY_OTG0	65</div><div class='add'>+#define SRST_USBPHY_OTG1	66</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON08 */</div><div class='add'>+#define SRST_A_DMA2DDR		67</div><div class='add'>+#define SRST_P_DMA2DDR		68</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON09 */</div><div class='add'>+#define SRST_USBOTG0_UTMI	69</div><div class='add'>+#define SRST_USBOTG1_UTMI	70</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON10 */</div><div class='add'>+#define SRST_A_DDRC_0		71</div><div class='add'>+#define SRST_A_DDRC_1		72</div><div class='add'>+#define SRST_A_DDR_BIU		73</div><div class='add'>+#define SRST_DDRC		74</div><div class='add'>+#define SRST_DDRMON		75</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON11 */</div><div class='add'>+#define SRST_H_LSPERI_BIU	76</div><div class='add'>+#define SRST_P_UART0		77</div><div class='add'>+#define SRST_P_UART1		78</div><div class='add'>+#define SRST_P_UART2		79</div><div class='add'>+#define SRST_P_UART3		80</div><div class='add'>+#define SRST_P_UART4		81</div><div class='add'>+#define SRST_UART0		82</div><div class='add'>+#define SRST_UART1		83</div><div class='add'>+#define SRST_UART2		84</div><div class='add'>+#define SRST_UART3		85</div><div class='add'>+#define SRST_UART4		86</div><div class='add'>+#define SRST_P_I2C0		87</div><div class='add'>+#define SRST_I2C0		88</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON12 */</div><div class='add'>+#define SRST_P_I2C1		89</div><div class='add'>+#define SRST_I2C1		90</div><div class='add'>+#define SRST_P_I2C2		91</div><div class='add'>+#define SRST_I2C2		92</div><div class='add'>+#define SRST_P_PWM1		93</div><div class='add'>+#define SRST_PWM1		94</div><div class='add'>+#define SRST_P_SPI0		95</div><div class='add'>+#define SRST_SPI0		96</div><div class='add'>+#define SRST_P_SPI1		97</div><div class='add'>+#define SRST_SPI1		98</div><div class='add'>+#define SRST_P_GPIO2		99</div><div class='add'>+#define SRST_DB_GPIO2		100</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON13 */</div><div class='add'>+#define SRST_P_GPIO3		101</div><div class='add'>+#define SRST_DB_GPIO3		102</div><div class='add'>+#define SRST_P_GPIO4		103</div><div class='add'>+#define SRST_DB_GPIO4		104</div><div class='add'>+#define SRST_H_CAN0		105</div><div class='add'>+#define SRST_CAN0		106</div><div class='add'>+#define SRST_H_CAN1		107</div><div class='add'>+#define SRST_CAN1		108</div><div class='add'>+#define SRST_H_PDM		109</div><div class='add'>+#define SRST_M_PDM		110</div><div class='add'>+#define SRST_PDM		111</div><div class='add'>+#define SRST_SPDIFTX		112</div><div class='add'>+#define SRST_H_SPDIFTX		113</div><div class='add'>+#define SRST_H_SPDIFRX		114</div><div class='add'>+#define SRST_SPDIFRX		115</div><div class='add'>+#define SRST_M_SAI0		116</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON14 */</div><div class='add'>+#define SRST_H_SAI0		117</div><div class='add'>+#define SRST_M_SAI1		118</div><div class='add'>+#define SRST_H_SAI1		119</div><div class='add'>+#define SRST_H_ASRC0		120</div><div class='add'>+#define SRST_ASRC0		121</div><div class='add'>+#define SRST_H_ASRC1		122</div><div class='add'>+#define SRST_ASRC1		123</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON17 */</div><div class='add'>+#define SRST_H_HSPERI_BIU	124</div><div class='add'>+#define SRST_H_SDMMC		125</div><div class='add'>+#define SRST_H_FSPI		126</div><div class='add'>+#define SRST_S_FSPI		127</div><div class='add'>+#define SRST_P_SPI2		128</div><div class='add'>+#define SRST_A_MAC0		129</div><div class='add'>+#define SRST_A_MAC1		130</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON18 */</div><div class='add'>+#define SRST_M_SAI2		131</div><div class='add'>+#define SRST_H_SAI2		132</div><div class='add'>+#define SRST_H_SAI3		133</div><div class='add'>+#define SRST_M_SAI3		134</div><div class='add'>+#define SRST_H_SAI4		135</div><div class='add'>+#define SRST_M_SAI4		136</div><div class='add'>+#define SRST_H_DSM		137</div><div class='add'>+#define SRST_M_DSM		138</div><div class='add'>+#define SRST_P_AUDIO_ADC	139</div><div class='add'>+#define SRST_M_AUDIO_ADC	140</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON19 */</div><div class='add'>+#define SRST_P_SARADC		141</div><div class='add'>+#define SRST_SARADC		142</div><div class='add'>+#define SRST_SARADC_PHY		143</div><div class='add'>+#define SRST_P_OTPC_NS		144</div><div class='add'>+#define SRST_SBPI_OTPC_NS	145</div><div class='add'>+#define SRST_USER_OTPC_NS	146</div><div class='add'>+#define SRST_P_UART5		147</div><div class='add'>+#define SRST_UART5		148</div><div class='add'>+#define SRST_P_GPIO234_IOC	149</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON21 */</div><div class='add'>+#define SRST_A_VIO_BIU		150</div><div class='add'>+#define SRST_H_VIO_BIU		151</div><div class='add'>+#define SRST_H_RGA		152</div><div class='add'>+#define SRST_A_RGA		153</div><div class='add'>+#define SRST_CORE_RGA		154</div><div class='add'>+#define SRST_A_VOP		155</div><div class='add'>+#define SRST_H_VOP		156</div><div class='add'>+#define SRST_VOP		157</div><div class='add'>+#define SRST_P_DPHY		158</div><div class='add'>+#define SRST_P_DSI_HOST		159</div><div class='add'>+#define SRST_P_TSADC		160</div><div class='add'>+#define SRST_TSADC		161</div><div class='add'>+</div><div class='add'>+/* CRU--&gt;SOFTRST_CON22 */</div><div class='add'>+#define SRST_P_GPIO1_IOC	162</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/rockchip,rk3528-cru.h b/include/dt-bindings/reset/rockchip,rk3528-cru.h<br/>new file mode 100644<br/>index 000000000000..6b024c5f2e1c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/rockchip,rk3528-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/rockchip,rk3528-cru.h</a></div><div class='hunk'>@@ -0,0 +1,241 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Rockchip Electronics Co. Ltd.</div><div class='add'>+ * Copyright (c) 2024 Yao Zi &lt;ziyao@disroot.org&gt;</div><div class='add'>+ * Author: Joseph Chen &lt;chenjh@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_ROCKCHIP_RK3528_H</div><div class='add'>+#define _DT_BINDINGS_RESET_ROCKCHIP_RK3528_H</div><div class='add'>+</div><div class='add'>+#define SRST_CORE0_PO		0</div><div class='add'>+#define SRST_CORE1_PO		1</div><div class='add'>+#define SRST_CORE2_PO		2</div><div class='add'>+#define SRST_CORE3_PO		3</div><div class='add'>+#define SRST_CORE0		4</div><div class='add'>+#define SRST_CORE1		5</div><div class='add'>+#define SRST_CORE2		6</div><div class='add'>+#define SRST_CORE3		7</div><div class='add'>+#define SRST_NL2		8</div><div class='add'>+#define SRST_CORE_BIU		9</div><div class='add'>+#define SRST_CORE_CRYPTO	10</div><div class='add'>+#define SRST_P_DBG		11</div><div class='add'>+#define SRST_POT_DBG		12</div><div class='add'>+#define SRST_NT_DBG		13</div><div class='add'>+#define SRST_P_CORE_GRF		14</div><div class='add'>+#define SRST_P_DAPLITE_BIU	15</div><div class='add'>+#define SRST_P_CPU_BIU		16</div><div class='add'>+#define SRST_REF_PVTPLL_CORE	17</div><div class='add'>+#define SRST_A_BUS_VOPGL_BIU	18</div><div class='add'>+#define SRST_A_BUS_H_BIU	19</div><div class='add'>+#define SRST_A_SYSMEM_BIU	20</div><div class='add'>+#define SRST_A_BUS_BIU		21</div><div class='add'>+#define SRST_H_BUS_BIU		22</div><div class='add'>+#define SRST_P_BUS_BIU		23</div><div class='add'>+#define SRST_P_DFT2APB		24</div><div class='add'>+#define SRST_P_BUS_GRF		25</div><div class='add'>+#define SRST_A_BUS_M_BIU	26</div><div class='add'>+#define SRST_A_GIC		27</div><div class='add'>+#define SRST_A_SPINLOCK		28</div><div class='add'>+#define SRST_A_DMAC		29</div><div class='add'>+#define SRST_P_TIMER		30</div><div class='add'>+#define SRST_TIMER0		31</div><div class='add'>+#define SRST_TIMER1		32</div><div class='add'>+#define SRST_TIMER2		33</div><div class='add'>+#define SRST_TIMER3		34</div><div class='add'>+#define SRST_TIMER4		35</div><div class='add'>+#define SRST_TIMER5		36</div><div class='add'>+#define SRST_P_JDBCK_DAP	37</div><div class='add'>+#define SRST_JDBCK_DAP		38</div><div class='add'>+#define SRST_P_WDT_NS		39</div><div class='add'>+#define SRST_T_WDT_NS		40</div><div class='add'>+#define SRST_H_TRNG_NS		41</div><div class='add'>+#define SRST_P_UART0		42</div><div class='add'>+#define SRST_S_UART0		43</div><div class='add'>+#define SRST_PKA_CRYPTO		44</div><div class='add'>+#define SRST_A_CRYPTO		45</div><div class='add'>+#define SRST_H_CRYPTO		46</div><div class='add'>+#define SRST_P_DMA2DDR		47</div><div class='add'>+#define SRST_A_DMA2DDR		48</div><div class='add'>+#define SRST_P_PWM0		49</div><div class='add'>+#define SRST_PWM0		50</div><div class='add'>+#define SRST_P_PWM1		51</div><div class='add'>+#define SRST_PWM1		52</div><div class='add'>+#define SRST_P_SCR		53</div><div class='add'>+#define SRST_A_DCF		54</div><div class='add'>+#define SRST_P_INTMUX		55</div><div class='add'>+#define SRST_A_VPU_BIU		56</div><div class='add'>+#define SRST_H_VPU_BIU		57</div><div class='add'>+#define SRST_P_VPU_BIU		58</div><div class='add'>+#define SRST_A_VPU		59</div><div class='add'>+#define SRST_H_VPU		60</div><div class='add'>+#define SRST_P_CRU_PCIE		61</div><div class='add'>+#define SRST_P_VPU_GRF		62</div><div class='add'>+#define SRST_H_SFC		63</div><div class='add'>+#define SRST_S_SFC		64</div><div class='add'>+#define SRST_C_EMMC		65</div><div class='add'>+#define SRST_H_EMMC		66</div><div class='add'>+#define SRST_A_EMMC		67</div><div class='add'>+#define SRST_B_EMMC		68</div><div class='add'>+#define SRST_T_EMMC		69</div><div class='add'>+#define SRST_P_GPIO1		70</div><div class='add'>+#define SRST_DB_GPIO1		71</div><div class='add'>+#define SRST_A_VPU_L_BIU	72</div><div class='add'>+#define SRST_P_VPU_IOC		73</div><div class='add'>+#define SRST_H_SAI_I2S0		74</div><div class='add'>+#define SRST_M_SAI_I2S0		75</div><div class='add'>+#define SRST_H_SAI_I2S2		76</div><div class='add'>+#define SRST_M_SAI_I2S2		77</div><div class='add'>+#define SRST_P_ACODEC		78</div><div class='add'>+#define SRST_P_GPIO3		79</div><div class='add'>+#define SRST_DB_GPIO3		80</div><div class='add'>+#define SRST_P_SPI1		81</div><div class='add'>+#define SRST_SPI1		82</div><div class='add'>+#define SRST_P_UART2		83</div><div class='add'>+#define SRST_S_UART2		84</div><div class='add'>+#define SRST_P_UART5		85</div><div class='add'>+#define SRST_S_UART5		86</div><div class='add'>+#define SRST_P_UART6		87</div><div class='add'>+#define SRST_S_UART6		88</div><div class='add'>+#define SRST_P_UART7		89</div><div class='add'>+#define SRST_S_UART7		90</div><div class='add'>+#define SRST_P_I2C3		91</div><div class='add'>+#define SRST_I2C3		92</div><div class='add'>+#define SRST_P_I2C5		93</div><div class='add'>+#define SRST_I2C5		94</div><div class='add'>+#define SRST_P_I2C6		95</div><div class='add'>+#define SRST_I2C6		96</div><div class='add'>+#define SRST_A_MAC		97</div><div class='add'>+#define SRST_P_PCIE		98</div><div class='add'>+#define SRST_PCIE_PIPE_PHY	99</div><div class='add'>+#define SRST_PCIE_POWER_UP	100</div><div class='add'>+#define SRST_P_PCIE_PHY		101</div><div class='add'>+#define SRST_P_PIPE_GRF		102</div><div class='add'>+#define SRST_H_SDIO0		103</div><div class='add'>+#define SRST_H_SDIO1		104</div><div class='add'>+#define SRST_TS_0		105</div><div class='add'>+#define SRST_TS_1		106</div><div class='add'>+#define SRST_P_CAN2		107</div><div class='add'>+#define SRST_CAN2		108</div><div class='add'>+#define SRST_P_CAN3		109</div><div class='add'>+#define SRST_CAN3		110</div><div class='add'>+#define SRST_P_SARADC		111</div><div class='add'>+#define SRST_SARADC		112</div><div class='add'>+#define SRST_SARADC_PHY		113</div><div class='add'>+#define SRST_P_TSADC		114</div><div class='add'>+#define SRST_TSADC		115</div><div class='add'>+#define SRST_A_USB3OTG		116</div><div class='add'>+#define SRST_A_GPU_BIU		117</div><div class='add'>+#define SRST_P_GPU_BIU		118</div><div class='add'>+#define SRST_A_GPU		119</div><div class='add'>+#define SRST_REF_PVTPLL_GPU	120</div><div class='add'>+#define SRST_H_RKVENC_BIU	121</div><div class='add'>+#define SRST_A_RKVENC_BIU	122</div><div class='add'>+#define SRST_P_RKVENC_BIU	123</div><div class='add'>+#define SRST_H_RKVENC		124</div><div class='add'>+#define SRST_A_RKVENC		125</div><div class='add'>+#define SRST_CORE_RKVENC	126</div><div class='add'>+#define SRST_H_SAI_I2S1		127</div><div class='add'>+#define SRST_M_SAI_I2S1		128</div><div class='add'>+#define SRST_P_I2C1		129</div><div class='add'>+#define SRST_I2C1		130</div><div class='add'>+#define SRST_P_I2C0		131</div><div class='add'>+#define SRST_I2C0		132</div><div class='add'>+#define SRST_P_SPI0		133</div><div class='add'>+#define SRST_SPI0		134</div><div class='add'>+#define SRST_P_GPIO4		135</div><div class='add'>+#define SRST_DB_GPIO4		136</div><div class='add'>+#define SRST_P_RKVENC_IOC	137</div><div class='add'>+#define SRST_H_SPDIF		138</div><div class='add'>+#define SRST_M_SPDIF		139</div><div class='add'>+#define SRST_H_PDM		140</div><div class='add'>+#define SRST_M_PDM		141</div><div class='add'>+#define SRST_P_UART1		142</div><div class='add'>+#define SRST_S_UART1		143</div><div class='add'>+#define SRST_P_UART3		144</div><div class='add'>+#define SRST_S_UART3		145</div><div class='add'>+#define SRST_P_RKVENC_GRF	146</div><div class='add'>+#define SRST_P_CAN0		147</div><div class='add'>+#define SRST_CAN0		148</div><div class='add'>+#define SRST_P_CAN1		149</div><div class='add'>+#define SRST_CAN1		150</div><div class='add'>+#define SRST_A_VO_BIU		151</div><div class='add'>+#define SRST_H_VO_BIU		152</div><div class='add'>+#define SRST_P_VO_BIU		153</div><div class='add'>+#define SRST_H_RGA2E		154</div><div class='add'>+#define SRST_A_RGA2E		155</div><div class='add'>+#define SRST_CORE_RGA2E		156</div><div class='add'>+#define SRST_H_VDPP		157</div><div class='add'>+#define SRST_A_VDPP		158</div><div class='add'>+#define SRST_CORE_VDPP		159</div><div class='add'>+#define SRST_P_VO_GRF		160</div><div class='add'>+#define SRST_P_CRU		161</div><div class='add'>+#define SRST_A_VOP_BIU		162</div><div class='add'>+#define SRST_H_VOP		163</div><div class='add'>+#define SRST_D_VOP0		164</div><div class='add'>+#define SRST_D_VOP1		165</div><div class='add'>+#define SRST_A_VOP		166</div><div class='add'>+#define SRST_P_HDMI		167</div><div class='add'>+#define SRST_HDMI		168</div><div class='add'>+#define SRST_P_HDMIPHY		169</div><div class='add'>+#define SRST_H_HDCP_KEY		170</div><div class='add'>+#define SRST_A_HDCP		171</div><div class='add'>+#define SRST_H_HDCP		172</div><div class='add'>+#define SRST_P_HDCP		173</div><div class='add'>+#define SRST_H_CVBS		174</div><div class='add'>+#define SRST_D_CVBS_VOP		175</div><div class='add'>+#define SRST_D_4X_CVBS_VOP	176</div><div class='add'>+#define SRST_A_JPEG_DECODER	177</div><div class='add'>+#define SRST_H_JPEG_DECODER	178</div><div class='add'>+#define SRST_A_VO_L_BIU		179</div><div class='add'>+#define SRST_A_MAC_VO		180</div><div class='add'>+#define SRST_A_JPEG_BIU		181</div><div class='add'>+#define SRST_H_SAI_I2S3		182</div><div class='add'>+#define SRST_M_SAI_I2S3		183</div><div class='add'>+#define SRST_MACPHY		184</div><div class='add'>+#define SRST_P_VCDCPHY		185</div><div class='add'>+#define SRST_P_GPIO2		186</div><div class='add'>+#define SRST_DB_GPIO2		187</div><div class='add'>+#define SRST_P_VO_IOC		188</div><div class='add'>+#define SRST_H_SDMMC0		189</div><div class='add'>+#define SRST_P_OTPC_NS		190</div><div class='add'>+#define SRST_SBPI_OTPC_NS	191</div><div class='add'>+#define SRST_USER_OTPC_NS	192</div><div class='add'>+#define SRST_HDMIHDP0		193</div><div class='add'>+#define SRST_H_USBHOST		194</div><div class='add'>+#define SRST_H_USBHOST_ARB	195</div><div class='add'>+#define SRST_HOST_UTMI		196</div><div class='add'>+#define SRST_P_UART4		197</div><div class='add'>+#define SRST_S_UART4		198</div><div class='add'>+#define SRST_P_I2C4		199</div><div class='add'>+#define SRST_I2C4		200</div><div class='add'>+#define SRST_P_I2C7		201</div><div class='add'>+#define SRST_I2C7		202</div><div class='add'>+#define SRST_P_USBPHY		203</div><div class='add'>+#define SRST_USBPHY_POR		204</div><div class='add'>+#define SRST_USBPHY_OTG		205</div><div class='add'>+#define SRST_USBPHY_HOST	206</div><div class='add'>+#define SRST_P_DDRPHY_CRU	207</div><div class='add'>+#define SRST_H_RKVDEC_BIU	208</div><div class='add'>+#define SRST_A_RKVDEC_BIU	209</div><div class='add'>+#define SRST_A_RKVDEC		210</div><div class='add'>+#define SRST_H_RKVDEC		211</div><div class='add'>+#define SRST_HEVC_CA_RKVDEC	212</div><div class='add'>+#define SRST_REF_PVTPLL_RKVDEC	213</div><div class='add'>+#define SRST_P_DDR_BIU		214</div><div class='add'>+#define SRST_P_DDRC		215</div><div class='add'>+#define SRST_P_DDRMON		216</div><div class='add'>+#define SRST_TIMER_DDRMON	217</div><div class='add'>+#define SRST_P_MSCH_BIU		218</div><div class='add'>+#define SRST_P_DDR_GRF		219</div><div class='add'>+#define SRST_P_DDR_HWLP		220</div><div class='add'>+#define SRST_P_DDRPHY		221</div><div class='add'>+#define SRST_MSCH_BIU		222</div><div class='add'>+#define SRST_A_DDR_UPCTL	223</div><div class='add'>+#define SRST_DDR_UPCTL		224</div><div class='add'>+#define SRST_DDRMON		225</div><div class='add'>+#define SRST_A_DDR_SCRAMBLE	226</div><div class='add'>+#define SRST_A_SPLIT		227</div><div class='add'>+#define SRST_DDR_PHY		228</div><div class='add'>+</div><div class='add'>+#endif // _DT_BINDINGS_RESET_ROCKCHIP_RK3528_H</div><div class='head'>diff --git a/include/dt-bindings/reset/rockchip,rk3562-cru.h b/include/dt-bindings/reset/rockchip,rk3562-cru.h<br/>new file mode 100644<br/>index 000000000000..8df95113056e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/rockchip,rk3562-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/rockchip,rk3562-cru.h</a></div><div class='hunk'>@@ -0,0 +1,358 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024-2025 Rockchip Electronics Co. Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Author: Elaine Zhang &lt;zhangqing@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_ROCKCHIP_RK3562_H</div><div class='add'>+#define _DT_BINDINGS_RESET_ROCKCHIP_RK3562_H</div><div class='add'>+</div><div class='add'>+/********Name=SOFTRST_CON01,Offset=0x404********/</div><div class='add'>+#define SRST_A_TOP_BIU			0</div><div class='add'>+#define SRST_A_TOP_VIO_BIU		1</div><div class='add'>+#define SRST_REF_PVTPLL_LOGIC		2</div><div class='add'>+/********Name=SOFTRST_CON03,Offset=0x40C********/</div><div class='add'>+#define SRST_NCOREPORESET0		3</div><div class='add'>+#define SRST_NCOREPORESET1		4</div><div class='add'>+#define SRST_NCOREPORESET2		5</div><div class='add'>+#define SRST_NCOREPORESET3		6</div><div class='add'>+#define SRST_NCORESET0			7</div><div class='add'>+#define SRST_NCORESET1			8</div><div class='add'>+#define SRST_NCORESET2			9</div><div class='add'>+#define SRST_NCORESET3			10</div><div class='add'>+#define SRST_NL2RESET			11</div><div class='add'>+/********Name=SOFTRST_CON04,Offset=0x410********/</div><div class='add'>+#define SRST_DAP			12</div><div class='add'>+#define SRST_P_DBG_DAPLITE		13</div><div class='add'>+#define SRST_REF_PVTPLL_CORE		14</div><div class='add'>+/********Name=SOFTRST_CON05,Offset=0x414********/</div><div class='add'>+#define SRST_A_CORE_BIU			15</div><div class='add'>+#define SRST_P_CORE_BIU			16</div><div class='add'>+#define SRST_H_CORE_BIU			17</div><div class='add'>+/********Name=SOFTRST_CON06,Offset=0x418********/</div><div class='add'>+#define SRST_A_NPU_BIU			18</div><div class='add'>+#define SRST_H_NPU_BIU			19</div><div class='add'>+#define SRST_A_RKNN			20</div><div class='add'>+#define SRST_H_RKNN			21</div><div class='add'>+#define SRST_REF_PVTPLL_NPU		22</div><div class='add'>+/********Name=SOFTRST_CON08,Offset=0x420********/</div><div class='add'>+#define SRST_A_GPU_BIU			23</div><div class='add'>+#define SRST_GPU			24</div><div class='add'>+#define SRST_REF_PVTPLL_GPU		25</div><div class='add'>+#define SRST_GPU_BRG_BIU		26</div><div class='add'>+/********Name=SOFTRST_CON09,Offset=0x424********/</div><div class='add'>+#define SRST_RKVENC_CORE		27</div><div class='add'>+#define SRST_A_VEPU_BIU			28</div><div class='add'>+#define SRST_H_VEPU_BIU			29</div><div class='add'>+#define SRST_A_RKVENC			30</div><div class='add'>+#define SRST_H_RKVENC			31</div><div class='add'>+/********Name=SOFTRST_CON10,Offset=0x428********/</div><div class='add'>+#define SRST_RKVDEC_HEVC_CA		32</div><div class='add'>+#define SRST_A_VDPU_BIU			33</div><div class='add'>+#define SRST_H_VDPU_BIU			34</div><div class='add'>+#define SRST_A_RKVDEC			35</div><div class='add'>+#define SRST_H_RKVDEC			36</div><div class='add'>+/********Name=SOFTRST_CON11,Offset=0x42C********/</div><div class='add'>+#define SRST_A_VI_BIU			37</div><div class='add'>+#define SRST_H_VI_BIU			38</div><div class='add'>+#define SRST_P_VI_BIU			39</div><div class='add'>+#define SRST_ISP			40</div><div class='add'>+#define SRST_A_VICAP			41</div><div class='add'>+#define SRST_H_VICAP			42</div><div class='add'>+#define SRST_D_VICAP			43</div><div class='add'>+#define SRST_I0_VICAP			44</div><div class='add'>+#define SRST_I1_VICAP			45</div><div class='add'>+#define SRST_I2_VICAP			46</div><div class='add'>+#define SRST_I3_VICAP			47</div><div class='add'>+/********Name=SOFTRST_CON12,Offset=0x430********/</div><div class='add'>+#define SRST_P_CSIHOST0			48</div><div class='add'>+#define SRST_P_CSIHOST1			49</div><div class='add'>+#define SRST_P_CSIHOST2			50</div><div class='add'>+#define SRST_P_CSIHOST3			51</div><div class='add'>+#define SRST_P_CSIPHY0			52</div><div class='add'>+#define SRST_P_CSIPHY1			53</div><div class='add'>+/********Name=SOFTRST_CON13,Offset=0x434********/</div><div class='add'>+#define SRST_A_VO_BIU			54</div><div class='add'>+#define SRST_H_VO_BIU			55</div><div class='add'>+#define SRST_A_VOP			56</div><div class='add'>+#define SRST_H_VOP			57</div><div class='add'>+#define SRST_D_VOP			58</div><div class='add'>+#define SRST_D_VOP1			59</div><div class='add'>+/********Name=SOFTRST_CON14,Offset=0x438********/</div><div class='add'>+#define SRST_A_RGA_BIU			60</div><div class='add'>+#define SRST_H_RGA_BIU			61</div><div class='add'>+#define SRST_A_RGA			62</div><div class='add'>+#define SRST_H_RGA			63</div><div class='add'>+#define SRST_RGA_CORE			64</div><div class='add'>+#define SRST_A_JDEC			65</div><div class='add'>+#define SRST_H_JDEC			66</div><div class='add'>+/********Name=SOFTRST_CON15,Offset=0x43C********/</div><div class='add'>+#define SRST_B_EBK_BIU			67</div><div class='add'>+#define SRST_P_EBK_BIU			68</div><div class='add'>+#define SRST_AHB2AXI_EBC		69</div><div class='add'>+#define SRST_H_EBC			70</div><div class='add'>+#define SRST_D_EBC			71</div><div class='add'>+#define SRST_H_EINK			72</div><div class='add'>+#define SRST_P_EINK			73</div><div class='add'>+/********Name=SOFTRST_CON16,Offset=0x440********/</div><div class='add'>+#define SRST_P_PHP_BIU			74</div><div class='add'>+#define SRST_A_PHP_BIU			75</div><div class='add'>+#define SRST_P_PCIE20			76</div><div class='add'>+#define SRST_PCIE20_POWERUP		77</div><div class='add'>+#define SRST_USB3OTG			78</div><div class='add'>+/********Name=SOFTRST_CON17,Offset=0x444********/</div><div class='add'>+#define SRST_PIPEPHY			79</div><div class='add'>+/********Name=SOFTRST_CON18,Offset=0x448********/</div><div class='add'>+#define SRST_A_BUS_BIU			80</div><div class='add'>+#define SRST_H_BUS_BIU			81</div><div class='add'>+#define SRST_P_BUS_BIU			82</div><div class='add'>+/********Name=SOFTRST_CON19,Offset=0x44C********/</div><div class='add'>+#define SRST_P_I2C1			83</div><div class='add'>+#define SRST_P_I2C2			84</div><div class='add'>+#define SRST_P_I2C3			85</div><div class='add'>+#define SRST_P_I2C4			86</div><div class='add'>+#define SRST_P_I2C5			87</div><div class='add'>+#define SRST_I2C1			88</div><div class='add'>+#define SRST_I2C2			89</div><div class='add'>+#define SRST_I2C3			90</div><div class='add'>+#define SRST_I2C4			91</div><div class='add'>+#define SRST_I2C5			92</div><div class='add'>+/********Name=SOFTRST_CON20,Offset=0x450********/</div><div class='add'>+#define SRST_BUS_GPIO3			93</div><div class='add'>+#define SRST_BUS_GPIO4			94</div><div class='add'>+/********Name=SOFTRST_CON21,Offset=0x454********/</div><div class='add'>+#define SRST_P_TIMER			95</div><div class='add'>+#define SRST_TIMER0			96</div><div class='add'>+#define SRST_TIMER1			97</div><div class='add'>+#define SRST_TIMER2			98</div><div class='add'>+#define SRST_TIMER3			99</div><div class='add'>+#define SRST_TIMER4			100</div><div class='add'>+#define SRST_TIMER5			101</div><div class='add'>+#define SRST_P_STIMER			102</div><div class='add'>+#define SRST_STIMER0			103</div><div class='add'>+#define SRST_STIMER1			104</div><div class='add'>+/********Name=SOFTRST_CON22,Offset=0x458********/</div><div class='add'>+#define SRST_P_WDTNS			105</div><div class='add'>+#define SRST_WDTNS			106</div><div class='add'>+#define SRST_P_GRF			107</div><div class='add'>+#define SRST_P_SGRF			108</div><div class='add'>+#define SRST_P_MAILBOX			109</div><div class='add'>+#define SRST_P_INTC			110</div><div class='add'>+#define SRST_A_BUS_GIC400		111</div><div class='add'>+#define SRST_A_BUS_GIC400_DEBUG		112</div><div class='add'>+/********Name=SOFTRST_CON23,Offset=0x45C********/</div><div class='add'>+#define SRST_A_BUS_SPINLOCK		113</div><div class='add'>+#define SRST_A_DCF			114</div><div class='add'>+#define SRST_P_DCF			115</div><div class='add'>+#define SRST_F_BUS_CM0_CORE		116</div><div class='add'>+#define SRST_T_BUS_CM0_JTAG		117</div><div class='add'>+#define SRST_H_ICACHE			118</div><div class='add'>+#define SRST_H_DCACHE			119</div><div class='add'>+/********Name=SOFTRST_CON24,Offset=0x460********/</div><div class='add'>+#define SRST_P_TSADC			120</div><div class='add'>+#define SRST_TSADC			121</div><div class='add'>+#define SRST_TSADCPHY			122</div><div class='add'>+#define SRST_P_DFT2APB			123</div><div class='add'>+/********Name=SOFTRST_CON25,Offset=0x464********/</div><div class='add'>+#define SRST_A_GMAC			124</div><div class='add'>+#define SRST_P_APB2ASB_VCCIO156		125</div><div class='add'>+#define SRST_P_DSIPHY			126</div><div class='add'>+#define SRST_P_DSITX			127</div><div class='add'>+#define SRST_P_CPU_EMA_DET		128</div><div class='add'>+#define SRST_P_HASH			129</div><div class='add'>+#define SRST_P_TOPCRU			130</div><div class='add'>+/********Name=SOFTRST_CON26,Offset=0x468********/</div><div class='add'>+#define SRST_P_ASB2APB_VCCIO156		131</div><div class='add'>+#define SRST_P_IOC_VCCIO156		132</div><div class='add'>+#define SRST_P_GPIO3_VCCIO156		133</div><div class='add'>+#define SRST_P_GPIO4_VCCIO156		134</div><div class='add'>+#define SRST_P_SARADC_VCCIO156		135</div><div class='add'>+#define SRST_SARADC_VCCIO156		136</div><div class='add'>+#define SRST_SARADC_VCCIO156_PHY	137</div><div class='add'>+/********Name=SOFTRST_CON27,Offset=0x46c********/</div><div class='add'>+#define SRST_A_MAC100			138</div><div class='add'>+</div><div class='add'>+/********Name=PMU0SOFTRST_CON00,Offset=0x10200********/</div><div class='add'>+#define SRST_P_PMU0_CRU			139</div><div class='add'>+#define SRST_P_PMU0_PMU			140</div><div class='add'>+#define SRST_PMU0_PMU			141</div><div class='add'>+#define SRST_P_PMU0_HP_TIMER		142</div><div class='add'>+#define SRST_PMU0_HP_TIMER		143</div><div class='add'>+#define SRST_PMU0_32K_HP_TIMER		144</div><div class='add'>+#define SRST_P_PMU0_PVTM		145</div><div class='add'>+#define SRST_PMU0_PVTM			146</div><div class='add'>+#define SRST_P_IOC_PMUIO		147</div><div class='add'>+#define SRST_P_PMU0_GPIO0		148</div><div class='add'>+#define SRST_PMU0_GPIO0			149</div><div class='add'>+#define SRST_P_PMU0_GRF			150</div><div class='add'>+#define SRST_P_PMU0_SGRF		151</div><div class='add'>+/********Name=PMU0SOFTRST_CON01,Offset=0x10204********/</div><div class='add'>+#define SRST_DDR_FAIL_SAFE		152</div><div class='add'>+#define SRST_P_PMU0_SCRKEYGEN		153</div><div class='add'>+/********Name=PMU0SOFTRST_CON02,Offset=0x10208********/</div><div class='add'>+#define SRST_P_PMU0_I2C0		154</div><div class='add'>+#define SRST_PMU0_I2C0			155</div><div class='add'>+</div><div class='add'>+/********Name=PMU1SOFTRST_CON00,Offset=0x18200********/</div><div class='add'>+#define SRST_P_PMU1_CRU			156</div><div class='add'>+#define SRST_H_PMU1_MEM			157</div><div class='add'>+#define SRST_H_PMU1_BIU			158</div><div class='add'>+#define SRST_P_PMU1_BIU			159</div><div class='add'>+#define SRST_P_PMU1_UART0		160</div><div class='add'>+#define SRST_S_PMU1_UART0		161</div><div class='add'>+/********Name=PMU1SOFTRST_CON01,Offset=0x18204********/</div><div class='add'>+#define SRST_P_PMU1_SPI0		162</div><div class='add'>+#define SRST_PMU1_SPI0			163</div><div class='add'>+#define SRST_P_PMU1_PWM0		164</div><div class='add'>+#define SRST_PMU1_PWM0			165</div><div class='add'>+/********Name=PMU1SOFTRST_CON02,Offset=0x18208********/</div><div class='add'>+#define SRST_F_PMU1_CM0_CORE		166</div><div class='add'>+#define SRST_T_PMU1_CM0_JTAG		167</div><div class='add'>+#define SRST_P_PMU1_WDTNS		168</div><div class='add'>+#define SRST_PMU1_WDTNS			169</div><div class='add'>+#define SRST_PMU1_MAILBOX		170</div><div class='add'>+</div><div class='add'>+/********Name=DDRSOFTRST_CON00,Offset=0x20200********/</div><div class='add'>+#define SRST_MSCH_BRG_BIU		171</div><div class='add'>+#define SRST_P_MSCH_BIU			172</div><div class='add'>+#define SRST_P_DDR_HWLP			173</div><div class='add'>+#define SRST_P_DDR_PHY			290</div><div class='add'>+#define SRST_P_DDR_DFICTL		174</div><div class='add'>+#define SRST_P_DDR_DMA2DDR		175</div><div class='add'>+/********Name=DDRSOFTRST_CON01,Offset=0x20204********/</div><div class='add'>+#define SRST_P_DDR_MON			176</div><div class='add'>+#define SRST_TM_DDR_MON			177</div><div class='add'>+#define SRST_P_DDR_GRF			178</div><div class='add'>+#define SRST_P_DDR_CRU			179</div><div class='add'>+#define SRST_P_SUBDDR_CRU		180</div><div class='add'>+</div><div class='add'>+/********Name=SUBDDRSOFTRST_CON00,Offset=0x28200********/</div><div class='add'>+#define SRST_MSCH_BIU			181</div><div class='add'>+#define SRST_DDR_PHY			182</div><div class='add'>+#define SRST_DDR_DFICTL			183</div><div class='add'>+#define SRST_DDR_SCRAMBLE		184</div><div class='add'>+#define SRST_DDR_MON			185</div><div class='add'>+#define SRST_A_DDR_SPLIT		186</div><div class='add'>+#define SRST_DDR_DMA2DDR		187</div><div class='add'>+</div><div class='add'>+/********Name=PERISOFTRST_CON01,Offset=0x30404********/</div><div class='add'>+#define SRST_A_PERI_BIU			188</div><div class='add'>+#define SRST_H_PERI_BIU			189</div><div class='add'>+#define SRST_P_PERI_BIU			190</div><div class='add'>+#define SRST_P_PERICRU			191</div><div class='add'>+/********Name=PERISOFTRST_CON02,Offset=0x30408********/</div><div class='add'>+#define SRST_H_SAI0_8CH			192</div><div class='add'>+#define SRST_M_SAI0_8CH			193</div><div class='add'>+#define SRST_H_SAI1_8CH			194</div><div class='add'>+#define SRST_M_SAI1_8CH			195</div><div class='add'>+#define SRST_H_SAI2_2CH			196</div><div class='add'>+#define SRST_M_SAI2_2CH			197</div><div class='add'>+/********Name=PERISOFTRST_CON03,Offset=0x3040C********/</div><div class='add'>+#define SRST_H_DSM			198</div><div class='add'>+#define SRST_DSM			199</div><div class='add'>+#define SRST_H_PDM			200</div><div class='add'>+#define SRST_M_PDM			201</div><div class='add'>+#define SRST_H_SPDIF			202</div><div class='add'>+#define SRST_M_SPDIF			203</div><div class='add'>+/********Name=PERISOFTRST_CON04,Offset=0x30410********/</div><div class='add'>+#define SRST_H_SDMMC0			204</div><div class='add'>+#define SRST_H_SDMMC1			205</div><div class='add'>+#define SRST_H_EMMC			206</div><div class='add'>+#define SRST_A_EMMC			207</div><div class='add'>+#define SRST_C_EMMC			208</div><div class='add'>+#define SRST_B_EMMC			209</div><div class='add'>+#define SRST_T_EMMC			210</div><div class='add'>+#define SRST_S_SFC			211</div><div class='add'>+#define SRST_H_SFC			212</div><div class='add'>+/********Name=PERISOFTRST_CON05,Offset=0x30414********/</div><div class='add'>+#define SRST_H_USB2HOST			213</div><div class='add'>+#define SRST_H_USB2HOST_ARB		214</div><div class='add'>+#define SRST_USB2HOST_UTMI		215</div><div class='add'>+/********Name=PERISOFTRST_CON06,Offset=0x30418********/</div><div class='add'>+#define SRST_P_SPI1			216</div><div class='add'>+#define SRST_SPI1			217</div><div class='add'>+#define SRST_P_SPI2			218</div><div class='add'>+#define SRST_SPI2			219</div><div class='add'>+/********Name=PERISOFTRST_CON07,Offset=0x3041C********/</div><div class='add'>+#define SRST_P_UART1			220</div><div class='add'>+#define SRST_P_UART2			221</div><div class='add'>+#define SRST_P_UART3			222</div><div class='add'>+#define SRST_P_UART4			223</div><div class='add'>+#define SRST_P_UART5			224</div><div class='add'>+#define SRST_P_UART6			225</div><div class='add'>+#define SRST_P_UART7			226</div><div class='add'>+#define SRST_P_UART8			227</div><div class='add'>+#define SRST_P_UART9			228</div><div class='add'>+#define SRST_S_UART1			229</div><div class='add'>+#define SRST_S_UART2			230</div><div class='add'>+/********Name=PERISOFTRST_CON08,Offset=0x30420********/</div><div class='add'>+#define SRST_S_UART3			231</div><div class='add'>+#define SRST_S_UART4			232</div><div class='add'>+#define SRST_S_UART5			233</div><div class='add'>+#define SRST_S_UART6			234</div><div class='add'>+#define SRST_S_UART7			235</div><div class='add'>+/********Name=PERISOFTRST_CON09,Offset=0x30424********/</div><div class='add'>+#define SRST_S_UART8			236</div><div class='add'>+#define SRST_S_UART9			237</div><div class='add'>+/********Name=PERISOFTRST_CON10,Offset=0x30428********/</div><div class='add'>+#define SRST_P_PWM1_PERI		238</div><div class='add'>+#define SRST_PWM1_PERI			239</div><div class='add'>+#define SRST_P_PWM2_PERI		240</div><div class='add'>+#define SRST_PWM2_PERI			241</div><div class='add'>+#define SRST_P_PWM3_PERI		242</div><div class='add'>+#define SRST_PWM3_PERI			243</div><div class='add'>+/********Name=PERISOFTRST_CON11,Offset=0x3042C********/</div><div class='add'>+#define SRST_P_CAN0			244</div><div class='add'>+#define SRST_CAN0			245</div><div class='add'>+#define SRST_P_CAN1			246</div><div class='add'>+#define SRST_CAN1			247</div><div class='add'>+/********Name=PERISOFTRST_CON12,Offset=0x30430********/</div><div class='add'>+#define SRST_A_CRYPTO			248</div><div class='add'>+#define SRST_H_CRYPTO			249</div><div class='add'>+#define SRST_P_CRYPTO			250</div><div class='add'>+#define SRST_CORE_CRYPTO		251</div><div class='add'>+#define SRST_PKA_CRYPTO			252</div><div class='add'>+#define SRST_H_KLAD			253</div><div class='add'>+#define SRST_P_KEY_READER		254</div><div class='add'>+#define SRST_H_RK_RNG_NS		255</div><div class='add'>+#define SRST_H_RK_RNG_S			256</div><div class='add'>+#define SRST_H_TRNG_NS			257</div><div class='add'>+#define SRST_H_TRNG_S			258</div><div class='add'>+#define SRST_H_CRYPTO_S			259</div><div class='add'>+/********Name=PERISOFTRST_CON13,Offset=0x30434********/</div><div class='add'>+#define SRST_P_PERI_WDT			260</div><div class='add'>+#define SRST_T_PERI_WDT			261</div><div class='add'>+#define SRST_A_SYSMEM			262</div><div class='add'>+#define SRST_H_BOOTROM			263</div><div class='add'>+#define SRST_P_PERI_GRF			264</div><div class='add'>+#define SRST_A_DMAC			265</div><div class='add'>+#define SRST_A_RKDMAC			267</div><div class='add'>+/********Name=PERISOFTRST_CON14,Offset=0x30438********/</div><div class='add'>+#define SRST_P_OTPC_NS			268</div><div class='add'>+#define SRST_SBPI_OTPC_NS		269</div><div class='add'>+#define SRST_USER_OTPC_NS		270</div><div class='add'>+#define SRST_P_OTPC_S			271</div><div class='add'>+#define SRST_SBPI_OTPC_S		272</div><div class='add'>+#define SRST_USER_OTPC_S		273</div><div class='add'>+#define SRST_OTPC_ARB			274</div><div class='add'>+#define SRST_P_OTPPHY			275</div><div class='add'>+#define SRST_OTP_NPOR			276</div><div class='add'>+/********Name=PERISOFTRST_CON15,Offset=0x3043C********/</div><div class='add'>+#define SRST_P_USB2PHY			277</div><div class='add'>+#define SRST_USB2PHY_POR		278</div><div class='add'>+#define SRST_USB2PHY_OTG		279</div><div class='add'>+#define SRST_USB2PHY_HOST		280</div><div class='add'>+#define SRST_P_PIPEPHY			281</div><div class='add'>+/********Name=PERISOFTRST_CON16,Offset=0x30440********/</div><div class='add'>+#define SRST_P_SARADC			282</div><div class='add'>+#define SRST_SARADC			283</div><div class='add'>+#define SRST_SARADC_PHY			284</div><div class='add'>+#define SRST_P_IOC_VCCIO234		285</div><div class='add'>+/********Name=PERISOFTRST_CON17,Offset=0x30444********/</div><div class='add'>+#define SRST_P_PERI_GPIO1		286</div><div class='add'>+#define SRST_P_PERI_GPIO2		287</div><div class='add'>+#define SRST_PERI_GPIO1			288</div><div class='add'>+#define SRST_PERI_GPIO2			289</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/rockchip,rk3576-cru.h b/include/dt-bindings/reset/rockchip,rk3576-cru.h<br/>new file mode 100644<br/>index 000000000000..ae856906f3a3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/rockchip,rk3576-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/rockchip,rk3576-cru.h</a></div><div class='hunk'>@@ -0,0 +1,564 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Rockchip Electronics Co. Ltd.</div><div class='add'>+ * Copyright (c) 2024 Collabora Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Author: Elaine Zhang &lt;zhangqing@rock-chips.com&gt;</div><div class='add'>+ * Author: Detlev Casanova &lt;detlev.casanova@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_ROCKCHIP_RK3576_H</div><div class='add'>+#define _DT_BINDINGS_RESET_ROCKCHIP_RK3576_H</div><div class='add'>+</div><div class='add'>+#define SRST_A_TOP_BIU			0</div><div class='add'>+#define SRST_P_TOP_BIU			1</div><div class='add'>+#define SRST_A_TOP_MID_BIU		2</div><div class='add'>+#define SRST_A_SECURE_HIGH_BIU		3</div><div class='add'>+#define SRST_H_TOP_BIU			4</div><div class='add'>+</div><div class='add'>+#define SRST_H_VO0VOP_CHANNEL_BIU	5</div><div class='add'>+#define SRST_A_VO0VOP_CHANNEL_BIU	6</div><div class='add'>+</div><div class='add'>+#define SRST_BISRINTF			7</div><div class='add'>+</div><div class='add'>+#define SRST_H_AUDIO_BIU		8</div><div class='add'>+#define SRST_H_ASRC_2CH_0		9</div><div class='add'>+#define SRST_H_ASRC_2CH_1		10</div><div class='add'>+#define SRST_H_ASRC_4CH_0		11</div><div class='add'>+#define SRST_H_ASRC_4CH_1		12</div><div class='add'>+#define SRST_ASRC_2CH_0			13</div><div class='add'>+#define SRST_ASRC_2CH_1			14</div><div class='add'>+#define SRST_ASRC_4CH_0			15</div><div class='add'>+#define SRST_ASRC_4CH_1			16</div><div class='add'>+#define SRST_M_SAI0_8CH			17</div><div class='add'>+#define SRST_H_SAI0_8CH			18</div><div class='add'>+#define SRST_H_SPDIF_RX0		19</div><div class='add'>+#define SRST_M_SPDIF_RX0		20</div><div class='add'>+</div><div class='add'>+#define SRST_H_SPDIF_RX1		21</div><div class='add'>+#define SRST_M_SPDIF_RX1		22</div><div class='add'>+#define SRST_M_SAI1_8CH			23</div><div class='add'>+#define SRST_H_SAI1_8CH			24</div><div class='add'>+#define SRST_M_SAI2_2CH			25</div><div class='add'>+#define SRST_H_SAI2_2CH			26</div><div class='add'>+#define SRST_M_SAI3_2CH			27</div><div class='add'>+#define SRST_H_SAI3_2CH			28</div><div class='add'>+</div><div class='add'>+#define SRST_M_SAI4_2CH			29</div><div class='add'>+#define SRST_H_SAI4_2CH			30</div><div class='add'>+#define SRST_H_ACDCDIG_DSM		31</div><div class='add'>+#define SRST_M_ACDCDIG_DSM		32</div><div class='add'>+#define SRST_PDM1			33</div><div class='add'>+#define SRST_H_PDM1			34</div><div class='add'>+#define SRST_M_PDM1			35</div><div class='add'>+#define SRST_H_SPDIF_TX0		36</div><div class='add'>+#define SRST_M_SPDIF_TX0		37</div><div class='add'>+#define SRST_H_SPDIF_TX1		38</div><div class='add'>+#define SRST_M_SPDIF_TX1		39</div><div class='add'>+</div><div class='add'>+#define SRST_A_BUS_BIU			40</div><div class='add'>+#define SRST_P_BUS_BIU			41</div><div class='add'>+#define SRST_P_CRU			42</div><div class='add'>+#define SRST_H_CAN0			43</div><div class='add'>+#define SRST_CAN0			44</div><div class='add'>+#define SRST_H_CAN1			45</div><div class='add'>+#define SRST_CAN1			46</div><div class='add'>+#define SRST_P_INTMUX2BUS		47</div><div class='add'>+#define SRST_P_VCCIO_IOC		48</div><div class='add'>+#define SRST_H_BUS_BIU			49</div><div class='add'>+#define SRST_KEY_SHIFT			50</div><div class='add'>+</div><div class='add'>+#define SRST_P_I2C1			51</div><div class='add'>+#define SRST_P_I2C2			52</div><div class='add'>+#define SRST_P_I2C3			53</div><div class='add'>+#define SRST_P_I2C4			54</div><div class='add'>+#define SRST_P_I2C5			55</div><div class='add'>+#define SRST_P_I2C6			56</div><div class='add'>+#define SRST_P_I2C7			57</div><div class='add'>+#define SRST_P_I2C8			58</div><div class='add'>+#define SRST_P_I2C9			59</div><div class='add'>+#define SRST_P_WDT_BUSMCU		60</div><div class='add'>+#define SRST_T_WDT_BUSMCU		61</div><div class='add'>+#define SRST_A_GIC			62</div><div class='add'>+#define SRST_I2C1			63</div><div class='add'>+#define SRST_I2C2			64</div><div class='add'>+#define SRST_I2C3			65</div><div class='add'>+#define SRST_I2C4			66</div><div class='add'>+</div><div class='add'>+#define SRST_I2C5			67</div><div class='add'>+#define SRST_I2C6			68</div><div class='add'>+#define SRST_I2C7			69</div><div class='add'>+#define SRST_I2C8			70</div><div class='add'>+#define SRST_I2C9			71</div><div class='add'>+#define SRST_P_SARADC			72</div><div class='add'>+#define SRST_SARADC			73</div><div class='add'>+#define SRST_P_TSADC			74</div><div class='add'>+#define SRST_TSADC			75</div><div class='add'>+#define SRST_P_UART0			76</div><div class='add'>+#define SRST_P_UART2			77</div><div class='add'>+#define SRST_P_UART3			78</div><div class='add'>+#define SRST_P_UART4			79</div><div class='add'>+#define SRST_P_UART5			80</div><div class='add'>+#define SRST_P_UART6			81</div><div class='add'>+</div><div class='add'>+#define SRST_P_UART7			82</div><div class='add'>+#define SRST_P_UART8			83</div><div class='add'>+#define SRST_P_UART9			84</div><div class='add'>+#define SRST_P_UART10			85</div><div class='add'>+#define SRST_P_UART11			86</div><div class='add'>+#define SRST_S_UART0			87</div><div class='add'>+#define SRST_S_UART2			88</div><div class='add'>+#define SRST_S_UART3			89</div><div class='add'>+#define SRST_S_UART4			90</div><div class='add'>+#define SRST_S_UART5			91</div><div class='add'>+</div><div class='add'>+#define SRST_S_UART6			92</div><div class='add'>+#define SRST_S_UART7			93</div><div class='add'>+#define SRST_S_UART8			94</div><div class='add'>+#define SRST_S_UART9			95</div><div class='add'>+#define SRST_S_UART10			96</div><div class='add'>+#define SRST_S_UART11			97</div><div class='add'>+#define SRST_P_SPI0			98</div><div class='add'>+#define SRST_P_SPI1			99</div><div class='add'>+#define SRST_P_SPI2			100</div><div class='add'>+</div><div class='add'>+#define SRST_P_SPI3			101</div><div class='add'>+#define SRST_P_SPI4			102</div><div class='add'>+#define SRST_SPI0			103</div><div class='add'>+#define SRST_SPI1			104</div><div class='add'>+#define SRST_SPI2			105</div><div class='add'>+#define SRST_SPI3			106</div><div class='add'>+#define SRST_SPI4			107</div><div class='add'>+#define SRST_P_WDT0			108</div><div class='add'>+#define SRST_T_WDT0			109</div><div class='add'>+#define SRST_P_SYS_GRF			110</div><div class='add'>+#define SRST_P_PWM1			111</div><div class='add'>+#define SRST_PWM1			112</div><div class='add'>+</div><div class='add'>+#define SRST_P_BUSTIMER0		113</div><div class='add'>+#define SRST_P_BUSTIMER1		114</div><div class='add'>+#define SRST_TIMER0			115</div><div class='add'>+#define SRST_TIMER1			116</div><div class='add'>+#define SRST_TIMER2			117</div><div class='add'>+#define SRST_TIMER3			118</div><div class='add'>+#define SRST_TIMER4			119</div><div class='add'>+#define SRST_TIMER5			120</div><div class='add'>+#define SRST_P_BUSIOC			121</div><div class='add'>+#define SRST_P_MAILBOX0			122</div><div class='add'>+#define SRST_P_GPIO1			123</div><div class='add'>+</div><div class='add'>+#define SRST_GPIO1			124</div><div class='add'>+#define SRST_P_GPIO2			125</div><div class='add'>+#define SRST_GPIO2			126</div><div class='add'>+#define SRST_P_GPIO3			127</div><div class='add'>+#define SRST_GPIO3			128</div><div class='add'>+#define SRST_P_GPIO4			129</div><div class='add'>+#define SRST_GPIO4			130</div><div class='add'>+#define SRST_A_DECOM			131</div><div class='add'>+#define SRST_P_DECOM			132</div><div class='add'>+#define SRST_D_DECOM			133</div><div class='add'>+#define SRST_TIMER6			134</div><div class='add'>+#define SRST_TIMER7			135</div><div class='add'>+#define SRST_TIMER8			136</div><div class='add'>+#define SRST_TIMER9			137</div><div class='add'>+#define SRST_TIMER10			138</div><div class='add'>+</div><div class='add'>+#define SRST_TIMER11			139</div><div class='add'>+#define SRST_A_DMAC0			140</div><div class='add'>+#define SRST_A_DMAC1			141</div><div class='add'>+#define SRST_A_DMAC2			142</div><div class='add'>+#define SRST_A_SPINLOCK			143</div><div class='add'>+#define SRST_REF_PVTPLL_BUS		144</div><div class='add'>+#define SRST_H_I3C0			145</div><div class='add'>+#define SRST_H_I3C1			146</div><div class='add'>+#define SRST_H_BUS_CM0_BIU		147</div><div class='add'>+#define SRST_F_BUS_CM0_CORE		148</div><div class='add'>+#define SRST_T_BUS_CM0_JTAG		149</div><div class='add'>+</div><div class='add'>+#define SRST_P_INTMUX2PMU		150</div><div class='add'>+#define SRST_P_INTMUX2DDR		151</div><div class='add'>+#define SRST_P_PVTPLL_BUS		152</div><div class='add'>+#define SRST_P_PWM2			153</div><div class='add'>+#define SRST_PWM2			154</div><div class='add'>+#define SRST_FREQ_PWM1			155</div><div class='add'>+#define SRST_COUNTER_PWM1		156</div><div class='add'>+#define SRST_I3C0			157</div><div class='add'>+#define SRST_I3C1			158</div><div class='add'>+</div><div class='add'>+#define SRST_P_DDR_MON_CH0		159</div><div class='add'>+#define SRST_P_DDR_BIU			160</div><div class='add'>+#define SRST_P_DDR_UPCTL_CH0		161</div><div class='add'>+#define SRST_TM_DDR_MON_CH0		162</div><div class='add'>+#define SRST_A_DDR_BIU			163</div><div class='add'>+#define SRST_DFI_CH0			164</div><div class='add'>+#define SRST_DDR_MON_CH0		165</div><div class='add'>+#define SRST_P_DDR_HWLP_CH0		166</div><div class='add'>+#define SRST_P_DDR_MON_CH1		167</div><div class='add'>+#define SRST_P_DDR_HWLP_CH1		168</div><div class='add'>+</div><div class='add'>+#define SRST_P_DDR_UPCTL_CH1		169</div><div class='add'>+#define SRST_TM_DDR_MON_CH1		170</div><div class='add'>+#define SRST_DFI_CH1			171</div><div class='add'>+#define SRST_A_DDR01_MSCH0		172</div><div class='add'>+#define SRST_A_DDR01_MSCH1		173</div><div class='add'>+#define SRST_DDR_MON_CH1		174</div><div class='add'>+#define SRST_DDR_SCRAMBLE_CH0		175</div><div class='add'>+#define SRST_DDR_SCRAMBLE_CH1		176</div><div class='add'>+#define SRST_P_AHB2APB			177</div><div class='add'>+#define SRST_H_AHB2APB			178</div><div class='add'>+#define SRST_H_DDR_BIU			179</div><div class='add'>+#define SRST_F_DDR_CM0_CORE		180</div><div class='add'>+</div><div class='add'>+#define SRST_P_DDR01_MSCH0		181</div><div class='add'>+#define SRST_P_DDR01_MSCH1		182</div><div class='add'>+#define SRST_DDR_TIMER0			183</div><div class='add'>+#define SRST_DDR_TIMER1			184</div><div class='add'>+#define SRST_T_WDT_DDR			185</div><div class='add'>+#define SRST_P_WDT			186</div><div class='add'>+#define SRST_P_TIMER			187</div><div class='add'>+#define SRST_T_DDR_CM0_JTAG		188</div><div class='add'>+#define SRST_P_DDR_GRF			189</div><div class='add'>+</div><div class='add'>+#define SRST_DDR_UPCTL_CH0		190</div><div class='add'>+#define SRST_A_DDR_UPCTL_0_CH0		191</div><div class='add'>+#define SRST_A_DDR_UPCTL_1_CH0		192</div><div class='add'>+#define SRST_A_DDR_UPCTL_2_CH0		193</div><div class='add'>+#define SRST_A_DDR_UPCTL_3_CH0		194</div><div class='add'>+#define SRST_A_DDR_UPCTL_4_CH0		195</div><div class='add'>+</div><div class='add'>+#define SRST_DDR_UPCTL_CH1		196</div><div class='add'>+#define SRST_A_DDR_UPCTL_0_CH1		197</div><div class='add'>+#define SRST_A_DDR_UPCTL_1_CH1		198</div><div class='add'>+#define SRST_A_DDR_UPCTL_2_CH1		199</div><div class='add'>+#define SRST_A_DDR_UPCTL_3_CH1		200</div><div class='add'>+#define SRST_A_DDR_UPCTL_4_CH1		201</div><div class='add'>+</div><div class='add'>+#define SRST_REF_PVTPLL_DDR		202</div><div class='add'>+#define SRST_P_PVTPLL_DDR		203</div><div class='add'>+</div><div class='add'>+#define SRST_A_RKNN0			204</div><div class='add'>+#define SRST_A_RKNN0_BIU		205</div><div class='add'>+#define SRST_L_RKNN0_BIU		206</div><div class='add'>+</div><div class='add'>+#define SRST_A_RKNN1			207</div><div class='add'>+#define SRST_A_RKNN1_BIU		208</div><div class='add'>+#define SRST_L_RKNN1_BIU		209</div><div class='add'>+</div><div class='add'>+#define SRST_NPU_DAP			210</div><div class='add'>+#define SRST_L_NPUSUBSYS_BIU		211</div><div class='add'>+#define SRST_P_NPUTOP_BIU		212</div><div class='add'>+#define SRST_P_NPU_TIMER		213</div><div class='add'>+#define SRST_NPUTIMER0			214</div><div class='add'>+#define SRST_NPUTIMER1			215</div><div class='add'>+#define SRST_P_NPU_WDT			216</div><div class='add'>+#define SRST_T_NPU_WDT			217</div><div class='add'>+</div><div class='add'>+#define SRST_A_RKNN_CBUF		218</div><div class='add'>+#define SRST_A_RVCORE0			219</div><div class='add'>+#define SRST_P_NPU_GRF			220</div><div class='add'>+#define SRST_P_PVTPLL_NPU		221</div><div class='add'>+#define SRST_NPU_PVTPLL			222</div><div class='add'>+#define SRST_H_NPU_CM0_BIU		223</div><div class='add'>+#define SRST_F_NPU_CM0_CORE		224</div><div class='add'>+#define SRST_T_NPU_CM0_JTAG		225</div><div class='add'>+#define SRST_A_RKNNTOP_BIU		226</div><div class='add'>+#define SRST_H_RKNN_CBUF		227</div><div class='add'>+#define SRST_H_RKNNTOP_BIU		228</div><div class='add'>+</div><div class='add'>+#define SRST_H_NVM_BIU			229</div><div class='add'>+#define SRST_A_NVM_BIU			230</div><div class='add'>+#define SRST_S_FSPI			231</div><div class='add'>+#define SRST_H_FSPI			232</div><div class='add'>+#define SRST_C_EMMC			233</div><div class='add'>+#define SRST_H_EMMC			234</div><div class='add'>+#define SRST_A_EMMC			235</div><div class='add'>+#define SRST_B_EMMC			236</div><div class='add'>+#define SRST_T_EMMC			237</div><div class='add'>+</div><div class='add'>+#define SRST_P_GRF			238</div><div class='add'>+#define SRST_P_PHP_BIU			239</div><div class='add'>+#define SRST_A_PHP_BIU			240</div><div class='add'>+#define SRST_P_PCIE0			241</div><div class='add'>+#define SRST_PCIE0_POWER_UP		242</div><div class='add'>+</div><div class='add'>+#define SRST_A_USB3OTG1			243</div><div class='add'>+#define SRST_A_MMU0			244</div><div class='add'>+#define SRST_A_SLV_MMU0			245</div><div class='add'>+#define SRST_A_MMU1			246</div><div class='add'>+</div><div class='add'>+#define SRST_A_SLV_MMU1			247</div><div class='add'>+#define SRST_P_PCIE1			248</div><div class='add'>+#define SRST_PCIE1_POWER_UP		249</div><div class='add'>+</div><div class='add'>+#define SRST_RXOOB0			250</div><div class='add'>+#define SRST_RXOOB1			251</div><div class='add'>+#define SRST_PMALIVE0			252</div><div class='add'>+#define SRST_PMALIVE1			253</div><div class='add'>+#define SRST_A_SATA0			254</div><div class='add'>+#define SRST_A_SATA1			255</div><div class='add'>+#define SRST_ASIC1			256</div><div class='add'>+#define SRST_ASIC0			257</div><div class='add'>+</div><div class='add'>+#define SRST_P_CSIDPHY1			258</div><div class='add'>+#define SRST_SCAN_CSIDPHY1		259</div><div class='add'>+</div><div class='add'>+#define SRST_P_SDGMAC_GRF		260</div><div class='add'>+#define SRST_P_SDGMAC_BIU		261</div><div class='add'>+#define SRST_A_SDGMAC_BIU		262</div><div class='add'>+#define SRST_H_SDGMAC_BIU		263</div><div class='add'>+#define SRST_A_GMAC0			264</div><div class='add'>+#define SRST_A_GMAC1			265</div><div class='add'>+#define SRST_P_GMAC0			266</div><div class='add'>+#define SRST_P_GMAC1			267</div><div class='add'>+#define SRST_H_SDIO			268</div><div class='add'>+</div><div class='add'>+#define SRST_H_SDMMC0			269</div><div class='add'>+#define SRST_S_FSPI1			270</div><div class='add'>+#define SRST_H_FSPI1			271</div><div class='add'>+#define SRST_A_DSMC_BIU			272</div><div class='add'>+#define SRST_A_DSMC			273</div><div class='add'>+#define SRST_P_DSMC			274</div><div class='add'>+#define SRST_H_HSGPIO			275</div><div class='add'>+#define SRST_HSGPIO			276</div><div class='add'>+#define SRST_A_HSGPIO			277</div><div class='add'>+</div><div class='add'>+#define SRST_H_RKVDEC			278</div><div class='add'>+#define SRST_H_RKVDEC_BIU		279</div><div class='add'>+#define SRST_A_RKVDEC_BIU		280</div><div class='add'>+#define SRST_RKVDEC_HEVC_CA		281</div><div class='add'>+#define SRST_RKVDEC_CORE		282</div><div class='add'>+</div><div class='add'>+#define SRST_A_USB_BIU			283</div><div class='add'>+#define SRST_P_USBUFS_BIU		284</div><div class='add'>+#define SRST_A_USB3OTG0			285</div><div class='add'>+#define SRST_A_UFS_BIU			286</div><div class='add'>+#define SRST_A_MMU2			287</div><div class='add'>+#define SRST_A_SLV_MMU2			288</div><div class='add'>+#define SRST_A_UFS_SYS			289</div><div class='add'>+</div><div class='add'>+#define SRST_A_UFS			290</div><div class='add'>+#define SRST_P_USBUFS_GRF		291</div><div class='add'>+#define SRST_P_UFS_GRF			292</div><div class='add'>+</div><div class='add'>+#define SRST_H_VPU_BIU			293</div><div class='add'>+#define SRST_A_JPEG_BIU			294</div><div class='add'>+#define SRST_A_RGA_BIU			295</div><div class='add'>+#define SRST_A_VDPP_BIU			296</div><div class='add'>+#define SRST_A_EBC_BIU			297</div><div class='add'>+#define SRST_H_RGA2E_0			298</div><div class='add'>+#define SRST_A_RGA2E_0			299</div><div class='add'>+#define SRST_CORE_RGA2E_0		300</div><div class='add'>+</div><div class='add'>+#define SRST_A_JPEG			301</div><div class='add'>+#define SRST_H_JPEG			302</div><div class='add'>+#define SRST_H_VDPP			303</div><div class='add'>+#define SRST_A_VDPP			304</div><div class='add'>+#define SRST_CORE_VDPP			305</div><div class='add'>+#define SRST_H_RGA2E_1			306</div><div class='add'>+#define SRST_A_RGA2E_1			307</div><div class='add'>+#define SRST_CORE_RGA2E_1		308</div><div class='add'>+#define SRST_H_EBC			309</div><div class='add'>+#define SRST_A_EBC			310</div><div class='add'>+#define SRST_D_EBC			311</div><div class='add'>+</div><div class='add'>+#define SRST_H_VEPU0_BIU		312</div><div class='add'>+#define SRST_A_VEPU0_BIU		313</div><div class='add'>+#define SRST_H_VEPU0			314</div><div class='add'>+#define SRST_A_VEPU0			315</div><div class='add'>+#define SRST_VEPU0_CORE			316</div><div class='add'>+</div><div class='add'>+#define SRST_A_VI_BIU			317</div><div class='add'>+#define SRST_H_VI_BIU			318</div><div class='add'>+#define SRST_P_VI_BIU			319</div><div class='add'>+#define SRST_D_VICAP			320</div><div class='add'>+#define SRST_A_VICAP			321</div><div class='add'>+#define SRST_H_VICAP			322</div><div class='add'>+#define SRST_ISP0			323</div><div class='add'>+#define SRST_ISP0_VICAP			324</div><div class='add'>+</div><div class='add'>+#define SRST_CORE_VPSS			325</div><div class='add'>+#define SRST_P_CSI_HOST_0		326</div><div class='add'>+#define SRST_P_CSI_HOST_1		327</div><div class='add'>+#define SRST_P_CSI_HOST_2		328</div><div class='add'>+#define SRST_P_CSI_HOST_3		329</div><div class='add'>+#define SRST_P_CSI_HOST_4		330</div><div class='add'>+</div><div class='add'>+#define SRST_CIFIN			331</div><div class='add'>+#define SRST_VICAP_I0CLK		332</div><div class='add'>+#define SRST_VICAP_I1CLK		333</div><div class='add'>+#define SRST_VICAP_I2CLK		334</div><div class='add'>+#define SRST_VICAP_I3CLK		335</div><div class='add'>+#define SRST_VICAP_I4CLK		336</div><div class='add'>+</div><div class='add'>+#define SRST_A_VOP_BIU			337</div><div class='add'>+#define SRST_A_VOP2_BIU			338</div><div class='add'>+#define SRST_H_VOP_BIU			339</div><div class='add'>+#define SRST_P_VOP_BIU			340</div><div class='add'>+#define SRST_H_VOP			341</div><div class='add'>+#define SRST_A_VOP			342</div><div class='add'>+#define SRST_D_VP0			343</div><div class='add'>+</div><div class='add'>+#define SRST_D_VP1			344</div><div class='add'>+#define SRST_D_VP2			345</div><div class='add'>+#define SRST_P_VOP2_BIU			346</div><div class='add'>+#define SRST_P_VOPGRF			347</div><div class='add'>+</div><div class='add'>+#define SRST_H_VO0_BIU			348</div><div class='add'>+#define SRST_P_VO0_BIU			349</div><div class='add'>+#define SRST_A_HDCP0_BIU		350</div><div class='add'>+#define SRST_P_VO0_GRF			351</div><div class='add'>+#define SRST_A_HDCP0			352</div><div class='add'>+#define SRST_H_HDCP0			353</div><div class='add'>+#define SRST_HDCP0			354</div><div class='add'>+</div><div class='add'>+#define SRST_P_DSIHOST0			355</div><div class='add'>+#define SRST_DSIHOST0			356</div><div class='add'>+#define SRST_P_HDMITX0			357</div><div class='add'>+#define SRST_HDMITX0_REF		358</div><div class='add'>+#define SRST_P_EDP0			359</div><div class='add'>+#define SRST_EDP0_24M			360</div><div class='add'>+</div><div class='add'>+#define SRST_M_SAI5_8CH			361</div><div class='add'>+#define SRST_H_SAI5_8CH			362</div><div class='add'>+#define SRST_M_SAI6_8CH			363</div><div class='add'>+#define SRST_H_SAI6_8CH			364</div><div class='add'>+#define SRST_H_SPDIF_TX2		365</div><div class='add'>+#define SRST_M_SPDIF_TX2		366</div><div class='add'>+#define SRST_H_SPDIF_RX2		367</div><div class='add'>+#define SRST_M_SPDIF_RX2		368</div><div class='add'>+</div><div class='add'>+#define SRST_H_SAI8_8CH			369</div><div class='add'>+#define SRST_M_SAI8_8CH			370</div><div class='add'>+</div><div class='add'>+#define SRST_H_VO1_BIU			371</div><div class='add'>+#define SRST_P_VO1_BIU			372</div><div class='add'>+#define SRST_M_SAI7_8CH			373</div><div class='add'>+#define SRST_H_SAI7_8CH			374</div><div class='add'>+#define SRST_H_SPDIF_TX3		375</div><div class='add'>+#define SRST_H_SPDIF_TX4		376</div><div class='add'>+#define SRST_H_SPDIF_TX5		377</div><div class='add'>+#define SRST_M_SPDIF_TX3		378</div><div class='add'>+</div><div class='add'>+#define SRST_DP0			379</div><div class='add'>+#define SRST_P_VO1_GRF			380</div><div class='add'>+#define SRST_A_HDCP1_BIU		381</div><div class='add'>+#define SRST_A_HDCP1			382</div><div class='add'>+#define SRST_H_HDCP1			383</div><div class='add'>+#define SRST_HDCP1			384</div><div class='add'>+#define SRST_H_SAI9_8CH			385</div><div class='add'>+#define SRST_M_SAI9_8CH			386</div><div class='add'>+#define SRST_M_SPDIF_TX4		387</div><div class='add'>+#define SRST_M_SPDIF_TX5		388</div><div class='add'>+</div><div class='add'>+#define SRST_GPU			389</div><div class='add'>+#define SRST_A_S_GPU_BIU		390</div><div class='add'>+#define SRST_A_M0_GPU_BIU		391</div><div class='add'>+#define SRST_P_GPU_BIU			392</div><div class='add'>+#define SRST_P_GPU_GRF			393</div><div class='add'>+#define SRST_GPU_PVTPLL			394</div><div class='add'>+#define SRST_P_PVTPLL_GPU		395</div><div class='add'>+</div><div class='add'>+#define SRST_A_CENTER_BIU		396</div><div class='add'>+#define SRST_A_DMA2DDR			397</div><div class='add'>+#define SRST_A_DDR_SHAREMEM		398</div><div class='add'>+#define SRST_A_DDR_SHAREMEM_BIU		399</div><div class='add'>+#define SRST_H_CENTER_BIU		400</div><div class='add'>+#define SRST_P_CENTER_GRF		401</div><div class='add'>+#define SRST_P_DMA2DDR			402</div><div class='add'>+#define SRST_P_SHAREMEM			403</div><div class='add'>+#define SRST_P_CENTER_BIU		404</div><div class='add'>+</div><div class='add'>+#define SRST_LINKSYM_HDMITXPHY0		405</div><div class='add'>+</div><div class='add'>+#define SRST_DP0_PIXELCLK		406</div><div class='add'>+#define SRST_PHY_DP0_TX			407</div><div class='add'>+#define SRST_DP1_PIXELCLK		408</div><div class='add'>+#define SRST_DP2_PIXELCLK		409</div><div class='add'>+</div><div class='add'>+#define SRST_H_VEPU1_BIU		410</div><div class='add'>+#define SRST_A_VEPU1_BIU		411</div><div class='add'>+#define SRST_H_VEPU1			412</div><div class='add'>+#define SRST_A_VEPU1			413</div><div class='add'>+#define SRST_VEPU1_CORE			414</div><div class='add'>+</div><div class='add'>+#define SRST_P_PHPPHY_CRU		415</div><div class='add'>+#define SRST_P_APB2ASB_SLV_CHIP_TOP	416</div><div class='add'>+#define SRST_P_PCIE2_COMBOPHY0		417</div><div class='add'>+#define SRST_P_PCIE2_COMBOPHY0_GRF	418</div><div class='add'>+#define SRST_P_PCIE2_COMBOPHY1		419</div><div class='add'>+#define SRST_P_PCIE2_COMBOPHY1_GRF	420</div><div class='add'>+</div><div class='add'>+#define SRST_PCIE0_PIPE_PHY		421</div><div class='add'>+#define SRST_PCIE1_PIPE_PHY		422</div><div class='add'>+</div><div class='add'>+#define SRST_H_CRYPTO_NS		423</div><div class='add'>+#define SRST_H_TRNG_NS			424</div><div class='add'>+#define SRST_P_OTPC_NS			425</div><div class='add'>+#define SRST_OTPC_NS			426</div><div class='add'>+</div><div class='add'>+#define SRST_P_HDPTX_GRF		427</div><div class='add'>+#define SRST_P_HDPTX_APB		428</div><div class='add'>+#define SRST_P_MIPI_DCPHY		429</div><div class='add'>+#define SRST_P_DCPHY_GRF		430</div><div class='add'>+#define SRST_P_BOT0_APB2ASB		431</div><div class='add'>+#define SRST_P_BOT1_APB2ASB		432</div><div class='add'>+#define SRST_USB2DEBUG			433</div><div class='add'>+#define SRST_P_CSIPHY_GRF		434</div><div class='add'>+#define SRST_P_CSIPHY			435</div><div class='add'>+#define SRST_P_USBPHY_GRF_0		436</div><div class='add'>+#define SRST_P_USBPHY_GRF_1		437</div><div class='add'>+#define SRST_P_USBDP_GRF		438</div><div class='add'>+#define SRST_P_USBDPPHY			439</div><div class='add'>+#define SRST_USBDP_COMBO_PHY_INIT	440</div><div class='add'>+</div><div class='add'>+#define SRST_USBDP_COMBO_PHY_CMN	441</div><div class='add'>+#define SRST_USBDP_COMBO_PHY_LANE	442</div><div class='add'>+#define SRST_USBDP_COMBO_PHY_PCS	443</div><div class='add'>+#define SRST_M_MIPI_DCPHY		444</div><div class='add'>+#define SRST_S_MIPI_DCPHY		445</div><div class='add'>+#define SRST_SCAN_CSIPHY		446</div><div class='add'>+#define SRST_P_VCCIO6_IOC		447</div><div class='add'>+#define SRST_OTGPHY_0			448</div><div class='add'>+#define SRST_OTGPHY_1			449</div><div class='add'>+#define SRST_HDPTX_INIT			450</div><div class='add'>+#define SRST_HDPTX_CMN			451</div><div class='add'>+#define SRST_HDPTX_LANE			452</div><div class='add'>+#define SRST_HDMITXHDP			453</div><div class='add'>+</div><div class='add'>+#define SRST_MPHY_INIT			454</div><div class='add'>+#define SRST_P_MPHY_GRF			455</div><div class='add'>+#define SRST_P_VCCIO7_IOC		456</div><div class='add'>+</div><div class='add'>+#define SRST_H_PMU1_BIU			457</div><div class='add'>+#define SRST_P_PMU1_NIU			458</div><div class='add'>+#define SRST_H_PMU_CM0_BIU		459</div><div class='add'>+#define SRST_PMU_CM0_CORE		460</div><div class='add'>+#define SRST_PMU_CM0_JTAG		461</div><div class='add'>+</div><div class='add'>+#define SRST_P_CRU_PMU1			462</div><div class='add'>+#define SRST_P_PMU1_GRF			463</div><div class='add'>+#define SRST_P_PMU1_IOC			464</div><div class='add'>+#define SRST_P_PMU1WDT			465</div><div class='add'>+#define SRST_T_PMU1WDT			466</div><div class='add'>+#define SRST_P_PMUTIMER			467</div><div class='add'>+#define SRST_PMUTIMER0			468</div><div class='add'>+#define SRST_PMUTIMER1			469</div><div class='add'>+#define SRST_P_PMU1PWM			470</div><div class='add'>+#define SRST_PMU1PWM			471</div><div class='add'>+</div><div class='add'>+#define SRST_P_I2C0			472</div><div class='add'>+#define SRST_I2C0			473</div><div class='add'>+#define SRST_S_UART1			474</div><div class='add'>+#define SRST_P_UART1			475</div><div class='add'>+#define SRST_PDM0			476</div><div class='add'>+#define SRST_H_PDM0			477</div><div class='add'>+</div><div class='add'>+#define SRST_M_PDM0			478</div><div class='add'>+#define SRST_H_VAD			479</div><div class='add'>+</div><div class='add'>+#define SRST_P_PMU0GRF			480</div><div class='add'>+#define SRST_P_PMU0IOC			481</div><div class='add'>+#define SRST_P_GPIO0			482</div><div class='add'>+#define SRST_DB_GPIO0			483</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/rockchip,rk3588-cru.h b/include/dt-bindings/reset/rockchip,rk3588-cru.h<br/>index d4264db2a07f..878beae6dc3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/rockchip,rk3588-cru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/rockchip,rk3588-cru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/rockchip,rk3588-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/rockchip,rk3588-cru.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2021 Rockchip Electronics Co. Ltd.</div><div class='add'>+ * Copyright (c) 2021, 2024 Rockchip Electronics Co. Ltd.</div><div class='ctx'>  * Copyright (c) 2022 Collabora Ltd.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Elaine Zhang &lt;zhangqing@rock-chips.com&gt;</div><div class='hunk'>@@ -751,4 +751,45 @@</div><div class='ctx'> #define SRST_P_TRNG_CHK			658</div><div class='ctx'> #define SRST_TRNG_S			659</div><div class='ctx'> </div><div class='add'>+#define SRST_A_HDMIRX_BIU		660</div><div class='add'>+</div><div class='add'>+/* SCMI Secure Resets */</div><div class='add'>+</div><div class='add'>+/* Name=SECURE_SOFTRST_CON00,Offset=0xA00 */</div><div class='add'>+#define SCMI_SRST_A_SECURE_NS_BIU	10</div><div class='add'>+#define SCMI_SRST_H_SECURE_NS_BIU	11</div><div class='add'>+#define SCMI_SRST_A_SECURE_S_BIU	12</div><div class='add'>+#define SCMI_SRST_H_SECURE_S_BIU	13</div><div class='add'>+#define SCMI_SRST_P_SECURE_S_BIU	14</div><div class='add'>+#define SCMI_SRST_CRYPTO_CORE		15</div><div class='add'>+/* Name=SECURE_SOFTRST_CON01,Offset=0xA04 */</div><div class='add'>+#define SCMI_SRST_CRYPTO_PKA		16</div><div class='add'>+#define SCMI_SRST_CRYPTO_RNG		17</div><div class='add'>+#define SCMI_SRST_A_CRYPTO		18</div><div class='add'>+#define SCMI_SRST_H_CRYPTO		19</div><div class='add'>+#define SCMI_SRST_KEYLADDER_CORE	25</div><div class='add'>+#define SCMI_SRST_KEYLADDER_RNG		26</div><div class='add'>+#define SCMI_SRST_A_KEYLADDER		27</div><div class='add'>+#define SCMI_SRST_H_KEYLADDER		28</div><div class='add'>+#define SCMI_SRST_P_OTPC_S		29</div><div class='add'>+#define SCMI_SRST_OTPC_S		30</div><div class='add'>+#define SCMI_SRST_WDT_S			31</div><div class='add'>+/* Name=SECURE_SOFTRST_CON02,Offset=0xA08 */</div><div class='add'>+#define SCMI_SRST_T_WDT_S		32</div><div class='add'>+#define SCMI_SRST_H_BOOTROM		33</div><div class='add'>+#define SCMI_SRST_A_DCF			34</div><div class='add'>+#define SCMI_SRST_P_DCF			35</div><div class='add'>+#define SCMI_SRST_H_BOOTROM_NS		37</div><div class='add'>+#define SCMI_SRST_P_KEYLADDER		46</div><div class='add'>+#define SCMI_SRST_H_TRNG_S		47</div><div class='add'>+/* Name=SECURE_SOFTRST_CON03,Offset=0xA0C */</div><div class='add'>+#define SCMI_SRST_H_TRNG_NS		48</div><div class='add'>+#define SCMI_SRST_D_SDMMC_BUFFER	49</div><div class='add'>+#define SCMI_SRST_H_SDMMC		50</div><div class='add'>+#define SCMI_SRST_H_SDMMC_BUFFER	51</div><div class='add'>+#define SCMI_SRST_SDMMC			52</div><div class='add'>+#define SCMI_SRST_P_TRNG_CHK		53</div><div class='add'>+#define SCMI_SRST_TRNG_S		54</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/reset/rockchip,rv1126b-cru.h b/include/dt-bindings/reset/rockchip,rv1126b-cru.h<br/>new file mode 100644<br/>index 000000000000..a7712db319d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/rockchip,rv1126b-cru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/rockchip,rv1126b-cru.h</a></div><div class='hunk'>@@ -0,0 +1,405 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Rockchip Electronics Co., Ltd.</div><div class='add'>+ * Author: Elaine Zhang &lt;zhangqing@rock-chips.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RESET_ROCKCHIP_RV1126B_H</div><div class='add'>+#define _DT_BINDINGS_RESET_ROCKCHIP_RV1126B_H</div><div class='add'>+</div><div class='add'>+/* ==========================list all of reset fields id=========================== */</div><div class='add'>+/* TOPCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+</div><div class='add'>+/* TOPCRU--&gt;SOFTRST_CON15 */</div><div class='add'>+#define SRST_P_CRU				0</div><div class='add'>+#define SRST_P_CRU_BIU				1</div><div class='add'>+</div><div class='add'>+/* BUSCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_A_TOP_BIU				2</div><div class='add'>+#define SRST_A_RKCE_BIU				3</div><div class='add'>+#define SRST_A_BUS_BIU				4</div><div class='add'>+#define SRST_H_BUS_BIU				5</div><div class='add'>+#define SRST_P_BUS_BIU				6</div><div class='add'>+#define SRST_P_CRU_BUS				7</div><div class='add'>+#define SRST_P_SYS_GRF				8</div><div class='add'>+#define SRST_H_BOOTROM				9</div><div class='add'>+#define SRST_A_GIC400				10</div><div class='add'>+#define SRST_A_SPINLOCK				11</div><div class='add'>+#define SRST_P_WDT_NS				12</div><div class='add'>+#define SRST_T_WDT_NS				13</div><div class='add'>+</div><div class='add'>+/* BUSCRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_P_WDT_HPMCU			14</div><div class='add'>+#define SRST_T_WDT_HPMCU			15</div><div class='add'>+#define SRST_H_CACHE				16</div><div class='add'>+#define SRST_P_HPMCU_MAILBOX			17</div><div class='add'>+#define SRST_P_HPMCU_INTMUX			18</div><div class='add'>+#define SRST_HPMCU_FULL_CLUSTER			19</div><div class='add'>+#define SRST_HPMCU_PWUP				20</div><div class='add'>+#define SRST_HPMCU_ONLY_CORE			21</div><div class='add'>+#define SRST_T_HPMCU_JTAG			22</div><div class='add'>+#define SRST_P_RKDMA				23</div><div class='add'>+#define SRST_A_RKDMA				24</div><div class='add'>+</div><div class='add'>+/* BUSCRU--&gt;SOFTRST_CON02 */</div><div class='add'>+#define SRST_P_DCF				25</div><div class='add'>+#define SRST_A_DCF				26</div><div class='add'>+#define SRST_H_RGA				27</div><div class='add'>+#define SRST_A_RGA				28</div><div class='add'>+#define SRST_CORE_RGA				29</div><div class='add'>+#define SRST_P_TIMER				30</div><div class='add'>+#define SRST_TIMER0				31</div><div class='add'>+#define SRST_TIMER1				32</div><div class='add'>+#define SRST_TIMER2				33</div><div class='add'>+#define SRST_TIMER3				34</div><div class='add'>+#define SRST_TIMER4				35</div><div class='add'>+#define SRST_TIMER5				36</div><div class='add'>+#define SRST_A_RKCE				37</div><div class='add'>+#define SRST_PKA_RKCE				38</div><div class='add'>+#define SRST_H_RKRNG_S				39</div><div class='add'>+#define SRST_H_RKRNG_NS				40</div><div class='add'>+</div><div class='add'>+/* BUSCRU--&gt;SOFTRST_CON03 */</div><div class='add'>+#define SRST_P_I2C0				41</div><div class='add'>+#define SRST_I2C0				42</div><div class='add'>+#define SRST_P_I2C1				43</div><div class='add'>+#define SRST_I2C1				44</div><div class='add'>+#define SRST_P_I2C3				45</div><div class='add'>+#define SRST_I2C3				46</div><div class='add'>+#define SRST_P_I2C4				47</div><div class='add'>+#define SRST_I2C4				48</div><div class='add'>+#define SRST_P_I2C5				49</div><div class='add'>+#define SRST_I2C5				50</div><div class='add'>+#define SRST_P_SPI0				51</div><div class='add'>+#define SRST_SPI0				52</div><div class='add'>+#define SRST_P_SPI1				53</div><div class='add'>+#define SRST_SPI1				54</div><div class='add'>+</div><div class='add'>+/* BUSCRU--&gt;SOFTRST_CON04 */</div><div class='add'>+#define SRST_P_PWM0				55</div><div class='add'>+#define SRST_PWM0				56</div><div class='add'>+#define SRST_P_PWM2				57</div><div class='add'>+#define SRST_PWM2				58</div><div class='add'>+#define SRST_P_PWM3				59</div><div class='add'>+#define SRST_PWM3				60</div><div class='add'>+</div><div class='add'>+/* BUSCRU--&gt;SOFTRST_CON05 */</div><div class='add'>+#define SRST_P_UART1				61</div><div class='add'>+#define SRST_S_UART1				62</div><div class='add'>+#define SRST_P_UART2				63</div><div class='add'>+#define SRST_S_UART2				64</div><div class='add'>+#define SRST_P_UART3				65</div><div class='add'>+#define SRST_S_UART3				66</div><div class='add'>+#define SRST_P_UART4				67</div><div class='add'>+#define SRST_S_UART4				68</div><div class='add'>+#define SRST_P_UART5				69</div><div class='add'>+#define SRST_S_UART5				70</div><div class='add'>+#define SRST_P_UART6				71</div><div class='add'>+#define SRST_S_UART6				72</div><div class='add'>+#define SRST_P_UART7				73</div><div class='add'>+#define SRST_S_UART7				74</div><div class='add'>+</div><div class='add'>+/* BUSCRU--&gt;SOFTRST_CON06 */</div><div class='add'>+#define SRST_P_TSADC				75</div><div class='add'>+#define SRST_TSADC				76</div><div class='add'>+#define SRST_H_SAI0				77</div><div class='add'>+#define SRST_M_SAI0				78</div><div class='add'>+#define SRST_H_SAI1				79</div><div class='add'>+#define SRST_M_SAI1				80</div><div class='add'>+#define SRST_H_SAI2				81</div><div class='add'>+#define SRST_M_SAI2				82</div><div class='add'>+#define SRST_H_RKDSM				83</div><div class='add'>+#define SRST_M_RKDSM				84</div><div class='add'>+#define SRST_H_PDM				85</div><div class='add'>+#define SRST_M_PDM				86</div><div class='add'>+#define SRST_PDM				87</div><div class='add'>+</div><div class='add'>+/* BUSCRU--&gt;SOFTRST_CON07 */</div><div class='add'>+#define SRST_H_ASRC0				88</div><div class='add'>+#define SRST_ASRC0				89</div><div class='add'>+#define SRST_H_ASRC1				90</div><div class='add'>+#define SRST_ASRC1				91</div><div class='add'>+#define SRST_P_AUDIO_ADC_BUS			92</div><div class='add'>+#define SRST_M_AUDIO_ADC_BUS			93</div><div class='add'>+#define SRST_P_RKCE				94</div><div class='add'>+#define SRST_H_NS_RKCE				95</div><div class='add'>+#define SRST_P_OTPC_NS				96</div><div class='add'>+#define SRST_SBPI_OTPC_NS			97</div><div class='add'>+#define SRST_USER_OTPC_NS			98</div><div class='add'>+#define SRST_OTPC_ARB				99</div><div class='add'>+#define SRST_P_OTP_MASK				100</div><div class='add'>+</div><div class='add'>+/* PERICRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_A_PERI_BIU				101</div><div class='add'>+#define SRST_P_PERI_BIU				102</div><div class='add'>+#define SRST_P_RTC_BIU				103</div><div class='add'>+#define SRST_P_CRU_PERI				104</div><div class='add'>+#define SRST_P_PERI_GRF				105</div><div class='add'>+#define SRST_P_GPIO1				106</div><div class='add'>+#define SRST_DB_GPIO1				107</div><div class='add'>+#define SRST_P_IOC_VCCIO1			108</div><div class='add'>+#define SRST_A_USB3OTG				109</div><div class='add'>+#define SRST_H_USB2HOST				110</div><div class='add'>+#define SRST_H_ARB_USB2HOST			111</div><div class='add'>+#define SRST_P_RTC_TEST				112</div><div class='add'>+</div><div class='add'>+/* PERICRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_H_EMMC				113</div><div class='add'>+#define SRST_H_FSPI0				114</div><div class='add'>+#define SRST_H_XIP_FSPI0			115</div><div class='add'>+#define SRST_S_2X_FSPI0				116</div><div class='add'>+#define SRST_UTMI_USB2HOST			117</div><div class='add'>+#define SRST_REF_PIPEPHY			118</div><div class='add'>+#define SRST_P_PIPEPHY				119</div><div class='add'>+#define SRST_P_PIPEPHY_GRF			120</div><div class='add'>+#define SRST_P_USB2PHY				121</div><div class='add'>+#define SRST_POR_USB2PHY			122</div><div class='add'>+#define SRST_OTG_USB2PHY			123</div><div class='add'>+#define SRST_HOST_USB2PHY			124</div><div class='add'>+</div><div class='add'>+/* CORECRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_REF_PVTPLL_CORE			125</div><div class='add'>+#define SRST_NCOREPORESET0			126</div><div class='add'>+#define SRST_NCORESET0				127</div><div class='add'>+#define SRST_NCOREPORESET1			128</div><div class='add'>+#define SRST_NCORESET1				129</div><div class='add'>+#define SRST_NCOREPORESET2			130</div><div class='add'>+#define SRST_NCORESET2				131</div><div class='add'>+#define SRST_NCOREPORESET3			132</div><div class='add'>+#define SRST_NCORESET3				133</div><div class='add'>+#define SRST_NDBGRESET				134</div><div class='add'>+#define SRST_NL2RESET				135</div><div class='add'>+</div><div class='add'>+/* CORECRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_A_CORE_BIU				136</div><div class='add'>+#define SRST_P_CORE_BIU				137</div><div class='add'>+#define SRST_H_CORE_BIU				138</div><div class='add'>+#define SRST_P_DBG				139</div><div class='add'>+#define SRST_POT_DBG				140</div><div class='add'>+#define SRST_NT_DBG				141</div><div class='add'>+#define SRST_P_CORE_PVTPLL			142</div><div class='add'>+#define SRST_P_CRU_CORE				143</div><div class='add'>+#define SRST_P_CORE_GRF				144</div><div class='add'>+#define SRST_P_DFT2APB				145</div><div class='add'>+</div><div class='add'>+/* PMUCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_H_PMU_BIU				146</div><div class='add'>+#define SRST_P_PMU_GPIO0			147</div><div class='add'>+#define SRST_DB_PMU_GPIO0			148</div><div class='add'>+#define SRST_P_PMU_HP_TIMER			149</div><div class='add'>+#define SRST_PMU_HP_TIMER			150</div><div class='add'>+#define SRST_PMU_32K_HP_TIMER			151</div><div class='add'>+</div><div class='add'>+/* PMUCRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_P_PWM1				152</div><div class='add'>+#define SRST_PWM1				153</div><div class='add'>+#define SRST_P_I2C2				154</div><div class='add'>+#define SRST_I2C2				155</div><div class='add'>+#define SRST_P_UART0				156</div><div class='add'>+#define SRST_S_UART0				157</div><div class='add'>+</div><div class='add'>+/* PMUCRU--&gt;SOFTRST_CON02 */</div><div class='add'>+#define SRST_P_RCOSC_CTRL			158</div><div class='add'>+#define SRST_REF_RCOSC_CTRL			159</div><div class='add'>+#define SRST_P_IOC_PMUIO0			160</div><div class='add'>+#define SRST_P_CRU_PMU				161</div><div class='add'>+#define SRST_P_PMU_GRF				162</div><div class='add'>+#define SRST_PREROLL				163</div><div class='add'>+#define SRST_PREROLL_32K			164</div><div class='add'>+#define SRST_H_PMU_SRAM				165</div><div class='add'>+</div><div class='add'>+/* PMUCRU--&gt;SOFTRST_CON03 */</div><div class='add'>+#define SRST_P_WDT_LPMCU			166</div><div class='add'>+#define SRST_T_WDT_LPMCU			167</div><div class='add'>+#define SRST_LPMCU_FULL_CLUSTER			168</div><div class='add'>+#define SRST_LPMCU_PWUP				169</div><div class='add'>+#define SRST_LPMCU_ONLY_CORE			170</div><div class='add'>+#define SRST_T_LPMCU_JTAG			171</div><div class='add'>+#define SRST_P_LPMCU_MAILBOX			172</div><div class='add'>+</div><div class='add'>+/* PMU1CRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_P_SPI2AHB				173</div><div class='add'>+#define SRST_H_SPI2AHB				174</div><div class='add'>+#define SRST_H_FSPI1				175</div><div class='add'>+#define SRST_H_XIP_FSPI1			176</div><div class='add'>+#define SRST_S_1X_FSPI1				177</div><div class='add'>+#define SRST_P_IOC_PMUIO1			178</div><div class='add'>+#define SRST_P_CRU_PMU1				179</div><div class='add'>+#define SRST_P_AUDIO_ADC_PMU			180</div><div class='add'>+#define SRST_M_AUDIO_ADC_PMU			181</div><div class='add'>+#define SRST_H_PMU1_BIU				182</div><div class='add'>+</div><div class='add'>+/* PMU1CRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_P_LPDMA				183</div><div class='add'>+#define SRST_A_LPDMA				184</div><div class='add'>+#define SRST_H_LPSAI				185</div><div class='add'>+#define SRST_M_LPSAI				186</div><div class='add'>+#define SRST_P_AOA_TDD				187</div><div class='add'>+#define SRST_P_AOA_FE				188</div><div class='add'>+#define SRST_P_AOA_AAD				189</div><div class='add'>+#define SRST_P_AOA_APB				190</div><div class='add'>+#define SRST_P_AOA_SRAM				191</div><div class='add'>+</div><div class='add'>+/* DDRCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_P_DDR_BIU				192</div><div class='add'>+#define SRST_P_DDRC				193</div><div class='add'>+#define SRST_P_DDRMON				194</div><div class='add'>+#define SRST_TIMER_DDRMON			195</div><div class='add'>+#define SRST_P_DFICTRL				196</div><div class='add'>+#define SRST_P_DDR_GRF				197</div><div class='add'>+#define SRST_P_CRU_DDR				198</div><div class='add'>+#define SRST_P_DDRPHY				199</div><div class='add'>+#define SRST_P_DMA2DDR				200</div><div class='add'>+</div><div class='add'>+/* SUBDDRCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_A_SYSMEM_BIU			201</div><div class='add'>+#define SRST_A_SYSMEM				202</div><div class='add'>+#define SRST_A_DDR_BIU				203</div><div class='add'>+#define SRST_A_DDRSCH0_CPU			204</div><div class='add'>+#define SRST_A_DDRSCH1_NPU			205</div><div class='add'>+#define SRST_A_DDRSCH2_POE			206</div><div class='add'>+#define SRST_A_DDRSCH3_VI			207</div><div class='add'>+#define SRST_CORE_DDRC				208</div><div class='add'>+#define SRST_DDRMON				209</div><div class='add'>+#define SRST_DFICTRL				210</div><div class='add'>+#define SRST_RS					211</div><div class='add'>+#define SRST_A_DMA2DDR				212</div><div class='add'>+#define SRST_DDRPHY				213</div><div class='add'>+</div><div class='add'>+/* VICRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_REF_PVTPLL_ISP			214</div><div class='add'>+#define SRST_A_GMAC_BIU				215</div><div class='add'>+#define SRST_A_VI_BIU				216</div><div class='add'>+#define SRST_H_VI_BIU				217</div><div class='add'>+#define SRST_P_VI_BIU				218</div><div class='add'>+#define SRST_P_CRU_VI				219</div><div class='add'>+#define SRST_P_VI_GRF				220</div><div class='add'>+#define SRST_P_VI_PVTPLL			221</div><div class='add'>+#define SRST_P_DSMC				222</div><div class='add'>+#define SRST_A_DSMC				223</div><div class='add'>+#define SRST_H_CAN0				224</div><div class='add'>+#define SRST_CAN0				225</div><div class='add'>+#define SRST_H_CAN1				226</div><div class='add'>+#define SRST_CAN1				227</div><div class='add'>+</div><div class='add'>+/* VICRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_P_GPIO2				228</div><div class='add'>+#define SRST_DB_GPIO2				229</div><div class='add'>+#define SRST_P_GPIO4				230</div><div class='add'>+#define SRST_DB_GPIO4				231</div><div class='add'>+#define SRST_P_GPIO5				232</div><div class='add'>+#define SRST_DB_GPIO5				233</div><div class='add'>+#define SRST_P_GPIO6				234</div><div class='add'>+#define SRST_DB_GPIO6				235</div><div class='add'>+#define SRST_P_GPIO7				236</div><div class='add'>+#define SRST_DB_GPIO7				237</div><div class='add'>+#define SRST_P_IOC_VCCIO2			238</div><div class='add'>+#define SRST_P_IOC_VCCIO4			239</div><div class='add'>+#define SRST_P_IOC_VCCIO5			240</div><div class='add'>+#define SRST_P_IOC_VCCIO6			241</div><div class='add'>+#define SRST_P_IOC_VCCIO7			242</div><div class='add'>+</div><div class='add'>+/* VICRU--&gt;SOFTRST_CON02 */</div><div class='add'>+#define SRST_CORE_ISP				243</div><div class='add'>+#define SRST_H_VICAP				244</div><div class='add'>+#define SRST_A_VICAP				245</div><div class='add'>+#define SRST_D_VICAP				246</div><div class='add'>+#define SRST_ISP0_VICAP				247</div><div class='add'>+#define SRST_CORE_VPSS				248</div><div class='add'>+#define SRST_CORE_VPSL				249</div><div class='add'>+#define SRST_P_CSI2HOST0			250</div><div class='add'>+#define SRST_P_CSI2HOST1			251</div><div class='add'>+#define SRST_P_CSI2HOST2			252</div><div class='add'>+#define SRST_P_CSI2HOST3			253</div><div class='add'>+#define SRST_H_SDMMC0				254</div><div class='add'>+#define SRST_A_GMAC				255</div><div class='add'>+#define SRST_P_CSIPHY0				256</div><div class='add'>+#define SRST_P_CSIPHY1				257</div><div class='add'>+</div><div class='add'>+/* VICRU--&gt;SOFTRST_CON03 */</div><div class='add'>+#define SRST_P_MACPHY				258</div><div class='add'>+#define SRST_MACPHY				259</div><div class='add'>+#define SRST_P_SARADC1				260</div><div class='add'>+#define SRST_SARADC1				261</div><div class='add'>+#define SRST_P_SARADC2				262</div><div class='add'>+#define SRST_SARADC2				263</div><div class='add'>+</div><div class='add'>+/* VEPUCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_REF_PVTPLL_VEPU			264</div><div class='add'>+#define SRST_A_VEPU_BIU				265</div><div class='add'>+#define SRST_H_VEPU_BIU				266</div><div class='add'>+#define SRST_P_VEPU_BIU				267</div><div class='add'>+#define SRST_P_CRU_VEPU				268</div><div class='add'>+#define SRST_P_VEPU_GRF				269</div><div class='add'>+#define SRST_P_GPIO3				270</div><div class='add'>+#define SRST_DB_GPIO3				271</div><div class='add'>+#define SRST_P_IOC_VCCIO3			272</div><div class='add'>+#define SRST_P_SARADC0				273</div><div class='add'>+#define SRST_SARADC0				274</div><div class='add'>+#define SRST_H_SDMMC1				275</div><div class='add'>+</div><div class='add'>+/* VEPUCRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_P_VEPU_PVTPLL			276</div><div class='add'>+#define SRST_H_VEPU				277</div><div class='add'>+#define SRST_A_VEPU				278</div><div class='add'>+#define SRST_CORE_VEPU				279</div><div class='add'>+</div><div class='add'>+/* NPUCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_REF_PVTPLL_NPU			280</div><div class='add'>+#define SRST_A_NPU_BIU				281</div><div class='add'>+#define SRST_H_NPU_BIU				282</div><div class='add'>+#define SRST_P_NPU_BIU				283</div><div class='add'>+#define SRST_P_CRU_NPU				284</div><div class='add'>+#define SRST_P_NPU_GRF				285</div><div class='add'>+#define SRST_P_NPU_PVTPLL			286</div><div class='add'>+#define SRST_H_RKNN				287</div><div class='add'>+#define SRST_A_RKNN				288</div><div class='add'>+</div><div class='add'>+/* VDOCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_A_RKVDEC_BIU			289</div><div class='add'>+#define SRST_A_VDO_BIU				290</div><div class='add'>+#define SRST_H_VDO_BIU				291</div><div class='add'>+#define SRST_P_VDO_BIU				292</div><div class='add'>+#define SRST_P_CRU_VDO				293</div><div class='add'>+#define SRST_P_VDO_GRF				294</div><div class='add'>+#define SRST_A_RKVDEC				295</div><div class='add'>+#define SRST_H_RKVDEC				296</div><div class='add'>+#define SRST_HEVC_CA_RKVDEC			297</div><div class='add'>+#define SRST_A_VOP				298</div><div class='add'>+#define SRST_H_VOP				299</div><div class='add'>+#define SRST_D_VOP				300</div><div class='add'>+#define SRST_A_OOC				301</div><div class='add'>+#define SRST_H_OOC				302</div><div class='add'>+#define SRST_D_OOC				303</div><div class='add'>+</div><div class='add'>+/* VDOCRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_H_RKJPEG				304</div><div class='add'>+#define SRST_A_RKJPEG				305</div><div class='add'>+#define SRST_A_RKMMU_DECOM			306</div><div class='add'>+#define SRST_H_RKMMU_DECOM			307</div><div class='add'>+#define SRST_D_DECOM				308</div><div class='add'>+#define SRST_A_DECOM				309</div><div class='add'>+#define SRST_P_DECOM				310</div><div class='add'>+#define SRST_P_MIPI_DSI				311</div><div class='add'>+#define SRST_P_DSIPHY				312</div><div class='add'>+</div><div class='add'>+/* VCPCRU--&gt;SOFTRST_CON00 */</div><div class='add'>+#define SRST_REF_PVTPLL_VCP			313</div><div class='add'>+#define SRST_A_VCP_BIU				314</div><div class='add'>+#define SRST_H_VCP_BIU				315</div><div class='add'>+#define SRST_P_VCP_BIU				316</div><div class='add'>+#define SRST_P_CRU_VCP				317</div><div class='add'>+#define SRST_P_VCP_GRF				318</div><div class='add'>+#define SRST_P_VCP_PVTPLL			319</div><div class='add'>+#define SRST_A_AISP_BIU				320</div><div class='add'>+#define SRST_H_AISP_BIU				321</div><div class='add'>+#define SRST_CORE_AISP				322</div><div class='add'>+</div><div class='add'>+/* VCPCRU--&gt;SOFTRST_CON01 */</div><div class='add'>+#define SRST_H_FEC				323</div><div class='add'>+#define SRST_A_FEC				324</div><div class='add'>+#define SRST_CORE_FEC				325</div><div class='add'>+#define SRST_H_AVSP				326</div><div class='add'>+#define SRST_A_AVSP				327</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/reset/sophgo,sg2042-reset.h b/include/dt-bindings/reset/sophgo,sg2042-reset.h<br/>new file mode 100644<br/>index 000000000000..9ab0980625c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/sophgo,sg2042-reset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/sophgo,sg2042-reset.h</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Sophgo Technology Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_RESET_SOPHGO_SG2042_H_</div><div class='add'>+#define __DT_BINDINGS_RESET_SOPHGO_SG2042_H_</div><div class='add'>+</div><div class='add'>+#define RST_MAIN_AP			0</div><div class='add'>+#define RST_RISCV_CPU			1</div><div class='add'>+#define RST_RISCV_LOW_SPEED_LOGIC	2</div><div class='add'>+#define RST_RISCV_CMN			3</div><div class='add'>+#define RST_HSDMA			4</div><div class='add'>+#define RST_SYSDMA			5</div><div class='add'>+#define RST_EFUSE0			6</div><div class='add'>+#define RST_EFUSE1			7</div><div class='add'>+#define RST_RTC				8</div><div class='add'>+#define RST_TIMER			9</div><div class='add'>+#define RST_WDT				10</div><div class='add'>+#define RST_AHB_ROM0			11</div><div class='add'>+#define RST_AHB_ROM1			12</div><div class='add'>+#define RST_I2C0			13</div><div class='add'>+#define RST_I2C1			14</div><div class='add'>+#define RST_I2C2			15</div><div class='add'>+#define RST_I2C3			16</div><div class='add'>+#define RST_GPIO0			17</div><div class='add'>+#define RST_GPIO1			18</div><div class='add'>+#define RST_GPIO2			19</div><div class='add'>+#define RST_PWM				20</div><div class='add'>+#define RST_AXI_SRAM0			21</div><div class='add'>+#define RST_AXI_SRAM1			22</div><div class='add'>+#define RST_SF0				23</div><div class='add'>+#define RST_SF1				24</div><div class='add'>+#define RST_LPC				25</div><div class='add'>+#define RST_ETH0			26</div><div class='add'>+#define RST_EMMC			27</div><div class='add'>+#define RST_SD				28</div><div class='add'>+#define RST_UART0			29</div><div class='add'>+#define RST_UART1			30</div><div class='add'>+#define RST_UART2			31</div><div class='add'>+#define RST_UART3			32</div><div class='add'>+#define RST_SPI0			33</div><div class='add'>+#define RST_SPI1			34</div><div class='add'>+#define RST_DBG_I2C			35</div><div class='add'>+#define RST_PCIE0			36</div><div class='add'>+#define RST_PCIE1			37</div><div class='add'>+#define RST_DDR0			38</div><div class='add'>+#define RST_DDR1			39</div><div class='add'>+#define RST_DDR2			40</div><div class='add'>+#define RST_DDR3			41</div><div class='add'>+#define RST_FAU0			42</div><div class='add'>+#define RST_FAU1			43</div><div class='add'>+#define RST_FAU2			44</div><div class='add'>+#define RST_RXU0			45</div><div class='add'>+#define RST_RXU1			46</div><div class='add'>+#define RST_RXU2			47</div><div class='add'>+#define RST_RXU3			48</div><div class='add'>+#define RST_RXU4			49</div><div class='add'>+#define RST_RXU5			50</div><div class='add'>+#define RST_RXU6			51</div><div class='add'>+#define RST_RXU7			52</div><div class='add'>+#define RST_RXU8			53</div><div class='add'>+#define RST_RXU9			54</div><div class='add'>+#define RST_RXU10			55</div><div class='add'>+#define RST_RXU11			56</div><div class='add'>+#define RST_RXU12			57</div><div class='add'>+#define RST_RXU13			58</div><div class='add'>+#define RST_RXU14			59</div><div class='add'>+#define RST_RXU15			60</div><div class='add'>+#define RST_RXU16			61</div><div class='add'>+#define RST_RXU17			62</div><div class='add'>+#define RST_RXU18			63</div><div class='add'>+#define RST_RXU19			64</div><div class='add'>+#define RST_RXU20			65</div><div class='add'>+#define RST_RXU21			66</div><div class='add'>+#define RST_RXU22			67</div><div class='add'>+#define RST_RXU23			68</div><div class='add'>+#define RST_RXU24			69</div><div class='add'>+#define RST_RXU25			70</div><div class='add'>+#define RST_RXU26			71</div><div class='add'>+#define RST_RXU27			72</div><div class='add'>+#define RST_RXU28			73</div><div class='add'>+#define RST_RXU29			74</div><div class='add'>+#define RST_RXU30			75</div><div class='add'>+#define RST_RXU31			76</div><div class='add'>+</div><div class='add'>+#endif /* __DT_BINDINGS_RESET_SOPHGO_SG2042_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/st,stm32mp21-rcc.h b/include/dt-bindings/reset/st,stm32mp21-rcc.h<br/>new file mode 100644<br/>index 000000000000..6463bd73d025<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/st,stm32mp21-rcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/st,stm32mp21-rcc.h</a></div><div class='hunk'>@@ -0,0 +1,138 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) STMicroelectronics 2025 - All Rights Reserved</div><div class='add'>+ * Author: Gabriel Fernandez &lt;gabriel.fernandez@foss.st.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_STM32MP21_RESET_H_</div><div class='add'>+#define _DT_BINDINGS_STM32MP21_RESET_H_</div><div class='add'>+</div><div class='add'>+#define TIM1_R		0</div><div class='add'>+#define TIM2_R		1</div><div class='add'>+#define TIM3_R		2</div><div class='add'>+#define TIM4_R		3</div><div class='add'>+#define TIM5_R		4</div><div class='add'>+#define TIM6_R		5</div><div class='add'>+#define TIM7_R		6</div><div class='add'>+#define TIM8_R		7</div><div class='add'>+#define TIM10_R		8</div><div class='add'>+#define TIM11_R		9</div><div class='add'>+#define TIM12_R		10</div><div class='add'>+#define TIM13_R		11</div><div class='add'>+#define TIM14_R		12</div><div class='add'>+#define TIM15_R		13</div><div class='add'>+#define TIM16_R		14</div><div class='add'>+#define TIM17_R		15</div><div class='add'>+#define LPTIM1_R	16</div><div class='add'>+#define LPTIM2_R	17</div><div class='add'>+#define LPTIM3_R	18</div><div class='add'>+#define LPTIM4_R	19</div><div class='add'>+#define LPTIM5_R	20</div><div class='add'>+#define SPI1_R		21</div><div class='add'>+#define SPI2_R		22</div><div class='add'>+#define SPI3_R		23</div><div class='add'>+#define SPI4_R		24</div><div class='add'>+#define SPI5_R		25</div><div class='add'>+#define SPI6_R		26</div><div class='add'>+#define SPDIFRX_R	27</div><div class='add'>+#define USART1_R	28</div><div class='add'>+#define USART2_R	29</div><div class='add'>+#define USART3_R	30</div><div class='add'>+#define UART4_R		31</div><div class='add'>+#define UART5_R		32</div><div class='add'>+#define USART6_R	33</div><div class='add'>+#define UART7_R		34</div><div class='add'>+#define LPUART1_R	35</div><div class='add'>+#define I2C1_R		36</div><div class='add'>+#define I2C2_R		37</div><div class='add'>+#define I2C3_R		38</div><div class='add'>+#define SAI1_R		39</div><div class='add'>+#define SAI2_R		40</div><div class='add'>+#define SAI3_R		41</div><div class='add'>+#define SAI4_R		42</div><div class='add'>+#define MDF1_R		43</div><div class='add'>+#define FDCAN_R		44</div><div class='add'>+#define HDP_R		45</div><div class='add'>+#define ADC1_R		46</div><div class='add'>+#define ADC2_R		47</div><div class='add'>+#define ETH1_R		48</div><div class='add'>+#define ETH2_R		49</div><div class='add'>+#define USBH_R		50</div><div class='add'>+#define USB2PHY1_R	51</div><div class='add'>+#define USB2PHY2_R	52</div><div class='add'>+#define SDMMC1_R	53</div><div class='add'>+#define SDMMC1DLL_R	54</div><div class='add'>+#define SDMMC2_R	55</div><div class='add'>+#define SDMMC2DLL_R	56</div><div class='add'>+#define SDMMC3_R	57</div><div class='add'>+#define SDMMC3DLL_R	58</div><div class='add'>+#define LTDC_R		59</div><div class='add'>+#define CSI_R		60</div><div class='add'>+#define DCMIPP_R	61</div><div class='add'>+#define DCMIPSSI_R	62</div><div class='add'>+#define WWDG1_R		63</div><div class='add'>+#define VREF_R		64</div><div class='add'>+#define DTS_R		65</div><div class='add'>+#define CRC_R		66</div><div class='add'>+#define SERC_R		67</div><div class='add'>+#define I3C1_R		68</div><div class='add'>+#define I3C2_R		69</div><div class='add'>+#define I3C3_R		70</div><div class='add'>+#define IWDG2_KER_R	71</div><div class='add'>+#define IWDG4_KER_R	72</div><div class='add'>+#define RNG1_R		73</div><div class='add'>+#define RNG2_R		74</div><div class='add'>+#define PKA_R		75</div><div class='add'>+#define SAES_R		76</div><div class='add'>+#define HASH1_R		77</div><div class='add'>+#define HASH2_R		78</div><div class='add'>+#define CRYP1_R		79</div><div class='add'>+#define CRYP2_R		80</div><div class='add'>+#define OSPI1_R		81</div><div class='add'>+#define OSPI1DLL_R	82</div><div class='add'>+#define OTG_R		83</div><div class='add'>+#define FMC_R		84</div><div class='add'>+#define DBG_R		85</div><div class='add'>+#define GPIOA_R		86</div><div class='add'>+#define GPIOB_R		87</div><div class='add'>+#define GPIOC_R		88</div><div class='add'>+#define GPIOD_R		89</div><div class='add'>+#define GPIOE_R		90</div><div class='add'>+#define GPIOF_R		91</div><div class='add'>+#define GPIOG_R		92</div><div class='add'>+#define GPIOH_R		93</div><div class='add'>+#define GPIOI_R		94</div><div class='add'>+#define GPIOZ_R		95</div><div class='add'>+#define HPDMA1_R	96</div><div class='add'>+#define HPDMA2_R	97</div><div class='add'>+#define HPDMA3_R	98</div><div class='add'>+#define IPCC1_R		99</div><div class='add'>+#define C2_HOLDBOOT_R	100</div><div class='add'>+#define C1_HOLDBOOT_R	101</div><div class='add'>+#define C1_R		102</div><div class='add'>+#define C1P1POR_R	103</div><div class='add'>+#define C1P1_R		104</div><div class='add'>+#define C2_R		105</div><div class='add'>+#define SYS_R		106</div><div class='add'>+#define VSW_R		107</div><div class='add'>+#define C1MS_R		108</div><div class='add'>+#define DDRCP_R		109</div><div class='add'>+#define DDRCAPB_R	110</div><div class='add'>+#define DDRPHYCAPB_R	111</div><div class='add'>+#define DDRCFG_R	112</div><div class='add'>+#define DDR_R		113</div><div class='add'>+#define DDRPERFM_R	114</div><div class='add'>+#define IWDG1_SYS_R	116</div><div class='add'>+#define IWDG2_SYS_R	117</div><div class='add'>+#define IWDG3_SYS_R	118</div><div class='add'>+#define IWDG4_SYS_R	119</div><div class='add'>+</div><div class='add'>+#define RST_SCMI_C1_R		0</div><div class='add'>+#define RST_SCMI_C2_R		1</div><div class='add'>+#define RST_SCMI_C1_HOLDBOOT_R	2</div><div class='add'>+#define RST_SCMI_C2_HOLDBOOT_R	3</div><div class='add'>+#define RST_SCMI_FMC		4</div><div class='add'>+#define RST_SCMI_OSPI1		5</div><div class='add'>+#define RST_SCMI_OSPI1DLL	6</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_STM32MP21_RESET_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/st,stm32mp25-rcc.h b/include/dt-bindings/reset/st,stm32mp25-rcc.h<br/>index d5615930bcc8..748e78ae20bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/st,stm32mp25-rcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/st,stm32mp25-rcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/st,stm32mp25-rcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/st,stm32mp25-rcc.h</a></div><div class='hunk'>@@ -69,7 +69,7 @@</div><div class='ctx'> #define ADC3_R		59</div><div class='ctx'> #define ETH1_R		60</div><div class='ctx'> #define ETH2_R		61</div><div class='del'>-#define USB2_R		62</div><div class='add'>+#define USBH_R		62</div><div class='ctx'> #define USB2PHY1_R	63</div><div class='ctx'> #define USB2PHY2_R	64</div><div class='ctx'> #define USB3DR_R	65</div><div class='head'>diff --git a/include/dt-bindings/reset/sun50i-h616-ccu.h b/include/dt-bindings/reset/sun50i-h616-ccu.h<br/>index 1bd8bb0a11be..ba626f7015b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/sun50i-h616-ccu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/sun50i-h616-ccu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/sun50i-h616-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/sun50i-h616-ccu.h</a></div><div class='hunk'>@@ -66,5 +66,9 @@</div><div class='ctx'> #define RST_BUS_TVE0		57</div><div class='ctx'> #define RST_BUS_HDCP		58</div><div class='ctx'> #define RST_BUS_KEYADC		59</div><div class='add'>+#define RST_BUS_GPADC		60</div><div class='add'>+#define RST_BUS_TCON_LCD0	61</div><div class='add'>+#define RST_BUS_TCON_LCD1	62</div><div class='add'>+#define RST_BUS_LVDS		63</div><div class='ctx'> </div><div class='ctx'> #endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/sun55i-a523-ccu.h b/include/dt-bindings/reset/sun55i-a523-ccu.h<br/>new file mode 100644<br/>index 000000000000..70df503f34fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/sun55i-a523-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/sun55i-a523-ccu.h</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Arm Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RST_SUN55I_A523_CCU_H_</div><div class='add'>+#define _DT_BINDINGS_RST_SUN55I_A523_CCU_H_</div><div class='add'>+</div><div class='add'>+#define RST_MBUS		0</div><div class='add'>+#define RST_BUS_NSI		1</div><div class='add'>+#define RST_BUS_DE		2</div><div class='add'>+#define RST_BUS_DI		3</div><div class='add'>+#define RST_BUS_G2D		4</div><div class='add'>+#define RST_BUS_SYS		5</div><div class='add'>+#define RST_BUS_GPU		6</div><div class='add'>+#define RST_BUS_CE		7</div><div class='add'>+#define RST_BUS_SYS_CE		8</div><div class='add'>+#define RST_BUS_VE		9</div><div class='add'>+#define RST_BUS_DMA		10</div><div class='add'>+#define RST_BUS_MSGBOX		11</div><div class='add'>+#define RST_BUS_SPINLOCK	12</div><div class='add'>+#define RST_BUS_CPUXTIMER	13</div><div class='add'>+#define RST_BUS_DBG		14</div><div class='add'>+#define RST_BUS_PWM0		15</div><div class='add'>+#define RST_BUS_PWM1		16</div><div class='add'>+#define RST_BUS_DRAM		17</div><div class='add'>+#define RST_BUS_NAND		18</div><div class='add'>+#define RST_BUS_MMC0		19</div><div class='add'>+#define RST_BUS_MMC1		20</div><div class='add'>+#define RST_BUS_MMC2		21</div><div class='add'>+#define RST_BUS_SYSDAP		22</div><div class='add'>+#define RST_BUS_UART0		23</div><div class='add'>+#define RST_BUS_UART1		24</div><div class='add'>+#define RST_BUS_UART2		25</div><div class='add'>+#define RST_BUS_UART3		26</div><div class='add'>+#define RST_BUS_UART4		27</div><div class='add'>+#define RST_BUS_UART5		28</div><div class='add'>+#define RST_BUS_UART6		29</div><div class='add'>+#define RST_BUS_UART7		30</div><div class='add'>+#define RST_BUS_I2C0		31</div><div class='add'>+#define RST_BUS_I2C1		32</div><div class='add'>+#define RST_BUS_I2C2		33</div><div class='add'>+#define RST_BUS_I2C3		34</div><div class='add'>+#define RST_BUS_I2C4		35</div><div class='add'>+#define RST_BUS_I2C5		36</div><div class='add'>+#define RST_BUS_CAN		37</div><div class='add'>+#define RST_BUS_SPI0		38</div><div class='add'>+#define RST_BUS_SPI1		39</div><div class='add'>+#define RST_BUS_SPI2		40</div><div class='add'>+#define RST_BUS_SPIFC		41</div><div class='add'>+#define RST_BUS_EMAC0		42</div><div class='add'>+#define RST_BUS_EMAC1		43</div><div class='add'>+#define RST_BUS_IR_RX		44</div><div class='add'>+#define RST_BUS_IR_TX		45</div><div class='add'>+#define RST_BUS_GPADC0		46</div><div class='add'>+#define RST_BUS_GPADC1		47</div><div class='add'>+#define RST_BUS_THS		48</div><div class='add'>+#define RST_USB_PHY0		49</div><div class='add'>+#define RST_USB_PHY1		50</div><div class='add'>+#define RST_BUS_OHCI0		51</div><div class='add'>+#define RST_BUS_OHCI1		52</div><div class='add'>+#define RST_BUS_EHCI0		53</div><div class='add'>+#define RST_BUS_EHCI1		54</div><div class='add'>+#define RST_BUS_OTG		55</div><div class='add'>+#define RST_BUS_3		56</div><div class='add'>+#define RST_BUS_LRADC		57</div><div class='add'>+#define RST_BUS_PCIE_USB3	58</div><div class='add'>+#define RST_BUS_DISPLAY0_TOP	59</div><div class='add'>+#define RST_BUS_DISPLAY1_TOP	60</div><div class='add'>+#define RST_BUS_HDMI_MAIN	61</div><div class='add'>+#define RST_BUS_HDMI_SUB	62</div><div class='add'>+#define RST_BUS_MIPI_DSI0	63</div><div class='add'>+#define RST_BUS_MIPI_DSI1	64</div><div class='add'>+#define RST_BUS_TCON_LCD0	65</div><div class='add'>+#define RST_BUS_TCON_LCD1	66</div><div class='add'>+#define RST_BUS_TCON_LCD2	67</div><div class='add'>+#define RST_BUS_TCON_TV0	68</div><div class='add'>+#define RST_BUS_TCON_TV1	69</div><div class='add'>+#define RST_BUS_LVDS0		70</div><div class='add'>+#define RST_BUS_LVDS1		71</div><div class='add'>+#define RST_BUS_EDP		72</div><div class='add'>+#define RST_BUS_VIDEO_OUT0	73</div><div class='add'>+#define RST_BUS_VIDEO_OUT1	74</div><div class='add'>+#define RST_BUS_LEDC		75</div><div class='add'>+#define RST_BUS_CSI		76</div><div class='add'>+#define RST_BUS_ISP		77</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_RST_SUN55I_A523_CCU_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/sun55i-a523-mcu-ccu.h b/include/dt-bindings/reset/sun55i-a523-mcu-ccu.h<br/>new file mode 100644<br/>index 000000000000..a89a0b44f08b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/sun55i-a523-mcu-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/sun55i-a523-mcu-ccu.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Chen-Yu Tsai &lt;wens@csie.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RST_SUN55I_A523_MCU_CCU_H_</div><div class='add'>+#define _DT_BINDINGS_RST_SUN55I_A523_MCU_CCU_H_</div><div class='add'>+</div><div class='add'>+#define RST_BUS_MCU_I2S0		0</div><div class='add'>+#define RST_BUS_MCU_I2S1		1</div><div class='add'>+#define RST_BUS_MCU_I2S2		2</div><div class='add'>+#define RST_BUS_MCU_I2S3		3</div><div class='add'>+#define RST_BUS_MCU_SPDIF		4</div><div class='add'>+#define RST_BUS_MCU_DMIC		5</div><div class='add'>+#define RST_BUS_MCU_AUDIO_CODEC		6</div><div class='add'>+#define RST_BUS_MCU_DSP_MSGBOX		7</div><div class='add'>+#define RST_BUS_MCU_DSP_CFG		8</div><div class='add'>+#define RST_BUS_MCU_NPU			9</div><div class='add'>+#define RST_BUS_MCU_TIMER		10</div><div class='add'>+#define RST_BUS_MCU_DSP_DEBUG		11</div><div class='add'>+#define RST_BUS_MCU_DSP			12</div><div class='add'>+#define RST_BUS_MCU_DMA			13</div><div class='add'>+#define RST_BUS_MCU_PUBSRAM		14</div><div class='add'>+#define RST_BUS_MCU_RISCV_CFG		15</div><div class='add'>+#define RST_BUS_MCU_RISCV_DEBUG		16</div><div class='add'>+#define RST_BUS_MCU_RISCV_CORE		17</div><div class='add'>+#define RST_BUS_MCU_RISCV_MSGBOX	18</div><div class='add'>+#define RST_BUS_MCU_PWM0		19</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_RST_SUN55I_A523_MCU_CCU_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/sun55i-a523-r-ccu.h b/include/dt-bindings/reset/sun55i-a523-r-ccu.h<br/>new file mode 100644<br/>index 000000000000..eb31ae9958d6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/sun55i-a523-r-ccu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/sun55i-a523-r-ccu.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Arm Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_RST_SUN55I_A523_R_CCU_H_</div><div class='add'>+#define _DT_BINDINGS_RST_SUN55I_A523_R_CCU_H_</div><div class='add'>+</div><div class='add'>+#define RST_BUS_R_TIMER		0</div><div class='add'>+#define RST_BUS_R_TWD		1</div><div class='add'>+#define RST_BUS_R_PWMCTRL	2</div><div class='add'>+#define RST_BUS_R_SPI		3</div><div class='add'>+#define RST_BUS_R_SPINLOCK	4</div><div class='add'>+#define RST_BUS_R_MSGBOX	5</div><div class='add'>+#define RST_BUS_R_UART0		6</div><div class='add'>+#define RST_BUS_R_UART1		7</div><div class='add'>+#define RST_BUS_R_I2C0		8</div><div class='add'>+#define RST_BUS_R_I2C1		9</div><div class='add'>+#define RST_BUS_R_I2C2		10</div><div class='add'>+#define RST_BUS_R_PPU1		11</div><div class='add'>+#define RST_BUS_R_IR_RX		12</div><div class='add'>+#define RST_BUS_R_RTC		13</div><div class='add'>+#define RST_BUS_R_CPUCFG	14</div><div class='add'>+#define RST_BUS_R_PPU0		15</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_RST_SUN55I_A523_R_CCU_H_ */</div><div class='head'>diff --git a/include/dt-bindings/reset/thead,th1520-reset.h b/include/dt-bindings/reset/thead,th1520-reset.h<br/>new file mode 100644<br/>index 000000000000..ba6805b6b12a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/thead,th1520-reset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/thead,th1520-reset.h</a></div><div class='hunk'>@@ -0,0 +1,236 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Author: Michal Wilczynski &lt;m.wilczynski@samsung.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_TH1520_RESET_H</div><div class='add'>+#define _DT_BINDINGS_TH1520_RESET_H</div><div class='add'>+</div><div class='add'>+/* AO Subsystem */</div><div class='add'>+#define TH1520_RESET_ID_SYSTEM		0</div><div class='add'>+#define TH1520_RESET_ID_RTC_APB		1</div><div class='add'>+#define TH1520_RESET_ID_RTC_REF		2</div><div class='add'>+#define TH1520_RESET_ID_AOGPIO_DB	3</div><div class='add'>+#define TH1520_RESET_ID_AOGPIO_APB	4</div><div class='add'>+#define TH1520_RESET_ID_AOI2C_APB	5</div><div class='add'>+#define TH1520_RESET_ID_PVT_APB		6</div><div class='add'>+#define TH1520_RESET_ID_E902_CORE	7</div><div class='add'>+#define TH1520_RESET_ID_E902_HAD	8</div><div class='add'>+#define TH1520_RESET_ID_AOTIMER_APB	9</div><div class='add'>+#define TH1520_RESET_ID_AOTIMER_CORE	10</div><div class='add'>+#define TH1520_RESET_ID_AOWDT_APB	11</div><div class='add'>+#define TH1520_RESET_ID_APSYS		12</div><div class='add'>+#define TH1520_RESET_ID_NPUSYS		13</div><div class='add'>+#define TH1520_RESET_ID_DDRSYS		14</div><div class='add'>+#define TH1520_RESET_ID_AXI_AP2CP	15</div><div class='add'>+#define TH1520_RESET_ID_AXI_CP2AP	16</div><div class='add'>+#define TH1520_RESET_ID_AXI_CP2SRAM	17</div><div class='add'>+#define TH1520_RESET_ID_AUDSYS_CORE	18</div><div class='add'>+#define TH1520_RESET_ID_AUDSYS_IOPMP	19</div><div class='add'>+#define TH1520_RESET_ID_AUDSYS		20</div><div class='add'>+#define TH1520_RESET_ID_DSP0		21</div><div class='add'>+#define TH1520_RESET_ID_DSP1		22</div><div class='add'>+#define TH1520_RESET_ID_GPU_MODULE	23</div><div class='add'>+#define TH1520_RESET_ID_VDEC		24</div><div class='add'>+#define TH1520_RESET_ID_VENC		25</div><div class='add'>+#define TH1520_RESET_ID_ADC_APB		26</div><div class='add'>+#define TH1520_RESET_ID_AUDGPIO_DB	27</div><div class='add'>+#define TH1520_RESET_ID_AUDGPIO_APB	28</div><div class='add'>+#define TH1520_RESET_ID_AOUART_IF	29</div><div class='add'>+#define TH1520_RESET_ID_AOUART_APB	30</div><div class='add'>+#define TH1520_RESET_ID_SRAM_AXI_P0	31</div><div class='add'>+#define TH1520_RESET_ID_SRAM_AXI_P1	32</div><div class='add'>+#define TH1520_RESET_ID_SRAM_AXI_P2	33</div><div class='add'>+#define TH1520_RESET_ID_SRAM_AXI_P3	34</div><div class='add'>+#define TH1520_RESET_ID_SRAM_AXI_P4	35</div><div class='add'>+#define TH1520_RESET_ID_SRAM_AXI_CORE	36</div><div class='add'>+#define TH1520_RESET_ID_SE		37</div><div class='add'>+</div><div class='add'>+/* AP Subsystem */</div><div class='add'>+#define TH1520_RESET_ID_BROM			0</div><div class='add'>+#define TH1520_RESET_ID_C910_TOP		1</div><div class='add'>+#define TH1520_RESET_ID_NPU			2</div><div class='add'>+#define TH1520_RESET_ID_WDT0			3</div><div class='add'>+#define TH1520_RESET_ID_WDT1			4</div><div class='add'>+#define TH1520_RESET_ID_C910_C0			5</div><div class='add'>+#define TH1520_RESET_ID_C910_C1			6</div><div class='add'>+#define TH1520_RESET_ID_C910_C2			7</div><div class='add'>+#define TH1520_RESET_ID_C910_C3			8</div><div class='add'>+#define TH1520_RESET_ID_CHIP_DBG_CORE		9</div><div class='add'>+#define TH1520_RESET_ID_CHIP_DBG_AXI		10</div><div class='add'>+#define TH1520_RESET_ID_AXI4_CPUSYS2_AXI	11</div><div class='add'>+#define TH1520_RESET_ID_AXI4_CPUSYS2_APB	12</div><div class='add'>+#define TH1520_RESET_ID_X2H_CPUSYS		13</div><div class='add'>+#define TH1520_RESET_ID_AHB2_CPUSYS		14</div><div class='add'>+#define TH1520_RESET_ID_APB3_CPUSYS		15</div><div class='add'>+#define TH1520_RESET_ID_MBOX0_APB		16</div><div class='add'>+#define TH1520_RESET_ID_MBOX1_APB		17</div><div class='add'>+#define TH1520_RESET_ID_MBOX2_APB		18</div><div class='add'>+#define TH1520_RESET_ID_MBOX3_APB		19</div><div class='add'>+#define TH1520_RESET_ID_TIMER0_APB		20</div><div class='add'>+#define TH1520_RESET_ID_TIMER0_CORE		21</div><div class='add'>+#define TH1520_RESET_ID_TIMER1_APB		22</div><div class='add'>+#define TH1520_RESET_ID_TIMER1_CORE		23</div><div class='add'>+#define TH1520_RESET_ID_PERISYS_AHB		24</div><div class='add'>+#define TH1520_RESET_ID_PERISYS_APB1		25</div><div class='add'>+#define TH1520_RESET_ID_PERISYS_APB2		26</div><div class='add'>+#define TH1520_RESET_ID_GMAC0_APB		27</div><div class='add'>+#define TH1520_RESET_ID_GMAC0_AHB		28</div><div class='add'>+#define TH1520_RESET_ID_GMAC0_CLKGEN		29</div><div class='add'>+#define TH1520_RESET_ID_GMAC0_AXI		30</div><div class='add'>+#define TH1520_RESET_ID_UART0_APB		31</div><div class='add'>+#define TH1520_RESET_ID_UART0_IF		32</div><div class='add'>+#define TH1520_RESET_ID_UART1_APB		33</div><div class='add'>+#define TH1520_RESET_ID_UART1_IF		34</div><div class='add'>+#define TH1520_RESET_ID_UART2_APB		35</div><div class='add'>+#define TH1520_RESET_ID_UART2_IF		36</div><div class='add'>+#define TH1520_RESET_ID_UART3_APB		37</div><div class='add'>+#define TH1520_RESET_ID_UART3_IF		38</div><div class='add'>+#define TH1520_RESET_ID_UART4_APB		39</div><div class='add'>+#define TH1520_RESET_ID_UART4_IF		40</div><div class='add'>+#define TH1520_RESET_ID_UART5_APB		41</div><div class='add'>+#define TH1520_RESET_ID_UART5_IF		42</div><div class='add'>+#define TH1520_RESET_ID_QSPI0_IF		43</div><div class='add'>+#define TH1520_RESET_ID_QSPI0_APB		44</div><div class='add'>+#define TH1520_RESET_ID_QSPI1_IF		45</div><div class='add'>+#define TH1520_RESET_ID_QSPI1_APB		46</div><div class='add'>+#define TH1520_RESET_ID_SPI_IF			47</div><div class='add'>+#define TH1520_RESET_ID_SPI_APB			48</div><div class='add'>+#define TH1520_RESET_ID_I2C0_APB		49</div><div class='add'>+#define TH1520_RESET_ID_I2C0_CORE		50</div><div class='add'>+#define TH1520_RESET_ID_I2C1_APB		51</div><div class='add'>+#define TH1520_RESET_ID_I2C1_CORE		52</div><div class='add'>+#define TH1520_RESET_ID_I2C2_APB		53</div><div class='add'>+#define TH1520_RESET_ID_I2C2_CORE		54</div><div class='add'>+#define TH1520_RESET_ID_I2C3_APB		55</div><div class='add'>+#define TH1520_RESET_ID_I2C3_CORE		56</div><div class='add'>+#define TH1520_RESET_ID_I2C4_APB		57</div><div class='add'>+#define TH1520_RESET_ID_I2C4_CORE		58</div><div class='add'>+#define TH1520_RESET_ID_I2C5_APB		59</div><div class='add'>+#define TH1520_RESET_ID_I2C5_CORE		60</div><div class='add'>+#define TH1520_RESET_ID_GPIO0_DB		61</div><div class='add'>+#define TH1520_RESET_ID_GPIO0_APB		62</div><div class='add'>+#define TH1520_RESET_ID_GPIO1_DB		63</div><div class='add'>+#define TH1520_RESET_ID_GPIO1_APB		64</div><div class='add'>+#define TH1520_RESET_ID_GPIO2_DB		65</div><div class='add'>+#define TH1520_RESET_ID_GPIO2_APB		66</div><div class='add'>+#define TH1520_RESET_ID_PWM_COUNTER		67</div><div class='add'>+#define TH1520_RESET_ID_PWM_APB			68</div><div class='add'>+#define TH1520_RESET_ID_PADCTRL0_APB		69</div><div class='add'>+#define TH1520_RESET_ID_CPU2PERI_X2H		70</div><div class='add'>+#define TH1520_RESET_ID_CPU2AON_X2H		71</div><div class='add'>+#define TH1520_RESET_ID_AON2CPU_A2X		72</div><div class='add'>+#define TH1520_RESET_ID_NPUSYS_AXI		73</div><div class='add'>+#define TH1520_RESET_ID_NPUSYS_AXI_APB		74</div><div class='add'>+#define TH1520_RESET_ID_CPU2VP_X2P		75</div><div class='add'>+#define TH1520_RESET_ID_CPU2VI_X2H		76</div><div class='add'>+#define TH1520_RESET_ID_BMU_AXI			77</div><div class='add'>+#define TH1520_RESET_ID_BMU_APB			78</div><div class='add'>+#define TH1520_RESET_ID_DMAC_CPUSYS_AXI		79</div><div class='add'>+#define TH1520_RESET_ID_DMAC_CPUSYS_AHB		80</div><div class='add'>+#define TH1520_RESET_ID_SPINLOCK		81</div><div class='add'>+#define TH1520_RESET_ID_CFG2TEE			82</div><div class='add'>+#define TH1520_RESET_ID_DSMART			83</div><div class='add'>+#define TH1520_RESET_ID_GPIO3_DB		84</div><div class='add'>+#define TH1520_RESET_ID_GPIO3_APB		85</div><div class='add'>+#define TH1520_RESET_ID_PERI_I2S		86</div><div class='add'>+#define TH1520_RESET_ID_PERI_APB3		87</div><div class='add'>+#define TH1520_RESET_ID_PERI2PERI1_APB		88</div><div class='add'>+#define TH1520_RESET_ID_VPSYS_APB		89</div><div class='add'>+#define TH1520_RESET_ID_PERISYS_APB4		90</div><div class='add'>+#define TH1520_RESET_ID_GMAC1_APB		91</div><div class='add'>+#define TH1520_RESET_ID_GMAC1_AHB		92</div><div class='add'>+#define TH1520_RESET_ID_GMAC1_CLKGEN		93</div><div class='add'>+#define TH1520_RESET_ID_GMAC1_AXI		94</div><div class='add'>+#define TH1520_RESET_ID_GMAC_AXI		95</div><div class='add'>+#define TH1520_RESET_ID_GMAC_AXI_APB		96</div><div class='add'>+#define TH1520_RESET_ID_PADCTRL1_APB		97</div><div class='add'>+#define TH1520_RESET_ID_VOSYS_AXI		98</div><div class='add'>+#define TH1520_RESET_ID_VOSYS_AXI_APB		99</div><div class='add'>+#define TH1520_RESET_ID_VOSYS_AXI_X2X		100</div><div class='add'>+#define TH1520_RESET_ID_MISC2VP_X2X		101</div><div class='add'>+#define TH1520_RESET_ID_DSPSYS			102</div><div class='add'>+#define TH1520_RESET_ID_VISYS			103</div><div class='add'>+#define TH1520_RESET_ID_VOSYS			104</div><div class='add'>+#define TH1520_RESET_ID_VPSYS			105</div><div class='add'>+</div><div class='add'>+/* DSP Subsystem */</div><div class='add'>+#define TH1520_RESET_ID_X2X_DSP1	0</div><div class='add'>+#define TH1520_RESET_ID_X2X_DSP0	1</div><div class='add'>+#define TH1520_RESET_ID_X2X_SLAVE_DSP1	2</div><div class='add'>+#define TH1520_RESET_ID_X2X_SLAVE_DSP0	3</div><div class='add'>+#define TH1520_RESET_ID_DSP0_CORE	4</div><div class='add'>+#define TH1520_RESET_ID_DSP0_DEBUG	5</div><div class='add'>+#define TH1520_RESET_ID_DSP0_APB	6</div><div class='add'>+#define TH1520_RESET_ID_DSP1_CORE	7</div><div class='add'>+#define TH1520_RESET_ID_DSP1_DEBUG	8</div><div class='add'>+#define TH1520_RESET_ID_DSP1_APB	9</div><div class='add'>+#define TH1520_RESET_ID_DSPSYS_APB	10</div><div class='add'>+#define TH1520_RESET_ID_AXI4_DSPSYS_SLV	11</div><div class='add'>+#define TH1520_RESET_ID_AXI4_DSPSYS	12</div><div class='add'>+#define TH1520_RESET_ID_AXI4_DSP_RS	13</div><div class='add'>+</div><div class='add'>+/* MISC Subsystem */</div><div class='add'>+#define TH1520_RESET_ID_EMMC_SDIO_CLKGEN	0</div><div class='add'>+#define TH1520_RESET_ID_EMMC			1</div><div class='add'>+#define TH1520_RESET_ID_MISCSYS_AXI		2</div><div class='add'>+#define TH1520_RESET_ID_MISCSYS_AXI_APB		3</div><div class='add'>+#define TH1520_RESET_ID_SDIO0			4</div><div class='add'>+#define TH1520_RESET_ID_SDIO1			5</div><div class='add'>+#define TH1520_RESET_ID_USB3_APB		6</div><div class='add'>+#define TH1520_RESET_ID_USB3_PHY		7</div><div class='add'>+#define TH1520_RESET_ID_USB3_VCC		8</div><div class='add'>+</div><div class='add'>+/* VI Subsystem */</div><div class='add'>+#define TH1520_RESET_ID_ISP0		0</div><div class='add'>+#define TH1520_RESET_ID_ISP1		1</div><div class='add'>+#define TH1520_RESET_ID_CSI0_APB	2</div><div class='add'>+#define TH1520_RESET_ID_CSI1_APB	3</div><div class='add'>+#define TH1520_RESET_ID_CSI2_APB	4</div><div class='add'>+#define TH1520_RESET_ID_MIPI_FIFO	5</div><div class='add'>+#define TH1520_RESET_ID_ISP_VENC_APB	6</div><div class='add'>+#define TH1520_RESET_ID_VIPRE_APB	7</div><div class='add'>+#define TH1520_RESET_ID_VIPRE_AXI	8</div><div class='add'>+#define TH1520_RESET_ID_DW200_APB	9</div><div class='add'>+#define TH1520_RESET_ID_VISYS3_AXI	10</div><div class='add'>+#define TH1520_RESET_ID_VISYS2_AXI	11</div><div class='add'>+#define TH1520_RESET_ID_VISYS1_AXI	12</div><div class='add'>+#define TH1520_RESET_ID_VISYS_AXI	13</div><div class='add'>+#define TH1520_RESET_ID_VISYS_APB	14</div><div class='add'>+#define TH1520_RESET_ID_ISP_VENC_AXI	15</div><div class='add'>+</div><div class='add'>+/* VO Subsystem */</div><div class='add'>+#define TH1520_RESET_ID_GPU		0</div><div class='add'>+#define TH1520_RESET_ID_GPU_CLKGEN	1</div><div class='add'>+#define TH1520_RESET_ID_DPU_AHB		5</div><div class='add'>+#define TH1520_RESET_ID_DPU_AXI		6</div><div class='add'>+#define TH1520_RESET_ID_DPU_CORE	7</div><div class='add'>+#define TH1520_RESET_ID_DSI0_APB	8</div><div class='add'>+#define TH1520_RESET_ID_DSI1_APB	9</div><div class='add'>+#define TH1520_RESET_ID_HDMI		10</div><div class='add'>+#define TH1520_RESET_ID_HDMI_APB	11</div><div class='add'>+#define TH1520_RESET_ID_VOAXI		12</div><div class='add'>+#define TH1520_RESET_ID_VOAXI_APB	13</div><div class='add'>+#define TH1520_RESET_ID_X2H_DPU_AXI	14</div><div class='add'>+#define TH1520_RESET_ID_X2H_DPU_AHB	15</div><div class='add'>+#define TH1520_RESET_ID_X2H_DPU1_AXI	16</div><div class='add'>+#define TH1520_RESET_ID_X2H_DPU1_AHB	17</div><div class='add'>+</div><div class='add'>+/* VP Subsystem */</div><div class='add'>+#define TH1520_RESET_ID_VPSYS_AXI_APB	0</div><div class='add'>+#define TH1520_RESET_ID_VPSYS_AXI	1</div><div class='add'>+#define TH1520_RESET_ID_FCE_APB		2</div><div class='add'>+#define TH1520_RESET_ID_FCE_CORE	3</div><div class='add'>+#define TH1520_RESET_ID_FCE_X2X_MASTER	4</div><div class='add'>+#define TH1520_RESET_ID_FCE_X2X_SLAVE	5</div><div class='add'>+#define TH1520_RESET_ID_G2D_APB		6</div><div class='add'>+#define TH1520_RESET_ID_G2D_ACLK	7</div><div class='add'>+#define TH1520_RESET_ID_G2D_CORE	8</div><div class='add'>+#define TH1520_RESET_ID_VDEC_APB	9</div><div class='add'>+#define TH1520_RESET_ID_VDEC_ACLK	10</div><div class='add'>+#define TH1520_RESET_ID_VDEC_CORE	11</div><div class='add'>+#define TH1520_RESET_ID_VENC_APB	12</div><div class='add'>+#define TH1520_RESET_ID_VENC_CORE	13</div><div class='add'>+</div><div class='add'>+#endif /* _DT_BINDINGS_TH1520_RESET_H */</div><div class='head'>diff --git a/include/dt-bindings/reset/toshiba,tmpv770x.h b/include/dt-bindings/reset/toshiba,tmpv770x.h<br/>index c1007acb1941..9452bef31425 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/toshiba,tmpv770x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/reset/toshiba,tmpv770x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/reset/toshiba,tmpv770x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/reset/toshiba,tmpv770x.h</a></div><div class='hunk'>@@ -36,6 +36,13 @@</div><div class='ctx'> #define TMPV770X_RESET_PIPCMIF		29</div><div class='ctx'> #define TMPV770X_RESET_PICKMON		30</div><div class='ctx'> #define TMPV770X_RESET_SBUSCLK		31</div><div class='del'>-#define TMPV770X_NR_RESET		32</div><div class='add'>+#define TMPV770X_RESET_VIIFBS0		32</div><div class='add'>+#define TMPV770X_RESET_VIIFBS0_APB	33</div><div class='add'>+#define TMPV770X_RESET_VIIFBS0_L2ISP	34</div><div class='add'>+#define TMPV770X_RESET_VIIFBS0_L1ISP	35</div><div class='add'>+#define TMPV770X_RESET_VIIFBS1		36</div><div class='add'>+#define TMPV770X_RESET_VIIFBS1_APB	37</div><div class='add'>+#define TMPV770X_RESET_VIIFBS1_L2ISP	38</div><div class='add'>+#define TMPV770X_RESET_VIIFBS1_L1ISP	39</div><div class='ctx'> </div><div class='ctx'> #endif /*_DT_BINDINGS_RESET_TOSHIBA_TMPV770X_H_ */</div><div class='head'>diff --git a/include/dt-bindings/soc/qe-fsl,tsa.h b/include/dt-bindings/soc/qe-fsl,tsa.h<br/>new file mode 100644<br/>index 000000000000..3cf3df9c0968<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/soc/qe-fsl,tsa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/soc/qe-fsl,tsa.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_BINDINGS_SOC_FSL_QE_TSA_H</div><div class='add'>+#define __DT_BINDINGS_SOC_FSL_QE_TSA_H</div><div class='add'>+</div><div class='add'>+#define FSL_QE_TSA_NU		0</div><div class='add'>+#define FSL_QE_TSA_UCC1		1</div><div class='add'>+#define FSL_QE_TSA_UCC2		2</div><div class='add'>+#define FSL_QE_TSA_UCC3		3</div><div class='add'>+#define FSL_QE_TSA_UCC4		4</div><div class='add'>+#define FSL_QE_TSA_UCC5		5</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/soc/samsung,exynos-usi.h b/include/dt-bindings/soc/samsung,exynos-usi.h<br/>index a01af169d249..b46de214dd09 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/soc/samsung,exynos-usi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/soc/samsung,exynos-usi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/soc/samsung,exynos-usi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/soc/samsung,exynos-usi.h</a></div><div class='hunk'>@@ -9,9 +9,18 @@</div><div class='ctx'> #ifndef __DT_BINDINGS_SAMSUNG_EXYNOS_USI_H</div><div class='ctx'> #define __DT_BINDINGS_SAMSUNG_EXYNOS_USI_H</div><div class='ctx'> </div><div class='del'>-#define USI_V2_NONE		0</div><div class='del'>-#define USI_V2_UART		1</div><div class='del'>-#define USI_V2_SPI		2</div><div class='del'>-#define USI_V2_I2C		3</div><div class='add'>+#define USI_MODE_NONE		0</div><div class='add'>+#define USI_MODE_UART		1</div><div class='add'>+#define USI_MODE_SPI		2</div><div class='add'>+#define USI_MODE_I2C		3</div><div class='add'>+#define USI_MODE_I2C1		4</div><div class='add'>+#define USI_MODE_I2C0_1		5</div><div class='add'>+#define USI_MODE_UART_I2C1	6</div><div class='add'>+</div><div class='add'>+/* Deprecated */</div><div class='add'>+#define USI_V2_NONE		USI_MODE_NONE</div><div class='add'>+#define USI_V2_UART		USI_MODE_UART</div><div class='add'>+#define USI_V2_SPI		USI_MODE_SPI</div><div class='add'>+#define USI_V2_I2C		USI_MODE_I2C</div><div class='ctx'> </div><div class='ctx'> #endif /* __DT_BINDINGS_SAMSUNG_EXYNOS_USI_H */</div><div class='head'>diff --git a/include/dt-bindings/sound/audio-graph.h b/include/dt-bindings/sound/audio-graph.h<br/>new file mode 100644<br/>index 000000000000..bdb70c6b7332<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/sound/audio-graph.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/sound/audio-graph.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * audio-graph.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2024 Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef __AUDIO_GRAPH_H</div><div class='add'>+#define __AUDIO_GRAPH_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * used in</div><div class='add'>+ *	link-trigger-order</div><div class='add'>+ *	link-trigger-order-start</div><div class='add'>+ *	link-trigger-order-stop</div><div class='add'>+ *</div><div class='add'>+ * default is</div><div class='add'>+ *	link-trigger-order = &lt;SND_SOC_TRIGGER_LINK</div><div class='add'>+ *			      SND_SOC_TRIGGER_COMPONENT</div><div class='add'>+ *			      SND_SOC_TRIGGER_DAI&gt;;</div><div class='add'>+ */</div><div class='add'>+#define SND_SOC_TRIGGER_LINK		0</div><div class='add'>+#define SND_SOC_TRIGGER_COMPONENT	1</div><div class='add'>+#define SND_SOC_TRIGGER_DAI		2</div><div class='add'>+#define SND_SOC_TRIGGER_SIZE		3	/* shoud be last */</div><div class='add'>+</div><div class='add'>+#endif /* __AUDIO_GRAPH_H */</div><div class='head'>diff --git a/include/dt-bindings/sound/cs48l32.h b/include/dt-bindings/sound/cs48l32.h<br/>new file mode 100644<br/>index 000000000000..4e82260fff67<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/sound/cs48l32.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/sound/cs48l32.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Device Tree defines for CS48L32 DSP.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016-2018, 2022, 2025 Cirrus Logic, Inc. and</div><div class='add'>+ *               Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef DT_BINDINGS_SOUND_CS48L32_H</div><div class='add'>+#define DT_BINDINGS_SOUND_CS48L32_H</div><div class='add'>+</div><div class='add'>+/* Values for cirrus,in-type */</div><div class='add'>+#define CS48L32_IN_TYPE_DIFF		0</div><div class='add'>+#define CS48L32_IN_TYPE_SE		1</div><div class='add'>+</div><div class='add'>+/* Values for cirrus,pdm-sup */</div><div class='add'>+#define CS48L32_PDM_SUP_VOUT_MIC	0</div><div class='add'>+#define CS48L32_PDM_SUP_MICBIAS1	1</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h b/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h<br/>index 39f203256c4f..6d1ce7f5da51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h</a></div><div class='hunk'>@@ -139,6 +139,7 @@</div><div class='ctx'> #define DISPLAY_PORT_RX_5	133</div><div class='ctx'> #define DISPLAY_PORT_RX_6	134</div><div class='ctx'> #define DISPLAY_PORT_RX_7	135</div><div class='add'>+#define USB_RX			136</div><div class='ctx'> </div><div class='ctx'> #define LPASS_CLK_ID_PRI_MI2S_IBIT	1</div><div class='ctx'> #define LPASS_CLK_ID_PRI_MI2S_EBIT	2</div><div class='head'>diff --git a/include/dt-bindings/sound/qcom,wcd9335.h b/include/dt-bindings/sound/qcom,wcd9335.h<br/>index f5e9f1db091e..4fc68aeb9e04 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/sound/qcom,wcd9335.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/sound/qcom,wcd9335.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/sound/qcom,wcd9335.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/sound/qcom,wcd9335.h</a></div><div class='hunk'>@@ -10,6 +10,5 @@</div><div class='ctx'> #define AIF3_PB                 4</div><div class='ctx'> #define AIF3_CAP                5</div><div class='ctx'> #define AIF4_PB                 6</div><div class='del'>-#define NUM_CODEC_DAIS          7</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/dt-bindings/sound/qcom,wcd934x.h b/include/dt-bindings/sound/qcom,wcd934x.h<br/>new file mode 100644<br/>index 000000000000..8b30d34fcc87<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/sound/qcom,wcd934x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/sound/qcom,wcd934x.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+</div><div class='add'>+#ifndef __DT_SOUND_QCOM_WCD934x_H</div><div class='add'>+#define __DT_SOUND_QCOM_WCD934x_H</div><div class='add'>+</div><div class='add'>+#define AIF1_PB                 0</div><div class='add'>+#define AIF1_CAP                1</div><div class='add'>+#define AIF2_PB                 2</div><div class='add'>+#define AIF2_CAP                3</div><div class='add'>+#define AIF3_PB                 4</div><div class='add'>+#define AIF3_CAP                5</div><div class='add'>+#define AIF4_PB                 6</div><div class='add'>+#define AIF4_VIFEED             7</div><div class='add'>+#define AIF4_MAD_TX             8</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/thermal/mediatek,lvts-thermal.h b/include/dt-bindings/thermal/mediatek,lvts-thermal.h<br/>index 997e2f55128a..ddc7302a510a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/thermal/mediatek,lvts-thermal.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/thermal/mediatek,lvts-thermal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/thermal/mediatek,lvts-thermal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/thermal/mediatek,lvts-thermal.h</a></div><div class='hunk'>@@ -16,6 +16,32 @@</div><div class='ctx'> #define MT7988_ETHWARP_0	6</div><div class='ctx'> #define MT7988_ETHWARP_1	7</div><div class='ctx'> </div><div class='add'>+#define MT8186_LITTLE_CPU0	0</div><div class='add'>+#define MT8186_LITTLE_CPU1	1</div><div class='add'>+#define MT8186_LITTLE_CPU2	2</div><div class='add'>+#define MT8186_CAM		3</div><div class='add'>+#define MT8186_BIG_CPU0	4</div><div class='add'>+#define MT8186_BIG_CPU1	5</div><div class='add'>+#define MT8186_NNA		6</div><div class='add'>+#define MT8186_ADSP		7</div><div class='add'>+#define MT8186_GPU		8</div><div class='add'>+</div><div class='add'>+#define MT8188_MCU_LITTLE_CPU0	0</div><div class='add'>+#define MT8188_MCU_LITTLE_CPU1	1</div><div class='add'>+#define MT8188_MCU_LITTLE_CPU2	2</div><div class='add'>+#define MT8188_MCU_LITTLE_CPU3	3</div><div class='add'>+#define MT8188_MCU_BIG_CPU0	4</div><div class='add'>+#define MT8188_MCU_BIG_CPU1	5</div><div class='add'>+</div><div class='add'>+#define MT8188_AP_APU		0</div><div class='add'>+#define MT8188_AP_GPU0		1</div><div class='add'>+#define MT8188_AP_GPU1		2</div><div class='add'>+#define MT8188_AP_ADSP		3</div><div class='add'>+#define MT8188_AP_VDO		4</div><div class='add'>+#define MT8188_AP_INFRA		5</div><div class='add'>+#define MT8188_AP_CAM1		6</div><div class='add'>+#define MT8188_AP_CAM2		7</div><div class='add'>+</div><div class='ctx'> #define MT8195_MCU_BIG_CPU0     0</div><div class='ctx'> #define MT8195_MCU_BIG_CPU1     1</div><div class='ctx'> #define MT8195_MCU_BIG_CPU2     2</div><div class='head'>diff --git a/include/dt-bindings/thermal/tegra114-soctherm.h b/include/dt-bindings/thermal/tegra114-soctherm.h<br/>new file mode 100644<br/>index 000000000000..b766a61cd1ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/thermal/tegra114-soctherm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/thermal/tegra114-soctherm.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * This header provides constants for binding nvidia,tegra114-soctherm.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DT_BINDINGS_THERMAL_TEGRA114_SOCTHERM_H</div><div class='add'>+#define _DT_BINDINGS_THERMAL_TEGRA114_SOCTHERM_H</div><div class='add'>+</div><div class='add'>+#define TEGRA114_SOCTHERM_SENSOR_CPU 0</div><div class='add'>+#define TEGRA114_SOCTHERM_SENSOR_MEM 1</div><div class='add'>+#define TEGRA114_SOCTHERM_SENSOR_GPU 2</div><div class='add'>+#define TEGRA114_SOCTHERM_SENSOR_PLLX 3</div><div class='add'>+</div><div class='add'>+#define TEGRA114_SOCTHERM_THROT_LEVEL_NONE 0</div><div class='add'>+#define TEGRA114_SOCTHERM_THROT_LEVEL_LOW  1</div><div class='add'>+#define TEGRA114_SOCTHERM_THROT_LEVEL_MED  2</div><div class='add'>+#define TEGRA114_SOCTHERM_THROT_LEVEL_HIGH 3</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/dt-bindings/watchdog/aspeed-wdt.h b/include/dt-bindings/watchdog/aspeed-wdt.h<br/>index 7ae6d84b2bd9..89fa31ffce2d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/watchdog/aspeed-wdt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/dt-bindings/watchdog/aspeed-wdt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/dt-bindings/watchdog/aspeed-wdt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/dt-bindings/watchdog/aspeed-wdt.h</a></div><div class='hunk'>@@ -89,4 +89,142 @@</div><div class='ctx'> </div><div class='ctx'> #define AST2600_WDT_RESET2_DEFAULT 0x03fffff1</div><div class='ctx'> </div><div class='add'>+#define AST2700_WDT_RESET1_CPU		(1 &lt;&lt; 0)</div><div class='add'>+#define AST2700_WDT_RESET1_DRAM		(1 &lt;&lt; 1)</div><div class='add'>+#define AST2700_WDT_RESET1_SLI0		(1 &lt;&lt; 2)</div><div class='add'>+#define AST2700_WDT_RESET1_EHCI		(1 &lt;&lt; 3)</div><div class='add'>+#define AST2700_WDT_RESET1_HACE		(1 &lt;&lt; 4)</div><div class='add'>+#define AST2700_WDT_RESET1_SOC_MISC0	(1 &lt;&lt; 5)</div><div class='add'>+#define AST2700_WDT_RESET1_VIDEO	(1 &lt;&lt; 6)</div><div class='add'>+#define AST2700_WDT_RESET1_2D_GRAPHIC	(1 &lt;&lt; 7)</div><div class='add'>+#define AST2700_WDT_RESET1_RAVS0	(1 &lt;&lt; 8)</div><div class='add'>+#define AST2700_WDT_RESET1_RAVS1	(1 &lt;&lt; 9)</div><div class='add'>+#define AST2700_WDT_RESET1_GPIO0	(1 &lt;&lt; 10)</div><div class='add'>+#define AST2700_WDT_RESET1_SSP		(1 &lt;&lt; 11)</div><div class='add'>+#define AST2700_WDT_RESET1_TSP		(1 &lt;&lt; 12)</div><div class='add'>+#define AST2700_WDT_RESET1_CRT		(1 &lt;&lt; 13)</div><div class='add'>+#define AST2700_WDT_RESET1_USB20_HOST	(1 &lt;&lt; 14)</div><div class='add'>+#define AST2700_WDT_RESET1_USB11_HOST	(1 &lt;&lt; 15)</div><div class='add'>+#define AST2700_WDT_RESET1_UFS		(1 &lt;&lt; 16)</div><div class='add'>+#define AST2700_WDT_RESET1_EMMC		(1 &lt;&lt; 17)</div><div class='add'>+#define AST2700_WDT_RESET1_AHB_TO_PCIE1	(1 &lt;&lt; 18)</div><div class='add'>+#define AST2700_WDT_RESET1_XDMA0	(1 &lt;&lt; 22)</div><div class='add'>+#define AST2700_WDT_RESET1_MCTP1	(1 &lt;&lt; 23)</div><div class='add'>+#define AST2700_WDT_RESET1_MCTP0	(1 &lt;&lt; 24)</div><div class='add'>+#define AST2700_WDT_RESET1_JTAG0	(1 &lt;&lt; 25)</div><div class='add'>+#define AST2700_WDT_RESET1_ECC		(1 &lt;&lt; 26)</div><div class='add'>+#define AST2700_WDT_RESET1_XDMA1	(1 &lt;&lt; 27)</div><div class='add'>+#define AST2700_WDT_RESET1_DP		(1 &lt;&lt; 28)</div><div class='add'>+#define AST2700_WDT_RESET1_DP_MCU	(1 &lt;&lt; 29)</div><div class='add'>+#define AST2700_WDT_RESET1_AHB_TO_PCIE0	(1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET1_DEFAULT 0x8207ff71</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET2_USB3_A_HOST	(1 &lt;&lt; 0)</div><div class='add'>+#define AST2700_WDT_RESET2_USB3_A_VHUB3	(1 &lt;&lt; 1)</div><div class='add'>+#define AST2700_WDT_RESET2_USB3_A_VHUB2	(1 &lt;&lt; 2)</div><div class='add'>+#define AST2700_WDT_RESET2_USB3_B_HOST	(1 &lt;&lt; 3)</div><div class='add'>+#define AST2700_WDT_RESET2_USB3_B_VHUB3	(1 &lt;&lt; 4)</div><div class='add'>+#define AST2700_WDT_RESET2_USB3_B_VHUB2	(1 &lt;&lt; 5)</div><div class='add'>+#define AST2700_WDT_RESET2_SM3		(1 &lt;&lt; 6)</div><div class='add'>+#define AST2700_WDT_RESET2_SM4		(1 &lt;&lt; 7)</div><div class='add'>+#define AST2700_WDT_RESET2_SHA3		(1 &lt;&lt; 8)</div><div class='add'>+#define AST2700_WDT_RESET2_RSA		(1 &lt;&lt; 9)</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET2_DEFAULT 0x000003f6</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET3_LPC0		(1 &lt;&lt; 0)</div><div class='add'>+#define AST2700_WDT_RESET3_LPC1		(1 &lt;&lt; 1)</div><div class='add'>+#define AST2700_WDT_RESET3_MDIO		(1 &lt;&lt; 2)</div><div class='add'>+#define AST2700_WDT_RESET3_PECI		(1 &lt;&lt; 3)</div><div class='add'>+#define AST2700_WDT_RESET3_PWM		(1 &lt;&lt; 4)</div><div class='add'>+#define AST2700_WDT_RESET3_MAC0		(1 &lt;&lt; 5)</div><div class='add'>+#define AST2700_WDT_RESET3_MAC1		(1 &lt;&lt; 6)</div><div class='add'>+#define AST2700_WDT_RESET3_MAC2		(1 &lt;&lt; 7)</div><div class='add'>+#define AST2700_WDT_RESET3_ADC		(1 &lt;&lt; 8)</div><div class='add'>+#define AST2700_WDT_RESET3_SDC		(1 &lt;&lt; 9)</div><div class='add'>+#define AST2700_WDT_RESET3_ESPI0	(1 &lt;&lt; 10)</div><div class='add'>+#define AST2700_WDT_RESET3_ESPI1	(1 &lt;&lt; 11)</div><div class='add'>+#define AST2700_WDT_RESET3_JTAG1	(1 &lt;&lt; 12)</div><div class='add'>+#define AST2700_WDT_RESET3_SPI0		(1 &lt;&lt; 13)</div><div class='add'>+#define AST2700_WDT_RESET3_SPI1		(1 &lt;&lt; 14)</div><div class='add'>+#define AST2700_WDT_RESET3_SPI2		(1 &lt;&lt; 15)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C0		(1 &lt;&lt; 16)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C1		(1 &lt;&lt; 17)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C2		(1 &lt;&lt; 18)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C3		(1 &lt;&lt; 19)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C4		(1 &lt;&lt; 20)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C5		(1 &lt;&lt; 21)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C6		(1 &lt;&lt; 22)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C7		(1 &lt;&lt; 23)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C8		(1 &lt;&lt; 24)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C9		(1 &lt;&lt; 25)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C10	(1 &lt;&lt; 26)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C11	(1 &lt;&lt; 27)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C12	(1 &lt;&lt; 28)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C13	(1 &lt;&lt; 29)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C14	(1 &lt;&lt; 30)</div><div class='add'>+#define AST2700_WDT_RESET3_I3C15	(1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET3_DEFAULT 0x000093ec</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET4_FMC		(1 &lt;&lt; 0)</div><div class='add'>+#define AST2700_WDT_RESET4_SOC_MISC1	(1 &lt;&lt; 1)</div><div class='add'>+#define AST2700_WDT_RESET4_AHB		(1 &lt;&lt; 2)</div><div class='add'>+#define AST2700_WDT_RESET4_SLI1		(1 &lt;&lt; 3)</div><div class='add'>+#define AST2700_WDT_RESET4_UART0	(1 &lt;&lt; 4)</div><div class='add'>+#define AST2700_WDT_RESET4_UART1	(1 &lt;&lt; 5)</div><div class='add'>+#define AST2700_WDT_RESET4_UART2	(1 &lt;&lt; 6)</div><div class='add'>+#define AST2700_WDT_RESET4_UART3	(1 &lt;&lt; 7)</div><div class='add'>+#define AST2700_WDT_RESET4_I2C_MONITOR	(1 &lt;&lt; 8)</div><div class='add'>+#define AST2700_WDT_RESET4_HOST_TO_SPI1	(1 &lt;&lt; 9)</div><div class='add'>+#define AST2700_WDT_RESET4_HOST_TO_SPI2	(1 &lt;&lt; 10)</div><div class='add'>+#define AST2700_WDT_RESET4_GPIO1	(1 &lt;&lt; 11)</div><div class='add'>+#define AST2700_WDT_RESET4_FSI		(1 &lt;&lt; 12)</div><div class='add'>+#define AST2700_WDT_RESET4_CANBUS	(1 &lt;&lt; 13)</div><div class='add'>+#define AST2700_WDT_RESET4_MCTP		(1 &lt;&lt; 14)</div><div class='add'>+#define AST2700_WDT_RESET4_XDMA		(1 &lt;&lt; 15)</div><div class='add'>+#define AST2700_WDT_RESET4_UART5	(1 &lt;&lt; 16)</div><div class='add'>+#define AST2700_WDT_RESET4_UART6	(1 &lt;&lt; 17)</div><div class='add'>+#define AST2700_WDT_RESET4_UART7	(1 &lt;&lt; 18)</div><div class='add'>+#define AST2700_WDT_RESET4_UART8	(1 &lt;&lt; 19)</div><div class='add'>+#define AST2700_WDT_RESET4_BOOT_MCU	(1 &lt;&lt; 20)</div><div class='add'>+#define AST2700_WDT_RESET4_IO_MCU	(1 &lt;&lt; 21)</div><div class='add'>+#define AST2700_WDT_RESET4_LTPI0	(1 &lt;&lt; 22)</div><div class='add'>+#define AST2700_WDT_RESET4_VGA_LINK	(1 &lt;&lt; 23)</div><div class='add'>+#define AST2700_WDT_RESET4_LTPI1	(1 &lt;&lt; 24)</div><div class='add'>+#define AST2700_WDT_RESET4_LTPI_PHY	(1 &lt;&lt; 25)</div><div class='add'>+#define AST2700_WDT_RESET4_ACE		(1 &lt;&lt; 26)</div><div class='add'>+#define AST2700_WDT_RESET4_LTPI_GPIO0	(1 &lt;&lt; 28)</div><div class='add'>+#define AST2700_WDT_RESET4_LTPI_GPIO1	(1 &lt;&lt; 29)</div><div class='add'>+#define AST2700_WDT_RESET4_AHB_TO_PCIE1	(1 &lt;&lt; 30)</div><div class='add'>+#define AST2700_WDT_RESET4_I3C_DMA	(1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET4_DEFAULT 0x40303803</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET5_I2C_GLOBAL	(1 &lt;&lt; 0)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C0		(1 &lt;&lt; 1)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C1		(1 &lt;&lt; 2)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C2		(1 &lt;&lt; 3)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C3		(1 &lt;&lt; 4)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C4		(1 &lt;&lt; 5)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C5		(1 &lt;&lt; 6)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C6		(1 &lt;&lt; 7)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C7		(1 &lt;&lt; 8)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C8		(1 &lt;&lt; 9)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C9		(1 &lt;&lt; 10)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C10	(1 &lt;&lt; 11)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C11	(1 &lt;&lt; 12)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C12	(1 &lt;&lt; 13)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C13	(1 &lt;&lt; 14)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C14	(1 &lt;&lt; 15)</div><div class='add'>+#define AST2700_WDT_RESET5_I2C15	(1 &lt;&lt; 16)</div><div class='add'>+#define AST2700_WDT_RESET5_UHCI		(1 &lt;&lt; 17)</div><div class='add'>+#define AST2700_WDT_RESET5_USB2_C_UART	(1 &lt;&lt; 18)</div><div class='add'>+#define AST2700_WDT_RESET5_USB2_C	(1 &lt;&lt; 19)</div><div class='add'>+#define AST2700_WDT_RESET5_USB2_D_UART	(1 &lt;&lt; 20)</div><div class='add'>+#define AST2700_WDT_RESET5_USB2_D	(1 &lt;&lt; 21)</div><div class='add'>+</div><div class='add'>+#define AST2700_WDT_RESET5_DEFAULT 0x00320000</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/hyperv/hvgdk.h b/include/hyperv/hvgdk.h<br/>new file mode 100644<br/>index 000000000000..dd6d4939ea29<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/hyperv/hvgdk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/hyperv/hvgdk.h</a></div><div class='hunk'>@@ -0,0 +1,308 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Type definitions for the Microsoft Hypervisor.</div><div class='add'>+ */</div><div class='add'>+#ifndef _HV_HVGDK_H</div><div class='add'>+#define _HV_HVGDK_H</div><div class='add'>+</div><div class='add'>+#include "hvgdk_mini.h"</div><div class='add'>+#include "hvgdk_ext.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The guest OS needs to register the guest ID with the hypervisor.</div><div class='add'>+ * The guest ID is a 64 bit entity and the structure of this ID is</div><div class='add'>+ * specified in the Hyper-V TLFS specification.</div><div class='add'>+ *</div><div class='add'>+ * While the current guideline does not specify how Linux guest ID(s)</div><div class='add'>+ * need to be generated, our plan is to publish the guidelines for</div><div class='add'>+ * Linux and other guest operating systems that currently are hosted</div><div class='add'>+ * on Hyper-V. The implementation here conforms to this yet</div><div class='add'>+ * unpublished guidelines.</div><div class='add'>+ *</div><div class='add'>+ * Bit(s)</div><div class='add'>+ * 63 - Indicates if the OS is Open Source or not; 1 is Open Source</div><div class='add'>+ * 62:56 - Os Type; Linux is 0x100</div><div class='add'>+ * 55:48 - Distro specific identification</div><div class='add'>+ * 47:16 - Linux kernel version number</div><div class='add'>+ * 15:0  - Distro specific identification</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HV_LINUX_VENDOR_ID              0x8100</div><div class='add'>+</div><div class='add'>+/* HV_VMX_ENLIGHTENED_VMCS */</div><div class='add'>+struct hv_enlightened_vmcs {</div><div class='add'>+	u32 revision_id;</div><div class='add'>+	u32 abort;</div><div class='add'>+</div><div class='add'>+	u16 host_es_selector;</div><div class='add'>+	u16 host_cs_selector;</div><div class='add'>+	u16 host_ss_selector;</div><div class='add'>+	u16 host_ds_selector;</div><div class='add'>+	u16 host_fs_selector;</div><div class='add'>+	u16 host_gs_selector;</div><div class='add'>+	u16 host_tr_selector;</div><div class='add'>+</div><div class='add'>+	u16 padding16_1;</div><div class='add'>+</div><div class='add'>+	u64 host_ia32_pat;</div><div class='add'>+	u64 host_ia32_efer;</div><div class='add'>+</div><div class='add'>+	u64 host_cr0;</div><div class='add'>+	u64 host_cr3;</div><div class='add'>+	u64 host_cr4;</div><div class='add'>+</div><div class='add'>+	u64 host_ia32_sysenter_esp;</div><div class='add'>+	u64 host_ia32_sysenter_eip;</div><div class='add'>+	u64 host_rip;</div><div class='add'>+	u32 host_ia32_sysenter_cs;</div><div class='add'>+</div><div class='add'>+	u32 pin_based_vm_exec_control;</div><div class='add'>+	u32 vm_exit_controls;</div><div class='add'>+	u32 secondary_vm_exec_control;</div><div class='add'>+</div><div class='add'>+	u64 io_bitmap_a;</div><div class='add'>+	u64 io_bitmap_b;</div><div class='add'>+	u64 msr_bitmap;</div><div class='add'>+</div><div class='add'>+	u16 guest_es_selector;</div><div class='add'>+	u16 guest_cs_selector;</div><div class='add'>+	u16 guest_ss_selector;</div><div class='add'>+	u16 guest_ds_selector;</div><div class='add'>+	u16 guest_fs_selector;</div><div class='add'>+	u16 guest_gs_selector;</div><div class='add'>+	u16 guest_ldtr_selector;</div><div class='add'>+	u16 guest_tr_selector;</div><div class='add'>+</div><div class='add'>+	u32 guest_es_limit;</div><div class='add'>+	u32 guest_cs_limit;</div><div class='add'>+	u32 guest_ss_limit;</div><div class='add'>+	u32 guest_ds_limit;</div><div class='add'>+	u32 guest_fs_limit;</div><div class='add'>+	u32 guest_gs_limit;</div><div class='add'>+	u32 guest_ldtr_limit;</div><div class='add'>+	u32 guest_tr_limit;</div><div class='add'>+	u32 guest_gdtr_limit;</div><div class='add'>+	u32 guest_idtr_limit;</div><div class='add'>+</div><div class='add'>+	u32 guest_es_ar_bytes;</div><div class='add'>+	u32 guest_cs_ar_bytes;</div><div class='add'>+	u32 guest_ss_ar_bytes;</div><div class='add'>+	u32 guest_ds_ar_bytes;</div><div class='add'>+	u32 guest_fs_ar_bytes;</div><div class='add'>+	u32 guest_gs_ar_bytes;</div><div class='add'>+	u32 guest_ldtr_ar_bytes;</div><div class='add'>+	u32 guest_tr_ar_bytes;</div><div class='add'>+</div><div class='add'>+	u64 guest_es_base;</div><div class='add'>+	u64 guest_cs_base;</div><div class='add'>+	u64 guest_ss_base;</div><div class='add'>+	u64 guest_ds_base;</div><div class='add'>+	u64 guest_fs_base;</div><div class='add'>+	u64 guest_gs_base;</div><div class='add'>+	u64 guest_ldtr_base;</div><div class='add'>+	u64 guest_tr_base;</div><div class='add'>+	u64 guest_gdtr_base;</div><div class='add'>+	u64 guest_idtr_base;</div><div class='add'>+</div><div class='add'>+	u64 padding64_1[3];</div><div class='add'>+</div><div class='add'>+	u64 vm_exit_msr_store_addr;</div><div class='add'>+	u64 vm_exit_msr_load_addr;</div><div class='add'>+	u64 vm_entry_msr_load_addr;</div><div class='add'>+</div><div class='add'>+	u64 cr3_target_value0;</div><div class='add'>+	u64 cr3_target_value1;</div><div class='add'>+	u64 cr3_target_value2;</div><div class='add'>+	u64 cr3_target_value3;</div><div class='add'>+</div><div class='add'>+	u32 page_fault_error_code_mask;</div><div class='add'>+	u32 page_fault_error_code_match;</div><div class='add'>+</div><div class='add'>+	u32 cr3_target_count;</div><div class='add'>+	u32 vm_exit_msr_store_count;</div><div class='add'>+	u32 vm_exit_msr_load_count;</div><div class='add'>+	u32 vm_entry_msr_load_count;</div><div class='add'>+</div><div class='add'>+	u64 tsc_offset;</div><div class='add'>+	u64 virtual_apic_page_addr;</div><div class='add'>+	u64 vmcs_link_pointer;</div><div class='add'>+</div><div class='add'>+	u64 guest_ia32_debugctl;</div><div class='add'>+	u64 guest_ia32_pat;</div><div class='add'>+	u64 guest_ia32_efer;</div><div class='add'>+</div><div class='add'>+	u64 guest_pdptr0;</div><div class='add'>+	u64 guest_pdptr1;</div><div class='add'>+	u64 guest_pdptr2;</div><div class='add'>+	u64 guest_pdptr3;</div><div class='add'>+</div><div class='add'>+	u64 guest_pending_dbg_exceptions;</div><div class='add'>+	u64 guest_sysenter_esp;</div><div class='add'>+	u64 guest_sysenter_eip;</div><div class='add'>+</div><div class='add'>+	u32 guest_activity_state;</div><div class='add'>+	u32 guest_sysenter_cs;</div><div class='add'>+</div><div class='add'>+	u64 cr0_guest_host_mask;</div><div class='add'>+	u64 cr4_guest_host_mask;</div><div class='add'>+	u64 cr0_read_shadow;</div><div class='add'>+	u64 cr4_read_shadow;</div><div class='add'>+	u64 guest_cr0;</div><div class='add'>+	u64 guest_cr3;</div><div class='add'>+	u64 guest_cr4;</div><div class='add'>+	u64 guest_dr7;</div><div class='add'>+</div><div class='add'>+	u64 host_fs_base;</div><div class='add'>+	u64 host_gs_base;</div><div class='add'>+	u64 host_tr_base;</div><div class='add'>+	u64 host_gdtr_base;</div><div class='add'>+	u64 host_idtr_base;</div><div class='add'>+	u64 host_rsp;</div><div class='add'>+</div><div class='add'>+	u64 ept_pointer;</div><div class='add'>+</div><div class='add'>+	u16 virtual_processor_id;</div><div class='add'>+	u16 padding16_2[3];</div><div class='add'>+</div><div class='add'>+	u64 padding64_2[5];</div><div class='add'>+	u64 guest_physical_address;</div><div class='add'>+</div><div class='add'>+	u32 vm_instruction_error;</div><div class='add'>+	u32 vm_exit_reason;</div><div class='add'>+	u32 vm_exit_intr_info;</div><div class='add'>+	u32 vm_exit_intr_error_code;</div><div class='add'>+	u32 idt_vectoring_info_field;</div><div class='add'>+	u32 idt_vectoring_error_code;</div><div class='add'>+	u32 vm_exit_instruction_len;</div><div class='add'>+	u32 vmx_instruction_info;</div><div class='add'>+</div><div class='add'>+	u64 exit_qualification;</div><div class='add'>+	u64 exit_io_instruction_ecx;</div><div class='add'>+	u64 exit_io_instruction_esi;</div><div class='add'>+	u64 exit_io_instruction_edi;</div><div class='add'>+	u64 exit_io_instruction_eip;</div><div class='add'>+</div><div class='add'>+	u64 guest_linear_address;</div><div class='add'>+	u64 guest_rsp;</div><div class='add'>+	u64 guest_rflags;</div><div class='add'>+</div><div class='add'>+	u32 guest_interruptibility_info;</div><div class='add'>+	u32 cpu_based_vm_exec_control;</div><div class='add'>+	u32 exception_bitmap;</div><div class='add'>+	u32 vm_entry_controls;</div><div class='add'>+	u32 vm_entry_intr_info_field;</div><div class='add'>+	u32 vm_entry_exception_error_code;</div><div class='add'>+	u32 vm_entry_instruction_len;</div><div class='add'>+	u32 tpr_threshold;</div><div class='add'>+</div><div class='add'>+	u64 guest_rip;</div><div class='add'>+</div><div class='add'>+	u32 hv_clean_fields;</div><div class='add'>+	u32 padding32_1;</div><div class='add'>+	u32 hv_synthetic_controls;</div><div class='add'>+	struct {</div><div class='add'>+		u32 nested_flush_hypercall:1;</div><div class='add'>+		u32 msr_bitmap:1;</div><div class='add'>+		u32 reserved:30;</div><div class='add'>+	}  __packed hv_enlightenments_control;</div><div class='add'>+	u32 hv_vp_id;</div><div class='add'>+	u32 padding32_2;</div><div class='add'>+	u64 hv_vm_id;</div><div class='add'>+	u64 partition_assist_page;</div><div class='add'>+	u64 padding64_4[4];</div><div class='add'>+	u64 guest_bndcfgs;</div><div class='add'>+	u64 guest_ia32_perf_global_ctrl;</div><div class='add'>+	u64 guest_ia32_s_cet;</div><div class='add'>+	u64 guest_ssp;</div><div class='add'>+	u64 guest_ia32_int_ssp_table_addr;</div><div class='add'>+	u64 guest_ia32_lbr_ctl;</div><div class='add'>+	u64 padding64_5[2];</div><div class='add'>+	u64 xss_exit_bitmap;</div><div class='add'>+	u64 encls_exiting_bitmap;</div><div class='add'>+	u64 host_ia32_perf_global_ctrl;</div><div class='add'>+	u64 tsc_multiplier;</div><div class='add'>+	u64 host_ia32_s_cet;</div><div class='add'>+	u64 host_ssp;</div><div class='add'>+	u64 host_ia32_int_ssp_table_addr;</div><div class='add'>+	u64 padding64_6;</div><div class='add'>+} __packed;</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE			0</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_IO_BITMAP		BIT(0)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP		BIT(1)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2		BIT(2)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1		BIT(3)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_PROC		BIT(4)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EVENT		BIT(5)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_ENTRY		BIT(6)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EXCPN		BIT(7)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_CRDR			BIT(8)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT		BIT(9)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_BASIC		BIT(10)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1		BIT(11)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP2		BIT(12)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER		BIT(13)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1		BIT(14)</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_ENLIGHTENMENTSCONTROL	BIT(15)</div><div class='add'>+</div><div class='add'>+#define HV_VMX_ENLIGHTENED_CLEAN_FIELD_ALL			0xFFFF</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note, Hyper-V isn't actually stealing bit 28 from Intel, just abusing it by</div><div class='add'>+ * pairing it with architecturally impossible exit reasons.  Bit 28 is set only</div><div class='add'>+ * on SMI exits to a SMI transfer monitor (STM) and if and only if a MTF VM-Exit</div><div class='add'>+ * is pending.  I.e. it will never be set by hardware for non-SMI exits (there</div><div class='add'>+ * are only three), nor will it ever be set unless the VMM is an STM.</div><div class='add'>+ */</div><div class='add'>+#define HV_VMX_SYNTHETIC_EXIT_REASON_TRAP_AFTER_FLUSH		0x10000031</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Hyper-V uses the software reserved 32 bytes in VMCB control area to expose</div><div class='add'>+ * SVM enlightenments to guests. This is documented in the TLFS doc.</div><div class='add'>+ * Note on naming: SVM_NESTED_ENLIGHTENED_VMCB_FIELDS</div><div class='add'>+ */</div><div class='add'>+struct hv_vmcb_enlightenments {</div><div class='add'>+	struct __packed hv_enlightenments_control {</div><div class='add'>+		u32 nested_flush_hypercall : 1;</div><div class='add'>+		u32 msr_bitmap : 1;</div><div class='add'>+		u32 enlightened_npt_tlb: 1;</div><div class='add'>+		u32 reserved : 29;</div><div class='add'>+	} __packed hv_enlightenments_control;</div><div class='add'>+	u32 hv_vp_id;</div><div class='add'>+	u64 hv_vm_id;</div><div class='add'>+	u64 partition_assist_page;</div><div class='add'>+	u64 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Hyper-V uses the software reserved clean bit in VMCB.</div><div class='add'>+ */</div><div class='add'>+#define HV_VMCB_NESTED_ENLIGHTENMENTS		31</div><div class='add'>+</div><div class='add'>+/* Synthetic VM-Exit */</div><div class='add'>+#define HV_SVM_EXITCODE_ENL			0xf0000000</div><div class='add'>+#define HV_SVM_ENL_EXITCODE_TRAP_AFTER_FLUSH	(1)</div><div class='add'>+</div><div class='add'>+/* VM_PARTITION_ASSIST_PAGE */</div><div class='add'>+struct hv_partition_assist_pg {</div><div class='add'>+	u32 tlb_lock_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Define connection identifier type. */</div><div class='add'>+union hv_connection_id {</div><div class='add'>+	u32 asu32;</div><div class='add'>+	struct {</div><div class='add'>+		u32 id : 24;</div><div class='add'>+		u32 reserved : 8;</div><div class='add'>+	} __packed u;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_input_unmap_gpa_pages {</div><div class='add'>+	u64 target_partition_id;</div><div class='add'>+	u64 target_gpa_base;</div><div class='add'>+	u32 unmap_flags;</div><div class='add'>+	u32 padding;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#endif /* #ifndef _HV_HVGDK_H */</div><div class='head'>diff --git a/include/hyperv/hvgdk_ext.h b/include/hyperv/hvgdk_ext.h<br/>new file mode 100644<br/>index 000000000000..641b591ee61f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/hyperv/hvgdk_ext.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/hyperv/hvgdk_ext.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Type definitions for the Microsoft Hypervisor.</div><div class='add'>+ */</div><div class='add'>+#ifndef _HV_HVGDK_EXT_H</div><div class='add'>+#define _HV_HVGDK_EXT_H</div><div class='add'>+</div><div class='add'>+#include "hvgdk_mini.h"</div><div class='add'>+</div><div class='add'>+/* Extended hypercalls */</div><div class='add'>+#define HV_EXT_CALL_QUERY_CAPABILITIES		0x8001</div><div class='add'>+#define HV_EXT_CALL_MEMORY_HEAT_HINT		0x8003</div><div class='add'>+</div><div class='add'>+/* Extended hypercalls */</div><div class='add'>+enum {		/* HV_EXT_CALL */</div><div class='add'>+	HV_EXTCALL_QUERY_CAPABILITIES = 0x8001,</div><div class='add'>+	HV_EXTCALL_MEMORY_HEAT_HINT   = 0x8003,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HV_EXT_OUTPUT_QUERY_CAPABILITIES */</div><div class='add'>+#define HV_EXT_CAPABILITY_MEMORY_COLD_DISCARD_HINT BIT(8)</div><div class='add'>+</div><div class='add'>+enum {		/* HV_EXT_MEMORY_HEAT_HINT_TYPE */</div><div class='add'>+	HV_EXTMEM_HEAT_HINT_COLD = 0,</div><div class='add'>+	HV_EXTMEM_HEAT_HINT_HOT = 1,</div><div class='add'>+	HV_EXTMEM_HEAT_HINT_COLD_DISCARD = 2,</div><div class='add'>+	HV_EXTMEM_HEAT_HINT_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The whole argument should fit in a page to be able to pass to the hypervisor</div><div class='add'>+ * in one hypercall.</div><div class='add'>+ */</div><div class='add'>+#define HV_MEMORY_HINT_MAX_GPA_PAGE_RANGES  \</div><div class='add'>+	((HV_HYP_PAGE_SIZE - sizeof(struct hv_memory_hint)) / \</div><div class='add'>+		sizeof(union hv_gpa_page_range))</div><div class='add'>+</div><div class='add'>+/* HvExtCallMemoryHeatHint hypercall */</div><div class='add'>+#define HV_EXT_MEMORY_HEAT_HINT_TYPE_COLD_DISCARD	2</div><div class='add'>+struct hv_memory_hint {		/* HV_EXT_INPUT_MEMORY_HEAT_HINT */</div><div class='add'>+	u64 heat_type : 2;	/* HV_EXTMEM_HEAT_HINT_* */</div><div class='add'>+	u64 reserved : 62;</div><div class='add'>+	union hv_gpa_page_range ranges[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#endif /* _HV_HVGDK_EXT_H */</div><div class='head'>diff --git a/include/hyperv/hvgdk_mini.h b/include/hyperv/hvgdk_mini.h<br/>new file mode 100644<br/>index 000000000000..04b18d0e37af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/hyperv/hvgdk_mini.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/hyperv/hvgdk_mini.h</a></div><div class='hunk'>@@ -0,0 +1,1528 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Type definitions for the Microsoft hypervisor.</div><div class='add'>+ */</div><div class='add'>+#ifndef _HV_HVGDK_MINI_H</div><div class='add'>+#define _HV_HVGDK_MINI_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+struct hv_u128 {</div><div class='add'>+	u64 low_part;</div><div class='add'>+	u64 high_part;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* NOTE: when adding below, update hv_result_to_string() */</div><div class='add'>+#define HV_STATUS_SUCCESS			    0x0</div><div class='add'>+#define HV_STATUS_INVALID_HYPERCALL_CODE	    0x2</div><div class='add'>+#define HV_STATUS_INVALID_HYPERCALL_INPUT	    0x3</div><div class='add'>+#define HV_STATUS_INVALID_ALIGNMENT		    0x4</div><div class='add'>+#define HV_STATUS_INVALID_PARAMETER		    0x5</div><div class='add'>+#define HV_STATUS_ACCESS_DENIED			    0x6</div><div class='add'>+#define HV_STATUS_INVALID_PARTITION_STATE	    0x7</div><div class='add'>+#define HV_STATUS_OPERATION_DENIED		    0x8</div><div class='add'>+#define HV_STATUS_UNKNOWN_PROPERTY		    0x9</div><div class='add'>+#define HV_STATUS_PROPERTY_VALUE_OUT_OF_RANGE	    0xA</div><div class='add'>+#define HV_STATUS_INSUFFICIENT_MEMORY		    0xB</div><div class='add'>+#define HV_STATUS_INVALID_PARTITION_ID		    0xD</div><div class='add'>+#define HV_STATUS_INVALID_VP_INDEX		    0xE</div><div class='add'>+#define HV_STATUS_NOT_FOUND			    0x10</div><div class='add'>+#define HV_STATUS_INVALID_PORT_ID		    0x11</div><div class='add'>+#define HV_STATUS_INVALID_CONNECTION_ID		    0x12</div><div class='add'>+#define HV_STATUS_INSUFFICIENT_BUFFERS		    0x13</div><div class='add'>+#define HV_STATUS_NOT_ACKNOWLEDGED		    0x14</div><div class='add'>+#define HV_STATUS_INVALID_VP_STATE		    0x15</div><div class='add'>+#define HV_STATUS_NO_RESOURCES			    0x1D</div><div class='add'>+#define HV_STATUS_PROCESSOR_FEATURE_NOT_SUPPORTED   0x20</div><div class='add'>+#define HV_STATUS_INVALID_LP_INDEX		    0x41</div><div class='add'>+#define HV_STATUS_INVALID_REGISTER_VALUE	    0x50</div><div class='add'>+#define HV_STATUS_OPERATION_FAILED		    0x71</div><div class='add'>+#define HV_STATUS_TIME_OUT			    0x78</div><div class='add'>+#define HV_STATUS_CALL_PENDING			    0x79</div><div class='add'>+#define HV_STATUS_VTL_ALREADY_ENABLED		    0x86</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Hyper-V TimeRefCount register and the TSC</div><div class='add'>+ * page provide a guest VM clock with 100ns tick rate</div><div class='add'>+ */</div><div class='add'>+#define HV_CLOCK_HZ (NSEC_PER_SEC / 100)</div><div class='add'>+</div><div class='add'>+#define HV_HYP_PAGE_SHIFT		12</div><div class='add'>+#define HV_HYP_PAGE_SIZE		BIT(HV_HYP_PAGE_SHIFT)</div><div class='add'>+#define HV_HYP_PAGE_MASK		(~(HV_HYP_PAGE_SIZE - 1))</div><div class='add'>+#define HV_HYP_LARGE_PAGE_SHIFT		21</div><div class='add'>+</div><div class='add'>+#define HV_PARTITION_ID_INVALID		((u64)0)</div><div class='add'>+#define HV_PARTITION_ID_SELF		((u64)-1)</div><div class='add'>+</div><div class='add'>+/* Hyper-V specific model specific registers (MSRs) */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+/* HV_X64_SYNTHETIC_MSR */</div><div class='add'>+#define HV_X64_MSR_GUEST_OS_ID			0x40000000</div><div class='add'>+#define HV_X64_MSR_HYPERCALL			0x40000001</div><div class='add'>+#define HV_X64_MSR_VP_INDEX			0x40000002</div><div class='add'>+#define HV_X64_MSR_RESET			0x40000003</div><div class='add'>+#define HV_X64_MSR_VP_RUNTIME			0x40000010</div><div class='add'>+#define HV_X64_MSR_TIME_REF_COUNT		0x40000020</div><div class='add'>+#define HV_X64_MSR_REFERENCE_TSC		0x40000021</div><div class='add'>+#define HV_X64_MSR_TSC_FREQUENCY		0x40000022</div><div class='add'>+#define HV_X64_MSR_APIC_FREQUENCY		0x40000023</div><div class='add'>+</div><div class='add'>+/* Define the virtual APIC registers */</div><div class='add'>+#define HV_X64_MSR_EOI				0x40000070</div><div class='add'>+#define HV_X64_MSR_ICR				0x40000071</div><div class='add'>+#define HV_X64_MSR_TPR				0x40000072</div><div class='add'>+#define HV_X64_MSR_VP_ASSIST_PAGE		0x40000073</div><div class='add'>+</div><div class='add'>+/* Define synthetic interrupt controller model specific registers. */</div><div class='add'>+#define HV_X64_MSR_SCONTROL			0x40000080</div><div class='add'>+#define HV_X64_MSR_SVERSION			0x40000081</div><div class='add'>+#define HV_X64_MSR_SIEFP			0x40000082</div><div class='add'>+#define HV_X64_MSR_SIMP				0x40000083</div><div class='add'>+#define HV_X64_MSR_EOM				0x40000084</div><div class='add'>+#define HV_X64_MSR_SIRBP			0x40000085</div><div class='add'>+#define HV_X64_MSR_SINT0			0x40000090</div><div class='add'>+#define HV_X64_MSR_SINT1			0x40000091</div><div class='add'>+#define HV_X64_MSR_SINT2			0x40000092</div><div class='add'>+#define HV_X64_MSR_SINT3			0x40000093</div><div class='add'>+#define HV_X64_MSR_SINT4			0x40000094</div><div class='add'>+#define HV_X64_MSR_SINT5			0x40000095</div><div class='add'>+#define HV_X64_MSR_SINT6			0x40000096</div><div class='add'>+#define HV_X64_MSR_SINT7			0x40000097</div><div class='add'>+#define HV_X64_MSR_SINT8			0x40000098</div><div class='add'>+#define HV_X64_MSR_SINT9			0x40000099</div><div class='add'>+#define HV_X64_MSR_SINT10			0x4000009A</div><div class='add'>+#define HV_X64_MSR_SINT11			0x4000009B</div><div class='add'>+#define HV_X64_MSR_SINT12			0x4000009C</div><div class='add'>+#define HV_X64_MSR_SINT13			0x4000009D</div><div class='add'>+#define HV_X64_MSR_SINT14			0x4000009E</div><div class='add'>+#define HV_X64_MSR_SINT15			0x4000009F</div><div class='add'>+</div><div class='add'>+/* Define synthetic interrupt controller model specific registers for nested hypervisor */</div><div class='add'>+#define HV_X64_MSR_NESTED_SCONTROL		0x40001080</div><div class='add'>+#define HV_X64_MSR_NESTED_SVERSION		0x40001081</div><div class='add'>+#define HV_X64_MSR_NESTED_SIEFP			0x40001082</div><div class='add'>+#define HV_X64_MSR_NESTED_SIMP			0x40001083</div><div class='add'>+#define HV_X64_MSR_NESTED_EOM			0x40001084</div><div class='add'>+#define HV_X64_MSR_NESTED_SINT0			0x40001090</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Synthetic Timer MSRs. Four timers per vcpu.</div><div class='add'>+ */</div><div class='add'>+#define HV_X64_MSR_STIMER0_CONFIG		0x400000B0</div><div class='add'>+#define HV_X64_MSR_STIMER0_COUNT		0x400000B1</div><div class='add'>+#define HV_X64_MSR_STIMER1_CONFIG		0x400000B2</div><div class='add'>+#define HV_X64_MSR_STIMER1_COUNT		0x400000B3</div><div class='add'>+#define HV_X64_MSR_STIMER2_CONFIG		0x400000B4</div><div class='add'>+#define HV_X64_MSR_STIMER2_COUNT		0x400000B5</div><div class='add'>+#define HV_X64_MSR_STIMER3_CONFIG		0x400000B6</div><div class='add'>+#define HV_X64_MSR_STIMER3_COUNT		0x400000B7</div><div class='add'>+</div><div class='add'>+/* Hyper-V guest idle MSR */</div><div class='add'>+#define HV_X64_MSR_GUEST_IDLE			0x400000F0</div><div class='add'>+</div><div class='add'>+/* Hyper-V guest crash notification MSR's */</div><div class='add'>+#define HV_X64_MSR_CRASH_P0			0x40000100</div><div class='add'>+#define HV_X64_MSR_CRASH_P1			0x40000101</div><div class='add'>+#define HV_X64_MSR_CRASH_P2			0x40000102</div><div class='add'>+#define HV_X64_MSR_CRASH_P3			0x40000103</div><div class='add'>+#define HV_X64_MSR_CRASH_P4			0x40000104</div><div class='add'>+#define HV_X64_MSR_CRASH_CTL			0x40000105</div><div class='add'>+</div><div class='add'>+#define HV_X64_MSR_HYPERCALL_ENABLE		0x00000001</div><div class='add'>+#define HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_SHIFT	12</div><div class='add'>+#define HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_MASK	\</div><div class='add'>+		(~((1ull &lt;&lt; HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_SHIFT) - 1))</div><div class='add'>+</div><div class='add'>+#define HV_X64_MSR_CRASH_PARAMS		\</div><div class='add'>+		(1 + (HV_X64_MSR_CRASH_P4 - HV_X64_MSR_CRASH_P0))</div><div class='add'>+</div><div class='add'>+#define HV_IPI_LOW_VECTOR	 0x10</div><div class='add'>+#define HV_IPI_HIGH_VECTOR	 0xff</div><div class='add'>+</div><div class='add'>+#define HV_X64_MSR_VP_ASSIST_PAGE_ENABLE	0x00000001</div><div class='add'>+#define HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_SHIFT	12</div><div class='add'>+#define HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_MASK	\</div><div class='add'>+		(~((1ull &lt;&lt; HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_SHIFT) - 1))</div><div class='add'>+</div><div class='add'>+/* Hyper-V Enlightened VMCS version mask in nested features CPUID */</div><div class='add'>+#define HV_X64_ENLIGHTENED_VMCS_VERSION		0xff</div><div class='add'>+</div><div class='add'>+#define HV_X64_MSR_TSC_REFERENCE_ENABLE		0x00000001</div><div class='add'>+#define HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT	12</div><div class='add'>+</div><div class='add'>+/* Number of XMM registers used in hypercall input/output */</div><div class='add'>+#define HV_HYPERCALL_MAX_XMM_REGISTERS		6</div><div class='add'>+</div><div class='add'>+struct hv_reenlightenment_control {</div><div class='add'>+	u64 vector : 8;</div><div class='add'>+	u64 reserved1 : 8;</div><div class='add'>+	u64 enabled : 1;</div><div class='add'>+	u64 reserved2 : 15;</div><div class='add'>+	u64 target_vp : 32;</div><div class='add'>+}  __packed;</div><div class='add'>+</div><div class='add'>+struct hv_tsc_emulation_status {	 /* HV_TSC_EMULATION_STATUS */</div><div class='add'>+	u64 inprogress : 1;</div><div class='add'>+	u64 reserved : 63;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_tsc_emulation_control {	 /* HV_TSC_INVARIANT_CONTROL */</div><div class='add'>+	u64 enabled : 1;</div><div class='add'>+	u64 reserved : 63;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* TSC emulation after migration */</div><div class='add'>+#define HV_X64_MSR_REENLIGHTENMENT_CONTROL	0x40000106</div><div class='add'>+#define HV_X64_MSR_TSC_EMULATION_CONTROL	0x40000107</div><div class='add'>+#define HV_X64_MSR_TSC_EMULATION_STATUS		0x40000108</div><div class='add'>+#define HV_X64_MSR_TSC_INVARIANT_CONTROL	0x40000118</div><div class='add'>+#define HV_EXPOSE_INVARIANT_TSC		BIT_ULL(0)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_X86 */</div><div class='add'>+</div><div class='add'>+struct hv_output_get_partition_id {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HV_CRASH_CTL_REG_CONTENTS */</div><div class='add'>+#define HV_CRASH_CTL_CRASH_NOTIFY_MSG		 BIT_ULL(62)</div><div class='add'>+#define HV_CRASH_CTL_CRASH_NOTIFY		 BIT_ULL(63)</div><div class='add'>+</div><div class='add'>+union hv_reference_tsc_msr {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 enable : 1;</div><div class='add'>+		u64 reserved : 11;</div><div class='add'>+		u64 pfn : 52;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The maximum number of sparse vCPU banks which can be encoded by 'struct hv_vpset' */</div><div class='add'>+#define HV_MAX_SPARSE_VCPU_BANKS (64)</div><div class='add'>+/* The number of vCPUs in one sparse bank */</div><div class='add'>+#define HV_VCPUS_PER_SPARSE_BANK (64)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some of Hyper-V structs do not use hv_vpset where linux uses them.</div><div class='add'>+ *</div><div class='add'>+ * struct hv_vpset is usually used as part of hypercall input. The portion</div><div class='add'>+ * that counts as "fixed size input header" vs. "variable size input header"</div><div class='add'>+ * varies per hypercall. See comments at relevant hypercall call sites as to</div><div class='add'>+ * how the "valid_bank_mask" field should be accounted.</div><div class='add'>+ */</div><div class='add'>+struct hv_vpset {	 /* HV_VP_SET */</div><div class='add'>+	u64 format;</div><div class='add'>+	u64 valid_bank_mask;</div><div class='add'>+	u64 bank_contents[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Version info reported by hypervisor</div><div class='add'>+ * Changed to a union for convenience</div><div class='add'>+ */</div><div class='add'>+union hv_hypervisor_version_info {</div><div class='add'>+	struct {</div><div class='add'>+		u32 build_number;</div><div class='add'>+</div><div class='add'>+		u32 minor_version : 16;</div><div class='add'>+		u32 major_version : 16;</div><div class='add'>+</div><div class='add'>+		u32 service_pack;</div><div class='add'>+</div><div class='add'>+		u32 service_number : 24;</div><div class='add'>+		u32 service_branch : 8;</div><div class='add'>+	};</div><div class='add'>+	struct {</div><div class='add'>+		u32 eax;</div><div class='add'>+		u32 ebx;</div><div class='add'>+		u32 ecx;</div><div class='add'>+		u32 edx;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HV_CPUID_FUNCTION */</div><div class='add'>+#define HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS	0x40000000</div><div class='add'>+#define HYPERV_CPUID_INTERFACE			0x40000001</div><div class='add'>+#define HYPERV_CPUID_VERSION			0x40000002</div><div class='add'>+#define HYPERV_CPUID_FEATURES			0x40000003</div><div class='add'>+#define HYPERV_CPUID_ENLIGHTMENT_INFO		0x40000004</div><div class='add'>+#define HYPERV_CPUID_IMPLEMENT_LIMITS		0x40000005</div><div class='add'>+#define HYPERV_CPUID_CPU_MANAGEMENT_FEATURES	0x40000007</div><div class='add'>+#define HYPERV_CPUID_NESTED_FEATURES		0x4000000A</div><div class='add'>+#define HYPERV_CPUID_ISOLATION_CONFIG		0x4000000C</div><div class='add'>+</div><div class='add'>+#define HYPERV_CPUID_VIRT_STACK_INTERFACE	 0x40000081</div><div class='add'>+#define HYPERV_VS_INTERFACE_EAX_SIGNATURE	 0x31235356  /* "VS#1" */</div><div class='add'>+</div><div class='add'>+#define HYPERV_CPUID_VIRT_STACK_PROPERTIES	 0x40000082</div><div class='add'>+/* Support for the extended IOAPIC RTE format */</div><div class='add'>+#define HYPERV_VS_PROPERTIES_EAX_EXTENDED_IOAPIC_RTE	 BIT(2)</div><div class='add'>+#define HYPERV_VS_PROPERTIES_EAX_CONFIDENTIAL_VMBUS_AVAILABLE	 BIT(3)</div><div class='add'>+</div><div class='add'>+#define HYPERV_HYPERVISOR_PRESENT_BIT		 0x80000000</div><div class='add'>+#define HYPERV_CPUID_MIN			 0x40000005</div><div class='add'>+#define HYPERV_CPUID_MAX			 0x4000ffff</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HV_X64_HYPERVISOR_FEATURES (EAX), or</div><div class='add'>+ * HV_PARTITION_PRIVILEGE_MASK [31-0]</div><div class='add'>+ */</div><div class='add'>+#define HV_MSR_VP_RUNTIME_AVAILABLE			BIT(0)</div><div class='add'>+#define HV_MSR_TIME_REF_COUNT_AVAILABLE			BIT(1)</div><div class='add'>+#define HV_MSR_SYNIC_AVAILABLE				BIT(2)</div><div class='add'>+#define HV_MSR_SYNTIMER_AVAILABLE			BIT(3)</div><div class='add'>+#define HV_MSR_APIC_ACCESS_AVAILABLE			BIT(4)</div><div class='add'>+#define HV_MSR_HYPERCALL_AVAILABLE			BIT(5)</div><div class='add'>+#define HV_MSR_VP_INDEX_AVAILABLE			BIT(6)</div><div class='add'>+#define HV_MSR_RESET_AVAILABLE				BIT(7)</div><div class='add'>+#define HV_MSR_STAT_PAGES_AVAILABLE			BIT(8)</div><div class='add'>+#define HV_MSR_REFERENCE_TSC_AVAILABLE			BIT(9)</div><div class='add'>+#define HV_MSR_GUEST_IDLE_AVAILABLE			BIT(10)</div><div class='add'>+#define HV_ACCESS_FREQUENCY_MSRS			BIT(11)</div><div class='add'>+#define HV_ACCESS_REENLIGHTENMENT			BIT(13)</div><div class='add'>+#define HV_ACCESS_TSC_INVARIANT				BIT(15)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HV_X64_HYPERVISOR_FEATURES (EBX), or</div><div class='add'>+ * HV_PARTITION_PRIVILEGE_MASK [63-32]</div><div class='add'>+ */</div><div class='add'>+#define HV_CREATE_PARTITIONS				BIT(0)</div><div class='add'>+#define HV_ACCESS_PARTITION_ID				BIT(1)</div><div class='add'>+#define HV_ACCESS_MEMORY_POOL				BIT(2)</div><div class='add'>+#define HV_ADJUST_MESSAGE_BUFFERS			BIT(3)</div><div class='add'>+#define HV_POST_MESSAGES				BIT(4)</div><div class='add'>+#define HV_SIGNAL_EVENTS				BIT(5)</div><div class='add'>+#define HV_CREATE_PORT					BIT(6)</div><div class='add'>+#define HV_CONNECT_PORT					BIT(7)</div><div class='add'>+#define HV_ACCESS_STATS					BIT(8)</div><div class='add'>+#define HV_DEBUGGING					BIT(11)</div><div class='add'>+#define HV_CPU_MANAGEMENT				BIT(12)</div><div class='add'>+#define HV_ENABLE_EXTENDED_HYPERCALLS			BIT(20)</div><div class='add'>+#define HV_ISOLATION					BIT(22)</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+/* HV_X64_HYPERVISOR_FEATURES (EDX) */</div><div class='add'>+#define HV_X64_MWAIT_AVAILABLE				BIT(0)</div><div class='add'>+#define HV_X64_GUEST_DEBUGGING_AVAILABLE		BIT(1)</div><div class='add'>+#define HV_X64_PERF_MONITOR_AVAILABLE			BIT(2)</div><div class='add'>+#define HV_X64_CPU_DYNAMIC_PARTITIONING_AVAILABLE	BIT(3)</div><div class='add'>+#define HV_X64_HYPERCALL_XMM_INPUT_AVAILABLE		BIT(4)</div><div class='add'>+#define HV_X64_GUEST_IDLE_STATE_AVAILABLE		BIT(5)</div><div class='add'>+#define HV_FEATURE_FREQUENCY_MSRS_AVAILABLE		BIT(8)</div><div class='add'>+#define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE		BIT(10)</div><div class='add'>+#define HV_FEATURE_DEBUG_MSRS_AVAILABLE			BIT(11)</div><div class='add'>+#define HV_FEATURE_EXT_GVA_RANGES_FLUSH			BIT(14)</div><div class='add'>+/*</div><div class='add'>+ * Support for returning hypercall output block via XMM</div><div class='add'>+ * registers is available</div><div class='add'>+ */</div><div class='add'>+#define HV_X64_HYPERCALL_XMM_OUTPUT_AVAILABLE		BIT(15)</div><div class='add'>+/* stimer Direct Mode is available */</div><div class='add'>+#define HV_STIMER_DIRECT_MODE_AVAILABLE			BIT(19)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Implementation recommendations. Indicates which behaviors the hypervisor</div><div class='add'>+ * recommends the OS implement for optimal performance.</div><div class='add'>+ * These are HYPERV_CPUID_ENLIGHTMENT_INFO.EAX bits.</div><div class='add'>+ */</div><div class='add'>+/* HV_X64_ENLIGHTENMENT_INFORMATION */</div><div class='add'>+#define HV_X64_AS_SWITCH_RECOMMENDED			BIT(0)</div><div class='add'>+#define HV_X64_LOCAL_TLB_FLUSH_RECOMMENDED		BIT(1)</div><div class='add'>+#define HV_X64_REMOTE_TLB_FLUSH_RECOMMENDED		BIT(2)</div><div class='add'>+#define HV_X64_APIC_ACCESS_RECOMMENDED			BIT(3)</div><div class='add'>+#define HV_X64_SYSTEM_RESET_RECOMMENDED			BIT(4)</div><div class='add'>+#define HV_X64_RELAXED_TIMING_RECOMMENDED		BIT(5)</div><div class='add'>+#define HV_DEPRECATING_AEOI_RECOMMENDED			BIT(9)</div><div class='add'>+#define HV_X64_CLUSTER_IPI_RECOMMENDED			BIT(10)</div><div class='add'>+#define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED		BIT(11)</div><div class='add'>+#define HV_X64_HYPERV_NESTED				BIT(12)</div><div class='add'>+#define HV_X64_ENLIGHTENED_VMCS_RECOMMENDED		BIT(14)</div><div class='add'>+#define HV_X64_USE_MMIO_HYPERCALLS			BIT(21)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CPU management features identification.</div><div class='add'>+ * These are HYPERV_CPUID_CPU_MANAGEMENT_FEATURES.EAX bits.</div><div class='add'>+ */</div><div class='add'>+#define HV_X64_START_LOGICAL_PROCESSOR			BIT(0)</div><div class='add'>+#define HV_X64_CREATE_ROOT_VIRTUAL_PROCESSOR		BIT(1)</div><div class='add'>+#define HV_X64_PERFORMANCE_COUNTER_SYNC			BIT(2)</div><div class='add'>+#define HV_X64_RESERVED_IDENTITY_BIT			BIT(31)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Virtual processor will never share a physical core with another virtual</div><div class='add'>+ * processor, except for virtual processors that are reported as sibling SMT</div><div class='add'>+ * threads.</div><div class='add'>+ */</div><div class='add'>+#define HV_X64_NO_NONARCH_CORESHARING			BIT(18)</div><div class='add'>+</div><div class='add'>+/* Nested features. These are HYPERV_CPUID_NESTED_FEATURES.EAX bits. */</div><div class='add'>+#define HV_X64_NESTED_DIRECT_FLUSH			BIT(17)</div><div class='add'>+#define HV_X64_NESTED_GUEST_MAPPING_FLUSH		BIT(18)</div><div class='add'>+#define HV_X64_NESTED_MSR_BITMAP			BIT(19)</div><div class='add'>+</div><div class='add'>+/* Nested features #2. These are HYPERV_CPUID_NESTED_FEATURES.EBX bits. */</div><div class='add'>+#define HV_X64_NESTED_EVMCS1_PERF_GLOBAL_CTRL		BIT(0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is specific to AMD and specifies that enlightened TLB flush is</div><div class='add'>+ * supported. If guest opts in to this feature, ASID invalidations only</div><div class='add'>+ * flushes gva -&gt; hpa mapping entries. To flush the TLB entries derived</div><div class='add'>+ * from NPT, hypercalls should be used (HvFlushGuestPhysicalAddressSpace</div><div class='add'>+ * or HvFlushGuestPhysicalAddressList).</div><div class='add'>+ */</div><div class='add'>+#define HV_X64_NESTED_ENLIGHTENED_TLB			BIT(22)</div><div class='add'>+</div><div class='add'>+/* HYPERV_CPUID_ISOLATION_CONFIG.EAX bits. */</div><div class='add'>+#define HV_PARAVISOR_PRESENT				BIT(0)</div><div class='add'>+</div><div class='add'>+/* HYPERV_CPUID_ISOLATION_CONFIG.EBX bits. */</div><div class='add'>+#define HV_ISOLATION_TYPE				GENMASK(3, 0)</div><div class='add'>+#define HV_SHARED_GPA_BOUNDARY_ACTIVE			BIT(5)</div><div class='add'>+#define HV_SHARED_GPA_BOUNDARY_BITS			GENMASK(11, 6)</div><div class='add'>+</div><div class='add'>+/* HYPERV_CPUID_FEATURES.ECX bits. */</div><div class='add'>+#define HV_VP_DISPATCH_INTERRUPT_INJECTION_AVAILABLE	BIT(9)</div><div class='add'>+#define HV_VP_GHCB_ROOT_MAPPING_AVAILABLE		BIT(10)</div><div class='add'>+</div><div class='add'>+enum hv_isolation_type {</div><div class='add'>+	HV_ISOLATION_TYPE_NONE	= 0,	/* HV_PARTITION_ISOLATION_TYPE_NONE */</div><div class='add'>+	HV_ISOLATION_TYPE_VBS	= 1,</div><div class='add'>+	HV_ISOLATION_TYPE_SNP	= 2,</div><div class='add'>+	HV_ISOLATION_TYPE_TDX	= 3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_x64_msr_hypercall_contents {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 enable : 1;</div><div class='add'>+		u64 reserved : 11;</div><div class='add'>+		u64 guest_physical_address : 52;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_X86 */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARM64)</div><div class='add'>+#define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE	BIT(8)</div><div class='add'>+#define HV_STIMER_DIRECT_MODE_AVAILABLE		BIT(13)</div><div class='add'>+#endif /* CONFIG_ARM64 */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+#define HV_MAXIMUM_PROCESSORS	    2048</div><div class='add'>+#elif defined(CONFIG_ARM64) /* CONFIG_X86 */</div><div class='add'>+#define HV_MAXIMUM_PROCESSORS	    320</div><div class='add'>+#endif /* CONFIG_ARM64 */</div><div class='add'>+</div><div class='add'>+#define HV_MAX_VP_INDEX			(HV_MAXIMUM_PROCESSORS - 1)</div><div class='add'>+#define HV_VP_INDEX_SELF		((u32)-2)</div><div class='add'>+#define HV_ANY_VP			((u32)-1)</div><div class='add'>+</div><div class='add'>+union hv_vp_assist_msr_contents {	 /* HV_REGISTER_VP_ASSIST_PAGE */</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 enable : 1;</div><div class='add'>+		u64 reserved : 11;</div><div class='add'>+		u64 pfn : 52;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Declare the various hypercall operations. */</div><div class='add'>+/* HV_CALL_CODE */</div><div class='add'>+#define HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE		0x0002</div><div class='add'>+#define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST		0x0003</div><div class='add'>+#define HVCALL_NOTIFY_LONG_SPIN_WAIT			0x0008</div><div class='add'>+#define HVCALL_SEND_IPI					0x000b</div><div class='add'>+#define HVCALL_ENABLE_VP_VTL				0x000f</div><div class='add'>+#define HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE_EX		0x0013</div><div class='add'>+#define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST_EX		0x0014</div><div class='add'>+#define HVCALL_SEND_IPI_EX				0x0015</div><div class='add'>+#define HVCALL_CREATE_PARTITION				0x0040</div><div class='add'>+#define HVCALL_INITIALIZE_PARTITION			0x0041</div><div class='add'>+#define HVCALL_FINALIZE_PARTITION			0x0042</div><div class='add'>+#define HVCALL_DELETE_PARTITION				0x0043</div><div class='add'>+#define HVCALL_GET_PARTITION_PROPERTY			0x0044</div><div class='add'>+#define HVCALL_SET_PARTITION_PROPERTY			0x0045</div><div class='add'>+#define HVCALL_GET_PARTITION_ID				0x0046</div><div class='add'>+#define HVCALL_DEPOSIT_MEMORY				0x0048</div><div class='add'>+#define HVCALL_WITHDRAW_MEMORY				0x0049</div><div class='add'>+#define HVCALL_MAP_GPA_PAGES				0x004b</div><div class='add'>+#define HVCALL_UNMAP_GPA_PAGES				0x004c</div><div class='add'>+#define HVCALL_INSTALL_INTERCEPT			0x004d</div><div class='add'>+#define HVCALL_CREATE_VP				0x004e</div><div class='add'>+#define HVCALL_DELETE_VP				0x004f</div><div class='add'>+#define HVCALL_GET_VP_REGISTERS				0x0050</div><div class='add'>+#define HVCALL_SET_VP_REGISTERS				0x0051</div><div class='add'>+#define HVCALL_TRANSLATE_VIRTUAL_ADDRESS		0x0052</div><div class='add'>+#define HVCALL_CLEAR_VIRTUAL_INTERRUPT			0x0056</div><div class='add'>+#define HVCALL_DELETE_PORT				0x0058</div><div class='add'>+#define HVCALL_DISCONNECT_PORT				0x005b</div><div class='add'>+#define HVCALL_POST_MESSAGE				0x005c</div><div class='add'>+#define HVCALL_SIGNAL_EVENT				0x005d</div><div class='add'>+#define HVCALL_POST_DEBUG_DATA				0x0069</div><div class='add'>+#define HVCALL_RETRIEVE_DEBUG_DATA			0x006a</div><div class='add'>+#define HVCALL_RESET_DEBUG_SESSION			0x006b</div><div class='add'>+#define HVCALL_MAP_STATS_PAGE				0x006c</div><div class='add'>+#define HVCALL_UNMAP_STATS_PAGE				0x006d</div><div class='add'>+#define HVCALL_SET_SYSTEM_PROPERTY			0x006f</div><div class='add'>+#define HVCALL_ADD_LOGICAL_PROCESSOR			0x0076</div><div class='add'>+#define HVCALL_GET_SYSTEM_PROPERTY			0x007b</div><div class='add'>+#define HVCALL_MAP_DEVICE_INTERRUPT			0x007c</div><div class='add'>+#define HVCALL_UNMAP_DEVICE_INTERRUPT			0x007d</div><div class='add'>+#define HVCALL_RETARGET_INTERRUPT			0x007e</div><div class='add'>+#define HVCALL_NOTIFY_PARTITION_EVENT                   0x0087</div><div class='add'>+#define HVCALL_ENTER_SLEEP_STATE			0x0084</div><div class='add'>+#define HVCALL_NOTIFY_PORT_RING_EMPTY			0x008b</div><div class='add'>+#define HVCALL_REGISTER_INTERCEPT_RESULT		0x0091</div><div class='add'>+#define HVCALL_ASSERT_VIRTUAL_INTERRUPT			0x0094</div><div class='add'>+#define HVCALL_CREATE_PORT				0x0095</div><div class='add'>+#define HVCALL_CONNECT_PORT				0x0096</div><div class='add'>+#define HVCALL_START_VP					0x0099</div><div class='add'>+#define HVCALL_GET_VP_INDEX_FROM_APIC_ID		0x009a</div><div class='add'>+#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE	0x00af</div><div class='add'>+#define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST	0x00b0</div><div class='add'>+#define HVCALL_SIGNAL_EVENT_DIRECT			0x00c0</div><div class='add'>+#define HVCALL_POST_MESSAGE_DIRECT			0x00c1</div><div class='add'>+#define HVCALL_DISPATCH_VP				0x00c2</div><div class='add'>+#define HVCALL_GET_GPA_PAGES_ACCESS_STATES		0x00c9</div><div class='add'>+#define HVCALL_ACQUIRE_SPARSE_SPA_PAGE_HOST_ACCESS	0x00d7</div><div class='add'>+#define HVCALL_RELEASE_SPARSE_SPA_PAGE_HOST_ACCESS	0x00d8</div><div class='add'>+#define HVCALL_MODIFY_SPARSE_GPA_PAGE_HOST_VISIBILITY	0x00db</div><div class='add'>+#define HVCALL_MAP_VP_STATE_PAGE			0x00e1</div><div class='add'>+#define HVCALL_UNMAP_VP_STATE_PAGE			0x00e2</div><div class='add'>+#define HVCALL_GET_VP_STATE				0x00e3</div><div class='add'>+#define HVCALL_SET_VP_STATE				0x00e4</div><div class='add'>+#define HVCALL_GET_VP_CPUID_VALUES			0x00f4</div><div class='add'>+#define HVCALL_GET_PARTITION_PROPERTY_EX		0x0101</div><div class='add'>+#define HVCALL_MMIO_READ				0x0106</div><div class='add'>+#define HVCALL_MMIO_WRITE				0x0107</div><div class='add'>+#define HVCALL_DISABLE_HYP_EX                           0x010f</div><div class='add'>+#define HVCALL_MAP_STATS_PAGE2				0x0131</div><div class='add'>+</div><div class='add'>+/* HV_HYPERCALL_INPUT */</div><div class='add'>+#define HV_HYPERCALL_RESULT_MASK	GENMASK_ULL(15, 0)</div><div class='add'>+#define HV_HYPERCALL_FAST_BIT		BIT(16)</div><div class='add'>+#define HV_HYPERCALL_VARHEAD_OFFSET	17</div><div class='add'>+#define HV_HYPERCALL_VARHEAD_MASK	GENMASK_ULL(26, 17)</div><div class='add'>+#define HV_HYPERCALL_RSVD0_MASK		GENMASK_ULL(31, 27)</div><div class='add'>+#define HV_HYPERCALL_NESTED		BIT_ULL(31)</div><div class='add'>+#define HV_HYPERCALL_REP_COMP_OFFSET	32</div><div class='add'>+#define HV_HYPERCALL_REP_COMP_1		BIT_ULL(32)</div><div class='add'>+#define HV_HYPERCALL_REP_COMP_MASK	GENMASK_ULL(43, 32)</div><div class='add'>+#define HV_HYPERCALL_RSVD1_MASK		GENMASK_ULL(47, 44)</div><div class='add'>+#define HV_HYPERCALL_REP_START_OFFSET	48</div><div class='add'>+#define HV_HYPERCALL_REP_START_MASK	GENMASK_ULL(59, 48)</div><div class='add'>+#define HV_HYPERCALL_RSVD2_MASK		GENMASK_ULL(63, 60)</div><div class='add'>+#define HV_HYPERCALL_RSVD_MASK		(HV_HYPERCALL_RSVD0_MASK | \</div><div class='add'>+					 HV_HYPERCALL_RSVD1_MASK | \</div><div class='add'>+					 HV_HYPERCALL_RSVD2_MASK)</div><div class='add'>+</div><div class='add'>+/* HvFlushGuestPhysicalAddressSpace hypercalls */</div><div class='add'>+struct hv_guest_mapping_flush {</div><div class='add'>+	u64 address_space;</div><div class='add'>+	u64 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  HV_MAX_FLUSH_PAGES = "additional_pages" + 1. It's limited</div><div class='add'>+ *  by the bitwidth of "additional_pages" in union hv_gpa_page_range.</div><div class='add'>+ */</div><div class='add'>+#define HV_MAX_FLUSH_PAGES (2048)</div><div class='add'>+#define HV_GPA_PAGE_RANGE_PAGE_SIZE_2MB		0</div><div class='add'>+#define HV_GPA_PAGE_RANGE_PAGE_SIZE_1GB		1</div><div class='add'>+</div><div class='add'>+#define HV_FLUSH_ALL_PROCESSORS			BIT(0)</div><div class='add'>+#define HV_FLUSH_ALL_VIRTUAL_ADDRESS_SPACES	BIT(1)</div><div class='add'>+#define HV_FLUSH_NON_GLOBAL_MAPPINGS_ONLY	BIT(2)</div><div class='add'>+#define HV_FLUSH_USE_EXTENDED_RANGE_FORMAT	BIT(3)</div><div class='add'>+</div><div class='add'>+/* HvFlushGuestPhysicalAddressList, HvExtCallMemoryHeatHint hypercall */</div><div class='add'>+union hv_gpa_page_range {</div><div class='add'>+	u64 address_space;</div><div class='add'>+	struct {</div><div class='add'>+		u64 additional_pages : 11;</div><div class='add'>+		u64 largepage : 1;</div><div class='add'>+		u64 basepfn : 52;</div><div class='add'>+	} page;</div><div class='add'>+	struct {</div><div class='add'>+		u64 reserved : 12;</div><div class='add'>+		u64 page_size : 1;</div><div class='add'>+		u64 reserved1 : 8;</div><div class='add'>+		u64 base_large_pfn : 43;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * All input flush parameters should be in single page. The max flush</div><div class='add'>+ * count is equal with how many entries of union hv_gpa_page_range can</div><div class='add'>+ * be populated into the input parameter page.</div><div class='add'>+ */</div><div class='add'>+#define HV_MAX_FLUSH_REP_COUNT ((HV_HYP_PAGE_SIZE - 2 * sizeof(u64)) / \</div><div class='add'>+				sizeof(union hv_gpa_page_range))</div><div class='add'>+</div><div class='add'>+struct hv_guest_mapping_flush_list {</div><div class='add'>+	u64 address_space;</div><div class='add'>+	u64 flags;</div><div class='add'>+	union hv_gpa_page_range gpa_list[HV_MAX_FLUSH_REP_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_tlb_flush {	 /* HV_INPUT_FLUSH_VIRTUAL_ADDRESS_LIST */</div><div class='add'>+	u64 address_space;</div><div class='add'>+	u64 flags;</div><div class='add'>+	u64 processor_mask;</div><div class='add'>+	u64 gva_list[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HvFlushVirtualAddressSpaceEx, HvFlushVirtualAddressListEx hypercalls */</div><div class='add'>+struct hv_tlb_flush_ex {</div><div class='add'>+	u64 address_space;</div><div class='add'>+	u64 flags;</div><div class='add'>+	struct hv_vpset hv_vp_set;</div><div class='add'>+	u64 gva_list[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ms_hyperv_tsc_page {	 /* HV_REFERENCE_TSC_PAGE */</div><div class='add'>+	volatile u32 tsc_sequence;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	volatile u64 tsc_scale;</div><div class='add'>+	volatile s64 tsc_offset;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Define the number of synthetic interrupt sources. */</div><div class='add'>+#define HV_SYNIC_SINT_COUNT (16)</div><div class='add'>+</div><div class='add'>+/* Define the expected SynIC version. */</div><div class='add'>+#define HV_SYNIC_VERSION_1		(0x1)</div><div class='add'>+/* Valid SynIC vectors are 16-255. */</div><div class='add'>+#define HV_SYNIC_FIRST_VALID_VECTOR	(16)</div><div class='add'>+</div><div class='add'>+#define HV_SYNIC_CONTROL_ENABLE		(1ULL &lt;&lt; 0)</div><div class='add'>+#define HV_SYNIC_SIMP_ENABLE		(1ULL &lt;&lt; 0)</div><div class='add'>+#define HV_SYNIC_SIEFP_ENABLE		(1ULL &lt;&lt; 0)</div><div class='add'>+#define HV_SYNIC_SINT_MASKED		(1ULL &lt;&lt; 16)</div><div class='add'>+#define HV_SYNIC_SINT_AUTO_EOI		(1ULL &lt;&lt; 17)</div><div class='add'>+#define HV_SYNIC_SINT_VECTOR_MASK	(0xFF)</div><div class='add'>+</div><div class='add'>+/* Hyper-V defined statically assigned SINTs */</div><div class='add'>+#define HV_SYNIC_INTERCEPTION_SINT_INDEX 0x00000000</div><div class='add'>+#define HV_SYNIC_IOMMU_FAULT_SINT_INDEX  0x00000001</div><div class='add'>+#define HV_SYNIC_VMBUS_SINT_INDEX	 0x00000002</div><div class='add'>+#define HV_SYNIC_FIRST_UNUSED_SINT_INDEX 0x00000005</div><div class='add'>+</div><div class='add'>+/* mshv assigned SINT for doorbell */</div><div class='add'>+#define HV_SYNIC_DOORBELL_SINT_INDEX     HV_SYNIC_FIRST_UNUSED_SINT_INDEX</div><div class='add'>+</div><div class='add'>+enum hv_interrupt_type {</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_FIXED		= 0x0000,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_LOWESTPRIORITY	= 0x0001,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_SMI		= 0x0002,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_REMOTEREAD	= 0x0003,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_NMI		= 0x0004,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_INIT		= 0x0005,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_SIPI		= 0x0006,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_EXTINT		= 0x0007,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_LOCALINT0		= 0x0008,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_LOCALINT1		= 0x0009,</div><div class='add'>+	HV_X64_INTERRUPT_TYPE_MAXIMUM		= 0x000A,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Define synthetic interrupt source. */</div><div class='add'>+union hv_synic_sint {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 vector : 8;</div><div class='add'>+		u64 reserved1 : 8;</div><div class='add'>+		u64 masked : 1;</div><div class='add'>+		u64 auto_eoi : 1;</div><div class='add'>+		u64 polling : 1;</div><div class='add'>+		u64 as_intercept : 1;</div><div class='add'>+		u64 proxy : 1;</div><div class='add'>+		u64 reserved2 : 43;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_x64_xsave_xfem_register {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u32 low_uint32;</div><div class='add'>+		u32 high_uint32;</div><div class='add'>+	} __packed;</div><div class='add'>+	struct {</div><div class='add'>+		u64 legacy_x87 : 1;</div><div class='add'>+		u64 legacy_sse : 1;</div><div class='add'>+		u64 avx : 1;</div><div class='add'>+		u64 mpx_bndreg : 1;</div><div class='add'>+		u64 mpx_bndcsr : 1;</div><div class='add'>+		u64 avx_512_op_mask : 1;</div><div class='add'>+		u64 avx_512_zmmhi : 1;</div><div class='add'>+		u64 avx_512_zmm16_31 : 1;</div><div class='add'>+		u64 rsvd8_9 : 2;</div><div class='add'>+		u64 pasid : 1;</div><div class='add'>+		u64 cet_u : 1;</div><div class='add'>+		u64 cet_s : 1;</div><div class='add'>+		u64 rsvd13_16 : 4;</div><div class='add'>+		u64 xtile_cfg : 1;</div><div class='add'>+		u64 xtile_data : 1;</div><div class='add'>+		u64 rsvd19_63 : 45;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Synthetic timer configuration */</div><div class='add'>+union hv_stimer_config {	 /* HV_X64_MSR_STIMER_CONFIG_CONTENTS */</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 enable : 1;</div><div class='add'>+		u64 periodic : 1;</div><div class='add'>+		u64 lazy : 1;</div><div class='add'>+		u64 auto_enable : 1;</div><div class='add'>+		u64 apic_vector : 8;</div><div class='add'>+		u64 direct_mode : 1;</div><div class='add'>+		u64 reserved_z0 : 3;</div><div class='add'>+		u64 sintx : 4;</div><div class='add'>+		u64 reserved_z1 : 44;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Define the number of synthetic timers */</div><div class='add'>+#define HV_SYNIC_STIMER_COUNT	(4)</div><div class='add'>+</div><div class='add'>+/* Define port identifier type. */</div><div class='add'>+union hv_port_id {</div><div class='add'>+	u32 asu32;</div><div class='add'>+	struct {</div><div class='add'>+		u32 id : 24;</div><div class='add'>+		u32 reserved : 8;</div><div class='add'>+	} __packed u;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HV_MESSAGE_SIZE			(256)</div><div class='add'>+#define HV_MESSAGE_PAYLOAD_BYTE_COUNT	(240)</div><div class='add'>+#define HV_MESSAGE_PAYLOAD_QWORD_COUNT	(30)</div><div class='add'>+</div><div class='add'>+/* Define hypervisor message types. */</div><div class='add'>+enum hv_message_type {</div><div class='add'>+	HVMSG_NONE				= 0x00000000,</div><div class='add'>+</div><div class='add'>+	/* Memory access messages. */</div><div class='add'>+	HVMSG_UNMAPPED_GPA			= 0x80000000,</div><div class='add'>+	HVMSG_GPA_INTERCEPT			= 0x80000001,</div><div class='add'>+</div><div class='add'>+	/* Timer notification messages. */</div><div class='add'>+	HVMSG_TIMER_EXPIRED			= 0x80000010,</div><div class='add'>+</div><div class='add'>+	/* Error messages. */</div><div class='add'>+	HVMSG_INVALID_VP_REGISTER_VALUE		= 0x80000020,</div><div class='add'>+	HVMSG_UNRECOVERABLE_EXCEPTION		= 0x80000021,</div><div class='add'>+	HVMSG_UNSUPPORTED_FEATURE		= 0x80000022,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Opaque intercept message. The original intercept message is only</div><div class='add'>+	 * accessible from the mapped intercept message page.</div><div class='add'>+	 */</div><div class='add'>+	HVMSG_OPAQUE_INTERCEPT			= 0x8000003F,</div><div class='add'>+</div><div class='add'>+	/* Trace buffer complete messages. */</div><div class='add'>+	HVMSG_EVENTLOG_BUFFERCOMPLETE		= 0x80000040,</div><div class='add'>+</div><div class='add'>+	/* Hypercall intercept */</div><div class='add'>+	HVMSG_HYPERCALL_INTERCEPT		= 0x80000050,</div><div class='add'>+</div><div class='add'>+	/* SynIC intercepts */</div><div class='add'>+	HVMSG_SYNIC_EVENT_INTERCEPT		= 0x80000060,</div><div class='add'>+	HVMSG_SYNIC_SINT_INTERCEPT		= 0x80000061,</div><div class='add'>+	HVMSG_SYNIC_SINT_DELIVERABLE	= 0x80000062,</div><div class='add'>+</div><div class='add'>+	/* Async call completion intercept */</div><div class='add'>+	HVMSG_ASYNC_CALL_COMPLETION		= 0x80000070,</div><div class='add'>+</div><div class='add'>+	/* Root scheduler messages */</div><div class='add'>+	HVMSG_SCHEDULER_VP_SIGNAL_BITSET	= 0x80000100,</div><div class='add'>+	HVMSG_SCHEDULER_VP_SIGNAL_PAIR		= 0x80000101,</div><div class='add'>+</div><div class='add'>+	/* Platform-specific processor intercept messages. */</div><div class='add'>+	HVMSG_X64_IO_PORT_INTERCEPT		= 0x80010000,</div><div class='add'>+	HVMSG_X64_MSR_INTERCEPT			= 0x80010001,</div><div class='add'>+	HVMSG_X64_CPUID_INTERCEPT		= 0x80010002,</div><div class='add'>+	HVMSG_X64_EXCEPTION_INTERCEPT		= 0x80010003,</div><div class='add'>+	HVMSG_X64_APIC_EOI			= 0x80010004,</div><div class='add'>+	HVMSG_X64_LEGACY_FP_ERROR		= 0x80010005,</div><div class='add'>+	HVMSG_X64_IOMMU_PRQ			= 0x80010006,</div><div class='add'>+	HVMSG_X64_HALT				= 0x80010007,</div><div class='add'>+	HVMSG_X64_INTERRUPTION_DELIVERABLE	= 0x80010008,</div><div class='add'>+	HVMSG_X64_SIPI_INTERCEPT		= 0x80010009,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Define the format of the SIMP register */</div><div class='add'>+union hv_synic_simp {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 simp_enabled : 1;</div><div class='add'>+		u64 preserved : 11;</div><div class='add'>+		u64 base_simp_gpa : 52;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_message_flags {</div><div class='add'>+	u8 asu8;</div><div class='add'>+	struct {</div><div class='add'>+		u8 msg_pending : 1;</div><div class='add'>+		u8 reserved : 7;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_message_header {</div><div class='add'>+	u32 message_type;</div><div class='add'>+	u8 payload_size;</div><div class='add'>+	union hv_message_flags message_flags;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	union {</div><div class='add'>+		u64 sender;</div><div class='add'>+		union hv_port_id port;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Message format for notifications delivered via</div><div class='add'>+ * intercept message(as_intercept=1)</div><div class='add'>+ */</div><div class='add'>+struct hv_notification_message_payload {</div><div class='add'>+	u32 sint_index;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_message {</div><div class='add'>+	struct hv_message_header header;</div><div class='add'>+	union {</div><div class='add'>+		u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];</div><div class='add'>+	} u;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Define the synthetic interrupt message page layout. */</div><div class='add'>+struct hv_message_page {</div><div class='add'>+	struct hv_message sint_message[HV_SYNIC_SINT_COUNT];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Define timer message payload structure. */</div><div class='add'>+struct hv_timer_message_payload {</div><div class='add'>+	u32 timer_index;</div><div class='add'>+	u32 reserved;</div><div class='add'>+	u64 expiration_time;	/* When the timer expired */</div><div class='add'>+	u64 delivery_time;	/* When the message was delivered */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_x64_segment_register {</div><div class='add'>+	u64 base;</div><div class='add'>+	u32 limit;</div><div class='add'>+	u16 selector;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u16 segment_type : 4;</div><div class='add'>+			u16 non_system_segment : 1;</div><div class='add'>+			u16 descriptor_privilege_level : 2;</div><div class='add'>+			u16 present : 1;</div><div class='add'>+			u16 reserved : 4;</div><div class='add'>+			u16 available : 1;</div><div class='add'>+			u16 _long : 1;</div><div class='add'>+			u16 _default : 1;</div><div class='add'>+			u16 granularity : 1;</div><div class='add'>+		} __packed;</div><div class='add'>+		u16 attributes;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_x64_table_register {</div><div class='add'>+	u16 pad[3];</div><div class='add'>+	u16 limit;</div><div class='add'>+	u64 base;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HV_NORMAL_VTL	0</div><div class='add'>+</div><div class='add'>+union hv_input_vtl {</div><div class='add'>+	u8 as_uint8;</div><div class='add'>+	struct {</div><div class='add'>+		u8 target_vtl : 4;</div><div class='add'>+		u8 use_target_vtl : 1;</div><div class='add'>+		u8 reserved_z : 3;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_init_vp_context {</div><div class='add'>+	u64 rip;</div><div class='add'>+	u64 rsp;</div><div class='add'>+	u64 rflags;</div><div class='add'>+</div><div class='add'>+	struct hv_x64_segment_register cs;</div><div class='add'>+	struct hv_x64_segment_register ds;</div><div class='add'>+	struct hv_x64_segment_register es;</div><div class='add'>+	struct hv_x64_segment_register fs;</div><div class='add'>+	struct hv_x64_segment_register gs;</div><div class='add'>+	struct hv_x64_segment_register ss;</div><div class='add'>+	struct hv_x64_segment_register tr;</div><div class='add'>+	struct hv_x64_segment_register ldtr;</div><div class='add'>+</div><div class='add'>+	struct hv_x64_table_register idtr;</div><div class='add'>+	struct hv_x64_table_register gdtr;</div><div class='add'>+</div><div class='add'>+	u64 efer;</div><div class='add'>+	u64 cr0;</div><div class='add'>+	u64 cr3;</div><div class='add'>+	u64 cr4;</div><div class='add'>+	u64 msr_cr_pat;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_enable_vp_vtl {</div><div class='add'>+	u64				partition_id;</div><div class='add'>+	u32				vp_index;</div><div class='add'>+	union hv_input_vtl		target_vtl;</div><div class='add'>+	u8				mbz0;</div><div class='add'>+	u16				mbz1;</div><div class='add'>+	struct hv_init_vp_context	vp_context;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_get_vp_from_apic_id_in {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	union hv_input_vtl target_vtl;</div><div class='add'>+	u8 res[7];</div><div class='add'>+	u32 apic_ids[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_register_vsm_partition_config {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 enable_vtl_protection : 1;</div><div class='add'>+		u64 default_vtl_protection_mask : 4;</div><div class='add'>+		u64 zero_memory_on_reset : 1;</div><div class='add'>+		u64 deny_lower_vtl_startup : 1;</div><div class='add'>+		u64 intercept_acceptance : 1;</div><div class='add'>+		u64 intercept_enable_vtl_protection : 1;</div><div class='add'>+		u64 intercept_vp_startup : 1;</div><div class='add'>+		u64 intercept_cpuid_unimplemented : 1;</div><div class='add'>+		u64 intercept_unrecoverable_exception : 1;</div><div class='add'>+		u64 intercept_page : 1;</div><div class='add'>+		u64 mbz : 51;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_register_vsm_capabilities {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 dr6_shared: 1;</div><div class='add'>+		u64 mbec_vtl_mask: 16;</div><div class='add'>+		u64 deny_lower_vtl_startup: 1;</div><div class='add'>+		u64 supervisor_shadow_stack: 1;</div><div class='add'>+		u64 hardware_hvpt_available: 1;</div><div class='add'>+		u64 software_hvpt_available: 1;</div><div class='add'>+		u64 hardware_hvpt_range_bits: 6;</div><div class='add'>+		u64 intercept_page_available: 1;</div><div class='add'>+		u64 return_action_available: 1;</div><div class='add'>+		u64 reserved: 35;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_register_vsm_page_offsets {</div><div class='add'>+	struct {</div><div class='add'>+		u64 vtl_call_offset : 12;</div><div class='add'>+		u64 vtl_return_offset : 12;</div><div class='add'>+		u64 reserved_mbz : 40;</div><div class='add'>+	} __packed;</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_nested_enlightenments_control {</div><div class='add'>+	struct {</div><div class='add'>+		u32 directhypercall : 1;</div><div class='add'>+		u32 reserved : 31;</div><div class='add'>+	} __packed features;</div><div class='add'>+	struct {</div><div class='add'>+		u32 inter_partition_comm : 1;</div><div class='add'>+		u32 reserved : 31;</div><div class='add'>+	} __packed hypercall_controls;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Define virtual processor assist page structure. */</div><div class='add'>+struct hv_vp_assist_page {</div><div class='add'>+	u32 apic_assist;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u32 vtl_entry_reason;</div><div class='add'>+	u32 vtl_reserved;</div><div class='add'>+	u64 vtl_ret_x64rax;</div><div class='add'>+	u64 vtl_ret_x64rcx;</div><div class='add'>+	struct hv_nested_enlightenments_control nested_control;</div><div class='add'>+	u8 enlighten_vmentry;</div><div class='add'>+	u8 reserved2[7];</div><div class='add'>+	u64 current_nested_vmcs;</div><div class='add'>+	u8 synthetic_time_unhalted_timer_expired;</div><div class='add'>+	u8 reserved3[7];</div><div class='add'>+	u8 virtualization_fault_information[40];</div><div class='add'>+	u8 reserved4[8];</div><div class='add'>+	u8 intercept_message[256];</div><div class='add'>+	u8 vtl_ret_actions[256];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hv_register_name {</div><div class='add'>+	/* Suspend Registers */</div><div class='add'>+	HV_REGISTER_EXPLICIT_SUSPEND				= 0x00000000,</div><div class='add'>+	HV_REGISTER_INTERCEPT_SUSPEND				= 0x00000001,</div><div class='add'>+	HV_REGISTER_DISPATCH_SUSPEND				= 0x00000003,</div><div class='add'>+</div><div class='add'>+	/* Version - 128-bit result same as CPUID 0x40000002 */</div><div class='add'>+	HV_REGISTER_HYPERVISOR_VERSION				= 0x00000100,</div><div class='add'>+</div><div class='add'>+	/* Feature Access (registers are 128 bits) - same as CPUID 0x40000003 - 0x4000000B */</div><div class='add'>+	HV_REGISTER_PRIVILEGES_AND_FEATURES_INFO		= 0x00000200,</div><div class='add'>+	HV_REGISTER_FEATURES_INFO				= 0x00000201,</div><div class='add'>+	HV_REGISTER_IMPLEMENTATION_LIMITS_INFO			= 0x00000202,</div><div class='add'>+	HV_REGISTER_HARDWARE_FEATURES_INFO			= 0x00000203,</div><div class='add'>+	HV_REGISTER_CPU_MANAGEMENT_FEATURES_INFO		= 0x00000204,</div><div class='add'>+	HV_REGISTER_SVM_FEATURES_INFO				= 0x00000205,</div><div class='add'>+	HV_REGISTER_SKIP_LEVEL_FEATURES_INFO			= 0x00000206,</div><div class='add'>+	HV_REGISTER_NESTED_VIRT_FEATURES_INFO			= 0x00000207,</div><div class='add'>+	HV_REGISTER_IPT_FEATURES_INFO				= 0x00000208,</div><div class='add'>+</div><div class='add'>+	/* Guest Crash Registers */</div><div class='add'>+	HV_REGISTER_GUEST_CRASH_P0				= 0x00000210,</div><div class='add'>+	HV_REGISTER_GUEST_CRASH_P1				= 0x00000211,</div><div class='add'>+	HV_REGISTER_GUEST_CRASH_P2				= 0x00000212,</div><div class='add'>+	HV_REGISTER_GUEST_CRASH_P3				= 0x00000213,</div><div class='add'>+	HV_REGISTER_GUEST_CRASH_P4				= 0x00000214,</div><div class='add'>+	HV_REGISTER_GUEST_CRASH_CTL				= 0x00000215,</div><div class='add'>+</div><div class='add'>+	/* Misc */</div><div class='add'>+	HV_REGISTER_VP_RUNTIME					= 0x00090000,</div><div class='add'>+	HV_REGISTER_GUEST_OS_ID					= 0x00090002,</div><div class='add'>+	HV_REGISTER_VP_INDEX					= 0x00090003,</div><div class='add'>+	HV_REGISTER_TIME_REF_COUNT				= 0x00090004,</div><div class='add'>+	HV_REGISTER_CPU_MANAGEMENT_VERSION			= 0x00090007,</div><div class='add'>+	HV_REGISTER_VP_ASSIST_PAGE				= 0x00090013,</div><div class='add'>+	HV_REGISTER_VP_ROOT_SIGNAL_COUNT			= 0x00090014,</div><div class='add'>+	HV_REGISTER_REFERENCE_TSC				= 0x00090017,</div><div class='add'>+</div><div class='add'>+	/* Hypervisor-defined Registers (Synic) */</div><div class='add'>+	HV_REGISTER_SINT0					= 0x000A0000,</div><div class='add'>+	HV_REGISTER_SINT1					= 0x000A0001,</div><div class='add'>+	HV_REGISTER_SINT2					= 0x000A0002,</div><div class='add'>+	HV_REGISTER_SINT3					= 0x000A0003,</div><div class='add'>+	HV_REGISTER_SINT4					= 0x000A0004,</div><div class='add'>+	HV_REGISTER_SINT5					= 0x000A0005,</div><div class='add'>+	HV_REGISTER_SINT6					= 0x000A0006,</div><div class='add'>+	HV_REGISTER_SINT7					= 0x000A0007,</div><div class='add'>+	HV_REGISTER_SINT8					= 0x000A0008,</div><div class='add'>+	HV_REGISTER_SINT9					= 0x000A0009,</div><div class='add'>+	HV_REGISTER_SINT10					= 0x000A000A,</div><div class='add'>+	HV_REGISTER_SINT11					= 0x000A000B,</div><div class='add'>+	HV_REGISTER_SINT12					= 0x000A000C,</div><div class='add'>+	HV_REGISTER_SINT13					= 0x000A000D,</div><div class='add'>+	HV_REGISTER_SINT14					= 0x000A000E,</div><div class='add'>+	HV_REGISTER_SINT15					= 0x000A000F,</div><div class='add'>+	HV_REGISTER_SCONTROL					= 0x000A0010,</div><div class='add'>+	HV_REGISTER_SVERSION					= 0x000A0011,</div><div class='add'>+	HV_REGISTER_SIEFP					= 0x000A0012,</div><div class='add'>+	HV_REGISTER_SIMP					= 0x000A0013,</div><div class='add'>+	HV_REGISTER_EOM						= 0x000A0014,</div><div class='add'>+	HV_REGISTER_SIRBP					= 0x000A0015,</div><div class='add'>+</div><div class='add'>+	HV_REGISTER_NESTED_SINT0				= 0x000A1000,</div><div class='add'>+	HV_REGISTER_NESTED_SINT1				= 0x000A1001,</div><div class='add'>+	HV_REGISTER_NESTED_SINT2				= 0x000A1002,</div><div class='add'>+	HV_REGISTER_NESTED_SINT3				= 0x000A1003,</div><div class='add'>+	HV_REGISTER_NESTED_SINT4				= 0x000A1004,</div><div class='add'>+	HV_REGISTER_NESTED_SINT5				= 0x000A1005,</div><div class='add'>+	HV_REGISTER_NESTED_SINT6				= 0x000A1006,</div><div class='add'>+	HV_REGISTER_NESTED_SINT7				= 0x000A1007,</div><div class='add'>+	HV_REGISTER_NESTED_SINT8				= 0x000A1008,</div><div class='add'>+	HV_REGISTER_NESTED_SINT9				= 0x000A1009,</div><div class='add'>+	HV_REGISTER_NESTED_SINT10				= 0x000A100A,</div><div class='add'>+	HV_REGISTER_NESTED_SINT11				= 0x000A100B,</div><div class='add'>+	HV_REGISTER_NESTED_SINT12				= 0x000A100C,</div><div class='add'>+	HV_REGISTER_NESTED_SINT13				= 0x000A100D,</div><div class='add'>+	HV_REGISTER_NESTED_SINT14				= 0x000A100E,</div><div class='add'>+	HV_REGISTER_NESTED_SINT15				= 0x000A100F,</div><div class='add'>+	HV_REGISTER_NESTED_SCONTROL				= 0x000A1010,</div><div class='add'>+	HV_REGISTER_NESTED_SVERSION				= 0x000A1011,</div><div class='add'>+	HV_REGISTER_NESTED_SIFP					= 0x000A1012,</div><div class='add'>+	HV_REGISTER_NESTED_SIPP					= 0x000A1013,</div><div class='add'>+	HV_REGISTER_NESTED_EOM					= 0x000A1014,</div><div class='add'>+	HV_REGISTER_NESTED_SIRBP				= 0x000a1015,</div><div class='add'>+</div><div class='add'>+	/* Hypervisor-defined Registers (Synthetic Timers) */</div><div class='add'>+	HV_REGISTER_STIMER0_CONFIG				= 0x000B0000,</div><div class='add'>+	HV_REGISTER_STIMER0_COUNT				= 0x000B0001,</div><div class='add'>+</div><div class='add'>+	/* VSM */</div><div class='add'>+	HV_REGISTER_VSM_VP_STATUS				= 0x000D0003,</div><div class='add'>+</div><div class='add'>+	/* Synthetic VSM registers */</div><div class='add'>+	HV_REGISTER_VSM_CODE_PAGE_OFFSETS	= 0x000D0002,</div><div class='add'>+	HV_REGISTER_VSM_CAPABILITIES		= 0x000D0006,</div><div class='add'>+	HV_REGISTER_VSM_PARTITION_CONFIG	= 0x000D0007,</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+	/* X64 Debug Registers */</div><div class='add'>+	HV_X64_REGISTER_DR0	= 0x00050000,</div><div class='add'>+	HV_X64_REGISTER_DR1	= 0x00050001,</div><div class='add'>+	HV_X64_REGISTER_DR2	= 0x00050002,</div><div class='add'>+	HV_X64_REGISTER_DR3	= 0x00050003,</div><div class='add'>+	HV_X64_REGISTER_DR6	= 0x00050004,</div><div class='add'>+	HV_X64_REGISTER_DR7	= 0x00050005,</div><div class='add'>+</div><div class='add'>+	/* X64 Cache control MSRs */</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_CAP		= 0x0008000D,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_DEF_TYPE	= 0x0008000E,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE0	= 0x00080010,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE1	= 0x00080011,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE2	= 0x00080012,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE3	= 0x00080013,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE4	= 0x00080014,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE5	= 0x00080015,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE6	= 0x00080016,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE7	= 0x00080017,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE8	= 0x00080018,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASE9	= 0x00080019,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASEA	= 0x0008001A,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASEB	= 0x0008001B,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASEC	= 0x0008001C,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASED	= 0x0008001D,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASEE	= 0x0008001E,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_BASEF	= 0x0008001F,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK0	= 0x00080040,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK1	= 0x00080041,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK2	= 0x00080042,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK3	= 0x00080043,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK4	= 0x00080044,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK5	= 0x00080045,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK6	= 0x00080046,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK7	= 0x00080047,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK8	= 0x00080048,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASK9	= 0x00080049,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASKA	= 0x0008004A,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASKB	= 0x0008004B,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASKC	= 0x0008004C,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASKD	= 0x0008004D,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASKE	= 0x0008004E,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_PHYS_MASKF	= 0x0008004F,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX64K00000	= 0x00080070,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX16K80000	= 0x00080071,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX16KA0000	= 0x00080072,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX4KC0000	= 0x00080073,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX4KC8000	= 0x00080074,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX4KD0000	= 0x00080075,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX4KD8000	= 0x00080076,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX4KE0000	= 0x00080077,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX4KE8000	= 0x00080078,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX4KF0000	= 0x00080079,</div><div class='add'>+	HV_X64_REGISTER_MSR_MTRR_FIX4KF8000	= 0x0008007A,</div><div class='add'>+</div><div class='add'>+	HV_X64_REGISTER_REG_PAGE	= 0x0009001C,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Arch compatibility regs for use with hv_set/get_register</div><div class='add'>+ */</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To support arch-generic code calling hv_set/get_register:</div><div class='add'>+ * - On x86, HV_MSR_ indicates an MSR accessed via rdmsrq/wrmsrq</div><div class='add'>+ * - On ARM, HV_MSR_ indicates a VP register accessed via hypercall</div><div class='add'>+ */</div><div class='add'>+#define HV_MSR_CRASH_P0		(HV_X64_MSR_CRASH_P0)</div><div class='add'>+#define HV_MSR_CRASH_P1		(HV_X64_MSR_CRASH_P1)</div><div class='add'>+#define HV_MSR_CRASH_P2		(HV_X64_MSR_CRASH_P2)</div><div class='add'>+#define HV_MSR_CRASH_P3		(HV_X64_MSR_CRASH_P3)</div><div class='add'>+#define HV_MSR_CRASH_P4		(HV_X64_MSR_CRASH_P4)</div><div class='add'>+#define HV_MSR_CRASH_CTL	(HV_X64_MSR_CRASH_CTL)</div><div class='add'>+</div><div class='add'>+#define HV_MSR_VP_INDEX		(HV_X64_MSR_VP_INDEX)</div><div class='add'>+#define HV_MSR_TIME_REF_COUNT	(HV_X64_MSR_TIME_REF_COUNT)</div><div class='add'>+#define HV_MSR_REFERENCE_TSC	(HV_X64_MSR_REFERENCE_TSC)</div><div class='add'>+</div><div class='add'>+#define HV_MSR_SINT0		(HV_X64_MSR_SINT0)</div><div class='add'>+#define HV_MSR_SVERSION		(HV_X64_MSR_SVERSION)</div><div class='add'>+#define HV_MSR_SCONTROL		(HV_X64_MSR_SCONTROL)</div><div class='add'>+#define HV_MSR_SIEFP		(HV_X64_MSR_SIEFP)</div><div class='add'>+#define HV_MSR_SIMP		(HV_X64_MSR_SIMP)</div><div class='add'>+#define HV_MSR_EOM		(HV_X64_MSR_EOM)</div><div class='add'>+#define HV_MSR_SIRBP		(HV_X64_MSR_SIRBP)</div><div class='add'>+</div><div class='add'>+#define HV_MSR_NESTED_SCONTROL	(HV_X64_MSR_NESTED_SCONTROL)</div><div class='add'>+#define HV_MSR_NESTED_SVERSION	(HV_X64_MSR_NESTED_SVERSION)</div><div class='add'>+#define HV_MSR_NESTED_SIEFP	(HV_X64_MSR_NESTED_SIEFP)</div><div class='add'>+#define HV_MSR_NESTED_SIMP	(HV_X64_MSR_NESTED_SIMP)</div><div class='add'>+#define HV_MSR_NESTED_EOM	(HV_X64_MSR_NESTED_EOM)</div><div class='add'>+#define HV_MSR_NESTED_SINT0	(HV_X64_MSR_NESTED_SINT0)</div><div class='add'>+</div><div class='add'>+#define HV_MSR_STIMER0_CONFIG	(HV_X64_MSR_STIMER0_CONFIG)</div><div class='add'>+#define HV_MSR_STIMER0_COUNT	(HV_X64_MSR_STIMER0_COUNT)</div><div class='add'>+</div><div class='add'>+#elif defined(CONFIG_ARM64) /* CONFIG_X86 */</div><div class='add'>+</div><div class='add'>+#define HV_MSR_CRASH_P0		(HV_REGISTER_GUEST_CRASH_P0)</div><div class='add'>+#define HV_MSR_CRASH_P1		(HV_REGISTER_GUEST_CRASH_P1)</div><div class='add'>+#define HV_MSR_CRASH_P2		(HV_REGISTER_GUEST_CRASH_P2)</div><div class='add'>+#define HV_MSR_CRASH_P3		(HV_REGISTER_GUEST_CRASH_P3)</div><div class='add'>+#define HV_MSR_CRASH_P4		(HV_REGISTER_GUEST_CRASH_P4)</div><div class='add'>+#define HV_MSR_CRASH_CTL	(HV_REGISTER_GUEST_CRASH_CTL)</div><div class='add'>+</div><div class='add'>+#define HV_MSR_VP_INDEX		(HV_REGISTER_VP_INDEX)</div><div class='add'>+#define HV_MSR_TIME_REF_COUNT	(HV_REGISTER_TIME_REF_COUNT)</div><div class='add'>+#define HV_MSR_REFERENCE_TSC	(HV_REGISTER_REFERENCE_TSC)</div><div class='add'>+</div><div class='add'>+#define HV_MSR_SINT0		(HV_REGISTER_SINT0)</div><div class='add'>+#define HV_MSR_SCONTROL		(HV_REGISTER_SCONTROL)</div><div class='add'>+#define HV_MSR_SIEFP		(HV_REGISTER_SIEFP)</div><div class='add'>+#define HV_MSR_SIMP		(HV_REGISTER_SIMP)</div><div class='add'>+#define HV_MSR_EOM		(HV_REGISTER_EOM)</div><div class='add'>+#define HV_MSR_SIRBP		(HV_REGISTER_SIRBP)</div><div class='add'>+</div><div class='add'>+#define HV_MSR_STIMER0_CONFIG	(HV_REGISTER_STIMER0_CONFIG)</div><div class='add'>+#define HV_MSR_STIMER0_COUNT	(HV_REGISTER_STIMER0_COUNT)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ARM64 */</div><div class='add'>+</div><div class='add'>+union hv_explicit_suspend_register {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 suspended : 1;</div><div class='add'>+		u64 reserved : 63;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_intercept_suspend_register {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 suspended : 1;</div><div class='add'>+		u64 reserved : 63;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_dispatch_suspend_register {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 suspended : 1;</div><div class='add'>+		u64 reserved : 63;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_arm64_pending_interruption_register {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 interruption_pending : 1;</div><div class='add'>+		u64 interruption_type: 1;</div><div class='add'>+		u64 reserved : 30;</div><div class='add'>+		u64 error_code : 32;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_arm64_interrupt_state_register {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 interrupt_shadow : 1;</div><div class='add'>+		u64 reserved : 63;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_arm64_pending_synthetic_exception_event {</div><div class='add'>+	u64 as_uint64[2];</div><div class='add'>+	struct {</div><div class='add'>+		u8 event_pending : 1;</div><div class='add'>+		u8 event_type : 3;</div><div class='add'>+		u8 reserved : 4;</div><div class='add'>+		u8 rsvd[3];</div><div class='add'>+		u32 exception_type;</div><div class='add'>+		u64 context;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_x64_interrupt_state_register {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 interrupt_shadow : 1;</div><div class='add'>+		u64 nmi_masked : 1;</div><div class='add'>+		u64 reserved : 62;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_x64_pending_interruption_register {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u32 interruption_pending : 1;</div><div class='add'>+		u32 interruption_type : 3;</div><div class='add'>+		u32 deliver_error_code : 1;</div><div class='add'>+		u32 instruction_length : 4;</div><div class='add'>+		u32 nested_event : 1;</div><div class='add'>+		u32 reserved : 6;</div><div class='add'>+		u32 interruption_vector : 16;</div><div class='add'>+		u32 error_code;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_register_value {</div><div class='add'>+	struct hv_u128 reg128;</div><div class='add'>+	u64 reg64;</div><div class='add'>+	u32 reg32;</div><div class='add'>+	u16 reg16;</div><div class='add'>+	u8 reg8;</div><div class='add'>+</div><div class='add'>+	struct hv_x64_segment_register segment;</div><div class='add'>+	struct hv_x64_table_register table;</div><div class='add'>+	union hv_explicit_suspend_register explicit_suspend;</div><div class='add'>+	union hv_intercept_suspend_register intercept_suspend;</div><div class='add'>+	union hv_dispatch_suspend_register dispatch_suspend;</div><div class='add'>+#ifdef CONFIG_ARM64</div><div class='add'>+	union hv_arm64_interrupt_state_register interrupt_state;</div><div class='add'>+	union hv_arm64_pending_interruption_register pending_interruption;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+	union hv_x64_interrupt_state_register interrupt_state;</div><div class='add'>+	union hv_x64_pending_interruption_register pending_interruption;</div><div class='add'>+#endif</div><div class='add'>+	union hv_arm64_pending_synthetic_exception_event pending_synthetic_exception_event;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NOTE: Linux helper struct - NOT from Hyper-V code. */</div><div class='add'>+struct hv_output_get_vp_registers {</div><div class='add'>+	DECLARE_FLEX_ARRAY(union hv_register_value, values);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARM64)</div><div class='add'>+/* HvGetVpRegisters returns an array of these output elements */</div><div class='add'>+struct hv_get_vp_registers_output {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32 a;</div><div class='add'>+			u32 b;</div><div class='add'>+			u32 c;</div><div class='add'>+			u32 d;</div><div class='add'>+		} as32 __packed;</div><div class='add'>+		struct {</div><div class='add'>+			u64 low;</div><div class='add'>+			u64 high;</div><div class='add'>+		} as64 __packed;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ARM64 */</div><div class='add'>+</div><div class='add'>+struct hv_register_assoc {</div><div class='add'>+	u32 name;			/* enum hv_register_name */</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u64 reserved2;</div><div class='add'>+	union hv_register_value value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_get_vp_registers {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	union hv_input_vtl input_vtl;</div><div class='add'>+	u8  rsvd_z8;</div><div class='add'>+	u16 rsvd_z16;</div><div class='add'>+	u32 names[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_set_vp_registers {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	union hv_input_vtl input_vtl;</div><div class='add'>+	u8  rsvd_z8;</div><div class='add'>+	u16 rsvd_z16;</div><div class='add'>+	struct hv_register_assoc elements[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HV_UNMAP_GPA_LARGE_PAGE		0x2</div><div class='add'>+</div><div class='add'>+/* HvCallSendSyntheticClusterIpi hypercall */</div><div class='add'>+struct hv_send_ipi {	 /* HV_INPUT_SEND_SYNTHETIC_CLUSTER_IPI */</div><div class='add'>+	u32 vector;</div><div class='add'>+	u32 reserved;</div><div class='add'>+	u64 cpu_mask;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define	HV_VTL_MASK			GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+/* Hyper-V memory host visibility */</div><div class='add'>+enum hv_mem_host_visibility {</div><div class='add'>+	VMBUS_PAGE_NOT_VISIBLE		= 0,</div><div class='add'>+	VMBUS_PAGE_VISIBLE_READ_ONLY	= 1,</div><div class='add'>+	VMBUS_PAGE_VISIBLE_READ_WRITE	= 3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HvCallModifySparseGpaPageHostVisibility hypercall */</div><div class='add'>+#define HV_MAX_MODIFY_GPA_REP_COUNT	((HV_HYP_PAGE_SIZE / sizeof(u64)) - 2)</div><div class='add'>+struct hv_gpa_range_for_visibility {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 host_visibility : 2;</div><div class='add'>+	u32 reserved0 : 30;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u64 gpa_page_list[HV_MAX_MODIFY_GPA_REP_COUNT];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+union hv_msi_address_register { /* HV_MSI_ADDRESS */</div><div class='add'>+	u32 as_uint32;</div><div class='add'>+	struct {</div><div class='add'>+		u32 reserved1 : 2;</div><div class='add'>+		u32 destination_mode : 1;</div><div class='add'>+		u32 redirection_hint : 1;</div><div class='add'>+		u32 reserved2 : 8;</div><div class='add'>+		u32 destination_id : 8;</div><div class='add'>+		u32 msi_base : 12;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_msi_data_register {	 /* HV_MSI_ENTRY.Data */</div><div class='add'>+	u32 as_uint32;</div><div class='add'>+	struct {</div><div class='add'>+		u32 vector : 8;</div><div class='add'>+		u32 delivery_mode : 3;</div><div class='add'>+		u32 reserved1 : 3;</div><div class='add'>+		u32 level_assert : 1;</div><div class='add'>+		u32 trigger_mode : 1;</div><div class='add'>+		u32 reserved2 : 16;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_msi_entry {	 /* HV_MSI_ENTRY */</div><div class='add'>+</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		union hv_msi_address_register address;</div><div class='add'>+		union hv_msi_data_register data;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#elif defined(CONFIG_ARM64) /* CONFIG_X86 */</div><div class='add'>+</div><div class='add'>+union hv_msi_entry {</div><div class='add'>+	u64 as_uint64[2];</div><div class='add'>+	struct {</div><div class='add'>+		u64 address;</div><div class='add'>+		u32 data;</div><div class='add'>+		u32 reserved;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_ARM64 */</div><div class='add'>+</div><div class='add'>+union hv_ioapic_rte {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 vector : 8;</div><div class='add'>+		u32 delivery_mode : 3;</div><div class='add'>+		u32 destination_mode : 1;</div><div class='add'>+		u32 delivery_status : 1;</div><div class='add'>+		u32 interrupt_polarity : 1;</div><div class='add'>+		u32 remote_irr : 1;</div><div class='add'>+		u32 trigger_mode : 1;</div><div class='add'>+		u32 interrupt_mask : 1;</div><div class='add'>+		u32 reserved1 : 15;</div><div class='add'>+</div><div class='add'>+		u32 reserved2 : 24;</div><div class='add'>+		u32 destination_id : 8;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 low_uint32;</div><div class='add'>+		u32 high_uint32;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hv_interrupt_source {	 /* HV_INTERRUPT_SOURCE */</div><div class='add'>+	HV_INTERRUPT_SOURCE_MSI = 1, /* MSI and MSI-X */</div><div class='add'>+	HV_INTERRUPT_SOURCE_IOAPIC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_interrupt_entry {	 /* HV_INTERRUPT_ENTRY */</div><div class='add'>+	u32 source;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	union {</div><div class='add'>+		union hv_msi_entry msi_entry;</div><div class='add'>+		union hv_ioapic_rte ioapic_rte;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HV_DEVICE_INTERRUPT_TARGET_MULTICAST		1</div><div class='add'>+#define HV_DEVICE_INTERRUPT_TARGET_PROCESSOR_SET	2</div><div class='add'>+</div><div class='add'>+struct hv_device_interrupt_target {	 /* HV_DEVICE_INTERRUPT_TARGET */</div><div class='add'>+	u32 vector;</div><div class='add'>+	u32 flags;		/* HV_DEVICE_INTERRUPT_TARGET_* above */</div><div class='add'>+	union {</div><div class='add'>+		u64 vp_mask;</div><div class='add'>+		struct hv_vpset vp_set;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_retarget_device_interrupt {	 /* HV_INPUT_RETARGET_DEVICE_INTERRUPT */</div><div class='add'>+	u64 partition_id;		/* use "self" */</div><div class='add'>+	u64 device_id;</div><div class='add'>+	struct hv_interrupt_entry int_entry;</div><div class='add'>+	u64 reserved2;</div><div class='add'>+	struct hv_device_interrupt_target int_target;</div><div class='add'>+} __packed __aligned(8);</div><div class='add'>+</div><div class='add'>+enum hv_intercept_type {</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+	HV_INTERCEPT_TYPE_X64_IO_PORT			= 0x00000000,</div><div class='add'>+	HV_INTERCEPT_TYPE_X64_MSR			= 0x00000001,</div><div class='add'>+	HV_INTERCEPT_TYPE_X64_CPUID			= 0x00000002,</div><div class='add'>+#endif</div><div class='add'>+	HV_INTERCEPT_TYPE_EXCEPTION			= 0x00000003,</div><div class='add'>+	/* Used to be HV_INTERCEPT_TYPE_REGISTER */</div><div class='add'>+	HV_INTERCEPT_TYPE_RESERVED0			= 0x00000004,</div><div class='add'>+	HV_INTERCEPT_TYPE_MMIO				= 0x00000005,</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+	HV_INTERCEPT_TYPE_X64_GLOBAL_CPUID		= 0x00000006,</div><div class='add'>+	HV_INTERCEPT_TYPE_X64_APIC_SMI			= 0x00000007,</div><div class='add'>+#endif</div><div class='add'>+	HV_INTERCEPT_TYPE_HYPERCALL			= 0x00000008,</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+	HV_INTERCEPT_TYPE_X64_APIC_INIT_SIPI		= 0x00000009,</div><div class='add'>+	HV_INTERCEPT_MC_UPDATE_PATCH_LEVEL_MSR_READ	= 0x0000000A,</div><div class='add'>+	HV_INTERCEPT_TYPE_X64_APIC_WRITE		= 0x0000000B,</div><div class='add'>+	HV_INTERCEPT_TYPE_X64_MSR_INDEX			= 0x0000000C,</div><div class='add'>+#endif</div><div class='add'>+	HV_INTERCEPT_TYPE_MAX,</div><div class='add'>+	HV_INTERCEPT_TYPE_INVALID			= 0xFFFFFFFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_intercept_parameters {</div><div class='add'>+	/*  HV_INTERCEPT_PARAMETERS is defined to be an 8-byte field. */</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+#if defined(CONFIG_X86)</div><div class='add'>+	/* HV_INTERCEPT_TYPE_X64_IO_PORT */</div><div class='add'>+	u16 io_port;</div><div class='add'>+	/* HV_INTERCEPT_TYPE_X64_CPUID */</div><div class='add'>+	u32 cpuid_index;</div><div class='add'>+	/* HV_INTERCEPT_TYPE_X64_APIC_WRITE */</div><div class='add'>+	u32 apic_write_mask;</div><div class='add'>+	/* HV_INTERCEPT_TYPE_EXCEPTION */</div><div class='add'>+	u16 exception_vector;</div><div class='add'>+	/* HV_INTERCEPT_TYPE_X64_MSR_INDEX */</div><div class='add'>+	u32 msr_index;</div><div class='add'>+#endif</div><div class='add'>+	/* N.B. Other intercept types do not have any parameters. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Data structures for HVCALL_MMIO_READ and HVCALL_MMIO_WRITE */</div><div class='add'>+#define HV_HYPERCALL_MMIO_MAX_DATA_LENGTH 64</div><div class='add'>+</div><div class='add'>+struct hv_mmio_read_input { /* HV_INPUT_MEMORY_MAPPED_IO_READ */</div><div class='add'>+	u64 gpa;</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_mmio_read_output {</div><div class='add'>+	u8 data[HV_HYPERCALL_MMIO_MAX_DATA_LENGTH];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_mmio_write_input {</div><div class='add'>+	u64 gpa;</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 reserved;</div><div class='add'>+	u8 data[HV_HYPERCALL_MMIO_MAX_DATA_LENGTH];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#endif /* _HV_HVGDK_MINI_H */</div><div class='head'>diff --git a/include/hyperv/hvhdk.h b/include/hyperv/hvhdk.h<br/>new file mode 100644<br/>index 000000000000..469186df7826<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/hyperv/hvhdk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/hyperv/hvhdk.h</a></div><div class='hunk'>@@ -0,0 +1,899 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Type definitions for the Microsoft hypervisor.</div><div class='add'>+ */</div><div class='add'>+#ifndef _HV_HVHDK_H</div><div class='add'>+#define _HV_HVHDK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hvhdk_mini.h"</div><div class='add'>+#include "hvgdk.h"</div><div class='add'>+</div><div class='add'>+/* Bits for dirty mask of hv_vp_register_page */</div><div class='add'>+#define HV_X64_REGISTER_CLASS_GENERAL	0</div><div class='add'>+#define HV_X64_REGISTER_CLASS_IP	1</div><div class='add'>+#define HV_X64_REGISTER_CLASS_XMM	2</div><div class='add'>+#define HV_X64_REGISTER_CLASS_SEGMENT	3</div><div class='add'>+#define HV_X64_REGISTER_CLASS_FLAGS	4</div><div class='add'>+</div><div class='add'>+#define HV_VP_REGISTER_PAGE_VERSION_1	1u</div><div class='add'>+</div><div class='add'>+#define HV_VP_REGISTER_PAGE_MAX_VECTOR_COUNT		7</div><div class='add'>+</div><div class='add'>+union hv_vp_register_page_interrupt_vectors {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u8 vector_count;</div><div class='add'>+		u8 vector[HV_VP_REGISTER_PAGE_MAX_VECTOR_COUNT];</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_vp_register_page {</div><div class='add'>+	u16 version;</div><div class='add'>+	u8 isvalid;</div><div class='add'>+	u8 rsvdz;</div><div class='add'>+	u32 dirty;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_X86)</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			/* General purpose registers</div><div class='add'>+			 * (HV_X64_REGISTER_CLASS_GENERAL)</div><div class='add'>+			 */</div><div class='add'>+			union {</div><div class='add'>+				struct {</div><div class='add'>+					u64 rax;</div><div class='add'>+					u64 rcx;</div><div class='add'>+					u64 rdx;</div><div class='add'>+					u64 rbx;</div><div class='add'>+					u64 rsp;</div><div class='add'>+					u64 rbp;</div><div class='add'>+					u64 rsi;</div><div class='add'>+					u64 rdi;</div><div class='add'>+					u64 r8;</div><div class='add'>+					u64 r9;</div><div class='add'>+					u64 r10;</div><div class='add'>+					u64 r11;</div><div class='add'>+					u64 r12;</div><div class='add'>+					u64 r13;</div><div class='add'>+					u64 r14;</div><div class='add'>+					u64 r15;</div><div class='add'>+				} __packed;</div><div class='add'>+</div><div class='add'>+				u64 gp_registers[16];</div><div class='add'>+			};</div><div class='add'>+			/* Instruction pointer (HV_X64_REGISTER_CLASS_IP) */</div><div class='add'>+			u64 rip;</div><div class='add'>+			/* Flags (HV_X64_REGISTER_CLASS_FLAGS) */</div><div class='add'>+			u64 rflags;</div><div class='add'>+		} __packed;</div><div class='add'>+</div><div class='add'>+		u64 registers[18];</div><div class='add'>+	};</div><div class='add'>+	/* Volatile XMM registers (HV_X64_REGISTER_CLASS_XMM) */</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			struct hv_u128 xmm0;</div><div class='add'>+			struct hv_u128 xmm1;</div><div class='add'>+			struct hv_u128 xmm2;</div><div class='add'>+			struct hv_u128 xmm3;</div><div class='add'>+			struct hv_u128 xmm4;</div><div class='add'>+			struct hv_u128 xmm5;</div><div class='add'>+		} __packed;</div><div class='add'>+</div><div class='add'>+		struct hv_u128 xmm_registers[6];</div><div class='add'>+	};</div><div class='add'>+	/* Segment registers (HV_X64_REGISTER_CLASS_SEGMENT) */</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			struct hv_x64_segment_register es;</div><div class='add'>+			struct hv_x64_segment_register cs;</div><div class='add'>+			struct hv_x64_segment_register ss;</div><div class='add'>+			struct hv_x64_segment_register ds;</div><div class='add'>+			struct hv_x64_segment_register fs;</div><div class='add'>+			struct hv_x64_segment_register gs;</div><div class='add'>+		} __packed;</div><div class='add'>+</div><div class='add'>+		struct hv_x64_segment_register segment_registers[6];</div><div class='add'>+	};</div><div class='add'>+	/* Misc. control registers (cannot be set via this interface) */</div><div class='add'>+	u64 cr0;</div><div class='add'>+	u64 cr3;</div><div class='add'>+	u64 cr4;</div><div class='add'>+	u64 cr8;</div><div class='add'>+	u64 efer;</div><div class='add'>+	u64 dr7;</div><div class='add'>+	union hv_x64_pending_interruption_register pending_interruption;</div><div class='add'>+	union hv_x64_interrupt_state_register interrupt_state;</div><div class='add'>+	u64 instruction_emulation_hints;</div><div class='add'>+	u64 xfem;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fields from this point are not included in the register page save chunk.</div><div class='add'>+	 * The reserved field is intended to maintain alignment for unsaved fields.</div><div class='add'>+	 */</div><div class='add'>+	u8 reserved1[0x100];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Interrupts injected as part of HvCallDispatchVp.</div><div class='add'>+	 */</div><div class='add'>+	union hv_vp_register_page_interrupt_vectors interrupt_vectors;</div><div class='add'>+</div><div class='add'>+#elif IS_ENABLED(CONFIG_ARM64)</div><div class='add'>+	/* Not yet supported in ARM */</div><div class='add'>+#endif</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HV_PARTITION_PROCESSOR_FEATURES_BANKS 2</div><div class='add'>+</div><div class='add'>+union hv_partition_processor_features {</div><div class='add'>+	u64 as_uint64[HV_PARTITION_PROCESSOR_FEATURES_BANKS];</div><div class='add'>+	struct {</div><div class='add'>+		u64 sse3_support : 1;</div><div class='add'>+		u64 lahf_sahf_support : 1;</div><div class='add'>+		u64 ssse3_support : 1;</div><div class='add'>+		u64 sse4_1_support : 1;</div><div class='add'>+		u64 sse4_2_support : 1;</div><div class='add'>+		u64 sse4a_support : 1;</div><div class='add'>+		u64 xop_support : 1;</div><div class='add'>+		u64 pop_cnt_support : 1;</div><div class='add'>+		u64 cmpxchg16b_support : 1;</div><div class='add'>+		u64 altmovcr8_support : 1;</div><div class='add'>+		u64 lzcnt_support : 1;</div><div class='add'>+		u64 mis_align_sse_support : 1;</div><div class='add'>+		u64 mmx_ext_support : 1;</div><div class='add'>+		u64 amd3dnow_support : 1;</div><div class='add'>+		u64 extended_amd3dnow_support : 1;</div><div class='add'>+		u64 page_1gb_support : 1;</div><div class='add'>+		u64 aes_support : 1;</div><div class='add'>+		u64 pclmulqdq_support : 1;</div><div class='add'>+		u64 pcid_support : 1;</div><div class='add'>+		u64 fma4_support : 1;</div><div class='add'>+		u64 f16c_support : 1;</div><div class='add'>+		u64 rd_rand_support : 1;</div><div class='add'>+		u64 rd_wr_fs_gs_support : 1;</div><div class='add'>+		u64 smep_support : 1;</div><div class='add'>+		u64 enhanced_fast_string_support : 1;</div><div class='add'>+		u64 bmi1_support : 1;</div><div class='add'>+		u64 bmi2_support : 1;</div><div class='add'>+		u64 hle_support_deprecated : 1;</div><div class='add'>+		u64 rtm_support_deprecated : 1;</div><div class='add'>+		u64 movbe_support : 1;</div><div class='add'>+		u64 npiep1_support : 1;</div><div class='add'>+		u64 dep_x87_fpu_save_support : 1;</div><div class='add'>+		u64 rd_seed_support : 1;</div><div class='add'>+		u64 adx_support : 1;</div><div class='add'>+		u64 intel_prefetch_support : 1;</div><div class='add'>+		u64 smap_support : 1;</div><div class='add'>+		u64 hle_support : 1;</div><div class='add'>+		u64 rtm_support : 1;</div><div class='add'>+		u64 rdtscp_support : 1;</div><div class='add'>+		u64 clflushopt_support : 1;</div><div class='add'>+		u64 clwb_support : 1;</div><div class='add'>+		u64 sha_support : 1;</div><div class='add'>+		u64 x87_pointers_saved_support : 1;</div><div class='add'>+		u64 invpcid_support : 1;</div><div class='add'>+		u64 ibrs_support : 1;</div><div class='add'>+		u64 stibp_support : 1;</div><div class='add'>+		u64 ibpb_support: 1;</div><div class='add'>+		u64 unrestricted_guest_support : 1;</div><div class='add'>+		u64 mdd_support : 1;</div><div class='add'>+		u64 fast_short_rep_mov_support : 1;</div><div class='add'>+		u64 l1dcache_flush_support : 1;</div><div class='add'>+		u64 rdcl_no_support : 1;</div><div class='add'>+		u64 ibrs_all_support : 1;</div><div class='add'>+		u64 skip_l1df_support : 1;</div><div class='add'>+		u64 ssb_no_support : 1;</div><div class='add'>+		u64 rsb_a_no_support : 1;</div><div class='add'>+		u64 virt_spec_ctrl_support : 1;</div><div class='add'>+		u64 rd_pid_support : 1;</div><div class='add'>+		u64 umip_support : 1;</div><div class='add'>+		u64 mbs_no_support : 1;</div><div class='add'>+		u64 mb_clear_support : 1;</div><div class='add'>+		u64 taa_no_support : 1;</div><div class='add'>+		u64 tsx_ctrl_support : 1;</div><div class='add'>+		/*</div><div class='add'>+		 * N.B. The final processor feature bit in bank 0 is reserved to</div><div class='add'>+		 * simplify potential downlevel backports.</div><div class='add'>+		 */</div><div class='add'>+		u64 reserved_bank0 : 1;</div><div class='add'>+</div><div class='add'>+		/* N.B. Begin bank 1 processor features. */</div><div class='add'>+		u64 acount_mcount_support : 1;</div><div class='add'>+		u64 tsc_invariant_support : 1;</div><div class='add'>+		u64 cl_zero_support : 1;</div><div class='add'>+		u64 rdpru_support : 1;</div><div class='add'>+		u64 la57_support : 1;</div><div class='add'>+		u64 mbec_support : 1;</div><div class='add'>+		u64 nested_virt_support : 1;</div><div class='add'>+		u64 psfd_support : 1;</div><div class='add'>+		u64 cet_ss_support : 1;</div><div class='add'>+		u64 cet_ibt_support : 1;</div><div class='add'>+		u64 vmx_exception_inject_support : 1;</div><div class='add'>+		u64 enqcmd_support : 1;</div><div class='add'>+		u64 umwait_tpause_support : 1;</div><div class='add'>+		u64 movdiri_support : 1;</div><div class='add'>+		u64 movdir64b_support : 1;</div><div class='add'>+		u64 cldemote_support : 1;</div><div class='add'>+		u64 serialize_support : 1;</div><div class='add'>+		u64 tsc_deadline_tmr_support : 1;</div><div class='add'>+		u64 tsc_adjust_support : 1;</div><div class='add'>+		u64 fzlrep_movsb : 1;</div><div class='add'>+		u64 fsrep_stosb : 1;</div><div class='add'>+		u64 fsrep_cmpsb : 1;</div><div class='add'>+		u64 reserved_bank1 : 42;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_partition_processor_xsave_features {</div><div class='add'>+	struct {</div><div class='add'>+		u64 xsave_support : 1;</div><div class='add'>+		u64 xsaveopt_support : 1;</div><div class='add'>+		u64 avx_support : 1;</div><div class='add'>+		u64 reserved1 : 61;</div><div class='add'>+	} __packed;</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_partition_creation_properties {</div><div class='add'>+	union hv_partition_processor_features disabled_processor_features;</div><div class='add'>+	union hv_partition_processor_xsave_features</div><div class='add'>+		disabled_processor_xsave_features;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HV_PARTITION_SYNTHETIC_PROCESSOR_FEATURES_BANKS 1</div><div class='add'>+</div><div class='add'>+union hv_partition_synthetic_processor_features {</div><div class='add'>+	u64 as_uint64[HV_PARTITION_SYNTHETIC_PROCESSOR_FEATURES_BANKS];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u64 hypervisor_present : 1;</div><div class='add'>+		/* Support for HV#1: (CPUID leaves 0x40000000 - 0x40000006)*/</div><div class='add'>+		u64 hv1 : 1;</div><div class='add'>+		u64 access_vp_run_time_reg : 1; /* HV_X64_MSR_VP_RUNTIME */</div><div class='add'>+		u64 access_partition_reference_counter : 1; /* HV_X64_MSR_TIME_REF_COUNT */</div><div class='add'>+		u64 access_synic_regs : 1; /* SINT-related registers */</div><div class='add'>+		/*</div><div class='add'>+		 * Access to HV_X64_MSR_STIMER0_CONFIG through</div><div class='add'>+		 * HV_X64_MSR_STIMER3_COUNT.</div><div class='add'>+		 */</div><div class='add'>+		u64 access_synthetic_timer_regs : 1;</div><div class='add'>+		u64 access_intr_ctrl_regs : 1; /* APIC MSRs and VP assist page*/</div><div class='add'>+		/* HV_X64_MSR_GUEST_OS_ID and HV_X64_MSR_HYPERCALL */</div><div class='add'>+		u64 access_hypercall_regs : 1;</div><div class='add'>+		u64 access_vp_index : 1;</div><div class='add'>+		u64 access_partition_reference_tsc : 1;</div><div class='add'>+		u64 access_guest_idle_reg : 1;</div><div class='add'>+		u64 access_frequency_regs : 1;</div><div class='add'>+		u64 reserved_z12 : 1;</div><div class='add'>+		u64 reserved_z13 : 1;</div><div class='add'>+		u64 reserved_z14 : 1;</div><div class='add'>+		u64 enable_extended_gva_ranges_for_flush_virtual_address_list : 1;</div><div class='add'>+		u64 reserved_z16 : 1;</div><div class='add'>+		u64 reserved_z17 : 1;</div><div class='add'>+		/* Use fast hypercall output. Corresponds to privilege. */</div><div class='add'>+		u64 fast_hypercall_output : 1;</div><div class='add'>+		u64 reserved_z19 : 1;</div><div class='add'>+		u64 start_virtual_processor : 1; /* Can start VPs */</div><div class='add'>+		u64 reserved_z21 : 1;</div><div class='add'>+		/* Synthetic timers in direct mode. */</div><div class='add'>+		u64 direct_synthetic_timers : 1;</div><div class='add'>+		u64 reserved_z23 : 1;</div><div class='add'>+		u64 extended_processor_masks : 1;</div><div class='add'>+</div><div class='add'>+		/* Enable various hypercalls */</div><div class='add'>+		u64 tb_flush_hypercalls : 1;</div><div class='add'>+		u64 synthetic_cluster_ipi : 1;</div><div class='add'>+		u64 notify_long_spin_wait : 1;</div><div class='add'>+		u64 query_numa_distance : 1;</div><div class='add'>+		u64 signal_events : 1;</div><div class='add'>+		u64 retarget_device_interrupt : 1;</div><div class='add'>+		u64 restore_time : 1;</div><div class='add'>+</div><div class='add'>+		/* EnlightenedVmcs nested enlightenment is supported. */</div><div class='add'>+		u64 enlightened_vmcs : 1;</div><div class='add'>+		u64 reserved : 31;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HV_MAKE_COMPATIBILITY_VERSION(major_, minor_)	\</div><div class='add'>+	((u32)((major_) &lt;&lt; 8 | (minor_)))</div><div class='add'>+</div><div class='add'>+#define HV_COMPATIBILITY_21_H2		HV_MAKE_COMPATIBILITY_VERSION(0X6, 0X9)</div><div class='add'>+</div><div class='add'>+union hv_partition_isolation_properties {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 isolation_type: 5;</div><div class='add'>+		u64 isolation_host_type : 2;</div><div class='add'>+		u64 rsvd_z: 5;</div><div class='add'>+		u64 shared_gpa_boundary_page_number: 52;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Various isolation types supported by MSHV.</div><div class='add'>+ */</div><div class='add'>+#define HV_PARTITION_ISOLATION_TYPE_NONE            0</div><div class='add'>+#define HV_PARTITION_ISOLATION_TYPE_SNP             2</div><div class='add'>+#define HV_PARTITION_ISOLATION_TYPE_TDX             3</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Various host isolation types supported by MSHV.</div><div class='add'>+ */</div><div class='add'>+#define HV_PARTITION_ISOLATION_HOST_TYPE_NONE       0x0</div><div class='add'>+#define HV_PARTITION_ISOLATION_HOST_TYPE_HARDWARE   0x1</div><div class='add'>+#define HV_PARTITION_ISOLATION_HOST_TYPE_RESERVED   0x2</div><div class='add'>+</div><div class='add'>+/* Note: Exo partition is enabled by default */</div><div class='add'>+#define HV_PARTITION_CREATION_FLAG_GPA_SUPER_PAGES_ENABLED		BIT(4)</div><div class='add'>+#define HV_PARTITION_CREATION_FLAG_EXO_PARTITION			BIT(8)</div><div class='add'>+#define HV_PARTITION_CREATION_FLAG_LAPIC_ENABLED			BIT(13)</div><div class='add'>+#define HV_PARTITION_CREATION_FLAG_INTERCEPT_MESSAGE_PAGE_ENABLED	BIT(19)</div><div class='add'>+#define HV_PARTITION_CREATION_FLAG_X2APIC_CAPABLE			BIT(22)</div><div class='add'>+</div><div class='add'>+struct hv_input_create_partition {</div><div class='add'>+	u64 flags;</div><div class='add'>+	struct hv_proximity_domain_info proximity_domain_info;</div><div class='add'>+	u32 compatibility_version;</div><div class='add'>+	u32 padding;</div><div class='add'>+	struct hv_partition_creation_properties partition_creation_properties;</div><div class='add'>+	union hv_partition_isolation_properties isolation_properties;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_output_create_partition {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_initialize_partition {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_finalize_partition {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_delete_partition {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_get_partition_property {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 property_code; /* enum hv_partition_property_code */</div><div class='add'>+	u32 padding;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_output_get_partition_property {</div><div class='add'>+	u64 property_value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_set_partition_property {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 property_code; /* enum hv_partition_property_code */</div><div class='add'>+	u32 padding;</div><div class='add'>+	u64 property_value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_partition_property_arg {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		union {</div><div class='add'>+			u32 arg;</div><div class='add'>+			u32 vp_index;</div><div class='add'>+		};</div><div class='add'>+		u16 reserved0;</div><div class='add'>+		u8 reserved1;</div><div class='add'>+		u8 object_type;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_input_get_partition_property_ex {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 property_code; /* enum hv_partition_property_code */</div><div class='add'>+	u32 padding;</div><div class='add'>+	union {</div><div class='add'>+		union hv_partition_property_arg arg_data;</div><div class='add'>+		u64 arg;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOTE: Should use hv_input_set_partition_property_ex_header to compute this</div><div class='add'>+ * size, but hv_input_get_partition_property_ex is identical so it suffices</div><div class='add'>+ */</div><div class='add'>+#define HV_PARTITION_PROPERTY_EX_MAX_VAR_SIZE \</div><div class='add'>+	(HV_HYP_PAGE_SIZE - sizeof(struct hv_input_get_partition_property_ex))</div><div class='add'>+</div><div class='add'>+union hv_partition_property_ex {</div><div class='add'>+	u8 buffer[HV_PARTITION_PROPERTY_EX_MAX_VAR_SIZE];</div><div class='add'>+	struct hv_partition_property_vmm_capabilities vmm_capabilities;</div><div class='add'>+	/* More fields to be filled in when needed */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_output_get_partition_property_ex {</div><div class='add'>+	union hv_partition_property_ex property_value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hv_vp_state_page_type {</div><div class='add'>+	HV_VP_STATE_PAGE_REGISTERS = 0,</div><div class='add'>+	HV_VP_STATE_PAGE_INTERCEPT_MESSAGE = 1,</div><div class='add'>+	HV_VP_STATE_PAGE_GHCB = 2,</div><div class='add'>+	HV_VP_STATE_PAGE_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_input_map_vp_state_page {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	u16 type; /* enum hv_vp_state_page_type */</div><div class='add'>+	union hv_input_vtl input_vtl;</div><div class='add'>+	union {</div><div class='add'>+		u8 as_uint8;</div><div class='add'>+		struct {</div><div class='add'>+			u8 map_location_provided : 1;</div><div class='add'>+			u8 reserved : 7;</div><div class='add'>+		};</div><div class='add'>+	} flags;</div><div class='add'>+	u64 requested_map_location;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_output_map_vp_state_page {</div><div class='add'>+	u64 map_location; /* GPA page number */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_unmap_vp_state_page {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	u16 type; /* enum hv_vp_state_page_type */</div><div class='add'>+	union hv_input_vtl input_vtl;</div><div class='add'>+	u8 reserved0;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_x64_apic_eoi_message {</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	u32 interrupt_vector;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_opaque_intercept_message {</div><div class='add'>+	u32 vp_index;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hv_port_type {</div><div class='add'>+	HV_PORT_TYPE_MESSAGE = 1,</div><div class='add'>+	HV_PORT_TYPE_EVENT   = 2,</div><div class='add'>+	HV_PORT_TYPE_MONITOR = 3,</div><div class='add'>+	HV_PORT_TYPE_DOORBELL = 4	/* Root Partition only */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_port_info {</div><div class='add'>+	u32 port_type; /* enum hv_port_type */</div><div class='add'>+	u32 padding;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32 target_sint;</div><div class='add'>+			u32 target_vp;</div><div class='add'>+			u64 rsvdz;</div><div class='add'>+		} message_port_info;</div><div class='add'>+		struct {</div><div class='add'>+			u32 target_sint;</div><div class='add'>+			u32 target_vp;</div><div class='add'>+			u16 base_flag_number;</div><div class='add'>+			u16 flag_count;</div><div class='add'>+			u32 rsvdz;</div><div class='add'>+		} event_port_info;</div><div class='add'>+		struct {</div><div class='add'>+			u64 monitor_address;</div><div class='add'>+			u64 rsvdz;</div><div class='add'>+		} monitor_port_info;</div><div class='add'>+		struct {</div><div class='add'>+			u32 target_sint;</div><div class='add'>+			u32 target_vp;</div><div class='add'>+			u64 rsvdz;</div><div class='add'>+		} doorbell_port_info;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_connection_info {</div><div class='add'>+	u32 port_type;</div><div class='add'>+	u32 padding;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u64 rsvdz;</div><div class='add'>+		} message_connection_info;</div><div class='add'>+		struct {</div><div class='add'>+			u64 rsvdz;</div><div class='add'>+		} event_connection_info;</div><div class='add'>+		struct {</div><div class='add'>+			u64 monitor_address;</div><div class='add'>+		} monitor_connection_info;</div><div class='add'>+		struct {</div><div class='add'>+			u64 gpa;</div><div class='add'>+			u64 trigger_value;</div><div class='add'>+			u64 flags;</div><div class='add'>+		} doorbell_connection_info;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Define synthetic interrupt controller flag constants. */</div><div class='add'>+#define HV_EVENT_FLAGS_COUNT		(256 * 8)</div><div class='add'>+#define HV_EVENT_FLAGS_BYTE_COUNT	(256)</div><div class='add'>+#define HV_EVENT_FLAGS32_COUNT		(256 / sizeof(u32))</div><div class='add'>+</div><div class='add'>+/* linux side we create long version of flags to use long bit ops on flags */</div><div class='add'>+#define HV_EVENT_FLAGS_UL_COUNT		(256 / sizeof(ulong))</div><div class='add'>+</div><div class='add'>+/* Define the synthetic interrupt controller event flags format. */</div><div class='add'>+union hv_synic_event_flags {</div><div class='add'>+	unsigned char flags8[HV_EVENT_FLAGS_BYTE_COUNT];</div><div class='add'>+	u32 flags32[HV_EVENT_FLAGS32_COUNT];</div><div class='add'>+	ulong flags[HV_EVENT_FLAGS_UL_COUNT];  /* linux only */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_synic_event_flags_page {</div><div class='add'>+	volatile union hv_synic_event_flags event_flags[HV_SYNIC_SINT_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HV_SYNIC_EVENT_RING_MESSAGE_COUNT 63</div><div class='add'>+</div><div class='add'>+struct hv_synic_event_ring {</div><div class='add'>+	u8  signal_masked;</div><div class='add'>+	u8  ring_full;</div><div class='add'>+	u16 reserved_z;</div><div class='add'>+	u32 data[HV_SYNIC_EVENT_RING_MESSAGE_COUNT];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_synic_event_ring_page {</div><div class='add'>+	struct hv_synic_event_ring sint_event_ring[HV_SYNIC_SINT_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Define SynIC control register. */</div><div class='add'>+union hv_synic_scontrol {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 enable : 1;</div><div class='add'>+		u64 reserved : 63;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Define the format of the SIEFP register */</div><div class='add'>+union hv_synic_siefp {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 siefp_enabled : 1;</div><div class='add'>+		u64 preserved : 11;</div><div class='add'>+		u64 base_siefp_gpa : 52;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_synic_sirbp {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u64 sirbp_enabled : 1;</div><div class='add'>+		u64 preserved : 11;</div><div class='add'>+		u64 base_sirbp_gpa : 52;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_interrupt_control {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u32 interrupt_type; /* enum hv_interrupt_type */</div><div class='add'>+#if IS_ENABLED(CONFIG_X86)</div><div class='add'>+		u32 level_triggered : 1;</div><div class='add'>+		u32 logical_dest_mode : 1;</div><div class='add'>+		u32 rsvd : 30;</div><div class='add'>+#elif IS_ENABLED(CONFIG_ARM64)</div><div class='add'>+		u32 rsvd1 : 2;</div><div class='add'>+		u32 asserted : 1;</div><div class='add'>+		u32 rsvd2 : 29;</div><div class='add'>+#endif</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_stimer_state {</div><div class='add'>+	struct {</div><div class='add'>+		u32 undelivered_msg_pending : 1;</div><div class='add'>+		u32 reserved : 31;</div><div class='add'>+	} __packed flags;</div><div class='add'>+	u32 resvd;</div><div class='add'>+	u64 config;</div><div class='add'>+	u64 count;</div><div class='add'>+	u64 adjustment;</div><div class='add'>+	u64 undelivered_exp_time;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_synthetic_timers_state {</div><div class='add'>+	struct hv_stimer_state timers[HV_SYNIC_STIMER_COUNT];</div><div class='add'>+	u64 reserved[5];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_async_completion_message_payload {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 status;</div><div class='add'>+	u32 completion_count;</div><div class='add'>+	u64 sub_status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_input_delete_vp {</div><div class='add'>+	u64 as_uint64[2];</div><div class='add'>+	struct {</div><div class='add'>+		u64 partition_id;</div><div class='add'>+		u32 vp_index;</div><div class='add'>+		u8 reserved[4];</div><div class='add'>+	} __packed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_assert_virtual_interrupt {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	union hv_interrupt_control control;</div><div class='add'>+	u64 dest_addr; /* cpu's apic id */</div><div class='add'>+	u32 vector;</div><div class='add'>+	u8 target_vtl;</div><div class='add'>+	u8 rsvd_z0;</div><div class='add'>+	u16 rsvd_z1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_create_port {</div><div class='add'>+	u64 port_partition_id;</div><div class='add'>+	union hv_port_id port_id;</div><div class='add'>+	u8 port_vtl;</div><div class='add'>+	u8 min_connection_vtl;</div><div class='add'>+	u16 padding;</div><div class='add'>+	u64 connection_partition_id;</div><div class='add'>+	struct hv_port_info port_info;</div><div class='add'>+	struct hv_proximity_domain_info proximity_domain_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_input_delete_port {</div><div class='add'>+	u64 as_uint64[2];</div><div class='add'>+	struct {</div><div class='add'>+		u64 port_partition_id;</div><div class='add'>+		union hv_port_id port_id;</div><div class='add'>+		u32 reserved;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_connect_port {</div><div class='add'>+	u64 connection_partition_id;</div><div class='add'>+	union hv_connection_id connection_id;</div><div class='add'>+	u8 connection_vtl;</div><div class='add'>+	u8 rsvdz0;</div><div class='add'>+	u16 rsvdz1;</div><div class='add'>+	u64 port_partition_id;</div><div class='add'>+	union hv_port_id port_id;</div><div class='add'>+	u32 reserved2;</div><div class='add'>+	struct hv_connection_info connection_info;</div><div class='add'>+	struct hv_proximity_domain_info proximity_domain_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_input_disconnect_port {</div><div class='add'>+	u64 as_uint64[2];</div><div class='add'>+	struct {</div><div class='add'>+		u64 connection_partition_id;</div><div class='add'>+		union hv_connection_id connection_id;</div><div class='add'>+		u32 is_doorbell: 1;</div><div class='add'>+		u32 reserved: 31;</div><div class='add'>+	} __packed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_input_notify_port_ring_empty {</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		u32 sint_index;</div><div class='add'>+		u32 reserved;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_vp_state_data_xsave {</div><div class='add'>+	u64 flags;</div><div class='add'>+	union hv_x64_xsave_xfem_register states;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For getting and setting VP state, there are two options based on the state type:</div><div class='add'>+ *</div><div class='add'>+ *     1.) Data that is accessed by PFNs in the input hypercall page. This is used</div><div class='add'>+ *         for state which may not fit into the hypercall pages.</div><div class='add'>+ *     2.) Data that is accessed directly in the input\output hypercall pages.</div><div class='add'>+ *         This is used for state that will always fit into the hypercall pages.</div><div class='add'>+ *</div><div class='add'>+ * In the future this could be dynamic based on the size if needed.</div><div class='add'>+ *</div><div class='add'>+ * Note these hypercalls have an 8-byte aligned variable header size as per the tlfs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HV_GET_SET_VP_STATE_TYPE_PFN	BIT(31)</div><div class='add'>+</div><div class='add'>+enum hv_get_set_vp_state_type {</div><div class='add'>+	/* HvGetSetVpStateLocalInterruptControllerState - APIC/GIC state */</div><div class='add'>+	HV_GET_SET_VP_STATE_LAPIC_STATE	     = 0 | HV_GET_SET_VP_STATE_TYPE_PFN,</div><div class='add'>+	HV_GET_SET_VP_STATE_XSAVE	     = 1 | HV_GET_SET_VP_STATE_TYPE_PFN,</div><div class='add'>+	HV_GET_SET_VP_STATE_SIM_PAGE	     = 2 | HV_GET_SET_VP_STATE_TYPE_PFN,</div><div class='add'>+	HV_GET_SET_VP_STATE_SIEF_PAGE	     = 3 | HV_GET_SET_VP_STATE_TYPE_PFN,</div><div class='add'>+	HV_GET_SET_VP_STATE_SYNTHETIC_TIMERS = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_vp_state_data {</div><div class='add'>+	u32 type;</div><div class='add'>+	u32 rsvd;</div><div class='add'>+	struct hv_vp_state_data_xsave xsave;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_get_vp_state {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	u8 input_vtl;</div><div class='add'>+	u8 rsvd0;</div><div class='add'>+	u16 rsvd1;</div><div class='add'>+	struct hv_vp_state_data state_data;</div><div class='add'>+	u64 output_data_pfns[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_output_get_vp_state {</div><div class='add'>+	struct hv_synthetic_timers_state synthetic_timers_state;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_input_set_vp_state_data {</div><div class='add'>+	u64 pfns;</div><div class='add'>+	u8 bytes;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_set_vp_state {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	u8 input_vtl;</div><div class='add'>+	u8 rsvd0;</div><div class='add'>+	u16 rsvd1;</div><div class='add'>+	struct hv_vp_state_data state_data;</div><div class='add'>+	union hv_input_set_vp_state_data data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_x64_vp_execution_state {</div><div class='add'>+	u16 as_uint16;</div><div class='add'>+	struct {</div><div class='add'>+		u16 cpl:2;</div><div class='add'>+		u16 cr0_pe:1;</div><div class='add'>+		u16 cr0_am:1;</div><div class='add'>+		u16 efer_lma:1;</div><div class='add'>+		u16 debug_active:1;</div><div class='add'>+		u16 interruption_pending:1;</div><div class='add'>+		u16 vtl:4;</div><div class='add'>+		u16 enclave_mode:1;</div><div class='add'>+		u16 interrupt_shadow:1;</div><div class='add'>+		u16 virtualization_fault_active:1;</div><div class='add'>+		u16 reserved:2;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_x64_intercept_message_header {</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	u8 instruction_length:4;</div><div class='add'>+	u8 cr8:4; /* Only set for exo partitions */</div><div class='add'>+	u8 intercept_access_type;</div><div class='add'>+	union hv_x64_vp_execution_state execution_state;</div><div class='add'>+	struct hv_x64_segment_register cs_segment;</div><div class='add'>+	u64 rip;</div><div class='add'>+	u64 rflags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_x64_memory_access_info {</div><div class='add'>+	u8 as_uint8;</div><div class='add'>+	struct {</div><div class='add'>+		u8 gva_valid:1;</div><div class='add'>+		u8 gva_gpa_valid:1;</div><div class='add'>+		u8 hypercall_output_pending:1;</div><div class='add'>+		u8 tlb_locked_no_overlay:1;</div><div class='add'>+		u8 reserved:4;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_x64_memory_intercept_message {</div><div class='add'>+	struct hv_x64_intercept_message_header header;</div><div class='add'>+	u32 cache_type; /* enum hv_cache_type */</div><div class='add'>+	u8 instruction_byte_count;</div><div class='add'>+	union hv_x64_memory_access_info memory_access_info;</div><div class='add'>+	u8 tpr_priority;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	u64 guest_virtual_address;</div><div class='add'>+	u64 guest_physical_address;</div><div class='add'>+	u8 instruction_bytes[16];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Dispatch state for the VP communicated by the hypervisor to the</div><div class='add'>+ * VP-dispatching thread in the root on return from HVCALL_DISPATCH_VP.</div><div class='add'>+ */</div><div class='add'>+enum hv_vp_dispatch_state {</div><div class='add'>+	HV_VP_DISPATCH_STATE_INVALID	= 0,</div><div class='add'>+	HV_VP_DISPATCH_STATE_BLOCKED	= 1,</div><div class='add'>+	HV_VP_DISPATCH_STATE_READY	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Dispatch event that caused the current dispatch state on return from</div><div class='add'>+ * HVCALL_DISPATCH_VP.</div><div class='add'>+ */</div><div class='add'>+enum hv_vp_dispatch_event {</div><div class='add'>+	HV_VP_DISPATCH_EVENT_INVALID	= 0x00000000,</div><div class='add'>+	HV_VP_DISPATCH_EVENT_SUSPEND	= 0x00000001,</div><div class='add'>+	HV_VP_DISPATCH_EVENT_INTERCEPT	= 0x00000002,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HV_ROOT_SCHEDULER_MAX_VPS_PER_CHILD_PARTITION   1024</div><div class='add'>+/* The maximum array size of HV_GENERIC_SET (vp_set) buffer */</div><div class='add'>+#define HV_GENERIC_SET_QWORD_COUNT(max) (((((max) - 1) &gt;&gt; 6) + 1) + 2)</div><div class='add'>+</div><div class='add'>+struct hv_vp_signal_bitset_scheduler_message {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 overflow_count;</div><div class='add'>+	u16 vp_count;</div><div class='add'>+	u16 reserved;</div><div class='add'>+</div><div class='add'>+#define BITSET_BUFFER_SIZE \</div><div class='add'>+	HV_GENERIC_SET_QWORD_COUNT(HV_ROOT_SCHEDULER_MAX_VPS_PER_CHILD_PARTITION)</div><div class='add'>+	union {</div><div class='add'>+		struct hv_vpset bitset;</div><div class='add'>+		u64 bitset_buffer[BITSET_BUFFER_SIZE];</div><div class='add'>+	} vp_bitset;</div><div class='add'>+#undef BITSET_BUFFER_SIZE</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static_assert(sizeof(struct hv_vp_signal_bitset_scheduler_message) &lt;=</div><div class='add'>+	(sizeof(struct hv_message) - sizeof(struct hv_message_header)));</div><div class='add'>+</div><div class='add'>+#define HV_MESSAGE_MAX_PARTITION_VP_PAIR_COUNT \</div><div class='add'>+	(((sizeof(struct hv_message) - sizeof(struct hv_message_header)) / \</div><div class='add'>+	 (sizeof(u64 /* partition id */) + sizeof(u32 /* vp index */))) - 1)</div><div class='add'>+</div><div class='add'>+struct hv_vp_signal_pair_scheduler_message {</div><div class='add'>+	u32 overflow_count;</div><div class='add'>+	u8 vp_count;</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+</div><div class='add'>+	u64 partition_ids[HV_MESSAGE_MAX_PARTITION_VP_PAIR_COUNT];</div><div class='add'>+	u32 vp_indexes[HV_MESSAGE_MAX_PARTITION_VP_PAIR_COUNT];</div><div class='add'>+</div><div class='add'>+	u8 reserved2[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static_assert(sizeof(struct hv_vp_signal_pair_scheduler_message) ==</div><div class='add'>+	(sizeof(struct hv_message) - sizeof(struct hv_message_header)));</div><div class='add'>+</div><div class='add'>+/* Input and output structures for HVCALL_DISPATCH_VP */</div><div class='add'>+#define HV_DISPATCH_VP_FLAG_CLEAR_INTERCEPT_SUSPEND	0x1</div><div class='add'>+#define HV_DISPATCH_VP_FLAG_ENABLE_CALLER_INTERRUPTS	0x2</div><div class='add'>+#define HV_DISPATCH_VP_FLAG_SET_CALLER_SPEC_CTRL	0x4</div><div class='add'>+#define HV_DISPATCH_VP_FLAG_SKIP_VP_SPEC_FLUSH		0x8</div><div class='add'>+#define HV_DISPATCH_VP_FLAG_SKIP_CALLER_SPEC_FLUSH	0x10</div><div class='add'>+#define HV_DISPATCH_VP_FLAG_SKIP_CALLER_USER_SPEC_FLUSH	0x20</div><div class='add'>+#define HV_DISPATCH_VP_FLAG_SCAN_INTERRUPT_INJECTION	0x40</div><div class='add'>+</div><div class='add'>+struct hv_input_dispatch_vp {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u64 time_slice; /* in 100ns */</div><div class='add'>+	u64 spec_ctrl;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_output_dispatch_vp {</div><div class='add'>+	u32 dispatch_state; /* enum hv_vp_dispatch_state */</div><div class='add'>+	u32 dispatch_event; /* enum hv_vp_dispatch_event */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_modify_sparse_spa_page_host_access {</div><div class='add'>+	u32 host_access : 2;</div><div class='add'>+	u32 reserved : 30;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u64 spa_page_list[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* hv_input_modify_sparse_spa_page_host_access flags */</div><div class='add'>+#define HV_MODIFY_SPA_PAGE_HOST_ACCESS_MAKE_EXCLUSIVE  0x1</div><div class='add'>+#define HV_MODIFY_SPA_PAGE_HOST_ACCESS_MAKE_SHARED     0x2</div><div class='add'>+#define HV_MODIFY_SPA_PAGE_HOST_ACCESS_LARGE_PAGE      0x4</div><div class='add'>+#define HV_MODIFY_SPA_PAGE_HOST_ACCESS_HUGE_PAGE       0x8</div><div class='add'>+</div><div class='add'>+#endif /* _HV_HVHDK_H */</div><div class='head'>diff --git a/include/hyperv/hvhdk_mini.h b/include/hyperv/hvhdk_mini.h<br/>new file mode 100644<br/>index 000000000000..41a29bf8ec14<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/hyperv/hvhdk_mini.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/hyperv/hvhdk_mini.h</a></div><div class='hunk'>@@ -0,0 +1,531 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Type definitions for the Microsoft Hypervisor.</div><div class='add'>+ */</div><div class='add'>+#ifndef _HV_HVHDK_MINI_H</div><div class='add'>+#define _HV_HVHDK_MINI_H</div><div class='add'>+</div><div class='add'>+#include "hvgdk_mini.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Doorbell connection_info flags.</div><div class='add'>+ */</div><div class='add'>+#define HV_DOORBELL_FLAG_TRIGGER_SIZE_MASK  0x00000007</div><div class='add'>+#define HV_DOORBELL_FLAG_TRIGGER_SIZE_ANY   0x00000000</div><div class='add'>+#define HV_DOORBELL_FLAG_TRIGGER_SIZE_BYTE  0x00000001</div><div class='add'>+#define HV_DOORBELL_FLAG_TRIGGER_SIZE_WORD  0x00000002</div><div class='add'>+#define HV_DOORBELL_FLAG_TRIGGER_SIZE_DWORD 0x00000003</div><div class='add'>+#define HV_DOORBELL_FLAG_TRIGGER_SIZE_QWORD 0x00000004</div><div class='add'>+#define HV_DOORBELL_FLAG_TRIGGER_ANY_VALUE  0x80000000</div><div class='add'>+</div><div class='add'>+/* Each generic set contains 64 elements */</div><div class='add'>+#define HV_GENERIC_SET_SHIFT		(6)</div><div class='add'>+#define HV_GENERIC_SET_MASK		(63)</div><div class='add'>+</div><div class='add'>+enum hv_generic_set_format {</div><div class='add'>+	HV_GENERIC_SET_SPARSE_4K,</div><div class='add'>+	HV_GENERIC_SET_ALL,</div><div class='add'>+};</div><div class='add'>+#define HV_GENERIC_SET_FORMAT hv_generic_set_format</div><div class='add'>+</div><div class='add'>+enum hv_scheduler_type {</div><div class='add'>+	HV_SCHEDULER_TYPE_LP		= 1, /* Classic scheduler w/o SMT */</div><div class='add'>+	HV_SCHEDULER_TYPE_LP_SMT	= 2, /* Classic scheduler w/ SMT */</div><div class='add'>+	HV_SCHEDULER_TYPE_CORE_SMT	= 3, /* Core scheduler */</div><div class='add'>+	HV_SCHEDULER_TYPE_ROOT		= 4, /* Root / integrated scheduler */</div><div class='add'>+	HV_SCHEDULER_TYPE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HV_STATS_AREA_TYPE */</div><div class='add'>+enum hv_stats_area_type {</div><div class='add'>+	HV_STATS_AREA_SELF = 0,</div><div class='add'>+	HV_STATS_AREA_PARENT = 1,</div><div class='add'>+	HV_STATS_AREA_INTERNAL = 2,</div><div class='add'>+	HV_STATS_AREA_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hv_stats_object_type {</div><div class='add'>+	HV_STATS_OBJECT_HYPERVISOR		= 0x00000001,</div><div class='add'>+	HV_STATS_OBJECT_LOGICAL_PROCESSOR	= 0x00000002,</div><div class='add'>+	HV_STATS_OBJECT_PARTITION		= 0x00010001,</div><div class='add'>+	HV_STATS_OBJECT_VP			= 0x00010002</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_stats_object_identity {</div><div class='add'>+	/* hv_stats_hypervisor */</div><div class='add'>+	struct {</div><div class='add'>+		u8 reserved[15];</div><div class='add'>+		u8 stats_area_type;</div><div class='add'>+	} __packed hv;</div><div class='add'>+</div><div class='add'>+	/* hv_stats_logical_processor */</div><div class='add'>+	struct {</div><div class='add'>+		u32 lp_index;</div><div class='add'>+		u8 reserved[11];</div><div class='add'>+		u8 stats_area_type;</div><div class='add'>+	} __packed lp;</div><div class='add'>+</div><div class='add'>+	/* hv_stats_partition */</div><div class='add'>+	struct {</div><div class='add'>+		u64 partition_id;</div><div class='add'>+		u8  reserved[7];</div><div class='add'>+		u8  stats_area_type;</div><div class='add'>+	} __packed partition;</div><div class='add'>+</div><div class='add'>+	/* hv_stats_vp */</div><div class='add'>+	struct {</div><div class='add'>+		u64 partition_id;</div><div class='add'>+		u32 vp_index;</div><div class='add'>+		u16 flags;</div><div class='add'>+		u8  reserved;</div><div class='add'>+		u8  stats_area_type;</div><div class='add'>+	} __packed vp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hv_partition_property_code {</div><div class='add'>+	/* Privilege properties */</div><div class='add'>+	HV_PARTITION_PROPERTY_PRIVILEGE_FLAGS			= 0x00010000,</div><div class='add'>+	HV_PARTITION_PROPERTY_SYNTHETIC_PROC_FEATURES		= 0x00010001,</div><div class='add'>+</div><div class='add'>+	/* Resource properties */</div><div class='add'>+	HV_PARTITION_PROPERTY_GPA_PAGE_ACCESS_TRACKING		= 0x00050005,</div><div class='add'>+	HV_PARTITION_PROPERTY_UNIMPLEMENTED_MSR_ACTION		= 0x00050017,</div><div class='add'>+</div><div class='add'>+	/* Compatibility properties */</div><div class='add'>+	HV_PARTITION_PROPERTY_PROCESSOR_XSAVE_FEATURES		= 0x00060002,</div><div class='add'>+	HV_PARTITION_PROPERTY_XSAVE_STATES                      = 0x00060007,</div><div class='add'>+	HV_PARTITION_PROPERTY_MAX_XSAVE_DATA_SIZE		= 0x00060008,</div><div class='add'>+	HV_PARTITION_PROPERTY_PROCESSOR_CLOCK_FREQUENCY		= 0x00060009,</div><div class='add'>+</div><div class='add'>+	/* Extended properties with larger property values */</div><div class='add'>+	HV_PARTITION_PROPERTY_VMM_CAPABILITIES			= 0x00090007,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HV_PARTITION_VMM_CAPABILITIES_BANK_COUNT		1</div><div class='add'>+#define HV_PARTITION_VMM_CAPABILITIES_RESERVED_BITFIELD_COUNT	59</div><div class='add'>+</div><div class='add'>+struct hv_partition_property_vmm_capabilities {</div><div class='add'>+	u16 bank_count;</div><div class='add'>+	u16 reserved[3];</div><div class='add'>+	union {</div><div class='add'>+		u64 as_uint64[HV_PARTITION_VMM_CAPABILITIES_BANK_COUNT];</div><div class='add'>+		struct {</div><div class='add'>+			u64 map_gpa_preserve_adjustable: 1;</div><div class='add'>+			u64 vmm_can_provide_overlay_gpfn: 1;</div><div class='add'>+			u64 vp_affinity_property: 1;</div><div class='add'>+#if IS_ENABLED(CONFIG_ARM64)</div><div class='add'>+			u64 vmm_can_provide_gic_overlay_locations: 1;</div><div class='add'>+#else</div><div class='add'>+			u64 reservedbit3: 1;</div><div class='add'>+#endif</div><div class='add'>+			u64 assignable_synthetic_proc_features: 1;</div><div class='add'>+			u64 reserved0: HV_PARTITION_VMM_CAPABILITIES_RESERVED_BITFIELD_COUNT;</div><div class='add'>+		} __packed;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hv_snp_status {</div><div class='add'>+	HV_SNP_STATUS_NONE = 0,</div><div class='add'>+	HV_SNP_STATUS_AVAILABLE = 1,</div><div class='add'>+	HV_SNP_STATUS_INCOMPATIBLE = 2,</div><div class='add'>+	HV_SNP_STATUS_PSP_UNAVAILABLE = 3,</div><div class='add'>+	HV_SNP_STATUS_PSP_INIT_FAILED = 4,</div><div class='add'>+	HV_SNP_STATUS_PSP_BAD_FW_VERSION = 5,</div><div class='add'>+	HV_SNP_STATUS_BAD_CONFIGURATION = 6,</div><div class='add'>+	HV_SNP_STATUS_PSP_FW_UPDATE_IN_PROGRESS = 7,</div><div class='add'>+	HV_SNP_STATUS_PSP_RB_INIT_FAILED = 8,</div><div class='add'>+	HV_SNP_STATUS_PSP_PLATFORM_STATUS_FAILED = 9,</div><div class='add'>+	HV_SNP_STATUS_PSP_INIT_LATE_FAILED = 10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hv_system_property {</div><div class='add'>+	/* Add more values when needed */</div><div class='add'>+	HV_SYSTEM_PROPERTY_SLEEP_STATE = 3,</div><div class='add'>+	HV_SYSTEM_PROPERTY_SCHEDULER_TYPE = 15,</div><div class='add'>+	HV_DYNAMIC_PROCESSOR_FEATURE_PROPERTY = 21,</div><div class='add'>+	HV_SYSTEM_PROPERTY_CRASHDUMPAREA = 47,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HV_PFN_RANGE_PGBITS 24  /* HV_SPA_PAGE_RANGE_ADDITIONAL_PAGES_BITS */</div><div class='add'>+union hv_pfn_range {            /* HV_SPA_PAGE_RANGE */</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+	struct {</div><div class='add'>+		/* 39:0: base pfn.  63:40: additional pages */</div><div class='add'>+		u64 base_pfn : 64 - HV_PFN_RANGE_PGBITS;</div><div class='add'>+		u64 add_pfns : HV_PFN_RANGE_PGBITS;</div><div class='add'>+	} __packed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hv_sleep_state {</div><div class='add'>+	HV_SLEEP_STATE_S1 = 1,</div><div class='add'>+	HV_SLEEP_STATE_S2 = 2,</div><div class='add'>+	HV_SLEEP_STATE_S3 = 3,</div><div class='add'>+	HV_SLEEP_STATE_S4 = 4,</div><div class='add'>+	HV_SLEEP_STATE_S5 = 5,</div><div class='add'>+	/*</div><div class='add'>+	 * After hypervisor has received this, any follow up sleep</div><div class='add'>+	 * state registration requests will be rejected.</div><div class='add'>+	 */</div><div class='add'>+	HV_SLEEP_STATE_LOCK = 6</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hv_dynamic_processor_feature_property {</div><div class='add'>+	/* Add more values when needed */</div><div class='add'>+	HV_X64_DYNAMIC_PROCESSOR_FEATURE_MAX_ENCRYPTED_PARTITIONS = 13,</div><div class='add'>+	HV_X64_DYNAMIC_PROCESSOR_FEATURE_SNP_STATUS = 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_input_get_system_property {</div><div class='add'>+	u32 property_id; /* enum hv_system_property */</div><div class='add'>+	union {</div><div class='add'>+		u32 as_uint32;</div><div class='add'>+#if IS_ENABLED(CONFIG_X86)</div><div class='add'>+		/* enum hv_dynamic_processor_feature_property */</div><div class='add'>+		u32 hv_processor_feature;</div><div class='add'>+#endif</div><div class='add'>+		/* More fields to be filled in when needed */</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_output_get_system_property {</div><div class='add'>+	union {</div><div class='add'>+		u32 scheduler_type; /* enum hv_scheduler_type */</div><div class='add'>+#if IS_ENABLED(CONFIG_X86)</div><div class='add'>+		u64 hv_processor_feature_value;</div><div class='add'>+#endif</div><div class='add'>+		union hv_pfn_range hv_cda_info; /* CrashdumpAreaAddress */</div><div class='add'>+		u64 hv_tramp_pa;                /* CrashdumpTrampolineAddress */</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_sleep_state_info {</div><div class='add'>+	u32 sleep_state; /* enum hv_sleep_state */</div><div class='add'>+	u8 pm1a_slp_typ;</div><div class='add'>+	u8 pm1b_slp_typ;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_set_system_property {</div><div class='add'>+	u32 property_id; /* enum hv_system_property */</div><div class='add'>+	u32 reserved;</div><div class='add'>+	union {</div><div class='add'>+		/* More fields to be filled in when needed */</div><div class='add'>+		struct hv_sleep_state_info set_sleep_state_info;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Add a reserved field to ensure the union is 8-byte aligned as</div><div class='add'>+		 * existing members may not be. This is a temporary measure</div><div class='add'>+		 * until all remaining members are added.</div><div class='add'>+		 */</div><div class='add'>+		 u64 reserved0[8];</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_enter_sleep_state {     /* HV_INPUT_ENTER_SLEEP_STATE */</div><div class='add'>+	u32 sleep_state;        /* enum hv_sleep_state */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_map_stats_page {</div><div class='add'>+	u32 type; /* enum hv_stats_object_type */</div><div class='add'>+	u32 padding;</div><div class='add'>+	union hv_stats_object_identity identity;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_map_stats_page2 {</div><div class='add'>+	u32 type; /* enum hv_stats_object_type */</div><div class='add'>+	u32 padding;</div><div class='add'>+	union hv_stats_object_identity identity;</div><div class='add'>+	u64 map_location;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_output_map_stats_page {</div><div class='add'>+	u64 map_location;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_unmap_stats_page {</div><div class='add'>+	u32 type; /* enum hv_stats_object_type */</div><div class='add'>+	u32 padding;</div><div class='add'>+	union hv_stats_object_identity identity;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_proximity_domain_flags {</div><div class='add'>+	u32 proximity_preferred : 1;</div><div class='add'>+	u32 reserved : 30;</div><div class='add'>+	u32 proximity_info_valid : 1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_proximity_domain_info {</div><div class='add'>+	u32 domain_id;</div><div class='add'>+	struct hv_proximity_domain_flags flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HvDepositMemory hypercall */</div><div class='add'>+struct hv_deposit_memory {	/* HV_INPUT_DEPOSIT_MEMORY */</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u64 gpa_page_list[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_withdraw_memory {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	struct hv_proximity_domain_info proximity_domain_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_output_withdraw_memory {</div><div class='add'>+	DECLARE_FLEX_ARRAY(u64, gpa_page_list);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HV Map GPA (Guest Physical Address) Flags */</div><div class='add'>+#define HV_MAP_GPA_PERMISSIONS_NONE	       0x0</div><div class='add'>+#define HV_MAP_GPA_READABLE		       0x1</div><div class='add'>+#define HV_MAP_GPA_WRITABLE		       0x2</div><div class='add'>+#define HV_MAP_GPA_KERNEL_EXECUTABLE	       0x4</div><div class='add'>+#define HV_MAP_GPA_USER_EXECUTABLE	       0x8</div><div class='add'>+#define HV_MAP_GPA_EXECUTABLE		       0xC</div><div class='add'>+#define HV_MAP_GPA_PERMISSIONS_MASK	       0xF</div><div class='add'>+#define HV_MAP_GPA_ADJUSTABLE		    0x8000</div><div class='add'>+#define HV_MAP_GPA_NO_ACCESS		   0x10000</div><div class='add'>+#define HV_MAP_GPA_NOT_CACHED		  0x200000</div><div class='add'>+#define HV_MAP_GPA_LARGE_PAGE		0x80000000</div><div class='add'>+</div><div class='add'>+struct hv_input_map_gpa_pages {</div><div class='add'>+	u64 target_partition_id;</div><div class='add'>+	u64 target_gpa_base;</div><div class='add'>+	u32 map_flags;</div><div class='add'>+	u32 padding;</div><div class='add'>+	u64 source_gpa_page_list[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_gpa_page_access_state_flags {</div><div class='add'>+	struct {</div><div class='add'>+		u64 clear_accessed : 1;</div><div class='add'>+		u64 set_accessed : 1;</div><div class='add'>+		u64 clear_dirty : 1;</div><div class='add'>+		u64 set_dirty : 1;</div><div class='add'>+		u64 reserved : 60;</div><div class='add'>+	} __packed;</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_input_get_gpa_pages_access_state {</div><div class='add'>+	u64  partition_id;</div><div class='add'>+	union hv_gpa_page_access_state_flags flags;</div><div class='add'>+	u64 hv_gpa_page_number;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_gpa_page_access_state {</div><div class='add'>+	struct {</div><div class='add'>+		u8 accessed : 1;</div><div class='add'>+		u8 dirty : 1;</div><div class='add'>+		u8 reserved: 6;</div><div class='add'>+	};</div><div class='add'>+	u8 as_uint8;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hv_crashdump_action {</div><div class='add'>+	HV_CRASHDUMP_NONE = 0,</div><div class='add'>+	HV_CRASHDUMP_SUSPEND_ALL_VPS,</div><div class='add'>+	HV_CRASHDUMP_PREPARE_FOR_STATE_SAVE,</div><div class='add'>+	HV_CRASHDUMP_STATE_SAVED,</div><div class='add'>+	HV_CRASHDUMP_ENTRY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_partition_event_root_crashdump_input {</div><div class='add'>+	u32 crashdump_action; /* enum hv_crashdump_action */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_disable_hyp_ex {   /* HV_X64_INPUT_DISABLE_HYPERVISOR_EX */</div><div class='add'>+	u64 rip;</div><div class='add'>+	u64 arg;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_crashdump_area {	   /* HV_CRASHDUMP_AREA */</div><div class='add'>+	u32 version;</div><div class='add'>+	union {</div><div class='add'>+		u32 flags_as_uint32;</div><div class='add'>+		struct {</div><div class='add'>+			u32 cda_valid : 1;</div><div class='add'>+			u32 cda_unused : 31;</div><div class='add'>+		} __packed;</div><div class='add'>+	};</div><div class='add'>+	/* more unused fields */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_partition_event_input {</div><div class='add'>+	struct hv_partition_event_root_crashdump_input crashdump_input;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hv_partition_event {</div><div class='add'>+	HV_PARTITION_EVENT_ROOT_CRASHDUMP = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_input_notify_partition_event {</div><div class='add'>+	u32 event;      /* enum hv_partition_event */</div><div class='add'>+	union hv_partition_event_input input;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_lp_startup_status {</div><div class='add'>+	u64 hv_status;</div><div class='add'>+	u64 substatus1;</div><div class='add'>+	u64 substatus2;</div><div class='add'>+	u64 substatus3;</div><div class='add'>+	u64 substatus4;</div><div class='add'>+	u64 substatus5;</div><div class='add'>+	u64 substatus6;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_input_add_logical_processor {</div><div class='add'>+	u32 lp_index;</div><div class='add'>+	u32 apic_id;</div><div class='add'>+	struct hv_proximity_domain_info proximity_domain_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hv_output_add_logical_processor {</div><div class='add'>+	struct hv_lp_startup_status startup_status;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum {	/* HV_SUBNODE_TYPE */</div><div class='add'>+	HV_SUBNODE_ANY		= 0,</div><div class='add'>+	HV_SUBNODE_SOCKET,</div><div class='add'>+	HV_SUBNODE_CLUSTER,</div><div class='add'>+	HV_SUBNODE_L3,</div><div class='add'>+	HV_SUBNODE_COUNT,</div><div class='add'>+	HV_SUBNODE_INVALID	= -1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hv_create_vp {	/* HV_INPUT_CREATE_VP */</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u32 vp_index;</div><div class='add'>+	u8 padding[3];</div><div class='add'>+	u8 subnode_type;</div><div class='add'>+	u64 subnode_id;</div><div class='add'>+	struct hv_proximity_domain_info proximity_domain_info;</div><div class='add'>+	u64 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HV_INTERRUPT_TRIGGER_MODE */</div><div class='add'>+enum hv_interrupt_trigger_mode {</div><div class='add'>+	HV_INTERRUPT_TRIGGER_MODE_EDGE	= 0,</div><div class='add'>+	HV_INTERRUPT_TRIGGER_MODE_LEVEL	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HV_DEVICE_INTERRUPT_DESCRIPTOR */</div><div class='add'>+struct hv_device_interrupt_descriptor {</div><div class='add'>+	u32 interrupt_type;</div><div class='add'>+	u32 trigger_mode;</div><div class='add'>+	u32 vector_count;</div><div class='add'>+	u32 reserved;</div><div class='add'>+	struct hv_device_interrupt_target target;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HV_INPUT_MAP_DEVICE_INTERRUPT */</div><div class='add'>+struct hv_input_map_device_interrupt {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u64 device_id;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 base_irt_idx;</div><div class='add'>+	struct hv_interrupt_entry logical_interrupt_entry;</div><div class='add'>+	struct hv_device_interrupt_descriptor interrupt_descriptor;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HV_OUTPUT_MAP_DEVICE_INTERRUPT */</div><div class='add'>+struct hv_output_map_device_interrupt {</div><div class='add'>+	struct hv_interrupt_entry interrupt_entry;</div><div class='add'>+	u64 ext_status_deprecated[5];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HV_INPUT_UNMAP_DEVICE_INTERRUPT */</div><div class='add'>+struct hv_input_unmap_device_interrupt {</div><div class='add'>+	u64 partition_id;</div><div class='add'>+	u64 device_id;</div><div class='add'>+	struct hv_interrupt_entry interrupt_entry;</div><div class='add'>+	u32 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HV_SOURCE_SHADOW_NONE		    0x0</div><div class='add'>+#define HV_SOURCE_SHADOW_BRIDGE_BUS_RANGE   0x1</div><div class='add'>+</div><div class='add'>+struct hv_send_ipi_ex { /* HV_INPUT_SEND_SYNTHETIC_CLUSTER_IPI_EX */</div><div class='add'>+	u32 vector;</div><div class='add'>+	u32 reserved;</div><div class='add'>+	struct hv_vpset vp_set;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+typedef u16 hv_pci_rid;		/* HV_PCI_RID */</div><div class='add'>+typedef u16 hv_pci_segment;	/* HV_PCI_SEGMENT */</div><div class='add'>+typedef u64 hv_logical_device_id;</div><div class='add'>+union hv_pci_bdf {	/* HV_PCI_BDF */</div><div class='add'>+	u16 as_uint16;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 function : 3;</div><div class='add'>+		u8 device : 5;</div><div class='add'>+		u8 bus;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union hv_pci_bus_range {</div><div class='add'>+	u16 as_uint16;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 subordinate_bus;</div><div class='add'>+		u8 secondary_bus;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum hv_device_type {		/* HV_DEVICE_TYPE */</div><div class='add'>+	HV_DEVICE_TYPE_LOGICAL	= 0,</div><div class='add'>+	HV_DEVICE_TYPE_PCI	= 1,</div><div class='add'>+	HV_DEVICE_TYPE_IOAPIC	= 2,</div><div class='add'>+	HV_DEVICE_TYPE_ACPI	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union hv_device_id {		/* HV_DEVICE_ID */</div><div class='add'>+	u64 as_uint64;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u64 reserved0 : 62;</div><div class='add'>+		u64 device_type : 2;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* HV_DEVICE_TYPE_LOGICAL */</div><div class='add'>+	struct {</div><div class='add'>+		u64 id : 62;</div><div class='add'>+		u64 device_type : 2;</div><div class='add'>+	} logical;</div><div class='add'>+</div><div class='add'>+	/* HV_DEVICE_TYPE_PCI */</div><div class='add'>+	struct {</div><div class='add'>+		union {</div><div class='add'>+			hv_pci_rid rid;</div><div class='add'>+			union hv_pci_bdf bdf;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		hv_pci_segment segment;</div><div class='add'>+		union hv_pci_bus_range shadow_bus_range;</div><div class='add'>+</div><div class='add'>+		u16 phantom_function_bits : 2;</div><div class='add'>+		u16 source_shadow : 1;</div><div class='add'>+</div><div class='add'>+		u16 rsvdz0 : 11;</div><div class='add'>+		u16 device_type : 2;</div><div class='add'>+	} pci;</div><div class='add'>+</div><div class='add'>+	/* HV_DEVICE_TYPE_IOAPIC */</div><div class='add'>+	struct {</div><div class='add'>+		u8 ioapic_id;</div><div class='add'>+		u8 rsvdz0;</div><div class='add'>+		u16 rsvdz1;</div><div class='add'>+		u16 rsvdz2;</div><div class='add'>+</div><div class='add'>+		u16 rsvdz3 : 14;</div><div class='add'>+		u16 device_type : 2;</div><div class='add'>+	} ioapic;</div><div class='add'>+</div><div class='add'>+	/* HV_DEVICE_TYPE_ACPI */</div><div class='add'>+	struct {</div><div class='add'>+		u32 input_mapping_base;</div><div class='add'>+		u32 input_mapping_count : 30;</div><div class='add'>+		u32 device_type : 2;</div><div class='add'>+	} acpi;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#endif /* _HV_HVHDK_MINI_H */</div><div class='head'>diff --git a/include/keys/asymmetric-type.h b/include/keys/asymmetric-type.h<br/>index 69a13e1e5b2e..1b91c8f98688 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/keys/asymmetric-type.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/asymmetric-type.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/keys/asymmetric-type.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/keys/asymmetric-type.h</a></div><div class='hunk'>@@ -49,7 +49,7 @@ enum asymmetric_payload_bits {</div><div class='ctx'>  */</div><div class='ctx'> struct asymmetric_key_id {</div><div class='ctx'> 	unsigned short	len;</div><div class='del'>-	unsigned char	data[];</div><div class='add'>+	unsigned char	data[] __counted_by(len);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct asymmetric_key_ids {</div><div class='head'>diff --git a/include/keys/dns_resolver-type.h b/include/keys/dns_resolver-type.h<br/>index 218ca22fb056..1b89088a2837 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/keys/dns_resolver-type.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/dns_resolver-type.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/keys/dns_resolver-type.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/keys/dns_resolver-type.h</a></div><div class='hunk'>@@ -12,8 +12,4 @@</div><div class='ctx'> </div><div class='ctx'> extern struct key_type key_type_dns_resolver;</div><div class='ctx'> </div><div class='del'>-extern int request_dns_resolver_key(const char *description,</div><div class='del'>-				    const char *callout_info,</div><div class='del'>-				    char **data);</div><div class='del'>-</div><div class='ctx'> #endif /* _KEYS_DNS_RESOLVER_TYPE_H */</div><div class='head'>diff --git a/include/keys/rxrpc-type.h b/include/keys/rxrpc-type.h<br/>index 333c0f49a9cd..0ddbe197a261 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/keys/rxrpc-type.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/rxrpc-type.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/keys/rxrpc-type.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/keys/rxrpc-type.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #define _KEYS_RXRPC_TYPE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/key.h&gt;</div><div class='add'>+#include &lt;crypto/krb5.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * key type for AF_RXRPC keys</div><div class='hunk'>@@ -32,6 +33,21 @@ struct rxkad_key {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * RxRPC key for YFS-RxGK (type-6 security)</div><div class='add'>+ */</div><div class='add'>+struct rxgk_key {</div><div class='add'>+	s64		begintime;	/* Time at which the ticket starts */</div><div class='add'>+	s64		endtime;	/* Time at which the ticket ends */</div><div class='add'>+	u64		lifetime;	/* Maximum lifespan of a connection (seconds) */</div><div class='add'>+	u64		bytelife;	/* Maximum number of bytes on a connection */</div><div class='add'>+	unsigned int	enctype;	/* Encoding type */</div><div class='add'>+	s8		level;		/* Negotiated security RXRPC_SECURITY_PLAIN/AUTH/ENCRYPT */</div><div class='add'>+	struct krb5_buffer key;		/* Master key, K0 */</div><div class='add'>+	struct krb5_buffer ticket;	/* Ticket to be passed to server */</div><div class='add'>+	u8		_key[];		/* Key storage */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * list of tokens attached to an rxrpc key</div><div class='ctx'>  */</div><div class='ctx'> struct rxrpc_key_token {</div><div class='hunk'>@@ -40,6 +56,7 @@ struct rxrpc_key_token {</div><div class='ctx'> 	struct rxrpc_key_token *next;	/* the next token in the list */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct rxkad_key *kad;</div><div class='add'>+		struct rxgk_key *rxgk;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h<br/>index 8365adf842ef..a6c2897bcc63 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/keys/system_keyring.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/system_keyring.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/keys/system_keyring.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/keys/system_keyring.h</a></div><div class='hunk'>@@ -73,7 +73,6 @@ static inline void __init set_machine_trusted_keys(struct key *keyring)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct pkcs7_message *pkcs7;</div><div class='ctx'> #ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING</div><div class='ctx'> extern int mark_hash_blacklisted(const u8 *hash, size_t hash_len,</div><div class='ctx'> 			       enum blacklist_hash_type hash_type);</div><div class='hunk'>@@ -93,6 +92,7 @@ static inline int is_binary_blacklisted(const u8 *hash, size_t hash_len)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+struct pkcs7_message;</div><div class='ctx'> #ifdef CONFIG_SYSTEM_REVOCATION_LIST</div><div class='ctx'> extern int add_key_to_revocation_list(const char *data, size_t size);</div><div class='ctx'> extern int is_key_on_revocation_list(struct pkcs7_message *pkcs7);</div><div class='head'>diff --git a/include/keys/trusted_dcp.h b/include/keys/trusted_dcp.h<br/>new file mode 100644<br/>index 000000000000..9aaa42075b40<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/keys/trusted_dcp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/keys/trusted_dcp.h</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 sigma star gmbh</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef TRUSTED_DCP_H</div><div class='add'>+#define TRUSTED_DCP_H</div><div class='add'>+</div><div class='add'>+extern struct trusted_key_ops dcp_trusted_key_ops;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/keys/trusted_tpm.h b/include/keys/trusted_tpm.h<br/>index 7769b726863a..0fadc6a4f166 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/keys/trusted_tpm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/keys/trusted_tpm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/keys/trusted_tpm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/keys/trusted_tpm.h</a></div><div class='hunk'>@@ -5,43 +5,8 @@</div><div class='ctx'> #include &lt;keys/trusted-type.h&gt;</div><div class='ctx'> #include &lt;linux/tpm_command.h&gt;</div><div class='ctx'> </div><div class='del'>-/* implementation specific TPM constants */</div><div class='del'>-#define MAX_BUF_SIZE			1024</div><div class='del'>-#define TPM_GETRANDOM_SIZE		14</div><div class='del'>-#define TPM_SIZE_OFFSET			2</div><div class='del'>-#define TPM_RETURN_OFFSET		6</div><div class='del'>-#define TPM_DATA_OFFSET			10</div><div class='del'>-</div><div class='del'>-#define LOAD32(buffer, offset)	(ntohl(*(uint32_t *)&amp;buffer[offset]))</div><div class='del'>-#define LOAD32N(buffer, offset)	(*(uint32_t *)&amp;buffer[offset])</div><div class='del'>-#define LOAD16(buffer, offset)	(ntohs(*(uint16_t *)&amp;buffer[offset]))</div><div class='del'>-</div><div class='ctx'> extern struct trusted_key_ops trusted_key_tpm_ops;</div><div class='ctx'> </div><div class='del'>-struct osapsess {</div><div class='del'>-	uint32_t handle;</div><div class='del'>-	unsigned char secret[SHA1_DIGEST_SIZE];</div><div class='del'>-	unsigned char enonce[TPM_NONCE_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* discrete values, but have to store in uint16_t for TPM use */</div><div class='del'>-enum {</div><div class='del'>-	SEAL_keytype = 1,</div><div class='del'>-	SRK_keytype = 4</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int TSS_authhmac(unsigned char *digest, const unsigned char *key,</div><div class='del'>-			unsigned int keylen, unsigned char *h1,</div><div class='del'>-			unsigned char *h2, unsigned int h3, ...);</div><div class='del'>-int TSS_checkhmac1(unsigned char *buffer,</div><div class='del'>-			  const uint32_t command,</div><div class='del'>-			  const unsigned char *ononce,</div><div class='del'>-			  const unsigned char *key,</div><div class='del'>-			  unsigned int keylen, ...);</div><div class='del'>-</div><div class='del'>-int trusted_tpm_send(unsigned char *cmd, size_t buflen);</div><div class='del'>-int oiap(struct tpm_buf *tb, uint32_t *handle, unsigned char *nonce);</div><div class='del'>-</div><div class='ctx'> int tpm2_seal_trusted(struct tpm_chip *chip,</div><div class='ctx'> 		      struct trusted_key_payload *payload,</div><div class='ctx'> 		      struct trusted_key_options *options);</div><div class='hunk'>@@ -49,50 +14,4 @@ int tpm2_unseal_trusted(struct tpm_chip *chip,</div><div class='ctx'> 			struct trusted_key_payload *payload,</div><div class='ctx'> 			struct trusted_key_options *options);</div><div class='ctx'> </div><div class='del'>-#define TPM_DEBUG 0</div><div class='del'>-</div><div class='del'>-#if TPM_DEBUG</div><div class='del'>-static inline void dump_options(struct trusted_key_options *o)</div><div class='del'>-{</div><div class='del'>-	pr_info("sealing key type %d\n", o-&gt;keytype);</div><div class='del'>-	pr_info("sealing key handle %0X\n", o-&gt;keyhandle);</div><div class='del'>-	pr_info("pcrlock %d\n", o-&gt;pcrlock);</div><div class='del'>-	pr_info("pcrinfo %d\n", o-&gt;pcrinfo_len);</div><div class='del'>-	print_hex_dump(KERN_INFO, "pcrinfo ", DUMP_PREFIX_NONE,</div><div class='del'>-		       16, 1, o-&gt;pcrinfo, o-&gt;pcrinfo_len, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dump_sess(struct osapsess *s)</div><div class='del'>-{</div><div class='del'>-	print_hex_dump(KERN_INFO, "trusted-key: handle ", DUMP_PREFIX_NONE,</div><div class='del'>-		       16, 1, &amp;s-&gt;handle, 4, 0);</div><div class='del'>-	pr_info("secret:\n");</div><div class='del'>-	print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE,</div><div class='del'>-		       16, 1, &amp;s-&gt;secret, SHA1_DIGEST_SIZE, 0);</div><div class='del'>-	pr_info("trusted-key: enonce:\n");</div><div class='del'>-	print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE,</div><div class='del'>-		       16, 1, &amp;s-&gt;enonce, SHA1_DIGEST_SIZE, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dump_tpm_buf(unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	pr_info("\ntpm buffer\n");</div><div class='del'>-	len = LOAD32(buf, TPM_SIZE_OFFSET);</div><div class='del'>-	print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 16, 1, buf, len, 0);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void dump_options(struct trusted_key_options *o)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dump_sess(struct osapsess *s)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dump_tpm_buf(unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/kunit/assert.h b/include/kunit/assert.h<br/>index 24c2b9fa61e8..bb879389f11d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kunit/assert.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/assert.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/assert.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/assert.h</a></div><div class='hunk'>@@ -60,7 +60,7 @@ void kunit_assert_prologue(const struct kunit_loc *loc,</div><div class='ctx'>  * struct kunit_fail_assert - Represents a plain fail expectation/assertion.</div><div class='ctx'>  * @assert: The parent of this type.</div><div class='ctx'>  *</div><div class='del'>- * Represents a simple KUNIT_FAIL/KUNIT_ASSERT_FAILURE that always fails.</div><div class='add'>+ * Represents a simple KUNIT_FAIL/KUNIT_FAIL_AND_ABORT that always fails.</div><div class='ctx'>  */</div><div class='ctx'> struct kunit_fail_assert {</div><div class='ctx'> 	struct kunit_assert assert;</div><div class='hunk'>@@ -218,4 +218,15 @@ void kunit_mem_assert_format(const struct kunit_assert *assert,</div><div class='ctx'> 			     const struct va_format *message,</div><div class='ctx'> 			     struct string_stream *stream);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_KUNIT)</div><div class='add'>+void kunit_assert_print_msg(const struct va_format *message,</div><div class='add'>+			    struct string_stream *stream);</div><div class='add'>+bool is_literal(const char *text, long long value);</div><div class='add'>+bool is_str_literal(const char *text, const char *value);</div><div class='add'>+void kunit_assert_hexdump(struct string_stream *stream,</div><div class='add'>+			  const void *buf,</div><div class='add'>+			  const void *compared_buf,</div><div class='add'>+			  const size_t len);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /*  _KUNIT_ASSERT_H */</div><div class='head'>diff --git a/include/kunit/clk.h b/include/kunit/clk.h<br/>new file mode 100644<br/>index 000000000000..f226044cc78d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/clk.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _CLK_KUNIT_H</div><div class='add'>+#define _CLK_KUNIT_H</div><div class='add'>+</div><div class='add'>+struct clk;</div><div class='add'>+struct clk_hw;</div><div class='add'>+struct device;</div><div class='add'>+struct device_node;</div><div class='add'>+struct of_phandle_args;</div><div class='add'>+struct kunit;</div><div class='add'>+</div><div class='add'>+struct clk *</div><div class='add'>+clk_get_kunit(struct kunit *test, struct device *dev, const char *con_id);</div><div class='add'>+struct clk *</div><div class='add'>+of_clk_get_kunit(struct kunit *test, struct device_node *np, int index);</div><div class='add'>+</div><div class='add'>+struct clk *</div><div class='add'>+clk_hw_get_clk_kunit(struct kunit *test, struct clk_hw *hw, const char *con_id);</div><div class='add'>+struct clk *</div><div class='add'>+clk_hw_get_clk_prepared_enabled_kunit(struct kunit *test, struct clk_hw *hw,</div><div class='add'>+				      const char *con_id);</div><div class='add'>+</div><div class='add'>+int clk_prepare_enable_kunit(struct kunit *test, struct clk *clk);</div><div class='add'>+</div><div class='add'>+int clk_hw_register_kunit(struct kunit *test, struct device *dev, struct clk_hw *hw);</div><div class='add'>+int of_clk_hw_register_kunit(struct kunit *test, struct device_node *node,</div><div class='add'>+			     struct clk_hw *hw);</div><div class='add'>+</div><div class='add'>+int of_clk_add_hw_provider_kunit(struct kunit *test, struct device_node *np,</div><div class='add'>+				 struct clk_hw *(*get)(struct of_phandle_args *clkspec, void *data),</div><div class='add'>+				 void *data);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/kunit/of.h b/include/kunit/of.h<br/>new file mode 100644<br/>index 000000000000..75a760a4e2a5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/of.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/of.h</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _KUNIT_OF_H</div><div class='add'>+#define _KUNIT_OF_H</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+</div><div class='add'>+struct device_node;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+</div><div class='add'>+void of_node_put_kunit(struct kunit *test, struct device_node *node);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void of_node_put_kunit(struct kunit *test, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	kunit_skip(test, "requires CONFIG_OF");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_OF */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_OF) &amp;&amp; defined(CONFIG_OF_OVERLAY) &amp;&amp; defined(CONFIG_OF_EARLY_FLATTREE)</div><div class='add'>+</div><div class='add'>+int of_overlay_fdt_apply_kunit(struct kunit *test, void *overlay_fdt,</div><div class='add'>+			       u32 overlay_fdt_size, int *ovcs_id);</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+of_overlay_fdt_apply_kunit(struct kunit *test, void *overlay_fdt,</div><div class='add'>+			   u32 overlay_fdt_size, int *ovcs_id)</div><div class='add'>+{</div><div class='add'>+	kunit_skip(test, "requires CONFIG_OF and CONFIG_OF_OVERLAY and CONFIG_OF_EARLY_FLATTREE for root node");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __of_overlay_apply_kunit() - Test managed of_overlay_fdt_apply() variant</div><div class='add'>+ * @test: test context</div><div class='add'>+ * @overlay_begin: start address of overlay to apply</div><div class='add'>+ * @overlay_end: end address of overlay to apply</div><div class='add'>+ *</div><div class='add'>+ * This is mostly internal API. See of_overlay_apply_kunit() for the wrapper</div><div class='add'>+ * that makes this easier to use.</div><div class='add'>+ *</div><div class='add'>+ * Similar to of_overlay_fdt_apply(), except the overlay is managed by the test</div><div class='add'>+ * case and is automatically removed with of_overlay_remove() after the test</div><div class='add'>+ * case concludes.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative errno on failure</div><div class='add'>+ */</div><div class='add'>+static inline int __of_overlay_apply_kunit(struct kunit *test,</div><div class='add'>+					   u8 *overlay_begin,</div><div class='add'>+					   const u8 *overlay_end)</div><div class='add'>+{</div><div class='add'>+	int unused;</div><div class='add'>+</div><div class='add'>+	return of_overlay_fdt_apply_kunit(test, overlay_begin,</div><div class='add'>+					  overlay_end - overlay_begin,</div><div class='add'>+					  &amp;unused);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define of_overlay_begin(overlay_name) __dtbo_##overlay_name##_begin</div><div class='add'>+#define of_overlay_end(overlay_name) __dtbo_##overlay_name##_end</div><div class='add'>+</div><div class='add'>+#define OF_OVERLAY_DECLARE(overlay_name)			\</div><div class='add'>+	extern uint8_t of_overlay_begin(overlay_name)[];	\</div><div class='add'>+	extern uint8_t of_overlay_end(overlay_name)[]		\</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_overlay_apply_kunit() - Test managed of_overlay_fdt_apply() for built-in overlays</div><div class='add'>+ * @test: test context</div><div class='add'>+ * @overlay_name: name of overlay to apply</div><div class='add'>+ *</div><div class='add'>+ * This macro is used to apply a device tree overlay built with the</div><div class='add'>+ * cmd_dt_S_dtbo rule in scripts/Makefile.lib that has been compiled into the</div><div class='add'>+ * kernel image or KUnit test module. The overlay is automatically removed when</div><div class='add'>+ * the test is finished.</div><div class='add'>+ *</div><div class='add'>+ * Unit tests that need device tree nodes should compile an overlay file with</div><div class='add'>+ * @overlay_name\.dtbo.o in their Makefile along with their unit test and then</div><div class='add'>+ * load the overlay during their test. The @overlay_name matches the filename</div><div class='add'>+ * of the overlay without the dtbo filename extension. If CONFIG_OF_OVERLAY is</div><div class='add'>+ * not enabled, the @test will be skipped.</div><div class='add'>+ *</div><div class='add'>+ * In the Makefile</div><div class='add'>+ *</div><div class='add'>+ * .. code-block:: none</div><div class='add'>+ *</div><div class='add'>+ *	obj-$(CONFIG_OF_OVERLAY_KUNIT_TEST) += overlay_test.o kunit_overlay_test.dtbo.o</div><div class='add'>+ *</div><div class='add'>+ * In the test</div><div class='add'>+ *</div><div class='add'>+ * .. code-block:: c</div><div class='add'>+ *</div><div class='add'>+ *	static void of_overlay_kunit_of_overlay_apply(struct kunit *test)</div><div class='add'>+ *	{</div><div class='add'>+ *		struct device_node *np;</div><div class='add'>+ *</div><div class='add'>+ *		KUNIT_ASSERT_EQ(test, 0,</div><div class='add'>+ *				of_overlay_apply_kunit(test, kunit_overlay_test));</div><div class='add'>+ *</div><div class='add'>+ *		np = of_find_node_by_name(NULL, "test-kunit");</div><div class='add'>+ *		KUNIT_EXPECT_NOT_ERR_OR_NULL(test, np);</div><div class='add'>+ *		of_node_put(np);</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative errno on failure.</div><div class='add'>+ */</div><div class='add'>+#define of_overlay_apply_kunit(test, overlay_name)		\</div><div class='add'>+({								\</div><div class='add'>+	OF_OVERLAY_DECLARE(overlay_name);			\</div><div class='add'>+								\</div><div class='add'>+	__of_overlay_apply_kunit((test),			\</div><div class='add'>+			of_overlay_begin(overlay_name),		\</div><div class='add'>+			of_overlay_end(overlay_name));		\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/kunit/platform_device.h b/include/kunit/platform_device.h<br/>new file mode 100644<br/>index 000000000000..f8236a8536f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/platform_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/platform_device.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _KUNIT_PLATFORM_DRIVER_H</div><div class='add'>+#define _KUNIT_PLATFORM_DRIVER_H</div><div class='add'>+</div><div class='add'>+struct completion;</div><div class='add'>+struct kunit;</div><div class='add'>+struct platform_device;</div><div class='add'>+struct platform_driver;</div><div class='add'>+</div><div class='add'>+struct platform_device *</div><div class='add'>+kunit_platform_device_alloc(struct kunit *test, const char *name, int id);</div><div class='add'>+int kunit_platform_device_add(struct kunit *test, struct platform_device *pdev);</div><div class='add'>+</div><div class='add'>+int kunit_platform_device_prepare_wait_for_probe(struct kunit *test,</div><div class='add'>+						 struct platform_device *pdev,</div><div class='add'>+						 struct completion *x);</div><div class='add'>+</div><div class='add'>+int kunit_platform_driver_register(struct kunit *test,</div><div class='add'>+				   struct platform_driver *drv);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/kunit/run-in-irq-context.h b/include/kunit/run-in-irq-context.h<br/>new file mode 100644<br/>index 000000000000..108e96433ea4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/run-in-irq-context.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/run-in-irq-context.h</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Helper function for testing code in interrupt contexts</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2025 Google LLC</div><div class='add'>+ */</div><div class='add'>+#ifndef _KUNIT_RUN_IN_IRQ_CONTEXT_H</div><div class='add'>+#define _KUNIT_RUN_IN_IRQ_CONTEXT_H</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;linux/timekeeping.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#define KUNIT_IRQ_TEST_HRTIMER_INTERVAL us_to_ktime(5)</div><div class='add'>+</div><div class='add'>+struct kunit_irq_test_state {</div><div class='add'>+	bool (*func)(void *test_specific_state);</div><div class='add'>+	void *test_specific_state;</div><div class='add'>+	bool task_func_reported_failure;</div><div class='add'>+	bool hardirq_func_reported_failure;</div><div class='add'>+	bool softirq_func_reported_failure;</div><div class='add'>+	unsigned long hardirq_func_calls;</div><div class='add'>+	unsigned long softirq_func_calls;</div><div class='add'>+	struct hrtimer timer;</div><div class='add'>+	struct work_struct bh_work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart kunit_irq_test_timer_func(struct hrtimer *timer)</div><div class='add'>+{</div><div class='add'>+	struct kunit_irq_test_state *state =</div><div class='add'>+		container_of(timer, typeof(*state), timer);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!in_hardirq());</div><div class='add'>+	state-&gt;hardirq_func_calls++;</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;func(state-&gt;test_specific_state))</div><div class='add'>+		state-&gt;hardirq_func_reported_failure = true;</div><div class='add'>+</div><div class='add'>+	hrtimer_forward_now(&amp;state-&gt;timer, KUNIT_IRQ_TEST_HRTIMER_INTERVAL);</div><div class='add'>+	queue_work(system_bh_wq, &amp;state-&gt;bh_work);</div><div class='add'>+	return HRTIMER_RESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kunit_irq_test_bh_work_func(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct kunit_irq_test_state *state =</div><div class='add'>+		container_of(work, typeof(*state), bh_work);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!in_serving_softirq());</div><div class='add'>+	state-&gt;softirq_func_calls++;</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;func(state-&gt;test_specific_state))</div><div class='add'>+		state-&gt;softirq_func_reported_failure = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper function which repeatedly runs the given @func in task, softirq, and</div><div class='add'>+ * hardirq context concurrently, and reports a failure to KUnit if any</div><div class='add'>+ * invocation of @func in any context returns false.  @func is passed</div><div class='add'>+ * @test_specific_state as its argument.  At most 3 invocations of @func will</div><div class='add'>+ * run concurrently: one in each of task, softirq, and hardirq context.</div><div class='add'>+ *</div><div class='add'>+ * The main purpose of this interrupt context testing is to validate fallback</div><div class='add'>+ * code paths that run in contexts where the normal code path cannot be used,</div><div class='add'>+ * typically due to the FPU or vector registers already being in-use in kernel</div><div class='add'>+ * mode.  These code paths aren't covered when the test code is executed only by</div><div class='add'>+ * the KUnit test runner thread in task context.  The reason for the concurrency</div><div class='add'>+ * is because merely using hardirq context is not sufficient to reach a fallback</div><div class='add'>+ * code path on some architectures; the hardirq actually has to occur while the</div><div class='add'>+ * FPU or vector unit was already in-use in kernel mode.</div><div class='add'>+ *</div><div class='add'>+ * Another purpose of this testing is to detect issues with the architecture's</div><div class='add'>+ * irq_fpu_usable() and kernel_fpu_begin/end() or equivalent functions,</div><div class='add'>+ * especially in softirq context when the softirq may have interrupted a task</div><div class='add'>+ * already using kernel-mode FPU or vector (if the arch didn't prevent that).</div><div class='add'>+ * Crypto functions are often executed in softirqs, so this is important.</div><div class='add'>+ */</div><div class='add'>+static inline void kunit_run_irq_test(struct kunit *test, bool (*func)(void *),</div><div class='add'>+				      int max_iterations,</div><div class='add'>+				      void *test_specific_state)</div><div class='add'>+{</div><div class='add'>+	struct kunit_irq_test_state state = {</div><div class='add'>+		.func = func,</div><div class='add'>+		.test_specific_state = test_specific_state,</div><div class='add'>+	};</div><div class='add'>+	unsigned long end_jiffies;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up a hrtimer (the way we access hardirq context) and a work</div><div class='add'>+	 * struct for the BH workqueue (the way we access softirq context).</div><div class='add'>+	 */</div><div class='add'>+	hrtimer_setup_on_stack(&amp;state.timer, kunit_irq_test_timer_func,</div><div class='add'>+			       CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);</div><div class='add'>+	INIT_WORK_ONSTACK(&amp;state.bh_work, kunit_irq_test_bh_work_func);</div><div class='add'>+</div><div class='add'>+	/* Run for up to max_iterations or 1 second, whichever comes first. */</div><div class='add'>+	end_jiffies = jiffies + HZ;</div><div class='add'>+	hrtimer_start(&amp;state.timer, KUNIT_IRQ_TEST_HRTIMER_INTERVAL,</div><div class='add'>+		      HRTIMER_MODE_REL_HARD);</div><div class='add'>+	for (int i = 0; i &lt; max_iterations &amp;&amp; !time_after(jiffies, end_jiffies);</div><div class='add'>+	     i++) {</div><div class='add'>+		if (!func(test_specific_state))</div><div class='add'>+			state.task_func_reported_failure = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cancel the timer and work. */</div><div class='add'>+	hrtimer_cancel(&amp;state.timer);</div><div class='add'>+	flush_work(&amp;state.bh_work);</div><div class='add'>+</div><div class='add'>+	/* Sanity check: the timer and BH functions should have been run. */</div><div class='add'>+	KUNIT_EXPECT_GT_MSG(test, state.hardirq_func_calls, 0,</div><div class='add'>+			    "Timer function was not called");</div><div class='add'>+	KUNIT_EXPECT_GT_MSG(test, state.softirq_func_calls, 0,</div><div class='add'>+			    "BH work function was not called");</div><div class='add'>+</div><div class='add'>+	/* Check for incorrect hash values reported from any context. */</div><div class='add'>+	KUNIT_EXPECT_FALSE_MSG(</div><div class='add'>+		test, state.task_func_reported_failure,</div><div class='add'>+		"Incorrect hash values reported from task context");</div><div class='add'>+	KUNIT_EXPECT_FALSE_MSG(</div><div class='add'>+		test, state.hardirq_func_reported_failure,</div><div class='add'>+		"Incorrect hash values reported from hardirq context");</div><div class='add'>+	KUNIT_EXPECT_FALSE_MSG(</div><div class='add'>+		test, state.softirq_func_reported_failure,</div><div class='add'>+		"Incorrect hash values reported from softirq context");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _KUNIT_RUN_IN_IRQ_CONTEXT_H */</div><div class='head'>diff --git a/include/kunit/skbuff.h b/include/kunit/skbuff.h<br/>index 44d12370939a..07784694357c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kunit/skbuff.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/skbuff.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/skbuff.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/skbuff.h</a></div><div class='hunk'>@@ -20,8 +20,9 @@ static void kunit_action_kfree_skb(void *p)</div><div class='ctx'>  * kunit_zalloc_skb() - Allocate and initialize a resource managed skb.</div><div class='ctx'>  * @test: The test case to which the skb belongs</div><div class='ctx'>  * @len: size to allocate</div><div class='add'>+ * @gfp: allocation flags</div><div class='ctx'>  *</div><div class='del'>- * Allocate a new struct sk_buff with GFP_KERNEL, zero fill the give length</div><div class='add'>+ * Allocate a new struct sk_buff with gfp flags, zero fill the given length</div><div class='ctx'>  * and add it as a resource to the kunit test for automatic cleanup.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: newly allocated SKB, or %NULL on error</div><div class='hunk'>@@ -29,7 +30,7 @@ static void kunit_action_kfree_skb(void *p)</div><div class='ctx'> static inline struct sk_buff *kunit_zalloc_skb(struct kunit *test, int len,</div><div class='ctx'> 					       gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *res = alloc_skb(len, GFP_KERNEL);</div><div class='add'>+	struct sk_buff *res = alloc_skb(len, gfp);</div><div class='ctx'> </div><div class='ctx'> 	if (!res || skb_pad(res, len))</div><div class='ctx'> 		return NULL;</div><div class='head'>diff --git a/include/kunit/test.h b/include/kunit/test.h<br/>index 61637ef32302..5ec5182b5e57 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kunit/test.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/test.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/test.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/test.h</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/rwonce.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Static key: true if any KUnit tests are currently running */</div><div class='ctx'> DECLARE_STATIC_KEY_FALSE(kunit_running);</div><div class='hunk'>@@ -66,7 +67,7 @@ enum kunit_status {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Speed Attribute is stored as an enum and separated into categories of</div><div class='del'>- * speed: very_slowm, slow, and normal. These speeds are relative to</div><div class='add'>+ * speed: very_slow, slow, and normal. These speeds are relative to</div><div class='ctx'>  * other KUnit tests.</div><div class='ctx'>  *</div><div class='ctx'>  * Note: unset speed attribute acts as default of KUNIT_SPEED_NORMAL.</div><div class='hunk'>@@ -91,6 +92,8 @@ struct kunit_attributes {</div><div class='ctx'>  * @name:     the name of the test case.</div><div class='ctx'>  * @generate_params: the generator function for parameterized tests.</div><div class='ctx'>  * @attr:     the attributes associated with the test</div><div class='add'>+ * @param_init: The init function to run before a parameterized test.</div><div class='add'>+ * @param_exit: The exit function to run after a parameterized test.</div><div class='ctx'>  *</div><div class='ctx'>  * A test case is a function with the signature,</div><div class='ctx'>  * ``void (*)(struct kunit *)``</div><div class='hunk'>@@ -125,8 +128,11 @@ struct kunit_attributes {</div><div class='ctx'> struct kunit_case {</div><div class='ctx'> 	void (*run_case)(struct kunit *test);</div><div class='ctx'> 	const char *name;</div><div class='del'>-	const void* (*generate_params)(const void *prev, char *desc);</div><div class='add'>+	const void* (*generate_params)(struct kunit *test,</div><div class='add'>+				       const void *prev, char *desc);</div><div class='ctx'> 	struct kunit_attributes attr;</div><div class='add'>+	int (*param_init)(struct kunit *test);</div><div class='add'>+	void (*param_exit)(struct kunit *test);</div><div class='ctx'> </div><div class='ctx'> 	/* private: internal use only. */</div><div class='ctx'> 	enum kunit_status status;</div><div class='hunk'>@@ -218,6 +224,31 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status)</div><div class='ctx'> 		  .attr = attributes, .module_name = KBUILD_MODNAME}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * KUNIT_CASE_PARAM_WITH_INIT - Define a parameterized KUnit test case with custom</div><div class='add'>+ * param_init() and param_exit() functions.</div><div class='add'>+ * @test_name: The function implementing the test case.</div><div class='add'>+ * @gen_params: The function to generate parameters for the test case.</div><div class='add'>+ * @init: A reference to the param_init() function to run before a parameterized test.</div><div class='add'>+ * @exit: A reference to the param_exit() function to run after a parameterized test.</div><div class='add'>+ *</div><div class='add'>+ * Provides the option to register param_init() and param_exit() functions.</div><div class='add'>+ * param_init/exit will be passed the parameterized test context and run once</div><div class='add'>+ * before and once after the parameterized test. The init function can be used</div><div class='add'>+ * to add resources to share between parameter runs, pass parameter arrays,</div><div class='add'>+ * and any other setup logic. The exit function can be used to clean up resources</div><div class='add'>+ * that were not managed by the parameterized test, and any other teardown logic.</div><div class='add'>+ *</div><div class='add'>+ * Note: If you are registering a parameter array in param_init() with</div><div class='add'>+ * kunit_register_param_array() then you need to pass kunit_array_gen_params()</div><div class='add'>+ * to this as the generator function.</div><div class='add'>+ */</div><div class='add'>+#define KUNIT_CASE_PARAM_WITH_INIT(test_name, gen_params, init, exit)		\</div><div class='add'>+		{ .run_case = test_name, .name = #test_name,			\</div><div class='add'>+		  .generate_params = gen_params,				\</div><div class='add'>+		  .param_init = init, .param_exit = exit,			\</div><div class='add'>+		  .module_name = KBUILD_MODNAME}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct kunit_suite - describes a related collection of &amp;struct kunit_case</div><div class='ctx'>  *</div><div class='ctx'>  * @name:	the name of the test. Purely informational.</div><div class='hunk'>@@ -262,19 +293,39 @@ struct kunit_suite_set {</div><div class='ctx'> 	struct kunit_suite * const *end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Stores the pointer to the parameter array and its metadata. */</div><div class='add'>+struct kunit_params {</div><div class='add'>+	/*</div><div class='add'>+	 * Reference to the parameter array for a parameterized test. This</div><div class='add'>+	 * is NULL if a parameter array wasn't directly passed to the</div><div class='add'>+	 * parameterized test context struct kunit via kunit_register_params_array().</div><div class='add'>+	 */</div><div class='add'>+	const void *params;</div><div class='add'>+	/* Reference to a function that gets the description of a parameter. */</div><div class='add'>+	void (*get_description)(struct kunit *test, const void *param, char *desc);</div><div class='add'>+	size_t num_params;</div><div class='add'>+	size_t elem_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct kunit - represents a running instance of a test.</div><div class='ctx'>  *</div><div class='ctx'>  * @priv: for user to store arbitrary data. Commonly used to pass data</div><div class='ctx'>  *	  created in the init function (see &amp;struct kunit_suite).</div><div class='add'>+ * @parent: reference to the parent context of type struct kunit that can</div><div class='add'>+ *	    be used for storing shared resources.</div><div class='add'>+ * @params_array: for storing the parameter array.</div><div class='ctx'>  *</div><div class='ctx'>  * Used to store information about the current context under which the test</div><div class='ctx'>  * is running. Most of this data is private and should only be accessed</div><div class='del'>- * indirectly via public functions; the one exception is @priv which can be</div><div class='del'>- * used by the test writer to store arbitrary data.</div><div class='add'>+ * indirectly via public functions; the exceptions are @priv, @parent and</div><div class='add'>+ * @params_array which can be used by the test writer to store arbitrary data,</div><div class='add'>+ * access the parent context, and to store the parameter array, respectively.</div><div class='ctx'>  */</div><div class='ctx'> struct kunit {</div><div class='ctx'> 	void *priv;</div><div class='add'>+	struct kunit *parent;</div><div class='add'>+	struct kunit_params params_array;</div><div class='ctx'> </div><div class='ctx'> 	/* private: internal use only. */</div><div class='ctx'> 	const char *name; /* Read only after initialization! */</div><div class='hunk'>@@ -301,6 +352,8 @@ struct kunit {</div><div class='ctx'> 	struct list_head resources; /* Protected by lock. */</div><div class='ctx'> </div><div class='ctx'> 	char status_comment[KUNIT_STATUS_COMMENT_SIZE];</div><div class='add'>+	/* Saves the last seen test. Useful to help with faults. */</div><div class='add'>+	struct kunit_loc last_seen;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void kunit_set_failure(struct kunit *test)</div><div class='hunk'>@@ -309,6 +362,7 @@ static inline void kunit_set_failure(struct kunit *test)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool kunit_enabled(void);</div><div class='add'>+bool kunit_autorun(void);</div><div class='ctx'> const char *kunit_action(void);</div><div class='ctx'> const char *kunit_filter_glob(void);</div><div class='ctx'> char *kunit_filter(void);</div><div class='hunk'>@@ -331,7 +385,8 @@ kunit_filter_suites(const struct kunit_suite_set *suite_set,</div><div class='ctx'> 		    int *err);</div><div class='ctx'> void kunit_free_suite_set(struct kunit_suite_set suite_set);</div><div class='ctx'> </div><div class='del'>-int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_suites);</div><div class='add'>+int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_suites,</div><div class='add'>+			     bool run_tests);</div><div class='ctx'> </div><div class='ctx'> void __kunit_test_suites_exit(struct kunit_suite **suites, int num_suites);</div><div class='ctx'> </div><div class='hunk'>@@ -341,6 +396,8 @@ void kunit_exec_list_tests(struct kunit_suite_set *suite_set, bool include_attr)</div><div class='ctx'> struct kunit_suite_set kunit_merge_suite_sets(struct kunit_suite_set init_suite_set,</div><div class='ctx'> 		struct kunit_suite_set suite_set);</div><div class='ctx'> </div><div class='add'>+const void *kunit_array_gen_params(struct kunit *test, const void *prev, char *desc);</div><div class='add'>+</div><div class='ctx'> #if IS_BUILTIN(CONFIG_KUNIT)</div><div class='ctx'> int kunit_run_all_tests(void);</div><div class='ctx'> #else</div><div class='hunk'>@@ -478,14 +535,91 @@ static inline void *kunit_kcalloc(struct kunit *test, size_t n, size_t size, gfp</div><div class='ctx'> 	return kunit_kmalloc_array(test, n, size, gfp | __GFP_ZERO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kunit_kfree_const() - conditionally free test managed memory</div><div class='add'>+ * @test: The test context object.</div><div class='add'>+ * @x: pointer to the memory</div><div class='add'>+ *</div><div class='add'>+ * Calls kunit_kfree() only if @x is not in .rodata section.</div><div class='add'>+ * See kunit_kstrdup_const() for more information.</div><div class='add'>+ */</div><div class='add'>+void kunit_kfree_const(struct kunit *test, const void *x);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kunit_kstrdup() - Duplicates a string into a test managed allocation.</div><div class='add'>+ *</div><div class='add'>+ * @test: The test context object.</div><div class='add'>+ * @str: The NULL-terminated string to duplicate.</div><div class='add'>+ * @gfp: flags passed to underlying kmalloc().</div><div class='add'>+ *</div><div class='add'>+ * See kstrdup() and kunit_kmalloc_array() for more information.</div><div class='add'>+ */</div><div class='add'>+static inline char *kunit_kstrdup(struct kunit *test, const char *str, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	size_t len;</div><div class='add'>+	char *buf;</div><div class='add'>+</div><div class='add'>+	if (!str)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	len = strlen(str) + 1;</div><div class='add'>+	buf = kunit_kmalloc(test, len, gfp);</div><div class='add'>+	if (buf)</div><div class='add'>+		memcpy(buf, str, len);</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kunit_kstrdup_const() - Conditionally duplicates a string into a test managed allocation.</div><div class='add'>+ *</div><div class='add'>+ * @test: The test context object.</div><div class='add'>+ * @str: The NULL-terminated string to duplicate.</div><div class='add'>+ * @gfp: flags passed to underlying kmalloc().</div><div class='add'>+ *</div><div class='add'>+ * Calls kunit_kstrdup() only if @str is not in the rodata section. Must be freed with</div><div class='add'>+ * kunit_kfree_const() -- not kunit_kfree().</div><div class='add'>+ * See kstrdup_const() and kunit_kmalloc_array() for more information.</div><div class='add'>+ */</div><div class='add'>+const char *kunit_kstrdup_const(struct kunit *test, const char *str, gfp_t gfp);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kunit_attach_mm() - Create and attach a new mm if it doesn't already exist.</div><div class='add'>+ *</div><div class='add'>+ * Allocates a &amp;struct mm_struct and attaches it to @current. In most cases, call</div><div class='add'>+ * kunit_vm_mmap() without calling kunit_attach_mm() directly. Only necessary when</div><div class='add'>+ * code under test accesses the mm before executing the mmap (e.g., to perform</div><div class='add'>+ * additional initialization beforehand).</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int kunit_attach_mm(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kunit_vm_mmap() - Allocate KUnit-tracked vm_mmap() area</div><div class='add'>+ * @test: The test context object.</div><div class='add'>+ * @file: struct file pointer to map from, if any</div><div class='add'>+ * @addr: desired address, if any</div><div class='add'>+ * @len: how many bytes to allocate</div><div class='add'>+ * @prot: mmap PROT_* bits</div><div class='add'>+ * @flag: mmap flags</div><div class='add'>+ * @offset: offset into @file to start mapping from.</div><div class='add'>+ *</div><div class='add'>+ * See vm_mmap() for more information.</div><div class='add'>+ */</div><div class='add'>+unsigned long kunit_vm_mmap(struct kunit *test, struct file *file,</div><div class='add'>+			    unsigned long addr, unsigned long len,</div><div class='add'>+			    unsigned long prot, unsigned long flag,</div><div class='add'>+			    unsigned long offset);</div><div class='add'>+</div><div class='ctx'> void kunit_cleanup(struct kunit *test);</div><div class='ctx'> </div><div class='ctx'> void __printf(2, 3) kunit_log_append(struct string_stream *log, const char *fmt, ...);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * kunit_mark_skipped() - Marks @test_or_suite as skipped</div><div class='add'>+ * kunit_mark_skipped() - Marks @test as skipped</div><div class='ctx'>  *</div><div class='del'>- * @test_or_suite: The test context object.</div><div class='add'>+ * @test: The test context object.</div><div class='ctx'>  * @fmt:  A printk() style format string.</div><div class='ctx'>  *</div><div class='ctx'>  * Marks the test as skipped. @fmt is given output as the test status</div><div class='hunk'>@@ -493,18 +627,18 @@ void __printf(2, 3) kunit_log_append(struct string_stream *log, const char *fmt,</div><div class='ctx'>  *</div><div class='ctx'>  * Test execution continues after kunit_mark_skipped() is called.</div><div class='ctx'>  */</div><div class='del'>-#define kunit_mark_skipped(test_or_suite, fmt, ...)			\</div><div class='add'>+#define kunit_mark_skipped(test, fmt, ...)				\</div><div class='ctx'> 	do {								\</div><div class='del'>-		WRITE_ONCE((test_or_suite)-&gt;status, KUNIT_SKIPPED);	\</div><div class='del'>-		scnprintf((test_or_suite)-&gt;status_comment,		\</div><div class='add'>+		WRITE_ONCE((test)-&gt;status, KUNIT_SKIPPED);		\</div><div class='add'>+		scnprintf((test)-&gt;status_comment,			\</div><div class='ctx'> 			  KUNIT_STATUS_COMMENT_SIZE,			\</div><div class='ctx'> 			  fmt, ##__VA_ARGS__);				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * kunit_skip() - Marks @test_or_suite as skipped</div><div class='add'>+ * kunit_skip() - Marks @test as skipped</div><div class='ctx'>  *</div><div class='del'>- * @test_or_suite: The test context object.</div><div class='add'>+ * @test: The test context object.</div><div class='ctx'>  * @fmt:  A printk() style format string.</div><div class='ctx'>  *</div><div class='ctx'>  * Skips the test. @fmt is given output as the test status</div><div class='hunk'>@@ -512,10 +646,10 @@ void __printf(2, 3) kunit_log_append(struct string_stream *log, const char *fmt,</div><div class='ctx'>  *</div><div class='ctx'>  * Test execution is halted after kunit_skip() is called.</div><div class='ctx'>  */</div><div class='del'>-#define kunit_skip(test_or_suite, fmt, ...)				\</div><div class='add'>+#define kunit_skip(test, fmt, ...)					\</div><div class='ctx'> 	do {								\</div><div class='del'>-		kunit_mark_skipped((test_or_suite), fmt, ##__VA_ARGS__);\</div><div class='del'>-		kunit_try_catch_throw(&amp;((test_or_suite)-&gt;try_catch));	\</div><div class='add'>+		kunit_mark_skipped((test), fmt, ##__VA_ARGS__);		\</div><div class='add'>+		kunit_try_catch_throw(&amp;((test)-&gt;try_catch));		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -567,6 +701,15 @@ void __printf(2, 3) kunit_log_append(struct string_stream *log, const char *fmt,</div><div class='ctx'> #define kunit_err(test, fmt, ...) \</div><div class='ctx'> 	kunit_printk(KERN_ERR, test, fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Must be called at the beginning of each KUNIT_*_ASSERTION().</div><div class='add'>+ * Cf. KUNIT_CURRENT_LOC.</div><div class='add'>+ */</div><div class='add'>+#define _KUNIT_SAVE_LOC(test) do {					       \</div><div class='add'>+	WRITE_ONCE(test-&gt;last_seen.file, __FILE__);			       \</div><div class='add'>+	WRITE_ONCE(test-&gt;last_seen.line, __LINE__);			       \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * KUNIT_SUCCEED() - A no-op expectation. Only exists for code clarity.</div><div class='ctx'>  * @test: The test context object.</div><div class='hunk'>@@ -575,7 +718,7 @@ void __printf(2, 3) kunit_log_append(struct string_stream *log, const char *fmt,</div><div class='ctx'>  * words, it does nothing and only exists for code clarity. See</div><div class='ctx'>  * KUNIT_EXPECT_TRUE() for more information.</div><div class='ctx'>  */</div><div class='del'>-#define KUNIT_SUCCEED(test) do {} while (0)</div><div class='add'>+#define KUNIT_SUCCEED(test) _KUNIT_SAVE_LOC(test)</div><div class='ctx'> </div><div class='ctx'> void __noreturn __kunit_abort(struct kunit *test);</div><div class='ctx'> </div><div class='hunk'>@@ -601,14 +744,16 @@ void __printf(6, 7) __kunit_do_failed_assertion(struct kunit *test,</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define KUNIT_FAIL_ASSERTION(test, assert_type, fmt, ...)		       \</div><div class='add'>+#define KUNIT_FAIL_ASSERTION(test, assert_type, fmt, ...) do {		       \</div><div class='add'>+	_KUNIT_SAVE_LOC(test);						       \</div><div class='ctx'> 	_KUNIT_FAILED(test,						       \</div><div class='ctx'> 		      assert_type,					       \</div><div class='ctx'> 		      kunit_fail_assert,				       \</div><div class='ctx'> 		      kunit_fail_assert_format,				       \</div><div class='ctx'> 		      {},						       \</div><div class='ctx'> 		      fmt,						       \</div><div class='del'>-		      ##__VA_ARGS__)</div><div class='add'>+		      ##__VA_ARGS__);					       \</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * KUNIT_FAIL() - Always causes a test to fail when evaluated.</div><div class='hunk'>@@ -637,6 +782,7 @@ void __printf(6, 7) __kunit_do_failed_assertion(struct kunit *test,</div><div class='ctx'> 			      fmt,					       \</div><div class='ctx'> 			      ...)					       \</div><div class='ctx'> do {									       \</div><div class='add'>+	_KUNIT_SAVE_LOC(test);						       \</div><div class='ctx'> 	if (likely(!!(condition_) == !!expected_true_))			       \</div><div class='ctx'> 		break;							       \</div><div class='ctx'> 									       \</div><div class='hunk'>@@ -698,6 +844,7 @@ do {									       \</div><div class='ctx'> 		.right_text = #right,					       \</div><div class='ctx'> 	};								       \</div><div class='ctx'> 									       \</div><div class='add'>+	_KUNIT_SAVE_LOC(test);						       \</div><div class='ctx'> 	if (likely(__left op __right))					       \</div><div class='ctx'> 		break;							       \</div><div class='ctx'> 									       \</div><div class='hunk'>@@ -758,6 +905,7 @@ do {									       \</div><div class='ctx'> 		.right_text = #right,					       \</div><div class='ctx'> 	};								       \</div><div class='ctx'> 									       \</div><div class='add'>+	_KUNIT_SAVE_LOC(test);						       \</div><div class='ctx'> 	if (likely((__left) &amp;&amp; (__right) &amp;&amp; (strcmp(__left, __right) op 0)))   \</div><div class='ctx'> 		break;							       \</div><div class='ctx'> 									       \</div><div class='hunk'>@@ -791,6 +939,7 @@ do {									       \</div><div class='ctx'> 		.right_text = #right,					       \</div><div class='ctx'> 	};								       \</div><div class='ctx'> 									       \</div><div class='add'>+	_KUNIT_SAVE_LOC(test);						       \</div><div class='ctx'> 	if (likely(__left &amp;&amp; __right))					       \</div><div class='ctx'> 		if (likely(memcmp(__left, __right, __size) op 0))	       \</div><div class='ctx'> 			break;						       \</div><div class='hunk'>@@ -815,6 +964,7 @@ do {									       \</div><div class='ctx'> do {									       \</div><div class='ctx'> 	const typeof(ptr) __ptr = (ptr);				       \</div><div class='ctx'> 									       \</div><div class='add'>+	_KUNIT_SAVE_LOC(test);						       \</div><div class='ctx'> 	if (!IS_ERR_OR_NULL(__ptr))					       \</div><div class='ctx'> 		break;							       \</div><div class='ctx'> 									       \</div><div class='hunk'>@@ -1193,7 +1343,18 @@ do {									       \</div><div class='ctx'> 						fmt,			       \</div><div class='ctx'> 						##__VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-#define KUNIT_ASSERT_FAILURE(test, fmt, ...) \</div><div class='add'>+/**</div><div class='add'>+ * KUNIT_FAIL_AND_ABORT() - Always causes a test to fail and abort when evaluated.</div><div class='add'>+ * @test: The test context object.</div><div class='add'>+ * @fmt: an informational message to be printed when the assertion is made.</div><div class='add'>+ * @...: string format arguments.</div><div class='add'>+ *</div><div class='add'>+ * The opposite of KUNIT_SUCCEED(), it is an assertion that always fails. In</div><div class='add'>+ * other words, it always results in a failed assertion, and consequently</div><div class='add'>+ * always causes the test case to fail and abort when evaluated.</div><div class='add'>+ * See KUNIT_ASSERT_TRUE() for more information.</div><div class='add'>+ */</div><div class='add'>+#define KUNIT_FAIL_AND_ABORT(test, fmt, ...) \</div><div class='ctx'> 	KUNIT_FAIL_ASSERTION(test, KUNIT_ASSERTION, fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1420,12 +1581,12 @@ do {									       \</div><div class='ctx'> 				   ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * KUNIT_ASSERT_STRNEQ() - Expects that strings @left and @right are not equal.</div><div class='add'>+ * KUNIT_ASSERT_STRNEQ() - An assertion that strings @left and @right are not equal.</div><div class='ctx'>  * @test: The test context object.</div><div class='ctx'>  * @left: an arbitrary expression that evaluates to a null terminated string.</div><div class='ctx'>  * @right: an arbitrary expression that evaluates to a null terminated string.</div><div class='ctx'>  *</div><div class='del'>- * Sets an expectation that the values that @left and @right evaluate to are</div><div class='add'>+ * Sets an assertion that the values that @left and @right evaluate to are</div><div class='ctx'>  * not equal. This is semantically equivalent to</div><div class='ctx'>  * KUNIT_ASSERT_TRUE(@test, strcmp((@left), (@right))). See KUNIT_ASSERT_TRUE()</div><div class='ctx'>  * for more information.</div><div class='hunk'>@@ -1441,6 +1602,60 @@ do {									       \</div><div class='ctx'> 				   ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * KUNIT_ASSERT_MEMEQ() - Asserts that the first @size bytes of @left and @right are equal.</div><div class='add'>+ * @test: The test context object.</div><div class='add'>+ * @left: An arbitrary expression that evaluates to the specified size.</div><div class='add'>+ * @right: An arbitrary expression that evaluates to the specified size.</div><div class='add'>+ * @size: Number of bytes compared.</div><div class='add'>+ *</div><div class='add'>+ * Sets an assertion that the values that @left and @right evaluate to are</div><div class='add'>+ * equal. This is semantically equivalent to</div><div class='add'>+ * KUNIT_ASSERT_TRUE(@test, !memcmp((@left), (@right), (@size))). See</div><div class='add'>+ * KUNIT_ASSERT_TRUE() for more information.</div><div class='add'>+ *</div><div class='add'>+ * Although this assertion works for any memory block, it is not recommended</div><div class='add'>+ * for comparing more structured data, such as structs. This assertion is</div><div class='add'>+ * recommended for comparing, for example, data arrays.</div><div class='add'>+ */</div><div class='add'>+#define KUNIT_ASSERT_MEMEQ(test, left, right, size) \</div><div class='add'>+	KUNIT_ASSERT_MEMEQ_MSG(test, left, right, size, NULL)</div><div class='add'>+</div><div class='add'>+#define KUNIT_ASSERT_MEMEQ_MSG(test, left, right, size, fmt, ...)	       \</div><div class='add'>+	KUNIT_MEM_ASSERTION(test,					       \</div><div class='add'>+			    KUNIT_ASSERTION,				       \</div><div class='add'>+			    left, ==, right,				       \</div><div class='add'>+			    size,					       \</div><div class='add'>+			    fmt,					       \</div><div class='add'>+			    ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * KUNIT_ASSERT_MEMNEQ() - Asserts that the first @size bytes of @left and @right are not equal.</div><div class='add'>+ * @test: The test context object.</div><div class='add'>+ * @left: An arbitrary expression that evaluates to the specified size.</div><div class='add'>+ * @right: An arbitrary expression that evaluates to the specified size.</div><div class='add'>+ * @size: Number of bytes compared.</div><div class='add'>+ *</div><div class='add'>+ * Sets an assertion that the values that @left and @right evaluate to are</div><div class='add'>+ * not equal. This is semantically equivalent to</div><div class='add'>+ * KUNIT_ASSERT_TRUE(@test, memcmp((@left), (@right), (@size))). See</div><div class='add'>+ * KUNIT_ASSERT_TRUE() for more information.</div><div class='add'>+ *</div><div class='add'>+ * Although this assertion works for any memory block, it is not recommended</div><div class='add'>+ * for comparing more structured data, such as structs. This assertion is</div><div class='add'>+ * recommended for comparing, for example, data arrays.</div><div class='add'>+ */</div><div class='add'>+#define KUNIT_ASSERT_MEMNEQ(test, left, right, size) \</div><div class='add'>+	KUNIT_ASSERT_MEMNEQ_MSG(test, left, right, size, NULL)</div><div class='add'>+</div><div class='add'>+#define KUNIT_ASSERT_MEMNEQ_MSG(test, left, right, size, fmt, ...)	       \</div><div class='add'>+	KUNIT_MEM_ASSERTION(test,					       \</div><div class='add'>+			    KUNIT_ASSERTION,				       \</div><div class='add'>+			    left, !=, right,				       \</div><div class='add'>+			    size,					       \</div><div class='add'>+			    fmt,					       \</div><div class='add'>+			    ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * KUNIT_ASSERT_NULL() - Asserts that pointers @ptr is null.</div><div class='ctx'>  * @test: The test context object.</div><div class='ctx'>  * @ptr: an arbitrary pointer.</div><div class='hunk'>@@ -1511,9 +1726,12 @@ do {									       \</div><div class='ctx'>  * Define function @name_gen_params which uses @array to generate parameters.</div><div class='ctx'>  */</div><div class='ctx'> #define KUNIT_ARRAY_PARAM(name, array, get_desc)						\</div><div class='del'>-	static const void *name##_gen_params(const void *prev, char *desc)			\</div><div class='add'>+	static const void *name##_gen_params(struct kunit *test,				\</div><div class='add'>+					     const void *prev, char *desc)			\</div><div class='ctx'> 	{											\</div><div class='ctx'> 		typeof((array)[0]) *__next = prev ? ((typeof(__next)) prev) + 1 : (array);	\</div><div class='add'>+		if (!prev)									\</div><div class='add'>+			kunit_register_params_array(test, array, ARRAY_SIZE(array), NULL);	\</div><div class='ctx'> 		if (__next - (array) &lt; ARRAY_SIZE((array))) {					\</div><div class='ctx'> 			void (*__get_desc)(typeof(__next), char *) = get_desc;			\</div><div class='ctx'> 			if (__get_desc)								\</div><div class='hunk'>@@ -1532,9 +1750,12 @@ do {									       \</div><div class='ctx'>  * Define function @name_gen_params which uses @array to generate parameters.</div><div class='ctx'>  */</div><div class='ctx'> #define KUNIT_ARRAY_PARAM_DESC(name, array, desc_member)					\</div><div class='del'>-	static const void *name##_gen_params(const void *prev, char *desc)			\</div><div class='add'>+	static const void *name##_gen_params(struct kunit *test,				\</div><div class='add'>+					     const void *prev, char *desc)			\</div><div class='ctx'> 	{											\</div><div class='ctx'> 		typeof((array)[0]) *__next = prev ? ((typeof(__next)) prev) + 1 : (array);	\</div><div class='add'>+		if (!prev)									\</div><div class='add'>+			kunit_register_params_array(test, array, ARRAY_SIZE(array), NULL);	\</div><div class='ctx'> 		if (__next - (array) &lt; ARRAY_SIZE((array))) {					\</div><div class='ctx'> 			strscpy(desc, __next-&gt;desc_member, KUNIT_PARAM_DESC_SIZE);		\</div><div class='ctx'> 			return __next;								\</div><div class='hunk'>@@ -1542,6 +1763,33 @@ do {									       \</div><div class='ctx'> 		return NULL;									\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * kunit_register_params_array() - Register parameter array for a KUnit test.</div><div class='add'>+ * @test: The KUnit test structure to which parameters will be added.</div><div class='add'>+ * @array: An array of test parameters.</div><div class='add'>+ * @param_count: Number of parameters.</div><div class='add'>+ * @get_desc: Function that generates a string description for a given parameter</div><div class='add'>+ * element.</div><div class='add'>+ *</div><div class='add'>+ * This macro initializes the @test's parameter array data, storing information</div><div class='add'>+ * including the parameter array, its count, the element size, and the parameter</div><div class='add'>+ * description function within `test-&gt;params_array`.</div><div class='add'>+ *</div><div class='add'>+ * Note: If using this macro in param_init(), kunit_array_gen_params()</div><div class='add'>+ * will then need to be manually provided as the parameter generator function to</div><div class='add'>+ * KUNIT_CASE_PARAM_WITH_INIT(). kunit_array_gen_params() is a KUnit</div><div class='add'>+ * function that uses the registered array to generate parameters</div><div class='add'>+ */</div><div class='add'>+#define kunit_register_params_array(test, array, param_count, get_desc)				\</div><div class='add'>+	do {											\</div><div class='add'>+		struct kunit *_test = (test);							\</div><div class='add'>+		const typeof((array)[0]) * _params_ptr = &amp;(array)[0];				\</div><div class='add'>+		_test-&gt;params_array.params = _params_ptr;					\</div><div class='add'>+		_test-&gt;params_array.num_params = (param_count);					\</div><div class='add'>+		_test-&gt;params_array.elem_size = sizeof(*_params_ptr);				\</div><div class='add'>+		_test-&gt;params_array.get_description = (get_desc);				\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='ctx'> // TODO(dlatypov@google.com): consider eventually migrating users to explicitly</div><div class='ctx'> // include resource.h themselves if they need it.</div><div class='ctx'> #include &lt;kunit/resource.h&gt;</div><div class='head'>diff --git a/include/kunit/try-catch.h b/include/kunit/try-catch.h<br/>index c507dd43119d..d4e1a5b98ed6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kunit/try-catch.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/try-catch.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/try-catch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/try-catch.h</a></div><div class='hunk'>@@ -14,13 +14,11 @@</div><div class='ctx'> </div><div class='ctx'> typedef void (*kunit_try_catch_func_t)(void *);</div><div class='ctx'> </div><div class='del'>-struct completion;</div><div class='ctx'> struct kunit;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct kunit_try_catch - provides a generic way to run code which might fail.</div><div class='ctx'>  * @test: The test case that is currently being executed.</div><div class='del'>- * @try_completion: Completion that the control thread waits on while test runs.</div><div class='ctx'>  * @try_result: Contains any errno obtained while running test case.</div><div class='ctx'>  * @try: The function, the test case, to attempt to run.</div><div class='ctx'>  * @catch: The function called if @try bails out.</div><div class='hunk'>@@ -46,10 +44,10 @@ struct kunit;</div><div class='ctx'> struct kunit_try_catch {</div><div class='ctx'> 	/* private: internal use only. */</div><div class='ctx'> 	struct kunit *test;</div><div class='del'>-	struct completion *try_completion;</div><div class='ctx'> 	int try_result;</div><div class='ctx'> 	kunit_try_catch_func_t try;</div><div class='ctx'> 	kunit_try_catch_func_t catch;</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> 	void *context;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/kunit/visibility.h b/include/kunit/visibility.h<br/>index 0dfe35feeec6..7c34c8ffcf3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kunit/visibility.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kunit/visibility.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kunit/visibility.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kunit/visibility.h</a></div><div class='hunk'>@@ -20,11 +20,11 @@</div><div class='ctx'>     /**</div><div class='ctx'>      * EXPORT_SYMBOL_IF_KUNIT(symbol) - Exports symbol into</div><div class='ctx'>      * EXPORTED_FOR_KUNIT_TESTING namespace only if CONFIG_KUNIT is</div><div class='del'>-     * enabled. Must use MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING)</div><div class='add'>+     * enabled. Must use MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING")</div><div class='ctx'>      * in test file in order to use symbols.</div><div class='add'>+     * @symbol: the symbol identifier to export</div><div class='ctx'>      */</div><div class='del'>-    #define EXPORT_SYMBOL_IF_KUNIT(symbol) EXPORT_SYMBOL_NS(symbol, \</div><div class='del'>-	    EXPORTED_FOR_KUNIT_TESTING)</div><div class='add'>+    #define EXPORT_SYMBOL_IF_KUNIT(symbol) EXPORT_SYMBOL_NS(symbol, "EXPORTED_FOR_KUNIT_TESTING")</div><div class='ctx'> #else</div><div class='ctx'>     #define VISIBLE_IF_KUNIT static</div><div class='ctx'>     #define EXPORT_SYMBOL_IF_KUNIT(symbol)</div><div class='head'>diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h<br/>index c819c5d16613..7310841f4512 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kvm/arm_arch_timer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kvm/arm_arch_timer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kvm/arm_arch_timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kvm/arm_arch_timer.h</a></div><div class='hunk'>@@ -51,8 +51,6 @@ struct arch_timer_vm_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct arch_timer_context {</div><div class='del'>-	struct kvm_vcpu			*vcpu;</div><div class='del'>-</div><div class='ctx'> 	/* Emulated Timer (may be unused) */</div><div class='ctx'> 	struct hrtimer			hrtimer;</div><div class='ctx'> 	u64				ns_frac;</div><div class='hunk'>@@ -71,6 +69,9 @@ struct arch_timer_context {</div><div class='ctx'> 		bool			level;</div><div class='ctx'> 	} irq;</div><div class='ctx'> </div><div class='add'>+	/* Who am I? */</div><div class='add'>+	enum kvm_arch_timers		timer_id;</div><div class='add'>+</div><div class='ctx'> 	/* Duplicated state from arch_timer.c for convenience */</div><div class='ctx'> 	u32				host_timer_irq;</div><div class='ctx'> };</div><div class='hunk'>@@ -98,6 +99,7 @@ int __init kvm_timer_hyp_init(bool has_gic);</div><div class='ctx'> int kvm_timer_enable(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_timer_sync_nested(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_timer_sync_user(struct kvm_vcpu *vcpu);</div><div class='ctx'> bool kvm_timer_should_notify_user(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_timer_update_run(struct kvm_vcpu *vcpu);</div><div class='hunk'>@@ -105,9 +107,6 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> void kvm_timer_init_vm(struct kvm *kvm);</div><div class='ctx'> </div><div class='del'>-u64 kvm_arm_timer_get_reg(struct kvm_vcpu *, u64 regid);</div><div class='del'>-int kvm_arm_timer_set_reg(struct kvm_vcpu *, u64 regid, u64 value);</div><div class='del'>-</div><div class='ctx'> int kvm_arm_timer_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);</div><div class='ctx'> int kvm_arm_timer_get_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);</div><div class='ctx'> int kvm_arm_timer_has_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);</div><div class='hunk'>@@ -126,9 +125,9 @@ void kvm_timer_init_vhe(void);</div><div class='ctx'> #define vcpu_hvtimer(v)	(&amp;(v)-&gt;arch.timer_cpu.timers[TIMER_HVTIMER])</div><div class='ctx'> #define vcpu_hptimer(v)	(&amp;(v)-&gt;arch.timer_cpu.timers[TIMER_HPTIMER])</div><div class='ctx'> </div><div class='del'>-#define arch_timer_ctx_index(ctx)	((ctx) - vcpu_timer((ctx)-&gt;vcpu)-&gt;timers)</div><div class='del'>-</div><div class='del'>-#define timer_vm_data(ctx)		(&amp;(ctx)-&gt;vcpu-&gt;kvm-&gt;arch.timer_data)</div><div class='add'>+#define arch_timer_ctx_index(ctx)	((ctx)-&gt;timer_id)</div><div class='add'>+#define timer_context_to_vcpu(ctx)	container_of((ctx), struct kvm_vcpu, arch.timer_cpu.timers[(ctx)-&gt;timer_id])</div><div class='add'>+#define timer_vm_data(ctx)		(&amp;(timer_context_to_vcpu(ctx)-&gt;kvm-&gt;arch.timer_data))</div><div class='ctx'> #define timer_irq(ctx)			(timer_vm_data(ctx)-&gt;ppi[arch_timer_ctx_index(ctx)])</div><div class='ctx'> </div><div class='ctx'> u64 kvm_arm_timer_read_sysreg(struct kvm_vcpu *vcpu,</div><div class='hunk'>@@ -147,9 +146,44 @@ u64 timer_get_cval(struct arch_timer_context *ctxt);</div><div class='ctx'> void kvm_timer_cpu_up(void);</div><div class='ctx'> void kvm_timer_cpu_down(void);</div><div class='ctx'> </div><div class='add'>+/* CNTKCTL_EL1 valid bits as of DDI0487J.a */</div><div class='add'>+#define CNTKCTL_VALID_BITS	(BIT(17) | GENMASK_ULL(9, 0))</div><div class='add'>+</div><div class='add'>+DECLARE_STATIC_KEY_FALSE(broken_cntvoff_key);</div><div class='add'>+</div><div class='add'>+static inline bool has_broken_cntvoff(void)</div><div class='add'>+{</div><div class='add'>+	return static_branch_unlikely(&amp;broken_cntvoff_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool has_cntpoff(void)</div><div class='ctx'> {</div><div class='ctx'> 	return (has_vhe() &amp;&amp; cpus_have_final_cap(ARM64_HAS_ECV_CNTPOFF));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 timer_get_offset(struct arch_timer_context *ctxt)</div><div class='add'>+{</div><div class='add'>+	u64 offset = 0;</div><div class='add'>+</div><div class='add'>+	if (!ctxt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ctxt-&gt;offset.vm_offset)</div><div class='add'>+		offset += *ctxt-&gt;offset.vm_offset;</div><div class='add'>+	if (ctxt-&gt;offset.vcpu_offset)</div><div class='add'>+		offset += *ctxt-&gt;offset.vcpu_offset;</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void timer_set_offset(struct arch_timer_context *ctxt, u64 offset)</div><div class='add'>+{</div><div class='add'>+	if (!ctxt-&gt;offset.vm_offset) {</div><div class='add'>+		WARN(offset, "timer %d\n", arch_timer_ctx_index(ctxt));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(*ctxt-&gt;offset.vm_offset, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h<br/>index 4b9d8fb393a8..96754b51b411 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kvm/arm_pmu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kvm/arm_pmu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kvm/arm_pmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kvm/arm_pmu.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/perf/arm_pmuv3.h&gt;</div><div class='ctx'> </div><div class='del'>-#define ARMV8_PMU_CYCLE_IDX		(ARMV8_PMU_MAX_COUNTERS - 1)</div><div class='add'>+#define KVM_ARMV8_PMU_MAX_COUNTERS	32</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_HW_PERF_EVENTS) &amp;&amp; IS_ENABLED(CONFIG_KVM)</div><div class='ctx'> struct kvm_pmc {</div><div class='hunk'>@@ -19,14 +19,14 @@ struct kvm_pmc {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_pmu_events {</div><div class='del'>-	u32 events_host;</div><div class='del'>-	u32 events_guest;</div><div class='add'>+	u64 events_host;</div><div class='add'>+	u64 events_guest;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvm_pmu {</div><div class='ctx'> 	struct irq_work overflow_work;</div><div class='ctx'> 	struct kvm_pmu_events events;</div><div class='del'>-	struct kvm_pmc pmc[ARMV8_PMU_MAX_COUNTERS];</div><div class='add'>+	struct kvm_pmc pmc[KVM_ARMV8_PMU_MAX_COUNTERS];</div><div class='ctx'> 	int irq_num;</div><div class='ctx'> 	bool created;</div><div class='ctx'> 	bool irq_level;</div><div class='hunk'>@@ -37,23 +37,17 @@ struct arm_pmu_entry {</div><div class='ctx'> 	struct arm_pmu *arm_pmu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DECLARE_STATIC_KEY_FALSE(kvm_arm_pmu_available);</div><div class='del'>-</div><div class='del'>-static __always_inline bool kvm_arm_support_pmu_v3(void)</div><div class='del'>-{</div><div class='del'>-	return static_branch_likely(&amp;kvm_arm_pmu_available);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+bool kvm_supports_guest_pmuv3(void);</div><div class='ctx'> #define kvm_arm_pmu_irq_initialized(v)	((v)-&gt;arch.pmu.irq_num &gt;= VGIC_NR_SGIS)</div><div class='ctx'> u64 kvm_pmu_get_counter_value(struct kvm_vcpu *vcpu, u64 select_idx);</div><div class='ctx'> void kvm_pmu_set_counter_value(struct kvm_vcpu *vcpu, u64 select_idx, u64 val);</div><div class='del'>-u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu);</div><div class='add'>+void kvm_pmu_set_counter_value_user(struct kvm_vcpu *vcpu, u64 select_idx, u64 val);</div><div class='add'>+u64 kvm_pmu_implemented_counter_mask(struct kvm_vcpu *vcpu);</div><div class='add'>+u64 kvm_pmu_accessible_counter_mask(struct kvm_vcpu *vcpu);</div><div class='ctx'> u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1);</div><div class='ctx'> void kvm_pmu_vcpu_init(struct kvm_vcpu *vcpu);</div><div class='del'>-void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu);</div><div class='del'>-void kvm_pmu_disable_counter_mask(struct kvm_vcpu *vcpu, u64 val);</div><div class='del'>-void kvm_pmu_enable_counter_mask(struct kvm_vcpu *vcpu, u64 val);</div><div class='add'>+void kvm_pmu_reprogram_counter_mask(struct kvm_vcpu *vcpu, u64 val);</div><div class='ctx'> void kvm_pmu_flush_hwstate(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_pmu_sync_hwstate(struct kvm_vcpu *vcpu);</div><div class='ctx'> bool kvm_pmu_should_notify_user(struct kvm_vcpu *vcpu);</div><div class='hunk'>@@ -86,31 +80,23 @@ void kvm_vcpu_pmu_resync_el0(void);</div><div class='ctx'>  */</div><div class='ctx'> #define kvm_pmu_update_vcpu_events(vcpu)				\</div><div class='ctx'> 	do {								\</div><div class='del'>-		if (!has_vhe() &amp;&amp; kvm_vcpu_has_pmu(vcpu))		\</div><div class='add'>+		if (!has_vhe() &amp;&amp; system_supports_pmuv3())		\</div><div class='ctx'> 			vcpu-&gt;arch.pmu.events = *kvm_get_pmu_events();	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Evaluates as true when emulating PMUv3p5, and false otherwise.</div><div class='del'>- */</div><div class='del'>-#define kvm_pmu_is_3p5(vcpu) ({						\</div><div class='del'>-	u64 val = IDREG(vcpu-&gt;kvm, SYS_ID_AA64DFR0_EL1);		\</div><div class='del'>-	u8 pmuver = SYS_FIELD_GET(ID_AA64DFR0_EL1, PMUVer, val);	\</div><div class='del'>-									\</div><div class='del'>-	pmuver &gt;= ID_AA64DFR0_EL1_PMUVer_V3P5;				\</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> u8 kvm_arm_pmu_get_pmuver_limit(void);</div><div class='ctx'> u64 kvm_pmu_evtyper_mask(struct kvm *kvm);</div><div class='ctx'> int kvm_arm_set_default_pmu(struct kvm *kvm);</div><div class='ctx'> u8 kvm_arm_pmu_get_max_counters(struct kvm *kvm);</div><div class='ctx'> </div><div class='ctx'> u64 kvm_vcpu_read_pmcr(struct kvm_vcpu *vcpu);</div><div class='add'>+bool kvm_pmu_counter_is_hyp(struct kvm_vcpu *vcpu, unsigned int idx);</div><div class='add'>+void kvm_pmu_nested_transition(struct kvm_vcpu *vcpu);</div><div class='ctx'> #else</div><div class='ctx'> struct kvm_pmu {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool kvm_arm_support_pmu_v3(void)</div><div class='add'>+static inline bool kvm_supports_guest_pmuv3(void)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -123,15 +109,19 @@ static inline u64 kvm_pmu_get_counter_value(struct kvm_vcpu *vcpu,</div><div class='ctx'> }</div><div class='ctx'> static inline void kvm_pmu_set_counter_value(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					     u64 select_idx, u64 val) {}</div><div class='del'>-static inline u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu)</div><div class='add'>+static inline void kvm_pmu_set_counter_value_user(struct kvm_vcpu *vcpu,</div><div class='add'>+						  u64 select_idx, u64 val) {}</div><div class='add'>+static inline u64 kvm_pmu_implemented_counter_mask(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline u64 kvm_pmu_accessible_counter_mask(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline void kvm_pmu_vcpu_init(struct kvm_vcpu *vcpu) {}</div><div class='del'>-static inline void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu) {}</div><div class='ctx'> static inline void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu) {}</div><div class='del'>-static inline void kvm_pmu_disable_counter_mask(struct kvm_vcpu *vcpu, u64 val) {}</div><div class='del'>-static inline void kvm_pmu_enable_counter_mask(struct kvm_vcpu *vcpu, u64 val) {}</div><div class='add'>+static inline void kvm_pmu_reprogram_counter_mask(struct kvm_vcpu *vcpu, u64 val) {}</div><div class='ctx'> static inline void kvm_pmu_flush_hwstate(struct kvm_vcpu *vcpu) {}</div><div class='ctx'> static inline void kvm_pmu_sync_hwstate(struct kvm_vcpu *vcpu) {}</div><div class='ctx'> static inline bool kvm_pmu_should_notify_user(struct kvm_vcpu *vcpu)</div><div class='hunk'>@@ -168,7 +158,6 @@ static inline u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define kvm_vcpu_has_pmu(vcpu)		({ false; })</div><div class='del'>-#define kvm_pmu_is_3p5(vcpu)		({ false; })</div><div class='ctx'> static inline void kvm_pmu_update_vcpu_events(struct kvm_vcpu *vcpu) {}</div><div class='ctx'> static inline void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu) {}</div><div class='ctx'> static inline void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu) {}</div><div class='hunk'>@@ -198,6 +187,13 @@ static inline u64 kvm_vcpu_read_pmcr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool kvm_pmu_counter_is_hyp(struct kvm_vcpu *vcpu, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_pmu_nested_transition(struct kvm_vcpu *vcpu) {}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h<br/>index e8fb624013d1..cbaec804eb83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kvm/arm_psci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kvm/arm_psci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kvm/arm_psci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kvm/arm_psci.h</a></div><div class='hunk'>@@ -14,8 +14,10 @@</div><div class='ctx'> #define KVM_ARM_PSCI_0_2	PSCI_VERSION(0, 2)</div><div class='ctx'> #define KVM_ARM_PSCI_1_0	PSCI_VERSION(1, 0)</div><div class='ctx'> #define KVM_ARM_PSCI_1_1	PSCI_VERSION(1, 1)</div><div class='add'>+#define KVM_ARM_PSCI_1_2	PSCI_VERSION(1, 2)</div><div class='add'>+#define KVM_ARM_PSCI_1_3	PSCI_VERSION(1, 3)</div><div class='ctx'> </div><div class='del'>-#define KVM_ARM_PSCI_LATEST	KVM_ARM_PSCI_1_1</div><div class='add'>+#define KVM_ARM_PSCI_LATEST	KVM_ARM_PSCI_1_3</div><div class='ctx'> </div><div class='ctx'> static inline int kvm_psci_version(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h<br/>index 8cc38e836f54..b261fb3968d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/kvm/arm_vgic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/kvm/arm_vgic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/kvm/arm_vgic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/kvm/arm_vgic.h</a></div><div class='hunk'>@@ -8,11 +8,12 @@</div><div class='ctx'> #include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/kvm.h&gt;</div><div class='ctx'> #include &lt;linux/irqreturn.h&gt;</div><div class='del'>-#include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/static_key.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/xarray.h&gt;</div><div class='ctx'> #include &lt;kvm/iodev.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/jump_label.h&gt;</div><div class='hunk'>@@ -25,7 +26,6 @@</div><div class='ctx'> #define VGIC_NR_SGIS		16</div><div class='ctx'> #define VGIC_NR_PPIS		16</div><div class='ctx'> #define VGIC_NR_PRIVATE_IRQS	(VGIC_NR_SGIS + VGIC_NR_PPIS)</div><div class='del'>-#define VGIC_MAX_PRIVATE	(VGIC_NR_PRIVATE_IRQS - 1)</div><div class='ctx'> #define VGIC_MAX_SPI		1019</div><div class='ctx'> #define VGIC_MAX_RESERVED	1023</div><div class='ctx'> #define VGIC_MIN_LPI		8192</div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> enum vgic_type {</div><div class='ctx'> 	VGIC_V2,		/* Good ol' GICv2 */</div><div class='ctx'> 	VGIC_V3,		/* New fancy GICv3 */</div><div class='add'>+	VGIC_V5,		/* Newer, fancier GICv5 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* same for all guests, as depending only on the _host's_ GIC model */</div><div class='hunk'>@@ -58,6 +59,9 @@ struct vgic_global {</div><div class='ctx'> 	/* virtual control interface mapping, HYP VA */</div><div class='ctx'> 	void __iomem		*vctrl_hyp;</div><div class='ctx'> </div><div class='add'>+	/* Physical CPU interface, kernel VA */</div><div class='add'>+	void __iomem		*gicc_base;</div><div class='add'>+</div><div class='ctx'> 	/* Number of implemented list registers */</div><div class='ctx'> 	int			nr_lr;</div><div class='ctx'> </div><div class='hunk'>@@ -77,9 +81,12 @@ struct vgic_global {</div><div class='ctx'> 	/* Pseudo GICv3 from outer space */</div><div class='ctx'> 	bool			no_hw_deactivation;</div><div class='ctx'> </div><div class='del'>-	/* GIC system register CPU interface */</div><div class='add'>+	/* GICv3 system register CPU interface */</div><div class='ctx'> 	struct static_key_false gicv3_cpuif;</div><div class='ctx'> </div><div class='add'>+	/* GICv3 compat mode on a GICv5 host */</div><div class='add'>+	bool			has_gcie_v3_compat;</div><div class='add'>+</div><div class='ctx'> 	u32			ich_vtr_el2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +123,8 @@ struct irq_ops {</div><div class='ctx'> </div><div class='ctx'> struct vgic_irq {</div><div class='ctx'> 	raw_spinlock_t irq_lock;	/* Protects the content of the struct */</div><div class='del'>-	struct list_head lpi_list;	/* Used to link all LPIs together */</div><div class='add'>+	u32 intid;			/* Guest visible INTID */</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> 	struct list_head ap_list;</div><div class='ctx'> </div><div class='ctx'> 	struct kvm_vcpu *vcpu;		/* SGIs and PPIs: The VCPU</div><div class='hunk'>@@ -130,15 +138,19 @@ struct vgic_irq {</div><div class='ctx'> 					 * affinity reg (v3).</div><div class='ctx'> 					 */</div><div class='ctx'> </div><div class='del'>-	u32 intid;			/* Guest visible INTID */</div><div class='del'>-	bool line_level;		/* Level only */</div><div class='del'>-	bool pending_latch;		/* The pending latch state used to calculate</div><div class='add'>+	bool pending_release:1;		/* Used for LPIs only, unreferenced IRQ</div><div class='add'>+					 * pending a release */</div><div class='add'>+</div><div class='add'>+	bool pending_latch:1;		/* The pending latch state used to calculate</div><div class='ctx'> 					 * the pending state for both level</div><div class='ctx'> 					 * and edge triggered IRQs. */</div><div class='del'>-	bool active;			/* not used for LPIs */</div><div class='del'>-	bool enabled;</div><div class='del'>-	bool hw;			/* Tied to HW IRQ */</div><div class='del'>-	struct kref refcount;		/* Used for LPIs */</div><div class='add'>+	enum vgic_irq_config config:1;	/* Level or edge */</div><div class='add'>+	bool line_level:1;		/* Level only */</div><div class='add'>+	bool enabled:1;</div><div class='add'>+	bool active:1;</div><div class='add'>+	bool hw:1;			/* Tied to HW IRQ */</div><div class='add'>+	bool on_lr:1;			/* Present in a CPU LR */</div><div class='add'>+	refcount_t refcount;		/* Used for LPIs */</div><div class='ctx'> 	u32 hwintid;			/* HW INTID number */</div><div class='ctx'> 	unsigned int host_irq;		/* linux irq corresponding to hwintid */</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -149,7 +161,6 @@ struct vgic_irq {</div><div class='ctx'> 	u8 active_source;		/* GICv2 SGIs only */</div><div class='ctx'> 	u8 priority;</div><div class='ctx'> 	u8 group;			/* 0 == group 0, 1 == group 1 */</div><div class='del'>-	enum vgic_irq_config config;	/* Level or edge */</div><div class='ctx'> </div><div class='ctx'> 	struct irq_ops *ops;</div><div class='ctx'> </div><div class='hunk'>@@ -209,6 +220,12 @@ struct vgic_its {</div><div class='ctx'> 	struct mutex		its_lock;</div><div class='ctx'> 	struct list_head	device_list;</div><div class='ctx'> 	struct list_head	collection_list;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Caches the (device_id, event_id) -&gt; vgic_irq translation for</div><div class='add'>+	 * LPIs that are mapped and enabled.</div><div class='add'>+	 */</div><div class='add'>+	struct xarray		translation_cache;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct vgic_state_iter;</div><div class='hunk'>@@ -243,6 +260,12 @@ struct vgic_dist {</div><div class='ctx'> </div><div class='ctx'> 	int			nr_spis;</div><div class='ctx'> </div><div class='add'>+	/* The GIC maintenance IRQ for nested hypervisors. */</div><div class='add'>+	u32			mi_intid;</div><div class='add'>+</div><div class='add'>+	/* Track the number of in-flight active SPIs */</div><div class='add'>+	atomic_t		active_spis;</div><div class='add'>+</div><div class='ctx'> 	/* base addresses in guest physical address space: */</div><div class='ctx'> 	gpa_t			vgic_dist_base;		/* distributor */</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -255,12 +278,16 @@ struct vgic_dist {</div><div class='ctx'> 	/* distributor enabled */</div><div class='ctx'> 	bool			enabled;</div><div class='ctx'> </div><div class='add'>+	/* Supports SGIs without active state */</div><div class='add'>+	bool			nassgicap;</div><div class='add'>+</div><div class='ctx'> 	/* Wants SGIs without active state */</div><div class='ctx'> 	bool			nassgireq;</div><div class='ctx'> </div><div class='ctx'> 	struct vgic_irq		*spis;</div><div class='ctx'> </div><div class='ctx'> 	struct vgic_io_device	dist_iodev;</div><div class='add'>+	struct vgic_io_device	cpuif_iodev;</div><div class='ctx'> </div><div class='ctx'> 	bool			has_its;</div><div class='ctx'> 	bool			table_write_in_progress;</div><div class='hunk'>@@ -273,13 +300,8 @@ struct vgic_dist {</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64			propbaser;</div><div class='ctx'> </div><div class='del'>-	/* Protects the lpi_list and the count value below. */</div><div class='del'>-	raw_spinlock_t		lpi_list_lock;</div><div class='del'>-	struct list_head	lpi_list_head;</div><div class='del'>-	int			lpi_list_count;</div><div class='del'>-</div><div class='del'>-	/* LPI translation cache */</div><div class='del'>-	struct list_head	lpi_translation_cache;</div><div class='add'>+#define LPI_XA_MARK_DEBUG_ITER	XA_MARK_0</div><div class='add'>+	struct xarray		lpi_xa;</div><div class='ctx'> </div><div class='ctx'> 	/* used by vgic-debug */</div><div class='ctx'> 	struct vgic_state_iter *iter;</div><div class='hunk'>@@ -329,7 +351,7 @@ struct vgic_cpu {</div><div class='ctx'> 		struct vgic_v3_cpu_if	vgic_v3;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	struct vgic_irq private_irqs[VGIC_NR_PRIVATE_IRQS];</div><div class='add'>+	struct vgic_irq *private_irqs;</div><div class='ctx'> </div><div class='ctx'> 	raw_spinlock_t ap_list_lock;	/* Protects the ap_list */</div><div class='ctx'> </div><div class='hunk'>@@ -364,10 +386,12 @@ struct vgic_cpu {</div><div class='ctx'> </div><div class='ctx'> extern struct static_key_false vgic_v2_cpuif_trap;</div><div class='ctx'> extern struct static_key_false vgic_v3_cpuif_trap;</div><div class='add'>+extern struct static_key_false vgic_v3_has_v2_compat;</div><div class='ctx'> </div><div class='ctx'> int kvm_set_legacy_vgic_v2_addr(struct kvm *kvm, struct kvm_arm_device_addr *dev_addr);</div><div class='ctx'> void kvm_vgic_early_init(struct kvm *kvm);</div><div class='ctx'> int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu);</div><div class='add'>+int kvm_vgic_vcpu_nv_init(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_vgic_create(struct kvm *kvm, u32 type);</div><div class='ctx'> void kvm_vgic_destroy(struct kvm *kvm);</div><div class='ctx'> void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu);</div><div class='hunk'>@@ -387,11 +411,13 @@ int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> void kvm_vgic_load(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_vgic_put(struct kvm_vcpu *vcpu);</div><div class='del'>-void kvm_vgic_vmcr_sync(struct kvm_vcpu *vcpu);</div><div class='add'>+</div><div class='add'>+u16 vgic_v3_get_eisr(struct kvm_vcpu *vcpu);</div><div class='add'>+u16 vgic_v3_get_elrsr(struct kvm_vcpu *vcpu);</div><div class='add'>+u64 vgic_v3_get_misr(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> #define irqchip_in_kernel(k)	(!!((k)-&gt;arch.vgic.in_kernel))</div><div class='ctx'> #define vgic_initialized(k)	((k)-&gt;arch.vgic.initialized)</div><div class='del'>-#define vgic_ready(k)		((k)-&gt;arch.vgic.ready)</div><div class='ctx'> #define vgic_valid_spi(k, i)	(((i) &gt;= VGIC_NR_PRIVATE_IRQS) &amp;&amp; \</div><div class='ctx'> 			((i) &lt; (k)-&gt;arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS))</div><div class='ctx'> </div><div class='hunk'>@@ -399,6 +425,7 @@ bool kvm_vcpu_has_pending_irqs(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_vgic_reset_mapped_irq(struct kvm_vcpu *vcpu, u32 vintid);</div><div class='add'>+void kvm_vgic_process_async_update(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg, bool allow_group1);</div><div class='ctx'> </div><div class='hunk'>@@ -426,13 +453,14 @@ struct kvm_kernel_irq_routing_entry;</div><div class='ctx'> int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int irq,</div><div class='ctx'> 			       struct kvm_kernel_irq_routing_entry *irq_entry);</div><div class='ctx'> </div><div class='del'>-int kvm_vgic_v4_unset_forwarding(struct kvm *kvm, int irq,</div><div class='del'>-				 struct kvm_kernel_irq_routing_entry *irq_entry);</div><div class='add'>+void kvm_vgic_v4_unset_forwarding(struct kvm *kvm, int host_irq);</div><div class='ctx'> </div><div class='ctx'> int vgic_v4_load(struct kvm_vcpu *vcpu);</div><div class='ctx'> void vgic_v4_commit(struct kvm_vcpu *vcpu);</div><div class='ctx'> int vgic_v4_put(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='add'>+bool vgic_state_is_nested(struct kvm_vcpu *vcpu);</div><div class='add'>+</div><div class='ctx'> /* CPU HP callbacks */</div><div class='ctx'> void kvm_vgic_cpu_up(void);</div><div class='ctx'> void kvm_vgic_cpu_down(void);</div><div class='head'>diff --git a/include/linux/acpi.h b/include/linux/acpi.h<br/>index a170c389dd74..fbf0c3a65f59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/acpi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/acpi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/acpi.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #ifndef _LINUX_ACPI_H</div><div class='ctx'> #define _LINUX_ACPI_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;	/* for struct resource */</div><div class='ctx'> #include &lt;linux/resource_ext.h&gt;</div><div class='hunk'>@@ -24,6 +25,7 @@ struct irq_domain_ops;</div><div class='ctx'> #define _LINUX</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='add'>+#include &lt;acpi/acpi_numa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_ACPI</div><div class='ctx'> </div><div class='hunk'>@@ -35,12 +37,11 @@ struct irq_domain_ops;</div><div class='ctx'> </div><div class='ctx'> #include &lt;acpi/acpi_bus.h&gt;</div><div class='ctx'> #include &lt;acpi/acpi_drivers.h&gt;</div><div class='del'>-#include &lt;acpi/acpi_numa.h&gt;</div><div class='ctx'> #include &lt;acpi/acpi_io.h&gt;</div><div class='ctx'> #include &lt;asm/acpi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI_TABLE_LIB</div><div class='del'>-#define EXPORT_SYMBOL_ACPI_LIB(x) EXPORT_SYMBOL_NS_GPL(x, ACPI)</div><div class='add'>+#define EXPORT_SYMBOL_ACPI_LIB(x) EXPORT_SYMBOL_NS_GPL(x, "ACPI")</div><div class='ctx'> #define __init_or_acpilib</div><div class='ctx'> #define __initdata_or_acpilib</div><div class='ctx'> #else</div><div class='hunk'>@@ -107,6 +108,7 @@ enum acpi_irq_model_id {</div><div class='ctx'> 	ACPI_IRQ_MODEL_PLATFORM,</div><div class='ctx'> 	ACPI_IRQ_MODEL_GIC,</div><div class='ctx'> 	ACPI_IRQ_MODEL_LPIC,</div><div class='add'>+	ACPI_IRQ_MODEL_RINTC,</div><div class='ctx'> 	ACPI_IRQ_MODEL_COUNT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -220,6 +222,17 @@ void acpi_reserve_initial_tables (void);</div><div class='ctx'> void acpi_table_init_complete (void);</div><div class='ctx'> int acpi_table_init (void);</div><div class='ctx'> </div><div class='add'>+static inline struct acpi_table_header *acpi_get_table_pointer(char *signature, u32 instance)</div><div class='add'>+{</div><div class='add'>+	struct acpi_table_header *table;</div><div class='add'>+	int status = acpi_get_table(signature, instance, &amp;table);</div><div class='add'>+</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return ERR_PTR(-ENOENT);</div><div class='add'>+	return table;</div><div class='add'>+}</div><div class='add'>+DEFINE_FREE(acpi_put_table, struct acpi_table_header *, if (!IS_ERR_OR_NULL(_T)) acpi_put_table(_T))</div><div class='add'>+</div><div class='ctx'> int acpi_table_parse(char *id, acpi_tbl_table_handler handler);</div><div class='ctx'> int __init_or_acpilib acpi_table_parse_entries(char *id,</div><div class='ctx'> 		unsigned long table_size, int entry_id,</div><div class='hunk'>@@ -237,14 +250,6 @@ acpi_table_parse_cedt(enum acpi_cedt_type id,</div><div class='ctx'> int acpi_parse_mcfg (struct acpi_table_header *header);</div><div class='ctx'> void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);</div><div class='ctx'> </div><div class='del'>-static inline bool acpi_gicc_is_usable(struct acpi_madt_generic_interrupt *gicc)</div><div class='del'>-{</div><div class='del'>-	return gicc-&gt;flags &amp; ACPI_MADT_ENABLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the following numa functions are architecture-dependent */</div><div class='del'>-void acpi_numa_slit_init (struct acpi_table_slit *slit);</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH)</div><div class='ctx'> void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);</div><div class='ctx'> #else</div><div class='hunk'>@@ -267,7 +272,11 @@ static inline void</div><div class='ctx'> acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);</div><div class='add'>+#ifdef CONFIG_RISCV</div><div class='add'>+void acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa);</div><div class='add'>+#else</div><div class='add'>+static inline void acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa) { }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef PHYS_CPUID_INVALID</div><div class='ctx'> typedef u32 phys_cpuid_t;</div><div class='hunk'>@@ -284,6 +293,9 @@ static inline bool invalid_phys_cpuid(phys_cpuid_t phys_id)</div><div class='ctx'> 	return phys_id == PHYS_CPUID_INVALID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+int __init acpi_get_madt_revision(void);</div><div class='add'>+</div><div class='ctx'> /* Validate the processor object's proc_id */</div><div class='ctx'> bool acpi_duplicate_processor_id(int proc_id);</div><div class='ctx'> /* Processor _CTS control */</div><div class='hunk'>@@ -309,6 +321,8 @@ int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id,</div><div class='ctx'> int acpi_unmap_cpu(int cpu);</div><div class='ctx'> #endif /* CONFIG_ACPI_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='add'>+acpi_handle acpi_get_processor_handle(int cpu);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC</div><div class='ctx'> int acpi_get_ioapic_id(acpi_handle handle, u32 gsi_base, u64 *phys_addr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -328,14 +342,16 @@ static inline bool acpi_sci_irq_valid(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern int sbf_port;</div><div class='del'>-extern unsigned long acpi_realmode_flags;</div><div class='ctx'> </div><div class='ctx'> int acpi_register_gsi (struct device *dev, u32 gsi, int triggering, int polarity);</div><div class='ctx'> int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);</div><div class='ctx'> int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);</div><div class='ctx'> </div><div class='add'>+typedef struct fwnode_handle *(*acpi_gsi_domain_disp_fn)(u32);</div><div class='add'>+</div><div class='ctx'> void acpi_set_irq_model(enum acpi_irq_model_id model,</div><div class='del'>-			struct fwnode_handle *(*)(u32));</div><div class='add'>+			acpi_gsi_domain_disp_fn fn);</div><div class='add'>+acpi_gsi_domain_disp_fn acpi_get_gsi_dispatcher(void);</div><div class='ctx'> void acpi_set_gsi_to_irq_fallback(u32 (*)(u32));</div><div class='ctx'> </div><div class='ctx'> struct irq_domain *acpi_irq_create_hierarchy(unsigned int flags,</div><div class='hunk'>@@ -361,6 +377,7 @@ void acpi_unregister_gsi (u32 gsi);</div><div class='ctx'> </div><div class='ctx'> struct pci_dev;</div><div class='ctx'> </div><div class='add'>+struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin);</div><div class='ctx'> int acpi_pci_irq_enable (struct pci_dev *dev);</div><div class='ctx'> void acpi_penalize_isa_irq(int irq, int active);</div><div class='ctx'> bool acpi_isa_irq_available(int irq);</div><div class='hunk'>@@ -385,7 +402,7 @@ extern bool acpi_is_pnp_device(struct acpi_device *);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)</div><div class='ctx'> </div><div class='del'>-typedef void (*wmi_notify_handler) (u32 value, void *context);</div><div class='add'>+typedef void (*wmi_notify_handler) (union acpi_object *data, void *context);</div><div class='ctx'> </div><div class='ctx'> int wmi_instance_count(const char *guid);</div><div class='ctx'> </div><div class='hunk'>@@ -400,7 +417,6 @@ extern acpi_status wmi_set_block(const char *guid, u8 instance,</div><div class='ctx'> extern acpi_status wmi_install_notify_handler(const char *guid,</div><div class='ctx'> 					wmi_notify_handler handler, void *data);</div><div class='ctx'> extern acpi_status wmi_remove_notify_handler(const char *guid);</div><div class='del'>-extern acpi_status wmi_get_event_data(u32 event, struct acpi_buffer *out);</div><div class='ctx'> extern bool wmi_has_guid(const char *guid);</div><div class='ctx'> extern char *wmi_get_acpi_device_uid(const char *guid);</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +437,7 @@ extern char *wmi_get_acpi_device_uid(const char *guid);</div><div class='ctx'> </div><div class='ctx'> extern char acpi_video_backlight_string[];</div><div class='ctx'> extern long acpi_is_video_device(acpi_handle handle);</div><div class='del'>-extern int acpi_blacklisted(void);</div><div class='add'>+</div><div class='ctx'> extern void acpi_osi_setup(char *str);</div><div class='ctx'> extern bool acpi_osi_is_win8(void);</div><div class='ctx'> </div><div class='hunk'>@@ -573,10 +589,15 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);</div><div class='ctx'> #define OSC_SB_CPCV2_SUPPORT			0x00000040</div><div class='ctx'> #define OSC_SB_PCLPI_SUPPORT			0x00000080</div><div class='ctx'> #define OSC_SB_OSLPI_SUPPORT			0x00000100</div><div class='add'>+#define OSC_SB_FAST_THERMAL_SAMPLING_SUPPORT	0x00000200</div><div class='add'>+#define OSC_SB_OVER_16_PSTATES_SUPPORT		0x00000400</div><div class='add'>+#define OSC_SB_GED_SUPPORT			0x00000800</div><div class='ctx'> #define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT		0x00001000</div><div class='del'>-#define OSC_SB_GENERIC_INITIATOR_SUPPORT	0x00002000</div><div class='add'>+#define OSC_SB_IRQ_RESOURCE_SOURCE_SUPPORT	0x00002000</div><div class='ctx'> #define OSC_SB_CPC_FLEXIBLE_ADR_SPACE		0x00004000</div><div class='add'>+#define OSC_SB_GENERIC_INITIATOR_SUPPORT	0x00020000</div><div class='ctx'> #define OSC_SB_NATIVE_USB4_SUPPORT		0x00040000</div><div class='add'>+#define OSC_SB_BATTERY_CHARGE_LIMITING_SUPPORT	0x00080000</div><div class='ctx'> #define OSC_SB_PRM_SUPPORT			0x00200000</div><div class='ctx'> #define OSC_SB_FFH_OPR_SUPPORT			0x00400000</div><div class='ctx'> </div><div class='hunk'>@@ -746,25 +767,29 @@ int acpi_reconfig_notifier_unregister(struct notifier_block *nb);</div><div class='ctx'> int acpi_gtdt_init(struct acpi_table_header *table, int *platform_timer_count);</div><div class='ctx'> int acpi_gtdt_map_ppi(int type);</div><div class='ctx'> bool acpi_gtdt_c3stop(int type);</div><div class='del'>-int acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem, int *timer_count);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef ACPI_HAVE_ARCH_SET_ROOT_POINTER</div><div class='del'>-static inline void acpi_arch_set_root_pointer(u64 addr)</div><div class='add'>+static __always_inline void acpi_arch_set_root_pointer(u64 addr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef ACPI_HAVE_ARCH_GET_ROOT_POINTER</div><div class='del'>-static inline u64 acpi_arch_get_root_pointer(void)</div><div class='add'>+static __always_inline u64 acpi_arch_get_root_pointer(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int acpi_get_local_u64_address(acpi_handle handle, u64 *addr);</div><div class='ctx'> int acpi_get_local_address(acpi_handle handle, u32 *addr);</div><div class='ctx'> const char *acpi_get_subsystem_id(acpi_handle handle);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ACPI_MRRM</div><div class='add'>+int acpi_mrrm_max_mem_region(void);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #else	/* !CONFIG_ACPI */</div><div class='ctx'> </div><div class='ctx'> #define acpi_disabled 1</div><div class='hunk'>@@ -778,8 +803,6 @@ const char *acpi_get_subsystem_id(acpi_handle handle);</div><div class='ctx'> #define acpi_dev_uid_match(adev, uid2)			(adev &amp;&amp; false)</div><div class='ctx'> #define acpi_dev_hid_uid_match(adev, hid2, uid2)	(adev &amp;&amp; false)</div><div class='ctx'> </div><div class='del'>-#include &lt;acpi/acpi_numa.h&gt;</div><div class='del'>-</div><div class='ctx'> struct fwnode_handle;</div><div class='ctx'> </div><div class='ctx'> static inline bool acpi_dev_found(const char *hid)</div><div class='hunk'>@@ -848,6 +871,11 @@ static inline struct fwnode_handle *acpi_fwnode_handle(struct acpi_device *adev)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline acpi_handle acpi_device_handle(struct acpi_device *adev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool has_acpi_companion(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -1077,8 +1105,29 @@ static inline bool acpi_sleep_state_supported(u8 sleep_state)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline acpi_handle acpi_get_processor_handle(int cpu)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int acpi_mrrm_max_mem_region(void)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* !CONFIG_ACPI */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ACPI_HMAT</div><div class='add'>+int hmat_get_extended_linear_cache_size(struct resource *backing_res, int nid,</div><div class='add'>+					resource_size_t *size);</div><div class='add'>+#else</div><div class='add'>+static inline int hmat_get_extended_linear_cache_size(struct resource *backing_res,</div><div class='add'>+						      int nid, resource_size_t *size)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> extern void arch_post_acpi_subsys_init(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC</div><div class='hunk'>@@ -1099,20 +1148,22 @@ void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state,</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state,</div><div class='ctx'> 					   u32 val_a, u32 val_b);</div><div class='del'>-#if defined(CONFIG_SUSPEND) &amp;&amp; defined(CONFIG_X86)</div><div class='ctx'> struct acpi_s2idle_dev_ops {</div><div class='ctx'> 	struct list_head list_node;</div><div class='ctx'> 	void (*prepare)(void);</div><div class='ctx'> 	void (*check)(void);</div><div class='ctx'> 	void (*restore)(void);</div><div class='ctx'> };</div><div class='add'>+#if defined(CONFIG_SUSPEND) &amp;&amp; defined(CONFIG_X86)</div><div class='ctx'> int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg);</div><div class='ctx'> void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg);</div><div class='del'>-int acpi_get_lps0_constraint(struct acpi_device *adev);</div><div class='ctx'> #else /* CONFIG_SUSPEND &amp;&amp; CONFIG_X86 */</div><div class='del'>-static inline int acpi_get_lps0_constraint(struct device *dev)</div><div class='add'>+static inline int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static inline void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg)</div><div class='ctx'> {</div><div class='del'>-	return ACPI_STATE_UNKNOWN;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SUSPEND &amp;&amp; CONFIG_X86 */</div><div class='ctx'> void arch_reserve_mem_area(acpi_physical_address addr, size_t size);</div><div class='hunk'>@@ -1153,8 +1204,6 @@ int acpi_subsys_suspend_noirq(struct device *dev);</div><div class='ctx'> int acpi_subsys_suspend(struct device *dev);</div><div class='ctx'> int acpi_subsys_freeze(struct device *dev);</div><div class='ctx'> int acpi_subsys_poweroff(struct device *dev);</div><div class='del'>-void acpi_ec_mark_gpe_for_wake(void);</div><div class='del'>-void acpi_ec_set_gpe_wake_mask(u8 action);</div><div class='ctx'> int acpi_subsys_restore_early(struct device *dev);</div><div class='ctx'> #else</div><div class='ctx'> static inline int acpi_subsys_prepare(struct device *dev) { return 0; }</div><div class='hunk'>@@ -1165,6 +1214,12 @@ static inline int acpi_subsys_suspend(struct device *dev) { return 0; }</div><div class='ctx'> static inline int acpi_subsys_freeze(struct device *dev) { return 0; }</div><div class='ctx'> static inline int acpi_subsys_poweroff(struct device *dev) { return 0; }</div><div class='ctx'> static inline int acpi_subsys_restore_early(struct device *dev) { return 0; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ACPI_EC) &amp;&amp; defined(CONFIG_PM_SLEEP)</div><div class='add'>+void acpi_ec_mark_gpe_for_wake(void);</div><div class='add'>+void acpi_ec_set_gpe_wake_mask(u8 action);</div><div class='add'>+#else</div><div class='ctx'> static inline void acpi_ec_mark_gpe_for_wake(void) {}</div><div class='ctx'> static inline void acpi_ec_set_gpe_wake_mask(u8 action) {}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1233,7 +1288,7 @@ bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,</div><div class='ctx'> 				struct acpi_resource_gpio **agpio);</div><div class='ctx'> bool acpi_gpio_get_io_resource(struct acpi_resource *ares,</div><div class='ctx'> 			       struct acpi_resource_gpio **agpio);</div><div class='del'>-int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *name, int index,</div><div class='add'>+int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *con_id, int index,</div><div class='ctx'> 				  bool *wake_capable);</div><div class='ctx'> #else</div><div class='ctx'> static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,</div><div class='hunk'>@@ -1246,7 +1301,7 @@ static inline bool acpi_gpio_get_io_resource(struct acpi_resource *ares,</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-static inline int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *name,</div><div class='add'>+static inline int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *con_id,</div><div class='ctx'> 						int index, bool *wake_capable)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENXIO;</div><div class='hunk'>@@ -1259,10 +1314,10 @@ static inline int acpi_dev_gpio_irq_wake_get(struct acpi_device *adev, int index</div><div class='ctx'> 	return acpi_dev_gpio_irq_wake_get_by(adev, NULL, index, wake_capable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *name,</div><div class='add'>+static inline int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *con_id,</div><div class='ctx'> 					   int index)</div><div class='ctx'> {</div><div class='del'>-	return acpi_dev_gpio_irq_wake_get_by(adev, name, index, NULL);</div><div class='add'>+	return acpi_dev_gpio_irq_wake_get_by(adev, con_id, index, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)</div><div class='hunk'>@@ -1300,9 +1355,6 @@ acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid,</div><div class='ctx'> int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname,</div><div class='ctx'> 		       void **valptr);</div><div class='ctx'> </div><div class='del'>-struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,</div><div class='del'>-					    struct fwnode_handle *child);</div><div class='del'>-</div><div class='ctx'> struct acpi_probe_entry;</div><div class='ctx'> typedef bool (*acpi_probe_entry_validate_subtbl)(struct acpi_subtable_header *,</div><div class='ctx'> 						 struct acpi_probe_entry *);</div><div class='hunk'>@@ -1333,6 +1385,8 @@ struct acpi_probe_entry {</div><div class='ctx'> 	kernel_ulong_t driver_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void arch_sort_irqchip_probe(struct acpi_probe_entry *ap_head, int nr);</div><div class='add'>+</div><div class='ctx'> #define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable,	\</div><div class='ctx'> 				 valid, data, fn)			\</div><div class='ctx'> 	static const struct acpi_probe_entry __acpi_probe_##name	\</div><div class='hunk'>@@ -1400,13 +1454,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct fwnode_handle *</div><div class='del'>-acpi_get_next_subnode(const struct fwnode_handle *fwnode,</div><div class='del'>-		      struct fwnode_handle *child)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct fwnode_handle *</div><div class='ctx'> acpi_graph_get_next_endpoint(const struct fwnode_handle *fwnode,</div><div class='ctx'> 			     struct fwnode_handle *prev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1452,18 +1499,25 @@ int acpi_parse_spcr(bool enable_earlycon, bool enable_console);</div><div class='ctx'> #else</div><div class='ctx'> static inline int acpi_parse_spcr(bool enable_earlycon, bool enable_console)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_ACPI_GENERIC_GSI)</div><div class='ctx'> int acpi_irq_get(acpi_handle handle, unsigned int index, struct resource *res);</div><div class='add'>+const struct cpumask *acpi_irq_get_affinity(acpi_handle handle,</div><div class='add'>+					    unsigned int index);</div><div class='ctx'> #else</div><div class='ctx'> static inline</div><div class='ctx'> int acpi_irq_get(acpi_handle handle, unsigned int index, struct resource *res)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+static inline const struct cpumask *acpi_irq_get_affinity(acpi_handle handle,</div><div class='add'>+							  unsigned int index)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI_LPIT</div><div class='hunk'>@@ -1490,6 +1544,9 @@ int find_acpi_cpu_topology(unsigned int cpu, int level);</div><div class='ctx'> int find_acpi_cpu_topology_cluster(unsigned int cpu);</div><div class='ctx'> int find_acpi_cpu_topology_package(unsigned int cpu);</div><div class='ctx'> int find_acpi_cpu_topology_hetero_id(unsigned int cpu);</div><div class='add'>+void acpi_pptt_get_cpus_from_container(u32 acpi_cpu_id, cpumask_t *cpus);</div><div class='add'>+int find_acpi_cache_level_from_id(u32 cache_id);</div><div class='add'>+int acpi_pptt_get_cpumask_from_cache_id(u32 cache_id, cpumask_t *cpus);</div><div class='ctx'> #else</div><div class='ctx'> static inline int acpi_pptt_cpu_is_thread(unsigned int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -1511,13 +1568,20 @@ static inline int find_acpi_cpu_topology_hetero_id(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+static inline void acpi_pptt_get_cpus_from_container(u32 acpi_cpu_id,</div><div class='add'>+						     cpumask_t *cpus) { }</div><div class='add'>+static inline int find_acpi_cache_level_from_id(u32 cache_id)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+static inline int acpi_pptt_get_cpumask_from_cache_id(u32 cache_id,</div><div class='add'>+						      cpumask_t *cpus)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARM64</div><div class='del'>-void acpi_arm_init(void);</div><div class='del'>-#else</div><div class='del'>-static inline void acpi_arm_init(void) { }</div><div class='del'>-#endif</div><div class='add'>+void acpi_arch_init(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI_PCC</div><div class='ctx'> void acpi_init_pcc(void);</div><div class='hunk'>@@ -1548,4 +1612,13 @@ static inline void acpi_use_parent_companion(struct device *dev)</div><div class='ctx'> 	ACPI_COMPANION_SET(dev, ACPI_COMPANION(dev-&gt;parent));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ACPI_NUMA</div><div class='add'>+bool acpi_node_backed_by_real_pxm(int nid);</div><div class='add'>+#else</div><div class='add'>+static inline bool acpi_node_backed_by_real_pxm(int nid)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif	/*_LINUX_ACPI_H*/</div><div class='head'>diff --git a/include/linux/acpi_dma.h b/include/linux/acpi_dma.h<br/>index 72cedb916a9c..e748b2877602 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/acpi_dma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi_dma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/acpi_dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/acpi_dma.h</a></div><div class='hunk'>@@ -11,10 +11,11 @@</div><div class='ctx'> #ifndef __LINUX_ACPI_DMA_H</div><div class='ctx'> #define __LINUX_ACPI_DMA_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct acpi_dma_spec - slave device DMA resources</div><div class='hunk'>@@ -65,7 +66,6 @@ int devm_acpi_dma_controller_register(struct device *dev,</div><div class='ctx'> 		struct dma_chan *(*acpi_dma_xlate)</div><div class='ctx'> 		(struct acpi_dma_spec *, struct acpi_dma *),</div><div class='ctx'> 		void *data);</div><div class='del'>-void devm_acpi_dma_controller_free(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> struct dma_chan *acpi_dma_request_slave_chan_by_index(struct device *dev,</div><div class='ctx'> 						      size_t index);</div><div class='hunk'>@@ -94,9 +94,6 @@ static inline int devm_acpi_dma_controller_register(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='del'>-static inline void devm_acpi_dma_controller_free(struct device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static inline struct dma_chan *acpi_dma_request_slave_chan_by_index(</div><div class='ctx'> 		struct device *dev, size_t index)</div><div class='head'>diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h<br/>index 1cb65592c95d..d4ed5622cf2b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/acpi_iort.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi_iort.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/acpi_iort.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/acpi_iort.h</a></div><div class='hunk'>@@ -39,7 +39,7 @@ void iort_get_rmr_sids(struct fwnode_handle *iommu_fwnode,</div><div class='ctx'> void iort_put_rmr_sids(struct fwnode_handle *iommu_fwnode,</div><div class='ctx'> 		       struct list_head *head);</div><div class='ctx'> /* IOMMU interface */</div><div class='del'>-int iort_dma_get_ranges(struct device *dev, u64 *size);</div><div class='add'>+int iort_dma_get_ranges(struct device *dev, u64 *limit);</div><div class='ctx'> int iort_iommu_configure_id(struct device *dev, const u32 *id_in);</div><div class='ctx'> void iort_iommu_get_resv_regions(struct device *dev, struct list_head *head);</div><div class='ctx'> phys_addr_t acpi_iort_dma_get_max_cpu_address(void);</div><div class='hunk'>@@ -55,7 +55,7 @@ void iort_get_rmr_sids(struct fwnode_handle *iommu_fwnode, struct list_head *hea</div><div class='ctx'> static inline</div><div class='ctx'> void iort_put_rmr_sids(struct fwnode_handle *iommu_fwnode, struct list_head *head) { }</div><div class='ctx'> /* IOMMU interface */</div><div class='del'>-static inline int iort_dma_get_ranges(struct device *dev, u64 *size)</div><div class='add'>+static inline int iort_dma_get_ranges(struct device *dev, u64 *limit)</div><div class='ctx'> { return -ENODEV; }</div><div class='ctx'> static inline int iort_iommu_configure_id(struct device *dev, const u32 *id_in)</div><div class='ctx'> { return -ENODEV; }</div><div class='head'>diff --git a/include/linux/acpi_pmtmr.h b/include/linux/acpi_pmtmr.h<br/>index 50d88bf1498d..0ded9220d379 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/acpi_pmtmr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/acpi_pmtmr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/acpi_pmtmr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/acpi_pmtmr.h</a></div><div class='hunk'>@@ -26,6 +26,19 @@ static inline u32 acpi_pm_read_early(void)</div><div class='ctx'> 	return acpi_pm_read_verified() &amp; ACPI_PM_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * Register callback for suspend and resume event</div><div class='add'>+ *</div><div class='add'>+ * @cb Callback triggered on suspend and resume</div><div class='add'>+ * @data Data passed with the callback</div><div class='add'>+ */</div><div class='add'>+void acpi_pmtmr_register_suspend_resume_callback(void (*cb)(void *data, bool suspend), void *data);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Remove registered callback for suspend and resume event</div><div class='add'>+ */</div><div class='add'>+void acpi_pmtmr_unregister_suspend_resume_callback(void);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline u32 acpi_pm_read_early(void)</div><div class='head'>diff --git a/include/linux/acpi_rimt.h b/include/linux/acpi_rimt.h<br/>new file mode 100644<br/>index 000000000000..fad3adc4d899<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/acpi_rimt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/acpi_rimt.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2024-2025, Ventana Micro Systems Inc.</div><div class='add'>+ *	Author: Sunil V L &lt;sunilvl@ventanamicro.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ACPI_RIMT_H</div><div class='add'>+#define _ACPI_RIMT_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI_RIMT</div><div class='add'>+int rimt_iommu_register(struct device *dev);</div><div class='add'>+#else</div><div class='add'>+static inline int rimt_iommu_register(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_IOMMU_API) &amp;&amp; defined(CONFIG_ACPI_RIMT)</div><div class='add'>+int rimt_iommu_configure_id(struct device *dev, const u32 *id_in);</div><div class='add'>+#else</div><div class='add'>+static inline int rimt_iommu_configure_id(struct device *dev, const u32 *id_in)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ACPI_RIMT_H */</div><div class='head'>diff --git a/include/linux/adi-axi-common.h b/include/linux/adi-axi-common.h<br/>new file mode 100644<br/>index 000000000000..37962ba530df<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/adi-axi-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/adi-axi-common.h</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Analog Devices AXI common registers &amp; definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2019 Analog Devices Inc.</div><div class='add'>+ *</div><div class='add'>+ * https://wiki.analog.com/resources/fpga/docs/axi_ip</div><div class='add'>+ * https://wiki.analog.com/resources/fpga/docs/hdl/regmap</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef ADI_AXI_COMMON_H_</div><div class='add'>+#define ADI_AXI_COMMON_H_</div><div class='add'>+</div><div class='add'>+#define ADI_AXI_REG_VERSION			0x0000</div><div class='add'>+#define ADI_AXI_REG_FPGA_INFO			0x001C</div><div class='add'>+</div><div class='add'>+#define ADI_AXI_PCORE_VER(major, minor, patch)	\</div><div class='add'>+	(((major) &lt;&lt; 16) | ((minor) &lt;&lt; 8) | (patch))</div><div class='add'>+</div><div class='add'>+#define ADI_AXI_PCORE_VER_MAJOR(version)	(((version) &gt;&gt; 16) &amp; 0xff)</div><div class='add'>+#define ADI_AXI_PCORE_VER_MINOR(version)	(((version) &gt;&gt; 8) &amp; 0xff)</div><div class='add'>+#define ADI_AXI_PCORE_VER_PATCH(version)	((version) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * adi_axi_pcore_ver_gteq() - check if a version is satisfied</div><div class='add'>+ * @version: the full version read from the hardware</div><div class='add'>+ * @major: the major version to compare against</div><div class='add'>+ * @minor: the minor version to compare against</div><div class='add'>+ *</div><div class='add'>+ * ADI AXI IP Cores use semantic versioning, so this can be used to check for</div><div class='add'>+ * feature availability.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the version is greater than or equal to the specified</div><div class='add'>+ *         major and minor version, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool adi_axi_pcore_ver_gteq(u32 version, u32 major, u32 minor)</div><div class='add'>+{</div><div class='add'>+	return ADI_AXI_PCORE_VER_MAJOR(version) &gt; (major) ||</div><div class='add'>+	       (ADI_AXI_PCORE_VER_MAJOR(version) == (major) &amp;&amp;</div><div class='add'>+		ADI_AXI_PCORE_VER_MINOR(version) &gt;= (minor));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ADI_AXI_INFO_FPGA_TECH(info)            (((info) &gt;&gt; 24) &amp; 0xff)</div><div class='add'>+#define ADI_AXI_INFO_FPGA_FAMILY(info)          (((info) &gt;&gt; 16) &amp; 0xff)</div><div class='add'>+#define ADI_AXI_INFO_FPGA_SPEED_GRADE(info)     (((info) &gt;&gt; 8) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+enum adi_axi_fpga_technology {</div><div class='add'>+	ADI_AXI_FPGA_TECH_UNKNOWN = 0,</div><div class='add'>+	ADI_AXI_FPGA_TECH_SERIES7,</div><div class='add'>+	ADI_AXI_FPGA_TECH_ULTRASCALE,</div><div class='add'>+	ADI_AXI_FPGA_TECH_ULTRASCALE_PLUS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum adi_axi_fpga_family {</div><div class='add'>+	ADI_AXI_FPGA_FAMILY_UNKNOWN = 0,</div><div class='add'>+	ADI_AXI_FPGA_FAMILY_ARTIX,</div><div class='add'>+	ADI_AXI_FPGA_FAMILY_KINTEX,</div><div class='add'>+	ADI_AXI_FPGA_FAMILY_VIRTEX,</div><div class='add'>+	ADI_AXI_FPGA_FAMILY_ZYNQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum adi_axi_fpga_speed_grade {</div><div class='add'>+	ADI_AXI_FPGA_SPEED_UNKNOWN      = 0,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_1    = 10,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_1L   = 11,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_1H   = 12,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_1HV  = 13,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_1LV  = 14,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_2    = 20,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_2L   = 21,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_2LV  = 22,</div><div class='add'>+	ADI_AXI_FPGA_SPEED_3    = 30,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* ADI_AXI_COMMON_H_ */</div><div class='head'>diff --git a/include/linux/adreno-smmu-priv.h b/include/linux/adreno-smmu-priv.h<br/>index c637e0997f6d..d83c9175828f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/adreno-smmu-priv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/adreno-smmu-priv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/adreno-smmu-priv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/adreno-smmu-priv.h</a></div><div class='hunk'>@@ -45,11 +45,16 @@ struct adreno_smmu_fault_info {</div><div class='ctx'>  *                 TTBR0 translation is enabled with the specified cfg</div><div class='ctx'>  * @get_fault_info: Called by the GPU fault handler to get information about</div><div class='ctx'>  *                  the fault</div><div class='del'>- * @set_stall:     Configure whether stall on fault (CFCFG) is enabled.  Call</div><div class='del'>- *                 before set_ttbr0_cfg().  If stalling on fault is enabled,</div><div class='del'>- *                 the GPU driver must call resume_translation()</div><div class='add'>+ * @set_stall:     Configure whether stall on fault (CFCFG) is enabled. If</div><div class='add'>+ *                 stalling on fault is enabled, the GPU driver must call</div><div class='add'>+ *                 resume_translation()</div><div class='ctx'>  * @resume_translation: Resume translation after a fault</div><div class='ctx'>  *</div><div class='add'>+ * @set_prr_bit:   [optional] Configure the GPU's Partially Resident</div><div class='add'>+ *                 Region (PRR) bit in the ACTLR register.</div><div class='add'>+ * @set_prr_addr:  [optional] Configure the PRR_CFG_*ADDR register with</div><div class='add'>+ *                 the physical address of PRR page passed from GPU</div><div class='add'>+ *                 driver.</div><div class='ctx'>  *</div><div class='ctx'>  * The GPU driver (drm/msm) and adreno-smmu work together for controlling</div><div class='ctx'>  * the GPU's SMMU instance.  This is by necessity, as the GPU is directly</div><div class='hunk'>@@ -67,6 +72,8 @@ struct adreno_smmu_priv {</div><div class='ctx'>     void (*get_fault_info)(const void *cookie, struct adreno_smmu_fault_info *info);</div><div class='ctx'>     void (*set_stall)(const void *cookie, bool enabled);</div><div class='ctx'>     void (*resume_translation)(const void *cookie, bool terminate);</div><div class='add'>+    void (*set_prr_bit)(const void *cookie, bool set);</div><div class='add'>+    void (*set_prr_addr)(const void *cookie, phys_addr_t page_addr);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* __ADRENO_SMMU_PRIV_H */</div><div class='head'>diff --git a/include/linux/aer.h b/include/linux/aer.h<br/>index ae0fae70d4bd..02940be66324 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/aer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/aer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/aer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/aer.h</a></div><div class='hunk'>@@ -16,13 +16,26 @@</div><div class='ctx'> #define AER_CORRECTABLE			2</div><div class='ctx'> #define DPC_FATAL			3</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * AER and DPC capabilities TLP Logging register sizes (PCIe r6.2, sec 7.8.4</div><div class='add'>+ * &amp; 7.9.14).</div><div class='add'>+ */</div><div class='add'>+#define PCIE_STD_NUM_TLP_HEADERLOG     4</div><div class='add'>+#define PCIE_STD_MAX_TLP_PREFIXLOG     4</div><div class='add'>+#define PCIE_STD_MAX_TLP_HEADERLOG	(PCIE_STD_NUM_TLP_HEADERLOG + 10)</div><div class='add'>+</div><div class='ctx'> struct pci_dev;</div><div class='ctx'> </div><div class='del'>-struct aer_header_log_regs {</div><div class='del'>-	u32 dw0;</div><div class='del'>-	u32 dw1;</div><div class='del'>-	u32 dw2;</div><div class='del'>-	u32 dw3;</div><div class='add'>+struct pcie_tlp_log {</div><div class='add'>+	union {</div><div class='add'>+		u32 dw[PCIE_STD_MAX_TLP_HEADERLOG];</div><div class='add'>+		struct {</div><div class='add'>+			u32 _do_not_use[PCIE_STD_NUM_TLP_HEADERLOG];</div><div class='add'>+			u32 prefix[PCIE_STD_MAX_TLP_PREFIXLOG];</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	u8 header_len;		/* Length of the Logged TLP Header in DWORDs */</div><div class='add'>+	bool flit;		/* TLP was logged when in Flit mode */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aer_capability_regs {</div><div class='hunk'>@@ -33,7 +46,7 @@ struct aer_capability_regs {</div><div class='ctx'> 	u32 cor_status;</div><div class='ctx'> 	u32 cor_mask;</div><div class='ctx'> 	u32 cap_control;</div><div class='del'>-	struct aer_header_log_regs header_log;</div><div class='add'>+	struct pcie_tlp_log header_log;</div><div class='ctx'> 	u32 root_command;</div><div class='ctx'> 	u32 root_status;</div><div class='ctx'> 	u16 cor_err_source;</div><div class='head'>diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h<br/>index 05e758b8b894..3ffa5341dce2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/alarmtimer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/alarmtimer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/alarmtimer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/alarmtimer.h</a></div><div class='hunk'>@@ -20,12 +20,6 @@ enum alarmtimer_type {</div><div class='ctx'> 	ALARM_BOOTTIME_FREEZER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum alarmtimer_restart {</div><div class='del'>-	ALARMTIMER_NORESTART,</div><div class='del'>-	ALARMTIMER_RESTART,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #define ALARMTIMER_STATE_INACTIVE	0x00</div><div class='ctx'> #define ALARMTIMER_STATE_ENQUEUED	0x01</div><div class='ctx'> </div><div class='hunk'>@@ -42,14 +36,14 @@ enum alarmtimer_restart {</div><div class='ctx'> struct alarm {</div><div class='ctx'> 	struct timerqueue_node	node;</div><div class='ctx'> 	struct hrtimer		timer;</div><div class='del'>-	enum alarmtimer_restart	(*function)(struct alarm *, ktime_t now);</div><div class='add'>+	void			(*function)(struct alarm *, ktime_t now);</div><div class='ctx'> 	enum alarmtimer_type	type;</div><div class='ctx'> 	int			state;</div><div class='ctx'> 	void			*data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void alarm_init(struct alarm *alarm, enum alarmtimer_type type,</div><div class='del'>-		enum alarmtimer_restart (*function)(struct alarm *, ktime_t));</div><div class='add'>+		void (*function)(struct alarm *, ktime_t));</div><div class='ctx'> void alarm_start(struct alarm *alarm, ktime_t start);</div><div class='ctx'> void alarm_start_relative(struct alarm *alarm, ktime_t start);</div><div class='ctx'> void alarm_restart(struct alarm *alarm);</div><div class='head'>diff --git a/include/linux/alcor_pci.h b/include/linux/alcor_pci.h<br/>index c4a0b23846d8..dcb1d37dabc2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/alcor_pci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/alcor_pci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/alcor_pci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/alcor_pci.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #define ALCOR_SD_CARD 0</div><div class='ctx'> #define ALCOR_MS_CARD 1</div><div class='ctx'> </div><div class='add'>+#define DRV_NAME_ALCOR_PCI			"alcor_pci"</div><div class='ctx'> #define DRV_NAME_ALCOR_PCI_SDMMC		"alcor_sdmmc"</div><div class='ctx'> #define DRV_NAME_ALCOR_PCI_MS			"alcor_ms"</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/align.h b/include/linux/align.h<br/>index 2b4acec7b95a..55debf105a5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/align.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/align.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/align.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/align.h</a></div><div class='hunk'>@@ -2,14 +2,6 @@</div><div class='ctx'> #ifndef _LINUX_ALIGN_H</div><div class='ctx'> #define _LINUX_ALIGN_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/const.h&gt;</div><div class='del'>-</div><div class='del'>-/* @a is a power of 2 value */</div><div class='del'>-#define ALIGN(x, a)		__ALIGN_KERNEL((x), (a))</div><div class='del'>-#define ALIGN_DOWN(x, a)	__ALIGN_KERNEL((x) - ((a) - 1), (a))</div><div class='del'>-#define __ALIGN_MASK(x, mask)	__ALIGN_KERNEL_MASK((x), (mask))</div><div class='del'>-#define PTR_ALIGN(p, a)		((typeof(p))ALIGN((unsigned long)(p), (a)))</div><div class='del'>-#define PTR_ALIGN_DOWN(p, a)	((typeof(p))ALIGN_DOWN((unsigned long)(p), (a)))</div><div class='del'>-#define IS_ALIGNED(x, a)		(((x) &amp; ((typeof(x))(a) - 1)) == 0)</div><div class='add'>+#include &lt;vdso/align.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif	/* _LINUX_ALIGN_H */</div><div class='head'>diff --git a/include/linux/alloc_tag.h b/include/linux/alloc_tag.h<br/>new file mode 100644<br/>index 000000000000..d40ac39bfbe8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/alloc_tag.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/alloc_tag.h</a></div><div class='hunk'>@@ -0,0 +1,268 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * allocation tagging</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_ALLOC_TAG_H</div><div class='add'>+#define _LINUX_ALLOC_TAG_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/codetag.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/preempt.h&gt;</div><div class='add'>+#include &lt;asm/percpu.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/static_key.h&gt;</div><div class='add'>+#include &lt;linux/irqflags.h&gt;</div><div class='add'>+</div><div class='add'>+struct alloc_tag_counters {</div><div class='add'>+	u64 bytes;</div><div class='add'>+	u64 calls;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An instance of this structure is created in a special ELF section at every</div><div class='add'>+ * allocation callsite. At runtime, the special section is treated as</div><div class='add'>+ * an array of these. Embedded codetag utilizes codetag framework.</div><div class='add'>+ */</div><div class='add'>+struct alloc_tag {</div><div class='add'>+	struct codetag			ct;</div><div class='add'>+	struct alloc_tag_counters __percpu	*counters;</div><div class='add'>+} __aligned(8);</div><div class='add'>+</div><div class='add'>+struct alloc_tag_kernel_section {</div><div class='add'>+	struct alloc_tag *first_tag;</div><div class='add'>+	unsigned long count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct alloc_tag_module_section {</div><div class='add'>+	union {</div><div class='add'>+		unsigned long start_addr;</div><div class='add'>+		struct alloc_tag *first_tag;</div><div class='add'>+	};</div><div class='add'>+	unsigned long end_addr;</div><div class='add'>+	/* used size */</div><div class='add'>+	unsigned long size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING_DEBUG</div><div class='add'>+</div><div class='add'>+#define CODETAG_EMPTY	((void *)1)</div><div class='add'>+</div><div class='add'>+static inline bool is_codetag_empty(union codetag_ref *ref)</div><div class='add'>+{</div><div class='add'>+	return ref-&gt;ct == CODETAG_EMPTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_codetag_empty(union codetag_ref *ref)</div><div class='add'>+{</div><div class='add'>+	if (ref)</div><div class='add'>+		ref-&gt;ct = CODETAG_EMPTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */</div><div class='add'>+</div><div class='add'>+static inline bool is_codetag_empty(union codetag_ref *ref) { return false; }</div><div class='add'>+</div><div class='add'>+static inline void set_codetag_empty(union codetag_ref *ref)</div><div class='add'>+{</div><div class='add'>+	if (ref)</div><div class='add'>+		ref-&gt;ct = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING</div><div class='add'>+</div><div class='add'>+#define ALLOC_TAG_SECTION_NAME	"alloc_tags"</div><div class='add'>+</div><div class='add'>+struct codetag_bytes {</div><div class='add'>+	struct codetag *ct;</div><div class='add'>+	s64 bytes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+size_t alloc_tag_top_users(struct codetag_bytes *tags, size_t count, bool can_sleep);</div><div class='add'>+</div><div class='add'>+static inline struct alloc_tag *ct_to_alloc_tag(struct codetag *ct)</div><div class='add'>+{</div><div class='add'>+	return container_of(ct, struct alloc_tag, ct);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_MODULE_NEEDS_WEAK_PER_CPU) &amp;&amp; defined(MODULE)</div><div class='add'>+/*</div><div class='add'>+ * When percpu variables are required to be defined as weak, static percpu</div><div class='add'>+ * variables can't be used inside a function (see comments for DECLARE_PER_CPU_SECTION).</div><div class='add'>+ * Instead we will account all module allocations to a single counter.</div><div class='add'>+ */</div><div class='add'>+DECLARE_PER_CPU(struct alloc_tag_counters, _shared_alloc_tag);</div><div class='add'>+</div><div class='add'>+#define DEFINE_ALLOC_TAG(_alloc_tag)						\</div><div class='add'>+	static struct alloc_tag _alloc_tag __used __aligned(8)			\</div><div class='add'>+	__section(ALLOC_TAG_SECTION_NAME) = {					\</div><div class='add'>+		.ct = CODE_TAG_INIT,						\</div><div class='add'>+		.counters = &amp;_shared_alloc_tag };</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_ARCH_MODULE_NEEDS_WEAK_PER_CPU &amp;&amp; MODULE */</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+</div><div class='add'>+#define DEFINE_ALLOC_TAG(_alloc_tag)						\</div><div class='add'>+	static struct alloc_tag _alloc_tag __used __aligned(8)			\</div><div class='add'>+	__section(ALLOC_TAG_SECTION_NAME) = {					\</div><div class='add'>+		.ct = CODE_TAG_INIT,						\</div><div class='add'>+		.counters = NULL };</div><div class='add'>+</div><div class='add'>+#else  /* MODULE */</div><div class='add'>+</div><div class='add'>+#define DEFINE_ALLOC_TAG(_alloc_tag)						\</div><div class='add'>+	static DEFINE_PER_CPU(struct alloc_tag_counters, _alloc_tag_cntr);	\</div><div class='add'>+	static struct alloc_tag _alloc_tag __used __aligned(8)			\</div><div class='add'>+	__section(ALLOC_TAG_SECTION_NAME) = {					\</div><div class='add'>+		.ct = CODE_TAG_INIT,						\</div><div class='add'>+		.counters = &amp;_alloc_tag_cntr };</div><div class='add'>+</div><div class='add'>+#endif /* MODULE */</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ARCH_MODULE_NEEDS_WEAK_PER_CPU &amp;&amp; MODULE */</div><div class='add'>+</div><div class='add'>+DECLARE_STATIC_KEY_MAYBE(CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT,</div><div class='add'>+			mem_alloc_profiling_key);</div><div class='add'>+</div><div class='add'>+static inline bool mem_alloc_profiling_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return static_branch_maybe(CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT,</div><div class='add'>+				   &amp;mem_alloc_profiling_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct alloc_tag_counters alloc_tag_read(struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	struct alloc_tag_counters v = { 0, 0 };</div><div class='add'>+	struct alloc_tag_counters *counter;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		counter = per_cpu_ptr(tag-&gt;counters, cpu);</div><div class='add'>+		v.bytes += counter-&gt;bytes;</div><div class='add'>+		v.calls += counter-&gt;calls;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return v;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING_DEBUG</div><div class='add'>+static inline void alloc_tag_add_check(union codetag_ref *ref, struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	WARN_ONCE(ref &amp;&amp; ref-&gt;ct &amp;&amp; !is_codetag_empty(ref),</div><div class='add'>+		  "alloc_tag was not cleared (got tag for %s:%u)\n",</div><div class='add'>+		  ref-&gt;ct-&gt;filename, ref-&gt;ct-&gt;lineno);</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(!tag, "current-&gt;alloc_tag not set\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void alloc_tag_sub_check(union codetag_ref *ref)</div><div class='add'>+{</div><div class='add'>+	WARN_ONCE(ref &amp;&amp; !ref-&gt;ct, "alloc_tag was not set\n");</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void alloc_tag_add_check(union codetag_ref *ref, struct alloc_tag *tag) {}</div><div class='add'>+static inline void alloc_tag_sub_check(union codetag_ref *ref) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Caller should verify both ref and tag to be valid */</div><div class='add'>+static inline bool __alloc_tag_ref_set(union codetag_ref *ref, struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	alloc_tag_add_check(ref, tag);</div><div class='add'>+	if (!ref || !tag)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ref-&gt;ct = &amp;tag-&gt;ct;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool alloc_tag_ref_set(union codetag_ref *ref, struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!__alloc_tag_ref_set(ref, tag)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We need in increment the call counter every time we have a new</div><div class='add'>+	 * allocation or when we split a large allocation into smaller ones.</div><div class='add'>+	 * Each new reference for every sub-allocation needs to increment call</div><div class='add'>+	 * counter because when we free each part the counter will be decremented.</div><div class='add'>+	 */</div><div class='add'>+	this_cpu_inc(tag-&gt;counters-&gt;calls);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void alloc_tag_add(union codetag_ref *ref, struct alloc_tag *tag, size_t bytes)</div><div class='add'>+{</div><div class='add'>+	if (likely(alloc_tag_ref_set(ref, tag)))</div><div class='add'>+		this_cpu_add(tag-&gt;counters-&gt;bytes, bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void alloc_tag_sub(union codetag_ref *ref, size_t bytes)</div><div class='add'>+{</div><div class='add'>+	struct alloc_tag *tag;</div><div class='add'>+</div><div class='add'>+	alloc_tag_sub_check(ref);</div><div class='add'>+	if (!ref || !ref-&gt;ct)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (is_codetag_empty(ref)) {</div><div class='add'>+		ref-&gt;ct = NULL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tag = ct_to_alloc_tag(ref-&gt;ct);</div><div class='add'>+</div><div class='add'>+	this_cpu_sub(tag-&gt;counters-&gt;bytes, bytes);</div><div class='add'>+	this_cpu_dec(tag-&gt;counters-&gt;calls);</div><div class='add'>+</div><div class='add'>+	ref-&gt;ct = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void alloc_tag_set_inaccurate(struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	tag-&gt;ct.flags |= CODETAG_FLAG_INACCURATE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool alloc_tag_is_inaccurate(struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	return !!(tag-&gt;ct.flags &amp; CODETAG_FLAG_INACCURATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define alloc_tag_record(p)	((p) = current-&gt;alloc_tag)</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MEM_ALLOC_PROFILING */</div><div class='add'>+</div><div class='add'>+#define DEFINE_ALLOC_TAG(_alloc_tag)</div><div class='add'>+static inline bool mem_alloc_profiling_enabled(void) { return false; }</div><div class='add'>+static inline void alloc_tag_add(union codetag_ref *ref, struct alloc_tag *tag,</div><div class='add'>+				 size_t bytes) {}</div><div class='add'>+static inline void alloc_tag_sub(union codetag_ref *ref, size_t bytes) {}</div><div class='add'>+static inline void alloc_tag_set_inaccurate(struct alloc_tag *tag) {}</div><div class='add'>+static inline bool alloc_tag_is_inaccurate(struct alloc_tag *tag) { return false; }</div><div class='add'>+#define alloc_tag_record(p)	do {} while (0)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MEM_ALLOC_PROFILING */</div><div class='add'>+</div><div class='add'>+#define alloc_hooks_tag(_tag, _do_alloc)				\</div><div class='add'>+({									\</div><div class='add'>+	typeof(_do_alloc) _res;						\</div><div class='add'>+	if (mem_alloc_profiling_enabled()) {				\</div><div class='add'>+		struct alloc_tag * __maybe_unused _old;			\</div><div class='add'>+		_old = alloc_tag_save(_tag);				\</div><div class='add'>+		_res = _do_alloc;					\</div><div class='add'>+		alloc_tag_restore(_tag, _old);				\</div><div class='add'>+	} else								\</div><div class='add'>+		_res = _do_alloc;					\</div><div class='add'>+	_res;								\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define alloc_hooks(_do_alloc)						\</div><div class='add'>+({									\</div><div class='add'>+	DEFINE_ALLOC_TAG(_alloc_tag);					\</div><div class='add'>+	alloc_hooks_tag(&amp;_alloc_tag, _do_alloc);			\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_ALLOC_TAG_H */</div><div class='head'>diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h<br/>index c60a6a14638c..9946276aff73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/amba/bus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/amba/bus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/amba/bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/amba/bus.h</a></div><div class='hunk'>@@ -105,24 +105,36 @@ enum amba_vendor {</div><div class='ctx'> 	AMBA_VENDOR_LSI = 0xb6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct bus_type amba_bustype;</div><div class='add'>+extern const struct bus_type amba_bustype;</div><div class='ctx'> </div><div class='ctx'> #define to_amba_device(d)	container_of_const(d, struct amba_device, dev)</div><div class='ctx'> </div><div class='ctx'> #define amba_get_drvdata(d)	dev_get_drvdata(&amp;d-&gt;dev)</div><div class='ctx'> #define amba_set_drvdata(d,p)	dev_set_drvdata(&amp;d-&gt;dev, p)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * use a macro to avoid include chaining to get THIS_MODULE</div><div class='add'>+ */</div><div class='add'>+#define amba_driver_register(drv) \</div><div class='add'>+	__amba_driver_register(drv, THIS_MODULE)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ARM_AMBA</div><div class='del'>-int amba_driver_register(struct amba_driver *);</div><div class='add'>+int __amba_driver_register(struct amba_driver *, struct module *);</div><div class='ctx'> void amba_driver_unregister(struct amba_driver *);</div><div class='add'>+bool dev_is_amba(const struct device *dev);</div><div class='ctx'> #else</div><div class='del'>-static inline int amba_driver_register(struct amba_driver *drv)</div><div class='add'>+static inline int __amba_driver_register(struct amba_driver *drv,</div><div class='add'>+					 struct module *owner)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> static inline void amba_driver_unregister(struct amba_driver *drv)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline bool dev_is_amba(const struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct amba_device *amba_device_alloc(const char *, resource_size_t, size_t);</div><div class='head'>diff --git a/include/linux/amd-iommu.h b/include/linux/amd-iommu.h<br/>index 2b90c48a6a87..edcee9f5335a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/amd-iommu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/amd-iommu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/amd-iommu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/amd-iommu.h</a></div><div class='hunk'>@@ -12,30 +12,16 @@</div><div class='ctx'> </div><div class='ctx'> struct amd_iommu;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is mainly used to communicate information back-and-forth</div><div class='del'>- * between SVM and IOMMU for setting up and tearing down posted</div><div class='del'>- * interrupt</div><div class='del'>- */</div><div class='del'>-struct amd_iommu_pi_data {</div><div class='del'>-	u32 ga_tag;</div><div class='del'>-	u32 prev_ga_tag;</div><div class='del'>-	u64 base;</div><div class='del'>-	bool is_guest_mode;</div><div class='del'>-	struct vcpu_data *vcpu_data;</div><div class='del'>-	void *ir_data;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_AMD_IOMMU</div><div class='ctx'> </div><div class='ctx'> struct task_struct;</div><div class='ctx'> struct pci_dev;</div><div class='ctx'> </div><div class='del'>-extern int amd_iommu_detect(void);</div><div class='add'>+extern void amd_iommu_detect(void);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_AMD_IOMMU */</div><div class='ctx'> </div><div class='del'>-static inline int amd_iommu_detect(void) { return -ENODEV; }</div><div class='add'>+static inline void amd_iommu_detect(void) { }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_AMD_IOMMU */</div><div class='ctx'> </div><div class='hunk'>@@ -44,10 +30,8 @@ static inline int amd_iommu_detect(void) { return -ENODEV; }</div><div class='ctx'> /* IOMMU AVIC Function */</div><div class='ctx'> extern int amd_iommu_register_ga_log_notifier(int (*notifier)(u32));</div><div class='ctx'> </div><div class='del'>-extern int</div><div class='del'>-amd_iommu_update_ga(int cpu, bool is_run, void *data);</div><div class='del'>-</div><div class='del'>-extern int amd_iommu_activate_guest_mode(void *data);</div><div class='add'>+extern int amd_iommu_update_ga(void *data, int cpu, bool ga_log_intr);</div><div class='add'>+extern int amd_iommu_activate_guest_mode(void *data, int cpu, bool ga_log_intr);</div><div class='ctx'> extern int amd_iommu_deactivate_guest_mode(void *data);</div><div class='ctx'> </div><div class='ctx'> #else /* defined(CONFIG_AMD_IOMMU) &amp;&amp; defined(CONFIG_IRQ_REMAP) */</div><div class='hunk'>@@ -58,13 +42,12 @@ amd_iommu_register_ga_log_notifier(int (*notifier)(u32))</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-amd_iommu_update_ga(int cpu, bool is_run, void *data)</div><div class='add'>+static inline int amd_iommu_update_ga(void *data, int cpu, bool ga_log_intr)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int amd_iommu_activate_guest_mode(void *data)</div><div class='add'>+static inline int amd_iommu_activate_guest_mode(void *data, int cpu, bool ga_log_intr)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -87,8 +70,10 @@ struct amd_iommu *get_amd_iommu(unsigned int idx);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_AMD_SEV</div><div class='ctx'> int amd_iommu_snp_disable(void);</div><div class='add'>+extern bool amd_iommu_sev_tio_supported(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline int amd_iommu_snp_disable(void) { return 0; }</div><div class='add'>+static inline bool amd_iommu_sev_tio_supported(void) { return false; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_X86_AMD_IOMMU_H */</div><div class='head'>diff --git a/include/linux/amd-pmf-io.h b/include/linux/amd-pmf-io.h<br/>index b4f818205216..6fa510f419c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/amd-pmf-io.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/amd-pmf-io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/amd-pmf-io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/amd-pmf-io.h</a></div><div class='hunk'>@@ -18,10 +18,12 @@</div><div class='ctx'>  * enum sfh_message_type - Query the SFH message type</div><div class='ctx'>  * @MT_HPD: Message ID to know the Human presence info from MP2 FW</div><div class='ctx'>  * @MT_ALS: Message ID to know the Ambient light info from MP2 FW</div><div class='add'>+ * @MT_SRA: Message ID to know the SRA data from MP2 FW</div><div class='ctx'>  */</div><div class='ctx'> enum sfh_message_type {</div><div class='ctx'> 	MT_HPD,</div><div class='ctx'> 	MT_ALS,</div><div class='add'>+	MT_SRA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -40,10 +42,23 @@ enum sfh_hpd_info {</div><div class='ctx'>  * struct amd_sfh_info - get HPD sensor info from MP2 FW</div><div class='ctx'>  * @ambient_light: Populates the ambient light information</div><div class='ctx'>  * @user_present: Populates the user presence information</div><div class='add'>+ * @platform_type: Operating modes (clamshell, flat, tent, etc.)</div><div class='add'>+ * @laptop_placement: Device states (ontable, onlap, outbag)</div><div class='ctx'>  */</div><div class='ctx'> struct amd_sfh_info {</div><div class='ctx'> 	u32 ambient_light;</div><div class='ctx'> 	u8 user_present;</div><div class='add'>+	u32 platform_type;</div><div class='add'>+	u32 laptop_placement;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum laptop_placement {</div><div class='add'>+	LP_UNKNOWN = 0,</div><div class='add'>+	ON_TABLE,</div><div class='add'>+	ON_LAP_MOTION,</div><div class='add'>+	IN_BAG,</div><div class='add'>+	OUT_OF_BAG,</div><div class='add'>+	LP_UNDEFINED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int amd_get_sfh_info(struct amd_sfh_info *sfh_info, enum sfh_message_type op);</div><div class='head'>diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h<br/>deleted file mode 100644<br/>index d21838835abd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/amd-pstate.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/amd-pstate.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * linux/include/linux/amd-pstate.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2022 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Meng Li &lt;li.meng@amd.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_AMD_PSTATE_H</div><div class='del'>-#define _LINUX_AMD_PSTATE_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pm_qos.h&gt;</div><div class='del'>-</div><div class='del'>-#define AMD_CPPC_EPP_PERFORMANCE		0x00</div><div class='del'>-#define AMD_CPPC_EPP_BALANCE_PERFORMANCE	0x80</div><div class='del'>-#define AMD_CPPC_EPP_BALANCE_POWERSAVE		0xBF</div><div class='del'>-#define AMD_CPPC_EPP_POWERSAVE			0xFF</div><div class='del'>-</div><div class='del'>-/*********************************************************************</div><div class='del'>- *                        AMD P-state INTERFACE                       *</div><div class='del'>- *********************************************************************/</div><div class='del'>-/**</div><div class='del'>- * struct  amd_aperf_mperf</div><div class='del'>- * @aperf: actual performance frequency clock count</div><div class='del'>- * @mperf: maximum performance frequency clock count</div><div class='del'>- * @tsc:   time stamp counter</div><div class='del'>- */</div><div class='del'>-struct amd_aperf_mperf {</div><div class='del'>-	u64 aperf;</div><div class='del'>-	u64 mperf;</div><div class='del'>-	u64 tsc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct amd_cpudata - private CPU data for AMD P-State</div><div class='del'>- * @cpu: CPU number</div><div class='del'>- * @req: constraint request to apply</div><div class='del'>- * @cppc_req_cached: cached performance request hints</div><div class='del'>- * @highest_perf: the maximum performance an individual processor may reach,</div><div class='del'>- *		  assuming ideal conditions</div><div class='del'>- *		  For platforms that do not support the preferred core feature, the</div><div class='del'>- *		  highest_pef may be configured with 166 or 255, to avoid max frequency</div><div class='del'>- *		  calculated wrongly. we take the fixed value as the highest_perf.</div><div class='del'>- * @nominal_perf: the maximum sustained performance level of the processor,</div><div class='del'>- *		  assuming ideal operating conditions</div><div class='del'>- * @lowest_nonlinear_perf: the lowest performance level at which nonlinear power</div><div class='del'>- *			   savings are achieved</div><div class='del'>- * @lowest_perf: the absolute lowest performance level of the processor</div><div class='del'>- * @prefcore_ranking: the preferred core ranking, the higher value indicates a higher</div><div class='del'>- * 		  priority.</div><div class='del'>- * @max_freq: the frequency that mapped to highest_perf</div><div class='del'>- * @min_freq: the frequency that mapped to lowest_perf</div><div class='del'>- * @nominal_freq: the frequency that mapped to nominal_perf</div><div class='del'>- * @lowest_nonlinear_freq: the frequency that mapped to lowest_nonlinear_perf</div><div class='del'>- * @cur: Difference of Aperf/Mperf/tsc count between last and current sample</div><div class='del'>- * @prev: Last Aperf/Mperf/tsc count value read from register</div><div class='del'>- * @freq: current cpu frequency value</div><div class='del'>- * @boost_supported: check whether the Processor or SBIOS supports boost mode</div><div class='del'>- * @hw_prefcore: check whether HW supports preferred core featue.</div><div class='del'>- * 		  Only when hw_prefcore and early prefcore param are true,</div><div class='del'>- * 		  AMD P-State driver supports preferred core featue.</div><div class='del'>- * @epp_policy: Last saved policy used to set energy-performance preference</div><div class='del'>- * @epp_cached: Cached CPPC energy-performance preference value</div><div class='del'>- * @policy: Cpufreq policy value</div><div class='del'>- * @cppc_cap1_cached Cached MSR_AMD_CPPC_CAP1 register value</div><div class='del'>- *</div><div class='del'>- * The amd_cpudata is key private data for each CPU thread in AMD P-State, and</div><div class='del'>- * represents all the attributes and goals that AMD P-State requests at runtime.</div><div class='del'>- */</div><div class='del'>-struct amd_cpudata {</div><div class='del'>-	int	cpu;</div><div class='del'>-</div><div class='del'>-	struct	freq_qos_request req[2];</div><div class='del'>-	u64	cppc_req_cached;</div><div class='del'>-</div><div class='del'>-	u32	highest_perf;</div><div class='del'>-	u32	nominal_perf;</div><div class='del'>-	u32	lowest_nonlinear_perf;</div><div class='del'>-	u32	lowest_perf;</div><div class='del'>-	u32     prefcore_ranking;</div><div class='del'>-	u32     min_limit_perf;</div><div class='del'>-	u32     max_limit_perf;</div><div class='del'>-	u32     min_limit_freq;</div><div class='del'>-	u32     max_limit_freq;</div><div class='del'>-</div><div class='del'>-	u32	max_freq;</div><div class='del'>-	u32	min_freq;</div><div class='del'>-	u32	nominal_freq;</div><div class='del'>-	u32	lowest_nonlinear_freq;</div><div class='del'>-</div><div class='del'>-	struct amd_aperf_mperf cur;</div><div class='del'>-	struct amd_aperf_mperf prev;</div><div class='del'>-</div><div class='del'>-	u64	freq;</div><div class='del'>-	bool	boost_supported;</div><div class='del'>-	bool	hw_prefcore;</div><div class='del'>-</div><div class='del'>-	/* EPP feature related attributes*/</div><div class='del'>-	s16	epp_policy;</div><div class='del'>-	s16	epp_cached;</div><div class='del'>-	u32	policy;</div><div class='del'>-	u64	cppc_cap1_cached;</div><div class='del'>-	bool	suspended;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * enum amd_pstate_mode - driver working mode of amd pstate</div><div class='del'>- */</div><div class='del'>-enum amd_pstate_mode {</div><div class='del'>-	AMD_PSTATE_UNDEFINED = 0,</div><div class='del'>-	AMD_PSTATE_DISABLE,</div><div class='del'>-	AMD_PSTATE_PASSIVE,</div><div class='del'>-	AMD_PSTATE_ACTIVE,</div><div class='del'>-	AMD_PSTATE_GUIDED,</div><div class='del'>-	AMD_PSTATE_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char * const amd_pstate_mode_string[] = {</div><div class='del'>-	[AMD_PSTATE_UNDEFINED]   = "undefined",</div><div class='del'>-	[AMD_PSTATE_DISABLE]     = "disable",</div><div class='del'>-	[AMD_PSTATE_PASSIVE]     = "passive",</div><div class='del'>-	[AMD_PSTATE_ACTIVE]      = "active",</div><div class='del'>-	[AMD_PSTATE_GUIDED]      = "guided",</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-#endif /* _LINUX_AMD_PSTATE_H */</div><div class='head'>diff --git a/include/linux/annotate.h b/include/linux/annotate.h<br/>new file mode 100644<br/>index 000000000000..2f1599c9e573<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/annotate.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/annotate.h</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_ANNOTATE_H</div><div class='add'>+#define _LINUX_ANNOTATE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/objtool_types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OBJTOOL</div><div class='add'>+</div><div class='add'>+#define __ASM_ANNOTATE(section, label, type)				\</div><div class='add'>+	.pushsection section, "M", @progbits, 8;			\</div><div class='add'>+	.long label - ., type;						\</div><div class='add'>+	.popsection</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+#define ASM_ANNOTATE_LABEL(label, type)					\</div><div class='add'>+	__stringify(__ASM_ANNOTATE(.discard.annotate_insn, label, type))</div><div class='add'>+</div><div class='add'>+#define ASM_ANNOTATE(type)						\</div><div class='add'>+	"911: "								\</div><div class='add'>+	__stringify(__ASM_ANNOTATE(.discard.annotate_insn, 911b, type))</div><div class='add'>+</div><div class='add'>+#define ASM_ANNOTATE_DATA(type)						\</div><div class='add'>+	"912: "								\</div><div class='add'>+	__stringify(__ASM_ANNOTATE(.discard.annotate_data, 912b, type))</div><div class='add'>+</div><div class='add'>+#else /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+.macro ANNOTATE type</div><div class='add'>+.Lhere_\@:</div><div class='add'>+	__ASM_ANNOTATE(.discard.annotate_insn, .Lhere_\@, \type)</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+.macro ANNOTATE_DATA type</div><div class='add'>+.Lhere_\@:</div><div class='add'>+	__ASM_ANNOTATE(.discard.annotate_data, .Lhere_\@, \type)</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_OBJTOOL */</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+#define ASM_ANNOTATE_LABEL(label, type) ""</div><div class='add'>+#define ASM_ANNOTATE(type)</div><div class='add'>+#define ASM_ANNOTATE_DATA(type)</div><div class='add'>+#else /* __ASSEMBLY__ */</div><div class='add'>+.macro ANNOTATE type</div><div class='add'>+.endm</div><div class='add'>+.macro ANNOTATE_DATA type</div><div class='add'>+.endm</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+#endif /* !CONFIG_OBJTOOL */</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Annotate away the various 'relocation to !ENDBR` complaints; knowing that</div><div class='add'>+ * these relocations will never be used for indirect calls.</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_NOENDBR		ASM_ANNOTATE(ANNOTYPE_NOENDBR)</div><div class='add'>+#define ANNOTATE_NOENDBR_SYM(sym)	asm(ASM_ANNOTATE_LABEL(sym, ANNOTYPE_NOENDBR))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This should be used immediately before an indirect jump/call. It tells</div><div class='add'>+ * objtool the subsequent indirect jump/call is vouched safe for retpoline</div><div class='add'>+ * builds.</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_RETPOLINE_SAFE		ASM_ANNOTATE(ANNOTYPE_RETPOLINE_SAFE)</div><div class='add'>+/*</div><div class='add'>+ * See linux/instrumentation.h</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_INSTR_BEGIN(label)	ASM_ANNOTATE_LABEL(label, ANNOTYPE_INSTR_BEGIN)</div><div class='add'>+#define ANNOTATE_INSTR_END(label)	ASM_ANNOTATE_LABEL(label, ANNOTYPE_INSTR_END)</div><div class='add'>+/*</div><div class='add'>+ * objtool annotation to ignore the alternatives and only consider the original</div><div class='add'>+ * instruction(s).</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_IGNORE_ALTERNATIVE	ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTS)</div><div class='add'>+/*</div><div class='add'>+ * This macro indicates that the following intra-function call is valid.</div><div class='add'>+ * Any non-annotated intra-function call will cause objtool to issue a warning.</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_INTRA_FUNCTION_CALL	ASM_ANNOTATE(ANNOTYPE_INTRA_FUNCTION_CALL)</div><div class='add'>+/*</div><div class='add'>+ * Use objtool to validate the entry requirement that all code paths do</div><div class='add'>+ * VALIDATE_UNRET_END before RET.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: The macro must be used at the beginning of a global symbol, otherwise</div><div class='add'>+ * it will be ignored.</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_UNRET_BEGIN		ASM_ANNOTATE(ANNOTYPE_UNRET_BEGIN)</div><div class='add'>+/*</div><div class='add'>+ * This should be used to refer to an instruction that is considered</div><div class='add'>+ * terminating, like a noreturn CALL or UD2 when we know they are not -- eg</div><div class='add'>+ * WARN using UD2.</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_REACHABLE(label)	ASM_ANNOTATE_LABEL(label, ANNOTYPE_REACHABLE)</div><div class='add'>+/*</div><div class='add'>+ * This should not be used; it annotates away CFI violations. There are a few</div><div class='add'>+ * valid use cases like kexec handover to the next kernel image, and there is</div><div class='add'>+ * no security concern there.</div><div class='add'>+ *</div><div class='add'>+ * There are also a few real issues annotated away, like EFI because we can't</div><div class='add'>+ * control the EFI code.</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_NOCFI_SYM(sym)		asm(ASM_ANNOTATE_LABEL(sym, ANNOTYPE_NOCFI))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Annotate a special section entry.  This emables livepatch module generation</div><div class='add'>+ * to find and extract individual special section entries as needed.</div><div class='add'>+ */</div><div class='add'>+#define ANNOTATE_DATA_SPECIAL		ASM_ANNOTATE_DATA(ANNOTYPE_DATA_SPECIAL)</div><div class='add'>+</div><div class='add'>+#else /* __ASSEMBLY__ */</div><div class='add'>+#define ANNOTATE_NOENDBR		ANNOTATE type=ANNOTYPE_NOENDBR</div><div class='add'>+#define ANNOTATE_RETPOLINE_SAFE		ANNOTATE type=ANNOTYPE_RETPOLINE_SAFE</div><div class='add'>+/*	ANNOTATE_INSTR_BEGIN		ANNOTATE type=ANNOTYPE_INSTR_BEGIN */</div><div class='add'>+/*	ANNOTATE_INSTR_END		ANNOTATE type=ANNOTYPE_INSTR_END */</div><div class='add'>+#define ANNOTATE_IGNORE_ALTERNATIVE	ANNOTATE type=ANNOTYPE_IGNORE_ALTS</div><div class='add'>+#define ANNOTATE_INTRA_FUNCTION_CALL	ANNOTATE type=ANNOTYPE_INTRA_FUNCTION_CALL</div><div class='add'>+#define ANNOTATE_UNRET_BEGIN		ANNOTATE type=ANNOTYPE_UNRET_BEGIN</div><div class='add'>+#define ANNOTATE_REACHABLE		ANNOTATE type=ANNOTYPE_REACHABLE</div><div class='add'>+#define ANNOTATE_NOCFI_SYM		ANNOTATE type=ANNOTYPE_NOCFI</div><div class='add'>+#define ANNOTATE_DATA_SPECIAL		ANNOTATE_DATA type=ANNOTYPE_DATA_SPECIAL</div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_ANNOTATE_H */</div><div class='head'>diff --git a/include/linux/anon_inodes.h b/include/linux/anon_inodes.h<br/>index 93a5f16d03f3..edef565c2a1a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/anon_inodes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/anon_inodes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/anon_inodes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/anon_inodes.h</a></div><div class='hunk'>@@ -9,12 +9,17 @@</div><div class='ctx'> #ifndef _LINUX_ANON_INODES_H</div><div class='ctx'> #define _LINUX_ANON_INODES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> struct file_operations;</div><div class='ctx'> struct inode;</div><div class='ctx'> </div><div class='ctx'> struct file *anon_inode_getfile(const char *name,</div><div class='ctx'> 				const struct file_operations *fops,</div><div class='ctx'> 				void *priv, int flags);</div><div class='add'>+struct file *anon_inode_getfile_fmode(const char *name,</div><div class='add'>+				const struct file_operations *fops,</div><div class='add'>+				void *priv, int flags, fmode_t f_mode);</div><div class='ctx'> struct file *anon_inode_create_getfile(const char *name,</div><div class='ctx'> 				       const struct file_operations *fops,</div><div class='ctx'> 				       void *priv, int flags,</div><div class='head'>diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h<br/>index a63d61ca55af..ebd7f8935f96 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/arch_topology.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arch_topology.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/arch_topology.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/arch_topology.h</a></div><div class='hunk'>@@ -11,21 +11,9 @@</div><div class='ctx'> void topology_normalize_cpu_scale(void);</div><div class='ctx'> int topology_update_cpu_topology(void);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ACPI_CPPC_LIB</div><div class='del'>-void topology_init_cpu_capacity_cppc(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> struct device_node;</div><div class='ctx'> bool topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu);</div><div class='ctx'> </div><div class='del'>-DECLARE_PER_CPU(unsigned long, cpu_scale);</div><div class='del'>-</div><div class='del'>-static inline unsigned long topology_get_cpu_scale(int cpu)</div><div class='del'>-{</div><div class='del'>-	return per_cpu(cpu_scale, cpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity);</div><div class='ctx'> </div><div class='ctx'> DECLARE_PER_CPU(unsigned long, capacity_freq_ref);</div><div class='ctx'> </div><div class='hunk'>@@ -49,6 +37,7 @@ enum scale_freq_source {</div><div class='ctx'> 	SCALE_FREQ_SOURCE_CPUFREQ = 0,</div><div class='ctx'> 	SCALE_FREQ_SOURCE_ARCH,</div><div class='ctx'> 	SCALE_FREQ_SOURCE_CPPC,</div><div class='add'>+	SCALE_FREQ_SOURCE_VIRT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct scale_freq_data {</div><div class='hunk'>@@ -60,14 +49,14 @@ void topology_scale_freq_tick(void);</div><div class='ctx'> void topology_set_scale_freq_source(struct scale_freq_data *data, const struct cpumask *cpus);</div><div class='ctx'> void topology_clear_scale_freq_source(enum scale_freq_source source, const struct cpumask *cpus);</div><div class='ctx'> </div><div class='del'>-DECLARE_PER_CPU(unsigned long, thermal_pressure);</div><div class='add'>+DECLARE_PER_CPU(unsigned long, hw_pressure);</div><div class='ctx'> </div><div class='del'>-static inline unsigned long topology_get_thermal_pressure(int cpu)</div><div class='add'>+static inline unsigned long topology_get_hw_pressure(int cpu)</div><div class='ctx'> {</div><div class='del'>-	return per_cpu(thermal_pressure, cpu);</div><div class='add'>+	return per_cpu(hw_pressure, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void topology_update_thermal_pressure(const struct cpumask *cpus,</div><div class='add'>+void topology_update_hw_pressure(const struct cpumask *cpus,</div><div class='ctx'> 				      unsigned long capped_freq);</div><div class='ctx'> </div><div class='ctx'> struct cpu_topology {</div><div class='hunk'>@@ -91,6 +80,11 @@ extern struct cpu_topology cpu_topology[NR_CPUS];</div><div class='ctx'> #define topology_sibling_cpumask(cpu)	(&amp;cpu_topology[cpu].thread_sibling)</div><div class='ctx'> #define topology_cluster_cpumask(cpu)	(&amp;cpu_topology[cpu].cluster_sibling)</div><div class='ctx'> #define topology_llc_cpumask(cpu)	(&amp;cpu_topology[cpu].llc_sibling)</div><div class='add'>+</div><div class='add'>+#ifndef arch_cpu_is_threaded</div><div class='add'>+#define arch_cpu_is_threaded()	(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void init_cpu_topology(void);</div><div class='ctx'> void store_cpu_topology(unsigned int cpuid);</div><div class='ctx'> const struct cpumask *cpu_coregroup_mask(int cpu);</div><div class='hunk'>@@ -100,6 +94,21 @@ void remove_cpu_topology(unsigned int cpuid);</div><div class='ctx'> void reset_cpu_topology(void);</div><div class='ctx'> int parse_acpi_topology(void);</div><div class='ctx'> void freq_inv_set_max_ratio(int cpu, u64 max_rate);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Architectures like ARM64 don't have reliable architectural way to get SMT</div><div class='add'>+ * information and depend on the firmware (ACPI/OF) report. Non-SMT core won't</div><div class='add'>+ * initialize thread_id so we can use this to detect the SMT implementation.</div><div class='add'>+ */</div><div class='add'>+static inline bool topology_core_has_smt(int cpu)</div><div class='add'>+{</div><div class='add'>+	return cpu_topology[cpu].thread_id != -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline bool topology_core_has_smt(int cpu) { return false; }</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_GENERIC_ARCH_TOPOLOGY */</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_ARCH_TOPOLOGY_H_ */</div><div class='head'>diff --git a/include/linux/args.h b/include/linux/args.h<br/>index 8ff60a54eb7d..2e8e65d975c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/args.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/args.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/args.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/args.h</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'>  * that as _n.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* This counts to 12. Any more, it will return 13th argument. */</div><div class='del'>-#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _n, X...) _n</div><div class='del'>-#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)</div><div class='add'>+/* This counts to 15. Any more, it will return 16th argument. */</div><div class='add'>+#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _n, X...) _n</div><div class='add'>+#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)</div><div class='ctx'> </div><div class='ctx'> /* Concatenate two parameters, but allow them to be expanded beforehand. */</div><div class='ctx'> #define __CONCAT(a, b) a ## b</div><div class='head'>diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h<br/>index 083f85653716..50b47eba7d01 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/arm-smccc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arm-smccc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/arm-smccc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/arm-smccc.h</a></div><div class='hunk'>@@ -7,6 +7,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/args.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #include &lt;uapi/linux/const.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -107,14 +112,81 @@</div><div class='ctx'> 			   ARM_SMCCC_FUNC_QUERY_CALL_UID)</div><div class='ctx'> </div><div class='ctx'> /* KVM UID value: 28b46fb6-2ec5-11e9-a9ca-4b564d003a74 */</div><div class='del'>-#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0	0xb66fb428U</div><div class='del'>-#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1	0xe911c52eU</div><div class='del'>-#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2	0x564bcaa9U</div><div class='del'>-#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3	0x743a004dU</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_UID_KVM UUID_INIT(\</div><div class='add'>+	0x28b46fb6, 0x2ec5, 0x11e9, \</div><div class='add'>+	0xa9, 0xca, 0x4b, 0x56, \</div><div class='add'>+	0x4d, 0x00, 0x3a, 0x74)</div><div class='ctx'> </div><div class='ctx'> /* KVM "vendor specific" services */</div><div class='ctx'> #define ARM_SMCCC_KVM_FUNC_FEATURES		0</div><div class='ctx'> #define ARM_SMCCC_KVM_FUNC_PTP			1</div><div class='add'>+/* Start of pKVM hypercall range */</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_HYP_MEMINFO		2</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_MEM_SHARE		3</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_MEM_UNSHARE		4</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_5		5</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_6		6</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_MMIO_GUARD		7</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_8		8</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_9		9</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_10		10</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_11		11</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_12		12</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_13		13</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_14		14</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_15		15</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_16		16</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_17		17</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_18		18</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_19		19</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_20		20</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_21		21</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_22		22</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_23		23</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_24		24</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_25		25</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_26		26</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_27		27</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_28		28</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_29		29</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_30		30</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_31		31</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_32		32</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_33		33</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_34		34</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_35		35</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_36		36</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_37		37</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_38		38</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_39		39</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_40		40</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_41		41</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_42		42</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_43		43</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_44		44</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_45		45</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_46		46</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_47		47</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_48		48</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_49		49</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_50		50</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_51		51</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_52		52</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_53		53</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_54		54</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_55		55</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_56		56</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_57		57</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_58		58</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_59		59</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_60		60</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_61		61</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_62		62</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_PKVM_RESV_63		63</div><div class='add'>+/* End of pKVM hypercall range */</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_DISCOVER_IMPL_VER	64</div><div class='add'>+#define ARM_SMCCC_KVM_FUNC_DISCOVER_IMPL_CPUS	65</div><div class='add'>+</div><div class='ctx'> #define ARM_SMCCC_KVM_FUNC_FEATURES_2		127</div><div class='ctx'> #define ARM_SMCCC_KVM_NUM_FUNCS			128</div><div class='ctx'> </div><div class='hunk'>@@ -137,6 +209,42 @@</div><div class='ctx'> 			   ARM_SMCCC_OWNER_VENDOR_HYP,			\</div><div class='ctx'> 			   ARM_SMCCC_KVM_FUNC_PTP)</div><div class='ctx'> </div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_KVM_HYP_MEMINFO_FUNC_ID			\</div><div class='add'>+	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,				\</div><div class='add'>+			   ARM_SMCCC_SMC_64,				\</div><div class='add'>+			   ARM_SMCCC_OWNER_VENDOR_HYP,			\</div><div class='add'>+			   ARM_SMCCC_KVM_FUNC_HYP_MEMINFO)</div><div class='add'>+</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_KVM_MEM_SHARE_FUNC_ID			\</div><div class='add'>+	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,				\</div><div class='add'>+			   ARM_SMCCC_SMC_64,				\</div><div class='add'>+			   ARM_SMCCC_OWNER_VENDOR_HYP,			\</div><div class='add'>+			   ARM_SMCCC_KVM_FUNC_MEM_SHARE)</div><div class='add'>+</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_KVM_MEM_UNSHARE_FUNC_ID			\</div><div class='add'>+	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,				\</div><div class='add'>+			   ARM_SMCCC_SMC_64,				\</div><div class='add'>+			   ARM_SMCCC_OWNER_VENDOR_HYP,			\</div><div class='add'>+			   ARM_SMCCC_KVM_FUNC_MEM_UNSHARE)</div><div class='add'>+</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_KVM_MMIO_GUARD_FUNC_ID			\</div><div class='add'>+	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,				\</div><div class='add'>+			   ARM_SMCCC_SMC_64,				\</div><div class='add'>+			   ARM_SMCCC_OWNER_VENDOR_HYP,			\</div><div class='add'>+			   ARM_SMCCC_KVM_FUNC_MMIO_GUARD)</div><div class='add'>+</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_KVM_DISCOVER_IMPL_VER_FUNC_ID		\</div><div class='add'>+	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,				\</div><div class='add'>+			   ARM_SMCCC_SMC_64,				\</div><div class='add'>+			   ARM_SMCCC_OWNER_VENDOR_HYP,			\</div><div class='add'>+			   ARM_SMCCC_KVM_FUNC_DISCOVER_IMPL_VER)</div><div class='add'>+</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_KVM_DISCOVER_IMPL_CPUS_FUNC_ID		\</div><div class='add'>+	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,				\</div><div class='add'>+			   ARM_SMCCC_SMC_64,				\</div><div class='add'>+			   ARM_SMCCC_OWNER_VENDOR_HYP,			\</div><div class='add'>+			   ARM_SMCCC_KVM_FUNC_DISCOVER_IMPL_CPUS)</div><div class='add'>+</div><div class='ctx'> /* ptp_kvm counter type ID */</div><div class='ctx'> #define KVM_PTP_VIRT_COUNTER			0</div><div class='ctx'> #define KVM_PTP_PHYS_COUNTER			1</div><div class='hunk'>@@ -227,8 +335,6 @@ u32 arm_smccc_get_version(void);</div><div class='ctx'> </div><div class='ctx'> void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit);</div><div class='ctx'> </div><div class='del'>-extern u64 smccc_has_sve_hint;</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * arm_smccc_get_soc_id_version()</div><div class='ctx'>  *</div><div class='hunk'>@@ -247,6 +353,57 @@ s32 arm_smccc_get_soc_id_version(void);</div><div class='ctx'>  */</div><div class='ctx'> s32 arm_smccc_get_soc_id_revision(void);</div><div class='ctx'> </div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns whether a specific hypervisor UUID is advertised for the</div><div class='add'>+ * Vendor Specific Hypervisor Service range.</div><div class='add'>+ */</div><div class='add'>+bool arm_smccc_hypervisor_has_uuid(const uuid_t *uuid);</div><div class='add'>+</div><div class='add'>+static inline uuid_t smccc_res_to_uuid(u32 r0, u32 r1, u32 r2, u32 r3)</div><div class='add'>+{</div><div class='add'>+	uuid_t uuid = {</div><div class='add'>+		.b = {</div><div class='add'>+			[0]  = (r0 &gt;&gt; 0)  &amp; 0xff,</div><div class='add'>+			[1]  = (r0 &gt;&gt; 8)  &amp; 0xff,</div><div class='add'>+			[2]  = (r0 &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+			[3]  = (r0 &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+</div><div class='add'>+			[4]  = (r1 &gt;&gt; 0)  &amp; 0xff,</div><div class='add'>+			[5]  = (r1 &gt;&gt; 8)  &amp; 0xff,</div><div class='add'>+			[6]  = (r1 &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+			[7]  = (r1 &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+</div><div class='add'>+			[8]  = (r2 &gt;&gt; 0)  &amp; 0xff,</div><div class='add'>+			[9]  = (r2 &gt;&gt; 8)  &amp; 0xff,</div><div class='add'>+			[10] = (r2 &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+			[11] = (r2 &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+</div><div class='add'>+			[12] = (r3 &gt;&gt; 0)  &amp; 0xff,</div><div class='add'>+			[13] = (r3 &gt;&gt; 8)  &amp; 0xff,</div><div class='add'>+			[14] = (r3 &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+			[15] = (r3 &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return uuid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 smccc_uuid_to_reg(const uuid_t *uuid, int reg)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	val |= (u32)(uuid-&gt;b[4 * reg + 0] &lt;&lt; 0);</div><div class='add'>+	val |= (u32)(uuid-&gt;b[4 * reg + 1] &lt;&lt; 8);</div><div class='add'>+	val |= (u32)(uuid-&gt;b[4 * reg + 2] &lt;&lt; 16);</div><div class='add'>+	val |= (u32)(uuid-&gt;b[4 * reg + 3] &lt;&lt; 24);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* !__ASSEMBLY__ */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct arm_smccc_res - Result from SMC/HVC call</div><div class='ctx'>  * @a0-a3 result values from registers 0 to 3</div><div class='hunk'>@@ -327,15 +484,6 @@ struct arm_smccc_quirk {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __arm_smccc_sve_check() - Set the SVE hint bit when doing SMC calls</div><div class='del'>- *</div><div class='del'>- * Sets the SMCCC hint bit to indicate if there is live state in the SVE</div><div class='del'>- * registers, this modifies x0 in place and should never be called from C</div><div class='del'>- * code.</div><div class='del'>- */</div><div class='del'>-asmlinkage unsigned long __arm_smccc_sve_check(unsigned long x0);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * __arm_smccc_smc() - make SMC calls</div><div class='ctx'>  * @a0-a7: arguments passed in registers 0 to 7</div><div class='ctx'>  * @res: result values from registers 0 to 3</div><div class='hunk'>@@ -402,20 +550,6 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* nVHE hypervisor doesn't have a current thread so needs separate checks */</div><div class='del'>-#if defined(CONFIG_ARM64_SVE) &amp;&amp; !defined(__KVM_NVHE_HYPERVISOR__)</div><div class='del'>-</div><div class='del'>-#define SMCCC_SVE_CHECK ALTERNATIVE("nop \n",  "bl __arm_smccc_sve_check \n", \</div><div class='del'>-				    ARM64_SVE)</div><div class='del'>-#define smccc_sve_clobbers "x16", "x30", "cc",</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define SMCCC_SVE_CHECK</div><div class='del'>-#define smccc_sve_clobbers</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define __constraint_read_2	"r" (arg0)</div><div class='ctx'> #define __constraint_read_3	__constraint_read_2, "r" (arg1)</div><div class='ctx'> #define __constraint_read_4	__constraint_read_3, "r" (arg2)</div><div class='hunk'>@@ -486,12 +620,11 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,</div><div class='ctx'> 		register unsigned long r3 asm("r3"); 			\</div><div class='ctx'> 		CONCATENATE(__declare_arg_,				\</div><div class='ctx'> 			    COUNT_ARGS(__VA_ARGS__))(__VA_ARGS__);	\</div><div class='del'>-		asm volatile(SMCCC_SVE_CHECK				\</div><div class='del'>-			     inst "\n" :				\</div><div class='add'>+		asm volatile(inst "\n" :				\</div><div class='ctx'> 			     "=r" (r0), "=r" (r1), "=r" (r2), "=r" (r3)	\</div><div class='ctx'> 			     : CONCATENATE(__constraint_read_,		\</div><div class='ctx'> 					   COUNT_ARGS(__VA_ARGS__))	\</div><div class='del'>-			     : smccc_sve_clobbers "memory");		\</div><div class='add'>+			     : "memory");				\</div><div class='ctx'> 		if (___res)						\</div><div class='ctx'> 			*___res = (typeof(*___res)){r0, r1, r2, r3};	\</div><div class='ctx'> 	} while (0)</div><div class='hunk'>@@ -540,7 +673,7 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,</div><div class='ctx'> 		asm ("" :						\</div><div class='ctx'> 		     : CONCATENATE(__constraint_read_,			\</div><div class='ctx'> 				   COUNT_ARGS(__VA_ARGS__))		\</div><div class='del'>-		     : smccc_sve_clobbers "memory");			\</div><div class='add'>+		     : "memory");					\</div><div class='ctx'> 		if (___res)						\</div><div class='ctx'> 			___res-&gt;a0 = SMCCC_RET_NOT_SUPPORTED;		\</div><div class='ctx'> 	} while (0)</div><div class='hunk'>@@ -577,5 +710,45 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,</div><div class='ctx'> 		method;							\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARM64</div><div class='add'>+</div><div class='add'>+#define __fail_smccc_1_2(___res)					\</div><div class='add'>+	do {								\</div><div class='add'>+		if (___res)						\</div><div class='add'>+			___res-&gt;a0 = SMCCC_RET_NOT_SUPPORTED;		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * arm_smccc_1_2_invoke() - make an SMCCC v1.2 compliant call</div><div class='add'>+ *</div><div class='add'>+ * @args: SMC args are in the a0..a17 fields of the arm_smcc_1_2_regs structure</div><div class='add'>+ * @res: result values from registers 0 to 17</div><div class='add'>+ *</div><div class='add'>+ * This macro will make either an HVC call or an SMC call depending on the</div><div class='add'>+ * current SMCCC conduit. If no valid conduit is available then -1</div><div class='add'>+ * (SMCCC_RET_NOT_SUPPORTED) is returned in @res.a0 (if supplied).</div><div class='add'>+ *</div><div class='add'>+ * The return value also provides the conduit that was used.</div><div class='add'>+ */</div><div class='add'>+#define arm_smccc_1_2_invoke(args, res) ({				\</div><div class='add'>+		struct arm_smccc_1_2_regs *__args = args;		\</div><div class='add'>+		struct arm_smccc_1_2_regs *__res = res;			\</div><div class='add'>+		int method = arm_smccc_1_1_get_conduit();		\</div><div class='add'>+		switch (method) {					\</div><div class='add'>+		case SMCCC_CONDUIT_HVC:					\</div><div class='add'>+			arm_smccc_1_2_hvc(__args, __res);		\</div><div class='add'>+			break;						\</div><div class='add'>+		case SMCCC_CONDUIT_SMC:					\</div><div class='add'>+			arm_smccc_1_2_smc(__args, __res);		\</div><div class='add'>+			break;						\</div><div class='add'>+		default:						\</div><div class='add'>+			__fail_smccc_1_2(__res);			\</div><div class='add'>+			method = SMCCC_CONDUIT_NONE;			\</div><div class='add'>+			break;						\</div><div class='add'>+		}							\</div><div class='add'>+		method;							\</div><div class='add'>+	})</div><div class='add'>+#endif /*CONFIG_ARM64*/</div><div class='add'>+</div><div class='ctx'> #endif /*__ASSEMBLY__*/</div><div class='ctx'> #endif /*__LINUX_ARM_SMCCC_H*/</div><div class='head'>diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h<br/>index c906f666ff5d..81e603839c4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/arm_ffa.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arm_ffa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/arm_ffa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/arm_ffa.h</a></div><div class='hunk'>@@ -73,6 +73,11 @@</div><div class='ctx'> #define FFA_FN64_MEM_PERM_GET		FFA_SMC_64(0x88)</div><div class='ctx'> #define FFA_MEM_PERM_SET		FFA_SMC_32(0x89)</div><div class='ctx'> #define FFA_FN64_MEM_PERM_SET		FFA_SMC_64(0x89)</div><div class='add'>+#define FFA_CONSOLE_LOG			FFA_SMC_32(0x8A)</div><div class='add'>+#define FFA_PARTITION_INFO_GET_REGS	FFA_SMC_64(0x8B)</div><div class='add'>+#define FFA_EL3_INTR_HANDLE		FFA_SMC_32(0x8C)</div><div class='add'>+#define FFA_MSG_SEND_DIRECT_REQ2	FFA_SMC_64(0x8D)</div><div class='add'>+#define FFA_MSG_SEND_DIRECT_RESP2	FFA_SMC_64(0x8E)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * For some calls it is necessary to use SMC64 to pass or return 64-bit values.</div><div class='hunk'>@@ -107,6 +112,7 @@</div><div class='ctx'> 	 FIELD_PREP(FFA_MINOR_VERSION_MASK, (minor)))</div><div class='ctx'> #define FFA_VERSION_1_0		FFA_PACK_VERSION_INFO(1, 0)</div><div class='ctx'> #define FFA_VERSION_1_1		FFA_PACK_VERSION_INFO(1, 1)</div><div class='add'>+#define FFA_VERSION_1_2		FFA_PACK_VERSION_INFO(1, 2)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * FF-A specification mentions explicitly about '4K pages'. This should</div><div class='hunk'>@@ -122,10 +128,12 @@</div><div class='ctx'> #define FFA_FEAT_RXTX_MIN_SZ_4K		0</div><div class='ctx'> #define FFA_FEAT_RXTX_MIN_SZ_64K	1</div><div class='ctx'> #define FFA_FEAT_RXTX_MIN_SZ_16K	2</div><div class='add'>+#define FFA_FEAT_RXTX_MIN_SZ_MASK	GENMASK(1, 0)</div><div class='ctx'> </div><div class='ctx'> /* FFA Bus/Device/Driver related */</div><div class='ctx'> struct ffa_device {</div><div class='ctx'> 	u32 id;</div><div class='add'>+	u32 properties;</div><div class='ctx'> 	int vm_id;</div><div class='ctx'> 	bool mode_32bit;</div><div class='ctx'> 	uuid_t uuid;</div><div class='hunk'>@@ -148,7 +156,7 @@ struct ffa_driver {</div><div class='ctx'> 	struct device_driver driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_ffa_driver(d) container_of(d, struct ffa_driver, driver)</div><div class='add'>+#define to_ffa_driver(d) container_of_const(d, struct ffa_driver, driver)</div><div class='ctx'> </div><div class='ctx'> static inline void ffa_dev_set_drvdata(struct ffa_device *fdev, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -160,25 +168,31 @@ static inline void *ffa_dev_get_drvdata(struct ffa_device *fdev)</div><div class='ctx'> 	return dev_get_drvdata(&amp;fdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ffa_partition_info;</div><div class='add'>+</div><div class='ctx'> #if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT)</div><div class='del'>-struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,</div><div class='del'>-				       const struct ffa_ops *ops);</div><div class='add'>+struct ffa_device *</div><div class='add'>+ffa_device_register(const struct ffa_partition_info *part_info,</div><div class='add'>+		    const struct ffa_ops *ops);</div><div class='ctx'> void ffa_device_unregister(struct ffa_device *ffa_dev);</div><div class='ctx'> int ffa_driver_register(struct ffa_driver *driver, struct module *owner,</div><div class='ctx'> 			const char *mod_name);</div><div class='ctx'> void ffa_driver_unregister(struct ffa_driver *driver);</div><div class='add'>+void ffa_devices_unregister(void);</div><div class='ctx'> bool ffa_device_is_valid(struct ffa_device *ffa_dev);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-static inline</div><div class='del'>-struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,</div><div class='del'>-				       const struct ffa_ops *ops)</div><div class='add'>+static inline struct ffa_device *</div><div class='add'>+ffa_device_register(const struct ffa_partition_info *part_info,</div><div class='add'>+		    const struct ffa_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ffa_device_unregister(struct ffa_device *dev) {}</div><div class='ctx'> </div><div class='add'>+static inline void ffa_devices_unregister(void) {}</div><div class='add'>+</div><div class='ctx'> static inline int</div><div class='ctx'> ffa_driver_register(struct ffa_driver *driver, struct module *owner,</div><div class='ctx'> 		    const char *mod_name)</div><div class='hunk'>@@ -211,6 +225,9 @@ bool ffa_device_is_valid(struct ffa_device *ffa_dev) { return false; }</div><div class='ctx'> </div><div class='ctx'> extern const struct bus_type ffa_bus_type;</div><div class='ctx'> </div><div class='add'>+/* The FF-A 1.0 partition structure lacks the uuid[4] */</div><div class='add'>+#define FFA_1_0_PARTITON_INFO_SZ	(8)</div><div class='add'>+</div><div class='ctx'> /* FFA transport related */</div><div class='ctx'> struct ffa_partition_info {</div><div class='ctx'> 	u16 id;</div><div class='hunk'>@@ -221,12 +238,37 @@ struct ffa_partition_info {</div><div class='ctx'> #define FFA_PARTITION_DIRECT_SEND	BIT(1)</div><div class='ctx'> /* partition can send and receive indirect messages. */</div><div class='ctx'> #define FFA_PARTITION_INDIRECT_MSG	BIT(2)</div><div class='add'>+/* partition can receive notifications */</div><div class='add'>+#define FFA_PARTITION_NOTIFICATION_RECV	BIT(3)</div><div class='ctx'> /* partition runs in the AArch64 execution state. */</div><div class='ctx'> #define FFA_PARTITION_AARCH64_EXEC	BIT(8)</div><div class='add'>+/* partition supports receipt of direct request2 */</div><div class='add'>+#define FFA_PARTITION_DIRECT_REQ2_RECV	BIT(9)</div><div class='add'>+/* partition can send direct request2. */</div><div class='add'>+#define FFA_PARTITION_DIRECT_REQ2_SEND	BIT(10)</div><div class='ctx'> 	u32 properties;</div><div class='del'>-	u32 uuid[4];</div><div class='add'>+	uuid_t uuid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline</div><div class='add'>+bool ffa_partition_check_property(struct ffa_device *dev, u32 property)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;properties &amp; property;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ffa_partition_supports_notify_recv(dev)	\</div><div class='add'>+	ffa_partition_check_property(dev, FFA_PARTITION_NOTIFICATION_RECV)</div><div class='add'>+</div><div class='add'>+#define ffa_partition_supports_indirect_msg(dev)	\</div><div class='add'>+	ffa_partition_check_property(dev, FFA_PARTITION_INDIRECT_MSG)</div><div class='add'>+</div><div class='add'>+#define ffa_partition_supports_direct_recv(dev)	\</div><div class='add'>+	ffa_partition_check_property(dev, FFA_PARTITION_DIRECT_RECV)</div><div class='add'>+</div><div class='add'>+#define ffa_partition_supports_direct_req2_recv(dev)	\</div><div class='add'>+	(ffa_partition_check_property(dev, FFA_PARTITION_DIRECT_REQ2_RECV) &amp;&amp; \</div><div class='add'>+	 !dev-&gt;mode_32bit)</div><div class='add'>+</div><div class='ctx'> /* For use with FFA_MSG_SEND_DIRECT_{REQ,RESP} which pass data via registers */</div><div class='ctx'> struct ffa_send_direct_data {</div><div class='ctx'> 	unsigned long data0; /* w3/x3 */</div><div class='hunk'>@@ -236,6 +278,21 @@ struct ffa_send_direct_data {</div><div class='ctx'> 	unsigned long data4; /* w7/x7 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ffa_indirect_msg_hdr {</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 res0;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 send_recv_id;</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 res1;</div><div class='add'>+	uuid_t uuid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For use with FFA_MSG_SEND_DIRECT_{REQ,RESP}2 which pass data via registers */</div><div class='add'>+struct ffa_send_direct_data2 {</div><div class='add'>+	unsigned long data[14]; /* x4-x17 */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ffa_mem_region_addr_range {</div><div class='ctx'> 	/* The base IPA of the constituent memory region, aligned to 4 kiB */</div><div class='ctx'> 	u64 address;</div><div class='hunk'>@@ -281,6 +338,7 @@ struct ffa_mem_region_attributes {</div><div class='ctx'> 	 * an `struct ffa_mem_region_addr_range`.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32 composite_off;</div><div class='add'>+	u8 impdef_val[16];</div><div class='ctx'> 	u64 reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -360,15 +418,31 @@ struct ffa_mem_region {</div><div class='ctx'> #define CONSTITUENTS_OFFSET(x)	\</div><div class='ctx'> 	(offsetof(struct ffa_composite_mem_region, constituents[x]))</div><div class='ctx'> </div><div class='add'>+#define FFA_EMAD_HAS_IMPDEF_FIELD(version)	((version) &gt;= FFA_VERSION_1_2)</div><div class='add'>+#define FFA_MEM_REGION_HAS_EP_MEM_OFFSET(version) ((version) &gt; FFA_VERSION_1_0)</div><div class='add'>+</div><div class='add'>+static inline u32 ffa_emad_size_get(u32 ffa_version)</div><div class='add'>+{</div><div class='add'>+	u32 sz;</div><div class='add'>+	struct ffa_mem_region_attributes *ep_mem_access;</div><div class='add'>+</div><div class='add'>+	if (FFA_EMAD_HAS_IMPDEF_FIELD(ffa_version))</div><div class='add'>+		sz = sizeof(*ep_mem_access);</div><div class='add'>+	else</div><div class='add'>+		sz = sizeof(*ep_mem_access) - sizeof(ep_mem_access-&gt;impdef_val);</div><div class='add'>+</div><div class='add'>+	return sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32</div><div class='ctx'> ffa_mem_desc_offset(struct ffa_mem_region *buf, int count, u32 ffa_version)</div><div class='ctx'> {</div><div class='del'>-	u32 offset = count * sizeof(struct ffa_mem_region_attributes);</div><div class='add'>+	u32 offset = count * ffa_emad_size_get(ffa_version);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Earlier to v1.1, the endpoint memory descriptor array started at</div><div class='ctx'> 	 * offset 32(i.e. offset of ep_mem_offset in the current structure)</div><div class='ctx'> 	 */</div><div class='del'>-	if (ffa_version &lt;= FFA_VERSION_1_0)</div><div class='add'>+	if (!FFA_MEM_REGION_HAS_EP_MEM_OFFSET(ffa_version))</div><div class='ctx'> 		offset += offsetof(struct ffa_mem_region, ep_mem_offset);</div><div class='ctx'> 	else</div><div class='ctx'> 		offset += sizeof(struct ffa_mem_region);</div><div class='hunk'>@@ -396,6 +470,9 @@ struct ffa_msg_ops {</div><div class='ctx'> 	void (*mode_32bit_set)(struct ffa_device *dev);</div><div class='ctx'> 	int (*sync_send_receive)(struct ffa_device *dev,</div><div class='ctx'> 				 struct ffa_send_direct_data *data);</div><div class='add'>+	int (*indirect_send)(struct ffa_device *dev, void *buf, size_t sz);</div><div class='add'>+	int (*sync_send_receive2)(struct ffa_device *dev,</div><div class='add'>+				  struct ffa_send_direct_data2 *data);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ffa_mem_ops {</div><div class='hunk'>@@ -410,6 +487,7 @@ struct ffa_cpu_ops {</div><div class='ctx'> </div><div class='ctx'> typedef void (*ffa_sched_recv_cb)(u16 vcpu, bool is_per_vcpu, void *cb_data);</div><div class='ctx'> typedef void (*ffa_notifier_cb)(int notify_id, void *cb_data);</div><div class='add'>+typedef void (*ffa_fwk_notifier_cb)(int notify_id, void *cb_data, void *buf);</div><div class='ctx'> </div><div class='ctx'> struct ffa_notifier_ops {</div><div class='ctx'> 	int (*sched_recv_cb_register)(struct ffa_device *dev,</div><div class='hunk'>@@ -418,6 +496,10 @@ struct ffa_notifier_ops {</div><div class='ctx'> 	int (*notify_request)(struct ffa_device *dev, bool per_vcpu,</div><div class='ctx'> 			      ffa_notifier_cb cb, void *cb_data, int notify_id);</div><div class='ctx'> 	int (*notify_relinquish)(struct ffa_device *dev, int notify_id);</div><div class='add'>+	int (*fwk_notify_request)(struct ffa_device *dev,</div><div class='add'>+				  ffa_fwk_notifier_cb cb, void *cb_data,</div><div class='add'>+				  int notify_id);</div><div class='add'>+	int (*fwk_notify_relinquish)(struct ffa_device *dev, int notify_id);</div><div class='ctx'> 	int (*notify_send)(struct ffa_device *dev, int notify_id, bool per_vcpu,</div><div class='ctx'> 			   u16 vcpu);</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/arm_mpam.h b/include/linux/arm_mpam.h<br/>new file mode 100644<br/>index 000000000000..7f00c5285a32<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/arm_mpam.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/arm_mpam.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) 2025 Arm Ltd. */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_ARM_MPAM_H</div><div class='add'>+#define __LINUX_ARM_MPAM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct mpam_msc;</div><div class='add'>+</div><div class='add'>+enum mpam_msc_iface {</div><div class='add'>+	MPAM_IFACE_MMIO,	/* a real MPAM MSC */</div><div class='add'>+	MPAM_IFACE_PCC,		/* a fake MPAM MSC */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mpam_class_types {</div><div class='add'>+	MPAM_CLASS_CACHE,	/* Caches, e.g. L2, L3 */</div><div class='add'>+	MPAM_CLASS_MEMORY,	/* Main memory */</div><div class='add'>+	MPAM_CLASS_UNKNOWN,	/* Everything else, e.g. SMMU */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MPAM_CLASS_ID_DEFAULT	255</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI_MPAM</div><div class='add'>+int acpi_mpam_parse_resources(struct mpam_msc *msc,</div><div class='add'>+			      struct acpi_mpam_msc_node *tbl_msc);</div><div class='add'>+</div><div class='add'>+int acpi_mpam_count_msc(void);</div><div class='add'>+#else</div><div class='add'>+static inline int acpi_mpam_parse_resources(struct mpam_msc *msc,</div><div class='add'>+					    struct acpi_mpam_msc_node *tbl_msc)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int acpi_mpam_count_msc(void) { return -EINVAL; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARM64_MPAM_DRIVER</div><div class='add'>+int mpam_ris_create(struct mpam_msc *msc, u8 ris_idx,</div><div class='add'>+		    enum mpam_class_types type, u8 class_id, int component_id);</div><div class='add'>+#else</div><div class='add'>+static inline int mpam_ris_create(struct mpam_msc *msc, u8 ris_idx,</div><div class='add'>+				  enum mpam_class_types type, u8 class_id,</div><div class='add'>+				  int component_id)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mpam_register_requestor() - Register a requestor with the MPAM driver</div><div class='add'>+ * @partid_max:		The maximum PARTID value the requestor can generate.</div><div class='add'>+ * @pmg_max:		The maximum PMG value the requestor can generate.</div><div class='add'>+ *</div><div class='add'>+ * Registers a requestor with the MPAM driver to ensure the chosen system-wide</div><div class='add'>+ * minimum PARTID and PMG values will allow the requestors features to be used.</div><div class='add'>+ *</div><div class='add'>+ * Returns an error if the registration is too late, and a larger PARTID/PMG</div><div class='add'>+ * value has been advertised to user-space. In this case the requestor should</div><div class='add'>+ * not use its MPAM features. Returns 0 on success.</div><div class='add'>+ */</div><div class='add'>+int mpam_register_requestor(u16 partid_max, u8 pmg_max);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_ARM_MPAM_H */</div><div class='head'>diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h<br/>index 255701e1251b..f652a5028b59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/arm_sdei.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/arm_sdei.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/arm_sdei.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/arm_sdei.h</a></div><div class='hunk'>@@ -46,12 +46,12 @@ int sdei_unregister_ghes(struct ghes *ghes);</div><div class='ctx'> /* For use by arch code when CPU hotplug notifiers are not appropriate. */</div><div class='ctx'> int sdei_mask_local_cpu(void);</div><div class='ctx'> int sdei_unmask_local_cpu(void);</div><div class='del'>-void __init sdei_init(void);</div><div class='add'>+void __init acpi_sdei_init(void);</div><div class='ctx'> void sdei_handler_abort(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline int sdei_mask_local_cpu(void) { return 0; }</div><div class='ctx'> static inline int sdei_unmask_local_cpu(void) { return 0; }</div><div class='del'>-static inline void sdei_init(void) { }</div><div class='add'>+static inline void acpi_sdei_init(void) { }</div><div class='ctx'> static inline void sdei_handler_abort(void) { }</div><div class='ctx'> #endif /* CONFIG_ARM_SDE_INTERFACE */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/asn1_decoder.h b/include/linux/asn1_decoder.h<br/>index 83f9c6e1e5e9..b41bce82a191 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/asn1_decoder.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/asn1_decoder.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/asn1_decoder.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/asn1_decoder.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #define _LINUX_ASN1_DECODER_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/asn1.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct asn1_decoder;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/asn1_encoder.h b/include/linux/asn1_encoder.h<br/>index 08cd0c2ad34f..d17484dffb74 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/asn1_encoder.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/asn1_encoder.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/asn1_encoder.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/asn1_encoder.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/asn1.h&gt;</div><div class='ctx'> #include &lt;linux/asn1_ber_bytecode.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define asn1_oid_len(oid) (sizeof(oid)/sizeof(u32))</div><div class='ctx'> unsigned char *</div><div class='head'>diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h<br/>index 5cc73d7e5b52..1ca9f9e05f4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/async_tx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/async_tx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/async_tx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/async_tx.h</a></div><div class='hunk'>@@ -168,11 +168,6 @@ async_xor_offs(struct page *dest, unsigned int offset,</div><div class='ctx'> 		int src_cnt, size_t len, struct async_submit_ctl *submit);</div><div class='ctx'> </div><div class='ctx'> struct dma_async_tx_descriptor *</div><div class='del'>-async_xor_val(struct page *dest, struct page **src_list, unsigned int offset,</div><div class='del'>-	      int src_cnt, size_t len, enum sum_check_flags *result,</div><div class='del'>-	      struct async_submit_ctl *submit);</div><div class='del'>-</div><div class='del'>-struct dma_async_tx_descriptor *</div><div class='ctx'> async_xor_val_offs(struct page *dest, unsigned int offset,</div><div class='ctx'> 		struct page **src_list, unsigned int *src_offset,</div><div class='ctx'> 		int src_cnt, size_t len, enum sum_check_flags *result,</div><div class='head'>diff --git a/include/linux/ata.h b/include/linux/ata.h<br/>index 792e10a09787..54b416e26995 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ata.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ata.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ata.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ata.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@ enum {</div><div class='ctx'> 	ATA_MAX_SECTORS_128	= 128,</div><div class='ctx'> 	ATA_MAX_SECTORS		= 256,</div><div class='ctx'> 	ATA_MAX_SECTORS_1024    = 1024,</div><div class='add'>+	ATA_MAX_SECTORS_8191    = 8191,</div><div class='ctx'> 	ATA_MAX_SECTORS_LBA48	= 65535,/* avoid count to be 0000h */</div><div class='ctx'> 	ATA_MAX_SECTORS_TAPE	= 65535,</div><div class='ctx'> 	ATA_MAX_TRIM_RNUM	= 64,	/* 512-byte payload / (6-byte LBA + 2-byte range per entry) */</div><div class='hunk'>@@ -566,6 +567,7 @@ struct ata_bmdma_prd {</div><div class='ctx'> #define ata_id_has_ncq(id)	((id)[ATA_ID_SATA_CAPABILITY] &amp; (1 &lt;&lt; 8))</div><div class='ctx'> #define ata_id_queue_depth(id)	(((id)[ATA_ID_QUEUE_DEPTH] &amp; 0x1f) + 1)</div><div class='ctx'> #define ata_id_removable(id)	((id)[ATA_ID_CONFIG] &amp; (1 &lt;&lt; 7))</div><div class='add'>+#define ata_id_is_locked(id)	(((id)[ATA_ID_DLF] &amp; 0x7) == 0x7)</div><div class='ctx'> #define ata_id_has_atapi_AN(id)	\</div><div class='ctx'> 	((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) &amp;&amp; \</div><div class='ctx'> 	  ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) &amp;&amp; \</div><div class='head'>diff --git a/include/linux/ath9k_platform.h b/include/linux/ath9k_platform.h<br/>deleted file mode 100644<br/>index 76860a461ed2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ath9k_platform.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ath9k_platform.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2008 Atheros Communications Inc.</div><div class='del'>- * Copyright (c) 2009 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- * Copyright (c) 2009 Imre Kaloz &lt;kaloz@openwrt.org&gt;</div><div class='del'>- *</div><div class='del'>- * Permission to use, copy, modify, and/or distribute this software for any</div><div class='del'>- * purpose with or without fee is hereby granted, provided that the above</div><div class='del'>- * copyright notice and this permission notice appear in all copies.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES</div><div class='del'>- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR</div><div class='del'>- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</div><div class='del'>- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF</div><div class='del'>- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_ATH9K_PLATFORM_H</div><div class='del'>-#define _LINUX_ATH9K_PLATFORM_H</div><div class='del'>-</div><div class='del'>-#define ATH9K_PLAT_EEP_MAX_WORDS	2048</div><div class='del'>-</div><div class='del'>-struct ath9k_platform_data {</div><div class='del'>-	const char *eeprom_name;</div><div class='del'>-</div><div class='del'>-	u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS];</div><div class='del'>-	u8 *macaddr;</div><div class='del'>-</div><div class='del'>-	int led_pin;</div><div class='del'>-	u32 gpio_mask;</div><div class='del'>-	u32 gpio_val;</div><div class='del'>-</div><div class='del'>-	u32 bt_active_pin;</div><div class='del'>-	u32 bt_priority_pin;</div><div class='del'>-	u32 wlan_active_pin;</div><div class='del'>-</div><div class='del'>-	bool endian_check;</div><div class='del'>-	bool is_clk_25mhz;</div><div class='del'>-	bool tx_gain_buffalo;</div><div class='del'>-	bool disable_2ghz;</div><div class='del'>-	bool disable_5ghz;</div><div class='del'>-	bool led_active_high;</div><div class='del'>-</div><div class='del'>-	int (*get_mac_revision)(void);</div><div class='del'>-	int (*external_reset)(void);</div><div class='del'>-</div><div class='del'>-	bool use_eeprom;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_ATH9K_PLATFORM_H */</div><div class='head'>diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h<br/>index 9b02961d65ee..70807c679f1a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/atmdev.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/atmdev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/atmdev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/atmdev.h</a></div><div class='hunk'>@@ -185,6 +185,7 @@ struct atmdev_ops { /* only send is required */</div><div class='ctx'> 	int (*compat_ioctl)(struct atm_dev *dev,unsigned int cmd,</div><div class='ctx'> 			    void __user *arg);</div><div class='ctx'> #endif</div><div class='add'>+	int (*pre_send)(struct atm_vcc *vcc, struct sk_buff *skb);</div><div class='ctx'> 	int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);</div><div class='ctx'> 	int (*send_bh)(struct atm_vcc *vcc, struct sk_buff *skb);</div><div class='ctx'> 	int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags);</div><div class='hunk'>@@ -249,6 +250,12 @@ static inline void atm_account_tx(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='ctx'> 	ATM_SKB(skb)-&gt;atm_options = vcc-&gt;atm_options;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void atm_return_tx(struct atm_vcc *vcc, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(refcount_sub_and_test(ATM_SKB(skb)-&gt;acct_truesize,</div><div class='add'>+					   &amp;sk_atm(vcc)-&gt;sk_wmem_alloc));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void atm_force_charge(struct atm_vcc *vcc,int truesize)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_add(truesize, &amp;sk_atm(vcc)-&gt;sk_rmem_alloc);</div><div class='head'>diff --git a/include/linux/atomic/atomic-arch-fallback.h b/include/linux/atomic/atomic-arch-fallback.h<br/>index 956bcba5dbf2..2f9d36b72bd8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/atomic/atomic-arch-fallback.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/atomic/atomic-arch-fallback.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/atomic/atomic-arch-fallback.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/atomic/atomic-arch-fallback.h</a></div><div class='hunk'>@@ -2242,7 +2242,7 @@ raw_atomic_try_cmpxchg_relaxed(atomic_t *v, int *old, int new)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * raw_atomic_sub_and_test() - atomic subtract and test if zero with full ordering</div><div class='del'>- * @i: int value to add</div><div class='add'>+ * @i: int value to subtract</div><div class='ctx'>  * @v: pointer to atomic_t</div><div class='ctx'>  *</div><div class='ctx'>  * Atomically updates @v to (@v - @i) with full ordering.</div><div class='hunk'>@@ -4368,7 +4368,7 @@ raw_atomic64_try_cmpxchg_relaxed(atomic64_t *v, s64 *old, s64 new)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * raw_atomic64_sub_and_test() - atomic subtract and test if zero with full ordering</div><div class='del'>- * @i: s64 value to add</div><div class='add'>+ * @i: s64 value to subtract</div><div class='ctx'>  * @v: pointer to atomic64_t</div><div class='ctx'>  *</div><div class='ctx'>  * Atomically updates @v to (@v - @i) with full ordering.</div><div class='hunk'>@@ -4690,4 +4690,4 @@ raw_atomic64_dec_if_positive(atomic64_t *v)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_ATOMIC_FALLBACK_H */</div><div class='del'>-// 14850c0b0db20c62fdc78ccd1d42b98b88d76331</div><div class='add'>+// b565db590afeeff0d7c9485ccbca5bb6e155749f</div><div class='head'>diff --git a/include/linux/atomic/atomic-instrumented.h b/include/linux/atomic/atomic-instrumented.h<br/>index debd487fe971..37ab6314a9f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/atomic/atomic-instrumented.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/atomic/atomic-instrumented.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/atomic/atomic-instrumented.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/atomic/atomic-instrumented.h</a></div><div class='hunk'>@@ -1276,7 +1276,7 @@ atomic_try_cmpxchg(atomic_t *v, int *old, int new)</div><div class='ctx'> {</div><div class='ctx'> 	kcsan_mb();</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic_try_cmpxchg(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1298,7 +1298,7 @@ static __always_inline bool</div><div class='ctx'> atomic_try_cmpxchg_acquire(atomic_t *v, int *old, int new)</div><div class='ctx'> {</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic_try_cmpxchg_acquire(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1321,7 +1321,7 @@ atomic_try_cmpxchg_release(atomic_t *v, int *old, int new)</div><div class='ctx'> {</div><div class='ctx'> 	kcsan_release();</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic_try_cmpxchg_release(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1343,13 +1343,13 @@ static __always_inline bool</div><div class='ctx'> atomic_try_cmpxchg_relaxed(atomic_t *v, int *old, int new)</div><div class='ctx'> {</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic_try_cmpxchg_relaxed(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atomic_sub_and_test() - atomic subtract and test if zero with full ordering</div><div class='del'>- * @i: int value to add</div><div class='add'>+ * @i: int value to subtract</div><div class='ctx'>  * @v: pointer to atomic_t</div><div class='ctx'>  *</div><div class='ctx'>  * Atomically updates @v to (@v - @i) with full ordering.</div><div class='hunk'>@@ -2854,7 +2854,7 @@ atomic64_try_cmpxchg(atomic64_t *v, s64 *old, s64 new)</div><div class='ctx'> {</div><div class='ctx'> 	kcsan_mb();</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic64_try_cmpxchg(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2876,7 +2876,7 @@ static __always_inline bool</div><div class='ctx'> atomic64_try_cmpxchg_acquire(atomic64_t *v, s64 *old, s64 new)</div><div class='ctx'> {</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic64_try_cmpxchg_acquire(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2899,7 +2899,7 @@ atomic64_try_cmpxchg_release(atomic64_t *v, s64 *old, s64 new)</div><div class='ctx'> {</div><div class='ctx'> 	kcsan_release();</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic64_try_cmpxchg_release(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2921,13 +2921,13 @@ static __always_inline bool</div><div class='ctx'> atomic64_try_cmpxchg_relaxed(atomic64_t *v, s64 *old, s64 new)</div><div class='ctx'> {</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic64_try_cmpxchg_relaxed(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atomic64_sub_and_test() - atomic subtract and test if zero with full ordering</div><div class='del'>- * @i: s64 value to add</div><div class='add'>+ * @i: s64 value to subtract</div><div class='ctx'>  * @v: pointer to atomic64_t</div><div class='ctx'>  *</div><div class='ctx'>  * Atomically updates @v to (@v - @i) with full ordering.</div><div class='hunk'>@@ -4432,7 +4432,7 @@ atomic_long_try_cmpxchg(atomic_long_t *v, long *old, long new)</div><div class='ctx'> {</div><div class='ctx'> 	kcsan_mb();</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic_long_try_cmpxchg(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4454,7 +4454,7 @@ static __always_inline bool</div><div class='ctx'> atomic_long_try_cmpxchg_acquire(atomic_long_t *v, long *old, long new)</div><div class='ctx'> {</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic_long_try_cmpxchg_acquire(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4477,7 +4477,7 @@ atomic_long_try_cmpxchg_release(atomic_long_t *v, long *old, long new)</div><div class='ctx'> {</div><div class='ctx'> 	kcsan_release();</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic_long_try_cmpxchg_release(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4499,13 +4499,13 @@ static __always_inline bool</div><div class='ctx'> atomic_long_try_cmpxchg_relaxed(atomic_long_t *v, long *old, long new)</div><div class='ctx'> {</div><div class='ctx'> 	instrument_atomic_read_write(v, sizeof(*v));</div><div class='del'>-	instrument_atomic_read_write(old, sizeof(*old));</div><div class='add'>+	instrument_read_write(old, sizeof(*old));</div><div class='ctx'> 	return raw_atomic_long_try_cmpxchg_relaxed(v, old, new);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atomic_long_sub_and_test() - atomic subtract and test if zero with full ordering</div><div class='del'>- * @i: long value to add</div><div class='add'>+ * @i: long value to subtract</div><div class='ctx'>  * @v: pointer to atomic_long_t</div><div class='ctx'>  *</div><div class='ctx'>  * Atomically updates @v to (@v - @i) with full ordering.</div><div class='hunk'>@@ -5050,4 +5050,4 @@ atomic_long_dec_if_positive(atomic_long_t *v)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_ATOMIC_INSTRUMENTED_H */</div><div class='del'>-// ce5b65e0f1f8a276268b667194581d24bed219d4</div><div class='add'>+// f618ac667f868941a84ce0ab2242f1786e049ed4</div><div class='head'>diff --git a/include/linux/atomic/atomic-long.h b/include/linux/atomic/atomic-long.h<br/>index 3ef844b3ab8a..f86b29d90877 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/atomic/atomic-long.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/atomic/atomic-long.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/atomic/atomic-long.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/atomic/atomic-long.h</a></div><div class='hunk'>@@ -1535,7 +1535,7 @@ raw_atomic_long_try_cmpxchg_relaxed(atomic_long_t *v, long *old, long new)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * raw_atomic_long_sub_and_test() - atomic subtract and test if zero with full ordering</div><div class='del'>- * @i: long value to add</div><div class='add'>+ * @i: long value to subtract</div><div class='ctx'>  * @v: pointer to atomic_long_t</div><div class='ctx'>  *</div><div class='ctx'>  * Atomically updates @v to (@v - @i) with full ordering.</div><div class='hunk'>@@ -1809,4 +1809,4 @@ raw_atomic_long_dec_if_positive(atomic_long_t *v)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_ATOMIC_LONG_H */</div><div class='del'>-// 1c4a26fc77f345342953770ebe3c4d08e7ce2f9a</div><div class='add'>+// eadf183c3600b8b92b91839dd3be6bcc560c752d</div><div class='head'>diff --git a/include/linux/attribute_container.h b/include/linux/attribute_container.h<br/>index e4004d1e6725..b3643de9931d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/attribute_container.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/attribute_container.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/attribute_container.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/attribute_container.h</a></div><div class='hunk'>@@ -61,14 +61,8 @@ int attribute_container_device_trigger_safe(struct device *dev,</div><div class='ctx'> 					    int (*undo)(struct attribute_container *,</div><div class='ctx'> 							struct device *,</div><div class='ctx'> 							struct device *));</div><div class='del'>-void attribute_container_trigger(struct device *dev, </div><div class='del'>-				 int (*fn)(struct attribute_container *,</div><div class='del'>-					   struct device *));</div><div class='ctx'> int attribute_container_add_attrs(struct device *classdev);</div><div class='ctx'> int attribute_container_add_class_device(struct device *classdev);</div><div class='del'>-int attribute_container_add_class_device_adapter(struct attribute_container *cont,</div><div class='del'>-						 struct device *dev,</div><div class='del'>-						 struct device *classdev);</div><div class='ctx'> void attribute_container_remove_attrs(struct device *classdev);</div><div class='ctx'> void attribute_container_class_device_del(struct device *classdev);</div><div class='ctx'> struct attribute_container *attribute_container_classdev_to_container(struct device *);</div><div class='head'>diff --git a/include/linux/audit.h b/include/linux/audit.h<br/>index 0050ef288ab3..536f8ee8da81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/audit.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/audit.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/audit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/audit.h</a></div><div class='hunk'>@@ -37,6 +37,8 @@ struct audit_watch;</div><div class='ctx'> struct audit_tree;</div><div class='ctx'> struct sk_buff;</div><div class='ctx'> struct kern_ipc_perm;</div><div class='add'>+struct lsm_id;</div><div class='add'>+struct lsm_prop;</div><div class='ctx'> </div><div class='ctx'> struct audit_krule {</div><div class='ctx'> 	u32			pflags;</div><div class='hunk'>@@ -147,6 +149,10 @@ extern unsigned compat_signal_class[];</div><div class='ctx'> #define AUDIT_TTY_ENABLE	BIT(0)</div><div class='ctx'> #define AUDIT_TTY_LOG_PASSWD	BIT(1)</div><div class='ctx'> </div><div class='add'>+/* bit values for audit_cfg_lsm */</div><div class='add'>+#define AUDIT_CFG_LSM_SECCTX_SUBJECT	BIT(0)</div><div class='add'>+#define AUDIT_CFG_LSM_SECCTX_OBJECT	BIT(1)</div><div class='add'>+</div><div class='ctx'> struct filename;</div><div class='ctx'> </div><div class='ctx'> #define AUDIT_OFF	0</div><div class='hunk'>@@ -185,6 +191,8 @@ extern void		    audit_log_path_denied(int type,</div><div class='ctx'> 						  const char *operation);</div><div class='ctx'> extern void		    audit_log_lost(const char *message);</div><div class='ctx'> </div><div class='add'>+extern int audit_log_subj_ctx(struct audit_buffer *ab, struct lsm_prop *prop);</div><div class='add'>+extern int audit_log_obj_ctx(struct audit_buffer *ab, struct lsm_prop *prop);</div><div class='ctx'> extern int audit_log_task_context(struct audit_buffer *ab);</div><div class='ctx'> extern void audit_log_task_info(struct audit_buffer *ab);</div><div class='ctx'> </div><div class='hunk'>@@ -210,6 +218,8 @@ extern u32 audit_enabled;</div><div class='ctx'> </div><div class='ctx'> extern int audit_signal_info(int sig, struct task_struct *t);</div><div class='ctx'> </div><div class='add'>+extern void audit_cfg_lsm(const struct lsm_id *lsmid, int flags);</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_AUDIT */</div><div class='ctx'> static inline __printf(4, 5)</div><div class='ctx'> void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,</div><div class='hunk'>@@ -245,6 +255,16 @@ static inline void audit_log_key(struct audit_buffer *ab, char *key)</div><div class='ctx'> { }</div><div class='ctx'> static inline void audit_log_path_denied(int type, const char *operation)</div><div class='ctx'> { }</div><div class='add'>+static inline int audit_log_subj_ctx(struct audit_buffer *ab,</div><div class='add'>+				     struct lsm_prop *prop)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int audit_log_obj_ctx(struct audit_buffer *ab,</div><div class='add'>+				    struct lsm_prop *prop)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> static inline int audit_log_task_context(struct audit_buffer *ab)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -269,6 +289,9 @@ static inline int audit_signal_info(int sig, struct task_struct *t)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void audit_cfg_lsm(const struct lsm_id *lsmid, int flags)</div><div class='add'>+{ }</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_AUDIT */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AUDIT_COMPAT_GENERIC</div><div class='hunk'>@@ -417,7 +440,7 @@ extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,</div><div class='ctx'> extern void __audit_log_capset(const struct cred *new, const struct cred *old);</div><div class='ctx'> extern void __audit_mmap_fd(int fd, int flags);</div><div class='ctx'> extern void __audit_openat2_how(struct open_how *how);</div><div class='del'>-extern void __audit_log_kern_module(char *name);</div><div class='add'>+extern void __audit_log_kern_module(const char *name);</div><div class='ctx'> extern void __audit_fanotify(u32 response, struct fanotify_response_info_audit_rule *friar);</div><div class='ctx'> extern void __audit_tk_injoffset(struct timespec64 offset);</div><div class='ctx'> extern void __audit_ntp_log(const struct audit_ntp_data *ad);</div><div class='hunk'>@@ -519,7 +542,7 @@ static inline void audit_openat2_how(struct open_how *how)</div><div class='ctx'> 		__audit_openat2_how(how);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void audit_log_kern_module(char *name)</div><div class='add'>+static inline void audit_log_kern_module(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	if (!audit_dummy_context())</div><div class='ctx'> 		__audit_log_kern_module(name);</div><div class='hunk'>@@ -527,7 +550,7 @@ static inline void audit_log_kern_module(char *name)</div><div class='ctx'> </div><div class='ctx'> static inline void audit_fanotify(u32 response, struct fanotify_response_info_audit_rule *friar)</div><div class='ctx'> {</div><div class='del'>-	if (!audit_dummy_context())</div><div class='add'>+	if (audit_enabled)</div><div class='ctx'> 		__audit_fanotify(response, friar);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -677,9 +700,8 @@ static inline void audit_mmap_fd(int fd, int flags)</div><div class='ctx'> static inline void audit_openat2_how(struct open_how *how)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='del'>-static inline void audit_log_kern_module(char *name)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+static inline void audit_log_kern_module(const char *name)</div><div class='add'>+{ }</div><div class='ctx'> </div><div class='ctx'> static inline void audit_fanotify(u32 response, struct fanotify_response_info_audit_rule *friar)</div><div class='ctx'> { }</div><div class='head'>diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h<br/>index de21d9d24a95..4086afd0cc6b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/auxiliary_bus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/auxiliary_bus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/auxiliary_bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/auxiliary_bus.h</a></div><div class='hunk'>@@ -58,6 +58,10 @@</div><div class='ctx'>  *       in</div><div class='ctx'>  * @name: Match name found by the auxiliary device driver,</div><div class='ctx'>  * @id: unique identitier if multiple devices of the same name are exported,</div><div class='add'>+ * @sysfs: embedded struct which hold all sysfs related fields,</div><div class='add'>+ * @sysfs.irqs: irqs xarray contains irq indices which are used by the device,</div><div class='add'>+ * @sysfs.lock: Synchronize irq sysfs creation,</div><div class='add'>+ * @sysfs.irq_dir_exists: whether "irqs" directory exists,</div><div class='ctx'>  *</div><div class='ctx'>  * An auxiliary_device represents a part of its parent device's functionality.</div><div class='ctx'>  * It is given a name that, combined with the registering drivers</div><div class='hunk'>@@ -139,6 +143,11 @@ struct auxiliary_device {</div><div class='ctx'> 	struct device dev;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	u32 id;</div><div class='add'>+	struct {</div><div class='add'>+		struct xarray irqs;</div><div class='add'>+		struct mutex lock; /* Synchronize irq sysfs creation */</div><div class='add'>+		bool irq_dir_exists;</div><div class='add'>+	} sysfs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -203,7 +212,7 @@ static inline struct auxiliary_device *to_auxiliary_dev(struct device *dev)</div><div class='ctx'> 	return container_of(dev, struct auxiliary_device, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct auxiliary_driver *to_auxiliary_drv(struct device_driver *drv)</div><div class='add'>+static inline const struct auxiliary_driver *to_auxiliary_drv(const struct device_driver *drv)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(drv, struct auxiliary_driver, driver);</div><div class='ctx'> }</div><div class='hunk'>@@ -212,8 +221,24 @@ int auxiliary_device_init(struct auxiliary_device *auxdev);</div><div class='ctx'> int __auxiliary_device_add(struct auxiliary_device *auxdev, const char *modname);</div><div class='ctx'> #define auxiliary_device_add(auxdev) __auxiliary_device_add(auxdev, KBUILD_MODNAME)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SYSFS</div><div class='add'>+int auxiliary_device_sysfs_irq_add(struct auxiliary_device *auxdev, int irq);</div><div class='add'>+void auxiliary_device_sysfs_irq_remove(struct auxiliary_device *auxdev,</div><div class='add'>+				       int irq);</div><div class='add'>+#else /* CONFIG_SYSFS */</div><div class='add'>+static inline int</div><div class='add'>+auxiliary_device_sysfs_irq_add(struct auxiliary_device *auxdev, int irq)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+auxiliary_device_sysfs_irq_remove(struct auxiliary_device *auxdev, int irq) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void auxiliary_device_uninit(struct auxiliary_device *auxdev)</div><div class='ctx'> {</div><div class='add'>+	mutex_destroy(&amp;auxdev-&gt;sysfs.lock);</div><div class='ctx'> 	put_device(&amp;auxdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -229,6 +254,23 @@ int __auxiliary_driver_register(struct auxiliary_driver *auxdrv, struct module *</div><div class='ctx'> </div><div class='ctx'> void auxiliary_driver_unregister(struct auxiliary_driver *auxdrv);</div><div class='ctx'> </div><div class='add'>+struct auxiliary_device *auxiliary_device_create(struct device *dev,</div><div class='add'>+						 const char *modname,</div><div class='add'>+						 const char *devname,</div><div class='add'>+						 void *platform_data,</div><div class='add'>+						 int id);</div><div class='add'>+void auxiliary_device_destroy(void *auxdev);</div><div class='add'>+</div><div class='add'>+struct auxiliary_device *__devm_auxiliary_device_create(struct device *dev,</div><div class='add'>+							const char *modname,</div><div class='add'>+							const char *devname,</div><div class='add'>+							void *platform_data,</div><div class='add'>+							int id);</div><div class='add'>+</div><div class='add'>+#define devm_auxiliary_device_create(dev, devname, platform_data)     \</div><div class='add'>+	__devm_auxiliary_device_create(dev, KBUILD_MODNAME, devname,  \</div><div class='add'>+				       platform_data, 0)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * module_auxiliary_driver() - Helper macro for registering an auxiliary driver</div><div class='ctx'>  * @__auxiliary_driver: auxiliary driver struct</div><div class='hunk'>@@ -244,8 +286,4 @@ void auxiliary_driver_unregister(struct auxiliary_driver *auxdrv);</div><div class='ctx'> #define module_auxiliary_driver(__auxiliary_driver) \</div><div class='ctx'> 	module_driver(__auxiliary_driver, auxiliary_driver_register, auxiliary_driver_unregister)</div><div class='ctx'> </div><div class='del'>-struct auxiliary_device *auxiliary_find_device(struct device *start,</div><div class='del'>-					       const void *data,</div><div class='del'>-					       int (*match)(struct device *dev, const void *data));</div><div class='del'>-</div><div class='ctx'> #endif /* _AUXILIARY_BUS_H_ */</div><div class='head'>diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h<br/>index 8e177b67e82f..11bdab5522fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/avf/virtchnl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/avf/virtchnl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/avf/virtchnl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/avf/virtchnl.h</a></div><div class='hunk'>@@ -89,6 +89,9 @@ enum virtchnl_rx_hsplit {</div><div class='ctx'> 	VIRTCHNL_RX_HSPLIT_SPLIT_SCTP    = 8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum virtchnl_bw_limit_type {</div><div class='add'>+	VIRTCHNL_BW_SHAPER = 0,</div><div class='add'>+};</div><div class='ctx'> /* END GENERIC DEFINES */</div><div class='ctx'> </div><div class='ctx'> /* Opcodes for VF-PF communication. These are placed in the v_opcode field</div><div class='hunk'>@@ -129,8 +132,8 @@ enum virtchnl_ops {</div><div class='ctx'> 	VIRTCHNL_OP_RELEASE_RDMA_IRQ_MAP = VIRTCHNL_OP_RELEASE_IWARP_IRQ_MAP,</div><div class='ctx'> 	VIRTCHNL_OP_CONFIG_RSS_KEY = 23,</div><div class='ctx'> 	VIRTCHNL_OP_CONFIG_RSS_LUT = 24,</div><div class='del'>-	VIRTCHNL_OP_GET_RSS_HENA_CAPS = 25,</div><div class='del'>-	VIRTCHNL_OP_SET_RSS_HENA = 26,</div><div class='add'>+	VIRTCHNL_OP_GET_RSS_HASHCFG_CAPS = 25,</div><div class='add'>+	VIRTCHNL_OP_SET_RSS_HASHCFG = 26,</div><div class='ctx'> 	VIRTCHNL_OP_ENABLE_VLAN_STRIPPING = 27,</div><div class='ctx'> 	VIRTCHNL_OP_DISABLE_VLAN_STRIPPING = 28,</div><div class='ctx'> 	VIRTCHNL_OP_REQUEST_QUEUES = 29,</div><div class='hunk'>@@ -151,6 +154,14 @@ enum virtchnl_ops {</div><div class='ctx'> 	VIRTCHNL_OP_DISABLE_VLAN_STRIPPING_V2 = 55,</div><div class='ctx'> 	VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2 = 56,</div><div class='ctx'> 	VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2 = 57,</div><div class='add'>+	/* opcode 58 and 59 are reserved */</div><div class='add'>+	VIRTCHNL_OP_1588_PTP_GET_CAPS = 60,</div><div class='add'>+	VIRTCHNL_OP_1588_PTP_GET_TIME = 61,</div><div class='add'>+	/* opcode 62 - 65 are reserved */</div><div class='add'>+	VIRTCHNL_OP_GET_QOS_CAPS = 66,</div><div class='add'>+	/* opcode 68 through 111 are reserved */</div><div class='add'>+	VIRTCHNL_OP_CONFIG_QUEUE_BW = 112,</div><div class='add'>+	VIRTCHNL_OP_CONFIG_QUANTA = 113,</div><div class='ctx'> 	VIRTCHNL_OP_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -247,6 +258,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);</div><div class='ctx'> /* used to negotiate communicating link speeds in Mbps */</div><div class='ctx'> #define VIRTCHNL_VF_CAP_ADV_LINK_SPEED		BIT(7)</div><div class='ctx'> #define  VIRTCHNL_VF_OFFLOAD_CRC		BIT(10)</div><div class='add'>+#define VIRTCHNL_VF_OFFLOAD_TC_U32		BIT(11)</div><div class='ctx'> #define VIRTCHNL_VF_OFFLOAD_VLAN_V2		BIT(15)</div><div class='ctx'> #define VIRTCHNL_VF_OFFLOAD_VLAN		BIT(16)</div><div class='ctx'> #define VIRTCHNL_VF_OFFLOAD_RX_POLLING		BIT(17)</div><div class='hunk'>@@ -260,6 +272,8 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);</div><div class='ctx'> #define VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC	BIT(26)</div><div class='ctx'> #define VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF		BIT(27)</div><div class='ctx'> #define VIRTCHNL_VF_OFFLOAD_FDIR_PF		BIT(28)</div><div class='add'>+#define VIRTCHNL_VF_OFFLOAD_QOS			BIT(29)</div><div class='add'>+#define VIRTCHNL_VF_CAP_PTP			BIT(31)</div><div class='ctx'> </div><div class='ctx'> #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \</div><div class='ctx'> 			       VIRTCHNL_VF_OFFLOAD_VLAN | \</div><div class='hunk'>@@ -299,6 +313,60 @@ struct virtchnl_txq_info {</div><div class='ctx'> </div><div class='ctx'> VIRTCHNL_CHECK_STRUCT_LEN(24, virtchnl_txq_info);</div><div class='ctx'> </div><div class='add'>+/* RX descriptor IDs (range from 0 to 63) */</div><div class='add'>+enum virtchnl_rx_desc_ids {</div><div class='add'>+	VIRTCHNL_RXDID_0_16B_BASE		= 0,</div><div class='add'>+	VIRTCHNL_RXDID_1_32B_BASE		= 1,</div><div class='add'>+	VIRTCHNL_RXDID_2_FLEX_SQ_NIC		= 2,</div><div class='add'>+	VIRTCHNL_RXDID_3_FLEX_SQ_SW		= 3,</div><div class='add'>+	VIRTCHNL_RXDID_4_FLEX_SQ_NIC_VEB	= 4,</div><div class='add'>+	VIRTCHNL_RXDID_5_FLEX_SQ_NIC_ACL	= 5,</div><div class='add'>+	VIRTCHNL_RXDID_6_FLEX_SQ_NIC_2		= 6,</div><div class='add'>+	VIRTCHNL_RXDID_7_HW_RSVD		= 7,</div><div class='add'>+	/* 8 through 15 are reserved */</div><div class='add'>+	VIRTCHNL_RXDID_16_COMMS_GENERIC		= 16,</div><div class='add'>+	VIRTCHNL_RXDID_17_COMMS_AUX_VLAN	= 17,</div><div class='add'>+	VIRTCHNL_RXDID_18_COMMS_AUX_IPV4	= 18,</div><div class='add'>+	VIRTCHNL_RXDID_19_COMMS_AUX_IPV6	= 19,</div><div class='add'>+	VIRTCHNL_RXDID_20_COMMS_AUX_FLOW	= 20,</div><div class='add'>+	VIRTCHNL_RXDID_21_COMMS_AUX_TCP		= 21,</div><div class='add'>+	/* 22 through 63 are reserved */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VIRTCHNL_RXDID_BIT(x)			BIT_ULL(VIRTCHNL_RXDID_##x)</div><div class='add'>+</div><div class='add'>+/* RX descriptor ID bitmasks */</div><div class='add'>+enum virtchnl_rx_desc_id_bitmasks {</div><div class='add'>+	VIRTCHNL_RXDID_0_16B_BASE_M		= VIRTCHNL_RXDID_BIT(0_16B_BASE),</div><div class='add'>+	VIRTCHNL_RXDID_1_32B_BASE_M		= VIRTCHNL_RXDID_BIT(1_32B_BASE),</div><div class='add'>+	VIRTCHNL_RXDID_2_FLEX_SQ_NIC_M		= VIRTCHNL_RXDID_BIT(2_FLEX_SQ_NIC),</div><div class='add'>+	VIRTCHNL_RXDID_3_FLEX_SQ_SW_M		= VIRTCHNL_RXDID_BIT(3_FLEX_SQ_SW),</div><div class='add'>+	VIRTCHNL_RXDID_4_FLEX_SQ_NIC_VEB_M	= VIRTCHNL_RXDID_BIT(4_FLEX_SQ_NIC_VEB),</div><div class='add'>+	VIRTCHNL_RXDID_5_FLEX_SQ_NIC_ACL_M	= VIRTCHNL_RXDID_BIT(5_FLEX_SQ_NIC_ACL),</div><div class='add'>+	VIRTCHNL_RXDID_6_FLEX_SQ_NIC_2_M	= VIRTCHNL_RXDID_BIT(6_FLEX_SQ_NIC_2),</div><div class='add'>+	VIRTCHNL_RXDID_7_HW_RSVD_M		= VIRTCHNL_RXDID_BIT(7_HW_RSVD),</div><div class='add'>+	/* 8 through 15 are reserved */</div><div class='add'>+	VIRTCHNL_RXDID_16_COMMS_GENERIC_M	= VIRTCHNL_RXDID_BIT(16_COMMS_GENERIC),</div><div class='add'>+	VIRTCHNL_RXDID_17_COMMS_AUX_VLAN_M	= VIRTCHNL_RXDID_BIT(17_COMMS_AUX_VLAN),</div><div class='add'>+	VIRTCHNL_RXDID_18_COMMS_AUX_IPV4_M	= VIRTCHNL_RXDID_BIT(18_COMMS_AUX_IPV4),</div><div class='add'>+	VIRTCHNL_RXDID_19_COMMS_AUX_IPV6_M	= VIRTCHNL_RXDID_BIT(19_COMMS_AUX_IPV6),</div><div class='add'>+	VIRTCHNL_RXDID_20_COMMS_AUX_FLOW_M	= VIRTCHNL_RXDID_BIT(20_COMMS_AUX_FLOW),</div><div class='add'>+	VIRTCHNL_RXDID_21_COMMS_AUX_TCP_M	= VIRTCHNL_RXDID_BIT(21_COMMS_AUX_TCP),</div><div class='add'>+	/* 22 through 63 are reserved */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* virtchnl_rxq_info_flags - definition of bits in the flags field of the</div><div class='add'>+ *			     virtchnl_rxq_info structure.</div><div class='add'>+ *</div><div class='add'>+ * @VIRTCHNL_PTP_RX_TSTAMP: request to enable Rx timestamping</div><div class='add'>+ *</div><div class='add'>+ * Other flag bits are currently reserved and they may be extended in the</div><div class='add'>+ * future.</div><div class='add'>+ */</div><div class='add'>+enum virtchnl_rxq_info_flags {</div><div class='add'>+	VIRTCHNL_PTP_RX_TSTAMP = BIT(0),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* VIRTCHNL_OP_CONFIG_RX_QUEUE</div><div class='ctx'>  * VF sends this message to set up parameters for one RX queue.</div><div class='ctx'>  * External data buffer contains one instance of virtchnl_rxq_info.</div><div class='hunk'>@@ -321,8 +389,14 @@ struct virtchnl_rxq_info {</div><div class='ctx'> 	u32 databuffer_size;</div><div class='ctx'> 	u32 max_pkt_size;</div><div class='ctx'> 	u8 crc_disable;</div><div class='del'>-	u8 rxdid;</div><div class='del'>-	u8 pad1[2];</div><div class='add'>+	/* see enum virtchnl_rx_desc_ids;</div><div class='add'>+	 * only used when VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC is supported. Note</div><div class='add'>+	 * that when the offload is not supported, the descriptor format aligns</div><div class='add'>+	 * with VIRTCHNL_RXDID_1_32B_BASE.</div><div class='add'>+	 */</div><div class='add'>+	enum virtchnl_rx_desc_ids rxdid:8;</div><div class='add'>+	enum virtchnl_rxq_info_flags flags:8; /* see virtchnl_rxq_info_flags */</div><div class='add'>+	u8 pad1;</div><div class='ctx'> 	u64 dma_ring_addr;</div><div class='ctx'> </div><div class='ctx'> 	/* see enum virtchnl_rx_hsplit; deprecated with AVF 1.0 */</div><div class='hunk'>@@ -900,18 +974,19 @@ struct virtchnl_rss_lut {</div><div class='ctx'> VIRTCHNL_CHECK_STRUCT_LEN(4, virtchnl_rss_lut);</div><div class='ctx'> #define virtchnl_rss_lut_LEGACY_SIZEOF	6</div><div class='ctx'> </div><div class='del'>-/* VIRTCHNL_OP_GET_RSS_HENA_CAPS</div><div class='del'>- * VIRTCHNL_OP_SET_RSS_HENA</div><div class='del'>- * VF sends these messages to get and set the hash filter enable bits for RSS.</div><div class='add'>+/* VIRTCHNL_OP_GET_RSS_HASHCFG_CAPS</div><div class='add'>+ * VIRTCHNL_OP_SET_RSS_HASHCFG</div><div class='add'>+ * VF sends these messages to get and set the hash filter configuration for RSS.</div><div class='ctx'>  * By default, the PF sets these to all possible traffic types that the</div><div class='ctx'>  * hardware supports. The VF can query this value if it wants to change the</div><div class='ctx'>  * traffic types that are hashed by the hardware.</div><div class='ctx'>  */</div><div class='del'>-struct virtchnl_rss_hena {</div><div class='del'>-	u64 hena;</div><div class='add'>+struct virtchnl_rss_hashcfg {</div><div class='add'>+	/* Bits defined by enum libie_filter_pctype */</div><div class='add'>+	u64 hashcfg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_rss_hena);</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_rss_hashcfg);</div><div class='ctx'> </div><div class='ctx'> /* Type of RSS algorithm */</div><div class='ctx'> enum virtchnl_rss_algorithm {</div><div class='hunk'>@@ -1022,10 +1097,6 @@ struct virtchnl_filter {</div><div class='ctx'> </div><div class='ctx'> VIRTCHNL_CHECK_STRUCT_LEN(272, virtchnl_filter);</div><div class='ctx'> </div><div class='del'>-struct virtchnl_supported_rxdids {</div><div class='del'>-	u64 supported_rxdids;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* VIRTCHNL_OP_EVENT</div><div class='ctx'>  * PF sends this message to inform the VF driver of events that may affect it.</div><div class='ctx'>  * No direct response is expected from the VF, though it may generate other</div><div class='hunk'>@@ -1121,6 +1192,7 @@ enum virtchnl_vfr_states {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define VIRTCHNL_MAX_NUM_PROTO_HDRS	32</div><div class='add'>+#define VIRTCHNL_MAX_SIZE_RAW_PACKET	1024</div><div class='ctx'> #define PROTO_HDR_SHIFT			5</div><div class='ctx'> #define PROTO_HDR_FIELD_START(proto_hdr_type) ((proto_hdr_type) &lt;&lt; PROTO_HDR_SHIFT)</div><div class='ctx'> #define PROTO_HDR_FIELD_MASK ((1UL &lt;&lt; PROTO_HDR_SHIFT) - 1)</div><div class='hunk'>@@ -1181,6 +1253,17 @@ enum virtchnl_proto_hdr_type {</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_ESP,</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_AH,</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_PFCP,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_GTPC,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_ECPRI,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_L2TPV2,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_PPP,</div><div class='add'>+	/* IPv4 and IPv6 Fragment header types are only associated to</div><div class='add'>+	 * VIRTCHNL_PROTO_HDR_IPV4 and VIRTCHNL_PROTO_HDR_IPV6 respectively,</div><div class='add'>+	 * cannot be used independently.</div><div class='add'>+	 */</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV4_FRAG,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_GRE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Protocol header field within a protocol header. */</div><div class='hunk'>@@ -1203,6 +1286,7 @@ enum virtchnl_proto_hdr_field {</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_IPV4_DSCP,</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_IPV4_TTL,</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_IPV4_PROT,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV4_CHKSUM,</div><div class='ctx'> 	/* IPV6 */</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_IPV6_SRC =</div><div class='ctx'> 		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV6),</div><div class='hunk'>@@ -1210,18 +1294,34 @@ enum virtchnl_proto_hdr_field {</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_IPV6_TC,</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_IPV6_HOP_LIMIT,</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_IPV6_PROT,</div><div class='add'>+	/* IPV6 Prefix */</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX32_SRC,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX32_DST,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX40_SRC,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX40_DST,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX48_SRC,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX48_DST,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX56_SRC,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX56_DST,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX64_SRC,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX64_DST,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX96_SRC,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_PREFIX96_DST,</div><div class='ctx'> 	/* TCP */</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_TCP_SRC_PORT =</div><div class='ctx'> 		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_TCP),</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_TCP_DST_PORT,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_TCP_CHKSUM,</div><div class='ctx'> 	/* UDP */</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_UDP_SRC_PORT =</div><div class='ctx'> 		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_UDP),</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_UDP_DST_PORT,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_UDP_CHKSUM,</div><div class='ctx'> 	/* SCTP */</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT =</div><div class='ctx'> 		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_SCTP),</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_SCTP_DST_PORT,</div><div class='add'>+	VIRTCHNL_PROTO_HDR_SCTP_CHKSUM,</div><div class='ctx'> 	/* GTPU_IP */</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_GTPU_IP_TEID =</div><div class='ctx'> 		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPU_IP),</div><div class='hunk'>@@ -1245,6 +1345,28 @@ enum virtchnl_proto_hdr_field {</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_PFCP_S_FIELD =</div><div class='ctx'> 		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_PFCP),</div><div class='ctx'> 	VIRTCHNL_PROTO_HDR_PFCP_SEID,</div><div class='add'>+	/* GTPC */</div><div class='add'>+	VIRTCHNL_PROTO_HDR_GTPC_TEID =</div><div class='add'>+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPC),</div><div class='add'>+	/* ECPRI */</div><div class='add'>+	VIRTCHNL_PROTO_HDR_ECPRI_MSG_TYPE =</div><div class='add'>+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_ECPRI),</div><div class='add'>+	VIRTCHNL_PROTO_HDR_ECPRI_PC_RTC_ID,</div><div class='add'>+	/* IPv4 Dummy Fragment */</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV4_FRAG_PKID =</div><div class='add'>+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV4_FRAG),</div><div class='add'>+	/* IPv6 Extension Fragment */</div><div class='add'>+	VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG_PKID =</div><div class='add'>+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG),</div><div class='add'>+	/* GTPU_DWN/UP */</div><div class='add'>+	VIRTCHNL_PROTO_HDR_GTPU_DWN_QFI =</div><div class='add'>+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_DWN),</div><div class='add'>+	VIRTCHNL_PROTO_HDR_GTPU_UP_QFI =</div><div class='add'>+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_UP),</div><div class='add'>+	/* L2TPv2 */</div><div class='add'>+	VIRTCHNL_PROTO_HDR_L2TPV2_SESS_ID =</div><div class='add'>+		PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_L2TPV2),</div><div class='add'>+	VIRTCHNL_PROTO_HDR_L2TPV2_LEN_SESS_ID,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct virtchnl_proto_hdr {</div><div class='hunk'>@@ -1266,13 +1388,22 @@ struct virtchnl_proto_hdrs {</div><div class='ctx'> 	u8 pad[3];</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * specify where protocol header start from.</div><div class='add'>+	 * must be 0 when sending a raw packet request.</div><div class='ctx'> 	 * 0 - from the outer layer</div><div class='ctx'> 	 * 1 - from the first inner layer</div><div class='ctx'> 	 * 2 - from the second inner layer</div><div class='ctx'> 	 * ....</div><div class='ctx'> 	 **/</div><div class='del'>-	int count; /* the proto layers must &lt; VIRTCHNL_MAX_NUM_PROTO_HDRS */</div><div class='del'>-	struct virtchnl_proto_hdr proto_hdr[VIRTCHNL_MAX_NUM_PROTO_HDRS];</div><div class='add'>+	u32 count; /* the proto layers must &lt; VIRTCHNL_MAX_NUM_PROTO_HDRS */</div><div class='add'>+	union {</div><div class='add'>+		struct virtchnl_proto_hdr</div><div class='add'>+			proto_hdr[VIRTCHNL_MAX_NUM_PROTO_HDRS];</div><div class='add'>+		struct {</div><div class='add'>+			u16 pkt_len;</div><div class='add'>+			u8 spec[VIRTCHNL_MAX_SIZE_RAW_PACKET];</div><div class='add'>+			u8 mask[VIRTCHNL_MAX_SIZE_RAW_PACKET];</div><div class='add'>+		} raw;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> VIRTCHNL_CHECK_STRUCT_LEN(2312, virtchnl_proto_hdrs);</div><div class='hunk'>@@ -1315,7 +1446,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(36, virtchnl_filter_action);</div><div class='ctx'> </div><div class='ctx'> struct virtchnl_filter_action_set {</div><div class='ctx'> 	/* action number must be less then VIRTCHNL_MAX_NUM_ACTIONS */</div><div class='del'>-	int count;</div><div class='add'>+	u32 count;</div><div class='ctx'> 	struct virtchnl_filter_action actions[VIRTCHNL_MAX_NUM_ACTIONS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1405,6 +1536,141 @@ struct virtchnl_fdir_del {</div><div class='ctx'> </div><div class='ctx'> VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_fdir_del);</div><div class='ctx'> </div><div class='add'>+#define VIRTCHNL_1588_PTP_CAP_RX_TSTAMP		BIT(1)</div><div class='add'>+#define VIRTCHNL_1588_PTP_CAP_READ_PHC		BIT(2)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct virtchnl_ptp_caps - Defines the PTP caps available to the VF.</div><div class='add'>+ * @caps: On send, VF sets what capabilities it requests. On reply, PF</div><div class='add'>+ *        indicates what has been enabled for this VF. The PF shall not set</div><div class='add'>+ *        bits which were not requested by the VF.</div><div class='add'>+ * @rsvd: Reserved bits for future extension.</div><div class='add'>+ *</div><div class='add'>+ * Structure that defines the PTP capabilities available to the VF. The VF</div><div class='add'>+ * sends VIRTCHNL_OP_1588_PTP_GET_CAPS, and must fill in the ptp_caps field</div><div class='add'>+ * indicating what capabilities it is requesting. The PF will respond with the</div><div class='add'>+ * same message with the virtchnl_ptp_caps structure indicating what is</div><div class='add'>+ * enabled for the VF.</div><div class='add'>+ *</div><div class='add'>+ * VIRTCHNL_1588_PTP_CAP_RX_TSTAMP indicates that the VF receive queues have</div><div class='add'>+ * receive timestamps enabled in the flexible descriptors. Note that this</div><div class='add'>+ * requires a VF to also negotiate to enable advanced flexible descriptors in</div><div class='add'>+ * the receive path instead of the default legacy descriptor format.</div><div class='add'>+ *</div><div class='add'>+ * VIRTCHNL_1588_PTP_CAP_READ_PHC indicates that the VF may read the PHC time</div><div class='add'>+ * via the VIRTCHNL_OP_1588_PTP_GET_TIME command.</div><div class='add'>+ *</div><div class='add'>+ * Note that in the future, additional capability flags may be added which</div><div class='add'>+ * indicate additional extended support. All fields marked as reserved by this</div><div class='add'>+ * header will be set to zero. VF implementations should verify this to ensure</div><div class='add'>+ * that future extensions do not break compatibility.</div><div class='add'>+ */</div><div class='add'>+struct virtchnl_ptp_caps {</div><div class='add'>+	u32 caps;</div><div class='add'>+	u8 rsvd[44];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(48, virtchnl_ptp_caps);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct virtchnl_phc_time - Contains the 64bits of PHC clock time in ns.</div><div class='add'>+ * @time: PHC time in nanoseconds</div><div class='add'>+ * @rsvd: Reserved for future extension</div><div class='add'>+ *</div><div class='add'>+ * Structure received with VIRTCHNL_OP_1588_PTP_GET_TIME. Contains the 64bits</div><div class='add'>+ * of PHC clock time in nanoseconds.</div><div class='add'>+ *</div><div class='add'>+ * VIRTCHNL_OP_1588_PTP_GET_TIME may be sent to request the current time of</div><div class='add'>+ * the PHC. This op is available in case direct access via the PHC registers</div><div class='add'>+ * is not available.</div><div class='add'>+ */</div><div class='add'>+struct virtchnl_phc_time {</div><div class='add'>+	u64 time;</div><div class='add'>+	u8 rsvd[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_phc_time);</div><div class='add'>+</div><div class='add'>+struct virtchnl_shaper_bw {</div><div class='add'>+	/* Unit is Kbps */</div><div class='add'>+	u32 committed;</div><div class='add'>+	u32 peak;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_shaper_bw);</div><div class='add'>+</div><div class='add'>+/* VIRTCHNL_OP_GET_QOS_CAPS</div><div class='add'>+ * VF sends this message to get its QoS Caps, such as</div><div class='add'>+ * TC number, Arbiter and Bandwidth.</div><div class='add'>+ */</div><div class='add'>+struct virtchnl_qos_cap_elem {</div><div class='add'>+	u8 tc_num;</div><div class='add'>+	u8 tc_prio;</div><div class='add'>+#define VIRTCHNL_ABITER_STRICT      0</div><div class='add'>+#define VIRTCHNL_ABITER_ETS         2</div><div class='add'>+	u8 arbiter;</div><div class='add'>+#define VIRTCHNL_STRICT_WEIGHT      1</div><div class='add'>+	u8 weight;</div><div class='add'>+	enum virtchnl_bw_limit_type type;</div><div class='add'>+	union {</div><div class='add'>+		struct virtchnl_shaper_bw shaper;</div><div class='add'>+		u8 pad2[32];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(40, virtchnl_qos_cap_elem);</div><div class='add'>+</div><div class='add'>+struct virtchnl_qos_cap_list {</div><div class='add'>+	u16 vsi_id;</div><div class='add'>+	u16 num_elem;</div><div class='add'>+	struct virtchnl_qos_cap_elem cap[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(4, virtchnl_qos_cap_list);</div><div class='add'>+#define virtchnl_qos_cap_list_LEGACY_SIZEOF	44</div><div class='add'>+</div><div class='add'>+/* VIRTCHNL_OP_CONFIG_QUEUE_BW */</div><div class='add'>+struct virtchnl_queue_bw {</div><div class='add'>+	u16 queue_id;</div><div class='add'>+	u8 tc;</div><div class='add'>+	u8 pad;</div><div class='add'>+	struct virtchnl_shaper_bw shaper;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_queue_bw);</div><div class='add'>+</div><div class='add'>+struct virtchnl_queues_bw_cfg {</div><div class='add'>+	u16 vsi_id;</div><div class='add'>+	u16 num_queues;</div><div class='add'>+	struct virtchnl_queue_bw cfg[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(4, virtchnl_queues_bw_cfg);</div><div class='add'>+#define virtchnl_queues_bw_cfg_LEGACY_SIZEOF	16</div><div class='add'>+</div><div class='add'>+enum virtchnl_queue_type {</div><div class='add'>+	VIRTCHNL_QUEUE_TYPE_TX			= 0,</div><div class='add'>+	VIRTCHNL_QUEUE_TYPE_RX			= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* structure to specify a chunk of contiguous queues */</div><div class='add'>+struct virtchnl_queue_chunk {</div><div class='add'>+	/* see enum virtchnl_queue_type */</div><div class='add'>+	s32 type;</div><div class='add'>+	u16 start_queue_id;</div><div class='add'>+	u16 num_queues;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_queue_chunk);</div><div class='add'>+</div><div class='add'>+struct virtchnl_quanta_cfg {</div><div class='add'>+	u16 quanta_size;</div><div class='add'>+	u16 pad;</div><div class='add'>+	struct virtchnl_queue_chunk queue_select;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_quanta_cfg);</div><div class='add'>+</div><div class='ctx'> #define __vss_byone(p, member, count, old)				      \</div><div class='ctx'> 	(struct_size(p, member, count) + (old - 1 - struct_size(p, member, 0)))</div><div class='ctx'> </div><div class='hunk'>@@ -1427,6 +1693,8 @@ VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_fdir_del);</div><div class='ctx'> 		 __vss(virtchnl_vlan_filter_list_v2, __vss_byelem, p, m, c),  \</div><div class='ctx'> 		 __vss(virtchnl_tc_info, __vss_byelem, p, m, c),	      \</div><div class='ctx'> 		 __vss(virtchnl_rdma_qvlist_info, __vss_byelem, p, m, c),     \</div><div class='add'>+		 __vss(virtchnl_qos_cap_list, __vss_byelem, p, m, c),	      \</div><div class='add'>+		 __vss(virtchnl_queues_bw_cfg, __vss_byelem, p, m, c),	      \</div><div class='ctx'> 		 __vss(virtchnl_rss_key, __vss_byone, p, m, c),		      \</div><div class='ctx'> 		 __vss(virtchnl_rss_lut, __vss_byone, p, m, c))</div><div class='ctx'> </div><div class='hunk'>@@ -1562,10 +1830,10 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode,</div><div class='ctx'> 	case VIRTCHNL_OP_CONFIG_RSS_HFUNC:</div><div class='ctx'> 		valid_len = sizeof(struct virtchnl_rss_hfunc);</div><div class='ctx'> 		break;</div><div class='del'>-	case VIRTCHNL_OP_GET_RSS_HENA_CAPS:</div><div class='add'>+	case VIRTCHNL_OP_GET_RSS_HASHCFG_CAPS:</div><div class='ctx'> 		break;</div><div class='del'>-	case VIRTCHNL_OP_SET_RSS_HENA:</div><div class='del'>-		valid_len = sizeof(struct virtchnl_rss_hena);</div><div class='add'>+	case VIRTCHNL_OP_SET_RSS_HASHCFG:</div><div class='add'>+		valid_len = sizeof(struct virtchnl_rss_hashcfg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING:</div><div class='ctx'> 	case VIRTCHNL_OP_DISABLE_VLAN_STRIPPING:</div><div class='hunk'>@@ -1626,6 +1894,41 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode,</div><div class='ctx'> 	case VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2:</div><div class='ctx'> 		valid_len = sizeof(struct virtchnl_vlan_setting);</div><div class='ctx'> 		break;</div><div class='add'>+	case VIRTCHNL_OP_GET_QOS_CAPS:</div><div class='add'>+		break;</div><div class='add'>+	case VIRTCHNL_OP_CONFIG_QUEUE_BW:</div><div class='add'>+		valid_len = virtchnl_queues_bw_cfg_LEGACY_SIZEOF;</div><div class='add'>+		if (msglen &gt;= valid_len) {</div><div class='add'>+			struct virtchnl_queues_bw_cfg *q_bw =</div><div class='add'>+				(struct virtchnl_queues_bw_cfg *)msg;</div><div class='add'>+</div><div class='add'>+			valid_len = virtchnl_struct_size(q_bw, cfg,</div><div class='add'>+							 q_bw-&gt;num_queues);</div><div class='add'>+			if (q_bw-&gt;num_queues == 0) {</div><div class='add'>+				err_msg_format = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case VIRTCHNL_OP_CONFIG_QUANTA:</div><div class='add'>+		valid_len = sizeof(struct virtchnl_quanta_cfg);</div><div class='add'>+		if (msglen &gt;= valid_len) {</div><div class='add'>+			struct virtchnl_quanta_cfg *q_quanta =</div><div class='add'>+				(struct virtchnl_quanta_cfg *)msg;</div><div class='add'>+</div><div class='add'>+			if (q_quanta-&gt;quanta_size == 0 ||</div><div class='add'>+			    q_quanta-&gt;queue_select.num_queues == 0) {</div><div class='add'>+				err_msg_format = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case VIRTCHNL_OP_1588_PTP_GET_CAPS:</div><div class='add'>+		valid_len = sizeof(struct virtchnl_ptp_caps);</div><div class='add'>+		break;</div><div class='add'>+	case VIRTCHNL_OP_1588_PTP_GET_TIME:</div><div class='add'>+		valid_len = sizeof(struct virtchnl_phc_time);</div><div class='add'>+		break;</div><div class='ctx'> 	/* These are always errors coming from the VF. */</div><div class='ctx'> 	case VIRTCHNL_OP_EVENT:</div><div class='ctx'> 	case VIRTCHNL_OP_UNKNOWN:</div><div class='head'>diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h<br/>index 2ad261082bba..0217c1073735 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/backing-dev-defs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/backing-dev-defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/backing-dev-defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/backing-dev-defs.h</a></div><div class='hunk'>@@ -63,6 +63,8 @@ enum wb_reason {</div><div class='ctx'> struct wb_completion {</div><div class='ctx'> 	atomic_t		cnt;</div><div class='ctx'> 	wait_queue_head_t	*waitq;</div><div class='add'>+	unsigned long progress_stamp;	/* The jiffies when slow progress is detected */</div><div class='add'>+	unsigned long wait_start;	/* The jiffies when waiting for the writeback work to finish */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define __WB_COMPLETION_INIT(_waitq)	\</div><div class='hunk'>@@ -152,6 +154,10 @@ struct bdi_writeback {</div><div class='ctx'> 	struct list_head blkcg_node;	/* anchored at blkcg-&gt;cgwb_list */</div><div class='ctx'> 	struct list_head b_attached;	/* attached inodes, protected by list_lock */</div><div class='ctx'> 	struct list_head offline_node;	/* anchored at offline_cgwbs */</div><div class='add'>+	struct work_struct switch_work;	/* work used to perform inode switching</div><div class='add'>+					 * to this wb */</div><div class='add'>+	struct llist_head switch_wbs_ctxs;	/* queued contexts for</div><div class='add'>+						 * writeback switching */</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct work_struct release_work;</div><div class='hunk'>@@ -164,7 +170,9 @@ struct backing_dev_info {</div><div class='ctx'> 	u64 id;</div><div class='ctx'> 	struct rb_node rb_node; /* keyed by -&gt;id */</div><div class='ctx'> 	struct list_head bdi_list;</div><div class='del'>-	unsigned long ra_pages;	/* max readahead in PAGE_SIZE units */</div><div class='add'>+	/* max readahead in PAGE_SIZE units */</div><div class='add'>+	unsigned long __data_racy ra_pages;</div><div class='add'>+</div><div class='ctx'> 	unsigned long io_pages;	/* max allowed IO size */</div><div class='ctx'> </div><div class='ctx'> 	struct kref refcnt;	/* Reference counter for the structure */</div><div class='head'>diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h<br/>index 8e7af9a03b41..0c8342747cab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/backing-dev.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/backing-dev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/backing-dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/backing-dev.h</a></div><div class='hunk'>@@ -66,16 +66,6 @@ static inline void wb_stat_mod(struct bdi_writeback *wb,</div><div class='ctx'> 	percpu_counter_add_batch(&amp;wb-&gt;stat[item], amount, WB_STAT_BATCH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void inc_wb_stat(struct bdi_writeback *wb, enum wb_stat_item item)</div><div class='del'>-{</div><div class='del'>-	wb_stat_mod(wb, item, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dec_wb_stat(struct bdi_writeback *wb, enum wb_stat_item item)</div><div class='del'>-{</div><div class='del'>-	wb_stat_mod(wb, item, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline s64 wb_stat(struct bdi_writeback *wb, enum wb_stat_item item)</div><div class='ctx'> {</div><div class='ctx'> 	return percpu_counter_read_positive(&amp;wb-&gt;stat[item]);</div><div class='hunk'>@@ -118,12 +108,10 @@ int bdi_set_strict_limit(struct backing_dev_info *bdi, unsigned int strict_limit</div><div class='ctx'>  *</div><div class='ctx'>  * BDI_CAP_WRITEBACK:		Supports dirty page writeback, and dirty pages</div><div class='ctx'>  *				should contribute to accounting</div><div class='del'>- * BDI_CAP_WRITEBACK_ACCT:	Automatically account writeback pages</div><div class='ctx'>  * BDI_CAP_STRICTLIMIT:		Keep number of dirty pages below bdi threshold</div><div class='ctx'>  */</div><div class='ctx'> #define BDI_CAP_WRITEBACK		(1 &lt;&lt; 0)</div><div class='del'>-#define BDI_CAP_WRITEBACK_ACCT		(1 &lt;&lt; 1)</div><div class='del'>-#define BDI_CAP_STRICTLIMIT		(1 &lt;&lt; 2)</div><div class='add'>+#define BDI_CAP_STRICTLIMIT		(1 &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> extern struct backing_dev_info noop_backing_dev_info;</div><div class='ctx'> </div><div class='hunk'>@@ -249,6 +237,7 @@ static inline struct bdi_writeback *inode_to_wb(const struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='ctx'> 	WARN_ON_ONCE(debug_locks &amp;&amp;</div><div class='add'>+		     (inode-&gt;i_sb-&gt;s_iflags &amp; SB_I_CGROUPWB) &amp;&amp;</div><div class='ctx'> 		     (!lockdep_is_held(&amp;inode-&gt;i_lock) &amp;&amp;</div><div class='ctx'> 		      !lockdep_is_held(&amp;inode-&gt;i_mapping-&gt;i_pages.xa_lock) &amp;&amp;</div><div class='ctx'> 		      !lockdep_is_held(&amp;inode-&gt;i_wb-&gt;list_lock)));</div><div class='hunk'>@@ -288,10 +277,11 @@ unlocked_inode_to_wb_begin(struct inode *inode, struct wb_lock_cookie *cookie)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Paired with store_release in inode_switch_wbs_work_fn() and</div><div class='add'>+	 * Paired with a release fence in inode_do_switch_wbs() and</div><div class='ctx'> 	 * ensures that we see the new wb if we see cleared I_WB_SWITCH.</div><div class='ctx'> 	 */</div><div class='del'>-	cookie-&gt;locked = smp_load_acquire(&amp;inode-&gt;i_state) &amp; I_WB_SWITCH;</div><div class='add'>+	cookie-&gt;locked = inode_state_read_once(inode) &amp; I_WB_SWITCH;</div><div class='add'>+	smp_rmb();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(cookie-&gt;locked))</div><div class='ctx'> 		xa_lock_irqsave(&amp;inode-&gt;i_mapping-&gt;i_pages, cookie-&gt;flags);</div><div class='head'>diff --git a/include/linux/backing-file.h b/include/linux/backing-file.h<br/>index 3f1fe1774f1b..1476a6ed1bfd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/backing-file.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/backing-file.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/backing-file.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/backing-file.h</a></div><div class='hunk'>@@ -14,27 +14,29 @@</div><div class='ctx'> </div><div class='ctx'> struct backing_file_ctx {</div><div class='ctx'> 	const struct cred *cred;</div><div class='del'>-	struct file *user_file;</div><div class='del'>-	void (*accessed)(struct file *);</div><div class='del'>-	void (*end_write)(struct file *);</div><div class='add'>+	void (*accessed)(struct file *file);</div><div class='add'>+	void (*end_write)(struct kiocb *iocb, ssize_t);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct file *backing_file_open(const struct path *user_path, int flags,</div><div class='ctx'> 			       const struct path *real_path,</div><div class='ctx'> 			       const struct cred *cred);</div><div class='add'>+struct file *backing_tmpfile_open(const struct path *user_path, int flags,</div><div class='add'>+				  const struct path *real_parentpath,</div><div class='add'>+				  umode_t mode, const struct cred *cred);</div><div class='ctx'> ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,</div><div class='ctx'> 			       struct kiocb *iocb, int flags,</div><div class='ctx'> 			       struct backing_file_ctx *ctx);</div><div class='ctx'> ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,</div><div class='ctx'> 				struct kiocb *iocb, int flags,</div><div class='ctx'> 				struct backing_file_ctx *ctx);</div><div class='del'>-ssize_t backing_file_splice_read(struct file *in, loff_t *ppos,</div><div class='add'>+ssize_t backing_file_splice_read(struct file *in, struct kiocb *iocb,</div><div class='ctx'> 				 struct pipe_inode_info *pipe, size_t len,</div><div class='ctx'> 				 unsigned int flags,</div><div class='ctx'> 				 struct backing_file_ctx *ctx);</div><div class='ctx'> ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,</div><div class='del'>-				  struct file *out, loff_t *ppos, size_t len,</div><div class='del'>-				  unsigned int flags,</div><div class='add'>+				  struct file *out, struct kiocb *iocb,</div><div class='add'>+				  size_t len, unsigned int flags,</div><div class='ctx'> 				  struct backing_file_ctx *ctx);</div><div class='ctx'> int backing_file_mmap(struct file *file, struct vm_area_struct *vma,</div><div class='ctx'> 		      struct backing_file_ctx *ctx);</div><div class='head'>diff --git a/include/linux/backlight.h b/include/linux/backlight.h<br/>index 614653e07e3a..f29a9ef1052e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/backlight.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/backlight.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/backlight.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/backlight.h</a></div><div class='hunk'>@@ -10,9 +10,8 @@</div><div class='ctx'> #define _LINUX_BACKLIGHT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum backlight_update_reason - what method was used to update backlight</div><div class='hunk'>@@ -65,24 +64,6 @@ enum backlight_type {</div><div class='ctx'> 	BACKLIGHT_TYPE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum backlight_notification - the type of notification</div><div class='del'>- *</div><div class='del'>- * The notifications that is used for notification sent to the receiver</div><div class='del'>- * that registered notifications using backlight_register_notifier().</div><div class='del'>- */</div><div class='del'>-enum backlight_notification {</div><div class='del'>-	/**</div><div class='del'>-	 * @BACKLIGHT_REGISTERED: The backlight device is registered.</div><div class='del'>-	 */</div><div class='del'>-	BACKLIGHT_REGISTERED,</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @BACKLIGHT_UNREGISTERED: The backlight revice is unregistered.</div><div class='del'>-	 */</div><div class='del'>-	BACKLIGHT_UNREGISTERED,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /** enum backlight_scale - the type of scale used for brightness values</div><div class='ctx'>  *</div><div class='ctx'>  * The type of scale used for brightness values.</div><div class='hunk'>@@ -110,7 +91,6 @@ enum backlight_scale {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct backlight_device;</div><div class='del'>-struct fb_info;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct backlight_ops - backlight operations</div><div class='hunk'>@@ -160,18 +140,18 @@ struct backlight_ops {</div><div class='ctx'> 	int (*get_brightness)(struct backlight_device *);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @check_fb: Check the framebuffer device.</div><div class='add'>+	 * @controls_device: Check against the display device</div><div class='ctx'> 	 *</div><div class='del'>-	 * Check if given framebuffer device is the one bound to this backlight.</div><div class='del'>-	 * This operation is optional and if not implemented it is assumed that the</div><div class='del'>-	 * fbdev is always the one bound to the backlight.</div><div class='add'>+	 * Check if the backlight controls the given display device. This</div><div class='add'>+	 * operation is optional and if not implemented it is assumed that</div><div class='add'>+	 * the display is always the one controlled by the backlight.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * RETURNS:</div><div class='ctx'> 	 *</div><div class='del'>-	 * If info is NULL or the info matches the fbdev bound to the backlight return true.</div><div class='del'>-	 * If info does not match the fbdev bound to the backlight return false.</div><div class='add'>+	 * If display_dev is NULL or display_dev matches the device controlled by</div><div class='add'>+	 * the backlight, return true. Otherwise return false.</div><div class='ctx'> 	 */</div><div class='del'>-	int (*check_fb)(struct backlight_device *bd, struct fb_info *info);</div><div class='add'>+	bool (*controls_device)(struct backlight_device *bd, struct device *display_dev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -209,33 +189,18 @@ struct backlight_properties {</div><div class='ctx'> 	 * attribute: /sys/class/backlight/&lt;backlight&gt;/bl_power</div><div class='ctx'> 	 * When the power property is updated update_status() is called.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The possible values are: (0: full on, 1 to 3: power saving</div><div class='del'>-	 * modes; 4: full off), see FB_BLANK_XXX.</div><div class='add'>+	 * The possible values are: (0: full on, 4: full off), see</div><div class='add'>+	 * BACKLIGHT_POWER constants.</div><div class='ctx'> 	 *</div><div class='del'>-	 * When the backlight device is enabled @power is set</div><div class='del'>-	 * to FB_BLANK_UNBLANK. When the backlight device is disabled</div><div class='del'>-	 * @power is set to FB_BLANK_POWERDOWN.</div><div class='add'>+	 * When the backlight device is enabled, @power is set to</div><div class='add'>+	 * BACKLIGHT_POWER_ON. When the backlight device is disabled,</div><div class='add'>+	 * @power is set to BACKLIGHT_POWER_OFF.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int power;</div><div class='ctx'> </div><div class='del'>-	/**</div><div class='del'>-	 * @fb_blank: The power state from the FBIOBLANK ioctl.</div><div class='del'>-	 *</div><div class='del'>-	 * When the FBIOBLANK ioctl is called @fb_blank is set to the</div><div class='del'>-	 * blank parameter and the update_status() operation is called.</div><div class='del'>-	 *</div><div class='del'>-	 * When the backlight device is enabled @fb_blank is set</div><div class='del'>-	 * to FB_BLANK_UNBLANK. When the backlight device is disabled</div><div class='del'>-	 * @fb_blank is set to FB_BLANK_POWERDOWN.</div><div class='del'>-	 *</div><div class='del'>-	 * Backlight drivers should avoid using this property. It has been</div><div class='del'>-	 * replaced by state &amp; BL_CORE_FBLANK (although most drivers should</div><div class='del'>-	 * use backlight_is_blank() as the preferred means to get the blank</div><div class='del'>-	 * state).</div><div class='del'>-	 *</div><div class='del'>-	 * fb_blank is deprecated and will be removed.</div><div class='del'>-	 */</div><div class='del'>-	int fb_blank;</div><div class='add'>+#define BACKLIGHT_POWER_ON		(0)</div><div class='add'>+#define BACKLIGHT_POWER_OFF		(4)</div><div class='add'>+#define BACKLIGHT_POWER_REDUCED		(1) // deprecated; don't use in new code</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @type: The type of backlight supported.</div><div class='hunk'>@@ -312,11 +277,6 @@ struct backlight_device {</div><div class='ctx'> 	const struct backlight_ops *ops;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @fb_notif: The framebuffer notifier block</div><div class='del'>-	 */</div><div class='del'>-	struct notifier_block fb_notif;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @entry: List entry of all registered backlight devices</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head entry;</div><div class='hunk'>@@ -327,15 +287,7 @@ struct backlight_device {</div><div class='ctx'> 	struct device dev;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @fb_bl_on: The state of individual fbdev's.</div><div class='del'>-	 *</div><div class='del'>-	 * Multiple fbdev's may share one backlight device. The fb_bl_on</div><div class='del'>-	 * records the state of the individual fbdev.</div><div class='del'>-	 */</div><div class='del'>-	bool fb_bl_on[FB_MAX];</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @use_count: The number of uses of fb_bl_on.</div><div class='add'>+	 * @use_count: The number of unblanked displays.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int use_count;</div><div class='ctx'> };</div><div class='hunk'>@@ -365,8 +317,7 @@ static inline int backlight_enable(struct backlight_device *bd)</div><div class='ctx'> 	if (!bd)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bd-&gt;props.power = FB_BLANK_UNBLANK;</div><div class='del'>-	bd-&gt;props.fb_blank = FB_BLANK_UNBLANK;</div><div class='add'>+	bd-&gt;props.power = BACKLIGHT_POWER_ON;</div><div class='ctx'> 	bd-&gt;props.state &amp;= ~BL_CORE_FBBLANK;</div><div class='ctx'> </div><div class='ctx'> 	return backlight_update_status(bd);</div><div class='hunk'>@@ -381,8 +332,7 @@ static inline int backlight_disable(struct backlight_device *bd)</div><div class='ctx'> 	if (!bd)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bd-&gt;props.power = FB_BLANK_POWERDOWN;</div><div class='del'>-	bd-&gt;props.fb_blank = FB_BLANK_POWERDOWN;</div><div class='add'>+	bd-&gt;props.power = BACKLIGHT_POWER_OFF;</div><div class='ctx'> 	bd-&gt;props.state |= BL_CORE_FBBLANK;</div><div class='ctx'> </div><div class='ctx'> 	return backlight_update_status(bd);</div><div class='hunk'>@@ -395,15 +345,13 @@ static inline int backlight_disable(struct backlight_device *bd)</div><div class='ctx'>  * Display is expected to be blank if any of these is true::</div><div class='ctx'>  *</div><div class='ctx'>  *   1) if power in not UNBLANK</div><div class='del'>- *   2) if fb_blank is not UNBLANK</div><div class='del'>- *   3) if state indicate BLANK or SUSPENDED</div><div class='add'>+ *   2) if state indicate BLANK or SUSPENDED</div><div class='ctx'>  *</div><div class='ctx'>  * Returns true if display is expected to be blank, false otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool backlight_is_blank(const struct backlight_device *bd)</div><div class='ctx'> {</div><div class='del'>-	return bd-&gt;props.power != FB_BLANK_UNBLANK ||</div><div class='del'>-	       bd-&gt;props.fb_blank != FB_BLANK_UNBLANK ||</div><div class='add'>+	return bd-&gt;props.power != BACKLIGHT_POWER_ON ||</div><div class='ctx'> 	       bd-&gt;props.state &amp; (BL_CORE_SUSPENDED | BL_CORE_FBBLANK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -440,13 +388,27 @@ void devm_backlight_device_unregister(struct device *dev,</div><div class='ctx'> 				      struct backlight_device *bd);</div><div class='ctx'> void backlight_force_update(struct backlight_device *bd,</div><div class='ctx'> 			    enum backlight_update_reason reason);</div><div class='del'>-int backlight_register_notifier(struct notifier_block *nb);</div><div class='del'>-int backlight_unregister_notifier(struct notifier_block *nb);</div><div class='ctx'> struct backlight_device *backlight_device_get_by_name(const char *name);</div><div class='ctx'> struct backlight_device *backlight_device_get_by_type(enum backlight_type type);</div><div class='ctx'> int backlight_device_set_brightness(struct backlight_device *bd,</div><div class='ctx'> 				    unsigned long brightness);</div><div class='ctx'> </div><div class='add'>+#if IS_REACHABLE(CONFIG_BACKLIGHT_CLASS_DEVICE)</div><div class='add'>+void backlight_notify_blank(struct backlight_device *bd,</div><div class='add'>+			    struct device *display_dev,</div><div class='add'>+			    bool fb_on, bool prev_fb_on);</div><div class='add'>+void backlight_notify_blank_all(struct device *display_dev,</div><div class='add'>+				bool fb_on, bool prev_fb_on);</div><div class='add'>+#else</div><div class='add'>+static inline void backlight_notify_blank(struct backlight_device *bd,</div><div class='add'>+					  struct device *display_dev,</div><div class='add'>+					  bool fb_on, bool prev_fb_on)</div><div class='add'>+{ }</div><div class='add'>+static inline void backlight_notify_blank_all(struct device *display_dev,</div><div class='add'>+					      bool fb_on, bool prev_fb_on)</div><div class='add'>+{ }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define to_backlight_device(obj) container_of(obj, struct backlight_device, dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/badblocks.h b/include/linux/badblocks.h<br/>index 670f2dae692f..996493917f36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/badblocks.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/badblocks.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/badblocks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/badblocks.h</a></div><div class='hunk'>@@ -48,11 +48,11 @@ struct badblocks_context {</div><div class='ctx'> 	int		ack;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int badblocks_check(struct badblocks *bb, sector_t s, int sectors,</div><div class='del'>-		   sector_t *first_bad, int *bad_sectors);</div><div class='del'>-int badblocks_set(struct badblocks *bb, sector_t s, int sectors,</div><div class='del'>-			int acknowledged);</div><div class='del'>-int badblocks_clear(struct badblocks *bb, sector_t s, int sectors);</div><div class='add'>+int badblocks_check(struct badblocks *bb, sector_t s, sector_t sectors,</div><div class='add'>+		    sector_t *first_bad, sector_t *bad_sectors);</div><div class='add'>+bool badblocks_set(struct badblocks *bb, sector_t s, sector_t sectors,</div><div class='add'>+		   int acknowledged);</div><div class='add'>+bool badblocks_clear(struct badblocks *bb, sector_t s, sector_t sectors);</div><div class='ctx'> void ack_all_badblocks(struct badblocks *bb);</div><div class='ctx'> ssize_t badblocks_show(struct badblocks *bb, char *page, int unack);</div><div class='ctx'> ssize_t badblocks_store(struct badblocks *bb, const char *page, size_t len,</div><div class='head'>diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h<br/>index 5ca2d5699620..7cfe48769239 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/balloon_compaction.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/balloon_compaction.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/balloon_compaction.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/balloon_compaction.h</a></div><div class='hunk'>@@ -4,12 +4,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Common interface definitions for making balloon pages movable by compaction.</div><div class='ctx'>  *</div><div class='del'>- * Balloon page migration makes use of the general non-lru movable page</div><div class='add'>+ * Balloon page migration makes use of the general "movable_ops page migration"</div><div class='ctx'>  * feature.</div><div class='ctx'>  *</div><div class='ctx'>  * page-&gt;private is used to reference the responsible balloon device.</div><div class='del'>- * page-&gt;mapping is used in context of non-lru page migration to reference</div><div class='del'>- * the address space operations for page isolation/migration/compaction.</div><div class='add'>+ * That these pages have movable_ops, and which movable_ops apply,</div><div class='add'>+ * is derived from the page type (PageOffline()) combined with the</div><div class='add'>+ * PG_movable_ops flag (PageMovableOps()).</div><div class='ctx'>  *</div><div class='ctx'>  * As the page isolation scanning step a compaction thread does is a lockless</div><div class='ctx'>  * procedure (from a page standpoint), it might bring some racy situations while</div><div class='hunk'>@@ -17,12 +18,10 @@</div><div class='ctx'>  * and safely perform balloon's page compaction and migration we must, always,</div><div class='ctx'>  * ensure following these simple rules:</div><div class='ctx'>  *</div><div class='del'>- *   i. when updating a balloon's page -&gt;mapping element, strictly do it under</div><div class='del'>- *      the following lock order, independently of the far superior</div><div class='del'>- *      locking scheme (lru_lock, balloon_lock):</div><div class='add'>+ *   i. Setting the PG_movable_ops flag and page-&gt;private with the following</div><div class='add'>+ *	lock order</div><div class='ctx'>  *	    +-page_lock(page);</div><div class='ctx'>  *	      +--spin_lock_irq(&amp;b_dev_info-&gt;pages_lock);</div><div class='del'>- *	            ... page-&gt;mapping updates here ...</div><div class='ctx'>  *</div><div class='ctx'>  *  ii. isolation or dequeueing procedure must remove the page from balloon</div><div class='ctx'>  *      device page list under b_dev_info-&gt;pages_lock.</div><div class='hunk'>@@ -78,6 +77,15 @@ static inline void balloon_devinfo_init(struct balloon_dev_info *balloon)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BALLOON_COMPACTION</div><div class='ctx'> extern const struct movable_operations balloon_mops;</div><div class='add'>+/*</div><div class='add'>+ * balloon_page_device - get the b_dev_info descriptor for the balloon device</div><div class='add'>+ *			 that enqueues the given page.</div><div class='add'>+ */</div><div class='add'>+static inline struct balloon_dev_info *balloon_page_device(struct page *page)</div><div class='add'>+{</div><div class='add'>+	return (struct balloon_dev_info *)page_private(page);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BALLOON_COMPACTION */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * balloon_page_insert - insert a page into the balloon's page list and make</div><div class='hunk'>@@ -92,68 +100,34 @@ static inline void balloon_page_insert(struct balloon_dev_info *balloon,</div><div class='ctx'> 				       struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	__SetPageOffline(page);</div><div class='del'>-	__SetPageMovable(page, &amp;balloon_mops);</div><div class='del'>-	set_page_private(page, (unsigned long)balloon);</div><div class='add'>+	if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) {</div><div class='add'>+		SetPageMovableOps(page);</div><div class='add'>+		set_page_private(page, (unsigned long)balloon);</div><div class='add'>+	}</div><div class='ctx'> 	list_add(&amp;page-&gt;lru, &amp;balloon-&gt;pages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * balloon_page_delete - delete a page from balloon's page list and clear</div><div class='del'>- *			 the page-&gt;private assignement accordingly.</div><div class='del'>- * @page    : page to be released from balloon's page list</div><div class='del'>- *</div><div class='del'>- * Caller must ensure the page is locked and the spin_lock protecting balloon</div><div class='del'>- * pages list is held before deleting a page from the balloon device.</div><div class='del'>- */</div><div class='del'>-static inline void balloon_page_delete(struct page *page)</div><div class='add'>+static inline gfp_t balloon_mapping_gfp_mask(void)</div><div class='ctx'> {</div><div class='del'>-	__ClearPageOffline(page);</div><div class='del'>-	__ClearPageMovable(page);</div><div class='del'>-	set_page_private(page, 0);</div><div class='del'>-	/*</div><div class='del'>-	 * No touch page.lru field once @page has been isolated</div><div class='del'>-	 * because VM is using the field.</div><div class='del'>-	 */</div><div class='del'>-	if (!PageIsolated(page))</div><div class='del'>-		list_del(&amp;page-&gt;lru);</div><div class='add'>+	if (IS_ENABLED(CONFIG_BALLOON_COMPACTION))</div><div class='add'>+		return GFP_HIGHUSER_MOVABLE;</div><div class='add'>+	return GFP_HIGHUSER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * balloon_page_device - get the b_dev_info descriptor for the balloon device</div><div class='del'>- *			 that enqueues the given page.</div><div class='add'>+ * balloon_page_finalize - prepare a balloon page that was removed from the</div><div class='add'>+ *			   balloon list for release to the page allocator</div><div class='add'>+ * @page: page to be released to the page allocator</div><div class='add'>+ *</div><div class='add'>+ * Caller must ensure that the page is locked.</div><div class='ctx'>  */</div><div class='del'>-static inline struct balloon_dev_info *balloon_page_device(struct page *page)</div><div class='add'>+static inline void balloon_page_finalize(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return (struct balloon_dev_info *)page_private(page);</div><div class='add'>+	if (IS_ENABLED(CONFIG_BALLOON_COMPACTION))</div><div class='add'>+		set_page_private(page, 0);</div><div class='add'>+	/* PageOffline is sticky until the page is freed to the buddy. */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline gfp_t balloon_mapping_gfp_mask(void)</div><div class='del'>-{</div><div class='del'>-	return GFP_HIGHUSER_MOVABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_BALLOON_COMPACTION */</div><div class='del'>-</div><div class='del'>-static inline void balloon_page_insert(struct balloon_dev_info *balloon,</div><div class='del'>-				       struct page *page)</div><div class='del'>-{</div><div class='del'>-	__SetPageOffline(page);</div><div class='del'>-	list_add(&amp;page-&gt;lru, &amp;balloon-&gt;pages);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void balloon_page_delete(struct page *page)</div><div class='del'>-{</div><div class='del'>-	__ClearPageOffline(page);</div><div class='del'>-	list_del(&amp;page-&gt;lru);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline gfp_t balloon_mapping_gfp_mask(void)</div><div class='del'>-{</div><div class='del'>-	return GFP_HIGHUSER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BALLOON_COMPACTION */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * balloon_page_push - insert a page into a page list.</div><div class='ctx'>  * @head : pointer to list</div><div class='head'>diff --git a/include/linux/base64.h b/include/linux/base64.h<br/>index 660d4cb1ef31..a2c6c9222da3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/base64.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/base64.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/base64.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/base64.h</a></div><div class='hunk'>@@ -8,9 +8,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+enum base64_variant {</div><div class='add'>+	BASE64_STD,       /* RFC 4648 (standard) */</div><div class='add'>+	BASE64_URLSAFE,   /* RFC 4648 (base64url) */</div><div class='add'>+	BASE64_IMAP,      /* RFC 3501 */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define BASE64_CHARS(nbytes)   DIV_ROUND_UP((nbytes) * 4, 3)</div><div class='ctx'> </div><div class='del'>-int base64_encode(const u8 *src, int len, char *dst);</div><div class='del'>-int base64_decode(const char *src, int len, u8 *dst);</div><div class='add'>+int base64_encode(const u8 *src, int len, char *dst, bool padding, enum base64_variant variant);</div><div class='add'>+int base64_decode(const char *src, int len, u8 *dst, bool padding, enum base64_variant variant);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_BASE64_H */</div><div class='head'>diff --git a/include/linux/bcm47xx_nvram.h b/include/linux/bcm47xx_nvram.h<br/>index 7615f8d7b1ed..e4b6ce953ddb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bcm47xx_nvram.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bcm47xx_nvram.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bcm47xx_nvram.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bcm47xx_nvram.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BCM47XX_NVRAM</div><div class='head'>diff --git a/include/linux/bcm47xx_sprom.h b/include/linux/bcm47xx_sprom.h<br/>index f8254fd53e15..40a7da3ef50e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bcm47xx_sprom.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bcm47xx_sprom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bcm47xx_sprom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bcm47xx_sprom.h</a></div><div class='hunk'>@@ -5,8 +5,8 @@</div><div class='ctx'> #ifndef __BCM47XX_SPROM_H</div><div class='ctx'> #define __BCM47XX_SPROM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ssb_sprom;</div><div class='head'>diff --git a/include/linux/bcm963xx_nvram.h b/include/linux/bcm963xx_nvram.h<br/>index c8c7f01159fe..48830bf18042 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bcm963xx_nvram.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bcm963xx_nvram.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bcm963xx_nvram.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bcm963xx_nvram.h</a></div><div class='hunk'>@@ -81,25 +81,21 @@ static int __maybe_unused bcm963xx_nvram_checksum(</div><div class='ctx'> 	const struct bcm963xx_nvram *nvram,</div><div class='ctx'> 	u32 *expected_out, u32 *actual_out)</div><div class='ctx'> {</div><div class='add'>+	const u32 zero = 0;</div><div class='ctx'> 	u32 expected, actual;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> </div><div class='ctx'> 	if (nvram-&gt;version &lt;= 4) {</div><div class='ctx'> 		expected = nvram-&gt;checksum_v4;</div><div class='del'>-		len = BCM963XX_NVRAM_V4_SIZE - sizeof(u32);</div><div class='add'>+		len = BCM963XX_NVRAM_V4_SIZE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		expected = nvram-&gt;checksum_v5;</div><div class='del'>-		len = BCM963XX_NVRAM_V5_SIZE - sizeof(u32);</div><div class='add'>+		len = BCM963XX_NVRAM_V5_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Calculate the CRC32 value for the nvram with a checksum value</div><div class='del'>-	 * of 0 without modifying or copying the nvram by combining:</div><div class='del'>-	 * - The CRC32 of the nvram without the checksum value</div><div class='del'>-	 * - The CRC32 of a zero checksum value (which is also 0)</div><div class='del'>-	 */</div><div class='del'>-	actual = crc32_le_combine(</div><div class='del'>-		crc32_le(~0, (u8 *)nvram, len), 0, sizeof(u32));</div><div class='add'>+	/* Calculate the CRC32 of the nvram with the checksum field set to 0. */</div><div class='add'>+	actual = crc32_le(~0, nvram, len - sizeof(u32));</div><div class='add'>+	actual = crc32_le(actual, &amp;zero, sizeof(u32));</div><div class='ctx'> </div><div class='ctx'> 	if (expected_out)</div><div class='ctx'> 		*expected_out = expected;</div><div class='head'>diff --git a/include/linux/bcma/bcma_driver_pci.h b/include/linux/bcma/bcma_driver_pci.h<br/>index 68da8dba5162..dba41b65ae0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bcma/bcma_driver_pci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bcma/bcma_driver_pci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bcma/bcma_driver_pci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bcma/bcma_driver_pci.h</a></div><div class='hunk'>@@ -203,7 +203,7 @@ struct pci_dev;</div><div class='ctx'> #define BCMA_CORE_PCI_MDIO_RXCTRL0		0x840</div><div class='ctx'> </div><div class='ctx'> /* PCIE Root Capability Register bits (Host mode only) */</div><div class='del'>-#define BCMA_CORE_PCI_RC_CRS_VISIBILITY		0x0001</div><div class='add'>+#define BCMA_CORE_PCI_RC_RRS_VISIBILITY		0x0001</div><div class='ctx'> </div><div class='ctx'> struct bcma_drv_pci;</div><div class='ctx'> struct bcma_bus;</div><div class='head'>diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h<br/>index 70f97f685bff..65abd5ab8836 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/binfmts.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/binfmts.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/binfmts.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/binfmts.h</a></div><div class='hunk'>@@ -19,13 +19,13 @@ struct linux_binprm {</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	unsigned long vma_pages;</div><div class='add'>+	unsigned long argmin; /* rlimit marker for copy_strings() */</div><div class='ctx'> #else</div><div class='ctx'> # define MAX_ARG_PAGES	32</div><div class='ctx'> 	struct page *page[MAX_ARG_PAGES];</div><div class='ctx'> #endif</div><div class='ctx'> 	struct mm_struct *mm;</div><div class='ctx'> 	unsigned long p; /* current top of mem */</div><div class='del'>-	unsigned long argmin; /* rlimit marker for copy_strings() */</div><div class='ctx'> 	unsigned int</div><div class='ctx'> 		/* Should an execfd be passed to userspace? */</div><div class='ctx'> 		have_execfd:1,</div><div class='hunk'>@@ -42,7 +42,14 @@ struct linux_binprm {</div><div class='ctx'> 		 * Set when errors can no longer be returned to the</div><div class='ctx'> 		 * original userspace.</div><div class='ctx'> 		 */</div><div class='del'>-		point_of_no_return:1;</div><div class='add'>+		point_of_no_return:1,</div><div class='add'>+		/* Set when "comm" must come from the dentry. */</div><div class='add'>+		comm_from_dentry:1,</div><div class='add'>+		/*</div><div class='add'>+		 * Set by user space to check executability according to the</div><div class='add'>+		 * caller's environment.</div><div class='add'>+		 */</div><div class='add'>+		is_check:1;</div><div class='ctx'> 	struct file *executable; /* Executable to pass to the interpreter */</div><div class='ctx'> 	struct file *interpreter;</div><div class='ctx'> 	struct file *file;</div><div class='hunk'>@@ -57,7 +64,7 @@ struct linux_binprm {</div><div class='ctx'> 	const char *fdpath;	/* generated filename for execveat */</div><div class='ctx'> 	unsigned interp_flags;</div><div class='ctx'> 	int execfd;		/* File descriptor of the executable */</div><div class='del'>-	unsigned long loader, exec;</div><div class='add'>+	unsigned long exec;</div><div class='ctx'> </div><div class='ctx'> 	struct rlimit rlim_stack; /* Saved RLIMIT_STACK used during exec. */</div><div class='ctx'> </div><div class='hunk'>@@ -83,7 +90,6 @@ struct linux_binfmt {</div><div class='ctx'> 	struct list_head lh;</div><div class='ctx'> 	struct module *module;</div><div class='ctx'> 	int (*load_binary)(struct linux_binprm *);</div><div class='del'>-	int (*load_shlib)(struct file *);</div><div class='ctx'> #ifdef CONFIG_COREDUMP</div><div class='ctx'> 	int (*core_dump)(struct coredump_params *cprm);</div><div class='ctx'> 	unsigned long min_coredump;	/* minimal dump size */</div><div class='head'>diff --git a/include/linux/bio-integrity.h b/include/linux/bio-integrity.h<br/>new file mode 100644<br/>index 000000000000..21e4652dcfd2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bio-integrity.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bio-integrity.h</a></div><div class='hunk'>@@ -0,0 +1,148 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_BIO_INTEGRITY_H</div><div class='add'>+#define _LINUX_BIO_INTEGRITY_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bio.h&gt;</div><div class='add'>+</div><div class='add'>+enum bip_flags {</div><div class='add'>+	BIP_BLOCK_INTEGRITY	= 1 &lt;&lt; 0, /* block layer owns integrity data */</div><div class='add'>+	BIP_MAPPED_INTEGRITY	= 1 &lt;&lt; 1, /* ref tag has been remapped */</div><div class='add'>+	BIP_DISK_NOCHECK	= 1 &lt;&lt; 2, /* disable disk integrity checking */</div><div class='add'>+	BIP_IP_CHECKSUM		= 1 &lt;&lt; 3, /* IP checksum */</div><div class='add'>+	BIP_COPY_USER		= 1 &lt;&lt; 4, /* Kernel bounce buffer in use */</div><div class='add'>+	BIP_CHECK_GUARD		= 1 &lt;&lt; 5, /* guard check */</div><div class='add'>+	BIP_CHECK_REFTAG	= 1 &lt;&lt; 6, /* reftag check */</div><div class='add'>+	BIP_CHECK_APPTAG	= 1 &lt;&lt; 7, /* apptag check */</div><div class='add'>+</div><div class='add'>+	BIP_MEMPOOL		= 1 &lt;&lt; 15, /* buffer backed by mempool */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bio_integrity_payload {</div><div class='add'>+	struct bvec_iter	bip_iter;</div><div class='add'>+</div><div class='add'>+	unsigned short		bip_vcnt;	/* # of integrity bio_vecs */</div><div class='add'>+	unsigned short		bip_max_vcnt;	/* integrity bio_vec slots */</div><div class='add'>+	unsigned short		bip_flags;	/* control flags */</div><div class='add'>+	u16			app_tag;	/* application tag value */</div><div class='add'>+</div><div class='add'>+	struct bio_vec		*bip_vec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BIP_CLONE_FLAGS (BIP_MAPPED_INTEGRITY | BIP_IP_CHECKSUM | \</div><div class='add'>+			 BIP_CHECK_GUARD | BIP_CHECK_REFTAG | BIP_CHECK_APPTAG)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INTEGRITY</div><div class='add'>+</div><div class='add'>+#define bip_for_each_vec(bvl, bip, iter)				\</div><div class='add'>+	for_each_bvec(bvl, (bip)-&gt;bip_vec, iter, (bip)-&gt;bip_iter)</div><div class='add'>+</div><div class='add'>+#define bio_for_each_integrity_vec(_bvl, _bio, _iter)			\</div><div class='add'>+	for_each_bio(_bio)						\</div><div class='add'>+		bip_for_each_vec(_bvl, _bio-&gt;bi_integrity, _iter)</div><div class='add'>+</div><div class='add'>+static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	if (bio-&gt;bi_opf &amp; REQ_INTEGRITY)</div><div class='add'>+		return bio-&gt;bi_integrity;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)</div><div class='add'>+{</div><div class='add'>+	struct bio_integrity_payload *bip = bio_integrity(bio);</div><div class='add'>+</div><div class='add'>+	if (bip)</div><div class='add'>+		return bip-&gt;bip_flags &amp; flag;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline sector_t bip_get_seed(struct bio_integrity_payload *bip)</div><div class='add'>+{</div><div class='add'>+	return bip-&gt;bip_iter.bi_sector;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bip_set_seed(struct bio_integrity_payload *bip,</div><div class='add'>+				sector_t seed)</div><div class='add'>+{</div><div class='add'>+	bip-&gt;bip_iter.bi_sector = seed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bio_integrity_init(struct bio *bio, struct bio_integrity_payload *bip,</div><div class='add'>+		struct bio_vec *bvecs, unsigned int nr_vecs);</div><div class='add'>+struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, gfp_t gfp,</div><div class='add'>+		unsigned int nr);</div><div class='add'>+int bio_integrity_add_page(struct bio *bio, struct page *page, unsigned int len,</div><div class='add'>+		unsigned int offset);</div><div class='add'>+int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter);</div><div class='add'>+int bio_integrity_map_iter(struct bio *bio, struct uio_meta *meta);</div><div class='add'>+void bio_integrity_unmap_user(struct bio *bio);</div><div class='add'>+bool bio_integrity_prep(struct bio *bio);</div><div class='add'>+void bio_integrity_advance(struct bio *bio, unsigned int bytes_done);</div><div class='add'>+void bio_integrity_trim(struct bio *bio);</div><div class='add'>+int bio_integrity_clone(struct bio *bio, struct bio *bio_src, gfp_t gfp_mask);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='add'>+</div><div class='add'>+static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int bio_integrity_map_iter(struct bio *bio, struct uio_meta *meta)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bio_integrity_unmap_user(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bio_integrity_prep(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int bio_integrity_clone(struct bio *bio, struct bio *bio_src,</div><div class='add'>+		gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bio_integrity_advance(struct bio *bio,</div><div class='add'>+		unsigned int bytes_done)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bio_integrity_trim(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct bio_integrity_payload *</div><div class='add'>+bio_integrity_alloc(struct bio *bio, gfp_t gfp, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int bio_integrity_add_page(struct bio *bio, struct page *page,</div><div class='add'>+					unsigned int len, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='add'>+</div><div class='add'>+void bio_integrity_alloc_buf(struct bio *bio, bool zero_buffer);</div><div class='add'>+void bio_integrity_free_buf(struct bio_integrity_payload *bip);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_BIO_INTEGRITY_H */</div><div class='head'>diff --git a/include/linux/bio.h b/include/linux/bio.h<br/>index 875d792bffff..ad2d57908c1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bio.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define BIO_MAX_VECS		256U</div><div class='add'>+#define BIO_MAX_INLINE_VECS	UIO_MAXIOV</div><div class='ctx'> </div><div class='ctx'> struct queue_limits;</div><div class='ctx'> </div><div class='hunk'>@@ -19,9 +20,6 @@ static inline unsigned int bio_max_segs(unsigned int nr_segs)</div><div class='ctx'> 	return min(nr_segs, BIO_MAX_VECS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define bio_prio(bio)			(bio)-&gt;bi_ioprio</div><div class='del'>-#define bio_set_prio(bio, prio)		((bio)-&gt;bi_ioprio = prio)</div><div class='del'>-</div><div class='ctx'> #define bio_iter_iovec(bio, iter)				\</div><div class='ctx'> 	bvec_iter_bvec((bio)-&gt;bi_io_vec, (iter))</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +291,7 @@ static inline void bio_first_folio(struct folio_iter *fi, struct bio *bio,</div><div class='ctx'> </div><div class='ctx'> 	fi-&gt;folio = page_folio(bvec-&gt;bv_page);</div><div class='ctx'> 	fi-&gt;offset = bvec-&gt;bv_offset +</div><div class='del'>-			PAGE_SIZE * (bvec-&gt;bv_page - &amp;fi-&gt;folio-&gt;page);</div><div class='add'>+			PAGE_SIZE * folio_page_idx(fi-&gt;folio, bvec-&gt;bv_page);</div><div class='ctx'> 	fi-&gt;_seg_count = bvec-&gt;bv_len;</div><div class='ctx'> 	fi-&gt;length = min(folio_size(fi-&gt;folio) - fi-&gt;offset, fi-&gt;_seg_count);</div><div class='ctx'> 	fi-&gt;_next = folio_next(fi-&gt;folio);</div><div class='hunk'>@@ -321,74 +319,13 @@ static inline void bio_next_folio(struct folio_iter *fi, struct bio *bio)</div><div class='ctx'> #define bio_for_each_folio_all(fi, bio)				\</div><div class='ctx'> 	for (bio_first_folio(&amp;fi, bio, 0); fi.folio; bio_next_folio(&amp;fi, bio))</div><div class='ctx'> </div><div class='del'>-enum bip_flags {</div><div class='del'>-	BIP_BLOCK_INTEGRITY	= 1 &lt;&lt; 0, /* block layer owns integrity data */</div><div class='del'>-	BIP_MAPPED_INTEGRITY	= 1 &lt;&lt; 1, /* ref tag has been remapped */</div><div class='del'>-	BIP_CTRL_NOCHECK	= 1 &lt;&lt; 2, /* disable HBA integrity checking */</div><div class='del'>-	BIP_DISK_NOCHECK	= 1 &lt;&lt; 3, /* disable disk integrity checking */</div><div class='del'>-	BIP_IP_CHECKSUM		= 1 &lt;&lt; 4, /* IP checksum */</div><div class='del'>-	BIP_INTEGRITY_USER	= 1 &lt;&lt; 5, /* Integrity payload is user address */</div><div class='del'>-	BIP_COPY_USER		= 1 &lt;&lt; 6, /* Kernel bounce buffer in use */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bio integrity payload</div><div class='del'>- */</div><div class='del'>-struct bio_integrity_payload {</div><div class='del'>-	struct bio		*bip_bio;	/* parent bio */</div><div class='del'>-</div><div class='del'>-	struct bvec_iter	bip_iter;</div><div class='del'>-</div><div class='del'>-	unsigned short		bip_vcnt;	/* # of integrity bio_vecs */</div><div class='del'>-	unsigned short		bip_max_vcnt;	/* integrity bio_vec slots */</div><div class='del'>-	unsigned short		bip_flags;	/* control flags */</div><div class='del'>-</div><div class='del'>-	struct bvec_iter	bio_iter;	/* for rewinding parent bio */</div><div class='del'>-</div><div class='del'>-	struct work_struct	bip_work;	/* I/O completion */</div><div class='del'>-</div><div class='del'>-	struct bio_vec		*bip_vec;</div><div class='del'>-	struct bio_vec		bip_inline_vecs[];/* embedded bvec array */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_BLK_DEV_INTEGRITY)</div><div class='del'>-</div><div class='del'>-static inline struct bio_integrity_payload *bio_integrity(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	if (bio-&gt;bi_opf &amp; REQ_INTEGRITY)</div><div class='del'>-		return bio-&gt;bi_integrity;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)</div><div class='del'>-{</div><div class='del'>-	struct bio_integrity_payload *bip = bio_integrity(bio);</div><div class='del'>-</div><div class='del'>-	if (bip)</div><div class='del'>-		return bip-&gt;bip_flags &amp; flag;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline sector_t bip_get_seed(struct bio_integrity_payload *bip)</div><div class='del'>-{</div><div class='del'>-	return bip-&gt;bip_iter.bi_sector;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bip_set_seed(struct bio_integrity_payload *bip,</div><div class='del'>-				sector_t seed)</div><div class='del'>-{</div><div class='del'>-	bip-&gt;bip_iter.bi_sector = seed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='del'>-</div><div class='ctx'> void bio_trim(struct bio *bio, sector_t offset, sector_t size);</div><div class='ctx'> extern struct bio *bio_split(struct bio *bio, int sectors,</div><div class='ctx'> 			     gfp_t gfp, struct bio_set *bs);</div><div class='del'>-struct bio *bio_split_rw(struct bio *bio, const struct queue_limits *lim,</div><div class='del'>-		unsigned *segs, struct bio_set *bs, unsigned max_bytes);</div><div class='add'>+int bio_split_io_at(struct bio *bio, const struct queue_limits *lim,</div><div class='add'>+		unsigned *segs, unsigned max_bytes, unsigned len_align);</div><div class='add'>+u8 bio_seg_gap(struct request_queue *q, struct bio *prev, struct bio *next,</div><div class='add'>+		u8 gaps_bit);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bio_next_split - get next @sectors from a bio, splitting if necessary</div><div class='hunk'>@@ -468,9 +405,13 @@ static inline int bio_iov_vecs_to_alloc(struct iov_iter *iter, int max_segs)</div><div class='ctx'> </div><div class='ctx'> struct request_queue;</div><div class='ctx'> </div><div class='del'>-extern int submit_bio_wait(struct bio *bio);</div><div class='ctx'> void bio_init(struct bio *bio, struct block_device *bdev, struct bio_vec *table,</div><div class='ctx'> 	      unsigned short max_vecs, blk_opf_t opf);</div><div class='add'>+static inline void bio_init_inline(struct bio *bio, struct block_device *bdev,</div><div class='add'>+	      unsigned short max_vecs, blk_opf_t opf)</div><div class='add'>+{</div><div class='add'>+	bio_init(bio, bdev, bio_inline_vecs(bio), max_vecs, opf);</div><div class='add'>+}</div><div class='ctx'> extern void bio_uninit(struct bio *);</div><div class='ctx'> void bio_reset(struct bio *bio, struct block_device *bdev, blk_opf_t opf);</div><div class='ctx'> void bio_chain(struct bio *, struct bio *);</div><div class='hunk'>@@ -479,16 +420,38 @@ int __must_check bio_add_page(struct bio *bio, struct page *page, unsigned len,</div><div class='ctx'> 			      unsigned off);</div><div class='ctx'> bool __must_check bio_add_folio(struct bio *bio, struct folio *folio,</div><div class='ctx'> 				size_t len, size_t off);</div><div class='del'>-extern int bio_add_pc_page(struct request_queue *, struct bio *, struct page *,</div><div class='del'>-			   unsigned int, unsigned int);</div><div class='del'>-int bio_add_zone_append_page(struct bio *bio, struct page *page,</div><div class='del'>-			     unsigned int len, unsigned int offset);</div><div class='ctx'> void __bio_add_page(struct bio *bio, struct page *page,</div><div class='ctx'> 		unsigned int len, unsigned int off);</div><div class='ctx'> void bio_add_folio_nofail(struct bio *bio, struct folio *folio, size_t len,</div><div class='ctx'> 			  size_t off);</div><div class='del'>-int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter);</div><div class='del'>-void bio_iov_bvec_set(struct bio *bio, struct iov_iter *iter);</div><div class='add'>+void bio_add_virt_nofail(struct bio *bio, void *vaddr, unsigned len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bio_add_max_vecs - number of bio_vecs needed to add data to a bio</div><div class='add'>+ * @kaddr: kernel virtual address to add</div><div class='add'>+ * @len: length in bytes to add</div><div class='add'>+ *</div><div class='add'>+ * Calculate how many bio_vecs need to be allocated to add the kernel virtual</div><div class='add'>+ * address range in [@kaddr:@len] in the worse case.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int bio_add_max_vecs(void *kaddr, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	if (is_vmalloc_addr(kaddr))</div><div class='add'>+		return DIV_ROUND_UP(offset_in_page(kaddr) + len, PAGE_SIZE);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int bio_add_vmalloc_chunk(struct bio *bio, void *vaddr, unsigned len);</div><div class='add'>+bool bio_add_vmalloc(struct bio *bio, void *vaddr, unsigned int len);</div><div class='add'>+</div><div class='add'>+int submit_bio_wait(struct bio *bio);</div><div class='add'>+int bdev_rw_virt(struct block_device *bdev, sector_t sector, void *data,</div><div class='add'>+		size_t len, enum req_op op);</div><div class='add'>+</div><div class='add'>+int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter,</div><div class='add'>+		unsigned len_align_mask);</div><div class='add'>+</div><div class='add'>+void bio_iov_bvec_set(struct bio *bio, const struct iov_iter *iter);</div><div class='ctx'> void __bio_release_pages(struct bio *bio, bool mark_dirty);</div><div class='ctx'> extern void bio_set_pages_dirty(struct bio *bio);</div><div class='ctx'> extern void bio_check_pages_dirty(struct bio *bio);</div><div class='hunk'>@@ -615,6 +578,13 @@ static inline void bio_list_merge(struct bio_list *bl, struct bio_list *bl2)</div><div class='ctx'> 	bl-&gt;tail = bl2-&gt;tail;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void bio_list_merge_init(struct bio_list *bl,</div><div class='add'>+		struct bio_list *bl2)</div><div class='add'>+{</div><div class='add'>+	bio_list_merge(bl, bl2);</div><div class='add'>+	bio_list_init(bl2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void bio_list_merge_head(struct bio_list *bl,</div><div class='ctx'> 				       struct bio_list *bl2)</div><div class='ctx'> {</div><div class='hunk'>@@ -688,10 +658,6 @@ struct bio_set {</div><div class='ctx'> </div><div class='ctx'> 	mempool_t bio_pool;</div><div class='ctx'> 	mempool_t bvec_pool;</div><div class='del'>-#if defined(CONFIG_BLK_DEV_INTEGRITY)</div><div class='del'>-	mempool_t bio_integrity_pool;</div><div class='del'>-	mempool_t bvec_integrity_pool;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	unsigned int back_pad;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -714,95 +680,6 @@ static inline bool bioset_initialized(struct bio_set *bs)</div><div class='ctx'> 	return bs-&gt;bio_slab != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_BLK_DEV_INTEGRITY)</div><div class='del'>-</div><div class='del'>-#define bip_for_each_vec(bvl, bip, iter)				\</div><div class='del'>-	for_each_bvec(bvl, (bip)-&gt;bip_vec, iter, (bip)-&gt;bip_iter)</div><div class='del'>-</div><div class='del'>-#define bio_for_each_integrity_vec(_bvl, _bio, _iter)			\</div><div class='del'>-	for_each_bio(_bio)						\</div><div class='del'>-		bip_for_each_vec(_bvl, _bio-&gt;bi_integrity, _iter)</div><div class='del'>-</div><div class='del'>-int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t len, u32 seed);</div><div class='del'>-extern struct bio_integrity_payload *bio_integrity_alloc(struct bio *, gfp_t, unsigned int);</div><div class='del'>-extern int bio_integrity_add_page(struct bio *, struct page *, unsigned int, unsigned int);</div><div class='del'>-extern bool bio_integrity_prep(struct bio *);</div><div class='del'>-extern void bio_integrity_advance(struct bio *, unsigned int);</div><div class='del'>-extern void bio_integrity_trim(struct bio *);</div><div class='del'>-extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t);</div><div class='del'>-extern int bioset_integrity_create(struct bio_set *, int);</div><div class='del'>-extern void bioset_integrity_free(struct bio_set *);</div><div class='del'>-extern void bio_integrity_init(void);</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='del'>-</div><div class='del'>-static inline void *bio_integrity(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bioset_integrity_create(struct bio_set *bs, int pool_size)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bioset_integrity_free (struct bio_set *bs)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bio_integrity_prep(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bio_integrity_clone(struct bio *bio, struct bio *bio_src,</div><div class='del'>-				      gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bio_integrity_advance(struct bio *bio,</div><div class='del'>-					 unsigned int bytes_done)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bio_integrity_trim(struct bio *bio)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bio_integrity_init(void)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bio_integrity_flagged(struct bio *bio, enum bip_flags flag)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *bio_integrity_alloc(struct bio * bio, gfp_t gfp,</div><div class='del'>-								unsigned int nr)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bio_integrity_add_page(struct bio *bio, struct page *page,</div><div class='del'>-					unsigned int len, unsigned int offset)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int bio_integrity_map_user(struct bio *bio, void __user *ubuf,</div><div class='del'>-					 ssize_t len, u32 seed)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Mark a bio as polled. Note that for async polled IO, the caller must</div><div class='ctx'>  * expect -EWOULDBLOCK if we cannot allocate a request (or other resources).</div><div class='hunk'>@@ -822,7 +699,28 @@ static inline void bio_clear_polled(struct bio *bio)</div><div class='ctx'> 	bio-&gt;bi_opf &amp;= ~REQ_POLLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bio_is_zone_append - is this a zone append bio?</div><div class='add'>+ * @bio:	bio to check</div><div class='add'>+ *</div><div class='add'>+ * Check if @bio is a zone append operation.  Core block layer code and end_io</div><div class='add'>+ * handlers must use this instead of an open coded REQ_OP_ZONE_APPEND check</div><div class='add'>+ * because the block layer can rewrite REQ_OP_ZONE_APPEND to REQ_OP_WRITE if</div><div class='add'>+ * it is not natively supported.</div><div class='add'>+ */</div><div class='add'>+static inline bool bio_is_zone_append(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_BLK_DEV_ZONED))</div><div class='add'>+		return false;</div><div class='add'>+	return bio_op(bio) == REQ_OP_ZONE_APPEND ||</div><div class='add'>+		bio_flagged(bio, BIO_EMULATES_ZONE_APPEND);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev,</div><div class='ctx'> 		unsigned int nr_pages, blk_opf_t opf, gfp_t gfp);</div><div class='add'>+struct bio *bio_chain_and_submit(struct bio *prev, struct bio *new);</div><div class='add'>+</div><div class='add'>+struct bio *blk_alloc_discard_bio(struct block_device *bdev,</div><div class='add'>+		sector_t *sector, sector_t *nr_sects, gfp_t gfp_mask);</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_BIO_H */</div><div class='head'>diff --git a/include/linux/bit_spinlock.h b/include/linux/bit_spinlock.h<br/>index bbc4730a6505..c0989b5b0407 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bit_spinlock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bit_spinlock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bit_spinlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bit_spinlock.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  * Don't use this unless you really need to: spin_lock() and spin_unlock()</div><div class='ctx'>  * are significantly faster.</div><div class='ctx'>  */</div><div class='del'>-static inline void bit_spin_lock(int bitnum, unsigned long *addr)</div><div class='add'>+static __always_inline void bit_spin_lock(int bitnum, unsigned long *addr)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Assuming the lock is uncontended, this never enters</div><div class='hunk'>@@ -38,7 +38,7 @@ static inline void bit_spin_lock(int bitnum, unsigned long *addr)</div><div class='ctx'> /*</div><div class='ctx'>  * Return true if it was acquired</div><div class='ctx'>  */</div><div class='del'>-static inline int bit_spin_trylock(int bitnum, unsigned long *addr)</div><div class='add'>+static __always_inline int bit_spin_trylock(int bitnum, unsigned long *addr)</div><div class='ctx'> {</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)</div><div class='hunk'>@@ -54,7 +54,7 @@ static inline int bit_spin_trylock(int bitnum, unsigned long *addr)</div><div class='ctx'> /*</div><div class='ctx'>  *  bit-based spin_unlock()</div><div class='ctx'>  */</div><div class='del'>-static inline void bit_spin_unlock(int bitnum, unsigned long *addr)</div><div class='add'>+static __always_inline void bit_spin_unlock(int bitnum, unsigned long *addr)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_DEBUG_SPINLOCK</div><div class='ctx'> 	BUG_ON(!test_bit(bitnum, addr));</div><div class='hunk'>@@ -71,7 +71,7 @@ static inline void bit_spin_unlock(int bitnum, unsigned long *addr)</div><div class='ctx'>  *  non-atomic version, which can be used eg. if the bit lock itself is</div><div class='ctx'>  *  protecting the rest of the flags in the word.</div><div class='ctx'>  */</div><div class='del'>-static inline void __bit_spin_unlock(int bitnum, unsigned long *addr)</div><div class='add'>+static __always_inline void __bit_spin_unlock(int bitnum, unsigned long *addr)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_DEBUG_SPINLOCK</div><div class='ctx'> 	BUG_ON(!test_bit(bitnum, addr));</div><div class='head'>diff --git a/include/linux/bitfield.h b/include/linux/bitfield.h<br/>index 63928f173223..126dc5b380af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bitfield.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bitfield.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bitfield.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bitfield.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #define _LINUX_BITFIELD_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/build_bug.h&gt;</div><div class='add'>+#include &lt;linux/typecheck.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -16,6 +17,7 @@</div><div class='ctx'>  * FIELD_{GET,PREP} macros take as first parameter shifted mask</div><div class='ctx'>  * from which they extract the base mask and shift amount.</div><div class='ctx'>  * Mask must be a compilation time constant.</div><div class='add'>+ * field_{get,prep} are variants that take a non-const mask.</div><div class='ctx'>  *</div><div class='ctx'>  * Example:</div><div class='ctx'>  *</div><div class='hunk'>@@ -38,8 +40,7 @@</div><div class='ctx'>  *	  FIELD_PREP(REG_FIELD_D, 0x40);</div><div class='ctx'>  *</div><div class='ctx'>  * Modify:</div><div class='del'>- *  reg &amp;= ~REG_FIELD_C;</div><div class='del'>- *  reg |= FIELD_PREP(REG_FIELD_C, c);</div><div class='add'>+ *  FIELD_MODIFY(REG_FIELD_C, &amp;reg, c);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define __bf_shf(x) (__builtin_ffsll(x) - 1)</div><div class='hunk'>@@ -60,7 +61,7 @@</div><div class='ctx'> </div><div class='ctx'> #define __bf_cast_unsigned(type, x)	((__unsigned_scalar_typeof(type))(x))</div><div class='ctx'> </div><div class='del'>-#define __BF_FIELD_CHECK(_mask, _reg, _val, _pfx)			\</div><div class='add'>+#define __BF_FIELD_CHECK_MASK(_mask, _val, _pfx)			\</div><div class='ctx'> 	({								\</div><div class='ctx'> 		BUILD_BUG_ON_MSG(!__builtin_constant_p(_mask),		\</div><div class='ctx'> 				 _pfx "mask is not constant");		\</div><div class='hunk'>@@ -69,13 +70,33 @@</div><div class='ctx'> 				 ~((_mask) &gt;&gt; __bf_shf(_mask)) &amp;	\</div><div class='ctx'> 					(0 + (_val)) : 0,		\</div><div class='ctx'> 				 _pfx "value too large for the field"); \</div><div class='del'>-		BUILD_BUG_ON_MSG(__bf_cast_unsigned(_mask, _mask) &gt;	\</div><div class='del'>-				 __bf_cast_unsigned(_reg, ~0ull),	\</div><div class='del'>-				 _pfx "type of reg too small for mask"); \</div><div class='ctx'> 		__BUILD_BUG_ON_NOT_POWER_OF_2((_mask) +			\</div><div class='ctx'> 					      (1ULL &lt;&lt; __bf_shf(_mask))); \</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='add'>+#define __BF_FIELD_CHECK_REG(mask, reg, pfx)				\</div><div class='add'>+	BUILD_BUG_ON_MSG(__bf_cast_unsigned(mask, mask) &gt;		\</div><div class='add'>+			 __bf_cast_unsigned(reg, ~0ull),		\</div><div class='add'>+			 pfx "type of reg too small for mask")</div><div class='add'>+</div><div class='add'>+#define __BF_FIELD_CHECK(mask, reg, val, pfx)				\</div><div class='add'>+	({								\</div><div class='add'>+		__BF_FIELD_CHECK_MASK(mask, val, pfx);			\</div><div class='add'>+		__BF_FIELD_CHECK_REG(mask, reg, pfx);			\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __FIELD_PREP(mask, val, pfx)					\</div><div class='add'>+	({								\</div><div class='add'>+		__BF_FIELD_CHECK_MASK(mask, val, pfx);			\</div><div class='add'>+		((typeof(mask))(val) &lt;&lt; __bf_shf(mask)) &amp; (mask);	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __FIELD_GET(mask, reg, pfx)					\</div><div class='add'>+	({								\</div><div class='add'>+		__BF_FIELD_CHECK_MASK(mask, 0U, pfx);			\</div><div class='add'>+		(typeof(mask))(((reg) &amp; (mask)) &gt;&gt; __bf_shf(mask));	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * FIELD_MAX() - produce the maximum value representable by a field</div><div class='ctx'>  * @_mask: shifted mask defining the field's length and position</div><div class='hunk'>@@ -112,8 +133,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #define FIELD_PREP(_mask, _val)						\</div><div class='ctx'> 	({								\</div><div class='del'>-		__BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: ");	\</div><div class='del'>-		((typeof(_mask))(_val) &lt;&lt; __bf_shf(_mask)) &amp; (_mask);	\</div><div class='add'>+		__BF_FIELD_CHECK_REG(_mask, 0ULL, "FIELD_PREP: ");	\</div><div class='add'>+		__FIELD_PREP(_mask, _val, "FIELD_PREP: ");		\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='ctx'> #define __BF_CHECK_POW2(n)	BUILD_BUG_ON_ZERO(((n) &amp; ((n) - 1)) != 0)</div><div class='hunk'>@@ -152,8 +173,25 @@</div><div class='ctx'>  */</div><div class='ctx'> #define FIELD_GET(_mask, _reg)						\</div><div class='ctx'> 	({								\</div><div class='del'>-		__BF_FIELD_CHECK(_mask, _reg, 0U, "FIELD_GET: ");	\</div><div class='del'>-		(typeof(_mask))(((_reg) &amp; (_mask)) &gt;&gt; __bf_shf(_mask));	\</div><div class='add'>+		__BF_FIELD_CHECK_REG(_mask, _reg, "FIELD_GET: ");	\</div><div class='add'>+		__FIELD_GET(_mask, _reg, "FIELD_GET: ");		\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * FIELD_MODIFY() - modify a bitfield element</div><div class='add'>+ * @_mask: shifted mask defining the field's length and position</div><div class='add'>+ * @_reg_p: pointer to the memory that should be updated</div><div class='add'>+ * @_val: value to store in the bitfield</div><div class='add'>+ *</div><div class='add'>+ * FIELD_MODIFY() modifies the set of bits in @_reg_p specified by @_mask,</div><div class='add'>+ * by replacing them with the bitfield value passed in as @_val.</div><div class='add'>+ */</div><div class='add'>+#define FIELD_MODIFY(_mask, _reg_p, _val)						\</div><div class='add'>+	({										\</div><div class='add'>+		typecheck_pointer(_reg_p);						\</div><div class='add'>+		__BF_FIELD_CHECK(_mask, *(_reg_p), _val, "FIELD_MODIFY: ");		\</div><div class='add'>+		*(_reg_p) &amp;= ~(_mask);							\</div><div class='add'>+		*(_reg_p) |= (((typeof(_mask))(_val) &lt;&lt; __bf_shf(_mask)) &amp; (_mask));	\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='ctx'> extern void __compiletime_error("value doesn't fit into mask")</div><div class='hunk'>@@ -172,14 +210,14 @@ static __always_inline u64 field_mask(u64 field)</div><div class='ctx'> }</div><div class='ctx'> #define field_max(field)	((typeof(field))field_mask(field))</div><div class='ctx'> #define ____MAKE_OP(type,base,to,from)					\</div><div class='del'>-static __always_inline __##type type##_encode_bits(base v, base field)	\</div><div class='add'>+static __always_inline __##type __must_check type##_encode_bits(base v, base field)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	if (__builtin_constant_p(v) &amp;&amp; (v &amp; ~field_mask(field)))	\</div><div class='ctx'> 		__field_overflow();					\</div><div class='ctx'> 	return to((v &amp; field_mask(field)) * field_multiplier(field));	\</div><div class='ctx'> }									\</div><div class='del'>-static __always_inline __##type type##_replace_bits(__##type old,	\</div><div class='del'>-					base val, base field)		\</div><div class='add'>+static __always_inline __##type __must_check type##_replace_bits(__##type old,	\</div><div class='add'>+							base val, base field)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	return (old &amp; ~to(field)) | type##_encode_bits(val, field);	\</div><div class='ctx'> }									\</div><div class='hunk'>@@ -188,7 +226,7 @@ static __always_inline void type##p_replace_bits(__##type *p,		\</div><div class='ctx'> {									\</div><div class='ctx'> 	*p = (*p &amp; ~to(field)) | type##_encode_bits(val, field);	\</div><div class='ctx'> }									\</div><div class='del'>-static __always_inline base type##_get_bits(__##type v, base field)	\</div><div class='add'>+static __always_inline base __must_check type##_get_bits(__##type v, base field)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	return (from(v) &amp; field)/field_multiplier(field);		\</div><div class='ctx'> }</div><div class='hunk'>@@ -203,4 +241,62 @@ __MAKE_OP(64)</div><div class='ctx'> #undef __MAKE_OP</div><div class='ctx'> #undef ____MAKE_OP</div><div class='ctx'> </div><div class='add'>+#define __field_prep(mask, val)						\</div><div class='add'>+	({								\</div><div class='add'>+		__auto_type __mask = (mask);				\</div><div class='add'>+		typeof(__mask) __val = (val);				\</div><div class='add'>+		unsigned int __shift = BITS_PER_TYPE(__mask) &lt;= 32 ?	\</div><div class='add'>+				       __ffs(__mask) : __ffs64(__mask);	\</div><div class='add'>+		(__val &lt;&lt; __shift) &amp; __mask;				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __field_get(mask, reg)						\</div><div class='add'>+	({								\</div><div class='add'>+		__auto_type __mask = (mask);				\</div><div class='add'>+		typeof(__mask) __reg =  (reg);				\</div><div class='add'>+		unsigned int __shift = BITS_PER_TYPE(__mask) &lt;= 32 ?	\</div><div class='add'>+				       __ffs(__mask) : __ffs64(__mask);	\</div><div class='add'>+		(__reg &amp; __mask) &gt;&gt; __shift;				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * field_prep() - prepare a bitfield element</div><div class='add'>+ * @mask: shifted mask defining the field's length and position, must be</div><div class='add'>+ *        non-zero</div><div class='add'>+ * @val:  value to put in the field</div><div class='add'>+ *</div><div class='add'>+ * Return: field value masked and shifted to its final destination</div><div class='add'>+ *</div><div class='add'>+ * field_prep() masks and shifts up the value.  The result should be</div><div class='add'>+ * combined with other fields of the bitfield using logical OR.</div><div class='add'>+ * Unlike FIELD_PREP(), @mask is not limited to a compile-time constant.</div><div class='add'>+ * Typical usage patterns are a value stored in a table, or calculated by</div><div class='add'>+ * shifting a constant by a variable number of bits.</div><div class='add'>+ * If you want to ensure that @mask is a compile-time constant, please use</div><div class='add'>+ * FIELD_PREP() directly instead.</div><div class='add'>+ */</div><div class='add'>+#define field_prep(mask, val)						\</div><div class='add'>+	(__builtin_constant_p(mask) ? __FIELD_PREP(mask, val, "field_prep: ") \</div><div class='add'>+				    : __field_prep(mask, val))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * field_get() - extract a bitfield element</div><div class='add'>+ * @mask: shifted mask defining the field's length and position, must be</div><div class='add'>+ *        non-zero</div><div class='add'>+ * @reg:  value of entire bitfield</div><div class='add'>+ *</div><div class='add'>+ * Return: extracted field value</div><div class='add'>+ *</div><div class='add'>+ * field_get() extracts the field specified by @mask from the</div><div class='add'>+ * bitfield passed in as @reg by masking and shifting it down.</div><div class='add'>+ * Unlike FIELD_GET(), @mask is not limited to a compile-time constant.</div><div class='add'>+ * Typical usage patterns are a value stored in a table, or calculated by</div><div class='add'>+ * shifting a constant by a variable number of bits.</div><div class='add'>+ * If you want to ensure that @mask is a compile-time constant, please use</div><div class='add'>+ * FIELD_GET() directly instead.</div><div class='add'>+ */</div><div class='add'>+#define field_get(mask, reg)						\</div><div class='add'>+	(__builtin_constant_p(mask) ? __FIELD_GET(mask, reg, "field_get: ") \</div><div class='add'>+				    : __field_get(mask, reg))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/bitmap-str.h b/include/linux/bitmap-str.h<br/>index 17caeca94cab..53d3e1b32d3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bitmap-str.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bitmap-str.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bitmap-str.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bitmap-str.h</a></div><div class='hunk'>@@ -2,12 +2,14 @@</div><div class='ctx'> #ifndef __LINUX_BITMAP_STR_H</div><div class='ctx'> #define __LINUX_BITMAP_STR_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> int bitmap_parse_user(const char __user *ubuf, unsigned int ulen, unsigned long *dst, int nbits);</div><div class='ctx'> int bitmap_print_to_pagebuf(bool list, char *buf, const unsigned long *maskp, int nmaskbits);</div><div class='del'>-extern int bitmap_print_bitmask_to_buf(char *buf, const unsigned long *maskp,</div><div class='del'>-					int nmaskbits, loff_t off, size_t count);</div><div class='del'>-extern int bitmap_print_list_to_buf(char *buf, const unsigned long *maskp,</div><div class='del'>-					int nmaskbits, loff_t off, size_t count);</div><div class='add'>+int bitmap_print_bitmask_to_buf(char *buf, const unsigned long *maskp, int nmaskbits,</div><div class='add'>+				loff_t off, size_t count);</div><div class='add'>+int bitmap_print_list_to_buf(char *buf, const unsigned long *maskp, int nmaskbits,</div><div class='add'>+			     loff_t off, size_t count);</div><div class='ctx'> int bitmap_parse(const char *buf, unsigned int buflen, unsigned long *dst, int nbits);</div><div class='ctx'> int bitmap_parselist(const char *buf, unsigned long *maskp, int nmaskbits);</div><div class='ctx'> int bitmap_parselist_user(const char __user *ubuf, unsigned int ulen,</div><div class='head'>diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h<br/>index fb3a9c93ac86..b0395e4ccf90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bitmap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bitmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bitmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bitmap.h</a></div><div class='hunk'>@@ -23,7 +23,7 @@ struct device;</div><div class='ctx'>  *</div><div class='ctx'>  * Function implementations generic to all architectures are in</div><div class='ctx'>  * lib/bitmap.c.  Functions implementations that are architecture</div><div class='del'>- * specific are in various include/asm-&lt;arch&gt;/bitops.h headers</div><div class='add'>+ * specific are in various arch/&lt;arch&gt;/include/asm/bitops.h headers</div><div class='ctx'>  * and other arch/&lt;arch&gt; specific files.</div><div class='ctx'>  *</div><div class='ctx'>  * See lib/bitmap.c for more details.</div><div class='hunk'>@@ -45,6 +45,7 @@ struct device;</div><div class='ctx'>  *  bitmap_copy(dst, src, nbits)                *dst = *src</div><div class='ctx'>  *  bitmap_and(dst, src1, src2, nbits)          *dst = *src1 &amp; *src2</div><div class='ctx'>  *  bitmap_or(dst, src1, src2, nbits)           *dst = *src1 | *src2</div><div class='add'>+ *  bitmap_weighted_or(dst, src1, src2, nbits)	*dst = *src1 | *src2. Returns Hamming Weight of dst</div><div class='ctx'>  *  bitmap_xor(dst, src1, src2, nbits)          *dst = *src1 ^ *src2</div><div class='ctx'>  *  bitmap_andnot(dst, src1, src2, nbits)       *dst = *src1 &amp; ~(*src2)</div><div class='ctx'>  *  bitmap_complement(dst, src, nbits)          *dst = ~(*src)</div><div class='hunk'>@@ -83,6 +84,10 @@ struct device;</div><div class='ctx'>  *  bitmap_to_arr64(buf, src, nbits)            Copy nbits from buf to u64[] dst</div><div class='ctx'>  *  bitmap_get_value8(map, start)               Get 8bit value from map at start</div><div class='ctx'>  *  bitmap_set_value8(map, value, start)        Set 8bit value to map at start</div><div class='add'>+ *  bitmap_read(map, start, nbits)              Read an nbits-sized value from</div><div class='add'>+ *                                              map at start</div><div class='add'>+ *  bitmap_write(map, value, start, nbits)      Write an nbits-sized value to</div><div class='add'>+ *                                              map at start</div><div class='ctx'>  *</div><div class='ctx'>  * Note, bitmap_zero() and bitmap_fill() operate over the region of</div><div class='ctx'>  * unsigned longs, that is, bits behind bitmap till the unsigned long</div><div class='hunk'>@@ -161,6 +166,8 @@ bool __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,</div><div class='ctx'> 		 const unsigned long *bitmap2, unsigned int nbits);</div><div class='ctx'> void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,</div><div class='ctx'> 		 const unsigned long *bitmap2, unsigned int nbits);</div><div class='add'>+unsigned int __bitmap_weighted_or(unsigned long *dst, const unsigned long *bitmap1,</div><div class='add'>+				  const unsigned long *bitmap2, unsigned int nbits);</div><div class='ctx'> void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,</div><div class='ctx'> 		  const unsigned long *bitmap2, unsigned int nbits);</div><div class='ctx'> bool __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,</div><div class='hunk'>@@ -199,12 +206,12 @@ unsigned long bitmap_find_next_zero_area_off(unsigned long *map,</div><div class='ctx'>  * the bit offset of all zero areas this function finds is multiples of that</div><div class='ctx'>  * power of 2. A @align_mask of 0 means no alignment is required.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long</div><div class='del'>-bitmap_find_next_zero_area(unsigned long *map,</div><div class='del'>-			   unsigned long size,</div><div class='del'>-			   unsigned long start,</div><div class='del'>-			   unsigned int nr,</div><div class='del'>-			   unsigned long align_mask)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned long bitmap_find_next_zero_area(unsigned long *map,</div><div class='add'>+					 unsigned long size,</div><div class='add'>+					 unsigned long start,</div><div class='add'>+					 unsigned int nr,</div><div class='add'>+					 unsigned long align_mask)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_find_next_zero_area_off(map, size, start, nr,</div><div class='ctx'> 					      align_mask, 0);</div><div class='hunk'>@@ -222,9 +229,11 @@ void bitmap_fold(unsigned long *dst, const unsigned long *orig,</div><div class='ctx'> #define BITMAP_FIRST_WORD_MASK(start) (~0UL &lt;&lt; ((start) &amp; (BITS_PER_LONG - 1)))</div><div class='ctx'> #define BITMAP_LAST_WORD_MASK(nbits) (~0UL &gt;&gt; (-(nbits) &amp; (BITS_PER_LONG - 1)))</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_zero(unsigned long *dst, unsigned int nbits)</div><div class='add'>+#define bitmap_size(nbits)	(ALIGN(nbits, BITS_PER_LONG) / BITS_PER_BYTE)</div><div class='add'>+</div><div class='add'>+static __always_inline void bitmap_zero(unsigned long *dst, unsigned int nbits)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);</div><div class='add'>+	unsigned int len = bitmap_size(nbits);</div><div class='ctx'> </div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = 0;</div><div class='hunk'>@@ -232,9 +241,9 @@ static inline void bitmap_zero(unsigned long *dst, unsigned int nbits)</div><div class='ctx'> 		memset(dst, 0, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_fill(unsigned long *dst, unsigned int nbits)</div><div class='add'>+static __always_inline void bitmap_fill(unsigned long *dst, unsigned int nbits)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);</div><div class='add'>+	unsigned int len = bitmap_size(nbits);</div><div class='ctx'> </div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = ~0UL;</div><div class='hunk'>@@ -242,10 +251,10 @@ static inline void bitmap_fill(unsigned long *dst, unsigned int nbits)</div><div class='ctx'> 		memset(dst, 0xff, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,</div><div class='del'>-			unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_copy(unsigned long *dst, const unsigned long *src, unsigned int nbits)</div><div class='ctx'> {</div><div class='del'>-	unsigned int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);</div><div class='add'>+	unsigned int len = bitmap_size(nbits);</div><div class='ctx'> </div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = *src;</div><div class='hunk'>@@ -256,14 +265,26 @@ static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,</div><div class='ctx'> /*</div><div class='ctx'>  * Copy bitmap and clear tail bits in last word.</div><div class='ctx'>  */</div><div class='del'>-static inline void bitmap_copy_clear_tail(unsigned long *dst,</div><div class='del'>-		const unsigned long *src, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_copy_clear_tail(unsigned long *dst, const unsigned long *src, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_copy(dst, src, nbits);</div><div class='ctx'> 	if (nbits % BITS_PER_LONG)</div><div class='ctx'> 		dst[nbits / BITS_PER_LONG] &amp;= BITMAP_LAST_WORD_MASK(nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void bitmap_copy_and_extend(unsigned long *to,</div><div class='add'>+					  const unsigned long *from,</div><div class='add'>+					  unsigned int count, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	unsigned int copy = BITS_TO_LONGS(count);</div><div class='add'>+</div><div class='add'>+	memcpy(to, from, copy * sizeof(long));</div><div class='add'>+	if (count % BITS_PER_LONG)</div><div class='add'>+		to[copy - 1] &amp;= BITMAP_LAST_WORD_MASK(count);</div><div class='add'>+	memset(to + copy, 0, bitmap_size(size) - copy * sizeof(long));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * On 32-bit systems bitmaps are represented as u32 arrays internally. On LE64</div><div class='ctx'>  * machines the order of hi and lo parts of numbers match the bitmap structure.</div><div class='hunk'>@@ -300,16 +321,18 @@ void bitmap_to_arr64(u64 *buf, const unsigned long *bitmap, unsigned int nbits);</div><div class='ctx'> 	bitmap_copy_clear_tail((unsigned long *)(buf), (const unsigned long *)(bitmap), (nbits))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline bool bitmap_and(unsigned long *dst, const unsigned long *src1,</div><div class='del'>-			const unsigned long *src2, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+bool bitmap_and(unsigned long *dst, const unsigned long *src1,</div><div class='add'>+		const unsigned long *src2, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		return (*dst = *src1 &amp; *src2 &amp; BITMAP_LAST_WORD_MASK(nbits)) != 0;</div><div class='ctx'> 	return __bitmap_and(dst, src1, src2, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,</div><div class='del'>-			const unsigned long *src2, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_or(unsigned long *dst, const unsigned long *src1,</div><div class='add'>+	       const unsigned long *src2, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = *src1 | *src2;</div><div class='hunk'>@@ -317,8 +340,21 @@ static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,</div><div class='ctx'> 		__bitmap_or(dst, src1, src2, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,</div><div class='del'>-			const unsigned long *src2, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int bitmap_weighted_or(unsigned long *dst, const unsigned long *src1,</div><div class='add'>+				const unsigned long *src2, unsigned int nbits)</div><div class='add'>+{</div><div class='add'>+	if (small_const_nbits(nbits)) {</div><div class='add'>+		*dst = *src1 | *src2;</div><div class='add'>+		return hweight_long(*dst &amp; BITMAP_LAST_WORD_MASK(nbits));</div><div class='add'>+	} else {</div><div class='add'>+		return __bitmap_weighted_or(dst, src1, src2, nbits);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_xor(unsigned long *dst, const unsigned long *src1,</div><div class='add'>+		const unsigned long *src2, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = *src1 ^ *src2;</div><div class='hunk'>@@ -326,16 +362,17 @@ static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,</div><div class='ctx'> 		__bitmap_xor(dst, src1, src2, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool bitmap_andnot(unsigned long *dst, const unsigned long *src1,</div><div class='del'>-			const unsigned long *src2, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+bool bitmap_andnot(unsigned long *dst, const unsigned long *src1,</div><div class='add'>+		   const unsigned long *src2, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		return (*dst = *src1 &amp; ~(*src2) &amp; BITMAP_LAST_WORD_MASK(nbits)) != 0;</div><div class='ctx'> 	return __bitmap_andnot(dst, src1, src2, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_complement(unsigned long *dst, const unsigned long *src,</div><div class='del'>-			unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_complement(unsigned long *dst, const unsigned long *src, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = ~(*src);</div><div class='hunk'>@@ -350,8 +387,8 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr</div><div class='ctx'> #endif</div><div class='ctx'> #define BITMAP_MEM_MASK (BITMAP_MEM_ALIGNMENT - 1)</div><div class='ctx'> </div><div class='del'>-static inline bool bitmap_equal(const unsigned long *src1,</div><div class='del'>-				const unsigned long *src2, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+bool bitmap_equal(const unsigned long *src1, const unsigned long *src2, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		return !((*src1 ^ *src2) &amp; BITMAP_LAST_WORD_MASK(nbits));</div><div class='hunk'>@@ -370,10 +407,9 @@ static inline bool bitmap_equal(const unsigned long *src1,</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: True if (*@src1 | *@src2) == *@src3, false otherwise</div><div class='ctx'>  */</div><div class='del'>-static inline bool bitmap_or_equal(const unsigned long *src1,</div><div class='del'>-				   const unsigned long *src2,</div><div class='del'>-				   const unsigned long *src3,</div><div class='del'>-				   unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+bool bitmap_or_equal(const unsigned long *src1, const unsigned long *src2,</div><div class='add'>+		     const unsigned long *src3, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (!small_const_nbits(nbits))</div><div class='ctx'> 		return __bitmap_or_equal(src1, src2, src3, nbits);</div><div class='hunk'>@@ -381,9 +417,8 @@ static inline bool bitmap_or_equal(const unsigned long *src1,</div><div class='ctx'> 	return !(((*src1 | *src2) ^ *src3) &amp; BITMAP_LAST_WORD_MASK(nbits));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool bitmap_intersects(const unsigned long *src1,</div><div class='del'>-				     const unsigned long *src2,</div><div class='del'>-				     unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+bool bitmap_intersects(const unsigned long *src1, const unsigned long *src2, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		return ((*src1 &amp; *src2) &amp; BITMAP_LAST_WORD_MASK(nbits)) != 0;</div><div class='hunk'>@@ -391,8 +426,8 @@ static inline bool bitmap_intersects(const unsigned long *src1,</div><div class='ctx'> 		return __bitmap_intersects(src1, src2, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool bitmap_subset(const unsigned long *src1,</div><div class='del'>-				 const unsigned long *src2, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+bool bitmap_subset(const unsigned long *src1, const unsigned long *src2, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		return ! ((*src1 &amp; ~(*src2)) &amp; BITMAP_LAST_WORD_MASK(nbits));</div><div class='hunk'>@@ -400,7 +435,8 @@ static inline bool bitmap_subset(const unsigned long *src1,</div><div class='ctx'> 		return __bitmap_subset(src1, src2, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool bitmap_empty(const unsigned long *src, unsigned nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+bool bitmap_empty(const unsigned long *src, unsigned nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		return ! (*src &amp; BITMAP_LAST_WORD_MASK(nbits));</div><div class='hunk'>@@ -408,7 +444,8 @@ static inline bool bitmap_empty(const unsigned long *src, unsigned nbits)</div><div class='ctx'> 	return find_first_bit(src, nbits) == nbits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool bitmap_full(const unsigned long *src, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+bool bitmap_full(const unsigned long *src, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		return ! (~(*src) &amp; BITMAP_LAST_WORD_MASK(nbits));</div><div class='hunk'>@@ -442,8 +479,8 @@ unsigned long bitmap_weight_andnot(const unsigned long *src1,</div><div class='ctx'> 	return __bitmap_weight_andnot(src1, src2, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline void bitmap_set(unsigned long *map, unsigned int start,</div><div class='del'>-		unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_set(unsigned long *map, unsigned int start, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (__builtin_constant_p(nbits) &amp;&amp; nbits == 1)</div><div class='ctx'> 		__set_bit(start, map);</div><div class='hunk'>@@ -458,8 +495,8 @@ static __always_inline void bitmap_set(unsigned long *map, unsigned int start,</div><div class='ctx'> 		__bitmap_set(map, start, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline void bitmap_clear(unsigned long *map, unsigned int start,</div><div class='del'>-		unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_clear(unsigned long *map, unsigned int start, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (__builtin_constant_p(nbits) &amp;&amp; nbits == 1)</div><div class='ctx'> 		__clear_bit(start, map);</div><div class='hunk'>@@ -474,8 +511,9 @@ static __always_inline void bitmap_clear(unsigned long *map, unsigned int start,</div><div class='ctx'> 		__bitmap_clear(map, start, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_shift_right(unsigned long *dst, const unsigned long *src,</div><div class='del'>-				unsigned int shift, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_shift_right(unsigned long *dst, const unsigned long *src,</div><div class='add'>+			unsigned int shift, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = (*src &amp; BITMAP_LAST_WORD_MASK(nbits)) &gt;&gt; shift;</div><div class='hunk'>@@ -483,8 +521,9 @@ static inline void bitmap_shift_right(unsigned long *dst, const unsigned long *s</div><div class='ctx'> 		__bitmap_shift_right(dst, src, shift, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_shift_left(unsigned long *dst, const unsigned long *src,</div><div class='del'>-				unsigned int shift, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_shift_left(unsigned long *dst, const unsigned long *src,</div><div class='add'>+		       unsigned int shift, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = (*src &lt;&lt; shift) &amp; BITMAP_LAST_WORD_MASK(nbits);</div><div class='hunk'>@@ -492,11 +531,12 @@ static inline void bitmap_shift_left(unsigned long *dst, const unsigned long *sr</div><div class='ctx'> 		__bitmap_shift_left(dst, src, shift, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_replace(unsigned long *dst,</div><div class='del'>-				  const unsigned long *old,</div><div class='del'>-				  const unsigned long *new,</div><div class='del'>-				  const unsigned long *mask,</div><div class='del'>-				  unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_replace(unsigned long *dst,</div><div class='add'>+		    const unsigned long *old,</div><div class='add'>+		    const unsigned long *new,</div><div class='add'>+		    const unsigned long *mask,</div><div class='add'>+		    unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(nbits))</div><div class='ctx'> 		*dst = (*old &amp; ~(*mask)) | (*new &amp; *mask);</div><div class='hunk'>@@ -522,24 +562,26 @@ static inline void bitmap_replace(unsigned long *dst,</div><div class='ctx'>  *</div><div class='ctx'>  * (Bits 0, 1, 2, 3, 4, 5 are copied to the bits 0, 1, 4, 8, 9, 12)</div><div class='ctx'>  *</div><div class='del'>- * A more 'visual' description of the operation:</div><div class='del'>- * src:  0000000001011010</div><div class='del'>- *                 ||||||</div><div class='del'>- *          +------+|||||</div><div class='del'>- *          |  +----+||||</div><div class='del'>- *          |  |+----+|||</div><div class='del'>- *          |  ||   +-+||</div><div class='del'>- *          |  ||   |  ||</div><div class='del'>- * mask: ...v..vv...v..vv</div><div class='del'>- *       ...0..11...0..10</div><div class='del'>- * dst:  0000001100000010</div><div class='del'>- *</div><div class='del'>- * A relationship exists between bitmap_scatter() and bitmap_gather().</div><div class='add'>+ * A more 'visual' description of the operation::</div><div class='add'>+ *</div><div class='add'>+ *	src:  0000000001011010</div><div class='add'>+ *	                ||||||</div><div class='add'>+ *	         +------+|||||</div><div class='add'>+ *	         |  +----+||||</div><div class='add'>+ *	         |  |+----+|||</div><div class='add'>+ *	         |  ||   +-+||</div><div class='add'>+ *	         |  ||   |  ||</div><div class='add'>+ *	mask: ...v..vv...v..vv</div><div class='add'>+ *	      ...0..11...0..10</div><div class='add'>+ *	dst:  0000001100000010</div><div class='add'>+ *</div><div class='add'>+ * A relationship exists between bitmap_scatter() and bitmap_gather(). See</div><div class='add'>+ * bitmap_gather() for the bitmap gather detailed operations. TL;DR:</div><div class='ctx'>  * bitmap_gather() can be seen as the 'reverse' bitmap_scatter() operation.</div><div class='del'>- * See bitmap_scatter() for details related to this relationship.</div><div class='ctx'>  */</div><div class='del'>-static inline void bitmap_scatter(unsigned long *dst, const unsigned long *src,</div><div class='del'>-				  const unsigned long *mask, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_scatter(unsigned long *dst, const unsigned long *src,</div><div class='add'>+		    const unsigned long *mask, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int n = 0;</div><div class='ctx'> 	unsigned int bit;</div><div class='hunk'>@@ -568,19 +610,22 @@ static inline void bitmap_scatter(unsigned long *dst, const unsigned long *src,</div><div class='ctx'>  *</div><div class='ctx'>  * (Bits 0, 1, 4, 8, 9, 12 are copied to the bits 0, 1, 2, 3, 4, 5)</div><div class='ctx'>  *</div><div class='del'>- * A more 'visual' description of the operation:</div><div class='del'>- * mask: ...v..vv...v..vv</div><div class='del'>- * src:  0000001100000010</div><div class='del'>- *          ^  ^^   ^   0</div><div class='del'>- *          |  ||   |  10</div><div class='del'>- *          |  ||   &gt; 010</div><div class='del'>- *          |  |+--&gt; 1010</div><div class='del'>- *          |  +--&gt; 11010</div><div class='del'>- *          +----&gt; 011010</div><div class='del'>- * dst:  0000000000011010</div><div class='add'>+ * A more 'visual' description of the operation::</div><div class='add'>+ *</div><div class='add'>+ *	mask: ...v..vv...v..vv</div><div class='add'>+ *	src:  0000001100000010</div><div class='add'>+ *	         ^  ^^   ^   0</div><div class='add'>+ *	         |  ||   |  10</div><div class='add'>+ *	         |  ||   &gt; 010</div><div class='add'>+ *	         |  |+--&gt; 1010</div><div class='add'>+ *	         |  +--&gt; 11010</div><div class='add'>+ *	         +----&gt; 011010</div><div class='add'>+ *	dst:  0000000000011010</div><div class='ctx'>  *</div><div class='ctx'>  * A relationship exists between bitmap_gather() and bitmap_scatter(). See</div><div class='del'>- * bitmap_scatter() for the bitmap scatter detailed operations.</div><div class='add'>+ * bitmap_scatter() for the bitmap scatter detailed operations. TL;DR:</div><div class='add'>+ * bitmap_scatter() can be seen as the 'reverse' bitmap_gather() operation.</div><div class='add'>+ *</div><div class='ctx'>  * Suppose scattered computed using bitmap_scatter(scattered, src, mask, n).</div><div class='ctx'>  * The operation bitmap_gather(result, scattered, mask, n) leads to a result</div><div class='ctx'>  * equal or equivalent to src.</div><div class='hunk'>@@ -591,8 +636,9 @@ static inline void bitmap_scatter(unsigned long *dst, const unsigned long *src,</div><div class='ctx'>  * bitmap_scatter(res, src, mask, n) and a call to</div><div class='ctx'>  * bitmap_scatter(res, result, mask, n) will lead to the same res value.</div><div class='ctx'>  */</div><div class='del'>-static inline void bitmap_gather(unsigned long *dst, const unsigned long *src,</div><div class='del'>-				 const unsigned long *mask, unsigned int nbits)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_gather(unsigned long *dst, const unsigned long *src,</div><div class='add'>+		   const unsigned long *mask, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int n = 0;</div><div class='ctx'> 	unsigned int bit;</div><div class='hunk'>@@ -603,9 +649,9 @@ static inline void bitmap_gather(unsigned long *dst, const unsigned long *src,</div><div class='ctx'> 		__assign_bit(n++, dst, test_bit(bit, src));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bitmap_next_set_region(unsigned long *bitmap,</div><div class='del'>-					  unsigned int *rs, unsigned int *re,</div><div class='del'>-					  unsigned int end)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_next_set_region(unsigned long *bitmap, unsigned int *rs,</div><div class='add'>+			    unsigned int *re, unsigned int end)</div><div class='ctx'> {</div><div class='ctx'> 	*rs = find_next_bit(bitmap, end, *rs);</div><div class='ctx'> 	*re = find_next_zero_bit(bitmap, end, *rs + 1);</div><div class='hunk'>@@ -620,7 +666,8 @@ static inline void bitmap_next_set_region(unsigned long *bitmap,</div><div class='ctx'>  * This is the complement to __bitmap_find_free_region() and releases</div><div class='ctx'>  * the found region (by clearing it in the bitmap).</div><div class='ctx'>  */</div><div class='del'>-static inline void bitmap_release_region(unsigned long *bitmap, unsigned int pos, int order)</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_release_region(unsigned long *bitmap, unsigned int pos, int order)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_clear(bitmap, pos, BIT(order));</div><div class='ctx'> }</div><div class='hunk'>@@ -636,7 +683,8 @@ static inline void bitmap_release_region(unsigned long *bitmap, unsigned int pos</div><div class='ctx'>  * Returns: 0 on success, or %-EBUSY if specified region wasn't</div><div class='ctx'>  * free (not all bits were zero).</div><div class='ctx'>  */</div><div class='del'>-static inline int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos, int order)</div><div class='add'>+static __always_inline</div><div class='add'>+int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos, int order)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int len = BIT(order);</div><div class='ctx'> </div><div class='hunk'>@@ -660,7 +708,8 @@ static inline int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos</div><div class='ctx'>  * Returns: the bit offset in bitmap of the allocated region,</div><div class='ctx'>  * or -errno on failure.</div><div class='ctx'>  */</div><div class='del'>-static inline int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order)</div><div class='add'>+static __always_inline</div><div class='add'>+int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int pos, end;		/* scans bitmap by regions of size order */</div><div class='ctx'> </div><div class='hunk'>@@ -714,44 +763,89 @@ static inline int bitmap_find_free_region(unsigned long *bitmap, unsigned int bi</div><div class='ctx'>  * That is ``(u32 *)(&amp;val)[0]`` gets the upper 32 bits,</div><div class='ctx'>  * but we expect the lower 32-bits of u64.</div><div class='ctx'>  */</div><div class='del'>-static inline void bitmap_from_u64(unsigned long *dst, u64 mask)</div><div class='add'>+static __always_inline void bitmap_from_u64(unsigned long *dst, u64 mask)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_from_arr64(dst, &amp;mask, 64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bitmap_get_value8 - get an 8-bit value within a memory region</div><div class='add'>+ * bitmap_read - read a value of n-bits from the memory region</div><div class='ctx'>  * @map: address to the bitmap memory region</div><div class='del'>- * @start: bit offset of the 8-bit value; must be a multiple of 8</div><div class='add'>+ * @start: bit offset of the n-bit value</div><div class='add'>+ * @nbits: size of value in bits, nonzero, up to BITS_PER_LONG</div><div class='ctx'>  *</div><div class='del'>- * Returns the 8-bit value located at the @start bit offset within the @src</div><div class='del'>- * memory region.</div><div class='add'>+ * Returns: value of @nbits bits located at the @start bit offset within the</div><div class='add'>+ * @map memory region. For @nbits = 0 and @nbits &gt; BITS_PER_LONG the return</div><div class='add'>+ * value is undefined.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long bitmap_get_value8(const unsigned long *map,</div><div class='del'>-					      unsigned long start)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned long bitmap_read(const unsigned long *map, unsigned long start, unsigned long nbits)</div><div class='ctx'> {</div><div class='del'>-	const size_t index = BIT_WORD(start);</div><div class='del'>-	const unsigned long offset = start % BITS_PER_LONG;</div><div class='add'>+	size_t index = BIT_WORD(start);</div><div class='add'>+	unsigned long offset = start % BITS_PER_LONG;</div><div class='add'>+	unsigned long space = BITS_PER_LONG - offset;</div><div class='add'>+	unsigned long value_low, value_high;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!nbits || nbits &gt; BITS_PER_LONG))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return (map[index] &gt;&gt; offset) &amp; 0xFF;</div><div class='add'>+	if (space &gt;= nbits)</div><div class='add'>+		return (map[index] &gt;&gt; offset) &amp; BITMAP_LAST_WORD_MASK(nbits);</div><div class='add'>+</div><div class='add'>+	value_low = map[index] &amp; BITMAP_FIRST_WORD_MASK(start);</div><div class='add'>+	value_high = map[index + 1] &amp; BITMAP_LAST_WORD_MASK(start + nbits);</div><div class='add'>+	return (value_low &gt;&gt; offset) | (value_high &lt;&lt; space);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bitmap_set_value8 - set an 8-bit value within a memory region</div><div class='add'>+ * bitmap_write - write n-bit value within a memory region</div><div class='ctx'>  * @map: address to the bitmap memory region</div><div class='del'>- * @value: the 8-bit value; values wider than 8 bits may clobber bitmap</div><div class='del'>- * @start: bit offset of the 8-bit value; must be a multiple of 8</div><div class='add'>+ * @value: value to write, clamped to nbits</div><div class='add'>+ * @start: bit offset of the n-bit value</div><div class='add'>+ * @nbits: size of value in bits, nonzero, up to BITS_PER_LONG.</div><div class='add'>+ *</div><div class='add'>+ * bitmap_write() behaves as-if implemented as @nbits calls of __assign_bit(),</div><div class='add'>+ * i.e. bits beyond @nbits are ignored:</div><div class='add'>+ *</div><div class='add'>+ *   for (bit = 0; bit &lt; nbits; bit++)</div><div class='add'>+ *           __assign_bit(start + bit, bitmap, val &amp; BIT(bit));</div><div class='add'>+ *</div><div class='add'>+ * For @nbits == 0 and @nbits &gt; BITS_PER_LONG no writes are performed.</div><div class='ctx'>  */</div><div class='del'>-static inline void bitmap_set_value8(unsigned long *map, unsigned long value,</div><div class='del'>-				     unsigned long start)</div><div class='del'>-{</div><div class='del'>-	const size_t index = BIT_WORD(start);</div><div class='del'>-	const unsigned long offset = start % BITS_PER_LONG;</div><div class='del'>-</div><div class='del'>-	map[index] &amp;= ~(0xFFUL &lt;&lt; offset);</div><div class='add'>+static __always_inline</div><div class='add'>+void bitmap_write(unsigned long *map, unsigned long value,</div><div class='add'>+		  unsigned long start, unsigned long nbits)</div><div class='add'>+{</div><div class='add'>+	size_t index;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+	unsigned long space;</div><div class='add'>+	unsigned long mask;</div><div class='add'>+	bool fit;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!nbits || nbits &gt; BITS_PER_LONG))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mask = BITMAP_LAST_WORD_MASK(nbits);</div><div class='add'>+	value &amp;= mask;</div><div class='add'>+	offset = start % BITS_PER_LONG;</div><div class='add'>+	space = BITS_PER_LONG - offset;</div><div class='add'>+	fit = space &gt;= nbits;</div><div class='add'>+	index = BIT_WORD(start);</div><div class='add'>+</div><div class='add'>+	map[index] &amp;= (fit ? (~(mask &lt;&lt; offset)) : ~BITMAP_FIRST_WORD_MASK(start));</div><div class='ctx'> 	map[index] |= value &lt;&lt; offset;</div><div class='add'>+	if (fit)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	map[index + 1] &amp;= BITMAP_FIRST_WORD_MASK(start + nbits);</div><div class='add'>+	map[index + 1] |= (value &gt;&gt; space);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define bitmap_get_value8(map, start)			\</div><div class='add'>+	bitmap_read(map, start, BITS_PER_BYTE)</div><div class='add'>+#define bitmap_set_value8(map, value, start)		\</div><div class='add'>+	bitmap_write(map, value, start, BITS_PER_BYTE)</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_BITMAP_H */</div><div class='head'>diff --git a/include/linux/bitops.h b/include/linux/bitops.h<br/>index 2ba557e067fe..ea7898cc5903 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bitops.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bitops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bitops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bitops.h</a></div><div class='hunk'>@@ -8,19 +8,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/kernel.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Set bits in the first 'n' bytes when loaded from memory */</div><div class='del'>-#ifdef __LITTLE_ENDIAN</div><div class='del'>-#  define aligned_byte_mask(n) ((1UL &lt;&lt; 8*(n))-1)</div><div class='del'>-#else</div><div class='del'>-#  define aligned_byte_mask(n) (~0xffUL &lt;&lt; (BITS_PER_LONG - 8 - 8*(n)))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define BITS_PER_TYPE(type)	(sizeof(type) * BITS_PER_BYTE)</div><div class='ctx'> #define BITS_TO_LONGS(nr)	__KERNEL_DIV_ROUND_UP(nr, BITS_PER_TYPE(long))</div><div class='ctx'> #define BITS_TO_U64(nr)		__KERNEL_DIV_ROUND_UP(nr, BITS_PER_TYPE(u64))</div><div class='ctx'> #define BITS_TO_U32(nr)		__KERNEL_DIV_ROUND_UP(nr, BITS_PER_TYPE(u32))</div><div class='ctx'> #define BITS_TO_BYTES(nr)	__KERNEL_DIV_ROUND_UP(nr, BITS_PER_TYPE(char))</div><div class='ctx'> </div><div class='add'>+#define BYTES_TO_BITS(nb)	((nb) * BITS_PER_BYTE)</div><div class='add'>+</div><div class='ctx'> extern unsigned int __sw_hweight8(unsigned int w);</div><div class='ctx'> extern unsigned int __sw_hweight16(unsigned int w);</div><div class='ctx'> extern unsigned int __sw_hweight32(unsigned int w);</div><div class='hunk'>@@ -52,12 +46,17 @@ extern unsigned long __sw_hweight64(__u64 w);</div><div class='ctx'> 	  __builtin_constant_p(*(const unsigned long *)(addr))) ?	\</div><div class='ctx'> 	 const##op(nr, addr) : op(nr, addr))</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The following macros are non-atomic versions of their non-underscored</div><div class='add'>+ * counterparts.</div><div class='add'>+ */</div><div class='ctx'> #define __set_bit(nr, addr)		bitop(___set_bit, nr, addr)</div><div class='ctx'> #define __clear_bit(nr, addr)		bitop(___clear_bit, nr, addr)</div><div class='ctx'> #define __change_bit(nr, addr)		bitop(___change_bit, nr, addr)</div><div class='ctx'> #define __test_and_set_bit(nr, addr)	bitop(___test_and_set_bit, nr, addr)</div><div class='ctx'> #define __test_and_clear_bit(nr, addr)	bitop(___test_and_clear_bit, nr, addr)</div><div class='ctx'> #define __test_and_change_bit(nr, addr)	bitop(___test_and_change_bit, nr, addr)</div><div class='add'>+</div><div class='ctx'> #define test_bit(nr, addr)		bitop(_test_bit, nr, addr)</div><div class='ctx'> #define test_bit_acquire(nr, addr)	bitop(_test_bit_acquire, nr, addr)</div><div class='ctx'> </div><div class='hunk'>@@ -80,6 +79,7 @@ __check_bitop_pr(__test_and_set_bit);</div><div class='ctx'> __check_bitop_pr(__test_and_clear_bit);</div><div class='ctx'> __check_bitop_pr(__test_and_change_bit);</div><div class='ctx'> __check_bitop_pr(test_bit);</div><div class='add'>+__check_bitop_pr(test_bit_acquire);</div><div class='ctx'> </div><div class='ctx'> #undef __check_bitop_pr</div><div class='ctx'> </div><div class='hunk'>@@ -200,7 +200,7 @@ static __always_inline __s64 sign_extend64(__u64 value, int index)</div><div class='ctx'> 	return (__s64)(value &lt;&lt; shift) &gt;&gt; shift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned fls_long(unsigned long l)</div><div class='add'>+static inline unsigned int fls_long(unsigned long l)</div><div class='ctx'> {</div><div class='ctx'> 	if (sizeof(l) == 4)</div><div class='ctx'> 		return fls(l);</div><div class='hunk'>@@ -229,6 +229,37 @@ static inline int get_count_order_long(unsigned long l)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * parity8 - get the parity of an u8 value</div><div class='add'>+ * @value: the value to be examined</div><div class='add'>+ *</div><div class='add'>+ * Determine the parity of the u8 argument.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * 0 for even parity, 1 for odd parity</div><div class='add'>+ *</div><div class='add'>+ * Note: This function informs you about the current parity. Example to bail</div><div class='add'>+ * out when parity is odd:</div><div class='add'>+ *</div><div class='add'>+ *	if (parity8(val) == 1)</div><div class='add'>+ *		return -EBADMSG;</div><div class='add'>+ *</div><div class='add'>+ * If you need to calculate a parity bit, you need to draw the conclusion from</div><div class='add'>+ * this result yourself. Example to enforce odd parity, parity bit is bit 7:</div><div class='add'>+ *</div><div class='add'>+ *	if (parity8(val) == 0)</div><div class='add'>+ *		val ^= BIT(7);</div><div class='add'>+ */</div><div class='add'>+static inline int parity8(u8 val)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * One explanation of this algorithm:</div><div class='add'>+	 * https://funloop.org/codex/problem/parity/README.html</div><div class='add'>+	 */</div><div class='add'>+	val ^= val &gt;&gt; 4;</div><div class='add'>+	return (0x6996 &gt;&gt; (val &amp; 0xf)) &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * __ffs64 - find first set bit in a 64 bit word</div><div class='ctx'>  * @word: The 64 bit word</div><div class='ctx'>  *</div><div class='hunk'>@@ -236,7 +267,7 @@ static inline int get_count_order_long(unsigned long l)</div><div class='ctx'>  * The result is not defined if no bits are set, so check that @word</div><div class='ctx'>  * is non-zero before calling this.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long __ffs64(u64 word)</div><div class='add'>+static inline __attribute_const__ unsigned int __ffs64(u64 word)</div><div class='ctx'> {</div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='ctx'> 	if (((u32)word) == 0UL)</div><div class='hunk'>@@ -252,18 +283,12 @@ static inline unsigned long __ffs64(u64 word)</div><div class='ctx'>  * @word: The word to search</div><div class='ctx'>  * @n: Bit to find</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long fns(unsigned long word, unsigned int n)</div><div class='add'>+static inline unsigned int fns(unsigned long word, unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	unsigned int bit;</div><div class='add'>+	while (word &amp;&amp; n--)</div><div class='add'>+		word &amp;= word - 1;</div><div class='ctx'> </div><div class='del'>-	while (word) {</div><div class='del'>-		bit = __ffs(word);</div><div class='del'>-		if (n-- == 0)</div><div class='del'>-			return bit;</div><div class='del'>-		__clear_bit(bit, &amp;word);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return BITS_PER_LONG;</div><div class='add'>+	return word ? __ffs(word) : BITS_PER_LONG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -272,23 +297,11 @@ static inline unsigned long fns(unsigned long word, unsigned int n)</div><div class='ctx'>  * @addr: the address to start counting from</div><div class='ctx'>  * @value: the value to assign</div><div class='ctx'>  */</div><div class='del'>-static __always_inline void assign_bit(long nr, volatile unsigned long *addr,</div><div class='del'>-				       bool value)</div><div class='del'>-{</div><div class='del'>-	if (value)</div><div class='del'>-		set_bit(nr, addr);</div><div class='del'>-	else</div><div class='del'>-		clear_bit(nr, addr);</div><div class='del'>-}</div><div class='add'>+#define assign_bit(nr, addr, value)					\</div><div class='add'>+	((value) ? set_bit((nr), (addr)) : clear_bit((nr), (addr)))</div><div class='ctx'> </div><div class='del'>-static __always_inline void __assign_bit(long nr, volatile unsigned long *addr,</div><div class='del'>-					 bool value)</div><div class='del'>-{</div><div class='del'>-	if (value)</div><div class='del'>-		__set_bit(nr, addr);</div><div class='del'>-	else</div><div class='del'>-		__clear_bit(nr, addr);</div><div class='del'>-}</div><div class='add'>+#define __assign_bit(nr, addr, value)					\</div><div class='add'>+	((value) ? __set_bit((nr), (addr)) : __clear_bit((nr), (addr)))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __ptr_set_bit - Set bit in a pointer's value</div><div class='head'>diff --git a/include/linux/bits.h b/include/linux/bits.h<br/>index 7c0cf5031abe..a40cc861b3a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bits.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bits.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bits.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bits.h</a></div><div class='hunk'>@@ -2,15 +2,15 @@</div><div class='ctx'> #ifndef __LINUX_BITS_H</div><div class='ctx'> #define __LINUX_BITS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/const.h&gt;</div><div class='ctx'> #include &lt;vdso/bits.h&gt;</div><div class='del'>-#include &lt;asm/bitsperlong.h&gt;</div><div class='add'>+#include &lt;uapi/linux/bits.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define BIT_MASK(nr)		(UL(1) &lt;&lt; ((nr) % BITS_PER_LONG))</div><div class='ctx'> #define BIT_WORD(nr)		((nr) / BITS_PER_LONG)</div><div class='ctx'> #define BIT_ULL_MASK(nr)	(ULL(1) &lt;&lt; ((nr) % BITS_PER_LONG_LONG))</div><div class='ctx'> #define BIT_ULL_WORD(nr)	((nr) / BITS_PER_LONG_LONG)</div><div class='ctx'> #define BITS_PER_BYTE		8</div><div class='add'>+#define BITS_PER_TYPE(type)	(sizeof(type) * BITS_PER_BYTE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Create a contiguous bitmask starting at bit position @l and ending at</div><div class='hunk'>@@ -18,28 +18,72 @@</div><div class='ctx'>  * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.</div><div class='ctx'>  */</div><div class='ctx'> #if !defined(__ASSEMBLY__)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Missing asm support</div><div class='add'>+ *</div><div class='add'>+ * GENMASK_U*() and BIT_U*() depend on BITS_PER_TYPE() which relies on sizeof(),</div><div class='add'>+ * something not available in asm. Nevertheless, fixed width integers is a C</div><div class='add'>+ * concept. Assembly code can rely on the long and long long versions instead.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/build_bug.h&gt;</div><div class='del'>-#define GENMASK_INPUT_CHECK(h, l) \</div><div class='del'>-	(BUILD_BUG_ON_ZERO(__builtin_choose_expr( \</div><div class='del'>-		__is_constexpr((l) &gt; (h)), (l) &gt; (h), 0)))</div><div class='del'>-#else</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='add'>+</div><div class='add'>+#define GENMASK_INPUT_CHECK(h, l) BUILD_BUG_ON_ZERO(const_true((l) &gt; (h)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generate a mask for the specified type @t. Additional checks are made to</div><div class='add'>+ * guarantee the value returned fits in that type, relying on</div><div class='add'>+ * -Wshift-count-overflow compiler check to detect incompatible arguments.</div><div class='add'>+ * For example, all these create build errors or warnings:</div><div class='add'>+ *</div><div class='add'>+ * - GENMASK(15, 20): wrong argument order</div><div class='add'>+ * - GENMASK(72, 15): doesn't fit unsigned long</div><div class='add'>+ * - GENMASK_U32(33, 15): doesn't fit in a u32</div><div class='add'>+ */</div><div class='add'>+#define GENMASK_TYPE(t, h, l)					\</div><div class='add'>+	((t)(GENMASK_INPUT_CHECK(h, l) +			\</div><div class='add'>+	     (type_max(t) &lt;&lt; (l) &amp;				\</div><div class='add'>+	      type_max(t) &gt;&gt; (BITS_PER_TYPE(t) - 1 - (h)))))</div><div class='add'>+</div><div class='add'>+#define GENMASK(h, l)		GENMASK_TYPE(unsigned long, h, l)</div><div class='add'>+#define GENMASK_ULL(h, l)	GENMASK_TYPE(unsigned long long, h, l)</div><div class='add'>+</div><div class='add'>+#define GENMASK_U8(h, l)	GENMASK_TYPE(u8, h, l)</div><div class='add'>+#define GENMASK_U16(h, l)	GENMASK_TYPE(u16, h, l)</div><div class='add'>+#define GENMASK_U32(h, l)	GENMASK_TYPE(u32, h, l)</div><div class='add'>+#define GENMASK_U64(h, l)	GENMASK_TYPE(u64, h, l)</div><div class='add'>+#define GENMASK_U128(h, l)	GENMASK_TYPE(u128, h, l)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fixed-type variants of BIT(), with additional checks like GENMASK_TYPE(). The</div><div class='add'>+ * following examples generate compiler warnings due to -Wshift-count-overflow:</div><div class='add'>+ *</div><div class='add'>+ * - BIT_U8(8)</div><div class='add'>+ * - BIT_U32(-1)</div><div class='add'>+ * - BIT_U32(40)</div><div class='add'>+ */</div><div class='add'>+#define BIT_INPUT_CHECK(type, nr) \</div><div class='add'>+	BUILD_BUG_ON_ZERO(const_true((nr) &gt;= BITS_PER_TYPE(type)))</div><div class='add'>+</div><div class='add'>+#define BIT_TYPE(type, nr) ((type)(BIT_INPUT_CHECK(type, nr) + BIT_ULL(nr)))</div><div class='add'>+</div><div class='add'>+#define BIT_U8(nr)	BIT_TYPE(u8, nr)</div><div class='add'>+#define BIT_U16(nr)	BIT_TYPE(u16, nr)</div><div class='add'>+#define BIT_U32(nr)	BIT_TYPE(u32, nr)</div><div class='add'>+#define BIT_U64(nr)	BIT_TYPE(u64, nr)</div><div class='add'>+</div><div class='add'>+#else /* defined(__ASSEMBLY__) */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * BUILD_BUG_ON_ZERO is not available in h files included from asm files,</div><div class='ctx'>  * disable the input check if that is the case.</div><div class='ctx'>  */</div><div class='del'>-#define GENMASK_INPUT_CHECK(h, l) 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define __GENMASK(h, l) \</div><div class='del'>-	(((~UL(0)) - (UL(1) &lt;&lt; (l)) + 1) &amp; \</div><div class='del'>-	 (~UL(0) &gt;&gt; (BITS_PER_LONG - 1 - (h))))</div><div class='del'>-#define GENMASK(h, l) \</div><div class='del'>-	(GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))</div><div class='del'>-</div><div class='del'>-#define __GENMASK_ULL(h, l) \</div><div class='del'>-	(((~ULL(0)) - (ULL(1) &lt;&lt; (l)) + 1) &amp; \</div><div class='del'>-	 (~ULL(0) &gt;&gt; (BITS_PER_LONG_LONG - 1 - (h))))</div><div class='del'>-#define GENMASK_ULL(h, l) \</div><div class='del'>-	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))</div><div class='add'>+#define GENMASK(h, l)		__GENMASK(h, l)</div><div class='add'>+#define GENMASK_ULL(h, l)	__GENMASK_ULL(h, l)</div><div class='add'>+</div><div class='add'>+#endif /* !defined(__ASSEMBLY__) */</div><div class='ctx'> </div><div class='ctx'> #endif	/* __LINUX_BITS_H */</div><div class='head'>diff --git a/include/linux/blk-crypto-profile.h b/include/linux/blk-crypto-profile.h<br/>index 90ab33cb5d0e..4f39e9cd7576 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blk-crypto-profile.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-crypto-profile.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/blk-crypto-profile.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/blk-crypto-profile.h</a></div><div class='hunk'>@@ -57,6 +57,62 @@ struct blk_crypto_ll_ops {</div><div class='ctx'> 	int (*keyslot_evict)(struct blk_crypto_profile *profile,</div><div class='ctx'> 			     const struct blk_crypto_key *key,</div><div class='ctx'> 			     unsigned int slot);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @derive_sw_secret: Derive the software secret from a hardware-wrapped</div><div class='add'>+	 *		      key in ephemerally-wrapped form.</div><div class='add'>+	 *</div><div class='add'>+	 * This only needs to be implemented if BLK_CRYPTO_KEY_TYPE_HW_WRAPPED</div><div class='add'>+	 * is supported.</div><div class='add'>+	 *</div><div class='add'>+	 * Must return 0 on success, -EBADMSG if the key is invalid, or another</div><div class='add'>+	 * -errno code on other errors.</div><div class='add'>+	 */</div><div class='add'>+	int (*derive_sw_secret)(struct blk_crypto_profile *profile,</div><div class='add'>+				const u8 *eph_key, size_t eph_key_size,</div><div class='add'>+				u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE]);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @import_key: Create a hardware-wrapped key by importing a raw key.</div><div class='add'>+	 *</div><div class='add'>+	 * This only needs to be implemented if BLK_CRYPTO_KEY_TYPE_HW_WRAPPED</div><div class='add'>+	 * is supported.</div><div class='add'>+	 *</div><div class='add'>+	 * On success, must write the new key in long-term wrapped form to</div><div class='add'>+	 * @lt_key and return its size in bytes.  On failure, must return a</div><div class='add'>+	 * -errno value.</div><div class='add'>+	 */</div><div class='add'>+	int (*import_key)(struct blk_crypto_profile *profile,</div><div class='add'>+			  const u8 *raw_key, size_t raw_key_size,</div><div class='add'>+			  u8 lt_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @generate_key: Generate a hardware-wrapped key.</div><div class='add'>+	 *</div><div class='add'>+	 * This only needs to be implemented if BLK_CRYPTO_KEY_TYPE_HW_WRAPPED</div><div class='add'>+	 * is supported.</div><div class='add'>+	 *</div><div class='add'>+	 * On success, must write the new key in long-term wrapped form to</div><div class='add'>+	 * @lt_key and return its size in bytes.  On failure, must return a</div><div class='add'>+	 * -errno value.</div><div class='add'>+	 */</div><div class='add'>+	int (*generate_key)(struct blk_crypto_profile *profile,</div><div class='add'>+			    u8 lt_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @prepare_key: Prepare a hardware-wrapped key to be used.</div><div class='add'>+	 *</div><div class='add'>+	 * Prepare a hardware-wrapped key to be used by converting it from</div><div class='add'>+	 * long-term wrapped form to ephemerally-wrapped form.  This only needs</div><div class='add'>+	 * to be implemented if BLK_CRYPTO_KEY_TYPE_HW_WRAPPED is supported.</div><div class='add'>+	 *</div><div class='add'>+	 * On success, must write the key in ephemerally-wrapped form to</div><div class='add'>+	 * @eph_key and return its size in bytes.  On failure, must return</div><div class='add'>+	 * -EBADMSG if the key is invalid, or another -errno on other error.</div><div class='add'>+	 */</div><div class='add'>+	int (*prepare_key)(struct blk_crypto_profile *profile,</div><div class='add'>+			   const u8 *lt_key, size_t lt_key_size,</div><div class='add'>+			   u8 eph_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -85,6 +141,12 @@ struct blk_crypto_profile {</div><div class='ctx'> 	unsigned int max_dun_bytes_supported;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @key_types_supported: A bitmask of the supported key types:</div><div class='add'>+	 * BLK_CRYPTO_KEY_TYPE_RAW and/or BLK_CRYPTO_KEY_TYPE_HW_WRAPPED.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int key_types_supported;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @modes_supported: Array of bitmasks that specifies whether each</div><div class='ctx'> 	 * combination of crypto mode and data unit size is supported.</div><div class='ctx'> 	 * Specifically, the i'th bit of modes_supported[crypto_mode] is set if</div><div class='hunk'>@@ -143,6 +205,17 @@ void blk_crypto_reprogram_all_keys(struct blk_crypto_profile *profile);</div><div class='ctx'> </div><div class='ctx'> void blk_crypto_profile_destroy(struct blk_crypto_profile *profile);</div><div class='ctx'> </div><div class='add'>+int blk_crypto_import_key(struct blk_crypto_profile *profile,</div><div class='add'>+			  const u8 *raw_key, size_t raw_key_size,</div><div class='add'>+			  u8 lt_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]);</div><div class='add'>+</div><div class='add'>+int blk_crypto_generate_key(struct blk_crypto_profile *profile,</div><div class='add'>+			    u8 lt_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]);</div><div class='add'>+</div><div class='add'>+int blk_crypto_prepare_key(struct blk_crypto_profile *profile,</div><div class='add'>+			   const u8 *lt_key, size_t lt_key_size,</div><div class='add'>+			   u8 eph_key[BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE]);</div><div class='add'>+</div><div class='ctx'> void blk_crypto_intersect_capabilities(struct blk_crypto_profile *parent,</div><div class='ctx'> 				       const struct blk_crypto_profile *child);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/blk-crypto.h b/include/linux/blk-crypto.h<br/>index 5e5822c18ee4..58b0c5254a67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blk-crypto.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-crypto.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/blk-crypto.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/blk-crypto.h</a></div><div class='hunk'>@@ -6,7 +6,9 @@</div><div class='ctx'> #ifndef __LINUX_BLK_CRYPTO_H</div><div class='ctx'> #define __LINUX_BLK_CRYPTO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;uapi/linux/blk-crypto.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum blk_crypto_mode_num {</div><div class='ctx'> 	BLK_ENCRYPTION_MODE_INVALID,</div><div class='hunk'>@@ -17,7 +19,55 @@ enum blk_crypto_mode_num {</div><div class='ctx'> 	BLK_ENCRYPTION_MODE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define BLK_CRYPTO_MAX_KEY_SIZE		64</div><div class='add'>+/*</div><div class='add'>+ * Supported types of keys.  Must be bitflags due to their use in</div><div class='add'>+ * blk_crypto_profile::key_types_supported.</div><div class='add'>+ */</div><div class='add'>+enum blk_crypto_key_type {</div><div class='add'>+	/*</div><div class='add'>+	 * Raw keys (i.e. "software keys").  These keys are simply kept in raw,</div><div class='add'>+	 * plaintext form in kernel memory.</div><div class='add'>+	 */</div><div class='add'>+	BLK_CRYPTO_KEY_TYPE_RAW = 0x1,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Hardware-wrapped keys.  These keys are only present in kernel memory</div><div class='add'>+	 * in ephemerally-wrapped form, and they can only be unwrapped by</div><div class='add'>+	 * dedicated hardware.  For details, see the "Hardware-wrapped keys"</div><div class='add'>+	 * section of Documentation/block/inline-encryption.rst.</div><div class='add'>+	 */</div><div class='add'>+	BLK_CRYPTO_KEY_TYPE_HW_WRAPPED = 0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Currently the maximum raw key size is 64 bytes, as that is the key size of</div><div class='add'>+ * BLK_ENCRYPTION_MODE_AES_256_XTS which takes the longest key.</div><div class='add'>+ *</div><div class='add'>+ * The maximum hardware-wrapped key size depends on the hardware's key wrapping</div><div class='add'>+ * algorithm, which is a hardware implementation detail, so it isn't precisely</div><div class='add'>+ * specified.  But currently 128 bytes is plenty in practice.  Implementations</div><div class='add'>+ * are recommended to wrap a 32-byte key for the hardware KDF with AES-256-GCM,</div><div class='add'>+ * which should result in a size closer to 64 bytes than 128.</div><div class='add'>+ *</div><div class='add'>+ * Both of these values can trivially be increased if ever needed.</div><div class='add'>+ */</div><div class='add'>+#define BLK_CRYPTO_MAX_RAW_KEY_SIZE		64</div><div class='add'>+#define BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE	128</div><div class='add'>+</div><div class='add'>+#define BLK_CRYPTO_MAX_ANY_KEY_SIZE \</div><div class='add'>+	MAX(BLK_CRYPTO_MAX_RAW_KEY_SIZE, BLK_CRYPTO_MAX_HW_WRAPPED_KEY_SIZE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Size of the "software secret" which can be derived from a hardware-wrapped</div><div class='add'>+ * key.  This is currently always 32 bytes.  Note, the choice of 32 bytes</div><div class='add'>+ * assumes that the software secret is only used directly for algorithms that</div><div class='add'>+ * don't require more than a 256-bit key to get the desired security strength.</div><div class='add'>+ * If it were to be used e.g. directly as an AES-256-XTS key, then this would</div><div class='add'>+ * need to be increased (which is possible if hardware supports it, but care</div><div class='add'>+ * would need to be taken to avoid breaking users who need exactly 32 bytes).</div><div class='add'>+ */</div><div class='add'>+#define BLK_CRYPTO_SW_SECRET_SIZE	32</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct blk_crypto_config - an inline encryption key's crypto configuration</div><div class='ctx'>  * @crypto_mode: encryption algorithm this key is for</div><div class='hunk'>@@ -26,20 +76,23 @@ enum blk_crypto_mode_num {</div><div class='ctx'>  *	ciphertext.  This is always a power of 2.  It might be e.g. the</div><div class='ctx'>  *	filesystem block size or the disk sector size.</div><div class='ctx'>  * @dun_bytes: the maximum number of bytes of DUN used when using this key</div><div class='add'>+ * @key_type: the type of this key -- either raw or hardware-wrapped</div><div class='ctx'>  */</div><div class='ctx'> struct blk_crypto_config {</div><div class='ctx'> 	enum blk_crypto_mode_num crypto_mode;</div><div class='ctx'> 	unsigned int data_unit_size;</div><div class='ctx'> 	unsigned int dun_bytes;</div><div class='add'>+	enum blk_crypto_key_type key_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct blk_crypto_key - an inline encryption key</div><div class='del'>- * @crypto_cfg: the crypto configuration (like crypto_mode, key size) for this</div><div class='del'>- *		key</div><div class='add'>+ * @crypto_cfg: the crypto mode, data unit size, key type, and other</div><div class='add'>+ *		characteristics of this key and how it will be used</div><div class='ctx'>  * @data_unit_size_bits: log2 of data_unit_size</div><div class='del'>- * @size: size of this key in bytes (determined by @crypto_cfg.crypto_mode)</div><div class='del'>- * @raw: the raw bytes of this key.  Only the first @size bytes are used.</div><div class='add'>+ * @size: size of this key in bytes.  The size of a raw key is fixed for a given</div><div class='add'>+ *	  crypto mode, but the size of a hardware-wrapped key can vary.</div><div class='add'>+ * @bytes: the bytes of this key.  Only the first @size bytes are significant.</div><div class='ctx'>  *</div><div class='ctx'>  * A blk_crypto_key is immutable once created, and many bios can reference it at</div><div class='ctx'>  * the same time.  It must not be freed until all bios using it have completed</div><div class='hunk'>@@ -49,7 +102,7 @@ struct blk_crypto_key {</div><div class='ctx'> 	struct blk_crypto_config crypto_cfg;</div><div class='ctx'> 	unsigned int data_unit_size_bits;</div><div class='ctx'> 	unsigned int size;</div><div class='del'>-	u8 raw[BLK_CRYPTO_MAX_KEY_SIZE];</div><div class='add'>+	u8 bytes[BLK_CRYPTO_MAX_ANY_KEY_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BLK_CRYPTO_MAX_IV_SIZE		32</div><div class='hunk'>@@ -87,7 +140,9 @@ bool bio_crypt_dun_is_contiguous(const struct bio_crypt_ctx *bc,</div><div class='ctx'> 				 unsigned int bytes,</div><div class='ctx'> 				 const u64 next_dun[BLK_CRYPTO_DUN_ARRAY_SIZE]);</div><div class='ctx'> </div><div class='del'>-int blk_crypto_init_key(struct blk_crypto_key *blk_key, const u8 *raw_key,</div><div class='add'>+int blk_crypto_init_key(struct blk_crypto_key *blk_key,</div><div class='add'>+			const u8 *key_bytes, size_t key_size,</div><div class='add'>+			enum blk_crypto_key_type key_type,</div><div class='ctx'> 			enum blk_crypto_mode_num crypto_mode,</div><div class='ctx'> 			unsigned int dun_bytes,</div><div class='ctx'> 			unsigned int data_unit_size);</div><div class='hunk'>@@ -103,6 +158,10 @@ bool blk_crypto_config_supported_natively(struct block_device *bdev,</div><div class='ctx'> bool blk_crypto_config_supported(struct block_device *bdev,</div><div class='ctx'> 				 const struct blk_crypto_config *cfg);</div><div class='ctx'> </div><div class='add'>+int blk_crypto_derive_sw_secret(struct block_device *bdev,</div><div class='add'>+				const u8 *eph_key, size_t eph_key_size,</div><div class='add'>+				u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE]);</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_BLK_INLINE_ENCRYPTION */</div><div class='ctx'> </div><div class='ctx'> static inline bool bio_has_crypt_ctx(struct bio *bio)</div><div class='head'>diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h<br/>index e253e7bd0d17..a6b84206eb94 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blk-integrity.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-integrity.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/blk-integrity.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/blk-integrity.h</a></div><div class='hunk'>@@ -3,55 +3,58 @@</div><div class='ctx'> #define _LINUX_BLK_INTEGRITY_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blk-mq.h&gt;</div><div class='add'>+#include &lt;linux/bio-integrity.h&gt;</div><div class='add'>+#include &lt;linux/blk-mq-dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct request;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Maximum contiguous integrity buffer allocation.</div><div class='add'>+ */</div><div class='add'>+#define BLK_INTEGRITY_MAX_SIZE		SZ_2M</div><div class='add'>+</div><div class='ctx'> enum blk_integrity_flags {</div><div class='del'>-	BLK_INTEGRITY_VERIFY		= 1 &lt;&lt; 0,</div><div class='del'>-	BLK_INTEGRITY_GENERATE		= 1 &lt;&lt; 1,</div><div class='add'>+	BLK_INTEGRITY_NOVERIFY		= 1 &lt;&lt; 0,</div><div class='add'>+	BLK_INTEGRITY_NOGENERATE	= 1 &lt;&lt; 1,</div><div class='ctx'> 	BLK_INTEGRITY_DEVICE_CAPABLE	= 1 &lt;&lt; 2,</div><div class='del'>-	BLK_INTEGRITY_IP_CHECKSUM	= 1 &lt;&lt; 3,</div><div class='add'>+	BLK_INTEGRITY_REF_TAG		= 1 &lt;&lt; 3,</div><div class='add'>+	BLK_INTEGRITY_STACKED		= 1 &lt;&lt; 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct blk_integrity_iter {</div><div class='del'>-	void			*prot_buf;</div><div class='del'>-	void			*data_buf;</div><div class='del'>-	sector_t		seed;</div><div class='del'>-	unsigned int		data_size;</div><div class='del'>-	unsigned short		interval;</div><div class='del'>-	unsigned char		tuple_size;</div><div class='del'>-	unsigned char		pi_offset;</div><div class='del'>-	const char		*disk_name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef blk_status_t (integrity_processing_fn) (struct blk_integrity_iter *);</div><div class='del'>-typedef void (integrity_prepare_fn) (struct request *);</div><div class='del'>-typedef void (integrity_complete_fn) (struct request *, unsigned int);</div><div class='del'>-</div><div class='del'>-struct blk_integrity_profile {</div><div class='del'>-	integrity_processing_fn		*generate_fn;</div><div class='del'>-	integrity_processing_fn		*verify_fn;</div><div class='del'>-	integrity_prepare_fn		*prepare_fn;</div><div class='del'>-	integrity_complete_fn		*complete_fn;</div><div class='del'>-	const char			*name;</div><div class='del'>-};</div><div class='add'>+const char *blk_integrity_profile_name(struct blk_integrity *bi);</div><div class='add'>+bool queue_limits_stack_integrity(struct queue_limits *t,</div><div class='add'>+		struct queue_limits *b);</div><div class='add'>+static inline bool queue_limits_stack_integrity_bdev(struct queue_limits *t,</div><div class='add'>+		struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return queue_limits_stack_integrity(t, &amp;bdev-&gt;bd_disk-&gt;queue-&gt;limits);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INTEGRITY</div><div class='del'>-void blk_integrity_register(struct gendisk *, struct blk_integrity *);</div><div class='del'>-void blk_integrity_unregister(struct gendisk *);</div><div class='del'>-int blk_integrity_compare(struct gendisk *, struct gendisk *);</div><div class='del'>-int blk_rq_map_integrity_sg(struct request_queue *, struct bio *,</div><div class='del'>-				   struct scatterlist *);</div><div class='add'>+int blk_rq_map_integrity_sg(struct request *, struct scatterlist *);</div><div class='add'>+</div><div class='ctx'> int blk_rq_count_integrity_sg(struct request_queue *, struct bio *);</div><div class='add'>+int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf,</div><div class='add'>+			      ssize_t bytes);</div><div class='add'>+int blk_get_meta_cap(struct block_device *bdev, unsigned int cmd,</div><div class='add'>+		     struct logical_block_metadata_cap __user *argp);</div><div class='add'>+bool blk_rq_integrity_dma_map_iter_start(struct request *req,</div><div class='add'>+		struct device *dma_dev,  struct dma_iova_state *state,</div><div class='add'>+		struct blk_dma_iter *iter);</div><div class='add'>+bool blk_rq_integrity_dma_map_iter_next(struct request *req,</div><div class='add'>+		struct device *dma_dev, struct blk_dma_iter *iter);</div><div class='ctx'> </div><div class='del'>-static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)</div><div class='add'>+static inline bool</div><div class='add'>+blk_integrity_queue_supports_integrity(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	struct blk_integrity *bi = &amp;disk-&gt;queue-&gt;integrity;</div><div class='add'>+	return q-&gt;limits.integrity.metadata_size;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!bi-&gt;profile)</div><div class='add'>+static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)</div><div class='add'>+{</div><div class='add'>+	if (!blk_integrity_queue_supports_integrity(disk-&gt;queue))</div><div class='ctx'> 		return NULL;</div><div class='del'>-</div><div class='del'>-	return bi;</div><div class='add'>+	return &amp;disk-&gt;queue-&gt;limits.integrity;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct blk_integrity *</div><div class='hunk'>@@ -60,18 +63,6 @@ bdev_get_integrity(struct block_device *bdev)</div><div class='ctx'> 	return blk_get_integrity(bdev-&gt;bd_disk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool</div><div class='del'>-blk_integrity_queue_supports_integrity(struct request_queue *q)</div><div class='del'>-{</div><div class='del'>-	return q-&gt;integrity.profile;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void blk_queue_max_integrity_segments(struct request_queue *q,</div><div class='del'>-						    unsigned int segs)</div><div class='del'>-{</div><div class='del'>-	q-&gt;limits.max_integrity_segments = segs;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned short</div><div class='ctx'> queue_max_integrity_segments(const struct request_queue *q)</div><div class='ctx'> {</div><div class='hunk'>@@ -97,7 +88,7 @@ static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,</div><div class='ctx'> static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi,</div><div class='ctx'> 					       unsigned int sectors)</div><div class='ctx'> {</div><div class='del'>-	return bio_integrity_intervals(bi, sectors) * bi-&gt;tuple_size;</div><div class='add'>+	return bio_integrity_intervals(bi, sectors) * bi-&gt;metadata_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool blk_integrity_rq(struct request *rq)</div><div class='hunk'>@@ -106,54 +97,59 @@ static inline bool blk_integrity_rq(struct request *rq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Return the first bvec that contains integrity data.  Only drivers that are</div><div class='del'>- * limited to a single integrity segment should use this helper.</div><div class='add'>+ * Return the current bvec that contains the integrity data. bip_iter may be</div><div class='add'>+ * advanced to iterate over the integrity data.</div><div class='ctx'>  */</div><div class='del'>-static inline struct bio_vec *rq_integrity_vec(struct request *rq)</div><div class='add'>+static inline struct bio_vec rq_integrity_vec(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	if (WARN_ON_ONCE(queue_max_integrity_segments(rq-&gt;q) &gt; 1))</div><div class='del'>-		return NULL;</div><div class='del'>-	return rq-&gt;bio-&gt;bi_integrity-&gt;bip_vec;</div><div class='add'>+	return mp_bvec_iter_bvec(rq-&gt;bio-&gt;bi_integrity-&gt;bip_vec,</div><div class='add'>+				 rq-&gt;bio-&gt;bi_integrity-&gt;bip_iter);</div><div class='ctx'> }</div><div class='ctx'> #else /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='add'>+static inline int blk_get_meta_cap(struct block_device *bdev, unsigned int cmd,</div><div class='add'>+				   struct logical_block_metadata_cap __user *argp)</div><div class='add'>+{</div><div class='add'>+	return -ENOIOCTLCMD;</div><div class='add'>+}</div><div class='ctx'> static inline int blk_rq_count_integrity_sg(struct request_queue *q,</div><div class='ctx'> 					    struct bio *b)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline int blk_rq_map_integrity_sg(struct request_queue *q,</div><div class='del'>-					  struct bio *b,</div><div class='add'>+static inline int blk_rq_map_integrity_sg(struct request *q,</div><div class='ctx'> 					  struct scatterlist *s)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline struct blk_integrity *bdev_get_integrity(struct block_device *b)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)</div><div class='add'>+static inline int blk_rq_integrity_map_user(struct request *rq,</div><div class='add'>+					    void __user *ubuf,</div><div class='add'>+					    ssize_t bytes)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-static inline bool</div><div class='del'>-blk_integrity_queue_supports_integrity(struct request_queue *q)</div><div class='add'>+static inline bool blk_rq_integrity_dma_map_iter_start(struct request *req,</div><div class='add'>+		struct device *dma_dev,  struct dma_iova_state *state,</div><div class='add'>+		struct blk_dma_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-static inline int blk_integrity_compare(struct gendisk *a, struct gendisk *b)</div><div class='add'>+static inline bool blk_rq_integrity_dma_map_iter_next(struct request *req,</div><div class='add'>+		struct device *dma_dev, struct blk_dma_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='del'>-static inline void blk_integrity_register(struct gendisk *d,</div><div class='del'>-					 struct blk_integrity *b)</div><div class='add'>+static inline struct blk_integrity *bdev_get_integrity(struct block_device *b)</div><div class='ctx'> {</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='del'>-static inline void blk_integrity_unregister(struct gendisk *d)</div><div class='add'>+static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)</div><div class='ctx'> {</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='del'>-static inline void blk_queue_max_integrity_segments(struct request_queue *q,</div><div class='del'>-						    unsigned int segs)</div><div class='add'>+static inline bool</div><div class='add'>+blk_integrity_queue_supports_integrity(struct request_queue *q)</div><div class='ctx'> {</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> static inline unsigned short</div><div class='ctx'> queue_max_integrity_segments(const struct request_queue *q)</div><div class='hunk'>@@ -177,9 +173,11 @@ static inline int blk_integrity_rq(struct request *rq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct bio_vec *rq_integrity_vec(struct request *rq)</div><div class='add'>+static inline struct bio_vec rq_integrity_vec(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	/* the optimizer will remove all calls to this function */</div><div class='add'>+	return (struct bio_vec){ };</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_BLK_DEV_INTEGRITY */</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_BLK_INTEGRITY_H */</div><div class='head'>diff --git a/include/linux/blk-mq-dma.h b/include/linux/blk-mq-dma.h<br/>new file mode 100644<br/>index 000000000000..cb88fc791fbd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/blk-mq-dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/blk-mq-dma.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef BLK_MQ_DMA_H</div><div class='add'>+#define BLK_MQ_DMA_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/blk-mq.h&gt;</div><div class='add'>+#include &lt;linux/pci-p2pdma.h&gt;</div><div class='add'>+</div><div class='add'>+struct blk_map_iter {</div><div class='add'>+	struct bvec_iter		iter;</div><div class='add'>+	struct bio			*bio;</div><div class='add'>+	struct bio_vec			*bvecs;</div><div class='add'>+	bool				is_integrity;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct blk_dma_iter {</div><div class='add'>+	/* Output address range for this iteration */</div><div class='add'>+	dma_addr_t			addr;</div><div class='add'>+	u32				len;</div><div class='add'>+	struct pci_p2pdma_map_state	p2pdma;</div><div class='add'>+</div><div class='add'>+	/* Status code. Only valid when blk_rq_dma_map_iter_* returned false */</div><div class='add'>+	blk_status_t			status;</div><div class='add'>+</div><div class='add'>+	/* Internal to blk_rq_dma_map_iter_* */</div><div class='add'>+	struct blk_map_iter		iter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool blk_rq_dma_map_iter_start(struct request *req, struct device *dma_dev,</div><div class='add'>+		struct dma_iova_state *state, struct blk_dma_iter *iter);</div><div class='add'>+bool blk_rq_dma_map_iter_next(struct request *req, struct device *dma_dev,</div><div class='add'>+		struct dma_iova_state *state, struct blk_dma_iter *iter);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_rq_dma_map_coalesce - were all segments coalesced?</div><div class='add'>+ * @state: DMA state to check</div><div class='add'>+ *</div><div class='add'>+ * Returns true if blk_rq_dma_map_iter_start coalesced all segments into a</div><div class='add'>+ * single DMA range.</div><div class='add'>+ */</div><div class='add'>+static inline bool blk_rq_dma_map_coalesce(struct dma_iova_state *state)</div><div class='add'>+{</div><div class='add'>+	return dma_use_iova(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * blk_rq_dma_unmap - try to DMA unmap a request</div><div class='add'>+ * @req:	request to unmap</div><div class='add'>+ * @dma_dev:	device to unmap from</div><div class='add'>+ * @state:	DMA IOVA state</div><div class='add'>+ * @mapped_len: number of bytes to unmap</div><div class='add'>+ * @map:	peer-to-peer mapping type</div><div class='add'>+ *</div><div class='add'>+ * Returns %false if the callers need to manually unmap every DMA segment</div><div class='add'>+ * mapped using @iter or %true if no work is left to be done.</div><div class='add'>+ */</div><div class='add'>+static inline bool blk_rq_dma_unmap(struct request *req, struct device *dma_dev,</div><div class='add'>+		struct dma_iova_state *state, size_t mapped_len,</div><div class='add'>+		enum pci_p2pdma_map_type map)</div><div class='add'>+{</div><div class='add'>+	if (map == PCI_P2PDMA_MAP_BUS_ADDR)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (dma_use_iova(state)) {</div><div class='add'>+		unsigned int attrs = 0;</div><div class='add'>+</div><div class='add'>+		if (map == PCI_P2PDMA_MAP_THRU_HOST_BRIDGE)</div><div class='add'>+			attrs |= DMA_ATTR_MMIO;</div><div class='add'>+</div><div class='add'>+		dma_iova_destroy(dma_dev, state, mapped_len, rq_dma_dir(req),</div><div class='add'>+				 attrs);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return !dma_need_unmap(dma_dev);</div><div class='add'>+}</div><div class='add'>+#endif /* BLK_MQ_DMA_H */</div><div class='head'>diff --git a/include/linux/blk-mq-pci.h b/include/linux/blk-mq-pci.h<br/>deleted file mode 100644<br/>index ca544e1d3508..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blk-mq-pci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-mq-pci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_BLK_MQ_PCI_H</div><div class='del'>-#define _LINUX_BLK_MQ_PCI_H</div><div class='del'>-</div><div class='del'>-struct blk_mq_queue_map;</div><div class='del'>-struct pci_dev;</div><div class='del'>-</div><div class='del'>-void blk_mq_pci_map_queues(struct blk_mq_queue_map *qmap, struct pci_dev *pdev,</div><div class='del'>-			   int offset);</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_BLK_MQ_PCI_H */</div><div class='head'>diff --git a/include/linux/blk-mq-virtio.h b/include/linux/blk-mq-virtio.h<br/>deleted file mode 100644<br/>index 13226e9b22dd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blk-mq-virtio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-mq-virtio.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_BLK_MQ_VIRTIO_H</div><div class='del'>-#define _LINUX_BLK_MQ_VIRTIO_H</div><div class='del'>-</div><div class='del'>-struct blk_mq_queue_map;</div><div class='del'>-struct virtio_device;</div><div class='del'>-</div><div class='del'>-void blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap,</div><div class='del'>-		struct virtio_device *vdev, int first_vec);</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_BLK_MQ_VIRTIO_H */</div><div class='head'>diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h<br/>index d3d8fd8e229b..cae9e857aea4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blk-mq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk-mq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/blk-mq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/blk-mq.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/srcu.h&gt;</div><div class='ctx'> #include &lt;linux/rw_hint.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct blk_mq_tags;</div><div class='ctx'> struct blk_flush_queue;</div><div class='hunk'>@@ -27,38 +28,61 @@ typedef enum rq_end_io_ret (rq_end_io_fn)(struct request *, blk_status_t);</div><div class='ctx'>  * request flags */</div><div class='ctx'> typedef __u32 __bitwise req_flags_t;</div><div class='ctx'> </div><div class='del'>-/* drive already may have started this one */</div><div class='del'>-#define RQF_STARTED		((__force req_flags_t)(1 &lt;&lt; 1))</div><div class='del'>-/* request for flush sequence */</div><div class='del'>-#define RQF_FLUSH_SEQ		((__force req_flags_t)(1 &lt;&lt; 4))</div><div class='del'>-/* merge of different types, fail separately */</div><div class='del'>-#define RQF_MIXED_MERGE		((__force req_flags_t)(1 &lt;&lt; 5))</div><div class='del'>-/* don't call prep for this one */</div><div class='del'>-#define RQF_DONTPREP		((__force req_flags_t)(1 &lt;&lt; 7))</div><div class='del'>-/* use hctx-&gt;sched_tags */</div><div class='del'>-#define RQF_SCHED_TAGS		((__force req_flags_t)(1 &lt;&lt; 8))</div><div class='del'>-/* use an I/O scheduler for this request */</div><div class='del'>-#define RQF_USE_SCHED		((__force req_flags_t)(1 &lt;&lt; 9))</div><div class='del'>-/* vaguely specified driver internal error.  Ignored by the block layer */</div><div class='del'>-#define RQF_FAILED		((__force req_flags_t)(1 &lt;&lt; 10))</div><div class='del'>-/* don't warn about errors */</div><div class='del'>-#define RQF_QUIET		((__force req_flags_t)(1 &lt;&lt; 11))</div><div class='del'>-/* account into disk and partition IO statistics */</div><div class='del'>-#define RQF_IO_STAT		((__force req_flags_t)(1 &lt;&lt; 13))</div><div class='del'>-/* runtime pm request */</div><div class='del'>-#define RQF_PM			((__force req_flags_t)(1 &lt;&lt; 15))</div><div class='del'>-/* on IO scheduler merge hash */</div><div class='del'>-#define RQF_HASHED		((__force req_flags_t)(1 &lt;&lt; 16))</div><div class='del'>-/* track IO completion time */</div><div class='del'>-#define RQF_STATS		((__force req_flags_t)(1 &lt;&lt; 17))</div><div class='del'>-/* Look at -&gt;special_vec for the actual data payload instead of the</div><div class='del'>-   bio chain. */</div><div class='del'>-#define RQF_SPECIAL_PAYLOAD	((__force req_flags_t)(1 &lt;&lt; 18))</div><div class='del'>-/* The per-zone write lock is held for this request */</div><div class='del'>-#define RQF_ZONE_WRITE_LOCKED	((__force req_flags_t)(1 &lt;&lt; 19))</div><div class='del'>-/* -&gt;timeout has been called, don't expire again */</div><div class='del'>-#define RQF_TIMED_OUT		((__force req_flags_t)(1 &lt;&lt; 21))</div><div class='del'>-#define RQF_RESV		((__force req_flags_t)(1 &lt;&lt; 23))</div><div class='add'>+/* Keep rqf_name[] in sync with the definitions below */</div><div class='add'>+enum rqf_flags {</div><div class='add'>+	/* drive already may have started this one */</div><div class='add'>+	__RQF_STARTED,</div><div class='add'>+	/* request for flush sequence */</div><div class='add'>+	__RQF_FLUSH_SEQ,</div><div class='add'>+	/* merge of different types, fail separately */</div><div class='add'>+	__RQF_MIXED_MERGE,</div><div class='add'>+	/* don't call prep for this one */</div><div class='add'>+	__RQF_DONTPREP,</div><div class='add'>+	/* use hctx-&gt;sched_tags */</div><div class='add'>+	__RQF_SCHED_TAGS,</div><div class='add'>+	/* use an I/O scheduler for this request */</div><div class='add'>+	__RQF_USE_SCHED,</div><div class='add'>+	/* vaguely specified driver internal error.  Ignored by block layer */</div><div class='add'>+	__RQF_FAILED,</div><div class='add'>+	/* don't warn about errors */</div><div class='add'>+	__RQF_QUIET,</div><div class='add'>+	/* account into disk and partition IO statistics */</div><div class='add'>+	__RQF_IO_STAT,</div><div class='add'>+	/* runtime pm request */</div><div class='add'>+	__RQF_PM,</div><div class='add'>+	/* on IO scheduler merge hash */</div><div class='add'>+	__RQF_HASHED,</div><div class='add'>+	/* track IO completion time */</div><div class='add'>+	__RQF_STATS,</div><div class='add'>+	/* Look at -&gt;special_vec for the actual data payload instead of the</div><div class='add'>+	   bio chain. */</div><div class='add'>+	__RQF_SPECIAL_PAYLOAD,</div><div class='add'>+	/* request completion needs to be signaled to zone write plugging. */</div><div class='add'>+	__RQF_ZONE_WRITE_PLUGGING,</div><div class='add'>+	/* -&gt;timeout has been called, don't expire again */</div><div class='add'>+	__RQF_TIMED_OUT,</div><div class='add'>+	__RQF_RESV,</div><div class='add'>+	__RQF_BITS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RQF_STARTED		((__force req_flags_t)(1 &lt;&lt; __RQF_STARTED))</div><div class='add'>+#define RQF_FLUSH_SEQ		((__force req_flags_t)(1 &lt;&lt; __RQF_FLUSH_SEQ))</div><div class='add'>+#define RQF_MIXED_MERGE		((__force req_flags_t)(1 &lt;&lt; __RQF_MIXED_MERGE))</div><div class='add'>+#define RQF_DONTPREP		((__force req_flags_t)(1 &lt;&lt; __RQF_DONTPREP))</div><div class='add'>+#define RQF_SCHED_TAGS		((__force req_flags_t)(1 &lt;&lt; __RQF_SCHED_TAGS))</div><div class='add'>+#define RQF_USE_SCHED		((__force req_flags_t)(1 &lt;&lt; __RQF_USE_SCHED))</div><div class='add'>+#define RQF_FAILED		((__force req_flags_t)(1 &lt;&lt; __RQF_FAILED))</div><div class='add'>+#define RQF_QUIET		((__force req_flags_t)(1 &lt;&lt; __RQF_QUIET))</div><div class='add'>+#define RQF_IO_STAT		((__force req_flags_t)(1 &lt;&lt; __RQF_IO_STAT))</div><div class='add'>+#define RQF_PM			((__force req_flags_t)(1 &lt;&lt; __RQF_PM))</div><div class='add'>+#define RQF_HASHED		((__force req_flags_t)(1 &lt;&lt; __RQF_HASHED))</div><div class='add'>+#define RQF_STATS		((__force req_flags_t)(1 &lt;&lt; __RQF_STATS))</div><div class='add'>+#define RQF_SPECIAL_PAYLOAD	\</div><div class='add'>+			((__force req_flags_t)(1 &lt;&lt; __RQF_SPECIAL_PAYLOAD))</div><div class='add'>+#define RQF_ZONE_WRITE_PLUGGING	\</div><div class='add'>+			((__force req_flags_t)(1 &lt;&lt; __RQF_ZONE_WRITE_PLUGGING))</div><div class='add'>+#define RQF_TIMED_OUT		((__force req_flags_t)(1 &lt;&lt; __RQF_TIMED_OUT))</div><div class='add'>+#define RQF_RESV		((__force req_flags_t)(1 &lt;&lt; __RQF_RESV))</div><div class='ctx'> </div><div class='ctx'> /* flags that prevent us from merging requests: */</div><div class='ctx'> #define RQF_NOMERGE_FLAGS \</div><div class='hunk'>@@ -126,19 +150,21 @@ struct request {</div><div class='ctx'> 	 * physical address coalescing is performed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned short nr_phys_segments;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BLK_DEV_INTEGRITY</div><div class='ctx'> 	unsigned short nr_integrity_segments;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The lowest set bit for address gaps between physical segments. This</div><div class='add'>+	 * provides information necessary for dma optimization opprotunities,</div><div class='add'>+	 * like for testing if the segments can be coalesced against the</div><div class='add'>+	 * device's iommu granule.</div><div class='add'>+	 */</div><div class='add'>+	unsigned char phys_gap_bit;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_INLINE_ENCRYPTION</div><div class='ctx'> 	struct bio_crypt_ctx *crypt_ctx;</div><div class='ctx'> 	struct blk_crypto_keyslot *crypt_keyslot;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	enum rw_hint write_hint;</div><div class='del'>-	unsigned short ioprio;</div><div class='del'>-</div><div class='ctx'> 	enum mq_rq_state state;</div><div class='ctx'> 	atomic_t ref;</div><div class='ctx'> </div><div class='hunk'>@@ -190,6 +216,14 @@ struct request {</div><div class='ctx'> 	void *end_io_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Returns a mask with all bits starting at req-&gt;phys_gap_bit set to 1.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long req_phys_gap_mask(const struct request *req)</div><div class='add'>+{</div><div class='add'>+	return ~(((1 &lt;&lt; req-&gt;phys_gap_bit) &gt;&gt; 1) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline enum req_op req_op(const struct request *req)</div><div class='ctx'> {</div><div class='ctx'> 	return req-&gt;cmd_flags &amp; REQ_OP_MASK;</div><div class='hunk'>@@ -202,7 +236,9 @@ static inline bool blk_rq_is_passthrough(struct request *rq)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned short req_get_ioprio(struct request *req)</div><div class='ctx'> {</div><div class='del'>-	return req-&gt;ioprio;</div><div class='add'>+	if (req-&gt;bio)</div><div class='add'>+		return req-&gt;bio-&gt;bi_ioprio;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define rq_data_dir(rq)		(op_is_write(req_op(rq)) ? WRITE : READ)</div><div class='hunk'>@@ -210,62 +246,61 @@ static inline unsigned short req_get_ioprio(struct request *req)</div><div class='ctx'> #define rq_dma_dir(rq) \</div><div class='ctx'> 	(op_is_write(req_op(rq)) ? DMA_TO_DEVICE : DMA_FROM_DEVICE)</div><div class='ctx'> </div><div class='del'>-#define rq_list_add(listptr, rq)	do {		\</div><div class='del'>-	(rq)-&gt;rq_next = *(listptr);			\</div><div class='del'>-	*(listptr) = rq;				\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define rq_list_add_tail(lastpptr, rq)	do {		\</div><div class='del'>-	(rq)-&gt;rq_next = NULL;				\</div><div class='del'>-	**(lastpptr) = rq;				\</div><div class='del'>-	*(lastpptr) = &amp;rq-&gt;rq_next;			\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define rq_list_pop(listptr)				\</div><div class='del'>-({							\</div><div class='del'>-	struct request *__req = NULL;			\</div><div class='del'>-	if ((listptr) &amp;&amp; *(listptr))	{		\</div><div class='del'>-		__req = *(listptr);			\</div><div class='del'>-		*(listptr) = __req-&gt;rq_next;		\</div><div class='del'>-	}						\</div><div class='del'>-	__req;						\</div><div class='del'>-})</div><div class='add'>+static inline int rq_list_empty(const struct rq_list *rl)</div><div class='add'>+{</div><div class='add'>+	return rl-&gt;head == NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define rq_list_peek(listptr)				\</div><div class='del'>-({							\</div><div class='del'>-	struct request *__req = NULL;			\</div><div class='del'>-	if ((listptr) &amp;&amp; *(listptr))			\</div><div class='del'>-		__req = *(listptr);			\</div><div class='del'>-	__req;						\</div><div class='del'>-})</div><div class='add'>+static inline void rq_list_init(struct rq_list *rl)</div><div class='add'>+{</div><div class='add'>+	rl-&gt;head = NULL;</div><div class='add'>+	rl-&gt;tail = NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define rq_list_for_each(listptr, pos)			\</div><div class='del'>-	for (pos = rq_list_peek((listptr)); pos; pos = rq_list_next(pos))</div><div class='add'>+static inline void rq_list_add_tail(struct rq_list *rl, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	rq-&gt;rq_next = NULL;</div><div class='add'>+	if (rl-&gt;tail)</div><div class='add'>+		rl-&gt;tail-&gt;rq_next = rq;</div><div class='add'>+	else</div><div class='add'>+		rl-&gt;head = rq;</div><div class='add'>+	rl-&gt;tail = rq;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define rq_list_for_each_safe(listptr, pos, nxt)			\</div><div class='del'>-	for (pos = rq_list_peek((listptr)), nxt = rq_list_next(pos);	\</div><div class='del'>-		pos; pos = nxt, nxt = pos ? rq_list_next(pos) : NULL)</div><div class='add'>+static inline void rq_list_add_head(struct rq_list *rl, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	rq-&gt;rq_next = rl-&gt;head;</div><div class='add'>+	rl-&gt;head = rq;</div><div class='add'>+	if (!rl-&gt;tail)</div><div class='add'>+		rl-&gt;tail = rq;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define rq_list_next(rq)	(rq)-&gt;rq_next</div><div class='del'>-#define rq_list_empty(list)	((list) == (struct request *) NULL)</div><div class='add'>+static inline struct request *rq_list_pop(struct rq_list *rl)</div><div class='add'>+{</div><div class='add'>+	struct request *rq = rl-&gt;head;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * rq_list_move() - move a struct request from one list to another</div><div class='del'>- * @src: The source list @rq is currently in</div><div class='del'>- * @dst: The destination list that @rq will be appended to</div><div class='del'>- * @rq: The request to move</div><div class='del'>- * @prev: The request preceding @rq in @src (NULL if @rq is the head)</div><div class='del'>- */</div><div class='del'>-static inline void rq_list_move(struct request **src, struct request **dst,</div><div class='del'>-				struct request *rq, struct request *prev)</div><div class='add'>+	if (rq) {</div><div class='add'>+		rl-&gt;head = rl-&gt;head-&gt;rq_next;</div><div class='add'>+		if (!rl-&gt;head)</div><div class='add'>+			rl-&gt;tail = NULL;</div><div class='add'>+		rq-&gt;rq_next = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct request *rq_list_peek(struct rq_list *rl)</div><div class='ctx'> {</div><div class='del'>-	if (prev)</div><div class='del'>-		prev-&gt;rq_next = rq-&gt;rq_next;</div><div class='del'>-	else</div><div class='del'>-		*src = rq-&gt;rq_next;</div><div class='del'>-	rq_list_add(dst, rq);</div><div class='add'>+	return rl-&gt;head;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define rq_list_for_each(rl, pos)					\</div><div class='add'>+	for (pos = rq_list_peek((rl)); (pos); pos = pos-&gt;rq_next)</div><div class='add'>+</div><div class='add'>+#define rq_list_for_each_safe(rl, pos, nxt)				\</div><div class='add'>+	for (pos = rq_list_peek((rl)), nxt = pos-&gt;rq_next;		\</div><div class='add'>+		pos; pos = nxt, nxt = pos ? pos-&gt;rq_next : NULL)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * enum blk_eh_timer_return - How the timeout handler should proceed</div><div class='ctx'>  * @BLK_EH_DONE: The block driver completed the command or will complete it at</div><div class='hunk'>@@ -278,9 +313,6 @@ enum blk_eh_timer_return {</div><div class='ctx'> 	BLK_EH_RESET_TIMER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define BLK_TAG_ALLOC_FIFO 0 /* allocate starting from 0 */</div><div class='del'>-#define BLK_TAG_ALLOC_RR 1 /* allocate starting from last allocated tag */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct blk_mq_hw_ctx - State for a hardware queue facing the hardware</div><div class='ctx'>  * block device</div><div class='hunk'>@@ -491,6 +523,11 @@ enum hctx_type {</div><div class='ctx'>  *		   request_queue.tag_set_list.</div><div class='ctx'>  * @srcu:	   Use as lock when type of the request queue is blocking</div><div class='ctx'>  *		   (BLK_MQ_F_BLOCKING).</div><div class='add'>+ * @tags_srcu:	   SRCU used to defer freeing of tags page_list to prevent</div><div class='add'>+ *		   use-after-free when iterating tags.</div><div class='add'>+ * @update_nr_hwq_lock:</div><div class='add'>+ * 		   Synchronize updating nr_hw_queues with add/del disk &amp;</div><div class='add'>+ * 		   switching elevator.</div><div class='ctx'>  */</div><div class='ctx'> struct blk_mq_tag_set {</div><div class='ctx'> 	const struct blk_mq_ops	*ops;</div><div class='hunk'>@@ -512,6 +549,9 @@ struct blk_mq_tag_set {</div><div class='ctx'> 	struct mutex		tag_list_lock;</div><div class='ctx'> 	struct list_head	tag_list;</div><div class='ctx'> 	struct srcu_struct	*srcu;</div><div class='add'>+	struct srcu_struct	tags_srcu;</div><div class='add'>+</div><div class='add'>+	struct rw_semaphore	update_nr_hwq_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -553,7 +593,7 @@ struct blk_mq_ops {</div><div class='ctx'> 	 * empty the @rqlist completely, then the rest will be queued</div><div class='ctx'> 	 * individually by the block layer upon return.</div><div class='ctx'> 	 */</div><div class='del'>-	void (*queue_rqs)(struct request **rqlist);</div><div class='add'>+	void (*queue_rqs)(struct rq_list *rqlist);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @get_budget: Reserve budget before queue request, once .queue_rq is</div><div class='hunk'>@@ -644,8 +684,8 @@ struct blk_mq_ops {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Keep hctx_flag_name[] in sync with the definitions below */</div><div class='ctx'> enum {</div><div class='del'>-	BLK_MQ_F_SHOULD_MERGE	= 1 &lt;&lt; 0,</div><div class='ctx'> 	BLK_MQ_F_TAG_QUEUE_SHARED = 1 &lt;&lt; 1,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set when this device requires underlying blk-mq device for</div><div class='hunk'>@@ -653,37 +693,35 @@ enum {</div><div class='ctx'> 	 */</div><div class='ctx'> 	BLK_MQ_F_STACKING	= 1 &lt;&lt; 2,</div><div class='ctx'> 	BLK_MQ_F_TAG_HCTX_SHARED = 1 &lt;&lt; 3,</div><div class='del'>-	BLK_MQ_F_BLOCKING	= 1 &lt;&lt; 5,</div><div class='del'>-	/* Do not allow an I/O scheduler to be configured. */</div><div class='del'>-	BLK_MQ_F_NO_SCHED	= 1 &lt;&lt; 6,</div><div class='add'>+	BLK_MQ_F_BLOCKING	= 1 &lt;&lt; 4,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Alloc tags on a round-robin base instead of the first available one.</div><div class='add'>+	 */</div><div class='add'>+	BLK_MQ_F_TAG_RR		= 1 &lt;&lt; 5,</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Select 'none' during queue registration in case of a single hwq</div><div class='ctx'> 	 * or shared hwqs instead of 'mq-deadline'.</div><div class='ctx'> 	 */</div><div class='del'>-	BLK_MQ_F_NO_SCHED_BY_DEFAULT	= 1 &lt;&lt; 7,</div><div class='del'>-	BLK_MQ_F_ALLOC_POLICY_START_BIT = 8,</div><div class='del'>-	BLK_MQ_F_ALLOC_POLICY_BITS = 1,</div><div class='del'>-</div><div class='del'>-	BLK_MQ_S_STOPPED	= 0,</div><div class='del'>-	BLK_MQ_S_TAG_ACTIVE	= 1,</div><div class='del'>-	BLK_MQ_S_SCHED_RESTART	= 2,</div><div class='del'>-</div><div class='del'>-	/* hw queue is inactive after all its CPUs become offline */</div><div class='del'>-	BLK_MQ_S_INACTIVE	= 3,</div><div class='del'>-</div><div class='del'>-	BLK_MQ_MAX_DEPTH	= 10240,</div><div class='add'>+	BLK_MQ_F_NO_SCHED_BY_DEFAULT	= 1 &lt;&lt; 6,</div><div class='ctx'> </div><div class='del'>-	BLK_MQ_CPU_WORK_BATCH	= 8,</div><div class='add'>+	BLK_MQ_F_MAX = 1 &lt;&lt; 7,</div><div class='ctx'> };</div><div class='del'>-#define BLK_MQ_FLAG_TO_ALLOC_POLICY(flags) \</div><div class='del'>-	((flags &gt;&gt; BLK_MQ_F_ALLOC_POLICY_START_BIT) &amp; \</div><div class='del'>-		((1 &lt;&lt; BLK_MQ_F_ALLOC_POLICY_BITS) - 1))</div><div class='del'>-#define BLK_ALLOC_POLICY_TO_MQ_FLAG(policy) \</div><div class='del'>-	((policy &amp; ((1 &lt;&lt; BLK_MQ_F_ALLOC_POLICY_BITS) - 1)) \</div><div class='del'>-		&lt;&lt; BLK_MQ_F_ALLOC_POLICY_START_BIT)</div><div class='ctx'> </div><div class='add'>+#define BLK_MQ_MAX_DEPTH	(10240)</div><div class='ctx'> #define BLK_MQ_NO_HCTX_IDX	(-1U)</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	/* Keep hctx_state_name[] in sync with the definitions below */</div><div class='add'>+	BLK_MQ_S_STOPPED,</div><div class='add'>+	BLK_MQ_S_TAG_ACTIVE,</div><div class='add'>+	BLK_MQ_S_SCHED_RESTART,</div><div class='add'>+	/* hw queue is inactive after all its CPUs become offline */</div><div class='add'>+	BLK_MQ_S_INACTIVE,</div><div class='add'>+	BLK_MQ_S_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set,</div><div class='ctx'> 		struct queue_limits *lim, void *queuedata,</div><div class='ctx'> 		struct lock_class_key *lkclass);</div><div class='hunk'>@@ -748,6 +786,7 @@ struct blk_mq_tags {</div><div class='ctx'> 	 * request pool</div><div class='ctx'> 	 */</div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags,</div><div class='hunk'>@@ -831,12 +870,6 @@ void blk_mq_end_request_batch(struct io_comp_batch *ib);</div><div class='ctx'>  */</div><div class='ctx'> static inline bool blk_mq_need_time_stamp(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * passthrough io doesn't use iostat accounting, cgroup stats</div><div class='del'>-	 * and io scheduler functionalities.</div><div class='del'>-	 */</div><div class='del'>-	if (blk_rq_is_passthrough(rq))</div><div class='del'>-		return false;</div><div class='ctx'> 	return (rq-&gt;rq_flags &amp; (RQF_IO_STAT | RQF_STATS | RQF_USE_SCHED));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -845,28 +878,46 @@ static inline bool blk_mq_is_reserved_rq(struct request *rq)</div><div class='ctx'> 	return rq-&gt;rq_flags &amp; RQF_RESV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='add'>+ * blk_mq_add_to_batch() - add a request to the completion batch</div><div class='add'>+ * @req: The request to add to batch</div><div class='add'>+ * @iob: The batch to add the request</div><div class='add'>+ * @is_error: Specify true if the request failed with an error</div><div class='add'>+ * @complete: The completaion handler for the request</div><div class='add'>+ *</div><div class='ctx'>  * Batched completions only work when there is no I/O error and no special</div><div class='ctx'>  * -&gt;end_io handler.</div><div class='add'>+ *</div><div class='add'>+ * Return: true when the request was added to the batch, otherwise false</div><div class='ctx'>  */</div><div class='ctx'> static inline bool blk_mq_add_to_batch(struct request *req,</div><div class='del'>-				       struct io_comp_batch *iob, int ioerror,</div><div class='add'>+				       struct io_comp_batch *iob, bool is_error,</div><div class='ctx'> 				       void (*complete)(struct io_comp_batch *))</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * blk_mq_end_request_batch() can't end request allocated from</div><div class='del'>-	 * sched tags</div><div class='add'>+	 * Check various conditions that exclude batch processing:</div><div class='add'>+	 * 1) No batch container</div><div class='add'>+	 * 2) Has scheduler data attached</div><div class='add'>+	 * 3) Not a passthrough request and end_io set</div><div class='add'>+	 * 4) Not a passthrough request and failed with an error</div><div class='ctx'> 	 */</div><div class='del'>-	if (!iob || (req-&gt;rq_flags &amp; RQF_SCHED_TAGS) || ioerror ||</div><div class='del'>-			(req-&gt;end_io &amp;&amp; !blk_rq_is_passthrough(req)))</div><div class='add'>+	if (!iob)</div><div class='add'>+		return false;</div><div class='add'>+	if (req-&gt;rq_flags &amp; RQF_SCHED_TAGS)</div><div class='ctx'> 		return false;</div><div class='add'>+	if (!blk_rq_is_passthrough(req)) {</div><div class='add'>+		if (req-&gt;end_io)</div><div class='add'>+			return false;</div><div class='add'>+		if (is_error)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!iob-&gt;complete)</div><div class='ctx'> 		iob-&gt;complete = complete;</div><div class='ctx'> 	else if (iob-&gt;complete != complete)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	iob-&gt;need_ts |= blk_mq_need_time_stamp(req);</div><div class='del'>-	rq_list_add(&amp;iob-&gt;req_list, req);</div><div class='add'>+	rq_list_add_tail(&amp;iob-&gt;req_list, req);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -893,14 +944,34 @@ void blk_mq_delay_run_hw_queues(struct request_queue *q, unsigned long msecs);</div><div class='ctx'> void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,</div><div class='ctx'> 		busy_tag_iter_fn *fn, void *priv);</div><div class='ctx'> void blk_mq_tagset_wait_completed_request(struct blk_mq_tag_set *tagset);</div><div class='del'>-void blk_mq_freeze_queue(struct request_queue *q);</div><div class='del'>-void blk_mq_unfreeze_queue(struct request_queue *q);</div><div class='add'>+void blk_mq_freeze_queue_nomemsave(struct request_queue *q);</div><div class='add'>+void blk_mq_unfreeze_queue_nomemrestore(struct request_queue *q);</div><div class='add'>+static inline unsigned int __must_check</div><div class='add'>+blk_mq_freeze_queue(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	unsigned int memflags = memalloc_noio_save();</div><div class='add'>+</div><div class='add'>+	blk_mq_freeze_queue_nomemsave(q);</div><div class='add'>+	return memflags;</div><div class='add'>+}</div><div class='add'>+static inline void</div><div class='add'>+blk_mq_unfreeze_queue(struct request_queue *q, unsigned int memflags)</div><div class='add'>+{</div><div class='add'>+	blk_mq_unfreeze_queue_nomemrestore(q);</div><div class='add'>+	memalloc_noio_restore(memflags);</div><div class='add'>+}</div><div class='ctx'> void blk_freeze_queue_start(struct request_queue *q);</div><div class='ctx'> void blk_mq_freeze_queue_wait(struct request_queue *q);</div><div class='ctx'> int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,</div><div class='ctx'> 				     unsigned long timeout);</div><div class='add'>+void blk_mq_unfreeze_queue_non_owner(struct request_queue *q);</div><div class='add'>+void blk_freeze_queue_start_non_owner(struct request_queue *q);</div><div class='ctx'> </div><div class='add'>+unsigned int blk_mq_num_possible_queues(unsigned int max_queues);</div><div class='add'>+unsigned int blk_mq_num_online_queues(unsigned int max_queues);</div><div class='ctx'> void blk_mq_map_queues(struct blk_mq_queue_map *qmap);</div><div class='add'>+void blk_mq_map_hw_queues(struct blk_mq_queue_map *qmap,</div><div class='add'>+			  struct device *dev, unsigned int offset);</div><div class='ctx'> void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues);</div><div class='ctx'> </div><div class='ctx'> void blk_mq_quiesce_queue_nowait(struct request_queue *q);</div><div class='hunk'>@@ -944,8 +1015,20 @@ static inline void *blk_mq_rq_to_pdu(struct request *rq)</div><div class='ctx'> 	return rq + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct blk_mq_hw_ctx *queue_hctx(struct request_queue *q, int id)</div><div class='add'>+{</div><div class='add'>+	struct blk_mq_hw_ctx *hctx;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hctx = rcu_dereference(q-&gt;queue_hw_ctx)[id];</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return hctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define queue_for_each_hw_ctx(q, hctx, i)				\</div><div class='del'>-	xa_for_each(&amp;(q)-&gt;hctx_table, (i), (hctx))</div><div class='add'>+	for ((i) = 0; (i) &lt; (q)-&gt;nr_hw_queues &amp;&amp;			\</div><div class='add'>+	     ({ hctx = queue_hctx((q), i); 1; }); (i)++)</div><div class='ctx'> </div><div class='ctx'> #define hctx_for_each_ctx(hctx, ctx, i)					\</div><div class='ctx'> 	for ((i) = 0; (i) &lt; (hctx)-&gt;nr_ctx &amp;&amp;				\</div><div class='hunk'>@@ -957,15 +1040,6 @@ static inline void blk_mq_cleanup_rq(struct request *rq)</div><div class='ctx'> 		rq-&gt;q-&gt;mq_ops-&gt;cleanup_rq(rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void blk_rq_bio_prep(struct request *rq, struct bio *bio,</div><div class='del'>-		unsigned int nr_segs)</div><div class='del'>-{</div><div class='del'>-	rq-&gt;nr_phys_segments = nr_segs;</div><div class='del'>-	rq-&gt;__data_len = bio-&gt;bi_iter.bi_size;</div><div class='del'>-	rq-&gt;bio = rq-&gt;biotail = bio;</div><div class='del'>-	rq-&gt;ioprio = bio_prio(bio);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void blk_mq_hctx_set_fq_lock_class(struct blk_mq_hw_ctx *hctx,</div><div class='ctx'> 		struct lock_class_key *key);</div><div class='ctx'> </div><div class='hunk'>@@ -997,8 +1071,8 @@ int blk_rq_map_user_io(struct request *, struct rq_map_data *,</div><div class='ctx'> int blk_rq_map_user_iov(struct request_queue *, struct request *,</div><div class='ctx'> 		struct rq_map_data *, const struct iov_iter *, gfp_t);</div><div class='ctx'> int blk_rq_unmap_user(struct bio *);</div><div class='del'>-int blk_rq_map_kern(struct request_queue *, struct request *, void *,</div><div class='del'>-		unsigned int, gfp_t);</div><div class='add'>+int blk_rq_map_kern(struct request *rq, void *kbuf, unsigned int len,</div><div class='add'>+		gfp_t gfp);</div><div class='ctx'> int blk_rq_append_bio(struct request *rq, struct bio *bio);</div><div class='ctx'> void blk_execute_rq_nowait(struct request *rq, bool at_head);</div><div class='ctx'> blk_status_t blk_execute_rq(struct request *rq, bool at_head);</div><div class='hunk'>@@ -1139,96 +1213,32 @@ static inline unsigned short blk_rq_nr_discard_segments(struct request *rq)</div><div class='ctx'> 	return max_t(unsigned short, rq-&gt;nr_phys_segments, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __blk_rq_map_sg(struct request_queue *q, struct request *rq,</div><div class='del'>-		struct scatterlist *sglist, struct scatterlist **last_sg);</div><div class='del'>-static inline int blk_rq_map_sg(struct request_queue *q, struct request *rq,</div><div class='del'>-		struct scatterlist *sglist)</div><div class='del'>-{</div><div class='del'>-	struct scatterlist *last_sg = NULL;</div><div class='del'>-</div><div class='del'>-	return __blk_rq_map_sg(q, rq, sglist, &amp;last_sg);</div><div class='del'>-}</div><div class='del'>-void blk_dump_rq_flags(struct request *, char *);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BLK_DEV_ZONED</div><div class='del'>-static inline unsigned int blk_rq_zone_no(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	return disk_zone_no(rq-&gt;q-&gt;disk, blk_rq_pos(rq));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int blk_rq_zone_is_seq(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	return disk_zone_is_seq(rq-&gt;q-&gt;disk, blk_rq_pos(rq));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * blk_rq_is_seq_zoned_write() - Check if @rq requires write serialization.</div><div class='del'>- * @rq: Request to examine.</div><div class='add'>+ * blk_rq_nr_bvec - return number of bvecs in a request</div><div class='add'>+ * @rq: request to calculate bvecs for</div><div class='ctx'>  *</div><div class='del'>- * Note: REQ_OP_ZONE_APPEND requests do not require serialization.</div><div class='add'>+ * Returns the number of bvecs.</div><div class='ctx'>  */</div><div class='del'>-static inline bool blk_rq_is_seq_zoned_write(struct request *rq)</div><div class='add'>+static inline unsigned int blk_rq_nr_bvec(struct request *rq)</div><div class='ctx'> {</div><div class='del'>-	return op_needs_zoned_write_locking(req_op(rq)) &amp;&amp;</div><div class='del'>-		blk_rq_zone_is_seq(rq);</div><div class='del'>-}</div><div class='add'>+	struct req_iterator rq_iter;</div><div class='add'>+	struct bio_vec bv;</div><div class='add'>+	unsigned int nr_bvec = 0;</div><div class='ctx'> </div><div class='del'>-bool blk_req_needs_zone_write_lock(struct request *rq);</div><div class='del'>-bool blk_req_zone_write_trylock(struct request *rq);</div><div class='del'>-void __blk_req_zone_write_lock(struct request *rq);</div><div class='del'>-void __blk_req_zone_write_unlock(struct request *rq);</div><div class='add'>+	rq_for_each_bvec(bv, rq, rq_iter)</div><div class='add'>+		nr_bvec++;</div><div class='ctx'> </div><div class='del'>-static inline void blk_req_zone_write_lock(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	if (blk_req_needs_zone_write_lock(rq))</div><div class='del'>-		__blk_req_zone_write_lock(rq);</div><div class='add'>+	return nr_bvec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void blk_req_zone_write_unlock(struct request *rq)</div><div class='add'>+int __blk_rq_map_sg(struct request *rq, struct scatterlist *sglist,</div><div class='add'>+		struct scatterlist **last_sg);</div><div class='add'>+static inline int blk_rq_map_sg(struct request *rq, struct scatterlist *sglist)</div><div class='ctx'> {</div><div class='del'>-	if (rq-&gt;rq_flags &amp; RQF_ZONE_WRITE_LOCKED)</div><div class='del'>-		__blk_req_zone_write_unlock(rq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool blk_req_zone_is_write_locked(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	return rq-&gt;q-&gt;disk-&gt;seq_zones_wlock &amp;&amp;</div><div class='del'>-		test_bit(blk_rq_zone_no(rq), rq-&gt;q-&gt;disk-&gt;seq_zones_wlock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool blk_req_can_dispatch_to_zone(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	if (!blk_req_needs_zone_write_lock(rq))</div><div class='del'>-		return true;</div><div class='del'>-	return !blk_req_zone_is_write_locked(rq);</div><div class='del'>-}</div><div class='del'>-#else /* CONFIG_BLK_DEV_ZONED */</div><div class='del'>-static inline bool blk_rq_is_seq_zoned_write(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool blk_req_needs_zone_write_lock(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void blk_req_zone_write_lock(struct request *rq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void blk_req_zone_write_unlock(struct request *rq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline bool blk_req_zone_is_write_locked(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='add'>+	struct scatterlist *last_sg = NULL;</div><div class='ctx'> </div><div class='del'>-static inline bool blk_req_can_dispatch_to_zone(struct request *rq)</div><div class='del'>-{</div><div class='del'>-	return true;</div><div class='add'>+	return __blk_rq_map_sg(rq, sglist, &amp;last_sg);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_BLK_DEV_ZONED */</div><div class='add'>+void blk_dump_rq_flags(struct request *, char *);</div><div class='ctx'> </div><div class='ctx'> #endif /* BLK_MQ_H */</div><div class='head'>diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h<br/>index cb1526ec44b5..5dc061d318a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blk_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blk_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/blk_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/blk_types.h</a></div><div class='hunk'>@@ -45,12 +45,17 @@ struct block_device {</div><div class='ctx'> 	struct request_queue *	bd_queue;</div><div class='ctx'> 	struct disk_stats __percpu *bd_stats;</div><div class='ctx'> 	unsigned long		bd_stamp;</div><div class='del'>-	bool			bd_read_only;	/* read-only policy */</div><div class='del'>-	u8			bd_partno;</div><div class='del'>-	bool			bd_write_holder;</div><div class='del'>-	bool			bd_has_submit_bio;</div><div class='add'>+	atomic_t		__bd_flags;	// partition number + flags</div><div class='add'>+#define BD_PARTNO		255	// lower 8 bits; assign-once</div><div class='add'>+#define BD_READ_ONLY		(1u&lt;&lt;8) // read-only policy</div><div class='add'>+#define BD_WRITE_HOLDER		(1u&lt;&lt;9)</div><div class='add'>+#define BD_HAS_SUBMIT_BIO	(1u&lt;&lt;10)</div><div class='add'>+#define BD_RO_WARNED		(1u&lt;&lt;11)</div><div class='add'>+#ifdef CONFIG_FAIL_MAKE_REQUEST</div><div class='add'>+#define BD_MAKE_IT_FAIL		(1u&lt;&lt;12)</div><div class='add'>+#endif</div><div class='ctx'> 	dev_t			bd_dev;</div><div class='del'>-	struct inode		*bd_inode;	/* will die */</div><div class='add'>+	struct address_space	*bd_mapping;	/* page cache */</div><div class='ctx'> </div><div class='ctx'> 	atomic_t		bd_openers;</div><div class='ctx'> 	spinlock_t		bd_size_lock; /* for bd_inode-&gt;i_size updates */</div><div class='hunk'>@@ -65,11 +70,10 @@ struct block_device {</div><div class='ctx'> 	struct mutex		bd_fsfreeze_mutex; /* serialize freeze/thaw */</div><div class='ctx'> </div><div class='ctx'> 	struct partition_meta_info *bd_meta_info;</div><div class='del'>-#ifdef CONFIG_FAIL_MAKE_REQUEST</div><div class='del'>-	bool			bd_make_it_fail;</div><div class='del'>-#endif</div><div class='del'>-	bool			bd_ro_warned;</div><div class='ctx'> 	int			bd_writers;</div><div class='add'>+#ifdef CONFIG_SECURITY</div><div class='add'>+	void			*bd_security;</div><div class='add'>+#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * keep this out-of-line as it's both big and not needed in the fast</div><div class='ctx'> 	 * path</div><div class='hunk'>@@ -88,15 +92,9 @@ struct block_device {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Block error status values.  See block/blk-core:blk_errors for the details.</div><div class='del'>- * Alpha cannot write a byte atomically, so we need to use 32-bit value.</div><div class='ctx'>  */</div><div class='del'>-#if defined(CONFIG_ALPHA) &amp;&amp; !defined(__alpha_bwx__)</div><div class='del'>-typedef u32 __bitwise blk_status_t;</div><div class='del'>-typedef u32 blk_short_t;</div><div class='del'>-#else</div><div class='ctx'> typedef u8 __bitwise blk_status_t;</div><div class='ctx'> typedef u16 blk_short_t;</div><div class='del'>-#endif</div><div class='ctx'> #define	BLK_STS_OK 0</div><div class='ctx'> #define BLK_STS_NOTSUPP		((__force blk_status_t)1)</div><div class='ctx'> #define BLK_STS_TIMEOUT		((__force blk_status_t)2)</div><div class='hunk'>@@ -137,25 +135,13 @@ typedef u16 blk_short_t;</div><div class='ctx'> #define BLK_STS_DEV_RESOURCE	((__force blk_status_t)13)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * BLK_STS_ZONE_RESOURCE is returned from the driver to the block layer if zone</div><div class='del'>- * related resources are unavailable, but the driver can guarantee the queue</div><div class='del'>- * will be rerun in the future once the resources become available again.</div><div class='del'>- *</div><div class='del'>- * This is different from BLK_STS_DEV_RESOURCE in that it explicitly references</div><div class='del'>- * a zone specific resource and IO to a different zone on the same device could</div><div class='del'>- * still be served. Examples of that are zones that are write-locked, but a read</div><div class='del'>- * to the same zone could be served.</div><div class='del'>- */</div><div class='del'>-#define BLK_STS_ZONE_RESOURCE	((__force blk_status_t)14)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * BLK_STS_ZONE_OPEN_RESOURCE is returned from the driver in the completion</div><div class='ctx'>  * path if the device returns a status indicating that too many zone resources</div><div class='ctx'>  * are currently open. The same command should be successful if resubmitted</div><div class='ctx'>  * after the number of open zones decreases below the device's limits, which is</div><div class='ctx'>  * reported in the request_queue's max_open_zones.</div><div class='ctx'>  */</div><div class='del'>-#define BLK_STS_ZONE_OPEN_RESOURCE	((__force blk_status_t)15)</div><div class='add'>+#define BLK_STS_ZONE_OPEN_RESOURCE	((__force blk_status_t)14)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * BLK_STS_ZONE_ACTIVE_RESOURCE is returned from the driver in the completion</div><div class='hunk'>@@ -164,20 +150,25 @@ typedef u16 blk_short_t;</div><div class='ctx'>  * after the number of active zones decreases below the device's limits, which</div><div class='ctx'>  * is reported in the request_queue's max_active_zones.</div><div class='ctx'>  */</div><div class='del'>-#define BLK_STS_ZONE_ACTIVE_RESOURCE	((__force blk_status_t)16)</div><div class='add'>+#define BLK_STS_ZONE_ACTIVE_RESOURCE	((__force blk_status_t)15)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * BLK_STS_OFFLINE is returned from the driver when the target device is offline</div><div class='ctx'>  * or is being taken offline. This could help differentiate the case where a</div><div class='ctx'>  * device is intentionally being shut down from a real I/O error.</div><div class='ctx'>  */</div><div class='del'>-#define BLK_STS_OFFLINE		((__force blk_status_t)17)</div><div class='add'>+#define BLK_STS_OFFLINE		((__force blk_status_t)16)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * BLK_STS_DURATION_LIMIT is returned from the driver when the target device</div><div class='ctx'>  * aborted the command because it exceeded one of its Command Duration Limits.</div><div class='ctx'>  */</div><div class='del'>-#define BLK_STS_DURATION_LIMIT	((__force blk_status_t)18)</div><div class='add'>+#define BLK_STS_DURATION_LIMIT	((__force blk_status_t)17)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Invalid size or alignment.</div><div class='add'>+ */</div><div class='add'>+#define BLK_STS_INVAL	((__force blk_status_t)19)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * blk_path_error - returns true if error may be path related</div><div class='hunk'>@@ -207,10 +198,6 @@ static inline bool blk_path_error(blk_status_t error)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct bio_issue {</div><div class='del'>-	u64 value;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> typedef __u32 __bitwise blk_opf_t;</div><div class='ctx'> </div><div class='ctx'> typedef unsigned int blk_qc_t;</div><div class='hunk'>@@ -229,12 +216,30 @@ struct bio {</div><div class='ctx'> 	unsigned short		bi_flags;	/* BIO_* below */</div><div class='ctx'> 	unsigned short		bi_ioprio;</div><div class='ctx'> 	enum rw_hint		bi_write_hint;</div><div class='add'>+	u8			bi_write_stream;</div><div class='ctx'> 	blk_status_t		bi_status;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The bvec gap bit indicates the lowest set bit in any address offset</div><div class='add'>+	 * between all bi_io_vecs. This field is initialized only after the bio</div><div class='add'>+	 * is split to the hardware limits (see bio_split_io_at()). The value</div><div class='add'>+	 * may be used to consider DMA optimization when performing that</div><div class='add'>+	 * mapping. The value is compared to a power of two mask where the</div><div class='add'>+	 * result depends on any bit set within the mask, so saving the lowest</div><div class='add'>+	 * bit is sufficient to know if any segment gap collides with the mask.</div><div class='add'>+	 */</div><div class='add'>+	u8			bi_bvec_gap_bit;</div><div class='add'>+</div><div class='ctx'> 	atomic_t		__bi_remaining;</div><div class='ctx'> </div><div class='ctx'> 	struct bvec_iter	bi_iter;</div><div class='ctx'> </div><div class='del'>-	blk_qc_t		bi_cookie;</div><div class='add'>+	union {</div><div class='add'>+		/* for polled bios: */</div><div class='add'>+		blk_qc_t		bi_cookie;</div><div class='add'>+		/* for plugged zoned writes only: */</div><div class='add'>+		unsigned int		__bi_nr_segments;</div><div class='add'>+	};</div><div class='ctx'> 	bio_end_io_t		*bi_end_io;</div><div class='ctx'> 	void			*bi_private;</div><div class='ctx'> #ifdef CONFIG_BLK_CGROUP</div><div class='hunk'>@@ -245,7 +250,8 @@ struct bio {</div><div class='ctx'> 	 * on release of the bio.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct blkcg_gq		*bi_blkg;</div><div class='del'>-	struct bio_issue	bi_issue;</div><div class='add'>+	/* Time that this bio was issued. */</div><div class='add'>+	u64			issue_time_ns;</div><div class='ctx'> #ifdef CONFIG_BLK_CGROUP_IOCOST</div><div class='ctx'> 	u64			bi_iocost_cost;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -255,11 +261,9 @@ struct bio {</div><div class='ctx'> 	struct bio_crypt_ctx	*bi_crypt_context;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	union {</div><div class='ctx'> #if defined(CONFIG_BLK_DEV_INTEGRITY)</div><div class='del'>-		struct bio_integrity_payload *bi_integrity; /* data integrity */</div><div class='add'>+	struct bio_integrity_payload *bi_integrity; /* data integrity */</div><div class='ctx'> #endif</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	unsigned short		bi_vcnt;	/* how many bio_vec's */</div><div class='ctx'> </div><div class='hunk'>@@ -274,25 +278,22 @@ struct bio {</div><div class='ctx'> 	struct bio_vec		*bi_io_vec;	/* the actual vec list */</div><div class='ctx'> </div><div class='ctx'> 	struct bio_set		*bi_pool;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can inline a number of vecs at the end of the bio, to avoid</div><div class='del'>-	 * double allocations for a small number of bio_vecs. This member</div><div class='del'>-	 * MUST obviously be kept at the very end of the bio.</div><div class='del'>-	 */</div><div class='del'>-	struct bio_vec		bi_inline_vecs[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BIO_RESET_BYTES		offsetof(struct bio, bi_max_vecs)</div><div class='ctx'> #define BIO_MAX_SECTORS		(UINT_MAX &gt;&gt; SECTOR_SHIFT)</div><div class='ctx'> </div><div class='add'>+static inline struct bio_vec *bio_inline_vecs(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return (struct bio_vec *)(bio + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * bio flags</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	BIO_PAGE_PINNED,	/* Unpin pages in bio_release_pages() */</div><div class='ctx'> 	BIO_CLONED,		/* doesn't own data */</div><div class='del'>-	BIO_BOUNCED,		/* bio is a bounce bio */</div><div class='ctx'> 	BIO_QUIET,		/* Make BIO Quiet */</div><div class='ctx'> 	BIO_CHAIN,		/* chained bio, -&gt;bi_remaining in effect */</div><div class='ctx'> 	BIO_REFFED,		/* bio has elevated -&gt;bi_cnt */</div><div class='hunk'>@@ -302,9 +303,18 @@ enum {</div><div class='ctx'> 				 * of this bio. */</div><div class='ctx'> 	BIO_CGROUP_ACCT,	/* has been accounted to a cgroup */</div><div class='ctx'> 	BIO_QOS_THROTTLED,	/* bio went through rq_qos throttle path */</div><div class='add'>+	/*</div><div class='add'>+	 * This bio has completed bps throttling at the single tg granularity,</div><div class='add'>+	 * which is different from BIO_BPS_THROTTLED. When the bio is enqueued</div><div class='add'>+	 * into the sq-&gt;queued of the upper tg, or is about to be dispatched,</div><div class='add'>+	 * this flag needs to be cleared. Since blk-throttle and rq_qos are not</div><div class='add'>+	 * on the same hierarchical level, reuse the value.</div><div class='add'>+	 */</div><div class='add'>+	BIO_TG_BPS_THROTTLED = BIO_QOS_THROTTLED,</div><div class='ctx'> 	BIO_QOS_MERGED,		/* but went through rq_qos merge path */</div><div class='ctx'> 	BIO_REMAPPED,</div><div class='del'>-	BIO_ZONE_WRITE_LOCKED,	/* Owns a zoned device zone write lock */</div><div class='add'>+	BIO_ZONE_WRITE_PLUGGING, /* bio handled through zone write plugging */</div><div class='add'>+	BIO_EMULATES_ZONE_APPEND, /* bio emulates a zone append operation */</div><div class='ctx'> 	BIO_FLAG_LAST</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -343,15 +353,15 @@ enum req_op {</div><div class='ctx'> 	/* write the zero filled sector many times */</div><div class='ctx'> 	REQ_OP_WRITE_ZEROES	= (__force blk_opf_t)9,</div><div class='ctx'> 	/* Open a zone */</div><div class='del'>-	REQ_OP_ZONE_OPEN	= (__force blk_opf_t)10,</div><div class='add'>+	REQ_OP_ZONE_OPEN	= (__force blk_opf_t)11,</div><div class='ctx'> 	/* Close a zone */</div><div class='del'>-	REQ_OP_ZONE_CLOSE	= (__force blk_opf_t)11,</div><div class='add'>+	REQ_OP_ZONE_CLOSE	= (__force blk_opf_t)13,</div><div class='ctx'> 	/* Transition a zone to full */</div><div class='del'>-	REQ_OP_ZONE_FINISH	= (__force blk_opf_t)12,</div><div class='add'>+	REQ_OP_ZONE_FINISH	= (__force blk_opf_t)15,</div><div class='ctx'> 	/* reset a zone write pointer */</div><div class='del'>-	REQ_OP_ZONE_RESET	= (__force blk_opf_t)13,</div><div class='add'>+	REQ_OP_ZONE_RESET	= (__force blk_opf_t)17,</div><div class='ctx'> 	/* reset all the zone present on the device */</div><div class='del'>-	REQ_OP_ZONE_RESET_ALL	= (__force blk_opf_t)15,</div><div class='add'>+	REQ_OP_ZONE_RESET_ALL	= (__force blk_opf_t)19,</div><div class='ctx'> </div><div class='ctx'> 	/* Driver private requests */</div><div class='ctx'> 	REQ_OP_DRV_IN		= (__force blk_opf_t)34,</div><div class='hunk'>@@ -360,6 +370,7 @@ enum req_op {</div><div class='ctx'> 	REQ_OP_LAST		= (__force blk_opf_t)36,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Keep cmd_flag_name[] in sync with the definitions below */</div><div class='ctx'> enum req_flag_bits {</div><div class='ctx'> 	__REQ_FAILFAST_DEV =	/* no driver retries of device errors */</div><div class='ctx'> 		REQ_OP_BITS,</div><div class='hunk'>@@ -381,7 +392,7 @@ enum req_flag_bits {</div><div class='ctx'> 	__REQ_SWAP,		/* swap I/O */</div><div class='ctx'> 	__REQ_DRV,		/* for driver use */</div><div class='ctx'> 	__REQ_FS_PRIVATE,	/* for file system (submitter) use */</div><div class='del'>-</div><div class='add'>+	__REQ_ATOMIC,		/* for atomic write operations */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Command specific flags, keep last:</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -413,6 +424,7 @@ enum req_flag_bits {</div><div class='ctx'> #define REQ_SWAP	(__force blk_opf_t)(1ULL &lt;&lt; __REQ_SWAP)</div><div class='ctx'> #define REQ_DRV		(__force blk_opf_t)(1ULL &lt;&lt; __REQ_DRV)</div><div class='ctx'> #define REQ_FS_PRIVATE	(__force blk_opf_t)(1ULL &lt;&lt; __REQ_FS_PRIVATE)</div><div class='add'>+#define REQ_ATOMIC	(__force blk_opf_t)(1ULL &lt;&lt; __REQ_ATOMIC)</div><div class='ctx'> </div><div class='ctx'> #define REQ_NOUNMAP	(__force blk_opf_t)(1ULL &lt;&lt; __REQ_NOUNMAP)</div><div class='ctx'> </div><div class='hunk'>@@ -467,15 +479,13 @@ static inline bool op_is_discard(blk_opf_t op)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Check if a bio or request operation is a zone management operation, with</div><div class='del'>- * the exception of REQ_OP_ZONE_RESET_ALL which is treated as a special case</div><div class='del'>- * due to its different handling in the block layer and device response in</div><div class='del'>- * case of command failure.</div><div class='add'>+ * Check if a bio or request operation is a zone management operation.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool op_is_zone_mgmt(enum req_op op)</div><div class='ctx'> {</div><div class='ctx'> 	switch (op &amp; REQ_OP_MASK) {</div><div class='ctx'> 	case REQ_OP_ZONE_RESET:</div><div class='add'>+	case REQ_OP_ZONE_RESET_ALL:</div><div class='ctx'> 	case REQ_OP_ZONE_OPEN:</div><div class='ctx'> 	case REQ_OP_ZONE_CLOSE:</div><div class='ctx'> 	case REQ_OP_ZONE_FINISH:</div><div class='head'>diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h<br/>index f9b87c39cab0..72e34acd439c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blkdev.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blkdev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/blkdev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/blkdev.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/uuid.h&gt;</div><div class='ctx'> #include &lt;linux/xarray.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct module;</div><div class='ctx'> struct request_queue;</div><div class='hunk'>@@ -37,6 +38,7 @@ struct blk_flush_queue;</div><div class='ctx'> struct kiocb;</div><div class='ctx'> struct pr_ops;</div><div class='ctx'> struct rq_qos;</div><div class='add'>+struct blk_report_zones_args;</div><div class='ctx'> struct blk_queue_stats;</div><div class='ctx'> struct blk_stat_callback;</div><div class='ctx'> struct blk_crypto_profile;</div><div class='hunk'>@@ -105,13 +107,21 @@ enum {</div><div class='ctx'> struct disk_events;</div><div class='ctx'> struct badblocks;</div><div class='ctx'> </div><div class='add'>+enum blk_integrity_checksum {</div><div class='add'>+	BLK_INTEGRITY_CSUM_NONE		= 0,</div><div class='add'>+	BLK_INTEGRITY_CSUM_IP		= 1,</div><div class='add'>+	BLK_INTEGRITY_CSUM_CRC		= 2,</div><div class='add'>+	BLK_INTEGRITY_CSUM_CRC64	= 3,</div><div class='add'>+} __packed ;</div><div class='add'>+</div><div class='ctx'> struct blk_integrity {</div><div class='del'>-	const struct blk_integrity_profile	*profile;</div><div class='ctx'> 	unsigned char				flags;</div><div class='del'>-	unsigned char				tuple_size;</div><div class='add'>+	enum blk_integrity_checksum		csum_type;</div><div class='add'>+	unsigned char				metadata_size;</div><div class='ctx'> 	unsigned char				pi_offset;</div><div class='ctx'> 	unsigned char				interval_exp;</div><div class='ctx'> 	unsigned char				tag_size;</div><div class='add'>+	unsigned char				pi_tuple_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef unsigned int __bitwise blk_mode_t;</div><div class='hunk'>@@ -128,6 +138,8 @@ typedef unsigned int __bitwise blk_mode_t;</div><div class='ctx'> #define BLK_OPEN_WRITE_IOCTL	((__force blk_mode_t)(1 &lt;&lt; 4))</div><div class='ctx'> /* open is exclusive wrt all other BLK_OPEN_WRITE opens to the device */</div><div class='ctx'> #define BLK_OPEN_RESTRICT_WRITES	((__force blk_mode_t)(1 &lt;&lt; 5))</div><div class='add'>+/* return partition scanning errors */</div><div class='add'>+#define BLK_OPEN_STRICT_SCAN	((__force blk_mode_t)(1 &lt;&lt; 6))</div><div class='ctx'> </div><div class='ctx'> struct gendisk {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -161,6 +173,7 @@ struct gendisk {</div><div class='ctx'> #define GD_ADDED			4</div><div class='ctx'> #define GD_SUPPRESS_PART_SCAN		5</div><div class='ctx'> #define GD_OWNS_QUEUE			6</div><div class='add'>+#define GD_ZONE_APPEND_USED		7</div><div class='ctx'> </div><div class='ctx'> 	struct mutex open_mutex;	/* open/close mutex */</div><div class='ctx'> 	unsigned open_partitions;	/* number of open partitions */</div><div class='hunk'>@@ -172,27 +185,25 @@ struct gendisk {</div><div class='ctx'> 	struct list_head slave_bdevs;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct timer_rand_state *random;</div><div class='del'>-	atomic_t sync_io;		/* RAID */</div><div class='ctx'> 	struct disk_events *ev;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> 	/*</div><div class='del'>-	 * Zoned block device information for request dispatch control.</div><div class='del'>-	 * nr_zones is the total number of zones of the device. This is always</div><div class='del'>-	 * 0 for regular block devices. conv_zones_bitmap is a bitmap of nr_zones</div><div class='del'>-	 * bits which indicates if a zone is conventional (bit set) or</div><div class='del'>-	 * sequential (bit clear). seq_zones_wlock is a bitmap of nr_zones</div><div class='del'>-	 * bits which indicates if a zone is write locked, that is, if a write</div><div class='del'>-	 * request targeting the zone was dispatched.</div><div class='del'>-	 *</div><div class='del'>-	 * Reads of this information must be protected with blk_queue_enter() /</div><div class='del'>-	 * blk_queue_exit(). Modifying this information is only allowed while</div><div class='del'>-	 * no requests are being processed. See also blk_mq_freeze_queue() and</div><div class='del'>-	 * blk_mq_unfreeze_queue().</div><div class='add'>+	 * Zoned block device information. Reads of this information must be</div><div class='add'>+	 * protected with blk_queue_enter() / blk_queue_exit(). Modifying this</div><div class='add'>+	 * information is only allowed while no requests are being processed.</div><div class='add'>+	 * See also blk_mq_freeze_queue() and blk_mq_unfreeze_queue().</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int		nr_zones;</div><div class='del'>-	unsigned long		*conv_zones_bitmap;</div><div class='del'>-	unsigned long		*seq_zones_wlock;</div><div class='add'>+	unsigned int		zone_capacity;</div><div class='add'>+	unsigned int		last_zone_capacity;</div><div class='add'>+	u8 __rcu		*zones_cond;</div><div class='add'>+	unsigned int		zone_wplugs_hash_bits;</div><div class='add'>+	atomic_t		nr_zone_wplugs;</div><div class='add'>+	spinlock_t		zone_wplugs_lock;</div><div class='add'>+	struct mempool		*zone_wplugs_pool;</div><div class='add'>+	struct hlist_head	*zone_wplugs_hash;</div><div class='add'>+	struct workqueue_struct *zone_wplugs_wq;</div><div class='ctx'> #endif /* CONFIG_BLK_DEV_ZONED */</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_CDROM)</div><div class='hunk'>@@ -209,12 +220,9 @@ struct gendisk {</div><div class='ctx'> 	 * devices that do not have multiple independent access ranges.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct blk_independent_access_ranges *ia_ranges;</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static inline bool disk_live(struct gendisk *disk)</div><div class='del'>-{</div><div class='del'>-	return !inode_unhashed(disk-&gt;part0-&gt;bd_inode);</div><div class='del'>-}</div><div class='add'>+	struct mutex rqos_state_mutex;	/* rqos state change mutex */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * disk_openers - returns how many openers are there for a disk</div><div class='hunk'>@@ -231,6 +239,19 @@ static inline unsigned int disk_openers(struct gendisk *disk)</div><div class='ctx'> 	return atomic_read(&amp;disk-&gt;part0-&gt;bd_openers);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * disk_has_partscan - return %true if partition scanning is enabled on a disk</div><div class='add'>+ * @disk: disk to check</div><div class='add'>+ *</div><div class='add'>+ * Returns %true if partitions scanning is enabled for @disk, or %false if</div><div class='add'>+ * partition scanning is disabled either permanently or temporarily.</div><div class='add'>+ */</div><div class='add'>+static inline bool disk_has_partscan(struct gendisk *disk)</div><div class='add'>+{</div><div class='add'>+	return !(disk-&gt;flags &amp; (GENHD_FL_NO_PART | GENHD_FL_HIDDEN)) &amp;&amp;</div><div class='add'>+		!test_bit(GD_SUPPRESS_PART_SCAN, &amp;disk-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The gendisk is refcounted by the part0 block_device, and the bd_device</div><div class='ctx'>  * therein is also used for device model presentation in sysfs.</div><div class='hunk'>@@ -251,9 +272,21 @@ static inline dev_t disk_devt(struct gendisk *disk)</div><div class='ctx'> 	return MKDEV(disk-&gt;major, disk-&gt;first_minor);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+/*</div><div class='add'>+ * We should strive for 1 &lt;&lt; (PAGE_SHIFT + MAX_PAGECACHE_ORDER)</div><div class='add'>+ * however we constrain this to what we can validate and test.</div><div class='add'>+ */</div><div class='add'>+#define BLK_MAX_BLOCK_SIZE      SZ_64K</div><div class='add'>+#else</div><div class='add'>+#define BLK_MAX_BLOCK_SIZE      PAGE_SIZE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* blk_validate_limits() validates bsize, so drivers don't usually need to */</div><div class='ctx'> static inline int blk_validate_block_size(unsigned long bsize)</div><div class='ctx'> {</div><div class='del'>-	if (bsize &lt; 512 || bsize &gt; PAGE_SIZE || !is_power_of_2(bsize))</div><div class='add'>+	if (bsize &lt; 512 || bsize &gt; BLK_MAX_BLOCK_SIZE || !is_power_of_2(bsize))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -265,17 +298,79 @@ static inline bool blk_op_is_passthrough(blk_opf_t op)</div><div class='ctx'> 	return op == REQ_OP_DRV_IN || op == REQ_OP_DRV_OUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* flags set by the driver in queue_limits.features */</div><div class='add'>+typedef unsigned int __bitwise blk_features_t;</div><div class='add'>+</div><div class='add'>+/* supports a volatile write cache */</div><div class='add'>+#define BLK_FEAT_WRITE_CACHE		((__force blk_features_t)(1u &lt;&lt; 0))</div><div class='add'>+</div><div class='add'>+/* supports passing on the FUA bit */</div><div class='add'>+#define BLK_FEAT_FUA			((__force blk_features_t)(1u &lt;&lt; 1))</div><div class='add'>+</div><div class='add'>+/* rotational device (hard drive or floppy) */</div><div class='add'>+#define BLK_FEAT_ROTATIONAL		((__force blk_features_t)(1u &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+/* contributes to the random number pool */</div><div class='add'>+#define BLK_FEAT_ADD_RANDOM		((__force blk_features_t)(1u &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+/* do disk/partitions IO accounting */</div><div class='add'>+#define BLK_FEAT_IO_STAT		((__force blk_features_t)(1u &lt;&lt; 4))</div><div class='add'>+</div><div class='add'>+/* don't modify data until writeback is done */</div><div class='add'>+#define BLK_FEAT_STABLE_WRITES		((__force blk_features_t)(1u &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+/* always completes in submit context */</div><div class='add'>+#define BLK_FEAT_SYNCHRONOUS		((__force blk_features_t)(1u &lt;&lt; 6))</div><div class='add'>+</div><div class='add'>+/* supports REQ_NOWAIT */</div><div class='add'>+#define BLK_FEAT_NOWAIT			((__force blk_features_t)(1u &lt;&lt; 7))</div><div class='add'>+</div><div class='add'>+/* supports DAX */</div><div class='add'>+#define BLK_FEAT_DAX			((__force blk_features_t)(1u &lt;&lt; 8))</div><div class='add'>+</div><div class='add'>+/* supports I/O polling */</div><div class='add'>+#define BLK_FEAT_POLL			((__force blk_features_t)(1u &lt;&lt; 9))</div><div class='add'>+</div><div class='add'>+/* is a zoned device */</div><div class='add'>+#define BLK_FEAT_ZONED			((__force blk_features_t)(1u &lt;&lt; 10))</div><div class='add'>+</div><div class='add'>+/* supports PCI(e) p2p requests */</div><div class='add'>+#define BLK_FEAT_PCI_P2PDMA		((__force blk_features_t)(1u &lt;&lt; 12))</div><div class='add'>+</div><div class='add'>+/* skip this queue in blk_mq_(un)quiesce_tagset */</div><div class='add'>+#define BLK_FEAT_SKIP_TAGSET_QUIESCE	((__force blk_features_t)(1u &lt;&lt; 13))</div><div class='add'>+</div><div class='add'>+/* undocumented magic for bcache */</div><div class='add'>+#define BLK_FEAT_RAID_PARTIAL_STRIPES_EXPENSIVE \</div><div class='add'>+	((__force blk_features_t)(1u &lt;&lt; 15))</div><div class='add'>+</div><div class='add'>+/* atomic writes enabled */</div><div class='add'>+#define BLK_FEAT_ATOMIC_WRITES \</div><div class='add'>+	((__force blk_features_t)(1u &lt;&lt; 16))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * BLK_BOUNCE_NONE:	never bounce (default)</div><div class='del'>- * BLK_BOUNCE_HIGH:	bounce all highmem pages</div><div class='add'>+ * Flags automatically inherited when stacking limits.</div><div class='ctx'>  */</div><div class='del'>-enum blk_bounce {</div><div class='del'>-	BLK_BOUNCE_NONE,</div><div class='del'>-	BLK_BOUNCE_HIGH,</div><div class='del'>-};</div><div class='add'>+#define BLK_FEAT_INHERIT_MASK \</div><div class='add'>+	(BLK_FEAT_WRITE_CACHE | BLK_FEAT_FUA | BLK_FEAT_ROTATIONAL | \</div><div class='add'>+	 BLK_FEAT_STABLE_WRITES | BLK_FEAT_ZONED | \</div><div class='add'>+	 BLK_FEAT_RAID_PARTIAL_STRIPES_EXPENSIVE)</div><div class='add'>+</div><div class='add'>+/* internal flags in queue_limits.flags */</div><div class='add'>+typedef unsigned int __bitwise blk_flags_t;</div><div class='add'>+</div><div class='add'>+/* do not send FLUSH/FUA commands despite advertising a write cache */</div><div class='add'>+#define BLK_FLAG_WRITE_CACHE_DISABLED	((__force blk_flags_t)(1u &lt;&lt; 0))</div><div class='add'>+</div><div class='add'>+/* I/O topology is misaligned */</div><div class='add'>+#define BLK_FLAG_MISALIGNED		((__force blk_flags_t)(1u &lt;&lt; 1))</div><div class='add'>+</div><div class='add'>+/* passthrough command IO accounting */</div><div class='add'>+#define BLK_FLAG_IOSTATS_PASSTHROUGH	((__force blk_flags_t)(1u &lt;&lt; 2))</div><div class='ctx'> </div><div class='ctx'> struct queue_limits {</div><div class='del'>-	enum blk_bounce		bounce;</div><div class='add'>+	blk_features_t		features;</div><div class='add'>+	blk_flags_t		flags;</div><div class='ctx'> 	unsigned long		seg_boundary_mask;</div><div class='ctx'> 	unsigned long		virt_boundary_mask;</div><div class='ctx'> </div><div class='hunk'>@@ -285,6 +380,7 @@ struct queue_limits {</div><div class='ctx'> 	unsigned int		max_sectors;</div><div class='ctx'> 	unsigned int		max_user_sectors;</div><div class='ctx'> 	unsigned int		max_segment_size;</div><div class='add'>+	unsigned int		max_fast_segment_size;</div><div class='ctx'> 	unsigned int		physical_block_size;</div><div class='ctx'> 	unsigned int		logical_block_size;</div><div class='ctx'> 	unsigned int		alignment_offset;</div><div class='hunk'>@@ -295,19 +391,32 @@ struct queue_limits {</div><div class='ctx'> 	unsigned int		max_user_discard_sectors;</div><div class='ctx'> 	unsigned int		max_secure_erase_sectors;</div><div class='ctx'> 	unsigned int		max_write_zeroes_sectors;</div><div class='add'>+	unsigned int		max_wzeroes_unmap_sectors;</div><div class='add'>+	unsigned int		max_hw_wzeroes_unmap_sectors;</div><div class='add'>+	unsigned int		max_user_wzeroes_unmap_sectors;</div><div class='add'>+	unsigned int		max_hw_zone_append_sectors;</div><div class='ctx'> 	unsigned int		max_zone_append_sectors;</div><div class='ctx'> 	unsigned int		discard_granularity;</div><div class='ctx'> 	unsigned int		discard_alignment;</div><div class='ctx'> 	unsigned int		zone_write_granularity;</div><div class='ctx'> </div><div class='add'>+	/* atomic write limits */</div><div class='add'>+	unsigned int		atomic_write_hw_max;</div><div class='add'>+	unsigned int		atomic_write_max_sectors;</div><div class='add'>+	unsigned int		atomic_write_hw_boundary;</div><div class='add'>+	unsigned int		atomic_write_boundary_sectors;</div><div class='add'>+	unsigned int		atomic_write_hw_unit_min;</div><div class='add'>+	unsigned int		atomic_write_unit_min;</div><div class='add'>+	unsigned int		atomic_write_hw_unit_max;</div><div class='add'>+	unsigned int		atomic_write_unit_max;</div><div class='add'>+</div><div class='ctx'> 	unsigned short		max_segments;</div><div class='ctx'> 	unsigned short		max_integrity_segments;</div><div class='ctx'> 	unsigned short		max_discard_segments;</div><div class='ctx'> </div><div class='del'>-	unsigned char		misaligned;</div><div class='del'>-	unsigned char		discard_misaligned;</div><div class='del'>-	unsigned char		raid_partial_stripes_expensive;</div><div class='del'>-	bool			zoned;</div><div class='add'>+	unsigned short		max_write_streams;</div><div class='add'>+	unsigned int		write_stream_granularity;</div><div class='add'>+</div><div class='ctx'> 	unsigned int		max_open_zones;</div><div class='ctx'> 	unsigned int		max_active_zones;</div><div class='ctx'> </div><div class='hunk'>@@ -317,20 +426,28 @@ struct queue_limits {</div><div class='ctx'> 	 * due to possible offsets.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int		dma_alignment;</div><div class='add'>+	unsigned int		dma_pad_mask;</div><div class='add'>+</div><div class='add'>+	struct blk_integrity	integrity;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef int (*report_zones_cb)(struct blk_zone *zone, unsigned int idx,</div><div class='ctx'> 			       void *data);</div><div class='ctx'> </div><div class='del'>-void disk_set_zoned(struct gendisk *disk);</div><div class='add'>+int disk_report_zone(struct gendisk *disk, struct blk_zone *zone,</div><div class='add'>+		     unsigned int idx, struct blk_report_zones_args *args);</div><div class='add'>+</div><div class='add'>+int blkdev_get_zone_info(struct block_device *bdev, sector_t sector,</div><div class='add'>+			 struct blk_zone *zone);</div><div class='ctx'> </div><div class='ctx'> #define BLK_ALL_ZONES  ((unsigned int)-1)</div><div class='ctx'> int blkdev_report_zones(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 		unsigned int nr_zones, report_zones_cb cb, void *data);</div><div class='add'>+int blkdev_report_zones_cached(struct block_device *bdev, sector_t sector,</div><div class='add'>+		unsigned int nr_zones, report_zones_cb cb, void *data);</div><div class='ctx'> int blkdev_zone_mgmt(struct block_device *bdev, enum req_op op,</div><div class='ctx'> 		sector_t sectors, sector_t nr_sectors);</div><div class='del'>-int blk_revalidate_disk_zones(struct gendisk *disk,</div><div class='del'>-		void (*update_driver_data)(struct gendisk *disk));</div><div class='add'>+int blk_revalidate_disk_zones(struct gendisk *disk);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Independent access ranges: struct blk_independent_access_range describes</div><div class='hunk'>@@ -378,7 +495,7 @@ struct request_queue {</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long		queue_flags;</div><div class='ctx'> </div><div class='del'>-	unsigned int		rq_timeout;</div><div class='add'>+	unsigned int __data_racy rq_timeout;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		queue_depth;</div><div class='ctx'> </div><div class='hunk'>@@ -386,9 +503,14 @@ struct request_queue {</div><div class='ctx'> </div><div class='ctx'> 	/* hw dispatch queues */</div><div class='ctx'> 	unsigned int		nr_hw_queues;</div><div class='del'>-	struct xarray		hctx_table;</div><div class='add'>+	struct blk_mq_hw_ctx * __rcu *queue_hw_ctx;</div><div class='ctx'> </div><div class='ctx'> 	struct percpu_ref	q_usage_counter;</div><div class='add'>+	struct lock_class_key	io_lock_cls_key;</div><div class='add'>+	struct lockdep_map	io_lockdep_map;</div><div class='add'>+</div><div class='add'>+	struct lock_class_key	q_lock_cls_key;</div><div class='add'>+	struct lockdep_map	q_lockdep_map;</div><div class='ctx'> </div><div class='ctx'> 	struct request		*last_merge;</div><div class='ctx'> </div><div class='hunk'>@@ -405,10 +527,6 @@ struct request_queue {</div><div class='ctx'> </div><div class='ctx'> 	struct queue_limits	limits;</div><div class='ctx'> </div><div class='del'>-#ifdef  CONFIG_BLK_DEV_INTEGRITY</div><div class='del'>-	struct blk_integrity integrity;</div><div class='del'>-#endif	/* CONFIG_BLK_DEV_INTEGRITY */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	enum rpm_status		rpm_status;</div><div class='hunk'>@@ -430,8 +548,6 @@ struct request_queue {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int			id;</div><div class='ctx'> </div><div class='del'>-	unsigned int		dma_pad_mask;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * queue settings</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -447,8 +563,6 @@ struct request_queue {</div><div class='ctx'> </div><div class='ctx'> 	atomic_t		nr_active_requests_shared_tags;</div><div class='ctx'> </div><div class='del'>-	unsigned int		required_elevator_features;</div><div class='del'>-</div><div class='ctx'> 	struct blk_mq_tags	*sched_shared_tags;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	icq_list;</div><div class='hunk'>@@ -474,8 +588,22 @@ struct request_queue {</div><div class='ctx'> 	struct blk_flush_queue	*fq;</div><div class='ctx'> 	struct list_head	flush_list;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Protects against I/O scheduler switching, particularly when updating</div><div class='add'>+	 * q-&gt;elevator. Since the elevator update code path may also modify q-&gt;</div><div class='add'>+	 * nr_requests and wbt latency, this lock also protects the sysfs attrs</div><div class='add'>+	 * nr_requests and wbt_lat_usec. Additionally the nr_hw_queues update</div><div class='add'>+	 * may modify hctx tags, reserved-tags and cpumask, so this lock also</div><div class='add'>+	 * helps protect the hctx sysfs/debugfs attrs. To ensure proper locking</div><div class='add'>+	 * order during an elevator or nr_hw_queue update, first freeze the</div><div class='add'>+	 * queue, then acquire -&gt;elevator_lock.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex		elevator_lock;</div><div class='add'>+</div><div class='ctx'> 	struct mutex		sysfs_lock;</div><div class='del'>-	struct mutex		sysfs_dir_lock;</div><div class='add'>+	/*</div><div class='add'>+	 * Protects queue limits and also sysfs attribute read_ahead_kb.</div><div class='add'>+	 */</div><div class='ctx'> 	struct mutex		limits_lock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -492,6 +620,16 @@ struct request_queue {</div><div class='ctx'> 	struct throtl_data *td;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct rcu_head		rcu_head;</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	struct task_struct	*mq_freeze_owner;</div><div class='add'>+	int			mq_freeze_owner_depth;</div><div class='add'>+	/*</div><div class='add'>+	 * Records disk &amp; queue state in current context, used in unfreeze</div><div class='add'>+	 * queue</div><div class='add'>+	 */</div><div class='add'>+	bool			mq_freeze_disk_dead;</div><div class='add'>+	bool			mq_freeze_queue_dying;</div><div class='add'>+#endif</div><div class='ctx'> 	wait_queue_head_t	mq_freeze_wq;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Protect concurrent access to q_usage_counter by</div><div class='hunk'>@@ -509,65 +647,46 @@ struct request_queue {</div><div class='ctx'> 	 * Serializes all debugfs metadata operations using the above dentries.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mutex		debugfs_mutex;</div><div class='del'>-</div><div class='del'>-	bool			mq_sysfs_init_done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Keep blk_queue_flag_name[] in sync with the definitions below */</div><div class='del'>-#define QUEUE_FLAG_STOPPED	0	/* queue is stopped */</div><div class='del'>-#define QUEUE_FLAG_DYING	1	/* queue being torn down */</div><div class='del'>-#define QUEUE_FLAG_NOMERGES     3	/* disable merge attempts */</div><div class='del'>-#define QUEUE_FLAG_SAME_COMP	4	/* complete on same CPU-group */</div><div class='del'>-#define QUEUE_FLAG_FAIL_IO	5	/* fake timeout */</div><div class='del'>-#define QUEUE_FLAG_NONROT	6	/* non-rotational device (SSD) */</div><div class='del'>-#define QUEUE_FLAG_VIRT		QUEUE_FLAG_NONROT /* paravirt device */</div><div class='del'>-#define QUEUE_FLAG_IO_STAT	7	/* do disk/partitions IO accounting */</div><div class='del'>-#define QUEUE_FLAG_NOXMERGES	9	/* No extended merges */</div><div class='del'>-#define QUEUE_FLAG_ADD_RANDOM	10	/* Contributes to random pool */</div><div class='del'>-#define QUEUE_FLAG_SYNCHRONOUS	11	/* always completes in submit context */</div><div class='del'>-#define QUEUE_FLAG_SAME_FORCE	12	/* force complete on same CPU */</div><div class='del'>-#define QUEUE_FLAG_HW_WC	13	/* Write back caching supported */</div><div class='del'>-#define QUEUE_FLAG_INIT_DONE	14	/* queue is initialized */</div><div class='del'>-#define QUEUE_FLAG_STABLE_WRITES 15	/* don't modify blks until WB is done */</div><div class='del'>-#define QUEUE_FLAG_POLL		16	/* IO polling enabled if set */</div><div class='del'>-#define QUEUE_FLAG_WC		17	/* Write back caching */</div><div class='del'>-#define QUEUE_FLAG_FUA		18	/* device supports FUA writes */</div><div class='del'>-#define QUEUE_FLAG_DAX		19	/* device supports DAX */</div><div class='del'>-#define QUEUE_FLAG_STATS	20	/* track IO start and completion times */</div><div class='del'>-#define QUEUE_FLAG_REGISTERED	22	/* queue has been registered to a disk */</div><div class='del'>-#define QUEUE_FLAG_QUIESCED	24	/* queue has been quiesced */</div><div class='del'>-#define QUEUE_FLAG_PCI_P2PDMA	25	/* device supports PCI p2p requests */</div><div class='del'>-#define QUEUE_FLAG_ZONE_RESETALL 26	/* supports Zone Reset All */</div><div class='del'>-#define QUEUE_FLAG_RQ_ALLOC_TIME 27	/* record rq-&gt;alloc_time_ns */</div><div class='del'>-#define QUEUE_FLAG_HCTX_ACTIVE	28	/* at least one blk-mq hctx is active */</div><div class='del'>-#define QUEUE_FLAG_NOWAIT       29	/* device supports NOWAIT */</div><div class='del'>-#define QUEUE_FLAG_SQ_SCHED     30	/* single queue style io dispatch */</div><div class='del'>-#define QUEUE_FLAG_SKIP_TAGSET_QUIESCE	31 /* quiesce_tagset skip the queue*/</div><div class='del'>-</div><div class='del'>-#define QUEUE_FLAG_MQ_DEFAULT	((1UL &lt;&lt; QUEUE_FLAG_IO_STAT) |		\</div><div class='del'>-				 (1UL &lt;&lt; QUEUE_FLAG_SAME_COMP) |	\</div><div class='del'>-				 (1UL &lt;&lt; QUEUE_FLAG_NOWAIT))</div><div class='add'>+enum {</div><div class='add'>+	QUEUE_FLAG_DYING,		/* queue being torn down */</div><div class='add'>+	QUEUE_FLAG_NOMERGES,		/* disable merge attempts */</div><div class='add'>+	QUEUE_FLAG_SAME_COMP,		/* complete on same CPU-group */</div><div class='add'>+	QUEUE_FLAG_FAIL_IO,		/* fake timeout */</div><div class='add'>+	QUEUE_FLAG_NOXMERGES,		/* No extended merges */</div><div class='add'>+	QUEUE_FLAG_SAME_FORCE,		/* force complete on same CPU */</div><div class='add'>+	QUEUE_FLAG_INIT_DONE,		/* queue is initialized */</div><div class='add'>+	QUEUE_FLAG_STATS,		/* track IO start and completion times */</div><div class='add'>+	QUEUE_FLAG_REGISTERED,		/* queue has been registered to a disk */</div><div class='add'>+	QUEUE_FLAG_QUIESCED,		/* queue has been quiesced */</div><div class='add'>+	QUEUE_FLAG_RQ_ALLOC_TIME,	/* record rq-&gt;alloc_time_ns */</div><div class='add'>+	QUEUE_FLAG_HCTX_ACTIVE,		/* at least one blk-mq hctx is active */</div><div class='add'>+	QUEUE_FLAG_SQ_SCHED,		/* single queue style io dispatch */</div><div class='add'>+	QUEUE_FLAG_DISABLE_WBT_DEF,	/* for sched to disable/enable wbt */</div><div class='add'>+	QUEUE_FLAG_NO_ELV_SWITCH,	/* can't switch elevator any more */</div><div class='add'>+	QUEUE_FLAG_QOS_ENABLED,		/* qos is enabled */</div><div class='add'>+	QUEUE_FLAG_BIO_ISSUE_TIME,	/* record bio-&gt;issue_time_ns */</div><div class='add'>+	QUEUE_FLAG_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QUEUE_FLAG_MQ_DEFAULT	(1UL &lt;&lt; QUEUE_FLAG_SAME_COMP)</div><div class='ctx'> </div><div class='ctx'> void blk_queue_flag_set(unsigned int flag, struct request_queue *q);</div><div class='ctx'> void blk_queue_flag_clear(unsigned int flag, struct request_queue *q);</div><div class='del'>-bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q);</div><div class='ctx'> </div><div class='del'>-#define blk_queue_stopped(q)	test_bit(QUEUE_FLAG_STOPPED, &amp;(q)-&gt;queue_flags)</div><div class='ctx'> #define blk_queue_dying(q)	test_bit(QUEUE_FLAG_DYING, &amp;(q)-&gt;queue_flags)</div><div class='ctx'> #define blk_queue_init_done(q)	test_bit(QUEUE_FLAG_INIT_DONE, &amp;(q)-&gt;queue_flags)</div><div class='ctx'> #define blk_queue_nomerges(q)	test_bit(QUEUE_FLAG_NOMERGES, &amp;(q)-&gt;queue_flags)</div><div class='ctx'> #define blk_queue_noxmerges(q)	\</div><div class='ctx'> 	test_bit(QUEUE_FLAG_NOXMERGES, &amp;(q)-&gt;queue_flags)</div><div class='del'>-#define blk_queue_nonrot(q)	test_bit(QUEUE_FLAG_NONROT, &amp;(q)-&gt;queue_flags)</div><div class='del'>-#define blk_queue_stable_writes(q) \</div><div class='del'>-	test_bit(QUEUE_FLAG_STABLE_WRITES, &amp;(q)-&gt;queue_flags)</div><div class='del'>-#define blk_queue_io_stat(q)	test_bit(QUEUE_FLAG_IO_STAT, &amp;(q)-&gt;queue_flags)</div><div class='del'>-#define blk_queue_add_random(q)	test_bit(QUEUE_FLAG_ADD_RANDOM, &amp;(q)-&gt;queue_flags)</div><div class='del'>-#define blk_queue_zone_resetall(q)	\</div><div class='del'>-	test_bit(QUEUE_FLAG_ZONE_RESETALL, &amp;(q)-&gt;queue_flags)</div><div class='del'>-#define blk_queue_dax(q)	test_bit(QUEUE_FLAG_DAX, &amp;(q)-&gt;queue_flags)</div><div class='del'>-#define blk_queue_pci_p2pdma(q)	\</div><div class='del'>-	test_bit(QUEUE_FLAG_PCI_P2PDMA, &amp;(q)-&gt;queue_flags)</div><div class='add'>+#define blk_queue_nonrot(q)	(!((q)-&gt;limits.features &amp; BLK_FEAT_ROTATIONAL))</div><div class='add'>+#define blk_queue_io_stat(q)	((q)-&gt;limits.features &amp; BLK_FEAT_IO_STAT)</div><div class='add'>+#define blk_queue_passthrough_stat(q)	\</div><div class='add'>+	((q)-&gt;limits.flags &amp; BLK_FLAG_IOSTATS_PASSTHROUGH)</div><div class='add'>+#define blk_queue_dax(q)	((q)-&gt;limits.features &amp; BLK_FEAT_DAX)</div><div class='add'>+#define blk_queue_pci_p2pdma(q)	((q)-&gt;limits.features &amp; BLK_FEAT_PCI_P2PDMA)</div><div class='ctx'> #ifdef CONFIG_BLK_RQ_ALLOC_TIME</div><div class='ctx'> #define blk_queue_rq_alloc_time(q)	\</div><div class='ctx'> 	test_bit(QUEUE_FLAG_RQ_ALLOC_TIME, &amp;(q)-&gt;queue_flags)</div><div class='hunk'>@@ -583,7 +702,11 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q);</div><div class='ctx'> #define blk_queue_registered(q)	test_bit(QUEUE_FLAG_REGISTERED, &amp;(q)-&gt;queue_flags)</div><div class='ctx'> #define blk_queue_sq_sched(q)	test_bit(QUEUE_FLAG_SQ_SCHED, &amp;(q)-&gt;queue_flags)</div><div class='ctx'> #define blk_queue_skip_tagset_quiesce(q) \</div><div class='del'>-	test_bit(QUEUE_FLAG_SKIP_TAGSET_QUIESCE, &amp;(q)-&gt;queue_flags)</div><div class='add'>+	((q)-&gt;limits.features &amp; BLK_FEAT_SKIP_TAGSET_QUIESCE)</div><div class='add'>+#define blk_queue_disable_wbt(q)	\</div><div class='add'>+	test_bit(QUEUE_FLAG_DISABLE_WBT_DEF, &amp;(q)-&gt;queue_flags)</div><div class='add'>+#define blk_queue_no_elv_switch(q)	\</div><div class='add'>+	test_bit(QUEUE_FLAG_NO_ELV_SWITCH, &amp;(q)-&gt;queue_flags)</div><div class='ctx'> </div><div class='ctx'> extern void blk_set_pm_only(struct request_queue *q);</div><div class='ctx'> extern void blk_clear_pm_only(struct request_queue *q);</div><div class='hunk'>@@ -613,15 +736,8 @@ static inline enum rpm_status queue_rpm_status(struct request_queue *q)</div><div class='ctx'> </div><div class='ctx'> static inline bool blk_queue_is_zoned(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	return IS_ENABLED(CONFIG_BLK_DEV_ZONED) &amp;&amp; q-&gt;limits.zoned;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BLK_DEV_ZONED</div><div class='del'>-unsigned int bdev_nr_zones(struct block_device *bdev);</div><div class='del'>-</div><div class='del'>-static inline unsigned int disk_nr_zones(struct gendisk *disk)</div><div class='del'>-{</div><div class='del'>-	return blk_queue_is_zoned(disk-&gt;queue) ? disk-&gt;nr_zones : 0;</div><div class='add'>+	return IS_ENABLED(CONFIG_BLK_DEV_ZONED) &amp;&amp;</div><div class='add'>+		(q-&gt;limits.features &amp; BLK_FEAT_ZONED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int disk_zone_no(struct gendisk *disk, sector_t sector)</div><div class='hunk'>@@ -631,27 +747,6 @@ static inline unsigned int disk_zone_no(struct gendisk *disk, sector_t sector)</div><div class='ctx'> 	return sector &gt;&gt; ilog2(disk-&gt;queue-&gt;limits.chunk_sectors);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool disk_zone_is_seq(struct gendisk *disk, sector_t sector)</div><div class='del'>-{</div><div class='del'>-	if (!blk_queue_is_zoned(disk-&gt;queue))</div><div class='del'>-		return false;</div><div class='del'>-	if (!disk-&gt;conv_zones_bitmap)</div><div class='del'>-		return true;</div><div class='del'>-	return !test_bit(disk_zone_no(disk, sector), disk-&gt;conv_zones_bitmap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void disk_set_max_open_zones(struct gendisk *disk,</div><div class='del'>-		unsigned int max_open_zones)</div><div class='del'>-{</div><div class='del'>-	disk-&gt;queue-&gt;limits.max_open_zones = max_open_zones;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void disk_set_max_active_zones(struct gendisk *disk,</div><div class='del'>-		unsigned int max_active_zones)</div><div class='del'>-{</div><div class='del'>-	disk-&gt;queue-&gt;limits.max_active_zones = max_active_zones;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned int bdev_max_open_zones(struct block_device *bdev)</div><div class='ctx'> {</div><div class='ctx'> 	return bdev-&gt;bd_disk-&gt;queue-&gt;limits.max_open_zones;</div><div class='hunk'>@@ -662,35 +757,6 @@ static inline unsigned int bdev_max_active_zones(struct block_device *bdev)</div><div class='ctx'> 	return bdev-&gt;bd_disk-&gt;queue-&gt;limits.max_active_zones;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* CONFIG_BLK_DEV_ZONED */</div><div class='del'>-static inline unsigned int bdev_nr_zones(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int disk_nr_zones(struct gendisk *disk)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline bool disk_zone_is_seq(struct gendisk *disk, sector_t sector)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-static inline unsigned int disk_zone_no(struct gendisk *disk, sector_t sector)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline unsigned int bdev_max_open_zones(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int bdev_max_active_zones(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_BLK_DEV_ZONED */</div><div class='del'>-</div><div class='ctx'> static inline unsigned int blk_queue_depth(struct request_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	if (q-&gt;queue_depth)</div><div class='hunk'>@@ -709,6 +775,9 @@ static inline unsigned int blk_queue_depth(struct request_queue *q)</div><div class='ctx'> #define for_each_bio(_bio)		\</div><div class='ctx'> 	for (; _bio; _bio = _bio-&gt;bi_next)</div><div class='ctx'> </div><div class='add'>+int __must_check add_disk_fwnode(struct device *parent, struct gendisk *disk,</div><div class='add'>+				 const struct attribute_group **groups,</div><div class='add'>+				 struct fwnode_handle *fwnode);</div><div class='ctx'> int __must_check device_add_disk(struct device *parent, struct gendisk *disk,</div><div class='ctx'> 				 const struct attribute_group **groups);</div><div class='ctx'> static inline int __must_check add_disk(struct gendisk *disk)</div><div class='hunk'>@@ -720,15 +789,35 @@ void invalidate_disk(struct gendisk *disk);</div><div class='ctx'> void set_disk_ro(struct gendisk *disk, bool read_only);</div><div class='ctx'> void disk_uevent(struct gendisk *disk, enum kobject_action action);</div><div class='ctx'> </div><div class='del'>-static inline int get_disk_ro(struct gendisk *disk)</div><div class='add'>+static inline u8 bdev_partno(const struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;bdev-&gt;__bd_flags) &amp; BD_PARTNO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bdev_test_flag(const struct block_device *bdev, unsigned flag)</div><div class='ctx'> {</div><div class='del'>-	return disk-&gt;part0-&gt;bd_read_only ||</div><div class='add'>+	return atomic_read(&amp;bdev-&gt;__bd_flags) &amp; flag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bdev_set_flag(struct block_device *bdev, unsigned flag)</div><div class='add'>+{</div><div class='add'>+	atomic_or(flag, &amp;bdev-&gt;__bd_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bdev_clear_flag(struct block_device *bdev, unsigned flag)</div><div class='add'>+{</div><div class='add'>+	atomic_andnot(flag, &amp;bdev-&gt;__bd_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool get_disk_ro(struct gendisk *disk)</div><div class='add'>+{</div><div class='add'>+	return bdev_test_flag(disk-&gt;part0, BD_READ_ONLY) ||</div><div class='ctx'> 		test_bit(GD_READ_ONLY, &amp;disk-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int bdev_read_only(struct block_device *bdev)</div><div class='add'>+static inline bool bdev_read_only(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return bdev-&gt;bd_read_only || get_disk_ro(bdev-&gt;bd_disk);</div><div class='add'>+	return bdev_test_flag(bdev, BD_READ_ONLY) || get_disk_ro(bdev-&gt;bd_disk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool set_capacity_and_notify(struct gendisk *disk, sector_t size);</div><div class='hunk'>@@ -764,6 +853,114 @@ static inline u64 sb_bdev_nr_blocks(struct super_block *sb)</div><div class='ctx'> 		(sb-&gt;s_blocksize_bits - SECTOR_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BLK_DEV_ZONED</div><div class='add'>+static inline unsigned int disk_nr_zones(struct gendisk *disk)</div><div class='add'>+{</div><div class='add'>+	return disk-&gt;nr_zones;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bio_needs_zone_write_plugging - Check if a BIO needs to be handled with zone</div><div class='add'>+ *				   write plugging</div><div class='add'>+ * @bio: The BIO being submitted</div><div class='add'>+ *</div><div class='add'>+ * Return true whenever @bio execution needs to be handled through zone</div><div class='add'>+ * write plugging (using blk_zone_plug_bio()). Return false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool bio_needs_zone_write_plugging(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	enum req_op op = bio_op(bio);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only zoned block devices have a zone write plug hash table. But not</div><div class='add'>+	 * all of them have one (e.g. DM devices may not need one).</div><div class='add'>+	 */</div><div class='add'>+	if (!bio-&gt;bi_bdev-&gt;bd_disk-&gt;zone_wplugs_hash)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Only write operations need zone write plugging. */</div><div class='add'>+	if (!op_is_write(op))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Ignore empty flush */</div><div class='add'>+	if (op_is_flush(bio-&gt;bi_opf) &amp;&amp; !bio_sectors(bio))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Ignore BIOs that already have been handled by zone write plugging. */</div><div class='add'>+	if (bio_flagged(bio, BIO_ZONE_WRITE_PLUGGING))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All zone write operations must be handled through zone write plugging</div><div class='add'>+	 * using blk_zone_plug_bio().</div><div class='add'>+	 */</div><div class='add'>+	switch (op) {</div><div class='add'>+	case REQ_OP_ZONE_APPEND:</div><div class='add'>+	case REQ_OP_WRITE:</div><div class='add'>+	case REQ_OP_WRITE_ZEROES:</div><div class='add'>+	case REQ_OP_ZONE_FINISH:</div><div class='add'>+	case REQ_OP_ZONE_RESET:</div><div class='add'>+	case REQ_OP_ZONE_RESET_ALL:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * disk_zone_capacity - returns the zone capacity of zone containing @sector</div><div class='add'>+ * @disk:	disk to work with</div><div class='add'>+ * @sector:	sector number within the querying zone</div><div class='add'>+ *</div><div class='add'>+ * Returns the zone capacity of a zone containing @sector. @sector can be any</div><div class='add'>+ * sector in the zone.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int disk_zone_capacity(struct gendisk *disk,</div><div class='add'>+					      sector_t sector)</div><div class='add'>+{</div><div class='add'>+	sector_t zone_sectors = disk-&gt;queue-&gt;limits.chunk_sectors;</div><div class='add'>+</div><div class='add'>+	if (sector + zone_sectors &gt;= get_capacity(disk))</div><div class='add'>+		return disk-&gt;last_zone_capacity;</div><div class='add'>+	return disk-&gt;zone_capacity;</div><div class='add'>+}</div><div class='add'>+static inline unsigned int bdev_zone_capacity(struct block_device *bdev,</div><div class='add'>+					      sector_t pos)</div><div class='add'>+{</div><div class='add'>+	return disk_zone_capacity(bdev-&gt;bd_disk, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bdev_zone_is_seq(struct block_device *bdev, sector_t sector);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_BLK_DEV_ZONED */</div><div class='add'>+static inline unsigned int disk_nr_zones(struct gendisk *disk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bdev_zone_is_seq(struct block_device *bdev, sector_t sector)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bio_needs_zone_write_plugging(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BLK_DEV_ZONED */</div><div class='add'>+</div><div class='add'>+static inline unsigned int bdev_nr_zones(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return disk_nr_zones(bdev-&gt;bd_disk);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int bdev_disk_changed(struct gendisk *disk, bool invalidate);</div><div class='ctx'> </div><div class='ctx'> void put_disk(struct gendisk *disk);</div><div class='hunk'>@@ -821,6 +1018,8 @@ extern int blk_register_queue(struct gendisk *disk);</div><div class='ctx'> extern void blk_unregister_queue(struct gendisk *disk);</div><div class='ctx'> void submit_bio_noacct(struct bio *bio);</div><div class='ctx'> struct bio *bio_split_to_limits(struct bio *bio);</div><div class='add'>+struct bio *bio_submit_split_bioset(struct bio *bio, unsigned int split_sectors,</div><div class='add'>+				    struct bio_set *bs);</div><div class='ctx'> </div><div class='ctx'> extern int blk_lld_busy(struct request_queue *q);</div><div class='ctx'> extern int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags);</div><div class='hunk'>@@ -853,20 +1052,23 @@ static inline unsigned int bio_zone_no(struct bio *bio)</div><div class='ctx'> 	return disk_zone_no(bio-&gt;bi_bdev-&gt;bd_disk, bio-&gt;bi_iter.bi_sector);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int bio_zone_is_seq(struct bio *bio)</div><div class='add'>+static inline bool bio_straddles_zones(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	return disk_zone_is_seq(bio-&gt;bi_bdev-&gt;bd_disk, bio-&gt;bi_iter.bi_sector);</div><div class='add'>+	return bio_sectors(bio) &amp;&amp;</div><div class='add'>+		bio_zone_no(bio) !=</div><div class='add'>+		disk_zone_no(bio-&gt;bi_bdev-&gt;bd_disk, bio_end_sector(bio) - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Return how much of the chunk is left to be used for I/O at a given offset.</div><div class='add'>+ * Return how much within the boundary is left to be used for I/O at a given</div><div class='add'>+ * offset.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int blk_chunk_sectors_left(sector_t offset,</div><div class='del'>-		unsigned int chunk_sectors)</div><div class='add'>+static inline unsigned int blk_boundary_sectors_left(sector_t offset,</div><div class='add'>+		unsigned int boundary_sectors)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(!is_power_of_2(chunk_sectors)))</div><div class='del'>-		return chunk_sectors - sector_div(offset, chunk_sectors);</div><div class='del'>-	return chunk_sectors - (offset &amp; (chunk_sectors - 1));</div><div class='add'>+	if (unlikely(!is_power_of_2(boundary_sectors)))</div><div class='add'>+		return boundary_sectors - sector_div(offset, boundary_sectors);</div><div class='add'>+	return boundary_sectors - (offset &amp; (boundary_sectors - 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -878,84 +1080,83 @@ static inline unsigned int blk_chunk_sectors_left(sector_t offset,</div><div class='ctx'>  * the caller can modify.  The caller must call queue_limits_commit_update()</div><div class='ctx'>  * to finish the update.</div><div class='ctx'>  *</div><div class='del'>- * Context: process context.  The caller must have frozen the queue or ensured</div><div class='del'>- * that there is outstanding I/O by other means.</div><div class='add'>+ * Context: process context.</div><div class='ctx'>  */</div><div class='ctx'> static inline struct queue_limits</div><div class='ctx'> queue_limits_start_update(struct request_queue *q)</div><div class='del'>-	__acquires(q-&gt;limits_lock)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;q-&gt;limits_lock);</div><div class='ctx'> 	return q-&gt;limits;</div><div class='ctx'> }</div><div class='add'>+int queue_limits_commit_update_frozen(struct request_queue *q,</div><div class='add'>+		struct queue_limits *lim);</div><div class='ctx'> int queue_limits_commit_update(struct request_queue *q,</div><div class='ctx'> 		struct queue_limits *lim);</div><div class='ctx'> int queue_limits_set(struct request_queue *q, struct queue_limits *lim);</div><div class='add'>+int blk_validate_limits(struct queue_limits *lim);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * queue_limits_cancel_update - cancel an atomic update of queue limits</div><div class='add'>+ * @q:		queue to update</div><div class='add'>+ *</div><div class='add'>+ * This functions cancels an atomic update of the queue limits started by</div><div class='add'>+ * queue_limits_start_update() and should be used when an error occurs after</div><div class='add'>+ * starting update.</div><div class='add'>+ */</div><div class='add'>+static inline void queue_limits_cancel_update(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;q-&gt;limits_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These helpers are for drivers that have sloppy feature negotiation and might</div><div class='add'>+ * have to disable DISCARD, WRITE_ZEROES or SECURE_DISCARD from the I/O</div><div class='add'>+ * completion handler when the device returned an indicator that the respective</div><div class='add'>+ * feature is not actually supported.  They are racy and the driver needs to</div><div class='add'>+ * cope with that.  Try to avoid this scheme if you can.</div><div class='add'>+ */</div><div class='add'>+static inline void blk_queue_disable_discard(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	q-&gt;limits.max_discard_sectors = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void blk_queue_disable_secure_erase(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	q-&gt;limits.max_secure_erase_sectors = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void blk_queue_disable_write_zeroes(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	q-&gt;limits.max_write_zeroes_sectors = 0;</div><div class='add'>+	q-&gt;limits.max_wzeroes_unmap_sectors = 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Access functions for manipulating queue properties</div><div class='ctx'>  */</div><div class='del'>-void blk_queue_bounce_limit(struct request_queue *q, enum blk_bounce limit);</div><div class='del'>-extern void blk_queue_max_hw_sectors(struct request_queue *, unsigned int);</div><div class='del'>-extern void blk_queue_chunk_sectors(struct request_queue *, unsigned int);</div><div class='del'>-extern void blk_queue_max_segments(struct request_queue *, unsigned short);</div><div class='del'>-extern void blk_queue_max_discard_segments(struct request_queue *,</div><div class='del'>-		unsigned short);</div><div class='del'>-void blk_queue_max_secure_erase_sectors(struct request_queue *q,</div><div class='del'>-		unsigned int max_sectors);</div><div class='del'>-extern void blk_queue_max_segment_size(struct request_queue *, unsigned int);</div><div class='del'>-extern void blk_queue_max_discard_sectors(struct request_queue *q,</div><div class='del'>-		unsigned int max_discard_sectors);</div><div class='del'>-extern void blk_queue_max_write_zeroes_sectors(struct request_queue *q,</div><div class='del'>-		unsigned int max_write_same_sectors);</div><div class='del'>-extern void blk_queue_logical_block_size(struct request_queue *, unsigned int);</div><div class='del'>-extern void blk_queue_max_zone_append_sectors(struct request_queue *q,</div><div class='del'>-		unsigned int max_zone_append_sectors);</div><div class='del'>-extern void blk_queue_physical_block_size(struct request_queue *, unsigned int);</div><div class='del'>-void blk_queue_zone_write_granularity(struct request_queue *q,</div><div class='del'>-				      unsigned int size);</div><div class='del'>-extern void blk_queue_alignment_offset(struct request_queue *q,</div><div class='del'>-				       unsigned int alignment);</div><div class='del'>-void disk_update_readahead(struct gendisk *disk);</div><div class='del'>-extern void blk_limits_io_min(struct queue_limits *limits, unsigned int min);</div><div class='del'>-extern void blk_queue_io_min(struct request_queue *q, unsigned int min);</div><div class='del'>-extern void blk_limits_io_opt(struct queue_limits *limits, unsigned int opt);</div><div class='del'>-extern void blk_queue_io_opt(struct request_queue *q, unsigned int opt);</div><div class='ctx'> extern void blk_set_queue_depth(struct request_queue *q, unsigned int depth);</div><div class='ctx'> extern void blk_set_stacking_limits(struct queue_limits *lim);</div><div class='ctx'> extern int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,</div><div class='ctx'> 			    sector_t offset);</div><div class='ctx'> void queue_limits_stack_bdev(struct queue_limits *t, struct block_device *bdev,</div><div class='ctx'> 		sector_t offset, const char *pfx);</div><div class='del'>-extern void blk_queue_update_dma_pad(struct request_queue *, unsigned int);</div><div class='del'>-extern void blk_queue_segment_boundary(struct request_queue *, unsigned long);</div><div class='del'>-extern void blk_queue_virt_boundary(struct request_queue *, unsigned long);</div><div class='del'>-extern void blk_queue_dma_alignment(struct request_queue *, int);</div><div class='del'>-extern void blk_queue_update_dma_alignment(struct request_queue *, int);</div><div class='ctx'> extern void blk_queue_rq_timeout(struct request_queue *, unsigned int);</div><div class='del'>-extern void blk_queue_write_cache(struct request_queue *q, bool enabled, bool fua);</div><div class='ctx'> </div><div class='ctx'> struct blk_independent_access_ranges *</div><div class='ctx'> disk_alloc_independent_access_ranges(struct gendisk *disk, int nr_ia_ranges);</div><div class='ctx'> void disk_set_independent_access_ranges(struct gendisk *disk,</div><div class='ctx'> 				struct blk_independent_access_ranges *iars);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Elevator features for blk_queue_required_elevator_features:</div><div class='del'>- */</div><div class='del'>-/* Supports zoned block devices sequential write constraint */</div><div class='del'>-#define ELEVATOR_F_ZBD_SEQ_WRITE	(1U &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-extern void blk_queue_required_elevator_features(struct request_queue *q,</div><div class='del'>-						 unsigned int features);</div><div class='del'>-extern bool blk_queue_can_use_dma_map_merging(struct request_queue *q,</div><div class='del'>-					      struct device *dev);</div><div class='del'>-</div><div class='ctx'> bool __must_check blk_get_queue(struct request_queue *);</div><div class='ctx'> extern void blk_put_queue(struct request_queue *);</div><div class='ctx'> </div><div class='ctx'> void blk_mark_disk_dead(struct gendisk *disk);</div><div class='ctx'> </div><div class='add'>+struct rq_list {</div><div class='add'>+	struct request *head;</div><div class='add'>+	struct request *tail;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='ctx'> /*</div><div class='ctx'>  * blk_plug permits building a queue of related requests by holding the I/O</div><div class='hunk'>@@ -969,10 +1170,10 @@ void blk_mark_disk_dead(struct gendisk *disk);</div><div class='ctx'>  * blk_flush_plug() is called.</div><div class='ctx'>  */</div><div class='ctx'> struct blk_plug {</div><div class='del'>-	struct request *mq_list; /* blk-mq requests */</div><div class='add'>+	struct rq_list mq_list; /* blk-mq requests */</div><div class='ctx'> </div><div class='ctx'> 	/* if ios_left is &gt; 1, we can batch tag/rq allocations */</div><div class='del'>-	struct request *cached_rq;</div><div class='add'>+	struct rq_list cached_rqs;</div><div class='ctx'> 	u64 cur_ktime;</div><div class='ctx'> 	unsigned short nr_ios;</div><div class='ctx'> </div><div class='hunk'>@@ -1065,6 +1266,7 @@ int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector,</div><div class='ctx'> </div><div class='ctx'> #define BLKDEV_ZERO_NOUNMAP	(1 &lt;&lt; 0)  /* do not free blocks */</div><div class='ctx'> #define BLKDEV_ZERO_NOFALLBACK	(1 &lt;&lt; 1)  /* don't write explicit zeroes */</div><div class='add'>+#define BLKDEV_ZERO_KILLABLE	(1 &lt;&lt; 2)  /* interruptible by fatal signals */</div><div class='ctx'> </div><div class='ctx'> extern int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,</div><div class='ctx'> 		sector_t nr_sects, gfp_t gfp_mask, struct bio **biop,</div><div class='hunk'>@@ -1095,7 +1297,7 @@ static inline int sb_issue_zeroout(struct super_block *sb, sector_t block,</div><div class='ctx'> </div><div class='ctx'> static inline bool bdev_is_partition(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return bdev-&gt;bd_partno;</div><div class='add'>+	return bdev_partno(bdev) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum blk_default_limits {</div><div class='hunk'>@@ -1105,14 +1307,10 @@ enum blk_default_limits {</div><div class='ctx'> 	BLK_SEG_BOUNDARY_MASK	= 0xFFFFFFFFUL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Default upper limit for the software max_sectors limit used for</div><div class='del'>- * regular file system I/O.  This can be increased through sysfs.</div><div class='del'>- *</div><div class='del'>- * Not to be confused with the max_hw_sector limit that is entirely</div><div class='del'>- * controlled by the driver, usually based on hardware limits.</div><div class='del'>- */</div><div class='del'>-#define BLK_DEF_MAX_SECTORS_CAP	2560u</div><div class='add'>+static inline struct queue_limits *bdev_limits(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return &amp;bdev_get_queue(bdev)-&gt;limits;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long queue_segment_boundary(const struct request_queue *q)</div><div class='ctx'> {</div><div class='hunk'>@@ -1154,18 +1352,20 @@ static inline unsigned int queue_max_segment_size(const struct request_queue *q)</div><div class='ctx'> 	return q-&gt;limits.max_segment_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int queue_max_zone_append_sectors(const struct request_queue *q)</div><div class='add'>+static inline bool queue_emulates_zone_append(struct request_queue *q)</div><div class='ctx'> {</div><div class='add'>+	return blk_queue_is_zoned(q) &amp;&amp; !q-&gt;limits.max_hw_zone_append_sectors;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	const struct queue_limits *l = &amp;q-&gt;limits;</div><div class='del'>-</div><div class='del'>-	return min(l-&gt;max_zone_append_sectors, l-&gt;max_sectors);</div><div class='add'>+static inline bool bdev_emulates_zone_append(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return queue_emulates_zone_append(bdev_get_queue(bdev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int</div><div class='ctx'> bdev_max_zone_append_sectors(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return queue_max_zone_append_sectors(bdev_get_queue(bdev));</div><div class='add'>+	return bdev_limits(bdev)-&gt;max_zone_append_sectors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int bdev_max_segments(struct block_device *bdev)</div><div class='hunk'>@@ -1173,14 +1373,16 @@ static inline unsigned int bdev_max_segments(struct block_device *bdev)</div><div class='ctx'> 	return queue_max_segments(bdev_get_queue(bdev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned queue_logical_block_size(const struct request_queue *q)</div><div class='add'>+static inline unsigned short bdev_max_write_streams(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	int retval = 512;</div><div class='del'>-</div><div class='del'>-	if (q &amp;&amp; q-&gt;limits.logical_block_size)</div><div class='del'>-		retval = q-&gt;limits.logical_block_size;</div><div class='add'>+	if (bdev_is_partition(bdev))</div><div class='add'>+		return 0;</div><div class='add'>+	return bdev_limits(bdev)-&gt;max_write_streams;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return retval;</div><div class='add'>+static inline unsigned queue_logical_block_size(const struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;limits.logical_block_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int bdev_logical_block_size(struct block_device *bdev)</div><div class='hunk'>@@ -1203,7 +1405,7 @@ static inline unsigned int queue_io_min(const struct request_queue *q)</div><div class='ctx'> 	return q-&gt;limits.io_min;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int bdev_io_min(struct block_device *bdev)</div><div class='add'>+static inline unsigned int bdev_io_min(struct block_device *bdev)</div><div class='ctx'> {</div><div class='ctx'> 	return queue_io_min(bdev_get_queue(bdev));</div><div class='ctx'> }</div><div class='hunk'>@@ -1213,7 +1415,7 @@ static inline unsigned int queue_io_opt(const struct request_queue *q)</div><div class='ctx'> 	return q-&gt;limits.io_opt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int bdev_io_opt(struct block_device *bdev)</div><div class='add'>+static inline unsigned int bdev_io_opt(struct block_device *bdev)</div><div class='ctx'> {</div><div class='ctx'> 	return queue_io_opt(bdev_get_queue(bdev));</div><div class='ctx'> }</div><div class='hunk'>@@ -1235,28 +1437,29 @@ unsigned int bdev_discard_alignment(struct block_device *bdev);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int bdev_max_discard_sectors(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return bdev_get_queue(bdev)-&gt;limits.max_discard_sectors;</div><div class='add'>+	return bdev_limits(bdev)-&gt;max_discard_sectors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int bdev_discard_granularity(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return bdev_get_queue(bdev)-&gt;limits.discard_granularity;</div><div class='add'>+	return bdev_limits(bdev)-&gt;discard_granularity;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int</div><div class='ctx'> bdev_max_secure_erase_sectors(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return bdev_get_queue(bdev)-&gt;limits.max_secure_erase_sectors;</div><div class='add'>+	return bdev_limits(bdev)-&gt;max_secure_erase_sectors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int bdev_write_zeroes_sectors(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	struct request_queue *q = bdev_get_queue(bdev);</div><div class='del'>-</div><div class='del'>-	if (q)</div><div class='del'>-		return q-&gt;limits.max_write_zeroes_sectors;</div><div class='add'>+	return bdev_limits(bdev)-&gt;max_write_zeroes_sectors;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static inline unsigned int</div><div class='add'>+bdev_write_zeroes_unmap_sectors(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return bdev_limits(bdev)-&gt;max_wzeroes_unmap_sectors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bdev_nonrot(struct block_device *bdev)</div><div class='hunk'>@@ -1266,29 +1469,38 @@ static inline bool bdev_nonrot(struct block_device *bdev)</div><div class='ctx'> </div><div class='ctx'> static inline bool bdev_synchronous(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(QUEUE_FLAG_SYNCHRONOUS,</div><div class='del'>-			&amp;bdev_get_queue(bdev)-&gt;queue_flags);</div><div class='add'>+	return bdev-&gt;bd_disk-&gt;queue-&gt;limits.features &amp; BLK_FEAT_SYNCHRONOUS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bdev_stable_writes(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(QUEUE_FLAG_STABLE_WRITES,</div><div class='del'>-			&amp;bdev_get_queue(bdev)-&gt;queue_flags);</div><div class='add'>+	struct request_queue *q = bdev_get_queue(bdev);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY) &amp;&amp;</div><div class='add'>+	    q-&gt;limits.integrity.csum_type != BLK_INTEGRITY_CSUM_NONE)</div><div class='add'>+		return true;</div><div class='add'>+	return q-&gt;limits.features &amp; BLK_FEAT_STABLE_WRITES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool blk_queue_write_cache(struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return (q-&gt;limits.features &amp; BLK_FEAT_WRITE_CACHE) &amp;&amp;</div><div class='add'>+		!(q-&gt;limits.flags &amp; BLK_FLAG_WRITE_CACHE_DISABLED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bdev_write_cache(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(QUEUE_FLAG_WC, &amp;bdev_get_queue(bdev)-&gt;queue_flags);</div><div class='add'>+	return blk_queue_write_cache(bdev_get_queue(bdev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bdev_fua(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(QUEUE_FLAG_FUA, &amp;bdev_get_queue(bdev)-&gt;queue_flags);</div><div class='add'>+	return bdev_limits(bdev)-&gt;features &amp; BLK_FEAT_FUA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bdev_nowait(struct block_device *bdev)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(QUEUE_FLAG_NOWAIT, &amp;bdev_get_queue(bdev)-&gt;queue_flags);</div><div class='add'>+	return bdev-&gt;bd_disk-&gt;queue-&gt;limits.features &amp; BLK_FEAT_NOWAIT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bdev_is_zoned(struct block_device *bdev)</div><div class='hunk'>@@ -1301,18 +1513,6 @@ static inline unsigned int bdev_zone_no(struct block_device *bdev, sector_t sec)</div><div class='ctx'> 	return disk_zone_no(bdev-&gt;bd_disk, sec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Whether write serialization is required for @op on zoned devices. */</div><div class='del'>-static inline bool op_needs_zoned_write_locking(enum req_op op)</div><div class='del'>-{</div><div class='del'>-	return op == REQ_OP_WRITE || op == REQ_OP_WRITE_ZEROES;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bdev_op_is_zoned_write(struct block_device *bdev,</div><div class='del'>-					  enum req_op op)</div><div class='del'>-{</div><div class='del'>-	return bdev_is_zoned(bdev) &amp;&amp; op_needs_zoned_write_locking(op);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline sector_t bdev_zone_sectors(struct block_device *bdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_queue *q = bdev_get_queue(bdev);</div><div class='hunk'>@@ -1322,21 +1522,67 @@ static inline sector_t bdev_zone_sectors(struct block_device *bdev)</div><div class='ctx'> 	return q-&gt;limits.chunk_sectors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline sector_t bdev_zone_start(struct block_device *bdev,</div><div class='add'>+				       sector_t sector)</div><div class='add'>+{</div><div class='add'>+	return sector &amp; ~(bdev_zone_sectors(bdev) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline sector_t bdev_offset_from_zone_start(struct block_device *bdev,</div><div class='ctx'> 						   sector_t sector)</div><div class='ctx'> {</div><div class='ctx'> 	return sector &amp; (bdev_zone_sectors(bdev) - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline sector_t bio_offset_from_zone_start(struct bio *bio)</div><div class='add'>+{</div><div class='add'>+	return bdev_offset_from_zone_start(bio-&gt;bi_bdev,</div><div class='add'>+					   bio-&gt;bi_iter.bi_sector);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool bdev_is_zone_start(struct block_device *bdev,</div><div class='ctx'> 				      sector_t sector)</div><div class='ctx'> {</div><div class='ctx'> 	return bdev_offset_from_zone_start(bdev, sector) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int queue_dma_alignment(const struct request_queue *q)</div><div class='add'>+/* Check whether @sector is a multiple of the zone size. */</div><div class='add'>+static inline bool bdev_is_zone_aligned(struct block_device *bdev,</div><div class='add'>+					sector_t sector)</div><div class='add'>+{</div><div class='add'>+	return bdev_is_zone_start(bdev, sector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int blk_zone_issue_zeroout(struct block_device *bdev, sector_t sector,</div><div class='add'>+			   sector_t nr_sects, gfp_t gfp_mask);</div><div class='add'>+</div><div class='add'>+static inline unsigned int queue_dma_alignment(const struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;limits.dma_alignment;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+queue_atomic_write_unit_max_bytes(const struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	return q ? q-&gt;limits.dma_alignment : 511;</div><div class='add'>+	return q-&gt;limits.atomic_write_unit_max;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+queue_atomic_write_unit_min_bytes(const struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;limits.atomic_write_unit_min;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+queue_atomic_write_boundary_bytes(const struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;limits.atomic_write_boundary_sectors &lt;&lt; SECTOR_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+queue_atomic_write_max_bytes(const struct request_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;limits.atomic_write_max_sectors &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int bdev_dma_alignment(struct block_device *bdev)</div><div class='hunk'>@@ -1344,17 +1590,17 @@ static inline unsigned int bdev_dma_alignment(struct block_device *bdev)</div><div class='ctx'> 	return queue_dma_alignment(bdev_get_queue(bdev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool bdev_iter_is_aligned(struct block_device *bdev,</div><div class='del'>-					struct iov_iter *iter)</div><div class='add'>+static inline unsigned int</div><div class='add'>+blk_lim_dma_alignment_and_pad(struct queue_limits *lim)</div><div class='ctx'> {</div><div class='del'>-	return iov_iter_is_aligned(iter, bdev_dma_alignment(bdev),</div><div class='del'>-				   bdev_logical_block_size(bdev) - 1);</div><div class='add'>+	return lim-&gt;dma_alignment | lim-&gt;dma_pad_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int blk_rq_aligned(struct request_queue *q, unsigned long addr,</div><div class='add'>+static inline bool blk_rq_aligned(struct request_queue *q, unsigned long addr,</div><div class='ctx'> 				 unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	unsigned int alignment = queue_dma_alignment(q) | q-&gt;dma_pad_mask;</div><div class='add'>+	unsigned int alignment = blk_lim_dma_alignment_and_pad(&amp;q-&gt;limits);</div><div class='add'>+</div><div class='ctx'> 	return !(addr &amp; alignment) &amp;&amp; !(len &amp; alignment);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1364,11 +1610,6 @@ static inline unsigned int blksize_bits(unsigned int size)</div><div class='ctx'> 	return order_base_2(size &gt;&gt; SECTOR_SHIFT) + SECTOR_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int block_size(struct block_device *bdev)</div><div class='del'>-{</div><div class='del'>-	return 1 &lt;&lt; bdev-&gt;bd_inode-&gt;i_blkbits;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int kblockd_schedule_work(struct work_struct *work);</div><div class='ctx'> int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay);</div><div class='ctx'> </div><div class='hunk'>@@ -1412,13 +1653,14 @@ struct block_device_operations {</div><div class='ctx'> 	unsigned int (*check_events) (struct gendisk *disk,</div><div class='ctx'> 				      unsigned int clearing);</div><div class='ctx'> 	void (*unlock_native_capacity) (struct gendisk *);</div><div class='del'>-	int (*getgeo)(struct block_device *, struct hd_geometry *);</div><div class='add'>+	int (*getgeo)(struct gendisk *, struct hd_geometry *);</div><div class='ctx'> 	int (*set_read_only)(struct block_device *bdev, bool ro);</div><div class='ctx'> 	void (*free_disk)(struct gendisk *disk);</div><div class='ctx'> 	/* this callback is with swap_lock and sometimes page table lock held */</div><div class='ctx'> 	void (*swap_slot_free_notify) (struct block_device *, unsigned long);</div><div class='ctx'> 	int (*report_zones)(struct gendisk *, sector_t sector,</div><div class='del'>-			unsigned int nr_zones, report_zones_cb cb, void *data);</div><div class='add'>+			    unsigned int nr_zones,</div><div class='add'>+			    struct blk_report_zones_args *args);</div><div class='ctx'> 	char *(*devnode)(struct gendisk *disk, umode_t *mode);</div><div class='ctx'> 	/* returns the length of the identifier or a negative errno: */</div><div class='ctx'> 	int (*get_unique_id)(struct gendisk *disk, u8 id[16],</div><div class='hunk'>@@ -1473,8 +1715,8 @@ static inline void bio_end_io_acct(struct bio *bio, unsigned long start_time)</div><div class='ctx'> 	return bio_end_io_acct_remapped(bio, start_time, bio-&gt;bi_bdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bdev_read_only(struct block_device *bdev);</div><div class='del'>-int set_blocksize(struct block_device *bdev, int size);</div><div class='add'>+int bdev_validate_blocksize(struct block_device *bdev, int block_size);</div><div class='add'>+int set_blocksize(struct file *file, int size);</div><div class='ctx'> </div><div class='ctx'> int lookup_bdev(const char *pathname, dev_t *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1530,12 +1772,10 @@ int bd_prepare_to_claim(struct block_device *bdev, void *holder,</div><div class='ctx'> 		const struct blk_holder_ops *hops);</div><div class='ctx'> void bd_abort_claiming(struct block_device *bdev, void *holder);</div><div class='ctx'> </div><div class='del'>-/* just for blk-cgroup, don't use elsewhere */</div><div class='del'>-struct block_device *blkdev_get_no_open(dev_t dev);</div><div class='del'>-void blkdev_put_no_open(struct block_device *bdev);</div><div class='del'>-</div><div class='ctx'> struct block_device *I_BDEV(struct inode *inode);</div><div class='ctx'> struct block_device *file_bdev(struct file *bdev_file);</div><div class='add'>+bool disk_live(struct gendisk *disk);</div><div class='add'>+unsigned int block_size(struct block_device *bdev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='ctx'> void invalidate_bdev(struct block_device *bdev);</div><div class='hunk'>@@ -1543,7 +1783,7 @@ int sync_blockdev(struct block_device *bdev);</div><div class='ctx'> int sync_blockdev_range(struct block_device *bdev, loff_t lstart, loff_t lend);</div><div class='ctx'> int sync_blockdev_nowait(struct block_device *bdev);</div><div class='ctx'> void sync_bdevs(bool wait);</div><div class='del'>-void bdev_statx_dioalign(struct inode *inode, struct kstat *stat);</div><div class='add'>+void bdev_statx(const struct path *path, struct kstat *stat, u32 request_mask);</div><div class='ctx'> void printk_all_partitions(void);</div><div class='ctx'> int __init early_lookup_bdev(const char *pathname, dev_t *dev);</div><div class='ctx'> #else</div><div class='hunk'>@@ -1561,7 +1801,8 @@ static inline int sync_blockdev_nowait(struct block_device *bdev)</div><div class='ctx'> static inline void sync_bdevs(bool wait)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline void bdev_statx_dioalign(struct inode *inode, struct kstat *stat)</div><div class='add'>+static inline void bdev_statx(const struct path *path, struct kstat *stat,</div><div class='add'>+		u32 request_mask)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void printk_all_partitions(void)</div><div class='hunk'>@@ -1575,13 +1816,61 @@ static inline int early_lookup_bdev(const char *pathname, dev_t *dev)</div><div class='ctx'> </div><div class='ctx'> int bdev_freeze(struct block_device *bdev);</div><div class='ctx'> int bdev_thaw(struct block_device *bdev);</div><div class='add'>+void bdev_fput(struct file *bdev_file);</div><div class='ctx'> </div><div class='ctx'> struct io_comp_batch {</div><div class='del'>-	struct request *req_list;</div><div class='add'>+	struct rq_list req_list;</div><div class='ctx'> 	bool need_ts;</div><div class='ctx'> 	void (*complete)(struct io_comp_batch *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool blk_atomic_write_start_sect_aligned(sector_t sector,</div><div class='add'>+						struct queue_limits *limits)</div><div class='add'>+{</div><div class='add'>+	unsigned int alignment = max(limits-&gt;atomic_write_hw_unit_min,</div><div class='add'>+				limits-&gt;atomic_write_hw_boundary);</div><div class='add'>+</div><div class='add'>+	return IS_ALIGNED(sector, alignment &gt;&gt; SECTOR_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bdev_can_atomic_write(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	struct request_queue *bd_queue = bdev-&gt;bd_queue;</div><div class='add'>+	struct queue_limits *limits = &amp;bd_queue-&gt;limits;</div><div class='add'>+</div><div class='add'>+	if (!limits-&gt;atomic_write_unit_min)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (bdev_is_partition(bdev))</div><div class='add'>+		return blk_atomic_write_start_sect_aligned(bdev-&gt;bd_start_sect,</div><div class='add'>+							limits);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+bdev_atomic_write_unit_min_bytes(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	if (!bdev_can_atomic_write(bdev))</div><div class='add'>+		return 0;</div><div class='add'>+	return queue_atomic_write_unit_min_bytes(bdev_get_queue(bdev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+bdev_atomic_write_unit_max_bytes(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	if (!bdev_can_atomic_write(bdev))</div><div class='add'>+		return 0;</div><div class='add'>+	return queue_atomic_write_unit_max_bytes(bdev_get_queue(bdev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int bio_split_rw_at(struct bio *bio,</div><div class='add'>+		const struct queue_limits *lim,</div><div class='add'>+		unsigned *segs, unsigned max_bytes)</div><div class='add'>+{</div><div class='add'>+	return bio_split_io_at(bio, lim, segs, max_bytes, lim-&gt;dma_alignment);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define DEFINE_IO_COMP_BATCH(name)	struct io_comp_batch name = { }</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_BLKDEV_H */</div><div class='head'>diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h<br/>index 122c62e561fc..05c8754456aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/blktrace_api.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/blktrace_api.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/blktrace_api.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/blktrace_api.h</a></div><div class='hunk'>@@ -14,11 +14,12 @@</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct blk_trace {</div><div class='add'>+	int version;</div><div class='ctx'> 	int trace_state;</div><div class='ctx'> 	struct rchan *rchan;</div><div class='ctx'> 	unsigned long __percpu *sequence;</div><div class='ctx'> 	unsigned char __percpu *msg_data;</div><div class='del'>-	u16 act_mask;</div><div class='add'>+	u64 act_mask;</div><div class='ctx'> 	u64 start_lba;</div><div class='ctx'> 	u64 end_lba;</div><div class='ctx'> 	u32 pid;</div><div class='head'>diff --git a/include/linux/bnxt/hsi.h b/include/linux/bnxt/hsi.h<br/>new file mode 100644<br/>index 000000000000..47c34990cf23<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bnxt/hsi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bnxt/hsi.h</a></div><div class='hunk'>@@ -0,0 +1,11166 @@</div><div class='add'>+/* Broadcom NetXtreme-C/E network driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2016 Broadcom Corporation</div><div class='add'>+ * Copyright (c) 2014-2018 Broadcom Limited</div><div class='add'>+ * Copyright (c) 2018-2025 Broadcom Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * DO NOT MODIFY!!! This file is automatically generated.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _BNXT_HSI_H_</div><div class='add'>+#define _BNXT_HSI_H_</div><div class='add'>+</div><div class='add'>+/* hwrm_cmd_hdr (size:128b/16B) */</div><div class='add'>+struct hwrm_cmd_hdr {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_resp_hdr (size:64b/8B) */</div><div class='add'>+struct hwrm_resp_hdr {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CMD_DISCR_TLV_ENCAP 0x8000UL</div><div class='add'>+#define CMD_DISCR_LAST     CMD_DISCR_TLV_ENCAP</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define TLV_TYPE_HWRM_REQUEST                    0x1UL</div><div class='add'>+#define TLV_TYPE_HWRM_RESPONSE                   0x2UL</div><div class='add'>+#define TLV_TYPE_ROCE_SP_COMMAND                 0x3UL</div><div class='add'>+#define TLV_TYPE_QUERY_ROCE_CC_GEN1              0x4UL</div><div class='add'>+#define TLV_TYPE_MODIFY_ROCE_CC_GEN1             0x5UL</div><div class='add'>+#define TLV_TYPE_QUERY_ROCE_CC_GEN2              0x6UL</div><div class='add'>+#define TLV_TYPE_MODIFY_ROCE_CC_GEN2             0x7UL</div><div class='add'>+#define TLV_TYPE_QUERY_ROCE_CC_GEN1_EXT          0x8UL</div><div class='add'>+#define TLV_TYPE_MODIFY_ROCE_CC_GEN1_EXT         0x9UL</div><div class='add'>+#define TLV_TYPE_QUERY_ROCE_CC_GEN2_EXT          0xaUL</div><div class='add'>+#define TLV_TYPE_MODIFY_ROCE_CC_GEN2_EXT         0xbUL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_ALIAS_ECC_PUBLIC_KEY 0x8001UL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_IV                   0x8003UL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_AUTH_TAG             0x8004UL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_CIPHERTEXT           0x8005UL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_HOST_ALGORITHMS      0x8006UL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_HOST_ECC_PUBLIC_KEY  0x8007UL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_ECDSA_SIGNATURE      0x8008UL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_FW_ECC_PUBLIC_KEY    0x8009UL</div><div class='add'>+#define TLV_TYPE_ENGINE_CKV_FW_ALGORITHMS        0x800aUL</div><div class='add'>+#define TLV_TYPE_LAST                           TLV_TYPE_ENGINE_CKV_FW_ALGORITHMS</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* tlv (size:64b/8B) */</div><div class='add'>+struct tlv {</div><div class='add'>+	__le16	cmd_discr;</div><div class='add'>+	u8	reserved_8b;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define TLV_FLAGS_MORE         0x1UL</div><div class='add'>+	#define TLV_FLAGS_MORE_LAST      0x0UL</div><div class='add'>+	#define TLV_FLAGS_MORE_NOT_LAST  0x1UL</div><div class='add'>+	#define TLV_FLAGS_REQUIRED     0x2UL</div><div class='add'>+	#define TLV_FLAGS_REQUIRED_NO    (0x0UL &lt;&lt; 1)</div><div class='add'>+	#define TLV_FLAGS_REQUIRED_YES   (0x1UL &lt;&lt; 1)</div><div class='add'>+	#define TLV_FLAGS_REQUIRED_LAST TLV_FLAGS_REQUIRED_YES</div><div class='add'>+	__le16	tlv_type;</div><div class='add'>+	__le16	length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* input (size:128b/16B) */</div><div class='add'>+struct input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* output (size:64b/8B) */</div><div class='add'>+struct output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_short_input (size:128b/16B) */</div><div class='add'>+struct hwrm_short_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	signature;</div><div class='add'>+	#define SHORT_REQ_SIGNATURE_SHORT_CMD 0x4321UL</div><div class='add'>+	#define SHORT_REQ_SIGNATURE_LAST     SHORT_REQ_SIGNATURE_SHORT_CMD</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	#define SHORT_REQ_TARGET_ID_DEFAULT 0x0UL</div><div class='add'>+	#define SHORT_REQ_TARGET_ID_TOOLS   0xfffdUL</div><div class='add'>+	#define SHORT_REQ_TARGET_ID_LAST   SHORT_REQ_TARGET_ID_TOOLS</div><div class='add'>+	__le16	size;</div><div class='add'>+	__le64	req_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* cmd_nums (size:64b/8B) */</div><div class='add'>+struct cmd_nums {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	#define HWRM_VER_GET                              0x0UL</div><div class='add'>+	#define HWRM_FUNC_ECHO_RESPONSE                   0xbUL</div><div class='add'>+	#define HWRM_ERROR_RECOVERY_QCFG                  0xcUL</div><div class='add'>+	#define HWRM_FUNC_DRV_IF_CHANGE                   0xdUL</div><div class='add'>+	#define HWRM_FUNC_BUF_UNRGTR                      0xeUL</div><div class='add'>+	#define HWRM_FUNC_VF_CFG                          0xfUL</div><div class='add'>+	#define HWRM_RESERVED1                            0x10UL</div><div class='add'>+	#define HWRM_FUNC_RESET                           0x11UL</div><div class='add'>+	#define HWRM_FUNC_GETFID                          0x12UL</div><div class='add'>+	#define HWRM_FUNC_VF_ALLOC                        0x13UL</div><div class='add'>+	#define HWRM_FUNC_VF_FREE                         0x14UL</div><div class='add'>+	#define HWRM_FUNC_QCAPS                           0x15UL</div><div class='add'>+	#define HWRM_FUNC_QCFG                            0x16UL</div><div class='add'>+	#define HWRM_FUNC_CFG                             0x17UL</div><div class='add'>+	#define HWRM_FUNC_QSTATS                          0x18UL</div><div class='add'>+	#define HWRM_FUNC_CLR_STATS                       0x19UL</div><div class='add'>+	#define HWRM_FUNC_DRV_UNRGTR                      0x1aUL</div><div class='add'>+	#define HWRM_FUNC_VF_RESC_FREE                    0x1bUL</div><div class='add'>+	#define HWRM_FUNC_VF_VNIC_IDS_QUERY               0x1cUL</div><div class='add'>+	#define HWRM_FUNC_DRV_RGTR                        0x1dUL</div><div class='add'>+	#define HWRM_FUNC_DRV_QVER                        0x1eUL</div><div class='add'>+	#define HWRM_FUNC_BUF_RGTR                        0x1fUL</div><div class='add'>+	#define HWRM_PORT_PHY_CFG                         0x20UL</div><div class='add'>+	#define HWRM_PORT_MAC_CFG                         0x21UL</div><div class='add'>+	#define HWRM_PORT_TS_QUERY                        0x22UL</div><div class='add'>+	#define HWRM_PORT_QSTATS                          0x23UL</div><div class='add'>+	#define HWRM_PORT_LPBK_QSTATS                     0x24UL</div><div class='add'>+	#define HWRM_PORT_CLR_STATS                       0x25UL</div><div class='add'>+	#define HWRM_PORT_LPBK_CLR_STATS                  0x26UL</div><div class='add'>+	#define HWRM_PORT_PHY_QCFG                        0x27UL</div><div class='add'>+	#define HWRM_PORT_MAC_QCFG                        0x28UL</div><div class='add'>+	#define HWRM_PORT_MAC_PTP_QCFG                    0x29UL</div><div class='add'>+	#define HWRM_PORT_PHY_QCAPS                       0x2aUL</div><div class='add'>+	#define HWRM_PORT_PHY_I2C_WRITE                   0x2bUL</div><div class='add'>+	#define HWRM_PORT_PHY_I2C_READ                    0x2cUL</div><div class='add'>+	#define HWRM_PORT_LED_CFG                         0x2dUL</div><div class='add'>+	#define HWRM_PORT_LED_QCFG                        0x2eUL</div><div class='add'>+	#define HWRM_PORT_LED_QCAPS                       0x2fUL</div><div class='add'>+	#define HWRM_QUEUE_QPORTCFG                       0x30UL</div><div class='add'>+	#define HWRM_QUEUE_QCFG                           0x31UL</div><div class='add'>+	#define HWRM_QUEUE_CFG                            0x32UL</div><div class='add'>+	#define HWRM_FUNC_VLAN_CFG                        0x33UL</div><div class='add'>+	#define HWRM_FUNC_VLAN_QCFG                       0x34UL</div><div class='add'>+	#define HWRM_QUEUE_PFCENABLE_QCFG                 0x35UL</div><div class='add'>+	#define HWRM_QUEUE_PFCENABLE_CFG                  0x36UL</div><div class='add'>+	#define HWRM_QUEUE_PRI2COS_QCFG                   0x37UL</div><div class='add'>+	#define HWRM_QUEUE_PRI2COS_CFG                    0x38UL</div><div class='add'>+	#define HWRM_QUEUE_COS2BW_QCFG                    0x39UL</div><div class='add'>+	#define HWRM_QUEUE_COS2BW_CFG                     0x3aUL</div><div class='add'>+	#define HWRM_QUEUE_DSCP_QCAPS                     0x3bUL</div><div class='add'>+	#define HWRM_QUEUE_DSCP2PRI_QCFG                  0x3cUL</div><div class='add'>+	#define HWRM_QUEUE_DSCP2PRI_CFG                   0x3dUL</div><div class='add'>+	#define HWRM_VNIC_ALLOC                           0x40UL</div><div class='add'>+	#define HWRM_VNIC_FREE                            0x41UL</div><div class='add'>+	#define HWRM_VNIC_CFG                             0x42UL</div><div class='add'>+	#define HWRM_VNIC_QCFG                            0x43UL</div><div class='add'>+	#define HWRM_VNIC_TPA_CFG                         0x44UL</div><div class='add'>+	#define HWRM_VNIC_TPA_QCFG                        0x45UL</div><div class='add'>+	#define HWRM_VNIC_RSS_CFG                         0x46UL</div><div class='add'>+	#define HWRM_VNIC_RSS_QCFG                        0x47UL</div><div class='add'>+	#define HWRM_VNIC_PLCMODES_CFG                    0x48UL</div><div class='add'>+	#define HWRM_VNIC_PLCMODES_QCFG                   0x49UL</div><div class='add'>+	#define HWRM_VNIC_QCAPS                           0x4aUL</div><div class='add'>+	#define HWRM_VNIC_UPDATE                          0x4bUL</div><div class='add'>+	#define HWRM_RING_ALLOC                           0x50UL</div><div class='add'>+	#define HWRM_RING_FREE                            0x51UL</div><div class='add'>+	#define HWRM_RING_CMPL_RING_QAGGINT_PARAMS        0x52UL</div><div class='add'>+	#define HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS     0x53UL</div><div class='add'>+	#define HWRM_RING_AGGINT_QCAPS                    0x54UL</div><div class='add'>+	#define HWRM_RING_SCHQ_ALLOC                      0x55UL</div><div class='add'>+	#define HWRM_RING_SCHQ_CFG                        0x56UL</div><div class='add'>+	#define HWRM_RING_SCHQ_FREE                       0x57UL</div><div class='add'>+	#define HWRM_RING_RESET                           0x5eUL</div><div class='add'>+	#define HWRM_RING_GRP_ALLOC                       0x60UL</div><div class='add'>+	#define HWRM_RING_GRP_FREE                        0x61UL</div><div class='add'>+	#define HWRM_RING_CFG                             0x62UL</div><div class='add'>+	#define HWRM_RING_QCFG                            0x63UL</div><div class='add'>+	#define HWRM_RESERVED5                            0x64UL</div><div class='add'>+	#define HWRM_RESERVED6                            0x65UL</div><div class='add'>+	#define HWRM_VNIC_RSS_COS_LB_CTX_ALLOC            0x70UL</div><div class='add'>+	#define HWRM_VNIC_RSS_COS_LB_CTX_FREE             0x71UL</div><div class='add'>+	#define HWRM_QUEUE_MPLS_QCAPS                     0x80UL</div><div class='add'>+	#define HWRM_QUEUE_MPLSTC2PRI_QCFG                0x81UL</div><div class='add'>+	#define HWRM_QUEUE_MPLSTC2PRI_CFG                 0x82UL</div><div class='add'>+	#define HWRM_QUEUE_VLANPRI_QCAPS                  0x83UL</div><div class='add'>+	#define HWRM_QUEUE_VLANPRI2PRI_QCFG               0x84UL</div><div class='add'>+	#define HWRM_QUEUE_VLANPRI2PRI_CFG                0x85UL</div><div class='add'>+	#define HWRM_QUEUE_GLOBAL_CFG                     0x86UL</div><div class='add'>+	#define HWRM_QUEUE_GLOBAL_QCFG                    0x87UL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_RX_FEATURE_QCFG      0x88UL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_RX_FEATURE_CFG       0x89UL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_TX_FEATURE_QCFG      0x8aUL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_TX_FEATURE_CFG       0x8bUL</div><div class='add'>+	#define HWRM_QUEUE_QCAPS                          0x8cUL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_RX_TUNING_QCFG       0x8dUL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_RX_TUNING_CFG        0x8eUL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_TX_TUNING_QCFG       0x8fUL</div><div class='add'>+	#define HWRM_CFA_L2_FILTER_ALLOC                  0x90UL</div><div class='add'>+	#define HWRM_CFA_L2_FILTER_FREE                   0x91UL</div><div class='add'>+	#define HWRM_CFA_L2_FILTER_CFG                    0x92UL</div><div class='add'>+	#define HWRM_CFA_L2_SET_RX_MASK                   0x93UL</div><div class='add'>+	#define HWRM_CFA_VLAN_ANTISPOOF_CFG               0x94UL</div><div class='add'>+	#define HWRM_CFA_TUNNEL_FILTER_ALLOC              0x95UL</div><div class='add'>+	#define HWRM_CFA_TUNNEL_FILTER_FREE               0x96UL</div><div class='add'>+	#define HWRM_CFA_ENCAP_RECORD_ALLOC               0x97UL</div><div class='add'>+	#define HWRM_CFA_ENCAP_RECORD_FREE                0x98UL</div><div class='add'>+	#define HWRM_CFA_NTUPLE_FILTER_ALLOC              0x99UL</div><div class='add'>+	#define HWRM_CFA_NTUPLE_FILTER_FREE               0x9aUL</div><div class='add'>+	#define HWRM_CFA_NTUPLE_FILTER_CFG                0x9bUL</div><div class='add'>+	#define HWRM_CFA_EM_FLOW_ALLOC                    0x9cUL</div><div class='add'>+	#define HWRM_CFA_EM_FLOW_FREE                     0x9dUL</div><div class='add'>+	#define HWRM_CFA_EM_FLOW_CFG                      0x9eUL</div><div class='add'>+	#define HWRM_TUNNEL_DST_PORT_QUERY                0xa0UL</div><div class='add'>+	#define HWRM_TUNNEL_DST_PORT_ALLOC                0xa1UL</div><div class='add'>+	#define HWRM_TUNNEL_DST_PORT_FREE                 0xa2UL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_TX_TUNING_CFG        0xa3UL</div><div class='add'>+	#define HWRM_STAT_CTX_ENG_QUERY                   0xafUL</div><div class='add'>+	#define HWRM_STAT_CTX_ALLOC                       0xb0UL</div><div class='add'>+	#define HWRM_STAT_CTX_FREE                        0xb1UL</div><div class='add'>+	#define HWRM_STAT_CTX_QUERY                       0xb2UL</div><div class='add'>+	#define HWRM_STAT_CTX_CLR_STATS                   0xb3UL</div><div class='add'>+	#define HWRM_PORT_QSTATS_EXT                      0xb4UL</div><div class='add'>+	#define HWRM_PORT_PHY_MDIO_WRITE                  0xb5UL</div><div class='add'>+	#define HWRM_PORT_PHY_MDIO_READ                   0xb6UL</div><div class='add'>+	#define HWRM_PORT_PHY_MDIO_BUS_ACQUIRE            0xb7UL</div><div class='add'>+	#define HWRM_PORT_PHY_MDIO_BUS_RELEASE            0xb8UL</div><div class='add'>+	#define HWRM_PORT_QSTATS_EXT_PFC_WD               0xb9UL</div><div class='add'>+	#define HWRM_RESERVED7                            0xbaUL</div><div class='add'>+	#define HWRM_PORT_TX_FIR_CFG                      0xbbUL</div><div class='add'>+	#define HWRM_PORT_TX_FIR_QCFG                     0xbcUL</div><div class='add'>+	#define HWRM_PORT_ECN_QSTATS                      0xbdUL</div><div class='add'>+	#define HWRM_FW_LIVEPATCH_QUERY                   0xbeUL</div><div class='add'>+	#define HWRM_FW_LIVEPATCH                         0xbfUL</div><div class='add'>+	#define HWRM_FW_RESET                             0xc0UL</div><div class='add'>+	#define HWRM_FW_QSTATUS                           0xc1UL</div><div class='add'>+	#define HWRM_FW_HEALTH_CHECK                      0xc2UL</div><div class='add'>+	#define HWRM_FW_SYNC                              0xc3UL</div><div class='add'>+	#define HWRM_FW_STATE_QCAPS                       0xc4UL</div><div class='add'>+	#define HWRM_FW_STATE_QUIESCE                     0xc5UL</div><div class='add'>+	#define HWRM_FW_STATE_BACKUP                      0xc6UL</div><div class='add'>+	#define HWRM_FW_STATE_RESTORE                     0xc7UL</div><div class='add'>+	#define HWRM_FW_SET_TIME                          0xc8UL</div><div class='add'>+	#define HWRM_FW_GET_TIME                          0xc9UL</div><div class='add'>+	#define HWRM_FW_SET_STRUCTURED_DATA               0xcaUL</div><div class='add'>+	#define HWRM_FW_GET_STRUCTURED_DATA               0xcbUL</div><div class='add'>+	#define HWRM_FW_IPC_MAILBOX                       0xccUL</div><div class='add'>+	#define HWRM_FW_ECN_CFG                           0xcdUL</div><div class='add'>+	#define HWRM_FW_ECN_QCFG                          0xceUL</div><div class='add'>+	#define HWRM_FW_SECURE_CFG                        0xcfUL</div><div class='add'>+	#define HWRM_EXEC_FWD_RESP                        0xd0UL</div><div class='add'>+	#define HWRM_REJECT_FWD_RESP                      0xd1UL</div><div class='add'>+	#define HWRM_FWD_RESP                             0xd2UL</div><div class='add'>+	#define HWRM_FWD_ASYNC_EVENT_CMPL                 0xd3UL</div><div class='add'>+	#define HWRM_OEM_CMD                              0xd4UL</div><div class='add'>+	#define HWRM_PORT_PRBS_TEST                       0xd5UL</div><div class='add'>+	#define HWRM_PORT_SFP_SIDEBAND_CFG                0xd6UL</div><div class='add'>+	#define HWRM_PORT_SFP_SIDEBAND_QCFG               0xd7UL</div><div class='add'>+	#define HWRM_FW_STATE_UNQUIESCE                   0xd8UL</div><div class='add'>+	#define HWRM_PORT_DSC_DUMP                        0xd9UL</div><div class='add'>+	#define HWRM_PORT_EP_TX_QCFG                      0xdaUL</div><div class='add'>+	#define HWRM_PORT_EP_TX_CFG                       0xdbUL</div><div class='add'>+	#define HWRM_PORT_CFG                             0xdcUL</div><div class='add'>+	#define HWRM_PORT_QCFG                            0xddUL</div><div class='add'>+	#define HWRM_PORT_MAC_QCAPS                       0xdfUL</div><div class='add'>+	#define HWRM_TEMP_MONITOR_QUERY                   0xe0UL</div><div class='add'>+	#define HWRM_REG_POWER_QUERY                      0xe1UL</div><div class='add'>+	#define HWRM_CORE_FREQUENCY_QUERY                 0xe2UL</div><div class='add'>+	#define HWRM_REG_POWER_HISTOGRAM                  0xe3UL</div><div class='add'>+	#define HWRM_MONITOR_PAX_HISTOGRAM_START          0xe4UL</div><div class='add'>+	#define HWRM_MONITOR_PAX_HISTOGRAM_COLLECT        0xe5UL</div><div class='add'>+	#define HWRM_STAT_QUERY_ROCE_STATS                0xe6UL</div><div class='add'>+	#define HWRM_STAT_QUERY_ROCE_STATS_EXT            0xe7UL</div><div class='add'>+	#define HWRM_WOL_FILTER_ALLOC                     0xf0UL</div><div class='add'>+	#define HWRM_WOL_FILTER_FREE                      0xf1UL</div><div class='add'>+	#define HWRM_WOL_FILTER_QCFG                      0xf2UL</div><div class='add'>+	#define HWRM_WOL_REASON_QCFG                      0xf3UL</div><div class='add'>+	#define HWRM_CFA_METER_QCAPS                      0xf4UL</div><div class='add'>+	#define HWRM_CFA_METER_PROFILE_ALLOC              0xf5UL</div><div class='add'>+	#define HWRM_CFA_METER_PROFILE_FREE               0xf6UL</div><div class='add'>+	#define HWRM_CFA_METER_PROFILE_CFG                0xf7UL</div><div class='add'>+	#define HWRM_CFA_METER_INSTANCE_ALLOC             0xf8UL</div><div class='add'>+	#define HWRM_CFA_METER_INSTANCE_FREE              0xf9UL</div><div class='add'>+	#define HWRM_CFA_METER_INSTANCE_CFG               0xfaUL</div><div class='add'>+	#define HWRM_CFA_VFR_ALLOC                        0xfdUL</div><div class='add'>+	#define HWRM_CFA_VFR_FREE                         0xfeUL</div><div class='add'>+	#define HWRM_CFA_VF_PAIR_ALLOC                    0x100UL</div><div class='add'>+	#define HWRM_CFA_VF_PAIR_FREE                     0x101UL</div><div class='add'>+	#define HWRM_CFA_VF_PAIR_INFO                     0x102UL</div><div class='add'>+	#define HWRM_CFA_FLOW_ALLOC                       0x103UL</div><div class='add'>+	#define HWRM_CFA_FLOW_FREE                        0x104UL</div><div class='add'>+	#define HWRM_CFA_FLOW_FLUSH                       0x105UL</div><div class='add'>+	#define HWRM_CFA_FLOW_STATS                       0x106UL</div><div class='add'>+	#define HWRM_CFA_FLOW_INFO                        0x107UL</div><div class='add'>+	#define HWRM_CFA_DECAP_FILTER_ALLOC               0x108UL</div><div class='add'>+	#define HWRM_CFA_DECAP_FILTER_FREE                0x109UL</div><div class='add'>+	#define HWRM_CFA_VLAN_ANTISPOOF_QCFG              0x10aUL</div><div class='add'>+	#define HWRM_CFA_REDIRECT_TUNNEL_TYPE_ALLOC       0x10bUL</div><div class='add'>+	#define HWRM_CFA_REDIRECT_TUNNEL_TYPE_FREE        0x10cUL</div><div class='add'>+	#define HWRM_CFA_PAIR_ALLOC                       0x10dUL</div><div class='add'>+	#define HWRM_CFA_PAIR_FREE                        0x10eUL</div><div class='add'>+	#define HWRM_CFA_PAIR_INFO                        0x10fUL</div><div class='add'>+	#define HWRM_FW_IPC_MSG                           0x110UL</div><div class='add'>+	#define HWRM_CFA_REDIRECT_TUNNEL_TYPE_INFO        0x111UL</div><div class='add'>+	#define HWRM_CFA_REDIRECT_QUERY_TUNNEL_TYPE       0x112UL</div><div class='add'>+	#define HWRM_CFA_FLOW_AGING_TIMER_RESET           0x113UL</div><div class='add'>+	#define HWRM_CFA_FLOW_AGING_CFG                   0x114UL</div><div class='add'>+	#define HWRM_CFA_FLOW_AGING_QCFG                  0x115UL</div><div class='add'>+	#define HWRM_CFA_FLOW_AGING_QCAPS                 0x116UL</div><div class='add'>+	#define HWRM_CFA_CTX_MEM_RGTR                     0x117UL</div><div class='add'>+	#define HWRM_CFA_CTX_MEM_UNRGTR                   0x118UL</div><div class='add'>+	#define HWRM_CFA_CTX_MEM_QCTX                     0x119UL</div><div class='add'>+	#define HWRM_CFA_CTX_MEM_QCAPS                    0x11aUL</div><div class='add'>+	#define HWRM_CFA_COUNTER_QCAPS                    0x11bUL</div><div class='add'>+	#define HWRM_CFA_COUNTER_CFG                      0x11cUL</div><div class='add'>+	#define HWRM_CFA_COUNTER_QCFG                     0x11dUL</div><div class='add'>+	#define HWRM_CFA_COUNTER_QSTATS                   0x11eUL</div><div class='add'>+	#define HWRM_CFA_TCP_FLAG_PROCESS_QCFG            0x11fUL</div><div class='add'>+	#define HWRM_CFA_EEM_QCAPS                        0x120UL</div><div class='add'>+	#define HWRM_CFA_EEM_CFG                          0x121UL</div><div class='add'>+	#define HWRM_CFA_EEM_QCFG                         0x122UL</div><div class='add'>+	#define HWRM_CFA_EEM_OP                           0x123UL</div><div class='add'>+	#define HWRM_CFA_ADV_FLOW_MGNT_QCAPS              0x124UL</div><div class='add'>+	#define HWRM_CFA_TFLIB                            0x125UL</div><div class='add'>+	#define HWRM_CFA_LAG_GROUP_MEMBER_RGTR            0x126UL</div><div class='add'>+	#define HWRM_CFA_LAG_GROUP_MEMBER_UNRGTR          0x127UL</div><div class='add'>+	#define HWRM_CFA_TLS_FILTER_ALLOC                 0x128UL</div><div class='add'>+	#define HWRM_CFA_TLS_FILTER_FREE                  0x129UL</div><div class='add'>+	#define HWRM_CFA_RELEASE_AFM_FUNC                 0x12aUL</div><div class='add'>+	#define HWRM_ENGINE_CKV_STATUS                    0x12eUL</div><div class='add'>+	#define HWRM_ENGINE_CKV_CKEK_ADD                  0x12fUL</div><div class='add'>+	#define HWRM_ENGINE_CKV_CKEK_DELETE               0x130UL</div><div class='add'>+	#define HWRM_ENGINE_CKV_KEY_ADD                   0x131UL</div><div class='add'>+	#define HWRM_ENGINE_CKV_KEY_DELETE                0x132UL</div><div class='add'>+	#define HWRM_ENGINE_CKV_FLUSH                     0x133UL</div><div class='add'>+	#define HWRM_ENGINE_CKV_RNG_GET                   0x134UL</div><div class='add'>+	#define HWRM_ENGINE_CKV_KEY_GEN                   0x135UL</div><div class='add'>+	#define HWRM_ENGINE_CKV_KEY_LABEL_CFG             0x136UL</div><div class='add'>+	#define HWRM_ENGINE_CKV_KEY_LABEL_QCFG            0x137UL</div><div class='add'>+	#define HWRM_ENGINE_QG_CONFIG_QUERY               0x13cUL</div><div class='add'>+	#define HWRM_ENGINE_QG_QUERY                      0x13dUL</div><div class='add'>+	#define HWRM_ENGINE_QG_METER_PROFILE_CONFIG_QUERY 0x13eUL</div><div class='add'>+	#define HWRM_ENGINE_QG_METER_PROFILE_QUERY        0x13fUL</div><div class='add'>+	#define HWRM_ENGINE_QG_METER_PROFILE_ALLOC        0x140UL</div><div class='add'>+	#define HWRM_ENGINE_QG_METER_PROFILE_FREE         0x141UL</div><div class='add'>+	#define HWRM_ENGINE_QG_METER_QUERY                0x142UL</div><div class='add'>+	#define HWRM_ENGINE_QG_METER_BIND                 0x143UL</div><div class='add'>+	#define HWRM_ENGINE_QG_METER_UNBIND               0x144UL</div><div class='add'>+	#define HWRM_ENGINE_QG_FUNC_BIND                  0x145UL</div><div class='add'>+	#define HWRM_ENGINE_SG_CONFIG_QUERY               0x146UL</div><div class='add'>+	#define HWRM_ENGINE_SG_QUERY                      0x147UL</div><div class='add'>+	#define HWRM_ENGINE_SG_METER_QUERY                0x148UL</div><div class='add'>+	#define HWRM_ENGINE_SG_METER_CONFIG               0x149UL</div><div class='add'>+	#define HWRM_ENGINE_SG_QG_BIND                    0x14aUL</div><div class='add'>+	#define HWRM_ENGINE_QG_SG_UNBIND                  0x14bUL</div><div class='add'>+	#define HWRM_ENGINE_CONFIG_QUERY                  0x154UL</div><div class='add'>+	#define HWRM_ENGINE_STATS_CONFIG                  0x155UL</div><div class='add'>+	#define HWRM_ENGINE_STATS_CLEAR                   0x156UL</div><div class='add'>+	#define HWRM_ENGINE_STATS_QUERY                   0x157UL</div><div class='add'>+	#define HWRM_ENGINE_STATS_QUERY_CONTINUOUS_ERROR  0x158UL</div><div class='add'>+	#define HWRM_ENGINE_RQ_ALLOC                      0x15eUL</div><div class='add'>+	#define HWRM_ENGINE_RQ_FREE                       0x15fUL</div><div class='add'>+	#define HWRM_ENGINE_CQ_ALLOC                      0x160UL</div><div class='add'>+	#define HWRM_ENGINE_CQ_FREE                       0x161UL</div><div class='add'>+	#define HWRM_ENGINE_NQ_ALLOC                      0x162UL</div><div class='add'>+	#define HWRM_ENGINE_NQ_FREE                       0x163UL</div><div class='add'>+	#define HWRM_ENGINE_ON_DIE_RQE_CREDITS            0x164UL</div><div class='add'>+	#define HWRM_ENGINE_FUNC_QCFG                     0x165UL</div><div class='add'>+	#define HWRM_FUNC_RESOURCE_QCAPS                  0x190UL</div><div class='add'>+	#define HWRM_FUNC_VF_RESOURCE_CFG                 0x191UL</div><div class='add'>+	#define HWRM_FUNC_BACKING_STORE_QCAPS             0x192UL</div><div class='add'>+	#define HWRM_FUNC_BACKING_STORE_CFG               0x193UL</div><div class='add'>+	#define HWRM_FUNC_BACKING_STORE_QCFG              0x194UL</div><div class='add'>+	#define HWRM_FUNC_VF_BW_CFG                       0x195UL</div><div class='add'>+	#define HWRM_FUNC_VF_BW_QCFG                      0x196UL</div><div class='add'>+	#define HWRM_FUNC_HOST_PF_IDS_QUERY               0x197UL</div><div class='add'>+	#define HWRM_FUNC_QSTATS_EXT                      0x198UL</div><div class='add'>+	#define HWRM_STAT_EXT_CTX_QUERY                   0x199UL</div><div class='add'>+	#define HWRM_FUNC_SPD_CFG                         0x19aUL</div><div class='add'>+	#define HWRM_FUNC_SPD_QCFG                        0x19bUL</div><div class='add'>+	#define HWRM_FUNC_PTP_PIN_QCFG                    0x19cUL</div><div class='add'>+	#define HWRM_FUNC_PTP_PIN_CFG                     0x19dUL</div><div class='add'>+	#define HWRM_FUNC_PTP_CFG                         0x19eUL</div><div class='add'>+	#define HWRM_FUNC_PTP_TS_QUERY                    0x19fUL</div><div class='add'>+	#define HWRM_FUNC_PTP_EXT_CFG                     0x1a0UL</div><div class='add'>+	#define HWRM_FUNC_PTP_EXT_QCFG                    0x1a1UL</div><div class='add'>+	#define HWRM_FUNC_KEY_CTX_ALLOC                   0x1a2UL</div><div class='add'>+	#define HWRM_FUNC_BACKING_STORE_CFG_V2            0x1a3UL</div><div class='add'>+	#define HWRM_FUNC_BACKING_STORE_QCFG_V2           0x1a4UL</div><div class='add'>+	#define HWRM_FUNC_DBR_PACING_CFG                  0x1a5UL</div><div class='add'>+	#define HWRM_FUNC_DBR_PACING_QCFG                 0x1a6UL</div><div class='add'>+	#define HWRM_FUNC_DBR_PACING_BROADCAST_EVENT      0x1a7UL</div><div class='add'>+	#define HWRM_FUNC_BACKING_STORE_QCAPS_V2          0x1a8UL</div><div class='add'>+	#define HWRM_FUNC_DBR_PACING_NQLIST_QUERY         0x1a9UL</div><div class='add'>+	#define HWRM_FUNC_DBR_RECOVERY_COMPLETED          0x1aaUL</div><div class='add'>+	#define HWRM_FUNC_SYNCE_CFG                       0x1abUL</div><div class='add'>+	#define HWRM_FUNC_SYNCE_QCFG                      0x1acUL</div><div class='add'>+	#define HWRM_FUNC_KEY_CTX_FREE                    0x1adUL</div><div class='add'>+	#define HWRM_FUNC_LAG_MODE_CFG                    0x1aeUL</div><div class='add'>+	#define HWRM_FUNC_LAG_MODE_QCFG                   0x1afUL</div><div class='add'>+	#define HWRM_FUNC_LAG_CREATE                      0x1b0UL</div><div class='add'>+	#define HWRM_FUNC_LAG_UPDATE                      0x1b1UL</div><div class='add'>+	#define HWRM_FUNC_LAG_FREE                        0x1b2UL</div><div class='add'>+	#define HWRM_FUNC_LAG_QCFG                        0x1b3UL</div><div class='add'>+	#define HWRM_FUNC_TTX_PACING_RATE_PROF_QUERY      0x1c3UL</div><div class='add'>+	#define HWRM_FUNC_TTX_PACING_RATE_QUERY           0x1c4UL</div><div class='add'>+	#define HWRM_SELFTEST_QLIST                       0x200UL</div><div class='add'>+	#define HWRM_SELFTEST_EXEC                        0x201UL</div><div class='add'>+	#define HWRM_SELFTEST_IRQ                         0x202UL</div><div class='add'>+	#define HWRM_SELFTEST_RETRIEVE_SERDES_DATA        0x203UL</div><div class='add'>+	#define HWRM_PCIE_QSTATS                          0x204UL</div><div class='add'>+	#define HWRM_MFG_FRU_WRITE_CONTROL                0x205UL</div><div class='add'>+	#define HWRM_MFG_TIMERS_QUERY                     0x206UL</div><div class='add'>+	#define HWRM_MFG_OTP_CFG                          0x207UL</div><div class='add'>+	#define HWRM_MFG_OTP_QCFG                         0x208UL</div><div class='add'>+	#define HWRM_MFG_HDMA_TEST                        0x209UL</div><div class='add'>+	#define HWRM_MFG_FRU_EEPROM_WRITE                 0x20aUL</div><div class='add'>+	#define HWRM_MFG_FRU_EEPROM_READ                  0x20bUL</div><div class='add'>+	#define HWRM_MFG_SOC_IMAGE                        0x20cUL</div><div class='add'>+	#define HWRM_MFG_SOC_QSTATUS                      0x20dUL</div><div class='add'>+	#define HWRM_MFG_PARAM_CRITICAL_DATA_FINALIZE     0x20eUL</div><div class='add'>+	#define HWRM_MFG_PARAM_CRITICAL_DATA_READ         0x20fUL</div><div class='add'>+	#define HWRM_MFG_PARAM_CRITICAL_DATA_HEALTH       0x210UL</div><div class='add'>+	#define HWRM_MFG_PRVSN_EXPORT_CSR                 0x211UL</div><div class='add'>+	#define HWRM_MFG_PRVSN_IMPORT_CERT                0x212UL</div><div class='add'>+	#define HWRM_MFG_PRVSN_GET_STATE                  0x213UL</div><div class='add'>+	#define HWRM_MFG_GET_NVM_MEASUREMENT              0x214UL</div><div class='add'>+	#define HWRM_MFG_PSOC_QSTATUS                     0x215UL</div><div class='add'>+	#define HWRM_MFG_SELFTEST_QLIST                   0x216UL</div><div class='add'>+	#define HWRM_MFG_SELFTEST_EXEC                    0x217UL</div><div class='add'>+	#define HWRM_STAT_GENERIC_QSTATS                  0x218UL</div><div class='add'>+	#define HWRM_MFG_PRVSN_EXPORT_CERT                0x219UL</div><div class='add'>+	#define HWRM_STAT_DB_ERROR_QSTATS                 0x21aUL</div><div class='add'>+	#define HWRM_MFG_TESTS                            0x21bUL</div><div class='add'>+	#define HWRM_MFG_WRITE_CERT_NVM                   0x21cUL</div><div class='add'>+	#define HWRM_PORT_POE_CFG                         0x230UL</div><div class='add'>+	#define HWRM_PORT_POE_QCFG                        0x231UL</div><div class='add'>+	#define HWRM_PORT_PHY_FDRSTAT                     0x232UL</div><div class='add'>+	#define HWRM_UDCC_QCAPS                           0x258UL</div><div class='add'>+	#define HWRM_UDCC_CFG                             0x259UL</div><div class='add'>+	#define HWRM_UDCC_QCFG                            0x25aUL</div><div class='add'>+	#define HWRM_UDCC_SESSION_CFG                     0x25bUL</div><div class='add'>+	#define HWRM_UDCC_SESSION_QCFG                    0x25cUL</div><div class='add'>+	#define HWRM_UDCC_SESSION_QUERY                   0x25dUL</div><div class='add'>+	#define HWRM_UDCC_COMP_CFG                        0x25eUL</div><div class='add'>+	#define HWRM_UDCC_COMP_QCFG                       0x25fUL</div><div class='add'>+	#define HWRM_UDCC_COMP_QUERY                      0x260UL</div><div class='add'>+	#define HWRM_QUEUE_PFCWD_TIMEOUT_QCAPS            0x261UL</div><div class='add'>+	#define HWRM_QUEUE_PFCWD_TIMEOUT_CFG              0x262UL</div><div class='add'>+	#define HWRM_QUEUE_PFCWD_TIMEOUT_QCFG             0x263UL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_RX_QCFG              0x264UL</div><div class='add'>+	#define HWRM_QUEUE_ADPTV_QOS_TX_QCFG              0x265UL</div><div class='add'>+	#define HWRM_TF                                   0x2bcUL</div><div class='add'>+	#define HWRM_TF_VERSION_GET                       0x2bdUL</div><div class='add'>+	#define HWRM_TF_SESSION_OPEN                      0x2c6UL</div><div class='add'>+	#define HWRM_TF_SESSION_REGISTER                  0x2c8UL</div><div class='add'>+	#define HWRM_TF_SESSION_UNREGISTER                0x2c9UL</div><div class='add'>+	#define HWRM_TF_SESSION_CLOSE                     0x2caUL</div><div class='add'>+	#define HWRM_TF_SESSION_QCFG                      0x2cbUL</div><div class='add'>+	#define HWRM_TF_SESSION_RESC_QCAPS                0x2ccUL</div><div class='add'>+	#define HWRM_TF_SESSION_RESC_ALLOC                0x2cdUL</div><div class='add'>+	#define HWRM_TF_SESSION_RESC_FREE                 0x2ceUL</div><div class='add'>+	#define HWRM_TF_SESSION_RESC_FLUSH                0x2cfUL</div><div class='add'>+	#define HWRM_TF_SESSION_RESC_INFO                 0x2d0UL</div><div class='add'>+	#define HWRM_TF_SESSION_HOTUP_STATE_SET           0x2d1UL</div><div class='add'>+	#define HWRM_TF_SESSION_HOTUP_STATE_GET           0x2d2UL</div><div class='add'>+	#define HWRM_TF_TBL_TYPE_GET                      0x2daUL</div><div class='add'>+	#define HWRM_TF_TBL_TYPE_SET                      0x2dbUL</div><div class='add'>+	#define HWRM_TF_TBL_TYPE_BULK_GET                 0x2dcUL</div><div class='add'>+	#define HWRM_TF_EM_INSERT                         0x2eaUL</div><div class='add'>+	#define HWRM_TF_EM_DELETE                         0x2ebUL</div><div class='add'>+	#define HWRM_TF_EM_HASH_INSERT                    0x2ecUL</div><div class='add'>+	#define HWRM_TF_EM_MOVE                           0x2edUL</div><div class='add'>+	#define HWRM_TF_TCAM_SET                          0x2f8UL</div><div class='add'>+	#define HWRM_TF_TCAM_GET                          0x2f9UL</div><div class='add'>+	#define HWRM_TF_TCAM_MOVE                         0x2faUL</div><div class='add'>+	#define HWRM_TF_TCAM_FREE                         0x2fbUL</div><div class='add'>+	#define HWRM_TF_GLOBAL_CFG_SET                    0x2fcUL</div><div class='add'>+	#define HWRM_TF_GLOBAL_CFG_GET                    0x2fdUL</div><div class='add'>+	#define HWRM_TF_IF_TBL_SET                        0x2feUL</div><div class='add'>+	#define HWRM_TF_IF_TBL_GET                        0x2ffUL</div><div class='add'>+	#define HWRM_TF_RESC_USAGE_SET                    0x300UL</div><div class='add'>+	#define HWRM_TF_RESC_USAGE_QUERY                  0x301UL</div><div class='add'>+	#define HWRM_TF_TBL_TYPE_ALLOC                    0x302UL</div><div class='add'>+	#define HWRM_TF_TBL_TYPE_FREE                     0x303UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_QCAPS                  0x380UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_ID_ALLOC               0x381UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_CONFIG                 0x382UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_DECONFIG               0x383UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_FID_ADD                0x384UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_FID_REM                0x385UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_POOL_ALLOC             0x386UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_POOL_FREE              0x387UL</div><div class='add'>+	#define HWRM_TFC_SESSION_ID_ALLOC                 0x388UL</div><div class='add'>+	#define HWRM_TFC_SESSION_FID_ADD                  0x389UL</div><div class='add'>+	#define HWRM_TFC_SESSION_FID_REM                  0x38aUL</div><div class='add'>+	#define HWRM_TFC_IDENT_ALLOC                      0x38bUL</div><div class='add'>+	#define HWRM_TFC_IDENT_FREE                       0x38cUL</div><div class='add'>+	#define HWRM_TFC_IDX_TBL_ALLOC                    0x38dUL</div><div class='add'>+	#define HWRM_TFC_IDX_TBL_ALLOC_SET                0x38eUL</div><div class='add'>+	#define HWRM_TFC_IDX_TBL_SET                      0x38fUL</div><div class='add'>+	#define HWRM_TFC_IDX_TBL_GET                      0x390UL</div><div class='add'>+	#define HWRM_TFC_IDX_TBL_FREE                     0x391UL</div><div class='add'>+	#define HWRM_TFC_GLOBAL_ID_ALLOC                  0x392UL</div><div class='add'>+	#define HWRM_TFC_TCAM_SET                         0x393UL</div><div class='add'>+	#define HWRM_TFC_TCAM_GET                         0x394UL</div><div class='add'>+	#define HWRM_TFC_TCAM_ALLOC                       0x395UL</div><div class='add'>+	#define HWRM_TFC_TCAM_ALLOC_SET                   0x396UL</div><div class='add'>+	#define HWRM_TFC_TCAM_FREE                        0x397UL</div><div class='add'>+	#define HWRM_TFC_IF_TBL_SET                       0x398UL</div><div class='add'>+	#define HWRM_TFC_IF_TBL_GET                       0x399UL</div><div class='add'>+	#define HWRM_TFC_TBL_SCOPE_CONFIG_GET             0x39aUL</div><div class='add'>+	#define HWRM_TFC_RESC_USAGE_QUERY                 0x39bUL</div><div class='add'>+	#define HWRM_TFC_GLOBAL_ID_FREE                   0x39cUL</div><div class='add'>+	#define HWRM_TFC_TCAM_PRI_UPDATE                  0x39dUL</div><div class='add'>+	#define HWRM_TFC_HOT_UPGRADE_PROCESS              0x3a0UL</div><div class='add'>+	#define HWRM_SV                                   0x400UL</div><div class='add'>+	#define HWRM_DBG_SERDES_TEST                      0xff0eUL</div><div class='add'>+	#define HWRM_DBG_LOG_BUFFER_FLUSH                 0xff0fUL</div><div class='add'>+	#define HWRM_DBG_READ_DIRECT                      0xff10UL</div><div class='add'>+	#define HWRM_DBG_READ_INDIRECT                    0xff11UL</div><div class='add'>+	#define HWRM_DBG_WRITE_DIRECT                     0xff12UL</div><div class='add'>+	#define HWRM_DBG_WRITE_INDIRECT                   0xff13UL</div><div class='add'>+	#define HWRM_DBG_DUMP                             0xff14UL</div><div class='add'>+	#define HWRM_DBG_ERASE_NVM                        0xff15UL</div><div class='add'>+	#define HWRM_DBG_CFG                              0xff16UL</div><div class='add'>+	#define HWRM_DBG_COREDUMP_LIST                    0xff17UL</div><div class='add'>+	#define HWRM_DBG_COREDUMP_INITIATE                0xff18UL</div><div class='add'>+	#define HWRM_DBG_COREDUMP_RETRIEVE                0xff19UL</div><div class='add'>+	#define HWRM_DBG_FW_CLI                           0xff1aUL</div><div class='add'>+	#define HWRM_DBG_I2C_CMD                          0xff1bUL</div><div class='add'>+	#define HWRM_DBG_RING_INFO_GET                    0xff1cUL</div><div class='add'>+	#define HWRM_DBG_CRASHDUMP_HEADER                 0xff1dUL</div><div class='add'>+	#define HWRM_DBG_CRASHDUMP_ERASE                  0xff1eUL</div><div class='add'>+	#define HWRM_DBG_DRV_TRACE                        0xff1fUL</div><div class='add'>+	#define HWRM_DBG_QCAPS                            0xff20UL</div><div class='add'>+	#define HWRM_DBG_QCFG                             0xff21UL</div><div class='add'>+	#define HWRM_DBG_CRASHDUMP_MEDIUM_CFG             0xff22UL</div><div class='add'>+	#define HWRM_DBG_USEQ_ALLOC                       0xff23UL</div><div class='add'>+	#define HWRM_DBG_USEQ_FREE                        0xff24UL</div><div class='add'>+	#define HWRM_DBG_USEQ_FLUSH                       0xff25UL</div><div class='add'>+	#define HWRM_DBG_USEQ_QCAPS                       0xff26UL</div><div class='add'>+	#define HWRM_DBG_USEQ_CW_CFG                      0xff27UL</div><div class='add'>+	#define HWRM_DBG_USEQ_SCHED_CFG                   0xff28UL</div><div class='add'>+	#define HWRM_DBG_USEQ_RUN                         0xff29UL</div><div class='add'>+	#define HWRM_DBG_USEQ_DELIVERY_REQ                0xff2aUL</div><div class='add'>+	#define HWRM_DBG_USEQ_RESP_HDR                    0xff2bUL</div><div class='add'>+	#define HWRM_DBG_COREDUMP_CAPTURE                 0xff2cUL</div><div class='add'>+	#define HWRM_DBG_PTRACE                           0xff2dUL</div><div class='add'>+	#define HWRM_DBG_SIM_CABLE_STATE                  0xff2eUL</div><div class='add'>+	#define HWRM_DBG_TOKEN_QUERY_AUTH_IDS             0xff2fUL</div><div class='add'>+	#define HWRM_DBG_TOKEN_CFG                        0xff30UL</div><div class='add'>+	#define HWRM_NVM_GET_VPD_FIELD_INFO               0xffeaUL</div><div class='add'>+	#define HWRM_NVM_SET_VPD_FIELD_INFO               0xffebUL</div><div class='add'>+	#define HWRM_NVM_DEFRAG                           0xffecUL</div><div class='add'>+	#define HWRM_NVM_REQ_ARBITRATION                  0xffedUL</div><div class='add'>+	#define HWRM_NVM_FACTORY_DEFAULTS                 0xffeeUL</div><div class='add'>+	#define HWRM_NVM_VALIDATE_OPTION                  0xffefUL</div><div class='add'>+	#define HWRM_NVM_FLUSH                            0xfff0UL</div><div class='add'>+	#define HWRM_NVM_GET_VARIABLE                     0xfff1UL</div><div class='add'>+	#define HWRM_NVM_SET_VARIABLE                     0xfff2UL</div><div class='add'>+	#define HWRM_NVM_INSTALL_UPDATE                   0xfff3UL</div><div class='add'>+	#define HWRM_NVM_MODIFY                           0xfff4UL</div><div class='add'>+	#define HWRM_NVM_VERIFY_UPDATE                    0xfff5UL</div><div class='add'>+	#define HWRM_NVM_GET_DEV_INFO                     0xfff6UL</div><div class='add'>+	#define HWRM_NVM_ERASE_DIR_ENTRY                  0xfff7UL</div><div class='add'>+	#define HWRM_NVM_MOD_DIR_ENTRY                    0xfff8UL</div><div class='add'>+	#define HWRM_NVM_FIND_DIR_ENTRY                   0xfff9UL</div><div class='add'>+	#define HWRM_NVM_GET_DIR_ENTRIES                  0xfffaUL</div><div class='add'>+	#define HWRM_NVM_GET_DIR_INFO                     0xfffbUL</div><div class='add'>+	#define HWRM_NVM_RAW_DUMP                         0xfffcUL</div><div class='add'>+	#define HWRM_NVM_READ                             0xfffdUL</div><div class='add'>+	#define HWRM_NVM_WRITE                            0xfffeUL</div><div class='add'>+	#define HWRM_NVM_RAW_WRITE_BLK                    0xffffUL</div><div class='add'>+	#define HWRM_LAST                                HWRM_NVM_RAW_WRITE_BLK</div><div class='add'>+	__le16	unused_0[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ret_codes (size:64b/8B) */</div><div class='add'>+struct ret_codes {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	#define HWRM_ERR_CODE_SUCCESS                      0x0UL</div><div class='add'>+	#define HWRM_ERR_CODE_FAIL                         0x1UL</div><div class='add'>+	#define HWRM_ERR_CODE_INVALID_PARAMS               0x2UL</div><div class='add'>+	#define HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED       0x3UL</div><div class='add'>+	#define HWRM_ERR_CODE_RESOURCE_ALLOC_ERROR         0x4UL</div><div class='add'>+	#define HWRM_ERR_CODE_INVALID_FLAGS                0x5UL</div><div class='add'>+	#define HWRM_ERR_CODE_INVALID_ENABLES              0x6UL</div><div class='add'>+	#define HWRM_ERR_CODE_UNSUPPORTED_TLV              0x7UL</div><div class='add'>+	#define HWRM_ERR_CODE_NO_BUFFER                    0x8UL</div><div class='add'>+	#define HWRM_ERR_CODE_UNSUPPORTED_OPTION_ERR       0x9UL</div><div class='add'>+	#define HWRM_ERR_CODE_HOT_RESET_PROGRESS           0xaUL</div><div class='add'>+	#define HWRM_ERR_CODE_HOT_RESET_FAIL               0xbUL</div><div class='add'>+	#define HWRM_ERR_CODE_NO_FLOW_COUNTER_DURING_ALLOC 0xcUL</div><div class='add'>+	#define HWRM_ERR_CODE_KEY_HASH_COLLISION           0xdUL</div><div class='add'>+	#define HWRM_ERR_CODE_KEY_ALREADY_EXISTS           0xeUL</div><div class='add'>+	#define HWRM_ERR_CODE_HWRM_ERROR                   0xfUL</div><div class='add'>+	#define HWRM_ERR_CODE_BUSY                         0x10UL</div><div class='add'>+	#define HWRM_ERR_CODE_RESOURCE_LOCKED              0x11UL</div><div class='add'>+	#define HWRM_ERR_CODE_PF_UNAVAILABLE               0x12UL</div><div class='add'>+	#define HWRM_ERR_CODE_ENTITY_NOT_PRESENT           0x13UL</div><div class='add'>+	#define HWRM_ERR_CODE_SECURE_SOC_ERROR             0x14UL</div><div class='add'>+	#define HWRM_ERR_CODE_TLV_ENCAPSULATED_RESPONSE    0x8000UL</div><div class='add'>+	#define HWRM_ERR_CODE_UNKNOWN_ERR                  0xfffeUL</div><div class='add'>+	#define HWRM_ERR_CODE_CMD_NOT_SUPPORTED            0xffffUL</div><div class='add'>+	#define HWRM_ERR_CODE_LAST                        HWRM_ERR_CODE_CMD_NOT_SUPPORTED</div><div class='add'>+	__le16	unused_0[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_err_output (size:128b/16B) */</div><div class='add'>+struct hwrm_err_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	opaque_0;</div><div class='add'>+	__le16	opaque_1;</div><div class='add'>+	u8	cmd_err;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+#define HWRM_NA_SIGNATURE ((__le32)(-1))</div><div class='add'>+#define HWRM_MAX_REQ_LEN 128</div><div class='add'>+#define HWRM_MAX_RESP_LEN 704</div><div class='add'>+#define HW_HASH_INDEX_SIZE 0x80</div><div class='add'>+#define HW_HASH_KEY_SIZE 40</div><div class='add'>+#define HWRM_RESP_VALID_KEY 1</div><div class='add'>+#define HWRM_TARGET_ID_BONO 0xFFF8</div><div class='add'>+#define HWRM_TARGET_ID_KONG 0xFFF9</div><div class='add'>+#define HWRM_TARGET_ID_APE 0xFFFA</div><div class='add'>+#define HWRM_TARGET_ID_TOOLS 0xFFFD</div><div class='add'>+#define HWRM_VERSION_MAJOR 1</div><div class='add'>+#define HWRM_VERSION_MINOR 10</div><div class='add'>+#define HWRM_VERSION_UPDATE 3</div><div class='add'>+#define HWRM_VERSION_RSVD 133</div><div class='add'>+#define HWRM_VERSION_STR "1.10.3.133"</div><div class='add'>+</div><div class='add'>+/* hwrm_ver_get_input (size:192b/24B) */</div><div class='add'>+struct hwrm_ver_get_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	hwrm_intf_maj;</div><div class='add'>+	u8	hwrm_intf_min;</div><div class='add'>+	u8	hwrm_intf_upd;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ver_get_output (size:1408b/176B) */</div><div class='add'>+struct hwrm_ver_get_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	hwrm_intf_maj_8b;</div><div class='add'>+	u8	hwrm_intf_min_8b;</div><div class='add'>+	u8	hwrm_intf_upd_8b;</div><div class='add'>+	u8	hwrm_intf_rsvd_8b;</div><div class='add'>+	u8	hwrm_fw_maj_8b;</div><div class='add'>+	u8	hwrm_fw_min_8b;</div><div class='add'>+	u8	hwrm_fw_bld_8b;</div><div class='add'>+	u8	hwrm_fw_rsvd_8b;</div><div class='add'>+	u8	mgmt_fw_maj_8b;</div><div class='add'>+	u8	mgmt_fw_min_8b;</div><div class='add'>+	u8	mgmt_fw_bld_8b;</div><div class='add'>+	u8	mgmt_fw_rsvd_8b;</div><div class='add'>+	u8	netctrl_fw_maj_8b;</div><div class='add'>+	u8	netctrl_fw_min_8b;</div><div class='add'>+	u8	netctrl_fw_bld_8b;</div><div class='add'>+	u8	netctrl_fw_rsvd_8b;</div><div class='add'>+	__le32	dev_caps_cfg;</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_SECURE_FW_UPD_SUPPORTED                  0x1UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_FW_DCBX_AGENT_SUPPORTED                  0x2UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_SHORT_CMD_SUPPORTED                      0x4UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_SHORT_CMD_REQUIRED                       0x8UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_KONG_MB_CHNL_SUPPORTED                   0x10UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_FLOW_HANDLE_64BIT_SUPPORTED              0x20UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_L2_FILTER_TYPES_ROCE_OR_L2_SUPPORTED     0x40UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_VIRTIO_VSWITCH_OFFLOAD_SUPPORTED         0x80UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_TRUSTED_VF_SUPPORTED                     0x100UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_FLOW_AGING_SUPPORTED                     0x200UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_ADV_FLOW_COUNTERS_SUPPORTED              0x400UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_EEM_SUPPORTED                        0x800UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_ADV_FLOW_MGNT_SUPPORTED              0x1000UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_TFLIB_SUPPORTED                      0x2000UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_TRUFLOW_SUPPORTED                    0x4000UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_SECURE_BOOT_CAPABLE                      0x8000UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_SECURE_SOC_CAPABLE                       0x10000UL</div><div class='add'>+	#define VER_GET_RESP_DEV_CAPS_CFG_DEBUG_TOKEN_SUPPORTED                    0x20000UL</div><div class='add'>+	u8	roce_fw_maj_8b;</div><div class='add'>+	u8	roce_fw_min_8b;</div><div class='add'>+	u8	roce_fw_bld_8b;</div><div class='add'>+	u8	roce_fw_rsvd_8b;</div><div class='add'>+	char	hwrm_fw_name[16];</div><div class='add'>+	char	mgmt_fw_name[16];</div><div class='add'>+	char	netctrl_fw_name[16];</div><div class='add'>+	char	active_pkg_name[16];</div><div class='add'>+	char	roce_fw_name[16];</div><div class='add'>+	__le16	chip_num;</div><div class='add'>+	u8	chip_rev;</div><div class='add'>+	u8	chip_metal;</div><div class='add'>+	u8	chip_bond_id;</div><div class='add'>+	u8	chip_platform_type;</div><div class='add'>+	#define VER_GET_RESP_CHIP_PLATFORM_TYPE_ASIC      0x0UL</div><div class='add'>+	#define VER_GET_RESP_CHIP_PLATFORM_TYPE_FPGA      0x1UL</div><div class='add'>+	#define VER_GET_RESP_CHIP_PLATFORM_TYPE_PALLADIUM 0x2UL</div><div class='add'>+	#define VER_GET_RESP_CHIP_PLATFORM_TYPE_LAST     VER_GET_RESP_CHIP_PLATFORM_TYPE_PALLADIUM</div><div class='add'>+	__le16	max_req_win_len;</div><div class='add'>+	__le16	max_resp_len;</div><div class='add'>+	__le16	def_req_timeout;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define VER_GET_RESP_FLAGS_DEV_NOT_RDY                   0x1UL</div><div class='add'>+	#define VER_GET_RESP_FLAGS_EXT_VER_AVAIL                 0x2UL</div><div class='add'>+	#define VER_GET_RESP_FLAGS_DEV_NOT_RDY_BACKING_STORE     0x4UL</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	u8	always_1;</div><div class='add'>+	__le16	hwrm_intf_major;</div><div class='add'>+	__le16	hwrm_intf_minor;</div><div class='add'>+	__le16	hwrm_intf_build;</div><div class='add'>+	__le16	hwrm_intf_patch;</div><div class='add'>+	__le16	hwrm_fw_major;</div><div class='add'>+	__le16	hwrm_fw_minor;</div><div class='add'>+	__le16	hwrm_fw_build;</div><div class='add'>+	__le16	hwrm_fw_patch;</div><div class='add'>+	__le16	mgmt_fw_major;</div><div class='add'>+	__le16	mgmt_fw_minor;</div><div class='add'>+	__le16	mgmt_fw_build;</div><div class='add'>+	__le16	mgmt_fw_patch;</div><div class='add'>+	__le16	netctrl_fw_major;</div><div class='add'>+	__le16	netctrl_fw_minor;</div><div class='add'>+	__le16	netctrl_fw_build;</div><div class='add'>+	__le16	netctrl_fw_patch;</div><div class='add'>+	__le16	roce_fw_major;</div><div class='add'>+	__le16	roce_fw_minor;</div><div class='add'>+	__le16	roce_fw_build;</div><div class='add'>+	__le16	roce_fw_patch;</div><div class='add'>+	__le16	max_ext_req_len;</div><div class='add'>+	__le16	max_req_timeout;</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* eject_cmpl (size:128b/16B) */</div><div class='add'>+struct eject_cmpl {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define EJECT_CMPL_TYPE_MASK       0x3fUL</div><div class='add'>+	#define EJECT_CMPL_TYPE_SFT        0</div><div class='add'>+	#define EJECT_CMPL_TYPE_STAT_EJECT   0x1aUL</div><div class='add'>+	#define EJECT_CMPL_TYPE_LAST        EJECT_CMPL_TYPE_STAT_EJECT</div><div class='add'>+	#define EJECT_CMPL_FLAGS_MASK      0xffc0UL</div><div class='add'>+	#define EJECT_CMPL_FLAGS_SFT       6</div><div class='add'>+	#define EJECT_CMPL_FLAGS_ERROR      0x40UL</div><div class='add'>+	__le16	len;</div><div class='add'>+	__le32	opaque;</div><div class='add'>+	__le16	v;</div><div class='add'>+	#define EJECT_CMPL_V                              0x1UL</div><div class='add'>+	#define EJECT_CMPL_ERRORS_MASK                    0xfffeUL</div><div class='add'>+	#define EJECT_CMPL_ERRORS_SFT                     1</div><div class='add'>+	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_MASK        0xeUL</div><div class='add'>+	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_SFT         1</div><div class='add'>+	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_NO_BUFFER     (0x0UL &lt;&lt; 1)</div><div class='add'>+	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_DID_NOT_FIT   (0x1UL &lt;&lt; 1)</div><div class='add'>+	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_BAD_FORMAT    (0x3UL &lt;&lt; 1)</div><div class='add'>+	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_FLUSH         (0x5UL &lt;&lt; 1)</div><div class='add'>+	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_LAST         EJECT_CMPL_ERRORS_BUFFER_ERROR_FLUSH</div><div class='add'>+	__le16	reserved16;</div><div class='add'>+	__le32	unused_2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cmpl (size:128b/16B) */</div><div class='add'>+struct hwrm_cmpl {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define CMPL_TYPE_MASK     0x3fUL</div><div class='add'>+	#define CMPL_TYPE_SFT      0</div><div class='add'>+	#define CMPL_TYPE_HWRM_DONE  0x20UL</div><div class='add'>+	#define CMPL_TYPE_LAST      CMPL_TYPE_HWRM_DONE</div><div class='add'>+	__le16	sequence_id;</div><div class='add'>+	__le32	unused_1;</div><div class='add'>+	__le32	v;</div><div class='add'>+	#define CMPL_V     0x1UL</div><div class='add'>+	__le32	unused_3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fwd_req_cmpl (size:128b/16B) */</div><div class='add'>+struct hwrm_fwd_req_cmpl {</div><div class='add'>+	__le16	req_len_type;</div><div class='add'>+	#define FWD_REQ_CMPL_TYPE_MASK        0x3fUL</div><div class='add'>+	#define FWD_REQ_CMPL_TYPE_SFT         0</div><div class='add'>+	#define FWD_REQ_CMPL_TYPE_HWRM_FWD_REQ  0x22UL</div><div class='add'>+	#define FWD_REQ_CMPL_TYPE_LAST         FWD_REQ_CMPL_TYPE_HWRM_FWD_REQ</div><div class='add'>+	#define FWD_REQ_CMPL_REQ_LEN_MASK     0xffc0UL</div><div class='add'>+	#define FWD_REQ_CMPL_REQ_LEN_SFT      6</div><div class='add'>+	__le16	source_id;</div><div class='add'>+	__le32	unused0;</div><div class='add'>+	__le32	req_buf_addr_v[2];</div><div class='add'>+	#define FWD_REQ_CMPL_V                0x1UL</div><div class='add'>+	#define FWD_REQ_CMPL_REQ_BUF_ADDR_MASK 0xfffffffeUL</div><div class='add'>+	#define FWD_REQ_CMPL_REQ_BUF_ADDR_SFT 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fwd_resp_cmpl (size:128b/16B) */</div><div class='add'>+struct hwrm_fwd_resp_cmpl {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define FWD_RESP_CMPL_TYPE_MASK         0x3fUL</div><div class='add'>+	#define FWD_RESP_CMPL_TYPE_SFT          0</div><div class='add'>+	#define FWD_RESP_CMPL_TYPE_HWRM_FWD_RESP  0x24UL</div><div class='add'>+	#define FWD_RESP_CMPL_TYPE_LAST          FWD_RESP_CMPL_TYPE_HWRM_FWD_RESP</div><div class='add'>+	__le16	source_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	unused_1;</div><div class='add'>+	__le32	resp_buf_addr_v[2];</div><div class='add'>+	#define FWD_RESP_CMPL_V                 0x1UL</div><div class='add'>+	#define FWD_RESP_CMPL_RESP_BUF_ADDR_MASK 0xfffffffeUL</div><div class='add'>+	#define FWD_RESP_CMPL_RESP_BUF_ADDR_SFT 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_TYPE_LAST             ASYNC_EVENT_CMPL_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE              0x0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_MTU_CHANGE                 0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CHANGE               0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_DCB_CONFIG_CHANGE               0x3UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED           0x4UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_NOT_ALLOWED      0x5UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE           0x6UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PORT_PHY_CFG_CHANGE             0x7UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY                    0x8UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY                  0x9UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG                0xaUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_FUNC_DRVR_UNLOAD                0x10UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_FUNC_DRVR_LOAD                  0x11UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_FUNC_FLR_PROC_CMPLT             0x12UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD                  0x20UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_LOAD                    0x21UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_VF_FLR                          0x30UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_VF_MAC_ADDR_CHANGE              0x31UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PF_VF_COMM_STATUS_CHANGE        0x32UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_VF_CFG_CHANGE                   0x33UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_LLFC_PFC_CHANGE                 0x34UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_DEFAULT_VNIC_CHANGE             0x35UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_HW_FLOW_AGED                    0x36UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION              0x37UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_EEM_CACHE_FLUSH_REQ             0x38UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_EEM_CACHE_FLUSH_DONE            0x39UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_TCP_FLAG_ACTION_CHANGE          0x3aUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_EEM_FLOW_ACTIVE                 0x3bUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_EEM_CFG_CHANGE                  0x3cUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_TFLIB_DEFAULT_VNIC_CHANGE       0x3dUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_TFLIB_LINK_STATUS_CHANGE        0x3eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_QUIESCE_DONE                    0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_DEFERRED_RESPONSE               0x40UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PFC_WATCHDOG_CFG_CHANGE         0x41UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_ECHO_REQUEST                    0x42UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PHC_UPDATE                      0x43UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PPS_TIMESTAMP                   0x44UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_ERROR_REPORT                    0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_DOORBELL_PACING_THRESHOLD       0x46UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_RSS_CHANGE                      0x47UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_DOORBELL_PACING_NQ_UPDATE       0x48UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_HW_DOORBELL_RECOVERY_READ_ERROR 0x49UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_CTX_ERROR                       0x4aUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_UDCC_SESSION_CHANGE             0x4bUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_DBG_BUF_PRODUCER                0x4cUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_PEER_MMAP_CHANGE                0x4dUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_REPRESENTOR_PAIR_CHANGE         0x4eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_VF_STAT_CHANGE                  0x4fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_HOST_COREDUMP                   0x50UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_ADPTV_QOS                       0x51UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_MAX_RGTR_EVENT_ID               0x52UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_FW_TRACE_MSG                    0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_HWRM_ERROR                      0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EVENT_ID_LAST                           ASYNC_EVENT_CMPL_EVENT_ID_HWRM_ERROR</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_link_status_change (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_link_status_change {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_LAST             ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_ID_LINK_STATUS_CHANGE 0x0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_ID_LAST              ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_ID_LINK_STATUS_CHANGE</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE     0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE_DOWN  0x0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE_UP    0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE_LAST ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE_UP</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PORT_MASK       0xeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PORT_SFT        1</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PORT_ID_MASK    0xffff0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PORT_ID_SFT     4</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PF_ID_MASK      0xff00000UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PF_ID_SFT       20</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_port_conn_not_allowed (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_port_conn_not_allowed {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_LAST             ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_ID_PORT_CONN_NOT_ALLOWED 0x4UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_ID_LAST                 ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_ID_PORT_CONN_NOT_ALLOWED</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_PORT_ID_MASK                 0xffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_PORT_ID_SFT                  0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_MASK      0xff0000UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_SFT       16</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_NONE        (0x0UL &lt;&lt; 16)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_DISABLETX   (0x1UL &lt;&lt; 16)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_WARNINGMSG  (0x2UL &lt;&lt; 16)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_PWRDOWN     (0x3UL &lt;&lt; 16)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_LAST       ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_PWRDOWN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_link_speed_cfg_change (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_link_speed_cfg_change {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_LAST             ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_ID_LINK_SPEED_CFG_CHANGE 0x6UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_ID_LAST                 ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_ID_LINK_SPEED_CFG_CHANGE</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_DATA1_PORT_ID_MASK                     0xffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_DATA1_PORT_ID_SFT                      0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_DATA1_SUPPORTED_LINK_SPEEDS_CHANGE     0x10000UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_DATA1_ILLEGAL_LINK_SPEED_CFG           0x20000UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_reset_notify (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_reset_notify {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_LAST             ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_ID_RESET_NOTIFY 0x8UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_ID_LAST        ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_ID_RESET_NOTIFY</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA2_FW_STATUS_CODE_MASK 0xffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA2_FW_STATUS_CODE_SFT 0</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_MASK                  0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_SFT                   0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_DRIVER_STOP_TX_QUEUE    0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_DRIVER_IFDOWN           0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_LAST                   ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_DRIVER_IFDOWN</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK                    0xff00UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_SFT                     8</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MANAGEMENT_RESET_REQUEST  (0x1UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_FATAL        (0x2UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_NON_FATAL    (0x3UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FAST_RESET                (0x4UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_ACTIVATION             (0x5UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_LAST                     ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_ACTIVATION</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DELAY_IN_100MS_TICKS_MASK           0xffff0000UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DELAY_IN_100MS_TICKS_SFT            16</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_recovery (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_recovery {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_ID_ERROR_RECOVERY 0x9UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_ID_LAST          ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_ID_ERROR_RECOVERY</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASK                 0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_SFT                  0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASTER_FUNC           0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_RECOVERY_ENABLED      0x2UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_ring_monitor_msg (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_ring_monitor_msg {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_TYPE_LAST             ASYNC_EVENT_CMPL_RING_MONITOR_MSG_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_ID_RING_MONITOR_MSG 0xaUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_ID_LAST            ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_ID_RING_MONITOR_MSG</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_MASK 0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_SFT 0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_TX    0x0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_RX    0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_CMPL  0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_LAST ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_CMPL</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_RING_MONITOR_MSG_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_vf_cfg_change (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_vf_cfg_change {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_LAST             ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_ID_VF_CFG_CHANGE 0x33UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_ID_LAST         ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_ID_VF_CFG_CHANGE</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA2_VF_ID_MASK 0xffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA2_VF_ID_SFT 0</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_MTU_CHANGE                0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_MRU_CHANGE                0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_DFLT_MAC_ADDR_CHANGE      0x4UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_DFLT_VLAN_CHANGE          0x8UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_TRUSTED_VF_CFG_CHANGE     0x10UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_TF_OWNERSHIP_RELEASE      0x20UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_default_vnic_change (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_default_vnic_change {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_TYPE_LAST             ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_UNUSED1_MASK         0xffc0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_UNUSED1_SFT          6</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_ID_ALLOC_FREE_NOTIFICATION 0x35UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_ID_LAST                   ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_ID_ALLOC_FREE_NOTIFICATION</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_DEF_VNIC_STATE_MASK          0x3UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_DEF_VNIC_STATE_SFT           0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_DEF_VNIC_STATE_DEF_VNIC_ALLOC  0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_DEF_VNIC_STATE_DEF_VNIC_FREE   0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_DEF_VNIC_STATE_LAST           ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_DEF_VNIC_STATE_DEF_VNIC_FREE</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_PF_ID_MASK                   0x3fcUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_PF_ID_SFT                    2</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_VF_ID_MASK                   0x3fffc00UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFAULT_VNIC_CHANGE_EVENT_DATA1_VF_ID_SFT                    10</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_hw_flow_aged (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_hw_flow_aged {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_LAST             ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_ID_HW_FLOW_AGED 0x36UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_ID_LAST        ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_ID_HW_FLOW_AGED</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_ID_MASK       0x7fffffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_ID_SFT        0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION     0x80000000UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION_RX    (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION_TX    (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION_LAST ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION_TX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_eem_cache_flush_req (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_eem_cache_flush_req {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_LAST             ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_EVENT_ID_EEM_CACHE_FLUSH_REQ 0x38UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_EVENT_ID_LAST               ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_EVENT_ID_EEM_CACHE_FLUSH_REQ</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_eem_cache_flush_done (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_eem_cache_flush_done {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_LAST             ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_ID_EEM_CACHE_FLUSH_DONE 0x39UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_ID_LAST                ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_ID_EEM_CACHE_FLUSH_DONE</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_DATA1_FID_MASK 0xffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_DATA1_FID_SFT 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_deferred_response (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_deferred_response {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_TYPE_LAST             ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_EVENT_ID_DEFERRED_RESPONSE 0x40UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_EVENT_ID_LAST             ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_EVENT_ID_DEFERRED_RESPONSE</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_EVENT_DATA2_SEQ_ID_MASK 0xffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_EVENT_DATA2_SEQ_ID_SFT 0</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DEFERRED_RESPONSE_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_echo_request (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_echo_request {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_TYPE_LAST             ASYNC_EVENT_CMPL_ECHO_REQUEST_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_EVENT_ID_ECHO_REQUEST 0x42UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ECHO_REQUEST_EVENT_ID_ECHO_REQUEST</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ECHO_REQUEST_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_phc_update (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_phc_update {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_TYPE_LAST             ASYNC_EVENT_CMPL_PHC_UPDATE_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_ID_PHC_UPDATE 0x43UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_ID_LAST      ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_ID_PHC_UPDATE</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA2_PHC_MASTER_FID_MASK 0xffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA2_PHC_MASTER_FID_SFT 0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA2_PHC_SEC_FID_MASK   0xffff0000UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA2_PHC_SEC_FID_SFT    16</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_MASK          0xfUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_SFT           0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_PHC_MASTER      0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_PHC_SECONDARY   0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_PHC_FAILOVER    0x3UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_PHC_RTC_UPDATE  0x4UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_LAST           ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_PHC_RTC_UPDATE</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_PHC_TIME_MSB_MASK   0xffff0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_PHC_TIME_MSB_SFT    4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_pps_timestamp (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_pps_timestamp {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_TYPE_LAST             ASYNC_EVENT_CMPL_PPS_TIMESTAMP_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_ID_PPS_TIMESTAMP 0x44UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_ID_LAST         ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_ID_PPS_TIMESTAMP</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE              0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE_INTERNAL       0x0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE_EXTERNAL       0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE_LAST          ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE_EXTERNAL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PIN_NUMBER_MASK         0xeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PIN_NUMBER_SFT          1</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PPS_TIMESTAMP_UPPER_MASK 0xffff0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PPS_TIMESTAMP_UPPER_SFT 4</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA1_PPS_TIMESTAMP_LOWER_MASK 0xffffffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA1_PPS_TIMESTAMP_LOWER_SFT 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_report (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_report {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_REPORT_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_EVENT_ID_ERROR_REPORT 0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_EVENT_ID_ERROR_REPORT</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_EVENT_DATA1_ERROR_TYPE_MASK 0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_EVENT_DATA1_ERROR_TYPE_SFT 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_dbg_buf_producer (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_dbg_buf_producer {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_TYPE_LAST             ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_ID_DBG_BUF_PRODUCER 0x4cUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_ID_LAST            ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_ID_DBG_BUF_PRODUCER</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA2_CURR_OFF_MASK 0xffffffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA2_CURR_OFF_SFT 0</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_MASK               0xffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_SFT                0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_SRT_TRACE            0x0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_SRT2_TRACE           0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_CRT_TRACE            0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_CRT2_TRACE           0x3UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_RIGP0_TRACE          0x4UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_L2_HWRM_TRACE        0x5UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_ROCE_HWRM_TRACE      0x6UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_CA0_TRACE            0x7UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_CA1_TRACE            0x8UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_CA2_TRACE            0x9UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_RIGP1_TRACE          0xaUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_AFM_KONG_HWRM_TRACE  0xbUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_ERR_QPC_TRACE        0xcUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_LAST                ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_ERR_QPC_TRACE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_hwrm_error (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_hwrm_error {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_TYPE_LAST             ASYNC_EVENT_CMPL_HWRM_ERROR_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_ID_HWRM_ERROR 0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_ID_LAST      ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_ID_HWRM_ERROR</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA2_SEVERITY_MASK    0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA2_SEVERITY_SFT     0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA2_SEVERITY_WARNING   0x0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA2_SEVERITY_NONFATAL  0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA2_SEVERITY_FATAL     0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA2_SEVERITY_LAST     ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA2_SEVERITY_FATAL</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA1_TIMESTAMP     0x1UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_report_base (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_report_base {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_ID_ERROR_REPORT 0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_ID_ERROR_REPORT</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_MASK                        0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_SFT                         0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_RESERVED                      0x0UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_PAUSE_STORM                   0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_INVALID_SIGNAL                0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_NVM                           0x3UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DOORBELL_DROP_THRESHOLD       0x4UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_THERMAL_THRESHOLD             0x5UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DUAL_DATA_RATE_NOT_SUPPORTED  0x6UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DUP_UDCC_SES                  0x7UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DB_DROP                       0x8UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_MD_TEMP                       0x9UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_VNIC_ERR                      0xaUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_LAST                         ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_VNIC_ERR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_report_pause_storm (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_report_pause_storm {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_EVENT_ID_ERROR_REPORT 0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_EVENT_ID_ERROR_REPORT</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_EVENT_DATA1_ERROR_TYPE_MASK       0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_EVENT_DATA1_ERROR_TYPE_SFT        0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_EVENT_DATA1_ERROR_TYPE_PAUSE_STORM  0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_EVENT_DATA1_ERROR_TYPE_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_PAUSE_STORM_EVENT_DATA1_ERROR_TYPE_PAUSE_STORM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_report_invalid_signal (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_report_invalid_signal {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_ID_ERROR_REPORT 0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_ID_ERROR_REPORT</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA2_PIN_ID_MASK 0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA2_PIN_ID_SFT 0</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA1_ERROR_TYPE_MASK          0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA1_ERROR_TYPE_SFT           0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA1_ERROR_TYPE_INVALID_SIGNAL  0x2UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA1_ERROR_TYPE_LAST           ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA1_ERROR_TYPE_INVALID_SIGNAL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_report_nvm (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_report_nvm {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_ID_ERROR_REPORT 0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_ID_ERROR_REPORT</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA2_ERR_ADDR_MASK 0xffffffffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA2_ERR_ADDR_SFT 0</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_ERROR_TYPE_MASK     0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_ERROR_TYPE_SFT      0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_ERROR_TYPE_NVM_ERROR  0x3UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_ERROR_TYPE_LAST      ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_ERROR_TYPE_NVM_ERROR</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_MASK   0xff00UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_SFT    8</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_WRITE    (0x1UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_ERASE    (0x2UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_LAST    ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_ERASE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_report_doorbell_drop_threshold (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_report_doorbell_drop_threshold {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_ID_ERROR_REPORT 0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_ID_ERROR_REPORT</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_ERROR_TYPE_MASK                   0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_ERROR_TYPE_SFT                    0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_ERROR_TYPE_DOORBELL_DROP_THRESHOLD  0x4UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_ERROR_TYPE_LAST                    ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_ERROR_TYPE_DOORBELL_DROP_THRESHOLD</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_EPOCH_MASK                        0xffffff00UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_EPOCH_SFT                         8</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_report_thermal (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_report_thermal {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_ID_ERROR_REPORT 0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_ID_ERROR_REPORT</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_CURRENT_TEMP_MASK  0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_CURRENT_TEMP_SFT   0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_THRESHOLD_TEMP_MASK 0xff00UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_THRESHOLD_TEMP_SFT 8</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_ERROR_TYPE_MASK          0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_ERROR_TYPE_SFT           0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_ERROR_TYPE_THERMAL_EVENT   0x5UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_ERROR_TYPE_LAST           ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_ERROR_TYPE_THERMAL_EVENT</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_MASK      0x700UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_SFT       8</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_WARN        (0x0UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_CRITICAL    (0x1UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_FATAL       (0x2UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_SHUTDOWN    (0x3UL &lt;&lt; 8)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_LAST       ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_SHUTDOWN</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR           0x800UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR_DECREASING  (0x0UL &lt;&lt; 11)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR_INCREASING  (0x1UL &lt;&lt; 11)</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR_LAST       ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR_INCREASING</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_async_event_cmpl_error_report_dual_data_rate_not_supported (size:128b/16B) */</div><div class='add'>+struct hwrm_async_event_cmpl_error_report_dual_data_rate_not_supported {</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_TYPE_MASK            0x3fUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_TYPE_SFT             0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_TYPE_HWRM_ASYNC_EVENT</div><div class='add'>+	__le16	event_id;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_EVENT_ID_ERROR_REPORT 0x45UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_EVENT_ID_LAST        ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_EVENT_ID_ERROR_REPORT</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+	u8	opaque_v;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_V          0x1UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_OPAQUE_MASK 0xfeUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_OPAQUE_SFT 1</div><div class='add'>+	u8	timestamp_lo;</div><div class='add'>+	__le16	timestamp_hi;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_EVENT_DATA1_ERROR_TYPE_MASK                        0xffUL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_EVENT_DATA1_ERROR_TYPE_SFT                         0</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_EVENT_DATA1_ERROR_TYPE_DUAL_DATA_RATE_NOT_SUPPORTED  0x6UL</div><div class='add'>+	#define ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_EVENT_DATA1_ERROR_TYPE_LAST                         ASYNC_EVENT_CMPL_ERROR_REPORT_DUAL_DATA_RATE_NOT_SUPPORTED_EVENT_DATA1_ERROR_TYPE_DUAL_DATA_RATE_NOT_SUPPORTED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_reset_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_reset_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_RESET_REQ_ENABLES_VF_ID_VALID     0x1UL</div><div class='add'>+	__le16	vf_id;</div><div class='add'>+	u8	func_reset_level;</div><div class='add'>+	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETALL      0x0UL</div><div class='add'>+	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETME       0x1UL</div><div class='add'>+	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETCHILDREN 0x2UL</div><div class='add'>+	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETVF       0x3UL</div><div class='add'>+	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_LAST         FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETVF</div><div class='add'>+	u8	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_reset_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_reset_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_getfid_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_getfid_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_GETFID_REQ_ENABLES_PCI_ID     0x1UL</div><div class='add'>+	__le16	pci_id;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_getfid_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_getfid_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_alloc_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_vf_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_VF_ALLOC_REQ_ENABLES_FIRST_VF_ID     0x1UL</div><div class='add'>+	__le16	first_vf_id;</div><div class='add'>+	__le16	num_vfs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_vf_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	first_vf_id;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_vf_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_VF_FREE_REQ_ENABLES_FIRST_VF_ID     0x1UL</div><div class='add'>+	__le16	first_vf_id;</div><div class='add'>+	__le16	num_vfs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_vf_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_cfg_input (size:576b/72B) */</div><div class='add'>+struct hwrm_func_vf_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_MTU                      0x1UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_GUEST_VLAN               0x2UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_ASYNC_EVENT_CR           0x4UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_DFLT_MAC_ADDR            0x8UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS          0x10UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS           0x20UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_TX_RINGS             0x40UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_RX_RINGS             0x80UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_L2_CTXS              0x100UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_VNICS                0x200UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_STAT_CTXS            0x400UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_HW_RING_GRPS         0x800UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_KTLS_TX_KEY_CTXS     0x1000UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_KTLS_RX_KEY_CTXS     0x2000UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_QUIC_TX_KEY_CTXS     0x4000UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_ENABLES_NUM_QUIC_RX_KEY_CTXS     0x8000UL</div><div class='add'>+	__le16	mtu;</div><div class='add'>+	__le16	guest_vlan;</div><div class='add'>+	__le16	async_event_cr;</div><div class='add'>+	u8	dflt_mac_addr[6];</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_TX_ASSETS_TEST             0x1UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_RX_ASSETS_TEST             0x2UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_CMPL_ASSETS_TEST           0x4UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST     0x8UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_RING_GRP_ASSETS_TEST       0x10UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_STAT_CTX_ASSETS_TEST       0x20UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_VNIC_ASSETS_TEST           0x40UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_L2_CTX_ASSETS_TEST         0x80UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_PPP_PUSH_MODE_ENABLE       0x100UL</div><div class='add'>+	#define FUNC_VF_CFG_REQ_FLAGS_PPP_PUSH_MODE_DISABLE      0x200UL</div><div class='add'>+	__le16	num_rsscos_ctxs;</div><div class='add'>+	__le16	num_cmpl_rings;</div><div class='add'>+	__le16	num_tx_rings;</div><div class='add'>+	__le16	num_rx_rings;</div><div class='add'>+	__le16	num_l2_ctxs;</div><div class='add'>+	__le16	num_vnics;</div><div class='add'>+	__le16	num_stat_ctxs;</div><div class='add'>+	__le16	num_hw_ring_grps;</div><div class='add'>+	__le32	num_ktls_tx_key_ctxs;</div><div class='add'>+	__le32	num_ktls_rx_key_ctxs;</div><div class='add'>+	__le16	num_msix;</div><div class='add'>+	u8	unused[2];</div><div class='add'>+	__le32	num_quic_tx_key_ctxs;</div><div class='add'>+	__le32	num_quic_rx_key_ctxs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_vf_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_qcaps_output (size:1152b/144B) */</div><div class='add'>+struct hwrm_func_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED                   0x1UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_GLOBAL_MSIX_AUTOMASKING               0x2UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_PTP_SUPPORTED                         0x4UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_ROCE_V1_SUPPORTED                     0x8UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_ROCE_V2_SUPPORTED                     0x10UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_WOL_MAGICPKT_SUPPORTED                0x20UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_WOL_BMP_SUPPORTED                     0x40UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_TX_RING_RL_SUPPORTED                  0x80UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_TX_BW_CFG_SUPPORTED                   0x100UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_VF_TX_RING_RL_SUPPORTED               0x200UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_VF_BW_CFG_SUPPORTED                   0x400UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_STD_TX_RING_MODE_SUPPORTED            0x800UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_GENEVE_TUN_FLAGS_SUPPORTED            0x1000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_NVGRE_TUN_FLAGS_SUPPORTED             0x2000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_GRE_TUN_FLAGS_SUPPORTED               0x4000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_MPLS_TUN_FLAGS_SUPPORTED              0x8000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_PCIE_STATS_SUPPORTED                  0x10000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_ADOPTED_PF_SUPPORTED                  0x20000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_ADMIN_PF_SUPPORTED                    0x40000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_LINK_ADMIN_STATUS_SUPPORTED           0x80000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_WCB_PUSH_MODE                         0x100000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_DYNAMIC_TX_RING_ALLOC                 0x200000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_HOT_RESET_CAPABLE                     0x400000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_ERROR_RECOVERY_CAPABLE                0x800000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_STATS_SUPPORTED                   0x1000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_ERR_RECOVER_RELOAD                    0x2000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_NOTIFY_VF_DEF_VNIC_CHNG_SUPPORTED     0x4000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_VLAN_ACCELERATION_TX_DISABLED         0x8000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_COREDUMP_CMD_SUPPORTED                0x10000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_CRASHDUMP_CMD_SUPPORTED               0x20000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_PFC_WD_STATS_SUPPORTED                0x40000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_DBG_QCAPS_CMD_SUPPORTED               0x80000000UL</div><div class='add'>+	u8	mac_address[6];</div><div class='add'>+	__le16	max_rsscos_ctx;</div><div class='add'>+	__le16	max_cmpl_rings;</div><div class='add'>+	__le16	max_tx_rings;</div><div class='add'>+	__le16	max_rx_rings;</div><div class='add'>+	__le16	max_l2_ctxs;</div><div class='add'>+	__le16	max_vnics;</div><div class='add'>+	__le16	first_vf_id;</div><div class='add'>+	__le16	max_vfs;</div><div class='add'>+	__le16	max_stat_ctx;</div><div class='add'>+	__le32	max_encap_records;</div><div class='add'>+	__le32	max_decap_records;</div><div class='add'>+	__le32	max_tx_em_flows;</div><div class='add'>+	__le32	max_tx_wm_flows;</div><div class='add'>+	__le32	max_rx_em_flows;</div><div class='add'>+	__le32	max_rx_wm_flows;</div><div class='add'>+	__le32	max_mcast_filters;</div><div class='add'>+	__le32	max_flow_id;</div><div class='add'>+	__le32	max_hw_ring_grps;</div><div class='add'>+	__le16	max_sp_tx_rings;</div><div class='add'>+	__le16	max_msix_vfs;</div><div class='add'>+	__le32	flags_ext;</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_ECN_MARK_SUPPORTED                          0x1UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_ECN_STATS_SUPPORTED                         0x2UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_EXT_HW_STATS_SUPPORTED                      0x4UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_HOT_RESET_IF_SUPPORT                        0x8UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_PROXY_MODE_SUPPORT                          0x10UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_TX_PROXY_SRC_INTF_OVERRIDE_SUPPORT          0x20UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_SCHQ_SUPPORTED                              0x40UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_PPP_PUSH_MODE_SUPPORTED                     0x80UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_EVB_MODE_CFG_NOT_SUPPORTED                  0x100UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_SOC_SPD_SUPPORTED                           0x200UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_FW_LIVEPATCH_SUPPORTED                      0x400UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_FAST_RESET_CAPABLE                          0x800UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_TX_METADATA_CFG_CAPABLE                     0x1000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_NVM_OPTION_ACTION_SUPPORTED                 0x2000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_BD_METADATA_SUPPORTED                       0x4000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_ECHO_REQUEST_SUPPORTED                      0x8000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_NPAR_1_2_SUPPORTED                          0x10000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_PTP_PTM_SUPPORTED                           0x20000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_PTP_PPS_SUPPORTED                           0x40000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_VF_CFG_ASYNC_FOR_PF_SUPPORTED               0x80000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_PARTITION_BW_SUPPORTED                      0x100000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_DFLT_VLAN_TPID_PCP_SUPPORTED                0x200000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_KTLS_SUPPORTED                              0x400000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_EP_RATE_CONTROL                             0x800000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_MIN_BW_SUPPORTED                            0x1000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_TX_COAL_CMPL_CAP                            0x2000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_BS_V2_SUPPORTED                             0x4000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_BS_V2_REQUIRED                              0x8000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_PTP_64BIT_RTC_SUPPORTED                     0x10000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_DBR_PACING_SUPPORTED                        0x20000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_HW_DBR_DROP_RECOV_SUPPORTED                 0x40000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT_DISABLE_CQ_OVERFLOW_DETECTION_SUPPORTED     0x80000000UL</div><div class='add'>+	u8	max_schqs;</div><div class='add'>+	u8	mpc_chnls_cap;</div><div class='add'>+	#define FUNC_QCAPS_RESP_MPC_CHNLS_CAP_TCE         0x1UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_MPC_CHNLS_CAP_RCE         0x2UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_MPC_CHNLS_CAP_TE_CFA      0x4UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_MPC_CHNLS_CAP_RE_CFA      0x8UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_MPC_CHNLS_CAP_PRIMATE     0x10UL</div><div class='add'>+	__le16	max_key_ctxs_alloc;</div><div class='add'>+	__le32	flags_ext2;</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_RX_ALL_PKTS_TIMESTAMPS_SUPPORTED      0x1UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_QUIC_SUPPORTED                        0x2UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_KDNET_SUPPORTED                       0x4UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_DBR_PACING_EXT_SUPPORTED              0x8UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_SW_DBR_DROP_RECOVERY_SUPPORTED        0x10UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_GENERIC_STATS_SUPPORTED               0x20UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_UDP_GSO_SUPPORTED                     0x40UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_SYNCE_SUPPORTED                       0x80UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_DBR_PACING_V0_SUPPORTED               0x100UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_TX_PKT_TS_CMPL_SUPPORTED              0x200UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_HW_LAG_SUPPORTED                      0x400UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_ON_CHIP_CTX_SUPPORTED                 0x800UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_STEERING_TAG_SUPPORTED                0x1000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_ENHANCED_VF_SCALE_SUPPORTED           0x2000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_KEY_XID_PARTITION_SUPPORTED           0x4000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_CONCURRENT_KTLS_QUIC_SUPPORTED        0x8000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_SCHQ_CROSS_TC_CAP_SUPPORTED           0x10000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_SCHQ_PER_TC_CAP_SUPPORTED             0x20000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_SCHQ_PER_TC_RESERVATION_SUPPORTED     0x40000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_DB_ERROR_STATS_SUPPORTED              0x80000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_ROCE_VF_RESOURCE_MGMT_SUPPORTED       0x100000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_UDCC_SUPPORTED                        0x200000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_TIMED_TX_SO_TXTIME_SUPPORTED          0x400000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_SW_MAX_RESOURCE_LIMITS_SUPPORTED      0x800000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_TF_INGRESS_NIC_FLOW_SUPPORTED         0x1000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_LPBK_STATS_SUPPORTED                  0x2000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_TF_EGRESS_NIC_FLOW_SUPPORTED          0x4000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_MULTI_LOSSLESS_QUEUES_SUPPORTED       0x8000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_PEER_MMAP_SUPPORTED                   0x10000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_TIMED_TX_PACING_SUPPORTED             0x20000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_VF_STAT_EJECTION_SUPPORTED            0x40000000UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT2_HOST_COREDUMP_SUPPORTED               0x80000000UL</div><div class='add'>+	__le16	tunnel_disable_flag;</div><div class='add'>+	#define FUNC_QCAPS_RESP_TUNNEL_DISABLE_FLAG_DISABLE_VXLAN      0x1UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_TUNNEL_DISABLE_FLAG_DISABLE_NGE        0x2UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_TUNNEL_DISABLE_FLAG_DISABLE_NVGRE      0x4UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_TUNNEL_DISABLE_FLAG_DISABLE_L2GRE      0x8UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_TUNNEL_DISABLE_FLAG_DISABLE_GRE        0x10UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_TUNNEL_DISABLE_FLAG_DISABLE_IPINIP     0x20UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_TUNNEL_DISABLE_FLAG_DISABLE_MPLS       0x40UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_TUNNEL_DISABLE_FLAG_DISABLE_PPPOE      0x80UL</div><div class='add'>+	__le16	xid_partition_cap;</div><div class='add'>+	#define FUNC_QCAPS_RESP_XID_PARTITION_CAP_TX_CK     0x1UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_XID_PARTITION_CAP_RX_CK     0x2UL</div><div class='add'>+	u8	device_serial_number[8];</div><div class='add'>+	__le16	ctxs_per_partition;</div><div class='add'>+	__le16	max_tso_segs;</div><div class='add'>+	__le32	roce_vf_max_av;</div><div class='add'>+	__le32	roce_vf_max_cq;</div><div class='add'>+	__le32	roce_vf_max_mrw;</div><div class='add'>+	__le32	roce_vf_max_qp;</div><div class='add'>+	__le32	roce_vf_max_srq;</div><div class='add'>+	__le32	roce_vf_max_gid;</div><div class='add'>+	__le32	flags_ext3;</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_RM_RSV_WHILE_ALLOC_CAP            0x1UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_REQUIRE_L2_FILTER                 0x2UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_MAX_ROCE_VFS_SUPPORTED            0x4UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_RX_RATE_PROFILE_SEL_SUPPORTED     0x8UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_BIDI_OPT_SUPPORTED                0x10UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_MIRROR_ON_ROCE_SUPPORTED          0x20UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_ROCE_VF_DYN_ALLOC_SUPPORT         0x40UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_CHANGE_UDP_SRCPORT_SUPPORT        0x80UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_PCIE_COMPLIANCE_SUPPORTED         0x100UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_MULTI_L2_DB_SUPPORTED             0x200UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_PCIE_SECURE_ATS_SUPPORTED         0x400UL</div><div class='add'>+	#define FUNC_QCAPS_RESP_FLAGS_EXT3_MBUF_STATS_SUPPORTED              0x800UL</div><div class='add'>+	__le16	max_roce_vfs;</div><div class='add'>+	__le16	max_crypto_rx_flow_filters;</div><div class='add'>+	u8	unused_3[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_qcfg_output (size:1408b/176B) */</div><div class='add'>+struct hwrm_func_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	__le16	vlan;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_OOB_WOL_MAGICPKT_ENABLED     0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_OOB_WOL_BMP_ENABLED          0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_FW_DCBX_AGENT_ENABLED        0x4UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_STD_TX_RING_MODE_ENABLED     0x8UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_FW_LLDP_AGENT_ENABLED        0x10UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_MULTI_HOST                   0x20UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_TRUSTED_VF                   0x40UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_SECURE_MODE_ENABLED          0x80UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_PREBOOT_LEGACY_L2_RINGS      0x100UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_HOT_RESET_ALLOWED            0x200UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_PPP_PUSH_MODE_ENABLED        0x400UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_RING_MONITOR_ENABLED         0x800UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_FAST_RESET_ALLOWED           0x1000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_MULTI_ROOT                   0x2000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_ENABLE_RDMA_SRIOV            0x4000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS_ROCE_VNIC_ID_VALID           0x8000UL</div><div class='add'>+	u8	mac_address[6];</div><div class='add'>+	__le16	pci_id;</div><div class='add'>+	__le16	alloc_rsscos_ctx;</div><div class='add'>+	__le16	alloc_cmpl_rings;</div><div class='add'>+	__le16	alloc_tx_rings;</div><div class='add'>+	__le16	alloc_rx_rings;</div><div class='add'>+	__le16	alloc_l2_ctx;</div><div class='add'>+	__le16	alloc_vnics;</div><div class='add'>+	__le16	admin_mtu;</div><div class='add'>+	__le16	mru;</div><div class='add'>+	__le16	stat_ctx_id;</div><div class='add'>+	u8	port_partition_type;</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_SPF     0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_MPFS    0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR1_0 0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR1_5 0x3UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR2_0 0x4UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR1_2 0x5UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_UNKNOWN 0xffUL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_LAST   FUNC_QCFG_RESP_PORT_PARTITION_TYPE_UNKNOWN</div><div class='add'>+	u8	port_pf_cnt;</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PF_CNT_UNAVAIL 0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_PF_CNT_LAST   FUNC_QCFG_RESP_PORT_PF_CNT_UNAVAIL</div><div class='add'>+	__le16	dflt_vnic_id;</div><div class='add'>+	__le16	max_mtu_configured;</div><div class='add'>+	__le32	min_bw;</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_SCALE_LAST                 FUNC_QCFG_RESP_MIN_BW_SCALE_BYTES</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_LAST         FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	__le32	max_bw;</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_SCALE_LAST                 FUNC_QCFG_RESP_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_LAST         FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	u8	evb_mode;</div><div class='add'>+	#define FUNC_QCFG_RESP_EVB_MODE_NO_EVB 0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_EVB_MODE_VEB    0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_EVB_MODE_VEPA   0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_EVB_MODE_LAST  FUNC_QCFG_RESP_EVB_MODE_VEPA</div><div class='add'>+	u8	options;</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_MASK         0x3UL</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_SFT          0</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_SIZE_64        0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_SIZE_128       0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_LAST          FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_SIZE_128</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_MASK       0xcUL</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_SFT        2</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_FORCED_DOWN  (0x0UL &lt;&lt; 2)</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_FORCED_UP    (0x1UL &lt;&lt; 2)</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_AUTO         (0x2UL &lt;&lt; 2)</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_LAST        FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_AUTO</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_RSVD_MASK                   0xf0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_OPTIONS_RSVD_SFT                    4</div><div class='add'>+	__le16	alloc_vfs;</div><div class='add'>+	__le32	alloc_mcast_filters;</div><div class='add'>+	__le32	alloc_hw_ring_grps;</div><div class='add'>+	__le16	alloc_sp_tx_rings;</div><div class='add'>+	__le16	alloc_stat_ctx;</div><div class='add'>+	__le16	alloc_msix;</div><div class='add'>+	__le16	registered_vfs;</div><div class='add'>+	__le16	l2_doorbell_bar_size_kb;</div><div class='add'>+	u8	active_endpoints;</div><div class='add'>+	u8	always_1;</div><div class='add'>+	__le32	reset_addr_poll;</div><div class='add'>+	__le16	legacy_l2_db_size_kb;</div><div class='add'>+	__le16	svif_info;</div><div class='add'>+	#define FUNC_QCFG_RESP_SVIF_INFO_SVIF_MASK      0x7fffUL</div><div class='add'>+	#define FUNC_QCFG_RESP_SVIF_INFO_SVIF_SFT       0</div><div class='add'>+	#define FUNC_QCFG_RESP_SVIF_INFO_SVIF_VALID     0x8000UL</div><div class='add'>+	u8	mpc_chnls;</div><div class='add'>+	#define FUNC_QCFG_RESP_MPC_CHNLS_TCE_ENABLED         0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MPC_CHNLS_RCE_ENABLED         0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MPC_CHNLS_TE_CFA_ENABLED      0x4UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MPC_CHNLS_RE_CFA_ENABLED      0x8UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MPC_CHNLS_PRIMATE_ENABLED     0x10UL</div><div class='add'>+	u8	db_page_size;</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_4KB   0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_8KB   0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_16KB  0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_32KB  0x3UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_64KB  0x4UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_128KB 0x5UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_256KB 0x6UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_512KB 0x7UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_1MB   0x8UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_2MB   0x9UL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_4MB   0xaUL</div><div class='add'>+	#define FUNC_QCFG_RESP_DB_PAGE_SIZE_LAST FUNC_QCFG_RESP_DB_PAGE_SIZE_4MB</div><div class='add'>+	__le16	roce_vnic_id;</div><div class='add'>+	__le32	partition_min_bw;</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_SCALE_LAST                 FUNC_QCFG_RESP_PARTITION_MIN_BW_SCALE_BYTES</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MIN_BW_BW_VALUE_UNIT_LAST         FUNC_QCFG_RESP_PARTITION_MIN_BW_BW_VALUE_UNIT_PERCENT1_100</div><div class='add'>+	__le32	partition_max_bw;</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_SCALE_LAST                 FUNC_QCFG_RESP_PARTITION_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_QCFG_RESP_PARTITION_MAX_BW_BW_VALUE_UNIT_LAST         FUNC_QCFG_RESP_PARTITION_MAX_BW_BW_VALUE_UNIT_PERCENT1_100</div><div class='add'>+	__le16	host_mtu;</div><div class='add'>+	__le16	flags2;</div><div class='add'>+	#define FUNC_QCFG_RESP_FLAGS2_SRIOV_DSCP_INSERT_ENABLED     0x1UL</div><div class='add'>+	__le16	stag_vid;</div><div class='add'>+	u8	port_kdnet_mode;</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_KDNET_MODE_DISABLED 0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_KDNET_MODE_ENABLED  0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_PORT_KDNET_MODE_LAST    FUNC_QCFG_RESP_PORT_KDNET_MODE_ENABLED</div><div class='add'>+	u8	kdnet_pcie_function;</div><div class='add'>+	__le16	port_kdnet_fid;</div><div class='add'>+	u8	unused_5;</div><div class='add'>+	u8	roce_bidi_opt_mode;</div><div class='add'>+	#define FUNC_QCFG_RESP_ROCE_BIDI_OPT_MODE_DISABLED      0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_ROCE_BIDI_OPT_MODE_DEDICATED     0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_ROCE_BIDI_OPT_MODE_SHARED        0x4UL</div><div class='add'>+	__le32	num_ktls_tx_key_ctxs;</div><div class='add'>+	__le32	num_ktls_rx_key_ctxs;</div><div class='add'>+	u8	lag_id;</div><div class='add'>+	u8	parif;</div><div class='add'>+	u8	fw_lag_id;</div><div class='add'>+	u8	unused_6;</div><div class='add'>+	__le32	num_quic_tx_key_ctxs;</div><div class='add'>+	__le32	num_quic_rx_key_ctxs;</div><div class='add'>+	__le32	roce_max_av_per_vf;</div><div class='add'>+	__le32	roce_max_cq_per_vf;</div><div class='add'>+	__le32	roce_max_mrw_per_vf;</div><div class='add'>+	__le32	roce_max_qp_per_vf;</div><div class='add'>+	__le32	roce_max_srq_per_vf;</div><div class='add'>+	__le32	roce_max_gid_per_vf;</div><div class='add'>+	__le16	xid_partition_cfg;</div><div class='add'>+	#define FUNC_QCFG_RESP_XID_PARTITION_CFG_TX_CK     0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_XID_PARTITION_CFG_RX_CK     0x2UL</div><div class='add'>+	__le16	mirror_vnic_id;</div><div class='add'>+	u8	max_link_width;</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_UNKNOWN 0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X1      0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X2      0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X4      0x4UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X8      0x8UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X16     0x10UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_LAST   FUNC_QCFG_RESP_MAX_LINK_WIDTH_X16</div><div class='add'>+	u8	max_link_speed;</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_SPEED_UNKNOWN 0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G1      0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G2      0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G3      0x3UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G4      0x4UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G5      0x5UL</div><div class='add'>+	#define FUNC_QCFG_RESP_MAX_LINK_SPEED_LAST   FUNC_QCFG_RESP_MAX_LINK_SPEED_G5</div><div class='add'>+	u8	negotiated_link_width;</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_UNKNOWN 0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X1      0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X2      0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X4      0x4UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X8      0x8UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X16     0x10UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_LAST   FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X16</div><div class='add'>+	u8	negotiated_link_speed;</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_UNKNOWN 0x0UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G1      0x1UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G2      0x2UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G3      0x3UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G4      0x4UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G5      0x5UL</div><div class='add'>+	#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_LAST   FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G5</div><div class='add'>+	u8	unused_7[2];</div><div class='add'>+	u8	pcie_compliance;</div><div class='add'>+	u8	unused_8;</div><div class='add'>+	__le16	l2_db_multi_page_size_kb;</div><div class='add'>+	u8	unused_9[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_cfg_input (size:1280b/160B) */</div><div class='add'>+struct hwrm_func_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	__le16	num_msix;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE     0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE      0x2UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_RSVD_MASK                      0x1fcUL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_RSVD_SFT                       2</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_STD_TX_RING_MODE_ENABLE        0x200UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_STD_TX_RING_MODE_DISABLE       0x400UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_VIRT_MAC_PERSIST               0x800UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_NO_AUTOCLEAR_STATISTIC         0x1000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_TX_ASSETS_TEST                 0x2000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_RX_ASSETS_TEST                 0x4000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_CMPL_ASSETS_TEST               0x8000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST         0x10000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_RING_GRP_ASSETS_TEST           0x20000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_STAT_CTX_ASSETS_TEST           0x40000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_VNIC_ASSETS_TEST               0x80000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_L2_CTX_ASSETS_TEST             0x100000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_TRUSTED_VF_ENABLE              0x200000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_DYNAMIC_TX_RING_ALLOC          0x400000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_NQ_ASSETS_TEST                 0x800000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_TRUSTED_VF_DISABLE             0x1000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_PREBOOT_LEGACY_L2_RINGS        0x2000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_HOT_RESET_IF_EN_DIS            0x4000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_PPP_PUSH_MODE_ENABLE           0x8000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_PPP_PUSH_MODE_DISABLE          0x10000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_BD_METADATA_ENABLE             0x20000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS_BD_METADATA_DISABLE            0x40000000UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_ADMIN_MTU                0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_MRU                      0x2UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS          0x4UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS           0x8UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_TX_RINGS             0x10UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_RX_RINGS             0x20UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_L2_CTXS              0x40UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_VNICS                0x80UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS            0x100UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR            0x200UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_DFLT_VLAN                0x400UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_DFLT_IP_ADDR             0x800UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_MIN_BW                   0x1000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_MAX_BW                   0x2000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_ASYNC_EVENT_CR           0x4000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_VLAN_ANTISPOOF_MODE      0x8000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_ALLOWED_VLAN_PRIS        0x10000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_EVB_MODE                 0x20000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_MCAST_FILTERS        0x40000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS         0x80000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_CACHE_LINESIZE           0x100000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_NUM_MSIX                 0x200000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_ADMIN_LINK_STATE         0x400000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_HOT_RESET_IF_SUPPORT     0x800000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_SCHQ_ID                  0x1000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_MPC_CHNLS                0x2000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_PARTITION_MIN_BW         0x4000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_PARTITION_MAX_BW         0x8000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_TPID                     0x10000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_HOST_MTU                 0x20000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_KTLS_TX_KEY_CTXS         0x40000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES_KTLS_RX_KEY_CTXS         0x80000000UL</div><div class='add'>+	__le16	admin_mtu;</div><div class='add'>+	__le16	mru;</div><div class='add'>+	__le16	num_rsscos_ctxs;</div><div class='add'>+	__le16	num_cmpl_rings;</div><div class='add'>+	__le16	num_tx_rings;</div><div class='add'>+	__le16	num_rx_rings;</div><div class='add'>+	__le16	num_l2_ctxs;</div><div class='add'>+	__le16	num_vnics;</div><div class='add'>+	__le16	num_stat_ctxs;</div><div class='add'>+	__le16	num_hw_ring_grps;</div><div class='add'>+	u8	dflt_mac_addr[6];</div><div class='add'>+	__le16	dflt_vlan;</div><div class='add'>+	__be32	dflt_ip_addr[4];</div><div class='add'>+	__le32	min_bw;</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_SCALE_LAST                 FUNC_CFG_REQ_MIN_BW_SCALE_BYTES</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_LAST         FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	__le32	max_bw;</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_SCALE_LAST                 FUNC_CFG_REQ_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_LAST         FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	__le16	async_event_cr;</div><div class='add'>+	u8	vlan_antispoof_mode;</div><div class='add'>+	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_NOCHECK                 0x0UL</div><div class='add'>+	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_VALIDATE_VLAN           0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_INSERT_IF_VLANDNE       0x2UL</div><div class='add'>+	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_INSERT_OR_OVERRIDE_VLAN 0x3UL</div><div class='add'>+	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_LAST                   FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_INSERT_OR_OVERRIDE_VLAN</div><div class='add'>+	u8	allowed_vlan_pris;</div><div class='add'>+	u8	evb_mode;</div><div class='add'>+	#define FUNC_CFG_REQ_EVB_MODE_NO_EVB 0x0UL</div><div class='add'>+	#define FUNC_CFG_REQ_EVB_MODE_VEB    0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_EVB_MODE_VEPA   0x2UL</div><div class='add'>+	#define FUNC_CFG_REQ_EVB_MODE_LAST  FUNC_CFG_REQ_EVB_MODE_VEPA</div><div class='add'>+	u8	options;</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_MASK         0x3UL</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SFT          0</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_64        0x0UL</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_128       0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_LAST          FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_128</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_MASK       0xcUL</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_SFT        2</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_FORCED_DOWN  (0x0UL &lt;&lt; 2)</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_FORCED_UP    (0x1UL &lt;&lt; 2)</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_AUTO         (0x2UL &lt;&lt; 2)</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_LAST        FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_AUTO</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_RSVD_MASK                   0xf0UL</div><div class='add'>+	#define FUNC_CFG_REQ_OPTIONS_RSVD_SFT                    4</div><div class='add'>+	__le16	num_mcast_filters;</div><div class='add'>+	__le16	schq_id;</div><div class='add'>+	__le16	mpc_chnls;</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_TCE_ENABLE          0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_TCE_DISABLE         0x2UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_RCE_ENABLE          0x4UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_RCE_DISABLE         0x8UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_TE_CFA_ENABLE       0x10UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_TE_CFA_DISABLE      0x20UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_RE_CFA_ENABLE       0x40UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_RE_CFA_DISABLE      0x80UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_PRIMATE_ENABLE      0x100UL</div><div class='add'>+	#define FUNC_CFG_REQ_MPC_CHNLS_PRIMATE_DISABLE     0x200UL</div><div class='add'>+	__le32	partition_min_bw;</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_SCALE_LAST                 FUNC_CFG_REQ_PARTITION_MIN_BW_SCALE_BYTES</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MIN_BW_BW_VALUE_UNIT_LAST         FUNC_CFG_REQ_PARTITION_MIN_BW_BW_VALUE_UNIT_PERCENT1_100</div><div class='add'>+	__le32	partition_max_bw;</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_SCALE_LAST                 FUNC_CFG_REQ_PARTITION_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define FUNC_CFG_REQ_PARTITION_MAX_BW_BW_VALUE_UNIT_LAST         FUNC_CFG_REQ_PARTITION_MAX_BW_BW_VALUE_UNIT_PERCENT1_100</div><div class='add'>+	__be16	tpid;</div><div class='add'>+	__le16	host_mtu;</div><div class='add'>+	__le32	flags2;</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS2_KTLS_KEY_CTX_ASSETS_TEST     0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_FLAGS2_QUIC_KEY_CTX_ASSETS_TEST     0x2UL</div><div class='add'>+	__le32	enables2;</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_KDNET                    0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_DB_PAGE_SIZE             0x2UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_QUIC_TX_KEY_CTXS         0x4UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_QUIC_RX_KEY_CTXS         0x8UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_ROCE_MAX_AV_PER_VF       0x10UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_ROCE_MAX_CQ_PER_VF       0x20UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_ROCE_MAX_MRW_PER_VF      0x40UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_ROCE_MAX_QP_PER_VF       0x80UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_ROCE_MAX_SRQ_PER_VF      0x100UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_ROCE_MAX_GID_PER_VF      0x200UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_XID_PARTITION_CFG        0x400UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_PHYSICAL_SLOT_NUMBER     0x800UL</div><div class='add'>+	#define FUNC_CFG_REQ_ENABLES2_PCIE_COMPLIANCE          0x1000UL</div><div class='add'>+	u8	port_kdnet_mode;</div><div class='add'>+	#define FUNC_CFG_REQ_PORT_KDNET_MODE_DISABLED 0x0UL</div><div class='add'>+	#define FUNC_CFG_REQ_PORT_KDNET_MODE_ENABLED  0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_PORT_KDNET_MODE_LAST    FUNC_CFG_REQ_PORT_KDNET_MODE_ENABLED</div><div class='add'>+	u8	db_page_size;</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_4KB   0x0UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_8KB   0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_16KB  0x2UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_32KB  0x3UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_64KB  0x4UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_128KB 0x5UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_256KB 0x6UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_512KB 0x7UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_1MB   0x8UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_2MB   0x9UL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_4MB   0xaUL</div><div class='add'>+	#define FUNC_CFG_REQ_DB_PAGE_SIZE_LAST FUNC_CFG_REQ_DB_PAGE_SIZE_4MB</div><div class='add'>+	__le16	physical_slot_number;</div><div class='add'>+	__le32	num_ktls_tx_key_ctxs;</div><div class='add'>+	__le32	num_ktls_rx_key_ctxs;</div><div class='add'>+	__le32	num_quic_tx_key_ctxs;</div><div class='add'>+	__le32	num_quic_rx_key_ctxs;</div><div class='add'>+	__le32	roce_max_av_per_vf;</div><div class='add'>+	__le32	roce_max_cq_per_vf;</div><div class='add'>+	__le32	roce_max_mrw_per_vf;</div><div class='add'>+	__le32	roce_max_qp_per_vf;</div><div class='add'>+	__le32	roce_max_srq_per_vf;</div><div class='add'>+	__le32	roce_max_gid_per_vf;</div><div class='add'>+	__le16	xid_partition_cfg;</div><div class='add'>+	#define FUNC_CFG_REQ_XID_PARTITION_CFG_TX_CK     0x1UL</div><div class='add'>+	#define FUNC_CFG_REQ_XID_PARTITION_CFG_RX_CK     0x2UL</div><div class='add'>+	u8	pcie_compliance;</div><div class='add'>+	u8	unused_2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_cfg_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_func_cfg_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_UNKNOWN                      0x0UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_PARTITION_BW_OUT_OF_RANGE    0x1UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_NPAR_PARTITION_DOWN_FAILED   0x2UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TPID_SET_DFLT_VLAN_NOT_SET   0x3UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RES_ARRAY_ALLOC_FAILED       0x4UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TX_RING_ASSET_TEST_FAILED    0x5UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TX_RING_RES_UPDATE_FAILED    0x6UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_APPLY_MAX_BW_FAILED          0x7UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_ENABLE_EVB_FAILED            0x8UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RSS_CTXT_ASSET_TEST_FAILED   0x9UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RSS_CTXT_RES_UPDATE_FAILED   0xaUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_CMPL_RING_ASSET_TEST_FAILED  0xbUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_CMPL_RING_RES_UPDATE_FAILED  0xcUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_NQ_ASSET_TEST_FAILED         0xdUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_NQ_RES_UPDATE_FAILED         0xeUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RX_RING_ASSET_TEST_FAILED    0xfUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RX_RING_RES_UPDATE_FAILED    0x10UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_VNIC_ASSET_TEST_FAILED       0x11UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_VNIC_RES_UPDATE_FAILED       0x12UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_FAILED_TO_START_STATS_THREAD 0x13UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RDMA_SRIOV_DISABLED          0x14UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TX_KTLS_DISABLED             0x15UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TX_KTLS_ASSET_TEST_FAILED    0x16UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TX_KTLS_RES_UPDATE_FAILED    0x17UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RX_KTLS_DISABLED             0x18UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RX_KTLS_ASSET_TEST_FAILED    0x19UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RX_KTLS_RES_UPDATE_FAILED    0x1aUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TX_QUIC_DISABLED             0x1bUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TX_QUIC_ASSET_TEST_FAILED    0x1cUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_TX_QUIC_RES_UPDATE_FAILED    0x1dUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RX_QUIC_DISABLED             0x1eUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RX_QUIC_ASSET_TEST_FAILED    0x1fUL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_RX_QUIC_RES_UPDATE_FAILED    0x20UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_INVALID_KDNET_MODE           0x21UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_SCHQ_CFG_FAIL                0x22UL</div><div class='add'>+	#define FUNC_CFG_CMD_ERR_CODE_LAST                        FUNC_CFG_CMD_ERR_CODE_SCHQ_CFG_FAIL</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_qstats_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_qstats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define FUNC_QSTATS_REQ_FLAGS_ROCE_ONLY        0x1UL</div><div class='add'>+	#define FUNC_QSTATS_REQ_FLAGS_COUNTER_MASK     0x2UL</div><div class='add'>+	#define FUNC_QSTATS_REQ_FLAGS_L2_ONLY          0x4UL</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_qstats_output (size:1408b/176B) */</div><div class='add'>+struct hwrm_func_qstats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	tx_ucast_pkts;</div><div class='add'>+	__le64	tx_mcast_pkts;</div><div class='add'>+	__le64	tx_bcast_pkts;</div><div class='add'>+	__le64	tx_discard_pkts;</div><div class='add'>+	__le64	tx_drop_pkts;</div><div class='add'>+	__le64	tx_ucast_bytes;</div><div class='add'>+	__le64	tx_mcast_bytes;</div><div class='add'>+	__le64	tx_bcast_bytes;</div><div class='add'>+	__le64	rx_ucast_pkts;</div><div class='add'>+	__le64	rx_mcast_pkts;</div><div class='add'>+	__le64	rx_bcast_pkts;</div><div class='add'>+	__le64	rx_discard_pkts;</div><div class='add'>+	__le64	rx_drop_pkts;</div><div class='add'>+	__le64	rx_ucast_bytes;</div><div class='add'>+	__le64	rx_mcast_bytes;</div><div class='add'>+	__le64	rx_bcast_bytes;</div><div class='add'>+	__le64	rx_agg_pkts;</div><div class='add'>+	__le64	rx_agg_bytes;</div><div class='add'>+	__le64	rx_agg_events;</div><div class='add'>+	__le64	rx_agg_aborts;</div><div class='add'>+	u8	clear_seq;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_qstats_ext_input (size:256b/32B) */</div><div class='add'>+struct hwrm_func_qstats_ext_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define FUNC_QSTATS_EXT_REQ_FLAGS_ROCE_ONLY        0x1UL</div><div class='add'>+	#define FUNC_QSTATS_EXT_REQ_FLAGS_COUNTER_MASK     0x2UL</div><div class='add'>+	u8	unused_0[1];</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_QSTATS_EXT_REQ_ENABLES_SCHQ_ID     0x1UL</div><div class='add'>+	__le16	schq_id;</div><div class='add'>+	__le16	traffic_class;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_qstats_ext_output (size:1536b/192B) */</div><div class='add'>+struct hwrm_func_qstats_ext_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	rx_ucast_pkts;</div><div class='add'>+	__le64	rx_mcast_pkts;</div><div class='add'>+	__le64	rx_bcast_pkts;</div><div class='add'>+	__le64	rx_discard_pkts;</div><div class='add'>+	__le64	rx_error_pkts;</div><div class='add'>+	__le64	rx_ucast_bytes;</div><div class='add'>+	__le64	rx_mcast_bytes;</div><div class='add'>+	__le64	rx_bcast_bytes;</div><div class='add'>+	__le64	tx_ucast_pkts;</div><div class='add'>+	__le64	tx_mcast_pkts;</div><div class='add'>+	__le64	tx_bcast_pkts;</div><div class='add'>+	__le64	tx_error_pkts;</div><div class='add'>+	__le64	tx_discard_pkts;</div><div class='add'>+	__le64	tx_ucast_bytes;</div><div class='add'>+	__le64	tx_mcast_bytes;</div><div class='add'>+	__le64	tx_bcast_bytes;</div><div class='add'>+	__le64	rx_tpa_eligible_pkt;</div><div class='add'>+	__le64	rx_tpa_eligible_bytes;</div><div class='add'>+	__le64	rx_tpa_pkt;</div><div class='add'>+	__le64	rx_tpa_bytes;</div><div class='add'>+	__le64	rx_tpa_errors;</div><div class='add'>+	__le64	rx_tpa_events;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_clr_stats_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_clr_stats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_clr_stats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_clr_stats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_resc_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_vf_resc_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	vf_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_resc_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_vf_resc_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_drv_rgtr_input (size:896b/112B) */</div><div class='add'>+struct hwrm_func_drv_rgtr_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_FWD_ALL_MODE                     0x1UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_FWD_NONE_MODE                    0x2UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_16BIT_VER_MODE                   0x4UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_FLOW_HANDLE_64BIT_MODE           0x8UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_HOT_RESET_SUPPORT                0x10UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_ERROR_RECOVERY_SUPPORT           0x20UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_MASTER_SUPPORT                   0x40UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_FAST_RESET_SUPPORT               0x80UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_RSS_STRICT_HASH_TYPE_SUPPORT     0x100UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_NPAR_1_2_SUPPORT                 0x200UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_ASYM_QUEUE_CFG_SUPPORT           0x400UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_TF_INGRESS_NIC_FLOW_MODE         0x800UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_FLAGS_TF_EGRESS_NIC_FLOW_MODE          0x1000UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_ENABLES_OS_TYPE             0x1UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_ENABLES_VER                 0x2UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_ENABLES_TIMESTAMP           0x4UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_ENABLES_VF_REQ_FWD          0x8UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_ENABLES_ASYNC_EVENT_FWD     0x10UL</div><div class='add'>+	__le16	os_type;</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_UNKNOWN   0x0UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_OTHER     0x1UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_MSDOS     0xeUL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_WINDOWS   0x12UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_SOLARIS   0x1dUL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_LINUX     0x24UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_FREEBSD   0x2aUL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_ESXI      0x68UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_WIN864    0x73UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_WIN2012R2 0x74UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_UEFI      0x8000UL</div><div class='add'>+	#define FUNC_DRV_RGTR_REQ_OS_TYPE_LAST     FUNC_DRV_RGTR_REQ_OS_TYPE_UEFI</div><div class='add'>+	u8	ver_maj_8b;</div><div class='add'>+	u8	ver_min_8b;</div><div class='add'>+	u8	ver_upd_8b;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	__le32	timestamp;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+	__le32	vf_req_fwd[8];</div><div class='add'>+	__le32	async_event_fwd[8];</div><div class='add'>+	__le16	ver_maj;</div><div class='add'>+	__le16	ver_min;</div><div class='add'>+	__le16	ver_upd;</div><div class='add'>+	__le16	ver_patch;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_drv_rgtr_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_drv_rgtr_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_DRV_RGTR_RESP_FLAGS_IF_CHANGE_SUPPORTED     0x1UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_drv_unrgtr_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_drv_unrgtr_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_DRV_UNRGTR_REQ_FLAGS_PREPARE_FOR_SHUTDOWN     0x1UL</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_drv_unrgtr_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_drv_unrgtr_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_buf_rgtr_input (size:1024b/128B) */</div><div class='add'>+struct hwrm_func_buf_rgtr_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_ENABLES_VF_ID            0x1UL</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_ENABLES_ERR_BUF_ADDR     0x2UL</div><div class='add'>+	__le16	vf_id;</div><div class='add'>+	__le16	req_buf_num_pages;</div><div class='add'>+	__le16	req_buf_page_size;</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_16B 0x4UL</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_4K  0xcUL</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_8K  0xdUL</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_64K 0x10UL</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_2M  0x15UL</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_4M  0x16UL</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_1G  0x1eUL</div><div class='add'>+	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_LAST FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_1G</div><div class='add'>+	__le16	req_buf_len;</div><div class='add'>+	__le16	resp_buf_len;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le64	req_buf_page_addr0;</div><div class='add'>+	__le64	req_buf_page_addr1;</div><div class='add'>+	__le64	req_buf_page_addr2;</div><div class='add'>+	__le64	req_buf_page_addr3;</div><div class='add'>+	__le64	req_buf_page_addr4;</div><div class='add'>+	__le64	req_buf_page_addr5;</div><div class='add'>+	__le64	req_buf_page_addr6;</div><div class='add'>+	__le64	req_buf_page_addr7;</div><div class='add'>+	__le64	req_buf_page_addr8;</div><div class='add'>+	__le64	req_buf_page_addr9;</div><div class='add'>+	__le64	error_buf_addr;</div><div class='add'>+	__le64	resp_buf_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_buf_rgtr_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_buf_rgtr_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_drv_qver_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_drv_qver_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	reserved;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	driver_type;</div><div class='add'>+	#define FUNC_DRV_QVER_REQ_DRIVER_TYPE_L2   0x0UL</div><div class='add'>+	#define FUNC_DRV_QVER_REQ_DRIVER_TYPE_ROCE 0x1UL</div><div class='add'>+	#define FUNC_DRV_QVER_REQ_DRIVER_TYPE_LAST FUNC_DRV_QVER_REQ_DRIVER_TYPE_ROCE</div><div class='add'>+	u8	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_drv_qver_output (size:256b/32B) */</div><div class='add'>+struct hwrm_func_drv_qver_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	os_type;</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_UNKNOWN   0x0UL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_OTHER     0x1UL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_MSDOS     0xeUL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_WINDOWS   0x12UL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_SOLARIS   0x1dUL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_LINUX     0x24UL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_FREEBSD   0x2aUL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_ESXI      0x68UL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_WIN864    0x73UL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_WIN2012R2 0x74UL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_UEFI      0x8000UL</div><div class='add'>+	#define FUNC_DRV_QVER_RESP_OS_TYPE_LAST     FUNC_DRV_QVER_RESP_OS_TYPE_UEFI</div><div class='add'>+	u8	ver_maj_8b;</div><div class='add'>+	u8	ver_min_8b;</div><div class='add'>+	u8	ver_upd_8b;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	__le16	ver_maj;</div><div class='add'>+	__le16	ver_min;</div><div class='add'>+	__le16	ver_upd;</div><div class='add'>+	__le16	ver_patch;</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_resource_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_resource_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_resource_qcaps_output (size:704b/88B) */</div><div class='add'>+struct hwrm_func_resource_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	max_vfs;</div><div class='add'>+	__le16	max_msix;</div><div class='add'>+	__le16	vf_reservation_strategy;</div><div class='add'>+	#define FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_MAXIMAL        0x0UL</div><div class='add'>+	#define FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_MINIMAL        0x1UL</div><div class='add'>+	#define FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_MINIMAL_STATIC 0x2UL</div><div class='add'>+	#define FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_LAST          FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_MINIMAL_STATIC</div><div class='add'>+	__le16	min_rsscos_ctx;</div><div class='add'>+	__le16	max_rsscos_ctx;</div><div class='add'>+	__le16	min_cmpl_rings;</div><div class='add'>+	__le16	max_cmpl_rings;</div><div class='add'>+	__le16	min_tx_rings;</div><div class='add'>+	__le16	max_tx_rings;</div><div class='add'>+	__le16	min_rx_rings;</div><div class='add'>+	__le16	max_rx_rings;</div><div class='add'>+	__le16	min_l2_ctxs;</div><div class='add'>+	__le16	max_l2_ctxs;</div><div class='add'>+	__le16	min_vnics;</div><div class='add'>+	__le16	max_vnics;</div><div class='add'>+	__le16	min_stat_ctx;</div><div class='add'>+	__le16	max_stat_ctx;</div><div class='add'>+	__le16	min_hw_ring_grps;</div><div class='add'>+	__le16	max_hw_ring_grps;</div><div class='add'>+	__le16	max_tx_scheduler_inputs;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define FUNC_RESOURCE_QCAPS_RESP_FLAGS_MIN_GUARANTEED     0x1UL</div><div class='add'>+	__le16	min_msix;</div><div class='add'>+	__le32	min_ktls_tx_key_ctxs;</div><div class='add'>+	__le32	max_ktls_tx_key_ctxs;</div><div class='add'>+	__le32	min_ktls_rx_key_ctxs;</div><div class='add'>+	__le32	max_ktls_rx_key_ctxs;</div><div class='add'>+	__le32	min_quic_tx_key_ctxs;</div><div class='add'>+	__le32	max_quic_tx_key_ctxs;</div><div class='add'>+	__le32	min_quic_rx_key_ctxs;</div><div class='add'>+	__le32	max_quic_rx_key_ctxs;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_resource_cfg_input (size:704b/88B) */</div><div class='add'>+struct hwrm_func_vf_resource_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	vf_id;</div><div class='add'>+	__le16	max_msix;</div><div class='add'>+	__le16	min_rsscos_ctx;</div><div class='add'>+	__le16	max_rsscos_ctx;</div><div class='add'>+	__le16	min_cmpl_rings;</div><div class='add'>+	__le16	max_cmpl_rings;</div><div class='add'>+	__le16	min_tx_rings;</div><div class='add'>+	__le16	max_tx_rings;</div><div class='add'>+	__le16	min_rx_rings;</div><div class='add'>+	__le16	max_rx_rings;</div><div class='add'>+	__le16	min_l2_ctxs;</div><div class='add'>+	__le16	max_l2_ctxs;</div><div class='add'>+	__le16	min_vnics;</div><div class='add'>+	__le16	max_vnics;</div><div class='add'>+	__le16	min_stat_ctx;</div><div class='add'>+	__le16	max_stat_ctx;</div><div class='add'>+	__le16	min_hw_ring_grps;</div><div class='add'>+	__le16	max_hw_ring_grps;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define FUNC_VF_RESOURCE_CFG_REQ_FLAGS_MIN_GUARANTEED     0x1UL</div><div class='add'>+	__le16	min_msix;</div><div class='add'>+	__le32	min_ktls_tx_key_ctxs;</div><div class='add'>+	__le32	max_ktls_tx_key_ctxs;</div><div class='add'>+	__le32	min_ktls_rx_key_ctxs;</div><div class='add'>+	__le32	max_ktls_rx_key_ctxs;</div><div class='add'>+	__le32	min_quic_tx_key_ctxs;</div><div class='add'>+	__le32	max_quic_tx_key_ctxs;</div><div class='add'>+	__le32	min_quic_rx_key_ctxs;</div><div class='add'>+	__le32	max_quic_rx_key_ctxs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_vf_resource_cfg_output (size:384b/48B) */</div><div class='add'>+struct hwrm_func_vf_resource_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	reserved_rsscos_ctx;</div><div class='add'>+	__le16	reserved_cmpl_rings;</div><div class='add'>+	__le16	reserved_tx_rings;</div><div class='add'>+	__le16	reserved_rx_rings;</div><div class='add'>+	__le16	reserved_l2_ctxs;</div><div class='add'>+	__le16	reserved_vnics;</div><div class='add'>+	__le16	reserved_stat_ctx;</div><div class='add'>+	__le16	reserved_hw_ring_grps;</div><div class='add'>+	__le32	reserved_ktls_tx_key_ctxs;</div><div class='add'>+	__le32	reserved_ktls_rx_key_ctxs;</div><div class='add'>+	__le32	reserved_quic_tx_key_ctxs;</div><div class='add'>+	__le32	reserved_quic_rx_key_ctxs;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_qcaps_input (size:128b/16B) */</div><div class='add'>+struct hwrm_func_backing_store_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_qcaps_output (size:832b/104B) */</div><div class='add'>+struct hwrm_func_backing_store_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	qp_max_entries;</div><div class='add'>+	__le16	qp_min_qp1_entries;</div><div class='add'>+	__le16	qp_max_l2_entries;</div><div class='add'>+	__le16	qp_entry_size;</div><div class='add'>+	__le16	srq_max_l2_entries;</div><div class='add'>+	__le32	srq_max_entries;</div><div class='add'>+	__le16	srq_entry_size;</div><div class='add'>+	__le16	cq_max_l2_entries;</div><div class='add'>+	__le32	cq_max_entries;</div><div class='add'>+	__le16	cq_entry_size;</div><div class='add'>+	__le16	vnic_max_vnic_entries;</div><div class='add'>+	__le16	vnic_max_ring_table_entries;</div><div class='add'>+	__le16	vnic_entry_size;</div><div class='add'>+	__le32	stat_max_entries;</div><div class='add'>+	__le16	stat_entry_size;</div><div class='add'>+	__le16	tqm_entry_size;</div><div class='add'>+	__le32	tqm_min_entries_per_ring;</div><div class='add'>+	__le32	tqm_max_entries_per_ring;</div><div class='add'>+	__le32	mrav_max_entries;</div><div class='add'>+	__le16	mrav_entry_size;</div><div class='add'>+	__le16	tim_entry_size;</div><div class='add'>+	__le32	tim_max_entries;</div><div class='add'>+	__le16	mrav_num_entries_units;</div><div class='add'>+	u8	tqm_entries_multiple;</div><div class='add'>+	u8	ctx_kind_initializer;</div><div class='add'>+	__le16	ctx_init_mask;</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_RESP_CTX_INIT_MASK_QP       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_RESP_CTX_INIT_MASK_SRQ      0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_RESP_CTX_INIT_MASK_CQ       0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_RESP_CTX_INIT_MASK_VNIC     0x8UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_RESP_CTX_INIT_MASK_STAT     0x10UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_RESP_CTX_INIT_MASK_MRAV     0x20UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_RESP_CTX_INIT_MASK_TKC      0x40UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_RESP_CTX_INIT_MASK_RKC      0x80UL</div><div class='add'>+	u8	qp_init_offset;</div><div class='add'>+	u8	srq_init_offset;</div><div class='add'>+	u8	cq_init_offset;</div><div class='add'>+	u8	vnic_init_offset;</div><div class='add'>+	u8	tqm_fp_rings_count;</div><div class='add'>+	u8	stat_init_offset;</div><div class='add'>+	u8	mrav_init_offset;</div><div class='add'>+	u8	tqm_fp_rings_count_ext;</div><div class='add'>+	u8	tkc_init_offset;</div><div class='add'>+	u8	rkc_init_offset;</div><div class='add'>+	__le16	tkc_entry_size;</div><div class='add'>+	__le16	rkc_entry_size;</div><div class='add'>+	__le32	tkc_max_entries;</div><div class='add'>+	__le32	rkc_max_entries;</div><div class='add'>+	__le16	fast_qpmd_qp_num_entries;</div><div class='add'>+	u8	rsvd1[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* tqm_fp_ring_cfg (size:128b/16B) */</div><div class='add'>+struct tqm_fp_ring_cfg {</div><div class='add'>+	u8	tqm_ring_pg_size_tqm_ring_lvl;</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_LVL_MASK      0xfUL</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_LVL_SFT       0</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_LVL_LVL_0       0x0UL</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_LVL_LVL_1       0x1UL</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_LVL_LVL_2       0x2UL</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_LVL_LAST       TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_LVL_LVL_2</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_SFT   4</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_LAST   TQM_FP_RING_CFG_TQM_RING_CFG_TQM_RING_PG_SIZE_PG_1G</div><div class='add'>+	u8	unused[3];</div><div class='add'>+	__le32	tqm_ring_num_entries;</div><div class='add'>+	__le64	tqm_ring_page_dir;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_cfg_input (size:2688b/336B) */</div><div class='add'>+struct hwrm_func_backing_store_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_FLAGS_PREBOOT_MODE               0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_FLAGS_MRAV_RESERVATION_SPLIT     0x2UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP               0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_SRQ              0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_CQ               0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_VNIC             0x8UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_STAT             0x10UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_SP           0x20UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING0        0x40UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING1        0x80UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING2        0x100UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING3        0x200UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING4        0x400UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING5        0x800UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING6        0x1000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING7        0x2000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV             0x4000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM              0x8000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING8        0x10000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING9        0x20000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING10       0x40000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TKC              0x80000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_RKC              0x100000UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP_FAST_QPMD     0x200000UL</div><div class='add'>+	u8	qpc_pg_size_qpc_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_1G</div><div class='add'>+	u8	srq_pg_size_srq_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_1G</div><div class='add'>+	u8	cq_pg_size_cq_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_1G</div><div class='add'>+	u8	vnic_pg_size_vnic_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_1G</div><div class='add'>+	u8	stat_pg_size_stat_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_sp_pg_size_tqm_sp_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_ring0_pg_size_tqm_ring0_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_ring1_pg_size_tqm_ring1_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_ring2_pg_size_tqm_ring2_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_ring3_pg_size_tqm_ring3_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_ring4_pg_size_tqm_ring4_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_ring5_pg_size_tqm_ring5_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_ring6_pg_size_tqm_ring6_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_1G</div><div class='add'>+	u8	tqm_ring7_pg_size_tqm_ring7_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_1G</div><div class='add'>+	u8	mrav_pg_size_mrav_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_1G</div><div class='add'>+	u8	tim_pg_size_tim_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_1G</div><div class='add'>+	__le64	qpc_page_dir;</div><div class='add'>+	__le64	srq_page_dir;</div><div class='add'>+	__le64	cq_page_dir;</div><div class='add'>+	__le64	vnic_page_dir;</div><div class='add'>+	__le64	stat_page_dir;</div><div class='add'>+	__le64	tqm_sp_page_dir;</div><div class='add'>+	__le64	tqm_ring0_page_dir;</div><div class='add'>+	__le64	tqm_ring1_page_dir;</div><div class='add'>+	__le64	tqm_ring2_page_dir;</div><div class='add'>+	__le64	tqm_ring3_page_dir;</div><div class='add'>+	__le64	tqm_ring4_page_dir;</div><div class='add'>+	__le64	tqm_ring5_page_dir;</div><div class='add'>+	__le64	tqm_ring6_page_dir;</div><div class='add'>+	__le64	tqm_ring7_page_dir;</div><div class='add'>+	__le64	mrav_page_dir;</div><div class='add'>+	__le64	tim_page_dir;</div><div class='add'>+	__le32	qp_num_entries;</div><div class='add'>+	__le32	srq_num_entries;</div><div class='add'>+	__le32	cq_num_entries;</div><div class='add'>+	__le32	stat_num_entries;</div><div class='add'>+	__le32	tqm_sp_num_entries;</div><div class='add'>+	__le32	tqm_ring0_num_entries;</div><div class='add'>+	__le32	tqm_ring1_num_entries;</div><div class='add'>+	__le32	tqm_ring2_num_entries;</div><div class='add'>+	__le32	tqm_ring3_num_entries;</div><div class='add'>+	__le32	tqm_ring4_num_entries;</div><div class='add'>+	__le32	tqm_ring5_num_entries;</div><div class='add'>+	__le32	tqm_ring6_num_entries;</div><div class='add'>+	__le32	tqm_ring7_num_entries;</div><div class='add'>+	__le32	mrav_num_entries;</div><div class='add'>+	__le32	tim_num_entries;</div><div class='add'>+	__le16	qp_num_qp1_entries;</div><div class='add'>+	__le16	qp_num_l2_entries;</div><div class='add'>+	__le16	qp_entry_size;</div><div class='add'>+	__le16	srq_num_l2_entries;</div><div class='add'>+	__le16	srq_entry_size;</div><div class='add'>+	__le16	cq_num_l2_entries;</div><div class='add'>+	__le16	cq_entry_size;</div><div class='add'>+	__le16	vnic_num_vnic_entries;</div><div class='add'>+	__le16	vnic_num_ring_table_entries;</div><div class='add'>+	__le16	vnic_entry_size;</div><div class='add'>+	__le16	stat_entry_size;</div><div class='add'>+	__le16	tqm_entry_size;</div><div class='add'>+	__le16	mrav_entry_size;</div><div class='add'>+	__le16	tim_entry_size;</div><div class='add'>+	u8	tqm_ring8_pg_size_tqm_ring_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_RING8_TQM_RING_PG_SIZE_PG_1G</div><div class='add'>+	u8	ring8_unused[3];</div><div class='add'>+	__le32	tqm_ring8_num_entries;</div><div class='add'>+	__le64	tqm_ring8_page_dir;</div><div class='add'>+	u8	tqm_ring9_pg_size_tqm_ring_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_RING9_TQM_RING_PG_SIZE_PG_1G</div><div class='add'>+	u8	ring9_unused[3];</div><div class='add'>+	__le32	tqm_ring9_num_entries;</div><div class='add'>+	__le64	tqm_ring9_page_dir;</div><div class='add'>+	u8	tqm_ring10_pg_size_tqm_ring_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_RING10_TQM_RING_PG_SIZE_PG_1G</div><div class='add'>+	u8	ring10_unused[3];</div><div class='add'>+	__le32	tqm_ring10_num_entries;</div><div class='add'>+	__le64	tqm_ring10_page_dir;</div><div class='add'>+	__le32	tkc_num_entries;</div><div class='add'>+	__le32	rkc_num_entries;</div><div class='add'>+	__le64	tkc_page_dir;</div><div class='add'>+	__le64	rkc_page_dir;</div><div class='add'>+	__le16	tkc_entry_size;</div><div class='add'>+	__le16	rkc_entry_size;</div><div class='add'>+	u8	tkc_pg_size_tkc_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TKC_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TKC_PG_SIZE_PG_1G</div><div class='add'>+	u8	rkc_pg_size_rkc_lvl;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_LVL_MASK      0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_LVL_SFT       0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_LVL_LVL_0       0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_LVL_LVL_1       0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_LVL_LVL_2       0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_RKC_LVL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_RKC_PG_SIZE_PG_1G</div><div class='add'>+	__le16	qp_num_fast_qpmd_entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_backing_store_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_error_recovery_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_error_recovery_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	unused_0[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_error_recovery_qcfg_output (size:1664b/208B) */</div><div class='add'>+struct hwrm_error_recovery_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FLAGS_HOST       0x1UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FLAGS_CO_CPU     0x2UL</div><div class='add'>+	__le32	driver_polling_freq;</div><div class='add'>+	__le32	master_func_wait_period;</div><div class='add'>+	__le32	normal_func_wait_period;</div><div class='add'>+	__le32	master_func_wait_period_after_reset;</div><div class='add'>+	__le32	max_bailout_time_after_reset;</div><div class='add'>+	__le32	fw_health_status_reg;</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_SFT     0</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_BAR1</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_MASK          0xfffffffcUL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SFT           2</div><div class='add'>+	__le32	fw_heartbeat_reg;</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_SFT     0</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_BAR1</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_MASK          0xfffffffcUL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SFT           2</div><div class='add'>+	__le32	fw_reset_cnt_reg;</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_SFT     0</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_BAR1</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_MASK          0xfffffffcUL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SFT           2</div><div class='add'>+	__le32	reset_inprogress_reg;</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_SFT     0</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_BAR1</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_MASK          0xfffffffcUL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SFT           2</div><div class='add'>+	__le32	reset_inprogress_reg_mask;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	reg_array_cnt;</div><div class='add'>+	__le32	reset_reg[16];</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_SFT     0</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_BAR1</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_MASK          0xfffffffcUL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SFT           2</div><div class='add'>+	__le32	reset_reg_val[16];</div><div class='add'>+	u8	delay_after_reset[16];</div><div class='add'>+	__le32	err_recovery_cnt_reg;</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SPACE_SFT     0</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SPACE_BAR1</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_MASK          0xfffffffcUL</div><div class='add'>+	#define ERROR_RECOVERY_QCFG_RESP_ERR_RECOVERY_CNT_REG_ADDR_SFT           2</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_echo_response_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_echo_response_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	event_data1;</div><div class='add'>+	__le32	event_data2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_echo_response_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_echo_response_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_pin_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_ptp_pin_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	unused_0[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_pin_qcfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_ptp_pin_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	num_pins;</div><div class='add'>+	u8	state;</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_STATE_PIN0_ENABLED     0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_STATE_PIN1_ENABLED     0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_STATE_PIN2_ENABLED     0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_STATE_PIN3_ENABLED     0x8UL</div><div class='add'>+	u8	pin0_usage;</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN0_USAGE_NONE     0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN0_USAGE_PPS_IN   0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN0_USAGE_PPS_OUT  0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN0_USAGE_SYNC_IN  0x3UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN0_USAGE_SYNC_OUT 0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN0_USAGE_LAST    FUNC_PTP_PIN_QCFG_RESP_PIN0_USAGE_SYNC_OUT</div><div class='add'>+	u8	pin1_usage;</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN1_USAGE_NONE     0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN1_USAGE_PPS_IN   0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN1_USAGE_PPS_OUT  0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN1_USAGE_SYNC_IN  0x3UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN1_USAGE_SYNC_OUT 0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN1_USAGE_LAST    FUNC_PTP_PIN_QCFG_RESP_PIN1_USAGE_SYNC_OUT</div><div class='add'>+	u8	pin2_usage;</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_NONE                      0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_PPS_IN                    0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_PPS_OUT                   0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_SYNC_IN                   0x3UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_SYNC_OUT                  0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_SYNCE_PRIMARY_CLOCK_OUT   0x5UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_SYNCE_SECONDARY_CLOCK_OUT 0x6UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_LAST                     FUNC_PTP_PIN_QCFG_RESP_PIN2_USAGE_SYNCE_SECONDARY_CLOCK_OUT</div><div class='add'>+	u8	pin3_usage;</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_NONE                      0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_PPS_IN                    0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_PPS_OUT                   0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_SYNC_IN                   0x3UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_SYNC_OUT                  0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_SYNCE_PRIMARY_CLOCK_OUT   0x5UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_SYNCE_SECONDARY_CLOCK_OUT 0x6UL</div><div class='add'>+	#define FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_LAST                     FUNC_PTP_PIN_QCFG_RESP_PIN3_USAGE_SYNCE_SECONDARY_CLOCK_OUT</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_pin_cfg_input (size:256b/32B) */</div><div class='add'>+struct hwrm_func_ptp_pin_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN0_STATE     0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN0_USAGE     0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN1_STATE     0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN1_USAGE     0x8UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN2_STATE     0x10UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN2_USAGE     0x20UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN3_STATE     0x40UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN3_USAGE     0x80UL</div><div class='add'>+	u8	pin0_state;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_STATE_DISABLED 0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_STATE_ENABLED  0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_STATE_LAST    FUNC_PTP_PIN_CFG_REQ_PIN0_STATE_ENABLED</div><div class='add'>+	u8	pin0_usage;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_USAGE_NONE     0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_USAGE_PPS_IN   0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_USAGE_PPS_OUT  0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_USAGE_SYNC_IN  0x3UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_USAGE_SYNC_OUT 0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN0_USAGE_LAST    FUNC_PTP_PIN_CFG_REQ_PIN0_USAGE_SYNC_OUT</div><div class='add'>+	u8	pin1_state;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_STATE_DISABLED 0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_STATE_ENABLED  0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_STATE_LAST    FUNC_PTP_PIN_CFG_REQ_PIN1_STATE_ENABLED</div><div class='add'>+	u8	pin1_usage;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_USAGE_NONE     0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_USAGE_PPS_IN   0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_USAGE_PPS_OUT  0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_USAGE_SYNC_IN  0x3UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_USAGE_SYNC_OUT 0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN1_USAGE_LAST    FUNC_PTP_PIN_CFG_REQ_PIN1_USAGE_SYNC_OUT</div><div class='add'>+	u8	pin2_state;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_STATE_DISABLED 0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_STATE_ENABLED  0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_STATE_LAST    FUNC_PTP_PIN_CFG_REQ_PIN2_STATE_ENABLED</div><div class='add'>+	u8	pin2_usage;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_NONE                      0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_PPS_IN                    0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_PPS_OUT                   0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_SYNC_IN                   0x3UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_SYNC_OUT                  0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_SYNCE_PRIMARY_CLOCK_OUT   0x5UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_SYNCE_SECONDARY_CLOCK_OUT 0x6UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_LAST                     FUNC_PTP_PIN_CFG_REQ_PIN2_USAGE_SYNCE_SECONDARY_CLOCK_OUT</div><div class='add'>+	u8	pin3_state;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_STATE_DISABLED 0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_STATE_ENABLED  0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_STATE_LAST    FUNC_PTP_PIN_CFG_REQ_PIN3_STATE_ENABLED</div><div class='add'>+	u8	pin3_usage;</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_NONE                      0x0UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_PPS_IN                    0x1UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_PPS_OUT                   0x2UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_SYNC_IN                   0x3UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_SYNC_OUT                  0x4UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_SYNCE_PRIMARY_CLOCK_OUT   0x5UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_SYNCE_SECONDARY_CLOCK_OUT 0x6UL</div><div class='add'>+	#define FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_LAST                     FUNC_PTP_PIN_CFG_REQ_PIN3_USAGE_SYNCE_SECONDARY_CLOCK_OUT</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_pin_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_ptp_pin_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_cfg_input (size:384b/48B) */</div><div class='add'>+struct hwrm_func_ptp_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	enables;</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_ENABLES_PTP_PPS_EVENT               0x1UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_ENABLES_PTP_FREQ_ADJ_DLL_SOURCE     0x2UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_ENABLES_PTP_FREQ_ADJ_DLL_PHASE      0x4UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_ENABLES_PTP_FREQ_ADJ_EXT_PERIOD     0x8UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_ENABLES_PTP_FREQ_ADJ_EXT_UP         0x10UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_ENABLES_PTP_FREQ_ADJ_EXT_PHASE      0x20UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_ENABLES_PTP_SET_TIME                0x40UL</div><div class='add'>+	u8	ptp_pps_event;</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_PPS_EVENT_INTERNAL     0x1UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_PPS_EVENT_EXTERNAL     0x2UL</div><div class='add'>+	u8	ptp_freq_adj_dll_source;</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_NONE    0x0UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_TSIO_0  0x1UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_TSIO_1  0x2UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_TSIO_2  0x3UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_TSIO_3  0x4UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_PORT_0  0x5UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_PORT_1  0x6UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_PORT_2  0x7UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_PORT_3  0x8UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_INVALID 0xffUL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_LAST   FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_SOURCE_INVALID</div><div class='add'>+	u8	ptp_freq_adj_dll_phase;</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_PHASE_NONE 0x0UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_PHASE_4K   0x1UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_PHASE_8K   0x2UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_PHASE_10M  0x3UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_PHASE_25M  0x4UL</div><div class='add'>+	#define FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_PHASE_LAST FUNC_PTP_CFG_REQ_PTP_FREQ_ADJ_DLL_PHASE_25M</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	__le32	ptp_freq_adj_ext_period;</div><div class='add'>+	__le32	ptp_freq_adj_ext_up;</div><div class='add'>+	__le32	ptp_freq_adj_ext_phase_lower;</div><div class='add'>+	__le32	ptp_freq_adj_ext_phase_upper;</div><div class='add'>+	__le64	ptp_set_time;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_ptp_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_ts_query_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_ptp_ts_query_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_PTP_TS_QUERY_REQ_FLAGS_PPS_TIME     0x1UL</div><div class='add'>+	#define FUNC_PTP_TS_QUERY_REQ_FLAGS_PTM_TIME     0x2UL</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_ts_query_output (size:320b/40B) */</div><div class='add'>+struct hwrm_func_ptp_ts_query_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	pps_event_ts;</div><div class='add'>+	__le64	ptm_local_ts;</div><div class='add'>+	__le64	ptm_system_ts;</div><div class='add'>+	__le32	ptm_link_delay;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_ext_cfg_input (size:256b/32B) */</div><div class='add'>+struct hwrm_func_ptp_ext_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	enables;</div><div class='add'>+	#define FUNC_PTP_EXT_CFG_REQ_ENABLES_PHC_MASTER_FID     0x1UL</div><div class='add'>+	#define FUNC_PTP_EXT_CFG_REQ_ENABLES_PHC_SEC_FID        0x2UL</div><div class='add'>+	#define FUNC_PTP_EXT_CFG_REQ_ENABLES_PHC_SEC_MODE       0x4UL</div><div class='add'>+	#define FUNC_PTP_EXT_CFG_REQ_ENABLES_FAILOVER_TIMER     0x8UL</div><div class='add'>+	__le16	phc_master_fid;</div><div class='add'>+	__le16	phc_sec_fid;</div><div class='add'>+	u8	phc_sec_mode;</div><div class='add'>+	#define FUNC_PTP_EXT_CFG_REQ_PHC_SEC_MODE_SWITCH  0x0UL</div><div class='add'>+	#define FUNC_PTP_EXT_CFG_REQ_PHC_SEC_MODE_ALL     0x1UL</div><div class='add'>+	#define FUNC_PTP_EXT_CFG_REQ_PHC_SEC_MODE_PF_ONLY 0x2UL</div><div class='add'>+	#define FUNC_PTP_EXT_CFG_REQ_PHC_SEC_MODE_LAST   FUNC_PTP_EXT_CFG_REQ_PHC_SEC_MODE_PF_ONLY</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le32	failover_timer;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_ext_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_ptp_ext_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_ext_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_ptp_ext_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	unused_0[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_ptp_ext_qcfg_output (size:256b/32B) */</div><div class='add'>+struct hwrm_func_ptp_ext_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	phc_master_fid;</div><div class='add'>+	__le16	phc_sec_fid;</div><div class='add'>+	__le16	phc_active_fid0;</div><div class='add'>+	__le16	phc_active_fid1;</div><div class='add'>+	__le32	last_failover_event;</div><div class='add'>+	__le16	from_fid;</div><div class='add'>+	__le16	to_fid;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_cfg_v2_input (size:512b/64B) */</div><div class='add'>+struct hwrm_func_backing_store_cfg_v2_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_QP                  0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_SRQ                 0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_CQ                  0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_VNIC                0x3UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_STAT                0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_SP_TQM_RING         0x5UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_FP_TQM_RING         0x6UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_MRAV                0xeUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_TIM                 0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_TX_CK               0x13UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_RX_CK               0x14UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_MP_TQM_RING         0x15UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_SQ_DB_SHADOW        0x16UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_RQ_DB_SHADOW        0x17UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_SRQ_DB_SHADOW       0x18UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_CQ_DB_SHADOW        0x19UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_TBL_SCOPE           0x1cUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_XID_PARTITION       0x1dUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_SRT_TRACE           0x1eUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_SRT2_TRACE          0x1fUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_CRT_TRACE           0x20UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_CRT2_TRACE          0x21UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_RIGP0_TRACE         0x22UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_L2_HWRM_TRACE       0x23UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_ROCE_HWRM_TRACE     0x24UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_TTX_PACING_TQM_RING 0x25UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_CA0_TRACE           0x26UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_CA1_TRACE           0x27UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_CA2_TRACE           0x28UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_RIGP1_TRACE         0x29UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_AFM_KONG_HWRM_TRACE 0x2aUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_ERR_QPC_TRACE       0x2bUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_INVALID             0xffffUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_LAST               FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_INVALID</div><div class='add'>+	__le16	instance;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_FLAGS_PREBOOT_MODE        0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_FLAGS_BS_CFG_ALL_DONE     0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_FLAGS_BS_EXTEND           0x4UL</div><div class='add'>+	__le64	page_dir;</div><div class='add'>+	__le32	num_entries;</div><div class='add'>+	__le16	entry_size;</div><div class='add'>+	u8	page_size_pbl_level;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PBL_LEVEL_MASK  0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PBL_LEVEL_SFT   0</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PBL_LEVEL_LVL_0   0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PBL_LEVEL_LVL_1   0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PBL_LEVEL_LVL_2   0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PBL_LEVEL_LAST   FUNC_BACKING_STORE_CFG_V2_REQ_PBL_LEVEL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_LAST   FUNC_BACKING_STORE_CFG_V2_REQ_PAGE_SIZE_PG_1G</div><div class='add'>+	u8	subtype_valid_cnt;</div><div class='add'>+	__le32	split_entry_0;</div><div class='add'>+	__le32	split_entry_1;</div><div class='add'>+	__le32	split_entry_2;</div><div class='add'>+	__le32	split_entry_3;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define FUNC_BACKING_STORE_CFG_V2_REQ_ENABLES_NEXT_BS_OFFSET     0x1UL</div><div class='add'>+	__le32	next_bs_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_cfg_v2_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_backing_store_cfg_v2_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	rsvd0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_qcfg_v2_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_backing_store_qcfg_v2_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_QP                  0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_SRQ                 0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_CQ                  0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_VNIC                0x3UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_STAT                0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_SP_TQM_RING         0x5UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_FP_TQM_RING         0x6UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_MRAV                0xeUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_TIM                 0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_TX_CK               0x13UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_RX_CK               0x14UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_MP_TQM_RING         0x15UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_SQ_DB_SHADOW        0x16UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_RQ_DB_SHADOW        0x17UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_SRQ_DB_SHADOW       0x18UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_CQ_DB_SHADOW        0x19UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_TBL_SCOPE           0x1cUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_XID_PARTITION_TABLE 0x1dUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_SRT_TRACE           0x1eUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_SRT2_TRACE          0x1fUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_CRT_TRACE           0x20UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_CRT2_TRACE          0x21UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_RIGP0_TRACE         0x22UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_L2_HWRM_TRACE       0x23UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_ROCE_HWRM_TRACE     0x24UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_TTX_PACING_TQM_RING 0x25UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_CA0_TRACE           0x26UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_CA1_TRACE           0x27UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_CA2_TRACE           0x28UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_RIGP1_TRACE         0x29UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_AFM_KONG_HWRM_TRACE 0x2aUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_ERR_QPC_TRACE       0x2bUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_INVALID             0xffffUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_LAST               FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_INVALID</div><div class='add'>+	__le16	instance;</div><div class='add'>+	u8	rsvd[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_qcfg_v2_output (size:448b/56B) */</div><div class='add'>+struct hwrm_func_backing_store_qcfg_v2_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_QP                  0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_SRQ                 0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_CQ                  0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_VNIC                0x3UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_STAT                0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_SP_TQM_RING         0x5UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_FP_TQM_RING         0x6UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_MRAV                0xeUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_TIM                 0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_TX_CK               0x13UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_RX_CK               0x14UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_MP_TQM_RING         0x15UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_TBL_SCOPE           0x1cUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_XID_PARTITION       0x1dUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_SRT_TRACE           0x1eUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_SRT2_TRACE          0x1fUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_CRT_TRACE           0x20UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_CRT2_TRACE          0x21UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_RIGP0_TRACE         0x22UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_L2_HWRM_TRACE       0x23UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_ROCE_HWRM_TRACE     0x24UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_TTX_PACING_TQM_RING 0x25UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_CA0_TRACE           0x26UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_CA1_TRACE           0x27UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_CA2_TRACE           0x28UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_RIGP1_TRACE         0x29UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_ERR_QPC_TRACE       0x2aUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_INVALID             0xffffUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_LAST               FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_INVALID</div><div class='add'>+	__le16	instance;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	__le64	page_dir;</div><div class='add'>+	__le32	num_entries;</div><div class='add'>+	u8	page_size_pbl_level;</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PBL_LEVEL_MASK  0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PBL_LEVEL_SFT   0</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PBL_LEVEL_LVL_0   0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PBL_LEVEL_LVL_1   0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PBL_LEVEL_LVL_2   0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PBL_LEVEL_LAST   FUNC_BACKING_STORE_QCFG_V2_RESP_PBL_LEVEL_LVL_2</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_MASK  0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_SFT   4</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_LAST   FUNC_BACKING_STORE_QCFG_V2_RESP_PAGE_SIZE_PG_1G</div><div class='add'>+	u8	subtype_valid_cnt;</div><div class='add'>+	u8	rsvd[2];</div><div class='add'>+	__le32	split_entry_0;</div><div class='add'>+	__le32	split_entry_1;</div><div class='add'>+	__le32	split_entry_2;</div><div class='add'>+	__le32	split_entry_3;</div><div class='add'>+	u8	rsvd2[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* qpc_split_entries (size:128b/16B) */</div><div class='add'>+struct qpc_split_entries {</div><div class='add'>+	__le32	qp_num_l2_entries;</div><div class='add'>+	__le32	qp_num_qp1_entries;</div><div class='add'>+	__le32	qp_num_fast_qpmd_entries;</div><div class='add'>+	__le32	rsvd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* srq_split_entries (size:128b/16B) */</div><div class='add'>+struct srq_split_entries {</div><div class='add'>+	__le32	srq_num_l2_entries;</div><div class='add'>+	__le32	rsvd;</div><div class='add'>+	__le32	rsvd2[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* cq_split_entries (size:128b/16B) */</div><div class='add'>+struct cq_split_entries {</div><div class='add'>+	__le32	cq_num_l2_entries;</div><div class='add'>+	__le32	rsvd;</div><div class='add'>+	__le32	rsvd2[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* vnic_split_entries (size:128b/16B) */</div><div class='add'>+struct vnic_split_entries {</div><div class='add'>+	__le32	vnic_num_vnic_entries;</div><div class='add'>+	__le32	rsvd;</div><div class='add'>+	__le32	rsvd2[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* mrav_split_entries (size:128b/16B) */</div><div class='add'>+struct mrav_split_entries {</div><div class='add'>+	__le32	mrav_num_av_entries;</div><div class='add'>+	__le32	rsvd;</div><div class='add'>+	__le32	rsvd2[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ts_split_entries (size:128b/16B) */</div><div class='add'>+struct ts_split_entries {</div><div class='add'>+	__le32	region_num_entries;</div><div class='add'>+	u8	tsid;</div><div class='add'>+	u8	lkup_static_bkt_cnt_exp[2];</div><div class='add'>+	u8	locked;</div><div class='add'>+	__le32	rsvd2[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ck_split_entries (size:128b/16B) */</div><div class='add'>+struct ck_split_entries {</div><div class='add'>+	__le32	num_quic_entries;</div><div class='add'>+	__le32	rsvd;</div><div class='add'>+	__le32	rsvd2[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_qcaps_v2_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_backing_store_qcaps_v2_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_QP                  0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRQ                 0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CQ                  0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_VNIC                0x3UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_STAT                0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SP_TQM_RING         0x5UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_FP_TQM_RING         0x6UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_MRAV                0xeUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TIM                 0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TX_CK               0x13UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RX_CK               0x14UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_MP_TQM_RING         0x15UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SQ_DB_SHADOW        0x16UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RQ_DB_SHADOW        0x17UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRQ_DB_SHADOW       0x18UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CQ_DB_SHADOW        0x19UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TBL_SCOPE           0x1cUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_XID_PARTITION       0x1dUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRT_TRACE           0x1eUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRT2_TRACE          0x1fUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CRT_TRACE           0x20UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CRT2_TRACE          0x21UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RIGP0_TRACE         0x22UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_L2_HWRM_TRACE       0x23UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_ROCE_HWRM_TRACE     0x24UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TTX_PACING_TQM_RING 0x25UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CA0_TRACE           0x26UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CA1_TRACE           0x27UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CA2_TRACE           0x28UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RIGP1_TRACE         0x29UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_AFM_KONG_HWRM_TRACE 0x2aUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_ERR_QPC_TRACE       0x2bUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_INVALID             0xffffUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_LAST               FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_INVALID</div><div class='add'>+	u8	rsvd[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_backing_store_qcaps_v2_output (size:448b/56B) */</div><div class='add'>+struct hwrm_func_backing_store_qcaps_v2_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_QP                  0x0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_SRQ                 0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_CQ                  0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_VNIC                0x3UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_STAT                0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_SP_TQM_RING         0x5UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_FP_TQM_RING         0x6UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_MRAV                0xeUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_TIM                 0xfUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_TX_CK               0x13UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_RX_CK               0x14UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_MP_TQM_RING         0x15UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_SQ_DB_SHADOW        0x16UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_RQ_DB_SHADOW        0x17UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_SRQ_DB_SHADOW       0x18UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_CQ_DB_SHADOW        0x19UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_TBL_SCOPE           0x1cUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_XID_PARTITION       0x1dUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_SRT_TRACE           0x1eUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_SRT2_TRACE          0x1fUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_CRT_TRACE           0x20UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_CRT2_TRACE          0x21UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_RIGP0_TRACE         0x22UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_L2_HWRM_TRACE       0x23UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_ROCE_HWRM_TRACE     0x24UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_TTX_PACING_TQM_RING 0x25UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_CA0_TRACE           0x26UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_CA1_TRACE           0x27UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_CA2_TRACE           0x28UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_RIGP1_TRACE         0x29UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_AFM_KONG_HWRM_TRACE 0x2aUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_ERR_QPC_TRACE       0x2bUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_INVALID             0xffffUL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_LAST               FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_INVALID</div><div class='add'>+	__le16	entry_size;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_ENABLE_CTX_KIND_INIT            0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_TYPE_VALID                      0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_DRIVER_MANAGED_MEMORY           0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_ROCE_QP_PSEUDO_STATIC_ALLOC     0x8UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_FW_DBG_TRACE                    0x10UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_FW_BIN_DBG_TRACE                0x20UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_NEXT_BS_OFFSET                  0x40UL</div><div class='add'>+	__le32	instance_bit_map;</div><div class='add'>+	u8	ctx_init_value;</div><div class='add'>+	u8	ctx_init_offset;</div><div class='add'>+	u8	entry_multiple;</div><div class='add'>+	u8	rsvd;</div><div class='add'>+	__le32	max_num_entries;</div><div class='add'>+	__le32	min_num_entries;</div><div class='add'>+	__le16	next_valid_type;</div><div class='add'>+	u8	subtype_valid_cnt;</div><div class='add'>+	u8	exact_cnt_bit_map;</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_EXACT_CNT_BIT_MAP_SPLIT_ENTRY_0_EXACT     0x1UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_EXACT_CNT_BIT_MAP_SPLIT_ENTRY_1_EXACT     0x2UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_EXACT_CNT_BIT_MAP_SPLIT_ENTRY_2_EXACT     0x4UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_EXACT_CNT_BIT_MAP_SPLIT_ENTRY_3_EXACT     0x8UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_EXACT_CNT_BIT_MAP_UNUSED_MASK             0xf0UL</div><div class='add'>+	#define FUNC_BACKING_STORE_QCAPS_V2_RESP_EXACT_CNT_BIT_MAP_UNUSED_SFT              4</div><div class='add'>+	__le32	split_entry_0;</div><div class='add'>+	__le32	split_entry_1;</div><div class='add'>+	__le32	split_entry_2;</div><div class='add'>+	__le32	split_entry_3;</div><div class='add'>+	__le16	max_instance_count;</div><div class='add'>+	u8	rsvd3;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_dbr_pacing_qcfg_input (size:128b/16B) */</div><div class='add'>+struct hwrm_func_dbr_pacing_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_dbr_pacing_qcfg_output (size:512b/64B) */</div><div class='add'>+struct hwrm_func_dbr_pacing_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_FLAGS_DBR_NQ_EVENT_ENABLED     0x1UL</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	__le32	dbr_stat_db_fifo_reg;</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_SFT     0</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_LAST     FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SPACE_BAR1</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_MASK          0xfffffffcUL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_STAT_DB_FIFO_REG_ADDR_SFT           2</div><div class='add'>+	__le32	dbr_stat_db_fifo_reg_watermark_mask;</div><div class='add'>+	u8	dbr_stat_db_fifo_reg_watermark_shift;</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	__le32	dbr_stat_db_fifo_reg_fifo_room_mask;</div><div class='add'>+	u8	dbr_stat_db_fifo_reg_fifo_room_shift;</div><div class='add'>+	u8	unused_2[3];</div><div class='add'>+	__le32	dbr_throttling_aeq_arm_reg;</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_SFT     0</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_LAST     FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SPACE_BAR1</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_MASK          0xfffffffcUL</div><div class='add'>+	#define FUNC_DBR_PACING_QCFG_RESP_DBR_THROTTLING_AEQ_ARM_REG_ADDR_SFT           2</div><div class='add'>+	u8	dbr_throttling_aeq_arm_reg_val;</div><div class='add'>+	u8	unused_3[3];</div><div class='add'>+	__le32	dbr_stat_db_max_fifo_depth;</div><div class='add'>+	__le32	primary_nq_id;</div><div class='add'>+	__le32	pacing_threshold;</div><div class='add'>+	u8	unused_4[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_drv_if_change_input (size:192b/24B) */</div><div class='add'>+struct hwrm_func_drv_if_change_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_DRV_IF_CHANGE_REQ_FLAGS_UP     0x1UL</div><div class='add'>+	__le32	unused;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_func_drv_if_change_output (size:128b/16B) */</div><div class='add'>+struct hwrm_func_drv_if_change_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define FUNC_DRV_IF_CHANGE_RESP_FLAGS_RESC_CHANGE           0x1UL</div><div class='add'>+	#define FUNC_DRV_IF_CHANGE_RESP_FLAGS_HOT_FW_RESET_DONE     0x2UL</div><div class='add'>+	#define FUNC_DRV_IF_CHANGE_RESP_FLAGS_CAPS_CHANGE           0x4UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_cfg_input (size:512b/64B) */</div><div class='add'>+struct hwrm_port_phy_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_RESET_PHY                  0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_DEPRECATED                 0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FORCE                      0x4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_RESTART_AUTONEG            0x8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_EEE_ENABLE                 0x10UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_EEE_DISABLE                0x20UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_EEE_TX_LPI_ENABLE          0x40UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_EEE_TX_LPI_DISABLE         0x80UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_AUTONEG_ENABLE         0x100UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_AUTONEG_DISABLE        0x200UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_ENABLE        0x400UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_DISABLE       0x800UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_ENABLE        0x1000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_DISABLE       0x2000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FORCE_LINK_DWN             0x4000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS544_1XN_ENABLE       0x8000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS544_1XN_DISABLE      0x10000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS544_IEEE_ENABLE      0x20000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS544_IEEE_DISABLE     0x40000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_1XN_ENABLE       0x80000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_1XN_DISABLE      0x100000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_IEEE_ENABLE      0x200000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_IEEE_DISABLE     0x400000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_LINK_TRAINING_ENABLE       0x800000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_LINK_TRAINING_DISABLE      0x1000000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_PRECODING_ENABLE           0x2000000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FLAGS_PRECODING_DISABLE          0x4000000UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_MODE                     0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_DUPLEX                   0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_PAUSE                    0x4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEED               0x8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEED_MASK          0x10UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_WIRESPEED                     0x20UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_LPBK                          0x40UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_PREEMPHASIS                   0x80UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_FORCE_PAUSE                   0x100UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_EEE_LINK_SPEED_MASK           0x200UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_TX_LPI_TIMER                  0x400UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_FORCE_PAM4_LINK_SPEED         0x800UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_PAM4_LINK_SPEED_MASK     0x1000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_FORCE_LINK_SPEEDS2            0x2000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEEDS2_MASK        0x4000UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	__le16	force_link_speed;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_100MB 0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB   0xaUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_2GB   0x14UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_2_5GB 0x19UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10GB  0x64UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_20GB  0xc8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_25GB  0xfaUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_40GB  0x190UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_50GB  0x1f4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_100GB 0x3e8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10MB  0xffffUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_LAST PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10MB</div><div class='add'>+	u8	auto_mode;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_MODE_NONE         0x0UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_MODE_ALL_SPEEDS   0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_MODE_ONE_SPEED    0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_MODE_ONE_OR_BELOW 0x3UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_MODE_SPEED_MASK   0x4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_MODE_LAST        PORT_PHY_CFG_REQ_AUTO_MODE_SPEED_MASK</div><div class='add'>+	u8	auto_duplex;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_DUPLEX_HALF 0x0UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_DUPLEX_FULL 0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_DUPLEX_BOTH 0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_DUPLEX_LAST PORT_PHY_CFG_REQ_AUTO_DUPLEX_BOTH</div><div class='add'>+	u8	auto_pause;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_PAUSE_TX                0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_PAUSE_RX                0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE     0x4UL</div><div class='add'>+	u8	mgmt_flag;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_MGMT_FLAG_LINK_RELEASE     0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_MGMT_FLAG_MGMT_VALID       0x80UL</div><div class='add'>+	__le16	auto_link_speed;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_100MB 0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_1GB   0xaUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_2GB   0x14UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_2_5GB 0x19UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_10GB  0x64UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_20GB  0xc8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_25GB  0xfaUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_40GB  0x190UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_50GB  0x1f4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_100GB 0x3e8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_10MB  0xffffUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_LAST PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_10MB</div><div class='add'>+	__le16	auto_link_speed_mask;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_100MBHD     0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_100MB       0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_1GBHD       0x4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_1GB         0x8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_2GB         0x10UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_2_5GB       0x20UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_10GB        0x40UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_20GB        0x80UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_25GB        0x100UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_40GB        0x200UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_50GB        0x400UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_100GB       0x800UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_10MBHD      0x1000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_10MB        0x2000UL</div><div class='add'>+	u8	wirespeed;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_WIRESPEED_OFF 0x0UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_WIRESPEED_ON  0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_WIRESPEED_LAST PORT_PHY_CFG_REQ_WIRESPEED_ON</div><div class='add'>+	u8	lpbk;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_LPBK_NONE     0x0UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_LPBK_LOCAL    0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_LPBK_REMOTE   0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_LPBK_EXTERNAL 0x3UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_LPBK_LAST    PORT_PHY_CFG_REQ_LPBK_EXTERNAL</div><div class='add'>+	u8	force_pause;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_PAUSE_TX     0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_PAUSE_RX     0x2UL</div><div class='add'>+	u8	unused_1;</div><div class='add'>+	__le32	preemphasis;</div><div class='add'>+	__le16	eee_link_speed_mask;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_RSVD1     0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_100MB     0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_RSVD2     0x4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_1GB       0x8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_RSVD3     0x10UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_RSVD4     0x20UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_10GB      0x40UL</div><div class='add'>+	__le16	force_pam4_link_speed;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_50GB  0x1f4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_100GB 0x3e8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_200GB 0x7d0UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_LAST PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_200GB</div><div class='add'>+	__le32	tx_lpi_timer;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_TX_LPI_TIMER_MASK 0xffffffUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_TX_LPI_TIMER_SFT 0</div><div class='add'>+	__le16	auto_link_pam4_speed_mask;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_PAM4_SPEED_MASK_50G      0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_PAM4_SPEED_MASK_100G     0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_PAM4_SPEED_MASK_200G     0x4UL</div><div class='add'>+	__le16	force_link_speeds2;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_1GB            0xaUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_10GB           0x64UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_25GB           0xfaUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_40GB           0x190UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_50GB           0x1f4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_100GB          0x3e8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_50GB_PAM4_56   0x1f5UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_100GB_PAM4_56  0x3e9UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_200GB_PAM4_56  0x7d1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_400GB_PAM4_56  0xfa1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_100GB_PAM4_112 0x3eaUL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_200GB_PAM4_112 0x7d2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_400GB_PAM4_112 0xfa2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_800GB_PAM4_112 0x1f42UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_LAST          PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_800GB_PAM4_112</div><div class='add'>+	__le16	auto_link_speeds2_mask;</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_1GB                0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_10GB               0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_25GB               0x4UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_40GB               0x8UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_50GB               0x10UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_100GB              0x20UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_50GB_PAM4_56       0x40UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_100GB_PAM4_56      0x80UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_200GB_PAM4_56      0x100UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_400GB_PAM4_56      0x200UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_100GB_PAM4_112     0x400UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_200GB_PAM4_112     0x800UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_400GB_PAM4_112     0x1000UL</div><div class='add'>+	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEEDS2_MASK_800GB_PAM4_112     0x2000UL</div><div class='add'>+	u8	unused_2[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_phy_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_cfg_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_port_phy_cfg_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define PORT_PHY_CFG_CMD_ERR_CODE_UNKNOWN       0x0UL</div><div class='add'>+	#define PORT_PHY_CFG_CMD_ERR_CODE_ILLEGAL_SPEED 0x1UL</div><div class='add'>+	#define PORT_PHY_CFG_CMD_ERR_CODE_RETRY         0x2UL</div><div class='add'>+	#define PORT_PHY_CFG_CMD_ERR_CODE_LAST         PORT_PHY_CFG_CMD_ERR_CODE_RETRY</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_phy_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_qcfg_output (size:832b/104B) */</div><div class='add'>+struct hwrm_port_phy_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	link;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_NO_LINK 0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SIGNAL  0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_LINK    0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_LAST   PORT_PHY_QCFG_RESP_LINK_LINK</div><div class='add'>+	u8	active_fec_signal_mode;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SIGNAL_MODE_MASK                0xfUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SIGNAL_MODE_SFT                 0</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SIGNAL_MODE_NRZ                   0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4                  0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4_112              0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SIGNAL_MODE_LAST                 PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4_112</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_MASK                 0xf0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_SFT                  4</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_NONE_ACTIVE        (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_CLAUSE74_ACTIVE    (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_CLAUSE91_ACTIVE    (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS544_1XN_ACTIVE   (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS544_IEEE_ACTIVE  (0x4UL &lt;&lt; 4)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS272_1XN_ACTIVE   (0x5UL &lt;&lt; 4)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS272_IEEE_ACTIVE  (0x6UL &lt;&lt; 4)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ACTIVE_FEC_LAST                  PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS272_IEEE_ACTIVE</div><div class='add'>+	__le16	link_speed;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_100MB 0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_1GB   0xaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_2GB   0x14UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_2_5GB 0x19UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_10GB  0x64UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_20GB  0xc8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_25GB  0xfaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_40GB  0x190UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_50GB  0x1f4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_100GB 0x3e8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_200GB 0x7d0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_400GB 0xfa0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_800GB 0x1f40UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_10MB  0xffffUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_SPEED_LAST PORT_PHY_QCFG_RESP_LINK_SPEED_10MB</div><div class='add'>+	u8	duplex_cfg;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_DUPLEX_CFG_HALF 0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_DUPLEX_CFG_FULL 0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_DUPLEX_CFG_LAST PORT_PHY_QCFG_RESP_DUPLEX_CFG_FULL</div><div class='add'>+	u8	pause;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PAUSE_TX     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PAUSE_RX     0x2UL</div><div class='add'>+	__le16	support_speeds;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_100MBHD     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_100MB       0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_1GBHD       0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_1GB         0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_2GB         0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_2_5GB       0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_10GB        0x40UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_20GB        0x80UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_25GB        0x100UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_40GB        0x200UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_50GB        0x400UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_100GB       0x800UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_10MBHD      0x1000UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_10MB        0x2000UL</div><div class='add'>+	__le16	force_link_speed;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_100MB 0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_1GB   0xaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_2GB   0x14UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_2_5GB 0x19UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_10GB  0x64UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_20GB  0xc8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_25GB  0xfaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_40GB  0x190UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_50GB  0x1f4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_100GB 0x3e8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_10MB  0xffffUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_LAST PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_10MB</div><div class='add'>+	u8	auto_mode;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_MODE_NONE         0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_MODE_ALL_SPEEDS   0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_MODE_ONE_SPEED    0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_MODE_ONE_OR_BELOW 0x3UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_MODE_SPEED_MASK   0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_MODE_LAST        PORT_PHY_QCFG_RESP_AUTO_MODE_SPEED_MASK</div><div class='add'>+	u8	auto_pause;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_PAUSE_TX                0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_PAUSE_RX                0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_PAUSE_AUTONEG_PAUSE     0x4UL</div><div class='add'>+	__le16	auto_link_speed;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_100MB 0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_1GB   0xaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_2GB   0x14UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_2_5GB 0x19UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_10GB  0x64UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_20GB  0xc8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_25GB  0xfaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_40GB  0x190UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_50GB  0x1f4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_100GB 0x3e8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_10MB  0xffffUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_LAST PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_10MB</div><div class='add'>+	__le16	auto_link_speed_mask;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_100MBHD     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_100MB       0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_1GBHD       0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_1GB         0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_2GB         0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_2_5GB       0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_10GB        0x40UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_20GB        0x80UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_25GB        0x100UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_40GB        0x200UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_50GB        0x400UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_100GB       0x800UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_10MBHD      0x1000UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_10MB        0x2000UL</div><div class='add'>+	u8	wirespeed;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_WIRESPEED_OFF 0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_WIRESPEED_ON  0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_WIRESPEED_LAST PORT_PHY_QCFG_RESP_WIRESPEED_ON</div><div class='add'>+	u8	lpbk;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LPBK_NONE     0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LPBK_LOCAL    0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LPBK_REMOTE   0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LPBK_EXTERNAL 0x3UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LPBK_LAST    PORT_PHY_QCFG_RESP_LPBK_EXTERNAL</div><div class='add'>+	u8	force_pause;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_PAUSE_TX     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_PAUSE_RX     0x2UL</div><div class='add'>+	u8	module_status;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_NONE          0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_DISABLETX     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_WARNINGMSG    0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_PWRDOWN       0x3UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTINSERTED   0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_CURRENTFAULT  0x5UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_OVERHEATED    0x6UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTAPPLICABLE 0xffUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_LAST         PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTAPPLICABLE</div><div class='add'>+	__le32	preemphasis;</div><div class='add'>+	u8	phy_maj;</div><div class='add'>+	u8	phy_min;</div><div class='add'>+	u8	phy_bld;</div><div class='add'>+	u8	phy_type;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_UNKNOWN          0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASECR           0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR4          0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASELR           0x3UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASESR           0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR2          0x5UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKX           0x6UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR           0x7UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASET            0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASETE           0x9UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_SGMIIEXTPHY      0xaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_L  0xbUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_S  0xcUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_N  0xdUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASESR       0xeUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASECR4     0xfUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR4     0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR4     0x11UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER4     0x12UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR10    0x13UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASECR4      0x14UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASESR4      0x15UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASELR4      0x16UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASEER4      0x17UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_ACTIVE_CABLE 0x18UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASET         0x19UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASESX        0x1aUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASECX        0x1bUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASECR4     0x1cUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASESR4     0x1dUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASELR4     0x1eUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASEER4     0x1fUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_50G_BASECR       0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_50G_BASESR       0x21UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_50G_BASELR       0x22UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_50G_BASEER       0x23UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASECR2     0x24UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR2     0x25UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR2     0x26UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER2     0x27UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASECR      0x28UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR      0x29UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR      0x2aUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER      0x2bUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASECR2     0x2cUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASESR2     0x2dUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASELR2     0x2eUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASEER2     0x2fUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASECR8     0x30UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASESR8     0x31UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASELR8     0x32UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASEER8     0x33UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASECR4     0x34UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASESR4     0x35UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASELR4     0x36UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASEER4     0x37UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_800G_BASECR8     0x38UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_800G_BASESR8     0x39UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_800G_BASELR8     0x3aUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_800G_BASEER8     0x3bUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_800G_BASEFR8     0x3cUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_800G_BASEDR8     0x3dUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_TYPE_LAST            PORT_PHY_QCFG_RESP_PHY_TYPE_800G_BASEDR8</div><div class='add'>+	u8	media_type;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_UNKNOWN   0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_TP        0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_DAC       0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_FIBRE     0x3UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_BACKPLANE 0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_LAST     PORT_PHY_QCFG_RESP_MEDIA_TYPE_BACKPLANE</div><div class='add'>+	u8	xcvr_pkg_type;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_XCVR_INTERNAL 0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_XCVR_EXTERNAL 0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_LAST         PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_XCVR_EXTERNAL</div><div class='add'>+	u8	eee_config_phy_addr;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_ADDR_MASK              0x1fUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PHY_ADDR_SFT               0</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_MASK            0xe0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_SFT             5</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_ENABLED      0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_ACTIVE       0x40UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_TX_LPI       0x80UL</div><div class='add'>+	u8	parallel_detect;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_PARALLEL_DETECT     0x1UL</div><div class='add'>+	__le16	link_partner_adv_speeds;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_100MBHD     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_100MB       0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_1GBHD       0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_1GB         0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_2GB         0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_2_5GB       0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_10GB        0x40UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_20GB        0x80UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_25GB        0x100UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_40GB        0x200UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_50GB        0x400UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_100GB       0x800UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_10MBHD      0x1000UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_10MB        0x2000UL</div><div class='add'>+	u8	link_partner_adv_auto_mode;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_NONE         0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_ALL_SPEEDS   0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_ONE_SPEED    0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_ONE_OR_BELOW 0x3UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_SPEED_MASK   0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_LAST        PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_SPEED_MASK</div><div class='add'>+	u8	link_partner_adv_pause;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_PAUSE_TX     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_PAUSE_RX     0x2UL</div><div class='add'>+	__le16	adv_eee_link_speed_mask;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_RSVD1     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_100MB     0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_RSVD2     0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_1GB       0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_RSVD3     0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_RSVD4     0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_10GB      0x40UL</div><div class='add'>+	__le16	link_partner_adv_eee_link_speed_mask;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_RSVD1     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_100MB     0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_RSVD2     0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_1GB       0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_RSVD3     0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_RSVD4     0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_10GB      0x40UL</div><div class='add'>+	__le32	xcvr_identifier_type_tx_lpi_timer;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_TX_LPI_TIMER_MASK            0xffffffUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_TX_LPI_TIMER_SFT             0</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_MASK    0xff000000UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_SFT     24</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_UNKNOWN   (0x0UL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_SFP       (0x3UL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFP      (0xcUL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFPPLUS  (0xdUL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFP28    (0x11UL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFPDD    (0x18UL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFP112   (0x1eUL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_SFPDD     (0x1fUL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_CSFP      (0x20UL &lt;&lt; 24)</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_LAST     PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_CSFP</div><div class='add'>+	__le16	fec_cfg;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_NONE_SUPPORTED           0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_AUTONEG_SUPPORTED        0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_AUTONEG_ENABLED          0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE74_SUPPORTED       0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE74_ENABLED         0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE91_SUPPORTED       0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE91_ENABLED         0x40UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS544_1XN_SUPPORTED      0x80UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS544_1XN_ENABLED        0x100UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS544_IEEE_SUPPORTED     0x200UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS544_IEEE_ENABLED       0x400UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS272_1XN_SUPPORTED      0x800UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS272_1XN_ENABLED        0x1000UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS272_IEEE_SUPPORTED     0x2000UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS272_IEEE_ENABLED       0x4000UL</div><div class='add'>+	u8	duplex_state;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_DUPLEX_STATE_HALF 0x0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_DUPLEX_STATE_FULL 0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_DUPLEX_STATE_LAST PORT_PHY_QCFG_RESP_DUPLEX_STATE_FULL</div><div class='add'>+	u8	option_flags;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_MEDIA_AUTO_DETECT     0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_SIGNAL_MODE_KNOWN     0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_SPEEDS2_SUPPORTED     0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_LINK_TRAINING         0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_PRECODING             0x10UL</div><div class='add'>+	char	phy_vendor_name[16];</div><div class='add'>+	char	phy_vendor_partnumber[16];</div><div class='add'>+	__le16	support_pam4_speeds;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_PAM4_SPEEDS_50G      0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_PAM4_SPEEDS_100G     0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_PAM4_SPEEDS_200G     0x4UL</div><div class='add'>+	__le16	force_pam4_link_speed;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_PAM4_LINK_SPEED_50GB  0x1f4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_PAM4_LINK_SPEED_100GB 0x3e8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_PAM4_LINK_SPEED_200GB 0x7d0UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_PAM4_LINK_SPEED_LAST PORT_PHY_QCFG_RESP_FORCE_PAM4_LINK_SPEED_200GB</div><div class='add'>+	__le16	auto_pam4_link_speed_mask;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_PAM4_LINK_SPEED_MASK_50G      0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_PAM4_LINK_SPEED_MASK_100G     0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_PAM4_LINK_SPEED_MASK_200G     0x4UL</div><div class='add'>+	u8	link_partner_pam4_adv_speeds;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_PAM4_ADV_SPEEDS_50GB      0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_PAM4_ADV_SPEEDS_100GB     0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_PAM4_ADV_SPEEDS_200GB     0x4UL</div><div class='add'>+	u8	link_down_reason;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_RF                      0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_OTP_SPEED_VIOLATION     0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_CABLE_REMOVED           0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_MODULE_FAULT            0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_BMC_REQUEST             0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_TX_LASER_DISABLED       0x20UL</div><div class='add'>+	__le16	support_speeds2;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_1GB                0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_10GB               0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_25GB               0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_40GB               0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_50GB               0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_100GB              0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_50GB_PAM4_56       0x40UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_100GB_PAM4_56      0x80UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_200GB_PAM4_56      0x100UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_400GB_PAM4_56      0x200UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_100GB_PAM4_112     0x400UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_200GB_PAM4_112     0x800UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_400GB_PAM4_112     0x1000UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_800GB_PAM4_112     0x2000UL</div><div class='add'>+	__le16	force_link_speeds2;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_1GB            0xaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_10GB           0x64UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_25GB           0xfaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_40GB           0x190UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_50GB           0x1f4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_100GB          0x3e8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_50GB_PAM4_56   0x1f5UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_100GB_PAM4_56  0x3e9UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_200GB_PAM4_56  0x7d1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_400GB_PAM4_56  0xfa1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_100GB_PAM4_112 0x3eaUL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_200GB_PAM4_112 0x7d2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_400GB_PAM4_112 0xfa2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_800GB_PAM4_112 0x1f42UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_LAST          PORT_PHY_QCFG_RESP_FORCE_LINK_SPEEDS2_800GB_PAM4_112</div><div class='add'>+	__le16	auto_link_speeds2;</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_1GB                0x1UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_10GB               0x2UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_25GB               0x4UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_40GB               0x8UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_50GB               0x10UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_100GB              0x20UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_50GB_PAM4_56       0x40UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_100GB_PAM4_56      0x80UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_200GB_PAM4_56      0x100UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_400GB_PAM4_56      0x200UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_100GB_PAM4_112     0x400UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_200GB_PAM4_112     0x800UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_400GB_PAM4_112     0x1000UL</div><div class='add'>+	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEEDS2_800GB_PAM4_112     0x2000UL</div><div class='add'>+	u8	active_lanes;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_mac_cfg_input (size:448b/56B) */</div><div class='add'>+struct hwrm_port_mac_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_MATCH_LINK                    0x1UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_VLAN_PRI2COS_ENABLE           0x2UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_TUNNEL_PRI2COS_ENABLE         0x4UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_IP_DSCP2COS_ENABLE            0x8UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_PTP_RX_TS_CAPTURE_ENABLE      0x10UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_PTP_RX_TS_CAPTURE_DISABLE     0x20UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_PTP_TX_TS_CAPTURE_ENABLE      0x40UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_PTP_TX_TS_CAPTURE_DISABLE     0x80UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_OOB_WOL_ENABLE                0x100UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_OOB_WOL_DISABLE               0x200UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_VLAN_PRI2COS_DISABLE          0x400UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_TUNNEL_PRI2COS_DISABLE        0x800UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_IP_DSCP2COS_DISABLE           0x1000UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_PTP_ONE_STEP_TX_TS            0x2000UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_ENABLE      0x4000UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_DISABLE     0x8000UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_IPG                            0x1UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_LPBK                           0x2UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_VLAN_PRI2COS_MAP_PRI           0x4UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_TUNNEL_PRI2COS_MAP_PRI         0x10UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_DSCP2COS_MAP_PRI               0x20UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_RX_TS_CAPTURE_PTP_MSG_TYPE     0x40UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_TX_TS_CAPTURE_PTP_MSG_TYPE     0x80UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_COS_FIELD_CFG                  0x100UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_PTP_FREQ_ADJ_PPB               0x200UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_PTP_ADJ_PHASE                  0x400UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_ENABLES_PTP_LOAD_CONTROL               0x800UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	ipg;</div><div class='add'>+	u8	lpbk;</div><div class='add'>+	#define PORT_MAC_CFG_REQ_LPBK_NONE   0x0UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_LPBK_LOCAL  0x1UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_LPBK_REMOTE 0x2UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_LPBK_LAST  PORT_MAC_CFG_REQ_LPBK_REMOTE</div><div class='add'>+	u8	vlan_pri2cos_map_pri;</div><div class='add'>+	u8	reserved1;</div><div class='add'>+	u8	tunnel_pri2cos_map_pri;</div><div class='add'>+	u8	dscp2pri_map_pri;</div><div class='add'>+	__le16	rx_ts_capture_ptp_msg_type;</div><div class='add'>+	__le16	tx_ts_capture_ptp_msg_type;</div><div class='add'>+	u8	cos_field_cfg;</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_RSVD1                     0x1UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_MASK         0x6UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_SFT          1</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_INNERMOST      (0x0UL &lt;&lt; 1)</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_OUTER          (0x1UL &lt;&lt; 1)</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_OUTERMOST      (0x2UL &lt;&lt; 1)</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_UNSPECIFIED    (0x3UL &lt;&lt; 1)</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_LAST          PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_UNSPECIFIED</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_MASK       0x18UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_SFT        3</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_INNERMOST    (0x0UL &lt;&lt; 3)</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_OUTER        (0x1UL &lt;&lt; 3)</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_OUTERMOST    (0x2UL &lt;&lt; 3)</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_UNSPECIFIED  (0x3UL &lt;&lt; 3)</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_LAST        PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_UNSPECIFIED</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_DEFAULT_COS_MASK          0xe0UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_DEFAULT_COS_SFT           5</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	__le32	ptp_freq_adj_ppb;</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	ptp_load_control;</div><div class='add'>+	#define PORT_MAC_CFG_REQ_PTP_LOAD_CONTROL_NONE      0x0UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_PTP_LOAD_CONTROL_IMMEDIATE 0x1UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_PTP_LOAD_CONTROL_PPS_EVENT 0x2UL</div><div class='add'>+	#define PORT_MAC_CFG_REQ_PTP_LOAD_CONTROL_LAST     PORT_MAC_CFG_REQ_PTP_LOAD_CONTROL_PPS_EVENT</div><div class='add'>+	__le64	ptp_adj_phase;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_mac_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_mac_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	mru;</div><div class='add'>+	__le16	mtu;</div><div class='add'>+	u8	ipg;</div><div class='add'>+	u8	lpbk;</div><div class='add'>+	#define PORT_MAC_CFG_RESP_LPBK_NONE   0x0UL</div><div class='add'>+	#define PORT_MAC_CFG_RESP_LPBK_LOCAL  0x1UL</div><div class='add'>+	#define PORT_MAC_CFG_RESP_LPBK_REMOTE 0x2UL</div><div class='add'>+	#define PORT_MAC_CFG_RESP_LPBK_LAST  PORT_MAC_CFG_RESP_LPBK_REMOTE</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_mac_ptp_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_mac_ptp_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_mac_ptp_qcfg_output (size:704b/88B) */</div><div class='add'>+struct hwrm_port_mac_ptp_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_DIRECT_ACCESS                       0x1UL</div><div class='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_ONE_STEP_TX_TS                      0x4UL</div><div class='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_HWRM_ACCESS                         0x8UL</div><div class='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_PARTIAL_DIRECT_ACCESS_REF_CLOCK     0x10UL</div><div class='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_RTC_CONFIGURED                      0x20UL</div><div class='add'>+	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_64B_PHC_TIME                        0x40UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	__le32	rx_ts_reg_off_lower;</div><div class='add'>+	__le32	rx_ts_reg_off_upper;</div><div class='add'>+	__le32	rx_ts_reg_off_seq_id;</div><div class='add'>+	__le32	rx_ts_reg_off_src_id_0;</div><div class='add'>+	__le32	rx_ts_reg_off_src_id_1;</div><div class='add'>+	__le32	rx_ts_reg_off_src_id_2;</div><div class='add'>+	__le32	rx_ts_reg_off_domain_id;</div><div class='add'>+	__le32	rx_ts_reg_off_fifo;</div><div class='add'>+	__le32	rx_ts_reg_off_fifo_adv;</div><div class='add'>+	__le32	rx_ts_reg_off_granularity;</div><div class='add'>+	__le32	tx_ts_reg_off_lower;</div><div class='add'>+	__le32	tx_ts_reg_off_upper;</div><div class='add'>+	__le32	tx_ts_reg_off_seq_id;</div><div class='add'>+	__le32	tx_ts_reg_off_fifo;</div><div class='add'>+	__le32	tx_ts_reg_off_granularity;</div><div class='add'>+	__le32	ts_ref_clock_reg_lower;</div><div class='add'>+	__le32	ts_ref_clock_reg_upper;</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* tx_port_stats (size:3264b/408B) */</div><div class='add'>+struct tx_port_stats {</div><div class='add'>+	__le64	tx_64b_frames;</div><div class='add'>+	__le64	tx_65b_127b_frames;</div><div class='add'>+	__le64	tx_128b_255b_frames;</div><div class='add'>+	__le64	tx_256b_511b_frames;</div><div class='add'>+	__le64	tx_512b_1023b_frames;</div><div class='add'>+	__le64	tx_1024b_1518b_frames;</div><div class='add'>+	__le64	tx_good_vlan_frames;</div><div class='add'>+	__le64	tx_1519b_2047b_frames;</div><div class='add'>+	__le64	tx_2048b_4095b_frames;</div><div class='add'>+	__le64	tx_4096b_9216b_frames;</div><div class='add'>+	__le64	tx_9217b_16383b_frames;</div><div class='add'>+	__le64	tx_good_frames;</div><div class='add'>+	__le64	tx_total_frames;</div><div class='add'>+	__le64	tx_ucast_frames;</div><div class='add'>+	__le64	tx_mcast_frames;</div><div class='add'>+	__le64	tx_bcast_frames;</div><div class='add'>+	__le64	tx_pause_frames;</div><div class='add'>+	__le64	tx_pfc_frames;</div><div class='add'>+	__le64	tx_jabber_frames;</div><div class='add'>+	__le64	tx_fcs_err_frames;</div><div class='add'>+	__le64	tx_control_frames;</div><div class='add'>+	__le64	tx_oversz_frames;</div><div class='add'>+	__le64	tx_single_dfrl_frames;</div><div class='add'>+	__le64	tx_multi_dfrl_frames;</div><div class='add'>+	__le64	tx_single_coll_frames;</div><div class='add'>+	__le64	tx_multi_coll_frames;</div><div class='add'>+	__le64	tx_late_coll_frames;</div><div class='add'>+	__le64	tx_excessive_coll_frames;</div><div class='add'>+	__le64	tx_frag_frames;</div><div class='add'>+	__le64	tx_err;</div><div class='add'>+	__le64	tx_tagged_frames;</div><div class='add'>+	__le64	tx_dbl_tagged_frames;</div><div class='add'>+	__le64	tx_runt_frames;</div><div class='add'>+	__le64	tx_fifo_underruns;</div><div class='add'>+	__le64	tx_pfc_ena_frames_pri0;</div><div class='add'>+	__le64	tx_pfc_ena_frames_pri1;</div><div class='add'>+	__le64	tx_pfc_ena_frames_pri2;</div><div class='add'>+	__le64	tx_pfc_ena_frames_pri3;</div><div class='add'>+	__le64	tx_pfc_ena_frames_pri4;</div><div class='add'>+	__le64	tx_pfc_ena_frames_pri5;</div><div class='add'>+	__le64	tx_pfc_ena_frames_pri6;</div><div class='add'>+	__le64	tx_pfc_ena_frames_pri7;</div><div class='add'>+	__le64	tx_eee_lpi_events;</div><div class='add'>+	__le64	tx_eee_lpi_duration;</div><div class='add'>+	__le64	tx_llfc_logical_msgs;</div><div class='add'>+	__le64	tx_hcfc_msgs;</div><div class='add'>+	__le64	tx_total_collisions;</div><div class='add'>+	__le64	tx_bytes;</div><div class='add'>+	__le64	tx_xthol_frames;</div><div class='add'>+	__le64	tx_stat_discard;</div><div class='add'>+	__le64	tx_stat_error;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* rx_port_stats (size:4224b/528B) */</div><div class='add'>+struct rx_port_stats {</div><div class='add'>+	__le64	rx_64b_frames;</div><div class='add'>+	__le64	rx_65b_127b_frames;</div><div class='add'>+	__le64	rx_128b_255b_frames;</div><div class='add'>+	__le64	rx_256b_511b_frames;</div><div class='add'>+	__le64	rx_512b_1023b_frames;</div><div class='add'>+	__le64	rx_1024b_1518b_frames;</div><div class='add'>+	__le64	rx_good_vlan_frames;</div><div class='add'>+	__le64	rx_1519b_2047b_frames;</div><div class='add'>+	__le64	rx_2048b_4095b_frames;</div><div class='add'>+	__le64	rx_4096b_9216b_frames;</div><div class='add'>+	__le64	rx_9217b_16383b_frames;</div><div class='add'>+	__le64	rx_total_frames;</div><div class='add'>+	__le64	rx_ucast_frames;</div><div class='add'>+	__le64	rx_mcast_frames;</div><div class='add'>+	__le64	rx_bcast_frames;</div><div class='add'>+	__le64	rx_fcs_err_frames;</div><div class='add'>+	__le64	rx_ctrl_frames;</div><div class='add'>+	__le64	rx_pause_frames;</div><div class='add'>+	__le64	rx_pfc_frames;</div><div class='add'>+	__le64	rx_unsupported_opcode_frames;</div><div class='add'>+	__le64	rx_unsupported_da_pausepfc_frames;</div><div class='add'>+	__le64	rx_wrong_sa_frames;</div><div class='add'>+	__le64	rx_align_err_frames;</div><div class='add'>+	__le64	rx_oor_len_frames;</div><div class='add'>+	__le64	rx_code_err_frames;</div><div class='add'>+	__le64	rx_false_carrier_frames;</div><div class='add'>+	__le64	rx_ovrsz_frames;</div><div class='add'>+	__le64	rx_jbr_frames;</div><div class='add'>+	__le64	rx_mtu_err_frames;</div><div class='add'>+	__le64	rx_match_crc_frames;</div><div class='add'>+	__le64	rx_promiscuous_frames;</div><div class='add'>+	__le64	rx_tagged_frames;</div><div class='add'>+	__le64	rx_double_tagged_frames;</div><div class='add'>+	__le64	rx_trunc_frames;</div><div class='add'>+	__le64	rx_good_frames;</div><div class='add'>+	__le64	rx_pfc_xon2xoff_frames_pri0;</div><div class='add'>+	__le64	rx_pfc_xon2xoff_frames_pri1;</div><div class='add'>+	__le64	rx_pfc_xon2xoff_frames_pri2;</div><div class='add'>+	__le64	rx_pfc_xon2xoff_frames_pri3;</div><div class='add'>+	__le64	rx_pfc_xon2xoff_frames_pri4;</div><div class='add'>+	__le64	rx_pfc_xon2xoff_frames_pri5;</div><div class='add'>+	__le64	rx_pfc_xon2xoff_frames_pri6;</div><div class='add'>+	__le64	rx_pfc_xon2xoff_frames_pri7;</div><div class='add'>+	__le64	rx_pfc_ena_frames_pri0;</div><div class='add'>+	__le64	rx_pfc_ena_frames_pri1;</div><div class='add'>+	__le64	rx_pfc_ena_frames_pri2;</div><div class='add'>+	__le64	rx_pfc_ena_frames_pri3;</div><div class='add'>+	__le64	rx_pfc_ena_frames_pri4;</div><div class='add'>+	__le64	rx_pfc_ena_frames_pri5;</div><div class='add'>+	__le64	rx_pfc_ena_frames_pri6;</div><div class='add'>+	__le64	rx_pfc_ena_frames_pri7;</div><div class='add'>+	__le64	rx_sch_crc_err_frames;</div><div class='add'>+	__le64	rx_undrsz_frames;</div><div class='add'>+	__le64	rx_frag_frames;</div><div class='add'>+	__le64	rx_eee_lpi_events;</div><div class='add'>+	__le64	rx_eee_lpi_duration;</div><div class='add'>+	__le64	rx_llfc_physical_msgs;</div><div class='add'>+	__le64	rx_llfc_logical_msgs;</div><div class='add'>+	__le64	rx_llfc_msgs_with_crc_err;</div><div class='add'>+	__le64	rx_hcfc_msgs;</div><div class='add'>+	__le64	rx_hcfc_msgs_with_crc_err;</div><div class='add'>+	__le64	rx_bytes;</div><div class='add'>+	__le64	rx_runt_bytes;</div><div class='add'>+	__le64	rx_runt_frames;</div><div class='add'>+	__le64	rx_stat_discard;</div><div class='add'>+	__le64	rx_stat_err;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_qstats_input (size:320b/40B) */</div><div class='add'>+struct hwrm_port_qstats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_QSTATS_REQ_FLAGS_COUNTER_MASK     0x1UL</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	__le64	tx_stat_host_addr;</div><div class='add'>+	__le64	rx_stat_host_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_qstats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_qstats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	tx_stat_size;</div><div class='add'>+	__le16	rx_stat_size;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_QSTATS_RESP_FLAGS_CLEARED     0x1UL</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* tx_port_stats_ext (size:2048b/256B) */</div><div class='add'>+struct tx_port_stats_ext {</div><div class='add'>+	__le64	tx_bytes_cos0;</div><div class='add'>+	__le64	tx_bytes_cos1;</div><div class='add'>+	__le64	tx_bytes_cos2;</div><div class='add'>+	__le64	tx_bytes_cos3;</div><div class='add'>+	__le64	tx_bytes_cos4;</div><div class='add'>+	__le64	tx_bytes_cos5;</div><div class='add'>+	__le64	tx_bytes_cos6;</div><div class='add'>+	__le64	tx_bytes_cos7;</div><div class='add'>+	__le64	tx_packets_cos0;</div><div class='add'>+	__le64	tx_packets_cos1;</div><div class='add'>+	__le64	tx_packets_cos2;</div><div class='add'>+	__le64	tx_packets_cos3;</div><div class='add'>+	__le64	tx_packets_cos4;</div><div class='add'>+	__le64	tx_packets_cos5;</div><div class='add'>+	__le64	tx_packets_cos6;</div><div class='add'>+	__le64	tx_packets_cos7;</div><div class='add'>+	__le64	pfc_pri0_tx_duration_us;</div><div class='add'>+	__le64	pfc_pri0_tx_transitions;</div><div class='add'>+	__le64	pfc_pri1_tx_duration_us;</div><div class='add'>+	__le64	pfc_pri1_tx_transitions;</div><div class='add'>+	__le64	pfc_pri2_tx_duration_us;</div><div class='add'>+	__le64	pfc_pri2_tx_transitions;</div><div class='add'>+	__le64	pfc_pri3_tx_duration_us;</div><div class='add'>+	__le64	pfc_pri3_tx_transitions;</div><div class='add'>+	__le64	pfc_pri4_tx_duration_us;</div><div class='add'>+	__le64	pfc_pri4_tx_transitions;</div><div class='add'>+	__le64	pfc_pri5_tx_duration_us;</div><div class='add'>+	__le64	pfc_pri5_tx_transitions;</div><div class='add'>+	__le64	pfc_pri6_tx_duration_us;</div><div class='add'>+	__le64	pfc_pri6_tx_transitions;</div><div class='add'>+	__le64	pfc_pri7_tx_duration_us;</div><div class='add'>+	__le64	pfc_pri7_tx_transitions;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* rx_port_stats_ext (size:3904b/488B) */</div><div class='add'>+struct rx_port_stats_ext {</div><div class='add'>+	__le64	link_down_events;</div><div class='add'>+	__le64	continuous_pause_events;</div><div class='add'>+	__le64	resume_pause_events;</div><div class='add'>+	__le64	continuous_roce_pause_events;</div><div class='add'>+	__le64	resume_roce_pause_events;</div><div class='add'>+	__le64	rx_bytes_cos0;</div><div class='add'>+	__le64	rx_bytes_cos1;</div><div class='add'>+	__le64	rx_bytes_cos2;</div><div class='add'>+	__le64	rx_bytes_cos3;</div><div class='add'>+	__le64	rx_bytes_cos4;</div><div class='add'>+	__le64	rx_bytes_cos5;</div><div class='add'>+	__le64	rx_bytes_cos6;</div><div class='add'>+	__le64	rx_bytes_cos7;</div><div class='add'>+	__le64	rx_packets_cos0;</div><div class='add'>+	__le64	rx_packets_cos1;</div><div class='add'>+	__le64	rx_packets_cos2;</div><div class='add'>+	__le64	rx_packets_cos3;</div><div class='add'>+	__le64	rx_packets_cos4;</div><div class='add'>+	__le64	rx_packets_cos5;</div><div class='add'>+	__le64	rx_packets_cos6;</div><div class='add'>+	__le64	rx_packets_cos7;</div><div class='add'>+	__le64	pfc_pri0_rx_duration_us;</div><div class='add'>+	__le64	pfc_pri0_rx_transitions;</div><div class='add'>+	__le64	pfc_pri1_rx_duration_us;</div><div class='add'>+	__le64	pfc_pri1_rx_transitions;</div><div class='add'>+	__le64	pfc_pri2_rx_duration_us;</div><div class='add'>+	__le64	pfc_pri2_rx_transitions;</div><div class='add'>+	__le64	pfc_pri3_rx_duration_us;</div><div class='add'>+	__le64	pfc_pri3_rx_transitions;</div><div class='add'>+	__le64	pfc_pri4_rx_duration_us;</div><div class='add'>+	__le64	pfc_pri4_rx_transitions;</div><div class='add'>+	__le64	pfc_pri5_rx_duration_us;</div><div class='add'>+	__le64	pfc_pri5_rx_transitions;</div><div class='add'>+	__le64	pfc_pri6_rx_duration_us;</div><div class='add'>+	__le64	pfc_pri6_rx_transitions;</div><div class='add'>+	__le64	pfc_pri7_rx_duration_us;</div><div class='add'>+	__le64	pfc_pri7_rx_transitions;</div><div class='add'>+	__le64	rx_bits;</div><div class='add'>+	__le64	rx_buffer_passed_threshold;</div><div class='add'>+	__le64	rx_pcs_symbol_err;</div><div class='add'>+	__le64	rx_corrected_bits;</div><div class='add'>+	__le64	rx_discard_bytes_cos0;</div><div class='add'>+	__le64	rx_discard_bytes_cos1;</div><div class='add'>+	__le64	rx_discard_bytes_cos2;</div><div class='add'>+	__le64	rx_discard_bytes_cos3;</div><div class='add'>+	__le64	rx_discard_bytes_cos4;</div><div class='add'>+	__le64	rx_discard_bytes_cos5;</div><div class='add'>+	__le64	rx_discard_bytes_cos6;</div><div class='add'>+	__le64	rx_discard_bytes_cos7;</div><div class='add'>+	__le64	rx_discard_packets_cos0;</div><div class='add'>+	__le64	rx_discard_packets_cos1;</div><div class='add'>+	__le64	rx_discard_packets_cos2;</div><div class='add'>+	__le64	rx_discard_packets_cos3;</div><div class='add'>+	__le64	rx_discard_packets_cos4;</div><div class='add'>+	__le64	rx_discard_packets_cos5;</div><div class='add'>+	__le64	rx_discard_packets_cos6;</div><div class='add'>+	__le64	rx_discard_packets_cos7;</div><div class='add'>+	__le64	rx_fec_corrected_blocks;</div><div class='add'>+	__le64	rx_fec_uncorrectable_blocks;</div><div class='add'>+	__le64	rx_filter_miss;</div><div class='add'>+	__le64	rx_fec_symbol_err;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_qstats_ext_input (size:320b/40B) */</div><div class='add'>+struct hwrm_port_qstats_ext_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	__le16	tx_stat_size;</div><div class='add'>+	__le16	rx_stat_size;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_QSTATS_EXT_REQ_FLAGS_COUNTER_MASK     0x1UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le64	tx_stat_host_addr;</div><div class='add'>+	__le64	rx_stat_host_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_qstats_ext_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_qstats_ext_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	tx_stat_size;</div><div class='add'>+	__le16	rx_stat_size;</div><div class='add'>+	__le16	total_active_cos_queues;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_QSTATS_EXT_RESP_FLAGS_CLEAR_ROCE_COUNTERS_SUPPORTED     0x1UL</div><div class='add'>+	#define PORT_QSTATS_EXT_RESP_FLAGS_CLEARED                           0x2UL</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_lpbk_qstats_input (size:256b/32B) */</div><div class='add'>+struct hwrm_port_lpbk_qstats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	lpbk_stat_size;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_LPBK_QSTATS_REQ_FLAGS_COUNTER_MASK     0x1UL</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	__le64	lpbk_stat_host_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_lpbk_qstats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_lpbk_qstats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	lpbk_stat_size;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* port_lpbk_stats (size:640b/80B) */</div><div class='add'>+struct port_lpbk_stats {</div><div class='add'>+	__le64	lpbk_ucast_frames;</div><div class='add'>+	__le64	lpbk_mcast_frames;</div><div class='add'>+	__le64	lpbk_bcast_frames;</div><div class='add'>+	__le64	lpbk_ucast_bytes;</div><div class='add'>+	__le64	lpbk_mcast_bytes;</div><div class='add'>+	__le64	lpbk_bcast_bytes;</div><div class='add'>+	__le64	lpbk_tx_discards;</div><div class='add'>+	__le64	lpbk_tx_errors;</div><div class='add'>+	__le64	lpbk_rx_discards;</div><div class='add'>+	__le64	lpbk_rx_errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_ecn_qstats_input (size:256b/32B) */</div><div class='add'>+struct hwrm_port_ecn_qstats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	__le16	ecn_stat_buf_size;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_ECN_QSTATS_REQ_FLAGS_COUNTER_MASK     0x1UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	__le64	ecn_stat_host_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_ecn_qstats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_ecn_qstats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	ecn_stat_buf_size;</div><div class='add'>+	u8	mark_en;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* port_stats_ecn (size:512b/64B) */</div><div class='add'>+struct port_stats_ecn {</div><div class='add'>+	__le64	mark_cnt_cos0;</div><div class='add'>+	__le64	mark_cnt_cos1;</div><div class='add'>+	__le64	mark_cnt_cos2;</div><div class='add'>+	__le64	mark_cnt_cos3;</div><div class='add'>+	__le64	mark_cnt_cos4;</div><div class='add'>+	__le64	mark_cnt_cos5;</div><div class='add'>+	__le64	mark_cnt_cos6;</div><div class='add'>+	__le64	mark_cnt_cos7;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_clr_stats_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_clr_stats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_CLR_STATS_REQ_FLAGS_ROCE_COUNTERS     0x1UL</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_clr_stats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_clr_stats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_lpbk_clr_stats_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_lpbk_clr_stats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_lpbk_clr_stats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_lpbk_clr_stats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_ts_query_input (size:320b/40B) */</div><div class='add'>+struct hwrm_port_ts_query_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_PATH             0x1UL</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_PATH_TX            0x0UL</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_PATH_RX            0x1UL</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_PATH_LAST         PORT_TS_QUERY_REQ_FLAGS_PATH_RX</div><div class='add'>+	#define PORT_TS_QUERY_REQ_FLAGS_CURRENT_TIME     0x2UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le16	enables;</div><div class='add'>+	#define PORT_TS_QUERY_REQ_ENABLES_TS_REQ_TIMEOUT     0x1UL</div><div class='add'>+	#define PORT_TS_QUERY_REQ_ENABLES_PTP_SEQ_ID         0x2UL</div><div class='add'>+	#define PORT_TS_QUERY_REQ_ENABLES_PTP_HDR_OFFSET     0x4UL</div><div class='add'>+	__le16	ts_req_timeout;</div><div class='add'>+	__le32	ptp_seq_id;</div><div class='add'>+	__le16	ptp_hdr_offset;</div><div class='add'>+	u8	unused_1[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_ts_query_output (size:192b/24B) */</div><div class='add'>+struct hwrm_port_ts_query_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	ptp_msg_ts;</div><div class='add'>+	__le16	ptp_msg_seqid;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_phy_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_qcaps_output (size:320b/40B) */</div><div class='add'>+struct hwrm_port_phy_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS_EEE_SUPPORTED                    0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS_EXTERNAL_LPBK_SUPPORTED          0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS_AUTONEG_LPBK_SUPPORTED           0x4UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS_SHARED_PHY_CFG_SUPPORTED         0x8UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS_CUMULATIVE_COUNTERS_ON_RESET     0x10UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS_LOCAL_LPBK_NOT_SUPPORTED         0x20UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS_FW_MANAGED_LINK_DOWN             0x40UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS_NO_FCS                           0x80UL</div><div class='add'>+	u8	port_cnt;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_PORT_CNT_UNKNOWN 0x0UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_PORT_CNT_1       0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_PORT_CNT_2       0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_PORT_CNT_3       0x3UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_PORT_CNT_4       0x4UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_PORT_CNT_12      0xcUL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_PORT_CNT_LAST   PORT_PHY_QCAPS_RESP_PORT_CNT_12</div><div class='add'>+	__le16	supported_speeds_force_mode;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_100MBHD     0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_100MB       0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_1GBHD       0x4UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_1GB         0x8UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_2GB         0x10UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_2_5GB       0x20UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_10GB        0x40UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_20GB        0x80UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_25GB        0x100UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_40GB        0x200UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_50GB        0x400UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_100GB       0x800UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_10MBHD      0x1000UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_10MB        0x2000UL</div><div class='add'>+	__le16	supported_speeds_auto_mode;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_100MBHD     0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_100MB       0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_1GBHD       0x4UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_1GB         0x8UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_2GB         0x10UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_2_5GB       0x20UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_10GB        0x40UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_20GB        0x80UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_25GB        0x100UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_40GB        0x200UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_50GB        0x400UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_100GB       0x800UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_10MBHD      0x1000UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_10MB        0x2000UL</div><div class='add'>+	__le16	supported_speeds_eee_mode;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_RSVD1     0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_100MB     0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_RSVD2     0x4UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_1GB       0x8UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_RSVD3     0x10UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_RSVD4     0x20UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_10GB      0x40UL</div><div class='add'>+	__le32	tx_lpi_timer_low;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_LOW_MASK 0xffffffUL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_LOW_SFT 0</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_RSVD2_MASK           0xff000000UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_RSVD2_SFT            24</div><div class='add'>+	__le32	valid_tx_lpi_timer_high;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_MASK 0xffffffUL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_SFT 0</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_RSVD_MASK             0xff000000UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_RSVD_SFT              24</div><div class='add'>+	__le16	supported_pam4_speeds_auto_mode;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_PAM4_SPEEDS_AUTO_MODE_50G      0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_PAM4_SPEEDS_AUTO_MODE_100G     0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_PAM4_SPEEDS_AUTO_MODE_200G     0x4UL</div><div class='add'>+	__le16	supported_pam4_speeds_force_mode;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_PAM4_SPEEDS_FORCE_MODE_50G      0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_PAM4_SPEEDS_FORCE_MODE_100G     0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_PAM4_SPEEDS_FORCE_MODE_200G     0x4UL</div><div class='add'>+	__le16	flags2;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS2_PAUSE_UNSUPPORTED           0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS2_PFC_UNSUPPORTED             0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS2_BANK_ADDR_SUPPORTED         0x4UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS2_SPEEDS2_SUPPORTED           0x8UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_FLAGS2_REMOTE_LPBK_UNSUPPORTED     0x10UL</div><div class='add'>+	u8	internal_port_cnt;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	supported_speeds2_force_mode;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_1GB                0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_10GB               0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_25GB               0x4UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_40GB               0x8UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_50GB               0x10UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_100GB              0x20UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_50GB_PAM4_56       0x40UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_100GB_PAM4_56      0x80UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_200GB_PAM4_56      0x100UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_400GB_PAM4_56      0x200UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_100GB_PAM4_112     0x400UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_200GB_PAM4_112     0x800UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_400GB_PAM4_112     0x1000UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_FORCE_MODE_800GB_PAM4_112     0x2000UL</div><div class='add'>+	__le16	supported_speeds2_auto_mode;</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_1GB                0x1UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_10GB               0x2UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_25GB               0x4UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_40GB               0x8UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_50GB               0x10UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_100GB              0x20UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_50GB_PAM4_56       0x40UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_100GB_PAM4_56      0x80UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_200GB_PAM4_56      0x100UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_400GB_PAM4_56      0x200UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_100GB_PAM4_112     0x400UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_200GB_PAM4_112     0x800UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_400GB_PAM4_112     0x1000UL</div><div class='add'>+	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS2_AUTO_MODE_800GB_PAM4_112     0x2000UL</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_i2c_write_input (size:832b/104B) */</div><div class='add'>+struct hwrm_port_phy_i2c_write_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define PORT_PHY_I2C_WRITE_REQ_ENABLES_PAGE_OFFSET     0x1UL</div><div class='add'>+	#define PORT_PHY_I2C_WRITE_REQ_ENABLES_BANK_NUMBER     0x2UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	i2c_slave_addr;</div><div class='add'>+	u8	bank_number;</div><div class='add'>+	__le16	page_number;</div><div class='add'>+	__le16	page_offset;</div><div class='add'>+	u8	data_length;</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+	__le32	data[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_i2c_write_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_phy_i2c_write_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_i2c_read_input (size:320b/40B) */</div><div class='add'>+struct hwrm_port_phy_i2c_read_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define PORT_PHY_I2C_READ_REQ_ENABLES_PAGE_OFFSET     0x1UL</div><div class='add'>+	#define PORT_PHY_I2C_READ_REQ_ENABLES_BANK_NUMBER     0x2UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	i2c_slave_addr;</div><div class='add'>+	u8	bank_number;</div><div class='add'>+	__le16	page_number;</div><div class='add'>+	__le16	page_offset;</div><div class='add'>+	u8	data_length;</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_i2c_read_output (size:640b/80B) */</div><div class='add'>+struct hwrm_port_phy_i2c_read_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	data[16];</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_mdio_write_input (size:320b/40B) */</div><div class='add'>+struct hwrm_port_phy_mdio_write_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	unused_0[2];</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	phy_addr;</div><div class='add'>+	u8	dev_addr;</div><div class='add'>+	__le16	reg_addr;</div><div class='add'>+	__le16	reg_data;</div><div class='add'>+	u8	cl45_mdio;</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_mdio_write_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_phy_mdio_write_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_mdio_read_input (size:256b/32B) */</div><div class='add'>+struct hwrm_port_phy_mdio_read_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	unused_0[2];</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	phy_addr;</div><div class='add'>+	u8	dev_addr;</div><div class='add'>+	__le16	reg_addr;</div><div class='add'>+	u8	cl45_mdio;</div><div class='add'>+	u8	unused_1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_phy_mdio_read_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_phy_mdio_read_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	reg_data;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_led_cfg_input (size:512b/64B) */</div><div class='add'>+struct hwrm_port_led_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED0_ID            0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED0_STATE         0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED0_COLOR         0x4UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED0_BLINK_ON      0x8UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED0_BLINK_OFF     0x10UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED0_GROUP_ID      0x20UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED1_ID            0x40UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED1_STATE         0x80UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED1_COLOR         0x100UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED1_BLINK_ON      0x200UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED1_BLINK_OFF     0x400UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED1_GROUP_ID      0x800UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED2_ID            0x1000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED2_STATE         0x2000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED2_COLOR         0x4000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED2_BLINK_ON      0x8000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED2_BLINK_OFF     0x10000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED2_GROUP_ID      0x20000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED3_ID            0x40000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED3_STATE         0x80000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED3_COLOR         0x100000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED3_BLINK_ON      0x200000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED3_BLINK_OFF     0x400000UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_ENABLES_LED3_GROUP_ID      0x800000UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	num_leds;</div><div class='add'>+	u8	rsvd;</div><div class='add'>+	u8	led0_id;</div><div class='add'>+	u8	led0_state;</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_STATE_DEFAULT  0x0UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_STATE_OFF      0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_STATE_ON       0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_STATE_BLINK    0x3UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_STATE_BLINKALT 0x4UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_STATE_LAST    PORT_LED_CFG_REQ_LED0_STATE_BLINKALT</div><div class='add'>+	u8	led0_color;</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_COLOR_DEFAULT    0x0UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_COLOR_AMBER      0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_COLOR_GREEN      0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_COLOR_GREENAMBER 0x3UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED0_COLOR_LAST      PORT_LED_CFG_REQ_LED0_COLOR_GREENAMBER</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	led0_blink_on;</div><div class='add'>+	__le16	led0_blink_off;</div><div class='add'>+	u8	led0_group_id;</div><div class='add'>+	u8	rsvd0;</div><div class='add'>+	u8	led1_id;</div><div class='add'>+	u8	led1_state;</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_STATE_DEFAULT  0x0UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_STATE_OFF      0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_STATE_ON       0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_STATE_BLINK    0x3UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_STATE_BLINKALT 0x4UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_STATE_LAST    PORT_LED_CFG_REQ_LED1_STATE_BLINKALT</div><div class='add'>+	u8	led1_color;</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_COLOR_DEFAULT    0x0UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_COLOR_AMBER      0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_COLOR_GREEN      0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_COLOR_GREENAMBER 0x3UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED1_COLOR_LAST      PORT_LED_CFG_REQ_LED1_COLOR_GREENAMBER</div><div class='add'>+	u8	unused_1;</div><div class='add'>+	__le16	led1_blink_on;</div><div class='add'>+	__le16	led1_blink_off;</div><div class='add'>+	u8	led1_group_id;</div><div class='add'>+	u8	rsvd1;</div><div class='add'>+	u8	led2_id;</div><div class='add'>+	u8	led2_state;</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_STATE_DEFAULT  0x0UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_STATE_OFF      0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_STATE_ON       0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_STATE_BLINK    0x3UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_STATE_BLINKALT 0x4UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_STATE_LAST    PORT_LED_CFG_REQ_LED2_STATE_BLINKALT</div><div class='add'>+	u8	led2_color;</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_COLOR_DEFAULT    0x0UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_COLOR_AMBER      0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_COLOR_GREEN      0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_COLOR_GREENAMBER 0x3UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED2_COLOR_LAST      PORT_LED_CFG_REQ_LED2_COLOR_GREENAMBER</div><div class='add'>+	u8	unused_2;</div><div class='add'>+	__le16	led2_blink_on;</div><div class='add'>+	__le16	led2_blink_off;</div><div class='add'>+	u8	led2_group_id;</div><div class='add'>+	u8	rsvd2;</div><div class='add'>+	u8	led3_id;</div><div class='add'>+	u8	led3_state;</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_STATE_DEFAULT  0x0UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_STATE_OFF      0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_STATE_ON       0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_STATE_BLINK    0x3UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_STATE_BLINKALT 0x4UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_STATE_LAST    PORT_LED_CFG_REQ_LED3_STATE_BLINKALT</div><div class='add'>+	u8	led3_color;</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_COLOR_DEFAULT    0x0UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_COLOR_AMBER      0x1UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_COLOR_GREEN      0x2UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_COLOR_GREENAMBER 0x3UL</div><div class='add'>+	#define PORT_LED_CFG_REQ_LED3_COLOR_LAST      PORT_LED_CFG_REQ_LED3_COLOR_GREENAMBER</div><div class='add'>+	u8	unused_3;</div><div class='add'>+	__le16	led3_blink_on;</div><div class='add'>+	__le16	led3_blink_off;</div><div class='add'>+	u8	led3_group_id;</div><div class='add'>+	u8	rsvd3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_led_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_led_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_led_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_led_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_led_qcfg_output (size:448b/56B) */</div><div class='add'>+struct hwrm_port_led_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	num_leds;</div><div class='add'>+	u8	led0_id;</div><div class='add'>+	u8	led0_type;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_TYPE_SPEED    0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_TYPE_ACTIVITY 0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_TYPE_INVALID  0xffUL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_TYPE_LAST    PORT_LED_QCFG_RESP_LED0_TYPE_INVALID</div><div class='add'>+	u8	led0_state;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_STATE_DEFAULT  0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_STATE_OFF      0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_STATE_ON       0x2UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_STATE_BLINK    0x3UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_STATE_BLINKALT 0x4UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_STATE_LAST    PORT_LED_QCFG_RESP_LED0_STATE_BLINKALT</div><div class='add'>+	u8	led0_color;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_COLOR_DEFAULT    0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_COLOR_AMBER      0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_COLOR_GREEN      0x2UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_COLOR_GREENAMBER 0x3UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED0_COLOR_LAST      PORT_LED_QCFG_RESP_LED0_COLOR_GREENAMBER</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	led0_blink_on;</div><div class='add'>+	__le16	led0_blink_off;</div><div class='add'>+	u8	led0_group_id;</div><div class='add'>+	u8	led1_id;</div><div class='add'>+	u8	led1_type;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_TYPE_SPEED    0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_TYPE_ACTIVITY 0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_TYPE_INVALID  0xffUL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_TYPE_LAST    PORT_LED_QCFG_RESP_LED1_TYPE_INVALID</div><div class='add'>+	u8	led1_state;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_STATE_DEFAULT  0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_STATE_OFF      0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_STATE_ON       0x2UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_STATE_BLINK    0x3UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_STATE_BLINKALT 0x4UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_STATE_LAST    PORT_LED_QCFG_RESP_LED1_STATE_BLINKALT</div><div class='add'>+	u8	led1_color;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_COLOR_DEFAULT    0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_COLOR_AMBER      0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_COLOR_GREEN      0x2UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_COLOR_GREENAMBER 0x3UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED1_COLOR_LAST      PORT_LED_QCFG_RESP_LED1_COLOR_GREENAMBER</div><div class='add'>+	u8	unused_1;</div><div class='add'>+	__le16	led1_blink_on;</div><div class='add'>+	__le16	led1_blink_off;</div><div class='add'>+	u8	led1_group_id;</div><div class='add'>+	u8	led2_id;</div><div class='add'>+	u8	led2_type;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_TYPE_SPEED    0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_TYPE_ACTIVITY 0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_TYPE_INVALID  0xffUL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_TYPE_LAST    PORT_LED_QCFG_RESP_LED2_TYPE_INVALID</div><div class='add'>+	u8	led2_state;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_STATE_DEFAULT  0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_STATE_OFF      0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_STATE_ON       0x2UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_STATE_BLINK    0x3UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_STATE_BLINKALT 0x4UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_STATE_LAST    PORT_LED_QCFG_RESP_LED2_STATE_BLINKALT</div><div class='add'>+	u8	led2_color;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_COLOR_DEFAULT    0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_COLOR_AMBER      0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_COLOR_GREEN      0x2UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_COLOR_GREENAMBER 0x3UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED2_COLOR_LAST      PORT_LED_QCFG_RESP_LED2_COLOR_GREENAMBER</div><div class='add'>+	u8	unused_2;</div><div class='add'>+	__le16	led2_blink_on;</div><div class='add'>+	__le16	led2_blink_off;</div><div class='add'>+	u8	led2_group_id;</div><div class='add'>+	u8	led3_id;</div><div class='add'>+	u8	led3_type;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_TYPE_SPEED    0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_TYPE_ACTIVITY 0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_TYPE_INVALID  0xffUL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_TYPE_LAST    PORT_LED_QCFG_RESP_LED3_TYPE_INVALID</div><div class='add'>+	u8	led3_state;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_STATE_DEFAULT  0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_STATE_OFF      0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_STATE_ON       0x2UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_STATE_BLINK    0x3UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_STATE_BLINKALT 0x4UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_STATE_LAST    PORT_LED_QCFG_RESP_LED3_STATE_BLINKALT</div><div class='add'>+	u8	led3_color;</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_COLOR_DEFAULT    0x0UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_COLOR_AMBER      0x1UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_COLOR_GREEN      0x2UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_COLOR_GREENAMBER 0x3UL</div><div class='add'>+	#define PORT_LED_QCFG_RESP_LED3_COLOR_LAST      PORT_LED_QCFG_RESP_LED3_COLOR_GREENAMBER</div><div class='add'>+	u8	unused_3;</div><div class='add'>+	__le16	led3_blink_on;</div><div class='add'>+	__le16	led3_blink_off;</div><div class='add'>+	u8	led3_group_id;</div><div class='add'>+	u8	unused_4[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_led_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_led_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_led_qcaps_output (size:384b/48B) */</div><div class='add'>+struct hwrm_port_led_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	num_leds;</div><div class='add'>+	u8	unused[3];</div><div class='add'>+	u8	led0_id;</div><div class='add'>+	u8	led0_type;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_TYPE_SPEED    0x0UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_TYPE_ACTIVITY 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_TYPE_INVALID  0xffUL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_TYPE_LAST    PORT_LED_QCAPS_RESP_LED0_TYPE_INVALID</div><div class='add'>+	u8	led0_group_id;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	led0_state_caps;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_ENABLED                 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_OFF_SUPPORTED           0x2UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_ON_SUPPORTED            0x4UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_BLINK_SUPPORTED         0x8UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_BLINK_ALT_SUPPORTED     0x10UL</div><div class='add'>+	__le16	led0_color_caps;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_RSVD                 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_AMBER_SUPPORTED      0x2UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_GREEN_SUPPORTED      0x4UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_GRNAMB_SUPPORTED     0x8UL</div><div class='add'>+	u8	led1_id;</div><div class='add'>+	u8	led1_type;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_TYPE_SPEED    0x0UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_TYPE_ACTIVITY 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_TYPE_INVALID  0xffUL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_TYPE_LAST    PORT_LED_QCAPS_RESP_LED1_TYPE_INVALID</div><div class='add'>+	u8	led1_group_id;</div><div class='add'>+	u8	unused_1;</div><div class='add'>+	__le16	led1_state_caps;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_ENABLED                 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_OFF_SUPPORTED           0x2UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_ON_SUPPORTED            0x4UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_BLINK_SUPPORTED         0x8UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_BLINK_ALT_SUPPORTED     0x10UL</div><div class='add'>+	__le16	led1_color_caps;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_RSVD                 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_AMBER_SUPPORTED      0x2UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_GREEN_SUPPORTED      0x4UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_GRNAMB_SUPPORTED     0x8UL</div><div class='add'>+	u8	led2_id;</div><div class='add'>+	u8	led2_type;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_TYPE_SPEED    0x0UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_TYPE_ACTIVITY 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_TYPE_INVALID  0xffUL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_TYPE_LAST    PORT_LED_QCAPS_RESP_LED2_TYPE_INVALID</div><div class='add'>+	u8	led2_group_id;</div><div class='add'>+	u8	unused_2;</div><div class='add'>+	__le16	led2_state_caps;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_ENABLED                 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_OFF_SUPPORTED           0x2UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_ON_SUPPORTED            0x4UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_BLINK_SUPPORTED         0x8UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_BLINK_ALT_SUPPORTED     0x10UL</div><div class='add'>+	__le16	led2_color_caps;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_RSVD                 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_AMBER_SUPPORTED      0x2UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_GREEN_SUPPORTED      0x4UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_GRNAMB_SUPPORTED     0x8UL</div><div class='add'>+	u8	led3_id;</div><div class='add'>+	u8	led3_type;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_TYPE_SPEED    0x0UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_TYPE_ACTIVITY 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_TYPE_INVALID  0xffUL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_TYPE_LAST    PORT_LED_QCAPS_RESP_LED3_TYPE_INVALID</div><div class='add'>+	u8	led3_group_id;</div><div class='add'>+	u8	unused_3;</div><div class='add'>+	__le16	led3_state_caps;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_ENABLED                 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_OFF_SUPPORTED           0x2UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_ON_SUPPORTED            0x4UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_BLINK_SUPPORTED         0x8UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_BLINK_ALT_SUPPORTED     0x10UL</div><div class='add'>+	__le16	led3_color_caps;</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_RSVD                 0x1UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_AMBER_SUPPORTED      0x2UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_GREEN_SUPPORTED      0x4UL</div><div class='add'>+	#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_GRNAMB_SUPPORTED     0x8UL</div><div class='add'>+	u8	unused_4[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_mac_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_port_mac_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_port_mac_qcaps_output (size:128b/16B) */</div><div class='add'>+struct hwrm_port_mac_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define PORT_MAC_QCAPS_RESP_FLAGS_LOCAL_LPBK_NOT_SUPPORTED     0x1UL</div><div class='add'>+	#define PORT_MAC_QCAPS_RESP_FLAGS_REMOTE_LPBK_SUPPORTED        0x2UL</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_qportcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_qportcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define QUEUE_QPORTCFG_REQ_FLAGS_PATH     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_REQ_FLAGS_PATH_TX    0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_REQ_FLAGS_PATH_RX    0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_REQ_FLAGS_PATH_LAST QUEUE_QPORTCFG_REQ_FLAGS_PATH_RX</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	drv_qmap_cap;</div><div class='add'>+	#define QUEUE_QPORTCFG_REQ_DRV_QMAP_CAP_DISABLED 0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_REQ_DRV_QMAP_CAP_ENABLED  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_REQ_DRV_QMAP_CAP_LAST    QUEUE_QPORTCFG_REQ_DRV_QMAP_CAP_ENABLED</div><div class='add'>+	u8	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_qportcfg_output (size:1344b/168B) */</div><div class='add'>+struct hwrm_queue_qportcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	max_configurable_queues;</div><div class='add'>+	u8	max_configurable_lossless_queues;</div><div class='add'>+	u8	queue_cfg_allowed;</div><div class='add'>+	u8	queue_cfg_info;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_CFG_INFO_ASYM_CFG             0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_CFG_INFO_USE_PROFILE_TYPE     0x2UL</div><div class='add'>+	u8	queue_pfcenable_cfg_allowed;</div><div class='add'>+	u8	queue_pri2cos_cfg_allowed;</div><div class='add'>+	u8	queue_cos2bw_cfg_allowed;</div><div class='add'>+	u8	queue_id0;</div><div class='add'>+	u8	queue_id0_service_profile;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_id1;</div><div class='add'>+	u8	queue_id1_service_profile;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_id2;</div><div class='add'>+	u8	queue_id2_service_profile;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_id3;</div><div class='add'>+	u8	queue_id3_service_profile;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_id4;</div><div class='add'>+	u8	queue_id4_service_profile;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_id5;</div><div class='add'>+	u8	queue_id5_service_profile;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_id6;</div><div class='add'>+	u8	queue_id6_service_profile;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_id7;</div><div class='add'>+	u8	queue_id7_service_profile;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_id0_service_profile_type;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_TYPE_ROCE     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_TYPE_NIC      0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_TYPE_CNP      0x4UL</div><div class='add'>+	char	qid0_name[16];</div><div class='add'>+	char	qid1_name[16];</div><div class='add'>+	char	qid2_name[16];</div><div class='add'>+	char	qid3_name[16];</div><div class='add'>+	char	qid4_name[16];</div><div class='add'>+	char	qid5_name[16];</div><div class='add'>+	char	qid6_name[16];</div><div class='add'>+	char	qid7_name[16];</div><div class='add'>+	u8	queue_id1_service_profile_type;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_TYPE_ROCE     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_TYPE_NIC      0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_TYPE_CNP      0x4UL</div><div class='add'>+	u8	queue_id2_service_profile_type;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_TYPE_ROCE     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_TYPE_NIC      0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_TYPE_CNP      0x4UL</div><div class='add'>+	u8	queue_id3_service_profile_type;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_TYPE_ROCE     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_TYPE_NIC      0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_TYPE_CNP      0x4UL</div><div class='add'>+	u8	queue_id4_service_profile_type;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_TYPE_ROCE     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_TYPE_NIC      0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_TYPE_CNP      0x4UL</div><div class='add'>+	u8	queue_id5_service_profile_type;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_TYPE_ROCE     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_TYPE_NIC      0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_TYPE_CNP      0x4UL</div><div class='add'>+	u8	queue_id6_service_profile_type;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_TYPE_ROCE     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_TYPE_NIC      0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_TYPE_CNP      0x4UL</div><div class='add'>+	u8	queue_id7_service_profile_type;</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_TYPE_ROCE     0x1UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_TYPE_NIC      0x2UL</div><div class='add'>+	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_TYPE_CNP      0x4UL</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define QUEUE_QCFG_REQ_FLAGS_PATH     0x1UL</div><div class='add'>+	#define QUEUE_QCFG_REQ_FLAGS_PATH_TX    0x0UL</div><div class='add'>+	#define QUEUE_QCFG_REQ_FLAGS_PATH_RX    0x1UL</div><div class='add'>+	#define QUEUE_QCFG_REQ_FLAGS_PATH_LAST QUEUE_QCFG_REQ_FLAGS_PATH_RX</div><div class='add'>+	__le32	queue_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_qcfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	queue_len;</div><div class='add'>+	u8	service_profile;</div><div class='add'>+	#define QUEUE_QCFG_RESP_SERVICE_PROFILE_LOSSY    0x0UL</div><div class='add'>+	#define QUEUE_QCFG_RESP_SERVICE_PROFILE_LOSSLESS 0x1UL</div><div class='add'>+	#define QUEUE_QCFG_RESP_SERVICE_PROFILE_UNKNOWN  0xffUL</div><div class='add'>+	#define QUEUE_QCFG_RESP_SERVICE_PROFILE_LAST    QUEUE_QCFG_RESP_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	queue_cfg_info;</div><div class='add'>+	#define QUEUE_QCFG_RESP_QUEUE_CFG_INFO_ASYM_CFG     0x1UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_cfg_input (size:320b/40B) */</div><div class='add'>+struct hwrm_queue_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define QUEUE_CFG_REQ_FLAGS_PATH_MASK 0x3UL</div><div class='add'>+	#define QUEUE_CFG_REQ_FLAGS_PATH_SFT  0</div><div class='add'>+	#define QUEUE_CFG_REQ_FLAGS_PATH_TX     0x0UL</div><div class='add'>+	#define QUEUE_CFG_REQ_FLAGS_PATH_RX     0x1UL</div><div class='add'>+	#define QUEUE_CFG_REQ_FLAGS_PATH_BIDIR  0x2UL</div><div class='add'>+	#define QUEUE_CFG_REQ_FLAGS_PATH_LAST  QUEUE_CFG_REQ_FLAGS_PATH_BIDIR</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define QUEUE_CFG_REQ_ENABLES_DFLT_LEN            0x1UL</div><div class='add'>+	#define QUEUE_CFG_REQ_ENABLES_SERVICE_PROFILE     0x2UL</div><div class='add'>+	__le32	queue_id;</div><div class='add'>+	__le32	dflt_len;</div><div class='add'>+	u8	service_profile;</div><div class='add'>+	#define QUEUE_CFG_REQ_SERVICE_PROFILE_LOSSY    0x0UL</div><div class='add'>+	#define QUEUE_CFG_REQ_SERVICE_PROFILE_LOSSLESS 0x1UL</div><div class='add'>+	#define QUEUE_CFG_REQ_SERVICE_PROFILE_UNKNOWN  0xffUL</div><div class='add'>+	#define QUEUE_CFG_REQ_SERVICE_PROFILE_LAST    QUEUE_CFG_REQ_SERVICE_PROFILE_UNKNOWN</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcenable_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_pfcenable_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcenable_qcfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_pfcenable_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI0_PFC_ENABLED              0x1UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI1_PFC_ENABLED              0x2UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI2_PFC_ENABLED              0x4UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI3_PFC_ENABLED              0x8UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI4_PFC_ENABLED              0x10UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI5_PFC_ENABLED              0x20UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI6_PFC_ENABLED              0x40UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI7_PFC_ENABLED              0x80UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI0_PFC_WATCHDOG_ENABLED     0x100UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI1_PFC_WATCHDOG_ENABLED     0x200UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI2_PFC_WATCHDOG_ENABLED     0x400UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI3_PFC_WATCHDOG_ENABLED     0x800UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI4_PFC_WATCHDOG_ENABLED     0x1000UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI5_PFC_WATCHDOG_ENABLED     0x2000UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI6_PFC_WATCHDOG_ENABLED     0x4000UL</div><div class='add'>+	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI7_PFC_WATCHDOG_ENABLED     0x8000UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcenable_cfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_pfcenable_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI0_PFC_ENABLED              0x1UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI1_PFC_ENABLED              0x2UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI2_PFC_ENABLED              0x4UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI3_PFC_ENABLED              0x8UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI4_PFC_ENABLED              0x10UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI5_PFC_ENABLED              0x20UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI6_PFC_ENABLED              0x40UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI7_PFC_ENABLED              0x80UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI0_PFC_WATCHDOG_ENABLED     0x100UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI1_PFC_WATCHDOG_ENABLED     0x200UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI2_PFC_WATCHDOG_ENABLED     0x400UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI3_PFC_WATCHDOG_ENABLED     0x800UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI4_PFC_WATCHDOG_ENABLED     0x1000UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI5_PFC_WATCHDOG_ENABLED     0x2000UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI6_PFC_WATCHDOG_ENABLED     0x4000UL</div><div class='add'>+	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI7_PFC_WATCHDOG_ENABLED     0x8000UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcenable_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_pfcenable_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pri2cos_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_pri2cos_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH      0x1UL</div><div class='add'>+	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH_TX     0x0UL</div><div class='add'>+	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH_RX     0x1UL</div><div class='add'>+	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH_LAST  QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH_RX</div><div class='add'>+	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_IVLAN     0x2UL</div><div class='add'>+	u8	port_id;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pri2cos_qcfg_output (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_pri2cos_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	pri0_cos_queue_id;</div><div class='add'>+	u8	pri1_cos_queue_id;</div><div class='add'>+	u8	pri2_cos_queue_id;</div><div class='add'>+	u8	pri3_cos_queue_id;</div><div class='add'>+	u8	pri4_cos_queue_id;</div><div class='add'>+	u8	pri5_cos_queue_id;</div><div class='add'>+	u8	pri6_cos_queue_id;</div><div class='add'>+	u8	pri7_cos_queue_id;</div><div class='add'>+	u8	queue_cfg_info;</div><div class='add'>+	#define QUEUE_PRI2COS_QCFG_RESP_QUEUE_CFG_INFO_ASYM_CFG     0x1UL</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pri2cos_cfg_input (size:320b/40B) */</div><div class='add'>+struct hwrm_queue_pri2cos_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_MASK 0x3UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_SFT  0</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_TX     0x0UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_RX     0x1UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_BIDIR  0x2UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_LAST  QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_BIDIR</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_IVLAN     0x4UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI0_COS_QUEUE_ID     0x1UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI1_COS_QUEUE_ID     0x2UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI2_COS_QUEUE_ID     0x4UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI3_COS_QUEUE_ID     0x8UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI4_COS_QUEUE_ID     0x10UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI5_COS_QUEUE_ID     0x20UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI6_COS_QUEUE_ID     0x40UL</div><div class='add'>+	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI7_COS_QUEUE_ID     0x80UL</div><div class='add'>+	u8	port_id;</div><div class='add'>+	u8	pri0_cos_queue_id;</div><div class='add'>+	u8	pri1_cos_queue_id;</div><div class='add'>+	u8	pri2_cos_queue_id;</div><div class='add'>+	u8	pri3_cos_queue_id;</div><div class='add'>+	u8	pri4_cos_queue_id;</div><div class='add'>+	u8	pri5_cos_queue_id;</div><div class='add'>+	u8	pri6_cos_queue_id;</div><div class='add'>+	u8	pri7_cos_queue_id;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pri2cos_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_pri2cos_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_cos2bw_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_cos2bw_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_cos2bw_qcfg_output (size:896b/112B) */</div><div class='add'>+struct hwrm_queue_cos2bw_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	queue_id0;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	unused_1;</div><div class='add'>+	__le32	queue_id0_min_bw;</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE_BYTES</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	__le32	queue_id0_max_bw;</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	u8	queue_id0_tsa_assign;</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_TSA_ASSIGN_SP             0x0UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_TSA_ASSIGN_ETS            0x1UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='add'>+	u8	queue_id0_pri_lvl;</div><div class='add'>+	u8	queue_id0_bw_weight;</div><div class='add'>+	struct {</div><div class='add'>+		u8	queue_id;</div><div class='add'>+		__le32	queue_id_min_bw;</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_SCALE_BYTES</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+		__le32	queue_id_max_bw;</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+		u8	queue_id_tsa_assign;</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_TSA_ASSIGN_SP             0x0UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_TSA_ASSIGN_ETS            0x1UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='add'>+	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='add'>+		u8	queue_id_pri_lvl;</div><div class='add'>+		u8	queue_id_bw_weight;</div><div class='add'>+	} __packed cfg[7];</div><div class='add'>+	u8	unused_2[4];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_cos2bw_cfg_input (size:1024b/128B) */</div><div class='add'>+struct hwrm_queue_cos2bw_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID     0x1UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID1_VALID     0x2UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID2_VALID     0x4UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID3_VALID     0x8UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID4_VALID     0x10UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID5_VALID     0x20UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID6_VALID     0x40UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID7_VALID     0x80UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	queue_id0;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le32	queue_id0_min_bw;</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE_BYTES</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	__le32	queue_id0_max_bw;</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	u8	queue_id0_tsa_assign;</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_TSA_ASSIGN_SP             0x0UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_TSA_ASSIGN_ETS            0x1UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='add'>+	u8	queue_id0_pri_lvl;</div><div class='add'>+	u8	queue_id0_bw_weight;</div><div class='add'>+	struct {</div><div class='add'>+		u8	queue_id;</div><div class='add'>+		__le32	queue_id_min_bw;</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_SCALE_BYTES</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+		__le32	queue_id_max_bw;</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+		u8	queue_id_tsa_assign;</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_TSA_ASSIGN_SP             0x0UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_TSA_ASSIGN_ETS            0x1UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='add'>+	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='add'>+		u8	queue_id_pri_lvl;</div><div class='add'>+		u8	queue_id_bw_weight;</div><div class='add'>+	} __packed cfg[7];</div><div class='add'>+	u8	unused_1[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_cos2bw_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_cos2bw_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_dscp_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_dscp_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	port_id;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_dscp_qcaps_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_dscp_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	num_dscp_bits;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	max_entries;</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_dscp2pri_qcfg_input (size:256b/32B) */</div><div class='add'>+struct hwrm_queue_dscp2pri_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	dest_data_addr;</div><div class='add'>+	u8	port_id;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	dest_data_buffer_size;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_dscp2pri_qcfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_dscp2pri_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	entry_cnt;</div><div class='add'>+	u8	default_pri;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_dscp2pri_cfg_input (size:320b/40B) */</div><div class='add'>+struct hwrm_queue_dscp2pri_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	src_data_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define QUEUE_DSCP2PRI_CFG_REQ_FLAGS_USE_HW_DEFAULT_PRI     0x1UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define QUEUE_DSCP2PRI_CFG_REQ_ENABLES_DEFAULT_PRI     0x1UL</div><div class='add'>+	u8	port_id;</div><div class='add'>+	u8	default_pri;</div><div class='add'>+	__le16	entry_cnt;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_dscp2pri_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_dscp2pri_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcwd_timeout_qcaps_input (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_pfcwd_timeout_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcwd_timeout_qcaps_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_pfcwd_timeout_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	max_pfcwd_timeout;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcwd_timeout_cfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_queue_pfcwd_timeout_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	pfcwd_timeout_value;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcwd_timeout_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_pfcwd_timeout_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcwd_timeout_qcfg_input (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_pfcwd_timeout_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_queue_pfcwd_timeout_qcfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_queue_pfcwd_timeout_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	pfcwd_timeout_value;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_alloc_input (size:192b/24B) */</div><div class='add'>+struct hwrm_vnic_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define VNIC_ALLOC_REQ_FLAGS_DEFAULT                  0x1UL</div><div class='add'>+	#define VNIC_ALLOC_REQ_FLAGS_VIRTIO_NET_FID_VALID     0x2UL</div><div class='add'>+	#define VNIC_ALLOC_REQ_FLAGS_VNIC_ID_VALID            0x4UL</div><div class='add'>+	__le16	virtio_net_fid;</div><div class='add'>+	__le16	vnic_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	vnic_id;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_update_input (size:256b/32B) */</div><div class='add'>+struct hwrm_vnic_update_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	vnic_id;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define VNIC_UPDATE_REQ_ENABLES_VNIC_STATE_VALID               0x1UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_ENABLES_MRU_VALID                      0x2UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_ENABLES_METADATA_FORMAT_TYPE_VALID     0x4UL</div><div class='add'>+	u8	vnic_state;</div><div class='add'>+	#define VNIC_UPDATE_REQ_VNIC_STATE_NORMAL 0x0UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_VNIC_STATE_DROP   0x1UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_VNIC_STATE_LAST  VNIC_UPDATE_REQ_VNIC_STATE_DROP</div><div class='add'>+	u8	metadata_format_type;</div><div class='add'>+	#define VNIC_UPDATE_REQ_METADATA_FORMAT_TYPE_0 0x0UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_METADATA_FORMAT_TYPE_1 0x1UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_METADATA_FORMAT_TYPE_2 0x2UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_METADATA_FORMAT_TYPE_3 0x3UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_METADATA_FORMAT_TYPE_4 0x4UL</div><div class='add'>+	#define VNIC_UPDATE_REQ_METADATA_FORMAT_TYPE_LAST VNIC_UPDATE_REQ_METADATA_FORMAT_TYPE_4</div><div class='add'>+	__le16	mru;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_update_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_update_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_vnic_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	vnic_id;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_cfg_input (size:384b/48B) */</div><div class='add'>+struct hwrm_vnic_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define VNIC_CFG_REQ_FLAGS_DEFAULT                              0x1UL</div><div class='add'>+	#define VNIC_CFG_REQ_FLAGS_VLAN_STRIP_MODE                      0x2UL</div><div class='add'>+	#define VNIC_CFG_REQ_FLAGS_BD_STALL_MODE                        0x4UL</div><div class='add'>+	#define VNIC_CFG_REQ_FLAGS_ROCE_DUAL_VNIC_MODE                  0x8UL</div><div class='add'>+	#define VNIC_CFG_REQ_FLAGS_ROCE_ONLY_VNIC_MODE                  0x10UL</div><div class='add'>+	#define VNIC_CFG_REQ_FLAGS_RSS_DFLT_CR_MODE                     0x20UL</div><div class='add'>+	#define VNIC_CFG_REQ_FLAGS_ROCE_MIRRORING_CAPABLE_VNIC_MODE     0x40UL</div><div class='add'>+	#define VNIC_CFG_REQ_FLAGS_PORTCOS_MAPPING_MODE                 0x80UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_DFLT_RING_GRP            0x1UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_RSS_RULE                 0x2UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_COS_RULE                 0x4UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_LB_RULE                  0x8UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_MRU                      0x10UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_DEFAULT_RX_RING_ID       0x20UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_DEFAULT_CMPL_RING_ID     0x40UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_QUEUE_ID                 0x80UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_RX_CSUM_V2_MODE          0x100UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_L2_CQE_MODE              0x200UL</div><div class='add'>+	#define VNIC_CFG_REQ_ENABLES_RAW_QP_ID                0x400UL</div><div class='add'>+	__le16	vnic_id;</div><div class='add'>+	__le16	dflt_ring_grp;</div><div class='add'>+	__le16	rss_rule;</div><div class='add'>+	__le16	cos_rule;</div><div class='add'>+	__le16	lb_rule;</div><div class='add'>+	__le16	mru;</div><div class='add'>+	__le16	default_rx_ring_id;</div><div class='add'>+	__le16	default_cmpl_ring_id;</div><div class='add'>+	__le16	queue_id;</div><div class='add'>+	u8	rx_csum_v2_mode;</div><div class='add'>+	#define VNIC_CFG_REQ_RX_CSUM_V2_MODE_DEFAULT 0x0UL</div><div class='add'>+	#define VNIC_CFG_REQ_RX_CSUM_V2_MODE_ALL_OK  0x1UL</div><div class='add'>+	#define VNIC_CFG_REQ_RX_CSUM_V2_MODE_MAX     0x2UL</div><div class='add'>+	#define VNIC_CFG_REQ_RX_CSUM_V2_MODE_LAST   VNIC_CFG_REQ_RX_CSUM_V2_MODE_MAX</div><div class='add'>+	u8	l2_cqe_mode;</div><div class='add'>+	#define VNIC_CFG_REQ_L2_CQE_MODE_DEFAULT    0x0UL</div><div class='add'>+	#define VNIC_CFG_REQ_L2_CQE_MODE_COMPRESSED 0x1UL</div><div class='add'>+	#define VNIC_CFG_REQ_L2_CQE_MODE_MIXED      0x2UL</div><div class='add'>+	#define VNIC_CFG_REQ_L2_CQE_MODE_LAST      VNIC_CFG_REQ_L2_CQE_MODE_MIXED</div><div class='add'>+	__le32	raw_qp_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_vnic_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_qcaps_output (size:192b/24B) */</div><div class='add'>+struct hwrm_vnic_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	mru;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_UNUSED                                  0x1UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_VLAN_STRIP_CAP                          0x2UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_BD_STALL_CAP                            0x4UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_ROCE_DUAL_VNIC_CAP                      0x8UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_ROCE_ONLY_VNIC_CAP                      0x10UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_DFLT_CR_CAP                         0x20UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_ROCE_MIRRORING_CAPABLE_VNIC_CAP         0x40UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_OUTERMOST_RSS_CAP                       0x80UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_COS_ASSIGNMENT_CAP                      0x100UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RX_CMPL_V2_CAP                          0x200UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_VNIC_STATE_CAP                          0x400UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_VIRTIO_NET_VNIC_ALLOC_CAP               0x800UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_METADATA_FORMAT_CAP                     0x1000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_STRICT_HASH_TYPE_CAP                0x2000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_HASH_TYPE_DELTA_CAP                 0x4000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RING_SELECT_MODE_TOEPLITZ_CAP           0x8000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RING_SELECT_MODE_XOR_CAP                0x10000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RING_SELECT_MODE_TOEPLITZ_CHKSM_CAP     0x20000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_IPV6_FLOW_LABEL_CAP                 0x40000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RX_CMPL_V3_CAP                          0x80000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_L2_CQE_MODE_CAP                         0x100000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_AH_SPI_IPV4_CAP               0x200000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_ESP_SPI_IPV4_CAP              0x400000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_AH_SPI_IPV6_CAP               0x800000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_ESP_SPI_IPV6_CAP              0x1000000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_OUTERMOST_RSS_TRUSTED_VF_CAP            0x2000000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_PORTCOS_MAPPING_MODE                    0x4000000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RSS_PROF_TCAM_MODE_ENABLED              0x8000000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_VNIC_RSS_HASH_MODE_CAP                  0x10000000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_HW_TUNNEL_TPA_CAP                       0x20000000UL</div><div class='add'>+	#define VNIC_QCAPS_RESP_FLAGS_RE_FLUSH_CAP                            0x40000000UL</div><div class='add'>+	__le16	max_aggs_supported;</div><div class='add'>+	u8	unused_1[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_tpa_cfg_input (size:384b/48B) */</div><div class='add'>+struct hwrm_vnic_tpa_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_TPA                       0x1UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_ENCAP_TPA                 0x2UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_RSC_WND_UPDATE            0x4UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_GRO                       0x8UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_AGG_WITH_ECN              0x10UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_AGG_WITH_SAME_GRE_SEQ     0x20UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_GRO_IPID_CHECK            0x40UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_GRO_TTL_CHECK             0x80UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_FLAGS_AGG_PACK_AS_GRO           0x100UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_ENABLES_MAX_AGG_SEGS      0x1UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_ENABLES_MAX_AGGS          0x2UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_ENABLES_MAX_AGG_TIMER     0x4UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_ENABLES_MIN_AGG_LEN       0x8UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_ENABLES_TNL_TPA_EN        0x10UL</div><div class='add'>+	__le16	vnic_id;</div><div class='add'>+	__le16	max_agg_segs;</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_1   0x0UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_2   0x1UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_4   0x2UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_8   0x3UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_MAX 0x1fUL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_LAST VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_MAX</div><div class='add'>+	__le16	max_aggs;</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGGS_1   0x0UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGGS_2   0x1UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGGS_4   0x2UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGGS_8   0x3UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGGS_16  0x4UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGGS_MAX 0x7UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_MAX_AGGS_LAST VNIC_TPA_CFG_REQ_MAX_AGGS_MAX</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le32	max_agg_timer;</div><div class='add'>+	__le32	min_agg_len;</div><div class='add'>+	__le32	tnl_tpa_en_bitmap;</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_VXLAN           0x1UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_GENEVE          0x2UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_NVGRE           0x4UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_GRE             0x8UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_IPV4            0x10UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_IPV6            0x20UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_VXLAN_GPE       0x40UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_VXLAN_CUST1     0x80UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_GRE_CUST1       0x100UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_UPAR1           0x200UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_UPAR2           0x400UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_UPAR3           0x800UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_UPAR4           0x1000UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_UPAR5           0x2000UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_UPAR6           0x4000UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_UPAR7           0x8000UL</div><div class='add'>+	#define VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_UPAR8           0x10000UL</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_tpa_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_tpa_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_tpa_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_vnic_tpa_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	vnic_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_tpa_qcfg_output (size:256b/32B) */</div><div class='add'>+struct hwrm_vnic_tpa_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_FLAGS_TPA                       0x1UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_FLAGS_ENCAP_TPA                 0x2UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_FLAGS_RSC_WND_UPDATE            0x4UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_FLAGS_GRO                       0x8UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_FLAGS_AGG_WITH_ECN              0x10UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_FLAGS_AGG_WITH_SAME_GRE_SEQ     0x20UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_FLAGS_GRO_IPID_CHECK            0x40UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_FLAGS_GRO_TTL_CHECK             0x80UL</div><div class='add'>+	__le16	max_agg_segs;</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_1   0x0UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_2   0x1UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_4   0x2UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_8   0x3UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_MAX 0x1fUL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_LAST VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_MAX</div><div class='add'>+	__le16	max_aggs;</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_1   0x0UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_2   0x1UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_4   0x2UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_8   0x3UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_16  0x4UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_MAX 0x7UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_LAST VNIC_TPA_QCFG_RESP_MAX_AGGS_MAX</div><div class='add'>+	__le32	max_agg_timer;</div><div class='add'>+	__le32	min_agg_len;</div><div class='add'>+	__le32	tnl_tpa_en_bitmap;</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_VXLAN           0x1UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_GENEVE          0x2UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_NVGRE           0x4UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_GRE             0x8UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_IPV4            0x10UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_IPV6            0x20UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_VXLAN_GPE       0x40UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_VXLAN_CUST1     0x80UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_GRE_CUST1       0x100UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_UPAR1           0x200UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_UPAR2           0x400UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_UPAR3           0x800UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_UPAR4           0x1000UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_UPAR5           0x2000UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_UPAR6           0x4000UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_UPAR7           0x8000UL</div><div class='add'>+	#define VNIC_TPA_QCFG_RESP_TNL_TPA_EN_BITMAP_UPAR8           0x10000UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_cfg_input (size:384b/48B) */</div><div class='add'>+struct hwrm_vnic_rss_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	hash_type;</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4                0x1UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4            0x2UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4            0x4UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6                0x8UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6            0x10UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6            0x20UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6_FLOW_LABEL     0x40UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_AH_SPI_IPV4         0x80UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_ESP_SPI_IPV4        0x100UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_AH_SPI_IPV6         0x200UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_TYPE_ESP_SPI_IPV6        0x400UL</div><div class='add'>+	__le16	vnic_id;</div><div class='add'>+	u8	ring_table_pair_index;</div><div class='add'>+	u8	hash_mode_flags;</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_DEFAULT         0x1UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_INNERMOST_4     0x2UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_INNERMOST_2     0x4UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_OUTERMOST_4     0x8UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_OUTERMOST_2     0x10UL</div><div class='add'>+	__le64	ring_grp_tbl_addr;</div><div class='add'>+	__le64	hash_key_tbl_addr;</div><div class='add'>+	__le16	rss_ctx_idx;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_FLAGS_HASH_TYPE_INCLUDE               0x1UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_FLAGS_HASH_TYPE_EXCLUDE               0x2UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_FLAGS_IPSEC_HASH_TYPE_CFG_SUPPORT     0x4UL</div><div class='add'>+	u8	ring_select_mode;</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_RING_SELECT_MODE_TOEPLITZ          0x0UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_RING_SELECT_MODE_XOR               0x1UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_RING_SELECT_MODE_TOEPLITZ_CHECKSUM 0x2UL</div><div class='add'>+	#define VNIC_RSS_CFG_REQ_RING_SELECT_MODE_LAST             VNIC_RSS_CFG_REQ_RING_SELECT_MODE_TOEPLITZ_CHECKSUM</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_rss_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_cfg_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_vnic_rss_cfg_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_UNKNOWN                      0x0UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_INTERFACE_NOT_READY          0x1UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_UNABLE_TO_GET_RSS_CFG        0x2UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_HASH_TYPE_UNSUPPORTED        0x3UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_HASH_TYPE_ERR                0x4UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_HASH_MODE_FAIL               0x5UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_RING_GRP_TABLE_ALLOC_ERR     0x6UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_HASH_KEY_ALLOC_ERR           0x7UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_DMA_FAILED                   0x8UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_RX_RING_ALLOC_ERR            0x9UL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_CMPL_RING_ALLOC_ERR          0xaUL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_HW_SET_RSS_FAILED            0xbUL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_CTX_INVALID                  0xcUL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_VNIC_INVALID                 0xdUL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_VNIC_RING_TABLE_PAIR_INVALID 0xeUL</div><div class='add'>+	#define VNIC_RSS_CFG_CMD_ERR_CODE_LAST                        VNIC_RSS_CFG_CMD_ERR_CODE_VNIC_RING_TABLE_PAIR_INVALID</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_vnic_rss_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	rss_ctx_idx;</div><div class='add'>+	__le16	vnic_id;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_qcfg_output (size:512b/64B) */</div><div class='add'>+struct hwrm_vnic_rss_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	hash_type;</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_IPV4                0x1UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_TCP_IPV4            0x2UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_UDP_IPV4            0x4UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_IPV6                0x8UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_TCP_IPV6            0x10UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_UDP_IPV6            0x20UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_IPV6_FLOW_LABEL     0x40UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_AH_SPI_IPV4         0x80UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_ESP_SPI_IPV4        0x100UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_AH_SPI_IPV6         0x200UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_TYPE_ESP_SPI_IPV6        0x400UL</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	__le32	hash_key[10];</div><div class='add'>+	u8	hash_mode_flags;</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_MODE_FLAGS_DEFAULT         0x1UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_MODE_FLAGS_INNERMOST_4     0x2UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_MODE_FLAGS_INNERMOST_2     0x4UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_MODE_FLAGS_OUTERMOST_4     0x8UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_HASH_MODE_FLAGS_OUTERMOST_2     0x10UL</div><div class='add'>+	u8	ring_select_mode;</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_RING_SELECT_MODE_TOEPLITZ          0x0UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_RING_SELECT_MODE_XOR               0x1UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_RING_SELECT_MODE_TOEPLITZ_CHECKSUM 0x2UL</div><div class='add'>+	#define VNIC_RSS_QCFG_RESP_RING_SELECT_MODE_LAST             VNIC_RSS_QCFG_RESP_RING_SELECT_MODE_TOEPLITZ_CHECKSUM</div><div class='add'>+	u8	unused_1[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_plcmodes_cfg_input (size:320b/40B) */</div><div class='add'>+struct hwrm_vnic_plcmodes_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_FLAGS_REGULAR_PLACEMENT     0x1UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_FLAGS_JUMBO_PLACEMENT       0x2UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV4              0x4UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6              0x8UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_FCOE              0x10UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_ROCE              0x20UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_FLAGS_VIRTIO_PLACEMENT      0x40UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_ENABLES_JUMBO_THRESH_VALID      0x1UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_OFFSET_VALID        0x2UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID     0x4UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_REQ_ENABLES_MAX_BDS_VALID           0x8UL</div><div class='add'>+	__le32	vnic_id;</div><div class='add'>+	__le16	jumbo_thresh;</div><div class='add'>+	__le16	hds_offset;</div><div class='add'>+	__le16	hds_threshold;</div><div class='add'>+	__le16	max_bds;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_plcmodes_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_plcmodes_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_plcmodes_cfg_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_vnic_plcmodes_cfg_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define VNIC_PLCMODES_CFG_CMD_ERR_CODE_UNKNOWN               0x0UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_CMD_ERR_CODE_INVALID_HDS_THRESHOLD 0x1UL</div><div class='add'>+	#define VNIC_PLCMODES_CFG_CMD_ERR_CODE_LAST                 VNIC_PLCMODES_CFG_CMD_ERR_CODE_INVALID_HDS_THRESHOLD</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_cos_lb_ctx_alloc_input (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_rss_cos_lb_ctx_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_cos_lb_ctx_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_rss_cos_lb_ctx_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	rss_cos_lb_ctx_id;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_cos_lb_ctx_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_vnic_rss_cos_lb_ctx_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	rss_cos_lb_ctx_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vnic_rss_cos_lb_ctx_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_vnic_rss_cos_lb_ctx_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_alloc_input (size:768b/96B) */</div><div class='add'>+struct hwrm_ring_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_RING_ARB_CFG              0x2UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_STAT_CTX_ID_VALID         0x8UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_MAX_BW_VALID              0x20UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_RX_RING_ID_VALID          0x40UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_NQ_RING_ID_VALID          0x80UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_RX_BUF_SIZE_VALID         0x100UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_SCHQ_ID                   0x200UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_MPC_CHNLS_TYPE            0x400UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_STEERING_TAG_VALID        0x800UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_RX_RATE_PROFILE_VALID     0x1000UL</div><div class='add'>+	#define RING_ALLOC_REQ_ENABLES_DPI_VALID                 0x2000UL</div><div class='add'>+	u8	ring_type;</div><div class='add'>+	#define RING_ALLOC_REQ_RING_TYPE_L2_CMPL   0x0UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_TYPE_TX        0x1UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_TYPE_RX        0x2UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_TYPE_ROCE_CMPL 0x3UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_TYPE_RX_AGG    0x4UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_TYPE_NQ        0x5UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_TYPE_LAST     RING_ALLOC_REQ_RING_TYPE_NQ</div><div class='add'>+	u8	cmpl_coal_cnt;</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_OFF 0x0UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_4   0x1UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_8   0x2UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_12  0x3UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_16  0x4UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_24  0x5UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_32  0x6UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_48  0x7UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_64  0x8UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_96  0x9UL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_128 0xaUL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_192 0xbUL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_256 0xcUL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_320 0xdUL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_384 0xeUL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_MAX 0xfUL</div><div class='add'>+	#define RING_ALLOC_REQ_CMPL_COAL_CNT_LAST    RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_MAX</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define RING_ALLOC_REQ_FLAGS_RX_SOP_PAD                        0x1UL</div><div class='add'>+	#define RING_ALLOC_REQ_FLAGS_DISABLE_CQ_OVERFLOW_DETECTION     0x2UL</div><div class='add'>+	#define RING_ALLOC_REQ_FLAGS_NQ_DBR_PACING                     0x4UL</div><div class='add'>+	#define RING_ALLOC_REQ_FLAGS_TX_PKT_TS_CMPL_ENABLE             0x8UL</div><div class='add'>+	__le64	page_tbl_addr;</div><div class='add'>+	__le32	fbo;</div><div class='add'>+	u8	page_size;</div><div class='add'>+	u8	page_tbl_depth;</div><div class='add'>+	__le16	schq_id;</div><div class='add'>+	__le32	length;</div><div class='add'>+	__le16	logical_id;</div><div class='add'>+	__le16	cmpl_ring_id;</div><div class='add'>+	__le16	queue_id;</div><div class='add'>+	__le16	rx_buf_size;</div><div class='add'>+	__le16	rx_ring_id;</div><div class='add'>+	__le16	nq_ring_id;</div><div class='add'>+	__le16	ring_arb_cfg;</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_MASK      0xfUL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_SFT       0</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_SP          0x1UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_WFQ         0x2UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_LAST       RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_WFQ</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_RSVD_MASK            0xf0UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_RSVD_SFT             4</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_PARAM_MASK 0xff00UL</div><div class='add'>+	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_PARAM_SFT 8</div><div class='add'>+	__le16	steering_tag;</div><div class='add'>+	__le32	reserved3;</div><div class='add'>+	__le32	stat_ctx_id;</div><div class='add'>+	__le32	reserved4;</div><div class='add'>+	__le32	max_bw;</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_SFT              0</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_SCALE                     0x10000000UL</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_SCALE_LAST                 RING_ALLOC_REQ_MAX_BW_SCALE_BYTES</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='add'>+	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_LAST         RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='add'>+	u8	int_mode;</div><div class='add'>+	#define RING_ALLOC_REQ_INT_MODE_LEGACY 0x0UL</div><div class='add'>+	#define RING_ALLOC_REQ_INT_MODE_RSVD   0x1UL</div><div class='add'>+	#define RING_ALLOC_REQ_INT_MODE_MSIX   0x2UL</div><div class='add'>+	#define RING_ALLOC_REQ_INT_MODE_POLL   0x3UL</div><div class='add'>+	#define RING_ALLOC_REQ_INT_MODE_LAST  RING_ALLOC_REQ_INT_MODE_POLL</div><div class='add'>+	u8	mpc_chnls_type;</div><div class='add'>+	#define RING_ALLOC_REQ_MPC_CHNLS_TYPE_TCE     0x0UL</div><div class='add'>+	#define RING_ALLOC_REQ_MPC_CHNLS_TYPE_RCE     0x1UL</div><div class='add'>+	#define RING_ALLOC_REQ_MPC_CHNLS_TYPE_TE_CFA  0x2UL</div><div class='add'>+	#define RING_ALLOC_REQ_MPC_CHNLS_TYPE_RE_CFA  0x3UL</div><div class='add'>+	#define RING_ALLOC_REQ_MPC_CHNLS_TYPE_PRIMATE 0x4UL</div><div class='add'>+	#define RING_ALLOC_REQ_MPC_CHNLS_TYPE_LAST   RING_ALLOC_REQ_MPC_CHNLS_TYPE_PRIMATE</div><div class='add'>+	u8	rx_rate_profile_sel;</div><div class='add'>+	#define RING_ALLOC_REQ_RX_RATE_PROFILE_SEL_DEFAULT   0x0UL</div><div class='add'>+	#define RING_ALLOC_REQ_RX_RATE_PROFILE_SEL_POLL_MODE 0x1UL</div><div class='add'>+	#define RING_ALLOC_REQ_RX_RATE_PROFILE_SEL_LAST     RING_ALLOC_REQ_RX_RATE_PROFILE_SEL_POLL_MODE</div><div class='add'>+	u8	unused_4;</div><div class='add'>+	__le64	cq_handle;</div><div class='add'>+	__le16	dpi;</div><div class='add'>+	__le16	unused_5[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_ring_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	ring_id;</div><div class='add'>+	__le16	logical_ring_id;</div><div class='add'>+	u8	push_buffer_index;</div><div class='add'>+	#define RING_ALLOC_RESP_PUSH_BUFFER_INDEX_PING_BUFFER 0x0UL</div><div class='add'>+	#define RING_ALLOC_RESP_PUSH_BUFFER_INDEX_PONG_BUFFER 0x1UL</div><div class='add'>+	#define RING_ALLOC_RESP_PUSH_BUFFER_INDEX_LAST       RING_ALLOC_RESP_PUSH_BUFFER_INDEX_PONG_BUFFER</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_free_input (size:256b/32B) */</div><div class='add'>+struct hwrm_ring_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	ring_type;</div><div class='add'>+	#define RING_FREE_REQ_RING_TYPE_L2_CMPL   0x0UL</div><div class='add'>+	#define RING_FREE_REQ_RING_TYPE_TX        0x1UL</div><div class='add'>+	#define RING_FREE_REQ_RING_TYPE_RX        0x2UL</div><div class='add'>+	#define RING_FREE_REQ_RING_TYPE_ROCE_CMPL 0x3UL</div><div class='add'>+	#define RING_FREE_REQ_RING_TYPE_RX_AGG    0x4UL</div><div class='add'>+	#define RING_FREE_REQ_RING_TYPE_NQ        0x5UL</div><div class='add'>+	#define RING_FREE_REQ_RING_TYPE_LAST     RING_FREE_REQ_RING_TYPE_NQ</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define RING_FREE_REQ_FLAGS_VIRTIO_RING_VALID 0x1UL</div><div class='add'>+	#define RING_FREE_REQ_FLAGS_LAST             RING_FREE_REQ_FLAGS_VIRTIO_RING_VALID</div><div class='add'>+	__le16	ring_id;</div><div class='add'>+	__le32	prod_idx;</div><div class='add'>+	__le32	opaque;</div><div class='add'>+	__le32	unused_1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_ring_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_reset_input (size:192b/24B) */</div><div class='add'>+struct hwrm_ring_reset_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	ring_type;</div><div class='add'>+	#define RING_RESET_REQ_RING_TYPE_L2_CMPL     0x0UL</div><div class='add'>+	#define RING_RESET_REQ_RING_TYPE_TX          0x1UL</div><div class='add'>+	#define RING_RESET_REQ_RING_TYPE_RX          0x2UL</div><div class='add'>+	#define RING_RESET_REQ_RING_TYPE_ROCE_CMPL   0x3UL</div><div class='add'>+	#define RING_RESET_REQ_RING_TYPE_RX_RING_GRP 0x6UL</div><div class='add'>+	#define RING_RESET_REQ_RING_TYPE_LAST       RING_RESET_REQ_RING_TYPE_RX_RING_GRP</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	ring_id;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_reset_output (size:128b/16B) */</div><div class='add'>+struct hwrm_ring_reset_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	push_buffer_index;</div><div class='add'>+	#define RING_RESET_RESP_PUSH_BUFFER_INDEX_PING_BUFFER 0x0UL</div><div class='add'>+	#define RING_RESET_RESP_PUSH_BUFFER_INDEX_PONG_BUFFER 0x1UL</div><div class='add'>+	#define RING_RESET_RESP_PUSH_BUFFER_INDEX_LAST       RING_RESET_RESP_PUSH_BUFFER_INDEX_PONG_BUFFER</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	consumer_idx[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_aggint_qcaps_input (size:128b/16B) */</div><div class='add'>+struct hwrm_ring_aggint_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_aggint_qcaps_output (size:384b/48B) */</div><div class='add'>+struct hwrm_ring_aggint_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	cmpl_params;</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_INT_LAT_TMR_MIN                  0x1UL</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_INT_LAT_TMR_MAX                  0x2UL</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_TIMER_RESET                      0x4UL</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_RING_IDLE                        0x8UL</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_NUM_CMPL_DMA_AGGR                0x10UL</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_NUM_CMPL_DMA_AGGR_DURING_INT     0x20UL</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_CMPL_AGGR_DMA_TMR                0x40UL</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_CMPL_AGGR_DMA_TMR_DURING_INT     0x80UL</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_NUM_CMPL_AGGR_INT                0x100UL</div><div class='add'>+	__le32	nq_params;</div><div class='add'>+	#define RING_AGGINT_QCAPS_RESP_NQ_PARAMS_INT_LAT_TMR_MIN     0x1UL</div><div class='add'>+	__le16	num_cmpl_dma_aggr_min;</div><div class='add'>+	__le16	num_cmpl_dma_aggr_max;</div><div class='add'>+	__le16	num_cmpl_dma_aggr_during_int_min;</div><div class='add'>+	__le16	num_cmpl_dma_aggr_during_int_max;</div><div class='add'>+	__le16	cmpl_aggr_dma_tmr_min;</div><div class='add'>+	__le16	cmpl_aggr_dma_tmr_max;</div><div class='add'>+	__le16	cmpl_aggr_dma_tmr_during_int_min;</div><div class='add'>+	__le16	cmpl_aggr_dma_tmr_during_int_max;</div><div class='add'>+	__le16	int_lat_tmr_min_min;</div><div class='add'>+	__le16	int_lat_tmr_min_max;</div><div class='add'>+	__le16	int_lat_tmr_max_min;</div><div class='add'>+	__le16	int_lat_tmr_max_max;</div><div class='add'>+	__le16	num_cmpl_aggr_int_min;</div><div class='add'>+	__le16	num_cmpl_aggr_int_max;</div><div class='add'>+	__le16	timer_units;</div><div class='add'>+	u8	unused_0[1];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_cmpl_ring_qaggint_params_input (size:192b/24B) */</div><div class='add'>+struct hwrm_ring_cmpl_ring_qaggint_params_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	ring_id;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define RING_CMPL_RING_QAGGINT_PARAMS_REQ_FLAGS_UNUSED_0_MASK 0x3UL</div><div class='add'>+	#define RING_CMPL_RING_QAGGINT_PARAMS_REQ_FLAGS_UNUSED_0_SFT 0</div><div class='add'>+	#define RING_CMPL_RING_QAGGINT_PARAMS_REQ_FLAGS_IS_NQ        0x4UL</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_cmpl_ring_qaggint_params_output (size:256b/32B) */</div><div class='add'>+struct hwrm_ring_cmpl_ring_qaggint_params_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define RING_CMPL_RING_QAGGINT_PARAMS_RESP_FLAGS_TIMER_RESET     0x1UL</div><div class='add'>+	#define RING_CMPL_RING_QAGGINT_PARAMS_RESP_FLAGS_RING_IDLE       0x2UL</div><div class='add'>+	__le16	num_cmpl_dma_aggr;</div><div class='add'>+	__le16	num_cmpl_dma_aggr_during_int;</div><div class='add'>+	__le16	cmpl_aggr_dma_tmr;</div><div class='add'>+	__le16	cmpl_aggr_dma_tmr_during_int;</div><div class='add'>+	__le16	int_lat_tmr_min;</div><div class='add'>+	__le16	int_lat_tmr_max;</div><div class='add'>+	__le16	num_cmpl_aggr_int;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_cmpl_ring_cfg_aggint_params_input (size:320b/40B) */</div><div class='add'>+struct hwrm_ring_cmpl_ring_cfg_aggint_params_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	ring_id;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET     0x1UL</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_RING_IDLE       0x2UL</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_IS_NQ           0x4UL</div><div class='add'>+	__le16	num_cmpl_dma_aggr;</div><div class='add'>+	__le16	num_cmpl_dma_aggr_during_int;</div><div class='add'>+	__le16	cmpl_aggr_dma_tmr;</div><div class='add'>+	__le16	cmpl_aggr_dma_tmr_during_int;</div><div class='add'>+	__le16	int_lat_tmr_min;</div><div class='add'>+	__le16	int_lat_tmr_max;</div><div class='add'>+	__le16	num_cmpl_aggr_int;</div><div class='add'>+	__le16	enables;</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_NUM_CMPL_DMA_AGGR                0x1UL</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_NUM_CMPL_DMA_AGGR_DURING_INT     0x2UL</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_CMPL_AGGR_DMA_TMR                0x4UL</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_INT_LAT_TMR_MIN                  0x8UL</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_INT_LAT_TMR_MAX                  0x10UL</div><div class='add'>+	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_NUM_CMPL_AGGR_INT                0x20UL</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_cmpl_ring_cfg_aggint_params_output (size:128b/16B) */</div><div class='add'>+struct hwrm_ring_cmpl_ring_cfg_aggint_params_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_grp_alloc_input (size:192b/24B) */</div><div class='add'>+struct hwrm_ring_grp_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	cr;</div><div class='add'>+	__le16	rr;</div><div class='add'>+	__le16	ar;</div><div class='add'>+	__le16	sc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_grp_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_ring_grp_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	ring_group_id;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_grp_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_ring_grp_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	ring_group_id;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_ring_grp_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_ring_grp_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEFAULT_FLOW_ID 0xFFFFFFFFUL</div><div class='add'>+#define ROCEV1_FLOW_ID 0xFFFFFFFEUL</div><div class='add'>+#define ROCEV2_FLOW_ID 0xFFFFFFFDUL</div><div class='add'>+#define ROCEV2_CNP_FLOW_ID 0xFFFFFFFCUL</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_filter_alloc_input (size:768b/96B) */</div><div class='add'>+struct hwrm_cfa_l2_filter_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH              0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_TX             0x0UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_RX             0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_LAST          CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_RX</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_LOOPBACK          0x2UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_DROP              0x4UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_OUTERMOST         0x8UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_MASK      0x30UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_SFT       4</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_NO_ROCE_L2  (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_L2          (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_ROCE        (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_LAST       CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_ROCE</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_XDP_DISABLE       0x40UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_SOURCE_VALID      0x80UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR             0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR_MASK        0x2UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_OVLAN            0x4UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_OVLAN_MASK       0x8UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN            0x10UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN_MASK       0x20UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_ADDR           0x40UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_ADDR_MASK      0x80UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_OVLAN          0x100UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_OVLAN_MASK     0x200UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_IVLAN          0x400UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_IVLAN_MASK     0x800UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_SRC_TYPE            0x1000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_SRC_ID              0x2000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE         0x4000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_DST_ID              0x8000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID      0x10000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_NUM_VLANS           0x20000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_NUM_VLANS         0x40000UL</div><div class='add'>+	u8	l2_addr[6];</div><div class='add'>+	u8	num_vlans;</div><div class='add'>+	u8	t_num_vlans;</div><div class='add'>+	u8	l2_addr_mask[6];</div><div class='add'>+	__le16	l2_ovlan;</div><div class='add'>+	__le16	l2_ovlan_mask;</div><div class='add'>+	__le16	l2_ivlan;</div><div class='add'>+	__le16	l2_ivlan_mask;</div><div class='add'>+	u8	unused_1[2];</div><div class='add'>+	u8	t_l2_addr[6];</div><div class='add'>+	u8	unused_2[2];</div><div class='add'>+	u8	t_l2_addr_mask[6];</div><div class='add'>+	__le16	t_l2_ovlan;</div><div class='add'>+	__le16	t_l2_ovlan_mask;</div><div class='add'>+	__le16	t_l2_ivlan;</div><div class='add'>+	__le16	t_l2_ivlan_mask;</div><div class='add'>+	u8	src_type;</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_NPORT 0x0UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_PF    0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_VF    0x2UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_VNIC  0x3UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_KONG  0x4UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_APE   0x5UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_BONO  0x6UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_TANG  0x7UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_LAST CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_TANG</div><div class='add'>+	u8	unused_3;</div><div class='add'>+	__le32	src_id;</div><div class='add'>+	u8	tunnel_type;</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE    0x10UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='add'>+	u8	unused_4;</div><div class='add'>+	__le16	dst_id;</div><div class='add'>+	__le16	mirror_vnic_id;</div><div class='add'>+	u8	pri_hint;</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_NO_PREFER    0x0UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_ABOVE_FILTER 0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_BELOW_FILTER 0x2UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_MAX          0x3UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_MIN          0x4UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_LAST        CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_MIN</div><div class='add'>+	u8	unused_5;</div><div class='add'>+	__le32	unused_6;</div><div class='add'>+	__le64	l2_filter_id_hint;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_filter_alloc_output (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_l2_filter_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	l2_filter_id;</div><div class='add'>+	__le32	flow_id;</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_filter_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_l2_filter_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	l2_filter_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_filter_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_l2_filter_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_filter_cfg_input (size:384b/48B) */</div><div class='add'>+struct hwrm_cfa_l2_filter_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_PATH                  0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_PATH_TX                 0x0UL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_PATH_RX                 0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_PATH_LAST              CFA_L2_FILTER_CFG_REQ_FLAGS_PATH_RX</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_DROP                  0x2UL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_MASK          0xcUL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_SFT           2</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_NO_ROCE_L2      (0x0UL &lt;&lt; 2)</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_L2              (0x1UL &lt;&lt; 2)</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_ROCE            (0x2UL &lt;&lt; 2)</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_LAST           CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_ROCE</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_REMAP_OP_MASK         0x30UL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_REMAP_OP_SFT          4</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_REMAP_OP_NO_UPDATE      (0x0UL &lt;&lt; 4)</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_REMAP_OP_BYPASS_LKUP    (0x1UL &lt;&lt; 4)</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_REMAP_OP_ENABLE_LKUP    (0x2UL &lt;&lt; 4)</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_REMAP_OP_RESTORE_FW_OP  (0x3UL &lt;&lt; 4)</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_FLAGS_REMAP_OP_LAST          CFA_L2_FILTER_CFG_REQ_FLAGS_REMAP_OP_RESTORE_FW_OP</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_ENABLES_DST_ID                 0x1UL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_ENABLES_NEW_MIRROR_VNIC_ID     0x2UL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_ENABLES_PROF_FUNC              0x4UL</div><div class='add'>+	#define CFA_L2_FILTER_CFG_REQ_ENABLES_L2_CONTEXT_ID          0x8UL</div><div class='add'>+	__le64	l2_filter_id;</div><div class='add'>+	__le32	dst_id;</div><div class='add'>+	__le32	new_mirror_vnic_id;</div><div class='add'>+	__le32	prof_func;</div><div class='add'>+	__le32	l2_context_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_filter_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_l2_filter_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_set_rx_mask_input (size:448b/56B) */</div><div class='add'>+struct hwrm_cfa_l2_set_rx_mask_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	vnic_id;</div><div class='add'>+	__le32	mask;</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_REQ_MASK_MCAST               0x2UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST           0x4UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_REQ_MASK_BCAST               0x8UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS         0x10UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_REQ_MASK_OUTERMOST           0x20UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_REQ_MASK_VLANONLY            0x40UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_REQ_MASK_VLAN_NONVLAN        0x80UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_REQ_MASK_ANYVLAN_NONVLAN     0x100UL</div><div class='add'>+	__le64	mc_tbl_addr;</div><div class='add'>+	__le32	num_mc_entries;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	__le64	vlan_tag_tbl_addr;</div><div class='add'>+	__le32	num_vlan_tags;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_set_rx_mask_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_l2_set_rx_mask_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_l2_set_rx_mask_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_cfa_l2_set_rx_mask_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_UNKNOWN                    0x0UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_NTUPLE_FILTER_CONFLICT_ERR 0x1UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_MAX_VLAN_TAGS              0x2UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_INVALID_VNIC_ID            0x3UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_INVALID_ACTION             0x4UL</div><div class='add'>+	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_LAST                      CFA_L2_SET_RX_MASK_CMD_ERR_CODE_INVALID_ACTION</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_tunnel_filter_alloc_input (size:704b/88B) */</div><div class='add'>+struct hwrm_cfa_tunnel_filter_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_FLAGS_LOOPBACK     0x1UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L2_FILTER_ID       0x1UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L2_ADDR            0x2UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN           0x4UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L3_ADDR            0x8UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L3_ADDR_TYPE       0x10UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_T_L3_ADDR_TYPE     0x20UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_T_L3_ADDR          0x40UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE        0x80UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_VNI                0x100UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_DST_VNIC_ID        0x200UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID     0x400UL</div><div class='add'>+	__le64	l2_filter_id;</div><div class='add'>+	u8	l2_addr[6];</div><div class='add'>+	__le16	l2_ivlan;</div><div class='add'>+	__le32	l3_addr[4];</div><div class='add'>+	__le32	t_l3_addr[4];</div><div class='add'>+	u8	l3_addr_type;</div><div class='add'>+	u8	t_l3_addr_type;</div><div class='add'>+	u8	tunnel_type;</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE    0x10UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='add'>+	u8	tunnel_flags;</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_FLAGS_TUN_FLAGS_OAM_CHECKSUM_EXPLHDR     0x1UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_FLAGS_TUN_FLAGS_CRITICAL_OPT_S1          0x2UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_FLAGS_TUN_FLAGS_EXTHDR_SEQNUM_S0         0x4UL</div><div class='add'>+	__le32	vni;</div><div class='add'>+	__le32	dst_vnic_id;</div><div class='add'>+	__le32	mirror_vnic_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_tunnel_filter_alloc_output (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_tunnel_filter_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	tunnel_filter_id;</div><div class='add'>+	__le32	flow_id;</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_tunnel_filter_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_tunnel_filter_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	tunnel_filter_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_tunnel_filter_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_tunnel_filter_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vxlan_ipv4_hdr (size:128b/16B) */</div><div class='add'>+struct hwrm_vxlan_ipv4_hdr {</div><div class='add'>+	u8	ver_hlen;</div><div class='add'>+	#define VXLAN_IPV4_HDR_VER_HLEN_HEADER_LENGTH_MASK 0xfUL</div><div class='add'>+	#define VXLAN_IPV4_HDR_VER_HLEN_HEADER_LENGTH_SFT 0</div><div class='add'>+	#define VXLAN_IPV4_HDR_VER_HLEN_VERSION_MASK      0xf0UL</div><div class='add'>+	#define VXLAN_IPV4_HDR_VER_HLEN_VERSION_SFT       4</div><div class='add'>+	u8	tos;</div><div class='add'>+	__be16	ip_id;</div><div class='add'>+	__be16	flags_frag_offset;</div><div class='add'>+	u8	ttl;</div><div class='add'>+	u8	protocol;</div><div class='add'>+	__be32	src_ip_addr;</div><div class='add'>+	__be32	dest_ip_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_vxlan_ipv6_hdr (size:320b/40B) */</div><div class='add'>+struct hwrm_vxlan_ipv6_hdr {</div><div class='add'>+	__be32	ver_tc_flow_label;</div><div class='add'>+	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_VER_SFT         0x1cUL</div><div class='add'>+	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_VER_MASK        0xf0000000UL</div><div class='add'>+	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_TC_SFT          0x14UL</div><div class='add'>+	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_TC_MASK         0xff00000UL</div><div class='add'>+	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_FLOW_LABEL_SFT  0x0UL</div><div class='add'>+	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_FLOW_LABEL_MASK 0xfffffUL</div><div class='add'>+	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_LAST           VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_FLOW_LABEL_MASK</div><div class='add'>+	__be16	payload_len;</div><div class='add'>+	u8	next_hdr;</div><div class='add'>+	u8	ttl;</div><div class='add'>+	__be32	src_ip_addr[4];</div><div class='add'>+	__be32	dest_ip_addr[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_encap_data_vxlan (size:640b/80B) */</div><div class='add'>+struct hwrm_cfa_encap_data_vxlan {</div><div class='add'>+	u8	src_mac_addr[6];</div><div class='add'>+	__le16	unused_0;</div><div class='add'>+	u8	dst_mac_addr[6];</div><div class='add'>+	u8	num_vlan_tags;</div><div class='add'>+	u8	unused_1;</div><div class='add'>+	__be16	ovlan_tpid;</div><div class='add'>+	__be16	ovlan_tci;</div><div class='add'>+	__be16	ivlan_tpid;</div><div class='add'>+	__be16	ivlan_tci;</div><div class='add'>+	__le32	l3[10];</div><div class='add'>+	#define CFA_ENCAP_DATA_VXLAN_L3_VER_MASK 0xfUL</div><div class='add'>+	#define CFA_ENCAP_DATA_VXLAN_L3_VER_IPV4 0x4UL</div><div class='add'>+	#define CFA_ENCAP_DATA_VXLAN_L3_VER_IPV6 0x6UL</div><div class='add'>+	#define CFA_ENCAP_DATA_VXLAN_L3_LAST    CFA_ENCAP_DATA_VXLAN_L3_VER_IPV6</div><div class='add'>+	__be16	src_port;</div><div class='add'>+	__be16	dst_port;</div><div class='add'>+	__be32	vni;</div><div class='add'>+	u8	hdr_rsvd0[3];</div><div class='add'>+	u8	hdr_rsvd1;</div><div class='add'>+	u8	hdr_flags;</div><div class='add'>+	u8	unused[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_encap_record_alloc_input (size:832b/104B) */</div><div class='add'>+struct hwrm_cfa_encap_record_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_FLAGS_LOOPBACK     0x1UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_FLAGS_EXTERNAL     0x2UL</div><div class='add'>+	u8	encap_type;</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN        0x1UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_NVGRE        0x2UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_L2GRE        0x3UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_IPIP         0x4UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_GENEVE       0x5UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_MPLS         0x6UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VLAN         0x7UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_IPGRE        0x8UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN_V4     0x9UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_IPGRE_V1     0xaUL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_L2_ETYPE     0xbUL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN_GPE    0x10UL</div><div class='add'>+	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_LAST        CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN_GPE</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	__le32	encap_data[20];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_encap_record_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_encap_record_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	encap_record_id;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_encap_record_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_encap_record_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	encap_record_id;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_encap_record_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_encap_record_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_ntuple_filter_alloc_input (size:1024b/128B) */</div><div class='add'>+struct hwrm_cfa_ntuple_filter_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_LOOPBACK              0x1UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DROP                  0x2UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_METER                 0x4UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DEST_FID              0x8UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_ARP_REPLY             0x10UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DEST_RFS_RING_IDX     0x20UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_NO_L2_CONTEXT         0x40UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_L2_FILTER_ID         0x1UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_ETHERTYPE            0x2UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE          0x4UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_MACADDR          0x8UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_IPADDR_TYPE          0x10UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR           0x20UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR_MASK      0x40UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_IPADDR           0x80UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_IPADDR_MASK      0x100UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_IP_PROTOCOL          0x200UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_PORT             0x400UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_PORT_MASK        0x800UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_PORT             0x1000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_PORT_MASK        0x2000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_PRI_HINT             0x4000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_NTUPLE_FILTER_ID     0x8000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_ID               0x10000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID       0x20000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_MACADDR          0x40000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_RFS_RING_TBL_IDX     0x80000UL</div><div class='add'>+	__le64	l2_filter_id;</div><div class='add'>+	u8	src_macaddr[6];</div><div class='add'>+	__be16	ethertype;</div><div class='add'>+	u8	ip_addr_type;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_UNKNOWN 0x0UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4    0x4UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6    0x6UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_LAST   CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6</div><div class='add'>+	u8	ip_protocol;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_UNKNOWN 0x0UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_TCP     0x6UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP     0x11UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_ICMP    0x1UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_ICMPV6  0x3aUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_RSVD    0xffUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_LAST   CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_RSVD</div><div class='add'>+	__le16	dst_id;</div><div class='add'>+	__le16	rfs_ring_tbl_idx;</div><div class='add'>+	u8	tunnel_type;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE    0x10UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='add'>+	u8	pri_hint;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_NO_PREFER 0x0UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_ABOVE     0x1UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_BELOW     0x2UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_HIGHEST   0x3UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_LOWEST    0x4UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_LAST     CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_LOWEST</div><div class='add'>+	__be32	src_ipaddr[4];</div><div class='add'>+	__be32	src_ipaddr_mask[4];</div><div class='add'>+	__be32	dst_ipaddr[4];</div><div class='add'>+	__be32	dst_ipaddr_mask[4];</div><div class='add'>+	__be16	src_port;</div><div class='add'>+	__be16	src_port_mask;</div><div class='add'>+	__be16	dst_port;</div><div class='add'>+	__be16	dst_port_mask;</div><div class='add'>+	__le64	ntuple_filter_id_hint;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_ntuple_filter_alloc_output (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_ntuple_filter_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	ntuple_filter_id;</div><div class='add'>+	__le32	flow_id;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_ntuple_filter_alloc_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_cfa_ntuple_filter_alloc_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_UNKNOWN            0x0UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_ZERO_MAC           0x65UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_BC_MC_MAC          0x66UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_VNIC       0x67UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_PF_FID     0x68UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_L2_CTXT_ID 0x69UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_NULL_L2_CTXT_CFG   0x6aUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_NULL_L2_DATA_FLD   0x6bUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_CFA_LAYOUT 0x6cUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L2_CTXT_ALLOC_FAIL 0x6dUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_ROCE_FLOW_ERR      0x6eUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_OWNER_FID  0x6fUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_ZERO_REF_CNT       0x70UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_FLOW_TYPE  0x71UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_IVLAN      0x72UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_MAX_VLAN_ID        0x73UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_TNL_REQ    0x74UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L2_ADDR            0x75UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L2_IVLAN           0x76UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L3_ADDR            0x77UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L3_ADDR_TYPE       0x78UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_T_L3_ADDR_TYPE     0x79UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_DST_VNIC_ID        0x7aUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_VNI                0x7bUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_DST_ID     0x7cUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_FAIL_ROCE_L2_FLOW  0x7dUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_NPAR_VLAN  0x7eUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_ATSP_ADD           0x7fUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_DFLT_VLAN_FAIL     0x80UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_L3_TYPE    0x81UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_VAL_FAIL_TNL_FLOW  0x82UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_LAST              CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_VAL_FAIL_TNL_FLOW</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_ntuple_filter_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_ntuple_filter_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	ntuple_filter_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_ntuple_filter_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_ntuple_filter_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_ntuple_filter_cfg_input (size:384b/48B) */</div><div class='add'>+struct hwrm_cfa_ntuple_filter_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_CFG_REQ_ENABLES_NEW_DST_ID                0x1UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_CFG_REQ_ENABLES_NEW_MIRROR_VNIC_ID        0x2UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_CFG_REQ_ENABLES_NEW_METER_INSTANCE_ID     0x4UL</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_CFG_REQ_FLAGS_DEST_FID              0x1UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_CFG_REQ_FLAGS_DEST_RFS_RING_IDX     0x2UL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_CFG_REQ_FLAGS_NO_L2_CONTEXT         0x4UL</div><div class='add'>+	__le64	ntuple_filter_id;</div><div class='add'>+	__le32	new_dst_id;</div><div class='add'>+	__le32	new_mirror_vnic_id;</div><div class='add'>+	__le16	new_meter_instance_id;</div><div class='add'>+	#define CFA_NTUPLE_FILTER_CFG_REQ_NEW_METER_INSTANCE_ID_INVALID 0xffffUL</div><div class='add'>+	#define CFA_NTUPLE_FILTER_CFG_REQ_NEW_METER_INSTANCE_ID_LAST   CFA_NTUPLE_FILTER_CFG_REQ_NEW_METER_INSTANCE_ID_INVALID</div><div class='add'>+	u8	unused_1[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_ntuple_filter_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_ntuple_filter_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_decap_filter_alloc_input (size:832b/104B) */</div><div class='add'>+struct hwrm_cfa_decap_filter_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_FLAGS_OVS_TUNNEL     0x1UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE        0x1UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_TUNNEL_ID          0x2UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_SRC_MACADDR        0x4UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_MACADDR        0x8UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_OVLAN_VID          0x10UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_IVLAN_VID          0x20UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_T_OVLAN_VID        0x40UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_T_IVLAN_VID        0x80UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_ETHERTYPE          0x100UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR         0x200UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_IPADDR         0x400UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_IPADDR_TYPE        0x800UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_IP_PROTOCOL        0x1000UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_SRC_PORT           0x2000UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_PORT           0x4000UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_ID             0x8000UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID     0x10000UL</div><div class='add'>+	__be32	tunnel_id;</div><div class='add'>+	u8	tunnel_type;</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE    0x10UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	unused_1;</div><div class='add'>+	u8	src_macaddr[6];</div><div class='add'>+	u8	unused_2[2];</div><div class='add'>+	u8	dst_macaddr[6];</div><div class='add'>+	__be16	ovlan_vid;</div><div class='add'>+	__be16	ivlan_vid;</div><div class='add'>+	__be16	t_ovlan_vid;</div><div class='add'>+	__be16	t_ivlan_vid;</div><div class='add'>+	__be16	ethertype;</div><div class='add'>+	u8	ip_addr_type;</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_UNKNOWN 0x0UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4    0x4UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6    0x6UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_LAST   CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6</div><div class='add'>+	u8	ip_protocol;</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_UNKNOWN 0x0UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_TCP     0x6UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP     0x11UL</div><div class='add'>+	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_LAST   CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP</div><div class='add'>+	__le16	unused_3;</div><div class='add'>+	__le32	unused_4;</div><div class='add'>+	__be32	src_ipaddr[4];</div><div class='add'>+	__be32	dst_ipaddr[4];</div><div class='add'>+	__be16	src_port;</div><div class='add'>+	__be16	dst_port;</div><div class='add'>+	__le16	dst_id;</div><div class='add'>+	__le16	l2_ctxt_ref_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_decap_filter_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_decap_filter_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	decap_filter_id;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_decap_filter_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_decap_filter_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	decap_filter_id;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_decap_filter_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_decap_filter_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_alloc_input (size:1024b/128B) */</div><div class='add'>+struct hwrm_cfa_flow_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_TUNNEL                 0x1UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_MASK          0x6UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_SFT           1</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_NONE            (0x0UL &lt;&lt; 1)</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_ONE             (0x1UL &lt;&lt; 1)</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_TWO             (0x2UL &lt;&lt; 1)</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_LAST           CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_TWO</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_MASK          0x38UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_SFT           3</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_L2              (0x0UL &lt;&lt; 3)</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_IPV4            (0x1UL &lt;&lt; 3)</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_IPV6            (0x2UL &lt;&lt; 3)</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_LAST           CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_IPV6</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_PATH_TX                0x40UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_PATH_RX                0x80UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_MATCH_VXLAN_IP_VNI     0x100UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_FLAGS_VHOST_ID_USE_VLAN      0x200UL</div><div class='add'>+	__le16	src_fid;</div><div class='add'>+	__le32	tunnel_handle;</div><div class='add'>+	__le16	action_flags;</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_FWD                       0x1UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_RECYCLE                   0x2UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_DROP                      0x4UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_METER                     0x8UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TUNNEL                    0x10UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_SRC                   0x20UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_DEST                  0x40UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_IPV4_ADDRESS          0x80UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_L2_HEADER_REWRITE         0x100UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TTL_DECREMENT             0x200UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TUNNEL_IP                 0x400UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_FLOW_AGING_ENABLED        0x800UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_PRI_HINT                  0x1000UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NO_FLOW_COUNTER_ALLOC     0x2000UL</div><div class='add'>+	__le16	dst_fid;</div><div class='add'>+	__be16	l2_rewrite_vlan_tpid;</div><div class='add'>+	__be16	l2_rewrite_vlan_tci;</div><div class='add'>+	__le16	act_meter_id;</div><div class='add'>+	__le16	ref_flow_handle;</div><div class='add'>+	__be16	ethertype;</div><div class='add'>+	__be16	outer_vlan_tci;</div><div class='add'>+	__be16	dmac[3];</div><div class='add'>+	__be16	inner_vlan_tci;</div><div class='add'>+	__be16	smac[3];</div><div class='add'>+	u8	ip_dst_mask_len;</div><div class='add'>+	u8	ip_src_mask_len;</div><div class='add'>+	__be32	ip_dst[4];</div><div class='add'>+	__be32	ip_src[4];</div><div class='add'>+	__be16	l4_src_port;</div><div class='add'>+	__be16	l4_src_port_mask;</div><div class='add'>+	__be16	l4_dst_port;</div><div class='add'>+	__be16	l4_dst_port_mask;</div><div class='add'>+	__be32	nat_ip_address[4];</div><div class='add'>+	__be16	l2_rewrite_dmac[3];</div><div class='add'>+	__be16	nat_port;</div><div class='add'>+	__be16	l2_rewrite_smac[3];</div><div class='add'>+	u8	ip_proto;</div><div class='add'>+	u8	tunnel_type;</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE    0x10UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='add'>+	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_alloc_output (size:256b/32B) */</div><div class='add'>+struct hwrm_cfa_flow_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	flow_handle;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le32	flow_id;</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='add'>+	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='add'>+	__le64	ext_flow_handle;</div><div class='add'>+	__le32	flow_counter_id;</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_alloc_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_cfa_flow_alloc_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_UNKNOWN         0x0UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_L2_CONTEXT_TCAM 0x1UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_ACTION_RECORD   0x2UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_FLOW_COUNTER    0x3UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_WILD_CARD_TCAM  0x4UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_HASH_COLLISION  0x5UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_KEY_EXISTS      0x6UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_FLOW_CTXT_DB    0x7UL</div><div class='add'>+	#define CFA_FLOW_ALLOC_CMD_ERR_CODE_LAST           CFA_FLOW_ALLOC_CMD_ERR_CODE_FLOW_CTXT_DB</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_free_input (size:256b/32B) */</div><div class='add'>+struct hwrm_cfa_flow_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	flow_handle;</div><div class='add'>+	__le16	unused_0;</div><div class='add'>+	__le32	flow_counter_id;</div><div class='add'>+	__le64	ext_flow_handle;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_free_output (size:256b/32B) */</div><div class='add'>+struct hwrm_cfa_flow_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	packet;</div><div class='add'>+	__le64	byte;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_info_input (size:256b/32B) */</div><div class='add'>+struct hwrm_cfa_flow_info_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	flow_handle;</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_MAX_MASK      0xfffUL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_CNP_CNT       0x1000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_ROCEV1_CNT    0x2000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_NIC_TX        0x3000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_ROCEV2_CNT    0x4000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_DIR_RX        0x8000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_CNP_CNT_RX    0x9000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_ROCEV1_CNT_RX 0xa000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_NIC_RX        0xb000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_ROCEV2_CNT_RX 0xc000UL</div><div class='add'>+	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_LAST         CFA_FLOW_INFO_REQ_FLOW_HANDLE_ROCEV2_CNT_RX</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	__le64	ext_flow_handle;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_info_output (size:5632b/704B) */</div><div class='add'>+struct hwrm_cfa_flow_info_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define CFA_FLOW_INFO_RESP_FLAGS_PATH_TX     0x1UL</div><div class='add'>+	#define CFA_FLOW_INFO_RESP_FLAGS_PATH_RX     0x2UL</div><div class='add'>+	u8	profile;</div><div class='add'>+	__le16	src_fid;</div><div class='add'>+	__le16	dst_fid;</div><div class='add'>+	__le16	l2_ctxt_id;</div><div class='add'>+	__le64	em_info;</div><div class='add'>+	__le64	tcam_info;</div><div class='add'>+	__le64	vfp_tcam_info;</div><div class='add'>+	__le16	ar_id;</div><div class='add'>+	__le16	flow_handle;</div><div class='add'>+	__le32	tunnel_handle;</div><div class='add'>+	__le16	flow_timer;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	__le32	flow_key_data[130];</div><div class='add'>+	__le32	flow_action_info[30];</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_stats_input (size:640b/80B) */</div><div class='add'>+struct hwrm_cfa_flow_stats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	num_flows;</div><div class='add'>+	__le16	flow_handle_0;</div><div class='add'>+	__le16	flow_handle_1;</div><div class='add'>+	__le16	flow_handle_2;</div><div class='add'>+	__le16	flow_handle_3;</div><div class='add'>+	__le16	flow_handle_4;</div><div class='add'>+	__le16	flow_handle_5;</div><div class='add'>+	__le16	flow_handle_6;</div><div class='add'>+	__le16	flow_handle_7;</div><div class='add'>+	__le16	flow_handle_8;</div><div class='add'>+	__le16	flow_handle_9;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le32	flow_id_0;</div><div class='add'>+	__le32	flow_id_1;</div><div class='add'>+	__le32	flow_id_2;</div><div class='add'>+	__le32	flow_id_3;</div><div class='add'>+	__le32	flow_id_4;</div><div class='add'>+	__le32	flow_id_5;</div><div class='add'>+	__le32	flow_id_6;</div><div class='add'>+	__le32	flow_id_7;</div><div class='add'>+	__le32	flow_id_8;</div><div class='add'>+	__le32	flow_id_9;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_flow_stats_output (size:1408b/176B) */</div><div class='add'>+struct hwrm_cfa_flow_stats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	packet_0;</div><div class='add'>+	__le64	packet_1;</div><div class='add'>+	__le64	packet_2;</div><div class='add'>+	__le64	packet_3;</div><div class='add'>+	__le64	packet_4;</div><div class='add'>+	__le64	packet_5;</div><div class='add'>+	__le64	packet_6;</div><div class='add'>+	__le64	packet_7;</div><div class='add'>+	__le64	packet_8;</div><div class='add'>+	__le64	packet_9;</div><div class='add'>+	__le64	byte_0;</div><div class='add'>+	__le64	byte_1;</div><div class='add'>+	__le64	byte_2;</div><div class='add'>+	__le64	byte_3;</div><div class='add'>+	__le64	byte_4;</div><div class='add'>+	__le64	byte_5;</div><div class='add'>+	__le64	byte_6;</div><div class='add'>+	__le64	byte_7;</div><div class='add'>+	__le64	byte_8;</div><div class='add'>+	__le64	byte_9;</div><div class='add'>+	__le16	flow_hits;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_vfr_alloc_input (size:448b/56B) */</div><div class='add'>+struct hwrm_cfa_vfr_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	vf_id;</div><div class='add'>+	__le16	reserved;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	char	vfr_name[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_vfr_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_vfr_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	rx_cfa_code;</div><div class='add'>+	__le16	tx_cfa_action;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_vfr_free_input (size:448b/56B) */</div><div class='add'>+struct hwrm_cfa_vfr_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	char	vfr_name[32];</div><div class='add'>+	__le16	vf_id;</div><div class='add'>+	__le16	reserved;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_vfr_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_vfr_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_eem_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_eem_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_EEM_QCAPS_REQ_FLAGS_PATH_TX               0x1UL</div><div class='add'>+	#define CFA_EEM_QCAPS_REQ_FLAGS_PATH_RX               0x2UL</div><div class='add'>+	#define CFA_EEM_QCAPS_REQ_FLAGS_PREFERRED_OFFLOAD     0x4UL</div><div class='add'>+	__le32	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_eem_qcaps_output (size:320b/40B) */</div><div class='add'>+struct hwrm_cfa_eem_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_FLAGS_PATH_TX                                         0x1UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_FLAGS_PATH_RX                                         0x2UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_FLAGS_CENTRALIZED_MEMORY_MODEL_SUPPORTED              0x4UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_FLAGS_DETACHED_CENTRALIZED_MEMORY_MODEL_SUPPORTED     0x8UL</div><div class='add'>+	__le32	unused_0;</div><div class='add'>+	__le32	supported;</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_SUPPORTED_KEY0_TABLE                       0x1UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_SUPPORTED_KEY1_TABLE                       0x2UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_SUPPORTED_EXTERNAL_RECORD_TABLE            0x4UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_SUPPORTED_EXTERNAL_FLOW_COUNTERS_TABLE     0x8UL</div><div class='add'>+	#define CFA_EEM_QCAPS_RESP_SUPPORTED_FID_TABLE                        0x10UL</div><div class='add'>+	__le32	max_entries_supported;</div><div class='add'>+	__le16	key_entry_size;</div><div class='add'>+	__le16	record_entry_size;</div><div class='add'>+	__le16	efc_entry_size;</div><div class='add'>+	__le16	fid_entry_size;</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_eem_cfg_input (size:384b/48B) */</div><div class='add'>+struct hwrm_cfa_eem_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_EEM_CFG_REQ_FLAGS_PATH_TX               0x1UL</div><div class='add'>+	#define CFA_EEM_CFG_REQ_FLAGS_PATH_RX               0x2UL</div><div class='add'>+	#define CFA_EEM_CFG_REQ_FLAGS_PREFERRED_OFFLOAD     0x4UL</div><div class='add'>+	#define CFA_EEM_CFG_REQ_FLAGS_SECONDARY_PF          0x8UL</div><div class='add'>+	__le16	group_id;</div><div class='add'>+	__le16	unused_0;</div><div class='add'>+	__le32	num_entries;</div><div class='add'>+	__le32	unused_1;</div><div class='add'>+	__le16	key0_ctx_id;</div><div class='add'>+	__le16	key1_ctx_id;</div><div class='add'>+	__le16	record_ctx_id;</div><div class='add'>+	__le16	efc_ctx_id;</div><div class='add'>+	__le16	fid_ctx_id;</div><div class='add'>+	__le16	unused_2;</div><div class='add'>+	__le32	unused_3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_eem_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_eem_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_eem_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_eem_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_EEM_QCFG_REQ_FLAGS_PATH_TX     0x1UL</div><div class='add'>+	#define CFA_EEM_QCFG_REQ_FLAGS_PATH_RX     0x2UL</div><div class='add'>+	__le32	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_eem_qcfg_output (size:256b/32B) */</div><div class='add'>+struct hwrm_cfa_eem_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_EEM_QCFG_RESP_FLAGS_PATH_TX               0x1UL</div><div class='add'>+	#define CFA_EEM_QCFG_RESP_FLAGS_PATH_RX               0x2UL</div><div class='add'>+	#define CFA_EEM_QCFG_RESP_FLAGS_PREFERRED_OFFLOAD     0x4UL</div><div class='add'>+	__le32	num_entries;</div><div class='add'>+	__le16	key0_ctx_id;</div><div class='add'>+	__le16	key1_ctx_id;</div><div class='add'>+	__le16	record_ctx_id;</div><div class='add'>+	__le16	efc_ctx_id;</div><div class='add'>+	__le16	fid_ctx_id;</div><div class='add'>+	u8	unused_2[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_eem_op_input (size:192b/24B) */</div><div class='add'>+struct hwrm_cfa_eem_op_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_EEM_OP_REQ_FLAGS_PATH_TX     0x1UL</div><div class='add'>+	#define CFA_EEM_OP_REQ_FLAGS_PATH_RX     0x2UL</div><div class='add'>+	__le16	unused_0;</div><div class='add'>+	__le16	op;</div><div class='add'>+	#define CFA_EEM_OP_REQ_OP_RESERVED    0x0UL</div><div class='add'>+	#define CFA_EEM_OP_REQ_OP_EEM_DISABLE 0x1UL</div><div class='add'>+	#define CFA_EEM_OP_REQ_OP_EEM_ENABLE  0x2UL</div><div class='add'>+	#define CFA_EEM_OP_REQ_OP_EEM_CLEANUP 0x3UL</div><div class='add'>+	#define CFA_EEM_OP_REQ_OP_LAST       CFA_EEM_OP_REQ_OP_EEM_CLEANUP</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_eem_op_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_eem_op_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_adv_flow_mgnt_qcaps_input (size:256b/32B) */</div><div class='add'>+struct hwrm_cfa_adv_flow_mgnt_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_cfa_adv_flow_mgnt_qcaps_output (size:128b/16B) */</div><div class='add'>+struct hwrm_cfa_adv_flow_mgnt_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_HND_16BIT_SUPPORTED                     0x1UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_HND_64BIT_SUPPORTED                     0x2UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_BATCH_DELETE_SUPPORTED                  0x4UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_RESET_ALL_SUPPORTED                     0x8UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NTUPLE_FLOW_DEST_FUNC_SUPPORTED              0x10UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_TX_EEM_FLOW_SUPPORTED                        0x20UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RX_EEM_FLOW_SUPPORTED                        0x40UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_COUNTER_ALLOC_SUPPORTED                 0x80UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_SUPPORTED                   0x100UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_UNTAGGED_VLAN_SUPPORTED                      0x200UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_XDP_SUPPORTED                                0x400UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_L2_HEADER_SOURCE_FIELDS_SUPPORTED            0x800UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NTUPLE_FLOW_RX_ARP_SUPPORTED                 0x1000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_V2_SUPPORTED                0x2000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NTUPLE_FLOW_RX_ETHERTYPE_IP_SUPPORTED        0x4000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_TRUFLOW_CAPABLE                              0x8000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_L2_FILTER_TRAFFIC_TYPE_L2_ROCE_SUPPORTED     0x10000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_LAG_SUPPORTED                                0x20000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NTUPLE_FLOW_NO_L2CTX_SUPPORTED               0x40000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NIC_FLOW_STATS_SUPPORTED                     0x80000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NTUPLE_FLOW_RX_EXT_IP_PROTO_SUPPORTED        0x100000UL</div><div class='add'>+	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_V3_SUPPORTED                0x200000UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_tunnel_dst_port_query_input (size:192b/24B) */</div><div class='add'>+struct hwrm_tunnel_dst_port_query_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	tunnel_type;</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_VXLAN              0x1UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_GENEVE             0x5UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_VXLAN_V4           0x9UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_IPGRE_V1           0xaUL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_L2_ETYPE           0xbUL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_VXLAN_GPE_V6       0xcUL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_CUSTOM_GRE         0xdUL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ECPRI              0xeUL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_SRV6               0xfUL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_VXLAN_GPE          0x10UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_GRE                0x11UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR       0x12UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES01 0x13UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES02 0x14UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES03 0x15UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES04 0x16UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES05 0x17UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES06 0x18UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES07 0x19UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_LAST              TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES07</div><div class='add'>+	u8	tunnel_next_proto;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_tunnel_dst_port_query_output (size:128b/16B) */</div><div class='add'>+struct hwrm_tunnel_dst_port_query_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	tunnel_dst_port_id;</div><div class='add'>+	__be16	tunnel_dst_port_val;</div><div class='add'>+	u8	upar_in_use;</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_UPAR_IN_USE_UPAR0     0x1UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_UPAR_IN_USE_UPAR1     0x2UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_UPAR_IN_USE_UPAR2     0x4UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_UPAR_IN_USE_UPAR3     0x8UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_UPAR_IN_USE_UPAR4     0x10UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_UPAR_IN_USE_UPAR5     0x20UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_UPAR_IN_USE_UPAR6     0x40UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_UPAR_IN_USE_UPAR7     0x80UL</div><div class='add'>+	u8	status;</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_STATUS_CHIP_LEVEL     0x1UL</div><div class='add'>+	#define TUNNEL_DST_PORT_QUERY_RESP_STATUS_FUNC_LEVEL     0x2UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_tunnel_dst_port_alloc_input (size:192b/24B) */</div><div class='add'>+struct hwrm_tunnel_dst_port_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	tunnel_type;</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN              0x1UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE             0x5UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4           0x9UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1           0xaUL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE           0xbUL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6       0xcUL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_CUSTOM_GRE         0xdUL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ECPRI              0xeUL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_SRV6               0xfUL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE          0x10UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GRE                0x11UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR       0x12UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES01 0x13UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES02 0x14UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES03 0x15UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES04 0x16UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES05 0x17UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES06 0x18UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES07 0x19UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_LAST              TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES07</div><div class='add'>+	u8	tunnel_next_proto;</div><div class='add'>+	__be16	tunnel_dst_port_val;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_tunnel_dst_port_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_tunnel_dst_port_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	tunnel_dst_port_id;</div><div class='add'>+	u8	error_info;</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_ERROR_INFO_SUCCESS         0x0UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_ERROR_INFO_ERR_ALLOCATED   0x1UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_ERROR_INFO_ERR_NO_RESOURCE 0x2UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_ERROR_INFO_ERR_ENABLED     0x3UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_ERROR_INFO_LAST           TUNNEL_DST_PORT_ALLOC_RESP_ERROR_INFO_ERR_ENABLED</div><div class='add'>+	u8	upar_in_use;</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_UPAR_IN_USE_UPAR0     0x1UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_UPAR_IN_USE_UPAR1     0x2UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_UPAR_IN_USE_UPAR2     0x4UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_UPAR_IN_USE_UPAR3     0x8UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_UPAR_IN_USE_UPAR4     0x10UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_UPAR_IN_USE_UPAR5     0x20UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_UPAR_IN_USE_UPAR6     0x40UL</div><div class='add'>+	#define TUNNEL_DST_PORT_ALLOC_RESP_UPAR_IN_USE_UPAR7     0x80UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_tunnel_dst_port_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_tunnel_dst_port_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	tunnel_type;</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN              0x1UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE             0x5UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_V4           0x9UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_IPGRE_V1           0xaUL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_L2_ETYPE           0xbUL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_GPE_V6       0xcUL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_CUSTOM_GRE         0xdUL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ECPRI              0xeUL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_SRV6               0xfUL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_GPE          0x10UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GRE                0x11UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR       0x12UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES01 0x13UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES02 0x14UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES03 0x15UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES04 0x16UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES05 0x17UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES06 0x18UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES07 0x19UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_LAST              TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_ULP_DYN_UPAR_RES07</div><div class='add'>+	u8	tunnel_next_proto;</div><div class='add'>+	__le16	tunnel_dst_port_id;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_tunnel_dst_port_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_tunnel_dst_port_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	error_info;</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_RESP_ERROR_INFO_SUCCESS           0x0UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_RESP_ERROR_INFO_ERR_NOT_OWNER     0x1UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_RESP_ERROR_INFO_ERR_NOT_ALLOCATED 0x2UL</div><div class='add'>+	#define TUNNEL_DST_PORT_FREE_RESP_ERROR_INFO_LAST             TUNNEL_DST_PORT_FREE_RESP_ERROR_INFO_ERR_NOT_ALLOCATED</div><div class='add'>+	u8	unused_1[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ctx_hw_stats (size:1280b/160B) */</div><div class='add'>+struct ctx_hw_stats {</div><div class='add'>+	__le64	rx_ucast_pkts;</div><div class='add'>+	__le64	rx_mcast_pkts;</div><div class='add'>+	__le64	rx_bcast_pkts;</div><div class='add'>+	__le64	rx_discard_pkts;</div><div class='add'>+	__le64	rx_error_pkts;</div><div class='add'>+	__le64	rx_ucast_bytes;</div><div class='add'>+	__le64	rx_mcast_bytes;</div><div class='add'>+	__le64	rx_bcast_bytes;</div><div class='add'>+	__le64	tx_ucast_pkts;</div><div class='add'>+	__le64	tx_mcast_pkts;</div><div class='add'>+	__le64	tx_bcast_pkts;</div><div class='add'>+	__le64	tx_error_pkts;</div><div class='add'>+	__le64	tx_discard_pkts;</div><div class='add'>+	__le64	tx_ucast_bytes;</div><div class='add'>+	__le64	tx_mcast_bytes;</div><div class='add'>+	__le64	tx_bcast_bytes;</div><div class='add'>+	__le64	tpa_pkts;</div><div class='add'>+	__le64	tpa_bytes;</div><div class='add'>+	__le64	tpa_events;</div><div class='add'>+	__le64	tpa_aborts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ctx_hw_stats_ext (size:1408b/176B) */</div><div class='add'>+struct ctx_hw_stats_ext {</div><div class='add'>+	__le64	rx_ucast_pkts;</div><div class='add'>+	__le64	rx_mcast_pkts;</div><div class='add'>+	__le64	rx_bcast_pkts;</div><div class='add'>+	__le64	rx_discard_pkts;</div><div class='add'>+	__le64	rx_error_pkts;</div><div class='add'>+	__le64	rx_ucast_bytes;</div><div class='add'>+	__le64	rx_mcast_bytes;</div><div class='add'>+	__le64	rx_bcast_bytes;</div><div class='add'>+	__le64	tx_ucast_pkts;</div><div class='add'>+	__le64	tx_mcast_pkts;</div><div class='add'>+	__le64	tx_bcast_pkts;</div><div class='add'>+	__le64	tx_error_pkts;</div><div class='add'>+	__le64	tx_discard_pkts;</div><div class='add'>+	__le64	tx_ucast_bytes;</div><div class='add'>+	__le64	tx_mcast_bytes;</div><div class='add'>+	__le64	tx_bcast_bytes;</div><div class='add'>+	__le64	rx_tpa_eligible_pkt;</div><div class='add'>+	__le64	rx_tpa_eligible_bytes;</div><div class='add'>+	__le64	rx_tpa_pkt;</div><div class='add'>+	__le64	rx_tpa_bytes;</div><div class='add'>+	__le64	rx_tpa_errors;</div><div class='add'>+	__le64	rx_tpa_events;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ctx_alloc_input (size:384b/48B) */</div><div class='add'>+struct hwrm_stat_ctx_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	stats_dma_addr;</div><div class='add'>+	__le32	update_period_ms;</div><div class='add'>+	u8	stat_ctx_flags;</div><div class='add'>+	#define STAT_CTX_ALLOC_REQ_STAT_CTX_FLAGS_ROCE             0x1UL</div><div class='add'>+	#define STAT_CTX_ALLOC_REQ_STAT_CTX_FLAGS_DUP_HOST_BUF     0x2UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	stats_dma_length;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define STAT_CTX_ALLOC_REQ_FLAGS_STEERING_TAG_VALID     0x1UL</div><div class='add'>+	__le16	steering_tag;</div><div class='add'>+	__le32	stat_ctx_id;</div><div class='add'>+	__le16	alloc_seq_id;</div><div class='add'>+	u8	unused_1[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ctx_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_stat_ctx_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	stat_ctx_id;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ctx_free_input (size:192b/24B) */</div><div class='add'>+struct hwrm_stat_ctx_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	stat_ctx_id;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ctx_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_stat_ctx_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	stat_ctx_id;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ctx_query_input (size:192b/24B) */</div><div class='add'>+struct hwrm_stat_ctx_query_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	stat_ctx_id;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define STAT_CTX_QUERY_REQ_FLAGS_COUNTER_MASK     0x1UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ctx_query_output (size:1408b/176B) */</div><div class='add'>+struct hwrm_stat_ctx_query_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	tx_ucast_pkts;</div><div class='add'>+	__le64	tx_mcast_pkts;</div><div class='add'>+	__le64	tx_bcast_pkts;</div><div class='add'>+	__le64	tx_discard_pkts;</div><div class='add'>+	__le64	tx_error_pkts;</div><div class='add'>+	__le64	tx_ucast_bytes;</div><div class='add'>+	__le64	tx_mcast_bytes;</div><div class='add'>+	__le64	tx_bcast_bytes;</div><div class='add'>+	__le64	rx_ucast_pkts;</div><div class='add'>+	__le64	rx_mcast_pkts;</div><div class='add'>+	__le64	rx_bcast_pkts;</div><div class='add'>+	__le64	rx_discard_pkts;</div><div class='add'>+	__le64	rx_error_pkts;</div><div class='add'>+	__le64	rx_ucast_bytes;</div><div class='add'>+	__le64	rx_mcast_bytes;</div><div class='add'>+	__le64	rx_bcast_bytes;</div><div class='add'>+	__le64	rx_agg_pkts;</div><div class='add'>+	__le64	rx_agg_bytes;</div><div class='add'>+	__le64	rx_agg_events;</div><div class='add'>+	__le64	rx_agg_aborts;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ext_ctx_query_input (size:192b/24B) */</div><div class='add'>+struct hwrm_stat_ext_ctx_query_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	stat_ctx_id;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define STAT_EXT_CTX_QUERY_REQ_FLAGS_COUNTER_MASK     0x1UL</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ext_ctx_query_output (size:1536b/192B) */</div><div class='add'>+struct hwrm_stat_ext_ctx_query_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	rx_ucast_pkts;</div><div class='add'>+	__le64	rx_mcast_pkts;</div><div class='add'>+	__le64	rx_bcast_pkts;</div><div class='add'>+	__le64	rx_discard_pkts;</div><div class='add'>+	__le64	rx_error_pkts;</div><div class='add'>+	__le64	rx_ucast_bytes;</div><div class='add'>+	__le64	rx_mcast_bytes;</div><div class='add'>+	__le64	rx_bcast_bytes;</div><div class='add'>+	__le64	tx_ucast_pkts;</div><div class='add'>+	__le64	tx_mcast_pkts;</div><div class='add'>+	__le64	tx_bcast_pkts;</div><div class='add'>+	__le64	tx_error_pkts;</div><div class='add'>+	__le64	tx_discard_pkts;</div><div class='add'>+	__le64	tx_ucast_bytes;</div><div class='add'>+	__le64	tx_mcast_bytes;</div><div class='add'>+	__le64	tx_bcast_bytes;</div><div class='add'>+	__le64	rx_tpa_eligible_pkt;</div><div class='add'>+	__le64	rx_tpa_eligible_bytes;</div><div class='add'>+	__le64	rx_tpa_pkt;</div><div class='add'>+	__le64	rx_tpa_bytes;</div><div class='add'>+	__le64	rx_tpa_errors;</div><div class='add'>+	__le64	rx_tpa_events;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ctx_clr_stats_input (size:192b/24B) */</div><div class='add'>+struct hwrm_stat_ctx_clr_stats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	stat_ctx_id;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_ctx_clr_stats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_stat_ctx_clr_stats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_pcie_qstats_input (size:256b/32B) */</div><div class='add'>+struct hwrm_pcie_qstats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	pcie_stat_size;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	__le64	pcie_stat_host_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_pcie_qstats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_pcie_qstats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	pcie_stat_size;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* pcie_ctx_hw_stats (size:768b/96B) */</div><div class='add'>+struct pcie_ctx_hw_stats {</div><div class='add'>+	__le64	pcie_pl_signal_integrity;</div><div class='add'>+	__le64	pcie_dl_signal_integrity;</div><div class='add'>+	__le64	pcie_tl_signal_integrity;</div><div class='add'>+	__le64	pcie_link_integrity;</div><div class='add'>+	__le64	pcie_tx_traffic_rate;</div><div class='add'>+	__le64	pcie_rx_traffic_rate;</div><div class='add'>+	__le64	pcie_tx_dllp_statistics;</div><div class='add'>+	__le64	pcie_rx_dllp_statistics;</div><div class='add'>+	__le64	pcie_equalization_time;</div><div class='add'>+	__le32	pcie_ltssm_histogram[4];</div><div class='add'>+	__le64	pcie_recovery_histogram;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* pcie_ctx_hw_stats_v2 (size:4544b/568B) */</div><div class='add'>+struct pcie_ctx_hw_stats_v2 {</div><div class='add'>+	__le64	pcie_pl_signal_integrity;</div><div class='add'>+	__le64	pcie_dl_signal_integrity;</div><div class='add'>+	__le64	pcie_tl_signal_integrity;</div><div class='add'>+	__le64	pcie_link_integrity;</div><div class='add'>+	__le64	pcie_tx_traffic_rate;</div><div class='add'>+	__le64	pcie_rx_traffic_rate;</div><div class='add'>+	__le64	pcie_tx_dllp_statistics;</div><div class='add'>+	__le64	pcie_rx_dllp_statistics;</div><div class='add'>+	__le64	pcie_equalization_time;</div><div class='add'>+	__le32	pcie_ltssm_histogram[4];</div><div class='add'>+	__le64	pcie_recovery_histogram;</div><div class='add'>+	__le32	pcie_tl_credit_nph_histogram[8];</div><div class='add'>+	__le32	pcie_tl_credit_ph_histogram[8];</div><div class='add'>+	__le32	pcie_tl_credit_pd_histogram[8];</div><div class='add'>+	__le32	pcie_cmpl_latest_times[4];</div><div class='add'>+	__le32	pcie_cmpl_longest_time;</div><div class='add'>+	__le32	pcie_cmpl_shortest_time;</div><div class='add'>+	__le32	unused_0[2];</div><div class='add'>+	__le32	pcie_cmpl_latest_headers[4][4];</div><div class='add'>+	__le32	pcie_cmpl_longest_headers[4][4];</div><div class='add'>+	__le32	pcie_cmpl_shortest_headers[4][4];</div><div class='add'>+	__le32	pcie_wr_latency_histogram[12];</div><div class='add'>+	__le32	pcie_wr_latency_all_normal_count;</div><div class='add'>+	__le32	unused_1;</div><div class='add'>+	__le64	pcie_posted_packet_count;</div><div class='add'>+	__le64	pcie_non_posted_packet_count;</div><div class='add'>+	__le64	pcie_other_packet_count;</div><div class='add'>+	__le64	pcie_blocked_packet_count;</div><div class='add'>+	__le64	pcie_cmpl_packet_count;</div><div class='add'>+	__le32	pcie_rd_latency_histogram[12];</div><div class='add'>+	__le32	pcie_rd_latency_all_normal_count;</div><div class='add'>+	__le32	unused_2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_generic_qstats_input (size:256b/32B) */</div><div class='add'>+struct hwrm_stat_generic_qstats_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	generic_stat_size;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define STAT_GENERIC_QSTATS_REQ_FLAGS_COUNTER_MASK     0x1UL</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	__le64	generic_stat_host_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_stat_generic_qstats_output (size:128b/16B) */</div><div class='add'>+struct hwrm_stat_generic_qstats_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	generic_stat_size;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* generic_sw_hw_stats (size:1472b/184B) */</div><div class='add'>+struct generic_sw_hw_stats {</div><div class='add'>+	__le64	pcie_statistics_tx_tlp;</div><div class='add'>+	__le64	pcie_statistics_rx_tlp;</div><div class='add'>+	__le64	pcie_credit_fc_hdr_posted;</div><div class='add'>+	__le64	pcie_credit_fc_hdr_nonposted;</div><div class='add'>+	__le64	pcie_credit_fc_hdr_cmpl;</div><div class='add'>+	__le64	pcie_credit_fc_data_posted;</div><div class='add'>+	__le64	pcie_credit_fc_data_nonposted;</div><div class='add'>+	__le64	pcie_credit_fc_data_cmpl;</div><div class='add'>+	__le64	pcie_credit_fc_tgt_nonposted;</div><div class='add'>+	__le64	pcie_credit_fc_tgt_data_posted;</div><div class='add'>+	__le64	pcie_credit_fc_tgt_hdr_posted;</div><div class='add'>+	__le64	pcie_credit_fc_cmpl_hdr_posted;</div><div class='add'>+	__le64	pcie_credit_fc_cmpl_data_posted;</div><div class='add'>+	__le64	pcie_cmpl_longest;</div><div class='add'>+	__le64	pcie_cmpl_shortest;</div><div class='add'>+	__le64	cache_miss_count_cfcq;</div><div class='add'>+	__le64	cache_miss_count_cfcs;</div><div class='add'>+	__le64	cache_miss_count_cfcc;</div><div class='add'>+	__le64	cache_miss_count_cfcm;</div><div class='add'>+	__le64	hw_db_recov_dbs_dropped;</div><div class='add'>+	__le64	hw_db_recov_drops_serviced;</div><div class='add'>+	__le64	hw_db_recov_dbs_recovered;</div><div class='add'>+	__le64	hw_db_recov_oo_drop_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_reset_input (size:192b/24B) */</div><div class='add'>+struct hwrm_fw_reset_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	embedded_proc_type;</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_BOOT                  0x0UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_MGMT                  0x1UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_NETCTRL               0x2UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_ROCE                  0x3UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_HOST                  0x4UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_AP                    0x5UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_CHIP                  0x6UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_HOST_RESOURCE_REINIT  0x7UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_IMPACTLESS_ACTIVATION 0x8UL</div><div class='add'>+	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_LAST                 FW_RESET_REQ_EMBEDDED_PROC_TYPE_IMPACTLESS_ACTIVATION</div><div class='add'>+	u8	selfrst_status;</div><div class='add'>+	#define FW_RESET_REQ_SELFRST_STATUS_SELFRSTNONE      0x0UL</div><div class='add'>+	#define FW_RESET_REQ_SELFRST_STATUS_SELFRSTASAP      0x1UL</div><div class='add'>+	#define FW_RESET_REQ_SELFRST_STATUS_SELFRSTPCIERST   0x2UL</div><div class='add'>+	#define FW_RESET_REQ_SELFRST_STATUS_SELFRSTIMMEDIATE 0x3UL</div><div class='add'>+	#define FW_RESET_REQ_SELFRST_STATUS_LAST            FW_RESET_REQ_SELFRST_STATUS_SELFRSTIMMEDIATE</div><div class='add'>+	u8	host_idx;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define FW_RESET_REQ_FLAGS_RESET_GRACEFUL     0x1UL</div><div class='add'>+	#define FW_RESET_REQ_FLAGS_FW_ACTIVATION      0x2UL</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_reset_output (size:128b/16B) */</div><div class='add'>+struct hwrm_fw_reset_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	selfrst_status;</div><div class='add'>+	#define FW_RESET_RESP_SELFRST_STATUS_SELFRSTNONE      0x0UL</div><div class='add'>+	#define FW_RESET_RESP_SELFRST_STATUS_SELFRSTASAP      0x1UL</div><div class='add'>+	#define FW_RESET_RESP_SELFRST_STATUS_SELFRSTPCIERST   0x2UL</div><div class='add'>+	#define FW_RESET_RESP_SELFRST_STATUS_SELFRSTIMMEDIATE 0x3UL</div><div class='add'>+	#define FW_RESET_RESP_SELFRST_STATUS_LAST            FW_RESET_RESP_SELFRST_STATUS_SELFRSTIMMEDIATE</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_qstatus_input (size:192b/24B) */</div><div class='add'>+struct hwrm_fw_qstatus_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	embedded_proc_type;</div><div class='add'>+	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_BOOT    0x0UL</div><div class='add'>+	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_MGMT    0x1UL</div><div class='add'>+	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_NETCTRL 0x2UL</div><div class='add'>+	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_ROCE    0x3UL</div><div class='add'>+	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_HOST    0x4UL</div><div class='add'>+	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_AP      0x5UL</div><div class='add'>+	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_CHIP    0x6UL</div><div class='add'>+	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_LAST   FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_CHIP</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_qstatus_output (size:128b/16B) */</div><div class='add'>+struct hwrm_fw_qstatus_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	selfrst_status;</div><div class='add'>+	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTNONE    0x0UL</div><div class='add'>+	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTASAP    0x1UL</div><div class='add'>+	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPCIERST 0x2UL</div><div class='add'>+	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPOWER   0x3UL</div><div class='add'>+	#define FW_QSTATUS_RESP_SELFRST_STATUS_LAST          FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPOWER</div><div class='add'>+	u8	nvm_option_action_status;</div><div class='add'>+	#define FW_QSTATUS_RESP_NVM_OPTION_ACTION_STATUS_NVMOPT_ACTION_NONE     0x0UL</div><div class='add'>+	#define FW_QSTATUS_RESP_NVM_OPTION_ACTION_STATUS_NVMOPT_ACTION_HOTRESET 0x1UL</div><div class='add'>+	#define FW_QSTATUS_RESP_NVM_OPTION_ACTION_STATUS_NVMOPT_ACTION_WARMBOOT 0x2UL</div><div class='add'>+	#define FW_QSTATUS_RESP_NVM_OPTION_ACTION_STATUS_NVMOPT_ACTION_COLDBOOT 0x3UL</div><div class='add'>+	#define FW_QSTATUS_RESP_NVM_OPTION_ACTION_STATUS_LAST                  FW_QSTATUS_RESP_NVM_OPTION_ACTION_STATUS_NVMOPT_ACTION_COLDBOOT</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_set_time_input (size:256b/32B) */</div><div class='add'>+struct hwrm_fw_set_time_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	year;</div><div class='add'>+	#define FW_SET_TIME_REQ_YEAR_UNKNOWN 0x0UL</div><div class='add'>+	#define FW_SET_TIME_REQ_YEAR_LAST   FW_SET_TIME_REQ_YEAR_UNKNOWN</div><div class='add'>+	u8	month;</div><div class='add'>+	u8	day;</div><div class='add'>+	u8	hour;</div><div class='add'>+	u8	minute;</div><div class='add'>+	u8	second;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	millisecond;</div><div class='add'>+	__le16	zone;</div><div class='add'>+	#define FW_SET_TIME_REQ_ZONE_UTC     0</div><div class='add'>+	#define FW_SET_TIME_REQ_ZONE_UNKNOWN 65535</div><div class='add'>+	#define FW_SET_TIME_REQ_ZONE_LAST   FW_SET_TIME_REQ_ZONE_UNKNOWN</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_set_time_output (size:128b/16B) */</div><div class='add'>+struct hwrm_fw_set_time_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_struct_hdr (size:128b/16B) */</div><div class='add'>+struct hwrm_struct_hdr {</div><div class='add'>+	__le16	struct_id;</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_LLDP_CFG              0x41bUL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_DCBX_ETS              0x41dUL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_DCBX_PFC              0x41fUL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_DCBX_APP              0x421UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_DCBX_FEATURE_STATE    0x422UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_LLDP_GENERIC          0x424UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_LLDP_DEVICE           0x426UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_POWER_BKUP            0x427UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_PEER_MMAP             0x429UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_AFM_OPAQUE            0x1UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_PORT_DESCRIPTION      0xaUL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_RSS_V2                0x64UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_MSIX_PER_VF           0xc8UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_UDCC_RTT_BUCKET_COUNT 0x12cUL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_UDCC_RTT_BUCKET_BOUND 0x12dUL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_DBG_TOKEN_CLAIMS      0x190UL</div><div class='add'>+	#define STRUCT_HDR_STRUCT_ID_LAST                 STRUCT_HDR_STRUCT_ID_DBG_TOKEN_CLAIMS</div><div class='add'>+	__le16	len;</div><div class='add'>+	u8	version;</div><div class='add'>+	#define STRUCT_HDR_VERSION_0 0x0UL</div><div class='add'>+	#define STRUCT_HDR_VERSION_1 0x1UL</div><div class='add'>+	#define STRUCT_HDR_VERSION_LAST STRUCT_HDR_VERSION_1</div><div class='add'>+	u8	count;</div><div class='add'>+	__le16	subtype;</div><div class='add'>+	__le16	next_offset;</div><div class='add'>+	#define STRUCT_HDR_NEXT_OFFSET_LAST 0x0UL</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_struct_data_dcbx_app (size:64b/8B) */</div><div class='add'>+struct hwrm_struct_data_dcbx_app {</div><div class='add'>+	__be16	protocol_id;</div><div class='add'>+	u8	protocol_selector;</div><div class='add'>+	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_ETHER_TYPE   0x1UL</div><div class='add'>+	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_TCP_PORT     0x2UL</div><div class='add'>+	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_UDP_PORT     0x3UL</div><div class='add'>+	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_TCP_UDP_PORT 0x4UL</div><div class='add'>+	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_LAST        STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_TCP_UDP_PORT</div><div class='add'>+	u8	priority;</div><div class='add'>+	u8	valid;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_set_structured_data_input (size:256b/32B) */</div><div class='add'>+struct hwrm_fw_set_structured_data_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	src_data_addr;</div><div class='add'>+	__le16	data_len;</div><div class='add'>+	u8	hdr_cnt;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_set_structured_data_output (size:128b/16B) */</div><div class='add'>+struct hwrm_fw_set_structured_data_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_set_structured_data_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_fw_set_structured_data_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_UNKNOWN       0x0UL</div><div class='add'>+	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_HDR_CNT   0x1UL</div><div class='add'>+	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_FMT       0x2UL</div><div class='add'>+	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID        0x3UL</div><div class='add'>+	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_ALREADY_ADDED 0x4UL</div><div class='add'>+	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_INST_IN_PROG  0x5UL</div><div class='add'>+	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_LAST         FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_INST_IN_PROG</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_get_structured_data_input (size:256b/32B) */</div><div class='add'>+struct hwrm_fw_get_structured_data_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	dest_data_addr;</div><div class='add'>+	__le16	data_len;</div><div class='add'>+	__le16	structure_id;</div><div class='add'>+	__le16	subtype;</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_UNUSED                  0x0UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_ALL                     0xffffUL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_ADMIN       0x100UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_PEER        0x101UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_OPERATIONAL 0x102UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_ADMIN          0x200UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_PEER           0x201UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_OPERATIONAL    0x202UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_HOST_OPERATIONAL        0x300UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_CLAIMS_SUPPORTED        0x320UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_CLAIMS_ACTIVE           0x321UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_LAST                   FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_CLAIMS_ACTIVE</div><div class='add'>+	u8	count;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_get_structured_data_output (size:128b/16B) */</div><div class='add'>+struct hwrm_fw_get_structured_data_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	hdr_cnt;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_get_structured_data_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_fw_get_structured_data_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_CMD_ERR_CODE_UNKNOWN 0x0UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID  0x3UL</div><div class='add'>+	#define FW_GET_STRUCTURED_DATA_CMD_ERR_CODE_LAST   FW_GET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_livepatch_query_input (size:192b/24B) */</div><div class='add'>+struct hwrm_fw_livepatch_query_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	fw_target;</div><div class='add'>+	#define FW_LIVEPATCH_QUERY_REQ_FW_TARGET_COMMON_FW 0x1UL</div><div class='add'>+	#define FW_LIVEPATCH_QUERY_REQ_FW_TARGET_SECURE_FW 0x2UL</div><div class='add'>+	#define FW_LIVEPATCH_QUERY_REQ_FW_TARGET_LAST     FW_LIVEPATCH_QUERY_REQ_FW_TARGET_SECURE_FW</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_livepatch_query_output (size:640b/80B) */</div><div class='add'>+struct hwrm_fw_livepatch_query_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	char	install_ver[32];</div><div class='add'>+	char	active_ver[32];</div><div class='add'>+	__le16	status_flags;</div><div class='add'>+	#define FW_LIVEPATCH_QUERY_RESP_STATUS_FLAGS_INSTALL     0x1UL</div><div class='add'>+	#define FW_LIVEPATCH_QUERY_RESP_STATUS_FLAGS_ACTIVE      0x2UL</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_livepatch_input (size:256b/32B) */</div><div class='add'>+struct hwrm_fw_livepatch_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	opcode;</div><div class='add'>+	#define FW_LIVEPATCH_REQ_OPCODE_ACTIVATE   0x1UL</div><div class='add'>+	#define FW_LIVEPATCH_REQ_OPCODE_DEACTIVATE 0x2UL</div><div class='add'>+	#define FW_LIVEPATCH_REQ_OPCODE_LAST      FW_LIVEPATCH_REQ_OPCODE_DEACTIVATE</div><div class='add'>+	u8	fw_target;</div><div class='add'>+	#define FW_LIVEPATCH_REQ_FW_TARGET_COMMON_FW 0x1UL</div><div class='add'>+	#define FW_LIVEPATCH_REQ_FW_TARGET_SECURE_FW 0x2UL</div><div class='add'>+	#define FW_LIVEPATCH_REQ_FW_TARGET_LAST     FW_LIVEPATCH_REQ_FW_TARGET_SECURE_FW</div><div class='add'>+	u8	loadtype;</div><div class='add'>+	#define FW_LIVEPATCH_REQ_LOADTYPE_NVM_INSTALL   0x1UL</div><div class='add'>+	#define FW_LIVEPATCH_REQ_LOADTYPE_MEMORY_DIRECT 0x2UL</div><div class='add'>+	#define FW_LIVEPATCH_REQ_LOADTYPE_LAST         FW_LIVEPATCH_REQ_LOADTYPE_MEMORY_DIRECT</div><div class='add'>+	u8	flags;</div><div class='add'>+	__le32	patch_len;</div><div class='add'>+	__le64	host_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_livepatch_output (size:128b/16B) */</div><div class='add'>+struct hwrm_fw_livepatch_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fw_livepatch_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_fw_livepatch_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_UNKNOWN         0x0UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_INVALID_OPCODE  0x1UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_INVALID_TARGET  0x2UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_NOT_SUPPORTED   0x3UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_NOT_INSTALLED   0x4UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_NOT_PATCHED     0x5UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_AUTH_FAIL       0x6UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_INVALID_HEADER  0x7UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_INVALID_SIZE    0x8UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_ALREADY_PATCHED 0x9UL</div><div class='add'>+	#define FW_LIVEPATCH_CMD_ERR_CODE_LAST           FW_LIVEPATCH_CMD_ERR_CODE_ALREADY_PATCHED</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_exec_fwd_resp_input (size:1024b/128B) */</div><div class='add'>+struct hwrm_exec_fwd_resp_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	encap_request[26];</div><div class='add'>+	__le16	encap_resp_target_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_exec_fwd_resp_output (size:128b/16B) */</div><div class='add'>+struct hwrm_exec_fwd_resp_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_reject_fwd_resp_input (size:1024b/128B) */</div><div class='add'>+struct hwrm_reject_fwd_resp_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	encap_request[26];</div><div class='add'>+	__le16	encap_resp_target_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_reject_fwd_resp_output (size:128b/16B) */</div><div class='add'>+struct hwrm_reject_fwd_resp_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fwd_resp_input (size:1024b/128B) */</div><div class='add'>+struct hwrm_fwd_resp_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	encap_resp_target_id;</div><div class='add'>+	__le16	encap_resp_cmpl_ring;</div><div class='add'>+	__le16	encap_resp_len;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	u8	unused_1;</div><div class='add'>+	__le64	encap_resp_addr;</div><div class='add'>+	__le32	encap_resp[24];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fwd_resp_output (size:128b/16B) */</div><div class='add'>+struct hwrm_fwd_resp_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fwd_async_event_cmpl_input (size:320b/40B) */</div><div class='add'>+struct hwrm_fwd_async_event_cmpl_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	encap_async_event_target_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	__le32	encap_async_event_cmpl[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_fwd_async_event_cmpl_output (size:128b/16B) */</div><div class='add'>+struct hwrm_fwd_async_event_cmpl_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_temp_monitor_query_input (size:128b/16B) */</div><div class='add'>+struct hwrm_temp_monitor_query_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_temp_monitor_query_output (size:192b/24B) */</div><div class='add'>+struct hwrm_temp_monitor_query_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	temp;</div><div class='add'>+	u8	phy_temp;</div><div class='add'>+	u8	om_temp;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define TEMP_MONITOR_QUERY_RESP_FLAGS_TEMP_NOT_AVAILABLE             0x1UL</div><div class='add'>+	#define TEMP_MONITOR_QUERY_RESP_FLAGS_PHY_TEMP_NOT_AVAILABLE         0x2UL</div><div class='add'>+	#define TEMP_MONITOR_QUERY_RESP_FLAGS_OM_NOT_PRESENT                 0x4UL</div><div class='add'>+	#define TEMP_MONITOR_QUERY_RESP_FLAGS_OM_TEMP_NOT_AVAILABLE          0x8UL</div><div class='add'>+	#define TEMP_MONITOR_QUERY_RESP_FLAGS_EXT_TEMP_FIELDS_AVAILABLE      0x10UL</div><div class='add'>+	#define TEMP_MONITOR_QUERY_RESP_FLAGS_THRESHOLD_VALUES_AVAILABLE     0x20UL</div><div class='add'>+	u8	temp2;</div><div class='add'>+	u8	phy_temp2;</div><div class='add'>+	u8	om_temp2;</div><div class='add'>+	u8	warn_threshold;</div><div class='add'>+	u8	critical_threshold;</div><div class='add'>+	u8	fatal_threshold;</div><div class='add'>+	u8	shutdown_threshold;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_wol_filter_alloc_input (size:512b/64B) */</div><div class='add'>+struct hwrm_wol_filter_alloc_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_ENABLES_MAC_ADDRESS           0x1UL</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_OFFSET        0x2UL</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_BUF_SIZE      0x4UL</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_BUF_ADDR      0x8UL</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_MASK_ADDR     0x10UL</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_MASK_SIZE     0x20UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	wol_type;</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_WOL_TYPE_MAGICPKT 0x0UL</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_WOL_TYPE_BMP      0x1UL</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_WOL_TYPE_INVALID  0xffUL</div><div class='add'>+	#define WOL_FILTER_ALLOC_REQ_WOL_TYPE_LAST    WOL_FILTER_ALLOC_REQ_WOL_TYPE_INVALID</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	mac_address[6];</div><div class='add'>+	__le16	pattern_offset;</div><div class='add'>+	__le16	pattern_buf_size;</div><div class='add'>+	__le16	pattern_mask_size;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+	__le64	pattern_buf_addr;</div><div class='add'>+	__le64	pattern_mask_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_wol_filter_alloc_output (size:128b/16B) */</div><div class='add'>+struct hwrm_wol_filter_alloc_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	wol_filter_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_wol_filter_free_input (size:256b/32B) */</div><div class='add'>+struct hwrm_wol_filter_free_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define WOL_FILTER_FREE_REQ_FLAGS_FREE_ALL_WOL_FILTERS     0x1UL</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define WOL_FILTER_FREE_REQ_ENABLES_WOL_FILTER_ID     0x1UL</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	wol_filter_id;</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_wol_filter_free_output (size:128b/16B) */</div><div class='add'>+struct hwrm_wol_filter_free_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_wol_filter_qcfg_input (size:448b/56B) */</div><div class='add'>+struct hwrm_wol_filter_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	__le16	handle;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	__le64	pattern_buf_addr;</div><div class='add'>+	__le16	pattern_buf_size;</div><div class='add'>+	u8	unused_1[6];</div><div class='add'>+	__le64	pattern_mask_addr;</div><div class='add'>+	__le16	pattern_mask_size;</div><div class='add'>+	u8	unused_2[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_wol_filter_qcfg_output (size:256b/32B) */</div><div class='add'>+struct hwrm_wol_filter_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	next_handle;</div><div class='add'>+	u8	wol_filter_id;</div><div class='add'>+	u8	wol_type;</div><div class='add'>+	#define WOL_FILTER_QCFG_RESP_WOL_TYPE_MAGICPKT 0x0UL</div><div class='add'>+	#define WOL_FILTER_QCFG_RESP_WOL_TYPE_BMP      0x1UL</div><div class='add'>+	#define WOL_FILTER_QCFG_RESP_WOL_TYPE_INVALID  0xffUL</div><div class='add'>+	#define WOL_FILTER_QCFG_RESP_WOL_TYPE_LAST    WOL_FILTER_QCFG_RESP_WOL_TYPE_INVALID</div><div class='add'>+	__le32	unused_0;</div><div class='add'>+	u8	mac_address[6];</div><div class='add'>+	__le16	pattern_offset;</div><div class='add'>+	__le16	pattern_size;</div><div class='add'>+	__le16	pattern_mask_size;</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_wol_reason_qcfg_input (size:320b/40B) */</div><div class='add'>+struct hwrm_wol_reason_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	port_id;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+	__le64	wol_pkt_buf_addr;</div><div class='add'>+	__le16	wol_pkt_buf_size;</div><div class='add'>+	u8	unused_1[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_wol_reason_qcfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_wol_reason_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	wol_filter_id;</div><div class='add'>+	u8	wol_reason;</div><div class='add'>+	#define WOL_REASON_QCFG_RESP_WOL_REASON_MAGICPKT 0x0UL</div><div class='add'>+	#define WOL_REASON_QCFG_RESP_WOL_REASON_BMP      0x1UL</div><div class='add'>+	#define WOL_REASON_QCFG_RESP_WOL_REASON_INVALID  0xffUL</div><div class='add'>+	#define WOL_REASON_QCFG_RESP_WOL_REASON_LAST    WOL_REASON_QCFG_RESP_WOL_REASON_INVALID</div><div class='add'>+	u8	wol_pkt_len;</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_read_direct_input (size:256b/32B) */</div><div class='add'>+struct hwrm_dbg_read_direct_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	host_dest_addr;</div><div class='add'>+	__le32	read_addr;</div><div class='add'>+	__le32	read_len32;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_read_direct_output (size:128b/16B) */</div><div class='add'>+struct hwrm_dbg_read_direct_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	crc32;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_qcaps_input (size:192b/24B) */</div><div class='add'>+struct hwrm_dbg_qcaps_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_qcaps_output (size:192b/24B) */</div><div class='add'>+struct hwrm_dbg_qcaps_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le32	coredump_component_disable_caps;</div><div class='add'>+	#define DBG_QCAPS_RESP_COREDUMP_COMPONENT_DISABLE_CAPS_NVRAM     0x1UL</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define DBG_QCAPS_RESP_FLAGS_CRASHDUMP_NVM             0x1UL</div><div class='add'>+	#define DBG_QCAPS_RESP_FLAGS_CRASHDUMP_HOST_DDR        0x2UL</div><div class='add'>+	#define DBG_QCAPS_RESP_FLAGS_CRASHDUMP_SOC_DDR         0x4UL</div><div class='add'>+	#define DBG_QCAPS_RESP_FLAGS_USEQ                      0x8UL</div><div class='add'>+	#define DBG_QCAPS_RESP_FLAGS_COREDUMP_HOST_DDR         0x10UL</div><div class='add'>+	#define DBG_QCAPS_RESP_FLAGS_COREDUMP_HOST_CAPTURE     0x20UL</div><div class='add'>+	#define DBG_QCAPS_RESP_FLAGS_PTRACE                    0x40UL</div><div class='add'>+	#define DBG_QCAPS_RESP_FLAGS_REG_ACCESS_RESTRICTED     0x80UL</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_qcfg_input (size:192b/24B) */</div><div class='add'>+struct hwrm_dbg_qcfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_MASK         0x3UL</div><div class='add'>+	#define DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_SFT          0</div><div class='add'>+	#define DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_DEST_NVM       0x0UL</div><div class='add'>+	#define DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_DEST_HOST_DDR  0x1UL</div><div class='add'>+	#define DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_DEST_SOC_DDR   0x2UL</div><div class='add'>+	#define DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_LAST          DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_DEST_SOC_DDR</div><div class='add'>+	__le32	coredump_component_disable_flags;</div><div class='add'>+	#define DBG_QCFG_REQ_COREDUMP_COMPONENT_DISABLE_FLAGS_NVRAM     0x1UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_qcfg_output (size:256b/32B) */</div><div class='add'>+struct hwrm_dbg_qcfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	fid;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le32	coredump_size;</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define DBG_QCFG_RESP_FLAGS_UART_LOG               0x1UL</div><div class='add'>+	#define DBG_QCFG_RESP_FLAGS_UART_LOG_SECONDARY     0x2UL</div><div class='add'>+	#define DBG_QCFG_RESP_FLAGS_FW_TRACE               0x4UL</div><div class='add'>+	#define DBG_QCFG_RESP_FLAGS_FW_TRACE_SECONDARY     0x8UL</div><div class='add'>+	#define DBG_QCFG_RESP_FLAGS_DEBUG_NOTIFY           0x10UL</div><div class='add'>+	#define DBG_QCFG_RESP_FLAGS_JTAG_DEBUG             0x20UL</div><div class='add'>+	__le16	async_cmpl_ring;</div><div class='add'>+	u8	unused_2[2];</div><div class='add'>+	__le32	crashdump_size;</div><div class='add'>+	u8	unused_3[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_crashdump_medium_cfg_input (size:320b/40B) */</div><div class='add'>+struct hwrm_dbg_crashdump_medium_cfg_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	output_dest_flags;</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_TYPE_DDR     0x1UL</div><div class='add'>+	__le16	pg_size_lvl;</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_LVL_MASK      0x3UL</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_LVL_SFT       0</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_LVL_LVL_0       0x0UL</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_LVL_LVL_1       0x1UL</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_LVL_LVL_2       0x2UL</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_LVL_LAST       DBG_CRASHDUMP_MEDIUM_CFG_REQ_LVL_LVL_2</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_MASK  0x1cUL</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_SFT   2</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 2)</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 2)</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 2)</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 2)</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 2)</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 2)</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_LAST   DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_1G</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_UNUSED11_MASK 0xffe0UL</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_UNUSED11_SFT  5</div><div class='add'>+	__le32	size;</div><div class='add'>+	__le32	coredump_component_disable_flags;</div><div class='add'>+	#define DBG_CRASHDUMP_MEDIUM_CFG_REQ_NVRAM     0x1UL</div><div class='add'>+	__le32	unused_0;</div><div class='add'>+	__le64	pbl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_crashdump_medium_cfg_output (size:128b/16B) */</div><div class='add'>+struct hwrm_dbg_crashdump_medium_cfg_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* coredump_segment_record (size:128b/16B) */</div><div class='add'>+struct coredump_segment_record {</div><div class='add'>+	__le16	component_id;</div><div class='add'>+	__le16	segment_id;</div><div class='add'>+	__le16	max_instances;</div><div class='add'>+	u8	version_hi;</div><div class='add'>+	u8	version_low;</div><div class='add'>+	u8	seg_flags;</div><div class='add'>+	u8	compress_flags;</div><div class='add'>+	#define SFLAG_COMPRESSED_ZLIB     0x1UL</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le32	segment_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_coredump_list_input (size:256b/32B) */</div><div class='add'>+struct hwrm_dbg_coredump_list_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	host_dest_addr;</div><div class='add'>+	__le32	host_buf_len;</div><div class='add'>+	__le16	seq_no;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define DBG_COREDUMP_LIST_REQ_FLAGS_CRASHDUMP     0x1UL</div><div class='add'>+	u8	unused_0[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_coredump_list_output (size:128b/16B) */</div><div class='add'>+struct hwrm_dbg_coredump_list_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define DBG_COREDUMP_LIST_RESP_FLAGS_MORE     0x1UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	total_segments;</div><div class='add'>+	__le16	data_len;</div><div class='add'>+	u8	unused_1;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_coredump_initiate_input (size:256b/32B) */</div><div class='add'>+struct hwrm_dbg_coredump_initiate_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	component_id;</div><div class='add'>+	__le16	segment_id;</div><div class='add'>+	__le16	instance;</div><div class='add'>+	__le16	unused_0;</div><div class='add'>+	u8	seg_flags;</div><div class='add'>+	#define DBG_COREDUMP_INITIATE_REQ_SEG_FLAGS_LIVE_DATA                0x1UL</div><div class='add'>+	#define DBG_COREDUMP_INITIATE_REQ_SEG_FLAGS_CRASH_DATA               0x2UL</div><div class='add'>+	#define DBG_COREDUMP_INITIATE_REQ_SEG_FLAGS_COLLECT_CTX_L1_CACHE     0x4UL</div><div class='add'>+	u8	unused_1[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_coredump_initiate_output (size:128b/16B) */</div><div class='add'>+struct hwrm_dbg_coredump_initiate_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* coredump_data_hdr (size:128b/16B) */</div><div class='add'>+struct coredump_data_hdr {</div><div class='add'>+	__le32	address;</div><div class='add'>+	__le32	flags_length;</div><div class='add'>+	#define COREDUMP_DATA_HDR_FLAGS_LENGTH_ACTUAL_LEN_MASK     0xffffffUL</div><div class='add'>+	#define COREDUMP_DATA_HDR_FLAGS_LENGTH_ACTUAL_LEN_SFT      0</div><div class='add'>+	#define COREDUMP_DATA_HDR_FLAGS_LENGTH_INDIRECT_ACCESS     0x1000000UL</div><div class='add'>+	__le32	instance;</div><div class='add'>+	__le32	next_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_coredump_retrieve_input (size:448b/56B) */</div><div class='add'>+struct hwrm_dbg_coredump_retrieve_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	host_dest_addr;</div><div class='add'>+	__le32	host_buf_len;</div><div class='add'>+	__le32	unused_0;</div><div class='add'>+	__le16	component_id;</div><div class='add'>+	__le16	segment_id;</div><div class='add'>+	__le16	instance;</div><div class='add'>+	__le16	unused_1;</div><div class='add'>+	u8	seg_flags;</div><div class='add'>+	u8	unused_2;</div><div class='add'>+	__le16	unused_3;</div><div class='add'>+	__le32	unused_4;</div><div class='add'>+	__le32	seq_no;</div><div class='add'>+	__le32	unused_5;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_coredump_retrieve_output (size:128b/16B) */</div><div class='add'>+struct hwrm_dbg_coredump_retrieve_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define DBG_COREDUMP_RETRIEVE_RESP_FLAGS_MORE     0x1UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	data_len;</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_ring_info_get_input (size:192b/24B) */</div><div class='add'>+struct hwrm_dbg_ring_info_get_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	ring_type;</div><div class='add'>+	#define DBG_RING_INFO_GET_REQ_RING_TYPE_L2_CMPL 0x0UL</div><div class='add'>+	#define DBG_RING_INFO_GET_REQ_RING_TYPE_TX      0x1UL</div><div class='add'>+	#define DBG_RING_INFO_GET_REQ_RING_TYPE_RX      0x2UL</div><div class='add'>+	#define DBG_RING_INFO_GET_REQ_RING_TYPE_NQ      0x3UL</div><div class='add'>+	#define DBG_RING_INFO_GET_REQ_RING_TYPE_LAST   DBG_RING_INFO_GET_REQ_RING_TYPE_NQ</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	__le32	fw_ring_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_ring_info_get_output (size:192b/24B) */</div><div class='add'>+struct hwrm_dbg_ring_info_get_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	producer_index;</div><div class='add'>+	__le32	consumer_index;</div><div class='add'>+	__le32	cag_vector_ctrl;</div><div class='add'>+	__le16	st_tag;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_log_buffer_flush_input (size:192b/24B) */</div><div class='add'>+struct hwrm_dbg_log_buffer_flush_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	type;</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_SRT_TRACE           0x0UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_SRT2_TRACE          0x1UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CRT_TRACE           0x2UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CRT2_TRACE          0x3UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_RIGP0_TRACE         0x4UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_L2_HWRM_TRACE       0x5UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_ROCE_HWRM_TRACE     0x6UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CA0_TRACE           0x7UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CA1_TRACE           0x8UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CA2_TRACE           0x9UL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_RIGP1_TRACE         0xaUL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_AFM_KONG_HWRM_TRACE 0xbUL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_ERR_QPC_TRACE       0xcUL</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_LAST               DBG_LOG_BUFFER_FLUSH_REQ_TYPE_ERR_QPC_TRACE</div><div class='add'>+	u8	unused_1[2];</div><div class='add'>+	__le32	flags;</div><div class='add'>+	#define DBG_LOG_BUFFER_FLUSH_REQ_FLAGS_FLUSH_ALL_BUFFERS     0x1UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_dbg_log_buffer_flush_output (size:128b/16B) */</div><div class='add'>+struct hwrm_dbg_log_buffer_flush_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	current_buffer_offset;</div><div class='add'>+	u8	unused_1[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_read_input (size:320b/40B) */</div><div class='add'>+struct hwrm_nvm_read_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	host_dest_addr;</div><div class='add'>+	__le16	dir_idx;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	__le32	offset;</div><div class='add'>+	__le32	len;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_read_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_read_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_dir_entries_input (size:192b/24B) */</div><div class='add'>+struct hwrm_nvm_get_dir_entries_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	host_dest_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_dir_entries_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_get_dir_entries_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_dir_info_input (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_get_dir_info_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_dir_info_output (size:192b/24B) */</div><div class='add'>+struct hwrm_nvm_get_dir_info_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	entries;</div><div class='add'>+	__le32	entry_length;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_write_input (size:448b/56B) */</div><div class='add'>+struct hwrm_nvm_write_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	host_src_addr;</div><div class='add'>+	__le16	dir_type;</div><div class='add'>+	__le16	dir_ordinal;</div><div class='add'>+	__le16	dir_ext;</div><div class='add'>+	__le16	dir_attr;</div><div class='add'>+	__le32	dir_data_length;</div><div class='add'>+	__le16	option;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define NVM_WRITE_REQ_FLAGS_KEEP_ORIG_ACTIVE_IMG     0x1UL</div><div class='add'>+	#define NVM_WRITE_REQ_FLAGS_BATCH_MODE               0x2UL</div><div class='add'>+	#define NVM_WRITE_REQ_FLAGS_BATCH_LAST               0x4UL</div><div class='add'>+	#define NVM_WRITE_REQ_FLAGS_SKIP_CRID_CHECK          0x8UL</div><div class='add'>+	__le32	dir_item_length;</div><div class='add'>+	__le32	offset;</div><div class='add'>+	__le32	len;</div><div class='add'>+	__le32	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_write_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_write_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	dir_item_length;</div><div class='add'>+	__le16	dir_idx;</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_write_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_nvm_write_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_UNKNOWN              0x0UL</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_FRAG_ERR             0x1UL</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_NO_SPACE             0x2UL</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_WRITE_FAILED         0x3UL</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_REQD_ERASE_FAILED    0x4UL</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_VERIFY_FAILED        0x5UL</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_INVALID_HEADER       0x6UL</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_UPDATE_DIGEST_FAILED 0x7UL</div><div class='add'>+	#define NVM_WRITE_CMD_ERR_CODE_LAST                NVM_WRITE_CMD_ERR_CODE_UPDATE_DIGEST_FAILED</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_modify_input (size:320b/40B) */</div><div class='add'>+struct hwrm_nvm_modify_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	host_src_addr;</div><div class='add'>+	__le16	dir_idx;</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define NVM_MODIFY_REQ_FLAGS_BATCH_MODE     0x1UL</div><div class='add'>+	#define NVM_MODIFY_REQ_FLAGS_BATCH_LAST     0x2UL</div><div class='add'>+	__le32	offset;</div><div class='add'>+	__le32	len;</div><div class='add'>+	u8	unused_1[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_modify_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_modify_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_find_dir_entry_input (size:256b/32B) */</div><div class='add'>+struct hwrm_nvm_find_dir_entry_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define NVM_FIND_DIR_ENTRY_REQ_ENABLES_DIR_IDX_VALID     0x1UL</div><div class='add'>+	__le16	dir_idx;</div><div class='add'>+	__le16	dir_type;</div><div class='add'>+	__le16	dir_ordinal;</div><div class='add'>+	__le16	dir_ext;</div><div class='add'>+	u8	opt_ordinal;</div><div class='add'>+	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_MASK 0x3UL</div><div class='add'>+	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_SFT 0</div><div class='add'>+	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_EQ    0x0UL</div><div class='add'>+	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_GE    0x1UL</div><div class='add'>+	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_GT    0x2UL</div><div class='add'>+	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_LAST NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_GT</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_find_dir_entry_output (size:256b/32B) */</div><div class='add'>+struct hwrm_nvm_find_dir_entry_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le32	dir_item_length;</div><div class='add'>+	__le32	dir_data_length;</div><div class='add'>+	__le32	fw_ver;</div><div class='add'>+	__le16	dir_ordinal;</div><div class='add'>+	__le16	dir_idx;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_erase_dir_entry_input (size:192b/24B) */</div><div class='add'>+struct hwrm_nvm_erase_dir_entry_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	dir_idx;</div><div class='add'>+	u8	unused_0[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_erase_dir_entry_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_erase_dir_entry_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_dev_info_input (size:192b/24B) */</div><div class='add'>+struct hwrm_nvm_get_dev_info_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define NVM_GET_DEV_INFO_REQ_FLAGS_SECURITY_SOC_NVM     0x1UL</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_dev_info_output (size:768b/96B) */</div><div class='add'>+struct hwrm_nvm_get_dev_info_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	manufacturer_id;</div><div class='add'>+	__le16	device_id;</div><div class='add'>+	__le32	sector_size;</div><div class='add'>+	__le32	nvram_size;</div><div class='add'>+	__le32	reserved_size;</div><div class='add'>+	__le32	available_size;</div><div class='add'>+	u8	nvm_cfg_ver_maj;</div><div class='add'>+	u8	nvm_cfg_ver_min;</div><div class='add'>+	u8	nvm_cfg_ver_upd;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define NVM_GET_DEV_INFO_RESP_FLAGS_FW_VER_VALID     0x1UL</div><div class='add'>+	char	pkg_name[16];</div><div class='add'>+	__le16	hwrm_fw_major;</div><div class='add'>+	__le16	hwrm_fw_minor;</div><div class='add'>+	__le16	hwrm_fw_build;</div><div class='add'>+	__le16	hwrm_fw_patch;</div><div class='add'>+	__le16	mgmt_fw_major;</div><div class='add'>+	__le16	mgmt_fw_minor;</div><div class='add'>+	__le16	mgmt_fw_build;</div><div class='add'>+	__le16	mgmt_fw_patch;</div><div class='add'>+	__le16	roce_fw_major;</div><div class='add'>+	__le16	roce_fw_minor;</div><div class='add'>+	__le16	roce_fw_build;</div><div class='add'>+	__le16	roce_fw_patch;</div><div class='add'>+	__le16	netctrl_fw_major;</div><div class='add'>+	__le16	netctrl_fw_minor;</div><div class='add'>+	__le16	netctrl_fw_build;</div><div class='add'>+	__le16	netctrl_fw_patch;</div><div class='add'>+	__le16	srt2_fw_major;</div><div class='add'>+	__le16	srt2_fw_minor;</div><div class='add'>+	__le16	srt2_fw_build;</div><div class='add'>+	__le16	srt2_fw_patch;</div><div class='add'>+	u8	security_soc_fw_major;</div><div class='add'>+	u8	security_soc_fw_minor;</div><div class='add'>+	u8	security_soc_fw_build;</div><div class='add'>+	u8	security_soc_fw_patch;</div><div class='add'>+	u8	unused_0[3];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_mod_dir_entry_input (size:256b/32B) */</div><div class='add'>+struct hwrm_nvm_mod_dir_entry_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	enables;</div><div class='add'>+	#define NVM_MOD_DIR_ENTRY_REQ_ENABLES_CHECKSUM     0x1UL</div><div class='add'>+	__le16	dir_idx;</div><div class='add'>+	__le16	dir_ordinal;</div><div class='add'>+	__le16	dir_ext;</div><div class='add'>+	__le16	dir_attr;</div><div class='add'>+	__le32	checksum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_mod_dir_entry_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_mod_dir_entry_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_verify_update_input (size:192b/24B) */</div><div class='add'>+struct hwrm_nvm_verify_update_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le16	dir_type;</div><div class='add'>+	__le16	dir_ordinal;</div><div class='add'>+	__le16	dir_ext;</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_verify_update_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_verify_update_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_install_update_input (size:192b/24B) */</div><div class='add'>+struct hwrm_nvm_install_update_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le32	install_type;</div><div class='add'>+	#define NVM_INSTALL_UPDATE_REQ_INSTALL_TYPE_NORMAL 0x0UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_REQ_INSTALL_TYPE_ALL    0xffffffffUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_REQ_INSTALL_TYPE_LAST  NVM_INSTALL_UPDATE_REQ_INSTALL_TYPE_ALL</div><div class='add'>+	__le16	flags;</div><div class='add'>+	#define NVM_INSTALL_UPDATE_REQ_FLAGS_ERASE_UNUSED_SPACE     0x1UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_REQ_FLAGS_REMOVE_UNUSED_PKG      0x2UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG      0x4UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_REQ_FLAGS_VERIFY_ONLY            0x8UL</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_install_update_output (size:192b/24B) */</div><div class='add'>+struct hwrm_nvm_install_update_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le64	installed_items;</div><div class='add'>+	u8	result;</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_SUCCESS                      0x0UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_FAILURE                      0xffUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_MALLOC_FAILURE               0xfdUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_INDEX_PARAMETER      0xfbUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_TYPE_PARAMETER       0xf3UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_PREREQUISITE         0xf2UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_FILE_HEADER          0xecUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_SIGNATURE            0xebUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_PROP_STREAM          0xeaUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_PROP_LENGTH          0xe9UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_MANIFEST             0xe8UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_TRAILER              0xe7UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_CHECKSUM             0xe6UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_ITEM_CHECKSUM        0xe5UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_DATA_LENGTH          0xe4UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_DIRECTIVE            0xe1UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_CHIP_REV         0xceUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_DEVICE_ID        0xcdUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_SUBSYS_VENDOR    0xccUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_SUBSYS_ID        0xcbUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_PLATFORM         0xc5UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_DUPLICATE_ITEM               0xc4UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_ZERO_LENGTH_ITEM             0xc3UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INSTALL_CHECKSUM_ERROR       0xb9UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INSTALL_DATA_ERROR           0xb8UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_INSTALL_AUTHENTICATION_ERROR 0xb7UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_ITEM_NOT_FOUND               0xb0UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_ITEM_LOCKED                  0xa7UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESULT_LAST                        NVM_INSTALL_UPDATE_RESP_RESULT_ITEM_LOCKED</div><div class='add'>+	u8	problem_item;</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_PROBLEM_ITEM_NONE    0x0UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_PROBLEM_ITEM_PACKAGE 0xffUL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_PROBLEM_ITEM_LAST   NVM_INSTALL_UPDATE_RESP_PROBLEM_ITEM_PACKAGE</div><div class='add'>+	u8	reset_required;</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_NONE  0x0UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_PCI   0x1UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_POWER 0x2UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_LAST NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_POWER</div><div class='add'>+	u8	unused_0[4];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_install_update_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_nvm_install_update_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_UNKNOWN            0x0UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR           0x1UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_NO_SPACE           0x2UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_ANTI_ROLLBACK      0x3UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_NO_VOLTREG_SUPPORT 0x4UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_DEFRAG_FAILED      0x5UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_UNKNOWN_DIR_ERR    0x6UL</div><div class='add'>+	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_LAST              NVM_INSTALL_UPDATE_CMD_ERR_CODE_UNKNOWN_DIR_ERR</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_variable_input (size:320b/40B) */</div><div class='add'>+struct hwrm_nvm_get_variable_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	dest_data_addr;</div><div class='add'>+	__le16	data_len;</div><div class='add'>+	__le16	option_num;</div><div class='add'>+	#define NVM_GET_VARIABLE_REQ_OPTION_NUM_RSVD_0    0x0UL</div><div class='add'>+	#define NVM_GET_VARIABLE_REQ_OPTION_NUM_RSVD_FFFF 0xffffUL</div><div class='add'>+	#define NVM_GET_VARIABLE_REQ_OPTION_NUM_LAST     NVM_GET_VARIABLE_REQ_OPTION_NUM_RSVD_FFFF</div><div class='add'>+	__le16	dimensions;</div><div class='add'>+	__le16	index_0;</div><div class='add'>+	__le16	index_1;</div><div class='add'>+	__le16	index_2;</div><div class='add'>+	__le16	index_3;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define NVM_GET_VARIABLE_REQ_FLAGS_FACTORY_DFLT           0x1UL</div><div class='add'>+	#define NVM_GET_VARIABLE_REQ_FLAGS_VALIDATE_OPT_VALUE     0x2UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_variable_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_get_variable_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	__le16	data_len;</div><div class='add'>+	__le16	option_num;</div><div class='add'>+	#define NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_0    0x0UL</div><div class='add'>+	#define NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_FFFF 0xffffUL</div><div class='add'>+	#define NVM_GET_VARIABLE_RESP_OPTION_NUM_LAST     NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_FFFF</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define NVM_GET_VARIABLE_RESP_FLAGS_VALIDATE_OPT_VALUE     0x1UL</div><div class='add'>+	u8	unused_0[2];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_get_variable_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_nvm_get_variable_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_UNKNOWN          0x0UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST    0x1UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR      0x2UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_LEN_TOO_SHORT    0x3UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_INDEX_INVALID    0x4UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_ACCESS_DENIED    0x5UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_CB_FAILED        0x6UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_INVALID_DATA_LEN 0x7UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_NO_MEM           0x8UL</div><div class='add'>+	#define NVM_GET_VARIABLE_CMD_ERR_CODE_LAST            NVM_GET_VARIABLE_CMD_ERR_CODE_NO_MEM</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_set_variable_input (size:320b/40B) */</div><div class='add'>+struct hwrm_nvm_set_variable_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	__le64	src_data_addr;</div><div class='add'>+	__le16	data_len;</div><div class='add'>+	__le16	option_num;</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_OPTION_NUM_RSVD_0    0x0UL</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_OPTION_NUM_RSVD_FFFF 0xffffUL</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_OPTION_NUM_LAST     NVM_SET_VARIABLE_REQ_OPTION_NUM_RSVD_FFFF</div><div class='add'>+	__le16	dimensions;</div><div class='add'>+	__le16	index_0;</div><div class='add'>+	__le16	index_1;</div><div class='add'>+	__le16	index_2;</div><div class='add'>+	__le16	index_3;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_FORCE_FLUSH                0x1UL</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_MASK          0xeUL</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_SFT           1</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_NONE            (0x0UL &lt;&lt; 1)</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_HMAC_SHA1       (0x1UL &lt;&lt; 1)</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_AES256          (0x2UL &lt;&lt; 1)</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_HMAC_SHA1_AUTH  (0x3UL &lt;&lt; 1)</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_LAST           NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_HMAC_SHA1_AUTH</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_FLAGS_UNUSED_0_MASK        0x70UL</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_FLAGS_UNUSED_0_SFT         4</div><div class='add'>+	#define NVM_SET_VARIABLE_REQ_FLAGS_FACTORY_DEFAULT            0x80UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_set_variable_output (size:128b/16B) */</div><div class='add'>+struct hwrm_nvm_set_variable_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_nvm_set_variable_cmd_err (size:64b/8B) */</div><div class='add'>+struct hwrm_nvm_set_variable_cmd_err {</div><div class='add'>+	u8	code;</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_UNKNOWN              0x0UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST        0x1UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR          0x2UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_LEN_TOO_SHORT        0x3UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_ACTION_NOT_SUPPORTED 0x4UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_INDEX_INVALID        0x5UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_ACCESS_DENIED        0x6UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_CB_FAILED            0x7UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_INVALID_DATA_LEN     0x8UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_NO_MEM               0x9UL</div><div class='add'>+	#define NVM_SET_VARIABLE_CMD_ERR_CODE_LAST                NVM_SET_VARIABLE_CMD_ERR_CODE_NO_MEM</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_selftest_qlist_input (size:128b/16B) */</div><div class='add'>+struct hwrm_selftest_qlist_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_selftest_qlist_output (size:2240b/280B) */</div><div class='add'>+struct hwrm_selftest_qlist_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	num_tests;</div><div class='add'>+	u8	available_tests;</div><div class='add'>+	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_NVM_TEST                 0x1UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_LINK_TEST                0x2UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_REGISTER_TEST            0x4UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_MEMORY_TEST              0x8UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_PCIE_SERDES_TEST         0x10UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_ETHERNET_SERDES_TEST     0x20UL</div><div class='add'>+	u8	offline_tests;</div><div class='add'>+	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_NVM_TEST                 0x1UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_LINK_TEST                0x2UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_REGISTER_TEST            0x4UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_MEMORY_TEST              0x8UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_PCIE_SERDES_TEST         0x10UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_ETHERNET_SERDES_TEST     0x20UL</div><div class='add'>+	u8	unused_0;</div><div class='add'>+	__le16	test_timeout;</div><div class='add'>+	u8	unused_1[2];</div><div class='add'>+	char	test_name[8][32];</div><div class='add'>+	u8	eyescope_target_BER_support;</div><div class='add'>+	#define SELFTEST_QLIST_RESP_EYESCOPE_TARGET_BER_SUPPORT_BER_1E8_SUPPORTED  0x0UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_EYESCOPE_TARGET_BER_SUPPORT_BER_1E9_SUPPORTED  0x1UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_EYESCOPE_TARGET_BER_SUPPORT_BER_1E10_SUPPORTED 0x2UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_EYESCOPE_TARGET_BER_SUPPORT_BER_1E11_SUPPORTED 0x3UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_EYESCOPE_TARGET_BER_SUPPORT_BER_1E12_SUPPORTED 0x4UL</div><div class='add'>+	#define SELFTEST_QLIST_RESP_EYESCOPE_TARGET_BER_SUPPORT_LAST              SELFTEST_QLIST_RESP_EYESCOPE_TARGET_BER_SUPPORT_BER_1E12_SUPPORTED</div><div class='add'>+	u8	unused_2[6];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_selftest_exec_input (size:192b/24B) */</div><div class='add'>+struct hwrm_selftest_exec_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+	u8	flags;</div><div class='add'>+	#define SELFTEST_EXEC_REQ_FLAGS_NVM_TEST                 0x1UL</div><div class='add'>+	#define SELFTEST_EXEC_REQ_FLAGS_LINK_TEST                0x2UL</div><div class='add'>+	#define SELFTEST_EXEC_REQ_FLAGS_REGISTER_TEST            0x4UL</div><div class='add'>+	#define SELFTEST_EXEC_REQ_FLAGS_MEMORY_TEST              0x8UL</div><div class='add'>+	#define SELFTEST_EXEC_REQ_FLAGS_PCIE_SERDES_TEST         0x10UL</div><div class='add'>+	#define SELFTEST_EXEC_REQ_FLAGS_ETHERNET_SERDES_TEST     0x20UL</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_selftest_exec_output (size:128b/16B) */</div><div class='add'>+struct hwrm_selftest_exec_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	requested_tests;</div><div class='add'>+	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_NVM_TEST                 0x1UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_LINK_TEST                0x2UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_REGISTER_TEST            0x4UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_MEMORY_TEST              0x8UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_PCIE_SERDES_TEST         0x10UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_ETHERNET_SERDES_TEST     0x20UL</div><div class='add'>+	u8	test_success;</div><div class='add'>+	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_NVM_TEST                 0x1UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_LINK_TEST                0x2UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_REGISTER_TEST            0x4UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_MEMORY_TEST              0x8UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_PCIE_SERDES_TEST         0x10UL</div><div class='add'>+	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_ETHERNET_SERDES_TEST     0x20UL</div><div class='add'>+	u8	unused_0[5];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_selftest_irq_input (size:128b/16B) */</div><div class='add'>+struct hwrm_selftest_irq_input {</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	cmpl_ring;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	target_id;</div><div class='add'>+	__le64	resp_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hwrm_selftest_irq_output (size:128b/16B) */</div><div class='add'>+struct hwrm_selftest_irq_output {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	unused_0[7];</div><div class='add'>+	u8	valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* dbc_dbc (size:64b/8B) */</div><div class='add'>+struct dbc_dbc {</div><div class='add'>+	__le32	index;</div><div class='add'>+	#define DBC_DBC_INDEX_MASK 0xffffffUL</div><div class='add'>+	#define DBC_DBC_INDEX_SFT  0</div><div class='add'>+	#define DBC_DBC_EPOCH      0x1000000UL</div><div class='add'>+	#define DBC_DBC_TOGGLE_MASK 0x6000000UL</div><div class='add'>+	#define DBC_DBC_TOGGLE_SFT 25</div><div class='add'>+	__le32	type_path_xid;</div><div class='add'>+	#define DBC_DBC_XID_MASK          0xfffffUL</div><div class='add'>+	#define DBC_DBC_XID_SFT           0</div><div class='add'>+	#define DBC_DBC_PATH_MASK         0x3000000UL</div><div class='add'>+	#define DBC_DBC_PATH_SFT          24</div><div class='add'>+	#define DBC_DBC_PATH_ROCE           (0x0UL &lt;&lt; 24)</div><div class='add'>+	#define DBC_DBC_PATH_L2             (0x1UL &lt;&lt; 24)</div><div class='add'>+	#define DBC_DBC_PATH_ENGINE         (0x2UL &lt;&lt; 24)</div><div class='add'>+	#define DBC_DBC_PATH_LAST          DBC_DBC_PATH_ENGINE</div><div class='add'>+	#define DBC_DBC_VALID             0x4000000UL</div><div class='add'>+	#define DBC_DBC_DEBUG_TRACE       0x8000000UL</div><div class='add'>+	#define DBC_DBC_TYPE_MASK         0xf0000000UL</div><div class='add'>+	#define DBC_DBC_TYPE_SFT          28</div><div class='add'>+	#define DBC_DBC_TYPE_SQ             (0x0UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_RQ             (0x1UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_SRQ            (0x2UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_SRQ_ARM        (0x3UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_CQ             (0x4UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_CQ_ARMSE       (0x5UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_CQ_ARMALL      (0x6UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_CQ_ARMENA      (0x7UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_SRQ_ARMENA     (0x8UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_CQ_CUTOFF_ACK  (0x9UL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_NQ             (0xaUL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_NQ_ARM         (0xbUL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_NQ_MASK        (0xeUL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_NULL           (0xfUL &lt;&lt; 28)</div><div class='add'>+	#define DBC_DBC_TYPE_LAST          DBC_DBC_TYPE_NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* db_push_start (size:64b/8B) */</div><div class='add'>+struct db_push_start {</div><div class='add'>+	u64	db;</div><div class='add'>+	#define DB_PUSH_START_DB_INDEX_MASK     0xffffffUL</div><div class='add'>+	#define DB_PUSH_START_DB_INDEX_SFT      0</div><div class='add'>+	#define DB_PUSH_START_DB_PI_LO_MASK     0xff000000UL</div><div class='add'>+	#define DB_PUSH_START_DB_PI_LO_SFT      24</div><div class='add'>+	#define DB_PUSH_START_DB_XID_MASK       0xfffff00000000ULL</div><div class='add'>+	#define DB_PUSH_START_DB_XID_SFT        32</div><div class='add'>+	#define DB_PUSH_START_DB_PI_HI_MASK     0xf0000000000000ULL</div><div class='add'>+	#define DB_PUSH_START_DB_PI_HI_SFT      52</div><div class='add'>+	#define DB_PUSH_START_DB_TYPE_MASK      0xf000000000000000ULL</div><div class='add'>+	#define DB_PUSH_START_DB_TYPE_SFT       60</div><div class='add'>+	#define DB_PUSH_START_DB_TYPE_PUSH_START  (0xcULL &lt;&lt; 60)</div><div class='add'>+	#define DB_PUSH_START_DB_TYPE_PUSH_END    (0xdULL &lt;&lt; 60)</div><div class='add'>+	#define DB_PUSH_START_DB_TYPE_LAST       DB_PUSH_START_DB_TYPE_PUSH_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* db_push_end (size:64b/8B) */</div><div class='add'>+struct db_push_end {</div><div class='add'>+	u64	db;</div><div class='add'>+	#define DB_PUSH_END_DB_INDEX_MASK      0xffffffUL</div><div class='add'>+	#define DB_PUSH_END_DB_INDEX_SFT       0</div><div class='add'>+	#define DB_PUSH_END_DB_PI_LO_MASK      0xff000000UL</div><div class='add'>+	#define DB_PUSH_END_DB_PI_LO_SFT       24</div><div class='add'>+	#define DB_PUSH_END_DB_XID_MASK        0xfffff00000000ULL</div><div class='add'>+	#define DB_PUSH_END_DB_XID_SFT         32</div><div class='add'>+	#define DB_PUSH_END_DB_PI_HI_MASK      0xf0000000000000ULL</div><div class='add'>+	#define DB_PUSH_END_DB_PI_HI_SFT       52</div><div class='add'>+	#define DB_PUSH_END_DB_PATH_MASK       0x300000000000000ULL</div><div class='add'>+	#define DB_PUSH_END_DB_PATH_SFT        56</div><div class='add'>+	#define DB_PUSH_END_DB_PATH_ROCE         (0x0ULL &lt;&lt; 56)</div><div class='add'>+	#define DB_PUSH_END_DB_PATH_L2           (0x1ULL &lt;&lt; 56)</div><div class='add'>+	#define DB_PUSH_END_DB_PATH_ENGINE       (0x2ULL &lt;&lt; 56)</div><div class='add'>+	#define DB_PUSH_END_DB_PATH_LAST        DB_PUSH_END_DB_PATH_ENGINE</div><div class='add'>+	#define DB_PUSH_END_DB_DEBUG_TRACE     0x800000000000000ULL</div><div class='add'>+	#define DB_PUSH_END_DB_TYPE_MASK       0xf000000000000000ULL</div><div class='add'>+	#define DB_PUSH_END_DB_TYPE_SFT        60</div><div class='add'>+	#define DB_PUSH_END_DB_TYPE_PUSH_START   (0xcULL &lt;&lt; 60)</div><div class='add'>+	#define DB_PUSH_END_DB_TYPE_PUSH_END     (0xdULL &lt;&lt; 60)</div><div class='add'>+	#define DB_PUSH_END_DB_TYPE_LAST        DB_PUSH_END_DB_TYPE_PUSH_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* db_push_info (size:64b/8B) */</div><div class='add'>+struct db_push_info {</div><div class='add'>+	u32	push_size_push_index;</div><div class='add'>+	#define DB_PUSH_INFO_PUSH_INDEX_MASK 0xffffffUL</div><div class='add'>+	#define DB_PUSH_INFO_PUSH_INDEX_SFT 0</div><div class='add'>+	#define DB_PUSH_INFO_PUSH_SIZE_MASK 0x1f000000UL</div><div class='add'>+	#define DB_PUSH_INFO_PUSH_SIZE_SFT  24</div><div class='add'>+	u32	reserved32;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* fw_status_reg (size:32b/4B) */</div><div class='add'>+struct fw_status_reg {</div><div class='add'>+	u32	fw_status;</div><div class='add'>+	#define FW_STATUS_REG_CODE_MASK              0xffffUL</div><div class='add'>+	#define FW_STATUS_REG_CODE_SFT               0</div><div class='add'>+	#define FW_STATUS_REG_CODE_READY               0x8000UL</div><div class='add'>+	#define FW_STATUS_REG_CODE_LAST               FW_STATUS_REG_CODE_READY</div><div class='add'>+	#define FW_STATUS_REG_IMAGE_DEGRADED         0x10000UL</div><div class='add'>+	#define FW_STATUS_REG_RECOVERABLE            0x20000UL</div><div class='add'>+	#define FW_STATUS_REG_CRASHDUMP_ONGOING      0x40000UL</div><div class='add'>+	#define FW_STATUS_REG_CRASHDUMP_COMPLETE     0x80000UL</div><div class='add'>+	#define FW_STATUS_REG_SHUTDOWN               0x100000UL</div><div class='add'>+	#define FW_STATUS_REG_CRASHED_NO_MASTER      0x200000UL</div><div class='add'>+	#define FW_STATUS_REG_RECOVERING             0x400000UL</div><div class='add'>+	#define FW_STATUS_REG_MANU_DEBUG_STATUS      0x800000UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hcomm_status (size:64b/8B) */</div><div class='add'>+struct hcomm_status {</div><div class='add'>+	u32	sig_ver;</div><div class='add'>+	#define HCOMM_STATUS_VER_MASK      0xffUL</div><div class='add'>+	#define HCOMM_STATUS_VER_SFT       0</div><div class='add'>+	#define HCOMM_STATUS_VER_LATEST      0x1UL</div><div class='add'>+	#define HCOMM_STATUS_VER_LAST       HCOMM_STATUS_VER_LATEST</div><div class='add'>+	#define HCOMM_STATUS_SIGNATURE_MASK 0xffffff00UL</div><div class='add'>+	#define HCOMM_STATUS_SIGNATURE_SFT 8</div><div class='add'>+	#define HCOMM_STATUS_SIGNATURE_VAL   (0x484353UL &lt;&lt; 8)</div><div class='add'>+	#define HCOMM_STATUS_SIGNATURE_LAST HCOMM_STATUS_SIGNATURE_VAL</div><div class='add'>+	u32	fw_status_loc;</div><div class='add'>+	#define HCOMM_STATUS_TRUE_ADDR_SPACE_MASK    0x3UL</div><div class='add'>+	#define HCOMM_STATUS_TRUE_ADDR_SPACE_SFT     0</div><div class='add'>+	#define HCOMM_STATUS_FW_STATUS_LOC_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='add'>+	#define HCOMM_STATUS_FW_STATUS_LOC_ADDR_SPACE_GRC       0x1UL</div><div class='add'>+	#define HCOMM_STATUS_FW_STATUS_LOC_ADDR_SPACE_BAR0      0x2UL</div><div class='add'>+	#define HCOMM_STATUS_FW_STATUS_LOC_ADDR_SPACE_BAR1      0x3UL</div><div class='add'>+	#define HCOMM_STATUS_FW_STATUS_LOC_ADDR_SPACE_LAST     HCOMM_STATUS_FW_STATUS_LOC_ADDR_SPACE_BAR1</div><div class='add'>+	#define HCOMM_STATUS_TRUE_OFFSET_MASK        0xfffffffcUL</div><div class='add'>+	#define HCOMM_STATUS_TRUE_OFFSET_SFT         2</div><div class='add'>+};</div><div class='add'>+#define HCOMM_STATUS_STRUCT_LOC 0x31001F0UL</div><div class='add'>+</div><div class='add'>+#endif /* _BNXT_HSI_H_ */</div><div class='head'>diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h<br/>index ca73940e26df..25df9260d206 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bootconfig.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bootconfig.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bootconfig.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bootconfig.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+bool __init cmdline_has_extra_options(void);</div><div class='ctx'> #else /* !__KERNEL__ */</div><div class='ctx'> /*</div><div class='ctx'>  * NOTE: This is only for tools/bootconfig, because tools/bootconfig will</div><div class='hunk'>@@ -287,7 +288,12 @@ int __init xbc_init(const char *buf, size_t size, const char **emsg, int *epos);</div><div class='ctx'> int __init xbc_get_info(int *node_size, size_t *data_size);</div><div class='ctx'> </div><div class='ctx'> /* XBC cleanup data structures */</div><div class='del'>-void __init xbc_exit(void);</div><div class='add'>+void __init _xbc_exit(bool early);</div><div class='add'>+</div><div class='add'>+static __always_inline void xbc_exit(void)</div><div class='add'>+{</div><div class='add'>+	_xbc_exit(false);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* XBC embedded bootconfig data in kernel */</div><div class='ctx'> #ifdef CONFIG_BOOT_CONFIG_EMBED</div><div class='head'>diff --git a/include/linux/bootmem_info.h b/include/linux/bootmem_info.h<br/>index cffa38a73618..4c506e76a808 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bootmem_info.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bootmem_info.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bootmem_info.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bootmem_info.h</a></div><div class='hunk'>@@ -6,11 +6,10 @@</div><div class='ctx'> #include &lt;linux/kmemleak.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Types for free bootmem stored in page-&gt;lru.next. These have to be in</div><div class='del'>- * some random range in unsigned long space for debugging purposes.</div><div class='add'>+ * Types for free bootmem stored in the low bits of page-&gt;private.</div><div class='ctx'>  */</div><div class='del'>-enum {</div><div class='del'>-	MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE = 12,</div><div class='add'>+enum bootmem_type {</div><div class='add'>+	MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE = 1,</div><div class='ctx'> 	SECTION_INFO = MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE,</div><div class='ctx'> 	MIX_SECTION_INFO,</div><div class='ctx'> 	NODE_INFO,</div><div class='hunk'>@@ -19,11 +18,23 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE</div><div class='ctx'> void __init register_page_bootmem_info_node(struct pglist_data *pgdat);</div><div class='add'>+void register_page_bootmem_memmap(unsigned long section_nr, struct page *map,</div><div class='add'>+				  unsigned long nr_pages);</div><div class='ctx'> </div><div class='ctx'> void get_page_bootmem(unsigned long info, struct page *page,</div><div class='del'>-		      unsigned long type);</div><div class='add'>+		enum bootmem_type type);</div><div class='ctx'> void put_page_bootmem(struct page *page);</div><div class='ctx'> </div><div class='add'>+static inline enum bootmem_type bootmem_type(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)page-&gt;private &amp; 0xf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long bootmem_info(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long)page-&gt;private &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Any memory allocated via the memblock allocator and not via the</div><div class='ctx'>  * buddy will be marked reserved already in the memmap. For those</div><div class='hunk'>@@ -31,7 +42,7 @@ void put_page_bootmem(struct page *page);</div><div class='ctx'>  */</div><div class='ctx'> static inline void free_bootmem_page(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	unsigned long magic = page-&gt;index;</div><div class='add'>+	enum bootmem_type type = bootmem_type(page);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The reserve_bootmem_region sets the reserved flag on bootmem</div><div class='hunk'>@@ -39,7 +50,7 @@ static inline void free_bootmem_page(struct page *page)</div><div class='ctx'> 	 */</div><div class='ctx'> 	VM_BUG_ON_PAGE(page_ref_count(page) != 2, page);</div><div class='ctx'> </div><div class='del'>-	if (magic == SECTION_INFO || magic == MIX_SECTION_INFO)</div><div class='add'>+	if (type == SECTION_INFO || type == MIX_SECTION_INFO)</div><div class='ctx'> 		put_page_bootmem(page);</div><div class='ctx'> 	else</div><div class='ctx'> 		VM_BUG_ON_PAGE(1, page);</div><div class='hunk'>@@ -49,12 +60,27 @@ static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void register_page_bootmem_memmap(unsigned long section_nr,</div><div class='add'>+		struct page *map, unsigned long nr_pages)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void put_page_bootmem(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline enum bootmem_type bootmem_type(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return SECTION_INFO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long bootmem_info(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void get_page_bootmem(unsigned long info, struct page *page,</div><div class='del'>-				    unsigned long type)</div><div class='add'>+				    enum bootmem_type type)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/bpf-cgroup-defs.h b/include/linux/bpf-cgroup-defs.h<br/>index 0985221d5478..c9e6b26abab6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpf-cgroup-defs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf-cgroup-defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf-cgroup-defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf-cgroup-defs.h</a></div><div class='hunk'>@@ -63,6 +63,7 @@ struct cgroup_bpf {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct hlist_head progs[MAX_CGROUP_BPF_ATTACH_TYPE];</div><div class='ctx'> 	u8 flags[MAX_CGROUP_BPF_ATTACH_TYPE];</div><div class='add'>+	u64 revisions[MAX_CGROUP_BPF_ATTACH_TYPE];</div><div class='ctx'> </div><div class='ctx'> 	/* list of cgroup shared storages */</div><div class='ctx'> 	struct list_head storages;</div><div class='head'>diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h<br/>index fb3c3e7181e6..d1eb5c7729cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpf-cgroup.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf-cgroup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf-cgroup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf-cgroup.h</a></div><div class='hunk'>@@ -77,9 +77,6 @@ to_cgroup_bpf_attach_type(enum bpf_attach_type attach_type)</div><div class='ctx'> extern struct static_key_false cgroup_bpf_enabled_key[MAX_CGROUP_BPF_ATTACH_TYPE];</div><div class='ctx'> #define cgroup_bpf_enabled(atype) static_branch_unlikely(&amp;cgroup_bpf_enabled_key[atype])</div><div class='ctx'> </div><div class='del'>-#define for_each_cgroup_storage_type(stype) \</div><div class='del'>-	for (stype = 0; stype &lt; MAX_BPF_CGROUP_STORAGE_TYPE; stype++)</div><div class='del'>-</div><div class='ctx'> struct bpf_cgroup_storage_map;</div><div class='ctx'> </div><div class='ctx'> struct bpf_storage_buffer {</div><div class='hunk'>@@ -103,7 +100,6 @@ struct bpf_cgroup_storage {</div><div class='ctx'> struct bpf_cgroup_link {</div><div class='ctx'> 	struct bpf_link link;</div><div class='ctx'> 	struct cgroup *cgroup;</div><div class='del'>-	enum bpf_attach_type type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_prog_list {</div><div class='hunk'>@@ -111,10 +107,10 @@ struct bpf_prog_list {</div><div class='ctx'> 	struct bpf_prog *prog;</div><div class='ctx'> 	struct bpf_cgroup_link *link;</div><div class='ctx'> 	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE];</div><div class='add'>+	u32 flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int cgroup_bpf_inherit(struct cgroup *cgrp);</div><div class='del'>-void cgroup_bpf_offline(struct cgroup *cgrp);</div><div class='add'>+void __init cgroup_bpf_lifetime_notifier_init(void);</div><div class='ctx'> </div><div class='ctx'> int __cgroup_bpf_run_filter_skb(struct sock *sk,</div><div class='ctx'> 				struct sk_buff *skb,</div><div class='hunk'>@@ -124,7 +120,7 @@ int __cgroup_bpf_run_filter_sk(struct sock *sk,</div><div class='ctx'> 			       enum cgroup_bpf_attach_type atype);</div><div class='ctx'> </div><div class='ctx'> int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,</div><div class='del'>-				      struct sockaddr *uaddr,</div><div class='add'>+				      struct sockaddr_unsized *uaddr,</div><div class='ctx'> 				      int *uaddrlen,</div><div class='ctx'> 				      enum cgroup_bpf_attach_type atype,</div><div class='ctx'> 				      void *t_ctx,</div><div class='hunk'>@@ -138,7 +134,7 @@ int __cgroup_bpf_check_dev_permission(short dev_type, u32 major, u32 minor,</div><div class='ctx'> 				      short access, enum cgroup_bpf_attach_type atype);</div><div class='ctx'> </div><div class='ctx'> int __cgroup_bpf_run_filter_sysctl(struct ctl_table_header *head,</div><div class='del'>-				   struct ctl_table *table, int write,</div><div class='add'>+				   const struct ctl_table *table, int write,</div><div class='ctx'> 				   char **buf, size_t *pcount, loff_t *ppos,</div><div class='ctx'> 				   enum cgroup_bpf_attach_type atype);</div><div class='ctx'> </div><div class='hunk'>@@ -209,7 +205,7 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,</div><div class='ctx'> 	int __ret = 0;							       \</div><div class='ctx'> 	if (cgroup_bpf_enabled(CGROUP_INET_EGRESS) &amp;&amp; sk) {		       \</div><div class='ctx'> 		typeof(sk) __sk = sk_to_full_sk(sk);			       \</div><div class='del'>-		if (sk_fullsock(__sk) &amp;&amp; __sk == skb_to_full_sk(skb) &amp;&amp;	       \</div><div class='add'>+		if (__sk &amp;&amp; __sk == skb_to_full_sk(skb) &amp;&amp;	       \</div><div class='ctx'> 		    cgroup_bpf_sock_enabled(__sk, CGROUP_INET_EGRESS))	       \</div><div class='ctx'> 			__ret = __cgroup_bpf_run_filter_skb(__sk, skb,	       \</div><div class='ctx'> 						      CGROUP_INET_EGRESS); \</div><div class='hunk'>@@ -242,8 +238,9 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,</div><div class='ctx'> ({									       \</div><div class='ctx'> 	int __ret = 0;							       \</div><div class='ctx'> 	if (cgroup_bpf_enabled(atype))					       \</div><div class='del'>-		__ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \</div><div class='del'>-							  atype, NULL, NULL);  \</div><div class='add'>+		__ret = __cgroup_bpf_run_filter_sock_addr(sk,		       \</div><div class='add'>+				(struct sockaddr_unsized *)uaddr, uaddrlen,     \</div><div class='add'>+				atype, NULL, NULL);			       \</div><div class='ctx'> 	__ret;								       \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='hunk'>@@ -252,8 +249,9 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,</div><div class='ctx'> 	int __ret = 0;							       \</div><div class='ctx'> 	if (cgroup_bpf_enabled(atype))	{				       \</div><div class='ctx'> 		lock_sock(sk);						       \</div><div class='del'>-		__ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \</div><div class='del'>-							  atype, t_ctx, NULL); \</div><div class='add'>+		__ret = __cgroup_bpf_run_filter_sock_addr(sk,		       \</div><div class='add'>+				(struct sockaddr_unsized *)uaddr, uaddrlen,     \</div><div class='add'>+				atype, t_ctx, NULL);			       \</div><div class='ctx'> 		release_sock(sk);					       \</div><div class='ctx'> 	}								       \</div><div class='ctx'> 	__ret;								       \</div><div class='hunk'>@@ -270,8 +268,9 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,</div><div class='ctx'> 	int __ret = 0;							       \</div><div class='ctx'> 	if (cgroup_bpf_enabled(atype))	{				       \</div><div class='ctx'> 		lock_sock(sk);						       \</div><div class='del'>-		__ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \</div><div class='del'>-							  atype, NULL, &amp;__flags); \</div><div class='add'>+		__ret = __cgroup_bpf_run_filter_sock_addr(sk,		       \</div><div class='add'>+				(struct sockaddr_unsized *)uaddr, uaddrlen,     \</div><div class='add'>+				atype, NULL, &amp;__flags);			       \</div><div class='ctx'> 		release_sock(sk);					       \</div><div class='ctx'> 		if (__flags &amp; BPF_RET_BIND_NO_CAP_NET_BIND_SERVICE)	       \</div><div class='ctx'> 			*bind_flags |= BIND_NO_CAP_NET_BIND_SERVICE;	       \</div><div class='hunk'>@@ -390,14 +389,6 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,</div><div class='ctx'> 	__ret;								       \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#define BPF_CGROUP_GETSOCKOPT_MAX_OPTLEN(optlen)			       \</div><div class='del'>-({									       \</div><div class='del'>-	int __ret = 0;							       \</div><div class='del'>-	if (cgroup_bpf_enabled(CGROUP_GETSOCKOPT))			       \</div><div class='del'>-		copy_from_sockptr(&amp;__ret, optlen, sizeof(int));		       \</div><div class='del'>-	__ret;								       \</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> #define BPF_CGROUP_RUN_PROG_GETSOCKOPT(sock, level, optname, optval, optlen,   \</div><div class='ctx'> 				       max_optlen, retval)		       \</div><div class='ctx'> ({									       \</div><div class='hunk'>@@ -434,12 +425,12 @@ int cgroup_bpf_prog_query(const union bpf_attr *attr,</div><div class='ctx'> </div><div class='ctx'> const struct bpf_func_proto *</div><div class='ctx'> cgroup_common_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog);</div><div class='del'>-const struct bpf_func_proto *</div><div class='del'>-cgroup_current_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog);</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static inline int cgroup_bpf_inherit(struct cgroup *cgrp) { return 0; }</div><div class='del'>-static inline void cgroup_bpf_offline(struct cgroup *cgrp) {}</div><div class='add'>+static inline void cgroup_bpf_lifetime_notifier_init(void)</div><div class='add'>+{</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline int cgroup_bpf_prog_attach(const union bpf_attr *attr,</div><div class='ctx'> 					 enum bpf_prog_type ptype,</div><div class='hunk'>@@ -472,12 +463,6 @@ cgroup_common_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const struct bpf_func_proto *</div><div class='del'>-cgroup_current_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int bpf_cgroup_storage_assign(struct bpf_prog_aux *aux,</div><div class='ctx'> 					    struct bpf_map *map) { return 0; }</div><div class='ctx'> static inline struct bpf_cgroup_storage *bpf_cgroup_storage_alloc(</div><div class='hunk'>@@ -518,7 +503,6 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map,</div><div class='ctx'> #define BPF_CGROUP_RUN_PROG_SOCK_OPS(sock_ops) ({ 0; })</div><div class='ctx'> #define BPF_CGROUP_RUN_PROG_DEVICE_CGROUP(atype, major, minor, access) ({ 0; })</div><div class='ctx'> #define BPF_CGROUP_RUN_PROG_SYSCTL(head,table,write,buf,count,pos) ({ 0; })</div><div class='del'>-#define BPF_CGROUP_GETSOCKOPT_MAX_OPTLEN(optlen) ({ 0; })</div><div class='ctx'> #define BPF_CGROUP_RUN_PROG_GETSOCKOPT(sock, level, optname, optval, \</div><div class='ctx'> 				       optlen, max_optlen, retval) ({ retval; })</div><div class='ctx'> #define BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN(sock, level, optname, optval, \</div><div class='hunk'>@@ -526,8 +510,6 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map,</div><div class='ctx'> #define BPF_CGROUP_RUN_PROG_SETSOCKOPT(sock, level, optname, optval, optlen, \</div><div class='ctx'> 				       kernel_optval) ({ 0; })</div><div class='ctx'> </div><div class='del'>-#define for_each_cgroup_storage_type(stype) for (; false; )</div><div class='del'>-</div><div class='ctx'> #endif /* CONFIG_CGROUP_BPF */</div><div class='ctx'> </div><div class='ctx'> #endif /* _BPF_CGROUP_H */</div><div class='head'>diff --git a/include/linux/bpf.h b/include/linux/bpf.h<br/>index 4f20f62f9d63..6498be4c44f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;uapi/linux/bpf.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/filter.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/sha2.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='hunk'>@@ -30,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/static_call.h&gt;</div><div class='ctx'> #include &lt;linux/memcontrol.h&gt;</div><div class='ctx'> #include &lt;linux/cfi.h&gt;</div><div class='add'>+#include &lt;asm/rqspinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct bpf_verifier_env;</div><div class='ctx'> struct bpf_verifier_log;</div><div class='hunk'>@@ -108,6 +110,7 @@ struct bpf_map_ops {</div><div class='ctx'> 	long (*map_pop_elem)(struct bpf_map *map, void *value);</div><div class='ctx'> 	long (*map_peek_elem)(struct bpf_map *map, void *value);</div><div class='ctx'> 	void *(*map_lookup_percpu_elem)(struct bpf_map *map, void *key, u32 cpu);</div><div class='add'>+	int (*map_get_hash)(struct bpf_map *map, u32 hash_buf_size, void *hash_buf);</div><div class='ctx'> </div><div class='ctx'> 	/* funcs called by prog_array and perf_event_array map */</div><div class='ctx'> 	void *(*map_fd_get_ptr)(struct bpf_map *map, struct file *map_file,</div><div class='hunk'>@@ -184,8 +187,8 @@ struct bpf_map_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	/* Support at most 10 fields in a BTF type */</div><div class='del'>-	BTF_FIELDS_MAX	   = 10,</div><div class='add'>+	/* Support at most 11 fields in a BTF type */</div><div class='add'>+	BTF_FIELDS_MAX	   = 11,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum btf_field_type {</div><div class='hunk'>@@ -202,8 +205,26 @@ enum btf_field_type {</div><div class='ctx'> 	BPF_GRAPH_NODE = BPF_RB_NODE | BPF_LIST_NODE,</div><div class='ctx'> 	BPF_GRAPH_ROOT = BPF_RB_ROOT | BPF_LIST_HEAD,</div><div class='ctx'> 	BPF_REFCOUNT   = (1 &lt;&lt; 9),</div><div class='add'>+	BPF_WORKQUEUE  = (1 &lt;&lt; 10),</div><div class='add'>+	BPF_UPTR       = (1 &lt;&lt; 11),</div><div class='add'>+	BPF_RES_SPIN_LOCK = (1 &lt;&lt; 12),</div><div class='add'>+	BPF_TASK_WORK  = (1 &lt;&lt; 13),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum bpf_cgroup_storage_type {</div><div class='add'>+	BPF_CGROUP_STORAGE_SHARED,</div><div class='add'>+	BPF_CGROUP_STORAGE_PERCPU,</div><div class='add'>+	__BPF_CGROUP_STORAGE_MAX</div><div class='add'>+#define MAX_BPF_CGROUP_STORAGE_TYPE __BPF_CGROUP_STORAGE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CGROUP_BPF</div><div class='add'>+# define for_each_cgroup_storage_type(stype) \</div><div class='add'>+	for (stype = 0; stype &lt; MAX_BPF_CGROUP_STORAGE_TYPE; stype++)</div><div class='add'>+#else</div><div class='add'>+# define for_each_cgroup_storage_type(stype) for (; false; )</div><div class='add'>+#endif /* CONFIG_CGROUP_BPF */</div><div class='add'>+</div><div class='ctx'> typedef void (*btf_dtor_kfunc_t)(void *);</div><div class='ctx'> </div><div class='ctx'> struct btf_field_kptr {</div><div class='hunk'>@@ -237,8 +258,11 @@ struct btf_record {</div><div class='ctx'> 	u32 cnt;</div><div class='ctx'> 	u32 field_mask;</div><div class='ctx'> 	int spin_lock_off;</div><div class='add'>+	int res_spin_lock_off;</div><div class='ctx'> 	int timer_off;</div><div class='add'>+	int wq_off;</div><div class='ctx'> 	int refcount_off;</div><div class='add'>+	int task_work_off;</div><div class='ctx'> 	struct btf_field fields[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -254,7 +278,22 @@ struct bpf_list_node_kern {</div><div class='ctx'> 	void *owner;</div><div class='ctx'> } __attribute__((aligned(8)));</div><div class='ctx'> </div><div class='add'>+/* 'Ownership' of program-containing map is claimed by the first program</div><div class='add'>+ * that is going to use this map or by the first program which FD is</div><div class='add'>+ * stored in the map to make sure that all callers and callees have the</div><div class='add'>+ * same prog type, JITed flag and xdp_has_frags flag.</div><div class='add'>+ */</div><div class='add'>+struct bpf_map_owner {</div><div class='add'>+	enum bpf_prog_type type;</div><div class='add'>+	bool jited;</div><div class='add'>+	bool xdp_has_frags;</div><div class='add'>+	u64 storage_cookie[MAX_BPF_CGROUP_STORAGE_TYPE];</div><div class='add'>+	const struct btf_type *attach_func_proto;</div><div class='add'>+	enum bpf_attach_type expected_attach_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bpf_map {</div><div class='add'>+	u8 sha[SHA256_DIGEST_SIZE];</div><div class='ctx'> 	const struct bpf_map_ops *ops;</div><div class='ctx'> 	struct bpf_map *inner_map_meta;</div><div class='ctx'> #ifdef CONFIG_SECURITY</div><div class='hunk'>@@ -273,7 +312,7 @@ struct bpf_map {</div><div class='ctx'> 	u32 btf_value_type_id;</div><div class='ctx'> 	u32 btf_vmlinux_value_type_id;</div><div class='ctx'> 	struct btf *btf;</div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> 	struct obj_cgroup *objcg;</div><div class='ctx'> #endif</div><div class='ctx'> 	char name[BPF_OBJ_NAME_LEN];</div><div class='hunk'>@@ -286,23 +325,16 @@ struct bpf_map {</div><div class='ctx'> 		struct rcu_head rcu;</div><div class='ctx'> 	};</div><div class='ctx'> 	atomic64_t writecnt;</div><div class='del'>-	/* 'Ownership' of program-containing map is claimed by the first program</div><div class='del'>-	 * that is going to use this map or by the first program which FD is</div><div class='del'>-	 * stored in the map to make sure that all callers and callees have the</div><div class='del'>-	 * same prog type, JITed flag and xdp_has_frags flag.</div><div class='del'>-	 */</div><div class='del'>-	struct {</div><div class='del'>-		spinlock_t lock;</div><div class='del'>-		enum bpf_prog_type type;</div><div class='del'>-		bool jited;</div><div class='del'>-		bool xdp_has_frags;</div><div class='del'>-	} owner;</div><div class='add'>+	spinlock_t owner_lock;</div><div class='add'>+	struct bpf_map_owner *owner;</div><div class='ctx'> 	bool bypass_spec_v1;</div><div class='ctx'> 	bool frozen; /* write-once; write-protected by freeze_mutex */</div><div class='ctx'> 	bool free_after_mult_rcu_gp;</div><div class='ctx'> 	bool free_after_rcu_gp;</div><div class='ctx'> 	atomic64_t sleepable_refcnt;</div><div class='ctx'> 	s64 __percpu *elem_count;</div><div class='add'>+	u64 cookie; /* write-once */</div><div class='add'>+	char *excl_prog_sha;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline const char *btf_field_type_name(enum btf_field_type type)</div><div class='hunk'>@@ -310,13 +342,19 @@ static inline const char *btf_field_type_name(enum btf_field_type type)</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case BPF_SPIN_LOCK:</div><div class='ctx'> 		return "bpf_spin_lock";</div><div class='add'>+	case BPF_RES_SPIN_LOCK:</div><div class='add'>+		return "bpf_res_spin_lock";</div><div class='ctx'> 	case BPF_TIMER:</div><div class='ctx'> 		return "bpf_timer";</div><div class='add'>+	case BPF_WORKQUEUE:</div><div class='add'>+		return "bpf_wq";</div><div class='ctx'> 	case BPF_KPTR_UNREF:</div><div class='ctx'> 	case BPF_KPTR_REF:</div><div class='ctx'> 		return "kptr";</div><div class='ctx'> 	case BPF_KPTR_PERCPU:</div><div class='ctx'> 		return "percpu_kptr";</div><div class='add'>+	case BPF_UPTR:</div><div class='add'>+		return "uptr";</div><div class='ctx'> 	case BPF_LIST_HEAD:</div><div class='ctx'> 		return "bpf_list_head";</div><div class='ctx'> 	case BPF_LIST_NODE:</div><div class='hunk'>@@ -327,22 +365,35 @@ static inline const char *btf_field_type_name(enum btf_field_type type)</div><div class='ctx'> 		return "bpf_rb_node";</div><div class='ctx'> 	case BPF_REFCOUNT:</div><div class='ctx'> 		return "bpf_refcount";</div><div class='add'>+	case BPF_TASK_WORK:</div><div class='add'>+		return "bpf_task_work";</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return "unknown";</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_DEBUG_KERNEL)</div><div class='add'>+#define BPF_WARN_ONCE(cond, format...) WARN_ONCE(cond, format)</div><div class='add'>+#else</div><div class='add'>+#define BPF_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline u32 btf_field_type_size(enum btf_field_type type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case BPF_SPIN_LOCK:</div><div class='ctx'> 		return sizeof(struct bpf_spin_lock);</div><div class='add'>+	case BPF_RES_SPIN_LOCK:</div><div class='add'>+		return sizeof(struct bpf_res_spin_lock);</div><div class='ctx'> 	case BPF_TIMER:</div><div class='ctx'> 		return sizeof(struct bpf_timer);</div><div class='add'>+	case BPF_WORKQUEUE:</div><div class='add'>+		return sizeof(struct bpf_wq);</div><div class='ctx'> 	case BPF_KPTR_UNREF:</div><div class='ctx'> 	case BPF_KPTR_REF:</div><div class='ctx'> 	case BPF_KPTR_PERCPU:</div><div class='add'>+	case BPF_UPTR:</div><div class='ctx'> 		return sizeof(u64);</div><div class='ctx'> 	case BPF_LIST_HEAD:</div><div class='ctx'> 		return sizeof(struct bpf_list_head);</div><div class='hunk'>@@ -354,6 +405,8 @@ static inline u32 btf_field_type_size(enum btf_field_type type)</div><div class='ctx'> 		return sizeof(struct bpf_rb_node);</div><div class='ctx'> 	case BPF_REFCOUNT:</div><div class='ctx'> 		return sizeof(struct bpf_refcount);</div><div class='add'>+	case BPF_TASK_WORK:</div><div class='add'>+		return sizeof(struct bpf_task_work);</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -365,11 +418,16 @@ static inline u32 btf_field_type_align(enum btf_field_type type)</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case BPF_SPIN_LOCK:</div><div class='ctx'> 		return __alignof__(struct bpf_spin_lock);</div><div class='add'>+	case BPF_RES_SPIN_LOCK:</div><div class='add'>+		return __alignof__(struct bpf_res_spin_lock);</div><div class='ctx'> 	case BPF_TIMER:</div><div class='ctx'> 		return __alignof__(struct bpf_timer);</div><div class='add'>+	case BPF_WORKQUEUE:</div><div class='add'>+		return __alignof__(struct bpf_wq);</div><div class='ctx'> 	case BPF_KPTR_UNREF:</div><div class='ctx'> 	case BPF_KPTR_REF:</div><div class='ctx'> 	case BPF_KPTR_PERCPU:</div><div class='add'>+	case BPF_UPTR:</div><div class='ctx'> 		return __alignof__(u64);</div><div class='ctx'> 	case BPF_LIST_HEAD:</div><div class='ctx'> 		return __alignof__(struct bpf_list_head);</div><div class='hunk'>@@ -381,6 +439,8 @@ static inline u32 btf_field_type_align(enum btf_field_type type)</div><div class='ctx'> 		return __alignof__(struct bpf_rb_node);</div><div class='ctx'> 	case BPF_REFCOUNT:</div><div class='ctx'> 		return __alignof__(struct bpf_refcount);</div><div class='add'>+	case BPF_TASK_WORK:</div><div class='add'>+		return __alignof__(struct bpf_task_work);</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -405,10 +465,14 @@ static inline void bpf_obj_init_field(const struct btf_field *field, void *addr)</div><div class='ctx'> 	case BPF_RB_ROOT:</div><div class='ctx'> 		/* RB_ROOT_CACHED 0-inits, no need to do anything after memset */</div><div class='ctx'> 	case BPF_SPIN_LOCK:</div><div class='add'>+	case BPF_RES_SPIN_LOCK:</div><div class='ctx'> 	case BPF_TIMER:</div><div class='add'>+	case BPF_WORKQUEUE:</div><div class='ctx'> 	case BPF_KPTR_UNREF:</div><div class='ctx'> 	case BPF_KPTR_REF:</div><div class='ctx'> 	case BPF_KPTR_PERCPU:</div><div class='add'>+	case BPF_UPTR:</div><div class='add'>+	case BPF_TASK_WORK:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='hunk'>@@ -497,6 +561,25 @@ static inline void copy_map_value_long(struct bpf_map *map, void *dst, void *src</div><div class='ctx'> 	bpf_obj_memcpy(map-&gt;record, dst, src, map-&gt;value_size, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void bpf_obj_swap_uptrs(const struct btf_record *rec, void *dst, void *src)</div><div class='add'>+{</div><div class='add'>+	unsigned long *src_uptr, *dst_uptr;</div><div class='add'>+	const struct btf_field *field;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!btf_record_has_field(rec, BPF_UPTR))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0, field = rec-&gt;fields; i &lt; rec-&gt;cnt; i++, field++) {</div><div class='add'>+		if (field-&gt;type != BPF_UPTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		src_uptr = src + field-&gt;offset;</div><div class='add'>+		dst_uptr = dst + field-&gt;offset;</div><div class='add'>+		swap(*src_uptr, *dst_uptr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void bpf_obj_memzero(struct btf_record *rec, void *dst, u32 size)</div><div class='ctx'> {</div><div class='ctx'> 	u32 curr_off = 0;</div><div class='hunk'>@@ -525,6 +608,8 @@ static inline void zero_map_value(struct bpf_map *map, void *dst)</div><div class='ctx'> void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,</div><div class='ctx'> 			   bool lock_src);</div><div class='ctx'> void bpf_timer_cancel_and_free(void *timer);</div><div class='add'>+void bpf_wq_cancel_and_free(void *timer);</div><div class='add'>+void bpf_task_work_cancel_and_free(void *timer);</div><div class='ctx'> void bpf_list_head_free(const struct btf_field *field, void *list_head,</div><div class='ctx'> 			struct bpf_spin_lock *spin_lock);</div><div class='ctx'> void bpf_rb_root_free(const struct btf_field *field, void *rb_root,</div><div class='hunk'>@@ -578,6 +663,16 @@ int map_check_no_btf(const struct bpf_map *map,</div><div class='ctx'> bool bpf_map_meta_equal(const struct bpf_map *meta0,</div><div class='ctx'> 			const struct bpf_map *meta1);</div><div class='ctx'> </div><div class='add'>+static inline bool bpf_map_has_internal_structs(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	return btf_record_has_field(map-&gt;record, BPF_TIMER | BPF_WORKQUEUE | BPF_TASK_WORK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bpf_map_free_internal_structs(struct bpf_map *map, void *obj);</div><div class='add'>+</div><div class='add'>+int bpf_dynptr_from_file_sleepable(struct file *file, u32 flags,</div><div class='add'>+				   struct bpf_dynptr *ptr__uninit);</div><div class='add'>+</div><div class='ctx'> extern const struct bpf_map_ops bpf_map_offload_ops;</div><div class='ctx'> </div><div class='ctx'> /* bpf_type_flag contains a set of flags that are applicable to the values of</div><div class='hunk'>@@ -624,6 +719,7 @@ enum bpf_type_flag {</div><div class='ctx'> 	 */</div><div class='ctx'> 	PTR_UNTRUSTED		= BIT(6 + BPF_BASE_TYPE_BITS),</div><div class='ctx'> </div><div class='add'>+	/* MEM can be uninitialized. */</div><div class='ctx'> 	MEM_UNINIT		= BIT(7 + BPF_BASE_TYPE_BITS),</div><div class='ctx'> </div><div class='ctx'> 	/* DYNPTR points to memory local to the bpf program. */</div><div class='hunk'>@@ -684,12 +780,30 @@ enum bpf_type_flag {</div><div class='ctx'> 	/* DYNPTR points to xdp_buff */</div><div class='ctx'> 	DYNPTR_TYPE_XDP		= BIT(16 + BPF_BASE_TYPE_BITS),</div><div class='ctx'> </div><div class='add'>+	/* Memory must be aligned on some architectures, used in combination with</div><div class='add'>+	 * MEM_FIXED_SIZE.</div><div class='add'>+	 */</div><div class='add'>+	MEM_ALIGNED		= BIT(17 + BPF_BASE_TYPE_BITS),</div><div class='add'>+</div><div class='add'>+	/* MEM is being written to, often combined with MEM_UNINIT. Non-presence</div><div class='add'>+	 * of MEM_WRITE means that MEM is only being read. MEM_WRITE without the</div><div class='add'>+	 * MEM_UNINIT means that memory needs to be initialized since it is also</div><div class='add'>+	 * read.</div><div class='add'>+	 */</div><div class='add'>+	MEM_WRITE		= BIT(18 + BPF_BASE_TYPE_BITS),</div><div class='add'>+</div><div class='add'>+	/* DYNPTR points to skb_metadata_end()-skb_metadata_len() */</div><div class='add'>+	DYNPTR_TYPE_SKB_META	= BIT(19 + BPF_BASE_TYPE_BITS),</div><div class='add'>+</div><div class='add'>+	/* DYNPTR points to file */</div><div class='add'>+	DYNPTR_TYPE_FILE	= BIT(20 + BPF_BASE_TYPE_BITS),</div><div class='add'>+</div><div class='ctx'> 	__BPF_TYPE_FLAG_MAX,</div><div class='ctx'> 	__BPF_TYPE_LAST_FLAG	= __BPF_TYPE_FLAG_MAX - 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DYNPTR_TYPE_FLAG_MASK	(DYNPTR_TYPE_LOCAL | DYNPTR_TYPE_RINGBUF | DYNPTR_TYPE_SKB \</div><div class='del'>-				 | DYNPTR_TYPE_XDP)</div><div class='add'>+				 | DYNPTR_TYPE_XDP | DYNPTR_TYPE_SKB_META | DYNPTR_TYPE_FILE)</div><div class='ctx'> </div><div class='ctx'> /* Max number of base types. */</div><div class='ctx'> #define BPF_BASE_TYPE_LIMIT	(1UL &lt;&lt; BPF_BASE_TYPE_BITS)</div><div class='hunk'>@@ -721,8 +835,6 @@ enum bpf_arg_type {</div><div class='ctx'> 	ARG_ANYTHING,		/* any (initialized) argument is ok */</div><div class='ctx'> 	ARG_PTR_TO_SPIN_LOCK,	/* pointer to bpf_spin_lock */</div><div class='ctx'> 	ARG_PTR_TO_SOCK_COMMON,	/* pointer to sock_common */</div><div class='del'>-	ARG_PTR_TO_INT,		/* pointer to int */</div><div class='del'>-	ARG_PTR_TO_LONG,	/* pointer to long */</div><div class='ctx'> 	ARG_PTR_TO_SOCKET,	/* pointer to bpf_sock (fullsock) */</div><div class='ctx'> 	ARG_PTR_TO_BTF_ID,	/* pointer to in-kernel struct */</div><div class='ctx'> 	ARG_PTR_TO_RINGBUF_MEM,	/* pointer to dynamically reserved ringbuf memory */</div><div class='hunk'>@@ -733,7 +845,7 @@ enum bpf_arg_type {</div><div class='ctx'> 	ARG_PTR_TO_STACK,	/* pointer to stack */</div><div class='ctx'> 	ARG_PTR_TO_CONST_STR,	/* pointer to a null terminated read-only string */</div><div class='ctx'> 	ARG_PTR_TO_TIMER,	/* pointer to bpf_timer */</div><div class='del'>-	ARG_PTR_TO_KPTR,	/* pointer to referenced kptr */</div><div class='add'>+	ARG_KPTR_XCHG_DEST,	/* pointer to destination that kptrs are bpf_kptr_xchg'd into */</div><div class='ctx'> 	ARG_PTR_TO_DYNPTR,      /* pointer to bpf_dynptr. See bpf_type_flag for dynptr type */</div><div class='ctx'> 	__BPF_ARG_TYPE_MAX,</div><div class='ctx'> </div><div class='hunk'>@@ -744,10 +856,10 @@ enum bpf_arg_type {</div><div class='ctx'> 	ARG_PTR_TO_SOCKET_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_SOCKET,</div><div class='ctx'> 	ARG_PTR_TO_STACK_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_STACK,</div><div class='ctx'> 	ARG_PTR_TO_BTF_ID_OR_NULL	= PTR_MAYBE_NULL | ARG_PTR_TO_BTF_ID,</div><div class='del'>-	/* pointer to memory does not need to be initialized, helper function must fill</div><div class='del'>-	 * all bytes or clear them in error case.</div><div class='add'>+	/* Pointer to memory does not need to be initialized, since helper function</div><div class='add'>+	 * fills all bytes or clears them in error case.</div><div class='ctx'> 	 */</div><div class='del'>-	ARG_PTR_TO_UNINIT_MEM		= MEM_UNINIT | ARG_PTR_TO_MEM,</div><div class='add'>+	ARG_PTR_TO_UNINIT_MEM		= MEM_UNINIT | MEM_WRITE | ARG_PTR_TO_MEM,</div><div class='ctx'> 	/* Pointer to valid memory of size known at compile time. */</div><div class='ctx'> 	ARG_PTR_TO_FIXED_SIZE_MEM	= MEM_FIXED_SIZE | ARG_PTR_TO_MEM,</div><div class='ctx'> </div><div class='hunk'>@@ -797,6 +909,12 @@ struct bpf_func_proto {</div><div class='ctx'> 	bool gpl_only;</div><div class='ctx'> 	bool pkt_access;</div><div class='ctx'> 	bool might_sleep;</div><div class='add'>+	/* set to true if helper follows contract for llvm</div><div class='add'>+	 * attribute bpf_fastcall:</div><div class='add'>+	 * - void functions do not scratch r0</div><div class='add'>+	 * - functions taking N arguments scratch only registers r1-rN</div><div class='add'>+	 */</div><div class='add'>+	bool allow_fastcall;</div><div class='ctx'> 	enum bpf_return_type ret_type;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -879,14 +997,11 @@ enum bpf_reg_type {</div><div class='ctx'> 	 * additional context, assume the value is non-null.</div><div class='ctx'> 	 */</div><div class='ctx'> 	PTR_TO_BTF_ID,</div><div class='del'>-	/* PTR_TO_BTF_ID_OR_NULL points to a kernel struct that has not</div><div class='del'>-	 * been checked for null. Used primarily to inform the verifier</div><div class='del'>-	 * an explicit null check is required for this struct.</div><div class='del'>-	 */</div><div class='ctx'> 	PTR_TO_MEM,		 /* reg points to valid memory region */</div><div class='ctx'> 	PTR_TO_ARENA,</div><div class='ctx'> 	PTR_TO_BUF,		 /* reg points to a read/write buffer */</div><div class='ctx'> 	PTR_TO_FUNC,		 /* reg points to a bpf program function */</div><div class='add'>+	PTR_TO_INSN,		 /* reg points to a bpf program instruction */</div><div class='ctx'> 	CONST_PTR_TO_DYNPTR,	 /* reg points to a const struct bpf_dynptr */</div><div class='ctx'> 	__BPF_REG_TYPE_MAX,</div><div class='ctx'> </div><div class='hunk'>@@ -895,6 +1010,10 @@ enum bpf_reg_type {</div><div class='ctx'> 	PTR_TO_SOCKET_OR_NULL		= PTR_MAYBE_NULL | PTR_TO_SOCKET,</div><div class='ctx'> 	PTR_TO_SOCK_COMMON_OR_NULL	= PTR_MAYBE_NULL | PTR_TO_SOCK_COMMON,</div><div class='ctx'> 	PTR_TO_TCP_SOCK_OR_NULL		= PTR_MAYBE_NULL | PTR_TO_TCP_SOCK,</div><div class='add'>+	/* PTR_TO_BTF_ID_OR_NULL points to a kernel struct that has not</div><div class='add'>+	 * been checked for null. Used primarily to inform the verifier</div><div class='add'>+	 * an explicit null check is required for this struct.</div><div class='add'>+	 */</div><div class='ctx'> 	PTR_TO_BTF_ID_OR_NULL		= PTR_MAYBE_NULL | PTR_TO_BTF_ID,</div><div class='ctx'> </div><div class='ctx'> 	/* This must be the last entry. Its purpose is to ensure the enum is</div><div class='hunk'>@@ -909,14 +1028,17 @@ static_assert(__BPF_REG_TYPE_MAX &lt;= BPF_BASE_TYPE_LIMIT);</div><div class='ctx'>  */</div><div class='ctx'> struct bpf_insn_access_aux {</div><div class='ctx'> 	enum bpf_reg_type reg_type;</div><div class='add'>+	bool is_ldsx;</div><div class='ctx'> 	union {</div><div class='ctx'> 		int ctx_field_size;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct btf *btf;</div><div class='ctx'> 			u32 btf_id;</div><div class='add'>+			u32 ref_obj_id;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> 	struct bpf_verifier_log *log; /* for verbose logs */</div><div class='add'>+	bool is_retval; /* is accessing function return value ? */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -935,6 +1057,21 @@ static inline bool bpf_pseudo_func(const struct bpf_insn *insn)</div><div class='ctx'> 	return bpf_is_ldimm64(insn) &amp;&amp; insn-&gt;src_reg == BPF_PSEUDO_FUNC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Given a BPF_ATOMIC instruction @atomic_insn, return true if it is an</div><div class='add'>+ * atomic load or store, and false if it is a read-modify-write instruction.</div><div class='add'>+ */</div><div class='add'>+static inline bool</div><div class='add'>+bpf_atomic_is_load_store(const struct bpf_insn *atomic_insn)</div><div class='add'>+{</div><div class='add'>+	switch (atomic_insn-&gt;imm) {</div><div class='add'>+	case BPF_LOAD_ACQ:</div><div class='add'>+	case BPF_STORE_REL:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct bpf_prog_ops {</div><div class='ctx'> 	int (*test_run)(struct bpf_prog *prog, const union bpf_attr *kattr,</div><div class='ctx'> 			union bpf_attr __user *uattr);</div><div class='hunk'>@@ -955,6 +1092,8 @@ struct bpf_verifier_ops {</div><div class='ctx'> 				struct bpf_insn_access_aux *info);</div><div class='ctx'> 	int (*gen_prologue)(struct bpf_insn *insn, bool direct_write,</div><div class='ctx'> 			    const struct bpf_prog *prog);</div><div class='add'>+	int (*gen_epilogue)(struct bpf_insn *insn, const struct bpf_prog *prog,</div><div class='add'>+			    s16 ctx_stack_off);</div><div class='ctx'> 	int (*gen_ld_abs)(const struct bpf_insn *orig,</div><div class='ctx'> 			  struct bpf_insn *insn_buf);</div><div class='ctx'> 	u32 (*convert_ctx_access)(enum bpf_access_type type,</div><div class='hunk'>@@ -993,14 +1132,6 @@ struct bpf_prog_offload {</div><div class='ctx'> 	u32			jited_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum bpf_cgroup_storage_type {</div><div class='del'>-	BPF_CGROUP_STORAGE_SHARED,</div><div class='del'>-	BPF_CGROUP_STORAGE_PERCPU,</div><div class='del'>-	__BPF_CGROUP_STORAGE_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MAX_BPF_CGROUP_STORAGE_TYPE __BPF_CGROUP_STORAGE_MAX</div><div class='del'>-</div><div class='ctx'> /* The longest tracepoint has 12 args.</div><div class='ctx'>  * See include/trace/bpf_probe.h</div><div class='ctx'>  */</div><div class='hunk'>@@ -1011,7 +1142,7 @@ enum bpf_cgroup_storage_type {</div><div class='ctx'>  */</div><div class='ctx'> #define MAX_BPF_FUNC_REG_ARGS 5</div><div class='ctx'> </div><div class='del'>-/* The argument is a structure. */</div><div class='add'>+/* The argument is a structure or a union. */</div><div class='ctx'> #define BTF_FMODEL_STRUCT_ARG		BIT(0)</div><div class='ctx'> </div><div class='ctx'> /* The argument is signed. */</div><div class='hunk'>@@ -1116,8 +1247,7 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *i</div><div class='ctx'> 				void *func_addr);</div><div class='ctx'> void *arch_alloc_bpf_trampoline(unsigned int size);</div><div class='ctx'> void arch_free_bpf_trampoline(void *image, unsigned int size);</div><div class='del'>-void arch_protect_bpf_trampoline(void *image, unsigned int size);</div><div class='del'>-void arch_unprotect_bpf_trampoline(void *image, unsigned int size);</div><div class='add'>+int __must_check arch_protect_bpf_trampoline(void *image, unsigned int size);</div><div class='ctx'> int arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags,</div><div class='ctx'> 			     struct bpf_tramp_links *tlinks, void *func_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1134,6 +1264,18 @@ typedef void (*bpf_trampoline_exit_t)(struct bpf_prog *prog, u64 start,</div><div class='ctx'> bpf_trampoline_enter_t bpf_trampoline_enter(const struct bpf_prog *prog);</div><div class='ctx'> bpf_trampoline_exit_t bpf_trampoline_exit(const struct bpf_prog *prog);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DYNAMIC_FTRACE_WITH_JMP</div><div class='add'>+static inline bool bpf_trampoline_use_jmp(u64 flags)</div><div class='add'>+{</div><div class='add'>+	return flags &amp; BPF_TRAMP_F_CALL_ORIG &amp;&amp; !(flags &amp; BPF_TRAMP_F_SKIP_FRAME);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool bpf_trampoline_use_jmp(u64 flags)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct bpf_ksym {</div><div class='ctx'> 	unsigned long		 start;</div><div class='ctx'> 	unsigned long		 end;</div><div class='hunk'>@@ -1260,16 +1402,39 @@ enum bpf_dynptr_type {</div><div class='ctx'> 	BPF_DYNPTR_TYPE_SKB,</div><div class='ctx'> 	/* Underlying data is a xdp_buff */</div><div class='ctx'> 	BPF_DYNPTR_TYPE_XDP,</div><div class='add'>+	/* Points to skb_metadata_end()-skb_metadata_len() */</div><div class='add'>+	BPF_DYNPTR_TYPE_SKB_META,</div><div class='add'>+	/* Underlying data is a file */</div><div class='add'>+	BPF_DYNPTR_TYPE_FILE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int bpf_dynptr_check_size(u32 size);</div><div class='del'>-u32 __bpf_dynptr_size(const struct bpf_dynptr_kern *ptr);</div><div class='del'>-const void *__bpf_dynptr_data(const struct bpf_dynptr_kern *ptr, u32 len);</div><div class='del'>-void *__bpf_dynptr_data_rw(const struct bpf_dynptr_kern *ptr, u32 len);</div><div class='add'>+int bpf_dynptr_check_size(u64 size);</div><div class='add'>+u64 __bpf_dynptr_size(const struct bpf_dynptr_kern *ptr);</div><div class='add'>+const void *__bpf_dynptr_data(const struct bpf_dynptr_kern *ptr, u64 len);</div><div class='add'>+void *__bpf_dynptr_data_rw(const struct bpf_dynptr_kern *ptr, u64 len);</div><div class='add'>+bool __bpf_dynptr_is_rdonly(const struct bpf_dynptr_kern *ptr);</div><div class='add'>+int __bpf_dynptr_write(const struct bpf_dynptr_kern *dst, u64 offset,</div><div class='add'>+		       void *src, u64 len, u64 flags);</div><div class='add'>+void *bpf_dynptr_slice_rdwr(const struct bpf_dynptr *p, u64 offset,</div><div class='add'>+			    void *buffer__opt, u64 buffer__szk);</div><div class='add'>+</div><div class='add'>+static inline int bpf_dynptr_check_off_len(const struct bpf_dynptr_kern *ptr, u64 offset, u64 len)</div><div class='add'>+{</div><div class='add'>+	u64 size = __bpf_dynptr_size(ptr);</div><div class='add'>+</div><div class='add'>+	if (len &gt; size || offset &gt; size - len)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BPF_JIT</div><div class='del'>-int bpf_trampoline_link_prog(struct bpf_tramp_link *link, struct bpf_trampoline *tr);</div><div class='del'>-int bpf_trampoline_unlink_prog(struct bpf_tramp_link *link, struct bpf_trampoline *tr);</div><div class='add'>+int bpf_trampoline_link_prog(struct bpf_tramp_link *link,</div><div class='add'>+			     struct bpf_trampoline *tr,</div><div class='add'>+			     struct bpf_prog *tgt_prog);</div><div class='add'>+int bpf_trampoline_unlink_prog(struct bpf_tramp_link *link,</div><div class='add'>+			       struct bpf_trampoline *tr,</div><div class='add'>+			       struct bpf_prog *tgt_prog);</div><div class='ctx'> struct bpf_trampoline *bpf_trampoline_get(u64 key,</div><div class='ctx'> 					  struct bpf_attach_target_info *tgt_info);</div><div class='ctx'> void bpf_trampoline_put(struct bpf_trampoline *tr);</div><div class='hunk'>@@ -1341,7 +1506,8 @@ int arch_prepare_bpf_dispatcher(void *image, void *buf, s64 *funcs, int num_func</div><div class='ctx'> void bpf_dispatcher_change_prog(struct bpf_dispatcher *d, struct bpf_prog *from,</div><div class='ctx'> 				struct bpf_prog *to);</div><div class='ctx'> /* Called only from JIT-enabled code, so there's no need for stubs. */</div><div class='del'>-void bpf_image_ksym_add(void *data, unsigned int size, struct bpf_ksym *ksym);</div><div class='add'>+void bpf_image_ksym_init(void *data, unsigned int size, struct bpf_ksym *ksym);</div><div class='add'>+void bpf_image_ksym_add(struct bpf_ksym *ksym);</div><div class='ctx'> void bpf_image_ksym_del(struct bpf_ksym *ksym);</div><div class='ctx'> void bpf_ksym_add(struct bpf_ksym *ksym);</div><div class='ctx'> void bpf_ksym_del(struct bpf_ksym *ksym);</div><div class='hunk'>@@ -1350,12 +1516,14 @@ void bpf_jit_uncharge_modmem(u32 size);</div><div class='ctx'> bool bpf_prog_has_trampoline(const struct bpf_prog *prog);</div><div class='ctx'> #else</div><div class='ctx'> static inline int bpf_trampoline_link_prog(struct bpf_tramp_link *link,</div><div class='del'>-					   struct bpf_trampoline *tr)</div><div class='add'>+					   struct bpf_trampoline *tr,</div><div class='add'>+					   struct bpf_prog *tgt_prog)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int bpf_trampoline_unlink_prog(struct bpf_tramp_link *link,</div><div class='del'>-					     struct bpf_trampoline *tr)</div><div class='add'>+					     struct bpf_trampoline *tr,</div><div class='add'>+					     struct bpf_prog *tgt_prog)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -1417,6 +1585,8 @@ struct bpf_ctx_arg_aux {</div><div class='ctx'> 	enum bpf_reg_type reg_type;</div><div class='ctx'> 	struct btf *btf;</div><div class='ctx'> 	u32 btf_id;</div><div class='add'>+	u32 ref_obj_id;</div><div class='add'>+	bool refcounted;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct btf_mod_pair {</div><div class='hunk'>@@ -1426,6 +1596,37 @@ struct btf_mod_pair {</div><div class='ctx'> </div><div class='ctx'> struct bpf_kfunc_desc_tab;</div><div class='ctx'> </div><div class='add'>+enum bpf_stream_id {</div><div class='add'>+	BPF_STDOUT = 1,</div><div class='add'>+	BPF_STDERR = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_stream_elem {</div><div class='add'>+	struct llist_node node;</div><div class='add'>+	int total_len;</div><div class='add'>+	int consumed_len;</div><div class='add'>+	char str[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/* 100k bytes */</div><div class='add'>+	BPF_STREAM_MAX_CAPACITY = 100000ULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_stream {</div><div class='add'>+	atomic_t capacity;</div><div class='add'>+	struct llist_head log;	/* list of in-flight stream elements in LIFO order */</div><div class='add'>+</div><div class='add'>+	struct mutex lock;  /* lock protecting backlog_{head,tail} */</div><div class='add'>+	struct llist_node *backlog_head; /* list of in-flight stream elements in FIFO order */</div><div class='add'>+	struct llist_node *backlog_tail; /* tail of the list above */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_stream_stage {</div><div class='add'>+	struct llist_head log;</div><div class='add'>+	int len;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bpf_prog_aux {</div><div class='ctx'> 	atomic64_t refcnt;</div><div class='ctx'> 	u32 used_map_cnt;</div><div class='hunk'>@@ -1439,11 +1640,14 @@ struct bpf_prog_aux {</div><div class='ctx'> 	u32 real_func_cnt; /* includes hidden progs, only used for JIT and freeing progs */</div><div class='ctx'> 	u32 func_idx; /* 0 for non-func prog, the index in func array for func prog */</div><div class='ctx'> 	u32 attach_btf_id; /* in-kernel BTF type id to attach to */</div><div class='add'>+	u32 attach_st_ops_member_off;</div><div class='ctx'> 	u32 ctx_arg_info_size;</div><div class='ctx'> 	u32 max_rdonly_access;</div><div class='ctx'> 	u32 max_rdwr_access;</div><div class='add'>+	u32 subprog_start;</div><div class='ctx'> 	struct btf *attach_btf;</div><div class='del'>-	const struct bpf_ctx_arg_aux *ctx_arg_info;</div><div class='add'>+	struct bpf_ctx_arg_aux *ctx_arg_info;</div><div class='add'>+	void __percpu *priv_stack_ptr;</div><div class='ctx'> 	struct mutex dst_mutex; /* protects dst_* pointers below, *after* prog becomes visible */</div><div class='ctx'> 	struct bpf_prog *dst_prog;</div><div class='ctx'> 	struct bpf_trampoline *dst_trampoline;</div><div class='hunk'>@@ -1459,12 +1663,22 @@ struct bpf_prog_aux {</div><div class='ctx'> 	bool xdp_has_frags;</div><div class='ctx'> 	bool exception_cb;</div><div class='ctx'> 	bool exception_boundary;</div><div class='add'>+	bool is_extended; /* true if extended by freplace program */</div><div class='add'>+	bool jits_use_priv_stack;</div><div class='add'>+	bool priv_stack_requested;</div><div class='add'>+	bool changes_pkt_data;</div><div class='add'>+	bool might_sleep;</div><div class='add'>+	bool kprobe_write_ctx;</div><div class='add'>+	u64 prog_array_member_cnt; /* counts how many times as member of prog_array */</div><div class='add'>+	struct mutex ext_mutex; /* mutex for is_extended and prog_array_member_cnt */</div><div class='ctx'> 	struct bpf_arena *arena;</div><div class='add'>+	void (*recursion_detected)(struct bpf_prog *prog); /* callback if recursion is detected */</div><div class='ctx'> 	/* BTF_KIND_FUNC_PROTO for valid attach_btf_id */</div><div class='ctx'> 	const struct btf_type *attach_func_proto;</div><div class='ctx'> 	/* function name for valid attach_btf_id */</div><div class='ctx'> 	const char *attach_func_name;</div><div class='ctx'> 	struct bpf_prog **func;</div><div class='add'>+	struct bpf_prog_aux *main_prog_aux;</div><div class='ctx'> 	void *jit_data; /* JIT specific data. arch dependent */</div><div class='ctx'> 	struct bpf_jit_poke_descriptor *poke_tab;</div><div class='ctx'> 	struct bpf_kfunc_desc_tab *kfunc_tab;</div><div class='hunk'>@@ -1475,6 +1689,7 @@ struct bpf_prog_aux {</div><div class='ctx'> #endif</div><div class='ctx'> 	struct bpf_ksym ksym;</div><div class='ctx'> 	const struct bpf_prog_ops *ops;</div><div class='add'>+	const struct bpf_struct_ops *st_ops;</div><div class='ctx'> 	struct bpf_map **used_maps;</div><div class='ctx'> 	struct mutex used_maps_mutex; /* mutex for used_maps and used_map_cnt */</div><div class='ctx'> 	struct btf_mod_pair *used_btfs;</div><div class='hunk'>@@ -1523,6 +1738,7 @@ struct bpf_prog_aux {</div><div class='ctx'> 		struct work_struct work;</div><div class='ctx'> 		struct rcu_head	rcu;</div><div class='ctx'> 	};</div><div class='add'>+	struct bpf_stream stream[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_prog {</div><div class='hunk'>@@ -1546,7 +1762,10 @@ struct bpf_prog {</div><div class='ctx'> 	enum bpf_attach_type	expected_attach_type; /* For some prog types */</div><div class='ctx'> 	u32			len;		/* Number of filter blocks */</div><div class='ctx'> 	u32			jited_len;	/* Size of jited insns in bytes */</div><div class='del'>-	u8			tag[BPF_TAG_SIZE];</div><div class='add'>+	union {</div><div class='add'>+		u8 digest[SHA256_DIGEST_SIZE];</div><div class='add'>+		u8 tag[BPF_TAG_SIZE];</div><div class='add'>+	};</div><div class='ctx'> 	struct bpf_prog_stats __percpu *stats;</div><div class='ctx'> 	int __percpu		*active;</div><div class='ctx'> 	unsigned int		(*bpf_func)(const void *ctx,</div><div class='hunk'>@@ -1574,12 +1793,37 @@ struct bpf_link {</div><div class='ctx'> 	enum bpf_link_type type;</div><div class='ctx'> 	const struct bpf_link_ops *ops;</div><div class='ctx'> 	struct bpf_prog *prog;</div><div class='del'>-	struct work_struct work;</div><div class='add'>+</div><div class='add'>+	u32 flags;</div><div class='add'>+	enum bpf_attach_type attach_type;</div><div class='add'>+</div><div class='add'>+	/* rcu is used before freeing, work can be used to schedule that</div><div class='add'>+	 * RCU-based freeing before that, so they never overlap</div><div class='add'>+	 */</div><div class='add'>+	union {</div><div class='add'>+		struct rcu_head rcu;</div><div class='add'>+		struct work_struct work;</div><div class='add'>+	};</div><div class='add'>+	/* whether BPF link itself has "sleepable" semantics, which can differ</div><div class='add'>+	 * from underlying BPF program having a "sleepable" semantics, as BPF</div><div class='add'>+	 * link's semantics is determined by target attach hook</div><div class='add'>+	 */</div><div class='add'>+	bool sleepable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_link_ops {</div><div class='ctx'> 	void (*release)(struct bpf_link *link);</div><div class='add'>+	/* deallocate link resources callback, called without RCU grace period</div><div class='add'>+	 * waiting</div><div class='add'>+	 */</div><div class='ctx'> 	void (*dealloc)(struct bpf_link *link);</div><div class='add'>+	/* deallocate link resources callback, called after RCU grace period;</div><div class='add'>+	 * if either the underlying BPF program is sleepable or BPF link's</div><div class='add'>+	 * target hook is sleepable, we'll go through tasks trace RCU GP and</div><div class='add'>+	 * then "classic" RCU GP; this need for chaining tasks trace and</div><div class='add'>+	 * classic RCU GPs is designated by setting bpf_link-&gt;sleepable flag</div><div class='add'>+	 */</div><div class='add'>+	void (*dealloc_deferred)(struct bpf_link *link);</div><div class='ctx'> 	int (*detach)(struct bpf_link *link);</div><div class='ctx'> 	int (*update_prog)(struct bpf_link *link, struct bpf_prog *new_prog,</div><div class='ctx'> 			   struct bpf_prog *old_prog);</div><div class='hunk'>@@ -1588,6 +1832,7 @@ struct bpf_link_ops {</div><div class='ctx'> 			      struct bpf_link_info *info);</div><div class='ctx'> 	int (*update_map)(struct bpf_link *link, struct bpf_map *new_map,</div><div class='ctx'> 			  struct bpf_map *old_map);</div><div class='add'>+	__poll_t (*poll)(struct file *file, struct poll_table_struct *pts);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_tramp_link {</div><div class='hunk'>@@ -1603,11 +1848,16 @@ struct bpf_shim_tramp_link {</div><div class='ctx'> </div><div class='ctx'> struct bpf_tracing_link {</div><div class='ctx'> 	struct bpf_tramp_link link;</div><div class='del'>-	enum bpf_attach_type attach_type;</div><div class='ctx'> 	struct bpf_trampoline *trampoline;</div><div class='ctx'> 	struct bpf_prog *tgt_prog;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct bpf_raw_tp_link {</div><div class='add'>+	struct bpf_link link;</div><div class='add'>+	struct bpf_raw_event_map *btp;</div><div class='add'>+	u64 cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bpf_link_primer {</div><div class='ctx'> 	struct bpf_link *link;</div><div class='ctx'> 	struct file *file;</div><div class='hunk'>@@ -1684,12 +1934,14 @@ struct btf_member;</div><div class='ctx'>  *	      reason, if this callback is not defined, the check is skipped as</div><div class='ctx'>  *	      the struct_ops map will have final verification performed in</div><div class='ctx'>  *	      @reg.</div><div class='del'>- * @type: BTF type.</div><div class='del'>- * @value_type: Value type.</div><div class='add'>+ * @cfi_stubs: Pointer to a structure of stub functions for CFI. These stubs</div><div class='add'>+ *	       provide the correct Control Flow Integrity hashes for the</div><div class='add'>+ *	       trampolines generated by BPF struct_ops.</div><div class='add'>+ * @owner: The module that owns this struct_ops. Used for module reference</div><div class='add'>+ *	   counting to ensure the module providing the struct_ops cannot be</div><div class='add'>+ *	   unloaded while in use.</div><div class='ctx'>  * @name: The name of the struct bpf_struct_ops object.</div><div class='ctx'>  * @func_models: Func models</div><div class='del'>- * @type_id: BTF type id.</div><div class='del'>- * @value_id: BTF value id.</div><div class='ctx'>  */</div><div class='ctx'> struct bpf_struct_ops {</div><div class='ctx'> 	const struct bpf_verifier_ops *verifier_ops;</div><div class='hunk'>@@ -1700,9 +1952,9 @@ struct bpf_struct_ops {</div><div class='ctx'> 	int (*init_member)(const struct btf_type *t,</div><div class='ctx'> 			   const struct btf_member *member,</div><div class='ctx'> 			   void *kdata, const void *udata);</div><div class='del'>-	int (*reg)(void *kdata);</div><div class='del'>-	void (*unreg)(void *kdata);</div><div class='del'>-	int (*update)(void *kdata, void *old_kdata);</div><div class='add'>+	int (*reg)(void *kdata, struct bpf_link *link);</div><div class='add'>+	void (*unreg)(void *kdata, struct bpf_link *link);</div><div class='add'>+	int (*update)(void *kdata, void *old_kdata, struct bpf_link *link);</div><div class='ctx'> 	int (*validate)(void *kdata);</div><div class='ctx'> 	void *cfi_stubs;</div><div class='ctx'> 	struct module *owner;</div><div class='hunk'>@@ -1764,6 +2016,7 @@ struct bpf_struct_ops_common_value {</div><div class='ctx'> #define BPF_MODULE_OWNER ((void *)((0xeB9FUL &lt;&lt; 2) + POISON_POINTER_DELTA))</div><div class='ctx'> bool bpf_struct_ops_get(const void *kdata);</div><div class='ctx'> void bpf_struct_ops_put(const void *kdata);</div><div class='add'>+int bpf_struct_ops_supported(const struct bpf_struct_ops *st_ops, u32 moff);</div><div class='ctx'> int bpf_struct_ops_map_sys_lookup_elem(struct bpf_map *map, void *key,</div><div class='ctx'> 				       void *value);</div><div class='ctx'> int bpf_struct_ops_prepare_trampoline(struct bpf_tramp_links *tlinks,</div><div class='hunk'>@@ -1788,6 +2041,7 @@ static inline void bpf_module_put(const void *data, struct module *owner)</div><div class='ctx'> 		module_put(owner);</div><div class='ctx'> }</div><div class='ctx'> int bpf_struct_ops_link_create(union bpf_attr *attr);</div><div class='add'>+u32 bpf_struct_ops_id(const void *kdata);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET</div><div class='ctx'> /* Define it here to avoid the use of forward declaration */</div><div class='hunk'>@@ -1820,6 +2074,10 @@ static inline void bpf_module_put(const void *data, struct module *owner)</div><div class='ctx'> {</div><div class='ctx'> 	module_put(owner);</div><div class='ctx'> }</div><div class='add'>+static inline int bpf_struct_ops_supported(const struct bpf_struct_ops *st_ops, u32 moff)</div><div class='add'>+{</div><div class='add'>+	return -ENOTSUPP;</div><div class='add'>+}</div><div class='ctx'> static inline int bpf_struct_ops_map_sys_lookup_elem(struct bpf_map *map,</div><div class='ctx'> 						     void *key,</div><div class='ctx'> 						     void *value)</div><div class='hunk'>@@ -1840,13 +2098,18 @@ static inline void bpf_struct_ops_desc_release(struct bpf_struct_ops_desc *st_op</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int bpf_prog_ctx_arg_info_init(struct bpf_prog *prog,</div><div class='add'>+			       const struct bpf_ctx_arg_aux *info, u32 cnt);</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_CGROUP_BPF) &amp;&amp; defined(CONFIG_BPF_LSM)</div><div class='ctx'> int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,</div><div class='del'>-				    int cgroup_atype);</div><div class='add'>+				    int cgroup_atype,</div><div class='add'>+				    enum bpf_attach_type attach_type);</div><div class='ctx'> void bpf_trampoline_unlink_cgroup_shim(struct bpf_prog *prog);</div><div class='ctx'> #else</div><div class='ctx'> static inline int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,</div><div class='del'>-						  int cgroup_atype)</div><div class='add'>+						  int cgroup_atype,</div><div class='add'>+						  enum bpf_attach_type attach_type)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -1867,6 +2130,12 @@ struct bpf_array {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The bpf_array_get_next_key() function may be used for all array-like</div><div class='add'>+ * maps, i.e., maps with u32 keys with range [0 ,..., max_entries)</div><div class='add'>+ */</div><div class='add'>+int bpf_array_get_next_key(struct bpf_map *map, void *key, void *next_key);</div><div class='add'>+</div><div class='ctx'> #define BPF_COMPLEXITY_LIMIT_INSNS      1000000 /* yes. 1M insns */</div><div class='ctx'> #define MAX_TAIL_CALL_CNT 33</div><div class='ctx'> </div><div class='hunk'>@@ -1875,6 +2144,7 @@ struct bpf_array {</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	BPF_MAX_LOOPS = 8 * 1024 * 1024,</div><div class='add'>+	BPF_MAX_TIMED_LOOPS = 0xffff,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BPF_F_ACCESS_MASK	(BPF_F_RDONLY |		\</div><div class='hunk'>@@ -1911,6 +2181,16 @@ static inline bool bpf_map_flags_access_ok(u32 access_flags)</div><div class='ctx'> 	       (BPF_F_RDONLY_PROG | BPF_F_WRONLY_PROG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct bpf_map_owner *bpf_map_owner_alloc(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	return kzalloc(sizeof(*map-&gt;owner), GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bpf_map_owner_free(struct bpf_map *map)</div><div class='add'>+{</div><div class='add'>+	kfree(map-&gt;owner);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct bpf_event_entry {</div><div class='ctx'> 	struct perf_event *event;</div><div class='ctx'> 	struct file *perf_file;</div><div class='hunk'>@@ -1931,6 +2211,8 @@ int bpf_prog_calc_tag(struct bpf_prog *fp);</div><div class='ctx'> const struct bpf_func_proto *bpf_get_trace_printk_proto(void);</div><div class='ctx'> const struct bpf_func_proto *bpf_get_trace_vprintk_proto(void);</div><div class='ctx'> </div><div class='add'>+const struct bpf_func_proto *bpf_get_perf_event_read_value_proto(void);</div><div class='add'>+</div><div class='ctx'> typedef unsigned long (*bpf_ctx_copy_t)(void *dst, const void *src,</div><div class='ctx'> 					unsigned long off, unsigned long len);</div><div class='ctx'> typedef u32 (*bpf_convert_ctx_access_t)(enum bpf_access_type type,</div><div class='hunk'>@@ -2089,26 +2371,25 @@ bpf_prog_run_array(const struct bpf_prog_array *array,</div><div class='ctx'>  * rcu-protected dynamically sized maps.</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline u32</div><div class='del'>-bpf_prog_run_array_uprobe(const struct bpf_prog_array __rcu *array_rcu,</div><div class='add'>+bpf_prog_run_array_uprobe(const struct bpf_prog_array *array,</div><div class='ctx'> 			  const void *ctx, bpf_prog_run_fn run_prog)</div><div class='ctx'> {</div><div class='ctx'> 	const struct bpf_prog_array_item *item;</div><div class='ctx'> 	const struct bpf_prog *prog;</div><div class='del'>-	const struct bpf_prog_array *array;</div><div class='ctx'> 	struct bpf_run_ctx *old_run_ctx;</div><div class='ctx'> 	struct bpf_trace_run_ctx run_ctx;</div><div class='ctx'> 	u32 ret = 1;</div><div class='ctx'> </div><div class='ctx'> 	might_fault();</div><div class='add'>+	RCU_LOCKDEP_WARN(!rcu_read_lock_trace_held(), "no rcu lock held");</div><div class='add'>+</div><div class='add'>+	if (unlikely(!array))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock_trace();</div><div class='ctx'> 	migrate_disable();</div><div class='ctx'> </div><div class='ctx'> 	run_ctx.is_uprobe = true;</div><div class='ctx'> </div><div class='del'>-	array = rcu_dereference_check(array_rcu, rcu_read_lock_trace_held());</div><div class='del'>-	if (unlikely(!array))</div><div class='del'>-		goto out;</div><div class='ctx'> 	old_run_ctx = bpf_set_run_ctx(&amp;run_ctx.run_ctx);</div><div class='ctx'> 	item = &amp;array-&gt;items[0];</div><div class='ctx'> 	while ((prog = READ_ONCE(item-&gt;prog))) {</div><div class='hunk'>@@ -2123,12 +2404,16 @@ bpf_prog_run_array_uprobe(const struct bpf_prog_array __rcu *array_rcu,</div><div class='ctx'> 			rcu_read_unlock();</div><div class='ctx'> 	}</div><div class='ctx'> 	bpf_reset_run_ctx(old_run_ctx);</div><div class='del'>-out:</div><div class='ctx'> 	migrate_enable();</div><div class='del'>-	rcu_read_unlock_trace();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool bpf_jit_bypass_spec_v1(void);</div><div class='add'>+bool bpf_jit_bypass_spec_v4(void);</div><div class='add'>+</div><div class='add'>+#define bpf_rcu_lock_held() \</div><div class='add'>+	(rcu_read_lock_held() || rcu_read_lock_trace_held() || rcu_read_lock_bh_held())</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BPF_SYSCALL</div><div class='ctx'> DECLARE_PER_CPU(int, bpf_prog_active);</div><div class='ctx'> extern struct mutex bpf_stats_enabled_mutex;</div><div class='hunk'>@@ -2155,6 +2440,7 @@ extern const struct super_operations bpf_super_ops;</div><div class='ctx'> extern const struct file_operations bpf_map_fops;</div><div class='ctx'> extern const struct file_operations bpf_prog_fops;</div><div class='ctx'> extern const struct file_operations bpf_iter_fops;</div><div class='add'>+extern const struct file_operations bpf_token_fops;</div><div class='ctx'> </div><div class='ctx'> #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type) \</div><div class='ctx'> 	extern const struct bpf_prog_ops _name ## _prog_ops; \</div><div class='hunk'>@@ -2190,12 +2476,40 @@ void bpf_map_free_record(struct bpf_map *map);</div><div class='ctx'> struct btf_record *btf_record_dup(const struct btf_record *rec);</div><div class='ctx'> bool btf_record_equal(const struct btf_record *rec_a, const struct btf_record *rec_b);</div><div class='ctx'> void bpf_obj_free_timer(const struct btf_record *rec, void *obj);</div><div class='add'>+void bpf_obj_free_workqueue(const struct btf_record *rec, void *obj);</div><div class='add'>+void bpf_obj_free_task_work(const struct btf_record *rec, void *obj);</div><div class='ctx'> void bpf_obj_free_fields(const struct btf_record *rec, void *obj);</div><div class='ctx'> void __bpf_obj_drop_impl(void *p, const struct btf_record *rec, bool percpu);</div><div class='ctx'> </div><div class='ctx'> struct bpf_map *bpf_map_get(u32 ufd);</div><div class='ctx'> struct bpf_map *bpf_map_get_with_uref(u32 ufd);</div><div class='del'>-struct bpf_map *__bpf_map_get(struct fd f);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The __bpf_map_get() and __btf_get_by_fd() functions parse a file</div><div class='add'>+ * descriptor and return a corresponding map or btf object.</div><div class='add'>+ * Their names are double underscored to emphasize the fact that they</div><div class='add'>+ * do not increase refcnt. To also increase refcnt use corresponding</div><div class='add'>+ * bpf_map_get() and btf_get_by_fd() functions.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline struct bpf_map *__bpf_map_get(struct fd f)</div><div class='add'>+{</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return ERR_PTR(-EBADF);</div><div class='add'>+	if (unlikely(fd_file(f)-&gt;f_op != &amp;bpf_map_fops))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	return fd_file(f)-&gt;private_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct btf *__btf_get_by_fd(struct fd f)</div><div class='add'>+{</div><div class='add'>+	if (fd_empty(f))</div><div class='add'>+		return ERR_PTR(-EBADF);</div><div class='add'>+	if (unlikely(fd_file(f)-&gt;f_op != &amp;btf_fops))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	return fd_file(f)-&gt;private_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void bpf_map_inc(struct bpf_map *map);</div><div class='ctx'> void bpf_map_inc_with_uref(struct bpf_map *map);</div><div class='ctx'> struct bpf_map *__bpf_map_inc_not_zero(struct bpf_map *map, bool uref);</div><div class='hunk'>@@ -2219,42 +2533,34 @@ int  generic_map_delete_batch(struct bpf_map *map,</div><div class='ctx'> struct bpf_map *bpf_map_get_curr_or_next(u32 *id);</div><div class='ctx'> struct bpf_prog *bpf_prog_get_curr_or_next(u32 *id);</div><div class='ctx'> </div><div class='del'>-int bpf_map_alloc_pages(const struct bpf_map *map, gfp_t gfp, int nid,</div><div class='add'>+</div><div class='add'>+int bpf_map_alloc_pages(const struct bpf_map *map, int nid,</div><div class='ctx'> 			unsigned long nr_pages, struct page **page_array);</div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> void *bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags,</div><div class='ctx'> 			   int node);</div><div class='add'>+void *bpf_map_kmalloc_nolock(const struct bpf_map *map, size_t size, gfp_t flags,</div><div class='add'>+			     int node);</div><div class='ctx'> void *bpf_map_kzalloc(const struct bpf_map *map, size_t size, gfp_t flags);</div><div class='ctx'> void *bpf_map_kvcalloc(struct bpf_map *map, size_t n, size_t size,</div><div class='ctx'> 		       gfp_t flags);</div><div class='ctx'> void __percpu *bpf_map_alloc_percpu(const struct bpf_map *map, size_t size,</div><div class='ctx'> 				    size_t align, gfp_t flags);</div><div class='ctx'> #else</div><div class='del'>-static inline void *</div><div class='del'>-bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags,</div><div class='del'>-		     int node)</div><div class='del'>-{</div><div class='del'>-	return kmalloc_node(size, flags, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *</div><div class='del'>-bpf_map_kzalloc(const struct bpf_map *map, size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return kzalloc(size, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *</div><div class='del'>-bpf_map_kvcalloc(struct bpf_map *map, size_t n, size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return kvcalloc(n, size, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __percpu *</div><div class='del'>-bpf_map_alloc_percpu(const struct bpf_map *map, size_t size, size_t align,</div><div class='del'>-		     gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return __alloc_percpu_gfp(size, align, flags);</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * These specialized allocators have to be macros for their allocations to be</div><div class='add'>+ * accounted separately (to have separate alloc_tag).</div><div class='add'>+ */</div><div class='add'>+#define bpf_map_kmalloc_node(_map, _size, _flags, _node)	\</div><div class='add'>+		kmalloc_node(_size, _flags, _node)</div><div class='add'>+#define bpf_map_kmalloc_nolock(_map, _size, _flags, _node)	\</div><div class='add'>+		kmalloc_nolock(_size, _flags, _node)</div><div class='add'>+#define bpf_map_kzalloc(_map, _size, _flags)			\</div><div class='add'>+		kzalloc(_size, _flags)</div><div class='add'>+#define bpf_map_kvcalloc(_map, _n, _size, _flags)		\</div><div class='add'>+		kvcalloc(_n, _size, _flags)</div><div class='add'>+#define bpf_map_alloc_percpu(_map, _size, _align, _flags)	\</div><div class='add'>+		__alloc_percpu_gfp(_size, _align, _flags)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -2302,23 +2608,32 @@ static inline bool bpf_allow_uninit_stack(const struct bpf_token *token)</div><div class='ctx'> </div><div class='ctx'> static inline bool bpf_bypass_spec_v1(const struct bpf_token *token)</div><div class='ctx'> {</div><div class='del'>-	return cpu_mitigations_off() || bpf_token_capable(token, CAP_PERFMON);</div><div class='add'>+	return bpf_jit_bypass_spec_v1() ||</div><div class='add'>+		cpu_mitigations_off() ||</div><div class='add'>+		bpf_token_capable(token, CAP_PERFMON);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bpf_bypass_spec_v4(const struct bpf_token *token)</div><div class='ctx'> {</div><div class='del'>-	return cpu_mitigations_off() || bpf_token_capable(token, CAP_PERFMON);</div><div class='add'>+	return bpf_jit_bypass_spec_v4() ||</div><div class='add'>+		cpu_mitigations_off() ||</div><div class='add'>+		bpf_token_capable(token, CAP_PERFMON);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bpf_map_new_fd(struct bpf_map *map, int flags);</div><div class='ctx'> int bpf_prog_new_fd(struct bpf_prog *prog);</div><div class='ctx'> </div><div class='ctx'> void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,</div><div class='del'>-		   const struct bpf_link_ops *ops, struct bpf_prog *prog);</div><div class='add'>+		   const struct bpf_link_ops *ops, struct bpf_prog *prog,</div><div class='add'>+		   enum bpf_attach_type attach_type);</div><div class='add'>+void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,</div><div class='add'>+			     const struct bpf_link_ops *ops, struct bpf_prog *prog,</div><div class='add'>+			     enum bpf_attach_type attach_type, bool sleepable);</div><div class='ctx'> int bpf_link_prime(struct bpf_link *link, struct bpf_link_primer *primer);</div><div class='ctx'> int bpf_link_settle(struct bpf_link_primer *primer);</div><div class='ctx'> void bpf_link_cleanup(struct bpf_link_primer *primer);</div><div class='ctx'> void bpf_link_inc(struct bpf_link *link);</div><div class='add'>+struct bpf_link *bpf_link_inc_not_zero(struct bpf_link *link);</div><div class='ctx'> void bpf_link_put(struct bpf_link *link);</div><div class='ctx'> int bpf_link_new_fd(struct bpf_link *link);</div><div class='ctx'> struct bpf_link *bpf_link_get_from_fd(u32 ufd);</div><div class='hunk'>@@ -2328,6 +2643,9 @@ void bpf_token_inc(struct bpf_token *token);</div><div class='ctx'> void bpf_token_put(struct bpf_token *token);</div><div class='ctx'> int bpf_token_create(union bpf_attr *attr);</div><div class='ctx'> struct bpf_token *bpf_token_get_from_fd(u32 ufd);</div><div class='add'>+int bpf_token_get_info_by_fd(struct bpf_token *token,</div><div class='add'>+			     const union bpf_attr *attr,</div><div class='add'>+			     union bpf_attr __user *uattr);</div><div class='ctx'> </div><div class='ctx'> bool bpf_token_allow_cmd(const struct bpf_token *token, enum bpf_cmd cmd);</div><div class='ctx'> bool bpf_token_allow_map_type(const struct bpf_token *token, enum bpf_map_type type);</div><div class='hunk'>@@ -2426,7 +2744,7 @@ struct bpf_iter__bpf_map_elem {</div><div class='ctx'> </div><div class='ctx'> int bpf_iter_reg_target(const struct bpf_iter_reg *reg_info);</div><div class='ctx'> void bpf_iter_unreg_target(const struct bpf_iter_reg *reg_info);</div><div class='del'>-bool bpf_iter_prog_supported(struct bpf_prog *prog);</div><div class='add'>+int bpf_iter_prog_supported(struct bpf_prog *prog);</div><div class='ctx'> const struct bpf_func_proto *</div><div class='ctx'> bpf_iter_get_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog);</div><div class='ctx'> int bpf_iter_link_attach(const union bpf_attr *attr, bpfptr_t uattr, struct bpf_prog *prog);</div><div class='hunk'>@@ -2450,7 +2768,7 @@ int bpf_percpu_hash_update(struct bpf_map *map, void *key, void *value,</div><div class='ctx'> int bpf_percpu_array_update(struct bpf_map *map, void *key, void *value,</div><div class='ctx'> 			    u64 flags);</div><div class='ctx'> </div><div class='del'>-int bpf_stackmap_copy(struct bpf_map *map, void *key, void *value);</div><div class='add'>+int bpf_stackmap_extract(struct bpf_map *map, void *key, void *value, bool delete);</div><div class='ctx'> </div><div class='ctx'> int bpf_fd_array_map_update_elem(struct bpf_map *map, struct file *map_file,</div><div class='ctx'> 				 void *key, void *value, u64 map_flags);</div><div class='hunk'>@@ -2478,7 +2796,7 @@ struct sk_buff;</div><div class='ctx'> struct bpf_dtab_netdev;</div><div class='ctx'> struct bpf_cpu_map_entry;</div><div class='ctx'> </div><div class='del'>-void __dev_flush(void);</div><div class='add'>+void __dev_flush(struct list_head *flush_list);</div><div class='ctx'> int dev_xdp_enqueue(struct net_device *dev, struct xdp_frame *xdpf,</div><div class='ctx'> 		    struct net_device *dev_rx);</div><div class='ctx'> int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_frame *xdpf,</div><div class='hunk'>@@ -2486,12 +2804,12 @@ int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_frame *xdpf,</div><div class='ctx'> int dev_map_enqueue_multi(struct xdp_frame *xdpf, struct net_device *dev_rx,</div><div class='ctx'> 			  struct bpf_map *map, bool exclude_ingress);</div><div class='ctx'> int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,</div><div class='del'>-			     struct bpf_prog *xdp_prog);</div><div class='add'>+			     const struct bpf_prog *xdp_prog);</div><div class='ctx'> int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			   struct bpf_prog *xdp_prog, struct bpf_map *map,</div><div class='del'>-			   bool exclude_ingress);</div><div class='add'>+			   const struct bpf_prog *xdp_prog,</div><div class='add'>+			   struct bpf_map *map, bool exclude_ingress);</div><div class='ctx'> </div><div class='del'>-void __cpu_map_flush(void);</div><div class='add'>+void __cpu_map_flush(struct list_head *flush_list);</div><div class='ctx'> int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_frame *xdpf,</div><div class='ctx'> 		    struct net_device *dev_rx);</div><div class='ctx'> int cpu_map_generic_redirect(struct bpf_cpu_map_entry *rcpu,</div><div class='hunk'>@@ -2627,9 +2945,8 @@ void bpf_dynptr_init(struct bpf_dynptr_kern *ptr, void *data,</div><div class='ctx'> 		     enum bpf_dynptr_type type, u32 offset, u32 size);</div><div class='ctx'> void bpf_dynptr_set_null(struct bpf_dynptr_kern *ptr);</div><div class='ctx'> void bpf_dynptr_set_rdonly(struct bpf_dynptr_kern *ptr);</div><div class='add'>+void bpf_prog_report_arena_violation(bool write, unsigned long addr, unsigned long fault_ip);</div><div class='ctx'> </div><div class='del'>-bool dev_check_flush(void);</div><div class='del'>-bool cpu_map_check_flush(void);</div><div class='ctx'> #else /* !CONFIG_BPF_SYSCALL */</div><div class='ctx'> static inline struct bpf_prog *bpf_prog_get(u32 ufd)</div><div class='ctx'> {</div><div class='hunk'>@@ -2667,7 +2984,13 @@ bpf_prog_inc_not_zero(struct bpf_prog *prog)</div><div class='ctx'> </div><div class='ctx'> static inline void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,</div><div class='ctx'> 				 const struct bpf_link_ops *ops,</div><div class='del'>-				 struct bpf_prog *prog)</div><div class='add'>+				 struct bpf_prog *prog, enum bpf_attach_type attach_type)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,</div><div class='add'>+					   const struct bpf_link_ops *ops, struct bpf_prog *prog,</div><div class='add'>+					   enum bpf_attach_type attach_type, bool sleepable)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2690,6 +3013,11 @@ static inline void bpf_link_inc(struct bpf_link *link)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct bpf_link *bpf_link_inc_not_zero(struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void bpf_link_put(struct bpf_link *link)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -2717,7 +3045,14 @@ static inline struct bpf_token *bpf_token_get_from_fd(u32 ufd)</div><div class='ctx'> 	return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __dev_flush(void)</div><div class='add'>+static inline int bpf_token_get_info_by_fd(struct bpf_token *token,</div><div class='add'>+					   const union bpf_attr *attr,</div><div class='add'>+					   union bpf_attr __user *uattr)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __dev_flush(struct list_head *flush_list)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2750,20 +3085,20 @@ struct sk_buff;</div><div class='ctx'> </div><div class='ctx'> static inline int dev_map_generic_redirect(struct bpf_dtab_netdev *dst,</div><div class='ctx'> 					   struct sk_buff *skb,</div><div class='del'>-					   struct bpf_prog *xdp_prog)</div><div class='add'>+					   const struct bpf_prog *xdp_prog)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='ctx'> int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			   struct bpf_prog *xdp_prog, struct bpf_map *map,</div><div class='del'>-			   bool exclude_ingress)</div><div class='add'>+			   const struct bpf_prog *xdp_prog,</div><div class='add'>+			   struct bpf_map *map, bool exclude_ingress)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __cpu_map_flush(void)</div><div class='add'>+static inline void __cpu_map_flush(struct list_head *flush_list)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2898,6 +3233,11 @@ static inline void bpf_dynptr_set_null(struct bpf_dynptr_kern *ptr)</div><div class='ctx'> static inline void bpf_dynptr_set_rdonly(struct bpf_dynptr_kern *ptr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void bpf_prog_report_arena_violation(bool write, unsigned long addr,</div><div class='add'>+						   unsigned long fault_ip)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_BPF_SYSCALL */</div><div class='ctx'> </div><div class='ctx'> static __always_inline int</div><div class='hunk'>@@ -2912,8 +3252,7 @@ bpf_probe_read_kernel_common(void *dst, u32 size, const void *unsafe_ptr)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __bpf_free_used_btfs(struct bpf_prog_aux *aux,</div><div class='del'>-			  struct btf_mod_pair *used_btfs, u32 len);</div><div class='add'>+void __bpf_free_used_btfs(struct btf_mod_pair *used_btfs, u32 len);</div><div class='ctx'> </div><div class='ctx'> static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,</div><div class='ctx'> 						 enum bpf_prog_type type)</div><div class='hunk'>@@ -2991,6 +3330,7 @@ int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype);</div><div class='ctx'> int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value, u64 flags);</div><div class='ctx'> int sock_map_bpf_prog_query(const union bpf_attr *attr,</div><div class='ctx'> 			    union bpf_attr __user *uattr);</div><div class='add'>+int sock_map_link_create(const union bpf_attr *attr, struct bpf_prog *prog);</div><div class='ctx'> </div><div class='ctx'> void sock_map_unhash(struct sock *sk);</div><div class='ctx'> void sock_map_destroy(struct sock *sk);</div><div class='hunk'>@@ -3089,6 +3429,11 @@ static inline int sock_map_bpf_prog_query(const union bpf_attr *attr,</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int sock_map_link_create(const union bpf_attr *attr, struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_BPF_SYSCALL */</div><div class='ctx'> #endif /* CONFIG_NET &amp;&amp; CONFIG_BPF_SYSCALL */</div><div class='ctx'> </div><div class='hunk'>@@ -3135,6 +3480,38 @@ static inline int bpf_fd_reuseport_array_update_elem(struct bpf_map *map,</div><div class='ctx'> #endif /* CONFIG_BPF_SYSCALL */</div><div class='ctx'> #endif /* defined(CONFIG_INET) &amp;&amp; defined(CONFIG_BPF_SYSCALL) */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_KEYS) &amp;&amp; defined(CONFIG_BPF_SYSCALL)</div><div class='add'>+</div><div class='add'>+struct bpf_key *bpf_lookup_user_key(s32 serial, u64 flags);</div><div class='add'>+struct bpf_key *bpf_lookup_system_key(u64 id);</div><div class='add'>+void bpf_key_put(struct bpf_key *bkey);</div><div class='add'>+int bpf_verify_pkcs7_signature(struct bpf_dynptr *data_p,</div><div class='add'>+			       struct bpf_dynptr *sig_p,</div><div class='add'>+			       struct bpf_key *trusted_keyring);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline struct bpf_key *bpf_lookup_user_key(u32 serial, u64 flags)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct bpf_key *bpf_lookup_system_key(u64 id)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bpf_key_put(struct bpf_key *bkey)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int bpf_verify_pkcs7_signature(struct bpf_dynptr *data_p,</div><div class='add'>+					     struct bpf_dynptr *sig_p,</div><div class='add'>+					     struct bpf_key *trusted_keyring)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif /* defined(CONFIG_KEYS) &amp;&amp; defined(CONFIG_BPF_SYSCALL) */</div><div class='add'>+</div><div class='ctx'> /* verifier prototypes for helper functions called from eBPF programs */</div><div class='ctx'> extern const struct bpf_func_proto bpf_map_lookup_elem_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_map_update_elem_proto;</div><div class='hunk'>@@ -3156,7 +3533,9 @@ extern const struct bpf_func_proto bpf_get_current_uid_gid_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_current_comm_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_stackid_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_stack_proto;</div><div class='add'>+extern const struct bpf_func_proto bpf_get_stack_sleepable_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_task_stack_proto;</div><div class='add'>+extern const struct bpf_func_proto bpf_get_task_stack_sleepable_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_stackid_proto_pe;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_stack_proto_pe;</div><div class='ctx'> extern const struct bpf_func_proto bpf_sock_map_update_proto;</div><div class='hunk'>@@ -3164,6 +3543,7 @@ extern const struct bpf_func_proto bpf_sock_hash_update_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_current_cgroup_id_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_current_ancestor_cgroup_id_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_get_cgroup_classid_curr_proto;</div><div class='add'>+extern const struct bpf_func_proto bpf_current_task_under_cgroup_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_msg_redirect_hash_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_msg_redirect_map_proto;</div><div class='ctx'> extern const struct bpf_func_proto bpf_sk_redirect_hash_proto;</div><div class='hunk'>@@ -3238,8 +3618,8 @@ u32 bpf_sock_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> 				struct bpf_insn *insn_buf,</div><div class='ctx'> 				struct bpf_prog *prog,</div><div class='ctx'> 				u32 *target_size);</div><div class='del'>-int bpf_dynptr_from_skb_rdonly(struct sk_buff *skb, u64 flags,</div><div class='del'>-			       struct bpf_dynptr_kern *ptr);</div><div class='add'>+int bpf_dynptr_from_skb_rdonly(struct __sk_buff *skb, u64 flags,</div><div class='add'>+			       struct bpf_dynptr *ptr);</div><div class='ctx'> #else</div><div class='ctx'> static inline bool bpf_sock_common_is_valid_access(int off, int size,</div><div class='ctx'> 						   enum bpf_access_type type,</div><div class='hunk'>@@ -3261,8 +3641,8 @@ static inline u32 bpf_sock_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline int bpf_dynptr_from_skb_rdonly(struct sk_buff *skb, u64 flags,</div><div class='del'>-					     struct bpf_dynptr_kern *ptr)</div><div class='add'>+static inline int bpf_dynptr_from_skb_rdonly(struct __sk_buff *skb, u64 flags,</div><div class='add'>+					     struct bpf_dynptr *ptr)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -3330,12 +3710,14 @@ static inline u32 bpf_xdp_sock_convert_ctx_access(enum bpf_access_type type,</div><div class='ctx'> #endif /* CONFIG_INET */</div><div class='ctx'> </div><div class='ctx'> enum bpf_text_poke_type {</div><div class='add'>+	BPF_MOD_NOP,</div><div class='ctx'> 	BPF_MOD_CALL,</div><div class='ctx'> 	BPF_MOD_JUMP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t,</div><div class='del'>-		       void *addr1, void *addr2);</div><div class='add'>+int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,</div><div class='add'>+		       enum bpf_text_poke_type new_t, void *old_addr,</div><div class='add'>+		       void *new_addr);</div><div class='ctx'> </div><div class='ctx'> void bpf_arch_poke_desc_update(struct bpf_jit_poke_descriptor *poke,</div><div class='ctx'> 			       struct bpf_prog *new, struct bpf_prog *old);</div><div class='hunk'>@@ -3349,6 +3731,16 @@ bool btf_id_set_contains(const struct btf_id_set *set, u32 id);</div><div class='ctx'> #define MAX_BPRINTF_VARARGS		12</div><div class='ctx'> #define MAX_BPRINTF_BUF			1024</div><div class='ctx'> </div><div class='add'>+/* Per-cpu temp buffers used by printf-like helpers to store the bprintf binary</div><div class='add'>+ * arguments representation.</div><div class='add'>+ */</div><div class='add'>+#define MAX_BPRINTF_BIN_ARGS	512</div><div class='add'>+</div><div class='add'>+struct bpf_bprintf_buffers {</div><div class='add'>+	char bin_args[MAX_BPRINTF_BIN_ARGS];</div><div class='add'>+	char buf[MAX_BPRINTF_BUF];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bpf_bprintf_data {</div><div class='ctx'> 	u32 *bin_args;</div><div class='ctx'> 	char *buf;</div><div class='hunk'>@@ -3356,9 +3748,33 @@ struct bpf_bprintf_data {</div><div class='ctx'> 	bool get_buf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int bpf_bprintf_prepare(char *fmt, u32 fmt_size, const u64 *raw_args,</div><div class='add'>+int bpf_bprintf_prepare(const char *fmt, u32 fmt_size, const u64 *raw_args,</div><div class='ctx'> 			u32 num_args, struct bpf_bprintf_data *data);</div><div class='ctx'> void bpf_bprintf_cleanup(struct bpf_bprintf_data *data);</div><div class='add'>+int bpf_try_get_buffers(struct bpf_bprintf_buffers **bufs);</div><div class='add'>+void bpf_put_buffers(void);</div><div class='add'>+</div><div class='add'>+void bpf_prog_stream_init(struct bpf_prog *prog);</div><div class='add'>+void bpf_prog_stream_free(struct bpf_prog *prog);</div><div class='add'>+int bpf_prog_stream_read(struct bpf_prog *prog, enum bpf_stream_id stream_id, void __user *buf, int len);</div><div class='add'>+void bpf_stream_stage_init(struct bpf_stream_stage *ss);</div><div class='add'>+void bpf_stream_stage_free(struct bpf_stream_stage *ss);</div><div class='add'>+__printf(2, 3)</div><div class='add'>+int bpf_stream_stage_printk(struct bpf_stream_stage *ss, const char *fmt, ...);</div><div class='add'>+int bpf_stream_stage_commit(struct bpf_stream_stage *ss, struct bpf_prog *prog,</div><div class='add'>+			    enum bpf_stream_id stream_id);</div><div class='add'>+int bpf_stream_stage_dump_stack(struct bpf_stream_stage *ss);</div><div class='add'>+</div><div class='add'>+#define bpf_stream_printk(ss, ...) bpf_stream_stage_printk(&amp;ss, __VA_ARGS__)</div><div class='add'>+#define bpf_stream_dump_stack(ss) bpf_stream_stage_dump_stack(&amp;ss)</div><div class='add'>+</div><div class='add'>+#define bpf_stream_stage(ss, prog, stream_id, expr)            \</div><div class='add'>+	({                                                     \</div><div class='add'>+		bpf_stream_stage_init(&amp;ss);                    \</div><div class='add'>+		(expr);                                        \</div><div class='add'>+		bpf_stream_stage_commit(&amp;ss, prog, stream_id); \</div><div class='add'>+		bpf_stream_stage_free(&amp;ss);                    \</div><div class='add'>+	})</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BPF_LSM</div><div class='ctx'> void bpf_cgroup_atype_get(u32 attach_btf_id, int cgroup_atype);</div><div class='hunk'>@@ -3394,4 +3810,34 @@ static inline bool bpf_is_subprog(const struct bpf_prog *prog)</div><div class='ctx'> 	return prog-&gt;aux-&gt;func_idx != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int bpf_prog_get_file_line(struct bpf_prog *prog, unsigned long ip, const char **filep,</div><div class='add'>+			   const char **linep, int *nump);</div><div class='add'>+struct bpf_prog *bpf_prog_find_from_stack(void);</div><div class='add'>+</div><div class='add'>+int bpf_insn_array_init(struct bpf_map *map, const struct bpf_prog *prog);</div><div class='add'>+int bpf_insn_array_ready(struct bpf_map *map);</div><div class='add'>+void bpf_insn_array_release(struct bpf_map *map);</div><div class='add'>+void bpf_insn_array_adjust(struct bpf_map *map, u32 off, u32 len);</div><div class='add'>+void bpf_insn_array_adjust_after_remove(struct bpf_map *map, u32 off, u32 len);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+void bpf_prog_update_insn_ptrs(struct bpf_prog *prog, u32 *offsets, void *image);</div><div class='add'>+#else</div><div class='add'>+static inline void</div><div class='add'>+bpf_prog_update_insn_ptrs(struct bpf_prog *prog, u32 *offsets, void *image)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline int bpf_map_check_op_flags(struct bpf_map *map, u64 flags, u64 allowed_flags)</div><div class='add'>+{</div><div class='add'>+	if (flags &amp; ~allowed_flags)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((flags &amp; BPF_F_LOCK) &amp;&amp; !btf_record_has_field(map-&gt;record, BPF_SPIN_LOCK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_BPF_H */</div><div class='head'>diff --git a/include/linux/bpf_crypto.h b/include/linux/bpf_crypto.h<br/>new file mode 100644<br/>index 000000000000..a41e71d4e2d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_crypto.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf_crypto.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#ifndef _BPF_CRYPTO_H</div><div class='add'>+#define _BPF_CRYPTO_H</div><div class='add'>+</div><div class='add'>+struct bpf_crypto_type {</div><div class='add'>+	void *(*alloc_tfm)(const char *algo);</div><div class='add'>+	void (*free_tfm)(void *tfm);</div><div class='add'>+	int (*has_algo)(const char *algo);</div><div class='add'>+	int (*setkey)(void *tfm, const u8 *key, unsigned int keylen);</div><div class='add'>+	int (*setauthsize)(void *tfm, unsigned int authsize);</div><div class='add'>+	int (*encrypt)(void *tfm, const u8 *src, u8 *dst, unsigned int len, u8 *iv);</div><div class='add'>+	int (*decrypt)(void *tfm, const u8 *src, u8 *dst, unsigned int len, u8 *iv);</div><div class='add'>+	unsigned int (*ivsize)(void *tfm);</div><div class='add'>+	unsigned int (*statesize)(void *tfm);</div><div class='add'>+	u32 (*get_flags)(void *tfm);</div><div class='add'>+	struct module *owner;</div><div class='add'>+	char name[14];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int bpf_crypto_register_type(const struct bpf_crypto_type *type);</div><div class='add'>+int bpf_crypto_unregister_type(const struct bpf_crypto_type *type);</div><div class='add'>+</div><div class='add'>+#endif /* _BPF_CRYPTO_H */</div><div class='head'>diff --git a/include/linux/bpf_local_storage.h b/include/linux/bpf_local_storage.h<br/>index dcddb0aef7d8..66432248cd81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_local_storage.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_local_storage.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_local_storage.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf_local_storage.h</a></div><div class='hunk'>@@ -18,9 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #define BPF_LOCAL_STORAGE_CACHE_SIZE	16</div><div class='ctx'> </div><div class='del'>-#define bpf_rcu_lock_held()                                                    \</div><div class='del'>-	(rcu_read_lock_held() || rcu_read_lock_trace_held() ||                 \</div><div class='del'>-	 rcu_read_lock_bh_held())</div><div class='ctx'> struct bpf_local_storage_map_bucket {</div><div class='ctx'> 	struct hlist_head list;</div><div class='ctx'> 	raw_spinlock_t lock;</div><div class='hunk'>@@ -56,9 +53,7 @@ struct bpf_local_storage_map {</div><div class='ctx'> 	u32 bucket_log;</div><div class='ctx'> 	u16 elem_size;</div><div class='ctx'> 	u16 cache_idx;</div><div class='del'>-	struct bpf_mem_alloc selem_ma;</div><div class='del'>-	struct bpf_mem_alloc storage_ma;</div><div class='del'>-	bool bpf_ma;</div><div class='add'>+	bool use_kmalloc_nolock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_local_storage_data {</div><div class='hunk'>@@ -77,7 +72,13 @@ struct bpf_local_storage_elem {</div><div class='ctx'> 	struct hlist_node map_node;	/* Linked to bpf_local_storage_map */</div><div class='ctx'> 	struct hlist_node snode;	/* Linked to bpf_local_storage */</div><div class='ctx'> 	struct bpf_local_storage __rcu *local_storage;</div><div class='del'>-	struct rcu_head rcu;</div><div class='add'>+	union {</div><div class='add'>+		struct rcu_head rcu;</div><div class='add'>+		struct hlist_node free_node;	/* used to postpone</div><div class='add'>+						 * bpf_selem_free</div><div class='add'>+						 * after raw_spin_unlock</div><div class='add'>+						 */</div><div class='add'>+	};</div><div class='ctx'> 	/* 8 bytes hole */</div><div class='ctx'> 	/* The data is stored in another cacheline to minimize</div><div class='ctx'> 	 * the number of cachelines access during a cache hit.</div><div class='hunk'>@@ -94,6 +95,7 @@ struct bpf_local_storage {</div><div class='ctx'> 				 */</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> 	raw_spinlock_t lock;	/* Protect adding/removing from the "list" */</div><div class='add'>+	bool use_kmalloc_nolock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* U16_MAX is much more than enough for sk local storage</div><div class='hunk'>@@ -127,7 +129,7 @@ int bpf_local_storage_map_alloc_check(union bpf_attr *attr);</div><div class='ctx'> struct bpf_map *</div><div class='ctx'> bpf_local_storage_map_alloc(union bpf_attr *attr,</div><div class='ctx'> 			    struct bpf_local_storage_cache *cache,</div><div class='del'>-			    bool bpf_ma);</div><div class='add'>+			    bool use_kmalloc_nolock);</div><div class='ctx'> </div><div class='ctx'> void __bpf_local_storage_insert_cache(struct bpf_local_storage *local_storage,</div><div class='ctx'> 				      struct bpf_local_storage_map *smap,</div><div class='hunk'>@@ -181,10 +183,9 @@ void bpf_selem_link_map(struct bpf_local_storage_map *smap,</div><div class='ctx'> </div><div class='ctx'> struct bpf_local_storage_elem *</div><div class='ctx'> bpf_selem_alloc(struct bpf_local_storage_map *smap, void *owner, void *value,</div><div class='del'>-		bool charge_mem, gfp_t gfp_flags);</div><div class='add'>+		bool swap_uptrs, gfp_t gfp_flags);</div><div class='ctx'> </div><div class='ctx'> void bpf_selem_free(struct bpf_local_storage_elem *selem,</div><div class='del'>-		    struct bpf_local_storage_map *smap,</div><div class='ctx'> 		    bool reuse_now);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -195,7 +196,7 @@ bpf_local_storage_alloc(void *owner,</div><div class='ctx'> </div><div class='ctx'> struct bpf_local_storage_data *</div><div class='ctx'> bpf_local_storage_update(void *owner, struct bpf_local_storage_map *smap,</div><div class='del'>-			 void *value, u64 map_flags, gfp_t gfp_flags);</div><div class='add'>+			 void *value, u64 map_flags, bool swap_uptrs, gfp_t gfp_flags);</div><div class='ctx'> </div><div class='ctx'> u64 bpf_local_storage_map_mem_usage(const struct bpf_map *map);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/bpf_lsm.h b/include/linux/bpf_lsm.h<br/>index 1de7ece5d36d..643809cc78c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_lsm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_lsm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_lsm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf_lsm.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/bpf_verifier.h&gt;</div><div class='ctx'> #include &lt;linux/lsm_hooks.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BPF_LSM</div><div class='hunk'>@@ -45,6 +46,13 @@ void bpf_inode_storage_free(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog, bpf_func_t *bpf_func);</div><div class='ctx'> </div><div class='add'>+int bpf_lsm_get_retval_range(const struct bpf_prog *prog,</div><div class='add'>+			     struct bpf_retval_range *range);</div><div class='add'>+int bpf_set_dentry_xattr_locked(struct dentry *dentry, const char *name__str,</div><div class='add'>+				const struct bpf_dynptr *value_p, int flags);</div><div class='add'>+int bpf_remove_dentry_xattr_locked(struct dentry *dentry, const char *name__str);</div><div class='add'>+bool bpf_lsm_has_d_inode_locked(const struct bpf_prog *prog);</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_BPF_LSM */</div><div class='ctx'> </div><div class='ctx'> static inline bool bpf_lsm_is_sleepable_hook(u32 btf_id)</div><div class='hunk'>@@ -78,6 +86,24 @@ static inline void bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int bpf_lsm_get_retval_range(const struct bpf_prog *prog,</div><div class='add'>+					   struct bpf_retval_range *range)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int bpf_set_dentry_xattr_locked(struct dentry *dentry, const char *name__str,</div><div class='add'>+					      const struct bpf_dynptr *value_p, int flags)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int bpf_remove_dentry_xattr_locked(struct dentry *dentry, const char *name__str)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline bool bpf_lsm_has_d_inode_locked(const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_BPF_LSM */</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_BPF_LSM_H */</div><div class='head'>diff --git a/include/linux/bpf_mem_alloc.h b/include/linux/bpf_mem_alloc.h<br/>index aaf004d94322..e45162ef59bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_mem_alloc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_mem_alloc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_mem_alloc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf_mem_alloc.h</a></div><div class='hunk'>@@ -33,6 +33,9 @@ int bpf_mem_alloc_percpu_init(struct bpf_mem_alloc *ma, struct obj_cgroup *objcg</div><div class='ctx'> int bpf_mem_alloc_percpu_unit_init(struct bpf_mem_alloc *ma, int size);</div><div class='ctx'> void bpf_mem_alloc_destroy(struct bpf_mem_alloc *ma);</div><div class='ctx'> </div><div class='add'>+/* Check the allocation size for kmalloc equivalent allocator */</div><div class='add'>+int bpf_mem_alloc_check_size(bool percpu, size_t size);</div><div class='add'>+</div><div class='ctx'> /* kmalloc/kfree equivalent: */</div><div class='ctx'> void *bpf_mem_alloc(struct bpf_mem_alloc *ma, size_t size);</div><div class='ctx'> void bpf_mem_free(struct bpf_mem_alloc *ma, void *ptr);</div><div class='head'>diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h<br/>index 9f2a6b83b49e..b13de31e163f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf_types.h</a></div><div class='hunk'>@@ -133,6 +133,7 @@ BPF_MAP_TYPE(BPF_MAP_TYPE_RINGBUF, ringbuf_map_ops)</div><div class='ctx'> BPF_MAP_TYPE(BPF_MAP_TYPE_BLOOM_FILTER, bloom_filter_map_ops)</div><div class='ctx'> BPF_MAP_TYPE(BPF_MAP_TYPE_USER_RINGBUF, user_ringbuf_map_ops)</div><div class='ctx'> BPF_MAP_TYPE(BPF_MAP_TYPE_ARENA, arena_map_ops)</div><div class='add'>+BPF_MAP_TYPE(BPF_MAP_TYPE_INSN_ARRAY, insn_array_map_ops)</div><div class='ctx'> </div><div class='ctx'> BPF_LINK_TYPE(BPF_LINK_TYPE_RAW_TRACEPOINT, raw_tracepoint)</div><div class='ctx'> BPF_LINK_TYPE(BPF_LINK_TYPE_TRACING, tracing)</div><div class='hunk'>@@ -146,6 +147,7 @@ BPF_LINK_TYPE(BPF_LINK_TYPE_XDP, xdp)</div><div class='ctx'> BPF_LINK_TYPE(BPF_LINK_TYPE_NETFILTER, netfilter)</div><div class='ctx'> BPF_LINK_TYPE(BPF_LINK_TYPE_TCX, tcx)</div><div class='ctx'> BPF_LINK_TYPE(BPF_LINK_TYPE_NETKIT, netkit)</div><div class='add'>+BPF_LINK_TYPE(BPF_LINK_TYPE_SOCKMAP, sockmap)</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_PERF_EVENTS</div><div class='ctx'> BPF_LINK_TYPE(BPF_LINK_TYPE_PERF_EVENT, perf)</div><div class='head'>diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h<br/>index 7cb1b75eee38..130bcbd66f60 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_verifier.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpf_verifier.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpf_verifier.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpf_verifier.h</a></div><div class='hunk'>@@ -23,44 +23,8 @@</div><div class='ctx'>  * (in the "-8,-16,...,-512" form)</div><div class='ctx'>  */</div><div class='ctx'> #define TMP_STR_BUF_LEN 320</div><div class='del'>-</div><div class='del'>-/* Liveness marks, used for registers and spilled-regs (in stack slots).</div><div class='del'>- * Read marks propagate upwards until they find a write mark; they record that</div><div class='del'>- * "one of this state's descendants read this reg" (and therefore the reg is</div><div class='del'>- * relevant for states_equal() checks).</div><div class='del'>- * Write marks collect downwards and do not propagate; they record that "the</div><div class='del'>- * straight-line code that reached this state (from its parent) wrote this reg"</div><div class='del'>- * (and therefore that reads propagated from this state or its descendants</div><div class='del'>- * should not propagate to its parent).</div><div class='del'>- * A state with a write mark can receive read marks; it just won't propagate</div><div class='del'>- * them to its parent, since the write mark is a property, not of the state,</div><div class='del'>- * but of the link between it and its parent.  See mark_reg_read() and</div><div class='del'>- * mark_stack_slot_read() in kernel/bpf/verifier.c.</div><div class='del'>- */</div><div class='del'>-enum bpf_reg_liveness {</div><div class='del'>-	REG_LIVE_NONE = 0, /* reg hasn't been read or written this branch */</div><div class='del'>-	REG_LIVE_READ32 = 0x1, /* reg was read, so we're sensitive to initial value */</div><div class='del'>-	REG_LIVE_READ64 = 0x2, /* likewise, but full 64-bit content matters */</div><div class='del'>-	REG_LIVE_READ = REG_LIVE_READ32 | REG_LIVE_READ64,</div><div class='del'>-	REG_LIVE_WRITTEN = 0x4, /* reg was written first, screening off later reads */</div><div class='del'>-	REG_LIVE_DONE = 0x8, /* liveness won't be updating this register anymore */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* For every reg representing a map value or allocated object pointer,</div><div class='del'>- * we consider the tuple of (ptr, id) for them to be unique in verifier</div><div class='del'>- * context and conside them to not alias each other for the purposes of</div><div class='del'>- * tracking lock state.</div><div class='del'>- */</div><div class='del'>-struct bpf_active_lock {</div><div class='del'>-	/* This can either be reg-&gt;map_ptr or reg-&gt;btf. If ptr is NULL,</div><div class='del'>-	 * there's no active lock held, and other fields have no</div><div class='del'>-	 * meaning. If non-NULL, it indicates that a lock is held and</div><div class='del'>-	 * id member has the reg-&gt;id of the register which can be &gt;= 0.</div><div class='del'>-	 */</div><div class='del'>-	void *ptr;</div><div class='del'>-	/* This will be reg-&gt;id */</div><div class='del'>-	u32 id;</div><div class='del'>-};</div><div class='add'>+/* Patch buffer size */</div><div class='add'>+#define INSN_BUF_SIZE 32</div><div class='ctx'> </div><div class='ctx'> #define ITER_PREFIX "bpf_iter_"</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +37,10 @@ enum bpf_iter_state {</div><div class='ctx'> struct bpf_reg_state {</div><div class='ctx'> 	/* Ordering of fields matters.  See states_equal() */</div><div class='ctx'> 	enum bpf_reg_type type;</div><div class='del'>-	/* Fixed part of pointer offset, pointer types only */</div><div class='add'>+	/*</div><div class='add'>+	 * Fixed part of pointer offset, pointer types only.</div><div class='add'>+	 * Or constant delta between "linked" scalars with the same ID.</div><div class='add'>+	 */</div><div class='ctx'> 	s32 off;</div><div class='ctx'> 	union {</div><div class='ctx'> 		/* valid when type == PTR_TO_PACKET */</div><div class='hunk'>@@ -126,6 +93,14 @@ struct bpf_reg_state {</div><div class='ctx'> 			int depth:30;</div><div class='ctx'> 		} iter;</div><div class='ctx'> </div><div class='add'>+		/* For irq stack slots */</div><div class='add'>+		struct {</div><div class='add'>+			enum {</div><div class='add'>+				IRQ_NATIVE_KFUNC,</div><div class='add'>+				IRQ_LOCK_KFUNC,</div><div class='add'>+			} kfunc_class;</div><div class='add'>+		} irq;</div><div class='add'>+</div><div class='ctx'> 		/* Max size from any of the above. */</div><div class='ctx'> 		struct {</div><div class='ctx'> 			unsigned long raw1;</div><div class='hunk'>@@ -167,6 +142,13 @@ struct bpf_reg_state {</div><div class='ctx'> 	 * Similarly to dynptrs, we use ID to track "belonging" of a reference</div><div class='ctx'> 	 * to a specific instance of bpf_iter.</div><div class='ctx'> 	 */</div><div class='add'>+	/*</div><div class='add'>+	 * Upper bit of ID is used to remember relationship between "linked"</div><div class='add'>+	 * registers. Example:</div><div class='add'>+	 * r1 = r2;    both will have r1-&gt;id == r2-&gt;id == N</div><div class='add'>+	 * r1 += 10;   r1-&gt;id == N | BPF_ADD_CONST and r1-&gt;off == 10</div><div class='add'>+	 */</div><div class='add'>+#define BPF_ADD_CONST (1U &lt;&lt; 31)</div><div class='ctx'> 	u32 id;</div><div class='ctx'> 	/* PTR_TO_SOCKET and PTR_TO_TCP_SOCK could be a ptr returned</div><div class='ctx'> 	 * from a pointer-cast helper, bpf_sk_fullsock() and</div><div class='hunk'>@@ -208,8 +190,6 @@ struct bpf_reg_state {</div><div class='ctx'> 	 * allowed and has the same effect as bpf_sk_release(sk).</div><div class='ctx'> 	 */</div><div class='ctx'> 	u32 ref_obj_id;</div><div class='del'>-	/* parentage chain for liveness checking */</div><div class='del'>-	struct bpf_reg_state *parent;</div><div class='ctx'> 	/* Inside the callee two registers can be both PTR_TO_STACK like</div><div class='ctx'> 	 * R1=fp-8 and R2=fp-8, but one of them points to this function stack</div><div class='ctx'> 	 * while another to the caller's stack. To differentiate them 'frameno'</div><div class='hunk'>@@ -222,7 +202,6 @@ struct bpf_reg_state {</div><div class='ctx'> 	 * patching which only happens after main verification finished.</div><div class='ctx'> 	 */</div><div class='ctx'> 	s32 subreg_def;</div><div class='del'>-	enum bpf_reg_liveness live;</div><div class='ctx'> 	/* if (!precise &amp;&amp; SCALAR_VALUE) min/max/tnum don't affect safety */</div><div class='ctx'> 	bool precise;</div><div class='ctx'> };</div><div class='hunk'>@@ -237,6 +216,7 @@ enum bpf_stack_slot_type {</div><div class='ctx'> 	 */</div><div class='ctx'> 	STACK_DYNPTR,</div><div class='ctx'> 	STACK_ITER,</div><div class='add'>+	STACK_IRQ_FLAG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BPF_REG_SIZE 8	/* size of eBPF register in bytes */</div><div class='hunk'>@@ -254,6 +234,17 @@ struct bpf_stack_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_reference_state {</div><div class='add'>+	/* Each reference object has a type. Ensure REF_TYPE_PTR is zero to</div><div class='add'>+	 * default to pointer reference on zero initialization of a state.</div><div class='add'>+	 */</div><div class='add'>+	enum ref_state_type {</div><div class='add'>+		REF_TYPE_PTR		= (1 &lt;&lt; 1),</div><div class='add'>+		REF_TYPE_IRQ		= (1 &lt;&lt; 2),</div><div class='add'>+		REF_TYPE_LOCK		= (1 &lt;&lt; 3),</div><div class='add'>+		REF_TYPE_RES_LOCK 	= (1 &lt;&lt; 4),</div><div class='add'>+		REF_TYPE_RES_LOCK_IRQ	= (1 &lt;&lt; 5),</div><div class='add'>+		REF_TYPE_LOCK_MASK	= REF_TYPE_LOCK | REF_TYPE_RES_LOCK | REF_TYPE_RES_LOCK_IRQ,</div><div class='add'>+	} type;</div><div class='ctx'> 	/* Track each reference created with a unique id, even if the same</div><div class='ctx'> 	 * instruction creates the reference multiple times (eg, via CALL).</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -262,17 +253,10 @@ struct bpf_reference_state {</div><div class='ctx'> 	 * is used purely to inform the user of a reference leak.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int insn_idx;</div><div class='del'>-	/* There can be a case like:</div><div class='del'>-	 * main (frame 0)</div><div class='del'>-	 *  cb (frame 1)</div><div class='del'>-	 *   func (frame 3)</div><div class='del'>-	 *    cb (frame 4)</div><div class='del'>-	 * Hence for frame 4, if callback_ref just stored boolean, it would be</div><div class='del'>-	 * impossible to distinguish nested callback refs. Hence store the</div><div class='del'>-	 * frameno and compare that to callback_ref in check_reference_leak when</div><div class='del'>-	 * exiting a callback function.</div><div class='del'>-	 */</div><div class='del'>-	int callback_ref;</div><div class='add'>+	/* Use to keep track of the source object of a lock, to ensure</div><div class='add'>+	 * it matches on unlock.</div><div class='add'>+	 */</div><div class='add'>+	void *ptr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_retval_range {</div><div class='hunk'>@@ -319,8 +303,6 @@ struct bpf_func_state {</div><div class='ctx'> 	u32 callback_depth;</div><div class='ctx'> </div><div class='ctx'> 	/* The following fields should be last. See copy_func_state() */</div><div class='del'>-	int acquired_refs;</div><div class='del'>-	struct bpf_reference_state *refs;</div><div class='ctx'> 	/* The state of the stack. Each element of the array describes BPF_REG_SIZE</div><div class='ctx'> 	 * (i.e. 8) bytes worth of stack memory.</div><div class='ctx'> 	 * stack[0] represents bytes [*(r10-8)..*(r10-1)]</div><div class='hunk'>@@ -349,7 +331,11 @@ enum {</div><div class='ctx'> 	INSN_F_SPI_MASK = 0x3f, /* 6 bits */</div><div class='ctx'> 	INSN_F_SPI_SHIFT = 3, /* shifted 3 bits to the left */</div><div class='ctx'> </div><div class='del'>-	INSN_F_STACK_ACCESS = BIT(9), /* we need 10 bits total */</div><div class='add'>+	INSN_F_STACK_ACCESS = BIT(9),</div><div class='add'>+</div><div class='add'>+	INSN_F_DST_REG_STACK = BIT(10), /* dst_reg is PTR_TO_STACK */</div><div class='add'>+	INSN_F_SRC_REG_STACK = BIT(11), /* src_reg is PTR_TO_STACK */</div><div class='add'>+	/* total 12 bits are used now. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static_assert(INSN_F_FRAMENO_MASK + 1 &gt;= MAX_CALL_FRAMES);</div><div class='hunk'>@@ -358,9 +344,13 @@ static_assert(INSN_F_SPI_MASK + 1 &gt;= MAX_BPF_STACK / 8);</div><div class='ctx'> struct bpf_jmp_history_entry {</div><div class='ctx'> 	u32 idx;</div><div class='ctx'> 	/* insn idx can't be bigger than 1 million */</div><div class='del'>-	u32 prev_idx : 22;</div><div class='del'>-	/* special flags, e.g., whether insn is doing register stack spill/load */</div><div class='del'>-	u32 flags : 10;</div><div class='add'>+	u32 prev_idx : 20;</div><div class='add'>+	/* special INSN_F_xxx flags */</div><div class='add'>+	u32 flags : 12;</div><div class='add'>+	/* additional registers that need precision tracking when this</div><div class='add'>+	 * jump is backtracked, vector of six 10-bit records</div><div class='add'>+	 */</div><div class='add'>+	u64 linked_regs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Maximum number of register states that can exist at once */</div><div class='hunk'>@@ -369,6 +359,8 @@ struct bpf_verifier_state {</div><div class='ctx'> 	/* call stack tracking */</div><div class='ctx'> 	struct bpf_func_state *frame[MAX_CALL_FRAMES];</div><div class='ctx'> 	struct bpf_verifier_state *parent;</div><div class='add'>+	/* Acquired reference states */</div><div class='add'>+	struct bpf_reference_state *refs;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 'branches' field is the number of branches left to explore:</div><div class='ctx'> 	 * 0 - all possible paths from this state reached bpf_exit or</div><div class='hunk'>@@ -418,28 +410,25 @@ struct bpf_verifier_state {</div><div class='ctx'> 	u32 insn_idx;</div><div class='ctx'> 	u32 curframe;</div><div class='ctx'> </div><div class='del'>-	struct bpf_active_lock active_lock;</div><div class='add'>+	u32 acquired_refs;</div><div class='add'>+	u32 active_locks;</div><div class='add'>+	u32 active_preempt_locks;</div><div class='add'>+	u32 active_irq_id;</div><div class='add'>+	u32 active_lock_id;</div><div class='add'>+	void *active_lock_ptr;</div><div class='add'>+	u32 active_rcu_locks;</div><div class='add'>+</div><div class='ctx'> 	bool speculative;</div><div class='del'>-	bool active_rcu_lock;</div><div class='del'>-	/* If this state was ever pointed-to by other state's loop_entry field</div><div class='del'>-	 * this flag would be set to true. Used to avoid freeing such states</div><div class='del'>-	 * while they are still in use.</div><div class='del'>-	 */</div><div class='del'>-	bool used_as_loop_entry;</div><div class='add'>+	bool in_sleepable;</div><div class='add'>+	bool cleaned;</div><div class='ctx'> </div><div class='ctx'> 	/* first and last insn idx of this verifier state */</div><div class='ctx'> 	u32 first_insn_idx;</div><div class='ctx'> 	u32 last_insn_idx;</div><div class='del'>-	/* If this state is a part of states loop this field points to some</div><div class='del'>-	 * parent of this state such that:</div><div class='del'>-	 * - it is also a member of the same states loop;</div><div class='del'>-	 * - DFS states traversal starting from initial state visits loop_entry</div><div class='del'>-	 *   state before this state.</div><div class='del'>-	 * Used to compute topmost loop entry for state loops.</div><div class='del'>-	 * State loops might appear because of open coded iterators logic.</div><div class='del'>-	 * See get_loop_entry() for more information.</div><div class='del'>-	 */</div><div class='del'>-	struct bpf_verifier_state *loop_entry;</div><div class='add'>+	/* if this state is a backedge state then equal_state</div><div class='add'>+	 * records cached state to which this state is equal.</div><div class='add'>+	 */</div><div class='add'>+	struct bpf_verifier_state *equal_state;</div><div class='ctx'> 	/* jmp history recorded from first to last.</div><div class='ctx'> 	 * backtracking is using it to go from last to first.</div><div class='ctx'> 	 * For most states jmp_history_cnt is [0-3].</div><div class='hunk'>@@ -490,8 +479,10 @@ struct bpf_verifier_state {</div><div class='ctx'> /* linked list of verifier states used to prune search */</div><div class='ctx'> struct bpf_verifier_state_list {</div><div class='ctx'> 	struct bpf_verifier_state state;</div><div class='del'>-	struct bpf_verifier_state_list *next;</div><div class='del'>-	int miss_cnt, hit_cnt;</div><div class='add'>+	struct list_head node;</div><div class='add'>+	u32 miss_cnt;</div><div class='add'>+	u32 hit_cnt:31;</div><div class='add'>+	u32 in_free_list:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_loop_inline_state {</div><div class='hunk'>@@ -502,6 +493,13 @@ struct bpf_loop_inline_state {</div><div class='ctx'> 	u32 callback_subprogno; /* valid when fit_for_inline is true */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* pointer and state for maps */</div><div class='add'>+struct bpf_map_ptr_state {</div><div class='add'>+	struct bpf_map *map_ptr;</div><div class='add'>+	bool poison;</div><div class='add'>+	bool unpriv;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Possible states for alu_state member. */</div><div class='ctx'> #define BPF_ALU_SANITIZE_SRC		(1U &lt;&lt; 0)</div><div class='ctx'> #define BPF_ALU_SANITIZE_DST		(1U &lt;&lt; 1)</div><div class='hunk'>@@ -511,10 +509,19 @@ struct bpf_loop_inline_state {</div><div class='ctx'> #define BPF_ALU_SANITIZE		(BPF_ALU_SANITIZE_SRC | \</div><div class='ctx'> 					 BPF_ALU_SANITIZE_DST)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * An array of BPF instructions.</div><div class='add'>+ * Primary usage: return value of bpf_insn_successors.</div><div class='add'>+ */</div><div class='add'>+struct bpf_iarray {</div><div class='add'>+	int cnt;</div><div class='add'>+	u32 items[];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bpf_insn_aux_data {</div><div class='ctx'> 	union {</div><div class='ctx'> 		enum bpf_reg_type ptr_type;	/* pointer type for load/store insns */</div><div class='del'>-		unsigned long map_ptr_state;	/* pointer/poison value for maps */</div><div class='add'>+		struct bpf_map_ptr_state map_ptr_state;</div><div class='ctx'> 		s32 call_imm;			/* saved imm field of call insn */</div><div class='ctx'> 		u32 alu_limit;			/* limit for add/sub register with pointer */</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -542,17 +549,28 @@ struct bpf_insn_aux_data {</div><div class='ctx'> 		/* remember the offset of node field within type to rewrite */</div><div class='ctx'> 		u64 insert_off;</div><div class='ctx'> 	};</div><div class='add'>+	struct bpf_iarray *jt;	/* jump table for gotox or bpf_tailcall call instruction */</div><div class='ctx'> 	struct btf_struct_meta *kptr_struct_meta;</div><div class='ctx'> 	u64 map_key_state; /* constant (32 bit) key tracking for maps */</div><div class='ctx'> 	int ctx_field_size; /* the ctx field size for load insn, maybe 0 */</div><div class='ctx'> 	u32 seen; /* this insn was processed by the verifier at env-&gt;pass_cnt */</div><div class='del'>-	bool sanitize_stack_spill; /* subject to Spectre v4 sanitation */</div><div class='add'>+	bool nospec; /* do not execute this instruction speculatively */</div><div class='add'>+	bool nospec_result; /* result is unsafe under speculation, nospec must follow */</div><div class='ctx'> 	bool zext_dst; /* this insn zero extends dst reg */</div><div class='ctx'> 	bool needs_zext; /* alu op needs to clear upper bits */</div><div class='del'>-	bool storage_get_func_atomic; /* bpf_*_storage_get() with atomic memory alloc */</div><div class='add'>+	bool non_sleepable; /* helper/kfunc may be called from non-sleepable context */</div><div class='ctx'> 	bool is_iter_next; /* bpf_iter_&lt;type&gt;_next() kfunc call */</div><div class='ctx'> 	bool call_with_percpu_alloc_ptr; /* {this,per}_cpu_ptr() with prog percpu alloc */</div><div class='ctx'> 	u8 alu_state; /* used in combination with alu_limit */</div><div class='add'>+	/* true if STX or LDX instruction is a part of a spill/fill</div><div class='add'>+	 * pattern for a bpf_fastcall call.</div><div class='add'>+	 */</div><div class='add'>+	u8 fastcall_pattern:1;</div><div class='add'>+	/* for CALL instructions, a number of spill/fill pairs in the</div><div class='add'>+	 * bpf_fastcall pattern.</div><div class='add'>+	 */</div><div class='add'>+	u8 fastcall_spills_num:3;</div><div class='add'>+	u8 arg_prog:4;</div><div class='ctx'> </div><div class='ctx'> 	/* below fields are initialized once */</div><div class='ctx'> 	unsigned int orig_idx; /* original instruction index */</div><div class='hunk'>@@ -566,6 +584,13 @@ struct bpf_insn_aux_data {</div><div class='ctx'> 	 * accepts callback function as a parameter.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool calls_callback;</div><div class='add'>+	/*</div><div class='add'>+	 * CFG strongly connected component this instruction belongs to,</div><div class='add'>+	 * zero if it is a singleton SCC.</div><div class='add'>+	 */</div><div class='add'>+	u32 scc;</div><div class='add'>+	/* registers alive before this instruction. */</div><div class='add'>+	u16 live_regs_before;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MAX_USED_MAPS 64 /* max number of maps accessed by one eBPF program */</div><div class='hunk'>@@ -616,12 +641,24 @@ struct bpf_subprog_arg_info {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum priv_stack_mode {</div><div class='add'>+	PRIV_STACK_UNKNOWN,</div><div class='add'>+	NO_PRIV_STACK,</div><div class='add'>+	PRIV_STACK_ADAPTIVE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bpf_subprog_info {</div><div class='ctx'> 	/* 'start' has to be the first field otherwise find_subprog() won't work */</div><div class='ctx'> 	u32 start; /* insn idx of function entry point */</div><div class='ctx'> 	u32 linfo_idx; /* The idx to the main_prog-&gt;aux-&gt;linfo */</div><div class='add'>+	u32 postorder_start; /* The idx to the env-&gt;cfg.insn_postorder */</div><div class='add'>+	u32 exit_idx; /* Index of one of the BPF_EXIT instructions in this subprogram */</div><div class='ctx'> 	u16 stack_depth; /* max. stack depth used by this function */</div><div class='ctx'> 	u16 stack_extra;</div><div class='add'>+	/* offsets in range [stack_depth .. fastcall_stack_off)</div><div class='add'>+	 * are used for bpf_fastcall spills and fills.</div><div class='add'>+	 */</div><div class='add'>+	s16 fastcall_stack_off;</div><div class='ctx'> 	bool has_tail_call: 1;</div><div class='ctx'> 	bool tail_call_reachable: 1;</div><div class='ctx'> 	bool has_ld_abs: 1;</div><div class='hunk'>@@ -629,8 +666,13 @@ struct bpf_subprog_info {</div><div class='ctx'> 	bool is_async_cb: 1;</div><div class='ctx'> 	bool is_exception_cb: 1;</div><div class='ctx'> 	bool args_cached: 1;</div><div class='add'>+	/* true if bpf_fastcall stack region is used by functions that can't be inlined */</div><div class='add'>+	bool keep_fastcall_stack: 1;</div><div class='add'>+	bool changes_pkt_data: 1;</div><div class='add'>+	bool might_sleep: 1;</div><div class='add'>+	u8 arg_cnt:3;</div><div class='ctx'> </div><div class='del'>-	u8 arg_cnt;</div><div class='add'>+	enum priv_stack_mode priv_stack_mode;</div><div class='ctx'> 	struct bpf_subprog_arg_info args[MAX_BPF_FUNC_REG_ARGS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -658,6 +700,40 @@ struct bpf_idset {</div><div class='ctx'> 	u32 ids[BPF_ID_MAP_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* see verifier.c:compute_scc_callchain() */</div><div class='add'>+struct bpf_scc_callchain {</div><div class='add'>+	/* call sites from bpf_verifier_state-&gt;frame[*]-&gt;callsite leading to this SCC */</div><div class='add'>+	u32 callsites[MAX_CALL_FRAMES - 1];</div><div class='add'>+	/* last frame in a chain is identified by SCC id */</div><div class='add'>+	u32 scc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* verifier state waiting for propagate_backedges() */</div><div class='add'>+struct bpf_scc_backedge {</div><div class='add'>+	struct bpf_scc_backedge *next;</div><div class='add'>+	struct bpf_verifier_state state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_scc_visit {</div><div class='add'>+	struct bpf_scc_callchain callchain;</div><div class='add'>+	/* first state in current verification path that entered SCC</div><div class='add'>+	 * identified by the callchain</div><div class='add'>+	 */</div><div class='add'>+	struct bpf_verifier_state *entry_state;</div><div class='add'>+	struct bpf_scc_backedge *backedges; /* list of backedges */</div><div class='add'>+	u32 num_backedges;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* An array of bpf_scc_visit structs sharing tht same bpf_scc_callchain-&gt;scc</div><div class='add'>+ * but having different bpf_scc_callchain-&gt;callsites.</div><div class='add'>+ */</div><div class='add'>+struct bpf_scc_info {</div><div class='add'>+	u32 num_visits;</div><div class='add'>+	struct bpf_scc_visit visits[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_liveness;</div><div class='add'>+</div><div class='ctx'> /* single container for all structs</div><div class='ctx'>  * one verifier_env per bpf_check() call</div><div class='ctx'>  */</div><div class='hunk'>@@ -673,12 +749,17 @@ struct bpf_verifier_env {</div><div class='ctx'> 	bool test_state_freq;		/* test verifier with different pruning frequency */</div><div class='ctx'> 	bool test_reg_invariants;	/* fail verification on register invariants violations */</div><div class='ctx'> 	struct bpf_verifier_state *cur_state; /* current verifier state */</div><div class='del'>-	struct bpf_verifier_state_list **explored_states; /* search pruning optimization */</div><div class='del'>-	struct bpf_verifier_state_list *free_list;</div><div class='add'>+	/* Search pruning optimization, array of list_heads for</div><div class='add'>+	 * lists of struct bpf_verifier_state_list.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head *explored_states;</div><div class='add'>+	struct list_head free_list;	/* list of struct bpf_verifier_state_list */</div><div class='ctx'> 	struct bpf_map *used_maps[MAX_USED_MAPS]; /* array of map's used by eBPF program */</div><div class='ctx'> 	struct btf_mod_pair used_btfs[MAX_USED_BTFS]; /* array of BTF's used by BPF program */</div><div class='add'>+	struct bpf_map *insn_array_maps[MAX_USED_MAPS]; /* array of INSN_ARRAY map's to be relocated */</div><div class='ctx'> 	u32 used_map_cnt;		/* number of used maps */</div><div class='ctx'> 	u32 used_btf_cnt;		/* number of used BTF objects */</div><div class='add'>+	u32 insn_array_map_cnt;		/* number of used maps of type BPF_MAP_TYPE_INSN_ARRAY */</div><div class='ctx'> 	u32 id_gen;			/* used to generate unique reg IDs */</div><div class='ctx'> 	u32 hidden_subprog_cnt;		/* number of hidden subprogs */</div><div class='ctx'> 	int exception_callback_subprog;</div><div class='hunk'>@@ -705,7 +786,14 @@ struct bpf_verifier_env {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		int *insn_state;</div><div class='ctx'> 		int *insn_stack;</div><div class='add'>+		/*</div><div class='add'>+		 * vector of instruction indexes sorted in post-order, grouped by subprogram,</div><div class='add'>+		 * see bpf_subprog_info-&gt;postorder_start.</div><div class='add'>+		 */</div><div class='add'>+		int *insn_postorder;</div><div class='ctx'> 		int cur_stack;</div><div class='add'>+		/* current position in the insn_postorder vector */</div><div class='add'>+		int cur_postorder;</div><div class='ctx'> 	} cfg;</div><div class='ctx'> 	struct backtrack_state bt;</div><div class='ctx'> 	struct bpf_jmp_history_entry *cur_hist_ent;</div><div class='hunk'>@@ -728,6 +816,9 @@ struct bpf_verifier_env {</div><div class='ctx'> 	u32 peak_states;</div><div class='ctx'> 	/* longest register parentage chain walked for liveness marking */</div><div class='ctx'> 	u32 longest_mark_read_walk;</div><div class='add'>+	u32 free_list_size;</div><div class='add'>+	u32 explored_states_size;</div><div class='add'>+	u32 num_backedges;</div><div class='ctx'> 	bpfptr_t fd_array;</div><div class='ctx'> </div><div class='ctx'> 	/* bit mask to keep track of whether a register has been accessed</div><div class='hunk'>@@ -737,10 +828,21 @@ struct bpf_verifier_env {</div><div class='ctx'> 	/* Same as scratched_regs but for stack slots */</div><div class='ctx'> 	u64 scratched_stack_slots;</div><div class='ctx'> 	u64 prev_log_pos, prev_insn_print_pos;</div><div class='add'>+	/* buffer used to temporary hold constants as scalar registers */</div><div class='add'>+	struct bpf_reg_state fake_reg[2];</div><div class='ctx'> 	/* buffer used to generate temporary string representations,</div><div class='ctx'> 	 * e.g., in reg_type_str() to generate reg_type string</div><div class='ctx'> 	 */</div><div class='ctx'> 	char tmp_str_buf[TMP_STR_BUF_LEN];</div><div class='add'>+	struct bpf_insn insn_buf[INSN_BUF_SIZE];</div><div class='add'>+	struct bpf_insn epilogue_buf[INSN_BUF_SIZE];</div><div class='add'>+	struct bpf_scc_callchain callchain_buf;</div><div class='add'>+	struct bpf_liveness *liveness;</div><div class='add'>+	/* array of pointers to bpf_scc_info indexed by SCC id */</div><div class='add'>+	struct bpf_scc_info **scc_info;</div><div class='add'>+	u32 scc_cnt;</div><div class='add'>+	struct bpf_iarray *succ;</div><div class='add'>+	struct bpf_iarray *gotox_tmp_buf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct bpf_func_info_aux *subprog_aux(struct bpf_verifier_env *env, int subprog)</div><div class='hunk'>@@ -768,6 +870,19 @@ __printf(3, 4) void verbose_linfo(struct bpf_verifier_env *env,</div><div class='ctx'> 				  u32 insn_off,</div><div class='ctx'> 				  const char *prefix_fmt, ...);</div><div class='ctx'> </div><div class='add'>+#define verifier_bug_if(cond, env, fmt, args...)						\</div><div class='add'>+	({											\</div><div class='add'>+		bool __cond = (cond);								\</div><div class='add'>+		if (unlikely(__cond))								\</div><div class='add'>+			verifier_bug(env, fmt " (" #cond ")", ##args);				\</div><div class='add'>+		(__cond);									\</div><div class='add'>+	})</div><div class='add'>+#define verifier_bug(env, fmt, args...)								\</div><div class='add'>+	({											\</div><div class='add'>+		BPF_WARN_ONCE(1, "verifier bug: " fmt "\n", ##args);				\</div><div class='add'>+		bpf_log(&amp;env-&gt;log, "verifier bug: " fmt "\n", ##args);				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> static inline struct bpf_func_state *cur_func(struct bpf_verifier_env *env)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_verifier_state *cur = env-&gt;cur_state;</div><div class='hunk'>@@ -835,8 +950,8 @@ static inline u32 type_flag(u32 type)</div><div class='ctx'> /* only use after check_attach_btf_id() */</div><div class='ctx'> static inline enum bpf_prog_type resolve_prog_type(const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='del'>-	return prog-&gt;type == BPF_PROG_TYPE_EXT ?</div><div class='del'>-		prog-&gt;aux-&gt;dst_prog-&gt;type : prog-&gt;type;</div><div class='add'>+	return (prog-&gt;type == BPF_PROG_TYPE_EXT &amp;&amp; prog-&gt;aux-&gt;saved_dst_prog_type) ?</div><div class='add'>+		prog-&gt;aux-&gt;saved_dst_prog_type : prog-&gt;type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool bpf_prog_check_recur(const struct bpf_prog *prog)</div><div class='hunk'>@@ -845,7 +960,9 @@ static inline bool bpf_prog_check_recur(const struct bpf_prog *prog)</div><div class='ctx'> 	case BPF_PROG_TYPE_TRACING:</div><div class='ctx'> 		return prog-&gt;expected_attach_type != BPF_TRACE_ITER;</div><div class='ctx'> 	case BPF_PROG_TYPE_STRUCT_OPS:</div><div class='add'>+		return prog-&gt;aux-&gt;jits_use_priv_stack;</div><div class='ctx'> 	case BPF_PROG_TYPE_LSM:</div><div class='add'>+	case BPF_PROG_TYPE_SYSCALL:</div><div class='ctx'> 		return false;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -884,6 +1001,11 @@ static inline bool type_is_sk_pointer(enum bpf_reg_type type)</div><div class='ctx'> 		type == PTR_TO_XDP_SOCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool type_may_be_null(u32 type)</div><div class='add'>+{</div><div class='add'>+	return type &amp; PTR_MAYBE_NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void mark_reg_scratched(struct bpf_verifier_env *env, u32 regno)</div><div class='ctx'> {</div><div class='ctx'> 	env-&gt;scratched_regs |= 1U &lt;&lt; regno;</div><div class='hunk'>@@ -931,13 +1053,38 @@ static inline bool bpf_stack_narrow_access_ok(int off, int fill_size, int spill_</div><div class='ctx'> 	return !(off % BPF_REG_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool insn_is_gotox(struct bpf_insn *insn)</div><div class='add'>+{</div><div class='add'>+	return BPF_CLASS(insn-&gt;code) == BPF_JMP &amp;&amp;</div><div class='add'>+	       BPF_OP(insn-&gt;code) == BPF_JA &amp;&amp;</div><div class='add'>+	       BPF_SRC(insn-&gt;code) == BPF_X;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const char *reg_type_str(struct bpf_verifier_env *env, enum bpf_reg_type type);</div><div class='ctx'> const char *dynptr_type_str(enum bpf_dynptr_type type);</div><div class='ctx'> const char *iter_type_str(const struct btf *btf, u32 btf_id);</div><div class='ctx'> const char *iter_state_str(enum bpf_iter_state state);</div><div class='ctx'> </div><div class='del'>-void print_verifier_state(struct bpf_verifier_env *env,</div><div class='del'>-			  const struct bpf_func_state *state, bool print_all);</div><div class='del'>-void print_insn_state(struct bpf_verifier_env *env, const struct bpf_func_state *state);</div><div class='add'>+void print_verifier_state(struct bpf_verifier_env *env, const struct bpf_verifier_state *vstate,</div><div class='add'>+			  u32 frameno, bool print_all);</div><div class='add'>+void print_insn_state(struct bpf_verifier_env *env, const struct bpf_verifier_state *vstate,</div><div class='add'>+		      u32 frameno);</div><div class='add'>+</div><div class='add'>+struct bpf_subprog_info *bpf_find_containing_subprog(struct bpf_verifier_env *env, int off);</div><div class='add'>+int bpf_jmp_offset(struct bpf_insn *insn);</div><div class='add'>+struct bpf_iarray *bpf_insn_successors(struct bpf_verifier_env *env, u32 idx);</div><div class='add'>+void bpf_fmt_stack_mask(char *buf, ssize_t buf_sz, u64 stack_mask);</div><div class='add'>+bool bpf_calls_callback(struct bpf_verifier_env *env, int insn_idx);</div><div class='add'>+</div><div class='add'>+int bpf_stack_liveness_init(struct bpf_verifier_env *env);</div><div class='add'>+void bpf_stack_liveness_free(struct bpf_verifier_env *env);</div><div class='add'>+int bpf_update_live_stack(struct bpf_verifier_env *env);</div><div class='add'>+int bpf_mark_stack_read(struct bpf_verifier_env *env, u32 frameno, u32 insn_idx, u64 mask);</div><div class='add'>+void bpf_mark_stack_write(struct bpf_verifier_env *env, u32 frameno, u64 mask);</div><div class='add'>+int bpf_reset_stack_write_marks(struct bpf_verifier_env *env, u32 insn_idx);</div><div class='add'>+int bpf_commit_stack_write_marks(struct bpf_verifier_env *env);</div><div class='add'>+int bpf_live_stack_query_init(struct bpf_verifier_env *env, struct bpf_verifier_state *st);</div><div class='add'>+bool bpf_stack_slot_alive(struct bpf_verifier_env *env, u32 frameno, u32 spi);</div><div class='add'>+void bpf_reset_live_stack_callchain(struct bpf_verifier_env *env);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_BPF_VERIFIER_H */</div><div class='head'>diff --git a/include/linux/bpfptr.h b/include/linux/bpfptr.h<br/>index 79b2f78eec1a..f6e0795db484 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bpfptr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bpfptr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bpfptr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bpfptr.h</a></div><div class='hunk'>@@ -65,9 +65,9 @@ static inline int copy_to_bpfptr_offset(bpfptr_t dst, size_t offset,</div><div class='ctx'> 	return copy_to_sockptr_offset((sockptr_t) dst, offset, src, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kvmemdup_bpfptr(bpfptr_t src, size_t len)</div><div class='add'>+static inline void *kvmemdup_bpfptr_noprof(bpfptr_t src, size_t len)</div><div class='ctx'> {</div><div class='del'>-	void *p = kvmalloc(len, GFP_USER | __GFP_NOWARN);</div><div class='add'>+	void *p = kvmalloc_node_align_noprof(len, 1, GFP_USER | __GFP_NOWARN, NUMA_NO_NODE);</div><div class='ctx'> </div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -77,6 +77,7 @@ static inline void *kvmemdup_bpfptr(bpfptr_t src, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='add'>+#define kvmemdup_bpfptr(...)	alloc_hooks(kvmemdup_bpfptr_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> static inline long strncpy_from_bpfptr(char *dst, bpfptr_t src, size_t count)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h<br/>index 1394ba302367..115a964f3006 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/brcmphy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/brcmphy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/brcmphy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/brcmphy.h</a></div><div class='hunk'>@@ -137,6 +137,7 @@</div><div class='ctx'> </div><div class='ctx'> #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC			0x07</div><div class='ctx'> #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_WIRESPEED_EN	0x0010</div><div class='add'>+#define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RSVD		0x0060</div><div class='ctx'> #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_EN	0x0080</div><div class='ctx'> #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN	0x0100</div><div class='ctx'> #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX		0x0200</div><div class='hunk'>@@ -183,6 +184,12 @@</div><div class='ctx'> #define BCM_LED_MULTICOLOR_PROGRAM	0xa</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Broadcom Synchronous Ethernet Controls (expansion register 0x0E)</div><div class='add'>+ */</div><div class='add'>+#define BCM_EXP_SYNC_ETHERNET		(MII_BCM54XX_EXP_SEL_ER + 0x0E)</div><div class='add'>+#define BCM_EXP_SYNC_ETHERNET_MII_LITE	BIT(11)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * BCM5482: Shadow registers</div><div class='ctx'>  * Shadow values go into bits [14:10] of register 0x1c to select a shadow</div><div class='ctx'>  * register to access.</div><div class='hunk'>@@ -271,12 +278,100 @@</div><div class='ctx'> #define BCM5482_SSD_SGMII_SLAVE_EN	0x0002	/* Slave mode enable */</div><div class='ctx'> #define BCM5482_SSD_SGMII_SLAVE_AD	0x0001	/* Slave auto-detection */</div><div class='ctx'> </div><div class='add'>+/* BroadR-Reach LRE Registers. */</div><div class='add'>+#define MII_BCM54XX_LRECR		0x00	/* LRE Control Register                    */</div><div class='add'>+#define MII_BCM54XX_LRESR		0x01	/* LRE Status Register                     */</div><div class='add'>+#define MII_BCM54XX_LREPHYSID1		0x02	/* LRE PHYS ID 1                           */</div><div class='add'>+#define MII_BCM54XX_LREPHYSID2		0x03	/* LRE PHYS ID 2                           */</div><div class='add'>+#define MII_BCM54XX_LREANAA		0x04	/* LDS Auto-Negotiation Advertised Ability */</div><div class='add'>+#define MII_BCM54XX_LREANAC		0x05	/* LDS Auto-Negotiation Advertised Control */</div><div class='add'>+#define MII_BCM54XX_LREANPT		0x06	/* LDS Ability Next Page Transmit          */</div><div class='add'>+#define MII_BCM54XX_LRELPA		0x07	/* LDS Link Partner Ability                */</div><div class='add'>+#define MII_BCM54XX_LRELPNPM		0x08	/* LDS Link Partner Next Page Message      */</div><div class='add'>+#define MII_BCM54XX_LRELPNPC		0x09	/* LDS Link Partner Next Page Control      */</div><div class='add'>+#define MII_BCM54XX_LRELDSE		0x0a	/* LDS Expansion Register                  */</div><div class='add'>+#define MII_BCM54XX_LREES		0x0f	/* LRE Extended Status                     */</div><div class='add'>+</div><div class='add'>+/* LRE control register. */</div><div class='add'>+#define LRECR_RESET			0x8000	/* Reset to default state      */</div><div class='add'>+#define LRECR_LOOPBACK			0x4000	/* Internal Loopback           */</div><div class='add'>+#define LRECR_LDSRES			0x2000	/* Restart LDS Process         */</div><div class='add'>+#define LRECR_LDSEN			0x1000	/* LDS Enable                  */</div><div class='add'>+#define LRECR_PDOWN			0x0800	/* Enable low power state      */</div><div class='add'>+#define LRECR_ISOLATE			0x0400	/* Isolate data paths from MII */</div><div class='add'>+#define LRECR_SPEED100			0x0200	/* Select 100 Mbps             */</div><div class='add'>+#define LRECR_SPEED10			0x0000	/* Select 10 Mbps              */</div><div class='add'>+#define LRECR_4PAIRS			0x0020	/* Select 4 Pairs              */</div><div class='add'>+#define LRECR_2PAIRS			0x0010	/* Select 2 Pairs              */</div><div class='add'>+#define LRECR_1PAIR			0x0000	/* Select 1 Pair               */</div><div class='add'>+#define LRECR_MASTER			0x0008	/* Force Master when LDS disabled */</div><div class='add'>+#define LRECR_SLAVE			0x0000	/* Force Slave when LDS disabled  */</div><div class='add'>+</div><div class='add'>+/* LRE status register. */</div><div class='add'>+#define LRESR_100_1PAIR			0x2000	/* Can do 100Mbps 1 Pair       */</div><div class='add'>+#define LRESR_100_4PAIR			0x1000	/* Can do 100Mbps 4 Pairs      */</div><div class='add'>+#define LRESR_100_2PAIR			0x0800	/* Can do 100Mbps 2 Pairs      */</div><div class='add'>+#define LRESR_10_2PAIR			0x0400	/* Can do 10Mbps 2 Pairs       */</div><div class='add'>+#define LRESR_10_1PAIR			0x0200	/* Can do 10Mbps 1 Pair        */</div><div class='add'>+#define LRESR_ESTATEN			0x0100	/* Extended Status in R15      */</div><div class='add'>+#define LRESR_RESV			0x0080	/* Unused...                   */</div><div class='add'>+#define LRESR_MFPS			0x0040	/* Can suppress Management Frames Preamble */</div><div class='add'>+#define LRESR_LDSCOMPLETE		0x0020	/* LDS Auto-negotiation complete */</div><div class='add'>+#define LRESR_8023			0x0010	/* Has IEEE 802.3 Support      */</div><div class='add'>+#define LRESR_LDSABILITY		0x0008	/* LDS auto-negotiation capable */</div><div class='add'>+#define LRESR_LSTATUS			0x0004	/* Link status                 */</div><div class='add'>+#define LRESR_JCD			0x0002	/* Jabber detected             */</div><div class='add'>+#define LRESR_ERCAP			0x0001	/* Ext-reg capability          */</div><div class='add'>+</div><div class='add'>+/* LDS Auto-Negotiation Advertised Ability. */</div><div class='add'>+#define LREANAA_PAUSE_ASYM		0x8000	/* Can pause asymmetrically    */</div><div class='add'>+#define LREANAA_PAUSE			0x4000	/* Can pause                   */</div><div class='add'>+#define LREANAA_100_1PAIR		0x0020	/* Can do 100Mbps 1 Pair       */</div><div class='add'>+#define LREANAA_100_4PAIR		0x0010	/* Can do 100Mbps 4 Pair       */</div><div class='add'>+#define LREANAA_100_2PAIR		0x0008	/* Can do 100Mbps 2 Pair       */</div><div class='add'>+#define LREANAA_10_2PAIR		0x0004	/* Can do 10Mbps 2 Pair        */</div><div class='add'>+#define LREANAA_10_1PAIR		0x0002	/* Can do 10Mbps 1 Pair        */</div><div class='add'>+</div><div class='add'>+#define LRE_ADVERTISE_FULL		(LREANAA_100_1PAIR | LREANAA_100_4PAIR | \</div><div class='add'>+					 LREANAA_100_2PAIR | LREANAA_10_2PAIR | \</div><div class='add'>+					 LREANAA_10_1PAIR)</div><div class='add'>+</div><div class='add'>+#define LRE_ADVERTISE_ALL		LRE_ADVERTISE_FULL</div><div class='add'>+</div><div class='add'>+/* LDS Link Partner Ability. */</div><div class='add'>+#define LRELPA_PAUSE_ASYM		0x8000	/* Supports asymmetric pause   */</div><div class='add'>+#define LRELPA_PAUSE			0x4000	/* Supports pause capability   */</div><div class='add'>+#define LRELPA_100_1PAIR		0x0020	/* 100Mbps 1 Pair capable      */</div><div class='add'>+#define LRELPA_100_4PAIR		0x0010	/* 100Mbps 4 Pair capable      */</div><div class='add'>+#define LRELPA_100_2PAIR		0x0008	/* 100Mbps 2 Pair capable      */</div><div class='add'>+#define LRELPA_10_2PAIR			0x0004	/* 10Mbps 2 Pair capable       */</div><div class='add'>+#define LRELPA_10_1PAIR			0x0002	/* 10Mbps 1 Pair capable       */</div><div class='add'>+</div><div class='add'>+/* LDS Expansion register. */</div><div class='add'>+#define LDSE_DOWNGRADE			0x8000	/* Can do LDS Speed Downgrade  */</div><div class='add'>+#define LDSE_MASTER			0x4000	/* Master / Slave              */</div><div class='add'>+#define LDSE_PAIRS_MASK			0x3000	/* Pair Count Mask             */</div><div class='add'>+#define LDSE_PAIRS_SHIFT		12</div><div class='add'>+#define LDSE_4PAIRS			(2 &lt;&lt; LDSE_PAIRS_SHIFT)	/* 4 Pairs Connection */</div><div class='add'>+#define LDSE_2PAIRS			(1 &lt;&lt; LDSE_PAIRS_SHIFT)	/* 2 Pairs Connection */</div><div class='add'>+#define LDSE_1PAIR			(0 &lt;&lt; LDSE_PAIRS_SHIFT)	/* 1 Pair  Connection */</div><div class='add'>+#define LDSE_CABLEN_MASK		0x0FFF	/* Cable Length Mask           */</div><div class='add'>+</div><div class='ctx'> /* BCM54810 Registers */</div><div class='ctx'> #define BCM54810_EXP_BROADREACH_LRE_MISC_CTL	(MII_BCM54XX_EXP_SEL_ER + 0x90)</div><div class='ctx'> #define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN	(1 &lt;&lt; 0)</div><div class='ctx'> #define BCM54810_SHD_CLK_CTL			0x3</div><div class='ctx'> #define BCM54810_SHD_CLK_CTL_GTXCLK_EN		(1 &lt;&lt; 9)</div><div class='ctx'> </div><div class='add'>+/* BCM54811 Registers */</div><div class='add'>+#define BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL	(MII_BCM54XX_EXP_SEL_ER + 0x9A)</div><div class='add'>+/* Access Control Override Enable */</div><div class='add'>+#define BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL_EN		BIT(15)</div><div class='add'>+/* Access Control Override Value */</div><div class='add'>+#define BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL_OVERRIDE_VAL	BIT(14)</div><div class='add'>+/* Access Control Value */</div><div class='add'>+#define BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL_VAL		BIT(13)</div><div class='add'>+</div><div class='ctx'> /* BCM54612E Registers */</div><div class='ctx'> #define BCM54612E_EXP_SPARE0		(MII_BCM54XX_EXP_SEL_ETC + 0x34)</div><div class='ctx'> #define BCM54612E_LED4_CLK125OUT_EN	(1 &lt;&lt; 1)</div><div class='head'>diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h<br/>index 9e97ced2896d..14fa93268630 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bsg-lib.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bsg-lib.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bsg-lib.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bsg-lib.h</a></div><div class='hunk'>@@ -65,7 +65,8 @@ struct bsg_job {</div><div class='ctx'> void bsg_job_done(struct bsg_job *job, int result,</div><div class='ctx'> 		  unsigned int reply_payload_rcv_len);</div><div class='ctx'> struct request_queue *bsg_setup_queue(struct device *dev, const char *name,</div><div class='del'>-		bsg_job_fn *job_fn, bsg_timeout_fn *timeout, int dd_job_size);</div><div class='add'>+		struct queue_limits *lim, bsg_job_fn *job_fn,</div><div class='add'>+		bsg_timeout_fn *timeout, int dd_job_size);</div><div class='ctx'> void bsg_remove_queue(struct request_queue *q);</div><div class='ctx'> void bsg_job_put(struct bsg_job *job);</div><div class='ctx'> int __must_check bsg_job_get(struct bsg_job *job);</div><div class='head'>diff --git a/include/linux/btf.h b/include/linux/btf.h<br/>index f9e56fd12a9f..f06976ffb63f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/btf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/btf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/btf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/btf.h</a></div><div class='hunk'>@@ -75,6 +75,10 @@</div><div class='ctx'> #define KF_ITER_NEXT    (1 &lt;&lt; 9) /* kfunc implements BPF iter next method */</div><div class='ctx'> #define KF_ITER_DESTROY (1 &lt;&lt; 10) /* kfunc implements BPF iter destructor */</div><div class='ctx'> #define KF_RCU_PROTECTED (1 &lt;&lt; 11) /* kfunc should be protected by rcu cs when they are invoked */</div><div class='add'>+#define KF_FASTCALL     (1 &lt;&lt; 12) /* kfunc supports bpf_fastcall protocol */</div><div class='add'>+#define KF_ARENA_RET    (1 &lt;&lt; 13) /* kfunc returns an arena pointer */</div><div class='add'>+#define KF_ARENA_ARG1   (1 &lt;&lt; 14) /* kfunc takes an arena pointer as its first argument */</div><div class='add'>+#define KF_ARENA_ARG2   (1 &lt;&lt; 15) /* kfunc takes an arena pointer as its second argument */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Tag marking a kernel function as a kfunc. This is meant to minimize the</div><div class='hunk'>@@ -82,7 +86,7 @@</div><div class='ctx'>  * as to avoid issues such as the compiler inlining or eliding either a static</div><div class='ctx'>  * kfunc, or a global kfunc in an LTO build.</div><div class='ctx'>  */</div><div class='del'>-#define __bpf_kfunc __used noinline</div><div class='add'>+#define __bpf_kfunc __used __retain __noclone noinline</div><div class='ctx'> </div><div class='ctx'> #define __bpf_kfunc_start_defs()					       \</div><div class='ctx'> 	__diag_push();							       \</div><div class='hunk'>@@ -140,6 +144,7 @@ extern const struct file_operations btf_fops;</div><div class='ctx'> const char *btf_get_name(const struct btf *btf);</div><div class='ctx'> void btf_get(struct btf *btf);</div><div class='ctx'> void btf_put(struct btf *btf);</div><div class='add'>+const struct btf_header *btf_header(const struct btf *btf);</div><div class='ctx'> int btf_new_fd(const union bpf_attr *attr, bpfptr_t uattr, u32 uattr_sz);</div><div class='ctx'> struct btf *btf_get_by_fd(int fd);</div><div class='ctx'> int btf_get_info_by_fd(const struct btf *btf,</div><div class='hunk'>@@ -212,8 +217,13 @@ int btf_get_fd_by_id(u32 id);</div><div class='ctx'> u32 btf_obj_id(const struct btf *btf);</div><div class='ctx'> bool btf_is_kernel(const struct btf *btf);</div><div class='ctx'> bool btf_is_module(const struct btf *btf);</div><div class='add'>+bool btf_is_vmlinux(const struct btf *btf);</div><div class='ctx'> struct module *btf_try_get_module(const struct btf *btf);</div><div class='ctx'> u32 btf_nr_types(const struct btf *btf);</div><div class='add'>+struct btf *btf_base_btf(const struct btf *btf);</div><div class='add'>+bool btf_type_is_i32(const struct btf_type *t);</div><div class='add'>+bool btf_type_is_i64(const struct btf_type *t);</div><div class='add'>+bool btf_type_is_primitive(const struct btf_type *t);</div><div class='ctx'> bool btf_member_is_reg_int(const struct btf *btf, const struct btf_type *s,</div><div class='ctx'> 			   const struct btf_member *m,</div><div class='ctx'> 			   u32 expected_offset, u32 expected_size);</div><div class='hunk'>@@ -339,11 +349,21 @@ static inline u8 btf_int_offset(const struct btf_type *t)</div><div class='ctx'> 	return BTF_INT_OFFSET(*(u32 *)(t + 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline __u8 btf_int_bits(const struct btf_type *t)</div><div class='add'>+{</div><div class='add'>+	return BTF_INT_BITS(*(__u32 *)(t + 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool btf_type_is_scalar(const struct btf_type *t)</div><div class='ctx'> {</div><div class='ctx'> 	return btf_type_is_int(t) || btf_type_is_enum(t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool btf_type_is_fwd(const struct btf_type *t)</div><div class='add'>+{</div><div class='add'>+	return BTF_INFO_KIND(t-&gt;info) == BTF_KIND_FWD;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool btf_type_is_typedef(const struct btf_type *t)</div><div class='ctx'> {</div><div class='ctx'> 	return BTF_INFO_KIND(t-&gt;info) == BTF_KIND_TYPEDEF;</div><div class='hunk'>@@ -478,6 +498,11 @@ static inline struct btf_param *btf_params(const struct btf_type *t)</div><div class='ctx'> 	return (struct btf_param *)(t + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct btf_decl_tag *btf_decl_tag(const struct btf_type *t)</div><div class='add'>+{</div><div class='add'>+	return (struct btf_decl_tag *)(t + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int btf_id_cmp_func(const void *a, const void *b)</div><div class='ctx'> {</div><div class='ctx'> 	const int *pa = a, *pb = b;</div><div class='hunk'>@@ -500,6 +525,7 @@ bool btf_param_match_suffix(const struct btf *btf,</div><div class='ctx'> 			    const char *suffix);</div><div class='ctx'> int btf_ctx_arg_offset(const struct btf *btf, const struct btf_type *func_proto,</div><div class='ctx'> 		       u32 arg_no);</div><div class='add'>+u32 btf_ctx_arg_idx(struct btf *btf, const struct btf_type *func_proto, int off);</div><div class='ctx'> </div><div class='ctx'> struct bpf_verifier_log;</div><div class='ctx'> </div><div class='hunk'>@@ -515,9 +541,38 @@ static inline const struct bpf_struct_ops_desc *bpf_struct_ops_find(struct btf *</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+enum btf_field_iter_kind {</div><div class='add'>+	BTF_FIELD_ITER_IDS,</div><div class='add'>+	BTF_FIELD_ITER_STRS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct btf_field_desc {</div><div class='add'>+	/* once-per-type offsets */</div><div class='add'>+	int t_off_cnt, t_offs[2];</div><div class='add'>+	/* member struct size, or zero, if no members */</div><div class='add'>+	int m_sz;</div><div class='add'>+	/* repeated per-member offsets */</div><div class='add'>+	int m_off_cnt, m_offs[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct btf_field_iter {</div><div class='add'>+	struct btf_field_desc desc;</div><div class='add'>+	void *p;</div><div class='add'>+	int m_idx;</div><div class='add'>+	int off_idx;</div><div class='add'>+	int vlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BPF_SYSCALL</div><div class='ctx'> const struct btf_type *btf_type_by_id(const struct btf *btf, u32 type_id);</div><div class='add'>+void btf_set_base_btf(struct btf *btf, const struct btf *base_btf);</div><div class='add'>+int btf_relocate(struct btf *btf, const struct btf *base_btf, __u32 **map_ids);</div><div class='add'>+int btf_field_iter_init(struct btf_field_iter *it, struct btf_type *t,</div><div class='add'>+			enum btf_field_iter_kind iter_kind);</div><div class='add'>+__u32 *btf_field_iter_next(struct btf_field_iter *it);</div><div class='add'>+</div><div class='ctx'> const char *btf_name_by_offset(const struct btf *btf, u32 offset);</div><div class='add'>+const char *btf_str_by_offset(const struct btf *btf, u32 offset);</div><div class='ctx'> struct btf *btf_parse_vmlinux(void);</div><div class='ctx'> struct btf *bpf_prog_get_target_btf(const struct bpf_prog *prog);</div><div class='ctx'> u32 *btf_kfunc_id_set_contains(const struct btf *btf, u32 kfunc_btf_id,</div><div class='hunk'>@@ -531,18 +586,52 @@ s32 btf_find_dtor_kfunc(struct btf *btf, u32 btf_id);</div><div class='ctx'> int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_cnt,</div><div class='ctx'> 				struct module *owner);</div><div class='ctx'> struct btf_struct_meta *btf_find_struct_meta(const struct btf *btf, u32 btf_id);</div><div class='add'>+bool btf_is_projection_of(const char *pname, const char *tname);</div><div class='ctx'> bool btf_is_prog_ctx_type(struct bpf_verifier_log *log, const struct btf *btf,</div><div class='ctx'> 			   const struct btf_type *t, enum bpf_prog_type prog_type,</div><div class='ctx'> 			   int arg);</div><div class='ctx'> int get_kern_ctx_btf_id(struct bpf_verifier_log *log, enum bpf_prog_type prog_type);</div><div class='ctx'> bool btf_types_are_same(const struct btf *btf1, u32 id1,</div><div class='ctx'> 			const struct btf *btf2, u32 id2);</div><div class='add'>+int btf_check_iter_arg(struct btf *btf, const struct btf_type *func, int arg_idx);</div><div class='add'>+</div><div class='add'>+static inline bool btf_type_is_struct_ptr(struct btf *btf, const struct btf_type *t)</div><div class='add'>+{</div><div class='add'>+	if (!btf_type_is_ptr(t))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	t = btf_type_skip_modifiers(btf, t-&gt;type, NULL);</div><div class='add'>+</div><div class='add'>+	return btf_type_is_struct(t);</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline const struct btf_type *btf_type_by_id(const struct btf *btf,</div><div class='ctx'> 						    u32 type_id)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void btf_set_base_btf(struct btf *btf, const struct btf *base_btf)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int btf_relocate(void *log, struct btf *btf, const struct btf *base_btf,</div><div class='add'>+			       __u32 **map_ids)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int btf_field_iter_init(struct btf_field_iter *it, struct btf_type *t,</div><div class='add'>+				      enum btf_field_iter_kind iter_kind)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u32 *btf_field_iter_next(struct btf_field_iter *it)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline const char *btf_name_by_offset(const struct btf *btf,</div><div class='ctx'> 					     u32 offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -589,16 +678,9 @@ static inline bool btf_types_are_same(const struct btf *btf1, u32 id1,</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline bool btf_type_is_struct_ptr(struct btf *btf, const struct btf_type *t)</div><div class='add'>+static inline int btf_check_iter_arg(struct btf *btf, const struct btf_type *func, int arg_idx)</div><div class='ctx'> {</div><div class='del'>-	if (!btf_type_is_ptr(t))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	t = btf_type_skip_modifiers(btf, t-&gt;type, NULL);</div><div class='del'>-</div><div class='del'>-	return btf_type_is_struct(t);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h<br/>index e24aabfe8ecc..139bdececdcf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/btf_ids.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/btf_ids.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/btf_ids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/btf_ids.h</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'> #ifndef _LINUX_BTF_IDS_H</div><div class='ctx'> #define _LINUX_BTF_IDS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt; /* for u32 */</div><div class='add'>+</div><div class='ctx'> struct btf_id_set {</div><div class='ctx'> 	u32 cnt;</div><div class='ctx'> 	u32 ids[];</div><div class='hunk'>@@ -281,5 +283,6 @@ extern u32 btf_tracing_ids[];</div><div class='ctx'> extern u32 bpf_cgroup_btf_id[];</div><div class='ctx'> extern u32 bpf_local_storage_map_btf_id[];</div><div class='ctx'> extern u32 btf_bpf_map_id[];</div><div class='add'>+extern u32 bpf_kmem_cache_btf_id[];</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h<br/>index d78454a4dd1f..b16b88bfbc3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/buffer_head.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/buffer_head.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/buffer_head.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/buffer_head.h</a></div><div class='hunk'>@@ -34,6 +34,7 @@ enum bh_state_bits {</div><div class='ctx'> 	BH_Meta,	/* Buffer contains metadata */</div><div class='ctx'> 	BH_Prio,	/* Buffer should be submitted with REQ_PRIO */</div><div class='ctx'> 	BH_Defer_Completion, /* Defer AIO completion to workqueue */</div><div class='add'>+	BH_Migrate,     /* Buffer is being migrated (norefs) */</div><div class='ctx'> </div><div class='ctx'> 	BH_PrivateStart,/* not a state bit, but the first bit available</div><div class='ctx'> 			 * for private allocation by other entities</div><div class='hunk'>@@ -53,7 +54,7 @@ typedef void (bh_end_io_t)(struct buffer_head *bh, int uptodate);</div><div class='ctx'>  * filesystem and block layers.  Nowadays the basic I/O unit</div><div class='ctx'>  * is the bio, and buffer_heads are used for extracting block</div><div class='ctx'>  * mappings (via a get_block_t call), for tracking state within</div><div class='del'>- * a page (via a page_mapping) and for wrapping bio submission</div><div class='add'>+ * a folio (via a folio_mapping) and for wrapping bio submission</div><div class='ctx'>  * for backward compatibility reasons (e.g. submit_bh).</div><div class='ctx'>  */</div><div class='ctx'> struct buffer_head {</div><div class='hunk'>@@ -182,7 +183,6 @@ static inline unsigned long bh_offset(const struct buffer_head *bh)</div><div class='ctx'> 		BUG_ON(!PagePrivate(page));			\</div><div class='ctx'> 		((struct buffer_head *)page_private(page));	\</div><div class='ctx'> 	})</div><div class='del'>-#define page_has_buffers(page)	PagePrivate(page)</div><div class='ctx'> #define folio_buffers(folio)		folio_get_private(folio)</div><div class='ctx'> </div><div class='ctx'> void buffer_check_dirty_writeback(struct folio *folio,</div><div class='hunk'>@@ -199,8 +199,7 @@ void folio_set_bh(struct buffer_head *bh, struct folio *folio,</div><div class='ctx'> 		  unsigned long offset);</div><div class='ctx'> struct buffer_head *folio_alloc_buffers(struct folio *folio, unsigned long size,</div><div class='ctx'> 					gfp_t gfp);</div><div class='del'>-struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size,</div><div class='del'>-		bool retry);</div><div class='add'>+struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size);</div><div class='ctx'> struct buffer_head *create_empty_buffers(struct folio *folio,</div><div class='ctx'> 		unsigned long blocksize, unsigned long b_state);</div><div class='ctx'> void end_buffer_read_sync(struct buffer_head *bh, int uptodate);</div><div class='hunk'>@@ -224,6 +223,8 @@ void __wait_on_buffer(struct buffer_head *);</div><div class='ctx'> wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);</div><div class='ctx'> struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block,</div><div class='ctx'> 			unsigned size);</div><div class='add'>+struct buffer_head *__find_get_block_nonatomic(struct block_device *bdev,</div><div class='add'>+			sector_t block, unsigned size);</div><div class='ctx'> struct buffer_head *bdev_getblk(struct block_device *bdev, sector_t block,</div><div class='ctx'> 		unsigned size, gfp_t gfp);</div><div class='ctx'> void __brelse(struct buffer_head *);</div><div class='hunk'>@@ -258,21 +259,19 @@ int __block_write_full_folio(struct inode *inode, struct folio *folio,</div><div class='ctx'> int block_read_full_folio(struct folio *, get_block_t *);</div><div class='ctx'> bool block_is_partially_uptodate(struct folio *, size_t from, size_t count);</div><div class='ctx'> int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,</div><div class='del'>-		struct page **pagep, get_block_t *get_block);</div><div class='del'>-int __block_write_begin(struct page *page, loff_t pos, unsigned len,</div><div class='add'>+		struct folio **foliop, get_block_t *get_block);</div><div class='add'>+int __block_write_begin(struct folio *folio, loff_t pos, unsigned len,</div><div class='ctx'> 		get_block_t *get_block);</div><div class='del'>-int block_write_end(struct file *, struct address_space *,</div><div class='del'>-				loff_t, unsigned, unsigned,</div><div class='del'>-				struct page *, void *);</div><div class='del'>-int generic_write_end(struct file *, struct address_space *,</div><div class='del'>-				loff_t, unsigned, unsigned,</div><div class='del'>-				struct page *, void *);</div><div class='add'>+int block_write_end(loff_t pos, unsigned len, unsigned copied, struct folio *);</div><div class='add'>+int generic_write_end(const struct kiocb *, struct address_space *,</div><div class='add'>+				loff_t, unsigned len, unsigned copied,</div><div class='add'>+				struct folio *, void *);</div><div class='ctx'> void folio_zero_new_buffers(struct folio *folio, size_t from, size_t to);</div><div class='del'>-int cont_write_begin(struct file *, struct address_space *, loff_t,</div><div class='del'>-			unsigned, struct page **, void **,</div><div class='add'>+int cont_write_begin(const struct kiocb *, struct address_space *, loff_t,</div><div class='add'>+			unsigned, struct folio **, void **,</div><div class='ctx'> 			get_block_t *, loff_t *);</div><div class='ctx'> int generic_cont_expand_simple(struct inode *inode, loff_t size);</div><div class='del'>-void block_commit_write(struct page *page, unsigned int from, unsigned int to);</div><div class='add'>+void block_commit_write(struct folio *folio, size_t from, size_t to);</div><div class='ctx'> int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,</div><div class='ctx'> 				get_block_t get_block);</div><div class='ctx'> sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);</div><div class='hunk'>@@ -303,12 +302,38 @@ static inline void put_bh(struct buffer_head *bh)</div><div class='ctx'>         atomic_dec(&amp;bh-&gt;b_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * brelse - Release a buffer.</div><div class='add'>+ * @bh: The buffer to release.</div><div class='add'>+ *</div><div class='add'>+ * Decrement a buffer_head's reference count.  If @bh is NULL, this</div><div class='add'>+ * function is a no-op.</div><div class='add'>+ *</div><div class='add'>+ * If all buffers on a folio have zero reference count, are clean</div><div class='add'>+ * and unlocked, and if the folio is unlocked and not under writeback</div><div class='add'>+ * then try_to_free_buffers() may strip the buffers from the folio in</div><div class='add'>+ * preparation for freeing it (sometimes, rarely, buffers are removed</div><div class='add'>+ * from a folio but it ends up not being freed, and buffers may later</div><div class='add'>+ * be reattached).</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='ctx'> static inline void brelse(struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	if (bh)</div><div class='ctx'> 		__brelse(bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bforget - Discard any dirty data in a buffer.</div><div class='add'>+ * @bh: The buffer to forget.</div><div class='add'>+ *</div><div class='add'>+ * Call this function instead of brelse() if the data written to a buffer</div><div class='add'>+ * no longer needs to be written back.  It will clear the buffer's dirty</div><div class='add'>+ * flag so writeback of this buffer will be skipped.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='ctx'> static inline void bforget(struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	if (bh)</div><div class='hunk'>@@ -338,7 +363,7 @@ static inline struct buffer_head *getblk_unmovable(struct block_device *bdev,</div><div class='ctx'> {</div><div class='ctx'> 	gfp_t gfp;</div><div class='ctx'> </div><div class='del'>-	gfp = mapping_gfp_constraint(bdev-&gt;bd_inode-&gt;i_mapping, ~__GFP_FS);</div><div class='add'>+	gfp = mapping_gfp_constraint(bdev-&gt;bd_mapping, ~__GFP_FS);</div><div class='ctx'> 	gfp |= __GFP_NOFAIL;</div><div class='ctx'> </div><div class='ctx'> 	return bdev_getblk(bdev, block, size, gfp);</div><div class='hunk'>@@ -349,7 +374,7 @@ static inline struct buffer_head *__getblk(struct block_device *bdev,</div><div class='ctx'> {</div><div class='ctx'> 	gfp_t gfp;</div><div class='ctx'> </div><div class='del'>-	gfp = mapping_gfp_constraint(bdev-&gt;bd_inode-&gt;i_mapping, ~__GFP_FS);</div><div class='add'>+	gfp = mapping_gfp_constraint(bdev-&gt;bd_mapping, ~__GFP_FS);</div><div class='ctx'> 	gfp |= __GFP_MOVABLE | __GFP_NOFAIL;</div><div class='ctx'> </div><div class='ctx'> 	return bdev_getblk(bdev, block, size, gfp);</div><div class='hunk'>@@ -373,6 +398,12 @@ sb_find_get_block(struct super_block *sb, sector_t block)</div><div class='ctx'> 	return __find_get_block(sb-&gt;s_bdev, block, sb-&gt;s_blocksize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct buffer_head *</div><div class='add'>+sb_find_get_block_nonatomic(struct super_block *sb, sector_t block)</div><div class='add'>+{</div><div class='add'>+	return __find_get_block_nonatomic(sb-&gt;s_bdev, block, sb-&gt;s_blocksize);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void</div><div class='ctx'> map_bh(struct buffer_head *bh, struct super_block *sb, sector_t block)</div><div class='ctx'> {</div><div class='hunk'>@@ -437,17 +468,21 @@ static inline void bh_readahead_batch(int nr, struct buffer_head *bhs[],</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  __bread() - reads a specified block and returns the bh</div><div class='del'>- *  @bdev: the block_device to read from</div><div class='del'>- *  @block: number of block</div><div class='del'>- *  @size: size (in bytes) to read</div><div class='add'>+ * __bread() - Read a block.</div><div class='add'>+ * @bdev: The block device to read from.</div><div class='add'>+ * @block: Block number in units of block size.</div><div class='add'>+ * @size: The block size of this device in bytes.</div><div class='add'>+ *</div><div class='add'>+ * Read a specified block, and return the buffer head that refers</div><div class='add'>+ * to it.  The memory is allocated from the movable area so that it can</div><div class='add'>+ * be migrated.  The returned buffer head has its refcount increased.</div><div class='add'>+ * The caller should call brelse() when it has finished with the buffer.</div><div class='ctx'>  *</div><div class='del'>- *  Reads a specified block, and returns buffer head that contains it.</div><div class='del'>- *  The page cache is allocated from movable area so that it can be migrated.</div><div class='del'>- *  It returns NULL if the block was unreadable.</div><div class='add'>+ * Context: May sleep waiting for I/O.</div><div class='add'>+ * Return: NULL if the block was unreadable.</div><div class='ctx'>  */</div><div class='del'>-static inline struct buffer_head *</div><div class='del'>-__bread(struct block_device *bdev, sector_t block, unsigned size)</div><div class='add'>+static inline struct buffer_head *__bread(struct block_device *bdev,</div><div class='add'>+		sector_t block, unsigned size)</div><div class='ctx'> {</div><div class='ctx'> 	return __bread_gfp(bdev, block, size, __GFP_MOVABLE);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/bug.h b/include/linux/bug.h<br/>index 348acf2558f3..17a4933c611b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bug.h</a></div><div class='hunk'>@@ -42,6 +42,7 @@ void bug_get_file_line(struct bug_entry *bug, const char **file,</div><div class='ctx'> struct bug_entry *find_bug(unsigned long bugaddr);</div><div class='ctx'> </div><div class='ctx'> enum bug_trap_type report_bug(unsigned long bug_addr, struct pt_regs *regs);</div><div class='add'>+enum bug_trap_type report_bug_entry(struct bug_entry *bug, struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> /* These are defined by the architecture */</div><div class='ctx'> int is_valid_bugaddr(unsigned long addr);</div><div class='hunk'>@@ -62,6 +63,13 @@ static inline enum bug_trap_type report_bug(unsigned long bug_addr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct bug_entry;</div><div class='add'>+</div><div class='add'>+static inline enum bug_trap_type</div><div class='add'>+report_bug_entry(struct bug_entry *bug, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return BUG_TRAP_TYPE_BUG;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void bug_get_file_line(struct bug_entry *bug, const char **file,</div><div class='ctx'> 				     unsigned int *line)</div><div class='ctx'> {</div><div class='hunk'>@@ -73,15 +81,23 @@ static inline void generic_bug_clear_once(void) {}</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_GENERIC_BUG */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PRINTK</div><div class='add'>+void mem_dump_obj(void *object);</div><div class='add'>+#else</div><div class='add'>+static inline void mem_dump_obj(void *object) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Since detected data corruption should stop operation on the affected</div><div class='ctx'>  * structures. Return value must be checked and sanely acted on by caller.</div><div class='ctx'>  */</div><div class='ctx'> static inline __must_check bool check_data_corruption(bool v) { return v; }</div><div class='del'>-#define CHECK_DATA_CORRUPTION(condition, fmt, ...)			 \</div><div class='add'>+#define CHECK_DATA_CORRUPTION(condition, addr, fmt, ...)		 \</div><div class='ctx'> 	check_data_corruption(({					 \</div><div class='ctx'> 		bool corruption = unlikely(condition);			 \</div><div class='ctx'> 		if (corruption) {					 \</div><div class='add'>+			if (addr)					 \</div><div class='add'>+				mem_dump_obj(addr);			 \</div><div class='ctx'> 			if (IS_ENABLED(CONFIG_BUG_ON_DATA_CORRUPTION)) { \</div><div class='ctx'> 				pr_err(fmt, ##__VA_ARGS__);		 \</div><div class='ctx'> 				BUG();					 \</div><div class='head'>diff --git a/include/linux/build_bug.h b/include/linux/build_bug.h<br/>index 3aa3640f8c18..2cfbb4c65c78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/build_bug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/build_bug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/build_bug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/build_bug.h</a></div><div class='hunk'>@@ -4,17 +4,17 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef __CHECKER__</div><div class='del'>-#define BUILD_BUG_ON_ZERO(e) (0)</div><div class='del'>-#else /* __CHECKER__ */</div><div class='ctx'> /*</div><div class='ctx'>  * Force a compilation error if condition is true, but also produce a</div><div class='ctx'>  * result (of value 0 and type int), so the expression can be used</div><div class='ctx'>  * e.g. in a structure initializer (or where-ever else comma expressions</div><div class='ctx'>  * aren't permitted).</div><div class='add'>+ *</div><div class='add'>+ * Take an error message as an optional second argument. If omitted,</div><div class='add'>+ * default to the stringification of the tested expression.</div><div class='ctx'>  */</div><div class='del'>-#define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))</div><div class='del'>-#endif /* __CHECKER__ */</div><div class='add'>+#define BUILD_BUG_ON_ZERO(e, ...) \</div><div class='add'>+	__BUILD_BUG_ON_ZERO_MSG(e, ##__VA_ARGS__, #e " is true")</div><div class='ctx'> </div><div class='ctx'> /* Force a compilation error if a constant expression is not a power of 2 */</div><div class='ctx'> #define __BUILD_BUG_ON_NOT_POWER_OF_2(n)	\</div><div class='head'>diff --git a/include/linux/buildid.h b/include/linux/buildid.h<br/>index 8a582d242f06..831c1b4b626c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/buildid.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/buildid.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/buildid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/buildid.h</a></div><div class='hunk'>@@ -7,15 +7,40 @@</div><div class='ctx'> #define BUILD_ID_SIZE_MAX 20</div><div class='ctx'> </div><div class='ctx'> struct vm_area_struct;</div><div class='del'>-int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id,</div><div class='del'>-		   __u32 *size);</div><div class='add'>+int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size);</div><div class='add'>+int build_id_parse_nofault(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size);</div><div class='ctx'> int build_id_parse_buf(const void *buf, unsigned char *build_id, u32 buf_size);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) || IS_ENABLED(CONFIG_CRASH_CORE)</div><div class='add'>+#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) || IS_ENABLED(CONFIG_VMCORE_INFO)</div><div class='ctx'> extern unsigned char vmlinux_build_id[BUILD_ID_SIZE_MAX];</div><div class='ctx'> void init_vmlinux_build_id(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline void init_vmlinux_build_id(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+struct freader {</div><div class='add'>+	void *buf;</div><div class='add'>+	u32 buf_sz;</div><div class='add'>+	int err;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			struct file *file;</div><div class='add'>+			struct folio *folio;</div><div class='add'>+			void *addr;</div><div class='add'>+			loff_t folio_off;</div><div class='add'>+			bool may_fault;</div><div class='add'>+		};</div><div class='add'>+		struct {</div><div class='add'>+			const char *data;</div><div class='add'>+			u64 data_sz;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void freader_init_from_file(struct freader *r, void *buf, u32 buf_sz,</div><div class='add'>+			    struct file *file, bool may_fault);</div><div class='add'>+void freader_init_from_mem(struct freader *r, const char *data, u64 data_sz);</div><div class='add'>+const void *freader_fetch(struct freader *r, loff_t file_off, size_t sz);</div><div class='add'>+void freader_cleanup(struct freader *r);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/bus/stm32_firewall_device.h b/include/linux/bus/stm32_firewall_device.h<br/>new file mode 100644<br/>index 000000000000..eaa7a3f54450<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bus/stm32_firewall_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bus/stm32_firewall_device.h</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023, STMicroelectronics - All Rights Reserved</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef STM32_FIREWALL_DEVICE_H</div><div class='add'>+#define STM32_FIREWALL_DEVICE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define STM32_FIREWALL_MAX_EXTRA_ARGS		5</div><div class='add'>+</div><div class='add'>+/* Opaque reference to stm32_firewall_controller */</div><div class='add'>+struct stm32_firewall_controller;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct stm32_firewall - Information on a device's firewall. Each device can have more than one</div><div class='add'>+ *			   firewall.</div><div class='add'>+ *</div><div class='add'>+ * @firewall_ctrl:		Pointer referencing a firewall controller of the device. It is</div><div class='add'>+ *				opaque so a device cannot manipulate the controller's ops or access</div><div class='add'>+ *				the controller's data</div><div class='add'>+ * @extra_args:			Extra arguments that are implementation dependent</div><div class='add'>+ * @entry:			Name of the firewall entry</div><div class='add'>+ * @extra_args_size:		Number of extra arguments</div><div class='add'>+ * @firewall_id:		Firewall ID associated the device for this firewall controller</div><div class='add'>+ */</div><div class='add'>+struct stm32_firewall {</div><div class='add'>+	struct stm32_firewall_controller *firewall_ctrl;</div><div class='add'>+	u32 extra_args[STM32_FIREWALL_MAX_EXTRA_ARGS];</div><div class='add'>+	const char *entry;</div><div class='add'>+	size_t extra_args_size;</div><div class='add'>+	u32 firewall_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_STM32_FIREWALL)</div><div class='add'>+/**</div><div class='add'>+ * stm32_firewall_get_firewall - Get the firewall(s) associated to given device.</div><div class='add'>+ *				 The firewall controller reference is always the first argument</div><div class='add'>+ *				 of each of the access-controller property entries.</div><div class='add'>+ *				 The firewall ID is always the second argument of each of the</div><div class='add'>+ *				 access-controller  property entries.</div><div class='add'>+ *				 If there's no argument linked to the phandle, then the firewall ID</div><div class='add'>+ *				 field is set to U32_MAX, which is an invalid ID.</div><div class='add'>+ *</div><div class='add'>+ * @np:				Device node to parse</div><div class='add'>+ * @firewall:			Array of firewall references</div><div class='add'>+ * @nb_firewall:		Number of firewall references to get. Must be at least 1.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -ENODEV if there's no match with a firewall controller or appropriate errno</div><div class='add'>+ * code if error occurred.</div><div class='add'>+ */</div><div class='add'>+int stm32_firewall_get_firewall(struct device_node *np, struct stm32_firewall *firewall,</div><div class='add'>+				unsigned int nb_firewall);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stm32_firewall_grant_access - Request firewall access rights and grant access.</div><div class='add'>+ *</div><div class='add'>+ * @firewall:			Firewall reference containing the ID to check against its firewall</div><div class='add'>+ *				controller</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if access is granted, -EACCES if access is denied, -ENODEV if firewall is null or</div><div class='add'>+ * appropriate errno code if error occurred</div><div class='add'>+ */</div><div class='add'>+int stm32_firewall_grant_access(struct stm32_firewall *firewall);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stm32_firewall_release_access - Release access granted from a call to</div><div class='add'>+ *				   stm32_firewall_grant_access().</div><div class='add'>+ *</div><div class='add'>+ * @firewall:			Firewall reference containing the ID to check against its firewall</div><div class='add'>+ *				controller</div><div class='add'>+ */</div><div class='add'>+void stm32_firewall_release_access(struct stm32_firewall *firewall);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stm32_firewall_grant_access_by_id - Request firewall access rights of a given device</div><div class='add'>+ *				       based on a specific firewall ID</div><div class='add'>+ *</div><div class='add'>+ * Warnings:</div><div class='add'>+ * There is no way to ensure that the given ID will correspond to the firewall referenced in the</div><div class='add'>+ * device node if the ID did not come from stm32_firewall_get_firewall(). In that case, this</div><div class='add'>+ * function must be used with caution.</div><div class='add'>+ * This function should be used for subsystem resources that do not have the same firewall ID</div><div class='add'>+ * as their parent.</div><div class='add'>+ * U32_MAX is an invalid ID.</div><div class='add'>+ *</div><div class='add'>+ * @firewall:			Firewall reference containing the firewall controller</div><div class='add'>+ * @subsystem_id:		Firewall ID of the subsystem resource</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if access is granted, -EACCES if access is denied, -ENODEV if firewall is null or</div><div class='add'>+ * appropriate errno code if error occurred</div><div class='add'>+ */</div><div class='add'>+int stm32_firewall_grant_access_by_id(struct stm32_firewall *firewall, u32 subsystem_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stm32_firewall_release_access_by_id - Release access granted from a call to</div><div class='add'>+ *					 stm32_firewall_grant_access_by_id().</div><div class='add'>+ *</div><div class='add'>+ * Warnings:</div><div class='add'>+ * There is no way to ensure that the given ID will correspond to the firewall referenced in the</div><div class='add'>+ * device node if the ID did not come from stm32_firewall_get_firewall(). In that case, this</div><div class='add'>+ * function must be used with caution.</div><div class='add'>+ * This function should be used for subsystem resources that do not have the same firewall ID</div><div class='add'>+ * as their parent.</div><div class='add'>+ * U32_MAX is an invalid ID.</div><div class='add'>+ *</div><div class='add'>+ * @firewall:			Firewall reference containing the firewall controller</div><div class='add'>+ * @subsystem_id:		Firewall ID of the subsystem resource</div><div class='add'>+ */</div><div class='add'>+void stm32_firewall_release_access_by_id(struct stm32_firewall *firewall, u32 subsystem_id);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_STM32_FIREWALL */</div><div class='add'>+</div><div class='add'>+static inline int stm32_firewall_get_firewall(struct device_node *np,</div><div class='add'>+					      struct stm32_firewall *firewall,</div><div class='add'>+					      unsigned int nb_firewall)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int stm32_firewall_grant_access(struct stm32_firewall *firewall)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void stm32_firewall_release_access(struct stm32_firewall *firewall)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int stm32_firewall_grant_access_by_id(struct stm32_firewall *firewall,</div><div class='add'>+						    u32 subsystem_id)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void stm32_firewall_release_access_by_id(struct stm32_firewall *firewall,</div><div class='add'>+						       u32 subsystem_id)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_STM32_FIREWALL */</div><div class='add'>+#endif /* STM32_FIREWALL_DEVICE_H */</div><div class='head'>diff --git a/include/linux/bvec.h b/include/linux/bvec.h<br/>index bd1e361b351c..3fc0efa0825b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/bvec.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/bvec.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/bvec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/bvec.h</a></div><div class='hunk'>@@ -22,11 +22,8 @@ struct page;</div><div class='ctx'>  * @bv_len:    Number of bytes in the address range.</div><div class='ctx'>  * @bv_offset: Start of the address range relative to the start of @bv_page.</div><div class='ctx'>  *</div><div class='del'>- * The following holds for a bvec if n * PAGE_SIZE &lt; bv_offset + bv_len:</div><div class='del'>- *</div><div class='del'>- *   nth_page(@bv_page, n) == @bv_page + n</div><div class='del'>- *</div><div class='del'>- * This holds because page_is_mergeable() checks the above property.</div><div class='add'>+ * All pages within a bio_vec starting from @bv_page are contiguous and</div><div class='add'>+ * can simply be iterated (see bvec_advance()).</div><div class='ctx'>  */</div><div class='ctx'> struct bio_vec {</div><div class='ctx'> 	struct page	*bv_page;</div><div class='hunk'>@@ -57,9 +54,12 @@ static inline void bvec_set_page(struct bio_vec *bv, struct page *page,</div><div class='ctx'>  * @offset:	offset into the folio</div><div class='ctx'>  */</div><div class='ctx'> static inline void bvec_set_folio(struct bio_vec *bv, struct folio *folio,</div><div class='del'>-		unsigned int len, unsigned int offset)</div><div class='add'>+		size_t len, size_t offset)</div><div class='ctx'> {</div><div class='del'>-	bvec_set_page(bv, &amp;folio-&gt;page, len, offset);</div><div class='add'>+	unsigned long nr = offset / PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(len &gt; UINT_MAX);</div><div class='add'>+	bvec_set_page(bv, folio_page(folio, nr), len, offset % PAGE_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -184,6 +184,12 @@ static inline void bvec_iter_advance_single(const struct bio_vec *bv,</div><div class='ctx'> 		((bvl = bvec_iter_bvec((bio_vec), (iter))), 1);	\</div><div class='ctx'> 	     bvec_iter_advance_single((bio_vec), &amp;(iter), (bvl).bv_len))</div><div class='ctx'> </div><div class='add'>+#define for_each_mp_bvec(bvl, bio_vec, iter, start)			\</div><div class='add'>+	for (iter = (start);						\</div><div class='add'>+	     (iter).bi_size &amp;&amp;						\</div><div class='add'>+		((bvl = mp_bvec_iter_bvec((bio_vec), (iter))), 1);	\</div><div class='add'>+	     bvec_iter_advance_single((bio_vec), &amp;(iter), (bvl).bv_len))</div><div class='add'>+</div><div class='ctx'> /* for iterating one bio from start to end */</div><div class='ctx'> #define BVEC_ITER_ALL_INIT (struct bvec_iter)				\</div><div class='ctx'> {									\</div><div class='hunk'>@@ -280,4 +286,13 @@ static inline void *bvec_virt(struct bio_vec *bvec)</div><div class='ctx'> 	return page_address(bvec-&gt;bv_page) + bvec-&gt;bv_offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bvec_phys - return the physical address for a bvec</div><div class='add'>+ * @bvec: bvec to return the physical address for</div><div class='add'>+ */</div><div class='add'>+static inline phys_addr_t bvec_phys(const struct bio_vec *bvec)</div><div class='add'>+{</div><div class='add'>+	return page_to_phys(bvec-&gt;bv_page) + bvec-&gt;bv_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_BVEC_H */</div><div class='head'>diff --git a/include/linux/byteorder/generic.h b/include/linux/byteorder/generic.h<br/>index c9a4c96c9943..55a44199de87 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/byteorder/generic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/byteorder/generic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/byteorder/generic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/byteorder/generic.h</a></div><div class='hunk'>@@ -173,6 +173,38 @@ static inline void cpu_to_le32_array(u32 *buf, unsigned int words)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void le64_to_cpu_array(u64 *buf, unsigned int words)</div><div class='add'>+{</div><div class='add'>+	while (words--) {</div><div class='add'>+		__le64_to_cpus(buf);</div><div class='add'>+		buf++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cpu_to_le64_array(u64 *buf, unsigned int words)</div><div class='add'>+{</div><div class='add'>+	while (words--) {</div><div class='add'>+		__cpu_to_le64s(buf);</div><div class='add'>+		buf++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void memcpy_from_le32(u32 *dst, const __le32 *src, size_t words)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; words; i++)</div><div class='add'>+		dst[i] = le32_to_cpu(src[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void memcpy_to_le32(__le32 *dst, const u32 *src, size_t words)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; words; i++)</div><div class='add'>+		dst[i] = cpu_to_le32(src[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void be16_add_cpu(__be16 *var, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	*var = cpu_to_be16(be16_to_cpu(*var) + val);</div><div class='head'>diff --git a/include/linux/cache.h b/include/linux/cache.h<br/>index 0ecb17bb6883..e69768f50d53 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cache.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cache.h</a></div><div class='hunk'>@@ -3,14 +3,37 @@</div><div class='ctx'> #define __LINUX_CACHE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/kernel.h&gt;</div><div class='add'>+#include &lt;vdso/cache.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef L1_CACHE_ALIGN</div><div class='ctx'> #define L1_CACHE_ALIGN(x) __ALIGN_KERNEL(x, L1_CACHE_BYTES)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef SMP_CACHE_BYTES</div><div class='del'>-#define SMP_CACHE_BYTES L1_CACHE_BYTES</div><div class='add'>+/**</div><div class='add'>+ * SMP_CACHE_ALIGN - align a value to the L2 cacheline size</div><div class='add'>+ * @x: value to align</div><div class='add'>+ *</div><div class='add'>+ * On some architectures, L2 ("SMP") CL size is bigger than L1, and sometimes,</div><div class='add'>+ * this needs to be accounted.</div><div class='add'>+ *</div><div class='add'>+ * Return: aligned value.</div><div class='add'>+ */</div><div class='add'>+#ifndef SMP_CACHE_ALIGN</div><div class='add'>+#define SMP_CACHE_ALIGN(x)	ALIGN(x, SMP_CACHE_BYTES)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ``__aligned_largest`` aligns a field to the value most optimal for the</div><div class='add'>+ * target architecture to perform memory operations. Get the actual value</div><div class='add'>+ * to be able to use it anywhere else.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LARGEST_ALIGN</div><div class='add'>+#define __LARGEST_ALIGN		sizeof(struct { long x; } __aligned_largest)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef LARGEST_ALIGN</div><div class='add'>+#define LARGEST_ALIGN(x)	ALIGN(x, __LARGEST_ALIGN)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -37,10 +60,6 @@</div><div class='ctx'> #define __ro_after_init __section(".data..ro_after_init")</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef ____cacheline_aligned</div><div class='del'>-#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef ____cacheline_aligned_in_smp</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> #define ____cacheline_aligned_in_smp ____cacheline_aligned</div><div class='hunk'>@@ -95,6 +114,39 @@</div><div class='ctx'> 	__u8 __cacheline_group_end__##GROUP[0]</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * __cacheline_group_begin_aligned - declare an aligned group start</div><div class='add'>+ * @GROUP: name of the group</div><div class='add'>+ * @...: optional group alignment</div><div class='add'>+ *</div><div class='add'>+ * The following block inside a struct:</div><div class='add'>+ *</div><div class='add'>+ *	__cacheline_group_begin_aligned(grp);</div><div class='add'>+ *	field a;</div><div class='add'>+ *	field b;</div><div class='add'>+ *	__cacheline_group_end_aligned(grp);</div><div class='add'>+ *</div><div class='add'>+ * will always be aligned to either the specified alignment or</div><div class='add'>+ * ``SMP_CACHE_BYTES``.</div><div class='add'>+ */</div><div class='add'>+#define __cacheline_group_begin_aligned(GROUP, ...)		\</div><div class='add'>+	__cacheline_group_begin(GROUP)				\</div><div class='add'>+	__aligned((__VA_ARGS__ + 0) ? : SMP_CACHE_BYTES)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __cacheline_group_end_aligned - declare an aligned group end</div><div class='add'>+ * @GROUP: name of the group</div><div class='add'>+ * @...: optional alignment (same as was in __cacheline_group_begin_aligned())</div><div class='add'>+ *</div><div class='add'>+ * Note that the end marker is aligned to sizeof(long) to allow more precise</div><div class='add'>+ * size assertion. It also declares a padding at the end to avoid next field</div><div class='add'>+ * falling into this cacheline.</div><div class='add'>+ */</div><div class='add'>+#define __cacheline_group_end_aligned(GROUP, ...)		\</div><div class='add'>+	__cacheline_group_end(GROUP) __aligned(sizeof(long));	\</div><div class='add'>+	struct { } __cacheline_group_pad__##GROUP		\</div><div class='add'>+	__aligned((__VA_ARGS__ + 0) ? : SMP_CACHE_BYTES)</div><div class='add'>+</div><div class='ctx'> #ifndef CACHELINE_ASSERT_GROUP_MEMBER</div><div class='ctx'> #define CACHELINE_ASSERT_GROUP_MEMBER(TYPE, GROUP, MEMBER) \</div><div class='ctx'> 	BUILD_BUG_ON(!(offsetof(TYPE, MEMBER) &gt;= \</div><div class='head'>diff --git a/include/linux/cache_coherency.h b/include/linux/cache_coherency.h<br/>new file mode 100644<br/>index 000000000000..cc81c5733e31<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cache_coherency.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cache_coherency.h</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Cache coherency maintenance operation device drivers</div><div class='add'>+ *</div><div class='add'>+ * Copyright Huawei 2025</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_CACHE_COHERENCY_H_</div><div class='add'>+#define _LINUX_CACHE_COHERENCY_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct cc_inval_params {</div><div class='add'>+	phys_addr_t addr;</div><div class='add'>+	size_t size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cache_coherency_ops_inst;</div><div class='add'>+</div><div class='add'>+struct cache_coherency_ops {</div><div class='add'>+	int (*wbinv)(struct cache_coherency_ops_inst *cci,</div><div class='add'>+		     struct cc_inval_params *invp);</div><div class='add'>+	int (*done)(struct cache_coherency_ops_inst *cci);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cache_coherency_ops_inst {</div><div class='add'>+	struct kref kref;</div><div class='add'>+	struct list_head node;</div><div class='add'>+	const struct cache_coherency_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cache_coherency_ops_instance_register(struct cache_coherency_ops_inst *cci);</div><div class='add'>+void cache_coherency_ops_instance_unregister(struct cache_coherency_ops_inst *cci);</div><div class='add'>+</div><div class='add'>+struct cache_coherency_ops_inst *</div><div class='add'>+_cache_coherency_ops_instance_alloc(const struct cache_coherency_ops *ops,</div><div class='add'>+				    size_t size);</div><div class='add'>+/**</div><div class='add'>+ * cache_coherency_ops_instance_alloc - Allocate cache coherency ops instance</div><div class='add'>+ * @ops: Cache maintenance operations</div><div class='add'>+ * @drv_struct: structure that contains the struct cache_coherency_ops_inst</div><div class='add'>+ * @member: Name of the struct cache_coherency_ops_inst member in @drv_struct.</div><div class='add'>+ *</div><div class='add'>+ * This allocates a driver specific structure and initializes the</div><div class='add'>+ * cache_coherency_ops_inst embedded in the drv_struct. Upon success the</div><div class='add'>+ * pointer must be freed via cache_coherency_ops_instance_put().</div><div class='add'>+ *</div><div class='add'>+ * Returns a &amp;drv_struct * on success, %NULL on error.</div><div class='add'>+ */</div><div class='add'>+#define cache_coherency_ops_instance_alloc(ops, drv_struct, member)	    \</div><div class='add'>+	({								    \</div><div class='add'>+		static_assert(__same_type(struct cache_coherency_ops_inst,  \</div><div class='add'>+					  ((drv_struct *)NULL)-&gt;member));   \</div><div class='add'>+		static_assert(offsetof(drv_struct, member) == 0);	    \</div><div class='add'>+		(drv_struct *)_cache_coherency_ops_instance_alloc(ops,	    \</div><div class='add'>+			sizeof(drv_struct));				    \</div><div class='add'>+	})</div><div class='add'>+void cache_coherency_ops_instance_put(struct cache_coherency_ops_inst *cci);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h<br/>index d504eb4b49ab..c8f4f0a0b874 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cacheinfo.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cacheinfo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cacheinfo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cacheinfo.h</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'> #define _LINUX_CACHEINFO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cpuhplock.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device_node;</div><div class='hunk'>@@ -113,29 +114,55 @@ int acpi_get_cache_info(unsigned int cpu,</div><div class='ctx'> const struct attribute_group *cache_get_priv_group(struct cacheinfo *this_leaf);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Get the id of the cache associated with @cpu at level @level.</div><div class='add'>+ * Get the cacheinfo structure for the cache associated with @cpu at</div><div class='add'>+ * level @level.</div><div class='ctx'>  * cpuhp lock must be held.</div><div class='ctx'>  */</div><div class='del'>-static inline int get_cpu_cacheinfo_id(int cpu, int level)</div><div class='add'>+static inline struct cacheinfo *get_cpu_cacheinfo_level(int cpu, int level)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu_cacheinfo *ci = get_cpu_cacheinfo(cpu);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_cpus_held();</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ci-&gt;num_leaves; i++) {</div><div class='ctx'> 		if (ci-&gt;info_list[i].level == level) {</div><div class='ctx'> 			if (ci-&gt;info_list[i].attributes &amp; CACHE_ID)</div><div class='del'>-				return ci-&gt;info_list[i].id;</div><div class='del'>-			return -1;</div><div class='add'>+				return &amp;ci-&gt;info_list[i];</div><div class='add'>+			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the id of the cache associated with @cpu at level @level.</div><div class='add'>+ * cpuhp lock must be held.</div><div class='add'>+ */</div><div class='add'>+static inline int get_cpu_cacheinfo_id(int cpu, int level)</div><div class='add'>+{</div><div class='add'>+	struct cacheinfo *ci = get_cpu_cacheinfo_level(cpu, level);</div><div class='add'>+</div><div class='add'>+	return ci ? ci-&gt;id : -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARM64</div><div class='add'>+#if defined(CONFIG_ARM64) || defined(CONFIG_ARM)</div><div class='ctx'> #define use_arch_cache_info()	(true)</div><div class='ctx'> #else</div><div class='ctx'> #define use_arch_cache_info()	(false)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_ARCH_HAS_CPU_CACHE_ALIASING</div><div class='add'>+#define cpu_dcache_is_aliasing()	false</div><div class='add'>+#define cpu_icache_is_aliasing()	cpu_dcache_is_aliasing()</div><div class='add'>+#else</div><div class='add'>+#include &lt;asm/cachetype.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef cpu_icache_is_aliasing</div><div class='add'>+#define cpu_icache_is_aliasing()	cpu_dcache_is_aliasing()</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_CACHEINFO_H */</div><div class='head'>diff --git a/include/linux/call_once.h b/include/linux/call_once.h<br/>new file mode 100644<br/>index 000000000000..13cd6469e7e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/call_once.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/call_once.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+#ifndef _LINUX_CALL_ONCE_H</div><div class='add'>+#define _LINUX_CALL_ONCE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+#define ONCE_NOT_STARTED 0</div><div class='add'>+#define ONCE_RUNNING     1</div><div class='add'>+#define ONCE_COMPLETED   2</div><div class='add'>+</div><div class='add'>+struct once {</div><div class='add'>+        atomic_t state;</div><div class='add'>+        struct mutex lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void __once_init(struct once *once, const char *name,</div><div class='add'>+			       struct lock_class_key *key)</div><div class='add'>+{</div><div class='add'>+        atomic_set(&amp;once-&gt;state, ONCE_NOT_STARTED);</div><div class='add'>+        __mutex_init(&amp;once-&gt;lock, name, key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define once_init(once)							\</div><div class='add'>+do {									\</div><div class='add'>+	static struct lock_class_key __key;				\</div><div class='add'>+	__once_init((once), #once, &amp;__key);				\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * call_once - Ensure a function has been called exactly once</div><div class='add'>+ *</div><div class='add'>+ * @once: Tracking struct</div><div class='add'>+ * @cb: Function to be called</div><div class='add'>+ *</div><div class='add'>+ * If @once has never completed successfully before, call @cb and, if</div><div class='add'>+ * it returns a zero or positive value, mark @once as completed.  Return</div><div class='add'>+ * the value returned by @cb</div><div class='add'>+ *</div><div class='add'>+ * If @once has completed succesfully before, return 0.</div><div class='add'>+ *</div><div class='add'>+ * The call to @cb is implicitly surrounded by a mutex, though for</div><div class='add'>+ * efficiency the * function avoids taking it after the first call.</div><div class='add'>+ */</div><div class='add'>+static inline int call_once(struct once *once, int (*cb)(struct once *))</div><div class='add'>+{</div><div class='add'>+	int r, state;</div><div class='add'>+</div><div class='add'>+	/* Pairs with atomic_set_release() below.  */</div><div class='add'>+	if (atomic_read_acquire(&amp;once-&gt;state) == ONCE_COMPLETED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;once-&gt;lock);</div><div class='add'>+	state = atomic_read(&amp;once-&gt;state);</div><div class='add'>+	if (unlikely(state != ONCE_NOT_STARTED))</div><div class='add'>+		return WARN_ON_ONCE(state != ONCE_COMPLETED) ? -EINVAL : 0;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;once-&gt;state, ONCE_RUNNING);</div><div class='add'>+	r = cb(once);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		atomic_set(&amp;once-&gt;state, ONCE_NOT_STARTED);</div><div class='add'>+	else</div><div class='add'>+		atomic_set_release(&amp;once-&gt;state, ONCE_COMPLETED);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_CALL_ONCE_H */</div><div class='head'>diff --git a/include/linux/can/bittiming.h b/include/linux/can/bittiming.h<br/>index 9b8a9c39614b..726d909e87ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/can/bittiming.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/can/bittiming.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/can/bittiming.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/can/bittiming.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /* Copyright (c) 2020 Pengutronix, Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='del'>- * Copyright (c) 2021 Vincent Mailhol &lt;mailhol.vincent@wanadoo.fr&gt;</div><div class='add'>+ * Copyright (c) 2021-2025 Vincent Mailhol &lt;mailhol@kernel.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _CAN_BITTIMING_H</div><div class='hunk'>@@ -14,8 +14,14 @@</div><div class='ctx'> #define CAN_BITRATE_UNSET 0</div><div class='ctx'> #define CAN_BITRATE_UNKNOWN (-1U)</div><div class='ctx'> </div><div class='del'>-#define CAN_CTRLMODE_TDC_MASK					\</div><div class='add'>+#define CAN_CTRLMODE_FD_TDC_MASK				\</div><div class='ctx'> 	(CAN_CTRLMODE_TDC_AUTO | CAN_CTRLMODE_TDC_MANUAL)</div><div class='add'>+#define CAN_CTRLMODE_XL_TDC_MASK				\</div><div class='add'>+	(CAN_CTRLMODE_XL_TDC_AUTO | CAN_CTRLMODE_XL_TDC_MANUAL)</div><div class='add'>+#define CAN_CTRLMODE_TDC_AUTO_MASK				\</div><div class='add'>+	(CAN_CTRLMODE_TDC_AUTO | CAN_CTRLMODE_XL_TDC_AUTO)</div><div class='add'>+#define CAN_CTRLMODE_TDC_MANUAL_MASK				\</div><div class='add'>+	(CAN_CTRLMODE_TDC_MANUAL | CAN_CTRLMODE_XL_TDC_MANUAL)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * struct can_tdc - CAN FD Transmission Delay Compensation parameters</div><div class='hunk'>@@ -81,6 +87,11 @@ struct can_tdc {</div><div class='ctx'> 	u32 tdcf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* The transceiver decoding margin corresponds to t_Decode in ISO 11898-2 */</div><div class='add'>+#define CAN_PWM_DECODE_NS 5</div><div class='add'>+/* Maximum PWM symbol duration. Corresponds to t_SymbolNom_MAX - t_Decode */</div><div class='add'>+#define CAN_PWM_NS_MAX (205 - CAN_PWM_DECODE_NS)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * struct can_tdc_const - CAN hardware-dependent constant for</div><div class='ctx'>  *	Transmission Delay Compensation</div><div class='hunk'>@@ -114,27 +125,85 @@ struct can_tdc_const {</div><div class='ctx'> 	u32 tdcf_max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * struct can_pwm - CAN Pulse-Width Modulation (PWM) parameters</div><div class='add'>+ *</div><div class='add'>+ * @pwms: pulse width modulation short phase</div><div class='add'>+ * @pwml: pulse width modulation long phase</div><div class='add'>+ * @pwmo: pulse width modulation offset</div><div class='add'>+ */</div><div class='add'>+struct can_pwm {</div><div class='add'>+	u32 pwms;</div><div class='add'>+	u32 pwml;</div><div class='add'>+	u32 pwmo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct can_pwm - CAN hardware-dependent constants for Pulse-Width</div><div class='add'>+ *	Modulation (PWM)</div><div class='add'>+ *</div><div class='add'>+ * @pwms_min: PWM short phase minimum value. Must be at least 1.</div><div class='add'>+ * @pwms_max: PWM short phase maximum value</div><div class='add'>+ * @pwml_min: PWM long phase minimum value. Must be at least 1.</div><div class='add'>+ * @pwml_max: PWM long phase maximum value</div><div class='add'>+ * @pwmo_min: PWM offset phase minimum value</div><div class='add'>+ * @pwmo_max: PWM offset phase maximum value</div><div class='add'>+ */</div><div class='add'>+struct can_pwm_const {</div><div class='add'>+	u32 pwms_min;</div><div class='add'>+	u32 pwms_max;</div><div class='add'>+	u32 pwml_min;</div><div class='add'>+	u32 pwml_max;</div><div class='add'>+	u32 pwmo_min;</div><div class='add'>+	u32 pwmo_max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct data_bittiming_params {</div><div class='add'>+	const struct can_bittiming_const *data_bittiming_const;</div><div class='add'>+	struct can_bittiming data_bittiming;</div><div class='add'>+	const struct can_tdc_const *tdc_const;</div><div class='add'>+	const struct can_pwm_const *pwm_const;</div><div class='add'>+	union {</div><div class='add'>+		struct can_tdc tdc;</div><div class='add'>+		struct can_pwm pwm;</div><div class='add'>+	};</div><div class='add'>+	const u32 *data_bitrate_const;</div><div class='add'>+	unsigned int data_bitrate_const_cnt;</div><div class='add'>+	int (*do_set_data_bittiming)(struct net_device *dev);</div><div class='add'>+	int (*do_get_auto_tdcv)(const struct net_device *dev, u32 *tdcv);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CAN_CALC_BITTIMING</div><div class='ctx'> int can_calc_bittiming(const struct net_device *dev, struct can_bittiming *bt,</div><div class='ctx'> 		       const struct can_bittiming_const *btc, struct netlink_ext_ack *extack);</div><div class='ctx'> </div><div class='ctx'> void can_calc_tdco(struct can_tdc *tdc, const struct can_tdc_const *tdc_const,</div><div class='ctx'> 		   const struct can_bittiming *dbt,</div><div class='del'>-		   u32 *ctrlmode, u32 ctrlmode_supported);</div><div class='add'>+		   u32 tdc_mask, u32 *ctrlmode, u32 ctrlmode_supported);</div><div class='add'>+</div><div class='add'>+int can_calc_pwm(struct net_device *dev, struct netlink_ext_ack *extack);</div><div class='ctx'> #else /* !CONFIG_CAN_CALC_BITTIMING */</div><div class='ctx'> static inline int</div><div class='ctx'> can_calc_bittiming(const struct net_device *dev, struct can_bittiming *bt,</div><div class='ctx'> 		   const struct can_bittiming_const *btc, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	netdev_err(dev, "bit-timing calculation not available\n");</div><div class='add'>+	NL_SET_ERR_MSG(extack, "bit-timing calculation not available\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> can_calc_tdco(struct can_tdc *tdc, const struct can_tdc_const *tdc_const,</div><div class='ctx'> 	      const struct can_bittiming *dbt,</div><div class='del'>-	      u32 *ctrlmode, u32 ctrlmode_supported)</div><div class='add'>+	      u32 tdc_mask, u32 *ctrlmode, u32 ctrlmode_supported)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+can_calc_pwm(struct net_device *dev, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	NL_SET_ERR_MSG(extack,</div><div class='add'>+		       "bit-timing calculation not available: manually provide PWML and PWMS\n");</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_CAN_CALC_BITTIMING */</div><div class='ctx'> </div><div class='hunk'>@@ -149,6 +218,39 @@ int can_get_bittiming(const struct net_device *dev, struct can_bittiming *bt,</div><div class='ctx'> 		      const unsigned int bitrate_const_cnt,</div><div class='ctx'> 		      struct netlink_ext_ack *extack);</div><div class='ctx'> </div><div class='add'>+int can_validate_pwm_bittiming(const struct net_device *dev,</div><div class='add'>+			       const struct can_pwm *pwm,</div><div class='add'>+			       struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * can_get_relative_tdco() - TDCO relative to the sample point</div><div class='add'>+ *</div><div class='add'>+ * struct can_tdc::tdco represents the absolute offset from TDCV. Some</div><div class='add'>+ * controllers use instead an offset relative to the Sample Point (SP)</div><div class='add'>+ * such that:</div><div class='add'>+ *</div><div class='add'>+ * SSP = TDCV + absolute TDCO</div><div class='add'>+ *     = TDCV + SP + relative TDCO</div><div class='add'>+ *</div><div class='add'>+ * -+----------- one bit ----------+-- TX pin</div><div class='add'>+ *  |&lt;--- Sample Point ---&gt;|</div><div class='add'>+ *</div><div class='add'>+ *                         --+----------- one bit ----------+-- RX pin</div><div class='add'>+ *  |&lt;-------- TDCV --------&gt;|</div><div class='add'>+ *                           |&lt;------------------------&gt;| absolute TDCO</div><div class='add'>+ *                           |&lt;--- Sample Point ---&gt;|</div><div class='add'>+ *                           |                      |&lt;-&gt;| relative TDCO</div><div class='add'>+ *  |&lt;------------- Secondary Sample Point ------------&gt;|</div><div class='add'>+ */</div><div class='add'>+static inline s32 can_get_relative_tdco(const struct data_bittiming_params *dbt_params)</div><div class='add'>+{</div><div class='add'>+	const struct can_bittiming *dbt = &amp;dbt_params-&gt;data_bittiming;</div><div class='add'>+	s32 sample_point_in_tc = (CAN_SYNC_SEG + dbt-&gt;prop_seg +</div><div class='add'>+				  dbt-&gt;phase_seg1) * dbt-&gt;brp;</div><div class='add'>+</div><div class='add'>+	return (s32)dbt_params-&gt;tdc.tdco - sample_point_in_tc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * can_bit_time() - Duration of one bit</div><div class='ctx'>  *</div><div class='hunk'>@@ -162,4 +264,17 @@ static inline unsigned int can_bit_time(const struct can_bittiming *bt)</div><div class='ctx'> 	return CAN_SYNC_SEG + bt-&gt;prop_seg + bt-&gt;phase_seg1 + bt-&gt;phase_seg2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Duration of one bit in minimum time quantum */</div><div class='add'>+static inline unsigned int can_bit_time_tqmin(const struct can_bittiming *bt)</div><div class='add'>+{</div><div class='add'>+	return can_bit_time(bt) * bt-&gt;brp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert a duration from minimum a minimum time quantum to nano seconds */</div><div class='add'>+static inline u32 can_tqmin_to_ns(u32 tqmin, u32 clock_freq)</div><div class='add'>+{</div><div class='add'>+	return DIV_U64_ROUND_CLOSEST(mul_u32_u32(tqmin, NSEC_PER_SEC),</div><div class='add'>+				     clock_freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* !_CAN_BITTIMING_H */</div><div class='head'>diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h<br/>index 1b92aed49363..f6416a56e95d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/can/dev.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/can/dev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/can/dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/can/dev.h</a></div><div class='hunk'>@@ -45,16 +45,11 @@ struct can_priv {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct can_device_stats can_stats;</div><div class='ctx'> </div><div class='del'>-	const struct can_bittiming_const *bittiming_const,</div><div class='del'>-		*data_bittiming_const;</div><div class='del'>-	struct can_bittiming bittiming, data_bittiming;</div><div class='del'>-	const struct can_tdc_const *tdc_const;</div><div class='del'>-	struct can_tdc tdc;</div><div class='del'>-</div><div class='add'>+	const struct can_bittiming_const *bittiming_const;</div><div class='add'>+	struct can_bittiming bittiming;</div><div class='add'>+	struct data_bittiming_params fd, xl;</div><div class='ctx'> 	unsigned int bitrate_const_cnt;</div><div class='ctx'> 	const u32 *bitrate_const;</div><div class='del'>-	const u32 *data_bitrate_const;</div><div class='del'>-	unsigned int data_bitrate_const_cnt;</div><div class='ctx'> 	u32 bitrate_max;</div><div class='ctx'> 	struct can_clock clock;</div><div class='ctx'> </div><div class='hunk'>@@ -77,69 +72,22 @@ struct can_priv {</div><div class='ctx'> 	struct delayed_work restart_work;</div><div class='ctx'> </div><div class='ctx'> 	int (*do_set_bittiming)(struct net_device *dev);</div><div class='del'>-	int (*do_set_data_bittiming)(struct net_device *dev);</div><div class='ctx'> 	int (*do_set_mode)(struct net_device *dev, enum can_mode mode);</div><div class='ctx'> 	int (*do_set_termination)(struct net_device *dev, u16 term);</div><div class='ctx'> 	int (*do_get_state)(const struct net_device *dev,</div><div class='ctx'> 			    enum can_state *state);</div><div class='ctx'> 	int (*do_get_berr_counter)(const struct net_device *dev,</div><div class='ctx'> 				   struct can_berr_counter *bec);</div><div class='del'>-	int (*do_get_auto_tdcv)(const struct net_device *dev, u32 *tdcv);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool can_tdc_is_enabled(const struct can_priv *priv)</div><div class='add'>+static inline bool can_fd_tdc_is_enabled(const struct can_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	return !!(priv-&gt;ctrlmode &amp; CAN_CTRLMODE_TDC_MASK);</div><div class='add'>+	return !!(priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD_TDC_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * can_get_relative_tdco() - TDCO relative to the sample point</div><div class='del'>- *</div><div class='del'>- * struct can_tdc::tdco represents the absolute offset from TDCV. Some</div><div class='del'>- * controllers use instead an offset relative to the Sample Point (SP)</div><div class='del'>- * such that:</div><div class='del'>- *</div><div class='del'>- * SSP = TDCV + absolute TDCO</div><div class='del'>- *     = TDCV + SP + relative TDCO</div><div class='del'>- *</div><div class='del'>- * -+----------- one bit ----------+-- TX pin</div><div class='del'>- *  |&lt;--- Sample Point ---&gt;|</div><div class='del'>- *</div><div class='del'>- *                         --+----------- one bit ----------+-- RX pin</div><div class='del'>- *  |&lt;-------- TDCV --------&gt;|</div><div class='del'>- *                           |&lt;------------------------&gt;| absolute TDCO</div><div class='del'>- *                           |&lt;--- Sample Point ---&gt;|</div><div class='del'>- *                           |                      |&lt;-&gt;| relative TDCO</div><div class='del'>- *  |&lt;------------- Secondary Sample Point ------------&gt;|</div><div class='del'>- */</div><div class='del'>-static inline s32 can_get_relative_tdco(const struct can_priv *priv)</div><div class='add'>+static inline bool can_xl_tdc_is_enabled(const struct can_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	const struct can_bittiming *dbt = &amp;priv-&gt;data_bittiming;</div><div class='del'>-	s32 sample_point_in_tc = (CAN_SYNC_SEG + dbt-&gt;prop_seg +</div><div class='del'>-				  dbt-&gt;phase_seg1) * dbt-&gt;brp;</div><div class='del'>-</div><div class='del'>-	return (s32)priv-&gt;tdc.tdco - sample_point_in_tc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* helper to define static CAN controller features at device creation time */</div><div class='del'>-static inline int __must_check can_set_static_ctrlmode(struct net_device *dev,</div><div class='del'>-						       u32 static_mode)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* alloc_candev() succeeded =&gt; netdev_priv() is valid at this point */</div><div class='del'>-	if (priv-&gt;ctrlmode_supported &amp; static_mode) {</div><div class='del'>-		netdev_warn(dev,</div><div class='del'>-			    "Controller features can not be supported and static at the same time\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;ctrlmode = static_mode;</div><div class='del'>-</div><div class='del'>-	/* override MTU which was set by default in can_setup()? */</div><div class='del'>-	if (static_mode &amp; CAN_CTRLMODE_FD)</div><div class='del'>-		dev-&gt;mtu = CANFD_MTU;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return !!(priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TDC_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 can_get_static_ctrlmode(struct can_priv *priv)</div><div class='hunk'>@@ -152,22 +100,6 @@ static inline bool can_is_canxl_dev_mtu(unsigned int mtu)</div><div class='ctx'> 	return (mtu &gt;= CANXL_MIN_MTU &amp;&amp; mtu &lt;= CANXL_MAX_MTU);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* drop skb if it does not contain a valid CAN frame for sending */</div><div class='del'>-static inline bool can_dev_dropped_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_LISTENONLY) {</div><div class='del'>-		netdev_info_once(dev,</div><div class='del'>-				 "interface in listen only mode, dropping skb\n");</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return can_dropped_invalid_skb(dev, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void can_setup(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,</div><div class='hunk'>@@ -179,14 +111,27 @@ struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,</div><div class='ctx'> void free_candev(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> /* a candev safe wrapper around netdev_priv */</div><div class='add'>+#if IS_ENABLED(CONFIG_CAN_NETLINK)</div><div class='ctx'> struct can_priv *safe_candev_priv(struct net_device *dev);</div><div class='add'>+#else</div><div class='add'>+static inline struct can_priv *safe_candev_priv(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> int open_candev(struct net_device *dev);</div><div class='ctx'> void close_candev(struct net_device *dev);</div><div class='del'>-int can_change_mtu(struct net_device *dev, int new_mtu);</div><div class='del'>-int can_eth_ioctl_hwts(struct net_device *netdev, struct ifreq *ifr, int cmd);</div><div class='add'>+void can_set_default_mtu(struct net_device *dev);</div><div class='add'>+int __must_check can_set_static_ctrlmode(struct net_device *dev,</div><div class='add'>+					 u32 static_mode);</div><div class='add'>+int can_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+		     struct kernel_hwtstamp_config *cfg);</div><div class='add'>+int can_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+		     struct kernel_hwtstamp_config *cfg,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='ctx'> int can_ethtool_op_get_ts_info_hwts(struct net_device *dev,</div><div class='del'>-				    struct ethtool_ts_info *info);</div><div class='add'>+				    struct kernel_ethtool_ts_info *info);</div><div class='ctx'> </div><div class='ctx'> int register_candev(struct net_device *dev);</div><div class='ctx'> void unregister_candev(struct net_device *dev);</div><div class='hunk'>@@ -195,6 +140,53 @@ int can_restart_now(struct net_device *dev);</div><div class='ctx'> void can_bus_off(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> const char *can_get_state_str(const enum can_state state);</div><div class='add'>+const char *can_get_ctrlmode_str(u32 ctrlmode);</div><div class='add'>+</div><div class='add'>+static inline bool can_dev_in_xl_only_mode(struct can_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const u32 mixed_mode = CAN_CTRLMODE_FD | CAN_CTRLMODE_XL;</div><div class='add'>+</div><div class='add'>+	/* When CAN XL is enabled but FD is disabled we are running in</div><div class='add'>+	 * the so-called 'CANXL-only mode' where the error signalling is</div><div class='add'>+	 * disabled. This helper function determines the required value</div><div class='add'>+	 * to disable error signalling in the CAN XL controller.</div><div class='add'>+	 * The so-called CC/FD/XL 'mixed mode' requires error signalling.</div><div class='add'>+	 */</div><div class='add'>+	return ((priv-&gt;ctrlmode &amp; mixed_mode) == CAN_CTRLMODE_XL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* drop skb if it does not contain a valid CAN frame for sending */</div><div class='add'>+static inline bool can_dev_dropped_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	u32 silent_mode = priv-&gt;ctrlmode &amp; (CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+					    CAN_CTRLMODE_RESTRICTED);</div><div class='add'>+</div><div class='add'>+	if (silent_mode) {</div><div class='add'>+		netdev_info_once(dev, "interface in %s mode, dropping skb\n",</div><div class='add'>+				 can_get_ctrlmode_str(silent_mode));</div><div class='add'>+		goto invalid_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD) &amp;&amp; can_is_canfd_skb(skb)) {</div><div class='add'>+		netdev_info_once(dev, "CAN FD is disabled, dropping skb\n");</div><div class='add'>+		goto invalid_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (can_dev_in_xl_only_mode(priv) &amp;&amp; !can_is_canxl_skb(skb)) {</div><div class='add'>+		netdev_info_once(dev,</div><div class='add'>+				 "Error signaling is disabled, dropping skb\n");</div><div class='add'>+		goto invalid_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return can_dropped_invalid_skb(dev, skb);</div><div class='add'>+</div><div class='add'>+invalid_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void can_state_get_by_berr_counter(const struct net_device *dev,</div><div class='ctx'> 				   const struct can_berr_counter *bec,</div><div class='ctx'> 				   enum can_state *tx_state,</div><div class='head'>diff --git a/include/linux/can/dev/peak_canfd.h b/include/linux/can/dev/peak_canfd.h<br/>index f38772fd0c07..d3788a3d0942 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/can/dev/peak_canfd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/can/dev/peak_canfd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/can/dev/peak_canfd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/can/dev/peak_canfd.h</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * CAN driver for PEAK System micro-CAN based adapters</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003-2011 PEAK System-Technik GmbH</div><div class='del'>- * Copyright (C) 2011-2013 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+ * Copyright (C) 2003-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #ifndef PUCAN_H</div><div class='ctx'> #define PUCAN_H</div><div class='head'>diff --git a/include/linux/capability.h b/include/linux/capability.h<br/>index 0c356a517991..1fb08922552c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/capability.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/capability.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/capability.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/capability.h</a></div><div class='hunk'>@@ -139,7 +139,6 @@ static inline kernel_cap_t cap_raise_nfsd_set(const kernel_cap_t a,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MULTIUSER</div><div class='del'>-extern bool has_capability(struct task_struct *t, int cap);</div><div class='ctx'> extern bool has_ns_capability(struct task_struct *t,</div><div class='ctx'> 			      struct user_namespace *ns, int cap);</div><div class='ctx'> extern bool has_capability_noaudit(struct task_struct *t, int cap);</div><div class='hunk'>@@ -150,10 +149,6 @@ extern bool ns_capable(struct user_namespace *ns, int cap);</div><div class='ctx'> extern bool ns_capable_noaudit(struct user_namespace *ns, int cap);</div><div class='ctx'> extern bool ns_capable_setid(struct user_namespace *ns, int cap);</div><div class='ctx'> #else</div><div class='del'>-static inline bool has_capability(struct task_struct *t, int cap)</div><div class='del'>-{</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='ctx'> static inline bool has_ns_capability(struct task_struct *t,</div><div class='ctx'> 			      struct user_namespace *ns, int cap)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/cc_platform.h b/include/linux/cc_platform.h<br/>index cb0d6cd1c12f..559353ad64ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cc_platform.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cc_platform.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cc_platform.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cc_platform.h</a></div><div class='hunk'>@@ -74,7 +74,7 @@ enum cc_attr {</div><div class='ctx'> 	CC_ATTR_GUEST_UNROLL_STRING_IO,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @CC_ATTR_SEV_SNP: Guest SNP is active.</div><div class='add'>+	 * @CC_ATTR_GUEST_SEV_SNP: Guest SNP is active.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The platform/OS is running as a guest/virtual machine and actively</div><div class='ctx'> 	 * using AMD SEV-SNP features.</div><div class='hunk'>@@ -82,14 +82,28 @@ enum cc_attr {</div><div class='ctx'> 	CC_ATTR_GUEST_SEV_SNP,</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @CC_ATTR_HOTPLUG_DISABLED: Hotplug is not supported or disabled.</div><div class='add'>+	 * @CC_ATTR_GUEST_SNP_SECURE_TSC: SNP Secure TSC is active.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The platform/OS is running as a guest/virtual machine does not</div><div class='del'>-	 * support CPU hotplug feature.</div><div class='add'>+	 * The platform/OS is running as a guest/virtual machine and actively</div><div class='add'>+	 * using AMD SEV-SNP Secure TSC feature.</div><div class='add'>+	 */</div><div class='add'>+	CC_ATTR_GUEST_SNP_SECURE_TSC,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @CC_ATTR_HOST_SEV_SNP: AMD SNP enabled on the host.</div><div class='add'>+	 *</div><div class='add'>+	 * The host kernel is running with the necessary features</div><div class='add'>+	 * enabled to run SEV-SNP guests.</div><div class='add'>+	 */</div><div class='add'>+	CC_ATTR_HOST_SEV_SNP,</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @CC_ATTR_SNP_SECURE_AVIC: Secure AVIC mode is active.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Examples include TDX Guest.</div><div class='add'>+	 * The host kernel is running with the necessary features enabled</div><div class='add'>+	 * to run SEV-SNP guests with full Secure AVIC capabilities.</div><div class='ctx'> 	 */</div><div class='del'>-	CC_ATTR_HOTPLUG_DISABLED,</div><div class='add'>+	CC_ATTR_SNP_SECURE_AVIC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_CC_PLATFORM</div><div class='hunk'>@@ -107,10 +121,14 @@ enum cc_attr {</div><div class='ctx'>  * * FALSE - Specified Confidential Computing attribute is not active</div><div class='ctx'>  */</div><div class='ctx'> bool cc_platform_has(enum cc_attr attr);</div><div class='add'>+void cc_platform_set(enum cc_attr attr);</div><div class='add'>+void cc_platform_clear(enum cc_attr attr);</div><div class='ctx'> </div><div class='ctx'> #else	/* !CONFIG_ARCH_HAS_CC_PLATFORM */</div><div class='ctx'> </div><div class='ctx'> static inline bool cc_platform_has(enum cc_attr attr) { return false; }</div><div class='add'>+static inline void cc_platform_set(enum cc_attr attr) { }</div><div class='add'>+static inline void cc_platform_clear(enum cc_attr attr) { }</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_ARCH_HAS_CC_PLATFORM */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h<br/>index 98c6fd0b39b6..b907e6c2307d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cdrom.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cdrom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cdrom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cdrom.h</a></div><div class='hunk'>@@ -62,7 +62,6 @@ struct cdrom_device_info {</div><div class='ctx'> 	__u8 last_sense;</div><div class='ctx'> 	__u8 media_written;		/* dirty flag, DVD+RW bookkeeping */</div><div class='ctx'> 	unsigned short mmc3_profile;	/* current MMC3 profile */</div><div class='del'>-	int (*exit)(struct cdrom_device_info *);</div><div class='ctx'> 	int mrw_mode_page;</div><div class='ctx'> 	bool opened_for_data;</div><div class='ctx'> 	__s64 last_media_change_ms;</div><div class='hunk'>@@ -77,7 +76,7 @@ struct cdrom_device_ops {</div><div class='ctx'> 				      unsigned int clearing, int slot);</div><div class='ctx'> 	int (*tray_move) (struct cdrom_device_info *, int);</div><div class='ctx'> 	int (*lock_door) (struct cdrom_device_info *, int);</div><div class='del'>-	int (*select_speed) (struct cdrom_device_info *, int);</div><div class='add'>+	int (*select_speed) (struct cdrom_device_info *, unsigned long);</div><div class='ctx'> 	int (*get_last_session) (struct cdrom_device_info *,</div><div class='ctx'> 				 struct cdrom_multisession *);</div><div class='ctx'> 	int (*get_mcn) (struct cdrom_device_info *,</div><div class='head'>diff --git a/include/linux/cdx/bitfield.h b/include/linux/cdx/bitfield.h<br/>new file mode 100644<br/>index 000000000000..567f8ec47582<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cdx/bitfield.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cdx/bitfield.h</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005-2006 Fen Systems Ltd.</div><div class='add'>+ * Copyright 2006-2013 Solarflare Communications Inc.</div><div class='add'>+ * Copyright (C) 2022-2023, Advanced Micro Devices, Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CDX_BITFIELD_H</div><div class='add'>+#define CDX_BITFIELD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+/* Lowest bit numbers and widths */</div><div class='add'>+#define CDX_DWORD_LBN 0</div><div class='add'>+#define CDX_DWORD_WIDTH 32</div><div class='add'>+</div><div class='add'>+/* Specified attribute (e.g. LBN) of the specified field */</div><div class='add'>+#define CDX_VAL(field, attribute) field ## _ ## attribute</div><div class='add'>+/* Low bit number of the specified field */</div><div class='add'>+#define CDX_LOW_BIT(field) CDX_VAL(field, LBN)</div><div class='add'>+/* Bit width of the specified field */</div><div class='add'>+#define CDX_WIDTH(field) CDX_VAL(field, WIDTH)</div><div class='add'>+/* High bit number of the specified field */</div><div class='add'>+#define CDX_HIGH_BIT(field) (CDX_LOW_BIT(field) + CDX_WIDTH(field) - 1)</div><div class='add'>+</div><div class='add'>+/* A doubleword (i.e. 4 byte) datatype - little-endian in HW */</div><div class='add'>+struct cdx_dword {</div><div class='add'>+	__le32 cdx_u32;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Value expanders for printk */</div><div class='add'>+#define CDX_DWORD_VAL(dword)				\</div><div class='add'>+	((unsigned int)le32_to_cpu((dword).cdx_u32))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Extract bit field portion [low,high) from the 32-bit little-endian</div><div class='add'>+ * element which contains bits [min,max)</div><div class='add'>+ */</div><div class='add'>+#define CDX_DWORD_FIELD(dword, field)					\</div><div class='add'>+	(FIELD_GET(GENMASK(CDX_HIGH_BIT(field), CDX_LOW_BIT(field)),	\</div><div class='add'>+		   le32_to_cpu((dword).cdx_u32)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Creates the portion of the named bit field that lies within the</div><div class='add'>+ * range [min,max).</div><div class='add'>+ */</div><div class='add'>+#define CDX_INSERT_FIELD(field, value)				\</div><div class='add'>+	(FIELD_PREP(GENMASK(CDX_HIGH_BIT(field),		\</div><div class='add'>+			    CDX_LOW_BIT(field)), value))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Creates the portion of the named bit fields that lie within the</div><div class='add'>+ * range [min,max).</div><div class='add'>+ */</div><div class='add'>+#define CDX_INSERT_FIELDS(field1, value1,		\</div><div class='add'>+			  field2, value2,		\</div><div class='add'>+			  field3, value3,		\</div><div class='add'>+			  field4, value4,		\</div><div class='add'>+			  field5, value5,		\</div><div class='add'>+			  field6, value6,		\</div><div class='add'>+			  field7, value7)		\</div><div class='add'>+	(CDX_INSERT_FIELD(field1, (value1)) |		\</div><div class='add'>+	 CDX_INSERT_FIELD(field2, (value2)) |		\</div><div class='add'>+	 CDX_INSERT_FIELD(field3, (value3)) |		\</div><div class='add'>+	 CDX_INSERT_FIELD(field4, (value4)) |		\</div><div class='add'>+	 CDX_INSERT_FIELD(field5, (value5)) |		\</div><div class='add'>+	 CDX_INSERT_FIELD(field6, (value6)) |		\</div><div class='add'>+	 CDX_INSERT_FIELD(field7, (value7)))</div><div class='add'>+</div><div class='add'>+#define CDX_POPULATE_DWORD(dword, ...)					\</div><div class='add'>+	(dword).cdx_u32 = cpu_to_le32(CDX_INSERT_FIELDS(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+/* Populate a dword field with various numbers of arguments */</div><div class='add'>+#define CDX_POPULATE_DWORD_7 CDX_POPULATE_DWORD</div><div class='add'>+#define CDX_POPULATE_DWORD_6(dword, ...) \</div><div class='add'>+	CDX_POPULATE_DWORD_7(dword, CDX_DWORD, 0, __VA_ARGS__)</div><div class='add'>+#define CDX_POPULATE_DWORD_5(dword, ...) \</div><div class='add'>+	CDX_POPULATE_DWORD_6(dword, CDX_DWORD, 0, __VA_ARGS__)</div><div class='add'>+#define CDX_POPULATE_DWORD_4(dword, ...) \</div><div class='add'>+	CDX_POPULATE_DWORD_5(dword, CDX_DWORD, 0, __VA_ARGS__)</div><div class='add'>+#define CDX_POPULATE_DWORD_3(dword, ...) \</div><div class='add'>+	CDX_POPULATE_DWORD_4(dword, CDX_DWORD, 0, __VA_ARGS__)</div><div class='add'>+#define CDX_POPULATE_DWORD_2(dword, ...) \</div><div class='add'>+	CDX_POPULATE_DWORD_3(dword, CDX_DWORD, 0, __VA_ARGS__)</div><div class='add'>+#define CDX_POPULATE_DWORD_1(dword, ...) \</div><div class='add'>+	CDX_POPULATE_DWORD_2(dword, CDX_DWORD, 0, __VA_ARGS__)</div><div class='add'>+#define CDX_SET_DWORD(dword) \</div><div class='add'>+	CDX_POPULATE_DWORD_1(dword, CDX_DWORD, 0xffffffff)</div><div class='add'>+</div><div class='add'>+#endif /* CDX_BITFIELD_H */</div><div class='head'>diff --git a/include/linux/cdx/cdx_bus.h b/include/linux/cdx/cdx_bus.h<br/>index 6355a36a3f81..b1ba97f6c9ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cdx/cdx_bus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cdx/cdx_bus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cdx/cdx_bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cdx/cdx_bus.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/msi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX_CDX_DEV_RESOURCES	4</div><div class='ctx'> #define CDX_CONTROLLER_ID_SHIFT 4</div><div class='hunk'>@@ -21,13 +22,25 @@</div><div class='ctx'> struct cdx_controller;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	CDX_DEV_MSI_CONF,</div><div class='ctx'> 	CDX_DEV_BUS_MASTER_CONF,</div><div class='ctx'> 	CDX_DEV_RESET_CONF,</div><div class='add'>+	CDX_DEV_MSI_ENABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cdx_msi_config {</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 data;</div><div class='add'>+	u16 msi_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cdx_device_config {</div><div class='ctx'> 	u8 type;</div><div class='del'>-	bool bus_master_enable;</div><div class='add'>+	union {</div><div class='add'>+		struct cdx_msi_config msi;</div><div class='add'>+		bool bus_master_enable;</div><div class='add'>+		bool msi_enable;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef int (*cdx_bus_enable_cb)(struct cdx_controller *cdx, u8 bus_num);</div><div class='hunk'>@@ -87,6 +100,7 @@ struct cdx_ops {</div><div class='ctx'>  * struct cdx_controller: CDX controller object</div><div class='ctx'>  * @dev: Linux device associated with the CDX controller.</div><div class='ctx'>  * @priv: private data</div><div class='add'>+ * @msi_domain: MSI domain</div><div class='ctx'>  * @id: Controller ID</div><div class='ctx'>  * @controller_registered: controller registered with bus</div><div class='ctx'>  * @ops: CDX controller ops</div><div class='hunk'>@@ -94,6 +108,7 @@ struct cdx_ops {</div><div class='ctx'> struct cdx_controller {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	void *priv;</div><div class='add'>+	struct irq_domain *msi_domain;</div><div class='ctx'> 	u32 id;</div><div class='ctx'> 	bool controller_registered;</div><div class='ctx'> 	struct cdx_ops *ops;</div><div class='hunk'>@@ -120,9 +135,13 @@ struct cdx_controller {</div><div class='ctx'>  * @req_id: Requestor ID associated with CDX device</div><div class='ctx'>  * @is_bus: Is this bus device</div><div class='ctx'>  * @enabled: is this bus enabled</div><div class='add'>+ * @msi_dev_id: MSI Device ID associated with CDX device</div><div class='add'>+ * @num_msi: Number of MSI's supported by the device</div><div class='ctx'>  * @driver_override: driver name to force a match; do not set directly,</div><div class='ctx'>  *                   because core frees it; use driver_set_override() to</div><div class='ctx'>  *                   set or clear it.</div><div class='add'>+ * @irqchip_lock: lock to synchronize irq/msi configuration</div><div class='add'>+ * @msi_write_pending: MSI write pending for this device</div><div class='ctx'>  */</div><div class='ctx'> struct cdx_device {</div><div class='ctx'> 	struct device dev;</div><div class='hunk'>@@ -144,7 +163,11 @@ struct cdx_device {</div><div class='ctx'> 	u32 req_id;</div><div class='ctx'> 	bool is_bus;</div><div class='ctx'> 	bool enabled;</div><div class='add'>+	u32 msi_dev_id;</div><div class='add'>+	u32 num_msi;</div><div class='ctx'> 	const char *driver_override;</div><div class='add'>+	struct mutex irqchip_lock;</div><div class='add'>+	bool msi_write_pending;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_cdx_device(_dev) \</div><div class='hunk'>@@ -188,7 +211,7 @@ struct cdx_driver {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_cdx_driver(_drv) \</div><div class='del'>-	container_of(_drv, struct cdx_driver, driver)</div><div class='add'>+	container_of_const(_drv, struct cdx_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /* Macro to avoid include chaining to get THIS_MODULE */</div><div class='ctx'> #define cdx_driver_register(drv) \</div><div class='hunk'>@@ -211,7 +234,7 @@ int __must_check __cdx_driver_register(struct cdx_driver *cdx_driver,</div><div class='ctx'>  */</div><div class='ctx'> void cdx_driver_unregister(struct cdx_driver *cdx_driver);</div><div class='ctx'> </div><div class='del'>-extern struct bus_type cdx_bus_type;</div><div class='add'>+extern const struct bus_type cdx_bus_type;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cdx_dev_reset - Reset CDX device</div><div class='hunk'>@@ -237,4 +260,32 @@ int cdx_set_master(struct cdx_device *cdx_dev);</div><div class='ctx'>  */</div><div class='ctx'> int cdx_clear_master(struct cdx_device *cdx_dev);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GENERIC_MSI_IRQ</div><div class='add'>+/**</div><div class='add'>+ * cdx_enable_msi - Enable MSI for the CDX device.</div><div class='add'>+ * @cdx_dev: device pointer</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, -errno on failure</div><div class='add'>+ */</div><div class='add'>+int cdx_enable_msi(struct cdx_device *cdx_dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cdx_disable_msi - Disable MSI for the CDX device.</div><div class='add'>+ * @cdx_dev: device pointer</div><div class='add'>+ */</div><div class='add'>+void cdx_disable_msi(struct cdx_device *cdx_dev);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_GENERIC_MSI_IRQ */</div><div class='add'>+</div><div class='add'>+static inline int cdx_enable_msi(struct cdx_device *cdx_dev)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cdx_disable_msi(struct cdx_device *cdx_dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_GENERIC_MSI_IRQ */</div><div class='add'>+</div><div class='ctx'> #endif /* _CDX_BUS_H_ */</div><div class='head'>diff --git a/include/linux/cdx/edac_cdx_pcol.h b/include/linux/cdx/edac_cdx_pcol.h<br/>new file mode 100644<br/>index 000000000000..749db33bb482<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cdx/edac_cdx_pcol.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cdx/edac_cdx_pcol.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Driver for AMD network controllers and boards</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021, Xilinx, Inc.</div><div class='add'>+ * Copyright (C) 2022-2023, Advanced Micro Devices, Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef MC_CDX_PCOL_H</div><div class='add'>+#define MC_CDX_PCOL_H</div><div class='add'>+#include  &lt;linux/cdx/mcdi.h&gt;</div><div class='add'>+</div><div class='add'>+#define MC_CMD_EDAC_GET_DDR_CONFIG_OUT_WORD_LENGTH_LEN		4</div><div class='add'>+/* Number of registers for the DDR controller */</div><div class='add'>+#define MC_CMD_GET_DDR_CONFIG_OFST	4</div><div class='add'>+#define MC_CMD_GET_DDR_CONFIG_LEN	4</div><div class='add'>+</div><div class='add'>+/***********************************/</div><div class='add'>+/* MC_CMD_EDAC_GET_DDR_CONFIG</div><div class='add'>+ * Provides detailed configuration for the DDR controller of the given index.</div><div class='add'>+ */</div><div class='add'>+#define MC_CMD_EDAC_GET_DDR_CONFIG 0x3</div><div class='add'>+</div><div class='add'>+/* MC_CMD_EDAC_GET_DDR_CONFIG_IN msgrequest */</div><div class='add'>+#define MC_CMD_EDAC_GET_DDR_CONFIG_IN_CONTROLLER_INDEX_OFST		0</div><div class='add'>+#define MC_CMD_EDAC_GET_DDR_CONFIG_IN_CONTROLLER_INDEX_LEN		4</div><div class='add'>+</div><div class='add'>+#endif /* MC_CDX_PCOL_H */</div><div class='head'>diff --git a/include/linux/cdx/mcdi.h b/include/linux/cdx/mcdi.h<br/>new file mode 100644<br/>index 000000000000..74075305cba4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cdx/mcdi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cdx/mcdi.h</a></div><div class='hunk'>@@ -0,0 +1,199 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2008-2013 Solarflare Communications Inc.</div><div class='add'>+ * Copyright (C) 2022-2023, Advanced Micro Devices, Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CDX_MCDI_H</div><div class='add'>+#define CDX_MCDI_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/rpmsg.h&gt;</div><div class='add'>+</div><div class='add'>+#include "linux/cdx/bitfield.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum cdx_mcdi_mode - MCDI transaction mode</div><div class='add'>+ * @MCDI_MODE_EVENTS: wait for an mcdi response callback.</div><div class='add'>+ * @MCDI_MODE_FAIL: we think MCDI is dead, so fail-fast all calls</div><div class='add'>+ */</div><div class='add'>+enum cdx_mcdi_mode {</div><div class='add'>+	MCDI_MODE_EVENTS,</div><div class='add'>+	MCDI_MODE_FAIL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCDI_RPC_TIMEOUT	(10 * HZ)</div><div class='add'>+#define MCDI_RPC_LONG_TIMEOU	(60 * HZ)</div><div class='add'>+#define MCDI_RPC_POST_RST_TIME	(10 * HZ)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum cdx_mcdi_cmd_state - State for an individual MCDI command</div><div class='add'>+ * @MCDI_STATE_QUEUED: Command not started and is waiting to run.</div><div class='add'>+ * @MCDI_STATE_RETRY: Command was submitted and MC rejected with no resources,</div><div class='add'>+ *	as MC have too many outstanding commands. Command will be retried once</div><div class='add'>+ *	another command returns.</div><div class='add'>+ * @MCDI_STATE_RUNNING: Command was accepted and is running.</div><div class='add'>+ * @MCDI_STATE_RUNNING_CANCELLED: Command is running but the issuer cancelled</div><div class='add'>+ *	the command.</div><div class='add'>+ * @MCDI_STATE_FINISHED: Processing of this command has completed.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum cdx_mcdi_cmd_state {</div><div class='add'>+	MCDI_STATE_QUEUED,</div><div class='add'>+	MCDI_STATE_RETRY,</div><div class='add'>+	MCDI_STATE_RUNNING,</div><div class='add'>+	MCDI_STATE_RUNNING_CANCELLED,</div><div class='add'>+	MCDI_STATE_FINISHED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cdx_mcdi - CDX MCDI Firmware interface, to interact</div><div class='add'>+ *	with CDX controller.</div><div class='add'>+ * @mcdi: MCDI interface</div><div class='add'>+ * @mcdi_ops: MCDI operations</div><div class='add'>+ * @r5_rproc : R5 Remoteproc device handle</div><div class='add'>+ * @rpdev: RPMsg device</div><div class='add'>+ * @ept: RPMsg endpoint</div><div class='add'>+ * @work: Post probe work</div><div class='add'>+ */</div><div class='add'>+struct cdx_mcdi {</div><div class='add'>+	/* MCDI interface */</div><div class='add'>+	struct cdx_mcdi_data *mcdi;</div><div class='add'>+	const struct cdx_mcdi_ops *mcdi_ops;</div><div class='add'>+</div><div class='add'>+	struct rproc *r5_rproc;</div><div class='add'>+	struct rpmsg_device *rpdev;</div><div class='add'>+	struct rpmsg_endpoint *ept;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cdx_mcdi_ops {</div><div class='add'>+	void (*mcdi_request)(struct cdx_mcdi *cdx,</div><div class='add'>+			     const struct cdx_dword *hdr, size_t hdr_len,</div><div class='add'>+			     const struct cdx_dword *sdu, size_t sdu_len);</div><div class='add'>+	unsigned int (*mcdi_rpc_timeout)(struct cdx_mcdi *cdx, unsigned int cmd);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef void cdx_mcdi_async_completer(struct cdx_mcdi *cdx,</div><div class='add'>+				      unsigned long cookie, int rc,</div><div class='add'>+				      struct cdx_dword *outbuf,</div><div class='add'>+				      size_t outlen_actual);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cdx_mcdi_cmd - An outstanding MCDI command</div><div class='add'>+ * @ref: Reference count. There will be one reference if the command is</div><div class='add'>+ *	in the mcdi_iface cmd_list, another if it's on a cleanup list,</div><div class='add'>+ *	and a third if it's queued in the work queue.</div><div class='add'>+ * @list: The data for this entry in mcdi-&gt;cmd_list</div><div class='add'>+ * @cleanup_list: The data for this entry in a cleanup list</div><div class='add'>+ * @work: The work item for this command, queued in mcdi-&gt;workqueue</div><div class='add'>+ * @mcdi: The mcdi_iface for this command</div><div class='add'>+ * @state: The state of this command</div><div class='add'>+ * @inlen: inbuf length</div><div class='add'>+ * @inbuf: Input buffer</div><div class='add'>+ * @quiet: Whether to silence errors</div><div class='add'>+ * @reboot_seen: Whether a reboot has been seen during this command,</div><div class='add'>+ *	to prevent duplicates</div><div class='add'>+ * @seq: Sequence number</div><div class='add'>+ * @started: Jiffies this command was started at</div><div class='add'>+ * @cookie: Context for completion function</div><div class='add'>+ * @completer: Completion function</div><div class='add'>+ * @handle: Command handle</div><div class='add'>+ * @cmd: Command number</div><div class='add'>+ * @rc: Return code</div><div class='add'>+ * @outlen: Length of output buffer</div><div class='add'>+ * @outbuf: Output buffer</div><div class='add'>+ */</div><div class='add'>+struct cdx_mcdi_cmd {</div><div class='add'>+	struct kref ref;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct list_head cleanup_list;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct cdx_mcdi_iface *mcdi;</div><div class='add'>+	enum cdx_mcdi_cmd_state state;</div><div class='add'>+	size_t inlen;</div><div class='add'>+	const struct cdx_dword *inbuf;</div><div class='add'>+	bool quiet;</div><div class='add'>+	bool reboot_seen;</div><div class='add'>+	u8 seq;</div><div class='add'>+	unsigned long started;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+	cdx_mcdi_async_completer *completer;</div><div class='add'>+	unsigned int handle;</div><div class='add'>+	unsigned int cmd;</div><div class='add'>+	int rc;</div><div class='add'>+	size_t outlen;</div><div class='add'>+	struct cdx_dword *outbuf;</div><div class='add'>+	/* followed by inbuf data if necessary */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cdx_mcdi_iface - MCDI protocol context</div><div class='add'>+ * @cdx: The associated NIC</div><div class='add'>+ * @iface_lock: Serialise access to this structure</div><div class='add'>+ * @outstanding_cleanups: Count of cleanups</div><div class='add'>+ * @cmd_list: List of outstanding and running commands</div><div class='add'>+ * @workqueue: Workqueue used for delayed processing</div><div class='add'>+ * @cmd_complete_wq: Waitqueue for command completion</div><div class='add'>+ * @db_held_by: Command the MC doorbell is in use by</div><div class='add'>+ * @seq_held_by: Command each sequence number is in use by</div><div class='add'>+ * @prev_handle: The last used command handle</div><div class='add'>+ * @mode: Poll for mcdi completion, or wait for an mcdi_event</div><div class='add'>+ * @prev_seq: The last used sequence number</div><div class='add'>+ * @new_epoch: Indicates start of day or start of MC reboot recovery</div><div class='add'>+ */</div><div class='add'>+struct cdx_mcdi_iface {</div><div class='add'>+	struct cdx_mcdi *cdx;</div><div class='add'>+	/* Serialise access */</div><div class='add'>+	struct mutex iface_lock;</div><div class='add'>+	unsigned int outstanding_cleanups;</div><div class='add'>+	struct list_head cmd_list;</div><div class='add'>+	struct workqueue_struct *workqueue;</div><div class='add'>+	wait_queue_head_t cmd_complete_wq;</div><div class='add'>+	struct cdx_mcdi_cmd *db_held_by;</div><div class='add'>+	struct cdx_mcdi_cmd *seq_held_by[16];</div><div class='add'>+	unsigned int prev_handle;</div><div class='add'>+	enum cdx_mcdi_mode mode;</div><div class='add'>+	u8 prev_seq;</div><div class='add'>+	bool new_epoch;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cdx_mcdi_data - extra state for NICs that implement MCDI</div><div class='add'>+ * @iface: Interface/protocol state</div><div class='add'>+ * @fn_flags: Flags for this function, as returned by %MC_CMD_DRV_ATTACH.</div><div class='add'>+ */</div><div class='add'>+struct cdx_mcdi_data {</div><div class='add'>+	struct cdx_mcdi_iface iface;</div><div class='add'>+	u32 fn_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void cdx_mcdi_finish(struct cdx_mcdi *cdx);</div><div class='add'>+int cdx_mcdi_init(struct cdx_mcdi *cdx);</div><div class='add'>+void cdx_mcdi_process_cmd(struct cdx_mcdi *cdx, struct cdx_dword *outbuf, int len);</div><div class='add'>+int cdx_mcdi_rpc(struct cdx_mcdi *cdx, unsigned int cmd,</div><div class='add'>+		 const struct cdx_dword *inbuf, size_t inlen,</div><div class='add'>+		 struct cdx_dword *outbuf, size_t outlen, size_t *outlen_actual);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We expect that 16- and 32-bit fields in MCDI requests and responses</div><div class='add'>+ * are appropriately aligned, but 64-bit fields are only</div><div class='add'>+ * 32-bit-aligned.</div><div class='add'>+ */</div><div class='add'>+#define MCDI_DECLARE_BUF(_name, _len) struct cdx_dword _name[DIV_ROUND_UP(_len, 4)] = {{0}}</div><div class='add'>+#define _MCDI_PTR(_buf, _offset)					\</div><div class='add'>+	((u8 *)(_buf) + (_offset))</div><div class='add'>+#define MCDI_PTR(_buf, _field)						\</div><div class='add'>+	_MCDI_PTR(_buf, MC_CMD_ ## _field ## _OFST)</div><div class='add'>+#define _MCDI_CHECK_ALIGN(_ofst, _align)				\</div><div class='add'>+	((void)BUILD_BUG_ON_ZERO((_ofst) &amp; ((_align) - 1)),		\</div><div class='add'>+	 (_ofst))</div><div class='add'>+#define _MCDI_DWORD(_buf, _field)					\</div><div class='add'>+	((_buf) + (_MCDI_CHECK_ALIGN(MC_CMD_ ## _field ## _OFST, 4) &gt;&gt; 2))</div><div class='add'>+</div><div class='add'>+#define MCDI_SET_DWORD(_buf, _field, _value)				\</div><div class='add'>+	CDX_POPULATE_DWORD_1(*_MCDI_DWORD(_buf, _field), CDX_DWORD, _value)</div><div class='add'>+#define MCDI_DWORD(_buf, _field)					\</div><div class='add'>+	CDX_DWORD_FIELD(*_MCDI_DWORD(_buf, _field), CDX_DWORD)</div><div class='add'>+#endif /* CDX_MCDI_H */</div><div class='head'>diff --git a/include/linux/ceph/ceph_debug.h b/include/linux/ceph/ceph_debug.h<br/>index 11a92a946016..5f904591fa5f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/ceph_debug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/ceph_debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/ceph_debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ceph/ceph_debug.h</a></div><div class='hunk'>@@ -27,17 +27,13 @@</div><div class='ctx'> 		 ##__VA_ARGS__)</div><div class='ctx'> # else</div><div class='ctx'> /* faux printk call just to see any compiler warnings. */</div><div class='del'>-#  define dout(fmt, ...)	do {				\</div><div class='del'>-		if (0)						\</div><div class='del'>-			printk(KERN_DEBUG fmt, ##__VA_ARGS__);	\</div><div class='del'>-	} while (0)</div><div class='del'>-#  define doutc(client, fmt, ...)	do {			\</div><div class='del'>-		if (0)						\</div><div class='del'>-			printk(KERN_DEBUG "[%pU %llu] " fmt,	\</div><div class='del'>-			&amp;client-&gt;fsid,				\</div><div class='del'>-			client-&gt;monc.auth-&gt;global_id,		\</div><div class='del'>-			##__VA_ARGS__);				\</div><div class='del'>-		} while (0)</div><div class='add'>+#  define dout(fmt, ...)					\</div><div class='add'>+		no_printk(KERN_DEBUG fmt, ##__VA_ARGS__)</div><div class='add'>+#  define doutc(client, fmt, ...)				\</div><div class='add'>+		no_printk(KERN_DEBUG "[%pU %llu] " fmt,		\</div><div class='add'>+			  &amp;client-&gt;fsid,			\</div><div class='add'>+			  client-&gt;monc.auth-&gt;global_id,		\</div><div class='add'>+			  ##__VA_ARGS__)</div><div class='ctx'> # endif</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='head'>diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h<br/>index ee1d0e5f9789..c7f2c63b3bc3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/ceph_fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/ceph_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/ceph_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ceph/ceph_fs.h</a></div><div class='hunk'>@@ -504,20 +504,6 @@ struct ceph_mds_request_head_legacy {</div><div class='ctx'> </div><div class='ctx'> #define CEPH_MDS_REQUEST_HEAD_VERSION  3</div><div class='ctx'> </div><div class='del'>-struct ceph_mds_request_head_old {</div><div class='del'>-	__le16 version;                /* struct version */</div><div class='del'>-	__le64 oldest_client_tid;</div><div class='del'>-	__le32 mdsmap_epoch;           /* on client */</div><div class='del'>-	__le32 flags;                  /* CEPH_MDS_FLAG_* */</div><div class='del'>-	__u8 num_retry, num_fwd;       /* count retry, fwd attempts */</div><div class='del'>-	__le16 num_releases;           /* # include cap/lease release records */</div><div class='del'>-	__le32 op;                     /* mds op code */</div><div class='del'>-	__le32 caller_uid, caller_gid;</div><div class='del'>-	__le64 ino;                    /* use this ino for openc, mkdir, mknod,</div><div class='del'>-					  etc. (if replaying) */</div><div class='del'>-	union ceph_mds_request_args_ext args;</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='ctx'> struct ceph_mds_request_head {</div><div class='ctx'> 	__le16 version;                /* struct version */</div><div class='ctx'> 	__le64 oldest_client_tid;</div><div class='hunk'>@@ -808,7 +794,7 @@ struct ceph_mds_caps {</div><div class='ctx'> </div><div class='ctx'> struct ceph_mds_cap_peer {</div><div class='ctx'> 	__le64 cap_id;</div><div class='del'>-	__le32 seq;</div><div class='add'>+	__le32 issue_seq;</div><div class='ctx'> 	__le32 mseq;</div><div class='ctx'> 	__le32 mds;</div><div class='ctx'> 	__u8   flags;</div><div class='hunk'>@@ -822,7 +808,7 @@ struct ceph_mds_cap_release {</div><div class='ctx'> struct ceph_mds_cap_item {</div><div class='ctx'> 	__le64 ino;</div><div class='ctx'> 	__le64 cap_id;</div><div class='del'>-	__le32 migrate_seq, seq;</div><div class='add'>+	__le32 migrate_seq, issue_seq;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> #define CEPH_MDS_LEASE_REVOKE           1  /*    mds  -&gt; client */</div><div class='head'>diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h<br/>index 04f3ace5787b..8fc1aed64113 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/decode.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/decode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/decode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ceph/decode.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ceph/types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h<br/>index 4497d0a6772c..63e0e2aa1ce9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/libceph.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/libceph.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/libceph.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ceph/libceph.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ceph/ceph_debug.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/exportfs.h&gt;</div><div class='hunk'>@@ -306,8 +306,7 @@ struct ceph_entity_addr *ceph_client_addr(struct ceph_client *client);</div><div class='ctx'> u64 ceph_client_gid(struct ceph_client *client);</div><div class='ctx'> extern void ceph_destroy_client(struct ceph_client *client);</div><div class='ctx'> extern void ceph_reset_client_addr(struct ceph_client *client);</div><div class='del'>-extern int __ceph_open_session(struct ceph_client *client,</div><div class='del'>-			       unsigned long started);</div><div class='add'>+extern int __ceph_open_session(struct ceph_client *client);</div><div class='ctx'> extern int ceph_open_session(struct ceph_client *client);</div><div class='ctx'> int ceph_wait_for_latest_osdmap(struct ceph_client *client,</div><div class='ctx'> 				unsigned long timeout);</div><div class='hunk'>@@ -317,12 +316,6 @@ extern void ceph_release_page_vector(struct page **pages, int num_pages);</div><div class='ctx'> extern void ceph_put_page_vector(struct page **pages, int num_pages,</div><div class='ctx'> 				 bool dirty);</div><div class='ctx'> extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);</div><div class='del'>-extern int ceph_copy_user_to_page_vector(struct page **pages,</div><div class='del'>-					 const void __user *data,</div><div class='del'>-					 loff_t off, size_t len);</div><div class='del'>-extern void ceph_copy_to_page_vector(struct page **pages,</div><div class='del'>-				    const void *data,</div><div class='del'>-				    loff_t off, size_t len);</div><div class='ctx'> extern void ceph_copy_from_page_vector(struct page **pages,</div><div class='ctx'> 				    void *data,</div><div class='ctx'> 				    loff_t off, size_t len);</div><div class='head'>diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h<br/>index 1717cc57cdac..6aa4c6478c9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/messenger.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/messenger.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/messenger.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ceph/messenger.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #ifndef __FS_CEPH_MESSENGER_H</div><div class='ctx'> #define __FS_CEPH_MESSENGER_H</div><div class='ctx'> </div><div class='add'>+#include &lt;crypto/sha2.h&gt;</div><div class='ctx'> #include &lt;linux/bvec.h&gt;</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='hunk'>@@ -412,7 +413,8 @@ struct ceph_connection_v2_info {</div><div class='ctx'> 	struct ceph_msg_data_cursor in_cursor;</div><div class='ctx'> 	struct ceph_msg_data_cursor out_cursor;</div><div class='ctx'> </div><div class='del'>-	struct crypto_shash *hmac_tfm;  /* post-auth signature */</div><div class='add'>+	struct hmac_sha256_key hmac_key;  /* post-auth signature */</div><div class='add'>+	bool hmac_key_set;</div><div class='ctx'> 	struct crypto_aead *gcm_tfm;  /* on-wire encryption */</div><div class='ctx'> 	struct aead_request *gcm_req;</div><div class='ctx'> 	struct crypto_wait gcm_wait;</div><div class='hunk'>@@ -548,12 +550,12 @@ void ceph_addr_set_port(struct ceph_entity_addr *addr, int p);</div><div class='ctx'> void ceph_con_process_message(struct ceph_connection *con);</div><div class='ctx'> int ceph_con_in_msg_alloc(struct ceph_connection *con,</div><div class='ctx'> 			  struct ceph_msg_header *hdr, int *skip);</div><div class='del'>-void ceph_con_get_out_msg(struct ceph_connection *con);</div><div class='add'>+struct ceph_msg *ceph_con_get_out_msg(struct ceph_connection *con);</div><div class='ctx'> </div><div class='ctx'> /* messenger_v1.c */</div><div class='ctx'> int ceph_con_v1_try_read(struct ceph_connection *con);</div><div class='ctx'> int ceph_con_v1_try_write(struct ceph_connection *con);</div><div class='del'>-void ceph_con_v1_revoke(struct ceph_connection *con);</div><div class='add'>+void ceph_con_v1_revoke(struct ceph_connection *con, struct ceph_msg *msg);</div><div class='ctx'> void ceph_con_v1_revoke_incoming(struct ceph_connection *con);</div><div class='ctx'> bool ceph_con_v1_opened(struct ceph_connection *con);</div><div class='ctx'> void ceph_con_v1_reset_session(struct ceph_connection *con);</div><div class='hunk'>@@ -562,7 +564,7 @@ void ceph_con_v1_reset_protocol(struct ceph_connection *con);</div><div class='ctx'> /* messenger_v2.c */</div><div class='ctx'> int ceph_con_v2_try_read(struct ceph_connection *con);</div><div class='ctx'> int ceph_con_v2_try_write(struct ceph_connection *con);</div><div class='del'>-void ceph_con_v2_revoke(struct ceph_connection *con);</div><div class='add'>+void ceph_con_v2_revoke(struct ceph_connection *con, struct ceph_msg *msg);</div><div class='ctx'> void ceph_con_v2_revoke_incoming(struct ceph_connection *con);</div><div class='ctx'> bool ceph_con_v2_opened(struct ceph_connection *con);</div><div class='ctx'> void ceph_con_v2_reset_session(struct ceph_connection *con);</div><div class='head'>diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h<br/>index f66f6aac74f6..50b14a5661c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/osd_client.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/osd_client.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/osd_client.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ceph/osd_client.h</a></div><div class='hunk'>@@ -449,8 +449,6 @@ extern int ceph_osdc_init(struct ceph_osd_client *osdc,</div><div class='ctx'> extern void ceph_osdc_stop(struct ceph_osd_client *osdc);</div><div class='ctx'> extern void ceph_osdc_reopen_osds(struct ceph_osd_client *osdc);</div><div class='ctx'> </div><div class='del'>-extern void ceph_osdc_handle_reply(struct ceph_osd_client *osdc,</div><div class='del'>-				   struct ceph_msg *msg);</div><div class='ctx'> extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc,</div><div class='ctx'> 				 struct ceph_msg *msg);</div><div class='ctx'> void ceph_osdc_update_epoch_barrier(struct ceph_osd_client *osdc, u32 eb);</div><div class='hunk'>@@ -492,9 +490,6 @@ extern void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *,</div><div class='ctx'> 					struct page **pages, u64 length,</div><div class='ctx'> 					u32 alignment, bool pages_from_pool,</div><div class='ctx'> 					bool own_pages);</div><div class='del'>-extern void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *,</div><div class='del'>-					unsigned int which,</div><div class='del'>-					struct ceph_pagelist *pagelist);</div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='ctx'> void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,</div><div class='ctx'> 				    unsigned int which,</div><div class='hunk'>@@ -511,9 +506,6 @@ void osd_req_op_extent_osd_data_bvec_pos(struct ceph_osd_request *osd_req,</div><div class='ctx'> void osd_req_op_extent_osd_iter(struct ceph_osd_request *osd_req,</div><div class='ctx'> 				unsigned int which, struct iov_iter *iter);</div><div class='ctx'> </div><div class='del'>-extern void osd_req_op_cls_request_data_pagelist(struct ceph_osd_request *,</div><div class='del'>-					unsigned int which,</div><div class='del'>-					struct ceph_pagelist *pagelist);</div><div class='ctx'> extern void osd_req_op_cls_request_data_pages(struct ceph_osd_request *,</div><div class='ctx'> 					unsigned int which,</div><div class='ctx'> 					struct page **pages, u64 length,</div><div class='hunk'>@@ -628,8 +620,6 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,</div><div class='ctx'> 		     u32 timeout,</div><div class='ctx'> 		     struct page ***preply_pages,</div><div class='ctx'> 		     size_t *preply_len);</div><div class='del'>-int ceph_osdc_watch_check(struct ceph_osd_client *osdc,</div><div class='del'>-			  struct ceph_osd_linger_request *lreq);</div><div class='ctx'> int ceph_osdc_list_watchers(struct ceph_osd_client *osdc,</div><div class='ctx'> 			    struct ceph_object_id *oid,</div><div class='ctx'> 			    struct ceph_object_locator *oloc,</div><div class='head'>diff --git a/include/linux/ceph/pagelist.h b/include/linux/ceph/pagelist.h<br/>index 5dead8486fd8..879bec0863aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/pagelist.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ceph/pagelist.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ceph/pagelist.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ceph/pagelist.h</a></div><div class='hunk'>@@ -17,12 +17,6 @@ struct ceph_pagelist {</div><div class='ctx'> 	refcount_t refcnt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ceph_pagelist_cursor {</div><div class='del'>-	struct ceph_pagelist *pl;   /* pagelist, for error checking */</div><div class='del'>-	struct list_head *page_lru; /* page in list */</div><div class='del'>-	size_t room;		    /* room remaining to reset to */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct ceph_pagelist *ceph_pagelist_alloc(gfp_t gfp_flags);</div><div class='ctx'> </div><div class='ctx'> extern void ceph_pagelist_release(struct ceph_pagelist *pl);</div><div class='hunk'>@@ -33,12 +27,6 @@ extern int ceph_pagelist_reserve(struct ceph_pagelist *pl, size_t space);</div><div class='ctx'> </div><div class='ctx'> extern int ceph_pagelist_free_reserve(struct ceph_pagelist *pl);</div><div class='ctx'> </div><div class='del'>-extern void ceph_pagelist_set_cursor(struct ceph_pagelist *pl,</div><div class='del'>-				     struct ceph_pagelist_cursor *c);</div><div class='del'>-</div><div class='del'>-extern int ceph_pagelist_truncate(struct ceph_pagelist *pl,</div><div class='del'>-				  struct ceph_pagelist_cursor *c);</div><div class='del'>-</div><div class='ctx'> static inline int ceph_pagelist_encode_64(struct ceph_pagelist *pl, u64 v)</div><div class='ctx'> {</div><div class='ctx'> 	__le64 ev = cpu_to_le64(v);</div><div class='head'>diff --git a/include/linux/cfag12864b.h b/include/linux/cfag12864b.h<br/>index 6617d9c68d86..83e6613d12ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cfag12864b.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cfag12864b.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cfag12864b.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cfag12864b.h</a></div><div class='hunk'>@@ -28,13 +28,6 @@</div><div class='ctx'> extern unsigned char * cfag12864b_buffer;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Get the refresh rate of the LCD</div><div class='del'>- *</div><div class='del'>- * Returns the refresh rate (hertz).</div><div class='del'>- */</div><div class='del'>-extern unsigned int cfag12864b_getrate(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Enable refreshing</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 if successful (anyone was using it),</div><div class='hunk'>@@ -50,16 +43,6 @@ extern unsigned char cfag12864b_enable(void);</div><div class='ctx'> extern void cfag12864b_disable(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Is enabled refreshing? (is anyone using the module?)</div><div class='del'>- *</div><div class='del'>- * Returns 0 if refreshing is not enabled (anyone is using it),</div><div class='del'>- * or != 0 if refreshing is enabled (someone is using it).</div><div class='del'>- *</div><div class='del'>- * Useful for buffer read-only modules.</div><div class='del'>- */</div><div class='del'>-extern unsigned char cfag12864b_isenabled(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Is the module inited?</div><div class='ctx'>  */</div><div class='ctx'> extern unsigned char cfag12864b_isinited(void);</div><div class='head'>diff --git a/include/linux/cfi.h b/include/linux/cfi.h<br/>index f0df518e11dd..1fd22ea6eba4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cfi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cfi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cfi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cfi.h</a></div><div class='hunk'>@@ -11,14 +11,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/cfi.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef cfi_get_offset</div><div class='del'>-static inline int cfi_get_offset(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+#ifdef CONFIG_CFI</div><div class='add'>+extern bool cfi_warn;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CFI_CLANG</div><div class='ctx'> enum bug_trap_type report_cfi_failure(struct pt_regs *regs, unsigned long addr,</div><div class='ctx'> 				      unsigned long *target, u32 type);</div><div class='ctx'> </div><div class='hunk'>@@ -27,7 +22,45 @@ static inline enum bug_trap_type report_cfi_failure_noaddr(struct pt_regs *regs,</div><div class='ctx'> {</div><div class='ctx'> 	return report_cfi_failure(regs, addr, NULL, 0);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_CFI_CLANG */</div><div class='add'>+</div><div class='add'>+#ifndef cfi_get_offset</div><div class='add'>+/*</div><div class='add'>+ * Returns the CFI prefix offset. By default, the compiler emits only</div><div class='add'>+ * a 4-byte CFI type hash before the function. If an architecture</div><div class='add'>+ * uses -fpatchable-function-entry=N,M where M&gt;0 to change the prefix</div><div class='add'>+ * offset, they must override this function.</div><div class='add'>+ */</div><div class='add'>+static inline int cfi_get_offset(void)</div><div class='add'>+{</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef cfi_get_func_hash</div><div class='add'>+static inline u32 cfi_get_func_hash(void *func)</div><div class='add'>+{</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	if (get_kernel_nofault(hash, func - cfi_get_offset()))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return hash;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* CFI type hashes for BPF function types */</div><div class='add'>+extern u32 cfi_bpf_hash;</div><div class='add'>+extern u32 cfi_bpf_subprog_hash;</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_CFI */</div><div class='add'>+</div><div class='add'>+static inline int cfi_get_offset(void) { return 0; }</div><div class='add'>+static inline u32 cfi_get_func_hash(void *func) { return 0; }</div><div class='add'>+</div><div class='add'>+#define cfi_bpf_hash 0U</div><div class='add'>+#define cfi_bpf_subprog_hash 0U</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_CFI */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_USES_CFI_TRAPS</div><div class='ctx'> bool is_cfi_trap(unsigned long addr);</div><div class='head'>diff --git a/include/linux/cfi_types.h b/include/linux/cfi_types.h<br/>index 6b8713675765..a86af9bc8bdc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cfi_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cfi_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cfi_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cfi_types.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #ifdef __ASSEMBLY__</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CFI_CLANG</div><div class='add'>+#ifdef CONFIG_CFI</div><div class='ctx'> /*</div><div class='ctx'>  * Use the __kcfi_typeid_&lt;function&gt; type identifier symbol to</div><div class='ctx'>  * annotate indirectly called assembly functions. The compiler emits</div><div class='hunk'>@@ -29,17 +29,40 @@</div><div class='ctx'> #define SYM_TYPED_START(name, linkage, align...)	\</div><div class='ctx'> 	SYM_TYPED_ENTRY(name, linkage, align)</div><div class='ctx'> </div><div class='del'>-#else /* CONFIG_CFI_CLANG */</div><div class='add'>+#else /* CONFIG_CFI */</div><div class='ctx'> </div><div class='ctx'> #define SYM_TYPED_START(name, linkage, align...)	\</div><div class='ctx'> 	SYM_START(name, linkage, align)</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_CFI_CLANG */</div><div class='add'>+#endif /* CONFIG_CFI */</div><div class='ctx'> </div><div class='ctx'> #ifndef SYM_TYPED_FUNC_START</div><div class='ctx'> #define SYM_TYPED_FUNC_START(name) 			\</div><div class='ctx'> 	SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#else /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CFI</div><div class='add'>+#define DEFINE_CFI_TYPE(name, func)						\</div><div class='add'>+	/*									\</div><div class='add'>+	 * Force a reference to the function so the compiler generates		\</div><div class='add'>+	 * __kcfi_typeid_&lt;func&gt;.						\</div><div class='add'>+	 */									\</div><div class='add'>+	__ADDRESSABLE(func);							\</div><div class='add'>+	/* u32 name __ro_after_init = __kcfi_typeid_&lt;func&gt; */			\</div><div class='add'>+	extern u32 name;							\</div><div class='add'>+	asm (									\</div><div class='add'>+	"	.pushsection	.data..ro_after_init,\"aw\",\%progbits	\n"	\</div><div class='add'>+	"	.type	" #name ",\%object				\n"	\</div><div class='add'>+	"	.globl	" #name "					\n"	\</div><div class='add'>+	"	.p2align	2, 0x0					\n"	\</div><div class='add'>+	#name ":							\n"	\</div><div class='add'>+	"	.4byte	__kcfi_typeid_" #func "				\n"	\</div><div class='add'>+	"	.size	" #name ", 4					\n"	\</div><div class='add'>+	"	.popsection						\n"	\</div><div class='add'>+	);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* _LINUX_CFI_TYPES_H */</div><div class='head'>diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h<br/>index ea48c861cd36..b760a3c470a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cgroup-defs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cgroup-defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cgroup-defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cgroup-defs.h</a></div><div class='hunk'>@@ -71,9 +71,6 @@ enum {</div><div class='ctx'> </div><div class='ctx'> 	/* Cgroup is frozen. */</div><div class='ctx'> 	CGRP_FROZEN,</div><div class='del'>-</div><div class='del'>-	/* Control group has to be killed. */</div><div class='del'>-	CGRP_KILL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* cgroup_root-&gt;flags */</div><div class='hunk'>@@ -94,6 +91,12 @@ enum {</div><div class='ctx'> 	 * cgroup_threadgroup_rwsem. This makes hot path operations such as</div><div class='ctx'> 	 * forks and exits into the slow path and more expensive.</div><div class='ctx'> 	 *</div><div class='add'>+	 * Alleviate the contention between fork, exec, exit operations and</div><div class='add'>+	 * writing to cgroup.procs by taking a per threadgroup rwsem instead of</div><div class='add'>+	 * the global cgroup_threadgroup_rwsem. Fork and other operations</div><div class='add'>+	 * from threads in different thread groups no longer contend with</div><div class='add'>+	 * writing to cgroup.procs.</div><div class='add'>+	 *</div><div class='ctx'> 	 * The static usage pattern of creating a cgroup, enabling controllers,</div><div class='ctx'> 	 * and then seeding it with CLONE_INTO_CGROUP doesn't require write</div><div class='ctx'> 	 * locking cgroup_threadgroup_rwsem and thus doesn't benefit from</div><div class='hunk'>@@ -119,7 +122,12 @@ enum {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable hugetlb accounting for the memory controller.</div><div class='ctx'> 	 */</div><div class='del'>-	 CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING = (1 &lt;&lt; 19),</div><div class='add'>+	CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING = (1 &lt;&lt; 19),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable legacy local pids.events.</div><div class='add'>+	 */</div><div class='add'>+	CGRP_ROOT_PIDS_LOCAL_EVENTS = (1 &lt;&lt; 20),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* cftype-&gt;flags */</div><div class='hunk'>@@ -138,6 +146,17 @@ enum {</div><div class='ctx'> 	__CFTYPE_ADDED		= (1 &lt;&lt; 18),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum cgroup_attach_lock_mode {</div><div class='add'>+	/* Default */</div><div class='add'>+	CGRP_ATTACH_LOCK_GLOBAL,</div><div class='add'>+</div><div class='add'>+	/* When pid=0 &amp;&amp; threadgroup=false, see comments in cgroup_procs_write_start */</div><div class='add'>+	CGRP_ATTACH_LOCK_NONE,</div><div class='add'>+</div><div class='add'>+	/* When favordynmods is on, see comments above CGRP_ROOT_FAVOR_DYNMODS */</div><div class='add'>+	CGRP_ATTACH_LOCK_PER_THREADGROUP,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * cgroup_file is the handle for a file instance created in a cgroup which</div><div class='ctx'>  * is used, for example, to generate file changed notifications.  This can</div><div class='hunk'>@@ -167,13 +186,31 @@ struct cgroup_subsys_state {</div><div class='ctx'> 	/* reference count - access via css_[try]get() and css_put() */</div><div class='ctx'> 	struct percpu_ref refcnt;</div><div class='ctx'> </div><div class='del'>-	/* siblings list anchored at the parent's -&gt;children */</div><div class='add'>+	/*</div><div class='add'>+	 * Depending on the context, this field is initialized</div><div class='add'>+	 * via css_rstat_init() at different places:</div><div class='add'>+	 *</div><div class='add'>+	 * when css is associated with cgroup::self</div><div class='add'>+	 *   when css-&gt;cgroup is the root cgroup</div><div class='add'>+	 *     performed in cgroup_init()</div><div class='add'>+	 *   when css-&gt;cgroup is not the root cgroup</div><div class='add'>+	 *     performed in cgroup_create()</div><div class='add'>+	 * when css is associated with a subsystem</div><div class='add'>+	 *   when css-&gt;cgroup is the root cgroup</div><div class='add'>+	 *     performed in cgroup_init_subsys() in the non-early path</div><div class='add'>+	 *   when css-&gt;cgroup is not the root cgroup</div><div class='add'>+	 *     performed in css_create()</div><div class='add'>+	 */</div><div class='add'>+	struct css_rstat_cpu __percpu *rstat_cpu;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * siblings list anchored at the parent's -&gt;children</div><div class='add'>+	 *</div><div class='add'>+	 * linkage is protected by cgroup_mutex or RCU</div><div class='add'>+	 */</div><div class='ctx'> 	struct list_head sibling;</div><div class='ctx'> 	struct list_head children;</div><div class='ctx'> </div><div class='del'>-	/* flush target list anchored at cgrp-&gt;rstat_css_list */</div><div class='del'>-	struct list_head rstat_css_node;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PI: Subsys-unique ID.  0 is unused and root is always 1.  The</div><div class='ctx'> 	 * matching css can be looked up using css_from_id().</div><div class='hunk'>@@ -205,6 +242,24 @@ struct cgroup_subsys_state {</div><div class='ctx'> 	 * fields of the containing structure.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct cgroup_subsys_state *parent;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Keep track of total numbers of visible descendant CSSes.</div><div class='add'>+	 * The total number of dying CSSes is tracked in</div><div class='add'>+	 * css-&gt;cgroup-&gt;nr_dying_subsys[ssid].</div><div class='add'>+	 * Protected by cgroup_mutex.</div><div class='add'>+	 */</div><div class='add'>+	int nr_descendants;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A singly-linked list of css structures to be rstat flushed.</div><div class='add'>+	 * This is a scratch field to be used exclusively by</div><div class='add'>+	 * css_rstat_flush().</div><div class='add'>+	 *</div><div class='add'>+	 * Protected by rstat_base_lock when css is cgroup::self.</div><div class='add'>+	 * Protected by css-&gt;ss-&gt;rstat_ss_lock otherwise.</div><div class='add'>+	 */</div><div class='add'>+	struct cgroup_subsys_state *rstat_flush_next;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -310,14 +365,15 @@ struct cgroup_base_stat {</div><div class='ctx'> #ifdef CONFIG_SCHED_CORE</div><div class='ctx'> 	u64 forceidle_sum;</div><div class='ctx'> #endif</div><div class='add'>+	u64 ntime;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * rstat - cgroup scalable recursive statistics.  Accounting is done</div><div class='del'>- * per-cpu in cgroup_rstat_cpu which is then lazily propagated up the</div><div class='add'>+ * per-cpu in css_rstat_cpu which is then lazily propagated up the</div><div class='ctx'>  * hierarchy on reads.</div><div class='ctx'>  *</div><div class='del'>- * When a stat gets updated, the cgroup_rstat_cpu and its ancestors are</div><div class='add'>+ * When a stat gets updated, the css_rstat_cpu and its ancestors are</div><div class='ctx'>  * linked into the updated tree.  On the following read, propagation only</div><div class='ctx'>  * considers and consumes the updated tree.  This makes reading O(the</div><div class='ctx'>  * number of descendants which have been active since last read) instead of</div><div class='hunk'>@@ -329,10 +385,26 @@ struct cgroup_base_stat {</div><div class='ctx'>  * frequency decreases the cost of each read.</div><div class='ctx'>  *</div><div class='ctx'>  * This struct hosts both the fields which implement the above -</div><div class='del'>- * updated_children and updated_next - and the fields which track basic</div><div class='del'>- * resource statistics on top of it - bsync, bstat and last_bstat.</div><div class='add'>+ * updated_children and updated_next.</div><div class='add'>+ */</div><div class='add'>+struct css_rstat_cpu {</div><div class='add'>+	/*</div><div class='add'>+	 * Child cgroups with stat updates on this cpu since the last read</div><div class='add'>+	 * are linked on the parent's -&gt;updated_children through</div><div class='add'>+	 * -&gt;updated_next. updated_children is terminated by its container css.</div><div class='add'>+	 */</div><div class='add'>+	struct cgroup_subsys_state *updated_children;</div><div class='add'>+	struct cgroup_subsys_state *updated_next;	/* NULL if not on the list */</div><div class='add'>+</div><div class='add'>+	struct llist_node lnode;		/* lockless list for update */</div><div class='add'>+	struct cgroup_subsys_state *owner;	/* back pointer */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This struct hosts the fields which track basic resource statistics on</div><div class='add'>+ * top of it - bsync, bstat and last_bstat.</div><div class='ctx'>  */</div><div class='del'>-struct cgroup_rstat_cpu {</div><div class='add'>+struct cgroup_rstat_base_cpu {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * -&gt;bsync protects -&gt;bstat.  These are the only fields which get</div><div class='ctx'> 	 * updated in the hot path.</div><div class='hunk'>@@ -359,20 +431,6 @@ struct cgroup_rstat_cpu {</div><div class='ctx'> 	 * deltas to propagate to the per-cpu subtree_bstat.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct cgroup_base_stat last_subtree_bstat;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Child cgroups with stat updates on this cpu since the last read</div><div class='del'>-	 * are linked on the parent's -&gt;updated_children through</div><div class='del'>-	 * -&gt;updated_next.</div><div class='del'>-	 *</div><div class='del'>-	 * In addition to being more compact, singly-linked list pointing</div><div class='del'>-	 * to the cgroup makes it unnecessary for each per-cpu struct to</div><div class='del'>-	 * point back to the associated cgroup.</div><div class='del'>-	 *</div><div class='del'>-	 * Protected by per-cpu cgroup_rstat_cpu_lock.</div><div class='del'>-	 */</div><div class='del'>-	struct cgroup *updated_children;	/* terminated by self cgroup */</div><div class='del'>-	struct cgroup *updated_next;		/* NULL iff not on the list */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cgroup_freezer_state {</div><div class='hunk'>@@ -380,7 +438,7 @@ struct cgroup_freezer_state {</div><div class='ctx'> 	bool freeze;</div><div class='ctx'> </div><div class='ctx'> 	/* Should the cgroup actually be frozen? */</div><div class='del'>-	int e_freeze;</div><div class='add'>+	bool e_freeze;</div><div class='ctx'> </div><div class='ctx'> 	/* Fields below are protected by css_set_lock */</div><div class='ctx'> </div><div class='hunk'>@@ -392,6 +450,23 @@ struct cgroup_freezer_state {</div><div class='ctx'> 	 * frozen, SIGSTOPped, and PTRACEd.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int nr_frozen_tasks;</div><div class='add'>+</div><div class='add'>+	/* Freeze time data consistency protection */</div><div class='add'>+	seqcount_spinlock_t freeze_seq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Most recent time the cgroup was requested to freeze.</div><div class='add'>+	 * Accesses guarded by freeze_seq counter. Writes serialized</div><div class='add'>+	 * by css_set_lock.</div><div class='add'>+	 */</div><div class='add'>+	u64 freeze_start_nsec;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Total duration the cgroup has spent freezing.</div><div class='add'>+	 * Accesses guarded by freeze_seq counter. Writes serialized</div><div class='add'>+	 * by css_set_lock.</div><div class='add'>+	 */</div><div class='add'>+	u64 frozen_nsec;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cgroup {</div><div class='hunk'>@@ -443,6 +518,9 @@ struct cgroup {</div><div class='ctx'> </div><div class='ctx'> 	int nr_threaded_children;	/* # of live threaded child cgroups */</div><div class='ctx'> </div><div class='add'>+	/* sequence number for cgroup.kill, serialized by css_set_lock. */</div><div class='add'>+	unsigned int kill_seq;</div><div class='add'>+</div><div class='ctx'> 	struct kernfs_node *kn;		/* cgroup kernfs entry */</div><div class='ctx'> 	struct cgroup_file procs_file;	/* handle for "cgroup.procs" */</div><div class='ctx'> 	struct cgroup_file events_file;	/* handle for "cgroup.events" */</div><div class='hunk'>@@ -465,6 +543,12 @@ struct cgroup {</div><div class='ctx'> 	/* Private pointers for each registered subsystem */</div><div class='ctx'> 	struct cgroup_subsys_state __rcu *subsys[CGROUP_SUBSYS_COUNT];</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Keep track of total number of dying CSSes at and below this cgroup.</div><div class='add'>+	 * Protected by cgroup_mutex.</div><div class='add'>+	 */</div><div class='add'>+	int nr_dying_subsys[CGROUP_SUBSYS_COUNT];</div><div class='add'>+</div><div class='ctx'> 	struct cgroup_root *root;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -492,23 +576,23 @@ struct cgroup {</div><div class='ctx'> 	struct cgroup *dom_cgrp;</div><div class='ctx'> 	struct cgroup *old_dom_cgrp;		/* used while enabling threaded */</div><div class='ctx'> </div><div class='del'>-	/* per-cpu recursive resource statistics */</div><div class='del'>-	struct cgroup_rstat_cpu __percpu *rstat_cpu;</div><div class='del'>-	struct list_head rstat_css_list;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * Add padding to separate the read mostly rstat_cpu and</div><div class='del'>-	 * rstat_css_list into a different cacheline from the following</div><div class='del'>-	 * rstat_flush_next and *bstat fields which can have frequent updates.</div><div class='add'>+	 * Depending on the context, this field is initialized via</div><div class='add'>+	 * css_rstat_init() at different places:</div><div class='add'>+	 *</div><div class='add'>+	 * when cgroup is the root cgroup</div><div class='add'>+	 *   performed in cgroup_setup_root()</div><div class='add'>+	 * otherwise</div><div class='add'>+	 *   performed in cgroup_create()</div><div class='ctx'> 	 */</div><div class='del'>-	CACHELINE_PADDING(_pad_);</div><div class='add'>+	struct cgroup_rstat_base_cpu __percpu *rstat_base_cpu;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * A singly-linked list of cgroup structures to be rstat flushed.</div><div class='del'>-	 * This is a scratch field to be used exclusively by</div><div class='del'>-	 * cgroup_rstat_flush_locked() and protected by cgroup_rstat_lock.</div><div class='add'>+	 * Add padding to keep the read mostly rstat per-cpu pointer on a</div><div class='add'>+	 * different cacheline than the following *bstat fields which can have</div><div class='add'>+	 * frequent updates.</div><div class='ctx'> 	 */</div><div class='del'>-	struct cgroup	*rstat_flush_next;</div><div class='add'>+	CACHELINE_PADDING(_pad_);</div><div class='ctx'> </div><div class='ctx'> 	/* cgroup basic resource statistics */</div><div class='ctx'> 	struct cgroup_base_stat last_bstat;</div><div class='hunk'>@@ -534,9 +618,6 @@ struct cgroup {</div><div class='ctx'> 	/* used to store eBPF programs */</div><div class='ctx'> 	struct cgroup_bpf bpf;</div><div class='ctx'> </div><div class='del'>-	/* If there is block congestion on this cgroup. */</div><div class='del'>-	atomic_t congestion_count;</div><div class='del'>-</div><div class='ctx'> 	/* Used to store internal freezer state */</div><div class='ctx'> 	struct cgroup_freezer_state freezer;</div><div class='ctx'> </div><div class='hunk'>@@ -598,9 +679,8 @@ struct cgroup_root {</div><div class='ctx'>  */</div><div class='ctx'> struct cftype {</div><div class='ctx'> 	/*</div><div class='del'>-	 * By convention, the name should begin with the name of the</div><div class='del'>-	 * subsystem, followed by a period.  Zero length string indicates</div><div class='del'>-	 * end of cftype array.</div><div class='add'>+	 * Name of the subsystem is prepended in cgroup_file_name().</div><div class='add'>+	 * Zero length string indicates end of cftype array.</div><div class='ctx'> 	 */</div><div class='ctx'> 	char name[MAX_CFTYPE_NAME];</div><div class='ctx'> 	unsigned long private;</div><div class='hunk'>@@ -676,9 +756,7 @@ struct cftype {</div><div class='ctx'> 	__poll_t (*poll)(struct kernfs_open_file *of,</div><div class='ctx'> 			 struct poll_table_struct *pt);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='ctx'> 	struct lock_class_key	lockdep_key;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -692,6 +770,7 @@ struct cgroup_subsys {</div><div class='ctx'> 	void (*css_released)(struct cgroup_subsys_state *css);</div><div class='ctx'> 	void (*css_free)(struct cgroup_subsys_state *css);</div><div class='ctx'> 	void (*css_reset)(struct cgroup_subsys_state *css);</div><div class='add'>+	void (*css_killed)(struct cgroup_subsys_state *css);</div><div class='ctx'> 	void (*css_rstat_flush)(struct cgroup_subsys_state *css, int cpu);</div><div class='ctx'> 	int (*css_extra_stat_show)(struct seq_file *seq,</div><div class='ctx'> 				   struct cgroup_subsys_state *css);</div><div class='hunk'>@@ -701,7 +780,6 @@ struct cgroup_subsys {</div><div class='ctx'> 	int (*can_attach)(struct cgroup_taskset *tset);</div><div class='ctx'> 	void (*cancel_attach)(struct cgroup_taskset *tset);</div><div class='ctx'> 	void (*attach)(struct cgroup_taskset *tset);</div><div class='del'>-	void (*post_attach)(void);</div><div class='ctx'> 	int (*can_fork)(struct task_struct *task,</div><div class='ctx'> 			struct css_set *cset);</div><div class='ctx'> 	void (*cancel_fork)(struct task_struct *task, struct css_set *cset);</div><div class='hunk'>@@ -771,20 +849,32 @@ struct cgroup_subsys {</div><div class='ctx'> 	 * specifies the mask of subsystems that this one depends on.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int depends_on;</div><div class='add'>+</div><div class='add'>+	spinlock_t rstat_ss_lock;</div><div class='add'>+	struct llist_head __percpu *lhead; /* lockless update list head */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct percpu_rw_semaphore cgroup_threadgroup_rwsem;</div><div class='add'>+extern bool cgroup_enable_per_threadgroup_rwsem;</div><div class='add'>+</div><div class='add'>+struct cgroup_of_peak {</div><div class='add'>+	unsigned long		value;</div><div class='add'>+	struct list_head	list;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cgroup_threadgroup_change_begin - threadgroup exclusion for cgroups</div><div class='ctx'>  * @tsk: target task</div><div class='ctx'>  *</div><div class='ctx'>  * Allows cgroup operations to synchronize against threadgroup changes</div><div class='del'>- * using a percpu_rw_semaphore.</div><div class='add'>+ * using a global percpu_rw_semaphore and a per threadgroup rw_semaphore when</div><div class='add'>+ * favordynmods is on. See the comment above CGRP_ROOT_FAVOR_DYNMODS definition.</div><div class='ctx'>  */</div><div class='ctx'> static inline void cgroup_threadgroup_change_begin(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	percpu_down_read(&amp;cgroup_threadgroup_rwsem);</div><div class='add'>+	if (cgroup_enable_per_threadgroup_rwsem)</div><div class='add'>+		down_read(&amp;tsk-&gt;signal-&gt;cgroup_threadgroup_rwsem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -795,6 +885,8 @@ static inline void cgroup_threadgroup_change_begin(struct task_struct *tsk)</div><div class='ctx'>  */</div><div class='ctx'> static inline void cgroup_threadgroup_change_end(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='add'>+	if (cgroup_enable_per_threadgroup_rwsem)</div><div class='add'>+		up_read(&amp;tsk-&gt;signal-&gt;cgroup_threadgroup_rwsem);</div><div class='ctx'> 	percpu_up_read(&amp;cgroup_threadgroup_rwsem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -842,14 +934,12 @@ static inline u16 sock_cgroup_prioidx(const struct sock_cgroup_data *skcd)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CGROUP_NET_CLASSID</div><div class='ctx'> static inline u32 sock_cgroup_classid(const struct sock_cgroup_data *skcd)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_CGROUP_NET_CLASSID</div><div class='ctx'> 	return READ_ONCE(skcd-&gt;classid);</div><div class='del'>-#else</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static inline void sock_cgroup_set_prioidx(struct sock_cgroup_data *skcd,</div><div class='ctx'> 					   u16 prioidx)</div><div class='hunk'>@@ -859,13 +949,13 @@ static inline void sock_cgroup_set_prioidx(struct sock_cgroup_data *skcd,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CGROUP_NET_CLASSID</div><div class='ctx'> static inline void sock_cgroup_set_classid(struct sock_cgroup_data *skcd,</div><div class='ctx'> 					   u32 classid)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_CGROUP_NET_CLASSID</div><div class='ctx'> 	WRITE_ONCE(skcd-&gt;classid, classid);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #else	/* CONFIG_SOCK_CGROUP_DATA */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h<br/>index 34aaf0e87def..bc892e3b37ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cgroup.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cgroup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cgroup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cgroup.h</a></div><div class='hunk'>@@ -10,8 +10,8 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/cgroupstats.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/kernfs.h&gt;</div><div class='ctx'> #include &lt;linux/jump_label.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/ns_common.h&gt;</div><div class='ctx'> #include &lt;linux/nsproxy.h&gt;</div><div class='ctx'> #include &lt;linux/user_namespace.h&gt;</div><div class='hunk'>@@ -26,11 +27,10 @@</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cgroup-defs.h&gt;</div><div class='add'>+#include &lt;linux/cgroup_namespace.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct kernel_clone_args;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CGROUPS</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * All weight knobs on the default hierarchy should use the following min,</div><div class='ctx'>  * default and max values.  The default value is the logarithmic center of</div><div class='hunk'>@@ -40,7 +40,9 @@ struct kernel_clone_args;</div><div class='ctx'> #define CGROUP_WEIGHT_DFL		100</div><div class='ctx'> #define CGROUP_WEIGHT_MAX		10000</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+</div><div class='add'>+enum css_task_iter_flags {</div><div class='ctx'> 	CSS_TASK_ITER_PROCS    = (1U &lt;&lt; 0),  /* walk only threadgroup leaders */</div><div class='ctx'> 	CSS_TASK_ITER_THREADED = (1U &lt;&lt; 1),  /* walk all threaded css_sets in the domain */</div><div class='ctx'> 	CSS_TASK_ITER_SKIPPED  = (1U &lt;&lt; 16), /* internal flags */</div><div class='hunk'>@@ -66,10 +68,16 @@ struct css_task_iter {</div><div class='ctx'> 	struct list_head		iters_node;	/* css_set-&gt;task_iters */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum cgroup_lifetime_events {</div><div class='add'>+	CGROUP_LIFETIME_ONLINE,</div><div class='add'>+	CGROUP_LIFETIME_OFFLINE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern struct file_system_type cgroup_fs_type;</div><div class='ctx'> extern struct cgroup_root cgrp_dfl_root;</div><div class='ctx'> extern struct css_set init_css_set;</div><div class='ctx'> extern spinlock_t css_set_lock;</div><div class='add'>+extern struct blocking_notifier_head cgroup_lifetime_notifier;</div><div class='ctx'> </div><div class='ctx'> #define SUBSYS(_x) extern struct cgroup_subsys _x ## _cgrp_subsys;</div><div class='ctx'> #include &lt;linux/cgroup_subsys.h&gt;</div><div class='hunk'>@@ -113,6 +121,7 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from);</div><div class='ctx'> </div><div class='ctx'> int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);</div><div class='ctx'> int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);</div><div class='add'>+int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);</div><div class='ctx'> int cgroup_rm_cftypes(struct cftype *cfts);</div><div class='ctx'> void cgroup_file_notify(struct cgroup_file *cfile);</div><div class='ctx'> void cgroup_file_show(struct cgroup_file *cfile, bool show);</div><div class='hunk'>@@ -128,9 +137,10 @@ extern void cgroup_cancel_fork(struct task_struct *p,</div><div class='ctx'> 			       struct kernel_clone_args *kargs);</div><div class='ctx'> extern void cgroup_post_fork(struct task_struct *p,</div><div class='ctx'> 			     struct kernel_clone_args *kargs);</div><div class='del'>-void cgroup_exit(struct task_struct *p);</div><div class='del'>-void cgroup_release(struct task_struct *p);</div><div class='del'>-void cgroup_free(struct task_struct *p);</div><div class='add'>+void cgroup_task_exit(struct task_struct *p);</div><div class='add'>+void cgroup_task_dead(struct task_struct *p);</div><div class='add'>+void cgroup_task_release(struct task_struct *p);</div><div class='add'>+void cgroup_task_free(struct task_struct *p);</div><div class='ctx'> </div><div class='ctx'> int cgroup_init_early(void);</div><div class='ctx'> int cgroup_init(void);</div><div class='hunk'>@@ -343,7 +353,23 @@ static inline u64 cgroup_id(const struct cgroup *cgrp)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool css_is_dying(struct cgroup_subsys_state *css)</div><div class='ctx'> {</div><div class='del'>-	return !(css-&gt;flags &amp; CSS_NO_REF) &amp;&amp; percpu_ref_is_dying(&amp;css-&gt;refcnt);</div><div class='add'>+	return css-&gt;flags &amp; CSS_DYING;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool css_is_online(struct cgroup_subsys_state *css)</div><div class='add'>+{</div><div class='add'>+	return css-&gt;flags &amp; CSS_ONLINE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool css_is_self(struct cgroup_subsys_state *css)</div><div class='add'>+{</div><div class='add'>+	if (css == &amp;css-&gt;cgroup-&gt;self) {</div><div class='add'>+		/* cgroup::self should not have subsystem association */</div><div class='add'>+		WARN_ON(css-&gt;ss != NULL);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void cgroup_get(struct cgroup *cgrp)</div><div class='hunk'>@@ -631,6 +657,7 @@ static inline void cgroup_kthread_ready(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cgroup_path_from_kernfs_id(u64 id, char *buf, size_t buflen);</div><div class='add'>+struct cgroup *__cgroup_get_from_id(u64 id);</div><div class='ctx'> struct cgroup *cgroup_get_from_id(u64 id);</div><div class='ctx'> #else /* !CONFIG_CGROUPS */</div><div class='ctx'> </div><div class='hunk'>@@ -654,9 +681,10 @@ static inline void cgroup_cancel_fork(struct task_struct *p,</div><div class='ctx'> 				      struct kernel_clone_args *kargs) {}</div><div class='ctx'> static inline void cgroup_post_fork(struct task_struct *p,</div><div class='ctx'> 				    struct kernel_clone_args *kargs) {}</div><div class='del'>-static inline void cgroup_exit(struct task_struct *p) {}</div><div class='del'>-static inline void cgroup_release(struct task_struct *p) {}</div><div class='del'>-static inline void cgroup_free(struct task_struct *p) {}</div><div class='add'>+static inline void cgroup_task_exit(struct task_struct *p) {}</div><div class='add'>+static inline void cgroup_task_dead(struct task_struct *p) {}</div><div class='add'>+static inline void cgroup_task_release(struct task_struct *p) {}</div><div class='add'>+static inline void cgroup_task_free(struct task_struct *p) {}</div><div class='ctx'> </div><div class='ctx'> static inline int cgroup_init_early(void) { return 0; }</div><div class='ctx'> static inline int cgroup_init(void) { return 0; }</div><div class='hunk'>@@ -687,10 +715,8 @@ static inline void cgroup_path_from_kernfs_id(u64 id, char *buf, size_t buflen)</div><div class='ctx'> /*</div><div class='ctx'>  * cgroup scalable recursive statistics.</div><div class='ctx'>  */</div><div class='del'>-void cgroup_rstat_updated(struct cgroup *cgrp, int cpu);</div><div class='del'>-void cgroup_rstat_flush(struct cgroup *cgrp);</div><div class='del'>-void cgroup_rstat_flush_hold(struct cgroup *cgrp);</div><div class='del'>-void cgroup_rstat_flush_release(void);</div><div class='add'>+void css_rstat_updated(struct cgroup_subsys_state *css, int cpu);</div><div class='add'>+void css_rstat_flush(struct cgroup_subsys_state *css);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Basic resource stats.</div><div class='hunk'>@@ -766,50 +792,6 @@ static inline void cgroup_sk_free(struct sock_cgroup_data *skcd) {}</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_CGROUP_DATA */</div><div class='ctx'> </div><div class='del'>-struct cgroup_namespace {</div><div class='del'>-	struct ns_common	ns;</div><div class='del'>-	struct user_namespace	*user_ns;</div><div class='del'>-	struct ucounts		*ucounts;</div><div class='del'>-	struct css_set          *root_cset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct cgroup_namespace init_cgroup_ns;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CGROUPS</div><div class='del'>-</div><div class='del'>-void free_cgroup_ns(struct cgroup_namespace *ns);</div><div class='del'>-</div><div class='del'>-struct cgroup_namespace *copy_cgroup_ns(unsigned long flags,</div><div class='del'>-					struct user_namespace *user_ns,</div><div class='del'>-					struct cgroup_namespace *old_ns);</div><div class='del'>-</div><div class='del'>-int cgroup_path_ns(struct cgroup *cgrp, char *buf, size_t buflen,</div><div class='del'>-		   struct cgroup_namespace *ns);</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_CGROUPS */</div><div class='del'>-</div><div class='del'>-static inline void free_cgroup_ns(struct cgroup_namespace *ns) { }</div><div class='del'>-static inline struct cgroup_namespace *</div><div class='del'>-copy_cgroup_ns(unsigned long flags, struct user_namespace *user_ns,</div><div class='del'>-	       struct cgroup_namespace *old_ns)</div><div class='del'>-{</div><div class='del'>-	return old_ns;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* !CONFIG_CGROUPS */</div><div class='del'>-</div><div class='del'>-static inline void get_cgroup_ns(struct cgroup_namespace *ns)</div><div class='del'>-{</div><div class='del'>-	if (ns)</div><div class='del'>-		refcount_inc(&amp;ns-&gt;ns.count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void put_cgroup_ns(struct cgroup_namespace *ns)</div><div class='del'>-{</div><div class='del'>-	if (ns &amp;&amp; refcount_dec_and_test(&amp;ns-&gt;ns.count))</div><div class='del'>-		free_cgroup_ns(ns);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_CGROUPS</div><div class='ctx'> </div><div class='ctx'> void cgroup_enter_frozen(void);</div><div class='hunk'>@@ -855,4 +837,6 @@ static inline void cgroup_bpf_put(struct cgroup *cgrp) {}</div><div class='ctx'> </div><div class='ctx'> struct cgroup *task_get_cgroup1(struct task_struct *tsk, int hierarchy_id);</div><div class='ctx'> </div><div class='add'>+struct cgroup_of_peak *of_peak(struct kernfs_open_file *of);</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_CGROUP_H */</div><div class='head'>diff --git a/include/linux/cgroup_dmem.h b/include/linux/cgroup_dmem.h<br/>new file mode 100644<br/>index 000000000000..dd4869f1d736<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cgroup_dmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cgroup_dmem.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright © 2023-2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CGROUP_DMEM_H</div><div class='add'>+#define _CGROUP_DMEM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/llist.h&gt;</div><div class='add'>+</div><div class='add'>+struct dmem_cgroup_pool_state;</div><div class='add'>+</div><div class='add'>+/* Opaque definition of a cgroup region, used internally */</div><div class='add'>+struct dmem_cgroup_region;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_CGROUP_DMEM)</div><div class='add'>+struct dmem_cgroup_region *dmem_cgroup_register_region(u64 size, const char *name_fmt, ...) __printf(2,3);</div><div class='add'>+void dmem_cgroup_unregister_region(struct dmem_cgroup_region *region);</div><div class='add'>+int dmem_cgroup_try_charge(struct dmem_cgroup_region *region, u64 size,</div><div class='add'>+			   struct dmem_cgroup_pool_state **ret_pool,</div><div class='add'>+			   struct dmem_cgroup_pool_state **ret_limit_pool);</div><div class='add'>+void dmem_cgroup_uncharge(struct dmem_cgroup_pool_state *pool, u64 size);</div><div class='add'>+bool dmem_cgroup_state_evict_valuable(struct dmem_cgroup_pool_state *limit_pool,</div><div class='add'>+				      struct dmem_cgroup_pool_state *test_pool,</div><div class='add'>+				      bool ignore_low, bool *ret_hit_low);</div><div class='add'>+</div><div class='add'>+void dmem_cgroup_pool_state_put(struct dmem_cgroup_pool_state *pool);</div><div class='add'>+#else</div><div class='add'>+static inline __printf(2,3) struct dmem_cgroup_region *</div><div class='add'>+dmem_cgroup_register_region(u64 size, const char *name_fmt, ...)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dmem_cgroup_unregister_region(struct dmem_cgroup_region *region)</div><div class='add'>+{ }</div><div class='add'>+</div><div class='add'>+static inline int dmem_cgroup_try_charge(struct dmem_cgroup_region *region, u64 size,</div><div class='add'>+					 struct dmem_cgroup_pool_state **ret_pool,</div><div class='add'>+					 struct dmem_cgroup_pool_state **ret_limit_pool)</div><div class='add'>+{</div><div class='add'>+	*ret_pool = NULL;</div><div class='add'>+</div><div class='add'>+	if (ret_limit_pool)</div><div class='add'>+		*ret_limit_pool = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dmem_cgroup_uncharge(struct dmem_cgroup_pool_state *pool, u64 size)</div><div class='add'>+{ }</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+bool dmem_cgroup_state_evict_valuable(struct dmem_cgroup_pool_state *limit_pool,</div><div class='add'>+				      struct dmem_cgroup_pool_state *test_pool,</div><div class='add'>+				      bool ignore_low, bool *ret_hit_low)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dmem_cgroup_pool_state_put(struct dmem_cgroup_pool_state *pool)</div><div class='add'>+{ }</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+#endif	/* _CGROUP_DMEM_H */</div><div class='head'>diff --git a/include/linux/cgroup_namespace.h b/include/linux/cgroup_namespace.h<br/>new file mode 100644<br/>index 000000000000..78a8418558a4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cgroup_namespace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cgroup_namespace.h</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_CGROUP_NAMESPACE_H</div><div class='add'>+#define _LINUX_CGROUP_NAMESPACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ns_common.h&gt;</div><div class='add'>+</div><div class='add'>+struct cgroup_namespace {</div><div class='add'>+	struct ns_common	ns;</div><div class='add'>+	struct user_namespace	*user_ns;</div><div class='add'>+	struct ucounts		*ucounts;</div><div class='add'>+	struct css_set          *root_cset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct cgroup_namespace init_cgroup_ns;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+</div><div class='add'>+static inline struct cgroup_namespace *to_cg_ns(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	return container_of(ns, struct cgroup_namespace, ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_cgroup_ns(struct cgroup_namespace *ns);</div><div class='add'>+</div><div class='add'>+struct cgroup_namespace *copy_cgroup_ns(u64 flags,</div><div class='add'>+					struct user_namespace *user_ns,</div><div class='add'>+					struct cgroup_namespace *old_ns);</div><div class='add'>+</div><div class='add'>+int cgroup_path_ns(struct cgroup *cgrp, char *buf, size_t buflen,</div><div class='add'>+		   struct cgroup_namespace *ns);</div><div class='add'>+</div><div class='add'>+static inline void get_cgroup_ns(struct cgroup_namespace *ns)</div><div class='add'>+{</div><div class='add'>+	ns_ref_inc(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void put_cgroup_ns(struct cgroup_namespace *ns)</div><div class='add'>+{</div><div class='add'>+	if (ns_ref_put(ns))</div><div class='add'>+		free_cgroup_ns(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_CGROUPS */</div><div class='add'>+</div><div class='add'>+static inline void free_cgroup_ns(struct cgroup_namespace *ns) { }</div><div class='add'>+static inline struct cgroup_namespace *</div><div class='add'>+copy_cgroup_ns(u64 flags, struct user_namespace *user_ns,</div><div class='add'>+	       struct cgroup_namespace *old_ns)</div><div class='add'>+{</div><div class='add'>+	return old_ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void get_cgroup_ns(struct cgroup_namespace *ns) { }</div><div class='add'>+static inline void put_cgroup_ns(struct cgroup_namespace *ns) { }</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_CGROUPS */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_CGROUP_NAMESPACE_H */</div><div class='head'>diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h<br/>index 445235487230..3fd0bcbf3080 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cgroup_subsys.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cgroup_subsys.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cgroup_subsys.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cgroup_subsys.h</a></div><div class='hunk'>@@ -65,6 +65,10 @@ SUBSYS(rdma)</div><div class='ctx'> SUBSYS(misc)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_CGROUP_DMEM)</div><div class='add'>+SUBSYS(dmem)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The following subsystems are not supported on the default hierarchy.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h<br/>index c2d09bc4f976..8d41b917c77d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cleanup.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cleanup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cleanup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cleanup.h</a></div><div class='hunk'>@@ -1,8 +1,157 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __LINUX_GUARDS_H</div><div class='del'>-#define __LINUX_GUARDS_H</div><div class='add'>+#ifndef _LINUX_CLEANUP_H</div><div class='add'>+#define _LINUX_CLEANUP_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/args.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: scope-based cleanup helpers</div><div class='add'>+ *</div><div class='add'>+ * The "goto error" pattern is notorious for introducing subtle resource</div><div class='add'>+ * leaks. It is tedious and error prone to add new resource acquisition</div><div class='add'>+ * constraints into code paths that already have several unwind</div><div class='add'>+ * conditions. The "cleanup" helpers enable the compiler to help with</div><div class='add'>+ * this tedium and can aid in maintaining LIFO (last in first out)</div><div class='add'>+ * unwind ordering to avoid unintentional leaks.</div><div class='add'>+ *</div><div class='add'>+ * As drivers make up the majority of the kernel code base, here is an</div><div class='add'>+ * example of using these helpers to clean up PCI drivers. The target of</div><div class='add'>+ * the cleanups are occasions where a goto is used to unwind a device</div><div class='add'>+ * reference (pci_dev_put()), or unlock the device (pci_dev_unlock())</div><div class='add'>+ * before returning.</div><div class='add'>+ *</div><div class='add'>+ * The DEFINE_FREE() macro can arrange for PCI device references to be</div><div class='add'>+ * dropped when the associated variable goes out of scope::</div><div class='add'>+ *</div><div class='add'>+ *	DEFINE_FREE(pci_dev_put, struct pci_dev *, if (_T) pci_dev_put(_T))</div><div class='add'>+ *	...</div><div class='add'>+ *	struct pci_dev *dev __free(pci_dev_put) =</div><div class='add'>+ *		pci_get_slot(parent, PCI_DEVFN(0, 0));</div><div class='add'>+ *</div><div class='add'>+ * The above will automatically call pci_dev_put() if @dev is non-NULL</div><div class='add'>+ * when @dev goes out of scope (automatic variable scope). If a function</div><div class='add'>+ * wants to invoke pci_dev_put() on error, but return @dev (i.e. without</div><div class='add'>+ * freeing it) on success, it can do::</div><div class='add'>+ *</div><div class='add'>+ *	return no_free_ptr(dev);</div><div class='add'>+ *</div><div class='add'>+ * ...or::</div><div class='add'>+ *</div><div class='add'>+ *	return_ptr(dev);</div><div class='add'>+ *</div><div class='add'>+ * The DEFINE_GUARD() macro can arrange for the PCI device lock to be</div><div class='add'>+ * dropped when the scope where guard() is invoked ends::</div><div class='add'>+ *</div><div class='add'>+ *	DEFINE_GUARD(pci_dev, struct pci_dev *, pci_dev_lock(_T), pci_dev_unlock(_T))</div><div class='add'>+ *	...</div><div class='add'>+ *	guard(pci_dev)(dev);</div><div class='add'>+ *</div><div class='add'>+ * The lifetime of the lock obtained by the guard() helper follows the</div><div class='add'>+ * scope of automatic variable declaration. Take the following example::</div><div class='add'>+ *</div><div class='add'>+ *	func(...)</div><div class='add'>+ *	{</div><div class='add'>+ *		if (...) {</div><div class='add'>+ *			...</div><div class='add'>+ *			guard(pci_dev)(dev); // pci_dev_lock() invoked here</div><div class='add'>+ *			...</div><div class='add'>+ *		} // &lt;- implied pci_dev_unlock() triggered here</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ * Observe the lock is held for the remainder of the "if ()" block not</div><div class='add'>+ * the remainder of "func()".</div><div class='add'>+ *</div><div class='add'>+ * The ACQUIRE() macro can be used in all places that guard() can be</div><div class='add'>+ * used and additionally support conditional locks::</div><div class='add'>+ *</div><div class='add'>+ *	DEFINE_GUARD_COND(pci_dev, _try, pci_dev_trylock(_T))</div><div class='add'>+ *	...</div><div class='add'>+ *	ACQUIRE(pci_dev_try, lock)(dev);</div><div class='add'>+ *	rc = ACQUIRE_ERR(pci_dev_try, &amp;lock);</div><div class='add'>+ *	if (rc)</div><div class='add'>+ *		return rc;</div><div class='add'>+ *	// @lock is held</div><div class='add'>+ *</div><div class='add'>+ * Now, when a function uses both __free() and guard()/ACQUIRE(), or</div><div class='add'>+ * multiple instances of __free(), the LIFO order of variable definition</div><div class='add'>+ * order matters. GCC documentation says:</div><div class='add'>+ *</div><div class='add'>+ * "When multiple variables in the same scope have cleanup attributes,</div><div class='add'>+ * at exit from the scope their associated cleanup functions are run in</div><div class='add'>+ * reverse order of definition (last defined, first cleanup)."</div><div class='add'>+ *</div><div class='add'>+ * When the unwind order matters it requires that variables be defined</div><div class='add'>+ * mid-function scope rather than at the top of the file.  Take the</div><div class='add'>+ * following example and notice the bug highlighted by "!!"::</div><div class='add'>+ *</div><div class='add'>+ *	LIST_HEAD(list);</div><div class='add'>+ *	DEFINE_MUTEX(lock);</div><div class='add'>+ *</div><div class='add'>+ *	struct object {</div><div class='add'>+ *	        struct list_head node;</div><div class='add'>+ *	};</div><div class='add'>+ *</div><div class='add'>+ *	static struct object *alloc_add(void)</div><div class='add'>+ *	{</div><div class='add'>+ *	        struct object *obj;</div><div class='add'>+ *</div><div class='add'>+ *	        lockdep_assert_held(&amp;lock);</div><div class='add'>+ *	        obj = kzalloc(sizeof(*obj), GFP_KERNEL);</div><div class='add'>+ *	        if (obj) {</div><div class='add'>+ *	                LIST_HEAD_INIT(&amp;obj-&gt;node);</div><div class='add'>+ *	                list_add(obj-&gt;node, &amp;list):</div><div class='add'>+ *	        }</div><div class='add'>+ *	        return obj;</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ *	static void remove_free(struct object *obj)</div><div class='add'>+ *	{</div><div class='add'>+ *	        lockdep_assert_held(&amp;lock);</div><div class='add'>+ *	        list_del(&amp;obj-&gt;node);</div><div class='add'>+ *	        kfree(obj);</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ *	DEFINE_FREE(remove_free, struct object *, if (_T) remove_free(_T))</div><div class='add'>+ *	static int init(void)</div><div class='add'>+ *	{</div><div class='add'>+ *	        struct object *obj __free(remove_free) = NULL;</div><div class='add'>+ *	        int err;</div><div class='add'>+ *</div><div class='add'>+ *	        guard(mutex)(&amp;lock);</div><div class='add'>+ *	        obj = alloc_add();</div><div class='add'>+ *</div><div class='add'>+ *	        if (!obj)</div><div class='add'>+ *	                return -ENOMEM;</div><div class='add'>+ *</div><div class='add'>+ *	        err = other_init(obj);</div><div class='add'>+ *	        if (err)</div><div class='add'>+ *	                return err; // remove_free() called without the lock!!</div><div class='add'>+ *</div><div class='add'>+ *	        no_free_ptr(obj);</div><div class='add'>+ *	        return 0;</div><div class='add'>+ *	}</div><div class='add'>+ *</div><div class='add'>+ * That bug is fixed by changing init() to call guard() and define +</div><div class='add'>+ * initialize @obj in this order::</div><div class='add'>+ *</div><div class='add'>+ *	guard(mutex)(&amp;lock);</div><div class='add'>+ *	struct object *obj __free(remove_free) = alloc_add();</div><div class='add'>+ *</div><div class='add'>+ * Given that the "__free(...) = NULL" pattern for variables defined at</div><div class='add'>+ * the top of the function poses this potential interdependency problem</div><div class='add'>+ * the recommendation is to always define and assign variables in one</div><div class='add'>+ * statement and not group variable definitions at the top of the</div><div class='add'>+ * function when __free() is used.</div><div class='add'>+ *</div><div class='add'>+ * Lastly, given that the benefit of cleanup helpers is removal of</div><div class='add'>+ * "goto", and that the "goto" statement can jump between scopes, the</div><div class='add'>+ * expectation is that usage of "goto" and cleanup helpers is never</div><div class='add'>+ * mixed in the same function. I.e. for a given routine, convert all</div><div class='add'>+ * resources that need a "goto" cleanup to scope-based cleanup, or</div><div class='add'>+ * convert none of them.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DEFINE_FREE(name, type, free):</div><div class='hunk'>@@ -59,24 +208,46 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_FREE(_name, _type, _free) \</div><div class='del'>-	static inline void __free_##_name(void *p) { _type _T = *(_type *)p; _free; }</div><div class='add'>+	static __always_inline void __free_##_name(void *p) { _type _T = *(_type *)p; _free; }</div><div class='ctx'> </div><div class='ctx'> #define __free(_name)	__cleanup(__free_##_name)</div><div class='ctx'> </div><div class='del'>-#define __get_and_null_ptr(p) \</div><div class='del'>-	({ __auto_type __ptr = &amp;(p); \</div><div class='del'>-	   __auto_type __val = *__ptr; \</div><div class='del'>-	   *__ptr = NULL;  __val; })</div><div class='add'>+#define __get_and_null(p, nullvalue)	    \</div><div class='add'>+	({                                  \</div><div class='add'>+		auto __ptr = &amp;(p);	    \</div><div class='add'>+		auto __val = *__ptr;	    \</div><div class='add'>+		*__ptr = nullvalue;         \</div><div class='add'>+		__val;                      \</div><div class='add'>+	})</div><div class='ctx'> </div><div class='del'>-static inline __must_check</div><div class='add'>+static __always_inline __must_check</div><div class='ctx'> const volatile void * __must_check_fn(const volatile void *val)</div><div class='ctx'> { return val; }</div><div class='ctx'> </div><div class='ctx'> #define no_free_ptr(p) \</div><div class='del'>-	((typeof(p)) __must_check_fn(__get_and_null_ptr(p)))</div><div class='add'>+	((typeof(p)) __must_check_fn((__force const volatile void *)__get_and_null(p, NULL)))</div><div class='ctx'> </div><div class='ctx'> #define return_ptr(p)	return no_free_ptr(p)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Only for situations where an allocation is handed in to another function</div><div class='add'>+ * and consumed by that function on success.</div><div class='add'>+ *</div><div class='add'>+ *	struct foo *f __free(kfree) = kzalloc(sizeof(*f), GFP_KERNEL);</div><div class='add'>+ *</div><div class='add'>+ *	setup(f);</div><div class='add'>+ *	if (some_condition)</div><div class='add'>+ *		return -EINVAL;</div><div class='add'>+ *	....</div><div class='add'>+ *	ret = bar(f);</div><div class='add'>+ *	if (!ret)</div><div class='add'>+ *		retain_and_null_ptr(f);</div><div class='add'>+ *	return ret;</div><div class='add'>+ *</div><div class='add'>+ * After retain_and_null_ptr(f) the variable f is NULL and cannot be</div><div class='add'>+ * dereferenced anymore.</div><div class='add'>+ */</div><div class='add'>+#define retain_and_null_ptr(p)		((void)__get_and_null(p, NULL))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DEFINE_CLASS(name, type, exit, init, init_args...):</div><div class='hunk'>@@ -90,12 +261,16 @@ const volatile void * __must_check_fn(const volatile void *val)</div><div class='ctx'>  * CLASS(name, var)(args...):</div><div class='ctx'>  *	declare the variable @var as an instance of the named class</div><div class='ctx'>  *</div><div class='add'>+ * CLASS_INIT(name, var, init_expr):</div><div class='add'>+ *	declare the variable @var as an instance of the named class with</div><div class='add'>+ *	custom initialization expression.</div><div class='add'>+ *</div><div class='ctx'>  * Ex.</div><div class='ctx'>  *</div><div class='ctx'>  * DEFINE_CLASS(fdget, struct fd, fdput(_T), fdget(fd), int fd)</div><div class='ctx'>  *</div><div class='ctx'>  *	CLASS(fdget, f)(fd);</div><div class='del'>- *	if (!f.file)</div><div class='add'>+ *	if (fd_empty(f))</div><div class='ctx'>  *		return -EBADF;</div><div class='ctx'>  *</div><div class='ctx'>  *	// use 'f' without concern</div><div class='hunk'>@@ -103,22 +278,34 @@ const volatile void * __must_check_fn(const volatile void *val)</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_CLASS(_name, _type, _exit, _init, _init_args...)		\</div><div class='ctx'> typedef _type class_##_name##_t;					\</div><div class='del'>-static inline void class_##_name##_destructor(_type *p)			\</div><div class='add'>+static __always_inline void class_##_name##_destructor(_type *p)	\</div><div class='ctx'> { _type _T = *p; _exit; }						\</div><div class='del'>-static inline _type class_##_name##_constructor(_init_args)		\</div><div class='add'>+static __always_inline _type class_##_name##_constructor(_init_args)	\</div><div class='ctx'> { _type t = _init; return t; }</div><div class='ctx'> </div><div class='ctx'> #define EXTEND_CLASS(_name, ext, _init, _init_args...)			\</div><div class='ctx'> typedef class_##_name##_t class_##_name##ext##_t;			\</div><div class='del'>-static inline void class_##_name##ext##_destructor(class_##_name##_t *p)\</div><div class='add'>+static __always_inline void class_##_name##ext##_destructor(class_##_name##_t *p) \</div><div class='ctx'> { class_##_name##_destructor(p); }					\</div><div class='del'>-static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \</div><div class='add'>+static __always_inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \</div><div class='ctx'> { class_##_name##_t t = _init; return t; }</div><div class='ctx'> </div><div class='ctx'> #define CLASS(_name, var)						\</div><div class='ctx'> 	class_##_name##_t var __cleanup(class_##_name##_destructor) =	\</div><div class='ctx'> 		class_##_name##_constructor</div><div class='ctx'> </div><div class='add'>+#define CLASS_INIT(_name, _var, _init_expr)                             \</div><div class='add'>+        class_##_name##_t _var __cleanup(class_##_name##_destructor) = (_init_expr)</div><div class='add'>+</div><div class='add'>+#define __scoped_class(_name, var, _label, args...)        \</div><div class='add'>+	for (CLASS(_name, var)(args); ; ({ goto _label; })) \</div><div class='add'>+		if (0) {                                   \</div><div class='add'>+_label:                                                    \</div><div class='add'>+			break;                             \</div><div class='add'>+		} else</div><div class='add'>+</div><div class='add'>+#define scoped_class(_name, var, args...) \</div><div class='add'>+	__scoped_class(_name, var, __UNIQUE_ID(label), args)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DEFINE_GUARD(name, type, lock, unlock):</div><div class='hunk'>@@ -146,34 +333,125 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \</div><div class='ctx'>  *      similar to scoped_guard(), except it does fail when the lock</div><div class='ctx'>  *      acquire fails.</div><div class='ctx'>  *</div><div class='add'>+ *      Only for conditional locks.</div><div class='add'>+ *</div><div class='add'>+ * ACQUIRE(name, var):</div><div class='add'>+ *	a named instance of the (guard) class, suitable for conditional</div><div class='add'>+ *	locks when paired with ACQUIRE_ERR().</div><div class='add'>+ *</div><div class='add'>+ * ACQUIRE_ERR(name, &amp;var):</div><div class='add'>+ *	a helper that is effectively a PTR_ERR() conversion of the guard</div><div class='add'>+ *	pointer. Returns 0 when the lock was acquired and a negative</div><div class='add'>+ *	error code otherwise.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define DEFINE_GUARD(_name, _type, _lock, _unlock) \</div><div class='del'>-	DEFINE_CLASS(_name, _type, if (_T) { _unlock; }, ({ _lock; _T; }), _type _T); \</div><div class='add'>+#define __DEFINE_CLASS_IS_CONDITIONAL(_name, _is_cond)	\</div><div class='add'>+static __maybe_unused const bool class_##_name##_is_conditional = _is_cond</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLASS_IS_UNCONDITIONAL(_name)		\</div><div class='add'>+	__DEFINE_CLASS_IS_CONDITIONAL(_name, false);	\</div><div class='ctx'> 	static inline void * class_##_name##_lock_ptr(class_##_name##_t *_T) \</div><div class='del'>-	{ return *_T; }</div><div class='add'>+	{ return (void *)1; }</div><div class='add'>+</div><div class='add'>+#define __GUARD_IS_ERR(_ptr)                                       \</div><div class='add'>+	({                                                         \</div><div class='add'>+		unsigned long _rc = (__force unsigned long)(_ptr); \</div><div class='add'>+		unlikely((_rc - 1) &gt;= -MAX_ERRNO - 1);             \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __DEFINE_GUARD_LOCK_PTR(_name, _exp)                                \</div><div class='add'>+	static __always_inline void *class_##_name##_lock_ptr(class_##_name##_t *_T) \</div><div class='add'>+	{                                                                   \</div><div class='add'>+		void *_ptr = (void *)(__force unsigned long)*(_exp);        \</div><div class='add'>+		if (IS_ERR(_ptr)) {                                         \</div><div class='add'>+			_ptr = NULL;                                        \</div><div class='add'>+		}                                                           \</div><div class='add'>+		return _ptr;                                                \</div><div class='add'>+	}                                                                   \</div><div class='add'>+	static __always_inline int class_##_name##_lock_err(class_##_name##_t *_T) \</div><div class='add'>+	{                                                                   \</div><div class='add'>+		long _rc = (__force unsigned long)*(_exp);                  \</div><div class='add'>+		if (!_rc) {                                                 \</div><div class='add'>+			_rc = -EBUSY;                                       \</div><div class='add'>+		}                                                           \</div><div class='add'>+		if (!IS_ERR_VALUE(_rc)) {                                   \</div><div class='add'>+			_rc = 0;                                            \</div><div class='add'>+		}                                                           \</div><div class='add'>+		return _rc;                                                 \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLASS_IS_GUARD(_name) \</div><div class='add'>+	__DEFINE_CLASS_IS_CONDITIONAL(_name, false); \</div><div class='add'>+	__DEFINE_GUARD_LOCK_PTR(_name, _T)</div><div class='add'>+</div><div class='add'>+#define DEFINE_CLASS_IS_COND_GUARD(_name) \</div><div class='add'>+	__DEFINE_CLASS_IS_CONDITIONAL(_name, true); \</div><div class='add'>+	__DEFINE_GUARD_LOCK_PTR(_name, _T)</div><div class='ctx'> </div><div class='del'>-#define DEFINE_GUARD_COND(_name, _ext, _condlock) \</div><div class='add'>+#define DEFINE_GUARD(_name, _type, _lock, _unlock) \</div><div class='add'>+	DEFINE_CLASS(_name, _type, if (!__GUARD_IS_ERR(_T)) { _unlock; }, ({ _lock; _T; }), _type _T); \</div><div class='add'>+	DEFINE_CLASS_IS_GUARD(_name)</div><div class='add'>+</div><div class='add'>+#define DEFINE_GUARD_COND_4(_name, _ext, _lock, _cond) \</div><div class='add'>+	__DEFINE_CLASS_IS_CONDITIONAL(_name##_ext, true); \</div><div class='ctx'> 	EXTEND_CLASS(_name, _ext, \</div><div class='del'>-		     ({ void *_t = _T; if (_T &amp;&amp; !(_condlock)) _t = NULL; _t; }), \</div><div class='add'>+		     ({ void *_t = _T; int _RET = (_lock); if (_T &amp;&amp; !(_cond)) _t = ERR_PTR(_RET); _t; }), \</div><div class='ctx'> 		     class_##_name##_t _T) \</div><div class='del'>-	static inline void * class_##_name##_ext##_lock_ptr(class_##_name##_t *_T) \</div><div class='del'>-	{ return class_##_name##_lock_ptr(_T); }</div><div class='add'>+	static __always_inline void * class_##_name##_ext##_lock_ptr(class_##_name##_t *_T) \</div><div class='add'>+	{ return class_##_name##_lock_ptr(_T); } \</div><div class='add'>+	static __always_inline int class_##_name##_ext##_lock_err(class_##_name##_t *_T) \</div><div class='add'>+	{ return class_##_name##_lock_err(_T); }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default binary condition; success on 'true'.</div><div class='add'>+ */</div><div class='add'>+#define DEFINE_GUARD_COND_3(_name, _ext, _lock) \</div><div class='add'>+	DEFINE_GUARD_COND_4(_name, _ext, _lock, _RET)</div><div class='add'>+</div><div class='add'>+#define DEFINE_GUARD_COND(X...) CONCATENATE(DEFINE_GUARD_COND_, COUNT_ARGS(X))(X)</div><div class='ctx'> </div><div class='ctx'> #define guard(_name) \</div><div class='ctx'> 	CLASS(_name, __UNIQUE_ID(guard))</div><div class='ctx'> </div><div class='ctx'> #define __guard_ptr(_name) class_##_name##_lock_ptr</div><div class='add'>+#define __guard_err(_name) class_##_name##_lock_err</div><div class='add'>+#define __is_cond_ptr(_name) class_##_name##_is_conditional</div><div class='add'>+</div><div class='add'>+#define ACQUIRE(_name, _var)     CLASS(_name, _var)</div><div class='add'>+#define ACQUIRE_ERR(_name, _var) __guard_err(_name)(_var)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper macro for scoped_guard().</div><div class='add'>+ *</div><div class='add'>+ * Note that the "!__is_cond_ptr(_name)" part of the condition ensures that</div><div class='add'>+ * compiler would be sure that for the unconditional locks the body of the</div><div class='add'>+ * loop (caller-provided code glued to the else clause) could not be skipped.</div><div class='add'>+ * It is needed because the other part - "__guard_ptr(_name)(&amp;scope)" - is too</div><div class='add'>+ * hard to deduce (even if could be proven true for unconditional locks).</div><div class='add'>+ */</div><div class='add'>+#define __scoped_guard(_name, _label, args...)				\</div><div class='add'>+	for (CLASS(_name, scope)(args);					\</div><div class='add'>+	     __guard_ptr(_name)(&amp;scope) || !__is_cond_ptr(_name);	\</div><div class='add'>+	     ({ goto _label; }))					\</div><div class='add'>+		if (0) {						\</div><div class='add'>+_label:									\</div><div class='add'>+			break;						\</div><div class='add'>+		} else</div><div class='add'>+</div><div class='add'>+#define scoped_guard(_name, args...)	\</div><div class='add'>+	__scoped_guard(_name, __UNIQUE_ID(label), args)</div><div class='ctx'> </div><div class='del'>-#define scoped_guard(_name, args...)					\</div><div class='del'>-	for (CLASS(_name, scope)(args),					\</div><div class='del'>-	     *done = NULL; __guard_ptr(_name)(&amp;scope) &amp;&amp; !done; done = (void *)1)</div><div class='add'>+#define __scoped_cond_guard(_name, _fail, _label, args...)		\</div><div class='add'>+	for (CLASS(_name, scope)(args); true; ({ goto _label; }))	\</div><div class='add'>+		if (!__guard_ptr(_name)(&amp;scope)) {			\</div><div class='add'>+			BUILD_BUG_ON(!__is_cond_ptr(_name));		\</div><div class='add'>+			_fail;						\</div><div class='add'>+_label:									\</div><div class='add'>+			break;						\</div><div class='add'>+		} else</div><div class='ctx'> </div><div class='del'>-#define scoped_cond_guard(_name, _fail, args...) \</div><div class='del'>-	for (CLASS(_name, scope)(args), \</div><div class='del'>-	     *done = NULL; !done; done = (void *)1) \</div><div class='del'>-		if (!__guard_ptr(_name)(&amp;scope)) _fail; \</div><div class='del'>-		else</div><div class='add'>+#define scoped_cond_guard(_name, _fail, args...)	\</div><div class='add'>+	__scoped_cond_guard(_name, _fail, __UNIQUE_ID(label), args)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Additional helper macros for generating lock guards with types, either for</div><div class='hunk'>@@ -201,19 +479,15 @@ typedef struct {							\</div><div class='ctx'> 	__VA_ARGS__;							\</div><div class='ctx'> } class_##_name##_t;							\</div><div class='ctx'> 									\</div><div class='del'>-static inline void class_##_name##_destructor(class_##_name##_t *_T)	\</div><div class='add'>+static __always_inline void class_##_name##_destructor(class_##_name##_t *_T) \</div><div class='ctx'> {									\</div><div class='del'>-	if (_T-&gt;lock) { _unlock; }					\</div><div class='add'>+	if (!__GUARD_IS_ERR(_T-&gt;lock)) { _unlock; }			\</div><div class='ctx'> }									\</div><div class='ctx'> 									\</div><div class='del'>-static inline void *class_##_name##_lock_ptr(class_##_name##_t *_T)	\</div><div class='del'>-{									\</div><div class='del'>-	return _T-&gt;lock;						\</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+__DEFINE_GUARD_LOCK_PTR(_name, &amp;_T-&gt;lock)</div><div class='ctx'> </div><div class='ctx'> #define __DEFINE_LOCK_GUARD_1(_name, _type, _lock)			\</div><div class='del'>-static inline class_##_name##_t class_##_name##_constructor(_type *l)	\</div><div class='add'>+static __always_inline class_##_name##_t class_##_name##_constructor(_type *l) \</div><div class='ctx'> {									\</div><div class='ctx'> 	class_##_name##_t _t = { .lock = l }, *_T = &amp;_t;		\</div><div class='ctx'> 	_lock;								\</div><div class='hunk'>@@ -221,7 +495,7 @@ static inline class_##_name##_t class_##_name##_constructor(_type *l)	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define __DEFINE_LOCK_GUARD_0(_name, _lock)				\</div><div class='del'>-static inline class_##_name##_t class_##_name##_constructor(void)	\</div><div class='add'>+static __always_inline class_##_name##_t class_##_name##_constructor(void) \</div><div class='ctx'> {									\</div><div class='ctx'> 	class_##_name##_t _t = { .lock = (void*)1 },			\</div><div class='ctx'> 			 *_T __maybe_unused = &amp;_t;			\</div><div class='hunk'>@@ -230,21 +504,31 @@ static inline class_##_name##_t class_##_name##_constructor(void)	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_LOCK_GUARD_1(_name, _type, _lock, _unlock, ...)		\</div><div class='add'>+__DEFINE_CLASS_IS_CONDITIONAL(_name, false);				\</div><div class='ctx'> __DEFINE_UNLOCK_GUARD(_name, _type, _unlock, __VA_ARGS__)		\</div><div class='ctx'> __DEFINE_LOCK_GUARD_1(_name, _type, _lock)</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_LOCK_GUARD_0(_name, _lock, _unlock, ...)			\</div><div class='add'>+__DEFINE_CLASS_IS_CONDITIONAL(_name, false);				\</div><div class='ctx'> __DEFINE_UNLOCK_GUARD(_name, void, _unlock, __VA_ARGS__)		\</div><div class='ctx'> __DEFINE_LOCK_GUARD_0(_name, _lock)</div><div class='ctx'> </div><div class='del'>-#define DEFINE_LOCK_GUARD_1_COND(_name, _ext, _condlock)		\</div><div class='add'>+#define DEFINE_LOCK_GUARD_1_COND_4(_name, _ext, _lock, _cond)		\</div><div class='add'>+	__DEFINE_CLASS_IS_CONDITIONAL(_name##_ext, true);		\</div><div class='ctx'> 	EXTEND_CLASS(_name, _ext,					\</div><div class='ctx'> 		     ({ class_##_name##_t _t = { .lock = l }, *_T = &amp;_t;\</div><div class='del'>-		        if (_T-&gt;lock &amp;&amp; !(_condlock)) _T-&gt;lock = NULL;	\</div><div class='add'>+		        int _RET = (_lock);                             \</div><div class='add'>+		        if (_T-&gt;lock &amp;&amp; !(_cond)) _T-&gt;lock = ERR_PTR(_RET);\</div><div class='ctx'> 			_t; }),						\</div><div class='ctx'> 		     typeof_member(class_##_name##_t, lock) l)		\</div><div class='del'>-	static inline void * class_##_name##_ext##_lock_ptr(class_##_name##_t *_T) \</div><div class='del'>-	{ return class_##_name##_lock_ptr(_T); }</div><div class='add'>+	static __always_inline void * class_##_name##_ext##_lock_ptr(class_##_name##_t *_T) \</div><div class='add'>+	{ return class_##_name##_lock_ptr(_T); } \</div><div class='add'>+	static __always_inline int class_##_name##_ext##_lock_err(class_##_name##_t *_T) \</div><div class='add'>+	{ return class_##_name##_lock_err(_T); }</div><div class='add'>+</div><div class='add'>+#define DEFINE_LOCK_GUARD_1_COND_3(_name, _ext, _lock) \</div><div class='add'>+	DEFINE_LOCK_GUARD_1_COND_4(_name, _ext, _lock, _RET)</div><div class='ctx'> </div><div class='add'>+#define DEFINE_LOCK_GUARD_1_COND(X...) CONCATENATE(DEFINE_LOCK_GUARD_1_COND_, COUNT_ARGS(X))(X)</div><div class='ctx'> </div><div class='del'>-#endif /* __LINUX_GUARDS_H */</div><div class='add'>+#endif /* _LINUX_CLEANUP_H */</div><div class='head'>diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h<br/>index 1293c38ddb7f..630705a47129 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clk-provider.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk-provider.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clk-provider.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clk-provider.h</a></div><div class='hunk'>@@ -394,6 +394,20 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,</div><div class='ctx'> 	__clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \</div><div class='ctx'> 				     NULL, (flags), (fixed_rate), 0, 0, true)</div><div class='ctx'> /**</div><div class='add'>+ * devm_clk_hw_register_fixed_rate_parent_data - register fixed-rate clock with</div><div class='add'>+ * the clock framework</div><div class='add'>+ * @dev: device that is registering this clock</div><div class='add'>+ * @name: name of this clock</div><div class='add'>+ * @parent_data: parent clk data</div><div class='add'>+ * @flags: framework-specific flags</div><div class='add'>+ * @fixed_rate: non-adjustable clock rate</div><div class='add'>+ */</div><div class='add'>+#define devm_clk_hw_register_fixed_rate_parent_data(dev, name, parent_data, flags, \</div><div class='add'>+						    fixed_rate)			   \</div><div class='add'>+	__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL,		   \</div><div class='add'>+				     (parent_data), (flags), (fixed_rate), 0,	   \</div><div class='add'>+				     0, true)</div><div class='add'>+/**</div><div class='ctx'>  * clk_hw_register_fixed_rate_parent_hw - register fixed-rate clock with</div><div class='ctx'>  * the clock framework</div><div class='ctx'>  * @dev: device that is registering this clock</div><div class='hunk'>@@ -609,6 +623,24 @@ struct clk *clk_register_gate(struct device *dev, const char *name,</div><div class='ctx'> 			       NULL, (flags), (reg), (bit_idx),		      \</div><div class='ctx'> 			       (clk_gate_flags), (lock))</div><div class='ctx'> /**</div><div class='add'>+ * devm_clk_hw_register_gate_parent_hw - register a gate clock with the clock</div><div class='add'>+ * framework</div><div class='add'>+ * @dev: device that is registering this clock</div><div class='add'>+ * @name: name of this clock</div><div class='add'>+ * @parent_hw: pointer to parent clk</div><div class='add'>+ * @flags: framework-specific flags for this clock</div><div class='add'>+ * @reg: register address to control gating of this clock</div><div class='add'>+ * @bit_idx: which bit in the register controls gating of this clock</div><div class='add'>+ * @clk_gate_flags: gate-specific flags for this clock</div><div class='add'>+ * @lock: shared register lock for this clock</div><div class='add'>+ */</div><div class='add'>+#define devm_clk_hw_register_gate_parent_hw(dev, name, parent_hw, flags,      \</div><div class='add'>+					    reg, bit_idx, clk_gate_flags,     \</div><div class='add'>+					    lock)			      \</div><div class='add'>+	__devm_clk_hw_register_gate((dev), NULL, (name), NULL, (parent_hw),   \</div><div class='add'>+				    NULL, (flags), (reg), (bit_idx),	      \</div><div class='add'>+				    (clk_gate_flags), (lock))</div><div class='add'>+/**</div><div class='ctx'>  * devm_clk_hw_register_gate_parent_data - register a gate clock with the</div><div class='ctx'>  * clock framework</div><div class='ctx'>  * @dev: device that is registering this clock</div><div class='hunk'>@@ -675,13 +707,15 @@ struct clk_div_table {</div><div class='ctx'>  * CLK_DIVIDER_BIG_ENDIAN - By default little endian register accesses are used</div><div class='ctx'>  *	for the divider register.  Setting this flag makes the register accesses</div><div class='ctx'>  *	big endian.</div><div class='add'>+ * CLK_DIVIDER_EVEN_INTEGERS - clock divisor is 2, 4, 6, 8, 10, etc.</div><div class='add'>+ *	Formula is 2 * (value read from hardware + 1).</div><div class='ctx'>  */</div><div class='ctx'> struct clk_divider {</div><div class='ctx'> 	struct clk_hw	hw;</div><div class='ctx'> 	void __iomem	*reg;</div><div class='ctx'> 	u8		shift;</div><div class='ctx'> 	u8		width;</div><div class='del'>-	u8		flags;</div><div class='add'>+	u16		flags;</div><div class='ctx'> 	const struct clk_div_table	*table;</div><div class='ctx'> 	spinlock_t	*lock;</div><div class='ctx'> };</div><div class='hunk'>@@ -697,6 +731,7 @@ struct clk_divider {</div><div class='ctx'> #define CLK_DIVIDER_READ_ONLY		BIT(5)</div><div class='ctx'> #define CLK_DIVIDER_MAX_AT_ZERO		BIT(6)</div><div class='ctx'> #define CLK_DIVIDER_BIG_ENDIAN		BIT(7)</div><div class='add'>+#define CLK_DIVIDER_EVEN_INTEGERS	BIT(8)</div><div class='ctx'> </div><div class='ctx'> extern const struct clk_ops clk_divider_ops;</div><div class='ctx'> extern const struct clk_ops clk_divider_ro_ops;</div><div class='hunk'>@@ -726,19 +761,21 @@ struct clk_hw *__clk_hw_register_divider(struct device *dev,</div><div class='ctx'> 		struct device_node *np, const char *name,</div><div class='ctx'> 		const char *parent_name, const struct clk_hw *parent_hw,</div><div class='ctx'> 		const struct clk_parent_data *parent_data, unsigned long flags,</div><div class='del'>-		void __iomem *reg, u8 shift, u8 width, u8 clk_divider_flags,</div><div class='add'>+		void __iomem *reg, u8 shift, u8 width,</div><div class='add'>+		unsigned long clk_divider_flags,</div><div class='ctx'> 		const struct clk_div_table *table, spinlock_t *lock);</div><div class='ctx'> struct clk_hw *__devm_clk_hw_register_divider(struct device *dev,</div><div class='ctx'> 		struct device_node *np, const char *name,</div><div class='ctx'> 		const char *parent_name, const struct clk_hw *parent_hw,</div><div class='ctx'> 		const struct clk_parent_data *parent_data, unsigned long flags,</div><div class='del'>-		void __iomem *reg, u8 shift, u8 width, u8 clk_divider_flags,</div><div class='add'>+		void __iomem *reg, u8 shift, u8 width,</div><div class='add'>+		unsigned long clk_divider_flags,</div><div class='ctx'> 		const struct clk_div_table *table, spinlock_t *lock);</div><div class='ctx'> struct clk *clk_register_divider_table(struct device *dev, const char *name,</div><div class='ctx'> 		const char *parent_name, unsigned long flags,</div><div class='ctx'> 		void __iomem *reg, u8 shift, u8 width,</div><div class='del'>-		u8 clk_divider_flags, const struct clk_div_table *table,</div><div class='del'>-		spinlock_t *lock);</div><div class='add'>+		unsigned long clk_divider_flags,</div><div class='add'>+		const struct clk_div_table *table, spinlock_t *lock);</div><div class='ctx'> /**</div><div class='ctx'>  * clk_register_divider - register a divider clock with the clock framework</div><div class='ctx'>  * @dev: device registering this clock</div><div class='hunk'>@@ -1084,18 +1121,28 @@ void of_fixed_factor_clk_setup(struct device_node *node);</div><div class='ctx'>  * @hw:		handle between common and hardware-specific interfaces</div><div class='ctx'>  * @mult:	multiplier</div><div class='ctx'>  * @div:	divider</div><div class='add'>+ * @acc:	fixed accuracy in ppb</div><div class='add'>+ * @flags:	behavior modifying flags</div><div class='ctx'>  *</div><div class='ctx'>  * Clock with a fixed multiplier and divider. The output frequency is the</div><div class='ctx'>  * parent clock rate divided by div and multiplied by mult.</div><div class='del'>- * Implements .recalc_rate, .set_rate and .round_rate</div><div class='add'>+ * Implements .recalc_rate, .set_rate, .round_rate and .recalc_accuracy</div><div class='add'>+ *</div><div class='add'>+ * Flags:</div><div class='add'>+ * * CLK_FIXED_FACTOR_FIXED_ACCURACY - Use the value in @acc instead of the</div><div class='add'>+ *                                     parent clk accuracy.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct clk_fixed_factor {</div><div class='ctx'> 	struct clk_hw	hw;</div><div class='ctx'> 	unsigned int	mult;</div><div class='ctx'> 	unsigned int	div;</div><div class='add'>+	unsigned long	acc;</div><div class='add'>+	unsigned int	flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CLK_FIXED_FACTOR_FIXED_ACCURACY	BIT(0)</div><div class='add'>+</div><div class='ctx'> #define to_clk_fixed_factor(_hw) container_of(_hw, struct clk_fixed_factor, hw)</div><div class='ctx'> </div><div class='ctx'> extern const struct clk_ops clk_fixed_factor_ops;</div><div class='hunk'>@@ -1106,10 +1153,27 @@ void clk_unregister_fixed_factor(struct clk *clk);</div><div class='ctx'> struct clk_hw *clk_hw_register_fixed_factor(struct device *dev,</div><div class='ctx'> 		const char *name, const char *parent_name, unsigned long flags,</div><div class='ctx'> 		unsigned int mult, unsigned int div);</div><div class='add'>+struct clk_hw *clk_hw_register_fixed_factor_fwname(struct device *dev,</div><div class='add'>+		struct device_node *np, const char *name, const char *fw_name,</div><div class='add'>+		unsigned long flags, unsigned int mult, unsigned int div);</div><div class='add'>+struct clk_hw *clk_hw_register_fixed_factor_with_accuracy_fwname(struct device *dev,</div><div class='add'>+		struct device_node *np, const char *name, const char *fw_name,</div><div class='add'>+		unsigned long flags, unsigned int mult, unsigned int div,</div><div class='add'>+		unsigned long acc);</div><div class='add'>+struct clk_hw *clk_hw_register_fixed_factor_index(struct device *dev,</div><div class='add'>+		const char *name, unsigned int index, unsigned long flags,</div><div class='add'>+		unsigned int mult, unsigned int div);</div><div class='ctx'> void clk_hw_unregister_fixed_factor(struct clk_hw *hw);</div><div class='ctx'> struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev,</div><div class='ctx'> 		const char *name, const char *parent_name, unsigned long flags,</div><div class='ctx'> 		unsigned int mult, unsigned int div);</div><div class='add'>+struct clk_hw *devm_clk_hw_register_fixed_factor_fwname(struct device *dev,</div><div class='add'>+		struct device_node *np, const char *name, const char *fw_name,</div><div class='add'>+		unsigned long flags, unsigned int mult, unsigned int div);</div><div class='add'>+struct clk_hw *devm_clk_hw_register_fixed_factor_with_accuracy_fwname(struct device *dev,</div><div class='add'>+		struct device_node *np, const char *name, const char *fw_name,</div><div class='add'>+		unsigned long flags, unsigned int mult, unsigned int div,</div><div class='add'>+		unsigned long acc);</div><div class='ctx'> struct clk_hw *devm_clk_hw_register_fixed_factor_index(struct device *dev,</div><div class='ctx'> 		const char *name, unsigned int index, unsigned long flags,</div><div class='ctx'> 		unsigned int mult, unsigned int div);</div><div class='hunk'>@@ -1296,6 +1360,32 @@ void clk_hw_unregister(struct clk_hw *hw);</div><div class='ctx'> /* helper functions */</div><div class='ctx'> const char *__clk_get_name(const struct clk *clk);</div><div class='ctx'> const char *clk_hw_get_name(const struct clk_hw *hw);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clk_hw_get_dev() - get device from an hardware clock.</div><div class='add'>+ * @hw: the clk_hw pointer to get the struct device from</div><div class='add'>+ *</div><div class='add'>+ * This is a helper to get the struct device associated with a hardware</div><div class='add'>+ * clock. Some clock controllers, such as the one registered with</div><div class='add'>+ * CLK_OF_DECLARE(), may have not provided a device pointer while</div><div class='add'>+ * registering the clock.</div><div class='add'>+ *</div><div class='add'>+ * Return: the struct device associated with the clock, or NULL if there</div><div class='add'>+ * is none.</div><div class='add'>+ */</div><div class='add'>+struct device *clk_hw_get_dev(const struct clk_hw *hw);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clk_hw_get_of_node() - get device_node from a hardware clock.</div><div class='add'>+ * @hw: the clk_hw pointer to get the struct device_node from</div><div class='add'>+ *</div><div class='add'>+ * This is a helper to get the struct device_node associated with a</div><div class='add'>+ * hardware clock.</div><div class='add'>+ *</div><div class='add'>+ * Return: the struct device_node associated with the clock, or NULL</div><div class='add'>+ * if there is none.</div><div class='add'>+ */</div><div class='add'>+struct device_node *clk_hw_get_of_node(const struct clk_hw *hw);</div><div class='ctx'> #ifdef CONFIG_COMMON_CLK</div><div class='ctx'> struct clk_hw *__clk_get_hw(struct clk *clk);</div><div class='ctx'> #else</div><div class='hunk'>@@ -1322,7 +1412,6 @@ unsigned long clk_hw_get_flags(const struct clk_hw *hw);</div><div class='ctx'> 	(clk_hw_get_flags((hw)) &amp; CLK_SET_RATE_PARENT)</div><div class='ctx'> </div><div class='ctx'> bool clk_hw_is_prepared(const struct clk_hw *hw);</div><div class='del'>-bool clk_hw_rate_is_protected(const struct clk_hw *hw);</div><div class='ctx'> bool clk_hw_is_enabled(const struct clk_hw *hw);</div><div class='ctx'> bool __clk_is_enabled(struct clk *clk);</div><div class='ctx'> struct clk *__clk_lookup(const char *name);</div><div class='head'>diff --git a/include/linux/clk.h b/include/linux/clk.h<br/>index 06f1b292f8a0..b607482ca77e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clk.h</a></div><div class='hunk'>@@ -202,6 +202,18 @@ bool clk_is_match(const struct clk *p, const struct clk *q);</div><div class='ctx'> int clk_rate_exclusive_get(struct clk *clk);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * devm_clk_rate_exclusive_get - devm variant of clk_rate_exclusive_get</div><div class='add'>+ * @dev: device the exclusivity is bound to</div><div class='add'>+ * @clk: clock source</div><div class='add'>+ *</div><div class='add'>+ * Calls clk_rate_exclusive_get() on @clk and registers a devm cleanup handler</div><div class='add'>+ * on @dev to call clk_rate_exclusive_put().</div><div class='add'>+ *</div><div class='add'>+ * Must not be called from within atomic context.</div><div class='add'>+ */</div><div class='add'>+int devm_clk_rate_exclusive_get(struct device *dev, struct clk *clk);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * clk_rate_exclusive_put - release exclusivity over the rate control of a</div><div class='ctx'>  *                          producer</div><div class='ctx'>  * @clk: clock source</div><div class='hunk'>@@ -274,6 +286,11 @@ static inline int clk_rate_exclusive_get(struct clk *clk)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int devm_clk_rate_exclusive_get(struct device *dev, struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void clk_rate_exclusive_put(struct clk *clk) {}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -479,6 +496,24 @@ int __must_check devm_clk_bulk_get_all(struct device *dev,</div><div class='ctx'> 				       struct clk_bulk_data **clks);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * devm_clk_bulk_get_all_enabled - Get and enable all clocks of the consumer (managed)</div><div class='add'>+ * @dev: device for clock "consumer"</div><div class='add'>+ * @clks: pointer to the clk_bulk_data table of consumer</div><div class='add'>+ *</div><div class='add'>+ * Returns a positive value for the number of clocks obtained while the</div><div class='add'>+ * clock references are stored in the clk_bulk_data table in @clks field.</div><div class='add'>+ * Returns 0 if there're none and a negative value if something failed.</div><div class='add'>+ *</div><div class='add'>+ * This helper function allows drivers to get all clocks of the</div><div class='add'>+ * consumer and enables them in one operation with management.</div><div class='add'>+ * The clks will automatically be disabled and freed when the device</div><div class='add'>+ * is unbound.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int __must_check devm_clk_bulk_get_all_enabled(struct device *dev,</div><div class='add'>+					       struct clk_bulk_data **clks);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * devm_clk_get - lookup and obtain a managed reference to a clock producer.</div><div class='ctx'>  * @dev: device for clock "consumer"</div><div class='ctx'>  * @id: clock consumer ID</div><div class='hunk'>@@ -608,6 +643,32 @@ struct clk *devm_clk_get_optional_prepared(struct device *dev, const char *id);</div><div class='ctx'> struct clk *devm_clk_get_optional_enabled(struct device *dev, const char *id);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * devm_clk_get_optional_enabled_with_rate - devm_clk_get_optional() +</div><div class='add'>+ *                                           clk_set_rate() +</div><div class='add'>+ *                                           clk_prepare_enable()</div><div class='add'>+ * @dev: device for clock "consumer"</div><div class='add'>+ * @id: clock consumer ID</div><div class='add'>+ * @rate: new clock rate</div><div class='add'>+ *</div><div class='add'>+ * Context: May sleep.</div><div class='add'>+ *</div><div class='add'>+ * Return: a struct clk corresponding to the clock producer, or</div><div class='add'>+ * valid IS_ERR() condition containing errno.  The implementation</div><div class='add'>+ * uses @dev and @id to determine the clock consumer, and thereby</div><div class='add'>+ * the clock producer.  If no such clk is found, it returns NULL</div><div class='add'>+ * which serves as a dummy clk.  That's the only difference compared</div><div class='add'>+ * to devm_clk_get_enabled().</div><div class='add'>+ *</div><div class='add'>+ * The returned clk (if valid) is prepared and enabled and rate was set.</div><div class='add'>+ *</div><div class='add'>+ * The clock will automatically be disabled, unprepared and freed</div><div class='add'>+ * when the device is unbound from the bus.</div><div class='add'>+ */</div><div class='add'>+struct clk *devm_clk_get_optional_enabled_with_rate(struct device *dev,</div><div class='add'>+						    const char *id,</div><div class='add'>+						    unsigned long rate);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * devm_get_clk_from_child - lookup and obtain a managed reference to a</div><div class='ctx'>  *			     clock producer from child node.</div><div class='ctx'>  * @dev: device for clock "consumer"</div><div class='hunk'>@@ -949,6 +1010,13 @@ static inline struct clk *devm_clk_get_optional_enabled(struct device *dev,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct clk *</div><div class='add'>+devm_clk_get_optional_enabled_with_rate(struct device *dev, const char *id,</div><div class='add'>+					unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,</div><div class='ctx'> 						 struct clk_bulk_data *clks)</div><div class='ctx'> {</div><div class='hunk'>@@ -968,6 +1036,12 @@ static inline int __must_check devm_clk_bulk_get_all(struct device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int __must_check devm_clk_bulk_get_all_enabled(struct device *dev,</div><div class='add'>+						struct clk_bulk_data **clks)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct clk *devm_get_clk_from_child(struct device *dev,</div><div class='ctx'> 				struct device_node *np, const char *con_id)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h<br/>index 7af499bdbecb..d60ce9708ea2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clk/at91_pmc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk/at91_pmc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clk/at91_pmc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clk/at91_pmc.h</a></div><div class='hunk'>@@ -47,8 +47,6 @@</div><div class='ctx'> #define	AT91_PMC_PCSR		0x18			/* Peripheral Clock Status Register */</div><div class='ctx'> </div><div class='ctx'> #define AT91_PMC_PLL_ACR	0x18			/* PLL Analog Control Register [for SAM9X60] */</div><div class='del'>-#define		AT91_PMC_PLL_ACR_DEFAULT_UPLL	UL(0x12020010)	/* Default PLL ACR value for UPLL */</div><div class='del'>-#define		AT91_PMC_PLL_ACR_DEFAULT_PLLA	UL(0x00020010)	/* Default PLL ACR value for PLLA */</div><div class='ctx'> #define		AT91_PMC_PLL_ACR_UTMIVR		(1 &lt;&lt; 12)	/* UPLL Voltage regulator Control */</div><div class='ctx'> #define		AT91_PMC_PLL_ACR_UTMIBG		(1 &lt;&lt; 13)	/* UPLL Bandgap Control */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/clk/davinci.h b/include/linux/clk/davinci.h<br/>index e1d37451e03f..787a81116b00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clk/davinci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk/davinci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clk/davinci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clk/davinci.h</a></div><div class='hunk'>@@ -12,12 +12,6 @@</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* function for registering clocks in early boot */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_DAVINCI_DA830</div><div class='del'>-int da830_pll_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ARCH_DAVINCI_DA850</div><div class='ctx'> int da850_pll0_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_CLK_DAVINCI_PLL_H___ */</div><div class='head'>diff --git a/include/linux/clk/renesas.h b/include/linux/clk/renesas.h<br/>index 0ebbe2f0b45e..69d8159deee3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clk/renesas.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk/renesas.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clk/renesas.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clk/renesas.h</a></div><div class='hunk'>@@ -10,7 +10,9 @@</div><div class='ctx'> #ifndef __LINUX_CLK_RENESAS_H_</div><div class='ctx'> #define __LINUX_CLK_RENESAS_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='ctx'> struct device_node;</div><div class='hunk'>@@ -32,4 +34,147 @@ void cpg_mssr_detach_dev(struct generic_pm_domain *unused, struct device *dev);</div><div class='ctx'> #define cpg_mssr_attach_dev	NULL</div><div class='ctx'> #define cpg_mssr_detach_dev	NULL</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rzv2h_pll_limits - PLL parameter constraints</div><div class='add'>+ *</div><div class='add'>+ * This structure defines the minimum and maximum allowed values for</div><div class='add'>+ * various parameters used to configure a PLL. These limits ensure</div><div class='add'>+ * the PLL operates within valid and stable ranges.</div><div class='add'>+ *</div><div class='add'>+ * @fout: Output frequency range (in MHz)</div><div class='add'>+ * @fout.min: Minimum allowed output frequency</div><div class='add'>+ * @fout.max: Maximum allowed output frequency</div><div class='add'>+ *</div><div class='add'>+ * @fvco: PLL oscillation frequency range (in MHz)</div><div class='add'>+ * @fvco.min: Minimum allowed VCO frequency</div><div class='add'>+ * @fvco.max: Maximum allowed VCO frequency</div><div class='add'>+ *</div><div class='add'>+ * @m: Main-divider range</div><div class='add'>+ * @m.min: Minimum main-divider value</div><div class='add'>+ * @m.max: Maximum main-divider value</div><div class='add'>+ *</div><div class='add'>+ * @p: Pre-divider range</div><div class='add'>+ * @p.min: Minimum pre-divider value</div><div class='add'>+ * @p.max: Maximum pre-divider value</div><div class='add'>+ *</div><div class='add'>+ * @s: Divider range</div><div class='add'>+ * @s.min: Minimum divider value</div><div class='add'>+ * @s.max: Maximum divider value</div><div class='add'>+ *</div><div class='add'>+ * @k: Delta-sigma modulator range (signed)</div><div class='add'>+ * @k.min: Minimum delta-sigma value</div><div class='add'>+ * @k.max: Maximum delta-sigma value</div><div class='add'>+ */</div><div class='add'>+struct rzv2h_pll_limits {</div><div class='add'>+	struct {</div><div class='add'>+		u32 min;</div><div class='add'>+		u32 max;</div><div class='add'>+	} fout;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 min;</div><div class='add'>+		u32 max;</div><div class='add'>+	} fvco;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u16 min;</div><div class='add'>+		u16 max;</div><div class='add'>+	} m;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 min;</div><div class='add'>+		u8 max;</div><div class='add'>+	} p;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 min;</div><div class='add'>+		u8 max;</div><div class='add'>+	} s;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		s16 min;</div><div class='add'>+		s16 max;</div><div class='add'>+	} k;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rzv2h_pll_pars - PLL configuration parameters</div><div class='add'>+ *</div><div class='add'>+ * This structure contains the configuration parameters for the</div><div class='add'>+ * Phase-Locked Loop (PLL), used to achieve a specific output frequency.</div><div class='add'>+ *</div><div class='add'>+ * @m: Main divider value</div><div class='add'>+ * @p: Pre-divider value</div><div class='add'>+ * @s: Output divider value</div><div class='add'>+ * @k: Delta-sigma modulation value</div><div class='add'>+ * @freq_millihz: Calculated PLL output frequency in millihertz</div><div class='add'>+ * @error_millihz: Frequency error from target in millihertz (signed)</div><div class='add'>+ */</div><div class='add'>+struct rzv2h_pll_pars {</div><div class='add'>+	u16 m;</div><div class='add'>+	u8 p;</div><div class='add'>+	u8 s;</div><div class='add'>+	s16 k;</div><div class='add'>+	u64 freq_millihz;</div><div class='add'>+	s64 error_millihz;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rzv2h_pll_div_pars - PLL parameters with post-divider</div><div class='add'>+ *</div><div class='add'>+ * This structure is used for PLLs that include an additional post-divider</div><div class='add'>+ * stage after the main PLL block. It contains both the PLL configuration</div><div class='add'>+ * parameters and the resulting frequency/error values after the divider.</div><div class='add'>+ *</div><div class='add'>+ * @pll: Main PLL configuration parameters (see struct rzv2h_pll_pars)</div><div class='add'>+ *</div><div class='add'>+ * @div: Post-divider configuration and result</div><div class='add'>+ * @div.divider_value: Divider applied to the PLL output</div><div class='add'>+ * @div.freq_millihz: Output frequency after divider in millihertz</div><div class='add'>+ * @div.error_millihz: Frequency error from target in millihertz (signed)</div><div class='add'>+ */</div><div class='add'>+struct rzv2h_pll_div_pars {</div><div class='add'>+	struct rzv2h_pll_pars pll;</div><div class='add'>+	struct {</div><div class='add'>+		u8 divider_value;</div><div class='add'>+		u64 freq_millihz;</div><div class='add'>+		s64 error_millihz;</div><div class='add'>+	} div;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RZV2H_CPG_PLL_DSI_LIMITS(name)					\</div><div class='add'>+	static const struct rzv2h_pll_limits (name) = {			\</div><div class='add'>+		.fout = { .min = 25 * MEGA, .max = 375 * MEGA },	\</div><div class='add'>+		.fvco = { .min = 1600 * MEGA, .max = 3200 * MEGA },	\</div><div class='add'>+		.m = { .min = 64, .max = 533 },				\</div><div class='add'>+		.p = { .min = 1, .max = 4 },				\</div><div class='add'>+		.s = { .min = 0, .max = 6 },				\</div><div class='add'>+		.k = { .min = -32768, .max = 32767 },			\</div><div class='add'>+	}								\</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CLK_RZV2H</div><div class='add'>+bool rzv2h_get_pll_pars(const struct rzv2h_pll_limits *limits,</div><div class='add'>+			struct rzv2h_pll_pars *pars, u64 freq_millihz);</div><div class='add'>+</div><div class='add'>+bool rzv2h_get_pll_divs_pars(const struct rzv2h_pll_limits *limits,</div><div class='add'>+			     struct rzv2h_pll_div_pars *pars,</div><div class='add'>+			     const u8 *table, u8 table_size, u64 freq_millihz);</div><div class='add'>+#else</div><div class='add'>+static inline bool rzv2h_get_pll_pars(const struct rzv2h_pll_limits *limits,</div><div class='add'>+				      struct rzv2h_pll_pars *pars,</div><div class='add'>+				      u64 freq_millihz)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool rzv2h_get_pll_divs_pars(const struct rzv2h_pll_limits *limits,</div><div class='add'>+					   struct rzv2h_pll_div_pars *pars,</div><div class='add'>+					   const u8 *table, u8 table_size,</div><div class='add'>+					   u64 freq_millihz)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h<br/>index cbfcbf186ce3..54a3fa370004 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clk/ti.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clk/ti.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clk/ti.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clk/ti.h</a></div><div class='hunk'>@@ -13,11 +13,14 @@</div><div class='ctx'> /**</div><div class='ctx'>  * struct clk_omap_reg - OMAP register declaration</div><div class='ctx'>  * @offset: offset from the master IP module base address</div><div class='add'>+ * @bit: register bit offset</div><div class='ctx'>  * @index: index of the master IP module</div><div class='add'>+ * @flags: flags</div><div class='ctx'>  */</div><div class='ctx'> struct clk_omap_reg {</div><div class='ctx'> 	void __iomem *ptr;</div><div class='ctx'> 	u16 offset;</div><div class='add'>+	u8 bit;</div><div class='ctx'> 	u8 index;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> };</div><div class='hunk'>@@ -31,14 +34,14 @@ struct clk_omap_reg {</div><div class='ctx'>  * @clk_ref: struct clk_hw pointer to the clock's reference clock input</div><div class='ctx'>  * @control_reg: register containing the DPLL mode bitfield</div><div class='ctx'>  * @enable_mask: mask of the DPLL mode bitfield in @control_reg</div><div class='del'>- * @last_rounded_rate: cache of the last rate result of omap2_dpll_round_rate()</div><div class='del'>- * @last_rounded_m: cache of the last M result of omap2_dpll_round_rate()</div><div class='add'>+ * @last_rounded_rate: cache of the last rate result of omap2_dpll_determine_rate()</div><div class='add'>+ * @last_rounded_m: cache of the last M result of omap2_dpll_determine_rate()</div><div class='ctx'>  * @last_rounded_m4xen: cache of the last M4X result of</div><div class='del'>- *			omap4_dpll_regm4xen_round_rate()</div><div class='add'>+ *			omap4_dpll_regm4xen_determine_rate()</div><div class='ctx'>  * @last_rounded_lpmode: cache of the last lpmode result of</div><div class='ctx'>  *			 omap4_dpll_lpmode_recalc()</div><div class='ctx'>  * @max_multiplier: maximum valid non-bypass multiplier value (actual)</div><div class='del'>- * @last_rounded_n: cache of the last N result of omap2_dpll_round_rate()</div><div class='add'>+ * @last_rounded_n: cache of the last N result of omap2_dpll_determine_rate()</div><div class='ctx'>  * @min_divider: minimum valid non-bypass divider value (actual)</div><div class='ctx'>  * @max_divider: maximum valid non-bypass divider value (actual)</div><div class='ctx'>  * @max_rate: maximum clock rate for the DPLL</div><div class='head'>diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h<br/>index 9aac31d856f3..b0df28ddd394 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clockchips.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clockchips.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clockchips.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clockchips.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #ifdef CONFIG_GENERIC_CLOCKEVENTS</div><div class='ctx'> </div><div class='ctx'> # include &lt;linux/clocksource.h&gt;</div><div class='del'>-# include &lt;linux/cpumask.h&gt;</div><div class='add'>+# include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> # include &lt;linux/ktime.h&gt;</div><div class='ctx'> # include &lt;linux/notifier.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h<br/>index 0ad8b550bb4b..65b7c41471c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clocksource.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clocksource.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clocksource.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clocksource.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+struct clocksource_base;</div><div class='ctx'> struct clocksource;</div><div class='ctx'> struct module;</div><div class='ctx'> </div><div class='hunk'>@@ -48,8 +49,10 @@ struct module;</div><div class='ctx'>  * @archdata:		Optional arch-specific data</div><div class='ctx'>  * @max_cycles:		Maximum safe cycle value which won't overflow on</div><div class='ctx'>  *			multiplication</div><div class='add'>+ * @max_raw_delta:	Maximum safe delta value for negative motion detection</div><div class='ctx'>  * @name:		Pointer to clocksource name</div><div class='ctx'>  * @list:		List head for registration (internal)</div><div class='add'>+ * @freq_khz:		Clocksource frequency in khz.</div><div class='ctx'>  * @rating:		Rating value for selection (higher is better)</div><div class='ctx'>  *			To avoid rating inflation the following</div><div class='ctx'>  *			list should give you a guide as to how</div><div class='hunk'>@@ -70,6 +73,8 @@ struct module;</div><div class='ctx'>  *			validate the clocksource from which the snapshot was</div><div class='ctx'>  *			taken.</div><div class='ctx'>  * @flags:		Flags describing special properties</div><div class='add'>+ * @base:		Hardware abstraction for clock on which a clocksource</div><div class='add'>+ *			is based</div><div class='ctx'>  * @enable:		Optional function to enable the clocksource</div><div class='ctx'>  * @disable:		Optional function to disable the clocksource</div><div class='ctx'>  * @suspend:		Optional suspend function for the clocksource</div><div class='hunk'>@@ -105,12 +110,15 @@ struct clocksource {</div><div class='ctx'> 	struct arch_clocksource_data archdata;</div><div class='ctx'> #endif</div><div class='ctx'> 	u64			max_cycles;</div><div class='add'>+	u64			max_raw_delta;</div><div class='ctx'> 	const char		*name;</div><div class='ctx'> 	struct list_head	list;</div><div class='add'>+	u32			freq_khz;</div><div class='ctx'> 	int			rating;</div><div class='ctx'> 	enum clocksource_ids	id;</div><div class='ctx'> 	enum vdso_clock_mode	vdso_clock_mode;</div><div class='ctx'> 	unsigned long		flags;</div><div class='add'>+	struct clocksource_base *base;</div><div class='ctx'> </div><div class='ctx'> 	int			(*enable)(struct clocksource *cs);</div><div class='ctx'> 	void			(*disable)(struct clocksource *cs);</div><div class='hunk'>@@ -209,7 +217,6 @@ static inline s64 clocksource_cyc2ns(u64 cycles, u32 mult, u32 shift)</div><div class='ctx'> </div><div class='ctx'> extern int clocksource_unregister(struct clocksource*);</div><div class='ctx'> extern void clocksource_touch_watchdog(void);</div><div class='del'>-extern void clocksource_change_rating(struct clocksource *cs, int rating);</div><div class='ctx'> extern void clocksource_suspend(void);</div><div class='ctx'> extern void clocksource_resume(void);</div><div class='ctx'> extern struct clocksource * __init clocksource_default_clock(void);</div><div class='hunk'>@@ -306,4 +313,25 @@ static inline unsigned int clocksource_get_max_watchdog_retry(void)</div><div class='ctx'> </div><div class='ctx'> void clocksource_verify_percpu(struct clocksource *cs);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct clocksource_base - hardware abstraction for clock on which a clocksource</div><div class='add'>+ *			is based</div><div class='add'>+ * @id:			Defaults to CSID_GENERIC. The id value is used for conversion</div><div class='add'>+ *			functions which require that the current clocksource is based</div><div class='add'>+ *			on a clocksource_base with a particular ID in certain snapshot</div><div class='add'>+ *			functions to allow callers to validate the clocksource from</div><div class='add'>+ *			which the snapshot was taken.</div><div class='add'>+ * @freq_khz:		Nominal frequency of the base clock in kHz</div><div class='add'>+ * @offset:		Offset between the base clock and the clocksource</div><div class='add'>+ * @numerator:		Numerator of the clock ratio between base clock and the clocksource</div><div class='add'>+ * @denominator:	Denominator of the clock ratio between base clock and the clocksource</div><div class='add'>+ */</div><div class='add'>+struct clocksource_base {</div><div class='add'>+	enum clocksource_ids	id;</div><div class='add'>+	u32			freq_khz;</div><div class='add'>+	u64			offset;</div><div class='add'>+	u32			numerator;</div><div class='add'>+	u32			denominator;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_CLOCKSOURCE_H */</div><div class='head'>diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h<br/>index a4fa3436940c..c4ef4ae2eded 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/clocksource_ids.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/clocksource_ids.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/clocksource_ids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/clocksource_ids.h</a></div><div class='hunk'>@@ -6,9 +6,11 @@</div><div class='ctx'> enum clocksource_ids {</div><div class='ctx'> 	CSID_GENERIC		= 0,</div><div class='ctx'> 	CSID_ARM_ARCH_COUNTER,</div><div class='add'>+	CSID_S390_TOD,</div><div class='ctx'> 	CSID_X86_TSC_EARLY,</div><div class='ctx'> 	CSID_X86_TSC,</div><div class='ctx'> 	CSID_X86_KVM_CLK,</div><div class='add'>+	CSID_X86_ART,</div><div class='ctx'> 	CSID_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/closure.h b/include/linux/closure.h<br/>index c554c6a08768..880fe85e35e9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/closure.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/closure.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/closure.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/closure.h</a></div><div class='hunk'>@@ -159,6 +159,7 @@ struct closure {</div><div class='ctx'> #ifdef CONFIG_DEBUG_CLOSURES</div><div class='ctx'> #define CLOSURE_MAGIC_DEAD	0xc054dead</div><div class='ctx'> #define CLOSURE_MAGIC_ALIVE	0xc054a11e</div><div class='add'>+#define CLOSURE_MAGIC_STACK	0xc05451cc</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		magic;</div><div class='ctx'> 	struct list_head	all;</div><div class='hunk'>@@ -194,6 +195,18 @@ static inline void closure_sync(struct closure *cl)</div><div class='ctx'> 		__closure_sync(cl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int __closure_sync_timeout(struct closure *cl, unsigned long timeout);</div><div class='add'>+</div><div class='add'>+static inline int closure_sync_timeout(struct closure *cl, unsigned long timeout)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_DEBUG_CLOSURES</div><div class='add'>+	BUG_ON(closure_nr_remaining(cl) != 1 &amp;&amp; !cl-&gt;closure_get_happened);</div><div class='add'>+#endif</div><div class='add'>+	return cl-&gt;closure_get_happened</div><div class='add'>+		? __closure_sync_timeout(cl, timeout)</div><div class='add'>+		: 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_DEBUG_CLOSURES</div><div class='ctx'> </div><div class='ctx'> void closure_debug_create(struct closure *cl);</div><div class='hunk'>@@ -273,6 +286,21 @@ static inline void closure_get(struct closure *cl)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * closure_get_not_zero</div><div class='add'>+ */</div><div class='add'>+static inline bool closure_get_not_zero(struct closure *cl)</div><div class='add'>+{</div><div class='add'>+	unsigned old = atomic_read(&amp;cl-&gt;remaining);</div><div class='add'>+	do {</div><div class='add'>+		if (!(old &amp; CLOSURE_REMAINING_MASK))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	} while (!atomic_try_cmpxchg_acquire(&amp;cl-&gt;remaining, &amp;old, old + 1));</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * closure_init - Initialize a closure, setting the refcount to 1</div><div class='ctx'>  * @cl:		closure to initialize</div><div class='ctx'>  * @parent:	parent of the new closure. cl will take a refcount on it for its</div><div class='hunk'>@@ -296,6 +324,18 @@ static inline void closure_init_stack(struct closure *cl)</div><div class='ctx'> {</div><div class='ctx'> 	memset(cl, 0, sizeof(struct closure));</div><div class='ctx'> 	atomic_set(&amp;cl-&gt;remaining, CLOSURE_REMAINING_INITIALIZER);</div><div class='add'>+#ifdef CONFIG_DEBUG_CLOSURES</div><div class='add'>+	cl-&gt;magic = CLOSURE_MAGIC_STACK;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void closure_init_stack_release(struct closure *cl)</div><div class='add'>+{</div><div class='add'>+	memset(cl, 0, sizeof(struct closure));</div><div class='add'>+	atomic_set_release(&amp;cl-&gt;remaining, CLOSURE_REMAINING_INITIALIZER);</div><div class='add'>+#ifdef CONFIG_DEBUG_CLOSURES</div><div class='add'>+	cl-&gt;magic = CLOSURE_MAGIC_STACK;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -343,6 +383,8 @@ do {									\</div><div class='ctx'>  */</div><div class='ctx'> #define closure_return(_cl)	continue_at((_cl), NULL, NULL)</div><div class='ctx'> </div><div class='add'>+void closure_return_sync(struct closure *cl);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * continue_at_nobarrier - jump to another function without barrier</div><div class='ctx'>  *</div><div class='hunk'>@@ -412,4 +454,39 @@ do {									\</div><div class='ctx'> 		__closure_wait_event(waitlist, _cond);			\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+#define __closure_wait_event_timeout(waitlist, _cond, _until)		\</div><div class='add'>+({									\</div><div class='add'>+	struct closure cl;						\</div><div class='add'>+	long _t;							\</div><div class='add'>+									\</div><div class='add'>+	closure_init_stack(&amp;cl);					\</div><div class='add'>+									\</div><div class='add'>+	while (1) {							\</div><div class='add'>+		closure_wait(waitlist, &amp;cl);				\</div><div class='add'>+		if (_cond) {						\</div><div class='add'>+			_t = max_t(long, 1L, _until - jiffies);		\</div><div class='add'>+			break;						\</div><div class='add'>+		}							\</div><div class='add'>+		_t = max_t(long, 0L, _until - jiffies);			\</div><div class='add'>+		if (!_t)						\</div><div class='add'>+			break;						\</div><div class='add'>+		closure_sync_timeout(&amp;cl, _t);				\</div><div class='add'>+	}								\</div><div class='add'>+	closure_wake_up(waitlist);					\</div><div class='add'>+	closure_sync(&amp;cl);						\</div><div class='add'>+	_t;								\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns 0 if timeout expired, remaining time in jiffies (at least 1) if</div><div class='add'>+ * condition became true</div><div class='add'>+ */</div><div class='add'>+#define closure_wait_event_timeout(waitlist, _cond, _timeout)		\</div><div class='add'>+({									\</div><div class='add'>+	unsigned long _until = jiffies + _timeout;			\</div><div class='add'>+	(_cond)								\</div><div class='add'>+		? max_t(long, 1L, _until - jiffies)			\</div><div class='add'>+		: __closure_wait_event_timeout(waitlist, _cond, _until);\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_CLOSURE_H */</div><div class='head'>diff --git a/include/linux/cma.h b/include/linux/cma.h<br/>index 63873b93deaa..62d9c1cf6326 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cma.h</a></div><div class='hunk'>@@ -6,12 +6,8 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/numa.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * There is always at least global CMA area and a few optional</div><div class='del'>- * areas configured in kernel .config.</div><div class='del'>- */</div><div class='ctx'> #ifdef CONFIG_CMA_AREAS</div><div class='del'>-#define MAX_CMA_AREAS	(1 + CONFIG_CMA_AREAS)</div><div class='add'>+#define MAX_CMA_AREAS	CONFIG_CMA_AREAS</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define CMA_MAX_NAME 64</div><div class='hunk'>@@ -44,6 +40,9 @@ static inline int __init cma_declare_contiguous(phys_addr_t base,</div><div class='ctx'> 	return cma_declare_contiguous_nid(base, size, limit, alignment,</div><div class='ctx'> 			order_per_bit, fixed, name, res_cma, NUMA_NO_NODE);</div><div class='ctx'> }</div><div class='add'>+extern int __init cma_declare_contiguous_multi(phys_addr_t size,</div><div class='add'>+			phys_addr_t align, unsigned int order_per_bit,</div><div class='add'>+			const char *name, struct cma **res_cma, int nid);</div><div class='ctx'> extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,</div><div class='ctx'> 					unsigned int order_per_bit,</div><div class='ctx'> 					const char *name,</div><div class='hunk'>@@ -54,6 +53,28 @@ extern bool cma_pages_valid(struct cma *cma, const struct page *pages, unsigned</div><div class='ctx'> extern bool cma_release(struct cma *cma, const struct page *pages, unsigned long count);</div><div class='ctx'> </div><div class='ctx'> extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data);</div><div class='add'>+extern bool cma_intersects(struct cma *cma, unsigned long start, unsigned long end);</div><div class='ctx'> </div><div class='ctx'> extern void cma_reserve_pages_on_error(struct cma *cma);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CMA</div><div class='add'>+struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp);</div><div class='add'>+bool cma_free_folio(struct cma *cma, const struct folio *folio);</div><div class='add'>+bool cma_validate_zones(struct cma *cma);</div><div class='add'>+#else</div><div class='add'>+static inline struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool cma_free_folio(struct cma *cma, const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline bool cma_validate_zones(struct cma *cma)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/cmpxchg-emu.h b/include/linux/cmpxchg-emu.h<br/>new file mode 100644<br/>index 000000000000..998deec67740<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cmpxchg-emu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cmpxchg-emu.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * Emulated 1-byte and 2-byte cmpxchg operations for architectures</div><div class='add'>+ * lacking direct support for these sizes.  These are implemented in terms</div><div class='add'>+ * of 4-byte cmpxchg operations.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Paul E. McKenney.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_CMPXCHG_EMU_H</div><div class='add'>+#define __LINUX_CMPXCHG_EMU_H</div><div class='add'>+</div><div class='add'>+uintptr_t cmpxchg_emu_u8(volatile u8 *p, uintptr_t old, uintptr_t new);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_CMPXCHG_EMU_H */</div><div class='head'>diff --git a/include/linux/codetag.h b/include/linux/codetag.h<br/>new file mode 100644<br/>index 000000000000..8ea2a5f7c98a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/codetag.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/codetag.h</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * code tagging framework</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_CODETAG_H</div><div class='add'>+#define _LINUX_CODETAG_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct codetag_iterator;</div><div class='add'>+struct codetag_type;</div><div class='add'>+struct codetag_module;</div><div class='add'>+struct seq_buf;</div><div class='add'>+struct module;</div><div class='add'>+</div><div class='add'>+#define CODETAG_SECTION_START_PREFIX	"__start_"</div><div class='add'>+#define CODETAG_SECTION_STOP_PREFIX	"__stop_"</div><div class='add'>+</div><div class='add'>+/* codetag flags */</div><div class='add'>+#define CODETAG_FLAG_INACCURATE	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An instance of this structure is created in a special ELF section at every</div><div class='add'>+ * code location being tagged.  At runtime, the special section is treated as</div><div class='add'>+ * an array of these.</div><div class='add'>+ */</div><div class='add'>+struct codetag {</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	unsigned int lineno;</div><div class='add'>+	const char *modname;</div><div class='add'>+	const char *function;</div><div class='add'>+	const char *filename;</div><div class='add'>+} __aligned(8);</div><div class='add'>+</div><div class='add'>+union codetag_ref {</div><div class='add'>+	struct codetag *ct;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct codetag_type_desc {</div><div class='add'>+	const char *section;</div><div class='add'>+	size_t tag_size;</div><div class='add'>+	int (*module_load)(struct module *mod,</div><div class='add'>+			   struct codetag *start, struct codetag *end);</div><div class='add'>+	void (*module_unload)(struct module *mod,</div><div class='add'>+			      struct codetag *start, struct codetag *end);</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+	void (*module_replaced)(struct module *mod, struct module *new_mod);</div><div class='add'>+	bool (*needs_section_mem)(struct module *mod, unsigned long size);</div><div class='add'>+	void *(*alloc_section_mem)(struct module *mod, unsigned long size,</div><div class='add'>+				   unsigned int prepend, unsigned long align);</div><div class='add'>+	void (*free_section_mem)(struct module *mod, bool used);</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct codetag_iterator {</div><div class='add'>+	struct codetag_type *cttype;</div><div class='add'>+	struct codetag_module *cmod;</div><div class='add'>+	unsigned long mod_id;</div><div class='add'>+	struct codetag *ct;</div><div class='add'>+	unsigned long mod_seq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+#define CT_MODULE_NAME KBUILD_MODNAME</div><div class='add'>+#else</div><div class='add'>+#define CT_MODULE_NAME NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define CODE_TAG_INIT {					\</div><div class='add'>+	.modname	= CT_MODULE_NAME,		\</div><div class='add'>+	.function	= __func__,			\</div><div class='add'>+	.filename	= __FILE__,			\</div><div class='add'>+	.lineno		= __LINE__,			\</div><div class='add'>+	.flags		= 0,				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void codetag_lock_module_list(struct codetag_type *cttype, bool lock);</div><div class='add'>+bool codetag_trylock_module_list(struct codetag_type *cttype);</div><div class='add'>+struct codetag_iterator codetag_get_ct_iter(struct codetag_type *cttype);</div><div class='add'>+struct codetag *codetag_next_ct(struct codetag_iterator *iter);</div><div class='add'>+</div><div class='add'>+void codetag_to_text(struct seq_buf *out, struct codetag *ct);</div><div class='add'>+</div><div class='add'>+struct codetag_type *</div><div class='add'>+codetag_register_type(const struct codetag_type_desc *desc);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CODE_TAGGING) &amp;&amp; defined(CONFIG_MODULES)</div><div class='add'>+</div><div class='add'>+bool codetag_needs_module_section(struct module *mod, const char *name,</div><div class='add'>+				  unsigned long size);</div><div class='add'>+void *codetag_alloc_module_section(struct module *mod, const char *name,</div><div class='add'>+				   unsigned long size, unsigned int prepend,</div><div class='add'>+				   unsigned long align);</div><div class='add'>+void codetag_free_module_sections(struct module *mod);</div><div class='add'>+void codetag_module_replaced(struct module *mod, struct module *new_mod);</div><div class='add'>+int codetag_load_module(struct module *mod);</div><div class='add'>+void codetag_unload_module(struct module *mod);</div><div class='add'>+</div><div class='add'>+#else /* defined(CONFIG_CODE_TAGGING) &amp;&amp; defined(CONFIG_MODULES) */</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+codetag_needs_module_section(struct module *mod, const char *name,</div><div class='add'>+			     unsigned long size) { return false; }</div><div class='add'>+static inline void *</div><div class='add'>+codetag_alloc_module_section(struct module *mod, const char *name,</div><div class='add'>+			     unsigned long size, unsigned int prepend,</div><div class='add'>+			     unsigned long align) { return NULL; }</div><div class='add'>+static inline void codetag_free_module_sections(struct module *mod) {}</div><div class='add'>+static inline void codetag_module_replaced(struct module *mod, struct module *new_mod) {}</div><div class='add'>+static inline int codetag_load_module(struct module *mod) { return 0; }</div><div class='add'>+static inline void codetag_unload_module(struct module *mod) {}</div><div class='add'>+</div><div class='add'>+#endif /* defined(CONFIG_CODE_TAGGING) &amp;&amp; defined(CONFIG_MODULES) */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_CODETAG_H */</div><div class='head'>diff --git a/include/linux/comedi/comedidev.h b/include/linux/comedi/comedidev.h<br/>index c08416a7364b..35fdc41845ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/comedi/comedidev.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/comedi/comedidev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/comedi/comedidev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/comedi/comedidev.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/spinlock_types.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/comedi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define COMEDI_VERSION(a, b, c) (((a) &lt;&lt; 16) + ((b) &lt;&lt; 8) + (c))</div><div class='hunk'>@@ -234,16 +235,12 @@ struct comedi_buf_page {</div><div class='ctx'>  *</div><div class='ctx'>  * A COMEDI data buffer is allocated as individual pages, either in</div><div class='ctx'>  * conventional memory or DMA coherent memory, depending on the attached,</div><div class='del'>- * low-level hardware device.  (The buffer pages also get mapped into the</div><div class='del'>- * kernel's contiguous virtual address space pointed to by the 'prealloc_buf'</div><div class='del'>- * member of &amp;struct comedi_async.)</div><div class='add'>+ * low-level hardware device.</div><div class='ctx'>  *</div><div class='ctx'>  * The buffer is normally freed when the COMEDI device is detached from the</div><div class='ctx'>  * low-level driver (which may happen due to device removal), but if it happens</div><div class='ctx'>  * to be mmapped at the time, the pages cannot be freed until the buffer has</div><div class='del'>- * been munmapped.  That is what the reference counter is for.  (The virtual</div><div class='del'>- * address space pointed by 'prealloc_buf' is freed when the COMEDI device is</div><div class='del'>- * detached.)</div><div class='add'>+ * been munmapped.  That is what the reference counter is for.</div><div class='ctx'>  */</div><div class='ctx'> struct comedi_buf_map {</div><div class='ctx'> 	struct device *dma_hw_dev;</div><div class='hunk'>@@ -255,7 +252,6 @@ struct comedi_buf_map {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct comedi_async - Control data for asynchronous COMEDI commands</div><div class='del'>- * @prealloc_buf: Kernel virtual address of allocated acquisition buffer.</div><div class='ctx'>  * @prealloc_bufsz: Buffer size (in bytes).</div><div class='ctx'>  * @buf_map: Map of buffer pages.</div><div class='ctx'>  * @max_bufsize: Maximum allowed buffer size (in bytes).</div><div class='hunk'>@@ -277,6 +273,8 @@ struct comedi_buf_map {</div><div class='ctx'>  * @events: Bit-vector of events that have occurred.</div><div class='ctx'>  * @cmd: Details of comedi command in progress.</div><div class='ctx'>  * @wait_head: Task wait queue for file reader or writer.</div><div class='add'>+ * @run_complete: "run complete" completion event.</div><div class='add'>+ * @run_active: "run active" reference counter.</div><div class='ctx'>  * @cb_mask: Bit-vector of events that should wake waiting tasks.</div><div class='ctx'>  * @inttrig: Software trigger function for command, or NULL.</div><div class='ctx'>  *</div><div class='hunk'>@@ -344,7 +342,6 @@ struct comedi_buf_map {</div><div class='ctx'>  * less than or equal to UINT_MAX).</div><div class='ctx'>  */</div><div class='ctx'> struct comedi_async {</div><div class='del'>-	void *prealloc_buf;</div><div class='ctx'> 	unsigned int prealloc_bufsz;</div><div class='ctx'> 	struct comedi_buf_map *buf_map;</div><div class='ctx'> 	unsigned int max_bufsize;</div><div class='hunk'>@@ -363,6 +360,8 @@ struct comedi_async {</div><div class='ctx'> 	unsigned int events;</div><div class='ctx'> 	struct comedi_cmd cmd;</div><div class='ctx'> 	wait_queue_head_t wait_head;</div><div class='add'>+	struct completion run_complete;</div><div class='add'>+	refcount_t run_active;</div><div class='ctx'> 	unsigned int cb_mask;</div><div class='ctx'> 	int (*inttrig)(struct comedi_device *dev, struct comedi_subdevice *s,</div><div class='ctx'> 		       unsigned int x);</div><div class='hunk'>@@ -590,6 +589,8 @@ struct comedi_device *comedi_dev_get_from_minor(unsigned int minor);</div><div class='ctx'> int comedi_dev_put(struct comedi_device *dev);</div><div class='ctx'> </div><div class='ctx'> bool comedi_is_subdevice_running(struct comedi_subdevice *s);</div><div class='add'>+bool comedi_get_is_subdevice_running(struct comedi_subdevice *s);</div><div class='add'>+void comedi_put_is_subdevice_running(struct comedi_subdevice *s);</div><div class='ctx'> </div><div class='ctx'> void *comedi_alloc_spriv(struct comedi_subdevice *s, size_t size);</div><div class='ctx'> void comedi_set_spriv_auto_free(struct comedi_subdevice *s);</div><div class='head'>diff --git a/include/linux/comedi/comedilib.h b/include/linux/comedi/comedilib.h<br/>index 0223c9cd9215..1f2b22b383cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/comedi/comedilib.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/comedi/comedilib.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/comedi/comedilib.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/comedi/comedilib.h</a></div><div class='hunk'>@@ -10,8 +10,38 @@</div><div class='ctx'> #ifndef _LINUX_COMEDILIB_H</div><div class='ctx'> #define _LINUX_COMEDILIB_H</div><div class='ctx'> </div><div class='del'>-struct comedi_device *comedi_open(const char *path);</div><div class='del'>-int comedi_close(struct comedi_device *dev);</div><div class='add'>+struct comedi_device *comedi_open_from(const char *path, int from);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * comedi_open() - Open a COMEDI device from the kernel</div><div class='add'>+ * @filename: Fake pathname of the form "/dev/comediN".</div><div class='add'>+ *</div><div class='add'>+ * Converts @filename to a COMEDI device number and "opens" it if it exists</div><div class='add'>+ * and is attached to a low-level COMEDI driver.</div><div class='add'>+ *</div><div class='add'>+ * Return: A pointer to the COMEDI device on success.</div><div class='add'>+ * Return %NULL on failure.</div><div class='add'>+ */</div><div class='add'>+static inline struct comedi_device *comedi_open(const char *path)</div><div class='add'>+{</div><div class='add'>+	return comedi_open_from(path, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int comedi_close_from(struct comedi_device *dev, int from);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * comedi_close() - Close a COMEDI device from the kernel</div><div class='add'>+ * @dev: COMEDI device.</div><div class='add'>+ *</div><div class='add'>+ * Closes a COMEDI device previously opened by comedi_open().</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0</div><div class='add'>+ */</div><div class='add'>+static inline int comedi_close(struct comedi_device *dev)</div><div class='add'>+{</div><div class='add'>+	return comedi_close_from(dev, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int comedi_dio_get_config(struct comedi_device *dev, unsigned int subdev,</div><div class='ctx'> 			  unsigned int chan, unsigned int *io);</div><div class='ctx'> int comedi_dio_config(struct comedi_device *dev, unsigned int subdev,</div><div class='head'>diff --git a/include/linux/compaction.h b/include/linux/compaction.h<br/>index e94776496049..173d9c07a895 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/compaction.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compaction.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/compaction.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/compaction.h</a></div><div class='hunk'>@@ -80,6 +80,11 @@ static inline unsigned long compact_gap(unsigned int order)</div><div class='ctx'> 	return 2UL &lt;&lt; order;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int current_is_kcompactd(void)</div><div class='add'>+{</div><div class='add'>+	return current-&gt;flags &amp; PF_KCOMPACTD;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_COMPACTION</div><div class='ctx'> </div><div class='ctx'> extern unsigned int extfrag_for_order(struct zone *zone, unsigned int order);</div><div class='hunk'>@@ -90,7 +95,7 @@ extern enum compact_result try_to_compact_pages(gfp_t gfp_mask,</div><div class='ctx'> 		struct page **page);</div><div class='ctx'> extern void reset_isolation_suitable(pg_data_t *pgdat);</div><div class='ctx'> extern bool compaction_suitable(struct zone *zone, int order,</div><div class='del'>-					       int highest_zoneidx);</div><div class='add'>+				unsigned long watermark, int highest_zoneidx);</div><div class='ctx'> </div><div class='ctx'> extern void compaction_defer_reset(struct zone *zone, int order,</div><div class='ctx'> 				bool alloc_success);</div><div class='hunk'>@@ -108,7 +113,8 @@ static inline void reset_isolation_suitable(pg_data_t *pgdat)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool compaction_suitable(struct zone *zone, int order,</div><div class='del'>-						      int highest_zoneidx)</div><div class='add'>+				       unsigned long watermark,</div><div class='add'>+				       int highest_zoneidx)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/compat.h b/include/linux/compat.h<br/>index 233f61ec8afc..56cebaff0c91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/compat.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compat.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/compat.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/compat.h</a></div><div class='hunk'>@@ -608,7 +608,7 @@ asmlinkage long compat_sys_fstatfs(unsigned int fd,</div><div class='ctx'> asmlinkage long compat_sys_fstatfs64(unsigned int fd, compat_size_t sz,</div><div class='ctx'> 				     struct compat_statfs64 __user *buf);</div><div class='ctx'> asmlinkage long compat_sys_truncate(const char __user *, compat_off_t);</div><div class='del'>-asmlinkage long compat_sys_ftruncate(unsigned int, compat_ulong_t);</div><div class='add'>+asmlinkage long compat_sys_ftruncate(unsigned int, compat_off_t);</div><div class='ctx'> /* No generic prototype for truncate64, ftruncate64, fallocate */</div><div class='ctx'> asmlinkage long compat_sys_openat(int dfd, const char __user *filename,</div><div class='ctx'> 				  int flags, umode_t mode);</div><div class='head'>diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h<br/>index ddab1ef22bee..107ce05bd16e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/compiler-clang.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler-clang.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/compiler-clang.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/compiler-clang.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __LINUX_COMPILER_TYPES_H</div><div class='del'>-#error "Please don't include &lt;linux/compiler-clang.h&gt; directly, include &lt;linux/compiler.h&gt; instead."</div><div class='add'>+#error "Please do not include &lt;linux/compiler-clang.h&gt; directly, include &lt;linux/compiler.h&gt; instead."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Compiler specific definitions for Clang compiler */</div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * Clang prior to 17 is being silly and considers many __cleanup() variables</div><div class='ctx'>  * as unused (because they are, their sole purpose is to go out of scope).</div><div class='ctx'>  *</div><div class='del'>- * https://reviews.llvm.org/D152180</div><div class='add'>+ * https://github.com/llvm/llvm-project/commit/877210faa447f4cc7db87812f8ed80e398fedd61</div><div class='ctx'>  */</div><div class='ctx'> #undef __cleanup</div><div class='ctx'> #define __cleanup(func) __maybe_unused __attribute__((__cleanup__(func)))</div><div class='hunk'>@@ -18,23 +18,42 @@</div><div class='ctx'> #define KASAN_ABI_VERSION 5</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Clang 22 added preprocessor macros to match GCC, in hopes of eventually</div><div class='add'>+ * dropping __has_feature support for sanitizers:</div><div class='add'>+ * https://github.com/llvm/llvm-project/commit/568c23bbd3303518c5056d7f03444dae4fdc8a9c</div><div class='add'>+ * Create these macros for older versions of clang so that it is easy to clean</div><div class='add'>+ * up once the minimum supported version of LLVM for building the kernel always</div><div class='add'>+ * creates these macros.</div><div class='add'>+ *</div><div class='ctx'>  * Note: Checking __has_feature(*_sanitizer) is only true if the feature is</div><div class='ctx'>  * enabled. Therefore it is not required to additionally check defined(CONFIG_*)</div><div class='ctx'>  * to avoid adding redundant attributes in other configurations.</div><div class='ctx'>  */</div><div class='add'>+#if __has_feature(address_sanitizer) &amp;&amp; !defined(__SANITIZE_ADDRESS__)</div><div class='add'>+#define __SANITIZE_ADDRESS__</div><div class='add'>+#endif</div><div class='add'>+#if __has_feature(hwaddress_sanitizer) &amp;&amp; !defined(__SANITIZE_HWADDRESS__)</div><div class='add'>+#define __SANITIZE_HWADDRESS__</div><div class='add'>+#endif</div><div class='add'>+#if __has_feature(thread_sanitizer) &amp;&amp; !defined(__SANITIZE_THREAD__)</div><div class='add'>+#define __SANITIZE_THREAD__</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#if __has_feature(address_sanitizer) || __has_feature(hwaddress_sanitizer)</div><div class='del'>-/* Emulate GCC's __SANITIZE_ADDRESS__ flag */</div><div class='add'>+/*</div><div class='add'>+ * Treat __SANITIZE_HWADDRESS__ the same as __SANITIZE_ADDRESS__ in the kernel.</div><div class='add'>+ */</div><div class='add'>+#ifdef __SANITIZE_HWADDRESS__</div><div class='ctx'> #define __SANITIZE_ADDRESS__</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef __SANITIZE_ADDRESS__</div><div class='ctx'> #define __no_sanitize_address \</div><div class='ctx'> 		__attribute__((no_sanitize("address", "hwaddress")))</div><div class='ctx'> #else</div><div class='ctx'> #define __no_sanitize_address</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if __has_feature(thread_sanitizer)</div><div class='del'>-/* emulate gcc's __SANITIZE_THREAD__ flag */</div><div class='del'>-#define __SANITIZE_THREAD__</div><div class='add'>+#ifdef __SANITIZE_THREAD__</div><div class='ctx'> #define __no_sanitize_thread \</div><div class='ctx'> 		__attribute__((no_sanitize("thread")))</div><div class='ctx'> #else</div><div class='hunk'>@@ -89,15 +108,13 @@</div><div class='ctx'> #define __no_sanitize_coverage</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Only Clang needs to disable the coverage sanitizer for kstack_erase. */</div><div class='add'>+#define __no_kstack_erase	__no_sanitize_coverage</div><div class='add'>+</div><div class='ctx'> #if __has_feature(shadow_call_stack)</div><div class='ctx'> # define __noscs	__attribute__((__no_sanitize__("shadow-call-stack")))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if __has_feature(kcfi)</div><div class='del'>-/* Disable CFI checking inside a function. */</div><div class='del'>-#define __nocfi		__attribute__((__no_sanitize__("kcfi")))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Turn individual warnings and errors on and off locally, depending</div><div class='ctx'>  * on version.</div><div class='hunk'>@@ -114,11 +131,25 @@</div><div class='ctx'> #define __diag_str(s)		__diag_str1(s)</div><div class='ctx'> #define __diag(s)		_Pragma(__diag_str(clang diagnostic s))</div><div class='ctx'> </div><div class='del'>-#if CONFIG_CLANG_VERSION &gt;= 110000</div><div class='del'>-#define __diag_clang_11(s)	__diag(s)</div><div class='del'>-#else</div><div class='del'>-#define __diag_clang_11(s)</div><div class='del'>-#endif</div><div class='add'>+#define __diag_clang_13(s)	__diag(s)</div><div class='ctx'> </div><div class='ctx'> #define __diag_ignore_all(option, comment) \</div><div class='del'>-	__diag_clang(11, ignore, option)</div><div class='add'>+	__diag_clang(13, ignore, option)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * clang has horrible behavior with "g" or "rm" constraints for asm</div><div class='add'>+ * inputs, turning them into something worse than "m". Avoid using</div><div class='add'>+ * constraints with multiple possible uses (but "ir" seems to be ok):</div><div class='add'>+ *</div><div class='add'>+ *	https://github.com/llvm/llvm-project/issues/20571</div><div class='add'>+ */</div><div class='add'>+#define ASM_INPUT_G "ir"</div><div class='add'>+#define ASM_INPUT_RM "r"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Declare compiler support for __typeof_unqual__() operator.</div><div class='add'>+ *</div><div class='add'>+ * Bindgen uses LLVM even if our C compiler is GCC, so we cannot</div><div class='add'>+ * rely on the auto-detected CONFIG_CC_HAS_TYPEOF_UNQUAL.</div><div class='add'>+ */</div><div class='add'>+#define CC_HAS_TYPEOF_UNQUAL (__clang_major__ &gt;= 19)</div><div class='head'>diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h<br/>index aff92b1d284f..5de824a0b3d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/compiler-gcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler-gcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/compiler-gcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/compiler-gcc.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __LINUX_COMPILER_TYPES_H</div><div class='del'>-#error "Please don't include &lt;linux/compiler-gcc.h&gt; directly, include &lt;linux/compiler.h&gt; instead."</div><div class='add'>+#error "Please do not include &lt;linux/compiler-gcc.h&gt; directly, include &lt;linux/compiler.h&gt; instead."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -35,10 +35,6 @@</div><div class='ctx'> 	(typeof(ptr)) (__ptr + (off));					\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MITIGATION_RETPOLINE</div><div class='del'>-#define __noretpoline __attribute__((__indirect_branch__("keep")))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(LATENT_ENTROPY_PLUGIN) &amp;&amp; !defined(__CHECKER__)</div><div class='ctx'> #define __latent_entropy __attribute__((latent_entropy))</div><div class='ctx'> #endif</div><div class='hunk'>@@ -52,38 +48,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #define barrier_before_unreachable() asm volatile("")</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Mark a position in code as unreachable.  This can be used to</div><div class='del'>- * suppress control flow warnings after asm blocks that transfer</div><div class='del'>- * control elsewhere.</div><div class='del'>- */</div><div class='del'>-#define unreachable() \</div><div class='del'>-	do {					\</div><div class='del'>-		annotate_unreachable();		\</div><div class='del'>-		barrier_before_unreachable();	\</div><div class='del'>-		__builtin_unreachable();	\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * GCC 'asm goto' with outputs miscompiles certain code sequences:</div><div class='del'>- *</div><div class='del'>- *   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113921</div><div class='del'>- *</div><div class='del'>- * Work around it via the same compiler barrier quirk that we used</div><div class='del'>- * to use for the old 'asm goto' workaround.</div><div class='del'>- *</div><div class='del'>- * Also, always mark such 'asm goto' statements as volatile: all</div><div class='del'>- * asm goto statements are supposed to be volatile as per the</div><div class='del'>- * documentation, but some versions of gcc didn't actually do</div><div class='del'>- * that for asms with outputs:</div><div class='del'>- *</div><div class='del'>- *    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98619</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND</div><div class='del'>-#define asm_goto_output(x...) \</div><div class='del'>-	do { asm volatile goto(x); asm (""); } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_ARCH_USE_BUILTIN_BSWAP)</div><div class='ctx'> #define __HAVE_BUILTIN_BSWAP32__</div><div class='ctx'> #define __HAVE_BUILTIN_BSWAP64__</div><div class='hunk'>@@ -100,7 +64,11 @@</div><div class='ctx'> #define __noscs __attribute__((__no_sanitize__("shadow-call-stack")))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef __SANITIZE_HWADDRESS__</div><div class='add'>+#define __no_sanitize_address __attribute__((__no_sanitize__("hwaddress")))</div><div class='add'>+#else</div><div class='ctx'> #define __no_sanitize_address __attribute__((__no_sanitize_address__))</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if defined(__SANITIZE_THREAD__)</div><div class='ctx'> #define __no_sanitize_thread __attribute__((__no_sanitize_thread__))</div><div class='hunk'>@@ -155,6 +123,8 @@</div><div class='ctx'> #define __diag_GCC_8(s)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define __diag_GCC_all(s)	__diag(s)</div><div class='add'>+</div><div class='ctx'> #define __diag_ignore_all(option, comment) \</div><div class='ctx'> 	__diag(__diag_GCC_ignore option)</div><div class='ctx'> </div><div class='hunk'>@@ -165,3 +135,11 @@</div><div class='ctx'> #if GCC_VERSION &lt; 90100</div><div class='ctx'> #undef __alloc_size__</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Declare compiler support for __typeof_unqual__() operator.</div><div class='add'>+ *</div><div class='add'>+ * Bindgen uses LLVM even if our C compiler is GCC, so we cannot</div><div class='add'>+ * rely on the auto-detected CONFIG_CC_HAS_TYPEOF_UNQUAL.</div><div class='add'>+ */</div><div class='add'>+#define CC_HAS_TYPEOF_UNQUAL (__GNUC__ &gt;= 14)</div><div class='head'>diff --git a/include/linux/compiler-version.h b/include/linux/compiler-version.h<br/>index 573fa85b6c0c..ac1665a98a15 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/compiler-version.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler-version.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/compiler-version.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/compiler-version.h</a></div><div class='hunk'>@@ -12,3 +12,33 @@</div><div class='ctx'>  * and add dependency on include/config/CC_VERSION_TEXT, which is touched</div><div class='ctx'>  * by Kconfig when the version string from the compiler changes.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+/* Additional tree-wide dependencies start here. */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If any of the GCC plugins change, we need to rebuild everything that</div><div class='add'>+ * was built with them, as they may have changed their behavior and those</div><div class='add'>+ * behaviors may need to be synchronized across all translation units.</div><div class='add'>+ */</div><div class='add'>+#ifdef GCC_PLUGINS</div><div class='add'>+#include &lt;generated/gcc-plugins.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If the randstruct seed itself changes (whether for GCC plugins or</div><div class='add'>+ * Clang), the entire tree needs to be rebuilt since the randomization of</div><div class='add'>+ * structures may change between compilation units if not.</div><div class='add'>+ */</div><div class='add'>+#ifdef RANDSTRUCT</div><div class='add'>+#include &lt;generated/randstruct_hash.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If any external changes affect Clang's integer wrapping sanitizer</div><div class='add'>+ * behavior, a full rebuild is needed as the coverage for wrapping types</div><div class='add'>+ * may have changed, which may impact the expected behaviors that should</div><div class='add'>+ * not differ between compilation units.</div><div class='add'>+ */</div><div class='add'>+#ifdef INTEGER_WRAP</div><div class='add'>+#include &lt;generated/integer-wrap.h&gt;</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/compiler.h b/include/linux/compiler.h<br/>index 52730e423681..04487c9bd751 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/compiler.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/compiler.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/compiler.h</a></div><div class='hunk'>@@ -109,35 +109,21 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,</div><div class='ctx'> </div><div class='ctx'> /* Unreachable code */</div><div class='ctx'> #ifdef CONFIG_OBJTOOL</div><div class='del'>-/*</div><div class='del'>- * These macros help objtool understand GCC code flow for unreachable code.</div><div class='del'>- * The __COUNTER__ based labels are a hack to make each instance of the macros</div><div class='del'>- * unique, to convince GCC not to merge duplicate inline asm statements.</div><div class='del'>- */</div><div class='del'>-#define __stringify_label(n) #n</div><div class='del'>-</div><div class='del'>-#define __annotate_unreachable(c) ({					\</div><div class='del'>-	asm volatile(__stringify_label(c) ":\n\t"			\</div><div class='del'>-		     ".pushsection .discard.unreachable\n\t"		\</div><div class='del'>-		     ".long " __stringify_label(c) "b - .\n\t"		\</div><div class='del'>-		     ".popsection\n\t" : : "i" (c));			\</div><div class='del'>-})</div><div class='del'>-#define annotate_unreachable() __annotate_unreachable(__COUNTER__)</div><div class='del'>-</div><div class='ctx'> /* Annotate a C jump table to allow objtool to follow the code flow */</div><div class='del'>-#define __annotate_jump_table __section(".rodata..c_jump_table")</div><div class='del'>-</div><div class='add'>+#define __annotate_jump_table __section(".data.rel.ro.c_jump_table")</div><div class='ctx'> #else /* !CONFIG_OBJTOOL */</div><div class='del'>-#define annotate_unreachable()</div><div class='ctx'> #define __annotate_jump_table</div><div class='ctx'> #endif /* CONFIG_OBJTOOL */</div><div class='ctx'> </div><div class='del'>-#ifndef unreachable</div><div class='del'>-# define unreachable() do {		\</div><div class='del'>-	annotate_unreachable();		\</div><div class='add'>+/*</div><div class='add'>+ * Mark a position in code as unreachable.  This can be used to</div><div class='add'>+ * suppress control flow warnings after asm blocks that transfer</div><div class='add'>+ * control elsewhere.</div><div class='add'>+ */</div><div class='add'>+#define unreachable() do {		\</div><div class='add'>+	barrier_before_unreachable();	\</div><div class='ctx'> 	__builtin_unreachable();	\</div><div class='ctx'> } while (0)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * KENTRY - kernel entry point</div><div class='hunk'>@@ -177,7 +163,11 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,</div><div class='ctx'> 	__asm__ ("" : "=r" (var) : "0" (var))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)</div><div class='add'>+/* Format: __UNIQUE_ID_&lt;name&gt;_&lt;__COUNTER__&gt; */</div><div class='add'>+#define __UNIQUE_ID(name)					\</div><div class='add'>+	__PASTE(__UNIQUE_ID_,					\</div><div class='add'>+	__PASTE(name,						\</div><div class='add'>+	__PASTE(_, __COUNTER__)))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * data_race - mark an expression as containing intentional data races</div><div class='hunk'>@@ -185,33 +175,92 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,</div><div class='ctx'>  * This data_race() macro is useful for situations in which data races</div><div class='ctx'>  * should be forgiven.  One example is diagnostic code that accesses</div><div class='ctx'>  * shared variables but is not a part of the core synchronization design.</div><div class='add'>+ * For example, if accesses to a given variable are protected by a lock,</div><div class='add'>+ * except for diagnostic code, then the accesses under the lock should</div><div class='add'>+ * be plain C-language accesses and those in the diagnostic code should</div><div class='add'>+ * use data_race().  This way, KCSAN will complain if buggy lockless</div><div class='add'>+ * accesses to that variable are introduced, even if the buggy accesses</div><div class='add'>+ * are protected by READ_ONCE() or WRITE_ONCE().</div><div class='ctx'>  *</div><div class='ctx'>  * This macro *does not* affect normal code generation, but is a hint</div><div class='del'>- * to tooling that data races here are to be ignored.</div><div class='add'>+ * to tooling that data races here are to be ignored.  If the access must</div><div class='add'>+ * be atomic *and* KCSAN should ignore the access, use both data_race()</div><div class='add'>+ * and READ_ONCE(), for example, data_race(READ_ONCE(x)).</div><div class='ctx'>  */</div><div class='ctx'> #define data_race(expr)							\</div><div class='ctx'> ({									\</div><div class='del'>-	__unqual_scalar_typeof(({ expr; })) __v = ({			\</div><div class='del'>-		__kcsan_disable_current();				\</div><div class='del'>-		expr;							\</div><div class='del'>-	});								\</div><div class='add'>+	__kcsan_disable_current();					\</div><div class='add'>+	auto __v = (expr);						\</div><div class='ctx'> 	__kcsan_enable_current();					\</div><div class='ctx'> 	__v;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+#ifdef __CHECKER__</div><div class='add'>+#define __BUILD_BUG_ON_ZERO_MSG(e, msg, ...) (0)</div><div class='add'>+#else /* __CHECKER__ */</div><div class='add'>+#define __BUILD_BUG_ON_ZERO_MSG(e, msg, ...) ((int)sizeof(struct {_Static_assert(!(e), msg);}))</div><div class='add'>+#endif /* __CHECKER__ */</div><div class='add'>+</div><div class='add'>+/* &amp;a[0] degrades to a pointer: a different type from an array */</div><div class='add'>+#define __is_array(a)		(!__same_type((a), &amp;(a)[0]))</div><div class='add'>+#define __must_be_array(a)	__BUILD_BUG_ON_ZERO_MSG(!__is_array(a), \</div><div class='add'>+							"must be array")</div><div class='add'>+</div><div class='add'>+#define __is_byte_array(a)	(__is_array(a) &amp;&amp; sizeof((a)[0]) == 1)</div><div class='add'>+#define __must_be_byte_array(a)	__BUILD_BUG_ON_ZERO_MSG(!__is_byte_array(a), \</div><div class='add'>+							"must be byte array")</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If the "nonstring" attribute isn't available, we have to return true</div><div class='add'>+ * so the __must_*() checks pass when "nonstring" isn't supported.</div><div class='add'>+ */</div><div class='add'>+#if __has_attribute(__nonstring__) &amp;&amp; defined(__annotated)</div><div class='add'>+#define __is_cstr(a)		(!__annotated(a, nonstring))</div><div class='add'>+#define __is_noncstr(a)		(__annotated(a, nonstring))</div><div class='add'>+#else</div><div class='add'>+#define __is_cstr(a)		(true)</div><div class='add'>+#define __is_noncstr(a)		(true)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Require C Strings (i.e. NUL-terminated) lack the "nonstring" attribute. */</div><div class='add'>+#define __must_be_cstr(p) \</div><div class='add'>+	__BUILD_BUG_ON_ZERO_MSG(!__is_cstr(p), \</div><div class='add'>+				"must be C-string (NUL-terminated)")</div><div class='add'>+#define __must_be_noncstr(p) \</div><div class='add'>+	__BUILD_BUG_ON_ZERO_MSG(!__is_noncstr(p), \</div><div class='add'>+				"must be non-C-string (not NUL-terminated)")</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use __typeof_unqual__() when available.</div><div class='add'>+ *</div><div class='add'>+ * XXX: Remove test for __CHECKER__ once</div><div class='add'>+ * sparse learns about __typeof_unqual__().</div><div class='add'>+ */</div><div class='add'>+#if CC_HAS_TYPEOF_UNQUAL &amp;&amp; !defined(__CHECKER__)</div><div class='add'>+# define USE_TYPEOF_UNQUAL 1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define TYPEOF_UNQUAL() to use __typeof_unqual__() as typeof</div><div class='add'>+ * operator when available, to return an unqualified type of the exp.</div><div class='add'>+ */</div><div class='add'>+#if defined(USE_TYPEOF_UNQUAL)</div><div class='add'>+# define TYPEOF_UNQUAL(exp) __typeof_unqual__(exp)</div><div class='add'>+#else</div><div class='add'>+# define TYPEOF_UNQUAL(exp) __typeof__(exp)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_CFI) &amp;&amp; !defined(__DISABLE_EXPORTS) &amp;&amp; !defined(BUILD_VDSO)</div><div class='ctx'> /*</div><div class='del'>- * Force the compiler to emit 'sym' as a symbol, so that we can reference</div><div class='del'>- * it from inline assembler. Necessary in case 'sym' could be inlined</div><div class='del'>- * otherwise, or eliminated entirely due to lack of references that are</div><div class='del'>- * visible to the compiler.</div><div class='add'>+ * Force a reference to the external symbol so the compiler generates</div><div class='add'>+ * __kcfi_typid.</div><div class='ctx'>  */</div><div class='del'>-#define ___ADDRESSABLE(sym, __attrs) \</div><div class='del'>-	static void * __used __attrs \</div><div class='del'>-	__UNIQUE_ID(__PASTE(__addressable_,sym)) = (void *)(uintptr_t)&amp;sym;</div><div class='del'>-#define __ADDRESSABLE(sym) \</div><div class='del'>-	___ADDRESSABLE(sym, __section(".discard.addressable"))</div><div class='add'>+#define KCFI_REFERENCE(sym) __ADDRESSABLE(sym)</div><div class='add'>+#else</div><div class='add'>+#define KCFI_REFERENCE(sym)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * offset_to_ptr - convert a relative memory offset to an absolute pointer</div><div class='hunk'>@@ -224,8 +273,18 @@ static inline void *offset_to_ptr(const int *off)</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='del'>-/* &amp;a[0] degrades to a pointer: a different type from an array */</div><div class='del'>-#define __must_be_array(a)	BUILD_BUG_ON_ZERO(__same_type((a), &amp;(a)[0]))</div><div class='add'>+/*</div><div class='add'>+ * Force the compiler to emit 'sym' as a symbol, so that we can reference</div><div class='add'>+ * it from inline assembler. Necessary in case 'sym' could be inlined</div><div class='add'>+ * otherwise, or eliminated entirely due to lack of references that are</div><div class='add'>+ * visible to the compiler.</div><div class='add'>+ */</div><div class='add'>+#define ___ADDRESSABLE(sym, __attrs)						\</div><div class='add'>+	static void * __used __attrs						\</div><div class='add'>+	__UNIQUE_ID(__PASTE(addressable_, sym)) = (void *)(uintptr_t)&amp;sym;</div><div class='add'>+</div><div class='add'>+#define __ADDRESSABLE(sym) \</div><div class='add'>+	___ADDRESSABLE(sym, __section(".discard.addressable"))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This returns a constant expression while determining if an argument is</div><div class='hunk'>@@ -259,7 +318,7 @@ static inline void *offset_to_ptr(const int *off)</div><div class='ctx'>  *   - When one operand is a null pointer constant (i.e. when x is an integer</div><div class='ctx'>  *     constant expression) and the other is an object pointer (i.e. our</div><div class='ctx'>  *     third operand), the conditional operator returns the type of the</div><div class='del'>- *     object pointer operand (i.e. "int *). Here, within the sizeof(), we</div><div class='add'>+ *     object pointer operand (i.e. "int *"). Here, within the sizeof(), we</div><div class='ctx'>  *     would then get:</div><div class='ctx'>  *       sizeof(*((int *)(...))  == sizeof(int)  == 4</div><div class='ctx'>  *   - When one operand is a void pointer (i.e. when x is not an integer</div><div class='hunk'>@@ -282,6 +341,37 @@ static inline void *offset_to_ptr(const int *off)</div><div class='ctx'> #define is_unsigned_type(type) (!is_signed_type(type))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Useful shorthand for "is this condition known at compile-time?"</div><div class='add'>+ *</div><div class='add'>+ * Note that the condition may involve non-constant values,</div><div class='add'>+ * but the compiler may know enough about the details of the</div><div class='add'>+ * values to determine that the condition is statically true.</div><div class='add'>+ */</div><div class='add'>+#define statically_true(x) (__builtin_constant_p(x) &amp;&amp; (x))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Similar to statically_true() but produces a constant expression</div><div class='add'>+ *</div><div class='add'>+ * To be used in conjunction with macros, such as BUILD_BUG_ON_ZERO(),</div><div class='add'>+ * which require their input to be a constant expression and for which</div><div class='add'>+ * statically_true() would otherwise fail.</div><div class='add'>+ *</div><div class='add'>+ * This is a trade-off: const_true() requires all its operands to be</div><div class='add'>+ * compile time constants. Else, it would always returns false even on</div><div class='add'>+ * the most trivial cases like:</div><div class='add'>+ *</div><div class='add'>+ *   true || non_const_var</div><div class='add'>+ *</div><div class='add'>+ * On the opposite, statically_true() is able to fold more complex</div><div class='add'>+ * tautologies and will return true on expressions such as:</div><div class='add'>+ *</div><div class='add'>+ *   !(non_const_var * 8 % 4)</div><div class='add'>+ *</div><div class='add'>+ * For the general case, statically_true() is better.</div><div class='add'>+ */</div><div class='add'>+#define const_true(x) __builtin_choose_expr(__is_constexpr(x), x, false)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This is needed in functions which generate the stack canary, see</div><div class='ctx'>  * arch/x86/kernel/smpboot.c::start_secondary() for an example.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h<br/>index 8bdf6e0918c1..c16d4199bf92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/compiler_attributes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler_attributes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/compiler_attributes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/compiler_attributes.h</a></div><div class='hunk'>@@ -95,19 +95,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Optional: only supported since gcc &gt;= 15</div><div class='del'>- * Optional: only supported since clang &gt;= 18</div><div class='del'>- *</div><div class='del'>- *   gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896</div><div class='del'>- * clang: https://github.com/llvm/llvm-project/pull/76348</div><div class='del'>- */</div><div class='del'>-#if __has_attribute(__counted_by__)</div><div class='del'>-# define __counted_by(member)		__attribute__((__counted_by__(member)))</div><div class='del'>-#else</div><div class='del'>-# define __counted_by(member)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Optional: not supported by gcc</div><div class='ctx'>  * Optional: only supported since clang &gt;= 14.0</div><div class='ctx'>  *</div><div class='hunk'>@@ -362,6 +349,19 @@</div><div class='ctx'> #define __used                          __attribute__((__used__))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * The __used attribute guarantees that the attributed variable will be</div><div class='add'>+ * always emitted by a compiler. It doesn't prevent the compiler from</div><div class='add'>+ * throwing 'unused' warnings when it can't detect how the variable is</div><div class='add'>+ * actually used. It's a compiler implementation details either emit</div><div class='add'>+ * the warning in that case or not.</div><div class='add'>+ *</div><div class='add'>+ * The combination of both 'used' and 'unused' attributes ensures that</div><div class='add'>+ * the variable would be emitted, and will not trigger 'unused' warnings.</div><div class='add'>+ * The attribute is applicable for functions, static and global variables.</div><div class='add'>+ */</div><div class='add'>+#define __always_used			__used __maybe_unused</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-warn_005funused_005fresult-function-attribute</div><div class='ctx'>  * clang: https://clang.llvm.org/docs/AttributeReference.html#nodiscard-warn-unused-result</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h<br/>index 3e64ec0f7ac8..1280693766b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/compiler_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/compiler_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/compiler_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/compiler_types.h</a></div><div class='hunk'>@@ -11,9 +11,26 @@</div><div class='ctx'> #define __has_builtin(x) (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Indirect macros required for expanded argument pasting, eg. __LINE__. */</div><div class='add'>+#define ___PASTE(a, b) a##b</div><div class='add'>+#define __PASTE(a, b) ___PASTE(a, b)</div><div class='add'>+</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * C23 introduces "auto" as a standard way to define type-inferred</div><div class='add'>+ * variables, but "auto" has been a (useless) keyword even since K&amp;R C,</div><div class='add'>+ * so it has always been "namespace reserved."</div><div class='add'>+ *</div><div class='add'>+ * Until at some future time we require C23 support, we need the gcc</div><div class='add'>+ * extension __auto_type, but there is no reason to put that elsewhere</div><div class='add'>+ * in the source code.</div><div class='add'>+ */</div><div class='add'>+#if __STDC_VERSION__ &lt; 202311L</div><div class='add'>+# define auto __auto_type</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Skipped when running bindgen due to a libclang issue;</div><div class='ctx'>  * see https://github.com/rust-lang/rust-bindgen/issues/2244.</div><div class='ctx'>  */</div><div class='hunk'>@@ -57,7 +74,7 @@ static inline void __chk_io_ptr(const volatile void __iomem *ptr) { }</div><div class='ctx'> #  define __user	BTF_TYPE_TAG(user)</div><div class='ctx'> # endif</div><div class='ctx'> # define __iomem</div><div class='del'>-# define __percpu	BTF_TYPE_TAG(percpu)</div><div class='add'>+# define __percpu	__percpu_qual BTF_TYPE_TAG(percpu)</div><div class='ctx'> # define __rcu		BTF_TYPE_TAG(rcu)</div><div class='ctx'> </div><div class='ctx'> # define __chk_user_ptr(x)	(void)0</div><div class='hunk'>@@ -79,10 +96,6 @@ static inline void __chk_io_ptr(const volatile void __iomem *ptr) { }</div><div class='ctx'> # define __builtin_warning(x, y...) (1)</div><div class='ctx'> #endif /* __CHECKER__ */</div><div class='ctx'> </div><div class='del'>-/* Indirect macros required for expanded argument pasting, eg. __LINE__. */</div><div class='del'>-#define ___PASTE(a,b) a##b</div><div class='del'>-#define __PASTE(a,b) ___PASTE(a,b)</div><div class='del'>-</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> /* Attributes */</div><div class='hunk'>@@ -99,17 +112,17 @@ static inline void __chk_io_ptr(const volatile void __iomem *ptr) { }</div><div class='ctx'>  *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Label-Attributes.html#index-cold-label-attribute</div><div class='ctx'>  *</div><div class='ctx'>  * When -falign-functions=N is in use, we must avoid the cold attribute as</div><div class='del'>- * contemporary versions of GCC drop the alignment for cold functions. Worse,</div><div class='del'>- * GCC can implicitly mark callees of cold functions as cold themselves, so</div><div class='del'>- * it's not sufficient to add __function_aligned here as that will not ensure</div><div class='del'>- * that callees are correctly aligned.</div><div class='add'>+ * GCC drops the alignment for cold functions. Worse, GCC can implicitly mark</div><div class='add'>+ * callees of cold functions as cold themselves, so it's not sufficient to add</div><div class='add'>+ * __function_aligned here as that will not ensure that callees are correctly</div><div class='add'>+ * aligned.</div><div class='ctx'>  *</div><div class='ctx'>  * See:</div><div class='ctx'>  *</div><div class='ctx'>  *   https://lore.kernel.org/lkml/Y77%2FqVgvaJidFpYt@FVFF77S0Q05N</div><div class='ctx'>  *   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88345#c9</div><div class='ctx'>  */</div><div class='del'>-#if !defined(CONFIG_CC_IS_GCC) || (CONFIG_FUNCTION_ALIGNMENT == 0)</div><div class='add'>+#if defined(CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT) || (CONFIG_FUNCTION_ALIGNMENT == 0)</div><div class='ctx'> #define __cold				__attribute__((__cold__))</div><div class='ctx'> #else</div><div class='ctx'> #define __cold</div><div class='hunk'>@@ -143,6 +156,29 @@ static inline void __chk_io_ptr(const volatile void __iomem *ptr) { }</div><div class='ctx'> # define __preserve_most</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Annotating a function/variable with __retain tells the compiler to place</div><div class='add'>+ * the object in its own section and set the flag SHF_GNU_RETAIN. This flag</div><div class='add'>+ * instructs the linker to retain the object during garbage-cleanup or LTO</div><div class='add'>+ * phases.</div><div class='add'>+ *</div><div class='add'>+ * Note that the __used macro is also used to prevent functions or data</div><div class='add'>+ * being optimized out, but operates at the compiler/IR-level and may still</div><div class='add'>+ * allow unintended removal of objects during linking.</div><div class='add'>+ *</div><div class='add'>+ * Optional: only supported since gcc &gt;= 11, clang &gt;= 13</div><div class='add'>+ *</div><div class='add'>+ *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-retain-function-attribute</div><div class='add'>+ * clang: https://clang.llvm.org/docs/AttributeReference.html#retain</div><div class='add'>+ */</div><div class='add'>+#if __has_attribute(__retain__) &amp;&amp; \</div><div class='add'>+	(defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || \</div><div class='add'>+	 defined(CONFIG_LTO_CLANG))</div><div class='add'>+# define __retain			__attribute__((__retain__))</div><div class='add'>+#else</div><div class='add'>+# define __retain</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Compiler specific macros. */</div><div class='ctx'> #ifdef __clang__</div><div class='ctx'> #include &lt;linux/compiler-clang.h&gt;</div><div class='hunk'>@@ -227,10 +263,9 @@ struct ftrace_likely_data {</div><div class='ctx'> /*</div><div class='ctx'>  * GCC does not warn about unused static inline functions for -Wunused-function.</div><div class='ctx'>  * Suppress the warning in clang as well by using __maybe_unused, but enable it</div><div class='del'>- * for W=1 build. This will allow clang to find unused functions. Remove the</div><div class='del'>- * __inline_maybe_unused entirely after fixing most of -Wunused-function warnings.</div><div class='add'>+ * for W=2 build. This will allow clang to find unused functions.</div><div class='ctx'>  */</div><div class='del'>-#ifdef KBUILD_EXTRA_WARN1</div><div class='add'>+#ifdef KBUILD_EXTRA_WARN2</div><div class='ctx'> #define __inline_maybe_unused</div><div class='ctx'> #else</div><div class='ctx'> #define __inline_maybe_unused __maybe_unused</div><div class='hunk'>@@ -243,6 +278,12 @@ struct ftrace_likely_data {</div><div class='ctx'> #define noinline_for_stack noinline</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Use noinline_for_tracing for functions that should not be inlined.</div><div class='add'>+ * For tracing reasons.</div><div class='add'>+ */</div><div class='add'>+#define noinline_for_tracing noinline</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Sanitizer helper attributes: Because using __always_inline and</div><div class='ctx'>  * __no_sanitize_* conflict, provide helper attributes that will either expand</div><div class='ctx'>  * to __no_sanitize_* in compilation units where instrumentation is enabled</div><div class='hunk'>@@ -273,17 +314,115 @@ struct ftrace_likely_data {</div><div class='ctx'>  * disable all instrumentation. See Kconfig.kcsan where this is mandatory.</div><div class='ctx'>  */</div><div class='ctx'> # define __no_kcsan __no_sanitize_thread __disable_sanitizer_instrumentation</div><div class='add'>+/*</div><div class='add'>+ * Type qualifier to mark variables where all data-racy accesses should be</div><div class='add'>+ * ignored by KCSAN. Note, the implementation simply marks these variables as</div><div class='add'>+ * volatile, since KCSAN will treat such accesses as "marked".</div><div class='add'>+ */</div><div class='add'>+# define __data_racy volatile</div><div class='ctx'> # define __no_sanitize_or_inline __no_kcsan notrace __maybe_unused</div><div class='ctx'> #else</div><div class='ctx'> # define __no_kcsan</div><div class='add'>+# define __data_racy</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef __SANITIZE_MEMORY__</div><div class='add'>+/*</div><div class='add'>+ * Similarly to KASAN and KCSAN, KMSAN loses function attributes of inlined</div><div class='add'>+ * functions, therefore disabling KMSAN checks also requires disabling inlining.</div><div class='add'>+ *</div><div class='add'>+ * __no_sanitize_or_inline effectively prevents KMSAN from reporting errors</div><div class='add'>+ * within the function and marks all its outputs as initialized.</div><div class='add'>+ */</div><div class='add'>+# define __no_sanitize_or_inline __no_kmsan_checks notrace __maybe_unused</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef __no_sanitize_or_inline</div><div class='ctx'> #define __no_sanitize_or_inline __always_inline</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The assume attribute is used to indicate that a certain condition is</div><div class='add'>+ * assumed to be true. If this condition is violated at runtime, the behavior</div><div class='add'>+ * is undefined. Compilers may or may not use this indication to generate</div><div class='add'>+ * optimized code.</div><div class='add'>+ *</div><div class='add'>+ * Note that the clang documentation states that optimizers may react</div><div class='add'>+ * differently to this attribute, and this may even have a negative</div><div class='add'>+ * performance impact. Therefore this attribute should be used with care.</div><div class='add'>+ *</div><div class='add'>+ * Optional: only supported since gcc &gt;= 13</div><div class='add'>+ * Optional: only supported since clang &gt;= 19</div><div class='add'>+ *</div><div class='add'>+ *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Statement-Attributes.html#index-assume-statement-attribute</div><div class='add'>+ * clang: https://clang.llvm.org/docs/AttributeReference.html#id13</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CC_HAS_ASSUME</div><div class='add'>+# define __assume(expr)			__attribute__((__assume__(expr)))</div><div class='add'>+#else</div><div class='add'>+# define __assume(expr)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Optional: only supported since gcc &gt;= 15</div><div class='add'>+ * Optional: only supported since clang &gt;= 18</div><div class='add'>+ *</div><div class='add'>+ *   gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896</div><div class='add'>+ * clang: https://github.com/llvm/llvm-project/pull/76348</div><div class='add'>+ *</div><div class='add'>+ * __bdos on clang &lt; 19.1.2 can erroneously return 0:</div><div class='add'>+ * https://github.com/llvm/llvm-project/pull/110497</div><div class='add'>+ *</div><div class='add'>+ * __bdos on clang &lt; 19.1.3 can be off by 4:</div><div class='add'>+ * https://github.com/llvm/llvm-project/pull/112636</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CC_HAS_COUNTED_BY</div><div class='add'>+# define __counted_by(member)		__attribute__((__counted_by__(member)))</div><div class='add'>+#else</div><div class='add'>+# define __counted_by(member)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Optional: only supported since gcc &gt;= 15</div><div class='add'>+ * Optional: not supported by Clang</div><div class='add'>+ *</div><div class='add'>+ * gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING</div><div class='add'>+# define __nonstring_array		__attribute__((__nonstring__))</div><div class='add'>+#else</div><div class='add'>+# define __nonstring_array</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Apply __counted_by() when the Endianness matches to increase test coverage.</div><div class='add'>+ */</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+#define __counted_by_le(member)	__counted_by(member)</div><div class='add'>+#define __counted_by_be(member)</div><div class='add'>+#else</div><div class='add'>+#define __counted_by_le(member)</div><div class='add'>+#define __counted_by_be(member)	__counted_by(member)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This designates the minimum number of elements a passed array parameter must</div><div class='add'>+ * have. For example:</div><div class='add'>+ *</div><div class='add'>+ *     void some_function(u8 param[at_least 7]);</div><div class='add'>+ *</div><div class='add'>+ * If a caller passes an array with fewer than 7 elements, the compiler will</div><div class='add'>+ * emit a warning.</div><div class='add'>+ */</div><div class='add'>+#ifndef __CHECKER__</div><div class='add'>+#define at_least static</div><div class='add'>+#else</div><div class='add'>+#define at_least</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Do not trap wrapping arithmetic within an annotated function. */</div><div class='del'>-#ifdef CONFIG_UBSAN_SIGNED_WRAP</div><div class='add'>+#ifdef CONFIG_UBSAN_INTEGER_WRAP</div><div class='ctx'> # define __signed_wrap __attribute__((no_sanitize("signed-integer-overflow")))</div><div class='ctx'> #else</div><div class='ctx'> # define __signed_wrap</div><div class='hunk'>@@ -335,14 +474,26 @@ struct ftrace_likely_data {</div><div class='ctx'> # define randomized_struct_fields_end</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef __no_kstack_erase</div><div class='add'>+# define __no_kstack_erase</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef __noscs</div><div class='ctx'> # define __noscs</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef __nocfi</div><div class='add'>+#if defined(CONFIG_CFI)</div><div class='add'>+# define __nocfi		__attribute__((__no_sanitize__("kcfi")))</div><div class='add'>+#else</div><div class='ctx'> # define __nocfi</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ARCH_USES_CFI_GENERIC_LLVM_PASS)</div><div class='add'>+# define __nocfi_generic	__nocfi</div><div class='add'>+#else</div><div class='add'>+# define __nocfi_generic</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Any place that could be marked with the "alloc_size" attribute is also</div><div class='ctx'>  * a place to be marked with the "malloc" attribute, except those that may</div><div class='hunk'>@@ -360,6 +511,11 @@ struct ftrace_likely_data {</div><div class='ctx'> /*</div><div class='ctx'>  * When the size of an allocated object is needed, use the best available</div><div class='ctx'>  * mechanism to find it. (For cases where sizeof() cannot be used.)</div><div class='add'>+ *</div><div class='add'>+ * Optional: only supported since gcc &gt;= 12</div><div class='add'>+ *</div><div class='add'>+ *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html</div><div class='add'>+ * clang: https://clang.llvm.org/docs/LanguageExtensions.html#evaluating-object-size</div><div class='ctx'>  */</div><div class='ctx'> #if __has_builtin(__builtin_dynamic_object_size)</div><div class='ctx'> #define __struct_size(p)	__builtin_dynamic_object_size(p, 0)</div><div class='hunk'>@@ -370,6 +526,16 @@ struct ftrace_likely_data {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Determine if an attribute has been applied to a variable.</div><div class='add'>+ * Using __annotated needs to check for __annotated being available,</div><div class='add'>+ * or negative tests may fail when annotation cannot be checked. For</div><div class='add'>+ * example, see the definition of __is_cstr().</div><div class='add'>+ */</div><div class='add'>+#if __has_builtin(__builtin_has_attribute)</div><div class='add'>+#define __annotated(var, attr)	__builtin_has_attribute(var, attr)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Some versions of gcc do not mark 'asm goto' volatile:</div><div class='ctx'>  *</div><div class='ctx'>  *  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103979</div><div class='hunk'>@@ -380,6 +546,15 @@ struct ftrace_likely_data {</div><div class='ctx'> #define asm_goto_output(x...) asm volatile goto(x)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Clang has trouble with constraints with multiple</div><div class='add'>+ * alternative behaviors (mainly "g" and "rm").</div><div class='add'>+ */</div><div class='add'>+#ifndef ASM_INPUT_G</div><div class='add'>+  #define ASM_INPUT_G "g"</div><div class='add'>+  #define ASM_INPUT_RM "rm"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CC_HAS_ASM_INLINE</div><div class='ctx'> #define asm_inline asm __inline</div><div class='ctx'> #else</div><div class='hunk'>@@ -417,6 +592,12 @@ struct ftrace_likely_data {</div><div class='ctx'> 	 sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))</div><div class='ctx'> </div><div class='ctx'> #ifdef __OPTIMIZE__</div><div class='add'>+/*</div><div class='add'>+ * #ifdef __OPTIMIZE__ is only a good approximation; for instance "make</div><div class='add'>+ * CFLAGS_foo.o=-Og" defines __OPTIMIZE__, does not elide the conditional code</div><div class='add'>+ * and can break compilation with wrong error message(s). Combine with</div><div class='add'>+ * -U__OPTIMIZE__ when needed.</div><div class='add'>+ */</div><div class='ctx'> # define __compiletime_assert(condition, msg, prefix, suffix)		\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		/*							\</div><div class='hunk'>@@ -430,7 +611,7 @@ struct ftrace_likely_data {</div><div class='ctx'> 			prefix ## suffix();				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> #else</div><div class='del'>-# define __compiletime_assert(condition, msg, prefix, suffix) do { } while (0)</div><div class='add'>+# define __compiletime_assert(condition, msg, prefix, suffix) ((void)(condition))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define _compiletime_assert(condition, msg, prefix, suffix) \</div><div class='head'>diff --git a/include/linux/component.h b/include/linux/component.h<br/>index df4aa75c9e7c..9d6c66401280 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/component.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/component.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/component.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/component.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #define COMPONENT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +90,8 @@ int component_compare_dev_name(struct device *dev, void *data);</div><div class='ctx'> </div><div class='ctx'> void component_master_del(struct device *,</div><div class='ctx'> 	const struct component_master_ops *);</div><div class='add'>+bool component_master_is_bound(struct device *parent,</div><div class='add'>+	const struct component_master_ops *ops);</div><div class='ctx'> </div><div class='ctx'> struct component_match;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/configfs.h b/include/linux/configfs.h<br/>index 2606711adb18..ef65c75beeaa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/configfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/configfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/configfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/configfs.h</a></div><div class='hunk'>@@ -64,8 +64,8 @@ extern void config_item_put(struct config_item *);</div><div class='ctx'> </div><div class='ctx'> struct config_item_type {</div><div class='ctx'> 	struct module				*ct_owner;</div><div class='del'>-	struct configfs_item_operations		*ct_item_ops;</div><div class='del'>-	struct configfs_group_operations	*ct_group_ops;</div><div class='add'>+	const struct configfs_item_operations	*ct_item_ops;</div><div class='add'>+	const struct configfs_group_operations	*ct_group_ops;</div><div class='ctx'> 	struct configfs_attribute		**ct_attrs;</div><div class='ctx'> 	struct configfs_bin_attribute		**ct_bin_attrs;</div><div class='ctx'> };</div><div class='hunk'>@@ -120,15 +120,19 @@ struct configfs_attribute {</div><div class='ctx'> 	ssize_t (*store)(struct config_item *, const char *, size_t);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CONFIGFS_ATTR(_pfx, _name)			\</div><div class='add'>+#define CONFIGFS_ATTR_PERM(_pfx, _name, _perm)		\</div><div class='ctx'> static struct configfs_attribute _pfx##attr_##_name = {	\</div><div class='ctx'> 	.ca_name	= __stringify(_name),		\</div><div class='del'>-	.ca_mode	= S_IRUGO | S_IWUSR,		\</div><div class='add'>+	.ca_mode	= _perm,			\</div><div class='ctx'> 	.ca_owner	= THIS_MODULE,			\</div><div class='ctx'> 	.show		= _pfx##_name##_show,		\</div><div class='ctx'> 	.store		= _pfx##_name##_store,		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define CONFIGFS_ATTR(_pfx, _name) CONFIGFS_ATTR_PERM(	\</div><div class='add'>+		_pfx, _name, S_IRUGO | S_IWUSR		\</div><div class='add'>+)</div><div class='add'>+</div><div class='ctx'> #define CONFIGFS_ATTR_RO(_pfx, _name)			\</div><div class='ctx'> static struct configfs_attribute _pfx##attr_##_name = {	\</div><div class='ctx'> 	.ca_name	= __stringify(_name),		\</div><div class='hunk'>@@ -216,6 +220,9 @@ struct configfs_group_operations {</div><div class='ctx'> 	struct config_group *(*make_group)(struct config_group *group, const char *name);</div><div class='ctx'> 	void (*disconnect_notify)(struct config_group *group, struct config_item *item);</div><div class='ctx'> 	void (*drop_item)(struct config_group *group, struct config_item *item);</div><div class='add'>+	bool (*is_visible)(struct config_item *item, struct configfs_attribute *attr, int n);</div><div class='add'>+	bool (*is_bin_visible)(struct config_item *item, struct configfs_bin_attribute *attr,</div><div class='add'>+			       int n);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct configfs_subsystem {</div><div class='head'>diff --git a/include/linux/console.h b/include/linux/console.h<br/>index 779d388af8a0..fc9f5c5c1b04 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/console.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/console.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/console.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/console.h</a></div><div class='hunk'>@@ -16,8 +16,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/irq_work.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='add'>+#include &lt;linux/rcuwait.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/vesa.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct vc_data;</div><div class='ctx'> struct console_font_op;</div><div class='hunk'>@@ -36,63 +40,91 @@ enum vc_intensity;</div><div class='ctx'> /**</div><div class='ctx'>  * struct consw - callbacks for consoles</div><div class='ctx'>  *</div><div class='add'>+ * @owner:      the module to get references of when this console is used</div><div class='add'>+ * @con_startup: set up the console and return its name (like VGA, EGA, ...)</div><div class='add'>+ * @con_init:   initialize the console on @vc. @init is true for the very first</div><div class='add'>+ *		call on this @vc.</div><div class='add'>+ * @con_deinit: deinitialize the console from @vc.</div><div class='add'>+ * @con_clear:  erase @count characters at [@x, @y] on @vc. @count &gt;= 1.</div><div class='add'>+ * @con_putc:   emit one character with attributes @ca to [@x, @y] on @vc.</div><div class='add'>+ *		(optional -- @con_putcs would be called instead)</div><div class='add'>+ * @con_putcs:  emit @count characters with attributes @s to [@x, @y] on @vc.</div><div class='add'>+ * @con_cursor: enable/disable cursor depending on @enable</div><div class='ctx'>  * @con_scroll: move lines from @top to @bottom in direction @dir by @lines.</div><div class='ctx'>  *		Return true if no generic handling should be done.</div><div class='ctx'>  *		Invoked by csi_M and printing to the console.</div><div class='del'>- * @con_set_palette: sets the palette of the console to @table (optional)</div><div class='add'>+ * @con_switch: notifier about the console switch; it is supposed to return</div><div class='add'>+ *		true if a redraw is needed.</div><div class='add'>+ * @con_blank:  blank/unblank the console. The target mode is passed in @blank.</div><div class='add'>+ *		@mode_switch is set if changing from/to text/graphics. The hook</div><div class='add'>+ *		is supposed to return true if a redraw is needed.</div><div class='add'>+ * @con_font_set: set console @vc font to @font with height @vpitch. @flags can</div><div class='add'>+ *		be %KD_FONT_FLAG_DONT_RECALC. (optional)</div><div class='add'>+ * @con_font_get: fetch the current font on @vc of height @vpitch into @font.</div><div class='add'>+ *		(optional)</div><div class='add'>+ * @con_font_default: set default font on @vc. @name can be %NULL or font name</div><div class='add'>+ *		to search for. @font can be filled back. (optional)</div><div class='add'>+ * @con_resize:	resize the @vc console to @width x @height. @from_user is true</div><div class='add'>+ *		when this change comes from the user space.</div><div class='add'>+ * @con_set_palette: sets the palette of the console @vc to @table (optional)</div><div class='ctx'>  * @con_scrolldelta: the contents of the console should be scrolled by @lines.</div><div class='ctx'>  *		     Invoked by user. (optional)</div><div class='add'>+ * @con_set_origin: set origin (see &amp;vc_data::vc_origin) of the @vc. If not</div><div class='add'>+ *		provided or returns false, the origin is set to</div><div class='add'>+ *		@vc-&gt;vc_screenbuf. (optional)</div><div class='add'>+ * @con_save_screen: save screen content into @vc-&gt;vc_screenbuf. Called e.g.</div><div class='add'>+ *		upon entering graphics. (optional)</div><div class='add'>+ * @con_build_attr: build attributes based on @color, @intensity and other</div><div class='add'>+ *		parameters. The result is used for both normal and erase</div><div class='add'>+ *		characters. (optional)</div><div class='add'>+ * @con_invert_region: invert a region of length @count on @vc starting at @p.</div><div class='add'>+ *		(optional)</div><div class='add'>+ * @con_debug_enter: prepare the console for the debugger. This includes, but</div><div class='add'>+ *		is not limited to, unblanking the console, loading an</div><div class='add'>+ *		appropriate palette, and allowing debugger generated output.</div><div class='add'>+ *		(optional)</div><div class='add'>+ * @con_debug_leave: restore the console to its pre-debug state as closely as</div><div class='add'>+ *		possible. (optional)</div><div class='ctx'>  */</div><div class='ctx'> struct consw {</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> 	const char *(*con_startup)(void);</div><div class='del'>-	void	(*con_init)(struct vc_data *vc, int init);</div><div class='add'>+	void	(*con_init)(struct vc_data *vc, bool init);</div><div class='ctx'> 	void	(*con_deinit)(struct vc_data *vc);</div><div class='del'>-	void	(*con_clear)(struct vc_data *vc, int sy, int sx, int height,</div><div class='del'>-			int width);</div><div class='del'>-	void	(*con_putc)(struct vc_data *vc, int c, int ypos, int xpos);</div><div class='del'>-	void	(*con_putcs)(struct vc_data *vc, const unsigned short *s,</div><div class='del'>-			int count, int ypos, int xpos);</div><div class='del'>-	void	(*con_cursor)(struct vc_data *vc, int mode);</div><div class='add'>+	void	(*con_clear)(struct vc_data *vc, unsigned int y,</div><div class='add'>+			     unsigned int x, unsigned int count);</div><div class='add'>+	void	(*con_putc)(struct vc_data *vc, u16 ca, unsigned int y,</div><div class='add'>+			    unsigned int x);</div><div class='add'>+	void	(*con_putcs)(struct vc_data *vc, const u16 *s,</div><div class='add'>+			     unsigned int count, unsigned int ypos,</div><div class='add'>+			     unsigned int xpos);</div><div class='add'>+	void	(*con_cursor)(struct vc_data *vc, bool enable);</div><div class='ctx'> 	bool	(*con_scroll)(struct vc_data *vc, unsigned int top,</div><div class='ctx'> 			unsigned int bottom, enum con_scroll dir,</div><div class='ctx'> 			unsigned int lines);</div><div class='del'>-	int	(*con_switch)(struct vc_data *vc);</div><div class='del'>-	int	(*con_blank)(struct vc_data *vc, int blank, int mode_switch);</div><div class='del'>-	int	(*con_font_set)(struct vc_data *vc, struct console_font *font,</div><div class='del'>-			unsigned int vpitch, unsigned int flags);</div><div class='add'>+	bool	(*con_switch)(struct vc_data *vc);</div><div class='add'>+	bool	(*con_blank)(struct vc_data *vc, enum vesa_blank_mode blank,</div><div class='add'>+			     bool mode_switch);</div><div class='add'>+	int	(*con_font_set)(struct vc_data *vc,</div><div class='add'>+				const struct console_font *font,</div><div class='add'>+				unsigned int vpitch, unsigned int flags);</div><div class='ctx'> 	int	(*con_font_get)(struct vc_data *vc, struct console_font *font,</div><div class='ctx'> 			unsigned int vpitch);</div><div class='ctx'> 	int	(*con_font_default)(struct vc_data *vc,</div><div class='del'>-			struct console_font *font, char *name);</div><div class='add'>+			struct console_font *font, const char *name);</div><div class='ctx'> 	int     (*con_resize)(struct vc_data *vc, unsigned int width,</div><div class='del'>-			unsigned int height, unsigned int user);</div><div class='add'>+			      unsigned int height, bool from_user);</div><div class='ctx'> 	void	(*con_set_palette)(struct vc_data *vc,</div><div class='ctx'> 			const unsigned char *table);</div><div class='ctx'> 	void	(*con_scrolldelta)(struct vc_data *vc, int lines);</div><div class='del'>-	int	(*con_set_origin)(struct vc_data *vc);</div><div class='add'>+	bool	(*con_set_origin)(struct vc_data *vc);</div><div class='ctx'> 	void	(*con_save_screen)(struct vc_data *vc);</div><div class='ctx'> 	u8	(*con_build_attr)(struct vc_data *vc, u8 color,</div><div class='ctx'> 			enum vc_intensity intensity,</div><div class='ctx'> 			bool blink, bool underline, bool reverse, bool italic);</div><div class='ctx'> 	void	(*con_invert_region)(struct vc_data *vc, u16 *p, int count);</div><div class='del'>-	u16    *(*con_screen_pos)(const struct vc_data *vc, int offset);</div><div class='del'>-	unsigned long (*con_getxy)(struct vc_data *vc, unsigned long position,</div><div class='del'>-			int *px, int *py);</div><div class='del'>-	/*</div><div class='del'>-	 * Flush the video console driver's scrollback buffer</div><div class='del'>-	 */</div><div class='del'>-	void	(*con_flush_scrollback)(struct vc_data *vc);</div><div class='del'>-	/*</div><div class='del'>-	 * Prepare the console for the debugger.  This includes, but is not</div><div class='del'>-	 * limited to, unblanking the console, loading an appropriate</div><div class='del'>-	 * palette, and allowing debugger generated output.</div><div class='del'>-	 */</div><div class='del'>-	int	(*con_debug_enter)(struct vc_data *vc);</div><div class='del'>-	/*</div><div class='del'>-	 * Restore the console to its pre-debug state as closely as possible.</div><div class='del'>-	 */</div><div class='del'>-	int	(*con_debug_leave)(struct vc_data *vc);</div><div class='add'>+	void	(*con_debug_enter)(struct vc_data *vc);</div><div class='add'>+	void	(*con_debug_leave)(struct vc_data *vc);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct consw *conswitchp;</div><div class='hunk'>@@ -112,32 +144,21 @@ int con_is_bound(const struct consw *csw);</div><div class='ctx'> int do_unregister_con_driver(const struct consw *csw);</div><div class='ctx'> int do_take_over_console(const struct consw *sw, int first, int last, int deflt);</div><div class='ctx'> void give_up_console(const struct consw *sw);</div><div class='del'>-#ifdef CONFIG_HW_CONSOLE</div><div class='del'>-int con_debug_enter(struct vc_data *vc);</div><div class='del'>-int con_debug_leave(void);</div><div class='add'>+#ifdef CONFIG_VT</div><div class='add'>+void con_debug_enter(struct vc_data *vc);</div><div class='add'>+void con_debug_leave(void);</div><div class='ctx'> #else</div><div class='del'>-static inline int con_debug_enter(struct vc_data *vc)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline int con_debug_leave(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+static inline void con_debug_enter(struct vc_data *vc) { }</div><div class='add'>+static inline void con_debug_leave(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* cursor */</div><div class='del'>-#define CM_DRAW     (1)</div><div class='del'>-#define CM_ERASE    (2)</div><div class='del'>-#define CM_MOVE     (3)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The interface for a console, or any other device that wants to capture</div><div class='ctx'>  * console messages (printer driver?)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cons_flags - General console flags</div><div class='add'>+ * enum cons_flags - General console flags</div><div class='ctx'>  * @CON_PRINTBUFFER:	Used by newly registered consoles to avoid duplicate</div><div class='ctx'>  *			output of messages that were already shown by boot</div><div class='ctx'>  *			consoles or read by userspace via syslog() syscall.</div><div class='hunk'>@@ -165,6 +186,8 @@ static inline int con_debug_leave(void)</div><div class='ctx'>  *			printing callbacks must not be called.</div><div class='ctx'>  * @CON_NBCON:		Console can operate outside of the legacy style console_lock</div><div class='ctx'>  *			constraints.</div><div class='add'>+ * @CON_NBCON_ATOMIC_UNSAFE: The write_atomic() callback is not safe and is</div><div class='add'>+ *			therefore only used by nbcon_atomic_flush_unsafe().</div><div class='ctx'>  */</div><div class='ctx'> enum cons_flags {</div><div class='ctx'> 	CON_PRINTBUFFER		= BIT(0),</div><div class='hunk'>@@ -176,6 +199,7 @@ enum cons_flags {</div><div class='ctx'> 	CON_EXTENDED		= BIT(6),</div><div class='ctx'> 	CON_SUSPENDED		= BIT(7),</div><div class='ctx'> 	CON_NBCON		= BIT(8),</div><div class='add'>+	CON_NBCON_ATOMIC_UNSAFE	= BIT(9),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -218,7 +242,7 @@ struct nbcon_state {</div><div class='ctx'> static_assert(sizeof(struct nbcon_state) &lt;= sizeof(int));</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nbcon_prio - console owner priority for nbcon consoles</div><div class='add'>+ * enum nbcon_prio - console owner priority for nbcon consoles</div><div class='ctx'>  * @NBCON_PRIO_NONE:		Unused</div><div class='ctx'>  * @NBCON_PRIO_NORMAL:		Normal (non-emergency) usage</div><div class='ctx'>  * @NBCON_PRIO_EMERGENCY:	Emergency output (WARN/OOPS...)</div><div class='hunk'>@@ -285,7 +309,7 @@ struct nbcon_write_context {</div><div class='ctx'> /**</div><div class='ctx'>  * struct console - The console descriptor structure</div><div class='ctx'>  * @name:		The name of the console driver</div><div class='del'>- * @write:		Write callback to output messages (Optional)</div><div class='add'>+ * @write:		Legacy write callback to output messages (Optional)</div><div class='ctx'>  * @read:		Read callback for console input (Optional)</div><div class='ctx'>  * @device:		The underlying TTY device driver (Optional)</div><div class='ctx'>  * @unblank:		Callback to unblank the console (Optional)</div><div class='hunk'>@@ -302,10 +326,14 @@ struct nbcon_write_context {</div><div class='ctx'>  * @data:		Driver private data</div><div class='ctx'>  * @node:		hlist node for the console list</div><div class='ctx'>  *</div><div class='del'>- * @write_atomic:	Write callback for atomic context</div><div class='ctx'>  * @nbcon_state:	State for nbcon consoles</div><div class='ctx'>  * @nbcon_seq:		Sequence number of the next record for nbcon to print</div><div class='add'>+ * @nbcon_device_ctxt:	Context available for non-printing operations</div><div class='add'>+ * @nbcon_prev_seq:	Seq num the previous nbcon owner was assigned to print</div><div class='ctx'>  * @pbufs:		Pointer to nbcon private buffer</div><div class='add'>+ * @kthread:		Printer kthread for this console</div><div class='add'>+ * @rcuwait:		RCU-safe wait object for @kthread waking</div><div class='add'>+ * @irq_work:		Defer @kthread waking to IRQ work context</div><div class='ctx'>  */</div><div class='ctx'> struct console {</div><div class='ctx'> 	char			name[16];</div><div class='hunk'>@@ -327,11 +355,121 @@ struct console {</div><div class='ctx'> 	struct hlist_node	node;</div><div class='ctx'> </div><div class='ctx'> 	/* nbcon console specific members */</div><div class='del'>-	bool			(*write_atomic)(struct console *con,</div><div class='del'>-						struct nbcon_write_context *wctxt);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @write_atomic:</div><div class='add'>+	 *</div><div class='add'>+	 * NBCON callback to write out text in any context. (Optional)</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is called with the console already acquired. However,</div><div class='add'>+	 * a higher priority context is allowed to take it over by default.</div><div class='add'>+	 *</div><div class='add'>+	 * The callback must call nbcon_enter_unsafe() and nbcon_exit_unsafe()</div><div class='add'>+	 * around any code where the takeover is not safe, for example, when</div><div class='add'>+	 * manipulating the serial port registers.</div><div class='add'>+	 *</div><div class='add'>+	 * nbcon_enter_unsafe() will fail if the context has lost the console</div><div class='add'>+	 * ownership in the meantime. In this case, the callback is no longer</div><div class='add'>+	 * allowed to go forward. It must back out immediately and carefully.</div><div class='add'>+	 * The buffer content is also no longer trusted since it no longer</div><div class='add'>+	 * belongs to the context.</div><div class='add'>+	 *</div><div class='add'>+	 * The callback should allow the takeover whenever it is safe. It</div><div class='add'>+	 * increases the chance to see messages when the system is in trouble.</div><div class='add'>+	 * If the driver must reacquire ownership in order to finalize or</div><div class='add'>+	 * revert hardware changes, nbcon_reacquire_nobuf() can be used.</div><div class='add'>+	 * However, on reacquire the buffer content is no longer available. A</div><div class='add'>+	 * reacquire cannot be used to resume printing.</div><div class='add'>+	 *</div><div class='add'>+	 * The callback can be called from any context (including NMI).</div><div class='add'>+	 * Therefore it must avoid usage of any locking and instead rely</div><div class='add'>+	 * on the console ownership for synchronization.</div><div class='add'>+	 */</div><div class='add'>+	void (*write_atomic)(struct console *con, struct nbcon_write_context *wctxt);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @write_thread:</div><div class='add'>+	 *</div><div class='add'>+	 * NBCON callback to write out text in task context.</div><div class='add'>+	 *</div><div class='add'>+	 * This callback must be called only in task context with both</div><div class='add'>+	 * device_lock() and the nbcon console acquired with</div><div class='add'>+	 * NBCON_PRIO_NORMAL.</div><div class='add'>+	 *</div><div class='add'>+	 * The same rules for console ownership verification and unsafe</div><div class='add'>+	 * sections handling applies as with write_atomic().</div><div class='add'>+	 *</div><div class='add'>+	 * The console ownership handling is necessary for synchronization</div><div class='add'>+	 * against write_atomic() which is synchronized only via the context.</div><div class='add'>+	 *</div><div class='add'>+	 * The device_lock() provides the primary serialization for operations</div><div class='add'>+	 * on the device. It might be as relaxed (mutex)[*] or as tight</div><div class='add'>+	 * (disabled preemption and interrupts) as needed. It allows</div><div class='add'>+	 * the kthread to operate in the least restrictive mode[**].</div><div class='add'>+	 *</div><div class='add'>+	 * [*] Standalone nbcon_context_try_acquire() is not safe with</div><div class='add'>+	 *     the preemption enabled, see nbcon_owner_matches(). But it</div><div class='add'>+	 *     can be safe when always called in the preemptive context</div><div class='add'>+	 *     under the device_lock().</div><div class='add'>+	 *</div><div class='add'>+	 * [**] The device_lock() makes sure that nbcon_context_try_acquire()</div><div class='add'>+	 *      would never need to spin which is important especially with</div><div class='add'>+	 *      PREEMPT_RT.</div><div class='add'>+	 */</div><div class='add'>+	void (*write_thread)(struct console *con, struct nbcon_write_context *wctxt);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @device_lock:</div><div class='add'>+	 *</div><div class='add'>+	 * NBCON callback to begin synchronization with driver code.</div><div class='add'>+	 *</div><div class='add'>+	 * Console drivers typically must deal with access to the hardware</div><div class='add'>+	 * via user input/output (such as an interactive login shell) and</div><div class='add'>+	 * output of kernel messages via printk() calls. This callback is</div><div class='add'>+	 * called by the printk-subsystem whenever it needs to synchronize</div><div class='add'>+	 * with hardware access by the driver. It should be implemented to</div><div class='add'>+	 * use whatever synchronization mechanism the driver is using for</div><div class='add'>+	 * itself (for example, the port lock for uart serial consoles).</div><div class='add'>+	 *</div><div class='add'>+	 * The callback is always called from task context. It may use any</div><div class='add'>+	 * synchronization method required by the driver.</div><div class='add'>+	 *</div><div class='add'>+	 * IMPORTANT: The callback MUST disable migration. The console driver</div><div class='add'>+	 *	may be using a synchronization mechanism that already takes</div><div class='add'>+	 *	care of this (such as spinlocks). Otherwise this function must</div><div class='add'>+	 *	explicitly call migrate_disable().</div><div class='add'>+	 *</div><div class='add'>+	 * The flags argument is provided as a convenience to the driver. It</div><div class='add'>+	 * will be passed again to device_unlock(). It can be ignored if the</div><div class='add'>+	 * driver does not need it.</div><div class='add'>+	 */</div><div class='add'>+	void (*device_lock)(struct console *con, unsigned long *flags);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @device_unlock:</div><div class='add'>+	 *</div><div class='add'>+	 * NBCON callback to finish synchronization with driver code.</div><div class='add'>+	 *</div><div class='add'>+	 * It is the counterpart to device_lock().</div><div class='add'>+	 *</div><div class='add'>+	 * This callback is always called from task context. It must</div><div class='add'>+	 * appropriately re-enable migration (depending on how device_lock()</div><div class='add'>+	 * disabled migration).</div><div class='add'>+	 *</div><div class='add'>+	 * The flags argument is the value of the same variable that was</div><div class='add'>+	 * passed to device_lock().</div><div class='add'>+	 */</div><div class='add'>+	void (*device_unlock)(struct console *con, unsigned long flags);</div><div class='add'>+</div><div class='ctx'> 	atomic_t		__private nbcon_state;</div><div class='ctx'> 	atomic_long_t		__private nbcon_seq;</div><div class='add'>+	struct nbcon_context	__private nbcon_device_ctxt;</div><div class='add'>+	atomic_long_t           __private nbcon_prev_seq;</div><div class='add'>+</div><div class='ctx'> 	struct printk_buffers	*pbufs;</div><div class='add'>+	struct task_struct	*kthread;</div><div class='add'>+	struct rcuwait		rcuwait;</div><div class='add'>+	struct irq_work		irq_work;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='hunk'>@@ -360,28 +498,34 @@ extern void console_list_unlock(void) __releases(console_mutex);</div><div class='ctx'> extern struct hlist_head console_list;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * console_srcu_read_flags - Locklessly read the console flags</div><div class='add'>+ * console_srcu_read_flags - Locklessly read flags of a possibly registered</div><div class='add'>+ *				console</div><div class='ctx'>  * @con:	struct console pointer of console to read flags from</div><div class='ctx'>  *</div><div class='del'>- * This function provides the necessary READ_ONCE() and data_race()</div><div class='del'>- * notation for locklessly reading the console flags. The READ_ONCE()</div><div class='del'>- * in this function matches the WRITE_ONCE() when @flags are modified</div><div class='del'>- * for registered consoles with console_srcu_write_flags().</div><div class='add'>+ * Locklessly reading @con-&gt;flags provides a consistent read value because</div><div class='add'>+ * there is at most one CPU modifying @con-&gt;flags and that CPU is using only</div><div class='add'>+ * read-modify-write operations to do so.</div><div class='add'>+ *</div><div class='add'>+ * Requires console_srcu_read_lock to be held, which implies that @con might</div><div class='add'>+ * be a registered console. The purpose of holding console_srcu_read_lock is</div><div class='add'>+ * to guarantee that the console state is valid (CON_SUSPENDED/CON_ENABLED)</div><div class='add'>+ * and that no exit/cleanup routines will run if the console is currently</div><div class='add'>+ * undergoing unregistration.</div><div class='ctx'>  *</div><div class='del'>- * Only use this function to read console flags when locklessly</div><div class='del'>- * iterating the console list via srcu.</div><div class='add'>+ * If the caller is holding the console_list_lock or it is _certain_ that</div><div class='add'>+ * @con is not and will not become registered, the caller may read</div><div class='add'>+ * @con-&gt;flags directly instead.</div><div class='ctx'>  *</div><div class='ctx'>  * Context: Any context.</div><div class='add'>+ * Return: The current value of the @con-&gt;flags field.</div><div class='ctx'>  */</div><div class='ctx'> static inline short console_srcu_read_flags(const struct console *con)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(!console_srcu_read_lock_is_held());</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Locklessly reading console-&gt;flags provides a consistent</div><div class='del'>-	 * read value because there is at most one CPU modifying</div><div class='del'>-	 * console-&gt;flags and that CPU is using only read-modify-write</div><div class='del'>-	 * operations to do so.</div><div class='add'>+	 * The READ_ONCE() matches the WRITE_ONCE() when @flags are modified</div><div class='add'>+	 * for registered consoles with console_srcu_write_flags().</div><div class='ctx'> 	 */</div><div class='ctx'> 	return data_race(READ_ONCE(con-&gt;flags));</div><div class='ctx'> }</div><div class='hunk'>@@ -450,7 +594,7 @@ static inline bool console_is_registered(const struct console *con)</div><div class='ctx'>  * for_each_console() - Iterator over registered consoles</div><div class='ctx'>  * @con:	struct console pointer used as loop cursor</div><div class='ctx'>  *</div><div class='del'>- * The console list and the console-&gt;flags are immutable while iterating.</div><div class='add'>+ * The console list and the &amp;console.flags are immutable while iterating.</div><div class='ctx'>  *</div><div class='ctx'>  * Requires console_list_lock to be held.</div><div class='ctx'>  */</div><div class='hunk'>@@ -459,13 +603,83 @@ static inline bool console_is_registered(const struct console *con)</div><div class='ctx'> 	hlist_for_each_entry(con, &amp;console_list, node)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PRINTK</div><div class='add'>+extern void nbcon_cpu_emergency_enter(void);</div><div class='add'>+extern void nbcon_cpu_emergency_exit(void);</div><div class='ctx'> extern bool nbcon_can_proceed(struct nbcon_write_context *wctxt);</div><div class='add'>+extern void nbcon_write_context_set_buf(struct nbcon_write_context *wctxt,</div><div class='add'>+					char *buf, unsigned int len);</div><div class='ctx'> extern bool nbcon_enter_unsafe(struct nbcon_write_context *wctxt);</div><div class='ctx'> extern bool nbcon_exit_unsafe(struct nbcon_write_context *wctxt);</div><div class='add'>+extern void nbcon_reacquire_nobuf(struct nbcon_write_context *wctxt);</div><div class='add'>+extern bool nbcon_allow_unsafe_takeover(void);</div><div class='add'>+extern bool nbcon_kdb_try_acquire(struct console *con,</div><div class='add'>+				  struct nbcon_write_context *wctxt);</div><div class='add'>+extern void nbcon_kdb_release(struct nbcon_write_context *wctxt);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if the given console is currently capable and allowed to print</div><div class='add'>+ * records. Note that this function does not consider the current context,</div><div class='add'>+ * which can also play a role in deciding if @con can be used to print</div><div class='add'>+ * records.</div><div class='add'>+ */</div><div class='add'>+static inline bool console_is_usable(struct console *con, short flags, bool use_atomic)</div><div class='add'>+{</div><div class='add'>+	if (!(flags &amp; CON_ENABLED))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if ((flags &amp; CON_SUSPENDED))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; CON_NBCON) {</div><div class='add'>+		if (use_atomic) {</div><div class='add'>+			/* The write_atomic() callback is optional. */</div><div class='add'>+			if (!con-&gt;write_atomic)</div><div class='add'>+				return false;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * An unsafe write_atomic() callback is only usable</div><div class='add'>+			 * when unsafe takeovers are allowed.</div><div class='add'>+			 */</div><div class='add'>+			if ((flags &amp; CON_NBCON_ATOMIC_UNSAFE) &amp;&amp; !nbcon_allow_unsafe_takeover())</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * For the !use_atomic case, @printk_kthreads_running is not</div><div class='add'>+		 * checked because the write_thread() callback is also used</div><div class='add'>+		 * via the legacy loop when the printer threads are not</div><div class='add'>+		 * available.</div><div class='add'>+		 */</div><div class='add'>+	} else {</div><div class='add'>+		if (!con-&gt;write)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Console drivers may assume that per-cpu resources have been</div><div class='add'>+	 * allocated. So unless they're explicitly marked as being able to</div><div class='add'>+	 * cope (CON_ANYTIME) don't call them until this CPU is officially up.</div><div class='add'>+	 */</div><div class='add'>+	if (!cpu_online(raw_smp_processor_id()) &amp;&amp; !(flags &amp; CON_ANYTIME))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='add'>+static inline void nbcon_cpu_emergency_enter(void) { }</div><div class='add'>+static inline void nbcon_cpu_emergency_exit(void) { }</div><div class='ctx'> static inline bool nbcon_can_proceed(struct nbcon_write_context *wctxt) { return false; }</div><div class='add'>+static inline void nbcon_write_context_set_buf(struct nbcon_write_context *wctxt,</div><div class='add'>+					       char *buf, unsigned int len) { }</div><div class='ctx'> static inline bool nbcon_enter_unsafe(struct nbcon_write_context *wctxt) { return false; }</div><div class='ctx'> static inline bool nbcon_exit_unsafe(struct nbcon_write_context *wctxt) { return false; }</div><div class='add'>+static inline void nbcon_reacquire_nobuf(struct nbcon_write_context *wctxt) { }</div><div class='add'>+static inline bool nbcon_kdb_try_acquire(struct console *con,</div><div class='add'>+					 struct nbcon_write_context *wctxt) { return false; }</div><div class='add'>+static inline void nbcon_kdb_release(struct nbcon_write_context *wctxt) { }</div><div class='add'>+static inline bool console_is_usable(struct console *con, short flags,</div><div class='add'>+				     bool use_atomic) { return false; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern int console_set_on_cmdline;</div><div class='hunk'>@@ -487,8 +701,8 @@ extern void console_conditional_schedule(void);</div><div class='ctx'> extern void console_unblank(void);</div><div class='ctx'> extern void console_flush_on_panic(enum con_flush_mode mode);</div><div class='ctx'> extern struct tty_driver *console_device(int *);</div><div class='del'>-extern void console_stop(struct console *);</div><div class='del'>-extern void console_start(struct console *);</div><div class='add'>+extern void console_suspend(struct console *);</div><div class='add'>+extern void console_resume(struct console *);</div><div class='ctx'> extern int is_console_locked(void);</div><div class='ctx'> extern int braille_register_console(struct console *, int index,</div><div class='ctx'> 		char *console_options, char *braille_options);</div><div class='hunk'>@@ -502,8 +716,8 @@ static inline void console_sysfs_notify(void)</div><div class='ctx'> extern bool console_suspend_enabled;</div><div class='ctx'> </div><div class='ctx'> /* Suspend and resume console messages over PM events */</div><div class='del'>-extern void suspend_console(void);</div><div class='del'>-extern void resume_console(void);</div><div class='add'>+extern void console_suspend_all(void);</div><div class='add'>+extern void console_resume_all(void);</div><div class='ctx'> </div><div class='ctx'> int mda_console_init(void);</div><div class='ctx'> </div><div class='hunk'>@@ -520,11 +734,7 @@ void vcs_remove_sysfs(int index);</div><div class='ctx'>  */</div><div class='ctx'> extern atomic_t ignore_console_lock_warning;</div><div class='ctx'> </div><div class='del'>-/* VESA Blanking Levels */</div><div class='del'>-#define VESA_NO_BLANKING        0</div><div class='del'>-#define VESA_VSYNC_SUSPEND      1</div><div class='del'>-#define VESA_HSYNC_SUSPEND      2</div><div class='del'>-#define VESA_POWERDOWN          3</div><div class='add'>+DEFINE_LOCK_GUARD_0(console_lock, console_lock(), console_unlock());</div><div class='ctx'> </div><div class='ctx'> extern void console_init(void);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h<br/>index 539f1cd45309..13b35637bd5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/console_struct.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/console_struct.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/console_struct.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/console_struct.h</a></div><div class='hunk'>@@ -145,13 +145,13 @@ struct vc_data {</div><div class='ctx'> 	unsigned int	vc_need_wrap	: 1;</div><div class='ctx'> 	unsigned int	vc_can_do_color	: 1;</div><div class='ctx'> 	unsigned int	vc_report_mouse : 2;</div><div class='add'>+	unsigned int	vc_bracketed_paste : 1;</div><div class='ctx'> 	unsigned char	vc_utf		: 1;	/* Unicode UTF-8 encoding */</div><div class='ctx'> 	unsigned char	vc_utf_count;</div><div class='ctx'> 		 int	vc_utf_char;</div><div class='ctx'> 	DECLARE_BITMAP(vc_tab_stop, VC_TABSTOPS_COUNT);	/* Tab stops. 256 columns. */</div><div class='ctx'> 	unsigned char   vc_palette[16*3];       /* Colour palette for VGA+ */</div><div class='ctx'> 	unsigned short * vc_translate;</div><div class='del'>-	unsigned int    vc_resize_user;         /* resize request from user */</div><div class='ctx'> 	unsigned int	vc_bell_pitch;		/* Console bell pitch */</div><div class='ctx'> 	unsigned int	vc_bell_duration;	/* Console bell duration */</div><div class='ctx'> 	unsigned short	vc_cur_blink_ms;	/* Cursor blink duration */</div><div class='hunk'>@@ -159,6 +159,9 @@ struct vc_data {</div><div class='ctx'> 	struct uni_pagedict *uni_pagedict;</div><div class='ctx'> 	struct uni_pagedict **uni_pagedict_loc; /* [!] Location of uni_pagedict variable for this console */</div><div class='ctx'> 	u32 **vc_uni_lines;			/* unicode screen content */</div><div class='add'>+	u16		*vc_saved_screen;</div><div class='add'>+	unsigned int	vc_saved_cols;</div><div class='add'>+	unsigned int	vc_saved_rows;</div><div class='ctx'> 	/* additional information is in vt_kern.h */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/consolemap.h b/include/linux/consolemap.h<br/>index c35db4896c37..6180b803795c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/consolemap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/consolemap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/consolemap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/consolemap.h</a></div><div class='hunk'>@@ -28,6 +28,10 @@ int conv_uni_to_pc(struct vc_data *conp, long ucs);</div><div class='ctx'> u32 conv_8bit_to_uni(unsigned char c);</div><div class='ctx'> int conv_uni_to_8bit(u32 uni);</div><div class='ctx'> void console_map_init(void);</div><div class='add'>+bool ucs_is_double_width(uint32_t cp);</div><div class='add'>+bool ucs_is_zero_width(uint32_t cp);</div><div class='add'>+u32 ucs_recompose(u32 base, u32 mark);</div><div class='add'>+u32 ucs_get_fallback(u32 cp);</div><div class='ctx'> #else</div><div class='ctx'> static inline u16 inverse_translate(const struct vc_data *conp, u16 glyph,</div><div class='ctx'> 		bool use_unicode)</div><div class='hunk'>@@ -57,6 +61,26 @@ static inline int conv_uni_to_8bit(u32 uni)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void console_map_init(void) { }</div><div class='add'>+</div><div class='add'>+static inline bool ucs_is_double_width(uint32_t cp)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ucs_is_zero_width(uint32_t cp)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 ucs_recompose(u32 base, u32 mark)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 ucs_get_fallback(u32 cp)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_CONSOLE_TRANSLATIONS */</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_CONSOLEMAP_H__ */</div><div class='head'>diff --git a/include/linux/container_of.h b/include/linux/container_of.h<br/>index 713890c867be..1f6ebf27d962 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/container_of.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/container_of.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/container_of.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/container_of.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  * @member:	the name of the member within the struct.</div><div class='ctx'>  *</div><div class='ctx'>  * WARNING: any const qualifier of @ptr is lost.</div><div class='add'>+ * Do not use container_of() in new code.</div><div class='ctx'>  */</div><div class='ctx'> #define container_of(ptr, type, member) ({				\</div><div class='ctx'> 	void *__mptr = (void *)(ptr);					\</div><div class='hunk'>@@ -28,6 +29,8 @@</div><div class='ctx'>  * @ptr:		the pointer to the member</div><div class='ctx'>  * @type:		the type of the container struct this is embedded in.</div><div class='ctx'>  * @member:		the name of the member within the struct.</div><div class='add'>+ *</div><div class='add'>+ * Always prefer container_of_const() instead of container_of() in new code.</div><div class='ctx'>  */</div><div class='ctx'> #define container_of_const(ptr, type, member)				\</div><div class='ctx'> 	_Generic(ptr,							\</div><div class='head'>diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h<br/>index 6e76b9dba00e..af9fe87a0922 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/context_tracking.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/context_tracking.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/context_tracking.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/context_tracking.h</a></div><div class='hunk'>@@ -26,26 +26,26 @@ extern void user_exit_callable(void);</div><div class='ctx'> static inline void user_enter(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (context_tracking_enabled())</div><div class='del'>-		ct_user_enter(CONTEXT_USER);</div><div class='add'>+		ct_user_enter(CT_STATE_USER);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> static inline void user_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (context_tracking_enabled())</div><div class='del'>-		ct_user_exit(CONTEXT_USER);</div><div class='add'>+		ct_user_exit(CT_STATE_USER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called with interrupts disabled.  */</div><div class='ctx'> static __always_inline void user_enter_irqoff(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (context_tracking_enabled())</div><div class='del'>-		__ct_user_enter(CONTEXT_USER);</div><div class='add'>+		__ct_user_enter(CT_STATE_USER);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> static __always_inline void user_exit_irqoff(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (context_tracking_enabled())</div><div class='del'>-		__ct_user_exit(CONTEXT_USER);</div><div class='add'>+		__ct_user_exit(CT_STATE_USER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline enum ctx_state exception_enter(void)</div><div class='hunk'>@@ -57,7 +57,7 @@ static inline enum ctx_state exception_enter(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	prev_ctx = __ct_state();</div><div class='del'>-	if (prev_ctx != CONTEXT_KERNEL)</div><div class='add'>+	if (prev_ctx != CT_STATE_KERNEL)</div><div class='ctx'> 		ct_user_exit(prev_ctx);</div><div class='ctx'> </div><div class='ctx'> 	return prev_ctx;</div><div class='hunk'>@@ -67,7 +67,7 @@ static inline void exception_exit(enum ctx_state prev_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK) &amp;&amp;</div><div class='ctx'> 	    context_tracking_enabled()) {</div><div class='del'>-		if (prev_ctx != CONTEXT_KERNEL)</div><div class='add'>+		if (prev_ctx != CT_STATE_KERNEL)</div><div class='ctx'> 			ct_user_enter(prev_ctx);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -75,15 +75,17 @@ static inline void exception_exit(enum ctx_state prev_ctx)</div><div class='ctx'> static __always_inline bool context_tracking_guest_enter(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (context_tracking_enabled())</div><div class='del'>-		__ct_user_enter(CONTEXT_GUEST);</div><div class='add'>+		__ct_user_enter(CT_STATE_GUEST);</div><div class='ctx'> </div><div class='ctx'> 	return context_tracking_enabled_this_cpu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline void context_tracking_guest_exit(void)</div><div class='add'>+static __always_inline bool context_tracking_guest_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (context_tracking_enabled())</div><div class='del'>-		__ct_user_exit(CONTEXT_GUEST);</div><div class='add'>+		__ct_user_exit(CT_STATE_GUEST);</div><div class='add'>+</div><div class='add'>+	return context_tracking_enabled_this_cpu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define CT_WARN_ON(cond) WARN_ON(context_tracking_enabled() &amp;&amp; (cond))</div><div class='hunk'>@@ -98,7 +100,7 @@ static inline void exception_exit(enum ctx_state prev_ctx) { }</div><div class='ctx'> static inline int ct_state(void) { return -1; }</div><div class='ctx'> static inline int __ct_state(void) { return -1; }</div><div class='ctx'> static __always_inline bool context_tracking_guest_enter(void) { return false; }</div><div class='del'>-static __always_inline void context_tracking_guest_exit(void) { }</div><div class='add'>+static __always_inline bool context_tracking_guest_exit(void) { return false; }</div><div class='ctx'> #define CT_WARN_ON(cond) do { } while (0)</div><div class='ctx'> #endif /* !CONFIG_CONTEXT_TRACKING_USER */</div><div class='ctx'> </div><div class='hunk'>@@ -113,13 +115,17 @@ extern void ct_idle_enter(void);</div><div class='ctx'> extern void ct_idle_exit(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Is the current CPU in an extended quiescent state?</div><div class='add'>+ * Is RCU watching the current CPU (IOW, it is not in an extended quiescent state)?</div><div class='add'>+ *</div><div class='add'>+ * Note that this returns the actual boolean data (watching / not watching),</div><div class='add'>+ * whereas ct_rcu_watching() returns the RCU_WATCHING subvariable of</div><div class='add'>+ * context_tracking.state.</div><div class='ctx'>  *</div><div class='ctx'>  * No ordering, as we are sampling CPU-local information.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline bool rcu_dynticks_curr_cpu_in_eqs(void)</div><div class='add'>+static __always_inline bool rcu_is_watching_curr_cpu(void)</div><div class='ctx'> {</div><div class='del'>-	return !(raw_atomic_read(this_cpu_ptr(&amp;context_tracking.state)) &amp; RCU_DYNTICKS_IDX);</div><div class='add'>+	return raw_atomic_read(this_cpu_ptr(&amp;context_tracking.state)) &amp; CT_RCU_WATCHING;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -140,9 +146,9 @@ static __always_inline bool warn_rcu_enter(void)</div><div class='ctx'> 	 * lots of the actual reporting also relies on RCU.</div><div class='ctx'> 	 */</div><div class='ctx'> 	preempt_disable_notrace();</div><div class='del'>-	if (rcu_dynticks_curr_cpu_in_eqs()) {</div><div class='add'>+	if (!rcu_is_watching_curr_cpu()) {</div><div class='ctx'> 		ret = true;</div><div class='del'>-		ct_state_inc(RCU_DYNTICKS_IDX);</div><div class='add'>+		ct_state_inc(CT_RCU_WATCHING);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -151,7 +157,7 @@ static __always_inline bool warn_rcu_enter(void)</div><div class='ctx'> static __always_inline void warn_rcu_exit(bool rcu)</div><div class='ctx'> {</div><div class='ctx'> 	if (rcu)</div><div class='del'>-		ct_state_inc(RCU_DYNTICKS_IDX);</div><div class='add'>+		ct_state_inc(CT_RCU_WATCHING);</div><div class='ctx'> 	preempt_enable_notrace();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/context_tracking_irq.h b/include/linux/context_tracking_irq.h<br/>index c50b5670c4a5..197916ee91a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/context_tracking_irq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/context_tracking_irq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/context_tracking_irq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/context_tracking_irq.h</a></div><div class='hunk'>@@ -10,12 +10,12 @@ void ct_irq_exit_irqson(void);</div><div class='ctx'> void ct_nmi_enter(void);</div><div class='ctx'> void ct_nmi_exit(void);</div><div class='ctx'> #else</div><div class='del'>-static inline void ct_irq_enter(void) { }</div><div class='del'>-static inline void ct_irq_exit(void) { }</div><div class='add'>+static __always_inline void ct_irq_enter(void) { }</div><div class='add'>+static __always_inline void ct_irq_exit(void) { }</div><div class='ctx'> static inline void ct_irq_enter_irqson(void) { }</div><div class='ctx'> static inline void ct_irq_exit_irqson(void) { }</div><div class='del'>-static inline void ct_nmi_enter(void) { }</div><div class='del'>-static inline void ct_nmi_exit(void) { }</div><div class='add'>+static __always_inline void ct_nmi_enter(void) { }</div><div class='add'>+static __always_inline void ct_nmi_exit(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h<br/>index bbff5f7f8803..0b81248aa03e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/context_tracking_state.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/context_tracking_state.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/context_tracking_state.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/context_tracking_state.h</a></div><div class='hunk'>@@ -7,23 +7,17 @@</div><div class='ctx'> #include &lt;linux/context_tracking_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Offset to allow distinguishing irq vs. task-based idle entry/exit. */</div><div class='del'>-#define DYNTICK_IRQ_NONIDLE	((LONG_MAX / 2) + 1)</div><div class='add'>+#define CT_NESTING_IRQ_NONIDLE	((LONG_MAX / 2) + 1)</div><div class='ctx'> </div><div class='ctx'> enum ctx_state {</div><div class='del'>-	CONTEXT_DISABLED	= -1,	/* returned by ct_state() if unknown */</div><div class='del'>-	CONTEXT_KERNEL		= 0,</div><div class='del'>-	CONTEXT_IDLE		= 1,</div><div class='del'>-	CONTEXT_USER		= 2,</div><div class='del'>-	CONTEXT_GUEST		= 3,</div><div class='del'>-	CONTEXT_MAX		= 4,</div><div class='add'>+	CT_STATE_DISABLED	= -1,	/* returned by ct_state() if unknown */</div><div class='add'>+	CT_STATE_KERNEL		= 0,</div><div class='add'>+	CT_STATE_IDLE		= 1,</div><div class='add'>+	CT_STATE_USER		= 2,</div><div class='add'>+	CT_STATE_GUEST		= 3,</div><div class='add'>+	CT_STATE_MAX		= 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Even value for idle, else odd. */</div><div class='del'>-#define RCU_DYNTICKS_IDX CONTEXT_MAX</div><div class='del'>-</div><div class='del'>-#define CT_STATE_MASK (CONTEXT_MAX - 1)</div><div class='del'>-#define CT_DYNTICKS_MASK (~CT_STATE_MASK)</div><div class='del'>-</div><div class='ctx'> struct context_tracking {</div><div class='ctx'> #ifdef CONFIG_CONTEXT_TRACKING_USER</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -39,14 +33,50 @@ struct context_tracking {</div><div class='ctx'> 	atomic_t state;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_CONTEXT_TRACKING_IDLE</div><div class='del'>-	long dynticks_nesting;		/* Track process nesting level. */</div><div class='del'>-	long dynticks_nmi_nesting;	/* Track irq/NMI nesting level. */</div><div class='add'>+	long nesting;		/* Track process nesting level. */</div><div class='add'>+	long nmi_nesting;	/* Track irq/NMI nesting level. */</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * We cram two different things within the same atomic variable:</div><div class='add'>+ *</div><div class='add'>+ *                     CT_RCU_WATCHING_START  CT_STATE_START</div><div class='add'>+ *                                |                |</div><div class='add'>+ *                                v                v</div><div class='add'>+ *     MSB [ RCU watching counter ][ context_state ] LSB</div><div class='add'>+ *         ^                       ^</div><div class='add'>+ *         |                       |</div><div class='add'>+ * CT_RCU_WATCHING_END        CT_STATE_END</div><div class='add'>+ *</div><div class='add'>+ * Bits are used from the LSB upwards, so unused bits (if any) will always be in</div><div class='add'>+ * upper bits of the variable.</div><div class='add'>+ */</div><div class='ctx'> #ifdef CONFIG_CONTEXT_TRACKING</div><div class='add'>+#define CT_SIZE (sizeof(((struct context_tracking *)0)-&gt;state) * BITS_PER_BYTE)</div><div class='add'>+</div><div class='add'>+#define CT_STATE_WIDTH bits_per(CT_STATE_MAX - 1)</div><div class='add'>+#define CT_STATE_START 0</div><div class='add'>+#define CT_STATE_END   (CT_STATE_START + CT_STATE_WIDTH - 1)</div><div class='add'>+</div><div class='add'>+#define CT_RCU_WATCHING_MAX_WIDTH (CT_SIZE - CT_STATE_WIDTH)</div><div class='add'>+#define CT_RCU_WATCHING_WIDTH     (IS_ENABLED(CONFIG_RCU_DYNTICKS_TORTURE) ? 2 : CT_RCU_WATCHING_MAX_WIDTH)</div><div class='add'>+#define CT_RCU_WATCHING_START     (CT_STATE_END + 1)</div><div class='add'>+#define CT_RCU_WATCHING_END       (CT_RCU_WATCHING_START + CT_RCU_WATCHING_WIDTH - 1)</div><div class='add'>+#define CT_RCU_WATCHING           BIT(CT_RCU_WATCHING_START)</div><div class='add'>+</div><div class='add'>+#define CT_STATE_MASK        GENMASK(CT_STATE_END,        CT_STATE_START)</div><div class='add'>+#define CT_RCU_WATCHING_MASK GENMASK(CT_RCU_WATCHING_END, CT_RCU_WATCHING_START)</div><div class='add'>+</div><div class='add'>+#define CT_UNUSED_WIDTH (CT_RCU_WATCHING_MAX_WIDTH - CT_RCU_WATCHING_WIDTH)</div><div class='add'>+</div><div class='add'>+static_assert(CT_STATE_WIDTH        +</div><div class='add'>+	      CT_RCU_WATCHING_WIDTH +</div><div class='add'>+	      CT_UNUSED_WIDTH       ==</div><div class='add'>+	      CT_SIZE);</div><div class='add'>+</div><div class='ctx'> DECLARE_PER_CPU(struct context_tracking, context_tracking);</div><div class='del'>-#endif</div><div class='add'>+#endif	/* CONFIG_CONTEXT_TRACKING */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CONTEXT_TRACKING_USER</div><div class='ctx'> static __always_inline int __ct_state(void)</div><div class='hunk'>@@ -56,47 +86,47 @@ static __always_inline int __ct_state(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CONTEXT_TRACKING_IDLE</div><div class='del'>-static __always_inline int ct_dynticks(void)</div><div class='add'>+static __always_inline int ct_rcu_watching(void)</div><div class='ctx'> {</div><div class='del'>-	return atomic_read(this_cpu_ptr(&amp;context_tracking.state)) &amp; CT_DYNTICKS_MASK;</div><div class='add'>+	return atomic_read(this_cpu_ptr(&amp;context_tracking.state)) &amp; CT_RCU_WATCHING_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline int ct_dynticks_cpu(int cpu)</div><div class='add'>+static __always_inline int ct_rcu_watching_cpu(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct context_tracking *ct = per_cpu_ptr(&amp;context_tracking, cpu);</div><div class='ctx'> </div><div class='del'>-	return atomic_read(&amp;ct-&gt;state) &amp; CT_DYNTICKS_MASK;</div><div class='add'>+	return atomic_read(&amp;ct-&gt;state) &amp; CT_RCU_WATCHING_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline int ct_dynticks_cpu_acquire(int cpu)</div><div class='add'>+static __always_inline int ct_rcu_watching_cpu_acquire(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct context_tracking *ct = per_cpu_ptr(&amp;context_tracking, cpu);</div><div class='ctx'> </div><div class='del'>-	return atomic_read_acquire(&amp;ct-&gt;state) &amp; CT_DYNTICKS_MASK;</div><div class='add'>+	return atomic_read_acquire(&amp;ct-&gt;state) &amp; CT_RCU_WATCHING_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline long ct_dynticks_nesting(void)</div><div class='add'>+static __always_inline long ct_nesting(void)</div><div class='ctx'> {</div><div class='del'>-	return __this_cpu_read(context_tracking.dynticks_nesting);</div><div class='add'>+	return __this_cpu_read(context_tracking.nesting);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline long ct_dynticks_nesting_cpu(int cpu)</div><div class='add'>+static __always_inline long ct_nesting_cpu(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct context_tracking *ct = per_cpu_ptr(&amp;context_tracking, cpu);</div><div class='ctx'> </div><div class='del'>-	return ct-&gt;dynticks_nesting;</div><div class='add'>+	return ct-&gt;nesting;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline long ct_dynticks_nmi_nesting(void)</div><div class='add'>+static __always_inline long ct_nmi_nesting(void)</div><div class='ctx'> {</div><div class='del'>-	return __this_cpu_read(context_tracking.dynticks_nmi_nesting);</div><div class='add'>+	return __this_cpu_read(context_tracking.nmi_nesting);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline long ct_dynticks_nmi_nesting_cpu(int cpu)</div><div class='add'>+static __always_inline long ct_nmi_nesting_cpu(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct context_tracking *ct = per_cpu_ptr(&amp;context_tracking, cpu);</div><div class='ctx'> </div><div class='del'>-	return ct-&gt;dynticks_nmi_nesting;</div><div class='add'>+	return ct-&gt;nmi_nesting;</div><div class='ctx'> }</div><div class='ctx'> #endif /* #ifdef CONFIG_CONTEXT_TRACKING_IDLE */</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +143,7 @@ static __always_inline bool context_tracking_enabled_cpu(int cpu)</div><div class='ctx'> 	return context_tracking_enabled() &amp;&amp; per_cpu(context_tracking.active, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool context_tracking_enabled_this_cpu(void)</div><div class='add'>+static __always_inline bool context_tracking_enabled_this_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	return context_tracking_enabled() &amp;&amp; __this_cpu_read(context_tracking.active);</div><div class='ctx'> }</div><div class='hunk'>@@ -123,14 +153,14 @@ static inline bool context_tracking_enabled_this_cpu(void)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the current cpu's context tracking state if context tracking</div><div class='ctx'>  * is enabled.  If context tracking is disabled, returns</div><div class='del'>- * CONTEXT_DISABLED.  This should be used primarily for debugging.</div><div class='add'>+ * CT_STATE_DISABLED.  This should be used primarily for debugging.</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline int ct_state(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!context_tracking_enabled())</div><div class='del'>-		return CONTEXT_DISABLED;</div><div class='add'>+		return CT_STATE_DISABLED;</div><div class='ctx'> </div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> 	ret = __ct_state();</div><div class='head'>diff --git a/include/linux/coredump.h b/include/linux/coredump.h<br/>index d3eba4360150..68861da4cf7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/coredump.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/coredump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/coredump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/coredump.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #ifdef CONFIG_COREDUMP</div><div class='ctx'> struct core_vma_metadata {</div><div class='ctx'> 	unsigned long start, end;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	vm_flags_t flags;</div><div class='ctx'> 	unsigned long dump_size;</div><div class='ctx'> 	unsigned long pgoff;</div><div class='ctx'> 	struct file   *file;</div><div class='hunk'>@@ -28,8 +28,11 @@ struct coredump_params {</div><div class='ctx'> 	int vma_count;</div><div class='ctx'> 	size_t vma_data_size;</div><div class='ctx'> 	struct core_vma_metadata *vma_meta;</div><div class='add'>+	struct pid *pid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+extern unsigned int core_file_note_size_limit;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These are the only things you should do on a core-file: use only these</div><div class='ctx'>  * functions to write out all the necessary info.</div><div class='hunk'>@@ -40,9 +43,31 @@ extern int dump_emit(struct coredump_params *cprm, const void *addr, int nr);</div><div class='ctx'> extern int dump_align(struct coredump_params *cprm, int align);</div><div class='ctx'> int dump_user_range(struct coredump_params *cprm, unsigned long start,</div><div class='ctx'> 		    unsigned long len);</div><div class='del'>-extern void do_coredump(const kernel_siginfo_t *siginfo);</div><div class='add'>+extern void vfs_coredump(const kernel_siginfo_t *siginfo);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Logging for the coredump code, ratelimited.</div><div class='add'>+ * The TGID and comm fields are added to the message.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define __COREDUMP_PRINTK(Level, Format, ...) \</div><div class='add'>+	do {	\</div><div class='add'>+		char comm[TASK_COMM_LEN];	\</div><div class='add'>+		/* This will always be NUL terminated. */ \</div><div class='add'>+		memcpy(comm, current-&gt;comm, sizeof(comm)); \</div><div class='add'>+		printk_ratelimited(Level "coredump: %d(%*pE): " Format "\n",	\</div><div class='add'>+			task_tgid_vnr(current), (int)strlen(comm), comm, ##__VA_ARGS__);	\</div><div class='add'>+	} while (0)	\</div><div class='add'>+</div><div class='add'>+#define coredump_report(fmt, ...) __COREDUMP_PRINTK(KERN_INFO, fmt, ##__VA_ARGS__)</div><div class='add'>+#define coredump_report_failure(fmt, ...) __COREDUMP_PRINTK(KERN_WARNING, fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #else</div><div class='del'>-static inline void do_coredump(const kernel_siginfo_t *siginfo) {}</div><div class='add'>+static inline void vfs_coredump(const kernel_siginfo_t *siginfo) {}</div><div class='add'>+</div><div class='add'>+#define coredump_report(...)</div><div class='add'>+#define coredump_report_failure(...)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_COREDUMP) &amp;&amp; defined(CONFIG_SYSCTL)</div><div class='head'>diff --git a/include/linux/coresight-pmu.h b/include/linux/coresight-pmu.h<br/>index 51ac441a37c3..89b0ac0014b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/coresight-pmu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/coresight-pmu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/coresight-pmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/coresight-pmu.h</a></div><div class='hunk'>@@ -49,12 +49,21 @@</div><div class='ctx'>  * Interpretation of the PERF_RECORD_AUX_OUTPUT_HW_ID payload.</div><div class='ctx'>  * Used to associate a CPU with the CoreSight Trace ID.</div><div class='ctx'>  * [07:00] - Trace ID - uses 8 bits to make value easy to read in file.</div><div class='del'>- * [59:08] - Unused (SBZ)</div><div class='del'>- * [63:60] - Version</div><div class='add'>+ * [39:08] - Sink ID - as reported in /sys/bus/event_source/devices/cs_etm/sinks/</div><div class='add'>+ *	      Added in minor version 1.</div><div class='add'>+ * [55:40] - Unused (SBZ)</div><div class='add'>+ * [59:56] - Minor Version - previously existing fields are compatible with</div><div class='add'>+ *	      all minor versions.</div><div class='add'>+ * [63:60] - Major Version - previously existing fields mean different things</div><div class='add'>+ *	      in new major versions.</div><div class='ctx'>  */</div><div class='ctx'> #define CS_AUX_HW_ID_TRACE_ID_MASK	GENMASK_ULL(7, 0)</div><div class='del'>-#define CS_AUX_HW_ID_VERSION_MASK	GENMASK_ULL(63, 60)</div><div class='add'>+#define CS_AUX_HW_ID_SINK_ID_MASK	GENMASK_ULL(39, 8)</div><div class='ctx'> </div><div class='del'>-#define CS_AUX_HW_ID_CURR_VERSION 0</div><div class='add'>+#define CS_AUX_HW_ID_MINOR_VERSION_MASK	GENMASK_ULL(59, 56)</div><div class='add'>+#define CS_AUX_HW_ID_MAJOR_VERSION_MASK	GENMASK_ULL(63, 60)</div><div class='add'>+</div><div class='add'>+#define CS_AUX_HW_ID_MAJOR_VERSION 0</div><div class='add'>+#define CS_AUX_HW_ID_MINOR_VERSION 1</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/coresight.h b/include/linux/coresight.h<br/>index a4cb7dd6ca23..2b48be97fcd0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/coresight.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/coresight.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/coresight.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/coresight.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Peripheral id registers (0xFD0-0xFEC) */</div><div class='ctx'> #define CORESIGHT_PERIPHIDR4	0xfd0</div><div class='hunk'>@@ -35,7 +36,7 @@</div><div class='ctx'> </div><div class='ctx'> #define CORESIGHT_UNLOCK	0xc5acce55</div><div class='ctx'> </div><div class='del'>-extern struct bus_type coresight_bustype;</div><div class='add'>+extern const struct bus_type coresight_bustype;</div><div class='ctx'> </div><div class='ctx'> enum coresight_dev_type {</div><div class='ctx'> 	CORESIGHT_DEV_TYPE_SINK,</div><div class='hunk'>@@ -70,7 +71,8 @@ enum coresight_dev_subtype_source {</div><div class='ctx'> </div><div class='ctx'> enum coresight_dev_subtype_helper {</div><div class='ctx'> 	CORESIGHT_DEV_SUBTYPE_HELPER_CATU,</div><div class='del'>-	CORESIGHT_DEV_SUBTYPE_HELPER_ECT_CTI</div><div class='add'>+	CORESIGHT_DEV_SUBTYPE_HELPER_ECT_CTI,</div><div class='add'>+	CORESIGHT_DEV_SUBTYPE_HELPER_CTCU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -171,6 +173,9 @@ struct coresight_desc {</div><div class='ctx'>  * @dest_dev:	a @coresight_device representation of the component</div><div class='ctx'> 		connected to @src_port. NULL until the device is created</div><div class='ctx'>  * @link: Representation of the connection as a sysfs link.</div><div class='add'>+ * @filter_src_fwnode: filter source component's fwnode handle.</div><div class='add'>+ * @filter_src_dev: a @coresight_device representation of the component that</div><div class='add'>+		needs to be filtered.</div><div class='ctx'>  *</div><div class='ctx'>  * The full connection structure looks like this, where in_conns store</div><div class='ctx'>  * references to same connection as the source device's out_conns.</div><div class='hunk'>@@ -199,8 +204,10 @@ struct coresight_connection {</div><div class='ctx'> 	struct coresight_device *dest_dev;</div><div class='ctx'> 	struct coresight_sysfs_link *link;</div><div class='ctx'> 	struct coresight_device *src_dev;</div><div class='del'>-	atomic_t src_refcnt;</div><div class='del'>-	atomic_t dest_refcnt;</div><div class='add'>+	struct fwnode_handle *filter_src_fwnode;</div><div class='add'>+	struct coresight_device *filter_src_dev;</div><div class='add'>+	int src_refcnt;</div><div class='add'>+	int dest_refcnt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -217,6 +224,24 @@ struct coresight_sysfs_link {</div><div class='ctx'> 	const char *target_name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* architecturally we have 128 IDs some of which are reserved */</div><div class='add'>+#define CORESIGHT_TRACE_IDS_MAX 128</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Trace ID map.</div><div class='add'>+ *</div><div class='add'>+ * @used_ids:	Bitmap to register available (bit = 0) and in use (bit = 1) IDs.</div><div class='add'>+ *		Initialised so that the reserved IDs are permanently marked as</div><div class='add'>+ *		in use.</div><div class='add'>+ * @perf_cs_etm_session_active: Number of Perf sessions using this ID map.</div><div class='add'>+ */</div><div class='add'>+struct coresight_trace_id_map {</div><div class='add'>+	DECLARE_BITMAP(used_ids, CORESIGHT_TRACE_IDS_MAX);</div><div class='add'>+	atomic_t __percpu *cpu_map;</div><div class='add'>+	atomic_t perf_cs_etm_session_active;</div><div class='add'>+	raw_spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct coresight_device - representation of a device as used by the framework</div><div class='ctx'>  * @pdata:	Platform data with device connections associated to this device.</div><div class='hunk'>@@ -226,13 +251,22 @@ struct coresight_sysfs_link {</div><div class='ctx'>  *		by @coresight_ops.</div><div class='ctx'>  * @access:	Device i/o access abstraction for this device.</div><div class='ctx'>  * @dev:	The device entity associated to this component.</div><div class='del'>- * @refcnt:	keep track of what is in use.</div><div class='add'>+ * @mode:	The device mode, i.e sysFS, Perf or disabled. This is actually</div><div class='add'>+ *		an 'enum cs_mode' but stored in an atomic type. Access is always</div><div class='add'>+ *		through atomic APIs, ensuring SMP-safe synchronisation between</div><div class='add'>+ *		racing from sysFS and Perf mode. A compare-and-exchange</div><div class='add'>+ *		operation is done to atomically claim one mode or the other.</div><div class='add'>+ * @refcnt:	keep track of what is in use. Only access this outside of the</div><div class='add'>+ *		device's spinlock when the coresight_mutex held and mode ==</div><div class='add'>+ *		CS_MODE_SYSFS. Otherwise it must be accessed from inside the</div><div class='add'>+ *		spinlock.</div><div class='ctx'>  * @orphan:	true if the component has connections that haven't been linked.</div><div class='del'>- * @enable:	'true' if component is currently part of an active path.</div><div class='del'>- * @activated:	'true' only if a _sink_ has been activated.  A sink can be</div><div class='del'>- *		activated but not yet enabled.  Enabling for a _sink_</div><div class='del'>- *		happens when a source has been selected and a path is enabled</div><div class='del'>- *		from source to that sink.</div><div class='add'>+ * @sysfs_sink_activated: 'true' when a sink has been selected for use via sysfs</div><div class='add'>+ *		by writing a 1 to the 'enable_sink' file.  A sink can be</div><div class='add'>+ *		activated but not yet enabled.  Enabling for a _sink_ happens</div><div class='add'>+ *		when a source has been selected and a path is enabled from</div><div class='add'>+ *		source to that sink. A sink can also become enabled but not</div><div class='add'>+ *		activated if it's used via Perf.</div><div class='ctx'>  * @ea:		Device attribute for sink representation under PMU directory.</div><div class='ctx'>  * @def_sink:	cached reference to default sink found for this device.</div><div class='ctx'>  * @nr_links:   number of sysfs links created to other components from this</div><div class='hunk'>@@ -250,20 +284,21 @@ struct coresight_device {</div><div class='ctx'> 	const struct coresight_ops *ops;</div><div class='ctx'> 	struct csdev_access access;</div><div class='ctx'> 	struct device dev;</div><div class='del'>-	atomic_t refcnt;</div><div class='add'>+	atomic_t mode;</div><div class='add'>+	int refcnt;</div><div class='ctx'> 	bool orphan;</div><div class='del'>-	bool enable;	/* true only if configured as part of a path */</div><div class='ctx'> 	/* sink specific fields */</div><div class='del'>-	bool activated;	/* true only if a sink is part of a path */</div><div class='add'>+	bool sysfs_sink_activated;</div><div class='ctx'> 	struct dev_ext_attribute *ea;</div><div class='ctx'> 	struct coresight_device *def_sink;</div><div class='add'>+	struct coresight_trace_id_map perf_sink_id_map;</div><div class='ctx'> 	/* sysfs links between components */</div><div class='ctx'> 	int nr_links;</div><div class='ctx'> 	bool has_conns_grp;</div><div class='ctx'> 	/* system configuration and feature lists */</div><div class='ctx'> 	struct list_head feature_csdev_list;</div><div class='ctx'> 	struct list_head config_csdev_list;</div><div class='del'>-	spinlock_t cscfg_csdev_lock;</div><div class='add'>+	raw_spinlock_t cscfg_csdev_lock;</div><div class='ctx'> 	void *active_cscfg_ctxt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -291,17 +326,31 @@ static struct coresight_dev_list (var) = {				\</div><div class='ctx'> </div><div class='ctx'> #define to_coresight_device(d) container_of(d, struct coresight_device, dev)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct coresight_path - data needed by enable/disable path</div><div class='add'>+ * @path_list:		path from source to sink.</div><div class='add'>+ * @trace_id:		trace_id of the whole path.</div><div class='add'>+ * @handle:		handle of the aux_event.</div><div class='add'>+ */</div><div class='add'>+struct coresight_path {</div><div class='add'>+	struct list_head		path_list;</div><div class='add'>+	u8				trace_id;</div><div class='add'>+	struct perf_output_handle	*handle;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum cs_mode {</div><div class='ctx'> 	CS_MODE_DISABLED,</div><div class='ctx'> 	CS_MODE_SYSFS,</div><div class='ctx'> 	CS_MODE_PERF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define coresight_ops(csdev)	csdev-&gt;ops</div><div class='ctx'> #define source_ops(csdev)	csdev-&gt;ops-&gt;source_ops</div><div class='ctx'> #define sink_ops(csdev)		csdev-&gt;ops-&gt;sink_ops</div><div class='ctx'> #define link_ops(csdev)		csdev-&gt;ops-&gt;link_ops</div><div class='ctx'> #define helper_ops(csdev)	csdev-&gt;ops-&gt;helper_ops</div><div class='ctx'> #define ect_ops(csdev)		csdev-&gt;ops-&gt;ect_ops</div><div class='add'>+#define panic_ops(csdev)	csdev-&gt;ops-&gt;panic_ops</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct coresight_ops_sink - basic operations for a sink</div><div class='hunk'>@@ -314,7 +363,7 @@ enum cs_mode {</div><div class='ctx'>  */</div><div class='ctx'> struct coresight_ops_sink {</div><div class='ctx'> 	int (*enable)(struct coresight_device *csdev, enum cs_mode mode,</div><div class='del'>-		      void *data);</div><div class='add'>+		      struct coresight_path *path);</div><div class='ctx'> 	int (*disable)(struct coresight_device *csdev);</div><div class='ctx'> 	void *(*alloc_buffer)(struct coresight_device *csdev,</div><div class='ctx'> 			      struct perf_event *event, void **pages,</div><div class='hunk'>@@ -347,13 +396,17 @@ struct coresight_ops_link {</div><div class='ctx'>  *		is associated to.</div><div class='ctx'>  * @enable:	enables tracing for a source.</div><div class='ctx'>  * @disable:	disables tracing for a source.</div><div class='add'>+ * @resume_perf: resumes tracing for a source in perf session.</div><div class='add'>+ * @pause_perf:	pauses tracing for a source in perf session.</div><div class='ctx'>  */</div><div class='ctx'> struct coresight_ops_source {</div><div class='ctx'> 	int (*cpu_id)(struct coresight_device *csdev);</div><div class='ctx'> 	int (*enable)(struct coresight_device *csdev, struct perf_event *event,</div><div class='del'>-		      enum cs_mode mode);</div><div class='add'>+		      enum cs_mode mode, struct coresight_path *path);</div><div class='ctx'> 	void (*disable)(struct coresight_device *csdev,</div><div class='ctx'> 			struct perf_event *event);</div><div class='add'>+	int (*resume_perf)(struct coresight_device *csdev);</div><div class='add'>+	void (*pause_perf)(struct coresight_device *csdev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -367,19 +420,31 @@ struct coresight_ops_source {</div><div class='ctx'>  */</div><div class='ctx'> struct coresight_ops_helper {</div><div class='ctx'> 	int (*enable)(struct coresight_device *csdev, enum cs_mode mode,</div><div class='del'>-		      void *data);</div><div class='del'>-	int (*disable)(struct coresight_device *csdev, void *data);</div><div class='add'>+		      struct coresight_path *path);</div><div class='add'>+	int (*disable)(struct coresight_device *csdev,</div><div class='add'>+		       struct coresight_path *path);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct coresight_ops_panic - Generic device ops for panic handing</div><div class='add'>+ *</div><div class='add'>+ * @sync	: Sync the device register state/trace data</div><div class='add'>+ */</div><div class='add'>+struct coresight_ops_panic {</div><div class='add'>+	int (*sync)(struct coresight_device *csdev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct coresight_ops {</div><div class='add'>+	int (*trace_id)(struct coresight_device *csdev, enum cs_mode mode,</div><div class='add'>+			struct coresight_device *sink);</div><div class='ctx'> 	const struct coresight_ops_sink *sink_ops;</div><div class='ctx'> 	const struct coresight_ops_link *link_ops;</div><div class='ctx'> 	const struct coresight_ops_source *source_ops;</div><div class='ctx'> 	const struct coresight_ops_helper *helper_ops;</div><div class='add'>+	const struct coresight_ops_panic *panic_ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_CORESIGHT)</div><div class='del'>-</div><div class='ctx'> static inline u32 csdev_access_relaxed_read32(struct csdev_access *csa,</div><div class='ctx'> 					      u32 offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -408,32 +473,6 @@ static inline bool is_coresight_device(void __iomem *base)</div><div class='ctx'> 	return cid == CORESIGHT_CID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Attempt to find and enable "APB clock" for the given device</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- *</div><div class='del'>- * clk   - Clock is found and enabled</div><div class='del'>- * NULL  - clock is not found</div><div class='del'>- * ERROR - Clock is found but failed to enable</div><div class='del'>- */</div><div class='del'>-static inline struct clk *coresight_get_enable_apb_pclk(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct clk *pclk;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	pclk = clk_get(dev, "apb_pclk");</div><div class='del'>-	if (IS_ERR(pclk))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ret = clk_prepare_enable(pclk);</div><div class='del'>-	if (ret) {</div><div class='del'>-		clk_put(pclk);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-	return pclk;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define CORESIGHT_PIDRn(i)	(0xFE0 + ((i) * 4))</div><div class='ctx'> </div><div class='ctx'> static inline u32 coresight_get_pid(struct csdev_access *csa)</div><div class='hunk'>@@ -557,9 +596,14 @@ static inline void csdev_access_write64(struct csdev_access *csa, u64 val, u32 o</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_64BIT */</div><div class='ctx'> </div><div class='add'>+static inline bool coresight_is_device_source(struct coresight_device *csdev)</div><div class='add'>+{</div><div class='add'>+	return csdev &amp;&amp; (csdev-&gt;type == CORESIGHT_DEV_TYPE_SOURCE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool coresight_is_percpu_source(struct coresight_device *csdev)</div><div class='ctx'> {</div><div class='del'>-	return csdev &amp;&amp; (csdev-&gt;type == CORESIGHT_DEV_TYPE_SOURCE) &amp;&amp;</div><div class='add'>+	return csdev &amp;&amp; coresight_is_device_source(csdev) &amp;&amp;</div><div class='ctx'> 	       (csdev-&gt;subtype.source_subtype == CORESIGHT_DEV_SUBTYPE_SOURCE_PROC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -569,113 +613,74 @@ static inline bool coresight_is_percpu_sink(struct coresight_device *csdev)</div><div class='ctx'> 	       (csdev-&gt;subtype.sink_subtype == CORESIGHT_DEV_SUBTYPE_SINK_PERCPU_SYSMEM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern struct coresight_device *</div><div class='del'>-coresight_register(struct coresight_desc *desc);</div><div class='del'>-extern void coresight_unregister(struct coresight_device *csdev);</div><div class='del'>-extern int coresight_enable(struct coresight_device *csdev);</div><div class='del'>-extern void coresight_disable(struct coresight_device *csdev);</div><div class='del'>-extern int coresight_timeout(struct csdev_access *csa, u32 offset,</div><div class='del'>-			     int position, int value);</div><div class='del'>-</div><div class='del'>-extern int coresight_claim_device(struct coresight_device *csdev);</div><div class='del'>-extern int coresight_claim_device_unlocked(struct coresight_device *csdev);</div><div class='del'>-</div><div class='del'>-extern void coresight_disclaim_device(struct coresight_device *csdev);</div><div class='del'>-extern void coresight_disclaim_device_unlocked(struct coresight_device *csdev);</div><div class='del'>-extern char *coresight_alloc_device_name(struct coresight_dev_list *devs,</div><div class='del'>-					 struct device *dev);</div><div class='del'>-</div><div class='del'>-extern bool coresight_loses_context_with_cpu(struct device *dev);</div><div class='del'>-</div><div class='del'>-u32 coresight_relaxed_read32(struct coresight_device *csdev, u32 offset);</div><div class='del'>-u32 coresight_read32(struct coresight_device *csdev, u32 offset);</div><div class='del'>-void coresight_write32(struct coresight_device *csdev, u32 val, u32 offset);</div><div class='del'>-void coresight_relaxed_write32(struct coresight_device *csdev,</div><div class='del'>-			       u32 val, u32 offset);</div><div class='del'>-u64 coresight_relaxed_read64(struct coresight_device *csdev, u32 offset);</div><div class='del'>-u64 coresight_read64(struct coresight_device *csdev, u32 offset);</div><div class='del'>-void coresight_relaxed_write64(struct coresight_device *csdev,</div><div class='del'>-			       u64 val, u32 offset);</div><div class='del'>-void coresight_write64(struct coresight_device *csdev, u64 val, u32 offset);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-static inline struct coresight_device *</div><div class='del'>-coresight_register(struct coresight_desc *desc) { return NULL; }</div><div class='del'>-static inline void coresight_unregister(struct coresight_device *csdev) {}</div><div class='del'>-static inline int</div><div class='del'>-coresight_enable(struct coresight_device *csdev) { return -ENOSYS; }</div><div class='del'>-static inline void coresight_disable(struct coresight_device *csdev) {}</div><div class='del'>-</div><div class='del'>-static inline int coresight_timeout(struct csdev_access *csa, u32 offset,</div><div class='del'>-				    int position, int value)</div><div class='del'>-{</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int coresight_claim_device_unlocked(struct coresight_device *csdev)</div><div class='add'>+/*</div><div class='add'>+ * Atomically try to take the device and set a new mode. Returns true on</div><div class='add'>+ * success, false if the device is already taken by someone else.</div><div class='add'>+ */</div><div class='add'>+static inline bool coresight_take_mode(struct coresight_device *csdev,</div><div class='add'>+				       enum cs_mode new_mode)</div><div class='ctx'> {</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='add'>+	int curr = CS_MODE_DISABLED;</div><div class='ctx'> </div><div class='del'>-static inline int coresight_claim_device(struct coresight_device *csdev)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return atomic_try_cmpxchg_acquire(&amp;csdev-&gt;mode, &amp;curr, new_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void coresight_disclaim_device(struct coresight_device *csdev) {}</div><div class='del'>-static inline void coresight_disclaim_device_unlocked(struct coresight_device *csdev) {}</div><div class='del'>-</div><div class='del'>-static inline bool coresight_loses_context_with_cpu(struct device *dev)</div><div class='add'>+static inline enum cs_mode coresight_get_mode(struct coresight_device *csdev)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='add'>+	return atomic_read_acquire(&amp;csdev-&gt;mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 coresight_relaxed_read32(struct coresight_device *csdev, u32 offset)</div><div class='add'>+static inline void coresight_set_mode(struct coresight_device *csdev,</div><div class='add'>+				      enum cs_mode new_mode)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	enum cs_mode current_mode = coresight_get_mode(csdev);</div><div class='ctx'> </div><div class='del'>-static inline u32 coresight_read32(struct coresight_device *csdev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	/*</div><div class='add'>+	 * Changing to a new mode must be done from an already disabled state</div><div class='add'>+	 * unless it's synchronized with coresight_take_mode(). Otherwise the</div><div class='add'>+	 * device is already in use and signifies a locking issue.</div><div class='add'>+	 */</div><div class='add'>+	WARN(new_mode != CS_MODE_DISABLED &amp;&amp; current_mode != CS_MODE_DISABLED &amp;&amp;</div><div class='add'>+	     current_mode != new_mode, "Device already in use\n");</div><div class='ctx'> </div><div class='del'>-static inline void coresight_write32(struct coresight_device *csdev, u32 val, u32 offset)</div><div class='del'>-{</div><div class='add'>+	atomic_set_release(&amp;csdev-&gt;mode, new_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void coresight_relaxed_write32(struct coresight_device *csdev,</div><div class='del'>-					     u32 val, u32 offset)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+struct coresight_device *coresight_register(struct coresight_desc *desc);</div><div class='add'>+void coresight_unregister(struct coresight_device *csdev);</div><div class='add'>+int coresight_enable_sysfs(struct coresight_device *csdev);</div><div class='add'>+void coresight_disable_sysfs(struct coresight_device *csdev);</div><div class='add'>+int coresight_timeout(struct csdev_access *csa, u32 offset, int position, int value);</div><div class='add'>+typedef void (*coresight_timeout_cb_t) (struct csdev_access *, u32, int, int);</div><div class='add'>+int coresight_timeout_action(struct csdev_access *csa, u32 offset, int position, int value,</div><div class='add'>+			     coresight_timeout_cb_t cb);</div><div class='add'>+int coresight_claim_device(struct coresight_device *csdev);</div><div class='add'>+int coresight_claim_device_unlocked(struct coresight_device *csdev);</div><div class='ctx'> </div><div class='del'>-static inline u64 coresight_relaxed_read64(struct coresight_device *csdev,</div><div class='del'>-					   u32 offset)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 coresight_read64(struct coresight_device *csdev, u32 offset)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(1);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void coresight_relaxed_write64(struct coresight_device *csdev,</div><div class='del'>-					     u64 val, u32 offset)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+int coresight_claim_device(struct coresight_device *csdev);</div><div class='add'>+int coresight_claim_device_unlocked(struct coresight_device *csdev);</div><div class='add'>+void coresight_clear_self_claim_tag(struct csdev_access *csa);</div><div class='add'>+void coresight_clear_self_claim_tag_unlocked(struct csdev_access *csa);</div><div class='add'>+void coresight_disclaim_device(struct coresight_device *csdev);</div><div class='add'>+void coresight_disclaim_device_unlocked(struct coresight_device *csdev);</div><div class='add'>+char *coresight_alloc_device_name(struct coresight_dev_list *devs,</div><div class='add'>+					 struct device *dev);</div><div class='ctx'> </div><div class='del'>-static inline void coresight_write64(struct coresight_device *csdev, u64 val, u32 offset)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+bool coresight_loses_context_with_cpu(struct device *dev);</div><div class='ctx'> </div><div class='del'>-#endif		/* IS_ENABLED(CONFIG_CORESIGHT) */</div><div class='add'>+u32 coresight_relaxed_read32(struct coresight_device *csdev, u32 offset);</div><div class='add'>+u32 coresight_read32(struct coresight_device *csdev, u32 offset);</div><div class='add'>+void coresight_write32(struct coresight_device *csdev, u32 val, u32 offset);</div><div class='add'>+void coresight_relaxed_write32(struct coresight_device *csdev,</div><div class='add'>+			       u32 val, u32 offset);</div><div class='add'>+u64 coresight_relaxed_read64(struct coresight_device *csdev, u32 offset);</div><div class='add'>+u64 coresight_read64(struct coresight_device *csdev, u32 offset);</div><div class='add'>+void coresight_relaxed_write64(struct coresight_device *csdev,</div><div class='add'>+			       u64 val, u32 offset);</div><div class='add'>+void coresight_write64(struct coresight_device *csdev, u64 val, u32 offset);</div><div class='ctx'> </div><div class='del'>-extern int coresight_get_cpu(struct device *dev);</div><div class='add'>+int coresight_get_cpu(struct device *dev);</div><div class='add'>+int coresight_get_static_trace_id(struct device *dev, u32 *id);</div><div class='ctx'> </div><div class='ctx'> struct coresight_platform_data *coresight_get_platform_data(struct device *dev);</div><div class='ctx'> struct coresight_connection *</div><div class='hunk'>@@ -692,4 +697,13 @@ coresight_find_output_type(struct coresight_platform_data *pdata,</div><div class='ctx'> 			   enum coresight_dev_type type,</div><div class='ctx'> 			   union coresight_dev_subtype subtype);</div><div class='ctx'> </div><div class='add'>+int coresight_init_driver(const char *drv, struct amba_driver *amba_drv,</div><div class='add'>+			  struct platform_driver *pdev_drv, struct module *owner);</div><div class='add'>+</div><div class='add'>+void coresight_remove_driver(struct amba_driver *amba_drv,</div><div class='add'>+			     struct platform_driver *pdev_drv);</div><div class='add'>+int coresight_etm_get_trace_id(struct coresight_device *csdev, enum cs_mode mode,</div><div class='add'>+			       struct coresight_device *sink);</div><div class='add'>+int coresight_get_enable_clocks(struct device *dev, struct clk **pclk,</div><div class='add'>+				struct clk **atclk);</div><div class='ctx'> #endif		/* _LINUX_COREISGHT_H */</div><div class='head'>diff --git a/include/linux/counter.h b/include/linux/counter.h<br/>index 702e9108bbb4..f208e867dd0f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/counter.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/counter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/counter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/counter.h</a></div><div class='hunk'>@@ -6,14 +6,15 @@</div><div class='ctx'> #ifndef _COUNTER_H_</div><div class='ctx'> #define _COUNTER_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kfifo.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock_types.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;uapi/linux/counter.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct counter_device;</div><div class='hunk'>@@ -359,7 +360,6 @@ struct counter_ops {</div><div class='ctx'>  * @num_counts:		number of Counts specified in @counts</div><div class='ctx'>  * @ext:		optional array of Counter device extensions</div><div class='ctx'>  * @num_ext:		number of Counter device extensions specified in @ext</div><div class='del'>- * @priv:		optional private data supplied by driver</div><div class='ctx'>  * @dev:		internal device structure</div><div class='ctx'>  * @chrdev:		internal character device structure</div><div class='ctx'>  * @events_list:	list of current watching Counter events</div><div class='hunk'>@@ -580,6 +580,9 @@ struct counter_array {</div><div class='ctx'> #define COUNTER_COMP_CEILING(_read, _write) \</div><div class='ctx'> 	COUNTER_COMP_COUNT_U64("ceiling", _read, _write)</div><div class='ctx'> </div><div class='add'>+#define COUNTER_COMP_COMPARE(_read, _write) \</div><div class='add'>+	COUNTER_COMP_COUNT_U64("compare", _read, _write)</div><div class='add'>+</div><div class='ctx'> #define COUNTER_COMP_COUNT_MODE(_read, _write, _available) \</div><div class='ctx'> { \</div><div class='ctx'> 	.type = COUNTER_COMP_COUNT_MODE, \</div><div class='hunk'>@@ -602,6 +605,9 @@ struct counter_array {</div><div class='ctx'> #define COUNTER_COMP_FLOOR(_read, _write) \</div><div class='ctx'> 	COUNTER_COMP_COUNT_U64("floor", _read, _write)</div><div class='ctx'> </div><div class='add'>+#define COUNTER_COMP_FREQUENCY(_read) \</div><div class='add'>+	COUNTER_COMP_SIGNAL_U64("frequency", _read, NULL)</div><div class='add'>+</div><div class='ctx'> #define COUNTER_COMP_POLARITY(_read, _write, _available) \</div><div class='ctx'> { \</div><div class='ctx'> 	.type = COUNTER_COMP_SIGNAL_POLARITY, \</div><div class='head'>diff --git a/include/linux/cper.h b/include/linux/cper.h<br/>index 265b0f8fc0b3..5b1236d8c65b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cper.h</a></div><div class='hunk'>@@ -89,6 +89,10 @@ enum {</div><div class='ctx'> #define CPER_NOTIFY_DMAR						\</div><div class='ctx'> 	GUID_INIT(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E,	\</div><div class='ctx'> 		  0x72, 0x2D, 0xEB, 0x41)</div><div class='add'>+/* CXL Protocol Error Section */</div><div class='add'>+#define CPER_SEC_CXL_PROT_ERR						\</div><div class='add'>+	GUID_INIT(0x80B9EFB4, 0x52B5, 0x4DE3, 0xA7, 0x77, 0x68, 0x78,	\</div><div class='add'>+		  0x4B, 0x77, 0x10, 0x48)</div><div class='ctx'> </div><div class='ctx'> /* CXL Event record UUIDs are formatted as GUIDs and reported in section type */</div><div class='ctx'> /*</div><div class='hunk'>@@ -293,11 +297,11 @@ enum {</div><div class='ctx'> #define CPER_ARM_INFO_FLAGS_PROPAGATED		BIT(2)</div><div class='ctx'> #define CPER_ARM_INFO_FLAGS_OVERFLOW		BIT(3)</div><div class='ctx'> </div><div class='del'>-#define CPER_ARM_CACHE_ERROR			0</div><div class='del'>-#define CPER_ARM_TLB_ERROR			1</div><div class='del'>-#define CPER_ARM_BUS_ERROR			2</div><div class='del'>-#define CPER_ARM_VENDOR_ERROR			3</div><div class='del'>-#define CPER_ARM_MAX_TYPE			CPER_ARM_VENDOR_ERROR</div><div class='add'>+#define CPER_ARM_ERR_TYPE_MASK			GENMASK(4,1)</div><div class='add'>+#define CPER_ARM_CACHE_ERROR			BIT(1)</div><div class='add'>+#define CPER_ARM_TLB_ERROR			BIT(2)</div><div class='add'>+#define CPER_ARM_BUS_ERROR			BIT(3)</div><div class='add'>+#define CPER_ARM_VENDOR_ERROR			BIT(4)</div><div class='ctx'> </div><div class='ctx'> #define CPER_ARM_ERR_VALID_TRANSACTION_TYPE	BIT(0)</div><div class='ctx'> #define CPER_ARM_ERR_VALID_OPERATION_TYPE	BIT(1)</div><div class='hunk'>@@ -584,6 +588,8 @@ const char *cper_mem_err_type_str(unsigned int);</div><div class='ctx'> const char *cper_mem_err_status_str(u64 status);</div><div class='ctx'> void cper_print_bits(const char *prefix, unsigned int bits,</div><div class='ctx'> 		     const char * const strs[], unsigned int strs_size);</div><div class='add'>+int cper_bits_to_str(char *buf, int buf_size, unsigned long bits,</div><div class='add'>+		     const char * const strs[], unsigned int strs_size);</div><div class='ctx'> void cper_mem_err_pack(const struct cper_sec_mem_err *,</div><div class='ctx'> 		       struct cper_mem_err_compact *);</div><div class='ctx'> const char *cper_mem_err_unpack(struct trace_seq *,</div><div class='hunk'>@@ -601,4 +607,8 @@ void cper_estatus_print(const char *pfx,</div><div class='ctx'> int cper_estatus_check_header(const struct acpi_hest_generic_status *estatus);</div><div class='ctx'> int cper_estatus_check(const struct acpi_hest_generic_status *estatus);</div><div class='ctx'> </div><div class='add'>+struct cxl_cper_sec_prot_err;</div><div class='add'>+void cxl_cper_print_prot_err(const char *pfx,</div><div class='add'>+			     const struct cxl_cper_sec_prot_err *prot_err);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/cpu.h b/include/linux/cpu.h<br/>index ae5a20cf2f9c..487b3bf2e1ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cpu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpu.h</a></div><div class='hunk'>@@ -16,8 +16,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/node.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/cpuhotplug.h&gt;</div><div class='add'>+#include &lt;linux/cpuhplock.h&gt;</div><div class='ctx'> #include &lt;linux/cpu_smt.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='hunk'>@@ -77,6 +77,13 @@ extern ssize_t cpu_show_gds(struct device *dev,</div><div class='ctx'> 			    struct device_attribute *attr, char *buf);</div><div class='ctx'> extern ssize_t cpu_show_reg_file_data_sampling(struct device *dev,</div><div class='ctx'> 					       struct device_attribute *attr, char *buf);</div><div class='add'>+extern ssize_t cpu_show_ghostwrite(struct device *dev, struct device_attribute *attr, char *buf);</div><div class='add'>+extern ssize_t cpu_show_old_microcode(struct device *dev,</div><div class='add'>+				      struct device_attribute *attr, char *buf);</div><div class='add'>+extern ssize_t cpu_show_indirect_target_selection(struct device *dev,</div><div class='add'>+						  struct device_attribute *attr, char *buf);</div><div class='add'>+extern ssize_t cpu_show_tsa(struct device *dev, struct device_attribute *attr, char *buf);</div><div class='add'>+extern ssize_t cpu_show_vmscape(struct device *dev, struct device_attribute *attr, char *buf);</div><div class='ctx'> </div><div class='ctx'> extern __printf(4, 5)</div><div class='ctx'> struct device *cpu_device_create(struct device *parent, void *drvdata,</div><div class='hunk'>@@ -115,6 +122,7 @@ extern void cpu_maps_update_begin(void);</div><div class='ctx'> extern void cpu_maps_update_done(void);</div><div class='ctx'> int bringup_hibernate_cpu(unsigned int sleep_cpu);</div><div class='ctx'> void bringup_nonboot_cpus(unsigned int max_cpus);</div><div class='add'>+int arch_cpu_rescan_dead_smt_siblings(void);</div><div class='ctx'> </div><div class='ctx'> #else	/* CONFIG_SMP */</div><div class='ctx'> #define cpuhp_tasks_frozen	0</div><div class='hunk'>@@ -129,40 +137,10 @@ static inline void cpu_maps_update_done(void)</div><div class='ctx'> </div><div class='ctx'> static inline int add_cpu(unsigned int cpu) { return 0;}</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='del'>-extern struct bus_type cpu_subsys;</div><div class='del'>-</div><div class='del'>-extern int lockdep_is_cpus_held(void);</div><div class='add'>+static inline int arch_cpu_rescan_dead_smt_siblings(void) { return 0; }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-extern void cpus_write_lock(void);</div><div class='del'>-extern void cpus_write_unlock(void);</div><div class='del'>-extern void cpus_read_lock(void);</div><div class='del'>-extern void cpus_read_unlock(void);</div><div class='del'>-extern int  cpus_read_trylock(void);</div><div class='del'>-extern void lockdep_assert_cpus_held(void);</div><div class='del'>-extern void cpu_hotplug_disable(void);</div><div class='del'>-extern void cpu_hotplug_enable(void);</div><div class='del'>-void clear_tasks_mm_cpumask(int cpu);</div><div class='del'>-int remove_cpu(unsigned int cpu);</div><div class='del'>-int cpu_device_down(struct device *dev);</div><div class='del'>-extern void smp_shutdown_nonboot_cpus(unsigned int primary_cpu);</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_HOTPLUG_CPU */</div><div class='del'>-</div><div class='del'>-static inline void cpus_write_lock(void) { }</div><div class='del'>-static inline void cpus_write_unlock(void) { }</div><div class='del'>-static inline void cpus_read_lock(void) { }</div><div class='del'>-static inline void cpus_read_unlock(void) { }</div><div class='del'>-static inline int  cpus_read_trylock(void) { return true; }</div><div class='del'>-static inline void lockdep_assert_cpus_held(void) { }</div><div class='del'>-static inline void cpu_hotplug_disable(void) { }</div><div class='del'>-static inline void cpu_hotplug_enable(void) { }</div><div class='del'>-static inline int remove_cpu(unsigned int cpu) { return -EPERM; }</div><div class='del'>-static inline void smp_shutdown_nonboot_cpus(unsigned int primary_cpu) { }</div><div class='del'>-#endif	/* !CONFIG_HOTPLUG_CPU */</div><div class='del'>-</div><div class='del'>-DEFINE_LOCK_GUARD_0(cpus_read_lock, cpus_read_lock(), cpus_read_unlock())</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+extern const struct bus_type cpu_subsys;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP_SMP</div><div class='ctx'> extern int freeze_secondary_cpus(int primary);</div><div class='hunk'>@@ -179,7 +157,7 @@ static inline int suspend_disable_secondary_cpus(void)</div><div class='ctx'> }</div><div class='ctx'> static inline void suspend_enable_secondary_cpus(void)</div><div class='ctx'> {</div><div class='del'>-	return thaw_secondary_cpus();</div><div class='add'>+	thaw_secondary_cpus();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_PM_SLEEP_SMP */</div><div class='hunk'>@@ -210,18 +188,45 @@ static inline void arch_cpu_finalize_init(void) { }</div><div class='ctx'> </div><div class='ctx'> void play_idle_precise(u64 duration_ns, u64 latency_ns);</div><div class='ctx'> </div><div class='del'>-static inline void play_idle(unsigned long duration_us)</div><div class='del'>-{</div><div class='del'>-	play_idle_precise(duration_us * NSEC_PER_USEC, U64_MAX);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> void cpuhp_report_idle_dead(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline void cpuhp_report_idle_dead(void) { }</div><div class='ctx'> #endif /* #ifdef CONFIG_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='add'>+enum cpu_attack_vectors {</div><div class='add'>+	CPU_MITIGATE_USER_KERNEL,</div><div class='add'>+	CPU_MITIGATE_USER_USER,</div><div class='add'>+	CPU_MITIGATE_GUEST_HOST,</div><div class='add'>+	CPU_MITIGATE_GUEST_GUEST,</div><div class='add'>+	NR_CPU_ATTACK_VECTORS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum smt_mitigations {</div><div class='add'>+	SMT_MITIGATIONS_OFF,</div><div class='add'>+	SMT_MITIGATIONS_AUTO,</div><div class='add'>+	SMT_MITIGATIONS_ON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_MITIGATIONS</div><div class='ctx'> extern bool cpu_mitigations_off(void);</div><div class='ctx'> extern bool cpu_mitigations_auto_nosmt(void);</div><div class='add'>+extern bool cpu_attack_vector_mitigated(enum cpu_attack_vectors v);</div><div class='add'>+extern enum smt_mitigations smt_mitigations;</div><div class='add'>+#else</div><div class='add'>+static inline bool cpu_mitigations_off(void)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+static inline bool cpu_mitigations_auto_nosmt(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline bool cpu_attack_vector_mitigated(enum cpu_attack_vectors v)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#define smt_mitigations SMT_MITIGATIONS_OFF</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_CPU_H_ */</div><div class='head'>diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h<br/>index a3bdc8a98f2c..2c774fb3c091 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cpu_cooling.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpu_cooling.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpu_cooling.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpu_cooling.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/thermal.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct cpufreq_policy;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/cpu_rmap.h b/include/linux/cpu_rmap.h<br/>index cae324d10965..2fd7ba75362a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cpu_rmap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpu_rmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpu_rmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpu_rmap.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * Copyright 2011 Solarflare Communications Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='hunk'>@@ -32,6 +32,7 @@ struct cpu_rmap {</div><div class='ctx'> #define CPU_RMAP_DIST_INF 0xffff</div><div class='ctx'> </div><div class='ctx'> extern struct cpu_rmap *alloc_cpu_rmap(unsigned int size, gfp_t flags);</div><div class='add'>+extern void cpu_rmap_get(struct cpu_rmap *rmap);</div><div class='ctx'> extern int cpu_rmap_put(struct cpu_rmap *rmap);</div><div class='ctx'> </div><div class='ctx'> extern int cpu_rmap_add(struct cpu_rmap *rmap, void *obj);</div><div class='head'>diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h<br/>index 836d57579828..0465d1e6f72a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cpufreq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpufreq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpufreq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpufreq.h</a></div><div class='hunk'>@@ -26,12 +26,10 @@</div><div class='ctx'>  *********************************************************************/</div><div class='ctx'> /*</div><div class='ctx'>  * Frequency values here are CPU kHz</div><div class='del'>- *</div><div class='del'>- * Maximum transition latency is in nanoseconds - if it's unknown,</div><div class='del'>- * CPUFREQ_ETERNAL shall be used.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define CPUFREQ_ETERNAL			(-1)</div><div class='add'>+#define CPUFREQ_DEFAULT_TRANSITION_LATENCY_NS	NSEC_PER_MSEC</div><div class='add'>+</div><div class='ctx'> #define CPUFREQ_NAME_LEN		16</div><div class='ctx'> /* Print length for names. Extra 1 space for accommodating '\n' in prints */</div><div class='ctx'> #define CPUFREQ_NAME_PLEN		(CPUFREQ_NAME_LEN + 1)</div><div class='hunk'>@@ -144,6 +142,9 @@ struct cpufreq_policy {</div><div class='ctx'> 	/* Per policy boost enabled flag. */</div><div class='ctx'> 	bool			boost_enabled;</div><div class='ctx'> </div><div class='add'>+	/* Per policy boost supported flag. */</div><div class='add'>+	bool			boost_supported;</div><div class='add'>+</div><div class='ctx'> 	 /* Cached frequency lookup from cpufreq_driver_resolve_freq. */</div><div class='ctx'> 	unsigned int cached_target_freq;</div><div class='ctx'> 	unsigned int cached_resolved_idx;</div><div class='hunk'>@@ -167,6 +168,12 @@ struct cpufreq_policy {</div><div class='ctx'> 	struct notifier_block nb_max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+DEFINE_GUARD(cpufreq_policy_write, struct cpufreq_policy *,</div><div class='add'>+	     down_write(&amp;_T-&gt;rwsem), up_write(&amp;_T-&gt;rwsem))</div><div class='add'>+</div><div class='add'>+DEFINE_GUARD(cpufreq_policy_read, struct cpufreq_policy *,</div><div class='add'>+	     down_read(&amp;_T-&gt;rwsem), up_read(&amp;_T-&gt;rwsem))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Used for passing new cpufreq policy data to the cpufreq driver's -&gt;verify()</div><div class='ctx'>  * callback for sanitization.  That callback is only expected to modify the min</div><div class='hunk'>@@ -210,6 +217,9 @@ static inline struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)</div><div class='ctx'> static inline void cpufreq_cpu_put(struct cpufreq_policy *policy) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Scope based cleanup macro for cpufreq_policy kobject reference counting */</div><div class='add'>+DEFINE_FREE(put_cpufreq_policy, struct cpufreq_policy *, if (_T) cpufreq_cpu_put(_T))</div><div class='add'>+</div><div class='ctx'> static inline bool policy_is_inactive(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_empty(policy-&gt;cpus);</div><div class='hunk'>@@ -229,9 +239,6 @@ void disable_cpufreq(void);</div><div class='ctx'> </div><div class='ctx'> u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);</div><div class='ctx'> </div><div class='del'>-struct cpufreq_policy *cpufreq_cpu_acquire(unsigned int cpu);</div><div class='del'>-void cpufreq_cpu_release(struct cpufreq_policy *policy);</div><div class='del'>-int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);</div><div class='ctx'> void refresh_frequency_limits(struct cpufreq_policy *policy);</div><div class='ctx'> void cpufreq_update_policy(unsigned int cpu);</div><div class='ctx'> void cpufreq_update_limits(unsigned int cpu);</div><div class='hunk'>@@ -241,6 +248,12 @@ struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy);</div><div class='ctx'> void cpufreq_enable_fast_switch(struct cpufreq_policy *policy);</div><div class='ctx'> void cpufreq_disable_fast_switch(struct cpufreq_policy *policy);</div><div class='ctx'> bool has_target_index(void);</div><div class='add'>+</div><div class='add'>+DECLARE_PER_CPU(unsigned long, cpufreq_pressure);</div><div class='add'>+static inline unsigned long cpufreq_get_pressure(int cpu)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(per_cpu(cpufreq_pressure, cpu));</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline unsigned int cpufreq_get(unsigned int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -264,6 +277,10 @@ static inline bool cpufreq_supports_freq_invariance(void)</div><div class='ctx'> }</div><div class='ctx'> static inline void disable_cpufreq(void) { }</div><div class='ctx'> static inline void cpufreq_update_limits(unsigned int cpu) { }</div><div class='add'>+static inline unsigned long cpufreq_get_pressure(int cpu)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_FREQ_STAT</div><div class='hunk'>@@ -379,14 +396,14 @@ struct cpufreq_driver {</div><div class='ctx'> 	unsigned int	(*get)(unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> 	/* Called to update policy limits on firmware notifications. */</div><div class='del'>-	void		(*update_limits)(unsigned int cpu);</div><div class='add'>+	void		(*update_limits)(struct cpufreq_policy *policy);</div><div class='ctx'> </div><div class='ctx'> 	/* optional */</div><div class='ctx'> 	int		(*bios_limit)(int cpu, unsigned int *limit);</div><div class='ctx'> </div><div class='ctx'> 	int		(*online)(struct cpufreq_policy *policy);</div><div class='ctx'> 	int		(*offline)(struct cpufreq_policy *policy);</div><div class='del'>-	int		(*exit)(struct cpufreq_policy *policy);</div><div class='add'>+	void		(*exit)(struct cpufreq_policy *policy);</div><div class='ctx'> 	int		(*suspend)(struct cpufreq_policy *policy);</div><div class='ctx'> 	int		(*resume)(struct cpufreq_policy *policy);</div><div class='ctx'> </div><div class='hunk'>@@ -567,12 +584,6 @@ static inline unsigned long cpufreq_scale(unsigned long old, u_int div,</div><div class='ctx'> #define CPUFREQ_POLICY_POWERSAVE	(1)</div><div class='ctx'> #define CPUFREQ_POLICY_PERFORMANCE	(2)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The polling frequency depends on the capability of the processor. Default</div><div class='del'>- * polling frequency is 1000 times the transition latency of the processor.</div><div class='del'>- */</div><div class='del'>-#define LATENCY_MULTIPLIER		(1000)</div><div class='del'>-</div><div class='ctx'> struct cpufreq_governor {</div><div class='ctx'> 	char	name[CPUFREQ_NAME_LEN];</div><div class='ctx'> 	int	(*init)(struct cpufreq_policy *policy);</div><div class='hunk'>@@ -637,6 +648,15 @@ module_exit(__governor##_exit)</div><div class='ctx'> struct cpufreq_governor *cpufreq_default_governor(void);</div><div class='ctx'> struct cpufreq_governor *cpufreq_fallback_governor(void);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_FREQ_GOV_SCHEDUTIL</div><div class='add'>+bool sugov_is_governor(struct cpufreq_policy *policy);</div><div class='add'>+#else</div><div class='add'>+static inline bool sugov_is_governor(struct cpufreq_policy *policy)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void cpufreq_policy_apply_limits(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	if (policy-&gt;max &lt; policy-&gt;cur)</div><div class='hunk'>@@ -758,26 +778,23 @@ struct cpufreq_frequency_table {</div><div class='ctx'> 		else</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,</div><div class='del'>-				    struct cpufreq_frequency_table *table);</div><div class='add'>+int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy);</div><div class='add'>+</div><div class='add'>+int cpufreq_frequency_table_verify(struct cpufreq_policy_data *policy);</div><div class='ctx'> </div><div class='del'>-int cpufreq_frequency_table_verify(struct cpufreq_policy_data *policy,</div><div class='del'>-				   struct cpufreq_frequency_table *table);</div><div class='ctx'> int cpufreq_generic_frequency_table_verify(struct cpufreq_policy_data *policy);</div><div class='ctx'> </div><div class='ctx'> int cpufreq_table_index_unsorted(struct cpufreq_policy *policy,</div><div class='del'>-				 unsigned int target_freq,</div><div class='del'>-				 unsigned int relation);</div><div class='add'>+				 unsigned int target_freq, unsigned int min,</div><div class='add'>+				 unsigned int max, unsigned int relation);</div><div class='ctx'> int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,</div><div class='ctx'> 		unsigned int freq);</div><div class='ctx'> </div><div class='ctx'> ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_FREQ</div><div class='del'>-int cpufreq_boost_trigger_state(int state);</div><div class='del'>-int cpufreq_boost_enabled(void);</div><div class='del'>-int cpufreq_enable_boost_support(void);</div><div class='del'>-bool policy_has_boost_freq(struct cpufreq_policy *policy);</div><div class='add'>+bool cpufreq_boost_enabled(void);</div><div class='add'>+int cpufreq_boost_set_sw(struct cpufreq_policy *policy, int state);</div><div class='ctx'> </div><div class='ctx'> /* Find lowest freq at or above target in a table in ascending order */</div><div class='ctx'> static inline int cpufreq_table_find_index_al(struct cpufreq_policy *policy,</div><div class='hunk'>@@ -832,12 +849,12 @@ static inline int cpufreq_table_find_index_dl(struct cpufreq_policy *policy,</div><div class='ctx'> 	return best;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Works only on sorted freq-tables */</div><div class='del'>-static inline int cpufreq_table_find_index_l(struct cpufreq_policy *policy,</div><div class='del'>-					     unsigned int target_freq,</div><div class='del'>-					     bool efficiencies)</div><div class='add'>+static inline int find_index_l(struct cpufreq_policy *policy,</div><div class='add'>+			       unsigned int target_freq,</div><div class='add'>+			       unsigned int min, unsigned int max,</div><div class='add'>+			       bool efficiencies)</div><div class='ctx'> {</div><div class='del'>-	target_freq = clamp_val(target_freq, policy-&gt;min, policy-&gt;max);</div><div class='add'>+	target_freq = clamp_val(target_freq, min, max);</div><div class='ctx'> </div><div class='ctx'> 	if (policy-&gt;freq_table_sorted == CPUFREQ_TABLE_SORTED_ASCENDING)</div><div class='ctx'> 		return cpufreq_table_find_index_al(policy, target_freq,</div><div class='hunk'>@@ -847,6 +864,14 @@ static inline int cpufreq_table_find_index_l(struct cpufreq_policy *policy,</div><div class='ctx'> 						   efficiencies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Works only on sorted freq-tables */</div><div class='add'>+static inline int cpufreq_table_find_index_l(struct cpufreq_policy *policy,</div><div class='add'>+					     unsigned int target_freq,</div><div class='add'>+					     bool efficiencies)</div><div class='add'>+{</div><div class='add'>+	return find_index_l(policy, target_freq, policy-&gt;min, policy-&gt;max, efficiencies);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Find highest freq at or below target in a table in ascending order */</div><div class='ctx'> static inline int cpufreq_table_find_index_ah(struct cpufreq_policy *policy,</div><div class='ctx'> 					      unsigned int target_freq,</div><div class='hunk'>@@ -900,12 +925,12 @@ static inline int cpufreq_table_find_index_dh(struct cpufreq_policy *policy,</div><div class='ctx'> 	return best;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Works only on sorted freq-tables */</div><div class='del'>-static inline int cpufreq_table_find_index_h(struct cpufreq_policy *policy,</div><div class='del'>-					     unsigned int target_freq,</div><div class='del'>-					     bool efficiencies)</div><div class='add'>+static inline int find_index_h(struct cpufreq_policy *policy,</div><div class='add'>+			       unsigned int target_freq,</div><div class='add'>+			       unsigned int min, unsigned int max,</div><div class='add'>+			       bool efficiencies)</div><div class='ctx'> {</div><div class='del'>-	target_freq = clamp_val(target_freq, policy-&gt;min, policy-&gt;max);</div><div class='add'>+	target_freq = clamp_val(target_freq, min, max);</div><div class='ctx'> </div><div class='ctx'> 	if (policy-&gt;freq_table_sorted == CPUFREQ_TABLE_SORTED_ASCENDING)</div><div class='ctx'> 		return cpufreq_table_find_index_ah(policy, target_freq,</div><div class='hunk'>@@ -915,6 +940,14 @@ static inline int cpufreq_table_find_index_h(struct cpufreq_policy *policy,</div><div class='ctx'> 						   efficiencies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Works only on sorted freq-tables */</div><div class='add'>+static inline int cpufreq_table_find_index_h(struct cpufreq_policy *policy,</div><div class='add'>+					     unsigned int target_freq,</div><div class='add'>+					     bool efficiencies)</div><div class='add'>+{</div><div class='add'>+	return find_index_h(policy, target_freq, policy-&gt;min, policy-&gt;max, efficiencies);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Find closest freq to target in a table in ascending order */</div><div class='ctx'> static inline int cpufreq_table_find_index_ac(struct cpufreq_policy *policy,</div><div class='ctx'> 					      unsigned int target_freq,</div><div class='hunk'>@@ -985,12 +1018,12 @@ static inline int cpufreq_table_find_index_dc(struct cpufreq_policy *policy,</div><div class='ctx'> 	return best;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Works only on sorted freq-tables */</div><div class='del'>-static inline int cpufreq_table_find_index_c(struct cpufreq_policy *policy,</div><div class='del'>-					     unsigned int target_freq,</div><div class='del'>-					     bool efficiencies)</div><div class='add'>+static inline int find_index_c(struct cpufreq_policy *policy,</div><div class='add'>+			       unsigned int target_freq,</div><div class='add'>+			       unsigned int min, unsigned int max,</div><div class='add'>+			       bool efficiencies)</div><div class='ctx'> {</div><div class='del'>-	target_freq = clamp_val(target_freq, policy-&gt;min, policy-&gt;max);</div><div class='add'>+	target_freq = clamp_val(target_freq, min, max);</div><div class='ctx'> </div><div class='ctx'> 	if (policy-&gt;freq_table_sorted == CPUFREQ_TABLE_SORTED_ASCENDING)</div><div class='ctx'> 		return cpufreq_table_find_index_ac(policy, target_freq,</div><div class='hunk'>@@ -1000,7 +1033,17 @@ static inline int cpufreq_table_find_index_c(struct cpufreq_policy *policy,</div><div class='ctx'> 						   efficiencies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpufreq_is_in_limits(struct cpufreq_policy *policy, int idx)</div><div class='add'>+/* Works only on sorted freq-tables */</div><div class='add'>+static inline int cpufreq_table_find_index_c(struct cpufreq_policy *policy,</div><div class='add'>+					     unsigned int target_freq,</div><div class='add'>+					     bool efficiencies)</div><div class='add'>+{</div><div class='add'>+	return find_index_c(policy, target_freq, policy-&gt;min, policy-&gt;max, efficiencies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool cpufreq_is_in_limits(struct cpufreq_policy *policy,</div><div class='add'>+					unsigned int min, unsigned int max,</div><div class='add'>+					int idx)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int freq;</div><div class='ctx'> </div><div class='hunk'>@@ -1009,11 +1052,13 @@ static inline bool cpufreq_is_in_limits(struct cpufreq_policy *policy, int idx)</div><div class='ctx'> </div><div class='ctx'> 	freq = policy-&gt;freq_table[idx].frequency;</div><div class='ctx'> </div><div class='del'>-	return freq == clamp_val(freq, policy-&gt;min, policy-&gt;max);</div><div class='add'>+	return freq == clamp_val(freq, min, max);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cpufreq_frequency_table_target(struct cpufreq_policy *policy,</div><div class='ctx'> 						 unsigned int target_freq,</div><div class='add'>+						 unsigned int min,</div><div class='add'>+						 unsigned int max,</div><div class='ctx'> 						 unsigned int relation)</div><div class='ctx'> {</div><div class='ctx'> 	bool efficiencies = policy-&gt;efficiencies_available &amp;&amp;</div><div class='hunk'>@@ -1024,29 +1069,26 @@ static inline int cpufreq_frequency_table_target(struct cpufreq_policy *policy,</div><div class='ctx'> 	relation &amp;= ~CPUFREQ_RELATION_E;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(policy-&gt;freq_table_sorted == CPUFREQ_TABLE_UNSORTED))</div><div class='del'>-		return cpufreq_table_index_unsorted(policy, target_freq,</div><div class='del'>-						    relation);</div><div class='add'>+		return cpufreq_table_index_unsorted(policy, target_freq, min,</div><div class='add'>+						    max, relation);</div><div class='ctx'> retry:</div><div class='ctx'> 	switch (relation) {</div><div class='ctx'> 	case CPUFREQ_RELATION_L:</div><div class='del'>-		idx = cpufreq_table_find_index_l(policy, target_freq,</div><div class='del'>-						 efficiencies);</div><div class='add'>+		idx = find_index_l(policy, target_freq, min, max, efficiencies);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPUFREQ_RELATION_H:</div><div class='del'>-		idx = cpufreq_table_find_index_h(policy, target_freq,</div><div class='del'>-						 efficiencies);</div><div class='add'>+		idx = find_index_h(policy, target_freq, min, max, efficiencies);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPUFREQ_RELATION_C:</div><div class='del'>-		idx = cpufreq_table_find_index_c(policy, target_freq,</div><div class='del'>-						 efficiencies);</div><div class='add'>+		idx = find_index_c(policy, target_freq, min, max, efficiencies);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Limit frequency index to honor policy-&gt;min/max */</div><div class='del'>-	if (!cpufreq_is_in_limits(policy, idx) &amp;&amp; efficiencies) {</div><div class='add'>+	/* Limit frequency index to honor min and max */</div><div class='add'>+	if (!cpufreq_is_in_limits(policy, min, max, idx) &amp;&amp; efficiencies) {</div><div class='ctx'> 		efficiencies = false;</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1103,10 +1145,9 @@ static inline int parse_perf_domain(int cpu, const char *list_name,</div><div class='ctx'> 				    const char *cell_name,</div><div class='ctx'> 				    struct of_phandle_args *args)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *cpu_np;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	cpu_np = of_cpu_device_node_get(cpu);</div><div class='add'>+	struct device_node *cpu_np __free(device_node) = of_cpu_device_node_get(cpu);</div><div class='ctx'> 	if (!cpu_np)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -1114,9 +1155,6 @@ static inline int parse_perf_domain(int cpu, const char *list_name,</div><div class='ctx'> 					 args);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-</div><div class='del'>-	of_node_put(cpu_np);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1141,8 +1179,7 @@ static inline int of_perf_domain_get_sharing_cpumask(int pcpu, const char *list_</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (pargs-&gt;np == args.np &amp;&amp; pargs-&gt;args_count == args.args_count &amp;&amp;</div><div class='del'>-		    !memcmp(pargs-&gt;args, args.args, sizeof(args.args[0]) * args.args_count))</div><div class='add'>+		if (of_phandle_args_equal(pargs, &amp;args))</div><div class='ctx'> 			cpumask_set_cpu(cpu, cpumask);</div><div class='ctx'> </div><div class='ctx'> 		of_node_put(args.np);</div><div class='hunk'>@@ -1151,23 +1188,14 @@ static inline int of_perf_domain_get_sharing_cpumask(int pcpu, const char *list_</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline int cpufreq_boost_trigger_state(int state)</div><div class='add'>+static inline bool cpufreq_boost_enabled(void)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline int cpufreq_boost_enabled(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int cpufreq_enable_boost_support(void)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool policy_has_boost_freq(struct cpufreq_policy *policy)</div><div class='add'>+static inline int cpufreq_boost_set_sw(struct cpufreq_policy *policy, int state)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -1185,7 +1213,7 @@ static inline int of_perf_domain_get_sharing_cpumask(int pcpu, const char *list_</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern unsigned int arch_freq_get_on_cpu(int cpu);</div><div class='add'>+extern int arch_freq_get_on_cpu(int cpu);</div><div class='ctx'> </div><div class='ctx'> #ifndef arch_set_freq_scale</div><div class='ctx'> static __always_inline</div><div class='hunk'>@@ -1199,7 +1227,6 @@ void arch_set_freq_scale(const struct cpumask *cpus,</div><div class='ctx'> /* the following are really really optional */</div><div class='ctx'> extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;</div><div class='ctx'> extern struct freq_attr cpufreq_freq_attr_scaling_boost_freqs;</div><div class='del'>-extern struct freq_attr *cpufreq_generic_attr[];</div><div class='ctx'> int cpufreq_table_validate_and_sort(struct cpufreq_policy *policy);</div><div class='ctx'> </div><div class='ctx'> unsigned int cpufreq_generic_get(unsigned int cpu);</div><div class='hunk'>@@ -1207,6 +1234,8 @@ void cpufreq_generic_init(struct cpufreq_policy *policy,</div><div class='ctx'> 		struct cpufreq_frequency_table *table,</div><div class='ctx'> 		unsigned int transition_latency);</div><div class='ctx'> </div><div class='add'>+bool cpufreq_ready_for_eas(const struct cpumask *cpu_mask);</div><div class='add'>+</div><div class='ctx'> static inline void cpufreq_register_em_with_opp(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	dev_pm_opp_of_register_em(get_cpu_device(policy-&gt;cpu),</div><div class='head'>diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h<br/>index 35e78ddb2b37..62cd7b35a29c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cpuhotplug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpuhotplug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpuhotplug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpuhotplug.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'>  * startup callbacks sequentially from CPUHP_OFFLINE + 1 to CPUHP_ONLINE</div><div class='ctx'>  * during a CPU online operation. During a CPU offline operation the</div><div class='ctx'>  * installed teardown callbacks are invoked in the reverse order from</div><div class='del'>- * CPU_ONLINE - 1 down to CPUHP_OFFLINE.</div><div class='add'>+ * CPUHP_ONLINE - 1 down to CPUHP_OFFLINE.</div><div class='ctx'>  *</div><div class='ctx'>  * The state space has three sections: PREPARE, STARTING and ONLINE.</div><div class='ctx'>  *</div><div class='hunk'>@@ -60,7 +60,6 @@ enum cpuhp_state {</div><div class='ctx'> 	/* PREPARE section invoked on a control CPU */</div><div class='ctx'> 	CPUHP_OFFLINE = 0,</div><div class='ctx'> 	CPUHP_CREATE_THREADS,</div><div class='del'>-	CPUHP_PERF_PREPARE,</div><div class='ctx'> 	CPUHP_PERF_X86_PREPARE,</div><div class='ctx'> 	CPUHP_PERF_X86_AMD_UNCORE_PREP,</div><div class='ctx'> 	CPUHP_PERF_POWER,</div><div class='hunk'>@@ -91,7 +90,6 @@ enum cpuhp_state {</div><div class='ctx'> 	CPUHP_RADIX_DEAD,</div><div class='ctx'> 	CPUHP_PAGE_ALLOC,</div><div class='ctx'> 	CPUHP_NET_DEV_DEAD,</div><div class='del'>-	CPUHP_PCI_XGENE_DEAD,</div><div class='ctx'> 	CPUHP_IOMMU_IOVA_DEAD,</div><div class='ctx'> 	CPUHP_AP_ARM_CACHE_B15_RAC_DEAD,</div><div class='ctx'> 	CPUHP_PADATA_DEAD,</div><div class='hunk'>@@ -100,7 +98,6 @@ enum cpuhp_state {</div><div class='ctx'> 	CPUHP_WORKQUEUE_PREP,</div><div class='ctx'> 	CPUHP_POWER_NUMA_PREPARE,</div><div class='ctx'> 	CPUHP_HRTIMERS_PREPARE,</div><div class='del'>-	CPUHP_PROFILE_PREPARE,</div><div class='ctx'> 	CPUHP_X2APIC_PREPARE,</div><div class='ctx'> 	CPUHP_SMPCFD_PREPARE,</div><div class='ctx'> 	CPUHP_RELAY_PREPARE,</div><div class='hunk'>@@ -117,11 +114,11 @@ enum cpuhp_state {</div><div class='ctx'> 	CPUHP_NET_IUCV_PREPARE,</div><div class='ctx'> 	CPUHP_ARM_BL_PREPARE,</div><div class='ctx'> 	CPUHP_TRACE_RB_PREPARE,</div><div class='del'>-	CPUHP_MM_ZS_PREPARE,</div><div class='ctx'> 	CPUHP_MM_ZSWP_POOL_PREPARE,</div><div class='ctx'> 	CPUHP_KVM_PPC_BOOK3S_PREPARE,</div><div class='ctx'> 	CPUHP_ZCOMP_PREPARE,</div><div class='ctx'> 	CPUHP_TIMERS_PREPARE,</div><div class='add'>+	CPUHP_TMIGR_PREPARE,</div><div class='ctx'> 	CPUHP_MIPS_SOC_PREPARE,</div><div class='ctx'> 	CPUHP_BP_PREPARE_DYN,</div><div class='ctx'> 	CPUHP_BP_PREPARE_DYN_END		= CPUHP_BP_PREPARE_DYN + 20,</div><div class='hunk'>@@ -144,13 +141,16 @@ enum cpuhp_state {</div><div class='ctx'> 	CPUHP_AP_IRQ_ARMADA_XP_STARTING,</div><div class='ctx'> 	CPUHP_AP_IRQ_BCM2836_STARTING,</div><div class='ctx'> 	CPUHP_AP_IRQ_MIPS_GIC_STARTING,</div><div class='del'>-	CPUHP_AP_IRQ_LOONGARCH_STARTING,</div><div class='add'>+	CPUHP_AP_IRQ_EIOINTC_STARTING,</div><div class='add'>+	CPUHP_AP_IRQ_AVECINTC_STARTING,</div><div class='ctx'> 	CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,</div><div class='add'>+	CPUHP_AP_IRQ_ACLINT_SSWI_STARTING,</div><div class='add'>+	CPUHP_AP_IRQ_RISCV_IMSIC_STARTING,</div><div class='add'>+	CPUHP_AP_IRQ_RISCV_SBI_IPI_STARTING,</div><div class='ctx'> 	CPUHP_AP_ARM_MVEBU_COHERENCY,</div><div class='ctx'> 	CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,</div><div class='ctx'> 	CPUHP_AP_PERF_X86_STARTING,</div><div class='ctx'> 	CPUHP_AP_PERF_X86_AMD_IBS_STARTING,</div><div class='del'>-	CPUHP_AP_PERF_X86_CSTATE_STARTING,</div><div class='ctx'> 	CPUHP_AP_PERF_XTENSA_STARTING,</div><div class='ctx'> 	CPUHP_AP_ARM_VFP_STARTING,</div><div class='ctx'> 	CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING,</div><div class='hunk'>@@ -168,8 +168,10 @@ enum cpuhp_state {</div><div class='ctx'> 	CPUHP_AP_QCOM_TIMER_STARTING,</div><div class='ctx'> 	CPUHP_AP_TEGRA_TIMER_STARTING,</div><div class='ctx'> 	CPUHP_AP_ARMADA_TIMER_STARTING,</div><div class='add'>+	CPUHP_AP_LOONGARCH_ARCH_TIMER_STARTING,</div><div class='ctx'> 	CPUHP_AP_MIPS_GIC_TIMER_STARTING,</div><div class='ctx'> 	CPUHP_AP_ARC_TIMER_STARTING,</div><div class='add'>+	CPUHP_AP_REALTEK_TIMER_STARTING,</div><div class='ctx'> 	CPUHP_AP_RISCV_TIMER_STARTING,</div><div class='ctx'> 	CPUHP_AP_CLINT_TIMER_STARTING,</div><div class='ctx'> 	CPUHP_AP_CSKY_TIMER_STARTING,</div><div class='hunk'>@@ -205,8 +207,6 @@ enum cpuhp_state {</div><div class='ctx'> 	CPUHP_AP_PERF_X86_UNCORE_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_X86_AMD_POWER_ONLINE,</div><div class='del'>-	CPUHP_AP_PERF_X86_RAPL_ONLINE,</div><div class='del'>-	CPUHP_AP_PERF_X86_CSTATE_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_S390_CF_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_S390_SF_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_ARM_CCI_ONLINE,</div><div class='hunk'>@@ -225,6 +225,7 @@ enum cpuhp_state {</div><div class='ctx'> 	CPUHP_AP_PERF_ARM_APM_XGENE_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_ARM_CAVIUM_TX2_UNCORE_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE,</div><div class='add'>+	CPUHP_AP_PERF_ARM_MRVL_PEM_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_POWERPC_NEST_IMC_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_POWERPC_CORE_IMC_ONLINE,</div><div class='ctx'> 	CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE,</div><div class='hunk'>@@ -237,6 +238,7 @@ enum cpuhp_state {</div><div class='ctx'> 	CPUHP_AP_WORKQUEUE_ONLINE,</div><div class='ctx'> 	CPUHP_AP_RANDOM_ONLINE,</div><div class='ctx'> 	CPUHP_AP_RCUTREE_ONLINE,</div><div class='add'>+	CPUHP_AP_KTHREADS_ONLINE,</div><div class='ctx'> 	CPUHP_AP_BASE_CACHEINFO_ONLINE,</div><div class='ctx'> 	CPUHP_AP_ONLINE_DYN,</div><div class='ctx'> 	CPUHP_AP_ONLINE_DYN_END		= CPUHP_AP_ONLINE_DYN + 40,</div><div class='head'>diff --git a/include/linux/cpuhplock.h b/include/linux/cpuhplock.h<br/>new file mode 100644<br/>index 000000000000..f7aa20f62b87<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpuhplock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpuhplock.h</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * include/linux/cpuhplock.h - CPU hotplug locking</div><div class='add'>+ *</div><div class='add'>+ * Locking functions for CPU hotplug.</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_CPUHPLOCK_H_</div><div class='add'>+#define _LINUX_CPUHPLOCK_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+extern int lockdep_is_cpus_held(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+void cpus_write_lock(void);</div><div class='add'>+void cpus_write_unlock(void);</div><div class='add'>+void cpus_read_lock(void);</div><div class='add'>+void cpus_read_unlock(void);</div><div class='add'>+int  cpus_read_trylock(void);</div><div class='add'>+void lockdep_assert_cpus_held(void);</div><div class='add'>+void cpu_hotplug_disable_offlining(void);</div><div class='add'>+void cpu_hotplug_disable(void);</div><div class='add'>+void cpu_hotplug_enable(void);</div><div class='add'>+void clear_tasks_mm_cpumask(int cpu);</div><div class='add'>+int remove_cpu(unsigned int cpu);</div><div class='add'>+int cpu_device_down(struct device *dev);</div><div class='add'>+void smp_shutdown_nonboot_cpus(unsigned int primary_cpu);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_HOTPLUG_CPU */</div><div class='add'>+</div><div class='add'>+static inline void cpus_write_lock(void) { }</div><div class='add'>+static inline void cpus_write_unlock(void) { }</div><div class='add'>+static inline void cpus_read_lock(void) { }</div><div class='add'>+static inline void cpus_read_unlock(void) { }</div><div class='add'>+static inline int  cpus_read_trylock(void) { return true; }</div><div class='add'>+static inline void lockdep_assert_cpus_held(void) { }</div><div class='add'>+static inline void cpu_hotplug_disable_offlining(void) { }</div><div class='add'>+static inline void cpu_hotplug_disable(void) { }</div><div class='add'>+static inline void cpu_hotplug_enable(void) { }</div><div class='add'>+static inline int remove_cpu(unsigned int cpu) { return -EPERM; }</div><div class='add'>+static inline void smp_shutdown_nonboot_cpus(unsigned int primary_cpu) { }</div><div class='add'>+#endif	/* !CONFIG_HOTPLUG_CPU */</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_0(cpus_read_lock, cpus_read_lock(), cpus_read_unlock())</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_CPUHPLOCK_H_ */</div><div class='head'>diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h<br/>index 3183aeb7f5b4..4073690504a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cpuidle.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpuidle.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpuidle.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpuidle.h</a></div><div class='hunk'>@@ -61,7 +61,7 @@ struct cpuidle_state {</div><div class='ctx'> 			struct cpuidle_driver *drv,</div><div class='ctx'> 			int index);</div><div class='ctx'> </div><div class='del'>-	int (*enter_dead) (struct cpuidle_device *dev, int index);</div><div class='add'>+	void (*enter_dead) (struct cpuidle_device *dev, int index);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CPUs execute -&gt;enter_s2idle with the local tick or entire timekeeping</div><div class='hunk'>@@ -248,7 +248,8 @@ extern int cpuidle_find_deepest_state(struct cpuidle_driver *drv,</div><div class='ctx'> 				      struct cpuidle_device *dev,</div><div class='ctx'> 				      u64 latency_limit_ns);</div><div class='ctx'> extern int cpuidle_enter_s2idle(struct cpuidle_driver *drv,</div><div class='del'>-				struct cpuidle_device *dev);</div><div class='add'>+				struct cpuidle_device *dev,</div><div class='add'>+				u64 latency_limit_ns);</div><div class='ctx'> extern void cpuidle_use_deepest_state(u64 latency_limit_ns);</div><div class='ctx'> #else</div><div class='ctx'> static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv,</div><div class='hunk'>@@ -256,7 +257,8 @@ static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv,</div><div class='ctx'> 					     u64 latency_limit_ns)</div><div class='ctx'> {return -ENODEV; }</div><div class='ctx'> static inline int cpuidle_enter_s2idle(struct cpuidle_driver *drv,</div><div class='del'>-				       struct cpuidle_device *dev)</div><div class='add'>+				       struct cpuidle_device *dev,</div><div class='add'>+				       u64 latency_limit_ns)</div><div class='ctx'> {return -ENODEV; }</div><div class='ctx'> static inline void cpuidle_use_deepest_state(u64 latency_limit_ns)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h<br/>index 1c29947db848..80211900f373 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cpumask.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpumask.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpumask.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpumask.h</a></div><div class='hunk'>@@ -7,26 +7,16 @@</div><div class='ctx'>  * set of CPUs in a system, one bit position per CPU number.  In general,</div><div class='ctx'>  * only nr_cpu_ids (&lt;= NR_CPUS) bits are valid.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/cleanup.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/threads.h&gt;</div><div class='del'>-#include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> #include &lt;linux/gfp_types.h&gt;</div><div class='ctx'> #include &lt;linux/numa.h&gt;</div><div class='add'>+#include &lt;linux/threads.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Don't assign or return these: may not be this big! */</div><div class='del'>-typedef struct cpumask { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cpumask_bits - get the bits in a cpumask</div><div class='del'>- * @maskp: the struct cpumask *</div><div class='del'>- *</div><div class='del'>- * You should only assume nr_cpu_ids bits of this mask are valid.  This is</div><div class='del'>- * a macro so it's const-correct.</div><div class='del'>- */</div><div class='del'>-#define cpumask_bits(maskp) ((maskp)-&gt;bits)</div><div class='add'>+#include &lt;asm/bug.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cpumask_pr_args - printf args to output a cpumask</div><div class='hunk'>@@ -42,7 +32,7 @@ typedef struct cpumask { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t;</div><div class='ctx'> extern unsigned int nr_cpu_ids;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline void set_nr_cpu_ids(unsigned int nr)</div><div class='add'>+static __always_inline void set_nr_cpu_ids(unsigned int nr)</div><div class='ctx'> {</div><div class='ctx'> #if (NR_CPUS == 1) || defined(CONFIG_FORCE_NR_CPUS)</div><div class='ctx'> 	WARN_ON(nr != nr_cpu_ids);</div><div class='hunk'>@@ -93,6 +83,7 @@ static inline void set_nr_cpu_ids(unsigned int nr)</div><div class='ctx'>  *</div><div class='ctx'>  *     cpu_possible_mask- has bit 'cpu' set iff cpu is populatable</div><div class='ctx'>  *     cpu_present_mask - has bit 'cpu' set iff cpu is populated</div><div class='add'>+ *     cpu_enabled_mask - has bit 'cpu' set iff cpu can be brought online</div><div class='ctx'>  *     cpu_online_mask  - has bit 'cpu' set iff cpu available to scheduler</div><div class='ctx'>  *     cpu_active_mask  - has bit 'cpu' set iff cpu available to migration</div><div class='ctx'>  *</div><div class='hunk'>@@ -125,16 +116,19 @@ static inline void set_nr_cpu_ids(unsigned int nr)</div><div class='ctx'> </div><div class='ctx'> extern struct cpumask __cpu_possible_mask;</div><div class='ctx'> extern struct cpumask __cpu_online_mask;</div><div class='add'>+extern struct cpumask __cpu_enabled_mask;</div><div class='ctx'> extern struct cpumask __cpu_present_mask;</div><div class='ctx'> extern struct cpumask __cpu_active_mask;</div><div class='ctx'> extern struct cpumask __cpu_dying_mask;</div><div class='ctx'> #define cpu_possible_mask ((const struct cpumask *)&amp;__cpu_possible_mask)</div><div class='ctx'> #define cpu_online_mask   ((const struct cpumask *)&amp;__cpu_online_mask)</div><div class='add'>+#define cpu_enabled_mask   ((const struct cpumask *)&amp;__cpu_enabled_mask)</div><div class='ctx'> #define cpu_present_mask  ((const struct cpumask *)&amp;__cpu_present_mask)</div><div class='ctx'> #define cpu_active_mask   ((const struct cpumask *)&amp;__cpu_active_mask)</div><div class='ctx'> #define cpu_dying_mask    ((const struct cpumask *)&amp;__cpu_dying_mask)</div><div class='ctx'> </div><div class='ctx'> extern atomic_t __num_online_cpus;</div><div class='add'>+extern unsigned int __num_possible_cpus;</div><div class='ctx'> </div><div class='ctx'> extern cpumask_t cpus_booted_once_mask;</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +152,7 @@ static __always_inline unsigned int cpumask_check(unsigned int cpu)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if no cpus set.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_first(const struct cpumask *srcp)</div><div class='add'>+static __always_inline unsigned int cpumask_first(const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	return find_first_bit(cpumask_bits(srcp), small_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -169,7 +163,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if all cpus are set.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_first_zero(const struct cpumask *srcp)</div><div class='add'>+static __always_inline unsigned int cpumask_first_zero(const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	return find_first_zero_bit(cpumask_bits(srcp), small_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -181,19 +175,49 @@ static inline unsigned int cpumask_first_zero(const struct cpumask *srcp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if no cpus set in both.  See also cpumask_next_and().</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned int cpumask_first_and(const struct cpumask *srcp1, const struct cpumask *srcp2)</div><div class='ctx'> {</div><div class='ctx'> 	return find_first_and_bit(cpumask_bits(srcp1), cpumask_bits(srcp2), small_cpumask_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * cpumask_first_andnot - return the first cpu from *srcp1 &amp; ~*srcp2</div><div class='add'>+ * @srcp1: the first input</div><div class='add'>+ * @srcp2: the second input</div><div class='add'>+ *</div><div class='add'>+ * Return: &gt;= nr_cpu_ids if no such cpu found.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_first_andnot(const struct cpumask *srcp1, const struct cpumask *srcp2)</div><div class='add'>+{</div><div class='add'>+	return find_first_andnot_bit(cpumask_bits(srcp1), cpumask_bits(srcp2), small_cpumask_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cpumask_first_and_and - return the first cpu from *srcp1 &amp; *srcp2 &amp; *srcp3</div><div class='add'>+ * @srcp1: the first input</div><div class='add'>+ * @srcp2: the second input</div><div class='add'>+ * @srcp3: the third input</div><div class='add'>+ *</div><div class='add'>+ * Return: &gt;= nr_cpu_ids if no cpus set in all.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_first_and_and(const struct cpumask *srcp1,</div><div class='add'>+				   const struct cpumask *srcp2,</div><div class='add'>+				   const struct cpumask *srcp3)</div><div class='add'>+{</div><div class='add'>+	return find_first_and_and_bit(cpumask_bits(srcp1), cpumask_bits(srcp2),</div><div class='add'>+				      cpumask_bits(srcp3), small_cpumask_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * cpumask_last - get the last CPU in a cpumask</div><div class='ctx'>  * @srcp:	- the cpumask pointer</div><div class='ctx'>  *</div><div class='ctx'>  * Return:	&gt;= nr_cpumask_bits if no CPUs set.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_last(const struct cpumask *srcp)</div><div class='add'>+static __always_inline unsigned int cpumask_last(const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	return find_last_bit(cpumask_bits(srcp), small_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -205,7 +229,7 @@ static inline unsigned int cpumask_last(const struct cpumask *srcp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if no further cpus set.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned int cpumask_next(int n, const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	/* -1 is a legal arg here. */</div><div class='hunk'>@@ -221,7 +245,8 @@ unsigned int cpumask_next(int n, const struct cpumask *srcp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if no further cpus unset.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	/* -1 is a legal arg here. */</div><div class='ctx'> 	if (n != -1)</div><div class='hunk'>@@ -231,18 +256,21 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)</div><div class='ctx'> </div><div class='ctx'> #if NR_CPUS == 1</div><div class='ctx'> /* Uniprocessor: there is only one valid CPU */</div><div class='del'>-static inline unsigned int cpumask_local_spread(unsigned int i, int node)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_local_spread(unsigned int i, int node)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int cpumask_any_and_distribute(const struct cpumask *src1p,</div><div class='del'>-						      const struct cpumask *src2p)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_any_and_distribute(const struct cpumask *src1p,</div><div class='add'>+					const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_first_and(src1p, src2p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int cpumask_any_distribute(const struct cpumask *srcp)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_any_distribute(const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_first(srcp);</div><div class='ctx'> }</div><div class='hunk'>@@ -261,9 +289,9 @@ unsigned int cpumask_any_distribute(const struct cpumask *srcp);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if no further cpus set in both.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned int cpumask_next_and(int n, const struct cpumask *src1p,</div><div class='del'>-		     const struct cpumask *src2p)</div><div class='add'>+			      const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	/* -1 is a legal arg here. */</div><div class='ctx'> 	if (n != -1)</div><div class='hunk'>@@ -273,35 +301,83 @@ unsigned int cpumask_next_and(int n, const struct cpumask *src1p,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * for_each_cpu - iterate over every cpu in a mask</div><div class='del'>- * @cpu: the (optionally unsigned) integer iterator</div><div class='del'>- * @mask: the cpumask pointer</div><div class='add'>+ * cpumask_next_andnot - get the next cpu in *src1p &amp; ~*src2p</div><div class='add'>+ * @n: the cpu prior to the place to search (i.e. return will be &gt; @n)</div><div class='add'>+ * @src1p: the first cpumask pointer</div><div class='add'>+ * @src2p: the second cpumask pointer</div><div class='ctx'>  *</div><div class='del'>- * After the loop, cpu is &gt;= nr_cpu_ids.</div><div class='add'>+ * Return: &gt;= nr_cpu_ids if no further cpus set in both.</div><div class='ctx'>  */</div><div class='del'>-#define for_each_cpu(cpu, mask)				\</div><div class='del'>-	for_each_set_bit(cpu, cpumask_bits(mask), small_cpumask_bits)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_next_andnot(int n, const struct cpumask *src1p,</div><div class='add'>+				 const struct cpumask *src2p)</div><div class='add'>+{</div><div class='add'>+	/* -1 is a legal arg here. */</div><div class='add'>+	if (n != -1)</div><div class='add'>+		cpumask_check(n);</div><div class='add'>+	return find_next_andnot_bit(cpumask_bits(src1p), cpumask_bits(src2p),</div><div class='add'>+		small_cpumask_bits, n + 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#if NR_CPUS == 1</div><div class='del'>-static inline</div><div class='del'>-unsigned int cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap)</div><div class='add'>+/**</div><div class='add'>+ * cpumask_next_and_wrap - get the next cpu in *src1p &amp; *src2p, starting from</div><div class='add'>+ *			   @n+1. If nothing found, wrap around and start from</div><div class='add'>+ *			   the beginning</div><div class='add'>+ * @n: the cpu prior to the place to search (i.e. search starts from @n+1)</div><div class='add'>+ * @src1p: the first cpumask pointer</div><div class='add'>+ * @src2p: the second cpumask pointer</div><div class='add'>+ *</div><div class='add'>+ * Return: next set bit, wrapped if needed, or &gt;= nr_cpu_ids if @src1p &amp; @src2p is empty.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_next_and_wrap(int n, const struct cpumask *src1p,</div><div class='add'>+			      const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='del'>-	cpumask_check(start);</div><div class='add'>+	/* -1 is a legal arg here. */</div><div class='ctx'> 	if (n != -1)</div><div class='ctx'> 		cpumask_check(n);</div><div class='add'>+	return find_next_and_bit_wrap(cpumask_bits(src1p), cpumask_bits(src2p),</div><div class='add'>+		small_cpumask_bits, n + 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Return the first available CPU when wrapping, or when starting before cpu0,</div><div class='del'>-	 * since there is only one valid option.</div><div class='del'>-	 */</div><div class='del'>-	if (wrap &amp;&amp; n &gt;= 0)</div><div class='del'>-		return nr_cpumask_bits;</div><div class='add'>+/**</div><div class='add'>+ * cpumask_next_wrap - get the next cpu in *src, starting from @n+1. If nothing</div><div class='add'>+ *		       found, wrap around and start from the beginning</div><div class='add'>+ * @n: the cpu prior to the place to search (i.e. search starts from @n+1)</div><div class='add'>+ * @src: cpumask pointer</div><div class='add'>+ *</div><div class='add'>+ * Return: next set bit, wrapped if needed, or &gt;= nr_cpu_ids if @src is empty.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_next_wrap(int n, const struct cpumask *src)</div><div class='add'>+{</div><div class='add'>+	/* -1 is a legal arg here. */</div><div class='add'>+	if (n != -1)</div><div class='add'>+		cpumask_check(n);</div><div class='add'>+	return find_next_bit_wrap(cpumask_bits(src), small_cpumask_bits, n + 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return cpumask_first(mask);</div><div class='add'>+/**</div><div class='add'>+ * cpumask_random - get random cpu in *src.</div><div class='add'>+ * @src: cpumask pointer</div><div class='add'>+ *</div><div class='add'>+ * Return: random set bit, or &gt;= nr_cpu_ids if @src is empty.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_random(const struct cpumask *src)</div><div class='add'>+{</div><div class='add'>+	return find_random_bit(cpumask_bits(src), nr_cpu_ids);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-unsigned int __pure cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * for_each_cpu - iterate over every cpu in a mask</div><div class='add'>+ * @cpu: the (optionally unsigned) integer iterator</div><div class='add'>+ * @mask: the cpumask pointer</div><div class='add'>+ *</div><div class='add'>+ * After the loop, cpu is &gt;= nr_cpu_ids.</div><div class='add'>+ */</div><div class='add'>+#define for_each_cpu(cpu, mask)				\</div><div class='add'>+	for_each_set_bit(cpu, cpumask_bits(mask), small_cpumask_bits)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * for_each_cpu_wrap - iterate over every cpu in a mask, starting at a specified location</div><div class='hunk'>@@ -369,19 +445,33 @@ unsigned int __pure cpumask_next_wrap(int n, const struct cpumask *mask, int sta</div><div class='ctx'> 	for_each_or_bit(cpu, cpumask_bits(mask1), cpumask_bits(mask2), small_cpumask_bits)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cpumask_any_but - return a "random" in a cpumask, but not this one.</div><div class='add'>+ * for_each_cpu_from - iterate over CPUs present in @mask, from @cpu to the end of @mask.</div><div class='add'>+ * @cpu: the (optionally unsigned) integer iterator</div><div class='add'>+ * @mask: the cpumask pointer</div><div class='add'>+ *</div><div class='add'>+ * After the loop, cpu is &gt;= nr_cpu_ids.</div><div class='add'>+ */</div><div class='add'>+#define for_each_cpu_from(cpu, mask)				\</div><div class='add'>+	for_each_set_bit_from(cpu, cpumask_bits(mask), small_cpumask_bits)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cpumask_any_but - return an arbitrary cpu in a cpumask, but not this one.</div><div class='ctx'>  * @mask: the cpumask to search</div><div class='ctx'>  * @cpu: the cpu to ignore.</div><div class='ctx'>  *</div><div class='ctx'>  * Often used to find any cpu but smp_processor_id() in a mask.</div><div class='add'>+ * If @cpu == -1, the function is equivalent to cpumask_any().</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if no cpus set.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='del'>-unsigned int cpumask_any_but(const struct cpumask *mask, unsigned int cpu)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_any_but(const struct cpumask *mask, int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	cpumask_check(cpu);</div><div class='add'>+	/* -1 is a legal arg here. */</div><div class='add'>+	if (cpu != -1)</div><div class='add'>+		cpumask_check(cpu);</div><div class='add'>+</div><div class='ctx'> 	for_each_cpu(i, mask)</div><div class='ctx'> 		if (i != cpu)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -389,46 +479,85 @@ unsigned int cpumask_any_but(const struct cpumask *mask, unsigned int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cpumask_nth - get the Nth cpu in a cpumask</div><div class='del'>- * @srcp: the cpumask pointer</div><div class='del'>- * @cpu: the Nth cpu to find, starting from 0</div><div class='add'>+ * cpumask_any_and_but - pick an arbitrary cpu from *mask1 &amp; *mask2, but not this one.</div><div class='add'>+ * @mask1: the first input cpumask</div><div class='add'>+ * @mask2: the second input cpumask</div><div class='add'>+ * @cpu: the cpu to ignore</div><div class='ctx'>  *</div><div class='del'>- * Return: &gt;= nr_cpu_ids if such cpu doesn't exist.</div><div class='add'>+ * If @cpu == -1, the function is equivalent to cpumask_any_and().</div><div class='add'>+ * Returns &gt;= nr_cpu_ids if no cpus set.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_nth(unsigned int cpu, const struct cpumask *srcp)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_any_and_but(const struct cpumask *mask1,</div><div class='add'>+				 const struct cpumask *mask2,</div><div class='add'>+				 int cpu)</div><div class='ctx'> {</div><div class='del'>-	return find_nth_bit(cpumask_bits(srcp), small_cpumask_bits, cpumask_check(cpu));</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* -1 is a legal arg here. */</div><div class='add'>+	if (cpu != -1)</div><div class='add'>+		cpumask_check(cpu);</div><div class='add'>+</div><div class='add'>+	i = cpumask_first_and(mask1, mask2);</div><div class='add'>+	if (i != cpu)</div><div class='add'>+		return i;</div><div class='add'>+</div><div class='add'>+	return cpumask_next_and(cpu, mask1, mask2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cpumask_nth_and - get the Nth cpu in 2 cpumasks</div><div class='del'>- * @srcp1: the cpumask pointer</div><div class='del'>- * @srcp2: the cpumask pointer</div><div class='add'>+ * cpumask_any_andnot_but - pick an arbitrary cpu from *mask1 &amp; ~*mask2, but not this one.</div><div class='add'>+ * @mask1: the first input cpumask</div><div class='add'>+ * @mask2: the second input cpumask</div><div class='add'>+ * @cpu: the cpu to ignore</div><div class='add'>+ *</div><div class='add'>+ * If @cpu == -1, the function returns the first matching cpu.</div><div class='add'>+ * Returns &gt;= nr_cpu_ids if no cpus set.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_any_andnot_but(const struct cpumask *mask1,</div><div class='add'>+				    const struct cpumask *mask2,</div><div class='add'>+				    int cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* -1 is a legal arg here. */</div><div class='add'>+	if (cpu != -1)</div><div class='add'>+		cpumask_check(cpu);</div><div class='add'>+</div><div class='add'>+	i = cpumask_first_andnot(mask1, mask2);</div><div class='add'>+	if (i != cpu)</div><div class='add'>+		return i;</div><div class='add'>+</div><div class='add'>+	return cpumask_next_andnot(cpu, mask1, mask2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cpumask_nth - get the Nth cpu in a cpumask</div><div class='add'>+ * @srcp: the cpumask pointer</div><div class='ctx'>  * @cpu: the Nth cpu to find, starting from 0</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if such cpu doesn't exist.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='del'>-unsigned int cpumask_nth_and(unsigned int cpu, const struct cpumask *srcp1,</div><div class='del'>-							const struct cpumask *srcp2)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_nth(unsigned int cpu, const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='del'>-	return find_nth_and_bit(cpumask_bits(srcp1), cpumask_bits(srcp2),</div><div class='del'>-				small_cpumask_bits, cpumask_check(cpu));</div><div class='add'>+	return find_nth_bit(cpumask_bits(srcp), small_cpumask_bits, cpumask_check(cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cpumask_nth_andnot - get the Nth cpu set in 1st cpumask, and clear in 2nd.</div><div class='add'>+ * cpumask_nth_and - get the Nth cpu in 2 cpumasks</div><div class='ctx'>  * @srcp1: the cpumask pointer</div><div class='ctx'>  * @srcp2: the cpumask pointer</div><div class='ctx'>  * @cpu: the Nth cpu to find, starting from 0</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if such cpu doesn't exist.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='del'>-unsigned int cpumask_nth_andnot(unsigned int cpu, const struct cpumask *srcp1,</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_nth_and(unsigned int cpu, const struct cpumask *srcp1,</div><div class='ctx'> 							const struct cpumask *srcp2)</div><div class='ctx'> {</div><div class='del'>-	return find_nth_andnot_bit(cpumask_bits(srcp1), cpumask_bits(srcp2),</div><div class='add'>+	return find_nth_and_bit(cpumask_bits(srcp1), cpumask_bits(srcp2),</div><div class='ctx'> 				small_cpumask_bits, cpumask_check(cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -467,16 +596,30 @@ unsigned int cpumask_nth_and_andnot(unsigned int cpu, const struct cpumask *srcp</div><div class='ctx'>  * @cpu: cpu number (&lt; nr_cpu_ids)</div><div class='ctx'>  * @dstp: the cpumask pointer</div><div class='ctx'>  */</div><div class='del'>-static __always_inline void cpumask_set_cpu(unsigned int cpu, struct cpumask *dstp)</div><div class='add'>+static __always_inline</div><div class='add'>+void cpumask_set_cpu(unsigned int cpu, struct cpumask *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	set_bit(cpumask_check(cpu), cpumask_bits(dstp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline void __cpumask_set_cpu(unsigned int cpu, struct cpumask *dstp)</div><div class='add'>+static __always_inline</div><div class='add'>+void __cpumask_set_cpu(unsigned int cpu, struct cpumask *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	__set_bit(cpumask_check(cpu), cpumask_bits(dstp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * cpumask_clear_cpus - clear cpus in a cpumask</div><div class='add'>+ * @dstp:  the cpumask pointer</div><div class='add'>+ * @cpu:   cpu number (&lt; nr_cpu_ids)</div><div class='add'>+ * @ncpus: number of cpus to clear (&lt; nr_cpu_ids)</div><div class='add'>+ */</div><div class='add'>+static __always_inline void cpumask_clear_cpus(struct cpumask *dstp,</div><div class='add'>+						unsigned int cpu, unsigned int ncpus)</div><div class='add'>+{</div><div class='add'>+	cpumask_check(cpu + ncpus - 1);</div><div class='add'>+	bitmap_clear(cpumask_bits(dstp), cpumask_check(cpu), ncpus);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cpumask_clear_cpu - clear a cpu in a cpumask</div><div class='hunk'>@@ -500,7 +643,8 @@ static __always_inline void __cpumask_clear_cpu(int cpu, struct cpumask *dstp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if @cpu is set in @cpumask, else returns false</div><div class='ctx'>  */</div><div class='del'>-static __always_inline bool cpumask_test_cpu(int cpu, const struct cpumask *cpumask)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_test_cpu(int cpu, const struct cpumask *cpumask)</div><div class='ctx'> {</div><div class='ctx'> 	return test_bit(cpumask_check(cpu), cpumask_bits((cpumask)));</div><div class='ctx'> }</div><div class='hunk'>@@ -514,7 +658,8 @@ static __always_inline bool cpumask_test_cpu(int cpu, const struct cpumask *cpum</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if @cpu is set in old bitmap of @cpumask, else returns false</div><div class='ctx'>  */</div><div class='del'>-static __always_inline bool cpumask_test_and_set_cpu(int cpu, struct cpumask *cpumask)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_test_and_set_cpu(int cpu, struct cpumask *cpumask)</div><div class='ctx'> {</div><div class='ctx'> 	return test_and_set_bit(cpumask_check(cpu), cpumask_bits(cpumask));</div><div class='ctx'> }</div><div class='hunk'>@@ -528,7 +673,8 @@ static __always_inline bool cpumask_test_and_set_cpu(int cpu, struct cpumask *cp</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if @cpu is set in old bitmap of @cpumask, else returns false</div><div class='ctx'>  */</div><div class='del'>-static __always_inline bool cpumask_test_and_clear_cpu(int cpu, struct cpumask *cpumask)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_test_and_clear_cpu(int cpu, struct cpumask *cpumask)</div><div class='ctx'> {</div><div class='ctx'> 	return test_and_clear_bit(cpumask_check(cpu), cpumask_bits(cpumask));</div><div class='ctx'> }</div><div class='hunk'>@@ -537,7 +683,7 @@ static __always_inline bool cpumask_test_and_clear_cpu(int cpu, struct cpumask *</div><div class='ctx'>  * cpumask_setall - set all cpus (&lt; nr_cpu_ids) in a cpumask</div><div class='ctx'>  * @dstp: the cpumask pointer</div><div class='ctx'>  */</div><div class='del'>-static inline void cpumask_setall(struct cpumask *dstp)</div><div class='add'>+static __always_inline void cpumask_setall(struct cpumask *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(small_cpumask_bits)) {</div><div class='ctx'> 		cpumask_bits(dstp)[0] = BITMAP_LAST_WORD_MASK(nr_cpumask_bits);</div><div class='hunk'>@@ -550,7 +696,7 @@ static inline void cpumask_setall(struct cpumask *dstp)</div><div class='ctx'>  * cpumask_clear - clear all cpus (&lt; nr_cpu_ids) in a cpumask</div><div class='ctx'>  * @dstp: the cpumask pointer</div><div class='ctx'>  */</div><div class='del'>-static inline void cpumask_clear(struct cpumask *dstp)</div><div class='add'>+static __always_inline void cpumask_clear(struct cpumask *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_zero(cpumask_bits(dstp), large_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -563,9 +709,9 @@ static inline void cpumask_clear(struct cpumask *dstp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: false if *@dstp is empty, else returns true</div><div class='ctx'>  */</div><div class='del'>-static inline bool cpumask_and(struct cpumask *dstp,</div><div class='del'>-			       const struct cpumask *src1p,</div><div class='del'>-			       const struct cpumask *src2p)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_and(struct cpumask *dstp, const struct cpumask *src1p,</div><div class='add'>+		 const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_and(cpumask_bits(dstp), cpumask_bits(src1p),</div><div class='ctx'> 				       cpumask_bits(src2p), small_cpumask_bits);</div><div class='hunk'>@@ -577,22 +723,39 @@ static inline bool cpumask_and(struct cpumask *dstp,</div><div class='ctx'>  * @src1p: the first input</div><div class='ctx'>  * @src2p: the second input</div><div class='ctx'>  */</div><div class='del'>-static inline void cpumask_or(struct cpumask *dstp, const struct cpumask *src1p,</div><div class='del'>-			      const struct cpumask *src2p)</div><div class='add'>+static __always_inline</div><div class='add'>+void cpumask_or(struct cpumask *dstp, const struct cpumask *src1p,</div><div class='add'>+		const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_or(cpumask_bits(dstp), cpumask_bits(src1p),</div><div class='ctx'> 				      cpumask_bits(src2p), small_cpumask_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * cpumask_weighted_or - *dstp = *src1p | *src2p and return the weight of the result</div><div class='add'>+ * @dstp: the cpumask result</div><div class='add'>+ * @src1p: the first input</div><div class='add'>+ * @src2p: the second input</div><div class='add'>+ *</div><div class='add'>+ * Return: The number of bits set in the resulting cpumask @dstp</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_weighted_or(struct cpumask *dstp, const struct cpumask *src1p,</div><div class='add'>+				 const struct cpumask *src2p)</div><div class='add'>+{</div><div class='add'>+	return bitmap_weighted_or(cpumask_bits(dstp), cpumask_bits(src1p),</div><div class='add'>+				  cpumask_bits(src2p), small_cpumask_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * cpumask_xor - *dstp = *src1p ^ *src2p</div><div class='ctx'>  * @dstp: the cpumask result</div><div class='ctx'>  * @src1p: the first input</div><div class='ctx'>  * @src2p: the second input</div><div class='ctx'>  */</div><div class='del'>-static inline void cpumask_xor(struct cpumask *dstp,</div><div class='del'>-			       const struct cpumask *src1p,</div><div class='del'>-			       const struct cpumask *src2p)</div><div class='add'>+static __always_inline</div><div class='add'>+void cpumask_xor(struct cpumask *dstp, const struct cpumask *src1p,</div><div class='add'>+		 const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_xor(cpumask_bits(dstp), cpumask_bits(src1p),</div><div class='ctx'> 				       cpumask_bits(src2p), small_cpumask_bits);</div><div class='hunk'>@@ -606,9 +769,9 @@ static inline void cpumask_xor(struct cpumask *dstp,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: false if *@dstp is empty, else returns true</div><div class='ctx'>  */</div><div class='del'>-static inline bool cpumask_andnot(struct cpumask *dstp,</div><div class='del'>-				  const struct cpumask *src1p,</div><div class='del'>-				  const struct cpumask *src2p)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_andnot(struct cpumask *dstp, const struct cpumask *src1p,</div><div class='add'>+		    const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_andnot(cpumask_bits(dstp), cpumask_bits(src1p),</div><div class='ctx'> 					  cpumask_bits(src2p), small_cpumask_bits);</div><div class='hunk'>@@ -621,8 +784,8 @@ static inline bool cpumask_andnot(struct cpumask *dstp,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the cpumasks are equal, false if not</div><div class='ctx'>  */</div><div class='del'>-static inline bool cpumask_equal(const struct cpumask *src1p,</div><div class='del'>-				const struct cpumask *src2p)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_equal(const struct cpumask *src1p, const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_equal(cpumask_bits(src1p), cpumask_bits(src2p),</div><div class='ctx'> 						 small_cpumask_bits);</div><div class='hunk'>@@ -637,9 +800,9 @@ static inline bool cpumask_equal(const struct cpumask *src1p,</div><div class='ctx'>  * Return: true if first cpumask ORed with second cpumask == third cpumask,</div><div class='ctx'>  *	   otherwise false</div><div class='ctx'>  */</div><div class='del'>-static inline bool cpumask_or_equal(const struct cpumask *src1p,</div><div class='del'>-				    const struct cpumask *src2p,</div><div class='del'>-				    const struct cpumask *src3p)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_or_equal(const struct cpumask *src1p, const struct cpumask *src2p,</div><div class='add'>+		      const struct cpumask *src3p)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_or_equal(cpumask_bits(src1p), cpumask_bits(src2p),</div><div class='ctx'> 			       cpumask_bits(src3p), small_cpumask_bits);</div><div class='hunk'>@@ -653,8 +816,8 @@ static inline bool cpumask_or_equal(const struct cpumask *src1p,</div><div class='ctx'>  * Return: true if first cpumask ANDed with second cpumask is non-empty,</div><div class='ctx'>  *	   otherwise false</div><div class='ctx'>  */</div><div class='del'>-static inline bool cpumask_intersects(const struct cpumask *src1p,</div><div class='del'>-				     const struct cpumask *src2p)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_intersects(const struct cpumask *src1p, const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_intersects(cpumask_bits(src1p), cpumask_bits(src2p),</div><div class='ctx'> 						      small_cpumask_bits);</div><div class='hunk'>@@ -667,8 +830,8 @@ static inline bool cpumask_intersects(const struct cpumask *src1p,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if *@src1p is a subset of *@src2p, else returns false</div><div class='ctx'>  */</div><div class='del'>-static inline bool cpumask_subset(const struct cpumask *src1p,</div><div class='del'>-				 const struct cpumask *src2p)</div><div class='add'>+static __always_inline</div><div class='add'>+bool cpumask_subset(const struct cpumask *src1p, const struct cpumask *src2p)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_subset(cpumask_bits(src1p), cpumask_bits(src2p),</div><div class='ctx'> 						  small_cpumask_bits);</div><div class='hunk'>@@ -680,7 +843,7 @@ static inline bool cpumask_subset(const struct cpumask *src1p,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if srcp is empty (has no bits set), else false</div><div class='ctx'>  */</div><div class='del'>-static inline bool cpumask_empty(const struct cpumask *srcp)</div><div class='add'>+static __always_inline bool cpumask_empty(const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_empty(cpumask_bits(srcp), small_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -691,7 +854,7 @@ static inline bool cpumask_empty(const struct cpumask *srcp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if srcp is full (has all bits set), else false</div><div class='ctx'>  */</div><div class='del'>-static inline bool cpumask_full(const struct cpumask *srcp)</div><div class='add'>+static __always_inline bool cpumask_full(const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_full(cpumask_bits(srcp), nr_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -702,7 +865,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: count of bits set in *srcp</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_weight(const struct cpumask *srcp)</div><div class='add'>+static __always_inline unsigned int cpumask_weight(const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_weight(cpumask_bits(srcp), small_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -714,8 +877,8 @@ static inline unsigned int cpumask_weight(const struct cpumask *srcp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: count of bits set in both *srcp1 and *srcp2</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_weight_and(const struct cpumask *srcp1,</div><div class='del'>-						const struct cpumask *srcp2)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_weight_and(const struct cpumask *srcp1, const struct cpumask *srcp2)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_weight_and(cpumask_bits(srcp1), cpumask_bits(srcp2), small_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -727,8 +890,9 @@ static inline unsigned int cpumask_weight_and(const struct cpumask *srcp1,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: count of bits set in both *srcp1 and *srcp2</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_weight_andnot(const struct cpumask *srcp1,</div><div class='del'>-						const struct cpumask *srcp2)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned int cpumask_weight_andnot(const struct cpumask *srcp1,</div><div class='add'>+				   const struct cpumask *srcp2)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_weight_andnot(cpumask_bits(srcp1), cpumask_bits(srcp2), small_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -739,8 +903,8 @@ static inline unsigned int cpumask_weight_andnot(const struct cpumask *srcp1,</div><div class='ctx'>  * @srcp: the input to shift</div><div class='ctx'>  * @n: the number of bits to shift by</div><div class='ctx'>  */</div><div class='del'>-static inline void cpumask_shift_right(struct cpumask *dstp,</div><div class='del'>-				       const struct cpumask *srcp, int n)</div><div class='add'>+static __always_inline</div><div class='add'>+void cpumask_shift_right(struct cpumask *dstp, const struct cpumask *srcp, int n)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_shift_right(cpumask_bits(dstp), cpumask_bits(srcp), n,</div><div class='ctx'> 					       small_cpumask_bits);</div><div class='hunk'>@@ -752,8 +916,8 @@ static inline void cpumask_shift_right(struct cpumask *dstp,</div><div class='ctx'>  * @srcp: the input to shift</div><div class='ctx'>  * @n: the number of bits to shift by</div><div class='ctx'>  */</div><div class='del'>-static inline void cpumask_shift_left(struct cpumask *dstp,</div><div class='del'>-				      const struct cpumask *srcp, int n)</div><div class='add'>+static __always_inline</div><div class='add'>+void cpumask_shift_left(struct cpumask *dstp, const struct cpumask *srcp, int n)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_shift_left(cpumask_bits(dstp), cpumask_bits(srcp), n,</div><div class='ctx'> 					      nr_cpumask_bits);</div><div class='hunk'>@@ -764,14 +928,14 @@ static inline void cpumask_shift_left(struct cpumask *dstp,</div><div class='ctx'>  * @dstp: the result</div><div class='ctx'>  * @srcp: the input cpumask</div><div class='ctx'>  */</div><div class='del'>-static inline void cpumask_copy(struct cpumask *dstp,</div><div class='del'>-				const struct cpumask *srcp)</div><div class='add'>+static __always_inline</div><div class='add'>+void cpumask_copy(struct cpumask *dstp, const struct cpumask *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_copy(cpumask_bits(dstp), cpumask_bits(srcp), large_cpumask_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cpumask_any - pick a "random" cpu from *srcp</div><div class='add'>+ * cpumask_any - pick an arbitrary cpu from *srcp</div><div class='ctx'>  * @srcp: the input cpumask</div><div class='ctx'>  *</div><div class='ctx'>  * Return: &gt;= nr_cpu_ids if no cpus set.</div><div class='hunk'>@@ -779,7 +943,7 @@ static inline void cpumask_copy(struct cpumask *dstp,</div><div class='ctx'> #define cpumask_any(srcp) cpumask_first(srcp)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cpumask_any_and - pick a "random" cpu from *mask1 &amp; *mask2</div><div class='add'>+ * cpumask_any_and - pick an arbitrary cpu from *mask1 &amp; *mask2</div><div class='ctx'>  * @mask1: the first input cpumask</div><div class='ctx'>  * @mask2: the second input cpumask</div><div class='ctx'>  *</div><div class='hunk'>@@ -801,8 +965,8 @@ static inline void cpumask_copy(struct cpumask *dstp,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: -errno, or 0 for success.</div><div class='ctx'>  */</div><div class='del'>-static inline int cpumask_parse_user(const char __user *buf, int len,</div><div class='del'>-				     struct cpumask *dstp)</div><div class='add'>+static __always_inline</div><div class='add'>+int cpumask_parse_user(const char __user *buf, int len, struct cpumask *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_parse_user(buf, len, cpumask_bits(dstp), nr_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -815,8 +979,8 @@ static inline int cpumask_parse_user(const char __user *buf, int len,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: -errno, or 0 for success.</div><div class='ctx'>  */</div><div class='del'>-static inline int cpumask_parselist_user(const char __user *buf, int len,</div><div class='del'>-				     struct cpumask *dstp)</div><div class='add'>+static __always_inline</div><div class='add'>+int cpumask_parselist_user(const char __user *buf, int len, struct cpumask *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_parselist_user(buf, len, cpumask_bits(dstp),</div><div class='ctx'> 				     nr_cpumask_bits);</div><div class='hunk'>@@ -829,7 +993,7 @@ static inline int cpumask_parselist_user(const char __user *buf, int len,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: -errno, or 0 for success.</div><div class='ctx'>  */</div><div class='del'>-static inline int cpumask_parse(const char *buf, struct cpumask *dstp)</div><div class='add'>+static __always_inline int cpumask_parse(const char *buf, struct cpumask *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_parse(buf, UINT_MAX, cpumask_bits(dstp), nr_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -841,7 +1005,7 @@ static inline int cpumask_parse(const char *buf, struct cpumask *dstp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: -errno, or 0 for success.</div><div class='ctx'>  */</div><div class='del'>-static inline int cpulist_parse(const char *buf, struct cpumask *dstp)</div><div class='add'>+static __always_inline int cpulist_parse(const char *buf, struct cpumask *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_parselist(buf, cpumask_bits(dstp), nr_cpumask_bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -851,60 +1015,20 @@ static inline int cpulist_parse(const char *buf, struct cpumask *dstp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: size to allocate for a &amp;struct cpumask in bytes</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int cpumask_size(void)</div><div class='add'>+static __always_inline unsigned int cpumask_size(void)</div><div class='ctx'> {</div><div class='del'>-	return BITS_TO_LONGS(large_cpumask_bits) * sizeof(long);</div><div class='add'>+	return bitmap_size(large_cpumask_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * cpumask_var_t: struct cpumask for stack usage.</div><div class='del'>- *</div><div class='del'>- * Oh, the wicked games we play!  In order to make kernel coding a</div><div class='del'>- * little more difficult, we typedef cpumask_var_t to an array or a</div><div class='del'>- * pointer: doing &amp;mask on an array is a noop, so it still works.</div><div class='del'>- *</div><div class='del'>- * i.e.</div><div class='del'>- *	cpumask_var_t tmpmask;</div><div class='del'>- *	if (!alloc_cpumask_var(&amp;tmpmask, GFP_KERNEL))</div><div class='del'>- *		return -ENOMEM;</div><div class='del'>- *</div><div class='del'>- *	  ... use 'tmpmask' like a normal struct cpumask * ...</div><div class='del'>- *</div><div class='del'>- *	free_cpumask_var(tmpmask);</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * However, one notable exception is there. alloc_cpumask_var() allocates</div><div class='del'>- * only nr_cpumask_bits bits (in the other hand, real cpumask_t always has</div><div class='del'>- * NR_CPUS bits). Therefore you don't have to dereference cpumask_var_t.</div><div class='del'>- *</div><div class='del'>- *	cpumask_var_t tmpmask;</div><div class='del'>- *	if (!alloc_cpumask_var(&amp;tmpmask, GFP_KERNEL))</div><div class='del'>- *		return -ENOMEM;</div><div class='del'>- *</div><div class='del'>- *	var = *tmpmask;</div><div class='del'>- *</div><div class='del'>- * This code makes NR_CPUS length memcopy and brings to a memory corruption.</div><div class='del'>- * cpumask_copy() provide safe copy functionality.</div><div class='del'>- *</div><div class='del'>- * Note that there is another evil here: If you define a cpumask_var_t</div><div class='del'>- * as a percpu variable then the way to obtain the address of the cpumask</div><div class='del'>- * structure differently influences what this_cpu_* operation needs to be</div><div class='del'>- * used. Please use this_cpu_cpumask_var_t in those cases. The direct use</div><div class='del'>- * of this_cpu_ptr() or this_cpu_read() will lead to failures when the</div><div class='del'>- * other type of cpumask_var_t implementation is configured.</div><div class='del'>- *</div><div class='del'>- * Please also note that __cpumask_var_read_mostly can be used to declare</div><div class='del'>- * a cpumask_var_t variable itself (not its content) as read mostly.</div><div class='del'>- */</div><div class='ctx'> #ifdef CONFIG_CPUMASK_OFFSTACK</div><div class='del'>-typedef struct cpumask *cpumask_var_t;</div><div class='ctx'> </div><div class='ctx'> #define this_cpu_cpumask_var_ptr(x)	this_cpu_read(x)</div><div class='ctx'> #define __cpumask_var_read_mostly	__read_mostly</div><div class='add'>+#define CPUMASK_VAR_NULL		NULL</div><div class='ctx'> </div><div class='ctx'> bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node);</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> bool zalloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)</div><div class='ctx'> {</div><div class='ctx'> 	return alloc_cpumask_var_node(mask, flags | __GFP_ZERO, node);</div><div class='hunk'>@@ -922,13 +1046,13 @@ bool zalloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: %true if allocation succeeded, %false if not</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	return alloc_cpumask_var_node(mask, flags, NUMA_NO_NODE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> bool zalloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	return alloc_cpumask_var(mask, flags | __GFP_ZERO);</div><div class='hunk'>@@ -938,54 +1062,54 @@ void alloc_bootmem_cpumask_var(cpumask_var_t *mask);</div><div class='ctx'> void free_cpumask_var(cpumask_var_t mask);</div><div class='ctx'> void free_bootmem_cpumask_var(cpumask_var_t mask);</div><div class='ctx'> </div><div class='del'>-static inline bool cpumask_available(cpumask_var_t mask)</div><div class='add'>+static __always_inline bool cpumask_available(cpumask_var_t mask)</div><div class='ctx'> {</div><div class='ctx'> 	return mask != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-typedef struct cpumask cpumask_var_t[1];</div><div class='ctx'> </div><div class='ctx'> #define this_cpu_cpumask_var_ptr(x) this_cpu_ptr(x)</div><div class='ctx'> #define __cpumask_var_read_mostly</div><div class='add'>+#define CPUMASK_VAR_NULL {}</div><div class='ctx'> </div><div class='del'>-static inline bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)</div><div class='add'>+static __always_inline bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags,</div><div class='add'>+static __always_inline bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags,</div><div class='ctx'> 					  int node)</div><div class='ctx'> {</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool zalloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)</div><div class='add'>+static __always_inline bool zalloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	cpumask_clear(*mask);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool zalloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags,</div><div class='add'>+static __always_inline bool zalloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags,</div><div class='ctx'> 					  int node)</div><div class='ctx'> {</div><div class='ctx'> 	cpumask_clear(*mask);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void alloc_bootmem_cpumask_var(cpumask_var_t *mask)</div><div class='add'>+static __always_inline void alloc_bootmem_cpumask_var(cpumask_var_t *mask)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void free_cpumask_var(cpumask_var_t mask)</div><div class='add'>+static __always_inline void free_cpumask_var(cpumask_var_t mask)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void free_bootmem_cpumask_var(cpumask_var_t mask)</div><div class='add'>+static __always_inline void free_bootmem_cpumask_var(cpumask_var_t mask)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpumask_available(cpumask_var_t mask)</div><div class='add'>+static __always_inline bool cpumask_available(cpumask_var_t mask)</div><div class='ctx'> {</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -1006,59 +1130,40 @@ extern const DECLARE_BITMAP(cpu_all_bits, NR_CPUS);</div><div class='ctx'> #define for_each_possible_cpu(cpu)	for ((cpu) = 0; (cpu) &lt; 1; (cpu)++)</div><div class='ctx'> #define for_each_online_cpu(cpu)	for ((cpu) = 0; (cpu) &lt; 1; (cpu)++)</div><div class='ctx'> #define for_each_present_cpu(cpu)	for ((cpu) = 0; (cpu) &lt; 1; (cpu)++)</div><div class='add'>+</div><div class='add'>+#define for_each_possible_cpu_wrap(cpu, start)	\</div><div class='add'>+	for ((void)(start), (cpu) = 0; (cpu) &lt; 1; (cpu)++)</div><div class='add'>+#define for_each_online_cpu_wrap(cpu, start)	\</div><div class='add'>+	for ((void)(start), (cpu) = 0; (cpu) &lt; 1; (cpu)++)</div><div class='ctx'> #else</div><div class='ctx'> #define for_each_possible_cpu(cpu) for_each_cpu((cpu), cpu_possible_mask)</div><div class='ctx'> #define for_each_online_cpu(cpu)   for_each_cpu((cpu), cpu_online_mask)</div><div class='add'>+#define for_each_enabled_cpu(cpu)   for_each_cpu((cpu), cpu_enabled_mask)</div><div class='ctx'> #define for_each_present_cpu(cpu)  for_each_cpu((cpu), cpu_present_mask)</div><div class='add'>+</div><div class='add'>+#define for_each_possible_cpu_wrap(cpu, start)	\</div><div class='add'>+	for_each_cpu_wrap((cpu), cpu_possible_mask, (start))</div><div class='add'>+#define for_each_online_cpu_wrap(cpu, start)	\</div><div class='add'>+	for_each_cpu_wrap((cpu), cpu_online_mask, (start))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Wrappers for arch boot code to manipulate normally-constant masks */</div><div class='ctx'> void init_cpu_present(const struct cpumask *src);</div><div class='ctx'> void init_cpu_possible(const struct cpumask *src);</div><div class='del'>-void init_cpu_online(const struct cpumask *src);</div><div class='ctx'> </div><div class='del'>-static inline void reset_cpu_possible_mask(void)</div><div class='del'>-{</div><div class='del'>-	bitmap_zero(cpumask_bits(&amp;__cpu_possible_mask), NR_CPUS);</div><div class='del'>-}</div><div class='add'>+#define assign_cpu(cpu, mask, val)	\</div><div class='add'>+	assign_bit(cpumask_check(cpu), cpumask_bits(mask), (val))</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-set_cpu_possible(unsigned int cpu, bool possible)</div><div class='del'>-{</div><div class='del'>-	if (possible)</div><div class='del'>-		cpumask_set_cpu(cpu, &amp;__cpu_possible_mask);</div><div class='del'>-	else</div><div class='del'>-		cpumask_clear_cpu(cpu, &amp;__cpu_possible_mask);</div><div class='del'>-}</div><div class='add'>+#define __assign_cpu(cpu, mask, val)	\</div><div class='add'>+	__assign_bit(cpumask_check(cpu), cpumask_bits(mask), (val))</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-set_cpu_present(unsigned int cpu, bool present)</div><div class='del'>-{</div><div class='del'>-	if (present)</div><div class='del'>-		cpumask_set_cpu(cpu, &amp;__cpu_present_mask);</div><div class='del'>-	else</div><div class='del'>-		cpumask_clear_cpu(cpu, &amp;__cpu_present_mask);</div><div class='del'>-}</div><div class='add'>+#define set_cpu_enabled(cpu, enabled)	assign_cpu((cpu), &amp;__cpu_enabled_mask, (enabled))</div><div class='add'>+#define set_cpu_present(cpu, present)	assign_cpu((cpu), &amp;__cpu_present_mask, (present))</div><div class='add'>+#define set_cpu_active(cpu, active)	assign_cpu((cpu), &amp;__cpu_active_mask, (active))</div><div class='add'>+#define set_cpu_dying(cpu, dying)	assign_cpu((cpu), &amp;__cpu_dying_mask, (dying))</div><div class='ctx'> </div><div class='ctx'> void set_cpu_online(unsigned int cpu, bool online);</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-set_cpu_active(unsigned int cpu, bool active)</div><div class='del'>-{</div><div class='del'>-	if (active)</div><div class='del'>-		cpumask_set_cpu(cpu, &amp;__cpu_active_mask);</div><div class='del'>-	else</div><div class='del'>-		cpumask_clear_cpu(cpu, &amp;__cpu_active_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-set_cpu_dying(unsigned int cpu, bool dying)</div><div class='del'>-{</div><div class='del'>-	if (dying)</div><div class='del'>-		cpumask_set_cpu(cpu, &amp;__cpu_dying_mask);</div><div class='del'>-	else</div><div class='del'>-		cpumask_clear_cpu(cpu, &amp;__cpu_dying_mask);</div><div class='del'>-}</div><div class='add'>+void set_cpu_possible(unsigned int cpu, bool possible);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * to_cpumask - convert a NR_CPUS bitmap to a struct cpumask *</div><div class='hunk'>@@ -1074,7 +1179,7 @@ set_cpu_dying(unsigned int cpu, bool dying)</div><div class='ctx'> 	((struct cpumask *)(1 ? (bitmap)				\</div><div class='ctx'> 			    : (void *)sizeof(__check_is_bitmap(bitmap))))</div><div class='ctx'> </div><div class='del'>-static inline int __check_is_bitmap(const unsigned long *bitmap)</div><div class='add'>+static __always_inline int __check_is_bitmap(const unsigned long *bitmap)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1089,7 +1194,7 @@ static inline int __check_is_bitmap(const unsigned long *bitmap)</div><div class='ctx'> extern const unsigned long</div><div class='ctx'> 	cpu_bit_bitmap[BITS_PER_LONG+1][BITS_TO_LONGS(NR_CPUS)];</div><div class='ctx'> </div><div class='del'>-static inline const struct cpumask *get_cpu_mask(unsigned int cpu)</div><div class='add'>+static __always_inline const struct cpumask *get_cpu_mask(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned long *p = cpu_bit_bitmap[1 + cpu % BITS_PER_LONG];</div><div class='ctx'> 	p -= cpu / BITS_PER_LONG;</div><div class='hunk'>@@ -1111,31 +1216,42 @@ static __always_inline unsigned int num_online_cpus(void)</div><div class='ctx'> {</div><div class='ctx'> 	return raw_atomic_read(&amp;__num_online_cpus);</div><div class='ctx'> }</div><div class='del'>-#define num_possible_cpus()	cpumask_weight(cpu_possible_mask)</div><div class='add'>+</div><div class='add'>+static __always_inline unsigned int num_possible_cpus(void)</div><div class='add'>+{</div><div class='add'>+	return __num_possible_cpus;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define num_enabled_cpus()	cpumask_weight(cpu_enabled_mask)</div><div class='ctx'> #define num_present_cpus()	cpumask_weight(cpu_present_mask)</div><div class='ctx'> #define num_active_cpus()	cpumask_weight(cpu_active_mask)</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_online(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_test_cpu(cpu, cpu_online_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_possible(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_enabled(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	return cpumask_test_cpu(cpu, cpu_enabled_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline bool cpu_possible(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_test_cpu(cpu, cpu_possible_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_present(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_present(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_test_cpu(cpu, cpu_present_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_active(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_active(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_test_cpu(cpu, cpu_active_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_dying(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_dying(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_test_cpu(cpu, cpu_dying_mask);</div><div class='ctx'> }</div><div class='hunk'>@@ -1144,30 +1260,36 @@ static inline bool cpu_dying(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> #define num_online_cpus()	1U</div><div class='ctx'> #define num_possible_cpus()	1U</div><div class='add'>+#define num_enabled_cpus()	1U</div><div class='ctx'> #define num_present_cpus()	1U</div><div class='ctx'> #define num_active_cpus()	1U</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_online(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_online(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpu == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_possible(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_possible(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpu == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_present(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_enabled(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpu == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_active(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_present(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpu == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool cpu_dying(unsigned int cpu)</div><div class='add'>+static __always_inline bool cpu_active(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	return cpu == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline bool cpu_dying(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -1201,7 +1323,7 @@ static inline bool cpu_dying(unsigned int cpu)</div><div class='ctx'>  * Return: the length of the (null-terminated) @buf string, zero if</div><div class='ctx'>  * nothing is copied.</div><div class='ctx'>  */</div><div class='del'>-static inline ssize_t</div><div class='add'>+static __always_inline ssize_t</div><div class='ctx'> cpumap_print_to_pagebuf(bool list, char *buf, const struct cpumask *mask)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_print_to_pagebuf(list, buf, cpumask_bits(mask),</div><div class='hunk'>@@ -1224,9 +1346,9 @@ cpumap_print_to_pagebuf(bool list, char *buf, const struct cpumask *mask)</div><div class='ctx'>  * Return: the length of how many bytes have been copied, excluding</div><div class='ctx'>  * terminating '\0'.</div><div class='ctx'>  */</div><div class='del'>-static inline ssize_t</div><div class='del'>-cpumap_print_bitmask_to_buf(char *buf, const struct cpumask *mask,</div><div class='del'>-		loff_t off, size_t count)</div><div class='add'>+static __always_inline</div><div class='add'>+ssize_t cpumap_print_bitmask_to_buf(char *buf, const struct cpumask *mask,</div><div class='add'>+				    loff_t off, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_print_bitmask_to_buf(buf, cpumask_bits(mask),</div><div class='ctx'> 				   nr_cpu_ids, off, count) - 1;</div><div class='hunk'>@@ -1246,9 +1368,9 @@ cpumap_print_bitmask_to_buf(char *buf, const struct cpumask *mask,</div><div class='ctx'>  * Return: the length of how many bytes have been copied, excluding</div><div class='ctx'>  * terminating '\0'.</div><div class='ctx'>  */</div><div class='del'>-static inline ssize_t</div><div class='del'>-cpumap_print_list_to_buf(char *buf, const struct cpumask *mask,</div><div class='del'>-		loff_t off, size_t count)</div><div class='add'>+static __always_inline</div><div class='add'>+ssize_t cpumap_print_list_to_buf(char *buf, const struct cpumask *mask,</div><div class='add'>+				 loff_t off, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_print_list_to_buf(buf, cpumask_bits(mask),</div><div class='ctx'> 				   nr_cpu_ids, off, count) - 1;</div><div class='head'>diff --git a/include/linux/cpumask_types.h b/include/linux/cpumask_types.h<br/>new file mode 100644<br/>index 000000000000..461ed1b6bcdb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpumask_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpumask_types.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __LINUX_CPUMASK_TYPES_H</div><div class='add'>+#define __LINUX_CPUMASK_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/threads.h&gt;</div><div class='add'>+</div><div class='add'>+/* Don't assign or return these: may not be this big! */</div><div class='add'>+typedef struct cpumask { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cpumask_bits - get the bits in a cpumask</div><div class='add'>+ * @maskp: the struct cpumask *</div><div class='add'>+ *</div><div class='add'>+ * You should only assume nr_cpu_ids bits of this mask are valid.  This is</div><div class='add'>+ * a macro so it's const-correct.</div><div class='add'>+ */</div><div class='add'>+#define cpumask_bits(maskp) ((maskp)-&gt;bits)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cpumask_var_t: struct cpumask for stack usage.</div><div class='add'>+ *</div><div class='add'>+ * Oh, the wicked games we play!  In order to make kernel coding a</div><div class='add'>+ * little more difficult, we typedef cpumask_var_t to an array or a</div><div class='add'>+ * pointer: doing &amp;mask on an array is a noop, so it still works.</div><div class='add'>+ *</div><div class='add'>+ * i.e.</div><div class='add'>+ *	cpumask_var_t tmpmask;</div><div class='add'>+ *	if (!alloc_cpumask_var(&amp;tmpmask, GFP_KERNEL))</div><div class='add'>+ *		return -ENOMEM;</div><div class='add'>+ *</div><div class='add'>+ *	  ... use 'tmpmask' like a normal struct cpumask * ...</div><div class='add'>+ *</div><div class='add'>+ *	free_cpumask_var(tmpmask);</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * However, one notable exception is there. alloc_cpumask_var() allocates</div><div class='add'>+ * only nr_cpumask_bits bits (in the other hand, real cpumask_t always has</div><div class='add'>+ * NR_CPUS bits). Therefore you don't have to dereference cpumask_var_t.</div><div class='add'>+ *</div><div class='add'>+ *	cpumask_var_t tmpmask;</div><div class='add'>+ *	if (!alloc_cpumask_var(&amp;tmpmask, GFP_KERNEL))</div><div class='add'>+ *		return -ENOMEM;</div><div class='add'>+ *</div><div class='add'>+ *	var = *tmpmask;</div><div class='add'>+ *</div><div class='add'>+ * This code makes NR_CPUS length memcopy and brings to a memory corruption.</div><div class='add'>+ * cpumask_copy() provide safe copy functionality.</div><div class='add'>+ *</div><div class='add'>+ * Note that there is another evil here: If you define a cpumask_var_t</div><div class='add'>+ * as a percpu variable then the way to obtain the address of the cpumask</div><div class='add'>+ * structure differently influences what this_cpu_* operation needs to be</div><div class='add'>+ * used. Please use this_cpu_cpumask_var_t in those cases. The direct use</div><div class='add'>+ * of this_cpu_ptr() or this_cpu_read() will lead to failures when the</div><div class='add'>+ * other type of cpumask_var_t implementation is configured.</div><div class='add'>+ *</div><div class='add'>+ * Please also note that __cpumask_var_read_mostly can be used to declare</div><div class='add'>+ * a cpumask_var_t variable itself (not its content) as read mostly.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_CPUMASK_OFFSTACK</div><div class='add'>+typedef struct cpumask *cpumask_var_t;</div><div class='add'>+#else</div><div class='add'>+typedef struct cpumask cpumask_var_t[1];</div><div class='add'>+#endif /* CONFIG_CPUMASK_OFFSTACK */</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_CPUMASK_TYPES_H */</div><div class='head'>diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h<br/>index 0ce6ff0d9c9a..a98d3330385c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cpuset.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cpuset.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cpuset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cpuset.h</a></div><div class='hunk'>@@ -70,11 +70,11 @@ extern int cpuset_init(void);</div><div class='ctx'> extern void cpuset_init_smp(void);</div><div class='ctx'> extern void cpuset_force_rebuild(void);</div><div class='ctx'> extern void cpuset_update_active_cpus(void);</div><div class='del'>-extern void cpuset_wait_for_hotplug(void);</div><div class='ctx'> extern void inc_dl_tasks_cs(struct task_struct *task);</div><div class='ctx'> extern void dec_dl_tasks_cs(struct task_struct *task);</div><div class='ctx'> extern void cpuset_lock(void);</div><div class='ctx'> extern void cpuset_unlock(void);</div><div class='add'>+extern void cpuset_cpus_allowed_locked(struct task_struct *p, struct cpumask *mask);</div><div class='ctx'> extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);</div><div class='ctx'> extern bool cpuset_cpus_allowed_fallback(struct task_struct *p);</div><div class='ctx'> extern bool cpuset_cpu_is_isolated(int cpu);</div><div class='hunk'>@@ -83,11 +83,11 @@ extern nodemask_t cpuset_mems_allowed(struct task_struct *p);</div><div class='ctx'> void cpuset_init_current_mems_allowed(void);</div><div class='ctx'> int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask);</div><div class='ctx'> </div><div class='del'>-extern bool cpuset_node_allowed(int node, gfp_t gfp_mask);</div><div class='add'>+extern bool cpuset_current_node_allowed(int node, gfp_t gfp_mask);</div><div class='ctx'> </div><div class='ctx'> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='del'>-	return cpuset_node_allowed(zone_to_nid(z), gfp_mask);</div><div class='add'>+	return cpuset_current_node_allowed(zone_to_nid(z), gfp_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)</div><div class='hunk'>@@ -100,6 +100,7 @@ static inline bool cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)</div><div class='ctx'> extern int cpuset_mems_allowed_intersects(const struct task_struct *tsk1,</div><div class='ctx'> 					  const struct task_struct *tsk2);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPUSETS_V1</div><div class='ctx'> #define cpuset_memory_pressure_bump() 				\</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		if (cpuset_memory_pressure_enabled)		\</div><div class='hunk'>@@ -107,6 +108,9 @@ extern int cpuset_mems_allowed_intersects(const struct task_struct *tsk1,</div><div class='ctx'> 	} while (0)</div><div class='ctx'> extern int cpuset_memory_pressure_enabled;</div><div class='ctx'> extern void __cpuset_memory_pressure_bump(void);</div><div class='add'>+#else</div><div class='add'>+static inline void cpuset_memory_pressure_bump(void) { }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> extern void cpuset_task_status_allowed(struct seq_file *m,</div><div class='ctx'> 					struct task_struct *task);</div><div class='hunk'>@@ -114,7 +118,6 @@ extern int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,</div><div class='ctx'> 			    struct pid *pid, struct task_struct *tsk);</div><div class='ctx'> </div><div class='ctx'> extern int cpuset_mem_spread_node(void);</div><div class='del'>-extern int cpuset_slab_spread_node(void);</div><div class='ctx'> </div><div class='ctx'> static inline int cpuset_do_page_mem_spread(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -123,9 +126,11 @@ static inline int cpuset_do_page_mem_spread(void)</div><div class='ctx'> </div><div class='ctx'> extern bool current_cpuset_is_being_rebound(void);</div><div class='ctx'> </div><div class='add'>+extern void dl_rebuild_rd_accounting(void);</div><div class='ctx'> extern void rebuild_sched_domains(void);</div><div class='ctx'> </div><div class='ctx'> extern void cpuset_print_current_mems_allowed(void);</div><div class='add'>+extern void cpuset_reset_sched_domains(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * read_mems_allowed_begin is required when making decisions involving</div><div class='hunk'>@@ -169,6 +174,7 @@ static inline void set_mems_allowed(nodemask_t nodemask)</div><div class='ctx'> 	task_unlock(current);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern bool cpuset_node_allowed(struct cgroup *cgroup, int nid);</div><div class='ctx'> #else /* !CONFIG_CPUSETS */</div><div class='ctx'> </div><div class='ctx'> static inline bool cpusets_enabled(void) { return false; }</div><div class='hunk'>@@ -185,17 +191,21 @@ static inline void cpuset_update_active_cpus(void)</div><div class='ctx'> 	partition_sched_domains(1, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void cpuset_wait_for_hotplug(void) { }</div><div class='del'>-</div><div class='ctx'> static inline void inc_dl_tasks_cs(struct task_struct *task) { }</div><div class='ctx'> static inline void dec_dl_tasks_cs(struct task_struct *task) { }</div><div class='ctx'> static inline void cpuset_lock(void) { }</div><div class='ctx'> static inline void cpuset_unlock(void) { }</div><div class='ctx'> </div><div class='add'>+static inline void cpuset_cpus_allowed_locked(struct task_struct *p,</div><div class='add'>+					struct cpumask *mask)</div><div class='add'>+{</div><div class='add'>+	cpumask_copy(mask, task_cpu_possible_mask(p));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void cpuset_cpus_allowed(struct task_struct *p,</div><div class='ctx'> 				       struct cpumask *mask)</div><div class='ctx'> {</div><div class='del'>-	cpumask_copy(mask, task_cpu_possible_mask(p));</div><div class='add'>+	cpuset_cpus_allowed_locked(p, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool cpuset_cpus_allowed_fallback(struct task_struct *p)</div><div class='hunk'>@@ -249,11 +259,6 @@ static inline int cpuset_mem_spread_node(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int cpuset_slab_spread_node(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int cpuset_do_page_mem_spread(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -264,11 +269,20 @@ static inline bool current_cpuset_is_being_rebound(void)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void dl_rebuild_rd_accounting(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void rebuild_sched_domains(void)</div><div class='ctx'> {</div><div class='ctx'> 	partition_sched_domains(1, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void cpuset_reset_sched_domains(void)</div><div class='add'>+{</div><div class='add'>+	partition_sched_domains(1, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void cpuset_print_current_mems_allowed(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -287,6 +301,10 @@ static inline bool read_mems_allowed_retry(unsigned int seq)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool cpuset_node_allowed(struct cgroup *cgroup, int nid)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> #endif /* !CONFIG_CPUSETS */</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_CPUSET_H */</div><div class='head'>diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h<br/>index 9eaeaafe0cad..d35726d6a415 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crash_core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crash_core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crash_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crash_core.h</a></div><div class='hunk'>@@ -5,129 +5,62 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='del'>-#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION</div><div class='del'>-#include &lt;asm/crash_core.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-/* Location of a reserved region to hold the crash kernel.</div><div class='del'>- */</div><div class='del'>-extern struct resource crashk_res;</div><div class='del'>-extern struct resource crashk_low_res;</div><div class='add'>+struct kimage;</div><div class='add'>+</div><div class='add'>+struct crash_mem {</div><div class='add'>+	unsigned int max_nr_ranges;</div><div class='add'>+	unsigned int nr_ranges;</div><div class='add'>+	struct range ranges[] __counted_by(max_nr_ranges);</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#define CRASH_CORE_NOTE_NAME	   "CORE"</div><div class='del'>-#define CRASH_CORE_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4)</div><div class='del'>-#define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(CRASH_CORE_NOTE_NAME), 4)</div><div class='del'>-#define CRASH_CORE_NOTE_DESC_BYTES ALIGN(sizeof(struct elf_prstatus), 4)</div><div class='add'>+#ifdef CONFIG_CRASH_DUMP</div><div class='ctx'> </div><div class='add'>+int crash_shrink_memory(unsigned long new_size);</div><div class='add'>+ssize_t crash_get_memory_size(void);</div><div class='add'>+</div><div class='add'>+#ifndef arch_kexec_protect_crashkres</div><div class='ctx'> /*</div><div class='del'>- * The per-cpu notes area is a list of notes terminated by a "NULL"</div><div class='del'>- * note header.  For kdump, the code in vmcore.c runs in the context</div><div class='del'>- * of the second kernel to combine them into one note.</div><div class='add'>+ * Protection mechanism for crashkernel reserved memory after</div><div class='add'>+ * the kdump kernel is loaded.</div><div class='add'>+ *</div><div class='add'>+ * Provide an empty default implementation here -- architecture</div><div class='add'>+ * code may override this</div><div class='ctx'>  */</div><div class='del'>-#define CRASH_CORE_NOTE_BYTES	   ((CRASH_CORE_NOTE_HEAD_BYTES * 2) +	\</div><div class='del'>-				     CRASH_CORE_NOTE_NAME_BYTES +	\</div><div class='del'>-				     CRASH_CORE_NOTE_DESC_BYTES)</div><div class='del'>-</div><div class='del'>-#define VMCOREINFO_BYTES	   PAGE_SIZE</div><div class='del'>-#define VMCOREINFO_NOTE_NAME	   "VMCOREINFO"</div><div class='del'>-#define VMCOREINFO_NOTE_NAME_BYTES ALIGN(sizeof(VMCOREINFO_NOTE_NAME), 4)</div><div class='del'>-#define VMCOREINFO_NOTE_SIZE	   ((CRASH_CORE_NOTE_HEAD_BYTES * 2) +	\</div><div class='del'>-				     VMCOREINFO_NOTE_NAME_BYTES +	\</div><div class='del'>-				     VMCOREINFO_BYTES)</div><div class='del'>-</div><div class='del'>-typedef u32 note_buf_t[CRASH_CORE_NOTE_BYTES/4];</div><div class='del'>-/* Per cpu memory for storing cpu states in case of system crash. */</div><div class='del'>-extern note_buf_t __percpu *crash_notes;</div><div class='del'>-</div><div class='del'>-void crash_update_vmcoreinfo_safecopy(void *ptr);</div><div class='del'>-void crash_save_vmcoreinfo(void);</div><div class='del'>-void arch_crash_save_vmcoreinfo(void);</div><div class='del'>-__printf(1, 2)</div><div class='del'>-void vmcoreinfo_append_str(const char *fmt, ...);</div><div class='del'>-phys_addr_t paddr_vmcoreinfo_note(void);</div><div class='del'>-</div><div class='del'>-#define VMCOREINFO_OSRELEASE(value) \</div><div class='del'>-	vmcoreinfo_append_str("OSRELEASE=%s\n", value)</div><div class='del'>-#define VMCOREINFO_BUILD_ID()						\</div><div class='del'>-	({								\</div><div class='del'>-		static_assert(sizeof(vmlinux_build_id) == 20);		\</div><div class='del'>-		vmcoreinfo_append_str("BUILD-ID=%20phN\n", vmlinux_build_id); \</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-#define VMCOREINFO_PAGESIZE(value) \</div><div class='del'>-	vmcoreinfo_append_str("PAGESIZE=%ld\n", value)</div><div class='del'>-#define VMCOREINFO_SYMBOL(name) \</div><div class='del'>-	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&amp;name)</div><div class='del'>-#define VMCOREINFO_SYMBOL_ARRAY(name) \</div><div class='del'>-	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)</div><div class='del'>-#define VMCOREINFO_SIZE(name) \</div><div class='del'>-	vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \</div><div class='del'>-			      (unsigned long)sizeof(name))</div><div class='del'>-#define VMCOREINFO_STRUCT_SIZE(name) \</div><div class='del'>-	vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \</div><div class='del'>-			      (unsigned long)sizeof(struct name))</div><div class='del'>-#define VMCOREINFO_OFFSET(name, field) \</div><div class='del'>-	vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \</div><div class='del'>-			      (unsigned long)offsetof(struct name, field))</div><div class='del'>-#define VMCOREINFO_TYPE_OFFSET(name, field) \</div><div class='del'>-	vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \</div><div class='del'>-			      (unsigned long)offsetof(name, field))</div><div class='del'>-#define VMCOREINFO_LENGTH(name, value) \</div><div class='del'>-	vmcoreinfo_append_str("LENGTH(%s)=%lu\n", #name, (unsigned long)value)</div><div class='del'>-#define VMCOREINFO_NUMBER(name) \</div><div class='del'>-	vmcoreinfo_append_str("NUMBER(%s)=%ld\n", #name, (long)name)</div><div class='del'>-#define VMCOREINFO_CONFIG(name) \</div><div class='del'>-	vmcoreinfo_append_str("CONFIG_%s=y\n", #name)</div><div class='del'>-</div><div class='del'>-extern unsigned char *vmcoreinfo_data;</div><div class='del'>-extern size_t vmcoreinfo_size;</div><div class='del'>-extern u32 *vmcoreinfo_note;</div><div class='del'>-</div><div class='del'>-Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type,</div><div class='del'>-			  void *data, size_t data_len);</div><div class='del'>-void final_note(Elf_Word *buf);</div><div class='del'>-</div><div class='del'>-int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,</div><div class='del'>-		unsigned long long *crash_size, unsigned long long *crash_base,</div><div class='del'>-		unsigned long long *low_size, bool *high);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION</div><div class='del'>-#ifndef DEFAULT_CRASH_KERNEL_LOW_SIZE</div><div class='del'>-#define DEFAULT_CRASH_KERNEL_LOW_SIZE	(128UL &lt;&lt; 20)</div><div class='add'>+static inline void arch_kexec_protect_crashkres(void) { }</div><div class='ctx'> #endif</div><div class='del'>-#ifndef CRASH_ALIGN</div><div class='del'>-#define CRASH_ALIGN			SZ_2M</div><div class='add'>+</div><div class='add'>+#ifndef arch_kexec_unprotect_crashkres</div><div class='add'>+static inline void arch_kexec_unprotect_crashkres(void) { }</div><div class='ctx'> #endif</div><div class='del'>-#ifndef CRASH_ADDR_LOW_MAX</div><div class='del'>-#define CRASH_ADDR_LOW_MAX		SZ_4G</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CRASH_DM_CRYPT</div><div class='add'>+int crash_load_dm_crypt_keys(struct kimage *image);</div><div class='add'>+ssize_t dm_crypt_keys_read(char *buf, size_t count, u64 *ppos);</div><div class='add'>+#else</div><div class='add'>+static inline int crash_load_dm_crypt_keys(struct kimage *image) {return 0; }</div><div class='ctx'> #endif</div><div class='del'>-#ifndef CRASH_ADDR_HIGH_MAX</div><div class='del'>-#define CRASH_ADDR_HIGH_MAX		memblock_end_of_DRAM()</div><div class='add'>+</div><div class='add'>+#ifndef arch_crash_handle_hotplug_event</div><div class='add'>+static inline void arch_crash_handle_hotplug_event(struct kimage *image, void *arg) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void __init reserve_crashkernel_generic(char *cmdline,</div><div class='del'>-		unsigned long long crash_size,</div><div class='del'>-		unsigned long long crash_base,</div><div class='del'>-		unsigned long long crash_low_size,</div><div class='del'>-		bool high);</div><div class='del'>-#else</div><div class='del'>-static inline void __init reserve_crashkernel_generic(char *cmdline,</div><div class='del'>-		unsigned long long crash_size,</div><div class='del'>-		unsigned long long crash_base,</div><div class='del'>-		unsigned long long crash_low_size,</div><div class='del'>-		bool high)</div><div class='del'>-{}</div><div class='add'>+int crash_check_hotplug_support(void);</div><div class='add'>+</div><div class='add'>+#ifndef arch_crash_hotplug_support</div><div class='add'>+static inline int arch_crash_hotplug_support(struct kimage *image, unsigned long kexec_flags)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef crash_get_elfcorehdr_size</div><div class='add'>+static inline unsigned int crash_get_elfcorehdr_size(void) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Alignment required for elf header segment */</div><div class='ctx'> #define ELF_CORE_HEADER_ALIGN   4096</div><div class='ctx'> </div><div class='del'>-struct crash_mem {</div><div class='del'>-	unsigned int max_nr_ranges;</div><div class='del'>-	unsigned int nr_ranges;</div><div class='del'>-	struct range ranges[] __counted_by(max_nr_ranges);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> extern int crash_exclude_mem_range(struct crash_mem *mem,</div><div class='ctx'> 				   unsigned long long mstart,</div><div class='ctx'> 				   unsigned long long mend);</div><div class='hunk'>@@ -144,4 +77,23 @@ struct kexec_segment;</div><div class='ctx'> #define KEXEC_CRASH_HP_REMOVE_MEMORY		4</div><div class='ctx'> #define KEXEC_CRASH_HP_INVALID_CPU		-1U</div><div class='ctx'> </div><div class='add'>+extern void __crash_kexec(struct pt_regs *regs);</div><div class='add'>+extern void crash_kexec(struct pt_regs *regs);</div><div class='add'>+int kexec_should_crash(struct task_struct *p);</div><div class='add'>+int kexec_crash_loaded(void);</div><div class='add'>+void crash_save_cpu(struct pt_regs *regs, int cpu);</div><div class='add'>+extern int kimage_crash_copy_vmcoreinfo(struct kimage *image);</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_CRASH_DUMP*/</div><div class='add'>+struct pt_regs;</div><div class='add'>+struct task_struct;</div><div class='add'>+struct kimage;</div><div class='add'>+static inline void __crash_kexec(struct pt_regs *regs) { }</div><div class='add'>+static inline void crash_kexec(struct pt_regs *regs) { }</div><div class='add'>+static inline int kexec_should_crash(struct task_struct *p) { return 0; }</div><div class='add'>+static inline int kexec_crash_loaded(void) { return 0; }</div><div class='add'>+static inline void crash_save_cpu(struct pt_regs *regs, int cpu) {};</div><div class='add'>+static inline int kimage_crash_copy_vmcoreinfo(struct kimage *image) { return 0; };</div><div class='add'>+#endif /* CONFIG_CRASH_DUMP*/</div><div class='add'>+</div><div class='ctx'> #endif /* LINUX_CRASH_CORE_H */</div><div class='head'>diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h<br/>index acc55626afdc..dd6fc3b2133b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crash_dump.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crash_dump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crash_dump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crash_dump.h</a></div><div class='hunk'>@@ -15,11 +15,15 @@</div><div class='ctx'> extern unsigned long long elfcorehdr_addr;</div><div class='ctx'> extern unsigned long long elfcorehdr_size;</div><div class='ctx'> </div><div class='add'>+extern unsigned long long dm_crypt_keys_addr;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CRASH_DUMP</div><div class='ctx'> extern int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size);</div><div class='ctx'> extern void elfcorehdr_free(unsigned long long addr);</div><div class='ctx'> extern ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos);</div><div class='ctx'> extern ssize_t elfcorehdr_read_notes(char *buf, size_t count, u64 *ppos);</div><div class='add'>+void elfcorehdr_fill_device_ram_ptload_elf64(Elf64_Phdr *phdr,</div><div class='add'>+		unsigned long long paddr, unsigned long long size);</div><div class='ctx'> extern int remap_oldmem_pfn_range(struct vm_area_struct *vma,</div><div class='ctx'> 				  unsigned long from, unsigned long pfn,</div><div class='ctx'> 				  unsigned long size, pgprot_t prot);</div><div class='hunk'>@@ -99,6 +103,12 @@ static inline void vmcore_unusable(void)</div><div class='ctx'>  *              indicated in the vmcore instead. For example, a ballooned page</div><div class='ctx'>  *              contains no data and reading from such a page will cause high</div><div class='ctx'>  *              load in the hypervisor.</div><div class='add'>+ * @get_device_ram: query RAM ranges that can only be detected by device</div><div class='add'>+ *   drivers, such as the virtio-mem driver, so they can be included in</div><div class='add'>+ *   the crash dump on architectures that allocate the elfcore hdr in the dump</div><div class='add'>+ *   ("2nd") kernel. Indicated RAM ranges may contain holes to reduce the</div><div class='add'>+ *   total number of ranges; such holes can be detected using the pfn_is_ram</div><div class='add'>+ *   callback just like for other RAM.</div><div class='ctx'>  * @next: List head to manage registered callbacks internally; initialized by</div><div class='ctx'>  *        register_vmcore_cb().</div><div class='ctx'>  *</div><div class='hunk'>@@ -109,11 +119,44 @@ static inline void vmcore_unusable(void)</div><div class='ctx'>  */</div><div class='ctx'> struct vmcore_cb {</div><div class='ctx'> 	bool (*pfn_is_ram)(struct vmcore_cb *cb, unsigned long pfn);</div><div class='add'>+	int (*get_device_ram)(struct vmcore_cb *cb, struct list_head *list);</div><div class='ctx'> 	struct list_head next;</div><div class='ctx'> };</div><div class='ctx'> extern void register_vmcore_cb(struct vmcore_cb *cb);</div><div class='ctx'> extern void unregister_vmcore_cb(struct vmcore_cb *cb);</div><div class='ctx'> </div><div class='add'>+struct vmcore_range {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	unsigned long long paddr;</div><div class='add'>+	unsigned long long size;</div><div class='add'>+	loff_t offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Allocate a vmcore range and add it to the list. */</div><div class='add'>+static inline int vmcore_alloc_add_range(struct list_head *list,</div><div class='add'>+		unsigned long long paddr, unsigned long long size)</div><div class='add'>+{</div><div class='add'>+	struct vmcore_range *m = kzalloc(sizeof(*m), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	m-&gt;paddr = paddr;</div><div class='add'>+	m-&gt;size = size;</div><div class='add'>+	list_add_tail(&amp;m-&gt;list, list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Free a list of vmcore ranges. */</div><div class='add'>+static inline void vmcore_free_ranges(struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	struct vmcore_range *m, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(m, tmp, list, list) {</div><div class='add'>+		list_del(&amp;m-&gt;list);</div><div class='add'>+		kfree(m);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_CRASH_DUMP */</div><div class='ctx'> static inline bool is_kdump_kernel(void) { return false; }</div><div class='ctx'> #endif /* CONFIG_CRASH_DUMP */</div><div class='head'>diff --git a/include/linux/crash_reserve.h b/include/linux/crash_reserve.h<br/>new file mode 100644<br/>index 000000000000..f0dc03d94ca2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crash_reserve.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crash_reserve.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef LINUX_CRASH_RESERVE_H</div><div class='add'>+#define LINUX_CRASH_RESERVE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/elfcore.h&gt;</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION</div><div class='add'>+#include &lt;asm/crash_reserve.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Location of a reserved region to hold the crash kernel.</div><div class='add'>+ */</div><div class='add'>+extern struct resource crashk_res;</div><div class='add'>+extern struct resource crashk_low_res;</div><div class='add'>+extern struct range crashk_cma_ranges[];</div><div class='add'>+#if defined(CONFIG_CMA) &amp;&amp; defined(CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION)</div><div class='add'>+#define CRASHKERNEL_CMA</div><div class='add'>+#define CRASHKERNEL_CMA_RANGES_MAX 4</div><div class='add'>+extern int crashk_cma_cnt;</div><div class='add'>+#else</div><div class='add'>+#define crashk_cma_cnt 0</div><div class='add'>+#define CRASHKERNEL_CMA_RANGES_MAX 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,</div><div class='add'>+		unsigned long long *crash_size, unsigned long long *crash_base,</div><div class='add'>+		unsigned long long *low_size, unsigned long long *cma_size,</div><div class='add'>+		bool *high);</div><div class='add'>+</div><div class='add'>+void __init reserve_crashkernel_cma(unsigned long long cma_size);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION</div><div class='add'>+#ifndef arch_add_crash_res_to_iomem</div><div class='add'>+static inline bool arch_add_crash_res_to_iomem(void)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#ifndef DEFAULT_CRASH_KERNEL_LOW_SIZE</div><div class='add'>+#define DEFAULT_CRASH_KERNEL_LOW_SIZE	(128UL &lt;&lt; 20)</div><div class='add'>+#endif</div><div class='add'>+#ifndef CRASH_ALIGN</div><div class='add'>+#define CRASH_ALIGN			SZ_2M</div><div class='add'>+#endif</div><div class='add'>+#ifndef CRASH_ADDR_LOW_MAX</div><div class='add'>+#define CRASH_ADDR_LOW_MAX		SZ_4G</div><div class='add'>+#endif</div><div class='add'>+#ifndef CRASH_ADDR_HIGH_MAX</div><div class='add'>+#define CRASH_ADDR_HIGH_MAX		memblock_end_of_DRAM()</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init reserve_crashkernel_generic(unsigned long long crash_size,</div><div class='add'>+					unsigned long long crash_base,</div><div class='add'>+					unsigned long long crash_low_size,</div><div class='add'>+					bool high);</div><div class='add'>+#else</div><div class='add'>+static inline void __init reserve_crashkernel_generic(</div><div class='add'>+		unsigned long long crash_size,</div><div class='add'>+		unsigned long long crash_base,</div><div class='add'>+		unsigned long long crash_low_size,</div><div class='add'>+		bool high)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+#endif /* LINUX_CRASH_RESERVE_H */</div><div class='head'>diff --git a/include/linux/crc-t10dif.h b/include/linux/crc-t10dif.h<br/>index 6bb0c0bf357b..ecc8bc2dd7f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crc-t10dif.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc-t10dif.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crc-t10dif.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crc-t10dif.h</a></div><div class='hunk'>@@ -4,13 +4,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#define CRC_T10DIF_DIGEST_SIZE 2</div><div class='del'>-#define CRC_T10DIF_BLOCK_SIZE 1</div><div class='del'>-#define CRC_T10DIF_STRING "crct10dif"</div><div class='add'>+u16 crc_t10dif_update(u16 crc, const u8 *p, size_t len);</div><div class='ctx'> </div><div class='del'>-extern __u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer,</div><div class='del'>-				size_t len);</div><div class='del'>-extern __u16 crc_t10dif(unsigned char const *, size_t);</div><div class='del'>-extern __u16 crc_t10dif_update(__u16 crc, unsigned char const *, size_t);</div><div class='add'>+static inline u16 crc_t10dif(const u8 *p, size_t len)</div><div class='add'>+{</div><div class='add'>+	return crc_t10dif_update(0, p, len);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/crc16.h b/include/linux/crc16.h<br/>index 9fa74529b317..b861d969b161 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crc16.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc16.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crc16.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crc16.h</a></div><div class='hunk'>@@ -15,14 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-extern u16 const crc16_table[256];</div><div class='del'>-</div><div class='del'>-extern u16 crc16(u16 crc, const u8 *buffer, size_t len);</div><div class='del'>-</div><div class='del'>-static inline u16 crc16_byte(u16 crc, const u8 data)</div><div class='del'>-{</div><div class='del'>-	return (crc &gt;&gt; 8) ^ crc16_table[(crc ^ data) &amp; 0xff];</div><div class='del'>-}</div><div class='add'>+u16 crc16(u16 crc, const u8 *p, size_t len);</div><div class='ctx'> </div><div class='ctx'> #endif /* __CRC16_H */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/crc32.h b/include/linux/crc32.h<br/>index 9e8a032c1788..da78b215ff2e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crc32.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc32.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crc32.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crc32.h</a></div><div class='hunk'>@@ -1,69 +1,100 @@</div><div class='del'>-/*</div><div class='del'>- * crc32.h</div><div class='del'>- * See linux/lib/crc32.c for license and changes</div><div class='del'>- */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> #ifndef _LINUX_CRC32_H</div><div class='ctx'> #define _LINUX_CRC32_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/bitrev.h&gt;</div><div class='ctx'> </div><div class='del'>-u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len);</div><div class='del'>-u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * crc32_le_combine - Combine two crc32 check values into one. For two</div><div class='del'>- * 		      sequences of bytes, seq1 and seq2 with lengths len1</div><div class='del'>- * 		      and len2, crc32_le() check values were calculated</div><div class='del'>- * 		      for each, crc1 and crc2.</div><div class='add'>+ * crc32_le() - Compute least-significant-bit-first IEEE CRC-32</div><div class='add'>+ * @crc: Initial CRC value.  ~0 (recommended) or 0 for a new CRC computation, or</div><div class='add'>+ *	 the previous CRC value if computing incrementally.</div><div class='add'>+ * @p: Pointer to the data buffer</div><div class='add'>+ * @len: Length of data in bytes</div><div class='add'>+ *</div><div class='add'>+ * This implements the CRC variant that is often known as the IEEE CRC-32, or</div><div class='add'>+ * simply CRC-32, and is widely used in Ethernet and other applications:</div><div class='add'>+ *</div><div class='add'>+ * - Polynomial: x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 +</div><div class='add'>+ *		 x^7 + x^5 + x^4 + x^2 + x^1 + x^0</div><div class='add'>+ * - Bit order: Least-significant-bit-first</div><div class='add'>+ * - Polynomial in integer form: 0xedb88320</div><div class='ctx'>  *</div><div class='del'>- * @crc1: crc32 of the first block</div><div class='del'>- * @crc2: crc32 of the second block</div><div class='del'>- * @len2: length of the second block</div><div class='add'>+ * This does *not* invert the CRC at the beginning or end.  The caller is</div><div class='add'>+ * expected to do that if it needs to.  Inverting at both ends is recommended.</div><div class='ctx'>  *</div><div class='del'>- * Return: The crc32_le() check value of seq1 and seq2 concatenated,</div><div class='del'>- * 	   requiring only crc1, crc2, and len2. Note: If seq_full denotes</div><div class='del'>- * 	   the concatenated memory area of seq1 with seq2, and crc_full</div><div class='del'>- * 	   the crc32_le() value of seq_full, then crc_full ==</div><div class='del'>- * 	   crc32_le_combine(crc1, crc2, len2) when crc_full was seeded</div><div class='del'>- * 	   with the same initializer as crc1, and crc2 seed was 0. See</div><div class='del'>- * 	   also crc32_combine_test().</div><div class='add'>+ * For new applications, prefer to use CRC-32C instead.  See crc32c().</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context</div><div class='add'>+ * Return: The new CRC value</div><div class='ctx'>  */</div><div class='del'>-u32 __attribute_const__ crc32_le_shift(u32 crc, size_t len);</div><div class='add'>+u32 crc32_le(u32 crc, const void *p, size_t len);</div><div class='ctx'> </div><div class='del'>-static inline u32 crc32_le_combine(u32 crc1, u32 crc2, size_t len2)</div><div class='add'>+/* This is just an alias for crc32_le(). */</div><div class='add'>+static inline u32 crc32(u32 crc, const void *p, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return crc32_le_shift(crc1, len2) ^ crc2;</div><div class='add'>+	return crc32_le(crc, p, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * __crc32c_le_combine - Combine two crc32c check values into one. For two</div><div class='del'>- * 			 sequences of bytes, seq1 and seq2 with lengths len1</div><div class='del'>- * 			 and len2, __crc32c_le() check values were calculated</div><div class='del'>- * 			 for each, crc1 and crc2.</div><div class='add'>+ * crc32_be() - Compute most-significant-bit-first IEEE CRC-32</div><div class='add'>+ * @crc: Initial CRC value.  ~0 (recommended) or 0 for a new CRC computation, or</div><div class='add'>+ *	 the previous CRC value if computing incrementally.</div><div class='add'>+ * @p: Pointer to the data buffer</div><div class='add'>+ * @len: Length of data in bytes</div><div class='ctx'>  *</div><div class='del'>- * @crc1: crc32c of the first block</div><div class='del'>- * @crc2: crc32c of the second block</div><div class='del'>- * @len2: length of the second block</div><div class='add'>+ * crc32_be() is the same as crc32_le() except that crc32_be() computes the</div><div class='add'>+ * *most-significant-bit-first* variant of the CRC.  I.e., within each byte, the</div><div class='add'>+ * most significant bit is processed first (treated as highest order polynomial</div><div class='add'>+ * coefficient).  The same bit order is also used for the CRC value itself:</div><div class='ctx'>  *</div><div class='del'>- * Return: The __crc32c_le() check value of seq1 and seq2 concatenated,</div><div class='del'>- * 	   requiring only crc1, crc2, and len2. Note: If seq_full denotes</div><div class='del'>- * 	   the concatenated memory area of seq1 with seq2, and crc_full</div><div class='del'>- * 	   the __crc32c_le() value of seq_full, then crc_full ==</div><div class='del'>- * 	   __crc32c_le_combine(crc1, crc2, len2) when crc_full was</div><div class='del'>- * 	   seeded with the same initializer as crc1, and crc2 seed</div><div class='del'>- * 	   was 0. See also crc32c_combine_test().</div><div class='add'>+ * - Polynomial: x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 +</div><div class='add'>+ *		 x^7 + x^5 + x^4 + x^2 + x^1 + x^0</div><div class='add'>+ * - Bit order: Most-significant-bit-first</div><div class='add'>+ * - Polynomial in integer form: 0x04c11db7</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context</div><div class='add'>+ * Return: The new CRC value</div><div class='ctx'>  */</div><div class='del'>-u32 __attribute_const__ __crc32c_le_shift(u32 crc, size_t len);</div><div class='add'>+u32 crc32_be(u32 crc, const void *p, size_t len);</div><div class='ctx'> </div><div class='del'>-static inline u32 __crc32c_le_combine(u32 crc1, u32 crc2, size_t len2)</div><div class='del'>-{</div><div class='del'>-	return __crc32c_le_shift(crc1, len2) ^ crc2;</div><div class='del'>-}</div><div class='add'>+/**</div><div class='add'>+ * crc32c() - Compute CRC-32C</div><div class='add'>+ * @crc: Initial CRC value.  ~0 (recommended) or 0 for a new CRC computation, or</div><div class='add'>+ *	 the previous CRC value if computing incrementally.</div><div class='add'>+ * @p: Pointer to the data buffer</div><div class='add'>+ * @len: Length of data in bytes</div><div class='add'>+ *</div><div class='add'>+ * This implements CRC-32C, i.e. the Castagnoli CRC.  This is the recommended</div><div class='add'>+ * CRC variant to use in new applications that want a 32-bit CRC.</div><div class='add'>+ *</div><div class='add'>+ * - Polynomial: x^32 + x^28 + x^27 + x^26 + x^25 + x^23 + x^22 + x^20 + x^19 +</div><div class='add'>+ *		 x^18 + x^14 + x^13 + x^11 + x^10 + x^9 + x^8 + x^6 + x^0</div><div class='add'>+ * - Bit order: Least-significant-bit-first</div><div class='add'>+ * - Polynomial in integer form: 0x82f63b78</div><div class='add'>+ *</div><div class='add'>+ * This does *not* invert the CRC at the beginning or end.  The caller is</div><div class='add'>+ * expected to do that if it needs to.  Inverting at both ends is recommended.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context</div><div class='add'>+ * Return: The new CRC value</div><div class='add'>+ */</div><div class='add'>+u32 crc32c(u32 crc, const void *p, size_t len);</div><div class='ctx'> </div><div class='del'>-#define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)(data), length)</div><div class='add'>+/*</div><div class='add'>+ * crc32_optimizations() returns flags that indicate which CRC32 library</div><div class='add'>+ * functions are using architecture-specific optimizations.  Unlike</div><div class='add'>+ * IS_ENABLED(CONFIG_CRC32_ARCH) it takes into account the different CRC32</div><div class='add'>+ * variants and also whether any needed CPU features are available at runtime.</div><div class='add'>+ */</div><div class='add'>+#define CRC32_LE_OPTIMIZATION	BIT(0) /* crc32_le() is optimized */</div><div class='add'>+#define CRC32_BE_OPTIMIZATION	BIT(1) /* crc32_be() is optimized */</div><div class='add'>+#define CRC32C_OPTIMIZATION	BIT(2) /* crc32c() is optimized */</div><div class='add'>+#if IS_ENABLED(CONFIG_CRC32_ARCH)</div><div class='add'>+u32 crc32_optimizations(void);</div><div class='add'>+#else</div><div class='add'>+static inline u32 crc32_optimizations(void) { return 0; }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Helpers for hash table generation of ethernet nics:</div><div class='head'>diff --git a/include/linux/crc32c.h b/include/linux/crc32c.h<br/>index 357ae4611a45..b8cff2f4309a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crc32c.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc32c.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crc32c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crc32c.h</a></div><div class='hunk'>@@ -2,11 +2,6 @@</div><div class='ctx'> #ifndef _LINUX_CRC32C_H</div><div class='ctx'> #define _LINUX_CRC32C_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-extern u32 crc32c(u32 crc, const void *address, unsigned int length);</div><div class='del'>-</div><div class='del'>-/* This macro exists for backwards-compatibility. */</div><div class='del'>-#define crc32c_le crc32c</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='ctx'> </div><div class='ctx'> #endif	/* _LINUX_CRC32C_H */</div><div class='head'>diff --git a/include/linux/crc32poly.h b/include/linux/crc32poly.h<br/>index 62c4b7790a28..ccab711295fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crc32poly.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc32poly.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crc32poly.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crc32poly.h</a></div><div class='hunk'>@@ -2,19 +2,13 @@</div><div class='ctx'> #ifndef _LINUX_CRC32_POLY_H</div><div class='ctx'> #define _LINUX_CRC32_POLY_H</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * There are multiple 16-bit CRC polynomials in common use, but this is</div><div class='del'>- * *the* standard CRC-32 polynomial, first popularized by Ethernet.</div><div class='del'>- * x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x^1+x^0</div><div class='del'>- */</div><div class='add'>+/* The polynomial used by crc32_le(), in integer form.  See crc32_le(). */</div><div class='ctx'> #define CRC32_POLY_LE 0xedb88320</div><div class='add'>+</div><div class='add'>+/* The polynomial used by crc32_be(), in integer form.  See crc32_be(). */</div><div class='ctx'> #define CRC32_POLY_BE 0x04c11db7</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is the CRC32c polynomial, as outlined by Castagnoli.</div><div class='del'>- * x^32+x^28+x^27+x^26+x^25+x^23+x^22+x^20+x^19+x^18+x^14+x^13+x^11+x^10+x^9+</div><div class='del'>- * x^8+x^6+x^0</div><div class='del'>- */</div><div class='del'>-#define CRC32C_POLY_LE 0x82F63B78</div><div class='add'>+/* The polynomial used by crc32c(), in integer form.  See crc32c(). */</div><div class='add'>+#define CRC32C_POLY_LE 0x82f63b78</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_CRC32_POLY_H */</div><div class='head'>diff --git a/include/linux/crc64.h b/include/linux/crc64.h<br/>index e044c60d1e61..fc0c06ab1993 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crc64.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc64.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crc64.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crc64.h</a></div><div class='hunk'>@@ -1,18 +1,28 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- * See lib/crc64.c for the related specification and polynomial arithmetic.</div><div class='del'>- */</div><div class='ctx'> #ifndef _LINUX_CRC64_H</div><div class='ctx'> #define _LINUX_CRC64_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#define CRC64_ROCKSOFT_STRING "crc64-rocksoft"</div><div class='del'>-</div><div class='del'>-u64 __pure crc64_be(u64 crc, const void *p, size_t len);</div><div class='del'>-u64 __pure crc64_rocksoft_generic(u64 crc, const void *p, size_t len);</div><div class='add'>+/**</div><div class='add'>+ * crc64_be - Calculate bitwise big-endian ECMA-182 CRC64</div><div class='add'>+ * @crc: seed value for computation. 0 or (u64)~0 for a new CRC calculation,</div><div class='add'>+ *       or the previous crc64 value if computing incrementally.</div><div class='add'>+ * @p: pointer to buffer over which CRC64 is run</div><div class='add'>+ * @len: length of buffer @p</div><div class='add'>+ */</div><div class='add'>+u64 crc64_be(u64 crc, const void *p, size_t len);</div><div class='ctx'> </div><div class='del'>-u64 crc64_rocksoft(const unsigned char *buffer, size_t len);</div><div class='del'>-u64 crc64_rocksoft_update(u64 crc, const unsigned char *buffer, size_t len);</div><div class='add'>+/**</div><div class='add'>+ * crc64_nvme - Calculate CRC64-NVME</div><div class='add'>+ * @crc: seed value for computation. 0 for a new CRC calculation, or the</div><div class='add'>+ *	 previous crc64 value if computing incrementally.</div><div class='add'>+ * @p: pointer to buffer over which CRC64 is run</div><div class='add'>+ * @len: length of buffer @p</div><div class='add'>+ *</div><div class='add'>+ * This computes the CRC64 defined in the NVME NVM Command Set Specification,</div><div class='add'>+ * *including the bitwise inversion at the beginning and end*.</div><div class='add'>+ */</div><div class='add'>+u64 crc64_nvme(u64 crc, const void *p, size_t len);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_CRC64_H */</div><div class='head'>diff --git a/include/linux/crc7.h b/include/linux/crc7.h<br/>index b462842f3c32..61d34749e437 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crc7.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crc7.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crc7.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crc7.h</a></div><div class='hunk'>@@ -3,13 +3,6 @@</div><div class='ctx'> #define _LINUX_CRC7_H</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-extern const u8 crc7_be_syndrome_table[256];</div><div class='del'>-</div><div class='del'>-static inline u8 crc7_be_byte(u8 crc, u8 data)</div><div class='del'>-{</div><div class='del'>-	return crc7_be_syndrome_table[crc ^ data];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern u8 crc7_be(u8 crc, const u8 *buffer, size_t len);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/cred.h b/include/linux/cred.h<br/>index 2976f534a7a3..343a140a6ba2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cred.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cred.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/cred.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/cred.h</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> struct cred;</div><div class='ctx'> struct inode;</div><div class='ctx'> </div><div class='add'>+extern struct task_struct init_task;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * COW Supplementary groups list</div><div class='ctx'>  */</div><div class='hunk'>@@ -148,16 +150,19 @@ struct cred {</div><div class='ctx'> </div><div class='ctx'> extern void __put_cred(struct cred *);</div><div class='ctx'> extern void exit_creds(struct task_struct *);</div><div class='del'>-extern int copy_creds(struct task_struct *, unsigned long);</div><div class='add'>+extern int copy_creds(struct task_struct *, u64);</div><div class='ctx'> extern const struct cred *get_task_cred(struct task_struct *);</div><div class='ctx'> extern struct cred *cred_alloc_blank(void);</div><div class='ctx'> extern struct cred *prepare_creds(void);</div><div class='ctx'> extern struct cred *prepare_exec_creds(void);</div><div class='ctx'> extern int commit_creds(struct cred *);</div><div class='ctx'> extern void abort_creds(struct cred *);</div><div class='del'>-extern const struct cred *override_creds(const struct cred *);</div><div class='del'>-extern void revert_creds(const struct cred *);</div><div class='ctx'> extern struct cred *prepare_kernel_cred(struct task_struct *);</div><div class='add'>+static inline const struct cred *kernel_cred(void)</div><div class='add'>+{</div><div class='add'>+	/* shut up sparse */</div><div class='add'>+	return rcu_dereference_raw(init_task.cred);</div><div class='add'>+}</div><div class='ctx'> extern int set_security_override(struct cred *, u32);</div><div class='ctx'> extern int set_security_override_from_ctx(struct cred *, const char *);</div><div class='ctx'> extern int set_create_files_as(struct cred *, struct inode *);</div><div class='hunk'>@@ -172,32 +177,26 @@ static inline bool cap_ambient_invariant_ok(const struct cred *cred)</div><div class='ctx'> 					  cred-&gt;cap_inheritable));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * get_new_cred_many - Get references on a new set of credentials</div><div class='del'>- * @cred: The new credentials to reference</div><div class='del'>- * @nr: Number of references to acquire</div><div class='del'>- *</div><div class='del'>- * Get references on the specified set of new credentials.  The caller must</div><div class='del'>- * release all acquired references.</div><div class='del'>- */</div><div class='del'>-static inline struct cred *get_new_cred_many(struct cred *cred, int nr)</div><div class='add'>+static inline const struct cred *override_creds(const struct cred *override_cred)</div><div class='ctx'> {</div><div class='del'>-	atomic_long_add(nr, &amp;cred-&gt;usage);</div><div class='del'>-	return cred;</div><div class='add'>+	return rcu_replace_pointer(current-&gt;cred, override_cred, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * get_new_cred - Get a reference on a new set of credentials</div><div class='del'>- * @cred: The new credentials to reference</div><div class='del'>- *</div><div class='del'>- * Get a reference on the specified set of new credentials.  The caller must</div><div class='del'>- * release the reference.</div><div class='del'>- */</div><div class='del'>-static inline struct cred *get_new_cred(struct cred *cred)</div><div class='add'>+static inline const struct cred *revert_creds(const struct cred *revert_cred)</div><div class='ctx'> {</div><div class='del'>-	return get_new_cred_many(cred, 1);</div><div class='add'>+	return rcu_replace_pointer(current-&gt;cred, revert_cred, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_CLASS(override_creds,</div><div class='add'>+	     const struct cred *,</div><div class='add'>+	     revert_creds(_T),</div><div class='add'>+	     override_creds(override_cred), const struct cred *override_cred)</div><div class='add'>+</div><div class='add'>+#define scoped_with_creds(cred) \</div><div class='add'>+	scoped_class(override_creds, __UNIQUE_ID(label), cred)</div><div class='add'>+</div><div class='add'>+#define scoped_with_kernel_creds() scoped_with_creds(kernel_cred())</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * get_cred_many - Get references on a set of credentials</div><div class='ctx'>  * @cred: The credentials to reference</div><div class='hunk'>@@ -218,7 +217,8 @@ static inline const struct cred *get_cred_many(const struct cred *cred, int nr)</div><div class='ctx'> 	if (!cred)</div><div class='ctx'> 		return cred;</div><div class='ctx'> 	nonconst_cred-&gt;non_rcu = 0;</div><div class='del'>-	return get_new_cred_many(nonconst_cred, nr);</div><div class='add'>+	atomic_long_add(nr, &amp;nonconst_cred-&gt;usage);</div><div class='add'>+	return cred;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -280,6 +280,13 @@ static inline void put_cred(const struct cred *cred)</div><div class='ctx'> 	put_cred_many(cred, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_CLASS(prepare_creds,</div><div class='add'>+	      struct cred *,</div><div class='add'>+	      if (_T) put_cred(_T),</div><div class='add'>+	      prepare_creds(), void)</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(put_cred, struct cred *, if (!IS_ERR_OR_NULL(_T)) put_cred(_T))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * current_cred - Access the current task's subjective credentials</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/linux/crypto.h b/include/linux/crypto.h<br/>index b164da5e129e..a2137e19be7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/crypto.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/crypto.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/crypto.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/crypto.h</a></div><div class='hunk'>@@ -13,7 +13,8 @@</div><div class='ctx'> #define _LINUX_CRYPTO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/refcount_types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -22,7 +23,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #define CRYPTO_ALG_TYPE_MASK		0x0000000f</div><div class='ctx'> #define CRYPTO_ALG_TYPE_CIPHER		0x00000001</div><div class='del'>-#define CRYPTO_ALG_TYPE_COMPRESS	0x00000002</div><div class='ctx'> #define CRYPTO_ALG_TYPE_AEAD		0x00000003</div><div class='ctx'> #define CRYPTO_ALG_TYPE_LSKCIPHER	0x00000004</div><div class='ctx'> #define CRYPTO_ALG_TYPE_SKCIPHER	0x00000005</div><div class='hunk'>@@ -50,6 +50,15 @@</div><div class='ctx'> #define CRYPTO_ALG_NEED_FALLBACK	0x00000100</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Set if the algorithm data structure should be duplicated into</div><div class='add'>+ * kmalloc memory before registration.  This is useful for hardware</div><div class='add'>+ * that can be disconnected at will.  Do not use this if the data</div><div class='add'>+ * structure is embedded into a bigger one.  Duplicate the overall</div><div class='add'>+ * data structure in the driver in that case.</div><div class='add'>+ */</div><div class='add'>+#define CRYPTO_ALG_DUP_FIRST		0x00000200</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Set if the algorithm has passed automated run-time testing.  Note that</div><div class='ctx'>  * if there is no run-time testing for a given algorithm it is considered</div><div class='ctx'>  * to have passed.</div><div class='hunk'>@@ -124,6 +133,14 @@</div><div class='ctx'>  */</div><div class='ctx'> #define CRYPTO_ALG_FIPS_INTERNAL	0x00020000</div><div class='ctx'> </div><div class='add'>+/* Set if the algorithm supports virtual addresses. */</div><div class='add'>+#define CRYPTO_ALG_REQ_VIRT		0x00040000</div><div class='add'>+</div><div class='add'>+/* Set if the algorithm cannot have a fallback (e.g., phmac). */</div><div class='add'>+#define CRYPTO_ALG_NO_FALLBACK		0x00080000</div><div class='add'>+</div><div class='add'>+/* The high bits 0xff000000 are reserved for type-specific flags. */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Transform masks and values (for crt_flags).</div><div class='ctx'>  */</div><div class='hunk'>@@ -133,6 +150,7 @@</div><div class='ctx'> #define CRYPTO_TFM_REQ_FORBID_WEAK_KEYS	0x00000100</div><div class='ctx'> #define CRYPTO_TFM_REQ_MAY_SLEEP	0x00000200</div><div class='ctx'> #define CRYPTO_TFM_REQ_MAY_BACKLOG	0x00000400</div><div class='add'>+#define CRYPTO_TFM_REQ_ON_STACK		0x00000800</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Miscellaneous stuff.</div><div class='hunk'>@@ -239,26 +257,7 @@ struct cipher_alg {</div><div class='ctx'> 	void (*cia_decrypt)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct compress_alg - compression/decompression algorithm</div><div class='del'>- * @coa_compress: Compress a buffer of specified length, storing the resulting</div><div class='del'>- *		  data in the specified buffer. Return the length of the</div><div class='del'>- *		  compressed data in dlen.</div><div class='del'>- * @coa_decompress: Decompress the source buffer, storing the uncompressed</div><div class='del'>- *		    data in the specified buffer. The length of the data is</div><div class='del'>- *		    returned in dlen.</div><div class='del'>- *</div><div class='del'>- * All fields are mandatory.</div><div class='del'>- */</div><div class='del'>-struct compress_alg {</div><div class='del'>-	int (*coa_compress)(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			    unsigned int slen, u8 *dst, unsigned int *dlen);</div><div class='del'>-	int (*coa_decompress)(struct crypto_tfm *tfm, const u8 *src,</div><div class='del'>-			      unsigned int slen, u8 *dst, unsigned int *dlen);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define cra_cipher	cra_u.cipher</div><div class='del'>-#define cra_compress	cra_u.compress</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct crypto_alg - definition of a cryptograpic cipher algorithm</div><div class='hunk'>@@ -291,6 +290,7 @@ struct compress_alg {</div><div class='ctx'>  *		   to the alignmask of the algorithm being used, in order to</div><div class='ctx'>  *		   avoid the API having to realign them.  Note: the alignmask is</div><div class='ctx'>  *		   not supported for hash algorithms and is always 0 for them.</div><div class='add'>+ * @cra_reqsize: Size of the request context for this algorithm.</div><div class='ctx'>  * @cra_priority: Priority of this transformation implementation. In case</div><div class='ctx'>  *		  multiple transformations with same @cra_name are available to</div><div class='ctx'>  *		  the Crypto API, the kernel will use the one with highest</div><div class='hunk'>@@ -309,27 +309,16 @@ struct compress_alg {</div><div class='ctx'>  *	      transformation types. There are multiple options, such as</div><div class='ctx'>  *	      &amp;crypto_skcipher_type, &amp;crypto_ahash_type, &amp;crypto_rng_type.</div><div class='ctx'>  *	      This field might be empty. In that case, there are no common</div><div class='del'>- *	      callbacks. This is the case for: cipher, compress, shash.</div><div class='add'>+ *	      callbacks. This is the case for: cipher.</div><div class='ctx'>  * @cra_u: Callbacks implementing the transformation. This is a union of</div><div class='ctx'>  *	   multiple structures. Depending on the type of transformation selected</div><div class='ctx'>  *	   by @cra_type and @cra_flags above, the associated structure must be</div><div class='ctx'>  *	   filled with callbacks. This field might be empty. This is the case</div><div class='ctx'>  *	   for ahash, shash.</div><div class='del'>- * @cra_init: Initialize the cryptographic transformation object. This function</div><div class='del'>- *	      is used to initialize the cryptographic transformation object.</div><div class='del'>- *	      This function is called only once at the instantiation time, right</div><div class='del'>- *	      after the transformation context was allocated. In case the</div><div class='del'>- *	      cryptographic hardware has some special requirements which need to</div><div class='del'>- *	      be handled by software, this function shall check for the precise</div><div class='del'>- *	      requirement of the transformation and put any software fallbacks</div><div class='del'>- *	      in place.</div><div class='del'>- * @cra_exit: Deinitialize the cryptographic transformation object. This is a</div><div class='del'>- *	      counterpart to @cra_init, used to remove various changes set in</div><div class='del'>- *	      @cra_init.</div><div class='add'>+ * @cra_init: Deprecated, do not use.</div><div class='add'>+ * @cra_exit: Deprecated, do not use.</div><div class='ctx'>  * @cra_u.cipher: Union member which contains a single-block symmetric cipher</div><div class='ctx'>  *		  definition. See @struct @cipher_alg.</div><div class='del'>- * @cra_u.compress: Union member which contains a (de)compression algorithm.</div><div class='del'>- *		    See @struct @compress_alg.</div><div class='ctx'>  * @cra_module: Owner of this transformation implementation. Set to THIS_MODULE</div><div class='ctx'>  * @cra_list: internally used</div><div class='ctx'>  * @cra_users: internally used</div><div class='hunk'>@@ -348,6 +337,7 @@ struct crypto_alg {</div><div class='ctx'> 	unsigned int cra_blocksize;</div><div class='ctx'> 	unsigned int cra_ctxsize;</div><div class='ctx'> 	unsigned int cra_alignmask;</div><div class='add'>+	unsigned int cra_reqsize;</div><div class='ctx'> </div><div class='ctx'> 	int cra_priority;</div><div class='ctx'> 	refcount_t cra_refcnt;</div><div class='hunk'>@@ -359,7 +349,6 @@ struct crypto_alg {</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct cipher_alg cipher;</div><div class='del'>-		struct compress_alg compress;</div><div class='ctx'> 	} cra_u;</div><div class='ctx'> </div><div class='ctx'> 	int (*cra_init)(struct crypto_tfm *tfm);</div><div class='hunk'>@@ -425,18 +414,16 @@ struct crypto_tfm {</div><div class='ctx'> 	u32 crt_flags;</div><div class='ctx'> </div><div class='ctx'> 	int node;</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	struct crypto_tfm *fb;</div><div class='add'>+</div><div class='ctx'> 	void (*exit)(struct crypto_tfm *tfm);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	struct crypto_alg *__crt_alg;</div><div class='ctx'> </div><div class='ctx'> 	void *__crt_ctx[] CRYPTO_MINALIGN_ATTR;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct crypto_comp {</div><div class='del'>-	struct crypto_tfm base;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* </div><div class='ctx'>  * Transform user interface.</div><div class='ctx'>  */</div><div class='hunk'>@@ -472,6 +459,11 @@ static inline unsigned int crypto_tfm_alg_alignmask(struct crypto_tfm *tfm)</div><div class='ctx'> 	return tfm-&gt;__crt_alg-&gt;cra_alignmask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int crypto_tfm_alg_reqsize(struct crypto_tfm *tfm)</div><div class='add'>+{</div><div class='add'>+	return tfm-&gt;__crt_alg-&gt;cra_reqsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 crypto_tfm_get_flags(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='ctx'> 	return tfm-&gt;crt_flags;</div><div class='hunk'>@@ -493,52 +485,45 @@ static inline unsigned int crypto_tfm_ctx_alignment(void)</div><div class='ctx'> 	return __alignof__(tfm-&gt;__crt_ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct crypto_comp *__crypto_comp_cast(struct crypto_tfm *tfm)</div><div class='add'>+static inline bool crypto_tfm_is_async(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	return (struct crypto_comp *)tfm;</div><div class='add'>+	return tfm-&gt;__crt_alg-&gt;cra_flags &amp; CRYPTO_ALG_ASYNC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct crypto_comp *crypto_alloc_comp(const char *alg_name,</div><div class='del'>-						    u32 type, u32 mask)</div><div class='add'>+static inline bool crypto_req_on_stack(struct crypto_async_request *req)</div><div class='ctx'> {</div><div class='del'>-	type &amp;= ~CRYPTO_ALG_TYPE_MASK;</div><div class='del'>-	type |= CRYPTO_ALG_TYPE_COMPRESS;</div><div class='del'>-	mask |= CRYPTO_ALG_TYPE_MASK;</div><div class='del'>-</div><div class='del'>-	return __crypto_comp_cast(crypto_alloc_base(alg_name, type, mask));</div><div class='add'>+	return req-&gt;flags &amp; CRYPTO_TFM_REQ_ON_STACK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct crypto_tfm *crypto_comp_tfm(struct crypto_comp *tfm)</div><div class='add'>+static inline void crypto_request_set_callback(</div><div class='add'>+	struct crypto_async_request *req, u32 flags,</div><div class='add'>+	crypto_completion_t compl, void *data)</div><div class='ctx'> {</div><div class='del'>-	return &amp;tfm-&gt;base;</div><div class='del'>-}</div><div class='add'>+	u32 keep = CRYPTO_TFM_REQ_ON_STACK;</div><div class='ctx'> </div><div class='del'>-static inline void crypto_free_comp(struct crypto_comp *tfm)</div><div class='del'>-{</div><div class='del'>-	crypto_free_tfm(crypto_comp_tfm(tfm));</div><div class='add'>+	req-&gt;complete = compl;</div><div class='add'>+	req-&gt;data = data;</div><div class='add'>+	req-&gt;flags &amp;= keep;</div><div class='add'>+	req-&gt;flags |= flags &amp; ~keep;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int crypto_has_comp(const char *alg_name, u32 type, u32 mask)</div><div class='add'>+static inline void crypto_request_set_tfm(struct crypto_async_request *req,</div><div class='add'>+					  struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	type &amp;= ~CRYPTO_ALG_TYPE_MASK;</div><div class='del'>-	type |= CRYPTO_ALG_TYPE_COMPRESS;</div><div class='del'>-	mask |= CRYPTO_ALG_TYPE_MASK;</div><div class='del'>-</div><div class='del'>-	return crypto_has_alg(alg_name, type, mask);</div><div class='add'>+	req-&gt;tfm = tfm;</div><div class='add'>+	req-&gt;flags &amp;= ~CRYPTO_TFM_REQ_ON_STACK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const char *crypto_comp_name(struct crypto_comp *tfm)</div><div class='add'>+struct crypto_async_request *crypto_request_clone(</div><div class='add'>+	struct crypto_async_request *req, size_t total, gfp_t gfp);</div><div class='add'>+</div><div class='add'>+static inline void crypto_stack_request_init(struct crypto_async_request *req,</div><div class='add'>+					     struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	return crypto_tfm_alg_name(crypto_comp_tfm(tfm));</div><div class='add'>+	req-&gt;flags = 0;</div><div class='add'>+	crypto_request_set_tfm(req, tfm);</div><div class='add'>+	req-&gt;flags |= CRYPTO_TFM_REQ_ON_STACK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int crypto_comp_compress(struct crypto_comp *tfm,</div><div class='del'>-			 const u8 *src, unsigned int slen,</div><div class='del'>-			 u8 *dst, unsigned int *dlen);</div><div class='del'>-</div><div class='del'>-int crypto_comp_decompress(struct crypto_comp *tfm,</div><div class='del'>-			   const u8 *src, unsigned int slen,</div><div class='del'>-			   u8 *dst, unsigned int *dlen);</div><div class='del'>-</div><div class='ctx'> #endif	/* _LINUX_CRYPTO_H */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/cxl-event.h b/include/linux/cxl-event.h<br/>deleted file mode 100644<br/>index 03fa6d50d46f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/cxl-event.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/cxl-event.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,143 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright(c) 2023 Intel Corporation. */</div><div class='del'>-#ifndef _LINUX_CXL_EVENT_H</div><div class='del'>-#define _LINUX_CXL_EVENT_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Common Event Record Format</div><div class='del'>- * CXL rev 3.0 section 8.2.9.2.1; Table 8-42</div><div class='del'>- */</div><div class='del'>-struct cxl_event_record_hdr {</div><div class='del'>-	u8 length;</div><div class='del'>-	u8 flags[3];</div><div class='del'>-	__le16 handle;</div><div class='del'>-	__le16 related_handle;</div><div class='del'>-	__le64 timestamp;</div><div class='del'>-	u8 maint_op_class;</div><div class='del'>-	u8 reserved[15];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define CXL_EVENT_RECORD_DATA_LENGTH 0x50</div><div class='del'>-struct cxl_event_generic {</div><div class='del'>-	struct cxl_event_record_hdr hdr;</div><div class='del'>-	u8 data[CXL_EVENT_RECORD_DATA_LENGTH];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * General Media Event Record</div><div class='del'>- * CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43</div><div class='del'>- */</div><div class='del'>-#define CXL_EVENT_GEN_MED_COMP_ID_SIZE	0x10</div><div class='del'>-struct cxl_event_gen_media {</div><div class='del'>-	struct cxl_event_record_hdr hdr;</div><div class='del'>-	__le64 phys_addr;</div><div class='del'>-	u8 descriptor;</div><div class='del'>-	u8 type;</div><div class='del'>-	u8 transaction_type;</div><div class='del'>-	u8 validity_flags[2];</div><div class='del'>-	u8 channel;</div><div class='del'>-	u8 rank;</div><div class='del'>-	u8 device[3];</div><div class='del'>-	u8 component_id[CXL_EVENT_GEN_MED_COMP_ID_SIZE];</div><div class='del'>-	u8 reserved[46];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DRAM Event Record - DER</div><div class='del'>- * CXL rev 3.0 section 8.2.9.2.1.2; Table 3-44</div><div class='del'>- */</div><div class='del'>-#define CXL_EVENT_DER_CORRECTION_MASK_SIZE	0x20</div><div class='del'>-struct cxl_event_dram {</div><div class='del'>-	struct cxl_event_record_hdr hdr;</div><div class='del'>-	__le64 phys_addr;</div><div class='del'>-	u8 descriptor;</div><div class='del'>-	u8 type;</div><div class='del'>-	u8 transaction_type;</div><div class='del'>-	u8 validity_flags[2];</div><div class='del'>-	u8 channel;</div><div class='del'>-	u8 rank;</div><div class='del'>-	u8 nibble_mask[3];</div><div class='del'>-	u8 bank_group;</div><div class='del'>-	u8 bank;</div><div class='del'>-	u8 row[3];</div><div class='del'>-	u8 column[2];</div><div class='del'>-	u8 correction_mask[CXL_EVENT_DER_CORRECTION_MASK_SIZE];</div><div class='del'>-	u8 reserved[0x17];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get Health Info Record</div><div class='del'>- * CXL rev 3.0 section 8.2.9.8.3.1; Table 8-100</div><div class='del'>- */</div><div class='del'>-struct cxl_get_health_info {</div><div class='del'>-	u8 health_status;</div><div class='del'>-	u8 media_status;</div><div class='del'>-	u8 add_status;</div><div class='del'>-	u8 life_used;</div><div class='del'>-	u8 device_temp[2];</div><div class='del'>-	u8 dirty_shutdown_cnt[4];</div><div class='del'>-	u8 cor_vol_err_cnt[4];</div><div class='del'>-	u8 cor_per_err_cnt[4];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Memory Module Event Record</div><div class='del'>- * CXL rev 3.0 section 8.2.9.2.1.3; Table 8-45</div><div class='del'>- */</div><div class='del'>-struct cxl_event_mem_module {</div><div class='del'>-	struct cxl_event_record_hdr hdr;</div><div class='del'>-	u8 event_type;</div><div class='del'>-	struct cxl_get_health_info info;</div><div class='del'>-	u8 reserved[0x3d];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-union cxl_event {</div><div class='del'>-	struct cxl_event_generic generic;</div><div class='del'>-	struct cxl_event_gen_media gen_media;</div><div class='del'>-	struct cxl_event_dram dram;</div><div class='del'>-	struct cxl_event_mem_module mem_module;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Common Event Record Format; in event logs</div><div class='del'>- * CXL rev 3.0 section 8.2.9.2.1; Table 8-42</div><div class='del'>- */</div><div class='del'>-struct cxl_event_record_raw {</div><div class='del'>-	uuid_t id;</div><div class='del'>-	union cxl_event event;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-enum cxl_event_type {</div><div class='del'>-	CXL_CPER_EVENT_GENERIC,</div><div class='del'>-	CXL_CPER_EVENT_GEN_MEDIA,</div><div class='del'>-	CXL_CPER_EVENT_DRAM,</div><div class='del'>-	CXL_CPER_EVENT_MEM_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CPER_CXL_DEVICE_ID_VALID		BIT(0)</div><div class='del'>-#define CPER_CXL_DEVICE_SN_VALID		BIT(1)</div><div class='del'>-#define CPER_CXL_COMP_EVENT_LOG_VALID		BIT(2)</div><div class='del'>-struct cxl_cper_event_rec {</div><div class='del'>-	struct {</div><div class='del'>-		u32 length;</div><div class='del'>-		u64 validation_bits;</div><div class='del'>-		struct cper_cxl_event_devid {</div><div class='del'>-			u16 vendor_id;</div><div class='del'>-			u16 device_id;</div><div class='del'>-			u8 func_num;</div><div class='del'>-			u8 device_num;</div><div class='del'>-			u8 bus_num;</div><div class='del'>-			u16 segment_num;</div><div class='del'>-			u16 slot_num; /* bits 2:0 reserved */</div><div class='del'>-			u8 reserved;</div><div class='del'>-		} __packed device_id;</div><div class='del'>-		struct cper_cxl_event_sn {</div><div class='del'>-			u32 lower_dw;</div><div class='del'>-			u32 upper_dw;</div><div class='del'>-		} __packed dev_serial_num;</div><div class='del'>-	} __packed hdr;</div><div class='del'>-</div><div class='del'>-	union cxl_event event;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_CXL_EVENT_H */</div><div class='head'>diff --git a/include/linux/damon.h b/include/linux/damon.h<br/>index 5881e4ac30be..3813373a9200 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/damon.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/damon.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/damon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/damon.h</a></div><div class='hunk'>@@ -36,6 +36,16 @@ struct damon_addr_range {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct damon_size_range - Represents size for filter to operate on [@min, @max].</div><div class='add'>+ * @min:	Min size (inclusive).</div><div class='add'>+ * @max:	Max size (inclusive).</div><div class='add'>+ */</div><div class='add'>+struct damon_size_range {</div><div class='add'>+	unsigned long min;</div><div class='add'>+	unsigned long max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct damon_region - Represents a monitoring target region.</div><div class='ctx'>  * @ar:			The address range of the region.</div><div class='ctx'>  * @sampling_addr:	Address of the sample for the next access check.</div><div class='hunk'>@@ -81,17 +91,23 @@ struct damon_region {</div><div class='ctx'>  * @nr_regions:		Number of monitoring target regions of this target.</div><div class='ctx'>  * @regions_list:	Head of the monitoring target regions of this target.</div><div class='ctx'>  * @list:		List head for siblings.</div><div class='add'>+ * @obsolete:		Whether the commit destination target is obsolete.</div><div class='ctx'>  *</div><div class='ctx'>  * Each monitoring context could have multiple targets.  For example, a context</div><div class='ctx'>  * for virtual memory address spaces could have multiple target processes.  The</div><div class='ctx'>  * @pid should be set for appropriate &amp;struct damon_operations including the</div><div class='ctx'>  * virtual address spaces monitoring operations.</div><div class='add'>+ *</div><div class='add'>+ * @obsolete is used only for damon_commit_targets() source targets, to specify</div><div class='add'>+ * the matching destination targets are obsolete.  Read damon_commit_targets()</div><div class='add'>+ * to see how it is handled.</div><div class='ctx'>  */</div><div class='ctx'> struct damon_target {</div><div class='ctx'> 	struct pid *pid;</div><div class='ctx'> 	unsigned int nr_regions;</div><div class='ctx'> 	struct list_head regions_list;</div><div class='ctx'> 	struct list_head list;</div><div class='add'>+	bool obsolete;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -100,19 +116,21 @@ struct damon_target {</div><div class='ctx'>  *</div><div class='ctx'>  * @DAMOS_WILLNEED:	Call ``madvise()`` for the region with MADV_WILLNEED.</div><div class='ctx'>  * @DAMOS_COLD:		Call ``madvise()`` for the region with MADV_COLD.</div><div class='del'>- * @DAMOS_PAGEOUT:	Call ``madvise()`` for the region with MADV_PAGEOUT.</div><div class='add'>+ * @DAMOS_PAGEOUT:	Reclaim the region.</div><div class='ctx'>  * @DAMOS_HUGEPAGE:	Call ``madvise()`` for the region with MADV_HUGEPAGE.</div><div class='ctx'>  * @DAMOS_NOHUGEPAGE:	Call ``madvise()`` for the region with MADV_NOHUGEPAGE.</div><div class='ctx'>  * @DAMOS_LRU_PRIO:	Prioritize the region on its LRU lists.</div><div class='ctx'>  * @DAMOS_LRU_DEPRIO:	Deprioritize the region on its LRU lists.</div><div class='add'>+ * @DAMOS_MIGRATE_HOT:  Migrate the regions prioritizing warmer regions.</div><div class='add'>+ * @DAMOS_MIGRATE_COLD:	Migrate the regions prioritizing colder regions.</div><div class='ctx'>  * @DAMOS_STAT:		Do nothing but count the stat.</div><div class='ctx'>  * @NR_DAMOS_ACTIONS:	Total number of DAMOS actions</div><div class='ctx'>  *</div><div class='ctx'>  * The support of each action is up to running &amp;struct damon_operations.</div><div class='del'>- * &amp;enum DAMON_OPS_VADDR and &amp;enum DAMON_OPS_FVADDR supports all actions except</div><div class='del'>- * &amp;enum DAMOS_LRU_PRIO and &amp;enum DAMOS_LRU_DEPRIO.  &amp;enum DAMON_OPS_PADDR</div><div class='del'>- * supports only &amp;enum DAMOS_PAGEOUT, &amp;enum DAMOS_LRU_PRIO, &amp;enum</div><div class='del'>- * DAMOS_LRU_DEPRIO, and &amp;DAMOS_STAT.</div><div class='add'>+ * Refer to 'Operation Action' section of Documentation/mm/damon/design.rst for</div><div class='add'>+ * status of the supports.</div><div class='add'>+ *</div><div class='add'>+ * Note that DAMOS_PAGEOUT doesn't trigger demotions.</div><div class='ctx'>  */</div><div class='ctx'> enum damos_action {</div><div class='ctx'> 	DAMOS_WILLNEED,</div><div class='hunk'>@@ -122,23 +140,87 @@ enum damos_action {</div><div class='ctx'> 	DAMOS_NOHUGEPAGE,</div><div class='ctx'> 	DAMOS_LRU_PRIO,</div><div class='ctx'> 	DAMOS_LRU_DEPRIO,</div><div class='add'>+	DAMOS_MIGRATE_HOT,</div><div class='add'>+	DAMOS_MIGRATE_COLD,</div><div class='ctx'> 	DAMOS_STAT,		/* Do nothing but only record the stat */</div><div class='ctx'> 	NR_DAMOS_ACTIONS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum damos_quota_goal_metric - Represents the metric to be used as the goal</div><div class='add'>+ *</div><div class='add'>+ * @DAMOS_QUOTA_USER_INPUT:	User-input value.</div><div class='add'>+ * @DAMOS_QUOTA_SOME_MEM_PSI_US:	System level some memory PSI in us.</div><div class='add'>+ * @DAMOS_QUOTA_NODE_MEM_USED_BP:	MemUsed ratio of a node.</div><div class='add'>+ * @DAMOS_QUOTA_NODE_MEM_FREE_BP:	MemFree ratio of a node.</div><div class='add'>+ * @DAMOS_QUOTA_NODE_MEMCG_USED_BP:	MemUsed ratio of a node for a cgroup.</div><div class='add'>+ * @DAMOS_QUOTA_NODE_MEMCG_FREE_BP:	MemFree ratio of a node for a cgroup.</div><div class='add'>+ * @NR_DAMOS_QUOTA_GOAL_METRICS:	Number of DAMOS quota goal metrics.</div><div class='add'>+ *</div><div class='add'>+ * Metrics equal to larger than @NR_DAMOS_QUOTA_GOAL_METRICS are unsupported.</div><div class='add'>+ */</div><div class='add'>+enum damos_quota_goal_metric {</div><div class='add'>+	DAMOS_QUOTA_USER_INPUT,</div><div class='add'>+	DAMOS_QUOTA_SOME_MEM_PSI_US,</div><div class='add'>+	DAMOS_QUOTA_NODE_MEM_USED_BP,</div><div class='add'>+	DAMOS_QUOTA_NODE_MEM_FREE_BP,</div><div class='add'>+	DAMOS_QUOTA_NODE_MEMCG_USED_BP,</div><div class='add'>+	DAMOS_QUOTA_NODE_MEMCG_FREE_BP,</div><div class='add'>+	NR_DAMOS_QUOTA_GOAL_METRICS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct damos_quota_goal - DAMOS scheme quota auto-tuning goal.</div><div class='add'>+ * @metric:		Metric to be used for representing the goal.</div><div class='add'>+ * @target_value:	Target value of @metric to achieve with the tuning.</div><div class='add'>+ * @current_value:	Current value of @metric.</div><div class='add'>+ * @last_psi_total:	Last measured total PSI</div><div class='add'>+ * @nid:		Node id.</div><div class='add'>+ * @memcg_id:		Memcg id.</div><div class='add'>+ * @list:		List head for siblings.</div><div class='add'>+ *</div><div class='add'>+ * Data structure for getting the current score of the quota tuning goal.  The</div><div class='add'>+ * score is calculated by how close @current_value and @target_value are.  Then</div><div class='add'>+ * the score is entered to DAMON's internal feedback loop mechanism to get the</div><div class='add'>+ * auto-tuned quota.</div><div class='add'>+ *</div><div class='add'>+ * If @metric is DAMOS_QUOTA_USER_INPUT, @current_value should be manually</div><div class='add'>+ * entered by the user, probably inside the kdamond callbacks.  Otherwise,</div><div class='add'>+ * DAMON sets @current_value with self-measured value of @metric.</div><div class='add'>+ *</div><div class='add'>+ * If @metric is DAMOS_QUOTA_NODE_MEM_{USED,FREE}_BP, @nid represents the node</div><div class='add'>+ * id of the target node to account the used/free memory.</div><div class='add'>+ *</div><div class='add'>+ * If @metric is DAMOS_QUOTA_NODE_MEMCG_{USED,FREE}_BP, @nid and @memcg_id</div><div class='add'>+ * represents the node id and the cgroup to account the used memory for.</div><div class='add'>+ */</div><div class='add'>+struct damos_quota_goal {</div><div class='add'>+	enum damos_quota_goal_metric metric;</div><div class='add'>+	unsigned long target_value;</div><div class='add'>+	unsigned long current_value;</div><div class='add'>+	/* metric-dependent fields */</div><div class='add'>+	union {</div><div class='add'>+		u64 last_psi_total;</div><div class='add'>+		struct {</div><div class='add'>+			int nid;</div><div class='add'>+			unsigned short memcg_id;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct damos_quota - Controls the aggressiveness of the given scheme.</div><div class='add'>+ * @reset_interval:	Charge reset interval in milliseconds.</div><div class='ctx'>  * @ms:			Maximum milliseconds that the scheme can use.</div><div class='ctx'>  * @sz:			Maximum bytes of memory that the action can be applied.</div><div class='del'>- * @reset_interval:	Charge reset interval in milliseconds.</div><div class='add'>+ * @goals:		Head of quota tuning goals (&amp;damos_quota_goal) list.</div><div class='add'>+ * @esz:		Effective size quota in bytes.</div><div class='ctx'>  *</div><div class='ctx'>  * @weight_sz:		Weight of the region's size for prioritization.</div><div class='ctx'>  * @weight_nr_accesses:	Weight of the region's nr_accesses for prioritization.</div><div class='ctx'>  * @weight_age:		Weight of the region's age for prioritization.</div><div class='ctx'>  *</div><div class='del'>- * @get_score:		Feedback function for self-tuning quota.</div><div class='del'>- * @get_score_arg:	Parameter for @get_score</div><div class='del'>- *</div><div class='ctx'>  * To avoid consuming too much CPU time or IO resources for applying the</div><div class='ctx'>  * &amp;struct damos-&gt;action to large memory, DAMON allows users to set time and/or</div><div class='ctx'>  * size quotas.  The quotas can be set by writing non-zero values to &amp;ms and</div><div class='hunk'>@@ -147,46 +229,44 @@ enum damos_action {</div><div class='ctx'>  * size quota is set, DAMON tries to apply the action only up to &amp;sz bytes</div><div class='ctx'>  * within &amp;reset_interval.</div><div class='ctx'>  *</div><div class='del'>- * Internally, the time quota is transformed to a size quota using estimated</div><div class='del'>- * throughput of the scheme's action.  DAMON then compares it against &amp;sz and</div><div class='del'>- * uses smaller one as the effective quota.</div><div class='add'>+ * To convince the different types of quotas and goals, DAMON internally</div><div class='add'>+ * converts those into one single size quota called "effective quota".  DAMON</div><div class='add'>+ * internally uses it as the only one real quota.  The conversion is made as</div><div class='add'>+ * follows.</div><div class='add'>+ *</div><div class='add'>+ * The time quota is transformed to a size quota using estimated throughput of</div><div class='add'>+ * the scheme's action.  DAMON then compares it against &amp;sz and uses smaller</div><div class='add'>+ * one as the effective quota.</div><div class='add'>+ *</div><div class='add'>+ * If @goals is not empty, DAMON calculates yet another size quota based on the</div><div class='add'>+ * goals using its internal feedback loop algorithm, for every @reset_interval.</div><div class='add'>+ * Then, if the new size quota is smaller than the effective quota, it uses the</div><div class='add'>+ * new size quota as the effective quota.</div><div class='add'>+ *</div><div class='add'>+ * The resulting effective size quota in bytes is set to @esz.</div><div class='ctx'>  *</div><div class='ctx'>  * For selecting regions within the quota, DAMON prioritizes current scheme's</div><div class='ctx'>  * target memory regions using the &amp;struct damon_operations-&gt;get_scheme_score.</div><div class='ctx'>  * You could customize the prioritization logic by setting &amp;weight_sz,</div><div class='ctx'>  * &amp;weight_nr_accesses, and &amp;weight_age, because monitoring operations are</div><div class='ctx'>  * encouraged to respect those.</div><div class='del'>- *</div><div class='del'>- * If @get_score function pointer is set, DAMON calls it back with</div><div class='del'>- * @get_score_arg and get the return value of it for every @reset_interval.</div><div class='del'>- * Then, DAMON adjusts the effective quota using the return value as a feedback</div><div class='del'>- * score to the current quota, using its internal feedback loop algorithm.</div><div class='del'>- *</div><div class='del'>- * The feedback loop algorithem assumes the quota input and the feedback score</div><div class='del'>- * output are in a positive proportional relationship, and the goal of the</div><div class='del'>- * tuning is getting the feedback screo value of 10,000.  If @ms and/or @sz are</div><div class='del'>- * set together, those work as a hard limit quota.  If neither @ms nor @sz are</div><div class='del'>- * set, the mechanism starts from the quota of one byte.</div><div class='ctx'>  */</div><div class='ctx'> struct damos_quota {</div><div class='add'>+	unsigned long reset_interval;</div><div class='ctx'> 	unsigned long ms;</div><div class='ctx'> 	unsigned long sz;</div><div class='del'>-	unsigned long reset_interval;</div><div class='add'>+	struct list_head goals;</div><div class='add'>+	unsigned long esz;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int weight_sz;</div><div class='ctx'> 	unsigned int weight_nr_accesses;</div><div class='ctx'> 	unsigned int weight_age;</div><div class='ctx'> </div><div class='del'>-	unsigned long (*get_score)(void *arg);</div><div class='del'>-	void *get_score_arg;</div><div class='del'>-</div><div class='ctx'> /* private: */</div><div class='ctx'> 	/* For throughput estimation */</div><div class='ctx'> 	unsigned long total_charged_sz;</div><div class='ctx'> 	unsigned long total_charged_ns;</div><div class='ctx'> </div><div class='del'>-	unsigned long esz;	/* Effective size quota in bytes */</div><div class='del'>-</div><div class='ctx'> 	/* For charging the quota */</div><div class='ctx'> 	unsigned long charged_sz;</div><div class='ctx'> 	unsigned long charged_from;</div><div class='hunk'>@@ -194,7 +274,6 @@ struct damos_quota {</div><div class='ctx'> 	unsigned long charge_addr_from;</div><div class='ctx'> </div><div class='ctx'> 	/* For prioritization */</div><div class='del'>-	unsigned long histogram[DAMOS_MAX_SCORE + 1];</div><div class='ctx'> 	unsigned int min_score;</div><div class='ctx'> </div><div class='ctx'> 	/* For feedback loop */</div><div class='hunk'>@@ -248,20 +327,44 @@ struct damos_watermarks {</div><div class='ctx'>  * @sz_tried:	Total size of regions that the scheme is tried to be applied.</div><div class='ctx'>  * @nr_applied:	Total number of regions that the scheme is applied.</div><div class='ctx'>  * @sz_applied:	Total size of regions that the scheme is applied.</div><div class='add'>+ * @sz_ops_filter_passed:</div><div class='add'>+ *		Total bytes that passed ops layer-handled DAMOS filters.</div><div class='ctx'>  * @qt_exceeds: Total number of times the quota of the scheme has exceeded.</div><div class='add'>+ *</div><div class='add'>+ * "Tried an action to a region" in this context means the DAMOS core logic</div><div class='add'>+ * determined the region as eligible to apply the action.  The access pattern</div><div class='add'>+ * (&amp;struct damos_access_pattern), quotas (&amp;struct damos_quota), watermarks</div><div class='add'>+ * (&amp;struct damos_watermarks) and filters (&amp;struct damos_filter) that handled</div><div class='add'>+ * on core logic can affect this.  The core logic asks the operation set</div><div class='add'>+ * (&amp;struct damon_operations) to apply the action to the region.</div><div class='add'>+ *</div><div class='add'>+ * "Applied an action to a region" in this context means the operation set</div><div class='add'>+ * (&amp;struct damon_operations) successfully applied the action to the region, at</div><div class='add'>+ * least to a part of the region.  The filters (&amp;struct damos_filter) that</div><div class='add'>+ * handled on operation set layer and type of the action and pages of the</div><div class='add'>+ * region can affect this.  For example, if a filter is set to exclude</div><div class='add'>+ * anonymous pages and the region has only anonymous pages, the region will be</div><div class='add'>+ * failed at applying the action.  If the action is &amp;DAMOS_PAGEOUT and all</div><div class='add'>+ * pages of the region are already paged out, the region will be failed at</div><div class='add'>+ * applying the action.</div><div class='ctx'>  */</div><div class='ctx'> struct damos_stat {</div><div class='ctx'> 	unsigned long nr_tried;</div><div class='ctx'> 	unsigned long sz_tried;</div><div class='ctx'> 	unsigned long nr_applied;</div><div class='ctx'> 	unsigned long sz_applied;</div><div class='add'>+	unsigned long sz_ops_filter_passed;</div><div class='ctx'> 	unsigned long qt_exceeds;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum damos_filter_type - Type of memory for &amp;struct damos_filter</div><div class='ctx'>  * @DAMOS_FILTER_TYPE_ANON:	Anonymous pages.</div><div class='add'>+ * @DAMOS_FILTER_TYPE_ACTIVE:	Active pages.</div><div class='ctx'>  * @DAMOS_FILTER_TYPE_MEMCG:	Specific memcg's pages.</div><div class='add'>+ * @DAMOS_FILTER_TYPE_YOUNG:	Recently accessed pages.</div><div class='add'>+ * @DAMOS_FILTER_TYPE_HUGEPAGE_SIZE:	Page is part of a hugepage.</div><div class='add'>+ * @DAMOS_FILTER_TYPE_UNMAPPED:	Unmapped pages.</div><div class='ctx'>  * @DAMOS_FILTER_TYPE_ADDR:	Address range.</div><div class='ctx'>  * @DAMOS_FILTER_TYPE_TARGET:	Data Access Monitoring target.</div><div class='ctx'>  * @NR_DAMOS_FILTER_TYPES:	Number of filter types.</div><div class='hunk'>@@ -279,7 +382,11 @@ struct damos_stat {</div><div class='ctx'>  */</div><div class='ctx'> enum damos_filter_type {</div><div class='ctx'> 	DAMOS_FILTER_TYPE_ANON,</div><div class='add'>+	DAMOS_FILTER_TYPE_ACTIVE,</div><div class='ctx'> 	DAMOS_FILTER_TYPE_MEMCG,</div><div class='add'>+	DAMOS_FILTER_TYPE_YOUNG,</div><div class='add'>+	DAMOS_FILTER_TYPE_HUGEPAGE_SIZE,</div><div class='add'>+	DAMOS_FILTER_TYPE_UNMAPPED,</div><div class='ctx'> 	DAMOS_FILTER_TYPE_ADDR,</div><div class='ctx'> 	DAMOS_FILTER_TYPE_TARGET,</div><div class='ctx'> 	NR_DAMOS_FILTER_TYPES,</div><div class='hunk'>@@ -287,31 +394,61 @@ enum damos_filter_type {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct damos_filter - DAMOS action target memory filter.</div><div class='del'>- * @type:	Type of the page.</div><div class='del'>- * @matching:	If the matching page should filtered out or in.</div><div class='add'>+ * @type:	Type of the target memory.</div><div class='add'>+ * @matching:	Whether this is for @type-matching memory.</div><div class='add'>+ * @allow:	Whether to include or exclude the @matching memory.</div><div class='ctx'>  * @memcg_id:	Memcg id of the question if @type is DAMOS_FILTER_MEMCG.</div><div class='ctx'>  * @addr_range:	Address range if @type is DAMOS_FILTER_TYPE_ADDR.</div><div class='ctx'>  * @target_idx:	Index of the &amp;struct damon_target of</div><div class='ctx'>  *		&amp;damon_ctx-&gt;adaptive_targets if @type is</div><div class='ctx'>  *		DAMOS_FILTER_TYPE_TARGET.</div><div class='add'>+ * @sz_range:	Size range if @type is DAMOS_FILTER_TYPE_HUGEPAGE_SIZE.</div><div class='ctx'>  * @list:	List head for siblings.</div><div class='ctx'>  *</div><div class='ctx'>  * Before applying the &amp;damos-&gt;action to a memory region, DAMOS checks if each</div><div class='del'>- * page of the region matches to this and avoid applying the action if so.</div><div class='del'>- * Support of each filter type depends on the running &amp;struct damon_operations</div><div class='del'>- * and the type.  Refer to &amp;enum damos_filter_type for more detai.</div><div class='add'>+ * byte of the region matches to this given condition and avoid applying the</div><div class='add'>+ * action if so.  Support of each filter type depends on the running &amp;struct</div><div class='add'>+ * damon_operations and the type.  Refer to &amp;enum damos_filter_type for more</div><div class='add'>+ * details.</div><div class='ctx'>  */</div><div class='ctx'> struct damos_filter {</div><div class='ctx'> 	enum damos_filter_type type;</div><div class='ctx'> 	bool matching;</div><div class='add'>+	bool allow;</div><div class='ctx'> 	union {</div><div class='ctx'> 		unsigned short memcg_id;</div><div class='ctx'> 		struct damon_addr_range addr_range;</div><div class='ctx'> 		int target_idx;</div><div class='add'>+		struct damon_size_range sz_range;</div><div class='ctx'> 	};</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct damon_ctx;</div><div class='add'>+struct damos;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct damos_walk_control - Control damos_walk().</div><div class='add'>+ *</div><div class='add'>+ * @walk_fn:	Function to be called back for each region.</div><div class='add'>+ * @data:	Data that will be passed to walk functions.</div><div class='add'>+ *</div><div class='add'>+ * Control damos_walk(), which requests specific kdamond to invoke the given</div><div class='add'>+ * function to each region that eligible to apply actions of the kdamond's</div><div class='add'>+ * schemes.  Refer to damos_walk() for more details.</div><div class='add'>+ */</div><div class='add'>+struct damos_walk_control {</div><div class='add'>+	void (*walk_fn)(void *data, struct damon_ctx *ctx,</div><div class='add'>+			struct damon_target *t, struct damon_region *r,</div><div class='add'>+			struct damos *s, unsigned long sz_filter_passed);</div><div class='add'>+	void *data;</div><div class='add'>+/* private: internal use only */</div><div class='add'>+	/* informs if the kdamond finished handling of the walk request */</div><div class='add'>+	struct completion completion;</div><div class='add'>+	/* informs if the walk is canceled. */</div><div class='add'>+	bool canceled;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct damos_access_pattern - Target access pattern of the given scheme.</div><div class='ctx'>  * @min_sz_region:	Minimum size of target regions.</div><div class='hunk'>@@ -331,13 +468,33 @@ struct damos_access_pattern {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct damos_migrate_dests - Migration destination nodes and their weights.</div><div class='add'>+ * @node_id_arr:	Array of migration destination node ids.</div><div class='add'>+ * @weight_arr:		Array of migration weights for @node_id_arr.</div><div class='add'>+ * @nr_dests:		Length of the @node_id_arr and @weight_arr arrays.</div><div class='add'>+ *</div><div class='add'>+ * @node_id_arr is an array of the ids of migration destination nodes.</div><div class='add'>+ * @weight_arr is an array of the weights for those.  The weights in</div><div class='add'>+ * @weight_arr are for nodes in @node_id_arr of same array index.</div><div class='add'>+ */</div><div class='add'>+struct damos_migrate_dests {</div><div class='add'>+	unsigned int *node_id_arr;</div><div class='add'>+	unsigned int *weight_arr;</div><div class='add'>+	size_t nr_dests;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct damos - Represents a Data Access Monitoring-based Operation Scheme.</div><div class='ctx'>  * @pattern:		Access pattern of target regions.</div><div class='del'>- * @action:		&amp;damo_action to be applied to the target regions.</div><div class='add'>+ * @action:		&amp;damos_action to be applied to the target regions.</div><div class='ctx'>  * @apply_interval_us:	The time between applying the @action.</div><div class='ctx'>  * @quota:		Control the aggressiveness of this scheme.</div><div class='ctx'>  * @wmarks:		Watermarks for automated (in)activation of this scheme.</div><div class='del'>- * @filters:		Additional set of &amp;struct damos_filter for &amp;action.</div><div class='add'>+ * @migrate_dests:	Destination nodes if @action is "migrate_{hot,cold}".</div><div class='add'>+ * @target_nid:		Destination node if @action is "migrate_{hot,cold}".</div><div class='add'>+ * @core_filters:	Additional set of &amp;struct damos_filter for &amp;action.</div><div class='add'>+ * @ops_filters:	ops layer handling &amp;struct damos_filter objects list.</div><div class='add'>+ * @last_applied:	Last @action applied ops-managing entity.</div><div class='ctx'>  * @stat:		Statistics of this scheme.</div><div class='ctx'>  * @list:		List head for siblings.</div><div class='ctx'>  *</div><div class='hunk'>@@ -352,9 +509,25 @@ struct damos_access_pattern {</div><div class='ctx'>  * monitoring context are inactive, DAMON stops monitoring either, and just</div><div class='ctx'>  * repeatedly checks the watermarks.</div><div class='ctx'>  *</div><div class='add'>+ * @migrate_dests specifies multiple migration target nodes with different</div><div class='add'>+ * weights for migrate_hot or migrate_cold actions.  @target_nid is ignored if</div><div class='add'>+ * this is set.</div><div class='add'>+ *</div><div class='add'>+ * @target_nid is used to set the migration target node for migrate_hot or</div><div class='add'>+ * migrate_cold actions, and @migrate_dests is unset.</div><div class='add'>+ *</div><div class='ctx'>  * Before applying the &amp;action to a memory region, &amp;struct damon_operations</div><div class='ctx'>  * implementation could check pages of the region and skip &amp;action to respect</div><div class='del'>- * &amp;filters</div><div class='add'>+ * &amp;core_filters</div><div class='add'>+ *</div><div class='add'>+ * The minimum entity that @action can be applied depends on the underlying</div><div class='add'>+ * &amp;struct damon_operations.  Since it may not be aligned with the core layer</div><div class='add'>+ * abstract, namely &amp;struct damon_region, &amp;struct damon_operations could apply</div><div class='add'>+ * @action to same entity multiple times.  Large folios that underlying on</div><div class='add'>+ * multiple &amp;struct damon region objects could be such examples.  The &amp;struct</div><div class='add'>+ * damon_operations can use @last_applied to avoid that.  DAMOS core logic</div><div class='add'>+ * unsets @last_applied when each regions walking for applying the scheme is</div><div class='add'>+ * finished.</div><div class='ctx'>  *</div><div class='ctx'>  * After applying the &amp;action to each region, &amp;stat_count and &amp;stat_sz is</div><div class='ctx'>  * updated to reflect the number of regions and total size of regions that the</div><div class='hunk'>@@ -370,10 +543,28 @@ struct damos {</div><div class='ctx'> 	 * @action</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long next_apply_sis;</div><div class='add'>+	/* informs if ongoing DAMOS walk for this scheme is finished */</div><div class='add'>+	bool walk_completed;</div><div class='add'>+	/*</div><div class='add'>+	 * If the current region in the filtering stage is allowed by core</div><div class='add'>+	 * layer-handled filters.  If true, operations layer allows it, too.</div><div class='add'>+	 */</div><div class='add'>+	bool core_filters_allowed;</div><div class='add'>+	/* whether to reject core/ops filters umatched regions */</div><div class='add'>+	bool core_filters_default_reject;</div><div class='add'>+	bool ops_filters_default_reject;</div><div class='ctx'> /* public: */</div><div class='ctx'> 	struct damos_quota quota;</div><div class='ctx'> 	struct damos_watermarks wmarks;</div><div class='del'>-	struct list_head filters;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			int target_nid;</div><div class='add'>+			struct damos_migrate_dests migrate_dests;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	struct list_head core_filters;</div><div class='add'>+	struct list_head ops_filters;</div><div class='add'>+	void *last_applied;</div><div class='ctx'> 	struct damos_stat stat;</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='hunk'>@@ -394,8 +585,6 @@ enum damon_ops_id {</div><div class='ctx'> 	NR_DAMON_OPS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct damon_ctx;</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct damon_operations - Monitoring operations for given use cases.</div><div class='ctx'>  *</div><div class='hunk'>@@ -404,10 +593,10 @@ struct damon_ctx;</div><div class='ctx'>  * @update:			Update operations-related data structures.</div><div class='ctx'>  * @prepare_access_checks:	Prepare next access check of target regions.</div><div class='ctx'>  * @check_accesses:		Check the accesses to target regions.</div><div class='del'>- * @reset_aggregated:		Reset aggregated accesses monitoring results.</div><div class='ctx'>  * @get_scheme_score:		Get the score of a region for a scheme.</div><div class='ctx'>  * @apply_scheme:		Apply a DAMON-based operation scheme.</div><div class='ctx'>  * @target_valid:		Determine if the target is valid.</div><div class='add'>+ * @cleanup_target:		Clean up each target before deallocation.</div><div class='ctx'>  * @cleanup:			Clean up the context.</div><div class='ctx'>  *</div><div class='ctx'>  * DAMON can be extended for various address spaces and usages.  For this,</div><div class='hunk'>@@ -416,8 +605,7 @@ struct damon_ctx;</div><div class='ctx'>  * (&amp;damon_ctx.kdamond) calls @init and @prepare_access_checks before starting</div><div class='ctx'>  * the monitoring, @update after each &amp;damon_attrs.ops_update_interval, and</div><div class='ctx'>  * @check_accesses, @target_valid and @prepare_access_checks after each</div><div class='del'>- * &amp;damon_attrs.sample_interval.  Finally, @reset_aggregated is called after</div><div class='del'>- * each &amp;damon_attrs.aggr_interval.</div><div class='add'>+ * &amp;damon_attrs.sample_interval.</div><div class='ctx'>  *</div><div class='ctx'>  * Each &amp;struct damon_operations instance having valid @id can be registered</div><div class='ctx'>  * via damon_register_ops() and selected by damon_select_ops() later.</div><div class='hunk'>@@ -432,16 +620,16 @@ struct damon_ctx;</div><div class='ctx'>  * last preparation and update the number of observed accesses of each region.</div><div class='ctx'>  * It should also return max number of observed accesses that made as a result</div><div class='ctx'>  * of its update.  The value will be used for regions adjustment threshold.</div><div class='del'>- * @reset_aggregated should reset the access monitoring results that aggregated</div><div class='del'>- * by @check_accesses.</div><div class='ctx'>  * @get_scheme_score should return the priority score of a region for a scheme</div><div class='ctx'>  * as an integer in [0, &amp;DAMOS_MAX_SCORE].</div><div class='ctx'>  * @apply_scheme is called from @kdamond when a region for user provided</div><div class='ctx'>  * DAMON-based operation scheme is found.  It should apply the scheme's action</div><div class='ctx'>  * to the region and return bytes of the region that the action is successfully</div><div class='del'>- * applied.</div><div class='add'>+ * applied.  It should also report how many bytes of the region has passed</div><div class='add'>+ * filters (&amp;struct damos_filter) that handled by itself.</div><div class='ctx'>  * @target_valid should check whether the target is still valid for the</div><div class='ctx'>  * monitoring.</div><div class='add'>+ * @cleanup_target is called before the target will be deallocated.</div><div class='ctx'>  * @cleanup is called from @kdamond just before its termination.</div><div class='ctx'>  */</div><div class='ctx'> struct damon_operations {</div><div class='hunk'>@@ -450,58 +638,67 @@ struct damon_operations {</div><div class='ctx'> 	void (*update)(struct damon_ctx *context);</div><div class='ctx'> 	void (*prepare_access_checks)(struct damon_ctx *context);</div><div class='ctx'> 	unsigned int (*check_accesses)(struct damon_ctx *context);</div><div class='del'>-	void (*reset_aggregated)(struct damon_ctx *context);</div><div class='ctx'> 	int (*get_scheme_score)(struct damon_ctx *context,</div><div class='ctx'> 			struct damon_target *t, struct damon_region *r,</div><div class='ctx'> 			struct damos *scheme);</div><div class='ctx'> 	unsigned long (*apply_scheme)(struct damon_ctx *context,</div><div class='ctx'> 			struct damon_target *t, struct damon_region *r,</div><div class='del'>-			struct damos *scheme);</div><div class='add'>+			struct damos *scheme, unsigned long *sz_filter_passed);</div><div class='ctx'> 	bool (*target_valid)(struct damon_target *t);</div><div class='add'>+	void (*cleanup_target)(struct damon_target *t);</div><div class='ctx'> 	void (*cleanup)(struct damon_ctx *context);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * struct damon_call_control - Control damon_call().</div><div class='add'>+ *</div><div class='add'>+ * @fn:			Function to be called back.</div><div class='add'>+ * @data:		Data that will be passed to @fn.</div><div class='add'>+ * @repeat:		Repeat invocations.</div><div class='add'>+ * @return_code:	Return code from @fn invocation.</div><div class='add'>+ * @dealloc_on_cancel:	De-allocate when canceled.</div><div class='add'>+ *</div><div class='add'>+ * Control damon_call(), which requests specific kdamond to invoke a given</div><div class='add'>+ * function.  Refer to damon_call() for more details.</div><div class='add'>+ */</div><div class='add'>+struct damon_call_control {</div><div class='add'>+	int (*fn)(void *data);</div><div class='add'>+	void *data;</div><div class='add'>+	bool repeat;</div><div class='add'>+	int return_code;</div><div class='add'>+	bool dealloc_on_cancel;</div><div class='add'>+/* private: internal use only */</div><div class='add'>+	/* informs if the kdamond finished handling of the request */</div><div class='add'>+	struct completion completion;</div><div class='add'>+	/* informs if the kdamond canceled @fn infocation */</div><div class='add'>+	bool canceled;</div><div class='add'>+	/* List head for siblings. */</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * struct damon_callback - Monitoring events notification callbacks.</div><div class='del'>- *</div><div class='del'>- * @before_start:	Called before starting the monitoring.</div><div class='del'>- * @after_wmarks_check:	Called after each schemes' watermarks check.</div><div class='del'>- * @after_sampling:	Called after each sampling.</div><div class='del'>- * @after_aggregation:	Called after each aggregation.</div><div class='del'>- * @before_damos_apply:	Called before applying DAMOS action.</div><div class='del'>- * @before_terminate:	Called before terminating the monitoring.</div><div class='del'>- * @private:		User private data.</div><div class='del'>- *</div><div class='del'>- * The monitoring thread (&amp;damon_ctx.kdamond) calls @before_start and</div><div class='del'>- * @before_terminate just before starting and finishing the monitoring,</div><div class='del'>- * respectively.  Therefore, those are good places for installing and cleaning</div><div class='del'>- * @private.</div><div class='del'>- *</div><div class='del'>- * The monitoring thread calls @after_wmarks_check after each DAMON-based</div><div class='del'>- * operation schemes' watermarks check.  If users need to make changes to the</div><div class='del'>- * attributes of the monitoring context while it's deactivated due to the</div><div class='del'>- * watermarks, this is the good place to do.</div><div class='del'>- *</div><div class='del'>- * The monitoring thread calls @after_sampling and @after_aggregation for each</div><div class='del'>- * of the sampling intervals and aggregation intervals, respectively.</div><div class='del'>- * Therefore, users can safely access the monitoring results without additional</div><div class='del'>- * protection.  For the reason, users are recommended to use these callback for</div><div class='del'>- * the accesses to the results.</div><div class='del'>- *</div><div class='del'>- * If any callback returns non-zero, monitoring stops.</div><div class='add'>+ * struct damon_intervals_goal - Monitoring intervals auto-tuning goal.</div><div class='add'>+ *</div><div class='add'>+ * @access_bp:		Access events observation ratio to achieve in bp.</div><div class='add'>+ * @aggrs:		Number of aggregations to achieve @access_bp within.</div><div class='add'>+ * @min_sample_us:	Minimum resulting sampling interval in microseconds.</div><div class='add'>+ * @max_sample_us:	Maximum resulting sampling interval in microseconds.</div><div class='add'>+ *</div><div class='add'>+ * DAMON automatically tunes &amp;damon_attrs-&gt;sample_interval and</div><div class='add'>+ * &amp;damon_attrs-&gt;aggr_interval aiming the ratio in bp (1/10,000) of</div><div class='add'>+ * DAMON-observed access events to theoretical maximum amount within @aggrs</div><div class='add'>+ * aggregations be same to @access_bp.  The logic increases</div><div class='add'>+ * &amp;damon_attrs-&gt;aggr_interval and &amp;damon_attrs-&gt;sampling_interval in same</div><div class='add'>+ * ratio if the current access events observation ratio is lower than the</div><div class='add'>+ * target for each @aggrs aggregations, and vice versa.</div><div class='add'>+ *</div><div class='add'>+ * If @aggrs is zero, the tuning is disabled and hence this struct is ignored.</div><div class='ctx'>  */</div><div class='del'>-struct damon_callback {</div><div class='del'>-	void *private;</div><div class='del'>-</div><div class='del'>-	int (*before_start)(struct damon_ctx *context);</div><div class='del'>-	int (*after_wmarks_check)(struct damon_ctx *context);</div><div class='del'>-	int (*after_sampling)(struct damon_ctx *context);</div><div class='del'>-	int (*after_aggregation)(struct damon_ctx *context);</div><div class='del'>-	int (*before_damos_apply)(struct damon_ctx *context,</div><div class='del'>-			struct damon_target *target,</div><div class='del'>-			struct damon_region *region,</div><div class='del'>-			struct damos *scheme);</div><div class='del'>-	void (*before_terminate)(struct damon_ctx *context);</div><div class='add'>+struct damon_intervals_goal {</div><div class='add'>+	unsigned long access_bp;</div><div class='add'>+	unsigned long aggrs;</div><div class='add'>+	unsigned long min_sample_us;</div><div class='add'>+	unsigned long max_sample_us;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -510,6 +707,7 @@ struct damon_callback {</div><div class='ctx'>  * @sample_interval:		The time between access samplings.</div><div class='ctx'>  * @aggr_interval:		The time between monitor results aggregations.</div><div class='ctx'>  * @ops_update_interval:	The time between monitoring operations updates.</div><div class='add'>+ * @intervals_goal:		Intervals auto-tuning goal.</div><div class='ctx'>  * @min_nr_regions:		The minimum number of adaptive monitoring</div><div class='ctx'>  *				regions.</div><div class='ctx'>  * @max_nr_regions:		The maximum number of adaptive monitoring</div><div class='hunk'>@@ -523,14 +721,26 @@ struct damon_callback {</div><div class='ctx'>  * ``mmap()`` calls from the application, in case of virtual memory monitoring)</div><div class='ctx'>  * and applies the changes for each @ops_update_interval.  All time intervals</div><div class='ctx'>  * are in micro-seconds.  Please refer to &amp;struct damon_operations and &amp;struct</div><div class='del'>- * damon_callback for more detail.</div><div class='add'>+ * damon_call_control for more detail.</div><div class='ctx'>  */</div><div class='ctx'> struct damon_attrs {</div><div class='ctx'> 	unsigned long sample_interval;</div><div class='ctx'> 	unsigned long aggr_interval;</div><div class='ctx'> 	unsigned long ops_update_interval;</div><div class='add'>+	struct damon_intervals_goal intervals_goal;</div><div class='ctx'> 	unsigned long min_nr_regions;</div><div class='ctx'> 	unsigned long max_nr_regions;</div><div class='add'>+/* private: internal use only */</div><div class='add'>+	/*</div><div class='add'>+	 * @aggr_interval to @sample_interval ratio.</div><div class='add'>+	 * Core-external components call damon_set_attrs() with &amp;damon_attrs</div><div class='add'>+	 * that this field is unset.  In the case, damon_set_attrs() sets this</div><div class='add'>+	 * field of resulting &amp;damon_attrs.  Core-internal components such as</div><div class='add'>+	 * kdamond_tune_intervals() calls damon_set_attrs() with &amp;damon_attrs</div><div class='add'>+	 * that this field is set.  In the case, damon_set_attrs() just keep</div><div class='add'>+	 * it.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long aggr_samples;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -558,8 +768,8 @@ struct damon_attrs {</div><div class='ctx'>  * Accesses to other fields must be protected by themselves.</div><div class='ctx'>  *</div><div class='ctx'>  * @ops:	Set of monitoring operations for given use cases.</div><div class='del'>- * @callback:	Set of callbacks for monitoring events notifications.</div><div class='del'>- *</div><div class='add'>+ * @addr_unit:	Scale factor for core to ops address conversion.</div><div class='add'>+ * @min_sz_region:		Minimum region size.</div><div class='ctx'>  * @adaptive_targets:	Head of monitoring targets (&amp;damon_target) list.</div><div class='ctx'>  * @schemes:		Head of schemes (&amp;damos) list.</div><div class='ctx'>  */</div><div class='hunk'>@@ -579,15 +789,30 @@ struct damon_ctx {</div><div class='ctx'> 	 * update</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long next_ops_update_sis;</div><div class='add'>+	/*</div><div class='add'>+	 * number of sample intervals that should be passed before next</div><div class='add'>+	 * intervals tuning</div><div class='add'>+	 */</div><div class='add'>+	unsigned long next_intervals_tune_sis;</div><div class='ctx'> 	/* for waiting until the execution of the kdamond_fn is started */</div><div class='ctx'> 	struct completion kdamond_started;</div><div class='add'>+	/* for scheme quotas prioritization */</div><div class='add'>+	unsigned long *regions_score_histogram;</div><div class='add'>+</div><div class='add'>+	/* lists of &amp;struct damon_call_control */</div><div class='add'>+	struct list_head call_controls;</div><div class='add'>+	struct mutex call_controls_lock;</div><div class='add'>+</div><div class='add'>+	struct damos_walk_control *walk_control;</div><div class='add'>+	struct mutex walk_control_lock;</div><div class='ctx'> </div><div class='ctx'> /* public: */</div><div class='ctx'> 	struct task_struct *kdamond;</div><div class='ctx'> 	struct mutex kdamond_lock;</div><div class='ctx'> </div><div class='ctx'> 	struct damon_operations ops;</div><div class='del'>-	struct damon_callback callback;</div><div class='add'>+	unsigned long addr_unit;</div><div class='add'>+	unsigned long min_sz_region;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head adaptive_targets;</div><div class='ctx'> 	struct list_head schemes;</div><div class='hunk'>@@ -640,11 +865,23 @@ static inline unsigned long damon_sz_region(struct damon_region *r)</div><div class='ctx'> #define damon_for_each_scheme_safe(s, next, ctx) \</div><div class='ctx'> 	list_for_each_entry_safe(s, next, &amp;(ctx)-&gt;schemes, list)</div><div class='ctx'> </div><div class='del'>-#define damos_for_each_filter(f, scheme) \</div><div class='del'>-	list_for_each_entry(f, &amp;(scheme)-&gt;filters, list)</div><div class='add'>+#define damos_for_each_quota_goal(goal, quota) \</div><div class='add'>+	list_for_each_entry(goal, &amp;quota-&gt;goals, list)</div><div class='add'>+</div><div class='add'>+#define damos_for_each_quota_goal_safe(goal, next, quota) \</div><div class='add'>+	list_for_each_entry_safe(goal, next, &amp;(quota)-&gt;goals, list)</div><div class='ctx'> </div><div class='del'>-#define damos_for_each_filter_safe(f, next, scheme) \</div><div class='del'>-	list_for_each_entry_safe(f, next, &amp;(scheme)-&gt;filters, list)</div><div class='add'>+#define damos_for_each_core_filter(f, scheme) \</div><div class='add'>+	list_for_each_entry(f, &amp;(scheme)-&gt;core_filters, list)</div><div class='add'>+</div><div class='add'>+#define damos_for_each_core_filter_safe(f, next, scheme) \</div><div class='add'>+	list_for_each_entry_safe(f, next, &amp;(scheme)-&gt;core_filters, list)</div><div class='add'>+</div><div class='add'>+#define damos_for_each_ops_filter(f, scheme) \</div><div class='add'>+	list_for_each_entry(f, &amp;(scheme)-&gt;ops_filters, list)</div><div class='add'>+</div><div class='add'>+#define damos_for_each_ops_filter_safe(f, next, scheme) \</div><div class='add'>+	list_for_each_entry_safe(f, next, &amp;(scheme)-&gt;ops_filters, list)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DAMON</div><div class='ctx'> </div><div class='hunk'>@@ -664,28 +901,37 @@ static inline void damon_insert_region(struct damon_region *r,</div><div class='ctx'> void damon_add_region(struct damon_region *r, struct damon_target *t);</div><div class='ctx'> void damon_destroy_region(struct damon_region *r, struct damon_target *t);</div><div class='ctx'> int damon_set_regions(struct damon_target *t, struct damon_addr_range *ranges,</div><div class='del'>-		unsigned int nr_ranges);</div><div class='add'>+		unsigned int nr_ranges, unsigned long min_sz_region);</div><div class='ctx'> void damon_update_region_access_rate(struct damon_region *r, bool accessed,</div><div class='ctx'> 		struct damon_attrs *attrs);</div><div class='ctx'> </div><div class='ctx'> struct damos_filter *damos_new_filter(enum damos_filter_type type,</div><div class='del'>-		bool matching);</div><div class='add'>+		bool matching, bool allow);</div><div class='ctx'> void damos_add_filter(struct damos *s, struct damos_filter *f);</div><div class='add'>+bool damos_filter_for_ops(enum damos_filter_type type);</div><div class='ctx'> void damos_destroy_filter(struct damos_filter *f);</div><div class='ctx'> </div><div class='add'>+struct damos_quota_goal *damos_new_quota_goal(</div><div class='add'>+		enum damos_quota_goal_metric metric,</div><div class='add'>+		unsigned long target_value);</div><div class='add'>+void damos_add_quota_goal(struct damos_quota *q, struct damos_quota_goal *g);</div><div class='add'>+void damos_destroy_quota_goal(struct damos_quota_goal *goal);</div><div class='add'>+</div><div class='ctx'> struct damos *damon_new_scheme(struct damos_access_pattern *pattern,</div><div class='ctx'> 			enum damos_action action,</div><div class='ctx'> 			unsigned long apply_interval_us,</div><div class='ctx'> 			struct damos_quota *quota,</div><div class='del'>-			struct damos_watermarks *wmarks);</div><div class='add'>+			struct damos_watermarks *wmarks,</div><div class='add'>+			int target_nid);</div><div class='ctx'> void damon_add_scheme(struct damon_ctx *ctx, struct damos *s);</div><div class='ctx'> void damon_destroy_scheme(struct damos *s);</div><div class='add'>+int damos_commit_quota_goals(struct damos_quota *dst, struct damos_quota *src);</div><div class='ctx'> </div><div class='ctx'> struct damon_target *damon_new_target(void);</div><div class='ctx'> void damon_add_target(struct damon_ctx *ctx, struct damon_target *t);</div><div class='ctx'> bool damon_targets_empty(struct damon_ctx *ctx);</div><div class='ctx'> void damon_free_target(struct damon_target *t);</div><div class='del'>-void damon_destroy_target(struct damon_target *t);</div><div class='add'>+void damon_destroy_target(struct damon_target *t, struct damon_ctx *ctx);</div><div class='ctx'> unsigned int damon_nr_regions(struct damon_target *t);</div><div class='ctx'> </div><div class='ctx'> struct damon_ctx *damon_new_ctx(void);</div><div class='hunk'>@@ -693,6 +939,7 @@ void damon_destroy_ctx(struct damon_ctx *ctx);</div><div class='ctx'> int damon_set_attrs(struct damon_ctx *ctx, struct damon_attrs *attrs);</div><div class='ctx'> void damon_set_schemes(struct damon_ctx *ctx,</div><div class='ctx'> 			struct damos **schemes, ssize_t nr_schemes);</div><div class='add'>+int damon_commit_ctx(struct damon_ctx *old_ctx, struct damon_ctx *new_ctx);</div><div class='ctx'> int damon_nr_running_ctxs(void);</div><div class='ctx'> bool damon_is_registered_ops(enum damon_ops_id id);</div><div class='ctx'> int damon_register_ops(struct damon_operations *ops);</div><div class='hunk'>@@ -711,11 +958,17 @@ static inline unsigned int damon_max_nr_accesses(const struct damon_attrs *attrs</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+bool damon_initialized(void);</div><div class='ctx'> int damon_start(struct damon_ctx **ctxs, int nr_ctxs, bool exclusive);</div><div class='ctx'> int damon_stop(struct damon_ctx **ctxs, int nr_ctxs);</div><div class='add'>+bool damon_is_running(struct damon_ctx *ctx);</div><div class='add'>+</div><div class='add'>+int damon_call(struct damon_ctx *ctx, struct damon_call_control *control);</div><div class='add'>+int damos_walk(struct damon_ctx *ctx, struct damos_walk_control *control);</div><div class='ctx'> </div><div class='ctx'> int damon_set_region_biggest_system_ram_default(struct damon_target *t,</div><div class='del'>-				unsigned long *start, unsigned long *end);</div><div class='add'>+				unsigned long *start, unsigned long *end,</div><div class='add'>+				unsigned long min_sz_region);</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_DAMON */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/dax.h b/include/linux/dax.h<br/>index b463502b16e1..9d624f4d9df6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dax.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dax.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dax.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dax.h</a></div><div class='hunk'>@@ -26,13 +26,7 @@ struct dax_operations {</div><div class='ctx'> 	 * number of pages available for DAX at that pfn.</div><div class='ctx'> 	 */</div><div class='ctx'> 	long (*direct_access)(struct dax_device *, pgoff_t, long,</div><div class='del'>-			enum dax_access_mode, void **, pfn_t *);</div><div class='del'>-	/*</div><div class='del'>-	 * Validate whether this device is usable as an fsdax backing</div><div class='del'>-	 * device.</div><div class='del'>-	 */</div><div class='del'>-	bool (*dax_supported)(struct dax_device *, struct block_device *, int,</div><div class='del'>-			sector_t, sector_t);</div><div class='add'>+			enum dax_access_mode, void **, unsigned long *);</div><div class='ctx'> 	/* zero_page_range: required operation. Zero page range   */</div><div class='ctx'> 	int (*zero_page_range)(struct dax_device *, pgoff_t, size_t);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -63,18 +57,21 @@ void kill_dax(struct dax_device *dax_dev);</div><div class='ctx'> void dax_write_cache(struct dax_device *dax_dev, bool wc);</div><div class='ctx'> bool dax_write_cache_enabled(struct dax_device *dax_dev);</div><div class='ctx'> bool dax_synchronous(struct dax_device *dax_dev);</div><div class='add'>+void set_dax_nocache(struct dax_device *dax_dev);</div><div class='add'>+void set_dax_nomc(struct dax_device *dax_dev);</div><div class='ctx'> void set_dax_synchronous(struct dax_device *dax_dev);</div><div class='ctx'> size_t dax_recovery_write(struct dax_device *dax_dev, pgoff_t pgoff,</div><div class='ctx'> 		void *addr, size_t bytes, struct iov_iter *i);</div><div class='ctx'> /*</div><div class='ctx'>  * Check if given mapping is supported by the file / underlying device.</div><div class='ctx'>  */</div><div class='del'>-static inline bool daxdev_mapping_supported(struct vm_area_struct *vma,</div><div class='del'>-					     struct dax_device *dax_dev)</div><div class='add'>+static inline bool daxdev_mapping_supported(vm_flags_t vm_flags,</div><div class='add'>+					    const struct inode *inode,</div><div class='add'>+					    struct dax_device *dax_dev)</div><div class='ctx'> {</div><div class='del'>-	if (!(vma-&gt;vm_flags &amp; VM_SYNC))</div><div class='add'>+	if (!(vm_flags &amp; VM_SYNC))</div><div class='ctx'> 		return true;</div><div class='del'>-	if (!IS_DAX(file_inode(vma-&gt;vm_file)))</div><div class='add'>+	if (!IS_DAX(inode))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	return dax_synchronous(dax_dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -86,11 +83,7 @@ static inline void *dax_holder(struct dax_device *dax_dev)</div><div class='ctx'> static inline struct dax_device *alloc_dax(void *private,</div><div class='ctx'> 		const struct dax_operations *ops)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Callers should check IS_ENABLED(CONFIG_DAX) to know if this</div><div class='del'>-	 * NULL is an error or expected.</div><div class='del'>-	 */</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> static inline void put_dax(struct dax_device *dax_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -109,13 +102,20 @@ static inline bool dax_synchronous(struct dax_device *dax_dev)</div><div class='ctx'> {</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='add'>+static inline void set_dax_nocache(struct dax_device *dax_dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void set_dax_nomc(struct dax_device *dax_dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> static inline void set_dax_synchronous(struct dax_device *dax_dev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline bool daxdev_mapping_supported(struct vm_area_struct *vma,</div><div class='del'>-				struct dax_device *dax_dev)</div><div class='add'>+static inline bool daxdev_mapping_supported(vm_flags_t vm_flags,</div><div class='add'>+					    const struct inode *inode,</div><div class='add'>+					    struct dax_device *dax_dev)</div><div class='ctx'> {</div><div class='del'>-	return !(vma-&gt;vm_flags &amp; VM_SYNC);</div><div class='add'>+	return !(vm_flags &amp; VM_SYNC);</div><div class='ctx'> }</div><div class='ctx'> static inline size_t dax_recovery_write(struct dax_device *dax_dev,</div><div class='ctx'> 		pgoff_t pgoff, void *addr, size_t bytes, struct iov_iter *i)</div><div class='hunk'>@@ -124,9 +124,6 @@ static inline size_t dax_recovery_write(struct dax_device *dax_dev,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void set_dax_nocache(struct dax_device *dax_dev);</div><div class='del'>-void set_dax_nomc(struct dax_device *dax_dev);</div><div class='del'>-</div><div class='ctx'> struct writeback_control;</div><div class='ctx'> #if defined(CONFIG_BLOCK) &amp;&amp; defined(CONFIG_FS_DAX)</div><div class='ctx'> int dax_add_host(struct dax_device *dax_dev, struct gendisk *disk);</div><div class='hunk'>@@ -212,6 +209,11 @@ int dax_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero,</div><div class='ctx'> int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,</div><div class='ctx'> 		const struct iomap_ops *ops);</div><div class='ctx'> </div><div class='add'>+static inline bool dax_page_is_idle(struct page *page)</div><div class='add'>+{</div><div class='add'>+	return page &amp;&amp; page_ref_count(page) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_DAX)</div><div class='ctx'> int dax_read_lock(void);</div><div class='ctx'> void dax_read_unlock(int id);</div><div class='hunk'>@@ -225,10 +227,23 @@ static inline void dax_read_unlock(int id)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_DAX */</div><div class='add'>+</div><div class='add'>+#if !IS_ENABLED(CONFIG_FS_DAX)</div><div class='add'>+static inline int __must_check dax_break_layout(struct inode *inode,</div><div class='add'>+			    loff_t start, loff_t end, void (cb)(struct inode *))</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dax_break_layout_final(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> bool dax_alive(struct dax_device *dax_dev);</div><div class='ctx'> void *dax_get_private(struct dax_device *dax_dev);</div><div class='ctx'> long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages,</div><div class='del'>-		enum dax_access_mode mode, void **kaddr, pfn_t *pfn);</div><div class='add'>+		enum dax_access_mode mode, void **kaddr, unsigned long *pfn);</div><div class='ctx'> size_t dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, void *addr,</div><div class='ctx'> 		size_t bytes, struct iov_iter *i);</div><div class='ctx'> size_t dax_copy_to_iter(struct dax_device *dax_dev, pgoff_t pgoff, void *addr,</div><div class='hunk'>@@ -242,12 +257,23 @@ void dax_flush(struct dax_device *dax_dev, void *addr, size_t size);</div><div class='ctx'> ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		const struct iomap_ops *ops);</div><div class='ctx'> vm_fault_t dax_iomap_fault(struct vm_fault *vmf, unsigned int order,</div><div class='del'>-		    pfn_t *pfnp, int *errp, const struct iomap_ops *ops);</div><div class='add'>+			unsigned long *pfnp, int *errp,</div><div class='add'>+			const struct iomap_ops *ops);</div><div class='ctx'> vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf,</div><div class='del'>-		unsigned int order, pfn_t pfn);</div><div class='add'>+		unsigned int order, unsigned long pfn);</div><div class='ctx'> int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index);</div><div class='add'>+void dax_delete_mapping_range(struct address_space *mapping,</div><div class='add'>+				loff_t start, loff_t end);</div><div class='ctx'> int dax_invalidate_mapping_entry_sync(struct address_space *mapping,</div><div class='ctx'> 				      pgoff_t index);</div><div class='add'>+int __must_check dax_break_layout(struct inode *inode, loff_t start,</div><div class='add'>+				loff_t end, void (cb)(struct inode *));</div><div class='add'>+static inline int __must_check dax_break_layout_inode(struct inode *inode,</div><div class='add'>+						void (cb)(struct inode *))</div><div class='add'>+{</div><div class='add'>+	return dax_break_layout(inode, 0, LLONG_MAX, cb);</div><div class='add'>+}</div><div class='add'>+void dax_break_layout_final(struct inode *inode);</div><div class='ctx'> int dax_dedupe_file_range_compare(struct inode *src, loff_t srcoff,</div><div class='ctx'> 				  struct inode *dest, loff_t destoff,</div><div class='ctx'> 				  loff_t len, bool *is_same,</div><div class='head'>diff --git a/include/linux/dcache.h b/include/linux/dcache.h<br/>index bf53e3894aae..898c60d21c92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dcache.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dcache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dcache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dcache.h</a></div><div class='hunk'>@@ -57,6 +57,8 @@ struct qstr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define QSTR_INIT(n,l) { { { .len = l } }, .name = n }</div><div class='add'>+#define QSTR_LEN(n,l) (struct qstr)QSTR_INIT(n,l)</div><div class='add'>+#define QSTR(n) QSTR_LEN(n, strlen(n))</div><div class='ctx'> </div><div class='ctx'> extern const struct qstr empty_name;</div><div class='ctx'> extern const struct qstr slash_name;</div><div class='hunk'>@@ -68,16 +70,24 @@ extern const struct qstr dotdot_name;</div><div class='ctx'>  * large memory footprint increase).</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-# define DNAME_INLINE_LEN 40 /* 192 bytes */</div><div class='add'>+# define DNAME_INLINE_WORDS 5 /* 192 bytes */</div><div class='ctx'> #else</div><div class='ctx'> # ifdef CONFIG_SMP</div><div class='del'>-#  define DNAME_INLINE_LEN 40 /* 128 bytes */</div><div class='add'>+#  define DNAME_INLINE_WORDS 9 /* 128 bytes */</div><div class='ctx'> # else</div><div class='del'>-#  define DNAME_INLINE_LEN 44 /* 128 bytes */</div><div class='add'>+#  define DNAME_INLINE_WORDS 11 /* 128 bytes */</div><div class='ctx'> # endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define DNAME_INLINE_LEN (DNAME_INLINE_WORDS*sizeof(unsigned long))</div><div class='add'>+</div><div class='add'>+union shortname_store {</div><div class='add'>+	unsigned char string[DNAME_INLINE_LEN];</div><div class='add'>+	unsigned long words[DNAME_INLINE_WORDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define d_lock	d_lockref.lock</div><div class='add'>+#define d_iname d_shortname.string</div><div class='ctx'> </div><div class='ctx'> struct dentry {</div><div class='ctx'> 	/* RCU lookup touched fields */</div><div class='hunk'>@@ -85,17 +95,25 @@ struct dentry {</div><div class='ctx'> 	seqcount_spinlock_t d_seq;	/* per dentry seqlock */</div><div class='ctx'> 	struct hlist_bl_node d_hash;	/* lookup hash list */</div><div class='ctx'> 	struct dentry *d_parent;	/* parent directory */</div><div class='del'>-	struct qstr d_name;</div><div class='add'>+	union {</div><div class='add'>+	struct qstr __d_name;		/* for use ONLY in fs/dcache.c */</div><div class='add'>+	const struct qstr d_name;</div><div class='add'>+	};</div><div class='ctx'> 	struct inode *d_inode;		/* Where the name belongs to - NULL is</div><div class='ctx'> 					 * negative */</div><div class='del'>-	unsigned char d_iname[DNAME_INLINE_LEN];	/* small names */</div><div class='add'>+	union shortname_store d_shortname;</div><div class='add'>+	/* --- cacheline 1 boundary (64 bytes) was 32 bytes ago --- */</div><div class='ctx'> </div><div class='ctx'> 	/* Ref lookup also touches following */</div><div class='del'>-	struct lockref d_lockref;	/* per-dentry lock and refcount */</div><div class='ctx'> 	const struct dentry_operations *d_op;</div><div class='ctx'> 	struct super_block *d_sb;	/* The root of the dentry tree */</div><div class='ctx'> 	unsigned long d_time;		/* used by d_revalidate */</div><div class='ctx'> 	void *d_fsdata;			/* fs-specific data */</div><div class='add'>+	/* --- cacheline 2 boundary (128 bytes) --- */</div><div class='add'>+	struct lockref d_lockref;	/* per-dentry lock and refcount</div><div class='add'>+					 * keep separate from RCU lookup area if</div><div class='add'>+					 * possible!</div><div class='add'>+					 */</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct list_head d_lru;		/* LRU list */</div><div class='hunk'>@@ -131,7 +149,8 @@ enum d_real_type {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dentry_operations {</div><div class='del'>-	int (*d_revalidate)(struct dentry *, unsigned int);</div><div class='add'>+	int (*d_revalidate)(struct inode *, const struct qstr *,</div><div class='add'>+			    struct dentry *, unsigned int);</div><div class='ctx'> 	int (*d_weak_revalidate)(struct dentry *, unsigned int);</div><div class='ctx'> 	int (*d_hash)(const struct dentry *, struct qstr *);</div><div class='ctx'> 	int (*d_compare)(const struct dentry *,</div><div class='hunk'>@@ -145,6 +164,8 @@ struct dentry_operations {</div><div class='ctx'> 	struct vfsmount *(*d_automount)(struct path *);</div><div class='ctx'> 	int (*d_manage)(const struct path *, bool);</div><div class='ctx'> 	struct dentry *(*d_real)(struct dentry *, enum d_real_type type);</div><div class='add'>+	bool (*d_unalias_trylock)(const struct dentry *);</div><div class='add'>+	void (*d_unalias_unlock)(const struct dentry *);</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -156,65 +177,59 @@ struct dentry_operations {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* d_flags entries */</div><div class='del'>-#define DCACHE_OP_HASH			BIT(0)</div><div class='del'>-#define DCACHE_OP_COMPARE		BIT(1)</div><div class='del'>-#define DCACHE_OP_REVALIDATE		BIT(2)</div><div class='del'>-#define DCACHE_OP_DELETE		BIT(3)</div><div class='del'>-#define DCACHE_OP_PRUNE			BIT(4)</div><div class='del'>-</div><div class='del'>-#define	DCACHE_DISCONNECTED		BIT(5)</div><div class='del'>-     /* This dentry is possibly not currently connected to the dcache tree, in</div><div class='del'>-      * which case its parent will either be itself, or will have this flag as</div><div class='del'>-      * well.  nfsd will not use a dentry with this bit set, but will first</div><div class='del'>-      * endeavour to clear the bit either by discovering that it is connected,</div><div class='del'>-      * or by performing lookup operations.   Any filesystem which supports</div><div class='del'>-      * nfsd_operations MUST have a lookup function which, if it finds a</div><div class='del'>-      * directory inode with a DCACHE_DISCONNECTED dentry, will d_move that</div><div class='del'>-      * dentry into place and return that dentry rather than the passed one,</div><div class='del'>-      * typically using d_splice_alias. */</div><div class='del'>-</div><div class='del'>-#define DCACHE_REFERENCED		BIT(6) /* Recently used, don't discard. */</div><div class='del'>-</div><div class='del'>-#define DCACHE_DONTCACHE		BIT(7) /* Purge from memory on final dput() */</div><div class='del'>-</div><div class='del'>-#define DCACHE_CANT_MOUNT		BIT(8)</div><div class='del'>-#define DCACHE_GENOCIDE			BIT(9)</div><div class='del'>-#define DCACHE_SHRINK_LIST		BIT(10)</div><div class='del'>-</div><div class='del'>-#define DCACHE_OP_WEAK_REVALIDATE	BIT(11)</div><div class='del'>-</div><div class='del'>-#define DCACHE_NFSFS_RENAMED		BIT(12)</div><div class='del'>-     /* this dentry has been "silly renamed" and has to be deleted on the last</div><div class='del'>-      * dput() */</div><div class='del'>-#define DCACHE_FSNOTIFY_PARENT_WATCHED	BIT(14)</div><div class='del'>-     /* Parent inode is watched by some fsnotify listener */</div><div class='del'>-</div><div class='del'>-#define DCACHE_DENTRY_KILLED		BIT(15)</div><div class='del'>-</div><div class='del'>-#define DCACHE_MOUNTED			BIT(16) /* is a mountpoint */</div><div class='del'>-#define DCACHE_NEED_AUTOMOUNT		BIT(17) /* handle automount on this dir */</div><div class='del'>-#define DCACHE_MANAGE_TRANSIT		BIT(18) /* manage transit from this dirent */</div><div class='add'>+enum dentry_flags {</div><div class='add'>+	DCACHE_OP_HASH			= BIT(0),</div><div class='add'>+	DCACHE_OP_COMPARE		= BIT(1),</div><div class='add'>+	DCACHE_OP_REVALIDATE		= BIT(2),</div><div class='add'>+	DCACHE_OP_DELETE		= BIT(3),</div><div class='add'>+	DCACHE_OP_PRUNE			= BIT(4),</div><div class='add'>+	/*</div><div class='add'>+	 * This dentry is possibly not currently connected to the dcache tree,</div><div class='add'>+	 * in which case its parent will either be itself, or will have this</div><div class='add'>+	 * flag as well.  nfsd will not use a dentry with this bit set, but will</div><div class='add'>+	 * first endeavour to clear the bit either by discovering that it is</div><div class='add'>+	 * connected, or by performing lookup operations.  Any filesystem which</div><div class='add'>+	 * supports nfsd_operations MUST have a lookup function which, if it</div><div class='add'>+	 * finds a directory inode with a DCACHE_DISCONNECTED dentry, will</div><div class='add'>+	 * d_move that dentry into place and return that dentry rather than the</div><div class='add'>+	 * passed one, typically using d_splice_alias.</div><div class='add'>+	 */</div><div class='add'>+	DCACHE_DISCONNECTED		= BIT(5),</div><div class='add'>+	DCACHE_REFERENCED		= BIT(6),	/* Recently used, don't discard. */</div><div class='add'>+	DCACHE_DONTCACHE		= BIT(7),	/* Purge from memory on final dput() */</div><div class='add'>+	DCACHE_CANT_MOUNT		= BIT(8),</div><div class='add'>+	DCACHE_SHRINK_LIST		= BIT(10),</div><div class='add'>+	DCACHE_OP_WEAK_REVALIDATE	= BIT(11),</div><div class='add'>+	/*</div><div class='add'>+	 * this dentry has been "silly renamed" and has to be deleted on the</div><div class='add'>+	 * last dput()</div><div class='add'>+	 */</div><div class='add'>+	DCACHE_NFSFS_RENAMED		= BIT(12),</div><div class='add'>+	DCACHE_FSNOTIFY_PARENT_WATCHED	= BIT(13),	/* Parent inode is watched by some fsnotify listener */</div><div class='add'>+	DCACHE_DENTRY_KILLED		= BIT(14),</div><div class='add'>+	DCACHE_MOUNTED			= BIT(15),	/* is a mountpoint */</div><div class='add'>+	DCACHE_NEED_AUTOMOUNT		= BIT(16),	/* handle automount on this dir */</div><div class='add'>+	DCACHE_MANAGE_TRANSIT		= BIT(17),	/* manage transit from this dirent */</div><div class='add'>+	DCACHE_LRU_LIST			= BIT(18),</div><div class='add'>+	DCACHE_ENTRY_TYPE		= (7 &lt;&lt; 19),	/* bits 19..21 are for storing type: */</div><div class='add'>+	DCACHE_MISS_TYPE		= (0 &lt;&lt; 19),	/* Negative dentry */</div><div class='add'>+	DCACHE_WHITEOUT_TYPE		= (1 &lt;&lt; 19),	/* Whiteout dentry (stop pathwalk) */</div><div class='add'>+	DCACHE_DIRECTORY_TYPE		= (2 &lt;&lt; 19),	/* Normal directory */</div><div class='add'>+	DCACHE_AUTODIR_TYPE		= (3 &lt;&lt; 19),	/* Lookupless directory (presumed automount) */</div><div class='add'>+	DCACHE_REGULAR_TYPE		= (4 &lt;&lt; 19),	/* Regular file type */</div><div class='add'>+	DCACHE_SPECIAL_TYPE		= (5 &lt;&lt; 19),	/* Other file type */</div><div class='add'>+	DCACHE_SYMLINK_TYPE		= (6 &lt;&lt; 19),	/* Symlink */</div><div class='add'>+	DCACHE_NOKEY_NAME		= BIT(22),	/* Encrypted name encoded without key */</div><div class='add'>+	DCACHE_OP_REAL			= BIT(23),</div><div class='add'>+	DCACHE_PAR_LOOKUP		= BIT(24),	/* being looked up (with parent locked shared) */</div><div class='add'>+	DCACHE_DENTRY_CURSOR		= BIT(25),</div><div class='add'>+	DCACHE_NORCU			= BIT(26),	/* No RCU delay for freeing */</div><div class='add'>+	DCACHE_PERSISTENT		= BIT(27)</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define DCACHE_MANAGED_DENTRY \</div><div class='ctx'> 	(DCACHE_MOUNTED|DCACHE_NEED_AUTOMOUNT|DCACHE_MANAGE_TRANSIT)</div><div class='ctx'> </div><div class='del'>-#define DCACHE_LRU_LIST			BIT(19)</div><div class='del'>-</div><div class='del'>-#define DCACHE_ENTRY_TYPE		(7 &lt;&lt; 20) /* bits 20..22 are for storing type: */</div><div class='del'>-#define DCACHE_MISS_TYPE		(0 &lt;&lt; 20) /* Negative dentry */</div><div class='del'>-#define DCACHE_WHITEOUT_TYPE		(1 &lt;&lt; 20) /* Whiteout dentry (stop pathwalk) */</div><div class='del'>-#define DCACHE_DIRECTORY_TYPE		(2 &lt;&lt; 20) /* Normal directory */</div><div class='del'>-#define DCACHE_AUTODIR_TYPE		(3 &lt;&lt; 20) /* Lookupless directory (presumed automount) */</div><div class='del'>-#define DCACHE_REGULAR_TYPE		(4 &lt;&lt; 20) /* Regular file type */</div><div class='del'>-#define DCACHE_SPECIAL_TYPE		(5 &lt;&lt; 20) /* Other file type */</div><div class='del'>-#define DCACHE_SYMLINK_TYPE		(6 &lt;&lt; 20) /* Symlink */</div><div class='del'>-</div><div class='del'>-#define DCACHE_NOKEY_NAME		BIT(25) /* Encrypted name encoded without key */</div><div class='del'>-#define DCACHE_OP_REAL			BIT(26)</div><div class='del'>-</div><div class='del'>-#define DCACHE_PAR_LOOKUP		BIT(28) /* being looked up (with parent locked shared) */</div><div class='del'>-#define DCACHE_DENTRY_CURSOR		BIT(29)</div><div class='del'>-#define DCACHE_NORCU			BIT(30) /* No RCU delay for freeing */</div><div class='del'>-</div><div class='ctx'> extern seqlock_t rename_lock;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -225,7 +240,6 @@ extern void d_instantiate_new(struct dentry *, struct inode *);</div><div class='ctx'> extern void __d_drop(struct dentry *dentry);</div><div class='ctx'> extern void d_drop(struct dentry *dentry);</div><div class='ctx'> extern void d_delete(struct dentry *);</div><div class='del'>-extern void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op);</div><div class='ctx'> </div><div class='ctx'> /* allocate/de-allocate */</div><div class='ctx'> extern struct dentry * d_alloc(struct dentry *, const struct qstr *);</div><div class='hunk'>@@ -233,10 +247,12 @@ extern struct dentry * d_alloc_anon(struct super_block *);</div><div class='ctx'> extern struct dentry * d_alloc_parallel(struct dentry *, const struct qstr *,</div><div class='ctx'> 					wait_queue_head_t *);</div><div class='ctx'> extern struct dentry * d_splice_alias(struct inode *, struct dentry *);</div><div class='add'>+/* weird procfs mess; *NOT* exported */</div><div class='add'>+extern struct dentry * d_splice_alias_ops(struct inode *, struct dentry *,</div><div class='add'>+					  const struct dentry_operations *);</div><div class='ctx'> extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *);</div><div class='ctx'> extern bool d_same_name(const struct dentry *dentry, const struct dentry *parent,</div><div class='ctx'> 			const struct qstr *name);</div><div class='del'>-extern struct dentry * d_exact_alias(struct dentry *, struct inode *);</div><div class='ctx'> extern struct dentry *d_find_any_alias(struct inode *inode);</div><div class='ctx'> extern struct dentry * d_obtain_alias(struct inode *);</div><div class='ctx'> extern struct dentry * d_obtain_root(struct inode *);</div><div class='hunk'>@@ -252,6 +268,8 @@ extern void d_tmpfile(struct file *, struct inode *);</div><div class='ctx'> </div><div class='ctx'> extern struct dentry *d_find_alias(struct inode *);</div><div class='ctx'> extern void d_prune_aliases(struct inode *);</div><div class='add'>+extern void d_dispose_if_unused(struct dentry *, struct list_head *);</div><div class='add'>+extern void shrink_dentry_list(struct list_head *);</div><div class='ctx'> </div><div class='ctx'> extern struct dentry *d_find_alias_rcu(struct inode *);</div><div class='ctx'> </div><div class='hunk'>@@ -271,13 +289,14 @@ extern void d_exchange(struct dentry *, struct dentry *);</div><div class='ctx'> extern struct dentry *d_ancestor(struct dentry *, struct dentry *);</div><div class='ctx'> </div><div class='ctx'> extern struct dentry *d_lookup(const struct dentry *, const struct qstr *);</div><div class='del'>-extern struct dentry *d_hash_and_lookup(struct dentry *, struct qstr *);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned d_count(const struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	return dentry-&gt;d_lockref.count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ino_t d_parent_ino(struct dentry *dentry);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * helper function for dentry_operations.d_dname() members</div><div class='ctx'>  */</div><div class='hunk'>@@ -501,12 +520,7 @@ static inline int simple_positive(const struct dentry *dentry)</div><div class='ctx'> 	return d_really_is_positive(dentry) &amp;&amp; !d_unhashed(dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int sysctl_vfs_cache_pressure;</div><div class='del'>-</div><div class='del'>-static inline unsigned long vfs_pressure_ratio(unsigned long val)</div><div class='del'>-{</div><div class='del'>-	return mult_frac(val, sysctl_vfs_cache_pressure, 100);</div><div class='del'>-}</div><div class='add'>+unsigned long vfs_pressure_ratio(unsigned long val);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * d_inode - Get the actual inode of this dentry</div><div class='hunk'>@@ -582,7 +596,7 @@ static inline struct inode *d_real_inode(const struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> struct name_snapshot {</div><div class='ctx'> 	struct qstr name;</div><div class='del'>-	unsigned char inline_name[DNAME_INLINE_LEN];</div><div class='add'>+	union shortname_store inline_name;</div><div class='ctx'> };</div><div class='ctx'> void take_dentry_name_snapshot(struct name_snapshot *, struct dentry *);</div><div class='ctx'> void release_dentry_name_snapshot(struct name_snapshot *);</div><div class='hunk'>@@ -597,4 +611,8 @@ static inline struct dentry *d_next_sibling(const struct dentry *dentry)</div><div class='ctx'> 	return hlist_entry_safe(dentry-&gt;d_sib.next, struct dentry, d_sib);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void set_default_d_op(struct super_block *, const struct dentry_operations *);</div><div class='add'>+struct dentry *d_make_persistent(struct dentry *, struct inode *);</div><div class='add'>+void d_make_discardable(struct dentry *dentry);</div><div class='add'>+</div><div class='ctx'> #endif	/* __LINUX_DCACHE_H */</div><div class='head'>diff --git a/include/linux/dccp.h b/include/linux/dccp.h<br/>index 325af611909f..0b61b8b996d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dccp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dccp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dccp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dccp.h</a></div><div class='hunk'>@@ -2,79 +2,8 @@</div><div class='ctx'> #ifndef _LINUX_DCCP_H</div><div class='ctx'> #define _LINUX_DCCP_H</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ktime.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/inet_connection_sock.h&gt;</div><div class='del'>-#include &lt;net/inet_sock.h&gt;</div><div class='del'>-#include &lt;net/inet_timewait_sock.h&gt;</div><div class='del'>-#include &lt;net/tcp_states.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/dccp.h&gt;</div><div class='ctx'> </div><div class='del'>-enum dccp_state {</div><div class='del'>-	DCCP_OPEN	     = TCP_ESTABLISHED,</div><div class='del'>-	DCCP_REQUESTING	     = TCP_SYN_SENT,</div><div class='del'>-	DCCP_LISTEN	     = TCP_LISTEN,</div><div class='del'>-	DCCP_RESPOND	     = TCP_SYN_RECV,</div><div class='del'>-	/*</div><div class='del'>-	 * States involved in closing a DCCP connection:</div><div class='del'>-	 * 1) ACTIVE_CLOSEREQ is entered by a server sending a CloseReq.</div><div class='del'>-	 *</div><div class='del'>-	 * 2) CLOSING can have three different meanings (RFC 4340, 8.3):</div><div class='del'>-	 *  a. Client has performed active-close, has sent a Close to the server</div><div class='del'>-	 *     from state OPEN or PARTOPEN, and is waiting for the final Reset</div><div class='del'>-	 *     (in this case, SOCK_DONE == 1).</div><div class='del'>-	 *  b. Client is asked to perform passive-close, by receiving a CloseReq</div><div class='del'>-	 *     in (PART)OPEN state. It sends a Close and waits for final Reset</div><div class='del'>-	 *     (in this case, SOCK_DONE == 0).</div><div class='del'>-	 *  c. Server performs an active-close as in (a), keeps TIMEWAIT state.</div><div class='del'>-	 *</div><div class='del'>-	 * 3) The following intermediate states are employed to give passively</div><div class='del'>-	 *    closing nodes a chance to process their unread data:</div><div class='del'>-	 *    - PASSIVE_CLOSE    (from OPEN =&gt; CLOSED) and</div><div class='del'>-	 *    - PASSIVE_CLOSEREQ (from (PART)OPEN to CLOSING; case (b) above).</div><div class='del'>-	 */</div><div class='del'>-	DCCP_ACTIVE_CLOSEREQ = TCP_FIN_WAIT1,</div><div class='del'>-	DCCP_PASSIVE_CLOSE   = TCP_CLOSE_WAIT,	/* any node receiving a Close */</div><div class='del'>-	DCCP_CLOSING	     = TCP_CLOSING,</div><div class='del'>-	DCCP_TIME_WAIT	     = TCP_TIME_WAIT,</div><div class='del'>-	DCCP_CLOSED	     = TCP_CLOSE,</div><div class='del'>-	DCCP_NEW_SYN_RECV    = TCP_NEW_SYN_RECV,</div><div class='del'>-	DCCP_PARTOPEN	     = TCP_MAX_STATES,</div><div class='del'>-	DCCP_PASSIVE_CLOSEREQ,			/* clients receiving CloseReq */</div><div class='del'>-	DCCP_MAX_STATES</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DCCPF_OPEN	      = TCPF_ESTABLISHED,</div><div class='del'>-	DCCPF_REQUESTING      = TCPF_SYN_SENT,</div><div class='del'>-	DCCPF_LISTEN	      = TCPF_LISTEN,</div><div class='del'>-	DCCPF_RESPOND	      = TCPF_SYN_RECV,</div><div class='del'>-	DCCPF_ACTIVE_CLOSEREQ = TCPF_FIN_WAIT1,</div><div class='del'>-	DCCPF_CLOSING	      = TCPF_CLOSING,</div><div class='del'>-	DCCPF_TIME_WAIT	      = TCPF_TIME_WAIT,</div><div class='del'>-	DCCPF_CLOSED	      = TCPF_CLOSE,</div><div class='del'>-	DCCPF_NEW_SYN_RECV    = TCPF_NEW_SYN_RECV,</div><div class='del'>-	DCCPF_PARTOPEN	      = (1 &lt;&lt; DCCP_PARTOPEN),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct dccp_hdr *dccp_hdr(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return (struct dccp_hdr *)skb_transport_header(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct dccp_hdr *dccp_zeroed_hdr(struct sk_buff *skb, int headlen)</div><div class='del'>-{</div><div class='del'>-	skb_push(skb, headlen);</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-	return memset(skb_transport_header(skb), 0, headlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct dccp_hdr_ext *dccp_hdrx(const struct dccp_hdr *dh)</div><div class='ctx'> {</div><div class='ctx'> 	return (struct dccp_hdr_ext *)((unsigned char *)dh + sizeof(*dh));</div><div class='hunk'>@@ -85,12 +14,6 @@ static inline unsigned int __dccp_basic_hdr_len(const struct dccp_hdr *dh)</div><div class='ctx'> 	return sizeof(*dh) + (dh-&gt;dccph_x ? sizeof(struct dccp_hdr_ext) : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int dccp_basic_hdr_len(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr *dh = dccp_hdr(skb);</div><div class='del'>-	return __dccp_basic_hdr_len(dh);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline __u64 dccp_hdr_seq(const struct dccp_hdr *dh)</div><div class='ctx'> {</div><div class='ctx'> 	__u64 seq_nr =  ntohs(dh-&gt;dccph_seq);</div><div class='hunk'>@@ -103,222 +26,10 @@ static inline __u64 dccp_hdr_seq(const struct dccp_hdr *dh)</div><div class='ctx'> 	return seq_nr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct dccp_hdr_request *dccp_hdr_request(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return (struct dccp_hdr_request *)(skb_transport_header(skb) +</div><div class='del'>-					   dccp_basic_hdr_len(skb));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct dccp_hdr_ack_bits *dccp_hdr_ack_bits(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return (struct dccp_hdr_ack_bits *)(skb_transport_header(skb) +</div><div class='del'>-					    dccp_basic_hdr_len(skb));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u64 dccp_hdr_ack_seq(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	const struct dccp_hdr_ack_bits *dhack = dccp_hdr_ack_bits(skb);</div><div class='del'>-	return ((u64)ntohs(dhack-&gt;dccph_ack_nr_high) &lt;&lt; 32) + ntohl(dhack-&gt;dccph_ack_nr_low);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct dccp_hdr_response *dccp_hdr_response(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return (struct dccp_hdr_response *)(skb_transport_header(skb) +</div><div class='del'>-					    dccp_basic_hdr_len(skb));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct dccp_hdr_reset *dccp_hdr_reset(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return (struct dccp_hdr_reset *)(skb_transport_header(skb) +</div><div class='del'>-					 dccp_basic_hdr_len(skb));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned int __dccp_hdr_len(const struct dccp_hdr *dh)</div><div class='ctx'> {</div><div class='ctx'> 	return __dccp_basic_hdr_len(dh) +</div><div class='ctx'> 	       dccp_packet_hdr_len(dh-&gt;dccph_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return __dccp_hdr_len(dccp_hdr(skb));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct dccp_request_sock  -  represent DCCP-specific connection request</div><div class='del'>- * @dreq_inet_rsk: structure inherited from</div><div class='del'>- * @dreq_iss: initial sequence number, sent on the first Response (RFC 4340, 7.1)</div><div class='del'>- * @dreq_gss: greatest sequence number sent (for retransmitted Responses)</div><div class='del'>- * @dreq_isr: initial sequence number received in the first Request</div><div class='del'>- * @dreq_gsr: greatest sequence number received (for retransmitted Request(s))</div><div class='del'>- * @dreq_service: service code present on the Request (there is just one)</div><div class='del'>- * @dreq_featneg: feature negotiation options for this connection</div><div class='del'>- * The following two fields are analogous to the ones in dccp_sock:</div><div class='del'>- * @dreq_timestamp_echo: last received timestamp to echo (13.1)</div><div class='del'>- * @dreq_timestamp_echo: the time of receiving the last @dreq_timestamp_echo</div><div class='del'>- */</div><div class='del'>-struct dccp_request_sock {</div><div class='del'>-	struct inet_request_sock dreq_inet_rsk;</div><div class='del'>-	__u64			 dreq_iss;</div><div class='del'>-	__u64			 dreq_gss;</div><div class='del'>-	__u64			 dreq_isr;</div><div class='del'>-	__u64			 dreq_gsr;</div><div class='del'>-	__be32			 dreq_service;</div><div class='del'>-	spinlock_t		 dreq_lock;</div><div class='del'>-	struct list_head	 dreq_featneg;</div><div class='del'>-	__u32			 dreq_timestamp_echo;</div><div class='del'>-	__u32			 dreq_timestamp_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct dccp_request_sock *dccp_rsk(const struct request_sock *req)</div><div class='del'>-{</div><div class='del'>-	return (struct dccp_request_sock *)req;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern struct inet_timewait_death_row dccp_death_row;</div><div class='del'>-</div><div class='del'>-extern int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,</div><div class='del'>-			      struct sk_buff *skb);</div><div class='del'>-</div><div class='del'>-struct dccp_options_received {</div><div class='del'>-	u64	dccpor_ndp:48;</div><div class='del'>-	u32	dccpor_timestamp;</div><div class='del'>-	u32	dccpor_timestamp_echo;</div><div class='del'>-	u32	dccpor_elapsed_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ccid;</div><div class='del'>-</div><div class='del'>-enum dccp_role {</div><div class='del'>-	DCCP_ROLE_UNDEFINED,</div><div class='del'>-	DCCP_ROLE_LISTEN,</div><div class='del'>-	DCCP_ROLE_CLIENT,</div><div class='del'>-	DCCP_ROLE_SERVER,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dccp_service_list {</div><div class='del'>-	__u32	dccpsl_nr;</div><div class='del'>-	__be32	dccpsl_list[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1)</div><div class='del'>-#define DCCP_SERVICE_CODE_IS_ABSENT		0</div><div class='del'>-</div><div class='del'>-static inline bool dccp_list_has_service(const struct dccp_service_list *sl,</div><div class='del'>-					const __be32 service)</div><div class='del'>-{</div><div class='del'>-	if (likely(sl != NULL)) {</div><div class='del'>-		u32 i = sl-&gt;dccpsl_nr;</div><div class='del'>-		while (i--)</div><div class='del'>-			if (sl-&gt;dccpsl_list[i] == service)</div><div class='del'>-				return true;</div><div class='del'>-	}</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct dccp_ackvec;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct dccp_sock - DCCP socket state</div><div class='del'>- *</div><div class='del'>- * @dccps_swl - sequence number window low</div><div class='del'>- * @dccps_swh - sequence number window high</div><div class='del'>- * @dccps_awl - acknowledgement number window low</div><div class='del'>- * @dccps_awh - acknowledgement number window high</div><div class='del'>- * @dccps_iss - initial sequence number sent</div><div class='del'>- * @dccps_isr - initial sequence number received</div><div class='del'>- * @dccps_osr - first OPEN sequence number received</div><div class='del'>- * @dccps_gss - greatest sequence number sent</div><div class='del'>- * @dccps_gsr - greatest valid sequence number received</div><div class='del'>- * @dccps_gar - greatest valid ack number received on a non-Sync; initialized to %dccps_iss</div><div class='del'>- * @dccps_service - first (passive sock) or unique (active sock) service code</div><div class='del'>- * @dccps_service_list - second .. last service code on passive socket</div><div class='del'>- * @dccps_timestamp_echo - latest timestamp received on a TIMESTAMP option</div><div class='del'>- * @dccps_timestamp_time - time of receiving latest @dccps_timestamp_echo</div><div class='del'>- * @dccps_l_ack_ratio - feature-local Ack Ratio</div><div class='del'>- * @dccps_r_ack_ratio - feature-remote Ack Ratio</div><div class='del'>- * @dccps_l_seq_win - local Sequence Window (influences ack number validity)</div><div class='del'>- * @dccps_r_seq_win - remote Sequence Window (influences seq number validity)</div><div class='del'>- * @dccps_pcslen - sender   partial checksum coverage (via sockopt)</div><div class='del'>- * @dccps_pcrlen - receiver partial checksum coverage (via sockopt)</div><div class='del'>- * @dccps_send_ndp_count - local Send NDP Count feature (7.7.2)</div><div class='del'>- * @dccps_ndp_count - number of Non Data Packets since last data packet</div><div class='del'>- * @dccps_mss_cache - current value of MSS (path MTU minus header sizes)</div><div class='del'>- * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4)</div><div class='del'>- * @dccps_featneg - tracks feature-negotiation state (mostly during handshake)</div><div class='del'>- * @dccps_hc_rx_ackvec - rx half connection ack vector</div><div class='del'>- * @dccps_hc_rx_ccid - CCID used for the receiver (or receiving half-connection)</div><div class='del'>- * @dccps_hc_tx_ccid - CCID used for the sender (or sending half-connection)</div><div class='del'>- * @dccps_options_received - parsed set of retrieved options</div><div class='del'>- * @dccps_qpolicy - TX dequeueing policy, one of %dccp_packet_dequeueing_policy</div><div class='del'>- * @dccps_tx_qlen - maximum length of the TX queue</div><div class='del'>- * @dccps_role - role of this sock, one of %dccp_role</div><div class='del'>- * @dccps_hc_rx_insert_options - receiver wants to add options when acking</div><div class='del'>- * @dccps_hc_tx_insert_options - sender wants to add options when sending</div><div class='del'>- * @dccps_server_timewait - server holds timewait state on close (RFC 4340, 8.3)</div><div class='del'>- * @dccps_sync_scheduled - flag which signals "send out-of-band message soon"</div><div class='del'>- * @dccps_xmitlet - tasklet scheduled by the TX CCID to dequeue data packets</div><div class='del'>- * @dccps_xmit_timer - used by the TX CCID to delay sending (rate-based pacing)</div><div class='del'>- * @dccps_syn_rtt - RTT sample from Request/Response exchange (in usecs)</div><div class='del'>- */</div><div class='del'>-struct dccp_sock {</div><div class='del'>-	/* inet_connection_sock has to be the first member of dccp_sock */</div><div class='del'>-	struct inet_connection_sock	dccps_inet_connection;</div><div class='del'>-#define dccps_syn_rtt			dccps_inet_connection.icsk_ack.lrcvtime</div><div class='del'>-	__u64				dccps_swl;</div><div class='del'>-	__u64				dccps_swh;</div><div class='del'>-	__u64				dccps_awl;</div><div class='del'>-	__u64				dccps_awh;</div><div class='del'>-	__u64				dccps_iss;</div><div class='del'>-	__u64				dccps_isr;</div><div class='del'>-	__u64				dccps_osr;</div><div class='del'>-	__u64				dccps_gss;</div><div class='del'>-	__u64				dccps_gsr;</div><div class='del'>-	__u64				dccps_gar;</div><div class='del'>-	__be32				dccps_service;</div><div class='del'>-	__u32				dccps_mss_cache;</div><div class='del'>-	struct dccp_service_list	*dccps_service_list;</div><div class='del'>-	__u32				dccps_timestamp_echo;</div><div class='del'>-	__u32				dccps_timestamp_time;</div><div class='del'>-	__u16				dccps_l_ack_ratio;</div><div class='del'>-	__u16				dccps_r_ack_ratio;</div><div class='del'>-	__u64				dccps_l_seq_win:48;</div><div class='del'>-	__u64				dccps_r_seq_win:48;</div><div class='del'>-	__u8				dccps_pcslen:4;</div><div class='del'>-	__u8				dccps_pcrlen:4;</div><div class='del'>-	__u8				dccps_send_ndp_count:1;</div><div class='del'>-	__u64				dccps_ndp_count:48;</div><div class='del'>-	unsigned long			dccps_rate_last;</div><div class='del'>-	struct list_head		dccps_featneg;</div><div class='del'>-	struct dccp_ackvec		*dccps_hc_rx_ackvec;</div><div class='del'>-	struct ccid			*dccps_hc_rx_ccid;</div><div class='del'>-	struct ccid			*dccps_hc_tx_ccid;</div><div class='del'>-	struct dccp_options_received	dccps_options_received;</div><div class='del'>-	__u8				dccps_qpolicy;</div><div class='del'>-	__u32				dccps_tx_qlen;</div><div class='del'>-	enum dccp_role			dccps_role:2;</div><div class='del'>-	__u8				dccps_hc_rx_insert_options:1;</div><div class='del'>-	__u8				dccps_hc_tx_insert_options:1;</div><div class='del'>-	__u8				dccps_server_timewait:1;</div><div class='del'>-	__u8				dccps_sync_scheduled:1;</div><div class='del'>-	struct tasklet_struct		dccps_xmitlet;</div><div class='del'>-	struct timer_list		dccps_xmit_timer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define dccp_sk(ptr)	container_of_const(ptr, struct dccp_sock, \</div><div class='del'>-					   dccps_inet_connection.icsk_inet.sk)</div><div class='del'>-</div><div class='del'>-static inline const char *dccp_role(const struct sock *sk)</div><div class='del'>-{</div><div class='del'>-	switch (dccp_sk(sk)-&gt;dccps_role) {</div><div class='del'>-	case DCCP_ROLE_UNDEFINED: return "undefined";</div><div class='del'>-	case DCCP_ROLE_LISTEN:	  return "listen";</div><div class='del'>-	case DCCP_ROLE_SERVER:	  return "server";</div><div class='del'>-	case DCCP_ROLE_CLIENT:	  return "client";</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void dccp_syn_ack_timeout(const struct request_sock *req);</div><div class='del'>-</div><div class='ctx'> #endif /* _LINUX_DCCP_H */</div><div class='head'>diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h<br/>index c9c65b132c0f..7cecda29447e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/debugfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/debugfs.h</a></div><div class='hunk'>@@ -57,7 +57,6 @@ static const struct file_operations __fops = {				\</div><div class='ctx'> 	.release = simple_attr_release,					\</div><div class='ctx'> 	.read	 = debugfs_attr_read,					\</div><div class='ctx'> 	.write	 = (__is_signed) ? debugfs_attr_write_signed : debugfs_attr_write,	\</div><div class='del'>-	.llseek  = no_llseek,						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_DEBUGFS_ATTRIBUTE(__fops, __get, __set, __fmt)		\</div><div class='hunk'>@@ -68,13 +67,77 @@ static const struct file_operations __fops = {				\</div><div class='ctx'> </div><div class='ctx'> typedef struct vfsmount *(*debugfs_automount_t)(struct dentry *, void *);</div><div class='ctx'> </div><div class='add'>+struct debugfs_short_fops {</div><div class='add'>+	ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);</div><div class='add'>+	ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *);</div><div class='add'>+	loff_t (*llseek) (struct file *, loff_t, int);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='ctx'> </div><div class='ctx'> struct dentry *debugfs_lookup(const char *name, struct dentry *parent);</div><div class='ctx'> </div><div class='del'>-struct dentry *debugfs_create_file(const char *name, umode_t mode,</div><div class='del'>-				   struct dentry *parent, void *data,</div><div class='del'>-				   const struct file_operations *fops);</div><div class='add'>+struct dentry *debugfs_create_file_full(const char *name, umode_t mode,</div><div class='add'>+					struct dentry *parent, void *data,</div><div class='add'>+					const void *aux,</div><div class='add'>+					const struct file_operations *fops);</div><div class='add'>+struct dentry *debugfs_create_file_short(const char *name, umode_t mode,</div><div class='add'>+					 struct dentry *parent, void *data,</div><div class='add'>+					 const void *aux,</div><div class='add'>+					 const struct debugfs_short_fops *fops);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * debugfs_create_file - create a file in the debugfs filesystem</div><div class='add'>+ * @name: a pointer to a string containing the name of the file to create.</div><div class='add'>+ * @mode: the permission that the file should have.</div><div class='add'>+ * @parent: a pointer to the parent dentry for this file.  This should be a</div><div class='add'>+ *          directory dentry if set.  If this parameter is NULL, then the</div><div class='add'>+ *          file will be created in the root of the debugfs filesystem.</div><div class='add'>+ * @data: a pointer to something that the caller will want to get to later</div><div class='add'>+ *        on.  The inode.i_private pointer will point to this value on</div><div class='add'>+ *        the open() call.</div><div class='add'>+ * @fops: a pointer to a struct file_operations or struct debugfs_short_fops that</div><div class='add'>+ *        should be used for this file.</div><div class='add'>+ *</div><div class='add'>+ * This is the basic "create a file" function for debugfs.  It allows for a</div><div class='add'>+ * wide range of flexibility in creating a file, or a directory (if you want</div><div class='add'>+ * to create a directory, the debugfs_create_dir() function is</div><div class='add'>+ * recommended to be used instead.)</div><div class='add'>+ *</div><div class='add'>+ * This function will return a pointer to a dentry if it succeeds.  This</div><div class='add'>+ * pointer must be passed to the debugfs_remove() function when the file is</div><div class='add'>+ * to be removed (no automatic cleanup happens if your module is unloaded,</div><div class='add'>+ * you are responsible here.)  If an error occurs, ERR_PTR(-ERROR) will be</div><div class='add'>+ * returned.</div><div class='add'>+ *</div><div class='add'>+ * If debugfs is not enabled in the kernel, the value -%ENODEV will be</div><div class='add'>+ * returned.</div><div class='add'>+ *</div><div class='add'>+ * If fops points to a struct debugfs_short_fops, then simple_open() will be</div><div class='add'>+ * used for the open, and only read/write/llseek are supported and are proxied,</div><div class='add'>+ * so no module reference or release are needed.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: it's expected that most callers should _ignore_ the errors returned</div><div class='add'>+ * by this function. Other debugfs functions handle the fact that the "dentry"</div><div class='add'>+ * passed to them could be an error and they don't crash in that case.</div><div class='add'>+ * Drivers should generally work fine even if debugfs fails to init anyway.</div><div class='add'>+ */</div><div class='add'>+#define debugfs_create_file(name, mode, parent, data, fops)			\</div><div class='add'>+	_Generic(fops,								\</div><div class='add'>+		 const struct file_operations *: debugfs_create_file_full,	\</div><div class='add'>+		 const struct debugfs_short_fops *: debugfs_create_file_short,	\</div><div class='add'>+		 struct file_operations *: debugfs_create_file_full,		\</div><div class='add'>+		 struct debugfs_short_fops *: debugfs_create_file_short)	\</div><div class='add'>+		(name, mode, parent, data, NULL, fops)</div><div class='add'>+</div><div class='add'>+#define debugfs_create_file_aux(name, mode, parent, data, aux, fops)		\</div><div class='add'>+	_Generic(fops,								\</div><div class='add'>+		 const struct file_operations *: debugfs_create_file_full,	\</div><div class='add'>+		 const struct debugfs_short_fops *: debugfs_create_file_short,	\</div><div class='add'>+		 struct file_operations *: debugfs_create_file_full,		\</div><div class='add'>+		 struct debugfs_short_fops *: debugfs_create_file_short)	\</div><div class='add'>+		(name, mode, parent, data, aux, fops)</div><div class='add'>+</div><div class='ctx'> struct dentry *debugfs_create_file_unsafe(const char *name, umode_t mode,</div><div class='ctx'> 				   struct dentry *parent, void *data,</div><div class='ctx'> 				   const struct file_operations *fops);</div><div class='hunk'>@@ -99,7 +162,7 @@ void debugfs_remove(struct dentry *dentry);</div><div class='ctx'> </div><div class='ctx'> void debugfs_lookup_and_remove(const char *name, struct dentry *parent);</div><div class='ctx'> </div><div class='del'>-const struct file_operations *debugfs_real_fops(const struct file *filp);</div><div class='add'>+void *debugfs_get_aux(const struct file *file);</div><div class='ctx'> </div><div class='ctx'> int debugfs_file_get(struct dentry *dentry);</div><div class='ctx'> void debugfs_file_put(struct dentry *dentry);</div><div class='hunk'>@@ -111,8 +174,7 @@ ssize_t debugfs_attr_write(struct file *file, const char __user *buf,</div><div class='ctx'> ssize_t debugfs_attr_write_signed(struct file *file, const char __user *buf,</div><div class='ctx'> 			size_t len, loff_t *ppos);</div><div class='ctx'> </div><div class='del'>-struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,</div><div class='del'>-                struct dentry *new_dir, const char *new_name);</div><div class='add'>+int debugfs_change_name(struct dentry *dentry, const char *fmt, ...) __printf(2, 3);</div><div class='ctx'> </div><div class='ctx'> void debugfs_create_u8(const char *name, umode_t mode, struct dentry *parent,</div><div class='ctx'> 		       u8 *value);</div><div class='hunk'>@@ -206,9 +268,17 @@ static inline struct dentry *debugfs_lookup(const char *name,</div><div class='ctx'> 	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct dentry *debugfs_create_file_aux(const char *name,</div><div class='add'>+					umode_t mode, struct dentry *parent,</div><div class='add'>+					void *data, void *aux,</div><div class='add'>+					const void *fops)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct dentry *debugfs_create_file(const char *name, umode_t mode,</div><div class='ctx'> 					struct dentry *parent, void *data,</div><div class='del'>-					const struct file_operations *fops)</div><div class='add'>+					const void *fops)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='hunk'>@@ -258,7 +328,7 @@ static inline void debugfs_lookup_and_remove(const char *name,</div><div class='ctx'> 					     struct dentry *parent)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='del'>-const struct file_operations *debugfs_real_fops(const struct file *filp);</div><div class='add'>+void *debugfs_get_aux(const struct file *file);</div><div class='ctx'> </div><div class='ctx'> static inline int debugfs_file_get(struct dentry *dentry)</div><div class='ctx'> {</div><div class='hunk'>@@ -288,10 +358,10 @@ static inline ssize_t debugfs_attr_write_signed(struct file *file,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,</div><div class='del'>-                struct dentry *new_dir, char *new_name)</div><div class='add'>+static inline int __printf(2, 3) debugfs_change_name(struct dentry *dentry,</div><div class='add'>+					const char *fmt, ...)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void debugfs_create_u8(const char *name, umode_t mode,</div><div class='hunk'>@@ -399,6 +469,11 @@ static inline ssize_t debugfs_read_file_str(struct file *file,</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define debugfs_create_file_aux_num(name, mode, parent, data, n, fops) \</div><div class='add'>+	debugfs_create_file_aux(name, mode, parent, data, \</div><div class='add'>+				(void *)(unsigned long)n, fops)</div><div class='add'>+#define debugfs_get_aux_num(f) (unsigned long)debugfs_get_aux(f)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * debugfs_create_xul - create a debugfs file that is used to read and write an</div><div class='ctx'>  * unsigned long value, formatted in hexadecimal</div><div class='head'>diff --git a/include/linux/debugobjects.h b/include/linux/debugobjects.h<br/>index 32444686b6ff..8b95545e7924 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/debugobjects.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/debugobjects.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/debugobjects.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/debugobjects.h</a></div><div class='hunk'>@@ -23,13 +23,17 @@ struct debug_obj_descr;</div><div class='ctx'>  * @state:	tracked object state</div><div class='ctx'>  * @astate:	current active state</div><div class='ctx'>  * @object:	pointer to the real object</div><div class='add'>+ * @batch_last:	pointer to the last hlist node in a batch</div><div class='ctx'>  * @descr:	pointer to an object type specific debug description structure</div><div class='ctx'>  */</div><div class='ctx'> struct debug_obj {</div><div class='del'>-	struct hlist_node	node;</div><div class='del'>-	enum debug_obj_state	state;</div><div class='del'>-	unsigned int		astate;</div><div class='del'>-	void			*object;</div><div class='add'>+	struct hlist_node		node;</div><div class='add'>+	enum debug_obj_state		state;</div><div class='add'>+	unsigned int			astate;</div><div class='add'>+	union {</div><div class='add'>+		void			*object;</div><div class='add'>+		struct hlist_node	*batch_last;</div><div class='add'>+	};</div><div class='ctx'> 	const struct debug_obj_descr *descr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/decompress/unxz.h b/include/linux/decompress/unxz.h<br/>index f764e2a7201e..3dd2658a9dab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/decompress/unxz.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/decompress/unxz.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/decompress/unxz.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/decompress/unxz.h</a></div><div class='hunk'>@@ -1,10 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: 0BSD */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Wrapper for decompressing XZ-compressed kernel, initramfs, and initrd</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Lasse Collin &lt;lasse.collin@tukaani.org&gt;</div><div class='del'>- *</div><div class='del'>- * This file has been put into the public domain.</div><div class='del'>- * You can do whatever you want with this file.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef DECOMPRESS_UNXZ_H</div><div class='head'>diff --git a/include/linux/delay.h b/include/linux/delay.h<br/>index ff9cda975e30..46412c00033a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/delay.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/delay.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/delay.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/delay.h</a></div><div class='hunk'>@@ -6,21 +6,12 @@</div><div class='ctx'>  * Copyright (C) 1993 Linus Torvalds</div><div class='ctx'>  *</div><div class='ctx'>  * Delay routines, using a pre-computed "loops_per_jiffy" value.</div><div class='del'>- *</div><div class='del'>- * Please note that ndelay(), udelay() and mdelay() may return early for</div><div class='del'>- * several reasons:</div><div class='del'>- *  1. computed loops_per_jiffy too low (due to the time taken to</div><div class='del'>- *     execute the timer interrupt.)</div><div class='del'>- *  2. cache behaviour affecting the time it takes to execute the</div><div class='del'>- *     loop function.</div><div class='del'>- *  3. CPU clock rate changes.</div><div class='del'>- *</div><div class='del'>- * Please see this thread:</div><div class='del'>- *   https://lists.openwall.net/linux-kernel/2011/01/09/56</div><div class='add'>+ * Sleep routines using timer list timers or hrtimers.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/math.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long loops_per_jiffy;</div><div class='ctx'> </div><div class='hunk'>@@ -35,12 +26,21 @@ extern unsigned long loops_per_jiffy;</div><div class='ctx'>  * The 2nd mdelay() definition ensures GCC will optimize away the </div><div class='ctx'>  * while loop for the common cases where n &lt;= MAX_UDELAY_MS  --  Paul G.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #ifndef MAX_UDELAY_MS</div><div class='ctx'> #define MAX_UDELAY_MS	5</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef mdelay</div><div class='add'>+/**</div><div class='add'>+ * mdelay - Inserting a delay based on milliseconds with busy waiting</div><div class='add'>+ * @n:	requested delay in milliseconds</div><div class='add'>+ *</div><div class='add'>+ * See udelay() for basic information about mdelay() and it's variants.</div><div class='add'>+ *</div><div class='add'>+ * Please double check, whether mdelay() is the right way to go or whether a</div><div class='add'>+ * refactoring of the code is the better variant to be able to use msleep()</div><div class='add'>+ * instead.</div><div class='add'>+ */</div><div class='ctx'> #define mdelay(n) (\</div><div class='ctx'> 	(__builtin_constant_p(n) &amp;&amp; (n)&lt;=MAX_UDELAY_MS) ? udelay((n)*1000) : \</div><div class='ctx'> 	({unsigned long __ms=(n); while (__ms--) udelay(1000);}))</div><div class='hunk'>@@ -63,30 +63,75 @@ unsigned long msleep_interruptible(unsigned int msecs);</div><div class='ctx'> void usleep_range_state(unsigned long min, unsigned long max,</div><div class='ctx'> 			unsigned int state);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * usleep_range - Sleep for an approximate time</div><div class='add'>+ * @min:	Minimum time in microseconds to sleep</div><div class='add'>+ * @max:	Maximum time in microseconds to sleep</div><div class='add'>+ *</div><div class='add'>+ * For basic information please refer to usleep_range_state().</div><div class='add'>+ *</div><div class='add'>+ * The task will be in the state TASK_UNINTERRUPTIBLE during the sleep.</div><div class='add'>+ */</div><div class='ctx'> static inline void usleep_range(unsigned long min, unsigned long max)</div><div class='ctx'> {</div><div class='ctx'> 	usleep_range_state(min, max, TASK_UNINTERRUPTIBLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void usleep_idle_range(unsigned long min, unsigned long max)</div><div class='add'>+/**</div><div class='add'>+ * usleep_range_idle - Sleep for an approximate time with idle time accounting</div><div class='add'>+ * @min:	Minimum time in microseconds to sleep</div><div class='add'>+ * @max:	Maximum time in microseconds to sleep</div><div class='add'>+ *</div><div class='add'>+ * For basic information please refer to usleep_range_state().</div><div class='add'>+ *</div><div class='add'>+ * The sleeping task has the state TASK_IDLE during the sleep to prevent</div><div class='add'>+ * contribution to the load average.</div><div class='add'>+ */</div><div class='add'>+static inline void usleep_range_idle(unsigned long min, unsigned long max)</div><div class='ctx'> {</div><div class='ctx'> 	usleep_range_state(min, max, TASK_IDLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ssleep - wrapper for seconds around msleep</div><div class='add'>+ * @seconds:	Requested sleep duration in seconds</div><div class='add'>+ *</div><div class='add'>+ * Please refer to msleep() for detailed information.</div><div class='add'>+ */</div><div class='ctx'> static inline void ssleep(unsigned int seconds)</div><div class='ctx'> {</div><div class='ctx'> 	msleep(seconds * 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* see Documentation/timers/timers-howto.rst for the thresholds */</div><div class='add'>+static const unsigned int max_slack_shift = 2;</div><div class='add'>+#define USLEEP_RANGE_UPPER_BOUND	((TICK_NSEC &lt;&lt; max_slack_shift) / NSEC_PER_USEC)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fsleep - flexible sleep which autoselects the best mechanism</div><div class='add'>+ * @usecs:	requested sleep duration in microseconds</div><div class='add'>+ *</div><div class='add'>+ * flseep() selects the best mechanism that will provide maximum 25% slack</div><div class='add'>+ * to the requested sleep duration. Therefore it uses:</div><div class='add'>+ *</div><div class='add'>+ * * udelay() loop for sleep durations &lt;= 10 microseconds to avoid hrtimer</div><div class='add'>+ *   overhead for really short sleep durations.</div><div class='add'>+ * * usleep_range() for sleep durations which would lead with the usage of</div><div class='add'>+ *   msleep() to a slack larger than 25%. This depends on the granularity of</div><div class='add'>+ *   jiffies.</div><div class='add'>+ * * msleep() for all other sleep durations.</div><div class='add'>+ *</div><div class='add'>+ * Note: When %CONFIG_HIGH_RES_TIMERS is not set, all sleeps are processed with</div><div class='add'>+ * the granularity of jiffies and the slack might exceed 25% especially for</div><div class='add'>+ * short sleep durations.</div><div class='add'>+ */</div><div class='ctx'> static inline void fsleep(unsigned long usecs)</div><div class='ctx'> {</div><div class='ctx'> 	if (usecs &lt;= 10)</div><div class='ctx'> 		udelay(usecs);</div><div class='del'>-	else if (usecs &lt;= 20000)</div><div class='del'>-		usleep_range(usecs, 2 * usecs);</div><div class='add'>+	else if (usecs &lt; USLEEP_RANGE_UPPER_BOUND)</div><div class='add'>+		usleep_range(usecs, usecs + (usecs &gt;&gt; max_slack_shift));</div><div class='ctx'> 	else</div><div class='del'>-		msleep(DIV_ROUND_UP(usecs, 1000));</div><div class='add'>+		msleep(DIV_ROUND_UP(usecs, USEC_PER_MSEC));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* defined(_LINUX_DELAY_H) */</div><div class='head'>diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h<br/>index 6639f48dac36..800dcc360db2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/delayacct.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/delayacct.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/delayacct.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/delayacct.h</a></div><div class='hunk'>@@ -29,25 +29,39 @@ struct task_delay_info {</div><div class='ctx'> 	 * XXX_delay contains the accumulated delay time in nanoseconds.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64 blkio_start;</div><div class='add'>+	u64 blkio_delay_max;</div><div class='add'>+	u64 blkio_delay_min;</div><div class='ctx'> 	u64 blkio_delay;	/* wait for sync block io completion */</div><div class='ctx'> 	u64 swapin_start;</div><div class='add'>+	u64 swapin_delay_max;</div><div class='add'>+	u64 swapin_delay_min;</div><div class='ctx'> 	u64 swapin_delay;	/* wait for swapin */</div><div class='ctx'> 	u32 blkio_count;	/* total count of the number of sync block */</div><div class='ctx'> 				/* io operations performed */</div><div class='ctx'> 	u32 swapin_count;	/* total count of swapin */</div><div class='ctx'> </div><div class='ctx'> 	u64 freepages_start;</div><div class='add'>+	u64 freepages_delay_max;</div><div class='add'>+	u64 freepages_delay_min;</div><div class='ctx'> 	u64 freepages_delay;	/* wait for memory reclaim */</div><div class='ctx'> </div><div class='ctx'> 	u64 thrashing_start;</div><div class='add'>+	u64 thrashing_delay_max;</div><div class='add'>+	u64 thrashing_delay_min;</div><div class='ctx'> 	u64 thrashing_delay;	/* wait for thrashing page */</div><div class='ctx'> </div><div class='ctx'> 	u64 compact_start;</div><div class='add'>+	u64 compact_delay_max;</div><div class='add'>+	u64 compact_delay_min;</div><div class='ctx'> 	u64 compact_delay;	/* wait for memory compact */</div><div class='ctx'> </div><div class='ctx'> 	u64 wpcopy_start;</div><div class='add'>+	u64 wpcopy_delay_max;</div><div class='add'>+	u64 wpcopy_delay_min;</div><div class='ctx'> 	u64 wpcopy_delay;	/* wait for write-protect copy */</div><div class='ctx'> </div><div class='add'>+	u64 irq_delay_max;</div><div class='add'>+	u64 irq_delay_min;</div><div class='ctx'> 	u64 irq_delay;	/* wait for IRQ/SOFTIRQ */</div><div class='ctx'> </div><div class='ctx'> 	u32 freepages_count;	/* total count of memory reclaim */</div><div class='head'>diff --git a/include/linux/dev_printk.h b/include/linux/dev_printk.h<br/>index 6bfe70decc9f..eb2094e43050 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dev_printk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dev_printk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dev_printk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dev_printk.h</a></div><div class='hunk'>@@ -130,6 +130,16 @@ void _dev_info(const struct device *dev, const char *fmt, ...)</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Dummy dev_printk for disabled debugging statements to use whilst maintaining</div><div class='add'>+ * gcc's format checking.</div><div class='add'>+ */</div><div class='add'>+#define dev_no_printk(level, dev, fmt, ...)				\</div><div class='add'>+	({								\</div><div class='add'>+		if (0)							\</div><div class='add'>+			_dev_printk(level, dev, fmt, ##__VA_ARGS__);	\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * #defines for all the dev_&lt;level&gt; macros to prefix with whatever</div><div class='ctx'>  * possible use of #define dev_fmt(fmt) ...</div><div class='ctx'>  */</div><div class='hunk'>@@ -158,10 +168,7 @@ void _dev_info(const struct device *dev, const char *fmt, ...)</div><div class='ctx'> 	dev_printk(KERN_DEBUG, dev, dev_fmt(fmt), ##__VA_ARGS__)</div><div class='ctx'> #else</div><div class='ctx'> #define dev_dbg(dev, fmt, ...)						\</div><div class='del'>-({									\</div><div class='del'>-	if (0)								\</div><div class='del'>-		dev_printk(KERN_DEBUG, dev, dev_fmt(fmt), ##__VA_ARGS__); \</div><div class='del'>-})</div><div class='add'>+	dev_no_printk(KERN_DEBUG, dev, dev_fmt(fmt), ##__VA_ARGS__)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PRINTK</div><div class='hunk'>@@ -247,20 +254,14 @@ do {									\</div><div class='ctx'> } while (0)</div><div class='ctx'> #else</div><div class='ctx'> #define dev_dbg_ratelimited(dev, fmt, ...)				\</div><div class='del'>-do {									\</div><div class='del'>-	if (0)								\</div><div class='del'>-		dev_printk(KERN_DEBUG, dev, dev_fmt(fmt), ##__VA_ARGS__); \</div><div class='del'>-} while (0)</div><div class='add'>+	dev_no_printk(KERN_DEBUG, dev, dev_fmt(fmt), ##__VA_ARGS__)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef VERBOSE_DEBUG</div><div class='ctx'> #define dev_vdbg	dev_dbg</div><div class='ctx'> #else</div><div class='ctx'> #define dev_vdbg(dev, fmt, ...)						\</div><div class='del'>-({									\</div><div class='del'>-	if (0)								\</div><div class='del'>-		dev_printk(KERN_DEBUG, dev, dev_fmt(fmt), ##__VA_ARGS__); \</div><div class='del'>-})</div><div class='add'>+	dev_no_printk(KERN_DEBUG, dev, dev_fmt(fmt), ##__VA_ARGS__)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -275,5 +276,14 @@ do {									\</div><div class='ctx'> 			dev_driver_string(dev), dev_name(dev), ## arg)</div><div class='ctx'> </div><div class='ctx'> __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...);</div><div class='add'>+__printf(3, 4) int dev_warn_probe(const struct device *dev, int err, const char *fmt, ...);</div><div class='add'>+</div><div class='add'>+/* Simple helper for dev_err_probe() when ERR_PTR() is to be returned. */</div><div class='add'>+#define dev_err_ptr_probe(dev, ___err, fmt, ...) \</div><div class='add'>+	ERR_PTR(dev_err_probe(dev, ___err, fmt, ##__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+/* Simple helper for dev_err_probe() when ERR_CAST() is to be returned. */</div><div class='add'>+#define dev_err_cast_probe(dev, ___err_ptr, fmt, ...) \</div><div class='add'>+	ERR_PTR(dev_err_probe(dev, PTR_ERR(___err_ptr), fmt, ##__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> #endif /* _DEVICE_PRINTK_H_ */</div><div class='head'>diff --git a/include/linux/devcoredump.h b/include/linux/devcoredump.h<br/>index c008169ed2c6..377892604ff4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/devcoredump.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/devcoredump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/devcoredump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/devcoredump.h</a></div><div class='hunk'>@@ -12,6 +12,9 @@</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+/* if data isn't read by userspace after 5 minutes then delete it */</div><div class='add'>+#define DEVCD_TIMEOUT	(HZ * 60 * 5)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * _devcd_free_sgtable - free all the memory of the given scatterlist table</div><div class='ctx'>  * (i.e. both pages and scatterlist instances)</div><div class='hunk'>@@ -50,19 +53,22 @@ static inline void _devcd_free_sgtable(struct scatterlist *table)</div><div class='ctx'> 	kfree(delete_iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_DEV_COREDUMP</div><div class='ctx'> void dev_coredumpv(struct device *dev, void *data, size_t datalen,</div><div class='ctx'> 		   gfp_t gfp);</div><div class='ctx'> </div><div class='del'>-void dev_coredumpm(struct device *dev, struct module *owner,</div><div class='del'>-		   void *data, size_t datalen, gfp_t gfp,</div><div class='del'>-		   ssize_t (*read)(char *buffer, loff_t offset, size_t count,</div><div class='del'>-				   void *data, size_t datalen),</div><div class='del'>-		   void (*free)(void *data));</div><div class='add'>+void dev_coredumpm_timeout(struct device *dev, struct module *owner,</div><div class='add'>+			   void *data, size_t datalen, gfp_t gfp,</div><div class='add'>+			   ssize_t (*read)(char *buffer, loff_t offset,</div><div class='add'>+					   size_t count, void *data,</div><div class='add'>+					   size_t datalen),</div><div class='add'>+			   void (*free)(void *data),</div><div class='add'>+			   unsigned long timeout);</div><div class='ctx'> </div><div class='ctx'> void dev_coredumpsg(struct device *dev, struct scatterlist *table,</div><div class='ctx'> 		    size_t datalen, gfp_t gfp);</div><div class='add'>+</div><div class='add'>+void dev_coredump_put(struct device *dev);</div><div class='ctx'> #else</div><div class='ctx'> static inline void dev_coredumpv(struct device *dev, void *data,</div><div class='ctx'> 				 size_t datalen, gfp_t gfp)</div><div class='hunk'>@@ -71,11 +77,13 @@ static inline void dev_coredumpv(struct device *dev, void *data,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-dev_coredumpm(struct device *dev, struct module *owner,</div><div class='del'>-	      void *data, size_t datalen, gfp_t gfp,</div><div class='del'>-	      ssize_t (*read)(char *buffer, loff_t offset, size_t count,</div><div class='del'>-			      void *data, size_t datalen),</div><div class='del'>-	      void (*free)(void *data))</div><div class='add'>+dev_coredumpm_timeout(struct device *dev, struct module *owner,</div><div class='add'>+		      void *data, size_t datalen, gfp_t gfp,</div><div class='add'>+		      ssize_t (*read)(char *buffer, loff_t offset,</div><div class='add'>+				      size_t count, void *data,</div><div class='add'>+				      size_t datalen),</div><div class='add'>+		      void (*free)(void *data),</div><div class='add'>+		      unsigned long timeout)</div><div class='ctx'> {</div><div class='ctx'> 	free(data);</div><div class='ctx'> }</div><div class='hunk'>@@ -85,6 +93,34 @@ static inline void dev_coredumpsg(struct device *dev, struct scatterlist *table,</div><div class='ctx'> {</div><div class='ctx'> 	_devcd_free_sgtable(table);</div><div class='ctx'> }</div><div class='add'>+static inline void dev_coredump_put(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_DEV_COREDUMP */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * dev_coredumpm - create device coredump with read/free methods</div><div class='add'>+ * @dev: the struct device for the crashed device</div><div class='add'>+ * @owner: the module that contains the read/free functions, use %THIS_MODULE</div><div class='add'>+ * @data: data cookie for the @read/@free functions</div><div class='add'>+ * @datalen: length of the data</div><div class='add'>+ * @gfp: allocation flags</div><div class='add'>+ * @read: function to read from the given buffer</div><div class='add'>+ * @free: function to free the given buffer</div><div class='add'>+ *</div><div class='add'>+ * Creates a new device coredump for the given device. If a previous one hasn't</div><div class='add'>+ * been read yet, the new coredump is discarded. The data lifetime is determined</div><div class='add'>+ * by the device coredump framework and when it is no longer needed the @free</div><div class='add'>+ * function will be called to free the data.</div><div class='add'>+ */</div><div class='add'>+static inline void dev_coredumpm(struct device *dev, struct module *owner,</div><div class='add'>+				 void *data, size_t datalen, gfp_t gfp,</div><div class='add'>+				 ssize_t (*read)(char *buffer, loff_t offset, size_t count,</div><div class='add'>+						 void *data, size_t datalen),</div><div class='add'>+				void (*free)(void *data))</div><div class='add'>+{</div><div class='add'>+	dev_coredumpm_timeout(dev, owner, data, datalen, gfp, read, free,</div><div class='add'>+			      DEVCD_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* __DEVCOREDUMP_H */</div><div class='head'>diff --git a/include/linux/devfreq-governor.h b/include/linux/devfreq-governor.h<br/>new file mode 100644<br/>index 000000000000..dfdd0160a29f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/devfreq-governor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/devfreq-governor.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * governor.h - internal header for devfreq governors.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2011 Samsung Electronics</div><div class='add'>+ *	MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This header is for devfreq governors</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_DEVFREQ_DEVFREQ_H__</div><div class='add'>+#define __LINUX_DEVFREQ_DEVFREQ_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/devfreq.h&gt;</div><div class='add'>+</div><div class='add'>+#define DEVFREQ_NAME_LEN			16</div><div class='add'>+</div><div class='add'>+#define to_devfreq(DEV)	container_of((DEV), struct devfreq, dev)</div><div class='add'>+</div><div class='add'>+/* Devfreq events */</div><div class='add'>+#define DEVFREQ_GOV_START			0x1</div><div class='add'>+#define DEVFREQ_GOV_STOP			0x2</div><div class='add'>+#define DEVFREQ_GOV_UPDATE_INTERVAL		0x3</div><div class='add'>+#define DEVFREQ_GOV_SUSPEND			0x4</div><div class='add'>+#define DEVFREQ_GOV_RESUME			0x5</div><div class='add'>+</div><div class='add'>+#define DEVFREQ_MIN_FREQ			0</div><div class='add'>+#define DEVFREQ_MAX_FREQ			ULONG_MAX</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Definition of the governor feature flags</div><div class='add'>+ * - DEVFREQ_GOV_FLAG_IMMUTABLE</div><div class='add'>+ *   : This governor is never changeable to other governors.</div><div class='add'>+ * - DEVFREQ_GOV_FLAG_IRQ_DRIVEN</div><div class='add'>+ *   : The devfreq won't schedule the work for this governor.</div><div class='add'>+ */</div><div class='add'>+#define DEVFREQ_GOV_FLAG_IMMUTABLE			BIT(0)</div><div class='add'>+#define DEVFREQ_GOV_FLAG_IRQ_DRIVEN			BIT(1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Definition of governor attribute flags except for common sysfs attributes</div><div class='add'>+ * - DEVFREQ_GOV_ATTR_POLLING_INTERVAL</div><div class='add'>+ *   : Indicate polling_interval sysfs attribute</div><div class='add'>+ * - DEVFREQ_GOV_ATTR_TIMER</div><div class='add'>+ *   : Indicate timer sysfs attribute</div><div class='add'>+ */</div><div class='add'>+#define DEVFREQ_GOV_ATTR_POLLING_INTERVAL		BIT(0)</div><div class='add'>+#define DEVFREQ_GOV_ATTR_TIMER				BIT(1)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct devfreq_governor - Devfreq policy governor</div><div class='add'>+ * @node:		list node - contains registered devfreq governors</div><div class='add'>+ * @name:		Governor's name</div><div class='add'>+ * @attrs:		Governor's sysfs attribute flags</div><div class='add'>+ * @flags:		Governor's feature flags</div><div class='add'>+ * @get_target_freq:	Returns desired operating frequency for the device.</div><div class='add'>+ *			Basically, get_target_freq will run</div><div class='add'>+ *			devfreq_dev_profile.get_dev_status() to get the</div><div class='add'>+ *			status of the device (load = busy_time / total_time).</div><div class='add'>+ * @event_handler:      Callback for devfreq core framework to notify events</div><div class='add'>+ *                      to governors. Events include per device governor</div><div class='add'>+ *                      init and exit, opp changes out of devfreq, suspend</div><div class='add'>+ *                      and resume of per device devfreq during device idle.</div><div class='add'>+ *</div><div class='add'>+ * Note that the callbacks are called with devfreq-&gt;lock locked by devfreq.</div><div class='add'>+ */</div><div class='add'>+struct devfreq_governor {</div><div class='add'>+	struct list_head node;</div><div class='add'>+</div><div class='add'>+	const char name[DEVFREQ_NAME_LEN];</div><div class='add'>+	const u64 attrs;</div><div class='add'>+	const u64 flags;</div><div class='add'>+	int (*get_target_freq)(struct devfreq *this, unsigned long *freq);</div><div class='add'>+	int (*event_handler)(struct devfreq *devfreq,</div><div class='add'>+				unsigned int event, void *data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void devfreq_monitor_start(struct devfreq *devfreq);</div><div class='add'>+void devfreq_monitor_stop(struct devfreq *devfreq);</div><div class='add'>+void devfreq_monitor_suspend(struct devfreq *devfreq);</div><div class='add'>+void devfreq_monitor_resume(struct devfreq *devfreq);</div><div class='add'>+void devfreq_update_interval(struct devfreq *devfreq, unsigned int *delay);</div><div class='add'>+</div><div class='add'>+int devfreq_add_governor(struct devfreq_governor *governor);</div><div class='add'>+int devfreq_remove_governor(struct devfreq_governor *governor);</div><div class='add'>+</div><div class='add'>+int devm_devfreq_add_governor(struct device *dev,</div><div class='add'>+			      struct devfreq_governor *governor);</div><div class='add'>+</div><div class='add'>+int devfreq_update_status(struct devfreq *devfreq, unsigned long freq);</div><div class='add'>+int devfreq_update_target(struct devfreq *devfreq, unsigned long freq);</div><div class='add'>+void devfreq_get_freq_range(struct devfreq *devfreq, unsigned long *min_freq,</div><div class='add'>+			    unsigned long *max_freq);</div><div class='add'>+</div><div class='add'>+static inline int devfreq_update_stats(struct devfreq *df)</div><div class='add'>+{</div><div class='add'>+	if (!df-&gt;profile-&gt;get_dev_status)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return df-&gt;profile-&gt;get_dev_status(df-&gt;dev.parent, &amp;df-&gt;last_status);</div><div class='add'>+}</div><div class='add'>+#endif /* __LINUX_DEVFREQ_DEVFREQ_H__ */</div><div class='head'>diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h<br/>index d312ffbac4dd..dc1075dc3446 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/devfreq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/devfreq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/devfreq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/devfreq.h</a></div><div class='hunk'>@@ -103,6 +103,8 @@ struct devfreq_dev_status {</div><div class='ctx'>  *</div><div class='ctx'>  * @is_cooling_device: A self-explanatory boolean giving the device a</div><div class='ctx'>  *                     cooling effect property.</div><div class='add'>+ * @dev_groups:		Optional device-specific sysfs attribute groups that to</div><div class='add'>+ *			be attached to the devfreq device.</div><div class='ctx'>  */</div><div class='ctx'> struct devfreq_dev_profile {</div><div class='ctx'> 	unsigned long initial_freq;</div><div class='hunk'>@@ -119,6 +121,8 @@ struct devfreq_dev_profile {</div><div class='ctx'> 	unsigned int max_state;</div><div class='ctx'> </div><div class='ctx'> 	bool is_cooling_device;</div><div class='add'>+</div><div class='add'>+	const struct attribute_group **dev_groups;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h<br/>index 82b2195efaca..38f625af6ab4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/device-mapper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device-mapper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/device-mapper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/device-mapper.h</a></div><div class='hunk'>@@ -93,7 +93,14 @@ typedef void (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,</div><div class='ctx'> typedef int (*dm_message_fn) (struct dm_target *ti, unsigned int argc, char **argv,</div><div class='ctx'> 			      char *result, unsigned int maxlen);</div><div class='ctx'> </div><div class='del'>-typedef int (*dm_prepare_ioctl_fn) (struct dm_target *ti, struct block_device **bdev);</div><div class='add'>+/*</div><div class='add'>+ * Called with *forward == true. If it remains true, the ioctl should be</div><div class='add'>+ * forwarded to bdev. If it is reset to false, the target already fully handled</div><div class='add'>+ * the ioctl and the return value is the return value for the whole ioctl.</div><div class='add'>+ */</div><div class='add'>+typedef int (*dm_prepare_ioctl_fn) (struct dm_target *ti, struct block_device **bdev,</div><div class='add'>+				    unsigned int cmd, unsigned long arg,</div><div class='add'>+				    bool *forward);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> typedef int (*dm_report_zones_fn) (struct dm_target *ti,</div><div class='hunk'>@@ -149,7 +156,7 @@ typedef int (*dm_busy_fn) (struct dm_target *ti);</div><div class='ctx'>  */</div><div class='ctx'> typedef long (*dm_dax_direct_access_fn) (struct dm_target *ti, pgoff_t pgoff,</div><div class='ctx'> 		long nr_pages, enum dax_access_mode node, void **kaddr,</div><div class='del'>-		pfn_t *pfn);</div><div class='add'>+		unsigned long *pfn);</div><div class='ctx'> typedef int (*dm_dax_zero_page_range_fn)(struct dm_target *ti, pgoff_t pgoff,</div><div class='ctx'> 		size_t nr_pages);</div><div class='ctx'> </div><div class='hunk'>@@ -180,6 +187,11 @@ int dm_get_device(struct dm_target *ti, const char *path, blk_mode_t mode,</div><div class='ctx'> void dm_put_device(struct dm_target *ti, struct dm_dev *d);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Helper function for getting devices</div><div class='add'>+ */</div><div class='add'>+int dm_devt_from_path(const char *path, dev_t *dev_p);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Information about a target type</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -294,6 +306,9 @@ struct target_type {</div><div class='ctx'> #define dm_target_supports_mixed_zoned_model(type) (false)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define DM_TARGET_ATOMIC_WRITES		0x00000400</div><div class='add'>+#define dm_target_supports_atomic_writes(type) ((type)-&gt;features &amp; DM_TARGET_ATOMIC_WRITES)</div><div class='add'>+</div><div class='ctx'> struct dm_target {</div><div class='ctx'> 	struct dm_table *table;</div><div class='ctx'> 	struct target_type *type;</div><div class='hunk'>@@ -358,22 +373,17 @@ struct dm_target {</div><div class='ctx'> 	bool discards_supported:1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Set if this target requires that discards be split on</div><div class='del'>-	 * 'max_discard_sectors' boundaries.</div><div class='del'>-	 */</div><div class='del'>-	bool max_discard_granularity:1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set if this target requires that secure_erases be split on</div><div class='del'>-	 * 'max_secure_erase_sectors' boundaries.</div><div class='add'>+	 * Automatically set by dm-core if this target supports</div><div class='add'>+	 * REQ_OP_ZONE_RESET_ALL. Otherwise, this operation will be emulated</div><div class='add'>+	 * using REQ_OP_ZONE_RESET. Target drivers must not set this manually.</div><div class='ctx'> 	 */</div><div class='del'>-	bool max_secure_erase_granularity:1;</div><div class='add'>+	bool zone_reset_all_supported:1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Set if this target requires that write_zeroes be split on</div><div class='del'>-	 * 'max_write_zeroes_sectors' boundaries.</div><div class='add'>+	 * Set if this target requires that discards be split on</div><div class='add'>+	 * 'max_discard_sectors' boundaries.</div><div class='ctx'> 	 */</div><div class='del'>-	bool max_write_zeroes_granularity:1;</div><div class='add'>+	bool max_discard_granularity:1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set if we need to limit the number of in-flight bios when swapping.</div><div class='hunk'>@@ -397,6 +407,27 @@ struct dm_target {</div><div class='ctx'> 	 * bio_set_dev(). NOTE: ideally a target should _not_ need this.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool needs_bio_set_dev:1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set if the target supports flush optimization. If all the targets in</div><div class='add'>+	 * a table have flush_bypasses_map set, the dm core will not send</div><div class='add'>+	 * flushes to the targets via a -&gt;map method. It will iterate over</div><div class='add'>+	 * dm_table-&gt;devices and send flushes to the devices directly. This</div><div class='add'>+	 * optimization reduces the number of flushes being sent when multiple</div><div class='add'>+	 * targets in a table use the same underlying device.</div><div class='add'>+	 *</div><div class='add'>+	 * This optimization may be enabled on targets that just pass the</div><div class='add'>+	 * flushes to the underlying devices without performing any other</div><div class='add'>+	 * actions on the flush request. Currently, dm-linear and dm-stripe</div><div class='add'>+	 * support it.</div><div class='add'>+	 */</div><div class='add'>+	bool flush_bypasses_map:1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set if the target calls bio_integrity_alloc on bios received</div><div class='add'>+	 * in the map method.</div><div class='add'>+	 */</div><div class='add'>+	bool mempool_needs_integrity:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void *dm_per_bio_data(struct bio *bio, size_t data_size);</div><div class='hunk'>@@ -503,17 +534,22 @@ int dm_post_suspending(struct dm_target *ti);</div><div class='ctx'> int dm_noflush_suspending(struct dm_target *ti);</div><div class='ctx'> void dm_accept_partial_bio(struct bio *bio, unsigned int n_sectors);</div><div class='ctx'> void dm_submit_bio_remap(struct bio *clone, struct bio *tgt_clone);</div><div class='del'>-union map_info *dm_get_rq_mapinfo(struct request *rq);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BLK_DEV_ZONED</div><div class='ctx'> struct dm_report_zones_args {</div><div class='ctx'> 	struct dm_target *tgt;</div><div class='add'>+	struct gendisk *disk;</div><div class='ctx'> 	sector_t next_sector;</div><div class='ctx'> </div><div class='del'>-	void *orig_data;</div><div class='del'>-	report_zones_cb orig_cb;</div><div class='ctx'> 	unsigned int zone_idx;</div><div class='ctx'> </div><div class='add'>+	/* for block layer -&gt;report_zones */</div><div class='add'>+	struct blk_report_zones_args *rep_args;</div><div class='add'>+</div><div class='add'>+	/* for internal users */</div><div class='add'>+	report_zones_cb cb;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='ctx'> 	/* must be filled by -&gt;report_zones before calling dm_report_zones_cb */</div><div class='ctx'> 	sector_t start;</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/device.h b/include/linux/device.h<br/>index 97c4b046c09d..0be95294b6e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/device.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/device.h</a></div><div class='hunk'>@@ -26,9 +26,9 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/uidgid.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/overflow.h&gt;</div><div class='ctx'> #include &lt;linux/device/bus.h&gt;</div><div class='ctx'> #include &lt;linux/device/class.h&gt;</div><div class='add'>+#include &lt;linux/device/devres.h&gt;</div><div class='ctx'> #include &lt;linux/device/driver.h&gt;</div><div class='ctx'> #include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;asm/device.h&gt;</div><div class='hunk'>@@ -132,6 +132,8 @@ ssize_t device_show_bool(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			char *buf);</div><div class='ctx'> ssize_t device_store_bool(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			 const char *buf, size_t count);</div><div class='add'>+ssize_t device_show_string(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			   char *buf);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DEVICE_ATTR - Define a device attribute.</div><div class='hunk'>@@ -251,6 +253,19 @@ ssize_t device_store_bool(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct dev_ext_attribute dev_attr_##_name = \</div><div class='ctx'> 		{ __ATTR(_name, _mode, device_show_bool, device_store_bool), &amp;(_var) }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * DEVICE_STRING_ATTR_RO - Define a device attribute backed by a r/o string.</div><div class='add'>+ * @_name: Attribute name.</div><div class='add'>+ * @_mode: File mode.</div><div class='add'>+ * @_var: Identifier of string.</div><div class='add'>+ *</div><div class='add'>+ * Like DEVICE_ULONG_ATTR(), but @_var is a string. Because the length of the</div><div class='add'>+ * string allocation is unknown, the attribute must be read-only.</div><div class='add'>+ */</div><div class='add'>+#define DEVICE_STRING_ATTR_RO(_name, _mode, _var) \</div><div class='add'>+	struct dev_ext_attribute dev_attr_##_name = \</div><div class='add'>+		{ __ATTR(_name, (_mode) &amp; ~0222, device_show_string, NULL), (_var) }</div><div class='add'>+</div><div class='ctx'> #define DEVICE_ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) \</div><div class='ctx'> 	struct device_attribute dev_attr_##_name =		\</div><div class='ctx'> 		__ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store)</div><div class='hunk'>@@ -266,164 +281,6 @@ int __must_check device_create_bin_file(struct device *dev,</div><div class='ctx'> void device_remove_bin_file(struct device *dev,</div><div class='ctx'> 			    const struct bin_attribute *attr);</div><div class='ctx'> </div><div class='del'>-/* device resource management */</div><div class='del'>-typedef void (*dr_release_t)(struct device *dev, void *res);</div><div class='del'>-typedef int (*dr_match_t)(struct device *dev, void *res, void *match_data);</div><div class='del'>-</div><div class='del'>-void *__devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp,</div><div class='del'>-			  int nid, const char *name) __malloc;</div><div class='del'>-#define devres_alloc(release, size, gfp) \</div><div class='del'>-	__devres_alloc_node(release, size, gfp, NUMA_NO_NODE, #release)</div><div class='del'>-#define devres_alloc_node(release, size, gfp, nid) \</div><div class='del'>-	__devres_alloc_node(release, size, gfp, nid, #release)</div><div class='del'>-</div><div class='del'>-void devres_for_each_res(struct device *dev, dr_release_t release,</div><div class='del'>-			 dr_match_t match, void *match_data,</div><div class='del'>-			 void (*fn)(struct device *, void *, void *),</div><div class='del'>-			 void *data);</div><div class='del'>-void devres_free(void *res);</div><div class='del'>-void devres_add(struct device *dev, void *res);</div><div class='del'>-void *devres_find(struct device *dev, dr_release_t release,</div><div class='del'>-		  dr_match_t match, void *match_data);</div><div class='del'>-void *devres_get(struct device *dev, void *new_res,</div><div class='del'>-		 dr_match_t match, void *match_data);</div><div class='del'>-void *devres_remove(struct device *dev, dr_release_t release,</div><div class='del'>-		    dr_match_t match, void *match_data);</div><div class='del'>-int devres_destroy(struct device *dev, dr_release_t release,</div><div class='del'>-		   dr_match_t match, void *match_data);</div><div class='del'>-int devres_release(struct device *dev, dr_release_t release,</div><div class='del'>-		   dr_match_t match, void *match_data);</div><div class='del'>-</div><div class='del'>-/* devres group */</div><div class='del'>-void * __must_check devres_open_group(struct device *dev, void *id, gfp_t gfp);</div><div class='del'>-void devres_close_group(struct device *dev, void *id);</div><div class='del'>-void devres_remove_group(struct device *dev, void *id);</div><div class='del'>-int devres_release_group(struct device *dev, void *id);</div><div class='del'>-</div><div class='del'>-/* managed devm_k.alloc/kfree for device drivers */</div><div class='del'>-void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp) __alloc_size(2);</div><div class='del'>-void *devm_krealloc(struct device *dev, void *ptr, size_t size,</div><div class='del'>-		    gfp_t gfp) __must_check __realloc_size(3);</div><div class='del'>-__printf(3, 0) char *devm_kvasprintf(struct device *dev, gfp_t gfp,</div><div class='del'>-				     const char *fmt, va_list ap) __malloc;</div><div class='del'>-__printf(3, 4) char *devm_kasprintf(struct device *dev, gfp_t gfp,</div><div class='del'>-				    const char *fmt, ...) __malloc;</div><div class='del'>-static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	return devm_kmalloc(dev, size, gfp | __GFP_ZERO);</div><div class='del'>-}</div><div class='del'>-static inline void *devm_kmalloc_array(struct device *dev,</div><div class='del'>-				       size_t n, size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	size_t bytes;</div><div class='del'>-</div><div class='del'>-	if (unlikely(check_mul_overflow(n, size, &amp;bytes)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return devm_kmalloc(dev, bytes, flags);</div><div class='del'>-}</div><div class='del'>-static inline void *devm_kcalloc(struct device *dev,</div><div class='del'>-				 size_t n, size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO);</div><div class='del'>-}</div><div class='del'>-static inline __realloc_size(3, 4) void * __must_check</div><div class='del'>-devm_krealloc_array(struct device *dev, void *p, size_t new_n, size_t new_size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	size_t bytes;</div><div class='del'>-</div><div class='del'>-	if (unlikely(check_mul_overflow(new_n, new_size, &amp;bytes)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return devm_krealloc(dev, p, bytes, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void devm_kfree(struct device *dev, const void *p);</div><div class='del'>-char *devm_kstrdup(struct device *dev, const char *s, gfp_t gfp) __malloc;</div><div class='del'>-const char *devm_kstrdup_const(struct device *dev, const char *s, gfp_t gfp);</div><div class='del'>-void *devm_kmemdup(struct device *dev, const void *src, size_t len, gfp_t gfp)</div><div class='del'>-	__realloc_size(3);</div><div class='del'>-</div><div class='del'>-unsigned long devm_get_free_pages(struct device *dev,</div><div class='del'>-				  gfp_t gfp_mask, unsigned int order);</div><div class='del'>-void devm_free_pages(struct device *dev, unsigned long addr);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAS_IOMEM</div><div class='del'>-void __iomem *devm_ioremap_resource(struct device *dev,</div><div class='del'>-				    const struct resource *res);</div><div class='del'>-void __iomem *devm_ioremap_resource_wc(struct device *dev,</div><div class='del'>-				       const struct resource *res);</div><div class='del'>-</div><div class='del'>-void __iomem *devm_of_iomap(struct device *dev,</div><div class='del'>-			    struct device_node *node, int index,</div><div class='del'>-			    resource_size_t *size);</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void __iomem *devm_ioremap_resource(struct device *dev,</div><div class='del'>-				    const struct resource *res)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void __iomem *devm_ioremap_resource_wc(struct device *dev,</div><div class='del'>-				       const struct resource *res)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void __iomem *devm_of_iomap(struct device *dev,</div><div class='del'>-			    struct device_node *node, int index,</div><div class='del'>-			    resource_size_t *size)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* allows to add/remove a custom action to devres stack */</div><div class='del'>-void devm_remove_action(struct device *dev, void (*action)(void *), void *data);</div><div class='del'>-void devm_release_action(struct device *dev, void (*action)(void *), void *data);</div><div class='del'>-</div><div class='del'>-int __devm_add_action(struct device *dev, void (*action)(void *), void *data, const char *name);</div><div class='del'>-#define devm_add_action(dev, action, data) \</div><div class='del'>-	__devm_add_action(dev, action, data, #action)</div><div class='del'>-</div><div class='del'>-static inline int __devm_add_action_or_reset(struct device *dev, void (*action)(void *),</div><div class='del'>-					     void *data, const char *name)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = __devm_add_action(dev, action, data, name);</div><div class='del'>-	if (ret)</div><div class='del'>-		action(data);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#define devm_add_action_or_reset(dev, action, data) \</div><div class='del'>-	__devm_add_action_or_reset(dev, action, data, #action)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * devm_alloc_percpu - Resource-managed alloc_percpu</div><div class='del'>- * @dev: Device to allocate per-cpu memory for</div><div class='del'>- * @type: Type to allocate per-cpu memory for</div><div class='del'>- *</div><div class='del'>- * Managed alloc_percpu. Per-cpu memory allocated with this function is</div><div class='del'>- * automatically freed on driver detach.</div><div class='del'>- *</div><div class='del'>- * RETURNS:</div><div class='del'>- * Pointer to allocated memory on success, NULL on failure.</div><div class='del'>- */</div><div class='del'>-#define devm_alloc_percpu(dev, type)      \</div><div class='del'>-	((typeof(type) __percpu *)__devm_alloc_percpu((dev), sizeof(type), \</div><div class='del'>-						      __alignof__(type)))</div><div class='del'>-</div><div class='del'>-void __percpu *__devm_alloc_percpu(struct device *dev, size_t size,</div><div class='del'>-				   size_t align);</div><div class='del'>-void devm_free_percpu(struct device *dev, void __percpu *pdata);</div><div class='del'>-</div><div class='ctx'> struct device_dma_parameters {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * a low level driver may set these to teach IOMMU code about</div><div class='hunk'>@@ -691,6 +548,9 @@ struct device_physical_location {</div><div class='ctx'>  *		and optionall (if the coherent mask is large enough) also</div><div class='ctx'>  *		for dma allocations.  This flag is managed by the dma ops</div><div class='ctx'>  *		instance from -&gt;dma_supported.</div><div class='add'>+ * @dma_skip_sync: DMA sync operations can be skipped for coherent buffers.</div><div class='add'>+ * @dma_iommu: Device is using default IOMMU implementation for DMA and</div><div class='add'>+ *		doesn't rely on dma_ops structure.</div><div class='ctx'>  *</div><div class='ctx'>  * At the lowest level, every device in a Linux system is represented by an</div><div class='ctx'>  * instance of struct device. The device structure contains the information</div><div class='hunk'>@@ -732,7 +592,7 @@ struct device {</div><div class='ctx'> 	struct dev_pin_info	*pins;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct dev_msi_info	msi;</div><div class='del'>-#ifdef CONFIG_DMA_OPS</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_DMA_OPS</div><div class='ctx'> 	const struct dma_map_ops *dma_ops;</div><div class='ctx'> #endif</div><div class='ctx'> 	u64		*dma_mask;	/* dma mask (if dma'able device) */</div><div class='hunk'>@@ -803,6 +663,12 @@ struct device {</div><div class='ctx'> #ifdef CONFIG_DMA_OPS_BYPASS</div><div class='ctx'> 	bool			dma_ops_bypass : 1;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_DMA_NEED_SYNC</div><div class='add'>+	bool			dma_skip_sync:1;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_IOMMU_DMA</div><div class='add'>+	bool			dma_iommu:1;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -966,6 +832,9 @@ static inline bool device_pm_not_required(struct device *dev)</div><div class='ctx'> static inline void device_set_pm_not_required(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;power.no_pm = true;</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	dev-&gt;power.no_callbacks = true;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void dev_pm_syscore_device(struct device *dev, bool val)</div><div class='hunk'>@@ -985,6 +854,42 @@ static inline bool dev_pm_test_driver_flags(struct device *dev, u32 flags)</div><div class='ctx'> 	return !!(dev-&gt;power.driver_flags &amp; flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool dev_pm_smart_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	return dev-&gt;power.smart_suspend;</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dev_pm_set_strict_midlayer - Update the device's power.strict_midlayer flag</div><div class='add'>+ * @dev: Target device.</div><div class='add'>+ * @val: New flag value.</div><div class='add'>+ *</div><div class='add'>+ * When set, power.strict_midlayer means that the middle layer power management</div><div class='add'>+ * code (typically, a bus type or a PM domain) does not expect its runtime PM</div><div class='add'>+ * suspend callback to be invoked at all during system-wide PM transitions and</div><div class='add'>+ * it does not expect its runtime PM resume callback to be invoked at any point</div><div class='add'>+ * when runtime PM is disabled for the device during system-wide PM transitions.</div><div class='add'>+ */</div><div class='add'>+static inline void dev_pm_set_strict_midlayer(struct device *dev, bool val)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	dev-&gt;power.strict_midlayer = val;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dev_pm_strict_midlayer_is_set(struct device *dev)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	return dev-&gt;power.strict_midlayer;</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void device_lock(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;mutex);</div><div class='hunk'>@@ -1012,13 +917,6 @@ static inline void device_lock_assert(struct device *dev)</div><div class='ctx'> 	lockdep_assert_held(&amp;dev-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct device_node *dev_of_node(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ENABLED(CONFIG_OF) || !dev)</div><div class='del'>-		return NULL;</div><div class='del'>-	return dev-&gt;of_node;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool dev_has_sync_state(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -1030,6 +928,18 @@ static inline bool dev_has_sync_state(struct device *dev)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int dev_set_drv_sync_state(struct device *dev,</div><div class='add'>+					 void (*fn)(struct device *dev))</div><div class='add'>+{</div><div class='add'>+	if (!dev || !dev-&gt;driver)</div><div class='add'>+		return 0;</div><div class='add'>+	if (dev-&gt;driver-&gt;sync_state &amp;&amp; dev-&gt;driver-&gt;sync_state != fn)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (!dev-&gt;driver-&gt;sync_state)</div><div class='add'>+		dev-&gt;driver-&gt;sync_state = fn;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void dev_set_removable(struct device *dev,</div><div class='ctx'> 				     enum device_removable removable)</div><div class='ctx'> {</div><div class='hunk'>@@ -1057,15 +967,44 @@ void device_del(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> DEFINE_FREE(device_del, struct device *, if (_T) device_del(_T))</div><div class='ctx'> </div><div class='del'>-int device_for_each_child(struct device *dev, void *data,</div><div class='del'>-			  int (*fn)(struct device *dev, void *data));</div><div class='del'>-int device_for_each_child_reverse(struct device *dev, void *data,</div><div class='del'>-				  int (*fn)(struct device *dev, void *data));</div><div class='del'>-struct device *device_find_child(struct device *dev, void *data,</div><div class='del'>-				 int (*match)(struct device *dev, void *data));</div><div class='del'>-struct device *device_find_child_by_name(struct device *parent,</div><div class='del'>-					 const char *name);</div><div class='del'>-struct device *device_find_any_child(struct device *parent);</div><div class='add'>+int device_for_each_child(struct device *parent, void *data,</div><div class='add'>+			  device_iter_t fn);</div><div class='add'>+int device_for_each_child_reverse(struct device *parent, void *data,</div><div class='add'>+				  device_iter_t fn);</div><div class='add'>+int device_for_each_child_reverse_from(struct device *parent,</div><div class='add'>+				       struct device *from, void *data,</div><div class='add'>+				       device_iter_t fn);</div><div class='add'>+struct device *device_find_child(struct device *parent, const void *data,</div><div class='add'>+				 device_match_t match);</div><div class='add'>+/**</div><div class='add'>+ * device_find_child_by_name - device iterator for locating a child device.</div><div class='add'>+ * @parent: parent struct device</div><div class='add'>+ * @name: name of the child device</div><div class='add'>+ *</div><div class='add'>+ * This is similar to the device_find_child() function above, but it</div><div class='add'>+ * returns a reference to a device that has the name @name.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: you will need to drop the reference with put_device() after use.</div><div class='add'>+ */</div><div class='add'>+static inline struct device *device_find_child_by_name(struct device *parent,</div><div class='add'>+						       const char *name)</div><div class='add'>+{</div><div class='add'>+	return device_find_child(parent, name, device_match_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_find_any_child - device iterator for locating a child device, if any.</div><div class='add'>+ * @parent: parent struct device</div><div class='add'>+ *</div><div class='add'>+ * This is similar to the device_find_child() function above, but it</div><div class='add'>+ * returns a reference to a child device, if any.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: you will need to drop the reference with put_device() after use.</div><div class='add'>+ */</div><div class='add'>+static inline struct device *device_find_any_child(struct device *parent)</div><div class='add'>+{</div><div class='add'>+	return device_find_child(parent, NULL, device_match_any);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int device_rename(struct device *dev, const char *new_name);</div><div class='ctx'> int device_move(struct device *dev, struct device *new_parent,</div><div class='hunk'>@@ -1125,10 +1064,21 @@ void unlock_device_hotplug(void);</div><div class='ctx'> int lock_device_hotplug_sysfs(void);</div><div class='ctx'> int device_offline(struct device *dev);</div><div class='ctx'> int device_online(struct device *dev);</div><div class='add'>+</div><div class='ctx'> void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode);</div><div class='ctx'> void set_secondary_fwnode(struct device *dev, struct fwnode_handle *fwnode);</div><div class='del'>-void device_set_of_node_from_dev(struct device *dev, const struct device *dev2);</div><div class='ctx'> void device_set_node(struct device *dev, struct fwnode_handle *fwnode);</div><div class='add'>+int device_add_of_node(struct device *dev, struct device_node *of_node);</div><div class='add'>+void device_remove_of_node(struct device *dev);</div><div class='add'>+void device_set_of_node_from_dev(struct device *dev, const struct device *dev2);</div><div class='add'>+struct device *get_dev_from_fwnode(struct fwnode_handle *fwnode);</div><div class='add'>+</div><div class='add'>+static inline struct device_node *dev_of_node(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_OF) || !dev)</div><div class='add'>+		return NULL;</div><div class='add'>+	return dev-&gt;of_node;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline int dev_num_vf(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1157,12 +1107,12 @@ static inline void *dev_get_platdata(const struct device *dev)</div><div class='ctx'>  * Manual binding of a device to driver. See drivers/base/bus.c</div><div class='ctx'>  * for information on use.</div><div class='ctx'>  */</div><div class='del'>-int __must_check device_driver_attach(struct device_driver *drv,</div><div class='add'>+int __must_check device_driver_attach(const struct device_driver *drv,</div><div class='ctx'> 				      struct device *dev);</div><div class='ctx'> int __must_check device_bind_driver(struct device *dev);</div><div class='ctx'> void device_release_driver(struct device *dev);</div><div class='ctx'> int  __must_check device_attach(struct device *dev);</div><div class='del'>-int __must_check driver_attach(struct device_driver *drv);</div><div class='add'>+int __must_check driver_attach(const struct device_driver *drv);</div><div class='ctx'> void device_initial_probe(struct device *dev);</div><div class='ctx'> int __must_check device_reprobe(struct device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1198,26 +1148,13 @@ static inline void device_remove_group(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	const struct attribute_group *groups[] = { grp, NULL };</div><div class='ctx'> </div><div class='del'>-	return device_remove_groups(dev, groups);</div><div class='add'>+	device_remove_groups(dev, groups);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __must_check devm_device_add_groups(struct device *dev,</div><div class='del'>-					const struct attribute_group **groups);</div><div class='ctx'> int __must_check devm_device_add_group(struct device *dev,</div><div class='ctx'> 				       const struct attribute_group *grp);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Platform "fixup" functions - allow the platform to have their say</div><div class='del'>- * about devices and actions that the general device layer doesn't</div><div class='del'>- * know about.</div><div class='del'>- */</div><div class='del'>-/* Notify platform of device discovery */</div><div class='del'>-extern int (*platform_notify)(struct device *dev);</div><div class='del'>-</div><div class='del'>-extern int (*platform_notify_remove)(struct device *dev);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * get_device - atomically increment the reference count for the device.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -1247,6 +1184,12 @@ void device_link_del(struct device_link *link);</div><div class='ctx'> void device_link_remove(void *consumer, struct device *supplier);</div><div class='ctx'> void device_links_supplier_sync_state_pause(void);</div><div class='ctx'> void device_links_supplier_sync_state_resume(void);</div><div class='add'>+void device_link_wait_removal(void);</div><div class='add'>+</div><div class='add'>+static inline bool device_link_test(const struct device_link *link, u32 flags)</div><div class='add'>+{</div><div class='add'>+	return !!(link-&gt;flags &amp; flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Create alias, so I can be autoloaded. */</div><div class='ctx'> #define MODULE_ALIAS_CHARDEV(major,minor) \</div><div class='head'>diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h<br/>index 5ef4ec1c36c3..99b1002b3e31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/device/bus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device/bus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/device/bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/device/bus.h</a></div><div class='hunk'>@@ -48,6 +48,7 @@ struct fwnode_handle;</div><div class='ctx'>  *		will never get called until they do.</div><div class='ctx'>  * @remove:	Called when a device removed from this bus.</div><div class='ctx'>  * @shutdown:	Called at shut-down time to quiesce the device.</div><div class='add'>+ * @irq_get_affinity:	Get IRQ affinity mask for the device on this bus.</div><div class='ctx'>  *</div><div class='ctx'>  * @online:	Called to put the device back online (after offlining it).</div><div class='ctx'>  * @offline:	Called to put the device offline for hot-removal. May fail.</div><div class='hunk'>@@ -81,12 +82,14 @@ struct bus_type {</div><div class='ctx'> 	const struct attribute_group **dev_groups;</div><div class='ctx'> 	const struct attribute_group **drv_groups;</div><div class='ctx'> </div><div class='del'>-	int (*match)(struct device *dev, struct device_driver *drv);</div><div class='add'>+	int (*match)(struct device *dev, const struct device_driver *drv);</div><div class='ctx'> 	int (*uevent)(const struct device *dev, struct kobj_uevent_env *env);</div><div class='ctx'> 	int (*probe)(struct device *dev);</div><div class='ctx'> 	void (*sync_state)(struct device *dev);</div><div class='ctx'> 	void (*remove)(struct device *dev);</div><div class='ctx'> 	void (*shutdown)(struct device *dev);</div><div class='add'>+	const struct cpumask *(*irq_get_affinity)(struct device *dev,</div><div class='add'>+			unsigned int irq_vec);</div><div class='ctx'> </div><div class='ctx'> 	int (*online)(struct device *dev);</div><div class='ctx'> 	int (*offline)(struct device *dev);</div><div class='hunk'>@@ -126,8 +129,12 @@ struct bus_attribute {</div><div class='ctx'> int __must_check bus_create_file(const struct bus_type *bus, struct bus_attribute *attr);</div><div class='ctx'> void bus_remove_file(const struct bus_type *bus, struct bus_attribute *attr);</div><div class='ctx'> </div><div class='add'>+/* Matching function type for drivers/base APIs to find a specific device */</div><div class='add'>+typedef int (*device_match_t)(struct device *dev, const void *data);</div><div class='add'>+</div><div class='ctx'> /* Generic device matching functions that all busses can use to match with */</div><div class='ctx'> int device_match_name(struct device *dev, const void *name);</div><div class='add'>+int device_match_type(struct device *dev, const void *type);</div><div class='ctx'> int device_match_of_node(struct device *dev, const void *np);</div><div class='ctx'> int device_match_fwnode(struct device *dev, const void *fwnode);</div><div class='ctx'> int device_match_devt(struct device *dev, const void *pdevt);</div><div class='hunk'>@@ -135,12 +142,17 @@ int device_match_acpi_dev(struct device *dev, const void *adev);</div><div class='ctx'> int device_match_acpi_handle(struct device *dev, const void *handle);</div><div class='ctx'> int device_match_any(struct device *dev, const void *unused);</div><div class='ctx'> </div><div class='add'>+/* Device iterating function type for various driver core for_each APIs */</div><div class='add'>+typedef int (*device_iter_t)(struct device *dev, void *data);</div><div class='add'>+</div><div class='ctx'> /* iterator helpers for buses */</div><div class='del'>-int bus_for_each_dev(const struct bus_type *bus, struct device *start, void *data,</div><div class='del'>-		     int (*fn)(struct device *dev, void *data));</div><div class='add'>+int bus_for_each_dev(const struct bus_type *bus, struct device *start,</div><div class='add'>+		     void *data, device_iter_t fn);</div><div class='ctx'> struct device *bus_find_device(const struct bus_type *bus, struct device *start,</div><div class='del'>-			       const void *data,</div><div class='del'>-			       int (*match)(struct device *dev, const void *data));</div><div class='add'>+			       const void *data, device_match_t match);</div><div class='add'>+struct device *bus_find_device_reverse(const struct bus_type *bus,</div><div class='add'>+				       struct device *start, const void *data,</div><div class='add'>+				       device_match_t match);</div><div class='ctx'> /**</div><div class='ctx'>  * bus_find_device_by_name - device iterator for locating a particular device</div><div class='ctx'>  * of a specific name.</div><div class='head'>diff --git a/include/linux/device/class.h b/include/linux/device/class.h<br/>index c576b49c55c2..65880e60c720 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/device/class.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device/class.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/device/class.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/device/class.h</a></div><div class='hunk'>@@ -82,20 +82,18 @@ bool class_is_registered(const struct class *class);</div><div class='ctx'> struct class_compat;</div><div class='ctx'> struct class_compat *class_compat_register(const char *name);</div><div class='ctx'> void class_compat_unregister(struct class_compat *cls);</div><div class='del'>-int class_compat_create_link(struct class_compat *cls, struct device *dev,</div><div class='del'>-			     struct device *device_link);</div><div class='del'>-void class_compat_remove_link(struct class_compat *cls, struct device *dev,</div><div class='del'>-			      struct device *device_link);</div><div class='add'>+int class_compat_create_link(struct class_compat *cls, struct device *dev);</div><div class='add'>+void class_compat_remove_link(struct class_compat *cls, struct device *dev);</div><div class='ctx'> </div><div class='ctx'> void class_dev_iter_init(struct class_dev_iter *iter, const struct class *class,</div><div class='ctx'> 			 const struct device *start, const struct device_type *type);</div><div class='ctx'> struct device *class_dev_iter_next(struct class_dev_iter *iter);</div><div class='ctx'> void class_dev_iter_exit(struct class_dev_iter *iter);</div><div class='ctx'> </div><div class='del'>-int class_for_each_device(const struct class *class, const struct device *start, void *data,</div><div class='del'>-			  int (*fn)(struct device *dev, void *data));</div><div class='add'>+int class_for_each_device(const struct class *class, const struct device *start,</div><div class='add'>+			  void *data, device_iter_t fn);</div><div class='ctx'> struct device *class_find_device(const struct class *class, const struct device *start,</div><div class='del'>-				 const void *data, int (*match)(struct device *, const void *));</div><div class='add'>+				 const void *data, device_match_t match);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * class_find_device_by_name - device iterator for locating a particular device</div><div class='hunk'>@@ -195,7 +193,7 @@ static inline int __must_check class_create_file(const struct class *class,</div><div class='ctx'> static inline void class_remove_file(const struct class *class,</div><div class='ctx'> 				     const struct class_attribute *attr)</div><div class='ctx'> {</div><div class='del'>-	return class_remove_file_ns(class, attr, NULL);</div><div class='add'>+	class_remove_file_ns(class, attr, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Simple class attribute that is just a static string */</div><div class='head'>diff --git a/include/linux/device/devres.h b/include/linux/device/devres.h<br/>new file mode 100644<br/>index 000000000000..9c1e3d643d69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/device/devres.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/device/devres.h</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _DEVICE_DEVRES_H_</div><div class='add'>+#define _DEVICE_DEVRES_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/gfp_types.h&gt;</div><div class='add'>+#include &lt;linux/numa.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='add'>+#include &lt;linux/stdarg.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/bug.h&gt;</div><div class='add'>+#include &lt;asm/percpu.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct device_node;</div><div class='add'>+struct resource;</div><div class='add'>+</div><div class='add'>+/* device resource management */</div><div class='add'>+typedef void (*dr_release_t)(struct device *dev, void *res);</div><div class='add'>+typedef int (*dr_match_t)(struct device *dev, void *res, void *match_data);</div><div class='add'>+</div><div class='add'>+void * __malloc</div><div class='add'>+__devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp, int nid, const char *name);</div><div class='add'>+#define devres_alloc(release, size, gfp) \</div><div class='add'>+	__devres_alloc_node(release, size, gfp, NUMA_NO_NODE, #release)</div><div class='add'>+#define devres_alloc_node(release, size, gfp, nid) \</div><div class='add'>+	__devres_alloc_node(release, size, gfp, nid, #release)</div><div class='add'>+</div><div class='add'>+void devres_for_each_res(struct device *dev, dr_release_t release,</div><div class='add'>+			 dr_match_t match, void *match_data,</div><div class='add'>+			 void (*fn)(struct device *, void *, void *),</div><div class='add'>+			 void *data);</div><div class='add'>+void devres_free(void *res);</div><div class='add'>+void devres_add(struct device *dev, void *res);</div><div class='add'>+void *devres_find(struct device *dev, dr_release_t release, dr_match_t match, void *match_data);</div><div class='add'>+void *devres_get(struct device *dev, void *new_res, dr_match_t match, void *match_data);</div><div class='add'>+void *devres_remove(struct device *dev, dr_release_t release, dr_match_t match, void *match_data);</div><div class='add'>+int devres_destroy(struct device *dev, dr_release_t release, dr_match_t match, void *match_data);</div><div class='add'>+int devres_release(struct device *dev, dr_release_t release, dr_match_t match, void *match_data);</div><div class='add'>+</div><div class='add'>+/* devres group */</div><div class='add'>+void * __must_check devres_open_group(struct device *dev, void *id, gfp_t gfp);</div><div class='add'>+void devres_close_group(struct device *dev, void *id);</div><div class='add'>+void devres_remove_group(struct device *dev, void *id);</div><div class='add'>+int devres_release_group(struct device *dev, void *id);</div><div class='add'>+</div><div class='add'>+/* managed devm_k.alloc/kfree for device drivers */</div><div class='add'>+void * __alloc_size(2)</div><div class='add'>+devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);</div><div class='add'>+void * __must_check __realloc_size(3)</div><div class='add'>+devm_krealloc(struct device *dev, void *ptr, size_t size, gfp_t gfp);</div><div class='add'>+static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return devm_kmalloc(dev, size, gfp | __GFP_ZERO);</div><div class='add'>+}</div><div class='add'>+static inline void *devm_kmalloc_array(struct device *dev, size_t n, size_t size, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	size_t bytes;</div><div class='add'>+</div><div class='add'>+	if (unlikely(check_mul_overflow(n, size, &amp;bytes)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return devm_kmalloc(dev, bytes, flags);</div><div class='add'>+}</div><div class='add'>+static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO);</div><div class='add'>+}</div><div class='add'>+static inline __realloc_size(3, 4) void * __must_check</div><div class='add'>+devm_krealloc_array(struct device *dev, void *p, size_t new_n, size_t new_size, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	size_t bytes;</div><div class='add'>+</div><div class='add'>+	if (unlikely(check_mul_overflow(new_n, new_size, &amp;bytes)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return devm_krealloc(dev, p, bytes, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devm_kfree(struct device *dev, const void *p);</div><div class='add'>+</div><div class='add'>+void * __realloc_size(3)</div><div class='add'>+devm_kmemdup(struct device *dev, const void *src, size_t len, gfp_t gfp);</div><div class='add'>+const void *</div><div class='add'>+devm_kmemdup_const(struct device *dev, const void *src, size_t len, gfp_t gfp);</div><div class='add'>+static inline void *devm_kmemdup_array(struct device *dev, const void *src,</div><div class='add'>+				       size_t n, size_t size, gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	return devm_kmemdup(dev, src, size_mul(size, n), flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char * __malloc</div><div class='add'>+devm_kstrdup(struct device *dev, const char *s, gfp_t gfp);</div><div class='add'>+const char *devm_kstrdup_const(struct device *dev, const char *s, gfp_t gfp);</div><div class='add'>+char * __printf(3, 0) __malloc</div><div class='add'>+devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt, va_list ap);</div><div class='add'>+char * __printf(3, 4) __malloc</div><div class='add'>+devm_kasprintf(struct device *dev, gfp_t gfp, const char *fmt, ...);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_alloc_percpu - Resource-managed alloc_percpu</div><div class='add'>+ * @dev: Device to allocate per-cpu memory for</div><div class='add'>+ * @type: Type to allocate per-cpu memory for</div><div class='add'>+ *</div><div class='add'>+ * Managed alloc_percpu. Per-cpu memory allocated with this function is</div><div class='add'>+ * automatically freed on driver detach.</div><div class='add'>+ *</div><div class='add'>+ * RETURNS:</div><div class='add'>+ * Pointer to allocated memory on success, NULL on failure.</div><div class='add'>+ */</div><div class='add'>+#define devm_alloc_percpu(dev, type)      \</div><div class='add'>+	((typeof(type) __percpu *)__devm_alloc_percpu((dev), sizeof(type), __alignof__(type)))</div><div class='add'>+</div><div class='add'>+void __percpu *__devm_alloc_percpu(struct device *dev, size_t size, size_t align);</div><div class='add'>+</div><div class='add'>+unsigned long devm_get_free_pages(struct device *dev, gfp_t gfp_mask, unsigned int order);</div><div class='add'>+void devm_free_pages(struct device *dev, unsigned long addr);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAS_IOMEM</div><div class='add'>+</div><div class='add'>+void __iomem *devm_ioremap_resource(struct device *dev, const struct resource *res);</div><div class='add'>+void __iomem *devm_ioremap_resource_wc(struct device *dev, const struct resource *res);</div><div class='add'>+</div><div class='add'>+void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int index,</div><div class='add'>+			    resource_size_t *size);</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void __iomem *devm_ioremap_resource(struct device *dev, const struct resource *res)</div><div class='add'>+{</div><div class='add'>+	return IOMEM_ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void __iomem *devm_ioremap_resource_wc(struct device *dev, const struct resource *res)</div><div class='add'>+{</div><div class='add'>+	return IOMEM_ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int index,</div><div class='add'>+			    resource_size_t *size)</div><div class='add'>+{</div><div class='add'>+	return IOMEM_ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* allows to add/remove a custom action to devres stack */</div><div class='add'>+int devm_remove_action_nowarn(struct device *dev, void (*action)(void *), void *data);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_remove_action() - removes previously added custom action</div><div class='add'>+ * @dev: Device that owns the action</div><div class='add'>+ * @action: Function implementing the action</div><div class='add'>+ * @data: Pointer to data passed to @action implementation</div><div class='add'>+ *</div><div class='add'>+ * Removes instance of @action previously added by devm_add_action().</div><div class='add'>+ * Both action and data should match one of the existing entries.</div><div class='add'>+ */</div><div class='add'>+static inline</div><div class='add'>+void devm_remove_action(struct device *dev, void (*action)(void *), void *data)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(devm_remove_action_nowarn(dev, action, data));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void devm_release_action(struct device *dev, void (*action)(void *), void *data);</div><div class='add'>+</div><div class='add'>+int __devm_add_action(struct device *dev, void (*action)(void *), void *data, const char *name);</div><div class='add'>+#define devm_add_action(dev, action, data) \</div><div class='add'>+	__devm_add_action(dev, action, data, #action)</div><div class='add'>+</div><div class='add'>+static inline int __devm_add_action_or_reset(struct device *dev, void (*action)(void *),</div><div class='add'>+					     void *data, const char *name)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __devm_add_action(dev, action, data, name);</div><div class='add'>+	if (ret)</div><div class='add'>+		action(data);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#define devm_add_action_or_reset(dev, action, data) \</div><div class='add'>+	__devm_add_action_or_reset(dev, action, data, #action)</div><div class='add'>+</div><div class='add'>+bool devm_is_action_added(struct device *dev, void (*action)(void *), void *data);</div><div class='add'>+</div><div class='add'>+#endif /* _DEVICE_DEVRES_H_ */</div><div class='head'>diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h<br/>index 7738f458995f..cd8e0f0a634b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/device/driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device/driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/device/driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/device/driver.h</a></div><div class='hunk'>@@ -146,18 +146,18 @@ struct driver_attribute {</div><div class='ctx'> #define DRIVER_ATTR_WO(_name) \</div><div class='ctx'> 	struct driver_attribute driver_attr_##_name = __ATTR_WO(_name)</div><div class='ctx'> </div><div class='del'>-int __must_check driver_create_file(struct device_driver *driver,</div><div class='add'>+int __must_check driver_create_file(const struct device_driver *driver,</div><div class='ctx'> 				    const struct driver_attribute *attr);</div><div class='del'>-void driver_remove_file(struct device_driver *driver,</div><div class='add'>+void driver_remove_file(const struct device_driver *driver,</div><div class='ctx'> 			const struct driver_attribute *attr);</div><div class='ctx'> </div><div class='ctx'> int driver_set_override(struct device *dev, const char **override,</div><div class='ctx'> 			const char *s, size_t len);</div><div class='ctx'> int __must_check driver_for_each_device(struct device_driver *drv, struct device *start,</div><div class='del'>-					void *data, int (*fn)(struct device *dev, void *));</div><div class='del'>-struct device *driver_find_device(struct device_driver *drv,</div><div class='add'>+					void *data, device_iter_t fn);</div><div class='add'>+struct device *driver_find_device(const struct device_driver *drv,</div><div class='ctx'> 				  struct device *start, const void *data,</div><div class='del'>-				  int (*match)(struct device *dev, const void *data));</div><div class='add'>+				  device_match_t match);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * driver_find_device_by_name - device iterator for locating a particular device</div><div class='hunk'>@@ -165,7 +165,7 @@ struct device *driver_find_device(struct device_driver *drv,</div><div class='ctx'>  * @drv: the driver we're iterating</div><div class='ctx'>  * @name: name of the device to match</div><div class='ctx'>  */</div><div class='del'>-static inline struct device *driver_find_device_by_name(struct device_driver *drv,</div><div class='add'>+static inline struct device *driver_find_device_by_name(const struct device_driver *drv,</div><div class='ctx'> 							const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	return driver_find_device(drv, NULL, name, device_match_name);</div><div class='hunk'>@@ -178,7 +178,7 @@ static inline struct device *driver_find_device_by_name(struct device_driver *dr</div><div class='ctx'>  * @np: of_node pointer to match.</div><div class='ctx'>  */</div><div class='ctx'> static inline struct device *</div><div class='del'>-driver_find_device_by_of_node(struct device_driver *drv,</div><div class='add'>+driver_find_device_by_of_node(const struct device_driver *drv,</div><div class='ctx'> 			      const struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	return driver_find_device(drv, NULL, np, device_match_of_node);</div><div class='hunk'>@@ -203,13 +203,13 @@ driver_find_device_by_fwnode(struct device_driver *drv,</div><div class='ctx'>  * @drv: the driver we're iterating</div><div class='ctx'>  * @devt: devt pointer to match.</div><div class='ctx'>  */</div><div class='del'>-static inline struct device *driver_find_device_by_devt(struct device_driver *drv,</div><div class='add'>+static inline struct device *driver_find_device_by_devt(const struct device_driver *drv,</div><div class='ctx'> 							dev_t devt)</div><div class='ctx'> {</div><div class='ctx'> 	return driver_find_device(drv, NULL, &amp;devt, device_match_devt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct device *driver_find_next_device(struct device_driver *drv,</div><div class='add'>+static inline struct device *driver_find_next_device(const struct device_driver *drv,</div><div class='ctx'> 						     struct device *start)</div><div class='ctx'> {</div><div class='ctx'> 	return driver_find_device(drv, start, NULL, device_match_any);</div><div class='hunk'>@@ -223,14 +223,14 @@ static inline struct device *driver_find_next_device(struct device_driver *drv,</div><div class='ctx'>  * @adev: ACPI_COMPANION device to match.</div><div class='ctx'>  */</div><div class='ctx'> static inline struct device *</div><div class='del'>-driver_find_device_by_acpi_dev(struct device_driver *drv,</div><div class='add'>+driver_find_device_by_acpi_dev(const struct device_driver *drv,</div><div class='ctx'> 			       const struct acpi_device *adev)</div><div class='ctx'> {</div><div class='ctx'> 	return driver_find_device(drv, NULL, adev, device_match_acpi_dev);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline struct device *</div><div class='del'>-driver_find_device_by_acpi_dev(struct device_driver *drv, const void *adev)</div><div class='add'>+driver_find_device_by_acpi_dev(const struct device_driver *drv, const void *adev)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/device/faux.h b/include/linux/device/faux.h<br/>new file mode 100644<br/>index 000000000000..9f43c0e46aa4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/device/faux.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/device/faux.h</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;</div><div class='add'>+ * Copyright (c) 2025 The Linux Foundation</div><div class='add'>+ *</div><div class='add'>+ * A "simple" faux bus that allows devices to be created and added</div><div class='add'>+ * automatically to it.  This is to be used whenever you need to create a</div><div class='add'>+ * device that is not associated with any "real" system resources, and do</div><div class='add'>+ * not want to have to deal with a bus/driver binding logic.  It is</div><div class='add'>+ * intended to be very simple, with only a create and a destroy function</div><div class='add'>+ * available.</div><div class='add'>+ */</div><div class='add'>+#ifndef _FAUX_DEVICE_H_</div><div class='add'>+#define _FAUX_DEVICE_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct faux_device - a "faux" device</div><div class='add'>+ * @dev:	internal struct device of the object</div><div class='add'>+ *</div><div class='add'>+ * A simple faux device that can be created/destroyed.  To be used when a</div><div class='add'>+ * driver only needs to have a device to "hang" something off.  This can be</div><div class='add'>+ * used for downloading firmware or other basic tasks.  Use this instead of</div><div class='add'>+ * a struct platform_device if the device has no resources assigned to</div><div class='add'>+ * it at all.</div><div class='add'>+ */</div><div class='add'>+struct faux_device {</div><div class='add'>+	struct device dev;</div><div class='add'>+};</div><div class='add'>+#define to_faux_device(x) container_of_const((x), struct faux_device, dev)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct faux_device_ops - a set of callbacks for a struct faux_device</div><div class='add'>+ * @probe:	called when a faux device is probed by the driver core</div><div class='add'>+ *		before the device is fully bound to the internal faux bus</div><div class='add'>+ *		code.  If probe succeeds, return 0, otherwise return a</div><div class='add'>+ *		negative error number to stop the probe sequence from</div><div class='add'>+ *		succeeding.</div><div class='add'>+ * @remove:	called when a faux device is removed from the system</div><div class='add'>+ *</div><div class='add'>+ * Both @probe and @remove are optional, if not needed, set to NULL.</div><div class='add'>+ */</div><div class='add'>+struct faux_device_ops {</div><div class='add'>+	int (*probe)(struct faux_device *faux_dev);</div><div class='add'>+	void (*remove)(struct faux_device *faux_dev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct faux_device *faux_device_create(const char *name,</div><div class='add'>+				       struct device *parent,</div><div class='add'>+				       const struct faux_device_ops *faux_ops);</div><div class='add'>+struct faux_device *faux_device_create_with_groups(const char *name,</div><div class='add'>+						   struct device *parent,</div><div class='add'>+						   const struct faux_device_ops *faux_ops,</div><div class='add'>+						   const struct attribute_group **groups);</div><div class='add'>+void faux_device_destroy(struct faux_device *faux_dev);</div><div class='add'>+</div><div class='add'>+static inline void *faux_device_get_drvdata(const struct faux_device *faux_dev)</div><div class='add'>+{</div><div class='add'>+	return dev_get_drvdata(&amp;faux_dev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void faux_device_set_drvdata(struct faux_device *faux_dev, void *data)</div><div class='add'>+{</div><div class='add'>+	dev_set_drvdata(&amp;faux_dev-&gt;dev, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _FAUX_DEVICE_H_ */</div><div class='head'>diff --git a/include/linux/device_cgroup.h b/include/linux/device_cgroup.h<br/>index d02f32b7514e..0864773a57e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/device_cgroup.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/device_cgroup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/device_cgroup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/device_cgroup.h</a></div><div class='hunk'>@@ -18,15 +18,16 @@ static inline int devcgroup_inode_permission(struct inode *inode, int mask)</div><div class='ctx'> {</div><div class='ctx'> 	short type, access = 0;</div><div class='ctx'> </div><div class='add'>+	if (likely(!S_ISBLK(inode-&gt;i_mode) &amp;&amp; !S_ISCHR(inode-&gt;i_mode)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (likely(!inode-&gt;i_rdev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISBLK(inode-&gt;i_mode))</div><div class='ctx'> 		type = DEVCG_DEV_BLOCK;</div><div class='del'>-	else if (S_ISCHR(inode-&gt;i_mode))</div><div class='add'>+	else /* S_ISCHR by the test above */</div><div class='ctx'> 		type = DEVCG_DEV_CHAR;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; MAY_WRITE)</div><div class='ctx'> 		access |= DEVCG_ACC_WRITE;</div><div class='head'>diff --git a/include/linux/devm-helpers.h b/include/linux/devm-helpers.h<br/>index 74891802200d..708ca9131402 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/devm-helpers.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/devm-helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/devm-helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/devm-helpers.h</a></div><div class='hunk'>@@ -41,7 +41,7 @@ static inline void devm_delayed_work_drop(void *res)</div><div class='ctx'>  * detached. A few drivers need delayed work which must be cancelled before</div><div class='ctx'>  * driver is detached to avoid accessing removed resources.</div><div class='ctx'>  * devm_delayed_work_autocancel() can be used to omit the explicit</div><div class='del'>- * cancelleation when driver is detached.</div><div class='add'>+ * cancellation when driver is detached.</div><div class='ctx'>  */</div><div class='ctx'> static inline int devm_delayed_work_autocancel(struct device *dev,</div><div class='ctx'> 					       struct delayed_work *w,</div><div class='hunk'>@@ -66,7 +66,7 @@ static inline void devm_work_drop(void *res)</div><div class='ctx'>  * A few drivers need to queue work which must be cancelled before driver</div><div class='ctx'>  * is detached to avoid accessing removed resources.</div><div class='ctx'>  * devm_work_autocancel() can be used to omit the explicit</div><div class='del'>- * cancelleation when driver is detached.</div><div class='add'>+ * cancellation when driver is detached.</div><div class='ctx'>  */</div><div class='ctx'> static inline int devm_work_autocancel(struct device *dev,</div><div class='ctx'> 				       struct work_struct *w,</div><div class='head'>diff --git a/include/linux/dfl.h b/include/linux/dfl.h<br/>index 0a7a00a0ee7f..1f02db0c1897 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dfl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dfl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dfl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dfl.h</a></div><div class='hunk'>@@ -71,7 +71,7 @@ struct dfl_driver {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_dfl_dev(d) container_of(d, struct dfl_device, dev)</div><div class='del'>-#define to_dfl_drv(d) container_of(d, struct dfl_driver, drv)</div><div class='add'>+#define to_dfl_drv(d) container_of_const(d, struct dfl_driver, drv)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * use a macro to avoid include chaining to get THIS_MODULE.</div><div class='head'>diff --git a/include/linux/dibs.h b/include/linux/dibs.h<br/>new file mode 100644<br/>index 000000000000..c75607f8a5cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dibs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dibs.h</a></div><div class='hunk'>@@ -0,0 +1,464 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ *  Direct Internal Buffer Sharing</div><div class='add'>+ *</div><div class='add'>+ *  Definitions for the DIBS module</div><div class='add'>+ *</div><div class='add'>+ *  Copyright IBM Corp. 2025</div><div class='add'>+ */</div><div class='add'>+#ifndef _DIBS_H</div><div class='add'>+#define _DIBS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+</div><div class='add'>+/* DIBS - Direct Internal Buffer Sharing - concept</div><div class='add'>+ * -----------------------------------------------</div><div class='add'>+ * In the case of multiple system sharing the same hardware, dibs fabrics can</div><div class='add'>+ * provide dibs devices to these systems. The systems use dibs devices of the</div><div class='add'>+ * same fabric to communicate via dmbs (Direct Memory Buffers). Each dmb has</div><div class='add'>+ * exactly one owning local dibs device and one remote using dibs device, that</div><div class='add'>+ * is authorized to write into this dmb. This access control is provided by the</div><div class='add'>+ * dibs fabric.</div><div class='add'>+ *</div><div class='add'>+ * Because the access to the dmb is based on access to physical memory, it is</div><div class='add'>+ * lossless and synchronous. The remote devices can directly access any offset</div><div class='add'>+ * of the dmb.</div><div class='add'>+ *</div><div class='add'>+ * Dibs fabrics, dibs devices and dmbs are identified by tokens and ids.</div><div class='add'>+ * Dibs fabric id is unique within the same hardware (with the exception of the</div><div class='add'>+ * dibs loopback fabric), dmb token is unique within the same fabric, dibs</div><div class='add'>+ * device gids are guaranteed to be unique within the same fabric and</div><div class='add'>+ * statistically likely to be globally unique. The exchange of these tokens and</div><div class='add'>+ * ids between the systems is not part of the dibs concept.</div><div class='add'>+ *</div><div class='add'>+ * The dibs layer provides an abstraction between dibs device drivers and dibs</div><div class='add'>+ * clients.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* DMB - Direct Memory Buffer</div><div class='add'>+ * --------------------------</div><div class='add'>+ * A dibs client provides a dmb as input buffer for a local receiving</div><div class='add'>+ * dibs device for exactly one (remote) sending dibs device. Only this</div><div class='add'>+ * sending device can send data into this dmb using move_data(). Sender</div><div class='add'>+ * and receiver can be the same device. A dmb belongs to exactly one client.</div><div class='add'>+ */</div><div class='add'>+struct dibs_dmb {</div><div class='add'>+	/* tok - Token for this dmb</div><div class='add'>+	 * Used by remote and local devices and clients to address this dmb.</div><div class='add'>+	 * Provided by dibs fabric. Unique per dibs fabric.</div><div class='add'>+	 */</div><div class='add'>+	u64 dmb_tok;</div><div class='add'>+	/* rgid - GID of designated remote sending device */</div><div class='add'>+	uuid_t rgid;</div><div class='add'>+	/* cpu_addr - buffer address */</div><div class='add'>+	void *cpu_addr;</div><div class='add'>+	/* len - buffer length */</div><div class='add'>+	u32 dmb_len;</div><div class='add'>+	/* idx - Index of this DMB on this receiving device */</div><div class='add'>+	u32 idx;</div><div class='add'>+	/* VLAN support (deprecated)</div><div class='add'>+	 * In order to write into a vlan-tagged dmb, the remote device needs</div><div class='add'>+	 * to belong to the this vlan</div><div class='add'>+	 */</div><div class='add'>+	u32 vlan_valid;</div><div class='add'>+	u32 vlan_id;</div><div class='add'>+	/* optional, used by device driver */</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DIBS events</div><div class='add'>+ * -----------</div><div class='add'>+ * Dibs devices can optionally notify dibs clients about events that happened</div><div class='add'>+ * in the fabric or at the remote device or remote dmb.</div><div class='add'>+ */</div><div class='add'>+enum dibs_event_type {</div><div class='add'>+	/* Buffer event, e.g. a remote dmb was unregistered */</div><div class='add'>+	DIBS_BUF_EVENT,</div><div class='add'>+	/* Device event, e.g. a remote dibs device was disabled */</div><div class='add'>+	DIBS_DEV_EVENT,</div><div class='add'>+	/* Software event, a dibs client can send an event signal to a</div><div class='add'>+	 * remote dibs device.</div><div class='add'>+	 */</div><div class='add'>+	DIBS_SW_EVENT,</div><div class='add'>+	DIBS_OTHER_TYPE };</div><div class='add'>+</div><div class='add'>+enum dibs_event_subtype {</div><div class='add'>+	DIBS_BUF_UNREGISTERED,</div><div class='add'>+	DIBS_DEV_DISABLED,</div><div class='add'>+	DIBS_DEV_ERR_STATE,</div><div class='add'>+	DIBS_OTHER_SUBTYPE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dibs_event {</div><div class='add'>+	u32 type;</div><div class='add'>+	u32 subtype;</div><div class='add'>+	/* uuid_null if invalid */</div><div class='add'>+	uuid_t gid;</div><div class='add'>+	/* zero if invalid */</div><div class='add'>+	u64 buffer_tok;</div><div class='add'>+	u64 time;</div><div class='add'>+	/* additional data or zero */</div><div class='add'>+	u64 data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dibs_dev;</div><div class='add'>+</div><div class='add'>+/* DIBS client</div><div class='add'>+ * -----------</div><div class='add'>+ */</div><div class='add'>+#define MAX_DIBS_CLIENTS	8</div><div class='add'>+#define NO_DIBS_CLIENT		0xff</div><div class='add'>+/* All dibs clients have access to all dibs devices.</div><div class='add'>+ * A dibs client provides the following functions to be called by dibs layer or</div><div class='add'>+ * dibs device drivers:</div><div class='add'>+ */</div><div class='add'>+struct dibs_client_ops {</div><div class='add'>+	/**</div><div class='add'>+	 *  add_dev() - add a dibs device</div><div class='add'>+	 *  @dev: device that was added</div><div class='add'>+	 *</div><div class='add'>+	 * Will be called during dibs_register_client() for all existing</div><div class='add'>+	 * dibs devices and whenever a new dibs device is registered.</div><div class='add'>+	 * dev is usable until dibs_client.remove() is called.</div><div class='add'>+	 * *dev is protected by device refcounting.</div><div class='add'>+	 */</div><div class='add'>+	void (*add_dev)(struct dibs_dev *dev);</div><div class='add'>+	/**</div><div class='add'>+	 * del_dev() - remove a dibs device</div><div class='add'>+	 * @dev: device to be removed</div><div class='add'>+	 *</div><div class='add'>+	 * Will be called whenever a dibs device is removed.</div><div class='add'>+	 * Will be called during dibs_unregister_client() for all existing</div><div class='add'>+	 * dibs devices and whenever a dibs device is unregistered.</div><div class='add'>+	 * The device has already stopped initiative for this client:</div><div class='add'>+	 * No new handlers will be started.</div><div class='add'>+	 * The device is no longer usable by this client after this call.</div><div class='add'>+	 */</div><div class='add'>+	void (*del_dev)(struct dibs_dev *dev);</div><div class='add'>+	/**</div><div class='add'>+	 * handle_irq() - Handle signaling for a DMB</div><div class='add'>+	 * @dev: device that owns the dmb</div><div class='add'>+	 * @idx: Index of the dmb that got signalled</div><div class='add'>+	 * @dmbemask: signaling mask of the dmb</div><div class='add'>+	 *</div><div class='add'>+	 * Handle signaling for a dmb that was registered by this client</div><div class='add'>+	 * for this device.</div><div class='add'>+	 * The dibs device can coalesce multiple signaling triggers into a</div><div class='add'>+	 * single call of handle_irq(). dmbemask can be used to indicate</div><div class='add'>+	 * different kinds of triggers.</div><div class='add'>+	 *</div><div class='add'>+	 * Context: Called in IRQ context by dibs device driver</div><div class='add'>+	 */</div><div class='add'>+	void (*handle_irq)(struct dibs_dev *dev, unsigned int idx,</div><div class='add'>+			   u16 dmbemask);</div><div class='add'>+	/**</div><div class='add'>+	 * handle_event() - Handle control information sent by device</div><div class='add'>+	 * @dev: device reporting the event</div><div class='add'>+	 * @event: ism event structure</div><div class='add'>+	 *</div><div class='add'>+	 * * Context: Called in IRQ context by dibs device driver</div><div class='add'>+	 */</div><div class='add'>+	void (*handle_event)(struct dibs_dev *dev,</div><div class='add'>+			     const struct dibs_event *event);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dibs_client {</div><div class='add'>+	/* client name for logging and debugging purposes */</div><div class='add'>+	const char *name;</div><div class='add'>+	const struct dibs_client_ops *ops;</div><div class='add'>+	/* client index - provided and used by dibs layer */</div><div class='add'>+	u8 id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Functions to be called by dibs clients:</div><div class='add'>+ */</div><div class='add'>+/**</div><div class='add'>+ * dibs_register_client() - register a client with dibs layer</div><div class='add'>+ * @client: this client</div><div class='add'>+ *</div><div class='add'>+ * Will call client-&gt;ops-&gt;add_dev() for all existing dibs devices.</div><div class='add'>+ * Return: zero on success.</div><div class='add'>+ */</div><div class='add'>+int dibs_register_client(struct dibs_client *client);</div><div class='add'>+/**</div><div class='add'>+ * dibs_unregister_client() - unregister a client with dibs layer</div><div class='add'>+ * @client: this client</div><div class='add'>+ *</div><div class='add'>+ * Will call client-&gt;ops-&gt;del_dev() for all existing dibs devices.</div><div class='add'>+ * Return: zero on success.</div><div class='add'>+ */</div><div class='add'>+int dibs_unregister_client(struct dibs_client *client);</div><div class='add'>+</div><div class='add'>+/* dibs clients can call dibs device ops. */</div><div class='add'>+</div><div class='add'>+/* DIBS devices</div><div class='add'>+ * ------------</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Defined fabric id / CHID for all loopback devices:</div><div class='add'>+ * All dibs loopback devices report this fabric id. In this case devices with</div><div class='add'>+ * the same fabric id can NOT communicate via dibs. Only loopback devices with</div><div class='add'>+ * the same dibs device gid can communicate (=same device with itself).</div><div class='add'>+ */</div><div class='add'>+#define DIBS_LOOPBACK_FABRIC	0xFFFF</div><div class='add'>+</div><div class='add'>+/* A dibs device provides the following functions to be called by dibs clients.</div><div class='add'>+ * They are mandatory, unless marked 'optional'.</div><div class='add'>+ */</div><div class='add'>+struct dibs_dev_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * get_fabric_id()</div><div class='add'>+	 * @dev: local dibs device</div><div class='add'>+	 *</div><div class='add'>+	 * Only devices on the same dibs fabric can communicate. Fabric_id is</div><div class='add'>+	 * unique inside the same HW system. Use fabric_id for fast negative</div><div class='add'>+	 * checks, but only query_remote_gid() can give a reliable positive</div><div class='add'>+	 * answer:</div><div class='add'>+	 * Different fabric_id: dibs is not possible</div><div class='add'>+	 * Same fabric_id: dibs may be possible or not</div><div class='add'>+	 *		   (e.g. different HW systems)</div><div class='add'>+	 * EXCEPTION: DIBS_LOOPBACK_FABRIC denotes an ism_loopback device</div><div class='add'>+	 *	      that can only communicate with itself. Use dibs_dev.gid</div><div class='add'>+	 *	      or query_remote_gid()to determine whether sender and</div><div class='add'>+	 *	      receiver use the same ism_loopback device.</div><div class='add'>+	 * Return: 2 byte dibs fabric id</div><div class='add'>+	 */</div><div class='add'>+	u16 (*get_fabric_id)(struct dibs_dev *dev);</div><div class='add'>+	/**</div><div class='add'>+	 * query_remote_gid()</div><div class='add'>+	 * @dev: local dibs device</div><div class='add'>+	 * @rgid: gid of remote dibs device</div><div class='add'>+	 * @vid_valid: if zero, vid will be ignored;</div><div class='add'>+	 *	       deprecated, ignored if device does not support vlan</div><div class='add'>+	 * @vid: VLAN id; deprecated, ignored if device does not support vlan</div><div class='add'>+	 *</div><div class='add'>+	 * Query whether a remote dibs device is reachable via this local device</div><div class='add'>+	 * and this vlan id.</div><div class='add'>+	 * Return: 0 if remote gid is reachable.</div><div class='add'>+	 */</div><div class='add'>+	int (*query_remote_gid)(struct dibs_dev *dev, const uuid_t *rgid,</div><div class='add'>+				u32 vid_valid, u32 vid);</div><div class='add'>+	/**</div><div class='add'>+	 * max_dmbs()</div><div class='add'>+	 * Return: Max number of DMBs that can be registered for this kind of</div><div class='add'>+	 *	   dibs_dev</div><div class='add'>+	 */</div><div class='add'>+	int (*max_dmbs)(void);</div><div class='add'>+	/**</div><div class='add'>+	 * register_dmb() - allocate and register a dmb</div><div class='add'>+	 * @dev: dibs device</div><div class='add'>+	 * @dmb: dmb struct to be registered</div><div class='add'>+	 * @client: dibs client</div><div class='add'>+	 * @vid: VLAN id; deprecated, ignored if device does not support vlan</div><div class='add'>+	 *</div><div class='add'>+	 * The following fields of dmb must provide valid input:</div><div class='add'>+	 *	@rgid: gid of remote user device</div><div class='add'>+	 *	@dmb_len: buffer length</div><div class='add'>+	 *	@idx: Optionally:requested idx (if non-zero)</div><div class='add'>+	 *	@vlan_valid: if zero, vlan_id will be ignored;</div><div class='add'>+	 *		     deprecated, ignored if device does not support vlan</div><div class='add'>+	 *	@vlan_id: deprecated, ignored if device does not support vlan</div><div class='add'>+	 * Upon return in addition the following fields will be valid:</div><div class='add'>+	 *	@dmb_tok: for usage by remote and local devices and clients</div><div class='add'>+	 *	@cpu_addr: allocated buffer</div><div class='add'>+	 *	@idx: dmb index, unique per dibs device</div><div class='add'>+	 *	@dma_addr: to be used by device driver,if applicable</div><div class='add'>+	 *</div><div class='add'>+	 * Allocate a dmb buffer and register it with this device and for this</div><div class='add'>+	 * client.</div><div class='add'>+	 * Return: zero on success</div><div class='add'>+	 */</div><div class='add'>+	int (*register_dmb)(struct dibs_dev *dev, struct dibs_dmb *dmb,</div><div class='add'>+			    struct dibs_client *client);</div><div class='add'>+	/**</div><div class='add'>+	 * unregister_dmb() - unregister and free a dmb</div><div class='add'>+	 * @dev: dibs device</div><div class='add'>+	 * @dmb: dmb struct to be unregistered</div><div class='add'>+	 * The following fields of dmb must provide valid input:</div><div class='add'>+	 *	@dmb_tok</div><div class='add'>+	 *	@cpu_addr</div><div class='add'>+	 *	@idx</div><div class='add'>+	 *</div><div class='add'>+	 * Free dmb.cpu_addr and unregister the dmb from this device.</div><div class='add'>+	 * Return: zero on success</div><div class='add'>+	 */</div><div class='add'>+	int (*unregister_dmb)(struct dibs_dev *dev, struct dibs_dmb *dmb);</div><div class='add'>+	/**</div><div class='add'>+	 * move_data() - write into a remote dmb</div><div class='add'>+	 * @dev: Local sending dibs device</div><div class='add'>+	 * @dmb_tok: Token of the remote dmb</div><div class='add'>+	 * @idx: signaling index in dmbemask</div><div class='add'>+	 * @sf: signaling flag;</div><div class='add'>+	 *      if true, idx will be turned on at target dmbemask mask</div><div class='add'>+	 *      and target device will be signaled.</div><div class='add'>+	 * @offset: offset within target dmb</div><div class='add'>+	 * @data: pointer to data to be sent</div><div class='add'>+	 * @size: length of data to be sent, can be zero.</div><div class='add'>+	 *</div><div class='add'>+	 * Use dev to write data of size at offset into a remote dmb</div><div class='add'>+	 * identified by dmb_tok. Data is moved synchronously, *data can</div><div class='add'>+	 * be freed when this function returns.</div><div class='add'>+	 *</div><div class='add'>+	 * If signaling flag (sf) is true, bit number idx bit will be turned</div><div class='add'>+	 * on in the dmbemask mask when handle_irq() is called at the remote</div><div class='add'>+	 * dibs client that owns the target dmb. The target device may chose</div><div class='add'>+	 * to coalesce the signaling triggers of multiple move_data() calls</div><div class='add'>+	 * to the same target dmb into a single handle_irq() call.</div><div class='add'>+	 * Return: zero on success</div><div class='add'>+	 */</div><div class='add'>+	int (*move_data)(struct dibs_dev *dev, u64 dmb_tok, unsigned int idx,</div><div class='add'>+			 bool sf, unsigned int offset, void *data,</div><div class='add'>+			 unsigned int size);</div><div class='add'>+	/**</div><div class='add'>+	 * add_vlan_id() - add dibs device to vlan (optional, deprecated)</div><div class='add'>+	 * @dev: dibs device</div><div class='add'>+	 * @vlan_id: vlan id</div><div class='add'>+	 *</div><div class='add'>+	 * In order to write into a vlan-tagged dmb, the remote device needs</div><div class='add'>+	 * to belong to the this vlan. A device can belong to more than 1 vlan.</div><div class='add'>+	 * Any device can access an untagged dmb.</div><div class='add'>+	 * Deprecated, only supported for backwards compatibility.</div><div class='add'>+	 * Return: zero on success</div><div class='add'>+	 */</div><div class='add'>+	int (*add_vlan_id)(struct dibs_dev *dev, u64 vlan_id);</div><div class='add'>+	/**</div><div class='add'>+	 * del_vlan_id() - remove dibs device from vlan (optional, deprecated)</div><div class='add'>+	 * @dev: dibs device</div><div class='add'>+	 * @vlan_id: vlan id</div><div class='add'>+	 * Return: zero on success</div><div class='add'>+	 */</div><div class='add'>+	int (*del_vlan_id)(struct dibs_dev *dev, u64 vlan_id);</div><div class='add'>+	/**</div><div class='add'>+	 * signal_event() - trigger an event at a remote dibs device (optional)</div><div class='add'>+	 * @dev: local dibs device</div><div class='add'>+	 * @rgid: gid of remote dibs device</div><div class='add'>+	 * trigger_irq: zero: notification may be coalesced with other events</div><div class='add'>+	 *		non-zero: notify immediately</div><div class='add'>+	 * @subtype: 4 byte event code, meaning is defined by dibs client</div><div class='add'>+	 * @data: 8 bytes of additional information,</div><div class='add'>+	 *	  meaning is defined by dibs client</div><div class='add'>+	 *</div><div class='add'>+	 * dibs devices can offer support for sending a control event of type</div><div class='add'>+	 * EVENT_SWR to a remote dibs device.</div><div class='add'>+	 * NOTE: handle_event() will be called for all registered dibs clients</div><div class='add'>+	 * at the remote device.</div><div class='add'>+	 * Return: zero on success</div><div class='add'>+	 */</div><div class='add'>+	int (*signal_event)(struct dibs_dev *dev, const uuid_t *rgid,</div><div class='add'>+			    u32 trigger_irq, u32 event_code, u64 info);</div><div class='add'>+	/**</div><div class='add'>+	 * support_mmapped_rdmb() - can this device provide memory mapped</div><div class='add'>+	 *			    remote dmbs? (optional)</div><div class='add'>+	 * @dev: dibs device</div><div class='add'>+	 *</div><div class='add'>+	 * A dibs device can provide a kernel address + length, that represent</div><div class='add'>+	 * a remote target dmb (like MMIO). Alternatively to calling</div><div class='add'>+	 * move_data(), a dibs client can write into such a ghost-send-buffer</div><div class='add'>+	 * (= to this kernel address) and the data will automatically</div><div class='add'>+	 * immediately appear in the target dmb, even without calling</div><div class='add'>+	 * move_data().</div><div class='add'>+	 *</div><div class='add'>+	 * Either all 3 function pointers for support_dmb_nocopy(),</div><div class='add'>+	 * attach_dmb() and detach_dmb() are defined, or all of them must</div><div class='add'>+	 * be NULL.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: non-zero, if memory mapped remote dmbs are supported.</div><div class='add'>+	 */</div><div class='add'>+	int (*support_mmapped_rdmb)(struct dibs_dev *dev);</div><div class='add'>+	/**</div><div class='add'>+	 * attach_dmb() - attach local memory to a remote dmb</div><div class='add'>+	 * @dev: Local sending ism device</div><div class='add'>+	 * @dmb: all other parameters are passed in the form of a</div><div class='add'>+	 *	 dmb struct</div><div class='add'>+	 *	 TODO: (THIS IS CONFUSING, should be changed)</div><div class='add'>+	 *  dmb_tok: (in) Token of the remote dmb, we want to attach to</div><div class='add'>+	 *  cpu_addr: (out) MMIO address</div><div class='add'>+	 *  dma_addr: (out) MMIO address (if applicable, invalid otherwise)</div><div class='add'>+	 *  dmb_len: (out) length of local MMIO region,</div><div class='add'>+	 *           equal to length of remote DMB.</div><div class='add'>+	 *  sba_idx: (out) index of remote dmb (NOT HELPFUL, should be removed)</div><div class='add'>+	 *</div><div class='add'>+	 * Provides a memory address to the sender that can be used to</div><div class='add'>+	 * directly write into the remote dmb.</div><div class='add'>+	 * Memory is available until detach_dmb is called</div><div class='add'>+	 *</div><div class='add'>+	 * Return: Zero upon success, Error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*attach_dmb)(struct dibs_dev *dev, struct dibs_dmb *dmb);</div><div class='add'>+	/**</div><div class='add'>+	 * detach_dmb() - Detach the ghost buffer from a remote dmb</div><div class='add'>+	 * @dev: ism device</div><div class='add'>+	 * @token: dmb token of the remote dmb</div><div class='add'>+	 *</div><div class='add'>+	 * No need to free cpu_addr.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: Zero upon success, Error code otherwise</div><div class='add'>+	 */</div><div class='add'>+	int (*detach_dmb)(struct dibs_dev *dev, u64 token);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dibs_dev {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct device dev;</div><div class='add'>+	/* To be filled by device driver, before calling dibs_dev_add(): */</div><div class='add'>+	const struct dibs_dev_ops *ops;</div><div class='add'>+	uuid_t gid;</div><div class='add'>+	/* priv pointer for device driver */</div><div class='add'>+	void *drv_priv;</div><div class='add'>+</div><div class='add'>+	/* priv pointer per client; for client usage only */</div><div class='add'>+	void *priv[MAX_DIBS_CLIENTS];</div><div class='add'>+</div><div class='add'>+	/* get this lock before accessing any of the fields below */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	/* array of client ids indexed by dmb idx;</div><div class='add'>+	 * can be used as indices into priv and subs arrays</div><div class='add'>+	 */</div><div class='add'>+	u8 *dmb_clientid_arr;</div><div class='add'>+	/* Sparse array of all ISM clients */</div><div class='add'>+	struct dibs_client *subs[MAX_DIBS_CLIENTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void dibs_set_priv(struct dibs_dev *dev,</div><div class='add'>+				 struct dibs_client *client, void *priv)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;priv[client-&gt;id] = priv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *dibs_get_priv(struct dibs_dev *dev,</div><div class='add'>+				  struct dibs_client *client)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;priv[client-&gt;id];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------- End of client-only functions ----------- */</div><div class='add'>+</div><div class='add'>+/* Functions to be called by dibs device drivers:</div><div class='add'>+ */</div><div class='add'>+/**</div><div class='add'>+ * dibs_dev_alloc() - allocate and reference device structure</div><div class='add'>+ *</div><div class='add'>+ * The following fields will be valid upon successful return: dev</div><div class='add'>+ * NOTE: Use put_device(dibs_get_dev(@dibs)) to give up your reference instead</div><div class='add'>+ * of freeing @dibs @dev directly once you have successfully called this</div><div class='add'>+ * function.</div><div class='add'>+ * Return: Pointer to dibs device structure</div><div class='add'>+ */</div><div class='add'>+struct dibs_dev *dibs_dev_alloc(void);</div><div class='add'>+/**</div><div class='add'>+ * dibs_dev_add() - register with dibs layer and all clients</div><div class='add'>+ * @dibs: dibs device</div><div class='add'>+ *</div><div class='add'>+ * The following fields must be valid upon entry: dev, ops, drv_priv</div><div class='add'>+ * All fields will be valid upon successful return.</div><div class='add'>+ * Return: zero on success</div><div class='add'>+ */</div><div class='add'>+int dibs_dev_add(struct dibs_dev *dibs);</div><div class='add'>+/**</div><div class='add'>+ * dibs_dev_del() - unregister from dibs layer and all clients</div><div class='add'>+ * @dibs: dibs device</div><div class='add'>+ */</div><div class='add'>+void dibs_dev_del(struct dibs_dev *dibs);</div><div class='add'>+</div><div class='add'>+#endif	/* _DIBS_H */</div><div class='head'>diff --git a/include/linux/dim.h b/include/linux/dim.h<br/>index f343bc9aa2ec..06543fd40fcc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dim.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dim.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dim.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dim.h</a></div><div class='hunk'>@@ -10,6 +10,15 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='add'>+struct net_device;</div><div class='add'>+</div><div class='add'>+/* Number of DIM profiles and period mode. */</div><div class='add'>+#define NET_DIM_PARAMS_NUM_PROFILES 5</div><div class='add'>+#define NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE 256</div><div class='add'>+#define NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE 128</div><div class='add'>+#define NET_DIM_DEF_PROFILE_CQE 1</div><div class='add'>+#define NET_DIM_DEF_PROFILE_EQE 1</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Number of events between DIM iterations.</div><div class='ctx'>  * Causes a moderation of the algorithm run.</div><div class='hunk'>@@ -38,12 +47,45 @@</div><div class='ctx'>  * @pkts: CQ packet counter suggestion (by DIM)</div><div class='ctx'>  * @comps: Completion counter</div><div class='ctx'>  * @cq_period_mode: CQ period count mode (from CQE/EQE)</div><div class='add'>+ * @rcu: for asynchronous kfree_rcu</div><div class='ctx'>  */</div><div class='ctx'> struct dim_cq_moder {</div><div class='ctx'> 	u16 usec;</div><div class='ctx'> 	u16 pkts;</div><div class='ctx'> 	u16 comps;</div><div class='ctx'> 	u8 cq_period_mode;</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DIM_PROFILE_RX		BIT(0)	/* support rx profile modification */</div><div class='add'>+#define DIM_PROFILE_TX		BIT(1)	/* support tx profile modification */</div><div class='add'>+</div><div class='add'>+#define DIM_COALESCE_USEC	BIT(0)	/* support usec field modification */</div><div class='add'>+#define DIM_COALESCE_PKTS	BIT(1)	/* support pkts field modification */</div><div class='add'>+#define DIM_COALESCE_COMPS	BIT(2)	/* support comps field modification */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct dim_irq_moder - Structure for irq moderation information.</div><div class='add'>+ * Used to collect irq moderation related information.</div><div class='add'>+ *</div><div class='add'>+ * @profile_flags: DIM_PROFILE_*</div><div class='add'>+ * @coal_flags: DIM_COALESCE_* for Rx and Tx</div><div class='add'>+ * @dim_rx_mode: Rx DIM period count mode: CQE or EQE</div><div class='add'>+ * @dim_tx_mode: Tx DIM period count mode: CQE or EQE</div><div class='add'>+ * @rx_profile: DIM profile list for Rx</div><div class='add'>+ * @tx_profile: DIM profile list for Tx</div><div class='add'>+ * @rx_dim_work: Rx DIM worker scheduled by net_dim()</div><div class='add'>+ * @tx_dim_work: Tx DIM worker scheduled by net_dim()</div><div class='add'>+ */</div><div class='add'>+struct dim_irq_moder {</div><div class='add'>+	u8 profile_flags;</div><div class='add'>+	u8 coal_flags;</div><div class='add'>+	u8 dim_rx_mode;</div><div class='add'>+	u8 dim_tx_mode;</div><div class='add'>+	struct dim_cq_moder __rcu *rx_profile;</div><div class='add'>+	struct dim_cq_moder __rcu *tx_profile;</div><div class='add'>+	void (*rx_dim_work)(struct work_struct *work);</div><div class='add'>+	void (*tx_dim_work)(struct work_struct *work);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -192,6 +234,77 @@ enum dim_step_result {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * net_dim_init_irq_moder - collect information to initialize irq moderation</div><div class='add'>+ * @dev: target network device</div><div class='add'>+ * @profile_flags: Rx or Tx profile modification capability</div><div class='add'>+ * @coal_flags: irq moderation params flags</div><div class='add'>+ * @rx_mode: CQ period mode for Rx</div><div class='add'>+ * @tx_mode: CQ period mode for Tx</div><div class='add'>+ * @rx_dim_work: Rx worker called after dim decision</div><div class='add'>+ * @tx_dim_work: Tx worker called after dim decision</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int net_dim_init_irq_moder(struct net_device *dev, u8 profile_flags,</div><div class='add'>+			   u8 coal_flags, u8 rx_mode, u8 tx_mode,</div><div class='add'>+			   void (*rx_dim_work)(struct work_struct *work),</div><div class='add'>+			   void (*tx_dim_work)(struct work_struct *work));</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * net_dim_free_irq_moder - free fields for irq moderation</div><div class='add'>+ * @dev: target network device</div><div class='add'>+ */</div><div class='add'>+void net_dim_free_irq_moder(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * net_dim_setting - initialize DIM's cq mode and schedule worker</div><div class='add'>+ * @dev: target network device</div><div class='add'>+ * @dim: DIM context</div><div class='add'>+ * @is_tx: true indicates the tx direction, false indicates the rx direction</div><div class='add'>+ */</div><div class='add'>+void net_dim_setting(struct net_device *dev, struct dim *dim, bool is_tx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * net_dim_work_cancel - synchronously cancel dim's worker</div><div class='add'>+ * @dim: DIM context</div><div class='add'>+ */</div><div class='add'>+void net_dim_work_cancel(struct dim *dim);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * net_dim_get_rx_irq_moder - get DIM rx results based on profile_ix</div><div class='add'>+ * @dev: target network device</div><div class='add'>+ * @dim: DIM context</div><div class='add'>+ *</div><div class='add'>+ * Return: DIM irq moderation</div><div class='add'>+ */</div><div class='add'>+struct dim_cq_moder</div><div class='add'>+net_dim_get_rx_irq_moder(struct net_device *dev, struct dim *dim);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * net_dim_get_tx_irq_moder - get DIM tx results based on profile_ix</div><div class='add'>+ * @dev: target network device</div><div class='add'>+ * @dim: DIM context</div><div class='add'>+ *</div><div class='add'>+ * Return: DIM irq moderation</div><div class='add'>+ */</div><div class='add'>+struct dim_cq_moder</div><div class='add'>+net_dim_get_tx_irq_moder(struct net_device *dev, struct dim *dim);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * net_dim_set_rx_mode - set DIM rx cq mode</div><div class='add'>+ * @dev: target network device</div><div class='add'>+ * @rx_mode: target rx cq mode</div><div class='add'>+ */</div><div class='add'>+void net_dim_set_rx_mode(struct net_device *dev, u8 rx_mode);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * net_dim_set_tx_mode - set DIM tx cq mode</div><div class='add'>+ * @dev: target network device</div><div class='add'>+ * @tx_mode: target tx cq mode</div><div class='add'>+ */</div><div class='add'>+void net_dim_set_tx_mode(struct net_device *dev, u8 tx_mode);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	dim_on_top - check if current state is a good place to stop (top location)</div><div class='ctx'>  *	@dim: DIM context</div><div class='ctx'>  *</div><div class='hunk'>@@ -238,7 +351,8 @@ void dim_park_tired(struct dim *dim);</div><div class='ctx'>  * Takes into consideration counter wrap-around.</div><div class='ctx'>  * Returned boolean indicates whether curr_stats are reliable.</div><div class='ctx'>  */</div><div class='del'>-bool dim_calc_stats(struct dim_sample *start, struct dim_sample *end,</div><div class='add'>+bool dim_calc_stats(const struct dim_sample *start,</div><div class='add'>+		    const struct dim_sample *end,</div><div class='ctx'> 		    struct dim_stats *curr_stats);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -311,7 +425,7 @@ struct dim_cq_moder net_dim_get_def_tx_moderation(u8 cq_period_mode);</div><div class='ctx'>  * This is the main logic of the algorithm, where data is processed in order</div><div class='ctx'>  * to decide on next required action.</div><div class='ctx'>  */</div><div class='del'>-void net_dim(struct dim *dim, struct dim_sample end_sample);</div><div class='add'>+void net_dim(struct dim *dim, const struct dim_sample *end_sample);</div><div class='ctx'> </div><div class='ctx'> /* RDMA DIM */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/dio.h b/include/linux/dio.h<br/>index 5abd07361eb5..464331c4c4a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dio.h</a></div><div class='hunk'>@@ -68,7 +68,7 @@ struct dio_bus {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dio_bus dio_bus;      /* Single DIO bus */</div><div class='del'>-extern struct bus_type dio_bus_type;</div><div class='add'>+extern const struct bus_type dio_bus_type;</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='ctx'>      *  DIO device IDs</div><div class='hunk'>@@ -93,7 +93,7 @@ struct dio_driver {</div><div class='ctx'> 	struct device_driver driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_dio_driver(drv)    container_of(drv, struct dio_driver, driver)</div><div class='add'>+#define to_dio_driver(drv)    container_of_const(drv, struct dio_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /* DIO/DIO-II boards all have the following 8bit registers.</div><div class='ctx'>  * These are offsets from the base of the device.</div><div class='head'>diff --git a/include/linux/dlm.h b/include/linux/dlm.h<br/>index c58c4f790c04..7e7b45b0d097 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dlm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dlm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dlm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dlm.h</a></div><div class='hunk'>@@ -35,6 +35,9 @@ struct dlm_lockspace_ops {</div><div class='ctx'> 			      int num_slots, int our_slot, uint32_t generation);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* only relevant for kernel lockspaces, will be removed in future */</div><div class='add'>+#define DLM_LSFL_SOFTIRQ __DLM_LSFL_RESERVED0</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * dlm_new_lockspace</div><div class='ctx'>  *</div><div class='hunk'>@@ -55,6 +58,11 @@ struct dlm_lockspace_ops {</div><div class='ctx'>  *   used to select the directory node.  Must be the same on all nodes.</div><div class='ctx'>  * DLM_LSFL_NEWEXCL</div><div class='ctx'>  *   dlm_new_lockspace() should return -EEXIST if the lockspace exists.</div><div class='add'>+ * DLM_LSFL_SOFTIRQ</div><div class='add'>+ *   dlm request callbacks (ast, bast) are softirq safe. Flag should be</div><div class='add'>+ *   preferred by users. Will be default in some future. If set the</div><div class='add'>+ *   strongest context for ast, bast callback is softirq as it avoids</div><div class='add'>+ *   an additional context switch.</div><div class='ctx'>  *</div><div class='ctx'>  * lvblen: length of lvb in bytes.  Must be multiple of 8.</div><div class='ctx'>  *   dlm_new_lockspace() returns an error if this does not match</div><div class='hunk'>@@ -80,12 +88,43 @@ int dlm_new_lockspace(const char *name, const char *cluster,</div><div class='ctx'> 		      int *ops_result, dlm_lockspace_t **lockspace);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * dlm_release_lockspace() release_option values:</div><div class='add'>+ *</div><div class='add'>+ * DLM_RELEASE_NO_LOCKS returns -EBUSY if any locks (lkb's)</div><div class='add'>+ *   exist in the local lockspace.</div><div class='add'>+ *</div><div class='add'>+ * DLM_RELEASE_UNUSED previous value that is no longer used.</div><div class='add'>+ *</div><div class='add'>+ * DLM_RELEASE_NORMAL releases the lockspace regardless of any</div><div class='add'>+ *   locks managed in the local lockspace.</div><div class='add'>+ *</div><div class='add'>+ * DLM_RELEASE_NO_EVENT release the lockspace regardless of any</div><div class='add'>+ *   locks managed in the local lockspace, and does not submit</div><div class='add'>+ *   a leave event to the cluster manager, so other nodes will</div><div class='add'>+ *   not be notified that the node should be removed from the</div><div class='add'>+ *   list of lockspace members.</div><div class='add'>+ *</div><div class='add'>+ * DLM_RELEASE_RECOVER like DLM_RELEASE_NORMAL, but the remaining</div><div class='add'>+ *   nodes will handle the removal of the node as if the node</div><div class='add'>+ *   had failed, e.g. the recover_slot() callback would be used.</div><div class='add'>+ */</div><div class='add'>+#define DLM_RELEASE_NO_LOCKS		0</div><div class='add'>+#define DLM_RELEASE_UNUSED		1</div><div class='add'>+#define DLM_RELEASE_NORMAL		2</div><div class='add'>+#define DLM_RELEASE_NO_EVENT		3</div><div class='add'>+#define DLM_RELEASE_RECOVER		4</div><div class='add'>+#define __DLM_RELEASE_MAX		DLM_RELEASE_RECOVER</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * dlm_release_lockspace</div><div class='ctx'>  *</div><div class='ctx'>  * Stop a lockspace.</div><div class='add'>+ *</div><div class='add'>+ * release_option: see DLM_RELEASE values above.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int dlm_release_lockspace(dlm_lockspace_t *lockspace, int force);</div><div class='add'>+int dlm_release_lockspace(dlm_lockspace_t *lockspace,</div><div class='add'>+			  unsigned int release_option);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * dlm_lock</div><div class='hunk'>@@ -121,7 +160,14 @@ int dlm_release_lockspace(dlm_lockspace_t *lockspace, int force);</div><div class='ctx'>  * call.</div><div class='ctx'>  *</div><div class='ctx'>  * AST routines should not block (at least not for long), but may make</div><div class='del'>- * any locking calls they please.</div><div class='add'>+ * any locking calls they please. If DLM_LSFL_SOFTIRQ for kernel</div><div class='add'>+ * users of dlm_new_lockspace() is passed the ast and bast callbacks</div><div class='add'>+ * can be processed in softirq context. Also some of the callback</div><div class='add'>+ * contexts are in the same context as the DLM lock request API, users</div><div class='add'>+ * must not hold locks while calling dlm lock request API and trying</div><div class='add'>+ * to acquire this lock in the callback again, this will end in a</div><div class='add'>+ * lock recursion. For newer implementation the DLM_LSFL_SOFTIRQ</div><div class='add'>+ * should be used.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> int dlm_lock(dlm_lockspace_t *lockspace,</div><div class='head'>diff --git a/include/linux/dma-buf-mapping.h b/include/linux/dma-buf-mapping.h<br/>new file mode 100644<br/>index 000000000000..a3c0ce2d3a42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-buf-mapping.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-buf-mapping.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * DMA BUF Mapping Helpers</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __DMA_BUF_MAPPING_H__</div><div class='add'>+#define __DMA_BUF_MAPPING_H__</div><div class='add'>+#include &lt;linux/dma-buf.h&gt;</div><div class='add'>+</div><div class='add'>+struct sg_table *dma_buf_phys_vec_to_sgt(struct dma_buf_attachment *attach,</div><div class='add'>+					 struct p2pdma_provider *provider,</div><div class='add'>+					 struct dma_buf_phys_vec *phys_vec,</div><div class='add'>+					 size_t nr_ranges, size_t size,</div><div class='add'>+					 enum dma_data_direction dir);</div><div class='add'>+void dma_buf_free_sgt(struct dma_buf_attachment *attach, struct sg_table *sgt,</div><div class='add'>+		      enum dma_data_direction dir);</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h<br/>index 8ff4add71f88..0bc492090237 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-buf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-buf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-buf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-buf.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/dma-fence.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/pci-p2pdma.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='ctx'> struct dma_buf;</div><div class='hunk'>@@ -35,15 +36,6 @@ struct dma_buf_attachment;</div><div class='ctx'>  */</div><div class='ctx'> struct dma_buf_ops {</div><div class='ctx'> 	/**</div><div class='del'>-	  * @cache_sgt_mapping:</div><div class='del'>-	  *</div><div class='del'>-	  * If true the framework will cache the first mapping made for each</div><div class='del'>-	  * attachment. This avoids creating mappings for attachments multiple</div><div class='del'>-	  * times.</div><div class='del'>-	  */</div><div class='del'>-	bool cache_sgt_mapping;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @attach:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This is called from dma_buf_attach() to make sure that a given</div><div class='hunk'>@@ -491,8 +483,6 @@ struct dma_buf_attach_ops {</div><div class='ctx'>  * @dmabuf: buffer for this attachment.</div><div class='ctx'>  * @dev: device attached to the buffer.</div><div class='ctx'>  * @node: list of dma_buf_attachment, protected by dma_resv lock of the dmabuf.</div><div class='del'>- * @sgt: cached mapping.</div><div class='del'>- * @dir: direction of cached mapping.</div><div class='ctx'>  * @peer2peer: true if the importer can handle peer resources without pages.</div><div class='ctx'>  * @priv: exporter specific attachment data.</div><div class='ctx'>  * @importer_ops: importer operations for this attachment, if provided</div><div class='hunk'>@@ -512,8 +502,6 @@ struct dma_buf_attachment {</div><div class='ctx'> 	struct dma_buf *dmabuf;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct list_head node;</div><div class='del'>-	struct sg_table *sgt;</div><div class='del'>-	enum dma_data_direction dir;</div><div class='ctx'> 	bool peer2peer;</div><div class='ctx'> 	const struct dma_buf_attach_ops *importer_ops;</div><div class='ctx'> 	void *importer_priv;</div><div class='hunk'>@@ -544,6 +532,16 @@ struct dma_buf_export_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct dma_buf_phys_vec - describe continuous chunk of memory</div><div class='add'>+ * @paddr:   physical address of that chunk</div><div class='add'>+ * @len:     Length of this chunk</div><div class='add'>+ */</div><div class='add'>+struct dma_buf_phys_vec {</div><div class='add'>+	phys_addr_t paddr;</div><div class='add'>+	size_t len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * DEFINE_DMA_BUF_EXPORT_INFO - helper macro for exporters</div><div class='ctx'>  * @name: export-info name</div><div class='ctx'>  *</div><div class='hunk'>@@ -581,20 +579,6 @@ static inline bool dma_buf_is_dynamic(struct dma_buf *dmabuf)</div><div class='ctx'> 	return !!dmabuf-&gt;ops-&gt;pin;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * dma_buf_attachment_is_dynamic - check if a DMA-buf attachment uses dynamic</div><div class='del'>- * mappings</div><div class='del'>- * @attach: the DMA-buf attachment to check</div><div class='del'>- *</div><div class='del'>- * Returns true if a DMA-buf importer wants to call the map/unmap functions with</div><div class='del'>- * the dma_resv lock held.</div><div class='del'>- */</div><div class='del'>-static inline bool</div><div class='del'>-dma_buf_attachment_is_dynamic(struct dma_buf_attachment *attach)</div><div class='del'>-{</div><div class='del'>-	return !!attach-&gt;importer_ops;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,</div><div class='ctx'> 					  struct device *dev);</div><div class='ctx'> struct dma_buf_attachment *</div><div class='hunk'>@@ -634,4 +618,6 @@ int dma_buf_vmap(struct dma_buf *dmabuf, struct iosys_map *map);</div><div class='ctx'> void dma_buf_vunmap(struct dma_buf *dmabuf, struct iosys_map *map);</div><div class='ctx'> int dma_buf_vmap_unlocked(struct dma_buf *dmabuf, struct iosys_map *map);</div><div class='ctx'> void dma_buf_vunmap_unlocked(struct dma_buf *dmabuf, struct iosys_map *map);</div><div class='add'>+struct dma_buf *dma_buf_iter_begin(void);</div><div class='add'>+struct dma_buf *dma_buf_iter_next(struct dma_buf *dmbuf);</div><div class='ctx'> #endif /* __DMA_BUF_H__ */</div><div class='head'>diff --git a/include/linux/dma-buf/heaps/cma.h b/include/linux/dma-buf/heaps/cma.h<br/>new file mode 100644<br/>index 000000000000..e751479e21e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-buf/heaps/cma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-buf/heaps/cma.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef DMA_BUF_HEAP_CMA_H_</div><div class='add'>+#define DMA_BUF_HEAP_CMA_H_</div><div class='add'>+</div><div class='add'>+struct cma;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DMABUF_HEAPS_CMA</div><div class='add'>+int dma_heap_cma_register_heap(struct cma *cma);</div><div class='add'>+#else</div><div class='add'>+static inline int dma_heap_cma_register_heap(struct cma *cma)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif // CONFIG_DMABUF_HEAPS_CMA</div><div class='add'>+</div><div class='add'>+#endif // DMA_BUF_HEAP_CMA_H_</div><div class='head'>diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h<br/>index 3eb3589ff43e..c249912456f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-direct.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-direct.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-direct.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-direct.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/mem_encrypt.h&gt;</div><div class='ctx'> #include &lt;linux/swiotlb.h&gt;</div><div class='ctx'> </div><div class='del'>-extern unsigned int zone_dma_bits;</div><div class='add'>+extern u64 zone_dma_limit;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Record the mapping of CPU physical to DMA addresses for a given region.</div><div class='hunk'>@@ -54,20 +54,42 @@ static inline phys_addr_t translate_dma_to_phys(struct device *dev,</div><div class='ctx'> 	return (phys_addr_t)-1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline dma_addr_t dma_range_map_min(const struct bus_dma_region *map)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t ret = (dma_addr_t)U64_MAX;</div><div class='add'>+</div><div class='add'>+	for (; map-&gt;size; map++)</div><div class='add'>+		ret = min(ret, map-&gt;dma_start);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline dma_addr_t dma_range_map_max(const struct bus_dma_region *map)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t ret = 0;</div><div class='add'>+</div><div class='add'>+	for (; map-&gt;size; map++)</div><div class='add'>+		ret = max(ret, map-&gt;dma_start + map-&gt;size - 1);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA</div><div class='ctx'> #include &lt;asm/dma-direct.h&gt;</div><div class='ctx'> #ifndef phys_to_dma_unencrypted</div><div class='ctx'> #define phys_to_dma_unencrypted		phys_to_dma</div><div class='ctx'> #endif</div><div class='ctx'> #else</div><div class='del'>-static inline dma_addr_t phys_to_dma_unencrypted(struct device *dev,</div><div class='del'>-		phys_addr_t paddr)</div><div class='add'>+static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;dma_range_map)</div><div class='ctx'> 		return translate_phys_to_dma(dev, paddr);</div><div class='ctx'> 	return paddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline dma_addr_t phys_to_dma_unencrypted(struct device *dev,</div><div class='add'>+						phys_addr_t paddr)</div><div class='add'>+{</div><div class='add'>+	return dma_addr_unencrypted(__phys_to_dma(dev, paddr));</div><div class='add'>+}</div><div class='ctx'> /*</div><div class='ctx'>  * If memory encryption is supported, phys_to_dma will set the memory encryption</div><div class='ctx'>  * bit in the DMA address, and dma_to_phys will clear it.</div><div class='hunk'>@@ -76,19 +98,20 @@ static inline dma_addr_t phys_to_dma_unencrypted(struct device *dev,</div><div class='ctx'>  */</div><div class='ctx'> static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)</div><div class='ctx'> {</div><div class='del'>-	return __sme_set(phys_to_dma_unencrypted(dev, paddr));</div><div class='add'>+	return dma_addr_encrypted(__phys_to_dma(dev, paddr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dma_addr)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t paddr;</div><div class='ctx'> </div><div class='add'>+	dma_addr = dma_addr_canonical(dma_addr);</div><div class='ctx'> 	if (dev-&gt;dma_range_map)</div><div class='ctx'> 		paddr = translate_dma_to_phys(dev, dma_addr);</div><div class='ctx'> 	else</div><div class='ctx'> 		paddr = dma_addr;</div><div class='ctx'> </div><div class='del'>-	return __sme_clr(paddr);</div><div class='add'>+	return paddr;</div><div class='ctx'> }</div><div class='ctx'> #endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */</div><div class='ctx'> </div><div class='hunk'>@@ -126,7 +149,5 @@ void dma_direct_free_pages(struct device *dev, size_t size,</div><div class='ctx'> 		struct page *page, dma_addr_t dma_addr,</div><div class='ctx'> 		enum dma_data_direction dir);</div><div class='ctx'> int dma_direct_supported(struct device *dev, u64 mask);</div><div class='del'>-dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,</div><div class='del'>-		size_t size, enum dma_data_direction dir, unsigned long attrs);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_DMA_DIRECT_H */</div><div class='head'>diff --git a/include/linux/dma-fence-array.h b/include/linux/dma-fence-array.h<br/>index ec7f25def392..079b3dec0a16 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-fence-array.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-fence-array.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-fence-array.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-fence-array.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@ struct dma_fence_array_cb {</div><div class='ctx'>  * @num_pending: fences in the array still pending</div><div class='ctx'>  * @fences: array of the fences</div><div class='ctx'>  * @work: internal irq_work function</div><div class='add'>+ * @callbacks: array of callback helpers</div><div class='ctx'>  */</div><div class='ctx'> struct dma_fence_array {</div><div class='ctx'> 	struct dma_fence base;</div><div class='hunk'>@@ -43,6 +44,8 @@ struct dma_fence_array {</div><div class='ctx'> 	struct dma_fence **fences;</div><div class='ctx'> </div><div class='ctx'> 	struct irq_work work;</div><div class='add'>+</div><div class='add'>+	struct dma_fence_array_cb callbacks[] __counted_by(num_fences);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -76,6 +79,12 @@ to_dma_fence_array(struct dma_fence *fence)</div><div class='ctx'> 	for (index = 0, fence = dma_fence_array_first(head); fence;	\</div><div class='ctx'> 	     ++(index), fence = dma_fence_array_next(head, index))</div><div class='ctx'> </div><div class='add'>+struct dma_fence_array *dma_fence_array_alloc(int num_fences);</div><div class='add'>+void dma_fence_array_init(struct dma_fence_array *array,</div><div class='add'>+			  int num_fences, struct dma_fence **fences,</div><div class='add'>+			  u64 context, unsigned seqno,</div><div class='add'>+			  bool signal_on_any);</div><div class='add'>+</div><div class='ctx'> struct dma_fence_array *dma_fence_array_create(int num_fences,</div><div class='ctx'> 					       struct dma_fence **fences,</div><div class='ctx'> 					       u64 context, unsigned seqno,</div><div class='head'>diff --git a/include/linux/dma-fence-chain.h b/include/linux/dma-fence-chain.h<br/>index 4bdf0b96da28..68c3c1e41014 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-fence-chain.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-fence-chain.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-fence-chain.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-fence-chain.h</a></div><div class='hunk'>@@ -85,11 +85,13 @@ dma_fence_chain_contained(struct dma_fence *fence)</div><div class='ctx'>  * dma_fence_chain_alloc</div><div class='ctx'>  *</div><div class='ctx'>  * Returns a new struct dma_fence_chain object or NULL on failure.</div><div class='add'>+ *</div><div class='add'>+ * This specialized allocator has to be a macro for its allocations to be</div><div class='add'>+ * accounted separately (to have a separate alloc_tag). The typecast is</div><div class='add'>+ * intentional to enforce typesafety.</div><div class='ctx'>  */</div><div class='del'>-static inline struct dma_fence_chain *dma_fence_chain_alloc(void)</div><div class='del'>-{</div><div class='del'>-	return kmalloc(sizeof(struct dma_fence_chain), GFP_KERNEL);</div><div class='del'>-};</div><div class='add'>+#define dma_fence_chain_alloc()	\</div><div class='add'>+		((struct dma_fence_chain *)kmalloc(sizeof(struct dma_fence_chain), GFP_KERNEL))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dma_fence_chain_free</div><div class='head'>diff --git a/include/linux/dma-fence-unwrap.h b/include/linux/dma-fence-unwrap.h<br/>index 66b1e56fbb81..62df222fe0f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-fence-unwrap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-fence-unwrap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-fence-unwrap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-fence-unwrap.h</a></div><div class='hunk'>@@ -52,6 +52,8 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences,</div><div class='ctx'> 					   struct dma_fence **fences,</div><div class='ctx'> 					   struct dma_fence_unwrap *cursors);</div><div class='ctx'> </div><div class='add'>+int dma_fence_dedup_array(struct dma_fence **array, int num_fences);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * dma_fence_unwrap_merge - unwrap and merge fences</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h<br/>index e06bad467f55..64639e104110 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-fence.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-fence.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-fence.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-fence.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> struct dma_fence;</div><div class='ctx'> struct dma_fence_ops;</div><div class='ctx'> struct dma_fence_cb;</div><div class='add'>+struct seq_file;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct dma_fence - software synchronization primitive</div><div class='hunk'>@@ -97,6 +98,7 @@ struct dma_fence {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum dma_fence_flag_bits {</div><div class='add'>+	DMA_FENCE_FLAG_SEQNO64_BIT,</div><div class='ctx'> 	DMA_FENCE_FLAG_SIGNALED_BIT,</div><div class='ctx'> 	DMA_FENCE_FLAG_TIMESTAMP_BIT,</div><div class='ctx'> 	DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,</div><div class='hunk'>@@ -125,14 +127,6 @@ struct dma_fence_cb {</div><div class='ctx'>  */</div><div class='ctx'> struct dma_fence_ops {</div><div class='ctx'> 	/**</div><div class='del'>-	 * @use_64bit_seqno:</div><div class='del'>-	 *</div><div class='del'>-	 * True if this dma_fence implementation uses 64bit seqno, false</div><div class='del'>-	 * otherwise.</div><div class='del'>-	 */</div><div class='del'>-	bool use_64bit_seqno;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @get_driver_name:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Returns the driver name. This is a callback to allow drivers to</div><div class='hunk'>@@ -169,8 +163,8 @@ struct dma_fence_ops {</div><div class='ctx'> 	 * implementation know that there is another driver waiting on the</div><div class='ctx'> 	 * signal (ie. hw-&gt;sw case).</div><div class='ctx'> 	 *</div><div class='del'>-	 * This function can be called from atomic context, but not</div><div class='del'>-	 * from irq context, so normal spinlocks can be used.</div><div class='add'>+	 * This is called with irq's disabled, so only spinlocks which disable</div><div class='add'>+	 * IRQ's can be used in the code outside of this callback.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * A return value of false indicates the fence already passed,</div><div class='ctx'> 	 * or some failure occurred that made it impossible to enable</div><div class='hunk'>@@ -239,27 +233,6 @@ struct dma_fence_ops {</div><div class='ctx'> 	void (*release)(struct dma_fence *fence);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @fence_value_str:</div><div class='del'>-	 *</div><div class='del'>-	 * Callback to fill in free-form debug info specific to this fence, like</div><div class='del'>-	 * the sequence number.</div><div class='del'>-	 *</div><div class='del'>-	 * This callback is optional.</div><div class='del'>-	 */</div><div class='del'>-	void (*fence_value_str)(struct dma_fence *fence, char *str, int size);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='del'>-	 * @timeline_value_str:</div><div class='del'>-	 *</div><div class='del'>-	 * Fills in the current value of the timeline as a string, like the</div><div class='del'>-	 * sequence number. Note that the specific fence passed to this function</div><div class='del'>-	 * should not matter, drivers should only use it to look up the</div><div class='del'>-	 * corresponding timeline structures.</div><div class='del'>-	 */</div><div class='del'>-	void (*timeline_value_str)(struct dma_fence *fence,</div><div class='del'>-				   char *str, int size);</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @set_deadline:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Callback to allow a fence waiter to inform the fence signaler of</div><div class='hunk'>@@ -283,6 +256,9 @@ struct dma_fence_ops {</div><div class='ctx'> void dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops,</div><div class='ctx'> 		    spinlock_t *lock, u64 context, u64 seqno);</div><div class='ctx'> </div><div class='add'>+void dma_fence_init64(struct dma_fence *fence, const struct dma_fence_ops *ops,</div><div class='add'>+		      spinlock_t *lock, u64 context, u64 seqno);</div><div class='add'>+</div><div class='ctx'> void dma_fence_release(struct kref *kref);</div><div class='ctx'> void dma_fence_free(struct dma_fence *fence);</div><div class='ctx'> void dma_fence_describe(struct dma_fence *fence, struct seq_file *seq);</div><div class='hunk'>@@ -403,6 +379,29 @@ bool dma_fence_remove_callback(struct dma_fence *fence,</div><div class='ctx'> void dma_fence_enable_sw_signaling(struct dma_fence *fence);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * DOC: Safe external access to driver provided object members</div><div class='add'>+ *</div><div class='add'>+ * All data not stored directly in the dma-fence object, such as the</div><div class='add'>+ * &amp;dma_fence.lock and memory potentially accessed by functions in the</div><div class='add'>+ * &amp;dma_fence.ops table, MUST NOT be accessed after the fence has been signalled</div><div class='add'>+ * because after that point drivers are allowed to free it.</div><div class='add'>+ *</div><div class='add'>+ * All code accessing that data via the dma-fence API (or directly, which is</div><div class='add'>+ * discouraged), MUST make sure to contain the complete access within a</div><div class='add'>+ * &amp;rcu_read_lock and &amp;rcu_read_unlock pair.</div><div class='add'>+ *</div><div class='add'>+ * Some dma-fence API handles this automatically, while other, as for example</div><div class='add'>+ * &amp;dma_fence_driver_name and &amp;dma_fence_timeline_name, leave that</div><div class='add'>+ * responsibility to the caller.</div><div class='add'>+ *</div><div class='add'>+ * To enable this scheme to work drivers MUST ensure a RCU grace period elapses</div><div class='add'>+ * between signalling the fence and freeing the said data.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+const char __rcu *dma_fence_driver_name(struct dma_fence *fence);</div><div class='add'>+const char __rcu *dma_fence_timeline_name(struct dma_fence *fence);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * dma_fence_is_signaled_locked - Return an indication if the fence</div><div class='ctx'>  *                                is signaled yet.</div><div class='ctx'>  * @fence: the fence to check</div><div class='hunk'>@@ -462,21 +461,20 @@ dma_fence_is_signaled(struct dma_fence *fence)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __dma_fence_is_later - return if f1 is chronologically later than f2</div><div class='add'>+ * @fence: fence in whose context to do the comparison</div><div class='ctx'>  * @f1: the first fence's seqno</div><div class='ctx'>  * @f2: the second fence's seqno from the same context</div><div class='del'>- * @ops: dma_fence_ops associated with the seqno</div><div class='ctx'>  *</div><div class='ctx'>  * Returns true if f1 is chronologically later than f2. Both fences must be</div><div class='ctx'>  * from the same context, since a seqno is not common across contexts.</div><div class='ctx'>  */</div><div class='del'>-static inline bool __dma_fence_is_later(u64 f1, u64 f2,</div><div class='del'>-					const struct dma_fence_ops *ops)</div><div class='add'>+static inline bool __dma_fence_is_later(struct dma_fence *fence, u64 f1, u64 f2)</div><div class='ctx'> {</div><div class='ctx'> 	/* This is for backward compatibility with drivers which can only handle</div><div class='ctx'> 	 * 32bit sequence numbers. Use a 64bit compare when the driver says to</div><div class='ctx'> 	 * do so.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ops-&gt;use_64bit_seqno)</div><div class='add'>+	if (test_bit(DMA_FENCE_FLAG_SEQNO64_BIT, &amp;fence-&gt;flags))</div><div class='ctx'> 		return f1 &gt; f2;</div><div class='ctx'> </div><div class='ctx'> 	return (int)(lower_32_bits(f1) - lower_32_bits(f2)) &gt; 0;</div><div class='hunk'>@@ -496,7 +494,7 @@ static inline bool dma_fence_is_later(struct dma_fence *f1,</div><div class='ctx'> 	if (WARN_ON(f1-&gt;context != f2-&gt;context))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	return __dma_fence_is_later(f1-&gt;seqno, f2-&gt;seqno, f1-&gt;ops);</div><div class='add'>+	return __dma_fence_is_later(f1, f1-&gt;seqno, f2-&gt;seqno);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -574,6 +572,12 @@ int dma_fence_get_status(struct dma_fence *fence);</div><div class='ctx'>  * rather than success. This must be set before signaling (so that the value</div><div class='ctx'>  * is visible before any waiters on the signal callback are woken). This</div><div class='ctx'>  * helper exists to help catching erroneous setting of #dma_fence.error.</div><div class='add'>+ *</div><div class='add'>+ * Examples of error codes which drivers should use:</div><div class='add'>+ *</div><div class='add'>+ * * %-ENODATA	 This operation produced no data, no other operation affected.</div><div class='add'>+ * * %-ECANCELED All operations from the same context have been canceled.</div><div class='add'>+ * * %-ETIME	 Operation caused a timeout and potentially device reset.</div><div class='ctx'>  */</div><div class='ctx'> static inline void dma_fence_set_error(struct dma_fence *fence,</div><div class='ctx'> 				       int error)</div><div class='head'>diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h<br/>index 0c05561cad6e..27d15f60950a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-heap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-heap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-heap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-heap.h</a></div><div class='hunk'>@@ -9,22 +9,21 @@</div><div class='ctx'> #ifndef _DMA_HEAPS_H</div><div class='ctx'> #define _DMA_HEAPS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/cdev.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct dma_heap;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct dma_heap_ops - ops to operate on a given heap</div><div class='del'>- * @allocate:		allocate dmabuf and return struct dma_buf ptr</div><div class='add'>+ * @allocate:	allocate dmabuf and return struct dma_buf ptr</div><div class='ctx'>  *</div><div class='ctx'>  * allocate returns dmabuf on success, ERR_PTR(-errno) on error.</div><div class='ctx'>  */</div><div class='ctx'> struct dma_heap_ops {</div><div class='ctx'> 	struct dma_buf *(*allocate)(struct dma_heap *heap,</div><div class='ctx'> 				    unsigned long len,</div><div class='del'>-				    unsigned long fd_flags,</div><div class='del'>-				    unsigned long heap_flags);</div><div class='add'>+				    u32 fd_flags,</div><div class='add'>+				    u64 heap_flags);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -41,28 +40,10 @@ struct dma_heap_export_info {</div><div class='ctx'> 	void *priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * dma_heap_get_drvdata() - get per-heap driver data</div><div class='del'>- * @heap: DMA-Heap to retrieve private data for</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- * The per-heap data for the heap.</div><div class='del'>- */</div><div class='ctx'> void *dma_heap_get_drvdata(struct dma_heap *heap);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * dma_heap_get_name() - get heap name</div><div class='del'>- * @heap: DMA-Heap to retrieve private data for</div><div class='del'>- *</div><div class='del'>- * Returns:</div><div class='del'>- * The char* for the heap name.</div><div class='del'>- */</div><div class='ctx'> const char *dma_heap_get_name(struct dma_heap *heap);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * dma_heap_add - adds a heap to dmabuf heaps</div><div class='del'>- * @exp_info:		information needed to register this heap</div><div class='del'>- */</div><div class='ctx'> struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info);</div><div class='ctx'> </div><div class='ctx'> #endif /* _DMA_HEAPS_H */</div><div class='head'>diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h<br/>index 4abc60f04209..4809204c674c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-map-ops.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-map-ops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-map-ops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-map-ops.h</a></div><div class='hunk'>@@ -13,32 +13,17 @@</div><div class='ctx'> struct cma;</div><div class='ctx'> struct iommu_ops;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Values for struct dma_map_ops.flags:</div><div class='del'>- *</div><div class='del'>- * DMA_F_PCI_P2PDMA_SUPPORTED: Indicates the dma_map_ops implementation can</div><div class='del'>- * handle PCI P2PDMA pages in the map_sg/unmap_sg operation.</div><div class='del'>- */</div><div class='del'>-#define DMA_F_PCI_P2PDMA_SUPPORTED     (1 &lt;&lt; 0)</div><div class='del'>-</div><div class='ctx'> struct dma_map_ops {</div><div class='del'>-	unsigned int flags;</div><div class='del'>-</div><div class='ctx'> 	void *(*alloc)(struct device *dev, size_t size,</div><div class='ctx'> 			dma_addr_t *dma_handle, gfp_t gfp,</div><div class='ctx'> 			unsigned long attrs);</div><div class='ctx'> 	void (*free)(struct device *dev, size_t size, void *vaddr,</div><div class='ctx'> 			dma_addr_t dma_handle, unsigned long attrs);</div><div class='del'>-	struct page *(*alloc_pages)(struct device *dev, size_t size,</div><div class='add'>+	struct page *(*alloc_pages_op)(struct device *dev, size_t size,</div><div class='ctx'> 			dma_addr_t *dma_handle, enum dma_data_direction dir,</div><div class='ctx'> 			gfp_t gfp);</div><div class='ctx'> 	void (*free_pages)(struct device *dev, size_t size, struct page *vaddr,</div><div class='ctx'> 			dma_addr_t dma_handle, enum dma_data_direction dir);</div><div class='del'>-	struct sg_table *(*alloc_noncontiguous)(struct device *dev, size_t size,</div><div class='del'>-			enum dma_data_direction dir, gfp_t gfp,</div><div class='del'>-			unsigned long attrs);</div><div class='del'>-	void (*free_noncontiguous)(struct device *dev, size_t size,</div><div class='del'>-			struct sg_table *sgt, enum dma_data_direction dir);</div><div class='ctx'> 	int (*mmap)(struct device *, struct vm_area_struct *,</div><div class='ctx'> 			void *, dma_addr_t, size_t, unsigned long attrs);</div><div class='ctx'> </div><div class='hunk'>@@ -46,10 +31,10 @@ struct dma_map_ops {</div><div class='ctx'> 			void *cpu_addr, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 			unsigned long attrs);</div><div class='ctx'> </div><div class='del'>-	dma_addr_t (*map_page)(struct device *dev, struct page *page,</div><div class='del'>-			unsigned long offset, size_t size,</div><div class='del'>-			enum dma_data_direction dir, unsigned long attrs);</div><div class='del'>-	void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+	dma_addr_t (*map_phys)(struct device *dev, phys_addr_t phys,</div><div class='add'>+			size_t size, enum dma_data_direction dir,</div><div class='add'>+			unsigned long attrs);</div><div class='add'>+	void (*unmap_phys)(struct device *dev, dma_addr_t dma_handle,</div><div class='ctx'> 			size_t size, enum dma_data_direction dir,</div><div class='ctx'> 			unsigned long attrs);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -61,12 +46,6 @@ struct dma_map_ops {</div><div class='ctx'> 			enum dma_data_direction dir, unsigned long attrs);</div><div class='ctx'> 	void (*unmap_sg)(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 			enum dma_data_direction dir, unsigned long attrs);</div><div class='del'>-	dma_addr_t (*map_resource)(struct device *dev, phys_addr_t phys_addr,</div><div class='del'>-			size_t size, enum dma_data_direction dir,</div><div class='del'>-			unsigned long attrs);</div><div class='del'>-	void (*unmap_resource)(struct device *dev, dma_addr_t dma_handle,</div><div class='del'>-			size_t size, enum dma_data_direction dir,</div><div class='del'>-			unsigned long attrs);</div><div class='ctx'> 	void (*sync_single_for_cpu)(struct device *dev, dma_addr_t dma_handle,</div><div class='ctx'> 			size_t size, enum dma_data_direction dir);</div><div class='ctx'> 	void (*sync_single_for_device)(struct device *dev,</div><div class='hunk'>@@ -85,7 +64,7 @@ struct dma_map_ops {</div><div class='ctx'> 	unsigned long (*get_merge_boundary)(struct device *dev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DMA_OPS</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_DMA_OPS</div><div class='ctx'> #include &lt;asm/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline const struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='hunk'>@@ -100,7 +79,7 @@ static inline void set_dma_ops(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;dma_ops = dma_ops;</div><div class='ctx'> }</div><div class='del'>-#else /* CONFIG_DMA_OPS */</div><div class='add'>+#else /* CONFIG_ARCH_HAS_DMA_OPS */</div><div class='ctx'> static inline const struct dma_map_ops *get_dma_ops(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -109,7 +88,7 @@ static inline void set_dma_ops(struct device *dev,</div><div class='ctx'> 			       const struct dma_map_ops *dma_ops)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_DMA_OPS */</div><div class='add'>+#endif /* CONFIG_ARCH_HAS_DMA_OPS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DMA_CMA</div><div class='ctx'> extern struct cma *dma_contiguous_default_area;</div><div class='hunk'>@@ -168,6 +147,9 @@ static inline void dma_free_contiguous(struct device *dev, struct page *page,</div><div class='ctx'> {</div><div class='ctx'> 	__free_pages(page, get_order(size));</div><div class='ctx'> }</div><div class='add'>+static inline void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_DMA_CMA*/</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DMA_DECLARE_COHERENT</div><div class='hunk'>@@ -216,20 +198,6 @@ static inline int dma_mmap_from_global_coherent(struct vm_area_struct *vma,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_DMA_GLOBAL_POOL */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is the actual return value from the -&gt;alloc_noncontiguous method.</div><div class='del'>- * The users of the DMA API should only care about the sg_table, but to make</div><div class='del'>- * the DMA-API internal vmaping and freeing easier we stash away the page</div><div class='del'>- * array as well (except for the fallback case).  This can go away any time,</div><div class='del'>- * e.g. when a vmap-variant that takes a scatterlist comes along.</div><div class='del'>- */</div><div class='del'>-struct dma_sgt_handle {</div><div class='del'>-	struct sg_table sgt;</div><div class='del'>-	struct page **pages;</div><div class='del'>-};</div><div class='del'>-#define sgt_handle(sgt) \</div><div class='del'>-	container_of((sgt), struct dma_sgt_handle, sgt)</div><div class='del'>-</div><div class='ctx'> int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,</div><div class='ctx'> 		void *cpu_addr, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 		unsigned long attrs);</div><div class='hunk'>@@ -271,7 +239,16 @@ static inline bool dev_is_dma_coherent(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_ARCH_HAS_DMA_COHERENCE_H */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline void dma_reset_need_sync(struct device *dev)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_DMA_NEED_SYNC</div><div class='add'>+	/* Reset it only once so that the function can be called on hotpath */</div><div class='add'>+	if (unlikely(dev-&gt;dma_skip_sync))</div><div class='add'>+		dev-&gt;dma_skip_sync = false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Check whether potential kmalloc() buffers are safe for non-coherent DMA.</div><div class='hunk'>@@ -412,25 +389,23 @@ void *arch_dma_set_uncached(void *addr, size_t size);</div><div class='ctx'> void arch_dma_clear_uncached(void *addr, size_t size);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_DMA_MAP_DIRECT</div><div class='del'>-bool arch_dma_map_page_direct(struct device *dev, phys_addr_t addr);</div><div class='del'>-bool arch_dma_unmap_page_direct(struct device *dev, dma_addr_t dma_handle);</div><div class='add'>+bool arch_dma_map_phys_direct(struct device *dev, phys_addr_t addr);</div><div class='add'>+bool arch_dma_unmap_phys_direct(struct device *dev, dma_addr_t dma_handle);</div><div class='ctx'> bool arch_dma_map_sg_direct(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		int nents);</div><div class='ctx'> bool arch_dma_unmap_sg_direct(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		int nents);</div><div class='ctx'> #else</div><div class='del'>-#define arch_dma_map_page_direct(d, a)		(false)</div><div class='del'>-#define arch_dma_unmap_page_direct(d, a)	(false)</div><div class='add'>+#define arch_dma_map_phys_direct(d, a)		(false)</div><div class='add'>+#define arch_dma_unmap_phys_direct(d, a)	(false)</div><div class='ctx'> #define arch_dma_map_sg_direct(d, s, n)		(false)</div><div class='ctx'> #define arch_dma_unmap_sg_direct(d, s, n)	(false)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS</div><div class='del'>-void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,</div><div class='del'>-		bool coherent);</div><div class='add'>+void arch_setup_dma_ops(struct device *dev, bool coherent);</div><div class='ctx'> #else</div><div class='del'>-static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base,</div><div class='del'>-		u64 size, bool coherent)</div><div class='add'>+static inline void arch_setup_dma_ops(struct device *dev, bool coherent)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_ARCH_HAS_SETUP_DMA_OPS */</div><div class='hunk'>@@ -456,58 +431,4 @@ static inline void debug_dma_dump_mappings(struct device *dev)</div><div class='ctx'> #endif /* CONFIG_DMA_API_DEBUG */</div><div class='ctx'> </div><div class='ctx'> extern const struct dma_map_ops dma_dummy_ops;</div><div class='del'>-</div><div class='del'>-enum pci_p2pdma_map_type {</div><div class='del'>-	/*</div><div class='del'>-	 * PCI_P2PDMA_MAP_UNKNOWN: Used internally for indicating the mapping</div><div class='del'>-	 * type hasn't been calculated yet. Functions that return this enum</div><div class='del'>-	 * never return this value.</div><div class='del'>-	 */</div><div class='del'>-	PCI_P2PDMA_MAP_UNKNOWN = 0,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * PCI_P2PDMA_MAP_NOT_SUPPORTED: Indicates the transaction will</div><div class='del'>-	 * traverse the host bridge and the host bridge is not in the</div><div class='del'>-	 * allowlist. DMA Mapping routines should return an error when</div><div class='del'>-	 * this is returned.</div><div class='del'>-	 */</div><div class='del'>-	PCI_P2PDMA_MAP_NOT_SUPPORTED,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * PCI_P2PDMA_BUS_ADDR: Indicates that two devices can talk to</div><div class='del'>-	 * each other directly through a PCI switch and the transaction will</div><div class='del'>-	 * not traverse the host bridge. Such a mapping should program</div><div class='del'>-	 * the DMA engine with PCI bus addresses.</div><div class='del'>-	 */</div><div class='del'>-	PCI_P2PDMA_MAP_BUS_ADDR,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * PCI_P2PDMA_MAP_THRU_HOST_BRIDGE: Indicates two devices can talk</div><div class='del'>-	 * to each other, but the transaction traverses a host bridge on the</div><div class='del'>-	 * allowlist. In this case, a normal mapping either with CPU physical</div><div class='del'>-	 * addresses (in the case of dma-direct) or IOVA addresses (in the</div><div class='del'>-	 * case of IOMMUs) should be used to program the DMA engine.</div><div class='del'>-	 */</div><div class='del'>-	PCI_P2PDMA_MAP_THRU_HOST_BRIDGE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pci_p2pdma_map_state {</div><div class='del'>-	struct dev_pagemap *pgmap;</div><div class='del'>-	int map;</div><div class='del'>-	u64 bus_off;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI_P2PDMA</div><div class='del'>-enum pci_p2pdma_map_type</div><div class='del'>-pci_p2pdma_map_segment(struct pci_p2pdma_map_state *state, struct device *dev,</div><div class='del'>-		       struct scatterlist *sg);</div><div class='del'>-#else /* CONFIG_PCI_P2PDMA */</div><div class='del'>-static inline enum pci_p2pdma_map_type</div><div class='del'>-pci_p2pdma_map_segment(struct pci_p2pdma_map_state *state, struct device *dev,</div><div class='del'>-		       struct scatterlist *sg)</div><div class='del'>-{</div><div class='del'>-	return PCI_P2PDMA_MAP_NOT_SUPPORTED;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PCI_P2PDMA */</div><div class='del'>-</div><div class='ctx'> #endif /* _LINUX_DMA_MAP_OPS_H */</div><div class='head'>diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h<br/>index 4a658de44ee9..2ceda49c609f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-mapping.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-mapping.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-mapping.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-mapping.h</a></div><div class='hunk'>@@ -2,15 +2,11 @@</div><div class='ctx'> #ifndef _LINUX_DMA_MAPPING_H</div><div class='ctx'> #define _LINUX_DMA_MAPPING_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/sizes.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/dma-direction.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/mem_encrypt.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * List of possible attributes associated with a DMA mapping. The semantics</div><div class='hunk'>@@ -63,6 +59,26 @@</div><div class='ctx'> #define DMA_ATTR_PRIVILEGED		(1UL &lt;&lt; 9)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * DMA_ATTR_MMIO - Indicates memory-mapped I/O (MMIO) region for DMA mapping</div><div class='add'>+ *</div><div class='add'>+ * This attribute indicates the physical address is not normal system</div><div class='add'>+ * memory. It may not be used with kmap*()/phys_to_virt()/phys_to_page()</div><div class='add'>+ * functions, it may not be cacheable, and access using CPU load/store</div><div class='add'>+ * instructions may not be allowed.</div><div class='add'>+ *</div><div class='add'>+ * Usually this will be used to describe MMIO addresses, or other non-cacheable</div><div class='add'>+ * register addresses. When DMA mapping this sort of address we call</div><div class='add'>+ * the operation Peer to Peer as a one device is DMA'ing to another device.</div><div class='add'>+ * For PCI devices the p2pdma APIs must be used to determine if DMA_ATTR_MMIO</div><div class='add'>+ * is appropriate.</div><div class='add'>+ *</div><div class='add'>+ * For architectures that require cache flushing for DMA coherence</div><div class='add'>+ * DMA_ATTR_MMIO will not perform any cache flushing. The address</div><div class='add'>+ * provided must never be mapped cacheable into the CPU.</div><div class='add'>+ */</div><div class='add'>+#define DMA_ATTR_MMIO		(1UL &lt;&lt; 10)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * A dma_addr_t can hold any valid DMA or bus address for the platform.  It can</div><div class='ctx'>  * be given to a device to use as a DMA source or target.  It is specific to a</div><div class='ctx'>  * given device and there may be a translation between the CPU physical address</div><div class='hunk'>@@ -74,7 +90,23 @@</div><div class='ctx'>  */</div><div class='ctx'> #define DMA_MAPPING_ERROR		(~(dma_addr_t)0)</div><div class='ctx'> </div><div class='del'>-#define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL&lt;&lt;(n))-1))</div><div class='add'>+#define DMA_BIT_MASK(n)	GENMASK_ULL(n - 1, 0)</div><div class='add'>+</div><div class='add'>+struct dma_iova_state {</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	u64 __size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use the high bit to mark if we used swiotlb for one or more ranges.</div><div class='add'>+ */</div><div class='add'>+#define DMA_IOVA_USE_SWIOTLB		(1ULL &lt;&lt; 63)</div><div class='add'>+</div><div class='add'>+static inline size_t dma_iova_size(struct dma_iova_state *state)</div><div class='add'>+{</div><div class='add'>+	/* Casting is needed for 32-bits systems */</div><div class='add'>+	return (size_t)(state-&gt;__size &amp; ~DMA_IOVA_USE_SWIOTLB);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DMA_API_DEBUG</div><div class='ctx'> void debug_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);</div><div class='hunk'>@@ -106,6 +138,10 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,</div><div class='ctx'> 		unsigned long attrs);</div><div class='ctx'> void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, size_t size,</div><div class='ctx'> 		enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+dma_addr_t dma_map_phys(struct device *dev, phys_addr_t phys, size_t size,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+void dma_unmap_phys(struct device *dev, dma_addr_t addr, size_t size,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs);</div><div class='ctx'> unsigned int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		int nents, enum dma_data_direction dir, unsigned long attrs);</div><div class='ctx'> void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,</div><div class='hunk'>@@ -117,14 +153,6 @@ dma_addr_t dma_map_resource(struct device *dev, phys_addr_t phys_addr,</div><div class='ctx'> 		size_t size, enum dma_data_direction dir, unsigned long attrs);</div><div class='ctx'> void dma_unmap_resource(struct device *dev, dma_addr_t addr, size_t size,</div><div class='ctx'> 		enum dma_data_direction dir, unsigned long attrs);</div><div class='del'>-void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, size_t size,</div><div class='del'>-		enum dma_data_direction dir);</div><div class='del'>-void dma_sync_single_for_device(struct device *dev, dma_addr_t addr,</div><div class='del'>-		size_t size, enum dma_data_direction dir);</div><div class='del'>-void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,</div><div class='del'>-		    int nelems, enum dma_data_direction dir);</div><div class='del'>-void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,</div><div class='del'>-		       int nelems, enum dma_data_direction dir);</div><div class='ctx'> void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,</div><div class='ctx'> 		gfp_t flag, unsigned long attrs);</div><div class='ctx'> void dma_free_attrs(struct device *dev, size_t size, void *cpu_addr,</div><div class='hunk'>@@ -147,7 +175,6 @@ u64 dma_get_required_mask(struct device *dev);</div><div class='ctx'> bool dma_addressing_limited(struct device *dev);</div><div class='ctx'> size_t dma_max_mapping_size(struct device *dev);</div><div class='ctx'> size_t dma_opt_mapping_size(struct device *dev);</div><div class='del'>-bool dma_need_sync(struct device *dev, dma_addr_t dma_addr);</div><div class='ctx'> unsigned long dma_get_merge_boundary(struct device *dev);</div><div class='ctx'> struct sg_table *dma_alloc_noncontiguous(struct device *dev, size_t size,</div><div class='ctx'> 		enum dma_data_direction dir, gfp_t gfp, unsigned long attrs);</div><div class='hunk'>@@ -169,6 +196,15 @@ static inline void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr,</div><div class='ctx'> 		size_t size, enum dma_data_direction dir, unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline dma_addr_t dma_map_phys(struct device *dev, phys_addr_t phys,</div><div class='add'>+		size_t size, enum dma_data_direction dir, unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	return DMA_MAPPING_ERROR;</div><div class='add'>+}</div><div class='add'>+static inline void dma_unmap_phys(struct device *dev, dma_addr_t addr,</div><div class='add'>+		size_t size, enum dma_data_direction dir, unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> static inline unsigned int dma_map_sg_attrs(struct device *dev,</div><div class='ctx'> 		struct scatterlist *sg, int nents, enum dma_data_direction dir,</div><div class='ctx'> 		unsigned long attrs)</div><div class='hunk'>@@ -195,22 +231,6 @@ static inline void dma_unmap_resource(struct device *dev, dma_addr_t addr,</div><div class='ctx'> 		size_t size, enum dma_data_direction dir, unsigned long attrs)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,</div><div class='del'>-		size_t size, enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void dma_sync_single_for_device(struct device *dev,</div><div class='del'>-		dma_addr_t addr, size_t size, enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void dma_sync_sg_for_cpu(struct device *dev,</div><div class='del'>-		struct scatterlist *sg, int nelems, enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void dma_sync_sg_for_device(struct device *dev,</div><div class='del'>-		struct scatterlist *sg, int nelems, enum dma_data_direction dir)</div><div class='del'>-{</div><div class='del'>-}</div><div class='ctx'> static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -277,10 +297,6 @@ static inline size_t dma_opt_mapping_size(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline bool dma_need_sync(struct device *dev, dma_addr_t dma_addr)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='ctx'> static inline unsigned long dma_get_merge_boundary(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -310,6 +326,151 @@ static inline int dma_mmap_noncontiguous(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_HAS_DMA */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IOMMU_DMA</div><div class='add'>+/**</div><div class='add'>+ * dma_use_iova - check if the IOVA API is used for this state</div><div class='add'>+ * @state: IOVA state</div><div class='add'>+ *</div><div class='add'>+ * Return %true if the DMA transfers uses the dma_iova_*() calls or %false if</div><div class='add'>+ * they can't be used.</div><div class='add'>+ */</div><div class='add'>+static inline bool dma_use_iova(struct dma_iova_state *state)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;__size != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool dma_iova_try_alloc(struct device *dev, struct dma_iova_state *state,</div><div class='add'>+		phys_addr_t phys, size_t size);</div><div class='add'>+void dma_iova_free(struct device *dev, struct dma_iova_state *state);</div><div class='add'>+void dma_iova_destroy(struct device *dev, struct dma_iova_state *state,</div><div class='add'>+		size_t mapped_len, enum dma_data_direction dir,</div><div class='add'>+		unsigned long attrs);</div><div class='add'>+int dma_iova_sync(struct device *dev, struct dma_iova_state *state,</div><div class='add'>+		size_t offset, size_t size);</div><div class='add'>+int dma_iova_link(struct device *dev, struct dma_iova_state *state,</div><div class='add'>+		phys_addr_t phys, size_t offset, size_t size,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+void dma_iova_unlink(struct device *dev, struct dma_iova_state *state,</div><div class='add'>+		size_t offset, size_t size, enum dma_data_direction dir,</div><div class='add'>+		unsigned long attrs);</div><div class='add'>+#else /* CONFIG_IOMMU_DMA */</div><div class='add'>+static inline bool dma_use_iova(struct dma_iova_state *state)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline bool dma_iova_try_alloc(struct device *dev,</div><div class='add'>+		struct dma_iova_state *state, phys_addr_t phys, size_t size)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline void dma_iova_free(struct device *dev,</div><div class='add'>+		struct dma_iova_state *state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void dma_iova_destroy(struct device *dev,</div><div class='add'>+		struct dma_iova_state *state, size_t mapped_len,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline int dma_iova_sync(struct device *dev,</div><div class='add'>+		struct dma_iova_state *state, size_t offset, size_t size)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int dma_iova_link(struct device *dev,</div><div class='add'>+		struct dma_iova_state *state, phys_addr_t phys, size_t offset,</div><div class='add'>+		size_t size, enum dma_data_direction dir, unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline void dma_iova_unlink(struct device *dev,</div><div class='add'>+		struct dma_iova_state *state, size_t offset, size_t size,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IOMMU_DMA */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_HAS_DMA) &amp;&amp; defined(CONFIG_DMA_NEED_SYNC)</div><div class='add'>+void __dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, size_t size,</div><div class='add'>+		enum dma_data_direction dir);</div><div class='add'>+void __dma_sync_single_for_device(struct device *dev, dma_addr_t addr,</div><div class='add'>+		size_t size, enum dma_data_direction dir);</div><div class='add'>+void __dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,</div><div class='add'>+		int nelems, enum dma_data_direction dir);</div><div class='add'>+void __dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,</div><div class='add'>+		int nelems, enum dma_data_direction dir);</div><div class='add'>+bool __dma_need_sync(struct device *dev, dma_addr_t dma_addr);</div><div class='add'>+</div><div class='add'>+static inline bool dma_dev_need_sync(const struct device *dev)</div><div class='add'>+{</div><div class='add'>+	/* Always call DMA sync operations when debugging is enabled */</div><div class='add'>+	return !dev-&gt;dma_skip_sync || IS_ENABLED(CONFIG_DMA_API_DEBUG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,</div><div class='add'>+		size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	if (dma_dev_need_sync(dev))</div><div class='add'>+		__dma_sync_single_for_cpu(dev, addr, size, dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dma_sync_single_for_device(struct device *dev,</div><div class='add'>+		dma_addr_t addr, size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	if (dma_dev_need_sync(dev))</div><div class='add'>+		__dma_sync_single_for_device(dev, addr, size, dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dma_sync_sg_for_cpu(struct device *dev,</div><div class='add'>+		struct scatterlist *sg, int nelems, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	if (dma_dev_need_sync(dev))</div><div class='add'>+		__dma_sync_sg_for_cpu(dev, sg, nelems, dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dma_sync_sg_for_device(struct device *dev,</div><div class='add'>+		struct scatterlist *sg, int nelems, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	if (dma_dev_need_sync(dev))</div><div class='add'>+		__dma_sync_sg_for_device(dev, sg, nelems, dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dma_need_sync(struct device *dev, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	return dma_dev_need_sync(dev) ? __dma_need_sync(dev, dma_addr) : false;</div><div class='add'>+}</div><div class='add'>+bool dma_need_unmap(struct device *dev);</div><div class='add'>+#else /* !CONFIG_HAS_DMA || !CONFIG_DMA_NEED_SYNC */</div><div class='add'>+static inline bool dma_dev_need_sync(const struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,</div><div class='add'>+		size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void dma_sync_single_for_device(struct device *dev,</div><div class='add'>+		dma_addr_t addr, size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void dma_sync_sg_for_cpu(struct device *dev,</div><div class='add'>+		struct scatterlist *sg, int nelems, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void dma_sync_sg_for_device(struct device *dev,</div><div class='add'>+		struct scatterlist *sg, int nelems, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline bool dma_need_sync(struct device *dev, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline bool dma_need_unmap(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_HAS_DMA || !CONFIG_DMA_NEED_SYNC */</div><div class='add'>+</div><div class='ctx'> struct page *dma_alloc_pages(struct device *dev, size_t size,</div><div class='ctx'> 		dma_addr_t *dma_handle, enum dma_data_direction dir, gfp_t gfp);</div><div class='ctx'> void dma_free_pages(struct device *dev, size_t size, struct page *page,</div><div class='hunk'>@@ -477,13 +638,11 @@ static inline unsigned int dma_get_max_seg_size(struct device *dev)</div><div class='ctx'> 	return SZ_64K;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dma_set_max_seg_size(struct device *dev, unsigned int size)</div><div class='add'>+static inline void dma_set_max_seg_size(struct device *dev, unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;dma_parms) {</div><div class='del'>-		dev-&gt;dma_parms-&gt;max_segment_size = size;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return -EIO;</div><div class='add'>+	if (WARN_ON_ONCE(!dev-&gt;dma_parms))</div><div class='add'>+		return;</div><div class='add'>+	dev-&gt;dma_parms-&gt;max_segment_size = size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long dma_get_seg_boundary(struct device *dev)</div><div class='hunk'>@@ -512,13 +671,11 @@ static inline unsigned long dma_get_seg_boundary_nr_pages(struct device *dev,</div><div class='ctx'> 	return (dma_get_seg_boundary(dev) &gt;&gt; page_shift) + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)</div><div class='add'>+static inline void dma_set_seg_boundary(struct device *dev, unsigned long mask)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;dma_parms) {</div><div class='del'>-		dev-&gt;dma_parms-&gt;segment_boundary_mask = mask;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return -EIO;</div><div class='add'>+	if (WARN_ON_ONCE(!dev-&gt;dma_parms))</div><div class='add'>+		return;</div><div class='add'>+	dev-&gt;dma_parms-&gt;segment_boundary_mask = mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int dma_get_min_align_mask(struct device *dev)</div><div class='hunk'>@@ -528,13 +685,12 @@ static inline unsigned int dma_get_min_align_mask(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dma_set_min_align_mask(struct device *dev,</div><div class='add'>+static inline void dma_set_min_align_mask(struct device *dev,</div><div class='ctx'> 		unsigned int min_align_mask)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON_ONCE(!dev-&gt;dma_parms))</div><div class='del'>-		return -EIO;</div><div class='add'>+		return;</div><div class='ctx'> 	dev-&gt;dma_parms-&gt;min_align_mask = min_align_mask;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef dma_get_cache_alignment</div><div class='hunk'>@@ -591,10 +747,14 @@ static inline int dma_mmap_wc(struct device *dev,</div><div class='ctx'> #else</div><div class='ctx'> #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME)</div><div class='ctx'> #define DEFINE_DMA_UNMAP_LEN(LEN_NAME)</div><div class='del'>-#define dma_unmap_addr(PTR, ADDR_NAME)           (0)</div><div class='del'>-#define dma_unmap_addr_set(PTR, ADDR_NAME, VAL)  do { } while (0)</div><div class='del'>-#define dma_unmap_len(PTR, LEN_NAME)             (0)</div><div class='del'>-#define dma_unmap_len_set(PTR, LEN_NAME, VAL)    do { } while (0)</div><div class='add'>+#define dma_unmap_addr(PTR, ADDR_NAME)           \</div><div class='add'>+	({ typeof(PTR) __p __maybe_unused = PTR; 0; })</div><div class='add'>+#define dma_unmap_addr_set(PTR, ADDR_NAME, VAL)  \</div><div class='add'>+	do { typeof(PTR) __p __maybe_unused = PTR; } while (0)</div><div class='add'>+#define dma_unmap_len(PTR, LEN_NAME)             \</div><div class='add'>+	({ typeof(PTR) __p __maybe_unused = PTR; 0; })</div><div class='add'>+#define dma_unmap_len_set(PTR, LEN_NAME, VAL)    \</div><div class='add'>+	do { typeof(PTR) __p __maybe_unused = PTR; } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_DMA_MAPPING_H */</div><div class='head'>diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h<br/>index 8d0e34dad446..c5ab6fd9ebe8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma-resv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma-resv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma-resv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma-resv.h</a></div><div class='hunk'>@@ -105,10 +105,10 @@ enum dma_resv_usage {</div><div class='ctx'> 	 * This should be used by submissions which don't want to participate in</div><div class='ctx'> 	 * any implicit synchronization.</div><div class='ctx'> 	 *</div><div class='del'>-	 * The most common case are preemption fences, page table updates, TLB</div><div class='del'>-	 * flushes as well as explicit synced user submissions.</div><div class='add'>+	 * The most common cases are preemption fences, page table updates, TLB</div><div class='add'>+	 * flushes as well as explicitly synced user submissions.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Explicit synced user user submissions can be promoted to</div><div class='add'>+	 * Explicitly synced user submissions can be promoted to</div><div class='ctx'> 	 * DMA_RESV_USAGE_READ or DMA_RESV_USAGE_WRITE as needed using</div><div class='ctx'> 	 * dma_buf_import_sync_file() when implicit synchronization should</div><div class='ctx'> 	 * become necessary after initial adding of the fence.</div><div class='head'>diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h<br/>index cfec5f946e23..76a8de9ae151 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma/imx-dma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma/imx-dma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma/imx-dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma/imx-dma.h</a></div><div class='hunk'>@@ -41,6 +41,7 @@ enum sdma_peripheral_type {</div><div class='ctx'> 	IMX_DMATYPE_SAI,	/* SAI */</div><div class='ctx'> 	IMX_DMATYPE_MULTI_SAI,	/* MULTI FIFOs For Audio */</div><div class='ctx'> 	IMX_DMATYPE_HDMI,       /* HDMI Audio */</div><div class='add'>+	IMX_DMATYPE_I2C,	/* I2C */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum imx_dma_prio {</div><div class='head'>diff --git a/include/linux/dma/ipu-dma.h b/include/linux/dma/ipu-dma.h<br/>deleted file mode 100644<br/>index 6969391580d2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma/ipu-dma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma/ipu-dma.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,174 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2008</div><div class='del'>- * Guennadi Liakhovetski, DENX Software Engineering, &lt;lg@denx.de&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005-2007 Freescale Semiconductor, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_DMA_IPU_DMA_H</div><div class='del'>-#define __LINUX_DMA_IPU_DMA_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/dmaengine.h&gt;</div><div class='del'>-</div><div class='del'>-/* IPU DMA Controller channel definitions. */</div><div class='del'>-enum ipu_channel {</div><div class='del'>-	IDMAC_IC_0 = 0,		/* IC (encoding task) to memory */</div><div class='del'>-	IDMAC_IC_1 = 1,		/* IC (viewfinder task) to memory */</div><div class='del'>-	IDMAC_ADC_0 = 1,</div><div class='del'>-	IDMAC_IC_2 = 2,</div><div class='del'>-	IDMAC_ADC_1 = 2,</div><div class='del'>-	IDMAC_IC_3 = 3,</div><div class='del'>-	IDMAC_IC_4 = 4,</div><div class='del'>-	IDMAC_IC_5 = 5,</div><div class='del'>-	IDMAC_IC_6 = 6,</div><div class='del'>-	IDMAC_IC_7 = 7,		/* IC (sensor data) to memory */</div><div class='del'>-	IDMAC_IC_8 = 8,</div><div class='del'>-	IDMAC_IC_9 = 9,</div><div class='del'>-	IDMAC_IC_10 = 10,</div><div class='del'>-	IDMAC_IC_11 = 11,</div><div class='del'>-	IDMAC_IC_12 = 12,</div><div class='del'>-	IDMAC_IC_13 = 13,</div><div class='del'>-	IDMAC_SDC_0 = 14,	/* Background synchronous display data */</div><div class='del'>-	IDMAC_SDC_1 = 15,	/* Foreground data (overlay) */</div><div class='del'>-	IDMAC_SDC_2 = 16,</div><div class='del'>-	IDMAC_SDC_3 = 17,</div><div class='del'>-	IDMAC_ADC_2 = 18,</div><div class='del'>-	IDMAC_ADC_3 = 19,</div><div class='del'>-	IDMAC_ADC_4 = 20,</div><div class='del'>-	IDMAC_ADC_5 = 21,</div><div class='del'>-	IDMAC_ADC_6 = 22,</div><div class='del'>-	IDMAC_ADC_7 = 23,</div><div class='del'>-	IDMAC_PF_0 = 24,</div><div class='del'>-	IDMAC_PF_1 = 25,</div><div class='del'>-	IDMAC_PF_2 = 26,</div><div class='del'>-	IDMAC_PF_3 = 27,</div><div class='del'>-	IDMAC_PF_4 = 28,</div><div class='del'>-	IDMAC_PF_5 = 29,</div><div class='del'>-	IDMAC_PF_6 = 30,</div><div class='del'>-	IDMAC_PF_7 = 31,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Order significant! */</div><div class='del'>-enum ipu_channel_status {</div><div class='del'>-	IPU_CHANNEL_FREE,</div><div class='del'>-	IPU_CHANNEL_INITIALIZED,</div><div class='del'>-	IPU_CHANNEL_READY,</div><div class='del'>-	IPU_CHANNEL_ENABLED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IPU_CHANNELS_NUM 32</div><div class='del'>-</div><div class='del'>-enum pixel_fmt {</div><div class='del'>-	/* 1 byte */</div><div class='del'>-	IPU_PIX_FMT_GENERIC,</div><div class='del'>-	IPU_PIX_FMT_RGB332,</div><div class='del'>-	IPU_PIX_FMT_YUV420P,</div><div class='del'>-	IPU_PIX_FMT_YUV422P,</div><div class='del'>-	IPU_PIX_FMT_YUV420P2,</div><div class='del'>-	IPU_PIX_FMT_YVU422P,</div><div class='del'>-	/* 2 bytes */</div><div class='del'>-	IPU_PIX_FMT_RGB565,</div><div class='del'>-	IPU_PIX_FMT_RGB666,</div><div class='del'>-	IPU_PIX_FMT_BGR666,</div><div class='del'>-	IPU_PIX_FMT_YUYV,</div><div class='del'>-	IPU_PIX_FMT_UYVY,</div><div class='del'>-	/* 3 bytes */</div><div class='del'>-	IPU_PIX_FMT_RGB24,</div><div class='del'>-	IPU_PIX_FMT_BGR24,</div><div class='del'>-	/* 4 bytes */</div><div class='del'>-	IPU_PIX_FMT_GENERIC_32,</div><div class='del'>-	IPU_PIX_FMT_RGB32,</div><div class='del'>-	IPU_PIX_FMT_BGR32,</div><div class='del'>-	IPU_PIX_FMT_ABGR32,</div><div class='del'>-	IPU_PIX_FMT_BGRA32,</div><div class='del'>-	IPU_PIX_FMT_RGBA32,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum ipu_color_space {</div><div class='del'>-	IPU_COLORSPACE_RGB,</div><div class='del'>-	IPU_COLORSPACE_YCBCR,</div><div class='del'>-	IPU_COLORSPACE_YUV</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Enumeration of IPU rotation modes</div><div class='del'>- */</div><div class='del'>-enum ipu_rotate_mode {</div><div class='del'>-	/* Note the enum values correspond to BAM value */</div><div class='del'>-	IPU_ROTATE_NONE = 0,</div><div class='del'>-	IPU_ROTATE_VERT_FLIP = 1,</div><div class='del'>-	IPU_ROTATE_HORIZ_FLIP = 2,</div><div class='del'>-	IPU_ROTATE_180 = 3,</div><div class='del'>-	IPU_ROTATE_90_RIGHT = 4,</div><div class='del'>-	IPU_ROTATE_90_RIGHT_VFLIP = 5,</div><div class='del'>-	IPU_ROTATE_90_RIGHT_HFLIP = 6,</div><div class='del'>-	IPU_ROTATE_90_LEFT = 7,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Enumeration of DI ports for ADC.</div><div class='del'>- */</div><div class='del'>-enum display_port {</div><div class='del'>-	DISP0,</div><div class='del'>-	DISP1,</div><div class='del'>-	DISP2,</div><div class='del'>-	DISP3</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct idmac_video_param {</div><div class='del'>-	unsigned short		in_width;</div><div class='del'>-	unsigned short		in_height;</div><div class='del'>-	uint32_t		in_pixel_fmt;</div><div class='del'>-	unsigned short		out_width;</div><div class='del'>-	unsigned short		out_height;</div><div class='del'>-	uint32_t		out_pixel_fmt;</div><div class='del'>-	unsigned short		out_stride;</div><div class='del'>-	bool			graphics_combine_en;</div><div class='del'>-	bool			global_alpha_en;</div><div class='del'>-	bool			key_color_en;</div><div class='del'>-	enum display_port	disp;</div><div class='del'>-	unsigned short		out_left;</div><div class='del'>-	unsigned short		out_top;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Union of initialization parameters for a logical channel. So far only video</div><div class='del'>- * parameters are used.</div><div class='del'>- */</div><div class='del'>-union ipu_channel_param {</div><div class='del'>-	struct idmac_video_param video;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct idmac_tx_desc {</div><div class='del'>-	struct dma_async_tx_descriptor	txd;</div><div class='del'>-	struct scatterlist		*sg;	/* scatterlist for this */</div><div class='del'>-	unsigned int			sg_len;	/* tx-descriptor. */</div><div class='del'>-	struct list_head		list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct idmac_channel {</div><div class='del'>-	struct dma_chan		dma_chan;</div><div class='del'>-	dma_cookie_t		completed;	/* last completed cookie	   */</div><div class='del'>-	union ipu_channel_param	params;</div><div class='del'>-	enum ipu_channel	link;	/* input channel, linked to the output	   */</div><div class='del'>-	enum ipu_channel_status	status;</div><div class='del'>-	void			*client;	/* Only one client per channel	   */</div><div class='del'>-	unsigned int		n_tx_desc;</div><div class='del'>-	struct idmac_tx_desc	*desc;		/* allocated tx-descriptors	   */</div><div class='del'>-	struct scatterlist	*sg[2];	/* scatterlist elements in buffer-0 and -1 */</div><div class='del'>-	struct list_head	free_list;	/* free tx-descriptors		   */</div><div class='del'>-	struct list_head	queue;		/* queued tx-descriptors	   */</div><div class='del'>-	spinlock_t		lock;		/* protects sg[0,1], queue	   */</div><div class='del'>-	struct mutex		chan_mutex; /* protects status, cookie, free_list  */</div><div class='del'>-	bool			sec_chan_en;</div><div class='del'>-	int			active_buffer;</div><div class='del'>-	unsigned int		eof_irq;</div><div class='del'>-	char			eof_name[16];	/* EOF IRQ name for request_irq()  */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd)</div><div class='del'>-#define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan)</div><div class='del'>-</div><div class='del'>-#endif /* __LINUX_DMA_IPU_DMA_H */</div><div class='head'>diff --git a/include/linux/dma/k3-udma-glue.h b/include/linux/dma/k3-udma-glue.h<br/>index e443be4d3b4b..5d43881e6fb7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dma/k3-udma-glue.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dma/k3-udma-glue.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dma/k3-udma-glue.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dma/k3-udma-glue.h</a></div><div class='hunk'>@@ -26,6 +26,11 @@ struct k3_udma_glue_tx_channel;</div><div class='ctx'> struct k3_udma_glue_tx_channel *k3_udma_glue_request_tx_chn(struct device *dev,</div><div class='ctx'> 		const char *name, struct k3_udma_glue_tx_channel_cfg *cfg);</div><div class='ctx'> </div><div class='add'>+struct k3_udma_glue_tx_channel *</div><div class='add'>+k3_udma_glue_request_tx_chn_for_thread_id(struct device *dev,</div><div class='add'>+					  struct k3_udma_glue_tx_channel_cfg *cfg,</div><div class='add'>+					  struct device_node *udmax_np, u32 thread_id);</div><div class='add'>+</div><div class='ctx'> void k3_udma_glue_release_tx_chn(struct k3_udma_glue_tx_channel *tx_chn);</div><div class='ctx'> int k3_udma_glue_push_tx_chn(struct k3_udma_glue_tx_channel *tx_chn,</div><div class='ctx'> 			     struct cppi5_host_desc_t *desc_tx,</div><div class='hunk'>@@ -109,6 +114,11 @@ struct k3_udma_glue_rx_channel *k3_udma_glue_request_rx_chn(</div><div class='ctx'> 		const char *name,</div><div class='ctx'> 		struct k3_udma_glue_rx_channel_cfg *cfg);</div><div class='ctx'> </div><div class='add'>+struct k3_udma_glue_rx_channel *</div><div class='add'>+k3_udma_glue_request_remote_rx_chn_for_thread_id(struct device *dev,</div><div class='add'>+						 struct k3_udma_glue_rx_channel_cfg *cfg,</div><div class='add'>+						 struct device_node *udmax_np, u32 thread_id);</div><div class='add'>+</div><div class='ctx'> void k3_udma_glue_release_rx_chn(struct k3_udma_glue_rx_channel *rx_chn);</div><div class='ctx'> int k3_udma_glue_enable_rx_chn(struct k3_udma_glue_rx_channel *rx_chn);</div><div class='ctx'> void k3_udma_glue_disable_rx_chn(struct k3_udma_glue_rx_channel *rx_chn);</div><div class='hunk'>@@ -126,12 +136,9 @@ u32 k3_udma_glue_rx_flow_get_fdq_id(struct k3_udma_glue_rx_channel *rx_chn,</div><div class='ctx'> u32 k3_udma_glue_rx_get_flow_id_base(struct k3_udma_glue_rx_channel *rx_chn);</div><div class='ctx'> int k3_udma_glue_rx_get_irq(struct k3_udma_glue_rx_channel *rx_chn,</div><div class='ctx'> 			    u32 flow_num);</div><div class='del'>-void k3_udma_glue_rx_put_irq(struct k3_udma_glue_rx_channel *rx_chn,</div><div class='del'>-			     u32 flow_num);</div><div class='ctx'> void k3_udma_glue_reset_rx_chn(struct k3_udma_glue_rx_channel *rx_chn,</div><div class='ctx'> 		u32 flow_num, void *data,</div><div class='del'>-		void (*cleanup)(void *data, dma_addr_t desc_dma),</div><div class='del'>-		bool skip_fdq);</div><div class='add'>+		void (*cleanup)(void *data, dma_addr_t desc_dma));</div><div class='ctx'> int k3_udma_glue_rx_flow_enable(struct k3_udma_glue_rx_channel *rx_chn,</div><div class='ctx'> 				u32 flow_idx);</div><div class='ctx'> int k3_udma_glue_rx_flow_disable(struct k3_udma_glue_rx_channel *rx_chn,</div><div class='head'>diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h<br/>index 752dbde4cec1..99efe2b9b4ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dmaengine.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dmaengine.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dmaengine.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dmaengine.h</a></div><div class='hunk'>@@ -84,7 +84,7 @@ enum dma_transfer_direction {</div><div class='ctx'> 	DMA_TRANS_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Interleaved Transfer Request</div><div class='ctx'>  * ----------------------------</div><div class='ctx'>  * A chunk is collection of contiguous bytes to be transferred.</div><div class='hunk'>@@ -161,6 +161,16 @@ struct dma_interleaved_template {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct dma_vec - DMA vector</div><div class='add'>+ * @addr: Bus address of the start of the vector</div><div class='add'>+ * @len: Length in bytes of the DMA vector</div><div class='add'>+ */</div><div class='add'>+struct dma_vec {</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	size_t len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * enum dma_ctrl_flags - DMA flags to augment operation preparation,</div><div class='ctx'>  *  control completion, and communicate status.</div><div class='ctx'>  * @DMA_PREP_INTERRUPT - trigger an interrupt (callback) upon completion of</div><div class='hunk'>@@ -213,7 +223,7 @@ enum sum_check_bits {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum pq_check_flags - result of async_{xor,pq}_zero_sum operations</div><div class='add'>+ * enum sum_check_flags - result of async_{xor,pq}_zero_sum operations</div><div class='ctx'>  * @SUM_CHECK_P_RESULT - 1 if xor zero sum error, 0 otherwise</div><div class='ctx'>  * @SUM_CHECK_Q_RESULT - 1 if reed-solomon zero sum error, 0 otherwise</div><div class='ctx'>  */</div><div class='hunk'>@@ -276,7 +286,7 @@ typedef struct { DECLARE_BITMAP(bits, DMA_TX_TYPE_END); } dma_cap_mask_t;</div><div class='ctx'>  *	pointer to the engine's metadata area</div><div class='ctx'>  *   4. Read out the metadata from the pointer</div><div class='ctx'>  *</div><div class='del'>- * Note: the two mode is not compatible and clients must use one mode for a</div><div class='add'>+ * Warning: the two modes are not compatible and clients must use one mode for a</div><div class='ctx'>  * descriptor.</div><div class='ctx'>  */</div><div class='ctx'> enum dma_desc_metadata_mode {</div><div class='hunk'>@@ -584,9 +594,13 @@ struct dma_descriptor_metadata_ops {</div><div class='ctx'>  * @phys: physical address of the descriptor</div><div class='ctx'>  * @chan: target channel for this operation</div><div class='ctx'>  * @tx_submit: accept the descriptor, assign ordered cookie and mark the</div><div class='del'>- * descriptor pending. To be pushed on .issue_pending() call</div><div class='add'>+ *	descriptor pending. To be pushed on .issue_pending() call</div><div class='add'>+ * @desc_free: driver's callback function to free a resusable descriptor</div><div class='add'>+ *	after completion</div><div class='ctx'>  * @callback: routine to call after this operation is complete</div><div class='add'>+ * @callback_result: error result from a DMA transaction</div><div class='ctx'>  * @callback_param: general parameter to pass to the callback routine</div><div class='add'>+ * @unmap: hook for generic DMA unmap data</div><div class='ctx'>  * @desc_metadata_mode: core managed metadata mode to protect mixed use of</div><div class='ctx'>  *	DESC_METADATA_CLIENT or DESC_METADATA_ENGINE. Otherwise</div><div class='ctx'>  *	DESC_METADATA_NONE</div><div class='hunk'>@@ -817,12 +831,14 @@ struct dma_filter {</div><div class='ctx'>  * @device_prep_dma_memset: prepares a memset operation</div><div class='ctx'>  * @device_prep_dma_memset_sg: prepares a memset operation over a scatter list</div><div class='ctx'>  * @device_prep_dma_interrupt: prepares an end of chain interrupt operation</div><div class='add'>+ * @device_prep_peripheral_dma_vec: prepares a scatter-gather DMA transfer,</div><div class='add'>+ *	where the address and size of each segment is located in one entry of</div><div class='add'>+ *	the dma_vec array.</div><div class='ctx'>  * @device_prep_slave_sg: prepares a slave dma operation</div><div class='ctx'>  * @device_prep_dma_cyclic: prepare a cyclic dma operation suitable for audio.</div><div class='ctx'>  *	The function takes a buffer of size buf_len. The callback function will</div><div class='ctx'>  *	be called after period_len bytes have been transferred.</div><div class='ctx'>  * @device_prep_interleaved_dma: Transfer expression in a generic way.</div><div class='del'>- * @device_prep_dma_imm_data: DMA's 8 byte immediate data to the dst address</div><div class='ctx'>  * @device_caps: May be used to override the generic DMA slave capabilities</div><div class='ctx'>  *	with per-channel specific ones</div><div class='ctx'>  * @device_config: Pushes a new configuration to a channel, return 0 or an error</div><div class='hunk'>@@ -910,6 +926,10 @@ struct dma_device {</div><div class='ctx'> 	struct dma_async_tx_descriptor *(*device_prep_dma_interrupt)(</div><div class='ctx'> 		struct dma_chan *chan, unsigned long flags);</div><div class='ctx'> </div><div class='add'>+	struct dma_async_tx_descriptor *(*device_prep_peripheral_dma_vec)(</div><div class='add'>+		struct dma_chan *chan, const struct dma_vec *vecs,</div><div class='add'>+		size_t nents, enum dma_transfer_direction direction,</div><div class='add'>+		unsigned long flags);</div><div class='ctx'> 	struct dma_async_tx_descriptor *(*device_prep_slave_sg)(</div><div class='ctx'> 		struct dma_chan *chan, struct scatterlist *sgl,</div><div class='ctx'> 		unsigned int sg_len, enum dma_transfer_direction direction,</div><div class='hunk'>@@ -921,9 +941,6 @@ struct dma_device {</div><div class='ctx'> 	struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(</div><div class='ctx'> 		struct dma_chan *chan, struct dma_interleaved_template *xt,</div><div class='ctx'> 		unsigned long flags);</div><div class='del'>-	struct dma_async_tx_descriptor *(*device_prep_dma_imm_data)(</div><div class='del'>-		struct dma_chan *chan, dma_addr_t dst, u64 data,</div><div class='del'>-		unsigned long flags);</div><div class='ctx'> </div><div class='ctx'> 	void (*device_caps)(struct dma_chan *chan, struct dma_slave_caps *caps);</div><div class='ctx'> 	int (*device_config)(struct dma_chan *chan, struct dma_slave_config *config);</div><div class='hunk'>@@ -973,6 +990,25 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(</div><div class='ctx'> 						  dir, flags, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * dmaengine_prep_peripheral_dma_vec() - Prepare a DMA scatter-gather descriptor</div><div class='add'>+ * @chan: The channel to be used for this descriptor</div><div class='add'>+ * @vecs: The array of DMA vectors that should be transferred</div><div class='add'>+ * @nents: The number of DMA vectors in the array</div><div class='add'>+ * @dir: Specifies the direction of the data transfer</div><div class='add'>+ * @flags: DMA engine flags</div><div class='add'>+ */</div><div class='add'>+static inline struct dma_async_tx_descriptor *dmaengine_prep_peripheral_dma_vec(</div><div class='add'>+	struct dma_chan *chan, const struct dma_vec *vecs, size_t nents,</div><div class='add'>+	enum dma_transfer_direction dir, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	if (!chan || !chan-&gt;device || !chan-&gt;device-&gt;device_prep_peripheral_dma_vec)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return chan-&gt;device-&gt;device_prep_peripheral_dma_vec(chan, vecs, nents,</div><div class='add'>+							    dir, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_sg(</div><div class='ctx'> 	struct dma_chan *chan, struct scatterlist *sgl,	unsigned int sg_len,</div><div class='ctx'> 	enum dma_transfer_direction dir, unsigned long flags)</div><div class='hunk'>@@ -1488,6 +1524,7 @@ struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,</div><div class='ctx'> </div><div class='ctx'> struct dma_chan *dma_request_chan(struct device *dev, const char *name);</div><div class='ctx'> struct dma_chan *dma_request_chan_by_mask(const dma_cap_mask_t *mask);</div><div class='add'>+struct dma_chan *devm_dma_request_chan(struct device *dev, const char *name);</div><div class='ctx'> </div><div class='ctx'> void dma_release_channel(struct dma_chan *chan);</div><div class='ctx'> int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps);</div><div class='hunk'>@@ -1524,6 +1561,12 @@ static inline struct dma_chan *dma_request_chan_by_mask(</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline struct dma_chan *devm_dma_request_chan(struct device *dev, const char *name)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void dma_release_channel(struct dma_chan *chan)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -1575,7 +1618,8 @@ int dma_async_device_register(struct dma_device *device);</div><div class='ctx'> int dmaenginem_async_device_register(struct dma_device *device);</div><div class='ctx'> void dma_async_device_unregister(struct dma_device *device);</div><div class='ctx'> int dma_async_device_channel_register(struct dma_device *device,</div><div class='del'>-				      struct dma_chan *chan);</div><div class='add'>+				      struct dma_chan *chan,</div><div class='add'>+				      const char *name);</div><div class='ctx'> void dma_async_device_channel_unregister(struct dma_device *device,</div><div class='ctx'> 					 struct dma_chan *chan);</div><div class='ctx'> void dma_run_dependencies(struct dma_async_tx_descriptor *tx);</div><div class='hunk'>@@ -1598,14 +1642,14 @@ static inline struct dma_chan</div><div class='ctx'> {</div><div class='ctx'> 	struct dma_chan *chan;</div><div class='ctx'> </div><div class='del'>-	chan = dma_request_slave_channel(dev, name);</div><div class='del'>-	if (chan)</div><div class='add'>+	chan = dma_request_chan(dev, name);</div><div class='add'>+	if (!IS_ERR(chan))</div><div class='ctx'> 		return chan;</div><div class='ctx'> </div><div class='ctx'> 	if (!fn || !fn_param)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return __dma_request_channel(&amp;mask, fn, fn_param, NULL);</div><div class='add'>+	return dma_request_channel(mask, fn, fn_param);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline char *</div><div class='head'>diff --git a/include/linux/dmapool.h b/include/linux/dmapool.h<br/>index f632ecfb4238..7d40b51933d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dmapool.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dmapool.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dmapool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dmapool.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #ifndef LINUX_DMAPOOL_H</div><div class='ctx'> #define	LINUX_DMAPOOL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/nodemask_types.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -18,8 +19,8 @@ struct device;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAS_DMA</div><div class='ctx'> </div><div class='del'>-struct dma_pool *dma_pool_create(const char *name, struct device *dev, </div><div class='del'>-			size_t size, size_t align, size_t allocation);</div><div class='add'>+struct dma_pool *dma_pool_create_node(const char *name, struct device *dev,</div><div class='add'>+		size_t size, size_t align, size_t boundary, int node);</div><div class='ctx'> </div><div class='ctx'> void dma_pool_destroy(struct dma_pool *pool);</div><div class='ctx'> </div><div class='hunk'>@@ -35,9 +36,12 @@ struct dma_pool *dmam_pool_create(const char *name, struct device *dev,</div><div class='ctx'> void dmam_pool_destroy(struct dma_pool *pool);</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_HAS_DMA */</div><div class='del'>-static inline struct dma_pool *dma_pool_create(const char *name,</div><div class='del'>-	struct device *dev, size_t size, size_t align, size_t allocation)</div><div class='del'>-{ return NULL; }</div><div class='add'>+static inline struct dma_pool *dma_pool_create_node(const char *name,</div><div class='add'>+		struct device *dev, size_t size, size_t align, size_t boundary,</div><div class='add'>+		int node)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> static inline void dma_pool_destroy(struct dma_pool *pool) { }</div><div class='ctx'> static inline void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,</div><div class='ctx'> 				   dma_addr_t *handle) { return NULL; }</div><div class='hunk'>@@ -49,6 +53,21 @@ static inline struct dma_pool *dmam_pool_create(const char *name,</div><div class='ctx'> static inline void dmam_pool_destroy(struct dma_pool *pool) { }</div><div class='ctx'> #endif /* !CONFIG_HAS_DMA */</div><div class='ctx'> </div><div class='add'>+static inline struct dma_pool *dma_pool_create(const char *name,</div><div class='add'>+		struct device *dev, size_t size, size_t align, size_t boundary)</div><div class='add'>+{</div><div class='add'>+	return dma_pool_create_node(name, dev, size, align, boundary,</div><div class='add'>+				    NUMA_NO_NODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_pool_zalloc - Get a zero-initialized block of DMA coherent memory.</div><div class='add'>+ * @pool: dma pool that will produce the block</div><div class='add'>+ * @mem_flags: GFP_* bitmask</div><div class='add'>+ * @handle: pointer to dma address of block</div><div class='add'>+ *</div><div class='add'>+ * Same as dma_pool_alloc(), but the returned memory is zeroed.</div><div class='add'>+ */</div><div class='ctx'> static inline void *dma_pool_zalloc(struct dma_pool *pool, gfp_t mem_flags,</div><div class='ctx'> 				    dma_addr_t *handle)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/dmar.h b/include/linux/dmar.h<br/>index e34b601b71fd..692b2b445761 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dmar.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dmar.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dmar.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dmar.h</a></div><div class='hunk'>@@ -117,7 +117,7 @@ extern int dmar_remove_dev_scope(struct dmar_pci_notify_info *info,</div><div class='ctx'> 				 int count);</div><div class='ctx'> /* Intel IOMMU detection */</div><div class='ctx'> void detect_intel_iommu(void);</div><div class='del'>-extern int enable_drhd_fault_handling(void);</div><div class='add'>+extern int enable_drhd_fault_handling(unsigned int cpu);</div><div class='ctx'> extern int dmar_device_add(acpi_handle handle);</div><div class='ctx'> extern int dmar_device_remove(acpi_handle handle);</div><div class='ctx'> </div><div class='hunk'>@@ -292,7 +292,6 @@ static inline void dmar_copy_shared_irte(struct irte *dst, struct irte *src)</div><div class='ctx'> struct irq_data;</div><div class='ctx'> extern void dmar_msi_unmask(struct irq_data *data);</div><div class='ctx'> extern void dmar_msi_mask(struct irq_data *data);</div><div class='del'>-extern void dmar_msi_read(int irq, struct msi_msg *msg);</div><div class='ctx'> extern void dmar_msi_write(int irq, struct msi_msg *msg);</div><div class='ctx'> extern int dmar_set_interrupt(struct intel_iommu *iommu);</div><div class='ctx'> extern irqreturn_t dmar_fault(int irq, void *dev_id);</div><div class='head'>diff --git a/include/linux/dpll.h b/include/linux/dpll.h<br/>index d275736230b3..562f520b23c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dpll.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dpll.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dpll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dpll.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> struct dpll_device;</div><div class='ctx'> struct dpll_pin;</div><div class='add'>+struct dpll_pin_esync;</div><div class='ctx'> </div><div class='ctx'> struct dpll_device_ops {</div><div class='ctx'> 	int (*mode_get)(const struct dpll_device *dpll, void *dpll_priv,</div><div class='hunk'>@@ -25,6 +26,24 @@ struct dpll_device_ops {</div><div class='ctx'> 			       struct netlink_ext_ack *extack);</div><div class='ctx'> 	int (*temp_get)(const struct dpll_device *dpll, void *dpll_priv,</div><div class='ctx'> 			s32 *temp, struct netlink_ext_ack *extack);</div><div class='add'>+	int (*clock_quality_level_get)(const struct dpll_device *dpll,</div><div class='add'>+				       void *dpll_priv,</div><div class='add'>+				       unsigned long *qls,</div><div class='add'>+				       struct netlink_ext_ack *extack);</div><div class='add'>+	int (*phase_offset_monitor_set)(const struct dpll_device *dpll,</div><div class='add'>+					void *dpll_priv,</div><div class='add'>+					enum dpll_feature_state state,</div><div class='add'>+					struct netlink_ext_ack *extack);</div><div class='add'>+	int (*phase_offset_monitor_get)(const struct dpll_device *dpll,</div><div class='add'>+					void *dpll_priv,</div><div class='add'>+					enum dpll_feature_state *state,</div><div class='add'>+					struct netlink_ext_ack *extack);</div><div class='add'>+	int (*phase_offset_avg_factor_set)(const struct dpll_device *dpll,</div><div class='add'>+					   void *dpll_priv, u32 factor,</div><div class='add'>+					   struct netlink_ext_ack *extack);</div><div class='add'>+	int (*phase_offset_avg_factor_get)(const struct dpll_device *dpll,</div><div class='add'>+					   void *dpll_priv, u32 *factor,</div><div class='add'>+					   struct netlink_ext_ack *extack);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpll_pin_ops {</div><div class='hunk'>@@ -83,6 +102,23 @@ struct dpll_pin_ops {</div><div class='ctx'> 	int (*ffo_get)(const struct dpll_pin *pin, void *pin_priv,</div><div class='ctx'> 		       const struct dpll_device *dpll, void *dpll_priv,</div><div class='ctx'> 		       s64 *ffo, struct netlink_ext_ack *extack);</div><div class='add'>+	int (*esync_set)(const struct dpll_pin *pin, void *pin_priv,</div><div class='add'>+			 const struct dpll_device *dpll, void *dpll_priv,</div><div class='add'>+			 u64 freq, struct netlink_ext_ack *extack);</div><div class='add'>+	int (*esync_get)(const struct dpll_pin *pin, void *pin_priv,</div><div class='add'>+			 const struct dpll_device *dpll, void *dpll_priv,</div><div class='add'>+			 struct dpll_pin_esync *esync,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='add'>+	int (*ref_sync_set)(const struct dpll_pin *pin, void *pin_priv,</div><div class='add'>+			    const struct dpll_pin *ref_sync_pin,</div><div class='add'>+			    void *ref_sync_pin_priv,</div><div class='add'>+			    const enum dpll_pin_state state,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+	int (*ref_sync_get)(const struct dpll_pin *pin, void *pin_priv,</div><div class='add'>+			    const struct dpll_pin *ref_sync_pin,</div><div class='add'>+			    void *ref_sync_pin_priv,</div><div class='add'>+			    enum dpll_pin_state *state,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpll_pin_frequency {</div><div class='hunk'>@@ -111,6 +147,13 @@ struct dpll_pin_phase_adjust_range {</div><div class='ctx'> 	s32 max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct dpll_pin_esync {</div><div class='add'>+	u64 freq;</div><div class='add'>+	const struct dpll_pin_frequency *range;</div><div class='add'>+	u8 range_num;</div><div class='add'>+	u8 pulse;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dpll_pin_properties {</div><div class='ctx'> 	const char *board_label;</div><div class='ctx'> 	const char *panel_label;</div><div class='hunk'>@@ -120,6 +163,7 @@ struct dpll_pin_properties {</div><div class='ctx'> 	u32 freq_supported_num;</div><div class='ctx'> 	struct dpll_pin_frequency *freq_supported;</div><div class='ctx'> 	struct dpll_pin_phase_adjust_range phase_range;</div><div class='add'>+	u32 phase_gran;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_DPLL)</div><div class='hunk'>@@ -175,6 +219,9 @@ int dpll_pin_on_pin_register(struct dpll_pin *parent, struct dpll_pin *pin,</div><div class='ctx'> void dpll_pin_on_pin_unregister(struct dpll_pin *parent, struct dpll_pin *pin,</div><div class='ctx'> 				const struct dpll_pin_ops *ops, void *priv);</div><div class='ctx'> </div><div class='add'>+int dpll_pin_ref_sync_pair_add(struct dpll_pin *pin,</div><div class='add'>+			       struct dpll_pin *ref_sync_pin);</div><div class='add'>+</div><div class='ctx'> int dpll_device_change_ntf(struct dpll_device *dpll);</div><div class='ctx'> </div><div class='ctx'> int dpll_pin_change_ntf(struct dpll_pin *pin);</div><div class='head'>diff --git a/include/linux/dsa/8021q.h b/include/linux/dsa/8021q.h<br/>index f3664ee12170..d13aabdeb4b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dsa/8021q.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dsa/8021q.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dsa/8021q.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dsa/8021q.h</a></div><div class='hunk'>@@ -8,12 +8,18 @@</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+/* VBID is limited to three bits only and zero is reserved.</div><div class='add'>+ * Only 7 bridges can be enumerated.</div><div class='add'>+ */</div><div class='add'>+#define DSA_TAG_8021Q_MAX_NUM_BRIDGES	7</div><div class='add'>+</div><div class='ctx'> int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto);</div><div class='ctx'> </div><div class='ctx'> void dsa_tag_8021q_unregister(struct dsa_switch *ds);</div><div class='ctx'> </div><div class='ctx'> int dsa_tag_8021q_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-			      struct dsa_bridge bridge);</div><div class='add'>+			      struct dsa_bridge bridge, bool *tx_fwd_offload,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='ctx'> </div><div class='ctx'> void dsa_tag_8021q_bridge_leave(struct dsa_switch *ds, int port,</div><div class='ctx'> 				struct dsa_bridge bridge);</div><div class='head'>diff --git a/include/linux/dsa/lan9303.h b/include/linux/dsa/lan9303.h<br/>index b4f22112ba75..3ce7cbcc37a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dsa/lan9303.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dsa/lan9303.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dsa/lan9303.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dsa/lan9303.h</a></div><div class='hunk'>@@ -5,8 +5,8 @@ struct lan9303;</div><div class='ctx'> </div><div class='ctx'> struct lan9303_phy_ops {</div><div class='ctx'> 	/* PHY 1 and 2 access*/</div><div class='del'>-	int	(*phy_read)(struct lan9303 *chip, int port, int regnum);</div><div class='del'>-	int	(*phy_write)(struct lan9303 *chip, int port,</div><div class='add'>+	int	(*phy_read)(struct lan9303 *chip, int addr, int regnum);</div><div class='add'>+	int	(*phy_write)(struct lan9303 *chip, int addr,</div><div class='ctx'> 			     int regnum, u16 val);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/dsa/ocelot.h b/include/linux/dsa/ocelot.h<br/>index dca2969015d8..620a3260fc08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dsa/ocelot.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dsa/ocelot.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dsa/ocelot.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dsa/ocelot.h</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> #ifndef _NET_DSA_TAG_OCELOT_H</div><div class='ctx'> #define _NET_DSA_TAG_OCELOT_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/packing.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -13,6 +15,7 @@</div><div class='ctx'> struct ocelot_skb_cb {</div><div class='ctx'> 	struct sk_buff *clone;</div><div class='ctx'> 	unsigned int ptp_class; /* valid only for clones */</div><div class='add'>+	unsigned long ptp_tx_time; /* valid only for clones */</div><div class='ctx'> 	u32 tstamp_lo;</div><div class='ctx'> 	u8 ptp_cmd;</div><div class='ctx'> 	u8 ts_id;</div><div class='hunk'>@@ -273,4 +276,49 @@ static inline u32 ocelot_ptp_rew_op(struct sk_buff *skb)</div><div class='ctx'> 	return rew_op;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ocelot_xmit_get_vlan_info: Determine VLAN_TCI and TAG_TYPE for injected frame</div><div class='add'>+ * @skb: Pointer to socket buffer</div><div class='add'>+ * @br: Pointer to bridge device that the port is under, if any</div><div class='add'>+ * @vlan_tci:</div><div class='add'>+ * @tag_type:</div><div class='add'>+ *</div><div class='add'>+ * If the port is under a VLAN-aware bridge, remove the VLAN header from the</div><div class='add'>+ * payload and move it into the DSA tag, which will make the switch classify</div><div class='add'>+ * the packet to the bridge VLAN. Otherwise, leave the classified VLAN at zero,</div><div class='add'>+ * which is the pvid of standalone ports (OCELOT_STANDALONE_PVID), although not</div><div class='add'>+ * of VLAN-unaware bridge ports (that would be ocelot_vlan_unaware_pvid()).</div><div class='add'>+ * Anyway, VID 0 is fine because it is stripped on egress for these port modes,</div><div class='add'>+ * and source address learning is not performed for packets injected from the</div><div class='add'>+ * CPU anyway, so it doesn't matter that the VID is "wrong".</div><div class='add'>+ */</div><div class='add'>+static inline void ocelot_xmit_get_vlan_info(struct sk_buff *skb,</div><div class='add'>+					     struct net_device *br,</div><div class='add'>+					     u64 *vlan_tci, u64 *tag_type)</div><div class='add'>+{</div><div class='add'>+	struct vlan_ethhdr *hdr;</div><div class='add'>+	u16 proto, tci;</div><div class='add'>+</div><div class='add'>+	if (!br || !br_vlan_enabled(br)) {</div><div class='add'>+		*vlan_tci = 0;</div><div class='add'>+		*tag_type = IFH_TAG_TYPE_C;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (struct vlan_ethhdr *)skb_mac_header(skb);</div><div class='add'>+	br_vlan_get_proto(br, &amp;proto);</div><div class='add'>+</div><div class='add'>+	if (ntohs(hdr-&gt;h_vlan_proto) == proto) {</div><div class='add'>+		vlan_remove_tag(skb, &amp;tci);</div><div class='add'>+		*vlan_tci = tci;</div><div class='add'>+	} else {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		br_vlan_get_pvid_rcu(br, &amp;tci);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		*vlan_tci = tci;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*tag_type = (proto != ETH_P_8021Q) ? IFH_TAG_TYPE_S : IFH_TAG_TYPE_C;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/dw_apb_timer.h b/include/linux/dw_apb_timer.h<br/>index 82ebf9223948..f8811c46b89e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dw_apb_timer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dw_apb_timer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dw_apb_timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dw_apb_timer.h</a></div><div class='hunk'>@@ -34,9 +34,6 @@ struct dw_apb_clocksource {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void dw_apb_clockevent_register(struct dw_apb_clock_event_device *dw_ced);</div><div class='del'>-void dw_apb_clockevent_pause(struct dw_apb_clock_event_device *dw_ced);</div><div class='del'>-void dw_apb_clockevent_resume(struct dw_apb_clock_event_device *dw_ced);</div><div class='del'>-void dw_apb_clockevent_stop(struct dw_apb_clock_event_device *dw_ced);</div><div class='ctx'> </div><div class='ctx'> struct dw_apb_clock_event_device *</div><div class='ctx'> dw_apb_clockevent_init(int cpu, const char *name, unsigned rating,</div><div class='head'>diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h<br/>index 4fcbf4d4fd0a..05743900a116 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dynamic_debug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dynamic_debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dynamic_debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dynamic_debug.h</a></div><div class='hunk'>@@ -38,11 +38,12 @@ struct _ddebug {</div><div class='ctx'> #define _DPRINTK_FLAGS_INCL_LINENO	(1&lt;&lt;3)</div><div class='ctx'> #define _DPRINTK_FLAGS_INCL_TID		(1&lt;&lt;4)</div><div class='ctx'> #define _DPRINTK_FLAGS_INCL_SOURCENAME	(1&lt;&lt;5)</div><div class='add'>+#define _DPRINTK_FLAGS_INCL_STACK	(1&lt;&lt;6)</div><div class='ctx'> </div><div class='ctx'> #define _DPRINTK_FLAGS_INCL_ANY		\</div><div class='ctx'> 	(_DPRINTK_FLAGS_INCL_MODNAME | _DPRINTK_FLAGS_INCL_FUNCNAME |\</div><div class='ctx'> 	 _DPRINTK_FLAGS_INCL_LINENO  | _DPRINTK_FLAGS_INCL_TID |\</div><div class='del'>-	 _DPRINTK_FLAGS_INCL_SOURCENAME)</div><div class='add'>+	 _DPRINTK_FLAGS_INCL_SOURCENAME | _DPRINTK_FLAGS_INCL_STACK)</div><div class='ctx'> </div><div class='ctx'> #if defined DEBUG</div><div class='ctx'> #define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINT</div><div class='hunk'>@@ -160,6 +161,12 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,</div><div class='ctx'> 			 const struct ib_device *ibdev,</div><div class='ctx'> 			 const char *fmt, ...);</div><div class='ctx'> </div><div class='add'>+#define __dynamic_dump_stack(desc)				\</div><div class='add'>+{								\</div><div class='add'>+	if (desc.flags &amp; _DPRINTK_FLAGS_INCL_STACK)		\</div><div class='add'>+		dump_stack();					\</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, cls, fmt)	\</div><div class='ctx'> 	static struct _ddebug  __aligned(8)			\</div><div class='ctx'> 	__section("__dyndbg") name = {				\</div><div class='hunk'>@@ -220,8 +227,10 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,</div><div class='ctx'>  */</div><div class='ctx'> #define __dynamic_func_call_cls(id, cls, fmt, func, ...) do {	\</div><div class='ctx'> 	DEFINE_DYNAMIC_DEBUG_METADATA_CLS(id, cls, fmt);	\</div><div class='del'>-	if (DYNAMIC_DEBUG_BRANCH(id))				\</div><div class='add'>+	if (DYNAMIC_DEBUG_BRANCH(id)) {				\</div><div class='ctx'> 		func(&amp;id, ##__VA_ARGS__);			\</div><div class='add'>+		__dynamic_dump_stack(id);			\</div><div class='add'>+	}							\</div><div class='ctx'> } while (0)</div><div class='ctx'> #define __dynamic_func_call(id, fmt, func, ...)				\</div><div class='ctx'> 	__dynamic_func_call_cls(id, _DPRINTK_CLASS_DFLT, fmt,		\</div><div class='hunk'>@@ -229,8 +238,10 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,</div><div class='ctx'> </div><div class='ctx'> #define __dynamic_func_call_cls_no_desc(id, cls, fmt, func, ...) do {	\</div><div class='ctx'> 	DEFINE_DYNAMIC_DEBUG_METADATA_CLS(id, cls, fmt);		\</div><div class='del'>-	if (DYNAMIC_DEBUG_BRANCH(id))					\</div><div class='add'>+	if (DYNAMIC_DEBUG_BRANCH(id)) {					\</div><div class='ctx'> 		func(__VA_ARGS__);					\</div><div class='add'>+		__dynamic_dump_stack(id);				\</div><div class='add'>+	}								\</div><div class='ctx'> } while (0)</div><div class='ctx'> #define __dynamic_func_call_no_desc(id, fmt, func, ...)			\</div><div class='ctx'> 	__dynamic_func_call_cls_no_desc(id, _DPRINTK_CLASS_DFLT,	\</div><div class='hunk'>@@ -305,9 +316,9 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,</div><div class='ctx'> #define DYNAMIC_DEBUG_BRANCH(descriptor) false</div><div class='ctx'> </div><div class='ctx'> #define dynamic_pr_debug(fmt, ...)					\</div><div class='del'>-	do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)</div><div class='add'>+	no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)</div><div class='ctx'> #define dynamic_dev_dbg(dev, fmt, ...)					\</div><div class='del'>-	do { if (0) dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); } while (0)</div><div class='add'>+	dev_no_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define dynamic_hex_dump(prefix_str, prefix_type, rowsize,		\</div><div class='ctx'> 			 groupsize, buf, len, ascii)			\</div><div class='ctx'> 	do { if (0)							\</div><div class='head'>diff --git a/include/linux/dynamic_queue_limits.h b/include/linux/dynamic_queue_limits.h<br/>index 5693a4be0d9a..808b1a5102e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/dynamic_queue_limits.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/dynamic_queue_limits.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/dynamic_queue_limits.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/dynamic_queue_limits.h</a></div><div class='hunk'>@@ -50,6 +50,9 @@ struct dql {</div><div class='ctx'> 	unsigned int	adj_limit;		/* limit + num_completed */</div><div class='ctx'> 	unsigned int	last_obj_cnt;		/* Count at last queuing */</div><div class='ctx'> </div><div class='add'>+	/* Stall threshold (in jiffies), defined by user */</div><div class='add'>+	unsigned short	stall_thrs;</div><div class='add'>+</div><div class='ctx'> 	unsigned long	history_head;		/* top 58 bits of jiffies */</div><div class='ctx'> 	/* stall entries, a bit per entry */</div><div class='ctx'> 	unsigned long	history[DQL_HIST_LEN];</div><div class='hunk'>@@ -71,8 +74,6 @@ struct dql {</div><div class='ctx'> 	unsigned int	min_limit;		/* Minimum limit */</div><div class='ctx'> 	unsigned int	slack_hold_time;	/* Time to measure slack */</div><div class='ctx'> </div><div class='del'>-	/* Stall threshold (in jiffies), defined by user */</div><div class='del'>-	unsigned short	stall_thrs;</div><div class='ctx'> 	/* Longest stall detected, reported to user */</div><div class='ctx'> 	unsigned short	stall_max;</div><div class='ctx'> 	unsigned long	last_reap;		/* Last reap (in jiffies) */</div><div class='hunk'>@@ -83,27 +84,11 @@ struct dql {</div><div class='ctx'> #define DQL_MAX_OBJECT (UINT_MAX / 16)</div><div class='ctx'> #define DQL_MAX_LIMIT ((UINT_MAX / 2) - DQL_MAX_OBJECT)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Record number of objects queued. Assumes that caller has already checked</div><div class='del'>- * availability in the queue with dql_avail.</div><div class='del'>- */</div><div class='del'>-static inline void dql_queued(struct dql *dql, unsigned int count)</div><div class='add'>+/* Populate the bitmap to be processed later in dql_check_stall() */</div><div class='add'>+static inline void dql_queue_stall(struct dql *dql)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long map, now, now_hi, i;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(count &gt; DQL_MAX_OBJECT);</div><div class='del'>-</div><div class='del'>-	dql-&gt;last_obj_cnt = count;</div><div class='del'>-</div><div class='del'>-	/* We want to force a write first, so that cpu do not attempt</div><div class='del'>-	 * to get cache line containing last_obj_cnt, num_queued, adj_limit</div><div class='del'>-	 * in Shared state, but directly does a Request For Ownership</div><div class='del'>-	 * It is only a hint, we use barrier() only.</div><div class='del'>-	 */</div><div class='del'>-	barrier();</div><div class='del'>-</div><div class='del'>-	dql-&gt;num_queued += count;</div><div class='del'>-</div><div class='ctx'> 	now = jiffies;</div><div class='ctx'> 	now_hi = now / BITS_PER_LONG;</div><div class='ctx'> </div><div class='hunk'>@@ -133,6 +118,31 @@ static inline void dql_queued(struct dql *dql, unsigned int count)</div><div class='ctx'> 		WRITE_ONCE(DQL_HIST_ENT(dql, now_hi), map | BIT_MASK(now));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Record number of objects queued. Assumes that caller has already checked</div><div class='add'>+ * availability in the queue with dql_avail.</div><div class='add'>+ */</div><div class='add'>+static inline void dql_queued(struct dql *dql, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(count &gt; DQL_MAX_OBJECT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(dql-&gt;last_obj_cnt, count);</div><div class='add'>+</div><div class='add'>+	/* We want to force a write first, so that cpu do not attempt</div><div class='add'>+	 * to get cache line containing last_obj_cnt, num_queued, adj_limit</div><div class='add'>+	 * in Shared state, but directly does a Request For Ownership</div><div class='add'>+	 * It is only a hint, we use barrier() only.</div><div class='add'>+	 */</div><div class='add'>+	barrier();</div><div class='add'>+</div><div class='add'>+	dql-&gt;num_queued += count;</div><div class='add'>+</div><div class='add'>+	/* Only populate stall information if the threshold is set */</div><div class='add'>+	if (READ_ONCE(dql-&gt;stall_thrs))</div><div class='add'>+		dql_queue_stall(dql);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Returns how many objects can be queued, &lt; 0 indicates over limit. */</div><div class='ctx'> static inline int dql_avail(const struct dql *dql)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/edac.h b/include/linux/edac.h<br/>index b4ee8961e623..fa32f2aca22f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/edac.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/edac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/edac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/edac.h</a></div><div class='hunk'>@@ -661,4 +661,226 @@ static inline struct dimm_info *edac_get_dimm(struct mem_ctl_info *mci,</div><div class='ctx'> </div><div class='ctx'> 	return mci-&gt;dimms[index];</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#define EDAC_FEAT_NAME_LEN	128</div><div class='add'>+</div><div class='add'>+/* RAS feature type */</div><div class='add'>+enum edac_dev_feat {</div><div class='add'>+	RAS_FEAT_SCRUB,</div><div class='add'>+	RAS_FEAT_ECS,</div><div class='add'>+	RAS_FEAT_MEM_REPAIR,</div><div class='add'>+	RAS_FEAT_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct edac_scrub_ops - scrub device operations (all elements optional)</div><div class='add'>+ * @read_addr: read base address of scrubbing range.</div><div class='add'>+ * @read_size: read offset of scrubbing range.</div><div class='add'>+ * @write_addr: set base address of the scrubbing range.</div><div class='add'>+ * @write_size: set offset of the scrubbing range.</div><div class='add'>+ * @get_enabled_bg: check if currently performing background scrub.</div><div class='add'>+ * @set_enabled_bg: start or stop a bg-scrub.</div><div class='add'>+ * @get_min_cycle: get minimum supported scrub cycle duration in seconds.</div><div class='add'>+ * @get_max_cycle: get maximum supported scrub cycle duration in seconds.</div><div class='add'>+ * @get_cycle_duration: get current scrub cycle duration in seconds.</div><div class='add'>+ * @set_cycle_duration: set current scrub cycle duration in seconds.</div><div class='add'>+ */</div><div class='add'>+struct edac_scrub_ops {</div><div class='add'>+	int (*read_addr)(struct device *dev, void *drv_data, u64 *base);</div><div class='add'>+	int (*read_size)(struct device *dev, void *drv_data, u64 *size);</div><div class='add'>+	int (*write_addr)(struct device *dev, void *drv_data, u64 base);</div><div class='add'>+	int (*write_size)(struct device *dev, void *drv_data, u64 size);</div><div class='add'>+	int (*get_enabled_bg)(struct device *dev, void *drv_data, bool *enable);</div><div class='add'>+	int (*set_enabled_bg)(struct device *dev, void *drv_data, bool enable);</div><div class='add'>+	int (*get_min_cycle)(struct device *dev, void *drv_data,  u32 *min);</div><div class='add'>+	int (*get_max_cycle)(struct device *dev, void *drv_data,  u32 *max);</div><div class='add'>+	int (*get_cycle_duration)(struct device *dev, void *drv_data, u32 *cycle);</div><div class='add'>+	int (*set_cycle_duration)(struct device *dev, void *drv_data, u32 cycle);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_EDAC_SCRUB)</div><div class='add'>+int edac_scrub_get_desc(struct device *scrub_dev,</div><div class='add'>+			const struct attribute_group **attr_groups,</div><div class='add'>+			u8 instance);</div><div class='add'>+#else</div><div class='add'>+static inline int edac_scrub_get_desc(struct device *scrub_dev,</div><div class='add'>+				      const struct attribute_group **attr_groups,</div><div class='add'>+				      u8 instance)</div><div class='add'>+{ return -EOPNOTSUPP; }</div><div class='add'>+#endif /* CONFIG_EDAC_SCRUB */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct edac_ecs_ops - ECS device operations (all elements optional)</div><div class='add'>+ * @get_log_entry_type: read the log entry type value.</div><div class='add'>+ * @set_log_entry_type: set the log entry type value.</div><div class='add'>+ * @get_mode: read the mode value.</div><div class='add'>+ * @set_mode: set the mode value.</div><div class='add'>+ * @reset: reset the ECS counter.</div><div class='add'>+ * @get_threshold: read the threshold count per gigabits of memory cells.</div><div class='add'>+ * @set_threshold: set the threshold count per gigabits of memory cells.</div><div class='add'>+ */</div><div class='add'>+struct edac_ecs_ops {</div><div class='add'>+	int (*get_log_entry_type)(struct device *dev, void *drv_data, int fru_id, u32 *val);</div><div class='add'>+	int (*set_log_entry_type)(struct device *dev, void *drv_data, int fru_id, u32 val);</div><div class='add'>+	int (*get_mode)(struct device *dev, void *drv_data, int fru_id, u32 *val);</div><div class='add'>+	int (*set_mode)(struct device *dev, void *drv_data, int fru_id, u32 val);</div><div class='add'>+	int (*reset)(struct device *dev, void *drv_data, int fru_id, u32 val);</div><div class='add'>+	int (*get_threshold)(struct device *dev, void *drv_data, int fru_id, u32 *threshold);</div><div class='add'>+	int (*set_threshold)(struct device *dev, void *drv_data, int fru_id, u32 threshold);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct edac_ecs_ex_info {</div><div class='add'>+	u16 num_media_frus;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_EDAC_ECS)</div><div class='add'>+int edac_ecs_get_desc(struct device *ecs_dev,</div><div class='add'>+		      const struct attribute_group **attr_groups,</div><div class='add'>+		      u16 num_media_frus);</div><div class='add'>+#else</div><div class='add'>+static inline int edac_ecs_get_desc(struct device *ecs_dev,</div><div class='add'>+				    const struct attribute_group **attr_groups,</div><div class='add'>+				    u16 num_media_frus)</div><div class='add'>+{ return -EOPNOTSUPP; }</div><div class='add'>+#endif /* CONFIG_EDAC_ECS */</div><div class='add'>+</div><div class='add'>+enum edac_mem_repair_type {</div><div class='add'>+	EDAC_REPAIR_PPR,</div><div class='add'>+	EDAC_REPAIR_CACHELINE_SPARING,</div><div class='add'>+	EDAC_REPAIR_ROW_SPARING,</div><div class='add'>+	EDAC_REPAIR_BANK_SPARING,</div><div class='add'>+	EDAC_REPAIR_RANK_SPARING,</div><div class='add'>+	EDAC_REPAIR_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const char * const edac_repair_type[];</div><div class='add'>+</div><div class='add'>+enum edac_mem_repair_cmd {</div><div class='add'>+	EDAC_DO_MEM_REPAIR = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct edac_mem_repair_ops - memory repair operations</div><div class='add'>+ * (all elements are optional except do_repair, set_hpa/set_dpa)</div><div class='add'>+ * @get_repair_type: get the memory repair type, listed in</div><div class='add'>+ *			 enum edac_mem_repair_function.</div><div class='add'>+ * @get_persist_mode: get the current persist mode.</div><div class='add'>+ *		      false - Soft repair type (temporary repair).</div><div class='add'>+ *		      true - Hard memory repair type (permanent repair).</div><div class='add'>+ * @set_persist_mode: set the persist mode of the memory repair instance.</div><div class='add'>+ * @get_repair_safe_when_in_use: get whether memory media is accessible and</div><div class='add'>+ *				 data is retained during repair operation.</div><div class='add'>+ * @get_hpa: get current host physical address (HPA) of memory to repair.</div><div class='add'>+ * @set_hpa: set host physical address (HPA) of memory to repair.</div><div class='add'>+ * @get_min_hpa: get the minimum supported host physical address (HPA).</div><div class='add'>+ * @get_max_hpa: get the maximum supported host physical address (HPA).</div><div class='add'>+ * @get_dpa: get current device physical address (DPA) of memory to repair.</div><div class='add'>+ * @set_dpa: set device physical address (DPA) of memory to repair.</div><div class='add'>+ *	     In some states of system configuration (e.g. before address decoders</div><div class='add'>+ *	     have been configured), memory devices (e.g. CXL) may not have an active</div><div class='add'>+ *	     mapping in the host physical address map. As such, the memory</div><div class='add'>+ *	     to repair must be identified by a device specific physical addressing</div><div class='add'>+ *	     scheme using a device physical address(DPA). The DPA and other control</div><div class='add'>+ *	     attributes to use for the repair operations will be presented in related</div><div class='add'>+ *	     error records.</div><div class='add'>+ * @get_min_dpa: get the minimum supported device physical address (DPA).</div><div class='add'>+ * @get_max_dpa: get the maximum supported device physical address (DPA).</div><div class='add'>+ * @get_nibble_mask: get current nibble mask of memory to repair.</div><div class='add'>+ * @set_nibble_mask: set nibble mask of memory to repair.</div><div class='add'>+ * @get_bank_group: get current bank group of memory to repair.</div><div class='add'>+ * @set_bank_group: set bank group of memory to repair.</div><div class='add'>+ * @get_bank: get current bank of memory to repair.</div><div class='add'>+ * @set_bank: set bank of memory to repair.</div><div class='add'>+ * @get_rank: get current rank of memory to repair.</div><div class='add'>+ * @set_rank: set rank of memory to repair.</div><div class='add'>+ * @get_row: get current row of memory to repair.</div><div class='add'>+ * @set_row: set row of memory to repair.</div><div class='add'>+ * @get_column: get current column of memory to repair.</div><div class='add'>+ * @set_column: set column of memory to repair.</div><div class='add'>+ * @get_channel: get current channel of memory to repair.</div><div class='add'>+ * @set_channel: set channel of memory to repair.</div><div class='add'>+ * @get_sub_channel: get current subchannel of memory to repair.</div><div class='add'>+ * @set_sub_channel: set subchannel of memory to repair.</div><div class='add'>+ * @do_repair: Issue memory repair operation for the HPA/DPA and</div><div class='add'>+ *	       other control attributes set for the memory to repair.</div><div class='add'>+ *</div><div class='add'>+ * All elements are optional except do_repair and at least one of set_hpa/set_dpa.</div><div class='add'>+ */</div><div class='add'>+struct edac_mem_repair_ops {</div><div class='add'>+	int (*get_repair_type)(struct device *dev, void *drv_data, const char **type);</div><div class='add'>+	int (*get_persist_mode)(struct device *dev, void *drv_data, bool *persist);</div><div class='add'>+	int (*set_persist_mode)(struct device *dev, void *drv_data, bool persist);</div><div class='add'>+	int (*get_repair_safe_when_in_use)(struct device *dev, void *drv_data, bool *safe);</div><div class='add'>+	int (*get_hpa)(struct device *dev, void *drv_data, u64 *hpa);</div><div class='add'>+	int (*set_hpa)(struct device *dev, void *drv_data, u64 hpa);</div><div class='add'>+	int (*get_min_hpa)(struct device *dev, void *drv_data, u64 *hpa);</div><div class='add'>+	int (*get_max_hpa)(struct device *dev, void *drv_data, u64 *hpa);</div><div class='add'>+	int (*get_dpa)(struct device *dev, void *drv_data, u64 *dpa);</div><div class='add'>+	int (*set_dpa)(struct device *dev, void *drv_data, u64 dpa);</div><div class='add'>+	int (*get_min_dpa)(struct device *dev, void *drv_data, u64 *dpa);</div><div class='add'>+	int (*get_max_dpa)(struct device *dev, void *drv_data, u64 *dpa);</div><div class='add'>+	int (*get_nibble_mask)(struct device *dev, void *drv_data, u32 *val);</div><div class='add'>+	int (*set_nibble_mask)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+	int (*get_bank_group)(struct device *dev, void *drv_data, u32 *val);</div><div class='add'>+	int (*set_bank_group)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+	int (*get_bank)(struct device *dev, void *drv_data, u32 *val);</div><div class='add'>+	int (*set_bank)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+	int (*get_rank)(struct device *dev, void *drv_data, u32 *val);</div><div class='add'>+	int (*set_rank)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+	int (*get_row)(struct device *dev, void *drv_data, u32 *val);</div><div class='add'>+	int (*set_row)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+	int (*get_column)(struct device *dev, void *drv_data, u32 *val);</div><div class='add'>+	int (*set_column)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+	int (*get_channel)(struct device *dev, void *drv_data, u32 *val);</div><div class='add'>+	int (*set_channel)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+	int (*get_sub_channel)(struct device *dev, void *drv_data, u32 *val);</div><div class='add'>+	int (*set_sub_channel)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+	int (*do_repair)(struct device *dev, void *drv_data, u32 val);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_EDAC_MEM_REPAIR)</div><div class='add'>+int edac_mem_repair_get_desc(struct device *dev,</div><div class='add'>+			     const struct attribute_group **attr_groups,</div><div class='add'>+			     u8 instance);</div><div class='add'>+#else</div><div class='add'>+static inline int edac_mem_repair_get_desc(struct device *dev,</div><div class='add'>+					   const struct attribute_group **attr_groups,</div><div class='add'>+					   u8 instance)</div><div class='add'>+{ return -EOPNOTSUPP; }</div><div class='add'>+#endif /* CONFIG_EDAC_MEM_REPAIR */</div><div class='add'>+</div><div class='add'>+/* EDAC device feature information structure */</div><div class='add'>+struct edac_dev_data {</div><div class='add'>+	union {</div><div class='add'>+		const struct edac_scrub_ops *scrub_ops;</div><div class='add'>+		const struct edac_ecs_ops *ecs_ops;</div><div class='add'>+		const struct edac_mem_repair_ops *mem_repair_ops;</div><div class='add'>+	};</div><div class='add'>+	u8 instance;</div><div class='add'>+	void *private;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct edac_dev_feat_ctx {</div><div class='add'>+	struct device dev;</div><div class='add'>+	void *private;</div><div class='add'>+	struct edac_dev_data *scrub;</div><div class='add'>+	struct edac_dev_data ecs;</div><div class='add'>+	struct edac_dev_data *mem_repair;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct edac_dev_feature {</div><div class='add'>+	enum edac_dev_feat ft_type;</div><div class='add'>+	u8 instance;</div><div class='add'>+	union {</div><div class='add'>+		const struct edac_scrub_ops *scrub_ops;</div><div class='add'>+		const struct edac_ecs_ops *ecs_ops;</div><div class='add'>+		const struct edac_mem_repair_ops *mem_repair_ops;</div><div class='add'>+	};</div><div class='add'>+	void *ctx;</div><div class='add'>+	struct edac_ecs_ex_info ecs_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int edac_dev_register(struct device *parent, char *dev_name,</div><div class='add'>+		      void *parent_pvt_data, int num_features,</div><div class='add'>+		      const struct edac_dev_feature *ras_features);</div><div class='ctx'> #endif /* _LINUX_EDAC_H_ */</div><div class='head'>diff --git a/include/linux/eeprom_93cx6.h b/include/linux/eeprom_93cx6.h<br/>index c860c72a921d..3a485cc0e0fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/eeprom_93cx6.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/eeprom_93cx6.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/eeprom_93cx6.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/eeprom_93cx6.h</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> 	Supported chipsets: 93c46, 93c56 and 93c66.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * EEPROM operation defines.</div><div class='ctx'>  */</div><div class='hunk'>@@ -34,6 +36,7 @@</div><div class='ctx'>  * @register_write(struct eeprom_93cx6 *eeprom): handler to</div><div class='ctx'>  * write to the eeprom register by using all reg_* fields.</div><div class='ctx'>  * @width: eeprom width, should be one of the PCI_EEPROM_WIDTH_* defines</div><div class='add'>+ * @quirks: eeprom or controller quirks</div><div class='ctx'>  * @drive_data: Set if we're driving the data line.</div><div class='ctx'>  * @reg_data_in: register field to indicate data input</div><div class='ctx'>  * @reg_data_out: register field to indicate data output</div><div class='hunk'>@@ -50,6 +53,9 @@ struct eeprom_93cx6 {</div><div class='ctx'> 	void (*register_write)(struct eeprom_93cx6 *eeprom);</div><div class='ctx'> </div><div class='ctx'> 	int width;</div><div class='add'>+	unsigned int quirks;</div><div class='add'>+/* Some EEPROMs require an extra clock cycle before reading */</div><div class='add'>+#define PCI_EEPROM_QUIRK_EXTRA_READ_CYCLE	BIT(0)</div><div class='ctx'> </div><div class='ctx'> 	char drive_data;</div><div class='ctx'> 	char reg_data_in;</div><div class='hunk'>@@ -71,3 +77,8 @@ extern void eeprom_93cx6_wren(struct eeprom_93cx6 *eeprom, bool enable);</div><div class='ctx'> </div><div class='ctx'> extern void eeprom_93cx6_write(struct eeprom_93cx6 *eeprom,</div><div class='ctx'> 			       u8 addr, u16 data);</div><div class='add'>+</div><div class='add'>+static inline bool has_quirk_extra_read_cycle(struct eeprom_93cx6 *eeprom)</div><div class='add'>+{</div><div class='add'>+	return eeprom-&gt;quirks &amp; PCI_EEPROM_QUIRK_EXTRA_READ_CYCLE;</div><div class='add'>+}</div><div class='head'>diff --git a/include/linux/eeprom_93xx46.h b/include/linux/eeprom_93xx46.h<br/>deleted file mode 100644<br/>index 34c2175e6a1e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/eeprom_93xx46.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/eeprom_93xx46.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- * Module: eeprom_93xx46</div><div class='del'>- * platform description for 93xx46 EEPROMs.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/gpio/consumer.h&gt;</div><div class='del'>-</div><div class='del'>-struct eeprom_93xx46_platform_data {</div><div class='del'>-	unsigned char	flags;</div><div class='del'>-#define EE_ADDR8	0x01		/*  8 bit addr. cfg */</div><div class='del'>-#define EE_ADDR16	0x02		/* 16 bit addr. cfg */</div><div class='del'>-#define EE_READONLY	0x08		/* forbid writing */</div><div class='del'>-#define EE_SIZE1K	0x10		/* 1 kb of data, that is a 93xx46 */</div><div class='del'>-#define EE_SIZE2K	0x20		/* 2 kb of data, that is a 93xx56 */</div><div class='del'>-#define EE_SIZE4K	0x40		/* 4 kb of data, that is a 93xx66 */</div><div class='del'>-</div><div class='del'>-	unsigned int	quirks;</div><div class='del'>-/* Single word read transfers only; no sequential read. */</div><div class='del'>-#define EEPROM_93XX46_QUIRK_SINGLE_WORD_READ		(1 &lt;&lt; 0)</div><div class='del'>-/* Instructions such as EWEN are (addrlen + 2) in length. */</div><div class='del'>-#define EEPROM_93XX46_QUIRK_INSTRUCTION_LENGTH		(1 &lt;&lt; 1)</div><div class='del'>-/* Add extra cycle after address during a read */</div><div class='del'>-#define EEPROM_93XX46_QUIRK_EXTRA_READ_CYCLE		BIT(2)</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * optional hooks to control additional logic</div><div class='del'>-	 * before and after spi transfer.</div><div class='del'>-	 */</div><div class='del'>-	void (*prepare)(void *);</div><div class='del'>-	void (*finish)(void *);</div><div class='del'>-	struct gpio_desc *select;</div><div class='del'>-};</div><div class='head'>diff --git a/include/linux/efi.h b/include/linux/efi.h<br/>index f0d56f106b60..2a43094e23f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/efi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/efi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/efi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/efi.h</a></div><div class='hunk'>@@ -74,10 +74,10 @@ typedef void *efi_handle_t;</div><div class='ctx'>  */</div><div class='ctx'> typedef guid_t efi_guid_t __aligned(__alignof__(u32));</div><div class='ctx'> </div><div class='del'>-#define EFI_GUID(a, b, c, d...) (efi_guid_t){ {					\</div><div class='add'>+#define EFI_GUID(a, b, c, d...) ((efi_guid_t){ {				\</div><div class='ctx'> 	(a) &amp; 0xff, ((a) &gt;&gt; 8) &amp; 0xff, ((a) &gt;&gt; 16) &amp; 0xff, ((a) &gt;&gt; 24) &amp; 0xff,	\</div><div class='ctx'> 	(b) &amp; 0xff, ((b) &gt;&gt; 8) &amp; 0xff,						\</div><div class='del'>-	(c) &amp; 0xff, ((c) &gt;&gt; 8) &amp; 0xff, d } }</div><div class='add'>+	(c) &amp; 0xff, ((c) &gt;&gt; 8) &amp; 0xff, d } })</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generic EFI table header</div><div class='hunk'>@@ -114,21 +114,22 @@ typedef	struct {</div><div class='ctx'> #define EFI_MAX_MEMORY_TYPE		16</div><div class='ctx'> </div><div class='ctx'> /* Attribute values: */</div><div class='del'>-#define EFI_MEMORY_UC		((u64)0x0000000000000001ULL)	/* uncached */</div><div class='del'>-#define EFI_MEMORY_WC		((u64)0x0000000000000002ULL)	/* write-coalescing */</div><div class='del'>-#define EFI_MEMORY_WT		((u64)0x0000000000000004ULL)	/* write-through */</div><div class='del'>-#define EFI_MEMORY_WB		((u64)0x0000000000000008ULL)	/* write-back */</div><div class='del'>-#define EFI_MEMORY_UCE		((u64)0x0000000000000010ULL)	/* uncached, exported */</div><div class='del'>-#define EFI_MEMORY_WP		((u64)0x0000000000001000ULL)	/* write-protect */</div><div class='del'>-#define EFI_MEMORY_RP		((u64)0x0000000000002000ULL)	/* read-protect */</div><div class='del'>-#define EFI_MEMORY_XP		((u64)0x0000000000004000ULL)	/* execute-protect */</div><div class='del'>-#define EFI_MEMORY_NV		((u64)0x0000000000008000ULL)	/* non-volatile */</div><div class='del'>-#define EFI_MEMORY_MORE_RELIABLE \</div><div class='del'>-				((u64)0x0000000000010000ULL)	/* higher reliability */</div><div class='del'>-#define EFI_MEMORY_RO		((u64)0x0000000000020000ULL)	/* read-only */</div><div class='del'>-#define EFI_MEMORY_SP		((u64)0x0000000000040000ULL)	/* soft reserved */</div><div class='del'>-#define EFI_MEMORY_CPU_CRYPTO	((u64)0x0000000000080000ULL)	/* supports encryption */</div><div class='del'>-#define EFI_MEMORY_RUNTIME	((u64)0x8000000000000000ULL)	/* range requires runtime mapping */</div><div class='add'>+#define EFI_MEMORY_UC			BIT_ULL(0)	/* uncached */</div><div class='add'>+#define EFI_MEMORY_WC			BIT_ULL(1)	/* write-coalescing */</div><div class='add'>+#define EFI_MEMORY_WT			BIT_ULL(2)	/* write-through */</div><div class='add'>+#define EFI_MEMORY_WB			BIT_ULL(3)	/* write-back */</div><div class='add'>+#define EFI_MEMORY_UCE			BIT_ULL(4)	/* uncached, exported */</div><div class='add'>+#define EFI_MEMORY_WP			BIT_ULL(12)	/* write-protect */</div><div class='add'>+#define EFI_MEMORY_RP			BIT_ULL(13)	/* read-protect */</div><div class='add'>+#define EFI_MEMORY_XP			BIT_ULL(14)	/* execute-protect */</div><div class='add'>+#define EFI_MEMORY_NV			BIT_ULL(15)	/* non-volatile */</div><div class='add'>+#define EFI_MEMORY_MORE_RELIABLE	BIT_ULL(16)	/* higher reliability */</div><div class='add'>+#define EFI_MEMORY_RO			BIT_ULL(17)	/* read-only */</div><div class='add'>+#define EFI_MEMORY_SP			BIT_ULL(18)	/* soft reserved */</div><div class='add'>+#define EFI_MEMORY_CPU_CRYPTO		BIT_ULL(19)	/* supports encryption */</div><div class='add'>+#define EFI_MEMORY_HOT_PLUGGABLE	BIT_ULL(20)	/* supports unplugging at runtime */</div><div class='add'>+#define EFI_MEMORY_RUNTIME		BIT_ULL(63)	/* range requires runtime mapping */</div><div class='add'>+</div><div class='ctx'> #define EFI_MEMORY_DESCRIPTOR_VERSION	1</div><div class='ctx'> </div><div class='ctx'> #define EFI_PAGE_SHIFT		12</div><div class='hunk'>@@ -289,7 +290,7 @@ typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor,</div><div class='ctx'> 					 unsigned long *data_size, void *data);</div><div class='ctx'> typedef efi_status_t efi_get_next_variable_t (unsigned long *name_size, efi_char16_t *name,</div><div class='ctx'> 					      efi_guid_t *vendor);</div><div class='del'>-typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor, </div><div class='add'>+typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor,</div><div class='ctx'> 					 u32 attr, unsigned long data_size,</div><div class='ctx'> 					 void *data);</div><div class='ctx'> typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count);</div><div class='hunk'>@@ -363,7 +364,6 @@ void efi_native_runtime_setup(void);</div><div class='ctx'> #define ACPI_20_TABLE_GUID			EFI_GUID(0x8868e871, 0xe4f1, 0x11d3,  0xbc, 0x22, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81)</div><div class='ctx'> #define SMBIOS_TABLE_GUID			EFI_GUID(0xeb9d2d31, 0x2d88, 0x11d3,  0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)</div><div class='ctx'> #define SMBIOS3_TABLE_GUID			EFI_GUID(0xf2fd1544, 0x9794, 0x4a2c,  0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94)</div><div class='del'>-#define UGA_IO_PROTOCOL_GUID			EFI_GUID(0x61a4d49e, 0x6f68, 0x4f1b,  0xb9, 0x22, 0xa8, 0x6e, 0xed, 0x0b, 0x07, 0xa2)</div><div class='ctx'> #define EFI_GLOBAL_VARIABLE_GUID		EFI_GUID(0x8be4df61, 0x93ca, 0x11d2,  0xaa, 0x0d, 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c)</div><div class='ctx'> #define UV_SYSTEM_TABLE_GUID			EFI_GUID(0x3b13a7d4, 0x633e, 0x11dd,  0x93, 0xec, 0xda, 0x25, 0x56, 0xd8, 0x95, 0x93)</div><div class='ctx'> #define LINUX_EFI_CRASH_GUID			EFI_GUID(0xcfc8fc79, 0xbe2e, 0x4ddc,  0x97, 0xf0, 0x9f, 0x98, 0xbf, 0xe2, 0x98, 0xa0)</div><div class='hunk'>@@ -373,18 +373,19 @@ void efi_native_runtime_setup(void);</div><div class='ctx'> #define EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID	EFI_GUID(0x8b843e20, 0x8132, 0x4852,  0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c)</div><div class='ctx'> #define EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL_GUID	EFI_GUID(0x05c99a21, 0xc70f, 0x4ad2,  0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e)</div><div class='ctx'> #define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID	EFI_GUID(0x9042a9de, 0x23dc, 0x4a38,  0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a)</div><div class='del'>-#define EFI_UGA_PROTOCOL_GUID			EFI_GUID(0x982c298b, 0xf4fa, 0x41cb,  0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39)</div><div class='add'>+#define EFI_EDID_DISCOVERED_PROTOCOL_GUID	EFI_GUID(0x1c0c34f6, 0xd380, 0x41fa,  0xa0, 0x49, 0x8a, 0xd0, 0x6c, 0x1a, 0x66, 0xaa)</div><div class='add'>+#define EFI_EDID_ACTIVE_PROTOCOL_GUID		EFI_GUID(0xbd8c1056, 0x9f36, 0x44ec,  0x92, 0xa8, 0xa6, 0x33, 0x7f, 0x81, 0x79, 0x86)</div><div class='ctx'> #define EFI_PCI_IO_PROTOCOL_GUID		EFI_GUID(0x4cf5b200, 0x68b8, 0x4ca5,  0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x02, 0x9a)</div><div class='ctx'> #define EFI_FILE_INFO_ID			EFI_GUID(0x09576e92, 0x6d3f, 0x11d2,  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)</div><div class='ctx'> #define EFI_SYSTEM_RESOURCE_TABLE_GUID		EFI_GUID(0xb122a263, 0x3661, 0x4f68,  0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80)</div><div class='ctx'> #define EFI_FILE_SYSTEM_GUID			EFI_GUID(0x964e5b22, 0x6459, 0x11d2,  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)</div><div class='ctx'> #define DEVICE_TREE_GUID			EFI_GUID(0xb1b621d5, 0xf19c, 0x41a5,  0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0)</div><div class='del'>-#define EFI_PROPERTIES_TABLE_GUID		EFI_GUID(0x880aaca3, 0x4adc, 0x4a04,  0x90, 0x79, 0xb7, 0x47, 0x34, 0x08, 0x25, 0xe5)</div><div class='ctx'> #define EFI_RNG_PROTOCOL_GUID			EFI_GUID(0x3152bca5, 0xeade, 0x433d,  0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44)</div><div class='ctx'> #define EFI_RNG_ALGORITHM_RAW			EFI_GUID(0xe43176d7, 0xb6e8, 0x4827,  0xb7, 0x84, 0x7f, 0xfd, 0xc4, 0xb6, 0x85, 0x61)</div><div class='ctx'> #define EFI_MEMORY_ATTRIBUTES_TABLE_GUID	EFI_GUID(0xdcfa911d, 0x26eb, 0x469f,  0xa2, 0x20, 0x38, 0xb7, 0xdc, 0x46, 0x12, 0x20)</div><div class='ctx'> #define EFI_CONSOLE_OUT_DEVICE_GUID		EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4,  0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)</div><div class='ctx'> #define APPLE_PROPERTIES_PROTOCOL_GUID		EFI_GUID(0x91bd12fe, 0xf6c3, 0x44fb,  0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0)</div><div class='add'>+#define APPLE_SET_OS_PROTOCOL_GUID		EFI_GUID(0xc5c5da95, 0x7d5c, 0x45e6,  0xb2, 0xf1, 0x3f, 0xd5, 0x2b, 0xb1, 0x00, 0x77)</div><div class='ctx'> #define EFI_TCG2_PROTOCOL_GUID			EFI_GUID(0x607f766c, 0x7455, 0x42be,  0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f)</div><div class='ctx'> #define EFI_TCG2_FINAL_EVENTS_TABLE_GUID	EFI_GUID(0x1e2ed096, 0x30e2, 0x4254,  0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25)</div><div class='ctx'> #define EFI_LOAD_FILE_PROTOCOL_GUID		EFI_GUID(0x56ec3091, 0x954c, 0x11d2,  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)</div><div class='hunk'>@@ -440,6 +441,7 @@ void efi_native_runtime_setup(void);</div><div class='ctx'> </div><div class='ctx'> /* OVMF protocol GUIDs */</div><div class='ctx'> #define OVMF_SEV_MEMORY_ACCEPTANCE_PROTOCOL_GUID	EFI_GUID(0xc5a010fe, 0x38a7, 0x4531,  0x8a, 0x4a, 0x05, 0x00, 0xd2, 0xfd, 0x16, 0x49)</div><div class='add'>+#define OVMF_MEMORY_LOG_TABLE_GUID		EFI_GUID(0x95305139, 0xb20f, 0x4723,  0x84, 0x25, 0x62, 0x7c, 0x88, 0x8f, 0xf1, 0x21)</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='ctx'> 	efi_guid_t guid;</div><div class='hunk'>@@ -580,15 +582,6 @@ struct efi_mem_range {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='del'>-	u32 version;</div><div class='del'>-	u32 length;</div><div class='del'>-	u64 memory_protection_attribute;</div><div class='del'>-} efi_properties_table_t;</div><div class='del'>-</div><div class='del'>-#define EFI_PROPERTIES_TABLE_VERSION	0x00010000</div><div class='del'>-#define EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA	0x1</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='ctx'> 	u16 version;</div><div class='ctx'> 	u16 length;</div><div class='ctx'> 	u32 runtime_services_supported;</div><div class='hunk'>@@ -607,7 +600,11 @@ typedef struct {</div><div class='ctx'> 	u32 num_entries;</div><div class='ctx'> 	u32 desc_size;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	efi_memory_desc_t entry[0];</div><div class='add'>+	/*</div><div class='add'>+	 * There are @num_entries following, each of size @desc_size bytes,</div><div class='add'>+	 * including an efi_memory_desc_t header. See efi_memdesc_ptr().</div><div class='add'>+	 */</div><div class='add'>+	efi_memory_desc_t entry[];</div><div class='ctx'> } efi_memory_attributes_table_t;</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='hunk'>@@ -648,6 +645,7 @@ extern struct efi {</div><div class='ctx'> 	unsigned long			esrt;			/* ESRT table */</div><div class='ctx'> 	unsigned long			tpm_log;		/* TPM2 Event Log table */</div><div class='ctx'> 	unsigned long			tpm_final_log;		/* TPM2 Final Events Log table */</div><div class='add'>+	unsigned long                   ovmf_debug_log;</div><div class='ctx'> 	unsigned long			mokvar_table;		/* MOK variable config table */</div><div class='ctx'> 	unsigned long			coco_secret;		/* Confidential computing secret table */</div><div class='ctx'> 	unsigned long			unaccepted;		/* Unaccepted memory table */</div><div class='hunk'>@@ -694,6 +692,11 @@ extern struct efi {</div><div class='ctx'> </div><div class='ctx'> extern struct mm_struct efi_mm;</div><div class='ctx'> </div><div class='add'>+static inline bool mm_is_efi(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_EFI) &amp;&amp; mm == &amp;efi_mm;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int</div><div class='ctx'> efi_guidcmp (efi_guid_t left, efi_guid_t right)</div><div class='ctx'> {</div><div class='hunk'>@@ -754,8 +757,6 @@ extern int efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md);</div><div class='ctx'> extern int __efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md);</div><div class='ctx'> extern void efi_mem_reserve(phys_addr_t addr, u64 size);</div><div class='ctx'> extern int efi_mem_reserve_persistent(phys_addr_t addr, u64 size);</div><div class='del'>-extern void efi_initialize_iomem_resources(struct resource *code_resource,</div><div class='del'>-		struct resource *data_resource, struct resource *bss_resource);</div><div class='ctx'> extern u64 efi_get_fdt_params(struct efi_memory_map_data *data);</div><div class='ctx'> extern struct kobject *efi_kobj;</div><div class='ctx'> </div><div class='hunk'>@@ -773,12 +774,12 @@ extern unsigned long efi_mem_attr_table;</div><div class='ctx'>  */</div><div class='ctx'> typedef int (*efi_memattr_perm_setter)(struct mm_struct *, efi_memory_desc_t *, bool);</div><div class='ctx'> </div><div class='del'>-extern int efi_memattr_init(void);</div><div class='add'>+extern void efi_memattr_init(void);</div><div class='ctx'> extern int efi_memattr_apply_permissions(struct mm_struct *mm,</div><div class='ctx'> 					 efi_memattr_perm_setter fn);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * efi_early_memdesc_ptr - get the n-th EFI memmap descriptor</div><div class='add'>+ * efi_memdesc_ptr - get the n-th EFI memmap descriptor</div><div class='ctx'>  * @map: the start of efi memmap</div><div class='ctx'>  * @desc_size: the size of space for each EFI memmap descriptor</div><div class='ctx'>  * @n: the index of efi memmap descriptor</div><div class='hunk'>@@ -796,7 +797,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,</div><div class='ctx'>  * during bootup since for_each_efi_memory_desc_xxx() is available after the</div><div class='ctx'>  * kernel initializes the EFI subsystem to set up struct efi_memory_map.</div><div class='ctx'>  */</div><div class='del'>-#define efi_early_memdesc_ptr(map, desc_size, n)			\</div><div class='add'>+#define efi_memdesc_ptr(map, desc_size, n)			\</div><div class='ctx'> 	(efi_memory_desc_t *)((void *)(map) + ((n) * (desc_size)))</div><div class='ctx'> </div><div class='ctx'> /* Iterate through an efi_memory_map */</div><div class='hunk'>@@ -863,10 +864,9 @@ static inline int efi_range_is_wc(unsigned long start, unsigned long len)</div><div class='ctx'> #define EFI_PARAVIRT		6	/* Access is via a paravirt interface */</div><div class='ctx'> #define EFI_ARCH_1		7	/* First arch-specific bit */</div><div class='ctx'> #define EFI_DBG			8	/* Print additional debug info at runtime */</div><div class='del'>-#define EFI_NX_PE_DATA		9	/* Can runtime data regions be mapped non-executable? */</div><div class='del'>-#define EFI_MEM_ATTR		10	/* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */</div><div class='del'>-#define EFI_MEM_NO_SOFT_RESERVE	11	/* Is the kernel configured to ignore soft reservations? */</div><div class='del'>-#define EFI_PRESERVE_BS_REGIONS	12	/* Are EFI boot-services memory segments available? */</div><div class='add'>+#define EFI_MEM_ATTR		9	/* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */</div><div class='add'>+#define EFI_MEM_NO_SOFT_RESERVE	10	/* Is the kernel configured to ignore soft reservations? */</div><div class='add'>+#define EFI_PRESERVE_BS_REGIONS	11	/* Are EFI boot-services memory segments available? */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EFI</div><div class='ctx'> /*</div><div class='hunk'>@@ -1067,12 +1067,11 @@ static inline u64 efivar_reserved_space(void) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The maximum size of VariableName + Data = 1024</div><div class='del'>- * Therefore, it's reasonable to save that much</div><div class='del'>- * space in each part of the structure,</div><div class='del'>- * and we use a page for reading/writing.</div><div class='add'>+ * There is no actual upper limit specified for the variable name size.</div><div class='add'>+ *</div><div class='add'>+ * This limit exists only for practical purposes, since name conversions</div><div class='add'>+ * are bounds-checked and name data is occasionally stored in-line.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #define EFI_VAR_NAME_LEN	1024</div><div class='ctx'> </div><div class='ctx'> int efivars_register(struct efivars *efivars,</div><div class='hunk'>@@ -1129,6 +1128,8 @@ static inline bool efi_runtime_disabled(void) { return true; }</div><div class='ctx'> extern void efi_call_virt_check_flags(unsigned long flags, const void *caller);</div><div class='ctx'> extern unsigned long efi_call_virt_save_flags(void);</div><div class='ctx'> </div><div class='add'>+void efi_runtime_assert_lock_held(void);</div><div class='add'>+</div><div class='ctx'> enum efi_secureboot_mode {</div><div class='ctx'> 	efi_secureboot_mode_unset,</div><div class='ctx'> 	efi_secureboot_mode_unknown,</div><div class='hunk'>@@ -1290,8 +1291,6 @@ struct linux_efi_memreserve {</div><div class='ctx'> </div><div class='ctx'> void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);</div><div class='ctx'> </div><div class='del'>-char *efi_systab_show_arch(char *str);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The LINUX_EFI_MOK_VARIABLE_TABLE_GUID config table can be provided</div><div class='ctx'>  * to the kernel by an EFI boot loader. The table contains a packed</div><div class='hunk'>@@ -1341,7 +1340,7 @@ struct linux_efi_initrd {</div><div class='ctx'> </div><div class='ctx'> bool xen_efi_config_table_is_usable(const efi_guid_t *guid, unsigned long table);</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> bool efi_config_table_is_usable(const efi_guid_t *guid, unsigned long table)</div><div class='ctx'> {</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_XEN_EFI))</div><div class='hunk'>@@ -1351,6 +1350,8 @@ bool efi_config_table_is_usable(const efi_guid_t *guid, unsigned long table)</div><div class='ctx'> </div><div class='ctx'> umode_t efi_attr_is_visible(struct kobject *kobj, struct attribute *attr, int n);</div><div class='ctx'> </div><div class='add'>+int ovmf_log_probe(unsigned long ovmf_debug_log_table);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * efivar ops event type</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/ehl_pse_io_aux.h b/include/linux/ehl_pse_io_aux.h<br/>new file mode 100644<br/>index 000000000000..afb8587ee5fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ehl_pse_io_aux.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ehl_pse_io_aux.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Intel Elkhart Lake PSE I/O Auxiliary Device</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2025 Intel Corporation.</div><div class='add'>+ *</div><div class='add'>+ * Author: Raag Jadav &lt;raag.jadav@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _EHL_PSE_IO_AUX_H_</div><div class='add'>+#define _EHL_PSE_IO_AUX_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#define EHL_PSE_IO_NAME		"ehl_pse_io"</div><div class='add'>+#define EHL_PSE_GPIO_NAME	"gpio"</div><div class='add'>+#define EHL_PSE_TIO_NAME	"pps_tio"</div><div class='add'>+</div><div class='add'>+struct ehl_pse_io_data {</div><div class='add'>+	struct resource mem;</div><div class='add'>+	int irq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _EHL_PSE_IO_AUX_H_ */</div><div class='head'>diff --git a/include/linux/eisa.h b/include/linux/eisa.h<br/>index b012e30afebd..cf55630b595b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/eisa.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/eisa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/eisa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/eisa.h</a></div><div class='hunk'>@@ -28,6 +28,9 @@</div><div class='ctx'> #define EISA_CONFIG_ENABLED         1</div><div class='ctx'> #define EISA_CONFIG_FORCED          2</div><div class='ctx'> </div><div class='add'>+/* Chosen to hold the longest string in eisa.ids. */</div><div class='add'>+#define EISA_DEVICE_INFO_NAME_SIZE 74</div><div class='add'>+</div><div class='ctx'> /* There is not much we can say about an EISA device, apart from</div><div class='ctx'>  * signature, slot number, and base address. dma_mask is set by</div><div class='ctx'>  * default to parent device mask..*/</div><div class='hunk'>@@ -41,7 +44,7 @@ struct eisa_device {</div><div class='ctx'> 	u64                   dma_mask;</div><div class='ctx'> 	struct device         dev; /* generic device */</div><div class='ctx'> #ifdef CONFIG_EISA_NAMES</div><div class='del'>-	char		      pretty_name[50];</div><div class='add'>+	char		      pretty_name[EISA_DEVICE_INFO_NAME_SIZE];</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -60,12 +63,12 @@ struct eisa_driver {</div><div class='ctx'> 	struct device_driver         driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_eisa_driver(drv) container_of(drv,struct eisa_driver, driver)</div><div class='add'>+#define to_eisa_driver(drv) container_of_const(drv,struct eisa_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /* These external functions are only available when EISA support is enabled. */</div><div class='ctx'> #ifdef CONFIG_EISA</div><div class='ctx'> </div><div class='del'>-extern struct bus_type eisa_bus_type;</div><div class='add'>+extern const struct bus_type eisa_bus_type;</div><div class='ctx'> int eisa_driver_register (struct eisa_driver *edrv);</div><div class='ctx'> void eisa_driver_unregister (struct eisa_driver *edrv);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/elf.h b/include/linux/elf.h<br/>index c9a46c4e183b..5c402788da19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/elf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/elf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/elf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/elf.h</a></div><div class='hunk'>@@ -65,7 +65,7 @@ extern Elf64_Dyn _DYNAMIC [];</div><div class='ctx'> struct file;</div><div class='ctx'> struct coredump_params;</div><div class='ctx'> </div><div class='del'>-#ifndef ARCH_HAVE_EXTRA_ELF_NOTES</div><div class='add'>+#ifndef CONFIG_ARCH_HAVE_EXTRA_ELF_NOTES</div><div class='ctx'> static inline int elf_coredump_extra_notes_size(void) { return 0; }</div><div class='ctx'> static inline int elf_coredump_extra_notes_write(struct coredump_params *cprm) { return 0; }</div><div class='ctx'> #else</div><div class='head'>diff --git a/include/linux/elfnote.h b/include/linux/elfnote.h<br/>index 69b136e4dd2b..bb3dcded055f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/elfnote.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/elfnote.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/elfnote.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/elfnote.h</a></div><div class='hunk'>@@ -60,23 +60,21 @@</div><div class='ctx'> </div><div class='ctx'> #else	/* !__ASSEMBLER__ */</div><div class='ctx'> #include &lt;uapi/linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> /*</div><div class='ctx'>  * Use an anonymous structure which matches the shape of</div><div class='ctx'>  * Elf{32,64}_Nhdr, but includes the name and desc data.  The size and</div><div class='ctx'>  * type of name and desc depend on the macro arguments.  "name" must</div><div class='del'>- * be a literal string, and "desc" must be passed by value.  You may</div><div class='del'>- * only define one note per line, since __LINE__ is used to generate</div><div class='del'>- * unique symbols.</div><div class='add'>+ * be a literal string, and "desc" must be passed by value.</div><div class='ctx'>  */</div><div class='del'>-#define _ELFNOTE_PASTE(a,b)	a##b</div><div class='del'>-#define _ELFNOTE(size, name, unique, type, desc)			\</div><div class='add'>+#define ELFNOTE(size, name, type, desc)					\</div><div class='ctx'> 	static const struct {						\</div><div class='ctx'> 		struct elf##size##_note _nhdr;				\</div><div class='ctx'> 		unsigned char _name[sizeof(name)]			\</div><div class='ctx'> 		__attribute__((aligned(sizeof(Elf##size##_Word))));	\</div><div class='ctx'> 		typeof(desc) _desc					\</div><div class='ctx'> 			     __attribute__((aligned(sizeof(Elf##size##_Word)))); \</div><div class='del'>-	} _ELFNOTE_PASTE(_note_, unique)				\</div><div class='add'>+	} __UNIQUE_ID(note)						\</div><div class='ctx'> 		__used							\</div><div class='ctx'> 		__attribute__((section(".note." name),			\</div><div class='ctx'> 			       aligned(sizeof(Elf##size##_Word)),	\</div><div class='hunk'>@@ -89,11 +87,10 @@</div><div class='ctx'> 		name,							\</div><div class='ctx'> 		desc							\</div><div class='ctx'> 	}</div><div class='del'>-#define ELFNOTE(size, name, type, desc)		\</div><div class='del'>-	_ELFNOTE(size, name, __LINE__, type, desc)</div><div class='ctx'> </div><div class='ctx'> #define ELFNOTE32(name, type, desc) ELFNOTE(32, name, type, desc)</div><div class='ctx'> #define ELFNOTE64(name, type, desc) ELFNOTE(64, name, type, desc)</div><div class='add'>+</div><div class='ctx'> #endif	/* __ASSEMBLER__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_ELFNOTE_H */</div><div class='head'>diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h<br/>index 770755df852f..43aa6153dc57 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/energy_model.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/energy_model.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/energy_model.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/energy_model.h</a></div><div class='hunk'>@@ -54,7 +54,11 @@ struct em_perf_table {</div><div class='ctx'> /**</div><div class='ctx'>  * struct em_perf_domain - Performance domain</div><div class='ctx'>  * @em_table:		Pointer to the runtime modifiable em_perf_table</div><div class='add'>+ * @node:		node in	em_pd_list (in energy_model.c)</div><div class='add'>+ * @id:			A unique ID number for each performance domain</div><div class='ctx'>  * @nr_perf_states:	Number of performance states</div><div class='add'>+ * @min_perf_state:	Minimum allowed Performance State index</div><div class='add'>+ * @max_perf_state:	Maximum allowed Performance State index</div><div class='ctx'>  * @flags:		See "em_perf_domain flags"</div><div class='ctx'>  * @cpus:		Cpumask covering the CPUs of the domain. It's here</div><div class='ctx'>  *			for performance reasons to avoid potential cache</div><div class='hunk'>@@ -69,7 +73,11 @@ struct em_perf_table {</div><div class='ctx'>  */</div><div class='ctx'> struct em_perf_domain {</div><div class='ctx'> 	struct em_perf_table __rcu *em_table;</div><div class='add'>+	struct list_head node;</div><div class='add'>+	int id;</div><div class='ctx'> 	int nr_perf_states;</div><div class='add'>+	int min_perf_state;</div><div class='add'>+	int max_perf_state;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned long cpus[];</div><div class='ctx'> };</div><div class='hunk'>@@ -163,22 +171,29 @@ struct em_data_callback {</div><div class='ctx'> struct em_perf_domain *em_cpu_get(int cpu);</div><div class='ctx'> struct em_perf_domain *em_pd_get(struct device *dev);</div><div class='ctx'> int em_dev_update_perf_domain(struct device *dev,</div><div class='del'>-			      struct em_perf_table __rcu *new_table);</div><div class='add'>+			      struct em_perf_table *new_table);</div><div class='ctx'> int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,</div><div class='del'>-				struct em_data_callback *cb, cpumask_t *span,</div><div class='del'>-				bool microwatts);</div><div class='add'>+				const struct em_data_callback *cb,</div><div class='add'>+				const cpumask_t *cpus, bool microwatts);</div><div class='add'>+int em_dev_register_pd_no_update(struct device *dev, unsigned int nr_states,</div><div class='add'>+				 const struct em_data_callback *cb,</div><div class='add'>+				 const cpumask_t *cpus, bool microwatts);</div><div class='ctx'> void em_dev_unregister_perf_domain(struct device *dev);</div><div class='del'>-struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd);</div><div class='del'>-void em_table_free(struct em_perf_table __rcu *table);</div><div class='add'>+struct em_perf_table *em_table_alloc(struct em_perf_domain *pd);</div><div class='add'>+void em_table_free(struct em_perf_table *table);</div><div class='ctx'> int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,</div><div class='ctx'> 			 int nr_states);</div><div class='add'>+int em_dev_update_chip_binning(struct device *dev);</div><div class='add'>+int em_update_performance_limits(struct em_perf_domain *pd,</div><div class='add'>+		unsigned long freq_min_khz, unsigned long freq_max_khz);</div><div class='add'>+void em_adjust_cpu_capacity(unsigned int cpu);</div><div class='add'>+void em_rebuild_sched_domains(void);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * em_pd_get_efficient_state() - Get an efficient performance state from the EM</div><div class='ctx'>  * @table:		List of performance states, in ascending order</div><div class='del'>- * @nr_perf_states:	Number of performance states</div><div class='add'>+ * @pd:			performance domain for which this must be done</div><div class='ctx'>  * @max_util:		Max utilization to map with the EM</div><div class='del'>- * @pd_flags:		Performance Domain flags</div><div class='ctx'>  *</div><div class='ctx'>  * It is called from the scheduler code quite frequently and as a consequence</div><div class='ctx'>  * doesn't implement any check.</div><div class='hunk'>@@ -187,13 +202,16 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,</div><div class='ctx'>  * requirement.</div><div class='ctx'>  */</div><div class='ctx'> static inline int</div><div class='del'>-em_pd_get_efficient_state(struct em_perf_state *table, int nr_perf_states,</div><div class='del'>-			  unsigned long max_util, unsigned long pd_flags)</div><div class='add'>+em_pd_get_efficient_state(struct em_perf_state *table,</div><div class='add'>+			  struct em_perf_domain *pd, unsigned long max_util)</div><div class='ctx'> {</div><div class='add'>+	unsigned long pd_flags = pd-&gt;flags;</div><div class='add'>+	int min_ps = pd-&gt;min_perf_state;</div><div class='add'>+	int max_ps = pd-&gt;max_perf_state;</div><div class='ctx'> 	struct em_perf_state *ps;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr_perf_states; i++) {</div><div class='add'>+	for (i = min_ps; i &lt;= max_ps; i++) {</div><div class='ctx'> 		ps = &amp;table[i];</div><div class='ctx'> 		if (ps-&gt;performance &gt;= max_util) {</div><div class='ctx'> 			if (pd_flags &amp; EM_PERF_DOMAIN_SKIP_INEFFICIENCIES &amp;&amp;</div><div class='hunk'>@@ -203,7 +221,7 @@ em_pd_get_efficient_state(struct em_perf_state *table, int nr_perf_states,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return nr_perf_states - 1;</div><div class='add'>+	return max_ps;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -230,9 +248,7 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd,</div><div class='ctx'> 	struct em_perf_state *ps;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='ctx'> 	WARN_ONCE(!rcu_read_lock_held(), "EM: rcu read lock needed\n");</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (!sum_util)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -245,7 +261,6 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd,</div><div class='ctx'> 	 * max utilization to the allowed CPU capacity before calculating</div><div class='ctx'> 	 * effective performance.</div><div class='ctx'> 	 */</div><div class='del'>-	max_util = map_util_perf(max_util);</div><div class='ctx'> 	max_util = min(max_util, allowed_cpu_cap);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -253,8 +268,7 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd,</div><div class='ctx'> 	 * requested performance.</div><div class='ctx'> 	 */</div><div class='ctx'> 	em_table = rcu_dereference(pd-&gt;em_table);</div><div class='del'>-	i = em_pd_get_efficient_state(em_table-&gt;state, pd-&gt;nr_perf_states,</div><div class='del'>-				      max_util, pd-&gt;flags);</div><div class='add'>+	i = em_pd_get_efficient_state(em_table-&gt;state, pd, max_util);</div><div class='ctx'> 	ps = &amp;em_table-&gt;state[i];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -338,8 +352,15 @@ struct em_data_callback {};</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='ctx'> int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,</div><div class='del'>-				struct em_data_callback *cb, cpumask_t *span,</div><div class='del'>-				bool microwatts)</div><div class='add'>+				const struct em_data_callback *cb,</div><div class='add'>+				const cpumask_t *cpus, bool microwatts)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+int em_dev_register_pd_no_update(struct device *dev, unsigned int nr_states,</div><div class='add'>+				 const struct em_data_callback *cb,</div><div class='add'>+				 const cpumask_t *cpus, bool microwatts)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -365,14 +386,14 @@ static inline int em_pd_nr_perf_states(struct em_perf_domain *pd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline</div><div class='del'>-struct em_perf_table __rcu *em_table_alloc(struct em_perf_domain *pd)</div><div class='add'>+struct em_perf_table *em_table_alloc(struct em_perf_domain *pd)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-static inline void em_table_free(struct em_perf_table __rcu *table) {}</div><div class='add'>+static inline void em_table_free(struct em_perf_table *table) {}</div><div class='ctx'> static inline</div><div class='ctx'> int em_dev_update_perf_domain(struct device *dev,</div><div class='del'>-			      struct em_perf_table __rcu *new_table)</div><div class='add'>+			      struct em_perf_table *new_table)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -387,6 +408,18 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+static inline int em_dev_update_chip_binning(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+int em_update_performance_limits(struct em_perf_domain *pd,</div><div class='add'>+		unsigned long freq_min_khz, unsigned long freq_max_khz)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline void em_adjust_cpu_capacity(unsigned int cpu) {}</div><div class='add'>+static inline void em_rebuild_sched_domains(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h<br/>index b0fb775a600d..87efb38b7081 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/entry-common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/entry-common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/entry-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/entry-common.h</a></div><div class='hunk'>@@ -2,26 +2,15 @@</div><div class='ctx'> #ifndef __LINUX_ENTRYCOMMON_H</div><div class='ctx'> #define __LINUX_ENTRYCOMMON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/static_call_types.h&gt;</div><div class='add'>+#include &lt;linux/irq-entry-common.h&gt;</div><div class='add'>+#include &lt;linux/livepatch.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/resume_user_mode.h&gt;</div><div class='ctx'> #include &lt;linux/seccomp.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/context_tracking.h&gt;</div><div class='del'>-#include &lt;linux/livepatch.h&gt;</div><div class='del'>-#include &lt;linux/resume_user_mode.h&gt;</div><div class='del'>-#include &lt;linux/tick.h&gt;</div><div class='del'>-#include &lt;linux/kmsan.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/entry-common.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Define dummy _TIF work flags if not defined by the architecture or for</div><div class='del'>- * disabled functionality.</div><div class='del'>- */</div><div class='del'>-#ifndef _TIF_PATCH_PENDING</div><div class='del'>-# define _TIF_PATCH_PENDING		(0)</div><div class='del'>-#endif</div><div class='add'>+#include &lt;asm/syscall.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef _TIF_UPROBE</div><div class='ctx'> # define _TIF_UPROBE			(0)</div><div class='hunk'>@@ -48,6 +37,7 @@</div><div class='ctx'> 				 SYSCALL_WORK_SYSCALL_AUDIT |		\</div><div class='ctx'> 				 SYSCALL_WORK_SYSCALL_USER_DISPATCH |	\</div><div class='ctx'> 				 ARCH_SYSCALL_WORK_ENTER)</div><div class='add'>+</div><div class='ctx'> #define SYSCALL_WORK_EXIT	(SYSCALL_WORK_SYSCALL_TRACEPOINT |	\</div><div class='ctx'> 				 SYSCALL_WORK_SYSCALL_TRACE |		\</div><div class='ctx'> 				 SYSCALL_WORK_SYSCALL_AUDIT |		\</div><div class='hunk'>@@ -55,87 +45,7 @@</div><div class='ctx'> 				 SYSCALL_WORK_SYSCALL_EXIT_TRAP	|	\</div><div class='ctx'> 				 ARCH_SYSCALL_WORK_EXIT)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * TIF flags handled in exit_to_user_mode_loop()</div><div class='del'>- */</div><div class='del'>-#ifndef ARCH_EXIT_TO_USER_MODE_WORK</div><div class='del'>-# define ARCH_EXIT_TO_USER_MODE_WORK		(0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define EXIT_TO_USER_MODE_WORK						\</div><div class='del'>-	(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE |		\</div><div class='del'>-	 _TIF_NEED_RESCHED | _TIF_PATCH_PENDING | _TIF_NOTIFY_SIGNAL |	\</div><div class='del'>-	 ARCH_EXIT_TO_USER_MODE_WORK)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * arch_enter_from_user_mode - Architecture specific sanity check for user mode regs</div><div class='del'>- * @regs:	Pointer to currents pt_regs</div><div class='del'>- *</div><div class='del'>- * Defaults to an empty implementation. Can be replaced by architecture</div><div class='del'>- * specific code.</div><div class='del'>- *</div><div class='del'>- * Invoked from syscall_enter_from_user_mode() in the non-instrumentable</div><div class='del'>- * section. Use __always_inline so the compiler cannot push it out of line</div><div class='del'>- * and make it instrumentable.</div><div class='del'>- */</div><div class='del'>-static __always_inline void arch_enter_from_user_mode(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-#ifndef arch_enter_from_user_mode</div><div class='del'>-static __always_inline void arch_enter_from_user_mode(struct pt_regs *regs) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enter_from_user_mode - Establish state when coming from user mode</div><div class='del'>- *</div><div class='del'>- * Syscall/interrupt entry disables interrupts, but user mode is traced as</div><div class='del'>- * interrupts enabled. Also with NO_HZ_FULL RCU might be idle.</div><div class='del'>- *</div><div class='del'>- * 1) Tell lockdep that interrupts are disabled</div><div class='del'>- * 2) Invoke context tracking if enabled to reactivate RCU</div><div class='del'>- * 3) Trace interrupts off state</div><div class='del'>- *</div><div class='del'>- * Invoked from architecture specific syscall entry code with interrupts</div><div class='del'>- * disabled. The calling code has to be non-instrumentable. When the</div><div class='del'>- * function returns all state is correct and interrupts are still</div><div class='del'>- * disabled. The subsequent functions can be instrumented.</div><div class='del'>- *</div><div class='del'>- * This is invoked when there is architecture specific functionality to be</div><div class='del'>- * done between establishing state and enabling interrupts. The caller must</div><div class='del'>- * enable interrupts before invoking syscall_enter_from_user_mode_work().</div><div class='del'>- */</div><div class='del'>-static __always_inline void enter_from_user_mode(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	arch_enter_from_user_mode(regs);</div><div class='del'>-	lockdep_hardirqs_off(CALLER_ADDR0);</div><div class='del'>-</div><div class='del'>-	CT_WARN_ON(__ct_state() != CONTEXT_USER);</div><div class='del'>-	user_exit_irqoff();</div><div class='del'>-</div><div class='del'>-	instrumentation_begin();</div><div class='del'>-	kmsan_unpoison_entry_regs(regs);</div><div class='del'>-	trace_hardirqs_off_finish();</div><div class='del'>-	instrumentation_end();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * syscall_enter_from_user_mode_prepare - Establish state and enable interrupts</div><div class='del'>- * @regs:	Pointer to currents pt_regs</div><div class='del'>- *</div><div class='del'>- * Invoked from architecture specific syscall entry code with interrupts</div><div class='del'>- * disabled. The calling code has to be non-instrumentable. When the</div><div class='del'>- * function returns all state is correct, interrupts are enabled and the</div><div class='del'>- * subsequent functions can be instrumented.</div><div class='del'>- *</div><div class='del'>- * This handles lockdep, RCU (context tracking) and tracing state, i.e.</div><div class='del'>- * the functionality provided by enter_from_user_mode().</div><div class='del'>- *</div><div class='del'>- * This is invoked when there is extra architecture specific functionality</div><div class='del'>- * to be done between establishing state and handling user mode entry work.</div><div class='del'>- */</div><div class='del'>-void syscall_enter_from_user_mode_prepare(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-long syscall_trace_enter(struct pt_regs *regs, long syscall,</div><div class='del'>-			 unsigned long work);</div><div class='add'>+long syscall_trace_enter(struct pt_regs *regs, long syscall, unsigned long work);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * syscall_enter_from_user_mode_work - Check and handle work before invoking</div><div class='hunk'>@@ -144,8 +54,8 @@ long syscall_trace_enter(struct pt_regs *regs, long syscall,</div><div class='ctx'>  * @syscall:	The syscall number</div><div class='ctx'>  *</div><div class='ctx'>  * Invoked from architecture specific syscall entry code with interrupts</div><div class='del'>- * enabled after invoking syscall_enter_from_user_mode_prepare() and extra</div><div class='del'>- * architecture specific work.</div><div class='add'>+ * enabled after invoking enter_from_user_mode(), enabling interrupts and</div><div class='add'>+ * extra architecture specific work.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: The original or a modified syscall number</div><div class='ctx'>  *</div><div class='hunk'>@@ -181,8 +91,9 @@ static __always_inline long syscall_enter_from_user_mode_work(struct pt_regs *re</div><div class='ctx'>  * function returns all state is correct, interrupts are enabled and the</div><div class='ctx'>  * subsequent functions can be instrumented.</div><div class='ctx'>  *</div><div class='del'>- * This is combination of syscall_enter_from_user_mode_prepare() and</div><div class='del'>- * syscall_enter_from_user_mode_work().</div><div class='add'>+ * This is the combination of enter_from_user_mode() and</div><div class='add'>+ * syscall_enter_from_user_mode_work() to be used when there is no</div><div class='add'>+ * architecture specific work to be done between the two.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: The original or a modified syscall number. See</div><div class='ctx'>  * syscall_enter_from_user_mode_work() for further explanation.</div><div class='hunk'>@@ -202,168 +113,13 @@ static __always_inline long syscall_enter_from_user_mode(struct pt_regs *regs, l</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * local_irq_enable_exit_to_user - Exit to user variant of local_irq_enable()</div><div class='del'>- * @ti_work:	Cached TIF flags gathered with interrupts disabled</div><div class='del'>- *</div><div class='del'>- * Defaults to local_irq_enable(). Can be supplied by architecture specific</div><div class='del'>- * code.</div><div class='del'>- */</div><div class='del'>-static inline void local_irq_enable_exit_to_user(unsigned long ti_work);</div><div class='del'>-</div><div class='del'>-#ifndef local_irq_enable_exit_to_user</div><div class='del'>-static inline void local_irq_enable_exit_to_user(unsigned long ti_work)</div><div class='del'>-{</div><div class='del'>-	local_irq_enable();</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * local_irq_disable_exit_to_user - Exit to user variant of local_irq_disable()</div><div class='del'>- *</div><div class='del'>- * Defaults to local_irq_disable(). Can be supplied by architecture specific</div><div class='del'>- * code.</div><div class='del'>- */</div><div class='del'>-static inline void local_irq_disable_exit_to_user(void);</div><div class='del'>-</div><div class='del'>-#ifndef local_irq_disable_exit_to_user</div><div class='del'>-static inline void local_irq_disable_exit_to_user(void)</div><div class='del'>-{</div><div class='del'>-	local_irq_disable();</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * arch_exit_to_user_mode_work - Architecture specific TIF work for exit</div><div class='del'>- *				 to user mode.</div><div class='del'>- * @regs:	Pointer to currents pt_regs</div><div class='del'>- * @ti_work:	Cached TIF flags gathered with interrupts disabled</div><div class='del'>- *</div><div class='del'>- * Invoked from exit_to_user_mode_loop() with interrupt enabled</div><div class='del'>- *</div><div class='del'>- * Defaults to NOOP. Can be supplied by architecture specific code.</div><div class='del'>- */</div><div class='del'>-static inline void arch_exit_to_user_mode_work(struct pt_regs *regs,</div><div class='del'>-					       unsigned long ti_work);</div><div class='del'>-</div><div class='del'>-#ifndef arch_exit_to_user_mode_work</div><div class='del'>-static inline void arch_exit_to_user_mode_work(struct pt_regs *regs,</div><div class='del'>-					       unsigned long ti_work)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * arch_exit_to_user_mode_prepare - Architecture specific preparation for</div><div class='del'>- *				    exit to user mode.</div><div class='del'>- * @regs:	Pointer to currents pt_regs</div><div class='del'>- * @ti_work:	Cached TIF flags gathered with interrupts disabled</div><div class='del'>- *</div><div class='del'>- * Invoked from exit_to_user_mode_prepare() with interrupt disabled as the last</div><div class='del'>- * function before return. Defaults to NOOP.</div><div class='del'>- */</div><div class='del'>-static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs,</div><div class='del'>-						  unsigned long ti_work);</div><div class='del'>-</div><div class='del'>-#ifndef arch_exit_to_user_mode_prepare</div><div class='del'>-static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs,</div><div class='del'>-						  unsigned long ti_work)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * arch_exit_to_user_mode - Architecture specific final work before</div><div class='del'>- *			    exit to user mode.</div><div class='del'>- *</div><div class='del'>- * Invoked from exit_to_user_mode() with interrupt disabled as the last</div><div class='del'>- * function before return. Defaults to NOOP.</div><div class='del'>- *</div><div class='del'>- * This needs to be __always_inline because it is non-instrumentable code</div><div class='del'>- * invoked after context tracking switched to user mode.</div><div class='add'>+ * syscall_exit_work - Handle work before returning to user mode</div><div class='add'>+ * @regs:	Pointer to current pt_regs</div><div class='add'>+ * @work:	Current thread syscall work</div><div class='ctx'>  *</div><div class='del'>- * An architecture implementation must not do anything complex, no locking</div><div class='del'>- * etc. The main purpose is for speculation mitigations.</div><div class='add'>+ * Do one-time syscall specific work.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline void arch_exit_to_user_mode(void);</div><div class='del'>-</div><div class='del'>-#ifndef arch_exit_to_user_mode</div><div class='del'>-static __always_inline void arch_exit_to_user_mode(void) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * arch_do_signal_or_restart -  Architecture specific signal delivery function</div><div class='del'>- * @regs:	Pointer to currents pt_regs</div><div class='del'>- *</div><div class='del'>- * Invoked from exit_to_user_mode_loop().</div><div class='del'>- */</div><div class='del'>-void arch_do_signal_or_restart(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * exit_to_user_mode_loop - do any pending work before leaving to user space</div><div class='del'>- */</div><div class='del'>-unsigned long exit_to_user_mode_loop(struct pt_regs *regs,</div><div class='del'>-				     unsigned long ti_work);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * exit_to_user_mode_prepare - call exit_to_user_mode_loop() if required</div><div class='del'>- * @regs:	Pointer to pt_regs on entry stack</div><div class='del'>- *</div><div class='del'>- * 1) check that interrupts are disabled</div><div class='del'>- * 2) call tick_nohz_user_enter_prepare()</div><div class='del'>- * 3) call exit_to_user_mode_loop() if any flags from</div><div class='del'>- *    EXIT_TO_USER_MODE_WORK are set</div><div class='del'>- * 4) check that interrupts are still disabled</div><div class='del'>- */</div><div class='del'>-static __always_inline void exit_to_user_mode_prepare(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned long ti_work;</div><div class='del'>-</div><div class='del'>-	lockdep_assert_irqs_disabled();</div><div class='del'>-</div><div class='del'>-	/* Flush pending rcuog wakeup before the last need_resched() check */</div><div class='del'>-	tick_nohz_user_enter_prepare();</div><div class='del'>-</div><div class='del'>-	ti_work = read_thread_flags();</div><div class='del'>-	if (unlikely(ti_work &amp; EXIT_TO_USER_MODE_WORK))</div><div class='del'>-		ti_work = exit_to_user_mode_loop(regs, ti_work);</div><div class='del'>-</div><div class='del'>-	arch_exit_to_user_mode_prepare(regs, ti_work);</div><div class='del'>-</div><div class='del'>-	/* Ensure that kernel state is sane for a return to userspace */</div><div class='del'>-	kmap_assert_nomap();</div><div class='del'>-	lockdep_assert_irqs_disabled();</div><div class='del'>-	lockdep_sys_exit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * exit_to_user_mode - Fixup state when exiting to user mode</div><div class='del'>- *</div><div class='del'>- * Syscall/interrupt exit enables interrupts, but the kernel state is</div><div class='del'>- * interrupts disabled when this is invoked. Also tell RCU about it.</div><div class='del'>- *</div><div class='del'>- * 1) Trace interrupts on state</div><div class='del'>- * 2) Invoke context tracking if enabled to adjust RCU state</div><div class='del'>- * 3) Invoke architecture specific last minute exit code, e.g. speculation</div><div class='del'>- *    mitigations, etc.: arch_exit_to_user_mode()</div><div class='del'>- * 4) Tell lockdep that interrupts are enabled</div><div class='del'>- *</div><div class='del'>- * Invoked from architecture specific code when syscall_exit_to_user_mode()</div><div class='del'>- * is not suitable as the last step before returning to userspace. Must be</div><div class='del'>- * invoked with interrupts disabled and the caller must be</div><div class='del'>- * non-instrumentable.</div><div class='del'>- * The caller has to invoke syscall_exit_to_user_mode_work() before this.</div><div class='del'>- */</div><div class='del'>-static __always_inline void exit_to_user_mode(void)</div><div class='del'>-{</div><div class='del'>-	instrumentation_begin();</div><div class='del'>-	trace_hardirqs_on_prepare();</div><div class='del'>-	lockdep_hardirqs_on_prepare();</div><div class='del'>-	instrumentation_end();</div><div class='del'>-</div><div class='del'>-	user_enter_irqoff();</div><div class='del'>-	arch_exit_to_user_mode();</div><div class='del'>-	lockdep_hardirqs_on(CALLER_ADDR0);</div><div class='del'>-}</div><div class='add'>+void syscall_exit_work(struct pt_regs *regs, unsigned long work);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * syscall_exit_to_user_mode_work - Handle work before returning to user mode</div><div class='hunk'>@@ -378,7 +134,30 @@ static __always_inline void exit_to_user_mode(void)</div><div class='ctx'>  * make the final state transitions. Interrupts must stay disabled between</div><div class='ctx'>  * return from this function and the invocation of exit_to_user_mode().</div><div class='ctx'>  */</div><div class='del'>-void syscall_exit_to_user_mode_work(struct pt_regs *regs);</div><div class='add'>+static __always_inline void syscall_exit_to_user_mode_work(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long work = READ_ONCE(current_thread_info()-&gt;syscall_work);</div><div class='add'>+	unsigned long nr = syscall_get_nr(current, regs);</div><div class='add'>+</div><div class='add'>+	CT_WARN_ON(ct_state() != CT_STATE_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_PROVE_LOCKING)) {</div><div class='add'>+		if (WARN(irqs_disabled(), "syscall %lu left IRQs disabled", nr))</div><div class='add'>+			local_irq_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rseq_debug_syscall_return(regs);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Do one-time syscall specific work. If these work items are</div><div class='add'>+	 * enabled, we want to run them exactly once per syscall exit with</div><div class='add'>+	 * interrupts enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(work &amp; SYSCALL_WORK_EXIT))</div><div class='add'>+		syscall_exit_work(regs, work);</div><div class='add'>+	local_irq_disable_exit_to_user();</div><div class='add'>+	syscall_exit_to_user_mode_prepare(regs);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * syscall_exit_to_user_mode - Handle work before returning to user mode</div><div class='hunk'>@@ -409,147 +188,12 @@ void syscall_exit_to_user_mode_work(struct pt_regs *regs);</div><div class='ctx'>  * exit_to_user_mode(). This function is preferred unless there is a</div><div class='ctx'>  * compelling architectural reason to use the separate functions.</div><div class='ctx'>  */</div><div class='del'>-void syscall_exit_to_user_mode(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * irqentry_enter_from_user_mode - Establish state before invoking the irq handler</div><div class='del'>- * @regs:	Pointer to currents pt_regs</div><div class='del'>- *</div><div class='del'>- * Invoked from architecture specific entry code with interrupts disabled.</div><div class='del'>- * Can only be called when the interrupt entry came from user mode. The</div><div class='del'>- * calling code must be non-instrumentable.  When the function returns all</div><div class='del'>- * state is correct and the subsequent functions can be instrumented.</div><div class='del'>- *</div><div class='del'>- * The function establishes state (lockdep, RCU (context tracking), tracing)</div><div class='del'>- */</div><div class='del'>-void irqentry_enter_from_user_mode(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * irqentry_exit_to_user_mode - Interrupt exit work</div><div class='del'>- * @regs:	Pointer to current's pt_regs</div><div class='del'>- *</div><div class='del'>- * Invoked with interrupts disabled and fully valid regs. Returns with all</div><div class='del'>- * work handled, interrupts disabled such that the caller can immediately</div><div class='del'>- * switch to user mode. Called from architecture specific interrupt</div><div class='del'>- * handling code.</div><div class='del'>- *</div><div class='del'>- * The call order is #2 and #3 as described in syscall_exit_to_user_mode().</div><div class='del'>- * Interrupt exit is not invoking #1 which is the syscall specific one time</div><div class='del'>- * work.</div><div class='del'>- */</div><div class='del'>-void irqentry_exit_to_user_mode(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-#ifndef irqentry_state</div><div class='del'>-/**</div><div class='del'>- * struct irqentry_state - Opaque object for exception state storage</div><div class='del'>- * @exit_rcu: Used exclusively in the irqentry_*() calls; signals whether the</div><div class='del'>- *            exit path has to invoke ct_irq_exit().</div><div class='del'>- * @lockdep: Used exclusively in the irqentry_nmi_*() calls; ensures that</div><div class='del'>- *           lockdep state is restored correctly on exit from nmi.</div><div class='del'>- *</div><div class='del'>- * This opaque object is filled in by the irqentry_*_enter() functions and</div><div class='del'>- * must be passed back into the corresponding irqentry_*_exit() functions</div><div class='del'>- * when the exception is complete.</div><div class='del'>- *</div><div class='del'>- * Callers of irqentry_*_[enter|exit]() must consider this structure opaque</div><div class='del'>- * and all members private.  Descriptions of the members are provided to aid in</div><div class='del'>- * the maintenance of the irqentry_*() functions.</div><div class='del'>- */</div><div class='del'>-typedef struct irqentry_state {</div><div class='del'>-	union {</div><div class='del'>-		bool	exit_rcu;</div><div class='del'>-		bool	lockdep;</div><div class='del'>-	};</div><div class='del'>-} irqentry_state_t;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * irqentry_enter - Handle state tracking on ordinary interrupt entries</div><div class='del'>- * @regs:	Pointer to pt_regs of interrupted context</div><div class='del'>- *</div><div class='del'>- * Invokes:</div><div class='del'>- *  - lockdep irqflag state tracking as low level ASM entry disabled</div><div class='del'>- *    interrupts.</div><div class='del'>- *</div><div class='del'>- *  - Context tracking if the exception hit user mode.</div><div class='del'>- *</div><div class='del'>- *  - The hardirq tracer to keep the state consistent as low level ASM</div><div class='del'>- *    entry disabled interrupts.</div><div class='del'>- *</div><div class='del'>- * As a precondition, this requires that the entry came from user mode,</div><div class='del'>- * idle, or a kernel context in which RCU is watching.</div><div class='del'>- *</div><div class='del'>- * For kernel mode entries RCU handling is done conditional. If RCU is</div><div class='del'>- * watching then the only RCU requirement is to check whether the tick has</div><div class='del'>- * to be restarted. If RCU is not watching then ct_irq_enter() has to be</div><div class='del'>- * invoked on entry and ct_irq_exit() on exit.</div><div class='del'>- *</div><div class='del'>- * Avoiding the ct_irq_enter/exit() calls is an optimization but also</div><div class='del'>- * solves the problem of kernel mode pagefaults which can schedule, which</div><div class='del'>- * is not possible after invoking ct_irq_enter() without undoing it.</div><div class='del'>- *</div><div class='del'>- * For user mode entries irqentry_enter_from_user_mode() is invoked to</div><div class='del'>- * establish the proper context for NOHZ_FULL. Otherwise scheduling on exit</div><div class='del'>- * would not be possible.</div><div class='del'>- *</div><div class='del'>- * Returns: An opaque object that must be passed to idtentry_exit()</div><div class='del'>- */</div><div class='del'>-irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * irqentry_exit_cond_resched - Conditionally reschedule on return from interrupt</div><div class='del'>- *</div><div class='del'>- * Conditional reschedule with additional sanity checks.</div><div class='del'>- */</div><div class='del'>-void raw_irqentry_exit_cond_resched(void);</div><div class='del'>-#ifdef CONFIG_PREEMPT_DYNAMIC</div><div class='del'>-#if defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL)</div><div class='del'>-#define irqentry_exit_cond_resched_dynamic_enabled	raw_irqentry_exit_cond_resched</div><div class='del'>-#define irqentry_exit_cond_resched_dynamic_disabled	NULL</div><div class='del'>-DECLARE_STATIC_CALL(irqentry_exit_cond_resched, raw_irqentry_exit_cond_resched);</div><div class='del'>-#define irqentry_exit_cond_resched()	static_call(irqentry_exit_cond_resched)()</div><div class='del'>-#elif defined(CONFIG_HAVE_PREEMPT_DYNAMIC_KEY)</div><div class='del'>-DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched);</div><div class='del'>-void dynamic_irqentry_exit_cond_resched(void);</div><div class='del'>-#define irqentry_exit_cond_resched()	dynamic_irqentry_exit_cond_resched()</div><div class='del'>-#endif</div><div class='del'>-#else /* CONFIG_PREEMPT_DYNAMIC */</div><div class='del'>-#define irqentry_exit_cond_resched()	raw_irqentry_exit_cond_resched()</div><div class='del'>-#endif /* CONFIG_PREEMPT_DYNAMIC */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * irqentry_exit - Handle return from exception that used irqentry_enter()</div><div class='del'>- * @regs:	Pointer to pt_regs (exception entry regs)</div><div class='del'>- * @state:	Return value from matching call to irqentry_enter()</div><div class='del'>- *</div><div class='del'>- * Depending on the return target (kernel/user) this runs the necessary</div><div class='del'>- * preemption and work checks if possible and required and returns to</div><div class='del'>- * the caller with interrupts disabled and no further work pending.</div><div class='del'>- *</div><div class='del'>- * This is the last action before returning to the low level ASM code which</div><div class='del'>- * just needs to return to the appropriate context.</div><div class='del'>- *</div><div class='del'>- * Counterpart to irqentry_enter().</div><div class='del'>- */</div><div class='del'>-void noinstr irqentry_exit(struct pt_regs *regs, irqentry_state_t state);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * irqentry_nmi_enter - Handle NMI entry</div><div class='del'>- * @regs:	Pointer to currents pt_regs</div><div class='del'>- *</div><div class='del'>- * Similar to irqentry_enter() but taking care of the NMI constraints.</div><div class='del'>- */</div><div class='del'>-irqentry_state_t noinstr irqentry_nmi_enter(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * irqentry_nmi_exit - Handle return from NMI handling</div><div class='del'>- * @regs:	Pointer to pt_regs (NMI entry regs)</div><div class='del'>- * @irq_state:	Return value from matching call to irqentry_nmi_enter()</div><div class='del'>- *</div><div class='del'>- * Last action before returning to the low level assembly code.</div><div class='del'>- *</div><div class='del'>- * Counterpart to irqentry_nmi_enter().</div><div class='del'>- */</div><div class='del'>-void noinstr irqentry_nmi_exit(struct pt_regs *regs, irqentry_state_t irq_state);</div><div class='add'>+static __always_inline void syscall_exit_to_user_mode(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	instrumentation_begin();</div><div class='add'>+	syscall_exit_to_user_mode_work(regs);</div><div class='add'>+	instrumentation_end();</div><div class='add'>+	exit_to_user_mode();</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/entry-kvm.h b/include/linux/entry-virt.h<br/>index 6813171afccb..bfa767702d9a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/entry-kvm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/entry-kvm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/entry-virt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/entry-virt.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __LINUX_ENTRYKVM_H</div><div class='del'>-#define __LINUX_ENTRYKVM_H</div><div class='add'>+#ifndef __LINUX_ENTRYVIRT_H</div><div class='add'>+#define __LINUX_ENTRYVIRT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/static_call_types.h&gt;</div><div class='ctx'> #include &lt;linux/resume_user_mode.h&gt;</div><div class='hunk'>@@ -10,17 +10,16 @@</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Transfer to guest mode work */</div><div class='del'>-#ifdef CONFIG_KVM_XFER_TO_GUEST_WORK</div><div class='add'>+#ifdef CONFIG_VIRT_XFER_TO_GUEST_WORK</div><div class='ctx'> </div><div class='ctx'> #ifndef ARCH_XFER_TO_GUEST_MODE_WORK</div><div class='ctx'> # define ARCH_XFER_TO_GUEST_MODE_WORK	(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define XFER_TO_GUEST_MODE_WORK						\</div><div class='del'>-	(_TIF_NEED_RESCHED | _TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL |	\</div><div class='del'>-	 _TIF_NOTIFY_RESUME | ARCH_XFER_TO_GUEST_MODE_WORK)</div><div class='del'>-</div><div class='del'>-struct kvm_vcpu;</div><div class='add'>+	(_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY | _TIF_SIGPENDING | \</div><div class='add'>+	 _TIF_NOTIFY_SIGNAL | _TIF_NOTIFY_RESUME |			\</div><div class='add'>+	 ARCH_XFER_TO_GUEST_MODE_WORK)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * arch_xfer_to_guest_mode_handle_work - Architecture specific xfer to guest</div><div class='hunk'>@@ -31,12 +30,10 @@ struct kvm_vcpu;</div><div class='ctx'>  * Invoked from xfer_to_guest_mode_handle_work(). Defaults to NOOP. Can be</div><div class='ctx'>  * replaced by architecture specific code.</div><div class='ctx'>  */</div><div class='del'>-static inline int arch_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu,</div><div class='del'>-						      unsigned long ti_work);</div><div class='add'>+static inline int arch_xfer_to_guest_mode_handle_work(unsigned long ti_work);</div><div class='ctx'> </div><div class='del'>-#ifndef arch_xfer_to_guest_mode_work</div><div class='del'>-static inline int arch_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu,</div><div class='del'>-						      unsigned long ti_work)</div><div class='add'>+#ifndef arch_xfer_to_guest_mode_handle_work</div><div class='add'>+static inline int arch_xfer_to_guest_mode_handle_work(unsigned long ti_work)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -45,11 +42,10 @@ static inline int arch_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu,</div><div class='ctx'> /**</div><div class='ctx'>  * xfer_to_guest_mode_handle_work - Check and handle pending work which needs</div><div class='ctx'>  *				    to be handled before going to guest mode</div><div class='del'>- * @vcpu:	Pointer to current's VCPU data</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: 0 or an error code</div><div class='ctx'>  */</div><div class='del'>-int xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu);</div><div class='add'>+int xfer_to_guest_mode_handle_work(void);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * xfer_to_guest_mode_prepare - Perform last minute preparation work that</div><div class='hunk'>@@ -94,6 +90,6 @@ static inline bool xfer_to_guest_mode_work_pending(void)</div><div class='ctx'> 	lockdep_assert_irqs_disabled();</div><div class='ctx'> 	return __xfer_to_guest_mode_work_pending();</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_KVM_XFER_TO_GUEST_WORK */</div><div class='add'>+#endif /* CONFIG_VIRT_XFER_TO_GUEST_WORK */</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/err.h b/include/linux/err.h<br/>index b5d9bb2a2349..8c37be0620ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/err.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/err.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/err.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/err.h</a></div><div class='hunk'>@@ -42,6 +42,20 @@ static inline void * __must_check ERR_PTR(long error)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * INIT_ERR_PTR - Init a const error pointer.</div><div class='add'>+ * @error: A negative error code.</div><div class='add'>+ *</div><div class='add'>+ * Like ERR_PTR(), but usable to initialize static variables.</div><div class='add'>+ */</div><div class='add'>+#define INIT_ERR_PTR(error) ((void *)(error))</div><div class='add'>+</div><div class='add'>+/* Return the pointer in the percpu address space. */</div><div class='add'>+#define ERR_PTR_PCPU(error) ((void __percpu *)(unsigned long)ERR_PTR(error))</div><div class='add'>+</div><div class='add'>+/* Cast an error pointer to __iomem. */</div><div class='add'>+#define IOMEM_ERR_PTR(error) (__force void __iomem *)ERR_PTR(error)</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * PTR_ERR - Extract the error code from an error pointer.</div><div class='ctx'>  * @ptr: An error pointer.</div><div class='ctx'>  * Return: The error code within @ptr.</div><div class='hunk'>@@ -51,6 +65,9 @@ static inline long __must_check PTR_ERR(__force const void *ptr)</div><div class='ctx'> 	return (long) ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Read an error pointer from the percpu address space. */</div><div class='add'>+#define PTR_ERR_PCPU(ptr) (PTR_ERR((const void *)(__force const unsigned long)(ptr)))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * IS_ERR - Detect an error pointer.</div><div class='ctx'>  * @ptr: The pointer to check.</div><div class='hunk'>@@ -61,6 +78,9 @@ static inline bool __must_check IS_ERR(__force const void *ptr)</div><div class='ctx'> 	return IS_ERR_VALUE((unsigned long)ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Read an error pointer from the percpu address space. */</div><div class='add'>+#define IS_ERR_PCPU(ptr) (IS_ERR((const void *)(__force const unsigned long)(ptr)))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * IS_ERR_OR_NULL - Detect an error pointer or a null pointer.</div><div class='ctx'>  * @ptr: The pointer to check.</div><div class='head'>diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h<br/>index 224645f17c33..9a1eacf35d37 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/etherdevice.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/etherdevice.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/etherdevice.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/etherdevice.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;asm/bitsperlong.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='hunk'>@@ -71,11 +71,17 @@ static const u8 eth_reserved_addr_base[ETH_ALEN] __aligned(2) =</div><div class='ctx'> { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };</div><div class='ctx'> #define eth_stp_addr eth_reserved_addr_base</div><div class='ctx'> </div><div class='add'>+static const u8 eth_ipv4_mcast_addr_base[ETH_ALEN] __aligned(2) =</div><div class='add'>+{ 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 };</div><div class='add'>+</div><div class='add'>+static const u8 eth_ipv6_mcast_addr_base[ETH_ALEN] __aligned(2) =</div><div class='add'>+{ 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 };</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * is_link_local_ether_addr - Determine if given Ethernet address is link-local</div><div class='ctx'>  * @addr: Pointer to a six-byte array containing the Ethernet address</div><div class='ctx'>  *</div><div class='del'>- * Return true if address is link local reserved addr (01:80:c2:00:00:0X) per</div><div class='add'>+ * Return: true if address is link local reserved addr (01:80:c2:00:00:0X) per</div><div class='ctx'>  * IEEE 802.1Q 8.6.3 Frame filtering.</div><div class='ctx'>  *</div><div class='ctx'>  * Please note: addr must be aligned to u16.</div><div class='hunk'>@@ -98,7 +104,7 @@ static inline bool is_link_local_ether_addr(const u8 *addr)</div><div class='ctx'>  * is_zero_ether_addr - Determine if give Ethernet address is all zeros.</div><div class='ctx'>  * @addr: Pointer to a six-byte array containing the Ethernet address</div><div class='ctx'>  *</div><div class='del'>- * Return true if the address is all zeroes.</div><div class='add'>+ * Return: true if the address is all zeroes.</div><div class='ctx'>  *</div><div class='ctx'>  * Please note: addr must be aligned to u16.</div><div class='ctx'>  */</div><div class='hunk'>@@ -117,7 +123,7 @@ static inline bool is_zero_ether_addr(const u8 *addr)</div><div class='ctx'>  * is_multicast_ether_addr - Determine if the Ethernet address is a multicast.</div><div class='ctx'>  * @addr: Pointer to a six-byte array containing the Ethernet address</div><div class='ctx'>  *</div><div class='del'>- * Return true if the address is a multicast address.</div><div class='add'>+ * Return: true if the address is a multicast address.</div><div class='ctx'>  * By definition the broadcast address is also a multicast address.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool is_multicast_ether_addr(const u8 *addr)</div><div class='hunk'>@@ -151,7 +157,7 @@ static inline bool is_multicast_ether_addr_64bits(const u8 *addr)</div><div class='ctx'>  * is_local_ether_addr - Determine if the Ethernet address is locally-assigned one (IEEE 802).</div><div class='ctx'>  * @addr: Pointer to a six-byte array containing the Ethernet address</div><div class='ctx'>  *</div><div class='del'>- * Return true if the address is a local address.</div><div class='add'>+ * Return: true if the address is a local address.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool is_local_ether_addr(const u8 *addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -162,7 +168,7 @@ static inline bool is_local_ether_addr(const u8 *addr)</div><div class='ctx'>  * is_broadcast_ether_addr - Determine if the Ethernet address is broadcast</div><div class='ctx'>  * @addr: Pointer to a six-byte array containing the Ethernet address</div><div class='ctx'>  *</div><div class='del'>- * Return true if the address is the broadcast address.</div><div class='add'>+ * Return: true if the address is the broadcast address.</div><div class='ctx'>  *</div><div class='ctx'>  * Please note: addr must be aligned to u16.</div><div class='ctx'>  */</div><div class='hunk'>@@ -177,7 +183,7 @@ static inline bool is_broadcast_ether_addr(const u8 *addr)</div><div class='ctx'>  * is_unicast_ether_addr - Determine if the Ethernet address is unicast</div><div class='ctx'>  * @addr: Pointer to a six-byte array containing the Ethernet address</div><div class='ctx'>  *</div><div class='del'>- * Return true if the address is a unicast address.</div><div class='add'>+ * Return: true if the address is a unicast address.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool is_unicast_ether_addr(const u8 *addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -191,7 +197,7 @@ static inline bool is_unicast_ether_addr(const u8 *addr)</div><div class='ctx'>  * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not</div><div class='ctx'>  * a multicast address, and is not FF:FF:FF:FF:FF:FF.</div><div class='ctx'>  *</div><div class='del'>- * Return true if the address is valid.</div><div class='add'>+ * Return: true if the address is valid.</div><div class='ctx'>  *</div><div class='ctx'>  * Please note: addr must be aligned to u16.</div><div class='ctx'>  */</div><div class='hunk'>@@ -208,7 +214,7 @@ static inline bool is_valid_ether_addr(const u8 *addr)</div><div class='ctx'>  *</div><div class='ctx'>  * Check that the value from the Ethertype/length field is a valid Ethertype.</div><div class='ctx'>  *</div><div class='del'>- * Return true if the valid is an 802.3 supported Ethertype.</div><div class='add'>+ * Return: true if the valid is an 802.3 supported Ethertype.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool eth_proto_is_802_3(__be16 proto)</div><div class='ctx'> {</div><div class='hunk'>@@ -430,18 +436,16 @@ static inline bool ether_addr_equal_masked(const u8 *addr1, const u8 *addr2,</div><div class='ctx'> </div><div class='ctx'> static inline bool ether_addr_is_ipv4_mcast(const u8 *addr)</div><div class='ctx'> {</div><div class='del'>-	u8 base[ETH_ALEN] = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 };</div><div class='ctx'> 	u8 mask[ETH_ALEN] = { 0xff, 0xff, 0xff, 0x80, 0x00, 0x00 };</div><div class='ctx'> </div><div class='del'>-	return ether_addr_equal_masked(addr, base, mask);</div><div class='add'>+	return ether_addr_equal_masked(addr, eth_ipv4_mcast_addr_base, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool ether_addr_is_ipv6_mcast(const u8 *addr)</div><div class='ctx'> {</div><div class='del'>-	u8 base[ETH_ALEN] = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 };</div><div class='ctx'> 	u8 mask[ETH_ALEN] = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='del'>-	return ether_addr_equal_masked(addr, base, mask);</div><div class='add'>+	return ether_addr_equal_masked(addr, eth_ipv6_mcast_addr_base, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool ether_addr_is_ip_mcast(const u8 *addr)</div><div class='hunk'>@@ -454,7 +458,7 @@ static inline bool ether_addr_is_ip_mcast(const u8 *addr)</div><div class='ctx'>  * ether_addr_to_u64 - Convert an Ethernet address into a u64 value.</div><div class='ctx'>  * @addr: Pointer to a six-byte array containing the Ethernet address</div><div class='ctx'>  *</div><div class='del'>- * Return a u64 value of the address</div><div class='add'>+ * Return: a u64 value of the address</div><div class='ctx'>  */</div><div class='ctx'> static inline u64 ether_addr_to_u64(const u8 *addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -608,7 +612,40 @@ static inline void eth_hw_addr_gen(struct net_device *dev, const u8 *base_addr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * eth_skb_pad - Pad buffer to mininum number of octets for Ethernet frame</div><div class='add'>+ * eth_skb_pkt_type - Assign packet type if destination address does not match</div><div class='add'>+ * @skb: Assigned a packet type if address does not match @dev address</div><div class='add'>+ * @dev: Network device used to compare packet address against</div><div class='add'>+ *</div><div class='add'>+ * If the destination MAC address of the packet does not match the network</div><div class='add'>+ * device address, assign an appropriate packet type.</div><div class='add'>+ */</div><div class='add'>+static inline void eth_skb_pkt_type(struct sk_buff *skb,</div><div class='add'>+				    const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct ethhdr *eth = eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!ether_addr_equal_64bits(eth-&gt;h_dest, dev-&gt;dev_addr))) {</div><div class='add'>+		if (unlikely(is_multicast_ether_addr_64bits(eth-&gt;h_dest))) {</div><div class='add'>+			if (ether_addr_equal_64bits(eth-&gt;h_dest, dev-&gt;broadcast))</div><div class='add'>+				skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='add'>+			else</div><div class='add'>+				skb-&gt;pkt_type = PACKET_MULTICAST;</div><div class='add'>+		} else {</div><div class='add'>+			skb-&gt;pkt_type = PACKET_OTHERHOST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ethhdr *eth_skb_pull_mac(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *eth = (struct ethhdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	skb_pull_inline(skb, ETH_HLEN);</div><div class='add'>+	return eth;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * eth_skb_pad - Pad buffer to minimum number of octets for Ethernet frame</div><div class='ctx'>  * @skb: Buffer to pad</div><div class='ctx'>  *</div><div class='ctx'>  * An Ethernet frame should have a minimum size of 60 bytes.  This function</div><div class='head'>diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h<br/>index 9901e563f706..5c9162193d26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ethtool.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ethtool.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ethtool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ethtool.h</a></div><div class='hunk'>@@ -17,7 +17,13 @@</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/timer_types.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/ethtool.h&gt;</div><div class='add'>+#include &lt;uapi/linux/ethtool_netlink_generated.h&gt;</div><div class='add'>+#include &lt;uapi/linux/net_tstamp.h&gt;</div><div class='add'>+</div><div class='add'>+#define ETHTOOL_MM_MAX_VERIFY_TIME_MS		128</div><div class='add'>+#define ETHTOOL_MM_MAX_VERIFY_RETRIES		3</div><div class='ctx'> </div><div class='ctx'> struct compat_ethtool_rx_flow_spec {</div><div class='ctx'> 	u32		flow_type;</div><div class='hunk'>@@ -77,6 +83,9 @@ enum {</div><div class='ctx'>  * @cqe_size: Size of TX/RX completion queue event</div><div class='ctx'>  * @tx_push_buf_len: Size of TX push buffer</div><div class='ctx'>  * @tx_push_buf_max_len: Maximum allowed size of TX push buffer</div><div class='add'>+ * @hds_thresh: Packet size threshold for header data split (HDS)</div><div class='add'>+ * @hds_thresh_max: Maximum supported setting for @hds_threshold</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> struct kernel_ethtool_ringparam {</div><div class='ctx'> 	u32	rx_buf_len;</div><div class='hunk'>@@ -86,6 +95,8 @@ struct kernel_ethtool_ringparam {</div><div class='ctx'> 	u32	cqe_size;</div><div class='ctx'> 	u32	tx_push_buf_len;</div><div class='ctx'> 	u32	tx_push_buf_max_len;</div><div class='add'>+	u32	hds_thresh;</div><div class='add'>+	u32	hds_thresh_max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -96,6 +107,7 @@ struct kernel_ethtool_ringparam {</div><div class='ctx'>  * @ETHTOOL_RING_USE_RX_PUSH: capture for setting rx_push</div><div class='ctx'>  * @ETHTOOL_RING_USE_TX_PUSH_BUF_LEN: capture for setting tx_push_buf_len</div><div class='ctx'>  * @ETHTOOL_RING_USE_TCP_DATA_SPLIT: capture for setting tcp_data_split</div><div class='add'>+ * @ETHTOOL_RING_USE_HDS_THRS: capture for setting header-data-split-thresh</div><div class='ctx'>  */</div><div class='ctx'> enum ethtool_supported_ring_param {</div><div class='ctx'> 	ETHTOOL_RING_USE_RX_BUF_LEN		= BIT(0),</div><div class='hunk'>@@ -104,6 +116,7 @@ enum ethtool_supported_ring_param {</div><div class='ctx'> 	ETHTOOL_RING_USE_RX_PUSH		= BIT(3),</div><div class='ctx'> 	ETHTOOL_RING_USE_TX_PUSH_BUF_LEN	= BIT(4),</div><div class='ctx'> 	ETHTOOL_RING_USE_TCP_DATA_SPLIT		= BIT(5),</div><div class='add'>+	ETHTOOL_RING_USE_HDS_THRS		= BIT(6),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define __ETH_RSS_HASH_BIT(bit)	((u32)1 &lt;&lt; (bit))</div><div class='hunk'>@@ -159,6 +172,57 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)</div><div class='ctx'> 	return index % n_rx_rings;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_rxfh_context - a custom RSS context configuration</div><div class='add'>+ * @indir_size: Number of u32 entries in indirection table</div><div class='add'>+ * @key_size: Size of hash key, in bytes</div><div class='add'>+ * @priv_size: Size of driver private data, in bytes</div><div class='add'>+ * @hfunc: RSS hash function identifier.  One of the %ETH_RSS_HASH_*</div><div class='add'>+ * @input_xfrm: Defines how the input data is transformed. Valid values are one</div><div class='add'>+ *	of %RXH_XFRM_*.</div><div class='add'>+ * @indir_configured: indir has been specified (at create time or subsequently)</div><div class='add'>+ * @key_configured: hkey has been specified (at create time or subsequently)</div><div class='add'>+ */</div><div class='add'>+struct ethtool_rxfh_context {</div><div class='add'>+	u32 indir_size;</div><div class='add'>+	u32 key_size;</div><div class='add'>+	u16 priv_size;</div><div class='add'>+	u8 hfunc;</div><div class='add'>+	u8 input_xfrm;</div><div class='add'>+	u8 indir_configured:1;</div><div class='add'>+	u8 key_configured:1;</div><div class='add'>+	/* private: driver private data, indirection table, and hash key are</div><div class='add'>+	 * stored sequentially in @data area.  Use below helpers to access.</div><div class='add'>+	 */</div><div class='add'>+	u32 key_off;</div><div class='add'>+	u8 data[] __aligned(sizeof(void *));</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void *ethtool_rxfh_context_priv(struct ethtool_rxfh_context *ctx)</div><div class='add'>+{</div><div class='add'>+	return ctx-&gt;data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 *ethtool_rxfh_context_indir(struct ethtool_rxfh_context *ctx)</div><div class='add'>+{</div><div class='add'>+	return (u32 *)(ctx-&gt;data + ALIGN(ctx-&gt;priv_size, sizeof(u32)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *ethtool_rxfh_context_key(struct ethtool_rxfh_context *ctx)</div><div class='add'>+{</div><div class='add'>+	return &amp;ctx-&gt;data[ctx-&gt;key_off];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ethtool_rxfh_context_lost(struct net_device *dev, u32 context_id);</div><div class='add'>+</div><div class='add'>+struct link_mode_info {</div><div class='add'>+	int                             speed;</div><div class='add'>+	u8                              lanes;</div><div class='add'>+	u8                              duplex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct link_mode_info link_mode_params[];</div><div class='add'>+</div><div class='ctx'> /* declare a link mode bitmap */</div><div class='ctx'> #define __ETHTOOL_DECLARE_LINK_MODE_MASK(name)		\</div><div class='ctx'> 	DECLARE_BITMAP(name, __ETHTOOL_LINK_MODE_MASK_NBITS)</div><div class='hunk'>@@ -213,7 +277,7 @@ struct ethtool_link_ksettings {</div><div class='ctx'>  *   @mode : one of the ETHTOOL_LINK_MODE_*_BIT</div><div class='ctx'>  * (not atomic, no bound checking)</div><div class='ctx'>  *</div><div class='del'>- * Returns true/false.</div><div class='add'>+ * Returns: true/false.</div><div class='ctx'>  */</div><div class='ctx'> #define ethtool_link_ksettings_test_link_mode(ptr, name, mode)		\</div><div class='ctx'> 	test_bit(ETHTOOL_LINK_MODE_ ## mode ## _BIT, (ptr)-&gt;link_modes.name)</div><div class='hunk'>@@ -284,7 +348,9 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,</div><div class='ctx'> #define ETHTOOL_COALESCE_TX_AGGR_MAX_BYTES	BIT(24)</div><div class='ctx'> #define ETHTOOL_COALESCE_TX_AGGR_MAX_FRAMES	BIT(25)</div><div class='ctx'> #define ETHTOOL_COALESCE_TX_AGGR_TIME_USECS	BIT(26)</div><div class='del'>-#define ETHTOOL_COALESCE_ALL_PARAMS		GENMASK(26, 0)</div><div class='add'>+#define ETHTOOL_COALESCE_RX_PROFILE		BIT(27)</div><div class='add'>+#define ETHTOOL_COALESCE_TX_PROFILE		BIT(28)</div><div class='add'>+#define ETHTOOL_COALESCE_ALL_PARAMS		GENMASK(28, 0)</div><div class='ctx'> </div><div class='ctx'> #define ETHTOOL_COALESCE_USECS						\</div><div class='ctx'> 	(ETHTOOL_COALESCE_RX_USECS | ETHTOOL_COALESCE_TX_USECS)</div><div class='hunk'>@@ -366,6 +432,29 @@ struct ethtool_eth_phy_stats {</div><div class='ctx'> 	);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_phy_stats - PHY-level statistics counters</div><div class='add'>+ * @rx_packets: Total successfully received frames</div><div class='add'>+ * @rx_bytes: Total successfully received bytes</div><div class='add'>+ * @rx_errors: Total received frames with errors (e.g., CRC errors)</div><div class='add'>+ * @tx_packets: Total successfully transmitted frames</div><div class='add'>+ * @tx_bytes: Total successfully transmitted bytes</div><div class='add'>+ * @tx_errors: Total transmitted frames with errors</div><div class='add'>+ *</div><div class='add'>+ * This structure provides a standardized interface for reporting</div><div class='add'>+ * PHY-level statistics counters. It is designed to expose statistics</div><div class='add'>+ * commonly provided by PHYs but not explicitly defined in the IEEE</div><div class='add'>+ * 802.3 standard.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_phy_stats {</div><div class='add'>+	u64 rx_packets;</div><div class='add'>+	u64 rx_bytes;</div><div class='add'>+	u64 rx_errors;</div><div class='add'>+	u64 tx_packets;</div><div class='add'>+	u64 tx_bytes;</div><div class='add'>+	u64 tx_errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Basic IEEE 802.3 MAC Ctrl statistics (30.3.3.*), not otherwise exposed</div><div class='ctx'>  * via a more targeted API.</div><div class='ctx'>  */</div><div class='hunk'>@@ -403,7 +492,29 @@ struct ethtool_pause_stats {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define ETHTOOL_MAX_LANES	8</div><div class='add'>+/*</div><div class='add'>+ * IEEE 802.3ck/df defines 16 bins for FEC histogram plus one more for</div><div class='add'>+ * the end-of-list marker, total 17 items</div><div class='add'>+ */</div><div class='add'>+#define ETHTOOL_FEC_HIST_MAX	17</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_fec_hist_range - error bits range for FEC histogram</div><div class='add'>+ * statistics</div><div class='add'>+ * @low: low bound of the bin (inclusive)</div><div class='add'>+ * @high: high bound of the bin (inclusive)</div><div class='add'>+ */</div><div class='add'>+struct ethtool_fec_hist_range {</div><div class='add'>+	u16 low;</div><div class='add'>+	u16 high;</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+struct ethtool_fec_hist {</div><div class='add'>+	struct ethtool_fec_hist_value {</div><div class='add'>+		u64 sum;</div><div class='add'>+		u64 per_lane[ETHTOOL_MAX_LANES];</div><div class='add'>+	} values[ETHTOOL_FEC_HIST_MAX];</div><div class='add'>+	const struct ethtool_fec_hist_range *ranges;</div><div class='add'>+};</div><div class='ctx'> /**</div><div class='ctx'>  * struct ethtool_fec_stats - statistics for IEEE 802.3 FEC</div><div class='ctx'>  * @corrected_blocks: number of received blocks corrected by FEC</div><div class='hunk'>@@ -447,7 +558,7 @@ struct ethtool_rmon_hist_range {</div><div class='ctx'> 	u16 high;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ETHTOOL_RMON_HIST_MAX	10</div><div class='add'>+#define ETHTOOL_RMON_HIST_MAX	11</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ethtool_rmon_stats - selected RMON (RFC 2819) statistics</div><div class='hunk'>@@ -480,21 +591,47 @@ struct ethtool_rmon_stats {</div><div class='ctx'> 	);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_ts_stats - HW timestamping statistics</div><div class='add'>+ * @pkts: Number of packets successfully timestamped by the hardware.</div><div class='add'>+ * @onestep_pkts_unconfirmed: Number of PTP packets with one-step TX</div><div class='add'>+ *			      timestamping that were sent, but for which the</div><div class='add'>+ *			      device offers no confirmation whether they made</div><div class='add'>+ *			      it onto the wire and the timestamp was inserted</div><div class='add'>+ *			      in the originTimestamp or correctionField, or</div><div class='add'>+ *			      not.</div><div class='add'>+ * @lost: Number of hardware timestamping requests where the timestamping</div><div class='add'>+ *	information from the hardware never arrived for submission with</div><div class='add'>+ *	the skb.</div><div class='add'>+ * @err: Number of arbitrary timestamp generation error events that the</div><div class='add'>+ *	hardware encountered, exclusive of @lost statistics. Cases such</div><div class='add'>+ *	as resource exhaustion, unavailability, firmware errors, and</div><div class='add'>+ *	detected illogical timestamp values not submitted with the skb</div><div class='add'>+ *	are inclusive to this counter.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_ts_stats {</div><div class='add'>+	struct_group(tx_stats,</div><div class='add'>+		u64 pkts;</div><div class='add'>+		u64 onestep_pkts_unconfirmed;</div><div class='add'>+		u64 lost;</div><div class='add'>+		u64 err;</div><div class='add'>+	);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define ETH_MODULE_EEPROM_PAGE_LEN	128</div><div class='ctx'> #define ETH_MODULE_MAX_I2C_ADDRESS	0x7f</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct ethtool_module_eeprom - EEPROM dump from specified page</div><div class='del'>- * @offset: Offset within the specified EEPROM page to begin read, in bytes.</div><div class='del'>- * @length: Number of bytes to read.</div><div class='del'>- * @page: Page number to read from.</div><div class='del'>- * @bank: Page bank number to read from, if applicable by EEPROM spec.</div><div class='add'>+ * struct ethtool_module_eeprom - plug-in module EEPROM read / write parameters</div><div class='add'>+ * @offset: When @offset is 0-127, it is used as an address to the Lower Memory</div><div class='add'>+ *	(@page must be 0). Otherwise, it is used as an address to the</div><div class='add'>+ *	Upper Memory.</div><div class='add'>+ * @length: Number of bytes to read / write.</div><div class='add'>+ * @page: Page number.</div><div class='add'>+ * @bank: Bank number, if supported by EEPROM spec.</div><div class='ctx'>  * @i2c_address: I2C address of a page. Value less than 0x7f expected. Most</div><div class='ctx'>  *	EEPROMs use 0x50 or 0x51.</div><div class='ctx'>  * @data: Pointer to buffer with EEPROM data of @length size.</div><div class='del'>- *</div><div class='del'>- * This can be used to manage pages during EEPROM dump in ethtool and pass</div><div class='del'>- * required information to the driver.</div><div class='ctx'>  */</div><div class='ctx'> struct ethtool_module_eeprom {</div><div class='ctx'> 	u32	offset;</div><div class='hunk'>@@ -608,6 +745,75 @@ struct ethtool_mm_stats {</div><div class='ctx'> 	u64 MACMergeHoldCount;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ethtool_mmsv_event {</div><div class='add'>+	ETHTOOL_MMSV_LP_SENT_VERIFY_MPACKET,</div><div class='add'>+	ETHTOOL_MMSV_LD_SENT_VERIFY_MPACKET,</div><div class='add'>+	ETHTOOL_MMSV_LP_SENT_RESPONSE_MPACKET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MAC Merge verification mPacket type */</div><div class='add'>+enum ethtool_mpacket {</div><div class='add'>+	ETHTOOL_MPACKET_VERIFY,</div><div class='add'>+	ETHTOOL_MPACKET_RESPONSE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ethtool_mmsv;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_mmsv_ops - Operations for MAC Merge Software Verification</div><div class='add'>+ * @configure_tx: Driver callback for the event where the preemptible TX</div><div class='add'>+ *		  becomes active or inactive. Preemptible traffic</div><div class='add'>+ *		  classes must be committed to hardware only while</div><div class='add'>+ *		  preemptible TX is active.</div><div class='add'>+ * @configure_pmac: Driver callback for the event where the pMAC state</div><div class='add'>+ *		    changes as result of an administrative setting</div><div class='add'>+ *		    (ethtool) or a call to ethtool_mmsv_link_state_handle().</div><div class='add'>+ * @send_mpacket: Driver-provided method for sending a Verify or a Response</div><div class='add'>+ *		  mPacket.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_mmsv_ops {</div><div class='add'>+	void (*configure_tx)(struct ethtool_mmsv *mmsv, bool tx_active);</div><div class='add'>+	void (*configure_pmac)(struct ethtool_mmsv *mmsv, bool pmac_enabled);</div><div class='add'>+	void (*send_mpacket)(struct ethtool_mmsv *mmsv, enum ethtool_mpacket mpacket);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_mmsv - MAC Merge Software Verification</div><div class='add'>+ * @ops: operations for MAC Merge Software Verification</div><div class='add'>+ * @dev: pointer to net_device structure</div><div class='add'>+ * @lock: serialize access to MAC Merge state between</div><div class='add'>+ *	  ethtool requests and link state updates.</div><div class='add'>+ * @status: current verification FSM state</div><div class='add'>+ * @verify_timer: timer for verification in local TX direction</div><div class='add'>+ * @verify_enabled: indicates if verification is enabled</div><div class='add'>+ * @verify_retries: number of retries for verification</div><div class='add'>+ * @pmac_enabled: indicates if the preemptible MAC is enabled</div><div class='add'>+ * @verify_time: time for verification in milliseconds</div><div class='add'>+ * @tx_enabled: indicates if transmission is enabled</div><div class='add'>+ */</div><div class='add'>+struct ethtool_mmsv {</div><div class='add'>+	const struct ethtool_mmsv_ops *ops;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	enum ethtool_mm_verify_status status;</div><div class='add'>+	struct timer_list verify_timer;</div><div class='add'>+	bool verify_enabled;</div><div class='add'>+	int verify_retries;</div><div class='add'>+	bool pmac_enabled;</div><div class='add'>+	u32 verify_time;</div><div class='add'>+	bool tx_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ethtool_mmsv_stop(struct ethtool_mmsv *mmsv);</div><div class='add'>+void ethtool_mmsv_link_state_handle(struct ethtool_mmsv *mmsv, bool up);</div><div class='add'>+void ethtool_mmsv_event_handle(struct ethtool_mmsv *mmsv,</div><div class='add'>+			       enum ethtool_mmsv_event event);</div><div class='add'>+void ethtool_mmsv_get_mm(struct ethtool_mmsv *mmsv,</div><div class='add'>+			 struct ethtool_mm_state *state);</div><div class='add'>+void ethtool_mmsv_set_mm(struct ethtool_mmsv *mmsv, struct ethtool_mm_cfg *cfg);</div><div class='add'>+void ethtool_mmsv_init(struct ethtool_mmsv *mmsv, struct net_device *dev,</div><div class='add'>+		       const struct ethtool_mmsv_ops *ops);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct ethtool_rxfh_param - RXFH (RSS) parameters</div><div class='ctx'>  * @hfunc: Defines the current RSS hash function used by HW (or to be set to).</div><div class='hunk'>@@ -642,15 +848,66 @@ struct ethtool_rxfh_param {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct ethtool_rxfh_fields - Rx Flow Hashing (RXFH) header field config</div><div class='add'>+ * @data: which header fields are used for hashing, bitmask of RXH_* defines</div><div class='add'>+ * @flow_type: L2-L4 network traffic flow type</div><div class='add'>+ * @rss_context: RSS context, will only be used if rxfh_per_ctx_fields is</div><div class='add'>+ *	set in struct ethtool_ops</div><div class='add'>+ */</div><div class='add'>+struct ethtool_rxfh_fields {</div><div class='add'>+	u32 data;</div><div class='add'>+	u32 flow_type;</div><div class='add'>+	u32 rss_context;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct kernel_ethtool_ts_info - kernel copy of struct ethtool_ts_info</div><div class='add'>+ * @cmd: command number = %ETHTOOL_GET_TS_INFO</div><div class='add'>+ * @so_timestamping: bit mask of the sum of the supported SO_TIMESTAMPING flags</div><div class='add'>+ * @phc_index: device index of the associated PHC, or -1 if there is none</div><div class='add'>+ * @phc_qualifier: qualifier of the associated PHC</div><div class='add'>+ * @phc_source: source device of the associated PHC</div><div class='add'>+ * @phc_phyindex: index of PHY device source of the associated PHC</div><div class='add'>+ * @tx_types: bit mask of the supported hwtstamp_tx_types enumeration values</div><div class='add'>+ * @rx_filters: bit mask of the supported hwtstamp_rx_filters enumeration values</div><div class='add'>+ */</div><div class='add'>+struct kernel_ethtool_ts_info {</div><div class='add'>+	u32 cmd;</div><div class='add'>+	u32 so_timestamping;</div><div class='add'>+	int phc_index;</div><div class='add'>+	enum hwtstamp_provider_qualifier phc_qualifier;</div><div class='add'>+	enum hwtstamp_source phc_source;</div><div class='add'>+	int phc_phyindex;</div><div class='add'>+	u32 tx_types;</div><div class='add'>+	u32 rx_filters;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct ethtool_ops - optional netdev operations</div><div class='add'>+ * @supported_input_xfrm: supported types of input xfrm from %RXH_XFRM_*.</div><div class='ctx'>  * @cap_link_lanes_supported: indicates if the driver supports lanes</div><div class='ctx'>  *	parameter.</div><div class='del'>- * @cap_rss_ctx_supported: indicates if the driver supports RSS</div><div class='del'>- *	contexts.</div><div class='del'>- * @cap_rss_sym_xor_supported: indicates if the driver supports symmetric-xor</div><div class='del'>- *	RSS.</div><div class='add'>+ * @rxfh_per_ctx_fields: device supports selecting different header fields</div><div class='add'>+ *	for Rx hash calculation and RSS for each additional context.</div><div class='add'>+ * @rxfh_per_ctx_key: device supports setting different RSS key for each</div><div class='add'>+ *	additional context. Netlink API should report hfunc, key, and input_xfrm</div><div class='add'>+ *	for every context, not just context 0.</div><div class='add'>+ * @cap_rss_rxnfc_adds: device supports nonzero ring_cookie in filters with</div><div class='add'>+ *	%FLOW_RSS flag; the queue ID from the filter is added to the value from</div><div class='add'>+ *	the indirection table to determine the delivery queue.</div><div class='add'>+ * @rxfh_indir_space: max size of RSS indirection tables, if indirection table</div><div class='add'>+ *	size as returned by @get_rxfh_indir_size may change during lifetime</div><div class='add'>+ *	of the device. Leave as 0 if the table size is constant.</div><div class='add'>+ * @rxfh_key_space: same as @rxfh_indir_space, but for the key.</div><div class='add'>+ * @rxfh_priv_size: size of the driver private data area the core should</div><div class='add'>+ *	allocate for an RSS context (in &amp;struct ethtool_rxfh_context).</div><div class='add'>+ * @rxfh_max_num_contexts: maximum (exclusive) supported RSS context ID.</div><div class='add'>+ *	If this is zero then the core may choose any (nonzero) ID, otherwise</div><div class='add'>+ *	the core will only use IDs strictly less than this value, as the</div><div class='add'>+ *	@rss_context argument to @create_rxfh_context and friends.</div><div class='ctx'>  * @supported_coalesce_params: supported types of interrupt coalescing.</div><div class='ctx'>  * @supported_ring_params: supported ring params.</div><div class='add'>+ * @supported_hwtstamp_qualifiers: bitfield of supported hwtstamp qualifier.</div><div class='ctx'>  * @get_drvinfo: Report driver/device information. Modern drivers no</div><div class='ctx'>  *	longer have to implement this callback. Most fields are</div><div class='ctx'>  *	correctly filled in by the core using system information, or</div><div class='hunk'>@@ -733,6 +990,7 @@ struct ethtool_rxfh_param {</div><div class='ctx'>  * @reset: Reset (part of) the device, as specified by a bitmask of</div><div class='ctx'>  *	flags from &amp;enum ethtool_reset_flags.  Returns a negative</div><div class='ctx'>  *	error code or zero.</div><div class='add'>+ * @get_rx_ring_count: Return the number of RX rings</div><div class='ctx'>  * @get_rxfh_key_size: Get the size of the RX flow hash key.</div><div class='ctx'>  *	Returns zero if not supported for this specific device.</div><div class='ctx'>  * @get_rxfh_indir_size: Get the size of the RX flow hash indirection table.</div><div class='hunk'>@@ -745,6 +1003,34 @@ struct ethtool_rxfh_param {</div><div class='ctx'>  *	will remain unchanged.</div><div class='ctx'>  *	Returns a negative error code or zero. An error code must be returned</div><div class='ctx'>  *	if at least one unsupported change was requested.</div><div class='add'>+ * @get_rxfh_fields: Get header fields used for flow hashing.</div><div class='add'>+ * @set_rxfh_fields: Set header fields used for flow hashing.</div><div class='add'>+ * @create_rxfh_context: Create a new RSS context with the specified RX flow</div><div class='add'>+ *	hash indirection table, hash key, and hash function.</div><div class='add'>+ *	The &amp;struct ethtool_rxfh_context for this context is passed in @ctx;</div><div class='add'>+ *	note that the indir table, hkey and hfunc are not yet populated as</div><div class='add'>+ *	of this call.  The driver does not need to update these; the core</div><div class='add'>+ *	will do so if this op succeeds.</div><div class='add'>+ *	However, if @rxfh.indir is set to %NULL, the driver must update the</div><div class='add'>+ *	indir table in @ctx with the (default or inherited) table actually in</div><div class='add'>+ *	use; similarly, if @rxfh.key is %NULL, @rxfh.hfunc is</div><div class='add'>+ *	%ETH_RSS_HASH_NO_CHANGE, or @rxfh.input_xfrm is %RXH_XFRM_NO_CHANGE,</div><div class='add'>+ *	the driver should update the corresponding information in @ctx.</div><div class='add'>+ *	If the driver provides this method, it must also provide</div><div class='add'>+ *	@modify_rxfh_context and @remove_rxfh_context.</div><div class='add'>+ *	Returns a negative error code or zero.</div><div class='add'>+ * @modify_rxfh_context: Reconfigure the specified RSS context.  Allows setting</div><div class='add'>+ *	the contents of the RX flow hash indirection table, hash key, and/or</div><div class='add'>+ *	hash function associated with the given context.</div><div class='add'>+ *	Parameters which are set to %NULL or zero will remain unchanged.</div><div class='add'>+ *	The &amp;struct ethtool_rxfh_context for this context is passed in @ctx;</div><div class='add'>+ *	note that it will still contain the *old* settings.  The driver does</div><div class='add'>+ *	not need to update these; the core will do so if this op succeeds.</div><div class='add'>+ *	Returns a negative error code or zero. An error code must be returned</div><div class='add'>+ *	if at least one unsupported change was requested.</div><div class='add'>+ * @remove_rxfh_context: Remove the specified RSS context.</div><div class='add'>+ *	The &amp;struct ethtool_rxfh_context for this context is passed in @ctx.</div><div class='add'>+ *	Returns a negative error code or zero.</div><div class='ctx'>  * @get_channels: Get number of channels.</div><div class='ctx'>  * @set_channels: Set number of channels.  Returns a negative error code or</div><div class='ctx'>  *	zero.</div><div class='hunk'>@@ -756,6 +1042,10 @@ struct ethtool_rxfh_param {</div><div class='ctx'>  *	It may be called with RCU, or rtnl or reference on the device.</div><div class='ctx'>  *	Drivers supporting transmit time stamps in software should set this to</div><div class='ctx'>  *	ethtool_op_get_ts_info().</div><div class='add'>+ * @get_ts_stats: Query the device hardware timestamping statistics. Drivers</div><div class='add'>+ *	must not zero statistics which they don't report. The stats structure</div><div class='add'>+ *	is initialized to ETHTOOL_STAT_NOT_SET indicating driver does not</div><div class='add'>+ *	report statistics.</div><div class='ctx'>  * @get_module_info: Get the size and type of the eeprom contained within</div><div class='ctx'>  *	a plug-in module.</div><div class='ctx'>  * @get_module_eeprom: Get the eeprom information from the plug-in module</div><div class='hunk'>@@ -799,6 +1089,8 @@ struct ethtool_rxfh_param {</div><div class='ctx'>  * @get_module_eeprom_by_page: Get a region of plug-in module EEPROM data from</div><div class='ctx'>  *	specified page. Returns a negative error code or the amount of bytes</div><div class='ctx'>  *	read.</div><div class='add'>+ * @set_module_eeprom_by_page: Write to a region of plug-in module EEPROM,</div><div class='add'>+ *	from kernel space only. Returns a negative error code or zero.</div><div class='ctx'>  * @get_eth_phy_stats: Query some of the IEEE 802.3 PHY statistics.</div><div class='ctx'>  * @get_eth_mac_stats: Query some of the IEEE 802.3 MAC statistics.</div><div class='ctx'>  * @get_eth_ctrl_stats: Query some of the IEEE 802.3 MAC Ctrl statistics.</div><div class='hunk'>@@ -826,11 +1118,18 @@ struct ethtool_rxfh_param {</div><div class='ctx'>  * of the generic netdev features interface.</div><div class='ctx'>  */</div><div class='ctx'> struct ethtool_ops {</div><div class='add'>+	u32     supported_input_xfrm:8;</div><div class='ctx'> 	u32     cap_link_lanes_supported:1;</div><div class='del'>-	u32     cap_rss_ctx_supported:1;</div><div class='del'>-	u32	cap_rss_sym_xor_supported:1;</div><div class='add'>+	u32	rxfh_per_ctx_fields:1;</div><div class='add'>+	u32	rxfh_per_ctx_key:1;</div><div class='add'>+	u32	cap_rss_rxnfc_adds:1;</div><div class='add'>+	u32	rxfh_indir_space;</div><div class='add'>+	u16	rxfh_key_space;</div><div class='add'>+	u16	rxfh_priv_size;</div><div class='add'>+	u32	rxfh_max_num_contexts;</div><div class='ctx'> 	u32	supported_coalesce_params;</div><div class='ctx'> 	u32	supported_ring_params;</div><div class='add'>+	u32	supported_hwtstamp_qualifiers;</div><div class='ctx'> 	void	(*get_drvinfo)(struct net_device *, struct ethtool_drvinfo *);</div><div class='ctx'> 	int	(*get_regs_len)(struct net_device *);</div><div class='ctx'> 	void	(*get_regs)(struct net_device *, struct ethtool_regs *, void *);</div><div class='hunk'>@@ -886,18 +1185,38 @@ struct ethtool_ops {</div><div class='ctx'> 	int	(*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *);</div><div class='ctx'> 	int	(*flash_device)(struct net_device *, struct ethtool_flash *);</div><div class='ctx'> 	int	(*reset)(struct net_device *, u32 *);</div><div class='add'>+	u32	(*get_rx_ring_count)(struct net_device *dev);</div><div class='ctx'> 	u32	(*get_rxfh_key_size)(struct net_device *);</div><div class='ctx'> 	u32	(*get_rxfh_indir_size)(struct net_device *);</div><div class='ctx'> 	int	(*get_rxfh)(struct net_device *, struct ethtool_rxfh_param *);</div><div class='ctx'> 	int	(*set_rxfh)(struct net_device *, struct ethtool_rxfh_param *,</div><div class='ctx'> 			    struct netlink_ext_ack *extack);</div><div class='add'>+	int	(*get_rxfh_fields)(struct net_device *,</div><div class='add'>+				   struct ethtool_rxfh_fields *);</div><div class='add'>+	int	(*set_rxfh_fields)(struct net_device *,</div><div class='add'>+				   const struct ethtool_rxfh_fields *,</div><div class='add'>+				   struct netlink_ext_ack *extack);</div><div class='add'>+	int	(*create_rxfh_context)(struct net_device *,</div><div class='add'>+				       struct ethtool_rxfh_context *ctx,</div><div class='add'>+				       const struct ethtool_rxfh_param *rxfh,</div><div class='add'>+				       struct netlink_ext_ack *extack);</div><div class='add'>+	int	(*modify_rxfh_context)(struct net_device *,</div><div class='add'>+				       struct ethtool_rxfh_context *ctx,</div><div class='add'>+				       const struct ethtool_rxfh_param *rxfh,</div><div class='add'>+				       struct netlink_ext_ack *extack);</div><div class='add'>+	int	(*remove_rxfh_context)(struct net_device *,</div><div class='add'>+				       struct ethtool_rxfh_context *ctx,</div><div class='add'>+				       u32 rss_context,</div><div class='add'>+				       struct netlink_ext_ack *extack);</div><div class='ctx'> 	void	(*get_channels)(struct net_device *, struct ethtool_channels *);</div><div class='ctx'> 	int	(*set_channels)(struct net_device *, struct ethtool_channels *);</div><div class='ctx'> 	int	(*get_dump_flag)(struct net_device *, struct ethtool_dump *);</div><div class='ctx'> 	int	(*get_dump_data)(struct net_device *,</div><div class='ctx'> 				 struct ethtool_dump *, void *);</div><div class='ctx'> 	int	(*set_dump)(struct net_device *, struct ethtool_dump *);</div><div class='del'>-	int	(*get_ts_info)(struct net_device *, struct ethtool_ts_info *);</div><div class='add'>+	int	(*get_ts_info)(struct net_device *, struct kernel_ethtool_ts_info *);</div><div class='add'>+	void	(*get_ts_stats)(struct net_device *dev,</div><div class='add'>+				struct ethtool_ts_stats *ts_stats);</div><div class='ctx'> 	int     (*get_module_info)(struct net_device *,</div><div class='ctx'> 				   struct ethtool_modinfo *);</div><div class='ctx'> 	int     (*get_module_eeprom)(struct net_device *,</div><div class='hunk'>@@ -917,7 +1236,8 @@ struct ethtool_ops {</div><div class='ctx'> 	int	(*set_link_ksettings)(struct net_device *,</div><div class='ctx'> 				      const struct ethtool_link_ksettings *);</div><div class='ctx'> 	void	(*get_fec_stats)(struct net_device *dev,</div><div class='del'>-				 struct ethtool_fec_stats *fec_stats);</div><div class='add'>+				 struct ethtool_fec_stats *fec_stats,</div><div class='add'>+				 struct ethtool_fec_hist *hist);</div><div class='ctx'> 	int	(*get_fecparam)(struct net_device *,</div><div class='ctx'> 				      struct ethtool_fecparam *);</div><div class='ctx'> 	int	(*set_fecparam)(struct net_device *,</div><div class='hunk'>@@ -931,6 +1251,9 @@ struct ethtool_ops {</div><div class='ctx'> 	int	(*get_module_eeprom_by_page)(struct net_device *dev,</div><div class='ctx'> 					     const struct ethtool_module_eeprom *page,</div><div class='ctx'> 					     struct netlink_ext_ack *extack);</div><div class='add'>+	int	(*set_module_eeprom_by_page)(struct net_device *dev,</div><div class='add'>+					     const struct ethtool_module_eeprom *page,</div><div class='add'>+					     struct netlink_ext_ack *extack);</div><div class='ctx'> 	void	(*get_eth_phy_stats)(struct net_device *dev,</div><div class='ctx'> 				     struct ethtool_eth_phy_stats *phy_stats);</div><div class='ctx'> 	void	(*get_eth_mac_stats)(struct net_device *dev,</div><div class='hunk'>@@ -973,6 +1296,21 @@ int ethtool_virtdev_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 				       const struct ethtool_link_ksettings *cmd,</div><div class='ctx'> 				       u32 *dev_speed, u8 *dev_duplex);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct ethtool_netdev_state - per-netdevice state for ethtool features</div><div class='add'>+ * @rss_ctx:		XArray of custom RSS contexts</div><div class='add'>+ * @rss_lock:		Protects entries in @rss_ctx.  May be taken from</div><div class='add'>+ *			within RTNL.</div><div class='add'>+ * @wol_enabled:	Wake-on-LAN is enabled</div><div class='add'>+ * @module_fw_flash_in_progress: Module firmware flashing is in progress.</div><div class='add'>+ */</div><div class='add'>+struct ethtool_netdev_state {</div><div class='add'>+	struct xarray		rss_ctx;</div><div class='add'>+	struct mutex		rss_lock;</div><div class='add'>+	unsigned		wol_enabled:1;</div><div class='add'>+	unsigned		module_fw_flash_in_progress:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct phy_device;</div><div class='ctx'> struct phy_tdr_config;</div><div class='ctx'> struct phy_plca_cfg;</div><div class='hunk'>@@ -1032,13 +1370,14 @@ ethtool_params_from_link_mode(struct ethtool_link_ksettings *link_ksettings,</div><div class='ctx'>  * @dev: pointer to net_device structure</div><div class='ctx'>  * @vclock_index: pointer to pointer of vclock index</div><div class='ctx'>  *</div><div class='del'>- * Return number of phc vclocks</div><div class='add'>+ * Return: number of phc vclocks</div><div class='ctx'>  */</div><div class='ctx'> int ethtool_get_phc_vclocks(struct net_device *dev, int **vclock_index);</div><div class='ctx'> </div><div class='ctx'> /* Some generic methods drivers may use in their ethtool_ops */</div><div class='ctx'> u32 ethtool_op_get_link(struct net_device *dev);</div><div class='del'>-int ethtool_op_get_ts_info(struct net_device *dev, struct ethtool_ts_info *eti);</div><div class='add'>+int ethtool_op_get_ts_info(struct net_device *dev,</div><div class='add'>+			   struct kernel_ethtool_ts_info *eti);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ethtool_mm_frag_size_add_to_min - Translate (standard) additional fragment</div><div class='hunk'>@@ -1085,9 +1424,10 @@ static inline int ethtool_mm_frag_size_min_to_add(u32 val_min, u32 *val_add,</div><div class='ctx'>  * ethtool_get_ts_info_by_layer - Obtains time stamping capabilities from the MAC or PHY layer.</div><div class='ctx'>  * @dev: pointer to net_device structure</div><div class='ctx'>  * @info: buffer to hold the result</div><div class='del'>- * Returns zero on success, non-zero otherwise.</div><div class='add'>+ * Returns: zero on success, non-zero otherwise.</div><div class='ctx'>  */</div><div class='del'>-int ethtool_get_ts_info_by_layer(struct net_device *dev, struct ethtool_ts_info *info);</div><div class='add'>+int ethtool_get_ts_info_by_layer(struct net_device *dev,</div><div class='add'>+				 struct kernel_ethtool_ts_info *info);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ethtool_sprintf - Write formatted string to ethtool string data</div><div class='hunk'>@@ -1112,6 +1452,17 @@ extern __printf(2, 3) void ethtool_sprintf(u8 **data, const char *fmt, ...);</div><div class='ctx'>  */</div><div class='ctx'> extern void ethtool_puts(u8 **data, const char *str);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ethtool_cpy - Write possibly-not-NUL-terminated string to ethtool string data</div><div class='add'>+ * @data: Pointer to a pointer to the start of string to write into</div><div class='add'>+ * @str: NUL-byte padded char array of size ETH_GSTRING_LEN to copy from</div><div class='add'>+ */</div><div class='add'>+#define ethtool_cpy(data, str)	do {				\</div><div class='add'>+	BUILD_BUG_ON(sizeof(str) != ETH_GSTRING_LEN);		\</div><div class='add'>+	memcpy(*(data), str, ETH_GSTRING_LEN);			\</div><div class='add'>+	*(data) += ETH_GSTRING_LEN;				\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> /* Link mode to forced speed capabilities maps */</div><div class='ctx'> struct ethtool_forced_speed_map {</div><div class='ctx'> 	u32		speed;</div><div class='head'>diff --git a/include/linux/ethtool_netlink.h b/include/linux/ethtool_netlink.h<br/>index fae0dfb9a9c8..39254b2726c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ethtool_netlink.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ethtool_netlink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ethtool_netlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ethtool_netlink.h</a></div><div class='hunk'>@@ -23,8 +23,10 @@ struct phy_device;</div><div class='ctx'> int ethnl_cable_test_alloc(struct phy_device *phydev, u8 cmd);</div><div class='ctx'> void ethnl_cable_test_free(struct phy_device *phydev);</div><div class='ctx'> void ethnl_cable_test_finished(struct phy_device *phydev);</div><div class='del'>-int ethnl_cable_test_result(struct phy_device *phydev, u8 pair, u8 result);</div><div class='del'>-int ethnl_cable_test_fault_length(struct phy_device *phydev, u8 pair, u32 cm);</div><div class='add'>+int ethnl_cable_test_result_with_src(struct phy_device *phydev, u8 pair,</div><div class='add'>+				     u8 result, u32 src);</div><div class='add'>+int ethnl_cable_test_fault_length_with_src(struct phy_device *phydev, u8 pair,</div><div class='add'>+					   u32 cm, u32 src);</div><div class='ctx'> int ethnl_cable_test_amplitude(struct phy_device *phydev, u8 pair, s16 mV);</div><div class='ctx'> int ethnl_cable_test_pulse(struct phy_device *phydev, u16 mV);</div><div class='ctx'> int ethnl_cable_test_step(struct phy_device *phydev, u32 first, u32 last,</div><div class='hunk'>@@ -41,6 +43,8 @@ void ethtool_aggregate_rmon_stats(struct net_device *dev,</div><div class='ctx'> 				  struct ethtool_rmon_stats *rmon_stats);</div><div class='ctx'> bool ethtool_dev_mm_supported(struct net_device *dev);</div><div class='ctx'> </div><div class='add'>+void ethnl_pse_send_ntf(struct net_device *netdev, unsigned long notif);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline int ethnl_cable_test_alloc(struct phy_device *phydev, u8 cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -54,14 +58,14 @@ static inline void ethnl_cable_test_free(struct phy_device *phydev)</div><div class='ctx'> static inline void ethnl_cable_test_finished(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline int ethnl_cable_test_result(struct phy_device *phydev, u8 pair,</div><div class='del'>-					  u8 result)</div><div class='add'>+static inline int ethnl_cable_test_result_with_src(struct phy_device *phydev,</div><div class='add'>+						   u8 pair, u8 result, u32 src)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ethnl_cable_test_fault_length(struct phy_device *phydev,</div><div class='del'>-						u8 pair, u32 cm)</div><div class='add'>+static inline int ethnl_cable_test_fault_length_with_src(struct phy_device *phydev,</div><div class='add'>+							 u8 pair, u32 cm, u32 src)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -118,5 +122,25 @@ static inline bool ethtool_dev_mm_supported(struct net_device *dev)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ethnl_pse_send_ntf(struct net_device *netdev,</div><div class='add'>+				      unsigned long notif)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* IS_ENABLED(CONFIG_ETHTOOL_NETLINK) */</div><div class='add'>+</div><div class='add'>+static inline int ethnl_cable_test_result(struct phy_device *phydev, u8 pair,</div><div class='add'>+					  u8 result)</div><div class='add'>+{</div><div class='add'>+	return ethnl_cable_test_result_with_src(phydev, pair, result,</div><div class='add'>+						ETHTOOL_A_CABLE_INF_SRC_TDR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ethnl_cable_test_fault_length(struct phy_device *phydev,</div><div class='add'>+						u8 pair, u32 cm)</div><div class='add'>+{</div><div class='add'>+	return ethnl_cable_test_fault_length_with_src(phydev, pair, cm,</div><div class='add'>+						      ETHTOOL_A_CABLE_INF_SRC_TDR);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_ETHTOOL_NETLINK_H_ */</div><div class='head'>diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h<br/>index 3337745d81bd..ccb478eb174b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/eventpoll.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/eventpoll.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/eventpoll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/eventpoll.h</a></div><div class='hunk'>@@ -25,6 +25,10 @@ struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long t</div><div class='ctx'> /* Used to release the epoll bits inside the "struct file" */</div><div class='ctx'> void eventpoll_release_file(struct file *file);</div><div class='ctx'> </div><div class='add'>+/* Copy ready events to userspace */</div><div class='add'>+int epoll_sendevents(struct file *file, struct epoll_event __user *events,</div><div class='add'>+		     int maxevents);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is called from inside fs/file_table.c:__fput() to unlink files</div><div class='ctx'>  * from the eventpoll interface. We need to have this facility to cleanup</div><div class='hunk'>@@ -42,7 +46,7 @@ static inline void eventpoll_release(struct file *file)</div><div class='ctx'> 	 * because the file in on the way to be removed and nobody ( but</div><div class='ctx'> 	 * eventpoll ) has still a reference to this file.</div><div class='ctx'> 	 */</div><div class='del'>-	if (likely(!file-&gt;f_ep))</div><div class='add'>+	if (likely(!READ_ONCE(file-&gt;f_ep)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/include/linux/evm.h b/include/linux/evm.h<br/>index d48d6da32315..ddece4a6b25d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/evm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/evm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/evm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/evm.h</a></div><div class='hunk'>@@ -26,6 +26,8 @@ extern int evm_protected_xattr_if_enabled(const char *req_xattr_name);</div><div class='ctx'> extern int evm_read_protected_xattrs(struct dentry *dentry, u8 *buffer,</div><div class='ctx'> 				     int buffer_size, char type,</div><div class='ctx'> 				     bool canonical_fmt);</div><div class='add'>+extern bool evm_metadata_changed(struct inode *inode,</div><div class='add'>+				 struct inode *metadata_inode);</div><div class='ctx'> #ifdef CONFIG_FS_POSIX_ACL</div><div class='ctx'> extern int posix_xattr_acl(const char *xattrname);</div><div class='ctx'> #else</div><div class='hunk'>@@ -76,5 +78,11 @@ static inline int evm_read_protected_xattrs(struct dentry *dentry, u8 *buffer,</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool evm_metadata_changed(struct inode *inode,</div><div class='add'>+					struct inode *metadata_inode)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_EVM */</div><div class='ctx'> #endif /* LINUX_EVM_H */</div><div class='head'>diff --git a/include/linux/execmem.h b/include/linux/execmem.h<br/>new file mode 100644<br/>index 000000000000..7de229134e30<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/execmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/execmem.h</a></div><div class='hunk'>@@ -0,0 +1,207 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_EXECMEM_ALLOC_H</div><div class='add'>+#define _LINUX_EXECMEM_ALLOC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/moduleloader.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+</div><div class='add'>+#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) &amp;&amp; \</div><div class='add'>+		!defined(CONFIG_KASAN_VMALLOC)</div><div class='add'>+#include &lt;linux/kasan.h&gt;</div><div class='add'>+#define MODULE_ALIGN (PAGE_SIZE &lt;&lt; KASAN_SHADOW_SCALE_SHIFT)</div><div class='add'>+#else</div><div class='add'>+#define MODULE_ALIGN PAGE_SIZE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum execmem_type - types of executable memory ranges</div><div class='add'>+ *</div><div class='add'>+ * There are several subsystems that allocate executable memory.</div><div class='add'>+ * Architectures define different restrictions on placement,</div><div class='add'>+ * permissions, alignment and other parameters for memory that can be used</div><div class='add'>+ * by these subsystems.</div><div class='add'>+ * Types in this enum identify subsystems that allocate executable memory</div><div class='add'>+ * and let architectures define parameters for ranges suitable for</div><div class='add'>+ * allocations by each subsystem.</div><div class='add'>+ *</div><div class='add'>+ * @EXECMEM_DEFAULT: default parameters that would be used for types that</div><div class='add'>+ * are not explicitly defined.</div><div class='add'>+ * @EXECMEM_MODULE_TEXT: parameters for module text sections</div><div class='add'>+ * @EXECMEM_KPROBES: parameters for kprobes</div><div class='add'>+ * @EXECMEM_FTRACE: parameters for ftrace</div><div class='add'>+ * @EXECMEM_BPF: parameters for BPF</div><div class='add'>+ * @EXECMEM_MODULE_DATA: parameters for module data sections</div><div class='add'>+ * @EXECMEM_TYPE_MAX:</div><div class='add'>+ */</div><div class='add'>+enum execmem_type {</div><div class='add'>+	EXECMEM_DEFAULT,</div><div class='add'>+	EXECMEM_MODULE_TEXT = EXECMEM_DEFAULT,</div><div class='add'>+	EXECMEM_KPROBES,</div><div class='add'>+	EXECMEM_FTRACE,</div><div class='add'>+	EXECMEM_BPF,</div><div class='add'>+	EXECMEM_MODULE_DATA,</div><div class='add'>+	EXECMEM_TYPE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum execmem_range_flags - options for executable memory allocations</div><div class='add'>+ * @EXECMEM_KASAN_SHADOW:	allocate kasan shadow</div><div class='add'>+ * @EXECMEM_ROX_CACHE:		allocations should use ROX cache of huge pages</div><div class='add'>+ */</div><div class='add'>+enum execmem_range_flags {</div><div class='add'>+	EXECMEM_KASAN_SHADOW	= (1 &lt;&lt; 0),</div><div class='add'>+	EXECMEM_ROX_CACHE	= (1 &lt;&lt; 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_EXECMEM_ROX</div><div class='add'>+/**</div><div class='add'>+ * execmem_fill_trapping_insns - set memory to contain instructions that</div><div class='add'>+ *				 will trap</div><div class='add'>+ * @ptr:	pointer to memory to fill</div><div class='add'>+ * @size:	size of the range to fill</div><div class='add'>+ *</div><div class='add'>+ * A hook for architecures to fill execmem ranges with invalid instructions.</div><div class='add'>+ * Architectures that use EXECMEM_ROX_CACHE must implement this.</div><div class='add'>+ */</div><div class='add'>+void execmem_fill_trapping_insns(void *ptr, size_t size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * execmem_restore_rox - restore read-only-execute permissions</div><div class='add'>+ * @ptr:	address of the region to remap</div><div class='add'>+ * @size:	size of the region to remap</div><div class='add'>+ *</div><div class='add'>+ * Restores read-only-execute permissions on a range [@ptr, @ptr + @size)</div><div class='add'>+ * after it was temporarily remapped as writable. Relies on architecture</div><div class='add'>+ * implementation of set_memory_rox() to restore mapping using large pages.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success or negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int execmem_restore_rox(void *ptr, size_t size);</div><div class='add'>+#else</div><div class='add'>+static inline int execmem_restore_rox(void *ptr, size_t size) { return 0; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct execmem_range - definition of an address space suitable for code and</div><div class='add'>+ *			  related data allocations</div><div class='add'>+ * @start:	address space start</div><div class='add'>+ * @end:	address space end (inclusive)</div><div class='add'>+ * @fallback_start: start of the secondary address space range for fallback</div><div class='add'>+ *                  allocations on architectures that require it</div><div class='add'>+ * @fallback_end:   start of the secondary address space (inclusive)</div><div class='add'>+ * @pgprot:	permissions for memory in this address space</div><div class='add'>+ * @alignment:	alignment required for text allocations</div><div class='add'>+ * @flags:	options for memory allocations for this range</div><div class='add'>+ */</div><div class='add'>+struct execmem_range {</div><div class='add'>+	unsigned long   start;</div><div class='add'>+	unsigned long   end;</div><div class='add'>+	unsigned long   fallback_start;</div><div class='add'>+	unsigned long   fallback_end;</div><div class='add'>+	pgprot_t        pgprot;</div><div class='add'>+	unsigned int	alignment;</div><div class='add'>+	enum execmem_range_flags flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct execmem_info - architecture parameters for code allocations</div><div class='add'>+ * @ranges: array of parameter sets defining architecture specific</div><div class='add'>+ * parameters for executable memory allocations. The ranges that are not</div><div class='add'>+ * explicitly initialized by an architecture use parameters defined for</div><div class='add'>+ * @EXECMEM_DEFAULT.</div><div class='add'>+ */</div><div class='add'>+struct execmem_info {</div><div class='add'>+	struct execmem_range	ranges[EXECMEM_TYPE_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * execmem_arch_setup - define parameters for allocations of executable memory</div><div class='add'>+ *</div><div class='add'>+ * A hook for architectures to define parameters for allocations of</div><div class='add'>+ * executable memory. These parameters should be filled into the</div><div class='add'>+ * @execmem_info structure.</div><div class='add'>+ *</div><div class='add'>+ * For architectures that do not implement this method a default set of</div><div class='add'>+ * parameters will be used</div><div class='add'>+ *</div><div class='add'>+ * Return: a structure defining architecture parameters and restrictions</div><div class='add'>+ * for allocations of executable memory</div><div class='add'>+ */</div><div class='add'>+struct execmem_info *execmem_arch_setup(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * execmem_alloc - allocate executable memory</div><div class='add'>+ * @type: type of the allocation</div><div class='add'>+ * @size: how many bytes of memory are required</div><div class='add'>+ *</div><div class='add'>+ * Allocates memory that will contain executable code, either generated or</div><div class='add'>+ * loaded from kernel modules.</div><div class='add'>+ *</div><div class='add'>+ * Allocates memory that will contain data coupled with executable code,</div><div class='add'>+ * like data sections in kernel modules.</div><div class='add'>+ *</div><div class='add'>+ * The memory will have protections defined by architecture for executable</div><div class='add'>+ * region of the @type.</div><div class='add'>+ *</div><div class='add'>+ * Return: a pointer to the allocated memory or %NULL</div><div class='add'>+ */</div><div class='add'>+void *execmem_alloc(enum execmem_type type, size_t size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * execmem_alloc_rw - allocate writable executable memory</div><div class='add'>+ * @type: type of the allocation</div><div class='add'>+ * @size: how many bytes of memory are required</div><div class='add'>+ *</div><div class='add'>+ * Allocates memory that will contain executable code, either generated or</div><div class='add'>+ * loaded from kernel modules.</div><div class='add'>+ *</div><div class='add'>+ * Allocates memory that will contain data coupled with executable code,</div><div class='add'>+ * like data sections in kernel modules.</div><div class='add'>+ *</div><div class='add'>+ * Forces writable permissions on the allocated memory and the caller is</div><div class='add'>+ * responsible to manage the permissions afterwards.</div><div class='add'>+ *</div><div class='add'>+ * For architectures that use ROX cache the permissions will be set to R+W.</div><div class='add'>+ * For architectures that don't use ROX cache the default permissions for @type</div><div class='add'>+ * will be used as they must be writable.</div><div class='add'>+ *</div><div class='add'>+ * Return: a pointer to the allocated memory or %NULL</div><div class='add'>+ */</div><div class='add'>+void *execmem_alloc_rw(enum execmem_type type, size_t size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * execmem_free - free executable memory</div><div class='add'>+ * @ptr: pointer to the memory that should be freed</div><div class='add'>+ */</div><div class='add'>+void execmem_free(void *ptr);</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(execmem, void *, if (_T) execmem_free(_T));</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+/**</div><div class='add'>+ * execmem_vmap - create virtual mapping for EXECMEM_MODULE_DATA memory</div><div class='add'>+ * @size: size of the virtual mapping in bytes</div><div class='add'>+ *</div><div class='add'>+ * Maps virtually contiguous area in the range suitable for EXECMEM_MODULE_DATA.</div><div class='add'>+ *</div><div class='add'>+ * Return: the area descriptor on success or %NULL on failure.</div><div class='add'>+ */</div><div class='add'>+struct vm_struct *execmem_vmap(size_t size);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * execmem_is_rox - check if execmem is read-only</div><div class='add'>+ * @type - the execmem type to check</div><div class='add'>+ *</div><div class='add'>+ * Return: %true if the @type is read-only, %false if it's writable</div><div class='add'>+ */</div><div class='add'>+bool execmem_is_rox(enum execmem_type type);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_EXECMEM) &amp;&amp; !defined(CONFIG_ARCH_WANTS_EXECMEM_LATE)</div><div class='add'>+void execmem_init(void);</div><div class='add'>+#else</div><div class='add'>+static inline void execmem_init(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_EXECMEM_ALLOC_H */</div><div class='head'>diff --git a/include/linux/export.h b/include/linux/export.h<br/>index 0bbd02fd351d..a686fd0ba406 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/export.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/export.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/export.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/export.h</a></div><div class='hunk'>@@ -24,11 +24,17 @@</div><div class='ctx'> 	.long sym</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define ___EXPORT_SYMBOL(sym, license, ns)		\</div><div class='add'>+/*</div><div class='add'>+ * LLVM integrated assembler cam merge adjacent string literals (like</div><div class='add'>+ * C and GNU-as) passed to '.ascii', but not to '.asciz' and chokes on:</div><div class='add'>+ *</div><div class='add'>+ *   .asciz "MODULE_" "kvm" ;</div><div class='add'>+ */</div><div class='add'>+#define ___EXPORT_SYMBOL(sym, license, ns...)		\</div><div class='ctx'> 	.section ".export_symbol","a"		ASM_NL	\</div><div class='ctx'> 	__export_symbol_##sym:			ASM_NL	\</div><div class='ctx'> 		.asciz license			ASM_NL	\</div><div class='del'>-		.asciz ns			ASM_NL	\</div><div class='add'>+		.ascii ns "\0"			ASM_NL	\</div><div class='ctx'> 		__EXPORT_SYMBOL_REF(sym)	ASM_NL	\</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='hunk'>@@ -52,22 +58,39 @@</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GENDWARFKSYMS</div><div class='add'>+/*</div><div class='add'>+ * With CONFIG_GENDWARFKSYMS, ensure the compiler emits debugging</div><div class='add'>+ * information for all exported symbols, including those defined in</div><div class='add'>+ * different TUs, by adding a __gendwarfksyms_ptr_&lt;symbol&gt; pointer</div><div class='add'>+ * that's discarded during the final link.</div><div class='add'>+ */</div><div class='add'>+#define __GENDWARFKSYMS_EXPORT(sym)				\</div><div class='add'>+	static typeof(sym) *__gendwarfksyms_ptr_##sym __used	\</div><div class='add'>+		__section(".discard.gendwarfksyms") = &amp;sym;</div><div class='add'>+#else</div><div class='add'>+#define __GENDWARFKSYMS_EXPORT(sym)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define __EXPORT_SYMBOL(sym, license, ns)			\</div><div class='ctx'> 	extern typeof(sym) sym;					\</div><div class='ctx'> 	__ADDRESSABLE(sym)					\</div><div class='add'>+	__GENDWARFKSYMS_EXPORT(sym)				\</div><div class='ctx'> 	asm(__stringify(___EXPORT_SYMBOL(sym, license, ns)))</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef DEFAULT_SYMBOL_NAMESPACE</div><div class='del'>-#define _EXPORT_SYMBOL(sym, license)	__EXPORT_SYMBOL(sym, license, __stringify(DEFAULT_SYMBOL_NAMESPACE))</div><div class='add'>+#define _EXPORT_SYMBOL(sym, license)	__EXPORT_SYMBOL(sym, license, DEFAULT_SYMBOL_NAMESPACE)</div><div class='ctx'> #else</div><div class='ctx'> #define _EXPORT_SYMBOL(sym, license)	__EXPORT_SYMBOL(sym, license, "")</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define EXPORT_SYMBOL(sym)		_EXPORT_SYMBOL(sym, "")</div><div class='ctx'> #define EXPORT_SYMBOL_GPL(sym)		_EXPORT_SYMBOL(sym, "GPL")</div><div class='del'>-#define EXPORT_SYMBOL_NS(sym, ns)	__EXPORT_SYMBOL(sym, "", __stringify(ns))</div><div class='del'>-#define EXPORT_SYMBOL_NS_GPL(sym, ns)	__EXPORT_SYMBOL(sym, "GPL", __stringify(ns))</div><div class='add'>+#define EXPORT_SYMBOL_NS(sym, ns)	__EXPORT_SYMBOL(sym, "", ns)</div><div class='add'>+#define EXPORT_SYMBOL_NS_GPL(sym, ns)	__EXPORT_SYMBOL(sym, "GPL", ns)</div><div class='add'>+</div><div class='add'>+#define EXPORT_SYMBOL_FOR_MODULES(sym, mods) __EXPORT_SYMBOL(sym, "GPL", "module:" mods)</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_EXPORT_H */</div><div class='head'>diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h<br/>index bb37ad5cc954..f0cf2714ec52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/exportfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/exportfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/exportfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/exportfs.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #define LINUX_EXPORTFS_H 1</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/path.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct dentry;</div><div class='ctx'> struct iattr;</div><div class='hunk'>@@ -122,6 +123,12 @@ enum fid_type {</div><div class='ctx'> 	FILEID_BCACHEFS_WITH_PARENT = 0xb2,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 *</div><div class='add'>+	 * 64 bit namespace identifier, 32 bit namespace type, 32 bit inode number.</div><div class='add'>+	 */</div><div class='add'>+	FILEID_NSFS = 0xf1,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * 64 bit unique kernfs id</div><div class='ctx'> 	 */</div><div class='ctx'> 	FILEID_KERNFS = 0xfe,</div><div class='hunk'>@@ -156,8 +163,33 @@ struct fid {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum handle_to_path_flags {</div><div class='add'>+	HANDLE_CHECK_PERMS   = (1 &lt;&lt; 0),</div><div class='add'>+	HANDLE_CHECK_SUBTREE = (1 &lt;&lt; 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct handle_to_path_ctx {</div><div class='add'>+	struct path root;</div><div class='add'>+	enum handle_to_path_flags flags;</div><div class='add'>+	unsigned int fh_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define EXPORT_FH_CONNECTABLE	0x1 /* Encode file handle with parent */</div><div class='ctx'> #define EXPORT_FH_FID		0x2 /* File handle may be non-decodeable */</div><div class='add'>+#define EXPORT_FH_DIR_ONLY	0x4 /* Only decode file handle for a directory */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Filesystems use only lower 8 bits of file_handle type for fid_type.</div><div class='add'>+ * name_to_handle_at() uses upper 16 bits of type as user flags to be</div><div class='add'>+ * interpreted by open_by_handle_at().</div><div class='add'>+ */</div><div class='add'>+#define FILEID_USER_FLAGS_MASK	0xffff0000</div><div class='add'>+#define FILEID_USER_FLAGS(type) ((type) &amp; FILEID_USER_FLAGS_MASK)</div><div class='add'>+</div><div class='add'>+/* Flags supported in encoded handle_type that is exported to user */</div><div class='add'>+#define FILEID_IS_CONNECTABLE	0x10000</div><div class='add'>+#define FILEID_IS_DIR		0x20000</div><div class='add'>+#define FILEID_VALID_USER_FLAGS	(FILEID_IS_CONNECTABLE | FILEID_IS_DIR)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct export_operations - for nfsd to communicate with file systems</div><div class='hunk'>@@ -204,18 +236,24 @@ struct fid {</div><div class='ctx'>  *    directory.  The name should be stored in the @name (with the</div><div class='ctx'>  *    understanding that it is already pointing to a %NAME_MAX+1 sized</div><div class='ctx'>  *    buffer.   get_name() should return %0 on success, a negative error code</div><div class='del'>- *    or error.  @get_name will be called without @parent-&gt;i_mutex held.</div><div class='add'>+ *    or error.  @get_name will be called without @parent-&gt;i_rwsem held.</div><div class='ctx'>  *</div><div class='ctx'>  * get_parent:</div><div class='ctx'>  *    @get_parent should find the parent directory for the given @child which</div><div class='ctx'>  *    is also a directory.  In the event that it cannot be found, or storage</div><div class='ctx'>  *    space cannot be allocated, a %ERR_PTR should be returned.</div><div class='ctx'>  *</div><div class='add'>+ * permission:</div><div class='add'>+ *    Allow filesystems to specify a custom permission function.</div><div class='add'>+ *</div><div class='add'>+ * open:</div><div class='add'>+ *    Allow filesystems to specify a custom open function.</div><div class='add'>+ *</div><div class='ctx'>  * commit_metadata:</div><div class='ctx'>  *    @commit_metadata should commit metadata changes to stable storage.</div><div class='ctx'>  *</div><div class='ctx'>  * Locking rules:</div><div class='del'>- *    get_parent is called with child-&gt;d_inode-&gt;i_mutex down</div><div class='add'>+ *    get_parent is called with child-&gt;d_inode-&gt;i_rwsem down</div><div class='ctx'>  *    get_name is not (which is possibly inconsistent)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -237,6 +275,8 @@ struct export_operations {</div><div class='ctx'> 			  bool write, u32 *device_generation);</div><div class='ctx'> 	int (*commit_blocks)(struct inode *inode, struct iomap *iomaps,</div><div class='ctx'> 			     int nr_iomaps, struct iattr *iattr);</div><div class='add'>+	int (*permission)(struct handle_to_path_ctx *ctx, unsigned int oflags);</div><div class='add'>+	struct file * (*open)(const struct path *path, unsigned int oflags);</div><div class='ctx'> #define	EXPORT_OP_NOWCC			(0x1) /* don't collect v3 wcc data */</div><div class='ctx'> #define	EXPORT_OP_NOSUBTREECHK		(0x2) /* no subtree checking */</div><div class='ctx'> #define	EXPORT_OP_CLOSE_BEFORE_UNLINK	(0x4) /* close files before unlink */</div><div class='hunk'>@@ -245,21 +285,20 @@ struct export_operations {</div><div class='ctx'> 						  atomic attribute updates</div><div class='ctx'> 						*/</div><div class='ctx'> #define EXPORT_OP_FLUSH_ON_CLOSE	(0x20) /* fs flushes file data on close */</div><div class='del'>-#define EXPORT_OP_ASYNC_LOCK		(0x40) /* fs can do async lock request */</div><div class='add'>+#define EXPORT_OP_NOLOCKS		(0x40) /* no file locking support */</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * exportfs_lock_op_is_async() - export op supports async lock operation</div><div class='add'>+ * exportfs_cannot_lock() - check if export implements file locking</div><div class='ctx'>  * @export_ops:	the nfs export operations to check</div><div class='ctx'>  *</div><div class='del'>- * Returns true if the nfs export_operations structure has</div><div class='del'>- * EXPORT_OP_ASYNC_LOCK in their flags set</div><div class='add'>+ * Returns true if the export does not support file locking.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool</div><div class='del'>-exportfs_lock_op_is_async(const struct export_operations *export_ops)</div><div class='add'>+exportfs_cannot_lock(const struct export_operations *export_ops)</div><div class='ctx'> {</div><div class='del'>-	return export_ops-&gt;flags &amp; EXPORT_OP_ASYNC_LOCK;</div><div class='add'>+	return export_ops-&gt;flags &amp; EXPORT_OP_NOLOCKS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid,</div><div class='hunk'>@@ -288,6 +327,17 @@ static inline bool exportfs_can_encode_fh(const struct export_operations *nop,</div><div class='ctx'> 	if (fh_flags &amp; EXPORT_FH_FID)</div><div class='ctx'> 		return exportfs_can_encode_fid(nop);</div><div class='ctx'> </div><div class='add'>+	/* Normal file handles cannot be created without export ops */</div><div class='add'>+	if (!nop)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If a connectable file handle was requested, we need to make sure that</div><div class='add'>+	 * filesystem can also decode connected file handles.</div><div class='add'>+	 */</div><div class='add'>+	if ((fh_flags &amp; EXPORT_FH_CONNECTABLE) &amp;&amp; !nop-&gt;fh_to_parent)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If a decodeable file handle was requested, we need to make sure that</div><div class='ctx'> 	 * filesystem can also decode file handles.</div><div class='hunk'>@@ -305,6 +355,7 @@ static inline int exportfs_encode_fid(struct inode *inode, struct fid *fid,</div><div class='ctx'> extern struct dentry *exportfs_decode_fh_raw(struct vfsmount *mnt,</div><div class='ctx'> 					     struct fid *fid, int fh_len,</div><div class='ctx'> 					     int fileid_type,</div><div class='add'>+					     unsigned int flags,</div><div class='ctx'> 					     int (*acceptable)(void *, struct dentry *),</div><div class='ctx'> 					     void *context);</div><div class='ctx'> extern struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,</div><div class='head'>diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h<br/>index 053137a0fe45..a7880787cad3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/f2fs_fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/f2fs_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/f2fs_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/f2fs_fs.h</a></div><div class='hunk'>@@ -17,16 +17,19 @@</div><div class='ctx'> #define F2FS_LOG_SECTORS_PER_BLOCK	(PAGE_SHIFT - 9) /* log number for sector/blk */</div><div class='ctx'> #define F2FS_BLKSIZE			PAGE_SIZE /* support only block == page */</div><div class='ctx'> #define F2FS_BLKSIZE_BITS		PAGE_SHIFT /* bits for F2FS_BLKSIZE */</div><div class='add'>+#define F2FS_SUM_BLKSIZE		4096	/* only support 4096 byte sum block */</div><div class='ctx'> #define F2FS_MAX_EXTENSION		64	/* # of extension entries */</div><div class='ctx'> #define F2FS_EXTENSION_LEN		8	/* max size of extension */</div><div class='del'>-#define F2FS_BLK_ALIGN(x)	(((x) + F2FS_BLKSIZE - 1) &gt;&gt; F2FS_BLKSIZE_BITS)</div><div class='ctx'> </div><div class='ctx'> #define NULL_ADDR		((block_t)0)	/* used as block_t addresses */</div><div class='ctx'> #define NEW_ADDR		((block_t)-1)	/* used as block_t addresses */</div><div class='ctx'> #define COMPRESS_ADDR		((block_t)-2)	/* used as compressed data flag */</div><div class='ctx'> </div><div class='del'>-#define F2FS_BYTES_TO_BLK(bytes)	((bytes) &gt;&gt; F2FS_BLKSIZE_BITS)</div><div class='del'>-#define F2FS_BLK_TO_BYTES(blk)		((blk) &lt;&lt; F2FS_BLKSIZE_BITS)</div><div class='add'>+#define F2FS_BLKSIZE_MASK		(F2FS_BLKSIZE - 1)</div><div class='add'>+#define F2FS_BYTES_TO_BLK(bytes)	((unsigned long long)(bytes) &gt;&gt; F2FS_BLKSIZE_BITS)</div><div class='add'>+#define F2FS_BLK_TO_BYTES(blk)		((unsigned long long)(blk) &lt;&lt; F2FS_BLKSIZE_BITS)</div><div class='add'>+#define F2FS_BLK_END_BYTES(blk)		(F2FS_BLK_TO_BYTES(blk + 1) - 1)</div><div class='add'>+#define F2FS_BLK_ALIGN(x)		(F2FS_BYTES_TO_BLK((x) + F2FS_BLKSIZE - 1))</div><div class='ctx'> </div><div class='ctx'> /* 0, 1(node nid), 2(meta nid) are reserved node id */</div><div class='ctx'> #define F2FS_RESERVED_NODE_NUM		3</div><div class='hunk'>@@ -40,12 +43,6 @@</div><div class='ctx'> </div><div class='ctx'> #define F2FS_ENC_UTF8_12_1	1</div><div class='ctx'> </div><div class='del'>-#define F2FS_IO_SIZE(sbi)	BIT(F2FS_OPTION(sbi).write_io_size_bits) /* Blocks */</div><div class='del'>-#define F2FS_IO_SIZE_KB(sbi)	BIT(F2FS_OPTION(sbi).write_io_size_bits + 2) /* KB */</div><div class='del'>-#define F2FS_IO_SIZE_BITS(sbi)	(F2FS_OPTION(sbi).write_io_size_bits) /* power of 2 */</div><div class='del'>-#define F2FS_IO_SIZE_MASK(sbi)	(F2FS_IO_SIZE(sbi) - 1)</div><div class='del'>-#define F2FS_IO_ALIGNED(sbi)	(F2FS_IO_SIZE(sbi) &gt; 1)</div><div class='del'>-</div><div class='ctx'> /* This flag is used by node and meta inodes, and by recovery */</div><div class='ctx'> #define GFP_F2FS_ZERO		(GFP_NOFS | __GFP_ZERO)</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +78,9 @@ enum stop_cp_reason {</div><div class='ctx'> 	STOP_CP_REASON_CORRUPTED_SUMMARY,</div><div class='ctx'> 	STOP_CP_REASON_UPDATE_INODE,</div><div class='ctx'> 	STOP_CP_REASON_FLUSH_FAIL,</div><div class='add'>+	STOP_CP_REASON_NO_SEGMENT,</div><div class='add'>+	STOP_CP_REASON_CORRUPTED_FREE_BITMAP,</div><div class='add'>+	STOP_CP_REASON_CORRUPTED_NID,</div><div class='ctx'> 	STOP_CP_REASON_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -263,15 +263,14 @@ struct node_footer {</div><div class='ctx'> #define CUR_ADDRS_PER_INODE(inode)	(DEF_ADDRS_PER_INODE - \</div><div class='ctx'> 					get_extra_isize(inode))</div><div class='ctx'> #define DEF_NIDS_PER_INODE	5	/* Node IDs in an Inode */</div><div class='del'>-#define ADDRS_PER_INODE(inode)	addrs_per_inode(inode)</div><div class='add'>+#define ADDRS_PER_INODE(inode)	addrs_per_page(inode, true)</div><div class='ctx'> /* Address Pointers in a Direct Block */</div><div class='ctx'> #define DEF_ADDRS_PER_BLOCK	((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32))</div><div class='del'>-#define ADDRS_PER_BLOCK(inode)	addrs_per_block(inode)</div><div class='add'>+#define ADDRS_PER_BLOCK(inode)	addrs_per_page(inode, false)</div><div class='ctx'> /* Node IDs in an Indirect Block */</div><div class='ctx'> #define NIDS_PER_BLOCK		((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32))</div><div class='ctx'> </div><div class='del'>-#define ADDRS_PER_PAGE(page, inode)	\</div><div class='del'>-	(IS_INODE(page) ? ADDRS_PER_INODE(inode) : ADDRS_PER_BLOCK(inode))</div><div class='add'>+#define ADDRS_PER_PAGE(folio, inode)	(addrs_per_page(inode, IS_INODE(folio)))</div><div class='ctx'> </div><div class='ctx'> #define	NODE_DIR1_BLOCK		(DEF_ADDRS_PER_INODE + 1)</div><div class='ctx'> #define	NODE_DIR2_BLOCK		(DEF_ADDRS_PER_INODE + 2)</div><div class='hunk'>@@ -283,7 +282,7 @@ struct node_footer {</div><div class='ctx'> #define F2FS_INLINE_DATA	0x02	/* file inline data flag */</div><div class='ctx'> #define F2FS_INLINE_DENTRY	0x04	/* file inline dentry flag */</div><div class='ctx'> #define F2FS_DATA_EXIST		0x08	/* file inline data exist flag */</div><div class='del'>-#define F2FS_INLINE_DOTS	0x10	/* file having implicit dot dentries */</div><div class='add'>+#define F2FS_INLINE_DOTS	0x10	/* file having implicit dot dentries (obsolete) */</div><div class='ctx'> #define F2FS_EXTRA_ATTR		0x20	/* file having extra attribute */</div><div class='ctx'> #define F2FS_PIN_FILE		0x40	/* file should not be gced */</div><div class='ctx'> #define F2FS_COMPRESS_RELEASED	0x80	/* file released compressed blocks */</div><div class='hunk'>@@ -398,7 +397,8 @@ struct f2fs_nat_block {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * F2FS uses 4 bytes to represent block address. As a result, supported size of</div><div class='del'>- * disk is 16 TB and it equals to 16 * 1024 * 1024 / 2 segments.</div><div class='add'>+ * disk is 16 TB for a 4K page size and 64 TB for a 16K page size and it equals</div><div class='add'>+ * to 16 * 1024 * 1024 / 2 segments.</div><div class='ctx'>  */</div><div class='ctx'> #define F2FS_MAX_SEGMENT       ((16 * 1024 * 1024) / 2)</div><div class='ctx'> </div><div class='hunk'>@@ -428,8 +428,10 @@ struct f2fs_sit_block {</div><div class='ctx'> /*</div><div class='ctx'>  * For segment summary</div><div class='ctx'>  *</div><div class='del'>- * One summary block contains exactly 512 summary entries, which represents</div><div class='del'>- * exactly one segment by default. Not allow to change the basic units.</div><div class='add'>+ * One summary block with 4KB size contains exactly 512 summary entries, which</div><div class='add'>+ * represents exactly one segment with 2MB size.</div><div class='add'>+ * Similarly, in the case of block with 16KB size, it represents one segment with 8MB size.</div><div class='add'>+ * Not allow to change the basic units.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: For initializing fields, you must use set_summary</div><div class='ctx'>  *</div><div class='hunk'>@@ -440,7 +442,7 @@ struct f2fs_sit_block {</div><div class='ctx'>  * from node's page's beginning to get a data block address.</div><div class='ctx'>  * ex) data_blkaddr = (block_t)(nodepage_start_address + ofs_in_node)</div><div class='ctx'>  */</div><div class='del'>-#define ENTRIES_IN_SUM		(F2FS_BLKSIZE / 8)</div><div class='add'>+#define ENTRIES_IN_SUM		(F2FS_SUM_BLKSIZE / 8)</div><div class='ctx'> #define	SUMMARY_SIZE		(7)	/* sizeof(struct f2fs_summary) */</div><div class='ctx'> #define	SUM_FOOTER_SIZE		(5)	/* sizeof(struct summary_footer) */</div><div class='ctx'> #define SUM_ENTRY_SIZE		(SUMMARY_SIZE * ENTRIES_IN_SUM)</div><div class='hunk'>@@ -466,7 +468,7 @@ struct summary_footer {</div><div class='ctx'> 	__le32 check_sum;		/* summary checksum */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define SUM_JOURNAL_SIZE	(F2FS_BLKSIZE - SUM_FOOTER_SIZE -\</div><div class='add'>+#define SUM_JOURNAL_SIZE	(F2FS_SUM_BLKSIZE - SUM_FOOTER_SIZE -\</div><div class='ctx'> 				SUM_ENTRY_SIZE)</div><div class='ctx'> #define NAT_JOURNAL_ENTRIES	((SUM_JOURNAL_SIZE - 2) /\</div><div class='ctx'> 				sizeof(struct nat_journal_entry))</div><div class='hunk'>@@ -560,6 +562,7 @@ typedef __le32	f2fs_hash_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * space utilization of regular dentry and inline dentry (w/o extra reservation)</div><div class='add'>+ * when block size is 4KB.</div><div class='ctx'>  *		regular dentry		inline dentry (def)	inline dentry (min)</div><div class='ctx'>  * bitmap	1 * 27 = 27		1 * 23 = 23		1 * 1 = 1</div><div class='ctx'>  * reserved	1 * 3 = 3		1 * 7 = 7		1 * 1 = 1</div><div class='head'>diff --git a/include/linux/falloc.h b/include/linux/falloc.h<br/>index f3f0b97b1675..7c38c6b76b60 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/falloc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/falloc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/falloc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/falloc.h</a></div><div class='hunk'>@@ -25,12 +25,19 @@ struct space_resv {</div><div class='ctx'> #define FS_IOC_UNRESVSP64	_IOW('X', 43, struct space_resv)</div><div class='ctx'> #define FS_IOC_ZERO_RANGE	_IOW('X', 57, struct space_resv)</div><div class='ctx'> </div><div class='del'>-#define	FALLOC_FL_SUPPORTED_MASK	(FALLOC_FL_KEEP_SIZE |		\</div><div class='del'>-					 FALLOC_FL_PUNCH_HOLE |		\</div><div class='del'>-					 FALLOC_FL_COLLAPSE_RANGE |	\</div><div class='del'>-					 FALLOC_FL_ZERO_RANGE |		\</div><div class='del'>-					 FALLOC_FL_INSERT_RANGE |	\</div><div class='del'>-					 FALLOC_FL_UNSHARE_RANGE)</div><div class='add'>+/*</div><div class='add'>+ * Mask of all supported fallocate modes.  Only one can be set at a time.</div><div class='add'>+ *</div><div class='add'>+ * In addition to the mode bit, the mode argument can also encode flags.</div><div class='add'>+ * FALLOC_FL_KEEP_SIZE is the only supported flag so far.</div><div class='add'>+ */</div><div class='add'>+#define FALLOC_FL_MODE_MASK	(FALLOC_FL_ALLOCATE_RANGE |	\</div><div class='add'>+				 FALLOC_FL_PUNCH_HOLE |		\</div><div class='add'>+				 FALLOC_FL_COLLAPSE_RANGE |	\</div><div class='add'>+				 FALLOC_FL_ZERO_RANGE |		\</div><div class='add'>+				 FALLOC_FL_INSERT_RANGE |	\</div><div class='add'>+				 FALLOC_FL_UNSHARE_RANGE |	\</div><div class='add'>+				 FALLOC_FL_WRITE_ZEROES)</div><div class='ctx'> </div><div class='ctx'> /* on ia32 l_start is on a 32-bit boundary */</div><div class='ctx'> #if defined(CONFIG_X86_64)</div><div class='head'>diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h<br/>index 4f1c4f603118..879cff5eccd4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fanotify.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fanotify.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fanotify.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fanotify.h</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #define FANOTIFY_FID_BITS	(FAN_REPORT_DFID_NAME_TARGET)</div><div class='ctx'> </div><div class='del'>-#define FANOTIFY_INFO_MODES	(FANOTIFY_FID_BITS | FAN_REPORT_PIDFD)</div><div class='add'>+#define FANOTIFY_INFO_MODES	(FANOTIFY_FID_BITS | FAN_REPORT_PIDFD | FAN_REPORT_MNT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * fanotify_init() flags that require CAP_SYS_ADMIN.</div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #define FANOTIFY_ADMIN_INIT_FLAGS	(FANOTIFY_PERM_CLASSES | \</div><div class='ctx'> 					 FAN_REPORT_TID | \</div><div class='ctx'> 					 FAN_REPORT_PIDFD | \</div><div class='add'>+					 FAN_REPORT_FD_ERROR | \</div><div class='ctx'> 					 FAN_UNLIMITED_QUEUE | \</div><div class='ctx'> 					 FAN_UNLIMITED_MARKS)</div><div class='ctx'> </div><div class='hunk'>@@ -46,7 +47,7 @@</div><div class='ctx'>  * so one of the flags for reporting file handles is required.</div><div class='ctx'>  */</div><div class='ctx'> #define FANOTIFY_USER_INIT_FLAGS	(FAN_CLASS_NOTIF | \</div><div class='del'>-					 FANOTIFY_FID_BITS | \</div><div class='add'>+					 FANOTIFY_FID_BITS | FAN_REPORT_MNT | \</div><div class='ctx'> 					 FAN_CLOEXEC | FAN_NONBLOCK)</div><div class='ctx'> </div><div class='ctx'> #define FANOTIFY_INIT_FLAGS	(FANOTIFY_ADMIN_INIT_FLAGS | \</div><div class='hunk'>@@ -57,7 +58,7 @@</div><div class='ctx'> #define FANOTIFY_INTERNAL_GROUP_FLAGS	(FANOTIFY_UNPRIV)</div><div class='ctx'> </div><div class='ctx'> #define FANOTIFY_MARK_TYPE_BITS	(FAN_MARK_INODE | FAN_MARK_MOUNT | \</div><div class='del'>-				 FAN_MARK_FILESYSTEM)</div><div class='add'>+				 FAN_MARK_FILESYSTEM | FAN_MARK_MNTNS)</div><div class='ctx'> </div><div class='ctx'> #define FANOTIFY_MARK_CMD_BITS	(FAN_MARK_ADD | FAN_MARK_REMOVE | \</div><div class='ctx'> 				 FAN_MARK_FLUSH)</div><div class='hunk'>@@ -88,6 +89,16 @@</div><div class='ctx'> #define FANOTIFY_DIRENT_EVENTS	(FAN_MOVE | FAN_CREATE | FAN_DELETE | \</div><div class='ctx'> 				 FAN_RENAME)</div><div class='ctx'> </div><div class='add'>+/* Content events can be used to inspect file content */</div><div class='add'>+#define FANOTIFY_CONTENT_PERM_EVENTS (FAN_OPEN_PERM | FAN_OPEN_EXEC_PERM | \</div><div class='add'>+				      FAN_ACCESS_PERM)</div><div class='add'>+/* Pre-content events can be used to fill file content */</div><div class='add'>+#define FANOTIFY_PRE_CONTENT_EVENTS  (FAN_PRE_ACCESS)</div><div class='add'>+</div><div class='add'>+/* Events that require a permission response from user */</div><div class='add'>+#define FANOTIFY_PERM_EVENTS	(FANOTIFY_CONTENT_PERM_EVENTS | \</div><div class='add'>+				 FANOTIFY_PRE_CONTENT_EVENTS)</div><div class='add'>+</div><div class='ctx'> /* Events that can be reported with event-&gt;fd */</div><div class='ctx'> #define FANOTIFY_FD_EVENTS (FANOTIFY_PATH_EVENTS | FANOTIFY_PERM_EVENTS)</div><div class='ctx'> </div><div class='hunk'>@@ -98,14 +109,13 @@</div><div class='ctx'> /* Events that can only be reported with data type FSNOTIFY_EVENT_ERROR */</div><div class='ctx'> #define FANOTIFY_ERROR_EVENTS	(FAN_FS_ERROR)</div><div class='ctx'> </div><div class='add'>+#define FANOTIFY_MOUNT_EVENTS	(FAN_MNT_ATTACH | FAN_MNT_DETACH)</div><div class='add'>+</div><div class='ctx'> /* Events that user can request to be notified on */</div><div class='ctx'> #define FANOTIFY_EVENTS		(FANOTIFY_PATH_EVENTS | \</div><div class='ctx'> 				 FANOTIFY_INODE_EVENTS | \</div><div class='del'>-				 FANOTIFY_ERROR_EVENTS)</div><div class='del'>-</div><div class='del'>-/* Events that require a permission response from user */</div><div class='del'>-#define FANOTIFY_PERM_EVENTS	(FAN_OPEN_PERM | FAN_ACCESS_PERM | \</div><div class='del'>-				 FAN_OPEN_EXEC_PERM)</div><div class='add'>+				 FANOTIFY_ERROR_EVENTS | \</div><div class='add'>+				 FANOTIFY_MOUNT_EVENTS)</div><div class='ctx'> </div><div class='ctx'> /* Extra flags that may be reported with event or control handling of events */</div><div class='ctx'> #define FANOTIFY_EVENT_FLAGS	(FAN_EVENT_ON_CHILD | FAN_ONDIR)</div><div class='hunk'>@@ -125,7 +135,9 @@</div><div class='ctx'> /* These masks check for invalid bits in permission responses. */</div><div class='ctx'> #define FANOTIFY_RESPONSE_ACCESS (FAN_ALLOW | FAN_DENY)</div><div class='ctx'> #define FANOTIFY_RESPONSE_FLAGS (FAN_AUDIT | FAN_INFO)</div><div class='del'>-#define FANOTIFY_RESPONSE_VALID_MASK (FANOTIFY_RESPONSE_ACCESS | FANOTIFY_RESPONSE_FLAGS)</div><div class='add'>+#define FANOTIFY_RESPONSE_VALID_MASK \</div><div class='add'>+	(FANOTIFY_RESPONSE_ACCESS | FANOTIFY_RESPONSE_FLAGS | \</div><div class='add'>+	 (FAN_ERRNO_MASK &lt;&lt; FAN_ERRNO_SHIFT))</div><div class='ctx'> </div><div class='ctx'> /* Do not use these old uapi constants internally */</div><div class='ctx'> #undef FAN_ALL_CLASS_BITS</div><div class='head'>diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h<br/>index 6d5edef09d45..58fd14c82270 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fault-inject.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fault-inject.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fault-inject.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fault-inject.h</a></div><div class='hunk'>@@ -2,13 +2,21 @@</div><div class='ctx'> #ifndef _LINUX_FAULT_INJECT_H</div><div class='ctx'> #define _LINUX_FAULT_INJECT_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct dentry;</div><div class='add'>+struct kmem_cache;</div><div class='add'>+</div><div class='add'>+enum fault_flags {</div><div class='add'>+	FAULT_NOWARN =	1 &lt;&lt; 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FAULT_INJECTION</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/configfs.h&gt;</div><div class='ctx'> #include &lt;linux/ratelimit.h&gt;</div><div class='del'>-#include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * For explanation of the elements of this struct, see</div><div class='hunk'>@@ -32,10 +40,6 @@ struct fault_attr {</div><div class='ctx'> 	struct dentry *dname;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum fault_flags {</div><div class='del'>-	FAULT_NOWARN =	1 &lt;&lt; 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define FAULT_ATTR_INITIALIZER {					\</div><div class='ctx'> 		.interval = 1,						\</div><div class='ctx'> 		.times = ATOMIC_INIT(1),				\</div><div class='hunk'>@@ -51,6 +55,28 @@ int setup_fault_attr(struct fault_attr *attr, char *str);</div><div class='ctx'> bool should_fail_ex(struct fault_attr *attr, ssize_t size, int flags);</div><div class='ctx'> bool should_fail(struct fault_attr *attr, ssize_t size);</div><div class='ctx'> </div><div class='add'>+#else /* CONFIG_FAULT_INJECTION */</div><div class='add'>+</div><div class='add'>+struct fault_attr {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DECLARE_FAULT_ATTR(name) struct fault_attr name = {}</div><div class='add'>+</div><div class='add'>+static inline int setup_fault_attr(struct fault_attr *attr, char *str)</div><div class='add'>+{</div><div class='add'>+	return 0; /* Note: 0 means error for __setup() handlers! */</div><div class='add'>+}</div><div class='add'>+static inline bool should_fail_ex(struct fault_attr *attr, ssize_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline bool should_fail(struct fault_attr *attr, ssize_t size)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_FAULT_INJECTION */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FAULT_INJECTION_DEBUG_FS</div><div class='ctx'> </div><div class='ctx'> struct dentry *fault_create_debugfs_attr(const char *name,</div><div class='hunk'>@@ -87,26 +113,19 @@ static inline void fault_config_init(struct fault_config *config,</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_FAULT_INJECTION_CONFIGFS */</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_FAULT_INJECTION */</div><div class='del'>-</div><div class='del'>-struct kmem_cache;</div><div class='del'>-</div><div class='del'>-bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_FAIL_PAGE_ALLOC</div><div class='del'>-bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order);</div><div class='add'>+bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order);</div><div class='ctx'> #else</div><div class='del'>-static inline bool __should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)</div><div class='add'>+static inline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_FAIL_PAGE_ALLOC */</div><div class='ctx'> </div><div class='del'>-int should_failslab(struct kmem_cache *s, gfp_t gfpflags);</div><div class='ctx'> #ifdef CONFIG_FAILSLAB</div><div class='del'>-extern bool __should_failslab(struct kmem_cache *s, gfp_t gfpflags);</div><div class='add'>+int should_failslab(struct kmem_cache *s, gfp_t gfpflags);</div><div class='ctx'> #else</div><div class='del'>-static inline bool __should_failslab(struct kmem_cache *s, gfp_t gfpflags)</div><div class='add'>+static inline int should_failslab(struct kmem_cache *s, gfp_t gfpflags)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/fb.h b/include/linux/fb.h<br/>index 05dc9624897d..05cc251035da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fb.h</a></div><div class='hunk'>@@ -2,28 +2,31 @@</div><div class='ctx'> #ifndef _LINUX_FB_H</div><div class='ctx'> #define _LINUX_FB_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/refcount.h&gt;</div><div class='del'>-#include &lt;linux/kgdb.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/fb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor_user)</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/backlight.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/fb.h&gt;</div><div class='add'>+#include &lt;asm/video.h&gt;</div><div class='ctx'> </div><div class='del'>-struct vm_area_struct;</div><div class='del'>-struct fb_info;</div><div class='add'>+struct backlight_device;</div><div class='ctx'> struct device;</div><div class='add'>+struct device_node;</div><div class='add'>+struct fb_info;</div><div class='ctx'> struct file;</div><div class='add'>+struct i2c_adapter;</div><div class='add'>+struct inode;</div><div class='add'>+struct lcd_device;</div><div class='add'>+struct module;</div><div class='add'>+struct notifier_block;</div><div class='add'>+struct page;</div><div class='ctx'> struct videomode;</div><div class='del'>-struct device_node;</div><div class='add'>+struct vm_area_struct;</div><div class='ctx'> </div><div class='ctx'> /* Definitions below are used in the parsed monitor specs */</div><div class='ctx'> #define FB_DPMS_ACTIVE_OFF	1</div><div class='hunk'>@@ -126,26 +129,24 @@ struct fb_cursor_user {</div><div class='ctx'>  * Register/unregister for framebuffer events</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*	The resolution of the passed in fb_info about to change */</div><div class='del'>-#define FB_EVENT_MODE_CHANGE		0x01</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_GUMSTIX_AM200EPD</div><div class='ctx'> /* only used by mach-pxa/am200epd.c */</div><div class='ctx'> #define FB_EVENT_FB_REGISTERED          0x05</div><div class='ctx'> #define FB_EVENT_FB_UNREGISTERED        0x06</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*      A display blank is requested       */</div><div class='del'>-#define FB_EVENT_BLANK                  0x09</div><div class='del'>-</div><div class='ctx'> struct fb_event {</div><div class='ctx'> 	struct fb_info *info;</div><div class='ctx'> 	void *data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*	Enough for the VT console needs, see its max_font_width/height */</div><div class='add'>+#define FB_MAX_BLIT_WIDTH	64</div><div class='add'>+#define FB_MAX_BLIT_HEIGHT	128</div><div class='add'>+</div><div class='ctx'> struct fb_blit_caps {</div><div class='del'>-	u32 x;</div><div class='del'>-	u32 y;</div><div class='add'>+	DECLARE_BITMAP(x, FB_MAX_BLIT_WIDTH);</div><div class='add'>+	DECLARE_BITMAP(y, FB_MAX_BLIT_HEIGHT);</div><div class='ctx'> 	u32 len;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> };</div><div class='hunk'>@@ -192,10 +193,12 @@ struct fb_pixmap {</div><div class='ctx'> 	u32 scan_align;		/* alignment per scanline		*/</div><div class='ctx'> 	u32 access_align;	/* alignment per read/write (bits)	*/</div><div class='ctx'> 	u32 flags;		/* see FB_PIXMAP_*			*/</div><div class='del'>-	u32 blit_x;             /* supported bit block dimensions (1-32)*/</div><div class='del'>-	u32 blit_y;             /* Format: blit_x = 1 &lt;&lt; (width - 1)    */</div><div class='del'>-	                        /*         blit_y = 1 &lt;&lt; (height - 1)   */</div><div class='del'>-	                        /* if 0, will be set to 0xffffffff (all)*/</div><div class='add'>+				/* supported bit block dimensions	*/</div><div class='add'>+				/* Format: test_bit(width - 1, blit_x)	*/</div><div class='add'>+				/*	   test_bit(height - 1, blit_y)	*/</div><div class='add'>+				/* if zero, will be set to full (all)	*/</div><div class='add'>+	DECLARE_BITMAP(blit_x, FB_MAX_BLIT_WIDTH);</div><div class='add'>+	DECLARE_BITMAP(blit_y, FB_MAX_BLIT_HEIGHT);</div><div class='ctx'> 	/* access methods */</div><div class='ctx'> 	void (*writeio)(struct fb_info *info, void __iomem *dst, void *src, unsigned int size);</div><div class='ctx'> 	void (*readio) (struct fb_info *info, void *dst, void __iomem *src, unsigned int size);</div><div class='hunk'>@@ -216,7 +219,9 @@ struct fb_deferred_io {</div><div class='ctx'> 	int open_count; /* number of opened files; protected by fb_info lock */</div><div class='ctx'> 	struct mutex lock; /* mutex that protects the pageref list */</div><div class='ctx'> 	struct list_head pagereflist; /* list of pagerefs for touched pages */</div><div class='add'>+	struct address_space *mapping; /* page cache object for fb device */</div><div class='ctx'> 	/* callback */</div><div class='add'>+	struct page *(*get_page)(struct fb_info *info, unsigned long offset);</div><div class='ctx'> 	void (*deferred_io)(struct fb_info *info, struct list_head *pagelist);</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='hunk'>@@ -461,6 +466,8 @@ struct fb_info {</div><div class='ctx'> 	struct list_head modelist;      /* mode list */</div><div class='ctx'> 	struct fb_videomode *mode;	/* current mode */</div><div class='ctx'> </div><div class='add'>+	int blank; /* current blanking; see FB_BLANK_ constants */</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_FB_BACKLIGHT)</div><div class='ctx'> 	/* assigned backlight device */</div><div class='ctx'> 	/* set before framebuffer registration,</div><div class='hunk'>@@ -471,6 +478,13 @@ struct fb_info {</div><div class='ctx'> 	struct mutex bl_curve_mutex;</div><div class='ctx'> 	u8 bl_curve[FB_BACKLIGHT_LEVELS];</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assigned LCD device; set before framebuffer</div><div class='add'>+	 * registration, remove after unregister</div><div class='add'>+	 */</div><div class='add'>+	struct lcd_device *lcd_dev;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FB_DEFERRED_IO</div><div class='ctx'> 	struct delayed_work deferred_work;</div><div class='ctx'> 	unsigned long npagerefs;</div><div class='hunk'>@@ -501,6 +515,7 @@ struct fb_info {</div><div class='ctx'> 	void *par;</div><div class='ctx'> </div><div class='ctx'> 	bool skip_vt_switch; /* no VT switch on suspend/resume required */</div><div class='add'>+	bool skip_panic; /* Do not write to the fb after a panic */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This will go away</div><div class='hunk'>@@ -592,6 +607,7 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,</div><div class='ctx'> /* fbmem.c */</div><div class='ctx'> extern int register_framebuffer(struct fb_info *fb_info);</div><div class='ctx'> extern void unregister_framebuffer(struct fb_info *fb_info);</div><div class='add'>+extern int devm_register_framebuffer(struct device *dev, struct fb_info *fb_info);</div><div class='ctx'> extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size);</div><div class='ctx'> extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx,</div><div class='ctx'> 				u32 height, u32 shift_high, u32 shift_low, u32 mod);</div><div class='hunk'>@@ -686,6 +702,10 @@ extern int fb_deferred_io_fsync(struct file *file, loff_t start,</div><div class='ctx'> 	__FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, sys) \</div><div class='ctx'> 	__FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, sys)</div><div class='ctx'> </div><div class='add'>+#define FB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS(__prefix, __damage_range, __damage_area) \</div><div class='add'>+	__FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, sys) \</div><div class='add'>+	__FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, sys)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Initializes struct fb_ops for deferred I/O.</div><div class='ctx'>  */</div><div class='hunk'>@@ -730,6 +750,24 @@ extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev);</div><div class='ctx'> extern void framebuffer_release(struct fb_info *info);</div><div class='ctx'> extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_FB_BACKLIGHT)</div><div class='add'>+struct backlight_device *fb_bl_device(struct fb_info *info);</div><div class='add'>+void fb_bl_notify_blank(struct fb_info *info, int old_blank);</div><div class='add'>+#else</div><div class='add'>+static inline struct backlight_device *fb_bl_device(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fb_bl_notify_blank(struct fb_info *info, int old_blank)</div><div class='add'>+{ }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline struct lcd_device *fb_lcd_device(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	return info-&gt;lcd_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* fbmon.c */</div><div class='ctx'> #define FB_MAXTIMINGS		0</div><div class='ctx'> #define FB_VSYNCTIMINGS		1</div><div class='hunk'>@@ -840,14 +878,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,</div><div class='ctx'> 			const struct fb_videomode *default_mode,</div><div class='ctx'> 			unsigned int default_bpp);</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_VIDEO_NOMODESET)</div><div class='ctx'> bool fb_modesetting_disabled(const char *drvname);</div><div class='del'>-#else</div><div class='del'>-static inline bool fb_modesetting_disabled(const char *drvname)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Convenience logging macros</div><div class='head'>diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h<br/>index 2382dec6d6ab..f206370060e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fbcon.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fbcon.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fbcon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fbcon.h</a></div><div class='hunk'>@@ -1,6 +1,13 @@</div><div class='ctx'> #ifndef _LINUX_FBCON_H</div><div class='ctx'> #define _LINUX_FBCON_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+</div><div class='add'>+struct fb_blit_caps;</div><div class='add'>+struct fb_info;</div><div class='add'>+struct fb_var_screeninfo;</div><div class='add'>+struct fb_videomode;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FRAMEBUFFER_CONSOLE</div><div class='ctx'> void __init fb_console_init(void);</div><div class='ctx'> void __exit fb_console_exit(void);</div><div class='hunk'>@@ -11,6 +18,7 @@ void fbcon_suspended(struct fb_info *info);</div><div class='ctx'> void fbcon_resumed(struct fb_info *info);</div><div class='ctx'> int fbcon_mode_deleted(struct fb_info *info,</div><div class='ctx'> 		       struct fb_videomode *mode);</div><div class='add'>+void fbcon_delete_modelist(struct list_head *head);</div><div class='ctx'> void fbcon_new_modelist(struct fb_info *info);</div><div class='ctx'> void fbcon_get_requirement(struct fb_info *info,</div><div class='ctx'> 			   struct fb_blit_caps *caps);</div><div class='hunk'>@@ -31,6 +39,7 @@ static inline void fbcon_suspended(struct fb_info *info) {}</div><div class='ctx'> static inline void fbcon_resumed(struct fb_info *info) {}</div><div class='ctx'> static inline int fbcon_mode_deleted(struct fb_info *info,</div><div class='ctx'> 				     struct fb_videomode *mode) { return 0; }</div><div class='add'>+static inline void fbcon_delete_modelist(struct list_head *head) {}</div><div class='ctx'> static inline void fbcon_new_modelist(struct fb_info *info) {}</div><div class='ctx'> static inline void fbcon_get_requirement(struct fb_info *info,</div><div class='ctx'> 					 struct fb_blit_caps *caps) {}</div><div class='head'>diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h<br/>index 78c8326d74ae..c45306a9f007 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fdtable.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fdtable.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fdtable.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fdtable.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * as this is the granularity returned by copy_fdset().</div><div class='ctx'>  */</div><div class='ctx'> #define NR_OPEN_DEFAULT BITS_PER_LONG</div><div class='del'>-#define NR_OPEN_MAX ~0U</div><div class='ctx'> </div><div class='ctx'> struct fdtable {</div><div class='ctx'> 	unsigned int max_fds;</div><div class='hunk'>@@ -33,16 +32,6 @@ struct fdtable {</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool close_on_exec(unsigned int fd, const struct fdtable *fdt)</div><div class='del'>-{</div><div class='del'>-	return test_bit(fd, fdt-&gt;close_on_exec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool fd_is_open(unsigned int fd, const struct fdtable *fdt)</div><div class='del'>-{</div><div class='del'>-	return test_bit(fd, fdt-&gt;open_fds);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Open file table structure</div><div class='ctx'>  */</div><div class='hunk'>@@ -103,25 +92,26 @@ static inline struct file *files_lookup_fd_locked(struct files_struct *files, un</div><div class='ctx'> 	return files_lookup_fd_raw(files, fd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct file *lookup_fdget_rcu(unsigned int fd);</div><div class='del'>-struct file *task_lookup_fdget_rcu(struct task_struct *task, unsigned int fd);</div><div class='del'>-struct file *task_lookup_next_fdget_rcu(struct task_struct *task, unsigned int *fd);</div><div class='add'>+static inline bool close_on_exec(unsigned int fd, const struct files_struct *files)</div><div class='add'>+{</div><div class='add'>+	return test_bit(fd, files_fdtable(files)-&gt;close_on_exec);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct task_struct;</div><div class='ctx'> </div><div class='ctx'> void put_files_struct(struct files_struct *fs);</div><div class='ctx'> int unshare_files(void);</div><div class='del'>-struct files_struct *dup_fd(struct files_struct *, unsigned, int *) __latent_entropy;</div><div class='add'>+struct fd_range {</div><div class='add'>+	unsigned int from, to;</div><div class='add'>+};</div><div class='add'>+struct files_struct *dup_fd(struct files_struct *, struct fd_range *) __latent_entropy;</div><div class='ctx'> void do_close_on_exec(struct files_struct *);</div><div class='ctx'> int iterate_fd(struct files_struct *, unsigned,</div><div class='ctx'> 		int (*)(const void *, struct file *, unsigned),</div><div class='ctx'> 		const void *);</div><div class='ctx'> </div><div class='ctx'> extern int close_fd(unsigned int fd);</div><div class='del'>-extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags);</div><div class='ctx'> extern struct file *file_close_fd(unsigned int fd);</div><div class='del'>-extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,</div><div class='del'>-		      struct files_struct **new_fdp);</div><div class='ctx'> </div><div class='ctx'> extern struct kmem_cache *files_cachep;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/fiemap.h b/include/linux/fiemap.h<br/>index c50882f19235..966092ffa89a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fiemap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fiemap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fiemap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fiemap.h</a></div><div class='hunk'>@@ -5,12 +5,18 @@</div><div class='ctx'> #include &lt;uapi/linux/fiemap.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct fiemap_extent_info - fiemap request to a filesystem</div><div class='add'>+ * @fi_flags:		Flags as passed from user</div><div class='add'>+ * @fi_extents_mapped:	Number of mapped extents</div><div class='add'>+ * @fi_extents_max:	Size of fiemap_extent array</div><div class='add'>+ * @fi_extents_start:	Start of fiemap_extent array</div><div class='add'>+ */</div><div class='ctx'> struct fiemap_extent_info {</div><div class='del'>-	unsigned int fi_flags;		/* Flags as passed from user */</div><div class='del'>-	unsigned int fi_extents_mapped;	/* Number of mapped extents */</div><div class='del'>-	unsigned int fi_extents_max;	/* Size of fiemap_extent array */</div><div class='del'>-	struct fiemap_extent __user *fi_extents_start; /* Start of</div><div class='del'>-							fiemap_extent array */</div><div class='add'>+	unsigned int fi_flags;</div><div class='add'>+	unsigned int fi_extents_mapped;</div><div class='add'>+	unsigned int fi_extents_max;</div><div class='add'>+	struct fiemap_extent __user *fi_extents_start;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int fiemap_prep(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='head'>diff --git a/include/linux/file.h b/include/linux/file.h<br/>index 169692cb1906..cf389fde9bc2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/file.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/file.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/file.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/file.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/posix_types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct file;</div><div class='ctx'> </div><div class='hunk'>@@ -29,61 +30,59 @@ extern struct file *alloc_file_pseudo_noaccount(struct inode *, struct vfsmount</div><div class='ctx'> extern struct file *alloc_file_clone(struct file *, int flags,</div><div class='ctx'> 	const struct file_operations *);</div><div class='ctx'> </div><div class='del'>-static inline void fput_light(struct file *file, int fput_needed)</div><div class='del'>-{</div><div class='del'>-	if (fput_needed)</div><div class='del'>-		fput(file);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+/* either a reference to struct file + flags</div><div class='add'>+ * (cloned vs. borrowed, pos locked), with</div><div class='add'>+ * flags stored in lower bits of value,</div><div class='add'>+ * or empty (represented by 0).</div><div class='add'>+ */</div><div class='ctx'> struct fd {</div><div class='del'>-	struct file *file;</div><div class='del'>-	unsigned int flags;</div><div class='add'>+	unsigned long word;</div><div class='ctx'> };</div><div class='ctx'> #define FDPUT_FPUT       1</div><div class='ctx'> #define FDPUT_POS_UNLOCK 2</div><div class='ctx'> </div><div class='del'>-static inline void fdput(struct fd fd)</div><div class='add'>+#define fd_file(f) ((struct file *)((f).word &amp; ~(FDPUT_FPUT|FDPUT_POS_UNLOCK)))</div><div class='add'>+static inline bool fd_empty(struct fd f)</div><div class='ctx'> {</div><div class='del'>-	if (fd.flags &amp; FDPUT_FPUT)</div><div class='del'>-		fput(fd.file);</div><div class='add'>+	return unlikely(!f.word);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern struct file *fget(unsigned int fd);</div><div class='del'>-extern struct file *fget_raw(unsigned int fd);</div><div class='del'>-extern struct file *fget_task(struct task_struct *task, unsigned int fd);</div><div class='del'>-extern unsigned long __fdget(unsigned int fd);</div><div class='del'>-extern unsigned long __fdget_raw(unsigned int fd);</div><div class='del'>-extern unsigned long __fdget_pos(unsigned int fd);</div><div class='del'>-extern void __f_unlock_pos(struct file *);</div><div class='del'>-</div><div class='del'>-static inline struct fd __to_fd(unsigned long v)</div><div class='add'>+#define EMPTY_FD (struct fd){0}</div><div class='add'>+static inline struct fd BORROWED_FD(struct file *f)</div><div class='ctx'> {</div><div class='del'>-	return (struct fd){(struct file *)(v &amp; ~3),v &amp; 3};</div><div class='add'>+	return (struct fd){(unsigned long)f};</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline struct fd fdget(unsigned int fd)</div><div class='add'>+static inline struct fd CLONED_FD(struct file *f)</div><div class='ctx'> {</div><div class='del'>-	return __to_fd(__fdget(fd));</div><div class='add'>+	return (struct fd){(unsigned long)f | FDPUT_FPUT};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct fd fdget_raw(unsigned int fd)</div><div class='add'>+static inline void fdput(struct fd fd)</div><div class='ctx'> {</div><div class='del'>-	return __to_fd(__fdget_raw(fd));</div><div class='add'>+	if (unlikely(fd.word &amp; FDPUT_FPUT))</div><div class='add'>+		fput(fd_file(fd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct fd fdget_pos(int fd)</div><div class='del'>-{</div><div class='del'>-	return __to_fd(__fdget_pos(fd));</div><div class='del'>-}</div><div class='add'>+extern struct file *fget(unsigned int fd);</div><div class='add'>+extern struct file *fget_raw(unsigned int fd);</div><div class='add'>+extern struct file *fget_task(struct task_struct *task, unsigned int fd);</div><div class='add'>+extern struct file *fget_task_next(struct task_struct *task, unsigned int *fd);</div><div class='add'>+extern void __f_unlock_pos(struct file *);</div><div class='add'>+</div><div class='add'>+struct fd fdget(unsigned int fd);</div><div class='add'>+struct fd fdget_raw(unsigned int fd);</div><div class='add'>+struct fd fdget_pos(unsigned int fd);</div><div class='ctx'> </div><div class='ctx'> static inline void fdput_pos(struct fd f)</div><div class='ctx'> {</div><div class='del'>-	if (f.flags &amp; FDPUT_POS_UNLOCK)</div><div class='del'>-		__f_unlock_pos(f.file);</div><div class='add'>+	if (f.word &amp; FDPUT_POS_UNLOCK)</div><div class='add'>+		__f_unlock_pos(fd_file(f));</div><div class='ctx'> 	fdput(f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DEFINE_CLASS(fd, struct fd, fdput(_T), fdget(fd), int fd)</div><div class='add'>+DEFINE_CLASS(fd_raw, struct fd, fdput(_T), fdget_raw(fd), int fd)</div><div class='add'>+DEFINE_CLASS(fd_pos, struct fd, fdput_pos(_T), fdget_pos(fd), int fd)</div><div class='ctx'> </div><div class='ctx'> extern int f_dupfd(unsigned int from, struct file *file, unsigned flags);</div><div class='ctx'> extern int replace_fd(unsigned fd, struct file *file, unsigned flags);</div><div class='hunk'>@@ -95,6 +94,27 @@ extern void put_unused_fd(unsigned int fd);</div><div class='ctx'> </div><div class='ctx'> DEFINE_CLASS(get_unused_fd, int, if (_T &gt;= 0) put_unused_fd(_T),</div><div class='ctx'> 	     get_unused_fd_flags(flags), unsigned flags)</div><div class='add'>+DEFINE_FREE(fput, struct file *, if (!IS_ERR_OR_NULL(_T)) fput(_T))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * take_fd() will take care to set @fd to -EBADF ensuring that</div><div class='add'>+ * CLASS(get_unused_fd) won't call put_unused_fd(). This makes it</div><div class='add'>+ * easier to rely on CLASS(get_unused_fd):</div><div class='add'>+ *</div><div class='add'>+ * struct file *f;</div><div class='add'>+ *</div><div class='add'>+ * CLASS(get_unused_fd, fd)(O_CLOEXEC);</div><div class='add'>+ * if (fd &lt; 0)</div><div class='add'>+ *         return fd;</div><div class='add'>+ *</div><div class='add'>+ * f = dentry_open(&amp;path, O_RDONLY, current_cred());</div><div class='add'>+ * if (IS_ERR(f))</div><div class='add'>+ *         return PTR_ERR(f);</div><div class='add'>+ *</div><div class='add'>+ * fd_install(fd, f);</div><div class='add'>+ * return take_fd(fd);</div><div class='add'>+ */</div><div class='add'>+#define take_fd(fd) __get_and_null(fd, -EBADF)</div><div class='ctx'> </div><div class='ctx'> extern void fd_install(unsigned int fd, struct file *file);</div><div class='ctx'> </div><div class='hunk'>@@ -107,4 +127,130 @@ extern void __fput_sync(struct file *);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int sysctl_nr_open_min, sysctl_nr_open_max;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * fd_prepare: Combined fd + file allocation cleanup class.</div><div class='add'>+ * @err: Error code to indicate if allocation succeeded.</div><div class='add'>+ * @__fd: Allocated fd (may not be accessed directly)</div><div class='add'>+ * @__file: Allocated struct file pointer (may not be accessed directly)</div><div class='add'>+ *</div><div class='add'>+ * Allocates an fd and a file together. On error paths, automatically cleans</div><div class='add'>+ * up whichever resource was successfully allocated. Allows flexible file</div><div class='add'>+ * allocation with different functions per usage.</div><div class='add'>+ *</div><div class='add'>+ * Do not use directly.</div><div class='add'>+ */</div><div class='add'>+struct fd_prepare {</div><div class='add'>+	s32 err;</div><div class='add'>+	s32 __fd; /* do not access directly */</div><div class='add'>+	struct file *__file; /* do not access directly */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Typedef for fd_prepare cleanup guards. */</div><div class='add'>+typedef struct fd_prepare class_fd_prepare_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Accessors for fd_prepare class members.</div><div class='add'>+ * _Generic() is used for zero-cost type safety.</div><div class='add'>+ */</div><div class='add'>+#define fd_prepare_fd(_fdf) \</div><div class='add'>+	(_Generic((_fdf), struct fd_prepare: (_fdf).__fd))</div><div class='add'>+</div><div class='add'>+#define fd_prepare_file(_fdf) \</div><div class='add'>+	(_Generic((_fdf), struct fd_prepare: (_fdf).__file))</div><div class='add'>+</div><div class='add'>+/* Do not use directly. */</div><div class='add'>+static inline void class_fd_prepare_destructor(const struct fd_prepare *fdf)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(fdf-&gt;err)) {</div><div class='add'>+		if (likely(fdf-&gt;__fd &gt;= 0))</div><div class='add'>+			put_unused_fd(fdf-&gt;__fd);</div><div class='add'>+		if (unlikely(!IS_ERR_OR_NULL(fdf-&gt;__file)))</div><div class='add'>+			fput(fdf-&gt;__file);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Do not use directly. */</div><div class='add'>+static inline int class_fd_prepare_lock_err(const struct fd_prepare *fdf)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(fdf-&gt;err))</div><div class='add'>+		return fdf-&gt;err;</div><div class='add'>+	if (unlikely(fdf-&gt;__fd &lt; 0))</div><div class='add'>+		return fdf-&gt;__fd;</div><div class='add'>+	if (unlikely(IS_ERR(fdf-&gt;__file)))</div><div class='add'>+		return PTR_ERR(fdf-&gt;__file);</div><div class='add'>+	if (unlikely(!fdf-&gt;__file))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __FD_PREPARE_INIT - Helper to initialize fd_prepare class.</div><div class='add'>+ * @_fd_flags: flags for get_unused_fd_flags()</div><div class='add'>+ * @_file_owned: expression that returns struct file *</div><div class='add'>+ *</div><div class='add'>+ * Returns a struct fd_prepare with fd, file, and err set.</div><div class='add'>+ * If fd allocation fails, fd will be negative and err will be set. If</div><div class='add'>+ * fd succeeds but file_init_expr fails, file will be ERR_PTR and err</div><div class='add'>+ * will be set. The err field is the single source of truth for error</div><div class='add'>+ * checking.</div><div class='add'>+ */</div><div class='add'>+#define __FD_PREPARE_INIT(_fd_flags, _file_owned)                 \</div><div class='add'>+	({                                                        \</div><div class='add'>+		struct fd_prepare fdf = {                         \</div><div class='add'>+			.__fd = get_unused_fd_flags((_fd_flags)), \</div><div class='add'>+		};                                                \</div><div class='add'>+		if (likely(fdf.__fd &gt;= 0))                        \</div><div class='add'>+			fdf.__file = (_file_owned);               \</div><div class='add'>+		fdf.err = ACQUIRE_ERR(fd_prepare, &amp;fdf);          \</div><div class='add'>+		fdf;                                              \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FD_PREPARE - Macro to declare and initialize an fd_prepare variable.</div><div class='add'>+ *</div><div class='add'>+ * Declares and initializes an fd_prepare variable with automatic</div><div class='add'>+ * cleanup. No separate scope required - cleanup happens when variable</div><div class='add'>+ * goes out of scope.</div><div class='add'>+ *</div><div class='add'>+ * @_fdf: name of struct fd_prepare variable to define</div><div class='add'>+ * @_fd_flags: flags for get_unused_fd_flags()</div><div class='add'>+ * @_file_owned: struct file to take ownership of (can be expression)</div><div class='add'>+ */</div><div class='add'>+#define FD_PREPARE(_fdf, _fd_flags, _file_owned) \</div><div class='add'>+	CLASS_INIT(fd_prepare, _fdf, __FD_PREPARE_INIT(_fd_flags, _file_owned))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fd_publish - Publish prepared fd and file to the fd table.</div><div class='add'>+ * @_fdf: struct fd_prepare variable</div><div class='add'>+ */</div><div class='add'>+#define fd_publish(_fdf)                                       \</div><div class='add'>+	({                                                     \</div><div class='add'>+		struct fd_prepare *fdp = &amp;(_fdf);              \</div><div class='add'>+		VFS_WARN_ON_ONCE(fdp-&gt;err);                    \</div><div class='add'>+		VFS_WARN_ON_ONCE(fdp-&gt;__fd &lt; 0);               \</div><div class='add'>+		VFS_WARN_ON_ONCE(IS_ERR_OR_NULL(fdp-&gt;__file)); \</div><div class='add'>+		fd_install(fdp-&gt;__fd, fdp-&gt;__file);            \</div><div class='add'>+		fdp-&gt;__fd;                                     \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/* Do not use directly. */</div><div class='add'>+#define __FD_ADD(_fdf, _fd_flags, _file_owned)            \</div><div class='add'>+	({                                                \</div><div class='add'>+		FD_PREPARE(_fdf, _fd_flags, _file_owned); \</div><div class='add'>+		s32 ret = _fdf.err;                       \</div><div class='add'>+		if (likely(!ret))                         \</div><div class='add'>+			ret = fd_publish(_fdf);           \</div><div class='add'>+		ret;                                      \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FD_ADD - Allocate and install an fd and file in one step.</div><div class='add'>+ * @_fd_flags: flags for get_unused_fd_flags()</div><div class='add'>+ * @_file_owned: struct file to take ownership of</div><div class='add'>+ *</div><div class='add'>+ * Returns the allocated fd number, or negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+#define FD_ADD(_fd_flags, _file_owned) \</div><div class='add'>+	__FD_ADD(__UNIQUE_ID(fd_prepare), _fd_flags, _file_owned)</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_FILE_H */</div><div class='head'>diff --git a/include/linux/file_ref.h b/include/linux/file_ref.h<br/>new file mode 100644<br/>index 000000000000..31551e4cb8f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/file_ref.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/file_ref.h</a></div><div class='hunk'>@@ -0,0 +1,218 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef _LINUX_FILE_REF_H</div><div class='add'>+#define _LINUX_FILE_REF_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/preempt.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * file_ref is a reference count implementation specifically for use by</div><div class='add'>+ * files. It takes inspiration from rcuref but differs in key aspects</div><div class='add'>+ * such as support for SLAB_TYPESAFE_BY_RCU type caches.</div><div class='add'>+ *</div><div class='add'>+ * FILE_REF_ONEREF                FILE_REF_MAXREF</div><div class='add'>+ * 0x0000000000000000UL      0x7FFFFFFFFFFFFFFFUL</div><div class='add'>+ * &lt;-------------------valid -------------------&gt;</div><div class='add'>+ *</div><div class='add'>+ *                       FILE_REF_SATURATED</div><div class='add'>+ * 0x8000000000000000UL 0xA000000000000000UL 0xBFFFFFFFFFFFFFFFUL</div><div class='add'>+ * &lt;-----------------------saturation zone----------------------&gt;</div><div class='add'>+ *</div><div class='add'>+ * FILE_REF_RELEASED                   FILE_REF_DEAD</div><div class='add'>+ * 0xC000000000000000UL         0xE000000000000000UL</div><div class='add'>+ * &lt;-------------------dead zone-------------------&gt;</div><div class='add'>+ *</div><div class='add'>+ * FILE_REF_NOREF</div><div class='add'>+ * 0xFFFFFFFFFFFFFFFFUL</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#define FILE_REF_ONEREF		0x0000000000000000UL</div><div class='add'>+#define FILE_REF_MAXREF		0x7FFFFFFFFFFFFFFFUL</div><div class='add'>+#define FILE_REF_SATURATED	0xA000000000000000UL</div><div class='add'>+#define FILE_REF_RELEASED	0xC000000000000000UL</div><div class='add'>+#define FILE_REF_DEAD		0xE000000000000000UL</div><div class='add'>+#define FILE_REF_NOREF		0xFFFFFFFFFFFFFFFFUL</div><div class='add'>+#else</div><div class='add'>+#define FILE_REF_ONEREF		0x00000000U</div><div class='add'>+#define FILE_REF_MAXREF		0x7FFFFFFFU</div><div class='add'>+#define FILE_REF_SATURATED	0xA0000000U</div><div class='add'>+#define FILE_REF_RELEASED	0xC0000000U</div><div class='add'>+#define FILE_REF_DEAD		0xE0000000U</div><div class='add'>+#define FILE_REF_NOREF		0xFFFFFFFFU</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	atomic64_t refcnt;</div><div class='add'>+#else</div><div class='add'>+	atomic_t refcnt;</div><div class='add'>+#endif</div><div class='add'>+} file_ref_t;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * file_ref_init - Initialize a file reference count</div><div class='add'>+ * @ref: Pointer to the reference count</div><div class='add'>+ * @cnt: The initial reference count typically '1'</div><div class='add'>+ */</div><div class='add'>+static inline void file_ref_init(file_ref_t *ref, unsigned long cnt)</div><div class='add'>+{</div><div class='add'>+	atomic_long_set(&amp;ref-&gt;refcnt, cnt - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool __file_ref_put(file_ref_t *ref, unsigned long cnt);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * file_ref_get - Acquire one reference on a file</div><div class='add'>+ * @ref: Pointer to the reference count</div><div class='add'>+ *</div><div class='add'>+ * Similar to atomic_inc_not_zero() but saturates at FILE_REF_MAXREF.</div><div class='add'>+ *</div><div class='add'>+ * Provides full memory ordering.</div><div class='add'>+ *</div><div class='add'>+ * Return: False if the attempt to acquire a reference failed. This happens</div><div class='add'>+ *         when the last reference has been put already. True if a reference</div><div class='add'>+ *         was successfully acquired</div><div class='add'>+ */</div><div class='add'>+static __always_inline __must_check bool file_ref_get(file_ref_t *ref)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Unconditionally increase the reference count with full</div><div class='add'>+	 * ordering. The saturation and dead zones provide enough</div><div class='add'>+	 * tolerance for this.</div><div class='add'>+	 *</div><div class='add'>+	 * If this indicates negative the file in question the fail can</div><div class='add'>+	 * be freed and immediately reused due to SLAB_TYPSAFE_BY_RCU.</div><div class='add'>+	 * Hence, unconditionally altering the file reference count to</div><div class='add'>+	 * e.g., reset the file reference count back to the middle of</div><div class='add'>+	 * the deadzone risk end up marking someone else's file as dead</div><div class='add'>+	 * behind their back.</div><div class='add'>+	 *</div><div class='add'>+	 * It would be possible to do a careful:</div><div class='add'>+	 *</div><div class='add'>+	 * cnt = atomic_long_inc_return();</div><div class='add'>+	 * if (likely(cnt &gt;= 0))</div><div class='add'>+	 *	return true;</div><div class='add'>+	 *</div><div class='add'>+	 * and then something like:</div><div class='add'>+	 *</div><div class='add'>+	 * if (cnt &gt;= FILE_REF_RELEASE)</div><div class='add'>+	 *	atomic_long_try_cmpxchg(&amp;ref-&gt;refcnt, &amp;cnt, FILE_REF_DEAD),</div><div class='add'>+	 *</div><div class='add'>+	 * to set the value back to the middle of the deadzone. But it's</div><div class='add'>+	 * practically impossible to go from FILE_REF_DEAD to</div><div class='add'>+	 * FILE_REF_ONEREF. It would need 2305843009213693952/2^61</div><div class='add'>+	 * file_ref_get()s to resurrect such a dead file.</div><div class='add'>+	 */</div><div class='add'>+	return !atomic_long_add_negative(1, &amp;ref-&gt;refcnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * file_ref_inc - Acquire one reference on a file</div><div class='add'>+ * @ref: Pointer to the reference count</div><div class='add'>+ *</div><div class='add'>+ * Acquire an additional reference on a file. Warns if the caller didn't</div><div class='add'>+ * already hold a reference.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void file_ref_inc(file_ref_t *ref)</div><div class='add'>+{</div><div class='add'>+	long prior = atomic_long_fetch_inc_relaxed(&amp;ref-&gt;refcnt);</div><div class='add'>+	WARN_ONCE(prior &lt; 0, "file_ref_inc() on a released file reference");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * file_ref_put -- Release a file reference</div><div class='add'>+ * @ref:	Pointer to the reference count</div><div class='add'>+ *</div><div class='add'>+ * Provides release memory ordering, such that prior loads and stores</div><div class='add'>+ * are done before, and provides an acquire ordering on success such</div><div class='add'>+ * that free() must come after.</div><div class='add'>+ *</div><div class='add'>+ * Return: True if this was the last reference with no future references</div><div class='add'>+ *         possible. This signals the caller that it can safely release</div><div class='add'>+ *         the object which is protected by the reference counter.</div><div class='add'>+ *         False if there are still active references or the put() raced</div><div class='add'>+ *         with a concurrent get()/put() pair. Caller is not allowed to</div><div class='add'>+ *         release the protected object.</div><div class='add'>+ */</div><div class='add'>+static __always_inline __must_check bool file_ref_put(file_ref_t *ref)</div><div class='add'>+{</div><div class='add'>+	long cnt;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * While files are SLAB_TYPESAFE_BY_RCU and thus file_ref_put()</div><div class='add'>+	 * calls don't risk UAFs when a file is recyclyed, it is still</div><div class='add'>+	 * vulnerable to UAFs caused by freeing the whole slab page once</div><div class='add'>+	 * it becomes unused. Prevent file_ref_put() from being</div><div class='add'>+	 * preempted protects against this.</div><div class='add'>+	 */</div><div class='add'>+	guard(preempt)();</div><div class='add'>+	/*</div><div class='add'>+	 * Unconditionally decrease the reference count. The saturation</div><div class='add'>+	 * and dead zones provide enough tolerance for this. If this</div><div class='add'>+	 * fails then we need to handle the last reference drop and</div><div class='add'>+	 * cases inside the saturation and dead zones.</div><div class='add'>+	 */</div><div class='add'>+	cnt = atomic_long_dec_return(&amp;ref-&gt;refcnt);</div><div class='add'>+	if (cnt &gt;= 0)</div><div class='add'>+		return false;</div><div class='add'>+	return __file_ref_put(ref, cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * file_ref_put_close - drop a reference expecting it would transition to FILE_REF_NOREF</div><div class='add'>+ * @ref:	Pointer to the reference count</div><div class='add'>+ *</div><div class='add'>+ * Semantically it is equivalent to calling file_ref_put(), but it trades lower</div><div class='add'>+ * performance in face of other CPUs also modifying the refcount for higher</div><div class='add'>+ * performance when this happens to be the last reference.</div><div class='add'>+ *</div><div class='add'>+ * For the last reference file_ref_put() issues 2 atomics. One to drop the</div><div class='add'>+ * reference and another to transition it to FILE_REF_DEAD. This routine does</div><div class='add'>+ * the work in one step, but in order to do it has to pre-read the variable which</div><div class='add'>+ * decreases scalability.</div><div class='add'>+ *</div><div class='add'>+ * Use with close() et al, stick to file_ref_put() by default.</div><div class='add'>+ */</div><div class='add'>+static __always_inline __must_check bool file_ref_put_close(file_ref_t *ref)</div><div class='add'>+{</div><div class='add'>+	long old;</div><div class='add'>+</div><div class='add'>+	old = atomic_long_read(&amp;ref-&gt;refcnt);</div><div class='add'>+	if (likely(old == FILE_REF_ONEREF)) {</div><div class='add'>+		if (likely(atomic_long_try_cmpxchg(&amp;ref-&gt;refcnt, &amp;old, FILE_REF_DEAD)))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return file_ref_put(ref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * file_ref_read - Read the number of file references</div><div class='add'>+ * @ref: Pointer to the reference count</div><div class='add'>+ *</div><div class='add'>+ * Return: The number of held references (0 ... N)</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long file_ref_read(file_ref_t *ref)</div><div class='add'>+{</div><div class='add'>+	unsigned long c = atomic_long_read(&amp;ref-&gt;refcnt);</div><div class='add'>+</div><div class='add'>+	/* Return 0 if within the DEAD zone. */</div><div class='add'>+	return c &gt;= FILE_REF_RELEASED ? 0 : c + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __file_ref_read_raw - Return the value stored in ref-&gt;refcnt</div><div class='add'>+ * @ref: Pointer to the reference count</div><div class='add'>+ *</div><div class='add'>+ * Return: The raw value found in the counter</div><div class='add'>+ *</div><div class='add'>+ * A hack for file_needs_f_pos_lock(), you probably want to use</div><div class='add'>+ * file_ref_read() instead.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long __file_ref_read_raw(file_ref_t *ref)</div><div class='add'>+{</div><div class='add'>+	return atomic_long_read(&amp;ref-&gt;refcnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/fileattr.h b/include/linux/fileattr.h<br/>index 47c05a9851d0..f89dcfad3f8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fileattr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fileattr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fileattr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fileattr.h</a></div><div class='hunk'>@@ -14,13 +14,33 @@</div><div class='ctx'> 	 FS_XFLAG_NODUMP | FS_XFLAG_NOATIME | FS_XFLAG_DAX | \</div><div class='ctx'> 	 FS_XFLAG_PROJINHERIT)</div><div class='ctx'> </div><div class='add'>+/* Read-only inode flags */</div><div class='add'>+#define FS_XFLAG_RDONLY_MASK \</div><div class='add'>+	(FS_XFLAG_PREALLOC | FS_XFLAG_HASATTR)</div><div class='add'>+</div><div class='add'>+/* Flags to indicate valid value of fsx_ fields */</div><div class='add'>+#define FS_XFLAG_VALUES_MASK \</div><div class='add'>+	(FS_XFLAG_EXTSIZE | FS_XFLAG_COWEXTSIZE)</div><div class='add'>+</div><div class='add'>+/* Flags for directories */</div><div class='add'>+#define FS_XFLAG_DIRONLY_MASK \</div><div class='add'>+	(FS_XFLAG_RTINHERIT | FS_XFLAG_NOSYMLINKS | FS_XFLAG_EXTSZINHERIT)</div><div class='add'>+</div><div class='add'>+/* Misc settable flags */</div><div class='add'>+#define FS_XFLAG_MISC_MASK \</div><div class='add'>+	(FS_XFLAG_REALTIME | FS_XFLAG_NODEFRAG | FS_XFLAG_FILESTREAM)</div><div class='add'>+</div><div class='add'>+#define FS_XFLAGS_MASK \</div><div class='add'>+	(FS_XFLAG_COMMON | FS_XFLAG_RDONLY_MASK | FS_XFLAG_VALUES_MASK | \</div><div class='add'>+	 FS_XFLAG_DIRONLY_MASK | FS_XFLAG_MISC_MASK)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Merged interface for miscellaneous file attributes.  'flags' originates from</div><div class='ctx'>  * ext* and 'fsx_flags' from xfs.  There's some overlap between the two, which</div><div class='ctx'>  * is handled by the VFS helpers, so filesystems are free to implement just one</div><div class='ctx'>  * or both of these sub-interfaces.</div><div class='ctx'>  */</div><div class='del'>-struct fileattr {</div><div class='add'>+struct file_kattr {</div><div class='ctx'> 	u32	flags;		/* flags (FS_IOC_GETFLAGS/FS_IOC_SETFLAGS) */</div><div class='ctx'> 	/* struct fsxattr: */</div><div class='ctx'> 	u32	fsx_xflags;	/* xflags field value (get/set) */</div><div class='hunk'>@@ -33,10 +53,10 @@ struct fileattr {</div><div class='ctx'> 	bool	fsx_valid:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int copy_fsxattr_to_user(const struct fileattr *fa, struct fsxattr __user *ufa);</div><div class='add'>+int copy_fsxattr_to_user(const struct file_kattr *fa, struct fsxattr __user *ufa);</div><div class='ctx'> </div><div class='del'>-void fileattr_fill_xflags(struct fileattr *fa, u32 xflags);</div><div class='del'>-void fileattr_fill_flags(struct fileattr *fa, u32 flags);</div><div class='add'>+void fileattr_fill_xflags(struct file_kattr *fa, u32 xflags);</div><div class='add'>+void fileattr_fill_flags(struct file_kattr *fa, u32 flags);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * fileattr_has_fsx - check for extended flags/attributes</div><div class='hunk'>@@ -45,15 +65,19 @@ void fileattr_fill_flags(struct fileattr *fa, u32 flags);</div><div class='ctx'>  * Return: true if any attributes are present that are not represented in</div><div class='ctx'>  * -&gt;flags.</div><div class='ctx'>  */</div><div class='del'>-static inline bool fileattr_has_fsx(const struct fileattr *fa)</div><div class='add'>+static inline bool fileattr_has_fsx(const struct file_kattr *fa)</div><div class='ctx'> {</div><div class='ctx'> 	return fa-&gt;fsx_valid &amp;&amp;</div><div class='ctx'> 		((fa-&gt;fsx_xflags &amp; ~FS_XFLAG_COMMON) || fa-&gt;fsx_extsize != 0 ||</div><div class='ctx'> 		 fa-&gt;fsx_projid != 0 ||	fa-&gt;fsx_cowextsize != 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int vfs_fileattr_get(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+int vfs_fileattr_get(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> int vfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='del'>-		     struct fileattr *fa);</div><div class='add'>+		     struct file_kattr *fa);</div><div class='add'>+int ioctl_getflags(struct file *file, unsigned int __user *argp);</div><div class='add'>+int ioctl_setflags(struct file *file, unsigned int __user *argp);</div><div class='add'>+int ioctl_fsgetxattr(struct file *file, void __user *argp);</div><div class='add'>+int ioctl_fssetxattr(struct file *file, void __user *argp);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_FILEATTR_H */</div><div class='head'>diff --git a/include/linux/filelock.h b/include/linux/filelock.h<br/>index daee999d05f3..54b824c05299 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/filelock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/filelock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/filelock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/filelock.h</a></div><div class='hunk'>@@ -159,6 +159,8 @@ int fcntl_setlk64(unsigned int, struct file *, unsigned int,</div><div class='ctx'> </div><div class='ctx'> int fcntl_setlease(unsigned int fd, struct file *filp, int arg);</div><div class='ctx'> int fcntl_getlease(struct file *filp);</div><div class='add'>+int fcntl_setdeleg(unsigned int fd, struct file *filp, struct delegation *deleg);</div><div class='add'>+int fcntl_getdeleg(struct file *filp, struct delegation *deleg);</div><div class='ctx'> </div><div class='ctx'> static inline bool lock_is_unlock(struct file_lock *fl)</div><div class='ctx'> {</div><div class='hunk'>@@ -175,9 +177,19 @@ static inline bool lock_is_write(struct file_lock *fl)</div><div class='ctx'> 	return fl-&gt;c.flc_type == F_WRLCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void locks_wake_up_waiter(struct file_lock_core *flc)</div><div class='add'>+{</div><div class='add'>+	wake_up(&amp;flc-&gt;flc_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void locks_wake_up(struct file_lock *fl)</div><div class='ctx'> {</div><div class='del'>-	wake_up(&amp;fl-&gt;c.flc_wait);</div><div class='add'>+	locks_wake_up_waiter(&amp;fl-&gt;c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool locks_can_async_lock(const struct file_operations *fops)</div><div class='add'>+{</div><div class='add'>+	return !fops-&gt;lock || fops-&gt;fop_flags &amp; FOP_ASYNC_LOCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* fs/locks.c */</div><div class='hunk'>@@ -202,7 +214,14 @@ int locks_lock_inode_wait(struct inode *inode, struct file_lock *fl);</div><div class='ctx'> void locks_init_lease(struct file_lease *);</div><div class='ctx'> void locks_free_lease(struct file_lease *fl);</div><div class='ctx'> struct file_lease *locks_alloc_lease(void);</div><div class='del'>-int __break_lease(struct inode *inode, unsigned int flags, unsigned int type);</div><div class='add'>+</div><div class='add'>+#define LEASE_BREAK_LEASE		BIT(0)	// break leases and delegations</div><div class='add'>+#define LEASE_BREAK_DELEG		BIT(1)	// break delegations only</div><div class='add'>+#define LEASE_BREAK_LAYOUT		BIT(2)	// break layouts only</div><div class='add'>+#define LEASE_BREAK_NONBLOCK		BIT(3)	// non-blocking break</div><div class='add'>+#define LEASE_BREAK_OPEN_RDONLY		BIT(4)	// readonly open event</div><div class='add'>+</div><div class='add'>+int __break_lease(struct inode *inode, unsigned int flags);</div><div class='ctx'> void lease_get_mtime(struct inode *, struct timespec64 *time);</div><div class='ctx'> int generic_setlease(struct file *, int, struct file_lease **, void **priv);</div><div class='ctx'> int kernel_setlease(struct file *, int, struct file_lease **, void **);</div><div class='hunk'>@@ -261,6 +280,16 @@ static inline int fcntl_getlease(struct file *filp)</div><div class='ctx'> 	return F_UNLCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int fcntl_setdeleg(unsigned int fd, struct file *filp, struct delegation *deleg)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int fcntl_getdeleg(struct file *filp, struct delegation *deleg)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool lock_is_unlock(struct file_lock *fl)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -357,7 +386,7 @@ static inline int locks_lock_inode_wait(struct inode *inode, struct file_lock *f</div><div class='ctx'> 	return -ENOLCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)</div><div class='add'>+static inline int __break_lease(struct inode *inode, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -418,83 +447,128 @@ static inline int locks_lock_file_wait(struct file *filp, struct file_lock *fl)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FILE_LOCKING</div><div class='add'>+static inline unsigned int openmode_to_lease_flags(unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+</div><div class='add'>+	if ((mode &amp; O_ACCMODE) == O_RDONLY)</div><div class='add'>+		flags |= LEASE_BREAK_OPEN_RDONLY;</div><div class='add'>+	if (mode &amp; O_NONBLOCK)</div><div class='add'>+		flags |= LEASE_BREAK_NONBLOCK;</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int break_lease(struct inode *inode, unsigned int mode)</div><div class='ctx'> {</div><div class='add'>+	struct file_lock_context *flctx;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since this check is lockless, we must ensure that any refcounts</div><div class='ctx'> 	 * taken are done before checking i_flctx-&gt;flc_lease. Otherwise, we</div><div class='ctx'> 	 * could end up racing with tasks trying to set a new lease on this</div><div class='ctx'> 	 * file.</div><div class='ctx'> 	 */</div><div class='add'>+	flctx = READ_ONCE(inode-&gt;i_flctx);</div><div class='add'>+	if (!flctx)</div><div class='add'>+		return 0;</div><div class='ctx'> 	smp_mb();</div><div class='del'>-	if (inode-&gt;i_flctx &amp;&amp; !list_empty_careful(&amp;inode-&gt;i_flctx-&gt;flc_lease))</div><div class='del'>-		return __break_lease(inode, mode, FL_LEASE);</div><div class='add'>+	if (!list_empty_careful(&amp;flctx-&gt;flc_lease))</div><div class='add'>+		return __break_lease(inode, LEASE_BREAK_LEASE | openmode_to_lease_flags(mode));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int break_deleg(struct inode *inode, unsigned int mode)</div><div class='add'>+static inline int break_deleg(struct inode *inode, unsigned int flags)</div><div class='ctx'> {</div><div class='add'>+	struct file_lock_context *flctx;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since this check is lockless, we must ensure that any refcounts</div><div class='ctx'> 	 * taken are done before checking i_flctx-&gt;flc_lease. Otherwise, we</div><div class='ctx'> 	 * could end up racing with tasks trying to set a new lease on this</div><div class='ctx'> 	 * file.</div><div class='ctx'> 	 */</div><div class='add'>+	flctx = READ_ONCE(inode-&gt;i_flctx);</div><div class='add'>+	if (!flctx)</div><div class='add'>+		return 0;</div><div class='ctx'> 	smp_mb();</div><div class='del'>-	if (inode-&gt;i_flctx &amp;&amp; !list_empty_careful(&amp;inode-&gt;i_flctx-&gt;flc_lease))</div><div class='del'>-		return __break_lease(inode, mode, FL_DELEG);</div><div class='add'>+	if (!list_empty_careful(&amp;flctx-&gt;flc_lease)) {</div><div class='add'>+		flags |= LEASE_BREAK_DELEG;</div><div class='add'>+		return __break_lease(inode, flags);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int try_break_deleg(struct inode *inode, struct inode **delegated_inode)</div><div class='add'>+struct delegated_inode {</div><div class='add'>+	struct inode *di_inode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool is_delegated(struct delegated_inode *di)</div><div class='add'>+{</div><div class='add'>+	return di-&gt;di_inode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int try_break_deleg(struct inode *inode,</div><div class='add'>+				  struct delegated_inode *di)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = break_deleg(inode, O_WRONLY|O_NONBLOCK);</div><div class='del'>-	if (ret == -EWOULDBLOCK &amp;&amp; delegated_inode) {</div><div class='del'>-		*delegated_inode = inode;</div><div class='add'>+	ret = break_deleg(inode, LEASE_BREAK_NONBLOCK);</div><div class='add'>+	if (ret == -EWOULDBLOCK &amp;&amp; di) {</div><div class='add'>+		di-&gt;di_inode = inode;</div><div class='ctx'> 		ihold(inode);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int break_deleg_wait(struct inode **delegated_inode)</div><div class='add'>+static inline int break_deleg_wait(struct delegated_inode *di)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = break_deleg(*delegated_inode, O_WRONLY);</div><div class='del'>-	iput(*delegated_inode);</div><div class='del'>-	*delegated_inode = NULL;</div><div class='add'>+	ret = break_deleg(di-&gt;di_inode, 0);</div><div class='add'>+	iput(di-&gt;di_inode);</div><div class='add'>+	di-&gt;di_inode = NULL;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int break_layout(struct inode *inode, bool wait)</div><div class='ctx'> {</div><div class='ctx'> 	smp_mb();</div><div class='del'>-	if (inode-&gt;i_flctx &amp;&amp; !list_empty_careful(&amp;inode-&gt;i_flctx-&gt;flc_lease))</div><div class='del'>-		return __break_lease(inode,</div><div class='del'>-				wait ? O_WRONLY : O_WRONLY | O_NONBLOCK,</div><div class='del'>-				FL_LAYOUT);</div><div class='add'>+	if (inode-&gt;i_flctx &amp;&amp; !list_empty_careful(&amp;inode-&gt;i_flctx-&gt;flc_lease)) {</div><div class='add'>+		unsigned int flags = LEASE_BREAK_LAYOUT;</div><div class='add'>+</div><div class='add'>+		if (!wait)</div><div class='add'>+			flags |= LEASE_BREAK_NONBLOCK;</div><div class='add'>+</div><div class='add'>+		return __break_lease(inode, flags);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_FILE_LOCKING */</div><div class='del'>-static inline int break_lease(struct inode *inode, unsigned int mode)</div><div class='add'>+struct delegated_inode { };</div><div class='add'>+</div><div class='add'>+static inline bool is_delegated(struct delegated_inode *di)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int break_lease(struct inode *inode, bool wait)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int break_deleg(struct inode *inode, unsigned int mode)</div><div class='add'>+static inline int break_deleg(struct inode *inode, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int try_break_deleg(struct inode *inode, struct inode **delegated_inode)</div><div class='add'>+static inline int try_break_deleg(struct inode *inode,</div><div class='add'>+				  struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int break_deleg_wait(struct inode **delegated_inode)</div><div class='add'>+static inline int break_deleg_wait(struct delegated_inode *delegated_inode)</div><div class='ctx'> {</div><div class='ctx'> 	BUG();</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/include/linux/filter.h b/include/linux/filter.h<br/>index c99bc3df2d28..fd54fed8f95f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/filter.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/filter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/filter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/filter.h</a></div><div class='hunk'>@@ -75,11 +75,17 @@ struct ctl_table_header;</div><div class='ctx'> /* unused opcode to mark special load instruction. Same as BPF_MSH */</div><div class='ctx'> #define BPF_PROBE_MEM32	0xa0</div><div class='ctx'> </div><div class='add'>+/* unused opcode to mark special atomic instruction */</div><div class='add'>+#define BPF_PROBE_ATOMIC 0xe0</div><div class='add'>+</div><div class='add'>+/* unused opcode to mark special ldsx instruction. Same as BPF_NOSPEC */</div><div class='add'>+#define BPF_PROBE_MEM32SX 0xc0</div><div class='add'>+</div><div class='ctx'> /* unused opcode to mark call to interpreter with arguments */</div><div class='ctx'> #define BPF_CALL_ARGS	0xe0</div><div class='ctx'> </div><div class='ctx'> /* unused opcode to mark speculation barrier for mitigating</div><div class='del'>- * Speculative Store Bypass</div><div class='add'>+ * Spectre v1 and v4</div><div class='ctx'>  */</div><div class='ctx'> #define BPF_NOSPEC	0xc0</div><div class='ctx'> </div><div class='hunk'>@@ -178,6 +184,25 @@ struct ctl_table_header;</div><div class='ctx'> 		.off   = 0,					\</div><div class='ctx'> 		.imm   = 0 })</div><div class='ctx'> </div><div class='add'>+/* Special (internal-only) form of mov, used to resolve per-CPU addrs:</div><div class='add'>+ * dst_reg = src_reg + &lt;percpu_base_off&gt;</div><div class='add'>+ * BPF_ADDR_PERCPU is used as a special insn-&gt;off value.</div><div class='add'>+ */</div><div class='add'>+#define BPF_ADDR_PERCPU	(-1)</div><div class='add'>+</div><div class='add'>+#define BPF_MOV64_PERCPU_REG(DST, SRC)				\</div><div class='add'>+	((struct bpf_insn) {					\</div><div class='add'>+		.code  = BPF_ALU64 | BPF_MOV | BPF_X,		\</div><div class='add'>+		.dst_reg = DST,					\</div><div class='add'>+		.src_reg = SRC,					\</div><div class='add'>+		.off   = BPF_ADDR_PERCPU,			\</div><div class='add'>+		.imm   = 0 })</div><div class='add'>+</div><div class='add'>+static inline bool insn_is_mov_percpu_addr(const struct bpf_insn *insn)</div><div class='add'>+{</div><div class='add'>+	return insn-&gt;code == (BPF_ALU64 | BPF_MOV | BPF_X) &amp;&amp; insn-&gt;off == BPF_ADDR_PERCPU;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Short form of mov, dst_reg = imm32 */</div><div class='ctx'> </div><div class='ctx'> #define BPF_MOV64_IMM(DST, IMM)					\</div><div class='hunk'>@@ -228,6 +253,16 @@ static inline bool insn_is_zext(const struct bpf_insn *insn)</div><div class='ctx'> 	return insn-&gt;code == (BPF_ALU | BPF_MOV | BPF_X) &amp;&amp; insn-&gt;imm == 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* addr_space_cast from as(0) to as(1) is for converting bpf arena pointers</div><div class='add'>+ * to pointers in user vma.</div><div class='add'>+ */</div><div class='add'>+static inline bool insn_is_cast_user(const struct bpf_insn *insn)</div><div class='add'>+{</div><div class='add'>+	return insn-&gt;code == (BPF_ALU64 | BPF_MOV | BPF_X) &amp;&amp;</div><div class='add'>+			      insn-&gt;off == BPF_ADDR_SPACE_CAST &amp;&amp;</div><div class='add'>+			      insn-&gt;imm == 1U &lt;&lt; 16;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* BPF_LD_IMM64 macro encodes single 'load 64-bit immediate' insn */</div><div class='ctx'> #define BPF_LD_IMM64(DST, IMM)					\</div><div class='ctx'> 	BPF_LD_IMM64_RAW(DST, 0, IMM)</div><div class='hunk'>@@ -332,6 +367,8 @@ static inline bool insn_is_zext(const struct bpf_insn *insn)</div><div class='ctx'>  *   BPF_XOR | BPF_FETCH      src_reg = atomic_fetch_xor(dst_reg + off16, src_reg);</div><div class='ctx'>  *   BPF_XCHG                 src_reg = atomic_xchg(dst_reg + off16, src_reg)</div><div class='ctx'>  *   BPF_CMPXCHG              r0 = atomic_cmpxchg(dst_reg + off16, r0, src_reg)</div><div class='add'>+ *   BPF_LOAD_ACQ             dst_reg = smp_load_acquire(src_reg + off16)</div><div class='add'>+ *   BPF_STORE_REL            smp_store_release(dst_reg + off16, src_reg)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define BPF_ATOMIC_OP(SIZE, OP, DST, SRC, OFF)			\</div><div class='hunk'>@@ -405,6 +442,16 @@ static inline bool insn_is_zext(const struct bpf_insn *insn)</div><div class='ctx'> 		.off   = OFF,					\</div><div class='ctx'> 		.imm   = 0 })</div><div class='ctx'> </div><div class='add'>+/* Unconditional jumps, gotol pc + imm32 */</div><div class='add'>+</div><div class='add'>+#define BPF_JMP32_A(IMM)					\</div><div class='add'>+	((struct bpf_insn) {					\</div><div class='add'>+		.code  = BPF_JMP32 | BPF_JA,			\</div><div class='add'>+		.dst_reg = 0,					\</div><div class='add'>+		.src_reg = 0,					\</div><div class='add'>+		.off   = 0,					\</div><div class='add'>+		.imm   = IMM })</div><div class='add'>+</div><div class='ctx'> /* Relative call */</div><div class='ctx'> </div><div class='ctx'> #define BPF_CALL_REL(TGT)					\</div><div class='hunk'>@@ -427,6 +474,16 @@ static inline bool insn_is_zext(const struct bpf_insn *insn)</div><div class='ctx'> 		.off   = 0,					\</div><div class='ctx'> 		.imm   = BPF_CALL_IMM(FUNC) })</div><div class='ctx'> </div><div class='add'>+/* Kfunc call */</div><div class='add'>+</div><div class='add'>+#define BPF_CALL_KFUNC(OFF, IMM)				\</div><div class='add'>+	((struct bpf_insn) {					\</div><div class='add'>+		.code  = BPF_JMP | BPF_CALL,			\</div><div class='add'>+		.dst_reg = 0,					\</div><div class='add'>+		.src_reg = BPF_PSEUDO_KFUNC_CALL,		\</div><div class='add'>+		.off   = OFF,					\</div><div class='add'>+		.imm   = IMM })</div><div class='add'>+</div><div class='ctx'> /* Raw code statement block */</div><div class='ctx'> </div><div class='ctx'> #define BPF_RAW_INSN(CODE, DST, SRC, OFF, IMM)			\</div><div class='hunk'>@@ -617,6 +674,11 @@ struct bpf_prog_stats {</div><div class='ctx'> 	struct u64_stats_sync syncp;</div><div class='ctx'> } __aligned(2 * sizeof(u64));</div><div class='ctx'> </div><div class='add'>+struct bpf_timed_may_goto {</div><div class='add'>+	u64 count;</div><div class='add'>+	u64 timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sk_filter {</div><div class='ctx'> 	refcount_t	refcnt;</div><div class='ctx'> 	struct rcu_head	rcu;</div><div class='hunk'>@@ -644,15 +706,19 @@ static __always_inline u32 __bpf_prog_run(const struct bpf_prog *prog,</div><div class='ctx'> 	cant_migrate();</div><div class='ctx'> 	if (static_branch_unlikely(&amp;bpf_stats_enabled_key)) {</div><div class='ctx'> 		struct bpf_prog_stats *stats;</div><div class='del'>-		u64 start = sched_clock();</div><div class='add'>+		u64 duration, start = sched_clock();</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 		ret = dfunc(ctx, prog-&gt;insnsi, prog-&gt;bpf_func);</div><div class='del'>-		stats = this_cpu_ptr(prog-&gt;stats);</div><div class='del'>-		flags = u64_stats_update_begin_irqsave(&amp;stats-&gt;syncp);</div><div class='del'>-		u64_stats_inc(&amp;stats-&gt;cnt);</div><div class='del'>-		u64_stats_add(&amp;stats-&gt;nsecs, sched_clock() - start);</div><div class='del'>-		u64_stats_update_end_irqrestore(&amp;stats-&gt;syncp, flags);</div><div class='add'>+</div><div class='add'>+		duration = sched_clock() - start;</div><div class='add'>+		if (likely(prog-&gt;stats)) {</div><div class='add'>+			stats = this_cpu_ptr(prog-&gt;stats);</div><div class='add'>+			flags = u64_stats_update_begin_irqsave(&amp;stats-&gt;syncp);</div><div class='add'>+			u64_stats_inc(&amp;stats-&gt;cnt);</div><div class='add'>+			u64_stats_add(&amp;stats-&gt;nsecs, duration);</div><div class='add'>+			u64_stats_update_end_irqrestore(&amp;stats-&gt;syncp, flags);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = dfunc(ctx, prog-&gt;insnsi, prog-&gt;bpf_func);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -699,21 +765,128 @@ struct bpf_nh_params {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* flags for bpf_redirect_info kern_flags */</div><div class='add'>+#define BPF_RI_F_RF_NO_DIRECT	BIT(0)	/* no napi_direct on return_frame */</div><div class='add'>+#define BPF_RI_F_RI_INIT	BIT(1)</div><div class='add'>+#define BPF_RI_F_CPU_MAP_INIT	BIT(2)</div><div class='add'>+#define BPF_RI_F_DEV_MAP_INIT	BIT(3)</div><div class='add'>+#define BPF_RI_F_XSK_MAP_INIT	BIT(4)</div><div class='add'>+</div><div class='ctx'> struct bpf_redirect_info {</div><div class='ctx'> 	u64 tgt_index;</div><div class='ctx'> 	void *tgt_value;</div><div class='ctx'> 	struct bpf_map *map;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	u32 kern_flags;</div><div class='ctx'> 	u32 map_id;</div><div class='ctx'> 	enum bpf_map_type map_type;</div><div class='ctx'> 	struct bpf_nh_params nh;</div><div class='add'>+	u32 kern_flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-DECLARE_PER_CPU(struct bpf_redirect_info, bpf_redirect_info);</div><div class='add'>+struct bpf_net_context {</div><div class='add'>+	struct bpf_redirect_info ri;</div><div class='add'>+	struct list_head cpu_map_flush_list;</div><div class='add'>+	struct list_head dev_map_flush_list;</div><div class='add'>+	struct list_head xskmap_map_flush_list;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* flags for bpf_redirect_info kern_flags */</div><div class='del'>-#define BPF_RI_F_RF_NO_DIRECT	BIT(0)	/* no napi_direct on return_frame */</div><div class='add'>+static inline struct bpf_net_context *bpf_net_ctx_set(struct bpf_net_context *bpf_net_ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *tsk = current;</div><div class='add'>+</div><div class='add'>+	if (tsk-&gt;bpf_net_context != NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	bpf_net_ctx-&gt;ri.kern_flags = 0;</div><div class='add'>+</div><div class='add'>+	tsk-&gt;bpf_net_context = bpf_net_ctx;</div><div class='add'>+	return bpf_net_ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bpf_net_ctx_clear(struct bpf_net_context *bpf_net_ctx)</div><div class='add'>+{</div><div class='add'>+	if (bpf_net_ctx)</div><div class='add'>+		current-&gt;bpf_net_context = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct bpf_net_context *bpf_net_ctx_get(void)</div><div class='add'>+{</div><div class='add'>+	return current-&gt;bpf_net_context;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct bpf_redirect_info *bpf_net_ctx_get_ri(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_net_context *bpf_net_ctx = bpf_net_ctx_get();</div><div class='add'>+</div><div class='add'>+	if (!(bpf_net_ctx-&gt;ri.kern_flags &amp; BPF_RI_F_RI_INIT)) {</div><div class='add'>+		memset(&amp;bpf_net_ctx-&gt;ri, 0, offsetof(struct bpf_net_context, ri.nh));</div><div class='add'>+		bpf_net_ctx-&gt;ri.kern_flags |= BPF_RI_F_RI_INIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;bpf_net_ctx-&gt;ri;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct list_head *bpf_net_ctx_get_cpu_map_flush_list(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_net_context *bpf_net_ctx = bpf_net_ctx_get();</div><div class='add'>+</div><div class='add'>+	if (!(bpf_net_ctx-&gt;ri.kern_flags &amp; BPF_RI_F_CPU_MAP_INIT)) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;bpf_net_ctx-&gt;cpu_map_flush_list);</div><div class='add'>+		bpf_net_ctx-&gt;ri.kern_flags |= BPF_RI_F_CPU_MAP_INIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;bpf_net_ctx-&gt;cpu_map_flush_list;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct list_head *bpf_net_ctx_get_dev_flush_list(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_net_context *bpf_net_ctx = bpf_net_ctx_get();</div><div class='add'>+</div><div class='add'>+	if (!(bpf_net_ctx-&gt;ri.kern_flags &amp; BPF_RI_F_DEV_MAP_INIT)) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;bpf_net_ctx-&gt;dev_map_flush_list);</div><div class='add'>+		bpf_net_ctx-&gt;ri.kern_flags |= BPF_RI_F_DEV_MAP_INIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;bpf_net_ctx-&gt;dev_map_flush_list;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct list_head *bpf_net_ctx_get_xskmap_flush_list(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_net_context *bpf_net_ctx = bpf_net_ctx_get();</div><div class='add'>+</div><div class='add'>+	if (!(bpf_net_ctx-&gt;ri.kern_flags &amp; BPF_RI_F_XSK_MAP_INIT)) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;bpf_net_ctx-&gt;xskmap_map_flush_list);</div><div class='add'>+		bpf_net_ctx-&gt;ri.kern_flags |= BPF_RI_F_XSK_MAP_INIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;bpf_net_ctx-&gt;xskmap_map_flush_list;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bpf_net_ctx_get_all_used_flush_lists(struct list_head **lh_map,</div><div class='add'>+							struct list_head **lh_dev,</div><div class='add'>+							struct list_head **lh_xsk)</div><div class='add'>+{</div><div class='add'>+	struct bpf_net_context *bpf_net_ctx = bpf_net_ctx_get();</div><div class='add'>+	u32 kern_flags = bpf_net_ctx-&gt;ri.kern_flags;</div><div class='add'>+	struct list_head *lh;</div><div class='add'>+</div><div class='add'>+	*lh_map = *lh_dev = *lh_xsk = NULL;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_BPF_SYSCALL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lh = &amp;bpf_net_ctx-&gt;dev_map_flush_list;</div><div class='add'>+	if (kern_flags &amp; BPF_RI_F_DEV_MAP_INIT &amp;&amp; !list_empty(lh))</div><div class='add'>+		*lh_dev = lh;</div><div class='add'>+</div><div class='add'>+	lh = &amp;bpf_net_ctx-&gt;cpu_map_flush_list;</div><div class='add'>+	if (kern_flags &amp; BPF_RI_F_CPU_MAP_INIT &amp;&amp; !list_empty(lh))</div><div class='add'>+		*lh_map = lh;</div><div class='add'>+</div><div class='add'>+	lh = &amp;bpf_net_ctx-&gt;xskmap_map_flush_list;</div><div class='add'>+	if (IS_ENABLED(CONFIG_XDP_SOCKETS) &amp;&amp;</div><div class='add'>+	    kern_flags &amp; BPF_RI_F_XSK_MAP_INIT &amp;&amp; !list_empty(lh))</div><div class='add'>+		*lh_xsk = lh;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Compute the linear packet data range [data, data_end) which</div><div class='ctx'>  * will be accessed by various program types (cls_bpf, act_bpf,</div><div class='hunk'>@@ -730,6 +903,26 @@ static inline void bpf_compute_data_pointers(struct sk_buff *skb)</div><div class='ctx'> 	cb-&gt;data_end  = skb-&gt;data + skb_headlen(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int bpf_prog_run_data_pointers(</div><div class='add'>+	const struct bpf_prog *prog,</div><div class='add'>+	struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_skb_data_end *cb = (struct bpf_skb_data_end *)skb-&gt;cb;</div><div class='add'>+	void *save_data_meta, *save_data_end;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	save_data_meta = cb-&gt;data_meta;</div><div class='add'>+	save_data_end = cb-&gt;data_end;</div><div class='add'>+</div><div class='add'>+	bpf_compute_data_pointers(skb);</div><div class='add'>+	res = bpf_prog_run(prog, skb);</div><div class='add'>+</div><div class='add'>+	cb-&gt;data_meta = save_data_meta;</div><div class='add'>+	cb-&gt;data_end = save_data_end;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Similar to bpf_compute_data_pointers(), except that save orginal</div><div class='ctx'>  * data in cb-&gt;data and cb-&gt;meta_data for restore.</div><div class='ctx'>  */</div><div class='hunk'>@@ -829,12 +1022,6 @@ static inline u32 bpf_prog_insn_size(const struct bpf_prog *prog)</div><div class='ctx'> 	return prog-&gt;len * sizeof(struct bpf_insn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 bpf_prog_tag_scratch_size(const struct bpf_prog *prog)</div><div class='del'>-{</div><div class='del'>-	return round_up(bpf_prog_insn_size(prog) +</div><div class='del'>-			sizeof(__be64) + 1, SHA1_BLOCK_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned int bpf_prog_size(unsigned int proglen)</div><div class='ctx'> {</div><div class='ctx'> 	return max(sizeof(struct bpf_prog),</div><div class='hunk'>@@ -887,26 +1074,38 @@ bpf_ctx_narrow_access_offset(u32 off, u32 size, u32 size_default)</div><div class='ctx'> </div><div class='ctx'> #define bpf_classic_proglen(fprog) (fprog-&gt;len * sizeof(fprog-&gt;filter[0]))</div><div class='ctx'> </div><div class='del'>-static inline void bpf_prog_lock_ro(struct bpf_prog *fp)</div><div class='add'>+static inline int __must_check bpf_prog_lock_ro(struct bpf_prog *fp)</div><div class='ctx'> {</div><div class='ctx'> #ifndef CONFIG_BPF_JIT_ALWAYS_ON</div><div class='ctx'> 	if (!fp-&gt;jited) {</div><div class='ctx'> 		set_vm_flush_reset_perms(fp);</div><div class='del'>-		set_memory_ro((unsigned long)fp, fp-&gt;pages);</div><div class='add'>+		return set_memory_ro((unsigned long)fp, fp-&gt;pages);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)</div><div class='add'>+static inline int __must_check</div><div class='add'>+bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)</div><div class='ctx'> {</div><div class='ctx'> 	set_vm_flush_reset_perms(hdr);</div><div class='del'>-	set_memory_rox((unsigned long)hdr, hdr-&gt;size &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	return set_memory_rox((unsigned long)hdr, hdr-&gt;size &gt;&gt; PAGE_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap);</div><div class='add'>+int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap,</div><div class='add'>+		       enum skb_drop_reason *reason);</div><div class='add'>+</div><div class='ctx'> static inline int sk_filter(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return sk_filter_trim_cap(sk, skb, 1);</div><div class='add'>+	enum skb_drop_reason ignore_reason;</div><div class='add'>+</div><div class='add'>+	return sk_filter_trim_cap(sk, skb, 1, &amp;ignore_reason);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sk_filter_reason(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				   enum skb_drop_reason *reason)</div><div class='add'>+{</div><div class='add'>+	return sk_filter_trim_cap(sk, skb, 1, reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct bpf_prog *bpf_prog_select_runtime(struct bpf_prog *fp, int *err);</div><div class='hunk'>@@ -957,14 +1156,22 @@ u64 __bpf_call_base(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5);</div><div class='ctx'> struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog);</div><div class='ctx'> void bpf_jit_compile(struct bpf_prog *prog);</div><div class='ctx'> bool bpf_jit_needs_zext(void);</div><div class='add'>+bool bpf_jit_inlines_helper_call(s32 imm);</div><div class='ctx'> bool bpf_jit_supports_subprog_tailcalls(void);</div><div class='add'>+bool bpf_jit_supports_percpu_insn(void);</div><div class='ctx'> bool bpf_jit_supports_kfunc_call(void);</div><div class='ctx'> bool bpf_jit_supports_far_kfunc_call(void);</div><div class='ctx'> bool bpf_jit_supports_exceptions(void);</div><div class='ctx'> bool bpf_jit_supports_ptr_xchg(void);</div><div class='ctx'> bool bpf_jit_supports_arena(void);</div><div class='add'>+bool bpf_jit_supports_insn(struct bpf_insn *insn, bool in_arena);</div><div class='add'>+bool bpf_jit_supports_private_stack(void);</div><div class='add'>+bool bpf_jit_supports_timed_may_goto(void);</div><div class='add'>+u64 bpf_arch_uaddress_limit(void);</div><div class='ctx'> void arch_bpf_stack_walk(bool (*consume_fn)(void *cookie, u64 ip, u64 sp, u64 bp), void *cookie);</div><div class='del'>-bool bpf_helper_changes_pkt_data(void *func);</div><div class='add'>+u64 arch_bpf_timed_may_goto(void);</div><div class='add'>+u64 bpf_check_timed_may_goto(struct bpf_timed_may_goto *);</div><div class='add'>+bool bpf_helper_changes_pkt_data(enum bpf_func_id func_id);</div><div class='ctx'> </div><div class='ctx'> static inline bool bpf_dump_raw_ok(const struct cred *cred)</div><div class='ctx'> {</div><div class='hunk'>@@ -978,25 +1185,23 @@ struct bpf_prog *bpf_patch_insn_single(struct bpf_prog *prog, u32 off,</div><div class='ctx'> 				       const struct bpf_insn *patch, u32 len);</div><div class='ctx'> int bpf_remove_insns(struct bpf_prog *prog, u32 off, u32 cnt);</div><div class='ctx'> </div><div class='del'>-void bpf_clear_redirect_map(struct bpf_map *map);</div><div class='del'>-</div><div class='ctx'> static inline bool xdp_return_frame_no_direct(void)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='ctx'> </div><div class='ctx'> 	return ri-&gt;kern_flags &amp; BPF_RI_F_RF_NO_DIRECT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void xdp_set_return_frame_no_direct(void)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='ctx'> </div><div class='ctx'> 	ri-&gt;kern_flags |= BPF_RI_F_RF_NO_DIRECT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void xdp_clear_return_frame_no_direct(void)</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='ctx'> </div><div class='ctx'> 	ri-&gt;kern_flags &amp;= ~BPF_RI_F_RF_NO_DIRECT;</div><div class='ctx'> }</div><div class='hunk'>@@ -1023,17 +1228,18 @@ static inline int xdp_ok_fwd_dev(const struct net_device *fwd,</div><div class='ctx'>  * This does not appear to be a real limitation for existing software.</div><div class='ctx'>  */</div><div class='ctx'> int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			    struct xdp_buff *xdp, struct bpf_prog *prog);</div><div class='add'>+			    struct xdp_buff *xdp, const struct bpf_prog *prog);</div><div class='ctx'> int xdp_do_redirect(struct net_device *dev,</div><div class='ctx'> 		    struct xdp_buff *xdp,</div><div class='del'>-		    struct bpf_prog *prog);</div><div class='add'>+		    const struct bpf_prog *prog);</div><div class='ctx'> int xdp_do_redirect_frame(struct net_device *dev,</div><div class='ctx'> 			  struct xdp_buff *xdp,</div><div class='ctx'> 			  struct xdp_frame *xdpf,</div><div class='del'>-			  struct bpf_prog *prog);</div><div class='add'>+			  const struct bpf_prog *prog);</div><div class='ctx'> void xdp_do_flush(void);</div><div class='ctx'> </div><div class='del'>-void bpf_warn_invalid_xdp_action(struct net_device *dev, struct bpf_prog *prog, u32 act);</div><div class='add'>+void bpf_warn_invalid_xdp_action(const struct net_device *dev,</div><div class='add'>+				 const struct bpf_prog *prog, u32 act);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_INET</div><div class='ctx'> struct sock *bpf_run_sk_reuseport(struct sock_reuseport *reuse, struct sock *sk,</div><div class='hunk'>@@ -1089,8 +1295,7 @@ bpf_jit_binary_pack_alloc(unsigned int proglen, u8 **ro_image,</div><div class='ctx'> 			  struct bpf_binary_header **rw_hdr,</div><div class='ctx'> 			  u8 **rw_image,</div><div class='ctx'> 			  bpf_jit_fill_hole_t bpf_fill_ill_insns);</div><div class='del'>-int bpf_jit_binary_pack_finalize(struct bpf_prog *prog,</div><div class='del'>-				 struct bpf_binary_header *ro_header,</div><div class='add'>+int bpf_jit_binary_pack_finalize(struct bpf_binary_header *ro_header,</div><div class='ctx'> 				 struct bpf_binary_header *rw_header);</div><div class='ctx'> void bpf_jit_binary_pack_free(struct bpf_binary_header *ro_header,</div><div class='ctx'> 			      struct bpf_binary_header *rw_header);</div><div class='hunk'>@@ -1102,13 +1307,15 @@ int bpf_jit_get_func_addr(const struct bpf_prog *prog,</div><div class='ctx'> 			  const struct bpf_insn *insn, bool extra_pass,</div><div class='ctx'> 			  u64 *func_addr, bool *func_addr_fixed);</div><div class='ctx'> </div><div class='add'>+const char *bpf_jit_get_prog_name(struct bpf_prog *prog);</div><div class='add'>+</div><div class='ctx'> struct bpf_prog *bpf_jit_blind_constants(struct bpf_prog *fp);</div><div class='ctx'> void bpf_jit_prog_release_other(struct bpf_prog *fp, struct bpf_prog *fp_other);</div><div class='ctx'> </div><div class='ctx'> static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,</div><div class='ctx'> 				u32 pass, void *image)</div><div class='ctx'> {</div><div class='del'>-	pr_err("flen=%u proglen=%u pass=%u image=%pK from=%s pid=%d\n", flen,</div><div class='add'>+	pr_err("flen=%u proglen=%u pass=%u image=%p from=%s pid=%d\n", flen,</div><div class='ctx'> 	       proglen, pass, image, current-&gt;comm, task_pid_nr(current));</div><div class='ctx'> </div><div class='ctx'> 	if (image)</div><div class='hunk'>@@ -1168,18 +1375,18 @@ static inline bool bpf_jit_kallsyms_enabled(void)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const char *__bpf_address_lookup(unsigned long addr, unsigned long *size,</div><div class='add'>+int __bpf_address_lookup(unsigned long addr, unsigned long *size,</div><div class='ctx'> 				 unsigned long *off, char *sym);</div><div class='ctx'> bool is_bpf_text_address(unsigned long addr);</div><div class='ctx'> int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,</div><div class='ctx'> 		    char *sym);</div><div class='ctx'> struct bpf_prog *bpf_prog_ksym_find(unsigned long addr);</div><div class='ctx'> </div><div class='del'>-static inline const char *</div><div class='add'>+static inline int</div><div class='ctx'> bpf_address_lookup(unsigned long addr, unsigned long *size,</div><div class='ctx'> 		   unsigned long *off, char **modname, char *sym)</div><div class='ctx'> {</div><div class='del'>-	const char *ret = __bpf_address_lookup(addr, size, off, sym);</div><div class='add'>+	int ret = __bpf_address_lookup(addr, size, off, sym);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &amp;&amp; modname)</div><div class='ctx'> 		*modname = NULL;</div><div class='hunk'>@@ -1223,11 +1430,11 @@ static inline bool bpf_jit_kallsyms_enabled(void)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const char *</div><div class='add'>+static inline int</div><div class='ctx'> __bpf_address_lookup(unsigned long addr, unsigned long *size,</div><div class='ctx'> 		     unsigned long *off, char *sym)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_bpf_text_address(unsigned long addr)</div><div class='hunk'>@@ -1246,11 +1453,11 @@ static inline struct bpf_prog *bpf_prog_ksym_find(unsigned long addr)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const char *</div><div class='add'>+static inline int</div><div class='ctx'> bpf_address_lookup(unsigned long addr, unsigned long *size,</div><div class='ctx'> 		   unsigned long *off, char **modname, char *sym)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void bpf_prog_kallsyms_add(struct bpf_prog *fp)</div><div class='hunk'>@@ -1330,7 +1537,7 @@ static inline int bpf_tell_extensions(void)</div><div class='ctx'> </div><div class='ctx'> struct bpf_sock_addr_kern {</div><div class='ctx'> 	struct sock *sk;</div><div class='del'>-	struct sockaddr *uaddr;</div><div class='add'>+	struct sockaddr_unsized *uaddr;</div><div class='ctx'> 	/* Temporary "register" to make indirect stores to nested structures</div><div class='ctx'> 	 * defined above. We need three registers to make such a store, but</div><div class='ctx'> 	 * only two (src and dst) are available at convert_ctx_access time</div><div class='hunk'>@@ -1352,6 +1559,7 @@ struct bpf_sock_ops_kern {</div><div class='ctx'> 	void	*skb_data_end;</div><div class='ctx'> 	u8	op;</div><div class='ctx'> 	u8	is_fullsock;</div><div class='add'>+	u8	is_locked_tcp_sock;</div><div class='ctx'> 	u8	remaining_opt_len;</div><div class='ctx'> 	u64	temp;			/* temp and everything after is not</div><div class='ctx'> 					 * initialized to 0 before calling</div><div class='hunk'>@@ -1366,7 +1574,7 @@ struct bpf_sock_ops_kern {</div><div class='ctx'> </div><div class='ctx'> struct bpf_sysctl_kern {</div><div class='ctx'> 	struct ctl_table_header *head;</div><div class='del'>-	struct ctl_table *table;</div><div class='add'>+	const struct ctl_table *table;</div><div class='ctx'> 	void *cur_val;</div><div class='ctx'> 	size_t cur_len;</div><div class='ctx'> 	void *new_val;</div><div class='hunk'>@@ -1472,7 +1680,7 @@ extern struct static_key_false bpf_sk_lookup_enabled;</div><div class='ctx'> 		_all_pass || _selected_sk ? SK_PASS : SK_DROP;		\</div><div class='ctx'> 	 })</div><div class='ctx'> </div><div class='del'>-static inline bool bpf_sk_lookup_run_v4(struct net *net, int protocol,</div><div class='add'>+static inline bool bpf_sk_lookup_run_v4(const struct net *net, int protocol,</div><div class='ctx'> 					const __be32 saddr, const __be16 sport,</div><div class='ctx'> 					const __be32 daddr, const u16 dport,</div><div class='ctx'> 					const int ifindex, struct sock **psk)</div><div class='hunk'>@@ -1509,7 +1717,7 @@ static inline bool bpf_sk_lookup_run_v4(struct net *net, int protocol,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='del'>-static inline bool bpf_sk_lookup_run_v6(struct net *net, int protocol,</div><div class='add'>+static inline bool bpf_sk_lookup_run_v6(const struct net *net, int protocol,</div><div class='ctx'> 					const struct in6_addr *saddr,</div><div class='ctx'> 					const __be16 sport,</div><div class='ctx'> 					const struct in6_addr *daddr,</div><div class='hunk'>@@ -1552,7 +1760,7 @@ static __always_inline long __bpf_xdp_redirect_map(struct bpf_map *map, u64 inde</div><div class='ctx'> 						   u64 flags, const u64 flag_mask,</div><div class='ctx'> 						   void *lookup_elem(struct bpf_map *map, u32 key))</div><div class='ctx'> {</div><div class='del'>-	struct bpf_redirect_info *ri = this_cpu_ptr(&amp;bpf_redirect_info);</div><div class='add'>+	struct bpf_redirect_info *ri = bpf_net_ctx_get_ri();</div><div class='ctx'> 	const u64 action_mask = XDP_ABORTED | XDP_DROP | XDP_PASS | XDP_TX;</div><div class='ctx'> </div><div class='ctx'> 	/* Lower bits of the flags are used as return code on lookup failure */</div><div class='hunk'>@@ -1595,6 +1803,9 @@ int __bpf_xdp_store_bytes(struct xdp_buff *xdp, u32 offset, void *buf, u32 len);</div><div class='ctx'> void *bpf_xdp_pointer(struct xdp_buff *xdp, u32 offset, u32 len);</div><div class='ctx'> void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off,</div><div class='ctx'> 		      void *buf, unsigned long len, bool flush);</div><div class='add'>+int __bpf_skb_meta_store_bytes(struct sk_buff *skb, u32 offset,</div><div class='add'>+			       const void *from, u32 len, u64 flags);</div><div class='add'>+void *bpf_skb_meta_pointer(struct sk_buff *skb, u32 offset);</div><div class='ctx'> #else /* CONFIG_NET */</div><div class='ctx'> static inline int __bpf_skb_load_bytes(const struct sk_buff *skb, u32 offset,</div><div class='ctx'> 				       void *to, u32 len)</div><div class='hunk'>@@ -1629,6 +1840,18 @@ static inline void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, voi</div><div class='ctx'> 				    unsigned long len, bool flush)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int __bpf_skb_meta_store_bytes(struct sk_buff *skb, u32 offset,</div><div class='add'>+					     const void *from, u32 len,</div><div class='add'>+					     u64 flags)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *bpf_skb_meta_pointer(struct sk_buff *skb, u32 offset)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_NET */</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_FILTER_H__ */</div><div class='head'>diff --git a/include/linux/find.h b/include/linux/find.h<br/>index 5e4f39ef2e72..9d720ad92bc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/find.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/find.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/find.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/find.h</a></div><div class='hunk'>@@ -29,6 +29,10 @@ unsigned long __find_nth_and_andnot_bit(const unsigned long *addr1, const unsign</div><div class='ctx'> 					unsigned long n);</div><div class='ctx'> extern unsigned long _find_first_and_bit(const unsigned long *addr1,</div><div class='ctx'> 					 const unsigned long *addr2, unsigned long size);</div><div class='add'>+unsigned long _find_first_andnot_bit(const unsigned long *addr1, const unsigned long *addr2,</div><div class='add'>+				 unsigned long size);</div><div class='add'>+unsigned long _find_first_and_and_bit(const unsigned long *addr1, const unsigned long *addr2,</div><div class='add'>+				      const unsigned long *addr3, unsigned long size);</div><div class='ctx'> extern unsigned long _find_first_zero_bit(const unsigned long *addr, unsigned long size);</div><div class='ctx'> extern unsigned long _find_last_bit(const unsigned long *addr, unsigned long size);</div><div class='ctx'> </div><div class='hunk'>@@ -40,6 +44,8 @@ unsigned long _find_next_bit_le(const unsigned long *addr, unsigned</div><div class='ctx'> 				long size, unsigned long offset);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+unsigned long find_random_bit(const unsigned long *addr, unsigned long size);</div><div class='add'>+</div><div class='ctx'> #ifndef find_next_bit</div><div class='ctx'> /**</div><div class='ctx'>  * find_next_bit - find the next set bit in a memory region</div><div class='hunk'>@@ -50,7 +56,7 @@ unsigned long _find_next_bit_le(const unsigned long *addr, unsigned</div><div class='ctx'>  * Returns the bit number for the next set bit</div><div class='ctx'>  * If no bits are set, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_bit(const unsigned long *addr, unsigned long size,</div><div class='ctx'> 			    unsigned long offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -79,7 +85,7 @@ unsigned long find_next_bit(const unsigned long *addr, unsigned long size,</div><div class='ctx'>  * Returns the bit number for the next set bit</div><div class='ctx'>  * If no bits are set, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_and_bit(const unsigned long *addr1,</div><div class='ctx'> 		const unsigned long *addr2, unsigned long size,</div><div class='ctx'> 		unsigned long offset)</div><div class='hunk'>@@ -110,7 +116,7 @@ unsigned long find_next_and_bit(const unsigned long *addr1,</div><div class='ctx'>  * Returns the bit number for the next set bit</div><div class='ctx'>  * If no bits are set, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_andnot_bit(const unsigned long *addr1,</div><div class='ctx'> 		const unsigned long *addr2, unsigned long size,</div><div class='ctx'> 		unsigned long offset)</div><div class='hunk'>@@ -140,7 +146,7 @@ unsigned long find_next_andnot_bit(const unsigned long *addr1,</div><div class='ctx'>  * Returns the bit number for the next set bit</div><div class='ctx'>  * If no bits are set, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_or_bit(const unsigned long *addr1,</div><div class='ctx'> 		const unsigned long *addr2, unsigned long size,</div><div class='ctx'> 		unsigned long offset)</div><div class='hunk'>@@ -169,7 +175,7 @@ unsigned long find_next_or_bit(const unsigned long *addr1,</div><div class='ctx'>  * Returns the bit number of the next zero bit</div><div class='ctx'>  * If no bits are zero, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,</div><div class='ctx'> 				 unsigned long offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -196,7 +202,7 @@ unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,</div><div class='ctx'>  * Returns the bit number of the first set bit.</div><div class='ctx'>  * If no bits are set, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_first_bit(const unsigned long *addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(size)) {</div><div class='hunk'>@@ -220,9 +226,9 @@ unsigned long find_first_bit(const unsigned long *addr, unsigned long size)</div><div class='ctx'>  *	 idx = find_first_bit(addr, size);</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the bit number of the N'th set bit.</div><div class='del'>- * If no such, returns @size.</div><div class='add'>+ * If no such, returns &gt;= @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_nth_bit(const unsigned long *addr, unsigned long size, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	if (n &gt;= size)</div><div class='hunk'>@@ -247,7 +253,7 @@ unsigned long find_nth_bit(const unsigned long *addr, unsigned long size, unsign</div><div class='ctx'>  * Returns the bit number of the N'th set bit.</div><div class='ctx'>  * If no such, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_nth_and_bit(const unsigned long *addr1, const unsigned long *addr2,</div><div class='ctx'> 				unsigned long size, unsigned long n)</div><div class='ctx'> {</div><div class='hunk'>@@ -264,33 +270,6 @@ unsigned long find_nth_and_bit(const unsigned long *addr1, const unsigned long *</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * find_nth_andnot_bit - find N'th set bit in 2 memory regions,</div><div class='del'>- *			 flipping bits in 2nd region</div><div class='del'>- * @addr1: The 1st address to start the search at</div><div class='del'>- * @addr2: The 2nd address to start the search at</div><div class='del'>- * @size: The maximum number of bits to search</div><div class='del'>- * @n: The number of set bit, which position is needed, counting from 0</div><div class='del'>- *</div><div class='del'>- * Returns the bit number of the N'th set bit.</div><div class='del'>- * If no such, returns @size.</div><div class='del'>- */</div><div class='del'>-static inline</div><div class='del'>-unsigned long find_nth_andnot_bit(const unsigned long *addr1, const unsigned long *addr2,</div><div class='del'>-				unsigned long size, unsigned long n)</div><div class='del'>-{</div><div class='del'>-	if (n &gt;= size)</div><div class='del'>-		return size;</div><div class='del'>-</div><div class='del'>-	if (small_const_nbits(size)) {</div><div class='del'>-		unsigned long val =  *addr1 &amp; (~*addr2) &amp; GENMASK(size - 1, 0);</div><div class='del'>-</div><div class='del'>-		return val ? fns(val, n) : size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return __find_nth_andnot_bit(addr1, addr2, size, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * find_nth_and_andnot_bit - find N'th set bit in 2 memory regions,</div><div class='ctx'>  *			     excluding those set in 3rd region</div><div class='ctx'>  * @addr1: The 1st address to start the search at</div><div class='hunk'>@@ -330,7 +309,7 @@ unsigned long find_nth_and_andnot_bit(const unsigned long *addr1,</div><div class='ctx'>  * Returns the bit number for the next set bit</div><div class='ctx'>  * If no bits are set, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_first_and_bit(const unsigned long *addr1,</div><div class='ctx'> 				 const unsigned long *addr2,</div><div class='ctx'> 				 unsigned long size)</div><div class='hunk'>@@ -345,6 +324,54 @@ unsigned long find_first_and_bit(const unsigned long *addr1,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * find_first_andnot_bit - find the first bit set in 1st memory region and unset in 2nd</div><div class='add'>+ * @addr1: The first address to base the search on</div><div class='add'>+ * @addr2: The second address to base the search on</div><div class='add'>+ * @size: The bitmap size in bits</div><div class='add'>+ *</div><div class='add'>+ * Returns the bit number for the first set bit</div><div class='add'>+ * If no bits are set, returns &gt;= @size.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned long find_first_andnot_bit(const unsigned long *addr1,</div><div class='add'>+				 const unsigned long *addr2,</div><div class='add'>+				 unsigned long size)</div><div class='add'>+{</div><div class='add'>+	if (small_const_nbits(size)) {</div><div class='add'>+		unsigned long val = *addr1 &amp; (~*addr2) &amp; GENMASK(size - 1, 0);</div><div class='add'>+</div><div class='add'>+		return val ? __ffs(val) : size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return _find_first_andnot_bit(addr1, addr2, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * find_first_and_and_bit - find the first set bit in 3 memory regions</div><div class='add'>+ * @addr1: The first address to base the search on</div><div class='add'>+ * @addr2: The second address to base the search on</div><div class='add'>+ * @addr3: The third address to base the search on</div><div class='add'>+ * @size: The bitmap size in bits</div><div class='add'>+ *</div><div class='add'>+ * Returns the bit number for the first set bit</div><div class='add'>+ * If no bits are set, returns @size.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned long find_first_and_and_bit(const unsigned long *addr1,</div><div class='add'>+				     const unsigned long *addr2,</div><div class='add'>+				     const unsigned long *addr3,</div><div class='add'>+				     unsigned long size)</div><div class='add'>+{</div><div class='add'>+	if (small_const_nbits(size)) {</div><div class='add'>+		unsigned long val = *addr1 &amp; *addr2 &amp; *addr3 &amp; GENMASK(size - 1, 0);</div><div class='add'>+</div><div class='add'>+		return val ? __ffs(val) : size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return _find_first_and_and_bit(addr1, addr2, addr3, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef find_first_zero_bit</div><div class='ctx'> /**</div><div class='ctx'>  * find_first_zero_bit - find the first cleared bit in a memory region</div><div class='hunk'>@@ -354,7 +381,7 @@ unsigned long find_first_and_bit(const unsigned long *addr1,</div><div class='ctx'>  * Returns the bit number of the first cleared bit.</div><div class='ctx'>  * If no bits are zero, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(size)) {</div><div class='hunk'>@@ -375,7 +402,7 @@ unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the bit number of the last set bit, or size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_last_bit(const unsigned long *addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(size)) {</div><div class='hunk'>@@ -398,14 +425,14 @@ unsigned long find_last_bit(const unsigned long *addr, unsigned long size)</div><div class='ctx'>  * Returns the bit number for the next set bit, or first set bit up to @offset</div><div class='ctx'>  * If no bits are set, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_and_bit_wrap(const unsigned long *addr1,</div><div class='ctx'> 					const unsigned long *addr2,</div><div class='ctx'> 					unsigned long size, unsigned long offset)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bit = find_next_and_bit(addr1, addr2, size, offset);</div><div class='ctx'> </div><div class='del'>-	if (bit &lt; size)</div><div class='add'>+	if (bit &lt; size || offset == 0)</div><div class='ctx'> 		return bit;</div><div class='ctx'> </div><div class='ctx'> 	bit = find_first_and_bit(addr1, addr2, offset);</div><div class='hunk'>@@ -413,21 +440,21 @@ unsigned long find_next_and_bit_wrap(const unsigned long *addr1,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * find_next_bit_wrap - find the next set bit in both memory regions</div><div class='del'>- * @addr: The first address to base the search on</div><div class='add'>+ * find_next_bit_wrap - find the next set bit in a memory region</div><div class='add'>+ * @addr: The address to base the search on</div><div class='ctx'>  * @size: The bitmap size in bits</div><div class='ctx'>  * @offset: The bitnumber to start searching at</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the bit number for the next set bit, or first set bit up to @offset</div><div class='ctx'>  * If no bits are set, returns @size.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_bit_wrap(const unsigned long *addr,</div><div class='ctx'> 					unsigned long size, unsigned long offset)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long bit = find_next_bit(addr, size, offset);</div><div class='ctx'> </div><div class='del'>-	if (bit &lt; size)</div><div class='add'>+	if (bit &lt; size || offset == 0)</div><div class='ctx'> 		return bit;</div><div class='ctx'> </div><div class='ctx'> 	bit = find_first_bit(addr, offset);</div><div class='hunk'>@@ -438,7 +465,7 @@ unsigned long find_next_bit_wrap(const unsigned long *addr,</div><div class='ctx'>  * Helper for for_each_set_bit_wrap(). Make sure you're doing right thing</div><div class='ctx'>  * before using it alone.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long __for_each_wrap(const unsigned long *bitmap, unsigned long size,</div><div class='ctx'> 				 unsigned long start, unsigned long n)</div><div class='ctx'> {</div><div class='hunk'>@@ -479,20 +506,20 @@ extern unsigned long find_next_clump8(unsigned long *clump,</div><div class='ctx'> </div><div class='ctx'> #if defined(__LITTLE_ENDIAN)</div><div class='ctx'> </div><div class='del'>-static inline unsigned long find_next_zero_bit_le(const void *addr,</div><div class='del'>-		unsigned long size, unsigned long offset)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset)</div><div class='ctx'> {</div><div class='ctx'> 	return find_next_zero_bit(addr, size, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long find_next_bit_le(const void *addr,</div><div class='del'>-		unsigned long size, unsigned long offset)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned long find_next_bit_le(const void *addr, unsigned long size, unsigned long offset)</div><div class='ctx'> {</div><div class='ctx'> 	return find_next_bit(addr, size, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long find_first_zero_bit_le(const void *addr,</div><div class='del'>-		unsigned long size)</div><div class='add'>+static __always_inline</div><div class='add'>+unsigned long find_first_zero_bit_le(const void *addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	return find_first_zero_bit(addr, size);</div><div class='ctx'> }</div><div class='hunk'>@@ -500,7 +527,7 @@ static inline unsigned long find_first_zero_bit_le(const void *addr,</div><div class='ctx'> #elif defined(__BIG_ENDIAN)</div><div class='ctx'> </div><div class='ctx'> #ifndef find_next_zero_bit_le</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_zero_bit_le(const void *addr, unsigned</div><div class='ctx'> 		long size, unsigned long offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -519,7 +546,7 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef find_first_zero_bit_le</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_first_zero_bit_le(const void *addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	if (small_const_nbits(size)) {</div><div class='hunk'>@@ -533,7 +560,7 @@ unsigned long find_first_zero_bit_le(const void *addr, unsigned long size)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef find_next_bit_le</div><div class='del'>-static inline</div><div class='add'>+static __always_inline</div><div class='ctx'> unsigned long find_next_bit_le(const void *addr, unsigned</div><div class='ctx'> 		long size, unsigned long offset)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/firewire.h b/include/linux/firewire.h<br/>index dd9f2d765e68..6143b7d28eac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firewire.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firewire.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firewire.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firewire.h</a></div><div class='hunk'>@@ -88,23 +88,30 @@ struct fw_card {</div><div class='ctx'> </div><div class='ctx'> 	int node_id;</div><div class='ctx'> 	int generation;</div><div class='del'>-	int current_tlabel;</div><div class='del'>-	u64 tlabel_mask;</div><div class='del'>-	struct list_head transaction_list;</div><div class='ctx'> 	u64 reset_jiffies;</div><div class='ctx'> </div><div class='del'>-	u32 split_timeout_hi;</div><div class='del'>-	u32 split_timeout_lo;</div><div class='del'>-	unsigned int split_timeout_cycles;</div><div class='del'>-	unsigned int split_timeout_jiffies;</div><div class='add'>+	struct {</div><div class='add'>+		int current_tlabel;</div><div class='add'>+		u64 tlabel_mask;</div><div class='add'>+		struct list_head list;</div><div class='add'>+		spinlock_t lock;</div><div class='add'>+	} transactions;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 hi;</div><div class='add'>+		u32 lo;</div><div class='add'>+		unsigned int cycles;</div><div class='add'>+		unsigned int jiffies;</div><div class='add'>+		spinlock_t lock;</div><div class='add'>+	} split_timeout;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long long guid;</div><div class='ctx'> 	unsigned max_receive;</div><div class='ctx'> 	int link_speed;</div><div class='ctx'> 	int config_rom_generation;</div><div class='ctx'> </div><div class='del'>-	spinlock_t lock; /* Take this lock when handling the lists in</div><div class='del'>-			  * this struct. */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='ctx'> 	struct fw_node *local_node;</div><div class='ctx'> 	struct fw_node *root_node;</div><div class='ctx'> 	struct fw_node *irm_node;</div><div class='hunk'>@@ -115,8 +122,6 @@ struct fw_card {</div><div class='ctx'> 	int index;</div><div class='ctx'> 	struct list_head link;</div><div class='ctx'> </div><div class='del'>-	struct list_head phy_receiver_list;</div><div class='del'>-</div><div class='ctx'> 	struct delayed_work br_work; /* bus reset job */</div><div class='ctx'> 	bool br_short;</div><div class='ctx'> </div><div class='hunk'>@@ -131,9 +136,16 @@ struct fw_card {</div><div class='ctx'> </div><div class='ctx'> 	bool broadcast_channel_allocated;</div><div class='ctx'> 	u32 broadcast_channel;</div><div class='del'>-	__be32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		__be32 buffer[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4];</div><div class='add'>+		spinlock_t lock;</div><div class='add'>+	} topology_map;</div><div class='ctx'> </div><div class='ctx'> 	__be32 maint_utility_register;</div><div class='add'>+</div><div class='add'>+	struct workqueue_struct *isoc_wq;</div><div class='add'>+	struct workqueue_struct *async_wq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct fw_card *fw_card_get(struct fw_card *card)</div><div class='hunk'>@@ -158,6 +170,20 @@ struct fw_attribute_group {</div><div class='ctx'> 	struct attribute *attrs[13];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum fw_device_quirk {</div><div class='add'>+	// See afa1282a35d3 ("firewire: core: check for 1394a compliant IRM, fix inaccessibility of Sony camcorder").</div><div class='add'>+	FW_DEVICE_QUIRK_IRM_IS_1394_1995_ONLY = BIT(0),</div><div class='add'>+</div><div class='add'>+	// See a509e43ff338 ("firewire: core: fix unstable I/O with Canon camcorder").</div><div class='add'>+	FW_DEVICE_QUIRK_IRM_IGNORES_BUS_MANAGER = BIT(1),</div><div class='add'>+</div><div class='add'>+	// MOTU Audio Express transfers acknowledge packet with 0x10 for pending state.</div><div class='add'>+	FW_DEVICE_QUIRK_ACK_PACKET_WITH_INVALID_PENDING_CODE = BIT(2),</div><div class='add'>+</div><div class='add'>+	// TASCAM FW-1082/FW-1804/FW-1884 often freezes when receiving S400 packets.</div><div class='add'>+	FW_DEVICE_QUIRK_UNSTABLE_AT_S400 = BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum fw_device_state {</div><div class='ctx'> 	FW_DEVICE_INITIALIZING,</div><div class='ctx'> 	FW_DEVICE_RUNNING,</div><div class='hunk'>@@ -191,6 +217,9 @@ struct fw_device {</div><div class='ctx'> 	struct fw_card *card;</div><div class='ctx'> 	struct device device;</div><div class='ctx'> </div><div class='add'>+	// A set of enum fw_device_quirk.</div><div class='add'>+	int quirks;</div><div class='add'>+</div><div class='ctx'> 	struct mutex client_list_mutex;</div><div class='ctx'> 	struct list_head client_list;</div><div class='ctx'> </div><div class='hunk'>@@ -305,8 +334,7 @@ struct fw_packet {</div><div class='ctx'> 	 * For successful transmission, the status code is the ack received</div><div class='ctx'> 	 * from the destination.  Otherwise it is one of the juju-specific</div><div class='ctx'> 	 * rcodes:  RCODE_SEND_ERROR, _CANCELLED, _BUSY, _GENERATION, _NO_ACK.</div><div class='del'>-	 * The callback can be called from tasklet context and thus</div><div class='del'>-	 * must never block.</div><div class='add'>+	 * The callback can be called from workqueue and thus must never block.</div><div class='ctx'> 	 */</div><div class='ctx'> 	fw_packet_callback_t callback;</div><div class='ctx'> 	int ack;</div><div class='hunk'>@@ -339,7 +367,11 @@ struct fw_address_handler {</div><div class='ctx'> 	u64 length;</div><div class='ctx'> 	fw_address_callback_t address_callback;</div><div class='ctx'> 	void *callback_data;</div><div class='add'>+</div><div class='add'>+	// Only for core functions.</div><div class='ctx'> 	struct list_head link;</div><div class='add'>+	struct kref kref;</div><div class='add'>+	struct completion done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct fw_address_region {</div><div class='hunk'>@@ -379,6 +411,10 @@ void __fw_send_request(struct fw_card *card, struct fw_transaction *t, int tcode</div><div class='ctx'>  *</div><div class='ctx'>  * A variation of __fw_send_request() to generate callback for response subaction without time</div><div class='ctx'>  * stamp.</div><div class='add'>+ *</div><div class='add'>+ * The callback is invoked in the workqueue context in most cases. However, if an error is detected</div><div class='add'>+ * before queueing or the destination address refers to the local node, it is invoked in the</div><div class='add'>+ * current context instead.</div><div class='ctx'>  */</div><div class='ctx'> static inline void fw_send_request(struct fw_card *card, struct fw_transaction *t, int tcode,</div><div class='ctx'> 				   int destination_id, int generation, int speed,</div><div class='hunk'>@@ -408,6 +444,10 @@ static inline void fw_send_request(struct fw_card *card, struct fw_transaction *</div><div class='ctx'>  * @callback_data:	data to be passed to the transaction completion callback</div><div class='ctx'>  *</div><div class='ctx'>  * A variation of __fw_send_request() to generate callback for response subaction with time stamp.</div><div class='add'>+ *</div><div class='add'>+ * The callback is invoked in the workqueue context in most cases. However, if an error is detected</div><div class='add'>+ * before queueing or the destination address refers to the local node, it is invoked in the current</div><div class='add'>+ * context instead.</div><div class='ctx'>  */</div><div class='ctx'> static inline void fw_send_request_with_tstamp(struct fw_card *card, struct fw_transaction *t,</div><div class='ctx'> 	int tcode, int destination_id, int generation, int speed, unsigned long long offset,</div><div class='hunk'>@@ -462,7 +502,7 @@ struct fw_iso_packet {</div><div class='ctx'> 				/* rx: Sync bit, wait for matching sy	*/</div><div class='ctx'> 	u32 tag:2;		/* tx: Tag in packet header		*/</div><div class='ctx'> 	u32 sy:4;		/* tx: Sy in packet header		*/</div><div class='del'>-	u32 header_length:8;	/* Length of immediate header		*/</div><div class='add'>+	u32 header_length:8;	/* Size of immediate header		*/</div><div class='ctx'> 	u32 header[];		/* tx: Top of 1394 isoch. data_block	*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -509,6 +549,7 @@ union fw_iso_callback {</div><div class='ctx'> </div><div class='ctx'> struct fw_iso_context {</div><div class='ctx'> 	struct fw_card *card;</div><div class='add'>+	struct work_struct work;</div><div class='ctx'> 	int type;</div><div class='ctx'> 	int channel;</div><div class='ctx'> 	int speed;</div><div class='hunk'>@@ -528,6 +569,25 @@ int fw_iso_context_queue(struct fw_iso_context *ctx,</div><div class='ctx'> 			 unsigned long payload);</div><div class='ctx'> void fw_iso_context_queue_flush(struct fw_iso_context *ctx);</div><div class='ctx'> int fw_iso_context_flush_completions(struct fw_iso_context *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fw_iso_context_schedule_flush_completions() - schedule work item to process isochronous context.</div><div class='add'>+ * @ctx: the isochronous context</div><div class='add'>+ *</div><div class='add'>+ * Schedule a work item on workqueue to process the isochronous context. The registered callback</div><div class='add'>+ * function is called by the worker when a queued packet buffer with the interrupt flag is</div><div class='add'>+ * completed, either after transmission in the IT context or after being filled in the IR context.</div><div class='add'>+ * The callback function is also called when the header buffer in the context becomes full, If it</div><div class='add'>+ * is required to process the context in the current context, fw_iso_context_flush_completions() is</div><div class='add'>+ * available instead.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ */</div><div class='add'>+static inline void fw_iso_context_schedule_flush_completions(struct fw_iso_context *ctx)</div><div class='add'>+{</div><div class='add'>+	queue_work(ctx-&gt;card-&gt;isoc_wq, &amp;ctx-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int fw_iso_context_start(struct fw_iso_context *ctx,</div><div class='ctx'> 			 int cycle, int sync, int tags);</div><div class='ctx'> int fw_iso_context_stop(struct fw_iso_context *ctx);</div><div class='head'>diff --git a/include/linux/firmware.h b/include/linux/firmware.h<br/>index 0311858b46ce..aae1b85ffc10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define FW_ACTION_NOUEVENT 0</div><div class='hunk'>@@ -97,6 +98,10 @@ static inline bool firmware_request_builtin(struct firmware *fw,</div><div class='ctx'> #if IS_REACHABLE(CONFIG_FW_LOADER)</div><div class='ctx'> int request_firmware(const struct firmware **fw, const char *name,</div><div class='ctx'> 		     struct device *device);</div><div class='add'>+int firmware_request_nowait_nowarn(</div><div class='add'>+	struct module *module, const char *name,</div><div class='add'>+	struct device *device, gfp_t gfp, void *context,</div><div class='add'>+	void (*cont)(const struct firmware *fw, void *context));</div><div class='ctx'> int firmware_request_nowarn(const struct firmware **fw, const char *name,</div><div class='ctx'> 			    struct device *device);</div><div class='ctx'> int firmware_request_platform(const struct firmware **fw, const char *name,</div><div class='hunk'>@@ -122,6 +127,14 @@ static inline int request_firmware(const struct firmware **fw,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int firmware_request_nowait_nowarn(</div><div class='add'>+	struct module *module, const char *name,</div><div class='add'>+	struct device *device, gfp_t gfp, void *context,</div><div class='add'>+	void (*cont)(const struct firmware *fw, void *context))</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int firmware_request_nowarn(const struct firmware **fw,</div><div class='ctx'> 					  const char *name,</div><div class='ctx'> 					  struct device *device)</div><div class='hunk'>@@ -198,4 +211,6 @@ static inline void firmware_upload_unregister(struct fw_upload *fw_upload)</div><div class='ctx'> </div><div class='ctx'> int firmware_request_cache(struct device *device, const char *name);</div><div class='ctx'> </div><div class='add'>+DEFINE_FREE(firmware, struct firmware *, release_firmware(_T))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/firmware/cirrus/cs_dsp.h b/include/linux/firmware/cirrus/cs_dsp.h<br/>index 29cd11d5a3cf..0ec1cdc5585d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/cirrus/cs_dsp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/cirrus/cs_dsp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/cirrus/cs_dsp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/cirrus/cs_dsp.h</a></div><div class='hunk'>@@ -42,6 +42,16 @@</div><div class='ctx'> #define CS_DSP_ACKED_CTL_MIN_VALUE           0</div><div class='ctx'> #define CS_DSP_ACKED_CTL_MAX_VALUE           0xFFFFFF</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Write sequence operation codes</div><div class='add'>+ */</div><div class='add'>+#define CS_DSP_WSEQ_FULL	0x00</div><div class='add'>+#define CS_DSP_WSEQ_ADDR8	0x02</div><div class='add'>+#define CS_DSP_WSEQ_L16		0x04</div><div class='add'>+#define CS_DSP_WSEQ_H16		0x05</div><div class='add'>+#define CS_DSP_WSEQ_UNLOCK	0xFD</div><div class='add'>+#define CS_DSP_WSEQ_END		0xFF</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct cs_dsp_region - Describes a logical memory region in DSP address space</div><div class='ctx'>  * @type:	Memory region type</div><div class='hunk'>@@ -54,14 +64,12 @@ struct cs_dsp_region {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct cs_dsp_alg_region - Describes a logical algorithm region in DSP address space</div><div class='del'>- * @list:	List node for internal use</div><div class='ctx'>  * @alg:	Algorithm id</div><div class='ctx'>  * @ver:	Expected algorithm version</div><div class='ctx'>  * @type:	Memory region type</div><div class='ctx'>  * @base:	Address of region</div><div class='ctx'>  */</div><div class='ctx'> struct cs_dsp_alg_region {</div><div class='del'>-	struct list_head list;</div><div class='ctx'> 	unsigned int alg;</div><div class='ctx'> 	unsigned int ver;</div><div class='ctx'> 	int type;</div><div class='hunk'>@@ -94,7 +102,7 @@ struct cs_dsp_coeff_ctl {</div><div class='ctx'> 	const char *subname;</div><div class='ctx'> 	unsigned int subname_len;</div><div class='ctx'> 	unsigned int offset;</div><div class='del'>-	size_t len;</div><div class='add'>+	unsigned int len;</div><div class='ctx'> 	unsigned int type;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> 	unsigned int set:1;</div><div class='hunk'>@@ -123,7 +131,6 @@ struct cs_dsp_client_ops;</div><div class='ctx'>  * @sysclk_mask:	Mask of frequency bits within sysclk register (ADSP1 only)</div><div class='ctx'>  * @sysclk_shift:	Shift of frequency bits within sysclk register (ADSP1 only)</div><div class='ctx'>  * @alg_regions:	List of currently loaded algorithm regions</div><div class='del'>- * @fw_file_name:	Filename of the current firmware</div><div class='ctx'>  * @fw_name:		Name of the current firmware</div><div class='ctx'>  * @fw_id:		ID of the current firmware, obtained from the wmfw</div><div class='ctx'>  * @fw_id_version:	Version of the firmware, obtained from the wmfw</div><div class='hunk'>@@ -168,7 +175,7 @@ struct cs_dsp {</div><div class='ctx'> 	const struct cs_dsp_region *mem;</div><div class='ctx'> 	int num_mems;</div><div class='ctx'> </div><div class='del'>-	int fw_ver;</div><div class='add'>+	int wmfw_ver;</div><div class='ctx'> </div><div class='ctx'> 	bool booted;</div><div class='ctx'> 	bool running;</div><div class='hunk'>@@ -181,8 +188,8 @@ struct cs_dsp {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	struct dentry *debugfs_root;</div><div class='del'>-	char *wmfw_file_name;</div><div class='del'>-	char *bin_file_name;</div><div class='add'>+	const char *wmfw_file_name;</div><div class='add'>+	const char *bin_file_name;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -214,13 +221,13 @@ int cs_dsp_adsp2_init(struct cs_dsp *dsp);</div><div class='ctx'> int cs_dsp_halo_init(struct cs_dsp *dsp);</div><div class='ctx'> </div><div class='ctx'> int cs_dsp_adsp1_power_up(struct cs_dsp *dsp,</div><div class='del'>-			  const struct firmware *wmfw_firmware, char *wmfw_filename,</div><div class='del'>-			  const struct firmware *coeff_firmware, char *coeff_filename,</div><div class='add'>+			  const struct firmware *wmfw_firmware, const char *wmfw_filename,</div><div class='add'>+			  const struct firmware *coeff_firmware, const char *coeff_filename,</div><div class='ctx'> 			  const char *fw_name);</div><div class='ctx'> void cs_dsp_adsp1_power_down(struct cs_dsp *dsp);</div><div class='ctx'> int cs_dsp_power_up(struct cs_dsp *dsp,</div><div class='del'>-		    const struct firmware *wmfw_firmware, char *wmfw_filename,</div><div class='del'>-		    const struct firmware *coeff_firmware, char *coeff_filename,</div><div class='add'>+		    const struct firmware *wmfw_firmware, const char *wmfw_filename,</div><div class='add'>+		    const struct firmware *coeff_firmware, const char *coeff_filename,</div><div class='ctx'> 		    const char *fw_name);</div><div class='ctx'> void cs_dsp_power_down(struct cs_dsp *dsp);</div><div class='ctx'> int cs_dsp_run(struct cs_dsp *dsp);</div><div class='hunk'>@@ -239,8 +246,12 @@ void cs_dsp_cleanup_debugfs(struct cs_dsp *dsp);</div><div class='ctx'> int cs_dsp_coeff_write_acked_control(struct cs_dsp_coeff_ctl *ctl, unsigned int event_id);</div><div class='ctx'> int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off,</div><div class='ctx'> 			    const void *buf, size_t len);</div><div class='add'>+int cs_dsp_coeff_lock_and_write_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off,</div><div class='add'>+				     const void *buf, size_t len);</div><div class='ctx'> int cs_dsp_coeff_read_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off,</div><div class='ctx'> 			   void *buf, size_t len);</div><div class='add'>+int cs_dsp_coeff_lock_and_read_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off,</div><div class='add'>+				    void *buf, size_t len);</div><div class='ctx'> struct cs_dsp_coeff_ctl *cs_dsp_get_ctl(struct cs_dsp *dsp, const char *name, int type,</div><div class='ctx'> 					unsigned int alg);</div><div class='ctx'> </div><div class='hunk'>@@ -256,6 +267,23 @@ struct cs_dsp_alg_region *cs_dsp_find_alg_region(struct cs_dsp *dsp,</div><div class='ctx'> const char *cs_dsp_mem_region_name(unsigned int type);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct cs_dsp_wseq - Describes a write sequence</div><div class='add'>+ * @ctl:	Write sequence cs_dsp control</div><div class='add'>+ * @ops:	Operations contained within</div><div class='add'>+ */</div><div class='add'>+struct cs_dsp_wseq {</div><div class='add'>+	struct cs_dsp_coeff_ctl *ctl;</div><div class='add'>+	struct list_head ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cs_dsp_wseq_init(struct cs_dsp *dsp, struct cs_dsp_wseq *wseqs, unsigned int num_wseqs);</div><div class='add'>+int cs_dsp_wseq_write(struct cs_dsp *dsp, struct cs_dsp_wseq *wseq, u32 addr, u32 data,</div><div class='add'>+		      u8 op_code, bool update);</div><div class='add'>+int cs_dsp_wseq_multi_write(struct cs_dsp *dsp, struct cs_dsp_wseq *wseq,</div><div class='add'>+			    const struct reg_sequence *reg_seq, int num_regs,</div><div class='add'>+			    u8 op_code, bool update);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct cs_dsp_chunk - Describes a buffer holding data formatted for the DSP</div><div class='ctx'>  * @data:	Pointer to underlying buffer memory</div><div class='ctx'>  * @max:	Pointer to end of the buffer memory</div><div class='head'>diff --git a/include/linux/firmware/cirrus/cs_dsp_test_utils.h b/include/linux/firmware/cirrus/cs_dsp_test_utils.h<br/>new file mode 100644<br/>index 000000000000..1f97764fdfd7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/cirrus/cs_dsp_test_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/cirrus/cs_dsp_test_utils.h</a></div><div class='hunk'>@@ -0,0 +1,159 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Support utilities for cs_dsp testing.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Cirrus Logic, Inc. and</div><div class='add'>+ *                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/firmware/cirrus/wmfw.h&gt;</div><div class='add'>+</div><div class='add'>+struct kunit;</div><div class='add'>+struct cs_dsp_test;</div><div class='add'>+struct cs_dsp_test_local;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cs_dsp_test - base class for test utilities</div><div class='add'>+ *</div><div class='add'>+ * @test:	Pointer to struct kunit instance.</div><div class='add'>+ * @dsp:	Pointer to struct cs_dsp instance.</div><div class='add'>+ * @local:	Private data for each test suite.</div><div class='add'>+ */</div><div class='add'>+struct cs_dsp_test {</div><div class='add'>+	struct kunit *test;</div><div class='add'>+	struct cs_dsp *dsp;</div><div class='add'>+</div><div class='add'>+	struct cs_dsp_test_local *local;</div><div class='add'>+</div><div class='add'>+	/* private: Following members are private */</div><div class='add'>+	bool saw_bus_write;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cs_dsp_mock_alg_def - Info for creating a mock algorithm entry.</div><div class='add'>+ *</div><div class='add'>+ * @id:		   Algorithm ID.</div><div class='add'>+ * @ver:	   Algorithm version.</div><div class='add'>+ * @xm_base_words: XM base address in DSP words.</div><div class='add'>+ * @xm_size_words: XM size in DSP words.</div><div class='add'>+ * @ym_base_words: YM base address in DSP words.</div><div class='add'>+ * @ym_size_words: YM size in DSP words.</div><div class='add'>+ * @zm_base_words: ZM base address in DSP words.</div><div class='add'>+ * @zm_size_words: ZM size in DSP words.</div><div class='add'>+ */</div><div class='add'>+struct cs_dsp_mock_alg_def {</div><div class='add'>+	unsigned int id;</div><div class='add'>+	unsigned int ver;</div><div class='add'>+	unsigned int xm_base_words;</div><div class='add'>+	unsigned int xm_size_words;</div><div class='add'>+	unsigned int ym_base_words;</div><div class='add'>+	unsigned int ym_size_words;</div><div class='add'>+	unsigned int zm_base_words;</div><div class='add'>+	unsigned int zm_size_words;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cs_dsp_mock_coeff_def {</div><div class='add'>+	const char *shortname;</div><div class='add'>+	const char *fullname;</div><div class='add'>+	const char *description;</div><div class='add'>+	u16 type;</div><div class='add'>+	u16 flags;</div><div class='add'>+	u16 mem_type;</div><div class='add'>+	unsigned int offset_dsp_words;</div><div class='add'>+	unsigned int length_bytes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cs_dsp_mock_xm_header - XM header builder</div><div class='add'>+ *</div><div class='add'>+ * @test_priv:	     Pointer to the struct cs_dsp_test.</div><div class='add'>+ * @blob_data:	     Pointer to the created blob data.</div><div class='add'>+ * @blob_size_bytes: Size of the data at blob_data.</div><div class='add'>+ */</div><div class='add'>+struct cs_dsp_mock_xm_header {</div><div class='add'>+	struct cs_dsp_test *test_priv;</div><div class='add'>+	void *blob_data;</div><div class='add'>+	size_t blob_size_bytes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cs_dsp_mock_wmfw_builder;</div><div class='add'>+struct cs_dsp_mock_bin_builder;</div><div class='add'>+</div><div class='add'>+extern const unsigned int cs_dsp_mock_adsp2_32bit_sysbase;</div><div class='add'>+extern const unsigned int cs_dsp_mock_adsp2_16bit_sysbase;</div><div class='add'>+extern const unsigned int cs_dsp_mock_halo_core_base;</div><div class='add'>+extern const unsigned int cs_dsp_mock_halo_sysinfo_base;</div><div class='add'>+</div><div class='add'>+extern const struct cs_dsp_region cs_dsp_mock_halo_dsp1_regions[];</div><div class='add'>+extern const unsigned int cs_dsp_mock_halo_dsp1_region_sizes[];</div><div class='add'>+extern const struct cs_dsp_region cs_dsp_mock_adsp2_32bit_dsp1_regions[];</div><div class='add'>+extern const unsigned int cs_dsp_mock_adsp2_32bit_dsp1_region_sizes[];</div><div class='add'>+extern const struct cs_dsp_region cs_dsp_mock_adsp2_16bit_dsp1_regions[];</div><div class='add'>+extern const unsigned int cs_dsp_mock_adsp2_16bit_dsp1_region_sizes[];</div><div class='add'>+int cs_dsp_mock_count_regions(const unsigned int *region_sizes);</div><div class='add'>+unsigned int cs_dsp_mock_size_of_region(const struct cs_dsp *dsp, int mem_type);</div><div class='add'>+unsigned int cs_dsp_mock_base_addr_for_mem(struct cs_dsp_test *priv, int mem_type);</div><div class='add'>+unsigned int cs_dsp_mock_reg_addr_inc_per_unpacked_word(struct cs_dsp_test *priv);</div><div class='add'>+unsigned int cs_dsp_mock_reg_block_length_bytes(struct cs_dsp_test *priv, int mem_type);</div><div class='add'>+unsigned int cs_dsp_mock_reg_block_length_registers(struct cs_dsp_test *priv, int mem_type);</div><div class='add'>+unsigned int cs_dsp_mock_reg_block_length_dsp_words(struct cs_dsp_test *priv, int mem_type);</div><div class='add'>+bool cs_dsp_mock_has_zm(struct cs_dsp_test *priv);</div><div class='add'>+int cs_dsp_mock_packed_to_unpacked_mem_type(int packed_mem_type);</div><div class='add'>+unsigned int cs_dsp_mock_num_dsp_words_to_num_packed_regs(unsigned int num_dsp_words);</div><div class='add'>+unsigned int cs_dsp_mock_xm_header_get_alg_base_in_words(struct cs_dsp_test *priv,</div><div class='add'>+							 unsigned int alg_id,</div><div class='add'>+							 int mem_type);</div><div class='add'>+unsigned int cs_dsp_mock_xm_header_get_fw_version(struct cs_dsp_mock_xm_header *header);</div><div class='add'>+void cs_dsp_mock_xm_header_drop_from_regmap_cache(struct cs_dsp_test *priv);</div><div class='add'>+int cs_dsp_mock_xm_header_write_to_regmap(struct cs_dsp_mock_xm_header *header);</div><div class='add'>+struct cs_dsp_mock_xm_header *cs_dsp_create_mock_xm_header(struct cs_dsp_test *priv,</div><div class='add'>+							   const struct cs_dsp_mock_alg_def *algs,</div><div class='add'>+							   size_t num_algs);</div><div class='add'>+</div><div class='add'>+int cs_dsp_mock_regmap_init(struct cs_dsp_test *priv);</div><div class='add'>+void cs_dsp_mock_regmap_drop_range(struct cs_dsp_test *priv,</div><div class='add'>+				   unsigned int first_reg, unsigned int last_reg);</div><div class='add'>+void cs_dsp_mock_regmap_drop_regs(struct cs_dsp_test *priv,</div><div class='add'>+				  unsigned int first_reg, size_t num_regs);</div><div class='add'>+void cs_dsp_mock_regmap_drop_bytes(struct cs_dsp_test *priv,</div><div class='add'>+				   unsigned int first_reg, size_t num_bytes);</div><div class='add'>+void cs_dsp_mock_regmap_drop_system_regs(struct cs_dsp_test *priv);</div><div class='add'>+bool cs_dsp_mock_regmap_is_dirty(struct cs_dsp_test *priv, bool drop_system_regs);</div><div class='add'>+</div><div class='add'>+struct cs_dsp_mock_bin_builder *cs_dsp_mock_bin_init(struct cs_dsp_test *priv,</div><div class='add'>+						     int format_version,</div><div class='add'>+						     unsigned int fw_version);</div><div class='add'>+void cs_dsp_mock_bin_add_raw_block(struct cs_dsp_mock_bin_builder *builder,</div><div class='add'>+				   unsigned int alg_id, unsigned int alg_ver,</div><div class='add'>+				   int type, unsigned int offset,</div><div class='add'>+				   const void *payload_data, size_t payload_len_bytes);</div><div class='add'>+void cs_dsp_mock_bin_add_info(struct cs_dsp_mock_bin_builder *builder,</div><div class='add'>+			      const char *info);</div><div class='add'>+void cs_dsp_mock_bin_add_name(struct cs_dsp_mock_bin_builder *builder,</div><div class='add'>+			      const char *name);</div><div class='add'>+void cs_dsp_mock_bin_add_patch(struct cs_dsp_mock_bin_builder *builder,</div><div class='add'>+			       unsigned int alg_id, unsigned int alg_ver,</div><div class='add'>+			       int mem_region, unsigned int reg_addr_offset,</div><div class='add'>+			       const void *payload_data, size_t payload_len_bytes);</div><div class='add'>+struct firmware *cs_dsp_mock_bin_get_firmware(struct cs_dsp_mock_bin_builder *builder);</div><div class='add'>+</div><div class='add'>+struct cs_dsp_mock_wmfw_builder *cs_dsp_mock_wmfw_init(struct cs_dsp_test *priv,</div><div class='add'>+						       int format_version);</div><div class='add'>+void cs_dsp_mock_wmfw_add_raw_block(struct cs_dsp_mock_wmfw_builder *builder,</div><div class='add'>+				    int mem_region, unsigned int mem_offset_dsp_words,</div><div class='add'>+				    const void *payload_data, size_t payload_len_bytes);</div><div class='add'>+void cs_dsp_mock_wmfw_add_info(struct cs_dsp_mock_wmfw_builder *builder,</div><div class='add'>+			       const char *info);</div><div class='add'>+void cs_dsp_mock_wmfw_add_data_block(struct cs_dsp_mock_wmfw_builder *builder,</div><div class='add'>+				     int mem_region, unsigned int mem_offset_dsp_words,</div><div class='add'>+				     const void *payload_data, size_t payload_len_bytes);</div><div class='add'>+void cs_dsp_mock_wmfw_start_alg_info_block(struct cs_dsp_mock_wmfw_builder *builder,</div><div class='add'>+					   unsigned int alg_id,</div><div class='add'>+					   const char *name,</div><div class='add'>+					   const char *description);</div><div class='add'>+void cs_dsp_mock_wmfw_add_coeff_desc(struct cs_dsp_mock_wmfw_builder *builder,</div><div class='add'>+				     const struct cs_dsp_mock_coeff_def *def);</div><div class='add'>+void cs_dsp_mock_wmfw_end_alg_info_block(struct cs_dsp_mock_wmfw_builder *builder);</div><div class='add'>+struct firmware *cs_dsp_mock_wmfw_get_firmware(struct cs_dsp_mock_wmfw_builder *builder);</div><div class='add'>+int cs_dsp_mock_wmfw_format_version(struct cs_dsp_mock_wmfw_builder *builder);</div><div class='head'>diff --git a/include/linux/firmware/imx/sm.h b/include/linux/firmware/imx/sm.h<br/>new file mode 100644<br/>index 000000000000..a33b45027356<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/imx/sm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/imx/sm.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2024 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _SCMI_IMX_H</div><div class='add'>+#define _SCMI_IMX_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/scmi_imx_protocol.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define SCMI_IMX95_CTRL_PDM_CLK_SEL	0	/* AON PDM clock sel */</div><div class='add'>+#define SCMI_IMX95_CTRL_MQS1_SETTINGS	1	/* AON MQS settings */</div><div class='add'>+#define SCMI_IMX95_CTRL_SAI1_MCLK	2	/* AON SAI1 MCLK */</div><div class='add'>+#define SCMI_IMX95_CTRL_SAI3_MCLK	3	/* WAKE SAI3 MCLK */</div><div class='add'>+#define SCMI_IMX95_CTRL_SAI4_MCLK	4	/* WAKE SAI4 MCLK */</div><div class='add'>+#define SCMI_IMX95_CTRL_SAI5_MCLK	5	/* WAKE SAI5 MCLK */</div><div class='add'>+</div><div class='add'>+#define SCMI_IMX94_CTRL_PDM_CLK_SEL	0U	/*!&lt; AON PDM clock sel */</div><div class='add'>+#define SCMI_IMX94_CTRL_MQS1_SETTINGS	1U	/*!&lt; AON MQS settings */</div><div class='add'>+#define SCMI_IMX94_CTRL_MQS2_SETTINGS	2U	/*!&lt; WAKE MQS settings */</div><div class='add'>+#define SCMI_IMX94_CTRL_SAI1_MCLK	3U	/*!&lt; AON SAI1 MCLK */</div><div class='add'>+#define SCMI_IMX94_CTRL_SAI2_MCLK	4U	/*!&lt; WAKE SAI2 MCLK */</div><div class='add'>+#define SCMI_IMX94_CTRL_SAI3_MCLK	5U	/*!&lt; WAKE SAI3 MCLK */</div><div class='add'>+#define SCMI_IMX94_CTRL_SAI4_MCLK	6U	/*!&lt; WAKE SAI4 MCLK */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IMX_SCMI_MISC_DRV)</div><div class='add'>+int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val);</div><div class='add'>+int scmi_imx_misc_ctrl_set(u32 id, u32 val);</div><div class='add'>+#else</div><div class='add'>+static inline int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int scmi_imx_misc_ctrl_set(u32 id, u32 val)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IMX_SCMI_CPU_DRV)</div><div class='add'>+int scmi_imx_cpu_start(u32 cpuid, bool start);</div><div class='add'>+int scmi_imx_cpu_started(u32 cpuid, bool *started);</div><div class='add'>+int scmi_imx_cpu_reset_vector_set(u32 cpuid, u64 vector, bool start, bool boot,</div><div class='add'>+				  bool resume);</div><div class='add'>+#else</div><div class='add'>+static inline int scmi_imx_cpu_start(u32 cpuid, bool start)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int scmi_imx_cpu_started(u32 cpuid, bool *started)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int scmi_imx_cpu_reset_vector_set(u32 cpuid, u64 vector, bool start,</div><div class='add'>+						bool boot, bool resume)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+enum scmi_imx_lmm_op {</div><div class='add'>+	SCMI_IMX_LMM_BOOT,</div><div class='add'>+	SCMI_IMX_LMM_POWER_ON,</div><div class='add'>+	SCMI_IMX_LMM_SHUTDOWN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For shutdown pperation */</div><div class='add'>+#define SCMI_IMX_LMM_OP_FORCEFUL	0</div><div class='add'>+#define SCMI_IMX_LMM_OP_GRACEFUL	BIT(0)</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IMX_SCMI_LMM_DRV)</div><div class='add'>+int scmi_imx_lmm_operation(u32 lmid, enum scmi_imx_lmm_op op, u32 flags);</div><div class='add'>+int scmi_imx_lmm_info(u32 lmid, struct scmi_imx_lmm_info *info);</div><div class='add'>+int scmi_imx_lmm_reset_vector_set(u32 lmid, u32 cpuid, u32 flags, u64 vector);</div><div class='add'>+#else</div><div class='add'>+static inline int scmi_imx_lmm_operation(u32 lmid, enum scmi_imx_lmm_op op, u32 flags)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int scmi_imx_lmm_info(u32 lmid, struct scmi_imx_lmm_info *info)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int scmi_imx_lmm_reset_vector_set(u32 lmid, u32 cpuid, u32 flags, u64 vector)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/firmware/intel/stratix10-smc.h b/include/linux/firmware/intel/stratix10-smc.h<br/>index ee80ca4bb0d0..935dba3633b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/intel/stratix10-smc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/intel/stratix10-smc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/intel/stratix10-smc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/intel/stratix10-smc.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017-2018, Intel Corporation</div><div class='add'>+ * Copyright (C) 2025, Altera Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __STRATIX10_SMC_H</div><div class='hunk'>@@ -47,6 +48,10 @@</div><div class='ctx'> 	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_64, \</div><div class='ctx'> 	ARM_SMCCC_OWNER_SIP, (func_num))</div><div class='ctx'> </div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_VAL(func_name)	\</div><div class='add'>+	ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL, ARM_SMCCC_SMC_64, \</div><div class='add'>+	ARM_SMCCC_OWNER_SIP, (func_name))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Return values in INTEL_SIP_SMC_* call</div><div class='ctx'>  *</div><div class='hunk'>@@ -620,4 +625,110 @@ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE)</div><div class='ctx'> #define INTEL_SIP_SMC_FCS_GET_PROVISION_DATA \</div><div class='ctx'> 	INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FCS_GET_PROVISION_DATA)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * Request INTEL_SIP_SMC_HWMON_READTEMP</div><div class='add'>+ * Sync call to request temperature</div><div class='add'>+ *</div><div class='add'>+ * Call register usage:</div><div class='add'>+ * a0 Temperature Channel</div><div class='add'>+ * a1-a7 not used</div><div class='add'>+ *</div><div class='add'>+ * Return status</div><div class='add'>+ * a0 INTEL_SIP_SMC_STATUS_OK</div><div class='add'>+ * a1 Temperature Value</div><div class='add'>+ * a2-a3 not used</div><div class='add'>+ */</div><div class='add'>+#define INTEL_SIP_SMC_FUNCID_HWMON_READTEMP 32</div><div class='add'>+#define INTEL_SIP_SMC_HWMON_READTEMP \</div><div class='add'>+	INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_HWMON_READTEMP)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Request INTEL_SIP_SMC_HWMON_READVOLT</div><div class='add'>+ * Sync call to request voltage</div><div class='add'>+ *</div><div class='add'>+ * Call register usage:</div><div class='add'>+ * a0 Voltage Channel</div><div class='add'>+ * a1-a7 not used</div><div class='add'>+ *</div><div class='add'>+ * Return status</div><div class='add'>+ * a0 INTEL_SIP_SMC_STATUS_OK</div><div class='add'>+ * a1 Voltage Value</div><div class='add'>+ * a2-a3 not used</div><div class='add'>+ */</div><div class='add'>+#define INTEL_SIP_SMC_FUNCID_HWMON_READVOLT 33</div><div class='add'>+#define INTEL_SIP_SMC_HWMON_READVOLT \</div><div class='add'>+	INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_HWMON_READVOLT)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Request INTEL_SIP_SMC_ASYNC_POLL</div><div class='add'>+ * Async call used by service driver at EL1 to query mailbox response from SDM.</div><div class='add'>+ *</div><div class='add'>+ * Call register usage:</div><div class='add'>+ * a0 INTEL_SIP_SMC_ASYNC_POLL</div><div class='add'>+ * a1 transaction job id</div><div class='add'>+ * a2-17 will be used to return the response data</div><div class='add'>+ *</div><div class='add'>+ * Return status</div><div class='add'>+ * a0 INTEL_SIP_SMC_STATUS_OK</div><div class='add'>+ * a1-17 will contain the response values from mailbox for the previous send</div><div class='add'>+ * transaction</div><div class='add'>+ * Or</div><div class='add'>+ * a0 INTEL_SIP_SMC_STATUS_NO_RESPONSE</div><div class='add'>+ * a1-17 not used</div><div class='add'>+ */</div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_FUNC_ID_POLL (0xC8)</div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_POLL \</div><div class='add'>+	INTEL_SIP_SMC_ASYNC_VAL(INTEL_SIP_SMC_ASYNC_FUNC_ID_POLL)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Request INTEL_SIP_SMC_ASYNC_RSU_GET_SPT</div><div class='add'>+ * Async call to get RSU SPT from SDM.</div><div class='add'>+ * Call register usage:</div><div class='add'>+ * a0 INTEL_SIP_SMC_ASYNC_RSU_GET_SPT</div><div class='add'>+ * a1 transaction job id</div><div class='add'>+ * a2-a17 not used</div><div class='add'>+ *</div><div class='add'>+ * Return status:</div><div class='add'>+ * a0 INTEL_SIP_SMC_STATUS_OK ,INTEL_SIP_SMC_STATUS_REJECTED</div><div class='add'>+ * or INTEL_SIP_SMC_STATUS_BUSY</div><div class='add'>+ * a1-a17 not used</div><div class='add'>+ */</div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_FUNC_ID_RSU_GET_SPT (0xEA)</div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_RSU_GET_SPT \</div><div class='add'>+	INTEL_SIP_SMC_ASYNC_VAL(INTEL_SIP_SMC_ASYNC_FUNC_ID_RSU_GET_SPT)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Request INTEL_SIP_SMC_ASYNC_RSU_GET_ERROR_STATUS</div><div class='add'>+ * Async call to get RSU error status from SDM.</div><div class='add'>+ * Call register usage:</div><div class='add'>+ * a0 INTEL_SIP_SMC_ASYNC_RSU_GET_ERROR_STATUS</div><div class='add'>+ * a1 transaction job id</div><div class='add'>+ * a2-a17 not used</div><div class='add'>+ *</div><div class='add'>+ * Return status:</div><div class='add'>+ * a0 INTEL_SIP_SMC_STATUS_OK ,INTEL_SIP_SMC_STATUS_REJECTED</div><div class='add'>+ * or INTEL_SIP_SMC_STATUS_BUSY</div><div class='add'>+ * a1-a17 not used</div><div class='add'>+ */</div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_FUNC_ID_RSU_GET_ERROR_STATUS (0xEB)</div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_RSU_GET_ERROR_STATUS \</div><div class='add'>+	INTEL_SIP_SMC_ASYNC_VAL(INTEL_SIP_SMC_ASYNC_FUNC_ID_RSU_GET_ERROR_STATUS)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Request INTEL_SIP_SMC_ASYNC_RSU_NOTIFY</div><div class='add'>+ * Async call to send NOTIFY value to SDM.</div><div class='add'>+ * Call register usage:</div><div class='add'>+ * a0 INTEL_SIP_SMC_ASYNC_RSU_NOTIFY</div><div class='add'>+ * a1 transaction job id</div><div class='add'>+ * a2 notify value</div><div class='add'>+ * a3-a17 not used</div><div class='add'>+ *</div><div class='add'>+ * Return status:</div><div class='add'>+ * a0 INTEL_SIP_SMC_STATUS_OK ,INTEL_SIP_SMC_STATUS_REJECTED</div><div class='add'>+ * or INTEL_SIP_SMC_STATUS_BUSY</div><div class='add'>+ * a1-a17 not used</div><div class='add'>+ */</div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_FUNC_ID_RSU_NOTIFY (0xEC)</div><div class='add'>+#define INTEL_SIP_SMC_ASYNC_RSU_NOTIFY \</div><div class='add'>+	INTEL_SIP_SMC_ASYNC_VAL(INTEL_SIP_SMC_ASYNC_FUNC_ID_RSU_NOTIFY)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/firmware/intel/stratix10-svc-client.h b/include/linux/firmware/intel/stratix10-svc-client.h<br/>index 60ed82112680..d290060f4c73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/intel/stratix10-svc-client.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/intel/stratix10-svc-client.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/intel/stratix10-svc-client.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/intel/stratix10-svc-client.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2017-2018, Intel Corporation</div><div class='add'>+ * Copyright (C) 2025, Altera Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __STRATIX10_SVC_CLIENT_H</div><div class='hunk'>@@ -11,10 +12,12 @@</div><div class='ctx'>  *</div><div class='ctx'>  * fpga: for FPGA configuration</div><div class='ctx'>  * rsu: for remote status update</div><div class='add'>+ * hwmon: for hardware monitoring (voltage and temperature)</div><div class='ctx'>  */</div><div class='ctx'> #define SVC_CLIENT_FPGA			"fpga"</div><div class='ctx'> #define SVC_CLIENT_RSU			"rsu"</div><div class='ctx'> #define SVC_CLIENT_FCS			"fcs"</div><div class='add'>+#define SVC_CLIENT_HWMON		"hwmon"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Status of the sent command, in bit number</div><div class='hunk'>@@ -70,6 +73,7 @@</div><div class='ctx'> #define SVC_RSU_REQUEST_TIMEOUT_MS              300</div><div class='ctx'> #define SVC_FCS_REQUEST_TIMEOUT_MS		2000</div><div class='ctx'> #define SVC_COMPLETED_TIMEOUT_MS		30000</div><div class='add'>+#define SVC_HWMON_REQUEST_TIMEOUT_MS		300</div><div class='ctx'> </div><div class='ctx'> struct stratix10_svc_chan;</div><div class='ctx'> </div><div class='hunk'>@@ -124,6 +128,9 @@ struct stratix10_svc_chan;</div><div class='ctx'>  * @COMMAND_RSU_DCMF_STATUS: query firmware for the DCMF status</div><div class='ctx'>  * return status is SVC_STATUS_OK or SVC_STATUS_ERROR</div><div class='ctx'>  *</div><div class='add'>+ * @COMMAND_RSU_GET_SPT_TABLE: query firmware for SPT table</div><div class='add'>+ * return status is SVC_STATUS_OK or SVC_STATUS_ERROR</div><div class='add'>+ *</div><div class='ctx'>  * @COMMAND_FCS_REQUEST_SERVICE: request validation of image from firmware,</div><div class='ctx'>  * return status is SVC_STATUS_OK, SVC_STATUS_INVALID_PARAM</div><div class='ctx'>  *</div><div class='hunk'>@@ -141,6 +148,12 @@ struct stratix10_svc_chan;</div><div class='ctx'>  *</div><div class='ctx'>  * @COMMAND_FCS_RANDOM_NUMBER_GEN: generate a random number, return status</div><div class='ctx'>  * is SVC_STATUS_OK, SVC_STATUS_ERROR</div><div class='add'>+ *</div><div class='add'>+ * @COMMAND_HWMON_READTEMP: query the temperature from the hardware monitor,</div><div class='add'>+ * return status is SVC_STATUS_OK or SVC_STATUS_ERROR</div><div class='add'>+ *</div><div class='add'>+ * @COMMAND_HWMON_READVOLT: query the voltage from the hardware monitor,</div><div class='add'>+ * return status is SVC_STATUS_OK or SVC_STATUS_ERROR</div><div class='ctx'>  */</div><div class='ctx'> enum stratix10_svc_command_code {</div><div class='ctx'> 	/* for FPGA */</div><div class='hunk'>@@ -158,6 +171,7 @@ enum stratix10_svc_command_code {</div><div class='ctx'> 	COMMAND_RSU_DCMF_VERSION,</div><div class='ctx'> 	COMMAND_RSU_DCMF_STATUS,</div><div class='ctx'> 	COMMAND_FIRMWARE_VERSION,</div><div class='add'>+	COMMAND_RSU_GET_SPT_TABLE,</div><div class='ctx'> 	/* for FCS */</div><div class='ctx'> 	COMMAND_FCS_REQUEST_SERVICE = 20,</div><div class='ctx'> 	COMMAND_FCS_SEND_CERTIFICATE,</div><div class='hunk'>@@ -171,6 +185,9 @@ enum stratix10_svc_command_code {</div><div class='ctx'> 	COMMAND_MBOX_SEND_CMD = 100,</div><div class='ctx'> 	/* Non-mailbox SMC Call */</div><div class='ctx'> 	COMMAND_SMC_SVC_VERSION = 200,</div><div class='add'>+	/* for HWMON */</div><div class='add'>+	COMMAND_HWMON_READTEMP,</div><div class='add'>+	COMMAND_HWMON_READVOLT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -284,5 +301,92 @@ int stratix10_svc_send(struct stratix10_svc_chan *chan, void *msg);</div><div class='ctx'>  * request process.</div><div class='ctx'>  */</div><div class='ctx'> void stratix10_svc_done(struct stratix10_svc_chan *chan);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * typedef async_callback_t - A type definition for an asynchronous callback function.</div><div class='add'>+ *</div><div class='add'>+ * This type defines a function pointer for an asynchronous callback.</div><div class='add'>+ * The callback function takes a single argument, which is a pointer to</div><div class='add'>+ * user-defined data.</div><div class='add'>+ *</div><div class='add'>+ * @cb_arg: Argument to be passed to the callback function.</div><div class='add'>+ */</div><div class='add'>+typedef void (*async_callback_t)(void *cb_arg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stratix10_svc_add_async_client - Add an asynchronous client to a Stratix 10</div><div class='add'>+ *                                  service channel.</div><div class='add'>+ * @chan: Pointer to the Stratix 10 service channel structure.</div><div class='add'>+ * @use_unique_clientid: Boolean flag indicating whether to use a unique client ID.</div><div class='add'>+ *</div><div class='add'>+ * This function registers an asynchronous client with the specified Stratix 10</div><div class='add'>+ * service channel. If the use_unique_clientid flag is set to true, a unique client</div><div class='add'>+ * ID will be assigned to the client.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure:</div><div class='add'>+ *         -EINVAL if the channel is NULL or the async controller is not initialized.</div><div class='add'>+ *         -EALREADY if the async channel is already allocated.</div><div class='add'>+ *         -ENOMEM if memory allocation fails.</div><div class='add'>+ *         Other negative values if ID allocation fails</div><div class='add'>+ */</div><div class='add'>+int stratix10_svc_add_async_client(struct stratix10_svc_chan *chan, bool use_unique_clientid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stratix10_svc_remove_async_client - Remove an asynchronous client from the Stratix 10</div><div class='add'>+ *                                     service channel.</div><div class='add'>+ * @chan: Pointer to the Stratix 10 service channel structure.</div><div class='add'>+ *</div><div class='add'>+ * This function removes an asynchronous client from the specified Stratix 10 service channel.</div><div class='add'>+ * It is typically used to clean up and release resources associated with the client.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -EINVAL if the channel or asynchronous channel is invalid.</div><div class='add'>+ */</div><div class='add'>+int stratix10_svc_remove_async_client(struct stratix10_svc_chan *chan);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stratix10_svc_async_send - Send an asynchronous message to the SDM mailbox</div><div class='add'>+ *                            in EL3 secure firmware.</div><div class='add'>+ * @chan: Pointer to the service channel structure.</div><div class='add'>+ * @msg: Pointer to the message to be sent.</div><div class='add'>+ * @handler: Pointer to the handler object used by caller to track the transaction.</div><div class='add'>+ * @cb: Callback function to be called upon completion.</div><div class='add'>+ * @cb_arg: Argument to be passed to the callback function.</div><div class='add'>+ *</div><div class='add'>+ * This function sends a message asynchronously to the SDM mailbox in EL3 secure firmware.</div><div class='add'>+ * and registers a callback function to be invoked when the operation completes.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success,and negative error codes on failure.</div><div class='add'>+ */</div><div class='add'>+int stratix10_svc_async_send(struct stratix10_svc_chan *chan, void *msg, void **handler,</div><div class='add'>+			     async_callback_t cb, void *cb_arg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stratix10_svc_async_poll - Polls the status of an asynchronous service request.</div><div class='add'>+ * @chan: Pointer to the service channel structure.</div><div class='add'>+ * @tx_handle: Handle to the transaction being polled.</div><div class='add'>+ * @data: Pointer to the callback data structure to be filled with the result.</div><div class='add'>+ *</div><div class='add'>+ * This function checks the status of an asynchronous service request</div><div class='add'>+ * and fills the provided callback data structure with the result.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -EINVAL if any input parameter is invalid or if the</div><div class='add'>+ *         async controller is not initialized, -EAGAIN if the transaction is</div><div class='add'>+ *         still in progress, or other negative error codes on failure.</div><div class='add'>+ */</div><div class='add'>+int stratix10_svc_async_poll(struct stratix10_svc_chan *chan, void *tx_handle,</div><div class='add'>+			     struct stratix10_svc_cb_data *data);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * stratix10_svc_async_done - Complete an asynchronous transaction</div><div class='add'>+ * @chan: Pointer to the service channel structure</div><div class='add'>+ * @tx_handle: Pointer to the transaction handle</div><div class='add'>+ *</div><div class='add'>+ * This function completes an asynchronous transaction by removing the</div><div class='add'>+ * transaction from the hash table and deallocating the associated resources.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -EINVAL on invalid input or errors.</div><div class='add'>+ */</div><div class='add'>+int stratix10_svc_async_done(struct stratix10_svc_chan *chan, void *tx_handle);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/firmware/mediatek/mtk-adsp-ipc.h b/include/linux/firmware/mediatek/mtk-adsp-ipc.h<br/>index 5b1d16fa3f56..6e86799a7dc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/mediatek/mtk-adsp-ipc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/mediatek/mtk-adsp-ipc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/mediatek/mtk-adsp-ipc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/mediatek/mtk-adsp-ipc.h</a></div><div class='hunk'>@@ -40,7 +40,7 @@ struct mtk_adsp_chan {</div><div class='ctx'> struct mtk_adsp_ipc {</div><div class='ctx'> 	struct mtk_adsp_chan chans[MTK_ADSP_MBOX_NUM];</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	struct mtk_adsp_ipc_ops *ops;</div><div class='add'>+	const struct mtk_adsp_ipc_ops *ops;</div><div class='ctx'> 	void *private_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/firmware/qcom/qcom_qseecom.h b/include/linux/firmware/qcom/qcom_qseecom.h<br/>index 5c28298a98be..3387897bf368 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/qcom/qcom_qseecom.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/qcom/qcom_qseecom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/qcom/qcom_qseecom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/qcom/qcom_qseecom.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #define __QCOM_QSEECOM_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/firmware/qcom/qcom_scm.h&gt;</div><div class='hunk'>@@ -27,9 +28,9 @@ struct qseecom_client {</div><div class='ctx'> /**</div><div class='ctx'>  * qcom_qseecom_app_send() - Send to and receive data from a given QSEE app.</div><div class='ctx'>  * @client:   The QSEECOM client associated with the target app.</div><div class='del'>- * @req:      Request buffer sent to the app (must be DMA-mappable).</div><div class='add'>+ * @req:      Request buffer sent to the app (must be TZ memory).</div><div class='ctx'>  * @req_size: Size of the request buffer.</div><div class='del'>- * @rsp:      Response buffer, written to by the app (must be DMA-mappable).</div><div class='add'>+ * @rsp:      Response buffer, written to by the app (must be TZ memory).</div><div class='ctx'>  * @rsp_size: Size of the response buffer.</div><div class='ctx'>  *</div><div class='ctx'>  * Sends a request to the QSEE app associated with the given client and read</div><div class='hunk'>@@ -43,7 +44,8 @@ struct qseecom_client {</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Zero on success, nonzero on failure.</div><div class='ctx'>  */</div><div class='del'>-static inline int qcom_qseecom_app_send(struct qseecom_client *client, void *req, size_t req_size,</div><div class='add'>+static inline int qcom_qseecom_app_send(struct qseecom_client *client,</div><div class='add'>+					void *req, size_t req_size,</div><div class='ctx'> 					void *rsp, size_t rsp_size)</div><div class='ctx'> {</div><div class='ctx'> 	return qcom_scm_qseecom_app_send(client-&gt;app_id, req, req_size, rsp, rsp_size);</div><div class='head'>diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h<br/>index ccaf28846054..a55ca771286b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/qcom/qcom_scm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/qcom/qcom_scm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/qcom/qcom_scm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/qcom/qcom_scm.h</a></div><div class='hunk'>@@ -85,6 +85,8 @@ int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);</div><div class='ctx'> </div><div class='ctx'> bool qcom_scm_restore_sec_cfg_available(void);</div><div class='ctx'> int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare);</div><div class='add'>+int qcom_scm_set_gpu_smmu_aperture(unsigned int context_bank);</div><div class='add'>+bool qcom_scm_set_gpu_smmu_aperture_is_available(void);</div><div class='ctx'> int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size);</div><div class='ctx'> int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);</div><div class='ctx'> int qcom_scm_iommu_set_cp_pool_size(u32 spare, u32 size);</div><div class='hunk'>@@ -103,6 +105,14 @@ bool qcom_scm_ice_available(void);</div><div class='ctx'> int qcom_scm_ice_invalidate_key(u32 index);</div><div class='ctx'> int qcom_scm_ice_set_key(u32 index, const u8 *key, u32 key_size,</div><div class='ctx'> 			 enum qcom_scm_ice_cipher cipher, u32 data_unit_size);</div><div class='add'>+bool qcom_scm_has_wrapped_key_support(void);</div><div class='add'>+int qcom_scm_derive_sw_secret(const u8 *eph_key, size_t eph_key_size,</div><div class='add'>+			      u8 *sw_secret, size_t sw_secret_size);</div><div class='add'>+int qcom_scm_generate_ice_key(u8 *lt_key, size_t lt_key_size);</div><div class='add'>+int qcom_scm_prepare_ice_key(const u8 *lt_key, size_t lt_key_size,</div><div class='add'>+			     u8 *eph_key, size_t eph_key_size);</div><div class='add'>+int qcom_scm_import_ice_key(const u8 *raw_key, size_t raw_key_size,</div><div class='add'>+			    u8 *lt_key, size_t lt_key_size);</div><div class='ctx'> </div><div class='ctx'> bool qcom_scm_hdcp_available(void);</div><div class='ctx'> int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp);</div><div class='hunk'>@@ -115,11 +125,39 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val,</div><div class='ctx'> int qcom_scm_lmh_profile_change(u32 profile_id);</div><div class='ctx'> bool qcom_scm_lmh_dcvsh_available(void);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Request TZ to program set of access controlled registers necessary</div><div class='add'>+ * irrespective of any features</div><div class='add'>+ */</div><div class='add'>+#define QCOM_SCM_GPU_ALWAYS_EN_REQ BIT(0)</div><div class='add'>+/*</div><div class='add'>+ * Request TZ to program BCL id to access controlled register when BCL is</div><div class='add'>+ * enabled</div><div class='add'>+ */</div><div class='add'>+#define QCOM_SCM_GPU_BCL_EN_REQ BIT(1)</div><div class='add'>+/*</div><div class='add'>+ * Request TZ to program set of access controlled register for CLX feature</div><div class='add'>+ * when enabled</div><div class='add'>+ */</div><div class='add'>+#define QCOM_SCM_GPU_CLX_EN_REQ BIT(2)</div><div class='add'>+/*</div><div class='add'>+ * Request TZ to program tsense ids to access controlled registers for reading</div><div class='add'>+ * gpu temperature sensors</div><div class='add'>+ */</div><div class='add'>+#define QCOM_SCM_GPU_TSENSE_EN_REQ BIT(3)</div><div class='add'>+</div><div class='add'>+int qcom_scm_gpu_init_regs(u32 gpu_req);</div><div class='add'>+</div><div class='add'>+int qcom_scm_shm_bridge_create(u64 pfn_and_ns_perm_flags,</div><div class='add'>+			       u64 ipfn_and_s_perm_flags, u64 size_and_flags,</div><div class='add'>+			       u64 ns_vmids, u64 *handle);</div><div class='add'>+int qcom_scm_shm_bridge_delete(u64 handle);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_QCOM_QSEECOM</div><div class='ctx'> </div><div class='ctx'> int qcom_scm_qseecom_app_get_id(const char *app_name, u32 *app_id);</div><div class='del'>-int qcom_scm_qseecom_app_send(u32 app_id, void *req, size_t req_size, void *rsp,</div><div class='del'>-			      size_t rsp_size);</div><div class='add'>+int qcom_scm_qseecom_app_send(u32 app_id, void *req, size_t req_size,</div><div class='add'>+			      void *rsp, size_t rsp_size);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_QCOM_QSEECOM */</div><div class='ctx'> </div><div class='hunk'>@@ -128,13 +166,19 @@ static inline int qcom_scm_qseecom_app_get_id(const char *app_name, u32 *app_id)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int qcom_scm_qseecom_app_send(u32 app_id, void *req,</div><div class='del'>-					    size_t req_size, void *rsp,</div><div class='del'>-					    size_t rsp_size)</div><div class='add'>+static inline int qcom_scm_qseecom_app_send(u32 app_id,</div><div class='add'>+					    void *req, size_t req_size,</div><div class='add'>+					    void *rsp, size_t rsp_size)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_QCOM_QSEECOM */</div><div class='ctx'> </div><div class='add'>+int qcom_scm_qtee_invoke_smc(phys_addr_t inbuf, size_t inbuf_size,</div><div class='add'>+			     phys_addr_t outbuf, size_t outbuf_size,</div><div class='add'>+			     u64 *result, u64 *response_type);</div><div class='add'>+int qcom_scm_qtee_callback_response(phys_addr_t buf, size_t buf_size,</div><div class='add'>+				    u64 *result, u64 *response_type);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/firmware/qcom/qcom_tzmem.h b/include/linux/firmware/qcom/qcom_tzmem.h<br/>new file mode 100644<br/>index 000000000000..23173e0c3ddd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/qcom/qcom_tzmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/qcom/qcom_tzmem.h</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023-2024 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __QCOM_TZMEM_H</div><div class='add'>+#define __QCOM_TZMEM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct qcom_tzmem_pool;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum qcom_tzmem_policy - Policy for pool growth.</div><div class='add'>+ */</div><div class='add'>+enum qcom_tzmem_policy {</div><div class='add'>+	/**</div><div class='add'>+	 * @QCOM_TZMEM_POLICY_STATIC: Static pool,</div><div class='add'>+	 * never grow above initial size.</div><div class='add'>+	 */</div><div class='add'>+	QCOM_TZMEM_POLICY_STATIC = 1,</div><div class='add'>+	/**</div><div class='add'>+	 * @QCOM_TZMEM_POLICY_MULTIPLIER: When out of memory,</div><div class='add'>+	 * add increment * current size of memory.</div><div class='add'>+	 */</div><div class='add'>+	QCOM_TZMEM_POLICY_MULTIPLIER,</div><div class='add'>+	/**</div><div class='add'>+	 * @QCOM_TZMEM_POLICY_ON_DEMAND: When out of memory</div><div class='add'>+	 * add as much as is needed until max_size.</div><div class='add'>+	 */</div><div class='add'>+	QCOM_TZMEM_POLICY_ON_DEMAND,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct qcom_tzmem_pool_config - TZ memory pool configuration.</div><div class='add'>+ * @initial_size: Number of bytes to allocate for the pool during its creation.</div><div class='add'>+ * @policy: Pool size growth policy.</div><div class='add'>+ * @increment: Used with policies that allow pool growth.</div><div class='add'>+ * @max_size: Size above which the pool will never grow.</div><div class='add'>+ */</div><div class='add'>+struct qcom_tzmem_pool_config {</div><div class='add'>+	size_t initial_size;</div><div class='add'>+	enum qcom_tzmem_policy policy;</div><div class='add'>+	size_t increment;</div><div class='add'>+	size_t max_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qcom_tzmem_pool *</div><div class='add'>+qcom_tzmem_pool_new(const struct qcom_tzmem_pool_config *config);</div><div class='add'>+void qcom_tzmem_pool_free(struct qcom_tzmem_pool *pool);</div><div class='add'>+struct qcom_tzmem_pool *</div><div class='add'>+devm_qcom_tzmem_pool_new(struct device *dev,</div><div class='add'>+			 const struct qcom_tzmem_pool_config *config);</div><div class='add'>+</div><div class='add'>+void *qcom_tzmem_alloc(struct qcom_tzmem_pool *pool, size_t size, gfp_t gfp);</div><div class='add'>+void qcom_tzmem_free(void *ptr);</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(qcom_tzmem, void *, if (_T) qcom_tzmem_free(_T))</div><div class='add'>+</div><div class='add'>+phys_addr_t qcom_tzmem_to_phys(void *ptr);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE)</div><div class='add'>+int qcom_tzmem_shm_bridge_create(phys_addr_t paddr, size_t size, u64 *handle);</div><div class='add'>+void qcom_tzmem_shm_bridge_delete(u64 handle);</div><div class='add'>+#else</div><div class='add'>+static inline int qcom_tzmem_shm_bridge_create(phys_addr_t paddr,</div><div class='add'>+					       size_t size, u64 *handle)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void qcom_tzmem_shm_bridge_delete(u64 handle)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __QCOM_TZMEM */</div><div class='head'>diff --git a/include/linux/firmware/samsung/exynos-acpm-protocol.h b/include/linux/firmware/samsung/exynos-acpm-protocol.h<br/>new file mode 100644<br/>index 000000000000..2091da965a5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/samsung/exynos-acpm-protocol.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/samsung/exynos-acpm-protocol.h</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2020 Samsung Electronics Co., Ltd.</div><div class='add'>+ * Copyright 2020 Google LLC.</div><div class='add'>+ * Copyright 2024 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __EXYNOS_ACPM_PROTOCOL_H</div><div class='add'>+#define __EXYNOS_ACPM_PROTOCOL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct acpm_handle;</div><div class='add'>+struct device_node;</div><div class='add'>+</div><div class='add'>+struct acpm_dvfs_ops {</div><div class='add'>+	int (*set_rate)(const struct acpm_handle *handle,</div><div class='add'>+			unsigned int acpm_chan_id, unsigned int clk_id,</div><div class='add'>+			unsigned long rate);</div><div class='add'>+	unsigned long (*get_rate)(const struct acpm_handle *handle,</div><div class='add'>+				  unsigned int acpm_chan_id,</div><div class='add'>+				  unsigned int clk_id);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpm_pmic_ops {</div><div class='add'>+	int (*read_reg)(const struct acpm_handle *handle,</div><div class='add'>+			unsigned int acpm_chan_id, u8 type, u8 reg, u8 chan,</div><div class='add'>+			u8 *buf);</div><div class='add'>+	int (*bulk_read)(const struct acpm_handle *handle,</div><div class='add'>+			 unsigned int acpm_chan_id, u8 type, u8 reg, u8 chan,</div><div class='add'>+			 u8 count, u8 *buf);</div><div class='add'>+	int (*write_reg)(const struct acpm_handle *handle,</div><div class='add'>+			 unsigned int acpm_chan_id, u8 type, u8 reg, u8 chan,</div><div class='add'>+			 u8 value);</div><div class='add'>+	int (*bulk_write)(const struct acpm_handle *handle,</div><div class='add'>+			  unsigned int acpm_chan_id, u8 type, u8 reg, u8 chan,</div><div class='add'>+			  u8 count, const u8 *buf);</div><div class='add'>+	int (*update_reg)(const struct acpm_handle *handle,</div><div class='add'>+			  unsigned int acpm_chan_id, u8 type, u8 reg, u8 chan,</div><div class='add'>+			  u8 value, u8 mask);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpm_ops {</div><div class='add'>+	struct acpm_dvfs_ops dvfs_ops;</div><div class='add'>+	struct acpm_pmic_ops pmic_ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct acpm_handle - Reference to an initialized protocol instance</div><div class='add'>+ * @ops:</div><div class='add'>+ */</div><div class='add'>+struct acpm_handle {</div><div class='add'>+	struct acpm_ops ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_EXYNOS_ACPM_PROTOCOL)</div><div class='add'>+const struct acpm_handle *devm_acpm_get_by_node(struct device *dev,</div><div class='add'>+						struct device_node *np);</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline const struct acpm_handle *devm_acpm_get_by_node(struct device *dev,</div><div class='add'>+							      struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __EXYNOS_ACPM_PROTOCOL_H */</div><div class='head'>diff --git a/include/linux/firmware/thead/thead,th1520-aon.h b/include/linux/firmware/thead/thead,th1520-aon.h<br/>new file mode 100644<br/>index 000000000000..dae132b66873<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/thead/thead,th1520-aon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/thead/thead,th1520-aon.h</a></div><div class='hunk'>@@ -0,0 +1,200 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Alibaba Group Holding Limited.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _THEAD_AON_H</div><div class='add'>+#define _THEAD_AON_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define AON_RPC_MSG_MAGIC (0xef)</div><div class='add'>+#define TH1520_AON_RPC_VERSION 2</div><div class='add'>+#define TH1520_AON_RPC_MSG_NUM 7</div><div class='add'>+</div><div class='add'>+struct th1520_aon_chan;</div><div class='add'>+</div><div class='add'>+enum th1520_aon_rpc_svc {</div><div class='add'>+	TH1520_AON_RPC_SVC_UNKNOWN = 0,</div><div class='add'>+	TH1520_AON_RPC_SVC_PM = 1,</div><div class='add'>+	TH1520_AON_RPC_SVC_MISC = 2,</div><div class='add'>+	TH1520_AON_RPC_SVC_AVFS = 3,</div><div class='add'>+	TH1520_AON_RPC_SVC_SYS = 4,</div><div class='add'>+	TH1520_AON_RPC_SVC_WDG = 5,</div><div class='add'>+	TH1520_AON_RPC_SVC_LPM = 6,</div><div class='add'>+	TH1520_AON_RPC_SVC_MAX = 0x3F,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum th1520_aon_misc_func {</div><div class='add'>+	TH1520_AON_MISC_FUNC_UNKNOWN = 0,</div><div class='add'>+	TH1520_AON_MISC_FUNC_SET_CONTROL = 1,</div><div class='add'>+	TH1520_AON_MISC_FUNC_GET_CONTROL = 2,</div><div class='add'>+	TH1520_AON_MISC_FUNC_REGDUMP_CFG = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum th1520_aon_wdg_func {</div><div class='add'>+	TH1520_AON_WDG_FUNC_UNKNOWN = 0,</div><div class='add'>+	TH1520_AON_WDG_FUNC_START = 1,</div><div class='add'>+	TH1520_AON_WDG_FUNC_STOP = 2,</div><div class='add'>+	TH1520_AON_WDG_FUNC_PING = 3,</div><div class='add'>+	TH1520_AON_WDG_FUNC_TIMEOUTSET = 4,</div><div class='add'>+	TH1520_AON_WDG_FUNC_RESTART = 5,</div><div class='add'>+	TH1520_AON_WDG_FUNC_GET_STATE = 6,</div><div class='add'>+	TH1520_AON_WDG_FUNC_POWER_OFF = 7,</div><div class='add'>+	TH1520_AON_WDG_FUNC_AON_WDT_ON = 8,</div><div class='add'>+	TH1520_AON_WDG_FUNC_AON_WDT_OFF = 9,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum th1520_aon_sys_func {</div><div class='add'>+	TH1520_AON_SYS_FUNC_UNKNOWN = 0,</div><div class='add'>+	TH1520_AON_SYS_FUNC_AON_RESERVE_MEM = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum th1520_aon_lpm_func {</div><div class='add'>+	TH1520_AON_LPM_FUNC_UNKNOWN = 0,</div><div class='add'>+	TH1520_AON_LPM_FUNC_REQUIRE_STR = 1,</div><div class='add'>+	TH1520_AON_LPM_FUNC_RESUME_STR = 2,</div><div class='add'>+	TH1520_AON_LPM_FUNC_REQUIRE_STD = 3,</div><div class='add'>+	TH1520_AON_LPM_FUNC_CPUHP = 4,</div><div class='add'>+	TH1520_AON_LPM_FUNC_REGDUMP_CFG = 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum th1520_aon_pm_func {</div><div class='add'>+	TH1520_AON_PM_FUNC_UNKNOWN = 0,</div><div class='add'>+	TH1520_AON_PM_FUNC_SET_RESOURCE_REGULATOR = 1,</div><div class='add'>+	TH1520_AON_PM_FUNC_GET_RESOURCE_REGULATOR = 2,</div><div class='add'>+	TH1520_AON_PM_FUNC_SET_RESOURCE_POWER_MODE = 3,</div><div class='add'>+	TH1520_AON_PM_FUNC_PWR_SET = 4,</div><div class='add'>+	TH1520_AON_PM_FUNC_PWR_GET = 5,</div><div class='add'>+	TH1520_AON_PM_FUNC_CHECK_FAULT = 6,</div><div class='add'>+	TH1520_AON_PM_FUNC_GET_TEMPERATURE = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct th1520_aon_rpc_msg_hdr {</div><div class='add'>+	u8 ver; /* version of msg hdr */</div><div class='add'>+	u8 size; /*  msg size ,uinit in bytes,the size includes rpc msg header self */</div><div class='add'>+	u8 svc; /* rpc main service id */</div><div class='add'>+	u8 func; /* rpc sub func id of specific service, sent by caller */</div><div class='add'>+} __packed __aligned(1);</div><div class='add'>+</div><div class='add'>+struct th1520_aon_rpc_ack_common {</div><div class='add'>+	struct th1520_aon_rpc_msg_hdr hdr;</div><div class='add'>+	u8 err_code;</div><div class='add'>+} __packed __aligned(1);</div><div class='add'>+</div><div class='add'>+#define RPC_SVC_MSG_TYPE_DATA 0</div><div class='add'>+#define RPC_SVC_MSG_TYPE_ACK 1</div><div class='add'>+#define RPC_SVC_MSG_NEED_ACK 0</div><div class='add'>+#define RPC_SVC_MSG_NO_NEED_ACK 1</div><div class='add'>+</div><div class='add'>+#define RPC_GET_VER(MESG) ((MESG)-&gt;ver)</div><div class='add'>+#define RPC_SET_VER(MESG, VER) ((MESG)-&gt;ver = (VER))</div><div class='add'>+#define RPC_GET_SVC_ID(MESG) ((MESG)-&gt;svc &amp; 0x3F)</div><div class='add'>+#define RPC_SET_SVC_ID(MESG, ID) ((MESG)-&gt;svc |= 0x3F &amp; (ID))</div><div class='add'>+#define RPC_GET_SVC_FLAG_MSG_TYPE(MESG) (((MESG)-&gt;svc &amp; 0x80) &gt;&gt; 7)</div><div class='add'>+#define RPC_SET_SVC_FLAG_MSG_TYPE(MESG, TYPE) ((MESG)-&gt;svc |= (TYPE) &lt;&lt; 7)</div><div class='add'>+#define RPC_GET_SVC_FLAG_ACK_TYPE(MESG) (((MESG)-&gt;svc &amp; 0x40) &gt;&gt; 6)</div><div class='add'>+#define RPC_SET_SVC_FLAG_ACK_TYPE(MESG, ACK) ((MESG)-&gt;svc |= (ACK) &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#define RPC_SET_BE64(MESG, OFFSET, SET_DATA)                                \</div><div class='add'>+	do {                                                                \</div><div class='add'>+		u8 *data = (u8 *)(MESG);                                    \</div><div class='add'>+		u64 _offset = (OFFSET);                                     \</div><div class='add'>+		u64 _set_data = (SET_DATA);                                 \</div><div class='add'>+		data[_offset + 7] = _set_data &amp; 0xFF;                       \</div><div class='add'>+		data[_offset + 6] = (_set_data &amp; 0xFF00) &gt;&gt; 8;              \</div><div class='add'>+		data[_offset + 5] = (_set_data &amp; 0xFF0000) &gt;&gt; 16;           \</div><div class='add'>+		data[_offset + 4] = (_set_data &amp; 0xFF000000) &gt;&gt; 24;         \</div><div class='add'>+		data[_offset + 3] = (_set_data &amp; 0xFF00000000) &gt;&gt; 32;       \</div><div class='add'>+		data[_offset + 2] = (_set_data &amp; 0xFF0000000000) &gt;&gt; 40;     \</div><div class='add'>+		data[_offset + 1] = (_set_data &amp; 0xFF000000000000) &gt;&gt; 48;   \</div><div class='add'>+		data[_offset + 0] = (_set_data &amp; 0xFF00000000000000) &gt;&gt; 56; \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define RPC_SET_BE32(MESG, OFFSET, SET_DATA)			    \</div><div class='add'>+	do {							    \</div><div class='add'>+		u8 *data = (u8 *)(MESG);			    \</div><div class='add'>+		u64 _offset = (OFFSET);				    \</div><div class='add'>+		u64 _set_data = (SET_DATA);			    \</div><div class='add'>+		data[_offset + 3] = (_set_data) &amp; 0xFF;		    \</div><div class='add'>+		data[_offset + 2] = (_set_data &amp; 0xFF00) &gt;&gt; 8;	    \</div><div class='add'>+		data[_offset + 1] = (_set_data &amp; 0xFF0000) &gt;&gt; 16;   \</div><div class='add'>+		data[_offset + 0] = (_set_data &amp; 0xFF000000) &gt;&gt; 24; \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define RPC_SET_BE16(MESG, OFFSET, SET_DATA)		       \</div><div class='add'>+	do {						       \</div><div class='add'>+		u8 *data = (u8 *)(MESG);		       \</div><div class='add'>+		u64 _offset = (OFFSET);			       \</div><div class='add'>+		u64 _set_data = (SET_DATA);		       \</div><div class='add'>+		data[_offset + 1] = (_set_data) &amp; 0xFF;	       \</div><div class='add'>+		data[_offset + 0] = (_set_data &amp; 0xFF00) &gt;&gt; 8; \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define RPC_SET_U8(MESG, OFFSET, SET_DATA)	  \</div><div class='add'>+	do {					  \</div><div class='add'>+		u8 *data = (u8 *)(MESG);	  \</div><div class='add'>+		data[OFFSET] = (SET_DATA) &amp; 0xFF; \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define RPC_GET_BE64(MESG, OFFSET, PTR)                                      \</div><div class='add'>+	do {                                                                 \</div><div class='add'>+		u8 *data = (u8 *)(MESG);                                     \</div><div class='add'>+		u64 _offset = (OFFSET);                                      \</div><div class='add'>+		*(u32 *)(PTR) =                                              \</div><div class='add'>+			(data[_offset + 7] | data[_offset + 6] &lt;&lt; 8 |        \</div><div class='add'>+			 data[_offset + 5] &lt;&lt; 16 | data[_offset + 4] &lt;&lt; 24 | \</div><div class='add'>+			 data[_offset + 3] &lt;&lt; 32 | data[_offset + 2] &lt;&lt; 40 | \</div><div class='add'>+			 data[_offset + 1] &lt;&lt; 48 | data[_offset + 0] &lt;&lt; 56); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define RPC_GET_BE32(MESG, OFFSET, PTR)                                      \</div><div class='add'>+	do {                                                                 \</div><div class='add'>+		u8 *data = (u8 *)(MESG);                                     \</div><div class='add'>+		u64 _offset = (OFFSET);                                      \</div><div class='add'>+		*(u32 *)(PTR) =                                              \</div><div class='add'>+			(data[_offset + 3] | data[_offset + 2] &lt;&lt; 8 |        \</div><div class='add'>+			 data[_offset + 1] &lt;&lt; 16 | data[_offset + 0] &lt;&lt; 24); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define RPC_GET_BE16(MESG, OFFSET, PTR)                                       \</div><div class='add'>+	do {                                                                  \</div><div class='add'>+		u8 *data = (u8 *)(MESG);                                      \</div><div class='add'>+		u64 _offset = (OFFSET);                                       \</div><div class='add'>+		*(u16 *)(PTR) = (data[_offset + 1] | data[_offset + 0] &lt;&lt; 8); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define RPC_GET_U8(MESG, OFFSET, PTR)          \</div><div class='add'>+	do {                                   \</div><div class='add'>+		u8 *data = (u8 *)(MESG);       \</div><div class='add'>+		*(u8 *)(PTR) = (data[OFFSET]); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Defines for SC PM Power Mode</div><div class='add'>+ */</div><div class='add'>+#define TH1520_AON_PM_PW_MODE_OFF 0 /* Power off */</div><div class='add'>+#define TH1520_AON_PM_PW_MODE_STBY 1 /* Power in standby */</div><div class='add'>+#define TH1520_AON_PM_PW_MODE_LP 2 /* Power in low-power */</div><div class='add'>+#define TH1520_AON_PM_PW_MODE_ON 3 /* Power on */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Defines for AON power islands</div><div class='add'>+ */</div><div class='add'>+#define TH1520_AON_AUDIO_PD 0</div><div class='add'>+#define TH1520_AON_VDEC_PD 1</div><div class='add'>+#define TH1520_AON_NPU_PD 2</div><div class='add'>+#define TH1520_AON_VENC_PD 3</div><div class='add'>+#define TH1520_AON_GPU_PD 4</div><div class='add'>+#define TH1520_AON_DSP0_PD 5</div><div class='add'>+#define TH1520_AON_DSP1_PD 6</div><div class='add'>+</div><div class='add'>+struct th1520_aon_chan *th1520_aon_init(struct device *dev);</div><div class='add'>+void th1520_aon_deinit(struct th1520_aon_chan *aon_chan);</div><div class='add'>+</div><div class='add'>+int th1520_aon_call_rpc(struct th1520_aon_chan *aon_chan, void *msg);</div><div class='add'>+int th1520_aon_power_update(struct th1520_aon_chan *aon_chan, u16 rsrc,</div><div class='add'>+			    bool power_on);</div><div class='add'>+</div><div class='add'>+#endif /* _THEAD_AON_H */</div><div class='head'>diff --git a/include/linux/firmware/xlnx-event-manager.h b/include/linux/firmware/xlnx-event-manager.h<br/>index 82e8254b0f80..645dd34155e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/xlnx-event-manager.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/xlnx-event-manager.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/xlnx-event-manager.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/xlnx-event-manager.h</a></div><div class='hunk'>@@ -1,4 +1,9 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Xilinx Event Management Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024, Advanced Micro Devices, Inc.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #ifndef _FIRMWARE_XLNX_EVENT_MANAGER_H_</div><div class='ctx'> #define _FIRMWARE_XLNX_EVENT_MANAGER_H_</div><div class='hunk'>@@ -7,6 +12,11 @@</div><div class='ctx'> </div><div class='ctx'> #define CB_MAX_PAYLOAD_SIZE	(4U) /*In payload maximum 32bytes */</div><div class='ctx'> </div><div class='add'>+#define EVENT_SUBSYSTEM_RESTART		(4U)</div><div class='add'>+</div><div class='add'>+#define PM_DEV_ACPU_0_0			(0x1810c0afU)</div><div class='add'>+#define PM_DEV_ACPU_0			(0x1810c003U)</div><div class='add'>+</div><div class='ctx'> /************************** Exported Function *****************************/</div><div class='ctx'> </div><div class='ctx'> typedef void (*event_cb_func_t)(const u32 *payload, void *data);</div><div class='head'>diff --git a/include/linux/firmware/xlnx-zynqmp-ufs.h b/include/linux/firmware/xlnx-zynqmp-ufs.h<br/>new file mode 100644<br/>index 000000000000..d3538dd5822a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/xlnx-zynqmp-ufs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/xlnx-zynqmp-ufs.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Firmware layer for UFS APIs.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2025 Advanced Micro Devices, Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __FIRMWARE_XLNX_ZYNQMP_UFS_H__</div><div class='add'>+#define __FIRMWARE_XLNX_ZYNQMP_UFS_H__</div><div class='add'>+</div><div class='add'>+#if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE)</div><div class='add'>+int zynqmp_pm_is_mphy_tx_rx_config_ready(bool *is_ready);</div><div class='add'>+int zynqmp_pm_is_sram_init_done(bool *is_done);</div><div class='add'>+int zynqmp_pm_set_sram_bypass(void);</div><div class='add'>+int zynqmp_pm_get_ufs_calibration_values(u32 *val);</div><div class='add'>+#else</div><div class='add'>+static inline int zynqmp_pm_is_mphy_tx_rx_config_ready(bool *is_ready)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int zynqmp_pm_is_sram_init_done(bool *is_done)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int zynqmp_pm_set_sram_bypass(void)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int zynqmp_pm_get_ufs_calibration_values(u32 *val)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __FIRMWARE_XLNX_ZYNQMP_UFS_H__ */</div><div class='head'>diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h<br/>index 9a7e52739251..15fdbd089bbf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/xlnx-zynqmp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/firmware/xlnx-zynqmp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/firmware/xlnx-zynqmp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/firmware/xlnx-zynqmp.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  * Xilinx Zynq MPSoC Firmware layer</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2014-2021 Xilinx</div><div class='add'>+ *  Copyright (C) 2022 - 2025 Advanced Micro Devices, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  *  Michal Simek &lt;michal.simek@amd.com&gt;</div><div class='ctx'>  *  Davorin Mista &lt;davorin.mista@aggios.com&gt;</div><div class='hunk'>@@ -15,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/firmware/xlnx-zynqmp-ufs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ZYNQMP_PM_VERSION_MAJOR	1</div><div class='ctx'> #define ZYNQMP_PM_VERSION_MINOR	0</div><div class='hunk'>@@ -31,25 +33,36 @@</div><div class='ctx'> /* SMC SIP service Call Function Identifier Prefix */</div><div class='ctx'> #define PM_SIP_SVC			0xC2000000</div><div class='ctx'> </div><div class='add'>+/* SMC function ID to get SiP SVC version */</div><div class='add'>+#define GET_SIP_SVC_VERSION	(0x8200ff03U)</div><div class='add'>+</div><div class='add'>+/* SiP Service Calls version numbers */</div><div class='add'>+#define SIP_SVC_VERSION_MAJOR		(0U)</div><div class='add'>+#define SIP_SVC_VERSION_MINOR		(2U)</div><div class='add'>+</div><div class='add'>+#define SIP_SVC_PASSTHROUGH_VERSION	((SIP_SVC_VERSION_MAJOR &lt;&lt; 16) | \</div><div class='add'>+					 SIP_SVC_VERSION_MINOR)</div><div class='add'>+</div><div class='add'>+/* Fixed ID for FW specific APIs */</div><div class='add'>+#define PASS_THROUGH_FW_CMD_ID	GENMASK(11, 0)</div><div class='add'>+</div><div class='ctx'> /* PM API versions */</div><div class='ctx'> #define PM_API_VERSION_1	1</div><div class='ctx'> #define PM_API_VERSION_2	2</div><div class='ctx'> </div><div class='ctx'> #define PM_PINCTRL_PARAM_SET_VERSION	2</div><div class='ctx'> </div><div class='del'>-#define ZYNQMP_FAMILY_CODE 0x23</div><div class='del'>-#define VERSAL_FAMILY_CODE 0x26</div><div class='del'>-</div><div class='del'>-/* When all subfamily of platform need to support */</div><div class='del'>-#define ALL_SUB_FAMILY_CODE		0x00</div><div class='del'>-#define VERSAL_SUB_FAMILY_CODE		0x01</div><div class='del'>-#define VERSALNET_SUB_FAMILY_CODE	0x03</div><div class='del'>-</div><div class='del'>-#define FAMILY_CODE_MASK	GENMASK(27, 21)</div><div class='del'>-#define SUB_FAMILY_CODE_MASK	GENMASK(20, 19)</div><div class='add'>+/* Family codes */</div><div class='add'>+#define PM_ZYNQMP_FAMILY_CODE 0x1 /* ZynqMP family code */</div><div class='add'>+#define PM_VERSAL_FAMILY_CODE 0x2 /* Versal family code */</div><div class='add'>+#define PM_VERSAL_NET_FAMILY_CODE 0x3 /* Versal NET family code */</div><div class='ctx'> </div><div class='ctx'> #define API_ID_MASK		GENMASK(7, 0)</div><div class='ctx'> #define MODULE_ID_MASK		GENMASK(11, 8)</div><div class='add'>+#define PLM_MODULE_ID_MASK	GENMASK(15, 8)</div><div class='add'>+</div><div class='add'>+/* Firmware feature check version mask */</div><div class='add'>+#define FIRMWARE_VERSION_MASK		0xFFFFU</div><div class='ctx'> </div><div class='ctx'> /* ATF only commands */</div><div class='ctx'> #define TF_A_PM_REGISTER_SGI		0xa04</div><div class='hunk'>@@ -58,7 +71,13 @@</div><div class='ctx'> #define GET_CALLBACK_DATA		0xa01</div><div class='ctx'> </div><div class='ctx'> /* Number of 32bits values in payload */</div><div class='del'>-#define PAYLOAD_ARG_CNT	4U</div><div class='add'>+#define PAYLOAD_ARG_CNT	7U</div><div class='add'>+</div><div class='add'>+/* Number of 64bits arguments for SMC call */</div><div class='add'>+#define SMC_ARG_CNT_64	8U</div><div class='add'>+</div><div class='add'>+/* Number of 32bits arguments for SMC call */</div><div class='add'>+#define SMC_ARG_CNT_32	13U</div><div class='ctx'> </div><div class='ctx'> /* Number of arguments for a callback */</div><div class='ctx'> #define CB_ARG_CNT     4</div><div class='hunk'>@@ -126,6 +145,7 @@</div><div class='ctx'> </div><div class='ctx'> enum pm_module_id {</div><div class='ctx'> 	PM_MODULE_ID = 0x0,</div><div class='add'>+	XPM_MODULE_ID = 0x2,</div><div class='ctx'> 	XSEM_MODULE_ID = 0x3,</div><div class='ctx'> 	TF_A_MODULE_ID = 0xa,</div><div class='ctx'> };</div><div class='hunk'>@@ -139,6 +159,7 @@ enum pm_api_cb_id {</div><div class='ctx'> enum pm_api_id {</div><div class='ctx'> 	PM_API_FEATURES = 0,</div><div class='ctx'> 	PM_GET_API_VERSION = 1,</div><div class='add'>+	PM_GET_NODE_STATUS = 3,</div><div class='ctx'> 	PM_REGISTER_NOTIFIER = 5,</div><div class='ctx'> 	PM_FORCE_POWERDOWN = 8,</div><div class='ctx'> 	PM_REQUEST_WAKEUP = 10,</div><div class='hunk'>@@ -171,6 +192,7 @@ enum pm_api_id {</div><div class='ctx'> 	PM_CLOCK_GETPARENT = 44,</div><div class='ctx'> 	PM_FPGA_READ = 46,</div><div class='ctx'> 	PM_SECURE_AES = 47,</div><div class='add'>+	PM_EFUSE_ACCESS = 53,</div><div class='ctx'> 	PM_FEATURE_CHECK = 63,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -213,9 +235,14 @@ enum pm_ioctl_id {</div><div class='ctx'> 	/* Runtime feature configuration */</div><div class='ctx'> 	IOCTL_SET_FEATURE_CONFIG = 26,</div><div class='ctx'> 	IOCTL_GET_FEATURE_CONFIG = 27,</div><div class='add'>+	/* IOCTL for Secure Read/Write Interface */</div><div class='add'>+	IOCTL_READ_REG = 28,</div><div class='add'>+	IOCTL_MASK_WRITE_REG = 29,</div><div class='ctx'> 	/* Dynamic SD/GEM configuration */</div><div class='ctx'> 	IOCTL_SET_SD_CONFIG = 30,</div><div class='ctx'> 	IOCTL_SET_GEM_CONFIG = 31,</div><div class='add'>+	/* IOCTL to get default/current QoS */</div><div class='add'>+	IOCTL_GET_QOS = 34,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum pm_query_id {</div><div class='hunk'>@@ -233,6 +260,7 @@ enum pm_query_id {</div><div class='ctx'> 	PM_QID_PINCTRL_GET_PIN_GROUPS = 11,</div><div class='ctx'> 	PM_QID_CLOCK_GET_NUM_CLOCKS = 12,</div><div class='ctx'> 	PM_QID_CLOCK_GET_MAX_DIVISOR = 13,</div><div class='add'>+	PM_QID_PINCTRL_GET_ATTRIBUTES = 15,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum rpu_oper_mode {</div><div class='hunk'>@@ -528,11 +556,12 @@ struct zynqmp_pm_query_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...);</div><div class='add'>+int zynqmp_pm_invoke_fw_fn(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...);</div><div class='ctx'> </div><div class='ctx'> #if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE)</div><div class='ctx'> int zynqmp_pm_get_api_version(u32 *version);</div><div class='ctx'> int zynqmp_pm_get_chipid(u32 *idcode, u32 *version);</div><div class='del'>-int zynqmp_pm_get_family_info(u32 *family, u32 *subfamily);</div><div class='add'>+int zynqmp_pm_get_family_info(u32 *family);</div><div class='ctx'> int zynqmp_pm_query_data(struct zynqmp_pm_query_data qdata, u32 *out);</div><div class='ctx'> int zynqmp_pm_clock_enable(u32 clock_id);</div><div class='ctx'> int zynqmp_pm_clock_disable(u32 clock_id);</div><div class='hunk'>@@ -548,12 +577,11 @@ int zynqmp_pm_get_pll_frac_data(u32 clk_id, u32 *data);</div><div class='ctx'> int zynqmp_pm_set_sd_tapdelay(u32 node_id, u32 type, u32 value);</div><div class='ctx'> int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type);</div><div class='ctx'> int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select);</div><div class='del'>-int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,</div><div class='add'>+int zynqmp_pm_reset_assert(const u32 reset,</div><div class='ctx'> 			   const enum zynqmp_pm_reset_action assert_flag);</div><div class='del'>-int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset, u32 *status);</div><div class='add'>+int zynqmp_pm_reset_get_status(const u32 reset, u32 *status);</div><div class='ctx'> unsigned int zynqmp_pm_bootmode_read(u32 *ps_mode);</div><div class='ctx'> int zynqmp_pm_bootmode_write(u32 ps_mode);</div><div class='del'>-int zynqmp_pm_init_finalize(void);</div><div class='ctx'> int zynqmp_pm_set_suspend_mode(u32 mode);</div><div class='ctx'> int zynqmp_pm_request_node(const u32 node, const u32 capabilities,</div><div class='ctx'> 			   const u32 qos, const enum zynqmp_pm_request_ack ack);</div><div class='hunk'>@@ -562,6 +590,7 @@ int zynqmp_pm_set_requirement(const u32 node, const u32 capabilities,</div><div class='ctx'> 			      const u32 qos,</div><div class='ctx'> 			      const enum zynqmp_pm_request_ack ack);</div><div class='ctx'> int zynqmp_pm_aes_engine(const u64 address, u32 *out);</div><div class='add'>+int zynqmp_pm_efuse_access(const u64 address, u32 *out);</div><div class='ctx'> int zynqmp_pm_sha_hash(const u64 address, const u32 size, const u32 flags);</div><div class='ctx'> int zynqmp_pm_fpga_load(const u64 address, const u32 size, const u32 flags);</div><div class='ctx'> int zynqmp_pm_fpga_get_status(u32 *value);</div><div class='hunk'>@@ -587,6 +616,9 @@ int zynqmp_pm_feature(const u32 api_id);</div><div class='ctx'> int zynqmp_pm_is_function_supported(const u32 api_id, const u32 id);</div><div class='ctx'> int zynqmp_pm_set_feature_config(enum pm_feature_config_id id, u32 value);</div><div class='ctx'> int zynqmp_pm_get_feature_config(enum pm_feature_config_id id, u32 *payload);</div><div class='add'>+int zynqmp_pm_sec_read_reg(u32 node_id, u32 offset, u32 *ret_value);</div><div class='add'>+int zynqmp_pm_sec_mask_write_reg(const u32 node_id, const u32 offset,</div><div class='add'>+				 u32 mask, u32 value);</div><div class='ctx'> int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset);</div><div class='ctx'> int zynqmp_pm_force_pwrdwn(const u32 target,</div><div class='ctx'> 			   const enum zynqmp_pm_request_ack ack);</div><div class='hunk'>@@ -597,6 +629,8 @@ int zynqmp_pm_request_wake(const u32 node,</div><div class='ctx'> int zynqmp_pm_get_rpu_mode(u32 node_id, enum rpu_oper_mode *rpu_mode);</div><div class='ctx'> int zynqmp_pm_set_rpu_mode(u32 node_id, enum rpu_oper_mode rpu_mode);</div><div class='ctx'> int zynqmp_pm_set_tcm_config(u32 node_id, enum rpu_tcm_comb tcm_mode);</div><div class='add'>+int zynqmp_pm_get_node_status(const u32 node, u32 *const status,</div><div class='add'>+			      u32 *const requirements, u32 *const usage);</div><div class='ctx'> int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value);</div><div class='ctx'> int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config,</div><div class='ctx'> 			     u32 value);</div><div class='hunk'>@@ -611,7 +645,7 @@ static inline int zynqmp_pm_get_chipid(u32 *idcode, u32 *version)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int zynqmp_pm_get_family_info(u32 *family, u32 *subfamily)</div><div class='add'>+static inline int zynqmp_pm_get_family_info(u32 *family)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='hunk'>@@ -692,14 +726,13 @@ static inline int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,</div><div class='add'>+static inline int zynqmp_pm_reset_assert(const u32 reset,</div><div class='ctx'> 					 const enum zynqmp_pm_reset_action assert_flag)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset,</div><div class='del'>-					     u32 *status)</div><div class='add'>+static inline int zynqmp_pm_reset_get_status(const u32 reset, u32 *status)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='hunk'>@@ -714,11 +747,6 @@ static inline int zynqmp_pm_bootmode_write(u32 ps_mode)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int zynqmp_pm_init_finalize(void)</div><div class='del'>-{</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int zynqmp_pm_set_suspend_mode(u32 mode)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='hunk'>@@ -749,6 +777,11 @@ static inline int zynqmp_pm_aes_engine(const u64 address, u32 *out)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int zynqmp_pm_efuse_access(const u64 address, u32 *out)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int zynqmp_pm_sha_hash(const u64 address, const u32 size,</div><div class='ctx'> 				     const u32 flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -885,6 +918,17 @@ static inline int zynqmp_pm_request_wake(const u32 node,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int zynqmp_pm_sec_read_reg(u32 node_id, u32 offset, u32 *ret_value)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int zynqmp_pm_sec_mask_write_reg(const u32 node_id, const u32 offset,</div><div class='add'>+					       u32 mask, u32 value)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int zynqmp_pm_get_rpu_mode(u32 node_id, enum rpu_oper_mode *rpu_mode)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='hunk'>@@ -900,6 +944,13 @@ static inline int zynqmp_pm_set_tcm_config(u32 node_id, enum rpu_tcm_comb tcm_mo</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int zynqmp_pm_get_node_status(const u32 node, u32 *const status,</div><div class='add'>+					    u32 *const requirements,</div><div class='add'>+					    u32 *const usage)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int zynqmp_pm_set_sd_config(u32 node,</div><div class='ctx'> 					  enum pm_sd_config_type config,</div><div class='ctx'> 					  u32 value)</div><div class='head'>diff --git a/include/linux/flex_proportions.h b/include/linux/flex_proportions.h<br/>index 3e378b1fb0bc..e9a72fd0bfe7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/flex_proportions.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/flex_proportions.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/flex_proportions.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/flex_proportions.h</a></div><div class='hunk'>@@ -39,38 +39,6 @@ void fprop_global_destroy(struct fprop_global *p);</div><div class='ctx'> bool fprop_new_period(struct fprop_global *p, int periods);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  ---- SINGLE ----</div><div class='del'>- */</div><div class='del'>-struct fprop_local_single {</div><div class='del'>-	/* the local events counter */</div><div class='del'>-	unsigned long events;</div><div class='del'>-	/* Period in which we last updated events */</div><div class='del'>-	unsigned int period;</div><div class='del'>-	raw_spinlock_t lock;	/* Protect period and numerator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define INIT_FPROP_LOCAL_SINGLE(name)			\</div><div class='del'>-{	.lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock),	\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int fprop_local_init_single(struct fprop_local_single *pl);</div><div class='del'>-void fprop_local_destroy_single(struct fprop_local_single *pl);</div><div class='del'>-void __fprop_inc_single(struct fprop_global *p, struct fprop_local_single *pl);</div><div class='del'>-void fprop_fraction_single(struct fprop_global *p,</div><div class='del'>-	struct fprop_local_single *pl, unsigned long *numerator,</div><div class='del'>-	unsigned long *denominator);</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void fprop_inc_single(struct fprop_global *p, struct fprop_local_single *pl)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	__fprop_inc_single(p, pl);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * ---- PERCPU ----</div><div class='ctx'>  */</div><div class='ctx'> struct fprop_local_percpu {</div><div class='head'>diff --git a/include/linux/folio_queue.h b/include/linux/folio_queue.h<br/>new file mode 100644<br/>index 000000000000..adab609c972e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/folio_queue.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/folio_queue.h</a></div><div class='hunk'>@@ -0,0 +1,282 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* Queue of folios definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ *</div><div class='add'>+ * See:</div><div class='add'>+ *</div><div class='add'>+ *	Documentation/core-api/folio_queue.rst</div><div class='add'>+ *</div><div class='add'>+ * for a description of the API.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_FOLIO_QUEUE_H</div><div class='add'>+#define _LINUX_FOLIO_QUEUE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pagevec.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Segment in a queue of running buffers.  Each segment can hold a number of</div><div class='add'>+ * folios and a portion of the queue can be referenced with the ITER_FOLIOQ</div><div class='add'>+ * iterator.  The possibility exists of inserting non-folio elements into the</div><div class='add'>+ * queue (such as gaps).</div><div class='add'>+ *</div><div class='add'>+ * Explicit prev and next pointers are used instead of a list_head to make it</div><div class='add'>+ * easier to add segments to tail and remove them from the head without the</div><div class='add'>+ * need for a lock.</div><div class='add'>+ */</div><div class='add'>+struct folio_queue {</div><div class='add'>+	struct folio_batch	vec;		/* Folios in the queue segment */</div><div class='add'>+	u8			orders[PAGEVEC_SIZE]; /* Order of each folio */</div><div class='add'>+	struct folio_queue	*next;		/* Next queue segment or NULL */</div><div class='add'>+	struct folio_queue	*prev;		/* Previous queue segment of NULL */</div><div class='add'>+	unsigned long		marks;		/* 1-bit mark per folio */</div><div class='add'>+	unsigned long		marks2;		/* Second 1-bit mark per folio */</div><div class='add'>+#if PAGEVEC_SIZE &gt; BITS_PER_LONG</div><div class='add'>+#error marks is not big enough</div><div class='add'>+#endif</div><div class='add'>+	unsigned int		rreq_id;</div><div class='add'>+	unsigned int		debug_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_init - Initialise a folio queue segment</div><div class='add'>+ * @folioq: The segment to initialise</div><div class='add'>+ * @rreq_id: The request identifier to use in tracelines.</div><div class='add'>+ *</div><div class='add'>+ * Initialise a folio queue segment and set an identifier to be used in traces.</div><div class='add'>+ *</div><div class='add'>+ * Note that the folio pointers are left uninitialised.</div><div class='add'>+ */</div><div class='add'>+static inline void folioq_init(struct folio_queue *folioq, unsigned int rreq_id)</div><div class='add'>+{</div><div class='add'>+	folio_batch_init(&amp;folioq-&gt;vec);</div><div class='add'>+	folioq-&gt;next = NULL;</div><div class='add'>+	folioq-&gt;prev = NULL;</div><div class='add'>+	folioq-&gt;marks = 0;</div><div class='add'>+	folioq-&gt;marks2 = 0;</div><div class='add'>+	folioq-&gt;rreq_id = rreq_id;</div><div class='add'>+	folioq-&gt;debug_id = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_nr_slots: Query the capacity of a folio queue segment</div><div class='add'>+ * @folioq: The segment to query</div><div class='add'>+ *</div><div class='add'>+ * Query the number of folios that a particular folio queue segment might hold.</div><div class='add'>+ * [!] NOTE: This must not be assumed to be the same for every segment!</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int folioq_nr_slots(const struct folio_queue *folioq)</div><div class='add'>+{</div><div class='add'>+	return PAGEVEC_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_count: Query the occupancy of a folio queue segment</div><div class='add'>+ * @folioq: The segment to query</div><div class='add'>+ *</div><div class='add'>+ * Query the number of folios that have been added to a folio queue segment.</div><div class='add'>+ * Note that this is not decreased as folios are removed from a segment.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int folioq_count(struct folio_queue *folioq)</div><div class='add'>+{</div><div class='add'>+	return folio_batch_count(&amp;folioq-&gt;vec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_full: Query if a folio queue segment is full</div><div class='add'>+ * @folioq: The segment to query</div><div class='add'>+ *</div><div class='add'>+ * Query if a folio queue segment is fully occupied.  Note that this does not</div><div class='add'>+ * change if folios are removed from a segment.</div><div class='add'>+ */</div><div class='add'>+static inline bool folioq_full(struct folio_queue *folioq)</div><div class='add'>+{</div><div class='add'>+	//return !folio_batch_space(&amp;folioq-&gt;vec);</div><div class='add'>+	return folioq_count(folioq) &gt;= folioq_nr_slots(folioq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_is_marked: Check first folio mark in a folio queue segment</div><div class='add'>+ * @folioq: The segment to query</div><div class='add'>+ * @slot: The slot number of the folio to query</div><div class='add'>+ *</div><div class='add'>+ * Determine if the first mark is set for the folio in the specified slot in a</div><div class='add'>+ * folio queue segment.</div><div class='add'>+ */</div><div class='add'>+static inline bool folioq_is_marked(const struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	return test_bit(slot, &amp;folioq-&gt;marks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_mark: Set the first mark on a folio in a folio queue segment</div><div class='add'>+ * @folioq: The segment to modify</div><div class='add'>+ * @slot: The slot number of the folio to modify</div><div class='add'>+ *</div><div class='add'>+ * Set the first mark for the folio in the specified slot in a folio queue</div><div class='add'>+ * segment.</div><div class='add'>+ */</div><div class='add'>+static inline void folioq_mark(struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	set_bit(slot, &amp;folioq-&gt;marks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_unmark: Clear the first mark on a folio in a folio queue segment</div><div class='add'>+ * @folioq: The segment to modify</div><div class='add'>+ * @slot: The slot number of the folio to modify</div><div class='add'>+ *</div><div class='add'>+ * Clear the first mark for the folio in the specified slot in a folio queue</div><div class='add'>+ * segment.</div><div class='add'>+ */</div><div class='add'>+static inline void folioq_unmark(struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	clear_bit(slot, &amp;folioq-&gt;marks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_is_marked2: Check second folio mark in a folio queue segment</div><div class='add'>+ * @folioq: The segment to query</div><div class='add'>+ * @slot: The slot number of the folio to query</div><div class='add'>+ *</div><div class='add'>+ * Determine if the second mark is set for the folio in the specified slot in a</div><div class='add'>+ * folio queue segment.</div><div class='add'>+ */</div><div class='add'>+static inline bool folioq_is_marked2(const struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	return test_bit(slot, &amp;folioq-&gt;marks2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_mark2: Set the second mark on a folio in a folio queue segment</div><div class='add'>+ * @folioq: The segment to modify</div><div class='add'>+ * @slot: The slot number of the folio to modify</div><div class='add'>+ *</div><div class='add'>+ * Set the second mark for the folio in the specified slot in a folio queue</div><div class='add'>+ * segment.</div><div class='add'>+ */</div><div class='add'>+static inline void folioq_mark2(struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	set_bit(slot, &amp;folioq-&gt;marks2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_unmark2: Clear the second mark on a folio in a folio queue segment</div><div class='add'>+ * @folioq: The segment to modify</div><div class='add'>+ * @slot: The slot number of the folio to modify</div><div class='add'>+ *</div><div class='add'>+ * Clear the second mark for the folio in the specified slot in a folio queue</div><div class='add'>+ * segment.</div><div class='add'>+ */</div><div class='add'>+static inline void folioq_unmark2(struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	clear_bit(slot, &amp;folioq-&gt;marks2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_append: Add a folio to a folio queue segment</div><div class='add'>+ * @folioq: The segment to add to</div><div class='add'>+ * @folio: The folio to add</div><div class='add'>+ *</div><div class='add'>+ * Add a folio to the tail of the sequence in a folio queue segment, increasing</div><div class='add'>+ * the occupancy count and returning the slot number for the folio just added.</div><div class='add'>+ * The folio size is extracted and stored in the queue and the marks are left</div><div class='add'>+ * unmodified.</div><div class='add'>+ *</div><div class='add'>+ * Note that it's left up to the caller to check that the segment capacity will</div><div class='add'>+ * not be exceeded and to extend the queue.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int folioq_append(struct folio_queue *folioq, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	unsigned int slot = folioq-&gt;vec.nr++;</div><div class='add'>+</div><div class='add'>+	folioq-&gt;vec.folios[slot] = folio;</div><div class='add'>+	folioq-&gt;orders[slot] = folio_order(folio);</div><div class='add'>+	return slot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_append_mark: Add a folio to a folio queue segment</div><div class='add'>+ * @folioq: The segment to add to</div><div class='add'>+ * @folio: The folio to add</div><div class='add'>+ *</div><div class='add'>+ * Add a folio to the tail of the sequence in a folio queue segment, increasing</div><div class='add'>+ * the occupancy count and returning the slot number for the folio just added.</div><div class='add'>+ * The folio size is extracted and stored in the queue, the first mark is set</div><div class='add'>+ * and and the second and third marks are left unmodified.</div><div class='add'>+ *</div><div class='add'>+ * Note that it's left up to the caller to check that the segment capacity will</div><div class='add'>+ * not be exceeded and to extend the queue.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int folioq_append_mark(struct folio_queue *folioq, struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	unsigned int slot = folioq-&gt;vec.nr++;</div><div class='add'>+</div><div class='add'>+	folioq-&gt;vec.folios[slot] = folio;</div><div class='add'>+	folioq-&gt;orders[slot] = folio_order(folio);</div><div class='add'>+	folioq_mark(folioq, slot);</div><div class='add'>+	return slot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_folio: Get a folio from a folio queue segment</div><div class='add'>+ * @folioq: The segment to access</div><div class='add'>+ * @slot: The folio slot to access</div><div class='add'>+ *</div><div class='add'>+ * Retrieve the folio in the specified slot from a folio queue segment.  Note</div><div class='add'>+ * that no bounds check is made and if the slot hasn't been added into yet, the</div><div class='add'>+ * pointer will be undefined.  If the slot has been cleared, NULL will be</div><div class='add'>+ * returned.</div><div class='add'>+ */</div><div class='add'>+static inline struct folio *folioq_folio(const struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	return folioq-&gt;vec.folios[slot];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_folio_order: Get the order of a folio from a folio queue segment</div><div class='add'>+ * @folioq: The segment to access</div><div class='add'>+ * @slot: The folio slot to access</div><div class='add'>+ *</div><div class='add'>+ * Retrieve the order of the folio in the specified slot from a folio queue</div><div class='add'>+ * segment.  Note that no bounds check is made and if the slot hasn't been</div><div class='add'>+ * added into yet, the order returned will be 0.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int folioq_folio_order(const struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	return folioq-&gt;orders[slot];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_folio_size: Get the size of a folio from a folio queue segment</div><div class='add'>+ * @folioq: The segment to access</div><div class='add'>+ * @slot: The folio slot to access</div><div class='add'>+ *</div><div class='add'>+ * Retrieve the size of the folio in the specified slot from a folio queue</div><div class='add'>+ * segment.  Note that no bounds check is made and if the slot hasn't been</div><div class='add'>+ * added into yet, the size returned will be PAGE_SIZE.</div><div class='add'>+ */</div><div class='add'>+static inline size_t folioq_folio_size(const struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	return PAGE_SIZE &lt;&lt; folioq_folio_order(folioq, slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folioq_clear: Clear a folio from a folio queue segment</div><div class='add'>+ * @folioq: The segment to clear</div><div class='add'>+ * @slot: The folio slot to clear</div><div class='add'>+ *</div><div class='add'>+ * Clear a folio from a sequence in a folio queue segment and clear its marks.</div><div class='add'>+ * The occupancy count is left unchanged.</div><div class='add'>+ */</div><div class='add'>+static inline void folioq_clear(struct folio_queue *folioq, unsigned int slot)</div><div class='add'>+{</div><div class='add'>+	folioq-&gt;vec.folios[slot] = NULL;</div><div class='add'>+	folioq_unmark(folioq, slot);</div><div class='add'>+	folioq_unmark2(folioq, slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_FOLIO_QUEUE_H */</div><div class='head'>diff --git a/include/linux/font.h b/include/linux/font.h<br/>index abf1442ce719..fd8625cd76b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/font.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/font.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/font.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/font.h</a></div><div class='hunk'>@@ -35,6 +35,7 @@ struct font_desc {</div><div class='ctx'> #define FONT6x10_IDX	10</div><div class='ctx'> #define TER16x32_IDX	11</div><div class='ctx'> #define FONT6x8_IDX	12</div><div class='add'>+#define TER10x18_IDX	13</div><div class='ctx'> </div><div class='ctx'> extern const struct font_desc	font_vga_8x8,</div><div class='ctx'> 			font_vga_8x16,</div><div class='hunk'>@@ -48,7 +49,8 @@ extern const struct font_desc	font_vga_8x8,</div><div class='ctx'> 			font_mini_4x6,</div><div class='ctx'> 			font_6x10,</div><div class='ctx'> 			font_ter_16x32,</div><div class='del'>-			font_6x8;</div><div class='add'>+			font_6x8,</div><div class='add'>+			font_ter_10x18;</div><div class='ctx'> </div><div class='ctx'> /* Find a font with a specific name */</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +59,8 @@ extern const struct font_desc *find_font(const char *name);</div><div class='ctx'> /* Get the default font for a specific screen size */</div><div class='ctx'> </div><div class='ctx'> extern const struct font_desc *get_default_font(int xres, int yres,</div><div class='del'>-						u32 font_w, u32 font_h);</div><div class='add'>+						unsigned long *font_w,</div><div class='add'>+						unsigned long *font_h);</div><div class='ctx'> </div><div class='ctx'> /* Max. length for the name of a predefined font */</div><div class='ctx'> #define MAX_FONT_NAME	32</div><div class='head'>diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h<br/>index 6aeebe0a6777..b3b53f8c1b28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fortify-string.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fortify-string.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fortify-string.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fortify-string.h</a></div><div class='hunk'>@@ -15,10 +15,14 @@</div><div class='ctx'> #define FORTIFY_REASON(func, write)	(FIELD_PREP(BIT(0), write) | \</div><div class='ctx'> 					 FIELD_PREP(GENMASK(7, 1), func))</div><div class='ctx'> </div><div class='add'>+/* Overridden by KUnit tests. */</div><div class='ctx'> #ifndef fortify_panic</div><div class='ctx'> # define fortify_panic(func, write, avail, size, retfail)	\</div><div class='ctx'> 	 __fortify_panic(FORTIFY_REASON(func, write), avail, size)</div><div class='ctx'> #endif</div><div class='add'>+#ifndef fortify_warn_once</div><div class='add'>+# define fortify_warn_once(x...)	WARN_ONCE(x)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define FORTIFY_READ		 0</div><div class='ctx'> #define FORTIFY_WRITE		 1</div><div class='hunk'>@@ -71,17 +75,30 @@ void __write_overflow_field(size_t avail, size_t wanted) __compiletime_warning("</div><div class='ctx'> 	__ret;							\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)</div><div class='add'>+#if defined(__SANITIZE_ADDRESS__)</div><div class='add'>+</div><div class='add'>+#if !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX) &amp;&amp; !defined(CONFIG_GENERIC_ENTRY)</div><div class='add'>+extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(memset);</div><div class='add'>+extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(memmove);</div><div class='add'>+extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(memcpy);</div><div class='add'>+#elif defined(CONFIG_KASAN_GENERIC)</div><div class='add'>+extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(__asan_memset);</div><div class='add'>+extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(__asan_memmove);</div><div class='add'>+extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(__asan_memcpy);</div><div class='add'>+#else /* CONFIG_KASAN_SW_TAGS */</div><div class='add'>+extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(__hwasan_memset);</div><div class='add'>+extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(__hwasan_memmove);</div><div class='add'>+extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(__hwasan_memcpy);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> extern void *__underlying_memchr(const void *p, int c, __kernel_size_t size) __RENAME(memchr);</div><div class='ctx'> extern int __underlying_memcmp(const void *p, const void *q, __kernel_size_t size) __RENAME(memcmp);</div><div class='del'>-extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(memcpy);</div><div class='del'>-extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(memmove);</div><div class='del'>-extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(memset);</div><div class='ctx'> extern char *__underlying_strcat(char *p, const char *q) __RENAME(strcat);</div><div class='ctx'> extern char *__underlying_strcpy(char *p, const char *q) __RENAME(strcpy);</div><div class='ctx'> extern __kernel_size_t __underlying_strlen(const char *p) __RENAME(strlen);</div><div class='ctx'> extern char *__underlying_strncat(char *p, const char *q, __kernel_size_t count) __RENAME(strncat);</div><div class='ctx'> extern char *__underlying_strncpy(char *p, const char *q, __kernel_size_t size) __RENAME(strncpy);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #if defined(__SANITIZE_MEMORY__)</div><div class='hunk'>@@ -106,6 +123,7 @@ extern char *__underlying_strncpy(char *p, const char *q, __kernel_size_t size)</div><div class='ctx'> #define __underlying_strlen	__builtin_strlen</div><div class='ctx'> #define __underlying_strncat	__builtin_strncat</div><div class='ctx'> #define __underlying_strncpy	__builtin_strncpy</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -578,16 +596,12 @@ __FORTIFY_INLINE bool fortify_memcpy_chk(__kernel_size_t size,</div><div class='ctx'> 	if (p_size != SIZE_MAX &amp;&amp; p_size &lt; size)</div><div class='ctx'> 		fortify_panic(func, FORTIFY_WRITE, p_size, size, true);</div><div class='ctx'> 	else if (q_size != SIZE_MAX &amp;&amp; q_size &lt; size)</div><div class='del'>-		fortify_panic(func, FORTIFY_READ, p_size, size, true);</div><div class='add'>+		fortify_panic(func, FORTIFY_READ, q_size, size, true);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Warn when writing beyond destination field size.</div><div class='ctx'> 	 *</div><div class='del'>-	 * We must ignore p_size_field == 0 for existing 0-element</div><div class='del'>-	 * fake flexible arrays, until they are all converted to</div><div class='del'>-	 * proper flexible arrays.</div><div class='del'>-	 *</div><div class='del'>-	 * The implementation of __builtin_*object_size() behaves</div><div class='add'>+	 * Note the implementation of __builtin_*object_size() behaves</div><div class='ctx'> 	 * like sizeof() when not directly referencing a flexible</div><div class='ctx'> 	 * array member, which means there will be many bounds checks</div><div class='ctx'> 	 * that will appear at run-time, without a way for them to be</div><div class='hunk'>@@ -595,13 +609,19 @@ __FORTIFY_INLINE bool fortify_memcpy_chk(__kernel_size_t size,</div><div class='ctx'> 	 * is specifically the flexible array member).</div><div class='ctx'> 	 * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101832</div><div class='ctx'> 	 */</div><div class='del'>-	if (p_size_field != 0 &amp;&amp; p_size_field != SIZE_MAX &amp;&amp;</div><div class='add'>+	if (p_size_field != SIZE_MAX &amp;&amp;</div><div class='ctx'> 	    p_size != p_size_field &amp;&amp; p_size_field &lt; size)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * To work around what seems to be an optimizer bug, the macro arguments</div><div class='add'>+ * need to have const copies or the values end up changed by the time they</div><div class='add'>+ * reach fortify_warn_once(). See commit 6f7630b1b5bc ("fortify: Capture</div><div class='add'>+ * __bos() results in const temp vars") for more details.</div><div class='add'>+ */</div><div class='ctx'> #define __fortify_memcpy_chk(p, q, size, p_size, q_size,		\</div><div class='ctx'> 			     p_size_field, q_size_field, op) ({		\</div><div class='ctx'> 	const size_t __fortify_size = (size_t)(size);			\</div><div class='hunk'>@@ -609,14 +629,20 @@ __FORTIFY_INLINE bool fortify_memcpy_chk(__kernel_size_t size,</div><div class='ctx'> 	const size_t __q_size = (q_size);				\</div><div class='ctx'> 	const size_t __p_size_field = (p_size_field);			\</div><div class='ctx'> 	const size_t __q_size_field = (q_size_field);			\</div><div class='del'>-	WARN_ONCE(fortify_memcpy_chk(__fortify_size, __p_size,		\</div><div class='add'>+	/* Keep a mutable version of the size for the final copy. */	\</div><div class='add'>+	size_t __copy_size = __fortify_size;				\</div><div class='add'>+	fortify_warn_once(fortify_memcpy_chk(__fortify_size, __p_size,	\</div><div class='ctx'> 				     __q_size, __p_size_field,		\</div><div class='ctx'> 				     __q_size_field, FORTIFY_FUNC_ ##op), \</div><div class='ctx'> 		  #op ": detected field-spanning write (size %zu) of single %s (size %zu)\n", \</div><div class='ctx'> 		  __fortify_size,					\</div><div class='ctx'> 		  "field \"" #p "\" at " FILE_LINE,			\</div><div class='ctx'> 		  __p_size_field);					\</div><div class='del'>-	__underlying_##op(p, q, __fortify_size);			\</div><div class='add'>+	/* Hide only the run-time size from value range tracking to */	\</div><div class='add'>+	/* silence compile-time false positive bounds warnings. */	\</div><div class='add'>+	if (!__builtin_constant_p(__copy_size))				\</div><div class='add'>+		OPTIMIZER_HIDE_VAR(__copy_size);			\</div><div class='add'>+	__underlying_##op(p, q, __copy_size);				\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -725,18 +751,20 @@ __FORTIFY_INLINE void *memchr_inv(const void * const POS0 p, int c, size_t size)</div><div class='ctx'> 	return __real_memchr_inv(p, c, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void *__real_kmemdup(const void *src, size_t len, gfp_t gfp) __RENAME(kmemdup)</div><div class='add'>+extern void *__real_kmemdup(const void *src, size_t len, gfp_t gfp) __RENAME(kmemdup_noprof)</div><div class='ctx'> 								    __realloc_size(2);</div><div class='del'>-__FORTIFY_INLINE void *kmemdup(const void * const POS0 p, size_t size, gfp_t gfp)</div><div class='add'>+__FORTIFY_INLINE void *kmemdup_noprof(const void * const POS0 p, size_t size, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	const size_t p_size = __struct_size(p);</div><div class='ctx'> </div><div class='ctx'> 	if (__compiletime_lessthan(p_size, size))</div><div class='ctx'> 		__read_overflow();</div><div class='ctx'> 	if (p_size &lt; size)</div><div class='del'>-		fortify_panic(FORTIFY_FUNC_kmemdup, FORTIFY_READ, p_size, size, NULL);</div><div class='add'>+		fortify_panic(FORTIFY_FUNC_kmemdup, FORTIFY_READ, p_size, size,</div><div class='add'>+			      __real_kmemdup(p, 0, gfp));</div><div class='ctx'> 	return __real_kmemdup(p, size, gfp);</div><div class='ctx'> }</div><div class='add'>+#define kmemdup(...)	alloc_hooks(kmemdup_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * strcpy - Copy a string into another string buffer</div><div class='head'>diff --git a/include/linux/fpga/adi-axi-common.h b/include/linux/fpga/adi-axi-common.h<br/>deleted file mode 100644<br/>index 141ac3f251e6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fpga/adi-axi-common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpga/adi-axi-common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- * Analog Devices AXI common registers &amp; definitions</div><div class='del'>- *</div><div class='del'>- * Copyright 2019 Analog Devices Inc.</div><div class='del'>- *</div><div class='del'>- * https://wiki.analog.com/resources/fpga/docs/axi_ip</div><div class='del'>- * https://wiki.analog.com/resources/fpga/docs/hdl/regmap</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ADI_AXI_COMMON_H_</div><div class='del'>-#define ADI_AXI_COMMON_H_</div><div class='del'>-</div><div class='del'>-#define ADI_AXI_REG_VERSION			0x0000</div><div class='del'>-</div><div class='del'>-#define ADI_AXI_PCORE_VER(major, minor, patch)	\</div><div class='del'>-	(((major) &lt;&lt; 16) | ((minor) &lt;&lt; 8) | (patch))</div><div class='del'>-</div><div class='del'>-#define ADI_AXI_PCORE_VER_MAJOR(version)	(((version) &gt;&gt; 16) &amp; 0xff)</div><div class='del'>-#define ADI_AXI_PCORE_VER_MINOR(version)	(((version) &gt;&gt; 8) &amp; 0xff)</div><div class='del'>-#define ADI_AXI_PCORE_VER_PATCH(version)	((version) &amp; 0xff)</div><div class='del'>-</div><div class='del'>-#endif /* ADI_AXI_COMMON_H_ */</div><div class='head'>diff --git a/include/linux/fpga/fpga-bridge.h b/include/linux/fpga/fpga-bridge.h<br/>index 223da48a6d18..94c4edd047e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fpga/fpga-bridge.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpga/fpga-bridge.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fpga/fpga-bridge.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fpga/fpga-bridge.h</a></div><div class='hunk'>@@ -45,6 +45,7 @@ struct fpga_bridge_info {</div><div class='ctx'>  * @dev: FPGA bridge device</div><div class='ctx'>  * @mutex: enforces exclusive reference to bridge</div><div class='ctx'>  * @br_ops: pointer to struct of FPGA bridge ops</div><div class='add'>+ * @br_ops_owner: module containing the br_ops</div><div class='ctx'>  * @info: fpga image specific information</div><div class='ctx'>  * @node: FPGA bridge list node</div><div class='ctx'>  * @priv: low level driver private date</div><div class='hunk'>@@ -54,6 +55,7 @@ struct fpga_bridge {</div><div class='ctx'> 	struct device dev;</div><div class='ctx'> 	struct mutex mutex; /* for exclusive reference to bridge */</div><div class='ctx'> 	const struct fpga_bridge_ops *br_ops;</div><div class='add'>+	struct module *br_ops_owner;</div><div class='ctx'> 	struct fpga_image_info *info;</div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> 	void *priv;</div><div class='hunk'>@@ -79,10 +81,12 @@ int of_fpga_bridge_get_to_list(struct device_node *np,</div><div class='ctx'> 			       struct fpga_image_info *info,</div><div class='ctx'> 			       struct list_head *bridge_list);</div><div class='ctx'> </div><div class='add'>+#define fpga_bridge_register(parent, name, br_ops, priv) \</div><div class='add'>+	__fpga_bridge_register(parent, name, br_ops, priv, THIS_MODULE)</div><div class='ctx'> struct fpga_bridge *</div><div class='del'>-fpga_bridge_register(struct device *parent, const char *name,</div><div class='del'>-		     const struct fpga_bridge_ops *br_ops,</div><div class='del'>-		     void *priv);</div><div class='add'>+__fpga_bridge_register(struct device *parent, const char *name,</div><div class='add'>+		       const struct fpga_bridge_ops *br_ops, void *priv,</div><div class='add'>+		       struct module *owner);</div><div class='ctx'> void fpga_bridge_unregister(struct fpga_bridge *br);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_FPGA_BRIDGE_H */</div><div class='head'>diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h<br/>index 54f63459efd6..0d4fe068f3d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fpga/fpga-mgr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpga/fpga-mgr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fpga/fpga-mgr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fpga/fpga-mgr.h</a></div><div class='hunk'>@@ -201,6 +201,7 @@ struct fpga_manager_ops {</div><div class='ctx'>  * @state: state of fpga manager</div><div class='ctx'>  * @compat_id: FPGA manager id for compatibility check.</div><div class='ctx'>  * @mops: pointer to struct of fpga manager ops</div><div class='add'>+ * @mops_owner: module containing the mops</div><div class='ctx'>  * @priv: low level driver private date</div><div class='ctx'>  */</div><div class='ctx'> struct fpga_manager {</div><div class='hunk'>@@ -210,6 +211,7 @@ struct fpga_manager {</div><div class='ctx'> 	enum fpga_mgr_states state;</div><div class='ctx'> 	struct fpga_compat_id *compat_id;</div><div class='ctx'> 	const struct fpga_manager_ops *mops;</div><div class='add'>+	struct module *mops_owner;</div><div class='ctx'> 	void *priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -230,18 +232,30 @@ struct fpga_manager *fpga_mgr_get(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> void fpga_mgr_put(struct fpga_manager *mgr);</div><div class='ctx'> </div><div class='add'>+#define fpga_mgr_register_full(parent, info) \</div><div class='add'>+	__fpga_mgr_register_full(parent, info, THIS_MODULE)</div><div class='ctx'> struct fpga_manager *</div><div class='del'>-fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *info);</div><div class='add'>+__fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *info,</div><div class='add'>+			 struct module *owner);</div><div class='ctx'> </div><div class='add'>+#define fpga_mgr_register(parent, name, mops, priv) \</div><div class='add'>+	__fpga_mgr_register(parent, name, mops, priv, THIS_MODULE)</div><div class='ctx'> struct fpga_manager *</div><div class='del'>-fpga_mgr_register(struct device *parent, const char *name,</div><div class='del'>-		  const struct fpga_manager_ops *mops, void *priv);</div><div class='add'>+__fpga_mgr_register(struct device *parent, const char *name,</div><div class='add'>+		    const struct fpga_manager_ops *mops, void *priv, struct module *owner);</div><div class='add'>+</div><div class='ctx'> void fpga_mgr_unregister(struct fpga_manager *mgr);</div><div class='ctx'> </div><div class='add'>+#define devm_fpga_mgr_register_full(parent, info) \</div><div class='add'>+	__devm_fpga_mgr_register_full(parent, info, THIS_MODULE)</div><div class='ctx'> struct fpga_manager *</div><div class='del'>-devm_fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *info);</div><div class='add'>+__devm_fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *info,</div><div class='add'>+			      struct module *owner);</div><div class='add'>+#define devm_fpga_mgr_register(parent, name, mops, priv) \</div><div class='add'>+	__devm_fpga_mgr_register(parent, name, mops, priv, THIS_MODULE)</div><div class='ctx'> struct fpga_manager *</div><div class='del'>-devm_fpga_mgr_register(struct device *parent, const char *name,</div><div class='del'>-		       const struct fpga_manager_ops *mops, void *priv);</div><div class='add'>+__devm_fpga_mgr_register(struct device *parent, const char *name,</div><div class='add'>+			 const struct fpga_manager_ops *mops, void *priv,</div><div class='add'>+			 struct module *owner);</div><div class='ctx'> </div><div class='ctx'> #endif /*_LINUX_FPGA_MGR_H */</div><div class='head'>diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h<br/>index 9d4d32909340..5fbc05fe70a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fpga/fpga-region.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fpga/fpga-region.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fpga/fpga-region.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fpga/fpga-region.h</a></div><div class='hunk'>@@ -36,6 +36,7 @@ struct fpga_region_info {</div><div class='ctx'>  * @mgr: FPGA manager</div><div class='ctx'>  * @info: FPGA image info</div><div class='ctx'>  * @compat_id: FPGA region id for compatibility check.</div><div class='add'>+ * @ops_owner: module containing the get_bridges function</div><div class='ctx'>  * @priv: private data</div><div class='ctx'>  * @get_bridges: optional function to get bridges to a list</div><div class='ctx'>  */</div><div class='hunk'>@@ -46,6 +47,7 @@ struct fpga_region {</div><div class='ctx'> 	struct fpga_manager *mgr;</div><div class='ctx'> 	struct fpga_image_info *info;</div><div class='ctx'> 	struct fpga_compat_id *compat_id;</div><div class='add'>+	struct module *ops_owner;</div><div class='ctx'> 	void *priv;</div><div class='ctx'> 	int (*get_bridges)(struct fpga_region *region);</div><div class='ctx'> };</div><div class='hunk'>@@ -58,12 +60,17 @@ fpga_region_class_find(struct device *start, const void *data,</div><div class='ctx'> </div><div class='ctx'> int fpga_region_program_fpga(struct fpga_region *region);</div><div class='ctx'> </div><div class='add'>+#define fpga_region_register_full(parent, info) \</div><div class='add'>+	__fpga_region_register_full(parent, info, THIS_MODULE)</div><div class='ctx'> struct fpga_region *</div><div class='del'>-fpga_region_register_full(struct device *parent, const struct fpga_region_info *info);</div><div class='add'>+__fpga_region_register_full(struct device *parent, const struct fpga_region_info *info,</div><div class='add'>+			    struct module *owner);</div><div class='ctx'> </div><div class='add'>+#define fpga_region_register(parent, mgr, get_bridges) \</div><div class='add'>+	__fpga_region_register(parent, mgr, get_bridges, THIS_MODULE)</div><div class='ctx'> struct fpga_region *</div><div class='del'>-fpga_region_register(struct device *parent, struct fpga_manager *mgr,</div><div class='del'>-		     int (*get_bridges)(struct fpga_region *));</div><div class='add'>+__fpga_region_register(struct device *parent, struct fpga_manager *mgr,</div><div class='add'>+		       int (*get_bridges)(struct fpga_region *), struct module *owner);</div><div class='ctx'> void fpga_region_unregister(struct fpga_region *region);</div><div class='ctx'> </div><div class='ctx'> #endif /* _FPGA_REGION_H */</div><div class='head'>diff --git a/include/linux/fprobe.h b/include/linux/fprobe.h<br/>index 3e03758151f4..0a3bcd1718f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fprobe.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fprobe.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fprobe.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fprobe.h</a></div><div class='hunk'>@@ -5,41 +5,69 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='del'>-#include &lt;linux/rethook.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/rhashtable.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+struct fprobe;</div><div class='add'>+typedef int (*fprobe_entry_cb)(struct fprobe *fp, unsigned long entry_ip,</div><div class='add'>+			       unsigned long ret_ip, struct ftrace_regs *regs,</div><div class='add'>+			       void *entry_data);</div><div class='add'>+</div><div class='add'>+typedef void (*fprobe_exit_cb)(struct fprobe *fp, unsigned long entry_ip,</div><div class='add'>+			       unsigned long ret_ip, struct ftrace_regs *regs,</div><div class='add'>+			       void *entry_data);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct fprobe_hlist_node - address based hash list node for fprobe.</div><div class='add'>+ *</div><div class='add'>+ * @hlist: The hlist node for address search hash table.</div><div class='add'>+ * @addr: One of the probing address of @fp.</div><div class='add'>+ * @fp: The fprobe which owns this.</div><div class='add'>+ */</div><div class='add'>+struct fprobe_hlist_node {</div><div class='add'>+	struct rhlist_head	hlist;</div><div class='add'>+	unsigned long		addr;</div><div class='add'>+	struct fprobe		*fp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct fprobe_hlist - hash list nodes for fprobe.</div><div class='add'>+ *</div><div class='add'>+ * @hlist: The hlist node for existence checking hash table.</div><div class='add'>+ * @rcu: rcu_head for RCU deferred release.</div><div class='add'>+ * @fp: The fprobe which owns this fprobe_hlist.</div><div class='add'>+ * @size: The size of @array.</div><div class='add'>+ * @array: The fprobe_hlist_node for each address to probe.</div><div class='add'>+ */</div><div class='add'>+struct fprobe_hlist {</div><div class='add'>+	struct hlist_node		hlist;</div><div class='add'>+	struct rcu_head			rcu;</div><div class='add'>+	struct fprobe			*fp;</div><div class='add'>+	int				size;</div><div class='add'>+	struct fprobe_hlist_node	array[] __counted_by(size);</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct fprobe - ftrace based probe.</div><div class='del'>- * @ops: The ftrace_ops.</div><div class='add'>+ *</div><div class='ctx'>  * @nmissed: The counter for missing events.</div><div class='ctx'>  * @flags: The status flag.</div><div class='del'>- * @rethook: The rethook data structure. (internal data)</div><div class='ctx'>  * @entry_data_size: The private data storage size.</div><div class='del'>- * @nr_maxactive: The max number of active functions.</div><div class='ctx'>  * @entry_handler: The callback function for function entry.</div><div class='ctx'>  * @exit_handler: The callback function for function exit.</div><div class='add'>+ * @hlist_array: The fprobe_hlist for fprobe search from IP hash table.</div><div class='ctx'>  */</div><div class='ctx'> struct fprobe {</div><div class='del'>-#ifdef CONFIG_FUNCTION_TRACER</div><div class='del'>-	/*</div><div class='del'>-	 * If CONFIG_FUNCTION_TRACER is not set, CONFIG_FPROBE is disabled too.</div><div class='del'>-	 * But user of fprobe may keep embedding the struct fprobe on their own</div><div class='del'>-	 * code. To avoid build error, this will keep the fprobe data structure</div><div class='del'>-	 * defined here, but remove ftrace_ops data structure.</div><div class='del'>-	 */</div><div class='del'>-	struct ftrace_ops	ops;</div><div class='del'>-#endif</div><div class='ctx'> 	unsigned long		nmissed;</div><div class='ctx'> 	unsigned int		flags;</div><div class='del'>-	struct rethook		*rethook;</div><div class='ctx'> 	size_t			entry_data_size;</div><div class='del'>-	int			nr_maxactive;</div><div class='del'>-</div><div class='del'>-	int (*entry_handler)(struct fprobe *fp, unsigned long entry_ip,</div><div class='del'>-			     unsigned long ret_ip, struct pt_regs *regs,</div><div class='del'>-			     void *entry_data);</div><div class='del'>-	void (*exit_handler)(struct fprobe *fp, unsigned long entry_ip,</div><div class='del'>-			     unsigned long ret_ip, struct pt_regs *regs,</div><div class='del'>-			     void *entry_data);</div><div class='add'>+</div><div class='add'>+	fprobe_entry_cb entry_handler;</div><div class='add'>+	fprobe_exit_cb  exit_handler;</div><div class='add'>+</div><div class='add'>+	struct fprobe_hlist	*hlist_array;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This fprobe is soft-disabled. */</div><div class='hunk'>@@ -67,6 +95,7 @@ int register_fprobe_ips(struct fprobe *fp, unsigned long *addrs, int num);</div><div class='ctx'> int register_fprobe_syms(struct fprobe *fp, const char **syms, int num);</div><div class='ctx'> int unregister_fprobe(struct fprobe *fp);</div><div class='ctx'> bool fprobe_is_registered(struct fprobe *fp);</div><div class='add'>+int fprobe_count_ips_from_filter(const char *filter, const char *notfilter);</div><div class='ctx'> #else</div><div class='ctx'> static inline int register_fprobe(struct fprobe *fp, const char *filter, const char *notfilter)</div><div class='ctx'> {</div><div class='hunk'>@@ -88,6 +117,10 @@ static inline bool fprobe_is_registered(struct fprobe *fp)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='add'>+static inline int fprobe_count_ips_from_filter(const char *filter, const char *notfilter)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -115,4 +148,9 @@ static inline void enable_fprobe(struct fprobe *fp)</div><div class='ctx'> 		fp-&gt;flags &amp;= ~FPROBE_FL_DISABLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The entry data size is 4 bits (=16) * sizeof(long) in maximum */</div><div class='add'>+#define FPROBE_DATA_SIZE_BITS		4</div><div class='add'>+#define MAX_FPROBE_DATA_SIZE_WORD	((1L &lt;&lt; FPROBE_DATA_SIZE_BITS) - 1)</div><div class='add'>+#define MAX_FPROBE_DATA_SIZE		(MAX_FPROBE_DATA_SIZE_WORD * sizeof(long))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/fpu.h b/include/linux/fpu.h<br/>new file mode 100644<br/>index 000000000000..2fb63e22913b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fpu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fpu.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_FPU_H</div><div class='add'>+#define _LINUX_FPU_H</div><div class='add'>+</div><div class='add'>+#ifdef _LINUX_FPU_COMPILATION_UNIT</div><div class='add'>+#error FP code must be compiled separately. See Documentation/core-api/floating-point.rst.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;asm/fpu.h&gt;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/framer/framer.h b/include/linux/framer/framer.h<br/>index 9a9b88962c29..2b85fe9e7f9a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/framer/framer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/framer/framer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/framer/framer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/framer/framer.h</a></div><div class='hunk'>@@ -181,12 +181,12 @@ static inline int framer_notifier_unregister(struct framer *framer,</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct framer *framer_get(struct device *dev, const char *con_id)</div><div class='add'>+static inline struct framer *framer_get(struct device *dev, const char *con_id)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENOSYS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void framer_put(struct device *dev, struct framer *framer)</div><div class='add'>+static inline void framer_put(struct device *dev, struct framer *framer)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/freezer.h b/include/linux/freezer.h<br/>index b303472255be..0a8c6c4d1a82 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/freezer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/freezer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/freezer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/freezer.h</a></div><div class='hunk'>@@ -22,14 +22,18 @@ extern bool pm_nosig_freezing;		/* PM nosig freezing in effect */</div><div class='ctx'> extern unsigned int freeze_timeout_msecs;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Check if a process has been frozen</div><div class='add'>+ * Check if a process has been frozen for PM or cgroup1 freezer. Note that</div><div class='add'>+ * cgroup2 freezer uses the job control mechanism and does not interact with</div><div class='add'>+ * the PM freezer.</div><div class='ctx'>  */</div><div class='ctx'> extern bool frozen(struct task_struct *p);</div><div class='ctx'> </div><div class='ctx'> extern bool freezing_slow_path(struct task_struct *p);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Check if there is a request to freeze a process</div><div class='add'>+ * Check if there is a request to freeze a task from PM or cgroup1 freezer.</div><div class='add'>+ * Note that cgroup2 freezer uses the job control mechanism and does not</div><div class='add'>+ * interact with the PM freezer.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool freezing(struct task_struct *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -47,6 +51,7 @@ extern int freeze_processes(void);</div><div class='ctx'> extern int freeze_kernel_threads(void);</div><div class='ctx'> extern void thaw_processes(void);</div><div class='ctx'> extern void thaw_kernel_threads(void);</div><div class='add'>+extern void thaw_process(struct task_struct *p);</div><div class='ctx'> </div><div class='ctx'> static inline bool try_to_freeze(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -62,9 +67,9 @@ extern bool freeze_task(struct task_struct *p);</div><div class='ctx'> extern bool set_freezable(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CGROUP_FREEZER</div><div class='del'>-extern bool cgroup_freezing(struct task_struct *task);</div><div class='add'>+extern bool cgroup1_freezing(struct task_struct *task);</div><div class='ctx'> #else /* !CONFIG_CGROUP_FREEZER */</div><div class='del'>-static inline bool cgroup_freezing(struct task_struct *task)</div><div class='add'>+static inline bool cgroup1_freezing(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -80,6 +85,7 @@ static inline int freeze_processes(void) { return -ENOSYS; }</div><div class='ctx'> static inline int freeze_kernel_threads(void) { return -ENOSYS; }</div><div class='ctx'> static inline void thaw_processes(void) {}</div><div class='ctx'> static inline void thaw_kernel_threads(void) {}</div><div class='add'>+static inline void thaw_process(struct task_struct *p) {}</div><div class='ctx'> </div><div class='ctx'> static inline bool try_to_freeze(void) { return false; }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/fs.h b/include/linux/fs.h<br/>index 0a22b7245982..04ceeca12a0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fs.h</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> #ifndef _LINUX_FS_H</div><div class='ctx'> #define _LINUX_FS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/fs/super.h&gt;</div><div class='add'>+#include &lt;linux/vfsdebug.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/wait_bit.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='hunk'>@@ -10,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/list_lru.h&gt;</div><div class='ctx'> #include &lt;linux/llist.h&gt;</div><div class='ctx'> #include &lt;linux/radix-tree.h&gt;</div><div class='ctx'> #include &lt;linux/xarray.h&gt;</div><div class='hunk'>@@ -36,7 +37,6 @@</div><div class='ctx'> #include &lt;linux/uuid.h&gt;</div><div class='ctx'> #include &lt;linux/errseq.h&gt;</div><div class='ctx'> #include &lt;linux/ioprio.h&gt;</div><div class='del'>-#include &lt;linux/fs_types.h&gt;</div><div class='ctx'> #include &lt;linux/build_bug.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='hunk'>@@ -45,15 +45,15 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/maple_tree.h&gt;</div><div class='ctx'> #include &lt;linux/rw_hint.h&gt;</div><div class='add'>+#include &lt;linux/file_ref.h&gt;</div><div class='add'>+#include &lt;linux/unicode.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/fs.h&gt;</div><div class='ctx'> </div><div class='del'>-struct backing_dev_info;</div><div class='ctx'> struct bdi_writeback;</div><div class='ctx'> struct bio;</div><div class='ctx'> struct io_comp_batch;</div><div class='del'>-struct export_operations;</div><div class='ctx'> struct fiemap_extent_info;</div><div class='ctx'> struct hd_geometry;</div><div class='ctx'> struct iovec;</div><div class='hunk'>@@ -67,16 +67,13 @@ struct vfsmount;</div><div class='ctx'> struct cred;</div><div class='ctx'> struct swap_info_struct;</div><div class='ctx'> struct seq_file;</div><div class='del'>-struct workqueue_struct;</div><div class='ctx'> struct iov_iter;</div><div class='del'>-struct fscrypt_inode_info;</div><div class='del'>-struct fscrypt_operations;</div><div class='del'>-struct fsverity_info;</div><div class='del'>-struct fsverity_operations;</div><div class='add'>+struct fsnotify_mark_connector;</div><div class='ctx'> struct fs_context;</div><div class='ctx'> struct fs_parameter_spec;</div><div class='del'>-struct fileattr;</div><div class='add'>+struct file_kattr;</div><div class='ctx'> struct iomap_ops;</div><div class='add'>+struct delegated_inode;</div><div class='ctx'> </div><div class='ctx'> extern void __init inode_init(void);</div><div class='ctx'> extern void __init inode_init_early(void);</div><div class='hunk'>@@ -110,21 +107,28 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* file is open for reading */</div><div class='del'>-#define FMODE_READ		((__force fmode_t)0x1)</div><div class='add'>+#define FMODE_READ		((__force fmode_t)(1 &lt;&lt; 0))</div><div class='ctx'> /* file is open for writing */</div><div class='del'>-#define FMODE_WRITE		((__force fmode_t)0x2)</div><div class='add'>+#define FMODE_WRITE		((__force fmode_t)(1 &lt;&lt; 1))</div><div class='ctx'> /* file is seekable */</div><div class='del'>-#define FMODE_LSEEK		((__force fmode_t)0x4)</div><div class='add'>+#define FMODE_LSEEK		((__force fmode_t)(1 &lt;&lt; 2))</div><div class='ctx'> /* file can be accessed using pread */</div><div class='del'>-#define FMODE_PREAD		((__force fmode_t)0x8)</div><div class='add'>+#define FMODE_PREAD		((__force fmode_t)(1 &lt;&lt; 3))</div><div class='ctx'> /* file can be accessed using pwrite */</div><div class='del'>-#define FMODE_PWRITE		((__force fmode_t)0x10)</div><div class='add'>+#define FMODE_PWRITE		((__force fmode_t)(1 &lt;&lt; 4))</div><div class='ctx'> /* File is opened for execution with sys_execve / sys_uselib */</div><div class='del'>-#define FMODE_EXEC		((__force fmode_t)0x20)</div><div class='add'>+#define FMODE_EXEC		((__force fmode_t)(1 &lt;&lt; 5))</div><div class='add'>+/* File writes are restricted (block device specific) */</div><div class='add'>+#define FMODE_WRITE_RESTRICTED	((__force fmode_t)(1 &lt;&lt; 6))</div><div class='add'>+/* File supports atomic writes */</div><div class='add'>+#define FMODE_CAN_ATOMIC_WRITE	((__force fmode_t)(1 &lt;&lt; 7))</div><div class='add'>+</div><div class='add'>+/* FMODE_* bit 8 */</div><div class='add'>+</div><div class='ctx'> /* 32bit hashes as llseek() offset (for directories) */</div><div class='del'>-#define FMODE_32BITHASH         ((__force fmode_t)0x200)</div><div class='add'>+#define FMODE_32BITHASH         ((__force fmode_t)(1 &lt;&lt; 9))</div><div class='ctx'> /* 64bit hashes as llseek() offset (for directories) */</div><div class='del'>-#define FMODE_64BITHASH         ((__force fmode_t)0x400)</div><div class='add'>+#define FMODE_64BITHASH         ((__force fmode_t)(1 &lt;&lt; 10))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Don't update ctime and mtime.</div><div class='hunk'>@@ -132,60 +136,85 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,</div><div class='ctx'>  * Currently a special hack for the XFS open_by_handle ioctl, but we'll</div><div class='ctx'>  * hopefully graduate it to a proper O_CMTIME flag supported by open(2) soon.</div><div class='ctx'>  */</div><div class='del'>-#define FMODE_NOCMTIME		((__force fmode_t)0x800)</div><div class='add'>+#define FMODE_NOCMTIME		((__force fmode_t)(1 &lt;&lt; 11))</div><div class='ctx'> </div><div class='ctx'> /* Expect random access pattern */</div><div class='del'>-#define FMODE_RANDOM		((__force fmode_t)0x1000)</div><div class='add'>+#define FMODE_RANDOM		((__force fmode_t)(1 &lt;&lt; 12))</div><div class='ctx'> </div><div class='del'>-/* File is huge (eg. /dev/mem): treat loff_t as unsigned */</div><div class='del'>-#define FMODE_UNSIGNED_OFFSET	((__force fmode_t)0x2000)</div><div class='add'>+/* Supports IOCB_HAS_METADATA */</div><div class='add'>+#define FMODE_HAS_METADATA	((__force fmode_t)(1 &lt;&lt; 13))</div><div class='ctx'> </div><div class='ctx'> /* File is opened with O_PATH; almost nothing can be done with it */</div><div class='del'>-#define FMODE_PATH		((__force fmode_t)0x4000)</div><div class='add'>+#define FMODE_PATH		((__force fmode_t)(1 &lt;&lt; 14))</div><div class='ctx'> </div><div class='ctx'> /* File needs atomic accesses to f_pos */</div><div class='del'>-#define FMODE_ATOMIC_POS	((__force fmode_t)0x8000)</div><div class='add'>+#define FMODE_ATOMIC_POS	((__force fmode_t)(1 &lt;&lt; 15))</div><div class='ctx'> /* Write access to underlying fs */</div><div class='del'>-#define FMODE_WRITER		((__force fmode_t)0x10000)</div><div class='add'>+#define FMODE_WRITER		((__force fmode_t)(1 &lt;&lt; 16))</div><div class='ctx'> /* Has read method(s) */</div><div class='del'>-#define FMODE_CAN_READ          ((__force fmode_t)0x20000)</div><div class='add'>+#define FMODE_CAN_READ          ((__force fmode_t)(1 &lt;&lt; 17))</div><div class='ctx'> /* Has write method(s) */</div><div class='del'>-#define FMODE_CAN_WRITE         ((__force fmode_t)0x40000)</div><div class='add'>+#define FMODE_CAN_WRITE         ((__force fmode_t)(1 &lt;&lt; 18))</div><div class='ctx'> </div><div class='del'>-#define FMODE_OPENED		((__force fmode_t)0x80000)</div><div class='del'>-#define FMODE_CREATED		((__force fmode_t)0x100000)</div><div class='add'>+#define FMODE_OPENED		((__force fmode_t)(1 &lt;&lt; 19))</div><div class='add'>+#define FMODE_CREATED		((__force fmode_t)(1 &lt;&lt; 20))</div><div class='ctx'> </div><div class='ctx'> /* File is stream-like */</div><div class='del'>-#define FMODE_STREAM		((__force fmode_t)0x200000)</div><div class='add'>+#define FMODE_STREAM		((__force fmode_t)(1 &lt;&lt; 21))</div><div class='ctx'> </div><div class='ctx'> /* File supports DIRECT IO */</div><div class='del'>-#define	FMODE_CAN_ODIRECT	((__force fmode_t)0x400000)</div><div class='add'>+#define	FMODE_CAN_ODIRECT	((__force fmode_t)(1 &lt;&lt; 22))</div><div class='ctx'> </div><div class='del'>-#define	FMODE_NOREUSE		((__force fmode_t)0x800000)</div><div class='del'>-</div><div class='del'>-/* File supports non-exclusive O_DIRECT writes from multiple threads */</div><div class='del'>-#define FMODE_DIO_PARALLEL_WRITE	((__force fmode_t)0x1000000)</div><div class='add'>+#define	FMODE_NOREUSE		((__force fmode_t)(1 &lt;&lt; 23))</div><div class='ctx'> </div><div class='ctx'> /* File is embedded in backing_file object */</div><div class='del'>-#define FMODE_BACKING		((__force fmode_t)0x2000000)</div><div class='add'>+#define FMODE_BACKING		((__force fmode_t)(1 &lt;&lt; 24))</div><div class='ctx'> </div><div class='del'>-/* File was opened by fanotify and shouldn't generate fanotify events */</div><div class='del'>-#define FMODE_NONOTIFY		((__force fmode_t)0x4000000)</div><div class='add'>+/*</div><div class='add'>+ * Together with FMODE_NONOTIFY_PERM defines which fsnotify events shouldn't be</div><div class='add'>+ * generated (see below)</div><div class='add'>+ */</div><div class='add'>+#define FMODE_NONOTIFY		((__force fmode_t)(1 &lt;&lt; 25))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Together with FMODE_NONOTIFY defines which fsnotify events shouldn't be</div><div class='add'>+ * generated (see below)</div><div class='add'>+ */</div><div class='add'>+#define FMODE_NONOTIFY_PERM	((__force fmode_t)(1 &lt;&lt; 26))</div><div class='ctx'> </div><div class='ctx'> /* File is capable of returning -EAGAIN if I/O will block */</div><div class='del'>-#define FMODE_NOWAIT		((__force fmode_t)0x8000000)</div><div class='add'>+#define FMODE_NOWAIT		((__force fmode_t)(1 &lt;&lt; 27))</div><div class='ctx'> </div><div class='ctx'> /* File represents mount that needs unmounting */</div><div class='del'>-#define FMODE_NEED_UNMOUNT	((__force fmode_t)0x10000000)</div><div class='add'>+#define FMODE_NEED_UNMOUNT	((__force fmode_t)(1 &lt;&lt; 28))</div><div class='ctx'> </div><div class='ctx'> /* File does not contribute to nr_files count */</div><div class='del'>-#define FMODE_NOACCOUNT		((__force fmode_t)0x20000000)</div><div class='add'>+#define FMODE_NOACCOUNT		((__force fmode_t)(1 &lt;&lt; 29))</div><div class='ctx'> </div><div class='del'>-/* File supports async buffered reads */</div><div class='del'>-#define FMODE_BUF_RASYNC	((__force fmode_t)0x40000000)</div><div class='del'>-</div><div class='del'>-/* File supports async nowait buffered writes */</div><div class='del'>-#define FMODE_BUF_WASYNC	((__force fmode_t)0x80000000)</div><div class='add'>+/*</div><div class='add'>+ * The two FMODE_NONOTIFY* define which fsnotify events should not be generated</div><div class='add'>+ * for an open file. These are the possible values of</div><div class='add'>+ * (f-&gt;f_mode &amp; FMODE_FSNOTIFY_MASK) and their meaning:</div><div class='add'>+ *</div><div class='add'>+ * FMODE_NONOTIFY - suppress all (incl. non-permission) events.</div><div class='add'>+ * FMODE_NONOTIFY_PERM - suppress permission (incl. pre-content) events.</div><div class='add'>+ * FMODE_NONOTIFY | FMODE_NONOTIFY_PERM - suppress only FAN_ACCESS_PERM.</div><div class='add'>+ */</div><div class='add'>+#define FMODE_FSNOTIFY_MASK \</div><div class='add'>+	(FMODE_NONOTIFY | FMODE_NONOTIFY_PERM)</div><div class='add'>+</div><div class='add'>+#define FMODE_FSNOTIFY_NONE(mode) \</div><div class='add'>+	((mode &amp; FMODE_FSNOTIFY_MASK) == FMODE_NONOTIFY)</div><div class='add'>+#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS</div><div class='add'>+#define FMODE_FSNOTIFY_HSM(mode) \</div><div class='add'>+	((mode &amp; FMODE_FSNOTIFY_MASK) == 0 || \</div><div class='add'>+	 (mode &amp; FMODE_FSNOTIFY_MASK) == (FMODE_NONOTIFY | FMODE_NONOTIFY_PERM))</div><div class='add'>+#define FMODE_FSNOTIFY_ACCESS_PERM(mode) \</div><div class='add'>+	((mode &amp; FMODE_FSNOTIFY_MASK) == 0)</div><div class='add'>+#else</div><div class='add'>+#define FMODE_FSNOTIFY_ACCESS_PERM(mode) 0</div><div class='add'>+#define FMODE_FSNOTIFY_HSM(mode)	0</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Attribute flags.  These should be or-ed together to figure out what</div><div class='hunk'>@@ -201,6 +230,7 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,</div><div class='ctx'> #define ATTR_ATIME_SET	(1 &lt;&lt; 7)</div><div class='ctx'> #define ATTR_MTIME_SET	(1 &lt;&lt; 8)</div><div class='ctx'> #define ATTR_FORCE	(1 &lt;&lt; 9) /* Not a change, but a change it */</div><div class='add'>+#define ATTR_CTIME_SET	(1 &lt;&lt; 10)</div><div class='ctx'> #define ATTR_KILL_SUID	(1 &lt;&lt; 11)</div><div class='ctx'> #define ATTR_KILL_SGID	(1 &lt;&lt; 12)</div><div class='ctx'> #define ATTR_FILE	(1 &lt;&lt; 13)</div><div class='hunk'>@@ -208,6 +238,7 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,</div><div class='ctx'> #define ATTR_OPEN	(1 &lt;&lt; 15) /* Truncating from open(O_TRUNC) */</div><div class='ctx'> #define ATTR_TIMES_SET	(1 &lt;&lt; 16)</div><div class='ctx'> #define ATTR_TOUCH	(1 &lt;&lt; 17)</div><div class='add'>+#define ATTR_DELEG	(1 &lt;&lt; 18) /* Delegated attrs. Don't break write delegations */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Whiteout is represented by a char device.  The following constants define the</div><div class='hunk'>@@ -262,11 +293,6 @@ struct iattr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Includes for diskquotas.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/quota.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Maximum number of layers of fs stack.  Needs to be limited to</div><div class='ctx'>  * prevent kernel stack overflow</div><div class='ctx'>  */</div><div class='hunk'>@@ -317,6 +343,9 @@ struct readahead_control;</div><div class='ctx'> #define IOCB_SYNC		(__force int) RWF_SYNC</div><div class='ctx'> #define IOCB_NOWAIT		(__force int) RWF_NOWAIT</div><div class='ctx'> #define IOCB_APPEND		(__force int) RWF_APPEND</div><div class='add'>+#define IOCB_ATOMIC		(__force int) RWF_ATOMIC</div><div class='add'>+#define IOCB_DONTCACHE		(__force int) RWF_DONTCACHE</div><div class='add'>+#define IOCB_NOSIGNAL		(__force int) RWF_NOSIGNAL</div><div class='ctx'> </div><div class='ctx'> /* non-RWF related bits - start at 16 */</div><div class='ctx'> #define IOCB_EVENTFD		(1 &lt;&lt; 16)</div><div class='hunk'>@@ -327,22 +356,9 @@ struct readahead_control;</div><div class='ctx'> #define IOCB_NOIO		(1 &lt;&lt; 20)</div><div class='ctx'> /* can use bio alloc cache */</div><div class='ctx'> #define IOCB_ALLOC_CACHE	(1 &lt;&lt; 21)</div><div class='del'>-/*</div><div class='del'>- * IOCB_DIO_CALLER_COMP can be set by the iocb owner, to indicate that the</div><div class='del'>- * iocb completion can be passed back to the owner for execution from a safe</div><div class='del'>- * context rather than needing to be punted through a workqueue. If this</div><div class='del'>- * flag is set, the bio completion handling may set iocb-&gt;dio_complete to a</div><div class='del'>- * handler function and iocb-&gt;private to context information for that handler.</div><div class='del'>- * The issuer should call the handler with that context information from task</div><div class='del'>- * context to complete the processing of the iocb. Note that while this</div><div class='del'>- * provides a task context for the dio_complete() callback, it should only be</div><div class='del'>- * used on the completion side for non-IO generating completions. It's fine to</div><div class='del'>- * call blocking functions from this callback, but they should not wait for</div><div class='del'>- * unrelated IO (like cache flushing, new IO generation, etc).</div><div class='del'>- */</div><div class='del'>-#define IOCB_DIO_CALLER_COMP	(1 &lt;&lt; 22)</div><div class='ctx'> /* kiocb is a read or write operation submitted by fs/aio.c. */</div><div class='del'>-#define IOCB_AIO_RW		(1 &lt;&lt; 23)</div><div class='add'>+#define IOCB_AIO_RW		(1 &lt;&lt; 22)</div><div class='add'>+#define IOCB_HAS_METADATA	(1 &lt;&lt; 23)</div><div class='ctx'> </div><div class='ctx'> /* for use in trace events */</div><div class='ctx'> #define TRACE_IOCB_STRINGS \</div><div class='hunk'>@@ -351,13 +367,16 @@ struct readahead_control;</div><div class='ctx'> 	{ IOCB_SYNC,		"SYNC" }, \</div><div class='ctx'> 	{ IOCB_NOWAIT,		"NOWAIT" }, \</div><div class='ctx'> 	{ IOCB_APPEND,		"APPEND" }, \</div><div class='add'>+	{ IOCB_ATOMIC,		"ATOMIC" }, \</div><div class='add'>+	{ IOCB_DONTCACHE,	"DONTCACHE" }, \</div><div class='ctx'> 	{ IOCB_EVENTFD,		"EVENTFD"}, \</div><div class='ctx'> 	{ IOCB_DIRECT,		"DIRECT" }, \</div><div class='ctx'> 	{ IOCB_WRITE,		"WRITE" }, \</div><div class='ctx'> 	{ IOCB_WAITQ,		"WAITQ" }, \</div><div class='ctx'> 	{ IOCB_NOIO,		"NOIO" }, \</div><div class='ctx'> 	{ IOCB_ALLOC_CACHE,	"ALLOC_CACHE" }, \</div><div class='del'>-	{ IOCB_DIO_CALLER_COMP,	"CALLER_COMP" }</div><div class='add'>+	{ IOCB_AIO_RW,		"AIO_RW" }, \</div><div class='add'>+	{ IOCB_HAS_METADATA,	"AIO_HAS_METADATA" }</div><div class='ctx'> </div><div class='ctx'> struct kiocb {</div><div class='ctx'> 	struct file		*ki_filp;</div><div class='hunk'>@@ -366,23 +385,14 @@ struct kiocb {</div><div class='ctx'> 	void			*private;</div><div class='ctx'> 	int			ki_flags;</div><div class='ctx'> 	u16			ki_ioprio; /* See linux/ioprio.h */</div><div class='del'>-	union {</div><div class='del'>-		/*</div><div class='del'>-		 * Only used for async buffered reads, where it denotes the</div><div class='del'>-		 * page waitqueue associated with completing the read. Valid</div><div class='del'>-		 * IFF IOCB_WAITQ is set.</div><div class='del'>-		 */</div><div class='del'>-		struct wait_page_queue	*ki_waitq;</div><div class='del'>-		/*</div><div class='del'>-		 * Can be used for O_DIRECT IO, where the completion handling</div><div class='del'>-		 * is punted back to the issuer of the IO. May only be set</div><div class='del'>-		 * if IOCB_DIO_CALLER_COMP is set by the issuer, and the issuer</div><div class='del'>-		 * must then check for presence of this handler when ki_complete</div><div class='del'>-		 * is invoked. The data passed in to this handler must be</div><div class='del'>-		 * assigned to -&gt;private when dio_complete is assigned.</div><div class='del'>-		 */</div><div class='del'>-		ssize_t (*dio_complete)(void *data);</div><div class='del'>-	};</div><div class='add'>+	u8			ki_write_stream;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only used for async buffered reads, where it denotes the page</div><div class='add'>+	 * waitqueue associated with completing the read.</div><div class='add'>+	 * Valid IFF IOCB_WAITQ is set.</div><div class='add'>+	 */</div><div class='add'>+	struct wait_page_queue	*ki_waitq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool is_sync_kiocb(struct kiocb *kiocb)</div><div class='hunk'>@@ -391,7 +401,6 @@ static inline bool is_sync_kiocb(struct kiocb *kiocb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct address_space_operations {</div><div class='del'>-	int (*writepage)(struct page *page, struct writeback_control *wbc);</div><div class='ctx'> 	int (*read_folio)(struct file *, struct folio *);</div><div class='ctx'> </div><div class='ctx'> 	/* Write back some dirty pages from this mapping. */</div><div class='hunk'>@@ -402,12 +411,12 @@ struct address_space_operations {</div><div class='ctx'> </div><div class='ctx'> 	void (*readahead)(struct readahead_control *);</div><div class='ctx'> </div><div class='del'>-	int (*write_begin)(struct file *, struct address_space *mapping,</div><div class='add'>+	int (*write_begin)(const struct kiocb *, struct address_space *mapping,</div><div class='ctx'> 				loff_t pos, unsigned len,</div><div class='del'>-				struct page **pagep, void **fsdata);</div><div class='del'>-	int (*write_end)(struct file *, struct address_space *mapping,</div><div class='add'>+				struct folio **foliop, void **fsdata);</div><div class='add'>+	int (*write_end)(const struct kiocb *, struct address_space *mapping,</div><div class='ctx'> 				loff_t pos, unsigned len, unsigned copied,</div><div class='del'>-				struct page *page, void *fsdata);</div><div class='add'>+				struct folio *folio, void *fsdata);</div><div class='ctx'> </div><div class='ctx'> 	/* Unfortunately this kludge is needed for FIBMAP. Don't use it */</div><div class='ctx'> 	sector_t (*bmap)(struct address_space *, sector_t);</div><div class='hunk'>@@ -482,7 +491,7 @@ struct address_space {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On most architectures that alignment is already the case; but</div><div class='ctx'> 	 * must be enforced here for CRIS, to let the least significant bit</div><div class='del'>-	 * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON.</div><div class='add'>+	 * of struct folio's "mapping" pointer be used for FOLIO_MAPPING_ANON.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> /* XArray tags, for tagging dirty and writeback pages in the pagecache. */</div><div class='hunk'>@@ -493,7 +502,7 @@ struct address_space {</div><div class='ctx'> /*</div><div class='ctx'>  * Returns true if any of the pages in the mapping are marked with the tag.</div><div class='ctx'>  */</div><div class='del'>-static inline bool mapping_tagged(struct address_space *mapping, xa_mark_t tag)</div><div class='add'>+static inline bool mapping_tagged(const struct address_space *mapping, xa_mark_t tag)</div><div class='ctx'> {</div><div class='ctx'> 	return xa_marked(&amp;mapping-&gt;i_pages, tag);</div><div class='ctx'> }</div><div class='hunk'>@@ -541,7 +550,7 @@ static inline void i_mmap_assert_write_locked(struct address_space *mapping)</div><div class='ctx'> /*</div><div class='ctx'>  * Might pages of this file be mapped into userspace?</div><div class='ctx'>  */</div><div class='del'>-static inline int mapping_mapped(struct address_space *mapping)</div><div class='add'>+static inline int mapping_mapped(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return	!RB_EMPTY_ROOT(&amp;mapping-&gt;i_mmap.rb_root);</div><div class='ctx'> }</div><div class='hunk'>@@ -555,7 +564,7 @@ static inline int mapping_mapped(struct address_space *mapping)</div><div class='ctx'>  * If i_mmap_writable is negative, no new writable mappings are allowed. You</div><div class='ctx'>  * can only deny writable mappings, if none exists right now.</div><div class='ctx'>  */</div><div class='del'>-static inline int mapping_writably_mapped(struct address_space *mapping)</div><div class='add'>+static inline int mapping_writably_mapped(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic_read(&amp;mapping-&gt;i_mmap_writable) &gt; 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -614,13 +623,139 @@ is_uncached_acl(struct posix_acl *acl)</div><div class='ctx'> 	return (long)acl &amp; 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define IOP_FASTPERM	0x0001</div><div class='del'>-#define IOP_LOOKUP	0x0002</div><div class='del'>-#define IOP_NOFOLLOW	0x0004</div><div class='del'>-#define IOP_XATTR	0x0008</div><div class='add'>+#define IOP_FASTPERM		0x0001</div><div class='add'>+#define IOP_LOOKUP		0x0002</div><div class='add'>+#define IOP_NOFOLLOW		0x0004</div><div class='add'>+#define IOP_XATTR		0x0008</div><div class='ctx'> #define IOP_DEFAULT_READLINK	0x0010</div><div class='add'>+#define IOP_MGTIME		0x0020</div><div class='add'>+#define IOP_CACHED_LINK		0x0040</div><div class='add'>+#define IOP_FASTPERM_MAY_EXEC	0x0080</div><div class='ctx'> </div><div class='del'>-struct fsnotify_mark_connector;</div><div class='add'>+/*</div><div class='add'>+ * Inode state bits.  Protected by inode-&gt;i_lock</div><div class='add'>+ *</div><div class='add'>+ * Four bits determine the dirty state of the inode: I_DIRTY_SYNC,</div><div class='add'>+ * I_DIRTY_DATASYNC, I_DIRTY_PAGES, and I_DIRTY_TIME.</div><div class='add'>+ *</div><div class='add'>+ * Four bits define the lifetime of an inode.  Initially, inodes are I_NEW,</div><div class='add'>+ * until that flag is cleared.  I_WILL_FREE, I_FREEING and I_CLEAR are set at</div><div class='add'>+ * various stages of removing an inode.</div><div class='add'>+ *</div><div class='add'>+ * Two bits are used for locking and completion notification, I_NEW and I_SYNC.</div><div class='add'>+ *</div><div class='add'>+ * I_DIRTY_SYNC		Inode is dirty, but doesn't have to be written on</div><div class='add'>+ *			fdatasync() (unless I_DIRTY_DATASYNC is also set).</div><div class='add'>+ *			Timestamp updates are the usual cause.</div><div class='add'>+ * I_DIRTY_DATASYNC	Data-related inode changes pending.  We keep track of</div><div class='add'>+ *			these changes separately from I_DIRTY_SYNC so that we</div><div class='add'>+ *			don't have to write inode on fdatasync() when only</div><div class='add'>+ *			e.g. the timestamps have changed.</div><div class='add'>+ * I_DIRTY_PAGES	Inode has dirty pages.  Inode itself may be clean.</div><div class='add'>+ * I_DIRTY_TIME		The inode itself has dirty timestamps, and the</div><div class='add'>+ *			lazytime mount option is enabled.  We keep track of this</div><div class='add'>+ *			separately from I_DIRTY_SYNC in order to implement</div><div class='add'>+ *			lazytime.  This gets cleared if I_DIRTY_INODE</div><div class='add'>+ *			(I_DIRTY_SYNC and/or I_DIRTY_DATASYNC) gets set. But</div><div class='add'>+ *			I_DIRTY_TIME can still be set if I_DIRTY_SYNC is already</div><div class='add'>+ *			in place because writeback might already be in progress</div><div class='add'>+ *			and we don't want to lose the time update</div><div class='add'>+ * I_NEW		Serves as both a mutex and completion notification.</div><div class='add'>+ *			New inodes set I_NEW.  If two processes both create</div><div class='add'>+ *			the same inode, one of them will release its inode and</div><div class='add'>+ *			wait for I_NEW to be released before returning.</div><div class='add'>+ *			Inodes in I_WILL_FREE, I_FREEING or I_CLEAR state can</div><div class='add'>+ *			also cause waiting on I_NEW, without I_NEW actually</div><div class='add'>+ *			being set.  find_inode() uses this to prevent returning</div><div class='add'>+ *			nearly-dead inodes.</div><div class='add'>+ * I_WILL_FREE		Must be set when calling write_inode_now() if i_count</div><div class='add'>+ *			is zero.  I_FREEING must be set when I_WILL_FREE is</div><div class='add'>+ *			cleared.</div><div class='add'>+ * I_FREEING		Set when inode is about to be freed but still has dirty</div><div class='add'>+ *			pages or buffers attached or the inode itself is still</div><div class='add'>+ *			dirty.</div><div class='add'>+ * I_CLEAR		Added by clear_inode().  In this state the inode is</div><div class='add'>+ *			clean and can be destroyed.  Inode keeps I_FREEING.</div><div class='add'>+ *</div><div class='add'>+ *			Inodes that are I_WILL_FREE, I_FREEING or I_CLEAR are</div><div class='add'>+ *			prohibited for many purposes.  iget() must wait for</div><div class='add'>+ *			the inode to be completely released, then create it</div><div class='add'>+ *			anew.  Other functions will just ignore such inodes,</div><div class='add'>+ *			if appropriate.  I_NEW is used for waiting.</div><div class='add'>+ *</div><div class='add'>+ * I_SYNC		Writeback of inode is running. The bit is set during</div><div class='add'>+ *			data writeback, and cleared with a wakeup on the bit</div><div class='add'>+ *			address once it is done. The bit is also used to pin</div><div class='add'>+ *			the inode in memory for flusher thread.</div><div class='add'>+ *</div><div class='add'>+ * I_REFERENCED		Marks the inode as recently references on the LRU list.</div><div class='add'>+ *</div><div class='add'>+ * I_WB_SWITCH		Cgroup bdi_writeback switching in progress.  Used to</div><div class='add'>+ *			synchronize competing switching instances and to tell</div><div class='add'>+ *			wb stat updates to grab the i_pages lock.  See</div><div class='add'>+ *			inode_switch_wbs_work_fn() for details.</div><div class='add'>+ *</div><div class='add'>+ * I_OVL_INUSE		Used by overlayfs to get exclusive ownership on upper</div><div class='add'>+ *			and work dirs among overlayfs mounts.</div><div class='add'>+ *</div><div class='add'>+ * I_CREATING		New object's inode in the middle of setting up.</div><div class='add'>+ *</div><div class='add'>+ * I_DONTCACHE		Evict inode as soon as it is not used anymore.</div><div class='add'>+ *</div><div class='add'>+ * I_SYNC_QUEUED	Inode is queued in b_io or b_more_io writeback lists.</div><div class='add'>+ *			Used to detect that mark_inode_dirty() should not move</div><div class='add'>+ *			inode between dirty lists.</div><div class='add'>+ *</div><div class='add'>+ * I_PINNING_FSCACHE_WB	Inode is pinning an fscache object for writeback.</div><div class='add'>+ *</div><div class='add'>+ * I_LRU_ISOLATING	Inode is pinned being isolated from LRU without holding</div><div class='add'>+ *			i_count.</div><div class='add'>+ *</div><div class='add'>+ * Q: What is the difference between I_WILL_FREE and I_FREEING?</div><div class='add'>+ *</div><div class='add'>+ * __I_{SYNC,NEW,LRU_ISOLATING} are used to derive unique addresses to wait</div><div class='add'>+ * upon. There's one free address left.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum inode_state_bits {</div><div class='add'>+	__I_NEW			= 0U,</div><div class='add'>+	__I_SYNC		= 1U,</div><div class='add'>+	__I_LRU_ISOLATING	= 2U</div><div class='add'>+	/* reserved wait address bit 3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum inode_state_flags_enum {</div><div class='add'>+	I_NEW			= (1U &lt;&lt; __I_NEW),</div><div class='add'>+	I_SYNC			= (1U &lt;&lt; __I_SYNC),</div><div class='add'>+	I_LRU_ISOLATING         = (1U &lt;&lt; __I_LRU_ISOLATING),</div><div class='add'>+	/* reserved flag bit 3 */</div><div class='add'>+	I_DIRTY_SYNC		= (1U &lt;&lt; 4),</div><div class='add'>+	I_DIRTY_DATASYNC	= (1U &lt;&lt; 5),</div><div class='add'>+	I_DIRTY_PAGES		= (1U &lt;&lt; 6),</div><div class='add'>+	I_WILL_FREE		= (1U &lt;&lt; 7),</div><div class='add'>+	I_FREEING		= (1U &lt;&lt; 8),</div><div class='add'>+	I_CLEAR			= (1U &lt;&lt; 9),</div><div class='add'>+	I_REFERENCED		= (1U &lt;&lt; 10),</div><div class='add'>+	I_LINKABLE		= (1U &lt;&lt; 11),</div><div class='add'>+	I_DIRTY_TIME		= (1U &lt;&lt; 12),</div><div class='add'>+	I_WB_SWITCH		= (1U &lt;&lt; 13),</div><div class='add'>+	I_OVL_INUSE		= (1U &lt;&lt; 14),</div><div class='add'>+	I_CREATING		= (1U &lt;&lt; 15),</div><div class='add'>+	I_DONTCACHE		= (1U &lt;&lt; 16),</div><div class='add'>+	I_SYNC_QUEUED		= (1U &lt;&lt; 17),</div><div class='add'>+	I_PINNING_NETFS_WB	= (1U &lt;&lt; 18)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)</div><div class='add'>+#define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES)</div><div class='add'>+#define I_DIRTY_ALL (I_DIRTY | I_DIRTY_TIME)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use inode_state_read() &amp; friends to access.</div><div class='add'>+ */</div><div class='add'>+struct inode_state_flags {</div><div class='add'>+	enum inode_state_flags_enum __state;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Keep mostly read-only and often accessed (especially for</div><div class='hunk'>@@ -630,14 +765,13 @@ struct fsnotify_mark_connector;</div><div class='ctx'> struct inode {</div><div class='ctx'> 	umode_t			i_mode;</div><div class='ctx'> 	unsigned short		i_opflags;</div><div class='del'>-	kuid_t			i_uid;</div><div class='del'>-	kgid_t			i_gid;</div><div class='ctx'> 	unsigned int		i_flags;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_FS_POSIX_ACL</div><div class='ctx'> 	struct posix_acl	*i_acl;</div><div class='ctx'> 	struct posix_acl	*i_default_acl;</div><div class='ctx'> #endif</div><div class='add'>+	kuid_t			i_uid;</div><div class='add'>+	kgid_t			i_gid;</div><div class='ctx'> </div><div class='ctx'> 	const struct inode_operations	*i_op;</div><div class='ctx'> 	struct super_block	*i_sb;</div><div class='hunk'>@@ -662,9 +796,13 @@ struct inode {</div><div class='ctx'> 	};</div><div class='ctx'> 	dev_t			i_rdev;</div><div class='ctx'> 	loff_t			i_size;</div><div class='del'>-	struct timespec64	__i_atime;</div><div class='del'>-	struct timespec64	__i_mtime;</div><div class='del'>-	struct timespec64	__i_ctime; /* use inode_*_ctime accessors! */</div><div class='add'>+	time64_t		i_atime_sec;</div><div class='add'>+	time64_t		i_mtime_sec;</div><div class='add'>+	time64_t		i_ctime_sec;</div><div class='add'>+	u32			i_atime_nsec;</div><div class='add'>+	u32			i_mtime_nsec;</div><div class='add'>+	u32			i_ctime_nsec;</div><div class='add'>+	u32			i_generation;</div><div class='ctx'> 	spinlock_t		i_lock;	/* i_blocks, i_bytes, maybe i_size */</div><div class='ctx'> 	unsigned short          i_bytes;</div><div class='ctx'> 	u8			i_blkbits;</div><div class='hunk'>@@ -676,7 +814,8 @@ struct inode {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Misc */</div><div class='del'>-	unsigned long		i_state;</div><div class='add'>+	struct inode_state_flags i_state;</div><div class='add'>+	/* 32-bit hole */</div><div class='ctx'> 	struct rw_semaphore	i_rwsem;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		dirtied_when;	/* jiffies of first dirtying */</div><div class='hunk'>@@ -713,7 +852,10 @@ struct inode {</div><div class='ctx'> 	};</div><div class='ctx'> 	struct file_lock_context	*i_flctx;</div><div class='ctx'> 	struct address_space	i_data;</div><div class='del'>-	struct list_head	i_devices;</div><div class='add'>+	union {</div><div class='add'>+		struct list_head	i_devices;</div><div class='add'>+		int			i_linklen;</div><div class='add'>+	};</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct pipe_inode_info	*i_pipe;</div><div class='ctx'> 		struct cdev		*i_cdev;</div><div class='hunk'>@@ -721,24 +863,114 @@ struct inode {</div><div class='ctx'> 		unsigned		i_dir_seq;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	__u32			i_generation;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FSNOTIFY</div><div class='ctx'> 	__u32			i_fsnotify_mask; /* all events this inode cares about */</div><div class='add'>+	/* 32-bit hole reserved for expanding i_fsnotify_mask */</div><div class='ctx'> 	struct fsnotify_mark_connector __rcu	*i_fsnotify_marks;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FS_ENCRYPTION</div><div class='del'>-	struct fscrypt_inode_info	*i_crypt_info;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_FS_VERITY</div><div class='del'>-	struct fsverity_info	*i_verity_info;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	void			*i_private; /* fs or device private pointer */</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * i_state handling</div><div class='add'>+ *</div><div class='add'>+ * We hide all of it behind helpers so that we can validate consumers.</div><div class='add'>+ */</div><div class='add'>+static inline enum inode_state_flags_enum inode_state_read_once(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(inode-&gt;i_state.__state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum inode_state_flags_enum inode_state_read(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	return inode-&gt;i_state.__state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_state_set_raw(struct inode *inode,</div><div class='add'>+				       enum inode_state_flags_enum flags)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(inode-&gt;i_state.__state, inode-&gt;i_state.__state | flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_state_set(struct inode *inode,</div><div class='add'>+				   enum inode_state_flags_enum flags)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	inode_state_set_raw(inode, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_state_clear_raw(struct inode *inode,</div><div class='add'>+					 enum inode_state_flags_enum flags)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(inode-&gt;i_state.__state, inode-&gt;i_state.__state &amp; ~flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_state_clear(struct inode *inode,</div><div class='add'>+				     enum inode_state_flags_enum flags)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	inode_state_clear_raw(inode, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_state_assign_raw(struct inode *inode,</div><div class='add'>+					  enum inode_state_flags_enum flags)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(inode-&gt;i_state.__state, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_state_assign(struct inode *inode,</div><div class='add'>+				      enum inode_state_flags_enum flags)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	inode_state_assign_raw(inode, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_state_replace_raw(struct inode *inode,</div><div class='add'>+					   enum inode_state_flags_enum clearflags,</div><div class='add'>+					   enum inode_state_flags_enum setflags)</div><div class='add'>+{</div><div class='add'>+	enum inode_state_flags_enum flags;</div><div class='add'>+	flags = inode-&gt;i_state.__state;</div><div class='add'>+	flags &amp;= ~clearflags;</div><div class='add'>+	flags |= setflags;</div><div class='add'>+	inode_state_assign_raw(inode, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_state_replace(struct inode *inode,</div><div class='add'>+				       enum inode_state_flags_enum clearflags,</div><div class='add'>+				       enum inode_state_flags_enum setflags)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	inode_state_replace_raw(inode, clearflags, setflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void inode_set_cached_link(struct inode *inode, char *link, int linklen)</div><div class='add'>+{</div><div class='add'>+	VFS_WARN_ON_INODE(strlen(link) != linklen, inode);</div><div class='add'>+	VFS_WARN_ON_INODE(inode-&gt;i_opflags &amp; IOP_CACHED_LINK, inode);</div><div class='add'>+	inode-&gt;i_link = link;</div><div class='add'>+	inode-&gt;i_linklen = linklen;</div><div class='add'>+	inode-&gt;i_opflags |= IOP_CACHED_LINK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get bit address from inode-&gt;i_state to use with wait_var_event()</div><div class='add'>+ * infrastructre.</div><div class='add'>+ */</div><div class='add'>+#define inode_state_wait_address(inode, bit) ((char *)&amp;(inode)-&gt;i_state + (bit))</div><div class='add'>+</div><div class='add'>+struct wait_queue_head *inode_bit_waitqueue(struct wait_bit_queue_entry *wqe,</div><div class='add'>+					    struct inode *inode, u32 bit);</div><div class='add'>+</div><div class='add'>+static inline void inode_wake_up_bit(struct inode *inode, u32 bit)</div><div class='add'>+{</div><div class='add'>+	/* Caller is responsible for correct memory barriers. */</div><div class='add'>+	wake_up_var(inode_state_wait_address(inode, bit));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct timespec64 timestamp_truncate(struct timespec64 t, struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int i_blocksize(const struct inode *node)</div><div class='hunk'>@@ -762,8 +994,10 @@ static inline void inode_fake_hash(struct inode *inode)</div><div class='ctx'> 	hlist_add_fake(&amp;inode-&gt;i_hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void wait_on_new_inode(struct inode *inode);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * inode-&gt;i_mutex nesting subclasses for the lock validator:</div><div class='add'>+ * inode-&gt;i_rwsem nesting subclasses for the lock validator:</div><div class='ctx'>  *</div><div class='ctx'>  * 0: the object of the current VFS operation</div><div class='ctx'>  * 1: parent</div><div class='hunk'>@@ -793,6 +1027,11 @@ static inline void inode_lock(struct inode *inode)</div><div class='ctx'> 	down_write(&amp;inode-&gt;i_rwsem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline __must_check int inode_lock_killable(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return down_write_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void inode_unlock(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	up_write(&amp;inode-&gt;i_rwsem);</div><div class='hunk'>@@ -803,6 +1042,11 @@ static inline void inode_lock_shared(struct inode *inode)</div><div class='ctx'> 	down_read(&amp;inode-&gt;i_rwsem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline __must_check int inode_lock_shared_killable(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return down_read_killable(&amp;inode-&gt;i_rwsem);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void inode_unlock_shared(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	up_read(&amp;inode-&gt;i_rwsem);</div><div class='hunk'>@@ -905,7 +1149,7 @@ static inline loff_t i_size_read(const struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * NOTE: unlike i_size_read(), i_size_write() does need locking around it</div><div class='del'>- * (normally i_mutex), otherwise on 32bit/SMP an update of i_size_seqcount</div><div class='add'>+ * (normally i_rwsem), otherwise on 32bit/SMP an update of i_size_seqcount</div><div class='ctx'>  * can be lost, resulting in subsequent i_size_read() calls spinning forever.</div><div class='ctx'>  */</div><div class='ctx'> static inline void i_size_write(struct inode *inode, loff_t i_size)</div><div class='hunk'>@@ -941,6 +1185,7 @@ static inline unsigned imajor(const struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct fown_struct {</div><div class='add'>+	struct file *file;	/* backpointer for security modules */</div><div class='ctx'> 	rwlock_t lock;          /* protects pid, uid, euid fields */</div><div class='ctx'> 	struct pid *pid;	/* pid or -pgrp where SIGIO should be sent */</div><div class='ctx'> 	enum pid_type pid_type;	/* Kind of process group SIGIO should be sent to */</div><div class='hunk'>@@ -956,6 +1201,7 @@ struct fown_struct {</div><div class='ctx'>  *      and so were/are genuinely "ahead".  Start next readahead when</div><div class='ctx'>  *      the first of these pages is accessed.</div><div class='ctx'>  * @ra_pages: Maximum size of a readahead request, copied from the bdi.</div><div class='add'>+ * @order: Preferred folio order used for most recent readahead.</div><div class='ctx'>  * @mmap_miss: How many mmap accesses missed in the page cache.</div><div class='ctx'>  * @prev_pos: The last byte in the most recent read request.</div><div class='ctx'>  *</div><div class='hunk'>@@ -967,7 +1213,8 @@ struct file_ra_state {</div><div class='ctx'> 	unsigned int size;</div><div class='ctx'> 	unsigned int async_size;</div><div class='ctx'> 	unsigned int ra_pages;</div><div class='del'>-	unsigned int mmap_miss;</div><div class='add'>+	unsigned short order;</div><div class='add'>+	unsigned short mmap_miss;</div><div class='ctx'> 	loff_t prev_pos;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -980,52 +1227,74 @@ static inline int ra_has_index(struct file_ra_state *ra, pgoff_t index)</div><div class='ctx'> 		index &lt;  ra-&gt;start + ra-&gt;size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * f_{lock,count,pos_lock} members can be highly contended and share</div><div class='del'>- * the same cacheline. f_{lock,mode} are very frequently used together</div><div class='del'>- * and so share the same cacheline as well. The read-mostly</div><div class='del'>- * f_{path,inode,op} are kept on a separate cacheline.</div><div class='add'>+/**</div><div class='add'>+ * struct file - Represents a file</div><div class='add'>+ * @f_lock: Protects f_ep, f_flags. Must not be taken from IRQ context.</div><div class='add'>+ * @f_mode: FMODE_* flags often used in hotpaths</div><div class='add'>+ * @f_op: file operations</div><div class='add'>+ * @f_mapping: Contents of a cacheable, mappable object.</div><div class='add'>+ * @private_data: filesystem or driver specific data</div><div class='add'>+ * @f_inode: cached inode</div><div class='add'>+ * @f_flags: file flags</div><div class='add'>+ * @f_iocb_flags: iocb flags</div><div class='add'>+ * @f_cred: stashed credentials of creator/opener</div><div class='add'>+ * @f_owner: file owner</div><div class='add'>+ * @f_path: path of the file</div><div class='add'>+ * @__f_path: writable alias for @f_path; *ONLY* for core VFS and only before</div><div class='add'>+ *   the file gets open</div><div class='add'>+ * @f_pos_lock: lock protecting file position</div><div class='add'>+ * @f_pipe: specific to pipes</div><div class='add'>+ * @f_pos: file position</div><div class='add'>+ * @f_security: LSM security context of this file</div><div class='add'>+ * @f_wb_err: writeback error</div><div class='add'>+ * @f_sb_err: per sb writeback errors</div><div class='add'>+ * @f_ep: link of all epoll hooks for this file</div><div class='add'>+ * @f_task_work: task work entry point</div><div class='add'>+ * @f_llist: work queue entrypoint</div><div class='add'>+ * @f_ra: file's readahead state</div><div class='add'>+ * @f_freeptr: Pointer used by SLAB_TYPESAFE_BY_RCU file cache (don't touch.)</div><div class='add'>+ * @f_ref: reference count</div><div class='ctx'>  */</div><div class='ctx'> struct file {</div><div class='add'>+	spinlock_t			f_lock;</div><div class='add'>+	fmode_t				f_mode;</div><div class='add'>+	const struct file_operations	*f_op;</div><div class='add'>+	struct address_space		*f_mapping;</div><div class='add'>+	void				*private_data;</div><div class='add'>+	struct inode			*f_inode;</div><div class='add'>+	unsigned int			f_flags;</div><div class='add'>+	unsigned int			f_iocb_flags;</div><div class='add'>+	const struct cred		*f_cred;</div><div class='add'>+	struct fown_struct		*f_owner;</div><div class='add'>+	/* --- cacheline 1 boundary (64 bytes) --- */</div><div class='ctx'> 	union {</div><div class='del'>-		/* fput() uses task work when closing and freeing file (default). */</div><div class='del'>-		struct callback_head 	f_task_work;</div><div class='del'>-		/* fput() must use workqueue (most kernel threads). */</div><div class='del'>-		struct llist_node	f_llist;</div><div class='del'>-		unsigned int 		f_iocb_flags;</div><div class='add'>+		const struct path	f_path;</div><div class='add'>+		struct path		__f_path;</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Protects f_ep, f_flags.</div><div class='del'>-	 * Must not be taken from IRQ context.</div><div class='del'>-	 */</div><div class='del'>-	spinlock_t		f_lock;</div><div class='del'>-	fmode_t			f_mode;</div><div class='del'>-	atomic_long_t		f_count;</div><div class='del'>-	struct mutex		f_pos_lock;</div><div class='del'>-	loff_t			f_pos;</div><div class='del'>-	unsigned int		f_flags;</div><div class='del'>-	struct fown_struct	f_owner;</div><div class='del'>-	const struct cred	*f_cred;</div><div class='del'>-	struct file_ra_state	f_ra;</div><div class='del'>-	struct path		f_path;</div><div class='del'>-	struct inode		*f_inode;	/* cached value */</div><div class='del'>-	const struct file_operations	*f_op;</div><div class='del'>-</div><div class='del'>-	u64			f_version;</div><div class='add'>+	union {</div><div class='add'>+		/* regular files (with FMODE_ATOMIC_POS) and directories */</div><div class='add'>+		struct mutex		f_pos_lock;</div><div class='add'>+		/* pipes */</div><div class='add'>+		u64			f_pipe;</div><div class='add'>+	};</div><div class='add'>+	loff_t				f_pos;</div><div class='ctx'> #ifdef CONFIG_SECURITY</div><div class='del'>-	void			*f_security;</div><div class='add'>+	void				*f_security;</div><div class='ctx'> #endif</div><div class='del'>-	/* needed for tty driver, and maybe others */</div><div class='del'>-	void			*private_data;</div><div class='del'>-</div><div class='add'>+	/* --- cacheline 2 boundary (128 bytes) --- */</div><div class='add'>+	errseq_t			f_wb_err;</div><div class='add'>+	errseq_t			f_sb_err;</div><div class='ctx'> #ifdef CONFIG_EPOLL</div><div class='del'>-	/* Used by fs/eventpoll.c to link all the hooks to this file */</div><div class='del'>-	struct hlist_head	*f_ep;</div><div class='del'>-#endif /* #ifdef CONFIG_EPOLL */</div><div class='del'>-	struct address_space	*f_mapping;</div><div class='del'>-	errseq_t		f_wb_err;</div><div class='del'>-	errseq_t		f_sb_err; /* for syncfs */</div><div class='add'>+	struct hlist_head		*f_ep;</div><div class='add'>+#endif</div><div class='add'>+	union {</div><div class='add'>+		struct callback_head	f_task_work;</div><div class='add'>+		struct llist_node	f_llist;</div><div class='add'>+		struct file_ra_state	f_ra;</div><div class='add'>+		freeptr_t		f_freeptr;</div><div class='add'>+	};</div><div class='add'>+	file_ref_t			f_ref;</div><div class='add'>+	/* --- cacheline 3 boundary (192 bytes) --- */</div><div class='ctx'> } __randomize_layout</div><div class='ctx'>   __attribute__((aligned(4)));	/* lest something weird decides that 2 is OK */</div><div class='ctx'> </div><div class='hunk'>@@ -1033,19 +1302,19 @@ struct file_handle {</div><div class='ctx'> 	__u32 handle_bytes;</div><div class='ctx'> 	int handle_type;</div><div class='ctx'> 	/* file identifier */</div><div class='del'>-	unsigned char f_handle[];</div><div class='add'>+	unsigned char f_handle[] __counted_by(handle_bytes);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct file *get_file(struct file *f)</div><div class='ctx'> {</div><div class='del'>-	atomic_long_inc(&amp;f-&gt;f_count);</div><div class='add'>+	file_ref_inc(&amp;f-&gt;f_ref);</div><div class='ctx'> 	return f;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct file *get_file_rcu(struct file __rcu **f);</div><div class='ctx'> struct file *get_file_active(struct file **f);</div><div class='ctx'> </div><div class='del'>-#define file_count(x)	atomic_long_read(&amp;(x)-&gt;f_count)</div><div class='add'>+#define file_count(f)	file_ref_read(&amp;(f)-&gt;f_ref)</div><div class='ctx'> </div><div class='ctx'> #define	MAX_NON_LFS	((1UL&lt;&lt;31) - 1)</div><div class='ctx'> </div><div class='hunk'>@@ -1069,6 +1338,12 @@ struct file_lease;</div><div class='ctx'> #define OFFT_OFFSET_MAX	type_max(off_t)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int file_f_owner_allocate(struct file *file);</div><div class='add'>+static inline struct fown_struct *file_f_owner(const struct file *file)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(file-&gt;f_owner);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void send_sigio(struct fown_struct *fown, int fd, int band);</div><div class='ctx'> </div><div class='ctx'> static inline struct inode *file_inode(const struct file *f)</div><div class='hunk'>@@ -1117,43 +1392,7 @@ extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force</div><div class='ctx'> extern int f_setown(struct file *filp, int who, int force);</div><div class='ctx'> extern void f_delown(struct file *filp);</div><div class='ctx'> extern pid_t f_getown(struct file *filp);</div><div class='del'>-extern int send_sigurg(struct fown_struct *fown);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * sb-&gt;s_flags.  Note that these mirror the equivalent MS_* flags where</div><div class='del'>- * represented in both.</div><div class='del'>- */</div><div class='del'>-#define SB_RDONLY       BIT(0)	/* Mount read-only */</div><div class='del'>-#define SB_NOSUID       BIT(1)	/* Ignore suid and sgid bits */</div><div class='del'>-#define SB_NODEV        BIT(2)	/* Disallow access to device special files */</div><div class='del'>-#define SB_NOEXEC       BIT(3)	/* Disallow program execution */</div><div class='del'>-#define SB_SYNCHRONOUS  BIT(4)	/* Writes are synced at once */</div><div class='del'>-#define SB_MANDLOCK     BIT(6)	/* Allow mandatory locks on an FS */</div><div class='del'>-#define SB_DIRSYNC      BIT(7)	/* Directory modifications are synchronous */</div><div class='del'>-#define SB_NOATIME      BIT(10)	/* Do not update access times. */</div><div class='del'>-#define SB_NODIRATIME   BIT(11)	/* Do not update directory access times */</div><div class='del'>-#define SB_SILENT       BIT(15)</div><div class='del'>-#define SB_POSIXACL     BIT(16)	/* Supports POSIX ACLs */</div><div class='del'>-#define SB_INLINECRYPT  BIT(17)	/* Use blk-crypto for encrypted files */</div><div class='del'>-#define SB_KERNMOUNT    BIT(22)	/* this is a kern_mount call */</div><div class='del'>-#define SB_I_VERSION    BIT(23)	/* Update inode I_version field */</div><div class='del'>-#define SB_LAZYTIME     BIT(25)	/* Update the on-disk [acm]times lazily */</div><div class='del'>-</div><div class='del'>-/* These sb flags are internal to the kernel */</div><div class='del'>-#define SB_DEAD         BIT(21)</div><div class='del'>-#define SB_DYING        BIT(24)</div><div class='del'>-#define SB_SUBMOUNT     BIT(26)</div><div class='del'>-#define SB_FORCE        BIT(27)</div><div class='del'>-#define SB_NOSEC        BIT(28)</div><div class='del'>-#define SB_BORN         BIT(29)</div><div class='del'>-#define SB_ACTIVE       BIT(30)</div><div class='del'>-#define SB_NOUSER       BIT(31)</div><div class='del'>-</div><div class='del'>-/* These flags relate to encoding and casefolding */</div><div class='del'>-#define SB_ENC_STRICT_MODE_FL	(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define sb_has_strict_encoding(sb) \</div><div class='del'>-	(sb-&gt;s_encoding_flags &amp; SB_ENC_STRICT_MODE_FL)</div><div class='add'>+extern int send_sigurg(struct file *file);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Umount options</div><div class='hunk'>@@ -1165,191 +1404,6 @@ extern int send_sigurg(struct fown_struct *fown);</div><div class='ctx'> #define UMOUNT_NOFOLLOW	0x00000008	/* Don't follow symlink on umount */</div><div class='ctx'> #define UMOUNT_UNUSED	0x80000000	/* Flag guaranteed to be unused */</div><div class='ctx'> </div><div class='del'>-/* sb-&gt;s_iflags */</div><div class='del'>-#define SB_I_CGROUPWB	0x00000001	/* cgroup-aware writeback enabled */</div><div class='del'>-#define SB_I_NOEXEC	0x00000002	/* Ignore executables on this fs */</div><div class='del'>-#define SB_I_NODEV	0x00000004	/* Ignore devices on this fs */</div><div class='del'>-#define SB_I_STABLE_WRITES 0x00000008	/* don't modify blks until WB is done */</div><div class='del'>-</div><div class='del'>-/* sb-&gt;s_iflags to limit user namespace mounts */</div><div class='del'>-#define SB_I_USERNS_VISIBLE		0x00000010 /* fstype already mounted */</div><div class='del'>-#define SB_I_IMA_UNVERIFIABLE_SIGNATURE	0x00000020</div><div class='del'>-#define SB_I_UNTRUSTED_MOUNTER		0x00000040</div><div class='del'>-#define SB_I_EVM_UNSUPPORTED		0x00000080</div><div class='del'>-</div><div class='del'>-#define SB_I_SKIP_SYNC	0x00000100	/* Skip superblock at global sync */</div><div class='del'>-#define SB_I_PERSB_BDI	0x00000200	/* has a per-sb bdi */</div><div class='del'>-#define SB_I_TS_EXPIRY_WARNED 0x00000400 /* warned about timestamp range expiry */</div><div class='del'>-#define SB_I_RETIRED	0x00000800	/* superblock shouldn't be reused */</div><div class='del'>-#define SB_I_NOUMASK	0x00001000	/* VFS does not apply umask */</div><div class='del'>-</div><div class='del'>-/* Possible states of 'frozen' field */</div><div class='del'>-enum {</div><div class='del'>-	SB_UNFROZEN = 0,		/* FS is unfrozen */</div><div class='del'>-	SB_FREEZE_WRITE	= 1,		/* Writes, dir ops, ioctls frozen */</div><div class='del'>-	SB_FREEZE_PAGEFAULT = 2,	/* Page faults stopped as well */</div><div class='del'>-	SB_FREEZE_FS = 3,		/* For internal FS use (e.g. to stop</div><div class='del'>-					 * internal threads if needed) */</div><div class='del'>-	SB_FREEZE_COMPLETE = 4,		/* -&gt;freeze_fs finished successfully */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SB_FREEZE_LEVELS (SB_FREEZE_COMPLETE - 1)</div><div class='del'>-</div><div class='del'>-struct sb_writers {</div><div class='del'>-	unsigned short			frozen;		/* Is sb frozen? */</div><div class='del'>-	int				freeze_kcount;	/* How many kernel freeze requests? */</div><div class='del'>-	int				freeze_ucount;	/* How many userspace freeze requests? */</div><div class='del'>-	struct percpu_rw_semaphore	rw_sem[SB_FREEZE_LEVELS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct super_block {</div><div class='del'>-	struct list_head	s_list;		/* Keep this first */</div><div class='del'>-	dev_t			s_dev;		/* search index; _not_ kdev_t */</div><div class='del'>-	unsigned char		s_blocksize_bits;</div><div class='del'>-	unsigned long		s_blocksize;</div><div class='del'>-	loff_t			s_maxbytes;	/* Max file size */</div><div class='del'>-	struct file_system_type	*s_type;</div><div class='del'>-	const struct super_operations	*s_op;</div><div class='del'>-	const struct dquot_operations	*dq_op;</div><div class='del'>-	const struct quotactl_ops	*s_qcop;</div><div class='del'>-	const struct export_operations *s_export_op;</div><div class='del'>-	unsigned long		s_flags;</div><div class='del'>-	unsigned long		s_iflags;	/* internal SB_I_* flags */</div><div class='del'>-	unsigned long		s_magic;</div><div class='del'>-	struct dentry		*s_root;</div><div class='del'>-	struct rw_semaphore	s_umount;</div><div class='del'>-	int			s_count;</div><div class='del'>-	atomic_t		s_active;</div><div class='del'>-#ifdef CONFIG_SECURITY</div><div class='del'>-	void                    *s_security;</div><div class='del'>-#endif</div><div class='del'>-	const struct xattr_handler * const *s_xattr;</div><div class='del'>-#ifdef CONFIG_FS_ENCRYPTION</div><div class='del'>-	const struct fscrypt_operations	*s_cop;</div><div class='del'>-	struct fscrypt_keyring	*s_master_keys; /* master crypto keys in use */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_FS_VERITY</div><div class='del'>-	const struct fsverity_operations *s_vop;</div><div class='del'>-#endif</div><div class='del'>-#if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	struct unicode_map *s_encoding;</div><div class='del'>-	__u16 s_encoding_flags;</div><div class='del'>-#endif</div><div class='del'>-	struct hlist_bl_head	s_roots;	/* alternate root dentries for NFS */</div><div class='del'>-	struct list_head	s_mounts;	/* list of mounts; _not_ for fs use */</div><div class='del'>-	struct block_device	*s_bdev;	/* can go away once we use an accessor for @s_bdev_file */</div><div class='del'>-	struct file		*s_bdev_file;</div><div class='del'>-	struct backing_dev_info *s_bdi;</div><div class='del'>-	struct mtd_info		*s_mtd;</div><div class='del'>-	struct hlist_node	s_instances;</div><div class='del'>-	unsigned int		s_quota_types;	/* Bitmask of supported quota types */</div><div class='del'>-	struct quota_info	s_dquot;	/* Diskquota specific options */</div><div class='del'>-</div><div class='del'>-	struct sb_writers	s_writers;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Keep s_fs_info, s_time_gran, s_fsnotify_mask, and</div><div class='del'>-	 * s_fsnotify_marks together for cache efficiency. They are frequently</div><div class='del'>-	 * accessed and rarely modified.</div><div class='del'>-	 */</div><div class='del'>-	void			*s_fs_info;	/* Filesystem private info */</div><div class='del'>-</div><div class='del'>-	/* Granularity of c/m/atime in ns (cannot be worse than a second) */</div><div class='del'>-	u32			s_time_gran;</div><div class='del'>-	/* Time limits for c/m/atime in seconds */</div><div class='del'>-	time64_t		   s_time_min;</div><div class='del'>-	time64_t		   s_time_max;</div><div class='del'>-#ifdef CONFIG_FSNOTIFY</div><div class='del'>-	__u32			s_fsnotify_mask;</div><div class='del'>-	struct fsnotify_mark_connector __rcu	*s_fsnotify_marks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * q: why are s_id and s_sysfs_name not the same? both are human</div><div class='del'>-	 * readable strings that identify the filesystem</div><div class='del'>-	 * a: s_id is allowed to change at runtime; it's used in log messages,</div><div class='del'>-	 * and we want to when a device starts out as single device (s_id is dev</div><div class='del'>-	 * name) but then a device is hot added and we have to switch to</div><div class='del'>-	 * identifying it by UUID</div><div class='del'>-	 * but s_sysfs_name is a handle for programmatic access, and can't</div><div class='del'>-	 * change at runtime</div><div class='del'>-	 */</div><div class='del'>-	char			s_id[32];	/* Informational name */</div><div class='del'>-	uuid_t			s_uuid;		/* UUID */</div><div class='del'>-	u8			s_uuid_len;	/* Default 16, possibly smaller for weird filesystems */</div><div class='del'>-</div><div class='del'>-	/* if set, fs shows up under sysfs at /sys/fs/$FSTYP/s_sysfs_name */</div><div class='del'>-	char			s_sysfs_name[UUID_STRING_LEN + 1];</div><div class='del'>-</div><div class='del'>-	unsigned int		s_max_links;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The next field is for VFS *only*. No filesystems have any business</div><div class='del'>-	 * even looking at it. You had been warned.</div><div class='del'>-	 */</div><div class='del'>-	struct mutex s_vfs_rename_mutex;	/* Kludge */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Filesystem subtype.  If non-empty the filesystem type field</div><div class='del'>-	 * in /proc/mounts will be "type.subtype"</div><div class='del'>-	 */</div><div class='del'>-	const char *s_subtype;</div><div class='del'>-</div><div class='del'>-	const struct dentry_operations *s_d_op; /* default d_op for dentries */</div><div class='del'>-</div><div class='del'>-	struct shrinker *s_shrink;	/* per-sb shrinker handle */</div><div class='del'>-</div><div class='del'>-	/* Number of inodes with nlink == 0 but still referenced */</div><div class='del'>-	atomic_long_t s_remove_count;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Number of inode/mount/sb objects that are being watched, note that</div><div class='del'>-	 * inodes objects are currently double-accounted.</div><div class='del'>-	 */</div><div class='del'>-	atomic_long_t s_fsnotify_connectors;</div><div class='del'>-</div><div class='del'>-	/* Read-only state of the superblock is being changed */</div><div class='del'>-	int s_readonly_remount;</div><div class='del'>-</div><div class='del'>-	/* per-sb errseq_t for reporting writeback errors via syncfs */</div><div class='del'>-	errseq_t s_wb_err;</div><div class='del'>-</div><div class='del'>-	/* AIO completions deferred from interrupt context */</div><div class='del'>-	struct workqueue_struct *s_dio_done_wq;</div><div class='del'>-	struct hlist_head s_pins;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Owning user namespace and default context in which to</div><div class='del'>-	 * interpret filesystem uids, gids, quotas, device nodes,</div><div class='del'>-	 * xattrs and security labels.</div><div class='del'>-	 */</div><div class='del'>-	struct user_namespace *s_user_ns;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The list_lru structure is essentially just a pointer to a table</div><div class='del'>-	 * of per-node lru lists, each of which has its own spinlock.</div><div class='del'>-	 * There is no need to put them into separate cachelines.</div><div class='del'>-	 */</div><div class='del'>-	struct list_lru		s_dentry_lru;</div><div class='del'>-	struct list_lru		s_inode_lru;</div><div class='del'>-	struct rcu_head		rcu;</div><div class='del'>-	struct work_struct	destroy_work;</div><div class='del'>-</div><div class='del'>-	struct mutex		s_sync_lock;	/* sync serialisation lock */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Indicates how deep in a filesystem stack this SB is</div><div class='del'>-	 */</div><div class='del'>-	int s_stack_depth;</div><div class='del'>-</div><div class='del'>-	/* s_inode_list_lock protects s_inodes */</div><div class='del'>-	spinlock_t		s_inode_list_lock ____cacheline_aligned_in_smp;</div><div class='del'>-	struct list_head	s_inodes;	/* all inodes */</div><div class='del'>-</div><div class='del'>-	spinlock_t		s_inode_wblist_lock;</div><div class='del'>-	struct list_head	s_inodes_wb;	/* writeback inodes */</div><div class='del'>-} __randomize_layout;</div><div class='del'>-</div><div class='ctx'> static inline struct user_namespace *i_user_ns(const struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return inode-&gt;i_sb-&gt;s_user_ns;</div><div class='hunk'>@@ -1542,26 +1596,32 @@ static inline bool fsuidgid_has_mapping(struct super_block *sb,</div><div class='ctx'> </div><div class='ctx'> struct timespec64 current_time(struct inode *inode);</div><div class='ctx'> struct timespec64 inode_set_ctime_current(struct inode *inode);</div><div class='add'>+struct timespec64 inode_set_ctime_deleg(struct inode *inode,</div><div class='add'>+					struct timespec64 update);</div><div class='ctx'> </div><div class='ctx'> static inline time64_t inode_get_atime_sec(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_atime.tv_sec;</div><div class='add'>+	return inode-&gt;i_atime_sec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline long inode_get_atime_nsec(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_atime.tv_nsec;</div><div class='add'>+	return inode-&gt;i_atime_nsec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct timespec64 inode_get_atime(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_atime;</div><div class='add'>+	struct timespec64 ts = { .tv_sec  = inode_get_atime_sec(inode),</div><div class='add'>+				 .tv_nsec = inode_get_atime_nsec(inode) };</div><div class='add'>+</div><div class='add'>+	return ts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct timespec64 inode_set_atime_to_ts(struct inode *inode,</div><div class='ctx'> 						      struct timespec64 ts)</div><div class='ctx'> {</div><div class='del'>-	inode-&gt;__i_atime = ts;</div><div class='add'>+	inode-&gt;i_atime_sec = ts.tv_sec;</div><div class='add'>+	inode-&gt;i_atime_nsec = ts.tv_nsec;</div><div class='ctx'> 	return ts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1570,28 +1630,32 @@ static inline struct timespec64 inode_set_atime(struct inode *inode,</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec64 ts = { .tv_sec  = sec,</div><div class='ctx'> 				 .tv_nsec = nsec };</div><div class='add'>+</div><div class='ctx'> 	return inode_set_atime_to_ts(inode, ts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline time64_t inode_get_mtime_sec(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_mtime.tv_sec;</div><div class='add'>+	return inode-&gt;i_mtime_sec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline long inode_get_mtime_nsec(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_mtime.tv_nsec;</div><div class='add'>+	return inode-&gt;i_mtime_nsec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct timespec64 inode_get_mtime(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_mtime;</div><div class='add'>+	struct timespec64 ts = { .tv_sec  = inode_get_mtime_sec(inode),</div><div class='add'>+				 .tv_nsec = inode_get_mtime_nsec(inode) };</div><div class='add'>+	return ts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct timespec64 inode_set_mtime_to_ts(struct inode *inode,</div><div class='ctx'> 						      struct timespec64 ts)</div><div class='ctx'> {</div><div class='del'>-	inode-&gt;__i_mtime = ts;</div><div class='add'>+	inode-&gt;i_mtime_sec = ts.tv_sec;</div><div class='add'>+	inode-&gt;i_mtime_nsec = ts.tv_nsec;</div><div class='ctx'> 	return ts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1603,28 +1667,37 @@ static inline struct timespec64 inode_set_mtime(struct inode *inode,</div><div class='ctx'> 	return inode_set_mtime_to_ts(inode, ts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Multigrain timestamps</div><div class='add'>+ *</div><div class='add'>+ * Conditionally use fine-grained ctime and mtime timestamps when there</div><div class='add'>+ * are users actively observing them via getattr. The primary use-case</div><div class='add'>+ * for this is NFS clients that use the ctime to distinguish between</div><div class='add'>+ * different states of the file, and that are often fooled by multiple</div><div class='add'>+ * operations that occur in the same coarse-grained timer tick.</div><div class='add'>+ */</div><div class='add'>+#define I_CTIME_QUERIED		((u32)BIT(31))</div><div class='add'>+</div><div class='ctx'> static inline time64_t inode_get_ctime_sec(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_ctime.tv_sec;</div><div class='add'>+	return inode-&gt;i_ctime_sec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline long inode_get_ctime_nsec(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_ctime.tv_nsec;</div><div class='add'>+	return inode-&gt;i_ctime_nsec &amp; ~I_CTIME_QUERIED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct timespec64 inode_get_ctime(const struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return inode-&gt;__i_ctime;</div><div class='del'>-}</div><div class='add'>+	struct timespec64 ts = { .tv_sec  = inode_get_ctime_sec(inode),</div><div class='add'>+				 .tv_nsec = inode_get_ctime_nsec(inode) };</div><div class='ctx'> </div><div class='del'>-static inline struct timespec64 inode_set_ctime_to_ts(struct inode *inode,</div><div class='del'>-						      struct timespec64 ts)</div><div class='del'>-{</div><div class='del'>-	inode-&gt;__i_ctime = ts;</div><div class='ctx'> 	return ts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct timespec64 inode_set_ctime_to_ts(struct inode *inode, struct timespec64 ts);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * inode_set_ctime - set the ctime in the inode</div><div class='ctx'>  * @inode: inode in which to set the ctime</div><div class='hunk'>@@ -1648,66 +1721,6 @@ struct timespec64 simple_inode_init_ts(struct inode *inode);</div><div class='ctx'>  * Snapshotting support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * These are internal functions, please use sb_start_{write,pagefault,intwrite}</div><div class='del'>- * instead.</div><div class='del'>- */</div><div class='del'>-static inline void __sb_end_write(struct super_block *sb, int level)</div><div class='del'>-{</div><div class='del'>-	percpu_up_read(sb-&gt;s_writers.rw_sem + level-1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __sb_start_write(struct super_block *sb, int level)</div><div class='del'>-{</div><div class='del'>-	percpu_down_read(sb-&gt;s_writers.rw_sem + level - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool __sb_start_write_trylock(struct super_block *sb, int level)</div><div class='del'>-{</div><div class='del'>-	return percpu_down_read_trylock(sb-&gt;s_writers.rw_sem + level - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define __sb_writers_acquired(sb, lev)	\</div><div class='del'>-	percpu_rwsem_acquire(&amp;(sb)-&gt;s_writers.rw_sem[(lev)-1], 1, _THIS_IP_)</div><div class='del'>-#define __sb_writers_release(sb, lev)	\</div><div class='del'>-	percpu_rwsem_release(&amp;(sb)-&gt;s_writers.rw_sem[(lev)-1], 1, _THIS_IP_)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __sb_write_started - check if sb freeze level is held</div><div class='del'>- * @sb: the super we write to</div><div class='del'>- * @level: the freeze level</div><div class='del'>- *</div><div class='del'>- * * &gt; 0 - sb freeze level is held</div><div class='del'>- * *   0 - sb freeze level is not held</div><div class='del'>- * * &lt; 0 - !CONFIG_LOCKDEP/LOCK_STATE_UNKNOWN</div><div class='del'>- */</div><div class='del'>-static inline int __sb_write_started(const struct super_block *sb, int level)</div><div class='del'>-{</div><div class='del'>-	return lockdep_is_held_type(sb-&gt;s_writers.rw_sem + level - 1, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * sb_write_started - check if SB_FREEZE_WRITE is held</div><div class='del'>- * @sb: the super we write to</div><div class='del'>- *</div><div class='del'>- * May be false positive with !CONFIG_LOCKDEP/LOCK_STATE_UNKNOWN.</div><div class='del'>- */</div><div class='del'>-static inline bool sb_write_started(const struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return __sb_write_started(sb, SB_FREEZE_WRITE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * sb_write_not_started - check if SB_FREEZE_WRITE is not held</div><div class='del'>- * @sb: the super we write to</div><div class='del'>- *</div><div class='del'>- * May be false positive with !CONFIG_LOCKDEP/LOCK_STATE_UNKNOWN.</div><div class='del'>- */</div><div class='del'>-static inline bool sb_write_not_started(const struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return __sb_write_started(sb, SB_FREEZE_WRITE) &lt;= 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * file_write_started - check if SB_FREEZE_WRITE is held</div><div class='ctx'>  * @file: the file we write to</div><div class='hunk'>@@ -1738,157 +1751,44 @@ static inline bool file_write_not_started(const struct file *file)</div><div class='ctx'> 	return sb_write_not_started(file_inode(file)-&gt;i_sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * sb_end_write - drop write access to a superblock</div><div class='del'>- * @sb: the super we wrote to</div><div class='del'>- *</div><div class='del'>- * Decrement number of writers to the filesystem. Wake up possible waiters</div><div class='del'>- * wanting to freeze the filesystem.</div><div class='del'>- */</div><div class='del'>-static inline void sb_end_write(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	__sb_end_write(sb, SB_FREEZE_WRITE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * sb_end_pagefault - drop write access to a superblock from a page fault</div><div class='del'>- * @sb: the super we wrote to</div><div class='del'>- *</div><div class='del'>- * Decrement number of processes handling write page fault to the filesystem.</div><div class='del'>- * Wake up possible waiters wanting to freeze the filesystem.</div><div class='del'>- */</div><div class='del'>-static inline void sb_end_pagefault(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	__sb_end_write(sb, SB_FREEZE_PAGEFAULT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * sb_end_intwrite - drop write access to a superblock for internal fs purposes</div><div class='del'>- * @sb: the super we wrote to</div><div class='del'>- *</div><div class='del'>- * Decrement fs-internal number of writers to the filesystem.  Wake up possible</div><div class='del'>- * waiters wanting to freeze the filesystem.</div><div class='del'>- */</div><div class='del'>-static inline void sb_end_intwrite(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	__sb_end_write(sb, SB_FREEZE_FS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * sb_start_write - get write access to a superblock</div><div class='del'>- * @sb: the super we write to</div><div class='del'>- *</div><div class='del'>- * When a process wants to write data or metadata to a file system (i.e. dirty</div><div class='del'>- * a page or an inode), it should embed the operation in a sb_start_write() -</div><div class='del'>- * sb_end_write() pair to get exclusion against file system freezing. This</div><div class='del'>- * function increments number of writers preventing freezing. If the file</div><div class='del'>- * system is already frozen, the function waits until the file system is</div><div class='del'>- * thawed.</div><div class='del'>- *</div><div class='del'>- * Since freeze protection behaves as a lock, users have to preserve</div><div class='del'>- * ordering of freeze protection and other filesystem locks. Generally,</div><div class='del'>- * freeze protection should be the outermost lock. In particular, we have:</div><div class='del'>- *</div><div class='del'>- * sb_start_write</div><div class='del'>- *   -&gt; i_mutex			(write path, truncate, directory ops, ...)</div><div class='del'>- *   -&gt; s_umount		(freeze_super, thaw_super)</div><div class='del'>- */</div><div class='del'>-static inline void sb_start_write(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	__sb_start_write(sb, SB_FREEZE_WRITE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool sb_start_write_trylock(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return __sb_start_write_trylock(sb, SB_FREEZE_WRITE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * sb_start_pagefault - get write access to a superblock from a page fault</div><div class='del'>- * @sb: the super we write to</div><div class='del'>- *</div><div class='del'>- * When a process starts handling write page fault, it should embed the</div><div class='del'>- * operation into sb_start_pagefault() - sb_end_pagefault() pair to get</div><div class='del'>- * exclusion against file system freezing. This is needed since the page fault</div><div class='del'>- * is going to dirty a page. This function increments number of running page</div><div class='del'>- * faults preventing freezing. If the file system is already frozen, the</div><div class='del'>- * function waits until the file system is thawed.</div><div class='del'>- *</div><div class='del'>- * Since page fault freeze protection behaves as a lock, users have to preserve</div><div class='del'>- * ordering of freeze protection and other filesystem locks. It is advised to</div><div class='del'>- * put sb_start_pagefault() close to mmap_lock in lock ordering. Page fault</div><div class='del'>- * handling code implies lock dependency:</div><div class='del'>- *</div><div class='del'>- * mmap_lock</div><div class='del'>- *   -&gt; sb_start_pagefault</div><div class='del'>- */</div><div class='del'>-static inline void sb_start_pagefault(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	__sb_start_write(sb, SB_FREEZE_PAGEFAULT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * sb_start_intwrite - get write access to a superblock for internal fs purposes</div><div class='del'>- * @sb: the super we write to</div><div class='del'>- *</div><div class='del'>- * This is the third level of protection against filesystem freezing. It is</div><div class='del'>- * free for use by a filesystem. The only requirement is that it must rank</div><div class='del'>- * below sb_start_pagefault.</div><div class='del'>- *</div><div class='del'>- * For example filesystem can call sb_start_intwrite() when starting a</div><div class='del'>- * transaction which somewhat eases handling of freezing for internal sources</div><div class='del'>- * of filesystem changes (internal fs threads, discarding preallocation on file</div><div class='del'>- * close, etc.).</div><div class='del'>- */</div><div class='del'>-static inline void sb_start_intwrite(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	__sb_start_write(sb, SB_FREEZE_FS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool sb_start_intwrite_trylock(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return __sb_start_write_trylock(sb, SB_FREEZE_FS);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool inode_owner_or_capable(struct mnt_idmap *idmap,</div><div class='ctx'> 			    const struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * VFS helper functions..</div><div class='ctx'>  */</div><div class='del'>-int vfs_create(struct mnt_idmap *, struct inode *,</div><div class='del'>-	       struct dentry *, umode_t, bool);</div><div class='del'>-int vfs_mkdir(struct mnt_idmap *, struct inode *,</div><div class='del'>-	      struct dentry *, umode_t);</div><div class='add'>+int vfs_create(struct mnt_idmap *, struct dentry *, umode_t,</div><div class='add'>+	       struct delegated_inode *);</div><div class='add'>+struct dentry *vfs_mkdir(struct mnt_idmap *, struct inode *,</div><div class='add'>+			 struct dentry *, umode_t, struct delegated_inode *);</div><div class='ctx'> int vfs_mknod(struct mnt_idmap *, struct inode *, struct dentry *,</div><div class='del'>-              umode_t, dev_t);</div><div class='add'>+	      umode_t, dev_t, struct delegated_inode *);</div><div class='ctx'> int vfs_symlink(struct mnt_idmap *, struct inode *,</div><div class='del'>-		struct dentry *, const char *);</div><div class='add'>+		struct dentry *, const char *, struct delegated_inode *);</div><div class='ctx'> int vfs_link(struct dentry *, struct mnt_idmap *, struct inode *,</div><div class='del'>-	     struct dentry *, struct inode **);</div><div class='del'>-int vfs_rmdir(struct mnt_idmap *, struct inode *, struct dentry *);</div><div class='add'>+	     struct dentry *, struct delegated_inode *);</div><div class='add'>+int vfs_rmdir(struct mnt_idmap *, struct inode *, struct dentry *,</div><div class='add'>+	      struct delegated_inode *);</div><div class='ctx'> int vfs_unlink(struct mnt_idmap *, struct inode *, struct dentry *,</div><div class='del'>-	       struct inode **);</div><div class='add'>+	       struct delegated_inode *);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct renamedata - contains all information required for renaming</div><div class='del'>- * @old_mnt_idmap:     idmap of the old mount the inode was found from</div><div class='del'>- * @old_dir:           parent of source</div><div class='add'>+ * @mnt_idmap:     idmap of the mount in which the rename is happening.</div><div class='add'>+ * @old_parent:        parent of source</div><div class='ctx'>  * @old_dentry:                source</div><div class='del'>- * @new_mnt_idmap:     idmap of the new mount the inode was found from</div><div class='del'>- * @new_dir:           parent of destination</div><div class='add'>+ * @new_parent:        parent of destination</div><div class='ctx'>  * @new_dentry:                destination</div><div class='ctx'>  * @delegated_inode:   returns an inode needing a delegation break</div><div class='ctx'>  * @flags:             rename flags</div><div class='ctx'>  */</div><div class='ctx'> struct renamedata {</div><div class='del'>-	struct mnt_idmap *old_mnt_idmap;</div><div class='del'>-	struct inode *old_dir;</div><div class='add'>+	struct mnt_idmap *mnt_idmap;</div><div class='add'>+	struct dentry *old_parent;</div><div class='ctx'> 	struct dentry *old_dentry;</div><div class='del'>-	struct mnt_idmap *new_mnt_idmap;</div><div class='del'>-	struct inode *new_dir;</div><div class='add'>+	struct dentry *new_parent;</div><div class='ctx'> 	struct dentry *new_dentry;</div><div class='del'>-	struct inode **delegated_inode;</div><div class='add'>+	struct delegated_inode *delegated_inode;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='hunk'>@@ -1898,7 +1798,7 @@ static inline int vfs_whiteout(struct mnt_idmap *idmap,</div><div class='ctx'> 			       struct inode *dir, struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	return vfs_mknod(idmap, dir, dentry, S_IFCHR | WHITEOUT_MODE,</div><div class='del'>-			 WHITEOUT_DEV);</div><div class='add'>+			 WHITEOUT_DEV, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct file *kernel_tmpfile_open(struct mnt_idmap *idmap,</div><div class='hunk'>@@ -1906,7 +1806,7 @@ struct file *kernel_tmpfile_open(struct mnt_idmap *idmap,</div><div class='ctx'> 				 umode_t mode, int open_flag,</div><div class='ctx'> 				 const struct cred *cred);</div><div class='ctx'> struct file *kernel_file_open(const struct path *path, int flags,</div><div class='del'>-			      struct inode *inode, const struct cred *cred);</div><div class='add'>+			      const struct cred *cred);</div><div class='ctx'> </div><div class='ctx'> int vfs_mkobj(struct dentry *, umode_t,</div><div class='ctx'> 		int (*f)(struct dentry *, umode_t, void *),</div><div class='hunk'>@@ -1916,8 +1816,6 @@ int vfs_fchown(struct file *file, uid_t user, gid_t group);</div><div class='ctx'> int vfs_fchmod(struct file *file, umode_t mode);</div><div class='ctx'> int vfs_utimes(const struct path *path, struct timespec64 *times);</div><div class='ctx'> </div><div class='del'>-extern long vfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> extern long compat_ptr_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 					unsigned long arg);</div><div class='hunk'>@@ -1933,6 +1831,8 @@ void inode_init_owner(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> extern bool may_open_dev(const struct path *path);</div><div class='ctx'> umode_t mode_strip_sgid(struct mnt_idmap *idmap,</div><div class='ctx'> 			const struct inode *dir, umode_t mode);</div><div class='add'>+bool in_group_or_capable(struct mnt_idmap *idmap,</div><div class='add'>+			 const struct inode *inode, vfsgid_t vfsgid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is the "filldir" function type, used by readdir() to let</div><div class='hunk'>@@ -1948,8 +1848,18 @@ typedef bool (*filldir_t)(struct dir_context *, const char *, int, loff_t, u64,</div><div class='ctx'> struct dir_context {</div><div class='ctx'> 	filldir_t actor;</div><div class='ctx'> 	loff_t pos;</div><div class='add'>+	/*</div><div class='add'>+	 * Filesystems MUST NOT MODIFY count, but may use as a hint:</div><div class='add'>+	 * 0	    unknown</div><div class='add'>+	 * &gt; 0      space in buffer (assume at least one entry)</div><div class='add'>+	 * INT_MAX  unlimited</div><div class='add'>+	 */</div><div class='add'>+	int count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* If OR-ed with d_type, pending signals are not checked */</div><div class='add'>+#define FILLDIR_FLAG_NOINTR	0x1000</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These flags let !MMU mmap() govern direct device mapping vs immediate</div><div class='ctx'>  * copying more easily for MAP_PRIVATE, especially for ROM filesystems.</div><div class='hunk'>@@ -2001,8 +1911,11 @@ struct iov_iter;</div><div class='ctx'> struct io_uring_cmd;</div><div class='ctx'> struct offset_ctx;</div><div class='ctx'> </div><div class='add'>+typedef unsigned int __bitwise fop_flags_t;</div><div class='add'>+</div><div class='ctx'> struct file_operations {</div><div class='ctx'> 	struct module *owner;</div><div class='add'>+	fop_flags_t fop_flags;</div><div class='ctx'> 	loff_t (*llseek) (struct file *, loff_t, int);</div><div class='ctx'> 	ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);</div><div class='ctx'> 	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);</div><div class='hunk'>@@ -2015,7 +1928,6 @@ struct file_operations {</div><div class='ctx'> 	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);</div><div class='ctx'> 	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);</div><div class='ctx'> 	int (*mmap) (struct file *, struct vm_area_struct *);</div><div class='del'>-	unsigned long mmap_supported_flags;</div><div class='ctx'> 	int (*open) (struct inode *, struct file *);</div><div class='ctx'> 	int (*flush) (struct file *, fl_owner_t id);</div><div class='ctx'> 	int (*release) (struct inode *, struct file *);</div><div class='hunk'>@@ -2044,8 +1956,26 @@ struct file_operations {</div><div class='ctx'> 	int (*uring_cmd)(struct io_uring_cmd *ioucmd, unsigned int issue_flags);</div><div class='ctx'> 	int (*uring_cmd_iopoll)(struct io_uring_cmd *, struct io_comp_batch *,</div><div class='ctx'> 				unsigned int poll_flags);</div><div class='add'>+	int (*mmap_prepare)(struct vm_area_desc *);</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='add'>+/* Supports async buffered reads */</div><div class='add'>+#define FOP_BUFFER_RASYNC	((__force fop_flags_t)(1 &lt;&lt; 0))</div><div class='add'>+/* Supports async buffered writes */</div><div class='add'>+#define FOP_BUFFER_WASYNC	((__force fop_flags_t)(1 &lt;&lt; 1))</div><div class='add'>+/* Supports synchronous page faults for mappings */</div><div class='add'>+#define FOP_MMAP_SYNC		((__force fop_flags_t)(1 &lt;&lt; 2))</div><div class='add'>+/* Supports non-exclusive O_DIRECT writes from multiple threads */</div><div class='add'>+#define FOP_DIO_PARALLEL_WRITE	((__force fop_flags_t)(1 &lt;&lt; 3))</div><div class='add'>+/* Contains huge pages */</div><div class='add'>+#define FOP_HUGE_PAGES		((__force fop_flags_t)(1 &lt;&lt; 4))</div><div class='add'>+/* Treat loff_t as unsigned (e.g., /dev/mem) */</div><div class='add'>+#define FOP_UNSIGNED_OFFSET	((__force fop_flags_t)(1 &lt;&lt; 5))</div><div class='add'>+/* Supports asynchronous lock callbacks */</div><div class='add'>+#define FOP_ASYNC_LOCK		((__force fop_flags_t)(1 &lt;&lt; 6))</div><div class='add'>+/* File system supports uncached read/write buffered IO */</div><div class='add'>+#define FOP_DONTCACHE		((__force fop_flags_t)(1 &lt;&lt; 7))</div><div class='add'>+</div><div class='ctx'> /* Wrap a directory iterator that needs exclusive inode access */</div><div class='ctx'> int wrap_directory_iterator(struct file *, struct dir_context *,</div><div class='ctx'> 			    int (*) (struct file *, struct dir_context *));</div><div class='hunk'>@@ -2067,8 +1997,8 @@ struct inode_operations {</div><div class='ctx'> 	int (*unlink) (struct inode *,struct dentry *);</div><div class='ctx'> 	int (*symlink) (struct mnt_idmap *, struct inode *,struct dentry *,</div><div class='ctx'> 			const char *);</div><div class='del'>-	int (*mkdir) (struct mnt_idmap *, struct inode *,struct dentry *,</div><div class='del'>-		      umode_t);</div><div class='add'>+	struct dentry *(*mkdir) (struct mnt_idmap *, struct inode *,</div><div class='add'>+				 struct dentry *, umode_t);</div><div class='ctx'> 	int (*rmdir) (struct inode *,struct dentry *);</div><div class='ctx'> 	int (*mknod) (struct mnt_idmap *, struct inode *,struct dentry *,</div><div class='ctx'> 		      umode_t,dev_t);</div><div class='hunk'>@@ -2091,32 +2021,48 @@ struct inode_operations {</div><div class='ctx'> 	int (*set_acl)(struct mnt_idmap *, struct dentry *,</div><div class='ctx'> 		       struct posix_acl *, int);</div><div class='ctx'> 	int (*fileattr_set)(struct mnt_idmap *idmap,</div><div class='del'>-			    struct dentry *dentry, struct fileattr *fa);</div><div class='del'>-	int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);</div><div class='add'>+			    struct dentry *dentry, struct file_kattr *fa);</div><div class='add'>+	int (*fileattr_get)(struct dentry *dentry, struct file_kattr *fa);</div><div class='ctx'> 	struct offset_ctx *(*get_offset_ctx)(struct inode *inode);</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='del'>-static inline ssize_t call_read_iter(struct file *file, struct kiocb *kio,</div><div class='del'>-				     struct iov_iter *iter)</div><div class='add'>+/* Did the driver provide valid mmap hook configuration? */</div><div class='add'>+static inline bool can_mmap_file(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	return file-&gt;f_op-&gt;read_iter(kio, iter);</div><div class='add'>+	bool has_mmap = file-&gt;f_op-&gt;mmap;</div><div class='add'>+	bool has_mmap_prepare = file-&gt;f_op-&gt;mmap_prepare;</div><div class='add'>+</div><div class='add'>+	/* Hooks are mutually exclusive. */</div><div class='add'>+	if (WARN_ON_ONCE(has_mmap &amp;&amp; has_mmap_prepare))</div><div class='add'>+		return false;</div><div class='add'>+	if (!has_mmap &amp;&amp; !has_mmap_prepare)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline ssize_t call_write_iter(struct file *file, struct kiocb *kio,</div><div class='del'>-				      struct iov_iter *iter)</div><div class='add'>+int __compat_vma_mmap(const struct file_operations *f_op,</div><div class='add'>+		struct file *file, struct vm_area_struct *vma);</div><div class='add'>+int compat_vma_mmap(struct file *file, struct vm_area_struct *vma);</div><div class='add'>+</div><div class='add'>+static inline int vfs_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	return file-&gt;f_op-&gt;write_iter(kio, iter);</div><div class='add'>+	if (file-&gt;f_op-&gt;mmap_prepare)</div><div class='add'>+		return compat_vma_mmap(file, vma);</div><div class='add'>+</div><div class='add'>+	return file-&gt;f_op-&gt;mmap(file, vma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int call_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static inline int vfs_mmap_prepare(struct file *file, struct vm_area_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	return file-&gt;f_op-&gt;mmap(file, vma);</div><div class='add'>+	return file-&gt;f_op-&gt;mmap_prepare(desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);</div><div class='ctx'> extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);</div><div class='ctx'> extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file *,</div><div class='ctx'> 				   loff_t, size_t, unsigned int);</div><div class='add'>+int remap_verify_area(struct file *file, loff_t pos, loff_t len, bool write);</div><div class='ctx'> int __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,</div><div class='ctx'> 				    struct file *file_out, loff_t pos_out,</div><div class='ctx'> 				    loff_t *len, unsigned int remap_flags,</div><div class='hunk'>@@ -2133,61 +2079,6 @@ extern loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,</div><div class='ctx'> 					struct file *dst_file, loff_t dst_pos,</div><div class='ctx'> 					loff_t len, unsigned int remap_flags);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum freeze_holder - holder of the freeze</div><div class='del'>- * @FREEZE_HOLDER_KERNEL: kernel wants to freeze or thaw filesystem</div><div class='del'>- * @FREEZE_HOLDER_USERSPACE: userspace wants to freeze or thaw filesystem</div><div class='del'>- * @FREEZE_MAY_NEST: whether nesting freeze and thaw requests is allowed</div><div class='del'>- *</div><div class='del'>- * Indicate who the owner of the freeze or thaw request is and whether</div><div class='del'>- * the freeze needs to be exclusive or can nest.</div><div class='del'>- * Without @FREEZE_MAY_NEST, multiple freeze and thaw requests from the</div><div class='del'>- * same holder aren't allowed. It is however allowed to hold a single</div><div class='del'>- * @FREEZE_HOLDER_USERSPACE and a single @FREEZE_HOLDER_KERNEL freeze at</div><div class='del'>- * the same time. This is relied upon by some filesystems during online</div><div class='del'>- * repair or similar.</div><div class='del'>- */</div><div class='del'>-enum freeze_holder {</div><div class='del'>-	FREEZE_HOLDER_KERNEL	= (1U &lt;&lt; 0),</div><div class='del'>-	FREEZE_HOLDER_USERSPACE	= (1U &lt;&lt; 1),</div><div class='del'>-	FREEZE_MAY_NEST		= (1U &lt;&lt; 2),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct super_operations {</div><div class='del'>-   	struct inode *(*alloc_inode)(struct super_block *sb);</div><div class='del'>-	void (*destroy_inode)(struct inode *);</div><div class='del'>-	void (*free_inode)(struct inode *);</div><div class='del'>-</div><div class='del'>-   	void (*dirty_inode) (struct inode *, int flags);</div><div class='del'>-	int (*write_inode) (struct inode *, struct writeback_control *wbc);</div><div class='del'>-	int (*drop_inode) (struct inode *);</div><div class='del'>-	void (*evict_inode) (struct inode *);</div><div class='del'>-	void (*put_super) (struct super_block *);</div><div class='del'>-	int (*sync_fs)(struct super_block *sb, int wait);</div><div class='del'>-	int (*freeze_super) (struct super_block *, enum freeze_holder who);</div><div class='del'>-	int (*freeze_fs) (struct super_block *);</div><div class='del'>-	int (*thaw_super) (struct super_block *, enum freeze_holder who);</div><div class='del'>-	int (*unfreeze_fs) (struct super_block *);</div><div class='del'>-	int (*statfs) (struct dentry *, struct kstatfs *);</div><div class='del'>-	int (*remount_fs) (struct super_block *, int *, char *);</div><div class='del'>-	void (*umount_begin) (struct super_block *);</div><div class='del'>-</div><div class='del'>-	int (*show_options)(struct seq_file *, struct dentry *);</div><div class='del'>-	int (*show_devname)(struct seq_file *, struct dentry *);</div><div class='del'>-	int (*show_path)(struct seq_file *, struct dentry *);</div><div class='del'>-	int (*show_stats)(struct seq_file *, struct dentry *);</div><div class='del'>-#ifdef CONFIG_QUOTA</div><div class='del'>-	ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);</div><div class='del'>-	ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);</div><div class='del'>-	struct dquot **(*get_dquots)(struct inode *);</div><div class='del'>-#endif</div><div class='del'>-	long (*nr_cached_objects)(struct super_block *,</div><div class='del'>-				  struct shrink_control *);</div><div class='del'>-	long (*free_cached_objects)(struct super_block *,</div><div class='del'>-				    struct shrink_control *);</div><div class='del'>-	void (*shutdown)(struct super_block *sb);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Inode flags - they have no relation to superblock flags now</div><div class='ctx'>  */</div><div class='hunk'>@@ -2213,6 +2104,7 @@ struct super_operations {</div><div class='ctx'> #define S_CASEFOLD	(1 &lt;&lt; 15) /* Casefolded file */</div><div class='ctx'> #define S_VERITY	(1 &lt;&lt; 16) /* Verity file (using fs/verity/) */</div><div class='ctx'> #define S_KERNEL_FILE	(1 &lt;&lt; 17) /* File is in use by the kernel (eg. fs/cachefiles) */</div><div class='add'>+#define S_ANON_INODE	(1 &lt;&lt; 19) /* Inode is an anonymous inode */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Note that nosuid etc flags are inode-specific: setting some file-system</div><div class='hunk'>@@ -2229,7 +2121,6 @@ struct super_operations {</div><div class='ctx'>  */</div><div class='ctx'> #define __IS_FLG(inode, flg)	((inode)-&gt;i_sb-&gt;s_flags &amp; (flg))</div><div class='ctx'> </div><div class='del'>-static inline bool sb_rdonly(const struct super_block *sb) { return sb-&gt;s_flags &amp; SB_RDONLY; }</div><div class='ctx'> #define IS_RDONLY(inode)	sb_rdonly((inode)-&gt;i_sb)</div><div class='ctx'> #define IS_SYNC(inode)		(__IS_FLG(inode, SB_SYNCHRONOUS) || \</div><div class='ctx'> 					((inode)-&gt;i_flags &amp; S_SYNC))</div><div class='hunk'>@@ -2251,7 +2142,13 @@ static inline bool sb_rdonly(const struct super_block *sb) { return sb-&gt;s_flags</div><div class='ctx'> </div><div class='ctx'> #define IS_DEADDIR(inode)	((inode)-&gt;i_flags &amp; S_DEAD)</div><div class='ctx'> #define IS_NOCMTIME(inode)	((inode)-&gt;i_flags &amp; S_NOCMTIME)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SWAP</div><div class='ctx'> #define IS_SWAPFILE(inode)	((inode)-&gt;i_flags &amp; S_SWAPFILE)</div><div class='add'>+#else</div><div class='add'>+#define IS_SWAPFILE(inode)	((void)(inode), 0U)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define IS_PRIVATE(inode)	((inode)-&gt;i_flags &amp; S_PRIVATE)</div><div class='ctx'> #define IS_IMA(inode)		((inode)-&gt;i_flags &amp; S_IMA)</div><div class='ctx'> #define IS_AUTOMOUNT(inode)	((inode)-&gt;i_flags &amp; S_AUTOMOUNT)</div><div class='hunk'>@@ -2263,6 +2160,7 @@ static inline bool sb_rdonly(const struct super_block *sb) { return sb-&gt;s_flags</div><div class='ctx'> </div><div class='ctx'> #define IS_WHITEOUT(inode)	(S_ISCHR(inode-&gt;i_mode) &amp;&amp; \</div><div class='ctx'> 				 (inode)-&gt;i_rdev == WHITEOUT_DEV)</div><div class='add'>+#define IS_ANON_FILE(inode)	((inode)-&gt;i_flags &amp; S_ANON_INODE)</div><div class='ctx'> </div><div class='ctx'> static inline bool HAS_UNMAPPED_ID(struct mnt_idmap *idmap,</div><div class='ctx'> 				   struct inode *inode)</div><div class='hunk'>@@ -2291,112 +2189,6 @@ static inline void kiocb_clone(struct kiocb *kiocb, struct kiocb *kiocb_src,</div><div class='ctx'> 	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Inode state bits.  Protected by inode-&gt;i_lock</div><div class='del'>- *</div><div class='del'>- * Four bits determine the dirty state of the inode: I_DIRTY_SYNC,</div><div class='del'>- * I_DIRTY_DATASYNC, I_DIRTY_PAGES, and I_DIRTY_TIME.</div><div class='del'>- *</div><div class='del'>- * Four bits define the lifetime of an inode.  Initially, inodes are I_NEW,</div><div class='del'>- * until that flag is cleared.  I_WILL_FREE, I_FREEING and I_CLEAR are set at</div><div class='del'>- * various stages of removing an inode.</div><div class='del'>- *</div><div class='del'>- * Two bits are used for locking and completion notification, I_NEW and I_SYNC.</div><div class='del'>- *</div><div class='del'>- * I_DIRTY_SYNC		Inode is dirty, but doesn't have to be written on</div><div class='del'>- *			fdatasync() (unless I_DIRTY_DATASYNC is also set).</div><div class='del'>- *			Timestamp updates are the usual cause.</div><div class='del'>- * I_DIRTY_DATASYNC	Data-related inode changes pending.  We keep track of</div><div class='del'>- *			these changes separately from I_DIRTY_SYNC so that we</div><div class='del'>- *			don't have to write inode on fdatasync() when only</div><div class='del'>- *			e.g. the timestamps have changed.</div><div class='del'>- * I_DIRTY_PAGES	Inode has dirty pages.  Inode itself may be clean.</div><div class='del'>- * I_DIRTY_TIME		The inode itself has dirty timestamps, and the</div><div class='del'>- *			lazytime mount option is enabled.  We keep track of this</div><div class='del'>- *			separately from I_DIRTY_SYNC in order to implement</div><div class='del'>- *			lazytime.  This gets cleared if I_DIRTY_INODE</div><div class='del'>- *			(I_DIRTY_SYNC and/or I_DIRTY_DATASYNC) gets set. But</div><div class='del'>- *			I_DIRTY_TIME can still be set if I_DIRTY_SYNC is already</div><div class='del'>- *			in place because writeback might already be in progress</div><div class='del'>- *			and we don't want to lose the time update</div><div class='del'>- * I_NEW		Serves as both a mutex and completion notification.</div><div class='del'>- *			New inodes set I_NEW.  If two processes both create</div><div class='del'>- *			the same inode, one of them will release its inode and</div><div class='del'>- *			wait for I_NEW to be released before returning.</div><div class='del'>- *			Inodes in I_WILL_FREE, I_FREEING or I_CLEAR state can</div><div class='del'>- *			also cause waiting on I_NEW, without I_NEW actually</div><div class='del'>- *			being set.  find_inode() uses this to prevent returning</div><div class='del'>- *			nearly-dead inodes.</div><div class='del'>- * I_WILL_FREE		Must be set when calling write_inode_now() if i_count</div><div class='del'>- *			is zero.  I_FREEING must be set when I_WILL_FREE is</div><div class='del'>- *			cleared.</div><div class='del'>- * I_FREEING		Set when inode is about to be freed but still has dirty</div><div class='del'>- *			pages or buffers attached or the inode itself is still</div><div class='del'>- *			dirty.</div><div class='del'>- * I_CLEAR		Added by clear_inode().  In this state the inode is</div><div class='del'>- *			clean and can be destroyed.  Inode keeps I_FREEING.</div><div class='del'>- *</div><div class='del'>- *			Inodes that are I_WILL_FREE, I_FREEING or I_CLEAR are</div><div class='del'>- *			prohibited for many purposes.  iget() must wait for</div><div class='del'>- *			the inode to be completely released, then create it</div><div class='del'>- *			anew.  Other functions will just ignore such inodes,</div><div class='del'>- *			if appropriate.  I_NEW is used for waiting.</div><div class='del'>- *</div><div class='del'>- * I_SYNC		Writeback of inode is running. The bit is set during</div><div class='del'>- *			data writeback, and cleared with a wakeup on the bit</div><div class='del'>- *			address once it is done. The bit is also used to pin</div><div class='del'>- *			the inode in memory for flusher thread.</div><div class='del'>- *</div><div class='del'>- * I_REFERENCED		Marks the inode as recently references on the LRU list.</div><div class='del'>- *</div><div class='del'>- * I_DIO_WAKEUP		Never set.  Only used as a key for wait_on_bit().</div><div class='del'>- *</div><div class='del'>- * I_WB_SWITCH		Cgroup bdi_writeback switching in progress.  Used to</div><div class='del'>- *			synchronize competing switching instances and to tell</div><div class='del'>- *			wb stat updates to grab the i_pages lock.  See</div><div class='del'>- *			inode_switch_wbs_work_fn() for details.</div><div class='del'>- *</div><div class='del'>- * I_OVL_INUSE		Used by overlayfs to get exclusive ownership on upper</div><div class='del'>- *			and work dirs among overlayfs mounts.</div><div class='del'>- *</div><div class='del'>- * I_CREATING		New object's inode in the middle of setting up.</div><div class='del'>- *</div><div class='del'>- * I_DONTCACHE		Evict inode as soon as it is not used anymore.</div><div class='del'>- *</div><div class='del'>- * I_SYNC_QUEUED	Inode is queued in b_io or b_more_io writeback lists.</div><div class='del'>- *			Used to detect that mark_inode_dirty() should not move</div><div class='del'>- * 			inode between dirty lists.</div><div class='del'>- *</div><div class='del'>- * I_PINNING_FSCACHE_WB	Inode is pinning an fscache object for writeback.</div><div class='del'>- *</div><div class='del'>- * Q: What is the difference between I_WILL_FREE and I_FREEING?</div><div class='del'>- */</div><div class='del'>-#define I_DIRTY_SYNC		(1 &lt;&lt; 0)</div><div class='del'>-#define I_DIRTY_DATASYNC	(1 &lt;&lt; 1)</div><div class='del'>-#define I_DIRTY_PAGES		(1 &lt;&lt; 2)</div><div class='del'>-#define __I_NEW			3</div><div class='del'>-#define I_NEW			(1 &lt;&lt; __I_NEW)</div><div class='del'>-#define I_WILL_FREE		(1 &lt;&lt; 4)</div><div class='del'>-#define I_FREEING		(1 &lt;&lt; 5)</div><div class='del'>-#define I_CLEAR			(1 &lt;&lt; 6)</div><div class='del'>-#define __I_SYNC		7</div><div class='del'>-#define I_SYNC			(1 &lt;&lt; __I_SYNC)</div><div class='del'>-#define I_REFERENCED		(1 &lt;&lt; 8)</div><div class='del'>-#define __I_DIO_WAKEUP		9</div><div class='del'>-#define I_DIO_WAKEUP		(1 &lt;&lt; __I_DIO_WAKEUP)</div><div class='del'>-#define I_LINKABLE		(1 &lt;&lt; 10)</div><div class='del'>-#define I_DIRTY_TIME		(1 &lt;&lt; 11)</div><div class='del'>-#define I_WB_SWITCH		(1 &lt;&lt; 13)</div><div class='del'>-#define I_OVL_INUSE		(1 &lt;&lt; 14)</div><div class='del'>-#define I_CREATING		(1 &lt;&lt; 15)</div><div class='del'>-#define I_DONTCACHE		(1 &lt;&lt; 16)</div><div class='del'>-#define I_SYNC_QUEUED		(1 &lt;&lt; 17)</div><div class='del'>-#define I_PINNING_NETFS_WB	(1 &lt;&lt; 18)</div><div class='del'>-</div><div class='del'>-#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)</div><div class='del'>-#define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES)</div><div class='del'>-#define I_DIRTY_ALL (I_DIRTY | I_DIRTY_TIME)</div><div class='del'>-</div><div class='ctx'> extern void __mark_inode_dirty(struct inode *, int);</div><div class='ctx'> static inline void mark_inode_dirty(struct inode *inode)</div><div class='ctx'> {</div><div class='hunk'>@@ -2408,6 +2200,11 @@ static inline void mark_inode_dirty_sync(struct inode *inode)</div><div class='ctx'> 	__mark_inode_dirty(inode, I_DIRTY_SYNC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int icount_read(const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;inode-&gt;i_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Returns true if the given inode itself only has dirty timestamps (its pages</div><div class='ctx'>  * may still be dirty) and isn't currently being allocated or freed.</div><div class='hunk'>@@ -2419,8 +2216,8 @@ static inline void mark_inode_dirty_sync(struct inode *inode)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool inode_is_dirtytime_only(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	return (inode-&gt;i_state &amp; (I_DIRTY_TIME | I_NEW |</div><div class='del'>-				  I_FREEING | I_WILL_FREE)) == I_DIRTY_TIME;</div><div class='add'>+	return (inode_state_read_once(inode) &amp;</div><div class='add'>+	       (I_DIRTY_TIME | I_NEW | I_FREEING | I_WILL_FREE)) == I_DIRTY_TIME;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void inc_nlink(struct inode *inode);</div><div class='hunk'>@@ -2471,6 +2268,9 @@ struct file_system_type {</div><div class='ctx'> #define FS_USERNS_MOUNT		8	/* Can be mounted by userns root */</div><div class='ctx'> #define FS_DISALLOW_NOTIFY_PERM	16	/* Disable fanotify permission events */</div><div class='ctx'> #define FS_ALLOW_IDMAP         32      /* FS has been updated to handle vfs idmappings. */</div><div class='add'>+#define FS_MGTIME		64	/* FS uses multigrain timestamps */</div><div class='add'>+#define FS_LBS			128	/* FS supports LBS */</div><div class='add'>+#define FS_POWER_FREEZE		256	/* Always freeze on suspend/hibernate */</div><div class='ctx'> #define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move() during rename() internally. */</div><div class='ctx'> 	int (*init_fs_context)(struct fs_context *);</div><div class='ctx'> 	const struct fs_parameter_spec *parameters;</div><div class='hunk'>@@ -2494,21 +2294,22 @@ struct file_system_type {</div><div class='ctx'> </div><div class='ctx'> #define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME)</div><div class='ctx'> </div><div class='del'>-extern struct dentry *mount_bdev(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data,</div><div class='del'>-	int (*fill_super)(struct super_block *, void *, int));</div><div class='del'>-extern struct dentry *mount_single(struct file_system_type *fs_type,</div><div class='del'>-	int flags, void *data,</div><div class='del'>-	int (*fill_super)(struct super_block *, void *, int));</div><div class='del'>-extern struct dentry *mount_nodev(struct file_system_type *fs_type,</div><div class='del'>-	int flags, void *data,</div><div class='del'>-	int (*fill_super)(struct super_block *, void *, int));</div><div class='add'>+/**</div><div class='add'>+ * is_mgtime: is this inode using multigrain timestamps</div><div class='add'>+ * @inode: inode to test for multigrain timestamps</div><div class='add'>+ *</div><div class='add'>+ * Return true if the inode uses multigrain timestamps, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool is_mgtime(const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return inode-&gt;i_opflags &amp; IOP_MGTIME;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern struct dentry *mount_subtree(struct vfsmount *mnt, const char *path);</div><div class='ctx'> void retire_super(struct super_block *sb);</div><div class='ctx'> void generic_shutdown_super(struct super_block *sb);</div><div class='ctx'> void kill_block_super(struct super_block *sb);</div><div class='ctx'> void kill_anon_super(struct super_block *sb);</div><div class='del'>-void kill_litter_super(struct super_block *sb);</div><div class='ctx'> void deactivate_super(struct super_block *sb);</div><div class='ctx'> void deactivate_locked_super(struct super_block *sb);</div><div class='ctx'> int set_anon_super(struct super_block *s, void *data);</div><div class='hunk'>@@ -2525,10 +2326,17 @@ struct super_block *sget(struct file_system_type *type,</div><div class='ctx'> struct super_block *sget_dev(struct fs_context *fc, dev_t dev);</div><div class='ctx'> </div><div class='ctx'> /* Alas, no aliases. Too much hassle with bringing module.h everywhere */</div><div class='del'>-#define fops_get(fops) \</div><div class='del'>-	(((fops) &amp;&amp; try_module_get((fops)-&gt;owner) ? (fops) : NULL))</div><div class='del'>-#define fops_put(fops) \</div><div class='del'>-	do { if (fops) module_put((fops)-&gt;owner); } while(0)</div><div class='add'>+#define fops_get(fops) ({						\</div><div class='add'>+	const struct file_operations *_fops = (fops);			\</div><div class='add'>+	(((_fops) &amp;&amp; try_module_get((_fops)-&gt;owner) ? (_fops) : NULL));	\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define fops_put(fops) ({						\</div><div class='add'>+	const struct file_operations *_fops = (fops);			\</div><div class='add'>+	if (_fops)							\</div><div class='add'>+		module_put((_fops)-&gt;owner);				\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This one is to be used *ONLY* from -&gt;open() instances.</div><div class='ctx'>  * fops must be non-NULL, pinned down *and* module dependencies</div><div class='hunk'>@@ -2546,8 +2354,6 @@ extern int unregister_filesystem(struct file_system_type *);</div><div class='ctx'> extern int vfs_statfs(const struct path *, struct kstatfs *);</div><div class='ctx'> extern int user_statfs(const char __user *, struct kstatfs *);</div><div class='ctx'> extern int fd_statfs(int, struct kstatfs *);</div><div class='del'>-int freeze_super(struct super_block *super, enum freeze_holder who);</div><div class='del'>-int thaw_super(struct super_block *super, enum freeze_holder who);</div><div class='ctx'> extern __printf(2, 3)</div><div class='ctx'> int super_setup_bdi_name(struct super_block *sb, char *fmt, ...);</div><div class='ctx'> extern int super_setup_bdi(struct super_block *sb);</div><div class='hunk'>@@ -2590,10 +2396,9 @@ static inline void super_set_sysfs_name_generic(struct super_block *sb, const ch</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int current_umask(void);</div><div class='del'>-</div><div class='ctx'> extern void ihold(struct inode * inode);</div><div class='ctx'> extern void iput(struct inode *);</div><div class='add'>+void iput_not_last(struct inode *);</div><div class='ctx'> int inode_update_timestamps(struct inode *inode, int flags);</div><div class='ctx'> int generic_update_time(struct inode *, int);</div><div class='ctx'> </div><div class='hunk'>@@ -2631,13 +2436,13 @@ static inline bool is_idmapped_mnt(const struct vfsmount *mnt)</div><div class='ctx'> 	return mnt_idmap(mnt) != &amp;nop_mnt_idmap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern long vfs_truncate(const struct path *, loff_t);</div><div class='add'>+int vfs_truncate(const struct path *, loff_t);</div><div class='ctx'> int do_truncate(struct mnt_idmap *, struct dentry *, loff_t start,</div><div class='ctx'> 		unsigned int time_attrs, struct file *filp);</div><div class='ctx'> extern int vfs_fallocate(struct file *file, int mode, loff_t offset,</div><div class='ctx'> 			loff_t len);</div><div class='del'>-extern long do_sys_open(int dfd, const char __user *filename, int flags,</div><div class='del'>-			umode_t mode);</div><div class='add'>+int do_sys_open(int dfd, const char __user *filename, int flags,</div><div class='add'>+		umode_t mode);</div><div class='ctx'> extern struct file *file_open_name(struct filename *, int, umode_t);</div><div class='ctx'> extern struct file *filp_open(const char *, int, umode_t);</div><div class='ctx'> extern struct file *file_open_root(const struct path *,</div><div class='hunk'>@@ -2650,9 +2455,11 @@ static inline struct file *file_open_root_mnt(struct vfsmount *mnt,</div><div class='ctx'> }</div><div class='ctx'> struct file *dentry_open(const struct path *path, int flags,</div><div class='ctx'> 			 const struct cred *creds);</div><div class='add'>+struct file *dentry_open_nonotify(const struct path *path, int flags,</div><div class='add'>+				  const struct cred *cred);</div><div class='ctx'> struct file *dentry_create(const struct path *path, int flags, umode_t mode,</div><div class='ctx'> 			   const struct cred *cred);</div><div class='del'>-struct path *backing_file_user_path(struct file *f);</div><div class='add'>+const struct path *backing_file_user_path(const struct file *f);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * When mmapping a file on a stackable filesystem (e.g., overlayfs), the file</div><div class='hunk'>@@ -2664,14 +2471,14 @@ struct path *backing_file_user_path(struct file *f);</div><div class='ctx'>  * by fstat() on that same fd.</div><div class='ctx'>  */</div><div class='ctx'> /* Get the path to display in /proc/&lt;pid&gt;/maps */</div><div class='del'>-static inline const struct path *file_user_path(struct file *f)</div><div class='add'>+static inline const struct path *file_user_path(const struct file *f)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(f-&gt;f_mode &amp; FMODE_BACKING))</div><div class='ctx'> 		return backing_file_user_path(f);</div><div class='ctx'> 	return &amp;f-&gt;f_path;</div><div class='ctx'> }</div><div class='ctx'> /* Get the inode whose inode number to display in /proc/&lt;pid&gt;/maps */</div><div class='del'>-static inline const struct inode *file_user_inode(struct file *f)</div><div class='add'>+static inline const struct inode *file_user_inode(const struct file *f)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(f-&gt;f_mode &amp; FMODE_BACKING))</div><div class='ctx'> 		return d_inode(backing_file_user_path(f)-&gt;dentry);</div><div class='hunk'>@@ -2684,11 +2491,31 @@ static inline struct file *file_clone_open(struct file *file)</div><div class='ctx'> }</div><div class='ctx'> extern int filp_close(struct file *, fl_owner_t id);</div><div class='ctx'> </div><div class='del'>-extern struct filename *getname_flags(const char __user *, int, int *);</div><div class='add'>+extern struct filename *getname_flags(const char __user *, int);</div><div class='ctx'> extern struct filename *getname_uflags(const char __user *, int);</div><div class='del'>-extern struct filename *getname(const char __user *);</div><div class='add'>+static inline struct filename *getname(const char __user *name)</div><div class='add'>+{</div><div class='add'>+	return getname_flags(name, 0);</div><div class='add'>+}</div><div class='ctx'> extern struct filename *getname_kernel(const char *);</div><div class='add'>+extern struct filename *__getname_maybe_null(const char __user *);</div><div class='add'>+static inline struct filename *getname_maybe_null(const char __user *name, int flags)</div><div class='add'>+{</div><div class='add'>+	if (!(flags &amp; AT_EMPTY_PATH))</div><div class='add'>+		return getname(name);</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return NULL;</div><div class='add'>+	return __getname_maybe_null(name);</div><div class='add'>+}</div><div class='ctx'> extern void putname(struct filename *name);</div><div class='add'>+DEFINE_FREE(putname, struct filename *, if (!IS_ERR_OR_NULL(_T)) putname(_T))</div><div class='add'>+</div><div class='add'>+static inline struct filename *refname(struct filename *name)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;name-&gt;refcnt);</div><div class='add'>+	return name;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> extern int finish_open(struct file *file, struct dentry *dentry,</div><div class='ctx'> 			int (*open)(struct inode *, struct file *));</div><div class='hunk'>@@ -2712,12 +2539,6 @@ extern struct kmem_cache *names_cachep;</div><div class='ctx'> #define __getname()		kmem_cache_alloc(names_cachep, GFP_KERNEL)</div><div class='ctx'> #define __putname(name)		kmem_cache_free(names_cachep, (void *)(name))</div><div class='ctx'> </div><div class='del'>-extern struct super_block *blockdev_superblock;</div><div class='del'>-static inline bool sb_is_blkdev_sb(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	return IS_ENABLED(CONFIG_BLOCK) &amp;&amp; sb == blockdev_superblock;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void emergency_thaw_all(void);</div><div class='ctx'> extern int sync_filesystem(struct super_block *);</div><div class='ctx'> extern const struct file_operations def_blk_fops;</div><div class='hunk'>@@ -2763,6 +2584,8 @@ extern int __must_check file_fdatawait_range(struct file *file, loff_t lstart,</div><div class='ctx'> extern int __must_check file_check_and_advance_wb_err(struct file *file);</div><div class='ctx'> extern int __must_check file_write_and_wait_range(struct file *file,</div><div class='ctx'> 						loff_t start, loff_t end);</div><div class='add'>+int filemap_flush_range(struct address_space *mapping, loff_t start,</div><div class='add'>+		loff_t end);</div><div class='ctx'> </div><div class='ctx'> static inline int file_write_and_wait(struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -2795,6 +2618,11 @@ static inline ssize_t generic_write_sync(struct kiocb *iocb, ssize_t count)</div><div class='ctx'> 				(iocb-&gt;ki_flags &amp; IOCB_SYNC) ? 0 : 1);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='add'>+	} else if (iocb-&gt;ki_flags &amp; IOCB_DONTCACHE) {</div><div class='add'>+		struct address_space *mapping = iocb-&gt;ki_filp-&gt;f_mapping;</div><div class='add'>+</div><div class='add'>+		filemap_flush_range(mapping, iocb-&gt;ki_pos - count,</div><div class='add'>+				iocb-&gt;ki_pos - 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -2813,7 +2641,7 @@ static inline int bmap(struct inode *inode,  sector_t *block)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int notify_change(struct mnt_idmap *, struct dentry *,</div><div class='del'>-		  struct iattr *, struct inode **);</div><div class='add'>+		  struct iattr *, struct delegated_inode *);</div><div class='ctx'> int inode_permission(struct mnt_idmap *, struct inode *, int);</div><div class='ctx'> int generic_permission(struct mnt_idmap *, struct inode *, int);</div><div class='ctx'> static inline int file_permission(struct file *file, int mask)</div><div class='hunk'>@@ -2843,7 +2671,7 @@ static inline bool inode_wrong_type(const struct inode *inode, umode_t mode)</div><div class='ctx'>  * file_start_write - get write access to a superblock for regular file io</div><div class='ctx'>  * @file: the file we want to write to</div><div class='ctx'>  *</div><div class='del'>- * This is a variant of sb_start_write() which is a noop on non-regualr file.</div><div class='add'>+ * This is a variant of sb_start_write() which is a noop on non-regular file.</div><div class='ctx'>  * Should be matched with a call to file_end_write().</div><div class='ctx'>  */</div><div class='ctx'> static inline void file_start_write(struct file *file)</div><div class='hunk'>@@ -2948,6 +2776,34 @@ static inline void allow_write_access(struct file *file)</div><div class='ctx'> 	if (file)</div><div class='ctx'> 		atomic_inc(&amp;file_inode(file)-&gt;i_writecount);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do not prevent write to executable file when watched by pre-content events.</div><div class='add'>+ *</div><div class='add'>+ * Note that FMODE_FSNOTIFY_HSM mode is set depending on pre-content watches at</div><div class='add'>+ * the time of file open and remains constant for entire lifetime of the file,</div><div class='add'>+ * so if pre-content watches are added post execution or removed before the end</div><div class='add'>+ * of the execution, it will not cause i_writecount reference leak.</div><div class='add'>+ */</div><div class='add'>+static inline int exe_file_deny_write_access(struct file *exe_file)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(FMODE_FSNOTIFY_HSM(exe_file-&gt;f_mode)))</div><div class='add'>+		return 0;</div><div class='add'>+	return deny_write_access(exe_file);</div><div class='add'>+}</div><div class='add'>+static inline void exe_file_allow_write_access(struct file *exe_file)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!exe_file || FMODE_FSNOTIFY_HSM(exe_file-&gt;f_mode)))</div><div class='add'>+		return;</div><div class='add'>+	allow_write_access(exe_file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void file_set_fsnotify_mode(struct file *file, fmode_t mode)</div><div class='add'>+{</div><div class='add'>+	file-&gt;f_mode &amp;= ~FMODE_FSNOTIFY_MASK;</div><div class='add'>+	file-&gt;f_mode |= mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool inode_is_open_for_write(const struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic_read(&amp;inode-&gt;i_writecount) &gt; 0;</div><div class='hunk'>@@ -2983,6 +2839,7 @@ extern struct file * open_exec(const char *);</div><div class='ctx'> /* fs/dcache.c -- generic fs support functions */</div><div class='ctx'> extern bool is_subdir(struct dentry *, struct dentry *);</div><div class='ctx'> extern bool path_is_under(const struct path *, const struct path *);</div><div class='add'>+u64 vfsmount_to_propagation_flags(struct vfsmount *mnt);</div><div class='ctx'> </div><div class='ctx'> extern char *file_path(struct file *, char *, int);</div><div class='ctx'> </div><div class='hunk'>@@ -2997,6 +2854,22 @@ static inline bool is_dot_dotdot(const char *name, size_t len)</div><div class='ctx'> 		(len == 1 || (len == 2 &amp;&amp; name[1] == '.'));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * name_contains_dotdot - check if a file name contains ".." path components</div><div class='add'>+ * @name: File path string to check</div><div class='add'>+ * Search for ".." surrounded by either '/' or start/end of string.</div><div class='add'>+ */</div><div class='add'>+static inline bool name_contains_dotdot(const char *name)</div><div class='add'>+{</div><div class='add'>+	size_t name_len;</div><div class='add'>+</div><div class='add'>+	name_len = strlen(name);</div><div class='add'>+	return strcmp(name, "..") == 0 ||</div><div class='add'>+	       strncmp(name, "../", 3) == 0 ||</div><div class='add'>+	       strstr(name, "/../") != NULL ||</div><div class='add'>+	       (name_len &gt;= 3 &amp;&amp; strcmp(name + name_len - 3, "/..") == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* needed for stackable file system support */</div><div class='hunk'>@@ -3004,14 +2877,19 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int whence);</div><div class='ctx'> </div><div class='ctx'> extern loff_t vfs_llseek(struct file *file, loff_t offset, int whence);</div><div class='ctx'> </div><div class='del'>-extern int inode_init_always(struct super_block *, struct inode *);</div><div class='add'>+extern int inode_init_always_gfp(struct super_block *, struct inode *, gfp_t);</div><div class='add'>+static inline int inode_init_always(struct super_block *sb, struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return inode_init_always_gfp(sb, inode, GFP_NOFS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void inode_init_once(struct inode *);</div><div class='ctx'> extern void address_space_init_once(struct address_space *mapping);</div><div class='ctx'> extern struct inode * igrab(struct inode *);</div><div class='ctx'> extern ino_t iunique(struct super_block *, ino_t);</div><div class='ctx'> extern int inode_needs_sync(struct inode *inode);</div><div class='del'>-extern int generic_delete_inode(struct inode *inode);</div><div class='del'>-static inline int generic_drop_inode(struct inode *inode)</div><div class='add'>+extern int inode_just_drop(struct inode *inode);</div><div class='add'>+static inline int inode_generic_drop(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return !inode-&gt;i_nlink || inode_unhashed(inode);</div><div class='ctx'> }</div><div class='hunk'>@@ -3019,7 +2897,7 @@ extern void d_mark_dontcache(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> extern struct inode *ilookup5_nowait(struct super_block *sb,</div><div class='ctx'> 		unsigned long hashval, int (*test)(struct inode *, void *),</div><div class='del'>-		void *data);</div><div class='add'>+		void *data, bool *isnew);</div><div class='ctx'> extern struct inode *ilookup5(struct super_block *sb, unsigned long hashval,</div><div class='ctx'> 		int (*test)(struct inode *, void *), void *data);</div><div class='ctx'> extern struct inode *ilookup(struct super_block *sb, unsigned long ino);</div><div class='hunk'>@@ -3028,7 +2906,12 @@ extern struct inode *inode_insert5(struct inode *inode, unsigned long hashval,</div><div class='ctx'> 		int (*test)(struct inode *, void *),</div><div class='ctx'> 		int (*set)(struct inode *, void *),</div><div class='ctx'> 		void *data);</div><div class='del'>-extern struct inode * iget5_locked(struct super_block *, unsigned long, int (*test)(struct inode *, void *), int (*set)(struct inode *, void *), void *);</div><div class='add'>+struct inode *iget5_locked(struct super_block *, unsigned long,</div><div class='add'>+			   int (*test)(struct inode *, void *),</div><div class='add'>+			   int (*set)(struct inode *, void *), void *);</div><div class='add'>+struct inode *iget5_locked_rcu(struct super_block *, unsigned long,</div><div class='add'>+			       int (*test)(struct inode *, void *),</div><div class='add'>+			       int (*set)(struct inode *, void *), void *);</div><div class='ctx'> extern struct inode * iget_locked(struct super_block *, unsigned long);</div><div class='ctx'> extern struct inode *find_inode_nowait(struct super_block *,</div><div class='ctx'> 				       unsigned long,</div><div class='hunk'>@@ -3066,11 +2949,20 @@ static inline bool is_zero_ino(ino_t ino)</div><div class='ctx'> 	return (u32)ino == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void __iget(struct inode * inode);</div><div class='add'>+static inline void __iget(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;inode-&gt;i_lock);</div><div class='add'>+	atomic_inc(&amp;inode-&gt;i_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void iget_failed(struct inode *);</div><div class='ctx'> extern void clear_inode(struct inode *);</div><div class='ctx'> extern void __destroy_inode(struct inode *);</div><div class='del'>-extern struct inode *new_inode_pseudo(struct super_block *sb);</div><div class='add'>+struct inode *alloc_inode(struct super_block *sb);</div><div class='add'>+static inline struct inode *new_inode_pseudo(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return alloc_inode(sb);</div><div class='add'>+}</div><div class='ctx'> extern struct inode *new_inode(struct super_block *sb);</div><div class='ctx'> extern void free_inode_nonrcu(struct inode *inode);</div><div class='ctx'> extern int setattr_should_drop_suidgid(struct mnt_idmap *, struct inode *);</div><div class='hunk'>@@ -3082,11 +2974,7 @@ int setattr_should_drop_sgid(struct mnt_idmap *idmap,</div><div class='ctx'>  * This must be used for allocating filesystems specific inodes to set</div><div class='ctx'>  * up the inode reclaim context correctly.</div><div class='ctx'>  */</div><div class='del'>-static inline void *</div><div class='del'>-alloc_inode_sb(struct super_block *sb, struct kmem_cache *cache, gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	return kmem_cache_alloc_lru(cache, &amp;sb-&gt;s_inode_lru, gfp);</div><div class='del'>-}</div><div class='add'>+#define alloc_inode_sb(_sb, _cache, _gfp) kmem_cache_alloc_lru(_cache, &amp;_sb-&gt;s_inode_lru, _gfp)</div><div class='ctx'> </div><div class='ctx'> extern void __insert_inode_hash(struct inode *, unsigned long hashval);</div><div class='ctx'> static inline void insert_inode_hash(struct inode *inode)</div><div class='hunk'>@@ -3102,13 +2990,12 @@ static inline void remove_inode_hash(struct inode *inode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void inode_sb_list_add(struct inode *inode);</div><div class='del'>-extern void inode_add_lru(struct inode *inode);</div><div class='add'>+extern void inode_lru_list_add(struct inode *inode);</div><div class='ctx'> </div><div class='del'>-extern int sb_set_blocksize(struct super_block *, int);</div><div class='del'>-extern int sb_min_blocksize(struct super_block *, int);</div><div class='del'>-</div><div class='del'>-extern int generic_file_mmap(struct file *, struct vm_area_struct *);</div><div class='del'>-extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);</div><div class='add'>+int generic_file_mmap(struct file *, struct vm_area_struct *);</div><div class='add'>+int generic_file_mmap_prepare(struct vm_area_desc *desc);</div><div class='add'>+int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);</div><div class='add'>+int generic_file_readonly_mmap_prepare(struct vm_area_desc *desc);</div><div class='ctx'> extern ssize_t generic_write_checks(struct kiocb *, struct iov_iter *);</div><div class='ctx'> int generic_write_checks_count(struct kiocb *iocb, loff_t *count);</div><div class='ctx'> extern int generic_write_check_limits(struct file *file, loff_t pos,</div><div class='hunk'>@@ -3147,11 +3034,12 @@ extern ssize_t iter_file_splice_write(struct pipe_inode_info *,</div><div class='ctx'> extern void</div><div class='ctx'> file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);</div><div class='ctx'> extern loff_t noop_llseek(struct file *file, loff_t offset, int whence);</div><div class='del'>-#define no_llseek NULL</div><div class='ctx'> extern loff_t vfs_setpos(struct file *file, loff_t offset, loff_t maxsize);</div><div class='ctx'> extern loff_t generic_file_llseek(struct file *file, loff_t offset, int whence);</div><div class='ctx'> extern loff_t generic_file_llseek_size(struct file *file, loff_t offset,</div><div class='ctx'> 		int whence, loff_t maxsize, loff_t eof);</div><div class='add'>+loff_t generic_llseek_cookie(struct file *file, loff_t offset, int whence,</div><div class='add'>+			     u64 *cookie);</div><div class='ctx'> extern loff_t fixed_size_llseek(struct file *file, loff_t offset,</div><div class='ctx'> 		int whence, loff_t size);</div><div class='ctx'> extern loff_t no_seek_end_llseek_size(struct file *, loff_t, int, loff_t);</div><div class='hunk'>@@ -3189,7 +3077,9 @@ static inline ssize_t blockdev_direct_IO(struct kiocb *iocb,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+bool inode_dio_finished(const struct inode *inode);</div><div class='ctx'> void inode_dio_wait(struct inode *inode);</div><div class='add'>+void inode_dio_wait_interruptible(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * inode_dio_begin - signal start of a direct I/O requests</div><div class='hunk'>@@ -3213,7 +3103,7 @@ static inline void inode_dio_begin(struct inode *inode)</div><div class='ctx'> static inline void inode_dio_end(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;inode-&gt;i_dio_count))</div><div class='del'>-		wake_up_bit(&amp;inode-&gt;i_state, __I_DIO_WAKEUP);</div><div class='add'>+		wake_up_var(&amp;inode-&gt;i_dio_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void inode_set_flags(struct inode *inode, unsigned int flags,</div><div class='hunk'>@@ -3223,16 +3113,23 @@ extern const struct file_operations generic_ro_fops;</div><div class='ctx'> </div><div class='ctx'> #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))</div><div class='ctx'> </div><div class='del'>-extern int readlink_copy(char __user *, int, const char *);</div><div class='add'>+extern int readlink_copy(char __user *, int, const char *, int);</div><div class='ctx'> extern int page_readlink(struct dentry *, char __user *, int);</div><div class='add'>+extern const char *page_get_link_raw(struct dentry *, struct inode *,</div><div class='add'>+				     struct delayed_call *);</div><div class='ctx'> extern const char *page_get_link(struct dentry *, struct inode *,</div><div class='ctx'> 				 struct delayed_call *);</div><div class='ctx'> extern void page_put_link(void *);</div><div class='ctx'> extern int page_symlink(struct inode *inode, const char *symname, int len);</div><div class='ctx'> extern const struct inode_operations page_symlink_inode_operations;</div><div class='ctx'> extern void kfree_link(void *);</div><div class='add'>+void fill_mg_cmtime(struct kstat *stat, u32 request_mask, struct inode *inode);</div><div class='ctx'> void generic_fillattr(struct mnt_idmap *, u32, struct inode *, struct kstat *);</div><div class='ctx'> void generic_fill_statx_attr(struct inode *inode, struct kstat *stat);</div><div class='add'>+void generic_fill_statx_atomic_writes(struct kstat *stat,</div><div class='add'>+				      unsigned int unit_min,</div><div class='add'>+				      unsigned int unit_max,</div><div class='add'>+				      unsigned int unit_max_opt);</div><div class='ctx'> extern int vfs_getattr_nosec(const struct path *, struct kstat *, u32, unsigned int);</div><div class='ctx'> extern int vfs_getattr(const struct path *, struct kstat *, u32, unsigned int);</div><div class='ctx'> void __inode_add_bytes(struct inode *inode, loff_t bytes);</div><div class='hunk'>@@ -3272,9 +3169,13 @@ extern void put_filesystem(struct file_system_type *fs);</div><div class='ctx'> extern struct file_system_type *get_fs_type(const char *name);</div><div class='ctx'> extern void drop_super(struct super_block *sb);</div><div class='ctx'> extern void drop_super_exclusive(struct super_block *sb);</div><div class='del'>-extern void iterate_supers(void (*)(struct super_block *, void *), void *);</div><div class='add'>+extern void iterate_supers(void (*f)(struct super_block *, void *), void *arg);</div><div class='ctx'> extern void iterate_supers_type(struct file_system_type *,</div><div class='ctx'> 			        void (*)(struct super_block *, void *), void *);</div><div class='add'>+void filesystems_freeze(bool freeze_all);</div><div class='add'>+void filesystems_thaw(void);</div><div class='add'>+</div><div class='add'>+void end_dirop(struct dentry *de);</div><div class='ctx'> </div><div class='ctx'> extern int dcache_dir_open(struct inode *, struct file *);</div><div class='ctx'> extern int dcache_dir_close(struct inode *, struct file *);</div><div class='hunk'>@@ -3289,6 +3190,8 @@ extern int simple_open(struct inode *inode, struct file *file);</div><div class='ctx'> extern int simple_link(struct dentry *, struct inode *, struct dentry *);</div><div class='ctx'> extern int simple_unlink(struct inode *, struct dentry *);</div><div class='ctx'> extern int simple_rmdir(struct inode *, struct dentry *);</div><div class='add'>+extern void __simple_unlink(struct inode *, struct dentry *);</div><div class='add'>+extern void __simple_rmdir(struct inode *, struct dentry *);</div><div class='ctx'> void simple_rename_timestamp(struct inode *old_dir, struct dentry *old_dentry,</div><div class='ctx'> 			     struct inode *new_dir, struct dentry *new_dentry);</div><div class='ctx'> extern int simple_rename_exchange(struct inode *old_dir, struct dentry *old_dentry,</div><div class='hunk'>@@ -3298,17 +3201,23 @@ extern int simple_rename(struct mnt_idmap *, struct inode *,</div><div class='ctx'> 			 unsigned int);</div><div class='ctx'> extern void simple_recursive_removal(struct dentry *,</div><div class='ctx'>                               void (*callback)(struct dentry *));</div><div class='add'>+extern void simple_remove_by_name(struct dentry *, const char *,</div><div class='add'>+                              void (*callback)(struct dentry *));</div><div class='add'>+extern void locked_recursive_removal(struct dentry *,</div><div class='add'>+                              void (*callback)(struct dentry *));</div><div class='ctx'> extern int noop_fsync(struct file *, loff_t, loff_t, int);</div><div class='ctx'> extern ssize_t noop_direct_IO(struct kiocb *iocb, struct iov_iter *iter);</div><div class='ctx'> extern int simple_empty(struct dentry *);</div><div class='del'>-extern int simple_write_begin(struct file *file, struct address_space *mapping,</div><div class='del'>-			loff_t pos, unsigned len,</div><div class='del'>-			struct page **pagep, void **fsdata);</div><div class='add'>+extern int simple_write_begin(const struct kiocb *iocb,</div><div class='add'>+			      struct address_space *mapping,</div><div class='add'>+			      loff_t pos, unsigned len,</div><div class='add'>+			      struct folio **foliop, void **fsdata);</div><div class='ctx'> extern const struct address_space_operations ram_aops;</div><div class='ctx'> extern int always_delete_dentry(const struct dentry *);</div><div class='ctx'> extern struct inode *alloc_anon_inode(struct super_block *);</div><div class='add'>+struct inode *anon_inode_make_secure_inode(struct super_block *sb, const char *name,</div><div class='add'>+					   const struct inode *context_inode);</div><div class='ctx'> extern int simple_nosetlease(struct file *, int, struct file_lease **, void **);</div><div class='del'>-extern const struct dentry_operations simple_dentry_operations;</div><div class='ctx'> </div><div class='ctx'> extern struct dentry *simple_lookup(struct inode *, struct dentry *, unsigned int flags);</div><div class='ctx'> extern ssize_t generic_read_dir(struct file *, char __user *, size_t, loff_t *);</div><div class='hunk'>@@ -3322,6 +3231,8 @@ extern int simple_fill_super(struct super_block *, unsigned long,</div><div class='ctx'> 			     const struct tree_descr *);</div><div class='ctx'> extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count);</div><div class='ctx'> extern void simple_release_fs(struct vfsmount **mount, int *count);</div><div class='add'>+struct dentry *simple_start_creating(struct dentry *, const char *);</div><div class='add'>+void simple_done_creating(struct dentry *);</div><div class='ctx'> </div><div class='ctx'> extern ssize_t simple_read_from_buffer(void __user *to, size_t count,</div><div class='ctx'> 			loff_t *ppos, const void *from, size_t available);</div><div class='hunk'>@@ -3336,7 +3247,8 @@ struct offset_ctx {</div><div class='ctx'> void simple_offset_init(struct offset_ctx *octx);</div><div class='ctx'> int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry);</div><div class='ctx'> void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry);</div><div class='del'>-int simple_offset_empty(struct dentry *dentry);</div><div class='add'>+int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry,</div><div class='add'>+			 struct inode *new_dir, struct dentry *new_dentry);</div><div class='ctx'> int simple_offset_rename_exchange(struct inode *old_dir,</div><div class='ctx'> 				  struct dentry *old_dentry,</div><div class='ctx'> 				  struct inode *new_dir,</div><div class='hunk'>@@ -3351,15 +3263,60 @@ extern int generic_file_fsync(struct file *, loff_t, loff_t, int);</div><div class='ctx'> extern int generic_check_addressable(unsigned, u64);</div><div class='ctx'> </div><div class='ctx'> extern void generic_set_sb_d_ops(struct super_block *sb);</div><div class='add'>+extern int generic_ci_match(const struct inode *parent,</div><div class='add'>+			    const struct qstr *name,</div><div class='add'>+			    const struct qstr *folded_name,</div><div class='add'>+			    const u8 *de_name, u32 de_name_len);</div><div class='ctx'> </div><div class='del'>-static inline bool sb_has_encoding(const struct super_block *sb)</div><div class='del'>-{</div><div class='ctx'> #if IS_ENABLED(CONFIG_UNICODE)</div><div class='del'>-	return !!sb-&gt;s_encoding;</div><div class='add'>+int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str);</div><div class='add'>+int generic_ci_d_compare(const struct dentry *dentry, unsigned int len,</div><div class='add'>+			 const char *str, const struct qstr *name);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * generic_ci_validate_strict_name - Check if a given name is suitable</div><div class='add'>+ * for a directory</div><div class='add'>+ *</div><div class='add'>+ * This functions checks if the proposed filename is valid for the</div><div class='add'>+ * parent directory. That means that only valid UTF-8 filenames will be</div><div class='add'>+ * accepted for casefold directories from filesystems created with the</div><div class='add'>+ * strict encoding flag.  That also means that any name will be</div><div class='add'>+ * accepted for directories that doesn't have casefold enabled, or</div><div class='add'>+ * aren't being strict with the encoding.</div><div class='add'>+ *</div><div class='add'>+ * @dir: inode of the directory where the new file will be created</div><div class='add'>+ * @name: name of the new file</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * True: if the filename is suitable for this directory. It can be</div><div class='add'>+ *   true if a given name is not suitable for a strict encoding</div><div class='add'>+ *   directory, but the directory being used isn't strict</div><div class='add'>+ * * False if the filename isn't suitable for this directory. This only</div><div class='add'>+ *   happens when a directory is casefolded and the filesystem is strict</div><div class='add'>+ *   about its encoding.</div><div class='add'>+ */</div><div class='add'>+static inline bool generic_ci_validate_strict_name(struct inode *dir,</div><div class='add'>+						   const struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	if (!IS_CASEFOLDED(dir) || !sb_has_strict_encoding(dir-&gt;i_sb))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A casefold dir must have a encoding set, unless the filesystem</div><div class='add'>+	 * is corrupted</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE(!dir-&gt;i_sb-&gt;s_encoding))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return !utf8_validate(dir-&gt;i_sb-&gt;s_encoding, name);</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='del'>-	return false;</div><div class='del'>-#endif</div><div class='add'>+static inline bool generic_ci_validate_strict_name(struct inode *dir,</div><div class='add'>+						   const struct qstr *name)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> int may_setattr(struct mnt_idmap *idmap, struct inode *inode,</div><div class='ctx'> 		unsigned int ia_valid);</div><div class='hunk'>@@ -3370,9 +3327,14 @@ void setattr_copy(struct mnt_idmap *, struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> extern int file_update_time(struct file *file);</div><div class='ctx'> </div><div class='add'>+static inline bool file_is_dax(const struct file *file)</div><div class='add'>+{</div><div class='add'>+	return file &amp;&amp; IS_DAX(file-&gt;f_mapping-&gt;host);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool vma_is_dax(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	return vma-&gt;vm_file &amp;&amp; IS_DAX(vma-&gt;vm_file-&gt;f_mapping-&gt;host);</div><div class='add'>+	return file_is_dax(vma-&gt;vm_file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool vma_is_fsdax(struct vm_area_struct *vma)</div><div class='hunk'>@@ -3403,7 +3365,8 @@ static inline int iocb_flags(struct file *file)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int kiocb_set_rw_flags(struct kiocb *ki, rwf_t flags)</div><div class='add'>+static inline int kiocb_set_rw_flags(struct kiocb *ki, rwf_t flags,</div><div class='add'>+				     int rw_type)</div><div class='ctx'> {</div><div class='ctx'> 	int kiocb_flags = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3420,7 +3383,20 @@ static inline int kiocb_set_rw_flags(struct kiocb *ki, rwf_t flags)</div><div class='ctx'> 	if (flags &amp; RWF_NOWAIT) {</div><div class='ctx'> 		if (!(ki-&gt;ki_filp-&gt;f_mode &amp; FMODE_NOWAIT))</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='del'>-		kiocb_flags |= IOCB_NOIO;</div><div class='add'>+	}</div><div class='add'>+	if (flags &amp; RWF_ATOMIC) {</div><div class='add'>+		if (rw_type != WRITE)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		if (!(ki-&gt;ki_filp-&gt;f_mode &amp; FMODE_CAN_ATOMIC_WRITE))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	if (flags &amp; RWF_DONTCACHE) {</div><div class='add'>+		/* file system must support it */</div><div class='add'>+		if (!(ki-&gt;ki_filp-&gt;f_op-&gt;fop_flags &amp; FOP_DONTCACHE))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		/* DAX mappings not supported */</div><div class='add'>+		if (IS_DAX(ki-&gt;ki_filp-&gt;f_mapping-&gt;host))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> 	kiocb_flags |= (__force int) (flags &amp; RWF_SUPPORTED);</div><div class='ctx'> 	if (flags &amp; RWF_SYNC)</div><div class='hunk'>@@ -3436,20 +3412,6 @@ static inline int kiocb_set_rw_flags(struct kiocb *ki, rwf_t flags)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline ino_t parent_ino(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	ino_t res;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't strictly need d_lock here? If the parent ino could change</div><div class='del'>-	 * then surely we'd have a deeper race in the caller?</div><div class='del'>-	 */</div><div class='del'>-	spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	res = dentry-&gt;d_parent-&gt;d_inode-&gt;i_ino;</div><div class='del'>-	spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Transaction based IO helpers */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3529,11 +3491,9 @@ struct ctl_table;</div><div class='ctx'> int __init list_bdev_fs_names(char *buf, size_t size);</div><div class='ctx'> </div><div class='ctx'> #define __FMODE_EXEC		((__force int) FMODE_EXEC)</div><div class='del'>-#define __FMODE_NONOTIFY	((__force int) FMODE_NONOTIFY)</div><div class='ctx'> </div><div class='ctx'> #define ACC_MODE(x) ("\004\002\006\006"[(x)&amp;O_ACCMODE])</div><div class='del'>-#define OPEN_FMODE(flag) ((__force fmode_t)(((flag + 1) &amp; O_ACCMODE) | \</div><div class='del'>-					    (flag &amp; __FMODE_NONOTIFY)))</div><div class='add'>+#define OPEN_FMODE(flag) ((__force fmode_t)((flag + 1) &amp; O_ACCMODE))</div><div class='ctx'> </div><div class='ctx'> static inline bool is_sxid(umode_t mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -3574,7 +3534,7 @@ static inline bool dir_emit_dot(struct file *file, struct dir_context *ctx)</div><div class='ctx'> static inline bool dir_emit_dotdot(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	return ctx-&gt;actor(ctx, "..", 2, ctx-&gt;pos,</div><div class='del'>-			  parent_ino(file-&gt;f_path.dentry), DT_DIR);</div><div class='add'>+			  d_parent_ino(file-&gt;f_path.dentry), DT_DIR);</div><div class='ctx'> }</div><div class='ctx'> static inline bool dir_emit_dots(struct file *file, struct dir_context *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -3613,4 +3573,37 @@ extern int vfs_fadvise(struct file *file, loff_t offset, loff_t len,</div><div class='ctx'> extern int generic_fadvise(struct file *file, loff_t offset, loff_t len,</div><div class='ctx'> 			   int advice);</div><div class='ctx'> </div><div class='add'>+static inline bool vfs_empty_path(int dfd, const char __user *path)</div><div class='add'>+{</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	if (dfd &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* We now allow NULL to be used for empty path. */</div><div class='add'>+	if (!path)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (unlikely(get_user(c, path)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return !c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int generic_atomic_write_valid(struct kiocb *iocb, struct iov_iter *iter);</div><div class='add'>+</div><div class='add'>+static inline bool extensible_ioctl_valid(unsigned int cmd_a,</div><div class='add'>+					  unsigned int cmd_b, size_t min_size)</div><div class='add'>+{</div><div class='add'>+	if (_IOC_DIR(cmd_a) != _IOC_DIR(cmd_b))</div><div class='add'>+		return false;</div><div class='add'>+	if (_IOC_TYPE(cmd_a) != _IOC_TYPE(cmd_b))</div><div class='add'>+		return false;</div><div class='add'>+	if (_IOC_NR(cmd_a) != _IOC_NR(cmd_b))</div><div class='add'>+		return false;</div><div class='add'>+	if (_IOC_SIZE(cmd_a) &lt; min_size)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_FS_H */</div><div class='head'>diff --git a/include/linux/fs/super.h b/include/linux/fs/super.h<br/>new file mode 100644<br/>index 000000000000..f21ffbb6dea5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fs/super.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fs/super.h</a></div><div class='hunk'>@@ -0,0 +1,238 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_FS_SUPER_H</div><div class='add'>+#define _LINUX_FS_SUPER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs/super_types.h&gt;</div><div class='add'>+#include &lt;linux/unicode.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are internal functions, please use sb_start_{write,pagefault,intwrite}</div><div class='add'>+ * instead.</div><div class='add'>+ */</div><div class='add'>+static inline void __sb_end_write(struct super_block *sb, int level)</div><div class='add'>+{</div><div class='add'>+	percpu_up_read(sb-&gt;s_writers.rw_sem + level - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __sb_start_write(struct super_block *sb, int level)</div><div class='add'>+{</div><div class='add'>+	percpu_down_read_freezable(sb-&gt;s_writers.rw_sem + level - 1, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __sb_start_write_trylock(struct super_block *sb, int level)</div><div class='add'>+{</div><div class='add'>+	return percpu_down_read_trylock(sb-&gt;s_writers.rw_sem + level - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __sb_writers_acquired(sb, lev) \</div><div class='add'>+	percpu_rwsem_acquire(&amp;(sb)-&gt;s_writers.rw_sem[(lev) - 1], 1, _THIS_IP_)</div><div class='add'>+#define __sb_writers_release(sb, lev) \</div><div class='add'>+	percpu_rwsem_release(&amp;(sb)-&gt;s_writers.rw_sem[(lev) - 1], _THIS_IP_)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __sb_write_started - check if sb freeze level is held</div><div class='add'>+ * @sb: the super we write to</div><div class='add'>+ * @level: the freeze level</div><div class='add'>+ *</div><div class='add'>+ * * &gt; 0 - sb freeze level is held</div><div class='add'>+ * *   0 - sb freeze level is not held</div><div class='add'>+ * * &lt; 0 - !CONFIG_LOCKDEP/LOCK_STATE_UNKNOWN</div><div class='add'>+ */</div><div class='add'>+static inline int __sb_write_started(const struct super_block *sb, int level)</div><div class='add'>+{</div><div class='add'>+	return lockdep_is_held_type(sb-&gt;s_writers.rw_sem + level - 1, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sb_write_started - check if SB_FREEZE_WRITE is held</div><div class='add'>+ * @sb: the super we write to</div><div class='add'>+ *</div><div class='add'>+ * May be false positive with !CONFIG_LOCKDEP/LOCK_STATE_UNKNOWN.</div><div class='add'>+ */</div><div class='add'>+static inline bool sb_write_started(const struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return __sb_write_started(sb, SB_FREEZE_WRITE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sb_write_not_started - check if SB_FREEZE_WRITE is not held</div><div class='add'>+ * @sb: the super we write to</div><div class='add'>+ *</div><div class='add'>+ * May be false positive with !CONFIG_LOCKDEP/LOCK_STATE_UNKNOWN.</div><div class='add'>+ */</div><div class='add'>+static inline bool sb_write_not_started(const struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return __sb_write_started(sb, SB_FREEZE_WRITE) &lt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sb_end_write - drop write access to a superblock</div><div class='add'>+ * @sb: the super we wrote to</div><div class='add'>+ *</div><div class='add'>+ * Decrement number of writers to the filesystem. Wake up possible waiters</div><div class='add'>+ * wanting to freeze the filesystem.</div><div class='add'>+ */</div><div class='add'>+static inline void sb_end_write(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	__sb_end_write(sb, SB_FREEZE_WRITE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sb_end_pagefault - drop write access to a superblock from a page fault</div><div class='add'>+ * @sb: the super we wrote to</div><div class='add'>+ *</div><div class='add'>+ * Decrement number of processes handling write page fault to the filesystem.</div><div class='add'>+ * Wake up possible waiters wanting to freeze the filesystem.</div><div class='add'>+ */</div><div class='add'>+static inline void sb_end_pagefault(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	__sb_end_write(sb, SB_FREEZE_PAGEFAULT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sb_end_intwrite - drop write access to a superblock for internal fs purposes</div><div class='add'>+ * @sb: the super we wrote to</div><div class='add'>+ *</div><div class='add'>+ * Decrement fs-internal number of writers to the filesystem.  Wake up possible</div><div class='add'>+ * waiters wanting to freeze the filesystem.</div><div class='add'>+ */</div><div class='add'>+static inline void sb_end_intwrite(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	__sb_end_write(sb, SB_FREEZE_FS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sb_start_write - get write access to a superblock</div><div class='add'>+ * @sb: the super we write to</div><div class='add'>+ *</div><div class='add'>+ * When a process wants to write data or metadata to a file system (i.e. dirty</div><div class='add'>+ * a page or an inode), it should embed the operation in a sb_start_write() -</div><div class='add'>+ * sb_end_write() pair to get exclusion against file system freezing. This</div><div class='add'>+ * function increments number of writers preventing freezing. If the file</div><div class='add'>+ * system is already frozen, the function waits until the file system is</div><div class='add'>+ * thawed.</div><div class='add'>+ *</div><div class='add'>+ * Since freeze protection behaves as a lock, users have to preserve</div><div class='add'>+ * ordering of freeze protection and other filesystem locks. Generally,</div><div class='add'>+ * freeze protection should be the outermost lock. In particular, we have:</div><div class='add'>+ *</div><div class='add'>+ * sb_start_write</div><div class='add'>+ *   -&gt; i_rwsem			(write path, truncate, directory ops, ...)</div><div class='add'>+ *   -&gt; s_umount		(freeze_super, thaw_super)</div><div class='add'>+ */</div><div class='add'>+static inline void sb_start_write(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	__sb_start_write(sb, SB_FREEZE_WRITE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_GUARD(super_write,</div><div class='add'>+	     struct super_block *,</div><div class='add'>+	     sb_start_write(_T),</div><div class='add'>+	     sb_end_write(_T))</div><div class='add'>+</div><div class='add'>+static inline bool sb_start_write_trylock(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return __sb_start_write_trylock(sb, SB_FREEZE_WRITE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sb_start_pagefault - get write access to a superblock from a page fault</div><div class='add'>+ * @sb: the super we write to</div><div class='add'>+ *</div><div class='add'>+ * When a process starts handling write page fault, it should embed the</div><div class='add'>+ * operation into sb_start_pagefault() - sb_end_pagefault() pair to get</div><div class='add'>+ * exclusion against file system freezing. This is needed since the page fault</div><div class='add'>+ * is going to dirty a page. This function increments number of running page</div><div class='add'>+ * faults preventing freezing. If the file system is already frozen, the</div><div class='add'>+ * function waits until the file system is thawed.</div><div class='add'>+ *</div><div class='add'>+ * Since page fault freeze protection behaves as a lock, users have to preserve</div><div class='add'>+ * ordering of freeze protection and other filesystem locks. It is advised to</div><div class='add'>+ * put sb_start_pagefault() close to mmap_lock in lock ordering. Page fault</div><div class='add'>+ * handling code implies lock dependency:</div><div class='add'>+ *</div><div class='add'>+ * mmap_lock</div><div class='add'>+ *   -&gt; sb_start_pagefault</div><div class='add'>+ */</div><div class='add'>+static inline void sb_start_pagefault(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	__sb_start_write(sb, SB_FREEZE_PAGEFAULT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sb_start_intwrite - get write access to a superblock for internal fs purposes</div><div class='add'>+ * @sb: the super we write to</div><div class='add'>+ *</div><div class='add'>+ * This is the third level of protection against filesystem freezing. It is</div><div class='add'>+ * free for use by a filesystem. The only requirement is that it must rank</div><div class='add'>+ * below sb_start_pagefault.</div><div class='add'>+ *</div><div class='add'>+ * For example filesystem can call sb_start_intwrite() when starting a</div><div class='add'>+ * transaction which somewhat eases handling of freezing for internal sources</div><div class='add'>+ * of filesystem changes (internal fs threads, discarding preallocation on file</div><div class='add'>+ * close, etc.).</div><div class='add'>+ */</div><div class='add'>+static inline void sb_start_intwrite(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	__sb_start_write(sb, SB_FREEZE_FS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool sb_start_intwrite_trylock(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return __sb_start_write_trylock(sb, SB_FREEZE_FS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool sb_rdonly(const struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return sb-&gt;s_flags &amp; SB_RDONLY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool sb_is_blkdev_sb(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_BLOCK) &amp;&amp; sb == blockdev_superblock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='add'>+static inline struct unicode_map *sb_encoding(const struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return sb-&gt;s_encoding;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Compare if two super blocks have the same encoding and flags */</div><div class='add'>+static inline bool sb_same_encoding(const struct super_block *sb1,</div><div class='add'>+				    const struct super_block *sb2)</div><div class='add'>+{</div><div class='add'>+	if (sb1-&gt;s_encoding == sb2-&gt;s_encoding)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return (sb1-&gt;s_encoding &amp;&amp; sb2-&gt;s_encoding &amp;&amp;</div><div class='add'>+		(sb1-&gt;s_encoding-&gt;version == sb2-&gt;s_encoding-&gt;version) &amp;&amp;</div><div class='add'>+		(sb1-&gt;s_encoding_flags == sb2-&gt;s_encoding_flags));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline struct unicode_map *sb_encoding(const struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool sb_same_encoding(const struct super_block *sb1,</div><div class='add'>+				    const struct super_block *sb2)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline bool sb_has_encoding(const struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return !!sb_encoding(sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sb_set_blocksize(struct super_block *sb, int size);</div><div class='add'>+int __must_check sb_min_blocksize(struct super_block *sb, int size);</div><div class='add'>+</div><div class='add'>+int freeze_super(struct super_block *super, enum freeze_holder who,</div><div class='add'>+		 const void *freeze_owner);</div><div class='add'>+int thaw_super(struct super_block *super, enum freeze_holder who,</div><div class='add'>+	       const void *freeze_owner);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_FS_SUPER_H */</div><div class='head'>diff --git a/include/linux/fs/super_types.h b/include/linux/fs/super_types.h<br/>new file mode 100644<br/>index 000000000000..6bd3009e09b3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fs/super_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fs/super_types.h</a></div><div class='hunk'>@@ -0,0 +1,336 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_FS_SUPER_TYPES_H</div><div class='add'>+#define _LINUX_FS_SUPER_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs_dirent.h&gt;</div><div class='add'>+#include &lt;linux/errseq.h&gt;</div><div class='add'>+#include &lt;linux/list_lru.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/list_bl.h&gt;</div><div class='add'>+#include &lt;linux/llist.h&gt;</div><div class='add'>+#include &lt;linux/uidgid.h&gt;</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+#include &lt;linux/percpu-rwsem.h&gt;</div><div class='add'>+#include &lt;linux/workqueue_types.h&gt;</div><div class='add'>+#include &lt;linux/quota.h&gt;</div><div class='add'>+</div><div class='add'>+struct backing_dev_info;</div><div class='add'>+struct block_device;</div><div class='add'>+struct dentry;</div><div class='add'>+struct dentry_operations;</div><div class='add'>+struct dquot_operations;</div><div class='add'>+struct export_operations;</div><div class='add'>+struct file;</div><div class='add'>+struct file_system_type;</div><div class='add'>+struct fscrypt_operations;</div><div class='add'>+struct fsnotify_sb_info;</div><div class='add'>+struct fsverity_operations;</div><div class='add'>+struct kstatfs;</div><div class='add'>+struct mount;</div><div class='add'>+struct mtd_info;</div><div class='add'>+struct quotactl_ops;</div><div class='add'>+struct shrinker;</div><div class='add'>+struct unicode_map;</div><div class='add'>+struct user_namespace;</div><div class='add'>+struct workqueue_struct;</div><div class='add'>+struct writeback_control;</div><div class='add'>+struct xattr_handler;</div><div class='add'>+</div><div class='add'>+extern struct super_block *blockdev_superblock;</div><div class='add'>+</div><div class='add'>+/* Possible states of 'frozen' field */</div><div class='add'>+enum {</div><div class='add'>+	SB_UNFROZEN		= 0,	/* FS is unfrozen */</div><div class='add'>+	SB_FREEZE_WRITE		= 1,	/* Writes, dir ops, ioctls frozen */</div><div class='add'>+	SB_FREEZE_PAGEFAULT	= 2,	/* Page faults stopped as well */</div><div class='add'>+	SB_FREEZE_FS		= 3,	/* For internal FS use (e.g. to stop internal threads if needed) */</div><div class='add'>+	SB_FREEZE_COMPLETE	= 4,	/* -&gt;freeze_fs finished successfully */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SB_FREEZE_LEVELS (SB_FREEZE_COMPLETE - 1)</div><div class='add'>+</div><div class='add'>+struct sb_writers {</div><div class='add'>+	unsigned short			frozen;		/* Is sb frozen? */</div><div class='add'>+	int				freeze_kcount;	/* How many kernel freeze requests? */</div><div class='add'>+	int				freeze_ucount;	/* How many userspace freeze requests? */</div><div class='add'>+	const void			*freeze_owner;	/* Owner of the freeze */</div><div class='add'>+	struct percpu_rw_semaphore	rw_sem[SB_FREEZE_LEVELS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum freeze_holder - holder of the freeze</div><div class='add'>+ * @FREEZE_HOLDER_KERNEL: kernel wants to freeze or thaw filesystem</div><div class='add'>+ * @FREEZE_HOLDER_USERSPACE: userspace wants to freeze or thaw filesystem</div><div class='add'>+ * @FREEZE_MAY_NEST: whether nesting freeze and thaw requests is allowed</div><div class='add'>+ * @FREEZE_EXCL: a freeze that can only be undone by the owner</div><div class='add'>+ *</div><div class='add'>+ * Indicate who the owner of the freeze or thaw request is and whether</div><div class='add'>+ * the freeze needs to be exclusive or can nest.</div><div class='add'>+ * Without @FREEZE_MAY_NEST, multiple freeze and thaw requests from the</div><div class='add'>+ * same holder aren't allowed. It is however allowed to hold a single</div><div class='add'>+ * @FREEZE_HOLDER_USERSPACE and a single @FREEZE_HOLDER_KERNEL freeze at</div><div class='add'>+ * the same time. This is relied upon by some filesystems during online</div><div class='add'>+ * repair or similar.</div><div class='add'>+ */</div><div class='add'>+enum freeze_holder {</div><div class='add'>+	FREEZE_HOLDER_KERNEL	= (1U &lt;&lt; 0),</div><div class='add'>+	FREEZE_HOLDER_USERSPACE	= (1U &lt;&lt; 1),</div><div class='add'>+	FREEZE_MAY_NEST		= (1U &lt;&lt; 2),</div><div class='add'>+	FREEZE_EXCL		= (1U &lt;&lt; 3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct super_operations {</div><div class='add'>+	struct inode *(*alloc_inode)(struct super_block *sb);</div><div class='add'>+	void (*destroy_inode)(struct inode *inode);</div><div class='add'>+	void (*free_inode)(struct inode *inode);</div><div class='add'>+	void (*dirty_inode)(struct inode *inode, int flags);</div><div class='add'>+	int (*write_inode)(struct inode *inode, struct writeback_control *wbc);</div><div class='add'>+	int (*drop_inode)(struct inode *inode);</div><div class='add'>+	void (*evict_inode)(struct inode *inode);</div><div class='add'>+	void (*put_super)(struct super_block *sb);</div><div class='add'>+	int (*sync_fs)(struct super_block *sb, int wait);</div><div class='add'>+	int (*freeze_super)(struct super_block *sb, enum freeze_holder who,</div><div class='add'>+			    const void *owner);</div><div class='add'>+	int (*freeze_fs)(struct super_block *sb);</div><div class='add'>+	int (*thaw_super)(struct super_block *sb, enum freeze_holder who,</div><div class='add'>+			  const void *owner);</div><div class='add'>+	int (*unfreeze_fs)(struct super_block *sb);</div><div class='add'>+	int (*statfs)(struct dentry *dentry, struct kstatfs *kstatfs);</div><div class='add'>+	int (*remount_fs) (struct super_block *, int *, char *);</div><div class='add'>+	void (*umount_begin)(struct super_block *sb);</div><div class='add'>+</div><div class='add'>+	int (*show_options)(struct seq_file *seq, struct dentry *dentry);</div><div class='add'>+	int (*show_devname)(struct seq_file *seq, struct dentry *dentry);</div><div class='add'>+	int (*show_path)(struct seq_file *seq, struct dentry *dentry);</div><div class='add'>+	int (*show_stats)(struct seq_file *seq, struct dentry *dentry);</div><div class='add'>+#ifdef CONFIG_QUOTA</div><div class='add'>+	ssize_t (*quota_read)(struct super_block *sb, int type, char *data,</div><div class='add'>+			      size_t len, loff_t off);</div><div class='add'>+	ssize_t (*quota_write)(struct super_block *sb, int type,</div><div class='add'>+			       const char *data, size_t len, loff_t off);</div><div class='add'>+	struct dquot __rcu **(*get_dquots)(struct inode *inode);</div><div class='add'>+#endif</div><div class='add'>+	long (*nr_cached_objects)(struct super_block *sb,</div><div class='add'>+				  struct shrink_control *sc);</div><div class='add'>+	long (*free_cached_objects)(struct super_block *sb,</div><div class='add'>+				    struct shrink_control *sc);</div><div class='add'>+	/*</div><div class='add'>+	 * If a filesystem can support graceful removal of a device and</div><div class='add'>+	 * continue read-write operations, implement this callback.</div><div class='add'>+	 *</div><div class='add'>+	 * Return 0 if the filesystem can continue read-write.</div><div class='add'>+	 * Non-zero return value or no such callback means the fs will be shutdown</div><div class='add'>+	 * as usual.</div><div class='add'>+	 */</div><div class='add'>+	int (*remove_bdev)(struct super_block *sb, struct block_device *bdev);</div><div class='add'>+	void (*shutdown)(struct super_block *sb);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct super_block {</div><div class='add'>+	struct list_head			s_list;		/* Keep this first */</div><div class='add'>+	dev_t					s_dev;		/* search index; _not_ kdev_t */</div><div class='add'>+	unsigned char				s_blocksize_bits;</div><div class='add'>+	unsigned long				s_blocksize;</div><div class='add'>+	loff_t					s_maxbytes;	/* Max file size */</div><div class='add'>+	struct file_system_type			*s_type;</div><div class='add'>+	const struct super_operations		*s_op;</div><div class='add'>+	const struct dquot_operations		*dq_op;</div><div class='add'>+	const struct quotactl_ops		*s_qcop;</div><div class='add'>+	const struct export_operations		*s_export_op;</div><div class='add'>+	unsigned long				s_flags;</div><div class='add'>+	unsigned long				s_iflags;	/* internal SB_I_* flags */</div><div class='add'>+	unsigned long				s_magic;</div><div class='add'>+	struct dentry				*s_root;</div><div class='add'>+	struct rw_semaphore			s_umount;</div><div class='add'>+	int					s_count;</div><div class='add'>+	atomic_t				s_active;</div><div class='add'>+#ifdef CONFIG_SECURITY</div><div class='add'>+	void					*s_security;</div><div class='add'>+#endif</div><div class='add'>+	const struct xattr_handler		*const *s_xattr;</div><div class='add'>+#ifdef CONFIG_FS_ENCRYPTION</div><div class='add'>+	const struct fscrypt_operations		*s_cop;</div><div class='add'>+	struct fscrypt_keyring			*s_master_keys; /* master crypto keys in use */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_FS_VERITY</div><div class='add'>+	const struct fsverity_operations	*s_vop;</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='add'>+	struct unicode_map			*s_encoding;</div><div class='add'>+	__u16					s_encoding_flags;</div><div class='add'>+#endif</div><div class='add'>+	struct hlist_bl_head			s_roots;	/* alternate root dentries for NFS */</div><div class='add'>+	struct mount				*s_mounts;	/* list of mounts; _not_ for fs use */</div><div class='add'>+	struct block_device			*s_bdev;	/* can go away once we use an accessor for @s_bdev_file */</div><div class='add'>+	struct file				*s_bdev_file;</div><div class='add'>+	struct backing_dev_info 		*s_bdi;</div><div class='add'>+	struct mtd_info				*s_mtd;</div><div class='add'>+	struct hlist_node			s_instances;</div><div class='add'>+	unsigned int				s_quota_types;	/* Bitmask of supported quota types */</div><div class='add'>+	struct quota_info			s_dquot;	/* Diskquota specific options */</div><div class='add'>+</div><div class='add'>+	struct sb_writers			s_writers;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Keep s_fs_info, s_time_gran, s_fsnotify_mask, and</div><div class='add'>+	 * s_fsnotify_info together for cache efficiency. They are frequently</div><div class='add'>+	 * accessed and rarely modified.</div><div class='add'>+	 */</div><div class='add'>+	void					*s_fs_info;	/* Filesystem private info */</div><div class='add'>+</div><div class='add'>+	/* Granularity of c/m/atime in ns (cannot be worse than a second) */</div><div class='add'>+	u32					s_time_gran;</div><div class='add'>+	/* Time limits for c/m/atime in seconds */</div><div class='add'>+	time64_t				s_time_min;</div><div class='add'>+	time64_t		   		s_time_max;</div><div class='add'>+#ifdef CONFIG_FSNOTIFY</div><div class='add'>+	u32					s_fsnotify_mask;</div><div class='add'>+	struct fsnotify_sb_info			*s_fsnotify_info;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * q: why are s_id and s_sysfs_name not the same? both are human</div><div class='add'>+	 * readable strings that identify the filesystem</div><div class='add'>+	 * a: s_id is allowed to change at runtime; it's used in log messages,</div><div class='add'>+	 * and we want to when a device starts out as single device (s_id is dev</div><div class='add'>+	 * name) but then a device is hot added and we have to switch to</div><div class='add'>+	 * identifying it by UUID</div><div class='add'>+	 * but s_sysfs_name is a handle for programmatic access, and can't</div><div class='add'>+	 * change at runtime</div><div class='add'>+	 */</div><div class='add'>+	char					s_id[32];	/* Informational name */</div><div class='add'>+	uuid_t					s_uuid;		/* UUID */</div><div class='add'>+	u8					s_uuid_len;	/* Default 16, possibly smaller for weird filesystems */</div><div class='add'>+</div><div class='add'>+	/* if set, fs shows up under sysfs at /sys/fs/$FSTYP/s_sysfs_name */</div><div class='add'>+	char					s_sysfs_name[UUID_STRING_LEN + 1];</div><div class='add'>+</div><div class='add'>+	unsigned int				s_max_links;</div><div class='add'>+	unsigned int				s_d_flags;	/* default d_flags for dentries */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The next field is for VFS *only*. No filesystems have any business</div><div class='add'>+	 * even looking at it. You had been warned.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex				s_vfs_rename_mutex;	/* Kludge */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Filesystem subtype.  If non-empty the filesystem type field</div><div class='add'>+	 * in /proc/mounts will be "type.subtype"</div><div class='add'>+	 */</div><div class='add'>+	const char				*s_subtype;</div><div class='add'>+</div><div class='add'>+	const struct dentry_operations		*__s_d_op; /* default d_op for dentries */</div><div class='add'>+</div><div class='add'>+	struct shrinker				*s_shrink;	/* per-sb shrinker handle */</div><div class='add'>+</div><div class='add'>+	/* Number of inodes with nlink == 0 but still referenced */</div><div class='add'>+	atomic_long_t				s_remove_count;</div><div class='add'>+</div><div class='add'>+	/* Read-only state of the superblock is being changed */</div><div class='add'>+	int					s_readonly_remount;</div><div class='add'>+</div><div class='add'>+	/* per-sb errseq_t for reporting writeback errors via syncfs */</div><div class='add'>+	errseq_t s_wb_err;</div><div class='add'>+</div><div class='add'>+	/* AIO completions deferred from interrupt context */</div><div class='add'>+	struct workqueue_struct			*s_dio_done_wq;</div><div class='add'>+	struct hlist_head			s_pins;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Owning user namespace and default context in which to</div><div class='add'>+	 * interpret filesystem uids, gids, quotas, device nodes,</div><div class='add'>+	 * xattrs and security labels.</div><div class='add'>+	 */</div><div class='add'>+	struct user_namespace			*s_user_ns;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The list_lru structure is essentially just a pointer to a table</div><div class='add'>+	 * of per-node lru lists, each of which has its own spinlock.</div><div class='add'>+	 * There is no need to put them into separate cachelines.</div><div class='add'>+	 */</div><div class='add'>+	struct list_lru				s_dentry_lru;</div><div class='add'>+	struct list_lru				s_inode_lru;</div><div class='add'>+	struct rcu_head				rcu;</div><div class='add'>+	struct work_struct			destroy_work;</div><div class='add'>+</div><div class='add'>+	struct mutex				s_sync_lock;	/* sync serialisation lock */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Indicates how deep in a filesystem stack this SB is</div><div class='add'>+	 */</div><div class='add'>+	int s_stack_depth;</div><div class='add'>+</div><div class='add'>+	/* s_inode_list_lock protects s_inodes */</div><div class='add'>+	spinlock_t				s_inode_list_lock ____cacheline_aligned_in_smp;</div><div class='add'>+	struct list_head			s_inodes;	/* all inodes */</div><div class='add'>+</div><div class='add'>+	spinlock_t				s_inode_wblist_lock;</div><div class='add'>+	struct list_head			s_inodes_wb;	/* writeback inodes */</div><div class='add'>+	long					s_min_writeback_pages;</div><div class='add'>+} __randomize_layout;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sb-&gt;s_flags.  Note that these mirror the equivalent MS_* flags where</div><div class='add'>+ * represented in both.</div><div class='add'>+ */</div><div class='add'>+#define SB_RDONLY       BIT(0)	/* Mount read-only */</div><div class='add'>+#define SB_NOSUID       BIT(1)	/* Ignore suid and sgid bits */</div><div class='add'>+#define SB_NODEV        BIT(2)	/* Disallow access to device special files */</div><div class='add'>+#define SB_NOEXEC       BIT(3)	/* Disallow program execution */</div><div class='add'>+#define SB_SYNCHRONOUS  BIT(4)	/* Writes are synced at once */</div><div class='add'>+#define SB_MANDLOCK     BIT(6)	/* Allow mandatory locks on an FS */</div><div class='add'>+#define SB_DIRSYNC      BIT(7)	/* Directory modifications are synchronous */</div><div class='add'>+#define SB_NOATIME      BIT(10)	/* Do not update access times. */</div><div class='add'>+#define SB_NODIRATIME   BIT(11)	/* Do not update directory access times */</div><div class='add'>+#define SB_SILENT       BIT(15)</div><div class='add'>+#define SB_POSIXACL     BIT(16)	/* Supports POSIX ACLs */</div><div class='add'>+#define SB_INLINECRYPT  BIT(17)	/* Use blk-crypto for encrypted files */</div><div class='add'>+#define SB_KERNMOUNT    BIT(22)	/* this is a kern_mount call */</div><div class='add'>+#define SB_I_VERSION    BIT(23)	/* Update inode I_version field */</div><div class='add'>+#define SB_LAZYTIME     BIT(25)	/* Update the on-disk [acm]times lazily */</div><div class='add'>+</div><div class='add'>+/* These sb flags are internal to the kernel */</div><div class='add'>+#define SB_DEAD         BIT(21)</div><div class='add'>+#define SB_DYING        BIT(24)</div><div class='add'>+#define SB_FORCE        BIT(27)</div><div class='add'>+#define SB_NOSEC        BIT(28)</div><div class='add'>+#define SB_BORN         BIT(29)</div><div class='add'>+#define SB_ACTIVE       BIT(30)</div><div class='add'>+#define SB_NOUSER       BIT(31)</div><div class='add'>+</div><div class='add'>+/* These flags relate to encoding and casefolding */</div><div class='add'>+#define SB_ENC_STRICT_MODE_FL		(1 &lt;&lt; 0)</div><div class='add'>+#define SB_ENC_NO_COMPAT_FALLBACK_FL	(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define sb_has_strict_encoding(sb) \</div><div class='add'>+	(sb-&gt;s_encoding_flags &amp; SB_ENC_STRICT_MODE_FL)</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_UNICODE)</div><div class='add'>+#define sb_no_casefold_compat_fallback(sb) \</div><div class='add'>+	(sb-&gt;s_encoding_flags &amp; SB_ENC_NO_COMPAT_FALLBACK_FL)</div><div class='add'>+#else</div><div class='add'>+#define sb_no_casefold_compat_fallback(sb) (1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* sb-&gt;s_iflags */</div><div class='add'>+#define SB_I_CGROUPWB	0x00000001	/* cgroup-aware writeback enabled */</div><div class='add'>+#define SB_I_NOEXEC	0x00000002	/* Ignore executables on this fs */</div><div class='add'>+#define SB_I_NODEV	0x00000004	/* Ignore devices on this fs */</div><div class='add'>+#define SB_I_STABLE_WRITES 0x00000008	/* don't modify blks until WB is done */</div><div class='add'>+</div><div class='add'>+/* sb-&gt;s_iflags to limit user namespace mounts */</div><div class='add'>+#define SB_I_USERNS_VISIBLE		0x00000010 /* fstype already mounted */</div><div class='add'>+#define SB_I_IMA_UNVERIFIABLE_SIGNATURE	0x00000020</div><div class='add'>+#define SB_I_UNTRUSTED_MOUNTER		0x00000040</div><div class='add'>+#define SB_I_EVM_HMAC_UNSUPPORTED	0x00000080</div><div class='add'>+</div><div class='add'>+#define SB_I_SKIP_SYNC	0x00000100	/* Skip superblock at global sync */</div><div class='add'>+#define SB_I_PERSB_BDI	0x00000200	/* has a per-sb bdi */</div><div class='add'>+#define SB_I_TS_EXPIRY_WARNED 0x00000400 /* warned about timestamp range expiry */</div><div class='add'>+#define SB_I_RETIRED	0x00000800	/* superblock shouldn't be reused */</div><div class='add'>+#define SB_I_NOUMASK	0x00001000	/* VFS does not apply umask */</div><div class='add'>+#define SB_I_NOIDMAP	0x00002000	/* No idmapped mounts on this superblock */</div><div class='add'>+#define SB_I_ALLOW_HSM	0x00004000	/* Allow HSM events on this superblock */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_FS_SUPER_TYPES_H */</div><div class='head'>diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h<br/>index c13e99cbbf81..0d6c8a6d7be2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fs_context.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_context.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fs_context.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fs_context.h</a></div><div class='hunk'>@@ -134,8 +134,13 @@ extern struct fs_context *fs_context_for_submount(struct file_system_type *fs_ty</div><div class='ctx'> </div><div class='ctx'> extern struct fs_context *vfs_dup_fs_context(struct fs_context *fc);</div><div class='ctx'> extern int vfs_parse_fs_param(struct fs_context *fc, struct fs_parameter *param);</div><div class='del'>-extern int vfs_parse_fs_string(struct fs_context *fc, const char *key,</div><div class='del'>-			       const char *value, size_t v_size);</div><div class='add'>+extern int vfs_parse_fs_qstr(struct fs_context *fc, const char *key,</div><div class='add'>+				const struct qstr *value);</div><div class='add'>+static inline int vfs_parse_fs_string(struct fs_context *fc, const char *key,</div><div class='add'>+			       const char *value)</div><div class='add'>+{</div><div class='add'>+	return vfs_parse_fs_qstr(fc, key, value ? &amp;QSTR(value) : NULL);</div><div class='add'>+}</div><div class='ctx'> int vfs_parse_monolithic_sep(struct fs_context *fc, void *data,</div><div class='ctx'> 			     char *(*sep)(char **));</div><div class='ctx'> extern int generic_parse_monolithic(struct fs_context *fc, void *data);</div><div class='hunk'>@@ -144,8 +149,6 @@ extern void put_fs_context(struct fs_context *fc);</div><div class='ctx'> extern int vfs_parse_fs_param_source(struct fs_context *fc,</div><div class='ctx'> 				     struct fs_parameter *param);</div><div class='ctx'> extern void fc_drop_locked(struct fs_context *fc);</div><div class='del'>-int reconfigure_single(struct super_block *s,</div><div class='del'>-		       int flags, void *data);</div><div class='ctx'> </div><div class='ctx'> extern int get_tree_nodev(struct fs_context *fc,</div><div class='ctx'> 			 int (*fill_super)(struct super_block *sb,</div><div class='hunk'>@@ -160,6 +163,12 @@ extern int get_tree_keyed(struct fs_context *fc,</div><div class='ctx'> </div><div class='ctx'> int setup_bdev_super(struct super_block *sb, int sb_flags,</div><div class='ctx'> 		struct fs_context *fc);</div><div class='add'>+</div><div class='add'>+#define GET_TREE_BDEV_QUIET_LOOKUP		0x0001</div><div class='add'>+int get_tree_bdev_flags(struct fs_context *fc,</div><div class='add'>+		int (*fill_super)(struct super_block *sb,</div><div class='add'>+				  struct fs_context *fc), unsigned int flags);</div><div class='add'>+</div><div class='ctx'> extern int get_tree_bdev(struct fs_context *fc,</div><div class='ctx'> 			       int (*fill_super)(struct super_block *sb,</div><div class='ctx'> 						 struct fs_context *fc));</div><div class='hunk'>@@ -182,10 +191,12 @@ struct fc_log {</div><div class='ctx'> extern __attribute__((format(printf, 4, 5)))</div><div class='ctx'> void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt, ...);</div><div class='ctx'> </div><div class='del'>-#define __logfc(fc, l, fmt, ...) logfc((fc)-&gt;log.log, NULL, \</div><div class='del'>-					l, fmt, ## __VA_ARGS__)</div><div class='del'>-#define __plog(p, l, fmt, ...) logfc((p)-&gt;log, (p)-&gt;prefix, \</div><div class='del'>-					l, fmt, ## __VA_ARGS__)</div><div class='add'>+#define __logfc(fc, l, fmt, ...) \</div><div class='add'>+	logfc((fc)-&gt;log.log, NULL, (l), (fmt), ## __VA_ARGS__)</div><div class='add'>+#define __plogp(p, prefix, l, fmt, ...) \</div><div class='add'>+	logfc((p)-&gt;log, (prefix), (l), (fmt), ## __VA_ARGS__)</div><div class='add'>+#define __plog(p, l, fmt, ...) __plogp(p, (p)-&gt;prefix, l, fmt, ## __VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * infof - Store supplementary informational message</div><div class='ctx'>  * @fc: The context in which to log the informational message</div><div class='hunk'>@@ -196,7 +207,9 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt,</div><div class='ctx'>  */</div><div class='ctx'> #define infof(fc, fmt, ...) __logfc(fc, 'i', fmt, ## __VA_ARGS__)</div><div class='ctx'> #define info_plog(p, fmt, ...) __plog(p, 'i', fmt, ## __VA_ARGS__)</div><div class='del'>-#define infofc(p, fmt, ...) __plog((&amp;(fc)-&gt;log), 'i', fmt, ## __VA_ARGS__)</div><div class='add'>+#define infofc(fc, fmt, ...) __plog((&amp;(fc)-&gt;log), 'i', fmt, ## __VA_ARGS__)</div><div class='add'>+#define infofcp(fc, prefix, fmt, ...) \</div><div class='add'>+	__plogp((&amp;(fc)-&gt;log), prefix, 'i', fmt, ## __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * warnf - Store supplementary warning message</div><div class='hunk'>@@ -209,6 +222,8 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt,</div><div class='ctx'> #define warnf(fc, fmt, ...) __logfc(fc, 'w', fmt, ## __VA_ARGS__)</div><div class='ctx'> #define warn_plog(p, fmt, ...) __plog(p, 'w', fmt, ## __VA_ARGS__)</div><div class='ctx'> #define warnfc(fc, fmt, ...) __plog((&amp;(fc)-&gt;log), 'w', fmt, ## __VA_ARGS__)</div><div class='add'>+#define warnfcp(fc, prefix, fmt, ...) \</div><div class='add'>+	__plogp((&amp;(fc)-&gt;log), prefix, 'w', fmt, ## __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * errorf - Store supplementary error message</div><div class='hunk'>@@ -221,6 +236,8 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt,</div><div class='ctx'> #define errorf(fc, fmt, ...) __logfc(fc, 'e', fmt, ## __VA_ARGS__)</div><div class='ctx'> #define error_plog(p, fmt, ...) __plog(p, 'e', fmt, ## __VA_ARGS__)</div><div class='ctx'> #define errorfc(fc, fmt, ...) __plog((&amp;(fc)-&gt;log), 'e', fmt, ## __VA_ARGS__)</div><div class='add'>+#define errorfcp(fc, prefix, fmt, ...) \</div><div class='add'>+	__plogp((&amp;(fc)-&gt;log), prefix, 'e', fmt, ## __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * invalf - Store supplementary invalid argument error message</div><div class='hunk'>@@ -233,5 +250,7 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt,</div><div class='ctx'> #define invalf(fc, fmt, ...) (errorf(fc, fmt, ## __VA_ARGS__), -EINVAL)</div><div class='ctx'> #define inval_plog(p, fmt, ...) (error_plog(p, fmt, ## __VA_ARGS__), -EINVAL)</div><div class='ctx'> #define invalfc(fc, fmt, ...) (errorfc(fc, fmt, ## __VA_ARGS__), -EINVAL)</div><div class='add'>+#define invalfcp(fc, prefix, fmt, ...) \</div><div class='add'>+	(errorfcp(fc, prefix, fmt, ## __VA_ARGS__), -EINVAL)</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_FS_CONTEXT_H */</div><div class='head'>diff --git a/include/linux/fs_types.h b/include/linux/fs_dirent.h<br/>index 54816791196f..92f75c5bac19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fs_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fs_dirent.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fs_dirent.h</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_FS_TYPES_H</div><div class='del'>-#define _LINUX_FS_TYPES_H</div><div class='add'>+#ifndef _LINUX_FS_DIRENT_H</div><div class='add'>+#define _LINUX_FS_DIRENT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/stat.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is a header for the common implementation of dirent</div><div class='hunk'>@@ -66,10 +69,10 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * declarations for helper functions, accompanying implementation</div><div class='del'>- * is in fs/fs_types.c</div><div class='add'>+ * is in fs/fs_dirent.c</div><div class='ctx'>  */</div><div class='ctx'> extern unsigned char fs_ftype_to_dtype(unsigned int filetype);</div><div class='ctx'> extern unsigned char fs_umode_to_ftype(umode_t mode);</div><div class='ctx'> extern unsigned char fs_umode_to_dtype(umode_t mode);</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* _LINUX_FS_DIRENT_H */</div><div class='head'>diff --git a/include/linux/fs_parser.h b/include/linux/fs_parser.h<br/>index 01542c4b87a2..5e8a3b546033 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fs_parser.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_parser.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fs_parser.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fs_parser.h</a></div><div class='hunk'>@@ -28,7 +28,8 @@ typedef int fs_param_type(struct p_log *,</div><div class='ctx'>  */</div><div class='ctx'> fs_param_type fs_param_is_bool, fs_param_is_u32, fs_param_is_s32, fs_param_is_u64,</div><div class='ctx'> 	fs_param_is_enum, fs_param_is_string, fs_param_is_blob, fs_param_is_blockdev,</div><div class='del'>-	fs_param_is_path, fs_param_is_fd;</div><div class='add'>+	fs_param_is_path, fs_param_is_fd, fs_param_is_uid, fs_param_is_gid,</div><div class='add'>+	fs_param_is_file_or_string;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Specification of the type of value a parameter wants.</div><div class='hunk'>@@ -57,6 +58,8 @@ struct fs_parse_result {</div><div class='ctx'> 		int		int_32;		/* For spec_s32/spec_enum */</div><div class='ctx'> 		unsigned int	uint_32;	/* For spec_u32{,_octal,_hex}/spec_enum */</div><div class='ctx'> 		u64		uint_64;	/* For spec_u64 */</div><div class='add'>+		kuid_t		uid;</div><div class='add'>+		kgid_t		gid;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -81,15 +84,12 @@ extern int fs_lookup_param(struct fs_context *fc,</div><div class='ctx'> </div><div class='ctx'> extern int lookup_constant(const struct constant_table tbl[], const char *name, int not_found);</div><div class='ctx'> </div><div class='add'>+extern const struct constant_table bool_names[];</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_VALIDATE_FS_PARSER</div><div class='del'>-extern bool validate_constant_table(const struct constant_table *tbl, size_t tbl_size,</div><div class='del'>-				    int low, int high, int special);</div><div class='ctx'> extern bool fs_validate_description(const char *name,</div><div class='ctx'> 				    const struct fs_parameter_spec *desc);</div><div class='ctx'> #else</div><div class='del'>-static inline bool validate_constant_table(const struct constant_table *tbl, size_t tbl_size,</div><div class='del'>-					   int low, int high, int special)</div><div class='del'>-{ return true; }</div><div class='ctx'> static inline bool fs_validate_description(const char *name,</div><div class='ctx'> 					   const struct fs_parameter_spec *desc)</div><div class='ctx'> { return true; }</div><div class='hunk'>@@ -121,7 +121,7 @@ static inline bool fs_validate_description(const char *name,</div><div class='ctx'> #define fsparam_u32oct(NAME, OPT) \</div><div class='ctx'> 			__fsparam(fs_param_is_u32, NAME, OPT, 0, (void *)8)</div><div class='ctx'> #define fsparam_u32hex(NAME, OPT) \</div><div class='del'>-			__fsparam(fs_param_is_u32_hex, NAME, OPT, 0, (void *)16)</div><div class='add'>+			__fsparam(fs_param_is_u32, NAME, OPT, 0, (void *)16)</div><div class='ctx'> #define fsparam_s32(NAME, OPT)	__fsparam(fs_param_is_s32, NAME, OPT, 0, NULL)</div><div class='ctx'> #define fsparam_u64(NAME, OPT)	__fsparam(fs_param_is_u64, NAME, OPT, 0, NULL)</div><div class='ctx'> #define fsparam_enum(NAME, OPT, array)	__fsparam(fs_param_is_enum, NAME, OPT, 0, array)</div><div class='hunk'>@@ -131,5 +131,13 @@ static inline bool fs_validate_description(const char *name,</div><div class='ctx'> #define fsparam_bdev(NAME, OPT)	__fsparam(fs_param_is_blockdev, NAME, OPT, 0, NULL)</div><div class='ctx'> #define fsparam_path(NAME, OPT)	__fsparam(fs_param_is_path, NAME, OPT, 0, NULL)</div><div class='ctx'> #define fsparam_fd(NAME, OPT)	__fsparam(fs_param_is_fd, NAME, OPT, 0, NULL)</div><div class='add'>+#define fsparam_file_or_string(NAME, OPT) \</div><div class='add'>+				__fsparam(fs_param_is_file_or_string, NAME, OPT, 0, NULL)</div><div class='add'>+#define fsparam_uid(NAME, OPT) __fsparam(fs_param_is_uid, NAME, OPT, 0, NULL)</div><div class='add'>+#define fsparam_gid(NAME, OPT) __fsparam(fs_param_is_gid, NAME, OPT, 0, NULL)</div><div class='add'>+</div><div class='add'>+/* String parameter that allows empty argument */</div><div class='add'>+#define fsparam_string_empty(NAME, OPT) \</div><div class='add'>+	__fsparam(fs_param_is_string, NAME, OPT, fs_param_can_be_empty, NULL)</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_FS_PARSER_H */</div><div class='head'>diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h<br/>index 2b1f74b24070..0cc2fa283305 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fs_stack.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_stack.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fs_stack.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fs_stack.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #define _LINUX_FS_STACK_H</div><div class='ctx'> </div><div class='ctx'> /* This file defines generic functions used primarily by stackable</div><div class='del'>- * filesystems; none of these functions require i_mutex to be held.</div><div class='add'>+ * filesystems; none of these functions require i_rwsem to be held.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h<br/>index 783b48dedb72..0070764b790a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fs_struct.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fs_struct.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fs_struct.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fs_struct.h</a></div><div class='hunk'>@@ -2,14 +2,14 @@</div><div class='ctx'> #ifndef _LINUX_FS_STRUCT_H</div><div class='ctx'> #define _LINUX_FS_STRUCT_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/path.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/seqlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct fs_struct {</div><div class='ctx'> 	int users;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	seqcount_spinlock_t seq;</div><div class='add'>+	seqlock_t seq;</div><div class='ctx'> 	int umask;</div><div class='ctx'> 	int in_exec;</div><div class='ctx'> 	struct path root, pwd;</div><div class='hunk'>@@ -26,20 +26,25 @@ extern int unshare_fs_struct(void);</div><div class='ctx'> </div><div class='ctx'> static inline void get_fs_root(struct fs_struct *fs, struct path *root)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;fs-&gt;lock);</div><div class='add'>+	read_seqlock_excl(&amp;fs-&gt;seq);</div><div class='ctx'> 	*root = fs-&gt;root;</div><div class='ctx'> 	path_get(root);</div><div class='del'>-	spin_unlock(&amp;fs-&gt;lock);</div><div class='add'>+	read_sequnlock_excl(&amp;fs-&gt;seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void get_fs_pwd(struct fs_struct *fs, struct path *pwd)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;fs-&gt;lock);</div><div class='add'>+	read_seqlock_excl(&amp;fs-&gt;seq);</div><div class='ctx'> 	*pwd = fs-&gt;pwd;</div><div class='ctx'> 	path_get(pwd);</div><div class='del'>-	spin_unlock(&amp;fs-&gt;lock);</div><div class='add'>+	read_sequnlock_excl(&amp;fs-&gt;seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern bool current_chrooted(void);</div><div class='ctx'> </div><div class='add'>+static inline int current_umask(void)</div><div class='add'>+{</div><div class='add'>+	return current-&gt;fs-&gt;umask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_FS_STRUCT_H */</div><div class='head'>diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h<br/>index bdf7f3eddf0a..4c91a019972b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fscache-cache.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fscache-cache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fscache-cache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fscache-cache.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> enum fscache_cache_trace;</div><div class='ctx'> enum fscache_cookie_trace;</div><div class='ctx'> enum fscache_access_trace;</div><div class='add'>+enum fscache_volume_trace;</div><div class='ctx'> </div><div class='ctx'> enum fscache_cache_state {</div><div class='ctx'> 	FSCACHE_CACHE_IS_NOT_PRESENT,	/* No cache is present for this name */</div><div class='hunk'>@@ -97,6 +98,11 @@ extern void fscache_withdraw_cookie(struct fscache_cookie *cookie);</div><div class='ctx'> </div><div class='ctx'> extern void fscache_io_error(struct fscache_cache *cache);</div><div class='ctx'> </div><div class='add'>+extern struct fscache_volume *</div><div class='add'>+fscache_try_get_volume(struct fscache_volume *volume,</div><div class='add'>+		       enum fscache_volume_trace where);</div><div class='add'>+extern void fscache_put_volume(struct fscache_volume *volume,</div><div class='add'>+			       enum fscache_volume_trace where);</div><div class='ctx'> extern void fscache_end_volume_access(struct fscache_volume *volume,</div><div class='ctx'> 				      struct fscache_cookie *cookie,</div><div class='ctx'> 				      enum fscache_access_trace why);</div><div class='head'>diff --git a/include/linux/fscache.h b/include/linux/fscache.h<br/>index 6e8562cbcc43..58fdb9605425 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fscache.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fscache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fscache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fscache.h</a></div><div class='hunk'>@@ -172,9 +172,12 @@ extern void __fscache_invalidate(struct fscache_cookie *, const void *, loff_t,</div><div class='ctx'> extern int __fscache_begin_read_operation(struct netfs_cache_resources *, struct fscache_cookie *);</div><div class='ctx'> extern int __fscache_begin_write_operation(struct netfs_cache_resources *, struct fscache_cookie *);</div><div class='ctx'> </div><div class='del'>-extern void __fscache_write_to_cache(struct fscache_cookie *, struct address_space *,</div><div class='del'>-				     loff_t, size_t, loff_t, netfs_io_terminated_t, void *,</div><div class='del'>-				     bool);</div><div class='add'>+void __fscache_write_to_cache(struct fscache_cookie *cookie,</div><div class='add'>+			      struct address_space *mapping,</div><div class='add'>+			      loff_t start, size_t len, loff_t i_size,</div><div class='add'>+			      netfs_io_terminated_t term_func,</div><div class='add'>+			      void *term_func_priv,</div><div class='add'>+			      bool using_pgpriv2, bool cond);</div><div class='ctx'> extern void __fscache_clear_page_bits(struct address_space *, loff_t, size_t);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -495,9 +498,6 @@ static inline void fscache_end_operation(struct netfs_cache_resources *cres)</div><div class='ctx'>  *</div><div class='ctx'>  *	NETFS_READ_HOLE_IGNORE - Just try to read (may return a short read).</div><div class='ctx'>  *</div><div class='del'>- *	NETFS_READ_HOLE_CLEAR - Seek for data, clearing the part of the buffer</div><div class='del'>- *				skipped over, then do as for IGNORE.</div><div class='del'>- *</div><div class='ctx'>  *	NETFS_READ_HOLE_FAIL - Give ENODATA if we encounter a hole.</div><div class='ctx'>  */</div><div class='ctx'> static inline</div><div class='hunk'>@@ -597,7 +597,8 @@ static inline void fscache_clear_page_bits(struct address_space *mapping,</div><div class='ctx'>  * @i_size: The new size of the inode</div><div class='ctx'>  * @term_func: The function to call upon completion</div><div class='ctx'>  * @term_func_priv: The private data for @term_func</div><div class='del'>- * @caching: If PG_fscache has been set</div><div class='add'>+ * @using_pgpriv2: If we're using PG_private_2 to mark in-progress write</div><div class='add'>+ * @caching: If we actually want to do the caching</div><div class='ctx'>  *</div><div class='ctx'>  * Helper function for a netfs to write dirty data from an inode into the cache</div><div class='ctx'>  * object that's backing it.</div><div class='hunk'>@@ -608,21 +609,23 @@ static inline void fscache_clear_page_bits(struct address_space *mapping,</div><div class='ctx'>  * marked with PG_fscache.</div><div class='ctx'>  *</div><div class='ctx'>  * If given, @term_func will be called upon completion and supplied with</div><div class='del'>- * @term_func_priv.  Note that the PG_fscache flags will have been cleared by</div><div class='del'>- * this point, so the netfs must retain its own pin on the mapping.</div><div class='add'>+ * @term_func_priv.  Note that if @using_pgpriv2 is set, the PG_private_2 flags</div><div class='add'>+ * will have been cleared by this point, so the netfs must retain its own pin</div><div class='add'>+ * on the mapping.</div><div class='ctx'>  */</div><div class='ctx'> static inline void fscache_write_to_cache(struct fscache_cookie *cookie,</div><div class='ctx'> 					  struct address_space *mapping,</div><div class='ctx'> 					  loff_t start, size_t len, loff_t i_size,</div><div class='ctx'> 					  netfs_io_terminated_t term_func,</div><div class='ctx'> 					  void *term_func_priv,</div><div class='del'>-					  bool caching)</div><div class='add'>+					  bool using_pgpriv2, bool caching)</div><div class='ctx'> {</div><div class='ctx'> 	if (caching)</div><div class='ctx'> 		__fscache_write_to_cache(cookie, mapping, start, len, i_size,</div><div class='del'>-					 term_func, term_func_priv, caching);</div><div class='add'>+					 term_func, term_func_priv,</div><div class='add'>+					 using_pgpriv2, caching);</div><div class='ctx'> 	else if (term_func)</div><div class='del'>-		term_func(term_func_priv, -ENOBUFS, false);</div><div class='add'>+		term_func(term_func_priv, -ENOBUFS);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h<br/>index 772f822dc6b8..516aba5b858b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fscrypt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fscrypt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fscrypt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fscrypt.h</a></div><div class='hunk'>@@ -61,6 +61,12 @@ struct fscrypt_name {</div><div class='ctx'> </div><div class='ctx'> /* Crypto operations for filesystems */</div><div class='ctx'> struct fscrypt_operations {</div><div class='add'>+	/*</div><div class='add'>+	 * The offset of the pointer to struct fscrypt_inode_info in the</div><div class='add'>+	 * filesystem-specific part of the inode, relative to the beginning of</div><div class='add'>+	 * the common part of the inode (the 'struct inode').</div><div class='add'>+	 */</div><div class='add'>+	ptrdiff_t inode_info_offs;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If set, then fs/crypto/ will allocate a global bounce page pool the</div><div class='hunk'>@@ -192,18 +198,47 @@ struct fscrypt_operations {</div><div class='ctx'> 					     unsigned int *num_devs);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags);</div><div class='add'>+int fscrypt_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+			 struct dentry *dentry, unsigned int flags);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns the address of the fscrypt info pointer within the</div><div class='add'>+ * filesystem-specific part of the inode.  (To save memory on filesystems that</div><div class='add'>+ * don't support fscrypt, a field in 'struct inode' itself is no longer used.)</div><div class='add'>+ */</div><div class='add'>+static inline struct fscrypt_inode_info **</div><div class='add'>+fscrypt_inode_info_addr(const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	VFS_WARN_ON_ONCE(inode-&gt;i_sb-&gt;s_cop-&gt;inode_info_offs == 0);</div><div class='add'>+	return (void *)inode + inode-&gt;i_sb-&gt;s_cop-&gt;inode_info_offs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Load the inode's fscrypt info pointer, using a raw dereference.  Since this</div><div class='add'>+ * uses a raw dereference with no memory barrier, it is appropriate to use only</div><div class='add'>+ * when the caller knows the inode's key setup already happened, resulting in</div><div class='add'>+ * non-NULL fscrypt info.  E.g., the file contents en/decryption functions use</div><div class='add'>+ * this, since fscrypt_file_open() set up the key.</div><div class='add'>+ */</div><div class='add'>+static inline struct fscrypt_inode_info *</div><div class='add'>+fscrypt_get_inode_info_raw(const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct fscrypt_inode_info *ci = *fscrypt_inode_info_addr(inode);</div><div class='add'>+</div><div class='add'>+	VFS_WARN_ON_ONCE(ci == NULL);</div><div class='add'>+	return ci;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline struct fscrypt_inode_info *</div><div class='ctx'> fscrypt_get_inode_info(const struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pairs with the cmpxchg_release() in fscrypt_setup_encryption_info().</div><div class='del'>-	 * I.e., another task may publish -&gt;i_crypt_info concurrently, executing</div><div class='del'>-	 * a RELEASE barrier.  We need to use smp_load_acquire() here to safely</div><div class='add'>+	 * I.e., another task may publish the fscrypt info concurrently,</div><div class='add'>+	 * executing a RELEASE barrier.  Use smp_load_acquire() here to safely</div><div class='ctx'> 	 * ACQUIRE the memory the other task published.</div><div class='ctx'> 	 */</div><div class='del'>-	return smp_load_acquire(&amp;inode-&gt;i_crypt_info);</div><div class='add'>+	return smp_load_acquire(fscrypt_inode_info_addr(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -309,13 +344,11 @@ static inline void fscrypt_prepare_dentry(struct dentry *dentry,</div><div class='ctx'> /* crypto.c */</div><div class='ctx'> void fscrypt_enqueue_decrypt_work(struct work_struct *);</div><div class='ctx'> </div><div class='del'>-struct page *fscrypt_encrypt_pagecache_blocks(struct page *page,</div><div class='del'>-					      unsigned int len,</div><div class='del'>-					      unsigned int offs,</div><div class='del'>-					      gfp_t gfp_flags);</div><div class='add'>+struct page *fscrypt_encrypt_pagecache_blocks(struct folio *folio,</div><div class='add'>+		size_t len, size_t offs, gfp_t gfp_flags);</div><div class='ctx'> int fscrypt_encrypt_block_inplace(const struct inode *inode, struct page *page,</div><div class='ctx'> 				  unsigned int len, unsigned int offs,</div><div class='del'>-				  u64 lblk_num, gfp_t gfp_flags);</div><div class='add'>+				  u64 lblk_num);</div><div class='ctx'> </div><div class='ctx'> int fscrypt_decrypt_pagecache_blocks(struct folio *folio, size_t len,</div><div class='ctx'> 				     size_t offs);</div><div class='hunk'>@@ -333,12 +366,13 @@ static inline struct page *fscrypt_pagecache_page(struct page *bounce_page)</div><div class='ctx'> 	return (struct page *)page_private(bounce_page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool fscrypt_is_bounce_folio(struct folio *folio)</div><div class='add'>+static inline bool fscrypt_is_bounce_folio(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return folio-&gt;mapping == NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct folio *fscrypt_pagecache_folio(struct folio *bounce_folio)</div><div class='add'>+static inline</div><div class='add'>+struct folio *fscrypt_pagecache_folio(const struct folio *bounce_folio)</div><div class='ctx'> {</div><div class='ctx'> 	return bounce_folio-&gt;private;</div><div class='ctx'> }</div><div class='hunk'>@@ -479,10 +513,8 @@ static inline void fscrypt_enqueue_decrypt_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page *fscrypt_encrypt_pagecache_blocks(struct page *page,</div><div class='del'>-							    unsigned int len,</div><div class='del'>-							    unsigned int offs,</div><div class='del'>-							    gfp_t gfp_flags)</div><div class='add'>+static inline struct page *fscrypt_encrypt_pagecache_blocks(struct folio *folio,</div><div class='add'>+		size_t len, size_t offs, gfp_t gfp_flags)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> }</div><div class='hunk'>@@ -490,8 +522,7 @@ static inline struct page *fscrypt_encrypt_pagecache_blocks(struct page *page,</div><div class='ctx'> static inline int fscrypt_encrypt_block_inplace(const struct inode *inode,</div><div class='ctx'> 						struct page *page,</div><div class='ctx'> 						unsigned int len,</div><div class='del'>-						unsigned int offs, u64 lblk_num,</div><div class='del'>-						gfp_t gfp_flags)</div><div class='add'>+						unsigned int offs, u64 lblk_num)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -521,12 +552,13 @@ static inline struct page *fscrypt_pagecache_page(struct page *bounce_page)</div><div class='ctx'> 	return ERR_PTR(-EINVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool fscrypt_is_bounce_folio(struct folio *folio)</div><div class='add'>+static inline bool fscrypt_is_bounce_folio(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct folio *fscrypt_pagecache_folio(struct folio *bounce_folio)</div><div class='add'>+static inline</div><div class='add'>+struct folio *fscrypt_pagecache_folio(const struct folio *bounce_folio)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(1);</div><div class='ctx'> 	return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -711,8 +743,8 @@ static inline u64 fscrypt_fname_siphash(const struct inode *dir,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int fscrypt_d_revalidate(struct dentry *dentry,</div><div class='del'>-				       unsigned int flags)</div><div class='add'>+static inline int fscrypt_d_revalidate(struct inode *dir, const struct qstr *name,</div><div class='add'>+				       struct dentry *dentry, unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/fsi.h b/include/linux/fsi.h<br/>index 3df8c54868df..adea1b432f2d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fsi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsi.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@ struct fsi_driver {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_fsi_dev(devp) container_of(devp, struct fsi_device, dev)</div><div class='del'>-#define to_fsi_drv(drvp) container_of(drvp, struct fsi_driver, drv)</div><div class='add'>+#define to_fsi_drv(drvp) container_of_const(drvp, struct fsi_driver, drv)</div><div class='ctx'> </div><div class='ctx'> extern int fsi_driver_register(struct fsi_driver *fsi_drv);</div><div class='ctx'> extern void fsi_driver_unregister(struct fsi_driver *fsi_drv);</div><div class='hunk'>@@ -68,7 +68,7 @@ extern int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,</div><div class='ctx'> extern int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,</div><div class='ctx'> 		const void *val, size_t size);</div><div class='ctx'> </div><div class='del'>-extern struct bus_type fsi_bus_type;</div><div class='add'>+extern const struct bus_type fsi_bus_type;</div><div class='ctx'> extern const struct device_type fsi_cdev_type;</div><div class='ctx'> </div><div class='ctx'> enum fsi_dev_type {</div><div class='head'>diff --git a/include/linux/fsl/enetc_mdio.h b/include/linux/fsl/enetc_mdio.h<br/>index df25fffdc0ae..623ccfcbf39c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fsl/enetc_mdio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl/enetc_mdio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsl/enetc_mdio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsl/enetc_mdio.h</a></div><div class='hunk'>@@ -59,7 +59,8 @@ static inline int enetc_mdio_read_c45(struct mii_bus *bus, int phy_id,</div><div class='ctx'> static inline int enetc_mdio_write_c45(struct mii_bus *bus, int phy_id,</div><div class='ctx'> 				       int devad, int regnum, u16 value)</div><div class='ctx'> { return -EINVAL; }</div><div class='del'>-struct enetc_hw *enetc_hw_alloc(struct device *dev, void __iomem *port_regs)</div><div class='add'>+static inline struct enetc_hw *enetc_hw_alloc(struct device *dev,</div><div class='add'>+					      void __iomem *port_regs)</div><div class='ctx'> { return ERR_PTR(-EINVAL); }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h<br/>index a1b3de87a3d1..897d6211c163 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fsl/mc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl/mc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsl/mc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsl/mc.h</a></div><div class='hunk'>@@ -56,7 +56,7 @@ struct fsl_mc_driver {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_fsl_mc_driver(_drv) \</div><div class='del'>-	container_of(_drv, struct fsl_mc_driver, driver)</div><div class='add'>+	container_of_const(_drv, struct fsl_mc_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum fsl_mc_pool_type - Types of allocatable MC bus resources</div><div class='hunk'>@@ -417,8 +417,6 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev,</div><div class='ctx'> </div><div class='ctx'> void fsl_mc_portal_free(struct fsl_mc_io *mc_io);</div><div class='ctx'> </div><div class='del'>-int fsl_mc_portal_reset(struct fsl_mc_io *mc_io);</div><div class='del'>-</div><div class='ctx'> int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev,</div><div class='ctx'> 					enum fsl_mc_pool_type pool_type,</div><div class='ctx'> 					struct fsl_mc_device **new_mc_adev);</div><div class='hunk'>@@ -436,23 +434,23 @@ void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev);</div><div class='ctx'> struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,</div><div class='ctx'> 					  u16 if_id);</div><div class='ctx'> </div><div class='del'>-extern struct bus_type fsl_mc_bus_type;</div><div class='del'>-</div><div class='del'>-extern struct device_type fsl_mc_bus_dprc_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpni_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpio_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpsw_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpbp_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpcon_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpmcp_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpmac_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dprtc_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpseci_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpdmux_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpdcei_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpaiop_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpci_type;</div><div class='del'>-extern struct device_type fsl_mc_bus_dpdmai_type;</div><div class='add'>+extern const struct bus_type fsl_mc_bus_type;</div><div class='add'>+</div><div class='add'>+extern const struct device_type fsl_mc_bus_dprc_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpni_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpio_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpsw_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpbp_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpcon_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpmcp_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpmac_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dprtc_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpseci_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpdmux_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpdcei_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpaiop_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpci_type;</div><div class='add'>+extern const struct device_type fsl_mc_bus_dpdmai_type;</div><div class='ctx'> </div><div class='ctx'> static inline bool is_fsl_mc_bus_dprc(const struct fsl_mc_device *mc_dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/fsl/netc_global.h b/include/linux/fsl/netc_global.h<br/>new file mode 100644<br/>index 000000000000..fdecca8c90f0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsl/netc_global.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsl/netc_global.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */</div><div class='add'>+/* Copyright 2024 NXP</div><div class='add'>+ */</div><div class='add'>+#ifndef __NETC_GLOBAL_H</div><div class='add'>+#define __NETC_GLOBAL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+static inline u32 netc_read(void __iomem *reg)</div><div class='add'>+{</div><div class='add'>+	return ioread32(reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netc_write(void __iomem *reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	iowrite32(val, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/fsl/ntmp.h b/include/linux/fsl/ntmp.h<br/>new file mode 100644<br/>index 000000000000..916dc4fe7de3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsl/ntmp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsl/ntmp.h</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */</div><div class='add'>+/* Copyright 2025 NXP */</div><div class='add'>+#ifndef __NETC_NTMP_H</div><div class='add'>+#define __NETC_NTMP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+struct maft_keye_data {</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	__le16 resv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct maft_cfge_data {</div><div class='add'>+	__le16 si_bitmap;</div><div class='add'>+	__le16 resv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct netc_cbdr_regs {</div><div class='add'>+	void __iomem *pir;</div><div class='add'>+	void __iomem *cir;</div><div class='add'>+	void __iomem *mr;</div><div class='add'>+</div><div class='add'>+	void __iomem *bar0;</div><div class='add'>+	void __iomem *bar1;</div><div class='add'>+	void __iomem *lenr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct netc_tbl_vers {</div><div class='add'>+	u8 maft_ver;</div><div class='add'>+	u8 rsst_ver;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct netc_cbdr {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct netc_cbdr_regs regs;</div><div class='add'>+</div><div class='add'>+	int bd_num;</div><div class='add'>+	int next_to_use;</div><div class='add'>+	int next_to_clean;</div><div class='add'>+</div><div class='add'>+	int dma_size;</div><div class='add'>+	void *addr_base;</div><div class='add'>+	void *addr_base_align;</div><div class='add'>+	dma_addr_t dma_base;</div><div class='add'>+	dma_addr_t dma_base_align;</div><div class='add'>+</div><div class='add'>+	/* Serialize the order of command BD ring */</div><div class='add'>+	spinlock_t ring_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ntmp_user {</div><div class='add'>+	int cbdr_num;	/* number of control BD ring */</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct netc_cbdr *ring;</div><div class='add'>+	struct netc_tbl_vers tbl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct maft_entry_data {</div><div class='add'>+	struct maft_keye_data keye;</div><div class='add'>+	struct maft_cfge_data cfge;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NXP_NETC_LIB)</div><div class='add'>+int ntmp_init_cbdr(struct netc_cbdr *cbdr, struct device *dev,</div><div class='add'>+		   const struct netc_cbdr_regs *regs);</div><div class='add'>+void ntmp_free_cbdr(struct netc_cbdr *cbdr);</div><div class='add'>+</div><div class='add'>+/* NTMP APIs */</div><div class='add'>+int ntmp_maft_add_entry(struct ntmp_user *user, u32 entry_id,</div><div class='add'>+			struct maft_entry_data *maft);</div><div class='add'>+int ntmp_maft_query_entry(struct ntmp_user *user, u32 entry_id,</div><div class='add'>+			  struct maft_entry_data *maft);</div><div class='add'>+int ntmp_maft_delete_entry(struct ntmp_user *user, u32 entry_id);</div><div class='add'>+int ntmp_rsst_update_entry(struct ntmp_user *user, const u32 *table,</div><div class='add'>+			   int count);</div><div class='add'>+int ntmp_rsst_query_entry(struct ntmp_user *user,</div><div class='add'>+			  u32 *table, int count);</div><div class='add'>+#else</div><div class='add'>+static inline int ntmp_init_cbdr(struct netc_cbdr *cbdr, struct device *dev,</div><div class='add'>+				 const struct netc_cbdr_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ntmp_free_cbdr(struct netc_cbdr *cbdr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ntmp_maft_add_entry(struct ntmp_user *user, u32 entry_id,</div><div class='add'>+				      struct maft_entry_data *maft)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ntmp_maft_query_entry(struct ntmp_user *user, u32 entry_id,</div><div class='add'>+					struct maft_entry_data *maft)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ntmp_maft_delete_entry(struct ntmp_user *user, u32 entry_id)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ntmp_rsst_update_entry(struct ntmp_user *user,</div><div class='add'>+					 const u32 *table, int count)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ntmp_rsst_query_entry(struct ntmp_user *user,</div><div class='add'>+					u32 *table, int count)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/fsl/ptp_qoriq.h b/include/linux/fsl/ptp_qoriq.h<br/>index b301bf7199d3..3601e25779ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fsl/ptp_qoriq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl/ptp_qoriq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsl/ptp_qoriq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsl/ptp_qoriq.h</a></div><div class='hunk'>@@ -145,7 +145,6 @@ struct ptp_qoriq {</div><div class='ctx'> 	struct ptp_clock *clock;</div><div class='ctx'> 	struct ptp_clock_info caps;</div><div class='ctx'> 	struct resource *rsrc;</div><div class='del'>-	struct dentry *debugfs_root;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	bool extts_fifo_support;</div><div class='ctx'> 	bool fiper3_support;</div><div class='hunk'>@@ -195,14 +194,5 @@ int ptp_qoriq_settime(struct ptp_clock_info *ptp,</div><div class='ctx'> int ptp_qoriq_enable(struct ptp_clock_info *ptp,</div><div class='ctx'> 		     struct ptp_clock_request *rq, int on);</div><div class='ctx'> int extts_clean_up(struct ptp_qoriq *ptp_qoriq, int index, bool update_event);</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-void ptp_qoriq_create_debugfs(struct ptp_qoriq *ptp_qoriq);</div><div class='del'>-void ptp_qoriq_remove_debugfs(struct ptp_qoriq *ptp_qoriq);</div><div class='del'>-#else</div><div class='del'>-static inline void ptp_qoriq_create_debugfs(struct ptp_qoriq *ptp_qoriq)</div><div class='del'>-{ }</div><div class='del'>-static inline void ptp_qoriq_remove_debugfs(struct ptp_qoriq *ptp_qoriq)</div><div class='del'>-{ }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h<br/>index 5d231ce8709b..49f20c2f99bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fsl_devices.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsl_devices.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsl_devices.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsl_devices.h</a></div><div class='hunk'>@@ -118,7 +118,6 @@ struct fsl_usb2_platform_data {</div><div class='ctx'> #define FSL_USB2_PORT0_ENABLED	0x00000001</div><div class='ctx'> #define FSL_USB2_PORT1_ENABLED	0x00000002</div><div class='ctx'> </div><div class='del'>-#define FLS_USB2_WORKAROUND_ENGCM09152	(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> struct spi_device;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h<br/>index 8300a5286988..28a9cb13fbfa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fsnotify.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsnotify.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsnotify.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsnotify.h</a></div><div class='hunk'>@@ -17,6 +17,25 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Are there any inode/mount/sb objects watched with priority prio or above? */</div><div class='add'>+static inline bool fsnotify_sb_has_priority_watchers(struct super_block *sb,</div><div class='add'>+						     int prio)</div><div class='add'>+{</div><div class='add'>+	struct fsnotify_sb_info *sbinfo = fsnotify_sb_info(sb);</div><div class='add'>+</div><div class='add'>+	/* Were any marks ever added to any object on this sb? */</div><div class='add'>+	if (!sbinfo)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return atomic_long_read(&amp;sbinfo-&gt;watched_objects[prio]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Are there any inode/mount/sb objects that are being watched at all? */</div><div class='add'>+static inline bool fsnotify_sb_has_watchers(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return fsnotify_sb_has_priority_watchers(sb, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Notify this @dir inode about a change in a child directory entry.</div><div class='ctx'>  * The directory entry may have turned positive or negative or its inode may</div><div class='hunk'>@@ -30,7 +49,7 @@ static inline int fsnotify_name(__u32 mask, const void *data, int data_type,</div><div class='ctx'> 				struct inode *dir, const struct qstr *name,</div><div class='ctx'> 				u32 cookie)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_long_read(&amp;dir-&gt;i_sb-&gt;s_fsnotify_connectors) == 0)</div><div class='add'>+	if (!fsnotify_sb_has_watchers(dir-&gt;i_sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return fsnotify(mask, data, data_type, dir, name, NULL, cookie);</div><div class='hunk'>@@ -44,7 +63,7 @@ static inline void fsnotify_dirent(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> </div><div class='ctx'> static inline void fsnotify_inode(struct inode *inode, __u32 mask)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_long_read(&amp;inode-&gt;i_sb-&gt;s_fsnotify_connectors) == 0)</div><div class='add'>+	if (!fsnotify_sb_has_watchers(inode-&gt;i_sb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode))</div><div class='hunk'>@@ -59,7 +78,7 @@ static inline int fsnotify_parent(struct dentry *dentry, __u32 mask,</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = d_inode(dentry);</div><div class='ctx'> </div><div class='del'>-	if (atomic_long_read(&amp;inode-&gt;i_sb-&gt;s_fsnotify_connectors) == 0)</div><div class='add'>+	if (!fsnotify_sb_has_watchers(inode-&gt;i_sb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='hunk'>@@ -89,26 +108,35 @@ static inline void fsnotify_dentry(struct dentry *dentry, __u32 mask)</div><div class='ctx'> 	fsnotify_parent(dentry, mask, dentry, FSNOTIFY_EVENT_DENTRY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int fsnotify_file(struct file *file, __u32 mask)</div><div class='add'>+static inline int fsnotify_path(const struct path *path, __u32 mask)</div><div class='ctx'> {</div><div class='del'>-	const struct path *path;</div><div class='add'>+	return fsnotify_parent(path-&gt;dentry, mask, path, FSNOTIFY_EVENT_PATH);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_NONOTIFY)</div><div class='add'>+static inline int fsnotify_file(struct file *file, __u32 mask)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * FMODE_NONOTIFY are fds generated by fanotify itself which should not</div><div class='add'>+	 * generate new events. We also don't want to generate events for</div><div class='add'>+	 * FMODE_PATH fds (involves open &amp; close events) as they are just</div><div class='add'>+	 * handle creation / destruction events and not "real" file events.</div><div class='add'>+	 */</div><div class='add'>+	if (FMODE_FSNOTIFY_NONE(file-&gt;f_mode))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	path = &amp;file-&gt;f_path;</div><div class='del'>-	return fsnotify_parent(path-&gt;dentry, mask, path, FSNOTIFY_EVENT_PATH);</div><div class='add'>+	return fsnotify_path(&amp;file-&gt;f_path, mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS</div><div class='add'>+</div><div class='add'>+int fsnotify_open_perm_and_set_mode(struct file *file);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * fsnotify_file_area_perm - permission hook before access to file range</div><div class='ctx'>  */</div><div class='ctx'> static inline int fsnotify_file_area_perm(struct file *file, int perm_mask,</div><div class='ctx'> 					  const loff_t *ppos, size_t count)</div><div class='ctx'> {</div><div class='del'>-	__u32 fsnotify_mask = FS_ACCESS_PERM;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * filesystem may be modified in the context of permission events</div><div class='ctx'> 	 * (e.g. by HSM filling a file on access), so sb freeze protection</div><div class='hunk'>@@ -116,49 +144,92 @@ static inline int fsnotify_file_area_perm(struct file *file, int perm_mask,</div><div class='ctx'> 	 */</div><div class='ctx'> 	lockdep_assert_once(file_write_not_started(file));</div><div class='ctx'> </div><div class='del'>-	if (!(perm_mask &amp; MAY_READ))</div><div class='add'>+	if (!(perm_mask &amp; (MAY_READ | MAY_WRITE | MAY_ACCESS)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return fsnotify_file(file, fsnotify_mask);</div><div class='add'>+	/*</div><div class='add'>+	 * read()/write() and other types of access generate pre-content events.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(FMODE_FSNOTIFY_HSM(file-&gt;f_mode))) {</div><div class='add'>+		int ret = fsnotify_pre_content(&amp;file-&gt;f_path, ppos, count);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(perm_mask &amp; MAY_READ) ||</div><div class='add'>+	    likely(!FMODE_FSNOTIFY_ACCESS_PERM(file-&gt;f_mode)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * read() also generates the legacy FS_ACCESS_PERM event, so content</div><div class='add'>+	 * scanners can inspect the content filled by pre-content event.</div><div class='add'>+	 */</div><div class='add'>+	return fsnotify_path(&amp;file-&gt;f_path, FS_ACCESS_PERM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * fsnotify_file_perm - permission hook before file access</div><div class='add'>+ * fsnotify_mmap_perm - permission hook before mmap of file range</div><div class='ctx'>  */</div><div class='del'>-static inline int fsnotify_file_perm(struct file *file, int perm_mask)</div><div class='add'>+static inline int fsnotify_mmap_perm(struct file *file, int prot,</div><div class='add'>+				     const loff_t off, size_t len)</div><div class='ctx'> {</div><div class='del'>-	return fsnotify_file_area_perm(file, perm_mask, NULL, 0);</div><div class='add'>+	/*</div><div class='add'>+	 * mmap() generates only pre-content events.</div><div class='add'>+	 */</div><div class='add'>+	if (!file || likely(!FMODE_FSNOTIFY_HSM(file-&gt;f_mode)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return fsnotify_pre_content(&amp;file-&gt;f_path, &amp;off, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * fsnotify_open_perm - permission hook before file open</div><div class='add'>+ * fsnotify_truncate_perm - permission hook before file truncate</div><div class='ctx'>  */</div><div class='del'>-static inline int fsnotify_open_perm(struct file *file)</div><div class='add'>+static inline int fsnotify_truncate_perm(const struct path *path, loff_t length)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	struct inode *inode = d_inode(path-&gt;dentry);</div><div class='ctx'> </div><div class='del'>-	if (file-&gt;f_flags &amp; __FMODE_EXEC) {</div><div class='del'>-		ret = fsnotify_file(file, FS_OPEN_EXEC_PERM);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	if (!(inode-&gt;i_sb-&gt;s_iflags &amp; SB_I_ALLOW_HSM) ||</div><div class='add'>+	    !fsnotify_sb_has_priority_watchers(inode-&gt;i_sb,</div><div class='add'>+					       FSNOTIFY_PRIO_PRE_CONTENT))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return fsnotify_file(file, FS_OPEN_PERM);</div><div class='add'>+	return fsnotify_pre_content(path, &amp;length, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fsnotify_file_perm - permission hook before file access (unknown range)</div><div class='add'>+ */</div><div class='add'>+static inline int fsnotify_file_perm(struct file *file, int perm_mask)</div><div class='add'>+{</div><div class='add'>+	return fsnotify_file_area_perm(file, perm_mask, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='add'>+static inline int fsnotify_open_perm_and_set_mode(struct file *file)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int fsnotify_file_area_perm(struct file *file, int perm_mask,</div><div class='ctx'> 					  const loff_t *ppos, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int fsnotify_file_perm(struct file *file, int perm_mask)</div><div class='add'>+static inline int fsnotify_mmap_perm(struct file *file, int prot,</div><div class='add'>+				     const loff_t off, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int fsnotify_open_perm(struct file *file)</div><div class='add'>+static inline int fsnotify_truncate_perm(const struct path *path, loff_t length)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int fsnotify_file_perm(struct file *file, int perm_mask)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -224,6 +295,11 @@ static inline void fsnotify_vfsmount_delete(struct vfsmount *mnt)</div><div class='ctx'> 	__fsnotify_vfsmount_delete(mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void fsnotify_mntns_delete(struct mnt_namespace *mntns)</div><div class='add'>+{</div><div class='add'>+	__fsnotify_mntns_delete(mntns);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * fsnotify_inoderemove - an inode is going away</div><div class='ctx'>  */</div><div class='hunk'>@@ -432,4 +508,19 @@ static inline int fsnotify_sb_error(struct super_block *sb, struct inode *inode,</div><div class='ctx'> 			NULL, NULL, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void fsnotify_mnt_attach(struct mnt_namespace *ns, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	fsnotify_mnt(FS_MNT_ATTACH, ns, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fsnotify_mnt_detach(struct mnt_namespace *ns, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	fsnotify_mnt(FS_MNT_DETACH, ns, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fsnotify_mnt_move(struct mnt_namespace *ns, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	fsnotify_mnt(FS_MNT_MOVE, ns, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* _LINUX_FS_NOTIFY_H */</div><div class='head'>diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h<br/>index 7f63be5ca0f1..0d954ea7b179 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fsnotify_backend.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsnotify_backend.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsnotify_backend.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsnotify_backend.h</a></div><div class='hunk'>@@ -31,8 +31,8 @@</div><div class='ctx'> #define FS_ACCESS		0x00000001	/* File was accessed */</div><div class='ctx'> #define FS_MODIFY		0x00000002	/* File was modified */</div><div class='ctx'> #define FS_ATTRIB		0x00000004	/* Metadata changed */</div><div class='del'>-#define FS_CLOSE_WRITE		0x00000008	/* Writtable file was closed */</div><div class='del'>-#define FS_CLOSE_NOWRITE	0x00000010	/* Unwrittable file closed */</div><div class='add'>+#define FS_CLOSE_WRITE		0x00000008	/* Writable file was closed */</div><div class='add'>+#define FS_CLOSE_NOWRITE	0x00000010	/* Unwritable file closed */</div><div class='ctx'> #define FS_OPEN			0x00000020	/* File was opened */</div><div class='ctx'> #define FS_MOVED_FROM		0x00000040	/* File was moved from X */</div><div class='ctx'> #define FS_MOVED_TO		0x00000080	/* File was moved to Y */</div><div class='hunk'>@@ -55,6 +55,13 @@</div><div class='ctx'> #define FS_OPEN_PERM		0x00010000	/* open event in an permission hook */</div><div class='ctx'> #define FS_ACCESS_PERM		0x00020000	/* access event in a permissions hook */</div><div class='ctx'> #define FS_OPEN_EXEC_PERM	0x00040000	/* open/exec event in a permission hook */</div><div class='add'>+/* #define FS_DIR_MODIFY	0x00080000 */	/* Deprecated (reserved) */</div><div class='add'>+</div><div class='add'>+#define FS_PRE_ACCESS		0x00100000	/* Pre-content access hook */</div><div class='add'>+</div><div class='add'>+#define FS_MNT_ATTACH		0x01000000	/* Mount was attached */</div><div class='add'>+#define FS_MNT_DETACH		0x02000000	/* Mount was detached */</div><div class='add'>+#define FS_MNT_MOVE		(FS_MNT_ATTACH | FS_MNT_DETACH)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Set on inode mark that cares about things that happen to its children.</div><div class='hunk'>@@ -77,8 +84,17 @@</div><div class='ctx'>  */</div><div class='ctx'> #define ALL_FSNOTIFY_DIRENT_EVENTS (FS_CREATE | FS_DELETE | FS_MOVE | FS_RENAME)</div><div class='ctx'> </div><div class='del'>-#define ALL_FSNOTIFY_PERM_EVENTS (FS_OPEN_PERM | FS_ACCESS_PERM | \</div><div class='del'>-				  FS_OPEN_EXEC_PERM)</div><div class='add'>+/* Mount namespace events */</div><div class='add'>+#define FSNOTIFY_MNT_EVENTS (FS_MNT_ATTACH | FS_MNT_DETACH)</div><div class='add'>+</div><div class='add'>+/* Content events can be used to inspect file content */</div><div class='add'>+#define FSNOTIFY_CONTENT_PERM_EVENTS (FS_OPEN_PERM | FS_OPEN_EXEC_PERM | \</div><div class='add'>+				      FS_ACCESS_PERM)</div><div class='add'>+/* Pre-content events can be used to fill file content */</div><div class='add'>+#define FSNOTIFY_PRE_CONTENT_EVENTS  (FS_PRE_ACCESS)</div><div class='add'>+</div><div class='add'>+#define ALL_FSNOTIFY_PERM_EVENTS (FSNOTIFY_CONTENT_PERM_EVENTS | \</div><div class='add'>+				  FSNOTIFY_PRE_CONTENT_EVENTS)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is a list of all events that may get sent to a parent that is watching</div><div class='hunk'>@@ -99,6 +115,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Events that can be reported to backends */</div><div class='ctx'> #define ALL_FSNOTIFY_EVENTS (ALL_FSNOTIFY_DIRENT_EVENTS | \</div><div class='add'>+			     FSNOTIFY_MNT_EVENTS | \</div><div class='ctx'> 			     FS_EVENTS_POSS_ON_CHILD | \</div><div class='ctx'> 			     FS_DELETE_SELF | FS_MOVE_SELF | \</div><div class='ctx'> 			     FS_UNMOUNT | FS_Q_OVERFLOW | FS_IN_IGNORED | \</div><div class='hunk'>@@ -177,6 +194,17 @@ struct fsnotify_event {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * fsnotify group priorities.</div><div class='add'>+ * Events are sent in order from highest priority to lowest priority.</div><div class='add'>+ */</div><div class='add'>+enum fsnotify_group_prio {</div><div class='add'>+	FSNOTIFY_PRIO_NORMAL = 0,	/* normal notifiers, no permissions */</div><div class='add'>+	FSNOTIFY_PRIO_CONTENT,		/* fanotify permission events */</div><div class='add'>+	FSNOTIFY_PRIO_PRE_CONTENT,	/* fanotify pre-content events */</div><div class='add'>+	__FSNOTIFY_PRIO_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * A group is a "thing" that wants to receive notification about filesystem</div><div class='ctx'>  * events.  The mask holds the subset of event types this group cares about.</div><div class='ctx'>  * refcnt on a group is up to the implementor and at any moment if it goes 0</div><div class='hunk'>@@ -201,19 +229,11 @@ struct fsnotify_group {</div><div class='ctx'> 	wait_queue_head_t notification_waitq;	/* read() on the notification file blocks on this waitq */</div><div class='ctx'> 	unsigned int q_len;			/* events on the queue */</div><div class='ctx'> 	unsigned int max_events;		/* maximum events allowed on the list */</div><div class='del'>-	/*</div><div class='del'>-	 * Valid fsnotify group priorities.  Events are send in order from highest</div><div class='del'>-	 * priority to lowest priority.  We default to the lowest priority.</div><div class='del'>-	 */</div><div class='del'>-	#define FS_PRIO_0	0 /* normal notifiers, no permissions */</div><div class='del'>-	#define FS_PRIO_1	1 /* fanotify content based access control */</div><div class='del'>-	#define FS_PRIO_2	2 /* fanotify pre-content access */</div><div class='del'>-	unsigned int priority;</div><div class='add'>+	enum fsnotify_group_prio priority;	/* priority for sending events */</div><div class='ctx'> 	bool shutdown;		/* group is being shut down, don't queue more events */</div><div class='ctx'> </div><div class='ctx'> #define FSNOTIFY_GROUP_USER	0x01 /* user allocated group */</div><div class='ctx'> #define FSNOTIFY_GROUP_DUPS	0x02 /* allow multiple marks per object */</div><div class='del'>-#define FSNOTIFY_GROUP_NOFS	0x04 /* group lock is not direct reclaim safe */</div><div class='ctx'> 	int flags;</div><div class='ctx'> 	unsigned int owner_flags;	/* stored flags of mark_mutex owner */</div><div class='ctx'> </div><div class='hunk'>@@ -230,6 +250,7 @@ struct fsnotify_group {</div><div class='ctx'> 						 * full */</div><div class='ctx'> </div><div class='ctx'> 	struct mem_cgroup *memcg;	/* memcg to charge allocations */</div><div class='add'>+	struct user_namespace *user_ns;	/* user ns where group was created */</div><div class='ctx'> </div><div class='ctx'> 	/* groups can define private fields here or use the void *private */</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -252,6 +273,8 @@ struct fsnotify_group {</div><div class='ctx'> 			int f_flags; /* event_f_flags from fanotify_init() */</div><div class='ctx'> 			struct ucounts *ucounts;</div><div class='ctx'> 			mempool_t error_events_pool;</div><div class='add'>+			/* chained on perm_group_list */</div><div class='add'>+			struct list_head perm_grp_list;</div><div class='ctx'> 		} fanotify_data;</div><div class='ctx'> #endif /* CONFIG_FANOTIFY */</div><div class='ctx'> 	};</div><div class='hunk'>@@ -264,30 +287,29 @@ struct fsnotify_group {</div><div class='ctx'> static inline void fsnotify_group_lock(struct fsnotify_group *group)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;group-&gt;mark_mutex);</div><div class='del'>-	if (group-&gt;flags &amp; FSNOTIFY_GROUP_NOFS)</div><div class='del'>-		group-&gt;owner_flags = memalloc_nofs_save();</div><div class='add'>+	group-&gt;owner_flags = memalloc_nofs_save();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void fsnotify_group_unlock(struct fsnotify_group *group)</div><div class='ctx'> {</div><div class='del'>-	if (group-&gt;flags &amp; FSNOTIFY_GROUP_NOFS)</div><div class='del'>-		memalloc_nofs_restore(group-&gt;owner_flags);</div><div class='add'>+	memalloc_nofs_restore(group-&gt;owner_flags);</div><div class='ctx'> 	mutex_unlock(&amp;group-&gt;mark_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void fsnotify_group_assert_locked(struct fsnotify_group *group)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(!mutex_is_locked(&amp;group-&gt;mark_mutex));</div><div class='del'>-	if (group-&gt;flags &amp; FSNOTIFY_GROUP_NOFS)</div><div class='del'>-		WARN_ON_ONCE(!(current-&gt;flags &amp; PF_MEMALLOC_NOFS));</div><div class='add'>+	WARN_ON_ONCE(!(current-&gt;flags &amp; PF_MEMALLOC_NOFS));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* When calling fsnotify tell it if the data is a path or inode */</div><div class='ctx'> enum fsnotify_data_type {</div><div class='ctx'> 	FSNOTIFY_EVENT_NONE,</div><div class='add'>+	FSNOTIFY_EVENT_FILE_RANGE,</div><div class='ctx'> 	FSNOTIFY_EVENT_PATH,</div><div class='ctx'> 	FSNOTIFY_EVENT_INODE,</div><div class='ctx'> 	FSNOTIFY_EVENT_DENTRY,</div><div class='add'>+	FSNOTIFY_EVENT_MNT,</div><div class='ctx'> 	FSNOTIFY_EVENT_ERROR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -297,6 +319,22 @@ struct fs_error_report {</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct file_range {</div><div class='add'>+	const struct path *path;</div><div class='add'>+	loff_t pos;</div><div class='add'>+	size_t count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const struct path *file_range_path(const struct file_range *range)</div><div class='add'>+{</div><div class='add'>+	return range-&gt;path;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fsnotify_mnt {</div><div class='add'>+	const struct mnt_namespace *ns;</div><div class='add'>+	u64 mnt_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline struct inode *fsnotify_data_inode(const void *data, int data_type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (data_type) {</div><div class='hunk'>@@ -306,6 +344,8 @@ static inline struct inode *fsnotify_data_inode(const void *data, int data_type)</div><div class='ctx'> 		return d_inode(data);</div><div class='ctx'> 	case FSNOTIFY_EVENT_PATH:</div><div class='ctx'> 		return d_inode(((const struct path *)data)-&gt;dentry);</div><div class='add'>+	case FSNOTIFY_EVENT_FILE_RANGE:</div><div class='add'>+		return d_inode(file_range_path(data)-&gt;dentry);</div><div class='ctx'> 	case FSNOTIFY_EVENT_ERROR:</div><div class='ctx'> 		return ((struct fs_error_report *)data)-&gt;inode;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -321,6 +361,8 @@ static inline struct dentry *fsnotify_data_dentry(const void *data, int data_typ</div><div class='ctx'> 		return (struct dentry *)data;</div><div class='ctx'> 	case FSNOTIFY_EVENT_PATH:</div><div class='ctx'> 		return ((const struct path *)data)-&gt;dentry;</div><div class='add'>+	case FSNOTIFY_EVENT_FILE_RANGE:</div><div class='add'>+		return file_range_path(data)-&gt;dentry;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -332,6 +374,8 @@ static inline const struct path *fsnotify_data_path(const void *data,</div><div class='ctx'> 	switch (data_type) {</div><div class='ctx'> 	case FSNOTIFY_EVENT_PATH:</div><div class='ctx'> 		return data;</div><div class='add'>+	case FSNOTIFY_EVENT_FILE_RANGE:</div><div class='add'>+		return file_range_path(data);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -347,6 +391,8 @@ static inline struct super_block *fsnotify_data_sb(const void *data,</div><div class='ctx'> 		return ((struct dentry *)data)-&gt;d_sb;</div><div class='ctx'> 	case FSNOTIFY_EVENT_PATH:</div><div class='ctx'> 		return ((const struct path *)data)-&gt;dentry-&gt;d_sb;</div><div class='add'>+	case FSNOTIFY_EVENT_FILE_RANGE:</div><div class='add'>+		return file_range_path(data)-&gt;dentry-&gt;d_sb;</div><div class='ctx'> 	case FSNOTIFY_EVENT_ERROR:</div><div class='ctx'> 		return ((struct fs_error_report *) data)-&gt;sb;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -354,6 +400,24 @@ static inline struct super_block *fsnotify_data_sb(const void *data,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline const struct fsnotify_mnt *fsnotify_data_mnt(const void *data,</div><div class='add'>+							   int data_type)</div><div class='add'>+{</div><div class='add'>+	switch (data_type) {</div><div class='add'>+	case FSNOTIFY_EVENT_MNT:</div><div class='add'>+		return data;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 fsnotify_data_mnt_id(const void *data, int data_type)</div><div class='add'>+{</div><div class='add'>+	const struct fsnotify_mnt *mnt_data = fsnotify_data_mnt(data, data_type);</div><div class='add'>+</div><div class='add'>+	return mnt_data ? mnt_data-&gt;mnt_id : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct fs_error_report *fsnotify_data_error_report(</div><div class='ctx'> 							const void *data,</div><div class='ctx'> 							int data_type)</div><div class='hunk'>@@ -366,6 +430,18 @@ static inline struct fs_error_report *fsnotify_data_error_report(</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline const struct file_range *fsnotify_data_file_range(</div><div class='add'>+							const void *data,</div><div class='add'>+							int data_type)</div><div class='add'>+{</div><div class='add'>+	switch (data_type) {</div><div class='add'>+	case FSNOTIFY_EVENT_FILE_RANGE:</div><div class='add'>+		return (struct file_range *)data;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Index to merged marks iterator array that correlates to a type of watch.</div><div class='ctx'>  * The type of watched object can be deduced from the iterator type, but not</div><div class='hunk'>@@ -379,6 +455,7 @@ enum fsnotify_iter_type {</div><div class='ctx'> 	FSNOTIFY_ITER_TYPE_SB,</div><div class='ctx'> 	FSNOTIFY_ITER_TYPE_PARENT,</div><div class='ctx'> 	FSNOTIFY_ITER_TYPE_INODE2,</div><div class='add'>+	FSNOTIFY_ITER_TYPE_MNTNS,</div><div class='ctx'> 	FSNOTIFY_ITER_TYPE_COUNT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -388,6 +465,7 @@ enum fsnotify_obj_type {</div><div class='ctx'> 	FSNOTIFY_OBJ_TYPE_INODE,</div><div class='ctx'> 	FSNOTIFY_OBJ_TYPE_VFSMOUNT,</div><div class='ctx'> 	FSNOTIFY_OBJ_TYPE_SB,</div><div class='add'>+	FSNOTIFY_OBJ_TYPE_MNTNS,</div><div class='ctx'> 	FSNOTIFY_OBJ_TYPE_COUNT,</div><div class='ctx'> 	FSNOTIFY_OBJ_TYPE_DETACHED = FSNOTIFY_OBJ_TYPE_COUNT</div><div class='ctx'> };</div><div class='hunk'>@@ -457,13 +535,6 @@ FSNOTIFY_ITER_FUNCS(sb, SB)</div><div class='ctx'> 	     type++)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * fsnotify_connp_t is what we embed in objects which connector can be attached</div><div class='del'>- * to. fsnotify_connp_t * is how we refer from connector back to object.</div><div class='del'>- */</div><div class='del'>-struct fsnotify_mark_connector;</div><div class='del'>-typedef struct fsnotify_mark_connector __rcu *fsnotify_connp_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Inode/vfsmount/sb point to this structure which tracks all marks attached to</div><div class='ctx'>  * the inode/vfsmount/sb. The reference to inode/vfsmount/sb is held by this</div><div class='ctx'>  * structure. We destroy this structure when there are no more marks attached</div><div class='hunk'>@@ -471,12 +542,14 @@ typedef struct fsnotify_mark_connector __rcu *fsnotify_connp_t;</div><div class='ctx'>  */</div><div class='ctx'> struct fsnotify_mark_connector {</div><div class='ctx'> 	spinlock_t lock;</div><div class='del'>-	unsigned short type;	/* Type of object [lock] */</div><div class='add'>+	unsigned char type;	/* Type of object [lock] */</div><div class='add'>+	unsigned char prio;	/* Highest priority group */</div><div class='add'>+#define FSNOTIFY_CONN_FLAG_IS_WATCHED	0x01</div><div class='ctx'> #define FSNOTIFY_CONN_FLAG_HAS_IREF	0x02</div><div class='ctx'> 	unsigned short flags;	/* flags [lock] */</div><div class='ctx'> 	union {</div><div class='ctx'> 		/* Object pointer [lock] */</div><div class='del'>-		fsnotify_connp_t *obj;</div><div class='add'>+		void *obj;</div><div class='ctx'> 		/* Used listing heads to free after srcu period expires */</div><div class='ctx'> 		struct fsnotify_mark_connector *destroy_next;</div><div class='ctx'> 	};</div><div class='hunk'>@@ -484,6 +557,37 @@ struct fsnotify_mark_connector {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Container for per-sb fsnotify state (sb marks and more).</div><div class='add'>+ * Attached lazily on first marked object on the sb and freed when killing sb.</div><div class='add'>+ */</div><div class='add'>+struct fsnotify_sb_info {</div><div class='add'>+	struct fsnotify_mark_connector __rcu *sb_marks;</div><div class='add'>+	/*</div><div class='add'>+	 * Number of inode/mount/sb objects that are being watched in this sb.</div><div class='add'>+	 * Note that inodes objects are currently double-accounted.</div><div class='add'>+	 *</div><div class='add'>+	 * The value in watched_objects[prio] is the number of objects that are</div><div class='add'>+	 * watched by groups of priority &gt;= prio, so watched_objects[0] is the</div><div class='add'>+	 * total number of watched objects in this sb.</div><div class='add'>+	 */</div><div class='add'>+	atomic_long_t watched_objects[__FSNOTIFY_PRIO_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct fsnotify_sb_info *fsnotify_sb_info(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_FSNOTIFY</div><div class='add'>+	return READ_ONCE(sb-&gt;s_fsnotify_info);</div><div class='add'>+#else</div><div class='add'>+	return NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline atomic_long_t *fsnotify_sb_watched_objects(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	return &amp;fsnotify_sb_info(sb)-&gt;watched_objects[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * A mark is simply an object attached to an in core inode which allows an</div><div class='ctx'>  * fsnotify listener to indicate they are either no longer interested in events</div><div class='ctx'>  * of a type matching mask or only interested in those events.</div><div class='hunk'>@@ -546,7 +650,10 @@ extern int __fsnotify_parent(struct dentry *dentry, __u32 mask, const void *data</div><div class='ctx'> extern void __fsnotify_inode_delete(struct inode *inode);</div><div class='ctx'> extern void __fsnotify_vfsmount_delete(struct vfsmount *mnt);</div><div class='ctx'> extern void fsnotify_sb_delete(struct super_block *sb);</div><div class='add'>+extern void __fsnotify_mntns_delete(struct mnt_namespace *mntns);</div><div class='add'>+extern void fsnotify_sb_free(struct super_block *sb);</div><div class='ctx'> extern u32 fsnotify_get_cookie(void);</div><div class='add'>+extern void fsnotify_mnt(__u32 mask, struct mnt_namespace *ns, struct vfsmount *mnt);</div><div class='ctx'> </div><div class='ctx'> static inline __u32 fsnotify_parent_needed_mask(__u32 mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -563,12 +670,14 @@ static inline __u32 fsnotify_parent_needed_mask(__u32 mask)</div><div class='ctx'> </div><div class='ctx'> static inline int fsnotify_inode_watches_children(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	__u32 parent_mask = READ_ONCE(inode-&gt;i_fsnotify_mask);</div><div class='add'>+</div><div class='ctx'> 	/* FS_EVENT_ON_CHILD is set if the inode may care */</div><div class='del'>-	if (!(inode-&gt;i_fsnotify_mask &amp; FS_EVENT_ON_CHILD))</div><div class='add'>+	if (!(parent_mask &amp; FS_EVENT_ON_CHILD))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/* this inode might care about child events, does it care about the</div><div class='ctx'> 	 * specific set of events that can happen on a child? */</div><div class='del'>-	return inode-&gt;i_fsnotify_mask &amp; FS_EVENTS_POSS_ON_CHILD;</div><div class='add'>+	return parent_mask &amp; FS_EVENTS_POSS_ON_CHILD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -582,7 +691,7 @@ static inline void fsnotify_update_flags(struct dentry *dentry)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Serialisation of setting PARENT_WATCHED on the dentries is provided</div><div class='ctx'> 	 * by d_lock. If inotify_inode_watched changes after we have taken</div><div class='del'>-	 * d_lock, the following __fsnotify_update_child_dentry_flags call will</div><div class='add'>+	 * d_lock, the following fsnotify_set_children_dentry_flags call will</div><div class='ctx'> 	 * find our entry, so it will spin until we complete here, and update</div><div class='ctx'> 	 * us with the new state.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -758,30 +867,35 @@ extern void fsnotify_recalc_mask(struct fsnotify_mark_connector *conn);</div><div class='ctx'> extern void fsnotify_init_mark(struct fsnotify_mark *mark,</div><div class='ctx'> 			       struct fsnotify_group *group);</div><div class='ctx'> /* Find mark belonging to given group in the list of marks */</div><div class='del'>-extern struct fsnotify_mark *fsnotify_find_mark(fsnotify_connp_t *connp,</div><div class='del'>-						struct fsnotify_group *group);</div><div class='add'>+struct fsnotify_mark *fsnotify_find_mark(void *obj, unsigned int obj_type,</div><div class='add'>+					 struct fsnotify_group *group);</div><div class='ctx'> /* attach the mark to the object */</div><div class='del'>-extern int fsnotify_add_mark(struct fsnotify_mark *mark,</div><div class='del'>-			     fsnotify_connp_t *connp, unsigned int obj_type,</div><div class='del'>-			     int add_flags);</div><div class='del'>-extern int fsnotify_add_mark_locked(struct fsnotify_mark *mark,</div><div class='del'>-				    fsnotify_connp_t *connp,</div><div class='del'>-				    unsigned int obj_type, int add_flags);</div><div class='add'>+int fsnotify_add_mark(struct fsnotify_mark *mark, void *obj,</div><div class='add'>+		      unsigned int obj_type, int add_flags);</div><div class='add'>+int fsnotify_add_mark_locked(struct fsnotify_mark *mark, void *obj,</div><div class='add'>+			     unsigned int obj_type, int add_flags);</div><div class='ctx'> </div><div class='ctx'> /* attach the mark to the inode */</div><div class='ctx'> static inline int fsnotify_add_inode_mark(struct fsnotify_mark *mark,</div><div class='ctx'> 					  struct inode *inode,</div><div class='ctx'> 					  int add_flags)</div><div class='ctx'> {</div><div class='del'>-	return fsnotify_add_mark(mark, &amp;inode-&gt;i_fsnotify_marks,</div><div class='del'>-				 FSNOTIFY_OBJ_TYPE_INODE, add_flags);</div><div class='add'>+	return fsnotify_add_mark(mark, inode, FSNOTIFY_OBJ_TYPE_INODE,</div><div class='add'>+				 add_flags);</div><div class='ctx'> }</div><div class='ctx'> static inline int fsnotify_add_inode_mark_locked(struct fsnotify_mark *mark,</div><div class='ctx'> 						 struct inode *inode,</div><div class='ctx'> 						 int add_flags)</div><div class='ctx'> {</div><div class='del'>-	return fsnotify_add_mark_locked(mark, &amp;inode-&gt;i_fsnotify_marks,</div><div class='del'>-					FSNOTIFY_OBJ_TYPE_INODE, add_flags);</div><div class='add'>+	return fsnotify_add_mark_locked(mark, inode, FSNOTIFY_OBJ_TYPE_INODE,</div><div class='add'>+					add_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct fsnotify_mark *fsnotify_find_inode_mark(</div><div class='add'>+						struct inode *inode,</div><div class='add'>+						struct fsnotify_group *group)</div><div class='add'>+{</div><div class='add'>+	return fsnotify_find_mark(inode, FSNOTIFY_OBJ_TYPE_INODE, group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* given a group and a mark, flag mark to be freed when all references are dropped */</div><div class='hunk'>@@ -796,21 +910,6 @@ extern void fsnotify_wait_marks_destroyed(void);</div><div class='ctx'> /* Clear all of the marks of a group attached to a given object type */</div><div class='ctx'> extern void fsnotify_clear_marks_by_group(struct fsnotify_group *group,</div><div class='ctx'> 					  unsigned int obj_type);</div><div class='del'>-/* run all the marks in a group, and clear all of the vfsmount marks */</div><div class='del'>-static inline void fsnotify_clear_vfsmount_marks_by_group(struct fsnotify_group *group)</div><div class='del'>-{</div><div class='del'>-	fsnotify_clear_marks_by_group(group, FSNOTIFY_OBJ_TYPE_VFSMOUNT);</div><div class='del'>-}</div><div class='del'>-/* run all the marks in a group, and clear all of the inode marks */</div><div class='del'>-static inline void fsnotify_clear_inode_marks_by_group(struct fsnotify_group *group)</div><div class='del'>-{</div><div class='del'>-	fsnotify_clear_marks_by_group(group, FSNOTIFY_OBJ_TYPE_INODE);</div><div class='del'>-}</div><div class='del'>-/* run all the marks in a group, and clear all of the sn marks */</div><div class='del'>-static inline void fsnotify_clear_sb_marks_by_group(struct fsnotify_group *group)</div><div class='del'>-{</div><div class='del'>-	fsnotify_clear_marks_by_group(group, FSNOTIFY_OBJ_TYPE_SB);</div><div class='del'>-}</div><div class='ctx'> extern void fsnotify_get_mark(struct fsnotify_mark *mark);</div><div class='ctx'> extern void fsnotify_put_mark(struct fsnotify_mark *mark);</div><div class='ctx'> extern void fsnotify_finish_user_wait(struct fsnotify_iter_info *iter_info);</div><div class='hunk'>@@ -820,9 +919,17 @@ static inline void fsnotify_init_event(struct fsnotify_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;event-&gt;list);</div><div class='ctx'> }</div><div class='add'>+int fsnotify_pre_content(const struct path *path, const loff_t *ppos,</div><div class='add'>+			 size_t count);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+static inline int fsnotify_pre_content(const struct path *path,</div><div class='add'>+				       const loff_t *ppos, size_t count)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int fsnotify(__u32 mask, const void *data, int data_type,</div><div class='ctx'> 			   struct inode *dir, const struct qstr *name,</div><div class='ctx'> 			   struct inode *inode, u32 cookie)</div><div class='hunk'>@@ -845,6 +952,12 @@ static inline void __fsnotify_vfsmount_delete(struct vfsmount *mnt)</div><div class='ctx'> static inline void fsnotify_sb_delete(struct super_block *sb)</div><div class='ctx'> {}</div><div class='ctx'> </div><div class='add'>+static inline void __fsnotify_mntns_delete(struct mnt_namespace *mntns)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void fsnotify_sb_free(struct super_block *sb)</div><div class='add'>+{}</div><div class='add'>+</div><div class='ctx'> static inline void fsnotify_update_flags(struct dentry *dentry)</div><div class='ctx'> {}</div><div class='ctx'> </div><div class='hunk'>@@ -856,6 +969,9 @@ static inline u32 fsnotify_get_cookie(void)</div><div class='ctx'> static inline void fsnotify_unmount_inodes(struct super_block *sb)</div><div class='ctx'> {}</div><div class='ctx'> </div><div class='add'>+static inline void fsnotify_mnt(__u32 mask, struct mnt_namespace *ns, struct vfsmount *mnt)</div><div class='add'>+{}</div><div class='add'>+</div><div class='ctx'> #endif	/* CONFIG_FSNOTIFY */</div><div class='ctx'> </div><div class='ctx'> #endif	/* __KERNEL __ */</div><div class='head'>diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h<br/>index 1eb7eae580be..5bc7280425a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fsverity.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fsverity.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fsverity.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fsverity.h</a></div><div class='hunk'>@@ -26,8 +26,16 @@</div><div class='ctx'> /* Arbitrary limit to bound the kmalloc() size.  Can be changed. */</div><div class='ctx'> #define FS_VERITY_MAX_DESCRIPTOR_SIZE	16384</div><div class='ctx'> </div><div class='add'>+struct fsverity_info;</div><div class='add'>+</div><div class='ctx'> /* Verity operations for filesystems */</div><div class='ctx'> struct fsverity_operations {</div><div class='add'>+	/**</div><div class='add'>+	 * The offset of the pointer to struct fsverity_info in the</div><div class='add'>+	 * filesystem-specific part of the inode, relative to the beginning of</div><div class='add'>+	 * the common part of the inode (the 'struct inode').</div><div class='add'>+	 */</div><div class='add'>+	ptrdiff_t inode_info_offs;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * Begin enabling verity on the given file.</div><div class='hunk'>@@ -124,15 +132,37 @@ struct fsverity_operations {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FS_VERITY</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Returns the address of the verity info pointer within the filesystem-specific</div><div class='add'>+ * part of the inode.  (To save memory on filesystems that don't support</div><div class='add'>+ * fsverity, a field in 'struct inode' itself is no longer used.)</div><div class='add'>+ */</div><div class='add'>+static inline struct fsverity_info **</div><div class='add'>+fsverity_info_addr(const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	VFS_WARN_ON_ONCE(inode-&gt;i_sb-&gt;s_vop-&gt;inode_info_offs == 0);</div><div class='add'>+	return (void *)inode + inode-&gt;i_sb-&gt;s_vop-&gt;inode_info_offs;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct fsverity_info *fsverity_get_info(const struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Pairs with the cmpxchg_release() in fsverity_set_info().</div><div class='del'>-	 * I.e., another task may publish -&gt;i_verity_info concurrently,</div><div class='del'>-	 * executing a RELEASE barrier.  We need to use smp_load_acquire() here</div><div class='del'>-	 * to safely ACQUIRE the memory the other task published.</div><div class='add'>+	 * Since this function can be called on inodes belonging to filesystems</div><div class='add'>+	 * that don't support fsverity at all, and fsverity_info_addr() doesn't</div><div class='add'>+	 * work on such filesystems, we have to start with an IS_VERITY() check.</div><div class='add'>+	 * Checking IS_VERITY() here is also useful to minimize the overhead of</div><div class='add'>+	 * fsverity_active() on non-verity files.</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_VERITY(inode))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Pairs with the cmpxchg_release() in fsverity_set_info().  I.e.,</div><div class='add'>+	 * another task may publish the inode's verity info concurrently,</div><div class='add'>+	 * executing a RELEASE barrier.  Use smp_load_acquire() here to safely</div><div class='add'>+	 * ACQUIRE the memory the other task published.</div><div class='ctx'> 	 */</div><div class='del'>-	return smp_load_acquire(&amp;inode-&gt;i_verity_info);</div><div class='add'>+	return smp_load_acquire(fsverity_info_addr(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* enable.c */</div><div class='hunk'>@@ -156,12 +186,19 @@ void __fsverity_cleanup_inode(struct inode *inode);</div><div class='ctx'>  * fsverity_cleanup_inode() - free the inode's verity info, if present</div><div class='ctx'>  * @inode: an inode being evicted</div><div class='ctx'>  *</div><div class='del'>- * Filesystems must call this on inode eviction to free -&gt;i_verity_info.</div><div class='add'>+ * Filesystems must call this on inode eviction to free the inode's verity info.</div><div class='ctx'>  */</div><div class='ctx'> static inline void fsverity_cleanup_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	if (inode-&gt;i_verity_info)</div><div class='add'>+	/*</div><div class='add'>+	 * Only IS_VERITY() inodes can have verity info, so start by checking</div><div class='add'>+	 * for IS_VERITY() (which is faster than retrieving the pointer to the</div><div class='add'>+	 * verity info).  This minimizes overhead for non-verity inodes.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_VERITY(inode))</div><div class='ctx'> 		__fsverity_cleanup_inode(inode);</div><div class='add'>+	else</div><div class='add'>+		VFS_WARN_ON_ONCE(*fsverity_info_addr(inode) != NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* read_metadata.c */</div><div class='hunk'>@@ -267,12 +304,12 @@ static inline bool fsverity_verify_page(struct page *page)</div><div class='ctx'>  * fsverity_active() - do reads from the inode need to go through fs-verity?</div><div class='ctx'>  * @inode: inode to check</div><div class='ctx'>  *</div><div class='del'>- * This checks whether -&gt;i_verity_info has been set.</div><div class='add'>+ * This checks whether the inode's verity info has been set.</div><div class='ctx'>  *</div><div class='ctx'>  * Filesystems call this from -&gt;readahead() to check whether the pages need to</div><div class='ctx'>  * be verified or not.  Don't use IS_VERITY() for this purpose; it's subject to</div><div class='ctx'>  * a race condition where the file is being read concurrently with</div><div class='del'>- * FS_IOC_ENABLE_VERITY completing.  (S_VERITY is set before -&gt;i_verity_info.)</div><div class='add'>+ * FS_IOC_ENABLE_VERITY completing.  (S_VERITY is set before the verity info.)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if reads need to go through fs-verity, otherwise false</div><div class='ctx'>  */</div><div class='hunk'>@@ -287,7 +324,7 @@ static inline bool fsverity_active(const struct inode *inode)</div><div class='ctx'>  * @filp: the struct file being set up</div><div class='ctx'>  *</div><div class='ctx'>  * When opening a verity file, deny the open if it is for writing.  Otherwise,</div><div class='del'>- * set up the inode's -&gt;i_verity_info if not already done.</div><div class='add'>+ * set up the inode's verity info if not already done.</div><div class='ctx'>  *</div><div class='ctx'>  * When combined with fscrypt, this must be called after fscrypt_file_open().</div><div class='ctx'>  * Otherwise, we won't have the key set up to decrypt the verity metadata.</div><div class='head'>diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h<br/>index e8921871ef9a..770f0dc993cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ftrace.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ftrace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ftrace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ftrace.h</a></div><div class='hunk'>@@ -43,9 +43,8 @@ struct dyn_ftrace;</div><div class='ctx'> </div><div class='ctx'> char *arch_ftrace_match_adjust(char *str, const char *search);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HAVE_FUNCTION_GRAPH_RETVAL</div><div class='del'>-struct fgraph_ret_regs;</div><div class='del'>-unsigned long ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs);</div><div class='add'>+#ifdef CONFIG_HAVE_FUNCTION_GRAPH_FREGS</div><div class='add'>+unsigned long ftrace_return_to_handler(struct ftrace_regs *fregs);</div><div class='ctx'> #else</div><div class='ctx'> unsigned long ftrace_return_to_handler(unsigned long frame_pointer);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -83,19 +82,18 @@ static inline void early_trace_init(void) { }</div><div class='ctx'> </div><div class='ctx'> struct module;</div><div class='ctx'> struct ftrace_hash;</div><div class='del'>-struct ftrace_direct_func;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_FUNCTION_TRACER) &amp;&amp; defined(CONFIG_MODULES) &amp;&amp; \</div><div class='ctx'> 	defined(CONFIG_DYNAMIC_FTRACE)</div><div class='del'>-const char *</div><div class='add'>+int</div><div class='ctx'> ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,</div><div class='ctx'> 		   unsigned long *off, char **modname, char *sym);</div><div class='ctx'> #else</div><div class='del'>-static inline const char *</div><div class='add'>+static inline int</div><div class='ctx'> ftrace_mod_address_lookup(unsigned long addr, unsigned long *size,</div><div class='ctx'> 		   unsigned long *off, char **modname, char *sym)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -114,14 +112,61 @@ static inline int ftrace_mod_get_kallsym(unsigned int symnum, unsigned long *val</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FUNCTION_TRACER</div><div class='ctx'> </div><div class='del'>-extern int ftrace_enabled;</div><div class='add'>+#include &lt;linux/ftrace_regs.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS</div><div class='add'>+extern int ftrace_enabled;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ftrace_regs - ftrace partial/optimal register set</div><div class='add'>+ *</div><div class='add'>+ * ftrace_regs represents a group of registers which is used at the</div><div class='add'>+ * function entry and exit. There are three types of registers.</div><div class='add'>+ *</div><div class='add'>+ * - Registers for passing the parameters to callee, including the stack</div><div class='add'>+ *   pointer. (e.g. rcx, rdx, rdi, rsi, r8, r9 and rsp on x86_64)</div><div class='add'>+ * - Registers for passing the return values to caller.</div><div class='add'>+ *   (e.g. rax and rdx on x86_64)</div><div class='add'>+ * - Registers for hooking the function call and return including the</div><div class='add'>+ *   frame pointer (the frame pointer is architecture/config dependent)</div><div class='add'>+ *   (e.g. rip, rbp and rsp for x86_64)</div><div class='add'>+ *</div><div class='add'>+ * Also, architecture dependent fields can be used for internal process.</div><div class='add'>+ * (e.g. orig_ax on x86_64)</div><div class='add'>+ *</div><div class='add'>+ * Basically, ftrace_regs stores the registers related to the context.</div><div class='add'>+ * On function entry, registers for function parameters and hooking the</div><div class='add'>+ * function call are stored, and on function exit, registers for function</div><div class='add'>+ * return value and frame pointers are stored.</div><div class='add'>+ *</div><div class='add'>+ * And also, it dpends on the context that which registers are restored</div><div class='add'>+ * from the ftrace_regs.</div><div class='add'>+ * On the function entry, those registers will be restored except for</div><div class='add'>+ * the stack pointer, so that user can change the function parameters</div><div class='add'>+ * and instruction pointer (e.g. live patching.)</div><div class='add'>+ * On the function exit, only registers which is used for return values</div><div class='add'>+ * are restored.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: user *must not* access regs directly, only do it via APIs, because</div><div class='add'>+ * the member can be changed according to the architecture.</div><div class='add'>+ * This is why the structure is empty here, so that nothing accesses</div><div class='add'>+ * the ftrace_regs directly.</div><div class='add'>+ */</div><div class='ctx'> struct ftrace_regs {</div><div class='del'>-	struct pt_regs		regs;</div><div class='add'>+	/* Nothing to see here, use the accessor functions! */</div><div class='ctx'> };</div><div class='del'>-#define arch_ftrace_get_regs(fregs) (&amp;(fregs)-&gt;regs)</div><div class='add'>+</div><div class='add'>+#define ftrace_regs_size()	sizeof(struct __arch_ftrace_regs)</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS</div><div class='add'>+/*</div><div class='add'>+ * Architectures that define HAVE_DYNAMIC_FTRACE_WITH_ARGS must define their own</div><div class='add'>+ * arch_ftrace_get_regs() where it only returns pt_regs *if* it is fully</div><div class='add'>+ * populated. It should return NULL otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs *fregs)</div><div class='add'>+{</div><div class='add'>+	return &amp;arch_ftrace_regs(fregs)-&gt;regs;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ftrace_regs_set_instruction_pointer() is to be defined by the architecture</div><div class='hunk'>@@ -131,6 +176,12 @@ struct ftrace_regs {</div><div class='ctx'> #define ftrace_regs_set_instruction_pointer(fregs, ip) do { } while (0)</div><div class='ctx'> #endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS</div><div class='add'>+</div><div class='add'>+static_assert(sizeof(struct pt_regs) == ftrace_regs_size());</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS */</div><div class='add'>+</div><div class='ctx'> static __always_inline struct pt_regs *ftrace_get_regs(struct ftrace_regs *fregs)</div><div class='ctx'> {</div><div class='ctx'> 	if (!fregs)</div><div class='hunk'>@@ -139,6 +190,62 @@ static __always_inline struct pt_regs *ftrace_get_regs(struct ftrace_regs *fregs</div><div class='ctx'> 	return arch_ftrace_get_regs(fregs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) || \</div><div class='add'>+	defined(CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS)</div><div class='add'>+</div><div class='add'>+#ifndef arch_ftrace_partial_regs</div><div class='add'>+#define arch_ftrace_partial_regs(regs) do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __always_inline struct pt_regs *</div><div class='add'>+ftrace_partial_regs(struct ftrace_regs *fregs, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * If CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS=y, ftrace_regs memory</div><div class='add'>+	 * layout is including pt_regs. So always returns that address.</div><div class='add'>+	 * Since arch_ftrace_get_regs() will check some members and may return</div><div class='add'>+	 * NULL, we can not use it.</div><div class='add'>+	 */</div><div class='add'>+	regs = &amp;arch_ftrace_regs(fregs)-&gt;regs;</div><div class='add'>+</div><div class='add'>+	/* Allow arch specific updates to regs. */</div><div class='add'>+	arch_ftrace_partial_regs(regs);</div><div class='add'>+	return regs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS || CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Please define arch dependent pt_regs which compatible to the</div><div class='add'>+ * perf_arch_fetch_caller_regs() but based on ftrace_regs.</div><div class='add'>+ * This requires</div><div class='add'>+ *   - user_mode(_regs) returns false (always kernel mode).</div><div class='add'>+ *   - able to use the _regs for stack trace.</div><div class='add'>+ */</div><div class='add'>+#ifndef arch_ftrace_fill_perf_regs</div><div class='add'>+/* As same as perf_arch_fetch_caller_regs(), do nothing by default */</div><div class='add'>+#define arch_ftrace_fill_perf_regs(fregs, _regs) do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __always_inline struct pt_regs *</div><div class='add'>+ftrace_fill_perf_regs(struct ftrace_regs *fregs, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	arch_ftrace_fill_perf_regs(fregs, regs);</div><div class='add'>+	return regs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */</div><div class='add'>+</div><div class='add'>+static __always_inline struct pt_regs *</div><div class='add'>+ftrace_fill_perf_regs(struct ftrace_regs *fregs, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	return &amp;arch_ftrace_regs(fregs)-&gt;regs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * When true, the ftrace_regs_{get,set}_*() functions may be used on fregs.</div><div class='ctx'>  * Note: this can be true even when ftrace_get_regs() cannot provide a pt_regs.</div><div class='hunk'>@@ -151,22 +258,22 @@ static __always_inline bool ftrace_regs_has_args(struct ftrace_regs *fregs)</div><div class='ctx'> 	return ftrace_get_regs(fregs) != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS</div><div class='del'>-#define ftrace_regs_get_instruction_pointer(fregs) \</div><div class='del'>-	instruction_pointer(ftrace_get_regs(fregs))</div><div class='del'>-#define ftrace_regs_get_argument(fregs, n) \</div><div class='del'>-	regs_get_kernel_argument(ftrace_get_regs(fregs), n)</div><div class='del'>-#define ftrace_regs_get_stack_pointer(fregs) \</div><div class='del'>-	kernel_stack_pointer(ftrace_get_regs(fregs))</div><div class='del'>-#define ftrace_regs_return_value(fregs) \</div><div class='del'>-	regs_return_value(ftrace_get_regs(fregs))</div><div class='del'>-#define ftrace_regs_set_return_value(fregs, ret) \</div><div class='del'>-	regs_set_return_value(ftrace_get_regs(fregs), ret)</div><div class='del'>-#define ftrace_override_function_with_return(fregs) \</div><div class='del'>-	override_function_with_return(ftrace_get_regs(fregs))</div><div class='del'>-#define ftrace_regs_query_register_offset(name) \</div><div class='del'>-	regs_query_register_offset(name)</div><div class='del'>-#endif</div><div class='add'>+#ifdef CONFIG_HAVE_REGS_AND_STACK_ACCESS_API</div><div class='add'>+static __always_inline unsigned long</div><div class='add'>+ftrace_regs_get_kernel_stack_nth(struct ftrace_regs *fregs, unsigned int nth)</div><div class='add'>+{</div><div class='add'>+	unsigned long *stackp;</div><div class='add'>+</div><div class='add'>+	stackp = (unsigned long *)ftrace_regs_get_stack_pointer(fregs);</div><div class='add'>+	if (((unsigned long)(stackp + nth) &amp; ~(THREAD_SIZE - 1)) ==</div><div class='add'>+	    ((unsigned long)stackp &amp; ~(THREAD_SIZE - 1)))</div><div class='add'>+		return *(stackp + nth);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else /* !CONFIG_HAVE_REGS_AND_STACK_ACCESS_API */</div><div class='add'>+#define ftrace_regs_get_kernel_stack_nth(fregs, nth)	(0L)</div><div class='add'>+#endif /* CONFIG_HAVE_REGS_AND_STACK_ACCESS_API */</div><div class='ctx'> </div><div class='ctx'> typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip,</div><div class='ctx'> 			      struct ftrace_ops *op, struct ftrace_regs *fregs);</div><div class='hunk'>@@ -228,6 +335,8 @@ ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops);</div><div class='ctx'>  *             ftrace_enabled.</div><div class='ctx'>  * DIRECT - Used by the direct ftrace_ops helper for direct functions</div><div class='ctx'>  *            (internal ftrace only, should not be used by others)</div><div class='add'>+ * SUBOP  - Is controlled by another op in field managed.</div><div class='add'>+ * GRAPH  - Is a component of the fgraph_ops structure</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	FTRACE_OPS_FL_ENABLED			= BIT(0),</div><div class='hunk'>@@ -248,6 +357,9 @@ enum {</div><div class='ctx'> 	FTRACE_OPS_FL_TRACE_ARRAY		= BIT(15),</div><div class='ctx'> 	FTRACE_OPS_FL_PERMANENT                 = BIT(16),</div><div class='ctx'> 	FTRACE_OPS_FL_DIRECT			= BIT(17),</div><div class='add'>+	FTRACE_OPS_FL_SUBOP			= BIT(18),</div><div class='add'>+	FTRACE_OPS_FL_GRAPH			= BIT(19),</div><div class='add'>+	FTRACE_OPS_FL_JMP			= BIT(20),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_DYNAMIC_FTRACE_WITH_ARGS</div><div class='hunk'>@@ -335,7 +447,9 @@ struct ftrace_ops {</div><div class='ctx'> 	unsigned long			trampoline;</div><div class='ctx'> 	unsigned long			trampoline_size;</div><div class='ctx'> 	struct list_head		list;</div><div class='add'>+	struct list_head		subop_list;</div><div class='ctx'> 	ftrace_ops_func_t		ops_func;</div><div class='add'>+	struct ftrace_ops		*managed;</div><div class='ctx'> #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS</div><div class='ctx'> 	unsigned long			direct_call;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -414,7 +528,6 @@ struct ftrace_func_entry {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS</div><div class='del'>-extern int ftrace_direct_func_count;</div><div class='ctx'> unsigned long ftrace_find_rec_direct(unsigned long ip);</div><div class='ctx'> int register_ftrace_direct(struct ftrace_ops *ops, unsigned long addr);</div><div class='ctx'> int unregister_ftrace_direct(struct ftrace_ops *ops, unsigned long addr,</div><div class='hunk'>@@ -426,7 +539,6 @@ void ftrace_stub_direct_tramp(void);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> struct ftrace_ops;</div><div class='del'>-# define ftrace_direct_func_count 0</div><div class='ctx'> static inline unsigned long ftrace_find_rec_direct(unsigned long ip)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -466,11 +578,41 @@ static inline void arch_ftrace_set_direct_caller(struct ftrace_regs *fregs,</div><div class='ctx'> 						 unsigned long addr) { }</div><div class='ctx'> #endif /* CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_STACK_TRACER</div><div class='add'>+#ifdef CONFIG_DYNAMIC_FTRACE_WITH_JMP</div><div class='add'>+static inline bool ftrace_is_jmp(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return addr &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long ftrace_jmp_set(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return addr | 1UL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long ftrace_jmp_get(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return addr &amp; ~1UL;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool ftrace_is_jmp(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long ftrace_jmp_set(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long ftrace_jmp_get(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_DYNAMIC_FTRACE_WITH_JMP */</div><div class='ctx'> </div><div class='del'>-extern int stack_tracer_enabled;</div><div class='add'>+#ifdef CONFIG_STACK_TRACER</div><div class='ctx'> </div><div class='del'>-int stack_trace_sysctl(struct ctl_table *table, int write, void *buffer,</div><div class='add'>+int stack_trace_sysctl(const struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 		       size_t *lenp, loff_t *ppos);</div><div class='ctx'> </div><div class='ctx'> /* DO NOT MODIFY THIS VARIABLE DIRECTLY! */</div><div class='hunk'>@@ -512,6 +654,30 @@ static inline void stack_tracer_disable(void) { }</div><div class='ctx'> static inline void stack_tracer_enable(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	FTRACE_UPDATE_CALLS		= (1 &lt;&lt; 0),</div><div class='add'>+	FTRACE_DISABLE_CALLS		= (1 &lt;&lt; 1),</div><div class='add'>+	FTRACE_UPDATE_TRACE_FUNC	= (1 &lt;&lt; 2),</div><div class='add'>+	FTRACE_START_FUNC_RET		= (1 &lt;&lt; 3),</div><div class='add'>+	FTRACE_STOP_FUNC_RET		= (1 &lt;&lt; 4),</div><div class='add'>+	FTRACE_MAY_SLEEP		= (1 &lt;&lt; 5),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Arches can override ftrace_get_symaddr() to convert fentry_ip to symaddr. */</div><div class='add'>+#ifndef ftrace_get_symaddr</div><div class='add'>+/**</div><div class='add'>+ * ftrace_get_symaddr - return the symbol address from fentry_ip</div><div class='add'>+ * @fentry_ip: the address of ftrace location</div><div class='add'>+ *</div><div class='add'>+ * Get the symbol address from @fentry_ip (fast path). If there is no fast</div><div class='add'>+ * search path, this returns 0.</div><div class='add'>+ * User may need to use kallsyms API to find the symbol address.</div><div class='add'>+ */</div><div class='add'>+#define ftrace_get_symaddr(fentry_ip) (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void ftrace_sync_ipi(void *data);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_DYNAMIC_FTRACE</div><div class='ctx'> </div><div class='ctx'> void ftrace_arch_code_modify_prepare(void);</div><div class='hunk'>@@ -606,15 +772,6 @@ void ftrace_set_global_notrace(unsigned char *buf, int len, int reset);</div><div class='ctx'> void ftrace_free_filter(struct ftrace_ops *ops);</div><div class='ctx'> void ftrace_ops_set_global_filter(struct ftrace_ops *ops);</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	FTRACE_UPDATE_CALLS		= (1 &lt;&lt; 0),</div><div class='del'>-	FTRACE_DISABLE_CALLS		= (1 &lt;&lt; 1),</div><div class='del'>-	FTRACE_UPDATE_TRACE_FUNC	= (1 &lt;&lt; 2),</div><div class='del'>-	FTRACE_START_FUNC_RET		= (1 &lt;&lt; 3),</div><div class='del'>-	FTRACE_STOP_FUNC_RET		= (1 &lt;&lt; 4),</div><div class='del'>-	FTRACE_MAY_SLEEP		= (1 &lt;&lt; 5),</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The FTRACE_UPDATE_* enum is used to pass information back</div><div class='ctx'>  * from the ftrace_update_record() and ftrace_test_record()</div><div class='hunk'>@@ -822,7 +979,8 @@ static inline int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec)</div><div class='ctx'> extern int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DYNAMIC_FTRACE_WITH_REGS) || \</div><div class='del'>-	defined(CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS)</div><div class='add'>+	defined(CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS) || \</div><div class='add'>+	defined(CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS)</div><div class='ctx'> /**</div><div class='ctx'>  * ftrace_modify_call - convert from one addr to another (no nop)</div><div class='ctx'>  * @rec: the call site record (e.g. mcount/fentry)</div><div class='hunk'>@@ -991,7 +1149,7 @@ static __always_inline unsigned long get_lock_parent_ip(void)</div><div class='ctx'> # define trace_preempt_off(a0, a1) do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_FTRACE_MCOUNT_RECORD</div><div class='add'>+#ifdef CONFIG_DYNAMIC_FTRACE</div><div class='ctx'> extern void ftrace_init(void);</div><div class='ctx'> #ifdef CC_USING_PATCHABLE_FUNCTION_ENTRY</div><div class='ctx'> #define FTRACE_CALLSITE_SECTION	"__patchable_function_entries"</div><div class='hunk'>@@ -1009,7 +1167,15 @@ static inline void ftrace_init(void) { }</div><div class='ctx'>  */</div><div class='ctx'> struct ftrace_graph_ent {</div><div class='ctx'> 	unsigned long func; /* Current function */</div><div class='del'>-	int depth;</div><div class='add'>+	unsigned long depth;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure that defines an entry function trace with retaddr.</div><div class='add'>+ */</div><div class='add'>+struct fgraph_retaddr_ent {</div><div class='add'>+	struct ftrace_graph_ent ent;</div><div class='add'>+	unsigned long retaddr;  /* Return address */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1025,23 +1191,38 @@ struct ftrace_graph_ret {</div><div class='ctx'> 	int depth;</div><div class='ctx'> 	/* Number of functions that overran the depth limit for current task */</div><div class='ctx'> 	unsigned int overrun;</div><div class='del'>-	unsigned long long calltime;</div><div class='del'>-	unsigned long long rettime;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* Type of the callback handlers for tracing function graph*/</div><div class='del'>-typedef void (*trace_func_graph_ret_t)(struct ftrace_graph_ret *); /* return */</div><div class='del'>-typedef int (*trace_func_graph_ent_t)(struct ftrace_graph_ent *); /* entry */</div><div class='add'>+struct fgraph_ops;</div><div class='ctx'> </div><div class='del'>-extern int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace);</div><div class='add'>+/* Type of the callback handlers for tracing function graph*/</div><div class='add'>+typedef void (*trace_func_graph_ret_t)(struct ftrace_graph_ret *,</div><div class='add'>+				       struct fgraph_ops *,</div><div class='add'>+				       struct ftrace_regs *); /* return */</div><div class='add'>+typedef int (*trace_func_graph_ent_t)(struct ftrace_graph_ent *,</div><div class='add'>+				      struct fgraph_ops *,</div><div class='add'>+				      struct ftrace_regs *); /* entry */</div><div class='add'>+</div><div class='add'>+extern int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace,</div><div class='add'>+				   struct fgraph_ops *gops,</div><div class='add'>+				   struct ftrace_regs *fregs);</div><div class='add'>+bool ftrace_pids_enabled(struct ftrace_ops *ops);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FUNCTION_GRAPH_TRACER</div><div class='ctx'> </div><div class='ctx'> struct fgraph_ops {</div><div class='ctx'> 	trace_func_graph_ent_t		entryfunc;</div><div class='ctx'> 	trace_func_graph_ret_t		retfunc;</div><div class='add'>+	struct ftrace_ops		ops; /* for the hash lists */</div><div class='add'>+	void				*private;</div><div class='add'>+	trace_func_graph_ent_t		saved_func;</div><div class='add'>+	int				idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void *fgraph_reserve_data(int idx, int size_bytes);</div><div class='add'>+void *fgraph_retrieve_data(int idx, int *size_bytes);</div><div class='add'>+void *fgraph_retrieve_parent_data(int idx, int *size_bytes, int depth);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Stack of return addresses for functions</div><div class='ctx'>  * of a thread.</div><div class='hunk'>@@ -1050,16 +1231,10 @@ struct fgraph_ops {</div><div class='ctx'> struct ftrace_ret_stack {</div><div class='ctx'> 	unsigned long ret;</div><div class='ctx'> 	unsigned long func;</div><div class='del'>-	unsigned long long calltime;</div><div class='del'>-#ifdef CONFIG_FUNCTION_PROFILER</div><div class='del'>-	unsigned long long subtime;</div><div class='del'>-#endif</div><div class='ctx'> #ifdef HAVE_FUNCTION_GRAPH_FP_TEST</div><div class='ctx'> 	unsigned long fp;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef HAVE_FUNCTION_GRAPH_RET_ADDR_PTR</div><div class='ctx'> 	unsigned long *retp;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1070,14 +1245,23 @@ struct ftrace_ret_stack {</div><div class='ctx'> extern void return_to_handler(void);</div><div class='ctx'> </div><div class='ctx'> extern int</div><div class='del'>-function_graph_enter(unsigned long ret, unsigned long func,</div><div class='del'>-		     unsigned long frame_pointer, unsigned long *retp);</div><div class='add'>+function_graph_enter_regs(unsigned long ret, unsigned long func,</div><div class='add'>+			  unsigned long frame_pointer, unsigned long *retp,</div><div class='add'>+			  struct ftrace_regs *fregs);</div><div class='add'>+</div><div class='add'>+static inline int function_graph_enter(unsigned long ret, unsigned long func,</div><div class='add'>+				       unsigned long fp, unsigned long *retp)</div><div class='add'>+{</div><div class='add'>+	return function_graph_enter_regs(ret, func, fp, retp, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct ftrace_ret_stack *</div><div class='del'>-ftrace_graph_get_ret_stack(struct task_struct *task, int idx);</div><div class='add'>+ftrace_graph_get_ret_stack(struct task_struct *task, int skip);</div><div class='add'>+unsigned long ftrace_graph_top_ret_addr(struct task_struct *task);</div><div class='ctx'> </div><div class='ctx'> unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx,</div><div class='ctx'> 				    unsigned long ret, unsigned long *retp);</div><div class='add'>+unsigned long *fgraph_get_task_var(struct fgraph_ops *gops);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Sometimes we don't want to trace a function with the function</div><div class='hunk'>@@ -1116,6 +1300,9 @@ extern void ftrace_graph_init_task(struct task_struct *t);</div><div class='ctx'> extern void ftrace_graph_exit_task(struct task_struct *t);</div><div class='ctx'> extern void ftrace_graph_init_idle_task(struct task_struct *t, int cpu);</div><div class='ctx'> </div><div class='add'>+/* Used by assembly, but to quiet sparse warnings */</div><div class='add'>+extern struct ftrace_ops *function_trace_op;</div><div class='add'>+</div><div class='ctx'> static inline void pause_graph_tracing(void)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;current-&gt;tracing_graph_pause);</div><div class='hunk'>@@ -1151,14 +1338,9 @@ static inline void unpause_graph_tracing(void) { }</div><div class='ctx'> #ifdef CONFIG_TRACING</div><div class='ctx'> enum ftrace_dump_mode;</div><div class='ctx'> </div><div class='del'>-extern enum ftrace_dump_mode ftrace_dump_on_oops;</div><div class='del'>-extern int tracepoint_printk;</div><div class='add'>+extern int ftrace_dump_on_oops_enabled(void);</div><div class='ctx'> </div><div class='ctx'> extern void disable_trace_on_warning(void);</div><div class='del'>-extern int __disable_trace_on_warning;</div><div class='del'>-</div><div class='del'>-int tracepoint_printk_sysctl(struct ctl_table *table, int write,</div><div class='del'>-			     void *buffer, size_t *lenp, loff_t *ppos);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_TRACING */</div><div class='ctx'> static inline void  disable_trace_on_warning(void) { }</div><div class='head'>diff --git a/include/linux/ftrace_regs.h b/include/linux/ftrace_regs.h<br/>new file mode 100644<br/>index 000000000000..15627ceea9bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ftrace_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ftrace_regs.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_FTRACE_REGS_H</div><div class='add'>+#define _LINUX_FTRACE_REGS_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For archs that just copy pt_regs in ftrace regs, it can use this default.</div><div class='add'>+ * If an architecture does not use pt_regs, it must define all the below</div><div class='add'>+ * accessor functions.</div><div class='add'>+ */</div><div class='add'>+#ifndef HAVE_ARCH_FTRACE_REGS</div><div class='add'>+struct __arch_ftrace_regs {</div><div class='add'>+	struct pt_regs		regs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define arch_ftrace_regs(fregs) ((struct __arch_ftrace_regs *)(fregs))</div><div class='add'>+</div><div class='add'>+struct ftrace_regs;</div><div class='add'>+</div><div class='add'>+#define ftrace_regs_get_instruction_pointer(fregs) \</div><div class='add'>+	instruction_pointer(&amp;arch_ftrace_regs(fregs)-&gt;regs)</div><div class='add'>+#define ftrace_regs_get_argument(fregs, n) \</div><div class='add'>+	regs_get_kernel_argument(&amp;arch_ftrace_regs(fregs)-&gt;regs, n)</div><div class='add'>+#define ftrace_regs_get_stack_pointer(fregs) \</div><div class='add'>+	kernel_stack_pointer(&amp;arch_ftrace_regs(fregs)-&gt;regs)</div><div class='add'>+#define ftrace_regs_get_return_value(fregs) \</div><div class='add'>+	regs_return_value(&amp;arch_ftrace_regs(fregs)-&gt;regs)</div><div class='add'>+#define ftrace_regs_set_return_value(fregs, ret) \</div><div class='add'>+	regs_set_return_value(&amp;arch_ftrace_regs(fregs)-&gt;regs, ret)</div><div class='add'>+#define ftrace_override_function_with_return(fregs) \</div><div class='add'>+	override_function_with_return(&amp;arch_ftrace_regs(fregs)-&gt;regs)</div><div class='add'>+#define ftrace_regs_query_register_offset(name) \</div><div class='add'>+	regs_query_register_offset(name)</div><div class='add'>+#define ftrace_regs_get_frame_pointer(fregs) \</div><div class='add'>+	frame_pointer(&amp;arch_ftrace_regs(fregs)-&gt;regs)</div><div class='add'>+</div><div class='add'>+#endif /* HAVE_ARCH_FTRACE_REGS */</div><div class='add'>+</div><div class='add'>+/* This can be overridden by the architectures */</div><div class='add'>+#ifndef FTRACE_REGS_MAX_ARGS</div><div class='add'>+# define FTRACE_REGS_MAX_ARGS	6</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_FTRACE_REGS_H */</div><div class='head'>diff --git a/include/linux/futex.h b/include/linux/futex.h<br/>index b70df27d7e85..9e9750f04980 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/futex.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/futex.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/futex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/futex.h</a></div><div class='hunk'>@@ -4,11 +4,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/futex.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct inode;</div><div class='del'>-struct mm_struct;</div><div class='ctx'> struct task_struct;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -34,6 +34,7 @@ union futex_key {</div><div class='ctx'> 		u64 i_seq;</div><div class='ctx'> 		unsigned long pgoff;</div><div class='ctx'> 		unsigned int offset;</div><div class='add'>+		/* unsigned int node; */</div><div class='ctx'> 	} shared;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		union {</div><div class='hunk'>@@ -42,11 +43,13 @@ union futex_key {</div><div class='ctx'> 		};</div><div class='ctx'> 		unsigned long address;</div><div class='ctx'> 		unsigned int offset;</div><div class='add'>+		/* unsigned int node; */</div><div class='ctx'> 	} private;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u64 ptr;</div><div class='ctx'> 		unsigned long word;</div><div class='ctx'> 		unsigned int offset;</div><div class='add'>+		unsigned int node;	/* NOT hashed! */</div><div class='ctx'> 	} both;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +80,20 @@ void futex_exec_release(struct task_struct *tsk);</div><div class='ctx'> </div><div class='ctx'> long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,</div><div class='ctx'> 	      u32 __user *uaddr2, u32 val2, u32 val3);</div><div class='del'>-#else</div><div class='add'>+int futex_hash_prctl(unsigned long arg2, unsigned long arg3, unsigned long arg4);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FUTEX_PRIVATE_HASH</div><div class='add'>+int futex_hash_allocate_default(void);</div><div class='add'>+void futex_hash_free(struct mm_struct *mm);</div><div class='add'>+int futex_mm_init(struct mm_struct *mm);</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_FUTEX_PRIVATE_HASH */</div><div class='add'>+static inline int futex_hash_allocate_default(void) { return 0; }</div><div class='add'>+static inline int futex_hash_free(struct mm_struct *mm) { return 0; }</div><div class='add'>+static inline int futex_mm_init(struct mm_struct *mm) { return 0; }</div><div class='add'>+#endif /* CONFIG_FUTEX_PRIVATE_HASH */</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_FUTEX */</div><div class='ctx'> static inline void futex_init_task(struct task_struct *tsk) { }</div><div class='ctx'> static inline void futex_exit_recursive(struct task_struct *tsk) { }</div><div class='ctx'> static inline void futex_exit_release(struct task_struct *tsk) { }</div><div class='hunk'>@@ -88,6 +104,17 @@ static inline long do_futex(u32 __user *uaddr, int op, u32 val,</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+static inline int futex_hash_prctl(unsigned long arg2, unsigned long arg3, unsigned long arg4)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline int futex_hash_allocate_default(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int futex_hash_free(struct mm_struct *mm) { return 0; }</div><div class='add'>+static inline int futex_mm_init(struct mm_struct *mm) { return 0; }</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/fw_table.h b/include/linux/fw_table.h<br/>index 95421860397a..9bd605b87c4c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fw_table.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fw_table.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fw_table.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fw_table.h</a></div><div class='hunk'>@@ -40,19 +40,21 @@ union acpi_subtable_headers {</div><div class='ctx'> </div><div class='ctx'> int acpi_parse_entries_array(char *id, unsigned long table_size,</div><div class='ctx'> 			     union fw_table_header *table_header,</div><div class='add'>+			     unsigned long max_length,</div><div class='ctx'> 			     struct acpi_subtable_proc *proc,</div><div class='ctx'> 			     int proc_num, unsigned int max_entries);</div><div class='ctx'> </div><div class='ctx'> int cdat_table_parse(enum acpi_cdat_type type,</div><div class='ctx'> 		     acpi_tbl_entry_handler_arg handler_arg, void *arg,</div><div class='del'>-		     struct acpi_table_cdat *table_header);</div><div class='add'>+		     struct acpi_table_cdat *table_header,</div><div class='add'>+		     unsigned long length);</div><div class='ctx'> </div><div class='ctx'> /* CXL is the only non-ACPI consumer of the FIRMWARE_TABLE library */</div><div class='ctx'> #if IS_ENABLED(CONFIG_ACPI) &amp;&amp; !IS_ENABLED(CONFIG_CXL_BUS)</div><div class='ctx'> #define EXPORT_SYMBOL_FWTBL_LIB(x) EXPORT_SYMBOL_ACPI_LIB(x)</div><div class='ctx'> #define __init_or_fwtbl_lib __init_or_acpilib</div><div class='ctx'> #else</div><div class='del'>-#define EXPORT_SYMBOL_FWTBL_LIB(x) EXPORT_SYMBOL_NS_GPL(x, CXL)</div><div class='add'>+#define EXPORT_SYMBOL_FWTBL_LIB(x) EXPORT_SYMBOL_NS_GPL(x, "CXL")</div><div class='ctx'> #define __init_or_fwtbl_lib</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/fwctl.h b/include/linux/fwctl.h<br/>new file mode 100644<br/>index 000000000000..5d61fc8a6871<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fwctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fwctl.h</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024-2025, NVIDIA CORPORATION &amp; AFFILIATES</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_FWCTL_H</div><div class='add'>+#define __LINUX_FWCTL_H</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;uapi/fwctl/fwctl.h&gt;</div><div class='add'>+</div><div class='add'>+struct fwctl_device;</div><div class='add'>+struct fwctl_uctx;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct fwctl_ops - Driver provided operations</div><div class='add'>+ *</div><div class='add'>+ * fwctl_unregister() will wait until all excuting ops are completed before it</div><div class='add'>+ * returns. Drivers should be mindful to not let their ops run for too long as</div><div class='add'>+ * it will block device hot unplug and module unloading.</div><div class='add'>+ */</div><div class='add'>+struct fwctl_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * @device_type: The drivers assigned device_type number. This is uABI.</div><div class='add'>+	 */</div><div class='add'>+	enum fwctl_device_type device_type;</div><div class='add'>+	/**</div><div class='add'>+	 * @uctx_size: The size of the fwctl_uctx struct to allocate. The first</div><div class='add'>+	 * bytes of this memory will be a fwctl_uctx. The driver can use the</div><div class='add'>+	 * remaining bytes as its private memory.</div><div class='add'>+	 */</div><div class='add'>+	size_t uctx_size;</div><div class='add'>+	/**</div><div class='add'>+	 * @open_uctx: Called when a file descriptor is opened before the uctx</div><div class='add'>+	 * is ever used.</div><div class='add'>+	 */</div><div class='add'>+	int (*open_uctx)(struct fwctl_uctx *uctx);</div><div class='add'>+	/**</div><div class='add'>+	 * @close_uctx: Called when the uctx is destroyed, usually when the FD</div><div class='add'>+	 * is closed.</div><div class='add'>+	 */</div><div class='add'>+	void (*close_uctx)(struct fwctl_uctx *uctx);</div><div class='add'>+	/**</div><div class='add'>+	 * @info: Implement FWCTL_INFO. Return a kmalloc() memory that is copied</div><div class='add'>+	 * to out_device_data. On input length indicates the size of the user</div><div class='add'>+	 * buffer on output it indicates the size of the memory. The driver can</div><div class='add'>+	 * ignore length on input, the core code will handle everything.</div><div class='add'>+	 */</div><div class='add'>+	void *(*info)(struct fwctl_uctx *uctx, size_t *length);</div><div class='add'>+	/**</div><div class='add'>+	 * @fw_rpc: Implement FWCTL_RPC. Deliver rpc_in/in_len to the FW and</div><div class='add'>+	 * return the response and set out_len. rpc_in can be returned as the</div><div class='add'>+	 * response pointer. Otherwise the returned pointer is freed with</div><div class='add'>+	 * kvfree().</div><div class='add'>+	 */</div><div class='add'>+	void *(*fw_rpc)(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope,</div><div class='add'>+			void *rpc_in, size_t in_len, size_t *out_len);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct fwctl_device - Per-driver registration struct</div><div class='add'>+ * @dev: The sysfs (class/fwctl/fwctlXX) device</div><div class='add'>+ *</div><div class='add'>+ * Each driver instance will have one of these structs with the driver private</div><div class='add'>+ * data following immediately after. This struct is refcounted, it is freed by</div><div class='add'>+ * calling fwctl_put().</div><div class='add'>+ */</div><div class='add'>+struct fwctl_device {</div><div class='add'>+	struct device dev;</div><div class='add'>+	/* private: */</div><div class='add'>+	struct cdev cdev;</div><div class='add'>+</div><div class='add'>+	/* Protect uctx_list */</div><div class='add'>+	struct mutex uctx_list_lock;</div><div class='add'>+	struct list_head uctx_list;</div><div class='add'>+	/*</div><div class='add'>+	 * Protect ops, held for write when ops becomes NULL during unregister,</div><div class='add'>+	 * held for read whenever ops is loaded or an ops function is running.</div><div class='add'>+	 */</div><div class='add'>+	struct rw_semaphore registration_lock;</div><div class='add'>+	const struct fwctl_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fwctl_device *_fwctl_alloc_device(struct device *parent,</div><div class='add'>+					 const struct fwctl_ops *ops,</div><div class='add'>+					 size_t size);</div><div class='add'>+/**</div><div class='add'>+ * fwctl_alloc_device - Allocate a fwctl</div><div class='add'>+ * @parent: Physical device that provides the FW interface</div><div class='add'>+ * @ops: Driver ops to register</div><div class='add'>+ * @drv_struct: 'struct driver_fwctl' that holds the struct fwctl_device</div><div class='add'>+ * @member: Name of the struct fwctl_device in @drv_struct</div><div class='add'>+ *</div><div class='add'>+ * This allocates and initializes the fwctl_device embedded in the drv_struct.</div><div class='add'>+ * Upon success the pointer must be freed via fwctl_put(). Returns a 'drv_struct</div><div class='add'>+ * \*' on success, NULL on error.</div><div class='add'>+ */</div><div class='add'>+#define fwctl_alloc_device(parent, ops, drv_struct, member)               \</div><div class='add'>+	({                                                                \</div><div class='add'>+		static_assert(__same_type(struct fwctl_device,            \</div><div class='add'>+					  ((drv_struct *)NULL)-&gt;member)); \</div><div class='add'>+		static_assert(offsetof(drv_struct, member) == 0);         \</div><div class='add'>+		(drv_struct *)_fwctl_alloc_device(parent, ops,            \</div><div class='add'>+						  sizeof(drv_struct));    \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+static inline struct fwctl_device *fwctl_get(struct fwctl_device *fwctl)</div><div class='add'>+{</div><div class='add'>+	get_device(&amp;fwctl-&gt;dev);</div><div class='add'>+	return fwctl;</div><div class='add'>+}</div><div class='add'>+static inline void fwctl_put(struct fwctl_device *fwctl)</div><div class='add'>+{</div><div class='add'>+	put_device(&amp;fwctl-&gt;dev);</div><div class='add'>+}</div><div class='add'>+DEFINE_FREE(fwctl, struct fwctl_device *, if (_T) fwctl_put(_T));</div><div class='add'>+</div><div class='add'>+int fwctl_register(struct fwctl_device *fwctl);</div><div class='add'>+void fwctl_unregister(struct fwctl_device *fwctl);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct fwctl_uctx - Per user FD context</div><div class='add'>+ * @fwctl: fwctl instance that owns the context</div><div class='add'>+ *</div><div class='add'>+ * Every FD opened by userspace will get a unique context allocation. Any driver</div><div class='add'>+ * private data will follow immediately after.</div><div class='add'>+ */</div><div class='add'>+struct fwctl_uctx {</div><div class='add'>+	struct fwctl_device *fwctl;</div><div class='add'>+	/* private: */</div><div class='add'>+	/* Head at fwctl_device::uctx_list */</div><div class='add'>+	struct list_head uctx_list_entry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h<br/>index 2a72f55d26eb..097be89487bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/fwnode.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/fwnode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/fwnode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/fwnode.h</a></div><div class='hunk'>@@ -2,6 +2,11 @@</div><div class='ctx'> /*</div><div class='ctx'>  * fwnode.h - Firmware device node object handle type definition.</div><div class='ctx'>  *</div><div class='add'>+ * This header file provides low-level data types and definitions for firmware</div><div class='add'>+ * and device property providers. The respective API header files supplied by</div><div class='add'>+ * them should contain all of the requisite data types and definitions for end</div><div class='add'>+ * users, so including it directly should not be necessary.</div><div class='add'>+ *</div><div class='ctx'>  * Copyright (C) 2015, Intel Corporation</div><div class='ctx'>  * Author: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -9,10 +14,16 @@</div><div class='ctx'> #ifndef _LINUX_FWNODE_H_</div><div class='ctx'> #define _LINUX_FWNODE_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+enum dev_dma_attr {</div><div class='add'>+	DEV_DMA_NOT_SUPPORTED,</div><div class='add'>+	DEV_DMA_NON_COHERENT,</div><div class='add'>+	DEV_DMA_COHERENT,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct fwnode_operations;</div><div class='ctx'> struct device;</div><div class='hunk'>@@ -53,8 +64,10 @@ struct fwnode_handle {</div><div class='ctx'>  * fwnode link flags</div><div class='ctx'>  *</div><div class='ctx'>  * CYCLE:	The fwnode link is part of a cycle. Don't defer probe.</div><div class='add'>+ * IGNORE:	Completely ignore this link, even during cycle detection.</div><div class='ctx'>  */</div><div class='ctx'> #define FWLINK_FLAG_CYCLE			BIT(0)</div><div class='add'>+#define FWLINK_FLAG_IGNORE			BIT(1)</div><div class='ctx'> </div><div class='ctx'> struct fwnode_link {</div><div class='ctx'> 	struct fwnode_handle *supplier;</div><div class='hunk'>@@ -83,7 +96,7 @@ struct fwnode_endpoint {</div><div class='ctx'> #define SWNODE_GRAPH_PORT_NAME_FMT		"port@%u"</div><div class='ctx'> #define SWNODE_GRAPH_ENDPOINT_NAME_FMT		"endpoint@%u"</div><div class='ctx'> </div><div class='del'>-#define NR_FWNODE_REFERENCE_ARGS	8</div><div class='add'>+#define NR_FWNODE_REFERENCE_ARGS	16</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct fwnode_reference_args - Fwnode reference with additional arguments</div><div class='hunk'>@@ -104,6 +117,7 @@ struct fwnode_reference_args {</div><div class='ctx'>  * @device_is_available: Return true if the device is available.</div><div class='ctx'>  * @device_get_match_data: Return the device driver match data.</div><div class='ctx'>  * @property_present: Return true if a property is present.</div><div class='add'>+ * @property_read_bool: Return a boolean property value.</div><div class='ctx'>  * @property_read_int_array: Read an array of integer properties. Return zero on</div><div class='ctx'>  *			     success, a negative error code otherwise.</div><div class='ctx'>  * @property_read_string_array: Read an array of string properties. Return zero</div><div class='hunk'>@@ -133,6 +147,8 @@ struct fwnode_operations {</div><div class='ctx'> 	(*device_get_dma_attr)(const struct fwnode_handle *fwnode);</div><div class='ctx'> 	bool (*property_present)(const struct fwnode_handle *fwnode,</div><div class='ctx'> 				 const char *propname);</div><div class='add'>+	bool (*property_read_bool)(const struct fwnode_handle *fwnode,</div><div class='add'>+				   const char *propname);</div><div class='ctx'> 	int (*property_read_int_array)(const struct fwnode_handle *fwnode,</div><div class='ctx'> 				       const char *propname,</div><div class='ctx'> 				       unsigned int elem_size, void *val,</div><div class='hunk'>@@ -187,7 +203,6 @@ struct fwnode_operations {</div><div class='ctx'> 		if (fwnode_has_op(fwnode, op))				\</div><div class='ctx'> 			(fwnode)-&gt;ops-&gt;op(fwnode, ## __VA_ARGS__);	\</div><div class='ctx'> 	} while (false)</div><div class='del'>-#define get_dev_from_fwnode(fwnode)	get_device((fwnode)-&gt;dev)</div><div class='ctx'> </div><div class='ctx'> static inline void fwnode_init(struct fwnode_handle *fwnode,</div><div class='ctx'> 			       const struct fwnode_operations *ops)</div><div class='hunk'>@@ -209,9 +224,10 @@ static inline void fwnode_dev_initialized(struct fwnode_handle *fwnode,</div><div class='ctx'> 		fwnode-&gt;flags &amp;= ~FWNODE_FLAG_INITIALIZED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern bool fw_devlink_is_strict(void);</div><div class='del'>-int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup);</div><div class='add'>+int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup,</div><div class='add'>+		    u8 flags);</div><div class='ctx'> void fwnode_links_purge(struct fwnode_handle *fwnode);</div><div class='ctx'> void fw_devlink_purge_absent_suppliers(struct fwnode_handle *fwnode);</div><div class='add'>+bool fw_devlink_is_strict(void);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/gameport.h b/include/linux/gameport.h<br/>index 07e370113b2b..86d62fdafd7a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gameport.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gameport.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gameport.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gameport.h</a></div><div class='hunk'>@@ -58,7 +58,7 @@ struct gameport_driver {</div><div class='ctx'> </div><div class='ctx'> 	bool ignore;</div><div class='ctx'> };</div><div class='del'>-#define to_gameport_driver(d)	container_of(d, struct gameport_driver, driver)</div><div class='add'>+#define to_gameport_driver(d)	container_of_const(d, struct gameport_driver, driver)</div><div class='ctx'> </div><div class='ctx'> int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mode);</div><div class='ctx'> void gameport_close(struct gameport *gameport);</div><div class='head'>diff --git a/include/linux/gcd.h b/include/linux/gcd.h<br/>index cb572677fd7f..616e81a7f7e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gcd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gcd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gcd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gcd.h</a></div><div class='hunk'>@@ -3,6 +3,9 @@</div><div class='ctx'> #define _GCD_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='add'>+</div><div class='add'>+DECLARE_STATIC_KEY_TRUE(efficient_ffs_key);</div><div class='ctx'> </div><div class='ctx'> unsigned long gcd(unsigned long a, unsigned long b) __attribute_const__;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/generic-radix-tree.h b/include/linux/generic-radix-tree.h<br/>index 847413164738..5b51c3d582d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/generic-radix-tree.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/generic-radix-tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/generic-radix-tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/generic-radix-tree.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  * DOC: Generic radix trees/sparse arrays</div><div class='ctx'>  *</div><div class='ctx'>  * Very simple and minimalistic, supporting arbitrary size entries up to</div><div class='del'>- * PAGE_SIZE.</div><div class='add'>+ * GENRADIX_NODE_SIZE.</div><div class='ctx'>  *</div><div class='ctx'>  * A genradix is defined with the type it will store, like so:</div><div class='ctx'>  *</div><div class='hunk'>@@ -41,16 +41,73 @@</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='ctx'> #include &lt;linux/math.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct genradix_root;</div><div class='ctx'> </div><div class='add'>+#define GENRADIX_NODE_SHIFT	9</div><div class='add'>+#define GENRADIX_NODE_SIZE	(1U &lt;&lt; GENRADIX_NODE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define GENRADIX_ARY		(GENRADIX_NODE_SIZE / sizeof(struct genradix_node *))</div><div class='add'>+#define GENRADIX_ARY_SHIFT	ilog2(GENRADIX_ARY)</div><div class='add'>+</div><div class='add'>+/* depth that's needed for a genradix that can address up to ULONG_MAX: */</div><div class='add'>+#define GENRADIX_MAX_DEPTH	\</div><div class='add'>+	DIV_ROUND_UP(BITS_PER_LONG - GENRADIX_NODE_SHIFT, GENRADIX_ARY_SHIFT)</div><div class='add'>+</div><div class='add'>+#define GENRADIX_DEPTH_MASK				\</div><div class='add'>+	((unsigned long) (roundup_pow_of_two(GENRADIX_MAX_DEPTH + 1) - 1))</div><div class='add'>+</div><div class='add'>+static inline int genradix_depth_shift(unsigned depth)</div><div class='add'>+{</div><div class='add'>+	return GENRADIX_NODE_SHIFT + GENRADIX_ARY_SHIFT * depth;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns size (of data, in bytes) that a tree of a given depth holds:</div><div class='add'>+ */</div><div class='add'>+static inline size_t genradix_depth_size(unsigned depth)</div><div class='add'>+{</div><div class='add'>+	return 1UL &lt;&lt; genradix_depth_shift(depth);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned genradix_root_to_depth(struct genradix_root *r)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long) r &amp; GENRADIX_DEPTH_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct genradix_node *genradix_root_to_node(struct genradix_root *r)</div><div class='add'>+{</div><div class='add'>+	return (void *) ((unsigned long) r &amp; ~GENRADIX_DEPTH_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct __genradix {</div><div class='ctx'> 	struct genradix_root		*root;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct genradix_node {</div><div class='add'>+	union {</div><div class='add'>+		/* Interior node: */</div><div class='add'>+		struct genradix_node	*children[GENRADIX_ARY];</div><div class='add'>+</div><div class='add'>+		/* Leaf: */</div><div class='add'>+		u8			data[GENRADIX_NODE_SIZE];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct genradix_node *genradix_alloc_node(gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	return kzalloc(GENRADIX_NODE_SIZE, gfp_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void genradix_free_node(struct genradix_node *node)</div><div class='add'>+{</div><div class='add'>+	kfree(node);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * NOTE: currently, sizeof(_type) must not be larger than PAGE_SIZE:</div><div class='add'>+ * NOTE: currently, sizeof(_type) must not be larger than GENRADIX_NODE_SIZE:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define __GENRADIX_INITIALIZER					\</div><div class='hunk'>@@ -101,14 +158,14 @@ void __genradix_free(struct __genradix *);</div><div class='ctx'> static inline size_t __idx_to_offset(size_t idx, size_t obj_size)</div><div class='ctx'> {</div><div class='ctx'> 	if (__builtin_constant_p(obj_size))</div><div class='del'>-		BUILD_BUG_ON(obj_size &gt; PAGE_SIZE);</div><div class='add'>+		BUILD_BUG_ON(obj_size &gt; GENRADIX_NODE_SIZE);</div><div class='ctx'> 	else</div><div class='del'>-		BUG_ON(obj_size &gt; PAGE_SIZE);</div><div class='add'>+		BUG_ON(obj_size &gt; GENRADIX_NODE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_power_of_2(obj_size)) {</div><div class='del'>-		size_t objs_per_page = PAGE_SIZE / obj_size;</div><div class='add'>+		size_t objs_per_page = GENRADIX_NODE_SIZE / obj_size;</div><div class='ctx'> </div><div class='del'>-		return (idx / objs_per_page) * PAGE_SIZE +</div><div class='add'>+		return (idx / objs_per_page) * GENRADIX_NODE_SIZE +</div><div class='ctx'> 			(idx % objs_per_page) * obj_size;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return idx * obj_size;</div><div class='hunk'>@@ -118,13 +175,37 @@ static inline size_t __idx_to_offset(size_t idx, size_t obj_size)</div><div class='ctx'> #define __genradix_cast(_radix)		(typeof((_radix)-&gt;type[0]) *)</div><div class='ctx'> #define __genradix_obj_size(_radix)	sizeof((_radix)-&gt;type[0])</div><div class='ctx'> #define __genradix_objs_per_page(_radix)			\</div><div class='del'>-	(PAGE_SIZE / sizeof((_radix)-&gt;type[0]))</div><div class='add'>+	(GENRADIX_NODE_SIZE / sizeof((_radix)-&gt;type[0]))</div><div class='ctx'> #define __genradix_page_remainder(_radix)			\</div><div class='del'>-	(PAGE_SIZE % sizeof((_radix)-&gt;type[0]))</div><div class='add'>+	(GENRADIX_NODE_SIZE % sizeof((_radix)-&gt;type[0]))</div><div class='ctx'> </div><div class='ctx'> #define __genradix_idx_to_offset(_radix, _idx)			\</div><div class='ctx'> 	__idx_to_offset(_idx, __genradix_obj_size(_radix))</div><div class='ctx'> </div><div class='add'>+static inline void *__genradix_ptr_inlined(struct __genradix *radix, size_t offset)</div><div class='add'>+{</div><div class='add'>+	struct genradix_root *r = READ_ONCE(radix-&gt;root);</div><div class='add'>+	struct genradix_node *n = genradix_root_to_node(r);</div><div class='add'>+	unsigned level		= genradix_root_to_depth(r);</div><div class='add'>+	unsigned shift		= genradix_depth_shift(level);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ilog2(offset) &gt;= genradix_depth_shift(level)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	while (n &amp;&amp; shift &gt; GENRADIX_NODE_SHIFT) {</div><div class='add'>+		shift -= GENRADIX_ARY_SHIFT;</div><div class='add'>+		n = n-&gt;children[offset &gt;&gt; shift];</div><div class='add'>+		offset &amp;= (1UL &lt;&lt; shift) - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return n ? &amp;n-&gt;data[offset] : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define genradix_ptr_inlined(_radix, _idx)			\</div><div class='add'>+	(__genradix_cast(_radix)				\</div><div class='add'>+	 __genradix_ptr_inlined(&amp;(_radix)-&gt;tree,		\</div><div class='add'>+			__genradix_idx_to_offset(_radix, _idx)))</div><div class='add'>+</div><div class='ctx'> void *__genradix_ptr(struct __genradix *, size_t);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -139,7 +220,24 @@ void *__genradix_ptr(struct __genradix *, size_t);</div><div class='ctx'> 	 __genradix_ptr(&amp;(_radix)-&gt;tree,			\</div><div class='ctx'> 			__genradix_idx_to_offset(_radix, _idx)))</div><div class='ctx'> </div><div class='del'>-void *__genradix_ptr_alloc(struct __genradix *, size_t, gfp_t);</div><div class='add'>+void *__genradix_ptr_alloc(struct __genradix *, size_t,</div><div class='add'>+			   struct genradix_node **, gfp_t);</div><div class='add'>+</div><div class='add'>+#define genradix_ptr_alloc_inlined(_radix, _idx, _gfp)			\</div><div class='add'>+	(__genradix_cast(_radix)					\</div><div class='add'>+	 (__genradix_ptr_inlined(&amp;(_radix)-&gt;tree,			\</div><div class='add'>+			__genradix_idx_to_offset(_radix, _idx)) ?:	\</div><div class='add'>+	  __genradix_ptr_alloc(&amp;(_radix)-&gt;tree,				\</div><div class='add'>+			__genradix_idx_to_offset(_radix, _idx),		\</div><div class='add'>+			NULL, _gfp)))</div><div class='add'>+</div><div class='add'>+#define genradix_ptr_alloc_preallocated_inlined(_radix, _idx, _new_node, _gfp)\</div><div class='add'>+	(__genradix_cast(_radix)					\</div><div class='add'>+	 (__genradix_ptr_inlined(&amp;(_radix)-&gt;tree,			\</div><div class='add'>+			__genradix_idx_to_offset(_radix, _idx)) ?:	\</div><div class='add'>+	  __genradix_ptr_alloc(&amp;(_radix)-&gt;tree,				\</div><div class='add'>+			__genradix_idx_to_offset(_radix, _idx),		\</div><div class='add'>+			_new_node, _gfp)))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * genradix_ptr_alloc - get a pointer to a genradix entry, allocating it</div><div class='hunk'>@@ -154,7 +252,13 @@ void *__genradix_ptr_alloc(struct __genradix *, size_t, gfp_t);</div><div class='ctx'> 	(__genradix_cast(_radix)				\</div><div class='ctx'> 	 __genradix_ptr_alloc(&amp;(_radix)-&gt;tree,			\</div><div class='ctx'> 			__genradix_idx_to_offset(_radix, _idx),	\</div><div class='del'>-			_gfp))</div><div class='add'>+			NULL, _gfp))</div><div class='add'>+</div><div class='add'>+#define genradix_ptr_alloc_preallocated(_radix, _idx, _new_node, _gfp)\</div><div class='add'>+	(__genradix_cast(_radix)				\</div><div class='add'>+	 __genradix_ptr_alloc(&amp;(_radix)-&gt;tree,			\</div><div class='add'>+			__genradix_idx_to_offset(_radix, _idx),	\</div><div class='add'>+			_new_node, _gfp))</div><div class='ctx'> </div><div class='ctx'> struct genradix_iter {</div><div class='ctx'> 	size_t			offset;</div><div class='hunk'>@@ -217,8 +321,8 @@ static inline void __genradix_iter_advance(struct genradix_iter *iter,</div><div class='ctx'> 	iter-&gt;offset += obj_size;</div><div class='ctx'> </div><div class='ctx'> 	if (!is_power_of_2(obj_size) &amp;&amp;</div><div class='del'>-	    (iter-&gt;offset &amp; (PAGE_SIZE - 1)) + obj_size &gt; PAGE_SIZE)</div><div class='del'>-		iter-&gt;offset = round_up(iter-&gt;offset, PAGE_SIZE);</div><div class='add'>+	    (iter-&gt;offset &amp; (GENRADIX_NODE_SIZE - 1)) + obj_size &gt; GENRADIX_NODE_SIZE)</div><div class='add'>+		iter-&gt;offset = round_up(iter-&gt;offset, GENRADIX_NODE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	iter-&gt;pos++;</div><div class='ctx'> }</div><div class='hunk'>@@ -235,8 +339,8 @@ static inline void __genradix_iter_rewind(struct genradix_iter *iter,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((iter-&gt;offset &amp; (PAGE_SIZE - 1)) == 0)</div><div class='del'>-		iter-&gt;offset -= PAGE_SIZE % obj_size;</div><div class='add'>+	if ((iter-&gt;offset &amp; (GENRADIX_NODE_SIZE - 1)) == 0)</div><div class='add'>+		iter-&gt;offset -= GENRADIX_NODE_SIZE % obj_size;</div><div class='ctx'> </div><div class='ctx'> 	iter-&gt;offset -= obj_size;</div><div class='ctx'> 	iter-&gt;pos--;</div><div class='hunk'>@@ -263,7 +367,7 @@ static inline void __genradix_iter_rewind(struct genradix_iter *iter,</div><div class='ctx'> 	genradix_for_each_from(_radix, _iter, _p, 0)</div><div class='ctx'> </div><div class='ctx'> #define genradix_last_pos(_radix)				\</div><div class='del'>-	(SIZE_MAX / PAGE_SIZE * __genradix_objs_per_page(_radix) - 1)</div><div class='add'>+	(SIZE_MAX / GENRADIX_NODE_SIZE * __genradix_objs_per_page(_radix) - 1)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * genradix_for_each_reverse - iterate over entry in a genradix, reverse order</div><div class='head'>diff --git a/include/linux/generic_pt/common.h b/include/linux/generic_pt/common.h<br/>new file mode 100644<br/>index 000000000000..6a9a1acb5aad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/generic_pt/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/generic_pt/common.h</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024-2025, NVIDIA CORPORATION &amp; AFFILIATES</div><div class='add'>+ */</div><div class='add'>+#ifndef __GENERIC_PT_COMMON_H</div><div class='add'>+#define __GENERIC_PT_COMMON_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Generic Radix Page Table</div><div class='add'>+ *</div><div class='add'>+ * Generic Radix Page Table is a set of functions and helpers to efficiently</div><div class='add'>+ * parse radix style page tables typically seen in HW implementations. The</div><div class='add'>+ * interface is built to deliver similar code generation as the mm's pte/pmd/etc</div><div class='add'>+ * system by fully inlining the exact code required to handle each table level.</div><div class='add'>+ *</div><div class='add'>+ * Like the mm subsystem each format contributes its parsing implementation</div><div class='add'>+ * under common names and the common code implements the required algorithms.</div><div class='add'>+ *</div><div class='add'>+ * The system is divided into three logical levels:</div><div class='add'>+ *</div><div class='add'>+ *  - The page table format and its manipulation functions</div><div class='add'>+ *  - Generic helpers to give a consistent API regardless of underlying format</div><div class='add'>+ *  - An algorithm implementation (e.g. IOMMU/DRM/KVM/MM)</div><div class='add'>+ *</div><div class='add'>+ * Multiple implementations are supported. The intention is to have the generic</div><div class='add'>+ * format code be re-usable for whatever specialized implementation is required.</div><div class='add'>+ * The generic code is solely about the format of the radix tree; it does not</div><div class='add'>+ * include memory allocation or higher level decisions that are left for the</div><div class='add'>+ * implementation.</div><div class='add'>+ *</div><div class='add'>+ * The generic framework supports a superset of functions across many HW</div><div class='add'>+ * implementations:</div><div class='add'>+ *</div><div class='add'>+ *  - Entries comprised of contiguous blocks of IO PTEs for larger page sizes</div><div class='add'>+ *  - Multi-level tables, up to 6 levels. Runtime selected top level</div><div class='add'>+ *  - Runtime variable table level size (ARM's concatenated tables)</div><div class='add'>+ *  - Expandable top level allowing dynamic sizing of table levels</div><div class='add'>+ *  - Optional leaf entries at any level</div><div class='add'>+ *  - 32-bit/64-bit virtual and output addresses, using every address bit</div><div class='add'>+ *  - Dirty tracking</div><div class='add'>+ *  - Sign extended addressing</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pt_common - struct for all page table implementations</div><div class='add'>+ */</div><div class='add'>+struct pt_common {</div><div class='add'>+	/**</div><div class='add'>+	 * @top_of_table: Encodes the table top pointer and the top level in a</div><div class='add'>+	 * single value. Must use READ_ONCE/WRITE_ONCE to access it. The lower</div><div class='add'>+	 * bits of the aligned table pointer are used for the level.</div><div class='add'>+	 */</div><div class='add'>+	uintptr_t top_of_table;</div><div class='add'>+	/**</div><div class='add'>+	 * @max_oasz_lg2: Maximum number of bits the OA can contain. Upper bits</div><div class='add'>+	 * must be zero. This may be less than what the page table format</div><div class='add'>+	 * supports, but must not be more.</div><div class='add'>+	 */</div><div class='add'>+	u8 max_oasz_lg2;</div><div class='add'>+	/**</div><div class='add'>+	 * @max_vasz_lg2: Maximum number of bits the VA can contain. Upper bits</div><div class='add'>+	 * are 0 or 1 depending on pt_full_va_prefix(). This may be less than</div><div class='add'>+	 * what the page table format supports, but must not be more. When</div><div class='add'>+	 * PT_FEAT_DYNAMIC_TOP is set this reflects the maximum VA capability.</div><div class='add'>+	 */</div><div class='add'>+	u8 max_vasz_lg2;</div><div class='add'>+	/**</div><div class='add'>+	 * @features: Bitmap of `enum pt_features`</div><div class='add'>+	 */</div><div class='add'>+	unsigned int features;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Encoding parameters for top_of_table */</div><div class='add'>+enum {</div><div class='add'>+	PT_TOP_LEVEL_BITS = 3,</div><div class='add'>+	PT_TOP_LEVEL_MASK = GENMASK(PT_TOP_LEVEL_BITS - 1, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum pt_features - Features turned on in the table. Each symbol is a bit</div><div class='add'>+ * position.</div><div class='add'>+ */</div><div class='add'>+enum pt_features {</div><div class='add'>+	/**</div><div class='add'>+	 * @PT_FEAT_DMA_INCOHERENT: Cache flush page table memory before</div><div class='add'>+	 * assuming the HW can read it. Otherwise a SMP release is sufficient</div><div class='add'>+	 * for HW to read it.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_DMA_INCOHERENT,</div><div class='add'>+	/**</div><div class='add'>+	 * @PT_FEAT_FULL_VA: The table can span the full VA range from 0 to</div><div class='add'>+	 * PT_VADDR_MAX.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_FULL_VA,</div><div class='add'>+	/**</div><div class='add'>+	 * @PT_FEAT_DYNAMIC_TOP: The table's top level can be increased</div><div class='add'>+	 * dynamically during map. This requires HW support for atomically</div><div class='add'>+	 * setting both the table top pointer and the starting table level.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_DYNAMIC_TOP,</div><div class='add'>+	/**</div><div class='add'>+	 * @PT_FEAT_SIGN_EXTEND: The top most bit of the valid VA range sign</div><div class='add'>+	 * extends up to the full pt_vaddr_t. This divides the page table into</div><div class='add'>+	 * three VA ranges::</div><div class='add'>+	 *</div><div class='add'>+	 *   0         -&gt; 2^N - 1             Lower</div><div class='add'>+	 *   2^N       -&gt; (MAX - 2^N - 1)     Non-Canonical</div><div class='add'>+	 *   MAX - 2^N -&gt; MAX                 Upper</div><div class='add'>+	 *</div><div class='add'>+	 * In this mode pt_common::max_vasz_lg2 includes the sign bit and the</div><div class='add'>+	 * upper bits that don't fall within the translation are just validated.</div><div class='add'>+	 *</div><div class='add'>+	 * If not set there is no sign extension and valid VA goes from 0 to 2^N</div><div class='add'>+	 * - 1.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_SIGN_EXTEND,</div><div class='add'>+	/**</div><div class='add'>+	 * @PT_FEAT_FLUSH_RANGE: IOTLB maintenance is done by flushing IOVA</div><div class='add'>+	 * ranges which will clean out any walk cache or any IOPTE fully</div><div class='add'>+	 * contained by the range. The optimization objective is to minimize the</div><div class='add'>+	 * number of flushes even if ranges include IOVA gaps that do not need</div><div class='add'>+	 * to be flushed.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_FLUSH_RANGE,</div><div class='add'>+	/**</div><div class='add'>+	 * @PT_FEAT_FLUSH_RANGE_NO_GAPS: Like PT_FEAT_FLUSH_RANGE except that</div><div class='add'>+	 * the optimization objective is to only flush IOVA that has been</div><div class='add'>+	 * changed. This mode is suitable for cases like hypervisor shadowing</div><div class='add'>+	 * where flushing unchanged ranges may cause the hypervisor to reparse</div><div class='add'>+	 * significant amount of page table.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_FLUSH_RANGE_NO_GAPS,</div><div class='add'>+	/* private: */</div><div class='add'>+	PT_FEAT_FMT_START,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pt_amdv1 {</div><div class='add'>+	struct pt_common common;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/*</div><div class='add'>+	 * The memory backing the tables is encrypted. Use __sme_set() to adjust</div><div class='add'>+	 * the page table pointers in the tree. This only works with</div><div class='add'>+	 * CONFIG_AMD_MEM_ENCRYPT.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_AMDV1_ENCRYPT_TABLES = PT_FEAT_FMT_START,</div><div class='add'>+	/*</div><div class='add'>+	 * The PTEs are set to prevent cache incoherent traffic, such as PCI no</div><div class='add'>+	 * snoop. This is set either at creation time or before the first map</div><div class='add'>+	 * operation.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_AMDV1_FORCE_COHERENCE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pt_vtdss {</div><div class='add'>+	struct pt_common common;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/*</div><div class='add'>+	 * The PTEs are set to prevent cache incoherent traffic, such as PCI no</div><div class='add'>+	 * snoop. This is set either at creation time or before the first map</div><div class='add'>+	 * operation.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_VTDSS_FORCE_COHERENCE = PT_FEAT_FMT_START,</div><div class='add'>+	/*</div><div class='add'>+	 * Prevent creating read-only PTEs. Used to work around HW errata</div><div class='add'>+	 * ERRATA_772415_SPR17.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_VTDSS_FORCE_WRITEABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pt_x86_64 {</div><div class='add'>+	struct pt_common common;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/*</div><div class='add'>+	 * The memory backing the tables is encrypted. Use __sme_set() to adjust</div><div class='add'>+	 * the page table pointers in the tree. This only works with</div><div class='add'>+	 * CONFIG_AMD_MEM_ENCRYPT.</div><div class='add'>+	 */</div><div class='add'>+	PT_FEAT_X86_64_AMD_ENCRYPT_TABLES = PT_FEAT_FMT_START,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/generic_pt/iommu.h b/include/linux/generic_pt/iommu.h<br/>new file mode 100644<br/>index 000000000000..9eefbb74efd0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/generic_pt/iommu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/generic_pt/iommu.h</a></div><div class='hunk'>@@ -0,0 +1,293 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024-2025, NVIDIA CORPORATION &amp; AFFILIATES</div><div class='add'>+ */</div><div class='add'>+#ifndef __GENERIC_PT_IOMMU_H</div><div class='add'>+#define __GENERIC_PT_IOMMU_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/generic_pt/common.h&gt;</div><div class='add'>+#include &lt;linux/iommu.h&gt;</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+</div><div class='add'>+struct iommu_iotlb_gather;</div><div class='add'>+struct pt_iommu_ops;</div><div class='add'>+struct pt_iommu_driver_ops;</div><div class='add'>+struct iommu_dirty_bitmap;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: IOMMU Radix Page Table</div><div class='add'>+ *</div><div class='add'>+ * The IOMMU implementation of the Generic Page Table provides an ops struct</div><div class='add'>+ * that is useful to go with an iommu_domain to serve the DMA API, IOMMUFD and</div><div class='add'>+ * the generic map/unmap interface.</div><div class='add'>+ *</div><div class='add'>+ * This interface uses a caller provided locking approach. The caller must have</div><div class='add'>+ * a VA range lock concept that prevents concurrent threads from calling ops on</div><div class='add'>+ * the same VA. Generally the range lock must be at least as large as a single</div><div class='add'>+ * map call.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pt_iommu - Base structure for IOMMU page tables</div><div class='add'>+ *</div><div class='add'>+ * The format-specific struct will include this as the first member.</div><div class='add'>+ */</div><div class='add'>+struct pt_iommu {</div><div class='add'>+	/**</div><div class='add'>+	 * @domain: The core IOMMU domain. The driver should use a union to</div><div class='add'>+	 * overlay this memory with its previously existing domain struct to</div><div class='add'>+	 * create an alias.</div><div class='add'>+	 */</div><div class='add'>+	struct iommu_domain domain;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @ops: Function pointers to access the API</div><div class='add'>+	 */</div><div class='add'>+	const struct pt_iommu_ops *ops;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @driver_ops: Function pointers provided by the HW driver to help</div><div class='add'>+	 * manage HW details like caches.</div><div class='add'>+	 */</div><div class='add'>+	const struct pt_iommu_driver_ops *driver_ops;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @nid: Node ID to use for table memory allocations. The IOMMU driver</div><div class='add'>+	 * may want to set the NID to the device's NID, if there are multiple</div><div class='add'>+	 * table walkers.</div><div class='add'>+	 */</div><div class='add'>+	int nid;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @iommu_device: Device pointer used for any DMA cache flushing when</div><div class='add'>+	 * PT_FEAT_DMA_INCOHERENT. This is the iommu device that created the</div><div class='add'>+	 * page table which must have dma ops that perform cache flushing.</div><div class='add'>+	 */</div><div class='add'>+	struct device *iommu_device;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pt_iommu_info - Details about the IOMMU page table</div><div class='add'>+ *</div><div class='add'>+ * Returned from pt_iommu_ops-&gt;get_info()</div><div class='add'>+ */</div><div class='add'>+struct pt_iommu_info {</div><div class='add'>+	/**</div><div class='add'>+	 * @pgsize_bitmap: A bitmask where each set bit indicates</div><div class='add'>+	 * a page size that can be natively stored in the page table.</div><div class='add'>+	 */</div><div class='add'>+	u64 pgsize_bitmap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pt_iommu_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * @set_dirty: Make the iova write dirty</div><div class='add'>+	 * @iommu_table: Table to manipulate</div><div class='add'>+	 * @iova: IO virtual address to start</div><div class='add'>+	 *</div><div class='add'>+	 * This is only used by iommufd testing. It makes the iova dirty so that</div><div class='add'>+	 * read_and_clear_dirty() will see it as dirty. Unlike all the other ops</div><div class='add'>+	 * this one is safe to call without holding any locking. It may return</div><div class='add'>+	 * -EAGAIN if there is a race.</div><div class='add'>+	 */</div><div class='add'>+	int (*set_dirty)(struct pt_iommu *iommu_table, dma_addr_t iova);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @get_info: Return the pt_iommu_info structure</div><div class='add'>+	 * @iommu_table: Table to query</div><div class='add'>+	 *</div><div class='add'>+	 * Return some basic static information about the page table.</div><div class='add'>+	 */</div><div class='add'>+	void (*get_info)(struct pt_iommu *iommu_table,</div><div class='add'>+			 struct pt_iommu_info *info);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @deinit: Undo a format specific init operation</div><div class='add'>+	 * @iommu_table: Table to destroy</div><div class='add'>+	 *</div><div class='add'>+	 * Release all of the memory. The caller must have already removed the</div><div class='add'>+	 * table from all HW access and all caches.</div><div class='add'>+	 */</div><div class='add'>+	void (*deinit)(struct pt_iommu *iommu_table);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pt_iommu_driver_ops - HW IOTLB cache flushing operations</div><div class='add'>+ *</div><div class='add'>+ * The IOMMU driver should implement these using container_of(iommu_table) to</div><div class='add'>+ * get to it's iommu_domain derived structure. All ops can be called in atomic</div><div class='add'>+ * contexts as they are buried under DMA API calls.</div><div class='add'>+ */</div><div class='add'>+struct pt_iommu_driver_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * @change_top: Update the top of table pointer</div><div class='add'>+	 * @iommu_table: Table to operate on</div><div class='add'>+	 * @top_paddr: New CPU physical address of the top pointer</div><div class='add'>+	 * @top_level: IOMMU PT level of the new top</div><div class='add'>+	 *</div><div class='add'>+	 * Called under the get_top_lock() spinlock. The driver must update all</div><div class='add'>+	 * HW references to this domain with a new top address and</div><div class='add'>+	 * configuration. On return mappings placed in the new top must be</div><div class='add'>+	 * reachable by the HW.</div><div class='add'>+	 *</div><div class='add'>+	 * top_level encodes the level in IOMMU PT format, level 0 is the</div><div class='add'>+	 * smallest page size increasing from there. This has to be translated</div><div class='add'>+	 * to any HW specific format. During this call the new top will not be</div><div class='add'>+	 * visible to any other API.</div><div class='add'>+	 *</div><div class='add'>+	 * This op is only used by PT_FEAT_DYNAMIC_TOP, and is required if</div><div class='add'>+	 * enabled.</div><div class='add'>+	 */</div><div class='add'>+	void (*change_top)(struct pt_iommu *iommu_table, phys_addr_t top_paddr,</div><div class='add'>+			   unsigned int top_level);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @get_top_lock: lock to hold when changing the table top</div><div class='add'>+	 * @iommu_table: Table to operate on</div><div class='add'>+	 *</div><div class='add'>+	 * Return a lock to hold when changing the table top page table from</div><div class='add'>+	 * being stored in HW. The lock will be held prior to calling</div><div class='add'>+	 * change_top() and released once the top is fully visible.</div><div class='add'>+	 *</div><div class='add'>+	 * Typically this would be a lock that protects the iommu_domain's</div><div class='add'>+	 * attachment list.</div><div class='add'>+	 *</div><div class='add'>+	 * This op is only used by PT_FEAT_DYNAMIC_TOP, and is required if</div><div class='add'>+	 * enabled.</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t *(*get_top_lock)(struct pt_iommu *iommu_table);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void pt_iommu_deinit(struct pt_iommu *iommu_table)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * It is safe to call pt_iommu_deinit() before an init, or if init</div><div class='add'>+	 * fails. The ops pointer will only become non-NULL if deinit needs to be</div><div class='add'>+	 * run.</div><div class='add'>+	 */</div><div class='add'>+	if (iommu_table-&gt;ops)</div><div class='add'>+		iommu_table-&gt;ops-&gt;deinit(iommu_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pt_iommu_cfg - Common configuration values for all formats</div><div class='add'>+ */</div><div class='add'>+struct pt_iommu_cfg {</div><div class='add'>+	/**</div><div class='add'>+	 * @features: Features required. Only these features will be turned on.</div><div class='add'>+	 * The feature list should reflect what the IOMMU HW is capable of.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int features;</div><div class='add'>+	/**</div><div class='add'>+	 * @hw_max_vasz_lg2: Maximum VA the IOMMU HW can support. This will</div><div class='add'>+	 * imply the top level of the table.</div><div class='add'>+	 */</div><div class='add'>+	u8 hw_max_vasz_lg2;</div><div class='add'>+	/**</div><div class='add'>+	 * @hw_max_oasz_lg2: Maximum OA the IOMMU HW can support. The format</div><div class='add'>+	 * might select a lower maximum OA.</div><div class='add'>+	 */</div><div class='add'>+	u8 hw_max_oasz_lg2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Generate the exported function signatures from iommu_pt.h */</div><div class='add'>+#define IOMMU_PROTOTYPES(fmt)                                                  \</div><div class='add'>+	phys_addr_t pt_iommu_##fmt##_iova_to_phys(struct iommu_domain *domain, \</div><div class='add'>+						  dma_addr_t iova);            \</div><div class='add'>+	int pt_iommu_##fmt##_map_pages(struct iommu_domain *domain,            \</div><div class='add'>+				       unsigned long iova, phys_addr_t paddr,  \</div><div class='add'>+				       size_t pgsize, size_t pgcount,          \</div><div class='add'>+				       int prot, gfp_t gfp, size_t *mapped);   \</div><div class='add'>+	size_t pt_iommu_##fmt##_unmap_pages(                                   \</div><div class='add'>+		struct iommu_domain *domain, unsigned long iova,               \</div><div class='add'>+		size_t pgsize, size_t pgcount,                                 \</div><div class='add'>+		struct iommu_iotlb_gather *iotlb_gather);                      \</div><div class='add'>+	int pt_iommu_##fmt##_read_and_clear_dirty(                             \</div><div class='add'>+		struct iommu_domain *domain, unsigned long iova, size_t size,  \</div><div class='add'>+		unsigned long flags, struct iommu_dirty_bitmap *dirty);        \</div><div class='add'>+	int pt_iommu_##fmt##_init(struct pt_iommu_##fmt *table,                \</div><div class='add'>+				  const struct pt_iommu_##fmt##_cfg *cfg,      \</div><div class='add'>+				  gfp_t gfp);                                  \</div><div class='add'>+	void pt_iommu_##fmt##_hw_info(struct pt_iommu_##fmt *table,            \</div><div class='add'>+				      struct pt_iommu_##fmt##_hw_info *info)</div><div class='add'>+#define IOMMU_FORMAT(fmt, member)       \</div><div class='add'>+	struct pt_iommu_##fmt {         \</div><div class='add'>+		struct pt_iommu iommu;  \</div><div class='add'>+		struct pt_##fmt member; \</div><div class='add'>+	};                              \</div><div class='add'>+	IOMMU_PROTOTYPES(fmt)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A driver uses IOMMU_PT_DOMAIN_OPS to populate the iommu_domain_ops for the</div><div class='add'>+ * iommu_pt</div><div class='add'>+ */</div><div class='add'>+#define IOMMU_PT_DOMAIN_OPS(fmt)                        \</div><div class='add'>+	.iova_to_phys = &amp;pt_iommu_##fmt##_iova_to_phys, \</div><div class='add'>+	.map_pages = &amp;pt_iommu_##fmt##_map_pages,       \</div><div class='add'>+	.unmap_pages = &amp;pt_iommu_##fmt##_unmap_pages</div><div class='add'>+#define IOMMU_PT_DIRTY_OPS(fmt) \</div><div class='add'>+	.read_and_clear_dirty = &amp;pt_iommu_##fmt##_read_and_clear_dirty</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The driver should setup its domain struct like</div><div class='add'>+ *	union {</div><div class='add'>+ *		struct iommu_domain domain;</div><div class='add'>+ *		struct pt_iommu_xxx xx;</div><div class='add'>+ *	};</div><div class='add'>+ * PT_IOMMU_CHECK_DOMAIN(struct mock_iommu_domain, xx.iommu, domain);</div><div class='add'>+ *</div><div class='add'>+ * Which creates an alias between driver_domain.domain and</div><div class='add'>+ * driver_domain.xx.iommu.domain. This is to avoid a mass rename of existing</div><div class='add'>+ * driver_domain.domain users.</div><div class='add'>+ */</div><div class='add'>+#define PT_IOMMU_CHECK_DOMAIN(s, pt_iommu_memb, domain_memb) \</div><div class='add'>+	static_assert(offsetof(s, pt_iommu_memb.domain) ==   \</div><div class='add'>+		      offsetof(s, domain_memb))</div><div class='add'>+</div><div class='add'>+struct pt_iommu_amdv1_cfg {</div><div class='add'>+	struct pt_iommu_cfg common;</div><div class='add'>+	unsigned int starting_level;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pt_iommu_amdv1_hw_info {</div><div class='add'>+	u64 host_pt_root;</div><div class='add'>+	u8 mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+IOMMU_FORMAT(amdv1, amdpt);</div><div class='add'>+</div><div class='add'>+/* amdv1_mock is used by the iommufd selftest */</div><div class='add'>+#define pt_iommu_amdv1_mock pt_iommu_amdv1</div><div class='add'>+#define pt_iommu_amdv1_mock_cfg pt_iommu_amdv1_cfg</div><div class='add'>+struct pt_iommu_amdv1_mock_hw_info;</div><div class='add'>+IOMMU_PROTOTYPES(amdv1_mock);</div><div class='add'>+</div><div class='add'>+struct pt_iommu_vtdss_cfg {</div><div class='add'>+	struct pt_iommu_cfg common;</div><div class='add'>+	/* 4 is a 57 bit 5 level table */</div><div class='add'>+	unsigned int top_level;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pt_iommu_vtdss_hw_info {</div><div class='add'>+	u64 ssptptr;</div><div class='add'>+	u8 aw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+IOMMU_FORMAT(vtdss, vtdss_pt);</div><div class='add'>+</div><div class='add'>+struct pt_iommu_x86_64_cfg {</div><div class='add'>+	struct pt_iommu_cfg common;</div><div class='add'>+	/* 4 is a 57 bit 5 level table */</div><div class='add'>+	unsigned int top_level;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pt_iommu_x86_64_hw_info {</div><div class='add'>+	u64 gcr3_pt;</div><div class='add'>+	u8 levels;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+IOMMU_FORMAT(x86_64, x86_64_pt);</div><div class='add'>+</div><div class='add'>+#undef IOMMU_PROTOTYPES</div><div class='add'>+#undef IOMMU_FORMAT</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h<br/>deleted file mode 100644<br/>index c285968e437a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/genetlink.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/genetlink.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __LINUX_GENERIC_NETLINK_H</div><div class='del'>-#define __LINUX_GENERIC_NETLINK_H</div><div class='del'>-</div><div class='del'>-#include &lt;uapi/linux/genetlink.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* All generic netlink requests are serialized by a global lock.  */</div><div class='del'>-extern void genl_lock(void);</div><div class='del'>-extern void genl_unlock(void);</div><div class='del'>-</div><div class='del'>-/* for synchronisation between af_netlink and genetlink */</div><div class='del'>-extern atomic_t genl_sk_destructing_cnt;</div><div class='del'>-extern wait_queue_head_t genl_sk_destructing_waitq;</div><div class='del'>-</div><div class='del'>-#define MODULE_ALIAS_GENL_FAMILY(family)\</div><div class='del'>- MODULE_ALIAS_NET_PF_PROTO_NAME(PF_NETLINK, NETLINK_GENERIC, "-family-" family)</div><div class='del'>-</div><div class='del'>-#endif	/* __LINUX_GENERIC_NETLINK_H */</div><div class='head'>diff --git a/include/linux/genl_magic_struct.h b/include/linux/genl_magic_struct.h<br/>index a419d93789ff..621b87a87d74 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/genl_magic_struct.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/genl_magic_struct.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/genl_magic_struct.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/genl_magic_struct.h</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/args.h&gt;</div><div class='del'>-#include &lt;linux/genetlink.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/genetlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern int CONCATENATE(GENL_MAGIC_FAMILY, _genl_register)(void);</div><div class='ctx'> extern void CONCATENATE(GENL_MAGIC_FAMILY, _genl_unregister)(void);</div><div class='head'>diff --git a/include/linux/gfp.h b/include/linux/gfp.h<br/>index 937c2a9b6e54..b155929af5b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gfp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gfp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gfp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gfp.h</a></div><div class='hunk'>@@ -6,6 +6,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='add'>+#include &lt;linux/alloc_tag.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct vm_area_struct;</div><div class='ctx'> struct mempolicy;</div><div class='hunk'>@@ -37,6 +40,25 @@ static inline bool gfpflags_allow_blocking(const gfp_t gfp_flags)</div><div class='ctx'> 	return !!(gfp_flags &amp; __GFP_DIRECT_RECLAIM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool gfpflags_allow_spinning(const gfp_t gfp_flags)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * !__GFP_DIRECT_RECLAIM -&gt; direct claim is not allowed.</div><div class='add'>+	 * !__GFP_KSWAPD_RECLAIM -&gt; it's not safe to wake up kswapd.</div><div class='add'>+	 * All GFP_* flags including GFP_NOWAIT use one or both flags.</div><div class='add'>+	 * alloc_pages_nolock() is the only API that doesn't specify either flag.</div><div class='add'>+	 *</div><div class='add'>+	 * This is stronger than GFP_NOWAIT or GFP_ATOMIC because</div><div class='add'>+	 * those are guaranteed to never block on a sleeping lock.</div><div class='add'>+	 * Here we are enforcing that the allocation doesn't ever spin</div><div class='add'>+	 * on any locks (i.e. only trylocks). There is no high level</div><div class='add'>+	 * GFP_$FOO flag for this use in alloc_pages_nolock() as the</div><div class='add'>+	 * regular page allocator doesn't fully support this</div><div class='add'>+	 * allocation mode.</div><div class='add'>+	 */</div><div class='add'>+	return !!(gfp_flags &amp; __GFP_RECLAIM);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='ctx'> #define OPT_ZONE_HIGHMEM ZONE_HIGHMEM</div><div class='ctx'> #else</div><div class='hunk'>@@ -155,6 +177,31 @@ static inline int gfp_zonelist(gfp_t flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * gfp flag masking for nested internal allocations.</div><div class='add'>+ *</div><div class='add'>+ * For code that needs to do allocations inside the public allocation API (e.g.</div><div class='add'>+ * memory allocation tracking code) the allocations need to obey the caller</div><div class='add'>+ * allocation context constrains to prevent allocation context mismatches (e.g.</div><div class='add'>+ * GFP_KERNEL allocations in GFP_NOFS contexts) from potential deadlock</div><div class='add'>+ * situations.</div><div class='add'>+ *</div><div class='add'>+ * It is also assumed that these nested allocations are for internal kernel</div><div class='add'>+ * object storage purposes only and are not going to be used for DMA, etc. Hence</div><div class='add'>+ * we strip out all the zone information and leave just the context information</div><div class='add'>+ * intact.</div><div class='add'>+ *</div><div class='add'>+ * Further, internal allocations must fail before the higher level allocation</div><div class='add'>+ * can fail, so we must make them fail faster and fail silently. We also don't</div><div class='add'>+ * want them to deplete emergency reserves.  Hence nested allocations must be</div><div class='add'>+ * prepared for these allocations to fail.</div><div class='add'>+ */</div><div class='add'>+static inline gfp_t gfp_nested_mask(gfp_t flags)</div><div class='add'>+{</div><div class='add'>+	return ((flags &amp; (GFP_KERNEL | GFP_ATOMIC | __GFP_NOLOCKDEP)) |</div><div class='add'>+		(__GFP_NORETRY | __GFP_NOMEMALLOC | __GFP_NOWARN));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * We get the zone list from the current node and the gfp_mask.</div><div class='ctx'>  * This zone list contains a maximum of MAX_NUMNODES*MAX_NR_ZONES zones.</div><div class='ctx'>  * There are two zonelists per node, one for all zones with memory and</div><div class='hunk'>@@ -175,42 +222,42 @@ static inline void arch_free_page(struct page *page, int order) { }</div><div class='ctx'> static inline void arch_alloc_page(struct page *page, int order) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid,</div><div class='add'>+struct page *__alloc_pages_noprof(gfp_t gfp, unsigned int order, int preferred_nid,</div><div class='ctx'> 		nodemask_t *nodemask);</div><div class='del'>-struct folio *__folio_alloc(gfp_t gfp, unsigned int order, int preferred_nid,</div><div class='add'>+#define __alloc_pages(...)			alloc_hooks(__alloc_pages_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_nid,</div><div class='ctx'> 		nodemask_t *nodemask);</div><div class='add'>+#define __folio_alloc(...)			alloc_hooks(__folio_alloc_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid,</div><div class='add'>+unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid,</div><div class='ctx'> 				nodemask_t *nodemask, int nr_pages,</div><div class='del'>-				struct list_head *page_list,</div><div class='ctx'> 				struct page **page_array);</div><div class='add'>+#define __alloc_pages_bulk(...)			alloc_hooks(alloc_pages_bulk_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-unsigned long alloc_pages_bulk_array_mempolicy(gfp_t gfp,</div><div class='add'>+unsigned long alloc_pages_bulk_mempolicy_noprof(gfp_t gfp,</div><div class='ctx'> 				unsigned long nr_pages,</div><div class='ctx'> 				struct page **page_array);</div><div class='add'>+#define  alloc_pages_bulk_mempolicy(...)				\</div><div class='add'>+	alloc_hooks(alloc_pages_bulk_mempolicy_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /* Bulk allocate order-0 pages */</div><div class='del'>-static inline unsigned long</div><div class='del'>-alloc_pages_bulk_list(gfp_t gfp, unsigned long nr_pages, struct list_head *list)</div><div class='del'>-{</div><div class='del'>-	return __alloc_pages_bulk(gfp, numa_mem_id(), NULL, nr_pages, list, NULL);</div><div class='del'>-}</div><div class='add'>+#define alloc_pages_bulk(_gfp, _nr_pages, _page_array)		\</div><div class='add'>+	__alloc_pages_bulk(_gfp, numa_mem_id(), NULL, _nr_pages, _page_array)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long</div><div class='del'>-alloc_pages_bulk_array(gfp_t gfp, unsigned long nr_pages, struct page **page_array)</div><div class='del'>-{</div><div class='del'>-	return __alloc_pages_bulk(gfp, numa_mem_id(), NULL, nr_pages, NULL, page_array);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long</div><div class='del'>-alloc_pages_bulk_array_node(gfp_t gfp, int nid, unsigned long nr_pages, struct page **page_array)</div><div class='add'>+alloc_pages_bulk_node_noprof(gfp_t gfp, int nid, unsigned long nr_pages,</div><div class='add'>+				   struct page **page_array)</div><div class='ctx'> {</div><div class='ctx'> 	if (nid == NUMA_NO_NODE)</div><div class='ctx'> 		nid = numa_mem_id();</div><div class='ctx'> </div><div class='del'>-	return __alloc_pages_bulk(gfp, nid, NULL, nr_pages, NULL, page_array);</div><div class='add'>+	return alloc_pages_bulk_noprof(gfp, nid, NULL, nr_pages, page_array);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define alloc_pages_bulk_node(...)				\</div><div class='add'>+	alloc_hooks(alloc_pages_bulk_node_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='ctx'> static inline void warn_if_node_offline(int this_node, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	gfp_t warn_gfp = gfp_mask &amp; (__GFP_THISNODE|__GFP_NOWARN);</div><div class='hunk'>@@ -230,119 +277,123 @@ static inline void warn_if_node_offline(int this_node, gfp_t gfp_mask)</div><div class='ctx'>  * online. For more general interface, see alloc_pages_node().</div><div class='ctx'>  */</div><div class='ctx'> static inline struct page *</div><div class='del'>-__alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order)</div><div class='add'>+__alloc_pages_node_noprof(int nid, gfp_t gfp_mask, unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON(nid &lt; 0 || nid &gt;= MAX_NUMNODES);</div><div class='ctx'> 	warn_if_node_offline(nid, gfp_mask);</div><div class='ctx'> </div><div class='del'>-	return __alloc_pages(gfp_mask, order, nid, NULL);</div><div class='add'>+	return __alloc_pages_noprof(gfp_mask, order, nid, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define  __alloc_pages_node(...)		alloc_hooks(__alloc_pages_node_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='ctx'> static inline</div><div class='del'>-struct folio *__folio_alloc_node(gfp_t gfp, unsigned int order, int nid)</div><div class='add'>+struct folio *__folio_alloc_node_noprof(gfp_t gfp, unsigned int order, int nid)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON(nid &lt; 0 || nid &gt;= MAX_NUMNODES);</div><div class='ctx'> 	warn_if_node_offline(nid, gfp);</div><div class='ctx'> </div><div class='del'>-	return __folio_alloc(gfp, order, nid, NULL);</div><div class='add'>+	return __folio_alloc_noprof(gfp, order, nid, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define  __folio_alloc_node(...)		alloc_hooks(__folio_alloc_node_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate pages, preferring the node given as nid. When nid == NUMA_NO_NODE,</div><div class='ctx'>  * prefer the current CPU's closest node. Otherwise node must be valid and</div><div class='ctx'>  * online.</div><div class='ctx'>  */</div><div class='del'>-static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,</div><div class='del'>-						unsigned int order)</div><div class='add'>+static inline struct page *alloc_pages_node_noprof(int nid, gfp_t gfp_mask,</div><div class='add'>+						   unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	if (nid == NUMA_NO_NODE)</div><div class='ctx'> 		nid = numa_mem_id();</div><div class='ctx'> </div><div class='del'>-	return __alloc_pages_node(nid, gfp_mask, order);</div><div class='add'>+	return __alloc_pages_node_noprof(nid, gfp_mask, order);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define  alloc_pages_node(...)			alloc_hooks(alloc_pages_node_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='del'>-struct page *alloc_pages(gfp_t gfp, unsigned int order);</div><div class='del'>-struct page *alloc_pages_mpol(gfp_t gfp, unsigned int order,</div><div class='add'>+struct page *alloc_pages_noprof(gfp_t gfp, unsigned int order);</div><div class='add'>+struct folio *folio_alloc_noprof(gfp_t gfp, unsigned int order);</div><div class='add'>+struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order,</div><div class='ctx'> 		struct mempolicy *mpol, pgoff_t ilx, int nid);</div><div class='del'>-struct folio *folio_alloc(gfp_t gfp, unsigned int order);</div><div class='del'>-struct folio *vma_alloc_folio(gfp_t gfp, int order, struct vm_area_struct *vma,</div><div class='del'>-		unsigned long addr, bool hugepage);</div><div class='add'>+struct folio *vma_alloc_folio_noprof(gfp_t gfp, int order, struct vm_area_struct *vma,</div><div class='add'>+		unsigned long addr);</div><div class='ctx'> #else</div><div class='del'>-static inline struct page *alloc_pages(gfp_t gfp_mask, unsigned int order)</div><div class='add'>+static inline struct page *alloc_pages_noprof(gfp_t gfp_mask, unsigned int order)</div><div class='ctx'> {</div><div class='del'>-	return alloc_pages_node(numa_node_id(), gfp_mask, order);</div><div class='add'>+	return alloc_pages_node_noprof(numa_node_id(), gfp_mask, order);</div><div class='ctx'> }</div><div class='del'>-static inline struct page *alloc_pages_mpol(gfp_t gfp, unsigned int order,</div><div class='del'>-		struct mempolicy *mpol, pgoff_t ilx, int nid)</div><div class='add'>+static inline struct folio *folio_alloc_noprof(gfp_t gfp, unsigned int order)</div><div class='ctx'> {</div><div class='del'>-	return alloc_pages(gfp, order);</div><div class='add'>+	return __folio_alloc_node_noprof(gfp, order, numa_node_id());</div><div class='ctx'> }</div><div class='del'>-static inline struct folio *folio_alloc(gfp_t gfp, unsigned int order)</div><div class='add'>+static inline struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order,</div><div class='add'>+		struct mempolicy *mpol, pgoff_t ilx, int nid)</div><div class='ctx'> {</div><div class='del'>-	return __folio_alloc_node(gfp, order, numa_node_id());</div><div class='add'>+	return folio_alloc_noprof(gfp, order);</div><div class='ctx'> }</div><div class='del'>-#define vma_alloc_folio(gfp, order, vma, addr, hugepage)		\</div><div class='del'>-	folio_alloc(gfp, order)</div><div class='add'>+#define vma_alloc_folio_noprof(gfp, order, vma, addr)		\</div><div class='add'>+	folio_alloc_noprof(gfp, order)</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#define alloc_pages(...)			alloc_hooks(alloc_pages_noprof(__VA_ARGS__))</div><div class='add'>+#define folio_alloc(...)			alloc_hooks(folio_alloc_noprof(__VA_ARGS__))</div><div class='add'>+#define folio_alloc_mpol(...)			alloc_hooks(folio_alloc_mpol_noprof(__VA_ARGS__))</div><div class='add'>+#define vma_alloc_folio(...)			alloc_hooks(vma_alloc_folio_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='ctx'> #define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0)</div><div class='del'>-static inline struct page *alloc_page_vma(gfp_t gfp,</div><div class='add'>+</div><div class='add'>+static inline struct page *alloc_page_vma_noprof(gfp_t gfp,</div><div class='ctx'> 		struct vm_area_struct *vma, unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = vma_alloc_folio(gfp, 0, vma, addr, false);</div><div class='add'>+	struct folio *folio = vma_alloc_folio_noprof(gfp, 0, vma, addr);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;folio-&gt;page;</div><div class='ctx'> }</div><div class='add'>+#define alloc_page_vma(...)			alloc_hooks(alloc_page_vma_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);</div><div class='del'>-extern unsigned long get_zeroed_page(gfp_t gfp_mask);</div><div class='add'>+struct page *alloc_pages_nolock_noprof(gfp_t gfp_flags, int nid, unsigned int order);</div><div class='add'>+#define alloc_pages_nolock(...)			alloc_hooks(alloc_pages_nolock_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __alloc_size(1);</div><div class='del'>-void free_pages_exact(void *virt, size_t size);</div><div class='del'>-__meminit void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __alloc_size(2);</div><div class='add'>+extern unsigned long get_free_pages_noprof(gfp_t gfp_mask, unsigned int order);</div><div class='add'>+#define __get_free_pages(...)			alloc_hooks(get_free_pages_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-#define __get_free_page(gfp_mask) \</div><div class='del'>-		__get_free_pages((gfp_mask), 0)</div><div class='add'>+extern unsigned long get_zeroed_page_noprof(gfp_t gfp_mask);</div><div class='add'>+#define get_zeroed_page(...)			alloc_hooks(get_zeroed_page_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-#define __get_dma_pages(gfp_mask, order) \</div><div class='del'>-		__get_free_pages((gfp_mask) | GFP_DMA, (order))</div><div class='add'>+void *alloc_pages_exact_noprof(size_t size, gfp_t gfp_mask) __alloc_size(1);</div><div class='add'>+#define alloc_pages_exact(...)			alloc_hooks(alloc_pages_exact_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-extern void __free_pages(struct page *page, unsigned int order);</div><div class='del'>-extern void free_pages(unsigned long addr, unsigned int order);</div><div class='add'>+void free_pages_exact(void *virt, size_t size);</div><div class='ctx'> </div><div class='del'>-struct page_frag_cache;</div><div class='del'>-void page_frag_cache_drain(struct page_frag_cache *nc);</div><div class='del'>-extern void __page_frag_cache_drain(struct page *page, unsigned int count);</div><div class='del'>-void *__page_frag_alloc_align(struct page_frag_cache *nc, unsigned int fragsz,</div><div class='del'>-			      gfp_t gfp_mask, unsigned int align_mask);</div><div class='add'>+__meminit void *alloc_pages_exact_nid_noprof(int nid, size_t size, gfp_t gfp_mask) __alloc_size(2);</div><div class='add'>+#define alloc_pages_exact_nid(...)					\</div><div class='add'>+	alloc_hooks(alloc_pages_exact_nid_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-static inline void *page_frag_alloc_align(struct page_frag_cache *nc,</div><div class='del'>-					  unsigned int fragsz, gfp_t gfp_mask,</div><div class='del'>-					  unsigned int align)</div><div class='del'>-{</div><div class='del'>-	WARN_ON_ONCE(!is_power_of_2(align));</div><div class='del'>-	return __page_frag_alloc_align(nc, fragsz, gfp_mask, -align);</div><div class='del'>-}</div><div class='add'>+#define __get_free_page(gfp_mask)					\</div><div class='add'>+	__get_free_pages((gfp_mask), 0)</div><div class='ctx'> </div><div class='del'>-static inline void *page_frag_alloc(struct page_frag_cache *nc,</div><div class='del'>-			     unsigned int fragsz, gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	return __page_frag_alloc_align(nc, fragsz, gfp_mask, ~0u);</div><div class='del'>-}</div><div class='add'>+#define __get_dma_pages(gfp_mask, order)				\</div><div class='add'>+	__get_free_pages((gfp_mask) | GFP_DMA, (order))</div><div class='ctx'> </div><div class='del'>-extern void page_frag_free(void *addr);</div><div class='add'>+extern void __free_pages(struct page *page, unsigned int order);</div><div class='add'>+extern void free_pages_nolock(struct page *page, unsigned int order);</div><div class='add'>+extern void free_pages(unsigned long addr, unsigned int order);</div><div class='ctx'> </div><div class='ctx'> #define __free_page(page) __free_pages((page), 0)</div><div class='ctx'> #define free_page(addr) free_pages((addr), 0)</div><div class='ctx'> </div><div class='ctx'> void page_alloc_init_cpuhp(void);</div><div class='del'>-int decay_pcp_high(struct zone *zone, struct per_cpu_pages *pcp);</div><div class='add'>+bool decay_pcp_high(struct zone *zone, struct per_cpu_pages *pcp);</div><div class='ctx'> void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp);</div><div class='ctx'> void drain_all_pages(struct zone *zone);</div><div class='ctx'> void drain_local_pages(struct zone *zone);</div><div class='ctx'> </div><div class='ctx'> void page_alloc_init_late(void);</div><div class='del'>-void setup_pcp_cacheinfo(void);</div><div class='add'>+void setup_pcp_cacheinfo(unsigned int cpu);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * gfp_allowed_mask is set to GFP_BOOT_MASK during early boot to restrict what</div><div class='hunk'>@@ -373,12 +424,46 @@ static inline bool gfp_compaction_allowed(gfp_t gfp_mask)</div><div class='ctx'> extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CONTIG_ALLOC</div><div class='add'>+</div><div class='add'>+typedef unsigned int __bitwise acr_flags_t;</div><div class='add'>+#define ACR_FLAGS_NONE ((__force acr_flags_t)0) // ordinary allocation request</div><div class='add'>+#define ACR_FLAGS_CMA ((__force acr_flags_t)BIT(0)) // allocate for CMA</div><div class='add'>+</div><div class='ctx'> /* The below functions must be run on a range from a single zone. */</div><div class='del'>-extern int alloc_contig_range(unsigned long start, unsigned long end,</div><div class='del'>-			      unsigned migratetype, gfp_t gfp_mask);</div><div class='del'>-extern struct page *alloc_contig_pages(unsigned long nr_pages, gfp_t gfp_mask,</div><div class='del'>-				       int nid, nodemask_t *nodemask);</div><div class='add'>+extern int alloc_contig_range_noprof(unsigned long start, unsigned long end,</div><div class='add'>+				     acr_flags_t alloc_flags, gfp_t gfp_mask);</div><div class='add'>+#define alloc_contig_range(...)			alloc_hooks(alloc_contig_range_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+extern struct page *alloc_contig_pages_noprof(unsigned long nr_pages, gfp_t gfp_mask,</div><div class='add'>+					      int nid, nodemask_t *nodemask);</div><div class='add'>+#define alloc_contig_pages(...)			alloc_hooks(alloc_contig_pages_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> void free_contig_range(unsigned long pfn, unsigned long nr_pages);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CONTIG_ALLOC</div><div class='add'>+static inline struct folio *folio_alloc_gigantic_noprof(int order, gfp_t gfp,</div><div class='add'>+							int nid, nodemask_t *node)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!order || !(gfp &amp; __GFP_COMP)))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	page = alloc_contig_pages_noprof(1 &lt;&lt; order, gfp, nid, node);</div><div class='add'>+</div><div class='add'>+	return page ? page_folio(page) : NULL;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline struct folio *folio_alloc_gigantic_noprof(int order, gfp_t gfp,</div><div class='add'>+							int nid, nodemask_t *node)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+/* This should be paired with folio_put() rather than free_contig_range(). */</div><div class='add'>+#define folio_alloc_gigantic(...) alloc_hooks(folio_alloc_gigantic_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(free_page, void *, free_page((unsigned long)_T))</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_GFP_H */</div><div class='head'>diff --git a/include/linux/gfp_types.h b/include/linux/gfp_types.h<br/>index 1b6053da8754..3de43b12209e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gfp_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gfp_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gfp_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gfp_types.h</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> #ifndef __LINUX_GFP_TYPES_H</div><div class='ctx'> #define __LINUX_GFP_TYPES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='ctx'> /* The typedef is in types.h but we want the documentation here */</div><div class='ctx'> #if 0</div><div class='ctx'> /**</div><div class='hunk'>@@ -21,44 +23,80 @@ typedef unsigned int __bitwise gfp_t;</div><div class='ctx'>  * include/trace/events/mmflags.h and tools/perf/builtin-kmem.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	___GFP_DMA_BIT,</div><div class='add'>+	___GFP_HIGHMEM_BIT,</div><div class='add'>+	___GFP_DMA32_BIT,</div><div class='add'>+	___GFP_MOVABLE_BIT,</div><div class='add'>+	___GFP_RECLAIMABLE_BIT,</div><div class='add'>+	___GFP_HIGH_BIT,</div><div class='add'>+	___GFP_IO_BIT,</div><div class='add'>+	___GFP_FS_BIT,</div><div class='add'>+	___GFP_ZERO_BIT,</div><div class='add'>+	___GFP_UNUSED_BIT,	/* 0x200u unused */</div><div class='add'>+	___GFP_DIRECT_RECLAIM_BIT,</div><div class='add'>+	___GFP_KSWAPD_RECLAIM_BIT,</div><div class='add'>+	___GFP_WRITE_BIT,</div><div class='add'>+	___GFP_NOWARN_BIT,</div><div class='add'>+	___GFP_RETRY_MAYFAIL_BIT,</div><div class='add'>+	___GFP_NOFAIL_BIT,</div><div class='add'>+	___GFP_NORETRY_BIT,</div><div class='add'>+	___GFP_MEMALLOC_BIT,</div><div class='add'>+	___GFP_COMP_BIT,</div><div class='add'>+	___GFP_NOMEMALLOC_BIT,</div><div class='add'>+	___GFP_HARDWALL_BIT,</div><div class='add'>+	___GFP_THISNODE_BIT,</div><div class='add'>+	___GFP_ACCOUNT_BIT,</div><div class='add'>+	___GFP_ZEROTAGS_BIT,</div><div class='add'>+#ifdef CONFIG_KASAN_HW_TAGS</div><div class='add'>+	___GFP_SKIP_ZERO_BIT,</div><div class='add'>+	___GFP_SKIP_KASAN_BIT,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	___GFP_NOLOCKDEP_BIT,</div><div class='add'>+#endif</div><div class='add'>+	___GFP_NO_OBJ_EXT_BIT,</div><div class='add'>+	___GFP_LAST_BIT</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Plain integer GFP bitmasks. Do not use this directly. */</div><div class='del'>-#define ___GFP_DMA		0x01u</div><div class='del'>-#define ___GFP_HIGHMEM		0x02u</div><div class='del'>-#define ___GFP_DMA32		0x04u</div><div class='del'>-#define ___GFP_MOVABLE		0x08u</div><div class='del'>-#define ___GFP_RECLAIMABLE	0x10u</div><div class='del'>-#define ___GFP_HIGH		0x20u</div><div class='del'>-#define ___GFP_IO		0x40u</div><div class='del'>-#define ___GFP_FS		0x80u</div><div class='del'>-#define ___GFP_ZERO		0x100u</div><div class='add'>+#define ___GFP_DMA		BIT(___GFP_DMA_BIT)</div><div class='add'>+#define ___GFP_HIGHMEM		BIT(___GFP_HIGHMEM_BIT)</div><div class='add'>+#define ___GFP_DMA32		BIT(___GFP_DMA32_BIT)</div><div class='add'>+#define ___GFP_MOVABLE		BIT(___GFP_MOVABLE_BIT)</div><div class='add'>+#define ___GFP_RECLAIMABLE	BIT(___GFP_RECLAIMABLE_BIT)</div><div class='add'>+#define ___GFP_HIGH		BIT(___GFP_HIGH_BIT)</div><div class='add'>+#define ___GFP_IO		BIT(___GFP_IO_BIT)</div><div class='add'>+#define ___GFP_FS		BIT(___GFP_FS_BIT)</div><div class='add'>+#define ___GFP_ZERO		BIT(___GFP_ZERO_BIT)</div><div class='ctx'> /* 0x200u unused */</div><div class='del'>-#define ___GFP_DIRECT_RECLAIM	0x400u</div><div class='del'>-#define ___GFP_KSWAPD_RECLAIM	0x800u</div><div class='del'>-#define ___GFP_WRITE		0x1000u</div><div class='del'>-#define ___GFP_NOWARN		0x2000u</div><div class='del'>-#define ___GFP_RETRY_MAYFAIL	0x4000u</div><div class='del'>-#define ___GFP_NOFAIL		0x8000u</div><div class='del'>-#define ___GFP_NORETRY		0x10000u</div><div class='del'>-#define ___GFP_MEMALLOC		0x20000u</div><div class='del'>-#define ___GFP_COMP		0x40000u</div><div class='del'>-#define ___GFP_NOMEMALLOC	0x80000u</div><div class='del'>-#define ___GFP_HARDWALL		0x100000u</div><div class='del'>-#define ___GFP_THISNODE		0x200000u</div><div class='del'>-#define ___GFP_ACCOUNT		0x400000u</div><div class='del'>-#define ___GFP_ZEROTAGS		0x800000u</div><div class='add'>+#define ___GFP_DIRECT_RECLAIM	BIT(___GFP_DIRECT_RECLAIM_BIT)</div><div class='add'>+#define ___GFP_KSWAPD_RECLAIM	BIT(___GFP_KSWAPD_RECLAIM_BIT)</div><div class='add'>+#define ___GFP_WRITE		BIT(___GFP_WRITE_BIT)</div><div class='add'>+#define ___GFP_NOWARN		BIT(___GFP_NOWARN_BIT)</div><div class='add'>+#define ___GFP_RETRY_MAYFAIL	BIT(___GFP_RETRY_MAYFAIL_BIT)</div><div class='add'>+#define ___GFP_NOFAIL		BIT(___GFP_NOFAIL_BIT)</div><div class='add'>+#define ___GFP_NORETRY		BIT(___GFP_NORETRY_BIT)</div><div class='add'>+#define ___GFP_MEMALLOC		BIT(___GFP_MEMALLOC_BIT)</div><div class='add'>+#define ___GFP_COMP		BIT(___GFP_COMP_BIT)</div><div class='add'>+#define ___GFP_NOMEMALLOC	BIT(___GFP_NOMEMALLOC_BIT)</div><div class='add'>+#define ___GFP_HARDWALL		BIT(___GFP_HARDWALL_BIT)</div><div class='add'>+#define ___GFP_THISNODE		BIT(___GFP_THISNODE_BIT)</div><div class='add'>+#define ___GFP_ACCOUNT		BIT(___GFP_ACCOUNT_BIT)</div><div class='add'>+#define ___GFP_ZEROTAGS		BIT(___GFP_ZEROTAGS_BIT)</div><div class='ctx'> #ifdef CONFIG_KASAN_HW_TAGS</div><div class='del'>-#define ___GFP_SKIP_ZERO	0x1000000u</div><div class='del'>-#define ___GFP_SKIP_KASAN	0x2000000u</div><div class='add'>+#define ___GFP_SKIP_ZERO	BIT(___GFP_SKIP_ZERO_BIT)</div><div class='add'>+#define ___GFP_SKIP_KASAN	BIT(___GFP_SKIP_KASAN_BIT)</div><div class='ctx'> #else</div><div class='ctx'> #define ___GFP_SKIP_ZERO	0</div><div class='ctx'> #define ___GFP_SKIP_KASAN	0</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='del'>-#define ___GFP_NOLOCKDEP	0x4000000u</div><div class='add'>+#define ___GFP_NOLOCKDEP	BIT(___GFP_NOLOCKDEP_BIT)</div><div class='ctx'> #else</div><div class='ctx'> #define ___GFP_NOLOCKDEP	0</div><div class='ctx'> #endif</div><div class='del'>-/* If the above are modified, __GFP_BITS_SHIFT may need updating */</div><div class='add'>+#define ___GFP_NO_OBJ_EXT       BIT(___GFP_NO_OBJ_EXT_BIT)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Physical address zone modifiers (see linux/mmzone.h - low four bits)</div><div class='hunk'>@@ -99,12 +137,15 @@ typedef unsigned int __bitwise gfp_t;</div><div class='ctx'>  * node with no fallbacks or placement policy enforcements.</div><div class='ctx'>  *</div><div class='ctx'>  * %__GFP_ACCOUNT causes the allocation to be accounted to kmemcg.</div><div class='add'>+ *</div><div class='add'>+ * %__GFP_NO_OBJ_EXT causes slab allocation to have no object extension.</div><div class='ctx'>  */</div><div class='ctx'> #define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE)</div><div class='ctx'> #define __GFP_WRITE	((__force gfp_t)___GFP_WRITE)</div><div class='ctx'> #define __GFP_HARDWALL   ((__force gfp_t)___GFP_HARDWALL)</div><div class='ctx'> #define __GFP_THISNODE	((__force gfp_t)___GFP_THISNODE)</div><div class='ctx'> #define __GFP_ACCOUNT	((__force gfp_t)___GFP_ACCOUNT)</div><div class='add'>+#define __GFP_NO_OBJ_EXT   ((__force gfp_t)___GFP_NO_OBJ_EXT)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DOC: Watermark modifiers</div><div class='hunk'>@@ -168,7 +209,8 @@ typedef unsigned int __bitwise gfp_t;</div><div class='ctx'>  * the caller still has to check for failures) while costly requests try to be</div><div class='ctx'>  * not disruptive and back off even without invoking the OOM killer.</div><div class='ctx'>  * The following three modifiers might be used to override some of these</div><div class='del'>- * implicit rules.</div><div class='add'>+ * implicit rules. Please note that all of them must be used along with</div><div class='add'>+ * %__GFP_DIRECT_RECLAIM flag.</div><div class='ctx'>  *</div><div class='ctx'>  * %__GFP_NORETRY: The VM implementation will try only very lightweight</div><div class='ctx'>  * memory direct reclaim to get some memory under memory pressure (thus</div><div class='hunk'>@@ -199,11 +241,14 @@ typedef unsigned int __bitwise gfp_t;</div><div class='ctx'>  * cannot handle allocation failures. The allocation could block</div><div class='ctx'>  * indefinitely but will never return with failure. Testing for</div><div class='ctx'>  * failure is pointless.</div><div class='add'>+ * It _must_ be blockable and used together with __GFP_DIRECT_RECLAIM.</div><div class='add'>+ * It should _never_ be used in non-sleepable contexts.</div><div class='ctx'>  * New users should be evaluated carefully (and the flag should be</div><div class='ctx'>  * used only when there is no reasonable failure policy) but it is</div><div class='ctx'>  * definitely preferable to use the flag rather than opencode endless</div><div class='ctx'>  * loop around allocator.</div><div class='del'>- * Using this flag for costly allocations is _highly_ discouraged.</div><div class='add'>+ * Allocating pages from the buddy with __GFP_NOFAIL and order &gt; 1 is</div><div class='add'>+ * not supported. Please consider using kvmalloc() instead.</div><div class='ctx'>  */</div><div class='ctx'> #define __GFP_IO	((__force gfp_t)___GFP_IO)</div><div class='ctx'> #define __GFP_FS	((__force gfp_t)___GFP_FS)</div><div class='hunk'>@@ -249,7 +294,7 @@ typedef unsigned int __bitwise gfp_t;</div><div class='ctx'> #define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP)</div><div class='ctx'> </div><div class='ctx'> /* Room for N __GFP_FOO bits */</div><div class='del'>-#define __GFP_BITS_SHIFT (26 + IS_ENABLED(CONFIG_LOCKDEP))</div><div class='add'>+#define __GFP_BITS_SHIFT ___GFP_LAST_BIT</div><div class='ctx'> #define __GFP_BITS_MASK ((__force gfp_t)((1 &lt;&lt; __GFP_BITS_SHIFT) - 1))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/gpio.h b/include/linux/gpio.h<br/>index 7ecc25c543ce..8f85ddb26429 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gpio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gpio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gpio.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- * &lt;linux/gpio.h&gt;</div><div class='add'>+ * NOTE: This header *must not* be included.</div><div class='ctx'>  *</div><div class='ctx'>  * This is the LEGACY GPIO bulk include file, including legacy APIs. It is</div><div class='ctx'>  * used for GPIO drivers still referencing the global GPIO numberspace,</div><div class='hunk'>@@ -13,41 +13,20 @@</div><div class='ctx'> #define __LINUX_GPIO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#ifdef CONFIG_GPIOLIB</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-struct device;</div><div class='add'>+#ifdef CONFIG_GPIOLIB_LEGACY</div><div class='ctx'> </div><div class='del'>-/* see Documentation/driver-api/gpio/legacy.rst */</div><div class='add'>+struct device;</div><div class='ctx'> </div><div class='ctx'> /* make these flag values available regardless of GPIO kconfig options */</div><div class='del'>-#define GPIOF_DIR_OUT	(0 &lt;&lt; 0)</div><div class='del'>-#define GPIOF_DIR_IN	(1 &lt;&lt; 0)</div><div class='del'>-</div><div class='del'>-#define GPIOF_INIT_LOW	(0 &lt;&lt; 1)</div><div class='del'>-#define GPIOF_INIT_HIGH	(1 &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-#define GPIOF_IN		(GPIOF_DIR_IN)</div><div class='del'>-#define GPIOF_OUT_INIT_LOW	(GPIOF_DIR_OUT | GPIOF_INIT_LOW)</div><div class='del'>-#define GPIOF_OUT_INIT_HIGH	(GPIOF_DIR_OUT | GPIOF_INIT_HIGH)</div><div class='del'>-</div><div class='del'>-/* Gpio pin is active-low */</div><div class='del'>-#define GPIOF_ACTIVE_LOW        (1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct gpio - a structure describing a GPIO with configuration</div><div class='del'>- * @gpio:	the GPIO number</div><div class='del'>- * @flags:	GPIO configuration as specified by GPIOF_*</div><div class='del'>- * @label:	a literal description string of this GPIO</div><div class='del'>- */</div><div class='del'>-struct gpio {</div><div class='del'>-	unsigned	gpio;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	const char	*label;</div><div class='del'>-};</div><div class='add'>+#define GPIOF_IN		((1 &lt;&lt; 0))</div><div class='add'>+#define GPIOF_OUT_INIT_LOW	((0 &lt;&lt; 0) | (0 &lt;&lt; 1))</div><div class='add'>+#define GPIOF_OUT_INIT_HIGH	((0 &lt;&lt; 0) | (1 &lt;&lt; 1))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_GPIOLIB</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gpio/consumer.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * "valid" GPIO numbers are nonnegative and may be passed to</div><div class='ctx'>  * setup routines like gpio_request().  Only some valid numbers</div><div class='hunk'>@@ -68,13 +47,6 @@ static inline bool gpio_is_valid(int number)</div><div class='ctx'>  * extra memory (for code and for per-GPIO table entries).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * At the end we want all GPIOs to be dynamically allocated from 0.</div><div class='del'>- * However, some legacy drivers still perform fixed allocation.</div><div class='del'>- * Until they are all fixed, leave 0-512 space for them.</div><div class='del'>- */</div><div class='del'>-#define GPIO_DYNAMIC_BASE	512</div><div class='del'>-</div><div class='ctx'> /* Always use the library code for GPIO management calls,</div><div class='ctx'>  * or when sleeping may be involved.</div><div class='ctx'>  */</div><div class='hunk'>@@ -96,7 +68,7 @@ static inline int gpio_get_value_cansleep(unsigned gpio)</div><div class='ctx'> }</div><div class='ctx'> static inline void gpio_set_value_cansleep(unsigned gpio, int value)</div><div class='ctx'> {</div><div class='del'>-	return gpiod_set_raw_value_cansleep(gpio_to_desc(gpio), value);</div><div class='add'>+	gpiod_set_raw_value_cansleep(gpio_to_desc(gpio), value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int gpio_get_value(unsigned gpio)</div><div class='hunk'>@@ -105,7 +77,7 @@ static inline int gpio_get_value(unsigned gpio)</div><div class='ctx'> }</div><div class='ctx'> static inline void gpio_set_value(unsigned gpio, int value)</div><div class='ctx'> {</div><div class='del'>-	return gpiod_set_raw_value(gpio_to_desc(gpio), value);</div><div class='add'>+	gpiod_set_raw_value(gpio_to_desc(gpio), value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int gpio_to_irq(unsigned gpio)</div><div class='hunk'>@@ -114,12 +86,7 @@ static inline int gpio_to_irq(unsigned gpio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int gpio_request_one(unsigned gpio, unsigned long flags, const char *label);</div><div class='del'>-int gpio_request_array(const struct gpio *array, size_t num);</div><div class='del'>-void gpio_free_array(const struct gpio *array, size_t num);</div><div class='ctx'> </div><div class='del'>-/* CONFIG_GPIOLIB: bindings for managed devices that want to request gpios */</div><div class='del'>-</div><div class='del'>-int devm_gpio_request(struct device *dev, unsigned gpio, const char *label);</div><div class='ctx'> int devm_gpio_request_one(struct device *dev, unsigned gpio,</div><div class='ctx'> 			  unsigned long flags, const char *label);</div><div class='ctx'> </div><div class='hunk'>@@ -146,11 +113,6 @@ static inline int gpio_request_one(unsigned gpio,</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int gpio_request_array(const struct gpio *array, size_t num)</div><div class='del'>-{</div><div class='del'>-	return -ENOSYS;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void gpio_free(unsigned gpio)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='hunk'>@@ -159,14 +121,6 @@ static inline void gpio_free(unsigned gpio)</div><div class='ctx'> 	WARN_ON(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void gpio_free_array(const struct gpio *array, size_t num)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='del'>-</div><div class='del'>-	/* GPIO can never have been requested */</div><div class='del'>-	WARN_ON(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int gpio_direction_input(unsigned gpio)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOSYS;</div><div class='hunk'>@@ -210,13 +164,6 @@ static inline int gpio_to_irq(unsigned gpio)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int devm_gpio_request(struct device *dev, unsigned gpio,</div><div class='del'>-				    const char *label)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(1);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int devm_gpio_request_one(struct device *dev, unsigned gpio,</div><div class='ctx'> 					unsigned long flags, const char *label)</div><div class='ctx'> {</div><div class='hunk'>@@ -225,5 +172,5 @@ static inline int devm_gpio_request_one(struct device *dev, unsigned gpio,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* ! CONFIG_GPIOLIB */</div><div class='del'>-</div><div class='add'>+#endif /* CONFIG_GPIOLIB_LEGACY */</div><div class='ctx'> #endif /* __LINUX_GPIO_H */</div><div class='head'>diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h<br/>index db2dfbae8edb..cafeb7a40ad1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/consumer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/consumer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/consumer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gpio/consumer.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #define __LINUX_GPIO_CONSUMER_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct acpi_device;</div><div class='hunk'>@@ -30,6 +31,7 @@ struct gpio_descs {</div><div class='ctx'> #define GPIOD_FLAGS_BIT_DIR_OUT		BIT(1)</div><div class='ctx'> #define GPIOD_FLAGS_BIT_DIR_VAL		BIT(2)</div><div class='ctx'> #define GPIOD_FLAGS_BIT_OPEN_DRAIN	BIT(3)</div><div class='add'>+/* GPIOD_FLAGS_BIT_NONEXCLUSIVE is DEPRECATED, don't use in new code. */</div><div class='ctx'> #define GPIOD_FLAGS_BIT_NONEXCLUSIVE	BIT(4)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -110,8 +112,6 @@ int gpiod_get_direction(struct gpio_desc *desc);</div><div class='ctx'> int gpiod_direction_input(struct gpio_desc *desc);</div><div class='ctx'> int gpiod_direction_output(struct gpio_desc *desc, int value);</div><div class='ctx'> int gpiod_direction_output_raw(struct gpio_desc *desc, int value);</div><div class='del'>-int gpiod_enable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags);</div><div class='del'>-int gpiod_disable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags);</div><div class='ctx'> </div><div class='ctx'> /* Value get/set from non-sleeping context */</div><div class='ctx'> int gpiod_get_value(const struct gpio_desc *desc);</div><div class='hunk'>@@ -119,7 +119,7 @@ int gpiod_get_array_value(unsigned int array_size,</div><div class='ctx'> 			  struct gpio_desc **desc_array,</div><div class='ctx'> 			  struct gpio_array *array_info,</div><div class='ctx'> 			  unsigned long *value_bitmap);</div><div class='del'>-void gpiod_set_value(struct gpio_desc *desc, int value);</div><div class='add'>+int gpiod_set_value(struct gpio_desc *desc, int value);</div><div class='ctx'> int gpiod_set_array_value(unsigned int array_size,</div><div class='ctx'> 			  struct gpio_desc **desc_array,</div><div class='ctx'> 			  struct gpio_array *array_info,</div><div class='hunk'>@@ -129,7 +129,7 @@ int gpiod_get_raw_array_value(unsigned int array_size,</div><div class='ctx'> 			      struct gpio_desc **desc_array,</div><div class='ctx'> 			      struct gpio_array *array_info,</div><div class='ctx'> 			      unsigned long *value_bitmap);</div><div class='del'>-void gpiod_set_raw_value(struct gpio_desc *desc, int value);</div><div class='add'>+int gpiod_set_raw_value(struct gpio_desc *desc, int value);</div><div class='ctx'> int gpiod_set_raw_array_value(unsigned int array_size,</div><div class='ctx'> 			      struct gpio_desc **desc_array,</div><div class='ctx'> 			      struct gpio_array *array_info,</div><div class='hunk'>@@ -141,7 +141,7 @@ int gpiod_get_array_value_cansleep(unsigned int array_size,</div><div class='ctx'> 				   struct gpio_desc **desc_array,</div><div class='ctx'> 				   struct gpio_array *array_info,</div><div class='ctx'> 				   unsigned long *value_bitmap);</div><div class='del'>-void gpiod_set_value_cansleep(struct gpio_desc *desc, int value);</div><div class='add'>+int gpiod_set_value_cansleep(struct gpio_desc *desc, int value);</div><div class='ctx'> int gpiod_set_array_value_cansleep(unsigned int array_size,</div><div class='ctx'> 				   struct gpio_desc **desc_array,</div><div class='ctx'> 				   struct gpio_array *array_info,</div><div class='hunk'>@@ -151,7 +151,7 @@ int gpiod_get_raw_array_value_cansleep(unsigned int array_size,</div><div class='ctx'> 				       struct gpio_desc **desc_array,</div><div class='ctx'> 				       struct gpio_array *array_info,</div><div class='ctx'> 				       unsigned long *value_bitmap);</div><div class='del'>-void gpiod_set_raw_value_cansleep(struct gpio_desc *desc, int value);</div><div class='add'>+int gpiod_set_raw_value_cansleep(struct gpio_desc *desc, int value);</div><div class='ctx'> int gpiod_set_raw_array_value_cansleep(unsigned int array_size,</div><div class='ctx'> 				       struct gpio_desc **desc_array,</div><div class='ctx'> 				       struct gpio_array *array_info,</div><div class='hunk'>@@ -167,10 +167,14 @@ int gpiod_cansleep(const struct gpio_desc *desc);</div><div class='ctx'> int gpiod_to_irq(const struct gpio_desc *desc);</div><div class='ctx'> int gpiod_set_consumer_name(struct gpio_desc *desc, const char *name);</div><div class='ctx'> </div><div class='add'>+bool gpiod_is_shared(const struct gpio_desc *desc);</div><div class='add'>+</div><div class='ctx'> /* Convert between the old gpio_ and new gpiod_ interfaces */</div><div class='ctx'> struct gpio_desc *gpio_to_desc(unsigned gpio);</div><div class='ctx'> int desc_to_gpio(const struct gpio_desc *desc);</div><div class='ctx'> </div><div class='add'>+int gpiod_hwgpio(const struct gpio_desc *desc);</div><div class='add'>+</div><div class='ctx'> struct gpio_desc *fwnode_gpiod_get_index(struct fwnode_handle *fwnode,</div><div class='ctx'> 					 const char *con_id, int index,</div><div class='ctx'> 					 enum gpiod_flags flags,</div><div class='hunk'>@@ -181,13 +185,14 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,</div><div class='ctx'> 					      enum gpiod_flags flags,</div><div class='ctx'> 					      const char *label);</div><div class='ctx'> </div><div class='add'>+bool gpiod_is_equal(const struct gpio_desc *desc,</div><div class='add'>+		    const struct gpio_desc *other);</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_GPIOLIB */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/bug.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline int gpiod_count(struct device *dev, const char *con_id)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -348,18 +353,6 @@ static inline int gpiod_direction_output_raw(struct gpio_desc *desc, int value)</div><div class='ctx'> 	WARN_ON(desc);</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='del'>-static inline int gpiod_enable_hw_timestamp_ns(struct gpio_desc *desc,</div><div class='del'>-					       unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(desc);</div><div class='del'>-	return -ENOSYS;</div><div class='del'>-}</div><div class='del'>-static inline int gpiod_disable_hw_timestamp_ns(struct gpio_desc *desc,</div><div class='del'>-						unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(desc);</div><div class='del'>-	return -ENOSYS;</div><div class='del'>-}</div><div class='ctx'> static inline int gpiod_get_value(const struct gpio_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	/* GPIO can never have been requested */</div><div class='hunk'>@@ -375,10 +368,11 @@ static inline int gpiod_get_array_value(unsigned int array_size,</div><div class='ctx'> 	WARN_ON(desc_array);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline void gpiod_set_value(struct gpio_desc *desc, int value)</div><div class='add'>+static inline int gpiod_set_value(struct gpio_desc *desc, int value)</div><div class='ctx'> {</div><div class='ctx'> 	/* GPIO can never have been requested */</div><div class='ctx'> 	WARN_ON(desc);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline int gpiod_set_array_value(unsigned int array_size,</div><div class='ctx'> 					struct gpio_desc **desc_array,</div><div class='hunk'>@@ -404,10 +398,11 @@ static inline int gpiod_get_raw_array_value(unsigned int array_size,</div><div class='ctx'> 	WARN_ON(desc_array);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline void gpiod_set_raw_value(struct gpio_desc *desc, int value)</div><div class='add'>+static inline int gpiod_set_raw_value(struct gpio_desc *desc, int value)</div><div class='ctx'> {</div><div class='ctx'> 	/* GPIO can never have been requested */</div><div class='ctx'> 	WARN_ON(desc);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline int gpiod_set_raw_array_value(unsigned int array_size,</div><div class='ctx'> 					    struct gpio_desc **desc_array,</div><div class='hunk'>@@ -434,10 +429,11 @@ static inline int gpiod_get_array_value_cansleep(unsigned int array_size,</div><div class='ctx'> 	WARN_ON(desc_array);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline void gpiod_set_value_cansleep(struct gpio_desc *desc, int value)</div><div class='add'>+static inline int gpiod_set_value_cansleep(struct gpio_desc *desc, int value)</div><div class='ctx'> {</div><div class='ctx'> 	/* GPIO can never have been requested */</div><div class='ctx'> 	WARN_ON(desc);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline int gpiod_set_array_value_cansleep(unsigned int array_size,</div><div class='ctx'> 					    struct gpio_desc **desc_array,</div><div class='hunk'>@@ -463,11 +459,12 @@ static inline int gpiod_get_raw_array_value_cansleep(unsigned int array_size,</div><div class='ctx'> 	WARN_ON(desc_array);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline void gpiod_set_raw_value_cansleep(struct gpio_desc *desc,</div><div class='del'>-						int value)</div><div class='add'>+static inline int gpiod_set_raw_value_cansleep(struct gpio_desc *desc,</div><div class='add'>+					       int value)</div><div class='ctx'> {</div><div class='ctx'> 	/* GPIO can never have been requested */</div><div class='ctx'> 	WARN_ON(desc);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline int gpiod_set_raw_array_value_cansleep(unsigned int array_size,</div><div class='ctx'> 						struct gpio_desc **desc_array,</div><div class='hunk'>@@ -527,6 +524,13 @@ static inline int gpiod_set_consumer_name(struct gpio_desc *desc,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool gpiod_is_shared(const struct gpio_desc *desc)</div><div class='add'>+{</div><div class='add'>+	/* GPIO can never have been requested */</div><div class='add'>+	WARN_ON(desc);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct gpio_desc *gpio_to_desc(unsigned gpio)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -558,8 +562,40 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev,</div><div class='ctx'> 	return ERR_PTR(-ENOSYS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool</div><div class='add'>+gpiod_is_equal(const struct gpio_desc *desc, const struct gpio_desc *other)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(desc || other);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_GPIOLIB */</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_GPIOLIB) &amp;&amp; IS_ENABLED(CONFIG_HTE)</div><div class='add'>+int gpiod_enable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags);</div><div class='add'>+int gpiod_disable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags);</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int gpiod_enable_hw_timestamp_ns(struct gpio_desc *desc,</div><div class='add'>+					       unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_GPIOLIB))</div><div class='add'>+		WARN_ON(desc);</div><div class='add'>+</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+static inline int gpiod_disable_hw_timestamp_ns(struct gpio_desc *desc,</div><div class='add'>+						unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_GPIOLIB))</div><div class='add'>+		WARN_ON(desc);</div><div class='add'>+</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_GPIOLIB &amp;&amp; CONFIG_HTE */</div><div class='add'>+</div><div class='ctx'> static inline</div><div class='ctx'> struct gpio_desc *devm_fwnode_gpiod_get(struct device *dev,</div><div class='ctx'> 					struct fwnode_handle *fwnode,</div><div class='hunk'>@@ -573,7 +609,7 @@ struct gpio_desc *devm_fwnode_gpiod_get(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> struct acpi_gpio_params {</div><div class='ctx'> 	unsigned int crs_entry_index;</div><div class='del'>-	unsigned int line_index;</div><div class='add'>+	unsigned short line_index;</div><div class='ctx'> 	bool active_low;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -608,8 +644,6 @@ int devm_acpi_dev_add_driver_gpios(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> #else  /* CONFIG_GPIOLIB &amp;&amp; CONFIG_ACPI */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev,</div><div class='ctx'> 			      const struct acpi_gpio_mapping *gpios)</div><div class='ctx'> {</div><div class='hunk'>@@ -635,8 +669,6 @@ void gpiod_unexport(struct gpio_desc *desc);</div><div class='ctx'> </div><div class='ctx'> #else  /* CONFIG_GPIOLIB &amp;&amp; CONFIG_GPIO_SYSFS */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/errno.h&gt;</div><div class='del'>-</div><div class='ctx'> static inline int gpiod_export(struct gpio_desc *desc,</div><div class='ctx'> 			       bool direction_may_change)</div><div class='ctx'> {</div><div class='hunk'>@@ -655,4 +687,14 @@ static inline void gpiod_unexport(struct gpio_desc *desc)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_GPIOLIB &amp;&amp; CONFIG_GPIO_SYSFS */</div><div class='ctx'> </div><div class='add'>+static inline int gpiod_multi_set_value_cansleep(struct gpio_descs *descs,</div><div class='add'>+						 unsigned long *value_bitmap)</div><div class='add'>+{</div><div class='add'>+	if (IS_ERR_OR_NULL(descs))</div><div class='add'>+		return PTR_ERR_OR_ZERO(descs);</div><div class='add'>+</div><div class='add'>+	return gpiod_set_array_value_cansleep(descs-&gt;ndescs, descs-&gt;desc,</div><div class='add'>+					      descs-&gt;info, value_bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h<br/>index dc75f802e284..fabe2baf7b50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gpio/driver.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock_types.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/util_macros.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_GENERIC_MSI_IRQ</div><div class='ctx'> #include &lt;asm/msi.h&gt;</div><div class='hunk'>@@ -286,8 +287,9 @@ struct gpio_irq_chip {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @first:</div><div class='ctx'> 	 *</div><div class='del'>-	 * Required for static IRQ allocation. If set, irq_domain_add_simple()</div><div class='del'>-	 * will allocate and map all IRQs during initialization.</div><div class='add'>+	 * Required for static IRQ allocation. If set,</div><div class='add'>+	 * irq_domain_create_simple() will allocate and map all IRQs</div><div class='add'>+	 * during initialization.</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int first;</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +330,8 @@ struct gpio_irq_chip {</div><div class='ctx'>  * @fwnode: optional fwnode providing this controller's properties</div><div class='ctx'>  * @owner: helps prevent removal of modules exporting active GPIOs</div><div class='ctx'>  * @request: optional hook for chip-specific activation, such as</div><div class='del'>- *	enabling module power and clock; may sleep</div><div class='add'>+ *	enabling module power and clock; may sleep; must return 0 on success</div><div class='add'>+ *	or negative error number on failure</div><div class='ctx'>  * @free: optional hook for chip-specific deactivation, such as</div><div class='ctx'>  *	disabling module power and clock; may sleep</div><div class='ctx'>  * @get_direction: returns direction for signal "offset", 0=out, 1=in,</div><div class='hunk'>@@ -344,10 +347,13 @@ struct gpio_irq_chip {</div><div class='ctx'>  * @get: returns value for signal "offset", 0=low, 1=high, or negative error</div><div class='ctx'>  * @get_multiple: reads values for multiple signals defined by "mask" and</div><div class='ctx'>  *	stores them in "bits", returns 0 on success or negative error</div><div class='del'>- * @set: assigns output value for signal "offset"</div><div class='del'>- * @set_multiple: assigns output values for multiple signals defined by "mask"</div><div class='add'>+ * @set: assigns output value for signal "offset", returns 0 on success or</div><div class='add'>+ *       negative error value</div><div class='add'>+ * @set_multiple: assigns output values for multiple signals defined by</div><div class='add'>+ *                "mask", returns 0 on success or negative error value</div><div class='ctx'>  * @set_config: optional hook for all kinds of settings. Uses the same</div><div class='del'>- *	packed config format as generic pinconf.</div><div class='add'>+ *	packed config format as generic pinconf. Must return 0 on success and</div><div class='add'>+ *	a negative error number on failure.</div><div class='ctx'>  * @to_irq: optional hook supporting non-static gpiod_to_irq() mappings;</div><div class='ctx'>  *	implementation may not sleep</div><div class='ctx'>  * @dbg_show: optional routine to show contents in debugfs; default code</div><div class='hunk'>@@ -376,35 +382,12 @@ struct gpio_irq_chip {</div><div class='ctx'>  * @names: if set, must be an array of strings to use as alternative</div><div class='ctx'>  *      names for the GPIOs in this chip. Any entry in the array</div><div class='ctx'>  *      may be NULL if there is no alias for the GPIO, however the</div><div class='del'>- *      array must be @ngpio entries long.  A name can include a single printk</div><div class='del'>- *      format specifier for an unsigned int.  It is substituted by the actual</div><div class='del'>- *      number of the gpio.</div><div class='add'>+ *      array must be @ngpio entries long.</div><div class='ctx'>  * @can_sleep: flag must be set iff get()/set() methods sleep, as they</div><div class='ctx'>  *	must while accessing GPIO expander chips over I2C or SPI. This</div><div class='ctx'>  *	implies that if the chip supports IRQs, these IRQs need to be threaded</div><div class='ctx'>  *	as the chip access may sleep when e.g. reading out the IRQ status</div><div class='ctx'>  *	registers.</div><div class='del'>- * @read_reg: reader function for generic GPIO</div><div class='del'>- * @write_reg: writer function for generic GPIO</div><div class='del'>- * @be_bits: if the generic GPIO has big endian bit order (bit 31 is representing</div><div class='del'>- *	line 0, bit 30 is line 1 ... bit 0 is line 31) this is set to true by the</div><div class='del'>- *	generic GPIO core. It is for internal housekeeping only.</div><div class='del'>- * @reg_dat: data (in) register for generic GPIO</div><div class='del'>- * @reg_set: output set register (out=high) for generic GPIO</div><div class='del'>- * @reg_clr: output clear register (out=low) for generic GPIO</div><div class='del'>- * @reg_dir_out: direction out setting register for generic GPIO</div><div class='del'>- * @reg_dir_in: direction in setting register for generic GPIO</div><div class='del'>- * @bgpio_dir_unreadable: indicates that the direction register(s) cannot</div><div class='del'>- *	be read and we need to rely on out internal state tracking.</div><div class='del'>- * @bgpio_bits: number of register bits used for a generic GPIO i.e.</div><div class='del'>- *	&lt;register width&gt; * 8</div><div class='del'>- * @bgpio_lock: used to lock chip-&gt;bgpio_data. Also, this is needed to keep</div><div class='del'>- *	shadowed and real data registers writes together.</div><div class='del'>- * @bgpio_data:	shadowed data register for generic GPIO to clear/set bits</div><div class='del'>- *	safely.</div><div class='del'>- * @bgpio_dir: shadowed direction register for generic GPIO to clear/set</div><div class='del'>- *	direction safely. A "1" in this word means the line is set as</div><div class='del'>- *	output.</div><div class='ctx'>  *</div><div class='ctx'>  * A gpio_chip can help platforms abstract various sources of GPIOs so</div><div class='ctx'>  * they can all be accessed through a common programming interface.</div><div class='hunk'>@@ -438,9 +421,9 @@ struct gpio_chip {</div><div class='ctx'> 	int			(*get_multiple)(struct gpio_chip *gc,</div><div class='ctx'> 						unsigned long *mask,</div><div class='ctx'> 						unsigned long *bits);</div><div class='del'>-	void			(*set)(struct gpio_chip *gc,</div><div class='del'>-						unsigned int offset, int value);</div><div class='del'>-	void			(*set_multiple)(struct gpio_chip *gc,</div><div class='add'>+	int			(*set)(struct gpio_chip *gc,</div><div class='add'>+				       unsigned int offset, int value);</div><div class='add'>+	int			(*set_multiple)(struct gpio_chip *gc,</div><div class='ctx'> 						unsigned long *mask,</div><div class='ctx'> 						unsigned long *bits);</div><div class='ctx'> 	int			(*set_config)(struct gpio_chip *gc,</div><div class='hunk'>@@ -470,22 +453,6 @@ struct gpio_chip {</div><div class='ctx'> 	const char		*const *names;</div><div class='ctx'> 	bool			can_sleep;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_GPIO_GENERIC)</div><div class='del'>-	unsigned long (*read_reg)(void __iomem *reg);</div><div class='del'>-	void (*write_reg)(void __iomem *reg, unsigned long data);</div><div class='del'>-	bool be_bits;</div><div class='del'>-	void __iomem *reg_dat;</div><div class='del'>-	void __iomem *reg_set;</div><div class='del'>-	void __iomem *reg_clr;</div><div class='del'>-	void __iomem *reg_dir_out;</div><div class='del'>-	void __iomem *reg_dir_in;</div><div class='del'>-	bool bgpio_dir_unreadable;</div><div class='del'>-	int bgpio_bits;</div><div class='del'>-	raw_spinlock_t bgpio_lock;</div><div class='del'>-	unsigned long bgpio_data;</div><div class='del'>-	unsigned long bgpio_dir;</div><div class='del'>-#endif /* CONFIG_GPIO_GENERIC */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_GPIOLIB_IRQCHIP</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib</div><div class='hunk'>@@ -501,14 +468,6 @@ struct gpio_chip {</div><div class='ctx'> 	struct gpio_irq_chip irq;</div><div class='ctx'> #endif /* CONFIG_GPIOLIB_IRQCHIP */</div><div class='ctx'> </div><div class='del'>-	/**</div><div class='del'>-	 * @valid_mask:</div><div class='del'>-	 *</div><div class='del'>-	 * If not %NULL, holds bitmask of GPIOs which are valid to be used</div><div class='del'>-	 * from the chip.</div><div class='del'>-	 */</div><div class='del'>-	unsigned long *valid_mask;</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_OF_GPIO)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If CONFIG_OF_GPIO is enabled, then all GPIO controllers described in</div><div class='hunk'>@@ -518,11 +477,33 @@ struct gpio_chip {</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @of_gpio_n_cells:</div><div class='ctx'> 	 *</div><div class='del'>-	 * Number of cells used to form the GPIO specifier.</div><div class='add'>+	 * Number of cells used to form the GPIO specifier. The standard is 2</div><div class='add'>+	 * cells:</div><div class='add'>+	 *</div><div class='add'>+	 * gpios = &lt;&amp;gpio offset flags&gt;;</div><div class='add'>+	 *</div><div class='add'>+	 * some complex GPIO controllers instantiate more than one chip per</div><div class='add'>+	 * device tree node and have 3 cells:</div><div class='add'>+	 *</div><div class='add'>+	 * gpios = &lt;&amp;gpio instance offset flags&gt;;</div><div class='add'>+	 *</div><div class='add'>+	 * Legacy GPIO controllers may even have 1 cell:</div><div class='add'>+	 *</div><div class='add'>+	 * gpios = &lt;&amp;gpio offset&gt;;</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int of_gpio_n_cells;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @of_node_instance_match:</div><div class='add'>+	 *</div><div class='add'>+	 * Determine if a chip is the right instance. Must be implemented by</div><div class='add'>+	 * any driver using more than one gpio_chip per device tree node.</div><div class='add'>+	 * Returns true if gc is the instance indicated by i (which is the</div><div class='add'>+	 * first cell in the phandles for GPIO lines and gpio-ranges).</div><div class='add'>+	 */</div><div class='add'>+	bool (*of_node_instance_match)(struct gpio_chip *gc, unsigned int i);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @of_xlate:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Callback to translate a device tree GPIO specifier into a chip-</div><div class='hunk'>@@ -552,19 +533,29 @@ DEFINE_CLASS(_gpiochip_for_each_data,</div><div class='ctx'> 	     const char **label, int *i)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * for_each_hwgpio_in_range - Iterates over all GPIOs in a given range</div><div class='add'>+ * @_chip: Chip to iterate over.</div><div class='add'>+ * @_i: Loop counter.</div><div class='add'>+ * @_base: First GPIO in the ranger.</div><div class='add'>+ * @_size: Amount of GPIOs to check starting from @base.</div><div class='add'>+ * @_label: Place to store the address of the label if the GPIO is requested.</div><div class='add'>+ *          Set to NULL for unused GPIOs.</div><div class='add'>+ */</div><div class='add'>+#define for_each_hwgpio_in_range(_chip, _i, _base, _size, _label)			\</div><div class='add'>+	for (CLASS(_gpiochip_for_each_data, _data)(&amp;_label, &amp;_i);			\</div><div class='add'>+	     _i &lt; _size;								\</div><div class='add'>+	     _i++, kfree(_label), _label = NULL)					\</div><div class='add'>+		for_each_if(!IS_ERR(_label = gpiochip_dup_line_label(_chip, _base + _i)))</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * for_each_hwgpio - Iterates over all GPIOs for given chip.</div><div class='ctx'>  * @_chip: Chip to iterate over.</div><div class='ctx'>  * @_i: Loop counter.</div><div class='ctx'>  * @_label: Place to store the address of the label if the GPIO is requested.</div><div class='ctx'>  *          Set to NULL for unused GPIOs.</div><div class='ctx'>  */</div><div class='del'>-#define for_each_hwgpio(_chip, _i, _label) \</div><div class='del'>-	for (CLASS(_gpiochip_for_each_data, _data)(&amp;_label, &amp;_i); \</div><div class='del'>-	     *_data.i &lt; _chip-&gt;ngpio; \</div><div class='del'>-	     (*_data.i)++, kfree(*(_data.label)), *_data.label = NULL) \</div><div class='del'>-		if (IS_ERR(*_data.label = \</div><div class='del'>-			gpiochip_dup_line_label(_chip, *_data.i))) {} \</div><div class='del'>-		else</div><div class='add'>+#define for_each_hwgpio(_chip, _i, _label)						\</div><div class='add'>+	for_each_hwgpio_in_range(_chip, _i, 0, _chip-&gt;ngpio, _label)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * for_each_requested_gpio_in_range - iterates over requested GPIOs in a given range</div><div class='hunk'>@@ -575,13 +566,8 @@ DEFINE_CLASS(_gpiochip_for_each_data,</div><div class='ctx'>  * @_label:	label of current GPIO</div><div class='ctx'>  */</div><div class='ctx'> #define for_each_requested_gpio_in_range(_chip, _i, _base, _size, _label)		\</div><div class='del'>-	for (CLASS(_gpiochip_for_each_data, _data)(&amp;_label, &amp;_i);			\</div><div class='del'>-	     *_data.i &lt; _size;								\</div><div class='del'>-	     (*_data.i)++, kfree(*(_data.label)), *_data.label = NULL)			\</div><div class='del'>-		if ((*_data.label =							\</div><div class='del'>-			gpiochip_dup_line_label(_chip, _base + *_data.i)) == NULL) {}	\</div><div class='del'>-		else if (IS_ERR(*_data.label)) {}					\</div><div class='del'>-		else</div><div class='add'>+	for_each_hwgpio_in_range(_chip, _i, _base, _size, _label)			\</div><div class='add'>+		for_each_if(_label)</div><div class='ctx'> </div><div class='ctx'> /* Iterates over all requested GPIO of the given @chip */</div><div class='ctx'> #define for_each_requested_gpio(chip, i, label)						\</div><div class='hunk'>@@ -634,10 +620,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,</div><div class='ctx'> 	devm_gpiochip_add_data_with_key(dev, gc, data, NULL, NULL)</div><div class='ctx'> #endif /* CONFIG_LOCKDEP */</div><div class='ctx'> </div><div class='del'>-static inline int gpiochip_add(struct gpio_chip *gc)</div><div class='del'>-{</div><div class='del'>-	return gpiochip_add_data(gc, NULL);</div><div class='del'>-}</div><div class='ctx'> void gpiochip_remove(struct gpio_chip *gc);</div><div class='ctx'> int devm_gpiochip_add_data_with_key(struct device *dev, struct gpio_chip *gc,</div><div class='ctx'> 				    void *data, struct lock_class_key *lock_key,</div><div class='hunk'>@@ -646,8 +628,6 @@ int devm_gpiochip_add_data_with_key(struct device *dev, struct gpio_chip *gc,</div><div class='ctx'> struct gpio_device *gpio_device_find(const void *data,</div><div class='ctx'> 				int (*match)(struct gpio_chip *gc,</div><div class='ctx'> 					     const void *data));</div><div class='del'>-struct gpio_device *gpio_device_find_by_label(const char *label);</div><div class='del'>-struct gpio_device *gpio_device_find_by_fwnode(const struct fwnode_handle *fwnode);</div><div class='ctx'> </div><div class='ctx'> struct gpio_device *gpio_device_get(struct gpio_device *gdev);</div><div class='ctx'> void gpio_device_put(struct gpio_device *gdev);</div><div class='hunk'>@@ -686,16 +666,11 @@ bool gpiochip_line_is_open_source(struct gpio_chip *gc, unsigned int offset);</div><div class='ctx'> /* Sleep persistence inquiry for drivers */</div><div class='ctx'> bool gpiochip_line_is_persistent(struct gpio_chip *gc, unsigned int offset);</div><div class='ctx'> bool gpiochip_line_is_valid(const struct gpio_chip *gc, unsigned int offset);</div><div class='add'>+const unsigned long *gpiochip_query_valid_mask(const struct gpio_chip *gc);</div><div class='ctx'> </div><div class='ctx'> /* get driver data */</div><div class='ctx'> void *gpiochip_get_data(struct gpio_chip *gc);</div><div class='ctx'> </div><div class='del'>-struct bgpio_pdata {</div><div class='del'>-	const char *label;</div><div class='del'>-	int base;</div><div class='del'>-	int ngpio;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY</div><div class='ctx'> </div><div class='ctx'> int gpiochip_populate_parent_fwspec_twocell(struct gpio_chip *gc,</div><div class='hunk'>@@ -709,19 +684,6 @@ int gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *gc,</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */</div><div class='ctx'> </div><div class='del'>-int bgpio_init(struct gpio_chip *gc, struct device *dev,</div><div class='del'>-	       unsigned long sz, void __iomem *dat, void __iomem *set,</div><div class='del'>-	       void __iomem *clr, void __iomem *dirout, void __iomem *dirin,</div><div class='del'>-	       unsigned long flags);</div><div class='del'>-</div><div class='del'>-#define BGPIOF_BIG_ENDIAN		BIT(0)</div><div class='del'>-#define BGPIOF_UNREADABLE_REG_SET	BIT(1) /* reg_set is unreadable */</div><div class='del'>-#define BGPIOF_UNREADABLE_REG_DIR	BIT(2) /* reg_dir is unreadable */</div><div class='del'>-#define BGPIOF_BIG_ENDIAN_BYTE_ORDER	BIT(3)</div><div class='del'>-#define BGPIOF_READ_OUTPUT_REG_SET	BIT(4) /* reg_set stores output value */</div><div class='del'>-#define BGPIOF_NO_OUTPUT		BIT(5) /* only input */</div><div class='del'>-#define BGPIOF_NO_SET_ON_INPUT		BIT(6)</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_GPIOLIB_IRQCHIP</div><div class='ctx'> int gpiochip_irqchip_add_domain(struct gpio_chip *gc,</div><div class='ctx'> 				struct irq_domain *domain);</div><div class='hunk'>@@ -756,23 +718,68 @@ struct gpio_pin_range {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PINCTRL</div><div class='ctx'> </div><div class='del'>-int gpiochip_add_pin_range(struct gpio_chip *gc, const char *pinctl_name,</div><div class='del'>-			   unsigned int gpio_offset, unsigned int pin_offset,</div><div class='del'>-			   unsigned int npins);</div><div class='add'>+int gpiochip_add_pin_range_with_pins(struct gpio_chip *gc,</div><div class='add'>+				     const char *pinctl_name,</div><div class='add'>+				     unsigned int gpio_offset,</div><div class='add'>+				     unsigned int pin_offset,</div><div class='add'>+				     unsigned int const *pins,</div><div class='add'>+				     unsigned int npins);</div><div class='ctx'> int gpiochip_add_pingroup_range(struct gpio_chip *gc,</div><div class='ctx'> 			struct pinctrl_dev *pctldev,</div><div class='ctx'> 			unsigned int gpio_offset, const char *pin_group);</div><div class='ctx'> void gpiochip_remove_pin_ranges(struct gpio_chip *gc);</div><div class='ctx'> </div><div class='add'>+static inline int</div><div class='add'>+gpiochip_add_pin_range(struct gpio_chip *gc,</div><div class='add'>+		       const char *pinctl_name,</div><div class='add'>+		       unsigned int gpio_offset,</div><div class='add'>+		       unsigned int pin_offset,</div><div class='add'>+		       unsigned int npins)</div><div class='add'>+{</div><div class='add'>+	return gpiochip_add_pin_range_with_pins(gc, pinctl_name, gpio_offset,</div><div class='add'>+						pin_offset, NULL, npins);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+gpiochip_add_sparse_pin_range(struct gpio_chip *gc,</div><div class='add'>+			      const char *pinctl_name,</div><div class='add'>+			      unsigned int gpio_offset,</div><div class='add'>+			      unsigned int const *pins,</div><div class='add'>+			      unsigned int npins)</div><div class='add'>+{</div><div class='add'>+	return gpiochip_add_pin_range_with_pins(gc, pinctl_name, gpio_offset, 0,</div><div class='add'>+						pins, npins);</div><div class='add'>+}</div><div class='ctx'> #else /* ! CONFIG_PINCTRL */</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='add'>+gpiochip_add_pin_range_with_pins(struct gpio_chip *gc,</div><div class='add'>+				 const char *pinctl_name,</div><div class='add'>+				 unsigned int gpio_offset,</div><div class='add'>+				 unsigned int pin_offset,</div><div class='add'>+				 unsigned int npins)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='ctx'> gpiochip_add_pin_range(struct gpio_chip *gc, const char *pinctl_name,</div><div class='ctx'> 		       unsigned int gpio_offset, unsigned int pin_offset,</div><div class='ctx'> 		       unsigned int npins)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+gpiochip_add_sparse_pin_range(struct gpio_chip *gc,</div><div class='add'>+			      const char *pinctl_name,</div><div class='add'>+			      unsigned int gpio_offset,</div><div class='add'>+			      unsigned int const *pins,</div><div class='add'>+			      unsigned int npins)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int</div><div class='ctx'> gpiochip_add_pingroup_range(struct gpio_chip *gc,</div><div class='ctx'> 			struct pinctrl_dev *pctldev,</div><div class='hunk'>@@ -795,7 +802,6 @@ struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc,</div><div class='ctx'> 					    enum gpiod_flags dflags);</div><div class='ctx'> void gpiochip_free_own_desc(struct gpio_desc *desc);</div><div class='ctx'> </div><div class='del'>-struct gpio_desc *gpiochip_get_desc(struct gpio_chip *gc, unsigned int hwnum);</div><div class='ctx'> struct gpio_desc *</div><div class='ctx'> gpio_device_get_desc(struct gpio_device *gdev, unsigned int hwnum);</div><div class='ctx'> </div><div class='hunk'>@@ -814,6 +820,9 @@ struct gpio_device *gpiod_to_gpio_device(struct gpio_desc *desc);</div><div class='ctx'> int gpio_device_get_base(struct gpio_device *gdev);</div><div class='ctx'> const char *gpio_device_get_label(struct gpio_device *gdev);</div><div class='ctx'> </div><div class='add'>+struct gpio_device *gpio_device_find_by_label(const char *label);</div><div class='add'>+struct gpio_device *gpio_device_find_by_fwnode(const struct fwnode_handle *fwnode);</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_GPIOLIB */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bug.h&gt;</div><div class='hunk'>@@ -843,6 +852,18 @@ static inline const char *gpio_device_get_label(struct gpio_device *gdev)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct gpio_device *gpio_device_find_by_label(const char *label)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct gpio_device *gpio_device_find_by_fwnode(const struct fwnode_handle *fwnode)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(1);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int gpiochip_lock_as_irq(struct gpio_chip *gc,</div><div class='ctx'> 				       unsigned int offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -859,7 +880,7 @@ static inline void gpiochip_unlock_as_irq(struct gpio_chip *gc,</div><div class='ctx'> </div><div class='ctx'> #define for_each_gpiochip_node(dev, child)					\</div><div class='ctx'> 	device_for_each_child_node(dev, child)					\</div><div class='del'>-		if (!fwnode_property_present(child, "gpio-controller")) {} else</div><div class='add'>+		for_each_if(fwnode_property_present(child, "gpio-controller"))</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int gpiochip_node_count(struct device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/gpio/forwarder.h b/include/linux/gpio/forwarder.h<br/>new file mode 100644<br/>index 000000000000..ee5d8355f735<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/forwarder.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gpio/forwarder.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __LINUX_GPIO_FORWARDER_H</div><div class='add'>+#define __LINUX_GPIO_FORWARDER_H</div><div class='add'>+</div><div class='add'>+struct gpio_desc;</div><div class='add'>+struct gpio_chip;</div><div class='add'>+struct gpiochip_fwd;</div><div class='add'>+</div><div class='add'>+struct gpiochip_fwd *devm_gpiochip_fwd_alloc(struct device *dev,</div><div class='add'>+					     unsigned int ngpios);</div><div class='add'>+int gpiochip_fwd_desc_add(struct gpiochip_fwd *fwd,</div><div class='add'>+			  struct gpio_desc *desc, unsigned int offset);</div><div class='add'>+void gpiochip_fwd_desc_free(struct gpiochip_fwd *fwd, unsigned int offset);</div><div class='add'>+int gpiochip_fwd_register(struct gpiochip_fwd *fwd, void *data);</div><div class='add'>+</div><div class='add'>+struct gpio_chip *gpiochip_fwd_get_gpiochip(struct gpiochip_fwd *fwd);</div><div class='add'>+</div><div class='add'>+void *gpiochip_fwd_get_data(struct gpiochip_fwd *fwd);</div><div class='add'>+</div><div class='add'>+int gpiochip_fwd_gpio_request(struct gpiochip_fwd *fwd, unsigned int offset);</div><div class='add'>+int gpiochip_fwd_gpio_get_direction(struct gpiochip_fwd *fwd,</div><div class='add'>+				    unsigned int offset);</div><div class='add'>+int gpiochip_fwd_gpio_direction_input(struct gpiochip_fwd *fwd,</div><div class='add'>+				      unsigned int offset);</div><div class='add'>+int gpiochip_fwd_gpio_direction_output(struct gpiochip_fwd *fwd,</div><div class='add'>+				       unsigned int offset,</div><div class='add'>+				       int value);</div><div class='add'>+int gpiochip_fwd_gpio_get(struct gpiochip_fwd *fwd, unsigned int offset);</div><div class='add'>+int gpiochip_fwd_gpio_get_multiple(struct gpiochip_fwd *fwd,</div><div class='add'>+				   unsigned long *mask,</div><div class='add'>+				   unsigned long *bits);</div><div class='add'>+int gpiochip_fwd_gpio_set(struct gpiochip_fwd *fwd, unsigned int offset,</div><div class='add'>+			  int value);</div><div class='add'>+int gpiochip_fwd_gpio_set_multiple(struct gpiochip_fwd *fwd,</div><div class='add'>+				   unsigned long *mask,</div><div class='add'>+				   unsigned long *bits);</div><div class='add'>+int gpiochip_fwd_gpio_set_config(struct gpiochip_fwd *fwd, unsigned int offset,</div><div class='add'>+				 unsigned long config);</div><div class='add'>+int gpiochip_fwd_gpio_to_irq(struct gpiochip_fwd *fwd, unsigned int offset);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/gpio/generic.h b/include/linux/gpio/generic.h<br/>new file mode 100644<br/>index 000000000000..ff566dc9c3cb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/generic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gpio/generic.h</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_GPIO_GENERIC_H</div><div class='add'>+#define __LINUX_GPIO_GENERIC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+#define GPIO_GENERIC_BIG_ENDIAN			BIT(0)</div><div class='add'>+#define GPIO_GENERIC_UNREADABLE_REG_SET		BIT(1) /* reg_set is unreadable */</div><div class='add'>+#define GPIO_GENERIC_UNREADABLE_REG_DIR		BIT(2) /* reg_dir is unreadable */</div><div class='add'>+#define GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER	BIT(3)</div><div class='add'>+#define GPIO_GENERIC_READ_OUTPUT_REG_SET	BIT(4) /* reg_set stores output value */</div><div class='add'>+#define GPIO_GENERIC_NO_OUTPUT			BIT(5) /* only input */</div><div class='add'>+#define GPIO_GENERIC_NO_SET_ON_INPUT		BIT(6)</div><div class='add'>+#define GPIO_GENERIC_PINCTRL_BACKEND		BIT(7) /* Call pinctrl direction setters */</div><div class='add'>+#define GPIO_GENERIC_NO_INPUT			BIT(8) /* only output */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct gpio_generic_chip_config - Generic GPIO chip configuration data</div><div class='add'>+ * @dev: Parent device of the new GPIO chip (compulsory).</div><div class='add'>+ * @sz: Size (width) of the MMIO registers in bytes, typically 1, 2 or 4.</div><div class='add'>+ * @dat: MMIO address for the register to READ the value of the GPIO lines, it</div><div class='add'>+ *       is expected that a 1 in the corresponding bit in this register means</div><div class='add'>+ *       the line is asserted.</div><div class='add'>+ * @set: MMIO address for the register to SET the value of the GPIO lines, it</div><div class='add'>+ *       is expected that we write the line with 1 in this register to drive</div><div class='add'>+ *       the GPIO line high.</div><div class='add'>+ * @clr: MMIO address for the register to CLEAR the value of the GPIO lines,</div><div class='add'>+ *       it is expected that we write the line with 1 in this register to</div><div class='add'>+ *       drive the GPIO line low. It is allowed to leave this address as NULL,</div><div class='add'>+ *       in that case the SET register will be assumed to also clear the GPIO</div><div class='add'>+ *       lines, by actively writing the line with 0.</div><div class='add'>+ * @dirout: MMIO address for the register to set the line as OUTPUT. It is</div><div class='add'>+ *          assumed that setting a line to 1 in this register will turn that</div><div class='add'>+ *          line into an output line. Conversely, setting the line to 0 will</div><div class='add'>+ *          turn that line into an input.</div><div class='add'>+ * @dirin: MMIO address for the register to set this line as INPUT. It is</div><div class='add'>+ *         assumed that setting a line to 1 in this register will turn that</div><div class='add'>+ *         line into an input line. Conversely, setting the line to 0 will</div><div class='add'>+ *         turn that line into an output.</div><div class='add'>+ * @flags: Different flags that will affect the behaviour of the device, such</div><div class='add'>+ *         as endianness etc.</div><div class='add'>+ */</div><div class='add'>+struct gpio_generic_chip_config {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	unsigned long sz;</div><div class='add'>+	void __iomem *dat;</div><div class='add'>+	void __iomem *set;</div><div class='add'>+	void __iomem *clr;</div><div class='add'>+	void __iomem *dirout;</div><div class='add'>+	void __iomem *dirin;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct gpio_generic_chip - Generic GPIO chip implementation.</div><div class='add'>+ * @gc: The underlying struct gpio_chip object, implementing low-level GPIO</div><div class='add'>+ *      chip routines.</div><div class='add'>+ * @read_reg: reader function for generic GPIO</div><div class='add'>+ * @write_reg: writer function for generic GPIO</div><div class='add'>+ * @be_bits: if the generic GPIO has big endian bit order (bit 31 is</div><div class='add'>+ *           representing line 0, bit 30 is line 1 ... bit 0 is line 31) this</div><div class='add'>+ *           is set to true by the generic GPIO core. It is for internal</div><div class='add'>+ *           housekeeping only.</div><div class='add'>+ * @reg_dat: data (in) register for generic GPIO</div><div class='add'>+ * @reg_set: output set register (out=high) for generic GPIO</div><div class='add'>+ * @reg_clr: output clear register (out=low) for generic GPIO</div><div class='add'>+ * @reg_dir_out: direction out setting register for generic GPIO</div><div class='add'>+ * @reg_dir_in: direction in setting register for generic GPIO</div><div class='add'>+ * @dir_unreadable: indicates that the direction register(s) cannot be read and</div><div class='add'>+ *                  we need to rely on out internal state tracking.</div><div class='add'>+ * @pinctrl: the generic GPIO uses a pin control backend.</div><div class='add'>+ * @bits: number of register bits used for a generic GPIO</div><div class='add'>+ *        i.e. &lt;register width&gt; * 8</div><div class='add'>+ * @lock: used to lock chip-&gt;sdata. Also, this is needed to keep</div><div class='add'>+ *        shadowed and real data registers writes together.</div><div class='add'>+ * @sdata: shadowed data register for generic GPIO to clear/set bits safely.</div><div class='add'>+ * @sdir: shadowed direction register for generic GPIO to clear/set direction</div><div class='add'>+ *        safely. A "1" in this word means the line is set as output.</div><div class='add'>+ */</div><div class='add'>+struct gpio_generic_chip {</div><div class='add'>+	struct gpio_chip gc;</div><div class='add'>+	unsigned long (*read_reg)(void __iomem *reg);</div><div class='add'>+	void (*write_reg)(void __iomem *reg, unsigned long data);</div><div class='add'>+	bool be_bits;</div><div class='add'>+	void __iomem *reg_dat;</div><div class='add'>+	void __iomem *reg_set;</div><div class='add'>+	void __iomem *reg_clr;</div><div class='add'>+	void __iomem *reg_dir_out;</div><div class='add'>+	void __iomem *reg_dir_in;</div><div class='add'>+	bool dir_unreadable;</div><div class='add'>+	bool pinctrl;</div><div class='add'>+	int bits;</div><div class='add'>+	raw_spinlock_t lock;</div><div class='add'>+	unsigned long sdata;</div><div class='add'>+	unsigned long sdir;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct gpio_generic_chip *</div><div class='add'>+to_gpio_generic_chip(struct gpio_chip *gc)</div><div class='add'>+{</div><div class='add'>+	return container_of(gc, struct gpio_generic_chip, gc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gpio_generic_chip_init(struct gpio_generic_chip *chip,</div><div class='add'>+			   const struct gpio_generic_chip_config *cfg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * gpio_generic_chip_set() - Set the GPIO line value of the generic GPIO chip.</div><div class='add'>+ * @chip: Generic GPIO chip to use.</div><div class='add'>+ * @offset: Hardware offset of the line to set.</div><div class='add'>+ * @value: New GPIO line value.</div><div class='add'>+ *</div><div class='add'>+ * Some modules using the generic GPIO chip, need to set line values in their</div><div class='add'>+ * direction setters but they don't have access to the gpio-mmio symbols so</div><div class='add'>+ * they use the function pointer in struct gpio_chip directly. This is not</div><div class='add'>+ * optimal and can lead to crashes at run-time in some instances. This wrapper</div><div class='add'>+ * provides a safe interface for users.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, negative error number of failure.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+gpio_generic_chip_set(struct gpio_generic_chip *chip, unsigned int offset,</div><div class='add'>+		      int value)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!chip-&gt;gc.set))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return chip-&gt;gc.set(&amp;chip-&gt;gc, offset, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * gpio_generic_read_reg() - Read a register using the underlying callback.</div><div class='add'>+ * @chip: Generic GPIO chip to use.</div><div class='add'>+ * @reg: Register to read.</div><div class='add'>+ *</div><div class='add'>+ * Returns: value read from register.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+gpio_generic_read_reg(struct gpio_generic_chip *chip, void __iomem *reg)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!chip-&gt;read_reg))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return chip-&gt;read_reg(reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * gpio_generic_write_reg() - Write a register using the underlying callback.</div><div class='add'>+ * @chip: Generic GPIO chip to use.</div><div class='add'>+ * @reg: Register to write to.</div><div class='add'>+ * @val: New value to write.</div><div class='add'>+ */</div><div class='add'>+static inline void gpio_generic_write_reg(struct gpio_generic_chip *chip,</div><div class='add'>+					  void __iomem *reg, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!chip-&gt;write_reg))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	chip-&gt;write_reg(reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define gpio_generic_chip_lock(gen_gc) \</div><div class='add'>+	raw_spin_lock(&amp;(gen_gc)-&gt;lock)</div><div class='add'>+</div><div class='add'>+#define gpio_generic_chip_unlock(gen_gc) \</div><div class='add'>+	raw_spin_unlock(&amp;(gen_gc)-&gt;lock)</div><div class='add'>+</div><div class='add'>+#define gpio_generic_chip_lock_irqsave(gen_gc, flags) \</div><div class='add'>+	raw_spin_lock_irqsave(&amp;(gen_gc)-&gt;lock, flags)</div><div class='add'>+</div><div class='add'>+#define gpio_generic_chip_unlock_irqrestore(gen_gc, flags) \</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;(gen_gc)-&gt;lock, flags)</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_1(gpio_generic_lock,</div><div class='add'>+		    struct gpio_generic_chip,</div><div class='add'>+		    gpio_generic_chip_lock(_T-&gt;lock),</div><div class='add'>+		    gpio_generic_chip_unlock(_T-&gt;lock))</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_1(gpio_generic_lock_irqsave,</div><div class='add'>+		    struct gpio_generic_chip,</div><div class='add'>+		    gpio_generic_chip_lock_irqsave(_T-&gt;lock, _T-&gt;flags),</div><div class='add'>+		    gpio_generic_chip_unlock_irqrestore(_T-&gt;lock, _T-&gt;flags),</div><div class='add'>+		    unsigned long flags)</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_GPIO_GENERIC_H */</div><div class='head'>diff --git a/include/linux/gpio/gpio-nomadik.h b/include/linux/gpio/gpio-nomadik.h<br/>new file mode 100644<br/>index 000000000000..592a774a53cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/gpio-nomadik.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gpio/gpio-nomadik.h</a></div><div class='hunk'>@@ -0,0 +1,292 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __LINUX_GPIO_NOMADIK_H</div><div class='add'>+#define __LINUX_GPIO_NOMADIK_H</div><div class='add'>+</div><div class='add'>+struct fwnode_handle;</div><div class='add'>+</div><div class='add'>+/* Package definitions */</div><div class='add'>+#define PINCTRL_NMK_STN8815	0</div><div class='add'>+#define PINCTRL_NMK_DB8500	1</div><div class='add'>+</div><div class='add'>+#define GPIO_BLOCK_SHIFT 5</div><div class='add'>+#define NMK_GPIO_PER_CHIP BIT(GPIO_BLOCK_SHIFT)</div><div class='add'>+#define NMK_MAX_BANKS DIV_ROUND_UP(512, NMK_GPIO_PER_CHIP)</div><div class='add'>+</div><div class='add'>+/* Register in the logic block */</div><div class='add'>+#define NMK_GPIO_DAT	0x00</div><div class='add'>+#define NMK_GPIO_DATS	0x04</div><div class='add'>+#define NMK_GPIO_DATC	0x08</div><div class='add'>+#define NMK_GPIO_PDIS	0x0c</div><div class='add'>+#define NMK_GPIO_DIR	0x10</div><div class='add'>+#define NMK_GPIO_DIRS	0x14</div><div class='add'>+#define NMK_GPIO_DIRC	0x18</div><div class='add'>+#define NMK_GPIO_SLPC	0x1c</div><div class='add'>+#define NMK_GPIO_AFSLA	0x20</div><div class='add'>+#define NMK_GPIO_AFSLB	0x24</div><div class='add'>+#define NMK_GPIO_LOWEMI	0x28</div><div class='add'>+</div><div class='add'>+#define NMK_GPIO_RIMSC	0x40</div><div class='add'>+#define NMK_GPIO_FIMSC	0x44</div><div class='add'>+#define NMK_GPIO_IS	0x48</div><div class='add'>+#define NMK_GPIO_IC	0x4c</div><div class='add'>+#define NMK_GPIO_RWIMSC	0x50</div><div class='add'>+#define NMK_GPIO_FWIMSC	0x54</div><div class='add'>+#define NMK_GPIO_WKS	0x58</div><div class='add'>+/* These appear in DB8540 and later ASICs */</div><div class='add'>+#define NMK_GPIO_EDGELEVEL 0x5C</div><div class='add'>+#define NMK_GPIO_LEVEL	0x60</div><div class='add'>+</div><div class='add'>+/* Pull up/down values */</div><div class='add'>+enum nmk_gpio_pull {</div><div class='add'>+	NMK_GPIO_PULL_NONE,</div><div class='add'>+	NMK_GPIO_PULL_UP,</div><div class='add'>+	NMK_GPIO_PULL_DOWN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Sleep mode */</div><div class='add'>+enum nmk_gpio_slpm {</div><div class='add'>+	NMK_GPIO_SLPM_INPUT,</div><div class='add'>+	NMK_GPIO_SLPM_WAKEUP_ENABLE = NMK_GPIO_SLPM_INPUT,</div><div class='add'>+	NMK_GPIO_SLPM_NOCHANGE,</div><div class='add'>+	NMK_GPIO_SLPM_WAKEUP_DISABLE = NMK_GPIO_SLPM_NOCHANGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nmk_gpio_chip {</div><div class='add'>+	struct gpio_chip chip;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	unsigned int bank;</div><div class='add'>+	void (*set_ioforce)(bool enable);</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	bool sleepmode;</div><div class='add'>+	bool is_mobileye_soc;</div><div class='add'>+	/* Keep track of configured edges */</div><div class='add'>+	u32 edge_rising;</div><div class='add'>+	u32 edge_falling;</div><div class='add'>+	u32 real_wake;</div><div class='add'>+	u32 rwimsc;</div><div class='add'>+	u32 fwimsc;</div><div class='add'>+	u32 rimsc;</div><div class='add'>+	u32 fimsc;</div><div class='add'>+	u32 pull_up;</div><div class='add'>+	u32 lowemi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Alternate functions: function C is set in hw by setting both A and B */</div><div class='add'>+#define NMK_GPIO_ALT_GPIO	0</div><div class='add'>+#define NMK_GPIO_ALT_A	1</div><div class='add'>+#define NMK_GPIO_ALT_B	2</div><div class='add'>+#define NMK_GPIO_ALT_C	(NMK_GPIO_ALT_A | NMK_GPIO_ALT_B)</div><div class='add'>+</div><div class='add'>+#define NMK_GPIO_ALT_CX_SHIFT 2</div><div class='add'>+#define NMK_GPIO_ALT_C1	((1&lt;&lt;NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)</div><div class='add'>+#define NMK_GPIO_ALT_C2	((2&lt;&lt;NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)</div><div class='add'>+#define NMK_GPIO_ALT_C3	((3&lt;&lt;NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)</div><div class='add'>+#define NMK_GPIO_ALT_C4	((4&lt;&lt;NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)</div><div class='add'>+</div><div class='add'>+#define PRCM_GPIOCR_ALTCX(pin_num,\</div><div class='add'>+	altc1_used, altc1_ri, altc1_cb,\</div><div class='add'>+	altc2_used, altc2_ri, altc2_cb,\</div><div class='add'>+	altc3_used, altc3_ri, altc3_cb,\</div><div class='add'>+	altc4_used, altc4_ri, altc4_cb)\</div><div class='add'>+{\</div><div class='add'>+	.pin = pin_num,\</div><div class='add'>+	.altcx[PRCM_IDX_GPIOCR_ALTC1] = {\</div><div class='add'>+		.used = altc1_used,\</div><div class='add'>+		.reg_index = altc1_ri,\</div><div class='add'>+		.control_bit = altc1_cb\</div><div class='add'>+	},\</div><div class='add'>+	.altcx[PRCM_IDX_GPIOCR_ALTC2] = {\</div><div class='add'>+		.used = altc2_used,\</div><div class='add'>+		.reg_index = altc2_ri,\</div><div class='add'>+		.control_bit = altc2_cb\</div><div class='add'>+	},\</div><div class='add'>+	.altcx[PRCM_IDX_GPIOCR_ALTC3] = {\</div><div class='add'>+		.used = altc3_used,\</div><div class='add'>+		.reg_index = altc3_ri,\</div><div class='add'>+		.control_bit = altc3_cb\</div><div class='add'>+	},\</div><div class='add'>+	.altcx[PRCM_IDX_GPIOCR_ALTC4] = {\</div><div class='add'>+		.used = altc4_used,\</div><div class='add'>+		.reg_index = altc4_ri,\</div><div class='add'>+		.control_bit = altc4_cb\</div><div class='add'>+	},\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum prcm_gpiocr_reg_index</div><div class='add'>+ * Used to reference an PRCM GPIOCR register address.</div><div class='add'>+ */</div><div class='add'>+enum prcm_gpiocr_reg_index {</div><div class='add'>+	PRCM_IDX_GPIOCR1,</div><div class='add'>+	PRCM_IDX_GPIOCR2,</div><div class='add'>+	PRCM_IDX_GPIOCR3</div><div class='add'>+};</div><div class='add'>+/**</div><div class='add'>+ * enum prcm_gpiocr_altcx_index</div><div class='add'>+ * Used to reference an Other alternate-C function.</div><div class='add'>+ */</div><div class='add'>+enum prcm_gpiocr_altcx_index {</div><div class='add'>+	PRCM_IDX_GPIOCR_ALTC1,</div><div class='add'>+	PRCM_IDX_GPIOCR_ALTC2,</div><div class='add'>+	PRCM_IDX_GPIOCR_ALTC3,</div><div class='add'>+	PRCM_IDX_GPIOCR_ALTC4,</div><div class='add'>+	PRCM_IDX_GPIOCR_ALTC_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct prcm_gpio_altcx - Other alternate-C function</div><div class='add'>+ * @used: other alternate-C function availability</div><div class='add'>+ * @reg_index: PRCM GPIOCR register index used to control the function</div><div class='add'>+ * @control_bit: PRCM GPIOCR bit used to control the function</div><div class='add'>+ */</div><div class='add'>+struct prcm_gpiocr_altcx {</div><div class='add'>+	bool used:1;</div><div class='add'>+	u8 reg_index:2;</div><div class='add'>+	u8 control_bit:5;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct prcm_gpio_altcx_pin_desc - Other alternate-C pin</div><div class='add'>+ * @pin: The pin number</div><div class='add'>+ * @altcx: array of other alternate-C[1-4] functions</div><div class='add'>+ */</div><div class='add'>+struct prcm_gpiocr_altcx_pin_desc {</div><div class='add'>+	unsigned short pin;</div><div class='add'>+	struct prcm_gpiocr_altcx altcx[PRCM_IDX_GPIOCR_ALTC_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct nmk_function - Nomadik pinctrl mux function</div><div class='add'>+ * @name: The name of the function, exported to pinctrl core.</div><div class='add'>+ * @groups: An array of pin groups that may select this function.</div><div class='add'>+ * @ngroups: The number of entries in @groups.</div><div class='add'>+ */</div><div class='add'>+struct nmk_function {</div><div class='add'>+	const char *name;</div><div class='add'>+	const char * const *groups;</div><div class='add'>+	unsigned int ngroups;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct nmk_pingroup - describes a Nomadik pin group</div><div class='add'>+ * @grp: Generic data of the pin group (name and pins)</div><div class='add'>+ * @altsetting: the altsetting to apply to all pins in this group to</div><div class='add'>+ *	configure them to be used by a function</div><div class='add'>+ */</div><div class='add'>+struct nmk_pingroup {</div><div class='add'>+	struct pingroup grp;</div><div class='add'>+	int altsetting;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NMK_PIN_GROUP(a, b)							\</div><div class='add'>+	{									\</div><div class='add'>+		.grp = PINCTRL_PINGROUP(#a, a##_pins, ARRAY_SIZE(a##_pins)),	\</div><div class='add'>+		.altsetting = b,						\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct nmk_pinctrl_soc_data - Nomadik pin controller per-SoC configuration</div><div class='add'>+ * @pins:	An array describing all pins the pin controller affects.</div><div class='add'>+ *		All pins which are also GPIOs must be listed first within the</div><div class='add'>+ *		array, and be numbered identically to the GPIO controller's</div><div class='add'>+ *		numbering.</div><div class='add'>+ * @npins:	The number of entries in @pins.</div><div class='add'>+ * @functions:	The functions supported on this SoC.</div><div class='add'>+ * @nfunction:	The number of entries in @functions.</div><div class='add'>+ * @groups:	An array describing all pin groups the pin SoC supports.</div><div class='add'>+ * @ngroups:	The number of entries in @groups.</div><div class='add'>+ * @altcx_pins:	The pins that support Other alternate-C function on this SoC</div><div class='add'>+ * @npins_altcx: The number of Other alternate-C pins</div><div class='add'>+ * @prcm_gpiocr_registers: The array of PRCM GPIOCR registers on this SoC</div><div class='add'>+ */</div><div class='add'>+struct nmk_pinctrl_soc_data {</div><div class='add'>+	const struct pinctrl_pin_desc *pins;</div><div class='add'>+	unsigned int npins;</div><div class='add'>+	const struct nmk_function *functions;</div><div class='add'>+	unsigned int nfunctions;</div><div class='add'>+	const struct nmk_pingroup *groups;</div><div class='add'>+	unsigned int ngroups;</div><div class='add'>+	const struct prcm_gpiocr_altcx_pin_desc *altcx_pins;</div><div class='add'>+	unsigned int npins_altcx;</div><div class='add'>+	const u16 *prcm_gpiocr_registers;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PINCTRL_STN8815</div><div class='add'>+</div><div class='add'>+void nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PINCTRL_DB8500</div><div class='add'>+</div><div class='add'>+void nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PINCTRL_DB8540</div><div class='add'>+</div><div class='add'>+void nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct platform_device;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Symbols declared in gpio-nomadik used by pinctrl-nomadik. If pinctrl-nomadik</div><div class='add'>+ * is enabled, then gpio-nomadik is enabled as well; the reverse if not always</div><div class='add'>+ * true.</div><div class='add'>+ */</div><div class='add'>+void nmk_gpio_dbg_show_one(struct seq_file *s, struct pinctrl_dev *pctldev,</div><div class='add'>+			   struct gpio_chip *chip, unsigned int offset);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void nmk_gpio_dbg_show_one(struct seq_file *s,</div><div class='add'>+					 struct pinctrl_dev *pctldev,</div><div class='add'>+					 struct gpio_chip *chip,</div><div class='add'>+					 unsigned int offset)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __nmk_gpio_make_output(struct nmk_gpio_chip *nmk_chip,</div><div class='add'>+			    unsigned int offset, int val);</div><div class='add'>+void __nmk_gpio_set_slpm(struct nmk_gpio_chip *nmk_chip, unsigned int offset,</div><div class='add'>+			 enum nmk_gpio_slpm mode);</div><div class='add'>+struct nmk_gpio_chip *nmk_gpio_populate_chip(struct fwnode_handle *fwnode,</div><div class='add'>+					     struct platform_device *pdev);</div><div class='add'>+</div><div class='add'>+/* Symbols declared in pinctrl-nomadik used by gpio-nomadik. */</div><div class='add'>+#ifdef CONFIG_PINCTRL_NOMADIK</div><div class='add'>+extern struct nmk_gpio_chip *nmk_gpio_chips[NMK_MAX_BANKS];</div><div class='add'>+extern spinlock_t nmk_gpio_slpm_lock;</div><div class='add'>+int __maybe_unused nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev,</div><div class='add'>+					    int gpio);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_GPIO_NOMADIK_H */</div><div class='head'>diff --git a/include/linux/gpio/legacy-of-mm-gpiochip.h b/include/linux/gpio/legacy-of-mm-gpiochip.h<br/>deleted file mode 100644<br/>index 2e2bd3b19cc3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/legacy-of-mm-gpiochip.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/legacy-of-mm-gpiochip.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='del'>-/*</div><div class='del'>- * OF helpers for the old of_mm_gpio_chip, used on ppc32 and nios2,</div><div class='del'>- * do not use in new code.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2007-2008  MontaVista Software, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Anton Vorontsov &lt;avorontsov@ru.mvista.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_GPIO_LEGACY_OF_MM_GPIO_CHIP_H</div><div class='del'>-#define __LINUX_GPIO_LEGACY_OF_MM_GPIO_CHIP_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gpio/driver.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * OF GPIO chip for memory mapped banks</div><div class='del'>- */</div><div class='del'>-struct of_mm_gpio_chip {</div><div class='del'>-	struct gpio_chip gc;</div><div class='del'>-	void (*save_regs)(struct of_mm_gpio_chip *mm_gc);</div><div class='del'>-	void __iomem *regs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc)</div><div class='del'>-{</div><div class='del'>-	return container_of(gc, struct of_mm_gpio_chip, gc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern int of_mm_gpiochip_add_data(struct device_node *np,</div><div class='del'>-				   struct of_mm_gpio_chip *mm_gc,</div><div class='del'>-				   void *data);</div><div class='del'>-extern void of_mm_gpiochip_remove(struct of_mm_gpio_chip *mm_gc);</div><div class='del'>-</div><div class='del'>-#endif /* __LINUX_GPIO_LEGACY_OF_MM_GPIO_CHIP_H */</div><div class='head'>diff --git a/include/linux/gpio/property.h b/include/linux/gpio/property.h<br/>index 6c75c8bd44a0..0d2209308002 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/property.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/property.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/property.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gpio/property.h</a></div><div class='hunk'>@@ -2,10 +2,13 @@</div><div class='ctx'> #ifndef __LINUX_GPIO_PROPERTY_H</div><div class='ctx'> #define __LINUX_GPIO_PROPERTY_H</div><div class='ctx'> </div><div class='del'>-#include &lt;dt-bindings/gpio/gpio.h&gt; /* for GPIO_* flags */</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='ctx'> </div><div class='add'>+struct software_node;</div><div class='add'>+</div><div class='ctx'> #define PROPERTY_ENTRY_GPIO(_name_, _chip_node_, _idx_, _flags_) \</div><div class='ctx'> 	PROPERTY_ENTRY_REF(_name_, _chip_node_, _idx_, _flags_)</div><div class='ctx'> </div><div class='add'>+extern const struct software_node swnode_gpio_undefined;</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_GPIO_PROPERTY_H */</div><div class='head'>diff --git a/include/linux/gpio/regmap.h b/include/linux/gpio/regmap.h<br/>index a9f7b7faf57b..12d154732ca9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/regmap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/gpio/regmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/gpio/regmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/gpio/regmap.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> struct device;</div><div class='ctx'> struct fwnode_handle;</div><div class='ctx'> struct gpio_regmap;</div><div class='add'>+struct gpio_chip;</div><div class='ctx'> struct irq_domain;</div><div class='ctx'> struct regmap;</div><div class='ctx'> </div><div class='hunk'>@@ -21,7 +22,7 @@ struct regmap;</div><div class='ctx'>  *			If not given, the fwnode of the parent is used.</div><div class='ctx'>  * @label:		(Optional) Descriptive name for GPIO controller.</div><div class='ctx'>  *			If not given, the name of the device is used.</div><div class='del'>- * @ngpio:		Number of GPIOs</div><div class='add'>+ * @ngpio:		(Optional) Number of GPIOs</div><div class='ctx'>  * @names:		(Optional) Array of names for gpios</div><div class='ctx'>  * @reg_dat_base:	(Optional) (in) register base address</div><div class='ctx'>  * @reg_set_base:	(Optional) set register base address</div><div class='hunk'>@@ -30,16 +31,27 @@ struct regmap;</div><div class='ctx'>  * @reg_dir_out_base:	(Optional) out setting register base address</div><div class='ctx'>  * @reg_stride:		(Optional) May be set if the registers (of the</div><div class='ctx'>  *			same type, dat, set, etc) are not consecutive.</div><div class='del'>- * @ngpio_per_reg:	Number of GPIOs per register</div><div class='add'>+ * @ngpio_per_reg:	(Optional) Number of GPIOs per register</div><div class='ctx'>  * @irq_domain:		(Optional) IRQ domain if the controller is</div><div class='ctx'>  *			interrupt-capable</div><div class='ctx'>  * @reg_mask_xlate:     (Optional) Translates base address and GPIO</div><div class='ctx'>  *			offset to a register/bitmask pair. If not</div><div class='ctx'>  *			given the default gpio_regmap_simple_xlate()</div><div class='ctx'>  *			is used.</div><div class='add'>+ * @fixed_direction_output:</div><div class='add'>+ *			(Optional) Bitmap representing the fixed direction of</div><div class='add'>+ *			the GPIO lines. Useful when there are GPIO lines with a</div><div class='add'>+ *			fixed direction mixed together in the same register.</div><div class='ctx'>  * @drvdata:		(Optional) Pointer to driver specific data which is</div><div class='ctx'>  *			not used by gpio-remap but is provided "as is" to the</div><div class='ctx'>  *			driver callback(s).</div><div class='add'>+ * @init_valid_mask:	(Optional) Routine to initialize @valid_mask, to be used</div><div class='add'>+ *			if not all GPIOs are valid.</div><div class='add'>+ * @regmap_irq_chip:	(Optional) Pointer on an regmap_irq_chip structure. If</div><div class='add'>+ *			set, a regmap-irq device will be created and the IRQ</div><div class='add'>+ *			domain will be set accordingly.</div><div class='add'>+ * @regmap_irq_line:	(Optional) The IRQ the device uses to signal interrupts.</div><div class='add'>+ * @regmap_irq_flags:	(Optional) The IRQF_ flags to use for the interrupt.</div><div class='ctx'>  *</div><div class='ctx'>  * The -&gt;reg_mask_xlate translates a given base address and GPIO offset to</div><div class='ctx'>  * register and mask pair. The base address is one of the given register</div><div class='hunk'>@@ -77,11 +89,22 @@ struct gpio_regmap_config {</div><div class='ctx'> 	int reg_stride;</div><div class='ctx'> 	int ngpio_per_reg;</div><div class='ctx'> 	struct irq_domain *irq_domain;</div><div class='add'>+	unsigned long *fixed_direction_output;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_REGMAP_IRQ</div><div class='add'>+	struct regmap_irq_chip *regmap_irq_chip;</div><div class='add'>+	int regmap_irq_line;</div><div class='add'>+	unsigned long regmap_irq_flags;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	int (*reg_mask_xlate)(struct gpio_regmap *gpio, unsigned int base,</div><div class='ctx'> 			      unsigned int offset, unsigned int *reg,</div><div class='ctx'> 			      unsigned int *mask);</div><div class='ctx'> </div><div class='add'>+	int (*init_valid_mask)(struct gpio_chip *gc,</div><div class='add'>+			       unsigned long *valid_mask,</div><div class='add'>+			       unsigned int ngpios);</div><div class='add'>+</div><div class='ctx'> 	void *drvdata;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/greybus.h b/include/linux/greybus.h<br/>index 18c0fb958b74..4d58e27ceaf6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/greybus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/greybus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/greybus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/greybus.h</a></div><div class='hunk'>@@ -64,7 +64,7 @@ struct greybus_driver {</div><div class='ctx'> </div><div class='ctx'> 	struct device_driver driver;</div><div class='ctx'> };</div><div class='del'>-#define to_greybus_driver(d) container_of(d, struct greybus_driver, driver)</div><div class='add'>+#define to_greybus_driver(d) container_of_const(d, struct greybus_driver, driver)</div><div class='ctx'> </div><div class='ctx'> static inline void greybus_set_drvdata(struct gb_bundle *bundle, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -104,44 +104,14 @@ void gb_debugfs_init(void);</div><div class='ctx'> void gb_debugfs_cleanup(void);</div><div class='ctx'> struct dentry *gb_debugfs_get(void);</div><div class='ctx'> </div><div class='del'>-extern struct bus_type greybus_bus_type;</div><div class='add'>+extern const struct bus_type greybus_bus_type;</div><div class='ctx'> </div><div class='del'>-extern struct device_type greybus_hd_type;</div><div class='del'>-extern struct device_type greybus_module_type;</div><div class='del'>-extern struct device_type greybus_interface_type;</div><div class='del'>-extern struct device_type greybus_control_type;</div><div class='del'>-extern struct device_type greybus_bundle_type;</div><div class='del'>-extern struct device_type greybus_svc_type;</div><div class='del'>-</div><div class='del'>-static inline int is_gb_host_device(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;type == &amp;greybus_hd_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_gb_module(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;type == &amp;greybus_module_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_gb_interface(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;type == &amp;greybus_interface_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_gb_control(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;type == &amp;greybus_control_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_gb_bundle(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;type == &amp;greybus_bundle_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_gb_svc(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev-&gt;type == &amp;greybus_svc_type;</div><div class='del'>-}</div><div class='add'>+extern const struct device_type greybus_hd_type;</div><div class='add'>+extern const struct device_type greybus_module_type;</div><div class='add'>+extern const struct device_type greybus_interface_type;</div><div class='add'>+extern const struct device_type greybus_control_type;</div><div class='add'>+extern const struct device_type greybus_bundle_type;</div><div class='add'>+extern const struct device_type greybus_svc_type;</div><div class='ctx'> </div><div class='ctx'> static inline bool cport_id_valid(struct gb_host_device *hd, u16 cport_id)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/greybus/greybus_protocols.h b/include/linux/greybus/greybus_protocols.h<br/>index aeb8f9243545..820134b0105c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/greybus/greybus_protocols.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/greybus/greybus_protocols.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/greybus/greybus_protocols.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/greybus/greybus_protocols.h</a></div><div class='hunk'>@@ -232,9 +232,7 @@ struct gb_fw_download_fetch_firmware_request {</div><div class='ctx'> 	__le32			size;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct gb_fw_download_fetch_firmware_response {</div><div class='del'>-	__u8			data[0];</div><div class='del'>-} __packed;</div><div class='add'>+/* gb_fw_download_fetch_firmware_response contains no other data */</div><div class='ctx'> </div><div class='ctx'> /* firmware download release firmware request */</div><div class='ctx'> struct gb_fw_download_release_firmware_request {</div><div class='hunk'>@@ -414,9 +412,7 @@ struct gb_bootrom_get_firmware_request {</div><div class='ctx'> 	__le32			size;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct gb_bootrom_get_firmware_response {</div><div class='del'>-	__u8			data[0];</div><div class='del'>-} __packed;</div><div class='add'>+/* gb_bootrom_get_firmware_response contains no other data */</div><div class='ctx'> </div><div class='ctx'> /* Bootrom protocol Ready to boot request */</div><div class='ctx'> struct gb_bootrom_ready_to_boot_request {</div><div class='head'>diff --git a/include/linux/group_cpus.h b/include/linux/group_cpus.h<br/>index e42807ec61f6..9d4e5ab6c314 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/group_cpus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/group_cpus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/group_cpus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/group_cpus.h</a></div><div class='hunk'>@@ -9,6 +9,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-struct cpumask *group_cpus_evenly(unsigned int numgrps);</div><div class='add'>+struct cpumask *group_cpus_evenly(unsigned int numgrps, unsigned int *nummasks);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/habanalabs/cpucp_if.h b/include/linux/habanalabs/cpucp_if.h<br/>index f316c8d0f3fc..45f181bcf890 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/habanalabs/cpucp_if.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/habanalabs/cpucp_if.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/habanalabs/cpucp_if.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/habanalabs/cpucp_if.h</a></div><div class='hunk'>@@ -42,6 +42,12 @@ enum eq_event_id {</div><div class='ctx'> 	EQ_EVENT_PWR_BRK_ENTRY,</div><div class='ctx'> 	EQ_EVENT_PWR_BRK_EXIT,</div><div class='ctx'> 	EQ_EVENT_HEARTBEAT,</div><div class='add'>+	EQ_EVENT_CPLD_RESET_REASON,</div><div class='add'>+	EQ_EVENT_CPLD_SHUTDOWN,</div><div class='add'>+	EQ_EVENT_POWER_EVT_START,</div><div class='add'>+	EQ_EVENT_POWER_EVT_END,</div><div class='add'>+	EQ_EVENT_THERMAL_EVT_START,</div><div class='add'>+	EQ_EVENT_THERMAL_EVT_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -391,6 +397,9 @@ struct hl_eq_entry {</div><div class='ctx'> #define EQ_CTL_READY_SHIFT		31</div><div class='ctx'> #define EQ_CTL_READY_MASK		0x80000000</div><div class='ctx'> </div><div class='add'>+#define EQ_CTL_EVENT_MODE_SHIFT		28</div><div class='add'>+#define EQ_CTL_EVENT_MODE_MASK		0x70000000</div><div class='add'>+</div><div class='ctx'> #define EQ_CTL_EVENT_TYPE_SHIFT		16</div><div class='ctx'> #define EQ_CTL_EVENT_TYPE_MASK		0x0FFF0000</div><div class='ctx'> </div><div class='hunk'>@@ -853,9 +862,6 @@ struct cpucp_packet {</div><div class='ctx'> 		 * result cannot be used to hold general purpose data.</div><div class='ctx'> 		 */</div><div class='ctx'> 		__le32 status_mask;</div><div class='del'>-</div><div class='del'>-		/* random, used once number, for security packets */</div><div class='del'>-		__le32 nonce;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='hunk'>@@ -864,6 +870,9 @@ struct cpucp_packet {</div><div class='ctx'> </div><div class='ctx'> 		/* For Generic packet sub index */</div><div class='ctx'> 		__le32 pkt_subidx;</div><div class='add'>+</div><div class='add'>+		/* random, used once number, for security packets */</div><div class='add'>+		__le32 nonce;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1140,6 +1149,7 @@ struct cpucp_security_info {</div><div class='ctx'>  *                (0 = fully functional, 1 = lower-half is not functional,</div><div class='ctx'>  *                 2 = upper-half is not functional)</div><div class='ctx'>  * @sec_info: security information</div><div class='add'>+ * @cpld_timestamp: CPLD programmed F/W timestamp.</div><div class='ctx'>  * @pll_map: Bit map of supported PLLs for current ASIC version.</div><div class='ctx'>  * @mme_binning_mask: MME binning mask,</div><div class='ctx'>  *                    bits [0:6]   &lt;==&gt; dcore0 mme fma</div><div class='hunk'>@@ -1165,7 +1175,7 @@ struct cpucp_security_info {</div><div class='ctx'> struct cpucp_info {</div><div class='ctx'> 	struct cpucp_sensor sensors[CPUCP_MAX_SENSORS];</div><div class='ctx'> 	__u8 kernel_version[VERSION_MAX_LEN];</div><div class='del'>-	__le32 reserved;</div><div class='add'>+	__le32 reserved1;</div><div class='ctx'> 	__le32 card_type;</div><div class='ctx'> 	__le32 card_location;</div><div class='ctx'> 	__le32 cpld_version;</div><div class='hunk'>@@ -1187,7 +1197,7 @@ struct cpucp_info {</div><div class='ctx'> 	__u8 substrate_version;</div><div class='ctx'> 	__u8 eq_health_check_supported;</div><div class='ctx'> 	struct cpucp_security_info sec_info;</div><div class='del'>-	__le32 fw_hbm_region_size;</div><div class='add'>+	__le32 cpld_timestamp;</div><div class='ctx'> 	__u8 pll_map[PLL_MAP_LEN];</div><div class='ctx'> 	__le64 mme_binning_mask;</div><div class='ctx'> 	__u8 fw_os_version[VERSION_MAX_LEN];</div><div class='hunk'>@@ -1415,9 +1425,13 @@ struct cpucp_monitor_dump {</div><div class='ctx'>  * from "pkt_subidx" field in struct cpucp_packet.</div><div class='ctx'>  *</div><div class='ctx'>  * HL_PASSTHROUGHT_VERSIONS	- Fetch all firmware versions.</div><div class='add'>+ * HL_GET_ERR_COUNTERS_CMD	- Command to get error counters</div><div class='add'>+ * HL_GET_P_STATE		- get performance state</div><div class='ctx'>  */</div><div class='ctx'> enum hl_passthrough_type {</div><div class='ctx'> 	HL_PASSTHROUGH_VERSIONS,</div><div class='add'>+	HL_GET_ERR_COUNTERS_CMD,</div><div class='add'>+	HL_GET_P_STATE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* CPUCP_IF_H */</div><div class='head'>diff --git a/include/linux/habanalabs/hl_boot_if.h b/include/linux/habanalabs/hl_boot_if.h<br/>index 93366d5621fd..af5fb4ad77eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/habanalabs/hl_boot_if.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/habanalabs/hl_boot_if.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/habanalabs/hl_boot_if.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/habanalabs/hl_boot_if.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2018-2020 HabanaLabs, Ltd.</div><div class='add'>+ * Copyright 2018-2023 HabanaLabs, Ltd.</div><div class='ctx'>  * All Rights Reserved.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -49,7 +49,6 @@ enum cpu_boot_err {</div><div class='ctx'> #define CPU_BOOT_ERR_FATAL_MASK					\</div><div class='ctx'> 		((1 &lt;&lt; CPU_BOOT_ERR_DRAM_INIT_FAIL) |		\</div><div class='ctx'> 		 (1 &lt;&lt; CPU_BOOT_ERR_PLL_FAIL) |			\</div><div class='del'>-		 (1 &lt;&lt; CPU_BOOT_ERR_DEVICE_UNUSABLE_FAIL) |	\</div><div class='ctx'> 		 (1 &lt;&lt; CPU_BOOT_ERR_BINNING_FAIL) |		\</div><div class='ctx'> 		 (1 &lt;&lt; CPU_BOOT_ERR_DRAM_SKIPPED) |		\</div><div class='ctx'> 		 (1 &lt;&lt; CPU_BOOT_ERR_ENG_ARC_MEM_SCRUB_FAIL) |	\</div><div class='hunk'>@@ -194,6 +193,8 @@ enum cpu_boot_dev_sts {</div><div class='ctx'> 	CPU_BOOT_DEV_STS_FW_NIC_STAT_EXT_EN = 24,</div><div class='ctx'> 	CPU_BOOT_DEV_STS_IS_IDLE_CHECK_EN = 25,</div><div class='ctx'> 	CPU_BOOT_DEV_STS_MAP_HWMON_EN = 26,</div><div class='add'>+	CPU_BOOT_DEV_STS_NIC_MEM_CLEAR_EN = 27,</div><div class='add'>+	CPU_BOOT_DEV_STS_MMU_PGTBL_DRAM_EN = 28,</div><div class='ctx'> 	CPU_BOOT_DEV_STS_ENABLED = 31,</div><div class='ctx'> 	CPU_BOOT_DEV_STS_SCND_EN = 63,</div><div class='ctx'> 	CPU_BOOT_DEV_STS_LAST = 64 /* we have 2 registers of 32 bits */</div><div class='hunk'>@@ -294,7 +295,7 @@ enum cpu_boot_dev_sts {</div><div class='ctx'>  *					Initialized in: linux</div><div class='ctx'>  *</div><div class='ctx'>  * CPU_BOOT_DEV_STS0_GIC_PRIVILEGED_EN	GIC access permission only from</div><div class='del'>- *					previleged entity. FW sets this status</div><div class='add'>+ *					privileged entity. FW sets this status</div><div class='ctx'>  *					bit for host. If this bit is set then</div><div class='ctx'>  *					GIC can not be accessed from host.</div><div class='ctx'>  *					Initialized in: linux</div><div class='hunk'>@@ -331,6 +332,17 @@ enum cpu_boot_dev_sts {</div><div class='ctx'>  *					HWMON enum mapping to cpucp enums.</div><div class='ctx'>  *					Initialized in: linux</div><div class='ctx'>  *</div><div class='add'>+ * CPU_BOOT_DEV_STS0_NIC_MEM_CLEAR_EN</div><div class='add'>+ *					If set, means f/w supports nic hbm memory clear and</div><div class='add'>+ *					tmr,txs hbm memory init.</div><div class='add'>+ *					Initialized in: zephyr-mgmt</div><div class='add'>+ *</div><div class='add'>+ * CPU_BOOT_DEV_STS_MMU_PGTBL_DRAM_EN</div><div class='add'>+ *					MMU page tables are located in DRAM.</div><div class='add'>+ *					F/W initializes security settings for MMU</div><div class='add'>+ *					page tables to reside in DRAM.</div><div class='add'>+ *					Initialized in: zephyr-mgmt</div><div class='add'>+ *</div><div class='ctx'>  * CPU_BOOT_DEV_STS0_ENABLED		Device status register enabled.</div><div class='ctx'>  *					This is a main indication that the</div><div class='ctx'>  *					running FW populates the device status</div><div class='hunk'>@@ -367,6 +379,8 @@ enum cpu_boot_dev_sts {</div><div class='ctx'> #define CPU_BOOT_DEV_STS0_FW_NIC_STAT_EXT_EN	(1 &lt;&lt; CPU_BOOT_DEV_STS_FW_NIC_STAT_EXT_EN)</div><div class='ctx'> #define CPU_BOOT_DEV_STS0_IS_IDLE_CHECK_EN	(1 &lt;&lt; CPU_BOOT_DEV_STS_IS_IDLE_CHECK_EN)</div><div class='ctx'> #define CPU_BOOT_DEV_STS0_MAP_HWMON_EN		(1 &lt;&lt; CPU_BOOT_DEV_STS_MAP_HWMON_EN)</div><div class='add'>+#define CPU_BOOT_DEV_STS0_NIC_MEM_CLEAR_EN	(1 &lt;&lt; CPU_BOOT_DEV_STS_NIC_MEM_CLEAR_EN)</div><div class='add'>+#define CPU_BOOT_DEV_STS0_MMU_PGTBL_DRAM_EN	(1 &lt;&lt; CPU_BOOT_DEV_STS_MMU_PGTBL_DRAM_EN)</div><div class='ctx'> #define CPU_BOOT_DEV_STS0_ENABLED		(1 &lt;&lt; CPU_BOOT_DEV_STS_ENABLED)</div><div class='ctx'> #define CPU_BOOT_DEV_STS1_ENABLED		(1 &lt;&lt; CPU_BOOT_DEV_STS_ENABLED)</div><div class='ctx'> </div><div class='hunk'>@@ -450,11 +464,11 @@ struct cpu_dyn_regs {</div><div class='ctx'> 	__le32 gic_dma_core_irq_ctrl;</div><div class='ctx'> 	__le32 gic_host_halt_irq;</div><div class='ctx'> 	__le32 gic_host_ints_irq;</div><div class='del'>-	__le32 gic_host_soft_rst_irq;</div><div class='add'>+	__le32 reserved0;</div><div class='ctx'> 	__le32 gic_rot_qm_irq_ctrl;</div><div class='del'>-	__le32 cpu_rst_status;</div><div class='add'>+	__le32 reserved1;</div><div class='ctx'> 	__le32 eng_arc_irq_ctrl;</div><div class='del'>-	__le32 reserved1[20];		/* reserve for future use */</div><div class='add'>+	__le32 reserved2[20];		/* reserve for future use */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* TODO: remove the desc magic after the code is updated to use message */</div><div class='hunk'>@@ -551,8 +565,9 @@ enum lkd_fw_ascii_msg_lvls {</div><div class='ctx'> 	LKD_FW_ASCII_MSG_DBG = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define LKD_FW_ASCII_MSG_MAX_LEN	128</div><div class='del'>-#define LKD_FW_ASCII_MSG_MAX		4	/* consider ABI when changing */</div><div class='add'>+#define LKD_FW_ASCII_MSG_MAX_LEN		128</div><div class='add'>+#define LKD_FW_ASCII_MSG_MAX			4	/* consider ABI when changing */</div><div class='add'>+#define LKD_FW_ASCII_MSG_MIN_DESC_VERSION	3</div><div class='ctx'> </div><div class='ctx'> struct lkd_fw_ascii_msg {</div><div class='ctx'> 	__u8 valid;</div><div class='head'>diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h<br/>index 3bb87bf6bc65..96bda41d9148 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hdmi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hdmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hdmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hdmi.h</a></div><div class='hunk'>@@ -59,6 +59,15 @@ enum hdmi_infoframe_type {</div><div class='ctx'> #define HDMI_DRM_INFOFRAME_SIZE    26</div><div class='ctx'> #define HDMI_VENDOR_INFOFRAME_SIZE  4</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * HDMI 1.3a table 5-14 states that the largest InfoFrame_length is 27,</div><div class='add'>+ * not including the packet header or checksum byte. We include the</div><div class='add'>+ * checksum byte in HDMI_INFOFRAME_HEADER_SIZE, so this should allow</div><div class='add'>+ * HDMI_INFOFRAME_SIZE(MAX) to be the largest buffer we could ever need</div><div class='add'>+ * for any HDMI infoframe.</div><div class='add'>+ */</div><div class='add'>+#define HDMI_MAX_INFOFRAME_SIZE    27</div><div class='add'>+</div><div class='ctx'> #define HDMI_INFOFRAME_SIZE(type)	\</div><div class='ctx'> 	(HDMI_INFOFRAME_HEADER_SIZE + HDMI_ ## type ## _INFOFRAME_SIZE)</div><div class='ctx'> </div><div class='hunk'>@@ -436,7 +445,6 @@ ssize_t hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer,</div><div class='ctx'> 			    size_t size);</div><div class='ctx'> ssize_t hdmi_infoframe_pack_only(const union hdmi_infoframe *frame,</div><div class='ctx'> 				 void *buffer, size_t size);</div><div class='del'>-int hdmi_infoframe_check(union hdmi_infoframe *frame);</div><div class='ctx'> int hdmi_infoframe_unpack(union hdmi_infoframe *frame,</div><div class='ctx'> 			  const void *buffer, size_t size);</div><div class='ctx'> void hdmi_infoframe_log(const char *level, struct device *dev,</div><div class='head'>diff --git a/include/linux/hfs_common.h b/include/linux/hfs_common.h<br/>new file mode 100644<br/>index 000000000000..dadb5e0aa8a3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hfs_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hfs_common.h</a></div><div class='hunk'>@@ -0,0 +1,653 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * HFS/HFS+ common definitions, inline functions,</div><div class='add'>+ * and shared functionality.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _HFS_COMMON_H_</div><div class='add'>+#define _HFS_COMMON_H_</div><div class='add'>+</div><div class='add'>+#ifdef pr_fmt</div><div class='add'>+#undef pr_fmt</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#define hfs_dbg(fmt, ...)							\</div><div class='add'>+	pr_debug("pid %d:%s:%d %s(): " fmt,					\</div><div class='add'>+		 current-&gt;pid, __FILE__, __LINE__, __func__, ##__VA_ARGS__)	\</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Format of structures on disk</div><div class='add'>+ * Information taken from Apple Technote #1150 (HFS Plus Volume Format)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* offsets to various blocks */</div><div class='add'>+#define HFS_DD_BLK			0	/* Driver Descriptor block */</div><div class='add'>+#define HFS_PMAP_BLK			1	/* First block of partition map */</div><div class='add'>+#define HFS_MDB_BLK			2	/* Block (w/i partition) of MDB */</div><div class='add'>+</div><div class='add'>+/* magic numbers for various disk blocks */</div><div class='add'>+#define HFS_DRVR_DESC_MAGIC		0x4552	/* "ER": driver descriptor map */</div><div class='add'>+#define HFS_OLD_PMAP_MAGIC		0x5453	/* "TS": old-type partition map */</div><div class='add'>+#define HFS_NEW_PMAP_MAGIC		0x504D	/* "PM": new-type partition map */</div><div class='add'>+#define HFS_SUPER_MAGIC			0x4244	/* "BD": HFS MDB (super block) */</div><div class='add'>+#define HFS_MFS_SUPER_MAGIC		0xD2D7	/* MFS MDB (super block) */</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_VOLHEAD_SIG		0x482b</div><div class='add'>+#define HFSPLUS_VOLHEAD_SIGX		0x4858</div><div class='add'>+#define HFSPLUS_SUPER_MAGIC		0x482b</div><div class='add'>+</div><div class='add'>+#define HFSP_WRAP_MAGIC			0x4244</div><div class='add'>+#define HFSP_WRAP_ATTRIB_SLOCK		0x8000</div><div class='add'>+#define HFSP_WRAP_ATTRIB_SPARED		0x0200</div><div class='add'>+</div><div class='add'>+#define HFSP_WRAPOFF_SIG		0x00</div><div class='add'>+#define HFSP_WRAPOFF_ATTRIB		0x0A</div><div class='add'>+#define HFSP_WRAPOFF_ABLKSIZE		0x14</div><div class='add'>+#define HFSP_WRAPOFF_ABLKSTART		0x1C</div><div class='add'>+#define HFSP_WRAPOFF_EMBEDSIG		0x7C</div><div class='add'>+#define HFSP_WRAPOFF_EMBEDEXT		0x7E</div><div class='add'>+</div><div class='add'>+#define HFSP_HARDLINK_TYPE		0x686c6e6b	/* 'hlnk' */</div><div class='add'>+#define HFSP_HFSPLUS_CREATOR		0x6866732b	/* 'hfs+' */</div><div class='add'>+</div><div class='add'>+#define HFSP_SYMLINK_TYPE		0x736c6e6b	/* 'slnk' */</div><div class='add'>+#define HFSP_SYMLINK_CREATOR		0x72686170	/* 'rhap' */</div><div class='add'>+</div><div class='add'>+#define HFSP_MOUNT_VERSION		0x482b4c78	/* 'H+Lx' */</div><div class='add'>+</div><div class='add'>+#define HFSP_HIDDENDIR_NAME \</div><div class='add'>+	"\xe2\x90\x80\xe2\x90\x80\xe2\x90\x80\xe2\x90\x80HFS+ Private Data"</div><div class='add'>+</div><div class='add'>+/* various FIXED size parameters */</div><div class='add'>+#define HFS_SECTOR_SIZE			512	/* size of an HFS sector */</div><div class='add'>+#define HFS_SECTOR_SIZE_BITS		9	/* log_2(HFS_SECTOR_SIZE) */</div><div class='add'>+#define HFS_MAX_VALENCE			32767U</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_SECTOR_SIZE		HFS_SECTOR_SIZE</div><div class='add'>+#define HFSPLUS_SECTOR_SHIFT		HFS_SECTOR_SIZE_BITS</div><div class='add'>+#define HFSPLUS_VOLHEAD_SECTOR		2</div><div class='add'>+#define HFSPLUS_MIN_VERSION		4</div><div class='add'>+#define HFSPLUS_CURRENT_VERSION		5</div><div class='add'>+</div><div class='add'>+#define HFS_NAMELEN			31	/* maximum length of an HFS filename */</div><div class='add'>+#define HFS_MAX_NAMELEN			128</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_MAX_STRLEN		255</div><div class='add'>+#define HFSPLUS_ATTR_MAX_STRLEN		127</div><div class='add'>+</div><div class='add'>+/* Meanings of the drAtrb field of the MDB,</div><div class='add'>+ * Reference: _Inside Macintosh: Files_ p. 2-61</div><div class='add'>+ */</div><div class='add'>+#define HFS_SB_ATTRIB_HLOCK	(1 &lt;&lt; 7)</div><div class='add'>+#define HFS_SB_ATTRIB_UNMNT	(1 &lt;&lt; 8)</div><div class='add'>+#define HFS_SB_ATTRIB_SPARED	(1 &lt;&lt; 9)</div><div class='add'>+#define HFS_SB_ATTRIB_INCNSTNT	(1 &lt;&lt; 11)</div><div class='add'>+#define HFS_SB_ATTRIB_SLOCK	(1 &lt;&lt; 15)</div><div class='add'>+</div><div class='add'>+/* values for hfs_cat_rec.cdrType */</div><div class='add'>+#define HFS_CDR_DIR		0x01	/* folder (directory) */</div><div class='add'>+#define HFS_CDR_FIL		0x02	/* file */</div><div class='add'>+#define HFS_CDR_THD		0x03	/* folder (directory) thread */</div><div class='add'>+#define HFS_CDR_FTH		0x04	/* file thread */</div><div class='add'>+</div><div class='add'>+/* legal values for hfs_ext_key.FkType and hfs_file.fork */</div><div class='add'>+#define HFS_FK_DATA		0x00</div><div class='add'>+#define HFS_FK_RSRC		0xFF</div><div class='add'>+</div><div class='add'>+/* bits in hfs_fil_entry.Flags */</div><div class='add'>+#define HFS_FIL_LOCK		0x01	/* locked */</div><div class='add'>+#define HFS_FIL_THD		0x02	/* file thread */</div><div class='add'>+#define HFS_FIL_DOPEN		0x04	/* data fork open */</div><div class='add'>+#define HFS_FIL_ROPEN		0x08	/* resource fork open */</div><div class='add'>+#define HFS_FIL_DIR		0x10	/* directory (always clear) */</div><div class='add'>+#define HFS_FIL_NOCOPY		0x40	/* copy-protected file */</div><div class='add'>+#define HFS_FIL_USED		0x80	/* open */</div><div class='add'>+</div><div class='add'>+/* bits in hfs_dir_entry.Flags. dirflags is 16 bits. */</div><div class='add'>+#define HFS_DIR_LOCK		0x01	/* locked */</div><div class='add'>+#define HFS_DIR_THD		0x02	/* directory thread */</div><div class='add'>+#define HFS_DIR_INEXPFOLDER	0x04	/* in a shared area */</div><div class='add'>+#define HFS_DIR_MOUNTED		0x08	/* mounted */</div><div class='add'>+#define HFS_DIR_DIR		0x10	/* directory (always set) */</div><div class='add'>+#define HFS_DIR_EXPFOLDER	0x20	/* share point */</div><div class='add'>+</div><div class='add'>+/* bits hfs_finfo.fdFlags */</div><div class='add'>+#define HFS_FLG_INITED		0x0100</div><div class='add'>+#define HFS_FLG_LOCKED		0x1000</div><div class='add'>+#define HFS_FLG_INVISIBLE	0x4000</div><div class='add'>+</div><div class='add'>+/* Some special File ID numbers */</div><div class='add'>+#define HFS_POR_CNID		1	/* Parent Of the Root */</div><div class='add'>+#define HFSPLUS_POR_CNID	HFS_POR_CNID</div><div class='add'>+#define HFS_ROOT_CNID		2	/* ROOT directory */</div><div class='add'>+#define HFSPLUS_ROOT_CNID	HFS_ROOT_CNID</div><div class='add'>+#define HFS_EXT_CNID		3	/* EXTents B-tree */</div><div class='add'>+#define HFSPLUS_EXT_CNID	HFS_EXT_CNID</div><div class='add'>+#define HFS_CAT_CNID		4	/* CATalog B-tree */</div><div class='add'>+#define HFSPLUS_CAT_CNID	HFS_CAT_CNID</div><div class='add'>+#define HFS_BAD_CNID		5	/* BAD blocks file */</div><div class='add'>+#define HFSPLUS_BAD_CNID	HFS_BAD_CNID</div><div class='add'>+#define HFS_ALLOC_CNID		6	/* ALLOCation file (HFS+) */</div><div class='add'>+#define HFSPLUS_ALLOC_CNID	HFS_ALLOC_CNID</div><div class='add'>+#define HFS_START_CNID		7	/* STARTup file (HFS+) */</div><div class='add'>+#define HFSPLUS_START_CNID	HFS_START_CNID</div><div class='add'>+#define HFS_ATTR_CNID		8	/* ATTRibutes file (HFS+) */</div><div class='add'>+#define HFSPLUS_ATTR_CNID	HFS_ATTR_CNID</div><div class='add'>+#define HFS_EXCH_CNID		15	/* ExchangeFiles temp id */</div><div class='add'>+#define HFSPLUS_EXCH_CNID	HFS_EXCH_CNID</div><div class='add'>+#define HFS_FIRSTUSER_CNID	16	/* first available user id */</div><div class='add'>+#define HFSPLUS_FIRSTUSER_CNID	HFS_FIRSTUSER_CNID</div><div class='add'>+</div><div class='add'>+/*======== HFS/HFS+ structures as they appear on the disk ========*/</div><div class='add'>+</div><div class='add'>+typedef __be32 hfsplus_cnid;</div><div class='add'>+typedef __be16 hfsplus_unichr;</div><div class='add'>+</div><div class='add'>+/* Pascal-style string of up to 31 characters */</div><div class='add'>+struct hfs_name {</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 name[HFS_NAMELEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* A "string" as used in filenames, etc. */</div><div class='add'>+struct hfsplus_unistr {</div><div class='add'>+	__be16 length;</div><div class='add'>+	hfsplus_unichr unicode[HFSPLUS_MAX_STRLEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A "string" is used in attributes file</div><div class='add'>+ * for name of extended attribute</div><div class='add'>+ */</div><div class='add'>+struct hfsplus_attr_unistr {</div><div class='add'>+	__be16 length;</div><div class='add'>+	hfsplus_unichr unicode[HFSPLUS_ATTR_MAX_STRLEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hfs_extent {</div><div class='add'>+	__be16 block;</div><div class='add'>+	__be16 count;</div><div class='add'>+};</div><div class='add'>+typedef struct hfs_extent hfs_extent_rec[3];</div><div class='add'>+</div><div class='add'>+/* A single contiguous area of a file */</div><div class='add'>+struct hfsplus_extent {</div><div class='add'>+	__be32 start_block;</div><div class='add'>+	__be32 block_count;</div><div class='add'>+} __packed;</div><div class='add'>+typedef struct hfsplus_extent hfsplus_extent_rec[8];</div><div class='add'>+</div><div class='add'>+/* Information for a "Fork" in a file */</div><div class='add'>+struct hfsplus_fork_raw {</div><div class='add'>+	__be64 total_size;</div><div class='add'>+	__be32 clump_size;</div><div class='add'>+	__be32 total_blocks;</div><div class='add'>+	hfsplus_extent_rec extents;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct hfs_mdb {</div><div class='add'>+	__be16 drSigWord;		/* Signature word indicating fs type */</div><div class='add'>+	__be32 drCrDate;		/* fs creation date/time */</div><div class='add'>+	__be32 drLsMod;			/* fs modification date/time */</div><div class='add'>+	__be16 drAtrb;			/* fs attributes */</div><div class='add'>+	__be16 drNmFls;			/* number of files in root directory */</div><div class='add'>+	__be16 drVBMSt;			/* location (in 512-byte blocks)</div><div class='add'>+					   of the volume bitmap */</div><div class='add'>+	__be16 drAllocPtr;		/* location (in allocation blocks)</div><div class='add'>+					   to begin next allocation search */</div><div class='add'>+	__be16 drNmAlBlks;		/* number of allocation blocks */</div><div class='add'>+	__be32 drAlBlkSiz;		/* bytes in an allocation block */</div><div class='add'>+	__be32 drClpSiz;		/* clumpsize, the number of bytes to</div><div class='add'>+					   allocate when extending a file */</div><div class='add'>+	__be16 drAlBlSt;		/* location (in 512-byte blocks)</div><div class='add'>+					   of the first allocation block */</div><div class='add'>+	__be32 drNxtCNID;		/* CNID to assign to the next</div><div class='add'>+					   file or directory created */</div><div class='add'>+	__be16 drFreeBks;		/* number of free allocation blocks */</div><div class='add'>+	u8 drVN[28];			/* the volume label */</div><div class='add'>+	__be32 drVolBkUp;		/* fs backup date/time */</div><div class='add'>+	__be16 drVSeqNum;		/* backup sequence number */</div><div class='add'>+	__be32 drWrCnt;			/* fs write count */</div><div class='add'>+	__be32 drXTClpSiz;		/* clumpsize for the extents B-tree */</div><div class='add'>+	__be32 drCTClpSiz;		/* clumpsize for the catalog B-tree */</div><div class='add'>+	__be16 drNmRtDirs;		/* number of directories in</div><div class='add'>+					   the root directory */</div><div class='add'>+	__be32 drFilCnt;		/* number of files in the fs */</div><div class='add'>+	__be32 drDirCnt;		/* number of directories in the fs */</div><div class='add'>+	u8 drFndrInfo[32];		/* data used by the Finder */</div><div class='add'>+	__be16 drEmbedSigWord;		/* embedded volume signature */</div><div class='add'>+	__be32 drEmbedExtent;		/* starting block number (xdrStABN)</div><div class='add'>+					   and number of allocation blocks</div><div class='add'>+					   (xdrNumABlks) occupied by embedded</div><div class='add'>+					   volume */</div><div class='add'>+	__be32 drXTFlSize;		/* bytes in the extents B-tree */</div><div class='add'>+	hfs_extent_rec drXTExtRec;	/* extents B-tree's first 3 extents */</div><div class='add'>+	__be32 drCTFlSize;		/* bytes in the catalog B-tree */</div><div class='add'>+	hfs_extent_rec drCTExtRec;	/* catalog B-tree's first 3 extents */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HFS+ Volume Header */</div><div class='add'>+struct hfsplus_vh {</div><div class='add'>+	__be16 signature;</div><div class='add'>+	__be16 version;</div><div class='add'>+	__be32 attributes;</div><div class='add'>+	__be32 last_mount_vers;</div><div class='add'>+	u32 reserved;</div><div class='add'>+</div><div class='add'>+	__be32 create_date;</div><div class='add'>+	__be32 modify_date;</div><div class='add'>+	__be32 backup_date;</div><div class='add'>+	__be32 checked_date;</div><div class='add'>+</div><div class='add'>+	__be32 file_count;</div><div class='add'>+	__be32 folder_count;</div><div class='add'>+</div><div class='add'>+	__be32 blocksize;</div><div class='add'>+	__be32 total_blocks;</div><div class='add'>+	__be32 free_blocks;</div><div class='add'>+</div><div class='add'>+	__be32 next_alloc;</div><div class='add'>+	__be32 rsrc_clump_sz;</div><div class='add'>+	__be32 data_clump_sz;</div><div class='add'>+	hfsplus_cnid next_cnid;</div><div class='add'>+</div><div class='add'>+	__be32 write_count;</div><div class='add'>+	__be64 encodings_bmp;</div><div class='add'>+</div><div class='add'>+	u32 finder_info[8];</div><div class='add'>+</div><div class='add'>+	struct hfsplus_fork_raw alloc_file;</div><div class='add'>+	struct hfsplus_fork_raw ext_file;</div><div class='add'>+	struct hfsplus_fork_raw cat_file;</div><div class='add'>+	struct hfsplus_fork_raw attr_file;</div><div class='add'>+	struct hfsplus_fork_raw start_file;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HFS+ volume attributes */</div><div class='add'>+#define HFSPLUS_VOL_UNMNT		(1 &lt;&lt; 8)</div><div class='add'>+#define HFSPLUS_VOL_SPARE_BLK		(1 &lt;&lt; 9)</div><div class='add'>+#define HFSPLUS_VOL_NOCACHE		(1 &lt;&lt; 10)</div><div class='add'>+#define HFSPLUS_VOL_INCNSTNT		(1 &lt;&lt; 11)</div><div class='add'>+#define HFSPLUS_VOL_NODEID_REUSED	(1 &lt;&lt; 12)</div><div class='add'>+#define HFSPLUS_VOL_JOURNALED		(1 &lt;&lt; 13)</div><div class='add'>+#define HFSPLUS_VOL_SOFTLOCK		(1 &lt;&lt; 15)</div><div class='add'>+#define HFSPLUS_VOL_UNUSED_NODE_FIX	(1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+struct hfs_point {</div><div class='add'>+	__be16 v;</div><div class='add'>+	__be16 h;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+typedef struct hfs_point hfsp_point;</div><div class='add'>+</div><div class='add'>+struct hfs_rect {</div><div class='add'>+	__be16 top;</div><div class='add'>+	__be16 left;</div><div class='add'>+	__be16 bottom;</div><div class='add'>+	__be16 right;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+typedef struct hfs_rect hfsp_rect;</div><div class='add'>+</div><div class='add'>+struct hfs_finfo {</div><div class='add'>+	__be32 fdType;</div><div class='add'>+	__be32 fdCreator;</div><div class='add'>+	__be16 fdFlags;</div><div class='add'>+	struct hfs_point fdLocation;</div><div class='add'>+	__be16 fdFldr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+typedef struct hfs_finfo FInfo;</div><div class='add'>+</div><div class='add'>+struct hfs_fxinfo {</div><div class='add'>+	__be16 fdIconID;</div><div class='add'>+	u8 fdUnused[8];</div><div class='add'>+	__be16 fdComment;</div><div class='add'>+	__be32 fdPutAway;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+typedef struct hfs_fxinfo FXInfo;</div><div class='add'>+</div><div class='add'>+struct hfs_dinfo {</div><div class='add'>+	struct hfs_rect frRect;</div><div class='add'>+	__be16 frFlags;</div><div class='add'>+	struct hfs_point frLocation;</div><div class='add'>+	__be16 frView;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+typedef struct hfs_dinfo DInfo;</div><div class='add'>+</div><div class='add'>+struct hfs_dxinfo {</div><div class='add'>+	struct hfs_point frScroll;</div><div class='add'>+	__be32 frOpenChain;</div><div class='add'>+	__be16 frUnused;</div><div class='add'>+	__be16 frComment;</div><div class='add'>+	__be32 frPutAway;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+typedef struct hfs_dxinfo DXInfo;</div><div class='add'>+</div><div class='add'>+union hfs_finder_info {</div><div class='add'>+	struct {</div><div class='add'>+		struct hfs_finfo finfo;</div><div class='add'>+		struct hfs_fxinfo fxinfo;</div><div class='add'>+	} file;</div><div class='add'>+	struct {</div><div class='add'>+		struct hfs_dinfo dinfo;</div><div class='add'>+		struct hfs_dxinfo dxinfo;</div><div class='add'>+	} dir;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* The key used in the catalog b-tree: */</div><div class='add'>+struct hfs_cat_key {</div><div class='add'>+	u8 key_len;		/* number of bytes in the key */</div><div class='add'>+	u8 reserved;		/* padding */</div><div class='add'>+	__be32 ParID;		/* CNID of the parent dir */</div><div class='add'>+	struct hfs_name	CName;	/* The filename of the entry */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HFS+ catalog entry key */</div><div class='add'>+struct hfsplus_cat_key {</div><div class='add'>+	__be16 key_len;</div><div class='add'>+	hfsplus_cnid parent;</div><div class='add'>+	struct hfsplus_unistr name;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_CAT_KEYLEN	(sizeof(struct hfsplus_cat_key))</div><div class='add'>+</div><div class='add'>+/* The key used in the extents b-tree: */</div><div class='add'>+struct hfs_ext_key {</div><div class='add'>+	u8 key_len;		/* number of bytes in the key */</div><div class='add'>+	u8 FkType;		/* HFS_FK_{DATA,RSRC} */</div><div class='add'>+	__be32 FNum;		/* The File ID of the file */</div><div class='add'>+	__be16 FABN;		/* allocation blocks number*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HFS+ extents tree key */</div><div class='add'>+struct hfsplus_ext_key {</div><div class='add'>+	__be16 key_len;</div><div class='add'>+	u8 fork_type;</div><div class='add'>+	u8 pad;</div><div class='add'>+	hfsplus_cnid cnid;</div><div class='add'>+	__be32 start_block;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_EXT_KEYLEN	sizeof(struct hfsplus_ext_key)</div><div class='add'>+</div><div class='add'>+typedef union hfs_btree_key {</div><div class='add'>+	u8 key_len;			/* number of bytes in the key */</div><div class='add'>+	struct hfs_cat_key cat;</div><div class='add'>+	struct hfs_ext_key ext;</div><div class='add'>+} hfs_btree_key;</div><div class='add'>+</div><div class='add'>+#define HFS_MAX_CAT_KEYLEN	(sizeof(struct hfs_cat_key) - sizeof(u8))</div><div class='add'>+#define HFS_MAX_EXT_KEYLEN	(sizeof(struct hfs_ext_key) - sizeof(u8))</div><div class='add'>+</div><div class='add'>+typedef union hfs_btree_key btree_key;</div><div class='add'>+</div><div class='add'>+/* The catalog record for a file */</div><div class='add'>+struct hfs_cat_file {</div><div class='add'>+	s8 type;			/* The type of entry */</div><div class='add'>+	u8 reserved;</div><div class='add'>+	u8 Flags;			/* Flags such as read-only */</div><div class='add'>+	s8 Typ;				/* file version number = 0 */</div><div class='add'>+	struct hfs_finfo UsrWds;	/* data used by the Finder */</div><div class='add'>+	__be32 FlNum;			/* The CNID */</div><div class='add'>+	__be16 StBlk;			/* obsolete */</div><div class='add'>+	__be32 LgLen;			/* The logical EOF of the data fork*/</div><div class='add'>+	__be32 PyLen;			/* The physical EOF of the data fork */</div><div class='add'>+	__be16 RStBlk;			/* obsolete */</div><div class='add'>+	__be32 RLgLen;			/* The logical EOF of the rsrc fork */</div><div class='add'>+	__be32 RPyLen;			/* The physical EOF of the rsrc fork */</div><div class='add'>+	__be32 CrDat;			/* The creation date */</div><div class='add'>+	__be32 MdDat;			/* The modified date */</div><div class='add'>+	__be32 BkDat;			/* The last backup date */</div><div class='add'>+	struct hfs_fxinfo FndrInfo;	/* more data for the Finder */</div><div class='add'>+	__be16 ClpSize;			/* number of bytes to allocate</div><div class='add'>+					   when extending files */</div><div class='add'>+	hfs_extent_rec ExtRec;		/* first extent record</div><div class='add'>+					   for the data fork */</div><div class='add'>+	hfs_extent_rec RExtRec;		/* first extent record</div><div class='add'>+					   for the resource fork */</div><div class='add'>+	u32 Resrv;			/* reserved by Apple */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* the catalog record for a directory */</div><div class='add'>+struct hfs_cat_dir {</div><div class='add'>+	s8 type;			/* The type of entry */</div><div class='add'>+	u8 reserved;</div><div class='add'>+	__be16 Flags;			/* flags */</div><div class='add'>+	__be16 Val;			/* Valence: number of files and</div><div class='add'>+					   dirs in the directory */</div><div class='add'>+	__be32 DirID;			/* The CNID */</div><div class='add'>+	__be32 CrDat;			/* The creation date */</div><div class='add'>+	__be32 MdDat;			/* The modification date */</div><div class='add'>+	__be32 BkDat;			/* The last backup date */</div><div class='add'>+	struct hfs_dinfo UsrInfo;	/* data used by the Finder */</div><div class='add'>+	struct hfs_dxinfo FndrInfo;	/* more data used by Finder */</div><div class='add'>+	u8 Resrv[16];			/* reserved by Apple */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* the catalog record for a thread */</div><div class='add'>+struct hfs_cat_thread {</div><div class='add'>+	s8 type;			/* The type of entry */</div><div class='add'>+	u8 reserved[9];			/* reserved by Apple */</div><div class='add'>+	__be32 ParID;			/* CNID of parent directory */</div><div class='add'>+	struct hfs_name CName;		/* The name of this entry */</div><div class='add'>+}  __packed;</div><div class='add'>+</div><div class='add'>+/* A catalog tree record */</div><div class='add'>+typedef union hfs_cat_rec {</div><div class='add'>+	s8 type;			/* The type of entry */</div><div class='add'>+	struct hfs_cat_file file;</div><div class='add'>+	struct hfs_cat_dir dir;</div><div class='add'>+	struct hfs_cat_thread thread;</div><div class='add'>+} hfs_cat_rec;</div><div class='add'>+</div><div class='add'>+/* POSIX permissions */</div><div class='add'>+struct hfsplus_perm {</div><div class='add'>+	__be32 owner;</div><div class='add'>+	__be32 group;</div><div class='add'>+	u8  rootflags;</div><div class='add'>+	u8  userflags;</div><div class='add'>+	__be16 mode;</div><div class='add'>+	__be32 dev;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_FLG_NODUMP	0x01</div><div class='add'>+#define HFSPLUS_FLG_IMMUTABLE	0x02</div><div class='add'>+#define HFSPLUS_FLG_APPEND	0x04</div><div class='add'>+</div><div class='add'>+/* HFS/HFS+ BTree node descriptor */</div><div class='add'>+struct hfs_bnode_desc {</div><div class='add'>+	__be32 next;		/* (V) Number of the next node at this level */</div><div class='add'>+	__be32 prev;		/* (V) Number of the prev node at this level */</div><div class='add'>+	u8 type;		/* (F) The type of node */</div><div class='add'>+	u8 height;		/* (F) The level of this node (leaves=1) */</div><div class='add'>+	__be16 num_recs;	/* (V) The number of records in this node */</div><div class='add'>+	u16 reserved;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HFS/HFS+ BTree node types */</div><div class='add'>+#define HFS_NODE_INDEX	0x00	/* An internal (index) node */</div><div class='add'>+#define HFS_NODE_HEADER	0x01	/* The tree header node (node 0) */</div><div class='add'>+#define HFS_NODE_MAP	0x02	/* Holds part of the bitmap of used nodes */</div><div class='add'>+#define HFS_NODE_LEAF	0xFF	/* A leaf (ndNHeight==1) node */</div><div class='add'>+</div><div class='add'>+/* HFS/HFS+ BTree header */</div><div class='add'>+struct hfs_btree_header_rec {</div><div class='add'>+	__be16 depth;		/* (V) The number of levels in this B-tree */</div><div class='add'>+	__be32 root;		/* (V) The node number of the root node */</div><div class='add'>+	__be32 leaf_count;	/* (V) The number of leaf records */</div><div class='add'>+	__be32 leaf_head;	/* (V) The number of the first leaf node */</div><div class='add'>+	__be32 leaf_tail;	/* (V) The number of the last leaf node */</div><div class='add'>+	__be16 node_size;	/* (F) The number of bytes in a node (=512) */</div><div class='add'>+	__be16 max_key_len;	/* (F) The length of a key in an index node */</div><div class='add'>+	__be32 node_count;	/* (V) The total number of nodes */</div><div class='add'>+	__be32 free_nodes;	/* (V) The number of unused nodes */</div><div class='add'>+	u16 reserved1;</div><div class='add'>+	__be32 clump_size;	/* (F) clump size. not usually used. */</div><div class='add'>+	u8 btree_type;		/* (F) BTree type */</div><div class='add'>+	u8 key_type;</div><div class='add'>+	__be32 attributes;	/* (F) attributes */</div><div class='add'>+	u32 reserved3[16];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* BTree attributes */</div><div class='add'>+#define BTREE_ATTR_BADCLOSE	0x00000001	/* b-tree not closed properly. not</div><div class='add'>+						   used by hfsplus. */</div><div class='add'>+#define HFS_TREE_BIGKEYS	0x00000002	/* key length is u16 instead of u8.</div><div class='add'>+						   used by hfsplus. */</div><div class='add'>+#define HFS_TREE_VARIDXKEYS	0x00000004	/* variable key length instead of</div><div class='add'>+						   max key length. use din catalog</div><div class='add'>+						   b-tree but not in extents</div><div class='add'>+						   b-tree (hfsplus). */</div><div class='add'>+</div><div class='add'>+/* HFS+ BTree misc info */</div><div class='add'>+#define HFSPLUS_TREE_HEAD			0</div><div class='add'>+#define HFSPLUS_NODE_MXSZ			32768</div><div class='add'>+#define HFSPLUS_ATTR_TREE_NODE_SIZE		8192</div><div class='add'>+#define HFSPLUS_BTREE_HDR_NODE_RECS_COUNT	3</div><div class='add'>+#define HFSPLUS_BTREE_HDR_USER_BYTES		128</div><div class='add'>+</div><div class='add'>+/* btree key type */</div><div class='add'>+#define HFSPLUS_KEY_CASEFOLDING		0xCF	/* case-insensitive */</div><div class='add'>+#define HFSPLUS_KEY_BINARY		0xBC	/* case-sensitive */</div><div class='add'>+</div><div class='add'>+/* HFS+ folder data (part of an hfsplus_cat_entry) */</div><div class='add'>+struct hfsplus_cat_folder {</div><div class='add'>+	__be16 type;</div><div class='add'>+	__be16 flags;</div><div class='add'>+	__be32 valence;</div><div class='add'>+	hfsplus_cnid id;</div><div class='add'>+	__be32 create_date;</div><div class='add'>+	__be32 content_mod_date;</div><div class='add'>+	__be32 attribute_mod_date;</div><div class='add'>+	__be32 access_date;</div><div class='add'>+	__be32 backup_date;</div><div class='add'>+	struct hfsplus_perm permissions;</div><div class='add'>+	struct_group_attr(info, __packed,</div><div class='add'>+		DInfo user_info;</div><div class='add'>+		DXInfo finder_info;</div><div class='add'>+	);</div><div class='add'>+	__be32 text_encoding;</div><div class='add'>+	__be32 subfolders;	/* Subfolder count in HFSX. Reserved in HFS+. */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HFS+ file data (part of a cat_entry) */</div><div class='add'>+struct hfsplus_cat_file {</div><div class='add'>+	__be16 type;</div><div class='add'>+	__be16 flags;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	hfsplus_cnid id;</div><div class='add'>+	__be32 create_date;</div><div class='add'>+	__be32 content_mod_date;</div><div class='add'>+	__be32 attribute_mod_date;</div><div class='add'>+	__be32 access_date;</div><div class='add'>+	__be32 backup_date;</div><div class='add'>+	struct hfsplus_perm permissions;</div><div class='add'>+	struct_group_attr(info, __packed,</div><div class='add'>+		FInfo user_info;</div><div class='add'>+		FXInfo finder_info;</div><div class='add'>+	);</div><div class='add'>+	__be32 text_encoding;</div><div class='add'>+	u32 reserved2;</div><div class='add'>+</div><div class='add'>+	struct hfsplus_fork_raw data_fork;</div><div class='add'>+	struct hfsplus_fork_raw rsrc_fork;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* File and folder flag bits */</div><div class='add'>+#define HFSPLUS_FILE_LOCKED		0x0001</div><div class='add'>+#define HFSPLUS_FILE_THREAD_EXISTS	0x0002</div><div class='add'>+#define HFSPLUS_XATTR_EXISTS		0x0004</div><div class='add'>+#define HFSPLUS_ACL_EXISTS		0x0008</div><div class='add'>+#define HFSPLUS_HAS_FOLDER_COUNT	0x0010	/* Folder has subfolder count</div><div class='add'>+						 * (HFSX only) */</div><div class='add'>+</div><div class='add'>+/* HFS+ catalog thread (part of a cat_entry) */</div><div class='add'>+struct hfsplus_cat_thread {</div><div class='add'>+	__be16 type;</div><div class='add'>+	s16 reserved;</div><div class='add'>+	hfsplus_cnid parentID;</div><div class='add'>+	struct hfsplus_unistr nodeName;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_MIN_THREAD_SZ		10</div><div class='add'>+</div><div class='add'>+/* A data record in the catalog tree */</div><div class='add'>+typedef union {</div><div class='add'>+	__be16 type;</div><div class='add'>+	struct hfsplus_cat_folder folder;</div><div class='add'>+	struct hfsplus_cat_file file;</div><div class='add'>+	struct hfsplus_cat_thread thread;</div><div class='add'>+} __packed hfsplus_cat_entry;</div><div class='add'>+</div><div class='add'>+/* HFS+ catalog entry type */</div><div class='add'>+#define HFSPLUS_FOLDER		0x0001</div><div class='add'>+#define HFSPLUS_FILE		0x0002</div><div class='add'>+#define HFSPLUS_FOLDER_THREAD	0x0003</div><div class='add'>+#define HFSPLUS_FILE_THREAD	0x0004</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_XATTR_FINDER_INFO_NAME	"com.apple.FinderInfo"</div><div class='add'>+#define HFSPLUS_XATTR_ACL_NAME		"com.apple.system.Security"</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_ATTR_INLINE_DATA	0x10</div><div class='add'>+#define HFSPLUS_ATTR_FORK_DATA		0x20</div><div class='add'>+#define HFSPLUS_ATTR_EXTENTS		0x30</div><div class='add'>+</div><div class='add'>+/* HFS+ attributes tree key */</div><div class='add'>+struct hfsplus_attr_key {</div><div class='add'>+	__be16 key_len;</div><div class='add'>+	__be16 pad;</div><div class='add'>+	hfsplus_cnid cnid;</div><div class='add'>+	__be32 start_block;</div><div class='add'>+	struct hfsplus_attr_unistr key_name;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_ATTR_KEYLEN	sizeof(struct hfsplus_attr_key)</div><div class='add'>+</div><div class='add'>+/* HFS+ fork data attribute */</div><div class='add'>+struct hfsplus_attr_fork_data {</div><div class='add'>+	__be32 record_type;</div><div class='add'>+	__be32 reserved;</div><div class='add'>+	struct hfsplus_fork_raw the_fork;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HFS+ extension attribute */</div><div class='add'>+struct hfsplus_attr_extents {</div><div class='add'>+	__be32 record_type;</div><div class='add'>+	__be32 reserved;</div><div class='add'>+	struct hfsplus_extent extents;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HFSPLUS_MAX_INLINE_DATA_SIZE	3802</div><div class='add'>+</div><div class='add'>+/* HFS+ attribute inline data */</div><div class='add'>+struct hfsplus_attr_inline_data {</div><div class='add'>+	__be32 record_type;</div><div class='add'>+	__be32 reserved1;</div><div class='add'>+	u8 reserved2[6];</div><div class='add'>+	__be16 length;</div><div class='add'>+	u8 raw_bytes[HFSPLUS_MAX_INLINE_DATA_SIZE];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* A data record in the attributes tree */</div><div class='add'>+typedef union {</div><div class='add'>+	__be32 record_type;</div><div class='add'>+	struct hfsplus_attr_fork_data fork_data;</div><div class='add'>+	struct hfsplus_attr_extents extents;</div><div class='add'>+	struct hfsplus_attr_inline_data inline_data;</div><div class='add'>+} __packed hfsplus_attr_entry;</div><div class='add'>+</div><div class='add'>+/* HFS+ generic BTree key */</div><div class='add'>+typedef union {</div><div class='add'>+	__be16 key_len;</div><div class='add'>+	struct hfsplus_cat_key cat;</div><div class='add'>+	struct hfsplus_ext_key ext;</div><div class='add'>+	struct hfsplus_attr_key attr;</div><div class='add'>+} __packed hfsplus_btree_key;</div><div class='add'>+</div><div class='add'>+#endif /* _HFS_COMMON_H_ */</div><div class='head'>diff --git a/include/linux/hid-over-i2c.h b/include/linux/hid-over-i2c.h<br/>new file mode 100644<br/>index 000000000000..3b1a0208a6b8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hid-over-i2c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hid-over-i2c.h</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright 2024 Intel Corporation */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef _HID_OVER_I2C_H_</div><div class='add'>+#define _HID_OVER_I2C_H_</div><div class='add'>+</div><div class='add'>+#define HIDI2C_REG_LEN		sizeof(__le16)</div><div class='add'>+</div><div class='add'>+/* Input report type definition in HIDI2C protocol */</div><div class='add'>+enum hidi2c_report_type {</div><div class='add'>+	HIDI2C_RESERVED = 0,</div><div class='add'>+	HIDI2C_INPUT,</div><div class='add'>+	HIDI2C_OUTPUT,</div><div class='add'>+	HIDI2C_FEATURE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Power state type definition in HIDI2C protocol */</div><div class='add'>+enum hidi2c_power_state {</div><div class='add'>+	HIDI2C_ON,</div><div class='add'>+	HIDI2C_SLEEP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Opcode type definition in HIDI2C protocol */</div><div class='add'>+enum hidi2c_opcode {</div><div class='add'>+	HIDI2C_RESET = 1,</div><div class='add'>+	HIDI2C_GET_REPORT,</div><div class='add'>+	HIDI2C_SET_REPORT,</div><div class='add'>+	HIDI2C_GET_IDLE,</div><div class='add'>+	HIDI2C_SET_IDLE,</div><div class='add'>+	HIDI2C_GET_PROTOCOL,</div><div class='add'>+	HIDI2C_SET_PROTOCOL,</div><div class='add'>+	HIDI2C_SET_POWER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hidi2c_report_packet - Report packet definition in HIDI2C protocol</div><div class='add'>+ * @len: data field length</div><div class='add'>+ * @data: HIDI2C report packet data</div><div class='add'>+ */</div><div class='add'>+struct hidi2c_report_packet {</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HIDI2C_LENGTH_LEN	sizeof(__le16)</div><div class='add'>+</div><div class='add'>+#define HIDI2C_PACKET_LEN(data_len)	((data_len) + HIDI2C_LENGTH_LEN)</div><div class='add'>+#define HIDI2C_DATA_LEN(pkt_len)	((pkt_len) - HIDI2C_LENGTH_LEN)</div><div class='add'>+</div><div class='add'>+#define HIDI2C_CMD_MAX_RI	0x0F</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * HIDI2C command data packet - Command packet definition in HIDI2C protocol</div><div class='add'>+ * @report_id:		[0:3] report id (&lt;15) for features or output reports</div><div class='add'>+ * @report_type:	[4:5] indicate report type, reference to hidi2c_report_type</div><div class='add'>+ * @reserved0:		[6:7] reserved bits</div><div class='add'>+ * @opcode:		[8:11] command operation code, reference to hidi2c_opcode</div><div class='add'>+ * @reserved1:		[12:15] reserved bits</div><div class='add'>+ * @report_id_optional: [23:16] appended 3rd byte.</div><div class='add'>+ *                      If the report_id in the low byte is set to the</div><div class='add'>+ *                      sentinel value (HIDI2C_CMD_MAX_RI), then this</div><div class='add'>+ *                      optional third byte represents the report id (&gt;=15)</div><div class='add'>+ *                      Otherwise, not this 3rd byte.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HIDI2C_CMD_LEN			sizeof(__le16)</div><div class='add'>+#define HIDI2C_CMD_LEN_OPT		(sizeof(__le16) + 1)</div><div class='add'>+#define HIDI2C_CMD_REPORT_ID		GENMASK(3, 0)</div><div class='add'>+#define HIDI2C_CMD_REPORT_TYPE		GENMASK(5, 4)</div><div class='add'>+#define HIDI2C_CMD_OPCODE		GENMASK(11, 8)</div><div class='add'>+#define HIDI2C_CMD_OPCODE		GENMASK(11, 8)</div><div class='add'>+#define HIDI2C_CMD_3RD_BYTE		GENMASK(23, 16)</div><div class='add'>+</div><div class='add'>+#define HIDI2C_HID_DESC_BCDVERSION	0x100</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hidi2c_dev_descriptor - HIDI2C device descriptor definition</div><div class='add'>+ * @dev_desc_len: The length of the complete device descriptor, fixed to 0x1E (30).</div><div class='add'>+ * @bcd_ver: The version number of the HIDI2C protocol supported.</div><div class='add'>+ *           In binary coded decimal (BCD) format.</div><div class='add'>+ * @report_desc_len: The length of the report descriptor</div><div class='add'>+ * @report_desc_reg: The register address to retrieve report descriptor</div><div class='add'>+ * @input_reg: the register address to retrieve input report</div><div class='add'>+ * @max_input_len: The length of the largest possible HID input (or feature) report</div><div class='add'>+ * @output_reg: the register address to send output report</div><div class='add'>+ * @max_output_len: The length of the largest output (or feature) report</div><div class='add'>+ * @cmd_reg: the register address to send command</div><div class='add'>+ * @data_reg: the register address to send command data</div><div class='add'>+ * @vendor_id: Device manufacturers vendor ID</div><div class='add'>+ * @product_id: Device unique model/product ID</div><div class='add'>+ * @version_id: Device’s unique version</div><div class='add'>+ * @reserved0: Reserved and should be 0</div><div class='add'>+ * @reserved1: Reserved and should be 0</div><div class='add'>+ */</div><div class='add'>+struct hidi2c_dev_descriptor {</div><div class='add'>+	__le16 dev_desc_len;</div><div class='add'>+	__le16 bcd_ver;</div><div class='add'>+	__le16 report_desc_len;</div><div class='add'>+	__le16 report_desc_reg;</div><div class='add'>+	__le16 input_reg;</div><div class='add'>+	__le16 max_input_len;</div><div class='add'>+	__le16 output_reg;</div><div class='add'>+	__le16 max_output_len;</div><div class='add'>+	__le16 cmd_reg;</div><div class='add'>+	__le16 data_reg;</div><div class='add'>+	__le16 vendor_id;</div><div class='add'>+	__le16 product_id;</div><div class='add'>+	__le16 version_id;</div><div class='add'>+	__le16 reserved0;</div><div class='add'>+	__le16 reserved1;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HIDI2C_DEV_DESC_LEN		sizeof(struct hidi2c_dev_descriptor)</div><div class='add'>+</div><div class='add'>+#endif /* _HID_OVER_I2C_H_ */</div><div class='head'>diff --git a/include/linux/hid-over-spi.h b/include/linux/hid-over-spi.h<br/>new file mode 100644<br/>index 000000000000..da5a14b5e89b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hid-over-spi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hid-over-spi.h</a></div><div class='hunk'>@@ -0,0 +1,155 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright 2024 Intel Corporation */</div><div class='add'>+</div><div class='add'>+#ifndef _HID_OVER_SPI_H_</div><div class='add'>+#define _HID_OVER_SPI_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* Input report type definition in HIDSPI protocol */</div><div class='add'>+enum input_report_type {</div><div class='add'>+	INVALID_INPUT_REPORT_TYPE_0	= 0,</div><div class='add'>+	DATA				= 1,</div><div class='add'>+	INVALID_TYPE_2			= 2,</div><div class='add'>+	RESET_RESPONSE			= 3,</div><div class='add'>+	COMMAND_RESPONSE		= 4,</div><div class='add'>+	GET_FEATURE_RESPONSE		= 5,</div><div class='add'>+	INVALID_TYPE_6			= 6,</div><div class='add'>+	DEVICE_DESCRIPTOR_RESPONSE	= 7,</div><div class='add'>+	REPORT_DESCRIPTOR_RESPONSE	= 8,</div><div class='add'>+	SET_FEATURE_RESPONSE		= 9,</div><div class='add'>+	OUTPUT_REPORT_RESPONSE		= 10,</div><div class='add'>+	GET_INPUT_REPORT_RESPONSE	= 11,</div><div class='add'>+	INVALID_INPUT_REPORT_TYPE	= 0xF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Output report type definition in HIDSPI protocol */</div><div class='add'>+enum output_report_type {</div><div class='add'>+	INVALID_OUTPUT_REPORT_TYPE_0	= 0,</div><div class='add'>+	DEVICE_DESCRIPTOR		= 1,</div><div class='add'>+	REPORT_DESCRIPTOR		= 2,</div><div class='add'>+	SET_FEATURE			= 3,</div><div class='add'>+	GET_FEATURE			= 4,</div><div class='add'>+	OUTPUT_REPORT			= 5,</div><div class='add'>+	GET_INPUT_REPORT		= 6,</div><div class='add'>+	COMMAND_CONTENT			= 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Set power command ID for output report */</div><div class='add'>+#define HIDSPI_SET_POWER_CMD_ID  1</div><div class='add'>+</div><div class='add'>+/* Power state definition in HIDSPI protocol */</div><div class='add'>+enum hidspi_power_state {</div><div class='add'>+	HIDSPI_ON	= 1,</div><div class='add'>+	HIDSPI_SLEEP	= 2,</div><div class='add'>+	HIDSPI_OFF	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Input report header definition in HIDSPI protocol</div><div class='add'>+ * Report header size is 32bits, it includes:</div><div class='add'>+ * protocol_ver:     [0:3] Current supported HIDSPI protocol version, must be 0x3</div><div class='add'>+ * reserved0:        [4:7] Reserved bits</div><div class='add'>+ * input_report_len: [8:21] Input report length in number bytes divided by 4</div><div class='add'>+ * last_frag_flag:   [22]Indicate if this packet is last fragment.</div><div class='add'>+ *                       1 - indicates last fragment</div><div class='add'>+ *                       0 - indicates additional fragments</div><div class='add'>+ * reserved1:        [23] Reserved bits</div><div class='add'>+ * @sync_const:      [24:31] Used to validate input report header, must be 0x5A</div><div class='add'>+ */</div><div class='add'>+#define HIDSPI_INPUT_HEADER_SIZE		sizeof(u32)</div><div class='add'>+#define HIDSPI_INPUT_HEADER_VER			GENMASK(3, 0)</div><div class='add'>+#define HIDSPI_INPUT_HEADER_REPORT_LEN		GENMASK(21, 8)</div><div class='add'>+#define HIDSPI_INPUT_HEADER_LAST_FLAG		BIT(22)</div><div class='add'>+#define HIDSPI_INPUT_HEADER_SYNC		GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct input_report_body_header - Input report body header definition in HIDSPI protocol</div><div class='add'>+ * @input_report_type: indicate input report type, reference to enum input_report_type</div><div class='add'>+ * @content_len: this input report body packet length</div><div class='add'>+ * @content_id: indicate this input report's report id</div><div class='add'>+ */</div><div class='add'>+struct input_report_body_header {</div><div class='add'>+	u8 input_report_type;</div><div class='add'>+	__le16 content_len;</div><div class='add'>+	u8 content_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HIDSPI_INPUT_BODY_HEADER_SIZE	sizeof(struct input_report_body_header)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct input_report_body - Input report body definition in HIDSPI protocol</div><div class='add'>+ * @body_hdr: input report body header</div><div class='add'>+ * @content: input report body content</div><div class='add'>+ */</div><div class='add'>+struct input_report_body {</div><div class='add'>+	struct input_report_body_header body_hdr;</div><div class='add'>+	u8 content[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HIDSPI_INPUT_BODY_SIZE(content_len)	((content_len) + HIDSPI_INPUT_BODY_HEADER_SIZE)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct output_report_header - Output report header definition in HIDSPI protocol</div><div class='add'>+ * @report_type: output report type, reference to enum output_report_type</div><div class='add'>+ * @content_len: length of content</div><div class='add'>+ * @content_id: 0x00 - descriptors</div><div class='add'>+ *              report id - Set/Feature feature or Input/Output Reports</div><div class='add'>+ *              command opcode - for commands</div><div class='add'>+ */</div><div class='add'>+struct output_report_header {</div><div class='add'>+	u8 report_type;</div><div class='add'>+	__le16 content_len;</div><div class='add'>+	u8 content_id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HIDSPI_OUTPUT_REPORT_HEADER_SIZE	sizeof(struct output_report_header)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct output_report - Output report definition in HIDSPI protocol</div><div class='add'>+ * @output_hdr: output report header</div><div class='add'>+ * @content: output report content</div><div class='add'>+ */</div><div class='add'>+struct output_report {</div><div class='add'>+	struct output_report_header output_hdr;</div><div class='add'>+	u8 content[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define HIDSPI_OUTPUT_REPORT_SIZE(content_len)	((content_len) + HIDSPI_OUTPUT_REPORT_HEADER_SIZE)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hidspi_dev_descriptor - HIDSPI device descriptor definition</div><div class='add'>+ * @dev_desc_len: The length of the complete device descriptor, fixed to 0x18 (24).</div><div class='add'>+ * @bcd_ver: The version number of the HIDSPI protocol supported.</div><div class='add'>+ *           In binary coded decimal (BCD) format. Must be fixed to 0x0300.</div><div class='add'>+ * @rep_desc_len: The length of the report descriptor</div><div class='add'>+ * @max_input_len: The length of the largest possible HID input (or feature) report</div><div class='add'>+ * @max_output_len: The length of the largest output (or feature) report</div><div class='add'>+ * @max_frag_len: The length of the largest fragment, where a fragment represents</div><div class='add'>+ *                the body of an input report.</div><div class='add'>+ * @vendor_id: Device manufacturers vendor ID</div><div class='add'>+ * @product_id: Device unique model/product ID</div><div class='add'>+ * @version_id: Device’s unique version</div><div class='add'>+ * @flags: Specify flags for the device’s operation</div><div class='add'>+ * @reserved: Reserved and should be 0</div><div class='add'>+ */</div><div class='add'>+struct hidspi_dev_descriptor {</div><div class='add'>+	__le16 dev_desc_len;</div><div class='add'>+	__le16 bcd_ver;</div><div class='add'>+	__le16 rep_desc_len;</div><div class='add'>+	__le16 max_input_len;</div><div class='add'>+	__le16 max_output_len;</div><div class='add'>+	__le16 max_frag_len;</div><div class='add'>+	__le16 vendor_id;</div><div class='add'>+	__le16 product_id;</div><div class='add'>+	__le16 version_id;</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le32 reserved;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HIDSPI_DEVICE_DESCRIPTOR_SIZE		sizeof(struct hidspi_dev_descriptor)</div><div class='add'>+#define HIDSPI_INPUT_DEVICE_DESCRIPTOR_SIZE	\</div><div class='add'>+	(HIDSPI_INPUT_BODY_HEADER_SIZE + HIDSPI_DEVICE_DESCRIPTOR_SIZE)</div><div class='add'>+</div><div class='add'>+#endif /* _HID_OVER_SPI_H_ */</div><div class='head'>diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h<br/>index c27329e2a5ad..e71056553108 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hid-sensor-hub.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid-sensor-hub.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hid-sensor-hub.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hid-sensor-hub.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'>  * @attrib_id:		Attribute id for this attribute.</div><div class='ctx'>  * @report_id:		Report id in which this information resides.</div><div class='ctx'>  * @index:		Field index in the report.</div><div class='del'>- * @units:		Measurment unit for this attribute.</div><div class='add'>+ * @units:		Measurement unit for this attribute.</div><div class='ctx'>  * @unit_expo:		Exponent used in the data.</div><div class='ctx'>  * @size:		Size in bytes for data size.</div><div class='ctx'>  * @logical_minimum:	Logical minimum value for this attribute.</div><div class='hunk'>@@ -39,8 +39,8 @@ struct hid_sensor_hub_attribute_info {</div><div class='ctx'>  * struct sensor_hub_pending - Synchronous read pending information</div><div class='ctx'>  * @status:		Pending status true/false.</div><div class='ctx'>  * @ready:		Completion synchronization data.</div><div class='del'>- * @usage_id:		Usage id for physical device, E.g. Gyro usage id.</div><div class='del'>- * @attr_usage_id:	Usage Id of a field, E.g. X-AXIS for a gyro.</div><div class='add'>+ * @usage_id:		Usage id for physical device, e.g. gyro usage id.</div><div class='add'>+ * @attr_usage_id:	Usage Id of a field, e.g. X-axis for a gyro.</div><div class='ctx'>  * @raw_size:		Response size for a read request.</div><div class='ctx'>  * @raw_data:		Place holder for received response.</div><div class='ctx'>  */</div><div class='hunk'>@@ -104,10 +104,10 @@ struct hid_sensor_hub_callbacks {</div><div class='ctx'> int sensor_hub_device_open(struct hid_sensor_hub_device *hsdev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-* sensor_hub_device_clode() - Close hub device</div><div class='add'>+* sensor_hub_device_close() - Close hub device</div><div class='ctx'> * @hsdev:	Hub device instance.</div><div class='ctx'> *</div><div class='del'>-* Used to clode hid device for sensor hub.</div><div class='add'>+* Used to close hid device for sensor hub.</div><div class='ctx'> */</div><div class='ctx'> void sensor_hub_device_close(struct hid_sensor_hub_device *hsdev);</div><div class='ctx'> </div><div class='hunk'>@@ -128,12 +128,13 @@ int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev,</div><div class='ctx'> 			struct hid_sensor_hub_callbacks *usage_callback);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-* sensor_hub_remove_callback() - Remove client callbacks</div><div class='add'>+* sensor_hub_remove_callback() - Remove client callback</div><div class='ctx'> * @hsdev:	Hub device instance.</div><div class='del'>-* @usage_id:	Usage id of the client (E.g. 0x200076 for Gyro).</div><div class='add'>+* @usage_id:	Usage id of the client (e.g. 0x200076 for gyro).</div><div class='ctx'> *</div><div class='del'>-* If there is a callback registred, this call will remove that</div><div class='del'>-* callbacks, so that it will stop data and event notifications.</div><div class='add'>+* Removes a previously registered callback for the given usage_id</div><div class='add'>+* and hsdev. Once removed, the client will no longer receive data or</div><div class='add'>+* event notifications.</div><div class='ctx'> */</div><div class='ctx'> int sensor_hub_remove_callback(struct hid_sensor_hub_device *hsdev,</div><div class='ctx'> 			u32 usage_id);</div><div class='head'>diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h<br/>index 13b1e65fbdcc..8a03d9696b1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hid-sensor-ids.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid-sensor-ids.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hid-sensor-ids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hid-sensor-ids.h</a></div><div class='hunk'>@@ -21,11 +21,17 @@</div><div class='ctx'> #define HID_USAGE_SENSOR_ALS					0x200041</div><div class='ctx'> #define HID_USAGE_SENSOR_DATA_LIGHT				0x2004d0</div><div class='ctx'> #define HID_USAGE_SENSOR_LIGHT_ILLUM				0x2004d1</div><div class='add'>+#define HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE		0x2004d2</div><div class='add'>+#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY			0x2004d3</div><div class='add'>+#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY_X			0x2004d4</div><div class='add'>+#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY_Y			0x2004d5</div><div class='ctx'> </div><div class='ctx'> /* PROX (200011) */</div><div class='ctx'> #define HID_USAGE_SENSOR_PROX                                   0x200011</div><div class='ctx'> #define HID_USAGE_SENSOR_DATA_PRESENCE                          0x2004b0</div><div class='ctx'> #define HID_USAGE_SENSOR_HUMAN_PRESENCE                         0x2004b1</div><div class='add'>+#define HID_USAGE_SENSOR_HUMAN_PROXIMITY                        0x2004b2</div><div class='add'>+#define HID_USAGE_SENSOR_HUMAN_ATTENTION                        0x2004bd</div><div class='ctx'> </div><div class='ctx'> /* Pressure (200031) */</div><div class='ctx'> #define HID_USAGE_SENSOR_PRESSURE                               0x200031</div><div class='head'>diff --git a/include/linux/hid.h b/include/linux/hid.h<br/>index 7c26db874ff0..dce862cafbbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hid.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hid.h</a></div><div class='hunk'>@@ -46,7 +46,7 @@ struct hid_item {</div><div class='ctx'> 	    __s16  s16;</div><div class='ctx'> 	    __u32  u32;</div><div class='ctx'> 	    __s32  s32;</div><div class='del'>-	    __u8  *longdata;</div><div class='add'>+	    const __u8  *longdata;</div><div class='ctx'> 	} data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +81,8 @@ struct hid_item {</div><div class='ctx'> #define HID_MAIN_ITEM_TAG_FEATURE		11</div><div class='ctx'> #define HID_MAIN_ITEM_TAG_BEGIN_COLLECTION	10</div><div class='ctx'> #define HID_MAIN_ITEM_TAG_END_COLLECTION	12</div><div class='add'>+#define HID_MAIN_ITEM_TAG_RESERVED_MIN		13</div><div class='add'>+#define HID_MAIN_ITEM_TAG_RESERVED_MAX		15</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * HID report descriptor main item contents</div><div class='hunk'>@@ -154,6 +156,7 @@ struct hid_item {</div><div class='ctx'> #define HID_UP_TELEPHONY	0x000b0000</div><div class='ctx'> #define HID_UP_CONSUMER		0x000c0000</div><div class='ctx'> #define HID_UP_DIGITIZER	0x000d0000</div><div class='add'>+#define HID_UP_HAPTIC		0x000e0000</div><div class='ctx'> #define HID_UP_PID		0x000f0000</div><div class='ctx'> #define HID_UP_BATTERY		0x00850000</div><div class='ctx'> #define HID_UP_CAMERA		0x00900000</div><div class='hunk'>@@ -218,6 +221,7 @@ struct hid_item {</div><div class='ctx'> #define HID_GD_DOWN		0x00010091</div><div class='ctx'> #define HID_GD_RIGHT		0x00010092</div><div class='ctx'> #define HID_GD_LEFT		0x00010093</div><div class='add'>+#define HID_GD_DO_NOT_DISTURB	0x0001009b</div><div class='ctx'> /* Microsoft Win8 Wireless Radio Controls CA usage codes */</div><div class='ctx'> #define HID_GD_RFKILL_BTN	0x000100c6</div><div class='ctx'> #define HID_GD_RFKILL_LED	0x000100c7</div><div class='hunk'>@@ -313,6 +317,28 @@ struct hid_item {</div><div class='ctx'> #define HID_DG_TOOLSERIALNUMBER	0x000d005b</div><div class='ctx'> #define HID_DG_LATENCYMODE	0x000d0060</div><div class='ctx'> </div><div class='add'>+#define HID_HP_SIMPLECONTROLLER	0x000e0001</div><div class='add'>+#define HID_HP_WAVEFORMLIST	0x000e0010</div><div class='add'>+#define HID_HP_DURATIONLIST	0x000e0011</div><div class='add'>+#define HID_HP_AUTOTRIGGER	0x000e0020</div><div class='add'>+#define HID_HP_MANUALTRIGGER	0x000e0021</div><div class='add'>+#define HID_HP_AUTOTRIGGERASSOCIATEDCONTROL 0x000e0022</div><div class='add'>+#define HID_HP_INTENSITY	0x000e0023</div><div class='add'>+#define HID_HP_REPEATCOUNT	0x000e0024</div><div class='add'>+#define HID_HP_RETRIGGERPERIOD	0x000e0025</div><div class='add'>+#define HID_HP_WAVEFORMVENDORPAGE	0x000e0026</div><div class='add'>+#define HID_HP_WAVEFORMVENDORID	0x000e0027</div><div class='add'>+#define HID_HP_WAVEFORMCUTOFFTIME	0x000e0028</div><div class='add'>+#define HID_HP_WAVEFORMNONE	0x000e1001</div><div class='add'>+#define HID_HP_WAVEFORMSTOP	0x000e1002</div><div class='add'>+#define HID_HP_WAVEFORMCLICK	0x000e1003</div><div class='add'>+#define HID_HP_WAVEFORMBUZZCONTINUOUS	0x000e1004</div><div class='add'>+#define HID_HP_WAVEFORMRUMBLECONTINUOUS	0x000e1005</div><div class='add'>+#define HID_HP_WAVEFORMPRESS	0x000e1006</div><div class='add'>+#define HID_HP_WAVEFORMRELEASE	0x000e1007</div><div class='add'>+#define HID_HP_VENDORWAVEFORMMIN	0x000e2001</div><div class='add'>+#define HID_HP_VENDORWAVEFORMMAX	0x000e2fff</div><div class='add'>+</div><div class='ctx'> #define HID_BAT_ABSOLUTESTATEOFCHARGE	0x00850065</div><div class='ctx'> #define HID_BAT_CHARGING		0x00850044</div><div class='ctx'> </div><div class='hunk'>@@ -354,11 +380,14 @@ struct hid_item {</div><div class='ctx'>  * | @HID_QUIRK_INPUT_PER_APP:</div><div class='ctx'>  * | @HID_QUIRK_X_INVERT:</div><div class='ctx'>  * | @HID_QUIRK_Y_INVERT:</div><div class='add'>+ * | @HID_QUIRK_IGNORE_MOUSE:</div><div class='ctx'>  * | @HID_QUIRK_SKIP_OUTPUT_REPORTS:</div><div class='ctx'>  * | @HID_QUIRK_SKIP_OUTPUT_REPORT_ID:</div><div class='ctx'>  * | @HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP:</div><div class='ctx'>  * | @HID_QUIRK_HAVE_SPECIAL_DRIVER:</div><div class='ctx'>  * | @HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE:</div><div class='add'>+ * | @HID_QUIRK_IGNORE_SPECIAL_DRIVER</div><div class='add'>+ * | @HID_QUIRK_POWER_ON_AFTER_BACKLIGHT</div><div class='ctx'>  * | @HID_QUIRK_FULLSPEED_INTERVAL:</div><div class='ctx'>  * | @HID_QUIRK_NO_INIT_REPORTS:</div><div class='ctx'>  * | @HID_QUIRK_NO_IGNORE:</div><div class='hunk'>@@ -378,12 +407,15 @@ struct hid_item {</div><div class='ctx'> #define HID_QUIRK_INPUT_PER_APP			BIT(11)</div><div class='ctx'> #define HID_QUIRK_X_INVERT			BIT(12)</div><div class='ctx'> #define HID_QUIRK_Y_INVERT			BIT(13)</div><div class='add'>+#define HID_QUIRK_IGNORE_MOUSE			BIT(14)</div><div class='ctx'> #define HID_QUIRK_SKIP_OUTPUT_REPORTS		BIT(16)</div><div class='ctx'> #define HID_QUIRK_SKIP_OUTPUT_REPORT_ID		BIT(17)</div><div class='ctx'> #define HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP	BIT(18)</div><div class='ctx'> #define HID_QUIRK_HAVE_SPECIAL_DRIVER		BIT(19)</div><div class='ctx'> #define HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE	BIT(20)</div><div class='ctx'> #define HID_QUIRK_NOINVERT			BIT(21)</div><div class='add'>+#define HID_QUIRK_IGNORE_SPECIAL_DRIVER		BIT(22)</div><div class='add'>+#define HID_QUIRK_POWER_ON_AFTER_BACKLIGHT	BIT(23)</div><div class='ctx'> #define HID_QUIRK_FULLSPEED_INTERVAL		BIT(28)</div><div class='ctx'> #define HID_QUIRK_NO_INIT_REPORTS		BIT(29)</div><div class='ctx'> #define HID_QUIRK_NO_IGNORE			BIT(30)</div><div class='hunk'>@@ -417,6 +449,12 @@ struct hid_item {</div><div class='ctx'> #define HID_BOOT_PROTOCOL	0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * HID units</div><div class='add'>+ */</div><div class='add'>+#define HID_UNIT_GRAM		0x0101</div><div class='add'>+#define HID_UNIT_NEWTON		0xe111</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This is the global environment of the parser. This information is</div><div class='ctx'>  * persistent for main-items. The global environment can be saved and</div><div class='ctx'>  * restored with PUSH/POP statements.</div><div class='hunk'>@@ -474,9 +512,9 @@ struct hid_usage {</div><div class='ctx'> 	__s8	  wheel_factor;		/* 120/resolution_multiplier */</div><div class='ctx'> 	__u16     code;			/* input driver code */</div><div class='ctx'> 	__u8      type;			/* input driver type */</div><div class='del'>-	__s8	  hat_min;		/* hat switch fun */</div><div class='del'>-	__s8	  hat_max;		/* ditto */</div><div class='del'>-	__s8	  hat_dir;		/* ditto */</div><div class='add'>+	__s16	  hat_min;		/* hat switch fun */</div><div class='add'>+	__s16	  hat_max;		/* ditto */</div><div class='add'>+	__s16	  hat_dir;		/* ditto */</div><div class='ctx'> 	__s16	  wheel_accumulated;	/* hi-res wheel */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -599,15 +637,17 @@ enum hid_battery_status {</div><div class='ctx'> struct hid_driver;</div><div class='ctx'> struct hid_ll_driver;</div><div class='ctx'> </div><div class='del'>-struct hid_device {							/* device report descriptor */</div><div class='del'>-	__u8 *dev_rdesc;</div><div class='del'>-	unsigned dev_rsize;</div><div class='del'>-	__u8 *rdesc;</div><div class='del'>-	unsigned rsize;</div><div class='add'>+struct hid_device {</div><div class='add'>+	const __u8 *dev_rdesc;						/* device report descriptor */</div><div class='add'>+	const __u8 *bpf_rdesc;						/* bpf modified report descriptor, if any */</div><div class='add'>+	const __u8 *rdesc;						/* currently used report descriptor */</div><div class='add'>+	unsigned int dev_rsize;</div><div class='add'>+	unsigned int bpf_rsize;</div><div class='add'>+	unsigned int rsize;</div><div class='add'>+	unsigned int collection_size;					/* Number of allocated hid_collections */</div><div class='ctx'> 	struct hid_collection *collection;				/* List of HID collections */</div><div class='del'>-	unsigned collection_size;					/* Number of allocated hid_collections */</div><div class='del'>-	unsigned maxcollection;						/* Number of parsed collections */</div><div class='del'>-	unsigned maxapplication;					/* Number of applications */</div><div class='add'>+	unsigned int maxcollection;						/* Number of parsed collections */</div><div class='add'>+	unsigned int maxapplication;					/* Number of applications */</div><div class='ctx'> 	__u16 bus;							/* BUS ID */</div><div class='ctx'> 	__u16 group;							/* Report group */</div><div class='ctx'> 	__u32 vendor;							/* Vendor ID */</div><div class='hunk'>@@ -683,9 +723,9 @@ struct hid_device {							/* device report descriptor */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int id;						/* system unique id */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BPF</div><div class='add'>+#ifdef CONFIG_HID_BPF</div><div class='ctx'> 	struct hid_bpf bpf;						/* hid-bpf data */</div><div class='del'>-#endif /* CONFIG_BPF */</div><div class='add'>+#endif /* CONFIG_HID_BPF */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void hiddev_free(struct kref *ref);</div><div class='hunk'>@@ -733,8 +773,9 @@ struct hid_descriptor {</div><div class='ctx'> 	__le16 bcdHID;</div><div class='ctx'> 	__u8  bCountryCode;</div><div class='ctx'> 	__u8  bNumDescriptors;</div><div class='add'>+	struct hid_class_descriptor rpt_desc;</div><div class='ctx'> </div><div class='del'>-	struct hid_class_descriptor desc[1];</div><div class='add'>+	struct hid_class_descriptor opt_descs[];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> #define HID_DEVICE(b, g, ven, prod)					\</div><div class='hunk'>@@ -785,6 +826,8 @@ struct hid_usage_id {</div><div class='ctx'>  * @suspend: invoked on suspend (NULL means nop)</div><div class='ctx'>  * @resume: invoked on resume if device was not reset (NULL means nop)</div><div class='ctx'>  * @reset_resume: invoked on resume if device was reset (NULL means nop)</div><div class='add'>+ * @on_hid_hw_open: invoked when hid core opens first instance (NULL means nop)</div><div class='add'>+ * @on_hid_hw_close: invoked when hid core closes last instance (NULL means nop)</div><div class='ctx'>  *</div><div class='ctx'>  * probe should return -errno on error, or 0 on success. During probe,</div><div class='ctx'>  * input will not be passed to raw_event unless hid_device_io_start is</div><div class='hunk'>@@ -804,7 +847,7 @@ struct hid_usage_id {</div><div class='ctx'>  * zero from them.</div><div class='ctx'>  */</div><div class='ctx'> struct hid_driver {</div><div class='del'>-	char *name;</div><div class='add'>+	const char *name;</div><div class='ctx'> 	const struct hid_device_id *id_table;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head dyn_list;</div><div class='hunk'>@@ -822,7 +865,7 @@ struct hid_driver {</div><div class='ctx'> 			struct hid_usage *usage, __s32 value);</div><div class='ctx'> 	void (*report)(struct hid_device *hdev, struct hid_report *report);</div><div class='ctx'> </div><div class='del'>-	__u8 *(*report_fixup)(struct hid_device *hdev, __u8 *buf,</div><div class='add'>+	const __u8 *(*report_fixup)(struct hid_device *hdev, __u8 *buf,</div><div class='ctx'> 			unsigned int *size);</div><div class='ctx'> </div><div class='ctx'> 	int (*input_mapping)(struct hid_device *hdev,</div><div class='hunk'>@@ -840,6 +883,8 @@ struct hid_driver {</div><div class='ctx'> 	int (*suspend)(struct hid_device *hdev, pm_message_t message);</div><div class='ctx'> 	int (*resume)(struct hid_device *hdev);</div><div class='ctx'> 	int (*reset_resume)(struct hid_device *hdev);</div><div class='add'>+	void (*on_hid_hw_open)(struct hid_device *hdev);</div><div class='add'>+	void (*on_hid_hw_close)(struct hid_device *hdev);</div><div class='ctx'> </div><div class='ctx'> /* private: */</div><div class='ctx'> 	struct device_driver driver;</div><div class='hunk'>@@ -939,7 +984,10 @@ extern void hidinput_hid_event(struct hid_device *, struct hid_field *, struct h</div><div class='ctx'> extern void hidinput_report_event(struct hid_device *hid, struct hid_report *report);</div><div class='ctx'> extern int hidinput_connect(struct hid_device *hid, unsigned int force);</div><div class='ctx'> extern void hidinput_disconnect(struct hid_device *);</div><div class='add'>+void hidinput_reset_resume(struct hid_device *hid);</div><div class='ctx'> </div><div class='add'>+struct hid_field *hid_find_field(struct hid_device *hdev, unsigned int report_type,</div><div class='add'>+				 unsigned int application, unsigned int usage);</div><div class='ctx'> int hid_set_field(struct hid_field *, unsigned, __s32);</div><div class='ctx'> int hid_input_report(struct hid_device *hid, enum hid_report_type type, u8 *data, u32 size,</div><div class='ctx'> 		     int interrupt);</div><div class='hunk'>@@ -953,7 +1001,7 @@ struct hid_device *hid_allocate_device(void);</div><div class='ctx'> struct hid_report *hid_register_report(struct hid_device *device,</div><div class='ctx'> 				       enum hid_report_type type, unsigned int id,</div><div class='ctx'> 				       unsigned int application);</div><div class='del'>-int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);</div><div class='add'>+int hid_parse_report(struct hid_device *hid, const __u8 *start, unsigned size);</div><div class='ctx'> struct hid_report *hid_validate_values(struct hid_device *hid,</div><div class='ctx'> 				       enum hid_report_type type, unsigned int id,</div><div class='ctx'> 				       unsigned int field_index,</div><div class='hunk'>@@ -972,7 +1020,6 @@ const struct hid_device_id *hid_match_device(struct hid_device *hdev,</div><div class='ctx'> 					     struct hid_driver *hdrv);</div><div class='ctx'> bool hid_compare_device_paths(struct hid_device *hdev_a,</div><div class='ctx'> 			      struct hid_device *hdev_b, char separator);</div><div class='del'>-s32 hid_snto32(__u32 value, unsigned n);</div><div class='ctx'> __u32 hid_field_extract(const struct hid_device *hid, __u8 *report,</div><div class='ctx'> 		     unsigned offset, unsigned n);</div><div class='ctx'> </div><div class='hunk'>@@ -1125,6 +1172,13 @@ int __must_check hid_hw_open(struct hid_device *hdev);</div><div class='ctx'> void hid_hw_close(struct hid_device *hdev);</div><div class='ctx'> void hid_hw_request(struct hid_device *hdev,</div><div class='ctx'> 		    struct hid_report *report, enum hid_class_request reqtype);</div><div class='add'>+int __hid_hw_raw_request(struct hid_device *hdev,</div><div class='add'>+			 unsigned char reportnum, __u8 *buf,</div><div class='add'>+			 size_t len, enum hid_report_type rtype,</div><div class='add'>+			 enum hid_class_request reqtype,</div><div class='add'>+			 __u64 source, bool from_bpf);</div><div class='add'>+int __hid_hw_output_report(struct hid_device *hdev, __u8 *buf, size_t len, __u64 source,</div><div class='add'>+			   bool from_bpf);</div><div class='ctx'> int hid_hw_raw_request(struct hid_device *hdev,</div><div class='ctx'> 		       unsigned char reportnum, __u8 *buf,</div><div class='ctx'> 		       size_t len, enum hid_report_type rtype,</div><div class='hunk'>@@ -1194,7 +1248,11 @@ static inline void hid_hw_wait(struct hid_device *hdev)</div><div class='ctx'> /**</div><div class='ctx'>  * hid_report_len - calculate the report length</div><div class='ctx'>  *</div><div class='del'>- * @report: the report we want to know the length</div><div class='add'>+ * @report: the report whose length we want to know</div><div class='add'>+ *</div><div class='add'>+ * The length counts the report ID byte, but only if the ID is nonzero</div><div class='add'>+ * and therefore is included in the report.  Reports whose ID is zero</div><div class='add'>+ * never include an ID byte.</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 hid_report_len(struct hid_report *report)</div><div class='ctx'> {</div><div class='hunk'>@@ -1209,12 +1267,6 @@ unsigned long hid_lookup_quirk(const struct hid_device *hdev);</div><div class='ctx'> int hid_quirks_init(char **quirks_param, __u16 bus, int count);</div><div class='ctx'> void hid_quirks_exit(__u16 bus);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HID_PID</div><div class='del'>-int hid_pidff_init(struct hid_device *hid);</div><div class='del'>-#else</div><div class='del'>-#define hid_pidff_init NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #define dbg_hid(fmt, ...) pr_debug("%s: " fmt, __FILE__, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #define hid_err(hid, fmt, ...)				\</div><div class='hunk'>@@ -1223,6 +1275,8 @@ int hid_pidff_init(struct hid_device *hid);</div><div class='ctx'> 	dev_notice(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define hid_warn(hid, fmt, ...)				\</div><div class='ctx'> 	dev_warn(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+#define hid_warn_ratelimited(hid, fmt, ...)				\</div><div class='add'>+	dev_warn_ratelimited(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define hid_info(hid, fmt, ...)				\</div><div class='ctx'> 	dev_info(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define hid_dbg(hid, fmt, ...)				\</div><div class='hunk'>@@ -1239,4 +1293,15 @@ int hid_pidff_init(struct hid_device *hid);</div><div class='ctx'> #define hid_dbg_once(hid, fmt, ...)			\</div><div class='ctx'> 	dev_dbg_once(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='add'>+#define hid_err_ratelimited(hid, fmt, ...)			\</div><div class='add'>+	dev_err_ratelimited(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+#define hid_notice_ratelimited(hid, fmt, ...)			\</div><div class='add'>+	dev_notice_ratelimited(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+#define hid_warn_ratelimited(hid, fmt, ...)			\</div><div class='add'>+	dev_warn_ratelimited(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+#define hid_info_ratelimited(hid, fmt, ...)			\</div><div class='add'>+	dev_info_ratelimited(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+#define hid_dbg_ratelimited(hid, fmt, ...)			\</div><div class='add'>+	dev_dbg_ratelimited(&amp;(hid)-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/hid_bpf.h b/include/linux/hid_bpf.h<br/>index 7118ac28d468..a2e47dbcf82c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hid_bpf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hid_bpf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hid_bpf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hid_bpf.h</a></div><div class='hunk'>@@ -4,7 +4,8 @@</div><div class='ctx'> #define __HID_BPF_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/srcu.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/hid.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct hid_device;</div><div class='hunk'>@@ -20,15 +21,9 @@ struct hid_device;</div><div class='ctx'>  * struct hid_bpf_ctx - User accessible data for all HID programs</div><div class='ctx'>  *</div><div class='ctx'>  * ``data`` is not directly accessible from the context. We need to issue</div><div class='del'>- * a call to ``hid_bpf_get_data()`` in order to get a pointer to that field.</div><div class='add'>+ * a call to hid_bpf_get_data() in order to get a pointer to that field.</div><div class='ctx'>  *</div><div class='del'>- * All of these fields are currently read-only.</div><div class='del'>- *</div><div class='del'>- * @index: program index in the jump table. No special meaning (a smaller index</div><div class='del'>- *         doesn't mean the program will be executed before another program with</div><div class='del'>- *         a bigger index).</div><div class='del'>- * @hid: the ``struct hid_device`` representing the device itself</div><div class='del'>- * @report_type: used for ``hid_bpf_device_event()``</div><div class='add'>+ * @hid: the &amp;struct hid_device representing the device itself</div><div class='ctx'>  * @allocated_size: Allocated size of data.</div><div class='ctx'>  *</div><div class='ctx'>  *                  This is how much memory is available and can be requested</div><div class='hunk'>@@ -45,73 +40,147 @@ struct hid_device;</div><div class='ctx'>  *        ``size`` must always be less or equal than ``allocated_size`` (it is enforced</div><div class='ctx'>  *        once all BPF programs have been run).</div><div class='ctx'>  * @retval: Return value of the previous program.</div><div class='add'>+ *</div><div class='add'>+ * ``hid`` and ``allocated_size`` are read-only, ``size`` and ``retval`` are read-write.</div><div class='ctx'>  */</div><div class='ctx'> struct hid_bpf_ctx {</div><div class='del'>-	__u32 index;</div><div class='del'>-	const struct hid_device *hid;</div><div class='add'>+	struct hid_device *hid;</div><div class='ctx'> 	__u32 allocated_size;</div><div class='del'>-	enum hid_report_type report_type;</div><div class='ctx'> 	union {</div><div class='ctx'> 		__s32 retval;</div><div class='ctx'> 		__s32 size;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum hid_bpf_attach_flags - flags used when attaching a HIF-BPF program</div><div class='del'>- *</div><div class='del'>- * @HID_BPF_FLAG_NONE: no specific flag is used, the kernel choses where to</div><div class='del'>- *                     insert the program</div><div class='del'>- * @HID_BPF_FLAG_INSERT_HEAD: insert the given program before any other program</div><div class='del'>- *                            currently attached to the device. This doesn't</div><div class='del'>- *                            guarantee that this program will always be first</div><div class='del'>- * @HID_BPF_FLAG_MAX: sentinel value, not to be used by the callers</div><div class='del'>- */</div><div class='del'>-enum hid_bpf_attach_flags {</div><div class='del'>-	HID_BPF_FLAG_NONE = 0,</div><div class='del'>-	HID_BPF_FLAG_INSERT_HEAD = _BITUL(0),</div><div class='del'>-	HID_BPF_FLAG_MAX,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Following functions are tracepoints that BPF programs can attach to */</div><div class='del'>-int hid_bpf_device_event(struct hid_bpf_ctx *ctx);</div><div class='del'>-int hid_bpf_rdesc_fixup(struct hid_bpf_ctx *ctx);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Below is HID internal</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* internal function to call eBPF programs, not to be used by anybody */</div><div class='del'>-int __hid_bpf_tail_call(struct hid_bpf_ctx *ctx);</div><div class='del'>-</div><div class='ctx'> #define HID_BPF_MAX_PROGS_PER_DEV 64</div><div class='ctx'> #define HID_BPF_FLAG_MASK (((HID_BPF_FLAG_MAX - 1) &lt;&lt; 1) - 1)</div><div class='ctx'> </div><div class='del'>-/* types of HID programs to attach to */</div><div class='del'>-enum hid_bpf_prog_type {</div><div class='del'>-	HID_BPF_PROG_TYPE_UNDEF = -1,</div><div class='del'>-	HID_BPF_PROG_TYPE_DEVICE_EVENT,			/* an event is emitted from the device */</div><div class='del'>-	HID_BPF_PROG_TYPE_RDESC_FIXUP,</div><div class='del'>-	HID_BPF_PROG_TYPE_MAX,</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> struct hid_report_enum;</div><div class='ctx'> </div><div class='del'>-struct hid_bpf_ops {</div><div class='add'>+struct hid_ops {</div><div class='ctx'> 	struct hid_report *(*hid_get_report)(struct hid_report_enum *report_enum, const u8 *data);</div><div class='ctx'> 	int (*hid_hw_raw_request)(struct hid_device *hdev,</div><div class='ctx'> 				  unsigned char reportnum, __u8 *buf,</div><div class='ctx'> 				  size_t len, enum hid_report_type rtype,</div><div class='del'>-				  enum hid_class_request reqtype);</div><div class='add'>+				  enum hid_class_request reqtype,</div><div class='add'>+				  u64 source, bool from_bpf);</div><div class='add'>+	int (*hid_hw_output_report)(struct hid_device *hdev, __u8 *buf, size_t len,</div><div class='add'>+				    u64 source, bool from_bpf);</div><div class='add'>+	int (*hid_input_report)(struct hid_device *hid, enum hid_report_type type,</div><div class='add'>+				u8 *data, u32 size, int interrupt, u64 source, bool from_bpf,</div><div class='add'>+				bool lock_already_taken);</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> 	const struct bus_type *bus_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct hid_bpf_ops *hid_bpf_ops;</div><div class='add'>+extern const struct hid_ops *hid_ops;</div><div class='ctx'> </div><div class='del'>-struct hid_bpf_prog_list {</div><div class='del'>-	u16 prog_idx[HID_BPF_MAX_PROGS_PER_DEV];</div><div class='del'>-	u8 prog_cnt;</div><div class='add'>+/**</div><div class='add'>+ * struct hid_bpf_ops - A BPF struct_ops of callbacks allowing to attach HID-BPF</div><div class='add'>+ *			programs to a HID device</div><div class='add'>+ * @hid_id: the HID uniq ID to attach to. This is writeable before ``load()``, and</div><div class='add'>+ *	    cannot be changed after</div><div class='add'>+ * @flags: flags used while attaching the struct_ops to the device. Currently only</div><div class='add'>+ *	   available value is %0 or ``BPF_F_BEFORE``.</div><div class='add'>+ *	   Writeable only before ``load()``</div><div class='add'>+ */</div><div class='add'>+struct hid_bpf_ops {</div><div class='add'>+	/* hid_id needs to stay first so we can easily change it</div><div class='add'>+	 * from userspace.</div><div class='add'>+	 */</div><div class='add'>+	int			hid_id;</div><div class='add'>+	u32			flags;</div><div class='add'>+</div><div class='add'>+	/* private: do not show up in the docs */</div><div class='add'>+	struct list_head	list;</div><div class='add'>+</div><div class='add'>+	/* public: rest should show up in the docs */</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hid_device_event: called whenever an event is coming in from the device</div><div class='add'>+	 *</div><div class='add'>+	 * It has the following arguments:</div><div class='add'>+	 *</div><div class='add'>+	 * ``ctx``: The HID-BPF context as &amp;struct hid_bpf_ctx</div><div class='add'>+	 *</div><div class='add'>+	 * Return: %0 on success and keep processing; a positive</div><div class='add'>+	 * value to change the incoming size buffer; a negative</div><div class='add'>+	 * error code to interrupt the processing of this event</div><div class='add'>+	 *</div><div class='add'>+	 * Context: Interrupt context.</div><div class='add'>+	 */</div><div class='add'>+	int (*hid_device_event)(struct hid_bpf_ctx *ctx, enum hid_report_type report_type,</div><div class='add'>+				u64 source);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hid_rdesc_fixup: called when the probe function parses the report descriptor</div><div class='add'>+	 * of the HID device</div><div class='add'>+	 *</div><div class='add'>+	 * It has the following arguments:</div><div class='add'>+	 *</div><div class='add'>+	 * ``ctx``: The HID-BPF context as &amp;struct hid_bpf_ctx</div><div class='add'>+	 *</div><div class='add'>+	 * Return: %0 on success and keep processing; a positive</div><div class='add'>+	 * value to change the incoming size buffer; a negative</div><div class='add'>+	 * error code to interrupt the processing of this device</div><div class='add'>+	 */</div><div class='add'>+	int (*hid_rdesc_fixup)(struct hid_bpf_ctx *ctx);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hid_hw_request: called whenever a hid_hw_raw_request() call is emitted</div><div class='add'>+	 * on the HID device</div><div class='add'>+	 *</div><div class='add'>+	 * It has the following arguments:</div><div class='add'>+	 *</div><div class='add'>+	 * ``ctx``: The HID-BPF context as &amp;struct hid_bpf_ctx</div><div class='add'>+	 *</div><div class='add'>+	 * ``reportnum``: the report number, as in hid_hw_raw_request()</div><div class='add'>+	 *</div><div class='add'>+	 * ``rtype``: the report type (``HID_INPUT_REPORT``, ``HID_FEATURE_REPORT``,</div><div class='add'>+	 * ``HID_OUTPUT_REPORT``)</div><div class='add'>+	 *</div><div class='add'>+	 * ``reqtype``: the request</div><div class='add'>+	 *</div><div class='add'>+	 * ``source``: a u64 referring to a uniq but identifiable source. If %0, the</div><div class='add'>+	 * kernel itself emitted that call. For hidraw, ``source`` is set</div><div class='add'>+	 * to the associated ``struct file *``.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: %0 to keep processing the request by hid-core; any other value</div><div class='add'>+	 * stops hid-core from processing that event. A positive value should be</div><div class='add'>+	 * returned with the number of bytes returned in the incoming buffer; a</div><div class='add'>+	 * negative error code interrupts the processing of this call.</div><div class='add'>+	 */</div><div class='add'>+	int (*hid_hw_request)(struct hid_bpf_ctx *ctx, unsigned char reportnum,</div><div class='add'>+			       enum hid_report_type rtype, enum hid_class_request reqtype,</div><div class='add'>+			       u64 source);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @hid_hw_output_report: called whenever a hid_hw_output_report() call is emitted</div><div class='add'>+	 * on the HID device</div><div class='add'>+	 *</div><div class='add'>+	 * It has the following arguments:</div><div class='add'>+	 *</div><div class='add'>+	 * ``ctx``: The HID-BPF context as &amp;struct hid_bpf_ctx</div><div class='add'>+	 *</div><div class='add'>+	 * ``source``: a u64 referring to a uniq but identifiable source. If %0, the</div><div class='add'>+	 * kernel itself emitted that call. For hidraw, ``source`` is set</div><div class='add'>+	 * to the associated ``struct file *``.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: %0 to keep processing the request by hid-core; any other value</div><div class='add'>+	 * stops hid-core from processing that event. A positive value should be</div><div class='add'>+	 * returned with the number of bytes written to the device; a negative error</div><div class='add'>+	 * code interrupts the processing of this call.</div><div class='add'>+	 */</div><div class='add'>+	int (*hid_hw_output_report)(struct hid_bpf_ctx *ctx, u64 source);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* private: do not show up in the docs */</div><div class='add'>+	struct hid_device *hdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* stored in each device */</div><div class='hunk'>@@ -121,38 +190,46 @@ struct hid_bpf {</div><div class='ctx'> 					 * to this HID device</div><div class='ctx'> 					 */</div><div class='ctx'> 	u32 allocated_data;</div><div class='del'>-</div><div class='del'>-	struct hid_bpf_prog_list __rcu *progs[HID_BPF_PROG_TYPE_MAX];	/* attached BPF progs */</div><div class='ctx'> 	bool destroyed;			/* prevents the assignment of any progs */</div><div class='ctx'> </div><div class='del'>-	spinlock_t progs_lock;		/* protects RCU update of progs */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* specific HID-BPF link when a program is attached to a device */</div><div class='del'>-struct hid_bpf_link {</div><div class='del'>-	struct bpf_link link;</div><div class='del'>-	int hid_table_index;</div><div class='add'>+	struct hid_bpf_ops *rdesc_ops;</div><div class='add'>+	struct list_head prog_list;</div><div class='add'>+	struct mutex prog_list_lock;	/* protects prog_list update */</div><div class='add'>+	struct srcu_struct srcu;	/* protects prog_list read-only access */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HID_BPF</div><div class='ctx'> u8 *dispatch_hid_bpf_device_event(struct hid_device *hid, enum hid_report_type type, u8 *data,</div><div class='del'>-				  u32 *size, int interrupt);</div><div class='add'>+				  u32 *size, int interrupt, u64 source, bool from_bpf);</div><div class='add'>+int dispatch_hid_bpf_raw_requests(struct hid_device *hdev,</div><div class='add'>+				  unsigned char reportnum, __u8 *buf,</div><div class='add'>+				  u32 size, enum hid_report_type rtype,</div><div class='add'>+				  enum hid_class_request reqtype,</div><div class='add'>+				  u64 source, bool from_bpf);</div><div class='add'>+int dispatch_hid_bpf_output_report(struct hid_device *hdev, __u8 *buf, u32 size,</div><div class='add'>+				   u64 source, bool from_bpf);</div><div class='ctx'> int hid_bpf_connect_device(struct hid_device *hdev);</div><div class='ctx'> void hid_bpf_disconnect_device(struct hid_device *hdev);</div><div class='ctx'> void hid_bpf_destroy_device(struct hid_device *hid);</div><div class='del'>-void hid_bpf_device_init(struct hid_device *hid);</div><div class='del'>-u8 *call_hid_bpf_rdesc_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *size);</div><div class='add'>+int hid_bpf_device_init(struct hid_device *hid);</div><div class='add'>+const u8 *call_hid_bpf_rdesc_fixup(struct hid_device *hdev, const u8 *rdesc, unsigned int *size);</div><div class='ctx'> #else /* CONFIG_HID_BPF */</div><div class='ctx'> static inline u8 *dispatch_hid_bpf_device_event(struct hid_device *hid, enum hid_report_type type,</div><div class='del'>-						u8 *data, u32 *size, int interrupt) { return data; }</div><div class='add'>+						u8 *data, u32 *size, int interrupt,</div><div class='add'>+						u64 source, bool from_bpf) { return data; }</div><div class='add'>+static inline int dispatch_hid_bpf_raw_requests(struct hid_device *hdev,</div><div class='add'>+						unsigned char reportnum, u8 *buf,</div><div class='add'>+						u32 size, enum hid_report_type rtype,</div><div class='add'>+						enum hid_class_request reqtype,</div><div class='add'>+						u64 source, bool from_bpf) { return 0; }</div><div class='add'>+static inline int dispatch_hid_bpf_output_report(struct hid_device *hdev, __u8 *buf, u32 size,</div><div class='add'>+						 u64 source, bool from_bpf) { return 0; }</div><div class='ctx'> static inline int hid_bpf_connect_device(struct hid_device *hdev) { return 0; }</div><div class='ctx'> static inline void hid_bpf_disconnect_device(struct hid_device *hdev) {}</div><div class='ctx'> static inline void hid_bpf_destroy_device(struct hid_device *hid) {}</div><div class='del'>-static inline void hid_bpf_device_init(struct hid_device *hid) {}</div><div class='del'>-static inline u8 *call_hid_bpf_rdesc_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *size)</div><div class='del'>-{</div><div class='del'>-	return kmemdup(rdesc, *size, GFP_KERNEL);</div><div class='del'>-}</div><div class='add'>+static inline int hid_bpf_device_init(struct hid_device *hid) { return 0; }</div><div class='add'>+static inline const u8 *call_hid_bpf_rdesc_fixup(struct hid_device *hdev, const u8 *rdesc,</div><div class='add'>+						 unsigned int *size) { return rdesc; }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_HID_BPF */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h<br/>index cd67f4ca5599..18fd30a288de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hidraw.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hidraw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hidraw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hidraw.h</a></div><div class='hunk'>@@ -32,6 +32,7 @@ struct hidraw_list {</div><div class='ctx'> 	struct hidraw *hidraw;</div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> 	struct mutex read_mutex;</div><div class='add'>+	bool revoked;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HIDRAW</div><div class='head'>diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-internal.h<br/>index a3028e400a9c..0574c21ca45d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/highmem-internal.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/highmem-internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/highmem-internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/highmem-internal.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_KMAP_LOCAL</div><div class='ctx'> void *__kmap_local_pfn_prot(unsigned long pfn, pgprot_t prot);</div><div class='del'>-void *__kmap_local_page_prot(struct page *page, pgprot_t prot);</div><div class='add'>+void *__kmap_local_page_prot(const struct page *page, pgprot_t prot);</div><div class='ctx'> void kunmap_local_indexed(const void *vaddr);</div><div class='ctx'> void kmap_local_fork(struct task_struct *tsk);</div><div class='ctx'> void __kmap_local_sched_out(void);</div><div class='hunk'>@@ -33,7 +33,7 @@ static inline void kmap_flush_tlb(unsigned long addr) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void *kmap_high(struct page *page);</div><div class='del'>-void kunmap_high(struct page *page);</div><div class='add'>+void kunmap_high(const struct page *page);</div><div class='ctx'> void __kmap_flush_unused(void);</div><div class='ctx'> struct page *__kmap_to_page(void *addr);</div><div class='ctx'> </div><div class='hunk'>@@ -50,7 +50,7 @@ static inline void *kmap(struct page *page)</div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void kunmap(struct page *page)</div><div class='add'>+static inline void kunmap(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> 	if (!PageHighMem(page))</div><div class='hunk'>@@ -68,18 +68,26 @@ static inline void kmap_flush_unused(void)</div><div class='ctx'> 	__kmap_flush_unused();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_local_page(struct page *page)</div><div class='add'>+static inline void *kmap_local_page(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return __kmap_local_page_prot(page, kmap_prot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_local_folio(struct folio *folio, size_t offset)</div><div class='add'>+static inline void *kmap_local_page_try_from_panic(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = folio_page(folio, offset / PAGE_SIZE);</div><div class='add'>+	if (!PageHighMem(page))</div><div class='add'>+		return page_address(page);</div><div class='add'>+	/* If the page is in HighMem, it's not safe to kmap it.*/</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *kmap_local_folio(const struct folio *folio, size_t offset)</div><div class='add'>+{</div><div class='add'>+	const struct page *page = folio_page(folio, offset / PAGE_SIZE);</div><div class='ctx'> 	return __kmap_local_page_prot(page, kmap_prot) + offset % PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_local_page_prot(struct page *page, pgprot_t prot)</div><div class='add'>+static inline void *kmap_local_page_prot(const struct page *page, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	return __kmap_local_page_prot(page, prot);</div><div class='ctx'> }</div><div class='hunk'>@@ -94,7 +102,7 @@ static inline void __kunmap_local(const void *vaddr)</div><div class='ctx'> 	kunmap_local_indexed(vaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_atomic_prot(struct page *page, pgprot_t prot)</div><div class='add'>+static inline void *kmap_atomic_prot(const struct page *page, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_PREEMPT_RT))</div><div class='ctx'> 		migrate_disable();</div><div class='hunk'>@@ -105,7 +113,7 @@ static inline void *kmap_atomic_prot(struct page *page, pgprot_t prot)</div><div class='ctx'> 	return __kmap_local_page_prot(page, prot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_atomic(struct page *page)</div><div class='add'>+static inline void *kmap_atomic(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return kmap_atomic_prot(page, kmap_prot);</div><div class='ctx'> }</div><div class='hunk'>@@ -131,22 +139,17 @@ static inline void __kunmap_atomic(const void *addr)</div><div class='ctx'> 		preempt_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int __nr_free_highpages(void);</div><div class='del'>-extern atomic_long_t _totalhigh_pages;</div><div class='add'>+unsigned long __nr_free_highpages(void);</div><div class='add'>+unsigned long __totalhigh_pages(void);</div><div class='ctx'> </div><div class='del'>-static inline unsigned int nr_free_highpages(void)</div><div class='add'>+static inline unsigned long nr_free_highpages(void)</div><div class='ctx'> {</div><div class='ctx'> 	return __nr_free_highpages();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long totalhigh_pages(void)</div><div class='ctx'> {</div><div class='del'>-	return (unsigned long)atomic_long_read(&amp;_totalhigh_pages);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void totalhigh_pages_add(long count)</div><div class='del'>-{</div><div class='del'>-	atomic_long_add(count, &amp;_totalhigh_pages);</div><div class='add'>+	return __totalhigh_pages();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_kmap_addr(const void *x)</div><div class='hunk'>@@ -170,27 +173,32 @@ static inline void *kmap(struct page *page)</div><div class='ctx'> 	return page_address(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void kunmap_high(struct page *page) { }</div><div class='add'>+static inline void kunmap_high(const struct page *page) { }</div><div class='ctx'> static inline void kmap_flush_unused(void) { }</div><div class='ctx'> </div><div class='del'>-static inline void kunmap(struct page *page)</div><div class='add'>+static inline void kunmap(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> #ifdef ARCH_HAS_FLUSH_ON_KUNMAP</div><div class='ctx'> 	kunmap_flush_on_unmap(page_address(page));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_local_page(struct page *page)</div><div class='add'>+static inline void *kmap_local_page(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return page_address(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *kmap_local_page_try_from_panic(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return page_address(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_local_folio(struct folio *folio, size_t offset)</div><div class='add'>+static inline void *kmap_local_folio(const struct folio *folio, size_t offset)</div><div class='ctx'> {</div><div class='del'>-	return page_address(&amp;folio-&gt;page) + offset;</div><div class='add'>+	return folio_address(folio) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_local_page_prot(struct page *page, pgprot_t prot)</div><div class='add'>+static inline void *kmap_local_page_prot(const struct page *page, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	return kmap_local_page(page);</div><div class='ctx'> }</div><div class='hunk'>@@ -207,7 +215,7 @@ static inline void __kunmap_local(const void *addr)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_atomic(struct page *page)</div><div class='add'>+static inline void *kmap_atomic(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_PREEMPT_RT))</div><div class='ctx'> 		migrate_disable();</div><div class='hunk'>@@ -217,7 +225,7 @@ static inline void *kmap_atomic(struct page *page)</div><div class='ctx'> 	return page_address(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *kmap_atomic_prot(struct page *page, pgprot_t prot)</div><div class='add'>+static inline void *kmap_atomic_prot(const struct page *page, pgprot_t prot)</div><div class='ctx'> {</div><div class='ctx'> 	return kmap_atomic(page);</div><div class='ctx'> }</div><div class='hunk'>@@ -239,8 +247,8 @@ static inline void __kunmap_atomic(const void *addr)</div><div class='ctx'> 		preempt_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int nr_free_highpages(void) { return 0; }</div><div class='del'>-static inline unsigned long totalhigh_pages(void) { return 0UL; }</div><div class='add'>+static inline unsigned long nr_free_highpages(void) { return 0; }</div><div class='add'>+static inline unsigned long totalhigh_pages(void) { return 0; }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_kmap_addr(const void *x)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/highmem.h b/include/linux/highmem.h<br/>index 451c1dff0e87..abc20f9810fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/highmem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/highmem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/highmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/highmem.h</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static inline void *kmap(struct page *page);</div><div class='ctx'>  * Counterpart to kmap(). A NOOP for CONFIG_HIGHMEM=n and for mappings of</div><div class='ctx'>  * pages in the low memory area.</div><div class='ctx'>  */</div><div class='del'>-static inline void kunmap(struct page *page);</div><div class='add'>+static inline void kunmap(const struct page *page);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kmap_to_page - Get the page for a kmap'ed address</div><div class='hunk'>@@ -93,7 +93,7 @@ static inline void kmap_flush_unused(void);</div><div class='ctx'>  * disabling migration in order to keep the virtual address stable across</div><div class='ctx'>  * preemption. No caller of kmap_local_page() can rely on this side effect.</div><div class='ctx'>  */</div><div class='del'>-static inline void *kmap_local_page(struct page *page);</div><div class='add'>+static inline void *kmap_local_page(const struct page *page);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kmap_local_folio - Map a page in this folio for temporary usage</div><div class='hunk'>@@ -129,7 +129,7 @@ static inline void *kmap_local_page(struct page *page);</div><div class='ctx'>  * Context: Can be invoked from any context.</div><div class='ctx'>  * Return: The virtual address of @offset.</div><div class='ctx'>  */</div><div class='del'>-static inline void *kmap_local_folio(struct folio *folio, size_t offset);</div><div class='add'>+static inline void *kmap_local_folio(const struct folio *folio, size_t offset);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kmap_atomic - Atomically map a page for temporary usage - Deprecated!</div><div class='hunk'>@@ -176,10 +176,10 @@ static inline void *kmap_local_folio(struct folio *folio, size_t offset);</div><div class='ctx'>  * kunmap_atomic(vaddr2);</div><div class='ctx'>  * kunmap_atomic(vaddr1);</div><div class='ctx'>  */</div><div class='del'>-static inline void *kmap_atomic(struct page *page);</div><div class='add'>+static inline void *kmap_atomic(const struct page *page);</div><div class='ctx'> </div><div class='ctx'> /* Highmem related interfaces for management code */</div><div class='del'>-static inline unsigned int nr_free_highpages(void);</div><div class='add'>+static inline unsigned long nr_free_highpages(void);</div><div class='ctx'> static inline unsigned long totalhigh_pages(void);</div><div class='ctx'> </div><div class='ctx'> #ifndef ARCH_HAS_FLUSH_ANON_PAGE</div><div class='hunk'>@@ -226,8 +226,8 @@ struct folio *vma_alloc_zeroed_movable_folio(struct vm_area_struct *vma,</div><div class='ctx'> {</div><div class='ctx'> 	struct folio *folio;</div><div class='ctx'> </div><div class='del'>-	folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, vaddr, false);</div><div class='del'>-	if (folio)</div><div class='add'>+	folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, vaddr);</div><div class='add'>+	if (folio &amp;&amp; user_alloc_needs_zeroing())</div><div class='ctx'> 		clear_user_highpage(&amp;folio-&gt;page, vaddr);</div><div class='ctx'> </div><div class='ctx'> 	return folio;</div><div class='hunk'>@@ -249,10 +249,12 @@ static inline void clear_highpage_kasan_tagged(struct page *page)</div><div class='ctx'> 	kunmap_local(kaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef __HAVE_ARCH_TAG_CLEAR_HIGHPAGE</div><div class='add'>+#ifndef __HAVE_ARCH_TAG_CLEAR_HIGHPAGES</div><div class='ctx'> </div><div class='del'>-static inline void tag_clear_highpage(struct page *page)</div><div class='add'>+/* Return false to let people know we did not initialize the pages */</div><div class='add'>+static inline bool tag_clear_highpages(struct page *page, int numpages)</div><div class='ctx'> {</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -292,12 +294,6 @@ static inline void zero_user_segment(struct page *page,</div><div class='ctx'> 	zero_user_segments(page, start, end, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void zero_user(struct page *page,</div><div class='del'>-	unsigned start, unsigned size)</div><div class='del'>-{</div><div class='del'>-	zero_user_segments(page, start, start + size, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifndef __HAVE_ARCH_COPY_USER_HIGHPAGE</div><div class='ctx'> </div><div class='ctx'> static inline void copy_user_highpage(struct page *to, struct page *from,</div><div class='hunk'>@@ -352,6 +348,9 @@ static inline int copy_mc_user_highpage(struct page *to, struct page *from,</div><div class='ctx'> 	kunmap_local(vto);</div><div class='ctx'> 	kunmap_local(vfrom);</div><div class='ctx'> </div><div class='add'>+	if (ret)</div><div class='add'>+		memory_failure_queue(page_to_pfn(from), 0);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -368,6 +367,9 @@ static inline int copy_mc_highpage(struct page *to, struct page *from)</div><div class='ctx'> 	kunmap_local(vto);</div><div class='ctx'> 	kunmap_local(vfrom);</div><div class='ctx'> </div><div class='add'>+	if (ret)</div><div class='add'>+		memory_failure_queue(page_to_pfn(from), 0);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -398,6 +400,33 @@ static inline void memcpy_page(struct page *dst_page, size_t dst_off,</div><div class='ctx'> 	kunmap_local(dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void memcpy_folio(struct folio *dst_folio, size_t dst_off,</div><div class='add'>+		struct folio *src_folio, size_t src_off, size_t len)</div><div class='add'>+{</div><div class='add'>+	VM_BUG_ON(dst_off + len &gt; folio_size(dst_folio));</div><div class='add'>+	VM_BUG_ON(src_off + len &gt; folio_size(src_folio));</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		char *dst = kmap_local_folio(dst_folio, dst_off);</div><div class='add'>+		const char *src = kmap_local_folio(src_folio, src_off);</div><div class='add'>+		size_t chunk = len;</div><div class='add'>+</div><div class='add'>+		if (folio_test_highmem(dst_folio) &amp;&amp;</div><div class='add'>+		    chunk &gt; PAGE_SIZE - offset_in_page(dst_off))</div><div class='add'>+			chunk = PAGE_SIZE - offset_in_page(dst_off);</div><div class='add'>+		if (folio_test_highmem(src_folio) &amp;&amp;</div><div class='add'>+		    chunk &gt; PAGE_SIZE - offset_in_page(src_off))</div><div class='add'>+			chunk = PAGE_SIZE - offset_in_page(src_off);</div><div class='add'>+		memcpy(dst, src, chunk);</div><div class='add'>+		kunmap_local(src);</div><div class='add'>+		kunmap_local(dst);</div><div class='add'>+</div><div class='add'>+		dst_off += chunk;</div><div class='add'>+		src_off += chunk;</div><div class='add'>+		len -= chunk;</div><div class='add'>+	} while (len &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void memset_page(struct page *page, size_t offset, int val,</div><div class='ctx'> 			       size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -439,6 +468,13 @@ static inline void memzero_page(struct page *page, size_t offset, size_t len)</div><div class='ctx'> 	kunmap_local(addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memcpy_from_folio - Copy a range of bytes from a folio.</div><div class='add'>+ * @to: The memory to copy to.</div><div class='add'>+ * @folio: The folio to read from.</div><div class='add'>+ * @offset: The first byte in the folio to read.</div><div class='add'>+ * @len: The number of bytes to copy.</div><div class='add'>+ */</div><div class='ctx'> static inline void memcpy_from_folio(char *to, struct folio *folio,</div><div class='ctx'> 		size_t offset, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -448,7 +484,7 @@ static inline void memcpy_from_folio(char *to, struct folio *folio,</div><div class='ctx'> 		const char *from = kmap_local_folio(folio, offset);</div><div class='ctx'> 		size_t chunk = len;</div><div class='ctx'> </div><div class='del'>-		if (folio_test_highmem(folio) &amp;&amp;</div><div class='add'>+		if (folio_test_partial_kmap(folio) &amp;&amp;</div><div class='ctx'> 		    chunk &gt; PAGE_SIZE - offset_in_page(offset))</div><div class='ctx'> 			chunk = PAGE_SIZE - offset_in_page(offset);</div><div class='ctx'> 		memcpy(to, from, chunk);</div><div class='hunk'>@@ -460,6 +496,13 @@ static inline void memcpy_from_folio(char *to, struct folio *folio,</div><div class='ctx'> 	} while (len &gt; 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memcpy_to_folio - Copy a range of bytes to a folio.</div><div class='add'>+ * @folio: The folio to write to.</div><div class='add'>+ * @offset: The first byte in the folio to store to.</div><div class='add'>+ * @from: The memory to copy from.</div><div class='add'>+ * @len: The number of bytes to copy.</div><div class='add'>+ */</div><div class='ctx'> static inline void memcpy_to_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 		const char *from, size_t len)</div><div class='ctx'> {</div><div class='hunk'>@@ -469,7 +512,7 @@ static inline void memcpy_to_folio(struct folio *folio, size_t offset,</div><div class='ctx'> 		char *to = kmap_local_folio(folio, offset);</div><div class='ctx'> 		size_t chunk = len;</div><div class='ctx'> </div><div class='del'>-		if (folio_test_highmem(folio) &amp;&amp;</div><div class='add'>+		if (folio_test_partial_kmap(folio) &amp;&amp;</div><div class='ctx'> 		    chunk &gt; PAGE_SIZE - offset_in_page(offset))</div><div class='ctx'> 			chunk = PAGE_SIZE - offset_in_page(offset);</div><div class='ctx'> 		memcpy(to, from, chunk);</div><div class='hunk'>@@ -502,7 +545,7 @@ static inline __must_check void *folio_zero_tail(struct folio *folio,</div><div class='ctx'> {</div><div class='ctx'> 	size_t len = folio_size(folio) - offset;</div><div class='ctx'> </div><div class='del'>-	if (folio_test_highmem(folio)) {</div><div class='add'>+	if (folio_test_partial_kmap(folio)) {</div><div class='ctx'> 		size_t max = PAGE_SIZE - offset_in_page(offset);</div><div class='ctx'> </div><div class='ctx'> 		while (len &gt; max) {</div><div class='hunk'>@@ -540,7 +583,7 @@ static inline void folio_fill_tail(struct folio *folio, size_t offset,</div><div class='ctx'> </div><div class='ctx'> 	VM_BUG_ON(offset + len &gt; folio_size(folio));</div><div class='ctx'> </div><div class='del'>-	if (folio_test_highmem(folio)) {</div><div class='add'>+	if (folio_test_partial_kmap(folio)) {</div><div class='ctx'> 		size_t max = PAGE_SIZE - offset_in_page(offset);</div><div class='ctx'> </div><div class='ctx'> 		while (len &gt; max) {</div><div class='hunk'>@@ -577,7 +620,7 @@ static inline size_t memcpy_from_file_folio(char *to, struct folio *folio,</div><div class='ctx'> 	size_t offset = offset_in_folio(folio, pos);</div><div class='ctx'> 	char *from = kmap_local_folio(folio, offset);</div><div class='ctx'> </div><div class='del'>-	if (folio_test_highmem(folio)) {</div><div class='add'>+	if (folio_test_partial_kmap(folio)) {</div><div class='ctx'> 		offset = offset_in_page(offset);</div><div class='ctx'> 		len = min_t(size_t, len, PAGE_SIZE - offset);</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -641,10 +684,4 @@ static inline void folio_release_kmap(struct folio *folio, void *addr)</div><div class='ctx'> 	kunmap_local(addr);</div><div class='ctx'> 	folio_put(folio);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void unmap_and_put_page(struct page *page, void *addr)</div><div class='del'>-{</div><div class='del'>-	folio_release_kmap(page_folio(page), addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* _LINUX_HIGHMEM_H */</div><div class='head'>diff --git a/include/linux/hisi_acc_qm.h b/include/linux/hisi_acc_qm.h<br/>index 5f4c74facf6a..ca1ec437a3ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hisi_acc_qm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hisi_acc_qm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hisi_acc_qm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hisi_acc_qm.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #define QM_MB_CMD_CQC_BT                0x5</div><div class='ctx'> #define QM_MB_CMD_SQC_VFT_V2            0x6</div><div class='ctx'> #define QM_MB_CMD_STOP_QP               0x8</div><div class='add'>+#define QM_MB_CMD_FLUSH_QM		0x9</div><div class='ctx'> #define QM_MB_CMD_SRC                   0xc</div><div class='ctx'> #define QM_MB_CMD_DST                   0xd</div><div class='ctx'> </div><div class='hunk'>@@ -96,11 +97,18 @@</div><div class='ctx'> /* page number for queue file region */</div><div class='ctx'> #define QM_DOORBELL_PAGE_NR		1</div><div class='ctx'> </div><div class='add'>+#define QM_DEV_ALG_MAX_LEN		256</div><div class='add'>+</div><div class='add'>+#define QM_MIG_REGION_SEL		0x100198</div><div class='add'>+#define QM_MIG_REGION_EN		BIT(0)</div><div class='add'>+</div><div class='ctx'> /* uacce mode of the driver */</div><div class='ctx'> #define UACCE_MODE_NOUACCE		0 /* don't use uacce */</div><div class='ctx'> #define UACCE_MODE_SVA			1 /* use uacce sva mode */</div><div class='ctx'> #define UACCE_MODE_DESC	"0(default) means only register to crypto, 1 means both register to crypto and uacce"</div><div class='ctx'> </div><div class='add'>+#define QM_ECC_MBIT			BIT(2)</div><div class='add'>+</div><div class='ctx'> enum qm_stop_reason {</div><div class='ctx'> 	QM_NORMAL,</div><div class='ctx'> 	QM_SOFT_RESET,</div><div class='hunk'>@@ -121,6 +129,8 @@ enum qm_hw_ver {</div><div class='ctx'> 	QM_HW_V1 = 0x20,</div><div class='ctx'> 	QM_HW_V2 = 0x21,</div><div class='ctx'> 	QM_HW_V3 = 0x30,</div><div class='add'>+	QM_HW_V4 = 0x50,</div><div class='add'>+	QM_HW_V5 = 0x51,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum qm_fun_type {</div><div class='hunk'>@@ -151,9 +161,11 @@ enum qm_cap_bits {</div><div class='ctx'> 	QM_SUPPORT_DB_ISOLATION = 0x0,</div><div class='ctx'> 	QM_SUPPORT_FUNC_QOS,</div><div class='ctx'> 	QM_SUPPORT_STOP_QP,</div><div class='add'>+	QM_SUPPORT_STOP_FUNC,</div><div class='ctx'> 	QM_SUPPORT_MB_COMMAND,</div><div class='ctx'> 	QM_SUPPORT_SVA_PREFETCH,</div><div class='ctx'> 	QM_SUPPORT_RPM,</div><div class='add'>+	QM_SUPPORT_DAE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct qm_dev_alg {</div><div class='hunk'>@@ -161,6 +173,11 @@ struct qm_dev_alg {</div><div class='ctx'> 	const char *alg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct qm_dev_dfx {</div><div class='add'>+	u32 dev_state;</div><div class='add'>+	u32 dev_timeout;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dfx_diff_registers {</div><div class='ctx'> 	u32 *regs;</div><div class='ctx'> 	u32 reg_offset;</div><div class='hunk'>@@ -189,6 +206,7 @@ struct qm_debug {</div><div class='ctx'> 	struct dentry *debug_root;</div><div class='ctx'> 	struct dentry *qm_d;</div><div class='ctx'> 	struct debugfs_file files[DEBUG_FILE_NUM];</div><div class='add'>+	struct qm_dev_dfx dev_dfx;</div><div class='ctx'> 	unsigned int *qm_last_words;</div><div class='ctx'> 	/* ACC engines recoreding last regs */</div><div class='ctx'> 	unsigned int *last_words;</div><div class='hunk'>@@ -221,19 +239,28 @@ struct hisi_qm_status {</div><div class='ctx'> </div><div class='ctx'> struct hisi_qm;</div><div class='ctx'> </div><div class='del'>-struct hisi_qm_err_info {</div><div class='del'>-	char *acpi_rst;</div><div class='del'>-	u32 msi_wr_port;</div><div class='add'>+enum acc_err_result {</div><div class='add'>+	ACC_ERR_NONE,</div><div class='add'>+	ACC_ERR_NEED_RESET,</div><div class='add'>+	ACC_ERR_RECOVERED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hisi_qm_err_mask {</div><div class='ctx'> 	u32 ecc_2bits_mask;</div><div class='del'>-	u32 qm_shutdown_mask;</div><div class='del'>-	u32 dev_shutdown_mask;</div><div class='del'>-	u32 qm_reset_mask;</div><div class='del'>-	u32 dev_reset_mask;</div><div class='add'>+	u32 shutdown_mask;</div><div class='add'>+	u32 reset_mask;</div><div class='ctx'> 	u32 ce;</div><div class='ctx'> 	u32 nfe;</div><div class='ctx'> 	u32 fe;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct hisi_qm_err_info {</div><div class='add'>+	char *acpi_rst;</div><div class='add'>+	u32 msi_wr_port;</div><div class='add'>+	struct hisi_qm_err_mask qm_err;</div><div class='add'>+	struct hisi_qm_err_mask dev_err;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hisi_qm_err_status {</div><div class='ctx'> 	u32 is_qm_ecc_mbit;</div><div class='ctx'> 	u32 is_dev_ecc_mbit;</div><div class='hunk'>@@ -249,9 +276,13 @@ struct hisi_qm_err_ini {</div><div class='ctx'> 	void (*close_axi_master_ooo)(struct hisi_qm *qm);</div><div class='ctx'> 	void (*open_sva_prefetch)(struct hisi_qm *qm);</div><div class='ctx'> 	void (*close_sva_prefetch)(struct hisi_qm *qm);</div><div class='del'>-	void (*log_dev_hw_err)(struct hisi_qm *qm, u32 err_sts);</div><div class='ctx'> 	void (*show_last_dfx_regs)(struct hisi_qm *qm);</div><div class='ctx'> 	void (*err_info_init)(struct hisi_qm *qm);</div><div class='add'>+	enum acc_err_result (*get_err_result)(struct hisi_qm *qm);</div><div class='add'>+	bool (*dev_is_abnormal)(struct hisi_qm *qm);</div><div class='add'>+	int (*set_priv_status)(struct hisi_qm *qm);</div><div class='add'>+	void (*disable_axi_error)(struct hisi_qm *qm);</div><div class='add'>+	void (*enable_axi_error)(struct hisi_qm *qm);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hisi_qm_cap_info {</div><div class='hunk'>@@ -266,13 +297,25 @@ struct hisi_qm_cap_info {</div><div class='ctx'> 	u32 v3_val;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct hisi_qm_cap_query_info {</div><div class='add'>+	u32 type;</div><div class='add'>+	const char *name;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 v1_val;</div><div class='add'>+	u32 v2_val;</div><div class='add'>+	u32 v3_val;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hisi_qm_cap_record {</div><div class='ctx'> 	u32 type;</div><div class='add'>+	const char *name;</div><div class='ctx'> 	u32 cap_val;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hisi_qm_cap_tables {</div><div class='add'>+	u32 qm_cap_size;</div><div class='ctx'> 	struct hisi_qm_cap_record *qm_cap_table;</div><div class='add'>+	u32 dev_cap_size;</div><div class='ctx'> 	struct hisi_qm_cap_record *dev_cap_table;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -366,6 +409,8 @@ struct hisi_qm {</div><div class='ctx'> </div><div class='ctx'> 	struct mutex mailbox_lock;</div><div class='ctx'> </div><div class='add'>+	struct mutex ifc_lock;</div><div class='add'>+</div><div class='ctx'> 	const struct hisi_qm_hw_ops *ops;</div><div class='ctx'> </div><div class='ctx'> 	struct qm_debug debug;</div><div class='hunk'>@@ -428,37 +473,6 @@ struct hisi_qp {</div><div class='ctx'> 	struct uacce_queue *uacce_q;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int q_num_set(const char *val, const struct kernel_param *kp,</div><div class='del'>-			    unsigned int device)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev;</div><div class='del'>-	u32 n, q_num;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!val)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	pdev = pci_get_device(PCI_VENDOR_ID_HUAWEI, device, NULL);</div><div class='del'>-	if (!pdev) {</div><div class='del'>-		q_num = min_t(u32, QM_QNUM_V1, QM_QNUM_V2);</div><div class='del'>-		pr_info("No device found currently, suppose queue number is %u\n",</div><div class='del'>-			q_num);</div><div class='del'>-	} else {</div><div class='del'>-		if (pdev-&gt;revision == QM_HW_V1)</div><div class='del'>-			q_num = QM_QNUM_V1;</div><div class='del'>-		else</div><div class='del'>-			q_num = QM_QNUM_V2;</div><div class='del'>-</div><div class='del'>-		pci_dev_put(pdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = kstrtou32(val, 10, &amp;n);</div><div class='del'>-	if (ret || n &lt; QM_MIN_QNUM || n &gt; q_num)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return param_set_int(val, kp);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int vfs_num_set(const char *val, const struct kernel_param *kp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 n;</div><div class='hunk'>@@ -518,12 +532,14 @@ static inline void hisi_qm_del_list(struct hisi_qm *qm, struct hisi_qm_list *qm_</div><div class='ctx'> 	mutex_unlock(&amp;qm_list-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int hisi_qm_q_num_set(const char *val, const struct kernel_param *kp,</div><div class='add'>+		      unsigned int device);</div><div class='ctx'> int hisi_qm_init(struct hisi_qm *qm);</div><div class='ctx'> void hisi_qm_uninit(struct hisi_qm *qm);</div><div class='ctx'> int hisi_qm_start(struct hisi_qm *qm);</div><div class='ctx'> int hisi_qm_stop(struct hisi_qm *qm, enum qm_stop_reason r);</div><div class='ctx'> int hisi_qm_start_qp(struct hisi_qp *qp, unsigned long arg);</div><div class='del'>-int hisi_qm_stop_qp(struct hisi_qp *qp);</div><div class='add'>+void hisi_qm_stop_qp(struct hisi_qp *qp);</div><div class='ctx'> int hisi_qp_send(struct hisi_qp *qp, const void *msg);</div><div class='ctx'> void hisi_qm_debug_init(struct hisi_qm *qm);</div><div class='ctx'> void hisi_qm_debug_regs_clear(struct hisi_qm *qm);</div><div class='hunk'>@@ -551,9 +567,9 @@ int hisi_qm_mb(struct hisi_qm *qm, u8 cmd, dma_addr_t dma_addr, u16 queue,</div><div class='ctx'> struct hisi_acc_sgl_pool;</div><div class='ctx'> struct hisi_acc_hw_sgl *hisi_acc_sg_buf_map_to_hw_sgl(struct device *dev,</div><div class='ctx'> 	struct scatterlist *sgl, struct hisi_acc_sgl_pool *pool,</div><div class='del'>-	u32 index, dma_addr_t *hw_sgl_dma);</div><div class='add'>+	u32 index, dma_addr_t *hw_sgl_dma, enum dma_data_direction dir);</div><div class='ctx'> void hisi_acc_sg_buf_unmap(struct device *dev, struct scatterlist *sgl,</div><div class='del'>-			   struct hisi_acc_hw_sgl *hw_sgl);</div><div class='add'>+			   struct hisi_acc_hw_sgl *hw_sgl, enum dma_data_direction dir);</div><div class='ctx'> struct hisi_acc_sgl_pool *hisi_acc_create_sgl_pool(struct device *dev,</div><div class='ctx'> 						   u32 count, u32 sge_nr);</div><div class='ctx'> void hisi_acc_free_sgl_pool(struct device *dev,</div><div class='hunk'>@@ -575,6 +591,9 @@ void hisi_qm_regs_dump(struct seq_file *s, struct debugfs_regset32 *regset);</div><div class='ctx'> u32 hisi_qm_get_hw_info(struct hisi_qm *qm,</div><div class='ctx'> 			const struct hisi_qm_cap_info *info_table,</div><div class='ctx'> 			u32 index, bool is_read);</div><div class='add'>+u32 hisi_qm_get_cap_value(struct hisi_qm *qm,</div><div class='add'>+			const struct hisi_qm_cap_query_info *info_table,</div><div class='add'>+			u32 index, bool is_read);</div><div class='ctx'> int hisi_qm_set_algs(struct hisi_qm *qm, u64 alg_msk, const struct qm_dev_alg *dev_algs,</div><div class='ctx'> 		     u32 dev_algs_size);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/hmm-dma.h b/include/linux/hmm-dma.h<br/>new file mode 100644<br/>index 000000000000..f58b9fc71999<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hmm-dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hmm-dma.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* Copyright (c) 2024 NVIDIA Corporation &amp; Affiliates */</div><div class='add'>+#ifndef LINUX_HMM_DMA_H</div><div class='add'>+#define LINUX_HMM_DMA_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+</div><div class='add'>+struct dma_iova_state;</div><div class='add'>+struct pci_p2pdma_map_state;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct hmm_dma_map - array of PFNs and DMA addresses</div><div class='add'>+ *</div><div class='add'>+ * @state: DMA IOVA state</div><div class='add'>+ * @pfns: array of PFNs</div><div class='add'>+ * @dma_list: array of DMA addresses</div><div class='add'>+ * @dma_entry_size: size of each DMA entry in the array</div><div class='add'>+ */</div><div class='add'>+struct hmm_dma_map {</div><div class='add'>+	struct dma_iova_state state;</div><div class='add'>+	unsigned long *pfn_list;</div><div class='add'>+	dma_addr_t *dma_list;</div><div class='add'>+	size_t dma_entry_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int hmm_dma_map_alloc(struct device *dev, struct hmm_dma_map *map,</div><div class='add'>+		      size_t nr_entries, size_t dma_entry_size);</div><div class='add'>+void hmm_dma_map_free(struct device *dev, struct hmm_dma_map *map);</div><div class='add'>+dma_addr_t hmm_dma_map_pfn(struct device *dev, struct hmm_dma_map *map,</div><div class='add'>+			   size_t idx,</div><div class='add'>+			   struct pci_p2pdma_map_state *p2pdma_state);</div><div class='add'>+bool hmm_dma_unmap_pfn(struct device *dev, struct hmm_dma_map *map, size_t idx);</div><div class='add'>+#endif /* LINUX_HMM_DMA_H */</div><div class='head'>diff --git a/include/linux/hmm.h b/include/linux/hmm.h<br/>index 126a36571667..db75ffc949a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hmm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hmm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hmm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hmm.h</a></div><div class='hunk'>@@ -23,6 +23,10 @@ struct mmu_interval_notifier;</div><div class='ctx'>  * HMM_PFN_WRITE - if the page memory can be written to (requires HMM_PFN_VALID)</div><div class='ctx'>  * HMM_PFN_ERROR - accessing the pfn is impossible and the device should</div><div class='ctx'>  *                 fail. ie poisoned memory, special pages, no vma, etc</div><div class='add'>+ * HMM_PFN_P2PDMA - P2P page</div><div class='add'>+ * HMM_PFN_P2PDMA_BUS - Bus mapped P2P transfer</div><div class='add'>+ * HMM_PFN_DMA_MAPPED - Flag preserved on input-to-output transformation</div><div class='add'>+ *                      to mark that page is already DMA mapped</div><div class='ctx'>  *</div><div class='ctx'>  * On input:</div><div class='ctx'>  * 0                 - Return the current state of the page, do not fault it.</div><div class='hunk'>@@ -36,13 +40,21 @@ enum hmm_pfn_flags {</div><div class='ctx'> 	HMM_PFN_VALID = 1UL &lt;&lt; (BITS_PER_LONG - 1),</div><div class='ctx'> 	HMM_PFN_WRITE = 1UL &lt;&lt; (BITS_PER_LONG - 2),</div><div class='ctx'> 	HMM_PFN_ERROR = 1UL &lt;&lt; (BITS_PER_LONG - 3),</div><div class='del'>-	HMM_PFN_ORDER_SHIFT = (BITS_PER_LONG - 8),</div><div class='add'>+	/*</div><div class='add'>+	 * Sticky flags, carried from input to output,</div><div class='add'>+	 * don't forget to update HMM_PFN_INOUT_FLAGS</div><div class='add'>+	 */</div><div class='add'>+	HMM_PFN_DMA_MAPPED = 1UL &lt;&lt; (BITS_PER_LONG - 4),</div><div class='add'>+	HMM_PFN_P2PDMA     = 1UL &lt;&lt; (BITS_PER_LONG - 5),</div><div class='add'>+	HMM_PFN_P2PDMA_BUS = 1UL &lt;&lt; (BITS_PER_LONG - 6),</div><div class='add'>+</div><div class='add'>+	HMM_PFN_ORDER_SHIFT = (BITS_PER_LONG - 11),</div><div class='ctx'> </div><div class='ctx'> 	/* Input flags */</div><div class='ctx'> 	HMM_PFN_REQ_FAULT = HMM_PFN_VALID,</div><div class='ctx'> 	HMM_PFN_REQ_WRITE = HMM_PFN_WRITE,</div><div class='ctx'> </div><div class='del'>-	HMM_PFN_FLAGS = 0xFFUL &lt;&lt; HMM_PFN_ORDER_SHIFT,</div><div class='add'>+	HMM_PFN_FLAGS = ~((1UL &lt;&lt; HMM_PFN_ORDER_SHIFT) - 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -58,6 +70,14 @@ static inline struct page *hmm_pfn_to_page(unsigned long hmm_pfn)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * hmm_pfn_to_phys() - return physical address pointed to by a device entry</div><div class='add'>+ */</div><div class='add'>+static inline phys_addr_t hmm_pfn_to_phys(unsigned long hmm_pfn)</div><div class='add'>+{</div><div class='add'>+	return __pfn_to_phys(hmm_pfn &amp; ~HMM_PFN_FLAGS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * hmm_pfn_to_map_order() - return the CPU mapping size order</div><div class='ctx'>  *</div><div class='ctx'>  * This is optionally useful to optimize processing of the pfn result</div><div class='head'>diff --git a/include/linux/host1x.h b/include/linux/host1x.h<br/>index 9c8119ed13a4..9fa9c30a34e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/host1x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/host1x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/host1x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/host1x.h</a></div><div class='hunk'>@@ -14,12 +14,17 @@</div><div class='ctx'> </div><div class='ctx'> enum host1x_class {</div><div class='ctx'> 	HOST1X_CLASS_HOST1X = 0x1,</div><div class='add'>+	HOST1X_CLASS_NVJPG1 = 0x7,</div><div class='add'>+	HOST1X_CLASS_NVENC = 0x21,</div><div class='add'>+	HOST1X_CLASS_NVENC1 = 0x22,</div><div class='ctx'> 	HOST1X_CLASS_GR2D = 0x51,</div><div class='ctx'> 	HOST1X_CLASS_GR2D_SB = 0x52,</div><div class='ctx'> 	HOST1X_CLASS_VIC = 0x5D,</div><div class='ctx'> 	HOST1X_CLASS_GR3D = 0x60,</div><div class='add'>+	HOST1X_CLASS_NVJPG = 0xC0,</div><div class='ctx'> 	HOST1X_CLASS_NVDEC = 0xF0,</div><div class='ctx'> 	HOST1X_CLASS_NVDEC1 = 0xF5,</div><div class='add'>+	HOST1X_CLASS_OFA = 0xF8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct host1x;</div><div class='hunk'>@@ -466,6 +471,7 @@ struct host1x_memory_context {</div><div class='ctx'> 	refcount_t ref;</div><div class='ctx'> 	struct pid *owner;</div><div class='ctx'> </div><div class='add'>+	struct device_dma_parameters dma_parms;</div><div class='ctx'> 	struct device dev;</div><div class='ctx'> 	u64 dma_mask;</div><div class='ctx'> 	u32 stream_id;</div><div class='head'>diff --git a/include/linux/host1x_context_bus.h b/include/linux/host1x_context_bus.h<br/>index 72462737a6db..c928cb432680 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/host1x_context_bus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/host1x_context_bus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/host1x_context_bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/host1x_context_bus.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TEGRA_HOST1X_CONTEXT_BUS</div><div class='del'>-extern struct bus_type host1x_context_device_bus_type;</div><div class='add'>+extern const struct bus_type host1x_context_device_bus_type;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h<br/>index aa1e65ccb615..2cf1bf65b225 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hrtimer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hrtimer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hrtimer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hrtimer.h</a></div><div class='hunk'>@@ -154,14 +154,11 @@ static inline s64 hrtimer_get_expires_ns(const struct hrtimer *timer)</div><div class='ctx'> 	return ktime_to_ns(timer-&gt;node.expires);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer)</div><div class='del'>-{</div><div class='del'>-	return ktime_sub(timer-&gt;node.expires, timer-&gt;base-&gt;get_time());</div><div class='del'>-}</div><div class='add'>+ktime_t hrtimer_cb_get_time(const struct hrtimer *timer);</div><div class='ctx'> </div><div class='del'>-static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer)</div><div class='add'>+static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer)</div><div class='ctx'> {</div><div class='del'>-	return timer-&gt;base-&gt;get_time();</div><div class='add'>+	return ktime_sub(timer-&gt;node.expires, hrtimer_cb_get_time(timer));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int hrtimer_is_hres_active(struct hrtimer *timer)</div><div class='hunk'>@@ -200,8 +197,7 @@ __hrtimer_expires_remaining_adjusted(const struct hrtimer *timer, ktime_t now)</div><div class='ctx'> static inline ktime_t</div><div class='ctx'> hrtimer_expires_remaining_adjusted(const struct hrtimer *timer)</div><div class='ctx'> {</div><div class='del'>-	return __hrtimer_expires_remaining_adjusted(timer,</div><div class='del'>-						    timer-&gt;base-&gt;get_time());</div><div class='add'>+	return __hrtimer_expires_remaining_adjusted(timer, hrtimer_cb_get_time(timer));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TIMERFD</div><div class='hunk'>@@ -223,37 +219,25 @@ static inline void hrtimer_cancel_wait_running(struct hrtimer *timer)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline enum hrtimer_restart hrtimer_dummy_timeout(struct hrtimer *unused)</div><div class='add'>+{</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Exported timer functions: */</div><div class='ctx'> </div><div class='ctx'> /* Initialize timers: */</div><div class='del'>-extern void hrtimer_init(struct hrtimer *timer, clockid_t which_clock,</div><div class='del'>-			 enum hrtimer_mode mode);</div><div class='del'>-extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, clockid_t clock_id,</div><div class='del'>-				 enum hrtimer_mode mode);</div><div class='add'>+extern void hrtimer_setup(struct hrtimer *timer, enum hrtimer_restart (*function)(struct hrtimer *),</div><div class='add'>+			  clockid_t clock_id, enum hrtimer_mode mode);</div><div class='add'>+extern void hrtimer_setup_on_stack(struct hrtimer *timer,</div><div class='add'>+				   enum hrtimer_restart (*function)(struct hrtimer *),</div><div class='add'>+				   clockid_t clock_id, enum hrtimer_mode mode);</div><div class='add'>+extern void hrtimer_setup_sleeper_on_stack(struct hrtimer_sleeper *sl, clockid_t clock_id,</div><div class='add'>+					   enum hrtimer_mode mode);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_OBJECTS_TIMERS</div><div class='del'>-extern void hrtimer_init_on_stack(struct hrtimer *timer, clockid_t which_clock,</div><div class='del'>-				  enum hrtimer_mode mode);</div><div class='del'>-extern void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,</div><div class='del'>-					  clockid_t clock_id,</div><div class='del'>-					  enum hrtimer_mode mode);</div><div class='del'>-</div><div class='ctx'> extern void destroy_hrtimer_on_stack(struct hrtimer *timer);</div><div class='ctx'> #else</div><div class='del'>-static inline void hrtimer_init_on_stack(struct hrtimer *timer,</div><div class='del'>-					 clockid_t which_clock,</div><div class='del'>-					 enum hrtimer_mode mode)</div><div class='del'>-{</div><div class='del'>-	hrtimer_init(timer, which_clock, mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,</div><div class='del'>-						 clockid_t clock_id,</div><div class='del'>-						 enum hrtimer_mode mode)</div><div class='del'>-{</div><div class='del'>-	hrtimer_init_sleeper(sl, clock_id, mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -337,6 +321,29 @@ static inline int hrtimer_callback_running(struct hrtimer *timer)</div><div class='ctx'> 	return timer-&gt;base-&gt;running == timer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * hrtimer_update_function - Update the timer's callback function</div><div class='add'>+ * @timer:	Timer to update</div><div class='add'>+ * @function:	New callback function</div><div class='add'>+ *</div><div class='add'>+ * Only safe to call if the timer is not enqueued. Can be called in the callback function if the</div><div class='add'>+ * timer is not enqueued at the same time (see the comments above HRTIMER_STATE_ENQUEUED).</div><div class='add'>+ */</div><div class='add'>+static inline void hrtimer_update_function(struct hrtimer *timer,</div><div class='add'>+					   enum hrtimer_restart (*function)(struct hrtimer *))</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PROVE_LOCKING</div><div class='add'>+	guard(raw_spinlock_irqsave)(&amp;timer-&gt;base-&gt;cpu_base-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(hrtimer_is_queued(timer)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!function))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+	ACCESS_PRIVATE(timer, function) = function;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Forward a hrtimer so it expires after now: */</div><div class='ctx'> extern u64</div><div class='ctx'> hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);</div><div class='hunk'>@@ -352,7 +359,7 @@ hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);</div><div class='ctx'> static inline u64 hrtimer_forward_now(struct hrtimer *timer,</div><div class='ctx'> 				      ktime_t interval)</div><div class='ctx'> {</div><div class='del'>-	return hrtimer_forward(timer, timer-&gt;base-&gt;get_time(), interval);</div><div class='add'>+	return hrtimer_forward(timer, hrtimer_cb_get_time(timer), interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Precise sleep: */</div><div class='hunk'>@@ -379,6 +386,7 @@ extern void __init hrtimers_init(void);</div><div class='ctx'> extern void sysrq_timer_list_show(void);</div><div class='ctx'> </div><div class='ctx'> int hrtimers_prepare_cpu(unsigned int cpu);</div><div class='add'>+int hrtimers_cpu_starting(unsigned int cpu);</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> int hrtimers_cpu_dying(unsigned int cpu);</div><div class='ctx'> #else</div><div class='head'>diff --git a/include/linux/hrtimer_defs.h b/include/linux/hrtimer_defs.h<br/>index c3b4b7ed7c16..aa49ffa130e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hrtimer_defs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hrtimer_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hrtimer_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hrtimer_defs.h</a></div><div class='hunk'>@@ -41,7 +41,6 @@</div><div class='ctx'>  * @seq:		seqcount around __run_hrtimer</div><div class='ctx'>  * @running:		pointer to the currently running hrtimer</div><div class='ctx'>  * @active:		red black tree root node for the active timers</div><div class='del'>- * @get_time:		function to retrieve the current time of the clock</div><div class='ctx'>  * @offset:		offset of this clock to the monotonic base</div><div class='ctx'>  */</div><div class='ctx'> struct hrtimer_clock_base {</div><div class='hunk'>@@ -51,7 +50,6 @@ struct hrtimer_clock_base {</div><div class='ctx'> 	seqcount_raw_spinlock_t	seq;</div><div class='ctx'> 	struct hrtimer		*running;</div><div class='ctx'> 	struct timerqueue_head	active;</div><div class='del'>-	ktime_t			(*get_time)(void);</div><div class='ctx'> 	ktime_t			offset;</div><div class='ctx'> } __hrtimer_clock_base_align;</div><div class='ctx'> </div><div class='hunk'>@@ -125,6 +123,7 @@ struct hrtimer_cpu_base {</div><div class='ctx'> 	ktime_t				softirq_expires_next;</div><div class='ctx'> 	struct hrtimer			*softirq_next_timer;</div><div class='ctx'> 	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];</div><div class='add'>+	call_single_data_t		csd;</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/hrtimer_types.h b/include/linux/hrtimer_types.h<br/>index ad66a3081735..8fbbb6bdf7a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hrtimer_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hrtimer_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hrtimer_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hrtimer_types.h</a></div><div class='hunk'>@@ -34,12 +34,12 @@ enum hrtimer_restart {</div><div class='ctx'>  * @is_hard:	Set if hrtimer will be expired in hard interrupt context</div><div class='ctx'>  *		even on RT.</div><div class='ctx'>  *</div><div class='del'>- * The hrtimer structure must be initialized by hrtimer_init()</div><div class='add'>+ * The hrtimer structure must be initialized by hrtimer_setup()</div><div class='ctx'>  */</div><div class='ctx'> struct hrtimer {</div><div class='ctx'> 	struct timerqueue_node		node;</div><div class='ctx'> 	ktime_t				_softexpires;</div><div class='del'>-	enum hrtimer_restart		(*function)(struct hrtimer *);</div><div class='add'>+	enum hrtimer_restart		(*__private function)(struct hrtimer *);</div><div class='ctx'> 	struct hrtimer_clock_base	*base;</div><div class='ctx'> 	u8				state;</div><div class='ctx'> 	u8				is_rel;</div><div class='head'>diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h<br/>index 5adb86af35fc..ae7f21aad0ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/huge_mm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/huge_mm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/huge_mm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/huge_mm.h</a></div><div class='hunk'>@@ -2,16 +2,16 @@</div><div class='ctx'> #ifndef _LINUX_HUGE_MM_H</div><div class='ctx'> #define _LINUX_HUGE_MM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched/coredump.h&gt;</div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt; /* only for vma_is_dax() */</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='ctx'> </div><div class='ctx'> vm_fault_t do_huge_pmd_anonymous_page(struct vm_fault *vmf);</div><div class='ctx'> int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,</div><div class='ctx'> 		  pmd_t *dst_pmd, pmd_t *src_pmd, unsigned long addr,</div><div class='ctx'> 		  struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma);</div><div class='del'>-void huge_pmd_set_accessed(struct vm_fault *vmf);</div><div class='add'>+bool huge_pmd_set_accessed(struct vm_fault *vmf);</div><div class='ctx'> int copy_huge_pud(struct mm_struct *dst_mm, struct mm_struct *src_mm,</div><div class='ctx'> 		  pud_t *dst_pud, pud_t *src_pud, unsigned long addr,</div><div class='ctx'> 		  struct vm_area_struct *vma);</div><div class='hunk'>@@ -37,8 +37,14 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,</div><div class='ctx'> 		    pmd_t *pmd, unsigned long addr, pgprot_t newprot,</div><div class='ctx'> 		    unsigned long cp_flags);</div><div class='ctx'> </div><div class='del'>-vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write);</div><div class='del'>-vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write);</div><div class='add'>+vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, unsigned long pfn,</div><div class='add'>+			      bool write);</div><div class='add'>+vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, unsigned long pfn,</div><div class='add'>+			      bool write);</div><div class='add'>+vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf, struct folio *folio,</div><div class='add'>+				bool write);</div><div class='add'>+vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf, struct folio *folio,</div><div class='add'>+				bool write);</div><div class='ctx'> </div><div class='ctx'> enum transparent_hugepage_flag {</div><div class='ctx'> 	TRANSPARENT_HUGEPAGE_UNSUPPORTED,</div><div class='hunk'>@@ -63,9 +69,7 @@ ssize_t single_hugepage_flag_show(struct kobject *kobj,</div><div class='ctx'> 				  struct kobj_attribute *attr, char *buf,</div><div class='ctx'> 				  enum transparent_hugepage_flag flag);</div><div class='ctx'> extern struct kobj_attribute shmem_enabled_attr;</div><div class='del'>-</div><div class='del'>-#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)</div><div class='del'>-#define HPAGE_PMD_NR (1&lt;&lt;HPAGE_PMD_ORDER)</div><div class='add'>+extern struct kobj_attribute thpsize_shmem_enabled_attr;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Mask of all large folio orders supported for anonymous THP; all orders up to</div><div class='hunk'>@@ -75,26 +79,103 @@ extern struct kobj_attribute shmem_enabled_attr;</div><div class='ctx'> #define THP_ORDERS_ALL_ANON	((BIT(PMD_ORDER + 1) - 1) &amp; ~(BIT(0) | BIT(1)))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Mask of all large folio orders supported for file THP.</div><div class='add'>+ * Mask of all large folio orders supported for file THP. Folios in a DAX</div><div class='add'>+ * file is never split and the MAX_PAGECACHE_ORDER limit does not apply to</div><div class='add'>+ * it.  Same to PFNMAPs where there's neither page* nor pagecache.</div><div class='ctx'>  */</div><div class='del'>-#define THP_ORDERS_ALL_FILE	(BIT(PMD_ORDER) | BIT(PUD_ORDER))</div><div class='add'>+#define THP_ORDERS_ALL_SPECIAL		\</div><div class='add'>+	(BIT(PMD_ORDER) | BIT(PUD_ORDER))</div><div class='add'>+#define THP_ORDERS_ALL_FILE_DEFAULT	\</div><div class='add'>+	((BIT(MAX_PAGECACHE_ORDER + 1) - 1) &amp; ~BIT(0))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Mask of all large folio orders supported for THP.</div><div class='ctx'>  */</div><div class='del'>-#define THP_ORDERS_ALL		(THP_ORDERS_ALL_ANON | THP_ORDERS_ALL_FILE)</div><div class='add'>+#define THP_ORDERS_ALL	\</div><div class='add'>+	(THP_ORDERS_ALL_ANON | THP_ORDERS_ALL_SPECIAL | THP_ORDERS_ALL_FILE_DEFAULT)</div><div class='add'>+</div><div class='add'>+enum tva_type {</div><div class='add'>+	TVA_SMAPS,		/* Exposing "THPeligible:" in smaps. */</div><div class='add'>+	TVA_PAGEFAULT,		/* Serving a page fault. */</div><div class='add'>+	TVA_KHUGEPAGED,		/* Khugepaged collapse. */</div><div class='add'>+	TVA_FORCED_COLLAPSE,	/* Forced collapse (e.g. MADV_COLLAPSE). */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#define thp_vma_allowable_order(vma, vm_flags, smaps, in_pf, enforce_sysfs, order) \</div><div class='del'>-	(!!thp_vma_allowable_orders(vma, vm_flags, smaps, in_pf, enforce_sysfs, BIT(order)))</div><div class='add'>+#define thp_vma_allowable_order(vma, vm_flags, type, order) \</div><div class='add'>+	(!!thp_vma_allowable_orders(vma, vm_flags, type, BIT(order)))</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+#define split_folio(f) split_folio_to_list(f, NULL)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PGTABLE_HAS_HUGE_LEAVES</div><div class='ctx'> #define HPAGE_PMD_SHIFT PMD_SHIFT</div><div class='del'>-#define HPAGE_PMD_SIZE	((1UL) &lt;&lt; HPAGE_PMD_SHIFT)</div><div class='add'>+#define HPAGE_PUD_SHIFT PUD_SHIFT</div><div class='add'>+#else</div><div class='add'>+#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })</div><div class='add'>+#define HPAGE_PUD_SHIFT ({ BUILD_BUG(); 0; })</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)</div><div class='add'>+#define HPAGE_PMD_NR (1&lt;&lt;HPAGE_PMD_ORDER)</div><div class='ctx'> #define HPAGE_PMD_MASK	(~(HPAGE_PMD_SIZE - 1))</div><div class='add'>+#define HPAGE_PMD_SIZE	((1UL) &lt;&lt; HPAGE_PMD_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define HPAGE_PUD_SHIFT PUD_SHIFT</div><div class='del'>-#define HPAGE_PUD_SIZE	((1UL) &lt;&lt; HPAGE_PUD_SHIFT)</div><div class='add'>+#define HPAGE_PUD_ORDER (HPAGE_PUD_SHIFT-PAGE_SHIFT)</div><div class='add'>+#define HPAGE_PUD_NR (1&lt;&lt;HPAGE_PUD_ORDER)</div><div class='ctx'> #define HPAGE_PUD_MASK	(~(HPAGE_PUD_SIZE - 1))</div><div class='add'>+#define HPAGE_PUD_SIZE	((1UL) &lt;&lt; HPAGE_PUD_SHIFT)</div><div class='add'>+</div><div class='add'>+enum mthp_stat_item {</div><div class='add'>+	MTHP_STAT_ANON_FAULT_ALLOC,</div><div class='add'>+	MTHP_STAT_ANON_FAULT_FALLBACK,</div><div class='add'>+	MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE,</div><div class='add'>+	MTHP_STAT_ZSWPOUT,</div><div class='add'>+	MTHP_STAT_SWPIN,</div><div class='add'>+	MTHP_STAT_SWPIN_FALLBACK,</div><div class='add'>+	MTHP_STAT_SWPIN_FALLBACK_CHARGE,</div><div class='add'>+	MTHP_STAT_SWPOUT,</div><div class='add'>+	MTHP_STAT_SWPOUT_FALLBACK,</div><div class='add'>+	MTHP_STAT_SHMEM_ALLOC,</div><div class='add'>+	MTHP_STAT_SHMEM_FALLBACK,</div><div class='add'>+	MTHP_STAT_SHMEM_FALLBACK_CHARGE,</div><div class='add'>+	MTHP_STAT_SPLIT,</div><div class='add'>+	MTHP_STAT_SPLIT_FAILED,</div><div class='add'>+	MTHP_STAT_SPLIT_DEFERRED,</div><div class='add'>+	MTHP_STAT_NR_ANON,</div><div class='add'>+	MTHP_STAT_NR_ANON_PARTIALLY_MAPPED,</div><div class='add'>+	__MTHP_STAT_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_TRANSPARENT_HUGEPAGE) &amp;&amp; defined(CONFIG_SYSFS)</div><div class='add'>+struct mthp_stat {</div><div class='add'>+	unsigned long stats[ilog2(MAX_PTRS_PER_PTE) + 1][__MTHP_STAT_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DECLARE_PER_CPU(struct mthp_stat, mthp_stats);</div><div class='add'>+</div><div class='add'>+static inline void mod_mthp_stat(int order, enum mthp_stat_item item, int delta)</div><div class='add'>+{</div><div class='add'>+	if (order &lt;= 0 || order &gt; PMD_ORDER)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	this_cpu_add(mthp_stats.stats[order][item], delta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void count_mthp_stat(int order, enum mthp_stat_item item)</div><div class='add'>+{</div><div class='add'>+	mod_mthp_stat(order, item, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline void mod_mthp_stat(int order, enum mthp_stat_item item, int delta)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void count_mthp_stat(int order, enum mthp_stat_item item)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='ctx'> </div><div class='ctx'> extern unsigned long transparent_hugepage_flags;</div><div class='ctx'> extern unsigned long huge_anon_orders_always;</div><div class='hunk'>@@ -114,18 +195,6 @@ static inline bool hugepage_global_always(void)</div><div class='ctx'> 			(1&lt;&lt;TRANSPARENT_HUGEPAGE_FLAG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool hugepage_flags_enabled(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We cover both the anon and the file-backed case here; we must return</div><div class='del'>-	 * true if globally enabled, even when all anon sizes are set to never.</div><div class='del'>-	 * So we don't need to look at huge_anon_orders_inherit.</div><div class='del'>-	 */</div><div class='del'>-	return hugepage_global_enabled() ||</div><div class='del'>-	       huge_anon_orders_always ||</div><div class='del'>-	       huge_anon_orders_madvise;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int highest_order(unsigned long orders)</div><div class='ctx'> {</div><div class='ctx'> 	return fls_long(orders) - 1;</div><div class='hunk'>@@ -196,31 +265,16 @@ static inline unsigned long thp_vma_suitable_orders(struct vm_area_struct *vma,</div><div class='ctx'> 	return orders;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool file_thp_enabled(struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	if (!vma-&gt;vm_file)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	inode = vma-&gt;vm_file-&gt;f_inode;</div><div class='del'>-</div><div class='del'>-	return (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS)) &amp;&amp;</div><div class='del'>-	       !inode_is_open_for_write(inode) &amp;&amp; S_ISREG(inode-&gt;i_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,</div><div class='del'>-					 unsigned long vm_flags, bool smaps,</div><div class='del'>-					 bool in_pf, bool enforce_sysfs,</div><div class='add'>+					 vm_flags_t vm_flags,</div><div class='add'>+					 enum tva_type type,</div><div class='ctx'> 					 unsigned long orders);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * thp_vma_allowable_orders - determine hugepage orders that are allowed for vma</div><div class='ctx'>  * @vma:  the vm area to check</div><div class='ctx'>  * @vm_flags: use these vm_flags instead of vma-&gt;vm_flags</div><div class='del'>- * @smaps: whether answer will be used for smaps file</div><div class='del'>- * @in_pf: whether answer will be used by page fault handler</div><div class='del'>- * @enforce_sysfs: whether sysfs config should be taken into account</div><div class='add'>+ * @type: TVA type</div><div class='ctx'>  * @orders: bitfield of all orders to consider</div><div class='ctx'>  *</div><div class='ctx'>  * Calculates the intersection of the requested hugepage orders and the allowed</div><div class='hunk'>@@ -233,12 +287,15 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,</div><div class='ctx'>  */</div><div class='ctx'> static inline</div><div class='ctx'> unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma,</div><div class='del'>-				       unsigned long vm_flags, bool smaps,</div><div class='del'>-				       bool in_pf, bool enforce_sysfs,</div><div class='add'>+				       vm_flags_t vm_flags,</div><div class='add'>+				       enum tva_type type,</div><div class='ctx'> 				       unsigned long orders)</div><div class='ctx'> {</div><div class='del'>-	/* Optimization to check if required orders are enabled early. */</div><div class='del'>-	if (enforce_sysfs &amp;&amp; vma_is_anonymous(vma)) {</div><div class='add'>+	/*</div><div class='add'>+	 * Optimization to check if required orders are enabled early. Only</div><div class='add'>+	 * forced collapse ignores sysfs configs.</div><div class='add'>+	 */</div><div class='add'>+	if (type != TVA_FORCED_COLLAPSE &amp;&amp; vma_is_anonymous(vma)) {</div><div class='ctx'> 		unsigned long mask = READ_ONCE(huge_anon_orders_always);</div><div class='ctx'> </div><div class='ctx'> 		if (vm_flags &amp; VM_HUGEPAGE)</div><div class='hunk'>@@ -252,81 +309,200 @@ unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return __thp_vma_allowable_orders(vma, vm_flags, smaps, in_pf,</div><div class='del'>-					  enforce_sysfs, orders);</div><div class='add'>+	return __thp_vma_allowable_orders(vma, vm_flags, type, orders);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct thpsize {</div><div class='add'>+	struct kobject kobj;</div><div class='add'>+	struct list_head node;</div><div class='add'>+	int order;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_thpsize(kobj) container_of(kobj, struct thpsize, kobj)</div><div class='add'>+</div><div class='ctx'> #define transparent_hugepage_use_zero_page()				\</div><div class='ctx'> 	(transparent_hugepage_flags &amp;					\</div><div class='ctx'> 	 (1&lt;&lt;TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG))</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Check whether THPs are explicitly disabled for this VMA, for example,</div><div class='add'>+ * through madvise or prctl.</div><div class='add'>+ */</div><div class='add'>+static inline bool vma_thp_disabled(struct vm_area_struct *vma,</div><div class='add'>+		vm_flags_t vm_flags, bool forced_collapse)</div><div class='add'>+{</div><div class='add'>+	/* Are THPs disabled for this VMA? */</div><div class='add'>+	if (vm_flags &amp; VM_NOHUGEPAGE)</div><div class='add'>+		return true;</div><div class='add'>+	/* Are THPs disabled for all VMAs in the whole process? */</div><div class='add'>+	if (mm_flags_test(MMF_DISABLE_THP_COMPLETELY, vma-&gt;vm_mm))</div><div class='add'>+		return true;</div><div class='add'>+	/*</div><div class='add'>+	 * Are THPs disabled only for VMAs where we didn't get an explicit</div><div class='add'>+	 * advise to use them?</div><div class='add'>+	 */</div><div class='add'>+	if (vm_flags &amp; VM_HUGEPAGE)</div><div class='add'>+		return false;</div><div class='add'>+	/*</div><div class='add'>+	 * Forcing a collapse (e.g., madv_collapse), is a clear advice to</div><div class='add'>+	 * use THPs.</div><div class='add'>+	 */</div><div class='add'>+	if (forced_collapse)</div><div class='add'>+		return false;</div><div class='add'>+	return mm_flags_test(MMF_DISABLE_THP_EXCEPT_ADVISED, vma-&gt;vm_mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool thp_disabled_by_hw(void)</div><div class='add'>+{</div><div class='add'>+	/* If the hardware/firmware marked hugepage support disabled. */</div><div class='add'>+	return transparent_hugepage_flags &amp; (1 &lt;&lt; TRANSPARENT_HUGEPAGE_UNSUPPORTED);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='ctx'> 		unsigned long len, unsigned long pgoff, unsigned long flags);</div><div class='add'>+unsigned long thp_get_unmapped_area_vmflags(struct file *filp, unsigned long addr,</div><div class='add'>+		unsigned long len, unsigned long pgoff, unsigned long flags,</div><div class='add'>+		vm_flags_t vm_flags);</div><div class='add'>+</div><div class='add'>+enum split_type {</div><div class='add'>+	SPLIT_TYPE_UNIFORM,</div><div class='add'>+	SPLIT_TYPE_NON_UNIFORM,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-void folio_prep_large_rmappable(struct folio *folio);</div><div class='del'>-bool can_split_folio(struct folio *folio, int *pextra_pins);</div><div class='del'>-int split_huge_page_to_list(struct page *page, struct list_head *list);</div><div class='add'>+bool can_split_folio(struct folio *folio, int caller_pins, int *pextra_pins);</div><div class='add'>+int __split_huge_page_to_list_to_order(struct page *page, struct list_head *list,</div><div class='add'>+		unsigned int new_order);</div><div class='add'>+int folio_split_unmapped(struct folio *folio, unsigned int new_order);</div><div class='add'>+int min_order_for_split(struct folio *folio);</div><div class='add'>+int split_folio_to_list(struct folio *folio, struct list_head *list);</div><div class='add'>+bool folio_split_supported(struct folio *folio, unsigned int new_order,</div><div class='add'>+		enum split_type split_type, bool warns);</div><div class='add'>+int folio_split(struct folio *folio, unsigned int new_order, struct page *page,</div><div class='add'>+		struct list_head *list);</div><div class='add'>+</div><div class='add'>+static inline int split_huge_page_to_list_to_order(struct page *page, struct list_head *list,</div><div class='add'>+		unsigned int new_order)</div><div class='add'>+{</div><div class='add'>+	return __split_huge_page_to_list_to_order(page, list, new_order);</div><div class='add'>+}</div><div class='add'>+static inline int split_huge_page_to_order(struct page *page, unsigned int new_order)</div><div class='add'>+{</div><div class='add'>+	return split_huge_page_to_list_to_order(page, NULL, new_order);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * try_folio_split_to_order() - try to split a @folio at @page to @new_order</div><div class='add'>+ * using non uniform split.</div><div class='add'>+ * @folio: folio to be split</div><div class='add'>+ * @page: split to @new_order at the given page</div><div class='add'>+ * @new_order: the target split order</div><div class='add'>+ *</div><div class='add'>+ * Try to split a @folio at @page using non uniform split to @new_order, if</div><div class='add'>+ * non uniform split is not supported, fall back to uniform split. After-split</div><div class='add'>+ * folios are put back to LRU list. Use min_order_for_split() to get the lower</div><div class='add'>+ * bound of @new_order.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 - split is successful, otherwise split failed.</div><div class='add'>+ */</div><div class='add'>+static inline int try_folio_split_to_order(struct folio *folio,</div><div class='add'>+		struct page *page, unsigned int new_order)</div><div class='add'>+{</div><div class='add'>+	if (!folio_split_supported(folio, new_order, SPLIT_TYPE_NON_UNIFORM, /* warns= */ false))</div><div class='add'>+		return split_huge_page_to_order(&amp;folio-&gt;page, new_order);</div><div class='add'>+	return folio_split(folio, new_order, page, NULL);</div><div class='add'>+}</div><div class='ctx'> static inline int split_huge_page(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return split_huge_page_to_list(page, NULL);</div><div class='add'>+	return split_huge_page_to_list_to_order(page, NULL, 0);</div><div class='ctx'> }</div><div class='del'>-void deferred_split_folio(struct folio *folio);</div><div class='add'>+void deferred_split_folio(struct folio *folio, bool partially_mapped);</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='add'>+void reparent_deferred_split_queue(struct mem_cgroup *memcg);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,</div><div class='del'>-		unsigned long address, bool freeze, struct folio *folio);</div><div class='add'>+		unsigned long address, bool freeze);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pmd_is_huge() - Is this PMD either a huge PMD entry or a software leaf entry?</div><div class='add'>+ * @pmd: The PMD to check.</div><div class='add'>+ *</div><div class='add'>+ * A huge PMD entry is a non-empty entry which is present and marked huge or a</div><div class='add'>+ * software leaf entry. This check be performed without the appropriate locks</div><div class='add'>+ * held, in which case the condition should be rechecked after they are</div><div class='add'>+ * acquired.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if this PMD is huge, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool pmd_is_huge(pmd_t pmd)</div><div class='add'>+{</div><div class='add'>+	if (pmd_present(pmd)) {</div><div class='add'>+		return pmd_trans_huge(pmd);</div><div class='add'>+	} else if (!pmd_none(pmd)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Non-present PMDs must be valid huge non-present entries. We</div><div class='add'>+		 * cannot assert that here due to header dependency issues.</div><div class='add'>+		 */</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define split_huge_pmd(__vma, __pmd, __address)				\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		pmd_t *____pmd = (__pmd);				\</div><div class='del'>-		if (is_swap_pmd(*____pmd) || pmd_trans_huge(*____pmd)	\</div><div class='del'>-					|| pmd_devmap(*____pmd))	\</div><div class='add'>+		if (pmd_is_huge(*____pmd))				\</div><div class='ctx'> 			__split_huge_pmd(__vma, __pmd, __address,	\</div><div class='del'>-						false, NULL);		\</div><div class='add'>+					 false);			\</div><div class='ctx'> 	}  while (0)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void split_huge_pmd_address(struct vm_area_struct *vma, unsigned long address,</div><div class='del'>-		bool freeze, struct folio *folio);</div><div class='add'>+		bool freeze);</div><div class='ctx'> </div><div class='ctx'> void __split_huge_pud(struct vm_area_struct *vma, pud_t *pud,</div><div class='ctx'> 		unsigned long address);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD</div><div class='add'>+int change_huge_pud(struct mmu_gather *tlb, struct vm_area_struct *vma,</div><div class='add'>+		    pud_t *pudp, unsigned long addr, pgprot_t newprot,</div><div class='add'>+		    unsigned long cp_flags);</div><div class='add'>+#else</div><div class='add'>+static inline int</div><div class='add'>+change_huge_pud(struct mmu_gather *tlb, struct vm_area_struct *vma,</div><div class='add'>+		pud_t *pudp, unsigned long addr, pgprot_t newprot,</div><div class='add'>+		unsigned long cp_flags) { return 0; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define split_huge_pud(__vma, __pud, __address)				\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		pud_t *____pud = (__pud);				\</div><div class='del'>-		if (pud_trans_huge(*____pud)				\</div><div class='del'>-					|| pud_devmap(*____pud))	\</div><div class='add'>+		if (pud_trans_huge(*____pud))				\</div><div class='ctx'> 			__split_huge_pud(__vma, __pud, __address);	\</div><div class='ctx'> 	}  while (0)</div><div class='ctx'> </div><div class='del'>-int hugepage_madvise(struct vm_area_struct *vma, unsigned long *vm_flags,</div><div class='add'>+int hugepage_madvise(struct vm_area_struct *vma, vm_flags_t *vm_flags,</div><div class='ctx'> 		     int advice);</div><div class='del'>-int madvise_collapse(struct vm_area_struct *vma,</div><div class='del'>-		     struct vm_area_struct **prev,</div><div class='del'>-		     unsigned long start, unsigned long end);</div><div class='add'>+int madvise_collapse(struct vm_area_struct *vma, unsigned long start,</div><div class='add'>+		     unsigned long end, bool *lock_dropped);</div><div class='ctx'> void vma_adjust_trans_huge(struct vm_area_struct *vma, unsigned long start,</div><div class='del'>-			   unsigned long end, long adjust_next);</div><div class='add'>+			   unsigned long end, struct vm_area_struct *next);</div><div class='ctx'> spinlock_t *__pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma);</div><div class='ctx'> spinlock_t *__pud_trans_huge_lock(pud_t *pud, struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='del'>-static inline int is_swap_pmd(pmd_t pmd)</div><div class='del'>-{</div><div class='del'>-	return !pmd_none(pmd) &amp;&amp; !pmd_present(pmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* mmap_lock must be held on entry */</div><div class='ctx'> static inline spinlock_t *pmd_trans_huge_lock(pmd_t *pmd,</div><div class='ctx'> 		struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd))</div><div class='add'>+	if (pmd_is_huge(*pmd))</div><div class='ctx'> 		return __pmd_trans_huge_lock(pmd, vma);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> static inline spinlock_t *pud_trans_huge_lock(pud_t *pud,</div><div class='ctx'> 		struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	if (pud_trans_huge(*pud) || pud_devmap(*pud))</div><div class='add'>+	if (pud_trans_huge(*pud))</div><div class='ctx'> 		return __pud_trans_huge_lock(pud, vma);</div><div class='ctx'> 	else</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -335,55 +511,65 @@ static inline spinlock_t *pud_trans_huge_lock(pud_t *pud,</div><div class='ctx'> /**</div><div class='ctx'>  * folio_test_pmd_mappable - Can we map this folio with a PMD?</div><div class='ctx'>  * @folio: The folio to test</div><div class='add'>+ *</div><div class='add'>+ * Return: true - @folio can be mapped, false - @folio cannot be mapped.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool folio_test_pmd_mappable(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_order(folio) &gt;= HPAGE_PMD_ORDER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *follow_devmap_pmd(struct vm_area_struct *vma, unsigned long addr,</div><div class='del'>-		pmd_t *pmd, int flags, struct dev_pagemap **pgmap);</div><div class='del'>-struct page *follow_devmap_pud(struct vm_area_struct *vma, unsigned long addr,</div><div class='del'>-		pud_t *pud, int flags, struct dev_pagemap **pgmap);</div><div class='del'>-</div><div class='ctx'> vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf);</div><div class='ctx'> </div><div class='del'>-extern struct page *huge_zero_page;</div><div class='add'>+vm_fault_t do_huge_pmd_device_private(struct vm_fault *vmf);</div><div class='add'>+</div><div class='add'>+extern struct folio *huge_zero_folio;</div><div class='ctx'> extern unsigned long huge_zero_pfn;</div><div class='ctx'> </div><div class='del'>-static inline bool is_huge_zero_page(struct page *page)</div><div class='add'>+static inline bool is_huge_zero_folio(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return READ_ONCE(huge_zero_page) == page;</div><div class='add'>+	VM_WARN_ON_ONCE(!folio);</div><div class='add'>+</div><div class='add'>+	return READ_ONCE(huge_zero_folio) == folio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_huge_zero_pmd(pmd_t pmd)</div><div class='add'>+static inline bool is_huge_zero_pfn(unsigned long pfn)</div><div class='ctx'> {</div><div class='del'>-	return pmd_present(pmd) &amp;&amp; READ_ONCE(huge_zero_pfn) == pmd_pfn(pmd);</div><div class='add'>+	return READ_ONCE(huge_zero_pfn) == (pfn &amp; ~(HPAGE_PMD_NR - 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_huge_zero_pud(pud_t pud)</div><div class='add'>+static inline bool is_huge_zero_pmd(pmd_t pmd)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='add'>+	return pmd_present(pmd) &amp;&amp; is_huge_zero_pfn(pmd_pfn(pmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *mm_get_huge_zero_page(struct mm_struct *mm);</div><div class='del'>-void mm_put_huge_zero_page(struct mm_struct *mm);</div><div class='add'>+struct folio *mm_get_huge_zero_folio(struct mm_struct *mm);</div><div class='add'>+void mm_put_huge_zero_folio(struct mm_struct *mm);</div><div class='ctx'> </div><div class='del'>-#define mk_huge_pmd(page, prot) pmd_mkhuge(mk_pmd(page, prot))</div><div class='add'>+static inline struct folio *get_persistent_huge_zero_folio(void)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PERSISTENT_HUGE_ZERO_FOLIO))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!huge_zero_folio))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return huge_zero_folio;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline bool thp_migration_supported(void)</div><div class='ctx'> {</div><div class='ctx'> 	return IS_ENABLED(CONFIG_ARCH_ENABLE_THP_MIGRATION);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='del'>-#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })</div><div class='del'>-#define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; })</div><div class='del'>-#define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; })</div><div class='add'>+void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address,</div><div class='add'>+			   pmd_t *pmd, bool freeze);</div><div class='add'>+bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr,</div><div class='add'>+			   pmd_t *pmdp, struct folio *folio);</div><div class='add'>+void map_anon_folio_pmd_nopf(struct folio *folio, pmd_t *pmd,</div><div class='add'>+		struct vm_area_struct *vma, unsigned long haddr);</div><div class='ctx'> </div><div class='del'>-#define HPAGE_PUD_SHIFT ({ BUILD_BUG(); 0; })</div><div class='del'>-#define HPAGE_PUD_MASK ({ BUILD_BUG(); 0; })</div><div class='del'>-#define HPAGE_PUD_SIZE ({ BUILD_BUG(); 0; })</div><div class='add'>+#else /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='ctx'> </div><div class='ctx'> static inline bool folio_test_pmd_mappable(struct folio *folio)</div><div class='ctx'> {</div><div class='hunk'>@@ -403,54 +589,99 @@ static inline unsigned long thp_vma_suitable_orders(struct vm_area_struct *vma,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma,</div><div class='del'>-					unsigned long vm_flags, bool smaps,</div><div class='del'>-					bool in_pf, bool enforce_sysfs,</div><div class='add'>+					vm_flags_t vm_flags,</div><div class='add'>+					enum tva_type type,</div><div class='ctx'> 					unsigned long orders)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void folio_prep_large_rmappable(struct folio *folio) {}</div><div class='del'>-</div><div class='ctx'> #define transparent_hugepage_flags 0UL</div><div class='ctx'> </div><div class='ctx'> #define thp_get_unmapped_area	NULL</div><div class='ctx'> </div><div class='add'>+static inline unsigned long</div><div class='add'>+thp_get_unmapped_area_vmflags(struct file *filp, unsigned long addr,</div><div class='add'>+			      unsigned long len, unsigned long pgoff,</div><div class='add'>+			      unsigned long flags, vm_flags_t vm_flags)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool</div><div class='del'>-can_split_folio(struct folio *folio, int *pextra_pins)</div><div class='add'>+can_split_folio(struct folio *folio, int caller_pins, int *pextra_pins)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> static inline int</div><div class='del'>-split_huge_page_to_list(struct page *page, struct list_head *list)</div><div class='add'>+split_huge_page_to_list_to_order(struct page *page, struct list_head *list,</div><div class='add'>+		unsigned int new_order)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	VM_WARN_ON_ONCE_PAGE(1, page);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline int split_huge_page_to_order(struct page *page, unsigned int new_order)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE_PAGE(1, page);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> static inline int split_huge_page(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	VM_WARN_ON_ONCE_PAGE(1, page);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int min_order_for_split(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE_FOLIO(1, folio);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int split_folio_to_list(struct folio *folio, struct list_head *list)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE_FOLIO(1, folio);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-static inline void deferred_split_folio(struct folio *folio) {}</div><div class='add'>+</div><div class='add'>+static inline int try_folio_split_to_order(struct folio *folio,</div><div class='add'>+		struct page *page, unsigned int new_order)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE_FOLIO(1, folio);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void deferred_split_folio(struct folio *folio, bool partially_mapped) {}</div><div class='add'>+static inline void reparent_deferred_split_queue(struct mem_cgroup *memcg) {}</div><div class='ctx'> #define split_huge_pmd(__vma, __pmd, __address)	\</div><div class='ctx'> 	do { } while (0)</div><div class='ctx'> </div><div class='ctx'> static inline void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,</div><div class='del'>-		unsigned long address, bool freeze, struct folio *folio) {}</div><div class='add'>+		unsigned long address, bool freeze) {}</div><div class='ctx'> static inline void split_huge_pmd_address(struct vm_area_struct *vma,</div><div class='del'>-		unsigned long address, bool freeze, struct folio *folio) {}</div><div class='add'>+		unsigned long address, bool freeze) {}</div><div class='add'>+static inline void split_huge_pmd_locked(struct vm_area_struct *vma,</div><div class='add'>+					 unsigned long address, pmd_t *pmd,</div><div class='add'>+					 bool freeze) {}</div><div class='add'>+</div><div class='add'>+static inline bool unmap_huge_pmd_locked(struct vm_area_struct *vma,</div><div class='add'>+					 unsigned long addr, pmd_t *pmdp,</div><div class='add'>+					 struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define split_huge_pud(__vma, __pmd, __address)	\</div><div class='ctx'> 	do { } while (0)</div><div class='ctx'> </div><div class='ctx'> static inline int hugepage_madvise(struct vm_area_struct *vma,</div><div class='del'>-				   unsigned long *vm_flags, int advice)</div><div class='add'>+				   vm_flags_t *vm_flags, int advice)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int madvise_collapse(struct vm_area_struct *vma,</div><div class='del'>-				   struct vm_area_struct **prev,</div><div class='del'>-				   unsigned long start, unsigned long end)</div><div class='add'>+				   unsigned long start,</div><div class='add'>+				   unsigned long end, bool *lock_dropped)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -458,12 +689,8 @@ static inline int madvise_collapse(struct vm_area_struct *vma,</div><div class='ctx'> static inline void vma_adjust_trans_huge(struct vm_area_struct *vma,</div><div class='ctx'> 					 unsigned long start,</div><div class='ctx'> 					 unsigned long end,</div><div class='del'>-					 long adjust_next)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline int is_swap_pmd(pmd_t pmd)</div><div class='add'>+					 struct vm_area_struct *next)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline spinlock_t *pmd_trans_huge_lock(pmd_t *pmd,</div><div class='ctx'> 		struct vm_area_struct *vma)</div><div class='hunk'>@@ -481,65 +708,101 @@ static inline vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_huge_zero_page(struct page *page)</div><div class='add'>+static inline vm_fault_t do_huge_pmd_device_private(struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_huge_zero_folio(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_huge_zero_pmd(pmd_t pmd)</div><div class='add'>+static inline bool is_huge_zero_pfn(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_huge_zero_pud(pud_t pud)</div><div class='add'>+static inline bool is_huge_zero_pmd(pmd_t pmd)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mm_put_huge_zero_page(struct mm_struct *mm)</div><div class='add'>+static inline void mm_put_huge_zero_folio(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page *follow_devmap_pmd(struct vm_area_struct *vma,</div><div class='del'>-	unsigned long addr, pmd_t *pmd, int flags, struct dev_pagemap **pgmap)</div><div class='add'>+static inline bool thp_migration_supported(void)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page *follow_devmap_pud(struct vm_area_struct *vma,</div><div class='del'>-	unsigned long addr, pud_t *pud, int flags, struct dev_pagemap **pgmap)</div><div class='add'>+static inline int highest_order(unsigned long orders)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int next_order(unsigned long *orders, int prev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __split_huge_pud(struct vm_area_struct *vma, pud_t *pud,</div><div class='add'>+				    unsigned long address)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int change_huge_pud(struct mmu_gather *tlb,</div><div class='add'>+				  struct vm_area_struct *vma, pud_t *pudp,</div><div class='add'>+				  unsigned long addr, pgprot_t newprot,</div><div class='add'>+				  unsigned long cp_flags)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct folio *get_persistent_huge_zero_folio(void)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool thp_migration_supported(void)</div><div class='add'>+static inline bool pmd_is_huge(pmd_t pmd)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='ctx'> </div><div class='del'>-static inline int split_folio_to_list(struct folio *folio,</div><div class='del'>-		struct list_head *list)</div><div class='add'>+static inline int split_folio_to_list_to_order(struct folio *folio,</div><div class='add'>+		struct list_head *list, int new_order)</div><div class='ctx'> {</div><div class='del'>-	return split_huge_page_to_list(&amp;folio-&gt;page, list);</div><div class='add'>+	return split_huge_page_to_list_to_order(&amp;folio-&gt;page, list, new_order);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int split_folio(struct folio *folio)</div><div class='add'>+static inline int split_folio_to_order(struct folio *folio, int new_order)</div><div class='ctx'> {</div><div class='del'>-	return split_folio_to_list(folio, NULL);</div><div class='add'>+	return split_folio_to_list_to_order(folio, NULL, new_order);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * archs that select ARCH_WANTS_THP_SWAP but don't support THP_SWP due to</div><div class='del'>- * limitations in the implementation like arm64 MTE can override this to</div><div class='del'>- * false</div><div class='add'>+/**</div><div class='add'>+ * largest_zero_folio - Get the largest zero size folio available</div><div class='add'>+ *</div><div class='add'>+ * This function shall be used when mm_get_huge_zero_folio() cannot be</div><div class='add'>+ * used as there is no appropriate mm lifetime to tie the huge zero folio</div><div class='add'>+ * from the caller.</div><div class='add'>+ *</div><div class='add'>+ * Deduce the size of the folio with folio_size instead of assuming the</div><div class='add'>+ * folio size.</div><div class='add'>+ *</div><div class='add'>+ * Return: pointer to PMD sized zero folio if CONFIG_PERSISTENT_HUGE_ZERO_FOLIO</div><div class='add'>+ * is enabled or a single page sized zero folio</div><div class='ctx'>  */</div><div class='del'>-#ifndef arch_thp_swp_supported</div><div class='del'>-static inline bool arch_thp_swp_supported(void)</div><div class='add'>+static inline struct folio *largest_zero_folio(void)</div><div class='ctx'> {</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+	struct folio *folio = get_persistent_huge_zero_folio();</div><div class='add'>+</div><div class='add'>+	if (folio)</div><div class='add'>+		return folio;</div><div class='ctx'> </div><div class='add'>+	return page_folio(ZERO_PAGE(0));</div><div class='add'>+}</div><div class='ctx'> #endif /* _LINUX_HUGE_MM_H */</div><div class='head'>diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h<br/>index c1ee640d87b1..019a1c5281e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hugetlb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hugetlb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hugetlb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hugetlb.h</a></div><div class='hunk'>@@ -14,18 +14,13 @@</div><div class='ctx'> #include &lt;linux/pgtable.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/userfaultfd_k.h&gt;</div><div class='add'>+#include &lt;linux/nodemask.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct ctl_table;</div><div class='ctx'> struct user_struct;</div><div class='ctx'> struct mmu_gather;</div><div class='ctx'> struct node;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_ARCH_HAS_HUGEPD</div><div class='del'>-typedef struct { unsigned long pd; } hugepd_t;</div><div class='del'>-#define is_hugepd(hugepd) (0)</div><div class='del'>-#define __hugepd(x) ((hugepd_t) { (x) })</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void free_huge_folio(struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='hunk'>@@ -133,16 +128,13 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma,</div><div class='ctx'> 			     unsigned long len);</div><div class='ctx'> int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *,</div><div class='ctx'> 			    struct vm_area_struct *, struct vm_area_struct *);</div><div class='del'>-struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma,</div><div class='del'>-				      unsigned long address, unsigned int flags,</div><div class='del'>-				      unsigned int *page_mask);</div><div class='ctx'> void unmap_hugepage_range(struct vm_area_struct *,</div><div class='del'>-			  unsigned long, unsigned long, struct page *,</div><div class='del'>-			  zap_flags_t);</div><div class='add'>+			  unsigned long start, unsigned long end,</div><div class='add'>+			  struct folio *, zap_flags_t);</div><div class='ctx'> void __unmap_hugepage_range(struct mmu_gather *tlb,</div><div class='ctx'> 			  struct vm_area_struct *vma,</div><div class='ctx'> 			  unsigned long start, unsigned long end,</div><div class='del'>-			  struct page *ref_page, zap_flags_t zap_flags);</div><div class='add'>+			  struct folio *, zap_flags_t zap_flags);</div><div class='ctx'> void hugetlb_report_meminfo(struct seq_file *);</div><div class='ctx'> int hugetlb_report_node_meminfo(char *buf, int len, int nid);</div><div class='ctx'> void hugetlb_show_meminfo_node(int nid);</div><div class='hunk'>@@ -157,16 +149,15 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_pte,</div><div class='ctx'> 			     uffd_flags_t flags,</div><div class='ctx'> 			     struct folio **foliop);</div><div class='ctx'> #endif /* CONFIG_USERFAULTFD */</div><div class='del'>-bool hugetlb_reserve_pages(struct inode *inode, long from, long to,</div><div class='del'>-						struct vm_area_struct *vma,</div><div class='del'>-						vm_flags_t vm_flags);</div><div class='add'>+long hugetlb_reserve_pages(struct inode *inode, long from, long to,</div><div class='add'>+			   struct vm_area_desc *desc, vm_flags_t vm_flags);</div><div class='ctx'> long hugetlb_unreserve_pages(struct inode *inode, long start, long end,</div><div class='ctx'> 						long freed);</div><div class='del'>-bool isolate_hugetlb(struct folio *folio, struct list_head *list);</div><div class='add'>+bool folio_isolate_hugetlb(struct folio *folio, struct list_head *list);</div><div class='ctx'> int get_hwpoison_hugetlb_folio(struct folio *folio, bool *hugetlb, bool unpoison);</div><div class='ctx'> int get_huge_page_for_hwpoison(unsigned long pfn, int flags,</div><div class='ctx'> 				bool *migratable_cleared);</div><div class='del'>-void folio_putback_active_hugetlb(struct folio *folio);</div><div class='add'>+void folio_putback_hugetlb(struct folio *folio);</div><div class='ctx'> void move_hugetlb_state(struct folio *old_folio, struct folio *new_folio, int reason);</div><div class='ctx'> void hugetlb_fix_reserve_counts(struct inode *inode);</div><div class='ctx'> extern struct mutex *hugetlb_fault_mutex_table;</div><div class='hunk'>@@ -174,11 +165,19 @@ u32 hugetlb_fault_mutex_hash(struct address_space *mapping, pgoff_t idx);</div><div class='ctx'> </div><div class='ctx'> pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma,</div><div class='ctx'> 		      unsigned long addr, pud_t *pud);</div><div class='add'>+bool hugetlbfs_pagecache_present(struct hstate *h,</div><div class='add'>+				 struct vm_area_struct *vma,</div><div class='add'>+				 unsigned long address);</div><div class='add'>+</div><div class='add'>+struct address_space *hugetlb_folio_mapping_lock_write(struct folio *folio);</div><div class='ctx'> </div><div class='del'>-struct address_space *hugetlb_page_mapping_lock_write(struct page *hpage);</div><div class='add'>+extern int sysctl_hugetlb_shm_group __read_mostly;</div><div class='add'>+extern struct list_head huge_boot_pages[MAX_NUMNODES];</div><div class='ctx'> </div><div class='del'>-extern int sysctl_hugetlb_shm_group;</div><div class='del'>-extern struct list_head huge_boot_pages;</div><div class='add'>+void hugetlb_bootmem_alloc(void);</div><div class='add'>+bool hugetlb_bootmem_allocated(void);</div><div class='add'>+extern nodemask_t hugetlb_bootmem_nodes;</div><div class='add'>+void hugetlb_bootmem_set_nodes(void);</div><div class='ctx'> </div><div class='ctx'> /* arch callbacks */</div><div class='ctx'> </div><div class='hunk'>@@ -272,16 +271,13 @@ void hugetlb_vma_unlock_write(struct vm_area_struct *vma);</div><div class='ctx'> int hugetlb_vma_trylock_write(struct vm_area_struct *vma);</div><div class='ctx'> void hugetlb_vma_assert_locked(struct vm_area_struct *vma);</div><div class='ctx'> void hugetlb_vma_lock_release(struct kref *kref);</div><div class='del'>-</div><div class='del'>-int pmd_huge(pmd_t pmd);</div><div class='del'>-int pud_huge(pud_t pud);</div><div class='ctx'> long hugetlb_change_protection(struct vm_area_struct *vma,</div><div class='ctx'> 		unsigned long address, unsigned long end, pgprot_t newprot,</div><div class='ctx'> 		unsigned long cp_flags);</div><div class='del'>-</div><div class='del'>-bool is_hugetlb_entry_migration(pte_t pte);</div><div class='del'>-bool is_hugetlb_entry_hwpoisoned(pte_t pte);</div><div class='ctx'> void hugetlb_unshare_all_pmds(struct vm_area_struct *vma);</div><div class='add'>+void fixup_hugetlb_reservations(struct vm_area_struct *vma);</div><div class='add'>+void hugetlb_split(struct vm_area_struct *vma, unsigned long addr);</div><div class='add'>+int hugetlb_vma_lock_alloc(struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='hunk'>@@ -298,8 +294,8 @@ static inline unsigned long hugetlb_total_pages(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct address_space *hugetlb_page_mapping_lock_write(</div><div class='del'>-							struct page *hpage)</div><div class='add'>+static inline struct address_space *hugetlb_folio_mapping_lock_write(</div><div class='add'>+							struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -329,13 +325,6 @@ static inline void hugetlb_zap_end(</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page *hugetlb_follow_page_mask(</div><div class='del'>-    struct vm_area_struct *vma, unsigned long address, unsigned int flags,</div><div class='del'>-    unsigned int *page_mask)</div><div class='del'>-{</div><div class='del'>-	BUILD_BUG(); /* should never be compiled in if !CONFIG_HUGETLB_PAGE*/</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int copy_hugetlb_page_range(struct mm_struct *dst,</div><div class='ctx'> 					  struct mm_struct *src,</div><div class='ctx'> 					  struct vm_area_struct *dst_vma,</div><div class='hunk'>@@ -368,12 +357,6 @@ static inline void hugetlb_show_meminfo_node(int nid)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int prepare_hugepage_range(struct file *file,</div><div class='del'>-				unsigned long addr, unsigned long len)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void hugetlb_vma_lock_read(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -399,29 +382,12 @@ static inline void hugetlb_vma_assert_locked(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pmd_huge(pmd_t pmd)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int pud_huge(pud_t pud)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int is_hugepage_only_range(struct mm_struct *mm,</div><div class='ctx'> 					unsigned long addr, unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,</div><div class='del'>-				unsigned long addr, unsigned long end,</div><div class='del'>-				unsigned long floor, unsigned long ceiling)</div><div class='del'>-{</div><div class='del'>-	BUG();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_USERFAULTFD</div><div class='ctx'> static inline int hugetlb_mfill_atomic_pte(pte_t *dst_pte,</div><div class='ctx'> 					   struct vm_area_struct *dst_vma,</div><div class='hunk'>@@ -441,7 +407,7 @@ static inline pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool isolate_hugetlb(struct folio *folio, struct list_head *list)</div><div class='add'>+static inline bool folio_isolate_hugetlb(struct folio *folio, struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -457,7 +423,7 @@ static inline int get_huge_page_for_hwpoison(unsigned long pfn, int flags,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void folio_putback_active_hugetlb(struct folio *folio)</div><div class='add'>+static inline void folio_putback_hugetlb(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -476,7 +442,7 @@ static inline long hugetlb_change_protection(</div><div class='ctx'> </div><div class='ctx'> static inline void __unmap_hugepage_range(struct mmu_gather *tlb,</div><div class='ctx'> 			struct vm_area_struct *vma, unsigned long start,</div><div class='del'>-			unsigned long end, struct page *ref_page,</div><div class='add'>+			unsigned long end, struct folio *folio,</div><div class='ctx'> 			zap_flags_t zap_flags)</div><div class='ctx'> {</div><div class='ctx'> 	BUG();</div><div class='hunk'>@@ -492,17 +458,18 @@ static inline vm_fault_t hugetlb_fault(struct mm_struct *mm,</div><div class='ctx'> </div><div class='ctx'> static inline void hugetlb_unshare_all_pmds(struct vm_area_struct *vma) { }</div><div class='ctx'> </div><div class='add'>+static inline void fixup_hugetlb_reservations(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hugetlb_split(struct vm_area_struct *vma, unsigned long addr) {}</div><div class='add'>+</div><div class='add'>+static inline int hugetlb_vma_lock_alloc(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* !CONFIG_HUGETLB_PAGE */</div><div class='del'>-/*</div><div class='del'>- * hugepages at page global directory. If arch support</div><div class='del'>- * hugepages at pgd level, they need to define this.</div><div class='del'>- */</div><div class='del'>-#ifndef pgd_huge</div><div class='del'>-#define pgd_huge(x)	0</div><div class='del'>-#endif</div><div class='del'>-#ifndef p4d_huge</div><div class='del'>-#define p4d_huge(x)	0</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef pgd_write</div><div class='ctx'> static inline int pgd_write(pgd_t pgd)</div><div class='hunk'>@@ -554,17 +521,13 @@ static inline struct hugetlbfs_inode_info *HUGETLBFS_I(struct inode *inode)</div><div class='ctx'> 	return container_of(inode, struct hugetlbfs_inode_info, vfs_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern const struct file_operations hugetlbfs_file_operations;</div><div class='ctx'> extern const struct vm_operations_struct hugetlb_vm_ops;</div><div class='ctx'> struct file *hugetlb_file_setup(const char *name, size_t size, vm_flags_t acct,</div><div class='ctx'> 				int creat_flags, int page_size_log);</div><div class='ctx'> </div><div class='del'>-static inline bool is_file_hugepages(struct file *file)</div><div class='add'>+static inline bool is_file_hugepages(const struct file *file)</div><div class='ctx'> {</div><div class='del'>-	if (file-&gt;f_op == &amp;hugetlbfs_file_operations)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return is_file_shm_hugepages(file);</div><div class='add'>+	return file-&gt;f_op-&gt;fop_flags &amp; FOP_HUGE_PAGES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct hstate *hstate_inode(struct inode *i)</div><div class='hunk'>@@ -587,16 +550,10 @@ static inline struct hstate *hstate_inode(struct inode *i)</div><div class='ctx'> }</div><div class='ctx'> #endif /* !CONFIG_HUGETLBFS */</div><div class='ctx'> </div><div class='del'>-#ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA</div><div class='del'>-unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='del'>-					unsigned long len, unsigned long pgoff,</div><div class='del'>-					unsigned long flags);</div><div class='del'>-#endif /* HAVE_ARCH_HUGETLB_UNMAPPED_AREA */</div><div class='del'>-</div><div class='ctx'> unsigned long</div><div class='del'>-generic_hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='del'>-				  unsigned long len, unsigned long pgoff,</div><div class='del'>-				  unsigned long flags);</div><div class='add'>+hugetlb_get_unmapped_area(struct file *file, unsigned long addr,</div><div class='add'>+				    unsigned long len, unsigned long pgoff,</div><div class='add'>+				    unsigned long flags);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * huegtlb page specific state flags.  These flags are located in page.private</div><div class='hunk'>@@ -635,6 +592,7 @@ enum hugetlb_page_flags {</div><div class='ctx'> 	HPG_freed,</div><div class='ctx'> 	HPG_vmemmap_optimized,</div><div class='ctx'> 	HPG_raw_hwp_unreliable,</div><div class='add'>+	HPG_cma,</div><div class='ctx'> 	__NR_HPAGEFLAGS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -648,47 +606,35 @@ static __always_inline						\</div><div class='ctx'> bool folio_test_hugetlb_##flname(struct folio *folio)		\</div><div class='ctx'> 	{	void *private = &amp;folio-&gt;private;		\</div><div class='ctx'> 		return test_bit(HPG_##flname, private);		\</div><div class='del'>-	}							\</div><div class='del'>-static inline int HPage##uname(struct page *page)		\</div><div class='del'>-	{ return test_bit(HPG_##flname, &amp;(page-&gt;private)); }</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #define SETHPAGEFLAG(uname, flname)				\</div><div class='ctx'> static __always_inline						\</div><div class='ctx'> void folio_set_hugetlb_##flname(struct folio *folio)		\</div><div class='ctx'> 	{	void *private = &amp;folio-&gt;private;		\</div><div class='ctx'> 		set_bit(HPG_##flname, private);			\</div><div class='del'>-	}							\</div><div class='del'>-static inline void SetHPage##uname(struct page *page)		\</div><div class='del'>-	{ set_bit(HPG_##flname, &amp;(page-&gt;private)); }</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #define CLEARHPAGEFLAG(uname, flname)				\</div><div class='ctx'> static __always_inline						\</div><div class='ctx'> void folio_clear_hugetlb_##flname(struct folio *folio)		\</div><div class='ctx'> 	{	void *private = &amp;folio-&gt;private;		\</div><div class='ctx'> 		clear_bit(HPG_##flname, private);		\</div><div class='del'>-	}							\</div><div class='del'>-static inline void ClearHPage##uname(struct page *page)		\</div><div class='del'>-	{ clear_bit(HPG_##flname, &amp;(page-&gt;private)); }</div><div class='add'>+	}</div><div class='ctx'> #else</div><div class='ctx'> #define TESTHPAGEFLAG(uname, flname)				\</div><div class='ctx'> static inline bool						\</div><div class='ctx'> folio_test_hugetlb_##flname(struct folio *folio)		\</div><div class='del'>-	{ return 0; }						\</div><div class='del'>-static inline int HPage##uname(struct page *page)		\</div><div class='ctx'> 	{ return 0; }</div><div class='ctx'> </div><div class='ctx'> #define SETHPAGEFLAG(uname, flname)				\</div><div class='ctx'> static inline void						\</div><div class='ctx'> folio_set_hugetlb_##flname(struct folio *folio) 		\</div><div class='del'>-	{ }							\</div><div class='del'>-static inline void SetHPage##uname(struct page *page)		\</div><div class='ctx'> 	{ }</div><div class='ctx'> </div><div class='ctx'> #define CLEARHPAGEFLAG(uname, flname)				\</div><div class='ctx'> static inline void						\</div><div class='ctx'> folio_clear_hugetlb_##flname(struct folio *folio)		\</div><div class='del'>-	{ }							\</div><div class='del'>-static inline void ClearHPage##uname(struct page *page)		\</div><div class='ctx'> 	{ }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -706,6 +652,7 @@ HPAGEFLAG(Temporary, temporary)</div><div class='ctx'> HPAGEFLAG(Freed, freed)</div><div class='ctx'> HPAGEFLAG(VmemmapOptimized, vmemmap_optimized)</div><div class='ctx'> HPAGEFLAG(RawHwpUnreliable, raw_hwp_unreliable)</div><div class='add'>+HPAGEFLAG(Cma, cma)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> </div><div class='hunk'>@@ -713,6 +660,7 @@ HPAGEFLAG(RawHwpUnreliable, raw_hwp_unreliable)</div><div class='ctx'> /* Defines one hugetlb page size */</div><div class='ctx'> struct hstate {</div><div class='ctx'> 	struct mutex resize_lock;</div><div class='add'>+	struct lock_class_key resize_key;</div><div class='ctx'> 	int next_nid_to_alloc;</div><div class='ctx'> 	int next_nid_to_free;</div><div class='ctx'> 	unsigned int order;</div><div class='hunk'>@@ -730,24 +678,35 @@ struct hstate {</div><div class='ctx'> 	unsigned int nr_huge_pages_node[MAX_NUMNODES];</div><div class='ctx'> 	unsigned int free_huge_pages_node[MAX_NUMNODES];</div><div class='ctx'> 	unsigned int surplus_huge_pages_node[MAX_NUMNODES];</div><div class='del'>-#ifdef CONFIG_CGROUP_HUGETLB</div><div class='del'>-	/* cgroup control files */</div><div class='del'>-	struct cftype cgroup_files_dfl[8];</div><div class='del'>-	struct cftype cgroup_files_legacy[10];</div><div class='del'>-#endif</div><div class='ctx'> 	char name[HSTATE_NAME_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cma;</div><div class='add'>+</div><div class='ctx'> struct huge_bootmem_page {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct hstate *hstate;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct cma *cma;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list);</div><div class='add'>+#define HUGE_BOOTMEM_HVO		0x0001</div><div class='add'>+#define HUGE_BOOTMEM_ZONES_VALID	0x0002</div><div class='add'>+#define HUGE_BOOTMEM_CMA		0x0004</div><div class='add'>+</div><div class='add'>+bool hugetlb_bootmem_page_zones_valid(int nid, struct huge_bootmem_page *m);</div><div class='add'>+</div><div class='add'>+int isolate_or_dissolve_huge_folio(struct folio *folio, struct list_head *list);</div><div class='add'>+int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn);</div><div class='add'>+void wait_for_freed_hugetlb_folios(void);</div><div class='ctx'> struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma,</div><div class='del'>-				unsigned long addr, int avoid_reserve);</div><div class='add'>+				unsigned long addr, bool cow_from_owner);</div><div class='ctx'> struct folio *alloc_hugetlb_folio_nodemask(struct hstate *h, int preferred_nid,</div><div class='del'>-				nodemask_t *nmask, gfp_t gfp_mask);</div><div class='add'>+				nodemask_t *nmask, gfp_t gfp_mask,</div><div class='add'>+				bool allow_alloc_fallback);</div><div class='add'>+struct folio *alloc_hugetlb_folio_reserve(struct hstate *h, int preferred_nid,</div><div class='add'>+					  nodemask_t *nmask, gfp_t gfp_mask);</div><div class='add'>+</div><div class='ctx'> int hugetlb_add_to_page_cache(struct folio *folio, struct address_space *mapping,</div><div class='ctx'> 			pgoff_t idx);</div><div class='ctx'> void restore_reserve_on_error(struct hstate *h, struct vm_area_struct *vma,</div><div class='hunk'>@@ -771,6 +730,11 @@ extern unsigned int default_hstate_idx;</div><div class='ctx'> </div><div class='ctx'> #define default_hstate (hstates[default_hstate_idx])</div><div class='ctx'> </div><div class='add'>+static inline struct hugepage_subpool *subpool_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return HUGETLBFS_SB(inode-&gt;i_sb)-&gt;spool;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct hugepage_subpool *hugetlb_folio_subpool(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return folio-&gt;_hugetlb_subpool;</div><div class='hunk'>@@ -827,9 +791,14 @@ static inline unsigned huge_page_shift(struct hstate *h)</div><div class='ctx'> 	return h-&gt;order + PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool order_is_gigantic(unsigned int order)</div><div class='add'>+{</div><div class='add'>+	return order &gt; MAX_PAGE_ORDER;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool hstate_is_gigantic(struct hstate *h)</div><div class='ctx'> {</div><div class='del'>-	return huge_page_order(h) &gt; MAX_PAGE_ORDER;</div><div class='add'>+	return order_is_gigantic(huge_page_order(h));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int pages_per_huge_page(const struct hstate *h)</div><div class='hunk'>@@ -859,9 +828,9 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,</div><div class='ctx'> #define is_hugepage_only_range is_hugepage_only_range</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef arch_clear_hugepage_flags</div><div class='del'>-static inline void arch_clear_hugepage_flags(struct page *page) { }</div><div class='del'>-#define arch_clear_hugepage_flags arch_clear_hugepage_flags</div><div class='add'>+#ifndef arch_clear_hugetlb_flags</div><div class='add'>+static inline void arch_clear_hugetlb_flags(struct folio *folio) { }</div><div class='add'>+#define arch_clear_hugetlb_flags arch_clear_hugetlb_flags</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef arch_make_huge_pte</div><div class='hunk'>@@ -872,6 +841,17 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef arch_has_huge_bootmem_alloc</div><div class='add'>+/*</div><div class='add'>+ * Some architectures do their own bootmem allocation, so they can't use</div><div class='add'>+ * early CMA allocation.</div><div class='add'>+ */</div><div class='add'>+static inline bool arch_has_huge_bootmem_alloc(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline struct hstate *folio_hstate(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON_FOLIO(!folio_test_hugetlb(folio), folio);</div><div class='hunk'>@@ -888,8 +868,8 @@ static inline int hstate_index(struct hstate *h)</div><div class='ctx'> 	return h - hstates;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int dissolve_free_huge_page(struct page *page);</div><div class='del'>-extern int dissolve_free_huge_pages(unsigned long start_pfn,</div><div class='add'>+int dissolve_free_hugetlb_folio(struct folio *folio);</div><div class='add'>+int dissolve_free_hugetlb_folios(unsigned long start_pfn,</div><div class='ctx'> 				    unsigned long end_pfn);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMORY_FAILURE</div><div class='hunk'>@@ -952,10 +932,11 @@ static inline bool hugepage_movable_supported(struct hstate *h)</div><div class='ctx'> /* Movability of hugepages depends on migration support. */</div><div class='ctx'> static inline gfp_t htlb_alloc_mask(struct hstate *h)</div><div class='ctx'> {</div><div class='del'>-	if (hugepage_movable_supported(h))</div><div class='del'>-		return GFP_HIGHUSER_MOVABLE;</div><div class='del'>-	else</div><div class='del'>-		return GFP_HIGHUSER;</div><div class='add'>+	gfp_t gfp = __GFP_COMP | __GFP_NOWARN;</div><div class='add'>+</div><div class='add'>+	gfp |= hugepage_movable_supported(h) ? GFP_HIGHUSER_MOVABLE : GFP_HIGHUSER;</div><div class='add'>+</div><div class='add'>+	return gfp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline gfp_t htlb_modify_alloc_mask(struct hstate *h, gfp_t gfp_mask)</div><div class='hunk'>@@ -970,13 +951,64 @@ static inline gfp_t htlb_modify_alloc_mask(struct hstate *h, gfp_t gfp_mask)</div><div class='ctx'> 	return modified_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool htlb_allow_alloc_fallback(int reason)</div><div class='add'>+{</div><div class='add'>+	bool allowed_fallback = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: the memory offline, memory failure and migration syscalls will</div><div class='add'>+	 * be allowed to fallback to other nodes due to lack of a better chioce,</div><div class='add'>+	 * that might break the per-node hugetlb pool. While other cases will</div><div class='add'>+	 * set the __GFP_THISNODE to avoid breaking the per-node hugetlb pool.</div><div class='add'>+	 */</div><div class='add'>+	switch (reason) {</div><div class='add'>+	case MR_MEMORY_HOTPLUG:</div><div class='add'>+	case MR_MEMORY_FAILURE:</div><div class='add'>+	case MR_SYSCALL:</div><div class='add'>+	case MR_MEMPOLICY_MBIND:</div><div class='add'>+		allowed_fallback = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return allowed_fallback;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline spinlock_t *huge_pte_lockptr(struct hstate *h,</div><div class='ctx'> 					   struct mm_struct *mm, pte_t *pte)</div><div class='ctx'> {</div><div class='del'>-	if (huge_page_size(h) == PMD_SIZE)</div><div class='add'>+	const unsigned long size = huge_page_size(h);</div><div class='add'>+</div><div class='add'>+	VM_WARN_ON(size == PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * hugetlb must use the exact same PT locks as core-mm page table</div><div class='add'>+	 * walkers would. When modifying a PTE table, hugetlb must take the</div><div class='add'>+	 * PTE PT lock, when modifying a PMD table, hugetlb must take the PMD</div><div class='add'>+	 * PT lock etc.</div><div class='add'>+	 *</div><div class='add'>+	 * The expectation is that any hugetlb folio smaller than a PMD is</div><div class='add'>+	 * always mapped into a single PTE table and that any hugetlb folio</div><div class='add'>+	 * smaller than a PUD (but at least as big as a PMD) is always mapped</div><div class='add'>+	 * into a single PMD table.</div><div class='add'>+	 *</div><div class='add'>+	 * If that does not hold for an architecture, then that architecture</div><div class='add'>+	 * must disable split PT locks such that all *_lockptr() functions</div><div class='add'>+	 * will give us the same result: the per-MM PT lock.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that with e.g., CONFIG_PGTABLE_LEVELS=2 where</div><div class='add'>+	 * PGDIR_SIZE==P4D_SIZE==PUD_SIZE==PMD_SIZE, we'd use pud_lockptr()</div><div class='add'>+	 * and core-mm would use pmd_lockptr(). However, in such configurations</div><div class='add'>+	 * split PMD locks are disabled -- they don't make sense on a single</div><div class='add'>+	 * PGDIR page table -- and the end result is the same.</div><div class='add'>+	 */</div><div class='add'>+	if (size &gt;= PUD_SIZE)</div><div class='add'>+		return pud_lockptr(mm, (pud_t *) pte);</div><div class='add'>+	else if (size &gt;= PMD_SIZE || IS_ENABLED(CONFIG_HIGHPTE))</div><div class='ctx'> 		return pmd_lockptr(mm, (pmd_t *) pte);</div><div class='del'>-	VM_BUG_ON(huge_page_size(h) == PAGE_SIZE);</div><div class='del'>-	return &amp;mm-&gt;page_table_lock;</div><div class='add'>+	/* pte_alloc_huge() only applies with !CONFIG_HIGHPTE */</div><div class='add'>+	return ptep_lockptr(mm, pte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef hugepages_supported</div><div class='hunk'>@@ -1010,7 +1042,9 @@ static inline void hugetlb_count_sub(long l, struct mm_struct *mm)</div><div class='ctx'> static inline pte_t huge_ptep_modify_prot_start(struct vm_area_struct *vma,</div><div class='ctx'> 						unsigned long addr, pte_t *ptep)</div><div class='ctx'> {</div><div class='del'>-	return huge_ptep_get_and_clear(vma-&gt;vm_mm, addr, ptep);</div><div class='add'>+	unsigned long psize = huge_page_size(hstate_vma(vma));</div><div class='add'>+</div><div class='add'>+	return huge_ptep_get_and_clear(vma-&gt;vm_mm, addr, ptep, psize);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1036,9 +1070,19 @@ void hugetlb_unregister_node(struct node *node);</div><div class='ctx'>  */</div><div class='ctx'> bool is_raw_hwpoison_page_in_hugepage(struct page *page);</div><div class='ctx'> </div><div class='add'>+static inline unsigned long huge_page_mask_align(struct file *file)</div><div class='add'>+{</div><div class='add'>+	return PAGE_MASK &amp; ~huge_page_mask(hstate_file(file));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else	/* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> struct hstate {};</div><div class='ctx'> </div><div class='add'>+static inline unsigned long huge_page_mask_align(struct file *file)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct hugepage_subpool *hugetlb_folio_subpool(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -1050,22 +1094,40 @@ static inline struct folio *filemap_lock_hugetlb_folio(struct hstate *h,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int isolate_or_dissolve_huge_page(struct page *page,</div><div class='add'>+static inline int isolate_or_dissolve_huge_folio(struct folio *folio,</div><div class='ctx'> 						struct list_head *list)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int replace_free_hugepage_folios(unsigned long start_pfn,</div><div class='add'>+		unsigned long end_pfn)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void wait_for_freed_hugetlb_folios(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma,</div><div class='ctx'> 					   unsigned long addr,</div><div class='del'>-					   int avoid_reserve)</div><div class='add'>+					   bool cow_from_owner)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct folio *</div><div class='add'>+alloc_hugetlb_folio_reserve(struct hstate *h, int preferred_nid,</div><div class='add'>+			    nodemask_t *nmask, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct folio *</div><div class='ctx'> alloc_hugetlb_folio_nodemask(struct hstate *h, int preferred_nid,</div><div class='del'>-			nodemask_t *nmask, gfp_t gfp_mask)</div><div class='add'>+			nodemask_t *nmask, gfp_t gfp_mask,</div><div class='add'>+			bool allow_alloc_fallback)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1150,12 +1212,12 @@ static inline int hstate_index(struct hstate *h)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dissolve_free_huge_page(struct page *page)</div><div class='add'>+static inline int dissolve_free_hugetlb_folio(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dissolve_free_huge_pages(unsigned long start_pfn,</div><div class='add'>+static inline int dissolve_free_hugetlb_folios(unsigned long start_pfn,</div><div class='ctx'> 					   unsigned long end_pfn)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1181,6 +1243,11 @@ static inline gfp_t htlb_modify_alloc_mask(struct hstate *h, gfp_t gfp_mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool htlb_allow_alloc_fallback(int reason)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline spinlock_t *huge_pte_lockptr(struct hstate *h,</div><div class='ctx'> 					   struct mm_struct *mm, pte_t *pte)</div><div class='ctx'> {</div><div class='hunk'>@@ -1221,6 +1288,21 @@ static inline void hugetlb_register_node(struct node *node)</div><div class='ctx'> static inline void hugetlb_unregister_node(struct node *node)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline bool hugetlbfs_pagecache_present(</div><div class='add'>+    struct hstate *h, struct vm_area_struct *vma, unsigned long address)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hugetlb_bootmem_alloc(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool hugetlb_bootmem_allocated(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif	/* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='ctx'> static inline spinlock_t *huge_pte_lock(struct hstate *h,</div><div class='hunk'>@@ -1241,7 +1323,7 @@ static inline __init void hugetlb_cma_reserve(int order)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE</div><div class='add'>+#ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING</div><div class='ctx'> static inline bool hugetlb_pmd_shared(pte_t *pte)</div><div class='ctx'> {</div><div class='ctx'> 	return page_count(virt_to_page(pte)) &gt; 1;</div><div class='hunk'>@@ -1277,8 +1359,7 @@ bool __vma_private_lock(struct vm_area_struct *vma);</div><div class='ctx'> static inline pte_t *</div><div class='ctx'> hugetlb_walk(struct vm_area_struct *vma, unsigned long addr, unsigned long sz)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_HUGETLB_PAGE) &amp;&amp; \</div><div class='del'>-	defined(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) &amp;&amp; defined(CONFIG_LOCKDEP)</div><div class='add'>+#if defined(CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING) &amp;&amp; defined(CONFIG_LOCKDEP)</div><div class='ctx'> 	struct hugetlb_vma_lock *vma_lock = vma-&gt;vm_private_data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/include/linux/hugetlb_inline.h b/include/linux/hugetlb_inline.h<br/>index 0660a03d37d9..a27aa0162918 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hugetlb_inline.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hugetlb_inline.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hugetlb_inline.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hugetlb_inline.h</a></div><div class='hunk'>@@ -2,22 +2,27 @@</div><div class='ctx'> #ifndef _LINUX_HUGETLB_INLINE_H</div><div class='ctx'> #define _LINUX_HUGETLB_INLINE_H</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HUGETLB_PAGE</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline bool is_vm_hugetlb_page(struct vm_area_struct *vma)</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+</div><div class='add'>+static inline bool is_vm_hugetlb_flags(vm_flags_t vm_flags)</div><div class='ctx'> {</div><div class='del'>-	return !!(vma-&gt;vm_flags &amp; VM_HUGETLB);</div><div class='add'>+	return !!(vm_flags &amp; VM_HUGETLB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static inline bool is_vm_hugetlb_page(struct vm_area_struct *vma)</div><div class='add'>+static inline bool is_vm_hugetlb_flags(vm_flags_t vm_flags)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline bool is_vm_hugetlb_page(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	return is_vm_hugetlb_flags(vma-&gt;vm_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/hung_task.h b/include/linux/hung_task.h<br/>new file mode 100644<br/>index 000000000000..c4403eeb7144<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hung_task.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hung_task.h</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Detect Hung Task: detecting tasks stuck in D state</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Tongcheng Travel (www.ly.com)</div><div class='add'>+ * Author: Lance Yang &lt;mingzhe.yang@ly.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_HUNG_TASK_H</div><div class='add'>+#define __LINUX_HUNG_TASK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @blocker: Combines lock address and blocking type.</div><div class='add'>+ *</div><div class='add'>+ * Since lock pointers are at least 4-byte aligned(32-bit) or 8-byte</div><div class='add'>+ * aligned(64-bit). This leaves the 2 least bits (LSBs) of the pointer</div><div class='add'>+ * always zero. So we can use these bits to encode the specific blocking</div><div class='add'>+ * type.</div><div class='add'>+ *</div><div class='add'>+ * Note that on architectures where this is not guaranteed, or for any</div><div class='add'>+ * unaligned lock, this tracking mechanism is silently skipped for that</div><div class='add'>+ * lock.</div><div class='add'>+ *</div><div class='add'>+ * Type encoding:</div><div class='add'>+ * 00 - Blocked on mutex			(BLOCKER_TYPE_MUTEX)</div><div class='add'>+ * 01 - Blocked on semaphore			(BLOCKER_TYPE_SEM)</div><div class='add'>+ * 10 - Blocked on rw-semaphore as READER	(BLOCKER_TYPE_RWSEM_READER)</div><div class='add'>+ * 11 - Blocked on rw-semaphore as WRITER	(BLOCKER_TYPE_RWSEM_WRITER)</div><div class='add'>+ */</div><div class='add'>+#define BLOCKER_TYPE_MUTEX		0x00UL</div><div class='add'>+#define BLOCKER_TYPE_SEM		0x01UL</div><div class='add'>+#define BLOCKER_TYPE_RWSEM_READER	0x02UL</div><div class='add'>+#define BLOCKER_TYPE_RWSEM_WRITER	0x03UL</div><div class='add'>+</div><div class='add'>+#define BLOCKER_TYPE_MASK		0x03UL</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER</div><div class='add'>+static inline void hung_task_set_blocker(void *lock, unsigned long type)</div><div class='add'>+{</div><div class='add'>+	unsigned long lock_ptr = (unsigned long)lock;</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!lock_ptr);</div><div class='add'>+	WARN_ON_ONCE(READ_ONCE(current-&gt;blocker));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the lock pointer matches the BLOCKER_TYPE_MASK, return</div><div class='add'>+	 * without writing anything.</div><div class='add'>+	 */</div><div class='add'>+	if (lock_ptr &amp; BLOCKER_TYPE_MASK)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(current-&gt;blocker, lock_ptr | type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hung_task_clear_blocker(void)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(current-&gt;blocker, 0UL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * hung_task_get_blocker_type - Extracts blocker type from encoded blocker</div><div class='add'>+ * address.</div><div class='add'>+ *</div><div class='add'>+ * @blocker: Blocker pointer with encoded type (via LSB bits)</div><div class='add'>+ *</div><div class='add'>+ * Returns: BLOCKER_TYPE_MUTEX, BLOCKER_TYPE_SEM, etc.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long hung_task_get_blocker_type(unsigned long blocker)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!blocker);</div><div class='add'>+</div><div class='add'>+	return blocker &amp; BLOCKER_TYPE_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *hung_task_blocker_to_lock(unsigned long blocker)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!blocker);</div><div class='add'>+</div><div class='add'>+	return (void *)(blocker &amp; ~BLOCKER_TYPE_MASK);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void hung_task_set_blocker(void *lock, unsigned long type)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void hung_task_clear_blocker(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline unsigned long hung_task_get_blocker_type(unsigned long blocker)</div><div class='add'>+{</div><div class='add'>+	return 0UL;</div><div class='add'>+}</div><div class='add'>+static inline void *hung_task_blocker_to_lock(unsigned long blocker)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_HUNG_TASK_H */</div><div class='head'>diff --git a/include/linux/hw_bitfield.h b/include/linux/hw_bitfield.h<br/>new file mode 100644<br/>index 000000000000..df202e167ce4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hw_bitfield.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hw_bitfield.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025, Collabora Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_HW_BITFIELD_H</div><div class='add'>+#define _LINUX_HW_BITFIELD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * FIELD_PREP_WM16() - prepare a bitfield element with a mask in the upper half</div><div class='add'>+ * @_mask: shifted mask defining the field's length and position</div><div class='add'>+ * @_val:  value to put in the field</div><div class='add'>+ *</div><div class='add'>+ * FIELD_PREP_WM16() masks and shifts up the value, as well as bitwise ORs the</div><div class='add'>+ * result with the mask shifted up by 16.</div><div class='add'>+ *</div><div class='add'>+ * This is useful for a common design of hardware registers where the upper</div><div class='add'>+ * 16-bit half of a 32-bit register is used as a write-enable mask. In such a</div><div class='add'>+ * register, a bit in the lower half is only updated if the corresponding bit</div><div class='add'>+ * in the upper half is high.</div><div class='add'>+ */</div><div class='add'>+#define FIELD_PREP_WM16(_mask, _val)					     \</div><div class='add'>+	({								     \</div><div class='add'>+		typeof(_val) __val = _val;				     \</div><div class='add'>+		typeof(_mask) __mask = _mask;				     \</div><div class='add'>+		__BF_FIELD_CHECK(__mask, ((u16)0U), __val,		     \</div><div class='add'>+				 "HWORD_UPDATE: ");			     \</div><div class='add'>+		(((typeof(__mask))(__val) &lt;&lt; __bf_shf(__mask)) &amp; (__mask)) | \</div><div class='add'>+		((__mask) &lt;&lt; 16);					     \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * FIELD_PREP_WM16_CONST() - prepare a constant bitfield element with a mask in</div><div class='add'>+ *                           the upper half</div><div class='add'>+ * @_mask: shifted mask defining the field's length and position</div><div class='add'>+ * @_val:  value to put in the field</div><div class='add'>+ *</div><div class='add'>+ * FIELD_PREP_WM16_CONST() masks and shifts up the value, as well as bitwise ORs</div><div class='add'>+ * the result with the mask shifted up by 16.</div><div class='add'>+ *</div><div class='add'>+ * This is useful for a common design of hardware registers where the upper</div><div class='add'>+ * 16-bit half of a 32-bit register is used as a write-enable mask. In such a</div><div class='add'>+ * register, a bit in the lower half is only updated if the corresponding bit</div><div class='add'>+ * in the upper half is high.</div><div class='add'>+ *</div><div class='add'>+ * Unlike FIELD_PREP_WM16(), this is a constant expression and can therefore</div><div class='add'>+ * be used in initializers. Error checking is less comfortable for this</div><div class='add'>+ * version.</div><div class='add'>+ */</div><div class='add'>+#define FIELD_PREP_WM16_CONST(_mask, _val)				 \</div><div class='add'>+	(								 \</div><div class='add'>+		FIELD_PREP_CONST(_mask, _val) |				 \</div><div class='add'>+		(BUILD_BUG_ON_ZERO(const_true((u64)(_mask) &gt; U16_MAX)) + \</div><div class='add'>+		 ((_mask) &lt;&lt; 16))					 \</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_HW_BITFIELD_H */</div><div class='head'>diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h<br/>index 136e9842120e..b424555753b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hw_random.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hw_random.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hw_random.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hw_random.h</a></div><div class='hunk'>@@ -13,9 +13,8 @@</div><div class='ctx'> #define LINUX_HWRANDOM_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct hwrng - Hardware Random Number Generator driver</div><div class='head'>diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h<br/>index edf96f249eb5..301a83afbd66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hwmon.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hwmon.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hwmon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hwmon.h</a></div><div class='hunk'>@@ -24,6 +24,7 @@ enum hwmon_sensor_types {</div><div class='ctx'> 	hwmon_curr,</div><div class='ctx'> 	hwmon_power,</div><div class='ctx'> 	hwmon_energy,</div><div class='add'>+	hwmon_energy64,</div><div class='ctx'> 	hwmon_humidity,</div><div class='ctx'> 	hwmon_fan,</div><div class='ctx'> 	hwmon_pwm,</div><div class='hunk'>@@ -45,6 +46,7 @@ enum hwmon_chip_attributes {</div><div class='ctx'> 	hwmon_chip_power_samples,</div><div class='ctx'> 	hwmon_chip_temp_samples,</div><div class='ctx'> 	hwmon_chip_beep_enable,</div><div class='add'>+	hwmon_chip_pec,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HWMON_C_TEMP_RESET_HISTORY	BIT(hwmon_chip_temp_reset_history)</div><div class='hunk'>@@ -60,6 +62,7 @@ enum hwmon_chip_attributes {</div><div class='ctx'> #define HWMON_C_POWER_SAMPLES		BIT(hwmon_chip_power_samples)</div><div class='ctx'> #define HWMON_C_TEMP_SAMPLES		BIT(hwmon_chip_temp_samples)</div><div class='ctx'> #define HWMON_C_BEEP_ENABLE		BIT(hwmon_chip_beep_enable)</div><div class='add'>+#define HWMON_C_PEC			BIT(hwmon_chip_pec)</div><div class='ctx'> </div><div class='ctx'> enum hwmon_temp_attributes {</div><div class='ctx'> 	hwmon_temp_enable,</div><div class='hunk'>@@ -366,7 +369,9 @@ enum hwmon_intrusion_attributes {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct hwmon_ops - hwmon device operations</div><div class='del'>- * @is_visible: Callback to return attribute visibility. Mandatory.</div><div class='add'>+ * @visible:	Static visibility. If non-zero, 'is_visible' is ignored.</div><div class='add'>+ * @is_visible: Callback to return attribute visibility. Mandatory unless</div><div class='add'>+ *		'visible' is non-zero.</div><div class='ctx'>  *		Parameters are:</div><div class='ctx'>  *		@const void *drvdata:</div><div class='ctx'>  *			Pointer to driver-private data structure passed</div><div class='hunk'>@@ -410,6 +415,7 @@ enum hwmon_intrusion_attributes {</div><div class='ctx'>  *		The function returns 0 on success or a negative error number.</div><div class='ctx'>  */</div><div class='ctx'> struct hwmon_ops {</div><div class='add'>+	umode_t visible;</div><div class='ctx'> 	umode_t (*is_visible)(const void *drvdata, enum hwmon_sensor_types type,</div><div class='ctx'> 			      u32 attr, int channel);</div><div class='ctx'> 	int (*read)(struct device *dev, enum hwmon_sensor_types type,</div><div class='hunk'>@@ -479,7 +485,6 @@ devm_hwmon_device_register_with_info(struct device *dev,</div><div class='ctx'> 				const struct attribute_group **extra_groups);</div><div class='ctx'> </div><div class='ctx'> void hwmon_device_unregister(struct device *dev);</div><div class='del'>-void devm_hwmon_device_unregister(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> int hwmon_notify_event(struct device *dev, enum hwmon_sensor_types type,</div><div class='ctx'> 		       u32 attr, int channel);</div><div class='hunk'>@@ -487,6 +492,9 @@ int hwmon_notify_event(struct device *dev, enum hwmon_sensor_types type,</div><div class='ctx'> char *hwmon_sanitize_name(const char *name);</div><div class='ctx'> char *devm_hwmon_sanitize_name(struct device *dev, const char *name);</div><div class='ctx'> </div><div class='add'>+void hwmon_lock(struct device *dev);</div><div class='add'>+void hwmon_unlock(struct device *dev);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * hwmon_is_bad_char - Is the char invalid in a hwmon name</div><div class='ctx'>  * @ch: the char to be considered</div><div class='head'>diff --git a/include/linux/hwspinlock.h b/include/linux/hwspinlock.h<br/>index bfe7c1f1ac6d..f35b42e8c5de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hwspinlock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hwspinlock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hwspinlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hwspinlock.h</a></div><div class='hunk'>@@ -58,18 +58,16 @@ struct hwspinlock_pdata {</div><div class='ctx'> int hwspin_lock_register(struct hwspinlock_device *bank, struct device *dev,</div><div class='ctx'> 		const struct hwspinlock_ops *ops, int base_id, int num_locks);</div><div class='ctx'> int hwspin_lock_unregister(struct hwspinlock_device *bank);</div><div class='del'>-struct hwspinlock *hwspin_lock_request(void);</div><div class='ctx'> struct hwspinlock *hwspin_lock_request_specific(unsigned int id);</div><div class='ctx'> int hwspin_lock_free(struct hwspinlock *hwlock);</div><div class='ctx'> int of_hwspin_lock_get_id(struct device_node *np, int index);</div><div class='del'>-int hwspin_lock_get_id(struct hwspinlock *hwlock);</div><div class='ctx'> int __hwspin_lock_timeout(struct hwspinlock *, unsigned int, int,</div><div class='ctx'> 							unsigned long *);</div><div class='ctx'> int __hwspin_trylock(struct hwspinlock *, int, unsigned long *);</div><div class='ctx'> void __hwspin_unlock(struct hwspinlock *, int, unsigned long *);</div><div class='ctx'> int of_hwspin_lock_get_id_byname(struct device_node *np, const char *name);</div><div class='add'>+int hwspin_lock_bust(struct hwspinlock *hwlock, unsigned int id);</div><div class='ctx'> int devm_hwspin_lock_free(struct device *dev, struct hwspinlock *hwlock);</div><div class='del'>-struct hwspinlock *devm_hwspin_lock_request(struct device *dev);</div><div class='ctx'> struct hwspinlock *devm_hwspin_lock_request_specific(struct device *dev,</div><div class='ctx'> 						     unsigned int id);</div><div class='ctx'> int devm_hwspin_lock_unregister(struct device *dev,</div><div class='hunk'>@@ -94,11 +92,6 @@ int devm_hwspin_lock_register(struct device *dev,</div><div class='ctx'>  * Note: ERR_PTR(-ENODEV) will still be considered a success for NULL-checking</div><div class='ctx'>  * users. Others, which care, can still check this with IS_ERR.</div><div class='ctx'>  */</div><div class='del'>-static inline struct hwspinlock *hwspin_lock_request(void)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct hwspinlock *hwspin_lock_request_specific(unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENODEV);</div><div class='hunk'>@@ -127,12 +120,12 @@ void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int of_hwspin_lock_get_id(struct device_node *np, int index)</div><div class='add'>+static inline int hwspin_lock_bust(struct hwspinlock *hwlock, unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int hwspin_lock_get_id(struct hwspinlock *hwlock)</div><div class='add'>+static inline int of_hwspin_lock_get_id(struct device_node *np, int index)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -149,11 +142,6 @@ int devm_hwspin_lock_free(struct device *dev, struct hwspinlock *hwlock)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct hwspinlock *devm_hwspin_lock_request(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline</div><div class='ctx'> struct hwspinlock *devm_hwspin_lock_request_specific(struct device *dev,</div><div class='ctx'> 						     unsigned int id)</div><div class='head'>diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h<br/>index 6ef0557b4bff..dfc516c1c719 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hyperv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hyperv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hyperv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hyperv.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/reciprocal_div.h&gt;</div><div class='del'>-#include &lt;asm/hyperv-tlfs.h&gt;</div><div class='add'>+#include &lt;hyperv/hvhdk.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAX_PAGE_BUFFER_COUNT				32</div><div class='ctx'> #define MAX_MULTIPAGE_BUFFER_COUNT			32 /* 128K */</div><div class='hunk'>@@ -265,16 +265,18 @@ static inline u32 hv_get_avail_to_write_percent(</div><div class='ctx'>  * Linux kernel.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define VERSION_WS2008  ((0 &lt;&lt; 16) | (13))</div><div class='del'>-#define VERSION_WIN7    ((1 &lt;&lt; 16) | (1))</div><div class='del'>-#define VERSION_WIN8    ((2 &lt;&lt; 16) | (4))</div><div class='del'>-#define VERSION_WIN8_1    ((3 &lt;&lt; 16) | (0))</div><div class='del'>-#define VERSION_WIN10 ((4 &lt;&lt; 16) | (0))</div><div class='del'>-#define VERSION_WIN10_V4_1 ((4 &lt;&lt; 16) | (1))</div><div class='del'>-#define VERSION_WIN10_V5 ((5 &lt;&lt; 16) | (0))</div><div class='del'>-#define VERSION_WIN10_V5_1 ((5 &lt;&lt; 16) | (1))</div><div class='del'>-#define VERSION_WIN10_V5_2 ((5 &lt;&lt; 16) | (2))</div><div class='del'>-#define VERSION_WIN10_V5_3 ((5 &lt;&lt; 16) | (3))</div><div class='add'>+#define VMBUS_MAKE_VERSION(MAJ, MIN)	((((u32)MAJ) &lt;&lt; 16) | (MIN))</div><div class='add'>+#define VERSION_WS2008					VMBUS_MAKE_VERSION(0, 13)</div><div class='add'>+#define VERSION_WIN7					VMBUS_MAKE_VERSION(1, 1)</div><div class='add'>+#define VERSION_WIN8					VMBUS_MAKE_VERSION(2, 4)</div><div class='add'>+#define VERSION_WIN8_1					VMBUS_MAKE_VERSION(3, 0)</div><div class='add'>+#define VERSION_WIN10					VMBUS_MAKE_VERSION(4, 0)</div><div class='add'>+#define VERSION_WIN10_V4_1				VMBUS_MAKE_VERSION(4, 1)</div><div class='add'>+#define VERSION_WIN10_V5				VMBUS_MAKE_VERSION(5, 0)</div><div class='add'>+#define VERSION_WIN10_V5_1				VMBUS_MAKE_VERSION(5, 1)</div><div class='add'>+#define VERSION_WIN10_V5_2				VMBUS_MAKE_VERSION(5, 2)</div><div class='add'>+#define VERSION_WIN10_V5_3				VMBUS_MAKE_VERSION(5, 3)</div><div class='add'>+#define VERSION_WIN10_V6_0				VMBUS_MAKE_VERSION(6, 0)</div><div class='ctx'> </div><div class='ctx'> /* Make maximum size of pipe payload of 16K */</div><div class='ctx'> #define MAX_PIPE_DATA_PAYLOAD		(sizeof(u8) * 16384)</div><div class='hunk'>@@ -335,14 +337,22 @@ struct vmbus_channel_offer {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Server Flags */</div><div class='del'>-#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE	1</div><div class='del'>-#define VMBUS_CHANNEL_SERVER_SUPPORTS_TRANSFER_PAGES	2</div><div class='del'>-#define VMBUS_CHANNEL_SERVER_SUPPORTS_GPADLS		4</div><div class='del'>-#define VMBUS_CHANNEL_NAMED_PIPE_MODE			0x10</div><div class='del'>-#define VMBUS_CHANNEL_LOOPBACK_OFFER			0x100</div><div class='del'>-#define VMBUS_CHANNEL_PARENT_OFFER			0x200</div><div class='del'>-#define VMBUS_CHANNEL_REQUEST_MONITORED_NOTIFICATION	0x400</div><div class='del'>-#define VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER		0x2000</div><div class='add'>+#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE		0x0001</div><div class='add'>+/*</div><div class='add'>+ * This flag indicates that the channel is offered by the paravisor, and must</div><div class='add'>+ * use encrypted memory for the channel ring buffer.</div><div class='add'>+ */</div><div class='add'>+#define VMBUS_CHANNEL_CONFIDENTIAL_RING_BUFFER			0x0002</div><div class='add'>+/*</div><div class='add'>+ * This flag indicates that the channel is offered by the paravisor, and must</div><div class='add'>+ * use encrypted memory for GPA direct packets and additional GPADLs.</div><div class='add'>+ */</div><div class='add'>+#define VMBUS_CHANNEL_CONFIDENTIAL_EXTERNAL_MEMORY		0x0004</div><div class='add'>+#define VMBUS_CHANNEL_NAMED_PIPE_MODE					0x0010</div><div class='add'>+#define VMBUS_CHANNEL_LOOPBACK_OFFER					0x0100</div><div class='add'>+#define VMBUS_CHANNEL_PARENT_OFFER						0x0200</div><div class='add'>+#define VMBUS_CHANNEL_REQUEST_MONITORED_NOTIFICATION	0x0400</div><div class='add'>+#define VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER				0x2000</div><div class='ctx'> </div><div class='ctx'> struct vmpacket_descriptor {</div><div class='ctx'> 	u16 type;</div><div class='hunk'>@@ -371,19 +381,6 @@ struct vmtransfer_page_packet_header {</div><div class='ctx'> 	struct vmtransfer_page_range ranges[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct vmgpadl_packet_header {</div><div class='del'>-	struct vmpacket_descriptor d;</div><div class='del'>-	u32 gpadl;</div><div class='del'>-	u32 reserved;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct vmadd_remove_transfer_page_set {</div><div class='del'>-	struct vmpacket_descriptor d;</div><div class='del'>-	u32 gpadl;</div><div class='del'>-	u16 xfer_pageset_id;</div><div class='del'>-	u16 reserved;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This structure defines a range in guest physical space that can be made to</div><div class='ctx'>  * look virtually contiguous.</div><div class='hunk'>@@ -395,30 +392,6 @@ struct gpa_range {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This is the format for an Establish Gpadl packet, which contains a handle by</div><div class='del'>- * which this GPADL will be known and a set of GPA ranges associated with it.</div><div class='del'>- * This can be converted to a MDL by the guest OS.  If there are multiple GPA</div><div class='del'>- * ranges, then the resulting MDL will be "chained," representing multiple VA</div><div class='del'>- * ranges.</div><div class='del'>- */</div><div class='del'>-struct vmestablish_gpadl {</div><div class='del'>-	struct vmpacket_descriptor d;</div><div class='del'>-	u32 gpadl;</div><div class='del'>-	u32 range_cnt;</div><div class='del'>-	struct gpa_range range[1];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the format for a Teardown Gpadl packet, which indicates that the</div><div class='del'>- * GPADL handle in the Establish Gpadl packet will never be referenced again.</div><div class='del'>- */</div><div class='del'>-struct vmteardown_gpadl {</div><div class='del'>-	struct vmpacket_descriptor d;</div><div class='del'>-	u32 gpadl;</div><div class='del'>-	u32 reserved;	/* for alignment to a 8-byte boundary */</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This is the format for a GPA-Direct packet, which contains a set of GPA</div><div class='ctx'>  * ranges, in addition to commands and/or data.</div><div class='ctx'>  */</div><div class='hunk'>@@ -429,25 +402,6 @@ struct vmdata_gpa_direct {</div><div class='ctx'> 	struct gpa_range range[1];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* This is the format for a Additional Data Packet. */</div><div class='del'>-struct vmadditional_data {</div><div class='del'>-	struct vmpacket_descriptor d;</div><div class='del'>-	u64 total_bytes;</div><div class='del'>-	u32 offset;</div><div class='del'>-	u32 byte_cnt;</div><div class='del'>-	unsigned char data[1];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-union vmpacket_largest_possible_header {</div><div class='del'>-	struct vmpacket_descriptor simple_hdr;</div><div class='del'>-	struct vmtransfer_page_packet_header xfer_page_hdr;</div><div class='del'>-	struct vmgpadl_packet_header gpadl_hdr;</div><div class='del'>-	struct vmadd_remove_transfer_page_set add_rm_xfer_page_hdr;</div><div class='del'>-	struct vmestablish_gpadl establish_gpadl_hdr;</div><div class='del'>-	struct vmteardown_gpadl teardown_gpadl_hdr;</div><div class='del'>-	struct vmdata_gpa_direct data_gpa_direct_hdr;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define VMPACKET_DATA_START_ADDRESS(__packet)	\</div><div class='ctx'> 	(void *)(((unsigned char *)__packet) +	\</div><div class='ctx'> 	 ((struct vmpacket_descriptor)__packet)-&gt;offset8 * 8)</div><div class='hunk'>@@ -677,6 +631,12 @@ struct vmbus_channel_relid_released {</div><div class='ctx'> 	u32 child_relid;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Used by the paravisor only, means that the encrypted ring buffers and</div><div class='add'>+ * the encrypted external memory are supported</div><div class='add'>+ */</div><div class='add'>+#define VMBUS_FEATURE_FLAG_CONFIDENTIAL_CHANNELS	0x10</div><div class='add'>+</div><div class='ctx'> struct vmbus_channel_initiate_contact {</div><div class='ctx'> 	struct vmbus_channel_message_header header;</div><div class='ctx'> 	u32 vmbus_version_requested;</div><div class='hunk'>@@ -686,7 +646,8 @@ struct vmbus_channel_initiate_contact {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8	msg_sint;</div><div class='ctx'> 			u8	msg_vtl;</div><div class='del'>-			u8	reserved[6];</div><div class='add'>+			u8	reserved[2];</div><div class='add'>+			u32 feature_flags; /* VMBus version 6.0 */</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> 	u64 monitor_page1;</div><div class='hunk'>@@ -763,20 +724,6 @@ struct vmbus_channel_msginfo {</div><div class='ctx'> 	unsigned char msg[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct vmbus_close_msg {</div><div class='del'>-	struct vmbus_channel_msginfo info;</div><div class='del'>-	struct vmbus_channel_close_channel msg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Define connection identifier type. */</div><div class='del'>-union hv_connection_id {</div><div class='del'>-	u32 asu32;</div><div class='del'>-	struct {</div><div class='del'>-		u32 id:24;</div><div class='del'>-		u32 reserved:8;</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum vmbus_device_type {</div><div class='ctx'> 	HV_IDE = 0,</div><div class='ctx'> 	HV_SCSI,</div><div class='hunk'>@@ -820,6 +767,8 @@ struct vmbus_requestor {</div><div class='ctx'> #define VMBUS_RQST_RESET (U64_MAX - 3)</div><div class='ctx'> </div><div class='ctx'> struct vmbus_device {</div><div class='add'>+	/* preferred ring buffer size in KB, 0 means no preferred size for this device */</div><div class='add'>+	size_t pref_ring_size;</div><div class='ctx'> 	u16  dev_type;</div><div class='ctx'> 	guid_t guid;</div><div class='ctx'> 	bool perf_device;</div><div class='hunk'>@@ -832,6 +781,7 @@ struct vmbus_gpadl {</div><div class='ctx'> 	u32 gpadl_handle;</div><div class='ctx'> 	u32 size;</div><div class='ctx'> 	void *buffer;</div><div class='add'>+	bool decrypted;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct vmbus_channel {</div><div class='hunk'>@@ -862,7 +812,7 @@ struct vmbus_channel {</div><div class='ctx'> 	struct hv_ring_buffer_info outbound;	/* send to parent */</div><div class='ctx'> 	struct hv_ring_buffer_info inbound;	/* receive from parent */</div><div class='ctx'> </div><div class='del'>-	struct vmbus_close_msg close_msg;</div><div class='add'>+	struct vmbus_channel_close_channel close_msg;</div><div class='ctx'> </div><div class='ctx'> 	/* Statistics */</div><div class='ctx'> 	u64	interrupts;	/* Host to Guest interrupts */</div><div class='hunk'>@@ -1064,6 +1014,16 @@ struct vmbus_channel {</div><div class='ctx'> </div><div class='ctx'> 	/* The max size of a packet on this channel */</div><div class='ctx'> 	u32 max_pkt_size;</div><div class='add'>+</div><div class='add'>+	/* function to mmap ring buffer memory to the channel's sysfs ring attribute */</div><div class='add'>+	int (*mmap_ring_buffer)(struct vmbus_channel *channel, struct vm_area_struct *vma);</div><div class='add'>+</div><div class='add'>+	/* boolean to control visibility of sysfs for ring buffer */</div><div class='add'>+	bool ring_sysfs_visible;</div><div class='add'>+	/* The ring buffer is encrypted */</div><div class='add'>+	bool co_ring_buffer;</div><div class='add'>+	/* The external memory is encrypted */</div><div class='add'>+	bool co_external_memory;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define lock_requestor(channel, flags)					\</div><div class='hunk'>@@ -1088,6 +1048,16 @@ u64 vmbus_request_addr_match(struct vmbus_channel *channel, u64 trans_id,</div><div class='ctx'> 			     u64 rqst_addr);</div><div class='ctx'> u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id);</div><div class='ctx'> </div><div class='add'>+static inline bool is_co_ring_buffer(const struct vmbus_channel_offer_channel *o)</div><div class='add'>+{</div><div class='add'>+	return !!(o-&gt;offer.chn_flags &amp; VMBUS_CHANNEL_CONFIDENTIAL_RING_BUFFER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_co_external_memory(const struct vmbus_channel_offer_channel *o)</div><div class='add'>+{</div><div class='add'>+	return !!(o-&gt;offer.chn_flags &amp; VMBUS_CHANNEL_CONFIDENTIAL_EXTERNAL_MEMORY);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool is_hvsock_offer(const struct vmbus_channel_offer_channel *o)</div><div class='ctx'> {</div><div class='ctx'> 	return !!(o-&gt;offer.chn_flags &amp; VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER);</div><div class='hunk'>@@ -1223,13 +1193,6 @@ extern int vmbus_sendpacket(struct vmbus_channel *channel,</div><div class='ctx'> 				  enum vmbus_packet_type type,</div><div class='ctx'> 				  u32 flags);</div><div class='ctx'> </div><div class='del'>-extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,</div><div class='del'>-					    struct hv_page_buffer pagebuffers[],</div><div class='del'>-					    u32 pagecount,</div><div class='del'>-					    void *buffer,</div><div class='del'>-					    u32 bufferlen,</div><div class='del'>-					    u64 requestid);</div><div class='del'>-</div><div class='ctx'> extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,</div><div class='ctx'> 				     struct vmbus_packet_mpb_array *mpb,</div><div class='ctx'> 				     u32 desc_size,</div><div class='hunk'>@@ -1327,11 +1290,7 @@ struct hv_device {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define device_to_hv_device(d)	container_of_const(d, struct hv_device, device)</div><div class='del'>-</div><div class='del'>-static inline struct hv_driver *drv_to_hv_drv(struct device_driver *d)</div><div class='del'>-{</div><div class='del'>-	return container_of(d, struct hv_driver, driver);</div><div class='del'>-}</div><div class='add'>+#define drv_to_hv_drv(d)	container_of_const(d, struct hv_driver, driver)</div><div class='ctx'> </div><div class='ctx'> static inline void hv_set_drvdata(struct hv_device *dev, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1343,6 +1302,8 @@ static inline void *hv_get_drvdata(struct hv_device *dev)</div><div class='ctx'> 	return dev_get_drvdata(&amp;dev-&gt;device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct device *hv_get_vmbus_root_device(void);</div><div class='add'>+</div><div class='ctx'> struct hv_ring_buffer_debug_info {</div><div class='ctx'> 	u32 current_interrupt_mask;</div><div class='ctx'> 	u32 current_read_index;</div><div class='hunk'>@@ -1560,6 +1521,7 @@ struct hv_util_service {</div><div class='ctx'> 	void *channel;</div><div class='ctx'> 	void (*util_cb)(void *);</div><div class='ctx'> 	int (*util_init)(struct hv_util_service *);</div><div class='add'>+	int (*util_init_transport)(void);</div><div class='ctx'> 	void (*util_deinit)(void);</div><div class='ctx'> 	int (*util_pre_suspend)(void);</div><div class='ctx'> 	int (*util_pre_resume)(void);</div><div class='hunk'>@@ -1670,6 +1632,7 @@ int vmbus_send_tl_connect_request(const guid_t *shv_guest_servie_id,</div><div class='ctx'> 				  const guid_t *shv_host_servie_id);</div><div class='ctx'> int vmbus_send_modifychannel(struct vmbus_channel *channel, u32 target_vp);</div><div class='ctx'> void vmbus_set_event(struct vmbus_channel *channel);</div><div class='add'>+int vmbus_channel_set_cpu(struct vmbus_channel *channel, u32 target_cpu);</div><div class='ctx'> </div><div class='ctx'> /* Get the start of the ring buffer. */</div><div class='ctx'> static inline void *</div><div class='head'>diff --git a/include/linux/hypervisor.h b/include/linux/hypervisor.h<br/>index 9efbc54e35e5..be5417303ecf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/hypervisor.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/hypervisor.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/hypervisor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/hypervisor.h</a></div><div class='hunk'>@@ -37,6 +37,9 @@ static inline bool hypervisor_isolated_pci_functions(void)</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_S390))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='add'>+	if (IS_ENABLED(CONFIG_LOONGARCH))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	return jailhouse_paravirt();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/i2c-algo-pca.h b/include/linux/i2c-algo-pca.h<br/>index 7c522fdd9ea7..e305bf32e40a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-algo-pca.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-algo-pca.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-algo-pca.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i2c-algo-pca.h</a></div><div class='hunk'>@@ -71,7 +71,7 @@ struct i2c_algo_pca_data {</div><div class='ctx'> 	void 				*data;	/* private low level data */</div><div class='ctx'> 	void (*write_byte)		(void *data, int reg, int val);</div><div class='ctx'> 	int  (*read_byte)		(void *data, int reg);</div><div class='del'>-	int  (*wait_for_completion)	(void *data);</div><div class='add'>+	int  (*wait_for_completion_cb)	(void *data);</div><div class='ctx'> 	void (*reset_chip)		(void *data);</div><div class='ctx'> 	/* For PCA9564, use one of the predefined frequencies:</div><div class='ctx'> 	 * 330000, 288000, 217000, 146000, 88000, 59000, 44000, 36000</div><div class='head'>diff --git a/include/linux/i2c-atr.h b/include/linux/i2c-atr.h<br/>index 4d5da161c225..2bb54dc87c8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-atr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-atr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-atr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i2c-atr.h</a></div><div class='hunk'>@@ -19,21 +19,59 @@ struct fwnode_handle;</div><div class='ctx'> struct i2c_atr;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum i2c_atr_flags - Flags for an I2C ATR driver</div><div class='add'>+ *</div><div class='add'>+ * @I2C_ATR_F_STATIC: ATR does not support dynamic mapping, use static mapping.</div><div class='add'>+ *                    Mappings will only be added or removed as a result of</div><div class='add'>+ *                    devices being added or removed from a child bus.</div><div class='add'>+ *                    The ATR pool will have to be big enough to accomodate all</div><div class='add'>+ *                    devices expected to be added to the child buses.</div><div class='add'>+ * @I2C_ATR_F_PASSTHROUGH: Allow unmapped incoming addresses to pass through</div><div class='add'>+ */</div><div class='add'>+enum i2c_atr_flags {</div><div class='add'>+	I2C_ATR_F_STATIC = BIT(0),</div><div class='add'>+	I2C_ATR_F_PASSTHROUGH = BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct i2c_atr_ops - Callbacks from ATR to the device driver.</div><div class='del'>- * @attach_client: Notify the driver of a new device connected on a child</div><div class='del'>- *                 bus, with the alias assigned to it. The driver must</div><div class='del'>- *                 configure the hardware to use the alias.</div><div class='del'>- * @detach_client: Notify the driver of a device getting disconnected. The</div><div class='del'>- *                 driver must configure the hardware to stop using the</div><div class='del'>- *                 alias.</div><div class='add'>+ * @attach_addr: Notify the driver of a new device connected on a child</div><div class='add'>+ *               bus, with the alias assigned to it. The driver must</div><div class='add'>+ *               configure the hardware to use the alias.</div><div class='add'>+ * @detach_addr: Notify the driver of a device getting disconnected. The</div><div class='add'>+ *               driver must configure the hardware to stop using the</div><div class='add'>+ *               alias.</div><div class='ctx'>  *</div><div class='ctx'>  * All these functions return 0 on success, a negative error code otherwise.</div><div class='ctx'>  */</div><div class='ctx'> struct i2c_atr_ops {</div><div class='del'>-	int (*attach_client)(struct i2c_atr *atr, u32 chan_id,</div><div class='del'>-			     const struct i2c_client *client, u16 alias);</div><div class='del'>-	void (*detach_client)(struct i2c_atr *atr, u32 chan_id,</div><div class='del'>-			      const struct i2c_client *client);</div><div class='add'>+	int (*attach_addr)(struct i2c_atr *atr, u32 chan_id,</div><div class='add'>+			   u16 addr, u16 alias);</div><div class='add'>+	void (*detach_addr)(struct i2c_atr *atr, u32 chan_id,</div><div class='add'>+			    u16 addr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct i2c_atr_adap_desc - An ATR downstream bus descriptor</div><div class='add'>+ * @chan_id:        Index of the new adapter (0 .. max_adapters-1).  This value is</div><div class='add'>+ *                  passed to the callbacks in `struct i2c_atr_ops`.</div><div class='add'>+ * @parent:         The device used as the parent of the new i2c adapter, or NULL</div><div class='add'>+ *                  to use the i2c-atr device as the parent.</div><div class='add'>+ * @bus_handle:     The fwnode handle that points to the adapter's i2c</div><div class='add'>+ *                  peripherals, or NULL.</div><div class='add'>+ * @num_aliases:    The number of aliases in this adapter's private alias pool. Set</div><div class='add'>+ *                  to zero if this adapter uses the ATR's global alias pool.</div><div class='add'>+ * @aliases:        An optional array of private aliases used by the adapter</div><div class='add'>+ *                  instead of the ATR's global pool of aliases. Must contain</div><div class='add'>+ *                  exactly num_aliases entries if num_aliases &gt; 0, is ignored</div><div class='add'>+ *                  otherwise.</div><div class='add'>+ */</div><div class='add'>+struct i2c_atr_adap_desc {</div><div class='add'>+	u32 chan_id;</div><div class='add'>+	struct device *parent;</div><div class='add'>+	struct fwnode_handle *bus_handle;</div><div class='add'>+	size_t num_aliases;</div><div class='add'>+	u16 *aliases;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -42,6 +80,7 @@ struct i2c_atr_ops {</div><div class='ctx'>  * @dev:          The device acting as an ATR</div><div class='ctx'>  * @ops:          Driver-specific callbacks</div><div class='ctx'>  * @max_adapters: Maximum number of child adapters</div><div class='add'>+ * @flags:        Flags for ATR</div><div class='ctx'>  *</div><div class='ctx'>  * The new ATR helper is connected to the parent adapter but has no child</div><div class='ctx'>  * adapters. Call i2c_atr_add_adapter() to add some.</div><div class='hunk'>@@ -51,7 +90,8 @@ struct i2c_atr_ops {</div><div class='ctx'>  * Return: pointer to the new ATR helper object, or ERR_PTR</div><div class='ctx'>  */</div><div class='ctx'> struct i2c_atr *i2c_atr_new(struct i2c_adapter *parent, struct device *dev,</div><div class='del'>-			    const struct i2c_atr_ops *ops, int max_adapters);</div><div class='add'>+			    const struct i2c_atr_ops *ops, int max_adapters,</div><div class='add'>+			    u32 flags);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * i2c_atr_delete - Delete an I2C ATR helper.</div><div class='hunk'>@@ -65,12 +105,7 @@ void i2c_atr_delete(struct i2c_atr *atr);</div><div class='ctx'> /**</div><div class='ctx'>  * i2c_atr_add_adapter - Create a child ("downstream") I2C bus.</div><div class='ctx'>  * @atr:        The I2C ATR</div><div class='del'>- * @chan_id:    Index of the new adapter (0 .. max_adapters-1).  This value is</div><div class='del'>- *              passed to the callbacks in `struct i2c_atr_ops`.</div><div class='del'>- * @adapter_parent: The device used as the parent of the new i2c adapter, or NULL</div><div class='del'>- *                  to use the i2c-atr device as the parent.</div><div class='del'>- * @bus_handle: The fwnode handle that points to the adapter's i2c</div><div class='del'>- *              peripherals, or NULL.</div><div class='add'>+ * @desc:       An ATR adapter descriptor</div><div class='ctx'>  *</div><div class='ctx'>  * After calling this function a new i2c bus will appear. Adding and removing</div><div class='ctx'>  * devices on the downstream bus will result in calls to the</div><div class='hunk'>@@ -85,9 +120,7 @@ void i2c_atr_delete(struct i2c_atr *atr);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success, a negative error code otherwise.</div><div class='ctx'>  */</div><div class='del'>-int i2c_atr_add_adapter(struct i2c_atr *atr, u32 chan_id,</div><div class='del'>-			struct device *adapter_parent,</div><div class='del'>-			struct fwnode_handle *bus_handle);</div><div class='add'>+int i2c_atr_add_adapter(struct i2c_atr *atr, struct i2c_atr_adap_desc *desc);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * i2c_atr_del_adapter - Remove a child ("downstream") I2C bus added by</div><div class='head'>diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h<br/>index 98ef73b7c8fd..1784ac7afb11 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-mux.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-mux.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-mux.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i2c-mux.h</a></div><div class='hunk'>@@ -56,8 +56,7 @@ struct i2c_adapter *i2c_root_adapter(struct device *dev);</div><div class='ctx'>  * callback functions to perform hardware-specific mux control.</div><div class='ctx'>  */</div><div class='ctx'> int i2c_mux_add_adapter(struct i2c_mux_core *muxc,</div><div class='del'>-			u32 force_nr, u32 chan_id,</div><div class='del'>-			unsigned int class);</div><div class='add'>+			u32 force_nr, u32 chan_id);</div><div class='ctx'> </div><div class='ctx'> void i2c_mux_del_adapters(struct i2c_mux_core *muxc);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/i2c-of-prober.h b/include/linux/i2c-of-prober.h<br/>new file mode 100644<br/>index 000000000000..bb6d47f50ee5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-of-prober.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i2c-of-prober.h</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Definitions for the Linux I2C OF component prober</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Google LLC</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_I2C_OF_PROBER_H</div><div class='add'>+#define _LINUX_I2C_OF_PROBER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kconfig.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct device_node;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct i2c_of_probe_ops - I2C OF component prober callbacks</div><div class='add'>+ *</div><div class='add'>+ * A set of callbacks to be used by i2c_of_probe_component().</div><div class='add'>+ *</div><div class='add'>+ * All callbacks are optional. Callbacks are called only once per run, and are</div><div class='add'>+ * used in the order they are defined in this structure.</div><div class='add'>+ *</div><div class='add'>+ * All callbacks that have return values shall return %0 on success,</div><div class='add'>+ * or a negative error number on failure.</div><div class='add'>+ *</div><div class='add'>+ * The @dev parameter passed to the callbacks is the same as @dev passed to</div><div class='add'>+ * i2c_of_probe_component(). It should only be used for dev_printk() calls</div><div class='add'>+ * and nothing else, especially not managed device resource (devres) APIs.</div><div class='add'>+ */</div><div class='add'>+struct i2c_of_probe_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * @enable: Retrieve and enable resources so that the components respond to probes.</div><div class='add'>+	 *</div><div class='add'>+	 * It is OK for this callback to return -EPROBE_DEFER since the intended use includes</div><div class='add'>+	 * retrieving resources and enables them. Resources should be reverted to their initial</div><div class='add'>+	 * state and released before returning if this fails.</div><div class='add'>+	 */</div><div class='add'>+	int (*enable)(struct device *dev, struct device_node *bus_node, void *data);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @cleanup_early: Release exclusive resources prior to calling probe() on a</div><div class='add'>+	 *		   detected component.</div><div class='add'>+	 *</div><div class='add'>+	 * Only called if a matching component is actually found. If none are found,</div><div class='add'>+	 * resources that would have been released in this callback should be released in</div><div class='add'>+	 * @free_resourcs_late instead.</div><div class='add'>+	 */</div><div class='add'>+	void (*cleanup_early)(struct device *dev, void *data);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @cleanup: Opposite of @enable to balance refcounts and free resources after probing.</div><div class='add'>+	 *</div><div class='add'>+	 * Should check if resources were already freed by @cleanup_early.</div><div class='add'>+	 */</div><div class='add'>+	void (*cleanup)(struct device *dev, void *data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct i2c_of_probe_cfg - I2C OF component prober configuration</div><div class='add'>+ * @ops: Callbacks for the prober to use.</div><div class='add'>+ * @type: A string to match the device node name prefix to probe for.</div><div class='add'>+ */</div><div class='add'>+struct i2c_of_probe_cfg {</div><div class='add'>+	const struct i2c_of_probe_ops *ops;</div><div class='add'>+	const char *type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_OF_DYNAMIC)</div><div class='add'>+</div><div class='add'>+int i2c_of_probe_component(struct device *dev, const struct i2c_of_probe_cfg *cfg, void *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: I2C OF component prober simple helpers</div><div class='add'>+ *</div><div class='add'>+ * Components such as trackpads are commonly connected to a devices baseboard</div><div class='add'>+ * with a 6-pin ribbon cable. That gives at most one voltage supply and one</div><div class='add'>+ * GPIO (commonly a "enable" or "reset" line) besides the I2C bus, interrupt</div><div class='add'>+ * pin, and common ground. Touchscreens, while integrated into the display</div><div class='add'>+ * panel's connection, typically have the same set of connections.</div><div class='add'>+ *</div><div class='add'>+ * A simple set of helpers are provided here for use with the I2C OF component</div><div class='add'>+ * prober. This implementation targets such components, allowing for at most</div><div class='add'>+ * one regulator supply.</div><div class='add'>+ *</div><div class='add'>+ * The following helpers are provided:</div><div class='add'>+ * * i2c_of_probe_simple_enable()</div><div class='add'>+ * * i2c_of_probe_simple_cleanup_early()</div><div class='add'>+ * * i2c_of_probe_simple_cleanup()</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct i2c_of_probe_simple_opts - Options for simple I2C component prober callbacks</div><div class='add'>+ * @res_node_compatible: Compatible string of device node to retrieve resources from.</div><div class='add'>+ * @supply_name: Name of regulator supply.</div><div class='add'>+ * @gpio_name: Name of GPIO. NULL if no GPIO line is used. Empty string ("") if GPIO</div><div class='add'>+ *	       line is unnamed.</div><div class='add'>+ * @post_power_on_delay_ms: Delay after regulators are powered on. Passed to msleep().</div><div class='add'>+ * @post_gpio_config_delay_ms: Delay after GPIO is configured. Passed to msleep().</div><div class='add'>+ * @gpio_assert_to_enable: %true if GPIO should be asserted, i.e. set to logical high,</div><div class='add'>+ *			   to enable the component.</div><div class='add'>+ *</div><div class='add'>+ * This describes power sequences common for the class of components supported by the</div><div class='add'>+ * simple component prober:</div><div class='add'>+ * * @gpio_name is configured to the non-active setting according to @gpio_assert_to_enable.</div><div class='add'>+ * * @supply_name regulator supply is enabled.</div><div class='add'>+ * * Wait for @post_power_on_delay_ms to pass.</div><div class='add'>+ * * @gpio_name is configured to the active setting according to @gpio_assert_to_enable.</div><div class='add'>+ * * Wait for @post_gpio_config_delay_ms to pass.</div><div class='add'>+ */</div><div class='add'>+struct i2c_of_probe_simple_opts {</div><div class='add'>+	const char *res_node_compatible;</div><div class='add'>+	const char *supply_name;</div><div class='add'>+	const char *gpio_name;</div><div class='add'>+	unsigned int post_power_on_delay_ms;</div><div class='add'>+	unsigned int post_gpio_config_delay_ms;</div><div class='add'>+	bool gpio_assert_to_enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gpio_desc;</div><div class='add'>+struct regulator;</div><div class='add'>+</div><div class='add'>+struct i2c_of_probe_simple_ctx {</div><div class='add'>+	/* public: provided by user before helpers are used. */</div><div class='add'>+	const struct i2c_of_probe_simple_opts *opts;</div><div class='add'>+	/* private: internal fields for helpers. */</div><div class='add'>+	struct regulator *supply;</div><div class='add'>+	struct gpio_desc *gpiod;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int i2c_of_probe_simple_enable(struct device *dev, struct device_node *bus_node, void *data);</div><div class='add'>+void i2c_of_probe_simple_cleanup_early(struct device *dev, void *data);</div><div class='add'>+void i2c_of_probe_simple_cleanup(struct device *dev, void *data);</div><div class='add'>+</div><div class='add'>+extern struct i2c_of_probe_ops i2c_of_probe_simple_ops;</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_OF_DYNAMIC) */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_I2C_OF_PROBER_H */</div><div class='head'>diff --git a/include/linux/i2c-smbus.h b/include/linux/i2c-smbus.h<br/>index ced1c6ead52a..dc1bd2ab4c13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-smbus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c-smbus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i2c-smbus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i2c-smbus.h</a></div><div class='hunk'>@@ -44,9 +44,11 @@ static inline void i2c_free_slave_host_notify_device(struct i2c_client *client)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_I2C_SMBUS) &amp;&amp; IS_ENABLED(CONFIG_DMI)</div><div class='del'>-void i2c_register_spd(struct i2c_adapter *adap);</div><div class='add'>+void i2c_register_spd_write_disable(struct i2c_adapter *adap);</div><div class='add'>+void i2c_register_spd_write_enable(struct i2c_adapter *adap);</div><div class='ctx'> #else</div><div class='del'>-static inline void i2c_register_spd(struct i2c_adapter *adap) { }</div><div class='add'>+static inline void i2c_register_spd_write_disable(struct i2c_adapter *adap) { }</div><div class='add'>+static inline void i2c_register_spd_write_enable(struct i2c_adapter *adap) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_I2C_SMBUS_H */</div><div class='head'>diff --git a/include/linux/i2c.h b/include/linux/i2c.h<br/>index 652ecb7abeda..20fd41b51d5c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i2c.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i2c.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i2c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i2c.h</a></div><div class='hunk'>@@ -24,13 +24,12 @@</div><div class='ctx'> #include &lt;uapi/linux/i2c.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern const struct bus_type i2c_bus_type;</div><div class='del'>-extern struct device_type i2c_adapter_type;</div><div class='del'>-extern struct device_type i2c_client_type;</div><div class='add'>+extern const struct device_type i2c_adapter_type;</div><div class='add'>+extern const struct device_type i2c_client_type;</div><div class='ctx'> </div><div class='ctx'> /* --- General options ------------------------------------------------	*/</div><div class='ctx'> </div><div class='ctx'> struct i2c_msg;</div><div class='del'>-struct i2c_algorithm;</div><div class='ctx'> struct i2c_adapter;</div><div class='ctx'> struct i2c_client;</div><div class='ctx'> struct i2c_driver;</div><div class='hunk'>@@ -304,7 +303,7 @@ struct i2c_driver {</div><div class='ctx'> </div><div class='ctx'> 	u32 flags;</div><div class='ctx'> };</div><div class='del'>-#define to_i2c_driver(d) container_of(d, struct i2c_driver, driver)</div><div class='add'>+#define to_i2c_driver(d) container_of_const(d, struct i2c_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct i2c_client - represent an I2C slave device</div><div class='hunk'>@@ -322,6 +321,8 @@ struct i2c_driver {</div><div class='ctx'>  *	calls it to pass on slave events to the slave driver.</div><div class='ctx'>  * @devres_group_id: id of the devres group that will be created for resources</div><div class='ctx'>  *	acquired when probing this device.</div><div class='add'>+ * @debugfs: pointer to the debugfs subdirectory which the I2C core created</div><div class='add'>+ *	for this client.</div><div class='ctx'>  *</div><div class='ctx'>  * An i2c_client identifies a single device (i.e. chip) connected to an</div><div class='ctx'>  * i2c bus. The behaviour exposed to Linux is defined by the driver</div><div class='hunk'>@@ -351,6 +352,7 @@ struct i2c_client {</div><div class='ctx'> 	i2c_slave_cb_t slave_cb;	/* callback for slave mode	*/</div><div class='ctx'> #endif</div><div class='ctx'> 	void *devres_group_id;		/* ID of probe devres group	*/</div><div class='add'>+	struct dentry *debugfs;		/* per-client debugfs dir	*/</div><div class='ctx'> };</div><div class='ctx'> #define to_i2c_client(d) container_of(d, struct i2c_client, dev)</div><div class='ctx'> </div><div class='hunk'>@@ -403,7 +405,6 @@ static inline bool i2c_detect_slave_mode(struct device *dev) { return false; }</div><div class='ctx'>  * @addr: stored in i2c_client.addr</div><div class='ctx'>  * @dev_name: Overrides the default &lt;busnr&gt;-&lt;addr&gt; dev_name if set</div><div class='ctx'>  * @platform_data: stored in i2c_client.dev.platform_data</div><div class='del'>- * @of_node: pointer to OpenFirmware device node</div><div class='ctx'>  * @fwnode: device node supplied by the platform firmware</div><div class='ctx'>  * @swnode: software node for the device</div><div class='ctx'>  * @resources: resources associated with the device</div><div class='hunk'>@@ -427,7 +428,6 @@ struct i2c_board_info {</div><div class='ctx'> 	unsigned short	addr;</div><div class='ctx'> 	const char	*dev_name;</div><div class='ctx'> 	void		*platform_data;</div><div class='del'>-	struct device_node *of_node;</div><div class='ctx'> 	struct fwnode_handle *fwnode;</div><div class='ctx'> 	const struct software_node *swnode;</div><div class='ctx'> 	const struct resource *resources;</div><div class='hunk'>@@ -512,46 +512,54 @@ i2c_register_board_info(int busnum, struct i2c_board_info const *info,</div><div class='ctx'> #endif /* I2C_BOARDINFO */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct i2c_algorithm - represent I2C transfer method</div><div class='del'>- * @master_xfer: Issue a set of i2c transactions to the given I2C adapter</div><div class='del'>- *   defined by the msgs array, with num messages available to transfer via</div><div class='del'>- *   the adapter specified by adap.</div><div class='del'>- * @master_xfer_atomic: same as @master_xfer. Yet, only using atomic context</div><div class='del'>- *   so e.g. PMICs can be accessed very late before shutdown. Optional.</div><div class='del'>- * @smbus_xfer: Issue smbus transactions to the given I2C adapter. If this</div><div class='add'>+ * struct i2c_algorithm - represent I2C transfer methods</div><div class='add'>+ * @xfer: Transfer a given number of messages defined by the msgs array via</div><div class='add'>+ *   the specified adapter.</div><div class='add'>+ * @xfer_atomic: Same as @xfer. Yet, only using atomic context so e.g. PMICs</div><div class='add'>+ *   can be accessed very late before shutdown. Optional.</div><div class='add'>+ * @smbus_xfer: Issue SMBus transactions to the given I2C adapter. If this</div><div class='ctx'>  *   is not present, then the bus layer will try and convert the SMBus calls</div><div class='ctx'>  *   into I2C transfers instead.</div><div class='del'>- * @smbus_xfer_atomic: same as @smbus_xfer. Yet, only using atomic context</div><div class='add'>+ * @smbus_xfer_atomic: Same as @smbus_xfer. Yet, only using atomic context</div><div class='ctx'>  *   so e.g. PMICs can be accessed very late before shutdown. Optional.</div><div class='ctx'>  * @functionality: Return the flags that this algorithm/adapter pair supports</div><div class='ctx'>  *   from the ``I2C_FUNC_*`` flags.</div><div class='del'>- * @reg_slave: Register given client to I2C slave mode of this adapter</div><div class='del'>- * @unreg_slave: Unregister given client from I2C slave mode of this adapter</div><div class='add'>+ * @reg_target: Register given client to local target mode of this adapter</div><div class='add'>+ * @unreg_target: Unregister given client from local target mode of this adapter</div><div class='add'>+ *</div><div class='add'>+ * @master_xfer: deprecated, use @xfer</div><div class='add'>+ * @master_xfer_atomic: deprecated, use @xfer_atomic</div><div class='add'>+ * @reg_slave: deprecated, use @reg_target</div><div class='add'>+ * @unreg_slave: deprecated, use @unreg_target</div><div class='ctx'>  *</div><div class='del'>- * The following structs are for those who like to implement new bus drivers:</div><div class='ctx'>  * i2c_algorithm is the interface to a class of hardware solutions which can</div><div class='ctx'>  * be addressed using the same bus algorithms - i.e. bit-banging or the PCF8584</div><div class='ctx'>  * to name two of the most common.</div><div class='ctx'>  *</div><div class='del'>- * The return codes from the ``master_xfer{_atomic}`` fields should indicate the</div><div class='add'>+ * The return codes from the ``xfer{_atomic}`` fields should indicate the</div><div class='ctx'>  * type of error code that occurred during the transfer, as documented in the</div><div class='ctx'>  * Kernel Documentation file Documentation/i2c/fault-codes.rst. Otherwise, the</div><div class='ctx'>  * number of messages executed should be returned.</div><div class='ctx'>  */</div><div class='ctx'> struct i2c_algorithm {</div><div class='ctx'> 	/*</div><div class='del'>-	 * If an adapter algorithm can't do I2C-level access, set master_xfer</div><div class='add'>+	 * If an adapter algorithm can't do I2C-level access, set xfer</div><div class='ctx'> 	 * to NULL. If an adapter algorithm can do SMBus access, set</div><div class='ctx'> 	 * smbus_xfer. If set to NULL, the SMBus protocol is simulated</div><div class='ctx'> 	 * using common I2C messages.</div><div class='del'>-	 *</div><div class='del'>-	 * master_xfer should return the number of messages successfully</div><div class='del'>-	 * processed, or a negative value on error</div><div class='ctx'> 	 */</div><div class='del'>-	int (*master_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs,</div><div class='del'>-			   int num);</div><div class='del'>-	int (*master_xfer_atomic)(struct i2c_adapter *adap,</div><div class='add'>+	union {</div><div class='add'>+		int (*xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs,</div><div class='add'>+			    int num);</div><div class='add'>+		int (*master_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs,</div><div class='add'>+				   int num);</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		int (*xfer_atomic)(struct i2c_adapter *adap,</div><div class='ctx'> 				   struct i2c_msg *msgs, int num);</div><div class='add'>+		int (*master_xfer_atomic)(struct i2c_adapter *adap,</div><div class='add'>+					   struct i2c_msg *msgs, int num);</div><div class='add'>+	};</div><div class='ctx'> 	int (*smbus_xfer)(struct i2c_adapter *adap, u16 addr,</div><div class='ctx'> 			  unsigned short flags, char read_write,</div><div class='ctx'> 			  u8 command, int size, union i2c_smbus_data *data);</div><div class='hunk'>@@ -563,8 +571,14 @@ struct i2c_algorithm {</div><div class='ctx'> 	u32 (*functionality)(struct i2c_adapter *adap);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_I2C_SLAVE)</div><div class='del'>-	int (*reg_slave)(struct i2c_client *client);</div><div class='del'>-	int (*unreg_slave)(struct i2c_client *client);</div><div class='add'>+	union {</div><div class='add'>+		int (*reg_target)(struct i2c_client *client);</div><div class='add'>+		int (*reg_slave)(struct i2c_client *client);</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		int (*unreg_target)(struct i2c_client *client);</div><div class='add'>+		int (*unreg_slave)(struct i2c_client *client);</div><div class='add'>+	};</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -748,6 +762,9 @@ struct i2c_adapter {</div><div class='ctx'> 	struct regulator *bus_regulator;</div><div class='ctx'> </div><div class='ctx'> 	struct dentry *debugfs;</div><div class='add'>+</div><div class='add'>+	/* 7bit address space */</div><div class='add'>+	DECLARE_BITMAP(addrs_in_instantiation, 1 &lt;&lt; 7);</div><div class='ctx'> };</div><div class='ctx'> #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)</div><div class='ctx'> </div><div class='hunk'>@@ -852,7 +869,6 @@ static inline void i2c_mark_adapter_resumed(struct i2c_adapter *adap)</div><div class='ctx'> </div><div class='ctx'> /* i2c adapter classes (bitmask) */</div><div class='ctx'> #define I2C_CLASS_HWMON		(1&lt;&lt;0)	/* lm_sensors, ... */</div><div class='del'>-#define I2C_CLASS_SPD		(1&lt;&lt;7)	/* Memory modules */</div><div class='ctx'> /* Warn users that the adapter doesn't support classes anymore */</div><div class='ctx'> #define I2C_CLASS_DEPRECATED	(1&lt;&lt;8)</div><div class='ctx'> </div><div class='hunk'>@@ -931,7 +947,22 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap)</div><div class='ctx'> </div><div class='ctx'> static inline u8 i2c_8bit_addr_from_msg(const struct i2c_msg *msg)</div><div class='ctx'> {</div><div class='del'>-	return (msg-&gt;addr &lt;&lt; 1) | (msg-&gt;flags &amp; I2C_M_RD ? 1 : 0);</div><div class='add'>+	return (msg-&gt;addr &lt;&lt; 1) | (msg-&gt;flags &amp; I2C_M_RD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 10-bit address</div><div class='add'>+ *   addr_1: 5'b11110 | addr[9:8] | (R/nW)</div><div class='add'>+ *   addr_2: addr[7:0]</div><div class='add'>+ */</div><div class='add'>+static inline u8 i2c_10bit_addr_hi_from_msg(const struct i2c_msg *msg)</div><div class='add'>+{</div><div class='add'>+	return 0xf0 | ((msg-&gt;addr &amp; GENMASK(9, 8)) &gt;&gt; 7) | (msg-&gt;flags &amp; I2C_M_RD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 i2c_10bit_addr_lo_from_msg(const struct i2c_msg *msg)</div><div class='add'>+{</div><div class='add'>+	return msg-&gt;addr &amp; GENMASK(7, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u8 *i2c_get_dma_safe_msg_buf(struct i2c_msg *msg, unsigned int threshold);</div><div class='hunk'>@@ -961,8 +992,6 @@ int i2c_handle_smbus_host_notify(struct i2c_adapter *adap, unsigned short addr);</div><div class='ctx'> #define builtin_i2c_driver(__i2c_driver) \</div><div class='ctx'> 	builtin_driver(__i2c_driver, i2c_add_driver)</div><div class='ctx'> </div><div class='del'>-#endif /* I2C */</div><div class='del'>-</div><div class='ctx'> /* must call put_device() when done with returned i2c_client device */</div><div class='ctx'> struct i2c_client *i2c_find_device_by_fwnode(struct fwnode_handle *fwnode);</div><div class='ctx'> </div><div class='hunk'>@@ -972,6 +1001,28 @@ struct i2c_adapter *i2c_find_adapter_by_fwnode(struct fwnode_handle *fwnode);</div><div class='ctx'> /* must call i2c_put_adapter() when done with returned i2c_adapter device */</div><div class='ctx'> struct i2c_adapter *i2c_get_adapter_by_fwnode(struct fwnode_handle *fwnode);</div><div class='ctx'> </div><div class='add'>+#else /* I2C */</div><div class='add'>+</div><div class='add'>+static inline struct i2c_client *</div><div class='add'>+i2c_find_device_by_fwnode(struct fwnode_handle *fwnode)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct i2c_adapter *</div><div class='add'>+i2c_find_adapter_by_fwnode(struct fwnode_handle *fwnode)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct i2c_adapter *</div><div class='add'>+i2c_get_adapter_by_fwnode(struct fwnode_handle *fwnode)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* !I2C */</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_OF)</div><div class='ctx'> /* must call put_device() when done with returned i2c_client device */</div><div class='ctx'> static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)</div><div class='hunk'>@@ -991,10 +1042,6 @@ static inline struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node</div><div class='ctx'> 	return i2c_get_adapter_by_fwnode(of_fwnode_handle(node));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const struct of_device_id</div><div class='del'>-*i2c_of_match_device(const struct of_device_id *matches,</div><div class='del'>-		     struct i2c_client *client);</div><div class='del'>-</div><div class='ctx'> int of_i2c_get_board_info(struct device *dev, struct device_node *node,</div><div class='ctx'> 			  struct i2c_board_info *info);</div><div class='ctx'> </div><div class='hunk'>@@ -1015,13 +1062,6 @@ static inline struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const struct of_device_id</div><div class='del'>-*i2c_of_match_device(const struct of_device_id *matches,</div><div class='del'>-		     struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int of_i2c_get_board_info(struct device *dev,</div><div class='ctx'> 					struct device_node *node,</div><div class='ctx'> 					struct i2c_board_info *info)</div><div class='hunk'>@@ -1034,7 +1074,7 @@ static inline int of_i2c_get_board_info(struct device *dev,</div><div class='ctx'> struct acpi_resource;</div><div class='ctx'> struct acpi_resource_i2c_serialbus;</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_ACPI)</div><div class='add'>+#if IS_REACHABLE(CONFIG_ACPI) &amp;&amp; IS_REACHABLE(CONFIG_I2C)</div><div class='ctx'> bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,</div><div class='ctx'> 			       struct acpi_resource_i2c_serialbus **i2c);</div><div class='ctx'> int i2c_acpi_client_count(struct acpi_device *adev);</div><div class='head'>diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h<br/>index e119f11948ef..9fcb6410a584 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i3c/device.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i3c/device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i3c/device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i3c/device.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'>  * These are the standard error codes as defined by the I3C specification.</div><div class='ctx'>  * When -EIO is returned by the i3c_device_do_priv_xfers() or</div><div class='ctx'>  * i3c_device_send_hdr_cmds() one can check the error code in</div><div class='del'>- * &amp;struct_i3c_priv_xfer.err or &amp;struct i3c_hdr_cmd.err to get a better idea of</div><div class='add'>+ * &amp;struct_i3c_xfer.err or &amp;struct i3c_hdr_cmd.err to get a better idea of</div><div class='ctx'>  * what went wrong.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -39,20 +39,25 @@ enum i3c_error_code {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * enum i3c_hdr_mode - HDR mode ids</div><div class='add'>+ * enum i3c_xfer_mode - I3C xfer mode ids</div><div class='ctx'>  * @I3C_HDR_DDR: DDR mode</div><div class='ctx'>  * @I3C_HDR_TSP: TSP mode</div><div class='ctx'>  * @I3C_HDR_TSL: TSL mode</div><div class='add'>+ * @I3C_SDR: SDR mode (NOT HDR mode)</div><div class='ctx'>  */</div><div class='del'>-enum i3c_hdr_mode {</div><div class='del'>-	I3C_HDR_DDR,</div><div class='del'>-	I3C_HDR_TSP,</div><div class='del'>-	I3C_HDR_TSL,</div><div class='add'>+enum i3c_xfer_mode {</div><div class='add'>+	/* The below 3 value (I3C_HDR*) must match GETCAP1 Byte bit position */</div><div class='add'>+	I3C_HDR_DDR = 0,</div><div class='add'>+	I3C_HDR_TSP = 1,</div><div class='add'>+	I3C_HDR_TSL = 2,</div><div class='add'>+	/* Use for default SDR transfer mode */</div><div class='add'>+	I3C_SDR = 31,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct i3c_priv_xfer - I3C SDR private transfer</div><div class='add'>+ * struct i3c_xfer - I3C data transfer</div><div class='ctx'>  * @rnw: encodes the transfer direction. true for a read, false for a write</div><div class='add'>+ * @cmd: Read/Write command in HDR mode, read: 0x80 - 0xff, write: 0x00 - 0x7f</div><div class='ctx'>  * @len: transfer length in bytes of the transfer</div><div class='ctx'>  * @actual_len: actual length in bytes are transferred by the controller</div><div class='ctx'>  * @data: input/output buffer</div><div class='hunk'>@@ -60,8 +65,11 @@ enum i3c_hdr_mode {</div><div class='ctx'>  * @data.out: output buffer. Must point to a DMA-able buffer</div><div class='ctx'>  * @err: I3C error code</div><div class='ctx'>  */</div><div class='del'>-struct i3c_priv_xfer {</div><div class='del'>-	u8 rnw;</div><div class='add'>+struct i3c_xfer {</div><div class='add'>+	union {</div><div class='add'>+		u8 rnw;</div><div class='add'>+		u8 cmd;</div><div class='add'>+	};</div><div class='ctx'> 	u16 len;</div><div class='ctx'> 	u16 actual_len;</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -71,6 +79,9 @@ struct i3c_priv_xfer {</div><div class='ctx'> 	enum i3c_error_code err;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* keep back compatible */</div><div class='add'>+#define i3c_priv_xfer i3c_xfer</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * enum i3c_dcr - I3C DCR values</div><div class='ctx'>  * @I3C_DCR_GENERIC_DEVICE: generic I3C device</div><div class='hunk'>@@ -183,10 +194,7 @@ struct i3c_driver {</div><div class='ctx'> 	const struct i3c_device_id *id_table;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct i3c_driver *drv_to_i3cdrv(struct device_driver *drv)</div><div class='del'>-{</div><div class='del'>-	return container_of(drv, struct i3c_driver, driver);</div><div class='del'>-}</div><div class='add'>+#define drv_to_i3cdrv(__drv)	container_of_const(__drv, struct i3c_driver, driver)</div><div class='ctx'> </div><div class='ctx'> struct device *i3cdev_to_dev(struct i3c_device *i3cdev);</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +256,7 @@ void i3c_driver_unregister(struct i3c_driver *drv);</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 if both registrations succeeds, a negative error code otherwise.</div><div class='ctx'>  */</div><div class='del'>-static inline int i3c_i2c_driver_register(struct i3c_driver *i3cdrv,</div><div class='add'>+static __always_inline int i3c_i2c_driver_register(struct i3c_driver *i3cdrv,</div><div class='ctx'> 					  struct i2c_driver *i2cdrv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -273,7 +281,7 @@ static inline int i3c_i2c_driver_register(struct i3c_driver *i3cdrv,</div><div class='ctx'>  * Note that when CONFIG_I3C is not enabled, this function only unregisters the</div><div class='ctx'>  * @i2cdrv.</div><div class='ctx'>  */</div><div class='del'>-static inline void i3c_i2c_driver_unregister(struct i3c_driver *i3cdrv,</div><div class='add'>+static __always_inline void i3c_i2c_driver_unregister(struct i3c_driver *i3cdrv,</div><div class='ctx'> 					     struct i2c_driver *i2cdrv)</div><div class='ctx'> {</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_I3C))</div><div class='hunk'>@@ -286,7 +294,7 @@ static inline void i3c_i2c_driver_unregister(struct i3c_driver *i3cdrv,</div><div class='ctx'>  * module_i3c_i2c_driver() - Register a module providing an I3C and an I2C</div><div class='ctx'>  *			     driver</div><div class='ctx'>  * @__i3cdrv: the I3C driver to register</div><div class='del'>- * @__i2cdrv: the I3C driver to register</div><div class='add'>+ * @__i2cdrv: the I2C driver to register</div><div class='ctx'>  *</div><div class='ctx'>  * Provide generic init/exit functions that simply register/unregister an I3C</div><div class='ctx'>  * and an I2C driver.</div><div class='hunk'>@@ -300,9 +308,15 @@ static inline void i3c_i2c_driver_unregister(struct i3c_driver *i3cdrv,</div><div class='ctx'> 		      i3c_i2c_driver_unregister,	\</div><div class='ctx'> 		      __i2cdrv)</div><div class='ctx'> </div><div class='del'>-int i3c_device_do_priv_xfers(struct i3c_device *dev,</div><div class='del'>-			     struct i3c_priv_xfer *xfers,</div><div class='del'>-			     int nxfers);</div><div class='add'>+int i3c_device_do_xfers(struct i3c_device *dev, struct i3c_xfer *xfers,</div><div class='add'>+			int nxfers, enum i3c_xfer_mode mode);</div><div class='add'>+</div><div class='add'>+static inline int i3c_device_do_priv_xfers(struct i3c_device *dev,</div><div class='add'>+					   struct i3c_xfer *xfers,</div><div class='add'>+					   int nxfers)</div><div class='add'>+{</div><div class='add'>+	return i3c_device_do_xfers(dev, xfers, nxfers, I3C_SDR);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int i3c_device_do_setdasa(struct i3c_device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -344,5 +358,6 @@ int i3c_device_request_ibi(struct i3c_device *dev,</div><div class='ctx'> void i3c_device_free_ibi(struct i3c_device *dev);</div><div class='ctx'> int i3c_device_enable_ibi(struct i3c_device *dev);</div><div class='ctx'> int i3c_device_disable_ibi(struct i3c_device *dev);</div><div class='add'>+u32 i3c_device_get_supported_xfer_mode(struct i3c_device *dev);</div><div class='ctx'> </div><div class='ctx'> #endif /* I3C_DEV_H */</div><div class='head'>diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h<br/>index 0ca27dd86956..2fd850f4678b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i3c/master.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i3c/master.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i3c/master.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i3c/master.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@ enum {</div><div class='ctx'> struct i3c_master_controller;</div><div class='ctx'> struct i3c_bus;</div><div class='ctx'> struct i3c_device;</div><div class='add'>+extern const struct bus_type i3c_bus_type;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct i3c_i2c_dev_desc - Common part of the I3C/I2C device descriptor</div><div class='hunk'>@@ -248,10 +249,15 @@ struct i3c_device {</div><div class='ctx'>  */</div><div class='ctx'> #define I3C_BUS_MAX_DEVS		11</div><div class='ctx'> </div><div class='del'>-#define I3C_BUS_MAX_I3C_SCL_RATE	12900000</div><div class='del'>-#define I3C_BUS_TYP_I3C_SCL_RATE	12500000</div><div class='del'>-#define I3C_BUS_I2C_FM_PLUS_SCL_RATE	1000000</div><div class='del'>-#define I3C_BUS_I2C_FM_SCL_RATE		400000</div><div class='add'>+/* Taken from the I3C Spec V1.1.1, chapter 6.2. "Timing specification" */</div><div class='add'>+#define I3C_BUS_I2C_FM_PLUS_SCL_MAX_RATE	1000000</div><div class='add'>+#define I3C_BUS_I2C_FM_SCL_MAX_RATE		400000</div><div class='add'>+#define I3C_BUS_I3C_SCL_MAX_RATE	12900000</div><div class='add'>+#define I3C_BUS_I3C_SCL_TYP_RATE	12500000</div><div class='add'>+#define I3C_BUS_TAVAL_MIN_NS		1000</div><div class='add'>+#define I3C_BUS_TBUF_MIXED_FM_MIN_NS	1300</div><div class='add'>+#define I3C_BUS_THIGH_MIXED_MAX_NS	41</div><div class='add'>+#define I3C_BUS_TIDLE_MIN_NS		200000</div><div class='ctx'> #define I3C_BUS_TLOW_OD_MIN_NS		200</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -277,13 +283,29 @@ enum i3c_bus_mode {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum i3c_open_drain_speed - I3C open-drain speed</div><div class='add'>+ * @I3C_OPEN_DRAIN_SLOW_SPEED: Slow open-drain speed for sending the first</div><div class='add'>+ *				broadcast address. The first broadcast address at this speed</div><div class='add'>+ *				will be visible to all devices on the I3C bus. I3C devices</div><div class='add'>+ *				working in I2C mode will turn off their spike filter when</div><div class='add'>+ *				switching into I3C mode.</div><div class='add'>+ * @I3C_OPEN_DRAIN_NORMAL_SPEED: Normal open-drain speed in I3C bus mode.</div><div class='add'>+ */</div><div class='add'>+enum i3c_open_drain_speed {</div><div class='add'>+	I3C_OPEN_DRAIN_SLOW_SPEED,</div><div class='add'>+	I3C_OPEN_DRAIN_NORMAL_SPEED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * enum i3c_addr_slot_status - I3C address slot status</div><div class='ctx'>  * @I3C_ADDR_SLOT_FREE: address is free</div><div class='ctx'>  * @I3C_ADDR_SLOT_RSVD: address is reserved</div><div class='ctx'>  * @I3C_ADDR_SLOT_I2C_DEV: address is assigned to an I2C device</div><div class='ctx'>  * @I3C_ADDR_SLOT_I3C_DEV: address is assigned to an I3C device</div><div class='ctx'>  * @I3C_ADDR_SLOT_STATUS_MASK: address slot mask</div><div class='del'>- *</div><div class='add'>+ * @I3C_ADDR_SLOT_EXT_STATUS_MASK: address slot mask with extended information</div><div class='add'>+ * @I3C_ADDR_SLOT_EXT_DESIRED: the bitmask represents addresses that are preferred by some devices,</div><div class='add'>+ *			       such as the "assigned-address" property in a device tree source.</div><div class='ctx'>  * On an I3C bus, addresses are assigned dynamically, and we need to know which</div><div class='ctx'>  * addresses are free to use and which ones are already assigned.</div><div class='ctx'>  *</div><div class='hunk'>@@ -296,8 +318,12 @@ enum i3c_addr_slot_status {</div><div class='ctx'> 	I3C_ADDR_SLOT_I2C_DEV,</div><div class='ctx'> 	I3C_ADDR_SLOT_I3C_DEV,</div><div class='ctx'> 	I3C_ADDR_SLOT_STATUS_MASK = 3,</div><div class='add'>+	I3C_ADDR_SLOT_EXT_STATUS_MASK = 7,</div><div class='add'>+	I3C_ADDR_SLOT_EXT_DESIRED = BIT(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define I3C_ADDR_SLOT_STATUS_BITS 4</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct i3c_bus - I3C bus object</div><div class='ctx'>  * @cur_master: I3C master currently driving the bus. Since I3C is multi-master</div><div class='hunk'>@@ -339,7 +365,7 @@ enum i3c_addr_slot_status {</div><div class='ctx'> struct i3c_bus {</div><div class='ctx'> 	struct i3c_dev_desc *cur_master;</div><div class='ctx'> 	int id;</div><div class='del'>-	unsigned long addrslots[((I2C_MAX_ADDR + 1) * 2) / BITS_PER_LONG];</div><div class='add'>+	unsigned long addrslots[((I2C_MAX_ADDR + 1) * I3C_ADDR_SLOT_STATUS_BITS) / BITS_PER_LONG];</div><div class='ctx'> 	enum i3c_bus_mode mode;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		unsigned long i3c;</div><div class='hunk'>@@ -392,7 +418,11 @@ struct i3c_bus {</div><div class='ctx'>  * @send_ccc_cmd: send a CCC command</div><div class='ctx'>  *		  This method is mandatory.</div><div class='ctx'>  * @priv_xfers: do one or several private I3C SDR transfers</div><div class='del'>- *		This method is mandatory.</div><div class='add'>+ *		This method is mandatory when i3c_xfers is not implemented. It</div><div class='add'>+ *		is deprecated.</div><div class='add'>+ * @i3c_xfers: do one or several I3C SDR or HDR transfers</div><div class='add'>+ *	       This method is mandatory when priv_xfers is not implemented but</div><div class='add'>+ *	       should be implemented instead of priv_xfers.</div><div class='ctx'>  * @attach_i2c_dev: called every time an I2C device is attached to the bus.</div><div class='ctx'>  *		    This is a good place to attach master controller specific</div><div class='ctx'>  *		    data to I2C devices.</div><div class='hunk'>@@ -435,6 +465,7 @@ struct i3c_bus {</div><div class='ctx'>  *		      NULL.</div><div class='ctx'>  * @enable_hotjoin: enable hot join event detect.</div><div class='ctx'>  * @disable_hotjoin: disable hot join event detect.</div><div class='add'>+ * @set_speed: adjust I3C open drain mode timing.</div><div class='ctx'>  */</div><div class='ctx'> struct i3c_master_controller_ops {</div><div class='ctx'> 	int (*bus_init)(struct i3c_master_controller *master);</div><div class='hunk'>@@ -447,13 +478,17 @@ struct i3c_master_controller_ops {</div><div class='ctx'> 				 const struct i3c_ccc_cmd *cmd);</div><div class='ctx'> 	int (*send_ccc_cmd)(struct i3c_master_controller *master,</div><div class='ctx'> 			    struct i3c_ccc_cmd *cmd);</div><div class='add'>+	/* Deprecated, please use i3c_xfers() */</div><div class='ctx'> 	int (*priv_xfers)(struct i3c_dev_desc *dev,</div><div class='ctx'> 			  struct i3c_priv_xfer *xfers,</div><div class='ctx'> 			  int nxfers);</div><div class='add'>+	int (*i3c_xfers)(struct i3c_dev_desc *dev,</div><div class='add'>+			 struct i3c_xfer *xfers,</div><div class='add'>+			 int nxfers, enum i3c_xfer_mode mode);</div><div class='ctx'> 	int (*attach_i2c_dev)(struct i2c_dev_desc *dev);</div><div class='ctx'> 	void (*detach_i2c_dev)(struct i2c_dev_desc *dev);</div><div class='ctx'> 	int (*i2c_xfers)(struct i2c_dev_desc *dev,</div><div class='del'>-			 const struct i2c_msg *xfers, int nxfers);</div><div class='add'>+			 struct i2c_msg *xfers, int nxfers);</div><div class='ctx'> 	int (*request_ibi)(struct i3c_dev_desc *dev,</div><div class='ctx'> 			   const struct i3c_ibi_setup *req);</div><div class='ctx'> 	void (*free_ibi)(struct i3c_dev_desc *dev);</div><div class='hunk'>@@ -463,6 +498,7 @@ struct i3c_master_controller_ops {</div><div class='ctx'> 				 struct i3c_ibi_slot *slot);</div><div class='ctx'> 	int (*enable_hotjoin)(struct i3c_master_controller *master);</div><div class='ctx'> 	int (*disable_hotjoin)(struct i3c_master_controller *master);</div><div class='add'>+	int (*set_speed)(struct i3c_master_controller *master, enum i3c_open_drain_speed speed);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -530,6 +566,26 @@ struct i3c_master_controller {</div><div class='ctx'> #define i3c_bus_for_each_i3cdev(bus, dev)				\</div><div class='ctx'> 	list_for_each_entry(dev, &amp;(bus)-&gt;devs.i3c, common.node)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct i3c_dma - DMA transfer and mapping descriptor</div><div class='add'>+ * @dev: device object of a device doing DMA</div><div class='add'>+ * @buf: destination/source buffer for DMA</div><div class='add'>+ * @len: length of transfer</div><div class='add'>+ * @map_len: length of DMA mapping</div><div class='add'>+ * @addr: mapped DMA address for a Host Controller Driver</div><div class='add'>+ * @dir: DMA direction</div><div class='add'>+ * @bounce_buf: an allocated bounce buffer if transfer needs it or NULL</div><div class='add'>+ */</div><div class='add'>+struct i3c_dma {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	void *buf;</div><div class='add'>+	size_t len;</div><div class='add'>+	size_t map_len;</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+	void *bounce_buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int i3c_master_do_i2c_xfers(struct i3c_master_controller *master,</div><div class='ctx'> 			    const struct i2c_msg *xfers,</div><div class='ctx'> 			    int nxfers);</div><div class='hunk'>@@ -547,6 +603,12 @@ int i3c_master_get_free_addr(struct i3c_master_controller *master,</div><div class='ctx'> int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,</div><div class='ctx'> 				  u8 addr);</div><div class='ctx'> int i3c_master_do_daa(struct i3c_master_controller *master);</div><div class='add'>+struct i3c_dma *i3c_master_dma_map_single(struct device *dev, void *ptr,</div><div class='add'>+					  size_t len, bool force_bounce,</div><div class='add'>+					  enum dma_data_direction dir);</div><div class='add'>+void i3c_master_dma_unmap_single(struct i3c_dma *dma_xfer);</div><div class='add'>+DEFINE_FREE(i3c_master_dma_unmap_single, void *,</div><div class='add'>+	    if (_T) i3c_master_dma_unmap_single(_T))</div><div class='ctx'> </div><div class='ctx'> int i3c_master_set_info(struct i3c_master_controller *master,</div><div class='ctx'> 			const struct i3c_device_info *info);</div><div class='head'>diff --git a/include/linux/i8042.h b/include/linux/i8042.h<br/>index 95b07f8b77fe..00037c13abc8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i8042.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i8042.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i8042.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i8042.h</a></div><div class='hunk'>@@ -54,15 +54,29 @@</div><div class='ctx'> </div><div class='ctx'> struct serio;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * typedef i8042_filter_t - i8042 filter callback</div><div class='add'>+ * @data: Data received by the i8042 controller</div><div class='add'>+ * @str: Status register of the i8042 controller</div><div class='add'>+ * @serio: Serio of the i8042 controller</div><div class='add'>+ * @context: Context pointer associated with this callback</div><div class='add'>+ *</div><div class='add'>+ * This represents a i8042 filter callback which can be used with i8042_install_filter()</div><div class='add'>+ * and i8042_remove_filter() to filter the i8042 input for platform-specific key codes.</div><div class='add'>+ *</div><div class='add'>+ * Context: Interrupt context.</div><div class='add'>+ * Returns: true if the data should be filtered out, false if otherwise.</div><div class='add'>+ */</div><div class='add'>+typedef bool (*i8042_filter_t)(unsigned char data, unsigned char str, struct serio *serio,</div><div class='add'>+			       void *context);</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_SERIO_I8042) || defined(CONFIG_SERIO_I8042_MODULE)</div><div class='ctx'> </div><div class='ctx'> void i8042_lock_chip(void);</div><div class='ctx'> void i8042_unlock_chip(void);</div><div class='ctx'> int i8042_command(unsigned char *param, int command);</div><div class='del'>-int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,</div><div class='del'>-					struct serio *serio));</div><div class='del'>-int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,</div><div class='del'>-				       struct serio *serio));</div><div class='add'>+int i8042_install_filter(i8042_filter_t filter, void *context);</div><div class='add'>+int i8042_remove_filter(i8042_filter_t filter);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='hunk'>@@ -79,14 +93,12 @@ static inline int i8042_command(unsigned char *param, int command)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,</div><div class='del'>-					struct serio *serio))</div><div class='add'>+static inline int i8042_install_filter(i8042_filter_t filter, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,</div><div class='del'>-				       struct serio *serio))</div><div class='add'>+static inline int i8042_remove_filter(i8042_filter_t filter)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/i8253.h b/include/linux/i8253.h<br/>index 8336b2f6f834..56c280eb2d4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/i8253.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/i8253.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/i8253.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/i8253.h</a></div><div class='hunk'>@@ -21,9 +21,9 @@</div><div class='ctx'> #define PIT_LATCH	((PIT_TICK_RATE + HZ/2) / HZ)</div><div class='ctx'> </div><div class='ctx'> extern raw_spinlock_t i8253_lock;</div><div class='del'>-extern bool i8253_clear_counter_on_shutdown;</div><div class='ctx'> extern struct clock_event_device i8253_clockevent;</div><div class='ctx'> extern void clockevent_i8253_init(bool oneshot);</div><div class='add'>+extern void clockevent_i8253_disable(void);</div><div class='ctx'> </div><div class='ctx'> extern void setup_pit_timer(void);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/icmp.h b/include/linux/icmp.h<br/>index 0af4d210ee31..043ec5d9c882 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/icmp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/icmp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/icmp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/icmp.h</a></div><div class='hunk'>@@ -40,4 +40,36 @@ void ip_icmp_error_rfc4884(const struct sk_buff *skb,</div><div class='ctx'> 			   struct sock_ee_data_rfc4884 *out,</div><div class='ctx'> 			   int thlen, int off);</div><div class='ctx'> </div><div class='add'>+/* RFC 4884 */</div><div class='add'>+#define ICMP_EXT_ORIG_DGRAM_MIN_LEN	128</div><div class='add'>+#define ICMP_EXT_VERSION_2		2</div><div class='add'>+</div><div class='add'>+/* ICMP Extension Object Classes */</div><div class='add'>+#define ICMP_EXT_OBJ_CLASS_IIO		2	/* RFC 5837 */</div><div class='add'>+</div><div class='add'>+/* Interface Information Object - RFC 5837 */</div><div class='add'>+enum {</div><div class='add'>+	ICMP_EXT_CTYPE_IIO_ROLE_IIF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ICMP_EXT_CTYPE_IIO_ROLE(ROLE)	((ROLE) &lt;&lt; 6)</div><div class='add'>+#define ICMP_EXT_CTYPE_IIO_MTU		BIT(0)</div><div class='add'>+#define ICMP_EXT_CTYPE_IIO_NAME		BIT(1)</div><div class='add'>+#define ICMP_EXT_CTYPE_IIO_IPADDR	BIT(2)</div><div class='add'>+#define ICMP_EXT_CTYPE_IIO_IFINDEX	BIT(3)</div><div class='add'>+</div><div class='add'>+struct icmp_ext_iio_name_subobj {</div><div class='add'>+	u8 len;</div><div class='add'>+	char name[IFNAMSIZ];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/* RFC 5837 - Incoming IP Interface Role */</div><div class='add'>+	ICMP_ERR_EXT_IIO_IIF,</div><div class='add'>+	/* Add new constants above. Used by "icmp_errors_extension_mask"</div><div class='add'>+	 * sysctl.</div><div class='add'>+	 */</div><div class='add'>+	ICMP_ERR_EXT_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif	/* _LINUX_ICMP_H */</div><div class='head'>diff --git a/include/linux/idr.h b/include/linux/idr.h<br/>index da5f5fa4a3a6..789e23e67444 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/idr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/idr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/idr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/idr.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/radix-tree.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct idr {</div><div class='ctx'> 	struct radix_tree_root	idr_rt;</div><div class='hunk'>@@ -124,6 +125,22 @@ void *idr_get_next_ul(struct idr *, unsigned long *nextid);</div><div class='ctx'> void *idr_replace(struct idr *, void *, unsigned long id);</div><div class='ctx'> void idr_destroy(struct idr *);</div><div class='ctx'> </div><div class='add'>+struct __class_idr {</div><div class='add'>+	struct idr *idr;</div><div class='add'>+	int id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define idr_null ((struct __class_idr){ NULL, -1 })</div><div class='add'>+#define take_idr_id(id) __get_and_null(id, idr_null)</div><div class='add'>+</div><div class='add'>+DEFINE_CLASS(idr_alloc, struct __class_idr,</div><div class='add'>+	     if (_T.id &gt;= 0) idr_remove(_T.idr, _T.id),</div><div class='add'>+	     ((struct __class_idr){</div><div class='add'>+	     	.idr = idr,</div><div class='add'>+		.id = idr_alloc(idr, ptr, start, end, gfp),</div><div class='add'>+	     }),</div><div class='add'>+	     struct idr *idr, void *ptr, int start, int end, gfp_t gfp);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * idr_init_base() - Initialise an IDR.</div><div class='ctx'>  * @idr: IDR handle.</div><div class='hunk'>@@ -257,6 +274,7 @@ struct ida {</div><div class='ctx'> int ida_alloc_range(struct ida *, unsigned int min, unsigned int max, gfp_t);</div><div class='ctx'> void ida_free(struct ida *, unsigned int id);</div><div class='ctx'> void ida_destroy(struct ida *ida);</div><div class='add'>+int ida_find_first_range(struct ida *ida, unsigned int min, unsigned int max);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ida_alloc() - Allocate an unused ID.</div><div class='hunk'>@@ -316,16 +334,18 @@ static inline void ida_init(struct ida *ida)</div><div class='ctx'> 	xa_init_flags(&amp;ida-&gt;xa, IDA_INIT_FLAGS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * ida_simple_get() and ida_simple_remove() are deprecated. Use</div><div class='del'>- * ida_alloc() and ida_free() instead respectively.</div><div class='del'>- */</div><div class='del'>-#define ida_simple_get(ida, start, end, gfp)	\</div><div class='del'>-			ida_alloc_range(ida, start, (end) - 1, gfp)</div><div class='del'>-#define ida_simple_remove(ida, id)	ida_free(ida, id)</div><div class='del'>-</div><div class='ctx'> static inline bool ida_is_empty(const struct ida *ida)</div><div class='ctx'> {</div><div class='ctx'> 	return xa_empty(&amp;ida-&gt;xa);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline bool ida_exists(struct ida *ida, unsigned int id)</div><div class='add'>+{</div><div class='add'>+	return ida_find_first_range(ida, id, id) == id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ida_find_first(struct ida *ida)</div><div class='add'>+{</div><div class='add'>+	return ida_find_first_range(ida, 0, ~0);</div><div class='add'>+}</div><div class='ctx'> #endif /* __IDR_H__ */</div><div class='head'>diff --git a/include/linux/ieee80211-eht.h b/include/linux/ieee80211-eht.h<br/>new file mode 100644<br/>index 000000000000..f9782e46c5e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211-eht.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211-eht.h</a></div><div class='hunk'>@@ -0,0 +1,1182 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * IEEE 802.11 EHT definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='add'>+ * &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2005, Devicescape Software, Inc.</div><div class='add'>+ * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_IEEE80211_EHT_H</div><div class='add'>+#define LINUX_IEEE80211_EHT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+/* need HE definitions for the inlines here */</div><div class='add'>+#include &lt;linux/ieee80211-he.h&gt;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_TTLM_MAX_CNT				2</div><div class='add'>+#define IEEE80211_TTLM_CONTROL_DIRECTION		0x03</div><div class='add'>+#define IEEE80211_TTLM_CONTROL_DEF_LINK_MAP		0x04</div><div class='add'>+#define IEEE80211_TTLM_CONTROL_SWITCH_TIME_PRESENT	0x08</div><div class='add'>+#define IEEE80211_TTLM_CONTROL_EXPECTED_DUR_PRESENT	0x10</div><div class='add'>+#define IEEE80211_TTLM_CONTROL_LINK_MAP_SIZE		0x20</div><div class='add'>+</div><div class='add'>+#define IEEE80211_TTLM_DIRECTION_DOWN		0</div><div class='add'>+#define IEEE80211_TTLM_DIRECTION_UP		1</div><div class='add'>+#define IEEE80211_TTLM_DIRECTION_BOTH		2</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_ttlm_elem - TID-To-Link Mapping element</div><div class='add'>+ *</div><div class='add'>+ * Defined in section 9.4.2.314 in P802.11be_D4</div><div class='add'>+ *</div><div class='add'>+ * @control: the first part of control field</div><div class='add'>+ * @optional: the second part of control field</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_ttlm_elem {</div><div class='add'>+	u8 control;</div><div class='add'>+	u8 optional[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_MCS_NSS_RX 0x0f</div><div class='add'>+#define IEEE80211_EHT_MCS_NSS_TX 0xf0</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_eht_mcs_nss_supp_20mhz_only - EHT 20MHz only station max</div><div class='add'>+ * supported NSS for per MCS.</div><div class='add'>+ *</div><div class='add'>+ * For each field below, bits 0 - 3 indicate the maximal number of spatial</div><div class='add'>+ * streams for Rx, and bits 4 - 7 indicate the maximal number of spatial streams</div><div class='add'>+ * for Tx.</div><div class='add'>+ *</div><div class='add'>+ * @rx_tx_mcs7_max_nss: indicates the maximum number of spatial streams</div><div class='add'>+ *     supported for reception and the maximum number of spatial streams</div><div class='add'>+ *     supported for transmission for MCS 0 - 7.</div><div class='add'>+ * @rx_tx_mcs9_max_nss: indicates the maximum number of spatial streams</div><div class='add'>+ *     supported for reception and the maximum number of spatial streams</div><div class='add'>+ *     supported for transmission for MCS 8 - 9.</div><div class='add'>+ * @rx_tx_mcs11_max_nss: indicates the maximum number of spatial streams</div><div class='add'>+ *     supported for reception and the maximum number of spatial streams</div><div class='add'>+ *     supported for transmission for MCS 10 - 11.</div><div class='add'>+ * @rx_tx_mcs13_max_nss: indicates the maximum number of spatial streams</div><div class='add'>+ *     supported for reception and the maximum number of spatial streams</div><div class='add'>+ *     supported for transmission for MCS 12 - 13.</div><div class='add'>+ * @rx_tx_max_nss: array of the previous fields for easier loop access</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_eht_mcs_nss_supp_20mhz_only {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 rx_tx_mcs7_max_nss;</div><div class='add'>+			u8 rx_tx_mcs9_max_nss;</div><div class='add'>+			u8 rx_tx_mcs11_max_nss;</div><div class='add'>+			u8 rx_tx_mcs13_max_nss;</div><div class='add'>+		};</div><div class='add'>+		u8 rx_tx_max_nss[4];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_eht_mcs_nss_supp_bw - EHT max supported NSS per MCS (except</div><div class='add'>+ * 20MHz only stations).</div><div class='add'>+ *</div><div class='add'>+ * For each field below, bits 0 - 3 indicate the maximal number of spatial</div><div class='add'>+ * streams for Rx, and bits 4 - 7 indicate the maximal number of spatial streams</div><div class='add'>+ * for Tx.</div><div class='add'>+ *</div><div class='add'>+ * @rx_tx_mcs9_max_nss: indicates the maximum number of spatial streams</div><div class='add'>+ *     supported for reception and the maximum number of spatial streams</div><div class='add'>+ *     supported for transmission for MCS 0 - 9.</div><div class='add'>+ * @rx_tx_mcs11_max_nss: indicates the maximum number of spatial streams</div><div class='add'>+ *     supported for reception and the maximum number of spatial streams</div><div class='add'>+ *     supported for transmission for MCS 10 - 11.</div><div class='add'>+ * @rx_tx_mcs13_max_nss: indicates the maximum number of spatial streams</div><div class='add'>+ *     supported for reception and the maximum number of spatial streams</div><div class='add'>+ *     supported for transmission for MCS 12 - 13.</div><div class='add'>+ * @rx_tx_max_nss: array of the previous fields for easier loop access</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_eht_mcs_nss_supp_bw {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 rx_tx_mcs9_max_nss;</div><div class='add'>+			u8 rx_tx_mcs11_max_nss;</div><div class='add'>+			u8 rx_tx_mcs13_max_nss;</div><div class='add'>+		};</div><div class='add'>+		u8 rx_tx_max_nss[3];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_eht_cap_elem_fixed - EHT capabilities fixed data</div><div class='add'>+ *</div><div class='add'>+ * This structure is the "EHT Capabilities element" fixed fields as</div><div class='add'>+ * described in P802.11be_D2.0 section 9.4.2.313.</div><div class='add'>+ *</div><div class='add'>+ * @mac_cap_info: MAC capabilities, see IEEE80211_EHT_MAC_CAP*</div><div class='add'>+ * @phy_cap_info: PHY capabilities, see IEEE80211_EHT_PHY_CAP*</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_eht_cap_elem_fixed {</div><div class='add'>+	u8 mac_cap_info[2];</div><div class='add'>+	u8 phy_cap_info[9];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_eht_cap_elem - EHT capabilities element</div><div class='add'>+ * @fixed: fixed parts, see &amp;ieee80211_eht_cap_elem_fixed</div><div class='add'>+ * @optional: optional parts</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_eht_cap_elem {</div><div class='add'>+	struct ieee80211_eht_cap_elem_fixed fixed;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Followed by:</div><div class='add'>+	 * Supported EHT-MCS And NSS Set field: 4, 3, 6 or 9 octets.</div><div class='add'>+	 * EHT PPE Thresholds field: variable length.</div><div class='add'>+	 */</div><div class='add'>+	u8 optional[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_OPER_INFO_PRESENT	                        0x01</div><div class='add'>+#define IEEE80211_EHT_OPER_DISABLED_SUBCHANNEL_BITMAP_PRESENT	0x02</div><div class='add'>+#define IEEE80211_EHT_OPER_EHT_DEF_PE_DURATION	                0x04</div><div class='add'>+#define IEEE80211_EHT_OPER_GROUP_ADDRESSED_BU_IND_LIMIT         0x08</div><div class='add'>+#define IEEE80211_EHT_OPER_GROUP_ADDRESSED_BU_IND_EXP_MASK      0x30</div><div class='add'>+#define IEEE80211_EHT_OPER_MCS15_DISABLE                        0x40</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_eht_operation - eht operation element</div><div class='add'>+ *</div><div class='add'>+ * This structure is the "EHT Operation Element" fields as</div><div class='add'>+ * described in P802.11be_D2.0 section 9.4.2.311</div><div class='add'>+ *</div><div class='add'>+ * @params: EHT operation element parameters. See &amp;IEEE80211_EHT_OPER_*</div><div class='add'>+ * @basic_mcs_nss: indicates the EHT-MCSs for each number of spatial streams in</div><div class='add'>+ *     EHT PPDUs that are supported by all EHT STAs in the BSS in transmit and</div><div class='add'>+ *     receive.</div><div class='add'>+ * @optional: optional parts</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_eht_operation {</div><div class='add'>+	u8 params;</div><div class='add'>+	struct ieee80211_eht_mcs_nss_supp_20mhz_only basic_mcs_nss;</div><div class='add'>+	u8 optional[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_eht_operation_info - eht operation information</div><div class='add'>+ *</div><div class='add'>+ * @control: EHT operation information control.</div><div class='add'>+ * @ccfs0: defines a channel center frequency for a 20, 40, 80, 160, or 320 MHz</div><div class='add'>+ *     EHT BSS.</div><div class='add'>+ * @ccfs1: defines a channel center frequency for a 160 or 320 MHz EHT BSS.</div><div class='add'>+ * @optional: optional parts</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_eht_operation_info {</div><div class='add'>+	u8 control;</div><div class='add'>+	u8 ccfs0;</div><div class='add'>+	u8 ccfs1;</div><div class='add'>+	u8 optional[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* EHT MAC capabilities as defined in P802.11be_D2.0 section 9.4.2.313.2 */</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS			0x01</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP0_OM_CONTROL			0x02</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1		0x04</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE2		0x08</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP0_RESTRICTED_TWT			0x10</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP0_SCS_TRAFFIC_DESC			0x20</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK		0xc0</div><div class='add'>+#define	IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_3895	        0</div><div class='add'>+#define	IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_7991	        1</div><div class='add'>+#define	IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454	        2</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP1_MAX_AMPDU_LEN_MASK		0x01</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP1_EHT_TRS				0x02</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP1_TXOP_RET				0x04</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP1_TWO_BQRS				0x08</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP1_EHT_LINK_ADAPT_MASK		0x30</div><div class='add'>+#define IEEE80211_EHT_MAC_CAP1_UNSOL_EPCS_PRIO_ACCESS		0x40</div><div class='add'>+</div><div class='add'>+/* EHT PHY capabilities as defined in P802.11be_D2.0 section 9.4.2.313.3 */</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ			0x02</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ		0x04</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI		0x08</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO		0x10</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER			0x20</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE			0x40</div><div class='add'>+</div><div class='add'>+/* EHT beamformee number of spatial streams &lt;= 80MHz is split */</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK		0x80</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK		0x03</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK	0x1c</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK	0xe0</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK		0x07</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK		0x38</div><div class='add'>+</div><div class='add'>+/* EHT number of sounding dimensions for 320MHz is split */</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK		0xc0</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP3_SOUNDING_DIM_320MHZ_MASK		0x01</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK		0x02</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK		0x04</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK		0x08</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK		0x10</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK			0x20</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK		0x40</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK			0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO		0x01</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP4_PSR_SR_SUPP			0x02</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP		0x04</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI	0x08</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK			0xf0</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK		0x01</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP		0x02</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP		0x04</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT		0x08</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK	0x30</div><div class='add'>+#define   IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_0US	0</div><div class='add'>+#define   IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US	1</div><div class='add'>+#define   IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US	2</div><div class='add'>+#define   IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_20US	3</div><div class='add'>+</div><div class='add'>+/* Maximum number of supported EHT LTF is split */</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK	0xc0</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF		0x40</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK	0x07</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_80MHZ			0x08</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_160MHZ		0x30</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_320MHZ		0x40</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK			0x78</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP		0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP7_20MHZ_STA_RX_NDP_WIDER_BW	0x01</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ	0x02</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ	0x04</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ	0x08</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ		0x10</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ		0x20</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ		0x40</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP7_TB_SOUNDING_FDBK_RATE_LIMIT	0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP8_RX_1024QAM_WIDER_BW_DL_OFDMA	0x01</div><div class='add'>+#define IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA	0x02</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EHT operation channel width as defined in P802.11be_D2.0 section 9.4.2.311</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_EHT_OPER_CHAN_WIDTH		0x7</div><div class='add'>+#define IEEE80211_EHT_OPER_CHAN_WIDTH_20MHZ	0</div><div class='add'>+#define IEEE80211_EHT_OPER_CHAN_WIDTH_40MHZ	1</div><div class='add'>+#define IEEE80211_EHT_OPER_CHAN_WIDTH_80MHZ	2</div><div class='add'>+#define IEEE80211_EHT_OPER_CHAN_WIDTH_160MHZ	3</div><div class='add'>+#define IEEE80211_EHT_OPER_CHAN_WIDTH_320MHZ	4</div><div class='add'>+</div><div class='add'>+/* Calculate 802.11be EHT capabilities IE Tx/Rx EHT MCS NSS Support Field size */</div><div class='add'>+static inline u8</div><div class='add'>+ieee80211_eht_mcs_nss_size(const struct ieee80211_he_cap_elem *he_cap,</div><div class='add'>+			   const struct ieee80211_eht_cap_elem_fixed *eht_cap,</div><div class='add'>+			   bool from_ap)</div><div class='add'>+{</div><div class='add'>+	u8 count = 0;</div><div class='add'>+</div><div class='add'>+	/* on 2.4 GHz, if it supports 40 MHz, the result is 3 */</div><div class='add'>+	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G)</div><div class='add'>+		return 3;</div><div class='add'>+</div><div class='add'>+	/* on 2.4 GHz, these three bits are reserved, so should be 0 */</div><div class='add'>+	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G)</div><div class='add'>+		count += 3;</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='add'>+		count += 3;</div><div class='add'>+</div><div class='add'>+	if (eht_cap-&gt;phy_cap_info[0] &amp; IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ)</div><div class='add'>+		count += 3;</div><div class='add'>+</div><div class='add'>+	if (count)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	return from_ap ? 3 : 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* 802.11be EHT PPE Thresholds */</div><div class='add'>+#define IEEE80211_EHT_PPE_THRES_NSS_POS			0</div><div class='add'>+#define IEEE80211_EHT_PPE_THRES_NSS_MASK		0xf</div><div class='add'>+#define IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK	0x1f0</div><div class='add'>+#define IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE		3</div><div class='add'>+#define IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE	9</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate 802.11be EHT capabilities IE EHT field size</div><div class='add'>+ */</div><div class='add'>+static inline u8</div><div class='add'>+ieee80211_eht_ppe_size(u16 ppe_thres_hdr, const u8 *phy_cap_info)</div><div class='add'>+{</div><div class='add'>+	u32 n;</div><div class='add'>+</div><div class='add'>+	if (!(phy_cap_info[5] &amp;</div><div class='add'>+	      IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	n = hweight16(ppe_thres_hdr &amp;</div><div class='add'>+		      IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+	n *= 1 + u16_get_bits(ppe_thres_hdr, IEEE80211_EHT_PPE_THRES_NSS_MASK);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Each pair is 6 bits, and we need to add the 9 "header" bits to the</div><div class='add'>+	 * total size.</div><div class='add'>+	 */</div><div class='add'>+	n = n * IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE * 2 +</div><div class='add'>+	    IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE;</div><div class='add'>+	return DIV_ROUND_UP(n, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ieee80211_eht_capa_size_ok(const u8 *he_capa, const u8 *data, u8 len,</div><div class='add'>+			   bool from_ap)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_eht_cap_elem_fixed *elem = (const void *)data;</div><div class='add'>+	u8 needed = sizeof(struct ieee80211_eht_cap_elem_fixed);</div><div class='add'>+</div><div class='add'>+	if (len &lt; needed || !he_capa)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	needed += ieee80211_eht_mcs_nss_size((const void *)he_capa,</div><div class='add'>+					     (const void *)data,</div><div class='add'>+					     from_ap);</div><div class='add'>+	if (len &lt; needed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (elem-&gt;phy_cap_info[5] &amp;</div><div class='add'>+			IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+		u16 ppe_thres_hdr;</div><div class='add'>+</div><div class='add'>+		if (len &lt; needed + sizeof(ppe_thres_hdr))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		ppe_thres_hdr = get_unaligned_le16(data + needed);</div><div class='add'>+		needed += ieee80211_eht_ppe_size(ppe_thres_hdr,</div><div class='add'>+						 elem-&gt;phy_cap_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len &gt;= needed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ieee80211_eht_oper_size_ok(const u8 *data, u8 len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_eht_operation *elem = (const void *)data;</div><div class='add'>+	u8 needed = sizeof(*elem);</div><div class='add'>+</div><div class='add'>+	if (len &lt; needed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (elem-&gt;params &amp; IEEE80211_EHT_OPER_INFO_PRESENT) {</div><div class='add'>+		needed += 3;</div><div class='add'>+</div><div class='add'>+		if (elem-&gt;params &amp;</div><div class='add'>+		    IEEE80211_EHT_OPER_DISABLED_SUBCHANNEL_BITMAP_PRESENT)</div><div class='add'>+			needed += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len &gt;= needed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* must validate ieee80211_eht_oper_size_ok() first */</div><div class='add'>+static inline u16</div><div class='add'>+ieee80211_eht_oper_dis_subchan_bitmap(const struct ieee80211_eht_operation *eht_oper)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_eht_operation_info *info =</div><div class='add'>+		(const void *)eht_oper-&gt;optional;</div><div class='add'>+</div><div class='add'>+	if (!(eht_oper-&gt;params &amp; IEEE80211_EHT_OPER_INFO_PRESENT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(eht_oper-&gt;params &amp; IEEE80211_EHT_OPER_DISABLED_SUBCHANNEL_BITMAP_PRESENT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return get_unaligned_le16(info-&gt;optional);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IEEE80211_BW_IND_DIS_SUBCH_PRESENT	BIT(1)</div><div class='add'>+</div><div class='add'>+struct ieee80211_bandwidth_indication {</div><div class='add'>+	u8 params;</div><div class='add'>+	struct ieee80211_eht_operation_info info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+ieee80211_bandwidth_indication_size_ok(const u8 *data, u8 len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_bandwidth_indication *bwi = (const void *)data;</div><div class='add'>+</div><div class='add'>+	if (len &lt; sizeof(*bwi))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (bwi-&gt;params &amp; IEEE80211_BW_IND_DIS_SUBCH_PRESENT &amp;&amp;</div><div class='add'>+	    len &lt; sizeof(*bwi) + 2)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Protected EHT action codes */</div><div class='add'>+enum ieee80211_protected_eht_actioncode {</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_TTLM_REQ = 0,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_TTLM_RES = 1,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_TTLM_TEARDOWN = 2,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_REQ = 3,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_RESP = 4,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_TEARDOWN = 5,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_EML_OP_MODE_NOTIF = 6,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_LINK_RECOMMEND = 7,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_ML_OP_UPDATE_REQ = 8,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_ML_OP_UPDATE_RESP = 9,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_NOTIF = 10,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_REQ = 11,</div><div class='add'>+	WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_RESP = 12,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* multi-link device */</div><div class='add'>+#define IEEE80211_MLD_MAX_NUM_LINKS	15</div><div class='add'>+</div><div class='add'>+#define IEEE80211_ML_CONTROL_TYPE			0x0007</div><div class='add'>+#define IEEE80211_ML_CONTROL_TYPE_BASIC			0</div><div class='add'>+#define IEEE80211_ML_CONTROL_TYPE_PREQ			1</div><div class='add'>+#define IEEE80211_ML_CONTROL_TYPE_RECONF		2</div><div class='add'>+#define IEEE80211_ML_CONTROL_TYPE_TDLS			3</div><div class='add'>+#define IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS		4</div><div class='add'>+#define IEEE80211_ML_CONTROL_PRESENCE_MASK		0xfff0</div><div class='add'>+</div><div class='add'>+struct ieee80211_multi_link_elem {</div><div class='add'>+	__le16 control;</div><div class='add'>+	u8 variable[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MLC_BASIC_PRES_LINK_ID		0x0010</div><div class='add'>+#define IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT	0x0020</div><div class='add'>+#define IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY		0x0040</div><div class='add'>+#define IEEE80211_MLC_BASIC_PRES_EML_CAPA		0x0080</div><div class='add'>+#define IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP		0x0100</div><div class='add'>+#define IEEE80211_MLC_BASIC_PRES_MLD_ID			0x0200</div><div class='add'>+#define IEEE80211_MLC_BASIC_PRES_EXT_MLD_CAPA_OP	0x0400</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MED_SYNC_DELAY_DURATION		0x00ff</div><div class='add'>+#define IEEE80211_MED_SYNC_DELAY_SYNC_OFDM_ED_THRESH	0x0f00</div><div class='add'>+#define IEEE80211_MED_SYNC_DELAY_SYNC_MAX_NUM_TXOPS	0xf000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Described in P802.11be_D3.0</div><div class='add'>+ * dot11MSDTimerDuration should default to 5484 (i.e. 171.375)</div><div class='add'>+ * dot11MSDOFDMEDthreshold defaults to -72 (i.e. 0)</div><div class='add'>+ * dot11MSDTXOPMAX defaults to 1</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_MED_SYNC_DELAY_DEFAULT		0x10ac</div><div class='add'>+</div><div class='add'>+#define IEEE80211_EML_CAP_EMLSR_SUPP			0x0001</div><div class='add'>+#define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY		0x000e</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_0US		0</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_32US		1</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_64US		2</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_128US		3</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_256US		4</div><div class='add'>+#define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY	0x0070</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_0US		0</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_16US		1</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_32US		2</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_64US		3</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_128US		4</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_256US		5</div><div class='add'>+#define IEEE80211_EML_CAP_EMLMR_SUPPORT			0x0080</div><div class='add'>+#define IEEE80211_EML_CAP_EMLMR_DELAY			0x0700</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLMR_DELAY_0US			0</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLMR_DELAY_32US			1</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLMR_DELAY_64US			2</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLMR_DELAY_128US			3</div><div class='add'>+#define  IEEE80211_EML_CAP_EMLMR_DELAY_256US			4</div><div class='add'>+#define IEEE80211_EML_CAP_TRANSITION_TIMEOUT		0x7800</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_0			0</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128US		1</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_256US		2</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_512US		3</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_1TU		4</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_2TU		5</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_4TU		6</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_8TU		7</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_16TU		8</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_32TU		9</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_64TU		10</div><div class='add'>+#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU		11</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_MAX_SIMUL_LINKS		0x000f</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_SRS_SUPPORT		0x0010</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP	0x0060</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_NO_SUPP	0</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_SAME	1</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_RESERVED	2</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_DIFF	3</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_FREQ_SEP_TYPE_IND		0x0f80</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_AAR_SUPPORT		0x1000</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_LINK_RECONF_SUPPORT	0x2000</div><div class='add'>+#define IEEE80211_MLD_CAP_OP_ALIGNED_TWT_SUPPORT	0x4000</div><div class='add'>+</div><div class='add'>+struct ieee80211_mle_basic_common_info {</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 mld_mac_addr[ETH_ALEN];</div><div class='add'>+	u8 variable[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MLC_PREQ_PRES_MLD_ID			0x0010</div><div class='add'>+</div><div class='add'>+struct ieee80211_mle_preq_common_info {</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 variable[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR		0x0010</div><div class='add'>+#define IEEE80211_MLC_RECONF_PRES_EML_CAPA		0x0020</div><div class='add'>+#define IEEE80211_MLC_RECONF_PRES_MLD_CAPA_OP		0x0040</div><div class='add'>+#define IEEE80211_MLC_RECONF_PRES_EXT_MLD_CAPA_OP	0x0080</div><div class='add'>+</div><div class='add'>+/* no fixed fields in RECONF */</div><div class='add'>+</div><div class='add'>+struct ieee80211_mle_tdls_common_info {</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 ap_mld_mac_addr[ETH_ALEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MLC_PRIO_ACCESS_PRES_AP_MLD_MAC_ADDR	0x0010</div><div class='add'>+</div><div class='add'>+/* no fixed fields in PRIO_ACCESS */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_common_size - check multi-link element common size</div><div class='add'>+ * @data: multi-link element, must already be checked for size using</div><div class='add'>+ *	ieee80211_mle_size_ok()</div><div class='add'>+ * Return: the size of the multi-link element's "common" subfield </div><div class='add'>+ */</div><div class='add'>+static inline u8 ieee80211_mle_common_size(const u8 *data)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+</div><div class='add'>+	switch (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE)) {</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_BASIC:</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_PREQ:</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_TDLS:</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_RECONF:</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS:</div><div class='add'>+		/*</div><div class='add'>+		 * The length is the first octet pointed by mle-&gt;variable so no</div><div class='add'>+		 * need to add anything</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sizeof(*mle) + mle-&gt;variable[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_get_link_id - returns the link ID</div><div class='add'>+ * @data: the basic multi link element</div><div class='add'>+ * Return: the link ID, or -1 if not present</div><div class='add'>+ *</div><div class='add'>+ * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='add'>+ * this must be checked using ieee80211_mle_type_ok().</div><div class='add'>+ */</div><div class='add'>+static inline int ieee80211_mle_get_link_id(const u8 *data)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+	const u8 *common = mle-&gt;variable;</div><div class='add'>+</div><div class='add'>+	/* common points now at the beginning of ieee80211_mle_basic_common_info */</div><div class='add'>+	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return *common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_get_bss_param_ch_cnt - returns the BSS parameter change count</div><div class='add'>+ * @data: pointer to the basic multi link element</div><div class='add'>+ * Return: the BSS Parameter Change Count field value, or -1 if not present</div><div class='add'>+ *</div><div class='add'>+ * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='add'>+ * this must be checked using ieee80211_mle_type_ok().</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+ieee80211_mle_get_bss_param_ch_cnt(const u8 *data)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+	const u8 *common = mle-&gt;variable;</div><div class='add'>+</div><div class='add'>+	/* common points now at the beginning of ieee80211_mle_basic_common_info */</div><div class='add'>+	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='add'>+		common += 1;</div><div class='add'>+</div><div class='add'>+	return *common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_get_eml_med_sync_delay - returns the medium sync delay</div><div class='add'>+ * @data: pointer to the multi-link element</div><div class='add'>+ * Return: the medium synchronization delay field value from the multi-link</div><div class='add'>+ *	element, or the default value (%IEEE80211_MED_SYNC_DELAY_DEFAULT)</div><div class='add'>+ *	if not present</div><div class='add'>+ *</div><div class='add'>+ * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='add'>+ * this must be checked using ieee80211_mle_type_ok().</div><div class='add'>+ */</div><div class='add'>+static inline u16 ieee80211_mle_get_eml_med_sync_delay(const u8 *data)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+	const u8 *common = mle-&gt;variable;</div><div class='add'>+</div><div class='add'>+	/* common points now at the beginning of ieee80211_mle_basic_common_info */</div><div class='add'>+	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY))</div><div class='add'>+		return IEEE80211_MED_SYNC_DELAY_DEFAULT;</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='add'>+		common += 1;</div><div class='add'>+</div><div class='add'>+	return get_unaligned_le16(common);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_get_eml_cap - returns the EML capability</div><div class='add'>+ * @data: pointer to the multi-link element</div><div class='add'>+ * Return: the EML capability field value from the multi-link element,</div><div class='add'>+ *	or 0 if not present</div><div class='add'>+ *</div><div class='add'>+ * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='add'>+ * this must be checked using ieee80211_mle_type_ok().</div><div class='add'>+ */</div><div class='add'>+static inline u16 ieee80211_mle_get_eml_cap(const u8 *data)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+	const u8 *common = mle-&gt;variable;</div><div class='add'>+</div><div class='add'>+	/* common points now at the beginning of ieee80211_mle_basic_common_info */</div><div class='add'>+	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='add'>+		common += 2;</div><div class='add'>+</div><div class='add'>+	return get_unaligned_le16(common);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_get_mld_capa_op - returns the MLD capabilities and operations.</div><div class='add'>+ * @data: pointer to the multi-link element</div><div class='add'>+ * Return: the MLD capabilities and operations field value from the multi-link</div><div class='add'>+ *	element, or 0 if not present</div><div class='add'>+ *</div><div class='add'>+ * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='add'>+ * this must be checked using ieee80211_mle_type_ok().</div><div class='add'>+ */</div><div class='add'>+static inline u16 ieee80211_mle_get_mld_capa_op(const u8 *data)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+	const u8 *common = mle-&gt;variable;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * common points now at the beginning of</div><div class='add'>+	 * ieee80211_mle_basic_common_info</div><div class='add'>+	 */</div><div class='add'>+	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='add'>+		common += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA)</div><div class='add'>+		common += 2;</div><div class='add'>+</div><div class='add'>+	return get_unaligned_le16(common);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Defined in Figure 9-1074t in P802.11be_D7.0 */</div><div class='add'>+#define IEEE80211_EHT_ML_EXT_MLD_CAPA_OP_PARAM_UPDATE           0x0001</div><div class='add'>+#define IEEE80211_EHT_ML_EXT_MLD_CAPA_OP_RECO_MAX_LINKS_MASK    0x001e</div><div class='add'>+#define IEEE80211_EHT_ML_EXT_MLD_CAPA_NSTR_UPDATE               0x0020</div><div class='add'>+#define IEEE80211_EHT_ML_EXT_MLD_CAPA_EMLSR_ENA_ON_ONE_LINK     0x0040</div><div class='add'>+#define IEEE80211_EHT_ML_EXT_MLD_CAPA_BTM_MLD_RECO_MULTI_AP     0x0080</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_get_ext_mld_capa_op - returns the extended MLD capabilities</div><div class='add'>+ *	and operations.</div><div class='add'>+ * @data: pointer to the multi-link element</div><div class='add'>+ * Return: the extended MLD capabilities and operations field value from</div><div class='add'>+ *	the multi-link element, or 0 if not present</div><div class='add'>+ *</div><div class='add'>+ * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='add'>+ * this must be checked using ieee80211_mle_type_ok().</div><div class='add'>+ */</div><div class='add'>+static inline u16 ieee80211_mle_get_ext_mld_capa_op(const u8 *data)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+	const u8 *common = mle-&gt;variable;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * common points now at the beginning of</div><div class='add'>+	 * ieee80211_mle_basic_common_info</div><div class='add'>+	 */</div><div class='add'>+	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_EXT_MLD_CAPA_OP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='add'>+		common += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA)</div><div class='add'>+		common += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP)</div><div class='add'>+		common += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_MLD_ID)</div><div class='add'>+		common += 1;</div><div class='add'>+</div><div class='add'>+	return get_unaligned_le16(common);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_get_mld_id - returns the MLD ID</div><div class='add'>+ * @data: pointer to the multi-link element</div><div class='add'>+ * Return: The MLD ID in the given multi-link element, or 0 if not present</div><div class='add'>+ *</div><div class='add'>+ * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='add'>+ * this must be checked using ieee80211_mle_type_ok().</div><div class='add'>+ */</div><div class='add'>+static inline u8 ieee80211_mle_get_mld_id(const u8 *data)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+	const u8 *common = mle-&gt;variable;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * common points now at the beginning of</div><div class='add'>+	 * ieee80211_mle_basic_common_info</div><div class='add'>+	 */</div><div class='add'>+	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_MLD_ID))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='add'>+		common += 1;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='add'>+		common += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA)</div><div class='add'>+		common += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP)</div><div class='add'>+		common += 2;</div><div class='add'>+</div><div class='add'>+	return *common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_size_ok - validate multi-link element size</div><div class='add'>+ * @data: pointer to the element data</div><div class='add'>+ * @len: length of the containing element</div><div class='add'>+ * Return: whether or not the multi-link element size is OK</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_mle_size_ok(const u8 *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u8 fixed = sizeof(*mle);</div><div class='add'>+	u8 common = 0;</div><div class='add'>+	bool check_common_len = false;</div><div class='add'>+	u16 control;</div><div class='add'>+</div><div class='add'>+	if (!data || len &lt; fixed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+</div><div class='add'>+	switch (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE)) {</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_BASIC:</div><div class='add'>+		common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='add'>+		check_common_len = true;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='add'>+			common += 1;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='add'>+			common += 1;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='add'>+			common += 2;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA)</div><div class='add'>+			common += 2;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP)</div><div class='add'>+			common += 2;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_BASIC_PRES_MLD_ID)</div><div class='add'>+			common += 1;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_BASIC_PRES_EXT_MLD_CAPA_OP)</div><div class='add'>+			common += 2;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_PREQ:</div><div class='add'>+		common += sizeof(struct ieee80211_mle_preq_common_info);</div><div class='add'>+		if (control &amp; IEEE80211_MLC_PREQ_PRES_MLD_ID)</div><div class='add'>+			common += 1;</div><div class='add'>+		check_common_len = true;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_RECONF:</div><div class='add'>+		if (control &amp; IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR)</div><div class='add'>+			common += ETH_ALEN;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_RECONF_PRES_EML_CAPA)</div><div class='add'>+			common += 2;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_RECONF_PRES_MLD_CAPA_OP)</div><div class='add'>+			common += 2;</div><div class='add'>+		if (control &amp; IEEE80211_MLC_RECONF_PRES_EXT_MLD_CAPA_OP)</div><div class='add'>+			common += 2;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_TDLS:</div><div class='add'>+		common += sizeof(struct ieee80211_mle_tdls_common_info);</div><div class='add'>+		check_common_len = true;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS:</div><div class='add'>+		common = ETH_ALEN + 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* we don't know this type */</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len &lt; fixed + common)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!check_common_len)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* if present, common length is the first octet there */</div><div class='add'>+	return mle-&gt;variable[0] &gt;= common;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_type_ok - validate multi-link element type and size</div><div class='add'>+ * @data: pointer to the element data</div><div class='add'>+ * @type: expected type of the element</div><div class='add'>+ * @len: length of the containing element</div><div class='add'>+ * Return: whether or not the multi-link element type matches and size is OK</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_mle_type_ok(const u8 *data, u8 type, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='add'>+	u16 control;</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_mle_size_ok(data, len))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	control = le16_to_cpu(mle-&gt;control);</div><div class='add'>+</div><div class='add'>+	if (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE) == type)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum ieee80211_mle_subelems {</div><div class='add'>+	IEEE80211_MLE_SUBELEM_PER_STA_PROFILE		= 0,</div><div class='add'>+	IEEE80211_MLE_SUBELEM_FRAGMENT		        = 254,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_LINK_ID			0x000f</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE		0x0010</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT		0x0020</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT		0x0040</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT		0x0080</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT		0x0100</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_NSTR_LINK_PAIR_PRESENT	0x0200</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE		0x0400</div><div class='add'>+#define IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT	0x0800</div><div class='add'>+</div><div class='add'>+struct ieee80211_mle_per_sta_profile {</div><div class='add'>+	__le16 control;</div><div class='add'>+	u8 sta_info_len;</div><div class='add'>+	u8 variable[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_basic_sta_prof_size_ok - validate basic multi-link element sta</div><div class='add'>+ *	profile size</div><div class='add'>+ * @data: pointer to the sub element data</div><div class='add'>+ * @len: length of the containing sub element</div><div class='add'>+ * Return: %true if the STA profile is large enough, %false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_mle_basic_sta_prof_size_ok(const u8 *data,</div><div class='add'>+							size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_mle_per_sta_profile *prof = (const void *)data;</div><div class='add'>+	u16 control;</div><div class='add'>+	u8 fixed = sizeof(*prof);</div><div class='add'>+	u8 info_len = 1;</div><div class='add'>+</div><div class='add'>+	if (len &lt; fixed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	control = le16_to_cpu(prof-&gt;control);</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT)</div><div class='add'>+		info_len += 6;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT)</div><div class='add'>+		info_len += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT)</div><div class='add'>+		info_len += 8;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT)</div><div class='add'>+		info_len += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE &amp;&amp;</div><div class='add'>+	    control &amp; IEEE80211_MLE_STA_CONTROL_NSTR_LINK_PAIR_PRESENT) {</div><div class='add'>+		if (control &amp; IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE)</div><div class='add'>+			info_len += 2;</div><div class='add'>+		else</div><div class='add'>+			info_len += 1;</div><div class='add'>+	}</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT)</div><div class='add'>+		info_len += 1;</div><div class='add'>+</div><div class='add'>+	return prof-&gt;sta_info_len &gt;= info_len &amp;&amp;</div><div class='add'>+	       fixed + prof-&gt;sta_info_len - 1 &lt;= len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_basic_sta_prof_bss_param_ch_cnt - get per-STA profile BSS</div><div class='add'>+ *	parameter change count</div><div class='add'>+ * @prof: the per-STA profile, having been checked with</div><div class='add'>+ *	ieee80211_mle_basic_sta_prof_size_ok() for the correct length</div><div class='add'>+ *</div><div class='add'>+ * Return: The BSS parameter change count value if present, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline u8</div><div class='add'>+ieee80211_mle_basic_sta_prof_bss_param_ch_cnt(const struct ieee80211_mle_per_sta_profile *prof)</div><div class='add'>+{</div><div class='add'>+	u16 control = le16_to_cpu(prof-&gt;control);</div><div class='add'>+	const u8 *pos = prof-&gt;variable;</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT)</div><div class='add'>+		pos += 6;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT)</div><div class='add'>+		pos += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT)</div><div class='add'>+		pos += 8;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT)</div><div class='add'>+		pos += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE &amp;&amp;</div><div class='add'>+	    control &amp; IEEE80211_MLE_STA_CONTROL_NSTR_LINK_PAIR_PRESENT) {</div><div class='add'>+		if (control &amp; IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE)</div><div class='add'>+			pos += 2;</div><div class='add'>+		else</div><div class='add'>+			pos += 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return *pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_LINK_ID			0x000f</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_COMPLETE_PROFILE		0x0010</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT		0x0020</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT		0x0040</div><div class='add'>+#define	IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE                 0x0780</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_AP_REM          0</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_OP_PARAM_UPDATE 1</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_ADD_LINK        2</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_DEL_LINK        3</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_NSTR_STATUS     4</div><div class='add'>+#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT       0x0800</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_mle_reconf_sta_prof_size_ok - validate reconfiguration multi-link</div><div class='add'>+ *	element sta profile size.</div><div class='add'>+ * @data: pointer to the sub element data</div><div class='add'>+ * @len: length of the containing sub element</div><div class='add'>+ * Return: %true if the STA profile is large enough, %false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_mle_reconf_sta_prof_size_ok(const u8 *data,</div><div class='add'>+							 size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_mle_per_sta_profile *prof = (const void *)data;</div><div class='add'>+	u16 control;</div><div class='add'>+	u8 fixed = sizeof(*prof);</div><div class='add'>+	u8 info_len = 1;</div><div class='add'>+</div><div class='add'>+	if (len &lt; fixed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	control = le16_to_cpu(prof-&gt;control);</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT)</div><div class='add'>+		info_len += ETH_ALEN;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT)</div><div class='add'>+		info_len += 2;</div><div class='add'>+	if (control &amp; IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT)</div><div class='add'>+		info_len += 2;</div><div class='add'>+</div><div class='add'>+	return prof-&gt;sta_info_len &gt;= info_len &amp;&amp;</div><div class='add'>+	       fixed + prof-&gt;sta_info_len - 1 &lt;= len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MLE_STA_EPCS_CONTROL_LINK_ID			0x000f</div><div class='add'>+#define IEEE80211_EPCS_ENA_RESP_BODY_LEN                        3</div><div class='add'>+</div><div class='add'>+static inline bool ieee80211_tid_to_link_map_size_ok(const u8 *data, size_t len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_ttlm_elem *t2l = (const void *)data;</div><div class='add'>+	u8 control, fixed = sizeof(*t2l), elem_len = 0;</div><div class='add'>+</div><div class='add'>+	if (len &lt; fixed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	control = t2l-&gt;control;</div><div class='add'>+</div><div class='add'>+	if (control &amp; IEEE80211_TTLM_CONTROL_SWITCH_TIME_PRESENT)</div><div class='add'>+		elem_len += 2;</div><div class='add'>+	if (control &amp; IEEE80211_TTLM_CONTROL_EXPECTED_DUR_PRESENT)</div><div class='add'>+		elem_len += 3;</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; IEEE80211_TTLM_CONTROL_DEF_LINK_MAP)) {</div><div class='add'>+		u8 bm_size;</div><div class='add'>+</div><div class='add'>+		elem_len += 1;</div><div class='add'>+		if (len &lt; fixed + elem_len)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (control &amp; IEEE80211_TTLM_CONTROL_LINK_MAP_SIZE)</div><div class='add'>+			bm_size = 1;</div><div class='add'>+		else</div><div class='add'>+			bm_size = 2;</div><div class='add'>+</div><div class='add'>+		elem_len += hweight8(t2l-&gt;optional[0]) * bm_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len &gt;= fixed + elem_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_emlsr_pad_delay_in_us - Fetch the EMLSR Padding delay</div><div class='add'>+ *	in microseconds</div><div class='add'>+ * @eml_cap: EML capabilities field value from common info field of</div><div class='add'>+ *	the Multi-link element</div><div class='add'>+ * Return: the EMLSR Padding delay (in microseconds) encoded in the</div><div class='add'>+ *	EML Capabilities field</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u32 ieee80211_emlsr_pad_delay_in_us(u16 eml_cap)</div><div class='add'>+{</div><div class='add'>+	/* IEEE Std 802.11be-2024 Table 9-417i—Encoding of the EMLSR</div><div class='add'>+	 * Padding Delay subfield.</div><div class='add'>+	 */</div><div class='add'>+	u32 pad_delay = u16_get_bits(eml_cap,</div><div class='add'>+				     IEEE80211_EML_CAP_EMLSR_PADDING_DELAY);</div><div class='add'>+</div><div class='add'>+	if (!pad_delay ||</div><div class='add'>+	    pad_delay &gt; IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_256US)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 32 * (1 &lt;&lt; (pad_delay - 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_emlsr_trans_delay_in_us - Fetch the EMLSR Transition</div><div class='add'>+ *	delay in microseconds</div><div class='add'>+ * @eml_cap: EML capabilities field value from common info field of</div><div class='add'>+ *	the Multi-link element</div><div class='add'>+ * Return: the EMLSR Transition delay (in microseconds) encoded in the</div><div class='add'>+ *	EML Capabilities field</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u32 ieee80211_emlsr_trans_delay_in_us(u16 eml_cap)</div><div class='add'>+{</div><div class='add'>+	/* IEEE Std 802.11be-2024 Table 9-417j—Encoding of the EMLSR</div><div class='add'>+	 * Transition Delay subfield.</div><div class='add'>+	 */</div><div class='add'>+	u32 trans_delay =</div><div class='add'>+		u16_get_bits(eml_cap,</div><div class='add'>+			     IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY);</div><div class='add'>+</div><div class='add'>+	/* invalid values also just use 0 */</div><div class='add'>+	if (!trans_delay ||</div><div class='add'>+	    trans_delay &gt; IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_256US)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 16 * (1 &lt;&lt; (trans_delay - 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_eml_trans_timeout_in_us - Fetch the EMLSR Transition</div><div class='add'>+ *	timeout value in microseconds</div><div class='add'>+ * @eml_cap: EML capabilities field value from common info field of</div><div class='add'>+ *	the Multi-link element</div><div class='add'>+ * Return: the EMLSR Transition timeout (in microseconds) encoded in</div><div class='add'>+ *	the EML Capabilities field</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u32 ieee80211_eml_trans_timeout_in_us(u16 eml_cap)</div><div class='add'>+{</div><div class='add'>+	/* IEEE Std 802.11be-2024 Table 9-417m—Encoding of the</div><div class='add'>+	 * Transition Timeout subfield.</div><div class='add'>+	 */</div><div class='add'>+	u8 timeout = u16_get_bits(eml_cap,</div><div class='add'>+				  IEEE80211_EML_CAP_TRANSITION_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	/* invalid values also just use 0 */</div><div class='add'>+	if (!timeout || timeout &gt; IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 128 * (1 &lt;&lt; (timeout - 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define for_each_mle_subelement(_elem, _data, _len)			\</div><div class='add'>+	if (ieee80211_mle_size_ok(_data, _len))				\</div><div class='add'>+		for_each_element(_elem,					\</div><div class='add'>+				 _data + ieee80211_mle_common_size(_data),\</div><div class='add'>+				 _len - ieee80211_mle_common_size(_data))</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_IEEE80211_H */</div><div class='head'>diff --git a/include/linux/ieee80211-he.h b/include/linux/ieee80211-he.h<br/>new file mode 100644<br/>index 000000000000..a08c446fbb04<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211-he.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211-he.h</a></div><div class='hunk'>@@ -0,0 +1,825 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * IEEE 802.11 HE definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='add'>+ * &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2005, Devicescape Software, Inc.</div><div class='add'>+ * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_IEEE80211_HE_H</div><div class='add'>+#define LINUX_IEEE80211_HE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_TWT_CONTROL_NDP			BIT(0)</div><div class='add'>+#define IEEE80211_TWT_CONTROL_RESP_MODE			BIT(1)</div><div class='add'>+#define IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST	BIT(3)</div><div class='add'>+#define IEEE80211_TWT_CONTROL_RX_DISABLED		BIT(4)</div><div class='add'>+#define IEEE80211_TWT_CONTROL_WAKE_DUR_UNIT		BIT(5)</div><div class='add'>+</div><div class='add'>+#define IEEE80211_TWT_REQTYPE_REQUEST			BIT(0)</div><div class='add'>+#define IEEE80211_TWT_REQTYPE_SETUP_CMD			GENMASK(3, 1)</div><div class='add'>+#define IEEE80211_TWT_REQTYPE_TRIGGER			BIT(4)</div><div class='add'>+#define IEEE80211_TWT_REQTYPE_IMPLICIT			BIT(5)</div><div class='add'>+#define IEEE80211_TWT_REQTYPE_FLOWTYPE			BIT(6)</div><div class='add'>+#define IEEE80211_TWT_REQTYPE_FLOWID			GENMASK(9, 7)</div><div class='add'>+#define IEEE80211_TWT_REQTYPE_WAKE_INT_EXP		GENMASK(14, 10)</div><div class='add'>+#define IEEE80211_TWT_REQTYPE_PROTECTION		BIT(15)</div><div class='add'>+</div><div class='add'>+enum ieee80211_twt_setup_cmd {</div><div class='add'>+	TWT_SETUP_CMD_REQUEST,</div><div class='add'>+	TWT_SETUP_CMD_SUGGEST,</div><div class='add'>+	TWT_SETUP_CMD_DEMAND,</div><div class='add'>+	TWT_SETUP_CMD_GROUPING,</div><div class='add'>+	TWT_SETUP_CMD_ACCEPT,</div><div class='add'>+	TWT_SETUP_CMD_ALTERNATE,</div><div class='add'>+	TWT_SETUP_CMD_DICTATE,</div><div class='add'>+	TWT_SETUP_CMD_REJECT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ieee80211_twt_params {</div><div class='add'>+	__le16 req_type;</div><div class='add'>+	__le64 twt;</div><div class='add'>+	u8 min_twt_dur;</div><div class='add'>+	__le16 mantissa;</div><div class='add'>+	u8 channel;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ieee80211_twt_setup {</div><div class='add'>+	u8 dialog_token;</div><div class='add'>+	u8 element_id;</div><div class='add'>+	u8 length;</div><div class='add'>+	u8 control;</div><div class='add'>+	u8 params[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_he_cap_elem - HE capabilities element</div><div class='add'>+ * @mac_cap_info: HE MAC Capabilities Information</div><div class='add'>+ * @phy_cap_info: HE PHY Capabilities Information</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the fixed fields of the payload of the</div><div class='add'>+ * "HE capabilities element" as described in IEEE Std 802.11ax-2021</div><div class='add'>+ * sections 9.4.2.248.2 and 9.4.2.248.3.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_he_cap_elem {</div><div class='add'>+	u8 mac_cap_info[6];</div><div class='add'>+	u8 phy_cap_info[11];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_TX_RX_MCS_NSS_DESC_MAX_LEN	5</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_he_mcs_support - HE MCS support definitions</div><div class='add'>+ * @IEEE80211_HE_MCS_SUPPORT_0_7: MCSes 0-7 are supported for the</div><div class='add'>+ *	number of streams</div><div class='add'>+ * @IEEE80211_HE_MCS_SUPPORT_0_9: MCSes 0-9 are supported</div><div class='add'>+ * @IEEE80211_HE_MCS_SUPPORT_0_11: MCSes 0-11 are supported</div><div class='add'>+ * @IEEE80211_HE_MCS_NOT_SUPPORTED: This number of streams isn't supported</div><div class='add'>+ *</div><div class='add'>+ * These definitions are used in each 2-bit subfield of the rx_mcs_*</div><div class='add'>+ * and tx_mcs_* fields of &amp;struct ieee80211_he_mcs_nss_supp, which are</div><div class='add'>+ * both split into 8 subfields by number of streams. These values indicate</div><div class='add'>+ * which MCSes are supported for the number of streams the value appears</div><div class='add'>+ * for.</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_he_mcs_support {</div><div class='add'>+	IEEE80211_HE_MCS_SUPPORT_0_7	= 0,</div><div class='add'>+	IEEE80211_HE_MCS_SUPPORT_0_9	= 1,</div><div class='add'>+	IEEE80211_HE_MCS_SUPPORT_0_11	= 2,</div><div class='add'>+	IEEE80211_HE_MCS_NOT_SUPPORTED	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_he_mcs_nss_supp - HE Tx/Rx HE MCS NSS Support Field</div><div class='add'>+ *</div><div class='add'>+ * This structure holds the data required for the Tx/Rx HE MCS NSS Support Field</div><div class='add'>+ * described in P802.11ax_D2.0 section 9.4.2.237.4</div><div class='add'>+ *</div><div class='add'>+ * @rx_mcs_80: Rx MCS map 2 bits for each stream, total 8 streams, for channel</div><div class='add'>+ *     widths less than 80MHz.</div><div class='add'>+ * @tx_mcs_80: Tx MCS map 2 bits for each stream, total 8 streams, for channel</div><div class='add'>+ *     widths less than 80MHz.</div><div class='add'>+ * @rx_mcs_160: Rx MCS map 2 bits for each stream, total 8 streams, for channel</div><div class='add'>+ *     width 160MHz.</div><div class='add'>+ * @tx_mcs_160: Tx MCS map 2 bits for each stream, total 8 streams, for channel</div><div class='add'>+ *     width 160MHz.</div><div class='add'>+ * @rx_mcs_80p80: Rx MCS map 2 bits for each stream, total 8 streams, for</div><div class='add'>+ *     channel width 80p80MHz.</div><div class='add'>+ * @tx_mcs_80p80: Tx MCS map 2 bits for each stream, total 8 streams, for</div><div class='add'>+ *     channel width 80p80MHz.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_he_mcs_nss_supp {</div><div class='add'>+	__le16 rx_mcs_80;</div><div class='add'>+	__le16 tx_mcs_80;</div><div class='add'>+	__le16 rx_mcs_160;</div><div class='add'>+	__le16 tx_mcs_160;</div><div class='add'>+	__le16 rx_mcs_80p80;</div><div class='add'>+	__le16 tx_mcs_80p80;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_he_operation - HE Operation element</div><div class='add'>+ * @he_oper_params: HE Operation Parameters + BSS Color Information</div><div class='add'>+ * @he_mcs_nss_set: Basic HE-MCS And NSS Set</div><div class='add'>+ * @optional: Optional fields VHT Operation Information, Max Co-Hosted</div><div class='add'>+ *            BSSID Indicator, and 6 GHz Operation Information</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "HE Operation</div><div class='add'>+ * element" as described in IEEE Std 802.11ax-2021 section 9.4.2.249.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_he_operation {</div><div class='add'>+	__le32 he_oper_params;</div><div class='add'>+	__le16 he_mcs_nss_set;</div><div class='add'>+	u8 optional[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_he_spr - Spatial Reuse Parameter Set element</div><div class='add'>+ * @he_sr_control: SR Control</div><div class='add'>+ * @optional: Optional fields Non-SRG OBSS PD Max Offset, SRG OBSS PD</div><div class='add'>+ *            Min Offset, SRG OBSS PD Max Offset, SRG BSS Color</div><div class='add'>+ *            Bitmap, and SRG Partial BSSID Bitmap</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "Spatial Reuse</div><div class='add'>+ * Parameter Set element" as described in IEEE Std 802.11ax-2021</div><div class='add'>+ * section 9.4.2.252.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_he_spr {</div><div class='add'>+	u8 he_sr_control;</div><div class='add'>+	u8 optional[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field</div><div class='add'>+ * @aifsn: ACI/AIFSN</div><div class='add'>+ * @ecw_min_max: ECWmin/ECWmax</div><div class='add'>+ * @mu_edca_timer: MU EDCA Timer</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the "MU AC Parameter Record" as described</div><div class='add'>+ * in IEEE Std 802.11ax-2021 section 9.4.2.251, Figure 9-788p.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_he_mu_edca_param_ac_rec {</div><div class='add'>+	u8 aifsn;</div><div class='add'>+	u8 ecw_min_max;</div><div class='add'>+	u8 mu_edca_timer;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_mu_edca_param_set - MU EDCA Parameter Set element</div><div class='add'>+ * @mu_qos_info: QoS Info</div><div class='add'>+ * @ac_be: MU AC_BE Parameter Record</div><div class='add'>+ * @ac_bk: MU AC_BK Parameter Record</div><div class='add'>+ * @ac_vi: MU AC_VI Parameter Record</div><div class='add'>+ * @ac_vo: MU AC_VO Parameter Record</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "MU EDCA Parameter Set</div><div class='add'>+ * element" as described in IEEE Std 802.11ax-2021 section 9.4.2.251.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_mu_edca_param_set {</div><div class='add'>+	u8 mu_qos_info;</div><div class='add'>+	struct ieee80211_he_mu_edca_param_ac_rec ac_be;</div><div class='add'>+	struct ieee80211_he_mu_edca_param_ac_rec ac_bk;</div><div class='add'>+	struct ieee80211_he_mu_edca_param_ac_rec ac_vi;</div><div class='add'>+	struct ieee80211_he_mu_edca_param_ac_rec ac_vo;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* 802.11ax HE MAC capabilities */</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_HTC_HE				0x01</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_TWT_REQ				0x02</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_TWT_RES				0x04</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_NOT_SUPP		0x00</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_LEVEL_1		0x08</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_LEVEL_2		0x10</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_LEVEL_3		0x18</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_MASK			0x18</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_1		0x00</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_2		0x20</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_4		0x40</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_8		0x60</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_16		0x80</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_32		0xa0</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_64		0xc0</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_UNLIMITED	0xe0</div><div class='add'>+#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_MASK		0xe0</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_UNLIMITED		0x00</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_128			0x01</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_256			0x02</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_512			0x03</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_MASK		0x03</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_0US		0x00</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_8US		0x04</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US		0x08</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK		0x0c</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_1		0x00</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_2		0x10</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_3		0x20</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_4		0x30</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_5		0x40</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_6		0x50</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_7		0x60</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8		0x70</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_MASK		0x70</div><div class='add'>+</div><div class='add'>+/* Link adaptation is split between byte HE_MAC_CAP1 and</div><div class='add'>+ * HE_MAC_CAP2. It should be set only if IEEE80211_HE_MAC_CAP0_HTC_HE</div><div class='add'>+ * in which case the following values apply:</div><div class='add'>+ * 0 = No feedback.</div><div class='add'>+ * 1 = reserved.</div><div class='add'>+ * 2 = Unsolicited feedback.</div><div class='add'>+ * 3 = both</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION			0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION			0x01</div><div class='add'>+#define IEEE80211_HE_MAC_CAP2_ALL_ACK				0x02</div><div class='add'>+#define IEEE80211_HE_MAC_CAP2_TRS				0x04</div><div class='add'>+#define IEEE80211_HE_MAC_CAP2_BSR				0x08</div><div class='add'>+#define IEEE80211_HE_MAC_CAP2_BCAST_TWT				0x10</div><div class='add'>+#define IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP			0x20</div><div class='add'>+#define IEEE80211_HE_MAC_CAP2_MU_CASCADING			0x40</div><div class='add'>+#define IEEE80211_HE_MAC_CAP2_ACK_EN				0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_OMI_CONTROL			0x02</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_OFDMA_RA				0x04</div><div class='add'>+</div><div class='add'>+/* The maximum length of an A-MDPU is defined by the combination of the Maximum</div><div class='add'>+ * A-MDPU Length Exponent field in the HT capabilities, VHT capabilities and the</div><div class='add'>+ * same field in the HE capabilities.</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_0		0x00</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_1		0x08</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2		0x10</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3		0x18</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK		0x18</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_AMSDU_FRAG			0x20</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED			0x40</div><div class='add'>+#define IEEE80211_HE_MAC_CAP3_RX_CTRL_FRAME_TO_MULTIBSS		0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG		0x01</div><div class='add'>+#define IEEE80211_HE_MAC_CAP4_QTP				0x02</div><div class='add'>+#define IEEE80211_HE_MAC_CAP4_BQR				0x04</div><div class='add'>+#define IEEE80211_HE_MAC_CAP4_PSR_RESP				0x08</div><div class='add'>+#define IEEE80211_HE_MAC_CAP4_NDP_FB_REP			0x10</div><div class='add'>+#define IEEE80211_HE_MAC_CAP4_OPS				0x20</div><div class='add'>+#define IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU			0x40</div><div class='add'>+/* Multi TID agg TX is split between byte #4 and #5</div><div class='add'>+ * The value is a combination of B39,B40,B41</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39		0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40		0x01</div><div class='add'>+#define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41		0x02</div><div class='add'>+#define IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION	0x04</div><div class='add'>+#define IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU			0x08</div><div class='add'>+#define IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX		0x10</div><div class='add'>+#define IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS			0x20</div><div class='add'>+#define IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING		0x40</div><div class='add'>+#define IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX		0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20</div><div class='add'>+#define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16</div><div class='add'>+#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13</div><div class='add'>+</div><div class='add'>+/* 802.11ax HE PHY capabilities */</div><div class='add'>+#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G		0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G	0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G		0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G	0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL		0x1e</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G	0x20</div><div class='add'>+#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G	0x40</div><div class='add'>+#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK			0xfe</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_80MHZ_ONLY_SECOND_20MHZ	0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_80MHZ_ONLY_SECOND_40MHZ	0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_160MHZ_ONLY_SECOND_20MHZ	0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_160MHZ_ONLY_SECOND_40MHZ	0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK			0x0f</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A				0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD			0x20</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US		0x40</div><div class='add'>+/* Midamble RX/TX Max NSTS is split between byte #2 and byte #3 */</div><div class='add'>+#define IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS			0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS			0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US			0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ			0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ			0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP2_DOPPLER_TX				0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP2_DOPPLER_RX				0x20</div><div class='add'>+</div><div class='add'>+/* Note that the meaning of UL MU below is different between an AP and a non-AP</div><div class='add'>+ * sta, where in the AP case it indicates support for Rx and in the non-AP sta</div><div class='add'>+ * case it indicates support for Tx.</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO			0x40</div><div class='add'>+#define IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO			0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM			0x00</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK			0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK			0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_16_QAM			0x03</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK			0x03</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1				0x00</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_2				0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM			0x00</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK			0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK			0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_16_QAM			0x18</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK			0x18</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1				0x00</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_2				0x20</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU		0x40</div><div class='add'>+#define IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER				0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE				0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER				0x02</div><div class='add'>+</div><div class='add'>+/* Minimal allowed value of Max STS under 80MHz is 3 */</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4		0x0c</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_5		0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_6		0x14</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_7		0x18</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_8		0x1c</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK	0x1c</div><div class='add'>+</div><div class='add'>+/* Minimal allowed value of Max STS above 80MHz is 3 */</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4		0x60</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_5		0x80</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_6		0xa0</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_7		0xc0</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_8		0xe0</div><div class='add'>+#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_MASK	0xe0</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_1	0x00</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2	0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_3	0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_4	0x03</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_5	0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_6	0x05</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_7	0x06</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_8	0x07</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK	0x07</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_1	0x00</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2	0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_3	0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_4	0x18</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_5	0x20</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_6	0x28</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_7	0x30</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_8	0x38</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK	0x38</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK				0x40</div><div class='add'>+#define IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK				0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU			0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU			0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB			0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB		0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB				0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE			0x20</div><div class='add'>+#define IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO		0x40</div><div class='add'>+#define IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT			0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_PSR_BASED_SR				0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP			0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI		0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_MAX_NC_1					0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_MAX_NC_2					0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_MAX_NC_3					0x18</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_MAX_NC_4					0x20</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_MAX_NC_5					0x28</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_MAX_NC_6					0x30</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_MAX_NC_7					0x38</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_MAX_NC_MASK				0x38</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ			0x40</div><div class='add'>+#define IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ			0x80</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI		0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G		0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU			0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU			0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_HE_ER_SU_1XLTF_AND_08_US_GI		0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_MIDAMBLE_RX_TX_2X_AND_1XLTF		0x20</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242				0x00</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484				0x40</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_996				0x80</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996				0xc0</div><div class='add'>+#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_MASK				0xc0</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM		0x01</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK		0x02</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU		0x04</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU		0x08</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB	0x10</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB	0x20</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US			0x0</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US			0x1</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US			0x2</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED		0x3</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS			6</div><div class='add'>+#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK			0xc0</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF			0x01</div><div class='add'>+</div><div class='add'>+/* 802.11ax HE TX/RX MCS NSS Support  */</div><div class='add'>+#define IEEE80211_TX_RX_MCS_NSS_SUPP_HIGHEST_MCS_POS			(3)</div><div class='add'>+#define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_POS			(6)</div><div class='add'>+#define IEEE80211_TX_RX_MCS_NSS_SUPP_RX_BITMAP_POS			(11)</div><div class='add'>+#define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_MASK			0x07c0</div><div class='add'>+#define IEEE80211_TX_RX_MCS_NSS_SUPP_RX_BITMAP_MASK			0xf800</div><div class='add'>+</div><div class='add'>+/* TX/RX HE MCS Support field Highest MCS subfield encoding */</div><div class='add'>+enum ieee80211_he_highest_mcs_supported_subfield_enc {</div><div class='add'>+	HIGHEST_MCS_SUPPORTED_MCS7 = 0,</div><div class='add'>+	HIGHEST_MCS_SUPPORTED_MCS8,</div><div class='add'>+	HIGHEST_MCS_SUPPORTED_MCS9,</div><div class='add'>+	HIGHEST_MCS_SUPPORTED_MCS10,</div><div class='add'>+	HIGHEST_MCS_SUPPORTED_MCS11,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Calculate 802.11ax HE capabilities IE Tx/Rx HE MCS NSS Support Field size */</div><div class='add'>+static inline u8</div><div class='add'>+ieee80211_he_mcs_nss_size(const struct ieee80211_he_cap_elem *he_cap)</div><div class='add'>+{</div><div class='add'>+	u8 count = 4;</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='add'>+		count += 4;</div><div class='add'>+</div><div class='add'>+	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='add'>+	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)</div><div class='add'>+		count += 4;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* 802.11ax HE PPE Thresholds */</div><div class='add'>+#define IEEE80211_PPE_THRES_NSS_SUPPORT_2NSS			(1)</div><div class='add'>+#define IEEE80211_PPE_THRES_NSS_POS				(0)</div><div class='add'>+#define IEEE80211_PPE_THRES_NSS_MASK				(7)</div><div class='add'>+#define IEEE80211_PPE_THRES_RU_INDEX_BITMASK_2x966_AND_966_RU	\</div><div class='add'>+	(BIT(5) | BIT(6))</div><div class='add'>+#define IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK		0x78</div><div class='add'>+#define IEEE80211_PPE_THRES_RU_INDEX_BITMASK_POS		(3)</div><div class='add'>+#define IEEE80211_PPE_THRES_INFO_PPET_SIZE			(3)</div><div class='add'>+#define IEEE80211_HE_PPE_THRES_INFO_HEADER_SIZE			(7)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate 802.11ax HE capabilities IE PPE field size</div><div class='add'>+ * Input: Header byte of ppe_thres (first byte), and HE capa IE's PHY cap u8*</div><div class='add'>+ */</div><div class='add'>+static inline u8</div><div class='add'>+ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info)</div><div class='add'>+{</div><div class='add'>+	u8 n;</div><div class='add'>+</div><div class='add'>+	if ((phy_cap_info[6] &amp;</div><div class='add'>+	     IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	n = hweight8(ppe_thres_hdr &amp;</div><div class='add'>+		     IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='add'>+	n *= (1 + ((ppe_thres_hdr &amp; IEEE80211_PPE_THRES_NSS_MASK) &gt;&gt;</div><div class='add'>+		   IEEE80211_PPE_THRES_NSS_POS));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Each pair is 6 bits, and we need to add the 7 "header" bits to the</div><div class='add'>+	 * total size.</div><div class='add'>+	 */</div><div class='add'>+	n = (n * IEEE80211_PPE_THRES_INFO_PPET_SIZE * 2) + 7;</div><div class='add'>+	n = DIV_ROUND_UP(n, 8);</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ieee80211_he_capa_size_ok(const u8 *data, u8 len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_he_cap_elem *he_cap_ie_elem = (const void *)data;</div><div class='add'>+	u8 needed = sizeof(*he_cap_ie_elem);</div><div class='add'>+</div><div class='add'>+	if (len &lt; needed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	needed += ieee80211_he_mcs_nss_size(he_cap_ie_elem);</div><div class='add'>+	if (len &lt; needed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (he_cap_ie_elem-&gt;phy_cap_info[6] &amp;</div><div class='add'>+			IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='add'>+		if (len &lt; needed + 1)</div><div class='add'>+			return false;</div><div class='add'>+		needed += ieee80211_he_ppe_size(data[needed],</div><div class='add'>+						he_cap_ie_elem-&gt;phy_cap_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len &gt;= needed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* HE Operation defines */</div><div class='add'>+#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK		0x00000007</div><div class='add'>+#define IEEE80211_HE_OPERATION_TWT_REQUIRED			0x00000008</div><div class='add'>+#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK		0x00003ff0</div><div class='add'>+#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET		4</div><div class='add'>+#define IEEE80211_HE_OPERATION_VHT_OPER_INFO			0x00004000</div><div class='add'>+#define IEEE80211_HE_OPERATION_CO_HOSTED_BSS			0x00008000</div><div class='add'>+#define IEEE80211_HE_OPERATION_ER_SU_DISABLE			0x00010000</div><div class='add'>+#define IEEE80211_HE_OPERATION_6GHZ_OP_INFO			0x00020000</div><div class='add'>+#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK			0x3f000000</div><div class='add'>+#define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET			24</div><div class='add'>+#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR		0x40000000</div><div class='add'>+#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED		0x80000000</div><div class='add'>+</div><div class='add'>+#define IEEE80211_6GHZ_CTRL_REG_LPI_AP			0</div><div class='add'>+#define IEEE80211_6GHZ_CTRL_REG_SP_AP			1</div><div class='add'>+#define IEEE80211_6GHZ_CTRL_REG_VLP_AP			2</div><div class='add'>+#define IEEE80211_6GHZ_CTRL_REG_INDOOR_LPI_AP		3</div><div class='add'>+#define IEEE80211_6GHZ_CTRL_REG_INDOOR_SP_AP_OLD	4</div><div class='add'>+#define IEEE80211_6GHZ_CTRL_REG_AP_ROLE_NOT_RELEVANT	7</div><div class='add'>+#define IEEE80211_6GHZ_CTRL_REG_INDOOR_SP_AP		8</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_he_6ghz_oper - HE 6 GHz operation Information field</div><div class='add'>+ * @primary: primary channel</div><div class='add'>+ * @control: control flags</div><div class='add'>+ * @ccfs0: channel center frequency segment 0</div><div class='add'>+ * @ccfs1: channel center frequency segment 1</div><div class='add'>+ * @minrate: minimum rate (in 1 Mbps units)</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_he_6ghz_oper {</div><div class='add'>+	u8 primary;</div><div class='add'>+#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH	0x3</div><div class='add'>+#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_20MHZ	0</div><div class='add'>+#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_40MHZ	1</div><div class='add'>+#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_80MHZ	2</div><div class='add'>+#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_160MHZ	3</div><div class='add'>+#define IEEE80211_HE_6GHZ_OPER_CTRL_DUP_BEACON	0x4</div><div class='add'>+#define IEEE80211_HE_6GHZ_OPER_CTRL_REG_INFO	0x78</div><div class='add'>+	u8 control;</div><div class='add'>+	u8 ccfs0;</div><div class='add'>+	u8 ccfs1;</div><div class='add'>+	u8 minrate;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_reg_conn_bits - represents Regulatory connectivity field bits.</div><div class='add'>+ *</div><div class='add'>+ * This enumeration defines bit flags used to represent regulatory connectivity</div><div class='add'>+ * field bits.</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_REG_CONN_LPI_VALID: Indicates whether the LPI bit is valid.</div><div class='add'>+ * @IEEE80211_REG_CONN_LPI_VALUE: Represents the value of the LPI bit.</div><div class='add'>+ * @IEEE80211_REG_CONN_SP_VALID: Indicates whether the SP bit is valid.</div><div class='add'>+ * @IEEE80211_REG_CONN_SP_VALUE: Represents the value of the SP bit.</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_reg_conn_bits {</div><div class='add'>+	IEEE80211_REG_CONN_LPI_VALID = BIT(0),</div><div class='add'>+	IEEE80211_REG_CONN_LPI_VALUE = BIT(1),</div><div class='add'>+	IEEE80211_REG_CONN_SP_VALID = BIT(2),</div><div class='add'>+	IEEE80211_REG_CONN_SP_VALUE = BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* transmit power interpretation type of transmit power envelope element */</div><div class='add'>+enum ieee80211_tx_power_intrpt_type {</div><div class='add'>+	IEEE80211_TPE_LOCAL_EIRP,</div><div class='add'>+	IEEE80211_TPE_LOCAL_EIRP_PSD,</div><div class='add'>+	IEEE80211_TPE_REG_CLIENT_EIRP,</div><div class='add'>+	IEEE80211_TPE_REG_CLIENT_EIRP_PSD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* category type of transmit power envelope element */</div><div class='add'>+enum ieee80211_tx_power_category_6ghz {</div><div class='add'>+	IEEE80211_TPE_CAT_6GHZ_DEFAULT = 0,</div><div class='add'>+	IEEE80211_TPE_CAT_6GHZ_SUBORDINATE = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For IEEE80211_TPE_LOCAL_EIRP / IEEE80211_TPE_REG_CLIENT_EIRP,</div><div class='add'>+ * setting to 63.5 dBm means no constraint.</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_TPE_MAX_TX_PWR_NO_CONSTRAINT	127</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For IEEE80211_TPE_LOCAL_EIRP_PSD / IEEE80211_TPE_REG_CLIENT_EIRP_PSD,</div><div class='add'>+ * setting to 127 indicates no PSD limit for the 20 MHz channel.</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_TPE_PSD_NO_LIMIT		127</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_tx_pwr_env - Transmit Power Envelope</div><div class='add'>+ * @info: Transmit Power Information field</div><div class='add'>+ * @variable: Maximum Transmit Power field</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "Transmit Power</div><div class='add'>+ * Envelope element" as described in IEEE Std 802.11ax-2021 section</div><div class='add'>+ * 9.4.2.161</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_tx_pwr_env {</div><div class='add'>+	u8 info;</div><div class='add'>+	u8 variable[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_TX_PWR_ENV_INFO_COUNT 0x7</div><div class='add'>+#define IEEE80211_TX_PWR_ENV_INFO_INTERPRET 0x38</div><div class='add'>+#define IEEE80211_TX_PWR_ENV_INFO_CATEGORY 0xC0</div><div class='add'>+</div><div class='add'>+#define IEEE80211_TX_PWR_ENV_EXT_COUNT	0xF</div><div class='add'>+</div><div class='add'>+static inline bool ieee80211_valid_tpe_element(const u8 *data, u8 len)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_tx_pwr_env *env = (const void *)data;</div><div class='add'>+	u8 count, interpret, category;</div><div class='add'>+	u8 needed = sizeof(*env);</div><div class='add'>+	u8 N; /* also called N in the spec */</div><div class='add'>+</div><div class='add'>+	if (len &lt; needed)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	count = u8_get_bits(env-&gt;info, IEEE80211_TX_PWR_ENV_INFO_COUNT);</div><div class='add'>+	interpret = u8_get_bits(env-&gt;info, IEEE80211_TX_PWR_ENV_INFO_INTERPRET);</div><div class='add'>+	category = u8_get_bits(env-&gt;info, IEEE80211_TX_PWR_ENV_INFO_CATEGORY);</div><div class='add'>+</div><div class='add'>+	switch (category) {</div><div class='add'>+	case IEEE80211_TPE_CAT_6GHZ_DEFAULT:</div><div class='add'>+	case IEEE80211_TPE_CAT_6GHZ_SUBORDINATE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (interpret) {</div><div class='add'>+	case IEEE80211_TPE_LOCAL_EIRP:</div><div class='add'>+	case IEEE80211_TPE_REG_CLIENT_EIRP:</div><div class='add'>+		if (count &gt; 3)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* count == 0 encodes 1 value for 20 MHz, etc. */</div><div class='add'>+		needed += count + 1;</div><div class='add'>+</div><div class='add'>+		if (len &lt; needed)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* there can be extension fields not accounted for in 'count' */</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	case IEEE80211_TPE_LOCAL_EIRP_PSD:</div><div class='add'>+	case IEEE80211_TPE_REG_CLIENT_EIRP_PSD:</div><div class='add'>+		if (count &gt; 4)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		N = count ? 1 &lt;&lt; (count - 1) : 1;</div><div class='add'>+		needed += N;</div><div class='add'>+</div><div class='add'>+		if (len &lt; needed)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (len &gt; needed) {</div><div class='add'>+			u8 K = u8_get_bits(env-&gt;variable[N],</div><div class='add'>+					   IEEE80211_TX_PWR_ENV_EXT_COUNT);</div><div class='add'>+</div><div class='add'>+			needed += 1 + K;</div><div class='add'>+			if (len &lt; needed)</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size</div><div class='add'>+ * @he_oper_ie: byte data of the He Operations IE, stating from the byte</div><div class='add'>+ *	after the ext ID byte. It is assumed that he_oper_ie has at least</div><div class='add'>+ *	sizeof(struct ieee80211_he_operation) bytes, the caller must have</div><div class='add'>+ *	validated this.</div><div class='add'>+ * @return the actual size of the IE data (not including header), or 0 on error</div><div class='add'>+ */</div><div class='add'>+static inline u8</div><div class='add'>+ieee80211_he_oper_size(const u8 *he_oper_ie)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_he_operation *he_oper = (const void *)he_oper_ie;</div><div class='add'>+	u8 oper_len = sizeof(struct ieee80211_he_operation);</div><div class='add'>+	u32 he_oper_params;</div><div class='add'>+</div><div class='add'>+	/* Make sure the input is not NULL */</div><div class='add'>+	if (!he_oper_ie)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Calc required length */</div><div class='add'>+	he_oper_params = le32_to_cpu(he_oper-&gt;he_oper_params);</div><div class='add'>+	if (he_oper_params &amp; IEEE80211_HE_OPERATION_VHT_OPER_INFO)</div><div class='add'>+		oper_len += 3;</div><div class='add'>+	if (he_oper_params &amp; IEEE80211_HE_OPERATION_CO_HOSTED_BSS)</div><div class='add'>+		oper_len++;</div><div class='add'>+	if (he_oper_params &amp; IEEE80211_HE_OPERATION_6GHZ_OP_INFO)</div><div class='add'>+		oper_len += sizeof(struct ieee80211_he_6ghz_oper);</div><div class='add'>+</div><div class='add'>+	/* Add the first byte (extension ID) to the total length */</div><div class='add'>+	oper_len++;</div><div class='add'>+</div><div class='add'>+	return oper_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_he_6ghz_oper - obtain 6 GHz operation field</div><div class='add'>+ * @he_oper: HE operation element (must be pre-validated for size)</div><div class='add'>+ *	but may be %NULL</div><div class='add'>+ *</div><div class='add'>+ * Return: a pointer to the 6 GHz operation field, or %NULL</div><div class='add'>+ */</div><div class='add'>+static inline const struct ieee80211_he_6ghz_oper *</div><div class='add'>+ieee80211_he_6ghz_oper(const struct ieee80211_he_operation *he_oper)</div><div class='add'>+{</div><div class='add'>+	const u8 *ret;</div><div class='add'>+	u32 he_oper_params;</div><div class='add'>+</div><div class='add'>+	if (!he_oper)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ret = (const void *)&amp;he_oper-&gt;optional;</div><div class='add'>+</div><div class='add'>+	he_oper_params = le32_to_cpu(he_oper-&gt;he_oper_params);</div><div class='add'>+</div><div class='add'>+	if (!(he_oper_params &amp; IEEE80211_HE_OPERATION_6GHZ_OP_INFO))</div><div class='add'>+		return NULL;</div><div class='add'>+	if (he_oper_params &amp; IEEE80211_HE_OPERATION_VHT_OPER_INFO)</div><div class='add'>+		ret += 3;</div><div class='add'>+	if (he_oper_params &amp; IEEE80211_HE_OPERATION_CO_HOSTED_BSS)</div><div class='add'>+		ret++;</div><div class='add'>+</div><div class='add'>+	return (const void *)ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* HE Spatial Reuse defines */</div><div class='add'>+#define IEEE80211_HE_SPR_PSR_DISALLOWED				BIT(0)</div><div class='add'>+#define IEEE80211_HE_SPR_NON_SRG_OBSS_PD_SR_DISALLOWED		BIT(1)</div><div class='add'>+#define IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT			BIT(2)</div><div class='add'>+#define IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT		BIT(3)</div><div class='add'>+#define IEEE80211_HE_SPR_HESIGA_SR_VAL15_ALLOWED		BIT(4)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ieee80211_he_spr_size - calculate 802.11ax HE Spatial Reuse IE size</div><div class='add'>+ * @he_spr_ie: byte data of the He Spatial Reuse IE, stating from the byte</div><div class='add'>+ *	after the ext ID byte. It is assumed that he_spr_ie has at least</div><div class='add'>+ *	sizeof(struct ieee80211_he_spr) bytes, the caller must have validated</div><div class='add'>+ *	this</div><div class='add'>+ * @return the actual size of the IE data (not including header), or 0 on error</div><div class='add'>+ */</div><div class='add'>+static inline u8</div><div class='add'>+ieee80211_he_spr_size(const u8 *he_spr_ie)</div><div class='add'>+{</div><div class='add'>+	const struct ieee80211_he_spr *he_spr = (const void *)he_spr_ie;</div><div class='add'>+	u8 spr_len = sizeof(struct ieee80211_he_spr);</div><div class='add'>+	u8 he_spr_params;</div><div class='add'>+</div><div class='add'>+	/* Make sure the input is not NULL */</div><div class='add'>+	if (!he_spr_ie)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Calc required length */</div><div class='add'>+	he_spr_params = he_spr-&gt;he_sr_control;</div><div class='add'>+	if (he_spr_params &amp; IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT)</div><div class='add'>+		spr_len++;</div><div class='add'>+	if (he_spr_params &amp; IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT)</div><div class='add'>+		spr_len += 18;</div><div class='add'>+</div><div class='add'>+	/* Add the first byte (extension ID) to the total length */</div><div class='add'>+	spr_len++;</div><div class='add'>+</div><div class='add'>+	return spr_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ieee80211_he_6ghz_capa {</div><div class='add'>+	/* uses IEEE80211_HE_6GHZ_CAP_* below */</div><div class='add'>+	__le16 capa;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* HE 6 GHz band capabilities */</div><div class='add'>+/* uses enum ieee80211_min_mpdu_spacing values */</div><div class='add'>+#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START	0x0007</div><div class='add'>+/* uses enum ieee80211_vht_max_ampdu_length_exp values */</div><div class='add'>+#define IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP	0x0038</div><div class='add'>+/* uses IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_* values */</div><div class='add'>+#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN	0x00c0</div><div class='add'>+/* WLAN_HT_CAP_SM_PS_* values */</div><div class='add'>+#define IEEE80211_HE_6GHZ_CAP_SM_PS		0x0600</div><div class='add'>+#define IEEE80211_HE_6GHZ_CAP_RD_RESPONDER	0x0800</div><div class='add'>+#define IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS	0x1000</div><div class='add'>+#define IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS	0x2000</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_IEEE80211_HE_H */</div><div class='head'>diff --git a/include/linux/ieee80211-ht.h b/include/linux/ieee80211-ht.h<br/>new file mode 100644<br/>index 000000000000..21bbf470540f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211-ht.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211-ht.h</a></div><div class='hunk'>@@ -0,0 +1,292 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * IEEE 802.11 HT definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='add'>+ * &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2005, Devicescape Software, Inc.</div><div class='add'>+ * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_IEEE80211_HT_H</div><div class='add'>+#define LINUX_IEEE80211_HT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+/* Maximal size of an A-MSDU that can be transported in a HT BA session */</div><div class='add'>+#define IEEE80211_MAX_MPDU_LEN_HT_BA		4095</div><div class='add'>+</div><div class='add'>+/* Maximal size of an A-MSDU */</div><div class='add'>+#define IEEE80211_MAX_MPDU_LEN_HT_3839		3839</div><div class='add'>+#define IEEE80211_MAX_MPDU_LEN_HT_7935		7935</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HT_CTL_LEN		4</div><div class='add'>+</div><div class='add'>+enum ieee80211_ht_chanwidth_values {</div><div class='add'>+	IEEE80211_HT_CHANWIDTH_20MHZ = 0,</div><div class='add'>+	IEEE80211_HT_CHANWIDTH_ANY = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_bar - Block Ack Request frame format</div><div class='add'>+ * @frame_control: Frame Control</div><div class='add'>+ * @duration: Duration</div><div class='add'>+ * @ra: RA</div><div class='add'>+ * @ta: TA</div><div class='add'>+ * @control: BAR Control</div><div class='add'>+ * @start_seq_num: Starting Sequence Number (see Figure 9-37)</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the "BlockAckReq frame format"</div><div class='add'>+ * as described in IEEE Std 802.11-2020 section 9.3.1.7.</div><div class='add'>+*/</div><div class='add'>+struct ieee80211_bar {</div><div class='add'>+	__le16 frame_control;</div><div class='add'>+	__le16 duration;</div><div class='add'>+	__u8 ra[ETH_ALEN];</div><div class='add'>+	__u8 ta[ETH_ALEN];</div><div class='add'>+	__le16 control;</div><div class='add'>+	__le16 start_seq_num;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* 802.11 BAR control masks */</div><div class='add'>+#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL	0x0000</div><div class='add'>+#define IEEE80211_BAR_CTRL_MULTI_TID		0x0002</div><div class='add'>+#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA	0x0004</div><div class='add'>+#define IEEE80211_BAR_CTRL_TID_INFO_MASK	0xf000</div><div class='add'>+#define IEEE80211_BAR_CTRL_TID_INFO_SHIFT	12</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HT_MCS_MASK_LEN		10</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_mcs_info - Supported MCS Set field</div><div class='add'>+ * @rx_mask: RX mask</div><div class='add'>+ * @rx_highest: highest supported RX rate. If set represents</div><div class='add'>+ *	the highest supported RX data rate in units of 1 Mbps.</div><div class='add'>+ *	If this field is 0 this value should not be used to</div><div class='add'>+ *	consider the highest RX data rate supported.</div><div class='add'>+ * @tx_params: TX parameters</div><div class='add'>+ * @reserved: Reserved bits</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the "Supported MCS Set field" as</div><div class='add'>+ * described in IEEE Std 802.11-2020 section 9.4.2.55.4.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_mcs_info {</div><div class='add'>+	u8 rx_mask[IEEE80211_HT_MCS_MASK_LEN];</div><div class='add'>+	__le16 rx_highest;</div><div class='add'>+	u8 tx_params;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* 802.11n HT capability MSC set */</div><div class='add'>+#define IEEE80211_HT_MCS_RX_HIGHEST_MASK	0x3ff</div><div class='add'>+#define IEEE80211_HT_MCS_TX_DEFINED		0x01</div><div class='add'>+#define IEEE80211_HT_MCS_TX_RX_DIFF		0x02</div><div class='add'>+/* value 0 == 1 stream etc */</div><div class='add'>+#define IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK	0x0C</div><div class='add'>+#define IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT	2</div><div class='add'>+#define		IEEE80211_HT_MCS_TX_MAX_STREAMS	4</div><div class='add'>+#define IEEE80211_HT_MCS_TX_UNEQUAL_MODULATION	0x10</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HT_MCS_CHAINS(mcs) ((mcs) == 32 ? 1 : (1 + ((mcs) &gt;&gt; 3)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 802.11n D5.0 20.3.5 / 20.6 says:</div><div class='add'>+ * - indices 0 to 7 and 32 are single spatial stream</div><div class='add'>+ * - 8 to 31 are multiple spatial streams using equal modulation</div><div class='add'>+ *   [8..15 for two streams, 16..23 for three and 24..31 for four]</div><div class='add'>+ * - remainder are multiple spatial streams using unequal modulation</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_HT_MCS_UNEQUAL_MODULATION_START 33</div><div class='add'>+#define IEEE80211_HT_MCS_UNEQUAL_MODULATION_START_BYTE \</div><div class='add'>+	(IEEE80211_HT_MCS_UNEQUAL_MODULATION_START / 8)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_ht_cap - HT capabilities element</div><div class='add'>+ * @cap_info: HT Capability Information</div><div class='add'>+ * @ampdu_params_info: A-MPDU Parameters</div><div class='add'>+ * @mcs: Supported MCS Set</div><div class='add'>+ * @extended_ht_cap_info: HT Extended Capabilities</div><div class='add'>+ * @tx_BF_cap_info: Transmit Beamforming Capabilities</div><div class='add'>+ * @antenna_selection_info: ASEL Capability</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "HT Capabilities</div><div class='add'>+ * element" as described in IEEE Std 802.11-2020 section 9.4.2.55.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_ht_cap {</div><div class='add'>+	__le16 cap_info;</div><div class='add'>+	u8 ampdu_params_info;</div><div class='add'>+</div><div class='add'>+	/* 16 bytes MCS information */</div><div class='add'>+	struct ieee80211_mcs_info mcs;</div><div class='add'>+</div><div class='add'>+	__le16 extended_ht_cap_info;</div><div class='add'>+	__le32 tx_BF_cap_info;</div><div class='add'>+	u8 antenna_selection_info;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* 802.11n HT capabilities masks (for cap_info) */</div><div class='add'>+#define IEEE80211_HT_CAP_LDPC_CODING		0x0001</div><div class='add'>+#define IEEE80211_HT_CAP_SUP_WIDTH_20_40	0x0002</div><div class='add'>+#define IEEE80211_HT_CAP_SM_PS			0x000C</div><div class='add'>+#define		IEEE80211_HT_CAP_SM_PS_SHIFT	2</div><div class='add'>+#define IEEE80211_HT_CAP_GRN_FLD		0x0010</div><div class='add'>+#define IEEE80211_HT_CAP_SGI_20			0x0020</div><div class='add'>+#define IEEE80211_HT_CAP_SGI_40			0x0040</div><div class='add'>+#define IEEE80211_HT_CAP_TX_STBC		0x0080</div><div class='add'>+#define IEEE80211_HT_CAP_RX_STBC		0x0300</div><div class='add'>+#define		IEEE80211_HT_CAP_RX_STBC_SHIFT	8</div><div class='add'>+#define IEEE80211_HT_CAP_DELAY_BA		0x0400</div><div class='add'>+#define IEEE80211_HT_CAP_MAX_AMSDU		0x0800</div><div class='add'>+#define IEEE80211_HT_CAP_DSSSCCK40		0x1000</div><div class='add'>+#define IEEE80211_HT_CAP_RESERVED		0x2000</div><div class='add'>+#define IEEE80211_HT_CAP_40MHZ_INTOLERANT	0x4000</div><div class='add'>+#define IEEE80211_HT_CAP_LSIG_TXOP_PROT		0x8000</div><div class='add'>+</div><div class='add'>+/* 802.11n HT extended capabilities masks (for extended_ht_cap_info) */</div><div class='add'>+#define IEEE80211_HT_EXT_CAP_PCO		0x0001</div><div class='add'>+#define IEEE80211_HT_EXT_CAP_PCO_TIME		0x0006</div><div class='add'>+#define		IEEE80211_HT_EXT_CAP_PCO_TIME_SHIFT	1</div><div class='add'>+#define IEEE80211_HT_EXT_CAP_MCS_FB		0x0300</div><div class='add'>+#define		IEEE80211_HT_EXT_CAP_MCS_FB_SHIFT	8</div><div class='add'>+#define IEEE80211_HT_EXT_CAP_HTC_SUP		0x0400</div><div class='add'>+#define IEEE80211_HT_EXT_CAP_RD_RESPONDER	0x0800</div><div class='add'>+</div><div class='add'>+/* 802.11n HT capability AMPDU settings (for ampdu_params_info) */</div><div class='add'>+#define IEEE80211_HT_AMPDU_PARM_FACTOR		0x03</div><div class='add'>+#define IEEE80211_HT_AMPDU_PARM_DENSITY		0x1C</div><div class='add'>+#define		IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT	2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum length of AMPDU that the STA can receive in high-throughput (HT).</div><div class='add'>+ * Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets)</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_max_ampdu_length_exp {</div><div class='add'>+	IEEE80211_HT_MAX_AMPDU_8K = 0,</div><div class='add'>+	IEEE80211_HT_MAX_AMPDU_16K = 1,</div><div class='add'>+	IEEE80211_HT_MAX_AMPDU_32K = 2,</div><div class='add'>+	IEEE80211_HT_MAX_AMPDU_64K = 3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IEEE80211_HT_MAX_AMPDU_FACTOR 13</div><div class='add'>+</div><div class='add'>+/* Minimum MPDU start spacing */</div><div class='add'>+enum ieee80211_min_mpdu_spacing {</div><div class='add'>+	IEEE80211_HT_MPDU_DENSITY_NONE = 0,	/* No restriction */</div><div class='add'>+	IEEE80211_HT_MPDU_DENSITY_0_25 = 1,	/* 1/4 usec */</div><div class='add'>+	IEEE80211_HT_MPDU_DENSITY_0_5 = 2,	/* 1/2 usec */</div><div class='add'>+	IEEE80211_HT_MPDU_DENSITY_1 = 3,	/* 1 usec */</div><div class='add'>+	IEEE80211_HT_MPDU_DENSITY_2 = 4,	/* 2 usec */</div><div class='add'>+	IEEE80211_HT_MPDU_DENSITY_4 = 5,	/* 4 usec */</div><div class='add'>+	IEEE80211_HT_MPDU_DENSITY_8 = 6,	/* 8 usec */</div><div class='add'>+	IEEE80211_HT_MPDU_DENSITY_16 = 7	/* 16 usec */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_ht_operation - HT operation IE</div><div class='add'>+ * @primary_chan: Primary Channel</div><div class='add'>+ * @ht_param: HT Operation Information parameters</div><div class='add'>+ * @operation_mode: HT Operation Information operation mode</div><div class='add'>+ * @stbc_param: HT Operation Information STBC params</div><div class='add'>+ * @basic_set: Basic HT-MCS Set</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "HT Operation</div><div class='add'>+ * element" as described in IEEE Std 802.11-2020 section 9.4.2.56.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_ht_operation {</div><div class='add'>+	u8 primary_chan;</div><div class='add'>+	u8 ht_param;</div><div class='add'>+	__le16 operation_mode;</div><div class='add'>+	__le16 stbc_param;</div><div class='add'>+	u8 basic_set[16];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* for ht_param */</div><div class='add'>+#define IEEE80211_HT_PARAM_CHA_SEC_OFFSET		0x03</div><div class='add'>+#define		IEEE80211_HT_PARAM_CHA_SEC_NONE		0x00</div><div class='add'>+#define		IEEE80211_HT_PARAM_CHA_SEC_ABOVE	0x01</div><div class='add'>+#define		IEEE80211_HT_PARAM_CHA_SEC_BELOW	0x03</div><div class='add'>+#define IEEE80211_HT_PARAM_CHAN_WIDTH_ANY		0x04</div><div class='add'>+#define IEEE80211_HT_PARAM_RIFS_MODE			0x08</div><div class='add'>+</div><div class='add'>+/* for operation_mode */</div><div class='add'>+#define IEEE80211_HT_OP_MODE_PROTECTION			0x0003</div><div class='add'>+#define		IEEE80211_HT_OP_MODE_PROTECTION_NONE		0</div><div class='add'>+#define		IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER	1</div><div class='add'>+#define		IEEE80211_HT_OP_MODE_PROTECTION_20MHZ		2</div><div class='add'>+#define		IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED	3</div><div class='add'>+#define IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT		0x0004</div><div class='add'>+#define IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT		0x0010</div><div class='add'>+#define IEEE80211_HT_OP_MODE_CCFS2_SHIFT		5</div><div class='add'>+#define IEEE80211_HT_OP_MODE_CCFS2_MASK			0x1fe0</div><div class='add'>+</div><div class='add'>+/* for stbc_param */</div><div class='add'>+#define IEEE80211_HT_STBC_PARAM_DUAL_BEACON		0x0040</div><div class='add'>+#define IEEE80211_HT_STBC_PARAM_DUAL_CTS_PROT		0x0080</div><div class='add'>+#define IEEE80211_HT_STBC_PARAM_STBC_BEACON		0x0100</div><div class='add'>+#define IEEE80211_HT_STBC_PARAM_LSIG_TXOP_FULLPROT	0x0200</div><div class='add'>+#define IEEE80211_HT_STBC_PARAM_PCO_ACTIVE		0x0400</div><div class='add'>+#define IEEE80211_HT_STBC_PARAM_PCO_PHASE		0x0800</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* block-ack parameters */</div><div class='add'>+#define IEEE80211_ADDBA_PARAM_AMSDU_MASK 0x0001</div><div class='add'>+#define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002</div><div class='add'>+#define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C</div><div class='add'>+#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0</div><div class='add'>+#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000</div><div class='add'>+#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A-MPDU buffer sizes</div><div class='add'>+ * According to HT size varies from 8 to 64 frames</div><div class='add'>+ * HE adds the ability to have up to 256 frames.</div><div class='add'>+ * EHT adds the ability to have up to 1K frames.</div><div class='add'>+ */</div><div class='add'>+#define IEEE80211_MIN_AMPDU_BUF		0x8</div><div class='add'>+#define IEEE80211_MAX_AMPDU_BUF_HT	0x40</div><div class='add'>+#define IEEE80211_MAX_AMPDU_BUF_HE	0x100</div><div class='add'>+#define IEEE80211_MAX_AMPDU_BUF_EHT	0x400</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Spatial Multiplexing Power Save Modes (for capability) */</div><div class='add'>+#define WLAN_HT_CAP_SM_PS_STATIC	0</div><div class='add'>+#define WLAN_HT_CAP_SM_PS_DYNAMIC	1</div><div class='add'>+#define WLAN_HT_CAP_SM_PS_INVALID	2</div><div class='add'>+#define WLAN_HT_CAP_SM_PS_DISABLED	3</div><div class='add'>+</div><div class='add'>+/* for SM power control field lower two bits */</div><div class='add'>+#define WLAN_HT_SMPS_CONTROL_DISABLED	0</div><div class='add'>+#define WLAN_HT_SMPS_CONTROL_STATIC	1</div><div class='add'>+#define WLAN_HT_SMPS_CONTROL_DYNAMIC	3</div><div class='add'>+</div><div class='add'>+/* HT action codes */</div><div class='add'>+enum ieee80211_ht_actioncode {</div><div class='add'>+	WLAN_HT_ACTION_NOTIFY_CHANWIDTH = 0,</div><div class='add'>+	WLAN_HT_ACTION_SMPS = 1,</div><div class='add'>+	WLAN_HT_ACTION_PSMP = 2,</div><div class='add'>+	WLAN_HT_ACTION_PCO_PHASE = 3,</div><div class='add'>+	WLAN_HT_ACTION_CSI = 4,</div><div class='add'>+	WLAN_HT_ACTION_NONCOMPRESSED_BF = 5,</div><div class='add'>+	WLAN_HT_ACTION_COMPRESSED_BF = 6,</div><div class='add'>+	WLAN_HT_ACTION_ASEL_IDX_FEEDBACK = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* BACK action code */</div><div class='add'>+enum ieee80211_back_actioncode {</div><div class='add'>+	WLAN_ACTION_ADDBA_REQ = 0,</div><div class='add'>+	WLAN_ACTION_ADDBA_RESP = 1,</div><div class='add'>+	WLAN_ACTION_DELBA = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* BACK (block-ack) parties */</div><div class='add'>+enum ieee80211_back_parties {</div><div class='add'>+	WLAN_BACK_RECIPIENT = 0,</div><div class='add'>+	WLAN_BACK_INITIATOR = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_IEEE80211_HT_H */</div><div class='head'>diff --git a/include/linux/ieee80211-mesh.h b/include/linux/ieee80211-mesh.h<br/>new file mode 100644<br/>index 000000000000..4b829bcb38b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211-mesh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211-mesh.h</a></div><div class='hunk'>@@ -0,0 +1,230 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * IEEE 802.11 mesh definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='add'>+ * &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2005, Devicescape Software, Inc.</div><div class='add'>+ * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_IEEE80211_MESH_H</div><div class='add'>+#define LINUX_IEEE80211_MESH_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MAX_MESH_ID_LEN	32</div><div class='add'>+</div><div class='add'>+struct ieee80211s_hdr {</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 ttl;</div><div class='add'>+	__le32 seqnum;</div><div class='add'>+	u8 eaddr1[ETH_ALEN];</div><div class='add'>+	u8 eaddr2[ETH_ALEN];</div><div class='add'>+} __packed __aligned(2);</div><div class='add'>+</div><div class='add'>+/* Mesh flags */</div><div class='add'>+#define MESH_FLAGS_AE_A4 	0x1</div><div class='add'>+#define MESH_FLAGS_AE_A5_A6	0x2</div><div class='add'>+#define MESH_FLAGS_AE		0x3</div><div class='add'>+#define MESH_FLAGS_PS_DEEP	0x4</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_preq_flags - mesh PREQ element flags</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_PREQ_PROACTIVE_PREP_FLAG: proactive PREP subfield</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_preq_flags {</div><div class='add'>+	IEEE80211_PREQ_PROACTIVE_PREP_FLAG	= 1&lt;&lt;2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_preq_target_flags - mesh PREQ element per target flags</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_PREQ_TO_FLAG: target only subfield</div><div class='add'>+ * @IEEE80211_PREQ_USN_FLAG: unknown target HWMP sequence number subfield</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_preq_target_flags {</div><div class='add'>+	IEEE80211_PREQ_TO_FLAG	= 1&lt;&lt;0,</div><div class='add'>+	IEEE80211_PREQ_USN_FLAG	= 1&lt;&lt;2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_mesh_chansw_params_ie - mesh channel switch parameters IE</div><div class='add'>+ * @mesh_ttl: Time To Live</div><div class='add'>+ * @mesh_flags: Flags</div><div class='add'>+ * @mesh_reason: Reason Code</div><div class='add'>+ * @mesh_pre_value: Precedence Value</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "Mesh Channel Switch</div><div class='add'>+ * Parameters element" as described in IEEE Std 802.11-2020 section</div><div class='add'>+ * 9.4.2.102.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_mesh_chansw_params_ie {</div><div class='add'>+	u8 mesh_ttl;</div><div class='add'>+	u8 mesh_flags;</div><div class='add'>+	__le16 mesh_reason;</div><div class='add'>+	__le16 mesh_pre_value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_meshconf_ie - Mesh Configuration element</div><div class='add'>+ * @meshconf_psel: Active Path Selection Protocol Identifier</div><div class='add'>+ * @meshconf_pmetric: Active Path Selection Metric Identifier</div><div class='add'>+ * @meshconf_congest: Congestion Control Mode Identifier</div><div class='add'>+ * @meshconf_synch: Synchronization Method Identifier</div><div class='add'>+ * @meshconf_auth: Authentication Protocol Identifier</div><div class='add'>+ * @meshconf_form: Mesh Formation Info</div><div class='add'>+ * @meshconf_cap: Mesh Capability (see &amp;enum mesh_config_capab_flags)</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "Mesh Configuration</div><div class='add'>+ * element" as described in IEEE Std 802.11-2020 section 9.4.2.97.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_meshconf_ie {</div><div class='add'>+	u8 meshconf_psel;</div><div class='add'>+	u8 meshconf_pmetric;</div><div class='add'>+	u8 meshconf_congest;</div><div class='add'>+	u8 meshconf_synch;</div><div class='add'>+	u8 meshconf_auth;</div><div class='add'>+	u8 meshconf_form;</div><div class='add'>+	u8 meshconf_cap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum mesh_config_capab_flags - Mesh Configuration IE capability field flags</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS: STA is willing to establish</div><div class='add'>+ *	additional mesh peerings with other mesh STAs</div><div class='add'>+ * @IEEE80211_MESHCONF_CAPAB_FORWARDING: the STA forwards MSDUs</div><div class='add'>+ * @IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING: TBTT adjustment procedure</div><div class='add'>+ *	is ongoing</div><div class='add'>+ * @IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL: STA is in deep sleep mode or has</div><div class='add'>+ *	neighbors in deep sleep mode</div><div class='add'>+ *</div><div class='add'>+ * Enumerates the "Mesh Capability" as described in IEEE Std</div><div class='add'>+ * 802.11-2020 section 9.4.2.97.7.</div><div class='add'>+ */</div><div class='add'>+enum mesh_config_capab_flags {</div><div class='add'>+	IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS		= 0x01,</div><div class='add'>+	IEEE80211_MESHCONF_CAPAB_FORWARDING		= 0x08,</div><div class='add'>+	IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING		= 0x20,</div><div class='add'>+	IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL	= 0x40,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MESHCONF_FORM_CONNECTED_TO_GATE 0x1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mesh channel switch parameters element's flag indicator</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#define WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT BIT(0)</div><div class='add'>+#define WLAN_EID_CHAN_SWITCH_PARAM_INITIATOR BIT(1)</div><div class='add'>+#define WLAN_EID_CHAN_SWITCH_PARAM_REASON BIT(2)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_rann_ie - RANN (root announcement) element</div><div class='add'>+ * @rann_flags: Flags</div><div class='add'>+ * @rann_hopcount: Hop Count</div><div class='add'>+ * @rann_ttl: Element TTL</div><div class='add'>+ * @rann_addr: Root Mesh STA Address</div><div class='add'>+ * @rann_seq: HWMP Sequence Number</div><div class='add'>+ * @rann_interval: Interval</div><div class='add'>+ * @rann_metric: Metric</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "RANN element" as</div><div class='add'>+ * described in IEEE Std 802.11-2020 section 9.4.2.111.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_rann_ie {</div><div class='add'>+	u8 rann_flags;</div><div class='add'>+	u8 rann_hopcount;</div><div class='add'>+	u8 rann_ttl;</div><div class='add'>+	u8 rann_addr[ETH_ALEN];</div><div class='add'>+	__le32 rann_seq;</div><div class='add'>+	__le32 rann_interval;</div><div class='add'>+	__le32 rann_metric;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum ieee80211_rann_flags {</div><div class='add'>+	RANN_FLAG_IS_GATE = 1 &lt;&lt; 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Mesh action codes */</div><div class='add'>+enum ieee80211_mesh_actioncode {</div><div class='add'>+	WLAN_MESH_ACTION_LINK_METRIC_REPORT,</div><div class='add'>+	WLAN_MESH_ACTION_HWMP_PATH_SELECTION,</div><div class='add'>+	WLAN_MESH_ACTION_GATE_ANNOUNCEMENT,</div><div class='add'>+	WLAN_MESH_ACTION_CONGESTION_CONTROL_NOTIFICATION,</div><div class='add'>+	WLAN_MESH_ACTION_MCCA_SETUP_REQUEST,</div><div class='add'>+	WLAN_MESH_ACTION_MCCA_SETUP_REPLY,</div><div class='add'>+	WLAN_MESH_ACTION_MCCA_ADVERTISEMENT_REQUEST,</div><div class='add'>+	WLAN_MESH_ACTION_MCCA_ADVERTISEMENT,</div><div class='add'>+	WLAN_MESH_ACTION_MCCA_TEARDOWN,</div><div class='add'>+	WLAN_MESH_ACTION_TBTT_ADJUSTMENT_REQUEST,</div><div class='add'>+	WLAN_MESH_ACTION_TBTT_ADJUSTMENT_RESPONSE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_mesh_sync_method - mesh synchronization method identifier</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET: the default synchronization method</div><div class='add'>+ * @IEEE80211_SYNC_METHOD_VENDOR: a vendor specific synchronization method</div><div class='add'>+ *	that will be specified in a vendor specific information element</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_mesh_sync_method {</div><div class='add'>+	IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET = 1,</div><div class='add'>+	IEEE80211_SYNC_METHOD_VENDOR = 255,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_mesh_path_protocol - mesh path selection protocol identifier</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_PATH_PROTOCOL_HWMP: the default path selection protocol</div><div class='add'>+ * @IEEE80211_PATH_PROTOCOL_VENDOR: a vendor specific protocol that will</div><div class='add'>+ *	be specified in a vendor specific information element</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_mesh_path_protocol {</div><div class='add'>+	IEEE80211_PATH_PROTOCOL_HWMP = 1,</div><div class='add'>+	IEEE80211_PATH_PROTOCOL_VENDOR = 255,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_mesh_path_metric - mesh path selection metric identifier</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_PATH_METRIC_AIRTIME: the default path selection metric</div><div class='add'>+ * @IEEE80211_PATH_METRIC_VENDOR: a vendor specific metric that will be</div><div class='add'>+ *	specified in a vendor specific information element</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_mesh_path_metric {</div><div class='add'>+	IEEE80211_PATH_METRIC_AIRTIME = 1,</div><div class='add'>+	IEEE80211_PATH_METRIC_VENDOR = 255,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_root_mode_identifier - root mesh STA mode identifier</div><div class='add'>+ *</div><div class='add'>+ * These attribute are used by dot11MeshHWMPRootMode to set root mesh STA mode</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_ROOTMODE_NO_ROOT: the mesh STA is not a root mesh STA (default)</div><div class='add'>+ * @IEEE80211_ROOTMODE_ROOT: the mesh STA is a root mesh STA if greater than</div><div class='add'>+ *	this value</div><div class='add'>+ * @IEEE80211_PROACTIVE_PREQ_NO_PREP: the mesh STA is a root mesh STA supports</div><div class='add'>+ *	the proactive PREQ with proactive PREP subfield set to 0</div><div class='add'>+ * @IEEE80211_PROACTIVE_PREQ_WITH_PREP: the mesh STA is a root mesh STA</div><div class='add'>+ *	supports the proactive PREQ with proactive PREP subfield set to 1</div><div class='add'>+ * @IEEE80211_PROACTIVE_RANN: the mesh STA is a root mesh STA supports</div><div class='add'>+ *	the proactive RANN</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_root_mode_identifier {</div><div class='add'>+	IEEE80211_ROOTMODE_NO_ROOT = 0,</div><div class='add'>+	IEEE80211_ROOTMODE_ROOT = 1,</div><div class='add'>+	IEEE80211_PROACTIVE_PREQ_NO_PREP = 2,</div><div class='add'>+	IEEE80211_PROACTIVE_PREQ_WITH_PREP = 3,</div><div class='add'>+	IEEE80211_PROACTIVE_RANN = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_IEEE80211_MESH_H */</div><div class='head'>diff --git a/include/linux/ieee80211-nan.h b/include/linux/ieee80211-nan.h<br/>new file mode 100644<br/>index 000000000000..d07959bf8a90<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211-nan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211-nan.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * WFA NAN definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='add'>+ * &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2005, Devicescape Software, Inc.</div><div class='add'>+ * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_IEEE80211_NAN_H</div><div class='add'>+#define LINUX_IEEE80211_NAN_H</div><div class='add'>+</div><div class='add'>+/* NAN operation mode, as defined in Wi-Fi Aware (TM) specification Table 81 */</div><div class='add'>+#define NAN_OP_MODE_PHY_MODE_VHT	0x01</div><div class='add'>+#define NAN_OP_MODE_PHY_MODE_HE		0x10</div><div class='add'>+#define NAN_OP_MODE_PHY_MODE_MASK	0x11</div><div class='add'>+#define NAN_OP_MODE_80P80MHZ		0x02</div><div class='add'>+#define NAN_OP_MODE_160MHZ		0x04</div><div class='add'>+#define NAN_OP_MODE_PNDL_SUPPRTED	0x08</div><div class='add'>+</div><div class='add'>+/* NAN Device capabilities, as defined in Wi-Fi Aware (TM) specification</div><div class='add'>+ * Table 79</div><div class='add'>+ */</div><div class='add'>+#define NAN_DEV_CAPA_DFS_OWNER			0x01</div><div class='add'>+#define NAN_DEV_CAPA_EXT_KEY_ID_SUPPORTED	0x02</div><div class='add'>+#define NAN_DEV_CAPA_SIM_NDP_RX_SUPPORTED	0x04</div><div class='add'>+#define NAN_DEV_CAPA_NDPE_SUPPORTED		0x08</div><div class='add'>+#define NAN_DEV_CAPA_S3_SUPPORTED		0x10</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_IEEE80211_NAN_H */</div><div class='head'>diff --git a/include/linux/ieee80211-p2p.h b/include/linux/ieee80211-p2p.h<br/>new file mode 100644<br/>index 000000000000..180891c11f08<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211-p2p.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211-p2p.h</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * WFA P2P definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='add'>+ * &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2005, Devicescape Software, Inc.</div><div class='add'>+ * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_IEEE80211_P2P_H</div><div class='add'>+#define LINUX_IEEE80211_P2P_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+/*</div><div class='add'>+ * Peer-to-Peer IE attribute related definitions.</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * enum ieee80211_p2p_attr_id - identifies type of peer-to-peer attribute.</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_p2p_attr_id {</div><div class='add'>+	IEEE80211_P2P_ATTR_STATUS = 0,</div><div class='add'>+	IEEE80211_P2P_ATTR_MINOR_REASON,</div><div class='add'>+	IEEE80211_P2P_ATTR_CAPABILITY,</div><div class='add'>+	IEEE80211_P2P_ATTR_DEVICE_ID,</div><div class='add'>+	IEEE80211_P2P_ATTR_GO_INTENT,</div><div class='add'>+	IEEE80211_P2P_ATTR_GO_CONFIG_TIMEOUT,</div><div class='add'>+	IEEE80211_P2P_ATTR_LISTEN_CHANNEL,</div><div class='add'>+	IEEE80211_P2P_ATTR_GROUP_BSSID,</div><div class='add'>+	IEEE80211_P2P_ATTR_EXT_LISTEN_TIMING,</div><div class='add'>+	IEEE80211_P2P_ATTR_INTENDED_IFACE_ADDR,</div><div class='add'>+	IEEE80211_P2P_ATTR_MANAGABILITY,</div><div class='add'>+	IEEE80211_P2P_ATTR_CHANNEL_LIST,</div><div class='add'>+	IEEE80211_P2P_ATTR_ABSENCE_NOTICE,</div><div class='add'>+	IEEE80211_P2P_ATTR_DEVICE_INFO,</div><div class='add'>+	IEEE80211_P2P_ATTR_GROUP_INFO,</div><div class='add'>+	IEEE80211_P2P_ATTR_GROUP_ID,</div><div class='add'>+	IEEE80211_P2P_ATTR_INTERFACE,</div><div class='add'>+	IEEE80211_P2P_ATTR_OPER_CHANNEL,</div><div class='add'>+	IEEE80211_P2P_ATTR_INVITE_FLAGS,</div><div class='add'>+	/* 19 - 220: Reserved */</div><div class='add'>+	IEEE80211_P2P_ATTR_VENDOR_SPECIFIC = 221,</div><div class='add'>+</div><div class='add'>+	IEEE80211_P2P_ATTR_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Notice of Absence attribute - described in P2P spec 4.1.14 */</div><div class='add'>+/* Typical max value used here */</div><div class='add'>+#define IEEE80211_P2P_NOA_DESC_MAX	4</div><div class='add'>+</div><div class='add'>+struct ieee80211_p2p_noa_desc {</div><div class='add'>+	u8 count;</div><div class='add'>+	__le32 duration;</div><div class='add'>+	__le32 interval;</div><div class='add'>+	__le32 start_time;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ieee80211_p2p_noa_attr {</div><div class='add'>+	u8 index;</div><div class='add'>+	u8 oppps_ctwindow;</div><div class='add'>+	struct ieee80211_p2p_noa_desc desc[IEEE80211_P2P_NOA_DESC_MAX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_P2P_OPPPS_ENABLE_BIT		BIT(7)</div><div class='add'>+#define IEEE80211_P2P_OPPPS_CTWINDOW_MASK	0x7F</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_IEEE80211_P2P_H */</div><div class='head'>diff --git a/include/linux/ieee80211-s1g.h b/include/linux/ieee80211-s1g.h<br/>new file mode 100644<br/>index 000000000000..5b9ed2dcc00e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211-s1g.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211-s1g.h</a></div><div class='hunk'>@@ -0,0 +1,575 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * IEEE 802.11 S1G definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='add'>+ * &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2005, Devicescape Software, Inc.</div><div class='add'>+ * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_IEEE80211_S1G_H</div><div class='add'>+#define LINUX_IEEE80211_S1G_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+/* bits unique to S1G beacon frame control */</div><div class='add'>+#define IEEE80211_S1G_BCN_NEXT_TBTT	0x100</div><div class='add'>+#define IEEE80211_S1G_BCN_CSSID		0x200</div><div class='add'>+#define IEEE80211_S1G_BCN_ANO		0x400</div><div class='add'>+</div><div class='add'>+/* see 802.11ah-2016 9.9 NDP CMAC frames */</div><div class='add'>+#define IEEE80211_S1G_1MHZ_NDP_BITS	25</div><div class='add'>+#define IEEE80211_S1G_1MHZ_NDP_BYTES	4</div><div class='add'>+#define IEEE80211_S1G_2MHZ_NDP_BITS	37</div><div class='add'>+#define IEEE80211_S1G_2MHZ_NDP_BYTES	5</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_is_s1g_beacon - check if IEEE80211_FTYPE_EXT &amp;&amp;</div><div class='add'>+ * IEEE80211_STYPE_S1G_BEACON</div><div class='add'>+ * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is an S1G beacon</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_is_s1g_beacon(__le16 fc)</div><div class='add'>+{</div><div class='add'>+	return (fc &amp; cpu_to_le16(IEEE80211_FCTL_FTYPE |</div><div class='add'>+				 IEEE80211_FCTL_STYPE)) ==</div><div class='add'>+	       cpu_to_le16(IEEE80211_FTYPE_EXT | IEEE80211_STYPE_S1G_BEACON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_s1g_has_next_tbtt - check if IEEE80211_S1G_BCN_NEXT_TBTT</div><div class='add'>+ * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame contains the variable-length</div><div class='add'>+ *	next TBTT field</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_s1g_has_next_tbtt(__le16 fc)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_is_s1g_beacon(fc) &amp;&amp;</div><div class='add'>+		(fc &amp; cpu_to_le16(IEEE80211_S1G_BCN_NEXT_TBTT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_s1g_has_ano - check if IEEE80211_S1G_BCN_ANO</div><div class='add'>+ * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame contains the variable-length</div><div class='add'>+ *	ANO field</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_s1g_has_ano(__le16 fc)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_is_s1g_beacon(fc) &amp;&amp;</div><div class='add'>+		(fc &amp; cpu_to_le16(IEEE80211_S1G_BCN_ANO));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_s1g_has_cssid - check if IEEE80211_S1G_BCN_CSSID</div><div class='add'>+ * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame contains the variable-length</div><div class='add'>+ *	compressed SSID field</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_s1g_has_cssid(__le16 fc)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_is_s1g_beacon(fc) &amp;&amp;</div><div class='add'>+		(fc &amp; cpu_to_le16(IEEE80211_S1G_BCN_CSSID));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_s1g_chanwidth - S1G channel widths</div><div class='add'>+ * These are defined in IEEE802.11-2016ah Table 10-20</div><div class='add'>+ * as BSS Channel Width</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_S1G_CHANWIDTH_1MHZ: 1MHz operating channel</div><div class='add'>+ * @IEEE80211_S1G_CHANWIDTH_2MHZ: 2MHz operating channel</div><div class='add'>+ * @IEEE80211_S1G_CHANWIDTH_4MHZ: 4MHz operating channel</div><div class='add'>+ * @IEEE80211_S1G_CHANWIDTH_8MHZ: 8MHz operating channel</div><div class='add'>+ * @IEEE80211_S1G_CHANWIDTH_16MHZ: 16MHz operating channel</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_s1g_chanwidth {</div><div class='add'>+	IEEE80211_S1G_CHANWIDTH_1MHZ = 0,</div><div class='add'>+	IEEE80211_S1G_CHANWIDTH_2MHZ = 1,</div><div class='add'>+	IEEE80211_S1G_CHANWIDTH_4MHZ = 3,</div><div class='add'>+	IEEE80211_S1G_CHANWIDTH_8MHZ = 7,</div><div class='add'>+	IEEE80211_S1G_CHANWIDTH_16MHZ = 15,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_s1g_pri_chanwidth - S1G primary channel widths</div><div class='add'>+ *	described in IEEE80211-2024 Table 10-39.</div><div class='add'>+ *</div><div class='add'>+ * @IEEE80211_S1G_PRI_CHANWIDTH_2MHZ: 2MHz primary channel</div><div class='add'>+ * @IEEE80211_S1G_PRI_CHANWIDTH_1MHZ: 1MHz primary channel</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_s1g_pri_chanwidth {</div><div class='add'>+	IEEE80211_S1G_PRI_CHANWIDTH_2MHZ = 0,</div><div class='add'>+	IEEE80211_S1G_PRI_CHANWIDTH_1MHZ = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_s1g_bcn_compat_ie - S1G Beacon Compatibility element</div><div class='add'>+ * @compat_info: Compatibility Information</div><div class='add'>+ * @beacon_int: Beacon Interval</div><div class='add'>+ * @tsf_completion: TSF Completion</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "S1G Beacon</div><div class='add'>+ * Compatibility element" as described in IEEE Std 802.11-2020 section</div><div class='add'>+ * 9.4.2.196.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_s1g_bcn_compat_ie {</div><div class='add'>+	__le16 compat_info;</div><div class='add'>+	__le16 beacon_int;</div><div class='add'>+	__le32 tsf_completion;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_s1g_oper_ie - S1G Operation element</div><div class='add'>+ * @ch_width: S1G Operation Information Channel Width</div><div class='add'>+ * @oper_class: S1G Operation Information Operating Class</div><div class='add'>+ * @primary_ch: S1G Operation Information Primary Channel Number</div><div class='add'>+ * @oper_ch: S1G Operation Information  Channel Center Frequency</div><div class='add'>+ * @basic_mcs_nss: Basic S1G-MCS and NSS Set</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "S1G Operation</div><div class='add'>+ * element" as described in IEEE Std 802.11-2020 section 9.4.2.212.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_s1g_oper_ie {</div><div class='add'>+	u8 ch_width;</div><div class='add'>+	u8 oper_class;</div><div class='add'>+	u8 primary_ch;</div><div class='add'>+	u8 oper_ch;</div><div class='add'>+	__le16 basic_mcs_nss;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_aid_response_ie - AID Response element</div><div class='add'>+ * @aid: AID/Group AID</div><div class='add'>+ * @switch_count: AID Switch Count</div><div class='add'>+ * @response_int: AID Response Interval</div><div class='add'>+ *</div><div class='add'>+ * This structure represents the payload of the "AID Response element"</div><div class='add'>+ * as described in IEEE Std 802.11-2020 section 9.4.2.194.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_aid_response_ie {</div><div class='add'>+	__le16 aid;</div><div class='add'>+	u8 switch_count;</div><div class='add'>+	__le16 response_int;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct ieee80211_s1g_cap {</div><div class='add'>+	u8 capab_info[10];</div><div class='add'>+	u8 supp_mcs_nss[5];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_s1g_optional_len - determine length of optional S1G beacon fields</div><div class='add'>+ * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: total length in bytes of the optional fixed-length fields</div><div class='add'>+ *</div><div class='add'>+ * S1G beacons may contain up to three optional fixed-length fields that</div><div class='add'>+ * precede the variable-length elements. Whether these fields are present</div><div class='add'>+ * is indicated by flags in the frame control field.</div><div class='add'>+ *</div><div class='add'>+ * From IEEE 802.11-2024 section 9.3.4.3:</div><div class='add'>+ *  - Next TBTT field may be 0 or 3 bytes</div><div class='add'>+ *  - Short SSID field may be 0 or 4 bytes</div><div class='add'>+ *  - Access Network Options (ANO) field may be 0 or 1 byte</div><div class='add'>+ */</div><div class='add'>+static inline size_t</div><div class='add'>+ieee80211_s1g_optional_len(__le16 fc)</div><div class='add'>+{</div><div class='add'>+	size_t len = 0;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_s1g_has_next_tbtt(fc))</div><div class='add'>+		len += 3;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_s1g_has_cssid(fc))</div><div class='add'>+		len += 4;</div><div class='add'>+</div><div class='add'>+	if (ieee80211_s1g_has_ano(fc))</div><div class='add'>+		len += 1;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* S1G Capabilities Information field */</div><div class='add'>+#define IEEE80211_S1G_CAPABILITY_LEN	15</div><div class='add'>+</div><div class='add'>+#define S1G_CAP0_S1G_LONG	BIT(0)</div><div class='add'>+#define S1G_CAP0_SGI_1MHZ	BIT(1)</div><div class='add'>+#define S1G_CAP0_SGI_2MHZ	BIT(2)</div><div class='add'>+#define S1G_CAP0_SGI_4MHZ	BIT(3)</div><div class='add'>+#define S1G_CAP0_SGI_8MHZ	BIT(4)</div><div class='add'>+#define S1G_CAP0_SGI_16MHZ	BIT(5)</div><div class='add'>+#define S1G_CAP0_SUPP_CH_WIDTH	GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+#define S1G_SUPP_CH_WIDTH_2	0</div><div class='add'>+#define S1G_SUPP_CH_WIDTH_4	1</div><div class='add'>+#define S1G_SUPP_CH_WIDTH_8	2</div><div class='add'>+#define S1G_SUPP_CH_WIDTH_16	3</div><div class='add'>+#define S1G_SUPP_CH_WIDTH_MAX(cap) ((1 &lt;&lt; FIELD_GET(S1G_CAP0_SUPP_CH_WIDTH, \</div><div class='add'>+						    cap[0])) &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP1_RX_LDPC	BIT(0)</div><div class='add'>+#define S1G_CAP1_TX_STBC	BIT(1)</div><div class='add'>+#define S1G_CAP1_RX_STBC	BIT(2)</div><div class='add'>+#define S1G_CAP1_SU_BFER	BIT(3)</div><div class='add'>+#define S1G_CAP1_SU_BFEE	BIT(4)</div><div class='add'>+#define S1G_CAP1_BFEE_STS	GENMASK(7, 5)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP2_SOUNDING_DIMENSIONS	GENMASK(2, 0)</div><div class='add'>+#define S1G_CAP2_MU_BFER		BIT(3)</div><div class='add'>+#define S1G_CAP2_MU_BFEE		BIT(4)</div><div class='add'>+#define S1G_CAP2_PLUS_HTC_VHT		BIT(5)</div><div class='add'>+#define S1G_CAP2_TRAVELING_PILOT	GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP3_RD_RESPONDER		BIT(0)</div><div class='add'>+#define S1G_CAP3_HT_DELAYED_BA		BIT(1)</div><div class='add'>+#define S1G_CAP3_MAX_MPDU_LEN		BIT(2)</div><div class='add'>+#define S1G_CAP3_MAX_AMPDU_LEN_EXP	GENMASK(4, 3)</div><div class='add'>+#define S1G_CAP3_MIN_MPDU_START		GENMASK(7, 5)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP4_UPLINK_SYNC	BIT(0)</div><div class='add'>+#define S1G_CAP4_DYNAMIC_AID	BIT(1)</div><div class='add'>+#define S1G_CAP4_BAT		BIT(2)</div><div class='add'>+#define S1G_CAP4_TIME_ADE	BIT(3)</div><div class='add'>+#define S1G_CAP4_NON_TIM	BIT(4)</div><div class='add'>+#define S1G_CAP4_GROUP_AID	BIT(5)</div><div class='add'>+#define S1G_CAP4_STA_TYPE	GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP5_CENT_AUTH_CONTROL	BIT(0)</div><div class='add'>+#define S1G_CAP5_DIST_AUTH_CONTROL	BIT(1)</div><div class='add'>+#define S1G_CAP5_AMSDU			BIT(2)</div><div class='add'>+#define S1G_CAP5_AMPDU			BIT(3)</div><div class='add'>+#define S1G_CAP5_ASYMMETRIC_BA		BIT(4)</div><div class='add'>+#define S1G_CAP5_FLOW_CONTROL		BIT(5)</div><div class='add'>+#define S1G_CAP5_SECTORIZED_BEAM	GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP6_OBSS_MITIGATION	BIT(0)</div><div class='add'>+#define S1G_CAP6_FRAGMENT_BA		BIT(1)</div><div class='add'>+#define S1G_CAP6_NDP_PS_POLL		BIT(2)</div><div class='add'>+#define S1G_CAP6_RAW_OPERATION		BIT(3)</div><div class='add'>+#define S1G_CAP6_PAGE_SLICING		BIT(4)</div><div class='add'>+#define S1G_CAP6_TXOP_SHARING_IMP_ACK	BIT(5)</div><div class='add'>+#define S1G_CAP6_VHT_LINK_ADAPT		GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP7_TACK_AS_PS_POLL		BIT(0)</div><div class='add'>+#define S1G_CAP7_DUP_1MHZ			BIT(1)</div><div class='add'>+#define S1G_CAP7_MCS_NEGOTIATION		BIT(2)</div><div class='add'>+#define S1G_CAP7_1MHZ_CTL_RESPONSE_PREAMBLE	BIT(3)</div><div class='add'>+#define S1G_CAP7_NDP_BFING_REPORT_POLL		BIT(4)</div><div class='add'>+#define S1G_CAP7_UNSOLICITED_DYN_AID		BIT(5)</div><div class='add'>+#define S1G_CAP7_SECTOR_TRAINING_OPERATION	BIT(6)</div><div class='add'>+#define S1G_CAP7_TEMP_PS_MODE_SWITCH		BIT(7)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP8_TWT_GROUPING	BIT(0)</div><div class='add'>+#define S1G_CAP8_BDT		BIT(1)</div><div class='add'>+#define S1G_CAP8_COLOR		GENMASK(4, 2)</div><div class='add'>+#define S1G_CAP8_TWT_REQUEST	BIT(5)</div><div class='add'>+#define S1G_CAP8_TWT_RESPOND	BIT(6)</div><div class='add'>+#define S1G_CAP8_PV1_FRAME	BIT(7)</div><div class='add'>+</div><div class='add'>+#define S1G_CAP9_LINK_ADAPT_PER_CONTROL_RESPONSE BIT(0)</div><div class='add'>+</div><div class='add'>+#define S1G_OPER_CH_WIDTH_PRIMARY	BIT(0)</div><div class='add'>+#define S1G_OPER_CH_WIDTH_OPER		GENMASK(4, 1)</div><div class='add'>+#define S1G_OPER_CH_PRIMARY_LOCATION	BIT(5)</div><div class='add'>+</div><div class='add'>+#define S1G_2M_PRIMARY_LOCATION_LOWER	0</div><div class='add'>+#define S1G_2M_PRIMARY_LOCATION_UPPER	1</div><div class='add'>+</div><div class='add'>+#define LISTEN_INT_USF	GENMASK(15, 14)</div><div class='add'>+#define LISTEN_INT_UI	GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MAX_USF	FIELD_MAX(LISTEN_INT_USF)</div><div class='add'>+#define IEEE80211_MAX_UI	FIELD_MAX(LISTEN_INT_UI)</div><div class='add'>+</div><div class='add'>+/* S1G encoding types */</div><div class='add'>+#define IEEE80211_S1G_TIM_ENC_MODE_BLOCK	0</div><div class='add'>+#define IEEE80211_S1G_TIM_ENC_MODE_SINGLE	1</div><div class='add'>+#define IEEE80211_S1G_TIM_ENC_MODE_OLB		2</div><div class='add'>+</div><div class='add'>+enum ieee80211_s1g_actioncode {</div><div class='add'>+	WLAN_S1G_AID_SWITCH_REQUEST,</div><div class='add'>+	WLAN_S1G_AID_SWITCH_RESPONSE,</div><div class='add'>+	WLAN_S1G_SYNC_CONTROL,</div><div class='add'>+	WLAN_S1G_STA_INFO_ANNOUNCE,</div><div class='add'>+	WLAN_S1G_EDCA_PARAM_SET,</div><div class='add'>+	WLAN_S1G_EL_OPERATION,</div><div class='add'>+	WLAN_S1G_TWT_SETUP,</div><div class='add'>+	WLAN_S1G_TWT_TEARDOWN,</div><div class='add'>+	WLAN_S1G_SECT_GROUP_ID_LIST,</div><div class='add'>+	WLAN_S1G_SECT_ID_FEEDBACK,</div><div class='add'>+	WLAN_S1G_TWT_INFORMATION = 11,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_is_s1g_short_beacon - check if frame is an S1G short beacon</div><div class='add'>+ * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * @variable: pointer to the beacon frame elements</div><div class='add'>+ * @variable_len: length of the frame elements</div><div class='add'>+ * Return: whether or not the frame is an S1G short beacon. As per</div><div class='add'>+ *	IEEE80211-2024 11.1.3.10.1, The S1G beacon compatibility element shall</div><div class='add'>+ *	always be present as the first element in beacon frames generated at a</div><div class='add'>+ *	TBTT (Target Beacon Transmission Time), so any frame not containing</div><div class='add'>+ *	this element must have been generated at a TSBTT (Target Short Beacon</div><div class='add'>+ *	Transmission Time) that is not a TBTT. Additionally, short beacons are</div><div class='add'>+ *	prohibited from containing the S1G beacon compatibility element as per</div><div class='add'>+ *	IEEE80211-2024 9.3.4.3 Table 9-76, so if we have an S1G beacon with</div><div class='add'>+ *	either no elements or the first element is not the beacon compatibility</div><div class='add'>+ *	element, we have a short beacon.</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_is_s1g_short_beacon(__le16 fc, const u8 *variable,</div><div class='add'>+						 size_t variable_len)</div><div class='add'>+{</div><div class='add'>+	if (!ieee80211_is_s1g_beacon(fc))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the frame does not contain at least 1 element (this is perfectly</div><div class='add'>+	 * valid in a short beacon) and is an S1G beacon, we have a short</div><div class='add'>+	 * beacon.</div><div class='add'>+	 */</div><div class='add'>+	if (variable_len &lt; 2)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return variable[0] != WLAN_EID_S1G_BCN_COMPAT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct s1g_tim_aid {</div><div class='add'>+	u16 aid;</div><div class='add'>+	u8 target_blk; /* Target block index */</div><div class='add'>+	u8 target_subblk; /* Target subblock index */</div><div class='add'>+	u8 target_subblk_bit; /* Target subblock bit */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct s1g_tim_enc_block {</div><div class='add'>+	u8 enc_mode;</div><div class='add'>+	bool inverse;</div><div class='add'>+	const u8 *ptr;</div><div class='add'>+	u8 len;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For an OLB encoded block that spans multiple blocks, this</div><div class='add'>+	 * is the offset into the span described by that encoded block.</div><div class='add'>+	 */</div><div class='add'>+	u8 olb_blk_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper routines to quickly extract the length of an encoded block. Validation</div><div class='add'>+ * is also performed to ensure the length extracted lies within the TIM.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline int ieee80211_s1g_len_bitmap(const u8 *ptr, const u8 *end)</div><div class='add'>+{</div><div class='add'>+	u8 blkmap;</div><div class='add'>+	u8 n_subblks;</div><div class='add'>+</div><div class='add'>+	if (ptr &gt;= end)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	blkmap = *ptr;</div><div class='add'>+	n_subblks = hweight8(blkmap);</div><div class='add'>+</div><div class='add'>+	if (ptr + 1 + n_subblks &gt; end)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 1 + n_subblks;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ieee80211_s1g_len_single(const u8 *ptr, const u8 *end)</div><div class='add'>+{</div><div class='add'>+	return (ptr + 1 &gt; end) ? -EINVAL : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ieee80211_s1g_len_olb(const u8 *ptr, const u8 *end)</div><div class='add'>+{</div><div class='add'>+	if (ptr &gt;= end)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return (ptr + 1 + *ptr &gt; end) ? -EINVAL : 1 + *ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enumerate all encoded blocks until we find the encoded block that describes</div><div class='add'>+ * our target AID. OLB is a special case as a single encoded block can describe</div><div class='add'>+ * multiple blocks as a single encoded block.</div><div class='add'>+ */</div><div class='add'>+static inline int ieee80211_s1g_find_target_block(struct s1g_tim_enc_block *enc,</div><div class='add'>+						  const struct s1g_tim_aid *aid,</div><div class='add'>+						  const u8 *ptr, const u8 *end)</div><div class='add'>+{</div><div class='add'>+	/* need at least block-control octet */</div><div class='add'>+	while (ptr + 1 &lt;= end) {</div><div class='add'>+		u8 ctrl = *ptr++;</div><div class='add'>+		u8 mode = ctrl &amp; 0x03;</div><div class='add'>+		bool contains, inverse = ctrl &amp; BIT(2);</div><div class='add'>+		u8 span, blk_off = ctrl &gt;&gt; 3;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		switch (mode) {</div><div class='add'>+		case IEEE80211_S1G_TIM_ENC_MODE_BLOCK:</div><div class='add'>+			len = ieee80211_s1g_len_bitmap(ptr, end);</div><div class='add'>+			contains = blk_off == aid-&gt;target_blk;</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_S1G_TIM_ENC_MODE_SINGLE:</div><div class='add'>+			len = ieee80211_s1g_len_single(ptr, end);</div><div class='add'>+			contains = blk_off == aid-&gt;target_blk;</div><div class='add'>+			break;</div><div class='add'>+		case IEEE80211_S1G_TIM_ENC_MODE_OLB:</div><div class='add'>+			len = ieee80211_s1g_len_olb(ptr, end);</div><div class='add'>+			/*</div><div class='add'>+			 * An OLB encoded block can describe more then one</div><div class='add'>+			 * block, meaning an encoded OLB block can span more</div><div class='add'>+			 * then a single block.</div><div class='add'>+			 */</div><div class='add'>+			if (len &gt; 0) {</div><div class='add'>+				/* Minus one for the length octet */</div><div class='add'>+				span = DIV_ROUND_UP(len - 1, 8);</div><div class='add'>+				/*</div><div class='add'>+				 * Check if our target block lies within the</div><div class='add'>+				 * block span described by this encoded block.</div><div class='add'>+				 */</div><div class='add'>+				contains = (aid-&gt;target_blk &gt;= blk_off) &amp;&amp;</div><div class='add'>+					   (aid-&gt;target_blk &lt; blk_off + span);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			return len;</div><div class='add'>+</div><div class='add'>+		if (contains) {</div><div class='add'>+			enc-&gt;enc_mode = mode;</div><div class='add'>+			enc-&gt;inverse = inverse;</div><div class='add'>+			enc-&gt;ptr = ptr;</div><div class='add'>+			enc-&gt;len = (u8)len;</div><div class='add'>+			enc-&gt;olb_blk_offset = blk_off;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ptr += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ieee80211_s1g_parse_bitmap(struct s1g_tim_enc_block *enc,</div><div class='add'>+					      struct s1g_tim_aid *aid)</div><div class='add'>+{</div><div class='add'>+	const u8 *ptr = enc-&gt;ptr;</div><div class='add'>+	u8 blkmap = *ptr++;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If our block bitmap does not contain a set bit that corresponds</div><div class='add'>+	 * to our AID, it could mean a variety of things depending on if</div><div class='add'>+	 * the encoding mode is inverted or not.</div><div class='add'>+	 *</div><div class='add'>+	 * 1. If inverted, it means the entire subblock is present and hence</div><div class='add'>+	 *    our AID has been set.</div><div class='add'>+	 * 2. If not inverted, it means our subblock is not present and hence</div><div class='add'>+	 *    it is all zero meaning our AID is not set.</div><div class='add'>+	 */</div><div class='add'>+	if (!(blkmap &amp; BIT(aid-&gt;target_subblk)))</div><div class='add'>+		return enc-&gt;inverse;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Increment ptr by the number of set subblocks that appear before our</div><div class='add'>+	 * target subblock. If our target subblock is 0, do nothing as ptr</div><div class='add'>+	 * already points to our target subblock.</div><div class='add'>+	 */</div><div class='add'>+	if (aid-&gt;target_subblk)</div><div class='add'>+		ptr += hweight8(blkmap &amp; GENMASK(aid-&gt;target_subblk - 1, 0));</div><div class='add'>+</div><div class='add'>+	return !!(*ptr &amp; BIT(aid-&gt;target_subblk_bit)) ^ enc-&gt;inverse;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ieee80211_s1g_parse_single(struct s1g_tim_enc_block *enc,</div><div class='add'>+					      struct s1g_tim_aid *aid)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Single AID mode describes, as the name suggests, a single AID</div><div class='add'>+	 * within the block described by the encoded block. The octet</div><div class='add'>+	 * contains the 6 LSBs of the AID described in the block. The other</div><div class='add'>+	 * 2 bits are reserved. When inversed, every single AID described</div><div class='add'>+	 * by the current block have buffered traffic except for the AID</div><div class='add'>+	 * described in the single AID octet.</div><div class='add'>+	 */</div><div class='add'>+	return ((*enc-&gt;ptr &amp; 0x3f) == (aid-&gt;aid &amp; 0x3f)) ^ enc-&gt;inverse;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ieee80211_s1g_parse_olb(struct s1g_tim_enc_block *enc,</div><div class='add'>+					   struct s1g_tim_aid *aid)</div><div class='add'>+{</div><div class='add'>+	const u8 *ptr = enc-&gt;ptr;</div><div class='add'>+	u8 blk_len = *ptr++;</div><div class='add'>+	/*</div><div class='add'>+	 * Given an OLB encoded block that describes multiple blocks,</div><div class='add'>+	 * calculate the offset into the span. Then calculate the</div><div class='add'>+	 * subblock location normally.</div><div class='add'>+	 */</div><div class='add'>+	u16 span_offset = aid-&gt;target_blk - enc-&gt;olb_blk_offset;</div><div class='add'>+	u16 subblk_idx = span_offset * 8 + aid-&gt;target_subblk;</div><div class='add'>+</div><div class='add'>+	if (subblk_idx &gt;= blk_len)</div><div class='add'>+		return enc-&gt;inverse;</div><div class='add'>+</div><div class='add'>+	return !!(ptr[subblk_idx] &amp; BIT(aid-&gt;target_subblk_bit)) ^ enc-&gt;inverse;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An S1G PVB has 3 non optional encoding types, each that can be inverted.</div><div class='add'>+ * An S1G PVB is constructed with zero or more encoded block subfields. Each</div><div class='add'>+ * encoded block represents a single "block" of AIDs (64), and each encoded</div><div class='add'>+ * block can contain one of the 3 encoding types alongside a single bit for</div><div class='add'>+ * whether the bits should be inverted.</div><div class='add'>+ *</div><div class='add'>+ * As the standard makes no guarantee about the ordering of encoded blocks,</div><div class='add'>+ * we must parse every encoded block in the worst case scenario given an</div><div class='add'>+ * AID that lies within the last block.</div><div class='add'>+ */</div><div class='add'>+static inline bool ieee80211_s1g_check_tim(const struct ieee80211_tim_ie *tim,</div><div class='add'>+					   u8 tim_len, u16 aid)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct s1g_tim_aid target_aid;</div><div class='add'>+	struct s1g_tim_enc_block enc_blk;</div><div class='add'>+</div><div class='add'>+	if (tim_len &lt; 3)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	target_aid.aid = aid;</div><div class='add'>+	target_aid.target_blk = (aid &gt;&gt; 6) &amp; 0x1f;</div><div class='add'>+	target_aid.target_subblk = (aid &gt;&gt; 3) &amp; 0x7;</div><div class='add'>+	target_aid.target_subblk_bit = aid &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Find our AIDs target encoded block and fill &amp;enc_blk with the</div><div class='add'>+	 * encoded blocks information. If no entry is found or an error</div><div class='add'>+	 * occurs return false.</div><div class='add'>+	 */</div><div class='add'>+	err = ieee80211_s1g_find_target_block(&amp;enc_blk, &amp;target_aid,</div><div class='add'>+					      tim-&gt;virtual_map,</div><div class='add'>+					      (const u8 *)tim + tim_len + 2);</div><div class='add'>+	if (err)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (enc_blk.enc_mode) {</div><div class='add'>+	case IEEE80211_S1G_TIM_ENC_MODE_BLOCK:</div><div class='add'>+		return ieee80211_s1g_parse_bitmap(&amp;enc_blk, &amp;target_aid);</div><div class='add'>+	case IEEE80211_S1G_TIM_ENC_MODE_SINGLE:</div><div class='add'>+		return ieee80211_s1g_parse_single(&amp;enc_blk, &amp;target_aid);</div><div class='add'>+	case IEEE80211_S1G_TIM_ENC_MODE_OLB:</div><div class='add'>+		return ieee80211_s1g_parse_olb(&amp;enc_blk, &amp;target_aid);</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_IEEE80211_H */</div><div class='head'>diff --git a/include/linux/ieee80211-vht.h b/include/linux/ieee80211-vht.h<br/>new file mode 100644<br/>index 000000000000..898dfb561fef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211-vht.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211-vht.h</a></div><div class='hunk'>@@ -0,0 +1,236 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * IEEE 802.11 VHT definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen</div><div class='add'>+ * &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2002-2003, Jouni Malinen &lt;jkmaline@cc.hut.fi&gt;</div><div class='add'>+ * Copyright (c) 2005, Devicescape Software, Inc.</div><div class='add'>+ * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='add'>+ * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='add'>+ * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_IEEE80211_VHT_H</div><div class='add'>+#define LINUX_IEEE80211_VHT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='add'>+#define IEEE80211_MAX_MPDU_LEN_VHT_3895		3895</div><div class='add'>+#define IEEE80211_MAX_MPDU_LEN_VHT_7991		7991</div><div class='add'>+#define IEEE80211_MAX_MPDU_LEN_VHT_11454	11454</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_vht_opmode_bits - VHT operating mode field bits</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK: channel width mask</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ: 20 MHz channel width</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ: 40 MHz channel width</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_80MHZ: 80 MHz channel width</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_160MHZ: 160 MHz or 80+80 MHz channel width</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_BW_160_80P80: 160 / 80+80 MHz indicator flag</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_RX_NSS_MASK: number of spatial streams mask</div><div class='add'>+ *	(the NSS value is the value of this field + 1)</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT: number of spatial streams shift</div><div class='add'>+ * @IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF: indicates streams in SU-MIMO PPDU</div><div class='add'>+ *	using a beamforming steering matrix</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_vht_opmode_bits {</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK	= 0x03,</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ	= 0,</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ	= 1,</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_CHANWIDTH_80MHZ	= 2,</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_CHANWIDTH_160MHZ	= 3,</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_BW_160_80P80	= 0x04,</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_RX_NSS_MASK	= 0x70,</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT	= 4,</div><div class='add'>+	IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF	= 0x80,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum length of AMPDU that the STA can receive in VHT.</div><div class='add'>+ * Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets)</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_vht_max_ampdu_length_exp {</div><div class='add'>+	IEEE80211_VHT_MAX_AMPDU_8K = 0,</div><div class='add'>+	IEEE80211_VHT_MAX_AMPDU_16K = 1,</div><div class='add'>+	IEEE80211_VHT_MAX_AMPDU_32K = 2,</div><div class='add'>+	IEEE80211_VHT_MAX_AMPDU_64K = 3,</div><div class='add'>+	IEEE80211_VHT_MAX_AMPDU_128K = 4,</div><div class='add'>+	IEEE80211_VHT_MAX_AMPDU_256K = 5,</div><div class='add'>+	IEEE80211_VHT_MAX_AMPDU_512K = 6,</div><div class='add'>+	IEEE80211_VHT_MAX_AMPDU_1024K = 7</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_vht_mcs_info - VHT MCS information</div><div class='add'>+ * @rx_mcs_map: RX MCS map 2 bits for each stream, total 8 streams</div><div class='add'>+ * @rx_highest: Indicates highest long GI VHT PPDU data rate</div><div class='add'>+ *	STA can receive. Rate expressed in units of 1 Mbps.</div><div class='add'>+ *	If this field is 0 this value should not be used to</div><div class='add'>+ *	consider the highest RX data rate supported.</div><div class='add'>+ *	The top 3 bits of this field indicate the Maximum NSTS,total</div><div class='add'>+ *	(a beamformee capability.)</div><div class='add'>+ * @tx_mcs_map: TX MCS map 2 bits for each stream, total 8 streams</div><div class='add'>+ * @tx_highest: Indicates highest long GI VHT PPDU data rate</div><div class='add'>+ *	STA can transmit. Rate expressed in units of 1 Mbps.</div><div class='add'>+ *	If this field is 0 this value should not be used to</div><div class='add'>+ *	consider the highest TX data rate supported.</div><div class='add'>+ *	The top 2 bits of this field are reserved, the</div><div class='add'>+ *	3rd bit from the top indiciates VHT Extended NSS BW</div><div class='add'>+ *	Capability.</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_vht_mcs_info {</div><div class='add'>+	__le16 rx_mcs_map;</div><div class='add'>+	__le16 rx_highest;</div><div class='add'>+	__le16 tx_mcs_map;</div><div class='add'>+	__le16 tx_highest;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* for rx_highest */</div><div class='add'>+#define IEEE80211_VHT_MAX_NSTS_TOTAL_SHIFT	13</div><div class='add'>+#define IEEE80211_VHT_MAX_NSTS_TOTAL_MASK	(7 &lt;&lt; IEEE80211_VHT_MAX_NSTS_TOTAL_SHIFT)</div><div class='add'>+</div><div class='add'>+/* for tx_highest */</div><div class='add'>+#define IEEE80211_VHT_EXT_NSS_BW_CAPABLE	(1 &lt;&lt; 13)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_vht_mcs_support - VHT MCS support definitions</div><div class='add'>+ * @IEEE80211_VHT_MCS_SUPPORT_0_7: MCSes 0-7 are supported for the</div><div class='add'>+ *	number of streams</div><div class='add'>+ * @IEEE80211_VHT_MCS_SUPPORT_0_8: MCSes 0-8 are supported</div><div class='add'>+ * @IEEE80211_VHT_MCS_SUPPORT_0_9: MCSes 0-9 are supported</div><div class='add'>+ * @IEEE80211_VHT_MCS_NOT_SUPPORTED: This number of streams isn't supported</div><div class='add'>+ *</div><div class='add'>+ * These definitions are used in each 2-bit subfield of the @rx_mcs_map</div><div class='add'>+ * and @tx_mcs_map fields of &amp;struct ieee80211_vht_mcs_info, which are</div><div class='add'>+ * both split into 8 subfields by number of streams. These values indicate</div><div class='add'>+ * which MCSes are supported for the number of streams the value appears</div><div class='add'>+ * for.</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_vht_mcs_support {</div><div class='add'>+	IEEE80211_VHT_MCS_SUPPORT_0_7	= 0,</div><div class='add'>+	IEEE80211_VHT_MCS_SUPPORT_0_8	= 1,</div><div class='add'>+	IEEE80211_VHT_MCS_SUPPORT_0_9	= 2,</div><div class='add'>+	IEEE80211_VHT_MCS_NOT_SUPPORTED	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_vht_cap - VHT capabilities</div><div class='add'>+ *</div><div class='add'>+ * This structure is the "VHT capabilities element" as</div><div class='add'>+ * described in 802.11ac D3.0 8.4.2.160</div><div class='add'>+ * @vht_cap_info: VHT capability info</div><div class='add'>+ * @supp_mcs: VHT MCS supported rates</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_vht_cap {</div><div class='add'>+	__le32 vht_cap_info;</div><div class='add'>+	struct ieee80211_vht_mcs_info supp_mcs;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum ieee80211_vht_chanwidth - VHT channel width</div><div class='add'>+ * @IEEE80211_VHT_CHANWIDTH_USE_HT: use the HT operation IE to</div><div class='add'>+ *	determine the channel width (20 or 40 MHz)</div><div class='add'>+ * @IEEE80211_VHT_CHANWIDTH_80MHZ: 80 MHz bandwidth</div><div class='add'>+ * @IEEE80211_VHT_CHANWIDTH_160MHZ: 160 MHz bandwidth</div><div class='add'>+ * @IEEE80211_VHT_CHANWIDTH_80P80MHZ: 80+80 MHz bandwidth</div><div class='add'>+ */</div><div class='add'>+enum ieee80211_vht_chanwidth {</div><div class='add'>+	IEEE80211_VHT_CHANWIDTH_USE_HT		= 0,</div><div class='add'>+	IEEE80211_VHT_CHANWIDTH_80MHZ		= 1,</div><div class='add'>+	IEEE80211_VHT_CHANWIDTH_160MHZ		= 2,</div><div class='add'>+	IEEE80211_VHT_CHANWIDTH_80P80MHZ	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ieee80211_vht_operation - VHT operation IE</div><div class='add'>+ *</div><div class='add'>+ * This structure is the "VHT operation element" as</div><div class='add'>+ * described in 802.11ac D3.0 8.4.2.161</div><div class='add'>+ * @chan_width: Operating channel width</div><div class='add'>+ * @center_freq_seg0_idx: center freq segment 0 index</div><div class='add'>+ * @center_freq_seg1_idx: center freq segment 1 index</div><div class='add'>+ * @basic_mcs_set: VHT Basic MCS rate set</div><div class='add'>+ */</div><div class='add'>+struct ieee80211_vht_operation {</div><div class='add'>+	u8 chan_width;</div><div class='add'>+	u8 center_freq_seg0_idx;</div><div class='add'>+	u8 center_freq_seg1_idx;</div><div class='add'>+	__le16 basic_mcs_set;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* 802.11ac VHT Capabilities */</div><div class='add'>+#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895			0x00000000</div><div class='add'>+#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991			0x00000001</div><div class='add'>+#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454			0x00000002</div><div class='add'>+#define IEEE80211_VHT_CAP_MAX_MPDU_MASK				0x00000003</div><div class='add'>+#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ		0x00000004</div><div class='add'>+#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ	0x00000008</div><div class='add'>+#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK			0x0000000C</div><div class='add'>+#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_SHIFT			2</div><div class='add'>+#define IEEE80211_VHT_CAP_RXLDPC				0x00000010</div><div class='add'>+#define IEEE80211_VHT_CAP_SHORT_GI_80				0x00000020</div><div class='add'>+#define IEEE80211_VHT_CAP_SHORT_GI_160				0x00000040</div><div class='add'>+#define IEEE80211_VHT_CAP_TXSTBC				0x00000080</div><div class='add'>+#define IEEE80211_VHT_CAP_RXSTBC_1				0x00000100</div><div class='add'>+#define IEEE80211_VHT_CAP_RXSTBC_2				0x00000200</div><div class='add'>+#define IEEE80211_VHT_CAP_RXSTBC_3				0x00000300</div><div class='add'>+#define IEEE80211_VHT_CAP_RXSTBC_4				0x00000400</div><div class='add'>+#define IEEE80211_VHT_CAP_RXSTBC_MASK				0x00000700</div><div class='add'>+#define IEEE80211_VHT_CAP_RXSTBC_SHIFT				8</div><div class='add'>+#define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE			0x00000800</div><div class='add'>+#define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE			0x00001000</div><div class='add'>+#define IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT                  13</div><div class='add'>+#define IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK			\</div><div class='add'>+		(7 &lt;&lt; IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT)</div><div class='add'>+#define IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT		16</div><div class='add'>+#define IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK		\</div><div class='add'>+		(7 &lt;&lt; IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT)</div><div class='add'>+#define IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE			0x00080000</div><div class='add'>+#define IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE			0x00100000</div><div class='add'>+#define IEEE80211_VHT_CAP_VHT_TXOP_PS				0x00200000</div><div class='add'>+#define IEEE80211_VHT_CAP_HTC_VHT				0x00400000</div><div class='add'>+#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT	23</div><div class='add'>+#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK	\</div><div class='add'>+		(7 &lt;&lt; IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT)</div><div class='add'>+#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB	0x08000000</div><div class='add'>+#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB	0x0c000000</div><div class='add'>+#define IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN			0x10000000</div><div class='add'>+#define IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN			0x20000000</div><div class='add'>+#define IEEE80211_VHT_CAP_EXT_NSS_BW_SHIFT			30</div><div class='add'>+#define IEEE80211_VHT_CAP_EXT_NSS_BW_MASK			0xc0000000</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ieee80211_get_vht_max_nss - return max NSS for a given bandwidth/MCS</div><div class='add'>+ * @cap: VHT capabilities of the peer</div><div class='add'>+ * @bw: bandwidth to use</div><div class='add'>+ * @mcs: MCS index to use</div><div class='add'>+ * @ext_nss_bw_capable: indicates whether or not the local transmitter</div><div class='add'>+ *	(rate scaling algorithm) can deal with the new logic</div><div class='add'>+ *	(dot11VHTExtendedNSSBWCapable)</div><div class='add'>+ * @max_vht_nss: current maximum NSS as advertised by the STA in</div><div class='add'>+ *	operating mode notification, can be 0 in which case the</div><div class='add'>+ *	capability data will be used to derive this (from MCS support)</div><div class='add'>+ * Return: The maximum NSS that can be used for the given bandwidth/MCS</div><div class='add'>+ *	combination</div><div class='add'>+ *</div><div class='add'>+ * Due to the VHT Extended NSS Bandwidth Support, the maximum NSS can</div><div class='add'>+ * vary for a given BW/MCS. This function parses the data.</div><div class='add'>+ *</div><div class='add'>+ * Note: This function is exported by cfg80211.</div><div class='add'>+ */</div><div class='add'>+int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,</div><div class='add'>+			      enum ieee80211_vht_chanwidth bw,</div><div class='add'>+			      int mcs, bool ext_nss_bw_capable,</div><div class='add'>+			      unsigned int max_vht_nss);</div><div class='add'>+</div><div class='add'>+/* VHT action codes */</div><div class='add'>+enum ieee80211_vht_actioncode {</div><div class='add'>+	WLAN_VHT_ACTION_COMPRESSED_BF = 0,</div><div class='add'>+	WLAN_VHT_ACTION_GROUPID_MGMT = 1,</div><div class='add'>+	WLAN_VHT_ACTION_OPMODE_NOTIF = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_IEEE80211_VHT_H */</div><div class='head'>diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h<br/>index 3385a2cc5b09..96439de55f07 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ieee80211.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ieee80211.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ieee80211.h</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  * Copyright (c) 2006, Michael Wu &lt;flamingice@sourmilk.net&gt;</div><div class='ctx'>  * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH</div><div class='ctx'>  * Copyright (c) 2016 - 2017 Intel Deutschland GmbH</div><div class='del'>- * Copyright (c) 2018 - 2024 Intel Corporation</div><div class='add'>+ * Copyright (c) 2018 - 2025 Intel Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef LINUX_IEEE80211_H</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DS bit usage</div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #define IEEE80211_FCTL_VERS		0x0003</div><div class='ctx'> #define IEEE80211_FCTL_FTYPE		0x000c</div><div class='ctx'> #define IEEE80211_FCTL_STYPE		0x00f0</div><div class='add'>+#define IEEE80211_FCTL_TYPE		(IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)</div><div class='ctx'> #define IEEE80211_FCTL_TODS		0x0100</div><div class='ctx'> #define IEEE80211_FCTL_FROMDS		0x0200</div><div class='ctx'> #define IEEE80211_FCTL_MOREFRAGS	0x0400</div><div class='hunk'>@@ -109,15 +110,6 @@</div><div class='ctx'> #define IEEE80211_STYPE_DMG_BEACON		0x0000</div><div class='ctx'> #define IEEE80211_STYPE_S1G_BEACON		0x0010</div><div class='ctx'> </div><div class='del'>-/* bits unique to S1G beacon */</div><div class='del'>-#define IEEE80211_S1G_BCN_NEXT_TBTT	0x100</div><div class='del'>-</div><div class='del'>-/* see 802.11ah-2016 9.9 NDP CMAC frames */</div><div class='del'>-#define IEEE80211_S1G_1MHZ_NDP_BITS	25</div><div class='del'>-#define IEEE80211_S1G_1MHZ_NDP_BYTES	4</div><div class='del'>-#define IEEE80211_S1G_2MHZ_NDP_BITS	37</div><div class='del'>-#define IEEE80211_S1G_2MHZ_NDP_BYTES	5</div><div class='del'>-</div><div class='ctx'> #define IEEE80211_NDP_FTYPE_CTS			0</div><div class='ctx'> #define IEEE80211_NDP_FTYPE_CF_END		0</div><div class='ctx'> #define IEEE80211_NDP_FTYPE_PS_POLL		1</div><div class='hunk'>@@ -153,9 +145,6 @@</div><div class='ctx'> </div><div class='ctx'> #define IEEE80211_ANO_NETTYPE_WILD              15</div><div class='ctx'> </div><div class='del'>-/* bits unique to S1G beacon */</div><div class='del'>-#define IEEE80211_S1G_BCN_NEXT_TBTT    0x100</div><div class='del'>-</div><div class='ctx'> /* control extension - for IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTL_EXT */</div><div class='ctx'> #define IEEE80211_CTL_EXT_POLL		0x2000</div><div class='ctx'> #define IEEE80211_CTL_EXT_SPR		0x3000</div><div class='hunk'>@@ -221,6 +210,7 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)</div><div class='ctx'> #define IEEE80211_MAX_AID_S1G		8191</div><div class='ctx'> #define IEEE80211_MAX_TIM_LEN		251</div><div class='ctx'> #define IEEE80211_MAX_MESH_PEERINGS	63</div><div class='add'>+</div><div class='ctx'> /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section</div><div class='ctx'>    6.2.1.1.2.</div><div class='ctx'> </div><div class='hunk'>@@ -234,21 +224,8 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)</div><div class='ctx'> /* 30 byte 4 addr hdr, 2 byte QoS, 2304 byte MSDU, 12 byte crypt, 4 byte FCS */</div><div class='ctx'> #define IEEE80211_MAX_FRAME_LEN		2352</div><div class='ctx'> </div><div class='del'>-/* Maximal size of an A-MSDU that can be transported in a HT BA session */</div><div class='del'>-#define IEEE80211_MAX_MPDU_LEN_HT_BA		4095</div><div class='del'>-</div><div class='del'>-/* Maximal size of an A-MSDU */</div><div class='del'>-#define IEEE80211_MAX_MPDU_LEN_HT_3839		3839</div><div class='del'>-#define IEEE80211_MAX_MPDU_LEN_HT_7935		7935</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MAX_MPDU_LEN_VHT_3895		3895</div><div class='del'>-#define IEEE80211_MAX_MPDU_LEN_VHT_7991		7991</div><div class='del'>-#define IEEE80211_MAX_MPDU_LEN_VHT_11454	11454</div><div class='del'>-</div><div class='ctx'> #define IEEE80211_MAX_SSID_LEN		32</div><div class='ctx'> </div><div class='del'>-#define IEEE80211_MAX_MESH_ID_LEN	32</div><div class='del'>-</div><div class='ctx'> #define IEEE80211_FIRST_TSPEC_TSID	8</div><div class='ctx'> #define IEEE80211_NUM_TIDS		16</div><div class='ctx'> </div><div class='hunk'>@@ -299,8 +276,6 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)</div><div class='ctx'> #define IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK	0x03</div><div class='ctx'> #define IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT	5</div><div class='ctx'> </div><div class='del'>-#define IEEE80211_HT_CTL_LEN		4</div><div class='del'>-</div><div class='ctx'> /* trigger type within common_info of trigger frame */</div><div class='ctx'> #define IEEE80211_TRIGGER_TYPE_MASK		0xf</div><div class='ctx'> #define IEEE80211_TRIGGER_TYPE_BASIC		0x0</div><div class='hunk'>@@ -373,6 +348,7 @@ struct ieee80211_trigger {</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_tods - check if IEEE80211_FCTL_TODS is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame has to-DS set</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_tods(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -382,6 +358,7 @@ static inline bool ieee80211_has_tods(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_fromds - check if IEEE80211_FCTL_FROMDS is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame has from-DS set</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_fromds(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -391,6 +368,7 @@ static inline bool ieee80211_has_fromds(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_a4 - check if IEEE80211_FCTL_TODS and IEEE80211_FCTL_FROMDS are set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not it's a 4-address frame (from-DS and to-DS set)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_a4(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -401,6 +379,7 @@ static inline bool ieee80211_has_a4(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_morefrags - check if IEEE80211_FCTL_MOREFRAGS is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame has more fragments (more frags bit set)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_morefrags(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -410,6 +389,7 @@ static inline bool ieee80211_has_morefrags(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_retry - check if IEEE80211_FCTL_RETRY is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the retry flag is set</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_retry(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -419,6 +399,7 @@ static inline bool ieee80211_has_retry(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_pm - check if IEEE80211_FCTL_PM is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the power management flag is set</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_pm(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -428,6 +409,7 @@ static inline bool ieee80211_has_pm(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_moredata - check if IEEE80211_FCTL_MOREDATA is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the more data flag is set</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_moredata(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -437,6 +419,7 @@ static inline bool ieee80211_has_moredata(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_protected - check if IEEE80211_FCTL_PROTECTED is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the protected flag is set</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_protected(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -446,6 +429,7 @@ static inline bool ieee80211_has_protected(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_has_order - check if IEEE80211_FCTL_ORDER is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the order flag is set</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_has_order(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -455,6 +439,7 @@ static inline bool ieee80211_has_order(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_mgmt - check if type is IEEE80211_FTYPE_MGMT</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame type is management</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_mgmt(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -465,6 +450,7 @@ static inline bool ieee80211_is_mgmt(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_ctl - check if type is IEEE80211_FTYPE_CTL</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame type is control</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_ctl(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -475,6 +461,7 @@ static inline bool ieee80211_is_ctl(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_data - check if type is IEEE80211_FTYPE_DATA</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a data frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_data(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -485,6 +472,7 @@ static inline bool ieee80211_is_data(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_ext - check if type is IEEE80211_FTYPE_EXT</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame type is extended</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_ext(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -496,6 +484,7 @@ static inline bool ieee80211_is_ext(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_data_qos - check if type is IEEE80211_FTYPE_DATA and IEEE80211_STYPE_QOS_DATA is set</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a QoS data frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_data_qos(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -510,6 +499,8 @@ static inline bool ieee80211_is_data_qos(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_data_present - check if type is IEEE80211_FTYPE_DATA and has data</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a QoS data frame that has data</div><div class='add'>+ *	(i.e. is not null data)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_data_present(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -524,6 +515,7 @@ static inline bool ieee80211_is_data_present(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_assoc_req - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_ASSOC_REQ</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is an association request</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_assoc_req(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -534,6 +526,7 @@ static inline bool ieee80211_is_assoc_req(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_assoc_resp - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_ASSOC_RESP</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is an association response</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_assoc_resp(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -544,6 +537,7 @@ static inline bool ieee80211_is_assoc_resp(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_reassoc_req - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_REASSOC_REQ</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a reassociation request</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_reassoc_req(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -554,6 +548,7 @@ static inline bool ieee80211_is_reassoc_req(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_reassoc_resp - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_REASSOC_RESP</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a reassociation response</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_reassoc_resp(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -564,6 +559,7 @@ static inline bool ieee80211_is_reassoc_resp(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_probe_req - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_PROBE_REQ</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a probe request</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_probe_req(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -574,6 +570,7 @@ static inline bool ieee80211_is_probe_req(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_probe_resp - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_PROBE_RESP</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a probe response</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_probe_resp(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -584,6 +581,7 @@ static inline bool ieee80211_is_probe_resp(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_beacon - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_BEACON</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a (regular, not S1G) beacon</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_beacon(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -592,42 +590,9 @@ static inline bool ieee80211_is_beacon(__le16 fc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ieee80211_is_s1g_beacon - check if IEEE80211_FTYPE_EXT &amp;&amp;</div><div class='del'>- * IEEE80211_STYPE_S1G_BEACON</div><div class='del'>- * @fc: frame control bytes in little-endian byteorder</div><div class='del'>- */</div><div class='del'>-static inline bool ieee80211_is_s1g_beacon(__le16 fc)</div><div class='del'>-{</div><div class='del'>-	return (fc &amp; cpu_to_le16(IEEE80211_FCTL_FTYPE |</div><div class='del'>-				 IEEE80211_FCTL_STYPE)) ==</div><div class='del'>-	       cpu_to_le16(IEEE80211_FTYPE_EXT | IEEE80211_STYPE_S1G_BEACON);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_next_tbtt_present - check if IEEE80211_FTYPE_EXT &amp;&amp;</div><div class='del'>- * IEEE80211_STYPE_S1G_BEACON &amp;&amp; IEEE80211_S1G_BCN_NEXT_TBTT</div><div class='del'>- * @fc: frame control bytes in little-endian byteorder</div><div class='del'>- */</div><div class='del'>-static inline bool ieee80211_next_tbtt_present(__le16 fc)</div><div class='del'>-{</div><div class='del'>-	return (fc &amp; cpu_to_le16(IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) ==</div><div class='del'>-	       cpu_to_le16(IEEE80211_FTYPE_EXT | IEEE80211_STYPE_S1G_BEACON) &amp;&amp;</div><div class='del'>-	       fc &amp; cpu_to_le16(IEEE80211_S1G_BCN_NEXT_TBTT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_is_s1g_short_beacon - check if next tbtt present bit is set. Only</div><div class='del'>- * true for S1G beacons when they're short.</div><div class='del'>- * @fc: frame control bytes in little-endian byteorder</div><div class='del'>- */</div><div class='del'>-static inline bool ieee80211_is_s1g_short_beacon(__le16 fc)</div><div class='del'>-{</div><div class='del'>-	return ieee80211_is_s1g_beacon(fc) &amp;&amp; ieee80211_next_tbtt_present(fc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * ieee80211_is_atim - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_ATIM</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is an ATIM frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_atim(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -638,6 +603,7 @@ static inline bool ieee80211_is_atim(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_disassoc - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_DISASSOC</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a disassociation frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_disassoc(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -648,6 +614,7 @@ static inline bool ieee80211_is_disassoc(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_auth - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_AUTH</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is an authentication frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_auth(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -658,6 +625,7 @@ static inline bool ieee80211_is_auth(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_deauth - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_DEAUTH</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a deauthentication frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_deauth(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -668,6 +636,7 @@ static inline bool ieee80211_is_deauth(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_action - check if IEEE80211_FTYPE_MGMT &amp;&amp; IEEE80211_STYPE_ACTION</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is an action frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_action(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -678,6 +647,7 @@ static inline bool ieee80211_is_action(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_back_req - check if IEEE80211_FTYPE_CTL &amp;&amp; IEEE80211_STYPE_BACK_REQ</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a block-ACK request frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_back_req(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -688,6 +658,7 @@ static inline bool ieee80211_is_back_req(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_back - check if IEEE80211_FTYPE_CTL &amp;&amp; IEEE80211_STYPE_BACK</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a block-ACK frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_back(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -698,6 +669,7 @@ static inline bool ieee80211_is_back(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_pspoll - check if IEEE80211_FTYPE_CTL &amp;&amp; IEEE80211_STYPE_PSPOLL</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a PS-poll frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_pspoll(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -708,6 +680,7 @@ static inline bool ieee80211_is_pspoll(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_rts - check if IEEE80211_FTYPE_CTL &amp;&amp; IEEE80211_STYPE_RTS</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is an RTS frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_rts(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -718,6 +691,7 @@ static inline bool ieee80211_is_rts(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_cts - check if IEEE80211_FTYPE_CTL &amp;&amp; IEEE80211_STYPE_CTS</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a CTS frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_cts(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -728,6 +702,7 @@ static inline bool ieee80211_is_cts(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_ack - check if IEEE80211_FTYPE_CTL &amp;&amp; IEEE80211_STYPE_ACK</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is an ACK frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_ack(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -738,6 +713,7 @@ static inline bool ieee80211_is_ack(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_cfend - check if IEEE80211_FTYPE_CTL &amp;&amp; IEEE80211_STYPE_CFEND</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a CF-end frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_cfend(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -748,6 +724,7 @@ static inline bool ieee80211_is_cfend(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_cfendack - check if IEEE80211_FTYPE_CTL &amp;&amp; IEEE80211_STYPE_CFENDACK</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a CF-end-ack frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_cfendack(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -758,6 +735,7 @@ static inline bool ieee80211_is_cfendack(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_nullfunc - check if frame is a regular (non-QoS) nullfunc frame</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a nullfunc frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_nullfunc(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -768,6 +746,7 @@ static inline bool ieee80211_is_nullfunc(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_qos_nullfunc - check if frame is a QoS nullfunc frame</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a QoS nullfunc frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_qos_nullfunc(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -778,6 +757,7 @@ static inline bool ieee80211_is_qos_nullfunc(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_trigger - check if frame is trigger frame</div><div class='ctx'>  * @fc: frame control field in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a trigger frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_trigger(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -788,6 +768,7 @@ static inline bool ieee80211_is_trigger(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_any_nullfunc - check if frame is regular or QoS nullfunc frame</div><div class='ctx'>  * @fc: frame control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is a nullfunc or QoS nullfunc frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_any_nullfunc(__le16 fc)</div><div class='ctx'> {</div><div class='hunk'>@@ -797,6 +778,8 @@ static inline bool ieee80211_is_any_nullfunc(__le16 fc)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set</div><div class='ctx'>  * @seq_ctrl: frame sequence control bytes in little-endian byteorder</div><div class='add'>+ * Return: whether or not the frame is the first fragment (also true if</div><div class='add'>+ *	it's not fragmented at all)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_first_frag(__le16 seq_ctrl)</div><div class='ctx'> {</div><div class='hunk'>@@ -806,6 +789,7 @@ static inline bool ieee80211_is_first_frag(__le16 seq_ctrl)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_frag - check if a frame is a fragment</div><div class='ctx'>  * @hdr: 802.11 header of the frame</div><div class='add'>+ * Return: whether or not the frame is a fragment</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_frag(struct ieee80211_hdr *hdr)</div><div class='ctx'> {</div><div class='hunk'>@@ -818,40 +802,6 @@ static inline u16 ieee80211_get_sn(struct ieee80211_hdr *hdr)</div><div class='ctx'> 	return le16_get_bits(hdr-&gt;seq_ctrl, IEEE80211_SCTL_SEQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ieee80211s_hdr {</div><div class='del'>-	u8 flags;</div><div class='del'>-	u8 ttl;</div><div class='del'>-	__le32 seqnum;</div><div class='del'>-	u8 eaddr1[ETH_ALEN];</div><div class='del'>-	u8 eaddr2[ETH_ALEN];</div><div class='del'>-} __packed __aligned(2);</div><div class='del'>-</div><div class='del'>-/* Mesh flags */</div><div class='del'>-#define MESH_FLAGS_AE_A4 	0x1</div><div class='del'>-#define MESH_FLAGS_AE_A5_A6	0x2</div><div class='del'>-#define MESH_FLAGS_AE		0x3</div><div class='del'>-#define MESH_FLAGS_PS_DEEP	0x4</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_preq_flags - mesh PREQ element flags</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_PREQ_PROACTIVE_PREP_FLAG: proactive PREP subfield</div><div class='del'>- */</div><div class='del'>-enum ieee80211_preq_flags {</div><div class='del'>-	IEEE80211_PREQ_PROACTIVE_PREP_FLAG	= 1&lt;&lt;2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_preq_target_flags - mesh PREQ element per target flags</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_PREQ_TO_FLAG: target only subfield</div><div class='del'>- * @IEEE80211_PREQ_USN_FLAG: unknown target HWMP sequence number subfield</div><div class='del'>- */</div><div class='del'>-enum ieee80211_preq_target_flags {</div><div class='del'>-	IEEE80211_PREQ_TO_FLAG	= 1&lt;&lt;0,</div><div class='del'>-	IEEE80211_PREQ_USN_FLAG	= 1&lt;&lt;2,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct ieee80211_quiet_ie - Quiet element</div><div class='ctx'>  * @count: Quiet Count</div><div class='hunk'>@@ -931,24 +881,6 @@ struct ieee80211_sec_chan_offs_ie {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct ieee80211_mesh_chansw_params_ie - mesh channel switch parameters IE</div><div class='del'>- * @mesh_ttl: Time To Live</div><div class='del'>- * @mesh_flags: Flags</div><div class='del'>- * @mesh_reason: Reason Code</div><div class='del'>- * @mesh_pre_value: Precedence Value</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "Mesh Channel Switch</div><div class='del'>- * Parameters element" as described in IEEE Std 802.11-2020 section</div><div class='del'>- * 9.4.2.102.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_mesh_chansw_params_ie {</div><div class='del'>-	u8 mesh_ttl;</div><div class='del'>-	u8 mesh_flags;</div><div class='del'>-	__le16 mesh_reason;</div><div class='del'>-	__le16 mesh_pre_value;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct ieee80211_wide_bw_chansw_ie - wide bandwidth channel switch IE</div><div class='ctx'>  * @new_channel_width: New Channel Width</div><div class='ctx'>  * @new_center_freq_seg0: New Channel Center Frequency Segment 0</div><div class='hunk'>@@ -988,137 +920,6 @@ struct ieee80211_tim_ie {</div><div class='ctx'> 	};</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_meshconf_ie - Mesh Configuration element</div><div class='del'>- * @meshconf_psel: Active Path Selection Protocol Identifier</div><div class='del'>- * @meshconf_pmetric: Active Path Selection Metric Identifier</div><div class='del'>- * @meshconf_congest: Congestion Control Mode Identifier</div><div class='del'>- * @meshconf_synch: Synchronization Method Identifier</div><div class='del'>- * @meshconf_auth: Authentication Protocol Identifier</div><div class='del'>- * @meshconf_form: Mesh Formation Info</div><div class='del'>- * @meshconf_cap: Mesh Capability (see &amp;enum mesh_config_capab_flags)</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "Mesh Configuration</div><div class='del'>- * element" as described in IEEE Std 802.11-2020 section 9.4.2.97.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_meshconf_ie {</div><div class='del'>-	u8 meshconf_psel;</div><div class='del'>-	u8 meshconf_pmetric;</div><div class='del'>-	u8 meshconf_congest;</div><div class='del'>-	u8 meshconf_synch;</div><div class='del'>-	u8 meshconf_auth;</div><div class='del'>-	u8 meshconf_form;</div><div class='del'>-	u8 meshconf_cap;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum mesh_config_capab_flags - Mesh Configuration IE capability field flags</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS: STA is willing to establish</div><div class='del'>- *	additional mesh peerings with other mesh STAs</div><div class='del'>- * @IEEE80211_MESHCONF_CAPAB_FORWARDING: the STA forwards MSDUs</div><div class='del'>- * @IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING: TBTT adjustment procedure</div><div class='del'>- *	is ongoing</div><div class='del'>- * @IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL: STA is in deep sleep mode or has</div><div class='del'>- *	neighbors in deep sleep mode</div><div class='del'>- *</div><div class='del'>- * Enumerates the "Mesh Capability" as described in IEEE Std</div><div class='del'>- * 802.11-2020 section 9.4.2.97.7.</div><div class='del'>- */</div><div class='del'>-enum mesh_config_capab_flags {</div><div class='del'>-	IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS		= 0x01,</div><div class='del'>-	IEEE80211_MESHCONF_CAPAB_FORWARDING		= 0x08,</div><div class='del'>-	IEEE80211_MESHCONF_CAPAB_TBTT_ADJUSTING		= 0x20,</div><div class='del'>-	IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL	= 0x40,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MESHCONF_FORM_CONNECTED_TO_GATE 0x1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mesh channel switch parameters element's flag indicator</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#define WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT BIT(0)</div><div class='del'>-#define WLAN_EID_CHAN_SWITCH_PARAM_INITIATOR BIT(1)</div><div class='del'>-#define WLAN_EID_CHAN_SWITCH_PARAM_REASON BIT(2)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_rann_ie - RANN (root announcement) element</div><div class='del'>- * @rann_flags: Flags</div><div class='del'>- * @rann_hopcount: Hop Count</div><div class='del'>- * @rann_ttl: Element TTL</div><div class='del'>- * @rann_addr: Root Mesh STA Address</div><div class='del'>- * @rann_seq: HWMP Sequence Number</div><div class='del'>- * @rann_interval: Interval</div><div class='del'>- * @rann_metric: Metric</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "RANN element" as</div><div class='del'>- * described in IEEE Std 802.11-2020 section 9.4.2.111.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_rann_ie {</div><div class='del'>-	u8 rann_flags;</div><div class='del'>-	u8 rann_hopcount;</div><div class='del'>-	u8 rann_ttl;</div><div class='del'>-	u8 rann_addr[ETH_ALEN];</div><div class='del'>-	__le32 rann_seq;</div><div class='del'>-	__le32 rann_interval;</div><div class='del'>-	__le32 rann_metric;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-enum ieee80211_rann_flags {</div><div class='del'>-	RANN_FLAG_IS_GATE = 1 &lt;&lt; 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum ieee80211_ht_chanwidth_values {</div><div class='del'>-	IEEE80211_HT_CHANWIDTH_20MHZ = 0,</div><div class='del'>-	IEEE80211_HT_CHANWIDTH_ANY = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_vht_opmode_bits - VHT operating mode field bits</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK: channel width mask</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ: 20 MHz channel width</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ: 40 MHz channel width</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_80MHZ: 80 MHz channel width</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_160MHZ: 160 MHz or 80+80 MHz channel width</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_BW_160_80P80: 160 / 80+80 MHz indicator flag</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_RX_NSS_MASK: number of spatial streams mask</div><div class='del'>- *	(the NSS value is the value of this field + 1)</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT: number of spatial streams shift</div><div class='del'>- * @IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF: indicates streams in SU-MIMO PPDU</div><div class='del'>- *	using a beamforming steering matrix</div><div class='del'>- */</div><div class='del'>-enum ieee80211_vht_opmode_bits {</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK	= 0x03,</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ	= 0,</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ	= 1,</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_CHANWIDTH_80MHZ	= 2,</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_CHANWIDTH_160MHZ	= 3,</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_BW_160_80P80	= 0x04,</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_RX_NSS_MASK	= 0x70,</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT	= 4,</div><div class='del'>-	IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF	= 0x80,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_s1g_chanwidth</div><div class='del'>- * These are defined in IEEE802.11-2016ah Table 10-20</div><div class='del'>- * as BSS Channel Width</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_S1G_CHANWIDTH_1MHZ: 1MHz operating channel</div><div class='del'>- * @IEEE80211_S1G_CHANWIDTH_2MHZ: 2MHz operating channel</div><div class='del'>- * @IEEE80211_S1G_CHANWIDTH_4MHZ: 4MHz operating channel</div><div class='del'>- * @IEEE80211_S1G_CHANWIDTH_8MHZ: 8MHz operating channel</div><div class='del'>- * @IEEE80211_S1G_CHANWIDTH_16MHZ: 16MHz operating channel</div><div class='del'>- */</div><div class='del'>-enum ieee80211_s1g_chanwidth {</div><div class='del'>-	IEEE80211_S1G_CHANWIDTH_1MHZ = 0,</div><div class='del'>-	IEEE80211_S1G_CHANWIDTH_2MHZ = 1,</div><div class='del'>-	IEEE80211_S1G_CHANWIDTH_4MHZ = 3,</div><div class='del'>-	IEEE80211_S1G_CHANWIDTH_8MHZ = 7,</div><div class='del'>-	IEEE80211_S1G_CHANWIDTH_16MHZ = 15,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define WLAN_SA_QUERY_TR_ID_LEN 2</div><div class='ctx'> #define WLAN_MEMBERSHIP_LEN 8</div><div class='ctx'> #define WLAN_USER_POSITION_LEN 16</div><div class='hunk'>@@ -1146,61 +947,6 @@ struct ieee80211_addba_ext_ie {</div><div class='ctx'> 	u8 data;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_s1g_bcn_compat_ie - S1G Beacon Compatibility element</div><div class='del'>- * @compat_info: Compatibility Information</div><div class='del'>- * @beacon_int: Beacon Interval</div><div class='del'>- * @tsf_completion: TSF Completion</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "S1G Beacon</div><div class='del'>- * Compatibility element" as described in IEEE Std 802.11-2020 section</div><div class='del'>- * 9.4.2.196.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_s1g_bcn_compat_ie {</div><div class='del'>-	__le16 compat_info;</div><div class='del'>-	__le16 beacon_int;</div><div class='del'>-	__le32 tsf_completion;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_s1g_oper_ie - S1G Operation element</div><div class='del'>- * @ch_width: S1G Operation Information Channel Width</div><div class='del'>- * @oper_class: S1G Operation Information Operating Class</div><div class='del'>- * @primary_ch: S1G Operation Information Primary Channel Number</div><div class='del'>- * @oper_ch: S1G Operation Information  Channel Center Frequency</div><div class='del'>- * @basic_mcs_nss: Basic S1G-MCS and NSS Set</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "S1G Operation</div><div class='del'>- * element" as described in IEEE Std 802.11-2020 section 9.4.2.212.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_s1g_oper_ie {</div><div class='del'>-	u8 ch_width;</div><div class='del'>-	u8 oper_class;</div><div class='del'>-	u8 primary_ch;</div><div class='del'>-	u8 oper_ch;</div><div class='del'>-	__le16 basic_mcs_nss;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_aid_response_ie - AID Response element</div><div class='del'>- * @aid: AID/Group AID</div><div class='del'>- * @switch_count: AID Switch Count</div><div class='del'>- * @response_int: AID Response Interval</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "AID Response element"</div><div class='del'>- * as described in IEEE Std 802.11-2020 section 9.4.2.194.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_aid_response_ie {</div><div class='del'>-	__le16 aid;</div><div class='del'>-	u8 switch_count;</div><div class='del'>-	__le16 response_int;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ieee80211_s1g_cap {</div><div class='del'>-	u8 capab_info[10];</div><div class='del'>-	u8 supp_mcs_nss[5];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='ctx'> struct ieee80211_ext {</div><div class='ctx'> 	__le16 frame_control;</div><div class='ctx'> 	__le16 duration;</div><div class='hunk'>@@ -1209,82 +955,27 @@ struct ieee80211_ext {</div><div class='ctx'> 			u8 sa[ETH_ALEN];</div><div class='ctx'> 			__le32 timestamp;</div><div class='ctx'> 			u8 change_seq;</div><div class='del'>-			u8 variable[0];</div><div class='add'>+			u8 variable[];</div><div class='ctx'> 		} __packed s1g_beacon;</div><div class='del'>-		struct {</div><div class='del'>-			u8 sa[ETH_ALEN];</div><div class='del'>-			__le32 timestamp;</div><div class='del'>-			u8 change_seq;</div><div class='del'>-			u8 next_tbtt[3];</div><div class='del'>-			u8 variable[0];</div><div class='del'>-		} __packed s1g_short_beacon;</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed __aligned(2);</div><div class='ctx'> </div><div class='del'>-#define IEEE80211_TWT_CONTROL_NDP			BIT(0)</div><div class='del'>-#define IEEE80211_TWT_CONTROL_RESP_MODE			BIT(1)</div><div class='del'>-#define IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST	BIT(3)</div><div class='del'>-#define IEEE80211_TWT_CONTROL_RX_DISABLED		BIT(4)</div><div class='del'>-#define IEEE80211_TWT_CONTROL_WAKE_DUR_UNIT		BIT(5)</div><div class='del'>-</div><div class='del'>-#define IEEE80211_TWT_REQTYPE_REQUEST			BIT(0)</div><div class='del'>-#define IEEE80211_TWT_REQTYPE_SETUP_CMD			GENMASK(3, 1)</div><div class='del'>-#define IEEE80211_TWT_REQTYPE_TRIGGER			BIT(4)</div><div class='del'>-#define IEEE80211_TWT_REQTYPE_IMPLICIT			BIT(5)</div><div class='del'>-#define IEEE80211_TWT_REQTYPE_FLOWTYPE			BIT(6)</div><div class='del'>-#define IEEE80211_TWT_REQTYPE_FLOWID			GENMASK(9, 7)</div><div class='del'>-#define IEEE80211_TWT_REQTYPE_WAKE_INT_EXP		GENMASK(14, 10)</div><div class='del'>-#define IEEE80211_TWT_REQTYPE_PROTECTION		BIT(15)</div><div class='del'>-</div><div class='del'>-enum ieee80211_twt_setup_cmd {</div><div class='del'>-	TWT_SETUP_CMD_REQUEST,</div><div class='del'>-	TWT_SETUP_CMD_SUGGEST,</div><div class='del'>-	TWT_SETUP_CMD_DEMAND,</div><div class='del'>-	TWT_SETUP_CMD_GROUPING,</div><div class='del'>-	TWT_SETUP_CMD_ACCEPT,</div><div class='del'>-	TWT_SETUP_CMD_ALTERNATE,</div><div class='del'>-	TWT_SETUP_CMD_DICTATE,</div><div class='del'>-	TWT_SETUP_CMD_REJECT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ieee80211_twt_params {</div><div class='del'>-	__le16 req_type;</div><div class='del'>-	__le64 twt;</div><div class='del'>-	u8 min_twt_dur;</div><div class='del'>-	__le16 mantissa;</div><div class='del'>-	u8 channel;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ieee80211_twt_setup {</div><div class='del'>-	u8 dialog_token;</div><div class='del'>-	u8 element_id;</div><div class='del'>-	u8 length;</div><div class='del'>-	u8 control;</div><div class='del'>-	u8 params[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_TTLM_MAX_CNT				2</div><div class='del'>-#define IEEE80211_TTLM_CONTROL_DIRECTION		0x03</div><div class='del'>-#define IEEE80211_TTLM_CONTROL_DEF_LINK_MAP		0x04</div><div class='del'>-#define IEEE80211_TTLM_CONTROL_SWITCH_TIME_PRESENT	0x08</div><div class='del'>-#define IEEE80211_TTLM_CONTROL_EXPECTED_DUR_PRESENT	0x10</div><div class='del'>-#define IEEE80211_TTLM_CONTROL_LINK_MAP_SIZE		0x20</div><div class='del'>-</div><div class='del'>-#define IEEE80211_TTLM_DIRECTION_DOWN		0</div><div class='del'>-#define IEEE80211_TTLM_DIRECTION_UP		1</div><div class='del'>-#define IEEE80211_TTLM_DIRECTION_BOTH		2</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * struct ieee80211_ttlm_elem - TID-To-Link Mapping element</div><div class='add'>+ * struct ieee80211_bss_load_elem - BSS Load elemen</div><div class='ctx'>  *</div><div class='del'>- * Defined in section 9.4.2.314 in P802.11be_D4</div><div class='add'>+ * Defined in section 9.4.2.26 in IEEE 802.11-REVme D4.1</div><div class='ctx'>  *</div><div class='del'>- * @control: the first part of control field</div><div class='del'>- * @optional: the second part of control field</div><div class='add'>+ * @sta_count: total number of STAs currently associated with the AP.</div><div class='add'>+ * @channel_util: Percentage of time that the access point sensed the channel</div><div class='add'>+ *	was busy. This value is in range [0, 255], the highest value means</div><div class='add'>+ *	100% busy.</div><div class='add'>+ * @avail_admission_capa: remaining amount of medium time used for admission</div><div class='add'>+ *	control.</div><div class='ctx'>  */</div><div class='del'>-struct ieee80211_ttlm_elem {</div><div class='del'>-	u8 control;</div><div class='del'>-	u8 optional[];</div><div class='add'>+struct ieee80211_bss_load_elem {</div><div class='add'>+	__le16 sta_count;</div><div class='add'>+	u8 channel_util;</div><div class='add'>+	__le16 avail_admission_capa;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct ieee80211_mgmt {</div><div class='hunk'>@@ -1393,6 +1084,8 @@ struct ieee80211_mgmt {</div><div class='ctx'> 					__le16 status;</div><div class='ctx'> 					__le16 capab;</div><div class='ctx'> 					__le16 timeout;</div><div class='add'>+					/* followed by BA Extension */</div><div class='add'>+					u8 variable[];</div><div class='ctx'> 				} __packed addba_resp;</div><div class='ctx'> 				struct{</div><div class='ctx'> 					u8 action_code;</div><div class='hunk'>@@ -1423,7 +1116,7 @@ struct ieee80211_mgmt {</div><div class='ctx'> 					u8 action_code;</div><div class='ctx'> 					u8 dialog_token;</div><div class='ctx'> 					__le16 capability;</div><div class='del'>-					u8 variable[0];</div><div class='add'>+					u8 variable[];</div><div class='ctx'> 				} __packed tdls_discover_resp;</div><div class='ctx'> 				struct {</div><div class='ctx'> 					u8 action_code;</div><div class='hunk'>@@ -1472,12 +1165,27 @@ struct ieee80211_mgmt {</div><div class='ctx'> 				struct {</div><div class='ctx'> 					u8 action_code;</div><div class='ctx'> 					u8 dialog_token;</div><div class='del'>-					u8 status_code;</div><div class='add'>+					__le16 status_code;</div><div class='ctx'> 					u8 variable[];</div><div class='ctx'> 				} __packed ttlm_res;</div><div class='ctx'> 				struct {</div><div class='ctx'> 					u8 action_code;</div><div class='ctx'> 				} __packed ttlm_tear_down;</div><div class='add'>+				struct {</div><div class='add'>+					u8 action_code;</div><div class='add'>+					u8 dialog_token;</div><div class='add'>+					u8 variable[];</div><div class='add'>+				} __packed ml_reconf_req;</div><div class='add'>+				struct {</div><div class='add'>+					u8 action_code;</div><div class='add'>+					u8 dialog_token;</div><div class='add'>+					u8 count;</div><div class='add'>+					u8 variable[];</div><div class='add'>+				} __packed ml_reconf_resp;</div><div class='add'>+				struct {</div><div class='add'>+					u8 action_code;</div><div class='add'>+					u8 variable[];</div><div class='add'>+				} __packed epcs;</div><div class='ctx'> 			} u;</div><div class='ctx'> 		} __packed action;</div><div class='ctx'> 		DECLARE_FLEX_ARRAY(u8, body); /* Generic frame body */</div><div class='hunk'>@@ -1488,16 +1196,18 @@ struct ieee80211_mgmt {</div><div class='ctx'> #define BSS_MEMBERSHIP_SELECTOR_HT_PHY	127</div><div class='ctx'> #define BSS_MEMBERSHIP_SELECTOR_VHT_PHY	126</div><div class='ctx'> #define BSS_MEMBERSHIP_SELECTOR_GLK	125</div><div class='del'>-#define BSS_MEMBERSHIP_SELECTOR_EPS	124</div><div class='add'>+#define BSS_MEMBERSHIP_SELECTOR_EPD	124</div><div class='ctx'> #define BSS_MEMBERSHIP_SELECTOR_SAE_H2E 123</div><div class='ctx'> #define BSS_MEMBERSHIP_SELECTOR_HE_PHY	122</div><div class='ctx'> #define BSS_MEMBERSHIP_SELECTOR_EHT_PHY	121</div><div class='ctx'> </div><div class='add'>+#define BSS_MEMBERSHIP_SELECTOR_MIN	BSS_MEMBERSHIP_SELECTOR_EHT_PHY</div><div class='add'>+</div><div class='ctx'> /* mgmt header + 1 byte category code */</div><div class='ctx'> #define IEEE80211_MIN_ACTION_SIZE offsetof(struct ieee80211_mgmt, u.action.u)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Management MIC information element (IEEE 802.11w) */</div><div class='add'>+/* Management MIC information element (IEEE 802.11w) for CMAC */</div><div class='ctx'> struct ieee80211_mmie {</div><div class='ctx'> 	u8 element_id;</div><div class='ctx'> 	u8 length;</div><div class='hunk'>@@ -1515,6 +1225,15 @@ struct ieee80211_mmie_16 {</div><div class='ctx'> 	u8 mic[16];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* Management MIC information element (IEEE 802.11w) for all variants */</div><div class='add'>+struct ieee80211_mmie_var {</div><div class='add'>+	u8 element_id;</div><div class='add'>+	u8 length;</div><div class='add'>+	__le16 key_id;</div><div class='add'>+	u8 sequence_number[6];</div><div class='add'>+	u8 mic[]; /* 8 or 16 bytes */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct ieee80211_vendor_ie {</div><div class='ctx'> 	u8 element_id;</div><div class='ctx'> 	u8 len;</div><div class='hunk'>@@ -1591,1661 +1310,39 @@ struct ieee80211_tdls_data {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 dialog_token;</div><div class='ctx'> 			__le16 capability;</div><div class='del'>-			u8 variable[0];</div><div class='add'>+			u8 variable[];</div><div class='ctx'> 		} __packed setup_req;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le16 status_code;</div><div class='ctx'> 			u8 dialog_token;</div><div class='ctx'> 			__le16 capability;</div><div class='del'>-			u8 variable[0];</div><div class='add'>+			u8 variable[];</div><div class='ctx'> 		} __packed setup_resp;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le16 status_code;</div><div class='ctx'> 			u8 dialog_token;</div><div class='del'>-			u8 variable[0];</div><div class='add'>+			u8 variable[];</div><div class='ctx'> 		} __packed setup_cfm;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le16 reason_code;</div><div class='del'>-			u8 variable[0];</div><div class='add'>+			u8 variable[];</div><div class='ctx'> 		} __packed teardown;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 dialog_token;</div><div class='del'>-			u8 variable[0];</div><div class='add'>+			u8 variable[];</div><div class='ctx'> 		} __packed discover_req;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u8 target_channel;</div><div class='ctx'> 			u8 oper_class;</div><div class='del'>-			u8 variable[0];</div><div class='add'>+			u8 variable[];</div><div class='ctx'> 		} __packed chan_switch_req;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le16 status_code;</div><div class='del'>-			u8 variable[0];</div><div class='add'>+			u8 variable[];</div><div class='ctx'> 		} __packed chan_switch_resp;</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Peer-to-Peer IE attribute related definitions.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * enum ieee80211_p2p_attr_id - identifies type of peer-to-peer attribute.</div><div class='del'>- */</div><div class='del'>-enum ieee80211_p2p_attr_id {</div><div class='del'>-	IEEE80211_P2P_ATTR_STATUS = 0,</div><div class='del'>-	IEEE80211_P2P_ATTR_MINOR_REASON,</div><div class='del'>-	IEEE80211_P2P_ATTR_CAPABILITY,</div><div class='del'>-	IEEE80211_P2P_ATTR_DEVICE_ID,</div><div class='del'>-	IEEE80211_P2P_ATTR_GO_INTENT,</div><div class='del'>-	IEEE80211_P2P_ATTR_GO_CONFIG_TIMEOUT,</div><div class='del'>-	IEEE80211_P2P_ATTR_LISTEN_CHANNEL,</div><div class='del'>-	IEEE80211_P2P_ATTR_GROUP_BSSID,</div><div class='del'>-	IEEE80211_P2P_ATTR_EXT_LISTEN_TIMING,</div><div class='del'>-	IEEE80211_P2P_ATTR_INTENDED_IFACE_ADDR,</div><div class='del'>-	IEEE80211_P2P_ATTR_MANAGABILITY,</div><div class='del'>-	IEEE80211_P2P_ATTR_CHANNEL_LIST,</div><div class='del'>-	IEEE80211_P2P_ATTR_ABSENCE_NOTICE,</div><div class='del'>-	IEEE80211_P2P_ATTR_DEVICE_INFO,</div><div class='del'>-	IEEE80211_P2P_ATTR_GROUP_INFO,</div><div class='del'>-	IEEE80211_P2P_ATTR_GROUP_ID,</div><div class='del'>-	IEEE80211_P2P_ATTR_INTERFACE,</div><div class='del'>-	IEEE80211_P2P_ATTR_OPER_CHANNEL,</div><div class='del'>-	IEEE80211_P2P_ATTR_INVITE_FLAGS,</div><div class='del'>-	/* 19 - 220: Reserved */</div><div class='del'>-	IEEE80211_P2P_ATTR_VENDOR_SPECIFIC = 221,</div><div class='del'>-</div><div class='del'>-	IEEE80211_P2P_ATTR_MAX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Notice of Absence attribute - described in P2P spec 4.1.14 */</div><div class='del'>-/* Typical max value used here */</div><div class='del'>-#define IEEE80211_P2P_NOA_DESC_MAX	4</div><div class='del'>-</div><div class='del'>-struct ieee80211_p2p_noa_desc {</div><div class='del'>-	u8 count;</div><div class='del'>-	__le32 duration;</div><div class='del'>-	__le32 interval;</div><div class='del'>-	__le32 start_time;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct ieee80211_p2p_noa_attr {</div><div class='del'>-	u8 index;</div><div class='del'>-	u8 oppps_ctwindow;</div><div class='del'>-	struct ieee80211_p2p_noa_desc desc[IEEE80211_P2P_NOA_DESC_MAX];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_P2P_OPPPS_ENABLE_BIT		BIT(7)</div><div class='del'>-#define IEEE80211_P2P_OPPPS_CTWINDOW_MASK	0x7F</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_bar - Block Ack Request frame format</div><div class='del'>- * @frame_control: Frame Control</div><div class='del'>- * @duration: Duration</div><div class='del'>- * @ra: RA</div><div class='del'>- * @ta: TA</div><div class='del'>- * @control: BAR Control</div><div class='del'>- * @start_seq_num: Starting Sequence Number (see Figure 9-37)</div><div class='del'>- *</div><div class='del'>- * This structure represents the "BlockAckReq frame format"</div><div class='del'>- * as described in IEEE Std 802.11-2020 section 9.3.1.7.</div><div class='del'>-*/</div><div class='del'>-struct ieee80211_bar {</div><div class='del'>-	__le16 frame_control;</div><div class='del'>-	__le16 duration;</div><div class='del'>-	__u8 ra[ETH_ALEN];</div><div class='del'>-	__u8 ta[ETH_ALEN];</div><div class='del'>-	__le16 control;</div><div class='del'>-	__le16 start_seq_num;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* 802.11 BAR control masks */</div><div class='del'>-#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL	0x0000</div><div class='del'>-#define IEEE80211_BAR_CTRL_MULTI_TID		0x0002</div><div class='del'>-#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA	0x0004</div><div class='del'>-#define IEEE80211_BAR_CTRL_TID_INFO_MASK	0xf000</div><div class='del'>-#define IEEE80211_BAR_CTRL_TID_INFO_SHIFT	12</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HT_MCS_MASK_LEN		10</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_mcs_info - Supported MCS Set field</div><div class='del'>- * @rx_mask: RX mask</div><div class='del'>- * @rx_highest: highest supported RX rate. If set represents</div><div class='del'>- *	the highest supported RX data rate in units of 1 Mbps.</div><div class='del'>- *	If this field is 0 this value should not be used to</div><div class='del'>- *	consider the highest RX data rate supported.</div><div class='del'>- * @tx_params: TX parameters</div><div class='del'>- * @reserved: Reserved bits</div><div class='del'>- *</div><div class='del'>- * This structure represents the "Supported MCS Set field" as</div><div class='del'>- * described in IEEE Std 802.11-2020 section 9.4.2.55.4.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_mcs_info {</div><div class='del'>-	u8 rx_mask[IEEE80211_HT_MCS_MASK_LEN];</div><div class='del'>-	__le16 rx_highest;</div><div class='del'>-	u8 tx_params;</div><div class='del'>-	u8 reserved[3];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* 802.11n HT capability MSC set */</div><div class='del'>-#define IEEE80211_HT_MCS_RX_HIGHEST_MASK	0x3ff</div><div class='del'>-#define IEEE80211_HT_MCS_TX_DEFINED		0x01</div><div class='del'>-#define IEEE80211_HT_MCS_TX_RX_DIFF		0x02</div><div class='del'>-/* value 0 == 1 stream etc */</div><div class='del'>-#define IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK	0x0C</div><div class='del'>-#define IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT	2</div><div class='del'>-#define		IEEE80211_HT_MCS_TX_MAX_STREAMS	4</div><div class='del'>-#define IEEE80211_HT_MCS_TX_UNEQUAL_MODULATION	0x10</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HT_MCS_CHAINS(mcs) ((mcs) == 32 ? 1 : (1 + ((mcs) &gt;&gt; 3)))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 802.11n D5.0 20.3.5 / 20.6 says:</div><div class='del'>- * - indices 0 to 7 and 32 are single spatial stream</div><div class='del'>- * - 8 to 31 are multiple spatial streams using equal modulation</div><div class='del'>- *   [8..15 for two streams, 16..23 for three and 24..31 for four]</div><div class='del'>- * - remainder are multiple spatial streams using unequal modulation</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_HT_MCS_UNEQUAL_MODULATION_START 33</div><div class='del'>-#define IEEE80211_HT_MCS_UNEQUAL_MODULATION_START_BYTE \</div><div class='del'>-	(IEEE80211_HT_MCS_UNEQUAL_MODULATION_START / 8)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_ht_cap - HT capabilities element</div><div class='del'>- * @cap_info: HT Capability Information</div><div class='del'>- * @ampdu_params_info: A-MPDU Parameters</div><div class='del'>- * @mcs: Supported MCS Set</div><div class='del'>- * @extended_ht_cap_info: HT Extended Capabilities</div><div class='del'>- * @tx_BF_cap_info: Transmit Beamforming Capabilities</div><div class='del'>- * @antenna_selection_info: ASEL Capability</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "HT Capabilities</div><div class='del'>- * element" as described in IEEE Std 802.11-2020 section 9.4.2.55.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_ht_cap {</div><div class='del'>-	__le16 cap_info;</div><div class='del'>-	u8 ampdu_params_info;</div><div class='del'>-</div><div class='del'>-	/* 16 bytes MCS information */</div><div class='del'>-	struct ieee80211_mcs_info mcs;</div><div class='del'>-</div><div class='del'>-	__le16 extended_ht_cap_info;</div><div class='del'>-	__le32 tx_BF_cap_info;</div><div class='del'>-	u8 antenna_selection_info;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* 802.11n HT capabilities masks (for cap_info) */</div><div class='del'>-#define IEEE80211_HT_CAP_LDPC_CODING		0x0001</div><div class='del'>-#define IEEE80211_HT_CAP_SUP_WIDTH_20_40	0x0002</div><div class='del'>-#define IEEE80211_HT_CAP_SM_PS			0x000C</div><div class='del'>-#define		IEEE80211_HT_CAP_SM_PS_SHIFT	2</div><div class='del'>-#define IEEE80211_HT_CAP_GRN_FLD		0x0010</div><div class='del'>-#define IEEE80211_HT_CAP_SGI_20			0x0020</div><div class='del'>-#define IEEE80211_HT_CAP_SGI_40			0x0040</div><div class='del'>-#define IEEE80211_HT_CAP_TX_STBC		0x0080</div><div class='del'>-#define IEEE80211_HT_CAP_RX_STBC		0x0300</div><div class='del'>-#define		IEEE80211_HT_CAP_RX_STBC_SHIFT	8</div><div class='del'>-#define IEEE80211_HT_CAP_DELAY_BA		0x0400</div><div class='del'>-#define IEEE80211_HT_CAP_MAX_AMSDU		0x0800</div><div class='del'>-#define IEEE80211_HT_CAP_DSSSCCK40		0x1000</div><div class='del'>-#define IEEE80211_HT_CAP_RESERVED		0x2000</div><div class='del'>-#define IEEE80211_HT_CAP_40MHZ_INTOLERANT	0x4000</div><div class='del'>-#define IEEE80211_HT_CAP_LSIG_TXOP_PROT		0x8000</div><div class='del'>-</div><div class='del'>-/* 802.11n HT extended capabilities masks (for extended_ht_cap_info) */</div><div class='del'>-#define IEEE80211_HT_EXT_CAP_PCO		0x0001</div><div class='del'>-#define IEEE80211_HT_EXT_CAP_PCO_TIME		0x0006</div><div class='del'>-#define		IEEE80211_HT_EXT_CAP_PCO_TIME_SHIFT	1</div><div class='del'>-#define IEEE80211_HT_EXT_CAP_MCS_FB		0x0300</div><div class='del'>-#define		IEEE80211_HT_EXT_CAP_MCS_FB_SHIFT	8</div><div class='del'>-#define IEEE80211_HT_EXT_CAP_HTC_SUP		0x0400</div><div class='del'>-#define IEEE80211_HT_EXT_CAP_RD_RESPONDER	0x0800</div><div class='del'>-</div><div class='del'>-/* 802.11n HT capability AMPDU settings (for ampdu_params_info) */</div><div class='del'>-#define IEEE80211_HT_AMPDU_PARM_FACTOR		0x03</div><div class='del'>-#define IEEE80211_HT_AMPDU_PARM_DENSITY		0x1C</div><div class='del'>-#define		IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT	2</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Maximum length of AMPDU that the STA can receive in high-throughput (HT).</div><div class='del'>- * Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets)</div><div class='del'>- */</div><div class='del'>-enum ieee80211_max_ampdu_length_exp {</div><div class='del'>-	IEEE80211_HT_MAX_AMPDU_8K = 0,</div><div class='del'>-	IEEE80211_HT_MAX_AMPDU_16K = 1,</div><div class='del'>-	IEEE80211_HT_MAX_AMPDU_32K = 2,</div><div class='del'>-	IEEE80211_HT_MAX_AMPDU_64K = 3</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Maximum length of AMPDU that the STA can receive in VHT.</div><div class='del'>- * Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets)</div><div class='del'>- */</div><div class='del'>-enum ieee80211_vht_max_ampdu_length_exp {</div><div class='del'>-	IEEE80211_VHT_MAX_AMPDU_8K = 0,</div><div class='del'>-	IEEE80211_VHT_MAX_AMPDU_16K = 1,</div><div class='del'>-	IEEE80211_VHT_MAX_AMPDU_32K = 2,</div><div class='del'>-	IEEE80211_VHT_MAX_AMPDU_64K = 3,</div><div class='del'>-	IEEE80211_VHT_MAX_AMPDU_128K = 4,</div><div class='del'>-	IEEE80211_VHT_MAX_AMPDU_256K = 5,</div><div class='del'>-	IEEE80211_VHT_MAX_AMPDU_512K = 6,</div><div class='del'>-	IEEE80211_VHT_MAX_AMPDU_1024K = 7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HT_MAX_AMPDU_FACTOR 13</div><div class='del'>-</div><div class='del'>-/* Minimum MPDU start spacing */</div><div class='del'>-enum ieee80211_min_mpdu_spacing {</div><div class='del'>-	IEEE80211_HT_MPDU_DENSITY_NONE = 0,	/* No restriction */</div><div class='del'>-	IEEE80211_HT_MPDU_DENSITY_0_25 = 1,	/* 1/4 usec */</div><div class='del'>-	IEEE80211_HT_MPDU_DENSITY_0_5 = 2,	/* 1/2 usec */</div><div class='del'>-	IEEE80211_HT_MPDU_DENSITY_1 = 3,	/* 1 usec */</div><div class='del'>-	IEEE80211_HT_MPDU_DENSITY_2 = 4,	/* 2 usec */</div><div class='del'>-	IEEE80211_HT_MPDU_DENSITY_4 = 5,	/* 4 usec */</div><div class='del'>-	IEEE80211_HT_MPDU_DENSITY_8 = 6,	/* 8 usec */</div><div class='del'>-	IEEE80211_HT_MPDU_DENSITY_16 = 7	/* 16 usec */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_ht_operation - HT operation IE</div><div class='del'>- * @primary_chan: Primary Channel</div><div class='del'>- * @ht_param: HT Operation Information parameters</div><div class='del'>- * @operation_mode: HT Operation Information operation mode</div><div class='del'>- * @stbc_param: HT Operation Information STBC params</div><div class='del'>- * @basic_set: Basic HT-MCS Set</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "HT Operation</div><div class='del'>- * element" as described in IEEE Std 802.11-2020 section 9.4.2.56.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_ht_operation {</div><div class='del'>-	u8 primary_chan;</div><div class='del'>-	u8 ht_param;</div><div class='del'>-	__le16 operation_mode;</div><div class='del'>-	__le16 stbc_param;</div><div class='del'>-	u8 basic_set[16];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* for ht_param */</div><div class='del'>-#define IEEE80211_HT_PARAM_CHA_SEC_OFFSET		0x03</div><div class='del'>-#define		IEEE80211_HT_PARAM_CHA_SEC_NONE		0x00</div><div class='del'>-#define		IEEE80211_HT_PARAM_CHA_SEC_ABOVE	0x01</div><div class='del'>-#define		IEEE80211_HT_PARAM_CHA_SEC_BELOW	0x03</div><div class='del'>-#define IEEE80211_HT_PARAM_CHAN_WIDTH_ANY		0x04</div><div class='del'>-#define IEEE80211_HT_PARAM_RIFS_MODE			0x08</div><div class='del'>-</div><div class='del'>-/* for operation_mode */</div><div class='del'>-#define IEEE80211_HT_OP_MODE_PROTECTION			0x0003</div><div class='del'>-#define		IEEE80211_HT_OP_MODE_PROTECTION_NONE		0</div><div class='del'>-#define		IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER	1</div><div class='del'>-#define		IEEE80211_HT_OP_MODE_PROTECTION_20MHZ		2</div><div class='del'>-#define		IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED	3</div><div class='del'>-#define IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT		0x0004</div><div class='del'>-#define IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT		0x0010</div><div class='del'>-#define IEEE80211_HT_OP_MODE_CCFS2_SHIFT		5</div><div class='del'>-#define IEEE80211_HT_OP_MODE_CCFS2_MASK			0x1fe0</div><div class='del'>-</div><div class='del'>-/* for stbc_param */</div><div class='del'>-#define IEEE80211_HT_STBC_PARAM_DUAL_BEACON		0x0040</div><div class='del'>-#define IEEE80211_HT_STBC_PARAM_DUAL_CTS_PROT		0x0080</div><div class='del'>-#define IEEE80211_HT_STBC_PARAM_STBC_BEACON		0x0100</div><div class='del'>-#define IEEE80211_HT_STBC_PARAM_LSIG_TXOP_FULLPROT	0x0200</div><div class='del'>-#define IEEE80211_HT_STBC_PARAM_PCO_ACTIVE		0x0400</div><div class='del'>-#define IEEE80211_HT_STBC_PARAM_PCO_PHASE		0x0800</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* block-ack parameters */</div><div class='del'>-#define IEEE80211_ADDBA_PARAM_AMSDU_MASK 0x0001</div><div class='del'>-#define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002</div><div class='del'>-#define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C</div><div class='del'>-#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0</div><div class='del'>-#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000</div><div class='del'>-#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A-MPDU buffer sizes</div><div class='del'>- * According to HT size varies from 8 to 64 frames</div><div class='del'>- * HE adds the ability to have up to 256 frames.</div><div class='del'>- * EHT adds the ability to have up to 1K frames.</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_MIN_AMPDU_BUF		0x8</div><div class='del'>-#define IEEE80211_MAX_AMPDU_BUF_HT	0x40</div><div class='del'>-#define IEEE80211_MAX_AMPDU_BUF_HE	0x100</div><div class='del'>-#define IEEE80211_MAX_AMPDU_BUF_EHT	0x400</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Spatial Multiplexing Power Save Modes (for capability) */</div><div class='del'>-#define WLAN_HT_CAP_SM_PS_STATIC	0</div><div class='del'>-#define WLAN_HT_CAP_SM_PS_DYNAMIC	1</div><div class='del'>-#define WLAN_HT_CAP_SM_PS_INVALID	2</div><div class='del'>-#define WLAN_HT_CAP_SM_PS_DISABLED	3</div><div class='del'>-</div><div class='del'>-/* for SM power control field lower two bits */</div><div class='del'>-#define WLAN_HT_SMPS_CONTROL_DISABLED	0</div><div class='del'>-#define WLAN_HT_SMPS_CONTROL_STATIC	1</div><div class='del'>-#define WLAN_HT_SMPS_CONTROL_DYNAMIC	3</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_vht_mcs_info - VHT MCS information</div><div class='del'>- * @rx_mcs_map: RX MCS map 2 bits for each stream, total 8 streams</div><div class='del'>- * @rx_highest: Indicates highest long GI VHT PPDU data rate</div><div class='del'>- *	STA can receive. Rate expressed in units of 1 Mbps.</div><div class='del'>- *	If this field is 0 this value should not be used to</div><div class='del'>- *	consider the highest RX data rate supported.</div><div class='del'>- *	The top 3 bits of this field indicate the Maximum NSTS,total</div><div class='del'>- *	(a beamformee capability.)</div><div class='del'>- * @tx_mcs_map: TX MCS map 2 bits for each stream, total 8 streams</div><div class='del'>- * @tx_highest: Indicates highest long GI VHT PPDU data rate</div><div class='del'>- *	STA can transmit. Rate expressed in units of 1 Mbps.</div><div class='del'>- *	If this field is 0 this value should not be used to</div><div class='del'>- *	consider the highest TX data rate supported.</div><div class='del'>- *	The top 2 bits of this field are reserved, the</div><div class='del'>- *	3rd bit from the top indiciates VHT Extended NSS BW</div><div class='del'>- *	Capability.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_vht_mcs_info {</div><div class='del'>-	__le16 rx_mcs_map;</div><div class='del'>-	__le16 rx_highest;</div><div class='del'>-	__le16 tx_mcs_map;</div><div class='del'>-	__le16 tx_highest;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* for rx_highest */</div><div class='del'>-#define IEEE80211_VHT_MAX_NSTS_TOTAL_SHIFT	13</div><div class='del'>-#define IEEE80211_VHT_MAX_NSTS_TOTAL_MASK	(7 &lt;&lt; IEEE80211_VHT_MAX_NSTS_TOTAL_SHIFT)</div><div class='del'>-</div><div class='del'>-/* for tx_highest */</div><div class='del'>-#define IEEE80211_VHT_EXT_NSS_BW_CAPABLE	(1 &lt;&lt; 13)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_vht_mcs_support - VHT MCS support definitions</div><div class='del'>- * @IEEE80211_VHT_MCS_SUPPORT_0_7: MCSes 0-7 are supported for the</div><div class='del'>- *	number of streams</div><div class='del'>- * @IEEE80211_VHT_MCS_SUPPORT_0_8: MCSes 0-8 are supported</div><div class='del'>- * @IEEE80211_VHT_MCS_SUPPORT_0_9: MCSes 0-9 are supported</div><div class='del'>- * @IEEE80211_VHT_MCS_NOT_SUPPORTED: This number of streams isn't supported</div><div class='del'>- *</div><div class='del'>- * These definitions are used in each 2-bit subfield of the @rx_mcs_map</div><div class='del'>- * and @tx_mcs_map fields of &amp;struct ieee80211_vht_mcs_info, which are</div><div class='del'>- * both split into 8 subfields by number of streams. These values indicate</div><div class='del'>- * which MCSes are supported for the number of streams the value appears</div><div class='del'>- * for.</div><div class='del'>- */</div><div class='del'>-enum ieee80211_vht_mcs_support {</div><div class='del'>-	IEEE80211_VHT_MCS_SUPPORT_0_7	= 0,</div><div class='del'>-	IEEE80211_VHT_MCS_SUPPORT_0_8	= 1,</div><div class='del'>-	IEEE80211_VHT_MCS_SUPPORT_0_9	= 2,</div><div class='del'>-	IEEE80211_VHT_MCS_NOT_SUPPORTED	= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_vht_cap - VHT capabilities</div><div class='del'>- *</div><div class='del'>- * This structure is the "VHT capabilities element" as</div><div class='del'>- * described in 802.11ac D3.0 8.4.2.160</div><div class='del'>- * @vht_cap_info: VHT capability info</div><div class='del'>- * @supp_mcs: VHT MCS supported rates</div><div class='del'>- */</div><div class='del'>-struct ieee80211_vht_cap {</div><div class='del'>-	__le32 vht_cap_info;</div><div class='del'>-	struct ieee80211_vht_mcs_info supp_mcs;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_vht_chanwidth - VHT channel width</div><div class='del'>- * @IEEE80211_VHT_CHANWIDTH_USE_HT: use the HT operation IE to</div><div class='del'>- *	determine the channel width (20 or 40 MHz)</div><div class='del'>- * @IEEE80211_VHT_CHANWIDTH_80MHZ: 80 MHz bandwidth</div><div class='del'>- * @IEEE80211_VHT_CHANWIDTH_160MHZ: 160 MHz bandwidth</div><div class='del'>- * @IEEE80211_VHT_CHANWIDTH_80P80MHZ: 80+80 MHz bandwidth</div><div class='del'>- */</div><div class='del'>-enum ieee80211_vht_chanwidth {</div><div class='del'>-	IEEE80211_VHT_CHANWIDTH_USE_HT		= 0,</div><div class='del'>-	IEEE80211_VHT_CHANWIDTH_80MHZ		= 1,</div><div class='del'>-	IEEE80211_VHT_CHANWIDTH_160MHZ		= 2,</div><div class='del'>-	IEEE80211_VHT_CHANWIDTH_80P80MHZ	= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_vht_operation - VHT operation IE</div><div class='del'>- *</div><div class='del'>- * This structure is the "VHT operation element" as</div><div class='del'>- * described in 802.11ac D3.0 8.4.2.161</div><div class='del'>- * @chan_width: Operating channel width</div><div class='del'>- * @center_freq_seg0_idx: center freq segment 0 index</div><div class='del'>- * @center_freq_seg1_idx: center freq segment 1 index</div><div class='del'>- * @basic_mcs_set: VHT Basic MCS rate set</div><div class='del'>- */</div><div class='del'>-struct ieee80211_vht_operation {</div><div class='del'>-	u8 chan_width;</div><div class='del'>-	u8 center_freq_seg0_idx;</div><div class='del'>-	u8 center_freq_seg1_idx;</div><div class='del'>-	__le16 basic_mcs_set;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_he_cap_elem - HE capabilities element</div><div class='del'>- * @mac_cap_info: HE MAC Capabilities Information</div><div class='del'>- * @phy_cap_info: HE PHY Capabilities Information</div><div class='del'>- *</div><div class='del'>- * This structure represents the fixed fields of the payload of the</div><div class='del'>- * "HE capabilities element" as described in IEEE Std 802.11ax-2021</div><div class='del'>- * sections 9.4.2.248.2 and 9.4.2.248.3.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_he_cap_elem {</div><div class='del'>-	u8 mac_cap_info[6];</div><div class='del'>-	u8 phy_cap_info[11];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_TX_RX_MCS_NSS_DESC_MAX_LEN	5</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_he_mcs_support - HE MCS support definitions</div><div class='del'>- * @IEEE80211_HE_MCS_SUPPORT_0_7: MCSes 0-7 are supported for the</div><div class='del'>- *	number of streams</div><div class='del'>- * @IEEE80211_HE_MCS_SUPPORT_0_9: MCSes 0-9 are supported</div><div class='del'>- * @IEEE80211_HE_MCS_SUPPORT_0_11: MCSes 0-11 are supported</div><div class='del'>- * @IEEE80211_HE_MCS_NOT_SUPPORTED: This number of streams isn't supported</div><div class='del'>- *</div><div class='del'>- * These definitions are used in each 2-bit subfield of the rx_mcs_*</div><div class='del'>- * and tx_mcs_* fields of &amp;struct ieee80211_he_mcs_nss_supp, which are</div><div class='del'>- * both split into 8 subfields by number of streams. These values indicate</div><div class='del'>- * which MCSes are supported for the number of streams the value appears</div><div class='del'>- * for.</div><div class='del'>- */</div><div class='del'>-enum ieee80211_he_mcs_support {</div><div class='del'>-	IEEE80211_HE_MCS_SUPPORT_0_7	= 0,</div><div class='del'>-	IEEE80211_HE_MCS_SUPPORT_0_9	= 1,</div><div class='del'>-	IEEE80211_HE_MCS_SUPPORT_0_11	= 2,</div><div class='del'>-	IEEE80211_HE_MCS_NOT_SUPPORTED	= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_he_mcs_nss_supp - HE Tx/Rx HE MCS NSS Support Field</div><div class='del'>- *</div><div class='del'>- * This structure holds the data required for the Tx/Rx HE MCS NSS Support Field</div><div class='del'>- * described in P802.11ax_D2.0 section 9.4.2.237.4</div><div class='del'>- *</div><div class='del'>- * @rx_mcs_80: Rx MCS map 2 bits for each stream, total 8 streams, for channel</div><div class='del'>- *     widths less than 80MHz.</div><div class='del'>- * @tx_mcs_80: Tx MCS map 2 bits for each stream, total 8 streams, for channel</div><div class='del'>- *     widths less than 80MHz.</div><div class='del'>- * @rx_mcs_160: Rx MCS map 2 bits for each stream, total 8 streams, for channel</div><div class='del'>- *     width 160MHz.</div><div class='del'>- * @tx_mcs_160: Tx MCS map 2 bits for each stream, total 8 streams, for channel</div><div class='del'>- *     width 160MHz.</div><div class='del'>- * @rx_mcs_80p80: Rx MCS map 2 bits for each stream, total 8 streams, for</div><div class='del'>- *     channel width 80p80MHz.</div><div class='del'>- * @tx_mcs_80p80: Tx MCS map 2 bits for each stream, total 8 streams, for</div><div class='del'>- *     channel width 80p80MHz.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_he_mcs_nss_supp {</div><div class='del'>-	__le16 rx_mcs_80;</div><div class='del'>-	__le16 tx_mcs_80;</div><div class='del'>-	__le16 rx_mcs_160;</div><div class='del'>-	__le16 tx_mcs_160;</div><div class='del'>-	__le16 rx_mcs_80p80;</div><div class='del'>-	__le16 tx_mcs_80p80;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_he_operation - HE Operation element</div><div class='del'>- * @he_oper_params: HE Operation Parameters + BSS Color Information</div><div class='del'>- * @he_mcs_nss_set: Basic HE-MCS And NSS Set</div><div class='del'>- * @optional: Optional fields VHT Operation Information, Max Co-Hosted</div><div class='del'>- *            BSSID Indicator, and 6 GHz Operation Information</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "HE Operation</div><div class='del'>- * element" as described in IEEE Std 802.11ax-2021 section 9.4.2.249.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_he_operation {</div><div class='del'>-	__le32 he_oper_params;</div><div class='del'>-	__le16 he_mcs_nss_set;</div><div class='del'>-	u8 optional[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_he_spr - Spatial Reuse Parameter Set element</div><div class='del'>- * @he_sr_control: SR Control</div><div class='del'>- * @optional: Optional fields Non-SRG OBSS PD Max Offset, SRG OBSS PD</div><div class='del'>- *            Min Offset, SRG OBSS PD Max Offset, SRG BSS Color</div><div class='del'>- *            Bitmap, and SRG Partial BSSID Bitmap</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "Spatial Reuse</div><div class='del'>- * Parameter Set element" as described in IEEE Std 802.11ax-2021</div><div class='del'>- * section 9.4.2.252.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_he_spr {</div><div class='del'>-	u8 he_sr_control;</div><div class='del'>-	u8 optional[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field</div><div class='del'>- * @aifsn: ACI/AIFSN</div><div class='del'>- * @ecw_min_max: ECWmin/ECWmax</div><div class='del'>- * @mu_edca_timer: MU EDCA Timer</div><div class='del'>- *</div><div class='del'>- * This structure represents the "MU AC Parameter Record" as described</div><div class='del'>- * in IEEE Std 802.11ax-2021 section 9.4.2.251, Figure 9-788p.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_he_mu_edca_param_ac_rec {</div><div class='del'>-	u8 aifsn;</div><div class='del'>-	u8 ecw_min_max;</div><div class='del'>-	u8 mu_edca_timer;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_mu_edca_param_set - MU EDCA Parameter Set element</div><div class='del'>- * @mu_qos_info: QoS Info</div><div class='del'>- * @ac_be: MU AC_BE Parameter Record</div><div class='del'>- * @ac_bk: MU AC_BK Parameter Record</div><div class='del'>- * @ac_vi: MU AC_VI Parameter Record</div><div class='del'>- * @ac_vo: MU AC_VO Parameter Record</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "MU EDCA Parameter Set</div><div class='del'>- * element" as described in IEEE Std 802.11ax-2021 section 9.4.2.251.</div><div class='del'>- */</div><div class='del'>-struct ieee80211_mu_edca_param_set {</div><div class='del'>-	u8 mu_qos_info;</div><div class='del'>-	struct ieee80211_he_mu_edca_param_ac_rec ac_be;</div><div class='del'>-	struct ieee80211_he_mu_edca_param_ac_rec ac_bk;</div><div class='del'>-	struct ieee80211_he_mu_edca_param_ac_rec ac_vi;</div><div class='del'>-	struct ieee80211_he_mu_edca_param_ac_rec ac_vo;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_MCS_NSS_RX 0x0f</div><div class='del'>-#define IEEE80211_EHT_MCS_NSS_TX 0xf0</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_eht_mcs_nss_supp_20mhz_only - EHT 20MHz only station max</div><div class='del'>- * supported NSS for per MCS.</div><div class='del'>- *</div><div class='del'>- * For each field below, bits 0 - 3 indicate the maximal number of spatial</div><div class='del'>- * streams for Rx, and bits 4 - 7 indicate the maximal number of spatial streams</div><div class='del'>- * for Tx.</div><div class='del'>- *</div><div class='del'>- * @rx_tx_mcs7_max_nss: indicates the maximum number of spatial streams</div><div class='del'>- *     supported for reception and the maximum number of spatial streams</div><div class='del'>- *     supported for transmission for MCS 0 - 7.</div><div class='del'>- * @rx_tx_mcs9_max_nss: indicates the maximum number of spatial streams</div><div class='del'>- *     supported for reception and the maximum number of spatial streams</div><div class='del'>- *     supported for transmission for MCS 8 - 9.</div><div class='del'>- * @rx_tx_mcs11_max_nss: indicates the maximum number of spatial streams</div><div class='del'>- *     supported for reception and the maximum number of spatial streams</div><div class='del'>- *     supported for transmission for MCS 10 - 11.</div><div class='del'>- * @rx_tx_mcs13_max_nss: indicates the maximum number of spatial streams</div><div class='del'>- *     supported for reception and the maximum number of spatial streams</div><div class='del'>- *     supported for transmission for MCS 12 - 13.</div><div class='del'>- * @rx_tx_max_nss: array of the previous fields for easier loop access</div><div class='del'>- */</div><div class='del'>-struct ieee80211_eht_mcs_nss_supp_20mhz_only {</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			u8 rx_tx_mcs7_max_nss;</div><div class='del'>-			u8 rx_tx_mcs9_max_nss;</div><div class='del'>-			u8 rx_tx_mcs11_max_nss;</div><div class='del'>-			u8 rx_tx_mcs13_max_nss;</div><div class='del'>-		};</div><div class='del'>-		u8 rx_tx_max_nss[4];</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_eht_mcs_nss_supp_bw - EHT max supported NSS per MCS (except</div><div class='del'>- * 20MHz only stations).</div><div class='del'>- *</div><div class='del'>- * For each field below, bits 0 - 3 indicate the maximal number of spatial</div><div class='del'>- * streams for Rx, and bits 4 - 7 indicate the maximal number of spatial streams</div><div class='del'>- * for Tx.</div><div class='del'>- *</div><div class='del'>- * @rx_tx_mcs9_max_nss: indicates the maximum number of spatial streams</div><div class='del'>- *     supported for reception and the maximum number of spatial streams</div><div class='del'>- *     supported for transmission for MCS 0 - 9.</div><div class='del'>- * @rx_tx_mcs11_max_nss: indicates the maximum number of spatial streams</div><div class='del'>- *     supported for reception and the maximum number of spatial streams</div><div class='del'>- *     supported for transmission for MCS 10 - 11.</div><div class='del'>- * @rx_tx_mcs13_max_nss: indicates the maximum number of spatial streams</div><div class='del'>- *     supported for reception and the maximum number of spatial streams</div><div class='del'>- *     supported for transmission for MCS 12 - 13.</div><div class='del'>- * @rx_tx_max_nss: array of the previous fields for easier loop access</div><div class='del'>- */</div><div class='del'>-struct ieee80211_eht_mcs_nss_supp_bw {</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			u8 rx_tx_mcs9_max_nss;</div><div class='del'>-			u8 rx_tx_mcs11_max_nss;</div><div class='del'>-			u8 rx_tx_mcs13_max_nss;</div><div class='del'>-		};</div><div class='del'>-		u8 rx_tx_max_nss[3];</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_eht_cap_elem_fixed - EHT capabilities fixed data</div><div class='del'>- *</div><div class='del'>- * This structure is the "EHT Capabilities element" fixed fields as</div><div class='del'>- * described in P802.11be_D2.0 section 9.4.2.313.</div><div class='del'>- *</div><div class='del'>- * @mac_cap_info: MAC capabilities, see IEEE80211_EHT_MAC_CAP*</div><div class='del'>- * @phy_cap_info: PHY capabilities, see IEEE80211_EHT_PHY_CAP*</div><div class='del'>- */</div><div class='del'>-struct ieee80211_eht_cap_elem_fixed {</div><div class='del'>-	u8 mac_cap_info[2];</div><div class='del'>-	u8 phy_cap_info[9];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_eht_cap_elem - EHT capabilities element</div><div class='del'>- * @fixed: fixed parts, see &amp;ieee80211_eht_cap_elem_fixed</div><div class='del'>- * @optional: optional parts</div><div class='del'>- */</div><div class='del'>-struct ieee80211_eht_cap_elem {</div><div class='del'>-	struct ieee80211_eht_cap_elem_fixed fixed;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Followed by:</div><div class='del'>-	 * Supported EHT-MCS And NSS Set field: 4, 3, 6 or 9 octets.</div><div class='del'>-	 * EHT PPE Thresholds field: variable length.</div><div class='del'>-	 */</div><div class='del'>-	u8 optional[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_OPER_INFO_PRESENT	                        0x01</div><div class='del'>-#define IEEE80211_EHT_OPER_DISABLED_SUBCHANNEL_BITMAP_PRESENT	0x02</div><div class='del'>-#define IEEE80211_EHT_OPER_EHT_DEF_PE_DURATION	                0x04</div><div class='del'>-#define IEEE80211_EHT_OPER_GROUP_ADDRESSED_BU_IND_LIMIT         0x08</div><div class='del'>-#define IEEE80211_EHT_OPER_GROUP_ADDRESSED_BU_IND_EXP_MASK      0x30</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_eht_operation - eht operation element</div><div class='del'>- *</div><div class='del'>- * This structure is the "EHT Operation Element" fields as</div><div class='del'>- * described in P802.11be_D2.0 section 9.4.2.311</div><div class='del'>- *</div><div class='del'>- * @params: EHT operation element parameters. See &amp;IEEE80211_EHT_OPER_*</div><div class='del'>- * @basic_mcs_nss: indicates the EHT-MCSs for each number of spatial streams in</div><div class='del'>- *     EHT PPDUs that are supported by all EHT STAs in the BSS in transmit and</div><div class='del'>- *     receive.</div><div class='del'>- * @optional: optional parts</div><div class='del'>- */</div><div class='del'>-struct ieee80211_eht_operation {</div><div class='del'>-	u8 params;</div><div class='del'>-	struct ieee80211_eht_mcs_nss_supp_20mhz_only basic_mcs_nss;</div><div class='del'>-	u8 optional[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_eht_operation_info - eht operation information</div><div class='del'>- *</div><div class='del'>- * @control: EHT operation information control.</div><div class='del'>- * @ccfs0: defines a channel center frequency for a 20, 40, 80, 160, or 320 MHz</div><div class='del'>- *     EHT BSS.</div><div class='del'>- * @ccfs1: defines a channel center frequency for a 160 or 320 MHz EHT BSS.</div><div class='del'>- * @optional: optional parts</div><div class='del'>- */</div><div class='del'>-struct ieee80211_eht_operation_info {</div><div class='del'>-	u8 control;</div><div class='del'>-	u8 ccfs0;</div><div class='del'>-	u8 ccfs1;</div><div class='del'>-	u8 optional[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* 802.11ac VHT Capabilities */</div><div class='del'>-#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895			0x00000000</div><div class='del'>-#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991			0x00000001</div><div class='del'>-#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454			0x00000002</div><div class='del'>-#define IEEE80211_VHT_CAP_MAX_MPDU_MASK				0x00000003</div><div class='del'>-#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ		0x00000004</div><div class='del'>-#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ	0x00000008</div><div class='del'>-#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK			0x0000000C</div><div class='del'>-#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_SHIFT			2</div><div class='del'>-#define IEEE80211_VHT_CAP_RXLDPC				0x00000010</div><div class='del'>-#define IEEE80211_VHT_CAP_SHORT_GI_80				0x00000020</div><div class='del'>-#define IEEE80211_VHT_CAP_SHORT_GI_160				0x00000040</div><div class='del'>-#define IEEE80211_VHT_CAP_TXSTBC				0x00000080</div><div class='del'>-#define IEEE80211_VHT_CAP_RXSTBC_1				0x00000100</div><div class='del'>-#define IEEE80211_VHT_CAP_RXSTBC_2				0x00000200</div><div class='del'>-#define IEEE80211_VHT_CAP_RXSTBC_3				0x00000300</div><div class='del'>-#define IEEE80211_VHT_CAP_RXSTBC_4				0x00000400</div><div class='del'>-#define IEEE80211_VHT_CAP_RXSTBC_MASK				0x00000700</div><div class='del'>-#define IEEE80211_VHT_CAP_RXSTBC_SHIFT				8</div><div class='del'>-#define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE			0x00000800</div><div class='del'>-#define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE			0x00001000</div><div class='del'>-#define IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT                  13</div><div class='del'>-#define IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK			\</div><div class='del'>-		(7 &lt;&lt; IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT)</div><div class='del'>-#define IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT		16</div><div class='del'>-#define IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK		\</div><div class='del'>-		(7 &lt;&lt; IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT)</div><div class='del'>-#define IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE			0x00080000</div><div class='del'>-#define IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE			0x00100000</div><div class='del'>-#define IEEE80211_VHT_CAP_VHT_TXOP_PS				0x00200000</div><div class='del'>-#define IEEE80211_VHT_CAP_HTC_VHT				0x00400000</div><div class='del'>-#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT	23</div><div class='del'>-#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK	\</div><div class='del'>-		(7 &lt;&lt; IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT)</div><div class='del'>-#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB	0x08000000</div><div class='del'>-#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB	0x0c000000</div><div class='del'>-#define IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN			0x10000000</div><div class='del'>-#define IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN			0x20000000</div><div class='del'>-#define IEEE80211_VHT_CAP_EXT_NSS_BW_SHIFT			30</div><div class='del'>-#define IEEE80211_VHT_CAP_EXT_NSS_BW_MASK			0xc0000000</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_get_vht_max_nss - return max NSS for a given bandwidth/MCS</div><div class='del'>- * @cap: VHT capabilities of the peer</div><div class='del'>- * @bw: bandwidth to use</div><div class='del'>- * @mcs: MCS index to use</div><div class='del'>- * @ext_nss_bw_capable: indicates whether or not the local transmitter</div><div class='del'>- *	(rate scaling algorithm) can deal with the new logic</div><div class='del'>- *	(dot11VHTExtendedNSSBWCapable)</div><div class='del'>- * @max_vht_nss: current maximum NSS as advertised by the STA in</div><div class='del'>- *	operating mode notification, can be 0 in which case the</div><div class='del'>- *	capability data will be used to derive this (from MCS support)</div><div class='del'>- *</div><div class='del'>- * Due to the VHT Extended NSS Bandwidth Support, the maximum NSS can</div><div class='del'>- * vary for a given BW/MCS. This function parses the data.</div><div class='del'>- *</div><div class='del'>- * Note: This function is exported by cfg80211.</div><div class='del'>- */</div><div class='del'>-int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,</div><div class='del'>-			      enum ieee80211_vht_chanwidth bw,</div><div class='del'>-			      int mcs, bool ext_nss_bw_capable,</div><div class='del'>-			      unsigned int max_vht_nss);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_ap_reg_power - regulatory power for a Access Point</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_REG_UNSET_AP: Access Point has no regulatory power mode</div><div class='del'>- * @IEEE80211_REG_LPI_AP: Indoor Access Point</div><div class='del'>- * @IEEE80211_REG_SP_AP: Standard power Access Point</div><div class='del'>- * @IEEE80211_REG_VLP_AP: Very low power Access Point</div><div class='del'>- * @IEEE80211_REG_AP_POWER_AFTER_LAST: internal</div><div class='del'>- * @IEEE80211_REG_AP_POWER_MAX: maximum value</div><div class='del'>- */</div><div class='del'>-enum ieee80211_ap_reg_power {</div><div class='del'>-	IEEE80211_REG_UNSET_AP,</div><div class='del'>-	IEEE80211_REG_LPI_AP,</div><div class='del'>-	IEEE80211_REG_SP_AP,</div><div class='del'>-	IEEE80211_REG_VLP_AP,</div><div class='del'>-	IEEE80211_REG_AP_POWER_AFTER_LAST,</div><div class='del'>-	IEEE80211_REG_AP_POWER_MAX =</div><div class='del'>-		IEEE80211_REG_AP_POWER_AFTER_LAST - 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_client_reg_power - regulatory power for a client</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_REG_UNSET_CLIENT: Client has no regulatory power mode</div><div class='del'>- * @IEEE80211_REG_DEFAULT_CLIENT: Default Client</div><div class='del'>- * @IEEE80211_REG_SUBORDINATE_CLIENT: Subordinate Client</div><div class='del'>- * @IEEE80211_REG_CLIENT_POWER_AFTER_LAST: internal</div><div class='del'>- * @IEEE80211_REG_CLIENT_POWER_MAX: maximum value</div><div class='del'>- */</div><div class='del'>-enum ieee80211_client_reg_power {</div><div class='del'>-	IEEE80211_REG_UNSET_CLIENT,</div><div class='del'>-	IEEE80211_REG_DEFAULT_CLIENT,</div><div class='del'>-	IEEE80211_REG_SUBORDINATE_CLIENT,</div><div class='del'>-	IEEE80211_REG_CLIENT_POWER_AFTER_LAST,</div><div class='del'>-	IEEE80211_REG_CLIENT_POWER_MAX =</div><div class='del'>-		IEEE80211_REG_CLIENT_POWER_AFTER_LAST - 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 802.11ax HE MAC capabilities */</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_HTC_HE				0x01</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_TWT_REQ				0x02</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_TWT_RES				0x04</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_NOT_SUPP		0x00</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_LEVEL_1		0x08</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_LEVEL_2		0x10</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_LEVEL_3		0x18</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_DYNAMIC_FRAG_MASK			0x18</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_1		0x00</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_2		0x20</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_4		0x40</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_8		0x60</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_16		0x80</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_32		0xa0</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_64		0xc0</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_UNLIMITED	0xe0</div><div class='del'>-#define IEEE80211_HE_MAC_CAP0_MAX_NUM_FRAG_MSDU_MASK		0xe0</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_UNLIMITED		0x00</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_128			0x01</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_256			0x02</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_512			0x03</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MIN_FRAG_SIZE_MASK		0x03</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_0US		0x00</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_8US		0x04</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US		0x08</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK		0x0c</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_1		0x00</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_2		0x10</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_3		0x20</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_4		0x30</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_5		0x40</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_6		0x50</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_7		0x60</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8		0x70</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_MASK		0x70</div><div class='del'>-</div><div class='del'>-/* Link adaptation is split between byte HE_MAC_CAP1 and</div><div class='del'>- * HE_MAC_CAP2. It should be set only if IEEE80211_HE_MAC_CAP0_HTC_HE</div><div class='del'>- * in which case the following values apply:</div><div class='del'>- * 0 = No feedback.</div><div class='del'>- * 1 = reserved.</div><div class='del'>- * 2 = Unsolicited feedback.</div><div class='del'>- * 3 = both</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_HE_MAC_CAP1_LINK_ADAPTATION			0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION			0x01</div><div class='del'>-#define IEEE80211_HE_MAC_CAP2_ALL_ACK				0x02</div><div class='del'>-#define IEEE80211_HE_MAC_CAP2_TRS				0x04</div><div class='del'>-#define IEEE80211_HE_MAC_CAP2_BSR				0x08</div><div class='del'>-#define IEEE80211_HE_MAC_CAP2_BCAST_TWT				0x10</div><div class='del'>-#define IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP			0x20</div><div class='del'>-#define IEEE80211_HE_MAC_CAP2_MU_CASCADING			0x40</div><div class='del'>-#define IEEE80211_HE_MAC_CAP2_ACK_EN				0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_OMI_CONTROL			0x02</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_OFDMA_RA				0x04</div><div class='del'>-</div><div class='del'>-/* The maximum length of an A-MDPU is defined by the combination of the Maximum</div><div class='del'>- * A-MDPU Length Exponent field in the HT capabilities, VHT capabilities and the</div><div class='del'>- * same field in the HE capabilities.</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_0		0x00</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_1		0x08</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2		0x10</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3		0x18</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK		0x18</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_AMSDU_FRAG			0x20</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED			0x40</div><div class='del'>-#define IEEE80211_HE_MAC_CAP3_RX_CTRL_FRAME_TO_MULTIBSS		0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG		0x01</div><div class='del'>-#define IEEE80211_HE_MAC_CAP4_QTP				0x02</div><div class='del'>-#define IEEE80211_HE_MAC_CAP4_BQR				0x04</div><div class='del'>-#define IEEE80211_HE_MAC_CAP4_PSR_RESP				0x08</div><div class='del'>-#define IEEE80211_HE_MAC_CAP4_NDP_FB_REP			0x10</div><div class='del'>-#define IEEE80211_HE_MAC_CAP4_OPS				0x20</div><div class='del'>-#define IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU			0x40</div><div class='del'>-/* Multi TID agg TX is split between byte #4 and #5</div><div class='del'>- * The value is a combination of B39,B40,B41</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39		0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40		0x01</div><div class='del'>-#define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41		0x02</div><div class='del'>-#define IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION	0x04</div><div class='del'>-#define IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU			0x08</div><div class='del'>-#define IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX		0x10</div><div class='del'>-#define IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS			0x20</div><div class='del'>-#define IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING		0x40</div><div class='del'>-#define IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX		0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20</div><div class='del'>-#define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16</div><div class='del'>-#define IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR	13</div><div class='del'>-</div><div class='del'>-/* 802.11ax HE PHY capabilities */</div><div class='del'>-#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G		0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G	0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G		0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G	0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL		0x1e</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_2G	0x20</div><div class='del'>-#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G	0x40</div><div class='del'>-#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK			0xfe</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_80MHZ_ONLY_SECOND_20MHZ	0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_80MHZ_ONLY_SECOND_40MHZ	0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_160MHZ_ONLY_SECOND_20MHZ	0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_160MHZ_ONLY_SECOND_40MHZ	0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK			0x0f</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A				0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD			0x20</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US		0x40</div><div class='del'>-/* Midamble RX/TX Max NSTS is split between byte #2 and byte #3 */</div><div class='del'>-#define IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS			0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS			0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US			0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ			0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ			0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP2_DOPPLER_TX				0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP2_DOPPLER_RX				0x20</div><div class='del'>-</div><div class='del'>-/* Note that the meaning of UL MU below is different between an AP and a non-AP</div><div class='del'>- * sta, where in the AP case it indicates support for Rx and in the non-AP sta</div><div class='del'>- * case it indicates support for Tx.</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO			0x40</div><div class='del'>-#define IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO			0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM			0x00</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK			0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK			0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_16_QAM			0x03</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK			0x03</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1				0x00</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_2				0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM			0x00</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK			0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK			0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_16_QAM			0x18</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK			0x18</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1				0x00</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_2				0x20</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU		0x40</div><div class='del'>-#define IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER				0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE				0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER				0x02</div><div class='del'>-</div><div class='del'>-/* Minimal allowed value of Max STS under 80MHz is 3 */</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4		0x0c</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_5		0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_6		0x14</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_7		0x18</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_8		0x1c</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK	0x1c</div><div class='del'>-</div><div class='del'>-/* Minimal allowed value of Max STS above 80MHz is 3 */</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4		0x60</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_5		0x80</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_6		0xa0</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_7		0xc0</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_8		0xe0</div><div class='del'>-#define IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_MASK	0xe0</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_1	0x00</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2	0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_3	0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_4	0x03</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_5	0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_6	0x05</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_7	0x06</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_8	0x07</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK	0x07</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_1	0x00</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2	0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_3	0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_4	0x18</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_5	0x20</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_6	0x28</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_7	0x30</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_8	0x38</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK	0x38</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK				0x40</div><div class='del'>-#define IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK				0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU			0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU			0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB			0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB		0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB				0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE			0x20</div><div class='del'>-#define IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO		0x40</div><div class='del'>-#define IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT			0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_PSR_BASED_SR				0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP			0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI		0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_MAX_NC_1					0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_MAX_NC_2					0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_MAX_NC_3					0x18</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_MAX_NC_4					0x20</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_MAX_NC_5					0x28</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_MAX_NC_6					0x30</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_MAX_NC_7					0x38</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_MAX_NC_MASK				0x38</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ			0x40</div><div class='del'>-#define IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ			0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI		0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G		0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU			0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU			0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_HE_ER_SU_1XLTF_AND_08_US_GI		0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_MIDAMBLE_RX_TX_2X_AND_1XLTF		0x20</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242				0x00</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484				0x40</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_996				0x80</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996				0xc0</div><div class='del'>-#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_MASK				0xc0</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM		0x01</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK		0x02</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU		0x04</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU		0x08</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB	0x10</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB	0x20</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US			0x0</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US			0x1</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US			0x2</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED		0x3</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS			6</div><div class='del'>-#define IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK			0xc0</div><div class='del'>-</div><div class='del'>-#define IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF			0x01</div><div class='del'>-</div><div class='del'>-/* 802.11ax HE TX/RX MCS NSS Support  */</div><div class='del'>-#define IEEE80211_TX_RX_MCS_NSS_SUPP_HIGHEST_MCS_POS			(3)</div><div class='del'>-#define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_POS			(6)</div><div class='del'>-#define IEEE80211_TX_RX_MCS_NSS_SUPP_RX_BITMAP_POS			(11)</div><div class='del'>-#define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_MASK			0x07c0</div><div class='del'>-#define IEEE80211_TX_RX_MCS_NSS_SUPP_RX_BITMAP_MASK			0xf800</div><div class='del'>-</div><div class='del'>-/* TX/RX HE MCS Support field Highest MCS subfield encoding */</div><div class='del'>-enum ieee80211_he_highest_mcs_supported_subfield_enc {</div><div class='del'>-	HIGHEST_MCS_SUPPORTED_MCS7 = 0,</div><div class='del'>-	HIGHEST_MCS_SUPPORTED_MCS8,</div><div class='del'>-	HIGHEST_MCS_SUPPORTED_MCS9,</div><div class='del'>-	HIGHEST_MCS_SUPPORTED_MCS10,</div><div class='del'>-	HIGHEST_MCS_SUPPORTED_MCS11,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Calculate 802.11ax HE capabilities IE Tx/Rx HE MCS NSS Support Field size */</div><div class='del'>-static inline u8</div><div class='del'>-ieee80211_he_mcs_nss_size(const struct ieee80211_he_cap_elem *he_cap)</div><div class='del'>-{</div><div class='del'>-	u8 count = 4;</div><div class='del'>-</div><div class='del'>-	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='del'>-	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='del'>-		count += 4;</div><div class='del'>-</div><div class='del'>-	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='del'>-	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)</div><div class='del'>-		count += 4;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 802.11ax HE PPE Thresholds */</div><div class='del'>-#define IEEE80211_PPE_THRES_NSS_SUPPORT_2NSS			(1)</div><div class='del'>-#define IEEE80211_PPE_THRES_NSS_POS				(0)</div><div class='del'>-#define IEEE80211_PPE_THRES_NSS_MASK				(7)</div><div class='del'>-#define IEEE80211_PPE_THRES_RU_INDEX_BITMASK_2x966_AND_966_RU	\</div><div class='del'>-	(BIT(5) | BIT(6))</div><div class='del'>-#define IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK		0x78</div><div class='del'>-#define IEEE80211_PPE_THRES_RU_INDEX_BITMASK_POS		(3)</div><div class='del'>-#define IEEE80211_PPE_THRES_INFO_PPET_SIZE			(3)</div><div class='del'>-#define IEEE80211_HE_PPE_THRES_INFO_HEADER_SIZE			(7)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calculate 802.11ax HE capabilities IE PPE field size</div><div class='del'>- * Input: Header byte of ppe_thres (first byte), and HE capa IE's PHY cap u8*</div><div class='del'>- */</div><div class='del'>-static inline u8</div><div class='del'>-ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info)</div><div class='del'>-{</div><div class='del'>-	u8 n;</div><div class='del'>-</div><div class='del'>-	if ((phy_cap_info[6] &amp;</div><div class='del'>-	     IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	n = hweight8(ppe_thres_hdr &amp;</div><div class='del'>-		     IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='del'>-	n *= (1 + ((ppe_thres_hdr &amp; IEEE80211_PPE_THRES_NSS_MASK) &gt;&gt;</div><div class='del'>-		   IEEE80211_PPE_THRES_NSS_POS));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Each pair is 6 bits, and we need to add the 7 "header" bits to the</div><div class='del'>-	 * total size.</div><div class='del'>-	 */</div><div class='del'>-	n = (n * IEEE80211_PPE_THRES_INFO_PPET_SIZE * 2) + 7;</div><div class='del'>-	n = DIV_ROUND_UP(n, 8);</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool ieee80211_he_capa_size_ok(const u8 *data, u8 len)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_he_cap_elem *he_cap_ie_elem = (const void *)data;</div><div class='del'>-	u8 needed = sizeof(*he_cap_ie_elem);</div><div class='del'>-</div><div class='del'>-	if (len &lt; needed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	needed += ieee80211_he_mcs_nss_size(he_cap_ie_elem);</div><div class='del'>-	if (len &lt; needed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (he_cap_ie_elem-&gt;phy_cap_info[6] &amp;</div><div class='del'>-			IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {</div><div class='del'>-		if (len &lt; needed + 1)</div><div class='del'>-			return false;</div><div class='del'>-		needed += ieee80211_he_ppe_size(data[needed],</div><div class='del'>-						he_cap_ie_elem-&gt;phy_cap_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len &gt;= needed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* HE Operation defines */</div><div class='del'>-#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK		0x00000007</div><div class='del'>-#define IEEE80211_HE_OPERATION_TWT_REQUIRED			0x00000008</div><div class='del'>-#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK		0x00003ff0</div><div class='del'>-#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET		4</div><div class='del'>-#define IEEE80211_HE_OPERATION_VHT_OPER_INFO			0x00004000</div><div class='del'>-#define IEEE80211_HE_OPERATION_CO_HOSTED_BSS			0x00008000</div><div class='del'>-#define IEEE80211_HE_OPERATION_ER_SU_DISABLE			0x00010000</div><div class='del'>-#define IEEE80211_HE_OPERATION_6GHZ_OP_INFO			0x00020000</div><div class='del'>-#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK			0x3f000000</div><div class='del'>-#define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET			24</div><div class='del'>-#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR		0x40000000</div><div class='del'>-#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED		0x80000000</div><div class='del'>-</div><div class='del'>-#define IEEE80211_6GHZ_CTRL_REG_LPI_AP	0</div><div class='del'>-#define IEEE80211_6GHZ_CTRL_REG_SP_AP	1</div><div class='del'>-#define IEEE80211_6GHZ_CTRL_REG_VLP_AP	2</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_he_6ghz_oper - HE 6 GHz operation Information field</div><div class='del'>- * @primary: primary channel</div><div class='del'>- * @control: control flags</div><div class='del'>- * @ccfs0: channel center frequency segment 0</div><div class='del'>- * @ccfs1: channel center frequency segment 1</div><div class='del'>- * @minrate: minimum rate (in 1 Mbps units)</div><div class='del'>- */</div><div class='del'>-struct ieee80211_he_6ghz_oper {</div><div class='del'>-	u8 primary;</div><div class='del'>-#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH	0x3</div><div class='del'>-#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_20MHZ	0</div><div class='del'>-#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_40MHZ	1</div><div class='del'>-#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_80MHZ	2</div><div class='del'>-#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_160MHZ	3</div><div class='del'>-#define IEEE80211_HE_6GHZ_OPER_CTRL_DUP_BEACON	0x4</div><div class='del'>-#define IEEE80211_HE_6GHZ_OPER_CTRL_REG_INFO	0x38</div><div class='del'>-	u8 control;</div><div class='del'>-	u8 ccfs0;</div><div class='del'>-	u8 ccfs1;</div><div class='del'>-	u8 minrate;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In "9.4.2.161 Transmit Power Envelope element" of "IEEE Std 802.11ax-2021",</div><div class='del'>- * it show four types in "Table 9-275a-Maximum Transmit Power Interpretation</div><div class='del'>- * subfield encoding", and two category for each type in "Table E-12-Regulatory</div><div class='del'>- * Info subfield encoding in the United States".</div><div class='del'>- * So it it totally max 8 Transmit Power Envelope element.</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_TPE_MAX_IE_COUNT	8</div><div class='del'>-/*</div><div class='del'>- * In "Table 9-277—Meaning of Maximum Transmit Power Count subfield"</div><div class='del'>- * of "IEEE Std 802.11ax™‐2021", the max power level is 8.</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_MAX_NUM_PWR_LEVEL	8</div><div class='del'>-</div><div class='del'>-#define IEEE80211_TPE_MAX_POWER_COUNT	8</div><div class='del'>-</div><div class='del'>-/* transmit power interpretation type of transmit power envelope element */</div><div class='del'>-enum ieee80211_tx_power_intrpt_type {</div><div class='del'>-	IEEE80211_TPE_LOCAL_EIRP,</div><div class='del'>-	IEEE80211_TPE_LOCAL_EIRP_PSD,</div><div class='del'>-	IEEE80211_TPE_REG_CLIENT_EIRP,</div><div class='del'>-	IEEE80211_TPE_REG_CLIENT_EIRP_PSD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ieee80211_tx_pwr_env - Transmit Power Envelope</div><div class='del'>- * @tx_power_info: Transmit Power Information field</div><div class='del'>- * @tx_power: Maximum Transmit Power field</div><div class='del'>- *</div><div class='del'>- * This structure represents the payload of the "Transmit Power</div><div class='del'>- * Envelope element" as described in IEEE Std 802.11ax-2021 section</div><div class='del'>- * 9.4.2.161</div><div class='del'>- */</div><div class='del'>-struct ieee80211_tx_pwr_env {</div><div class='del'>-	u8 tx_power_info;</div><div class='del'>-	s8 tx_power[IEEE80211_TPE_MAX_POWER_COUNT];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_TX_PWR_ENV_INFO_COUNT 0x7</div><div class='del'>-#define IEEE80211_TX_PWR_ENV_INFO_INTERPRET 0x38</div><div class='del'>-#define IEEE80211_TX_PWR_ENV_INFO_CATEGORY 0xC0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size</div><div class='del'>- * @he_oper_ie: byte data of the He Operations IE, stating from the byte</div><div class='del'>- *	after the ext ID byte. It is assumed that he_oper_ie has at least</div><div class='del'>- *	sizeof(struct ieee80211_he_operation) bytes, the caller must have</div><div class='del'>- *	validated this.</div><div class='del'>- * @return the actual size of the IE data (not including header), or 0 on error</div><div class='del'>- */</div><div class='del'>-static inline u8</div><div class='del'>-ieee80211_he_oper_size(const u8 *he_oper_ie)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_he_operation *he_oper = (const void *)he_oper_ie;</div><div class='del'>-	u8 oper_len = sizeof(struct ieee80211_he_operation);</div><div class='del'>-	u32 he_oper_params;</div><div class='del'>-</div><div class='del'>-	/* Make sure the input is not NULL */</div><div class='del'>-	if (!he_oper_ie)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Calc required length */</div><div class='del'>-	he_oper_params = le32_to_cpu(he_oper-&gt;he_oper_params);</div><div class='del'>-	if (he_oper_params &amp; IEEE80211_HE_OPERATION_VHT_OPER_INFO)</div><div class='del'>-		oper_len += 3;</div><div class='del'>-	if (he_oper_params &amp; IEEE80211_HE_OPERATION_CO_HOSTED_BSS)</div><div class='del'>-		oper_len++;</div><div class='del'>-	if (he_oper_params &amp; IEEE80211_HE_OPERATION_6GHZ_OP_INFO)</div><div class='del'>-		oper_len += sizeof(struct ieee80211_he_6ghz_oper);</div><div class='del'>-</div><div class='del'>-	/* Add the first byte (extension ID) to the total length */</div><div class='del'>-	oper_len++;</div><div class='del'>-</div><div class='del'>-	return oper_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_he_6ghz_oper - obtain 6 GHz operation field</div><div class='del'>- * @he_oper: HE operation element (must be pre-validated for size)</div><div class='del'>- *	but may be %NULL</div><div class='del'>- *</div><div class='del'>- * Return: a pointer to the 6 GHz operation field, or %NULL</div><div class='del'>- */</div><div class='del'>-static inline const struct ieee80211_he_6ghz_oper *</div><div class='del'>-ieee80211_he_6ghz_oper(const struct ieee80211_he_operation *he_oper)</div><div class='del'>-{</div><div class='del'>-	const u8 *ret;</div><div class='del'>-	u32 he_oper_params;</div><div class='del'>-</div><div class='del'>-	if (!he_oper)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ret = (const void *)&amp;he_oper-&gt;optional;</div><div class='del'>-</div><div class='del'>-	he_oper_params = le32_to_cpu(he_oper-&gt;he_oper_params);</div><div class='del'>-</div><div class='del'>-	if (!(he_oper_params &amp; IEEE80211_HE_OPERATION_6GHZ_OP_INFO))</div><div class='del'>-		return NULL;</div><div class='del'>-	if (he_oper_params &amp; IEEE80211_HE_OPERATION_VHT_OPER_INFO)</div><div class='del'>-		ret += 3;</div><div class='del'>-	if (he_oper_params &amp; IEEE80211_HE_OPERATION_CO_HOSTED_BSS)</div><div class='del'>-		ret++;</div><div class='del'>-</div><div class='del'>-	return (const void *)ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* HE Spatial Reuse defines */</div><div class='del'>-#define IEEE80211_HE_SPR_PSR_DISALLOWED				BIT(0)</div><div class='del'>-#define IEEE80211_HE_SPR_NON_SRG_OBSS_PD_SR_DISALLOWED		BIT(1)</div><div class='del'>-#define IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT			BIT(2)</div><div class='del'>-#define IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT		BIT(3)</div><div class='del'>-#define IEEE80211_HE_SPR_HESIGA_SR_VAL15_ALLOWED		BIT(4)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ieee80211_he_spr_size - calculate 802.11ax HE Spatial Reuse IE size</div><div class='del'>- * @he_spr_ie: byte data of the He Spatial Reuse IE, stating from the byte</div><div class='del'>- *	after the ext ID byte. It is assumed that he_spr_ie has at least</div><div class='del'>- *	sizeof(struct ieee80211_he_spr) bytes, the caller must have validated</div><div class='del'>- *	this</div><div class='del'>- * @return the actual size of the IE data (not including header), or 0 on error</div><div class='del'>- */</div><div class='del'>-static inline u8</div><div class='del'>-ieee80211_he_spr_size(const u8 *he_spr_ie)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_he_spr *he_spr = (const void *)he_spr_ie;</div><div class='del'>-	u8 spr_len = sizeof(struct ieee80211_he_spr);</div><div class='del'>-	u8 he_spr_params;</div><div class='del'>-</div><div class='del'>-	/* Make sure the input is not NULL */</div><div class='del'>-	if (!he_spr_ie)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Calc required length */</div><div class='del'>-	he_spr_params = he_spr-&gt;he_sr_control;</div><div class='del'>-	if (he_spr_params &amp; IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT)</div><div class='del'>-		spr_len++;</div><div class='del'>-	if (he_spr_params &amp; IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT)</div><div class='del'>-		spr_len += 18;</div><div class='del'>-</div><div class='del'>-	/* Add the first byte (extension ID) to the total length */</div><div class='del'>-	spr_len++;</div><div class='del'>-</div><div class='del'>-	return spr_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* S1G Capabilities Information field */</div><div class='del'>-#define IEEE80211_S1G_CAPABILITY_LEN	15</div><div class='del'>-</div><div class='del'>-#define S1G_CAP0_S1G_LONG	BIT(0)</div><div class='del'>-#define S1G_CAP0_SGI_1MHZ	BIT(1)</div><div class='del'>-#define S1G_CAP0_SGI_2MHZ	BIT(2)</div><div class='del'>-#define S1G_CAP0_SGI_4MHZ	BIT(3)</div><div class='del'>-#define S1G_CAP0_SGI_8MHZ	BIT(4)</div><div class='del'>-#define S1G_CAP0_SGI_16MHZ	BIT(5)</div><div class='del'>-#define S1G_CAP0_SUPP_CH_WIDTH	GENMASK(7, 6)</div><div class='del'>-</div><div class='del'>-#define S1G_SUPP_CH_WIDTH_2	0</div><div class='del'>-#define S1G_SUPP_CH_WIDTH_4	1</div><div class='del'>-#define S1G_SUPP_CH_WIDTH_8	2</div><div class='del'>-#define S1G_SUPP_CH_WIDTH_16	3</div><div class='del'>-#define S1G_SUPP_CH_WIDTH_MAX(cap) ((1 &lt;&lt; FIELD_GET(S1G_CAP0_SUPP_CH_WIDTH, \</div><div class='del'>-						    cap[0])) &lt;&lt; 1)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP1_RX_LDPC	BIT(0)</div><div class='del'>-#define S1G_CAP1_TX_STBC	BIT(1)</div><div class='del'>-#define S1G_CAP1_RX_STBC	BIT(2)</div><div class='del'>-#define S1G_CAP1_SU_BFER	BIT(3)</div><div class='del'>-#define S1G_CAP1_SU_BFEE	BIT(4)</div><div class='del'>-#define S1G_CAP1_BFEE_STS	GENMASK(7, 5)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP2_SOUNDING_DIMENSIONS	GENMASK(2, 0)</div><div class='del'>-#define S1G_CAP2_MU_BFER		BIT(3)</div><div class='del'>-#define S1G_CAP2_MU_BFEE		BIT(4)</div><div class='del'>-#define S1G_CAP2_PLUS_HTC_VHT		BIT(5)</div><div class='del'>-#define S1G_CAP2_TRAVELING_PILOT	GENMASK(7, 6)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP3_RD_RESPONDER		BIT(0)</div><div class='del'>-#define S1G_CAP3_HT_DELAYED_BA		BIT(1)</div><div class='del'>-#define S1G_CAP3_MAX_MPDU_LEN		BIT(2)</div><div class='del'>-#define S1G_CAP3_MAX_AMPDU_LEN_EXP	GENMASK(4, 3)</div><div class='del'>-#define S1G_CAP3_MIN_MPDU_START		GENMASK(7, 5)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP4_UPLINK_SYNC	BIT(0)</div><div class='del'>-#define S1G_CAP4_DYNAMIC_AID	BIT(1)</div><div class='del'>-#define S1G_CAP4_BAT		BIT(2)</div><div class='del'>-#define S1G_CAP4_TIME_ADE	BIT(3)</div><div class='del'>-#define S1G_CAP4_NON_TIM	BIT(4)</div><div class='del'>-#define S1G_CAP4_GROUP_AID	BIT(5)</div><div class='del'>-#define S1G_CAP4_STA_TYPE	GENMASK(7, 6)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP5_CENT_AUTH_CONTROL	BIT(0)</div><div class='del'>-#define S1G_CAP5_DIST_AUTH_CONTROL	BIT(1)</div><div class='del'>-#define S1G_CAP5_AMSDU			BIT(2)</div><div class='del'>-#define S1G_CAP5_AMPDU			BIT(3)</div><div class='del'>-#define S1G_CAP5_ASYMMETRIC_BA		BIT(4)</div><div class='del'>-#define S1G_CAP5_FLOW_CONTROL		BIT(5)</div><div class='del'>-#define S1G_CAP5_SECTORIZED_BEAM	GENMASK(7, 6)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP6_OBSS_MITIGATION	BIT(0)</div><div class='del'>-#define S1G_CAP6_FRAGMENT_BA		BIT(1)</div><div class='del'>-#define S1G_CAP6_NDP_PS_POLL		BIT(2)</div><div class='del'>-#define S1G_CAP6_RAW_OPERATION		BIT(3)</div><div class='del'>-#define S1G_CAP6_PAGE_SLICING		BIT(4)</div><div class='del'>-#define S1G_CAP6_TXOP_SHARING_IMP_ACK	BIT(5)</div><div class='del'>-#define S1G_CAP6_VHT_LINK_ADAPT		GENMASK(7, 6)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP7_TACK_AS_PS_POLL		BIT(0)</div><div class='del'>-#define S1G_CAP7_DUP_1MHZ			BIT(1)</div><div class='del'>-#define S1G_CAP7_MCS_NEGOTIATION		BIT(2)</div><div class='del'>-#define S1G_CAP7_1MHZ_CTL_RESPONSE_PREAMBLE	BIT(3)</div><div class='del'>-#define S1G_CAP7_NDP_BFING_REPORT_POLL		BIT(4)</div><div class='del'>-#define S1G_CAP7_UNSOLICITED_DYN_AID		BIT(5)</div><div class='del'>-#define S1G_CAP7_SECTOR_TRAINING_OPERATION	BIT(6)</div><div class='del'>-#define S1G_CAP7_TEMP_PS_MODE_SWITCH		BIT(7)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP8_TWT_GROUPING	BIT(0)</div><div class='del'>-#define S1G_CAP8_BDT		BIT(1)</div><div class='del'>-#define S1G_CAP8_COLOR		GENMASK(4, 2)</div><div class='del'>-#define S1G_CAP8_TWT_REQUEST	BIT(5)</div><div class='del'>-#define S1G_CAP8_TWT_RESPOND	BIT(6)</div><div class='del'>-#define S1G_CAP8_PV1_FRAME	BIT(7)</div><div class='del'>-</div><div class='del'>-#define S1G_CAP9_LINK_ADAPT_PER_CONTROL_RESPONSE BIT(0)</div><div class='del'>-</div><div class='del'>-#define S1G_OPER_CH_WIDTH_PRIMARY_1MHZ	BIT(0)</div><div class='del'>-#define S1G_OPER_CH_WIDTH_OPER		GENMASK(4, 1)</div><div class='del'>-</div><div class='del'>-/* EHT MAC capabilities as defined in P802.11be_D2.0 section 9.4.2.313.2 */</div><div class='del'>-#define IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS			0x01</div><div class='del'>-#define IEEE80211_EHT_MAC_CAP0_OM_CONTROL			0x02</div><div class='del'>-#define IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1		0x04</div><div class='del'>-#define IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE2		0x08</div><div class='del'>-#define IEEE80211_EHT_MAC_CAP0_RESTRICTED_TWT			0x10</div><div class='del'>-#define IEEE80211_EHT_MAC_CAP0_SCS_TRAFFIC_DESC			0x20</div><div class='del'>-#define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK		0xc0</div><div class='del'>-#define	IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_3895	        0</div><div class='del'>-#define	IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_7991	        1</div><div class='del'>-#define	IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454	        2</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_MAC_CAP1_MAX_AMPDU_LEN_MASK		0x01</div><div class='del'>-</div><div class='del'>-/* EHT PHY capabilities as defined in P802.11be_D2.0 section 9.4.2.313.3 */</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ			0x02</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ		0x04</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI		0x08</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO		0x10</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER			0x20</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE			0x40</div><div class='del'>-</div><div class='del'>-/* EHT beamformee number of spatial streams &lt;= 80MHz is split */</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK		0x80</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK		0x03</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK	0x1c</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK	0xe0</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK		0x07</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK		0x38</div><div class='del'>-</div><div class='del'>-/* EHT number of sounding dimensions for 320MHz is split */</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK		0xc0</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP3_SOUNDING_DIM_320MHZ_MASK		0x01</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK		0x02</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK		0x04</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK		0x08</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK		0x10</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK			0x20</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK		0x40</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK			0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO		0x01</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP4_PSR_SR_SUPP			0x02</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP		0x04</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI	0x08</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK			0xf0</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK		0x01</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP		0x02</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP		0x04</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT		0x08</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK	0x30</div><div class='del'>-#define   IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_0US	0</div><div class='del'>-#define   IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US	1</div><div class='del'>-#define   IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US	2</div><div class='del'>-#define   IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_20US	3</div><div class='del'>-</div><div class='del'>-/* Maximum number of supported EHT LTF is split */</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK	0xc0</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF		0x40</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK	0x07</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_80MHZ			0x08</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_160MHZ		0x30</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_320MHZ		0x40</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK			0x78</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP		0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP7_20MHZ_STA_RX_NDP_WIDER_BW	0x01</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ	0x02</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ	0x04</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ	0x08</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ		0x10</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ		0x20</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ		0x40</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP7_TB_SOUNDING_FDBK_RATE_LIMIT	0x80</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP8_RX_1024QAM_WIDER_BW_DL_OFDMA	0x01</div><div class='del'>-#define IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA	0x02</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EHT operation channel width as defined in P802.11be_D2.0 section 9.4.2.311</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_EHT_OPER_CHAN_WIDTH		0x7</div><div class='del'>-#define IEEE80211_EHT_OPER_CHAN_WIDTH_20MHZ	0</div><div class='del'>-#define IEEE80211_EHT_OPER_CHAN_WIDTH_40MHZ	1</div><div class='del'>-#define IEEE80211_EHT_OPER_CHAN_WIDTH_80MHZ	2</div><div class='del'>-#define IEEE80211_EHT_OPER_CHAN_WIDTH_160MHZ	3</div><div class='del'>-#define IEEE80211_EHT_OPER_CHAN_WIDTH_320MHZ	4</div><div class='del'>-</div><div class='del'>-/* Calculate 802.11be EHT capabilities IE Tx/Rx EHT MCS NSS Support Field size */</div><div class='del'>-static inline u8</div><div class='del'>-ieee80211_eht_mcs_nss_size(const struct ieee80211_he_cap_elem *he_cap,</div><div class='del'>-			   const struct ieee80211_eht_cap_elem_fixed *eht_cap,</div><div class='del'>-			   bool from_ap)</div><div class='del'>-{</div><div class='del'>-	u8 count = 0;</div><div class='del'>-</div><div class='del'>-	/* on 2.4 GHz, if it supports 40 MHz, the result is 3 */</div><div class='del'>-	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='del'>-	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G)</div><div class='del'>-		return 3;</div><div class='del'>-</div><div class='del'>-	/* on 2.4 GHz, these three bits are reserved, so should be 0 */</div><div class='del'>-	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='del'>-	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G)</div><div class='del'>-		count += 3;</div><div class='del'>-</div><div class='del'>-	if (he_cap-&gt;phy_cap_info[0] &amp;</div><div class='del'>-	    IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G)</div><div class='del'>-		count += 3;</div><div class='del'>-</div><div class='del'>-	if (eht_cap-&gt;phy_cap_info[0] &amp; IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ)</div><div class='del'>-		count += 3;</div><div class='del'>-</div><div class='del'>-	if (count)</div><div class='del'>-		return count;</div><div class='del'>-</div><div class='del'>-	return from_ap ? 3 : 4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 802.11be EHT PPE Thresholds */</div><div class='del'>-#define IEEE80211_EHT_PPE_THRES_NSS_POS			0</div><div class='del'>-#define IEEE80211_EHT_PPE_THRES_NSS_MASK		0xf</div><div class='del'>-#define IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK	0x1f0</div><div class='del'>-#define IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE		3</div><div class='del'>-#define IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE	9</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calculate 802.11be EHT capabilities IE EHT field size</div><div class='del'>- */</div><div class='del'>-static inline u8</div><div class='del'>-ieee80211_eht_ppe_size(u16 ppe_thres_hdr, const u8 *phy_cap_info)</div><div class='del'>-{</div><div class='del'>-	u32 n;</div><div class='del'>-</div><div class='del'>-	if (!(phy_cap_info[5] &amp;</div><div class='del'>-	      IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	n = hweight16(ppe_thres_hdr &amp;</div><div class='del'>-		      IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK);</div><div class='del'>-	n *= 1 + u16_get_bits(ppe_thres_hdr, IEEE80211_EHT_PPE_THRES_NSS_MASK);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Each pair is 6 bits, and we need to add the 9 "header" bits to the</div><div class='del'>-	 * total size.</div><div class='del'>-	 */</div><div class='del'>-	n = n * IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE * 2 +</div><div class='del'>-	    IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE;</div><div class='del'>-	return DIV_ROUND_UP(n, 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool</div><div class='del'>-ieee80211_eht_capa_size_ok(const u8 *he_capa, const u8 *data, u8 len,</div><div class='del'>-			   bool from_ap)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_eht_cap_elem_fixed *elem = (const void *)data;</div><div class='del'>-	u8 needed = sizeof(struct ieee80211_eht_cap_elem_fixed);</div><div class='del'>-</div><div class='del'>-	if (len &lt; needed || !he_capa)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	needed += ieee80211_eht_mcs_nss_size((const void *)he_capa,</div><div class='del'>-					     (const void *)data,</div><div class='del'>-					     from_ap);</div><div class='del'>-	if (len &lt; needed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (elem-&gt;phy_cap_info[5] &amp;</div><div class='del'>-			IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) {</div><div class='del'>-		u16 ppe_thres_hdr;</div><div class='del'>-</div><div class='del'>-		if (len &lt; needed + sizeof(ppe_thres_hdr))</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		ppe_thres_hdr = get_unaligned_le16(data + needed);</div><div class='del'>-		needed += ieee80211_eht_ppe_size(ppe_thres_hdr,</div><div class='del'>-						 elem-&gt;phy_cap_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len &gt;= needed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool</div><div class='del'>-ieee80211_eht_oper_size_ok(const u8 *data, u8 len)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_eht_operation *elem = (const void *)data;</div><div class='del'>-	u8 needed = sizeof(*elem);</div><div class='del'>-</div><div class='del'>-	if (len &lt; needed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (elem-&gt;params &amp; IEEE80211_EHT_OPER_INFO_PRESENT) {</div><div class='del'>-		needed += 3;</div><div class='del'>-</div><div class='del'>-		if (elem-&gt;params &amp;</div><div class='del'>-		    IEEE80211_EHT_OPER_DISABLED_SUBCHANNEL_BITMAP_PRESENT)</div><div class='del'>-			needed += 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len &gt;= needed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* must validate ieee80211_eht_oper_size_ok() first */</div><div class='del'>-static inline u16</div><div class='del'>-ieee80211_eht_oper_dis_subchan_bitmap(const struct ieee80211_eht_operation *eht_oper)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_eht_operation_info *info =</div><div class='del'>-		(const void *)eht_oper-&gt;optional;</div><div class='del'>-</div><div class='del'>-	if (!(eht_oper-&gt;params &amp; IEEE80211_EHT_OPER_INFO_PRESENT))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!(eht_oper-&gt;params &amp; IEEE80211_EHT_OPER_DISABLED_SUBCHANNEL_BITMAP_PRESENT))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return get_unaligned_le16(info-&gt;optional);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IEEE80211_BW_IND_DIS_SUBCH_PRESENT	BIT(1)</div><div class='del'>-</div><div class='del'>-struct ieee80211_bandwidth_indication {</div><div class='del'>-	u8 params;</div><div class='del'>-	struct ieee80211_eht_operation_info info;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-static inline bool</div><div class='del'>-ieee80211_bandwidth_indication_size_ok(const u8 *data, u8 len)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_bandwidth_indication *bwi = (const void *)data;</div><div class='del'>-</div><div class='del'>-	if (len &lt; sizeof(*bwi))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (bwi-&gt;params &amp; IEEE80211_BW_IND_DIS_SUBCH_PRESENT &amp;&amp;</div><div class='del'>-	    len &lt; sizeof(*bwi) + 2)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define LISTEN_INT_USF	GENMASK(15, 14)</div><div class='del'>-#define LISTEN_INT_UI	GENMASK(13, 0)</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MAX_USF	FIELD_MAX(LISTEN_INT_USF)</div><div class='del'>-#define IEEE80211_MAX_UI	FIELD_MAX(LISTEN_INT_UI)</div><div class='del'>-</div><div class='ctx'> /* Authentication algorithms */</div><div class='ctx'> #define WLAN_AUTH_OPEN 0</div><div class='ctx'> #define WLAN_AUTH_SHARED_KEY 1</div><div class='hunk'>@@ -3396,8 +1493,8 @@ enum ieee80211_statuscode {</div><div class='ctx'> 	WLAN_STATUS_DENIED_WITH_SUGGESTED_BAND_AND_CHANNEL = 99,</div><div class='ctx'> 	WLAN_STATUS_DENIED_DUE_TO_SPECTRUM_MANAGEMENT = 103,</div><div class='ctx'> 	/* 802.11ai */</div><div class='del'>-	WLAN_STATUS_FILS_AUTHENTICATION_FAILURE = 108,</div><div class='del'>-	WLAN_STATUS_UNKNOWN_AUTHENTICATION_SERVER = 109,</div><div class='add'>+	WLAN_STATUS_FILS_AUTHENTICATION_FAILURE = 112,</div><div class='add'>+	WLAN_STATUS_UNKNOWN_AUTHENTICATION_SERVER = 113,</div><div class='ctx'> 	WLAN_STATUS_SAE_HASH_TO_ELEMENT = 126,</div><div class='ctx'> 	WLAN_STATUS_SAE_PK = 127,</div><div class='ctx'> 	WLAN_STATUS_DENIED_TID_TO_LINK_MAPPING = 133,</div><div class='hunk'>@@ -3678,6 +1775,7 @@ enum ieee80211_eid_ext {</div><div class='ctx'> 	WLAN_EID_EXT_FILS_PUBLIC_KEY = 12,</div><div class='ctx'> 	WLAN_EID_EXT_FILS_NONCE = 13,</div><div class='ctx'> 	WLAN_EID_EXT_FUTURE_CHAN_GUIDANCE = 14,</div><div class='add'>+	WLAN_EID_EXT_DH_PARAMETER = 32,</div><div class='ctx'> 	WLAN_EID_EXT_HE_CAPABILITY = 35,</div><div class='ctx'> 	WLAN_EID_EXT_HE_OPERATION = 36,</div><div class='ctx'> 	WLAN_EID_EXT_UORA = 37,</div><div class='hunk'>@@ -3701,6 +1799,8 @@ enum ieee80211_eid_ext {</div><div class='ctx'> 	WLAN_EID_EXT_EHT_CAPABILITY = 108,</div><div class='ctx'> 	WLAN_EID_EXT_TID_TO_LINK_MAPPING = 109,</div><div class='ctx'> 	WLAN_EID_EXT_BANDWIDTH_INDICATION = 135,</div><div class='add'>+	WLAN_EID_EXT_KNOWN_STA_IDENTIFCATION = 136,</div><div class='add'>+	WLAN_EID_EXT_NON_AP_STA_REG_CON = 137,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Action category code */</div><div class='hunk'>@@ -3741,25 +1841,6 @@ enum ieee80211_spectrum_mgmt_actioncode {</div><div class='ctx'> 	WLAN_ACTION_SPCT_CHL_SWITCH = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* HT action codes */</div><div class='del'>-enum ieee80211_ht_actioncode {</div><div class='del'>-	WLAN_HT_ACTION_NOTIFY_CHANWIDTH = 0,</div><div class='del'>-	WLAN_HT_ACTION_SMPS = 1,</div><div class='del'>-	WLAN_HT_ACTION_PSMP = 2,</div><div class='del'>-	WLAN_HT_ACTION_PCO_PHASE = 3,</div><div class='del'>-	WLAN_HT_ACTION_CSI = 4,</div><div class='del'>-	WLAN_HT_ACTION_NONCOMPRESSED_BF = 5,</div><div class='del'>-	WLAN_HT_ACTION_COMPRESSED_BF = 6,</div><div class='del'>-	WLAN_HT_ACTION_ASEL_IDX_FEEDBACK = 7,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* VHT action codes */</div><div class='del'>-enum ieee80211_vht_actioncode {</div><div class='del'>-	WLAN_VHT_ACTION_COMPRESSED_BF = 0,</div><div class='del'>-	WLAN_VHT_ACTION_GROUPID_MGMT = 1,</div><div class='del'>-	WLAN_VHT_ACTION_OPMODE_NOTIF = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Self Protected Action codes */</div><div class='ctx'> enum ieee80211_self_protected_actioncode {</div><div class='ctx'> 	WLAN_SP_RESERVED = 0,</div><div class='hunk'>@@ -3770,34 +1851,12 @@ enum ieee80211_self_protected_actioncode {</div><div class='ctx'> 	WLAN_SP_MGK_ACK = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Mesh action codes */</div><div class='del'>-enum ieee80211_mesh_actioncode {</div><div class='del'>-	WLAN_MESH_ACTION_LINK_METRIC_REPORT,</div><div class='del'>-	WLAN_MESH_ACTION_HWMP_PATH_SELECTION,</div><div class='del'>-	WLAN_MESH_ACTION_GATE_ANNOUNCEMENT,</div><div class='del'>-	WLAN_MESH_ACTION_CONGESTION_CONTROL_NOTIFICATION,</div><div class='del'>-	WLAN_MESH_ACTION_MCCA_SETUP_REQUEST,</div><div class='del'>-	WLAN_MESH_ACTION_MCCA_SETUP_REPLY,</div><div class='del'>-	WLAN_MESH_ACTION_MCCA_ADVERTISEMENT_REQUEST,</div><div class='del'>-	WLAN_MESH_ACTION_MCCA_ADVERTISEMENT,</div><div class='del'>-	WLAN_MESH_ACTION_MCCA_TEARDOWN,</div><div class='del'>-	WLAN_MESH_ACTION_TBTT_ADJUSTMENT_REQUEST,</div><div class='del'>-	WLAN_MESH_ACTION_TBTT_ADJUSTMENT_RESPONSE,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Unprotected WNM action codes */</div><div class='ctx'> enum ieee80211_unprotected_wnm_actioncode {</div><div class='ctx'> 	WLAN_UNPROTECTED_WNM_ACTION_TIM = 0,</div><div class='ctx'> 	WLAN_UNPROTECTED_WNM_ACTION_TIMING_MEASUREMENT_RESPONSE = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Protected EHT action codes */</div><div class='del'>-enum ieee80211_protected_eht_actioncode {</div><div class='del'>-	WLAN_PROTECTED_EHT_ACTION_TTLM_REQ = 0,</div><div class='del'>-	WLAN_PROTECTED_EHT_ACTION_TTLM_RES = 1,</div><div class='del'>-	WLAN_PROTECTED_EHT_ACTION_TTLM_TEARDOWN = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Security key length */</div><div class='ctx'> enum ieee80211_key_len {</div><div class='ctx'> 	WLAN_KEY_LEN_WEP40 = 5,</div><div class='hunk'>@@ -3814,18 +1873,14 @@ enum ieee80211_key_len {</div><div class='ctx'> 	WLAN_KEY_LEN_BIP_GMAC_256 = 32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum ieee80211_s1g_actioncode {</div><div class='del'>-	WLAN_S1G_AID_SWITCH_REQUEST,</div><div class='del'>-	WLAN_S1G_AID_SWITCH_RESPONSE,</div><div class='del'>-	WLAN_S1G_SYNC_CONTROL,</div><div class='del'>-	WLAN_S1G_STA_INFO_ANNOUNCE,</div><div class='del'>-	WLAN_S1G_EDCA_PARAM_SET,</div><div class='del'>-	WLAN_S1G_EL_OPERATION,</div><div class='del'>-	WLAN_S1G_TWT_SETUP,</div><div class='del'>-	WLAN_S1G_TWT_TEARDOWN,</div><div class='del'>-	WLAN_S1G_SECT_GROUP_ID_LIST,</div><div class='del'>-	WLAN_S1G_SECT_ID_FEEDBACK,</div><div class='del'>-	WLAN_S1G_TWT_INFORMATION = 11,</div><div class='add'>+/* Radio measurement action codes as defined in IEEE 802.11-2024 - Table 9-470 */</div><div class='add'>+enum ieee80211_radio_measurement_actioncode {</div><div class='add'>+	WLAN_RM_ACTION_RADIO_MEASUREMENT_REQUEST = 0,</div><div class='add'>+	WLAN_RM_ACTION_RADIO_MEASUREMENT_REPORT  = 1,</div><div class='add'>+	WLAN_RM_ACTION_LINK_MEASUREMENT_REQUEST  = 2,</div><div class='add'>+	WLAN_RM_ACTION_LINK_MEASUREMENT_REPORT   = 3,</div><div class='add'>+	WLAN_RM_ACTION_NEIGHBOR_REPORT_REQUEST   = 4,</div><div class='add'>+	WLAN_RM_ACTION_NEIGHBOR_REPORT_RESPONSE  = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IEEE80211_WEP_IV_LEN		4</div><div class='hunk'>@@ -3843,6 +1898,9 @@ enum ieee80211_s1g_actioncode {</div><div class='ctx'> #define IEEE80211_GCMP_HDR_LEN		8</div><div class='ctx'> #define IEEE80211_GCMP_MIC_LEN		16</div><div class='ctx'> #define IEEE80211_GCMP_PN_LEN		6</div><div class='add'>+#define IEEE80211_CMAC_128_MIC_LEN	8</div><div class='add'>+#define IEEE80211_CMAC_256_MIC_LEN	16</div><div class='add'>+#define IEEE80211_GMAC_MIC_LEN		16</div><div class='ctx'> </div><div class='ctx'> #define FILS_NONCE_LEN			16</div><div class='ctx'> #define FILS_MAX_KEK_LEN		64</div><div class='hunk'>@@ -3968,71 +2026,15 @@ enum ieee80211_tdls_actioncode {</div><div class='ctx'> /* Defines support for enhanced multi-bssid advertisement*/</div><div class='ctx'> #define WLAN_EXT_CAPA11_EMA_SUPPORT	BIT(3)</div><div class='ctx'> </div><div class='add'>+/* Enable Beacon Protection */</div><div class='add'>+#define WLAN_EXT_CAPA11_BCN_PROTECT	BIT(4)</div><div class='add'>+</div><div class='ctx'> /* TDLS specific payload type in the LLC/SNAP header */</div><div class='ctx'> #define WLAN_TDLS_SNAP_RFTYPE	0x2</div><div class='ctx'> </div><div class='ctx'> /* BSS Coex IE information field bits */</div><div class='ctx'> #define WLAN_BSS_COEX_INFORMATION_REQUEST	BIT(0)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_mesh_sync_method - mesh synchronization method identifier</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET: the default synchronization method</div><div class='del'>- * @IEEE80211_SYNC_METHOD_VENDOR: a vendor specific synchronization method</div><div class='del'>- *	that will be specified in a vendor specific information element</div><div class='del'>- */</div><div class='del'>-enum ieee80211_mesh_sync_method {</div><div class='del'>-	IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET = 1,</div><div class='del'>-	IEEE80211_SYNC_METHOD_VENDOR = 255,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_mesh_path_protocol - mesh path selection protocol identifier</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_PATH_PROTOCOL_HWMP: the default path selection protocol</div><div class='del'>- * @IEEE80211_PATH_PROTOCOL_VENDOR: a vendor specific protocol that will</div><div class='del'>- *	be specified in a vendor specific information element</div><div class='del'>- */</div><div class='del'>-enum ieee80211_mesh_path_protocol {</div><div class='del'>-	IEEE80211_PATH_PROTOCOL_HWMP = 1,</div><div class='del'>-	IEEE80211_PATH_PROTOCOL_VENDOR = 255,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_mesh_path_metric - mesh path selection metric identifier</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_PATH_METRIC_AIRTIME: the default path selection metric</div><div class='del'>- * @IEEE80211_PATH_METRIC_VENDOR: a vendor specific metric that will be</div><div class='del'>- *	specified in a vendor specific information element</div><div class='del'>- */</div><div class='del'>-enum ieee80211_mesh_path_metric {</div><div class='del'>-	IEEE80211_PATH_METRIC_AIRTIME = 1,</div><div class='del'>-	IEEE80211_PATH_METRIC_VENDOR = 255,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ieee80211_root_mode_identifier - root mesh STA mode identifier</div><div class='del'>- *</div><div class='del'>- * These attribute are used by dot11MeshHWMPRootMode to set root mesh STA mode</div><div class='del'>- *</div><div class='del'>- * @IEEE80211_ROOTMODE_NO_ROOT: the mesh STA is not a root mesh STA (default)</div><div class='del'>- * @IEEE80211_ROOTMODE_ROOT: the mesh STA is a root mesh STA if greater than</div><div class='del'>- *	this value</div><div class='del'>- * @IEEE80211_PROACTIVE_PREQ_NO_PREP: the mesh STA is a root mesh STA supports</div><div class='del'>- *	the proactive PREQ with proactive PREP subfield set to 0</div><div class='del'>- * @IEEE80211_PROACTIVE_PREQ_WITH_PREP: the mesh STA is a root mesh STA</div><div class='del'>- *	supports the proactive PREQ with proactive PREP subfield set to 1</div><div class='del'>- * @IEEE80211_PROACTIVE_RANN: the mesh STA is a root mesh STA supports</div><div class='del'>- *	the proactive RANN</div><div class='del'>- */</div><div class='del'>-enum ieee80211_root_mode_identifier {</div><div class='del'>-	IEEE80211_ROOTMODE_NO_ROOT = 0,</div><div class='del'>-	IEEE80211_ROOTMODE_ROOT = 1,</div><div class='del'>-	IEEE80211_PROACTIVE_PREQ_NO_PREP = 2,</div><div class='del'>-	IEEE80211_PROACTIVE_PREQ_WITH_PREP = 3,</div><div class='del'>-	IEEE80211_PROACTIVE_RANN = 4,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * IEEE 802.11-2007 7.3.2.9 Country information element</div><div class='ctx'>  *</div><div class='hunk'>@@ -4125,7 +2127,7 @@ enum ieee80211_idle_options {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct ieee80211_bss_max_idle_period_ie</div><div class='add'>+ * struct ieee80211_bss_max_idle_period_ie - BSS max idle period element struct</div><div class='ctx'>  *</div><div class='ctx'>  * This structure refers to "BSS Max idle period element"</div><div class='ctx'>  *</div><div class='hunk'>@@ -4140,19 +2142,6 @@ struct ieee80211_bss_max_idle_period_ie {</div><div class='ctx'> 	u8 idle_options;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* BACK action code */</div><div class='del'>-enum ieee80211_back_actioncode {</div><div class='del'>-	WLAN_ACTION_ADDBA_REQ = 0,</div><div class='del'>-	WLAN_ACTION_ADDBA_RESP = 1,</div><div class='del'>-	WLAN_ACTION_DELBA = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* BACK (block-ack) parties */</div><div class='del'>-enum ieee80211_back_parties {</div><div class='del'>-	WLAN_BACK_RECIPIENT = 0,</div><div class='del'>-	WLAN_BACK_INITIATOR = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* SA Query action */</div><div class='ctx'> enum ieee80211_sa_query_action {</div><div class='ctx'> 	WLAN_ACTION_SA_QUERY_REQUEST = 0,</div><div class='hunk'>@@ -4160,7 +2149,7 @@ enum ieee80211_sa_query_action {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct ieee80211_bssid_index</div><div class='add'>+ * struct ieee80211_bssid_index - multiple BSSID index element structure</div><div class='ctx'>  *</div><div class='ctx'>  * This structure refers to "Multiple BSSID-index element"</div><div class='ctx'>  *</div><div class='hunk'>@@ -4175,7 +2164,8 @@ struct ieee80211_bssid_index {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct ieee80211_multiple_bssid_configuration</div><div class='add'>+ * struct ieee80211_multiple_bssid_configuration - multiple BSSID configuration</div><div class='add'>+ *	element structure</div><div class='ctx'>  *</div><div class='ctx'>  * This structure refers to "Multiple BSSID Configuration element"</div><div class='ctx'>  *</div><div class='hunk'>@@ -4285,27 +2275,10 @@ struct ieee80211_tspec_ie {</div><div class='ctx'> 	__le16 medium_time;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct ieee80211_he_6ghz_capa {</div><div class='del'>-	/* uses IEEE80211_HE_6GHZ_CAP_* below */</div><div class='del'>-	__le16 capa;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/* HE 6 GHz band capabilities */</div><div class='del'>-/* uses enum ieee80211_min_mpdu_spacing values */</div><div class='del'>-#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START	0x0007</div><div class='del'>-/* uses enum ieee80211_vht_max_ampdu_length_exp values */</div><div class='del'>-#define IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP	0x0038</div><div class='del'>-/* uses IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_* values */</div><div class='del'>-#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN	0x00c0</div><div class='del'>-/* WLAN_HT_CAP_SM_PS_* values */</div><div class='del'>-#define IEEE80211_HE_6GHZ_CAP_SM_PS		0x0600</div><div class='del'>-#define IEEE80211_HE_6GHZ_CAP_RD_RESPONDER	0x0800</div><div class='del'>-#define IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS	0x1000</div><div class='del'>-#define IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS	0x2000</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_get_qos_ctl - get pointer to qos control bytes</div><div class='ctx'>  * @hdr: the frame</div><div class='add'>+ * Return: a pointer to the QoS control field in the frame header</div><div class='ctx'>  *</div><div class='ctx'>  * The qos ctrl bytes come after the frame_control, duration, seq_num</div><div class='ctx'>  * and 3 or 4 addresses of length ETH_ALEN. Checks frame_control to choose</div><div class='hunk'>@@ -4328,6 +2301,7 @@ static inline u8 *ieee80211_get_qos_ctl(struct ieee80211_hdr *hdr)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_get_tid - get qos TID</div><div class='ctx'>  * @hdr: the frame</div><div class='add'>+ * Return: the TID from the QoS control field</div><div class='ctx'>  */</div><div class='ctx'> static inline u8 ieee80211_get_tid(struct ieee80211_hdr *hdr)</div><div class='ctx'> {</div><div class='hunk'>@@ -4339,6 +2313,7 @@ static inline u8 ieee80211_get_tid(struct ieee80211_hdr *hdr)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_get_SA - get pointer to SA</div><div class='ctx'>  * @hdr: the frame</div><div class='add'>+ * Return: a pointer to the source address (SA)</div><div class='ctx'>  *</div><div class='ctx'>  * Given an 802.11 frame, this function returns the offset</div><div class='ctx'>  * to the source address (SA). It does not verify that the</div><div class='hunk'>@@ -4358,6 +2333,7 @@ static inline u8 *ieee80211_get_SA(struct ieee80211_hdr *hdr)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_get_DA - get pointer to DA</div><div class='ctx'>  * @hdr: the frame</div><div class='add'>+ * Return: a pointer to the destination address (DA)</div><div class='ctx'>  *</div><div class='ctx'>  * Given an 802.11 frame, this function returns the offset</div><div class='ctx'>  * to the destination address (DA). It does not verify that</div><div class='hunk'>@@ -4376,6 +2352,7 @@ static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU</div><div class='ctx'>  * @skb: the skb to check, starting with the 802.11 header</div><div class='add'>+ * Return: whether or not the MMPDU is bufferable</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_bufferable_mmpdu(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -4414,6 +2391,7 @@ static inline bool ieee80211_is_bufferable_mmpdu(struct sk_buff *skb)</div><div class='ctx'> /**</div><div class='ctx'>  * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame</div><div class='ctx'>  * @hdr: the frame (buffer must include at least the first octet of payload)</div><div class='add'>+ * Return: whether or not the frame is a robust management frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)</div><div class='ctx'> {</div><div class='hunk'>@@ -4450,6 +2428,7 @@ static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame</div><div class='ctx'>  * @skb: the skb containing the frame, length will be checked</div><div class='add'>+ * Return: whether or not the frame is a robust management frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -4462,6 +2441,7 @@ static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)</div><div class='ctx'>  * ieee80211_is_public_action - check if frame is a public action frame</div><div class='ctx'>  * @hdr: the frame</div><div class='ctx'>  * @len: length of the frame</div><div class='add'>+ * Return: whether or not the frame is a public action frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_public_action(struct ieee80211_hdr *hdr,</div><div class='ctx'> 					      size_t len)</div><div class='hunk'>@@ -4507,8 +2487,9 @@ ieee80211_is_protected_dual_of_public_action(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * _ieee80211_is_group_privacy_action - check if frame is a group addressed</div><div class='del'>- * privacy action frame</div><div class='add'>+ *	privacy action frame</div><div class='ctx'>  * @hdr: the frame</div><div class='add'>+ * Return: whether or not the frame is a group addressed privacy action frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool _ieee80211_is_group_privacy_action(struct ieee80211_hdr *hdr)</div><div class='ctx'> {</div><div class='hunk'>@@ -4524,8 +2505,9 @@ static inline bool _ieee80211_is_group_privacy_action(struct ieee80211_hdr *hdr)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_is_group_privacy_action - check if frame is a group addressed</div><div class='del'>- * privacy action frame</div><div class='add'>+ *	privacy action frame</div><div class='ctx'>  * @skb: the skb containing the frame, length will be checked</div><div class='add'>+ * Return: whether or not the frame is a group addressed privacy action frame</div><div class='ctx'>  */</div><div class='ctx'> static inline bool ieee80211_is_group_privacy_action(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -4537,20 +2519,15 @@ static inline bool ieee80211_is_group_privacy_action(struct sk_buff *skb)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_tu_to_usec - convert time units (TU) to microseconds</div><div class='ctx'>  * @tu: the TUs</div><div class='add'>+ * Return: the time value converted to microseconds</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned long ieee80211_tu_to_usec(unsigned long tu)</div><div class='ctx'> {</div><div class='ctx'> 	return 1024 * tu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * ieee80211_check_tim - check if AID bit is set in TIM</div><div class='del'>- * @tim: the TIM IE</div><div class='del'>- * @tim_len: length of the TIM IE</div><div class='del'>- * @aid: the AID to look for</div><div class='del'>- */</div><div class='del'>-static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,</div><div class='del'>-				       u8 tim_len, u16 aid)</div><div class='add'>+static inline bool __ieee80211_check_tim(const struct ieee80211_tim_ie *tim,</div><div class='add'>+					 u8 tim_len, u16 aid)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mask;</div><div class='ctx'> 	u8 index, indexn1, indexn2;</div><div class='hunk'>@@ -4574,8 +2551,10 @@ static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ieee80211_get_tdls_action - get tdls packet action (or -1, if not tdls packet)</div><div class='add'>+ * ieee80211_get_tdls_action - get TDLS action code</div><div class='ctx'>  * @skb: the skb containing the frame, length will not be checked</div><div class='add'>+ * Return: the TDLS action code, or -1 if it's not an encapsulated TDLS action</div><div class='add'>+ *	frame</div><div class='ctx'>  *</div><div class='ctx'>  * This function assumes the frame is a data frame, and that the network header</div><div class='ctx'>  * is in the correct place.</div><div class='hunk'>@@ -4615,6 +2594,7 @@ static inline int ieee80211_get_tdls_action(struct sk_buff *skb)</div><div class='ctx'> /**</div><div class='ctx'>  * ieee80211_action_contains_tpc - checks if the frame contains TPC element</div><div class='ctx'>  * @skb: the skb containing the frame, length will be checked</div><div class='add'>+ * Return: %true if the frame contains a TPC element, %false otherwise</div><div class='ctx'>  *</div><div class='ctx'>  * This function checks if it's either TPC report action frame or Link</div><div class='ctx'>  * Measurement report action frame as defined in IEEE Std. 802.11-2012 8.5.2.5</div><div class='hunk'>@@ -4659,6 +2639,11 @@ static inline bool ieee80211_action_contains_tpc(struct sk_buff *skb)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ieee80211_is_timing_measurement - check if frame is timing measurement response</div><div class='add'>+ * @skb: the SKB to check</div><div class='add'>+ * Return: whether or not the frame is a valid timing measurement response</div><div class='add'>+ */</div><div class='ctx'> static inline bool ieee80211_is_timing_measurement(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='hunk'>@@ -4678,6 +2663,11 @@ static inline bool ieee80211_is_timing_measurement(struct sk_buff *skb)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ieee80211_is_ftm - check if frame is FTM response</div><div class='add'>+ * @skb: the SKB to check</div><div class='add'>+ * Return: whether or not the frame is a valid FTM response action frame</div><div class='add'>+ */</div><div class='ctx'> static inline bool ieee80211_is_ftm(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee80211_mgmt *mgmt = (void *)skb-&gt;data;</div><div class='hunk'>@@ -4732,6 +2722,7 @@ struct element {</div><div class='ctx'>  * @element: element pointer after for_each_element() or friends</div><div class='ctx'>  * @data: same data pointer as passed to for_each_element() or friends</div><div class='ctx'>  * @datalen: same data length as passed to for_each_element() or friends</div><div class='add'>+ * Return: %true if all elements were iterated, %false otherwise; see notes</div><div class='ctx'>  *</div><div class='ctx'>  * This function returns %true if all the data was parsed or considered</div><div class='ctx'>  * while walking the elements. Only use this if your for_each_element()</div><div class='hunk'>@@ -4825,596 +2816,28 @@ struct ieee80211_tbtt_info_ge_11 {</div><div class='ctx'> 	struct ieee80211_rnr_mld_params mld_params;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* multi-link device */</div><div class='del'>-#define IEEE80211_MLD_MAX_NUM_LINKS	15</div><div class='del'>-</div><div class='del'>-#define IEEE80211_ML_CONTROL_TYPE			0x0007</div><div class='del'>-#define IEEE80211_ML_CONTROL_TYPE_BASIC			0</div><div class='del'>-#define IEEE80211_ML_CONTROL_TYPE_PREQ			1</div><div class='del'>-#define IEEE80211_ML_CONTROL_TYPE_RECONF		2</div><div class='del'>-#define IEEE80211_ML_CONTROL_TYPE_TDLS			3</div><div class='del'>-#define IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS		4</div><div class='del'>-#define IEEE80211_ML_CONTROL_PRESENCE_MASK		0xfff0</div><div class='del'>-</div><div class='del'>-struct ieee80211_multi_link_elem {</div><div class='del'>-	__le16 control;</div><div class='del'>-	u8 variable[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MLC_BASIC_PRES_LINK_ID		0x0010</div><div class='del'>-#define IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT	0x0020</div><div class='del'>-#define IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY		0x0040</div><div class='del'>-#define IEEE80211_MLC_BASIC_PRES_EML_CAPA		0x0080</div><div class='del'>-#define IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP		0x0100</div><div class='del'>-#define IEEE80211_MLC_BASIC_PRES_MLD_ID			0x0200</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MED_SYNC_DELAY_DURATION		0x00ff</div><div class='del'>-#define IEEE80211_MED_SYNC_DELAY_SYNC_OFDM_ED_THRESH	0x0f00</div><div class='del'>-#define IEEE80211_MED_SYNC_DELAY_SYNC_MAX_NUM_TXOPS	0xf000</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Described in P802.11be_D3.0</div><div class='del'>- * dot11MSDTimerDuration should default to 5484 (i.e. 171.375)</div><div class='del'>- * dot11MSDOFDMEDthreshold defaults to -72 (i.e. 0)</div><div class='del'>- * dot11MSDTXOPMAX defaults to 1</div><div class='del'>- */</div><div class='del'>-#define IEEE80211_MED_SYNC_DELAY_DEFAULT		0x10ac</div><div class='del'>-</div><div class='del'>-#define IEEE80211_EML_CAP_EMLSR_SUPP			0x0001</div><div class='del'>-#define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY		0x000e</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_0US		0</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_32US		1</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_64US		2</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_128US		3</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_256US		4</div><div class='del'>-#define IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY	0x0070</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_0US		0</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_16US		1</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_32US		2</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_64US		3</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_128US		4</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_256US		5</div><div class='del'>-#define IEEE80211_EML_CAP_EMLMR_SUPPORT			0x0080</div><div class='del'>-#define IEEE80211_EML_CAP_EMLMR_DELAY			0x0700</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLMR_DELAY_0US			0</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLMR_DELAY_32US			1</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLMR_DELAY_64US			2</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLMR_DELAY_128US			3</div><div class='del'>-#define  IEEE80211_EML_CAP_EMLMR_DELAY_256US			4</div><div class='del'>-#define IEEE80211_EML_CAP_TRANSITION_TIMEOUT		0x7800</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_0			0</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128US		1</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_256US		2</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_512US		3</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_1TU		4</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_2TU		5</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_4TU		6</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_8TU		7</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_16TU		8</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_32TU		9</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_64TU		10</div><div class='del'>-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU		11</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_MAX_SIMUL_LINKS		0x000f</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_SRS_SUPPORT		0x0010</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP	0x0060</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_NO_SUPP	0</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_SAME	1</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_RESERVED	2</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_DIFF	3</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_FREQ_SEP_TYPE_IND		0x0f80</div><div class='del'>-#define IEEE80211_MLD_CAP_OP_AAR_SUPPORT		0x1000</div><div class='del'>-</div><div class='del'>-struct ieee80211_mle_basic_common_info {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 mld_mac_addr[ETH_ALEN];</div><div class='del'>-	u8 variable[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MLC_PREQ_PRES_MLD_ID			0x0010</div><div class='del'>-</div><div class='del'>-struct ieee80211_mle_preq_common_info {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 variable[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR		0x0010</div><div class='del'>-</div><div class='del'>-/* no fixed fields in RECONF */</div><div class='del'>-</div><div class='del'>-struct ieee80211_mle_tdls_common_info {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 ap_mld_mac_addr[ETH_ALEN];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MLC_PRIO_ACCESS_PRES_AP_MLD_MAC_ADDR	0x0010</div><div class='del'>-</div><div class='del'>-/* no fixed fields in PRIO_ACCESS */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_common_size - check multi-link element common size</div><div class='del'>- * @data: multi-link element, must already be checked for size using</div><div class='del'>- *	ieee80211_mle_size_ok()</div><div class='del'>- */</div><div class='del'>-static inline u8 ieee80211_mle_common_size(const u8 *data)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-	u8 common = 0;</div><div class='del'>-</div><div class='del'>-	switch (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE)) {</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_BASIC:</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_PREQ:</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_TDLS:</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_RECONF:</div><div class='del'>-		/*</div><div class='del'>-		 * The length is the first octet pointed by mle-&gt;variable so no</div><div class='del'>-		 * need to add anything</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS:</div><div class='del'>-		if (control &amp; IEEE80211_MLC_PRIO_ACCESS_PRES_AP_MLD_MAC_ADDR)</div><div class='del'>-			common += ETH_ALEN;</div><div class='del'>-		return common;</div><div class='del'>-	default:</div><div class='del'>-		WARN_ON(1);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sizeof(*mle) + common + mle-&gt;variable[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_get_link_id - returns the link ID</div><div class='del'>- * @data: the basic multi link element</div><div class='del'>- *</div><div class='del'>- * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='del'>- * this must be checked using ieee80211_mle_type_ok().</div><div class='del'>- *</div><div class='del'>- * If the BSS link ID can't be found, -1 will be returned</div><div class='del'>- */</div><div class='del'>-static inline int ieee80211_mle_get_link_id(const u8 *data)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-	const u8 *common = mle-&gt;variable;</div><div class='del'>-</div><div class='del'>-	/* common points now at the beginning of ieee80211_mle_basic_common_info */</div><div class='del'>-	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='del'>-</div><div class='del'>-	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return *common;</div><div class='del'>-}</div><div class='add'>+#include "ieee80211-ht.h"</div><div class='add'>+#include "ieee80211-vht.h"</div><div class='add'>+#include "ieee80211-he.h"</div><div class='add'>+#include "ieee80211-eht.h"</div><div class='add'>+#include "ieee80211-mesh.h"</div><div class='add'>+#include "ieee80211-s1g.h"</div><div class='add'>+#include "ieee80211-p2p.h"</div><div class='add'>+#include "ieee80211-nan.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ieee80211_mle_get_bss_param_ch_cnt - returns the BSS parameter change count</div><div class='del'>- * @data: pointer to the basic multi link element</div><div class='del'>- *</div><div class='del'>- * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='del'>- * this must be checked using ieee80211_mle_type_ok().</div><div class='del'>- *</div><div class='del'>- * If the BSS parameter change count value can't be found (the presence bit</div><div class='del'>- * for it is clear), -1 will be returned.</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-ieee80211_mle_get_bss_param_ch_cnt(const u8 *data)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-	const u8 *common = mle-&gt;variable;</div><div class='del'>-</div><div class='del'>-	/* common points now at the beginning of ieee80211_mle_basic_common_info */</div><div class='del'>-	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='del'>-</div><div class='del'>-	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='del'>-		common += 1;</div><div class='del'>-</div><div class='del'>-	return *common;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_get_eml_med_sync_delay - returns the medium sync delay</div><div class='del'>- * @data: pointer to the multi link EHT IE</div><div class='del'>- *</div><div class='del'>- * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='del'>- * this must be checked using ieee80211_mle_type_ok().</div><div class='del'>- *</div><div class='del'>- * If the medium synchronization is not present, then the default value is</div><div class='del'>- * returned.</div><div class='del'>- */</div><div class='del'>-static inline u16 ieee80211_mle_get_eml_med_sync_delay(const u8 *data)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-	const u8 *common = mle-&gt;variable;</div><div class='del'>-</div><div class='del'>-	/* common points now at the beginning of ieee80211_mle_basic_common_info */</div><div class='del'>-	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='del'>-</div><div class='del'>-	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY))</div><div class='del'>-		return IEEE80211_MED_SYNC_DELAY_DEFAULT;</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='del'>-		common += 1;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='del'>-		common += 1;</div><div class='del'>-</div><div class='del'>-	return get_unaligned_le16(common);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_get_eml_cap - returns the EML capability</div><div class='del'>- * @data: pointer to the multi link EHT IE</div><div class='del'>- *</div><div class='del'>- * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='del'>- * this must be checked using ieee80211_mle_type_ok().</div><div class='del'>- *</div><div class='del'>- * If the EML capability is not present, 0 will be returned.</div><div class='del'>- */</div><div class='del'>-static inline u16 ieee80211_mle_get_eml_cap(const u8 *data)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-	const u8 *common = mle-&gt;variable;</div><div class='del'>-</div><div class='del'>-	/* common points now at the beginning of ieee80211_mle_basic_common_info */</div><div class='del'>-	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='del'>-</div><div class='del'>-	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='del'>-		common += 1;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='del'>-		common += 1;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='del'>-		common += 2;</div><div class='del'>-</div><div class='del'>-	return get_unaligned_le16(common);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_get_mld_capa_op - returns the MLD capabilities and operations.</div><div class='del'>- * @data: pointer to the multi link EHT IE</div><div class='del'>- *</div><div class='del'>- * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='del'>- * this must be checked using ieee80211_mle_type_ok().</div><div class='del'>- *</div><div class='del'>- * If the MLD capabilities and operations field is not present, 0 will be</div><div class='del'>- * returned.</div><div class='del'>- */</div><div class='del'>-static inline u16 ieee80211_mle_get_mld_capa_op(const u8 *data)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-	const u8 *common = mle-&gt;variable;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * common points now at the beginning of</div><div class='del'>-	 * ieee80211_mle_basic_common_info</div><div class='del'>-	 */</div><div class='del'>-	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='del'>-</div><div class='del'>-	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='del'>-		common += 1;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='del'>-		common += 1;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='del'>-		common += 2;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA)</div><div class='del'>-		common += 2;</div><div class='del'>-</div><div class='del'>-	return get_unaligned_le16(common);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_get_mld_id - returns the MLD ID</div><div class='del'>- * @data: pointer to the multi link element</div><div class='del'>- *</div><div class='del'>- * The element is assumed to be of the correct type (BASIC) and big enough,</div><div class='del'>- * this must be checked using ieee80211_mle_type_ok().</div><div class='del'>- *</div><div class='del'>- * If the MLD ID is not present, 0 will be returned.</div><div class='del'>- */</div><div class='del'>-static inline u8 ieee80211_mle_get_mld_id(const u8 *data)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u16 control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-	const u8 *common = mle-&gt;variable;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * common points now at the beginning of</div><div class='del'>-	 * ieee80211_mle_basic_common_info</div><div class='del'>-	 */</div><div class='del'>-	common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='del'>-</div><div class='del'>-	if (!(control &amp; IEEE80211_MLC_BASIC_PRES_MLD_ID))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='del'>-		common += 1;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='del'>-		common += 1;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='del'>-		common += 2;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA)</div><div class='del'>-		common += 2;</div><div class='del'>-	if (control &amp; IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP)</div><div class='del'>-		common += 2;</div><div class='del'>-</div><div class='del'>-	return *common;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_size_ok - validate multi-link element size</div><div class='del'>- * @data: pointer to the element data</div><div class='del'>- * @len: length of the containing element</div><div class='del'>- */</div><div class='del'>-static inline bool ieee80211_mle_size_ok(const u8 *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u8 fixed = sizeof(*mle);</div><div class='del'>-	u8 common = 0;</div><div class='del'>-	bool check_common_len = false;</div><div class='del'>-	u16 control;</div><div class='del'>-</div><div class='del'>-	if (len &lt; fixed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-</div><div class='del'>-	switch (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE)) {</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_BASIC:</div><div class='del'>-		common += sizeof(struct ieee80211_mle_basic_common_info);</div><div class='del'>-		check_common_len = true;</div><div class='del'>-		if (control &amp; IEEE80211_MLC_BASIC_PRES_LINK_ID)</div><div class='del'>-			common += 1;</div><div class='del'>-		if (control &amp; IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)</div><div class='del'>-			common += 1;</div><div class='del'>-		if (control &amp; IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)</div><div class='del'>-			common += 2;</div><div class='del'>-		if (control &amp; IEEE80211_MLC_BASIC_PRES_EML_CAPA)</div><div class='del'>-			common += 2;</div><div class='del'>-		if (control &amp; IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP)</div><div class='del'>-			common += 2;</div><div class='del'>-		if (control &amp; IEEE80211_MLC_BASIC_PRES_MLD_ID)</div><div class='del'>-			common += 1;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_PREQ:</div><div class='del'>-		common += sizeof(struct ieee80211_mle_preq_common_info);</div><div class='del'>-		if (control &amp; IEEE80211_MLC_PREQ_PRES_MLD_ID)</div><div class='del'>-			common += 1;</div><div class='del'>-		check_common_len = true;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_RECONF:</div><div class='del'>-		if (control &amp; IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR)</div><div class='del'>-			common += ETH_ALEN;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_TDLS:</div><div class='del'>-		common += sizeof(struct ieee80211_mle_tdls_common_info);</div><div class='del'>-		check_common_len = true;</div><div class='del'>-		break;</div><div class='del'>-	case IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS:</div><div class='del'>-		if (control &amp; IEEE80211_MLC_PRIO_ACCESS_PRES_AP_MLD_MAC_ADDR)</div><div class='del'>-			common += ETH_ALEN;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* we don't know this type */</div><div class='del'>-		return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len &lt; fixed + common)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (!check_common_len)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	/* if present, common length is the first octet there */</div><div class='del'>-	return mle-&gt;variable[0] &gt;= common;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_type_ok - validate multi-link element type and size</div><div class='del'>- * @data: pointer to the element data</div><div class='del'>- * @type: expected type of the element</div><div class='del'>- * @len: length of the containing element</div><div class='del'>- */</div><div class='del'>-static inline bool ieee80211_mle_type_ok(const u8 *data, u8 type, size_t len)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_multi_link_elem *mle = (const void *)data;</div><div class='del'>-	u16 control;</div><div class='del'>-</div><div class='del'>-	if (!ieee80211_mle_size_ok(data, len))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	control = le16_to_cpu(mle-&gt;control);</div><div class='del'>-</div><div class='del'>-	if (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE) == type)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum ieee80211_mle_subelems {</div><div class='del'>-	IEEE80211_MLE_SUBELEM_PER_STA_PROFILE		= 0,</div><div class='del'>-	IEEE80211_MLE_SUBELEM_FRAGMENT		        = 254,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_LINK_ID			0x000f</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE		0x0010</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT		0x0020</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT		0x0040</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT		0x0080</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT		0x0100</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_NSTR_LINK_PAIR_PRESENT	0x0200</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE		0x0400</div><div class='del'>-#define IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT	0x0800</div><div class='del'>-</div><div class='del'>-struct ieee80211_mle_per_sta_profile {</div><div class='del'>-	__le16 control;</div><div class='del'>-	u8 sta_info_len;</div><div class='del'>-	u8 variable[];</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_basic_sta_prof_size_ok - validate basic multi-link element sta</div><div class='del'>- *	profile size</div><div class='del'>- * @data: pointer to the sub element data</div><div class='del'>- * @len: length of the containing sub element</div><div class='del'>- */</div><div class='del'>-static inline bool ieee80211_mle_basic_sta_prof_size_ok(const u8 *data,</div><div class='del'>-							size_t len)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_mle_per_sta_profile *prof = (const void *)data;</div><div class='del'>-	u16 control;</div><div class='del'>-	u8 fixed = sizeof(*prof);</div><div class='del'>-	u8 info_len = 1;</div><div class='del'>-</div><div class='del'>-	if (len &lt; fixed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	control = le16_to_cpu(prof-&gt;control);</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT)</div><div class='del'>-		info_len += 6;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT)</div><div class='del'>-		info_len += 2;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT)</div><div class='del'>-		info_len += 8;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT)</div><div class='del'>-		info_len += 2;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE &amp;&amp;</div><div class='del'>-	    control &amp; IEEE80211_MLE_STA_CONTROL_NSTR_LINK_PAIR_PRESENT) {</div><div class='del'>-		if (control &amp; IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE)</div><div class='del'>-			info_len += 2;</div><div class='del'>-		else</div><div class='del'>-			info_len += 1;</div><div class='del'>-	}</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT)</div><div class='del'>-		info_len += 1;</div><div class='del'>-</div><div class='del'>-	return prof-&gt;sta_info_len &gt;= info_len &amp;&amp;</div><div class='del'>-	       fixed + prof-&gt;sta_info_len &lt;= len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_basic_sta_prof_bss_param_ch_cnt - get per-STA profile BSS</div><div class='del'>- *	parameter change count</div><div class='del'>- * @prof: the per-STA profile, having been checked with</div><div class='del'>- *	ieee80211_mle_basic_sta_prof_size_ok() for the correct length</div><div class='del'>- *</div><div class='del'>- * Return: The BSS parameter change count value if present, 0 otherwise.</div><div class='del'>- */</div><div class='del'>-static inline u8</div><div class='del'>-ieee80211_mle_basic_sta_prof_bss_param_ch_cnt(const struct ieee80211_mle_per_sta_profile *prof)</div><div class='del'>-{</div><div class='del'>-	u16 control = le16_to_cpu(prof-&gt;control);</div><div class='del'>-	const u8 *pos = prof-&gt;variable;</div><div class='del'>-</div><div class='del'>-	if (!(control &amp; IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT)</div><div class='del'>-		pos += 6;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT)</div><div class='del'>-		pos += 2;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT)</div><div class='del'>-		pos += 8;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT)</div><div class='del'>-		pos += 2;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE &amp;&amp;</div><div class='del'>-	    control &amp; IEEE80211_MLE_STA_CONTROL_NSTR_LINK_PAIR_PRESENT) {</div><div class='del'>-		if (control &amp; IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE)</div><div class='del'>-			pos += 2;</div><div class='del'>-		else</div><div class='del'>-			pos += 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return *pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IEEE80211_MLE_STA_RECONF_CONTROL_LINK_ID			0x000f</div><div class='del'>-#define IEEE80211_MLE_STA_RECONF_CONTROL_COMPLETE_PROFILE		0x0010</div><div class='del'>-#define IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT		0x0020</div><div class='del'>-#define IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT		0x0040</div><div class='del'>-#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_UPDATE_TYPE		0x0780</div><div class='del'>-#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT	0x0800</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ieee80211_mle_reconf_sta_prof_size_ok - validate reconfiguration multi-link</div><div class='del'>- *	element sta profile size.</div><div class='del'>- * @data: pointer to the sub element data</div><div class='del'>- * @len: length of the containing sub element</div><div class='add'>+ * ieee80211_check_tim - check if AID bit is set in TIM</div><div class='add'>+ * @tim: the TIM IE</div><div class='add'>+ * @tim_len: length of the TIM IE</div><div class='add'>+ * @aid: the AID to look for</div><div class='add'>+ * @s1g: whether the TIM is from an S1G PPDU</div><div class='add'>+ * Return: whether or not traffic is indicated in the TIM for the given AID</div><div class='ctx'>  */</div><div class='del'>-static inline bool ieee80211_mle_reconf_sta_prof_size_ok(const u8 *data,</div><div class='del'>-							 size_t len)</div><div class='add'>+static inline bool ieee80211_check_tim(const struct ieee80211_tim_ie *tim,</div><div class='add'>+				       u8 tim_len, u16 aid, bool s1g)</div><div class='ctx'> {</div><div class='del'>-	const struct ieee80211_mle_per_sta_profile *prof = (const void *)data;</div><div class='del'>-	u16 control;</div><div class='del'>-	u8 fixed = sizeof(*prof);</div><div class='del'>-	u8 info_len = 1;</div><div class='del'>-</div><div class='del'>-	if (len &lt; fixed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	control = le16_to_cpu(prof-&gt;control);</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT)</div><div class='del'>-		info_len += ETH_ALEN;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT)</div><div class='del'>-		info_len += 2;</div><div class='del'>-	if (control &amp; IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT)</div><div class='del'>-		info_len += 2;</div><div class='del'>-</div><div class='del'>-	return prof-&gt;sta_info_len &gt;= info_len &amp;&amp;</div><div class='del'>-	       fixed + prof-&gt;sta_info_len - 1 &lt;= len;</div><div class='add'>+	return s1g ? ieee80211_s1g_check_tim(tim, tim_len, aid) :</div><div class='add'>+		     __ieee80211_check_tim(tim, tim_len, aid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool ieee80211_tid_to_link_map_size_ok(const u8 *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	const struct ieee80211_ttlm_elem *t2l = (const void *)data;</div><div class='del'>-	u8 control, fixed = sizeof(*t2l), elem_len = 0;</div><div class='del'>-</div><div class='del'>-	if (len &lt; fixed)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	control = t2l-&gt;control;</div><div class='del'>-</div><div class='del'>-	if (control &amp; IEEE80211_TTLM_CONTROL_SWITCH_TIME_PRESENT)</div><div class='del'>-		elem_len += 2;</div><div class='del'>-	if (control &amp; IEEE80211_TTLM_CONTROL_EXPECTED_DUR_PRESENT)</div><div class='del'>-		elem_len += 3;</div><div class='del'>-</div><div class='del'>-	if (!(control &amp; IEEE80211_TTLM_CONTROL_DEF_LINK_MAP)) {</div><div class='del'>-		u8 bm_size;</div><div class='del'>-</div><div class='del'>-		elem_len += 1;</div><div class='del'>-		if (len &lt; fixed + elem_len)</div><div class='del'>-			return false;</div><div class='del'>-</div><div class='del'>-		if (control &amp; IEEE80211_TTLM_CONTROL_LINK_MAP_SIZE)</div><div class='del'>-			bm_size = 1;</div><div class='del'>-		else</div><div class='del'>-			bm_size = 2;</div><div class='del'>-</div><div class='del'>-		elem_len += hweight8(t2l-&gt;optional[0]) * bm_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len &gt;= fixed + elem_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define for_each_mle_subelement(_elem, _data, _len)			\</div><div class='del'>-	if (ieee80211_mle_size_ok(_data, _len))				\</div><div class='del'>-		for_each_element(_elem,					\</div><div class='del'>-				 _data + ieee80211_mle_common_size(_data),\</div><div class='del'>-				 _len - ieee80211_mle_common_size(_data))</div><div class='del'>-</div><div class='ctx'> #endif /* LINUX_IEEE80211_H */</div><div class='head'>diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h<br/>index 3ff96ae31bf6..c5fe3b2a53e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_bridge.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_bridge.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_bridge.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_bridge.h</a></div><div class='hunk'>@@ -65,11 +65,9 @@ struct br_ip_list {</div><div class='ctx'> #define BR_DEFAULT_AGEING_TIME	(300 * HZ)</div><div class='ctx'> </div><div class='ctx'> struct net_bridge;</div><div class='del'>-void brioctl_set(int (*hook)(struct net *net, struct net_bridge *br,</div><div class='del'>-			     unsigned int cmd, struct ifreq *ifr,</div><div class='add'>+void brioctl_set(int (*hook)(struct net *net, unsigned int cmd,</div><div class='ctx'> 			     void __user *uarg));</div><div class='del'>-int br_ioctl_call(struct net *net, struct net_bridge *br, unsigned int cmd,</div><div class='del'>-		  struct ifreq *ifr, void __user *uarg);</div><div class='add'>+int br_ioctl_call(struct net *net, unsigned int cmd, void __user *uarg);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_BRIDGE) &amp;&amp; IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)</div><div class='ctx'> int br_multicast_list_adjacent(struct net_device *dev,</div><div class='head'>diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h<br/>index 8a9792a6427a..61b7335aa037 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_ether.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_ether.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_ether.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_ether.h</a></div><div class='hunk'>@@ -19,6 +19,9 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/if_ether.h&gt;</div><div class='ctx'> </div><div class='add'>+/* XX:XX:XX:XX:XX:XX */</div><div class='add'>+#define MAC_ADDR_STR_LEN (3 * ETH_ALEN - 1)</div><div class='add'>+</div><div class='ctx'> static inline struct ethhdr *eth_hdr(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return (struct ethhdr *)skb_mac_header(skb);</div><div class='head'>diff --git a/include/linux/if_hsr.h b/include/linux/if_hsr.h<br/>index 0404f5bf4f30..f4cf2dd36d19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_hsr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_hsr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_hsr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_hsr.h</a></div><div class='hunk'>@@ -13,6 +13,15 @@ enum hsr_version {</div><div class='ctx'> 	PRP_V1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum hsr_port_type {</div><div class='add'>+	HSR_PT_NONE = 0,	/* Must be 0, used by framereg */</div><div class='add'>+	HSR_PT_SLAVE_A,</div><div class='add'>+	HSR_PT_SLAVE_B,</div><div class='add'>+	HSR_PT_INTERLINK,</div><div class='add'>+	HSR_PT_MASTER,</div><div class='add'>+	HSR_PT_PORTS,	/* This must be the last item in the enum */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* HSR Tag.</div><div class='ctx'>  * As defined in IEC-62439-3:2010, the HSR tag is really { ethertype = 0x88FB,</div><div class='ctx'>  * path, LSDU_size, sequence Nr }. But we let eth_header() create { h_dest,</div><div class='hunk'>@@ -32,6 +41,10 @@ struct hsr_tag {</div><div class='ctx'> #if IS_ENABLED(CONFIG_HSR)</div><div class='ctx'> extern bool is_hsr_master(struct net_device *dev);</div><div class='ctx'> extern int hsr_get_version(struct net_device *dev, enum hsr_version *ver);</div><div class='add'>+struct net_device *hsr_get_port_ndev(struct net_device *ndev,</div><div class='add'>+				     enum hsr_port_type pt);</div><div class='add'>+int hsr_get_port_type(struct net_device *hsr_dev, struct net_device *dev,</div><div class='add'>+		      enum hsr_port_type *type);</div><div class='ctx'> #else</div><div class='ctx'> static inline bool is_hsr_master(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -42,6 +55,19 @@ static inline int hsr_get_version(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline struct net_device *hsr_get_port_ndev(struct net_device *ndev,</div><div class='add'>+						   enum hsr_port_type pt)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int hsr_get_port_type(struct net_device *hsr_dev,</div><div class='add'>+				    struct net_device *dev,</div><div class='add'>+				    enum hsr_port_type *type)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_HSR */</div><div class='ctx'> </div><div class='ctx'> #endif /*_LINUX_IF_HSR_H_*/</div><div class='head'>diff --git a/include/linux/if_ltalk.h b/include/linux/if_ltalk.h<br/>deleted file mode 100644<br/>index 4cc1c0b77870..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_ltalk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_ltalk.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __LINUX_LTALK_H</div><div class='del'>-#define __LINUX_LTALK_H</div><div class='del'>-</div><div class='del'>-#include &lt;uapi/linux/if_ltalk.h&gt;</div><div class='del'>-</div><div class='del'>-extern struct net_device *alloc_ltalkdev(int sizeof_priv);</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h<br/>index 523025106a64..0f7281e3e448 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_macvlan.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_macvlan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_macvlan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_macvlan.h</a></div><div class='hunk'>@@ -59,8 +59,10 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan,</div><div class='ctx'> </div><div class='ctx'> extern void macvlan_common_setup(struct net_device *dev);</div><div class='ctx'> </div><div class='del'>-extern int macvlan_common_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-				  struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+struct rtnl_newlink_params;</div><div class='add'>+</div><div class='add'>+extern int macvlan_common_newlink(struct net_device *dev,</div><div class='add'>+				  struct rtnl_newlink_params *params,</div><div class='ctx'> 				  struct netlink_ext_ack *extack);</div><div class='ctx'> </div><div class='ctx'> extern void macvlan_dellink(struct net_device *dev, struct list_head *head);</div><div class='head'>diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h<br/>index ff3beda1312c..db45d6f1c4f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_pppox.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_pppox.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_pppox.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_pppox.h</a></div><div class='hunk'>@@ -43,7 +43,7 @@ struct pppox_sock {</div><div class='ctx'> 	/* struct sock must be the first member of pppox_sock */</div><div class='ctx'> 	struct sock sk;</div><div class='ctx'> 	struct ppp_channel chan;</div><div class='del'>-	struct pppox_sock	*next;	  /* for hash table */</div><div class='add'>+	struct pppox_sock __rcu	*next;	  /* for hash table */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct pppoe_opt pppoe;</div><div class='ctx'> 		struct pptp_opt  pptp;</div><div class='head'>diff --git a/include/linux/if_rmnet.h b/include/linux/if_rmnet.h<br/>index 839d1e48b85e..c44bf6e80ecb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_rmnet.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_rmnet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_rmnet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_rmnet.h</a></div><div class='hunk'>@@ -42,7 +42,7 @@ struct rmnet_map_ul_csum_header {</div><div class='ctx'> </div><div class='ctx'> /* csum_info field:</div><div class='ctx'>  *  OFFSET:	where (offset in bytes) to insert computed checksum</div><div class='del'>- *  UDP:	1 = UDP checksum (zero checkum means no checksum)</div><div class='add'>+ *  UDP:	1 = UDP checksum (zero checksum means no checksum)</div><div class='ctx'>  *  ENABLED:	1 = checksum computation requested</div><div class='ctx'>  */</div><div class='ctx'> #define MAP_CSUM_UL_OFFSET_MASK		GENMASK(13, 0)</div><div class='head'>diff --git a/include/linux/if_team.h b/include/linux/if_team.h<br/>index cdc684e04a2f..ce97d891cf72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_team.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_team.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_team.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_team.h</a></div><div class='hunk'>@@ -191,8 +191,6 @@ struct team {</div><div class='ctx'> </div><div class='ctx'> 	const struct header_ops *header_ops_cache;</div><div class='ctx'> </div><div class='del'>-	struct mutex lock; /* used for overall locking, e.g. port lists write */</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * List of enabled ports and their count</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -223,7 +221,6 @@ struct team {</div><div class='ctx'> 		atomic_t count_pending;</div><div class='ctx'> 		struct delayed_work dw;</div><div class='ctx'> 	} mcast_rejoin;</div><div class='del'>-	struct lock_class_key team_lock_key;</div><div class='ctx'> 	long mode_priv[TEAM_MODE_PRIV_LONGS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h<br/>index 043d442994b0..80166eb62f41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_tun.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_tun.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_tun.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_tun.h</a></div><div class='hunk'>@@ -19,11 +19,6 @@ struct tun_msg_ctl {</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct tun_xdp_hdr {</div><div class='del'>-	int buflen;</div><div class='del'>-	struct virtio_net_hdr gso;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_TUN) || defined(CONFIG_TUN_MODULE)</div><div class='ctx'> struct socket *tun_get_socket(struct file *);</div><div class='ctx'> struct ptr_ring *tun_get_tx_ring(struct file *file);</div><div class='head'>diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h<br/>index c1645c86eed9..f7f34eb15e06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/if_vlan.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/if_vlan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/if_vlan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/if_vlan.h</a></div><div class='hunk'>@@ -79,11 +79,6 @@ static inline struct vlan_ethhdr *skb_vlan_eth_hdr(const struct sk_buff *skb)</div><div class='ctx'> /* found in socket.c */</div><div class='ctx'> extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));</div><div class='ctx'> </div><div class='del'>-static inline bool is_vlan_dev(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-        return dev-&gt;priv_flags &amp; IFF_802_1Q_VLAN;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define skb_vlan_tag_present(__skb)	(!!(__skb)-&gt;vlan_all)</div><div class='ctx'> #define skb_vlan_tag_get(__skb)		((__skb)-&gt;vlan_tci)</div><div class='ctx'> #define skb_vlan_tag_get_id(__skb)	((__skb)-&gt;vlan_tci &amp; VLAN_VID_MASK)</div><div class='hunk'>@@ -136,7 +131,7 @@ struct vlan_pcpu_stats {</div><div class='ctx'> 	u32			tx_dropped;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_VLAN_8021Q)</div><div class='ctx'> </div><div class='ctx'> extern struct net_device *__vlan_find_dev_deep_rcu(struct net_device *real_dev,</div><div class='ctx'> 					       __be16 vlan_proto, u16 vlan_id);</div><div class='hunk'>@@ -176,6 +171,7 @@ struct netpoll;</div><div class='ctx'>  *	@real_dev_addr: address of underlying netdevice</div><div class='ctx'>  *	@dent: proc dir entry</div><div class='ctx'>  *	@vlan_pcpu_stats: ptr to percpu rx stats</div><div class='add'>+ *	@netpoll: netpoll instance "propagated" down to @real_dev</div><div class='ctx'>  */</div><div class='ctx'> struct vlan_dev_priv {</div><div class='ctx'> 	unsigned int				nr_ingress_mappings;</div><div class='hunk'>@@ -199,6 +195,11 @@ struct vlan_dev_priv {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool is_vlan_dev(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;priv_flags &amp; IFF_802_1Q_VLAN;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct vlan_dev_priv *vlan_dev_priv(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return netdev_priv(dev);</div><div class='hunk'>@@ -236,6 +237,11 @@ extern void vlan_vids_del_by_dev(struct net_device *dev,</div><div class='ctx'> extern bool vlan_uses_dev(const struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='add'>+static inline bool is_vlan_dev(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct net_device *</div><div class='ctx'> __vlan_find_dev_deep_rcu(struct net_device *real_dev,</div><div class='ctx'> 		     __be16 vlan_proto, u16 vlan_id)</div><div class='hunk'>@@ -253,19 +259,19 @@ vlan_for_each(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	BUG();</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u16 vlan_dev_vlan_id(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	BUG();</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline __be16 vlan_dev_vlan_proto(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	BUG();</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -310,7 +316,7 @@ static inline bool vlan_uses_dev(const struct net_device *dev)</div><div class='ctx'>  * eth_type_vlan - check for valid vlan ether type.</div><div class='ctx'>  * @ethertype: ether type to check</div><div class='ctx'>  *</div><div class='del'>- * Returns true if the ether type is a vlan ether type.</div><div class='add'>+ * Returns: true if the ether type is a vlan ether type.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool eth_type_vlan(__be16 ethertype)</div><div class='ctx'> {</div><div class='hunk'>@@ -341,24 +347,25 @@ static inline bool vlan_hw_offload_capable(netdev_features_t features,</div><div class='ctx'>  * @mac_len: MAC header length including outer vlan headers</div><div class='ctx'>  *</div><div class='ctx'>  * Inserts the VLAN tag into @skb as part of the payload at offset mac_len</div><div class='del'>- * Returns error if skb_cow_head fails.</div><div class='del'>- *</div><div class='ctx'>  * Does not change skb-&gt;protocol so this function can be used during receive.</div><div class='add'>+ *</div><div class='add'>+ * Returns: error if skb_cow_head fails.</div><div class='ctx'>  */</div><div class='ctx'> static inline int __vlan_insert_inner_tag(struct sk_buff *skb,</div><div class='ctx'> 					  __be16 vlan_proto, u16 vlan_tci,</div><div class='ctx'> 					  unsigned int mac_len)</div><div class='ctx'> {</div><div class='add'>+	const u8 meta_len = mac_len &gt; ETH_TLEN ? skb_metadata_len(skb) : 0;</div><div class='ctx'> 	struct vlan_ethhdr *veth;</div><div class='ctx'> </div><div class='del'>-	if (skb_cow_head(skb, VLAN_HLEN) &lt; 0)</div><div class='add'>+	if (skb_cow_head(skb, meta_len + VLAN_HLEN) &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, VLAN_HLEN);</div><div class='ctx'> </div><div class='ctx'> 	/* Move the mac header sans proto to the beginning of the new header. */</div><div class='ctx'> 	if (likely(mac_len &gt; ETH_TLEN))</div><div class='del'>-		memmove(skb-&gt;data, skb-&gt;data + VLAN_HLEN, mac_len - ETH_TLEN);</div><div class='add'>+		skb_postpush_data_move(skb, VLAN_HLEN, mac_len - ETH_TLEN);</div><div class='ctx'> 	if (skb_mac_header_was_set(skb))</div><div class='ctx'> 		skb-&gt;mac_header -= VLAN_HLEN;</div><div class='ctx'> </div><div class='hunk'>@@ -390,9 +397,9 @@ static inline int __vlan_insert_inner_tag(struct sk_buff *skb,</div><div class='ctx'>  * @vlan_tci: VLAN TCI to insert</div><div class='ctx'>  *</div><div class='ctx'>  * Inserts the VLAN tag into @skb as part of the payload</div><div class='del'>- * Returns error if skb_cow_head fails.</div><div class='del'>- *</div><div class='ctx'>  * Does not change skb-&gt;protocol so this function can be used during receive.</div><div class='add'>+ *</div><div class='add'>+ * Returns: error if skb_cow_head fails.</div><div class='ctx'>  */</div><div class='ctx'> static inline int __vlan_insert_tag(struct sk_buff *skb,</div><div class='ctx'> 				    __be16 vlan_proto, u16 vlan_tci)</div><div class='hunk'>@@ -414,6 +421,8 @@ static inline int __vlan_insert_tag(struct sk_buff *skb,</div><div class='ctx'>  * doesn't have to worry about freeing the original skb.</div><div class='ctx'>  *</div><div class='ctx'>  * Does not change skb-&gt;protocol so this function can be used during receive.</div><div class='add'>+ *</div><div class='add'>+ * Return: modified @skb on success, NULL on error (@skb is freed).</div><div class='ctx'>  */</div><div class='ctx'> static inline struct sk_buff *vlan_insert_inner_tag(struct sk_buff *skb,</div><div class='ctx'> 						    __be16 vlan_proto,</div><div class='hunk'>@@ -443,6 +452,8 @@ static inline struct sk_buff *vlan_insert_inner_tag(struct sk_buff *skb,</div><div class='ctx'>  * doesn't have to worry about freeing the original skb.</div><div class='ctx'>  *</div><div class='ctx'>  * Does not change skb-&gt;protocol so this function can be used during receive.</div><div class='add'>+ *</div><div class='add'>+ * Return: modified @skb on success, NULL on error (@skb is freed).</div><div class='ctx'>  */</div><div class='ctx'> static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb,</div><div class='ctx'> 					      __be16 vlan_proto, u16 vlan_tci)</div><div class='hunk'>@@ -461,6 +472,8 @@ static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb,</div><div class='ctx'>  *</div><div class='ctx'>  * Following the skb_unshare() example, in case of error, the calling function</div><div class='ctx'>  * doesn't have to worry about freeing the original skb.</div><div class='add'>+ *</div><div class='add'>+ * Return: modified @skb on success, NULL on error (@skb is freed).</div><div class='ctx'>  */</div><div class='ctx'> static inline struct sk_buff *vlan_insert_tag_set_proto(struct sk_buff *skb,</div><div class='ctx'> 							__be16 vlan_proto,</div><div class='hunk'>@@ -533,7 +546,7 @@ static inline void __vlan_hwaccel_put_tag(struct sk_buff *skb,</div><div class='ctx'>  * @skb: skbuff to query</div><div class='ctx'>  * @vlan_tci: buffer to store value</div><div class='ctx'>  *</div><div class='del'>- * Returns error if the skb is not of VLAN type</div><div class='add'>+ * Returns: error if the skb is not of VLAN type</div><div class='ctx'>  */</div><div class='ctx'> static inline int __vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)</div><div class='ctx'> {</div><div class='hunk'>@@ -551,7 +564,7 @@ static inline int __vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)</div><div class='ctx'>  * @skb: skbuff to query</div><div class='ctx'>  * @vlan_tci: buffer to store value</div><div class='ctx'>  *</div><div class='del'>- * Returns error if @skb-&gt;vlan_tci is not set correctly</div><div class='add'>+ * Returns: error if @skb-&gt;vlan_tci is not set correctly</div><div class='ctx'>  */</div><div class='ctx'> static inline int __vlan_hwaccel_get_tag(const struct sk_buff *skb,</div><div class='ctx'> 					 u16 *vlan_tci)</div><div class='hunk'>@@ -570,7 +583,7 @@ static inline int __vlan_hwaccel_get_tag(const struct sk_buff *skb,</div><div class='ctx'>  * @skb: skbuff to query</div><div class='ctx'>  * @vlan_tci: buffer to store value</div><div class='ctx'>  *</div><div class='del'>- * Returns error if the skb is not VLAN tagged</div><div class='add'>+ * Returns: error if the skb is not VLAN tagged</div><div class='ctx'>  */</div><div class='ctx'> static inline int vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)</div><div class='ctx'> {</div><div class='hunk'>@@ -582,16 +595,19 @@ static inline int vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * vlan_get_protocol - get protocol EtherType.</div><div class='add'>+ * __vlan_get_protocol_offset() - get protocol EtherType.</div><div class='ctx'>  * @skb: skbuff to query</div><div class='ctx'>  * @type: first vlan protocol</div><div class='add'>+ * @mac_offset: MAC offset</div><div class='ctx'>  * @depth: buffer to store length of eth and vlan tags in bytes</div><div class='ctx'>  *</div><div class='del'>- * Returns the EtherType of the packet, regardless of whether it is</div><div class='add'>+ * Returns: the EtherType of the packet, regardless of whether it is</div><div class='ctx'>  * vlan encapsulated (normal or hardware accelerated) or not.</div><div class='ctx'>  */</div><div class='del'>-static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,</div><div class='del'>-					 int *depth)</div><div class='add'>+static inline __be16 __vlan_get_protocol_offset(const struct sk_buff *skb,</div><div class='add'>+						__be16 type,</div><div class='add'>+						int mac_offset,</div><div class='add'>+						int *depth)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int vlan_depth = skb-&gt;mac_len, parse_depth = VLAN_MAX_DEPTH;</div><div class='ctx'> </div><div class='hunk'>@@ -610,7 +626,8 @@ static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,</div><div class='ctx'> 		do {</div><div class='ctx'> 			struct vlan_hdr vhdr, *vh;</div><div class='ctx'> </div><div class='del'>-			vh = skb_header_pointer(skb, vlan_depth, sizeof(vhdr), &amp;vhdr);</div><div class='add'>+			vh = skb_header_pointer(skb, mac_offset + vlan_depth,</div><div class='add'>+						sizeof(vhdr), &amp;vhdr);</div><div class='ctx'> 			if (unlikely(!vh || !--parse_depth))</div><div class='ctx'> 				return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -625,11 +642,17 @@ static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,</div><div class='ctx'> 	return type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,</div><div class='add'>+					 int *depth)</div><div class='add'>+{</div><div class='add'>+	return __vlan_get_protocol_offset(skb, type, 0, depth);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * vlan_get_protocol - get protocol EtherType.</div><div class='ctx'>  * @skb: skbuff to query</div><div class='ctx'>  *</div><div class='del'>- * Returns the EtherType of the packet, regardless of whether it is</div><div class='add'>+ * Returns: the EtherType of the packet, regardless of whether it is</div><div class='ctx'>  * vlan encapsulated (normal or hardware accelerated) or not.</div><div class='ctx'>  */</div><div class='ctx'> static inline __be16 vlan_get_protocol(const struct sk_buff *skb)</div><div class='hunk'>@@ -709,25 +732,23 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,</div><div class='ctx'>  *</div><div class='ctx'>  * Expects the skb to contain a VLAN tag in the payload, and to have skb-&gt;data</div><div class='ctx'>  * pointing at the MAC header.</div><div class='del'>- *</div><div class='del'>- * Returns a new pointer to skb-&gt;data, or NULL on failure to pull.</div><div class='ctx'>  */</div><div class='del'>-static inline void *vlan_remove_tag(struct sk_buff *skb, u16 *vlan_tci)</div><div class='add'>+static inline void vlan_remove_tag(struct sk_buff *skb, u16 *vlan_tci)</div><div class='ctx'> {</div><div class='ctx'> 	struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb-&gt;data + ETH_HLEN);</div><div class='ctx'> </div><div class='ctx'> 	*vlan_tci = ntohs(vhdr-&gt;h_vlan_TCI);</div><div class='ctx'> </div><div class='del'>-	memmove(skb-&gt;data + VLAN_HLEN, skb-&gt;data, 2 * ETH_ALEN);</div><div class='ctx'> 	vlan_set_encap_proto(skb, vhdr);</div><div class='del'>-	return __skb_pull(skb, VLAN_HLEN);</div><div class='add'>+	__skb_pull(skb, VLAN_HLEN);</div><div class='add'>+	skb_postpull_data_move(skb, VLAN_HLEN, 2 * ETH_ALEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * skb_vlan_tagged - check if skb is vlan tagged.</div><div class='ctx'>  * @skb: skbuff to query</div><div class='ctx'>  *</div><div class='del'>- * Returns true if the skb is tagged, regardless of whether it is hardware</div><div class='add'>+ * Returns: true if the skb is tagged, regardless of whether it is hardware</div><div class='ctx'>  * accelerated or not.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool skb_vlan_tagged(const struct sk_buff *skb)</div><div class='hunk'>@@ -743,7 +764,7 @@ static inline bool skb_vlan_tagged(const struct sk_buff *skb)</div><div class='ctx'>  * skb_vlan_tagged_multi - check if skb is vlan tagged with multiple headers.</div><div class='ctx'>  * @skb: skbuff to query</div><div class='ctx'>  *</div><div class='del'>- * Returns true if the skb is tagged with multiple vlan headers, regardless</div><div class='add'>+ * Returns: true if the skb is tagged with multiple vlan headers, regardless</div><div class='ctx'>  * of whether it is hardware accelerated or not.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool skb_vlan_tagged_multi(struct sk_buff *skb)</div><div class='hunk'>@@ -774,7 +795,7 @@ static inline bool skb_vlan_tagged_multi(struct sk_buff *skb)</div><div class='ctx'>  * @skb: skbuff to query</div><div class='ctx'>  * @features: features to be checked</div><div class='ctx'>  *</div><div class='del'>- * Returns features without unsafe ones if the skb has multiple tags.</div><div class='add'>+ * Returns: features without unsafe ones if the skb has multiple tags.</div><div class='ctx'>  */</div><div class='ctx'> static inline netdev_features_t vlan_features_check(struct sk_buff *skb,</div><div class='ctx'> 						    netdev_features_t features)</div><div class='hunk'>@@ -798,9 +819,11 @@ static inline netdev_features_t vlan_features_check(struct sk_buff *skb,</div><div class='ctx'>  * @h1: Pointer to vlan header</div><div class='ctx'>  * @h2: Pointer to vlan header</div><div class='ctx'>  *</div><div class='del'>- * Compare two vlan headers, returns 0 if equal.</div><div class='add'>+ * Compare two vlan headers.</div><div class='ctx'>  *</div><div class='ctx'>  * Please note that alignment of h1 &amp; h2 are only guaranteed to be 16 bits.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if equal, arbitrary non-zero value if not equal.</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned long compare_vlan_header(const struct vlan_hdr *h1,</div><div class='ctx'> 						const struct vlan_hdr *h2)</div><div class='head'>diff --git a/include/linux/igmp.h b/include/linux/igmp.h<br/>index 5171231f70a8..073b30a9b850 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/igmp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/igmp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/igmp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/igmp.h</a></div><div class='hunk'>@@ -87,6 +87,8 @@ struct ip_mc_list {</div><div class='ctx'> 	char			loaded;</div><div class='ctx'> 	unsigned char		gsquery;	/* check source marks? */</div><div class='ctx'> 	unsigned char		crcount;</div><div class='add'>+	unsigned long		mca_cstamp;</div><div class='add'>+	unsigned long		mca_tstamp;</div><div class='ctx'> 	struct rcu_head		rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/iio/adc-helpers.h b/include/linux/iio/adc-helpers.h<br/>new file mode 100644<br/>index 000000000000..56b092a2a4c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/adc-helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/adc-helpers.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The industrial I/O ADC firmware property parsing helpers</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2025 Matti Vaittinen &lt;mazziesaccount@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _INDUSTRIAL_IO_ADC_HELPERS_H_</div><div class='add'>+#define _INDUSTRIAL_IO_ADC_HELPERS_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct iio_chan_spec;</div><div class='add'>+</div><div class='add'>+static inline int iio_adc_device_num_channels(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return device_get_named_child_node_count(dev, "channel");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int devm_iio_adc_device_alloc_chaninfo_se(struct device *dev,</div><div class='add'>+					  const struct iio_chan_spec *template,</div><div class='add'>+					  int max_chan_id,</div><div class='add'>+					  struct iio_chan_spec **cs);</div><div class='add'>+</div><div class='add'>+#endif /* _INDUSTRIAL_IO_ADC_HELPERS_H_ */</div><div class='head'>diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h<br/>index 719cf9cc6e1a..6e70a412e218 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/adc/ad_sigma_delta.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/adc/ad_sigma_delta.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/adc/ad_sigma_delta.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/adc/ad_sigma_delta.h</a></div><div class='hunk'>@@ -29,7 +29,10 @@ struct ad_sd_calib_data {</div><div class='ctx'> </div><div class='ctx'> struct ad_sigma_delta;</div><div class='ctx'> struct device;</div><div class='add'>+struct gpio_desc;</div><div class='ctx'> struct iio_dev;</div><div class='add'>+struct spi_offload;</div><div class='add'>+struct spi_offload_trigger;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ad_sigma_delta_info - Sigma Delta driver specific callbacks and options</div><div class='hunk'>@@ -37,10 +40,19 @@ struct iio_dev;</div><div class='ctx'>  * @append_status: Will be called to enable status append at the end of the sample, may be NULL.</div><div class='ctx'>  * @set_mode: Will be called to select the current mode, may be NULL.</div><div class='ctx'>  * @disable_all: Will be called to disable all channels, may be NULL.</div><div class='add'>+ * @disable_one: Will be called to disable a single channel after</div><div class='add'>+ *		ad_sigma_delta_single_conversion(), may be NULL.</div><div class='add'>+ *		Usage of this callback expects iio_chan_spec.address to contain</div><div class='add'>+ *		the value required for the driver to identify the channel.</div><div class='ctx'>  * @postprocess_sample: Is called for each sampled data word, can be used to</div><div class='ctx'>  *		modify or drop the sample data, it, may be NULL.</div><div class='ctx'>  * @has_registers: true if the device has writable and readable registers, false</div><div class='ctx'>  *		if there is just one read-only sample data shift register.</div><div class='add'>+ * @has_named_irqs: Set to true if there is more than one IRQ line.</div><div class='add'>+ * @supports_spi_offload: Set to true if the driver supports SPI offload. Often</div><div class='add'>+ *		special considerations are needed for scan_type and other channel</div><div class='add'>+ *		info, so individual drivers have to set this to let the core</div><div class='add'>+ *		code know that it can use SPI offload if it is available.</div><div class='ctx'>  * @addr_shift: Shift of the register address in the communications register.</div><div class='ctx'>  * @read_mask: Mask for the communications register having the read bit set.</div><div class='ctx'>  * @status_ch_mask: Mask for the channel number stored in status register.</div><div class='hunk'>@@ -48,20 +60,25 @@ struct iio_dev;</div><div class='ctx'>  *   be used.</div><div class='ctx'>  * @irq_flags: flags for the interrupt used by the triggered buffer</div><div class='ctx'>  * @num_slots: Number of sequencer slots</div><div class='add'>+ * @num_resetclks: Number of SPI clk cycles with MOSI=1 to reset the chip.</div><div class='ctx'>  */</div><div class='ctx'> struct ad_sigma_delta_info {</div><div class='ctx'> 	int (*set_channel)(struct ad_sigma_delta *, unsigned int channel);</div><div class='ctx'> 	int (*append_status)(struct ad_sigma_delta *, bool append);</div><div class='ctx'> 	int (*set_mode)(struct ad_sigma_delta *, enum ad_sigma_delta_mode mode);</div><div class='ctx'> 	int (*disable_all)(struct ad_sigma_delta *);</div><div class='add'>+	int (*disable_one)(struct ad_sigma_delta *, unsigned int chan);</div><div class='ctx'> 	int (*postprocess_sample)(struct ad_sigma_delta *, unsigned int raw_sample);</div><div class='ctx'> 	bool has_registers;</div><div class='add'>+	bool has_named_irqs;</div><div class='add'>+	bool supports_spi_offload;</div><div class='ctx'> 	unsigned int addr_shift;</div><div class='ctx'> 	unsigned int read_mask;</div><div class='ctx'> 	unsigned int status_ch_mask;</div><div class='ctx'> 	unsigned int data_reg;</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> 	unsigned int num_slots;</div><div class='add'>+	unsigned int num_resetclks;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -78,21 +95,28 @@ struct ad_sigma_delta {</div><div class='ctx'> </div><div class='ctx'> /* private: */</div><div class='ctx'> 	struct completion	completion;</div><div class='add'>+	spinlock_t		irq_lock; /* protects .irq_dis and irq en/disable state */</div><div class='ctx'> 	bool			irq_dis;</div><div class='ctx'> </div><div class='ctx'> 	bool			bus_locked;</div><div class='ctx'> 	bool			keep_cs_asserted;</div><div class='ctx'> </div><div class='del'>-	uint8_t			comm;</div><div class='add'>+	u8			comm;</div><div class='ctx'> </div><div class='ctx'> 	const struct ad_sigma_delta_info *info;</div><div class='ctx'> 	unsigned int		active_slots;</div><div class='ctx'> 	unsigned int		current_slot;</div><div class='ctx'> 	unsigned int		num_slots;</div><div class='add'>+	struct gpio_desc	*rdy_gpiod;</div><div class='add'>+	int			irq_line;</div><div class='ctx'> 	bool			status_appended;</div><div class='ctx'> 	/* map slots to channels in order to know what to expect from devices */</div><div class='ctx'> 	unsigned int		*slots;</div><div class='del'>-	uint8_t			*samples_buf;</div><div class='add'>+	struct spi_message	sample_msg;</div><div class='add'>+	struct spi_transfer	sample_xfer[2];</div><div class='add'>+	u8			*samples_buf;</div><div class='add'>+	struct spi_offload	*offload;</div><div class='add'>+	struct spi_offload_trigger *offload_trigger;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * DMA (thus cache coherency maintenance) requires the</div><div class='hunk'>@@ -101,10 +125,16 @@ struct ad_sigma_delta {</div><div class='ctx'> 	 * 'rx_buf' is up to 32 bits per sample + 64 bit timestamp,</div><div class='ctx'> 	 * rounded to 16 bytes to take into account padding.</div><div class='ctx'> 	 */</div><div class='del'>-	uint8_t				tx_buf[4] __aligned(IIO_DMA_MINALIGN);</div><div class='del'>-	uint8_t				rx_buf[16] __aligned(8);</div><div class='add'>+	u8				tx_buf[4] __aligned(IIO_DMA_MINALIGN);</div><div class='add'>+	u8				rx_buf[16] __aligned(8);</div><div class='add'>+	u8				sample_addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool ad_sigma_delta_has_spi_offload(struct ad_sigma_delta *sd)</div><div class='add'>+{</div><div class='add'>+	return sd-&gt;offload != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int ad_sigma_delta_set_channel(struct ad_sigma_delta *sd,</div><div class='ctx'> 	unsigned int channel)</div><div class='ctx'> {</div><div class='hunk'>@@ -137,6 +167,15 @@ static inline int ad_sigma_delta_disable_all(struct ad_sigma_delta *sd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int ad_sigma_delta_disable_one(struct ad_sigma_delta *sd,</div><div class='add'>+					     unsigned int chan)</div><div class='add'>+{</div><div class='add'>+	if (sd-&gt;info-&gt;disable_one)</div><div class='add'>+		return sd-&gt;info-&gt;disable_one(sd, chan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int ad_sigma_delta_set_mode(struct ad_sigma_delta *sd,</div><div class='ctx'> 	unsigned int mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -155,14 +194,13 @@ static inline int ad_sigma_delta_postprocess_sample(struct ad_sigma_delta *sd,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ad_sd_set_comm(struct ad_sigma_delta *sigma_delta, uint8_t comm);</div><div class='add'>+void ad_sd_set_comm(struct ad_sigma_delta *sigma_delta, u8 comm);</div><div class='ctx'> int ad_sd_write_reg(struct ad_sigma_delta *sigma_delta, unsigned int reg,</div><div class='ctx'> 	unsigned int size, unsigned int val);</div><div class='ctx'> int ad_sd_read_reg(struct ad_sigma_delta *sigma_delta, unsigned int reg,</div><div class='ctx'> 	unsigned int size, unsigned int *val);</div><div class='ctx'> </div><div class='del'>-int ad_sd_reset(struct ad_sigma_delta *sigma_delta,</div><div class='del'>-	unsigned int reset_length);</div><div class='add'>+int ad_sd_reset(struct ad_sigma_delta *sigma_delta);</div><div class='ctx'> </div><div class='ctx'> int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,</div><div class='ctx'> 	const struct iio_chan_spec *chan, int *val);</div><div class='head'>diff --git a/include/linux/iio/adc/adi-axi-adc.h b/include/linux/iio/adc/adi-axi-adc.h<br/>deleted file mode 100644<br/>index b7904992d561..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/adc/adi-axi-adc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/adc/adi-axi-adc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- * Analog Devices Generic AXI ADC IP core driver/library</div><div class='del'>- * Link: https://wiki.analog.com/resources/fpga/docs/axi_adc_ip</div><div class='del'>- *</div><div class='del'>- * Copyright 2012-2020 Analog Devices Inc.</div><div class='del'>- */</div><div class='del'>-#ifndef __ADI_AXI_ADC_H__</div><div class='del'>-#define __ADI_AXI_ADC_H__</div><div class='del'>-</div><div class='del'>-struct device;</div><div class='del'>-struct iio_chan_spec;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct adi_axi_adc_chip_info - Chip specific information</div><div class='del'>- * @name		Chip name</div><div class='del'>- * @id			Chip ID (usually product ID)</div><div class='del'>- * @channels		Channel specifications of type @struct iio_chan_spec</div><div class='del'>- * @num_channels	Number of @channels</div><div class='del'>- * @scale_table		Supported scales by the chip; tuples of 2 ints</div><div class='del'>- * @num_scales		Number of scales in the table</div><div class='del'>- * @max_rate		Maximum sampling rate supported by the device</div><div class='del'>- */</div><div class='del'>-struct adi_axi_adc_chip_info {</div><div class='del'>-	const char			*name;</div><div class='del'>-	unsigned int			id;</div><div class='del'>-</div><div class='del'>-	const struct iio_chan_spec	*channels;</div><div class='del'>-	unsigned int			num_channels;</div><div class='del'>-</div><div class='del'>-	const unsigned int		(*scale_table)[2];</div><div class='del'>-	int				num_scales;</div><div class='del'>-</div><div class='del'>-	unsigned long			max_rate;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct adi_axi_adc_conv - data of the ADC attached to the AXI ADC</div><div class='del'>- * @chip_info		chip info details for the client ADC</div><div class='del'>- * @preenable_setup	op to run in the client before enabling the AXI ADC</div><div class='del'>- * @reg_access		IIO debugfs_reg_access hook for the client ADC</div><div class='del'>- * @read_raw		IIO read_raw hook for the client ADC</div><div class='del'>- * @write_raw		IIO write_raw hook for the client ADC</div><div class='del'>- * @read_avail		IIO read_avail hook for the client ADC</div><div class='del'>- */</div><div class='del'>-struct adi_axi_adc_conv {</div><div class='del'>-	const struct adi_axi_adc_chip_info		*chip_info;</div><div class='del'>-</div><div class='del'>-	int (*preenable_setup)(struct adi_axi_adc_conv *conv);</div><div class='del'>-	int (*reg_access)(struct adi_axi_adc_conv *conv, unsigned int reg,</div><div class='del'>-			  unsigned int writeval, unsigned int *readval);</div><div class='del'>-	int (*read_raw)(struct adi_axi_adc_conv *conv,</div><div class='del'>-			struct iio_chan_spec const *chan,</div><div class='del'>-			int *val, int *val2, long mask);</div><div class='del'>-	int (*write_raw)(struct adi_axi_adc_conv *conv,</div><div class='del'>-			 struct iio_chan_spec const *chan,</div><div class='del'>-			 int val, int val2, long mask);</div><div class='del'>-	int (*read_avail)(struct adi_axi_adc_conv *conv,</div><div class='del'>-			  struct iio_chan_spec const *chan,</div><div class='del'>-			  const int **val, int *type, int *length, long mask);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct adi_axi_adc_conv *devm_adi_axi_adc_conv_register(struct device *dev,</div><div class='del'>-							size_t sizeof_priv);</div><div class='del'>-</div><div class='del'>-void *adi_axi_adc_conv_priv(struct adi_axi_adc_conv *conv);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/iio/adc/qcom-vadc-common.h b/include/linux/iio/adc/qcom-vadc-common.h<br/>index aa21b032e861..3bf4c49726a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/adc/qcom-vadc-common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/adc/qcom-vadc-common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/adc/qcom-vadc-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/adc/qcom-vadc-common.h</a></div><div class='hunk'>@@ -83,27 +83,27 @@ struct vadc_linear_graph {</div><div class='ctx'> /**</div><div class='ctx'>  * enum vadc_scale_fn_type - Scaling function to convert ADC code to</div><div class='ctx'>  *				physical scaled units for the channel.</div><div class='del'>- * SCALE_DEFAULT: Default scaling to convert raw adc code to voltage (uV).</div><div class='del'>- * SCALE_THERM_100K_PULLUP: Returns temperature in millidegC.</div><div class='add'>+ * @SCALE_DEFAULT: Default scaling to convert raw adc code to voltage (uV).</div><div class='add'>+ * @SCALE_THERM_100K_PULLUP: Returns temperature in millidegC.</div><div class='ctx'>  *				 Uses a mapping table with 100K pullup.</div><div class='del'>- * SCALE_PMIC_THERM: Returns result in milli degree's Centigrade.</div><div class='del'>- * SCALE_XOTHERM: Returns XO thermistor voltage in millidegC.</div><div class='del'>- * SCALE_PMI_CHG_TEMP: Conversion for PMI CHG temp</div><div class='del'>- * SCALE_HW_CALIB_DEFAULT: Default scaling to convert raw adc code to</div><div class='add'>+ * @SCALE_PMIC_THERM: Returns result in milli degree's Centigrade.</div><div class='add'>+ * @SCALE_XOTHERM: Returns XO thermistor voltage in millidegC.</div><div class='add'>+ * @SCALE_PMI_CHG_TEMP: Conversion for PMI CHG temp</div><div class='add'>+ * @SCALE_HW_CALIB_DEFAULT: Default scaling to convert raw adc code to</div><div class='ctx'>  *	voltage (uV) with hardware applied offset/slope values to adc code.</div><div class='del'>- * SCALE_HW_CALIB_THERM_100K_PULLUP: Returns temperature in millidegC using</div><div class='add'>+ * @SCALE_HW_CALIB_THERM_100K_PULLUP: Returns temperature in millidegC using</div><div class='ctx'>  *	lookup table. The hardware applies offset/slope to adc code.</div><div class='del'>- * SCALE_HW_CALIB_XOTHERM: Returns XO thermistor voltage in millidegC using</div><div class='add'>+ * @SCALE_HW_CALIB_XOTHERM: Returns XO thermistor voltage in millidegC using</div><div class='ctx'>  *	100k pullup. The hardware applies offset/slope to adc code.</div><div class='del'>- * SCALE_HW_CALIB_THERM_100K_PU_PM7: Returns temperature in millidegC using</div><div class='add'>+ * @SCALE_HW_CALIB_THERM_100K_PU_PM7: Returns temperature in millidegC using</div><div class='ctx'>  *	lookup table for PMIC7. The hardware applies offset/slope to adc code.</div><div class='del'>- * SCALE_HW_CALIB_PMIC_THERM: Returns result in milli degree's Centigrade.</div><div class='add'>+ * @SCALE_HW_CALIB_PMIC_THERM: Returns result in milli degree's Centigrade.</div><div class='ctx'>  *	The hardware applies offset/slope to adc code.</div><div class='del'>- * SCALE_HW_CALIB_PMIC_THERM: Returns result in milli degree's Centigrade.</div><div class='add'>+ * @SCALE_HW_CALIB_PMIC_THERM: Returns result in milli degree's Centigrade.</div><div class='ctx'>  *	The hardware applies offset/slope to adc code. This is for PMIC7.</div><div class='del'>- * SCALE_HW_CALIB_PM5_CHG_TEMP: Returns result in millidegrees for PMIC5</div><div class='add'>+ * @SCALE_HW_CALIB_PM5_CHG_TEMP: Returns result in millidegrees for PMIC5</div><div class='ctx'>  *	charger temperature.</div><div class='del'>- * SCALE_HW_CALIB_PM5_SMB_TEMP: Returns result in millidegrees for PMIC5</div><div class='add'>+ * @SCALE_HW_CALIB_PM5_SMB_TEMP: Returns result in millidegrees for PMIC5</div><div class='ctx'>  *	SMB1390 temperature.</div><div class='ctx'>  */</div><div class='ctx'> enum vadc_scale_fn_type {</div><div class='hunk'>@@ -120,6 +120,7 @@ enum vadc_scale_fn_type {</div><div class='ctx'> 	SCALE_HW_CALIB_PMIC_THERM_PM7,</div><div class='ctx'> 	SCALE_HW_CALIB_PM5_CHG_TEMP,</div><div class='ctx'> 	SCALE_HW_CALIB_PM5_SMB_TEMP,</div><div class='add'>+	/* private: */</div><div class='ctx'> 	SCALE_HW_CALIB_INVALID,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/iio/backend.h b/include/linux/iio/backend.h<br/>new file mode 100644<br/>index 000000000000..7f815f3fed6a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/backend.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/backend.h</a></div><div class='hunk'>@@ -0,0 +1,270 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef _IIO_BACKEND_H_</div><div class='add'>+#define _IIO_BACKEND_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/iio/iio.h&gt;</div><div class='add'>+</div><div class='add'>+struct iio_chan_spec;</div><div class='add'>+struct fwnode_handle;</div><div class='add'>+struct iio_backend;</div><div class='add'>+struct device;</div><div class='add'>+struct iio_dev;</div><div class='add'>+</div><div class='add'>+enum iio_backend_data_type {</div><div class='add'>+	IIO_BACKEND_TWOS_COMPLEMENT,</div><div class='add'>+	IIO_BACKEND_OFFSET_BINARY,</div><div class='add'>+	IIO_BACKEND_DATA_UNSIGNED,</div><div class='add'>+	IIO_BACKEND_DATA_TYPE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iio_backend_data_source {</div><div class='add'>+	IIO_BACKEND_INTERNAL_CONTINUOUS_WAVE,</div><div class='add'>+	IIO_BACKEND_EXTERNAL,</div><div class='add'>+	IIO_BACKEND_INTERNAL_RAMP_16BIT,</div><div class='add'>+	IIO_BACKEND_DATA_SOURCE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define iio_backend_debugfs_ptr(ptr)	PTR_IF(IS_ENABLED(CONFIG_DEBUG_FS), ptr)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * IIO_BACKEND_EX_INFO - Helper for an IIO extended channel attribute</div><div class='add'>+ * @_name: Attribute name</div><div class='add'>+ * @_shared: Whether the attribute is shared between all channels</div><div class='add'>+ * @_what: Data private to the driver</div><div class='add'>+ */</div><div class='add'>+#define IIO_BACKEND_EX_INFO(_name, _shared, _what) {	\</div><div class='add'>+	.name = (_name),				\</div><div class='add'>+	.shared = (_shared),				\</div><div class='add'>+	.read =  iio_backend_ext_info_get,		\</div><div class='add'>+	.write = iio_backend_ext_info_set,		\</div><div class='add'>+	.private = (_what),				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iio_backend_data_fmt - Backend data format</div><div class='add'>+ * @type: Data type.</div><div class='add'>+ * @sign_extend: Bool to tell if the data is sign extended.</div><div class='add'>+ * @enable: Enable/Disable the data format module. If disabled,</div><div class='add'>+ *	    not formatting will happen.</div><div class='add'>+ */</div><div class='add'>+struct iio_backend_data_fmt {</div><div class='add'>+	enum iio_backend_data_type type;</div><div class='add'>+	bool sign_extend;</div><div class='add'>+	bool enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* vendor specific from 32 */</div><div class='add'>+enum iio_backend_test_pattern {</div><div class='add'>+	IIO_BACKEND_NO_TEST_PATTERN,</div><div class='add'>+	/* modified prbs9 */</div><div class='add'>+	IIO_BACKEND_ADI_PRBS_9A = 32,</div><div class='add'>+	/* modified prbs23 */</div><div class='add'>+	IIO_BACKEND_ADI_PRBS_23A,</div><div class='add'>+	IIO_BACKEND_TEST_PATTERN_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iio_backend_sample_trigger {</div><div class='add'>+	IIO_BACKEND_SAMPLE_TRIGGER_EDGE_FALLING,</div><div class='add'>+	IIO_BACKEND_SAMPLE_TRIGGER_EDGE_RISING,</div><div class='add'>+	IIO_BACKEND_SAMPLE_TRIGGER_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iio_backend_interface_type {</div><div class='add'>+	IIO_BACKEND_INTERFACE_SERIAL_LVDS,</div><div class='add'>+	IIO_BACKEND_INTERFACE_SERIAL_CMOS,</div><div class='add'>+	IIO_BACKEND_INTERFACE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iio_backend_filter_type {</div><div class='add'>+	IIO_BACKEND_FILTER_TYPE_DISABLED,</div><div class='add'>+	IIO_BACKEND_FILTER_TYPE_SINC1,</div><div class='add'>+	IIO_BACKEND_FILTER_TYPE_SINC5,</div><div class='add'>+	IIO_BACKEND_FILTER_TYPE_SINC5_PLUS_COMP,</div><div class='add'>+	IIO_BACKEND_FILTER_TYPE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iio_backend_ops - operations structure for an iio_backend</div><div class='add'>+ * @enable: Enable backend.</div><div class='add'>+ * @disable: Disable backend.</div><div class='add'>+ * @chan_enable: Enable one channel.</div><div class='add'>+ * @chan_disable: Disable one channel.</div><div class='add'>+ * @data_format_set: Configure the data format for a specific channel.</div><div class='add'>+ * @data_source_set: Configure the data source for a specific channel.</div><div class='add'>+ * @data_source_get: Data source getter for a specific channel.</div><div class='add'>+ * @set_sample_rate: Configure the sampling rate for a specific channel.</div><div class='add'>+ * @test_pattern_set: Configure a test pattern.</div><div class='add'>+ * @chan_status: Get the channel status.</div><div class='add'>+ * @iodelay_set: Set digital I/O delay.</div><div class='add'>+ * @data_sample_trigger: Control when to sample data.</div><div class='add'>+ * @request_buffer: Request an IIO buffer.</div><div class='add'>+ * @free_buffer: Free an IIO buffer.</div><div class='add'>+ * @extend_chan_spec: Extend an IIO channel.</div><div class='add'>+ * @ext_info_set: Extended info setter.</div><div class='add'>+ * @ext_info_get: Extended info getter.</div><div class='add'>+ * @interface_type_get: Interface type.</div><div class='add'>+ * @data_size_set: Data size.</div><div class='add'>+ * @oversampling_ratio_set: Set Oversampling ratio.</div><div class='add'>+ * @read_raw: Read a channel attribute from a backend device</div><div class='add'>+ * @debugfs_print_chan_status: Print channel status into a buffer.</div><div class='add'>+ * @debugfs_reg_access: Read or write register value of backend.</div><div class='add'>+ * @filter_type_set: Set filter type.</div><div class='add'>+ * @interface_data_align: Perform the data alignment process.</div><div class='add'>+ * @num_lanes_set: Set the number of lanes enabled.</div><div class='add'>+ * @ddr_enable: Enable interface DDR (Double Data Rate) mode.</div><div class='add'>+ * @ddr_disable: Disable interface DDR (Double Data Rate) mode.</div><div class='add'>+ * @data_stream_enable: Enable data stream.</div><div class='add'>+ * @data_stream_disable: Disable data stream.</div><div class='add'>+ * @data_transfer_addr: Set data address.</div><div class='add'>+ **/</div><div class='add'>+struct iio_backend_ops {</div><div class='add'>+	int (*enable)(struct iio_backend *back);</div><div class='add'>+	void (*disable)(struct iio_backend *back);</div><div class='add'>+	int (*chan_enable)(struct iio_backend *back, unsigned int chan);</div><div class='add'>+	int (*chan_disable)(struct iio_backend *back, unsigned int chan);</div><div class='add'>+	int (*data_format_set)(struct iio_backend *back, unsigned int chan,</div><div class='add'>+			       const struct iio_backend_data_fmt *data);</div><div class='add'>+	int (*data_source_set)(struct iio_backend *back, unsigned int chan,</div><div class='add'>+			       enum iio_backend_data_source data);</div><div class='add'>+	int (*data_source_get)(struct iio_backend *back, unsigned int chan,</div><div class='add'>+			       enum iio_backend_data_source *data);</div><div class='add'>+	int (*set_sample_rate)(struct iio_backend *back, unsigned int chan,</div><div class='add'>+			       u64 sample_rate_hz);</div><div class='add'>+	int (*test_pattern_set)(struct iio_backend *back,</div><div class='add'>+				unsigned int chan,</div><div class='add'>+				enum iio_backend_test_pattern pattern);</div><div class='add'>+	int (*chan_status)(struct iio_backend *back, unsigned int chan,</div><div class='add'>+			   bool *error);</div><div class='add'>+	int (*iodelay_set)(struct iio_backend *back, unsigned int chan,</div><div class='add'>+			   unsigned int taps);</div><div class='add'>+	int (*data_sample_trigger)(struct iio_backend *back,</div><div class='add'>+				   enum iio_backend_sample_trigger trigger);</div><div class='add'>+	struct iio_buffer *(*request_buffer)(struct iio_backend *back,</div><div class='add'>+					     struct iio_dev *indio_dev);</div><div class='add'>+	void (*free_buffer)(struct iio_backend *back,</div><div class='add'>+			    struct iio_buffer *buffer);</div><div class='add'>+	int (*extend_chan_spec)(struct iio_backend *back,</div><div class='add'>+				struct iio_chan_spec *chan);</div><div class='add'>+	int (*ext_info_set)(struct iio_backend *back, uintptr_t private,</div><div class='add'>+			    const struct iio_chan_spec *chan,</div><div class='add'>+			    const char *buf, size_t len);</div><div class='add'>+	int (*ext_info_get)(struct iio_backend *back, uintptr_t private,</div><div class='add'>+			    const struct iio_chan_spec *chan, char *buf);</div><div class='add'>+	int (*interface_type_get)(struct iio_backend *back,</div><div class='add'>+				  enum iio_backend_interface_type *type);</div><div class='add'>+	int (*data_size_set)(struct iio_backend *back, unsigned int size);</div><div class='add'>+	int (*oversampling_ratio_set)(struct iio_backend *back,</div><div class='add'>+				      unsigned int chan, unsigned int ratio);</div><div class='add'>+	int (*read_raw)(struct iio_backend *back,</div><div class='add'>+			struct iio_chan_spec const *chan, int *val, int *val2,</div><div class='add'>+			long mask);</div><div class='add'>+	int (*debugfs_print_chan_status)(struct iio_backend *back,</div><div class='add'>+					 unsigned int chan, char *buf,</div><div class='add'>+					 size_t len);</div><div class='add'>+	int (*debugfs_reg_access)(struct iio_backend *back, unsigned int reg,</div><div class='add'>+				  unsigned int writeval, unsigned int *readval);</div><div class='add'>+	int (*filter_type_set)(struct iio_backend *back,</div><div class='add'>+			       enum iio_backend_filter_type type);</div><div class='add'>+	int (*interface_data_align)(struct iio_backend *back, u32 timeout_us);</div><div class='add'>+	int (*num_lanes_set)(struct iio_backend *back, unsigned int num_lanes);</div><div class='add'>+	int (*ddr_enable)(struct iio_backend *back);</div><div class='add'>+	int (*ddr_disable)(struct iio_backend *back);</div><div class='add'>+	int (*data_stream_enable)(struct iio_backend *back);</div><div class='add'>+	int (*data_stream_disable)(struct iio_backend *back);</div><div class='add'>+	int (*data_transfer_addr)(struct iio_backend *back, u32 address);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iio_backend_info - info structure for an iio_backend</div><div class='add'>+ * @name: Backend name.</div><div class='add'>+ * @ops: Backend operations.</div><div class='add'>+ */</div><div class='add'>+struct iio_backend_info {</div><div class='add'>+	const char *name;</div><div class='add'>+	const struct iio_backend_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iio_backend_chan_enable(struct iio_backend *back, unsigned int chan);</div><div class='add'>+int iio_backend_chan_disable(struct iio_backend *back, unsigned int chan);</div><div class='add'>+int devm_iio_backend_enable(struct device *dev, struct iio_backend *back);</div><div class='add'>+int iio_backend_enable(struct iio_backend *back);</div><div class='add'>+void iio_backend_disable(struct iio_backend *back);</div><div class='add'>+int iio_backend_data_format_set(struct iio_backend *back, unsigned int chan,</div><div class='add'>+				const struct iio_backend_data_fmt *data);</div><div class='add'>+int iio_backend_data_source_set(struct iio_backend *back, unsigned int chan,</div><div class='add'>+				enum iio_backend_data_source data);</div><div class='add'>+int iio_backend_data_source_get(struct iio_backend *back, unsigned int chan,</div><div class='add'>+				enum iio_backend_data_source *data);</div><div class='add'>+int iio_backend_set_sampling_freq(struct iio_backend *back, unsigned int chan,</div><div class='add'>+				  u64 sample_rate_hz);</div><div class='add'>+int iio_backend_test_pattern_set(struct iio_backend *back,</div><div class='add'>+				 unsigned int chan,</div><div class='add'>+				 enum iio_backend_test_pattern pattern);</div><div class='add'>+int iio_backend_chan_status(struct iio_backend *back, unsigned int chan,</div><div class='add'>+			    bool *error);</div><div class='add'>+int iio_backend_iodelay_set(struct iio_backend *back, unsigned int lane,</div><div class='add'>+			    unsigned int taps);</div><div class='add'>+int iio_backend_data_sample_trigger(struct iio_backend *back,</div><div class='add'>+				    enum iio_backend_sample_trigger trigger);</div><div class='add'>+int devm_iio_backend_request_buffer(struct device *dev,</div><div class='add'>+				    struct iio_backend *back,</div><div class='add'>+				    struct iio_dev *indio_dev);</div><div class='add'>+int iio_backend_filter_type_set(struct iio_backend *back,</div><div class='add'>+				enum iio_backend_filter_type type);</div><div class='add'>+int iio_backend_interface_data_align(struct iio_backend *back, u32 timeout_us);</div><div class='add'>+int iio_backend_num_lanes_set(struct iio_backend *back, unsigned int num_lanes);</div><div class='add'>+int iio_backend_ddr_enable(struct iio_backend *back);</div><div class='add'>+int iio_backend_ddr_disable(struct iio_backend *back);</div><div class='add'>+int iio_backend_data_stream_enable(struct iio_backend *back);</div><div class='add'>+int iio_backend_data_stream_disable(struct iio_backend *back);</div><div class='add'>+int iio_backend_data_transfer_addr(struct iio_backend *back, u32 address);</div><div class='add'>+ssize_t iio_backend_ext_info_set(struct iio_dev *indio_dev, uintptr_t private,</div><div class='add'>+				 const struct iio_chan_spec *chan,</div><div class='add'>+				 const char *buf, size_t len);</div><div class='add'>+ssize_t iio_backend_ext_info_get(struct iio_dev *indio_dev, uintptr_t private,</div><div class='add'>+				 const struct iio_chan_spec *chan, char *buf);</div><div class='add'>+int iio_backend_interface_type_get(struct iio_backend *back,</div><div class='add'>+				   enum iio_backend_interface_type *type);</div><div class='add'>+int iio_backend_data_size_set(struct iio_backend *back, unsigned int size);</div><div class='add'>+int iio_backend_oversampling_ratio_set(struct iio_backend *back,</div><div class='add'>+				       unsigned int chan,</div><div class='add'>+				       unsigned int ratio);</div><div class='add'>+int iio_backend_read_raw(struct iio_backend *back,</div><div class='add'>+			 struct iio_chan_spec const *chan, int *val, int *val2,</div><div class='add'>+			 long mask);</div><div class='add'>+int iio_backend_extend_chan_spec(struct iio_backend *back,</div><div class='add'>+				 struct iio_chan_spec *chan);</div><div class='add'>+void *iio_backend_get_priv(const struct iio_backend *conv);</div><div class='add'>+struct iio_backend *devm_iio_backend_get(struct device *dev, const char *name);</div><div class='add'>+struct iio_backend *devm_iio_backend_fwnode_get(struct device *dev,</div><div class='add'>+						const char *name,</div><div class='add'>+						struct fwnode_handle *fwnode);</div><div class='add'>+struct iio_backend *</div><div class='add'>+__devm_iio_backend_get_from_fwnode_lookup(struct device *dev,</div><div class='add'>+					  struct fwnode_handle *fwnode);</div><div class='add'>+</div><div class='add'>+int devm_iio_backend_register(struct device *dev,</div><div class='add'>+			      const struct iio_backend_info *info, void *priv);</div><div class='add'>+</div><div class='add'>+static inline int iio_backend_read_scale(struct iio_backend *back,</div><div class='add'>+					 struct iio_chan_spec const *chan,</div><div class='add'>+					 int *val, int *val2)</div><div class='add'>+{</div><div class='add'>+	return iio_backend_read_raw(back, chan, val, val2, IIO_CHAN_INFO_SCALE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iio_backend_read_offset(struct iio_backend *back,</div><div class='add'>+					  struct iio_chan_spec const *chan,</div><div class='add'>+					  int *val, int *val2)</div><div class='add'>+{</div><div class='add'>+	return iio_backend_read_raw(back, chan, val, val2,</div><div class='add'>+				    IIO_CHAN_INFO_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t iio_backend_debugfs_print_chan_status(struct iio_backend *back,</div><div class='add'>+					      unsigned int chan, char *buf,</div><div class='add'>+					      size_t len);</div><div class='add'>+void iio_backend_debugfs_add(struct iio_backend *back,</div><div class='add'>+			     struct iio_dev *indio_dev);</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/iio/buffer-dma.h b/include/linux/iio/buffer-dma.h<br/>index 18d3702fa95d..4f33e6a39797 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/buffer-dma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/buffer-dma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/buffer-dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/buffer-dma.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #ifndef __INDUSTRIALIO_DMA_BUFFER_H__</div><div class='ctx'> #define __INDUSTRIALIO_DMA_BUFFER_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -16,6 +17,9 @@</div><div class='ctx'> struct iio_dma_buffer_queue;</div><div class='ctx'> struct iio_dma_buffer_ops;</div><div class='ctx'> struct device;</div><div class='add'>+struct dma_buf_attachment;</div><div class='add'>+struct dma_fence;</div><div class='add'>+struct sg_table;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum iio_block_state - State of a struct iio_dma_buffer_block</div><div class='hunk'>@@ -41,6 +45,10 @@ enum iio_block_state {</div><div class='ctx'>  * @queue: Parent DMA buffer queue</div><div class='ctx'>  * @kref: kref used to manage the lifetime of block</div><div class='ctx'>  * @state: Current state of the block</div><div class='add'>+ * @cyclic: True if this is a cyclic buffer</div><div class='add'>+ * @fileio: True if this buffer is used for fileio mode</div><div class='add'>+ * @sg_table: DMA table for the transfer when transferring a DMABUF</div><div class='add'>+ * @fence: DMA fence to be signaled when a DMABUF transfer is complete</div><div class='ctx'>  */</div><div class='ctx'> struct iio_dma_buffer_block {</div><div class='ctx'> 	/* May only be accessed by the owner of the block */</div><div class='hunk'>@@ -63,6 +71,12 @@ struct iio_dma_buffer_block {</div><div class='ctx'> 	 * queue-&gt;list_lock if the block is not owned by the core.</div><div class='ctx'> 	 */</div><div class='ctx'> 	enum iio_block_state state;</div><div class='add'>+</div><div class='add'>+	bool cyclic;</div><div class='add'>+	bool fileio;</div><div class='add'>+</div><div class='add'>+	struct sg_table *sg_table;</div><div class='add'>+	struct dma_fence *fence;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -72,6 +86,7 @@ struct iio_dma_buffer_block {</div><div class='ctx'>  * @pos: Read offset in the active block</div><div class='ctx'>  * @block_size: Size of each block</div><div class='ctx'>  * @next_dequeue: index of next block that will be dequeued</div><div class='add'>+ * @enabled: Whether the buffer is operating in fileio mode</div><div class='ctx'>  */</div><div class='ctx'> struct iio_dma_buffer_queue_fileio {</div><div class='ctx'> 	struct iio_dma_buffer_block *blocks[2];</div><div class='hunk'>@@ -80,6 +95,7 @@ struct iio_dma_buffer_queue_fileio {</div><div class='ctx'> 	size_t block_size;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int next_dequeue;</div><div class='add'>+	bool enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -95,6 +111,7 @@ struct iio_dma_buffer_queue_fileio {</div><div class='ctx'>  *   the DMA controller</div><div class='ctx'>  * @incoming: List of buffers on the incoming queue</div><div class='ctx'>  * @active: Whether the buffer is currently active</div><div class='add'>+ * @num_dmabufs: Total number of DMABUFs attached to this queue</div><div class='ctx'>  * @fileio: FileIO state</div><div class='ctx'>  */</div><div class='ctx'> struct iio_dma_buffer_queue {</div><div class='hunk'>@@ -107,6 +124,7 @@ struct iio_dma_buffer_queue {</div><div class='ctx'> 	struct list_head incoming;</div><div class='ctx'> </div><div class='ctx'> 	bool active;</div><div class='add'>+	atomic_t num_dmabufs;</div><div class='ctx'> </div><div class='ctx'> 	struct iio_dma_buffer_queue_fileio fileio;</div><div class='ctx'> };</div><div class='hunk'>@@ -132,7 +150,9 @@ int iio_dma_buffer_disable(struct iio_buffer *buffer,</div><div class='ctx'> 	struct iio_dev *indio_dev);</div><div class='ctx'> int iio_dma_buffer_read(struct iio_buffer *buffer, size_t n,</div><div class='ctx'> 	char __user *user_buffer);</div><div class='del'>-size_t iio_dma_buffer_data_available(struct iio_buffer *buffer);</div><div class='add'>+int iio_dma_buffer_write(struct iio_buffer *buffer, size_t n,</div><div class='add'>+			 const char __user *user_buffer);</div><div class='add'>+size_t iio_dma_buffer_usage(struct iio_buffer *buffer);</div><div class='ctx'> int iio_dma_buffer_set_bytes_per_datum(struct iio_buffer *buffer, size_t bpd);</div><div class='ctx'> int iio_dma_buffer_set_length(struct iio_buffer *buffer, unsigned int length);</div><div class='ctx'> int iio_dma_buffer_request_update(struct iio_buffer *buffer);</div><div class='hunk'>@@ -142,4 +162,18 @@ int iio_dma_buffer_init(struct iio_dma_buffer_queue *queue,</div><div class='ctx'> void iio_dma_buffer_exit(struct iio_dma_buffer_queue *queue);</div><div class='ctx'> void iio_dma_buffer_release(struct iio_dma_buffer_queue *queue);</div><div class='ctx'> </div><div class='add'>+struct iio_dma_buffer_block *</div><div class='add'>+iio_dma_buffer_attach_dmabuf(struct iio_buffer *buffer,</div><div class='add'>+			     struct dma_buf_attachment *attach);</div><div class='add'>+void iio_dma_buffer_detach_dmabuf(struct iio_buffer *buffer,</div><div class='add'>+				  struct iio_dma_buffer_block *block);</div><div class='add'>+int iio_dma_buffer_enqueue_dmabuf(struct iio_buffer *buffer,</div><div class='add'>+				  struct iio_dma_buffer_block *block,</div><div class='add'>+				  struct dma_fence *fence,</div><div class='add'>+				  struct sg_table *sgt,</div><div class='add'>+				  size_t size, bool cyclic);</div><div class='add'>+void iio_dma_buffer_lock_queue(struct iio_buffer *buffer);</div><div class='add'>+void iio_dma_buffer_unlock_queue(struct iio_buffer *buffer);</div><div class='add'>+struct device *iio_dma_buffer_get_dma_dev(struct iio_buffer *buffer);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iio/buffer-dmaengine.h b/include/linux/iio/buffer-dmaengine.h<br/>index 5c355be89814..37f27545f69f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/buffer-dmaengine.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/buffer-dmaengine.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/buffer-dmaengine.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/buffer-dmaengine.h</a></div><div class='hunk'>@@ -7,11 +7,33 @@</div><div class='ctx'> #ifndef __IIO_DMAENGINE_H__</div><div class='ctx'> #define __IIO_DMAENGINE_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/iio/buffer.h&gt;</div><div class='add'>+</div><div class='ctx'> struct iio_dev;</div><div class='ctx'> struct device;</div><div class='add'>+struct dma_chan;</div><div class='add'>+</div><div class='add'>+void iio_dmaengine_buffer_teardown(struct iio_buffer *buffer);</div><div class='add'>+struct iio_buffer *iio_dmaengine_buffer_setup_ext(struct device *dev,</div><div class='add'>+						  struct iio_dev *indio_dev,</div><div class='add'>+						  const char *channel,</div><div class='add'>+						  enum iio_buffer_direction dir);</div><div class='add'>+</div><div class='add'>+#define iio_dmaengine_buffer_setup(dev, indio_dev, channel)	\</div><div class='add'>+	iio_dmaengine_buffer_setup_ext(dev, indio_dev, channel,	\</div><div class='add'>+				       IIO_BUFFER_DIRECTION_IN)</div><div class='add'>+</div><div class='add'>+int devm_iio_dmaengine_buffer_setup_ext(struct device *dev,</div><div class='add'>+					struct iio_dev *indio_dev,</div><div class='add'>+					const char *channel,</div><div class='add'>+					enum iio_buffer_direction dir);</div><div class='add'>+int devm_iio_dmaengine_buffer_setup_with_handle(struct device *dev,</div><div class='add'>+						struct iio_dev *indio_dev,</div><div class='add'>+						struct dma_chan *chan,</div><div class='add'>+						enum iio_buffer_direction dir);</div><div class='ctx'> </div><div class='del'>-int devm_iio_dmaengine_buffer_setup(struct device *dev,</div><div class='del'>-				    struct iio_dev *indio_dev,</div><div class='del'>-				    const char *channel);</div><div class='add'>+#define devm_iio_dmaengine_buffer_setup(dev, indio_dev, channel)	\</div><div class='add'>+	devm_iio_dmaengine_buffer_setup_ext(dev, indio_dev, channel,	\</div><div class='add'>+					    IIO_BUFFER_DIRECTION_IN)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h<br/>index 418b1307d3f2..d37f82678f71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/buffer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/buffer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/buffer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/buffer.h</a></div><div class='hunk'>@@ -26,18 +26,14 @@ int iio_pop_from_buffer(struct iio_buffer *buffer, void *data);</div><div class='ctx'>  * @data:		sample data</div><div class='ctx'>  * @timestamp:		timestamp for the sample data</div><div class='ctx'>  *</div><div class='del'>- * Pushes data to the IIO device's buffers. If timestamps are enabled for the</div><div class='del'>- * device the function will store the supplied timestamp as the last element in</div><div class='del'>- * the sample data buffer before pushing it to the device buffers. The sample</div><div class='del'>- * data buffer needs to be large enough to hold the additional timestamp</div><div class='del'>- * (usually the buffer should be indio-&gt;scan_bytes bytes large).</div><div class='add'>+ * DEPRECATED: Use iio_push_to_buffers_with_ts() instead.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 0 on success, a negative error code otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline int iio_push_to_buffers_with_timestamp(struct iio_dev *indio_dev,</div><div class='ctx'> 	void *data, int64_t timestamp)</div><div class='ctx'> {</div><div class='del'>-	if (indio_dev-&gt;scan_timestamp) {</div><div class='add'>+	if (ACCESS_PRIVATE(indio_dev, scan_timestamp)) {</div><div class='ctx'> 		size_t ts_offset = indio_dev-&gt;scan_bytes / sizeof(int64_t) - 1;</div><div class='ctx'> 		((int64_t *)data)[ts_offset] = timestamp;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -45,6 +41,34 @@ static inline int iio_push_to_buffers_with_timestamp(struct iio_dev *indio_dev,</div><div class='ctx'> 	return iio_push_to_buffers(indio_dev, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iio_push_to_buffers_with_ts() - push data and timestamp to buffers</div><div class='add'>+ * @indio_dev:		iio_dev structure for device.</div><div class='add'>+ * @data:		Pointer to sample data buffer.</div><div class='add'>+ * @data_total_len:	The size of @data in bytes.</div><div class='add'>+ * @timestamp:		Timestamp for the sample data.</div><div class='add'>+ *</div><div class='add'>+ * Pushes data to the IIO device's buffers. If timestamps are enabled for the</div><div class='add'>+ * device the function will store the supplied timestamp as the last element in</div><div class='add'>+ * the sample data buffer before pushing it to the device buffers. The sample</div><div class='add'>+ * data buffer needs to be large enough to hold the additional timestamp</div><div class='add'>+ * (usually the buffer should be at least indio-&gt;scan_bytes bytes large).</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ * Return: 0 on success, a negative error code otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline int iio_push_to_buffers_with_ts(struct iio_dev *indio_dev,</div><div class='add'>+					      void *data, size_t data_total_len,</div><div class='add'>+					      s64 timestamp)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(data_total_len &lt; indio_dev-&gt;scan_bytes)) {</div><div class='add'>+		dev_err(&amp;indio_dev-&gt;dev, "Undersized storage pushed to buffer\n");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return iio_push_to_buffers_with_timestamp(indio_dev, data, timestamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iio_push_to_buffers_with_ts_unaligned(struct iio_dev *indio_dev,</div><div class='ctx'> 					  const void *data, size_t data_sz,</div><div class='ctx'> 					  int64_t timestamp);</div><div class='head'>diff --git a/include/linux/iio/buffer_impl.h b/include/linux/iio/buffer_impl.h<br/>index 89c3fd7c29ca..c0b0e0992a85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/buffer_impl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/buffer_impl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/buffer_impl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/buffer_impl.h</a></div><div class='hunk'>@@ -9,8 +9,12 @@</div><div class='ctx'> #include &lt;uapi/linux/iio/buffer.h&gt;</div><div class='ctx'> #include &lt;linux/iio/buffer.h&gt;</div><div class='ctx'> </div><div class='add'>+struct dma_buf_attachment;</div><div class='add'>+struct dma_fence;</div><div class='ctx'> struct iio_dev;</div><div class='add'>+struct iio_dma_buffer_block;</div><div class='ctx'> struct iio_buffer;</div><div class='add'>+struct sg_table;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * INDIO_BUFFER_FLAG_FIXED_WATERMARK - Watermark level of the buffer can not be</div><div class='hunk'>@@ -20,7 +24,8 @@ struct iio_buffer;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iio_buffer_access_funcs - access functions for buffers.</div><div class='del'>- * @store_to:		actually store stuff to the buffer</div><div class='add'>+ * @store_to:		actually store stuff to the buffer - must be safe to</div><div class='add'>+ *			call from any context (e.g. must not sleep).</div><div class='ctx'>  * @read:		try to get a specified number of bytes (must exist)</div><div class='ctx'>  * @data_available:	indicates how much data is available for reading from</div><div class='ctx'>  *			the buffer.</div><div class='hunk'>@@ -39,6 +44,17 @@ struct iio_buffer;</div><div class='ctx'>  *                      device stops sampling. Calles are balanced with @enable.</div><div class='ctx'>  * @release:		called when the last reference to the buffer is dropped,</div><div class='ctx'>  *			should free all resources allocated by the buffer.</div><div class='add'>+ * @attach_dmabuf:	called from userspace via ioctl to attach one external</div><div class='add'>+ *			DMABUF.</div><div class='add'>+ * @detach_dmabuf:	called from userspace via ioctl to detach one previously</div><div class='add'>+ *			attached DMABUF.</div><div class='add'>+ * @enqueue_dmabuf:	called from userspace via ioctl to queue this DMABUF</div><div class='add'>+ *			object to this buffer. Requires a valid DMABUF fd, that</div><div class='add'>+ *			was previouly attached to this buffer.</div><div class='add'>+ * @get_dma_dev:	called to get the DMA channel associated with this buffer.</div><div class='add'>+ * @lock_queue:		called when the core needs to lock the buffer queue;</div><div class='add'>+ *                      it is used when enqueueing DMABUF objects.</div><div class='add'>+ * @unlock_queue:       used to unlock a previously locked buffer queue</div><div class='ctx'>  * @modes:		Supported operating modes by this buffer type</div><div class='ctx'>  * @flags:		A bitmask combination of INDIO_BUFFER_FLAG_*</div><div class='ctx'>  *</div><div class='hunk'>@@ -68,6 +84,18 @@ struct iio_buffer_access_funcs {</div><div class='ctx'> </div><div class='ctx'> 	void (*release)(struct iio_buffer *buffer);</div><div class='ctx'> </div><div class='add'>+	struct iio_dma_buffer_block * (*attach_dmabuf)(struct iio_buffer *buffer,</div><div class='add'>+						       struct dma_buf_attachment *attach);</div><div class='add'>+	void (*detach_dmabuf)(struct iio_buffer *buffer,</div><div class='add'>+			      struct iio_dma_buffer_block *block);</div><div class='add'>+	int (*enqueue_dmabuf)(struct iio_buffer *buffer,</div><div class='add'>+			      struct iio_dma_buffer_block *block,</div><div class='add'>+			      struct dma_fence *fence, struct sg_table *sgt,</div><div class='add'>+			      size_t size, bool cyclic);</div><div class='add'>+	struct device * (*get_dma_dev)(struct iio_buffer *buffer);</div><div class='add'>+	void (*lock_queue)(struct iio_buffer *buffer);</div><div class='add'>+	void (*unlock_queue)(struct iio_buffer *buffer);</div><div class='add'>+</div><div class='ctx'> 	unsigned int modes;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> };</div><div class='hunk'>@@ -136,6 +164,12 @@ struct iio_buffer {</div><div class='ctx'> </div><div class='ctx'> 	/* @ref: Reference count of the buffer. */</div><div class='ctx'> 	struct kref ref;</div><div class='add'>+</div><div class='add'>+	/* @dmabufs: List of DMABUF attachments */</div><div class='add'>+	struct list_head dmabufs; /* P: dmabufs_mutex */</div><div class='add'>+</div><div class='add'>+	/* @dmabufs_mutex: Protects dmabufs */</div><div class='add'>+	struct mutex dmabufs_mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -159,6 +193,8 @@ void iio_buffer_init(struct iio_buffer *buffer);</div><div class='ctx'> struct iio_buffer *iio_buffer_get(struct iio_buffer *buffer);</div><div class='ctx'> void iio_buffer_put(struct iio_buffer *buffer);</div><div class='ctx'> </div><div class='add'>+void iio_buffer_signal_dmabuf_done(struct dma_fence *fence, int ret);</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_IIO_BUFFER */</div><div class='ctx'> </div><div class='ctx'> static inline void iio_buffer_get(struct iio_buffer *buffer) {}</div><div class='head'>diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h<br/>index e72167b96d27..bb966abcde53 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/common/cros_ec_sensors_core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/common/cros_ec_sensors_core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/common/cros_ec_sensors_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/common/cros_ec_sensors_core.h</a></div><div class='hunk'>@@ -126,5 +126,6 @@ extern const struct dev_pm_ops cros_ec_sensors_pm_ops;</div><div class='ctx'> </div><div class='ctx'> /* List of extended channel specification for all sensors. */</div><div class='ctx'> extern const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[];</div><div class='add'>+extern const struct iio_chan_spec_ext_info cros_ec_sensors_limited_info[];</div><div class='ctx'> </div><div class='ctx'> #endif  /* __CROS_EC_SENSORS_CORE_H */</div><div class='head'>diff --git a/include/linux/iio/common/inv_sensors_timestamp.h b/include/linux/iio/common/inv_sensors_timestamp.h<br/>index a47d304d1ba7..8d506f1e9df2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/common/inv_sensors_timestamp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/common/inv_sensors_timestamp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/common/inv_sensors_timestamp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/common/inv_sensors_timestamp.h</a></div><div class='hunk'>@@ -71,8 +71,7 @@ int inv_sensors_timestamp_update_odr(struct inv_sensors_timestamp *ts,</div><div class='ctx'> 				     uint32_t period, bool fifo);</div><div class='ctx'> </div><div class='ctx'> void inv_sensors_timestamp_interrupt(struct inv_sensors_timestamp *ts,</div><div class='del'>-				     uint32_t fifo_period, size_t fifo_nb,</div><div class='del'>-				     size_t sensor_nb, int64_t timestamp);</div><div class='add'>+				     size_t sample_nb, int64_t timestamp);</div><div class='ctx'> </div><div class='ctx'> static inline int64_t inv_sensors_timestamp_pop(struct inv_sensors_timestamp *ts)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h<br/>index e9910b41d48e..5039558267e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/consumer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/consumer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/consumer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/consumer.h</a></div><div class='hunk'>@@ -131,7 +131,8 @@ struct iio_cb_buffer;</div><div class='ctx'> /**</div><div class='ctx'>  * iio_channel_get_all_cb() - register callback for triggered capture</div><div class='ctx'>  * @dev:		Pointer to client device.</div><div class='del'>- * @cb:			Callback function.</div><div class='add'>+ * @cb:			Callback function. Must be safe to call from any context</div><div class='add'>+ *			(e.g. must not sleep).</div><div class='ctx'>  * @private:		Private data passed to callback.</div><div class='ctx'>  *</div><div class='ctx'>  * NB right now we have no ability to mux data from multiple devices.</div><div class='hunk'>@@ -382,6 +383,24 @@ int iio_read_channel_scale(struct iio_channel *chan, int *val,</div><div class='ctx'> 			   int *val2);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * iio_multiply_value() - Multiply an IIO value</div><div class='add'>+ * @result:	Destination pointer for the multiplication result</div><div class='add'>+ * @multiplier:	Multiplier.</div><div class='add'>+ * @type:	One of the IIO_VAL_* constants. This decides how the @val and</div><div class='add'>+ *		@val2 parameters are interpreted.</div><div class='add'>+ * @val:	Value being multiplied.</div><div class='add'>+ * @val2:	Value being multiplied. @val2 use depends on type.</div><div class='add'>+ *</div><div class='add'>+ * Multiply an IIO value with a s64 multiplier storing the result as</div><div class='add'>+ * IIO_VAL_INT. This is typically used for scaling.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * IIO_VAL_INT on success or a negative error-number on failure.</div><div class='add'>+ */</div><div class='add'>+int iio_multiply_value(int *result, s64 multiplier,</div><div class='add'>+		       unsigned int type, int val, int val2);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * iio_convert_raw_to_processed() - Converts a raw value to a processed value</div><div class='ctx'>  * @chan:		The channel being queried</div><div class='ctx'>  * @raw:		The raw IIO to convert</div><div class='hunk'>@@ -418,7 +437,7 @@ unsigned int iio_get_channel_ext_info_count(struct iio_channel *chan);</div><div class='ctx'>  * @chan:		The channel being queried.</div><div class='ctx'>  * @attr:		The ext_info attribute to read.</div><div class='ctx'>  * @buf:		Where to store the attribute value. Assumed to hold</div><div class='del'>- *			at least PAGE_SIZE bytes.</div><div class='add'>+ *			at least PAGE_SIZE bytes and to be aligned at PAGE_SIZE.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the number of bytes written to buf (perhaps w/o zero termination;</div><div class='ctx'>  * it need not even be a string), or an error code.</div><div class='hunk'>@@ -441,4 +460,14 @@ ssize_t iio_read_channel_ext_info(struct iio_channel *chan,</div><div class='ctx'> ssize_t iio_write_channel_ext_info(struct iio_channel *chan, const char *attr,</div><div class='ctx'> 				   const char *buf, size_t len);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iio_read_channel_label() - read label for a given channel</div><div class='add'>+ * @chan:		The channel being queried.</div><div class='add'>+ * @buf:		Where to store the attribute value. Assumed to hold</div><div class='add'>+ *			at least PAGE_SIZE bytes and to be aligned at PAGE_SIZE.</div><div class='add'>+ *</div><div class='add'>+ * Returns the number of bytes written to buf, or an error code.</div><div class='add'>+ */</div><div class='add'>+ssize_t iio_read_channel_label(struct iio_channel *chan, char *buf);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iio/driver.h b/include/linux/iio/driver.h<br/>index 7a157ed218f6..7f8b55551ed0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/driver.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@ struct iio_map;</div><div class='ctx'>  * @map:	array of mappings specifying association of channel with client</div><div class='ctx'>  */</div><div class='ctx'> int iio_map_array_register(struct iio_dev *indio_dev,</div><div class='del'>-			   struct iio_map *map);</div><div class='add'>+			   const struct iio_map *map);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iio_map_array_unregister() - tell the core to remove consumer mappings for</div><div class='hunk'>@@ -38,6 +38,7 @@ int iio_map_array_unregister(struct iio_dev *indio_dev);</div><div class='ctx'>  * handle de-registration of the IIO map object when the device's refcount goes to</div><div class='ctx'>  * zero.</div><div class='ctx'>  */</div><div class='del'>-int devm_iio_map_array_register(struct device *dev, struct iio_dev *indio_dev, struct iio_map *maps);</div><div class='add'>+int devm_iio_map_array_register(struct device *dev, struct iio_dev *indio_dev,</div><div class='add'>+				const struct iio_map *maps);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iio/events.h b/include/linux/iio/events.h<br/>index a4558c45a548..72062a0c7c87 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/events.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/events.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/events.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/events.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;uapi/linux/iio/events.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * IIO_EVENT_CODE() - create event identifier</div><div class='add'>+ * _IIO_EVENT_CODE() - create event identifier</div><div class='ctx'>  * @chan_type:	Type of the channel. Should be one of enum iio_chan_type.</div><div class='ctx'>  * @diff:	Whether the event is for an differential channel or not.</div><div class='ctx'>  * @modifier:	Modifier for the channel. Should be one of enum iio_modifier.</div><div class='hunk'>@@ -19,10 +19,13 @@</div><div class='ctx'>  * @chan:	Channel number for non-differential channels.</div><div class='ctx'>  * @chan1:	First channel number for differential channels.</div><div class='ctx'>  * @chan2:	Second channel number for differential channels.</div><div class='add'>+ *</div><div class='add'>+ * Drivers should use the specialized macros below instead of using this one</div><div class='add'>+ * directly.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define IIO_EVENT_CODE(chan_type, diff, modifier, direction,		\</div><div class='del'>-		       type, chan, chan1, chan2)			\</div><div class='add'>+#define _IIO_EVENT_CODE(chan_type, diff, modifier, direction,		\</div><div class='add'>+			type, chan, chan1, chan2)			\</div><div class='ctx'> 	(((u64)type &lt;&lt; 56) | ((u64)diff &lt;&lt; 55) |			\</div><div class='ctx'> 	 ((u64)direction &lt;&lt; 48) | ((u64)modifier &lt;&lt; 40) |		\</div><div class='ctx'> 	 ((u64)chan_type &lt;&lt; 32) | (((u16)chan2) &lt;&lt; 16) | ((u16)chan1) | \</div><div class='hunk'>@@ -30,7 +33,8 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * IIO_MOD_EVENT_CODE() - create event identifier for modified channels</div><div class='add'>+ * IIO_MOD_EVENT_CODE() - create event identifier for modified (non</div><div class='add'>+ * differential) channels</div><div class='ctx'>  * @chan_type:	Type of the channel. Should be one of enum iio_chan_type.</div><div class='ctx'>  * @number:	Channel number.</div><div class='ctx'>  * @modifier:	Modifier for the channel. Should be one of enum iio_modifier.</div><div class='hunk'>@@ -40,10 +44,11 @@</div><div class='ctx'> </div><div class='ctx'> #define IIO_MOD_EVENT_CODE(chan_type, number, modifier,		\</div><div class='ctx'> 			   type, direction)				\</div><div class='del'>-	IIO_EVENT_CODE(chan_type, 0, modifier, direction, type, number, 0, 0)</div><div class='add'>+	_IIO_EVENT_CODE(chan_type, 0, modifier, direction, type, number, 0, 0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * IIO_UNMOD_EVENT_CODE() - create event identifier for unmodified channels</div><div class='add'>+ * IIO_UNMOD_EVENT_CODE() - create event identifier for unmodified (non</div><div class='add'>+ * differential) channels</div><div class='ctx'>  * @chan_type:	Type of the channel. Should be one of enum iio_chan_type.</div><div class='ctx'>  * @number:	Channel number.</div><div class='ctx'>  * @type:	Type of the event. Should be one of enum iio_event_type.</div><div class='hunk'>@@ -51,6 +56,18 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define IIO_UNMOD_EVENT_CODE(chan_type, number, type, direction)	\</div><div class='del'>-	IIO_EVENT_CODE(chan_type, 0, 0, direction, type, number, 0, 0)</div><div class='add'>+	_IIO_EVENT_CODE(chan_type, 0, 0, direction, type, number, 0, 0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * IIO_DIFF_EVENT_CODE() - create event identifier for differential channels</div><div class='add'>+ * @chan_type:	Type of the channel. Should be one of enum iio_chan_type.</div><div class='add'>+ * @chan1:	First channel number for differential channels.</div><div class='add'>+ * @chan2:	Second channel number for differential channels.</div><div class='add'>+ * @type:	Type of the event. Should be one of enum iio_event_type.</div><div class='add'>+ * @direction:	Direction of the event. One of enum iio_event_direction.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define IIO_DIFF_EVENT_CODE(chan_type, chan1, chan2, type, direction)	\</div><div class='add'>+	_IIO_EVENT_CODE(chan_type, 1, 0, direction, type, 0, chan1, chan2)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iio/frequency/adf4350.h b/include/linux/iio/frequency/adf4350.h<br/>index de45cf2ee1e4..ce2086f97e3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/frequency/adf4350.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/frequency/adf4350.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/frequency/adf4350.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/frequency/adf4350.h</a></div><div class='hunk'>@@ -51,7 +51,7 @@</div><div class='ctx'> </div><div class='ctx'> /* REG3 Bit Definitions */</div><div class='ctx'> #define ADF4350_REG3_12BIT_CLKDIV(x)		((x) &lt;&lt; 3)</div><div class='del'>-#define ADF4350_REG3_12BIT_CLKDIV_MODE(x)	((x) &lt;&lt; 16)</div><div class='add'>+#define ADF4350_REG3_12BIT_CLKDIV_MODE(x)	((x) &lt;&lt; 15)</div><div class='ctx'> #define ADF4350_REG3_12BIT_CSR_EN		(1 &lt;&lt; 18)</div><div class='ctx'> #define ADF4351_REG3_CHARGE_CANCELLATION_EN	(1 &lt;&lt; 21)</div><div class='ctx'> #define ADF4351_REG3_ANTI_BACKLASH_3ns_EN	(1 &lt;&lt; 22)</div><div class='head'>diff --git a/include/linux/iio/iio-gts-helper.h b/include/linux/iio/iio-gts-helper.h<br/>index 9cb6c80dea71..66f830ab9b49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/iio-gts-helper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/iio-gts-helper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/iio-gts-helper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/iio-gts-helper.h</a></div><div class='hunk'>@@ -188,6 +188,9 @@ int iio_gts_total_gain_to_scale(struct iio_gts *gts, int total_gain,</div><div class='ctx'> int iio_gts_find_gain_sel_for_scale_using_time(struct iio_gts *gts, int time_sel,</div><div class='ctx'> 					       int scale_int, int scale_nano,</div><div class='ctx'> 					       int *gain_sel);</div><div class='add'>+int iio_gts_find_gain_time_sel_for_scale(struct iio_gts *gts, int scale_int,</div><div class='add'>+					 int scale_nano, int *gain_sel,</div><div class='add'>+					 int *time_sel);</div><div class='ctx'> int iio_gts_get_scale(struct iio_gts *gts, int gain, int time, int *scale_int,</div><div class='ctx'> 		      int *scale_nano);</div><div class='ctx'> int iio_gts_find_new_gain_sel_by_old_gain_time(struct iio_gts *gts,</div><div class='hunk'>@@ -196,11 +199,15 @@ int iio_gts_find_new_gain_sel_by_old_gain_time(struct iio_gts *gts,</div><div class='ctx'> int iio_gts_find_new_gain_by_old_gain_time(struct iio_gts *gts, int old_gain,</div><div class='ctx'> 					   int old_time, int new_time,</div><div class='ctx'> 					   int *new_gain);</div><div class='add'>+int iio_gts_find_new_gain_by_gain_time_min(struct iio_gts *gts, int old_gain,</div><div class='add'>+					   int old_time, int new_time,</div><div class='add'>+					   int *new_gain, bool *in_range);</div><div class='ctx'> int iio_gts_avail_times(struct iio_gts *gts,  const int **vals, int *type,</div><div class='ctx'> 			int *length);</div><div class='ctx'> int iio_gts_all_avail_scales(struct iio_gts *gts, const int **vals, int *type,</div><div class='ctx'> 			     int *length);</div><div class='ctx'> int iio_gts_avail_scales_for_time(struct iio_gts *gts, int time,</div><div class='ctx'> 				  const int **vals, int *type, int *length);</div><div class='add'>+int iio_gts_get_total_gain(struct iio_gts *gts, int gain, int time);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iio/iio-opaque.h b/include/linux/iio/iio-opaque.h<br/>index 5aec3945555b..4247497f3f8b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/iio-opaque.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/iio-opaque.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/iio-opaque.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/iio-opaque.h</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'>  * @groupcounter:		index of next attribute group</div><div class='ctx'>  * @legacy_scan_el_group:	attribute group for legacy scan elements attribute group</div><div class='ctx'>  * @legacy_buffer_group:	attribute group for legacy buffer attributes group</div><div class='del'>- * @bounce_buffer:		for devices that call iio_push_to_buffers_with_timestamp_unaligned()</div><div class='add'>+ * @bounce_buffer:		for devices that call iio_push_to_buffers_with_ts_unaligned()</div><div class='ctx'>  * @bounce_buffer_size:		size of currently allocate bounce buffer</div><div class='ctx'>  * @scan_index_timestamp:	cache of the index to the timestamp</div><div class='ctx'>  * @clock_id:			timestamping clock posix identifier</div><div class='hunk'>@@ -70,7 +70,7 @@ struct iio_dev_opaque {</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DEBUG_FS)</div><div class='ctx'> 	struct dentry			*debugfs_dentry;</div><div class='del'>-	unsigned			cached_reg_addr;</div><div class='add'>+	unsigned int			cached_reg_addr;</div><div class='ctx'> 	char				read_buf[20];</div><div class='ctx'> 	unsigned int			read_buf_len;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h<br/>index c5b36d2c1e73..872ebdf0dd77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/iio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/iio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/iio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/iio.h</a></div><div class='hunk'>@@ -7,8 +7,11 @@</div><div class='ctx'> #ifndef _INDUSTRIAL_IO_H_</div><div class='ctx'> #define _INDUSTRIAL_IO_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/align.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/iio/types.h&gt;</div><div class='ctx'> /* IIO TODO LIST */</div><div class='hunk'>@@ -173,6 +176,27 @@ struct iio_event_spec {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct iio_scan_type - specification for channel data format in buffer</div><div class='add'>+ * @sign:		's' or 'u' to specify signed or unsigned</div><div class='add'>+ * @realbits:		Number of valid bits of data</div><div class='add'>+ * @storagebits:	Realbits + padding</div><div class='add'>+ * @shift:		Shift right by this before masking out realbits.</div><div class='add'>+ * @repeat:		Number of times real/storage bits repeats. When the</div><div class='add'>+ *			repeat element is more than 1, then the type element in</div><div class='add'>+ *			sysfs will show a repeat value. Otherwise, the number</div><div class='add'>+ *			of repetitions is omitted.</div><div class='add'>+ * @endianness:		little or big endian</div><div class='add'>+ */</div><div class='add'>+struct iio_scan_type {</div><div class='add'>+	char	sign;</div><div class='add'>+	u8	realbits;</div><div class='add'>+	u8	storagebits;</div><div class='add'>+	u8	shift;</div><div class='add'>+	u8	repeat;</div><div class='add'>+	enum iio_endian endianness;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iio_chan_spec - specification of a single channel</div><div class='ctx'>  * @type:		What type of measurement is the channel making.</div><div class='ctx'>  * @channel:		What number do we wish to assign the channel.</div><div class='hunk'>@@ -182,18 +206,13 @@ struct iio_event_spec {</div><div class='ctx'>  * @address:		Driver specific identifier.</div><div class='ctx'>  * @scan_index:		Monotonic index to give ordering in scans when read</div><div class='ctx'>  *			from a buffer.</div><div class='del'>- * @scan_type:		struct describing the scan type</div><div class='del'>- * @scan_type.sign:		's' or 'u' to specify signed or unsigned</div><div class='del'>- * @scan_type.realbits:		Number of valid bits of data</div><div class='del'>- * @scan_type.storagebits:	Realbits + padding</div><div class='del'>- * @scan_type.shift:		Shift right by this before masking out</div><div class='del'>- *				realbits.</div><div class='del'>- * @scan_type.repeat:		Number of times real/storage bits repeats.</div><div class='del'>- *				When the repeat element is more than 1, then</div><div class='del'>- *				the type element in sysfs will show a repeat</div><div class='del'>- *				value. Otherwise, the number of repetitions</div><div class='del'>- *				is omitted.</div><div class='del'>- * @scan_type.endianness:	little or big endian</div><div class='add'>+ * @scan_type:		struct describing the scan type - mutually exclusive</div><div class='add'>+ *			with ext_scan_type.</div><div class='add'>+ * @ext_scan_type:	Used in rare cases where there is more than one scan</div><div class='add'>+ *			format for a channel. When this is used, the flag</div><div class='add'>+ *			has_ext_scan_type must be set and the driver must</div><div class='add'>+ *			implement get_current_scan_type in struct iio_info.</div><div class='add'>+ * @num_ext_scan_type:	Number of elements in ext_scan_type.</div><div class='ctx'>  * @info_mask_separate: What information is to be exported that is specific to</div><div class='ctx'>  *			this channel.</div><div class='ctx'>  * @info_mask_separate_available: What availability information is to be</div><div class='hunk'>@@ -237,6 +256,7 @@ struct iio_event_spec {</div><div class='ctx'>  *			attributes but not for event codes.</div><div class='ctx'>  * @output:		Channel is output.</div><div class='ctx'>  * @differential:	Channel is differential.</div><div class='add'>+ * @has_ext_scan_type:	True if ext_scan_type is used instead of scan_type.</div><div class='ctx'>  */</div><div class='ctx'> struct iio_chan_spec {</div><div class='ctx'> 	enum iio_chan_type	type;</div><div class='hunk'>@@ -244,31 +264,31 @@ struct iio_chan_spec {</div><div class='ctx'> 	int			channel2;</div><div class='ctx'> 	unsigned long		address;</div><div class='ctx'> 	int			scan_index;</div><div class='del'>-	struct {</div><div class='del'>-		char	sign;</div><div class='del'>-		u8	realbits;</div><div class='del'>-		u8	storagebits;</div><div class='del'>-		u8	shift;</div><div class='del'>-		u8	repeat;</div><div class='del'>-		enum iio_endian endianness;</div><div class='del'>-	} scan_type;</div><div class='del'>-	long			info_mask_separate;</div><div class='del'>-	long			info_mask_separate_available;</div><div class='del'>-	long			info_mask_shared_by_type;</div><div class='del'>-	long			info_mask_shared_by_type_available;</div><div class='del'>-	long			info_mask_shared_by_dir;</div><div class='del'>-	long			info_mask_shared_by_dir_available;</div><div class='del'>-	long			info_mask_shared_by_all;</div><div class='del'>-	long			info_mask_shared_by_all_available;</div><div class='add'>+	union {</div><div class='add'>+		struct iio_scan_type scan_type;</div><div class='add'>+		struct {</div><div class='add'>+			const struct iio_scan_type *ext_scan_type;</div><div class='add'>+			unsigned int num_ext_scan_type;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	unsigned long			info_mask_separate;</div><div class='add'>+	unsigned long			info_mask_separate_available;</div><div class='add'>+	unsigned long			info_mask_shared_by_type;</div><div class='add'>+	unsigned long			info_mask_shared_by_type_available;</div><div class='add'>+	unsigned long			info_mask_shared_by_dir;</div><div class='add'>+	unsigned long			info_mask_shared_by_dir_available;</div><div class='add'>+	unsigned long			info_mask_shared_by_all;</div><div class='add'>+	unsigned long			info_mask_shared_by_all_available;</div><div class='ctx'> 	const struct iio_event_spec *event_spec;</div><div class='ctx'> 	unsigned int		num_event_specs;</div><div class='ctx'> 	const struct iio_chan_spec_ext_info *ext_info;</div><div class='ctx'> 	const char		*extend_name;</div><div class='ctx'> 	const char		*datasheet_name;</div><div class='del'>-	unsigned		modified:1;</div><div class='del'>-	unsigned		indexed:1;</div><div class='del'>-	unsigned		output:1;</div><div class='del'>-	unsigned		differential:1;</div><div class='add'>+	unsigned int		modified:1;</div><div class='add'>+	unsigned int		indexed:1;</div><div class='add'>+	unsigned int		output:1;</div><div class='add'>+	unsigned int		differential:1;</div><div class='add'>+	unsigned int		has_ext_scan_type:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -431,6 +451,9 @@ struct iio_trigger; /* forward declaration */</div><div class='ctx'>  *			for better event identification.</div><div class='ctx'>  * @validate_trigger:	function to validate the trigger when the</div><div class='ctx'>  *			current trigger gets changed.</div><div class='add'>+ * @get_current_scan_type: must be implemented by drivers that use ext_scan_type</div><div class='add'>+ *			in the channel spec to return the index of the currently</div><div class='add'>+ *			active ext_scan type for a channel.</div><div class='ctx'>  * @update_scan_mode:	function to configure device and scan buffer when</div><div class='ctx'>  *			channels have changed</div><div class='ctx'>  * @debugfs_reg_access:	function to read or write register value of device</div><div class='hunk'>@@ -493,7 +516,7 @@ struct iio_info {</div><div class='ctx'> 				  const struct iio_chan_spec *chan,</div><div class='ctx'> 				  enum iio_event_type type,</div><div class='ctx'> 				  enum iio_event_direction dir,</div><div class='del'>-				  int state);</div><div class='add'>+				  bool state);</div><div class='ctx'> </div><div class='ctx'> 	int (*read_event_value)(struct iio_dev *indio_dev,</div><div class='ctx'> 				const struct iio_chan_spec *chan,</div><div class='hunk'>@@ -515,16 +538,18 @@ struct iio_info {</div><div class='ctx'> </div><div class='ctx'> 	int (*validate_trigger)(struct iio_dev *indio_dev,</div><div class='ctx'> 				struct iio_trigger *trig);</div><div class='add'>+	int (*get_current_scan_type)(const struct iio_dev *indio_dev,</div><div class='add'>+				     const struct iio_chan_spec *chan);</div><div class='ctx'> 	int (*update_scan_mode)(struct iio_dev *indio_dev,</div><div class='ctx'> 				const unsigned long *scan_mask);</div><div class='ctx'> 	int (*debugfs_reg_access)(struct iio_dev *indio_dev,</div><div class='del'>-				  unsigned reg, unsigned writeval,</div><div class='del'>-				  unsigned *readval);</div><div class='add'>+				  unsigned int reg, unsigned int writeval,</div><div class='add'>+				  unsigned int *readval);</div><div class='ctx'> 	int (*fwnode_xlate)(struct iio_dev *indio_dev,</div><div class='ctx'> 			    const struct fwnode_reference_args *iiospec);</div><div class='del'>-	int (*hwfifo_set_watermark)(struct iio_dev *indio_dev, unsigned val);</div><div class='add'>+	int (*hwfifo_set_watermark)(struct iio_dev *indio_dev, unsigned int val);</div><div class='ctx'> 	int (*hwfifo_flush_to_buffer)(struct iio_dev *indio_dev,</div><div class='del'>-				      unsigned count);</div><div class='add'>+				      unsigned int count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -586,9 +611,9 @@ struct iio_dev {</div><div class='ctx'> 	int				scan_bytes;</div><div class='ctx'> </div><div class='ctx'> 	const unsigned long		*available_scan_masks;</div><div class='del'>-	unsigned			masklength;</div><div class='add'>+	unsigned int			__private masklength;</div><div class='ctx'> 	const unsigned long		*active_scan_mask;</div><div class='del'>-	bool				scan_timestamp;</div><div class='add'>+	bool				__private scan_timestamp;</div><div class='ctx'> 	struct iio_trigger		*trig;</div><div class='ctx'> 	struct iio_poll_func		*pollfunc;</div><div class='ctx'> 	struct iio_poll_func		*pollfunc_event;</div><div class='hunk'>@@ -601,7 +626,7 @@ struct iio_dev {</div><div class='ctx'> 	const struct iio_info		*info;</div><div class='ctx'> 	const struct iio_buffer_setup_ops	*setup_ops;</div><div class='ctx'> </div><div class='del'>-	void				*priv;</div><div class='add'>+	void				*__private priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int iio_device_id(struct iio_dev *indio_dev);</div><div class='hunk'>@@ -636,12 +661,36 @@ void iio_device_unregister(struct iio_dev *indio_dev);</div><div class='ctx'> int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,</div><div class='ctx'> 			       struct module *this_mod);</div><div class='ctx'> int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp);</div><div class='del'>-int iio_device_claim_direct_mode(struct iio_dev *indio_dev);</div><div class='del'>-void iio_device_release_direct_mode(struct iio_dev *indio_dev);</div><div class='add'>+bool __iio_device_claim_direct(struct iio_dev *indio_dev);</div><div class='add'>+void __iio_device_release_direct(struct iio_dev *indio_dev);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper functions that allow claim and release of direct mode</div><div class='add'>+ * in a fashion that doesn't generate many false positives from sparse.</div><div class='add'>+ * Note this must remain static inline in the header so that sparse</div><div class='add'>+ * can see the __acquire() marking. Revisit when sparse supports</div><div class='add'>+ * __cond_acquires()</div><div class='add'>+ */</div><div class='add'>+static inline bool iio_device_claim_direct(struct iio_dev *indio_dev)</div><div class='add'>+{</div><div class='add'>+	if (!__iio_device_claim_direct(indio_dev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	__acquire(iio_dev);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iio_device_release_direct(struct iio_dev *indio_dev)</div><div class='add'>+{</div><div class='add'>+	__iio_device_release_direct(indio_dev);</div><div class='add'>+	__release(indio_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int iio_device_claim_buffer_mode(struct iio_dev *indio_dev);</div><div class='ctx'> void iio_device_release_buffer_mode(struct iio_dev *indio_dev);</div><div class='ctx'> </div><div class='del'>-extern struct bus_type iio_bus_type;</div><div class='add'>+extern const struct bus_type iio_bus_type;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iio_device_put() - reference counted deallocation of struct device</div><div class='hunk'>@@ -728,14 +777,51 @@ static inline void *iio_device_get_drvdata(const struct iio_dev *indio_dev)</div><div class='ctx'>  * to in turn include IIO_DMA_MINALIGN'd elements such as buffers which</div><div class='ctx'>  * must not share  cachelines with the rest of the structure, thus making</div><div class='ctx'>  * them safe for use with non-coherent DMA.</div><div class='add'>+ *</div><div class='add'>+ * A number of drivers also use this on buffers that include a 64-bit timestamp</div><div class='add'>+ * that is used with iio_push_to_buffers_with_ts(). Therefore, in the case where</div><div class='add'>+ * DMA alignment is not sufficient for proper timestamp alignment, we align to</div><div class='add'>+ * 8 bytes instead.</div><div class='ctx'>  */</div><div class='del'>-#define IIO_DMA_MINALIGN ARCH_DMA_MINALIGN</div><div class='add'>+#define IIO_DMA_MINALIGN MAX(ARCH_DMA_MINALIGN, sizeof(s64))</div><div class='add'>+</div><div class='add'>+#define __IIO_DECLARE_BUFFER_WITH_TS(type, name, count) \</div><div class='add'>+	type name[ALIGN((count), sizeof(s64) / sizeof(type)) + sizeof(s64) / sizeof(type)]</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * IIO_DECLARE_BUFFER_WITH_TS() - Declare a buffer with timestamp</div><div class='add'>+ * @type: element type of the buffer</div><div class='add'>+ * @name: identifier name of the buffer</div><div class='add'>+ * @count: number of elements in the buffer</div><div class='add'>+ *</div><div class='add'>+ * Declares a buffer that is safe to use with iio_push_to_buffers_with_ts(). In</div><div class='add'>+ * addition to allocating enough space for @count elements of @type, it also</div><div class='add'>+ * allocates space for a s64 timestamp at the end of the buffer and ensures</div><div class='add'>+ * proper alignment of the timestamp.</div><div class='add'>+ */</div><div class='add'>+#define IIO_DECLARE_BUFFER_WITH_TS(type, name, count) \</div><div class='add'>+	__IIO_DECLARE_BUFFER_WITH_TS(type, name, count) __aligned(sizeof(s64))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * IIO_DECLARE_DMA_BUFFER_WITH_TS() - Declare a DMA-aligned buffer with timestamp</div><div class='add'>+ * @type: element type of the buffer</div><div class='add'>+ * @name: identifier name of the buffer</div><div class='add'>+ * @count: number of elements in the buffer</div><div class='add'>+ *</div><div class='add'>+ * Same as IIO_DECLARE_BUFFER_WITH_TS(), but is uses __aligned(IIO_DMA_MINALIGN)</div><div class='add'>+ * to ensure that the buffer doesn't share cachelines with anything that comes</div><div class='add'>+ * before it in a struct. This should not be used for stack-allocated buffers</div><div class='add'>+ * as stack memory cannot generally be used for DMA.</div><div class='add'>+ */</div><div class='add'>+#define IIO_DECLARE_DMA_BUFFER_WITH_TS(type, name, count) \</div><div class='add'>+	__IIO_DECLARE_BUFFER_WITH_TS(type, name, count) __aligned(IIO_DMA_MINALIGN)</div><div class='add'>+</div><div class='ctx'> struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv);</div><div class='ctx'> </div><div class='ctx'> /* The information at the returned address is guaranteed to be cacheline aligned */</div><div class='ctx'> static inline void *iio_priv(const struct iio_dev *indio_dev)</div><div class='ctx'> {</div><div class='del'>-	return indio_dev-&gt;priv;</div><div class='add'>+	return ACCESS_PRIVATE(indio_dev, priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iio_device_free(struct iio_dev *indio_dev);</div><div class='hunk'>@@ -760,6 +846,98 @@ static inline struct dentry *iio_get_debugfs_dentry(struct iio_dev *indio_dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iio_device_suspend_triggering() - suspend trigger attached to an iio_dev</div><div class='add'>+ * @indio_dev: iio_dev associated with the device that will have triggers suspended</div><div class='add'>+ *</div><div class='add'>+ * Return 0 if successful, negative otherwise</div><div class='add'>+ **/</div><div class='add'>+int iio_device_suspend_triggering(struct iio_dev *indio_dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iio_device_resume_triggering() - resume trigger attached to an iio_dev</div><div class='add'>+ *	that was previously suspended with iio_device_suspend_triggering()</div><div class='add'>+ * @indio_dev: iio_dev associated with the device that will have triggers resumed</div><div class='add'>+ *</div><div class='add'>+ * Return 0 if successful, negative otherwise</div><div class='add'>+ **/</div><div class='add'>+int iio_device_resume_triggering(struct iio_dev *indio_dev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+bool iio_read_acpi_mount_matrix(struct device *dev,</div><div class='add'>+				struct iio_mount_matrix *orientation,</div><div class='add'>+				char *acpi_method);</div><div class='add'>+const char *iio_get_acpi_device_name_and_data(struct device *dev, const void **data);</div><div class='add'>+#else</div><div class='add'>+static inline bool iio_read_acpi_mount_matrix(struct device *dev,</div><div class='add'>+					      struct iio_mount_matrix *orientation,</div><div class='add'>+					      char *acpi_method)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline const char *</div><div class='add'>+iio_get_acpi_device_name_and_data(struct device *dev, const void **data)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+static inline const char *iio_get_acpi_device_name(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return iio_get_acpi_device_name_and_data(dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iio_get_current_scan_type - Get the current scan type for a channel</div><div class='add'>+ * @indio_dev:	the IIO device to get the scan type for</div><div class='add'>+ * @chan:	the channel to get the scan type for</div><div class='add'>+ *</div><div class='add'>+ * Most devices only have one scan type per channel and can just access it</div><div class='add'>+ * directly without calling this function. Core IIO code and drivers that</div><div class='add'>+ * implement ext_scan_type in the channel spec should use this function to</div><div class='add'>+ * get the current scan type for a channel.</div><div class='add'>+ *</div><div class='add'>+ * Returns: the current scan type for the channel or error.</div><div class='add'>+ */</div><div class='add'>+static inline const struct iio_scan_type</div><div class='add'>+*iio_get_current_scan_type(const struct iio_dev *indio_dev,</div><div class='add'>+			   const struct iio_chan_spec *chan)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (chan-&gt;has_ext_scan_type) {</div><div class='add'>+		ret = indio_dev-&gt;info-&gt;get_current_scan_type(indio_dev, chan);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+		if (ret &gt;= chan-&gt;num_ext_scan_type)</div><div class='add'>+			return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+		return &amp;chan-&gt;ext_scan_type[ret];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;chan-&gt;scan_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iio_get_masklength - Get length of the channels mask</div><div class='add'>+ * @indio_dev: the IIO device to get the masklength for</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int iio_get_masklength(const struct iio_dev *indio_dev)</div><div class='add'>+{</div><div class='add'>+	return ACCESS_PRIVATE(indio_dev, masklength);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iio_active_scan_mask_index(struct iio_dev *indio_dev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iio_for_each_active_channel - Iterated over active channels</div><div class='add'>+ * @indio_dev: the IIO device</div><div class='add'>+ * @chan: Holds the index of the enabled channel</div><div class='add'>+ */</div><div class='add'>+#define iio_for_each_active_channel(indio_dev, chan) \</div><div class='add'>+	for_each_set_bit((chan), (indio_dev)-&gt;active_scan_mask, \</div><div class='add'>+			 iio_get_masklength(indio_dev))</div><div class='add'>+</div><div class='ctx'> ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals);</div><div class='ctx'> </div><div class='ctx'> int iio_str_to_fixpoint(const char *str, int fract_mult, int *integer,</div><div class='head'>diff --git a/include/linux/iio/imu/adis.h b/include/linux/iio/imu/adis.h<br/>index 8898966bc0f0..bfb6df68e6c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/imu/adis.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/imu/adis.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/imu/adis.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/imu/adis.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #ifndef __IIO_ADIS_H__</div><div class='ctx'> #define __IIO_ADIS_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/iio/iio.h&gt;</div><div class='hunk'>@@ -21,6 +22,7 @@</div><div class='ctx'> #define ADIS_REG_PAGE_ID 0x00</div><div class='ctx'> </div><div class='ctx'> struct adis;</div><div class='add'>+struct iio_dev_attr;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct adis_timeouts - ADIS chip variant timeouts</div><div class='hunk'>@@ -42,6 +44,8 @@ struct adis_timeout {</div><div class='ctx'>  * @glob_cmd_reg: Register address of the GLOB_CMD register</div><div class='ctx'>  * @msc_ctrl_reg: Register address of the MSC_CTRL register</div><div class='ctx'>  * @diag_stat_reg: Register address of the DIAG_STAT register</div><div class='add'>+ * @diag_stat_size:	Length (in bytes) of the DIAG_STAT register. If 0 the</div><div class='add'>+ *			default length is 2 bytes long.</div><div class='ctx'>  * @prod_id_reg: Register address of the PROD_ID register</div><div class='ctx'>  * @prod_id: Product ID code that should be expected when reading @prod_id_reg</div><div class='ctx'>  * @self_test_mask: Bitmask of supported self-test operations</div><div class='hunk'>@@ -53,6 +57,7 @@ struct adis_timeout {</div><div class='ctx'>  * @enable_irq: Hook for ADIS devices that have a special IRQ enable/disable</div><div class='ctx'>  * @unmasked_drdy: True for devices that cannot mask/unmask the data ready pin</div><div class='ctx'>  * @has_paging: True if ADIS device has paged registers</div><div class='add'>+ * @has_fifo: True if ADIS device has a hardware FIFO</div><div class='ctx'>  * @burst_reg_cmd:	Register command that triggers burst</div><div class='ctx'>  * @burst_len:		Burst size in the SPI RX buffer. If @burst_max_len is defined,</div><div class='ctx'>  *			this should be the minimum size supported by the device.</div><div class='hunk'>@@ -68,6 +73,7 @@ struct adis_data {</div><div class='ctx'> 	unsigned int glob_cmd_reg;</div><div class='ctx'> 	unsigned int msc_ctrl_reg;</div><div class='ctx'> 	unsigned int diag_stat_reg;</div><div class='add'>+	unsigned int diag_stat_size;</div><div class='ctx'> 	unsigned int prod_id_reg;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int prod_id;</div><div class='hunk'>@@ -84,6 +90,7 @@ struct adis_data {</div><div class='ctx'> 	bool unmasked_drdy;</div><div class='ctx'> </div><div class='ctx'> 	bool has_paging;</div><div class='add'>+	bool has_fifo;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int burst_reg_cmd;</div><div class='ctx'> 	unsigned int burst_len;</div><div class='hunk'>@@ -92,13 +99,28 @@ struct adis_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct adis_ops: Custom ops for adis devices.</div><div class='add'>+ * @write: Custom spi write implementation.</div><div class='add'>+ * @read: Custom spi read implementation.</div><div class='add'>+ * @reset: Custom sw reset implementation. The custom implementation does not</div><div class='add'>+ *	   need to sleep after the reset. It's done by the library already.</div><div class='add'>+ */</div><div class='add'>+struct adis_ops {</div><div class='add'>+	int (*write)(struct adis *adis, unsigned int reg, unsigned int value,</div><div class='add'>+		     unsigned int size);</div><div class='add'>+	int (*read)(struct adis *adis, unsigned int reg, unsigned int *value,</div><div class='add'>+		    unsigned int size);</div><div class='add'>+	int (*reset)(struct adis *adis);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct adis - ADIS device instance data</div><div class='ctx'>  * @spi: Reference to SPI device which owns this ADIS IIO device</div><div class='ctx'>  * @trig: IIO trigger object data</div><div class='ctx'>  * @data: ADIS chip variant specific data</div><div class='del'>- * @burst: ADIS burst transfer information</div><div class='ctx'>  * @burst_extra_len: Burst extra length. Should only be used by devices that can</div><div class='ctx'>  *		     dynamically change their burst mode length.</div><div class='add'>+ * @ops: ops struct for custom read and write functions</div><div class='ctx'>  * @state_lock: Lock used by the device to protect state</div><div class='ctx'>  * @msg: SPI message object</div><div class='ctx'>  * @xfer: SPI transfer objects to be used for a @msg</div><div class='hunk'>@@ -114,7 +136,8 @@ struct adis {</div><div class='ctx'> </div><div class='ctx'> 	const struct adis_data	*data;</div><div class='ctx'> 	unsigned int		burst_extra_len;</div><div class='del'>-	/**</div><div class='add'>+	const struct adis_ops	*ops;</div><div class='add'>+	/*</div><div class='ctx'> 	 * The state_lock is meant to be used during operations that require</div><div class='ctx'> 	 * a sequence of SPI R/W in order to protect the SPI transfer</div><div class='ctx'> 	 * information (fields 'xfer', 'msg' &amp; 'current_page') between</div><div class='hunk'>@@ -144,17 +167,12 @@ int __adis_reset(struct adis *adis);</div><div class='ctx'>  * adis_reset() - Reset the device</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success, a negative error code otherwise</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int adis_reset(struct adis *adis)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;adis-&gt;state_lock);</div><div class='del'>-	ret = __adis_reset(adis);</div><div class='del'>-	mutex_unlock(&amp;adis-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	guard(mutex)(&amp;adis-&gt;state_lock);</div><div class='add'>+	return __adis_reset(adis);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __adis_write_reg(struct adis *adis, unsigned int reg,</div><div class='hunk'>@@ -166,36 +184,42 @@ int __adis_read_reg(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * __adis_write_reg_8() - Write single byte to a register (unlocked)</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the register to be written</div><div class='del'>- * @value: The value to write</div><div class='add'>+ * @val: The value to write</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int __adis_write_reg_8(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				     u8 val)</div><div class='ctx'> {</div><div class='del'>-	return __adis_write_reg(adis, reg, val, 1);</div><div class='add'>+	return adis-&gt;ops-&gt;write(adis, reg, val, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __adis_write_reg_16() - Write 2 bytes to a pair of registers (unlocked)</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the two registers</div><div class='del'>- * @value: Value to be written</div><div class='add'>+ * @val: Value to be written</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int __adis_write_reg_16(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				      u16 val)</div><div class='ctx'> {</div><div class='del'>-	return __adis_write_reg(adis, reg, val, 2);</div><div class='add'>+	return adis-&gt;ops-&gt;write(adis, reg, val, 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __adis_write_reg_32() - write 4 bytes to four registers (unlocked)</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the four register</div><div class='del'>- * @value: Value to be written</div><div class='add'>+ * @val: Value to be written</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int __adis_write_reg_32(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				      u32 val)</div><div class='ctx'> {</div><div class='del'>-	return __adis_write_reg(adis, reg, val, 4);</div><div class='add'>+	return adis-&gt;ops-&gt;write(adis, reg, val, 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -203,6 +227,8 @@ static inline int __adis_write_reg_32(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the two registers</div><div class='ctx'>  * @val: The value read back from the device</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int __adis_read_reg_16(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				     u16 *val)</div><div class='hunk'>@@ -210,7 +236,7 @@ static inline int __adis_read_reg_16(struct adis *adis, unsigned int reg,</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __adis_read_reg(adis, reg, &amp;tmp, 2);</div><div class='add'>+	ret = adis-&gt;ops-&gt;read(adis, reg, &amp;tmp, 2);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		*val = tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -222,6 +248,8 @@ static inline int __adis_read_reg_16(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the two registers</div><div class='ctx'>  * @val: The value read back from the device</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int __adis_read_reg_32(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				     u32 *val)</div><div class='hunk'>@@ -229,7 +257,7 @@ static inline int __adis_read_reg_32(struct adis *adis, unsigned int reg,</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = __adis_read_reg(adis, reg, &amp;tmp, 4);</div><div class='add'>+	ret = adis-&gt;ops-&gt;read(adis, reg, &amp;tmp, 4);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		*val = tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -240,19 +268,16 @@ static inline int __adis_read_reg_32(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * adis_write_reg() - write N bytes to register</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the two registers</div><div class='del'>- * @value: The value to write to device (up to 4 bytes)</div><div class='add'>+ * @val: The value to write to device (up to 4 bytes)</div><div class='ctx'>  * @size: The size of the @value (in bytes)</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int adis_write_reg(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				 unsigned int val, unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;adis-&gt;state_lock);</div><div class='del'>-	ret = __adis_write_reg(adis, reg, val, size);</div><div class='del'>-	mutex_unlock(&amp;adis-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	guard(mutex)(&amp;adis-&gt;state_lock);</div><div class='add'>+	return adis-&gt;ops-&gt;write(adis, reg, val, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -261,24 +286,23 @@ static inline int adis_write_reg(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * @reg: The address of the lower of the two registers</div><div class='ctx'>  * @val: The value read back from the device</div><div class='ctx'>  * @size: The size of the @val buffer</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static int adis_read_reg(struct adis *adis, unsigned int reg,</div><div class='ctx'> 			 unsigned int *val, unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;adis-&gt;state_lock);</div><div class='del'>-	ret = __adis_read_reg(adis, reg, val, size);</div><div class='del'>-	mutex_unlock(&amp;adis-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	guard(mutex)(&amp;adis-&gt;state_lock);</div><div class='add'>+	return adis-&gt;ops-&gt;read(adis, reg, val, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * adis_write_reg_8() - Write single byte to a register</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the register to be written</div><div class='del'>- * @value: The value to write</div><div class='add'>+ * @val: The value to write</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int adis_write_reg_8(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				   u8 val)</div><div class='hunk'>@@ -290,7 +314,9 @@ static inline int adis_write_reg_8(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * adis_write_reg_16() - Write 2 bytes to a pair of registers</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the two registers</div><div class='del'>- * @value: Value to be written</div><div class='add'>+ * @val: Value to be written</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int adis_write_reg_16(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				    u16 val)</div><div class='hunk'>@@ -302,7 +328,9 @@ static inline int adis_write_reg_16(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * adis_write_reg_32() - write 4 bytes to four registers</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the four register</div><div class='del'>- * @value: Value to be written</div><div class='add'>+ * @val: Value to be written</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int adis_write_reg_32(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				    u32 val)</div><div class='hunk'>@@ -315,6 +343,8 @@ static inline int adis_write_reg_32(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the two registers</div><div class='ctx'>  * @val: The value read back from the device</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int adis_read_reg_16(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				   u16 *val)</div><div class='hunk'>@@ -334,6 +364,8 @@ static inline int adis_read_reg_16(struct adis *adis, unsigned int reg,</div><div class='ctx'>  * @adis: The adis device</div><div class='ctx'>  * @reg: The address of the lower of the two registers</div><div class='ctx'>  * @val: The value read back from the device</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int adis_read_reg_32(struct adis *adis, unsigned int reg,</div><div class='ctx'> 				   u32 *val)</div><div class='hunk'>@@ -359,16 +391,14 @@ int __adis_update_bits_base(struct adis *adis, unsigned int reg, const u32 mask,</div><div class='ctx'>  * @size: Size of the register to update</div><div class='ctx'>  *</div><div class='ctx'>  * Updates the desired bits of @reg in accordance with @mask and @val.</div><div class='add'>+ *</div><div class='add'>+ * Returns: %0 on success, a negative error code otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int adis_update_bits_base(struct adis *adis, unsigned int reg,</div><div class='ctx'> 					const u32 mask, const u32 val, u8 size)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;adis-&gt;state_lock);</div><div class='del'>-	ret = __adis_update_bits_base(adis, reg, mask, val, size);</div><div class='del'>-	mutex_unlock(&amp;adis-&gt;state_lock);</div><div class='del'>-	return ret;</div><div class='add'>+	guard(mutex)(&amp;adis-&gt;state_lock);</div><div class='add'>+	return __adis_update_bits_base(adis, reg, mask, val, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -409,35 +439,19 @@ int __adis_enable_irq(struct adis *adis, bool enable);</div><div class='ctx'> </div><div class='ctx'> static inline int adis_enable_irq(struct adis *adis, bool enable)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;adis-&gt;state_lock);</div><div class='del'>-	ret = __adis_enable_irq(adis, enable);</div><div class='del'>-	mutex_unlock(&amp;adis-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	guard(mutex)(&amp;adis-&gt;state_lock);</div><div class='add'>+	return __adis_enable_irq(adis, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int adis_check_status(struct adis *adis)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;adis-&gt;state_lock);</div><div class='del'>-	ret = __adis_check_status(adis);</div><div class='del'>-	mutex_unlock(&amp;adis-&gt;state_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void adis_dev_lock(struct adis *adis)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;adis-&gt;state_lock);</div><div class='add'>+	guard(mutex)(&amp;adis-&gt;state_lock);</div><div class='add'>+	return __adis_check_status(adis);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void adis_dev_unlock(struct adis *adis)</div><div class='del'>-{</div><div class='del'>-	mutex_unlock(&amp;adis-&gt;state_lock);</div><div class='del'>-}</div><div class='add'>+#define adis_dev_auto_lock(adis)	guard(mutex)(&amp;(adis)-&gt;state_lock)</div><div class='add'>+#define adis_dev_auto_scoped_lock(adis) \</div><div class='add'>+	scoped_guard(mutex, &amp;(adis)-&gt;state_lock)</div><div class='ctx'> </div><div class='ctx'> int adis_single_conversion(struct iio_dev *indio_dev,</div><div class='ctx'> 			   const struct iio_chan_spec *chan,</div><div class='hunk'>@@ -515,11 +529,19 @@ int adis_single_conversion(struct iio_dev *indio_dev,</div><div class='ctx'> #define ADIS_ROT_CHAN(mod, addr, si, info_sep, info_all, bits) \</div><div class='ctx'> 	ADIS_MOD_CHAN(IIO_ROT, mod, addr, si, info_sep, info_all, bits)</div><div class='ctx'> </div><div class='add'>+#define devm_adis_setup_buffer_and_trigger(adis, indio_dev, trigger_handler)	\</div><div class='add'>+	devm_adis_setup_buffer_and_trigger_with_attrs((adis), (indio_dev),	\</div><div class='add'>+						      (trigger_handler), NULL,	\</div><div class='add'>+						      NULL)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IIO_ADIS_LIB_BUFFER</div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-devm_adis_setup_buffer_and_trigger(struct adis *adis, struct iio_dev *indio_dev,</div><div class='del'>-				   irq_handler_t trigger_handler);</div><div class='add'>+devm_adis_setup_buffer_and_trigger_with_attrs(struct adis *adis,</div><div class='add'>+					      struct iio_dev *indio_dev,</div><div class='add'>+					      irq_handler_t trigger_handler,</div><div class='add'>+					      const struct iio_buffer_setup_ops *ops,</div><div class='add'>+					      const struct iio_dev_attr **buffer_attrs);</div><div class='ctx'> </div><div class='ctx'> int devm_adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -529,8 +551,11 @@ int adis_update_scan_mode(struct iio_dev *indio_dev,</div><div class='ctx'> #else /* CONFIG_IIO_BUFFER */</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-devm_adis_setup_buffer_and_trigger(struct adis *adis, struct iio_dev *indio_dev,</div><div class='del'>-				   irq_handler_t trigger_handler)</div><div class='add'>+devm_adis_setup_buffer_and_trigger_with_attrs(struct adis *adis,</div><div class='add'>+					      struct iio_dev *indio_dev,</div><div class='add'>+					      irq_handler_t trigger_handler,</div><div class='add'>+					      const struct iio_buffer_setup_ops *ops,</div><div class='add'>+					      const struct iio_dev_attr **buffer_attrs)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/iio/timer/stm32-lptim-trigger.h b/include/linux/iio/timer/stm32-lptim-trigger.h<br/>index a34dcf6a6001..ce3cf0addb2e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/timer/stm32-lptim-trigger.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/timer/stm32-lptim-trigger.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/timer/stm32-lptim-trigger.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/timer/stm32-lptim-trigger.h</a></div><div class='hunk'>@@ -14,6 +14,15 @@</div><div class='ctx'> #define LPTIM1_OUT	"lptim1_out"</div><div class='ctx'> #define LPTIM2_OUT	"lptim2_out"</div><div class='ctx'> #define LPTIM3_OUT	"lptim3_out"</div><div class='add'>+#define LPTIM4_OUT	"lptim4_out"</div><div class='add'>+#define LPTIM5_OUT	"lptim5_out"</div><div class='add'>+</div><div class='add'>+#define LPTIM1_CH1	"lptim1_ch1"</div><div class='add'>+#define LPTIM1_CH2	"lptim1_ch2"</div><div class='add'>+#define LPTIM2_CH1	"lptim2_ch1"</div><div class='add'>+#define LPTIM2_CH2	"lptim2_ch2"</div><div class='add'>+#define LPTIM3_CH1	"lptim3_ch1"</div><div class='add'>+#define LPTIM4_CH1	"lptim4_ch1"</div><div class='ctx'> </div><div class='ctx'> #if IS_REACHABLE(CONFIG_IIO_STM32_LPTIMER_TRIGGER)</div><div class='ctx'> bool is_stm32_lptim_trigger(struct iio_trigger *trig);</div><div class='head'>diff --git a/include/linux/iio/timer/stm32-timer-trigger.h b/include/linux/iio/timer/stm32-timer-trigger.h<br/>index 37572e4dc73a..1ee237b56183 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/timer/stm32-timer-trigger.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/timer/stm32-timer-trigger.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/timer/stm32-timer-trigger.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/timer/stm32-timer-trigger.h</a></div><div class='hunk'>@@ -72,6 +72,12 @@</div><div class='ctx'> </div><div class='ctx'> #define TIM17_OC1	"tim17_oc1"</div><div class='ctx'> </div><div class='add'>+#define TIM20_OC1	"tim20_oc1"</div><div class='add'>+#define TIM20_OC2	"tim20_oc2"</div><div class='add'>+#define TIM20_OC3	"tim20_oc3"</div><div class='add'>+#define TIM20_TRGO	"tim20_trgo"</div><div class='add'>+#define TIM20_TRGO2	"tim20_trgo2"</div><div class='add'>+</div><div class='ctx'> #if IS_REACHABLE(CONFIG_IIO_STM32_TIMER_TRIGGER)</div><div class='ctx'> bool is_stm32_timer_trigger(struct iio_trigger *trig);</div><div class='ctx'> #else</div><div class='head'>diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h<br/>index d89982c98368..34eebad12d2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iio/types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iio/types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iio/types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iio/types.h</a></div><div class='hunk'>@@ -69,6 +69,8 @@ enum iio_chan_info_enum {</div><div class='ctx'> 	IIO_CHAN_INFO_CALIBAMBIENT,</div><div class='ctx'> 	IIO_CHAN_INFO_ZEROPOINT,</div><div class='ctx'> 	IIO_CHAN_INFO_TROUGH,</div><div class='add'>+	IIO_CHAN_INFO_CONVDELAY,</div><div class='add'>+	IIO_CHAN_INFO_POWERFACTOR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _IIO_TYPES_H_ */</div><div class='head'>diff --git a/include/linux/ima.h b/include/linux/ima.h<br/>index 0bae61a15b60..8e29cb4e6a01 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ima.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ima.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ima.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ima.h</a></div><div class='hunk'>@@ -32,6 +32,9 @@ static inline void ima_appraise_parse_cmdline(void) {}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IMA_KEXEC</div><div class='ctx'> extern void ima_add_kexec_buffer(struct kimage *image);</div><div class='add'>+extern void ima_kexec_post_load(struct kimage *image);</div><div class='add'>+#else</div><div class='add'>+static inline void ima_kexec_post_load(struct kimage *image) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='head'>diff --git a/include/linux/in6.h b/include/linux/in6.h<br/>index 0777a21cbf86..403f926d33d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/in6.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/in6.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/in6.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/in6.h</a></div><div class='hunk'>@@ -18,6 +18,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/in6.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Large enough to hold both sockaddr_in and sockaddr_in6. */</div><div class='add'>+struct sockaddr_inet {</div><div class='add'>+	unsigned short	sa_family;</div><div class='add'>+	char		sa_data[sizeof(struct sockaddr_in6) -</div><div class='add'>+				sizeof(unsigned short)];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553</div><div class='ctx'>  * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined</div><div class='ctx'>  * in network byte order, not in host byte order as are the IPv4 equivalents</div><div class='head'>diff --git a/include/linux/inet.h b/include/linux/inet.h<br/>index bd8276e96e60..9158772f3559 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/inet.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/inet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/inet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/inet.h</a></div><div class='hunk'>@@ -55,6 +55,6 @@ extern int in6_pton(const char *src, int srclen, u8 *dst, int delim, const char</div><div class='ctx'> </div><div class='ctx'> extern int inet_pton_with_scope(struct net *net, unsigned short af,</div><div class='ctx'> 		const char *src, const char *port, struct sockaddr_storage *addr);</div><div class='del'>-extern bool inet_addr_is_any(struct sockaddr *addr);</div><div class='add'>+bool inet_addr_is_any(struct sockaddr_storage *addr);</div><div class='ctx'> </div><div class='ctx'> #endif	/* _LINUX_INET_H */</div><div class='head'>diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h<br/>index a9033696b0aa..704fd415c2b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/inet_diag.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/inet_diag.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/inet_diag.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/inet_diag.h</a></div><div class='hunk'>@@ -24,9 +24,6 @@ struct inet_diag_handler {</div><div class='ctx'> 					 bool net_admin,</div><div class='ctx'> 					 struct sk_buff *skb);</div><div class='ctx'> </div><div class='del'>-	size_t		(*idiag_get_aux_size)(struct sock *sk,</div><div class='del'>-					      bool net_admin);</div><div class='del'>-</div><div class='ctx'> 	int		(*destroy)(struct sk_buff *in_skb,</div><div class='ctx'> 				   const struct inet_diag_req_v2 *req);</div><div class='ctx'> </div><div class='hunk'>@@ -41,6 +38,11 @@ struct inet_diag_dump_data {</div><div class='ctx'> #define inet_diag_nla_bpf_stgs req_nlas[INET_DIAG_REQ_SK_BPF_STORAGES]</div><div class='ctx'> </div><div class='ctx'> 	struct bpf_sk_storage_diag *bpf_stg_diag;</div><div class='add'>+	bool mark_needed;	/* INET_DIAG_BC_MARK_COND present. */</div><div class='add'>+#ifdef CONFIG_SOCK_CGROUP_DATA</div><div class='add'>+	bool cgroup_needed;	/* INET_DIAG_BC_CGROUP_COND present. */</div><div class='add'>+#endif</div><div class='add'>+	bool userlocks_needed;	/* INET_DIAG_BC_AUTO present. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct inet_connection_sock;</div><div class='hunk'>@@ -48,18 +50,8 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,</div><div class='ctx'> 		      struct sk_buff *skb, struct netlink_callback *cb,</div><div class='ctx'> 		      const struct inet_diag_req_v2 *req,</div><div class='ctx'> 		      u16 nlmsg_flags, bool net_admin);</div><div class='del'>-void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb,</div><div class='del'>-			 struct netlink_callback *cb,</div><div class='del'>-			 const struct inet_diag_req_v2 *r);</div><div class='del'>-int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo,</div><div class='del'>-			    struct netlink_callback *cb,</div><div class='del'>-			    const struct inet_diag_req_v2 *req);</div><div class='del'>-</div><div class='del'>-struct sock *inet_diag_find_one_icsk(struct net *net,</div><div class='del'>-				     struct inet_hashinfo *hashinfo,</div><div class='del'>-				     const struct inet_diag_req_v2 *req);</div><div class='ctx'> </div><div class='del'>-int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk);</div><div class='add'>+int inet_diag_bc_sk(const struct inet_diag_dump_data *cb_data, struct sock *sk);</div><div class='ctx'> </div><div class='ctx'> void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h<br/>index cb5280e6cc21..5730ba6b1cfa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/inetdevice.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/inetdevice.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/inetdevice.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/inetdevice.h</a></div><div class='hunk'>@@ -141,7 +141,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)</div><div class='ctx'> 							  ARP_EVICT_NOCARRIER)</div><div class='ctx'> </div><div class='ctx'> struct in_ifaddr {</div><div class='del'>-	struct hlist_node	hash;</div><div class='add'>+	struct hlist_node	addr_lst;</div><div class='ctx'> 	struct in_ifaddr	__rcu *ifa_next;</div><div class='ctx'> 	struct in_device	*ifa_dev;</div><div class='ctx'> 	struct rcu_head		rcu_head;</div><div class='hunk'>@@ -226,6 +226,10 @@ static __inline__ bool bad_mask(__be32 mask, __be32 addr)</div><div class='ctx'> 	for (ifa = rtnl_dereference((in_dev)-&gt;ifa_list); ifa;	\</div><div class='ctx'> 	     ifa = rtnl_dereference(ifa-&gt;ifa_next))</div><div class='ctx'> </div><div class='add'>+#define in_dev_for_each_ifa_rtnl_net(net, ifa, in_dev)			\</div><div class='add'>+	for (ifa = rtnl_net_dereference(net, (in_dev)-&gt;ifa_list); ifa;	\</div><div class='add'>+	     ifa = rtnl_net_dereference(net, ifa-&gt;ifa_next))</div><div class='add'>+</div><div class='ctx'> #define in_dev_for_each_ifa_rcu(ifa, in_dev)			\</div><div class='ctx'> 	for (ifa = rcu_dereference((in_dev)-&gt;ifa_list); ifa;	\</div><div class='ctx'> 	     ifa = rcu_dereference(ifa-&gt;ifa_next))</div><div class='hunk'>@@ -252,6 +256,11 @@ static inline struct in_device *__in_dev_get_rtnl(const struct net_device *dev)</div><div class='ctx'> 	return rtnl_dereference(dev-&gt;ip_ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct in_device *__in_dev_get_rtnl_net(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return rtnl_net_dereference(dev_net(dev), dev-&gt;ip_ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* called with rcu_read_lock or rtnl held */</div><div class='ctx'> static inline bool ip_ignore_linkdown(const struct net_device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/init.h b/include/linux/init.h<br/>index 3fa3f6241350..40331923b9f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/init.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/init.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/init.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/init.h</a></div><div class='hunk'>@@ -7,13 +7,6 @@</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Built-in __init functions needn't be compiled with retpoline */</div><div class='del'>-#if defined(__noretpoline) &amp;&amp; !defined(MODULE)</div><div class='del'>-#define __noinitretpoline __noretpoline</div><div class='del'>-#else</div><div class='del'>-#define __noinitretpoline</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* These macros are used to mark some functions or </div><div class='ctx'>  * initialized data (doesn't apply to uninitialized data)</div><div class='ctx'>  * as `initialization' functions. The kernel can take this</div><div class='hunk'>@@ -49,7 +42,8 @@</div><div class='ctx'> </div><div class='ctx'> /* These are for everybody (although not all archs will actually</div><div class='ctx'>    discard it in modules) */</div><div class='del'>-#define __init		__section(".init.text") __cold  __latent_entropy __noinitretpoline</div><div class='add'>+#define __init		__section(".init.text") __cold __latent_entropy	\</div><div class='add'>+						__no_kstack_erase</div><div class='ctx'> #define __initdata	__section(".init.data")</div><div class='ctx'> #define __initconst	__section(".init.rodata")</div><div class='ctx'> #define __exitdata	__section(".exit.data")</div><div class='hunk'>@@ -84,11 +78,15 @@</div><div class='ctx'> </div><div class='ctx'> #define __exit          __section(".exit.text") __exitused __cold notrace</div><div class='ctx'> </div><div class='del'>-/* Used for MEMORY_HOTPLUG */</div><div class='del'>-#define __meminit        __section(".meminit.text") __cold notrace \</div><div class='del'>-						  __latent_entropy</div><div class='del'>-#define __meminitdata    __section(".meminit.data")</div><div class='del'>-#define __meminitconst   __section(".meminit.rodata")</div><div class='add'>+#ifdef CONFIG_MEMORY_HOTPLUG</div><div class='add'>+#define __meminit</div><div class='add'>+#define __meminitdata</div><div class='add'>+#define __meminitconst</div><div class='add'>+#else</div><div class='add'>+#define __meminit	__init</div><div class='add'>+#define __meminitdata	__initdata</div><div class='add'>+#define __meminitconst	__initconst</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* For assembly routines */</div><div class='ctx'> #define __HEAD		.section	".head.text","ax"</div><div class='hunk'>@@ -99,10 +97,6 @@</div><div class='ctx'> #define __INITRODATA	.section	".init.rodata","a",%progbits</div><div class='ctx'> #define __FINITDATA	.previous</div><div class='ctx'> </div><div class='del'>-#define __MEMINIT        .section	".meminit.text", "ax"</div><div class='del'>-#define __MEMINITDATA    .section	".meminit.data", "aw"</div><div class='del'>-#define __MEMINITRODATA  .section	".meminit.rodata", "a"</div><div class='del'>-</div><div class='ctx'> /* silence warnings when references are OK */</div><div class='ctx'> #define __REF            .section       ".ref.text", "ax"</div><div class='ctx'> #define __REFDATA        .section       ".ref.data", "aw"</div><div class='hunk'>@@ -168,12 +162,8 @@ extern initcall_entry_t __initcall_end[];</div><div class='ctx'> </div><div class='ctx'> extern struct file_system_type rootfs_fs_type;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX)</div><div class='ctx'> extern bool rodata_enabled;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_STRICT_KERNEL_RWX</div><div class='ctx'> void mark_rodata_ro(void);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> extern void (*late_time_init)(void);</div><div class='ctx'> </div><div class='hunk'>@@ -210,12 +200,13 @@ extern struct module __this_module;</div><div class='ctx'> </div><div class='ctx'> /* Format: &lt;modname&gt;__&lt;counter&gt;_&lt;line&gt;_&lt;fn&gt; */</div><div class='ctx'> #define __initcall_id(fn)					\</div><div class='add'>+	__PASTE(kmod_,						\</div><div class='ctx'> 	__PASTE(__KBUILD_MODNAME,				\</div><div class='ctx'> 	__PASTE(__,						\</div><div class='ctx'> 	__PASTE(__COUNTER__,					\</div><div class='ctx'> 	__PASTE(_,						\</div><div class='ctx'> 	__PASTE(__LINE__,					\</div><div class='del'>-	__PASTE(_, fn))))))</div><div class='add'>+	__PASTE(_, fn)))))))</div><div class='ctx'> </div><div class='ctx'> /* Format: __&lt;prefix&gt;__&lt;iid&gt;&lt;id&gt; */</div><div class='ctx'> #define __initcall_name(prefix, __iid, id)			\</div><div class='head'>diff --git a/include/linux/init_task.h b/include/linux/init_task.h<br/>index bccb3f1f6262..a6cb241ea00c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/init_task.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/init_task.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/init_task.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/init_task.h</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> extern struct files_struct init_files;</div><div class='ctx'> extern struct fs_struct init_fs;</div><div class='ctx'> extern struct nsproxy init_nsproxy;</div><div class='del'>-extern struct cred init_cred;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE</div><div class='ctx'> #define INIT_PREV_CPUTIME(x)	.prev_cputime = {			\</div><div class='head'>diff --git a/include/linux/input.h b/include/linux/input.h<br/>index de6503c0edb8..7d7cb0593a63 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/input.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/input.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/input.h</a></div><div class='hunk'>@@ -275,7 +275,8 @@ struct input_handle;</div><div class='ctx'>  *	it may not sleep</div><div class='ctx'>  * @events: event sequence handler. This method is being called by</div><div class='ctx'>  *	input core with interrupts disabled and dev-&gt;event_lock</div><div class='del'>- *	spinlock held and so it may not sleep</div><div class='add'>+ *	spinlock held and so it may not sleep. The method must return</div><div class='add'>+ *	number of events passed to it.</div><div class='ctx'>  * @filter: similar to @event; separates normal event handlers from</div><div class='ctx'>  *	"filters".</div><div class='ctx'>  * @match: called after comparing device's id with handler's id_table</div><div class='hunk'>@@ -285,6 +286,10 @@ struct input_handle;</div><div class='ctx'>  * @start: starts handler for given handle. This function is called by</div><div class='ctx'>  *	input core right after connect() method and also when a process</div><div class='ctx'>  *	that "grabbed" a device releases it</div><div class='add'>+ * @passive_observer: set to %true by drivers only interested in observing</div><div class='add'>+ *	data stream from devices if there are other users present. Such</div><div class='add'>+ *	drivers will not result in starting underlying hardware device</div><div class='add'>+ *	when input_open_device() is called for their handles</div><div class='ctx'>  * @legacy_minors: set to %true by drivers using legacy minor ranges</div><div class='ctx'>  * @minor: beginning of range of 32 legacy minors for devices this driver</div><div class='ctx'>  *	can provide</div><div class='hunk'>@@ -312,14 +317,15 @@ struct input_handler {</div><div class='ctx'> 	void *private;</div><div class='ctx'> </div><div class='ctx'> 	void (*event)(struct input_handle *handle, unsigned int type, unsigned int code, int value);</div><div class='del'>-	void (*events)(struct input_handle *handle,</div><div class='del'>-		       const struct input_value *vals, unsigned int count);</div><div class='add'>+	unsigned int (*events)(struct input_handle *handle,</div><div class='add'>+			       struct input_value *vals, unsigned int count);</div><div class='ctx'> 	bool (*filter)(struct input_handle *handle, unsigned int type, unsigned int code, int value);</div><div class='ctx'> 	bool (*match)(struct input_handler *handler, struct input_dev *dev);</div><div class='ctx'> 	int (*connect)(struct input_handler *handler, struct input_dev *dev, const struct input_device_id *id);</div><div class='ctx'> 	void (*disconnect)(struct input_handle *handle);</div><div class='ctx'> 	void (*start)(struct input_handle *handle);</div><div class='ctx'> </div><div class='add'>+	bool passive_observer;</div><div class='ctx'> 	bool legacy_minors;</div><div class='ctx'> 	int minor;</div><div class='ctx'> 	const char *name;</div><div class='hunk'>@@ -338,12 +344,16 @@ struct input_handler {</div><div class='ctx'>  * @name: name given to the handle by handler that created it</div><div class='ctx'>  * @dev: input device the handle is attached to</div><div class='ctx'>  * @handler: handler that works with the device through this handle</div><div class='add'>+ * @handle_events: event sequence handler. It is set up by the input core</div><div class='add'>+ *	according to event handling method specified in the @handler. See</div><div class='add'>+ *	input_handle_setup_event_handler().</div><div class='add'>+ *	This method is being called by the input core with interrupts disabled</div><div class='add'>+ *	and dev-&gt;event_lock spinlock held and so it may not sleep.</div><div class='ctx'>  * @d_node: used to put the handle on device's list of attached handles</div><div class='ctx'>  * @h_node: used to put the handle on handler's list of handles from which</div><div class='ctx'>  *	it gets events</div><div class='ctx'>  */</div><div class='ctx'> struct input_handle {</div><div class='del'>-</div><div class='ctx'> 	void *private;</div><div class='ctx'> </div><div class='ctx'> 	int open;</div><div class='hunk'>@@ -352,6 +362,10 @@ struct input_handle {</div><div class='ctx'> 	struct input_dev *dev;</div><div class='ctx'> 	struct input_handler *handler;</div><div class='ctx'> </div><div class='add'>+	unsigned int (*handle_events)(struct input_handle *handle,</div><div class='add'>+				      struct input_value *vals,</div><div class='add'>+				      unsigned int count);</div><div class='add'>+</div><div class='ctx'> 	struct list_head	d_node;</div><div class='ctx'> 	struct list_head	h_node;</div><div class='ctx'> };</div><div class='hunk'>@@ -514,7 +528,7 @@ void input_enable_softrepeat(struct input_dev *dev, int delay, int period);</div><div class='ctx'> </div><div class='ctx'> bool input_device_enabled(struct input_dev *dev);</div><div class='ctx'> </div><div class='del'>-extern struct class input_class;</div><div class='add'>+extern const struct class input_class;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ff_device - force-feedback part of an input device</div><div class='head'>diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h<br/>index b8d8d69eba29..90867f44ab4d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/input/matrix_keypad.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input/matrix_keypad.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/input/matrix_keypad.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/input/matrix_keypad.h</a></div><div class='hunk'>@@ -34,52 +34,6 @@ struct matrix_keymap_data {</div><div class='ctx'> 	unsigned int	keymap_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct matrix_keypad_platform_data - platform-dependent keypad data</div><div class='del'>- * @keymap_data: pointer to &amp;matrix_keymap_data</div><div class='del'>- * @row_gpios: pointer to array of gpio numbers representing rows</div><div class='del'>- * @col_gpios: pointer to array of gpio numbers reporesenting colums</div><div class='del'>- * @num_row_gpios: actual number of row gpios used by device</div><div class='del'>- * @num_col_gpios: actual number of col gpios used by device</div><div class='del'>- * @col_scan_delay_us: delay, measured in microseconds, that is</div><div class='del'>- *	needed before we can keypad after activating column gpio</div><div class='del'>- * @debounce_ms: debounce interval in milliseconds</div><div class='del'>- * @clustered_irq: may be specified if interrupts of all row/column GPIOs</div><div class='del'>- *	are bundled to one single irq</div><div class='del'>- * @clustered_irq_flags: flags that are needed for the clustered irq</div><div class='del'>- * @active_low: gpio polarity</div><div class='del'>- * @wakeup: controls whether the device should be set up as wakeup</div><div class='del'>- *	source</div><div class='del'>- * @no_autorepeat: disable key autorepeat</div><div class='del'>- * @drive_inactive_cols: drive inactive columns during scan, rather than</div><div class='del'>- *	making them inputs.</div><div class='del'>- *</div><div class='del'>- * This structure represents platform-specific data that use used by</div><div class='del'>- * matrix_keypad driver to perform proper initialization.</div><div class='del'>- */</div><div class='del'>-struct matrix_keypad_platform_data {</div><div class='del'>-	const struct matrix_keymap_data *keymap_data;</div><div class='del'>-</div><div class='del'>-	const unsigned int *row_gpios;</div><div class='del'>-	const unsigned int *col_gpios;</div><div class='del'>-</div><div class='del'>-	unsigned int	num_row_gpios;</div><div class='del'>-	unsigned int	num_col_gpios;</div><div class='del'>-</div><div class='del'>-	unsigned int	col_scan_delay_us;</div><div class='del'>-</div><div class='del'>-	/* key debounce interval in milli-second */</div><div class='del'>-	unsigned int	debounce_ms;</div><div class='del'>-</div><div class='del'>-	unsigned int	clustered_irq;</div><div class='del'>-	unsigned int	clustered_irq_flags;</div><div class='del'>-</div><div class='del'>-	bool		active_low;</div><div class='del'>-	bool		wakeup;</div><div class='del'>-	bool		no_autorepeat;</div><div class='del'>-	bool		drive_inactive_cols;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,</div><div class='ctx'> 			       const char *keymap_name,</div><div class='ctx'> 			       unsigned int rows, unsigned int cols,</div><div class='hunk'>@@ -88,6 +42,4 @@ int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,</div><div class='ctx'> int matrix_keypad_parse_properties(struct device *dev,</div><div class='ctx'> 				   unsigned int *rows, unsigned int *cols);</div><div class='ctx'> </div><div class='del'>-#define matrix_keypad_parse_of_params matrix_keypad_parse_properties</div><div class='del'>-</div><div class='ctx'> #endif /* _MATRIX_KEYPAD_H */</div><div class='head'>diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h<br/>index 2cf89a538b18..d30286298a00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/input/mt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input/mt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/input/mt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/input/mt.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #define INPUT_MT_DROP_UNUSED	0x0004	/* drop contacts not seen in frame */</div><div class='ctx'> #define INPUT_MT_TRACK		0x0008	/* use in-kernel tracking */</div><div class='ctx'> #define INPUT_MT_SEMI_MT	0x0010	/* semi-mt device, finger count handled manually */</div><div class='add'>+#define INPUT_MT_TOTAL_FORCE	0x0020	/* calculate total force from slots pressure */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct input_mt_slot - represents the state of an input MT slot</div><div class='head'>diff --git a/include/linux/input/navpoint.h b/include/linux/input/navpoint.h<br/>deleted file mode 100644<br/>index 5192ae3f5ec1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/input/navpoint.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/input/navpoint.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2012 Paul Parsons &lt;lost.distance@yahoo.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct navpoint_platform_data {</div><div class='del'>-	int		port;		/* PXA SSP port for pxa_ssp_request() */</div><div class='del'>-};</div><div class='head'>diff --git a/include/linux/input/touch-overlay.h b/include/linux/input/touch-overlay.h<br/>new file mode 100644<br/>index 000000000000..0253e554d3cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/input/touch-overlay.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/input/touch-overlay.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Javier Carrasco &lt;javier.carrasco@wolfvision.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _TOUCH_OVERLAY</div><div class='add'>+#define _TOUCH_OVERLAY</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct input_dev;</div><div class='add'>+</div><div class='add'>+int touch_overlay_map(struct list_head *list, struct input_dev *input);</div><div class='add'>+</div><div class='add'>+void touch_overlay_get_touchscreen_abs(struct list_head *list, u16 *x, u16 *y);</div><div class='add'>+</div><div class='add'>+bool touch_overlay_mapped_touchscreen(struct list_head *list);</div><div class='add'>+</div><div class='add'>+bool touch_overlay_process_contact(struct list_head *list,</div><div class='add'>+				   struct input_dev *input,</div><div class='add'>+				   struct input_mt_pos *pos, int slot);</div><div class='add'>+</div><div class='add'>+void touch_overlay_sync_frame(struct list_head *list, struct input_dev *input);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/instrumentation.h b/include/linux/instrumentation.h<br/>index bc7babe91b2e..bf675a8aef8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/instrumentation.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/instrumentation.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/instrumentation.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/instrumentation.h</a></div><div class='hunk'>@@ -4,14 +4,14 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NOINSTR_VALIDATION</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/objtool.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Begin/end of an instrumentation safe region */</div><div class='ctx'> #define __instrumentation_begin(c) ({					\</div><div class='ctx'> 	asm volatile(__stringify(c) ": nop\n\t"				\</div><div class='del'>-		     ".pushsection .discard.instr_begin\n\t"		\</div><div class='del'>-		     ".long " __stringify(c) "b - .\n\t"		\</div><div class='del'>-		     ".popsection\n\t" : : "i" (c));			\</div><div class='add'>+		     ANNOTATE_INSTR_BEGIN(__ASM_BREF(c))		\</div><div class='add'>+		     : : "i" (c));					\</div><div class='ctx'> })</div><div class='ctx'> #define instrumentation_begin() __instrumentation_begin(__COUNTER__)</div><div class='ctx'> </div><div class='hunk'>@@ -48,9 +48,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #define __instrumentation_end(c) ({					\</div><div class='ctx'> 	asm volatile(__stringify(c) ": nop\n\t"				\</div><div class='del'>-		     ".pushsection .discard.instr_end\n\t"		\</div><div class='del'>-		     ".long " __stringify(c) "b - .\n\t"		\</div><div class='del'>-		     ".popsection\n\t" : : "i" (c));			\</div><div class='add'>+		     ANNOTATE_INSTR_END(__ASM_BREF(c))			\</div><div class='add'>+		     : : "i" (c));					\</div><div class='ctx'> })</div><div class='ctx'> #define instrumentation_end() __instrumentation_end(__COUNTER__)</div><div class='ctx'> #else /* !CONFIG_NOINSTR_VALIDATION */</div><div class='head'>diff --git a/include/linux/instrumented.h b/include/linux/instrumented.h<br/>index 1b608e00290a..711a1f0d1a73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/instrumented.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/instrumented.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/instrumented.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/instrumented.h</a></div><div class='hunk'>@@ -148,6 +148,41 @@ instrument_copy_from_user_after(const void *to, const void __user *from,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * instrument_memcpy_before - add instrumentation before non-instrumented memcpy</div><div class='add'>+ * @to: destination address</div><div class='add'>+ * @from: source address</div><div class='add'>+ * @n: number of bytes to copy</div><div class='add'>+ *</div><div class='add'>+ * Instrument memory accesses that happen in custom memcpy implementations. The</div><div class='add'>+ * instrumentation should be inserted before the memcpy call.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void instrument_memcpy_before(void *to, const void *from,</div><div class='add'>+						     unsigned long n)</div><div class='add'>+{</div><div class='add'>+	kasan_check_write(to, n);</div><div class='add'>+	kasan_check_read(from, n);</div><div class='add'>+	kcsan_check_write(to, n);</div><div class='add'>+	kcsan_check_read(from, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * instrument_memcpy_after - add instrumentation after non-instrumented memcpy</div><div class='add'>+ * @to: destination address</div><div class='add'>+ * @from: source address</div><div class='add'>+ * @n: number of bytes to copy</div><div class='add'>+ * @left: number of bytes not copied (if known)</div><div class='add'>+ *</div><div class='add'>+ * Instrument memory accesses that happen in custom memcpy implementations. The</div><div class='add'>+ * instrumentation should be inserted after the memcpy call.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void instrument_memcpy_after(void *to, const void *from,</div><div class='add'>+						    unsigned long n,</div><div class='add'>+						    unsigned long left)</div><div class='add'>+{</div><div class='add'>+	kmsan_memmove(to, from, n - left);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * instrument_get_user() - add instrumentation to get_user()-like macros</div><div class='ctx'>  * @to: destination variable, may not be address-taken</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/linux/integrity.h b/include/linux/integrity.h<br/>index 459b79683783..f5842372359b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/integrity.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/integrity.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/integrity.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/integrity.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #define _LINUX_INTEGRITY_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/iversion.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum integrity_status {</div><div class='ctx'> 	INTEGRITY_PASS = 0,</div><div class='hunk'>@@ -28,4 +29,37 @@ static inline void integrity_load_keys(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_INTEGRITY */</div><div class='ctx'> </div><div class='add'>+/* An inode's attributes for detection of changes */</div><div class='add'>+struct integrity_inode_attributes {</div><div class='add'>+	u64 version;		/* track inode changes */</div><div class='add'>+	unsigned long ino;</div><div class='add'>+	dev_t dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On stacked filesystems the i_version alone is not enough to detect file data</div><div class='add'>+ * or metadata change. Additional metadata is required.</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+integrity_inode_attrs_store(struct integrity_inode_attributes *attrs,</div><div class='add'>+			    u64 i_version, const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	attrs-&gt;version = i_version;</div><div class='add'>+	attrs-&gt;dev = inode-&gt;i_sb-&gt;s_dev;</div><div class='add'>+	attrs-&gt;ino = inode-&gt;i_ino;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On stacked filesystems detect whether the inode or its content has changed.</div><div class='add'>+ */</div><div class='add'>+static inline bool</div><div class='add'>+integrity_inode_attrs_changed(const struct integrity_inode_attributes *attrs,</div><div class='add'>+			      const struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	return (inode-&gt;i_sb-&gt;s_dev != attrs-&gt;dev ||</div><div class='add'>+		inode-&gt;i_ino != attrs-&gt;ino ||</div><div class='add'>+		!inode_eq_iversion(inode, attrs-&gt;version));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_INTEGRITY_H */</div><div class='head'>diff --git a/include/linux/intel-ish-client-if.h b/include/linux/intel-ish-client-if.h<br/>index 771622650247..2cd4f65aaa37 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/intel-ish-client-if.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel-ish-client-if.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/intel-ish-client-if.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/intel-ish-client-if.h</a></div><div class='hunk'>@@ -87,6 +87,8 @@ bool ishtp_wait_resume(struct ishtp_device *dev);</div><div class='ctx'> ishtp_print_log ishtp_trace_callback(struct ishtp_cl_device *cl_device);</div><div class='ctx'> /* Get device pointer of PCI device for DMA acces */</div><div class='ctx'> struct device *ishtp_get_pci_device(struct ishtp_cl_device *cl_device);</div><div class='add'>+/* Get the ISHTP workqueue */</div><div class='add'>+struct workqueue_struct *ishtp_get_workqueue(struct ishtp_cl_device *cl_device);</div><div class='ctx'> </div><div class='ctx'> struct ishtp_cl *ishtp_cl_allocate(struct ishtp_cl_device *cl_device);</div><div class='ctx'> void ishtp_cl_free(struct ishtp_cl *cl);</div><div class='hunk'>@@ -100,7 +102,6 @@ void ishtp_cl_destroy_connection(struct ishtp_cl *cl, bool reset);</div><div class='ctx'> int ishtp_cl_send(struct ishtp_cl *cl, uint8_t *buf, size_t length);</div><div class='ctx'> int ishtp_cl_flush_queues(struct ishtp_cl *cl);</div><div class='ctx'> int ishtp_cl_io_rb_recycle(struct ishtp_cl_rb *rb);</div><div class='del'>-bool ishtp_cl_tx_empty(struct ishtp_cl *cl);</div><div class='ctx'> struct ishtp_cl_rb *ishtp_cl_rx_get_rb(struct ishtp_cl *cl);</div><div class='ctx'> void *ishtp_get_client_data(struct ishtp_cl *cl);</div><div class='ctx'> void ishtp_set_client_data(struct ishtp_cl *cl, void *data);</div><div class='hunk'>@@ -108,6 +109,7 @@ struct ishtp_device *ishtp_get_ishtp_device(struct ishtp_cl *cl);</div><div class='ctx'> void ishtp_set_tx_ring_size(struct ishtp_cl *cl, int size);</div><div class='ctx'> void ishtp_set_rx_ring_size(struct ishtp_cl *cl, int size);</div><div class='ctx'> void ishtp_set_connection_state(struct ishtp_cl *cl, int state);</div><div class='add'>+int ishtp_get_connection_state(struct ishtp_cl *cl);</div><div class='ctx'> void ishtp_cl_set_fw_client_id(struct ishtp_cl *cl, int fw_client_id);</div><div class='ctx'> </div><div class='ctx'> void ishtp_put_device(struct ishtp_cl_device *cl_dev);</div><div class='head'>diff --git a/include/linux/intel_dg_nvm_aux.h b/include/linux/intel_dg_nvm_aux.h<br/>new file mode 100644<br/>index 000000000000..625d46a6b96e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/intel_dg_nvm_aux.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/intel_dg_nvm_aux.h</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+/* SPDX-License-Identifier: MIT */</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2019-2025, Intel Corporation. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __INTEL_DG_NVM_AUX_H__</div><div class='add'>+#define __INTEL_DG_NVM_AUX_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define INTEL_DG_NVM_REGIONS 13</div><div class='add'>+</div><div class='add'>+struct intel_dg_nvm_region {</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct intel_dg_nvm_dev {</div><div class='add'>+	struct auxiliary_device aux_dev;</div><div class='add'>+	bool writable_override;</div><div class='add'>+	bool non_posted_erase;</div><div class='add'>+	struct resource bar;</div><div class='add'>+	struct resource bar2;</div><div class='add'>+	const struct intel_dg_nvm_region *regions;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define auxiliary_dev_to_intel_dg_nvm_dev(auxiliary_dev) \</div><div class='add'>+	container_of(auxiliary_dev, struct intel_dg_nvm_dev, aux_dev)</div><div class='add'>+</div><div class='add'>+#endif /* __INTEL_DG_NVM_AUX_H__ */</div><div class='head'>diff --git a/include/linux/intel_pmt_features.h b/include/linux/intel_pmt_features.h<br/>new file mode 100644<br/>index 000000000000..53573a4a49b7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/intel_pmt_features.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/intel_pmt_features.h</a></div><div class='hunk'>@@ -0,0 +1,157 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _FEATURES_H</div><div class='add'>+#define _FEATURES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* Common masks */</div><div class='add'>+#define PMT_CAP_TELEM			BIT(0)</div><div class='add'>+#define PMT_CAP_WATCHER			BIT(1)</div><div class='add'>+#define PMT_CAP_CRASHLOG		BIT(2)</div><div class='add'>+#define PMT_CAP_STREAMING		BIT(3)</div><div class='add'>+#define PMT_CAP_THRESHOLD		BIT(4)</div><div class='add'>+#define PMT_CAP_WINDOW			BIT(5)</div><div class='add'>+#define PMT_CAP_CONFIG			BIT(6)</div><div class='add'>+#define PMT_CAP_TRACING			BIT(7)</div><div class='add'>+#define PMT_CAP_INBAND			BIT(8)</div><div class='add'>+#define PMT_CAP_OOB			BIT(9)</div><div class='add'>+#define PMT_CAP_SECURED_CHAN		BIT(10)</div><div class='add'>+</div><div class='add'>+#define PMT_CAP_PMT_SP			BIT(11)</div><div class='add'>+#define PMT_CAP_PMT_SP_POLICY		GENMASK(17, 12)</div><div class='add'>+</div><div class='add'>+/* Per Core Performance Telemetry (PCPT) specific masks */</div><div class='add'>+#define PMT_CAP_PCPT_CORE_PERF		BIT(18)</div><div class='add'>+#define PMT_CAP_PCPT_CORE_C0_RES	BIT(19)</div><div class='add'>+#define PMT_CAP_PCPT_CORE_ACTIVITY	BIT(20)</div><div class='add'>+#define PMT_CAP_PCPT_CACHE_PERF		BIT(21)</div><div class='add'>+#define PMT_CAP_PCPT_QUALITY_TELEM	BIT(22)</div><div class='add'>+</div><div class='add'>+/* Per Core Environmental Telemetry (PCET) specific masks */</div><div class='add'>+#define PMT_CAP_PCET_WORKPOINT_HIST	BIT(18)</div><div class='add'>+#define PMT_CAP_PCET_CORE_CURR_TEMP	BIT(19)</div><div class='add'>+#define PMT_CAP_PCET_CORE_INST_RES	BIT(20)</div><div class='add'>+#define PMT_CAP_PCET_QUALITY_TELEM	BIT(21)	/* Same as PMT_CAP_PCPT */</div><div class='add'>+#define PMT_CAP_PCET_CORE_CDYN_LVL	BIT(22)</div><div class='add'>+#define PMT_CAP_PCET_CORE_STRESS_LVL	BIT(23)</div><div class='add'>+#define PMT_CAP_PCET_CORE_DAS		BIT(24)</div><div class='add'>+#define PMT_CAP_PCET_FIVR_HEALTH	BIT(25)</div><div class='add'>+#define PMT_CAP_PCET_ENERGY		BIT(26)</div><div class='add'>+#define PMT_CAP_PCET_PEM_STATUS		BIT(27)</div><div class='add'>+#define PMT_CAP_PCET_CORE_C_STATE	BIT(28)</div><div class='add'>+</div><div class='add'>+/* Per RMID Performance Telemetry specific masks */</div><div class='add'>+#define PMT_CAP_RMID_CORES_PERF		BIT(18)</div><div class='add'>+#define PMT_CAP_RMID_CACHE_PERF		BIT(19)</div><div class='add'>+#define PMT_CAP_RMID_PERF_QUAL		BIT(20)</div><div class='add'>+</div><div class='add'>+/* Accelerator Telemetry specific masks */</div><div class='add'>+#define PMT_CAP_ACCEL_CPM_TELEM		BIT(18)</div><div class='add'>+#define PMT_CAP_ACCEL_TIP_TELEM		BIT(19)</div><div class='add'>+</div><div class='add'>+/* Uncore Telemetry specific masks */</div><div class='add'>+#define PMT_CAP_UNCORE_IO_CA_TELEM	BIT(18)</div><div class='add'>+#define PMT_CAP_UNCORE_RMID_TELEM	BIT(19)</div><div class='add'>+#define PMT_CAP_UNCORE_D2D_ULA_TELEM	BIT(20)</div><div class='add'>+#define PMT_CAP_UNCORE_PKGC_TELEM	BIT(21)</div><div class='add'>+</div><div class='add'>+/* Crash Log specific masks */</div><div class='add'>+#define PMT_CAP_CRASHLOG_MAN_TRIG	BIT(11)</div><div class='add'>+#define PMT_CAP_CRASHLOG_CORE		BIT(12)</div><div class='add'>+#define PMT_CAP_CRASHLOG_UNCORE		BIT(13)</div><div class='add'>+#define PMT_CAP_CRASHLOG_TOR		BIT(14)</div><div class='add'>+#define PMT_CAP_CRASHLOG_S3M		BIT(15)</div><div class='add'>+#define PMT_CAP_CRASHLOG_PERSISTENCY	BIT(16)</div><div class='add'>+#define PMT_CAP_CRASHLOG_CLIP_GPIO	BIT(17)</div><div class='add'>+#define PMT_CAP_CRASHLOG_PRE_RESET	BIT(18)</div><div class='add'>+#define PMT_CAP_CRASHLOG_POST_RESET	BIT(19)</div><div class='add'>+</div><div class='add'>+/* PeTe Log specific masks */</div><div class='add'>+#define PMT_CAP_PETE_MAN_TRIG		BIT(11)</div><div class='add'>+#define PMT_CAP_PETE_ENCRYPTION		BIT(12)</div><div class='add'>+#define PMT_CAP_PETE_PERSISTENCY	BIT(13)</div><div class='add'>+#define PMT_CAP_PETE_REQ_TOKENS		BIT(14)</div><div class='add'>+#define PMT_CAP_PETE_PROD_ENABLED	BIT(15)</div><div class='add'>+#define PMT_CAP_PETE_DEBUG_ENABLED	BIT(16)</div><div class='add'>+</div><div class='add'>+/* TPMI control specific masks */</div><div class='add'>+#define PMT_CAP_TPMI_MAILBOX		BIT(11)</div><div class='add'>+#define PMT_CAP_TPMI_LOCK		BIT(12)</div><div class='add'>+</div><div class='add'>+/* Tracing specific masks */</div><div class='add'>+#define PMT_CAP_TRACE_SRAR		BIT(11)</div><div class='add'>+#define PMT_CAP_TRACE_CORRECTABLE	BIT(12)</div><div class='add'>+#define PMT_CAP_TRACE_MCTP		BIT(13)</div><div class='add'>+#define PMT_CAP_TRACE_MRT		BIT(14)</div><div class='add'>+</div><div class='add'>+/* Per RMID Energy Telemetry specific masks */</div><div class='add'>+#define PMT_CAP_RMID_ENERGY		BIT(18)</div><div class='add'>+#define PMT_CAP_RMID_ACTIVITY		BIT(19)</div><div class='add'>+#define PMT_CAP_RMID_ENERGY_QUAL	BIT(20)</div><div class='add'>+</div><div class='add'>+enum pmt_feature_id {</div><div class='add'>+	FEATURE_INVALID			= 0x0,</div><div class='add'>+	FEATURE_PER_CORE_PERF_TELEM	= 0x1,</div><div class='add'>+	FEATURE_PER_CORE_ENV_TELEM	= 0x2,</div><div class='add'>+	FEATURE_PER_RMID_PERF_TELEM	= 0x3,</div><div class='add'>+	FEATURE_ACCEL_TELEM		= 0x4,</div><div class='add'>+	FEATURE_UNCORE_TELEM		= 0x5,</div><div class='add'>+	FEATURE_CRASH_LOG		= 0x6,</div><div class='add'>+	FEATURE_PETE_LOG		= 0x7,</div><div class='add'>+	FEATURE_TPMI_CTRL		= 0x8,</div><div class='add'>+	FEATURE_RESERVED		= 0x9,</div><div class='add'>+	FEATURE_TRACING			= 0xA,</div><div class='add'>+	FEATURE_PER_RMID_ENERGY_TELEM	= 0xB,</div><div class='add'>+	FEATURE_MAX			= 0xB,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum feature_layout {</div><div class='add'>+	LAYOUT_RMID,</div><div class='add'>+	LAYOUT_WATCHER,</div><div class='add'>+	LAYOUT_COMMAND,</div><div class='add'>+	LAYOUT_CAPS_ONLY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pmt_cap {</div><div class='add'>+	u32		mask;</div><div class='add'>+	const char	*name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const char * const pmt_feature_names[];</div><div class='add'>+extern enum feature_layout feature_layout[];</div><div class='add'>+extern struct pmt_cap pmt_cap_common[];</div><div class='add'>+extern struct pmt_cap pmt_cap_pcpt[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_pcpt[];</div><div class='add'>+extern struct pmt_cap pmt_cap_pcet[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_pcet[];</div><div class='add'>+extern struct pmt_cap pmt_cap_rmid_perf[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_rmid_perf[];</div><div class='add'>+extern struct pmt_cap pmt_cap_accel[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_accel[];</div><div class='add'>+extern struct pmt_cap pmt_cap_uncore[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_uncore[];</div><div class='add'>+extern struct pmt_cap pmt_cap_crashlog[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_crashlog[];</div><div class='add'>+extern struct pmt_cap pmt_cap_pete[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_pete[];</div><div class='add'>+extern struct pmt_cap pmt_cap_tpmi[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_tpmi[];</div><div class='add'>+extern struct pmt_cap pmt_cap_s3m[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_s3m[];</div><div class='add'>+extern struct pmt_cap pmt_cap_tracing[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_tracing[];</div><div class='add'>+extern struct pmt_cap pmt_cap_rmid_energy[];</div><div class='add'>+extern struct pmt_cap *pmt_caps_rmid_energy[];</div><div class='add'>+</div><div class='add'>+static inline bool pmt_feature_id_is_valid(enum pmt_feature_id id)</div><div class='add'>+{</div><div class='add'>+	if (id &gt; FEATURE_MAX)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (id == FEATURE_INVALID || id == FEATURE_RESERVED)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/intel_rapl.h b/include/linux/intel_rapl.h<br/>index f3196f82fd8a..e9ade2ff4af6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/intel_rapl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_rapl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/intel_rapl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/intel_rapl.h</a></div><div class='hunk'>@@ -152,12 +152,32 @@ struct rapl_if_priv {</div><div class='ctx'> 	union rapl_reg reg_unit;</div><div class='ctx'> 	union rapl_reg regs[RAPL_DOMAIN_MAX][RAPL_DOMAIN_REG_MAX];</div><div class='ctx'> 	int limits[RAPL_DOMAIN_MAX];</div><div class='del'>-	int (*read_raw)(int id, struct reg_action *ra);</div><div class='add'>+	int (*read_raw)(int id, struct reg_action *ra, bool atomic);</div><div class='ctx'> 	int (*write_raw)(int id, struct reg_action *ra);</div><div class='ctx'> 	void *defaults;</div><div class='ctx'> 	void *rpi;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PERF_EVENTS</div><div class='add'>+/**</div><div class='add'>+ * struct rapl_package_pmu_data: Per package data for PMU support</div><div class='add'>+ * @scale:		Scale of 2^-32 Joules for each energy counter increase.</div><div class='add'>+ * @lock:		Lock to protect n_active and active_list.</div><div class='add'>+ * @n_active:		Number of active events.</div><div class='add'>+ * @active_list:	List of active events.</div><div class='add'>+ * @timer_interval:	Maximum timer expiration time before counter overflow.</div><div class='add'>+ * @hrtimer:		Periodically update the counter to prevent overflow.</div><div class='add'>+ */</div><div class='add'>+struct rapl_package_pmu_data {</div><div class='add'>+	u64 scale[RAPL_DOMAIN_MAX];</div><div class='add'>+	raw_spinlock_t lock;</div><div class='add'>+	int n_active;</div><div class='add'>+	struct list_head active_list;</div><div class='add'>+	ktime_t timer_interval;</div><div class='add'>+	struct hrtimer hrtimer;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* maximum rapl package domain name: package-%d-die-%d */</div><div class='ctx'> #define PACKAGE_DOMAIN_NAME_LENGTH 30</div><div class='ctx'> </div><div class='hunk'>@@ -176,6 +196,10 @@ struct rapl_package {</div><div class='ctx'> 	struct cpumask cpumask;</div><div class='ctx'> 	char name[PACKAGE_DOMAIN_NAME_LENGTH];</div><div class='ctx'> 	struct rapl_if_priv *priv;</div><div class='add'>+#ifdef CONFIG_PERF_EVENTS</div><div class='add'>+	bool has_pmu;</div><div class='add'>+	struct rapl_package_pmu_data pmu_data;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rapl_package *rapl_find_package_domain_cpuslocked(int id, struct rapl_if_priv *priv,</div><div class='hunk'>@@ -188,4 +212,12 @@ struct rapl_package *rapl_find_package_domain(int id, struct rapl_if_priv *priv,</div><div class='ctx'> struct rapl_package *rapl_add_package(int id, struct rapl_if_priv *priv, bool id_is_cpu);</div><div class='ctx'> void rapl_remove_package(struct rapl_package *rp);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PERF_EVENTS</div><div class='add'>+int rapl_package_add_pmu(struct rapl_package *rp);</div><div class='add'>+void rapl_package_remove_pmu(struct rapl_package *rp);</div><div class='add'>+#else</div><div class='add'>+static inline int rapl_package_add_pmu(struct rapl_package *rp) { return 0; }</div><div class='add'>+static inline void rapl_package_remove_pmu(struct rapl_package *rp) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __INTEL_RAPL_H__ */</div><div class='head'>diff --git a/include/linux/intel_tcc.h b/include/linux/intel_tcc.h<br/>index 8ff8eabb4a98..fa788817acfc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/intel_tcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_tcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/intel_tcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/intel_tcc.h</a></div><div class='hunk'>@@ -14,5 +14,6 @@ int intel_tcc_get_tjmax(int cpu);</div><div class='ctx'> int intel_tcc_get_offset(int cpu);</div><div class='ctx'> int intel_tcc_set_offset(int cpu, int offset);</div><div class='ctx'> int intel_tcc_get_temp(int cpu, int *temp, bool pkg);</div><div class='add'>+u32 intel_tcc_get_offset_mask(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* __INTEL_TCC_H__ */</div><div class='head'>diff --git a/include/linux/intel_tpmi.h b/include/linux/intel_tpmi.h<br/>index a3529b962be6..94c06bf214fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/intel_tpmi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/intel_tpmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/intel_tpmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/intel_tpmi.h</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitfield.h&gt;</div><div class='ctx'> </div><div class='add'>+struct oobmsm_plat_info;</div><div class='add'>+</div><div class='ctx'> #define TPMI_VERSION_INVALID	0xff</div><div class='ctx'> #define TPMI_MINOR_VERSION(val)	FIELD_GET(GENMASK(4, 0), val)</div><div class='ctx'> #define TPMI_MAJOR_VERSION(val)	FIELD_GET(GENMASK(7, 5), val)</div><div class='hunk'>@@ -21,30 +23,15 @@ enum intel_tpmi_id {</div><div class='ctx'> 	TPMI_ID_PEM = 1,	/* Power and Perf excursion Monitor */</div><div class='ctx'> 	TPMI_ID_UNCORE = 2,	/* Uncore Frequency Scaling */</div><div class='ctx'> 	TPMI_ID_SST = 5,	/* Speed Select Technology */</div><div class='add'>+	TPMI_ID_PLR = 0xc,	/* Performance Limit Reasons */</div><div class='ctx'> 	TPMI_CONTROL_ID = 0x80,	/* Special ID for getting feature status */</div><div class='ctx'> 	TPMI_INFO_ID = 0x81,	/* Special ID for PCI BDF and Package ID information */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct intel_tpmi_plat_info - Platform information for a TPMI device instance</div><div class='del'>- * @package_id:	CPU Package id</div><div class='del'>- * @bus_number:	PCI bus number</div><div class='del'>- * @device_number: PCI device number</div><div class='del'>- * @function_number: PCI function number</div><div class='del'>- *</div><div class='del'>- * Structure to store platform data for a TPMI device instance. This</div><div class='del'>- * struct is used to return data via tpmi_get_platform_data().</div><div class='del'>- */</div><div class='del'>-struct intel_tpmi_plat_info {</div><div class='del'>-	u8 package_id;</div><div class='del'>-	u8 bus_number;</div><div class='del'>-	u8 device_number;</div><div class='del'>-	u8 function_number;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct intel_tpmi_plat_info *tpmi_get_platform_data(struct auxiliary_device *auxdev);</div><div class='add'>+struct oobmsm_plat_info *tpmi_get_platform_data(struct auxiliary_device *auxdev);</div><div class='ctx'> struct resource *tpmi_get_resource_at_index(struct auxiliary_device *auxdev, int index);</div><div class='ctx'> int tpmi_get_resource_count(struct auxiliary_device *auxdev);</div><div class='ctx'> int tpmi_get_feature_status(struct auxiliary_device *auxdev, int feature_id, bool *read_blocked,</div><div class='ctx'> 			    bool *write_blocked);</div><div class='add'>+struct dentry *tpmi_get_debugfs_dir(struct auxiliary_device *auxdev);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h<br/>new file mode 100644<br/>index 000000000000..53f6fe88e369<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/intel_vsec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/intel_vsec.h</a></div><div class='hunk'>@@ -0,0 +1,239 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _INTEL_VSEC_H</div><div class='add'>+#define _INTEL_VSEC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/intel_pmt_features.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VSEC_CAP_UNUSED is reserved. It exists to prevent zero initialized</div><div class='add'>+ * intel_vsec devices from being automatically set to a known</div><div class='add'>+ * capability with ID 0</div><div class='add'>+ */</div><div class='add'>+#define VSEC_CAP_UNUSED		BIT(0)</div><div class='add'>+#define VSEC_CAP_TELEMETRY	BIT(1)</div><div class='add'>+#define VSEC_CAP_WATCHER	BIT(2)</div><div class='add'>+#define VSEC_CAP_CRASHLOG	BIT(3)</div><div class='add'>+#define VSEC_CAP_SDSI		BIT(4)</div><div class='add'>+#define VSEC_CAP_TPMI		BIT(5)</div><div class='add'>+#define VSEC_CAP_DISCOVERY	BIT(6)</div><div class='add'>+#define VSEC_FEATURE_COUNT	7</div><div class='add'>+</div><div class='add'>+/* Intel DVSEC offsets */</div><div class='add'>+#define INTEL_DVSEC_ENTRIES		0xA</div><div class='add'>+#define INTEL_DVSEC_SIZE		0xB</div><div class='add'>+#define INTEL_DVSEC_TABLE		0xC</div><div class='add'>+#define INTEL_DVSEC_TABLE_BAR(x)	((x) &amp; GENMASK(2, 0))</div><div class='add'>+#define INTEL_DVSEC_TABLE_OFFSET(x)	((x) &amp; GENMASK(31, 3))</div><div class='add'>+#define TABLE_OFFSET_SHIFT		3</div><div class='add'>+</div><div class='add'>+struct pci_dev;</div><div class='add'>+struct resource;</div><div class='add'>+</div><div class='add'>+enum intel_vsec_id {</div><div class='add'>+	VSEC_ID_TELEMETRY	= 2,</div><div class='add'>+	VSEC_ID_WATCHER		= 3,</div><div class='add'>+	VSEC_ID_CRASHLOG	= 4,</div><div class='add'>+	VSEC_ID_DISCOVERY	= 12,</div><div class='add'>+	VSEC_ID_SDSI		= 65,</div><div class='add'>+	VSEC_ID_TPMI		= 66,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct intel_vsec_header - Common fields of Intel VSEC and DVSEC registers.</div><div class='add'>+ * @rev:         Revision ID of the VSEC/DVSEC register space</div><div class='add'>+ * @length:      Length of the VSEC/DVSEC register space</div><div class='add'>+ * @id:          ID of the feature</div><div class='add'>+ * @num_entries: Number of instances of the feature</div><div class='add'>+ * @entry_size:  Size of the discovery table for each feature</div><div class='add'>+ * @tbir:        BAR containing the discovery tables</div><div class='add'>+ * @offset:      BAR offset of start of the first discovery table</div><div class='add'>+ */</div><div class='add'>+struct intel_vsec_header {</div><div class='add'>+	u8	rev;</div><div class='add'>+	u16	length;</div><div class='add'>+	u16	id;</div><div class='add'>+	u8	num_entries;</div><div class='add'>+	u8	entry_size;</div><div class='add'>+	u8	tbir;</div><div class='add'>+	u32	offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum intel_vsec_quirks {</div><div class='add'>+	/* Watcher feature not supported */</div><div class='add'>+	VSEC_QUIRK_NO_WATCHER	= BIT(0),</div><div class='add'>+</div><div class='add'>+	/* Crashlog feature not supported */</div><div class='add'>+	VSEC_QUIRK_NO_CRASHLOG	= BIT(1),</div><div class='add'>+</div><div class='add'>+	/* Use shift instead of mask to read discovery table offset */</div><div class='add'>+	VSEC_QUIRK_TABLE_SHIFT	= BIT(2),</div><div class='add'>+</div><div class='add'>+	/* DVSEC not present (provided in driver data) */</div><div class='add'>+	VSEC_QUIRK_NO_DVSEC	= BIT(3),</div><div class='add'>+</div><div class='add'>+	/* Platforms requiring quirk in the auxiliary driver */</div><div class='add'>+	VSEC_QUIRK_EARLY_HW     = BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pmt_callbacks - Callback infrastructure for PMT devices</div><div class='add'>+ * -&gt;read_telem() when specified, called by client driver to access PMT data (instead</div><div class='add'>+ * of direct copy).</div><div class='add'>+ * @pdev:  PCI device reference for the callback's use</div><div class='add'>+ * @guid:  ID of data to acccss</div><div class='add'>+ * @data:  buffer for the data to be copied</div><div class='add'>+ * @off:   offset into the requested buffer</div><div class='add'>+ * @count: size of buffer</div><div class='add'>+ */</div><div class='add'>+struct pmt_callbacks {</div><div class='add'>+	int (*read_telem)(struct pci_dev *pdev, u32 guid, u64 *data, loff_t off, u32 count);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vsec_feature_dependency {</div><div class='add'>+	unsigned long feature;</div><div class='add'>+	unsigned long supplier_bitmap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct intel_vsec_platform_info - Platform specific data</div><div class='add'>+ * @parent:    parent device in the auxbus chain</div><div class='add'>+ * @headers:   list of headers to define the PMT client devices to create</div><div class='add'>+ * @deps:      array of feature dependencies</div><div class='add'>+ * @priv_data: private data, usable by parent devices, currently a callback</div><div class='add'>+ * @caps:      bitmask of PMT capabilities for the given headers</div><div class='add'>+ * @quirks:    bitmask of VSEC device quirks</div><div class='add'>+ * @base_addr: allow a base address to be specified (rather than derived)</div><div class='add'>+ * @num_deps:  Count feature dependencies</div><div class='add'>+ */</div><div class='add'>+struct intel_vsec_platform_info {</div><div class='add'>+	struct device *parent;</div><div class='add'>+	struct intel_vsec_header **headers;</div><div class='add'>+	const struct vsec_feature_dependency *deps;</div><div class='add'>+	void *priv_data;</div><div class='add'>+	unsigned long caps;</div><div class='add'>+	unsigned long quirks;</div><div class='add'>+	u64 base_addr;</div><div class='add'>+	int num_deps;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct intel_sec_device - Auxbus specific device information</div><div class='add'>+ * @auxdev:        auxbus device struct for auxbus access</div><div class='add'>+ * @pcidev:        pci device associated with the device</div><div class='add'>+ * @resource:      any resources shared by the parent</div><div class='add'>+ * @ida:           id reference</div><div class='add'>+ * @num_resources: number of resources</div><div class='add'>+ * @id:            xarray id</div><div class='add'>+ * @priv_data:     any private data needed</div><div class='add'>+ * @quirks:        specified quirks</div><div class='add'>+ * @base_addr:     base address of entries (if specified)</div><div class='add'>+ * @cap_id:        the enumerated id of the vsec feature</div><div class='add'>+ */</div><div class='add'>+struct intel_vsec_device {</div><div class='add'>+	struct auxiliary_device auxdev;</div><div class='add'>+	struct pci_dev *pcidev;</div><div class='add'>+	struct resource *resource;</div><div class='add'>+	struct ida *ida;</div><div class='add'>+	int num_resources;</div><div class='add'>+	int id; /* xa */</div><div class='add'>+	void *priv_data;</div><div class='add'>+	size_t priv_data_size;</div><div class='add'>+	unsigned long quirks;</div><div class='add'>+	u64 base_addr;</div><div class='add'>+	unsigned long cap_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct oobmsm_plat_info - Platform information for a device instance</div><div class='add'>+ * @cdie_mask:       Mask of all compute dies in the partition</div><div class='add'>+ * @package_id:      CPU Package id</div><div class='add'>+ * @partition:       Package partition id when multiple VSEC PCI devices per package</div><div class='add'>+ * @segment:         PCI segment ID</div><div class='add'>+ * @bus_number:      PCI bus number</div><div class='add'>+ * @device_number:   PCI device number</div><div class='add'>+ * @function_number: PCI function number</div><div class='add'>+ *</div><div class='add'>+ * Structure to store platform data for a OOBMSM device instance.</div><div class='add'>+ */</div><div class='add'>+struct oobmsm_plat_info {</div><div class='add'>+	u16 cdie_mask;</div><div class='add'>+	u8 package_id;</div><div class='add'>+	u8 partition;</div><div class='add'>+	u8 segment;</div><div class='add'>+	u8 bus_number;</div><div class='add'>+	u8 device_number;</div><div class='add'>+	u8 function_number;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct telemetry_region {</div><div class='add'>+	struct oobmsm_plat_info	plat_info;</div><div class='add'>+	void __iomem		*addr;</div><div class='add'>+	size_t			size;</div><div class='add'>+	u32			guid;</div><div class='add'>+	u32			num_rmids;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pmt_feature_group {</div><div class='add'>+	enum pmt_feature_id	id;</div><div class='add'>+	int			count;</div><div class='add'>+	struct kref		kref;</div><div class='add'>+	struct telemetry_region	regions[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,</div><div class='add'>+		       struct intel_vsec_device *intel_vsec_dev,</div><div class='add'>+		       const char *name);</div><div class='add'>+</div><div class='add'>+static inline struct intel_vsec_device *dev_to_ivdev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return container_of(dev, struct intel_vsec_device, auxdev.dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct intel_vsec_device *auxdev_to_ivdev(struct auxiliary_device *auxdev)</div><div class='add'>+{</div><div class='add'>+	return container_of(auxdev, struct intel_vsec_device, auxdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_INTEL_VSEC)</div><div class='add'>+int intel_vsec_register(struct pci_dev *pdev,</div><div class='add'>+			 struct intel_vsec_platform_info *info);</div><div class='add'>+int intel_vsec_set_mapping(struct oobmsm_plat_info *plat_info,</div><div class='add'>+			   struct intel_vsec_device *vsec_dev);</div><div class='add'>+struct oobmsm_plat_info *intel_vsec_get_mapping(struct pci_dev *pdev);</div><div class='add'>+#else</div><div class='add'>+static inline int intel_vsec_register(struct pci_dev *pdev,</div><div class='add'>+				       struct intel_vsec_platform_info *info)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static inline int intel_vsec_set_mapping(struct oobmsm_plat_info *plat_info,</div><div class='add'>+					 struct intel_vsec_device *vsec_dev)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static inline struct oobmsm_plat_info *intel_vsec_get_mapping(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_INTEL_PMT_TELEMETRY)</div><div class='add'>+struct pmt_feature_group *</div><div class='add'>+intel_pmt_get_regions_by_feature(enum pmt_feature_id id);</div><div class='add'>+</div><div class='add'>+void intel_pmt_put_feature_group(struct pmt_feature_group *feature_group);</div><div class='add'>+#else</div><div class='add'>+static inline struct pmt_feature_group *</div><div class='add'>+intel_pmt_get_regions_by_feature(enum pmt_feature_id id)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+intel_pmt_put_feature_group(struct pmt_feature_group *feature_group) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/interconnect-clk.h b/include/linux/interconnect-clk.h<br/>index 0cd80112bea5..9bcee3e9c56c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/interconnect-clk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interconnect-clk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/interconnect-clk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/interconnect-clk.h</a></div><div class='hunk'>@@ -11,12 +11,16 @@ struct device;</div><div class='ctx'> struct icc_clk_data {</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	const char *name;</div><div class='add'>+	unsigned int master_id;</div><div class='add'>+	unsigned int slave_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct icc_provider *icc_clk_register(struct device *dev,</div><div class='ctx'> 				      unsigned int first_id,</div><div class='ctx'> 				      unsigned int num_clocks,</div><div class='ctx'> 				      const struct icc_clk_data *data);</div><div class='add'>+int devm_icc_clk_register(struct device *dev, unsigned int first_id,</div><div class='add'>+			  unsigned int num_clocks, const struct icc_clk_data *data);</div><div class='ctx'> void icc_clk_unregister(struct icc_provider *provider);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/interconnect-provider.h b/include/linux/interconnect-provider.h<br/>index 7ba183f221f1..8a2f652a05ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/interconnect-provider.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interconnect-provider.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/interconnect-provider.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/interconnect-provider.h</a></div><div class='hunk'>@@ -36,7 +36,7 @@ struct icc_onecell_data {</div><div class='ctx'> 	struct icc_node *nodes[] __counted_by(num_nodes);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct icc_node *of_icc_xlate_onecell(struct of_phandle_args *spec,</div><div class='add'>+struct icc_node *of_icc_xlate_onecell(const struct of_phandle_args *spec,</div><div class='ctx'> 				      void *data);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -65,8 +65,9 @@ struct icc_provider {</div><div class='ctx'> 			 u32 peak_bw, u32 *agg_avg, u32 *agg_peak);</div><div class='ctx'> 	void (*pre_aggregate)(struct icc_node *node);</div><div class='ctx'> 	int (*get_bw)(struct icc_node *node, u32 *avg, u32 *peak);</div><div class='del'>-	struct icc_node* (*xlate)(struct of_phandle_args *spec, void *data);</div><div class='del'>-	struct icc_node_data* (*xlate_extended)(struct of_phandle_args *spec, void *data);</div><div class='add'>+	struct icc_node* (*xlate)(const struct of_phandle_args *spec, void *data);</div><div class='add'>+	struct icc_node_data* (*xlate_extended)(const struct of_phandle_args *spec,</div><div class='add'>+						void *data);</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	int			users;</div><div class='ctx'> 	bool			inter_set;</div><div class='hunk'>@@ -115,8 +116,11 @@ struct icc_node {</div><div class='ctx'> </div><div class='ctx'> int icc_std_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,</div><div class='ctx'> 		      u32 peak_bw, u32 *agg_avg, u32 *agg_peak);</div><div class='add'>+struct icc_node *icc_node_create_dyn(void);</div><div class='ctx'> struct icc_node *icc_node_create(int id);</div><div class='ctx'> void icc_node_destroy(int id);</div><div class='add'>+int icc_node_set_name(struct icc_node *node, const struct icc_provider *provider, const char *name);</div><div class='add'>+int icc_link_nodes(struct icc_node *src_node, struct icc_node **dst_node);</div><div class='ctx'> int icc_link_create(struct icc_node *node, const int dst_id);</div><div class='ctx'> void icc_node_add(struct icc_node *node, struct icc_provider *provider);</div><div class='ctx'> void icc_node_del(struct icc_node *node);</div><div class='hunk'>@@ -124,7 +128,7 @@ int icc_nodes_remove(struct icc_provider *provider);</div><div class='ctx'> void icc_provider_init(struct icc_provider *provider);</div><div class='ctx'> int icc_provider_register(struct icc_provider *provider);</div><div class='ctx'> void icc_provider_deregister(struct icc_provider *provider);</div><div class='del'>-struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec);</div><div class='add'>+struct icc_node_data *of_icc_get_from_provider(const struct of_phandle_args *spec);</div><div class='ctx'> void icc_sync_state(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -135,6 +139,11 @@ static inline int icc_std_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,</div><div class='ctx'> 	return -ENOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct icc_node *icc_node_create_dyn(void)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct icc_node *icc_node_create(int id)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENOTSUPP);</div><div class='hunk'>@@ -144,6 +153,17 @@ static inline void icc_node_destroy(int id)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int icc_node_set_name(struct icc_node *node, const struct icc_provider *provider,</div><div class='add'>+				    const char *name)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int icc_link_nodes(struct icc_node *src_node, struct icc_node **dst_node)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int icc_link_create(struct icc_node *node, const int dst_id)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOTSUPP;</div><div class='hunk'>@@ -171,7 +191,7 @@ static inline int icc_provider_register(struct icc_provider *provider)</div><div class='ctx'> </div><div class='ctx'> static inline void icc_provider_deregister(struct icc_provider *provider) { }</div><div class='ctx'> </div><div class='del'>-static inline struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec)</div><div class='add'>+static inline struct icc_node_data *of_icc_get_from_provider(const struct of_phandle_args *spec)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENOTSUPP);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h<br/>index 97ac253df62c..4b12821528a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/interconnect.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interconnect.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/interconnect.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/interconnect.h</a></div><div class='hunk'>@@ -16,10 +16,13 @@</div><div class='ctx'> #define MBps_to_icc(x)	((x) * 1000)</div><div class='ctx'> #define GBps_to_icc(x)	((x) * 1000 * 1000)</div><div class='ctx'> #define bps_to_icc(x)	(1)</div><div class='del'>-#define kbps_to_icc(x)	((x) / 8 + ((x) % 8 ? 1 : 0))</div><div class='add'>+#define kbps_to_icc(x)	(((x) + 7) / 8)</div><div class='ctx'> #define Mbps_to_icc(x)	((x) * 1000 / 8)</div><div class='ctx'> #define Gbps_to_icc(x)	((x) * 1000 * 1000 / 8)</div><div class='ctx'> </div><div class='add'>+/* macro to indicate dynamic id allocation */</div><div class='add'>+#define ICC_ALLOC_DYN_ID	-1</div><div class='add'>+</div><div class='ctx'> struct icc_path;</div><div class='ctx'> struct device;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h<br/>index 76121c2bb4f8..266f2b39213a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/interrupt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interrupt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/interrupt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/interrupt.h</a></div><div class='hunk'>@@ -5,13 +5,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/irqreturn.h&gt;</div><div class='ctx'> #include &lt;linux/irqnr.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/irqflags.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/jump_label.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -67,6 +68,8 @@</div><div class='ctx'>  *                later.</div><div class='ctx'>  * IRQF_NO_DEBUG - Exclude from runnaway detection for IPI and similar handlers,</div><div class='ctx'>  *		   depends on IRQF_PERCPU.</div><div class='add'>+ * IRQF_COND_ONESHOT - Agree to do IRQF_ONESHOT if already set for a shared</div><div class='add'>+ *                 interrupt.</div><div class='ctx'>  */</div><div class='ctx'> #define IRQF_SHARED		0x00000080</div><div class='ctx'> #define IRQF_PROBE_SHARED	0x00000100</div><div class='hunk'>@@ -82,6 +85,7 @@</div><div class='ctx'> #define IRQF_COND_SUSPEND	0x00040000</div><div class='ctx'> #define IRQF_NO_AUTOEN		0x00080000</div><div class='ctx'> #define IRQF_NO_DEBUG		0x00100000</div><div class='add'>+#define IRQF_COND_ONESHOT	0x00200000</div><div class='ctx'> </div><div class='ctx'> #define IRQF_TIMER		(__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)</div><div class='ctx'> </div><div class='hunk'>@@ -105,6 +109,7 @@ typedef irqreturn_t (*irq_handler_t)(int, void *);</div><div class='ctx'>  * @name:	name of the device</div><div class='ctx'>  * @dev_id:	cookie to identify the device</div><div class='ctx'>  * @percpu_dev_id:	cookie to identify the device</div><div class='add'>+ * @affinity:	CPUs this irqaction is allowed to run on</div><div class='ctx'>  * @next:	pointer to the next irqaction for shared interrupts</div><div class='ctx'>  * @irq:	interrupt number</div><div class='ctx'>  * @flags:	flags (see IRQF_* above)</div><div class='hunk'>@@ -117,8 +122,11 @@ typedef irqreturn_t (*irq_handler_t)(int, void *);</div><div class='ctx'>  */</div><div class='ctx'> struct irqaction {</div><div class='ctx'> 	irq_handler_t		handler;</div><div class='del'>-	void			*dev_id;</div><div class='del'>-	void __percpu		*percpu_dev_id;</div><div class='add'>+	union {</div><div class='add'>+		void		*dev_id;</div><div class='add'>+		void __percpu	*percpu_dev_id;</div><div class='add'>+	};</div><div class='add'>+	const struct cpumask	*affinity;</div><div class='ctx'> 	struct irqaction	*next;</div><div class='ctx'> 	irq_handler_t		thread_fn;</div><div class='ctx'> 	struct task_struct	*thread;</div><div class='hunk'>@@ -136,7 +144,7 @@ extern irqreturn_t no_action(int cpl, void *dev_id);</div><div class='ctx'> /*</div><div class='ctx'>  * If a (PCI) device interrupt is not connected we set dev-&gt;irq to</div><div class='ctx'>  * IRQ_NOTCONNECTED. This causes request_irq() to fail with -ENOTCONN, so we</div><div class='del'>- * can distingiush that case from other error returns.</div><div class='add'>+ * can distinguish that case from other error returns.</div><div class='ctx'>  *</div><div class='ctx'>  * 0x80000000 is guaranteed to be outside the available range of interrupts</div><div class='ctx'>  * and easy to distinguish from other possible incorrect values.</div><div class='hunk'>@@ -165,7 +173,7 @@ static inline int __must_check</div><div class='ctx'> request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,</div><div class='ctx'> 	    const char *name, void *dev)</div><div class='ctx'> {</div><div class='del'>-	return request_threaded_irq(irq, handler, NULL, flags, name, dev);</div><div class='add'>+	return request_threaded_irq(irq, handler, NULL, flags | IRQF_COND_ONESHOT, name, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern int __must_check</div><div class='hunk'>@@ -175,7 +183,7 @@ request_any_context_irq(unsigned int irq, irq_handler_t handler,</div><div class='ctx'> extern int __must_check</div><div class='ctx'> __request_percpu_irq(unsigned int irq, irq_handler_t handler,</div><div class='ctx'> 		     unsigned long flags, const char *devname,</div><div class='del'>-		     void __percpu *percpu_dev_id);</div><div class='add'>+		     const cpumask_t *affinity, void __percpu *percpu_dev_id);</div><div class='ctx'> </div><div class='ctx'> extern int __must_check</div><div class='ctx'> request_nmi(unsigned int irq, irq_handler_t handler, unsigned long flags,</div><div class='hunk'>@@ -186,12 +194,21 @@ request_percpu_irq(unsigned int irq, irq_handler_t handler,</div><div class='ctx'> 		   const char *devname, void __percpu *percpu_dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	return __request_percpu_irq(irq, handler, 0,</div><div class='del'>-				    devname, percpu_dev_id);</div><div class='add'>+				    devname, NULL, percpu_dev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __must_check</div><div class='add'>+request_percpu_irq_affinity(unsigned int irq, irq_handler_t handler,</div><div class='add'>+			    const char *devname, const cpumask_t *affinity,</div><div class='add'>+			    void __percpu *percpu_dev_id)</div><div class='add'>+{</div><div class='add'>+	return __request_percpu_irq(irq, handler, 0,</div><div class='add'>+				    devname, affinity, percpu_dev_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern int __must_check</div><div class='del'>-request_percpu_nmi(unsigned int irq, irq_handler_t handler,</div><div class='del'>-		   const char *devname, void __percpu *dev);</div><div class='add'>+request_percpu_nmi(unsigned int irq, irq_handler_t handler, const char *name,</div><div class='add'>+		   const struct cpumask *affinity, void __percpu *dev_id);</div><div class='ctx'> </div><div class='ctx'> extern const void *free_irq(unsigned int, void *);</div><div class='ctx'> extern void free_percpu_irq(unsigned int, void __percpu *);</div><div class='hunk'>@@ -232,6 +249,9 @@ extern void enable_percpu_irq(unsigned int irq, unsigned int type);</div><div class='ctx'> extern bool irq_percpu_is_enabled(unsigned int irq);</div><div class='ctx'> extern void irq_wake_thread(unsigned int irq, void *dev_id);</div><div class='ctx'> </div><div class='add'>+DEFINE_LOCK_GUARD_1(disable_irq, int,</div><div class='add'>+		    disable_irq(*_T-&gt;lock), enable_irq(*_T-&gt;lock))</div><div class='add'>+</div><div class='ctx'> extern void disable_nmi_nosync(unsigned int irq);</div><div class='ctx'> extern void disable_percpu_nmi(unsigned int irq);</div><div class='ctx'> extern void enable_nmi(unsigned int irq);</div><div class='hunk'>@@ -269,7 +289,7 @@ struct irq_affinity_notify {</div><div class='ctx'> #define	IRQ_AFFINITY_MAX_SETS  4</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct irq_affinity - Description for automatic irq affinity assignements</div><div class='add'>+ * struct irq_affinity - Description for automatic irq affinity assignments</div><div class='ctx'>  * @pre_vectors:	Don't apply affinity to @pre_vectors at beginning of</div><div class='ctx'>  *			the MSI(-X) vector space</div><div class='ctx'>  * @post_vectors:	Don't apply affinity to @post_vectors at end of</div><div class='hunk'>@@ -441,7 +461,7 @@ irq_calc_affinity_vectors(unsigned int minvec, unsigned int maxvec,</div><div class='ctx'> static inline void disable_irq_nosync_lockdep(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='add'>+#if defined(CONFIG_LOCKDEP) &amp;&amp; !defined(CONFIG_PREEMPT_RT)</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -449,22 +469,14 @@ static inline void disable_irq_nosync_lockdep(unsigned int irq)</div><div class='ctx'> static inline void disable_irq_nosync_lockdep_irqsave(unsigned int irq, unsigned long *flags)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='add'>+#if defined(CONFIG_LOCKDEP) &amp;&amp; !defined(CONFIG_PREEMPT_RT)</div><div class='ctx'> 	local_irq_save(*flags);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void disable_irq_lockdep(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	disable_irq(irq);</div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='del'>-	local_irq_disable();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void enable_irq_lockdep(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='add'>+#if defined(CONFIG_LOCKDEP) &amp;&amp; !defined(CONFIG_PREEMPT_RT)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> #endif</div><div class='ctx'> 	enable_irq(irq);</div><div class='hunk'>@@ -472,7 +484,7 @@ static inline void enable_irq_lockdep(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> static inline void enable_irq_lockdep_irqrestore(unsigned int irq, unsigned long *flags)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='add'>+#if defined(CONFIG_LOCKDEP) &amp;&amp; !defined(CONFIG_PREEMPT_RT)</div><div class='ctx'> 	local_irq_restore(*flags);</div><div class='ctx'> #endif</div><div class='ctx'> 	enable_irq(irq);</div><div class='hunk'>@@ -587,7 +599,7 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];</div><div class='ctx'> </div><div class='ctx'> struct softirq_action</div><div class='ctx'> {</div><div class='del'>-	void	(*action)(struct softirq_action *);</div><div class='add'>+	void	(*action)(void);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_softirq(void);</div><div class='hunk'>@@ -602,13 +614,60 @@ static inline void do_softirq_post_smp_call_flush(unsigned int unused)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern void open_softirq(int nr, void (*action)(struct softirq_action *));</div><div class='add'>+extern void open_softirq(int nr, void (*action)(void));</div><div class='ctx'> extern void softirq_init(void);</div><div class='ctx'> extern void __raise_softirq_irqoff(unsigned int nr);</div><div class='ctx'> </div><div class='ctx'> extern void raise_softirq_irqoff(unsigned int nr);</div><div class='ctx'> extern void raise_softirq(unsigned int nr);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * With forced-threaded interrupts enabled a raised softirq is deferred to</div><div class='add'>+ * ksoftirqd unless it can be handled within the threaded interrupt. This</div><div class='add'>+ * affects timer_list timers and hrtimers which are explicitly marked with</div><div class='add'>+ * HRTIMER_MODE_SOFT.</div><div class='add'>+ * With PREEMPT_RT enabled more hrtimers are moved to softirq for processing</div><div class='add'>+ * which includes all timers which are not explicitly marked HRTIMER_MODE_HARD.</div><div class='add'>+ * Userspace controlled timers (like the clock_nanosleep() interface) is divided</div><div class='add'>+ * into two categories: Tasks with elevated scheduling policy including</div><div class='add'>+ * SCHED_{FIFO|RR|DL} and the remaining scheduling policy. The tasks with the</div><div class='add'>+ * elevated scheduling policy are woken up directly from the HARDIRQ while all</div><div class='add'>+ * other wake ups are delayed to softirq and so to ksoftirqd.</div><div class='add'>+ *</div><div class='add'>+ * The ksoftirqd runs at SCHED_OTHER policy at which it should remain since it</div><div class='add'>+ * handles the softirq in an overloaded situation (not handled everything</div><div class='add'>+ * within its last run).</div><div class='add'>+ * If the timers are handled at SCHED_OTHER priority then they competes with all</div><div class='add'>+ * other SCHED_OTHER tasks for CPU resources are possibly delayed.</div><div class='add'>+ * Moving timers softirqs to a low priority SCHED_FIFO thread instead ensures</div><div class='add'>+ * that timer are performed before scheduling any SCHED_OTHER thread.</div><div class='add'>+ */</div><div class='add'>+DECLARE_PER_CPU(struct task_struct *, ktimerd);</div><div class='add'>+DECLARE_PER_CPU(unsigned long, pending_timer_softirq);</div><div class='add'>+void raise_ktimers_thread(unsigned int nr);</div><div class='add'>+</div><div class='add'>+static inline unsigned int local_timers_pending_force_th(void)</div><div class='add'>+{</div><div class='add'>+	return __this_cpu_read(pending_timer_softirq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void raise_timer_softirq(unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_in_irq();</div><div class='add'>+	if (force_irqthreads())</div><div class='add'>+		raise_ktimers_thread(nr);</div><div class='add'>+	else</div><div class='add'>+		__raise_softirq_irqoff(nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int local_timers_pending(void)</div><div class='add'>+{</div><div class='add'>+	if (force_irqthreads())</div><div class='add'>+		return local_timers_pending_force_th();</div><div class='add'>+	else</div><div class='add'>+		return local_softirq_pending();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> DECLARE_PER_CPU(struct task_struct *, ksoftirqd);</div><div class='ctx'> </div><div class='ctx'> static inline struct task_struct *this_cpu_ksoftirqd(void)</div><div class='head'>diff --git a/include/linux/interval_tree.h b/include/linux/interval_tree.h<br/>index 2b8026a39906..9d5791e9f737 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/interval_tree.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interval_tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/interval_tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/interval_tree.h</a></div><div class='hunk'>@@ -20,6 +20,10 @@ interval_tree_remove(struct interval_tree_node *node,</div><div class='ctx'> 		     struct rb_root_cached *root);</div><div class='ctx'> </div><div class='ctx'> extern struct interval_tree_node *</div><div class='add'>+interval_tree_subtree_search(struct interval_tree_node *node,</div><div class='add'>+			     unsigned long start, unsigned long last);</div><div class='add'>+</div><div class='add'>+extern struct interval_tree_node *</div><div class='ctx'> interval_tree_iter_first(struct rb_root_cached *root,</div><div class='ctx'> 			 unsigned long start, unsigned long last);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/interval_tree_generic.h b/include/linux/interval_tree_generic.h<br/>index aaa8a0767aa3..c5a2fed49eb0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/interval_tree_generic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/interval_tree_generic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/interval_tree_generic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/interval_tree_generic.h</a></div><div class='hunk'>@@ -77,7 +77,7 @@ ITSTATIC void ITPREFIX ## _remove(ITSTRUCT *node,			      \</div><div class='ctx'>  *   Cond2: start &lt;= ITLAST(node)					      \</div><div class='ctx'>  */									      \</div><div class='ctx'> 									      \</div><div class='del'>-static ITSTRUCT *							      \</div><div class='add'>+ITSTATIC ITSTRUCT *							      \</div><div class='ctx'> ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last)	      \</div><div class='ctx'> {									      \</div><div class='ctx'> 	while (true) {							      \</div><div class='hunk'>@@ -104,12 +104,8 @@ ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last)	      \</div><div class='ctx'> 		if (ITSTART(node) &lt;= last) {		/* Cond1 */	      \</div><div class='ctx'> 			if (start &lt;= ITLAST(node))	/* Cond2 */	      \</div><div class='ctx'> 				return node;	/* node is leftmost match */  \</div><div class='del'>-			if (node-&gt;ITRB.rb_right) {			      \</div><div class='del'>-				node = rb_entry(node-&gt;ITRB.rb_right,	      \</div><div class='del'>-						ITSTRUCT, ITRB);	      \</div><div class='del'>-				if (start &lt;= node-&gt;ITSUBTREE)		      \</div><div class='del'>-					continue;			      \</div><div class='del'>-			}						      \</div><div class='add'>+			node = rb_entry(node-&gt;ITRB.rb_right, ITSTRUCT, ITRB); \</div><div class='add'>+			continue;					      \</div><div class='ctx'> 		}							      \</div><div class='ctx'> 		return NULL;	/* No match */				      \</div><div class='ctx'> 	}								      \</div><div class='head'>diff --git a/include/linux/io-64-nonatomic-hi-lo.h b/include/linux/io-64-nonatomic-hi-lo.h<br/>index f32522bb3aa5..d3eade7cf663 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/io-64-nonatomic-hi-lo.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io-64-nonatomic-hi-lo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io-64-nonatomic-hi-lo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io-64-nonatomic-hi-lo.h</a></div><div class='hunk'>@@ -101,22 +101,38 @@ static inline void iowrite64be_hi_lo(u64 val, void __iomem *addr)</div><div class='ctx'> </div><div class='ctx'> #ifndef ioread64</div><div class='ctx'> #define ioread64_is_nonatomic</div><div class='add'>+#if defined(CONFIG_GENERIC_IOMAP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#define ioread64 __ioread64_hi_lo</div><div class='add'>+#else</div><div class='ctx'> #define ioread64 ioread64_hi_lo</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef iowrite64</div><div class='ctx'> #define iowrite64_is_nonatomic</div><div class='add'>+#if defined(CONFIG_GENERIC_IOMAP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#define iowrite64 __iowrite64_hi_lo</div><div class='add'>+#else</div><div class='ctx'> #define iowrite64 iowrite64_hi_lo</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef ioread64be</div><div class='ctx'> #define ioread64be_is_nonatomic</div><div class='add'>+#if defined(CONFIG_GENERIC_IOMAP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#define ioread64be __ioread64be_hi_lo</div><div class='add'>+#else</div><div class='ctx'> #define ioread64be ioread64be_hi_lo</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef iowrite64be</div><div class='ctx'> #define iowrite64be_is_nonatomic</div><div class='add'>+#if defined(CONFIG_GENERIC_IOMAP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#define iowrite64be __iowrite64be_hi_lo</div><div class='add'>+#else</div><div class='ctx'> #define iowrite64be iowrite64be_hi_lo</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif	/* _LINUX_IO_64_NONATOMIC_HI_LO_H_ */</div><div class='head'>diff --git a/include/linux/io-64-nonatomic-lo-hi.h b/include/linux/io-64-nonatomic-lo-hi.h<br/>index 448a21435dba..94e676ec3d3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/io-64-nonatomic-lo-hi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io-64-nonatomic-lo-hi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io-64-nonatomic-lo-hi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io-64-nonatomic-lo-hi.h</a></div><div class='hunk'>@@ -101,22 +101,38 @@ static inline void iowrite64be_lo_hi(u64 val, void __iomem *addr)</div><div class='ctx'> </div><div class='ctx'> #ifndef ioread64</div><div class='ctx'> #define ioread64_is_nonatomic</div><div class='add'>+#if defined(CONFIG_GENERIC_IOMAP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#define ioread64 __ioread64_lo_hi</div><div class='add'>+#else</div><div class='ctx'> #define ioread64 ioread64_lo_hi</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef iowrite64</div><div class='ctx'> #define iowrite64_is_nonatomic</div><div class='add'>+#if defined(CONFIG_GENERIC_IOMAP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#define iowrite64 __iowrite64_lo_hi</div><div class='add'>+#else</div><div class='ctx'> #define iowrite64 iowrite64_lo_hi</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef ioread64be</div><div class='ctx'> #define ioread64be_is_nonatomic</div><div class='add'>+#if defined(CONFIG_GENERIC_IOMAP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#define ioread64be __ioread64be_lo_hi</div><div class='add'>+#else</div><div class='ctx'> #define ioread64be ioread64be_lo_hi</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef iowrite64be</div><div class='ctx'> #define iowrite64be_is_nonatomic</div><div class='add'>+#if defined(CONFIG_GENERIC_IOMAP) &amp;&amp; defined(CONFIG_64BIT)</div><div class='add'>+#define iowrite64be __iowrite64be_lo_hi</div><div class='add'>+#else</div><div class='ctx'> #define iowrite64be iowrite64be_lo_hi</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif	/* _LINUX_IO_64_NONATOMIC_LO_HI_H_ */</div><div class='head'>diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h<br/>index 7376c1df9c90..c16353cc6e3c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/io-mapping.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io-mapping.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io-mapping.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io-mapping.h</a></div><div class='hunk'>@@ -225,7 +225,4 @@ io_mapping_free(struct io_mapping *iomap)</div><div class='ctx'> 	kfree(iomap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int io_mapping_map_user(struct io_mapping *iomap, struct vm_area_struct *vma,</div><div class='del'>-		unsigned long addr, unsigned long pfn, unsigned long size);</div><div class='del'>-</div><div class='ctx'> #endif /* _LINUX_IO_MAPPING_H */</div><div class='head'>diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h<br/>index 86cf1f7ae389..7a1516011ccf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/io-pgtable.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io-pgtable.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io-pgtable.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io-pgtable.h</a></div><div class='hunk'>@@ -15,8 +15,6 @@ enum io_pgtable_fmt {</div><div class='ctx'> 	ARM_64_LPAE_S2,</div><div class='ctx'> 	ARM_V7S,</div><div class='ctx'> 	ARM_MALI_LPAE,</div><div class='del'>-	AMD_IOMMU_V1,</div><div class='del'>-	AMD_IOMMU_V2,</div><div class='ctx'> 	APPLE_DART,</div><div class='ctx'> 	APPLE_DART2,</div><div class='ctx'> 	IO_PGTABLE_NUM_FMTS,</div><div class='hunk'>@@ -85,6 +83,16 @@ struct io_pgtable_cfg {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * IO_PGTABLE_QUIRK_ARM_OUTER_WBWA: Override the outer-cacheability</div><div class='ctx'> 	 *	attributes set in the TCR for a non-coherent page-table walker.</div><div class='add'>+	 *</div><div class='add'>+	 * IO_PGTABLE_QUIRK_ARM_HD: Enables dirty tracking in stage 1 pagetable.</div><div class='add'>+	 * IO_PGTABLE_QUIRK_ARM_S2FWB: Use the FWB format for the MemAttrs bits</div><div class='add'>+	 *</div><div class='add'>+	 * IO_PGTABLE_QUIRK_NO_WARN: Do not WARN_ON() on conflicting</div><div class='add'>+	 *	mappings, but silently return -EEXISTS.  Normally an attempt</div><div class='add'>+	 *	to map over an existing mapping would indicate some sort of</div><div class='add'>+	 *	kernel bug, which would justify the WARN_ON().  But for GPU</div><div class='add'>+	 *	drivers, this could be under control of userspace.  Which</div><div class='add'>+	 *	deserves an error return, but not to spam dmesg.</div><div class='ctx'> 	 */</div><div class='ctx'> 	#define IO_PGTABLE_QUIRK_ARM_NS			BIT(0)</div><div class='ctx'> 	#define IO_PGTABLE_QUIRK_NO_PERMS		BIT(1)</div><div class='hunk'>@@ -92,6 +100,9 @@ struct io_pgtable_cfg {</div><div class='ctx'> 	#define IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT	BIT(4)</div><div class='ctx'> 	#define IO_PGTABLE_QUIRK_ARM_TTBR1		BIT(5)</div><div class='ctx'> 	#define IO_PGTABLE_QUIRK_ARM_OUTER_WBWA		BIT(6)</div><div class='add'>+	#define IO_PGTABLE_QUIRK_ARM_HD			BIT(7)</div><div class='add'>+	#define IO_PGTABLE_QUIRK_ARM_S2FWB		BIT(8)</div><div class='add'>+	#define IO_PGTABLE_QUIRK_NO_WARN		BIT(9)</div><div class='ctx'> 	unsigned long			quirks;</div><div class='ctx'> 	unsigned long			pgsize_bitmap;</div><div class='ctx'> 	unsigned int			ias;</div><div class='hunk'>@@ -167,16 +178,31 @@ struct io_pgtable_cfg {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u64 ttbr[4];</div><div class='ctx'> 			u32 n_ttbrs;</div><div class='add'>+			u32 n_levels;</div><div class='ctx'> 		} apple_dart_cfg;</div><div class='add'>+</div><div class='add'>+		struct {</div><div class='add'>+			int nid;</div><div class='add'>+		} amd;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct arm_lpae_io_pgtable_walk_data - information from a pgtable walk</div><div class='add'>+ *</div><div class='add'>+ * @ptes:     The recorded PTE values from the walk</div><div class='add'>+ */</div><div class='add'>+struct arm_lpae_io_pgtable_walk_data {</div><div class='add'>+	u64 ptes[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct io_pgtable_ops - Page table manipulation API for IOMMU drivers.</div><div class='ctx'>  *</div><div class='ctx'>  * @map_pages:    Map a physically contiguous range of pages of the same size.</div><div class='ctx'>  * @unmap_pages:  Unmap a range of virtually contiguous pages of the same size.</div><div class='ctx'>  * @iova_to_phys: Translate iova to physical address.</div><div class='add'>+ * @pgtable_walk: (optional) Perform a page table walk for a given iova.</div><div class='ctx'>  *</div><div class='ctx'>  * These functions map directly onto the iommu_ops member functions with</div><div class='ctx'>  * the same names.</div><div class='hunk'>@@ -190,6 +216,7 @@ struct io_pgtable_ops {</div><div class='ctx'> 			      struct iommu_iotlb_gather *gather);</div><div class='ctx'> 	phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,</div><div class='ctx'> 				    unsigned long iova);</div><div class='add'>+	int (*pgtable_walk)(struct io_pgtable_ops *ops, unsigned long iova, void *wd);</div><div class='ctx'> 	int (*read_and_clear_dirty)(struct io_pgtable_ops *ops,</div><div class='ctx'> 				    unsigned long iova, size_t size,</div><div class='ctx'> 				    unsigned long flags,</div><div class='head'>diff --git a/include/linux/io.h b/include/linux/io.h<br/>index 235ba7d80a8f..0642c7ee41db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/io.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io.h</a></div><div class='hunk'>@@ -6,19 +6,23 @@</div><div class='ctx'> #ifndef _LINUX_IO_H</div><div class='ctx'> #define _LINUX_IO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='del'>-struct resource;</div><div class='ctx'> </div><div class='del'>-__visible void __iowrite32_copy(void __iomem *to, const void *from, size_t count);</div><div class='add'>+#ifndef __iowrite32_copy</div><div class='add'>+void __iowrite32_copy(void __iomem *to, const void *from, size_t count);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __ioread32_copy(void *to, const void __iomem *from, size_t count);</div><div class='add'>+</div><div class='add'>+#ifndef __iowrite64_copy</div><div class='ctx'> void __iowrite64_copy(void __iomem *to, const void *from, size_t count);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> int ioremap_page_range(unsigned long addr, unsigned long end,</div><div class='hunk'>@@ -58,8 +62,6 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err)</div><div class='del'>-</div><div class='ctx'> void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,</div><div class='ctx'> 			   resource_size_t size);</div><div class='ctx'> void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,</div><div class='hunk'>@@ -181,4 +183,25 @@ static inline void arch_io_free_memtype_wc(resource_size_t base,</div><div class='ctx'> int devm_arch_io_reserve_memtype_wc(struct device *dev, resource_size_t start,</div><div class='ctx'> 				    resource_size_t size);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_STRICT_DEVMEM</div><div class='add'>+static inline int range_is_allowed(unsigned long pfn, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	u64 from = ((u64)pfn) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	u64 to = from + size;</div><div class='add'>+	u64 cursor = from;</div><div class='add'>+</div><div class='add'>+	while (cursor &lt; to) {</div><div class='add'>+		if (!devmem_is_allowed(pfn))</div><div class='add'>+			return 0;</div><div class='add'>+		cursor += PAGE_SIZE;</div><div class='add'>+		pfn++;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int range_is_allowed(unsigned long pfn, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> #endif /* _LINUX_IO_H */</div><div class='head'>diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h<br/>index 68ed6697fece..85fe4e6b275c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/io_uring.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io_uring.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io_uring.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io_uring.h</a></div><div class='hunk'>@@ -11,15 +11,12 @@ void __io_uring_cancel(bool cancel_all);</div><div class='ctx'> void __io_uring_free(struct task_struct *tsk);</div><div class='ctx'> void io_uring_unreg_ringfd(void);</div><div class='ctx'> const char *io_uring_get_opcode(u8 opcode);</div><div class='del'>-int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags);</div><div class='ctx'> bool io_is_uring_fops(struct file *file);</div><div class='ctx'> </div><div class='ctx'> static inline void io_uring_files_cancel(void)</div><div class='ctx'> {</div><div class='del'>-	if (current-&gt;io_uring) {</div><div class='del'>-		io_uring_unreg_ringfd();</div><div class='add'>+	if (current-&gt;io_uring)</div><div class='ctx'> 		__io_uring_cancel(false);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> static inline void io_uring_task_cancel(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -45,11 +42,6 @@ static inline const char *io_uring_get_opcode(u8 opcode)</div><div class='ctx'> {</div><div class='ctx'> 	return "";</div><div class='ctx'> }</div><div class='del'>-static inline int io_uring_cmd_sock(struct io_uring_cmd *cmd,</div><div class='del'>-				    unsigned int issue_flags)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='ctx'> static inline bool io_is_uring_fops(struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='head'>diff --git a/include/linux/io_uring/cmd.h b/include/linux/io_uring/cmd.h<br/>index e453a997c060..375fd048c4cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/io_uring/cmd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io_uring/cmd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io_uring/cmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io_uring/cmd.h</a></div><div class='hunk'>@@ -4,18 +4,20 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/io_uring.h&gt;</div><div class='ctx'> #include &lt;linux/io_uring_types.h&gt;</div><div class='add'>+#include &lt;linux/blk-mq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* only top 8 bits of sqe-&gt;uring_cmd_flags for kernel internal use */</div><div class='ctx'> #define IORING_URING_CMD_CANCELABLE	(1U &lt;&lt; 30)</div><div class='add'>+/* io_uring_cmd is being issued again */</div><div class='add'>+#define IORING_URING_CMD_REISSUE	(1U &lt;&lt; 31)</div><div class='ctx'> </div><div class='ctx'> struct io_uring_cmd {</div><div class='ctx'> 	struct file	*file;</div><div class='ctx'> 	const struct io_uring_sqe *sqe;</div><div class='del'>-	/* callback to defer completions to task context */</div><div class='del'>-	void (*task_work_cb)(struct io_uring_cmd *cmd, unsigned);</div><div class='ctx'> 	u32		cmd_op;</div><div class='ctx'> 	u32		flags;</div><div class='ctx'> 	u8		pdu[32]; /* available inline for free use */</div><div class='add'>+	u8		unused[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)</div><div class='hunk'>@@ -23,55 +25,160 @@ static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)</div><div class='ctx'> 	return sqe-&gt;cmd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void io_uring_cmd_private_sz_check(size_t cmd_sz)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(cmd_sz &gt; sizeof_field(struct io_uring_cmd, pdu));</div><div class='add'>+}</div><div class='add'>+#define io_uring_cmd_to_pdu(cmd, pdu_type) ( \</div><div class='add'>+	io_uring_cmd_private_sz_check(sizeof(pdu_type)), \</div><div class='add'>+	((pdu_type *)&amp;(cmd)-&gt;pdu) \</div><div class='add'>+)</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_IO_URING)</div><div class='ctx'> int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,</div><div class='del'>-			      struct iov_iter *iter, void *ioucmd);</div><div class='del'>-void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, ssize_t res2,</div><div class='del'>-			unsigned issue_flags);</div><div class='add'>+			      struct iov_iter *iter,</div><div class='add'>+			      struct io_uring_cmd *ioucmd,</div><div class='add'>+			      unsigned int issue_flags);</div><div class='add'>+int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd,</div><div class='add'>+				  const struct iovec __user *uvec,</div><div class='add'>+				  size_t uvec_segs,</div><div class='add'>+				  int ddir, struct iov_iter *iter,</div><div class='add'>+				  unsigned issue_flags);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Completes the request, i.e. posts an io_uring CQE and deallocates @ioucmd</div><div class='add'>+ * and the corresponding io_uring request.</div><div class='add'>+ *</div><div class='add'>+ * Note: the caller should never hard code @issue_flags and is only allowed</div><div class='add'>+ * to pass the mask provided by the core io_uring code.</div><div class='add'>+ */</div><div class='add'>+void __io_uring_cmd_done(struct io_uring_cmd *cmd, s32 ret, u64 res2,</div><div class='add'>+			 unsigned issue_flags, bool is_cqe32);</div><div class='add'>+</div><div class='ctx'> void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,</div><div class='del'>-			    void (*task_work_cb)(struct io_uring_cmd *, unsigned),</div><div class='add'>+			    io_req_tw_func_t task_work_cb,</div><div class='ctx'> 			    unsigned flags);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Note: the caller should never hard code @issue_flags and only use the</div><div class='add'>+ * mask provided by the core io_uring code.</div><div class='add'>+ */</div><div class='ctx'> void io_uring_cmd_mark_cancelable(struct io_uring_cmd *cmd,</div><div class='ctx'> 		unsigned int issue_flags);</div><div class='ctx'> </div><div class='add'>+/* Execute the request from a blocking context */</div><div class='add'>+void io_uring_cmd_issue_blocking(struct io_uring_cmd *ioucmd);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Select a buffer from the provided buffer group for multishot uring_cmd.</div><div class='add'>+ * Returns the selected buffer address and size.</div><div class='add'>+ */</div><div class='add'>+struct io_br_sel io_uring_cmd_buffer_select(struct io_uring_cmd *ioucmd,</div><div class='add'>+					    unsigned buf_group, size_t *len,</div><div class='add'>+					    unsigned int issue_flags);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Complete a multishot uring_cmd event. This will post a CQE to the completion</div><div class='add'>+ * queue and update the provided buffer.</div><div class='add'>+ */</div><div class='add'>+bool io_uring_mshot_cmd_post_cqe(struct io_uring_cmd *ioucmd,</div><div class='add'>+				 struct io_br_sel *sel, unsigned int issue_flags);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='del'>-static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,</div><div class='del'>-			      struct iov_iter *iter, void *ioucmd)</div><div class='add'>+static inline int</div><div class='add'>+io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,</div><div class='add'>+			  struct iov_iter *iter, struct io_uring_cmd *ioucmd,</div><div class='add'>+			  unsigned int issue_flags)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret,</div><div class='del'>-		ssize_t ret2, unsigned issue_flags)</div><div class='add'>+static inline int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd,</div><div class='add'>+						const struct iovec __user *uvec,</div><div class='add'>+						size_t uvec_segs,</div><div class='add'>+						int ddir, struct iov_iter *iter,</div><div class='add'>+						unsigned issue_flags)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline void __io_uring_cmd_done(struct io_uring_cmd *cmd, s32 ret,</div><div class='add'>+		u64 ret2, unsigned issue_flags, bool is_cqe32)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd,</div><div class='del'>-			    void (*task_work_cb)(struct io_uring_cmd *, unsigned),</div><div class='del'>-			    unsigned flags)</div><div class='add'>+			    io_req_tw_func_t task_work_cb, unsigned flags)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void io_uring_cmd_mark_cancelable(struct io_uring_cmd *cmd,</div><div class='ctx'> 		unsigned int issue_flags)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline void io_uring_cmd_issue_blocking(struct io_uring_cmd *ioucmd)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline struct io_br_sel</div><div class='add'>+io_uring_cmd_buffer_select(struct io_uring_cmd *ioucmd, unsigned buf_group,</div><div class='add'>+			   size_t *len, unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	return (struct io_br_sel) { .val = -EOPNOTSUPP };</div><div class='add'>+}</div><div class='add'>+static inline bool io_uring_mshot_cmd_post_cqe(struct io_uring_cmd *ioucmd,</div><div class='add'>+				struct io_br_sel *sel, unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline struct io_uring_cmd *io_uring_cmd_from_tw(struct io_tw_req tw_req)</div><div class='add'>+{</div><div class='add'>+	return io_kiocb_to_cmd(tw_req.req, struct io_uring_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* task_work executor checks the deferred list completion */</div><div class='add'>+#define IO_URING_CMD_TASK_WORK_ISSUE_FLAGS IO_URING_F_COMPLETE_DEFER</div><div class='add'>+</div><div class='ctx'> /* users must follow the IOU_F_TWQ_LAZY_WAKE semantics */</div><div class='ctx'> static inline void io_uring_cmd_do_in_task_lazy(struct io_uring_cmd *ioucmd,</div><div class='del'>-			void (*task_work_cb)(struct io_uring_cmd *, unsigned))</div><div class='add'>+			io_req_tw_func_t task_work_cb)</div><div class='ctx'> {</div><div class='ctx'> 	__io_uring_cmd_do_in_task(ioucmd, task_work_cb, IOU_F_TWQ_LAZY_WAKE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void io_uring_cmd_complete_in_task(struct io_uring_cmd *ioucmd,</div><div class='del'>-			void (*task_work_cb)(struct io_uring_cmd *, unsigned))</div><div class='add'>+			io_req_tw_func_t task_work_cb)</div><div class='ctx'> {</div><div class='ctx'> 	__io_uring_cmd_do_in_task(ioucmd, task_work_cb, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct task_struct *io_uring_cmd_get_task(struct io_uring_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	return cmd_to_io_kiocb(cmd)-&gt;task;</div><div class='add'>+	return cmd_to_io_kiocb(cmd)-&gt;tctx-&gt;task;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return uring_cmd's context reference as its context handle for driver to</div><div class='add'>+ * track per-context resource, such as registered kernel IO buffer</div><div class='add'>+ */</div><div class='add'>+static inline void *io_uring_cmd_ctx_handle(struct io_uring_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	return cmd_to_io_kiocb(cmd)-&gt;ctx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void io_uring_cmd_done(struct io_uring_cmd *ioucmd, s32 ret,</div><div class='add'>+				     unsigned issue_flags)</div><div class='add'>+{</div><div class='add'>+	return __io_uring_cmd_done(ioucmd, ret, 0, issue_flags, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void io_uring_cmd_done32(struct io_uring_cmd *ioucmd, s32 ret,</div><div class='add'>+				       u64 res2, unsigned issue_flags)</div><div class='add'>+{</div><div class='add'>+	return __io_uring_cmd_done(ioucmd, ret, res2, issue_flags, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int io_buffer_register_bvec(struct io_uring_cmd *cmd, struct request *rq,</div><div class='add'>+			    void (*release)(void *), unsigned int index,</div><div class='add'>+			    unsigned int issue_flags);</div><div class='add'>+int io_buffer_unregister_bvec(struct io_uring_cmd *cmd, unsigned int index,</div><div class='add'>+			      unsigned int issue_flags);</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_IO_URING_CMD_H */</div><div class='head'>diff --git a/include/linux/io_uring/net.h b/include/linux/io_uring/net.h<br/>new file mode 100644<br/>index 000000000000..b58f39fed4d5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io_uring/net.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io_uring/net.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef _LINUX_IO_URING_NET_H</div><div class='add'>+#define _LINUX_IO_URING_NET_H</div><div class='add'>+</div><div class='add'>+struct io_uring_cmd;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_IO_URING)</div><div class='add'>+int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline int io_uring_cmd_sock(struct io_uring_cmd *cmd,</div><div class='add'>+				    unsigned int issue_flags)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h<br/>index e24893625085..e1adb0d20a0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/io_uring_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/io_uring_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/io_uring_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/io_uring_types.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@ enum {</div><div class='ctx'> 	 * A hint to not wake right away but delay until there are enough of</div><div class='ctx'> 	 * tw's queued to match the number of CQEs the task is waiting for.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Must not be used wirh requests generating more than one CQE.</div><div class='add'>+	 * Must not be used with requests generating more than one CQE.</div><div class='ctx'> 	 * It's also ignored unless IORING_SETUP_DEFER_TASKRUN is set.</div><div class='ctx'> 	 */</div><div class='ctx'> 	IOU_F_TWQ_LAZY_WAKE			= 1,</div><div class='hunk'>@@ -26,6 +26,8 @@ enum io_uring_cmd_flags {</div><div class='ctx'> 	IO_URING_F_MULTISHOT		= 4,</div><div class='ctx'> 	/* executed by io-wq */</div><div class='ctx'> 	IO_URING_F_IOWQ			= 8,</div><div class='add'>+	/* executed inline from syscall */</div><div class='add'>+	IO_URING_F_INLINE		= 16,</div><div class='ctx'> 	/* int's last bit, sign checks are usually faster than a bit test */</div><div class='ctx'> 	IO_URING_F_NONBLOCK		= INT_MIN,</div><div class='ctx'> </div><div class='hunk'>@@ -50,24 +52,23 @@ struct io_wq_work_list {</div><div class='ctx'> </div><div class='ctx'> struct io_wq_work {</div><div class='ctx'> 	struct io_wq_work_node list;</div><div class='del'>-	unsigned flags;</div><div class='add'>+	atomic_t flags;</div><div class='ctx'> 	/* place it here instead of io_kiocb as it fills padding and saves 4B */</div><div class='ctx'> 	int cancel_seq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct io_fixed_file {</div><div class='del'>-	/* file * with additional FFS_* flags */</div><div class='del'>-	unsigned long file_ptr;</div><div class='add'>+struct io_rsrc_data {</div><div class='add'>+	unsigned int			nr;</div><div class='add'>+	struct io_rsrc_node		**nodes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct io_file_table {</div><div class='del'>-	struct io_fixed_file *files;</div><div class='add'>+	struct io_rsrc_data data;</div><div class='ctx'> 	unsigned long *bitmap;</div><div class='ctx'> 	unsigned int alloc_hint;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct io_hash_bucket {</div><div class='del'>-	spinlock_t		lock;</div><div class='ctx'> 	struct hlist_head	list;</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='hunk'>@@ -76,6 +77,32 @@ struct io_hash_table {</div><div class='ctx'> 	unsigned		hash_bits;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct io_mapped_region {</div><div class='add'>+	struct page		**pages;</div><div class='add'>+	void			*ptr;</div><div class='add'>+	unsigned		nr_pages;</div><div class='add'>+	unsigned		flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return value from io_buffer_list selection, to avoid stashing it in</div><div class='add'>+ * struct io_kiocb. For legacy/classic provided buffers, keeping a reference</div><div class='add'>+ * across execution contexts are fine. But for ring provided buffers, the</div><div class='add'>+ * list may go away as soon as -&gt;uring_lock is dropped. As the io_kiocb</div><div class='add'>+ * persists, it's better to just keep the buffer local for those cases.</div><div class='add'>+ */</div><div class='add'>+struct io_br_sel {</div><div class='add'>+	struct io_buffer_list *buf_list;</div><div class='add'>+	/*</div><div class='add'>+	 * Some selection parts return the user address, others return an error.</div><div class='add'>+	 */</div><div class='add'>+	union {</div><div class='add'>+		void __user *addr;</div><div class='add'>+		ssize_t val;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Arbitrary limit, can be raised if need be</div><div class='ctx'>  */</div><div class='hunk'>@@ -85,6 +112,7 @@ struct io_uring_task {</div><div class='ctx'> 	/* submission side */</div><div class='ctx'> 	int				cached_refs;</div><div class='ctx'> 	const struct io_ring_ctx 	*last;</div><div class='add'>+	struct task_struct		*task;</div><div class='ctx'> 	struct io_wq			*io_wq;</div><div class='ctx'> 	struct file			*registered_rings[IO_RINGFD_REG_MAX];</div><div class='ctx'> </div><div class='hunk'>@@ -100,6 +128,14 @@ struct io_uring_task {</div><div class='ctx'> 	} ____cacheline_aligned_in_smp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct iou_vec {</div><div class='add'>+	union {</div><div class='add'>+		struct iovec	*iovec;</div><div class='add'>+		struct bio_vec	*bvec;</div><div class='add'>+	};</div><div class='add'>+	unsigned		nr; /* number of struct iovec it can hold */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct io_uring {</div><div class='ctx'> 	u32 head;</div><div class='ctx'> 	u32 tail;</div><div class='hunk'>@@ -205,24 +241,17 @@ struct io_submit_state {</div><div class='ctx'> </div><div class='ctx'> 	bool			plug_started;</div><div class='ctx'> 	bool			need_plug;</div><div class='add'>+	bool			cq_flush;</div><div class='ctx'> 	unsigned short		submit_nr;</div><div class='del'>-	unsigned int		cqes_count;</div><div class='ctx'> 	struct blk_plug		plug;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct io_ev_fd {</div><div class='del'>-	struct eventfd_ctx	*cq_ev_fd;</div><div class='del'>-	unsigned int		eventfd_async: 1;</div><div class='del'>-	struct rcu_head		rcu;</div><div class='del'>-	atomic_t		refs;</div><div class='del'>-	atomic_t		ops;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct io_alloc_cache {</div><div class='del'>-	struct io_wq_work_node	list;</div><div class='add'>+	void			**entries;</div><div class='ctx'> 	unsigned int		nr_cached;</div><div class='ctx'> 	unsigned int		max_cached;</div><div class='del'>-	size_t			elem_size;</div><div class='add'>+	unsigned int		elem_size;</div><div class='add'>+	unsigned int		init_clear;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct io_ring_ctx {</div><div class='hunk'>@@ -247,6 +276,9 @@ struct io_ring_ctx {</div><div class='ctx'> 		struct io_rings		*rings;</div><div class='ctx'> 		struct percpu_ref	refs;</div><div class='ctx'> </div><div class='add'>+		clockid_t		clockid;</div><div class='add'>+		enum tk_offsets		clock_offset;</div><div class='add'>+</div><div class='ctx'> 		enum task_work_notify_mode	notify_method;</div><div class='ctx'> 		unsigned			sq_thread_idle;</div><div class='ctx'> 	} ____cacheline_aligned_in_smp;</div><div class='hunk'>@@ -275,7 +307,6 @@ struct io_ring_ctx {</div><div class='ctx'> 		 * Fixed resources fast path, should be accessed only under</div><div class='ctx'> 		 * uring_lock, and updated through io_uring_register(2)</div><div class='ctx'> 		 */</div><div class='del'>-		struct io_rsrc_node	*rsrc_node;</div><div class='ctx'> 		atomic_t		cancel_seq;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -288,24 +319,35 @@ struct io_ring_ctx {</div><div class='ctx'> 		struct io_wq_work_list	iopoll_list;</div><div class='ctx'> </div><div class='ctx'> 		struct io_file_table	file_table;</div><div class='del'>-		struct io_mapped_ubuf	**user_bufs;</div><div class='del'>-		unsigned		nr_user_files;</div><div class='del'>-		unsigned		nr_user_bufs;</div><div class='add'>+		struct io_rsrc_data	buf_table;</div><div class='add'>+		struct io_alloc_cache	node_cache;</div><div class='add'>+		struct io_alloc_cache	imu_cache;</div><div class='ctx'> </div><div class='ctx'> 		struct io_submit_state	submit_state;</div><div class='ctx'> </div><div class='del'>-		struct io_buffer_list	*io_bl;</div><div class='add'>+		/*</div><div class='add'>+		 * Modifications are protected by -&gt;uring_lock and -&gt;mmap_lock.</div><div class='add'>+		 * The buffer list's io mapped region should be stable once</div><div class='add'>+		 * published.</div><div class='add'>+		 */</div><div class='ctx'> 		struct xarray		io_bl_xa;</div><div class='ctx'> </div><div class='del'>-		struct io_hash_table	cancel_table_locked;</div><div class='add'>+		struct io_hash_table	cancel_table;</div><div class='ctx'> 		struct io_alloc_cache	apoll_cache;</div><div class='ctx'> 		struct io_alloc_cache	netmsg_cache;</div><div class='add'>+		struct io_alloc_cache	rw_cache;</div><div class='add'>+		struct io_alloc_cache	cmd_cache;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Any cancelable uring_cmd is added to this list in</div><div class='ctx'> 		 * -&gt;uring_cmd() by io_uring_cmd_insert_cancelable()</div><div class='ctx'> 		 */</div><div class='ctx'> 		struct hlist_head	cancelable_uring_cmd;</div><div class='add'>+		/*</div><div class='add'>+		 * For Hybrid IOPOLL, runtime in hybrid polling, without</div><div class='add'>+		 * scheduling time</div><div class='add'>+		 */</div><div class='add'>+		u64					hybrid_poll_time;</div><div class='ctx'> 	} ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -319,7 +361,9 @@ struct io_ring_ctx {</div><div class='ctx'> 		unsigned		cached_cq_tail;</div><div class='ctx'> 		unsigned		cq_entries;</div><div class='ctx'> 		struct io_ev_fd	__rcu	*io_ev_fd;</div><div class='del'>-		unsigned		cq_extra;</div><div class='add'>+</div><div class='add'>+		void			*cq_wait_arg;</div><div class='add'>+		size_t			cq_wait_size;</div><div class='ctx'> 	} ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -328,6 +372,7 @@ struct io_ring_ctx {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct llist_head	work_llist;</div><div class='add'>+		struct llist_head	retry_llist;</div><div class='ctx'> 		unsigned long		check_cq;</div><div class='ctx'> 		atomic_t		cq_wait_nr;</div><div class='ctx'> 		atomic_t		cq_timeouts;</div><div class='hunk'>@@ -336,23 +381,15 @@ struct io_ring_ctx {</div><div class='ctx'> </div><div class='ctx'> 	/* timeouts */</div><div class='ctx'> 	struct {</div><div class='del'>-		spinlock_t		timeout_lock;</div><div class='add'>+		raw_spinlock_t		timeout_lock;</div><div class='ctx'> 		struct list_head	timeout_list;</div><div class='ctx'> 		struct list_head	ltimeout_list;</div><div class='ctx'> 		unsigned		cq_last_tm_flush;</div><div class='ctx'> 	} ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='del'>-	struct io_uring_cqe	completion_cqes[16];</div><div class='del'>-</div><div class='ctx'> 	spinlock_t		completion_lock;</div><div class='ctx'> </div><div class='del'>-	/* IRQ completion list, under -&gt;completion_lock */</div><div class='del'>-	unsigned int		locked_free_nr;</div><div class='del'>-	struct io_wq_work_list	locked_free_list;</div><div class='del'>-</div><div class='del'>-	struct list_head	io_buffers_comp;</div><div class='ctx'> 	struct list_head	cq_overflow_list;</div><div class='del'>-	struct io_hash_table	cancel_table;</div><div class='ctx'> </div><div class='ctx'> 	struct hlist_head	waitid_list;</div><div class='ctx'> </div><div class='hunk'>@@ -370,25 +407,12 @@ struct io_ring_ctx {</div><div class='ctx'> 	unsigned int		file_alloc_start;</div><div class='ctx'> 	unsigned int		file_alloc_end;</div><div class='ctx'> </div><div class='del'>-	struct list_head	io_buffers_cache;</div><div class='del'>-</div><div class='del'>-	/* deferred free list, protected by -&gt;uring_lock */</div><div class='del'>-	struct hlist_head	io_buf_list;</div><div class='del'>-</div><div class='ctx'> 	/* Keep this last, we don't need it for the fast path */</div><div class='ctx'> 	struct wait_queue_head		poll_wq;</div><div class='ctx'> 	struct io_restriction		restrictions;</div><div class='ctx'> </div><div class='del'>-	/* slow path rsrc auxilary data, used by update/register */</div><div class='del'>-	struct io_mapped_ubuf		*dummy_ubuf;</div><div class='del'>-	struct io_rsrc_data		*file_data;</div><div class='del'>-	struct io_rsrc_data		*buf_data;</div><div class='del'>-</div><div class='del'>-	/* protected by -&gt;uring_lock */</div><div class='del'>-	struct list_head		rsrc_ref_list;</div><div class='del'>-	struct io_alloc_cache		rsrc_node_cache;</div><div class='del'>-	struct wait_queue_head		rsrc_quiesce_wq;</div><div class='del'>-	unsigned			rsrc_quiesce;</div><div class='add'>+	/* Stores zcrx object pointers of type struct io_zcrx_ifq */</div><div class='add'>+	struct xarray			zcrx_ctxs;</div><div class='ctx'> </div><div class='ctx'> 	u32			pers_next;</div><div class='ctx'> 	struct xarray		personalities;</div><div class='hunk'>@@ -412,36 +436,47 @@ struct io_ring_ctx {</div><div class='ctx'> </div><div class='ctx'> 	struct callback_head		poll_wq_task_work;</div><div class='ctx'> 	struct list_head		defer_list;</div><div class='add'>+	unsigned			nr_drained;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_RX_BUSY_POLL</div><div class='ctx'> 	struct list_head	napi_list;	/* track busy poll napi_id */</div><div class='ctx'> 	spinlock_t		napi_lock;	/* napi_list lock */</div><div class='ctx'> </div><div class='ctx'> 	/* napi busy poll default timeout */</div><div class='del'>-	unsigned int		napi_busy_poll_to;</div><div class='add'>+	ktime_t			napi_busy_poll_dt;</div><div class='ctx'> 	bool			napi_prefer_busy_poll;</div><div class='del'>-	bool			napi_enabled;</div><div class='add'>+	u8			napi_track_mode;</div><div class='ctx'> </div><div class='ctx'> 	DECLARE_HASHTABLE(napi_ht, 4);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* protected by -&gt;completion_lock */</div><div class='ctx'> 	unsigned			evfd_last_cq_tail;</div><div class='add'>+	unsigned			nr_req_allocated;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If IORING_SETUP_NO_MMAP is used, then the below holds</div><div class='del'>-	 * the gup'ed pages for the two rings, and the sqes.</div><div class='add'>+	 * Protection for resize vs mmap races - both the mmap and resize</div><div class='add'>+	 * side will need to grab this lock, to prevent either side from</div><div class='add'>+	 * being run concurrently with the other.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned short			n_ring_pages;</div><div class='del'>-	unsigned short			n_sqe_pages;</div><div class='del'>-	struct page			**ring_pages;</div><div class='del'>-	struct page			**sqe_pages;</div><div class='add'>+	struct mutex			mmap_lock;</div><div class='add'>+</div><div class='add'>+	struct io_mapped_region		sq_region;</div><div class='add'>+	struct io_mapped_region		ring_region;</div><div class='add'>+	/* used for optimised request parameter and wait argument passing  */</div><div class='add'>+	struct io_mapped_region		param_region;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Token indicating function is called in task work context:</div><div class='add'>+ * ctx-&gt;uring_lock is held and any completions generated will be flushed.</div><div class='add'>+ * ONLY core io_uring.c should instantiate this struct.</div><div class='add'>+ */</div><div class='ctx'> struct io_tw_state {</div><div class='del'>-	/* -&gt;uring_lock is taken, callbacks can use io_tw_lock to lock it */</div><div class='del'>-	bool locked;</div><div class='add'>+	bool cancel;</div><div class='ctx'> };</div><div class='add'>+/* Alias to use in code that doesn't instantiate struct io_tw_state */</div><div class='add'>+typedef struct io_tw_state io_tw_token_t;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	REQ_F_FIXED_FILE_BIT	= IOSQE_FIXED_FILE_BIT,</div><div class='hunk'>@@ -460,6 +495,7 @@ enum {</div><div class='ctx'> 	REQ_F_LINK_TIMEOUT_BIT,</div><div class='ctx'> 	REQ_F_NEED_CLEANUP_BIT,</div><div class='ctx'> 	REQ_F_POLLED_BIT,</div><div class='add'>+	REQ_F_HYBRID_IOPOLL_STATE_BIT,</div><div class='ctx'> 	REQ_F_BUFFER_SELECTED_BIT,</div><div class='ctx'> 	REQ_F_BUFFER_RING_BIT,</div><div class='ctx'> 	REQ_F_REISSUE_BIT,</div><div class='hunk'>@@ -470,17 +506,21 @@ enum {</div><div class='ctx'> 	REQ_F_SKIP_LINK_CQES_BIT,</div><div class='ctx'> 	REQ_F_SINGLE_POLL_BIT,</div><div class='ctx'> 	REQ_F_DOUBLE_POLL_BIT,</div><div class='add'>+	REQ_F_MULTISHOT_BIT,</div><div class='ctx'> 	REQ_F_APOLL_MULTISHOT_BIT,</div><div class='ctx'> 	REQ_F_CLEAR_POLLIN_BIT,</div><div class='del'>-	REQ_F_HASH_LOCKED_BIT,</div><div class='ctx'> 	/* keep async read/write and isreg together and in order */</div><div class='ctx'> 	REQ_F_SUPPORT_NOWAIT_BIT,</div><div class='ctx'> 	REQ_F_ISREG_BIT,</div><div class='ctx'> 	REQ_F_POLL_NO_LAZY_BIT,</div><div class='del'>-	REQ_F_CANCEL_SEQ_BIT,</div><div class='ctx'> 	REQ_F_CAN_POLL_BIT,</div><div class='ctx'> 	REQ_F_BL_EMPTY_BIT,</div><div class='ctx'> 	REQ_F_BL_NO_RECYCLE_BIT,</div><div class='add'>+	REQ_F_BUFFERS_COMMIT_BIT,</div><div class='add'>+	REQ_F_BUF_NODE_BIT,</div><div class='add'>+	REQ_F_HAS_METADATA_BIT,</div><div class='add'>+	REQ_F_IMPORT_BUFFER_BIT,</div><div class='add'>+	REQ_F_SQE_COPIED_BIT,</div><div class='ctx'> </div><div class='ctx'> 	/* not a real bit, just to check we're not overflowing the space */</div><div class='ctx'> 	__REQ_F_LAST_BIT,</div><div class='hunk'>@@ -519,6 +559,8 @@ enum {</div><div class='ctx'> 	REQ_F_NEED_CLEANUP	= IO_REQ_FLAG(REQ_F_NEED_CLEANUP_BIT),</div><div class='ctx'> 	/* already went through poll handler */</div><div class='ctx'> 	REQ_F_POLLED		= IO_REQ_FLAG(REQ_F_POLLED_BIT),</div><div class='add'>+	/* every req only blocks once in hybrid poll */</div><div class='add'>+	REQ_F_IOPOLL_STATE        = IO_REQ_FLAG(REQ_F_HYBRID_IOPOLL_STATE_BIT),</div><div class='ctx'> 	/* buffer already selected */</div><div class='ctx'> 	REQ_F_BUFFER_SELECTED	= IO_REQ_FLAG(REQ_F_BUFFER_SELECTED_BIT),</div><div class='ctx'> 	/* buffer selected from ring, needs commit */</div><div class='hunk'>@@ -543,25 +585,40 @@ enum {</div><div class='ctx'> 	REQ_F_SINGLE_POLL	= IO_REQ_FLAG(REQ_F_SINGLE_POLL_BIT),</div><div class='ctx'> 	/* double poll may active */</div><div class='ctx'> 	REQ_F_DOUBLE_POLL	= IO_REQ_FLAG(REQ_F_DOUBLE_POLL_BIT),</div><div class='add'>+	/* request posts multiple completions, should be set at prep time */</div><div class='add'>+	REQ_F_MULTISHOT		= IO_REQ_FLAG(REQ_F_MULTISHOT_BIT),</div><div class='ctx'> 	/* fast poll multishot mode */</div><div class='ctx'> 	REQ_F_APOLL_MULTISHOT	= IO_REQ_FLAG(REQ_F_APOLL_MULTISHOT_BIT),</div><div class='ctx'> 	/* recvmsg special flag, clear EPOLLIN */</div><div class='ctx'> 	REQ_F_CLEAR_POLLIN	= IO_REQ_FLAG(REQ_F_CLEAR_POLLIN_BIT),</div><div class='del'>-	/* hashed into -&gt;cancel_hash_locked, protected by -&gt;uring_lock */</div><div class='del'>-	REQ_F_HASH_LOCKED	= IO_REQ_FLAG(REQ_F_HASH_LOCKED_BIT),</div><div class='ctx'> 	/* don't use lazy poll wake for this request */</div><div class='ctx'> 	REQ_F_POLL_NO_LAZY	= IO_REQ_FLAG(REQ_F_POLL_NO_LAZY_BIT),</div><div class='del'>-	/* cancel sequence is set and valid */</div><div class='del'>-	REQ_F_CANCEL_SEQ	= IO_REQ_FLAG(REQ_F_CANCEL_SEQ_BIT),</div><div class='ctx'> 	/* file is pollable */</div><div class='ctx'> 	REQ_F_CAN_POLL		= IO_REQ_FLAG(REQ_F_CAN_POLL_BIT),</div><div class='ctx'> 	/* buffer list was empty after selection of buffer */</div><div class='ctx'> 	REQ_F_BL_EMPTY		= IO_REQ_FLAG(REQ_F_BL_EMPTY_BIT),</div><div class='ctx'> 	/* don't recycle provided buffers for this request */</div><div class='ctx'> 	REQ_F_BL_NO_RECYCLE	= IO_REQ_FLAG(REQ_F_BL_NO_RECYCLE_BIT),</div><div class='add'>+	/* buffer ring head needs incrementing on put */</div><div class='add'>+	REQ_F_BUFFERS_COMMIT	= IO_REQ_FLAG(REQ_F_BUFFERS_COMMIT_BIT),</div><div class='add'>+	/* buf node is valid */</div><div class='add'>+	REQ_F_BUF_NODE		= IO_REQ_FLAG(REQ_F_BUF_NODE_BIT),</div><div class='add'>+	/* request has read/write metadata assigned */</div><div class='add'>+	REQ_F_HAS_METADATA	= IO_REQ_FLAG(REQ_F_HAS_METADATA_BIT),</div><div class='add'>+	/*</div><div class='add'>+	 * For vectored fixed buffers, resolve iovec to registered buffers.</div><div class='add'>+	 * For SEND_ZC, whether to import buffers (i.e. the first issue).</div><div class='add'>+	 */</div><div class='add'>+	REQ_F_IMPORT_BUFFER	= IO_REQ_FLAG(REQ_F_IMPORT_BUFFER_BIT),</div><div class='add'>+	/* -&gt;sqe_copy() has been called, if necessary */</div><div class='add'>+	REQ_F_SQE_COPIED	= IO_REQ_FLAG(REQ_F_SQE_COPIED_BIT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct io_tw_req {</div><div class='add'>+	struct io_kiocb *req;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef void (*io_req_tw_func_t)(struct io_kiocb *req, struct io_tw_state *ts);</div><div class='add'>+typedef void (*io_req_tw_func_t)(struct io_tw_req tw_req, io_tw_token_t tw);</div><div class='ctx'> </div><div class='ctx'> struct io_task_work {</div><div class='ctx'> 	struct llist_node		node;</div><div class='hunk'>@@ -596,7 +653,11 @@ static inline void io_kiocb_cmd_sz_check(size_t cmd_sz)</div><div class='ctx'> 	io_kiocb_cmd_sz_check(sizeof(cmd_type)) , \</div><div class='ctx'> 	((cmd_type *)&amp;(req)-&gt;cmd) \</div><div class='ctx'> )</div><div class='del'>-#define cmd_to_io_kiocb(ptr)	((struct io_kiocb *) ptr)</div><div class='add'>+</div><div class='add'>+static inline struct io_kiocb *cmd_to_io_kiocb(void *ptr)</div><div class='add'>+{</div><div class='add'>+	return ptr;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> struct io_kiocb {</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -615,8 +676,7 @@ struct io_kiocb {</div><div class='ctx'> 	u8				iopoll_completed;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Can be either a fixed buffer index, or used with provided buffers.</div><div class='del'>-	 * For the latter, before issue it points to the buffer group ID,</div><div class='del'>-	 * and after selection it points to the buffer ID itself.</div><div class='add'>+	 * For the latter, it points to the selected buffer ID.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16				buf_index;</div><div class='ctx'> </div><div class='hunk'>@@ -628,20 +688,13 @@ struct io_kiocb {</div><div class='ctx'> 	struct io_cqe			cqe;</div><div class='ctx'> </div><div class='ctx'> 	struct io_ring_ctx		*ctx;</div><div class='del'>-	struct task_struct		*task;</div><div class='add'>+	struct io_uring_task		*tctx;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='del'>-		/* store used ubuf, so we can prevent reloading */</div><div class='del'>-		struct io_mapped_ubuf	*imu;</div><div class='del'>-</div><div class='ctx'> 		/* stores selected buf, valid IFF REQ_F_BUFFER_SELECTED is set */</div><div class='ctx'> 		struct io_buffer	*kbuf;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * stores buffer ID for ring provided buffers, valid IFF</div><div class='del'>-		 * REQ_F_BUFFER_RING is set.</div><div class='del'>-		 */</div><div class='del'>-		struct io_buffer_list	*buf_list;</div><div class='add'>+		struct io_rsrc_node	*buf_node;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='hunk'>@@ -651,24 +704,34 @@ struct io_kiocb {</div><div class='ctx'> 		__poll_t apoll_events;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	struct io_rsrc_node		*rsrc_node;</div><div class='add'>+	struct io_rsrc_node		*file_node;</div><div class='ctx'> </div><div class='ctx'> 	atomic_t			refs;</div><div class='del'>-	atomic_t			poll_refs;</div><div class='add'>+	bool				cancel_seq_set;</div><div class='ctx'> 	struct io_task_work		io_task_work;</div><div class='del'>-	/* for polled requests, i.e. IORING_OP_POLL_ADD and async armed poll */</div><div class='del'>-	struct hlist_node		hash_node;</div><div class='add'>+	union {</div><div class='add'>+		/*</div><div class='add'>+		 * for polled requests, i.e. IORING_OP_POLL_ADD and async armed</div><div class='add'>+		 * poll</div><div class='add'>+		 */</div><div class='add'>+		struct hlist_node	hash_node;</div><div class='add'>+		/* For IOPOLL setup queues, with hybrid polling */</div><div class='add'>+		u64                     iopoll_start;</div><div class='add'>+		/* for private io_kiocb freeing */</div><div class='add'>+		struct rcu_head		rcu_head;</div><div class='add'>+	};</div><div class='ctx'> 	/* internal polling, see IORING_FEAT_FAST_POLL */</div><div class='ctx'> 	struct async_poll		*apoll;</div><div class='ctx'> 	/* opcode allocated if it needs to store data for async defer */</div><div class='ctx'> 	void				*async_data;</div><div class='ctx'> 	/* linked requests, IFF REQ_F_HARDLINK or REQ_F_LINK are set */</div><div class='add'>+	atomic_t			poll_refs;</div><div class='ctx'> 	struct io_kiocb			*link;</div><div class='ctx'> 	/* custom credentials, valid IFF REQ_F_CREDS is set */</div><div class='ctx'> 	const struct cred		*creds;</div><div class='ctx'> 	struct io_wq_work		work;</div><div class='ctx'> </div><div class='del'>-	struct {</div><div class='add'>+	struct io_big_cqe {</div><div class='ctx'> 		u64			extra1;</div><div class='ctx'> 		u64			extra2;</div><div class='ctx'> 	} big_cqe;</div><div class='hunk'>@@ -678,5 +741,4 @@ struct io_overflow_cqe {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct io_uring_cqe cqe;</div><div class='ctx'> };</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h<br/>index 14f7eaf1b443..079d8773790c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iocontext.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iocontext.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iocontext.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iocontext.h</a></div><div class='hunk'>@@ -118,8 +118,8 @@ struct task_struct;</div><div class='ctx'> #ifdef CONFIG_BLOCK</div><div class='ctx'> void put_io_context(struct io_context *ioc);</div><div class='ctx'> void exit_io_context(struct task_struct *task);</div><div class='del'>-int __copy_io(unsigned long clone_flags, struct task_struct *tsk);</div><div class='del'>-static inline int copy_io(unsigned long clone_flags, struct task_struct *tsk)</div><div class='add'>+int __copy_io(u64 clone_flags, struct task_struct *tsk);</div><div class='add'>+static inline int copy_io(u64 clone_flags, struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	if (!current-&gt;io_context)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -129,7 +129,7 @@ static inline int copy_io(unsigned long clone_flags, struct task_struct *tsk)</div><div class='ctx'> struct io_context;</div><div class='ctx'> static inline void put_io_context(struct io_context *ioc) { }</div><div class='ctx'> static inline void exit_io_context(struct task_struct *task) { }</div><div class='del'>-static inline int copy_io(unsigned long clone_flags, struct task_struct *tsk)</div><div class='add'>+static inline int copy_io(u64 clone_flags, struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/iomap.h b/include/linux/iomap.h<br/>index 6fc1c858013d..520e967cb501 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iomap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iomap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iomap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iomap.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/pagevec.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct address_space;</div><div class='ctx'> struct fiemap_extent_info;</div><div class='hunk'>@@ -16,6 +17,7 @@ struct inode;</div><div class='ctx'> struct iomap_iter;</div><div class='ctx'> struct iomap_dio;</div><div class='ctx'> struct iomap_writepage_ctx;</div><div class='add'>+struct iomap_read_folio_ctx;</div><div class='ctx'> struct iov_iter;</div><div class='ctx'> struct kiocb;</div><div class='ctx'> struct page;</div><div class='hunk'>@@ -53,6 +55,16 @@ struct vm_fault;</div><div class='ctx'>  *</div><div class='ctx'>  * IOMAP_F_XATTR indicates that the iomap is for an extended attribute extent</div><div class='ctx'>  * rather than a file data extent.</div><div class='add'>+ *</div><div class='add'>+ * IOMAP_F_BOUNDARY indicates that I/O and I/O completions for this iomap must</div><div class='add'>+ * never be merged with the mapping before it.</div><div class='add'>+ *</div><div class='add'>+ * IOMAP_F_ANON_WRITE indicates that (write) I/O does not have a target block</div><div class='add'>+ * assigned to it yet and the file system will do that in the bio submission</div><div class='add'>+ * handler, splitting the I/O as needed.</div><div class='add'>+ *</div><div class='add'>+ * IOMAP_F_ATOMIC_BIO indicates that (write) I/O will be issued as an atomic</div><div class='add'>+ * bio, i.e. set REQ_ATOMIC.</div><div class='ctx'>  */</div><div class='ctx'> #define IOMAP_F_NEW		(1U &lt;&lt; 0)</div><div class='ctx'> #define IOMAP_F_DIRTY		(1U &lt;&lt; 1)</div><div class='hunk'>@@ -64,6 +76,14 @@ struct vm_fault;</div><div class='ctx'> #define IOMAP_F_BUFFER_HEAD	0</div><div class='ctx'> #endif /* CONFIG_BUFFER_HEAD */</div><div class='ctx'> #define IOMAP_F_XATTR		(1U &lt;&lt; 5)</div><div class='add'>+#define IOMAP_F_BOUNDARY	(1U &lt;&lt; 6)</div><div class='add'>+#define IOMAP_F_ANON_WRITE	(1U &lt;&lt; 7)</div><div class='add'>+#define IOMAP_F_ATOMIC_BIO	(1U &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flag reserved for file system specific usage</div><div class='add'>+ */</div><div class='add'>+#define IOMAP_F_PRIVATE		(1U &lt;&lt; 12)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Flags set by the core iomap code during operations:</div><div class='hunk'>@@ -75,22 +95,14 @@ struct vm_fault;</div><div class='ctx'>  * range it covers needs to be remapped by the high level before the operation</div><div class='ctx'>  * can proceed.</div><div class='ctx'>  */</div><div class='del'>-#define IOMAP_F_SIZE_CHANGED	(1U &lt;&lt; 8)</div><div class='del'>-#define IOMAP_F_STALE		(1U &lt;&lt; 9)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Flags from 0x1000 up are for file system specific usage:</div><div class='del'>- */</div><div class='del'>-#define IOMAP_F_PRIVATE		(1U &lt;&lt; 12)</div><div class='del'>-</div><div class='add'>+#define IOMAP_F_SIZE_CHANGED	(1U &lt;&lt; 14)</div><div class='add'>+#define IOMAP_F_STALE		(1U &lt;&lt; 15)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Magic value for addr:</div><div class='ctx'>  */</div><div class='ctx'> #define IOMAP_NULL_ADDR -1ULL	/* addr is not valid */</div><div class='ctx'> </div><div class='del'>-struct iomap_folio_ops;</div><div class='del'>-</div><div class='ctx'> struct iomap {</div><div class='ctx'> 	u64			addr; /* disk offset of mapping, bytes */</div><div class='ctx'> 	loff_t			offset;	/* file offset of mapping, bytes */</div><div class='hunk'>@@ -101,12 +113,13 @@ struct iomap {</div><div class='ctx'> 	struct dax_device	*dax_dev; /* dax_dev for dax operations */</div><div class='ctx'> 	void			*inline_data;</div><div class='ctx'> 	void			*private; /* filesystem private */</div><div class='del'>-	const struct iomap_folio_ops *folio_ops;</div><div class='ctx'> 	u64			validity_cookie; /* used with .iomap_valid() */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline sector_t iomap_sector(const struct iomap *iomap, loff_t pos)</div><div class='ctx'> {</div><div class='add'>+	if (iomap-&gt;flags &amp; IOMAP_F_ANON_WRITE)</div><div class='add'>+		return U64_MAX; /* invalid */</div><div class='ctx'> 	return (iomap-&gt;addr + pos - iomap-&gt;offset) &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -129,16 +142,11 @@ static inline bool iomap_inline_data_valid(const struct iomap *iomap)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * When a filesystem sets folio_ops in an iomap mapping it returns, get_folio</div><div class='del'>- * and put_folio will be called for each folio written to.  This only applies</div><div class='del'>- * to buffered writes as unbuffered writes will not typically have folios</div><div class='del'>- * associated with them.</div><div class='del'>- *</div><div class='ctx'>  * When get_folio succeeds, put_folio will always be called to do any</div><div class='ctx'>  * cleanup work necessary.  put_folio is responsible for unlocking and putting</div><div class='ctx'>  * @folio.</div><div class='ctx'>  */</div><div class='del'>-struct iomap_folio_ops {</div><div class='add'>+struct iomap_write_ops {</div><div class='ctx'> 	struct folio *(*get_folio)(struct iomap_iter *iter, loff_t pos,</div><div class='ctx'> 			unsigned len);</div><div class='ctx'> 	void (*put_folio)(struct inode *inode, loff_t pos, unsigned copied,</div><div class='hunk'>@@ -160,6 +168,16 @@ struct iomap_folio_ops {</div><div class='ctx'> 	 * locked by the iomap code.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool (*iomap_valid)(struct inode *inode, const struct iomap *iomap);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Optional if the filesystem wishes to provide a custom handler for</div><div class='add'>+	 * reading in the contents of a folio, otherwise iomap will default to</div><div class='add'>+	 * submitting a bio read request.</div><div class='add'>+	 *</div><div class='add'>+	 * The read must be done synchronously.</div><div class='add'>+	 */</div><div class='add'>+	int (*read_folio_range)(const struct iomap_iter *iter,</div><div class='add'>+			struct folio *folio, loff_t pos, size_t len);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -178,6 +196,8 @@ struct iomap_folio_ops {</div><div class='ctx'> #else</div><div class='ctx'> #define IOMAP_DAX		0</div><div class='ctx'> #endif /* CONFIG_FS_DAX */</div><div class='add'>+#define IOMAP_ATOMIC		(1 &lt;&lt; 9) /* torn-write protection */</div><div class='add'>+#define IOMAP_DONTCACHE		(1 &lt;&lt; 10)</div><div class='ctx'> </div><div class='ctx'> struct iomap_ops {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -206,8 +226,10 @@ struct iomap_ops {</div><div class='ctx'>  *	calls to iomap_iter().  Treat as read-only in the body.</div><div class='ctx'>  * @len: The remaining length of the file segment we're operating on.</div><div class='ctx'>  *	It is updated at the same time as @pos.</div><div class='del'>- * @processed: The number of bytes processed by the body in the most recent</div><div class='del'>- *	iteration, or a negative errno. 0 causes the iteration to stop.</div><div class='add'>+ * @iter_start_pos: The original start pos for the current iomap. Used for</div><div class='add'>+ *	incremental iter advance.</div><div class='add'>+ * @status: Status of the most recent iteration. Zero on success or a negative</div><div class='add'>+ *	errno on error.</div><div class='ctx'>  * @flags: Zero or more of the iomap_begin flags above.</div><div class='ctx'>  * @iomap: Map describing the I/O iteration</div><div class='ctx'>  * @srcmap: Source map for COW operations</div><div class='hunk'>@@ -216,28 +238,54 @@ struct iomap_iter {</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	loff_t pos;</div><div class='ctx'> 	u64 len;</div><div class='del'>-	s64 processed;</div><div class='add'>+	loff_t iter_start_pos;</div><div class='add'>+	int status;</div><div class='ctx'> 	unsigned flags;</div><div class='ctx'> 	struct iomap iomap;</div><div class='ctx'> 	struct iomap srcmap;</div><div class='add'>+	struct folio_batch *fbatch;</div><div class='ctx'> 	void *private;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops);</div><div class='add'>+int iomap_iter_advance(struct iomap_iter *iter, u64 count);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iomap_length - length of the current iomap iteration</div><div class='add'>+ * iomap_length_trim - trimmed length of the current iomap iteration</div><div class='ctx'>  * @iter: iteration structure</div><div class='add'>+ * @pos: File position to trim from.</div><div class='add'>+ * @len: Length of the mapping to trim to.</div><div class='ctx'>  *</div><div class='del'>- * Returns the length that the operation applies to for the current iteration.</div><div class='add'>+ * Returns a trimmed length that the operation applies to for the current</div><div class='add'>+ * iteration.</div><div class='ctx'>  */</div><div class='del'>-static inline u64 iomap_length(const struct iomap_iter *iter)</div><div class='add'>+static inline u64 iomap_length_trim(const struct iomap_iter *iter, loff_t pos,</div><div class='add'>+		u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	u64 end = iter-&gt;iomap.offset + iter-&gt;iomap.length;</div><div class='ctx'> </div><div class='ctx'> 	if (iter-&gt;srcmap.type != IOMAP_HOLE)</div><div class='ctx'> 		end = min(end, iter-&gt;srcmap.offset + iter-&gt;srcmap.length);</div><div class='del'>-	return min(iter-&gt;len, end - iter-&gt;pos);</div><div class='add'>+	return min(len, end - pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iomap_length - length of the current iomap iteration</div><div class='add'>+ * @iter: iteration structure</div><div class='add'>+ *</div><div class='add'>+ * Returns the length that the operation applies to for the current iteration.</div><div class='add'>+ */</div><div class='add'>+static inline u64 iomap_length(const struct iomap_iter *iter)</div><div class='add'>+{</div><div class='add'>+	return iomap_length_trim(iter, iter-&gt;pos, iter-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iomap_iter_advance_full - advance by the full length of current map</div><div class='add'>+ */</div><div class='add'>+static inline int iomap_iter_advance_full(struct iomap_iter *iter)</div><div class='add'>+{</div><div class='add'>+	return iomap_iter_advance(iter, iomap_length(iter));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -256,27 +304,70 @@ static inline const struct iomap *iomap_iter_srcmap(const struct iomap_iter *i)</div><div class='ctx'> 	return &amp;i-&gt;iomap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='del'>-		const struct iomap_ops *ops);</div><div class='del'>-int iomap_file_buffered_write_punch_delalloc(struct inode *inode,</div><div class='del'>-		struct iomap *iomap, loff_t pos, loff_t length, ssize_t written,</div><div class='del'>-		int (*punch)(struct inode *inode, loff_t pos, loff_t length));</div><div class='add'>+/*</div><div class='add'>+ * Return the file offset for the first unchanged block after a short write.</div><div class='add'>+ *</div><div class='add'>+ * If nothing was written, round @pos down to point at the first block in</div><div class='add'>+ * the range, else round up to include the partially written block.</div><div class='add'>+ */</div><div class='add'>+static inline loff_t iomap_last_written_block(struct inode *inode, loff_t pos,</div><div class='add'>+		ssize_t written)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!written))</div><div class='add'>+		return round_down(pos, i_blocksize(inode));</div><div class='add'>+	return round_up(pos + written, i_blocksize(inode));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if the range needs to be unshared for a FALLOC_FL_UNSHARE_RANGE</div><div class='add'>+ * operation.</div><div class='add'>+ *</div><div class='add'>+ * Don't bother with blocks that are not shared to start with; or mappings that</div><div class='add'>+ * cannot be shared, such as inline data, delalloc reservations, holes or</div><div class='add'>+ * unwritten extents.</div><div class='add'>+ *</div><div class='add'>+ * Note that we use srcmap directly instead of iomap_iter_srcmap as unsharing</div><div class='add'>+ * requires providing a separate source map, and the presence of one is a good</div><div class='add'>+ * indicator that unsharing is needed, unlike IOMAP_F_SHARED which can be set</div><div class='add'>+ * for any data that goes into the COW fork for XFS.</div><div class='add'>+ */</div><div class='add'>+static inline bool iomap_want_unshare_iter(const struct iomap_iter *iter)</div><div class='add'>+{</div><div class='add'>+	return (iter-&gt;iomap.flags &amp; IOMAP_F_SHARED) &amp;&amp;</div><div class='add'>+		iter-&gt;srcmap.type == IOMAP_MAPPED;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops);</div><div class='del'>-void iomap_readahead(struct readahead_control *, const struct iomap_ops *ops);</div><div class='add'>+ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *from,</div><div class='add'>+		const struct iomap_ops *ops,</div><div class='add'>+		const struct iomap_write_ops *write_ops, void *private);</div><div class='add'>+void iomap_read_folio(const struct iomap_ops *ops,</div><div class='add'>+		struct iomap_read_folio_ctx *ctx);</div><div class='add'>+void iomap_readahead(const struct iomap_ops *ops,</div><div class='add'>+		struct iomap_read_folio_ctx *ctx);</div><div class='ctx'> bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count);</div><div class='ctx'> struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos, size_t len);</div><div class='ctx'> bool iomap_release_folio(struct folio *folio, gfp_t gfp_flags);</div><div class='ctx'> void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len);</div><div class='ctx'> bool iomap_dirty_folio(struct address_space *mapping, struct folio *folio);</div><div class='ctx'> int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,</div><div class='del'>-		const struct iomap_ops *ops);</div><div class='add'>+		const struct iomap_ops *ops,</div><div class='add'>+		const struct iomap_write_ops *write_ops);</div><div class='add'>+loff_t iomap_fill_dirty_folios(struct iomap_iter *iter, loff_t offset,</div><div class='add'>+		loff_t length);</div><div class='ctx'> int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,</div><div class='del'>-		bool *did_zero, const struct iomap_ops *ops);</div><div class='add'>+		bool *did_zero, const struct iomap_ops *ops,</div><div class='add'>+		const struct iomap_write_ops *write_ops, void *private);</div><div class='ctx'> int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,</div><div class='del'>-		const struct iomap_ops *ops);</div><div class='del'>-vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf,</div><div class='del'>-			const struct iomap_ops *ops);</div><div class='add'>+		const struct iomap_ops *ops,</div><div class='add'>+		const struct iomap_write_ops *write_ops, void *private);</div><div class='add'>+vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops,</div><div class='add'>+		void *private);</div><div class='add'>+typedef void (*iomap_punch_t)(struct inode *inode, loff_t offset, loff_t length,</div><div class='add'>+		struct iomap *iomap);</div><div class='add'>+void iomap_write_delalloc_release(struct inode *inode, loff_t start_byte,</div><div class='add'>+		loff_t end_byte, unsigned flags, struct iomap *iomap,</div><div class='add'>+		iomap_punch_t punch);</div><div class='add'>+</div><div class='ctx'> int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,</div><div class='ctx'> 		u64 start, u64 len, const struct iomap_ops *ops);</div><div class='ctx'> loff_t iomap_seek_hole(struct inode *inode, loff_t offset,</div><div class='hunk'>@@ -287,16 +378,44 @@ sector_t iomap_bmap(struct address_space *mapping, sector_t bno,</div><div class='ctx'> 		const struct iomap_ops *ops);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Flags for iomap_ioend-&gt;io_flags.</div><div class='add'>+ */</div><div class='add'>+/* shared COW extent */</div><div class='add'>+#define IOMAP_IOEND_SHARED		(1U &lt;&lt; 0)</div><div class='add'>+/* unwritten extent */</div><div class='add'>+#define IOMAP_IOEND_UNWRITTEN		(1U &lt;&lt; 1)</div><div class='add'>+/* don't merge into previous ioend */</div><div class='add'>+#define IOMAP_IOEND_BOUNDARY		(1U &lt;&lt; 2)</div><div class='add'>+/* is direct I/O */</div><div class='add'>+#define IOMAP_IOEND_DIRECT		(1U &lt;&lt; 3)</div><div class='add'>+/* is DONTCACHE I/O */</div><div class='add'>+#define IOMAP_IOEND_DONTCACHE		(1U &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flags that if set on either ioend prevent the merge of two ioends.</div><div class='add'>+ * (IOMAP_IOEND_BOUNDARY also prevents merges, but only one-way)</div><div class='add'>+ */</div><div class='add'>+#define IOMAP_IOEND_NOMERGE_FLAGS \</div><div class='add'>+	(IOMAP_IOEND_SHARED | IOMAP_IOEND_UNWRITTEN | IOMAP_IOEND_DIRECT | \</div><div class='add'>+	 IOMAP_IOEND_DONTCACHE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Structure for writeback I/O completions.</div><div class='add'>+ *</div><div class='add'>+ * File systems can split a bio generated by iomap.  In that case the parent</div><div class='add'>+ * ioend it was split from is recorded in ioend-&gt;io_parent.</div><div class='ctx'>  */</div><div class='ctx'> struct iomap_ioend {</div><div class='ctx'> 	struct list_head	io_list;	/* next ioend in chain */</div><div class='del'>-	u16			io_type;</div><div class='del'>-	u16			io_flags;	/* IOMAP_F_* */</div><div class='add'>+	u16			io_flags;	/* IOMAP_IOEND_* */</div><div class='ctx'> 	struct inode		*io_inode;	/* file being written to */</div><div class='ctx'> 	size_t			io_size;	/* size of the extent */</div><div class='add'>+	atomic_t		io_remaining;	/* completetion defer count */</div><div class='add'>+	int			io_error;	/* stashed away status */</div><div class='add'>+	struct iomap_ioend	*io_parent;	/* parent for completions */</div><div class='ctx'> 	loff_t			io_offset;	/* offset in the file */</div><div class='ctx'> 	sector_t		io_sector;	/* start sector of ioend */</div><div class='add'>+	void			*io_private;	/* file system private data */</div><div class='ctx'> 	struct bio		io_bio;		/* MUST BE LAST! */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -307,48 +426,90 @@ static inline struct iomap_ioend *iomap_ioend_from_bio(struct bio *bio)</div><div class='ctx'> </div><div class='ctx'> struct iomap_writeback_ops {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Required, maps the blocks so that writeback can be performed on</div><div class='del'>-	 * the range starting at offset.</div><div class='add'>+	 * Performs writeback on the passed in range</div><div class='ctx'> 	 *</div><div class='del'>-	 * Can return arbitrarily large regions, but we need to call into it at</div><div class='add'>+	 * Can map arbitrarily large regions, but we need to call into it at</div><div class='ctx'> 	 * least once per folio to allow the file systems to synchronize with</div><div class='ctx'> 	 * the write path that could be invalidating mappings.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * An existing mapping from a previous call to this method can be reused</div><div class='ctx'> 	 * by the file system if it is still valid.</div><div class='add'>+	 *</div><div class='add'>+	 * If this succeeds, iomap_finish_folio_write() must be called once</div><div class='add'>+	 * writeback completes for the range, regardless of whether the</div><div class='add'>+	 * writeback succeeded or failed.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns the number of bytes processed or a negative errno.</div><div class='ctx'> 	 */</div><div class='del'>-	int (*map_blocks)(struct iomap_writepage_ctx *wpc, struct inode *inode,</div><div class='del'>-			  loff_t offset, unsigned len);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Optional, allows the file systems to perform actions just before</div><div class='del'>-	 * submitting the bio and/or override the bio end_io handler for complex</div><div class='del'>-	 * operations like copy on write extent manipulation or unwritten extent</div><div class='del'>-	 * conversions.</div><div class='del'>-	 */</div><div class='del'>-	int (*prepare_ioend)(struct iomap_ioend *ioend, int status);</div><div class='add'>+	ssize_t (*writeback_range)(struct iomap_writepage_ctx *wpc,</div><div class='add'>+			struct folio *folio, u64 pos, unsigned int len,</div><div class='add'>+			u64 end_pos);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Optional, allows the file system to discard state on a page where</div><div class='del'>-	 * we failed to submit any I/O.</div><div class='add'>+	 * Submit a writeback context previously build up by -&gt;writeback_range.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns 0 if the context was successfully submitted, or a negative</div><div class='add'>+	 * error code if not.  If @error is non-zero a failure occurred, and</div><div class='add'>+	 * the writeback context should be completed with an error.</div><div class='ctx'> 	 */</div><div class='del'>-	void (*discard_folio)(struct folio *folio, loff_t pos);</div><div class='add'>+	int (*writeback_submit)(struct iomap_writepage_ctx *wpc, int error);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iomap_writepage_ctx {</div><div class='ctx'> 	struct iomap		iomap;</div><div class='del'>-	struct iomap_ioend	*ioend;</div><div class='add'>+	struct inode		*inode;</div><div class='add'>+	struct writeback_control *wbc;</div><div class='ctx'> 	const struct iomap_writeback_ops *ops;</div><div class='ctx'> 	u32			nr_folios;	/* folios added to the ioend */</div><div class='add'>+	void			*wb_ctx;	/* pending writeback context */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct iomap_ioend *iomap_init_ioend(struct inode *inode, struct bio *bio,</div><div class='add'>+		loff_t file_offset, u16 ioend_flags);</div><div class='add'>+struct iomap_ioend *iomap_split_ioend(struct iomap_ioend *ioend,</div><div class='add'>+		unsigned int max_len, bool is_append);</div><div class='ctx'> void iomap_finish_ioends(struct iomap_ioend *ioend, int error);</div><div class='ctx'> void iomap_ioend_try_merge(struct iomap_ioend *ioend,</div><div class='ctx'> 		struct list_head *more_ioends);</div><div class='ctx'> void iomap_sort_ioends(struct list_head *ioend_list);</div><div class='del'>-int iomap_writepages(struct address_space *mapping,</div><div class='del'>-		struct writeback_control *wbc, struct iomap_writepage_ctx *wpc,</div><div class='del'>-		const struct iomap_writeback_ops *ops);</div><div class='add'>+ssize_t iomap_add_to_ioend(struct iomap_writepage_ctx *wpc, struct folio *folio,</div><div class='add'>+		loff_t pos, loff_t end_pos, unsigned int dirty_len);</div><div class='add'>+int iomap_ioend_writeback_submit(struct iomap_writepage_ctx *wpc, int error);</div><div class='add'>+</div><div class='add'>+void iomap_finish_folio_read(struct folio *folio, size_t off, size_t len,</div><div class='add'>+		int error);</div><div class='add'>+void iomap_finish_folio_write(struct inode *inode, struct folio *folio,</div><div class='add'>+		size_t len);</div><div class='add'>+</div><div class='add'>+int iomap_writeback_folio(struct iomap_writepage_ctx *wpc, struct folio *folio);</div><div class='add'>+int iomap_writepages(struct iomap_writepage_ctx *wpc);</div><div class='add'>+</div><div class='add'>+struct iomap_read_folio_ctx {</div><div class='add'>+	const struct iomap_read_ops *ops;</div><div class='add'>+	struct folio		*cur_folio;</div><div class='add'>+	struct readahead_control *rac;</div><div class='add'>+	void			*read_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iomap_read_ops {</div><div class='add'>+	/*</div><div class='add'>+	 * Read in a folio range.</div><div class='add'>+	 *</div><div class='add'>+	 * If this succeeds, iomap_finish_folio_read() must be called after the</div><div class='add'>+	 * range is read in, regardless of whether the read succeeded or failed.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns 0 on success or a negative error on failure.</div><div class='add'>+	 */</div><div class='add'>+	int (*read_folio_range)(const struct iomap_iter *iter,</div><div class='add'>+			struct iomap_read_folio_ctx *ctx, size_t len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Submit any pending read requests.</div><div class='add'>+	 *</div><div class='add'>+	 * This is optional.</div><div class='add'>+	 */</div><div class='add'>+	void (*submit_read)(struct iomap_read_folio_ctx *ctx);</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Flags for direct I/O -&gt;end_io:</div><div class='hunk'>@@ -393,6 +554,14 @@ struct iomap_dio_ops {</div><div class='ctx'>  */</div><div class='ctx'> #define IOMAP_DIO_PARTIAL		(1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Ensure each bio is aligned to fs block size.</div><div class='add'>+ *</div><div class='add'>+ * For filesystems which need to calculate/verify the checksum of each fs</div><div class='add'>+ * block. Otherwise they may not be able to handle unaligned bios.</div><div class='add'>+ */</div><div class='add'>+#define IOMAP_DIO_FSBLOCK_ALIGNED	(1 &lt;&lt; 3)</div><div class='add'>+</div><div class='ctx'> ssize_t iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> 		const struct iomap_ops *ops, const struct iomap_dio_ops *dops,</div><div class='ctx'> 		unsigned int dio_flags, void *private, size_t done_before);</div><div class='hunk'>@@ -413,4 +582,32 @@ int iomap_swapfile_activate(struct swap_info_struct *sis,</div><div class='ctx'> # define iomap_swapfile_activate(sis, swapfile, pagespan, ops)	(-EIO)</div><div class='ctx'> #endif /* CONFIG_SWAP */</div><div class='ctx'> </div><div class='add'>+extern struct bio_set iomap_ioend_bioset;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLOCK</div><div class='add'>+extern const struct iomap_read_ops iomap_bio_read_ops;</div><div class='add'>+</div><div class='add'>+static inline void iomap_bio_read_folio(struct folio *folio,</div><div class='add'>+		const struct iomap_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct iomap_read_folio_ctx ctx = {</div><div class='add'>+		.ops		= &amp;iomap_bio_read_ops,</div><div class='add'>+		.cur_folio	= folio,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iomap_read_folio(ops, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iomap_bio_readahead(struct readahead_control *rac,</div><div class='add'>+		const struct iomap_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct iomap_read_folio_ctx ctx = {</div><div class='add'>+		.ops		= &amp;iomap_bio_read_ops,</div><div class='add'>+		.rac		= rac,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	iomap_readahead(ops, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_BLOCK */</div><div class='add'>+</div><div class='ctx'> #endif /* LINUX_IOMAP_H */</div><div class='head'>diff --git a/include/linux/iommu-dma.h b/include/linux/iommu-dma.h<br/>new file mode 100644<br/>index 000000000000..a92b3ff9b934<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iommu-dma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iommu-dma.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024, NVIDIA CORPORATION &amp; AFFILIATES. All rights reserved</div><div class='add'>+ *</div><div class='add'>+ * DMA operations that map physical memory through IOMMU.</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_IOMMU_DMA_H</div><div class='add'>+#define _LINUX_IOMMU_DMA_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-direction.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IOMMU_DMA</div><div class='add'>+static inline bool use_dma_iommu(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;dma_iommu;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool use_dma_iommu(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IOMMU_DMA */</div><div class='add'>+</div><div class='add'>+dma_addr_t iommu_dma_map_phys(struct device *dev, phys_addr_t phys, size_t size,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+void iommu_dma_unmap_phys(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+		size_t size, enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+void iommu_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+void *iommu_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,</div><div class='add'>+		gfp_t gfp, unsigned long attrs);</div><div class='add'>+int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma,</div><div class='add'>+		void *cpu_addr, dma_addr_t dma_addr, size_t size,</div><div class='add'>+		unsigned long attrs);</div><div class='add'>+int iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt,</div><div class='add'>+		void *cpu_addr, dma_addr_t dma_addr, size_t size,</div><div class='add'>+		unsigned long attrs);</div><div class='add'>+unsigned long iommu_dma_get_merge_boundary(struct device *dev);</div><div class='add'>+size_t iommu_dma_opt_mapping_size(void);</div><div class='add'>+size_t iommu_dma_max_mapping_size(struct device *dev);</div><div class='add'>+void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr,</div><div class='add'>+		dma_addr_t handle, unsigned long attrs);</div><div class='add'>+struct sg_table *iommu_dma_alloc_noncontiguous(struct device *dev, size_t size,</div><div class='add'>+		enum dma_data_direction dir, gfp_t gfp, unsigned long attrs);</div><div class='add'>+void iommu_dma_free_noncontiguous(struct device *dev, size_t size,</div><div class='add'>+		struct sg_table *sgt, enum dma_data_direction dir);</div><div class='add'>+void *iommu_dma_vmap_noncontiguous(struct device *dev, size_t size,</div><div class='add'>+		struct sg_table *sgt);</div><div class='add'>+#define iommu_dma_vunmap_noncontiguous(dev, vaddr) \</div><div class='add'>+	vunmap(vaddr);</div><div class='add'>+int iommu_dma_mmap_noncontiguous(struct device *dev, struct vm_area_struct *vma,</div><div class='add'>+		size_t size, struct sg_table *sgt);</div><div class='add'>+void iommu_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+		size_t size, enum dma_data_direction dir);</div><div class='add'>+void iommu_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+		size_t size, enum dma_data_direction dir);</div><div class='add'>+void iommu_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl,</div><div class='add'>+		int nelems, enum dma_data_direction dir);</div><div class='add'>+void iommu_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sgl,</div><div class='add'>+		int nelems, enum dma_data_direction dir);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_IOMMU_DMA_H */</div><div class='head'>diff --git a/include/linux/iommu.h b/include/linux/iommu.h<br/>index 2e925b5eba53..8c66284a91a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iommu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iommu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iommu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iommu.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/iova_bitmap.h&gt;</div><div class='add'>+#include &lt;uapi/linux/iommufd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IOMMU_READ	(1 &lt;&lt; 0)</div><div class='ctx'> #define IOMMU_WRITE	(1 &lt;&lt; 1)</div><div class='hunk'>@@ -41,7 +42,12 @@ struct iommu_dirty_ops;</div><div class='ctx'> struct notifier_block;</div><div class='ctx'> struct iommu_sva;</div><div class='ctx'> struct iommu_dma_cookie;</div><div class='add'>+struct iommu_dma_msi_cookie;</div><div class='ctx'> struct iommu_fault_param;</div><div class='add'>+struct iommufd_ctx;</div><div class='add'>+struct iommufd_viommu;</div><div class='add'>+struct msi_desc;</div><div class='add'>+struct msi_msg;</div><div class='ctx'> </div><div class='ctx'> #define IOMMU_FAULT_PERM_READ	(1 &lt;&lt; 0) /* read */</div><div class='ctx'> #define IOMMU_FAULT_PERM_WRITE	(1 &lt;&lt; 1) /* write */</div><div class='hunk'>@@ -69,8 +75,7 @@ enum iommu_fault_type {</div><div class='ctx'> struct iommu_fault_page_request {</div><div class='ctx'> #define IOMMU_FAULT_PAGE_REQUEST_PASID_VALID	(1 &lt;&lt; 0)</div><div class='ctx'> #define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE	(1 &lt;&lt; 1)</div><div class='del'>-#define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA	(1 &lt;&lt; 2)</div><div class='del'>-#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID	(1 &lt;&lt; 3)</div><div class='add'>+#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID	(1 &lt;&lt; 2)</div><div class='ctx'> 	u32	flags;</div><div class='ctx'> 	u32	pasid;</div><div class='ctx'> 	u32	grpid;</div><div class='hunk'>@@ -125,12 +130,16 @@ struct iopf_fault {</div><div class='ctx'> struct iopf_group {</div><div class='ctx'> 	struct iopf_fault last_fault;</div><div class='ctx'> 	struct list_head faults;</div><div class='add'>+	size_t fault_count;</div><div class='ctx'> 	/* list node for iommu_fault_param::faults */</div><div class='ctx'> 	struct list_head pending_node;</div><div class='ctx'> 	struct work_struct work;</div><div class='del'>-	struct iommu_domain *domain;</div><div class='add'>+	struct iommu_attach_handle *attach_handle;</div><div class='ctx'> 	/* The device's fault data parameter. */</div><div class='ctx'> 	struct iommu_fault_param *fault_param;</div><div class='add'>+	/* Used by handler provider to hook the group on its own lists. */</div><div class='add'>+	struct list_head node;</div><div class='add'>+	u32 cookie;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -158,6 +167,15 @@ struct iommu_domain_geometry {</div><div class='ctx'> 	bool force_aperture;       /* DMA only allowed in mappable range? */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum iommu_domain_cookie_type {</div><div class='add'>+	IOMMU_COOKIE_NONE,</div><div class='add'>+	IOMMU_COOKIE_DMA_IOVA,</div><div class='add'>+	IOMMU_COOKIE_DMA_MSI,</div><div class='add'>+	IOMMU_COOKIE_FAULT_HANDLER,</div><div class='add'>+	IOMMU_COOKIE_SVA,</div><div class='add'>+	IOMMU_COOKIE_IOMMUFD,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Domain feature flags */</div><div class='ctx'> #define __IOMMU_DOMAIN_PAGING	(1U &lt;&lt; 0)  /* Support for iommu_map/unmap */</div><div class='ctx'> #define __IOMMU_DOMAIN_DMA_API	(1U &lt;&lt; 1)  /* Domain for use in DMA-API</div><div class='hunk'>@@ -204,15 +222,18 @@ struct iommu_domain_geometry {</div><div class='ctx'> </div><div class='ctx'> struct iommu_domain {</div><div class='ctx'> 	unsigned type;</div><div class='add'>+	enum iommu_domain_cookie_type cookie_type;</div><div class='ctx'> 	const struct iommu_domain_ops *ops;</div><div class='ctx'> 	const struct iommu_dirty_ops *dirty_ops;</div><div class='ctx'> 	const struct iommu_ops *owner; /* Whose domain_alloc we came from */</div><div class='ctx'> 	unsigned long pgsize_bitmap;	/* Bitmap of page sizes in use */</div><div class='ctx'> 	struct iommu_domain_geometry geometry;</div><div class='del'>-	struct iommu_dma_cookie *iova_cookie;</div><div class='ctx'> 	int (*iopf_handler)(struct iopf_group *group);</div><div class='del'>-	void *fault_data;</div><div class='del'>-	union {</div><div class='add'>+</div><div class='add'>+	union { /* cookie */</div><div class='add'>+		struct iommu_dma_cookie *iova_cookie;</div><div class='add'>+		struct iommu_dma_msi_cookie *msi_cookie;</div><div class='add'>+		struct iommufd_hw_pagetable *iommufd_hwpt;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			iommu_fault_handler_t handler;</div><div class='ctx'> 			void *handler_token;</div><div class='hunk'>@@ -296,28 +317,26 @@ struct iommu_iort_rmr_data {</div><div class='ctx'> 	u32 num_sids;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum iommu_dev_features - Per device IOMMU features</div><div class='del'>- * @IOMMU_DEV_FEAT_SVA: Shared Virtual Addresses</div><div class='del'>- * @IOMMU_DEV_FEAT_IOPF: I/O Page Faults such as PRI or Stall. Generally</div><div class='del'>- *			 enabling %IOMMU_DEV_FEAT_SVA requires</div><div class='del'>- *			 %IOMMU_DEV_FEAT_IOPF, but some devices manage I/O Page</div><div class='del'>- *			 Faults themselves instead of relying on the IOMMU. When</div><div class='del'>- *			 supported, this feature must be enabled before and</div><div class='del'>- *			 disabled after %IOMMU_DEV_FEAT_SVA.</div><div class='del'>- *</div><div class='del'>- * Device drivers enable a feature using iommu_dev_enable_feature().</div><div class='del'>- */</div><div class='del'>-enum iommu_dev_features {</div><div class='del'>-	IOMMU_DEV_FEAT_SVA,</div><div class='del'>-	IOMMU_DEV_FEAT_IOPF,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define IOMMU_NO_PASID	(0U) /* Reserved for DMA w/o PASID */</div><div class='ctx'> #define IOMMU_FIRST_GLOBAL_PASID	(1U) /*starting range for allocation */</div><div class='ctx'> #define IOMMU_PASID_INVALID	(-1U)</div><div class='ctx'> typedef unsigned int ioasid_t;</div><div class='ctx'> </div><div class='add'>+/* Read but do not clear any dirty bits */</div><div class='add'>+#define IOMMU_DIRTY_NO_CLEAR (1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pages allocated through iommu_alloc_pages_node_sz() can be placed on this</div><div class='add'>+ * list using iommu_pages_list_add(). Note: ONLY pages from</div><div class='add'>+ * iommu_alloc_pages_node_sz() can be used this way!</div><div class='add'>+ */</div><div class='add'>+struct iommu_pages_list {</div><div class='add'>+	struct list_head pages;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IOMMU_PAGES_LIST_INIT(name) \</div><div class='add'>+	((struct iommu_pages_list){ .pages = LIST_HEAD_INIT(name.pages) })</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IOMMU_API</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -340,7 +359,7 @@ struct iommu_iotlb_gather {</div><div class='ctx'> 	unsigned long		start;</div><div class='ctx'> 	unsigned long		end;</div><div class='ctx'> 	size_t			pgsize;</div><div class='del'>-	struct list_head	freelist;</div><div class='add'>+	struct iommu_pages_list	freelist;</div><div class='ctx'> 	bool			queued;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -354,9 +373,6 @@ struct iommu_dirty_bitmap {</div><div class='ctx'> 	struct iommu_iotlb_gather *gather;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Read but do not clear any dirty bits */</div><div class='del'>-#define IOMMU_DIRTY_NO_CLEAR (1 &lt;&lt; 0)</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct iommu_dirty_ops - domain specific dirty tracking operations</div><div class='ctx'>  * @set_dirty_tracking: Enable or Disable dirty tracking on the iommu domain</div><div class='hunk'>@@ -420,10 +436,10 @@ static inline int __iommu_copy_struct_from_user(</div><div class='ctx'> 	void *dst_data, const struct iommu_user_data *src_data,</div><div class='ctx'> 	unsigned int data_type, size_t data_len, size_t min_len)</div><div class='ctx'> {</div><div class='del'>-	if (src_data-&gt;type != data_type)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (WARN_ON(!dst_data || !src_data))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (src_data-&gt;type != data_type)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (src_data-&gt;len &lt; min_len || data_len &lt; src_data-&gt;len)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return copy_struct_from_user(dst_data, data_len, src_data-&gt;uptr,</div><div class='hunk'>@@ -436,8 +452,8 @@ static inline int __iommu_copy_struct_from_user(</div><div class='ctx'>  *        include/uapi/linux/iommufd.h</div><div class='ctx'>  * @user_data: Pointer to a struct iommu_user_data for user space data info</div><div class='ctx'>  * @data_type: The data type of the @kdst. Must match with @user_data-&gt;type</div><div class='del'>- * @min_last: The last memember of the data structure @kdst points in the</div><div class='del'>- *            initial version.</div><div class='add'>+ * @min_last: The last member of the data structure @kdst points in the initial</div><div class='add'>+ *            version.</div><div class='ctx'>  * Return 0 for success, otherwise -error.</div><div class='ctx'>  */</div><div class='ctx'> #define iommu_copy_struct_from_user(kdst, user_data, data_type, min_last) \</div><div class='hunk'>@@ -488,7 +504,9 @@ static inline int __iommu_copy_struct_from_user_array(</div><div class='ctx'>  * @index: Index to the location in the array to copy user data from</div><div class='ctx'>  * @min_last: The last member of the data structure @kdst points in the</div><div class='ctx'>  *            initial version.</div><div class='del'>- * Return 0 for success, otherwise -error.</div><div class='add'>+ *</div><div class='add'>+ * Copy a single entry from a user array. Return 0 for success, otherwise</div><div class='add'>+ * -error.</div><div class='ctx'>  */</div><div class='ctx'> #define iommu_copy_struct_from_user_array(kdst, user_array, data_type, index, \</div><div class='ctx'> 					  min_last)                           \</div><div class='hunk'>@@ -497,27 +515,113 @@ static inline int __iommu_copy_struct_from_user_array(</div><div class='ctx'> 		offsetofend(typeof(*(kdst)), min_last))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * iommu_copy_struct_from_full_user_array - Copy iommu driver specific user</div><div class='add'>+ *         space data from an iommu_user_data_array</div><div class='add'>+ * @kdst: Pointer to an iommu driver specific user data that is defined in</div><div class='add'>+ *        include/uapi/linux/iommufd.h</div><div class='add'>+ * @kdst_entry_size: sizeof(*kdst)</div><div class='add'>+ * @user_array: Pointer to a struct iommu_user_data_array for a user space</div><div class='add'>+ *              array</div><div class='add'>+ * @data_type: The data type of the @kdst. Must match with @user_array-&gt;type</div><div class='add'>+ *</div><div class='add'>+ * Copy the entire user array. kdst must have room for kdst_entry_size *</div><div class='add'>+ * user_array-&gt;entry_num bytes. Return 0 for success, otherwise -error.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+iommu_copy_struct_from_full_user_array(void *kdst, size_t kdst_entry_size,</div><div class='add'>+				       struct iommu_user_data_array *user_array,</div><div class='add'>+				       unsigned int data_type)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (user_array-&gt;type != data_type)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!user_array-&gt;entry_num)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (likely(user_array-&gt;entry_len == kdst_entry_size)) {</div><div class='add'>+		if (copy_from_user(kdst, user_array-&gt;uptr,</div><div class='add'>+				   user_array-&gt;entry_num *</div><div class='add'>+					   user_array-&gt;entry_len))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy item by item */</div><div class='add'>+	for (i = 0; i != user_array-&gt;entry_num; i++) {</div><div class='add'>+		ret = copy_struct_from_user(</div><div class='add'>+			kdst + kdst_entry_size * i, kdst_entry_size,</div><div class='add'>+			user_array-&gt;uptr + user_array-&gt;entry_len * i,</div><div class='add'>+			user_array-&gt;entry_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __iommu_copy_struct_to_user - Report iommu driver specific user space data</div><div class='add'>+ * @dst_data: Pointer to a struct iommu_user_data for user space data location</div><div class='add'>+ * @src_data: Pointer to an iommu driver specific user data that is defined in</div><div class='add'>+ *            include/uapi/linux/iommufd.h</div><div class='add'>+ * @data_type: The data type of the @src_data. Must match with @dst_data.type</div><div class='add'>+ * @data_len: Length of current user data structure, i.e. sizeof(struct _src)</div><div class='add'>+ * @min_len: Initial length of user data structure for backward compatibility.</div><div class='add'>+ *           This should be offsetofend using the last member in the user data</div><div class='add'>+ *           struct that was initially added to include/uapi/linux/iommufd.h</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+__iommu_copy_struct_to_user(const struct iommu_user_data *dst_data,</div><div class='add'>+			    void *src_data, unsigned int data_type,</div><div class='add'>+			    size_t data_len, size_t min_len)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!dst_data || !src_data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (dst_data-&gt;type != data_type)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (dst_data-&gt;len &lt; min_len || data_len &lt; dst_data-&gt;len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return copy_struct_to_user(dst_data-&gt;uptr, dst_data-&gt;len, src_data,</div><div class='add'>+				   data_len, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iommu_copy_struct_to_user - Report iommu driver specific user space data</div><div class='add'>+ * @user_data: Pointer to a struct iommu_user_data for user space data location</div><div class='add'>+ * @ksrc: Pointer to an iommu driver specific user data that is defined in</div><div class='add'>+ *        include/uapi/linux/iommufd.h</div><div class='add'>+ * @data_type: The data type of the @ksrc. Must match with @user_data-&gt;type</div><div class='add'>+ * @min_last: The last member of the data structure @ksrc points in the initial</div><div class='add'>+ *            version.</div><div class='add'>+ * Return 0 for success, otherwise -error.</div><div class='add'>+ */</div><div class='add'>+#define iommu_copy_struct_to_user(user_data, ksrc, data_type, min_last)        \</div><div class='add'>+	__iommu_copy_struct_to_user(user_data, ksrc, data_type, sizeof(*ksrc), \</div><div class='add'>+				    offsetofend(typeof(*ksrc), min_last))</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct iommu_ops - iommu ops and capabilities</div><div class='ctx'>  * @capable: check capability</div><div class='ctx'>  * @hw_info: report iommu hardware information. The data buffer returned by this</div><div class='ctx'>  *           op is allocated in the iommu driver and freed by the caller after</div><div class='del'>- *           use. The information type is one of enum iommu_hw_info_type defined</div><div class='del'>- *           in include/uapi/linux/iommufd.h.</div><div class='del'>- * @domain_alloc: allocate and return an iommu domain if success. Otherwise</div><div class='del'>- *                NULL is returned. The domain is not fully initialized until</div><div class='del'>- *                the caller iommu_domain_alloc() returns.</div><div class='del'>- * @domain_alloc_user: Allocate an iommu domain corresponding to the input</div><div class='del'>- *                     parameters as defined in include/uapi/linux/iommufd.h.</div><div class='del'>- *                     Unlike @domain_alloc, it is called only by IOMMUFD and</div><div class='del'>- *                     must fully initialize the new domain before return.</div><div class='del'>- *                     Upon success, if the @user_data is valid and the @parent</div><div class='del'>- *                     points to a kernel-managed domain, the new domain must be</div><div class='del'>- *                     IOMMU_DOMAIN_NESTED type; otherwise, the @parent must be</div><div class='del'>- *                     NULL while the @user_data can be optionally provided, the</div><div class='del'>- *                     new domain must support __IOMMU_DOMAIN_PAGING.</div><div class='del'>- *                     Upon failure, ERR_PTR must be returned.</div><div class='add'>+ *           use. @type can input a requested type and output a supported type.</div><div class='add'>+ *           Driver should reject an unsupported data @type input</div><div class='add'>+ * @domain_alloc: Do not use in new drivers</div><div class='add'>+ * @domain_alloc_identity: allocate an IDENTITY domain. Drivers should prefer to</div><div class='add'>+ *                         use identity_domain instead. This should only be used</div><div class='add'>+ *                         if dynamic logic is necessary.</div><div class='add'>+ * @domain_alloc_paging_flags: Allocate an iommu domain corresponding to the</div><div class='add'>+ *                     input parameters as defined in</div><div class='add'>+ *                     include/uapi/linux/iommufd.h. The @user_data can be</div><div class='add'>+ *                     optionally provided, the new domain must support</div><div class='add'>+ *                     __IOMMU_DOMAIN_PAGING. Upon failure, ERR_PTR must be</div><div class='add'>+ *                     returned.</div><div class='ctx'>  * @domain_alloc_paging: Allocate an iommu_domain that can be used for</div><div class='del'>- *                       UNMANAGED, DMA, and DMA_FQ domain types.</div><div class='add'>+ *                       UNMANAGED, DMA, and DMA_FQ domain types. This is the</div><div class='add'>+ *                       same as invoking domain_alloc_paging_flags() with</div><div class='add'>+ *                       @flags=0, @user_data=NULL. A driver should implement</div><div class='add'>+ *                       only one of the two ops.</div><div class='add'>+ * @domain_alloc_sva: Allocate an iommu_domain for Shared Virtual Addressing.</div><div class='add'>+ * @domain_alloc_nested: Allocate an iommu_domain for nested translation.</div><div class='ctx'>  * @probe_device: Add device to iommu driver handling</div><div class='ctx'>  * @release_device: Remove device from iommu driver handling</div><div class='ctx'>  * @probe_finalize: Do final setup work after the device is added to an IOMMU</div><div class='hunk'>@@ -527,18 +631,22 @@ static inline int __iommu_copy_struct_from_user_array(</div><div class='ctx'>  * @of_xlate: add OF master IDs to iommu grouping</div><div class='ctx'>  * @is_attach_deferred: Check if domain attach should be deferred from iommu</div><div class='ctx'>  *                      driver init to device driver init (default no)</div><div class='del'>- * @dev_enable/disable_feat: per device entries to enable/disable</div><div class='del'>- *                               iommu specific features.</div><div class='ctx'>  * @page_response: handle page request response</div><div class='ctx'>  * @def_domain_type: device default domain type, return value:</div><div class='ctx'>  *		- IOMMU_DOMAIN_IDENTITY: must use an identity domain</div><div class='ctx'>  *		- IOMMU_DOMAIN_DMA: must use a dma domain</div><div class='ctx'>  *		- 0: use the default setting</div><div class='ctx'>  * @default_domain_ops: the default ops for domains</div><div class='del'>- * @remove_dev_pasid: Remove any translation configurations of a specific</div><div class='del'>- *                    pasid, so that any DMA transactions with this pasid</div><div class='del'>- *                    will be blocked by the hardware.</div><div class='del'>- * @pgsize_bitmap: bitmap of all possible supported page sizes</div><div class='add'>+ * @get_viommu_size: Get the size of a driver-level vIOMMU structure for a given</div><div class='add'>+ *                   @dev corresponding to @viommu_type. Driver should return 0</div><div class='add'>+ *                   if vIOMMU isn't supported accordingly. It is required for</div><div class='add'>+ *                   driver to use the VIOMMU_STRUCT_SIZE macro to sanitize the</div><div class='add'>+ *                   driver-level vIOMMU structure related to the core one</div><div class='add'>+ * @viommu_init: Init the driver-level struct of an iommufd_viommu on a physical</div><div class='add'>+ *               IOMMU instance @viommu-&gt;iommu_dev, as the set of virtualization</div><div class='add'>+ *               resources shared/passed to user space IOMMU instance. Associate</div><div class='add'>+ *               it with a nesting @parent_domain. It is required for driver to</div><div class='add'>+ *               set @viommu-&gt;ops pointing to its own viommu_ops</div><div class='ctx'>  * @owner: Driver module providing these ops</div><div class='ctx'>  * @identity_domain: An always available, always attachable identity</div><div class='ctx'>  *                   translation.</div><div class='hunk'>@@ -547,17 +655,30 @@ static inline int __iommu_copy_struct_from_user_array(</div><div class='ctx'>  * @default_domain: If not NULL this will always be set as the default domain.</div><div class='ctx'>  *                  This should be an IDENTITY/BLOCKED/PLATFORM domain.</div><div class='ctx'>  *                  Do not use in new drivers.</div><div class='add'>+ * @user_pasid_table: IOMMU driver supports user-managed PASID table. There is</div><div class='add'>+ *                    no user domain for each PASID and the I/O page faults are</div><div class='add'>+ *                    forwarded through the user domain attached to the device</div><div class='add'>+ *                    RID.</div><div class='ctx'>  */</div><div class='ctx'> struct iommu_ops {</div><div class='ctx'> 	bool (*capable)(struct device *dev, enum iommu_cap);</div><div class='del'>-	void *(*hw_info)(struct device *dev, u32 *length, u32 *type);</div><div class='add'>+	void *(*hw_info)(struct device *dev, u32 *length,</div><div class='add'>+			 enum iommu_hw_info_type *type);</div><div class='ctx'> </div><div class='ctx'> 	/* Domain allocation and freeing by the iommu driver */</div><div class='add'>+#if IS_ENABLED(CONFIG_FSL_PAMU)</div><div class='ctx'> 	struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type);</div><div class='del'>-	struct iommu_domain *(*domain_alloc_user)(</div><div class='del'>-		struct device *dev, u32 flags, struct iommu_domain *parent,</div><div class='add'>+#endif</div><div class='add'>+	struct iommu_domain *(*domain_alloc_identity)(struct device *dev);</div><div class='add'>+	struct iommu_domain *(*domain_alloc_paging_flags)(</div><div class='add'>+		struct device *dev, u32 flags,</div><div class='ctx'> 		const struct iommu_user_data *user_data);</div><div class='ctx'> 	struct iommu_domain *(*domain_alloc_paging)(struct device *dev);</div><div class='add'>+	struct iommu_domain *(*domain_alloc_sva)(struct device *dev,</div><div class='add'>+						 struct mm_struct *mm);</div><div class='add'>+	struct iommu_domain *(*domain_alloc_nested)(</div><div class='add'>+		struct device *dev, struct iommu_domain *parent, u32 flags,</div><div class='add'>+		const struct iommu_user_data *user_data);</div><div class='ctx'> </div><div class='ctx'> 	struct iommu_device *(*probe_device)(struct device *dev);</div><div class='ctx'> 	void (*release_device)(struct device *dev);</div><div class='hunk'>@@ -571,22 +692,24 @@ struct iommu_ops {</div><div class='ctx'> 	bool (*is_attach_deferred)(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Per device IOMMU features */</div><div class='del'>-	int (*dev_enable_feat)(struct device *dev, enum iommu_dev_features f);</div><div class='del'>-	int (*dev_disable_feat)(struct device *dev, enum iommu_dev_features f);</div><div class='del'>-</div><div class='ctx'> 	void (*page_response)(struct device *dev, struct iopf_fault *evt,</div><div class='ctx'> 			      struct iommu_page_response *msg);</div><div class='ctx'> </div><div class='ctx'> 	int (*def_domain_type)(struct device *dev);</div><div class='del'>-	void (*remove_dev_pasid)(struct device *dev, ioasid_t pasid);</div><div class='add'>+</div><div class='add'>+	size_t (*get_viommu_size)(struct device *dev,</div><div class='add'>+				  enum iommu_viommu_type viommu_type);</div><div class='add'>+	int (*viommu_init)(struct iommufd_viommu *viommu,</div><div class='add'>+			   struct iommu_domain *parent_domain,</div><div class='add'>+			   const struct iommu_user_data *user_data);</div><div class='ctx'> </div><div class='ctx'> 	const struct iommu_domain_ops *default_domain_ops;</div><div class='del'>-	unsigned long pgsize_bitmap;</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> 	struct iommu_domain *identity_domain;</div><div class='ctx'> 	struct iommu_domain *blocked_domain;</div><div class='ctx'> 	struct iommu_domain *release_domain;</div><div class='ctx'> 	struct iommu_domain *default_domain;</div><div class='add'>+	u8 user_pasid_table:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -604,7 +727,8 @@ struct iommu_ops {</div><div class='ctx'>  * * EBUSY	- device is attached to a domain and cannot be changed</div><div class='ctx'>  * * ENODEV	- device specific errors, not able to be attached</div><div class='ctx'>  * * &lt;others&gt;	- treated as ENODEV by the caller. Use is discouraged</div><div class='del'>- * @set_dev_pasid: set an iommu domain to a pasid of device</div><div class='add'>+ * @set_dev_pasid: set or replace an iommu domain to a pasid of device. The pasid of</div><div class='add'>+ *                 the device should be left in the old config in error case.</div><div class='ctx'>  * @map_pages: map a physically contiguous set of pages of the same size to</div><div class='ctx'>  *             an iommu domain.</div><div class='ctx'>  * @unmap_pages: unmap a number of pages of the same size from an iommu domain</div><div class='hunk'>@@ -623,14 +747,14 @@ struct iommu_ops {</div><div class='ctx'>  * @enforce_cache_coherency: Prevent any kind of DMA from bypassing IOMMU_CACHE,</div><div class='ctx'>  *                           including no-snoop TLPs on PCIe or other platform</div><div class='ctx'>  *                           specific mechanisms.</div><div class='del'>- * @enable_nesting: Enable nesting</div><div class='ctx'>  * @set_pgtable_quirks: Set io page table quirks (IO_PGTABLE_QUIRK_*)</div><div class='ctx'>  * @free: Release the domain after use.</div><div class='ctx'>  */</div><div class='ctx'> struct iommu_domain_ops {</div><div class='del'>-	int (*attach_dev)(struct iommu_domain *domain, struct device *dev);</div><div class='add'>+	int (*attach_dev)(struct iommu_domain *domain, struct device *dev,</div><div class='add'>+			  struct iommu_domain *old);</div><div class='ctx'> 	int (*set_dev_pasid)(struct iommu_domain *domain, struct device *dev,</div><div class='del'>-			     ioasid_t pasid);</div><div class='add'>+			     ioasid_t pasid, struct iommu_domain *old);</div><div class='ctx'> </div><div class='ctx'> 	int (*map_pages)(struct iommu_domain *domain, unsigned long iova,</div><div class='ctx'> 			 phys_addr_t paddr, size_t pgsize, size_t pgcount,</div><div class='hunk'>@@ -651,7 +775,6 @@ struct iommu_domain_ops {</div><div class='ctx'> 				    dma_addr_t iova);</div><div class='ctx'> </div><div class='ctx'> 	bool (*enforce_cache_coherency)(struct iommu_domain *domain);</div><div class='del'>-	int (*enable_nesting)(struct iommu_domain *domain);</div><div class='ctx'> 	int (*set_pgtable_quirks)(struct iommu_domain *domain,</div><div class='ctx'> 				  unsigned long quirks);</div><div class='ctx'> </div><div class='hunk'>@@ -666,6 +789,7 @@ struct iommu_domain_ops {</div><div class='ctx'>  * @dev: struct device for sysfs handling</div><div class='ctx'>  * @singleton_group: Used internally for drivers that have only one group</div><div class='ctx'>  * @max_pasids: number of supported PASIDs</div><div class='add'>+ * @ready: set once iommu_device_register() has completed successfully</div><div class='ctx'>  */</div><div class='ctx'> struct iommu_device {</div><div class='ctx'> 	struct list_head list;</div><div class='hunk'>@@ -674,6 +798,7 @@ struct iommu_device {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct iommu_group *singleton_group;</div><div class='ctx'> 	u32 max_pasids;</div><div class='add'>+	bool ready;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -768,26 +893,30 @@ static inline void iommu_iotlb_gather_init(struct iommu_iotlb_gather *gather)</div><div class='ctx'> {</div><div class='ctx'> 	*gather = (struct iommu_iotlb_gather) {</div><div class='ctx'> 		.start	= ULONG_MAX,</div><div class='del'>-		.freelist = LIST_HEAD_INIT(gather-&gt;freelist),</div><div class='add'>+		.freelist = IOMMU_PAGES_LIST_INIT(gather-&gt;freelist),</div><div class='ctx'> 	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int bus_iommu_probe(const struct bus_type *bus);</div><div class='del'>-extern bool iommu_present(const struct bus_type *bus);</div><div class='ctx'> extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap);</div><div class='ctx'> extern bool iommu_group_has_isolated_msi(struct iommu_group *group);</div><div class='del'>-extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus);</div><div class='add'>+struct iommu_domain *iommu_paging_domain_alloc_flags(struct device *dev, unsigned int flags);</div><div class='add'>+static inline struct iommu_domain *iommu_paging_domain_alloc(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return iommu_paging_domain_alloc_flags(dev, 0);</div><div class='add'>+}</div><div class='ctx'> extern void iommu_domain_free(struct iommu_domain *domain);</div><div class='ctx'> extern int iommu_attach_device(struct iommu_domain *domain,</div><div class='ctx'> 			       struct device *dev);</div><div class='ctx'> extern void iommu_detach_device(struct iommu_domain *domain,</div><div class='ctx'> 				struct device *dev);</div><div class='del'>-extern int iommu_sva_unbind_gpasid(struct iommu_domain *domain,</div><div class='del'>-				   struct device *dev, ioasid_t pasid);</div><div class='ctx'> extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev);</div><div class='ctx'> extern struct iommu_domain *iommu_get_dma_domain(struct device *dev);</div><div class='ctx'> extern int iommu_map(struct iommu_domain *domain, unsigned long iova,</div><div class='ctx'> 		     phys_addr_t paddr, size_t size, int prot, gfp_t gfp);</div><div class='add'>+int iommu_map_nosync(struct iommu_domain *domain, unsigned long iova,</div><div class='add'>+		phys_addr_t paddr, size_t size, int prot, gfp_t gfp);</div><div class='add'>+int iommu_sync_map(struct iommu_domain *domain, unsigned long iova,</div><div class='add'>+		size_t size);</div><div class='ctx'> extern size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova,</div><div class='ctx'> 			  size_t size);</div><div class='ctx'> extern size_t iommu_unmap_fast(struct iommu_domain *domain,</div><div class='hunk'>@@ -833,7 +962,6 @@ extern void iommu_group_put(struct iommu_group *group);</div><div class='ctx'> extern int iommu_group_id(struct iommu_group *group);</div><div class='ctx'> extern struct iommu_domain *iommu_group_default_domain(struct iommu_group *);</div><div class='ctx'> </div><div class='del'>-int iommu_enable_nesting(struct iommu_domain *domain);</div><div class='ctx'> int iommu_set_pgtable_quirks(struct iommu_domain *domain,</div><div class='ctx'> 		unsigned long quirks);</div><div class='ctx'> </div><div class='hunk'>@@ -965,7 +1093,6 @@ extern struct iommu_group *generic_single_device_group(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iommu_fwspec - per-device IOMMU instance data</div><div class='del'>- * @ops: ops for this device's IOMMU</div><div class='ctx'>  * @iommu_fwnode: firmware handle for this device's IOMMU</div><div class='ctx'>  * @flags: IOMMU_FWSPEC_* flags</div><div class='ctx'>  * @num_ids: number of associated device IDs</div><div class='hunk'>@@ -976,7 +1103,6 @@ extern struct iommu_group *generic_single_device_group(struct device *dev);</div><div class='ctx'>  * consumers.</div><div class='ctx'>  */</div><div class='ctx'> struct iommu_fwspec {</div><div class='del'>-	const struct iommu_ops	*ops;</div><div class='ctx'> 	struct fwnode_handle	*iommu_fwnode;</div><div class='ctx'> 	u32			flags;</div><div class='ctx'> 	unsigned int		num_ids;</div><div class='hunk'>@@ -985,28 +1111,37 @@ struct iommu_fwspec {</div><div class='ctx'> </div><div class='ctx'> /* ATS is supported */</div><div class='ctx'> #define IOMMU_FWSPEC_PCI_RC_ATS			(1 &lt;&lt; 0)</div><div class='add'>+/* CANWBS is supported */</div><div class='add'>+#define IOMMU_FWSPEC_PCI_RC_CANWBS		(1 &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * An iommu attach handle represents a relationship between an iommu domain</div><div class='add'>+ * and a PASID or RID of a device. It is allocated and managed by the component</div><div class='add'>+ * that manages the domain and is stored in the iommu group during the time the</div><div class='add'>+ * domain is attached.</div><div class='add'>+ */</div><div class='add'>+struct iommu_attach_handle {</div><div class='add'>+	struct iommu_domain		*domain;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct iommu_sva - handle to a device-mm bond</div><div class='ctx'>  */</div><div class='ctx'> struct iommu_sva {</div><div class='add'>+	struct iommu_attach_handle	handle;</div><div class='ctx'> 	struct device			*dev;</div><div class='del'>-	struct iommu_domain		*domain;</div><div class='del'>-	struct list_head		handle_item;</div><div class='ctx'> 	refcount_t			users;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iommu_mm_data {</div><div class='ctx'> 	u32			pasid;</div><div class='add'>+	struct mm_struct	*mm;</div><div class='ctx'> 	struct list_head	sva_domains;</div><div class='del'>-	struct list_head	sva_handles;</div><div class='add'>+	struct list_head	mm_list_elm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode,</div><div class='del'>-		      const struct iommu_ops *ops);</div><div class='del'>-void iommu_fwspec_free(struct device *dev);</div><div class='add'>+int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode);</div><div class='ctx'> int iommu_fwspec_add_ids(struct device *dev, const u32 *ids, int num_ids);</div><div class='del'>-const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode);</div><div class='ctx'> </div><div class='ctx'> static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1035,9 +1170,6 @@ void dev_iommu_priv_set(struct device *dev, void *priv);</div><div class='ctx'> extern struct mutex iommu_probe_device_lock;</div><div class='ctx'> int iommu_probe_device(struct device *dev);</div><div class='ctx'> </div><div class='del'>-int iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features f);</div><div class='del'>-int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features f);</div><div class='del'>-</div><div class='ctx'> int iommu_device_use_default_domain(struct device *dev);</div><div class='ctx'> void iommu_device_unuse_default_domain(struct device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1049,12 +1181,10 @@ int iommu_device_claim_dma_owner(struct device *dev, void *owner);</div><div class='ctx'> void iommu_device_release_dma_owner(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> int iommu_attach_device_pasid(struct iommu_domain *domain,</div><div class='del'>-			      struct device *dev, ioasid_t pasid);</div><div class='add'>+			      struct device *dev, ioasid_t pasid,</div><div class='add'>+			      struct iommu_attach_handle *handle);</div><div class='ctx'> void iommu_detach_device_pasid(struct iommu_domain *domain,</div><div class='ctx'> 			       struct device *dev, ioasid_t pasid);</div><div class='del'>-struct iommu_domain *</div><div class='del'>-iommu_get_domain_for_dev_pasid(struct device *dev, ioasid_t pasid,</div><div class='del'>-			       unsigned int type);</div><div class='ctx'> ioasid_t iommu_alloc_global_pasid(struct device *dev);</div><div class='ctx'> void iommu_free_global_pasid(ioasid_t pasid);</div><div class='ctx'> #else /* CONFIG_IOMMU_API */</div><div class='hunk'>@@ -1068,19 +1198,20 @@ struct iommu_iotlb_gather {};</div><div class='ctx'> struct iommu_dirty_bitmap {};</div><div class='ctx'> struct iommu_dirty_ops {};</div><div class='ctx'> </div><div class='del'>-static inline bool iommu_present(const struct bus_type *bus)</div><div class='add'>+static inline bool device_iommu_capable(struct device *dev, enum iommu_cap cap)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool device_iommu_capable(struct device *dev, enum iommu_cap cap)</div><div class='add'>+static inline struct iommu_domain *iommu_paging_domain_alloc_flags(struct device *dev,</div><div class='add'>+						     unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus)</div><div class='add'>+static inline struct iommu_domain *iommu_paging_domain_alloc(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iommu_domain_free(struct iommu_domain *domain)</div><div class='hunk'>@@ -1312,40 +1443,17 @@ static inline void iommu_device_unlink(struct device *dev, struct device *link)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int iommu_fwspec_init(struct device *dev,</div><div class='del'>-				    struct fwnode_handle *iommu_fwnode,</div><div class='del'>-				    const struct iommu_ops *ops)</div><div class='add'>+				    struct fwnode_handle *iommu_fwnode)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void iommu_fwspec_free(struct device *dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int iommu_fwspec_add_ids(struct device *dev, u32 *ids,</div><div class='ctx'> 				       int num_ids)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features feat)</div><div class='del'>-{</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat)</div><div class='del'>-{</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -1385,7 +1493,8 @@ static inline int iommu_device_claim_dma_owner(struct device *dev, void *owner)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int iommu_attach_device_pasid(struct iommu_domain *domain,</div><div class='del'>-					    struct device *dev, ioasid_t pasid)</div><div class='add'>+					    struct device *dev, ioasid_t pasid,</div><div class='add'>+					    struct iommu_attach_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='hunk'>@@ -1395,13 +1504,6 @@ static inline void iommu_detach_device_pasid(struct iommu_domain *domain,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct iommu_domain *</div><div class='del'>-iommu_get_domain_for_dev_pasid(struct device *dev, ioasid_t pasid,</div><div class='del'>-			       unsigned int type)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline ioasid_t iommu_alloc_global_pasid(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return IOMMU_PASID_INVALID;</div><div class='hunk'>@@ -1410,6 +1512,18 @@ static inline ioasid_t iommu_alloc_global_pasid(struct device *dev)</div><div class='ctx'> static inline void iommu_free_global_pasid(ioasid_t pasid) {}</div><div class='ctx'> #endif /* CONFIG_IOMMU_API */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IRQ_MSI_IOMMU</div><div class='add'>+#ifdef CONFIG_IOMMU_API</div><div class='add'>+int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr);</div><div class='add'>+#else</div><div class='add'>+static inline int iommu_dma_prepare_msi(struct msi_desc *desc,</div><div class='add'>+					phys_addr_t msi_addr)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IOMMU_API */</div><div class='add'>+#endif /* CONFIG_IRQ_MSI_IOMMU */</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_LOCKDEP) &amp;&amp; IS_ENABLED(CONFIG_IOMMU_API)</div><div class='ctx'> void iommu_group_mutex_assert(struct device *dev);</div><div class='ctx'> #else</div><div class='hunk'>@@ -1443,39 +1557,12 @@ static inline void iommu_debugfs_setup(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IOMMU_DMA</div><div class='del'>-#include &lt;linux/msi.h&gt;</div><div class='del'>-</div><div class='del'>-/* Setup call for arch DMA mapping code */</div><div class='del'>-void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit);</div><div class='del'>-</div><div class='ctx'> int iommu_get_msi_cookie(struct iommu_domain *domain, dma_addr_t base);</div><div class='del'>-</div><div class='del'>-int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr);</div><div class='del'>-void iommu_dma_compose_msi_msg(struct msi_desc *desc, struct msi_msg *msg);</div><div class='del'>-</div><div class='ctx'> #else /* CONFIG_IOMMU_DMA */</div><div class='del'>-</div><div class='del'>-struct msi_desc;</div><div class='del'>-struct msi_msg;</div><div class='del'>-</div><div class='del'>-static inline void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int iommu_get_msi_cookie(struct iommu_domain *domain, dma_addr_t base)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void iommu_dma_compose_msi_msg(struct msi_desc *desc, struct msi_msg *msg)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif	/* CONFIG_IOMMU_DMA */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1531,13 +1618,12 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev,</div><div class='ctx'> 					struct mm_struct *mm);</div><div class='ctx'> void iommu_sva_unbind_device(struct iommu_sva *handle);</div><div class='ctx'> u32 iommu_sva_get_pasid(struct iommu_sva *handle);</div><div class='del'>-struct iommu_domain *iommu_sva_domain_alloc(struct device *dev,</div><div class='del'>-					    struct mm_struct *mm);</div><div class='add'>+void iommu_sva_invalidate_kva_range(unsigned long start, unsigned long end);</div><div class='ctx'> #else</div><div class='ctx'> static inline struct iommu_sva *</div><div class='ctx'> iommu_sva_bind_device(struct device *dev, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iommu_sva_unbind_device(struct iommu_sva *handle)</div><div class='hunk'>@@ -1557,12 +1643,7 @@ static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mm_pasid_drop(struct mm_struct *mm) {}</div><div class='del'>-</div><div class='del'>-static inline struct iommu_domain *</div><div class='del'>-iommu_sva_domain_alloc(struct device *dev, struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='add'>+static inline void iommu_sva_invalidate_kva_range(unsigned long start, unsigned long end) {}</div><div class='ctx'> #endif /* CONFIG_IOMMU_SVA */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IOMMU_IOPF</div><div class='hunk'>@@ -1573,7 +1654,7 @@ struct iopf_queue *iopf_queue_alloc(const char *name);</div><div class='ctx'> void iopf_queue_free(struct iopf_queue *queue);</div><div class='ctx'> int iopf_queue_discard_partial(struct iopf_queue *queue);</div><div class='ctx'> void iopf_free_group(struct iopf_group *group);</div><div class='del'>-void iommu_report_device_fault(struct device *dev, struct iopf_fault *evt);</div><div class='add'>+int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt);</div><div class='ctx'> void iopf_group_response(struct iopf_group *group,</div><div class='ctx'> 			 enum iommu_page_response_code status);</div><div class='ctx'> #else</div><div class='hunk'>@@ -1611,9 +1692,10 @@ static inline void iopf_free_group(struct iopf_group *group)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static inline int</div><div class='ctx'> iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)</div><div class='ctx'> {</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void iopf_group_response(struct iopf_group *group,</div><div class='head'>diff --git a/include/linux/iommufd.h b/include/linux/iommufd.h<br/>index ffc3a949f837..6e7efe83bc5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iommufd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iommufd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iommufd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iommufd.h</a></div><div class='hunk'>@@ -6,25 +6,67 @@</div><div class='ctx'> #ifndef __LINUX_IOMMUFD_H</div><div class='ctx'> #define __LINUX_IOMMUFD_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/iommu.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/xarray.h&gt;</div><div class='add'>+#include &lt;uapi/linux/iommufd.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='del'>-struct iommufd_device;</div><div class='del'>-struct page;</div><div class='del'>-struct iommufd_ctx;</div><div class='del'>-struct iommufd_access;</div><div class='ctx'> struct file;</div><div class='ctx'> struct iommu_group;</div><div class='add'>+struct iommu_user_data;</div><div class='add'>+struct iommu_user_data_array;</div><div class='add'>+struct iommufd_access;</div><div class='add'>+struct iommufd_ctx;</div><div class='add'>+struct iommufd_device;</div><div class='add'>+struct iommufd_viommu_ops;</div><div class='add'>+struct page;</div><div class='add'>+</div><div class='add'>+enum iommufd_object_type {</div><div class='add'>+	IOMMUFD_OBJ_NONE,</div><div class='add'>+	IOMMUFD_OBJ_ANY = IOMMUFD_OBJ_NONE,</div><div class='add'>+	IOMMUFD_OBJ_DEVICE,</div><div class='add'>+	IOMMUFD_OBJ_HWPT_PAGING,</div><div class='add'>+	IOMMUFD_OBJ_HWPT_NESTED,</div><div class='add'>+	IOMMUFD_OBJ_IOAS,</div><div class='add'>+	IOMMUFD_OBJ_ACCESS,</div><div class='add'>+	IOMMUFD_OBJ_FAULT,</div><div class='add'>+	IOMMUFD_OBJ_VIOMMU,</div><div class='add'>+	IOMMUFD_OBJ_VDEVICE,</div><div class='add'>+	IOMMUFD_OBJ_VEVENTQ,</div><div class='add'>+	IOMMUFD_OBJ_HW_QUEUE,</div><div class='add'>+#ifdef CONFIG_IOMMUFD_TEST</div><div class='add'>+	IOMMUFD_OBJ_SELFTEST,</div><div class='add'>+#endif</div><div class='add'>+	IOMMUFD_OBJ_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Base struct for all objects with a userspace ID handle. */</div><div class='add'>+struct iommufd_object {</div><div class='add'>+	/*</div><div class='add'>+	 * Destroy will sleep and wait for wait_cnt to go to zero. This allows</div><div class='add'>+	 * concurrent users of the ID to reliably avoid causing a spurious</div><div class='add'>+	 * destroy failure. Incrementing this count should either be short</div><div class='add'>+	 * lived or be revoked and blocked during pre_destroy().</div><div class='add'>+	 */</div><div class='add'>+	refcount_t wait_cnt;</div><div class='add'>+	refcount_t users;</div><div class='add'>+	enum iommufd_object_type type;</div><div class='add'>+	unsigned int id;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct iommufd_device *iommufd_device_bind(struct iommufd_ctx *ictx,</div><div class='ctx'> 					   struct device *dev, u32 *id);</div><div class='ctx'> void iommufd_device_unbind(struct iommufd_device *idev);</div><div class='ctx'> </div><div class='del'>-int iommufd_device_attach(struct iommufd_device *idev, u32 *pt_id);</div><div class='del'>-int iommufd_device_replace(struct iommufd_device *idev, u32 *pt_id);</div><div class='del'>-void iommufd_device_detach(struct iommufd_device *idev);</div><div class='add'>+int iommufd_device_attach(struct iommufd_device *idev, ioasid_t pasid,</div><div class='add'>+			  u32 *pt_id);</div><div class='add'>+int iommufd_device_replace(struct iommufd_device *idev, ioasid_t pasid,</div><div class='add'>+			   u32 *pt_id);</div><div class='add'>+void iommufd_device_detach(struct iommufd_device *idev, ioasid_t pasid);</div><div class='ctx'> </div><div class='ctx'> struct iommufd_ctx *iommufd_device_to_ictx(struct iommufd_device *idev);</div><div class='ctx'> u32 iommufd_device_to_id(struct iommufd_device *idev);</div><div class='hunk'>@@ -54,6 +96,107 @@ void iommufd_access_detach(struct iommufd_access *access);</div><div class='ctx'> </div><div class='ctx'> void iommufd_ctx_get(struct iommufd_ctx *ictx);</div><div class='ctx'> </div><div class='add'>+struct iommufd_viommu {</div><div class='add'>+	struct iommufd_object obj;</div><div class='add'>+	struct iommufd_ctx *ictx;</div><div class='add'>+	struct iommu_device *iommu_dev;</div><div class='add'>+	struct iommufd_hwpt_paging *hwpt;</div><div class='add'>+</div><div class='add'>+	const struct iommufd_viommu_ops *ops;</div><div class='add'>+</div><div class='add'>+	struct xarray vdevs;</div><div class='add'>+	struct list_head veventqs;</div><div class='add'>+	struct rw_semaphore veventqs_rwsem;</div><div class='add'>+</div><div class='add'>+	enum iommu_viommu_type type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iommufd_vdevice {</div><div class='add'>+	struct iommufd_object obj;</div><div class='add'>+	struct iommufd_viommu *viommu;</div><div class='add'>+	struct iommufd_device *idev;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Virtual device ID per vIOMMU, e.g. vSID of ARM SMMUv3, vDeviceID of</div><div class='add'>+	 * AMD IOMMU, and vRID of Intel VT-d</div><div class='add'>+	 */</div><div class='add'>+	u64 virt_id;</div><div class='add'>+</div><div class='add'>+	/* Clean up all driver-specific parts of an iommufd_vdevice */</div><div class='add'>+	void (*destroy)(struct iommufd_vdevice *vdev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iommufd_hw_queue {</div><div class='add'>+	struct iommufd_object obj;</div><div class='add'>+	struct iommufd_viommu *viommu;</div><div class='add'>+	struct iommufd_access *access;</div><div class='add'>+</div><div class='add'>+	u64 base_addr; /* in guest physical address space */</div><div class='add'>+	size_t length;</div><div class='add'>+</div><div class='add'>+	enum iommu_hw_queue_type type;</div><div class='add'>+</div><div class='add'>+	/* Clean up all driver-specific parts of an iommufd_hw_queue */</div><div class='add'>+	void (*destroy)(struct iommufd_hw_queue *hw_queue);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iommufd_viommu_ops - vIOMMU specific operations</div><div class='add'>+ * @destroy: Clean up all driver-specific parts of an iommufd_viommu. The memory</div><div class='add'>+ *           of the vIOMMU will be free-ed by iommufd core after calling this op</div><div class='add'>+ * @alloc_domain_nested: Allocate a IOMMU_DOMAIN_NESTED on a vIOMMU that holds a</div><div class='add'>+ *                       nesting parent domain (IOMMU_DOMAIN_PAGING). @user_data</div><div class='add'>+ *                       must be defined in include/uapi/linux/iommufd.h.</div><div class='add'>+ *                       It must fully initialize the new iommu_domain before</div><div class='add'>+ *                       returning. Upon failure, ERR_PTR must be returned.</div><div class='add'>+ * @cache_invalidate: Flush hardware cache used by a vIOMMU. It can be used for</div><div class='add'>+ *                    any IOMMU hardware specific cache: TLB and device cache.</div><div class='add'>+ *                    The @array passes in the cache invalidation requests, in</div><div class='add'>+ *                    form of a driver data structure. A driver must update the</div><div class='add'>+ *                    array-&gt;entry_num to report the number of handled requests.</div><div class='add'>+ *                    The data structure of the array entry must be defined in</div><div class='add'>+ *                    include/uapi/linux/iommufd.h</div><div class='add'>+ * @vdevice_size: Size of the driver-defined vDEVICE structure per this vIOMMU</div><div class='add'>+ * @vdevice_init: Initialize the driver-level structure of a vDEVICE object, or</div><div class='add'>+ *                related HW procedure. @vdev is already initialized by iommufd</div><div class='add'>+ *                core: vdev-&gt;dev and vdev-&gt;viommu pointers; vdev-&gt;id carries a</div><div class='add'>+ *                per-vIOMMU virtual ID (refer to struct iommu_vdevice_alloc in</div><div class='add'>+ *                include/uapi/linux/iommufd.h)</div><div class='add'>+ *                If driver has a deinit function to revert what vdevice_init op</div><div class='add'>+ *                does, it should set it to the @vdev-&gt;destroy function pointer</div><div class='add'>+ * @get_hw_queue_size: Get the size of a driver-defined HW queue structure for a</div><div class='add'>+ *                     given @viommu corresponding to @queue_type. Driver should</div><div class='add'>+ *                     return 0 if HW queue aren't supported accordingly. It is</div><div class='add'>+ *                     required for driver to use the HW_QUEUE_STRUCT_SIZE macro</div><div class='add'>+ *                     to sanitize the driver-level HW queue structure related</div><div class='add'>+ *                     to the core one</div><div class='add'>+ * @hw_queue_init_phys: Initialize the driver-level structure of a HW queue that</div><div class='add'>+ *                      is initialized with its core-level structure that holds</div><div class='add'>+ *                      all the info about a guest queue memory.</div><div class='add'>+ *                      Driver providing this op indicates that HW accesses the</div><div class='add'>+ *                      guest queue memory via physical addresses.</div><div class='add'>+ *                      @index carries the logical HW QUEUE ID per vIOMMU in a</div><div class='add'>+ *                      guest VM, for a multi-queue model. @base_addr_pa carries</div><div class='add'>+ *                      the physical location of the guest queue</div><div class='add'>+ *                      If driver has a deinit function to revert what this op</div><div class='add'>+ *                      does, it should set it to the @hw_queue-&gt;destroy pointer</div><div class='add'>+ */</div><div class='add'>+struct iommufd_viommu_ops {</div><div class='add'>+	void (*destroy)(struct iommufd_viommu *viommu);</div><div class='add'>+	struct iommu_domain *(*alloc_domain_nested)(</div><div class='add'>+		struct iommufd_viommu *viommu, u32 flags,</div><div class='add'>+		const struct iommu_user_data *user_data);</div><div class='add'>+	int (*cache_invalidate)(struct iommufd_viommu *viommu,</div><div class='add'>+				struct iommu_user_data_array *array);</div><div class='add'>+	const size_t vdevice_size;</div><div class='add'>+	int (*vdevice_init)(struct iommufd_vdevice *vdev);</div><div class='add'>+	size_t (*get_hw_queue_size)(struct iommufd_viommu *viommu,</div><div class='add'>+				    enum iommu_hw_queue_type queue_type);</div><div class='add'>+	/* AMD's HW will add hw_queue_init simply using @hw_queue-&gt;base_addr */</div><div class='add'>+	int (*hw_queue_init_phys)(struct iommufd_hw_queue *hw_queue, u32 index,</div><div class='add'>+				  phys_addr_t base_addr_pa);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_IOMMUFD)</div><div class='ctx'> struct iommufd_ctx *iommufd_ctx_from_file(struct file *file);</div><div class='ctx'> struct iommufd_ctx *iommufd_ctx_from_fd(int fd);</div><div class='hunk'>@@ -95,8 +238,9 @@ static inline void iommufd_access_unpin_pages(struct iommufd_access *access,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int iommufd_access_rw(struct iommufd_access *access, unsigned long iova,</div><div class='del'>-		      void *data, size_t len, unsigned int flags)</div><div class='add'>+static inline int iommufd_access_rw(struct iommufd_access *access,</div><div class='add'>+				    unsigned long iova, void *data, size_t len,</div><div class='add'>+				    unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -111,4 +255,146 @@ static inline int iommufd_vfio_compat_set_no_iommu(struct iommufd_ctx *ictx)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_IOMMUFD */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IOMMUFD_DRIVER_CORE)</div><div class='add'>+int _iommufd_object_depend(struct iommufd_object *obj_dependent,</div><div class='add'>+			   struct iommufd_object *obj_depended);</div><div class='add'>+void _iommufd_object_undepend(struct iommufd_object *obj_dependent,</div><div class='add'>+			      struct iommufd_object *obj_depended);</div><div class='add'>+int _iommufd_alloc_mmap(struct iommufd_ctx *ictx, struct iommufd_object *owner,</div><div class='add'>+			phys_addr_t mmio_addr, size_t length,</div><div class='add'>+			unsigned long *offset);</div><div class='add'>+void _iommufd_destroy_mmap(struct iommufd_ctx *ictx,</div><div class='add'>+			   struct iommufd_object *owner, unsigned long offset);</div><div class='add'>+struct device *iommufd_vdevice_to_device(struct iommufd_vdevice *vdev);</div><div class='add'>+struct device *iommufd_viommu_find_dev(struct iommufd_viommu *viommu,</div><div class='add'>+				       unsigned long vdev_id);</div><div class='add'>+int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu,</div><div class='add'>+			       struct device *dev, unsigned long *vdev_id);</div><div class='add'>+int iommufd_viommu_report_event(struct iommufd_viommu *viommu,</div><div class='add'>+				enum iommu_veventq_type type, void *event_data,</div><div class='add'>+				size_t data_len);</div><div class='add'>+#else /* !CONFIG_IOMMUFD_DRIVER_CORE */</div><div class='add'>+static inline int _iommufd_object_depend(struct iommufd_object *obj_dependent,</div><div class='add'>+					 struct iommufd_object *obj_depended)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+_iommufd_object_undepend(struct iommufd_object *obj_dependent,</div><div class='add'>+			 struct iommufd_object *obj_depended)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int _iommufd_alloc_mmap(struct iommufd_ctx *ictx,</div><div class='add'>+				      struct iommufd_object *owner,</div><div class='add'>+				      phys_addr_t mmio_addr, size_t length,</div><div class='add'>+				      unsigned long *offset)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void _iommufd_destroy_mmap(struct iommufd_ctx *ictx,</div><div class='add'>+					 struct iommufd_object *owner,</div><div class='add'>+					 unsigned long offset)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct device *</div><div class='add'>+iommufd_vdevice_to_device(struct iommufd_vdevice *vdev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct device *</div><div class='add'>+iommufd_viommu_find_dev(struct iommufd_viommu *viommu, unsigned long vdev_id)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu,</div><div class='add'>+					     struct device *dev,</div><div class='add'>+					     unsigned long *vdev_id)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int iommufd_viommu_report_event(struct iommufd_viommu *viommu,</div><div class='add'>+					      enum iommu_veventq_type type,</div><div class='add'>+					      void *event_data, size_t data_len)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_IOMMUFD_DRIVER_CORE */</div><div class='add'>+</div><div class='add'>+#define VIOMMU_STRUCT_SIZE(drv_struct, member)                                 \</div><div class='add'>+	(sizeof(drv_struct) +                                                  \</div><div class='add'>+	 BUILD_BUG_ON_ZERO(offsetof(drv_struct, member)) +                     \</div><div class='add'>+	 BUILD_BUG_ON_ZERO(!__same_type(struct iommufd_viommu,                 \</div><div class='add'>+					((drv_struct *)NULL)-&gt;member)))</div><div class='add'>+</div><div class='add'>+#define VDEVICE_STRUCT_SIZE(drv_struct, member)                                \</div><div class='add'>+	(sizeof(drv_struct) +                                                  \</div><div class='add'>+	 BUILD_BUG_ON_ZERO(offsetof(drv_struct, member)) +                     \</div><div class='add'>+	 BUILD_BUG_ON_ZERO(!__same_type(struct iommufd_vdevice,                \</div><div class='add'>+					((drv_struct *)NULL)-&gt;member)))</div><div class='add'>+</div><div class='add'>+#define HW_QUEUE_STRUCT_SIZE(drv_struct, member)                               \</div><div class='add'>+	(sizeof(drv_struct) +                                                  \</div><div class='add'>+	 BUILD_BUG_ON_ZERO(offsetof(drv_struct, member)) +                     \</div><div class='add'>+	 BUILD_BUG_ON_ZERO(!__same_type(struct iommufd_hw_queue,               \</div><div class='add'>+					((drv_struct *)NULL)-&gt;member)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helpers for IOMMU driver to build/destroy a dependency between two sibling</div><div class='add'>+ * structures created by one of the allocators above</div><div class='add'>+ */</div><div class='add'>+#define iommufd_hw_queue_depend(dependent, depended, member)                   \</div><div class='add'>+	({                                                                     \</div><div class='add'>+		int ret = -EINVAL;                                             \</div><div class='add'>+									       \</div><div class='add'>+		static_assert(__same_type(struct iommufd_hw_queue,             \</div><div class='add'>+					  dependent-&gt;member));                 \</div><div class='add'>+		static_assert(__same_type(typeof(*dependent), *depended));     \</div><div class='add'>+		if (!WARN_ON_ONCE(dependent-&gt;member.viommu !=                  \</div><div class='add'>+				  depended-&gt;member.viommu))                    \</div><div class='add'>+			ret = _iommufd_object_depend(&amp;dependent-&gt;member.obj,   \</div><div class='add'>+						     &amp;depended-&gt;member.obj);   \</div><div class='add'>+		ret;                                                           \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define iommufd_hw_queue_undepend(dependent, depended, member)                 \</div><div class='add'>+	({                                                                     \</div><div class='add'>+		static_assert(__same_type(struct iommufd_hw_queue,             \</div><div class='add'>+					  dependent-&gt;member));                 \</div><div class='add'>+		static_assert(__same_type(typeof(*dependent), *depended));     \</div><div class='add'>+		WARN_ON_ONCE(dependent-&gt;member.viommu !=                       \</div><div class='add'>+			     depended-&gt;member.viommu);                         \</div><div class='add'>+		_iommufd_object_undepend(&amp;dependent-&gt;member.obj,               \</div><div class='add'>+					 &amp;depended-&gt;member.obj);               \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helpers for IOMMU driver to alloc/destroy an mmapable area for a structure.</div><div class='add'>+ *</div><div class='add'>+ * To support an mmappable MMIO region, kernel driver must first register it to</div><div class='add'>+ * iommufd core to allocate an @offset, during a driver-structure initialization</div><div class='add'>+ * (e.g. viommu_init op). Then, it should report to user space this @offset and</div><div class='add'>+ * the @length of the MMIO region for mmap syscall.</div><div class='add'>+ */</div><div class='add'>+static inline int iommufd_viommu_alloc_mmap(struct iommufd_viommu *viommu,</div><div class='add'>+					    phys_addr_t mmio_addr,</div><div class='add'>+					    size_t length,</div><div class='add'>+					    unsigned long *offset)</div><div class='add'>+{</div><div class='add'>+	return _iommufd_alloc_mmap(viommu-&gt;ictx, &amp;viommu-&gt;obj, mmio_addr,</div><div class='add'>+				   length, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void iommufd_viommu_destroy_mmap(struct iommufd_viommu *viommu,</div><div class='add'>+					       unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	_iommufd_destroy_mmap(viommu-&gt;ictx, &amp;viommu-&gt;obj, offset);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h<br/>index 19a7b00baff4..bdd2e0652bc3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iopoll.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iopoll.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iopoll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iopoll.h</a></div><div class='hunk'>@@ -14,65 +14,64 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * read_poll_timeout - Periodically poll an address until a condition is</div><div class='del'>- *			met or a timeout occurs</div><div class='del'>- * @op: accessor function (takes @args as its arguments)</div><div class='del'>- * @val: Variable to read the value into</div><div class='del'>- * @cond: Break condition (usually involving @val)</div><div class='del'>- * @sleep_us: Maximum time to sleep between reads in us (0</div><div class='del'>- *            tight-loops).  Should be less than ~20ms since usleep_range</div><div class='del'>- *            is used (see Documentation/timers/timers-howto.rst).</div><div class='del'>- * @timeout_us: Timeout in us, 0 means never timeout</div><div class='del'>- * @sleep_before_read: if it is true, sleep @sleep_us before read.</div><div class='del'>- * @args: arguments for @op poll</div><div class='add'>+ * poll_timeout_us - Periodically poll and perform an operation until</div><div class='add'>+ *                   a condition is met or a timeout occurs</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='del'>- * case, the last read value at @args is stored in @val. Must not</div><div class='del'>- * be called from atomic context if sleep_us or timeout_us are used.</div><div class='add'>+ * @op: Operation</div><div class='add'>+ * @cond: Break condition</div><div class='add'>+ * @sleep_us: Maximum time to sleep between operations in us (0 tight-loops).</div><div class='add'>+ *            Please read usleep_range() function description for details and</div><div class='add'>+ *            limitations.</div><div class='add'>+ * @timeout_us: Timeout in us, 0 means never timeout</div><div class='add'>+ * @sleep_before_op: if it is true, sleep @sleep_us before operation.</div><div class='ctx'>  *</div><div class='ctx'>  * When available, you'll probably want to use one of the specialized</div><div class='ctx'>  * macros defined below rather than this macro directly.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout. Must not</div><div class='add'>+ * be called from atomic context if sleep_us or timeout_us are used.</div><div class='ctx'>  */</div><div class='del'>-#define read_poll_timeout(op, val, cond, sleep_us, timeout_us, \</div><div class='del'>-				sleep_before_read, args...) \</div><div class='add'>+#define poll_timeout_us(op, cond, sleep_us, timeout_us, sleep_before_op) \</div><div class='ctx'> ({ \</div><div class='ctx'> 	u64 __timeout_us = (timeout_us); \</div><div class='ctx'> 	unsigned long __sleep_us = (sleep_us); \</div><div class='ctx'> 	ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \</div><div class='add'>+	int ___ret; \</div><div class='ctx'> 	might_sleep_if((__sleep_us) != 0); \</div><div class='del'>-	if (sleep_before_read &amp;&amp; __sleep_us) \</div><div class='add'>+	if ((sleep_before_op) &amp;&amp; __sleep_us) \</div><div class='ctx'> 		usleep_range((__sleep_us &gt;&gt; 2) + 1, __sleep_us); \</div><div class='ctx'> 	for (;;) { \</div><div class='del'>-		(val) = op(args); \</div><div class='del'>-		if (cond) \</div><div class='add'>+		bool __expired = __timeout_us &amp;&amp; \</div><div class='add'>+			ktime_compare(ktime_get(), __timeout) &gt; 0; \</div><div class='add'>+		/* guarantee 'op' and 'cond' are evaluated after timeout expired */ \</div><div class='add'>+		barrier(); \</div><div class='add'>+		op; \</div><div class='add'>+		if (cond) { \</div><div class='add'>+			___ret = 0; \</div><div class='ctx'> 			break; \</div><div class='del'>-		if (__timeout_us &amp;&amp; \</div><div class='del'>-		    ktime_compare(ktime_get(), __timeout) &gt; 0) { \</div><div class='del'>-			(val) = op(args); \</div><div class='add'>+		} \</div><div class='add'>+		if (__expired) { \</div><div class='add'>+			___ret = -ETIMEDOUT; \</div><div class='ctx'> 			break; \</div><div class='ctx'> 		} \</div><div class='ctx'> 		if (__sleep_us) \</div><div class='ctx'> 			usleep_range((__sleep_us &gt;&gt; 2) + 1, __sleep_us); \</div><div class='ctx'> 		cpu_relax(); \</div><div class='ctx'> 	} \</div><div class='del'>-	(cond) ? 0 : -ETIMEDOUT; \</div><div class='add'>+	___ret; \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * read_poll_timeout_atomic - Periodically poll an address until a condition is</div><div class='del'>- * 				met or a timeout occurs</div><div class='del'>- * @op: accessor function (takes @args as its arguments)</div><div class='del'>- * @val: Variable to read the value into</div><div class='del'>- * @cond: Break condition (usually involving @val)</div><div class='del'>- * @delay_us: Time to udelay between reads in us (0 tight-loops).  Should</div><div class='del'>- *            be less than ~10us since udelay is used (see</div><div class='del'>- *            Documentation/timers/timers-howto.rst).</div><div class='del'>- * @timeout_us: Timeout in us, 0 means never timeout</div><div class='del'>- * @delay_before_read: if it is true, delay @delay_us before read.</div><div class='del'>- * @args: arguments for @op poll</div><div class='add'>+ * poll_timeout_us_atomic - Periodically poll and perform an operation until</div><div class='add'>+ *                          a condition is met or a timeout occurs</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='del'>- * case, the last read value at @args is stored in @val.</div><div class='add'>+ * @op: Operation</div><div class='add'>+ * @cond: Break condition</div><div class='add'>+ * @delay_us: Time to udelay between operations in us (0 tight-loops).</div><div class='add'>+ *            Please read udelay() function description for details and</div><div class='add'>+ *            limitations.</div><div class='add'>+ * @timeout_us: Timeout in us, 0 means never timeout</div><div class='add'>+ * @delay_before_op: if it is true, delay @delay_us before operation.</div><div class='ctx'>  *</div><div class='ctx'>  * This macro does not rely on timekeeping.  Hence it is safe to call even when</div><div class='ctx'>  * timekeeping is suspended, at the expense of an underestimation of wall clock</div><div class='hunk'>@@ -80,25 +79,33 @@</div><div class='ctx'>  *</div><div class='ctx'>  * When available, you'll probably want to use one of the specialized</div><div class='ctx'>  * macros defined below rather than this macro directly.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout.</div><div class='ctx'>  */</div><div class='del'>-#define read_poll_timeout_atomic(op, val, cond, delay_us, timeout_us, \</div><div class='del'>-					delay_before_read, args...) \</div><div class='add'>+#define poll_timeout_us_atomic(op, cond, delay_us, timeout_us, \</div><div class='add'>+			       delay_before_op) \</div><div class='ctx'> ({ \</div><div class='ctx'> 	u64 __timeout_us = (timeout_us); \</div><div class='ctx'> 	s64 __left_ns = __timeout_us * NSEC_PER_USEC; \</div><div class='ctx'> 	unsigned long __delay_us = (delay_us); \</div><div class='ctx'> 	u64 __delay_ns = __delay_us * NSEC_PER_USEC; \</div><div class='del'>-	if (delay_before_read &amp;&amp; __delay_us) { \</div><div class='add'>+	int ___ret; \</div><div class='add'>+	if ((delay_before_op) &amp;&amp; __delay_us) { \</div><div class='ctx'> 		udelay(__delay_us); \</div><div class='ctx'> 		if (__timeout_us) \</div><div class='ctx'> 			__left_ns -= __delay_ns; \</div><div class='ctx'> 	} \</div><div class='ctx'> 	for (;;) { \</div><div class='del'>-		(val) = op(args); \</div><div class='del'>-		if (cond) \</div><div class='add'>+		bool __expired = __timeout_us &amp;&amp; __left_ns &lt; 0; \</div><div class='add'>+		/* guarantee 'op' and 'cond' are evaluated after timeout expired */ \</div><div class='add'>+		barrier(); \</div><div class='add'>+		op; \</div><div class='add'>+		if (cond) { \</div><div class='add'>+			___ret = 0; \</div><div class='ctx'> 			break; \</div><div class='del'>-		if (__timeout_us &amp;&amp; __left_ns &lt; 0) { \</div><div class='del'>-			(val) = op(args); \</div><div class='add'>+		} \</div><div class='add'>+		if (__expired) { \</div><div class='add'>+			___ret = -ETIMEDOUT; \</div><div class='ctx'> 			break; \</div><div class='ctx'> 		} \</div><div class='ctx'> 		if (__delay_us) { \</div><div class='hunk'>@@ -110,26 +117,77 @@</div><div class='ctx'> 		if (__timeout_us) \</div><div class='ctx'> 			__left_ns--; \</div><div class='ctx'> 	} \</div><div class='del'>-	(cond) ? 0 : -ETIMEDOUT; \</div><div class='add'>+	___ret; \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * read_poll_timeout - Periodically poll an address until a condition is</div><div class='add'>+ *                     met or a timeout occurs</div><div class='add'>+ * @op: accessor function (takes @args as its arguments)</div><div class='add'>+ * @val: Variable to read the value into</div><div class='add'>+ * @cond: Break condition (usually involving @val)</div><div class='add'>+ * @sleep_us: Maximum time to sleep between reads in us (0 tight-loops). Please</div><div class='add'>+ *            read usleep_range() function description for details and</div><div class='add'>+ *            limitations.</div><div class='add'>+ * @timeout_us: Timeout in us, 0 means never timeout</div><div class='add'>+ * @sleep_before_read: if it is true, sleep @sleep_us before read.</div><div class='add'>+ * @args: arguments for @op poll</div><div class='add'>+ *</div><div class='add'>+ * When available, you'll probably want to use one of the specialized</div><div class='add'>+ * macros defined below rather than this macro directly.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='add'>+ * case, the last read value at @args is stored in @val. Must not</div><div class='add'>+ * be called from atomic context if sleep_us or timeout_us are used.</div><div class='add'>+ */</div><div class='add'>+#define read_poll_timeout(op, val, cond, sleep_us, timeout_us, \</div><div class='add'>+			  sleep_before_read, args...) \</div><div class='add'>+	poll_timeout_us((val) = op(args), cond, sleep_us, timeout_us, sleep_before_read)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * read_poll_timeout_atomic - Periodically poll an address until a condition is</div><div class='add'>+ *                            met or a timeout occurs</div><div class='add'>+ * @op: accessor function (takes @args as its arguments)</div><div class='add'>+ * @val: Variable to read the value into</div><div class='add'>+ * @cond: Break condition (usually involving @val)</div><div class='add'>+ * @delay_us: Time to udelay between reads in us (0 tight-loops). Please</div><div class='add'>+ *            read udelay() function description for details and</div><div class='add'>+ *            limitations.</div><div class='add'>+ * @timeout_us: Timeout in us, 0 means never timeout</div><div class='add'>+ * @delay_before_read: if it is true, delay @delay_us before read.</div><div class='add'>+ * @args: arguments for @op poll</div><div class='add'>+ *</div><div class='add'>+ * This macro does not rely on timekeeping.  Hence it is safe to call even when</div><div class='add'>+ * timekeeping is suspended, at the expense of an underestimation of wall clock</div><div class='add'>+ * time, which is rather minimal with a non-zero delay_us.</div><div class='add'>+ *</div><div class='add'>+ * When available, you'll probably want to use one of the specialized</div><div class='add'>+ * macros defined below rather than this macro directly.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='add'>+ * case, the last read value at @args is stored in @val.</div><div class='add'>+ */</div><div class='add'>+#define read_poll_timeout_atomic(op, val, cond, sleep_us, timeout_us, \</div><div class='add'>+				 sleep_before_read, args...) \</div><div class='add'>+	poll_timeout_us_atomic((val) = op(args), cond, sleep_us, timeout_us, sleep_before_read)</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * readx_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs</div><div class='ctx'>  * @op: accessor function (takes @addr as its only argument)</div><div class='ctx'>  * @addr: Address to poll</div><div class='ctx'>  * @val: Variable to read the value into</div><div class='ctx'>  * @cond: Break condition (usually involving @val)</div><div class='del'>- * @sleep_us: Maximum time to sleep between reads in us (0</div><div class='del'>- *            tight-loops).  Should be less than ~20ms since usleep_range</div><div class='del'>- *            is used (see Documentation/timers/timers-howto.rst).</div><div class='add'>+ * @sleep_us: Maximum time to sleep between reads in us (0 tight-loops). Please</div><div class='add'>+ *            read usleep_range() function description for details and</div><div class='add'>+ *            limitations.</div><div class='ctx'>  * @timeout_us: Timeout in us, 0 means never timeout</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='del'>- * case, the last read value at @addr is stored in @val. Must not</div><div class='del'>- * be called from atomic context if sleep_us or timeout_us are used.</div><div class='del'>- *</div><div class='ctx'>  * When available, you'll probably want to use one of the specialized</div><div class='ctx'>  * macros defined below rather than this macro directly.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='add'>+ * case, the last read value at @addr is stored in @val. Must not</div><div class='add'>+ * be called from atomic context if sleep_us or timeout_us are used.</div><div class='ctx'>  */</div><div class='ctx'> #define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us)	\</div><div class='ctx'> 	read_poll_timeout(op, val, cond, sleep_us, timeout_us, false, addr)</div><div class='hunk'>@@ -140,16 +198,16 @@</div><div class='ctx'>  * @addr: Address to poll</div><div class='ctx'>  * @val: Variable to read the value into</div><div class='ctx'>  * @cond: Break condition (usually involving @val)</div><div class='del'>- * @delay_us: Time to udelay between reads in us (0 tight-loops).  Should</div><div class='del'>- *            be less than ~10us since udelay is used (see</div><div class='del'>- *            Documentation/timers/timers-howto.rst).</div><div class='add'>+ * @delay_us: Time to udelay between reads in us (0 tight-loops). Please</div><div class='add'>+ *            read udelay() function description for details and</div><div class='add'>+ *            limitations.</div><div class='ctx'>  * @timeout_us: Timeout in us, 0 means never timeout</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='del'>- * case, the last read value at @addr is stored in @val.</div><div class='del'>- *</div><div class='ctx'>  * When available, you'll probably want to use one of the specialized</div><div class='ctx'>  * macros defined below rather than this macro directly.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='add'>+ * case, the last read value at @addr is stored in @val.</div><div class='ctx'>  */</div><div class='ctx'> #define readx_poll_timeout_atomic(op, addr, val, cond, delay_us, timeout_us) \</div><div class='ctx'> 	read_poll_timeout_atomic(op, val, cond, delay_us, timeout_us, false, addr)</div><div class='head'>diff --git a/include/linux/ioport.h b/include/linux/ioport.h<br/>index db7fe25f3370..9afa30f9346f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ioport.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ioport.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ioport.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ioport.h</a></div><div class='hunk'>@@ -154,15 +154,20 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* helpers to define resources */</div><div class='del'>-#define DEFINE_RES_NAMED(_start, _size, _name, _flags)			\</div><div class='add'>+#define DEFINE_RES_NAMED_DESC(_start, _size, _name, _flags, _desc)	\</div><div class='ctx'> (struct resource) {							\</div><div class='ctx'> 		.start = (_start),					\</div><div class='ctx'> 		.end = (_start) + (_size) - 1,				\</div><div class='ctx'> 		.name = (_name),					\</div><div class='ctx'> 		.flags = (_flags),					\</div><div class='del'>-		.desc = IORES_DESC_NONE,				\</div><div class='add'>+		.desc = (_desc),					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define DEFINE_RES_NAMED(_start, _size, _name, _flags)			\</div><div class='add'>+	DEFINE_RES_NAMED_DESC(_start, _size, _name, _flags, IORES_DESC_NONE)</div><div class='add'>+#define DEFINE_RES(_start, _size, _flags)				\</div><div class='add'>+	DEFINE_RES_NAMED(_start, _size, NULL, _flags)</div><div class='add'>+</div><div class='ctx'> #define DEFINE_RES_IO_NAMED(_start, _size, _name)			\</div><div class='ctx'> 	DEFINE_RES_NAMED((_start), (_size), (_name), IORESOURCE_IO)</div><div class='ctx'> #define DEFINE_RES_IO(_start, _size)					\</div><div class='hunk'>@@ -188,6 +193,42 @@ enum {</div><div class='ctx'> #define DEFINE_RES_DMA(_dma)						\</div><div class='ctx'> 	DEFINE_RES_DMA_NAMED((_dma), NULL)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * typedef resource_alignf - Resource alignment callback</div><div class='add'>+ * @data:	Private data used by the callback</div><div class='add'>+ * @res:	Resource candidate range (an empty resource space)</div><div class='add'>+ * @size:	The minimum size of the empty space</div><div class='add'>+ * @align:	Alignment from the constraints</div><div class='add'>+ *</div><div class='add'>+ * Callback allows calculating resource placement and alignment beyond min,</div><div class='add'>+ * max, and align fields in the struct resource_constraint.</div><div class='add'>+ *</div><div class='add'>+ * Return: Start address for the resource.</div><div class='add'>+ */</div><div class='add'>+typedef resource_size_t (*resource_alignf)(void *data,</div><div class='add'>+					   const struct resource *res,</div><div class='add'>+					   resource_size_t size,</div><div class='add'>+					   resource_size_t align);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct resource_constraint - constraints to be met while searching empty</div><div class='add'>+ *				resource space</div><div class='add'>+ * @min:		The minimum address for the memory range</div><div class='add'>+ * @max:		The maximum address for the memory range</div><div class='add'>+ * @align:		Alignment for the start address of the empty space</div><div class='add'>+ * @alignf:		Additional alignment constraints callback</div><div class='add'>+ * @alignf_data:	Data provided for @alignf callback</div><div class='add'>+ *</div><div class='add'>+ * Contains the range and alignment constraints that have to be met during</div><div class='add'>+ * find_resource_space(). @alignf can be NULL indicating no alignment beyond</div><div class='add'>+ * @align is necessary.</div><div class='add'>+ */</div><div class='add'>+struct resource_constraint {</div><div class='add'>+	resource_size_t min, max, align;</div><div class='add'>+	resource_alignf alignf;</div><div class='add'>+	void *alignf_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* PC/ISA/whatever - the normal PC address spaces: IO and memory */</div><div class='ctx'> extern struct resource ioport_resource;</div><div class='ctx'> extern struct resource iomem_resource;</div><div class='hunk'>@@ -207,15 +248,44 @@ extern void arch_remove_reservations(struct resource *avail);</div><div class='ctx'> extern int allocate_resource(struct resource *root, struct resource *new,</div><div class='ctx'> 			     resource_size_t size, resource_size_t min,</div><div class='ctx'> 			     resource_size_t max, resource_size_t align,</div><div class='del'>-			     resource_size_t (*alignf)(void *,</div><div class='del'>-						       const struct resource *,</div><div class='del'>-						       resource_size_t,</div><div class='del'>-						       resource_size_t),</div><div class='add'>+			     resource_alignf alignf,</div><div class='ctx'> 			     void *alignf_data);</div><div class='ctx'> struct resource *lookup_resource(struct resource *root, resource_size_t start);</div><div class='ctx'> int adjust_resource(struct resource *res, resource_size_t start,</div><div class='ctx'> 		    resource_size_t size);</div><div class='ctx'> resource_size_t resource_alignment(struct resource *res);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resource_set_size - Calculate resource end address from size and start</div><div class='add'>+ * @res: Resource descriptor</div><div class='add'>+ * @size: Size of the resource</div><div class='add'>+ *</div><div class='add'>+ * Calculate the end address for @res based on @size.</div><div class='add'>+ *</div><div class='add'>+ * Note: The start address of @res must be set when calling this function.</div><div class='add'>+ * Prefer resource_set_range() if setting both the start address and @size.</div><div class='add'>+ */</div><div class='add'>+static inline void resource_set_size(struct resource *res, resource_size_t size)</div><div class='add'>+{</div><div class='add'>+	res-&gt;end = res-&gt;start + size - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resource_set_range - Set resource start and end addresses</div><div class='add'>+ * @res: Resource descriptor</div><div class='add'>+ * @start: Start address for the resource</div><div class='add'>+ * @size: Size of the resource</div><div class='add'>+ *</div><div class='add'>+ * Set @res start address and calculate the end address based on @size.</div><div class='add'>+ */</div><div class='add'>+static inline void resource_set_range(struct resource *res,</div><div class='add'>+				      resource_size_t start,</div><div class='add'>+				      resource_size_t size)</div><div class='add'>+{</div><div class='add'>+	res-&gt;start = start;</div><div class='add'>+	resource_set_size(res, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline resource_size_t resource_size(const struct resource *res)</div><div class='ctx'> {</div><div class='ctx'> 	return res-&gt;end - res-&gt;start + 1;</div><div class='hunk'>@@ -264,6 +334,18 @@ static inline bool resource_union(const struct resource *r1, const struct resour</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Check if this resource is added to a resource tree or detached. Caller is</div><div class='add'>+ * responsible for not racing assignment.</div><div class='add'>+ */</div><div class='add'>+static inline bool resource_assigned(struct resource *res)</div><div class='add'>+{</div><div class='add'>+	return res-&gt;parent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int find_resource_space(struct resource *root, struct resource *new,</div><div class='add'>+			resource_size_t size, struct resource_constraint *constraint);</div><div class='add'>+</div><div class='ctx'> /* Convenience shorthand with allocation */</div><div class='ctx'> #define request_region(start,n,name)		__request_region(&amp;ioport_resource, (start), (n), (name), 0)</div><div class='ctx'> #define request_muxed_region(start,n,name)	__request_region(&amp;ioport_resource, (start), (n), (name), IORESOURCE_MUXED)</div><div class='head'>diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h<br/>index db1249cd9692..5210e8371238 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ioprio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ioprio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ioprio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ioprio.h</a></div><div class='hunk'>@@ -40,7 +40,7 @@ static inline int task_nice_ioclass(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> 	if (task-&gt;policy == SCHED_IDLE)</div><div class='ctx'> 		return IOPRIO_CLASS_IDLE;</div><div class='del'>-	else if (task_is_realtime(task))</div><div class='add'>+	else if (rt_or_dl_task_policy(task))</div><div class='ctx'> 		return IOPRIO_CLASS_RT;</div><div class='ctx'> 	else</div><div class='ctx'> 		return IOPRIO_CLASS_BE;</div><div class='hunk'>@@ -60,7 +60,8 @@ static inline int __get_task_ioprio(struct task_struct *p)</div><div class='ctx'> 	int prio;</div><div class='ctx'> </div><div class='ctx'> 	if (!ioc)</div><div class='del'>-		return IOPRIO_DEFAULT;</div><div class='add'>+		return IOPRIO_PRIO_VALUE(task_nice_ioclass(p),</div><div class='add'>+					 task_nice_ioprio(p));</div><div class='ctx'> </div><div class='ctx'> 	if (p != current)</div><div class='ctx'> 		lockdep_assert_held(&amp;p-&gt;alloc_lock);</div><div class='head'>diff --git a/include/linux/ioremap.h b/include/linux/ioremap.h<br/>index f0e99fc7dd8b..2bd1661fe9ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ioremap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ioremap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ioremap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ioremap.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kasan.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_HAS_IOMEM) || defined(CONFIG_GENERIC_IOREMAP)</div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/iosys-map.h b/include/linux/iosys-map.h<br/>index e3649a6563dd..3e85afe794c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iosys-map.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iosys-map.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iosys-map.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iosys-map.h</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'>  * the same driver for allocation, read and write operations.</div><div class='ctx'>  *</div><div class='ctx'>  * Open-coding access to :c:type:`struct iosys_map &lt;iosys_map&gt;` is considered</div><div class='del'>- * bad style. Rather then accessing its fields directly, use one of the provided</div><div class='add'>+ * bad style. Rather than accessing its fields directly, use one of the provided</div><div class='ctx'>  * helper functions, or implement your own. For example, instances of</div><div class='ctx'>  * :c:type:`struct iosys_map &lt;iosys_map&gt;` can be initialized statically with</div><div class='ctx'>  * IOSYS_MAP_INIT_VADDR(), or at runtime with iosys_map_set_vaddr(). These</div><div class='hunk'>@@ -264,12 +264,7 @@ static inline bool iosys_map_is_set(const struct iosys_map *map)</div><div class='ctx'>  */</div><div class='ctx'> static inline void iosys_map_clear(struct iosys_map *map)</div><div class='ctx'> {</div><div class='del'>-	if (map-&gt;is_iomem) {</div><div class='del'>-		map-&gt;vaddr_iomem = NULL;</div><div class='del'>-		map-&gt;is_iomem = false;</div><div class='del'>-	} else {</div><div class='del'>-		map-&gt;vaddr = NULL;</div><div class='del'>-	}</div><div class='add'>+	memset(map, 0, sizeof(*map));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/iov_iter.h b/include/linux/iov_iter.h<br/>index 270454a6703d..f9a17fbbd398 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iov_iter.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iov_iter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iov_iter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iov_iter.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/bvec.h&gt;</div><div class='add'>+#include &lt;linux/folio_queue.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef size_t (*iov_step_f)(void *iter_base, size_t progress, size_t len,</div><div class='ctx'> 			     void *priv, void *priv2);</div><div class='hunk'>@@ -141,6 +142,62 @@ size_t iterate_bvec(struct iov_iter *iter, size_t len, void *priv, void *priv2,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Handle ITER_FOLIOQ.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+size_t iterate_folioq(struct iov_iter *iter, size_t len, void *priv, void *priv2,</div><div class='add'>+		      iov_step_f step)</div><div class='add'>+{</div><div class='add'>+	const struct folio_queue *folioq = iter-&gt;folioq;</div><div class='add'>+	unsigned int slot = iter-&gt;folioq_slot;</div><div class='add'>+	size_t progress = 0, skip = iter-&gt;iov_offset;</div><div class='add'>+</div><div class='add'>+	if (slot == folioq_nr_slots(folioq)) {</div><div class='add'>+		/* The iterator may have been extended. */</div><div class='add'>+		folioq = folioq-&gt;next;</div><div class='add'>+		slot = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct folio *folio = folioq_folio(folioq, slot);</div><div class='add'>+		size_t part, remain = 0, consumed;</div><div class='add'>+		size_t fsize;</div><div class='add'>+		void *base;</div><div class='add'>+</div><div class='add'>+		if (!folio)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		fsize = folioq_folio_size(folioq, slot);</div><div class='add'>+		if (skip &lt; fsize) {</div><div class='add'>+			base = kmap_local_folio(folio, skip);</div><div class='add'>+			part = umin(len, PAGE_SIZE - skip % PAGE_SIZE);</div><div class='add'>+			remain = step(base, progress, part, priv, priv2);</div><div class='add'>+			kunmap_local(base);</div><div class='add'>+			consumed = part - remain;</div><div class='add'>+			len -= consumed;</div><div class='add'>+			progress += consumed;</div><div class='add'>+			skip += consumed;</div><div class='add'>+		}</div><div class='add'>+		if (skip &gt;= fsize) {</div><div class='add'>+			skip = 0;</div><div class='add'>+			slot++;</div><div class='add'>+			if (slot == folioq_nr_slots(folioq) &amp;&amp; folioq-&gt;next) {</div><div class='add'>+				folioq = folioq-&gt;next;</div><div class='add'>+				slot = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (remain)</div><div class='add'>+			break;</div><div class='add'>+	} while (len);</div><div class='add'>+</div><div class='add'>+	iter-&gt;folioq_slot = slot;</div><div class='add'>+	iter-&gt;folioq = folioq;</div><div class='add'>+	iter-&gt;iov_offset = skip;</div><div class='add'>+	iter-&gt;count -= progress;</div><div class='add'>+	return progress;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Handle ITER_XARRAY.</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline</div><div class='hunk'>@@ -249,6 +306,8 @@ size_t iterate_and_advance2(struct iov_iter *iter, size_t len, void *priv,</div><div class='ctx'> 		return iterate_bvec(iter, len, priv, priv2, step);</div><div class='ctx'> 	if (iov_iter_is_kvec(iter))</div><div class='ctx'> 		return iterate_kvec(iter, len, priv, priv2, step);</div><div class='add'>+	if (iov_iter_is_folioq(iter))</div><div class='add'>+		return iterate_folioq(iter, len, priv, priv2, step);</div><div class='ctx'> 	if (iov_iter_is_xarray(iter))</div><div class='ctx'> 		return iterate_xarray(iter, len, priv, priv2, step);</div><div class='ctx'> 	return iterate_discard(iter, len, priv, priv2, step);</div><div class='hunk'>@@ -271,4 +330,51 @@ size_t iterate_and_advance(struct iov_iter *iter, size_t len, void *priv,</div><div class='ctx'> 	return iterate_and_advance2(iter, len, priv, NULL, ustep, step);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iterate_and_advance_kernel - Iterate over a kernel-internal iterator</div><div class='add'>+ * @iter: The iterator to iterate over.</div><div class='add'>+ * @len: The amount to iterate over.</div><div class='add'>+ * @priv: Data for the step functions.</div><div class='add'>+ * @priv2: More data for the step functions.</div><div class='add'>+ * @step: Function for other iterators; given kernel addresses.</div><div class='add'>+ *</div><div class='add'>+ * Iterate over the next part of an iterator, up to the specified length.  The</div><div class='add'>+ * buffer is presented in segments, which for kernel iteration are broken up by</div><div class='add'>+ * physical pages and mapped, with the mapped address being presented.</div><div class='add'>+ *</div><div class='add'>+ * [!] Note This will only handle BVEC, KVEC, FOLIOQ, XARRAY and DISCARD-type</div><div class='add'>+ * iterators; it will not handle UBUF or IOVEC-type iterators.</div><div class='add'>+ *</div><div class='add'>+ * A step functions, @step, must be provided, one for handling mapped kernel</div><div class='add'>+ * addresses and the other is given user addresses which have the potential to</div><div class='add'>+ * fault since no pinning is performed.</div><div class='add'>+ *</div><div class='add'>+ * The step functions are passed the address and length of the segment, @priv,</div><div class='add'>+ * @priv2 and the amount of data so far iterated over (which can, for example,</div><div class='add'>+ * be added to @priv to point to the right part of a second buffer).  The step</div><div class='add'>+ * functions should return the amount of the segment they didn't process (ie. 0</div><div class='add'>+ * indicates complete processsing).</div><div class='add'>+ *</div><div class='add'>+ * This function returns the amount of data processed (ie. 0 means nothing was</div><div class='add'>+ * processed and the value of @len means processes to completion).</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+size_t iterate_and_advance_kernel(struct iov_iter *iter, size_t len, void *priv,</div><div class='add'>+				  void *priv2, iov_step_f step)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(iter-&gt;count &lt; len))</div><div class='add'>+		len = iter-&gt;count;</div><div class='add'>+	if (unlikely(!len))</div><div class='add'>+		return 0;</div><div class='add'>+	if (iov_iter_is_bvec(iter))</div><div class='add'>+		return iterate_bvec(iter, len, priv, priv2, step);</div><div class='add'>+	if (iov_iter_is_kvec(iter))</div><div class='add'>+		return iterate_kvec(iter, len, priv, priv2, step);</div><div class='add'>+	if (iov_iter_is_folioq(iter))</div><div class='add'>+		return iterate_folioq(iter, len, priv, priv2, step);</div><div class='add'>+	if (iov_iter_is_xarray(iter))</div><div class='add'>+		return iterate_xarray(iter, len, priv, priv2, step);</div><div class='add'>+	return iterate_discard(iter, len, priv, priv2, step);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_IOV_ITER_H */</div><div class='head'>diff --git a/include/linux/iova.h b/include/linux/iova.h<br/>index 83c00fac2acb..d2c4fd923efa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/iova.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/iova.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/iova.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/iova.h</a></div><div class='hunk'>@@ -65,6 +65,11 @@ static inline size_t iova_align(struct iova_domain *iovad, size_t size)</div><div class='ctx'> 	return ALIGN(size, iovad-&gt;granule);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline size_t iova_align_down(struct iova_domain *iovad, size_t size)</div><div class='add'>+{</div><div class='add'>+	return ALIGN_DOWN(size, iovad-&gt;granule);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline dma_addr_t iova_dma_addr(struct iova_domain *iovad, struct iova *iova)</div><div class='ctx'> {</div><div class='ctx'> 	return (dma_addr_t)iova-&gt;pfn_lo &lt;&lt; iova_shift(iovad);</div><div class='head'>diff --git a/include/linux/ipack.h b/include/linux/ipack.h<br/>index 2c6936b8371f..455f6c2a1903 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ipack.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipack.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ipack.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ipack.h</a></div><div class='hunk'>@@ -70,15 +70,13 @@ enum ipack_space {</div><div class='ctx'> 	IPACK_SPACE_COUNT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- */</div><div class='ctx'> struct ipack_region {</div><div class='ctx'> 	phys_addr_t start;</div><div class='ctx'> 	size_t      size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	struct ipack_device</div><div class='add'>+ *	struct ipack_device - subsystem representation of an IPack device</div><div class='ctx'>  *</div><div class='ctx'>  *	@slot: Slot where the device is plugged in the carrier board</div><div class='ctx'>  *	@bus: ipack_bus_device where the device is plugged to.</div><div class='hunk'>@@ -89,7 +87,7 @@ struct ipack_region {</div><div class='ctx'>  *</div><div class='ctx'>  * Warning: Direct access to mapped memory is possible but the endianness</div><div class='ctx'>  * is not the same with PCI carrier or VME carrier. The endianness is managed</div><div class='del'>- * by the carrier board throught bus-&gt;ops.</div><div class='add'>+ * by the carrier board through bus-&gt;ops.</div><div class='ctx'>  */</div><div class='ctx'> struct ipack_device {</div><div class='ctx'> 	unsigned int slot;</div><div class='hunk'>@@ -124,6 +122,7 @@ struct ipack_driver_ops {</div><div class='ctx'>  * struct ipack_driver -- Specific data to each ipack device driver</div><div class='ctx'>  *</div><div class='ctx'>  * @driver: Device driver kernel representation</div><div class='add'>+ * @id_table: Device ID table for this driver</div><div class='ctx'>  * @ops:    Callbacks provided by the IPack device driver</div><div class='ctx'>  */</div><div class='ctx'> struct ipack_driver {</div><div class='hunk'>@@ -161,7 +160,7 @@ struct ipack_bus_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	struct ipack_bus_device</div><div class='add'>+ *	struct ipack_bus_device - IPack bus representation</div><div class='ctx'>  *</div><div class='ctx'>  *	@dev: pointer to carrier device</div><div class='ctx'>  *	@slots: number of slots available</div><div class='hunk'>@@ -185,6 +184,8 @@ struct ipack_bus_device {</div><div class='ctx'>  *</div><div class='ctx'>  * The carrier board device should call this function to register itself as</div><div class='ctx'>  * available bus device in ipack.</div><div class='add'>+ *</div><div class='add'>+ * Return: %NULL on error or &amp;struct ipack_bus_device on success</div><div class='ctx'>  */</div><div class='ctx'> struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots,</div><div class='ctx'> 					    const struct ipack_bus_ops *ops,</div><div class='hunk'>@@ -192,6 +193,8 @@ struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ipack_bus_unregister -- unregister an ipack bus</div><div class='add'>+ *</div><div class='add'>+ *	Return: %0</div><div class='ctx'>  */</div><div class='ctx'> int ipack_bus_unregister(struct ipack_bus_device *bus);</div><div class='ctx'> </div><div class='hunk'>@@ -200,6 +203,8 @@ int ipack_bus_unregister(struct ipack_bus_device *bus);</div><div class='ctx'>  *</div><div class='ctx'>  * Called by a ipack driver to register itself as a driver</div><div class='ctx'>  * that can manage ipack devices.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success or error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int ipack_driver_register(struct ipack_driver *edrv, struct module *owner,</div><div class='ctx'> 			  const char *name);</div><div class='hunk'>@@ -215,7 +220,7 @@ void ipack_driver_unregister(struct ipack_driver *edrv);</div><div class='ctx'>  * function.  The rest of the fields will be allocated and populated</div><div class='ctx'>  * during initalization.</div><div class='ctx'>  *</div><div class='del'>- * Return zero on success or error code on failure.</div><div class='add'>+ * Return: zero on success or error code on failure.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: _Never_ directly free @dev after calling this function, even</div><div class='ctx'>  * if it returned an error! Always use ipack_put_device() to give up the</div><div class='hunk'>@@ -230,7 +235,7 @@ int ipack_device_init(struct ipack_device *dev);</div><div class='ctx'>  * Add a new IPack device. The call is done by the carrier driver</div><div class='ctx'>  * after calling ipack_device_init().</div><div class='ctx'>  *</div><div class='del'>- * Return zero on success or error code on failure.</div><div class='add'>+ * Return: zero on success or error code on failure.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTE: _Never_ directly free @dev after calling this function, even</div><div class='ctx'>  * if it returned an error! Always use ipack_put_device() to give up the</div><div class='hunk'>@@ -266,9 +271,11 @@ void ipack_put_device(struct ipack_device *dev);</div><div class='ctx'> 	 .device = (dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ipack_get_carrier - it increase the carrier ref. counter of</div><div class='add'>+ * ipack_get_carrier - try to increase the carrier ref. counter of</div><div class='ctx'>  *                     the carrier module</div><div class='ctx'>  * @dev: mezzanine device which wants to get the carrier</div><div class='add'>+ *</div><div class='add'>+ * Return: true on success.</div><div class='ctx'>  */</div><div class='ctx'> static inline int ipack_get_carrier(struct ipack_device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h<br/>index e8240cf2611a..12faca29bbb9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ipc_namespace.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipc_namespace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ipc_namespace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ipc_namespace.h</a></div><div class='hunk'>@@ -129,20 +129,25 @@ static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_IPC_NS)</div><div class='del'>-extern struct ipc_namespace *copy_ipcs(unsigned long flags,</div><div class='add'>+static inline struct ipc_namespace *to_ipc_ns(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	return container_of(ns, struct ipc_namespace, ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern struct ipc_namespace *copy_ipcs(u64 flags,</div><div class='ctx'> 	struct user_namespace *user_ns, struct ipc_namespace *ns);</div><div class='ctx'> </div><div class='ctx'> static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)</div><div class='ctx'> {</div><div class='ctx'> 	if (ns)</div><div class='del'>-		refcount_inc(&amp;ns-&gt;ns.count);</div><div class='add'>+		ns_ref_inc(ns);</div><div class='ctx'> 	return ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct ipc_namespace *get_ipc_ns_not_zero(struct ipc_namespace *ns)</div><div class='ctx'> {</div><div class='ctx'> 	if (ns) {</div><div class='del'>-		if (refcount_inc_not_zero(&amp;ns-&gt;ns.count))</div><div class='add'>+		if (ns_ref_get(ns))</div><div class='ctx'> 			return ns;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +156,7 @@ static inline struct ipc_namespace *get_ipc_ns_not_zero(struct ipc_namespace *ns</div><div class='ctx'> </div><div class='ctx'> extern void put_ipc_ns(struct ipc_namespace *ns);</div><div class='ctx'> #else</div><div class='del'>-static inline struct ipc_namespace *copy_ipcs(unsigned long flags,</div><div class='add'>+static inline struct ipc_namespace *copy_ipcs(u64 flags,</div><div class='ctx'> 	struct user_namespace *user_ns, struct ipc_namespace *ns)</div><div class='ctx'> {</div><div class='ctx'> 	if (flags &amp; CLONE_NEWIPC)</div><div class='head'>diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h<br/>index a1c9c0d48ebf..7da6602eab71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ipmi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ipmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ipmi.h</a></div><div class='hunk'>@@ -93,7 +93,8 @@ struct ipmi_user_hndl {</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Called when the interface detects a watchdog pre-timeout.  If</div><div class='del'>-	 * this is NULL, it will be ignored for the user.</div><div class='add'>+	 * this is NULL, it will be ignored for the user.  Note that you</div><div class='add'>+	 * can't do any IPMI calls from here, it's called with locks held.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*ipmi_watchdog_pretimeout)(void *handler_data);</div><div class='ctx'> </div><div class='hunk'>@@ -126,7 +127,7 @@ int ipmi_create_user(unsigned int          if_num,</div><div class='ctx'>  * the users before you destroy the callback structures, it should be</div><div class='ctx'>  * safe, too.</div><div class='ctx'>  */</div><div class='del'>-int ipmi_destroy_user(struct ipmi_user *user);</div><div class='add'>+void ipmi_destroy_user(struct ipmi_user *user);</div><div class='ctx'> </div><div class='ctx'> /* Get the IPMI version of the BMC we are talking to. */</div><div class='ctx'> int ipmi_get_version(struct ipmi_user *user,</div><div class='hunk'>@@ -343,4 +344,14 @@ extern int ipmi_get_smi_info(int if_num, struct ipmi_smi_info *data);</div><div class='ctx'> /* Helper function for computing the IPMB checksum of some data. */</div><div class='ctx'> unsigned char ipmb_checksum(unsigned char *data, int size);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * For things that must send messages at panic time, like the IPMI watchdog</div><div class='add'>+ * driver that extends the reset time on a panic, use this to send messages</div><div class='add'>+ * from panic context.  Note that this puts the driver into a mode that</div><div class='add'>+ * only works at panic time, so only use it then.</div><div class='add'>+ */</div><div class='add'>+void ipmi_panic_request_and_wait(struct ipmi_user *user,</div><div class='add'>+				 struct ipmi_addr *addr,</div><div class='add'>+				 struct kernel_ipmi_msg *msg);</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_IPMI_H */</div><div class='head'>diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h<br/>index 5d69820d8b02..892e2d656e1e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ipmi_smi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipmi_smi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ipmi_smi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ipmi_smi.h</a></div><div class='hunk'>@@ -109,8 +109,9 @@ struct ipmi_smi_msg {</div><div class='ctx'> </div><div class='ctx'> 	enum ipmi_smi_msg_type type;</div><div class='ctx'> </div><div class='del'>-	long    msgid;</div><div class='del'>-	void    *user_data;</div><div class='add'>+	long msgid;</div><div class='add'>+	/* Response to this message, will be NULL if not from a user request. */</div><div class='add'>+	struct ipmi_recv_msg *recv_msg;</div><div class='ctx'> </div><div class='ctx'> 	int           data_size;</div><div class='ctx'> 	unsigned char data[IPMI_MAX_MSG_LENGTH];</div><div class='hunk'>@@ -168,9 +169,11 @@ struct ipmi_smi_handlers {</div><div class='ctx'> 	 * are held when this is run.  Message are delivered one at</div><div class='ctx'> 	 * a time by the message handler, a new message will not be</div><div class='ctx'> 	 * delivered until the previous message is returned.</div><div class='add'>+	 *</div><div class='add'>+	 * This can return an error if the SMI is not in a state where it</div><div class='add'>+	 * can send a message.</div><div class='ctx'> 	 */</div><div class='del'>-	void (*sender)(void                *send_info,</div><div class='del'>-		       struct ipmi_smi_msg *msg);</div><div class='add'>+	int (*sender)(void *send_info, struct ipmi_smi_msg *msg);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Called by the upper layer to request that we try to get</div><div class='head'>diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h<br/>index 383a0ea2ab91..7294e4e89b79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ipv6.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ipv6.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ipv6.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ipv6.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@ struct ipv6_devconf {</div><div class='ctx'> 	__s32		hop_limit;</div><div class='ctx'> 	__s32		mtu6;</div><div class='ctx'> 	__s32		forwarding;</div><div class='add'>+	__s32		force_forwarding;</div><div class='ctx'> 	__s32		disable_policy;</div><div class='ctx'> 	__s32		proxy_ndp;</div><div class='ctx'> 	__cacheline_group_end(ipv6_devconf_read_txrx);</div><div class='hunk'>@@ -89,6 +90,7 @@ struct ipv6_devconf {</div><div class='ctx'> 	__u8		ioam6_enabled;</div><div class='ctx'> 	__u8		ndisc_evict_nocarrier;</div><div class='ctx'> 	__u8		ra_honor_pio_life;</div><div class='add'>+	__u8		ra_honor_pio_pflag;</div><div class='ctx'> </div><div class='ctx'> 	struct ctl_table_header *sysctl_header;</div><div class='ctx'> };</div><div class='hunk'>@@ -155,6 +157,7 @@ struct inet6_skb_parm {</div><div class='ctx'> #define IP6SKB_SEG6	      256</div><div class='ctx'> #define IP6SKB_FAKEJUMBO      512</div><div class='ctx'> #define IP6SKB_MULTIPATH      1024</div><div class='add'>+#define IP6SKB_MCROUTE        2048</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_NET_L3_MASTER_DEV)</div><div class='hunk'>@@ -206,22 +209,26 @@ struct inet6_cork {</div><div class='ctx'> 	struct ipv6_txoptions *opt;</div><div class='ctx'> 	u8 hop_limit;</div><div class='ctx'> 	u8 tclass;</div><div class='add'>+	u8 dontfrag:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* struct ipv6_pinfo - ipv6 private area */</div><div class='ctx'> struct ipv6_pinfo {</div><div class='add'>+	/* Used in tx path (inet6_csk_route_socket(), ip6_xmit()) */</div><div class='ctx'> 	struct in6_addr 	saddr;</div><div class='del'>-	struct in6_pktinfo	sticky_pktinfo;</div><div class='del'>-	const struct in6_addr		*daddr_cache;</div><div class='add'>+	__be32			flow_label;</div><div class='add'>+	u32			dst_cookie;</div><div class='add'>+	struct ipv6_txoptions __rcu	*opt;</div><div class='add'>+	s16			hop_limit;</div><div class='add'>+	u8			pmtudisc;</div><div class='add'>+	u8			tclass;</div><div class='ctx'> #ifdef CONFIG_IPV6_SUBTREES</div><div class='del'>-	const struct in6_addr		*saddr_cache;</div><div class='add'>+	bool			saddr_cache;</div><div class='ctx'> #endif</div><div class='add'>+	bool			daddr_cache;</div><div class='ctx'> </div><div class='del'>-	__be32			flow_label;</div><div class='del'>-	__u32			frag_size;</div><div class='del'>-</div><div class='del'>-	s16			hop_limit;</div><div class='ctx'> 	u8			mcast_hops;</div><div class='add'>+	u32			frag_size;</div><div class='ctx'> </div><div class='ctx'> 	int			ucast_oif;</div><div class='ctx'> 	int			mcast_oif;</div><div class='hunk'>@@ -229,7 +236,7 @@ struct ipv6_pinfo {</div><div class='ctx'> 	/* pktoption flags */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='del'>-			__u16	srcrt:1,</div><div class='add'>+			u16	srcrt:1,</div><div class='ctx'> 				osrcrt:1,</div><div class='ctx'> 			        rxinfo:1,</div><div class='ctx'> 			        rxoinfo:1,</div><div class='hunk'>@@ -246,29 +253,24 @@ struct ipv6_pinfo {</div><div class='ctx'> 				recvfragsize:1;</div><div class='ctx'> 				/* 1 bits hole */</div><div class='ctx'> 		} bits;</div><div class='del'>-		__u16		all;</div><div class='add'>+		u16		all;</div><div class='ctx'> 	} rxopt;</div><div class='ctx'> </div><div class='ctx'> 	/* sockopt flags */</div><div class='del'>-	__u8			srcprefs;	/* 001: prefer temporary address</div><div class='add'>+	u8			srcprefs;	/* 001: prefer temporary address</div><div class='ctx'> 						 * 010: prefer public address</div><div class='ctx'> 						 * 100: prefer care-of address</div><div class='ctx'> 						 */</div><div class='del'>-	__u8			pmtudisc;</div><div class='del'>-	__u8			min_hopcount;</div><div class='del'>-	__u8			tclass;</div><div class='add'>+	u8			min_hopcount;</div><div class='ctx'> 	__be32			rcv_flowinfo;</div><div class='add'>+	struct in6_pktinfo	sticky_pktinfo;</div><div class='ctx'> </div><div class='del'>-	__u32			dst_cookie;</div><div class='del'>-</div><div class='del'>-	struct ipv6_mc_socklist	__rcu *ipv6_mc_list;</div><div class='del'>-	struct ipv6_ac_socklist	*ipv6_ac_list;</div><div class='del'>-	struct ipv6_fl_socklist __rcu *ipv6_fl_list;</div><div class='del'>-</div><div class='del'>-	struct ipv6_txoptions __rcu	*opt;</div><div class='ctx'> 	struct sk_buff		*pktoptions;</div><div class='ctx'> 	struct sk_buff		*rxpmtu;</div><div class='ctx'> 	struct inet6_cork	cork;</div><div class='add'>+</div><div class='add'>+	struct ipv6_mc_socklist	__rcu *ipv6_mc_list;</div><div class='add'>+	struct ipv6_ac_socklist	*ipv6_ac_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* We currently use available bits from inet_sk(sk)-&gt;inet_flags,</div><div class='hunk'>@@ -291,7 +293,7 @@ struct raw6_sock {</div><div class='ctx'> 	__u32			offset;		/* checksum offset  */</div><div class='ctx'> 	struct icmp6_filter	filter;</div><div class='ctx'> 	__u32			ip6mr_table;</div><div class='del'>-</div><div class='add'>+	struct numa_drop_counters drop_counters;</div><div class='ctx'> 	struct ipv6_pinfo	inet6;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/irq-entry-common.h b/include/linux/irq-entry-common.h<br/>new file mode 100644<br/>index 000000000000..6ab913e57da0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irq-entry-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irq-entry-common.h</a></div><div class='hunk'>@@ -0,0 +1,458 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __LINUX_IRQENTRYCOMMON_H</div><div class='add'>+#define __LINUX_IRQENTRYCOMMON_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/context_tracking.h&gt;</div><div class='add'>+#include &lt;linux/kmsan.h&gt;</div><div class='add'>+#include &lt;linux/rseq_entry.h&gt;</div><div class='add'>+#include &lt;linux/static_call_types.h&gt;</div><div class='add'>+#include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/tick.h&gt;</div><div class='add'>+#include &lt;linux/unwind_deferred.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/entry-common.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define dummy _TIF work flags if not defined by the architecture or for</div><div class='add'>+ * disabled functionality.</div><div class='add'>+ */</div><div class='add'>+#ifndef _TIF_PATCH_PENDING</div><div class='add'>+# define _TIF_PATCH_PENDING		(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TIF flags handled in exit_to_user_mode_loop()</div><div class='add'>+ */</div><div class='add'>+#ifndef ARCH_EXIT_TO_USER_MODE_WORK</div><div class='add'>+# define ARCH_EXIT_TO_USER_MODE_WORK		(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define EXIT_TO_USER_MODE_WORK						\</div><div class='add'>+	(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE |		\</div><div class='add'>+	 _TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY |			\</div><div class='add'>+	 _TIF_PATCH_PENDING | _TIF_NOTIFY_SIGNAL | _TIF_RSEQ |		\</div><div class='add'>+	 ARCH_EXIT_TO_USER_MODE_WORK)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arch_enter_from_user_mode - Architecture specific sanity check for user mode regs</div><div class='add'>+ * @regs:	Pointer to currents pt_regs</div><div class='add'>+ *</div><div class='add'>+ * Defaults to an empty implementation. Can be replaced by architecture</div><div class='add'>+ * specific code.</div><div class='add'>+ *</div><div class='add'>+ * Invoked from syscall_enter_from_user_mode() in the non-instrumentable</div><div class='add'>+ * section. Use __always_inline so the compiler cannot push it out of line</div><div class='add'>+ * and make it instrumentable.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void arch_enter_from_user_mode(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#ifndef arch_enter_from_user_mode</div><div class='add'>+static __always_inline void arch_enter_from_user_mode(struct pt_regs *regs) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arch_in_rcu_eqs - Architecture specific check for RCU extended quiescent</div><div class='add'>+ * states.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the CPU is potentially in an RCU EQS, false otherwise.</div><div class='add'>+ *</div><div class='add'>+ * Architectures only need to define this if threads other than the idle thread</div><div class='add'>+ * may have an interruptible EQS. This does not need to handle idle threads. It</div><div class='add'>+ * is safe to over-estimate at the cost of redundant RCU management work.</div><div class='add'>+ *</div><div class='add'>+ * Invoked from irqentry_enter()</div><div class='add'>+ */</div><div class='add'>+#ifndef arch_in_rcu_eqs</div><div class='add'>+static __always_inline bool arch_in_rcu_eqs(void) { return false; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enter_from_user_mode - Establish state when coming from user mode</div><div class='add'>+ * @regs:	Pointer to currents pt_regs</div><div class='add'>+ *</div><div class='add'>+ * Syscall/interrupt entry disables interrupts, but user mode is traced as</div><div class='add'>+ * interrupts enabled. Also with NO_HZ_FULL RCU might be idle.</div><div class='add'>+ *</div><div class='add'>+ * 1) Tell lockdep that interrupts are disabled</div><div class='add'>+ * 2) Invoke context tracking if enabled to reactivate RCU</div><div class='add'>+ * 3) Trace interrupts off state</div><div class='add'>+ *</div><div class='add'>+ * Invoked from architecture specific syscall entry code with interrupts</div><div class='add'>+ * disabled. The calling code has to be non-instrumentable. When the</div><div class='add'>+ * function returns all state is correct and interrupts are still</div><div class='add'>+ * disabled. The subsequent functions can be instrumented.</div><div class='add'>+ *</div><div class='add'>+ * This is invoked when there is architecture specific functionality to be</div><div class='add'>+ * done between establishing state and enabling interrupts. The caller must</div><div class='add'>+ * enable interrupts before invoking syscall_enter_from_user_mode_work().</div><div class='add'>+ */</div><div class='add'>+static __always_inline void enter_from_user_mode(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	arch_enter_from_user_mode(regs);</div><div class='add'>+	lockdep_hardirqs_off(CALLER_ADDR0);</div><div class='add'>+</div><div class='add'>+	CT_WARN_ON(__ct_state() != CT_STATE_USER);</div><div class='add'>+	user_exit_irqoff();</div><div class='add'>+</div><div class='add'>+	instrumentation_begin();</div><div class='add'>+	kmsan_unpoison_entry_regs(regs);</div><div class='add'>+	trace_hardirqs_off_finish();</div><div class='add'>+	instrumentation_end();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * local_irq_enable_exit_to_user - Exit to user variant of local_irq_enable()</div><div class='add'>+ * @ti_work:	Cached TIF flags gathered with interrupts disabled</div><div class='add'>+ *</div><div class='add'>+ * Defaults to local_irq_enable(). Can be supplied by architecture specific</div><div class='add'>+ * code.</div><div class='add'>+ */</div><div class='add'>+static inline void local_irq_enable_exit_to_user(unsigned long ti_work);</div><div class='add'>+</div><div class='add'>+#ifndef local_irq_enable_exit_to_user</div><div class='add'>+static inline void local_irq_enable_exit_to_user(unsigned long ti_work)</div><div class='add'>+{</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * local_irq_disable_exit_to_user - Exit to user variant of local_irq_disable()</div><div class='add'>+ *</div><div class='add'>+ * Defaults to local_irq_disable(). Can be supplied by architecture specific</div><div class='add'>+ * code.</div><div class='add'>+ */</div><div class='add'>+static inline void local_irq_disable_exit_to_user(void);</div><div class='add'>+</div><div class='add'>+#ifndef local_irq_disable_exit_to_user</div><div class='add'>+static inline void local_irq_disable_exit_to_user(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arch_exit_to_user_mode_work - Architecture specific TIF work for exit</div><div class='add'>+ *				 to user mode.</div><div class='add'>+ * @regs:	Pointer to currents pt_regs</div><div class='add'>+ * @ti_work:	Cached TIF flags gathered with interrupts disabled</div><div class='add'>+ *</div><div class='add'>+ * Invoked from exit_to_user_mode_loop() with interrupt enabled</div><div class='add'>+ *</div><div class='add'>+ * Defaults to NOOP. Can be supplied by architecture specific code.</div><div class='add'>+ */</div><div class='add'>+static inline void arch_exit_to_user_mode_work(struct pt_regs *regs,</div><div class='add'>+					       unsigned long ti_work);</div><div class='add'>+</div><div class='add'>+#ifndef arch_exit_to_user_mode_work</div><div class='add'>+static inline void arch_exit_to_user_mode_work(struct pt_regs *regs,</div><div class='add'>+					       unsigned long ti_work)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arch_exit_to_user_mode_prepare - Architecture specific preparation for</div><div class='add'>+ *				    exit to user mode.</div><div class='add'>+ * @regs:	Pointer to currents pt_regs</div><div class='add'>+ * @ti_work:	Cached TIF flags gathered with interrupts disabled</div><div class='add'>+ *</div><div class='add'>+ * Invoked from exit_to_user_mode_prepare() with interrupt disabled as the last</div><div class='add'>+ * function before return. Defaults to NOOP.</div><div class='add'>+ */</div><div class='add'>+static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs,</div><div class='add'>+						  unsigned long ti_work);</div><div class='add'>+</div><div class='add'>+#ifndef arch_exit_to_user_mode_prepare</div><div class='add'>+static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs,</div><div class='add'>+						  unsigned long ti_work)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arch_exit_to_user_mode - Architecture specific final work before</div><div class='add'>+ *			    exit to user mode.</div><div class='add'>+ *</div><div class='add'>+ * Invoked from exit_to_user_mode() with interrupt disabled as the last</div><div class='add'>+ * function before return. Defaults to NOOP.</div><div class='add'>+ *</div><div class='add'>+ * This needs to be __always_inline because it is non-instrumentable code</div><div class='add'>+ * invoked after context tracking switched to user mode.</div><div class='add'>+ *</div><div class='add'>+ * An architecture implementation must not do anything complex, no locking</div><div class='add'>+ * etc. The main purpose is for speculation mitigations.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void arch_exit_to_user_mode(void);</div><div class='add'>+</div><div class='add'>+#ifndef arch_exit_to_user_mode</div><div class='add'>+static __always_inline void arch_exit_to_user_mode(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arch_do_signal_or_restart -  Architecture specific signal delivery function</div><div class='add'>+ * @regs:	Pointer to currents pt_regs</div><div class='add'>+ *</div><div class='add'>+ * Invoked from exit_to_user_mode_loop().</div><div class='add'>+ */</div><div class='add'>+void arch_do_signal_or_restart(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+/* Handle pending TIF work */</div><div class='add'>+unsigned long exit_to_user_mode_loop(struct pt_regs *regs, unsigned long ti_work);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __exit_to_user_mode_prepare - call exit_to_user_mode_loop() if required</div><div class='add'>+ * @regs:	Pointer to pt_regs on entry stack</div><div class='add'>+ *</div><div class='add'>+ * 1) check that interrupts are disabled</div><div class='add'>+ * 2) call tick_nohz_user_enter_prepare()</div><div class='add'>+ * 3) call exit_to_user_mode_loop() if any flags from</div><div class='add'>+ *    EXIT_TO_USER_MODE_WORK are set</div><div class='add'>+ * 4) check that interrupts are still disabled</div><div class='add'>+ *</div><div class='add'>+ * Don't invoke directly, use the syscall/irqentry_ prefixed variants below</div><div class='add'>+ */</div><div class='add'>+static __always_inline void __exit_to_user_mode_prepare(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long ti_work;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_irqs_disabled();</div><div class='add'>+</div><div class='add'>+	/* Flush pending rcuog wakeup before the last need_resched() check */</div><div class='add'>+	tick_nohz_user_enter_prepare();</div><div class='add'>+</div><div class='add'>+	ti_work = read_thread_flags();</div><div class='add'>+	if (unlikely(ti_work &amp; EXIT_TO_USER_MODE_WORK))</div><div class='add'>+		ti_work = exit_to_user_mode_loop(regs, ti_work);</div><div class='add'>+</div><div class='add'>+	arch_exit_to_user_mode_prepare(regs, ti_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void __exit_to_user_mode_validate(void)</div><div class='add'>+{</div><div class='add'>+	/* Ensure that kernel state is sane for a return to userspace */</div><div class='add'>+	kmap_assert_nomap();</div><div class='add'>+	lockdep_assert_irqs_disabled();</div><div class='add'>+	lockdep_sys_exit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Temporary workaround to keep ARM64 alive */</div><div class='add'>+static __always_inline void exit_to_user_mode_prepare_legacy(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	__exit_to_user_mode_prepare(regs);</div><div class='add'>+	rseq_exit_to_user_mode_legacy();</div><div class='add'>+	__exit_to_user_mode_validate();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * syscall_exit_to_user_mode_prepare - call exit_to_user_mode_loop() if required</div><div class='add'>+ * @regs:	Pointer to pt_regs on entry stack</div><div class='add'>+ *</div><div class='add'>+ * Wrapper around __exit_to_user_mode_prepare() to separate the exit work for</div><div class='add'>+ * syscalls and interrupts.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void syscall_exit_to_user_mode_prepare(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	__exit_to_user_mode_prepare(regs);</div><div class='add'>+	rseq_syscall_exit_to_user_mode();</div><div class='add'>+	__exit_to_user_mode_validate();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irqentry_exit_to_user_mode_prepare - call exit_to_user_mode_loop() if required</div><div class='add'>+ * @regs:	Pointer to pt_regs on entry stack</div><div class='add'>+ *</div><div class='add'>+ * Wrapper around __exit_to_user_mode_prepare() to separate the exit work for</div><div class='add'>+ * syscalls and interrupts.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void irqentry_exit_to_user_mode_prepare(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	__exit_to_user_mode_prepare(regs);</div><div class='add'>+	rseq_irqentry_exit_to_user_mode();</div><div class='add'>+	__exit_to_user_mode_validate();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * exit_to_user_mode - Fixup state when exiting to user mode</div><div class='add'>+ *</div><div class='add'>+ * Syscall/interrupt exit enables interrupts, but the kernel state is</div><div class='add'>+ * interrupts disabled when this is invoked. Also tell RCU about it.</div><div class='add'>+ *</div><div class='add'>+ * 1) Trace interrupts on state</div><div class='add'>+ * 2) Invoke context tracking if enabled to adjust RCU state</div><div class='add'>+ * 3) Invoke architecture specific last minute exit code, e.g. speculation</div><div class='add'>+ *    mitigations, etc.: arch_exit_to_user_mode()</div><div class='add'>+ * 4) Tell lockdep that interrupts are enabled</div><div class='add'>+ *</div><div class='add'>+ * Invoked from architecture specific code when syscall_exit_to_user_mode()</div><div class='add'>+ * is not suitable as the last step before returning to userspace. Must be</div><div class='add'>+ * invoked with interrupts disabled and the caller must be</div><div class='add'>+ * non-instrumentable.</div><div class='add'>+ * The caller has to invoke syscall_exit_to_user_mode_work() before this.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void exit_to_user_mode(void)</div><div class='add'>+{</div><div class='add'>+	instrumentation_begin();</div><div class='add'>+	unwind_reset_info();</div><div class='add'>+	trace_hardirqs_on_prepare();</div><div class='add'>+	lockdep_hardirqs_on_prepare();</div><div class='add'>+	instrumentation_end();</div><div class='add'>+</div><div class='add'>+	user_enter_irqoff();</div><div class='add'>+	arch_exit_to_user_mode();</div><div class='add'>+	lockdep_hardirqs_on(CALLER_ADDR0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irqentry_enter_from_user_mode - Establish state before invoking the irq handler</div><div class='add'>+ * @regs:	Pointer to currents pt_regs</div><div class='add'>+ *</div><div class='add'>+ * Invoked from architecture specific entry code with interrupts disabled.</div><div class='add'>+ * Can only be called when the interrupt entry came from user mode. The</div><div class='add'>+ * calling code must be non-instrumentable.  When the function returns all</div><div class='add'>+ * state is correct and the subsequent functions can be instrumented.</div><div class='add'>+ *</div><div class='add'>+ * The function establishes state (lockdep, RCU (context tracking), tracing)</div><div class='add'>+ */</div><div class='add'>+static __always_inline void irqentry_enter_from_user_mode(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	enter_from_user_mode(regs);</div><div class='add'>+	rseq_note_user_irq_entry();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irqentry_exit_to_user_mode - Interrupt exit work</div><div class='add'>+ * @regs:	Pointer to current's pt_regs</div><div class='add'>+ *</div><div class='add'>+ * Invoked with interrupts disabled and fully valid regs. Returns with all</div><div class='add'>+ * work handled, interrupts disabled such that the caller can immediately</div><div class='add'>+ * switch to user mode. Called from architecture specific interrupt</div><div class='add'>+ * handling code.</div><div class='add'>+ *</div><div class='add'>+ * The call order is #2 and #3 as described in syscall_exit_to_user_mode().</div><div class='add'>+ * Interrupt exit is not invoking #1 which is the syscall specific one time</div><div class='add'>+ * work.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void irqentry_exit_to_user_mode(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	instrumentation_begin();</div><div class='add'>+	irqentry_exit_to_user_mode_prepare(regs);</div><div class='add'>+	instrumentation_end();</div><div class='add'>+	exit_to_user_mode();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef irqentry_state</div><div class='add'>+/**</div><div class='add'>+ * struct irqentry_state - Opaque object for exception state storage</div><div class='add'>+ * @exit_rcu: Used exclusively in the irqentry_*() calls; signals whether the</div><div class='add'>+ *            exit path has to invoke ct_irq_exit().</div><div class='add'>+ * @lockdep: Used exclusively in the irqentry_nmi_*() calls; ensures that</div><div class='add'>+ *           lockdep state is restored correctly on exit from nmi.</div><div class='add'>+ *</div><div class='add'>+ * This opaque object is filled in by the irqentry_*_enter() functions and</div><div class='add'>+ * must be passed back into the corresponding irqentry_*_exit() functions</div><div class='add'>+ * when the exception is complete.</div><div class='add'>+ *</div><div class='add'>+ * Callers of irqentry_*_[enter|exit]() must consider this structure opaque</div><div class='add'>+ * and all members private.  Descriptions of the members are provided to aid in</div><div class='add'>+ * the maintenance of the irqentry_*() functions.</div><div class='add'>+ */</div><div class='add'>+typedef struct irqentry_state {</div><div class='add'>+	union {</div><div class='add'>+		bool	exit_rcu;</div><div class='add'>+		bool	lockdep;</div><div class='add'>+	};</div><div class='add'>+} irqentry_state_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irqentry_enter - Handle state tracking on ordinary interrupt entries</div><div class='add'>+ * @regs:	Pointer to pt_regs of interrupted context</div><div class='add'>+ *</div><div class='add'>+ * Invokes:</div><div class='add'>+ *  - lockdep irqflag state tracking as low level ASM entry disabled</div><div class='add'>+ *    interrupts.</div><div class='add'>+ *</div><div class='add'>+ *  - Context tracking if the exception hit user mode.</div><div class='add'>+ *</div><div class='add'>+ *  - The hardirq tracer to keep the state consistent as low level ASM</div><div class='add'>+ *    entry disabled interrupts.</div><div class='add'>+ *</div><div class='add'>+ * As a precondition, this requires that the entry came from user mode,</div><div class='add'>+ * idle, or a kernel context in which RCU is watching.</div><div class='add'>+ *</div><div class='add'>+ * For kernel mode entries RCU handling is done conditional. If RCU is</div><div class='add'>+ * watching then the only RCU requirement is to check whether the tick has</div><div class='add'>+ * to be restarted. If RCU is not watching then ct_irq_enter() has to be</div><div class='add'>+ * invoked on entry and ct_irq_exit() on exit.</div><div class='add'>+ *</div><div class='add'>+ * Avoiding the ct_irq_enter/exit() calls is an optimization but also</div><div class='add'>+ * solves the problem of kernel mode pagefaults which can schedule, which</div><div class='add'>+ * is not possible after invoking ct_irq_enter() without undoing it.</div><div class='add'>+ *</div><div class='add'>+ * For user mode entries irqentry_enter_from_user_mode() is invoked to</div><div class='add'>+ * establish the proper context for NOHZ_FULL. Otherwise scheduling on exit</div><div class='add'>+ * would not be possible.</div><div class='add'>+ *</div><div class='add'>+ * Returns: An opaque object that must be passed to idtentry_exit()</div><div class='add'>+ */</div><div class='add'>+irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irqentry_exit_cond_resched - Conditionally reschedule on return from interrupt</div><div class='add'>+ *</div><div class='add'>+ * Conditional reschedule with additional sanity checks.</div><div class='add'>+ */</div><div class='add'>+void raw_irqentry_exit_cond_resched(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PREEMPT_DYNAMIC</div><div class='add'>+#if defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL)</div><div class='add'>+#define irqentry_exit_cond_resched_dynamic_enabled	raw_irqentry_exit_cond_resched</div><div class='add'>+#define irqentry_exit_cond_resched_dynamic_disabled	NULL</div><div class='add'>+DECLARE_STATIC_CALL(irqentry_exit_cond_resched, raw_irqentry_exit_cond_resched);</div><div class='add'>+#define irqentry_exit_cond_resched()	static_call(irqentry_exit_cond_resched)()</div><div class='add'>+#elif defined(CONFIG_HAVE_PREEMPT_DYNAMIC_KEY)</div><div class='add'>+DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched);</div><div class='add'>+void dynamic_irqentry_exit_cond_resched(void);</div><div class='add'>+#define irqentry_exit_cond_resched()	dynamic_irqentry_exit_cond_resched()</div><div class='add'>+#endif</div><div class='add'>+#else /* CONFIG_PREEMPT_DYNAMIC */</div><div class='add'>+#define irqentry_exit_cond_resched()	raw_irqentry_exit_cond_resched()</div><div class='add'>+#endif /* CONFIG_PREEMPT_DYNAMIC */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irqentry_exit - Handle return from exception that used irqentry_enter()</div><div class='add'>+ * @regs:	Pointer to pt_regs (exception entry regs)</div><div class='add'>+ * @state:	Return value from matching call to irqentry_enter()</div><div class='add'>+ *</div><div class='add'>+ * Depending on the return target (kernel/user) this runs the necessary</div><div class='add'>+ * preemption and work checks if possible and required and returns to</div><div class='add'>+ * the caller with interrupts disabled and no further work pending.</div><div class='add'>+ *</div><div class='add'>+ * This is the last action before returning to the low level ASM code which</div><div class='add'>+ * just needs to return to the appropriate context.</div><div class='add'>+ *</div><div class='add'>+ * Counterpart to irqentry_enter().</div><div class='add'>+ */</div><div class='add'>+void noinstr irqentry_exit(struct pt_regs *regs, irqentry_state_t state);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irqentry_nmi_enter - Handle NMI entry</div><div class='add'>+ * @regs:	Pointer to currents pt_regs</div><div class='add'>+ *</div><div class='add'>+ * Similar to irqentry_enter() but taking care of the NMI constraints.</div><div class='add'>+ */</div><div class='add'>+irqentry_state_t noinstr irqentry_nmi_enter(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irqentry_nmi_exit - Handle return from NMI handling</div><div class='add'>+ * @regs:	Pointer to pt_regs (NMI entry regs)</div><div class='add'>+ * @irq_state:	Return value from matching call to irqentry_nmi_enter()</div><div class='add'>+ *</div><div class='add'>+ * Last action before returning to the low level assembly code.</div><div class='add'>+ *</div><div class='add'>+ * Counterpart to irqentry_nmi_enter().</div><div class='add'>+ */</div><div class='add'>+void noinstr irqentry_nmi_exit(struct pt_regs *regs, irqentry_state_t irq_state);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/irq.h b/include/linux/irq.h<br/>index 97baa937ab5b..4a9f1d7b08c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irq.h</a></div><div class='hunk'>@@ -64,7 +64,6 @@ enum irqchip_irq_state;</div><div class='ctx'>  * IRQ_NOAUTOEN			- Interrupt is not automatically enabled in</div><div class='ctx'>  *				  request/setup_irq()</div><div class='ctx'>  * IRQ_NO_BALANCING		- Interrupt cannot be balanced (affinity set)</div><div class='del'>- * IRQ_MOVE_PCNTXT		- Interrupt can be migrated from process context</div><div class='ctx'>  * IRQ_NESTED_THREAD		- Interrupt nests into another thread</div><div class='ctx'>  * IRQ_PER_CPU_DEVID		- Dev_id is a per-cpu variable</div><div class='ctx'>  * IRQ_IS_POLLED		- Always polled by another interrupt. Exclude</div><div class='hunk'>@@ -93,7 +92,6 @@ enum {</div><div class='ctx'> 	IRQ_NOREQUEST		= (1 &lt;&lt; 11),</div><div class='ctx'> 	IRQ_NOAUTOEN		= (1 &lt;&lt; 12),</div><div class='ctx'> 	IRQ_NO_BALANCING	= (1 &lt;&lt; 13),</div><div class='del'>-	IRQ_MOVE_PCNTXT		= (1 &lt;&lt; 14),</div><div class='ctx'> 	IRQ_NESTED_THREAD	= (1 &lt;&lt; 15),</div><div class='ctx'> 	IRQ_NOTHREAD		= (1 &lt;&lt; 16),</div><div class='ctx'> 	IRQ_PER_CPU_DEVID	= (1 &lt;&lt; 17),</div><div class='hunk'>@@ -105,7 +103,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> #define IRQF_MODIFY_MASK	\</div><div class='ctx'> 	(IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \</div><div class='del'>-	 IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \</div><div class='add'>+	 IRQ_NOAUTOEN | IRQ_LEVEL | IRQ_NO_BALANCING | \</div><div class='ctx'> 	 IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \</div><div class='ctx'> 	 IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_HIDDEN)</div><div class='ctx'> </div><div class='hunk'>@@ -115,7 +113,7 @@ enum {</div><div class='ctx'>  * Return value for chip-&gt;irq_set_affinity()</div><div class='ctx'>  *</div><div class='ctx'>  * IRQ_SET_MASK_OK	- OK, core updates irq_common_data.affinity</div><div class='del'>- * IRQ_SET_MASK_NOCPY	- OK, chip did update irq_common_data.affinity</div><div class='add'>+ * IRQ_SET_MASK_NOCOPY	- OK, chip did update irq_common_data.affinity</div><div class='ctx'>  * IRQ_SET_MASK_OK_DONE	- Same as IRQ_SET_MASK_OK for core. Special code to</div><div class='ctx'>  *			  support stacked irqchips, which indicates skipping</div><div class='ctx'>  *			  all descendant irqchips.</div><div class='hunk'>@@ -201,8 +199,6 @@ struct irq_data {</div><div class='ctx'>  * IRQD_LEVEL			- Interrupt is level triggered</div><div class='ctx'>  * IRQD_WAKEUP_STATE		- Interrupt is configured for wakeup</div><div class='ctx'>  *				  from suspend</div><div class='del'>- * IRQD_MOVE_PCNTXT		- Interrupt can be moved in process</div><div class='del'>- *				  context</div><div class='ctx'>  * IRQD_IRQ_DISABLED		- Disabled state of the interrupt</div><div class='ctx'>  * IRQD_IRQ_MASKED		- Masked state of the interrupt</div><div class='ctx'>  * IRQD_IRQ_INPROGRESS		- In progress state of the interrupt</div><div class='hunk'>@@ -233,7 +229,6 @@ enum {</div><div class='ctx'> 	IRQD_AFFINITY_SET		= BIT(12),</div><div class='ctx'> 	IRQD_LEVEL			= BIT(13),</div><div class='ctx'> 	IRQD_WAKEUP_STATE		= BIT(14),</div><div class='del'>-	IRQD_MOVE_PCNTXT		= BIT(15),</div><div class='ctx'> 	IRQD_IRQ_DISABLED		= BIT(16),</div><div class='ctx'> 	IRQD_IRQ_MASKED			= BIT(17),</div><div class='ctx'> 	IRQD_IRQ_INPROGRESS		= BIT(18),</div><div class='hunk'>@@ -338,11 +333,6 @@ static inline bool irqd_is_wakeup_set(struct irq_data *d)</div><div class='ctx'> 	return __irqd_to_state(d) &amp; IRQD_WAKEUP_STATE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool irqd_can_move_in_process_context(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	return __irqd_to_state(d) &amp; IRQD_MOVE_PCNTXT;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool irqd_irq_disabled(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	return __irqd_to_state(d) &amp; IRQD_IRQ_DISABLED;</div><div class='hunk'>@@ -496,6 +486,7 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)</div><div class='ctx'>  * @ipi_send_mask:	send an IPI to destination cpus in cpumask</div><div class='ctx'>  * @irq_nmi_setup:	function called from core code before enabling an NMI</div><div class='ctx'>  * @irq_nmi_teardown:	function called from core code after disabling an NMI</div><div class='add'>+ * @irq_force_complete_move:	optional function to force complete pending irq move</div><div class='ctx'>  * @flags:		chip specific flags</div><div class='ctx'>  */</div><div class='ctx'> struct irq_chip {</div><div class='hunk'>@@ -547,6 +538,8 @@ struct irq_chip {</div><div class='ctx'> 	int		(*irq_nmi_setup)(struct irq_data *data);</div><div class='ctx'> 	void		(*irq_nmi_teardown)(struct irq_data *data);</div><div class='ctx'> </div><div class='add'>+	void		(*irq_force_complete_move)(struct irq_data *data);</div><div class='add'>+</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -567,6 +560,7 @@ struct irq_chip {</div><div class='ctx'>  *                                    in the suspend path if they are in disabled state</div><div class='ctx'>  * IRQCHIP_AFFINITY_PRE_STARTUP:      Default affinity update before startup</div><div class='ctx'>  * IRQCHIP_IMMUTABLE:		      Don't ever change anything in this chip</div><div class='add'>+ * IRQCHIP_MOVE_DEFERRED:	      Move the interrupt in actual interrupt context</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	IRQCHIP_SET_TYPE_MASKED			= (1 &lt;&lt;  0),</div><div class='hunk'>@@ -581,6 +575,7 @@ enum {</div><div class='ctx'> 	IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND	= (1 &lt;&lt;  9),</div><div class='ctx'> 	IRQCHIP_AFFINITY_PRE_STARTUP		= (1 &lt;&lt; 10),</div><div class='ctx'> 	IRQCHIP_IMMUTABLE			= (1 &lt;&lt; 11),</div><div class='add'>+	IRQCHIP_MOVE_DEFERRED			= (1 &lt;&lt; 12),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irqdesc.h&gt;</div><div class='hunk'>@@ -602,7 +597,6 @@ enum {</div><div class='ctx'> </div><div class='ctx'> struct irqaction;</div><div class='ctx'> extern int setup_percpu_irq(unsigned int irq, struct irqaction *new);</div><div class='del'>-extern void remove_percpu_irq(unsigned int irq, struct irqaction *act);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEPRECATED_IRQ_CPU_ONOFFLINE</div><div class='ctx'> extern void irq_cpu_online(void);</div><div class='hunk'>@@ -620,6 +614,7 @@ extern int irq_affinity_online_cpu(unsigned int cpu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_GENERIC_PENDING_IRQ)</div><div class='add'>+bool irq_can_move_in_process_context(struct irq_data *data);</div><div class='ctx'> void __irq_move_irq(struct irq_data *data);</div><div class='ctx'> static inline void irq_move_irq(struct irq_data *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -627,11 +622,10 @@ static inline void irq_move_irq(struct irq_data *data)</div><div class='ctx'> 		__irq_move_irq(data);</div><div class='ctx'> }</div><div class='ctx'> void irq_move_masked_irq(struct irq_data *data);</div><div class='del'>-void irq_force_complete_move(struct irq_desc *desc);</div><div class='ctx'> #else</div><div class='add'>+static inline bool irq_can_move_in_process_context(struct irq_data *data) { return true; }</div><div class='ctx'> static inline void irq_move_irq(struct irq_data *data) { }</div><div class='ctx'> static inline void irq_move_masked_irq(struct irq_data *data) { }</div><div class='del'>-static inline void irq_force_complete_move(struct irq_desc *desc) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern int no_irq_affinity;</div><div class='hunk'>@@ -661,7 +655,6 @@ extern void handle_bad_irq(struct irq_desc *desc);</div><div class='ctx'> extern void handle_nested_irq(unsigned int irq);</div><div class='ctx'> </div><div class='ctx'> extern void handle_fasteoi_nmi(struct irq_desc *desc);</div><div class='del'>-extern void handle_percpu_devid_fasteoi_nmi(struct irq_desc *desc);</div><div class='ctx'> </div><div class='ctx'> extern int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg);</div><div class='ctx'> extern int irq_chip_pm_get(struct irq_data *data);</div><div class='hunk'>@@ -675,6 +668,8 @@ extern int irq_chip_set_parent_state(struct irq_data *data,</div><div class='ctx'> extern int irq_chip_get_parent_state(struct irq_data *data,</div><div class='ctx'> 				     enum irqchip_irq_state which,</div><div class='ctx'> 				     bool *state);</div><div class='add'>+extern void irq_chip_shutdown_parent(struct irq_data *data);</div><div class='add'>+extern unsigned int irq_chip_startup_parent(struct irq_data *data);</div><div class='ctx'> extern void irq_chip_enable_parent(struct irq_data *data);</div><div class='ctx'> extern void irq_chip_disable_parent(struct irq_data *data);</div><div class='ctx'> extern void irq_chip_ack_parent(struct irq_data *data);</div><div class='hunk'>@@ -694,6 +689,9 @@ extern int irq_chip_request_resources_parent(struct irq_data *data);</div><div class='ctx'> extern void irq_chip_release_resources_parent(struct irq_data *data);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Disable or mask interrupts during a kernel kexec */</div><div class='add'>+extern void machine_kexec_mask_interrupts(void);</div><div class='add'>+</div><div class='ctx'> /* Handling of unhandled and spurious interrupts: */</div><div class='ctx'> extern void note_interrupt(struct irq_desc *desc, irqreturn_t action_ret);</div><div class='ctx'> </div><div class='hunk'>@@ -702,7 +700,7 @@ extern void note_interrupt(struct irq_desc *desc, irqreturn_t action_ret);</div><div class='ctx'> extern int noirqdebug_setup(char *str);</div><div class='ctx'> </div><div class='ctx'> /* Checks whether the interrupt can be requested by request_irq(): */</div><div class='del'>-extern int can_request_irq(unsigned int irq, unsigned long irqflags);</div><div class='add'>+extern bool can_request_irq(unsigned int irq, unsigned long irqflags);</div><div class='ctx'> </div><div class='ctx'> /* Dummy irq-chip implementations: */</div><div class='ctx'> extern struct irq_chip no_irq_chip;</div><div class='hunk'>@@ -720,10 +718,6 @@ static inline void irq_set_chip_and_handler(unsigned int irq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern int irq_set_percpu_devid(unsigned int irq);</div><div class='del'>-extern int irq_set_percpu_devid_partition(unsigned int irq,</div><div class='del'>-					  const struct cpumask *affinity);</div><div class='del'>-extern int irq_get_percpu_devid_partition(unsigned int irq,</div><div class='del'>-					  struct cpumask *affinity);</div><div class='ctx'> </div><div class='ctx'> extern void</div><div class='ctx'> __irq_set_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,</div><div class='hunk'>@@ -979,10 +973,6 @@ static inline void irq_free_desc(unsigned int irq)</div><div class='ctx'> 	irq_free_descs(irq, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_GENERIC_IRQ_LEGACY</div><div class='del'>-void irq_init_desc(unsigned int irq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct irq_chip_regs - register offsets for struct irq_gci</div><div class='ctx'>  * @enable:	Enable register offset to reg_base</div><div class='hunk'>@@ -991,7 +981,6 @@ void irq_init_desc(unsigned int irq);</div><div class='ctx'>  * @ack:	Ack register offset to reg_base</div><div class='ctx'>  * @eoi:	Eoi register offset to reg_base</div><div class='ctx'>  * @type:	Type configuration register offset to reg_base</div><div class='del'>- * @polarity:	Polarity configuration register offset to reg_base</div><div class='ctx'>  */</div><div class='ctx'> struct irq_chip_regs {</div><div class='ctx'> 	unsigned long		enable;</div><div class='hunk'>@@ -1000,7 +989,6 @@ struct irq_chip_regs {</div><div class='ctx'> 	unsigned long		ack;</div><div class='ctx'> 	unsigned long		eoi;</div><div class='ctx'> 	unsigned long		type;</div><div class='del'>-	unsigned long		polarity;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1040,8 +1028,6 @@ struct irq_chip_type {</div><div class='ctx'>  * @irq_base:		Interrupt base nr for this chip</div><div class='ctx'>  * @irq_cnt:		Number of interrupts handled by this chip</div><div class='ctx'>  * @mask_cache:		Cached mask register shared between all chip types</div><div class='del'>- * @type_cache:		Cached type register</div><div class='del'>- * @polarity_cache:	Cached polarity register</div><div class='ctx'>  * @wake_enabled:	Interrupt can wakeup from suspend</div><div class='ctx'>  * @wake_active:	Interrupt is marked as an wakeup from suspend source</div><div class='ctx'>  * @num_ct:		Number of available irq_chip_type instances (usually 1)</div><div class='hunk'>@@ -1068,8 +1054,6 @@ struct irq_chip_generic {</div><div class='ctx'> 	unsigned int		irq_base;</div><div class='ctx'> 	unsigned int		irq_cnt;</div><div class='ctx'> 	u32			mask_cache;</div><div class='del'>-	u32			type_cache;</div><div class='del'>-	u32			polarity_cache;</div><div class='ctx'> 	u32			wake_enabled;</div><div class='ctx'> 	u32			wake_active;</div><div class='ctx'> 	unsigned int		num_ct;</div><div class='hunk'>@@ -1106,6 +1090,7 @@ enum irq_gc_flags {</div><div class='ctx'>  * @irq_flags_to_set:	IRQ* flags to set on irq setup</div><div class='ctx'>  * @irq_flags_to_clear:	IRQ* flags to clear on irq setup</div><div class='ctx'>  * @gc_flags:		Generic chip specific setup flags</div><div class='add'>+ * @exit:		Function called on each chip when they are destroyed.</div><div class='ctx'>  * @gc:			Array of pointers to generic interrupt chips</div><div class='ctx'>  */</div><div class='ctx'> struct irq_domain_chip_generic {</div><div class='hunk'>@@ -1114,9 +1099,37 @@ struct irq_domain_chip_generic {</div><div class='ctx'> 	unsigned int		irq_flags_to_clear;</div><div class='ctx'> 	unsigned int		irq_flags_to_set;</div><div class='ctx'> 	enum irq_gc_flags	gc_flags;</div><div class='add'>+	void			(*exit)(struct irq_chip_generic *gc);</div><div class='ctx'> 	struct irq_chip_generic	*gc[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct irq_domain_chip_generic_info - Generic chip information structure</div><div class='add'>+ * @name:		Name of the generic interrupt chip</div><div class='add'>+ * @handler:		Interrupt handler used by the generic interrupt chip</div><div class='add'>+ * @irqs_per_chip:	Number of interrupts each chip handles (max 32)</div><div class='add'>+ * @num_ct:		Number of irq_chip_type instances associated with each</div><div class='add'>+ *			chip</div><div class='add'>+ * @irq_flags_to_clear:	IRQ_* bits to clear in the mapping function</div><div class='add'>+ * @irq_flags_to_set:	IRQ_* bits to set in the mapping function</div><div class='add'>+ * @gc_flags:		Generic chip specific setup flags</div><div class='add'>+ * @init:		Function called on each chip when they are created.</div><div class='add'>+ *			Allow to do some additional chip initialisation.</div><div class='add'>+ * @exit:		Function called on each chip when they are destroyed.</div><div class='add'>+ *			Allow to do some chip cleanup operation.</div><div class='add'>+ */</div><div class='add'>+struct irq_domain_chip_generic_info {</div><div class='add'>+	const char		*name;</div><div class='add'>+	irq_flow_handler_t	handler;</div><div class='add'>+	unsigned int		irqs_per_chip;</div><div class='add'>+	unsigned int		num_ct;</div><div class='add'>+	unsigned int		irq_flags_to_clear;</div><div class='add'>+	unsigned int		irq_flags_to_set;</div><div class='add'>+	enum irq_gc_flags	gc_flags;</div><div class='add'>+	int			(*init)(struct irq_chip_generic *gc);</div><div class='add'>+	void			(*exit)(struct irq_chip_generic *gc);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Generic chip callback functions */</div><div class='ctx'> void irq_gc_noop(struct irq_data *d);</div><div class='ctx'> void irq_gc_mask_disable_reg(struct irq_data *d);</div><div class='hunk'>@@ -1153,6 +1166,20 @@ int devm_irq_setup_generic_chip(struct device *dev, struct irq_chip_generic *gc,</div><div class='ctx'> </div><div class='ctx'> struct irq_chip_generic *irq_get_domain_generic_chip(struct irq_domain *d, unsigned int hw_irq);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GENERIC_IRQ_CHIP</div><div class='add'>+int irq_domain_alloc_generic_chips(struct irq_domain *d,</div><div class='add'>+				   const struct irq_domain_chip_generic_info *info);</div><div class='add'>+void irq_domain_remove_generic_chips(struct irq_domain *d);</div><div class='add'>+#else</div><div class='add'>+static inline int</div><div class='add'>+irq_domain_alloc_generic_chips(struct irq_domain *d,</div><div class='add'>+			       const struct irq_domain_chip_generic_info *info)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+static inline void irq_domain_remove_generic_chips(struct irq_domain *d) { }</div><div class='add'>+#endif /* CONFIG_GENERIC_IRQ_CHIP */</div><div class='add'>+</div><div class='ctx'> int __irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip,</div><div class='ctx'> 				     int num_ct, const char *name,</div><div class='ctx'> 				     irq_flow_handler_t handler,</div><div class='hunk'>@@ -1187,31 +1214,6 @@ static inline struct irq_chip_type *irq_data_get_chip_type(struct irq_data *d)</div><div class='ctx'> </div><div class='ctx'> #define IRQ_MSK(n) (u32)((n) &lt; 32 ? ((1 &lt;&lt; (n)) - 1) : UINT_MAX)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-static inline void irq_gc_lock(struct irq_chip_generic *gc)</div><div class='del'>-{</div><div class='del'>-	raw_spin_lock(&amp;gc-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void irq_gc_unlock(struct irq_chip_generic *gc)</div><div class='del'>-{</div><div class='del'>-	raw_spin_unlock(&amp;gc-&gt;lock);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void irq_gc_lock(struct irq_chip_generic *gc) { }</div><div class='del'>-static inline void irq_gc_unlock(struct irq_chip_generic *gc) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The irqsave variants are for usage in non interrupt code. Do not use</div><div class='del'>- * them in irq_chip callbacks. Use irq_gc_lock() instead.</div><div class='del'>- */</div><div class='del'>-#define irq_gc_lock_irqsave(gc, flags)	\</div><div class='del'>-	raw_spin_lock_irqsave(&amp;(gc)-&gt;lock, flags)</div><div class='del'>-</div><div class='del'>-#define irq_gc_unlock_irqrestore(gc, flags)	\</div><div class='del'>-	raw_spin_unlock_irqrestore(&amp;(gc)-&gt;lock, flags)</div><div class='del'>-</div><div class='ctx'> static inline void irq_reg_writel(struct irq_chip_generic *gc,</div><div class='ctx'> 				  u32 val, int reg_offset)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/irq_sim.h b/include/linux/irq_sim.h<br/>index ab831e5ae748..89b4d8ff274b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irq_sim.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irq_sim.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irq_sim.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irq_sim.h</a></div><div class='hunk'>@@ -16,11 +16,28 @@</div><div class='ctx'>  * requested like normal irqs and enqueued from process context.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+struct irq_sim_ops {</div><div class='add'>+	int (*irq_sim_irq_requested)(struct irq_domain *domain,</div><div class='add'>+				     irq_hw_number_t hwirq, void *data);</div><div class='add'>+	void (*irq_sim_irq_released)(struct irq_domain *domain,</div><div class='add'>+				     irq_hw_number_t hwirq, void *data);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode,</div><div class='ctx'> 					 unsigned int num_irqs);</div><div class='ctx'> struct irq_domain *devm_irq_domain_create_sim(struct device *dev,</div><div class='ctx'> 					      struct fwnode_handle *fwnode,</div><div class='ctx'> 					      unsigned int num_irqs);</div><div class='add'>+struct irq_domain *irq_domain_create_sim_full(struct fwnode_handle *fwnode,</div><div class='add'>+					      unsigned int num_irqs,</div><div class='add'>+					      const struct irq_sim_ops *ops,</div><div class='add'>+					      void *data);</div><div class='add'>+struct irq_domain *</div><div class='add'>+devm_irq_domain_create_sim_full(struct device *dev,</div><div class='add'>+				struct fwnode_handle *fwnode,</div><div class='add'>+				unsigned int num_irqs,</div><div class='add'>+				const struct irq_sim_ops *ops,</div><div class='add'>+				void *data);</div><div class='ctx'> void irq_domain_remove_sim(struct irq_domain *domain);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_IRQ_SIM_H */</div><div class='head'>diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h<br/>index 136f2980cba3..c5afd053ae32 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irq_work.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irq_work.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irq_work.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irq_work.h</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #ifndef _LINUX_IRQ_WORK_H</div><div class='ctx'> #define _LINUX_IRQ_WORK_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/smp_types.h&gt;</div><div class='add'>+#include &lt;linux/irq_work_types.h&gt;</div><div class='ctx'> #include &lt;linux/rcuwait.h&gt;</div><div class='add'>+#include &lt;linux/smp_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * An entry can be in one of four states:</div><div class='hunk'>@@ -14,12 +15,6 @@</div><div class='ctx'>  * busy      NULL, 2 -&gt; {free, claimed} : callback in progress, can be claimed</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct irq_work {</div><div class='del'>-	struct __call_single_node node;</div><div class='del'>-	void (*func)(struct irq_work *);</div><div class='del'>-	struct rcuwait irqwait;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define __IRQ_WORK_INIT(_func, _flags) (struct irq_work){	\</div><div class='ctx'> 	.node = { .u_flags = (_flags), },			\</div><div class='ctx'> 	.func = (_func),					\</div><div class='head'>diff --git a/include/linux/irq_work_types.h b/include/linux/irq_work_types.h<br/>new file mode 100644<br/>index 000000000000..73abec5bb06e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irq_work_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irq_work_types.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_IRQ_WORK_TYPES_H</div><div class='add'>+#define _LINUX_IRQ_WORK_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/smp_types.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct irq_work {</div><div class='add'>+	struct __call_single_node	node;</div><div class='add'>+	void				(*func)(struct irq_work *);</div><div class='add'>+	struct rcuwait			irqwait;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/irqbypass.h b/include/linux/irqbypass.h<br/>index 9bdb2a781841..ede1fa938152 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqbypass.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqbypass.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqbypass.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqbypass.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='add'>+struct eventfd_ctx;</div><div class='ctx'> struct irq_bypass_consumer;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -18,20 +19,22 @@ struct irq_bypass_consumer;</div><div class='ctx'>  * The IRQ bypass manager is a simple set of lists and callbacks that allows</div><div class='ctx'>  * IRQ producers (ex. physical interrupt sources) to be matched to IRQ</div><div class='ctx'>  * consumers (ex. virtualization hardware that allows IRQ bypass or offload)</div><div class='del'>- * via a shared token (ex. eventfd_ctx).  Producers and consumers register</div><div class='del'>- * independently.  When a token match is found, the optional @stop callback</div><div class='del'>- * will be called for each participant.  The pair will then be connected via</div><div class='del'>- * the @add_* callbacks, and finally the optional @start callback will allow</div><div class='del'>- * any final coordination.  When either participant is unregistered, the</div><div class='del'>- * process is repeated using the @del_* callbacks in place of the @add_*</div><div class='del'>- * callbacks.  Match tokens must be unique per producer/consumer, 1:N pairings</div><div class='del'>- * are not supported.</div><div class='add'>+ * via a shared eventfd_ctx.  Producers and consumers register independently.</div><div class='add'>+ * When a producer and consumer are paired, i.e. an eventfd match is found, the</div><div class='add'>+ * optional @stop callback will be called for each participant.  The pair will</div><div class='add'>+ * then be connected via the @add_* callbacks, and finally the optional @start</div><div class='add'>+ * callback will allow any final coordination.  When either participant is</div><div class='add'>+ * unregistered, the process is repeated using the @del_* callbacks in place of</div><div class='add'>+ * the @add_* callbacks.  eventfds must be unique per producer/consumer, 1:N</div><div class='add'>+ * pairings are not supported.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+struct irq_bypass_consumer;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct irq_bypass_producer - IRQ bypass producer definition</div><div class='del'>- * @node: IRQ bypass manager private list management</div><div class='del'>- * @token: opaque token to match between producer and consumer (non-NULL)</div><div class='add'>+ * @eventfd: eventfd context used to match producers and consumers</div><div class='add'>+ * @consumer: The connected consumer (NULL if no connection)</div><div class='ctx'>  * @irq: Linux IRQ number for the producer device</div><div class='ctx'>  * @add_consumer: Connect the IRQ producer to an IRQ consumer (optional)</div><div class='ctx'>  * @del_consumer: Disconnect the IRQ producer from an IRQ consumer (optional)</div><div class='hunk'>@@ -43,8 +46,8 @@ struct irq_bypass_consumer;</div><div class='ctx'>  * for a physical device assigned to a VM.</div><div class='ctx'>  */</div><div class='ctx'> struct irq_bypass_producer {</div><div class='del'>-	struct list_head node;</div><div class='del'>-	void *token;</div><div class='add'>+	struct eventfd_ctx *eventfd;</div><div class='add'>+	struct irq_bypass_consumer *consumer;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int (*add_consumer)(struct irq_bypass_producer *,</div><div class='ctx'> 			    struct irq_bypass_consumer *);</div><div class='hunk'>@@ -56,8 +59,8 @@ struct irq_bypass_producer {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct irq_bypass_consumer - IRQ bypass consumer definition</div><div class='del'>- * @node: IRQ bypass manager private list management</div><div class='del'>- * @token: opaque token to match between producer and consumer (non-NULL)</div><div class='add'>+ * @eventfd: eventfd context used to match producers and consumers</div><div class='add'>+ * @producer: The connected producer (NULL if no connection)</div><div class='ctx'>  * @add_producer: Connect the IRQ consumer to an IRQ producer</div><div class='ctx'>  * @del_producer: Disconnect the IRQ consumer from an IRQ producer</div><div class='ctx'>  * @stop: Perform any quiesce operations necessary prior to add/del (optional)</div><div class='hunk'>@@ -69,8 +72,9 @@ struct irq_bypass_producer {</div><div class='ctx'>  * portions of the interrupt handling to the VM.</div><div class='ctx'>  */</div><div class='ctx'> struct irq_bypass_consumer {</div><div class='del'>-	struct list_head node;</div><div class='del'>-	void *token;</div><div class='add'>+	struct eventfd_ctx *eventfd;</div><div class='add'>+	struct irq_bypass_producer *producer;</div><div class='add'>+</div><div class='ctx'> 	int (*add_producer)(struct irq_bypass_consumer *,</div><div class='ctx'> 			    struct irq_bypass_producer *);</div><div class='ctx'> 	void (*del_producer)(struct irq_bypass_consumer *,</div><div class='hunk'>@@ -79,9 +83,11 @@ struct irq_bypass_consumer {</div><div class='ctx'> 	void (*start)(struct irq_bypass_consumer *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int irq_bypass_register_producer(struct irq_bypass_producer *);</div><div class='del'>-void irq_bypass_unregister_producer(struct irq_bypass_producer *);</div><div class='del'>-int irq_bypass_register_consumer(struct irq_bypass_consumer *);</div><div class='del'>-void irq_bypass_unregister_consumer(struct irq_bypass_consumer *);</div><div class='add'>+int irq_bypass_register_producer(struct irq_bypass_producer *producer,</div><div class='add'>+				 struct eventfd_ctx *eventfd, int irq);</div><div class='add'>+void irq_bypass_unregister_producer(struct irq_bypass_producer *producer);</div><div class='add'>+int irq_bypass_register_consumer(struct irq_bypass_consumer *consumer,</div><div class='add'>+				 struct eventfd_ctx *eventfd);</div><div class='add'>+void irq_bypass_unregister_consumer(struct irq_bypass_consumer *consumer);</div><div class='ctx'> </div><div class='ctx'> #endif /* IRQBYPASS_H */</div><div class='head'>diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h<br/>index d5e6024cb2a8..bc4ddacd6ddc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip.h</a></div><div class='hunk'>@@ -17,12 +17,18 @@</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='add'>+typedef int (*platform_irq_probe_t)(struct platform_device *, struct device_node *);</div><div class='add'>+</div><div class='ctx'> /* Undefined on purpose */</div><div class='ctx'> extern of_irq_init_cb_t typecheck_irq_init_cb;</div><div class='add'>+extern platform_irq_probe_t typecheck_irq_probe;</div><div class='ctx'> </div><div class='ctx'> #define typecheck_irq_init_cb(fn)					\</div><div class='ctx'> 	(__typecheck(typecheck_irq_init_cb, &amp;fn) ? fn : fn)</div><div class='ctx'> </div><div class='add'>+#define typecheck_irq_probe(fn)						\</div><div class='add'>+	(__typecheck(typecheck_irq_probe, &amp;fn) ? fn : fn)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This macro must be used by the different irqchip drivers to declare</div><div class='ctx'>  * the association between their DT compatible string and their</div><div class='hunk'>@@ -42,7 +48,7 @@ extern int platform_irqchip_probe(struct platform_device *pdev);</div><div class='ctx'> static const struct of_device_id drv_name##_irqchip_match_table[] = {</div><div class='ctx'> </div><div class='ctx'> #define IRQCHIP_MATCH(compat, fn) { .compatible = compat,		\</div><div class='del'>-				    .data = typecheck_irq_init_cb(fn), },</div><div class='add'>+				    .data = typecheck_irq_probe(fn), },</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define IRQCHIP_PLATFORM_DRIVER_END(drv_name, ...)			\</div><div class='head'>diff --git a/include/linux/irqchip/arm-gic-common.h b/include/linux/irqchip/arm-gic-common.h<br/>index 1177f3a1aed5..fc0246cc05ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic-common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic-common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/arm-gic-common.h</a></div><div class='hunk'>@@ -10,10 +10,6 @@</div><div class='ctx'> #include &lt;linux/irqchip/arm-vgic-info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GICD_INT_DEF_PRI		0xa0</div><div class='del'>-#define GICD_INT_DEF_PRI_X4		((GICD_INT_DEF_PRI &lt;&lt; 24) |\</div><div class='del'>-					(GICD_INT_DEF_PRI &lt;&lt; 16) |\</div><div class='del'>-					(GICD_INT_DEF_PRI &lt;&lt; 8) |\</div><div class='del'>-					GICD_INT_DEF_PRI)</div><div class='ctx'> </div><div class='ctx'> struct irq_domain;</div><div class='ctx'> struct fwnode_handle;</div><div class='head'>diff --git a/include/linux/irqchip/arm-gic-v3-prio.h b/include/linux/irqchip/arm-gic-v3-prio.h<br/>new file mode 100644<br/>index 000000000000..44157c9abb78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic-v3-prio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/arm-gic-v3-prio.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_IRQCHIP_ARM_GIC_V3_PRIO_H</div><div class='add'>+#define __LINUX_IRQCHIP_ARM_GIC_V3_PRIO_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GIC priorities from the view of the PMR/RPR.</div><div class='add'>+ *</div><div class='add'>+ * These values are chosen to be valid in either the absolute priority space or</div><div class='add'>+ * the NS view of the priority space. The value programmed into the distributor</div><div class='add'>+ * and ITS will be chosen at boot time such that these values appear in the</div><div class='add'>+ * PMR/RPR.</div><div class='add'>+ *</div><div class='add'>+ * GICV3_PRIO_UNMASKED is the PMR view of the priority to use to permit both</div><div class='add'>+ * IRQs and pseudo-NMIs.</div><div class='add'>+ *</div><div class='add'>+ * GICV3_PRIO_IRQ is the PMR view of the priority of regular interrupts. This</div><div class='add'>+ * can be written to the PMR to mask regular IRQs.</div><div class='add'>+ *</div><div class='add'>+ * GICV3_PRIO_NMI is the PMR view of the priority of pseudo-NMIs. This can be</div><div class='add'>+ * written to the PMR to mask pseudo-NMIs.</div><div class='add'>+ *</div><div class='add'>+ * On arm64 some code sections either automatically switch back to PSR.I or</div><div class='add'>+ * explicitly require to not use priority masking. If bit GICV3_PRIO_PSR_I_SET</div><div class='add'>+ * is included in the priority mask, it indicates that PSR.I should be set and</div><div class='add'>+ * interrupt disabling temporarily does not rely on IRQ priorities.</div><div class='add'>+ */</div><div class='add'>+#define GICV3_PRIO_UNMASKED	0xe0</div><div class='add'>+#define GICV3_PRIO_IRQ		0xc0</div><div class='add'>+#define GICV3_PRIO_NMI		0x80</div><div class='add'>+</div><div class='add'>+#define GICV3_PRIO_PSR_I_SET	(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLER__</div><div class='add'>+</div><div class='add'>+#define __gicv3_prio_to_ns(p)	(0xff &amp; ((p) &lt;&lt; 1))</div><div class='add'>+#define __gicv3_ns_to_prio(ns)	(0x80 | ((ns) &gt;&gt; 1))</div><div class='add'>+</div><div class='add'>+#define __gicv3_prio_valid_ns(p) \</div><div class='add'>+	(__gicv3_ns_to_prio(__gicv3_prio_to_ns(p)) == (p))</div><div class='add'>+</div><div class='add'>+static_assert(__gicv3_prio_valid_ns(GICV3_PRIO_NMI));</div><div class='add'>+static_assert(__gicv3_prio_valid_ns(GICV3_PRIO_IRQ));</div><div class='add'>+</div><div class='add'>+static_assert(GICV3_PRIO_NMI &lt; GICV3_PRIO_IRQ);</div><div class='add'>+static_assert(GICV3_PRIO_IRQ &lt; GICV3_PRIO_UNMASKED);</div><div class='add'>+</div><div class='add'>+static_assert(GICV3_PRIO_IRQ &lt; (GICV3_PRIO_IRQ | GICV3_PRIO_PSR_I_SET));</div><div class='add'>+</div><div class='add'>+#endif /* __ASSEMBLER */</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_IRQCHIP_ARM_GIC_V3_PRIO_H */</div><div class='head'>diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h<br/>index 728691365464..70c0948f978e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic-v3.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic-v3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic-v3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/arm-gic-v3.h</a></div><div class='hunk'>@@ -638,7 +638,7 @@ struct fwnode_handle;</div><div class='ctx'> int __init its_lpi_memreserve_init(void);</div><div class='ctx'> int its_cpu_init(void);</div><div class='ctx'> int its_init(struct fwnode_handle *handle, struct rdists *rdists,</div><div class='del'>-	     struct irq_domain *domain);</div><div class='add'>+	     struct irq_domain *domain, u8 irq_prio);</div><div class='ctx'> int mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent);</div><div class='ctx'> </div><div class='ctx'> static inline bool gic_enable_sre(void)</div><div class='head'>diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h<br/>index 2c63375bbd43..0b0887099fd7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic-v4.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic-v4.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic-v4.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/arm-gic-v4.h</a></div><div class='hunk'>@@ -25,6 +25,14 @@ struct its_vm {</div><div class='ctx'> 	irq_hw_number_t		db_lpi_base;</div><div class='ctx'> 	unsigned long		*db_bitmap;</div><div class='ctx'> 	int			nr_db_lpis;</div><div class='add'>+	/*</div><div class='add'>+	 * Ensures mutual exclusion between updates to vlpi_count[]</div><div class='add'>+	 * and map/unmap when using the ITSList mechanism.</div><div class='add'>+	 *</div><div class='add'>+	 * The lock order for any sequence involving the ITSList is</div><div class='add'>+	 * vmapp_lock -&gt; vpe_lock -&gt;vmovp_lock.</div><div class='add'>+	 */</div><div class='add'>+	raw_spinlock_t		vmapp_lock;</div><div class='ctx'> 	u32			vlpi_count[GICv4_ITS_LIST_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -58,10 +66,12 @@ struct its_vpe {</div><div class='ctx'> 				bool	enabled;</div><div class='ctx'> 				bool	group;</div><div class='ctx'> 			}			sgi_config[16];</div><div class='del'>-			atomic_t vmapp_count;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	/* Track the VPE being mapped */</div><div class='add'>+	atomic_t vmapp_count;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensures mutual exclusion between affinity setting of the</div><div class='ctx'> 	 * vPE and vLPI operations using vpe-&gt;col_idx.</div><div class='hunk'>@@ -136,7 +146,7 @@ int its_commit_vpe(struct its_vpe *vpe);</div><div class='ctx'> int its_invall_vpe(struct its_vpe *vpe);</div><div class='ctx'> int its_map_vlpi(int irq, struct its_vlpi_map *map);</div><div class='ctx'> int its_get_vlpi(int irq, struct its_vlpi_map *map);</div><div class='del'>-int its_unmap_vlpi(int irq);</div><div class='add'>+void its_unmap_vlpi(int irq);</div><div class='ctx'> int its_prop_update_vlpi(int irq, u8 config, bool inv);</div><div class='ctx'> int its_prop_update_vsgi(int irq, u8 priority, bool group);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/irqchip/arm-gic-v5.h b/include/linux/irqchip/arm-gic-v5.h<br/>new file mode 100644<br/>index 000000000000..68ddcdb1cec5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic-v5.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/arm-gic-v5.h</a></div><div class='hunk'>@@ -0,0 +1,394 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 ARM Limited, All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_IRQCHIP_ARM_GIC_V5_H</div><div class='add'>+#define __LINUX_IRQCHIP_ARM_GIC_V5_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='add'>+#include &lt;asm/sysreg.h&gt;</div><div class='add'>+</div><div class='add'>+#define GICV5_IPIS_PER_CPU		MAX_IPI</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * INTID handling</div><div class='add'>+ */</div><div class='add'>+#define GICV5_HWIRQ_ID			GENMASK(23, 0)</div><div class='add'>+#define GICV5_HWIRQ_TYPE		GENMASK(31, 29)</div><div class='add'>+#define GICV5_HWIRQ_INTID		GENMASK_ULL(31, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_HWIRQ_TYPE_PPI		UL(0x1)</div><div class='add'>+#define GICV5_HWIRQ_TYPE_LPI		UL(0x2)</div><div class='add'>+#define GICV5_HWIRQ_TYPE_SPI		UL(0x3)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tables attributes</div><div class='add'>+ */</div><div class='add'>+#define GICV5_NO_READ_ALLOC		0b0</div><div class='add'>+#define GICV5_READ_ALLOC		0b1</div><div class='add'>+#define GICV5_NO_WRITE_ALLOC		0b0</div><div class='add'>+#define GICV5_WRITE_ALLOC		0b1</div><div class='add'>+</div><div class='add'>+#define GICV5_NON_CACHE			0b00</div><div class='add'>+#define GICV5_WB_CACHE			0b01</div><div class='add'>+#define GICV5_WT_CACHE			0b10</div><div class='add'>+</div><div class='add'>+#define GICV5_NON_SHARE			0b00</div><div class='add'>+#define GICV5_OUTER_SHARE		0b10</div><div class='add'>+#define GICV5_INNER_SHARE		0b11</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRS registers and tables structures</div><div class='add'>+ */</div><div class='add'>+#define GICV5_IRS_IDR1			0x0004</div><div class='add'>+#define GICV5_IRS_IDR2			0x0008</div><div class='add'>+#define GICV5_IRS_IDR5			0x0014</div><div class='add'>+#define GICV5_IRS_IDR6			0x0018</div><div class='add'>+#define GICV5_IRS_IDR7			0x001c</div><div class='add'>+#define GICV5_IRS_CR0			0x0080</div><div class='add'>+#define GICV5_IRS_CR1			0x0084</div><div class='add'>+#define GICV5_IRS_SYNCR			0x00c0</div><div class='add'>+#define GICV5_IRS_SYNC_STATUSR		0x00c4</div><div class='add'>+#define GICV5_IRS_SPI_SELR		0x0108</div><div class='add'>+#define GICV5_IRS_SPI_CFGR		0x0114</div><div class='add'>+#define GICV5_IRS_SPI_STATUSR		0x0118</div><div class='add'>+#define GICV5_IRS_PE_SELR		0x0140</div><div class='add'>+#define GICV5_IRS_PE_STATUSR		0x0144</div><div class='add'>+#define GICV5_IRS_PE_CR0		0x0148</div><div class='add'>+#define GICV5_IRS_IST_BASER		0x0180</div><div class='add'>+#define GICV5_IRS_IST_CFGR		0x0190</div><div class='add'>+#define GICV5_IRS_IST_STATUSR		0x0194</div><div class='add'>+#define GICV5_IRS_MAP_L2_ISTR		0x01c0</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IDR1_PRIORITY_BITS	GENMASK(22, 20)</div><div class='add'>+#define GICV5_IRS_IDR1_IAFFID_BITS	GENMASK(19, 16)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IDR1_PRIORITY_BITS_1BITS	0b000</div><div class='add'>+#define GICV5_IRS_IDR1_PRIORITY_BITS_2BITS	0b001</div><div class='add'>+#define GICV5_IRS_IDR1_PRIORITY_BITS_3BITS	0b010</div><div class='add'>+#define GICV5_IRS_IDR1_PRIORITY_BITS_4BITS	0b011</div><div class='add'>+#define GICV5_IRS_IDR1_PRIORITY_BITS_5BITS	0b100</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IDR2_ISTMD_SZ		GENMASK(19, 15)</div><div class='add'>+#define GICV5_IRS_IDR2_ISTMD		BIT(14)</div><div class='add'>+#define GICV5_IRS_IDR2_IST_L2SZ		GENMASK(13, 11)</div><div class='add'>+#define GICV5_IRS_IDR2_IST_LEVELS	BIT(10)</div><div class='add'>+#define GICV5_IRS_IDR2_MIN_LPI_ID_BITS	GENMASK(9, 6)</div><div class='add'>+#define GICV5_IRS_IDR2_LPI		BIT(5)</div><div class='add'>+#define GICV5_IRS_IDR2_ID_BITS		GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IDR5_SPI_RANGE	GENMASK(24, 0)</div><div class='add'>+#define GICV5_IRS_IDR6_SPI_IRS_RANGE	GENMASK(24, 0)</div><div class='add'>+#define GICV5_IRS_IDR7_SPI_BASE		GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IST_L2SZ_SUPPORT_4KB(r)	FIELD_GET(BIT(11), (r))</div><div class='add'>+#define GICV5_IRS_IST_L2SZ_SUPPORT_16KB(r)	FIELD_GET(BIT(12), (r))</div><div class='add'>+#define GICV5_IRS_IST_L2SZ_SUPPORT_64KB(r)	FIELD_GET(BIT(13), (r))</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_CR0_IDLE		BIT(1)</div><div class='add'>+#define GICV5_IRS_CR0_IRSEN		BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_CR1_VPED_WA		BIT(15)</div><div class='add'>+#define GICV5_IRS_CR1_VPED_RA		BIT(14)</div><div class='add'>+#define GICV5_IRS_CR1_VMD_WA		BIT(13)</div><div class='add'>+#define GICV5_IRS_CR1_VMD_RA		BIT(12)</div><div class='add'>+#define GICV5_IRS_CR1_VPET_WA		BIT(11)</div><div class='add'>+#define GICV5_IRS_CR1_VPET_RA		BIT(10)</div><div class='add'>+#define GICV5_IRS_CR1_VMT_WA		BIT(9)</div><div class='add'>+#define GICV5_IRS_CR1_VMT_RA		BIT(8)</div><div class='add'>+#define GICV5_IRS_CR1_IST_WA		BIT(7)</div><div class='add'>+#define GICV5_IRS_CR1_IST_RA		BIT(6)</div><div class='add'>+#define GICV5_IRS_CR1_IC		GENMASK(5, 4)</div><div class='add'>+#define GICV5_IRS_CR1_OC		GENMASK(3, 2)</div><div class='add'>+#define GICV5_IRS_CR1_SH		GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_SYNCR_SYNC		BIT(31)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_SYNC_STATUSR_IDLE	BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_SPI_STATUSR_V		BIT(1)</div><div class='add'>+#define GICV5_IRS_SPI_STATUSR_IDLE	BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_SPI_SELR_ID		GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_SPI_CFGR_TM		BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_PE_SELR_IAFFID	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_PE_STATUSR_V		BIT(1)</div><div class='add'>+#define GICV5_IRS_PE_STATUSR_IDLE	BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_PE_CR0_DPS		BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IST_STATUSR_IDLE	BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IST_CFGR_STRUCTURE	BIT(16)</div><div class='add'>+#define GICV5_IRS_IST_CFGR_ISTSZ	GENMASK(8, 7)</div><div class='add'>+#define GICV5_IRS_IST_CFGR_L2SZ		GENMASK(6, 5)</div><div class='add'>+#define GICV5_IRS_IST_CFGR_LPI_ID_BITS	GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IST_CFGR_STRUCTURE_LINEAR	0b0</div><div class='add'>+#define GICV5_IRS_IST_CFGR_STRUCTURE_TWO_LEVEL	0b1</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IST_CFGR_ISTSZ_4	0b00</div><div class='add'>+#define GICV5_IRS_IST_CFGR_ISTSZ_8	0b01</div><div class='add'>+#define GICV5_IRS_IST_CFGR_ISTSZ_16	0b10</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IST_CFGR_L2SZ_4K	0b00</div><div class='add'>+#define GICV5_IRS_IST_CFGR_L2SZ_16K	0b01</div><div class='add'>+#define GICV5_IRS_IST_CFGR_L2SZ_64K	0b10</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_IST_BASER_ADDR_MASK	GENMASK_ULL(55, 6)</div><div class='add'>+#define GICV5_IRS_IST_BASER_VALID	BIT_ULL(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IRS_MAP_L2_ISTR_ID	GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ISTL1E_VALID		BIT_ULL(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ISTL1E_L2_ADDR_MASK	GENMASK_ULL(55, 12)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ITS registers and tables structures</div><div class='add'>+ */</div><div class='add'>+#define GICV5_ITS_IDR1		0x0004</div><div class='add'>+#define GICV5_ITS_IDR2		0x0008</div><div class='add'>+#define GICV5_ITS_CR0		0x0080</div><div class='add'>+#define GICV5_ITS_CR1		0x0084</div><div class='add'>+#define GICV5_ITS_DT_BASER	0x00c0</div><div class='add'>+#define GICV5_ITS_DT_CFGR	0x00d0</div><div class='add'>+#define GICV5_ITS_DIDR		0x0100</div><div class='add'>+#define GICV5_ITS_EIDR		0x0108</div><div class='add'>+#define GICV5_ITS_INV_EVENTR	0x010c</div><div class='add'>+#define GICV5_ITS_INV_DEVICER	0x0110</div><div class='add'>+#define GICV5_ITS_STATUSR	0x0120</div><div class='add'>+#define GICV5_ITS_SYNCR		0x0140</div><div class='add'>+#define GICV5_ITS_SYNC_STATUSR	0x0148</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_IDR1_L2SZ			GENMASK(10, 8)</div><div class='add'>+#define GICV5_ITS_IDR1_ITT_LEVELS		BIT(7)</div><div class='add'>+#define GICV5_ITS_IDR1_DT_LEVELS		BIT(6)</div><div class='add'>+#define GICV5_ITS_IDR1_DEVICEID_BITS		GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_IDR1_L2SZ_SUPPORT_4KB(r)	FIELD_GET(BIT(8), (r))</div><div class='add'>+#define GICV5_ITS_IDR1_L2SZ_SUPPORT_16KB(r)	FIELD_GET(BIT(9), (r))</div><div class='add'>+#define GICV5_ITS_IDR1_L2SZ_SUPPORT_64KB(r)	FIELD_GET(BIT(10), (r))</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_IDR2_XDMN_EVENTs		GENMASK(6, 5)</div><div class='add'>+#define GICV5_ITS_IDR2_EVENTID_BITS		GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_CR0_IDLE			BIT(1)</div><div class='add'>+#define GICV5_ITS_CR0_ITSEN			BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_CR1_ITT_RA			BIT(7)</div><div class='add'>+#define GICV5_ITS_CR1_DT_RA			BIT(6)</div><div class='add'>+#define GICV5_ITS_CR1_IC			GENMASK(5, 4)</div><div class='add'>+#define GICV5_ITS_CR1_OC			GENMASK(3, 2)</div><div class='add'>+#define GICV5_ITS_CR1_SH			GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_DT_CFGR_STRUCTURE		BIT(16)</div><div class='add'>+#define GICV5_ITS_DT_CFGR_L2SZ			GENMASK(7, 6)</div><div class='add'>+#define GICV5_ITS_DT_CFGR_DEVICEID_BITS		GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_DT_BASER_ADDR_MASK		GENMASK_ULL(55, 3)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_INV_DEVICER_I			BIT(31)</div><div class='add'>+#define GICV5_ITS_INV_DEVICER_EVENTID_BITS	GENMASK(5, 1)</div><div class='add'>+#define GICV5_ITS_INV_DEVICER_L1		BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_DIDR_DEVICEID			GENMASK_ULL(31, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_EIDR_EVENTID			GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_INV_EVENTR_I			BIT(31)</div><div class='add'>+#define GICV5_ITS_INV_EVENTR_ITT_L2SZ		GENMASK(2, 1)</div><div class='add'>+#define GICV5_ITS_INV_EVENTR_L1			BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_STATUSR_IDLE			BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_SYNCR_SYNC			BIT_ULL(63)</div><div class='add'>+#define GICV5_ITS_SYNCR_SYNCALL			BIT_ULL(32)</div><div class='add'>+#define GICV5_ITS_SYNCR_DEVICEID		GENMASK_ULL(31, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_SYNC_STATUSR_IDLE		BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_DTL1E_VALID			BIT_ULL(0)</div><div class='add'>+/* Note that there is no shift for the address by design */</div><div class='add'>+#define GICV5_DTL1E_L2_ADDR_MASK		GENMASK_ULL(55, 3)</div><div class='add'>+#define GICV5_DTL1E_SPAN			GENMASK_ULL(63, 60)</div><div class='add'>+</div><div class='add'>+#define GICV5_DTL2E_VALID			BIT_ULL(0)</div><div class='add'>+#define GICV5_DTL2E_ITT_L2SZ			GENMASK_ULL(2, 1)</div><div class='add'>+/* Note that there is no shift for the address by design */</div><div class='add'>+#define GICV5_DTL2E_ITT_ADDR_MASK		GENMASK_ULL(55, 3)</div><div class='add'>+#define GICV5_DTL2E_ITT_DSWE			BIT_ULL(57)</div><div class='add'>+#define GICV5_DTL2E_ITT_STRUCTURE		BIT_ULL(58)</div><div class='add'>+#define GICV5_DTL2E_EVENT_ID_BITS		GENMASK_ULL(63, 59)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITTL1E_VALID			BIT_ULL(0)</div><div class='add'>+/* Note that there is no shift for the address by design */</div><div class='add'>+#define GICV5_ITTL1E_L2_ADDR_MASK		GENMASK_ULL(55, 3)</div><div class='add'>+#define GICV5_ITTL1E_SPAN			GENMASK_ULL(63, 60)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITTL2E_LPI_ID			GENMASK_ULL(23, 0)</div><div class='add'>+#define GICV5_ITTL2E_DAC			GENMASK_ULL(29, 28)</div><div class='add'>+#define GICV5_ITTL2E_VIRTUAL			BIT_ULL(30)</div><div class='add'>+#define GICV5_ITTL2E_VALID			BIT_ULL(31)</div><div class='add'>+#define GICV5_ITTL2E_VM_ID			GENMASK_ULL(47, 32)</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_DT_ITT_CFGR_L2SZ_4k		0b00</div><div class='add'>+#define GICV5_ITS_DT_ITT_CFGR_L2SZ_16k		0b01</div><div class='add'>+#define GICV5_ITS_DT_ITT_CFGR_L2SZ_64k		0b10</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_DT_ITT_CFGR_STRUCTURE_LINEAR		0</div><div class='add'>+#define GICV5_ITS_DT_ITT_CFGR_STRUCTURE_TWO_LEVEL	1</div><div class='add'>+</div><div class='add'>+#define GICV5_ITS_HWIRQ_DEVICE_ID		GENMASK_ULL(31, 0)</div><div class='add'>+#define GICV5_ITS_HWIRQ_EVENT_ID		GENMASK_ULL(63, 32)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IWB registers</div><div class='add'>+ */</div><div class='add'>+#define GICV5_IWB_IDR0				0x0000</div><div class='add'>+#define GICV5_IWB_CR0				0x0080</div><div class='add'>+#define GICV5_IWB_WENABLE_STATUSR		0x00c0</div><div class='add'>+#define GICV5_IWB_WENABLER			0x2000</div><div class='add'>+#define GICV5_IWB_WTMR				0x4000</div><div class='add'>+</div><div class='add'>+#define GICV5_IWB_IDR0_INT_DOMS			GENMASK(14, 11)</div><div class='add'>+#define GICV5_IWB_IDR0_IW_RANGE			GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IWB_CR0_IDLE			BIT(1)</div><div class='add'>+#define GICV5_IWB_CR0_IWBEN			BIT(0)</div><div class='add'>+</div><div class='add'>+#define GICV5_IWB_WENABLE_STATUSR_IDLE		BIT(0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global Data structures and functions</div><div class='add'>+ */</div><div class='add'>+struct gicv5_chip_data {</div><div class='add'>+	struct fwnode_handle	*fwnode;</div><div class='add'>+	struct irq_domain	*ppi_domain;</div><div class='add'>+	struct irq_domain	*spi_domain;</div><div class='add'>+	struct irq_domain	*lpi_domain;</div><div class='add'>+	struct irq_domain	*ipi_domain;</div><div class='add'>+	u32			global_spi_count;</div><div class='add'>+	u8			cpuif_pri_bits;</div><div class='add'>+	u8			cpuif_id_bits;</div><div class='add'>+	u8			irs_pri_bits;</div><div class='add'>+	struct {</div><div class='add'>+		__le64 *l1ist_addr;</div><div class='add'>+		u32 l2_size;</div><div class='add'>+		u8 l2_bits;</div><div class='add'>+		bool l2;</div><div class='add'>+	} ist;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct gicv5_chip_data gicv5_global_data __read_mostly;</div><div class='add'>+</div><div class='add'>+struct gicv5_irs_chip_data {</div><div class='add'>+	struct list_head	entry;</div><div class='add'>+	struct fwnode_handle	*fwnode;</div><div class='add'>+	void __iomem		*irs_base;</div><div class='add'>+	u32			flags;</div><div class='add'>+	u32			spi_min;</div><div class='add'>+	u32			spi_range;</div><div class='add'>+	raw_spinlock_t		spi_config_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int gicv5_wait_for_op_s_atomic(void __iomem *addr, u32 offset,</div><div class='add'>+					     const char *reg_s, u32 mask,</div><div class='add'>+					     u32 *val)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg = addr + offset;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = readl_poll_timeout_atomic(reg, tmp, tmp &amp; mask, 1, 10 * USEC_PER_MSEC);</div><div class='add'>+	if (unlikely(ret == -ETIMEDOUT)) {</div><div class='add'>+		pr_err_ratelimited("%s timeout...\n", reg_s);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val)</div><div class='add'>+		*val = tmp;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gicv5_wait_for_op_s(void __iomem *addr, u32 offset,</div><div class='add'>+				      const char *reg_s, u32 mask)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg = addr + offset;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = readl_poll_timeout(reg, val, val &amp; mask, 1, 10 * USEC_PER_MSEC);</div><div class='add'>+	if (unlikely(ret == -ETIMEDOUT)) {</div><div class='add'>+		pr_err_ratelimited("%s timeout...\n", reg_s);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define gicv5_wait_for_op_atomic(base, reg, mask, val) \</div><div class='add'>+	gicv5_wait_for_op_s_atomic(base, reg, #reg, mask, val)</div><div class='add'>+</div><div class='add'>+#define gicv5_wait_for_op(base, reg, mask) \</div><div class='add'>+	gicv5_wait_for_op_s(base, reg, #reg, mask)</div><div class='add'>+</div><div class='add'>+void __init gicv5_init_lpi_domain(void);</div><div class='add'>+void __init gicv5_free_lpi_domain(void);</div><div class='add'>+</div><div class='add'>+int gicv5_irs_of_probe(struct device_node *parent);</div><div class='add'>+void gicv5_irs_remove(void);</div><div class='add'>+int gicv5_irs_enable(void);</div><div class='add'>+void gicv5_irs_its_probe(void);</div><div class='add'>+int gicv5_irs_register_cpu(int cpuid);</div><div class='add'>+int gicv5_irs_cpu_to_iaffid(int cpu_id, u16 *iaffid);</div><div class='add'>+struct gicv5_irs_chip_data *gicv5_irs_lookup_by_spi_id(u32 spi_id);</div><div class='add'>+int gicv5_spi_irq_set_type(struct irq_data *d, unsigned int type);</div><div class='add'>+int gicv5_irs_iste_alloc(u32 lpi);</div><div class='add'>+void gicv5_irs_syncr(void);</div><div class='add'>+</div><div class='add'>+struct gicv5_its_devtab_cfg {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__le64	*devtab;</div><div class='add'>+		} linear;</div><div class='add'>+		struct {</div><div class='add'>+			__le64	*l1devtab;</div><div class='add'>+			__le64	**l2ptrs;</div><div class='add'>+		} l2;</div><div class='add'>+	};</div><div class='add'>+	u32	cfgr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gicv5_its_itt_cfg {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__le64		*itt;</div><div class='add'>+			unsigned int	num_ents;</div><div class='add'>+		} linear;</div><div class='add'>+		struct {</div><div class='add'>+			__le64		*l1itt;</div><div class='add'>+			__le64		**l2ptrs;</div><div class='add'>+			unsigned int	num_l1_ents;</div><div class='add'>+			u8		l2sz;</div><div class='add'>+		} l2;</div><div class='add'>+	};</div><div class='add'>+	u8	event_id_bits;</div><div class='add'>+	bool	l2itt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void gicv5_init_lpis(u32 max);</div><div class='add'>+void gicv5_deinit_lpis(void);</div><div class='add'>+</div><div class='add'>+int gicv5_alloc_lpi(void);</div><div class='add'>+void gicv5_free_lpi(u32 lpi);</div><div class='add'>+</div><div class='add'>+void __init gicv5_its_of_probe(struct device_node *parent);</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h<br/>index 2223f95079ce..d45fa19f9e47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-gic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-gic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/arm-gic.h</a></div><div class='hunk'>@@ -86,7 +86,13 @@</div><div class='ctx'> </div><div class='ctx'> #define GICH_HCR_EN			(1 &lt;&lt; 0)</div><div class='ctx'> #define GICH_HCR_UIE			(1 &lt;&lt; 1)</div><div class='add'>+#define GICH_HCR_LRENPIE		(1 &lt;&lt; 2)</div><div class='ctx'> #define GICH_HCR_NPIE			(1 &lt;&lt; 3)</div><div class='add'>+#define GICH_HCR_VGrp0EIE		(1 &lt;&lt; 4)</div><div class='add'>+#define GICH_HCR_VGrp0DIE		(1 &lt;&lt; 5)</div><div class='add'>+#define GICH_HCR_VGrp1EIE		(1 &lt;&lt; 6)</div><div class='add'>+#define GICH_HCR_VGrp1DIE		(1 &lt;&lt; 7)</div><div class='add'>+#define GICH_HCR_EOICOUNT		GENMASK(31, 27)</div><div class='ctx'> </div><div class='ctx'> #define GICH_LR_VIRTUALID		(0x3ff &lt;&lt; 0)</div><div class='ctx'> #define GICH_LR_PHYSID_CPUID_SHIFT	(10)</div><div class='head'>diff --git a/include/linux/irqchip/arm-vgic-info.h b/include/linux/irqchip/arm-vgic-info.h<br/>index a75b2c7de69d..67d9d960273b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-vgic-info.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/arm-vgic-info.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/arm-vgic-info.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/arm-vgic-info.h</a></div><div class='hunk'>@@ -15,6 +15,8 @@ enum gic_type {</div><div class='ctx'> 	GIC_V2,</div><div class='ctx'> 	/* Full GICv3, optionally with v2 compat */</div><div class='ctx'> 	GIC_V3,</div><div class='add'>+	/* Full GICv5, optionally with v3 compat */</div><div class='add'>+	GIC_V5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gic_kvm_info {</div><div class='hunk'>@@ -22,6 +24,8 @@ struct gic_kvm_info {</div><div class='ctx'> 	enum gic_type	type;</div><div class='ctx'> 	/* Virtual CPU interface */</div><div class='ctx'> 	struct resource vcpu;</div><div class='add'>+	/* GICv2 GICC VA */</div><div class='add'>+	void __iomem	*gicc_base;</div><div class='ctx'> 	/* Interrupt number */</div><div class='ctx'> 	unsigned int	maint_irq;</div><div class='ctx'> 	/* No interrupt mask, no need to use the above field */</div><div class='head'>diff --git a/include/linux/irqchip/irq-davinci-aintc.h b/include/linux/irqchip/irq-davinci-aintc.h<br/>deleted file mode 100644<br/>index ea4e087fac98..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/irq-davinci-aintc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/irq-davinci-aintc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2019 Texas Instruments</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_IRQ_DAVINCI_AINTC_</div><div class='del'>-#define _LINUX_IRQ_DAVINCI_AINTC_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct davinci_aintc_config - configuration data for davinci-aintc driver.</div><div class='del'>- *</div><div class='del'>- * @reg: register range to map</div><div class='del'>- * @num_irqs: number of HW interrupts supported by the controller</div><div class='del'>- * @prios: an array of size num_irqs containing priority settings for</div><div class='del'>- *         each interrupt</div><div class='del'>- */</div><div class='del'>-struct davinci_aintc_config {</div><div class='del'>-	struct resource reg;</div><div class='del'>-	unsigned int num_irqs;</div><div class='del'>-	u8 *prios;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void davinci_aintc_init(const struct davinci_aintc_config *config);</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_IRQ_DAVINCI_AINTC_ */</div><div class='head'>diff --git a/include/linux/irqchip/irq-davinci-cp-intc.h b/include/linux/irqchip/irq-davinci-cp-intc.h<br/>deleted file mode 100644<br/>index 8d71ed5b5a61..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/irq-davinci-cp-intc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/irq-davinci-cp-intc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2019 Texas Instruments</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_IRQ_DAVINCI_CP_INTC_</div><div class='del'>-#define _LINUX_IRQ_DAVINCI_CP_INTC_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct davinci_cp_intc_config - configuration data for davinci-cp-intc</div><div class='del'>- *                                 driver.</div><div class='del'>- *</div><div class='del'>- * @reg: register range to map</div><div class='del'>- * @num_irqs: number of HW interrupts supported by the controller</div><div class='del'>- */</div><div class='del'>-struct davinci_cp_intc_config {</div><div class='del'>-	struct resource reg;</div><div class='del'>-	unsigned int num_irqs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int davinci_cp_intc_init(const struct davinci_cp_intc_config *config);</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_IRQ_DAVINCI_CP_INTC_ */</div><div class='head'>diff --git a/include/linux/irqchip/irq-msi-lib.h b/include/linux/irqchip/irq-msi-lib.h<br/>new file mode 100644<br/>index 000000000000..224ac28e88d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/irq-msi-lib.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/irq-msi-lib.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright (C) 2022 Linutronix GmbH</div><div class='add'>+// Copyright (C) 2022 Intel</div><div class='add'>+</div><div class='add'>+#ifndef _IRQCHIP_IRQ_MSI_LIB_H</div><div class='add'>+#define _IRQCHIP_IRQ_MSI_LIB_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/msi.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+#define MATCH_PCI_MSI		BIT(DOMAIN_BUS_PCI_MSI)</div><div class='add'>+#else</div><div class='add'>+#define MATCH_PCI_MSI		(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define MATCH_PLATFORM_MSI	BIT(DOMAIN_BUS_PLATFORM_MSI)</div><div class='add'>+</div><div class='add'>+struct msi_domain_info;</div><div class='add'>+int msi_lib_irq_domain_select(struct irq_domain *d, struct irq_fwspec *fwspec,</div><div class='add'>+			      enum irq_domain_bus_token bus_token);</div><div class='add'>+</div><div class='add'>+bool msi_lib_init_dev_msi_info(struct device *dev, struct irq_domain *domain,</div><div class='add'>+			       struct irq_domain *real_parent,</div><div class='add'>+			       struct msi_domain_info *info);</div><div class='add'>+</div><div class='add'>+#endif /* _IRQCHIP_IRQ_MSI_LIB_H */</div><div class='head'>diff --git a/include/linux/irqchip/irq-partition-percpu.h b/include/linux/irqchip/irq-partition-percpu.h<br/>deleted file mode 100644<br/>index 2f6ae7551748..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/irq-partition-percpu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqchip/irq-partition-percpu.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2016 ARM Limited, All Rights Reserved.</div><div class='del'>- * Author: Marc Zyngier &lt;marc.zyngier@arm.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_IRQCHIP_IRQ_PARTITION_PERCPU_H</div><div class='del'>-#define __LINUX_IRQCHIP_IRQ_PARTITION_PERCPU_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fwnode.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='del'>-#include &lt;linux/irqdomain.h&gt;</div><div class='del'>-</div><div class='del'>-struct partition_affinity {</div><div class='del'>-	cpumask_t			mask;</div><div class='del'>-	void				*partition_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct partition_desc;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PARTITION_PERCPU</div><div class='del'>-int partition_translate_id(struct partition_desc *desc, void *partition_id);</div><div class='del'>-struct partition_desc *partition_create_desc(struct fwnode_handle *fwnode,</div><div class='del'>-					     struct partition_affinity *parts,</div><div class='del'>-					     int nr_parts,</div><div class='del'>-					     int chained_irq,</div><div class='del'>-					     const struct irq_domain_ops *ops);</div><div class='del'>-struct irq_domain *partition_get_domain(struct partition_desc *dsc);</div><div class='del'>-#else</div><div class='del'>-static inline int partition_translate_id(struct partition_desc *desc,</div><div class='del'>-					 void *partition_id)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-struct partition_desc *partition_create_desc(struct fwnode_handle *fwnode,</div><div class='del'>-					     struct partition_affinity *parts,</div><div class='del'>-					     int nr_parts,</div><div class='del'>-					     int chained_irq,</div><div class='del'>-					     const struct irq_domain_ops *ops)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-struct irq_domain *partition_get_domain(struct partition_desc *dsc)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* __LINUX_IRQCHIP_IRQ_PARTITION_PERCPU_H */</div><div class='head'>diff --git a/include/linux/irqchip/irq-renesas-rzv2h.h b/include/linux/irqchip/irq-renesas-rzv2h.h<br/>new file mode 100644<br/>index 000000000000..618a60d2eac0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/irq-renesas-rzv2h.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/irq-renesas-rzv2h.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Renesas RZ/V2H(P) Interrupt Control Unit (ICU)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Renesas Electronics Corporation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_IRQ_RENESAS_RZV2H</div><div class='add'>+#define __LINUX_IRQ_RENESAS_RZV2H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#define RZV2H_ICU_DMAC_REQ_NO_DEFAULT		0x3ff</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RENESAS_RZV2H_ICU</div><div class='add'>+void rzv2h_icu_register_dma_req(struct platform_device *icu_dev, u8 dmac_index, u8 dmac_channel,</div><div class='add'>+				u16 req_no);</div><div class='add'>+#else</div><div class='add'>+static inline void rzv2h_icu_register_dma_req(struct platform_device *icu_dev, u8 dmac_index,</div><div class='add'>+					      u8 dmac_channel, u16 req_no) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_IRQ_RENESAS_RZV2H */</div><div class='head'>diff --git a/include/linux/irqchip/riscv-aplic.h b/include/linux/irqchip/riscv-aplic.h<br/>new file mode 100644<br/>index 000000000000..ec8f7df50583<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/riscv-aplic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/riscv-aplic.h</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Western Digital Corporation or its affiliates.</div><div class='add'>+ * Copyright (C) 2022 Ventana Micro Systems Inc.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_IRQCHIP_RISCV_APLIC_H</div><div class='add'>+#define __LINUX_IRQCHIP_RISCV_APLIC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#define APLIC_MAX_IDC			BIT(14)</div><div class='add'>+#define APLIC_MAX_SOURCE		1024</div><div class='add'>+</div><div class='add'>+#define APLIC_DOMAINCFG			0x0000</div><div class='add'>+#define APLIC_DOMAINCFG_RDONLY		0x80000000</div><div class='add'>+#define APLIC_DOMAINCFG_IE		BIT(8)</div><div class='add'>+#define APLIC_DOMAINCFG_DM		BIT(2)</div><div class='add'>+#define APLIC_DOMAINCFG_BE		BIT(0)</div><div class='add'>+</div><div class='add'>+#define APLIC_SOURCECFG_BASE		0x0004</div><div class='add'>+#define APLIC_SOURCECFG_D		BIT(10)</div><div class='add'>+#define APLIC_SOURCECFG_CHILDIDX_MASK	0x000003ff</div><div class='add'>+#define APLIC_SOURCECFG_SM_MASK	0x00000007</div><div class='add'>+#define APLIC_SOURCECFG_SM_INACTIVE	0x0</div><div class='add'>+#define APLIC_SOURCECFG_SM_DETACH	0x1</div><div class='add'>+#define APLIC_SOURCECFG_SM_EDGE_RISE	0x4</div><div class='add'>+#define APLIC_SOURCECFG_SM_EDGE_FALL	0x5</div><div class='add'>+#define APLIC_SOURCECFG_SM_LEVEL_HIGH	0x6</div><div class='add'>+#define APLIC_SOURCECFG_SM_LEVEL_LOW	0x7</div><div class='add'>+</div><div class='add'>+#define APLIC_MMSICFGADDR		0x1bc0</div><div class='add'>+#define APLIC_MMSICFGADDRH		0x1bc4</div><div class='add'>+#define APLIC_SMSICFGADDR		0x1bc8</div><div class='add'>+#define APLIC_SMSICFGADDRH		0x1bcc</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RISCV_M_MODE</div><div class='add'>+#define APLIC_xMSICFGADDR		APLIC_MMSICFGADDR</div><div class='add'>+#define APLIC_xMSICFGADDRH		APLIC_MMSICFGADDRH</div><div class='add'>+#else</div><div class='add'>+#define APLIC_xMSICFGADDR		APLIC_SMSICFGADDR</div><div class='add'>+#define APLIC_xMSICFGADDRH		APLIC_SMSICFGADDRH</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define APLIC_xMSICFGADDRH_L		BIT(31)</div><div class='add'>+#define APLIC_xMSICFGADDRH_HHXS_MASK	0x1f</div><div class='add'>+#define APLIC_xMSICFGADDRH_HHXS_SHIFT	24</div><div class='add'>+#define APLIC_xMSICFGADDRH_HHXS		(APLIC_xMSICFGADDRH_HHXS_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_xMSICFGADDRH_HHXS_SHIFT)</div><div class='add'>+#define APLIC_xMSICFGADDRH_LHXS_MASK	0x7</div><div class='add'>+#define APLIC_xMSICFGADDRH_LHXS_SHIFT	20</div><div class='add'>+#define APLIC_xMSICFGADDRH_LHXS		(APLIC_xMSICFGADDRH_LHXS_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_xMSICFGADDRH_LHXS_SHIFT)</div><div class='add'>+#define APLIC_xMSICFGADDRH_HHXW_MASK	0x7</div><div class='add'>+#define APLIC_xMSICFGADDRH_HHXW_SHIFT	16</div><div class='add'>+#define APLIC_xMSICFGADDRH_HHXW		(APLIC_xMSICFGADDRH_HHXW_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_xMSICFGADDRH_HHXW_SHIFT)</div><div class='add'>+#define APLIC_xMSICFGADDRH_LHXW_MASK	0xf</div><div class='add'>+#define APLIC_xMSICFGADDRH_LHXW_SHIFT	12</div><div class='add'>+#define APLIC_xMSICFGADDRH_LHXW		(APLIC_xMSICFGADDRH_LHXW_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_xMSICFGADDRH_LHXW_SHIFT)</div><div class='add'>+#define APLIC_xMSICFGADDRH_BAPPN_MASK	0xfff</div><div class='add'>+#define APLIC_xMSICFGADDRH_BAPPN_SHIFT	0</div><div class='add'>+#define APLIC_xMSICFGADDRH_BAPPN	(APLIC_xMSICFGADDRH_BAPPN_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_xMSICFGADDRH_BAPPN_SHIFT)</div><div class='add'>+</div><div class='add'>+#define APLIC_xMSICFGADDR_PPN_SHIFT	12</div><div class='add'>+</div><div class='add'>+#define APLIC_xMSICFGADDR_PPN_HART(__lhxs) \</div><div class='add'>+	(BIT(__lhxs) - 1)</div><div class='add'>+</div><div class='add'>+#define APLIC_xMSICFGADDR_PPN_LHX_MASK(__lhxw) \</div><div class='add'>+	(BIT(__lhxw) - 1)</div><div class='add'>+#define APLIC_xMSICFGADDR_PPN_LHX_SHIFT(__lhxs) \</div><div class='add'>+	((__lhxs))</div><div class='add'>+#define APLIC_xMSICFGADDR_PPN_LHX(__lhxw, __lhxs) \</div><div class='add'>+	(APLIC_xMSICFGADDR_PPN_LHX_MASK(__lhxw) &lt;&lt; \</div><div class='add'>+	 APLIC_xMSICFGADDR_PPN_LHX_SHIFT(__lhxs))</div><div class='add'>+</div><div class='add'>+#define APLIC_xMSICFGADDR_PPN_HHX_MASK(__hhxw) \</div><div class='add'>+	(BIT(__hhxw) - 1)</div><div class='add'>+#define APLIC_xMSICFGADDR_PPN_HHX_SHIFT(__hhxs) \</div><div class='add'>+	((__hhxs) + APLIC_xMSICFGADDR_PPN_SHIFT)</div><div class='add'>+#define APLIC_xMSICFGADDR_PPN_HHX(__hhxw, __hhxs) \</div><div class='add'>+	(APLIC_xMSICFGADDR_PPN_HHX_MASK(__hhxw) &lt;&lt; \</div><div class='add'>+	 APLIC_xMSICFGADDR_PPN_HHX_SHIFT(__hhxs))</div><div class='add'>+</div><div class='add'>+#define APLIC_IRQBITS_PER_REG		32</div><div class='add'>+</div><div class='add'>+#define APLIC_SETIP_BASE		0x1c00</div><div class='add'>+#define APLIC_SETIPNUM			0x1cdc</div><div class='add'>+</div><div class='add'>+#define APLIC_CLRIP_BASE		0x1d00</div><div class='add'>+#define APLIC_CLRIPNUM			0x1ddc</div><div class='add'>+</div><div class='add'>+#define APLIC_SETIE_BASE		0x1e00</div><div class='add'>+#define APLIC_SETIENUM			0x1edc</div><div class='add'>+</div><div class='add'>+#define APLIC_CLRIE_BASE		0x1f00</div><div class='add'>+#define APLIC_CLRIENUM			0x1fdc</div><div class='add'>+</div><div class='add'>+#define APLIC_SETIPNUM_LE		0x2000</div><div class='add'>+#define APLIC_SETIPNUM_BE		0x2004</div><div class='add'>+</div><div class='add'>+#define APLIC_GENMSI			0x3000</div><div class='add'>+</div><div class='add'>+#define APLIC_TARGET_BASE		0x3004</div><div class='add'>+#define APLIC_TARGET_HART_IDX_SHIFT	18</div><div class='add'>+#define APLIC_TARGET_HART_IDX_MASK	0x3fff</div><div class='add'>+#define APLIC_TARGET_HART_IDX		(APLIC_TARGET_HART_IDX_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_TARGET_HART_IDX_SHIFT)</div><div class='add'>+#define APLIC_TARGET_GUEST_IDX_SHIFT	12</div><div class='add'>+#define APLIC_TARGET_GUEST_IDX_MASK	0x3f</div><div class='add'>+#define APLIC_TARGET_GUEST_IDX		(APLIC_TARGET_GUEST_IDX_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_TARGET_GUEST_IDX_SHIFT)</div><div class='add'>+#define APLIC_TARGET_IPRIO_SHIFT	0</div><div class='add'>+#define APLIC_TARGET_IPRIO_MASK		0xff</div><div class='add'>+#define APLIC_TARGET_IPRIO		(APLIC_TARGET_IPRIO_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_TARGET_IPRIO_SHIFT)</div><div class='add'>+#define APLIC_TARGET_EIID_SHIFT		0</div><div class='add'>+#define APLIC_TARGET_EIID_MASK		0x7ff</div><div class='add'>+#define APLIC_TARGET_EIID		(APLIC_TARGET_EIID_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_TARGET_EIID_SHIFT)</div><div class='add'>+</div><div class='add'>+#define APLIC_IDC_BASE			0x4000</div><div class='add'>+#define APLIC_IDC_SIZE			32</div><div class='add'>+</div><div class='add'>+#define APLIC_IDC_IDELIVERY		0x00</div><div class='add'>+</div><div class='add'>+#define APLIC_IDC_IFORCE		0x04</div><div class='add'>+</div><div class='add'>+#define APLIC_IDC_ITHRESHOLD		0x08</div><div class='add'>+</div><div class='add'>+#define APLIC_IDC_TOPI			0x18</div><div class='add'>+#define APLIC_IDC_TOPI_ID_SHIFT		16</div><div class='add'>+#define APLIC_IDC_TOPI_ID_MASK		0x3ff</div><div class='add'>+#define APLIC_IDC_TOPI_ID		(APLIC_IDC_TOPI_ID_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_IDC_TOPI_ID_SHIFT)</div><div class='add'>+#define APLIC_IDC_TOPI_PRIO_SHIFT	0</div><div class='add'>+#define APLIC_IDC_TOPI_PRIO_MASK	0xff</div><div class='add'>+#define APLIC_IDC_TOPI_PRIO		(APLIC_IDC_TOPI_PRIO_MASK &lt;&lt; \</div><div class='add'>+					 APLIC_IDC_TOPI_PRIO_SHIFT)</div><div class='add'>+</div><div class='add'>+#define APLIC_IDC_CLAIMI		0x1c</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/irqchip/riscv-imsic.h b/include/linux/irqchip/riscv-imsic.h<br/>new file mode 100644<br/>index 000000000000..7f3ff5c5ea53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqchip/riscv-imsic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqchip/riscv-imsic.h</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Western Digital Corporation or its affiliates.</div><div class='add'>+ * Copyright (C) 2022 Ventana Micro Systems Inc.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_IRQCHIP_RISCV_IMSIC_H</div><div class='add'>+#define __LINUX_IRQCHIP_RISCV_IMSIC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/fwnode.h&gt;</div><div class='add'>+</div><div class='add'>+#define IMSIC_MMIO_PAGE_SHIFT		12</div><div class='add'>+#define IMSIC_MMIO_PAGE_SZ		BIT(IMSIC_MMIO_PAGE_SHIFT)</div><div class='add'>+#define IMSIC_MMIO_PAGE_LE		0x00</div><div class='add'>+#define IMSIC_MMIO_PAGE_BE		0x04</div><div class='add'>+</div><div class='add'>+#define IMSIC_MIN_ID			63</div><div class='add'>+#define IMSIC_MAX_ID			2048</div><div class='add'>+</div><div class='add'>+#define IMSIC_EIDELIVERY		0x70</div><div class='add'>+</div><div class='add'>+#define IMSIC_EITHRESHOLD		0x72</div><div class='add'>+</div><div class='add'>+#define IMSIC_EIP0			0x80</div><div class='add'>+#define IMSIC_EIP63			0xbf</div><div class='add'>+#define IMSIC_EIPx_BITS			32</div><div class='add'>+</div><div class='add'>+#define IMSIC_EIE0			0xc0</div><div class='add'>+#define IMSIC_EIE63			0xff</div><div class='add'>+#define IMSIC_EIEx_BITS			32</div><div class='add'>+</div><div class='add'>+#define IMSIC_FIRST			IMSIC_EIDELIVERY</div><div class='add'>+#define IMSIC_LAST			IMSIC_EIE63</div><div class='add'>+</div><div class='add'>+#define IMSIC_MMIO_SETIPNUM_LE		0x00</div><div class='add'>+#define IMSIC_MMIO_SETIPNUM_BE		0x04</div><div class='add'>+</div><div class='add'>+struct imsic_local_config {</div><div class='add'>+	phys_addr_t				msi_pa;</div><div class='add'>+	void __iomem				*msi_va;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct imsic_global_config {</div><div class='add'>+	/*</div><div class='add'>+	 * MSI Target Address Scheme</div><div class='add'>+	 *</div><div class='add'>+	 * XLEN-1                                                12     0</div><div class='add'>+	 * |                                                     |     |</div><div class='add'>+	 * -------------------------------------------------------------</div><div class='add'>+	 * |xxxxxx|Group Index|xxxxxxxxxxx|HART Index|Guest Index|  0  |</div><div class='add'>+	 * -------------------------------------------------------------</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Bits representing Guest index, HART index, and Group index */</div><div class='add'>+	u32					guest_index_bits;</div><div class='add'>+	u32					hart_index_bits;</div><div class='add'>+	u32					group_index_bits;</div><div class='add'>+	u32					group_index_shift;</div><div class='add'>+</div><div class='add'>+	/* Global base address matching all target MSI addresses */</div><div class='add'>+	phys_addr_t				base_addr;</div><div class='add'>+</div><div class='add'>+	/* Number of interrupt identities */</div><div class='add'>+	u32					nr_ids;</div><div class='add'>+</div><div class='add'>+	/* Number of guest interrupt identities */</div><div class='add'>+	u32					nr_guest_ids;</div><div class='add'>+</div><div class='add'>+	/* Per-CPU IMSIC addresses */</div><div class='add'>+	struct imsic_local_config __percpu	*local;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RISCV_IMSIC</div><div class='add'>+</div><div class='add'>+const struct imsic_global_config *imsic_get_global_config(void);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline const struct imsic_global_config *imsic_get_global_config(void)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_ACPI) &amp;&amp; IS_ENABLED(CONFIG_RISCV_IMSIC)</div><div class='add'>+int imsic_platform_acpi_probe(struct fwnode_handle *fwnode);</div><div class='add'>+struct fwnode_handle *imsic_acpi_get_fwnode(struct device *dev);</div><div class='add'>+#else</div><div class='add'>+static inline struct fwnode_handle *imsic_acpi_get_fwnode(struct device *dev) { return NULL; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h<br/>index d9451d456a73..37e0b5b5600a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqdesc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqdesc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqdesc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqdesc.h</a></div><div class='hunk'>@@ -18,6 +18,18 @@ struct irq_domain;</div><div class='ctx'> struct pt_regs;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct irqstat - interrupt statistics</div><div class='add'>+ * @cnt:	real-time interrupt count</div><div class='add'>+ * @ref:	snapshot of interrupt count</div><div class='add'>+ */</div><div class='add'>+struct irqstat {</div><div class='add'>+	unsigned int	cnt;</div><div class='add'>+#ifdef CONFIG_GENERIC_IRQ_STAT_SNAPSHOT</div><div class='add'>+	unsigned int	ref;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct irq_desc - interrupt descriptor</div><div class='ctx'>  * @irq_common_data:	per irq and chip data passed down to chip functions</div><div class='ctx'>  * @kstat_irqs:		irq stats per cpu</div><div class='hunk'>@@ -55,7 +67,7 @@ struct pt_regs;</div><div class='ctx'> struct irq_desc {</div><div class='ctx'> 	struct irq_common_data	irq_common_data;</div><div class='ctx'> 	struct irq_data		irq_data;</div><div class='del'>-	unsigned int __percpu	*kstat_irqs;</div><div class='add'>+	struct irqstat __percpu	*kstat_irqs;</div><div class='ctx'> 	irq_flow_handler_t	handle_irq;</div><div class='ctx'> 	struct irqaction	*action;	/* IRQ action list */</div><div class='ctx'> 	unsigned int		status_use_accessors;</div><div class='hunk'>@@ -70,7 +82,6 @@ struct irq_desc {</div><div class='ctx'> 	int			threads_handled_last;</div><div class='ctx'> 	raw_spinlock_t		lock;</div><div class='ctx'> 	struct cpumask		*percpu_enabled;</div><div class='del'>-	const struct cpumask	*percpu_affinity;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	const struct cpumask	*affinity_hint;</div><div class='ctx'> 	struct irq_affinity_notify *affinity_notify;</div><div class='hunk'>@@ -119,7 +130,7 @@ extern struct irq_desc irq_desc[NR_IRQS];</div><div class='ctx'> static inline unsigned int irq_desc_kstat_cpu(struct irq_desc *desc,</div><div class='ctx'> 					      unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	return desc-&gt;kstat_irqs ? *per_cpu_ptr(desc-&gt;kstat_irqs, cpu) : 0;</div><div class='add'>+	return desc-&gt;kstat_irqs ? per_cpu(desc-&gt;kstat_irqs-&gt;cnt, cpu) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct irq_desc *irq_data_to_desc(struct irq_data *data)</div><div class='head'>diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h<br/>index 21ecf582a0fe..952d3c8dd6b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqdomain.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqdomain.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqdomain.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqdomain.h</a></div><div class='hunk'>@@ -1,30 +1,8 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- * irq_domain - IRQ translation domains</div><div class='add'>+ * irq_domain - IRQ Translation Domains</div><div class='ctx'>  *</div><div class='del'>- * Translation infrastructure between hw and linux irq numbers.  This is</div><div class='del'>- * helpful for interrupt controllers to implement mapping between hardware</div><div class='del'>- * irq numbers and the Linux irq number space.</div><div class='del'>- *</div><div class='del'>- * irq_domains also have hooks for translating device tree or other</div><div class='del'>- * firmware interrupt representations into a hardware irq number that</div><div class='del'>- * can be mapped back to a Linux irq number without any extra platform</div><div class='del'>- * support code.</div><div class='del'>- *</div><div class='del'>- * Interrupt controller "domain" data structure. This could be defined as a</div><div class='del'>- * irq domain controller. That is, it handles the mapping between hardware</div><div class='del'>- * and virtual interrupt numbers for a given interrupt domain. The domain</div><div class='del'>- * structure is generally created by the PIC code for a given PIC instance</div><div class='del'>- * (though a domain can cover more than one PIC if they have a flat number</div><div class='del'>- * model). It's the domain callbacks that are responsible for setting the</div><div class='del'>- * irq_chip on a given irq_desc after it's been mapped.</div><div class='del'>- *</div><div class='del'>- * The host code and data structures use a fwnode_handle pointer to</div><div class='del'>- * identify the domain. In some cases, and in order to preserve source</div><div class='del'>- * code compatibility, this fwnode pointer is "upgraded" to a DT</div><div class='del'>- * device_node. For those firmware infrastructures that do not provide</div><div class='del'>- * a unique identifier for an interrupt controller, the irq_domain</div><div class='del'>- * code offers a fwnode allocator.</div><div class='add'>+ * See Documentation/core-api/irq/irq-domain.rst for the details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _LINUX_IRQDOMAIN_H</div><div class='hunk'>@@ -61,24 +39,57 @@ struct msi_parent_ops;</div><div class='ctx'>  * pass a device-specific description of an interrupt.</div><div class='ctx'>  */</div><div class='ctx'> struct irq_fwspec {</div><div class='del'>-	struct fwnode_handle *fwnode;</div><div class='del'>-	int param_count;</div><div class='del'>-	u32 param[IRQ_DOMAIN_IRQ_SPEC_PARAMS];</div><div class='add'>+	struct fwnode_handle	*fwnode;</div><div class='add'>+	int			param_count;</div><div class='add'>+	u32			param[IRQ_DOMAIN_IRQ_SPEC_PARAMS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct irq_fwspec_info - firmware provided IRQ information structure</div><div class='add'>+ *</div><div class='add'>+ * @flags:		Information validity flags</div><div class='add'>+ * @affinity:		Affinity mask for this interrupt</div><div class='add'>+ *</div><div class='add'>+ * This structure reports firmware-specific information about an</div><div class='add'>+ * interrupt. The only significant information is the affinity of a</div><div class='add'>+ * per-CPU interrupt, but this is designed to be extended as required.</div><div class='add'>+ */</div><div class='add'>+struct irq_fwspec_info {</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+	const struct cpumask	*affinity;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IRQ_FWSPEC_INFO_AFFINITY_VALID	BIT(0)</div><div class='add'>+</div><div class='ctx'> /* Conversion function from of_phandle_args fields to fwspec  */</div><div class='ctx'> void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args,</div><div class='ctx'> 			       unsigned int count, struct irq_fwspec *fwspec);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct irq_domain_ops - Methods for irq_domain objects</div><div class='del'>- * @match: Match an interrupt controller device node to a host, returns</div><div class='del'>- *         1 on a match</div><div class='del'>- * @map: Create or update a mapping between a virtual irq number and a hw</div><div class='del'>- *       irq number. This is called only once for a given mapping.</div><div class='del'>- * @unmap: Dispose of such a mapping</div><div class='del'>- * @xlate: Given a device tree node and interrupt specifier, decode</div><div class='del'>- *         the hardware irq number and linux irq type value.</div><div class='add'>+ * @match:	Match an interrupt controller device node to a domain, returns</div><div class='add'>+ *		1 on a match</div><div class='add'>+ * @select:	Match an interrupt controller fw specification. It is more generic</div><div class='add'>+ *		than @match as it receives a complete struct irq_fwspec. Therefore,</div><div class='add'>+ *		@select is preferred if provided. Returns 1 on a match.</div><div class='add'>+ * @map:	Create or update a mapping between a virtual irq number and a hw</div><div class='add'>+ *		irq number. This is called only once for a given mapping.</div><div class='add'>+ * @unmap:	Dispose of such a mapping</div><div class='add'>+ * @xlate:	Given a device tree node and interrupt specifier, decode</div><div class='add'>+ *		the hardware irq number and linux irq type value.</div><div class='add'>+ * @alloc:	Allocate @nr_irqs interrupts starting from @virq.</div><div class='add'>+ * @free:	Free @nr_irqs interrupts starting from @virq.</div><div class='add'>+ * @activate:	Activate one interrupt in HW (@irqd). If @reserve is set, only</div><div class='add'>+ *		reserve the vector. If unset, assign the vector (called from</div><div class='add'>+ *		request_irq()).</div><div class='add'>+ * @deactivate:	Disarm one interrupt (@irqd).</div><div class='add'>+ * @translate:	Given @fwspec, decode the hardware irq number (@out_hwirq) and</div><div class='add'>+ *		linux irq type value (@out_type). This is a generalised @xlate</div><div class='add'>+ *		(over struct irq_fwspec) and is preferred if provided.</div><div class='add'>+ * @get_fwspec_info:</div><div class='add'>+ *		Given @fwspec, report additional firmware-provided information in</div><div class='add'>+ *		@info. Optional.</div><div class='add'>+ * @debug_show:	For domains to show specific data for an interrupt in debugfs.</div><div class='ctx'>  *</div><div class='ctx'>  * Functions below are provided by the driver and called whenever a new mapping</div><div class='ctx'>  * is created or an old mapping is disposed. The driver can then proceed to</div><div class='hunk'>@@ -86,29 +97,30 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args,</div><div class='ctx'>  * to setup the irq_desc when returning from map().</div><div class='ctx'>  */</div><div class='ctx'> struct irq_domain_ops {</div><div class='del'>-	int (*match)(struct irq_domain *d, struct device_node *node,</div><div class='del'>-		     enum irq_domain_bus_token bus_token);</div><div class='del'>-	int (*select)(struct irq_domain *d, struct irq_fwspec *fwspec,</div><div class='del'>-		      enum irq_domain_bus_token bus_token);</div><div class='del'>-	int (*map)(struct irq_domain *d, unsigned int virq, irq_hw_number_t hw);</div><div class='del'>-	void (*unmap)(struct irq_domain *d, unsigned int virq);</div><div class='del'>-	int (*xlate)(struct irq_domain *d, struct device_node *node,</div><div class='del'>-		     const u32 *intspec, unsigned int intsize,</div><div class='del'>-		     unsigned long *out_hwirq, unsigned int *out_type);</div><div class='add'>+	int	(*match)(struct irq_domain *d, struct device_node *node,</div><div class='add'>+			 enum irq_domain_bus_token bus_token);</div><div class='add'>+	int	(*select)(struct irq_domain *d, struct irq_fwspec *fwspec,</div><div class='add'>+			  enum irq_domain_bus_token bus_token);</div><div class='add'>+	int	(*map)(struct irq_domain *d, unsigned int virq, irq_hw_number_t hw);</div><div class='add'>+	void	(*unmap)(struct irq_domain *d, unsigned int virq);</div><div class='add'>+	int	(*xlate)(struct irq_domain *d, struct device_node *node,</div><div class='add'>+			 const u32 *intspec, unsigned int intsize,</div><div class='add'>+			 unsigned long *out_hwirq, unsigned int *out_type);</div><div class='ctx'> #ifdef	CONFIG_IRQ_DOMAIN_HIERARCHY</div><div class='ctx'> 	/* extended V2 interfaces to support hierarchy irq_domains */</div><div class='del'>-	int (*alloc)(struct irq_domain *d, unsigned int virq,</div><div class='del'>-		     unsigned int nr_irqs, void *arg);</div><div class='del'>-	void (*free)(struct irq_domain *d, unsigned int virq,</div><div class='del'>-		     unsigned int nr_irqs);</div><div class='del'>-	int (*activate)(struct irq_domain *d, struct irq_data *irqd, bool reserve);</div><div class='del'>-	void (*deactivate)(struct irq_domain *d, struct irq_data *irq_data);</div><div class='del'>-	int (*translate)(struct irq_domain *d, struct irq_fwspec *fwspec,</div><div class='del'>-			 unsigned long *out_hwirq, unsigned int *out_type);</div><div class='add'>+	int	(*alloc)(struct irq_domain *d, unsigned int virq,</div><div class='add'>+			 unsigned int nr_irqs, void *arg);</div><div class='add'>+	void	(*free)(struct irq_domain *d, unsigned int virq,</div><div class='add'>+			unsigned int nr_irqs);</div><div class='add'>+	int	(*activate)(struct irq_domain *d, struct irq_data *irqd, bool reserve);</div><div class='add'>+	void	(*deactivate)(struct irq_domain *d, struct irq_data *irq_data);</div><div class='add'>+	int	(*translate)(struct irq_domain *d, struct irq_fwspec *fwspec,</div><div class='add'>+			     unsigned long *out_hwirq, unsigned int *out_type);</div><div class='add'>+	int	(*get_fwspec_info)(struct irq_fwspec *fwspec, struct irq_fwspec_info *info);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_GENERIC_IRQ_DEBUGFS</div><div class='del'>-	void (*debug_show)(struct seq_file *m, struct irq_domain *d,</div><div class='del'>-			   struct irq_data *irqd, int ind);</div><div class='add'>+	void	(*debug_show)(struct seq_file *m, struct irq_domain *d,</div><div class='add'>+			      struct irq_data *irqd, int ind);</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -131,6 +143,9 @@ struct irq_domain_chip_generic;</div><div class='ctx'>  * Optional elements:</div><div class='ctx'>  * @fwnode:	Pointer to firmware node associated with the irq_domain. Pretty easy</div><div class='ctx'>  *		to swap it for the of_node via the irq_domain_get_of_node accessor</div><div class='add'>+ * @bus_token:	@fwnode's device_node might be used for several irq domains. But</div><div class='add'>+ *		in connection with @bus_token, the pair shall be unique in a</div><div class='add'>+ *		system.</div><div class='ctx'>  * @gc:		Pointer to a list of generic chips. There is a helper function for</div><div class='ctx'>  *		setting up one or more generic chips for interrupt controllers</div><div class='ctx'>  *		drivers using the generic chip library which uses this pointer.</div><div class='hunk'>@@ -141,9 +156,12 @@ struct irq_domain_chip_generic;</div><div class='ctx'>  *		purposes related to the irq domain.</div><div class='ctx'>  * @parent:	Pointer to parent irq_domain to support hierarchy irq_domains</div><div class='ctx'>  * @msi_parent_ops: Pointer to MSI parent domain methods for per device domain init</div><div class='add'>+ * @exit:	Function called when the domain is destroyed</div><div class='ctx'>  *</div><div class='ctx'>  * Revmap data, used internally by the irq domain code:</div><div class='del'>- * @revmap_size:	Size of the linear map table @revmap[]</div><div class='add'>+ * @hwirq_max:		Top limit for the HW irq number. Especially to avoid</div><div class='add'>+ *			conflicts/failures with reserved HW irqs. Can be ~0.</div><div class='add'>+ * @revmap_size:	Size of the linear map table @revmap</div><div class='ctx'>  * @revmap_tree:	Radix map tree for hwirqs that don't fit in the linear map</div><div class='ctx'>  * @revmap:		Linear table of irq_data pointers</div><div class='ctx'>  */</div><div class='hunk'>@@ -169,6 +187,7 @@ struct irq_domain {</div><div class='ctx'> #ifdef CONFIG_GENERIC_MSI_IRQ</div><div class='ctx'> 	const struct msi_parent_ops	*msi_parent_ops;</div><div class='ctx'> #endif</div><div class='add'>+	void				(*exit)(struct irq_domain *d);</div><div class='ctx'> </div><div class='ctx'> 	/* reverse map data. The linear map gets appended to the irq_domain */</div><div class='ctx'> 	irq_hw_number_t			hwirq_max;</div><div class='hunk'>@@ -182,7 +201,7 @@ enum {</div><div class='ctx'> 	/* Irq domain is hierarchical */</div><div class='ctx'> 	IRQ_DOMAIN_FLAG_HIERARCHY	= (1 &lt;&lt; 0),</div><div class='ctx'> </div><div class='del'>-	/* Irq domain name was allocated in __irq_domain_add() */</div><div class='add'>+	/* Irq domain name was allocated internally */</div><div class='ctx'> 	IRQ_DOMAIN_NAME_ALLOCATED	= (1 &lt;&lt; 1),</div><div class='ctx'> </div><div class='ctx'> 	/* Irq domain is an IPI domain with virq per cpu */</div><div class='hunk'>@@ -208,6 +227,15 @@ enum {</div><div class='ctx'> 	/* Irq domain is a MSI device domain */</div><div class='ctx'> 	IRQ_DOMAIN_FLAG_MSI_DEVICE	= (1 &lt;&lt; 9),</div><div class='ctx'> </div><div class='add'>+	/* Irq domain must destroy generic chips when removed */</div><div class='add'>+	IRQ_DOMAIN_FLAG_DESTROY_GC	= (1 &lt;&lt; 10),</div><div class='add'>+</div><div class='add'>+	/* Address and data pair is mutable when irq_set_affinity() */</div><div class='add'>+	IRQ_DOMAIN_FLAG_MSI_IMMUTABLE	= (1 &lt;&lt; 11),</div><div class='add'>+</div><div class='add'>+	/* IRQ domain requires parent fwnode matching */</div><div class='add'>+	IRQ_DOMAIN_FLAG_FWNODE_PARENT	= (1 &lt;&lt; 12),</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Flags starting from IRQ_DOMAIN_FLAG_NONCORE are reserved</div><div class='ctx'> 	 * for implementation specific purposes and ignored by the</div><div class='hunk'>@@ -221,8 +249,7 @@ static inline struct device_node *irq_domain_get_of_node(struct irq_domain *d)</div><div class='ctx'> 	return to_of_node(d-&gt;fwnode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void irq_domain_set_pm_device(struct irq_domain *d,</div><div class='del'>-					    struct device *dev)</div><div class='add'>+static inline void irq_domain_set_pm_device(struct irq_domain *d, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (d)</div><div class='ctx'> 		d-&gt;pm_dev = dev;</div><div class='hunk'>@@ -238,14 +265,12 @@ enum {</div><div class='ctx'> 	IRQCHIP_FWNODE_NAMED_ID,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-struct fwnode_handle *irq_domain_alloc_named_fwnode(const char *name)</div><div class='add'>+static inline struct fwnode_handle *irq_domain_alloc_named_fwnode(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_NAMED, 0, name, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-struct fwnode_handle *irq_domain_alloc_named_id_fwnode(const char *name, int id)</div><div class='add'>+static inline struct fwnode_handle *irq_domain_alloc_named_id_fwnode(const char *name, int id)</div><div class='ctx'> {</div><div class='ctx'> 	return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_NAMED_ID, id, name,</div><div class='ctx'> 					 NULL);</div><div class='hunk'>@@ -257,53 +282,87 @@ static inline struct fwnode_handle *irq_domain_alloc_fwnode(phys_addr_t *pa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void irq_domain_free_fwnode(struct fwnode_handle *fwnode);</div><div class='del'>-struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, unsigned int size,</div><div class='del'>-				    irq_hw_number_t hwirq_max, int direct_max,</div><div class='del'>-				    const struct irq_domain_ops *ops,</div><div class='del'>-				    void *host_data);</div><div class='del'>-struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode,</div><div class='del'>-					    unsigned int size,</div><div class='del'>-					    unsigned int first_irq,</div><div class='del'>-					    const struct irq_domain_ops *ops,</div><div class='del'>-					    void *host_data);</div><div class='del'>-struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,</div><div class='del'>-					 unsigned int size,</div><div class='del'>-					 unsigned int first_irq,</div><div class='del'>-					 irq_hw_number_t first_hwirq,</div><div class='del'>-					 const struct irq_domain_ops *ops,</div><div class='del'>-					 void *host_data);</div><div class='del'>-struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode,</div><div class='del'>-					    unsigned int size,</div><div class='del'>-					    unsigned int first_irq,</div><div class='del'>-					    irq_hw_number_t first_hwirq,</div><div class='del'>-					    const struct irq_domain_ops *ops,</div><div class='del'>-					    void *host_data);</div><div class='del'>-extern struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,</div><div class='del'>-						   enum irq_domain_bus_token bus_token);</div><div class='del'>-extern void irq_set_default_host(struct irq_domain *host);</div><div class='del'>-extern struct irq_domain *irq_get_default_host(void);</div><div class='del'>-extern int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,</div><div class='del'>-				  irq_hw_number_t hwirq, int node,</div><div class='del'>-				  const struct irq_affinity_desc *affinity);</div><div class='ctx'> </div><div class='del'>-static inline struct fwnode_handle *of_node_to_fwnode(struct device_node *node)</div><div class='del'>-{</div><div class='del'>-	return node ? &amp;node-&gt;fwnode : NULL;</div><div class='del'>-}</div><div class='add'>+DEFINE_FREE(irq_domain_free_fwnode, struct fwnode_handle *, if (_T) irq_domain_free_fwnode(_T))</div><div class='add'>+</div><div class='add'>+struct irq_domain_chip_generic_info;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct irq_domain_info - Domain information structure</div><div class='add'>+ * @fwnode:		firmware node for the interrupt controller</div><div class='add'>+ * @domain_flags:	Additional flags to add to the domain flags</div><div class='add'>+ * @size:		Size of linear map; 0 for radix mapping only</div><div class='add'>+ * @hwirq_max:		Maximum number of interrupts supported by controller</div><div class='add'>+ * @direct_max:		Maximum value of direct maps;</div><div class='add'>+ *			Use ~0 for no limit; 0 for no direct mapping</div><div class='add'>+ * @hwirq_base:		The first hardware interrupt number (legacy domains only)</div><div class='add'>+ * @virq_base:		The first Linux interrupt number for legacy domains to</div><div class='add'>+ *			immediately associate the interrupts after domain creation</div><div class='add'>+ * @bus_token:		Domain bus token</div><div class='add'>+ * @name_suffix:	Optional name suffix to avoid collisions when multiple</div><div class='add'>+ *			domains are added using same fwnode</div><div class='add'>+ * @ops:		Domain operation callbacks</div><div class='add'>+ * @host_data:		Controller private data pointer</div><div class='add'>+ * @dev:		Device which creates the domain</div><div class='add'>+ * @dgc_info:		Geneneric chip information structure pointer used to</div><div class='add'>+ *			create generic chips for the domain if not NULL.</div><div class='add'>+ * @init:		Function called when the domain is created.</div><div class='add'>+ *			Allow to do some additional domain initialisation.</div><div class='add'>+ * @exit:		Function called when the domain is destroyed.</div><div class='add'>+ *			Allow to do some additional cleanup operation.</div><div class='add'>+ */</div><div class='add'>+struct irq_domain_info {</div><div class='add'>+	struct fwnode_handle			*fwnode;</div><div class='add'>+	unsigned int				domain_flags;</div><div class='add'>+	unsigned int				size;</div><div class='add'>+	irq_hw_number_t				hwirq_max;</div><div class='add'>+	int					direct_max;</div><div class='add'>+	unsigned int				hwirq_base;</div><div class='add'>+	unsigned int				virq_base;</div><div class='add'>+	enum irq_domain_bus_token		bus_token;</div><div class='add'>+	const char				*name_suffix;</div><div class='add'>+	const struct irq_domain_ops		*ops;</div><div class='add'>+	void					*host_data;</div><div class='add'>+	struct device				*dev;</div><div class='add'>+#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY</div><div class='add'>+	/**</div><div class='add'>+	 * @parent: Pointer to the parent irq domain used in a hierarchy domain</div><div class='add'>+	 */</div><div class='add'>+	struct irq_domain			*parent;</div><div class='add'>+#endif</div><div class='add'>+	struct irq_domain_chip_generic_info	*dgc_info;</div><div class='add'>+	int					(*init)(struct irq_domain *d);</div><div class='add'>+	void					(*exit)(struct irq_domain *d);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct irq_domain *irq_domain_instantiate(const struct irq_domain_info *info);</div><div class='add'>+struct irq_domain *devm_irq_domain_instantiate(struct device *dev,</div><div class='add'>+					       const struct irq_domain_info *info);</div><div class='add'>+</div><div class='add'>+struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode, unsigned int size,</div><div class='add'>+					    unsigned int first_irq,</div><div class='add'>+					    const struct irq_domain_ops *ops, void *host_data);</div><div class='add'>+struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, unsigned int size,</div><div class='add'>+					    unsigned int first_irq, irq_hw_number_t first_hwirq,</div><div class='add'>+					    const struct irq_domain_ops *ops, void *host_data);</div><div class='add'>+struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,</div><div class='add'>+					    enum irq_domain_bus_token bus_token);</div><div class='add'>+void irq_set_default_domain(struct irq_domain *domain);</div><div class='add'>+struct irq_domain *irq_get_default_domain(void);</div><div class='add'>+int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node,</div><div class='add'>+			   const struct irq_affinity_desc *affinity);</div><div class='ctx'> </div><div class='ctx'> extern const struct fwnode_operations irqchip_fwnode_ops;</div><div class='ctx'> </div><div class='del'>-static inline bool is_fwnode_irqchip(struct fwnode_handle *fwnode)</div><div class='add'>+static inline bool is_fwnode_irqchip(const struct fwnode_handle *fwnode)</div><div class='ctx'> {</div><div class='ctx'> 	return fwnode &amp;&amp; fwnode-&gt;ops == &amp;irqchip_fwnode_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void irq_domain_update_bus_token(struct irq_domain *domain,</div><div class='del'>-					enum irq_domain_bus_token bus_token);</div><div class='add'>+void irq_domain_update_bus_token(struct irq_domain *domain, enum irq_domain_bus_token bus_token);</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,</div><div class='del'>-					    enum irq_domain_bus_token bus_token)</div><div class='add'>+static inline struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,</div><div class='add'>+							  enum irq_domain_bus_token bus_token)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_fwspec fwspec = {</div><div class='ctx'> 		.fwnode = fwnode,</div><div class='hunk'>@@ -315,7 +374,7 @@ struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,</div><div class='ctx'> static inline struct irq_domain *irq_find_matching_host(struct device_node *node,</div><div class='ctx'> 							enum irq_domain_bus_token bus_token)</div><div class='ctx'> {</div><div class='del'>-	return irq_find_matching_fwnode(of_node_to_fwnode(node), bus_token);</div><div class='add'>+	return irq_find_matching_fwnode(of_fwnode_handle(node), bus_token);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct irq_domain *irq_find_host(struct device_node *node)</div><div class='hunk'>@@ -329,88 +388,107 @@ static inline struct irq_domain *irq_find_host(struct device_node *node)</div><div class='ctx'> 	return d;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct irq_domain *irq_domain_add_simple(struct device_node *of_node,</div><div class='del'>-						       unsigned int size,</div><div class='del'>-						       unsigned int first_irq,</div><div class='del'>-						       const struct irq_domain_ops *ops,</div><div class='del'>-						       void *host_data)</div><div class='del'>-{</div><div class='del'>-	return irq_domain_create_simple(of_node_to_fwnode(of_node), size, first_irq, ops, host_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * irq_domain_add_linear() - Allocate and register a linear revmap irq_domain.</div><div class='del'>- * @of_node: pointer to interrupt controller's device tree node.</div><div class='del'>- * @size: Number of interrupts in the domain.</div><div class='del'>- * @ops: map/unmap domain callbacks</div><div class='del'>- * @host_data: Controller private data pointer</div><div class='del'>- */</div><div class='del'>-static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_node,</div><div class='del'>-					 unsigned int size,</div><div class='del'>-					 const struct irq_domain_ops *ops,</div><div class='del'>-					 void *host_data)</div><div class='del'>-{</div><div class='del'>-	return __irq_domain_add(of_node_to_fwnode(of_node), size, size, 0, ops, host_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IRQ_DOMAIN_NOMAP</div><div class='del'>-static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_node,</div><div class='del'>-					 unsigned int max_irq,</div><div class='del'>-					 const struct irq_domain_ops *ops,</div><div class='del'>-					 void *host_data)</div><div class='del'>-{</div><div class='del'>-	return __irq_domain_add(of_node_to_fwnode(of_node), 0, max_irq, max_irq, ops, host_data);</div><div class='add'>+static inline struct irq_domain *irq_domain_create_nomap(struct fwnode_handle *fwnode,</div><div class='add'>+							 unsigned int max_irq,</div><div class='add'>+							 const struct irq_domain_ops *ops,</div><div class='add'>+							 void *host_data)</div><div class='add'>+{</div><div class='add'>+	const struct irq_domain_info info = {</div><div class='add'>+		.fwnode		= fwnode,</div><div class='add'>+		.hwirq_max	= max_irq,</div><div class='add'>+		.direct_max	= max_irq,</div><div class='add'>+		.ops		= ops,</div><div class='add'>+		.host_data	= host_data,</div><div class='add'>+	};</div><div class='add'>+	struct irq_domain *d = irq_domain_instantiate(&amp;info);</div><div class='add'>+</div><div class='add'>+	return IS_ERR(d) ? NULL : d;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern unsigned int irq_create_direct_mapping(struct irq_domain *host);</div><div class='add'>+unsigned int irq_create_direct_mapping(struct irq_domain *domain);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node,</div><div class='del'>-					 const struct irq_domain_ops *ops,</div><div class='del'>-					 void *host_data)</div><div class='del'>-{</div><div class='del'>-	return __irq_domain_add(of_node_to_fwnode(of_node), 0, ~0, 0, ops, host_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * irq_domain_create_linear - Allocate and register a linear revmap irq_domain.</div><div class='add'>+ * @fwnode:	pointer to interrupt controller's FW node.</div><div class='add'>+ * @size:	Number of interrupts in the domain.</div><div class='add'>+ * @ops:	map/unmap domain callbacks</div><div class='add'>+ * @host_data:	Controller private data pointer</div><div class='add'>+ *</div><div class='add'>+ * Returns: Newly created irq_domain</div><div class='add'>+ */</div><div class='ctx'> static inline struct irq_domain *irq_domain_create_linear(struct fwnode_handle *fwnode,</div><div class='del'>-					 unsigned int size,</div><div class='del'>-					 const struct irq_domain_ops *ops,</div><div class='del'>-					 void *host_data)</div><div class='del'>-{</div><div class='del'>-	return __irq_domain_add(fwnode, size, size, 0, ops, host_data);</div><div class='add'>+							  unsigned int size,</div><div class='add'>+							  const struct irq_domain_ops *ops,</div><div class='add'>+							  void *host_data)</div><div class='add'>+{</div><div class='add'>+	const struct irq_domain_info info = {</div><div class='add'>+		.fwnode		= fwnode,</div><div class='add'>+		.size		= size,</div><div class='add'>+		.hwirq_max	= size,</div><div class='add'>+		.ops		= ops,</div><div class='add'>+		.host_data	= host_data,</div><div class='add'>+	};</div><div class='add'>+	struct irq_domain *d = irq_domain_instantiate(&amp;info);</div><div class='add'>+</div><div class='add'>+	return IS_ERR(d) ? NULL : d;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct irq_domain *irq_domain_create_tree(struct fwnode_handle *fwnode,</div><div class='del'>-					 const struct irq_domain_ops *ops,</div><div class='del'>-					 void *host_data)</div><div class='del'>-{</div><div class='del'>-	return __irq_domain_add(fwnode, 0, ~0, 0, ops, host_data);</div><div class='add'>+							const struct irq_domain_ops *ops,</div><div class='add'>+							void *host_data)</div><div class='add'>+{</div><div class='add'>+	const struct irq_domain_info info = {</div><div class='add'>+		.fwnode		= fwnode,</div><div class='add'>+		.hwirq_max	= ~0,</div><div class='add'>+		.ops		= ops,</div><div class='add'>+		.host_data	= host_data,</div><div class='add'>+	};</div><div class='add'>+	struct irq_domain *d = irq_domain_instantiate(&amp;info);</div><div class='add'>+</div><div class='add'>+	return IS_ERR(d) ? NULL : d;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void irq_domain_remove(struct irq_domain *host);</div><div class='add'>+void irq_domain_remove(struct irq_domain *domain);</div><div class='ctx'> </div><div class='del'>-extern int irq_domain_associate(struct irq_domain *domain, unsigned int irq,</div><div class='del'>-					irq_hw_number_t hwirq);</div><div class='del'>-extern void irq_domain_associate_many(struct irq_domain *domain,</div><div class='del'>-				      unsigned int irq_base,</div><div class='del'>-				      irq_hw_number_t hwirq_base, int count);</div><div class='add'>+int irq_domain_associate(struct irq_domain *domain, unsigned int irq, irq_hw_number_t hwirq);</div><div class='add'>+void irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base,</div><div class='add'>+			       irq_hw_number_t hwirq_base, int count);</div><div class='ctx'> </div><div class='del'>-extern unsigned int irq_create_mapping_affinity(struct irq_domain *host,</div><div class='del'>-				      irq_hw_number_t hwirq,</div><div class='del'>-				      const struct irq_affinity_desc *affinity);</div><div class='del'>-extern unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);</div><div class='del'>-extern void irq_dispose_mapping(unsigned int virq);</div><div class='add'>+unsigned int irq_create_mapping_affinity(struct irq_domain *domain, irq_hw_number_t hwirq,</div><div class='add'>+					 const struct irq_affinity_desc *affinity);</div><div class='add'>+unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);</div><div class='add'>+void irq_dispose_mapping(unsigned int virq);</div><div class='ctx'> </div><div class='del'>-static inline unsigned int irq_create_mapping(struct irq_domain *host,</div><div class='del'>-					      irq_hw_number_t hwirq)</div><div class='add'>+/**</div><div class='add'>+ * irq_create_mapping - Map a hardware interrupt into linux irq space</div><div class='add'>+ * @domain:	domain owning this hardware interrupt or NULL for default domain</div><div class='add'>+ * @hwirq:	hardware irq number in that domain space</div><div class='add'>+ *</div><div class='add'>+ * Only one mapping per hardware interrupt is permitted.</div><div class='add'>+ *</div><div class='add'>+ * If the sense/trigger is to be specified, set_irq_type() should be called</div><div class='add'>+ * on the number returned from that call.</div><div class='add'>+ *</div><div class='add'>+ * Returns: Linux irq number or 0 on error</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int irq_create_mapping(struct irq_domain *domain, irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='del'>-	return irq_create_mapping_affinity(host, hwirq, NULL);</div><div class='add'>+	return irq_create_mapping_affinity(domain, hwirq, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern struct irq_desc *__irq_resolve_mapping(struct irq_domain *domain,</div><div class='del'>-					      irq_hw_number_t hwirq,</div><div class='del'>-					      unsigned int *irq);</div><div class='add'>+struct irq_desc *__irq_resolve_mapping(struct irq_domain *domain,</div><div class='add'>+				       irq_hw_number_t hwirq,</div><div class='add'>+				       unsigned int *irq);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * irq_resolve_mapping - Find a linux irq from a hw irq number.</div><div class='add'>+ * @domain:	domain owning this hardware interrupt</div><div class='add'>+ * @hwirq:	hardware irq number in that domain space</div><div class='add'>+ *</div><div class='add'>+ * Returns: Interrupt descriptor</div><div class='add'>+ */</div><div class='ctx'> static inline struct irq_desc *irq_resolve_mapping(struct irq_domain *domain,</div><div class='ctx'> 						   irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='hunk'>@@ -419,8 +497,10 @@ static inline struct irq_desc *irq_resolve_mapping(struct irq_domain *domain,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * irq_find_mapping() - Find a linux irq from a hw irq number.</div><div class='del'>- * @domain: domain owning this hardware interrupt</div><div class='del'>- * @hwirq: hardware irq number in that domain space</div><div class='add'>+ * @domain:	domain owning this hardware interrupt</div><div class='add'>+ * @hwirq:	hardware irq number in that domain space</div><div class='add'>+ *</div><div class='add'>+ * Returns: Linux irq number or 0 if not found</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned int irq_find_mapping(struct irq_domain *domain,</div><div class='ctx'> 					    irq_hw_number_t hwirq)</div><div class='hunk'>@@ -433,108 +513,117 @@ static inline unsigned int irq_find_mapping(struct irq_domain *domain,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int irq_linear_revmap(struct irq_domain *domain,</div><div class='del'>-					     irq_hw_number_t hwirq)</div><div class='del'>-{</div><div class='del'>-	return irq_find_mapping(domain, hwirq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern const struct irq_domain_ops irq_domain_simple_ops;</div><div class='ctx'> </div><div class='ctx'> /* stock xlate functions */</div><div class='ctx'> int irq_domain_xlate_onecell(struct irq_domain *d, struct device_node *ctrlr,</div><div class='del'>-			const u32 *intspec, unsigned int intsize,</div><div class='del'>-			irq_hw_number_t *out_hwirq, unsigned int *out_type);</div><div class='add'>+			     const u32 *intspec, unsigned int intsize,</div><div class='add'>+			     irq_hw_number_t *out_hwirq, unsigned int *out_type);</div><div class='ctx'> int irq_domain_xlate_twocell(struct irq_domain *d, struct device_node *ctrlr,</div><div class='del'>-			const u32 *intspec, unsigned int intsize,</div><div class='del'>-			irq_hw_number_t *out_hwirq, unsigned int *out_type);</div><div class='add'>+			     const u32 *intspec, unsigned int intsize,</div><div class='add'>+			     irq_hw_number_t *out_hwirq, unsigned int *out_type);</div><div class='ctx'> int irq_domain_xlate_onetwocell(struct irq_domain *d, struct device_node *ctrlr,</div><div class='del'>-			const u32 *intspec, unsigned int intsize,</div><div class='del'>-			irq_hw_number_t *out_hwirq, unsigned int *out_type);</div><div class='del'>-</div><div class='del'>-int irq_domain_translate_twocell(struct irq_domain *d,</div><div class='del'>-				 struct irq_fwspec *fwspec,</div><div class='del'>-				 unsigned long *out_hwirq,</div><div class='del'>-				 unsigned int *out_type);</div><div class='del'>-</div><div class='del'>-int irq_domain_translate_onecell(struct irq_domain *d,</div><div class='del'>-				 struct irq_fwspec *fwspec,</div><div class='del'>-				 unsigned long *out_hwirq,</div><div class='del'>-				 unsigned int *out_type);</div><div class='add'>+				const u32 *intspec, unsigned int intsize,</div><div class='add'>+				irq_hw_number_t *out_hwirq, unsigned int *out_type);</div><div class='add'>+int irq_domain_xlate_twothreecell(struct irq_domain *d, struct device_node *ctrlr,</div><div class='add'>+				  const u32 *intspec, unsigned int intsize,</div><div class='add'>+				  irq_hw_number_t *out_hwirq, unsigned int *out_type);</div><div class='add'>+</div><div class='add'>+int irq_domain_translate_onecell(struct irq_domain *d, struct irq_fwspec *fwspec,</div><div class='add'>+				 unsigned long *out_hwirq, unsigned int *out_type);</div><div class='add'>+int irq_domain_translate_twocell(struct irq_domain *d, struct irq_fwspec *fwspec,</div><div class='add'>+				 unsigned long *out_hwirq, unsigned int *out_type);</div><div class='add'>+int irq_domain_translate_twothreecell(struct irq_domain *d, struct irq_fwspec *fwspec,</div><div class='add'>+				      unsigned long *out_hwirq, unsigned int *out_type);</div><div class='ctx'> </div><div class='ctx'> /* IPI functions */</div><div class='ctx'> int irq_reserve_ipi(struct irq_domain *domain, const struct cpumask *dest);</div><div class='ctx'> int irq_destroy_ipi(unsigned int irq, const struct cpumask *dest);</div><div class='ctx'> </div><div class='ctx'> /* V2 interfaces to support hierarchy IRQ domains. */</div><div class='del'>-extern struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain,</div><div class='del'>-						unsigned int virq);</div><div class='del'>-extern void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,</div><div class='del'>-				irq_hw_number_t hwirq,</div><div class='del'>-				const struct irq_chip *chip,</div><div class='del'>-				void *chip_data, irq_flow_handler_t handler,</div><div class='del'>-				void *handler_data, const char *handler_name);</div><div class='del'>-extern void irq_domain_reset_irq_data(struct irq_data *irq_data);</div><div class='add'>+struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain, unsigned int virq);</div><div class='add'>+void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, irq_hw_number_t hwirq,</div><div class='add'>+			 const struct irq_chip *chip, void *chip_data, irq_flow_handler_t handler,</div><div class='add'>+			 void *handler_data, const char *handler_name);</div><div class='add'>+void irq_domain_reset_irq_data(struct irq_data *irq_data);</div><div class='ctx'> #ifdef	CONFIG_IRQ_DOMAIN_HIERARCHY</div><div class='del'>-extern struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent,</div><div class='del'>-			unsigned int flags, unsigned int size,</div><div class='del'>-			struct fwnode_handle *fwnode,</div><div class='del'>-			const struct irq_domain_ops *ops, void *host_data);</div><div class='del'>-</div><div class='del'>-static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *parent,</div><div class='del'>-					    unsigned int flags,</div><div class='del'>-					    unsigned int size,</div><div class='del'>-					    struct device_node *node,</div><div class='del'>-					    const struct irq_domain_ops *ops,</div><div class='del'>-					    void *host_data)</div><div class='del'>-{</div><div class='del'>-	return irq_domain_create_hierarchy(parent, flags, size,</div><div class='del'>-					   of_node_to_fwnode(node),</div><div class='del'>-					   ops, host_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base,</div><div class='del'>-				   unsigned int nr_irqs, int node, void *arg,</div><div class='del'>-				   bool realloc,</div><div class='del'>-				   const struct irq_affinity_desc *affinity);</div><div class='del'>-extern void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs);</div><div class='del'>-extern int irq_domain_activate_irq(struct irq_data *irq_data, bool early);</div><div class='del'>-extern void irq_domain_deactivate_irq(struct irq_data *irq_data);</div><div class='del'>-</div><div class='del'>-static inline int irq_domain_alloc_irqs(struct irq_domain *domain,</div><div class='del'>-			unsigned int nr_irqs, int node, void *arg)</div><div class='del'>-{</div><div class='del'>-	return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false,</div><div class='del'>-				       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern int irq_domain_alloc_irqs_hierarchy(struct irq_domain *domain,</div><div class='del'>-					   unsigned int irq_base,</div><div class='del'>-					   unsigned int nr_irqs, void *arg);</div><div class='del'>-extern int irq_domain_set_hwirq_and_chip(struct irq_domain *domain,</div><div class='del'>-					 unsigned int virq,</div><div class='del'>-					 irq_hw_number_t hwirq,</div><div class='del'>-					 const struct irq_chip *chip,</div><div class='del'>-					 void *chip_data);</div><div class='del'>-extern void irq_domain_free_irqs_common(struct irq_domain *domain,</div><div class='del'>-					unsigned int virq,</div><div class='del'>-					unsigned int nr_irqs);</div><div class='del'>-extern void irq_domain_free_irqs_top(struct irq_domain *domain,</div><div class='del'>-				     unsigned int virq, unsigned int nr_irqs);</div><div class='del'>-</div><div class='del'>-extern int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg);</div><div class='del'>-extern int irq_domain_pop_irq(struct irq_domain *domain, int virq);</div><div class='del'>-</div><div class='del'>-extern int irq_domain_alloc_irqs_parent(struct irq_domain *domain,</div><div class='del'>-					unsigned int irq_base,</div><div class='del'>-					unsigned int nr_irqs, void *arg);</div><div class='del'>-</div><div class='del'>-extern void irq_domain_free_irqs_parent(struct irq_domain *domain,</div><div class='del'>-					unsigned int irq_base,</div><div class='del'>-					unsigned int nr_irqs);</div><div class='del'>-</div><div class='del'>-extern int irq_domain_disconnect_hierarchy(struct irq_domain *domain,</div><div class='del'>-					   unsigned int virq);</div><div class='add'>+/**</div><div class='add'>+ * irq_domain_create_hierarchy - Add a irqdomain into the hierarchy</div><div class='add'>+ * @parent:	Parent irq domain to associate with the new domain</div><div class='add'>+ * @flags:	Irq domain flags associated to the domain</div><div class='add'>+ * @size:	Size of the domain. See below</div><div class='add'>+ * @fwnode:	Optional fwnode of the interrupt controller</div><div class='add'>+ * @ops:	Pointer to the interrupt domain callbacks</div><div class='add'>+ * @host_data:	Controller private data pointer</div><div class='add'>+ *</div><div class='add'>+ * If @size is 0 a tree domain is created, otherwise a linear domain.</div><div class='add'>+ *</div><div class='add'>+ * If successful the parent is associated to the new domain and the</div><div class='add'>+ * domain flags are set.</div><div class='add'>+ *</div><div class='add'>+ * Returns: A pointer to IRQ domain, or %NULL on failure.</div><div class='add'>+ */</div><div class='add'>+static inline struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent,</div><div class='add'>+							     unsigned int flags, unsigned int size,</div><div class='add'>+							     struct fwnode_handle *fwnode,</div><div class='add'>+							     const struct irq_domain_ops *ops,</div><div class='add'>+							     void *host_data)</div><div class='add'>+{</div><div class='add'>+	const struct irq_domain_info info = {</div><div class='add'>+		.fwnode		= fwnode,</div><div class='add'>+		.size		= size,</div><div class='add'>+		.hwirq_max	= size ? : ~0U,</div><div class='add'>+		.ops		= ops,</div><div class='add'>+		.host_data	= host_data,</div><div class='add'>+		.domain_flags	= flags,</div><div class='add'>+		.parent		= parent,</div><div class='add'>+	};</div><div class='add'>+	struct irq_domain *d = irq_domain_instantiate(&amp;info);</div><div class='add'>+</div><div class='add'>+	return IS_ERR(d) ? NULL : d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, unsigned int nr_irqs,</div><div class='add'>+			    int node, void *arg, bool realloc,</div><div class='add'>+			    const struct irq_affinity_desc *affinity);</div><div class='add'>+void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs);</div><div class='add'>+int irq_domain_activate_irq(struct irq_data *irq_data, bool early);</div><div class='add'>+void irq_domain_deactivate_irq(struct irq_data *irq_data);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * irq_domain_alloc_irqs - Allocate IRQs from domain</div><div class='add'>+ * @domain:	domain to allocate from</div><div class='add'>+ * @nr_irqs:	number of IRQs to allocate</div><div class='add'>+ * @node:	NUMA node id for memory allocation</div><div class='add'>+ * @arg:	domain specific argument</div><div class='add'>+ *</div><div class='add'>+ * See __irq_domain_alloc_irqs()' documentation.</div><div class='add'>+ */</div><div class='add'>+static inline int irq_domain_alloc_irqs(struct irq_domain *domain, unsigned int nr_irqs,</div><div class='add'>+					int node, void *arg)</div><div class='add'>+{</div><div class='add'>+	return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int irq_domain_set_hwirq_and_chip(struct irq_domain *domain, unsigned int virq,</div><div class='add'>+				  irq_hw_number_t hwirq, const struct irq_chip *chip,</div><div class='add'>+				  void *chip_data);</div><div class='add'>+void irq_domain_free_irqs_common(struct irq_domain *domain, unsigned int virq,</div><div class='add'>+				 unsigned int nr_irqs);</div><div class='add'>+void irq_domain_free_irqs_top(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs);</div><div class='add'>+</div><div class='add'>+int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg);</div><div class='add'>+int irq_domain_pop_irq(struct irq_domain *domain, int virq);</div><div class='add'>+</div><div class='add'>+int irq_domain_alloc_irqs_parent(struct irq_domain *domain, unsigned int irq_base,</div><div class='add'>+				 unsigned int nr_irqs, void *arg);</div><div class='add'>+</div><div class='add'>+void irq_domain_free_irqs_parent(struct irq_domain *domain, unsigned int irq_base,</div><div class='add'>+				 unsigned int nr_irqs);</div><div class='add'>+</div><div class='add'>+int irq_domain_disconnect_hierarchy(struct irq_domain *domain, unsigned int virq);</div><div class='add'>+</div><div class='add'>+int irq_populate_fwspec_info(struct irq_fwspec *fwspec, struct irq_fwspec_info *info);</div><div class='ctx'> </div><div class='ctx'> static inline bool irq_domain_is_hierarchy(struct irq_domain *domain)</div><div class='ctx'> {</div><div class='hunk'>@@ -543,8 +632,7 @@ static inline bool irq_domain_is_hierarchy(struct irq_domain *domain)</div><div class='ctx'> </div><div class='ctx'> static inline bool irq_domain_is_ipi(struct irq_domain *domain)</div><div class='ctx'> {</div><div class='del'>-	return domain-&gt;flags &amp;</div><div class='del'>-		(IRQ_DOMAIN_FLAG_IPI_PER_CPU | IRQ_DOMAIN_FLAG_IPI_SINGLE);</div><div class='add'>+	return domain-&gt;flags &amp; (IRQ_DOMAIN_FLAG_IPI_PER_CPU | IRQ_DOMAIN_FLAG_IPI_SINGLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool irq_domain_is_ipi_per_cpu(struct irq_domain *domain)</div><div class='hunk'>@@ -572,15 +660,18 @@ static inline bool irq_domain_is_msi_device(struct irq_domain *domain)</div><div class='ctx'> 	return domain-&gt;flags &amp; IRQ_DOMAIN_FLAG_MSI_DEVICE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool irq_domain_is_msi_immutable(struct irq_domain *domain)</div><div class='add'>+{</div><div class='add'>+	return domain-&gt;flags &amp; IRQ_DOMAIN_FLAG_MSI_IMMUTABLE;</div><div class='add'>+}</div><div class='ctx'> #else	/* CONFIG_IRQ_DOMAIN_HIERARCHY */</div><div class='del'>-static inline int irq_domain_alloc_irqs(struct irq_domain *domain,</div><div class='del'>-			unsigned int nr_irqs, int node, void *arg)</div><div class='add'>+static inline int irq_domain_alloc_irqs(struct irq_domain *domain, unsigned int nr_irqs,</div><div class='add'>+					int node, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void irq_domain_free_irqs(unsigned int virq,</div><div class='del'>-					unsigned int nr_irqs) { }</div><div class='add'>+static inline void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs) { }</div><div class='ctx'> </div><div class='ctx'> static inline bool irq_domain_is_hierarchy(struct irq_domain *domain)</div><div class='ctx'> {</div><div class='hunk'>@@ -617,11 +708,14 @@ static inline bool irq_domain_is_msi_device(struct irq_domain *domain)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int irq_populate_fwspec_info(struct irq_fwspec *fwspec, struct irq_fwspec_info *info)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> #endif	/* CONFIG_IRQ_DOMAIN_HIERARCHY */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_GENERIC_MSI_IRQ</div><div class='del'>-int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq,</div><div class='del'>-				  unsigned int type);</div><div class='add'>+int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq, unsigned int type);</div><div class='ctx'> void msi_device_domain_free_wired(struct irq_domain *domain, unsigned int virq);</div><div class='ctx'> #else</div><div class='ctx'> static inline int msi_device_domain_alloc_wired(struct irq_domain *domain, unsigned int hwirq,</div><div class='hunk'>@@ -636,10 +730,44 @@ static inline void msi_device_domain_free_wired(struct irq_domain *domain, unsig</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node,</div><div class='add'>+						     const struct irq_domain_ops *ops,</div><div class='add'>+						     void *host_data)</div><div class='add'>+{</div><div class='add'>+	struct irq_domain_info info = {</div><div class='add'>+		.fwnode		= of_fwnode_handle(of_node),</div><div class='add'>+		.hwirq_max	= ~0U,</div><div class='add'>+		.ops		= ops,</div><div class='add'>+		.host_data	= host_data,</div><div class='add'>+	};</div><div class='add'>+	struct irq_domain *d;</div><div class='add'>+</div><div class='add'>+	d = irq_domain_instantiate(&amp;info);</div><div class='add'>+	return IS_ERR(d) ? NULL : d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_node,</div><div class='add'>+						       unsigned int size,</div><div class='add'>+						       const struct irq_domain_ops *ops,</div><div class='add'>+						       void *host_data)</div><div class='add'>+{</div><div class='add'>+	struct irq_domain_info info = {</div><div class='add'>+		.fwnode		= of_fwnode_handle(of_node),</div><div class='add'>+		.size		= size,</div><div class='add'>+		.hwirq_max	= size,</div><div class='add'>+		.ops		= ops,</div><div class='add'>+		.host_data	= host_data,</div><div class='add'>+	};</div><div class='add'>+	struct irq_domain *d;</div><div class='add'>+</div><div class='add'>+	d = irq_domain_instantiate(&amp;info);</div><div class='add'>+	return IS_ERR(d) ? NULL : d;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_IRQ_DOMAIN */</div><div class='ctx'> static inline void irq_dispose_mapping(unsigned int virq) { }</div><div class='del'>-static inline struct irq_domain *irq_find_matching_fwnode(</div><div class='del'>-	struct fwnode_handle *fwnode, enum irq_domain_bus_token bus_token)</div><div class='add'>+static inline struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,</div><div class='add'>+							  enum irq_domain_bus_token bus_token)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/irqdomain_defs.h b/include/linux/irqdomain_defs.h<br/>index 5c1fe6f1fcde..36653e2ee1c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqdomain_defs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqdomain_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqdomain_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqdomain_defs.h</a></div><div class='hunk'>@@ -25,7 +25,6 @@ enum irq_domain_bus_token {</div><div class='ctx'> 	DOMAIN_BUS_PCI_DEVICE_MSIX,</div><div class='ctx'> 	DOMAIN_BUS_DMAR,</div><div class='ctx'> 	DOMAIN_BUS_AMDVI,</div><div class='del'>-	DOMAIN_BUS_PCI_DEVICE_IMS,</div><div class='ctx'> 	DOMAIN_BUS_DEVICE_MSI,</div><div class='ctx'> 	DOMAIN_BUS_WIRED_TO_MSI,</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h<br/>index 147feebd508c..57b074e0cfbb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqflags.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqflags.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqflags.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqflags.h</a></div><div class='hunk'>@@ -18,6 +18,8 @@</div><div class='ctx'> #include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/percpu.h&gt;</div><div class='ctx'> </div><div class='add'>+struct task_struct;</div><div class='add'>+</div><div class='ctx'> /* Currently lockdep_softirqs_on/off is used only by lockdep */</div><div class='ctx'> #ifdef CONFIG_PROVE_LOCKING</div><div class='ctx'>   extern void lockdep_softirqs_on(unsigned long ip);</div><div class='hunk'>@@ -25,12 +27,16 @@</div><div class='ctx'>   extern void lockdep_hardirqs_on_prepare(void);</div><div class='ctx'>   extern void lockdep_hardirqs_on(unsigned long ip);</div><div class='ctx'>   extern void lockdep_hardirqs_off(unsigned long ip);</div><div class='add'>+  extern void lockdep_cleanup_dead_cpu(unsigned int cpu,</div><div class='add'>+				       struct task_struct *idle);</div><div class='ctx'> #else</div><div class='ctx'>   static inline void lockdep_softirqs_on(unsigned long ip) { }</div><div class='ctx'>   static inline void lockdep_softirqs_off(unsigned long ip) { }</div><div class='ctx'>   static inline void lockdep_hardirqs_on_prepare(void) { }</div><div class='ctx'>   static inline void lockdep_hardirqs_on(unsigned long ip) { }</div><div class='ctx'>   static inline void lockdep_hardirqs_off(unsigned long ip) { }</div><div class='add'>+  static inline void lockdep_cleanup_dead_cpu(unsigned int cpu,</div><div class='add'>+					      struct task_struct *idle) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TRACE_IRQFLAGS</div><div class='hunk'>@@ -114,7 +120,7 @@ do {						\</div><div class='ctx'> # define lockdep_softirq_enter()		do { } while (0)</div><div class='ctx'> # define lockdep_softirq_exit()			do { } while (0)</div><div class='ctx'> # define lockdep_hrtimer_enter(__hrtimer)	false</div><div class='del'>-# define lockdep_hrtimer_exit(__context)	do { } while (0)</div><div class='add'>+# define lockdep_hrtimer_exit(__context)	do { (void)(__context); } while (0)</div><div class='ctx'> # define lockdep_posixtimer_enter()		do { } while (0)</div><div class='ctx'> # define lockdep_posixtimer_exit()		do { } while (0)</div><div class='ctx'> # define lockdep_irq_work_enter(__work)		do { } while (0)</div><div class='head'>diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h<br/>index 3496baa0b07f..e97206c721a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/irqnr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/irqnr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/irqnr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/irqnr.h</a></div><div class='hunk'>@@ -5,30 +5,36 @@</div><div class='ctx'> #include &lt;uapi/linux/irqnr.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern int nr_irqs;</div><div class='add'>+unsigned int irq_get_nr_irqs(void) __pure;</div><div class='add'>+unsigned int irq_set_nr_irqs(unsigned int nr);</div><div class='ctx'> extern struct irq_desc *irq_to_desc(unsigned int irq);</div><div class='ctx'> unsigned int irq_get_next_irq(unsigned int offset);</div><div class='ctx'> </div><div class='del'>-# define for_each_irq_desc(irq, desc)					\</div><div class='del'>-	for (irq = 0, desc = irq_to_desc(irq); irq &lt; nr_irqs;		\</div><div class='del'>-	     irq++, desc = irq_to_desc(irq))				\</div><div class='del'>-		if (!desc)						\</div><div class='del'>-			;						\</div><div class='del'>-		else</div><div class='del'>-</div><div class='add'>+#define for_each_irq_desc(irq, desc)                                      \</div><div class='add'>+	for (unsigned int __nr_irqs__ = irq_get_nr_irqs(); __nr_irqs__;   \</div><div class='add'>+	     __nr_irqs__ = 0)                                             \</div><div class='add'>+		for (irq = 0, desc = irq_to_desc(irq); irq &lt; __nr_irqs__; \</div><div class='add'>+		     irq++, desc = irq_to_desc(irq))                      \</div><div class='add'>+			if (!desc)                                        \</div><div class='add'>+				;                                         \</div><div class='add'>+			else</div><div class='ctx'> </div><div class='ctx'> # define for_each_irq_desc_reverse(irq, desc)				\</div><div class='del'>-	for (irq = nr_irqs - 1, desc = irq_to_desc(irq); irq &gt;= 0;	\</div><div class='del'>-	     irq--, desc = irq_to_desc(irq))				\</div><div class='add'>+	for (irq = irq_get_nr_irqs() - 1, desc = irq_to_desc(irq);	\</div><div class='add'>+	     irq &gt;= 0; irq--, desc = irq_to_desc(irq))			\</div><div class='ctx'> 		if (!desc)						\</div><div class='ctx'> 			;						\</div><div class='ctx'> 		else</div><div class='ctx'> </div><div class='del'>-# define for_each_active_irq(irq)			\</div><div class='del'>-	for (irq = irq_get_next_irq(0); irq &lt; nr_irqs;	\</div><div class='del'>-	     irq = irq_get_next_irq(irq + 1))</div><div class='add'>+#define for_each_active_irq(irq)                                        \</div><div class='add'>+	for (unsigned int __nr_irqs__ = irq_get_nr_irqs(); __nr_irqs__; \</div><div class='add'>+	     __nr_irqs__ = 0)                                           \</div><div class='add'>+		for (irq = irq_get_next_irq(0); irq &lt; __nr_irqs__;      \</div><div class='add'>+		     irq = irq_get_next_irq(irq + 1))</div><div class='ctx'> </div><div class='del'>-#define for_each_irq_nr(irq)                   \</div><div class='del'>-       for (irq = 0; irq &lt; nr_irqs; irq++)</div><div class='add'>+#define for_each_irq_nr(irq)                                            \</div><div class='add'>+	for (unsigned int __nr_irqs__ = irq_get_nr_irqs(); __nr_irqs__; \</div><div class='add'>+	     __nr_irqs__ = 0)                                           \</div><div class='add'>+		for (irq = 0; irq &lt; __nr_irqs__; irq++)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/ism.h b/include/linux/ism.h<br/>index 5428edd90982..b7feb4dcd5a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ism.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ism.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ism.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ism.h</a></div><div class='hunk'>@@ -11,37 +11,25 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-struct ism_dmb {</div><div class='del'>-	u64 dmb_tok;</div><div class='del'>-	u64 rgid;</div><div class='del'>-	u32 dmb_len;</div><div class='del'>-	u32 sba_idx;</div><div class='del'>-	u32 vlan_valid;</div><div class='del'>-	u32 vlan_id;</div><div class='del'>-	void *cpu_addr;</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Unless we gain unexpected popularity, this limit should hold for a while */</div><div class='ctx'> #define MAX_CLIENTS		8</div><div class='ctx'> #define ISM_NR_DMBS		1920</div><div class='ctx'> </div><div class='ctx'> struct ism_dev {</div><div class='ctx'> 	spinlock_t lock; /* protects the ism device */</div><div class='add'>+	spinlock_t cmd_lock; /* serializes cmds */</div><div class='ctx'> 	struct list_head list;</div><div class='add'>+	struct dibs_dev *dibs;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> </div><div class='ctx'> 	struct ism_sba *sba;</div><div class='ctx'> 	dma_addr_t sba_dma_addr;</div><div class='ctx'> 	DECLARE_BITMAP(sba_bitmap, ISM_NR_DMBS);</div><div class='del'>-	u8 *sba_client_arr;	/* entries are indices into 'clients' array */</div><div class='ctx'> 	void *priv[MAX_CLIENTS];</div><div class='ctx'> </div><div class='ctx'> 	struct ism_eq *ieq;</div><div class='ctx'> 	dma_addr_t ieq_dma_addr;</div><div class='ctx'> </div><div class='del'>-	struct device dev;</div><div class='del'>-	u64 local_gid;</div><div class='ctx'> 	int ieq_idx;</div><div class='ctx'> </div><div class='ctx'> 	struct ism_client *subs[MAX_CLIENTS];</div><div class='hunk'>@@ -57,14 +45,7 @@ struct ism_event {</div><div class='ctx'> </div><div class='ctx'> struct ism_client {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	void (*add)(struct ism_dev *dev);</div><div class='del'>-	void (*remove)(struct ism_dev *dev);</div><div class='ctx'> 	void (*handle_event)(struct ism_dev *dev, struct ism_event *event);</div><div class='del'>-	/* Parameter dmbemask contains a bit vector with updated DMBEs, if sent</div><div class='del'>-	 * via ism_move_data(). Callback function must handle all active bits</div><div class='del'>-	 * indicated by dmbemask.</div><div class='del'>-	 */</div><div class='del'>-	void (*handle_irq)(struct ism_dev *dev, unsigned int bit, u16 dmbemask);</div><div class='ctx'> 	/* Private area - don't touch! */</div><div class='ctx'> 	u8 id;</div><div class='ctx'> };</div><div class='hunk'>@@ -81,12 +62,6 @@ static inline void ism_set_priv(struct ism_dev *dev, struct ism_client *client,</div><div class='ctx'> 	dev-&gt;priv[client-&gt;id] = priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int  ism_register_dmb(struct ism_dev *dev, struct ism_dmb *dmb,</div><div class='del'>-		      struct ism_client *client);</div><div class='del'>-int  ism_unregister_dmb(struct ism_dev *dev, struct ism_dmb *dmb);</div><div class='del'>-int  ism_move(struct ism_dev *dev, u64 dmb_tok, unsigned int idx, bool sf,</div><div class='del'>-	      unsigned int offset, void *data, unsigned int size);</div><div class='del'>-</div><div class='ctx'> const struct smcd_ops *ism_get_smcd_ops(void);</div><div class='ctx'> </div><div class='ctx'> #endif	/* _ISM_H */</div><div class='head'>diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h<br/>index 971f3e826e15..f5eaf76198f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/jbd2.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/jbd2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/jbd2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/jbd2.h</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/bit_spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;linux/crc32c.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define journal_oom_retry 1</div><div class='hunk'>@@ -459,7 +459,6 @@ struct jbd2_revoke_table_s;</div><div class='ctx'>  * @h_ref: Reference count on this handle.</div><div class='ctx'>  * @h_err: Field for caller's use to track errors through large fs operations.</div><div class='ctx'>  * @h_sync: Flag for sync-on-close.</div><div class='del'>- * @h_jdata: Flag to force data journaling.</div><div class='ctx'>  * @h_reserved: Flag for handle for reserved credits.</div><div class='ctx'>  * @h_aborted: Flag indicating fatal error on handle.</div><div class='ctx'>  * @h_type: For handle statistics.</div><div class='hunk'>@@ -491,7 +490,6 @@ struct jbd2_journal_handle</div><div class='ctx'> </div><div class='ctx'> 	/* Flags [no locking] */</div><div class='ctx'> 	unsigned int	h_sync:		1;</div><div class='del'>-	unsigned int	h_jdata:	1;</div><div class='ctx'> 	unsigned int	h_reserved:	1;</div><div class='ctx'> 	unsigned int	h_aborted:	1;</div><div class='ctx'> 	unsigned int	h_type:		8;</div><div class='hunk'>@@ -700,12 +698,6 @@ struct transaction_s</div><div class='ctx'> </div><div class='ctx'> 	/* Disk flush needs to be sent to fs partition [no locking] */</div><div class='ctx'> 	int			t_need_data_flush;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For use by the filesystem to store fs-specific data</div><div class='del'>-	 * structures associated with the transaction</div><div class='del'>-	 */</div><div class='del'>-	struct list_head	t_private_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct transaction_run_stats_s {</div><div class='hunk'>@@ -1086,6 +1078,13 @@ struct journal_s</div><div class='ctx'> 	int			j_revoke_records_per_block;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @j_transaction_overhead_buffers:</div><div class='add'>+	 *</div><div class='add'>+	 * Number of blocks each transaction needs for its own bookkeeping</div><div class='add'>+	 */</div><div class='add'>+	int			j_transaction_overhead_buffers;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @j_commit_interval:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * What is the maximum transaction lifetime before we begin a commit?</div><div class='hunk'>@@ -1235,13 +1234,6 @@ struct journal_s</div><div class='ctx'> 	void *j_private;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @j_chksum_driver:</div><div class='del'>-	 *</div><div class='del'>-	 * Reference to checksum algorithm driver via cryptoapi.</div><div class='del'>-	 */</div><div class='del'>-	struct crypto_shash *j_chksum_driver;</div><div class='del'>-</div><div class='del'>-	/**</div><div class='ctx'> 	 * @j_csum_seed:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Precomputed journal UUID checksum for seeding other checksums.</div><div class='hunk'>@@ -1261,6 +1253,12 @@ struct journal_s</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct lockdep_map	j_trans_commit_map;</div><div class='ctx'> #endif</div><div class='add'>+	/**</div><div class='add'>+	 * @jbd2_trans_commit_key:</div><div class='add'>+	 *</div><div class='add'>+	 * "struct lock_class_key" for @j_trans_commit_map</div><div class='add'>+	 */</div><div class='add'>+	struct lock_class_key	jbd2_trans_commit_key;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @j_fc_cleanup_callback:</div><div class='hunk'>@@ -1388,9 +1386,6 @@ JBD2_FEATURE_INCOMPAT_FUNCS(fast_commit,	FAST_COMMIT)</div><div class='ctx'> #define JBD2_FLUSHED	0x008	/* The journal superblock has been flushed */</div><div class='ctx'> #define JBD2_LOADED	0x010	/* The journal superblock has been loaded */</div><div class='ctx'> #define JBD2_BARRIER	0x020	/* Use IDE barriers */</div><div class='del'>-#define JBD2_ABORT_ON_SYNCDATA_ERR	0x040	/* Abort the journal on file</div><div class='del'>-						 * data write error in ordered</div><div class='del'>-						 * mode */</div><div class='ctx'> #define JBD2_CYCLE_RECORD		0x080	/* Journal cycled record log on</div><div class='ctx'> 						 * clean and empty filesystem</div><div class='ctx'> 						 * logging area */</div><div class='hunk'>@@ -1407,7 +1402,6 @@ JBD2_FEATURE_INCOMPAT_FUNCS(fast_commit,	FAST_COMMIT)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Filing buffers */</div><div class='del'>-extern void jbd2_journal_unfile_buffer(journal_t *, struct journal_head *);</div><div class='ctx'> extern bool __jbd2_journal_refile_buffer(struct journal_head *);</div><div class='ctx'> extern void jbd2_journal_refile_buffer(journal_t *, struct journal_head *);</div><div class='ctx'> extern void __jbd2_journal_file_buffer(struct journal_head *, transaction_t *, int);</div><div class='hunk'>@@ -1434,7 +1428,9 @@ void jbd2_update_log_tail(journal_t *journal, tid_t tid, unsigned long block);</div><div class='ctx'> extern void jbd2_journal_commit_transaction(journal_t *);</div><div class='ctx'> </div><div class='ctx'> /* Checkpoint list management */</div><div class='del'>-void __jbd2_journal_clean_checkpoint_list(journal_t *journal, bool destroy);</div><div class='add'>+enum jbd2_shrink_type {JBD2_SHRINK_DESTROY, JBD2_SHRINK_BUSY_STOP, JBD2_SHRINK_BUSY_SKIP};</div><div class='add'>+</div><div class='add'>+void __jbd2_journal_clean_checkpoint_list(journal_t *journal, enum jbd2_shrink_type type);</div><div class='ctx'> unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal, unsigned long *nr_to_scan);</div><div class='ctx'> int __jbd2_journal_remove_checkpoint(struct journal_head *);</div><div class='ctx'> int jbd2_journal_try_remove_checkpoint(struct journal_head *jh);</div><div class='hunk'>@@ -1586,10 +1582,13 @@ void jbd2_journal_put_journal_head(struct journal_head *jh);</div><div class='ctx'>  */</div><div class='ctx'> extern struct kmem_cache *jbd2_handle_cache;</div><div class='ctx'> </div><div class='del'>-static inline handle_t *jbd2_alloc_handle(gfp_t gfp_flags)</div><div class='del'>-{</div><div class='del'>-	return kmem_cache_zalloc(jbd2_handle_cache, gfp_flags);</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * This specialized allocator has to be a macro for its allocations to be</div><div class='add'>+ * accounted separately (to have a separate alloc_tag). The typecast is</div><div class='add'>+ * intentional to enforce typesafety.</div><div class='add'>+ */</div><div class='add'>+#define jbd2_alloc_handle(_gfp_flags)	\</div><div class='add'>+		((handle_t *)kmem_cache_zalloc(jbd2_handle_cache, _gfp_flags))</div><div class='ctx'> </div><div class='ctx'> static inline void jbd2_free_handle(handle_t *handle)</div><div class='ctx'> {</div><div class='hunk'>@@ -1602,10 +1601,13 @@ static inline void jbd2_free_handle(handle_t *handle)</div><div class='ctx'>  */</div><div class='ctx'> extern struct kmem_cache *jbd2_inode_cache;</div><div class='ctx'> </div><div class='del'>-static inline struct jbd2_inode *jbd2_alloc_inode(gfp_t gfp_flags)</div><div class='del'>-{</div><div class='del'>-	return kmem_cache_alloc(jbd2_inode_cache, gfp_flags);</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * This specialized allocator has to be a macro for its allocations to be</div><div class='add'>+ * accounted separately (to have a separate alloc_tag). The typecast is</div><div class='add'>+ * intentional to enforce typesafety.</div><div class='add'>+ */</div><div class='add'>+#define jbd2_alloc_inode(_gfp_flags)	\</div><div class='add'>+		((struct jbd2_inode *)kmem_cache_alloc(jbd2_inode_cache, _gfp_flags))</div><div class='ctx'> </div><div class='ctx'> static inline void jbd2_free_inode(struct jbd2_inode *jinode)</div><div class='ctx'> {</div><div class='hunk'>@@ -1619,10 +1621,12 @@ extern void	   jbd2_journal_destroy_revoke_record_cache(void);</div><div class='ctx'> extern void	   jbd2_journal_destroy_revoke_table_cache(void);</div><div class='ctx'> extern int __init jbd2_journal_init_revoke_record_cache(void);</div><div class='ctx'> extern int __init jbd2_journal_init_revoke_table_cache(void);</div><div class='add'>+struct jbd2_revoke_table_s *jbd2_journal_init_revoke_table(int hash_size);</div><div class='add'>+void jbd2_journal_destroy_revoke_table(struct jbd2_revoke_table_s *table);</div><div class='ctx'> </div><div class='ctx'> extern void	   jbd2_journal_destroy_revoke(journal_t *);</div><div class='ctx'> extern int	   jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *);</div><div class='del'>-extern int	   jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);</div><div class='add'>+extern void	   jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);</div><div class='ctx'> extern void	   jbd2_journal_write_revoke_records(transaction_t *transaction,</div><div class='ctx'> 						     struct list_head *log_bufs);</div><div class='ctx'> </div><div class='hunk'>@@ -1660,12 +1664,7 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out);</div><div class='ctx'> int jbd2_submit_inode_data(journal_t *journal, struct jbd2_inode *jinode);</div><div class='ctx'> int jbd2_wait_inode_data(journal_t *journal, struct jbd2_inode *jinode);</div><div class='ctx'> int jbd2_fc_wait_bufs(journal_t *journal, int num_blks);</div><div class='del'>-int jbd2_fc_release_bufs(journal_t *journal);</div><div class='del'>-</div><div class='del'>-static inline int jbd2_journal_get_max_txn_bufs(journal_t *journal)</div><div class='del'>-{</div><div class='del'>-	return (journal-&gt;j_total_len - journal-&gt;j_fc_wbufsize) / 4;</div><div class='del'>-}</div><div class='add'>+void jbd2_fc_release_bufs(journal_t *journal);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * is_journal_abort</div><div class='hunk'>@@ -1696,7 +1695,7 @@ static inline void jbd2_journal_abort_handle(handle_t *handle)</div><div class='ctx'> </div><div class='ctx'> static inline void jbd2_init_fs_dev_write_error(journal_t *journal)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = journal-&gt;j_fs_dev-&gt;bd_inode-&gt;i_mapping;</div><div class='add'>+	struct address_space *mapping = journal-&gt;j_fs_dev-&gt;bd_mapping;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save the original wb_err value of client fs's bdev mapping which</div><div class='hunk'>@@ -1707,7 +1706,7 @@ static inline void jbd2_init_fs_dev_write_error(journal_t *journal)</div><div class='ctx'> </div><div class='ctx'> static inline int jbd2_check_fs_dev_write_error(journal_t *journal)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping = journal-&gt;j_fs_dev-&gt;bd_inode-&gt;i_mapping;</div><div class='add'>+	struct address_space *mapping = journal-&gt;j_fs_dev-&gt;bd_mapping;</div><div class='ctx'> </div><div class='ctx'> 	return errseq_check(&amp;mapping-&gt;wb_err,</div><div class='ctx'> 			    READ_ONCE(journal-&gt;j_fs_dev_wb_err));</div><div class='hunk'>@@ -1730,20 +1729,13 @@ static inline int tid_geq(tid_t x, tid_t y)</div><div class='ctx'> 	return (difference &gt;= 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int jbd2_journal_blocks_per_page(struct inode *inode);</div><div class='add'>+extern int jbd2_journal_blocks_per_folio(struct inode *inode);</div><div class='ctx'> extern size_t journal_tag_bytes(journal_t *journal);</div><div class='ctx'> </div><div class='del'>-static inline bool jbd2_journal_has_csum_v2or3_feature(journal_t *j)</div><div class='del'>-{</div><div class='del'>-	return jbd2_has_feature_csum2(j) || jbd2_has_feature_csum3(j);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int jbd2_journal_has_csum_v2or3(journal_t *journal)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(jbd2_journal_has_csum_v2or3_feature(journal) &amp;&amp;</div><div class='del'>-		     journal-&gt;j_chksum_driver == NULL);</div><div class='del'>-</div><div class='del'>-	return journal-&gt;j_chksum_driver != NULL;</div><div class='add'>+	return jbd2_has_feature_csum2(journal) ||</div><div class='add'>+	       jbd2_has_feature_csum3(journal);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int jbd2_journal_get_num_fc_blks(journal_superblock_t *jsb)</div><div class='hunk'>@@ -1780,28 +1772,9 @@ static inline unsigned long jbd2_log_space_left(journal_t *journal)</div><div class='ctx'> #define BJ_Reserved	4	/* Buffer is reserved for access by journal */</div><div class='ctx'> #define BJ_Types	5</div><div class='ctx'> </div><div class='del'>-/* JBD uses a CRC32 checksum */</div><div class='del'>-#define JBD_MAX_CHECKSUM_SIZE 4</div><div class='del'>-</div><div class='del'>-static inline u32 jbd2_chksum(journal_t *journal, u32 crc,</div><div class='del'>-			      const void *address, unsigned int length)</div><div class='add'>+static inline u32 jbd2_chksum(u32 crc, const void *address, unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	struct {</div><div class='del'>-		struct shash_desc shash;</div><div class='del'>-		char ctx[JBD_MAX_CHECKSUM_SIZE];</div><div class='del'>-	} desc;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(crypto_shash_descsize(journal-&gt;j_chksum_driver) &gt;</div><div class='del'>-		JBD_MAX_CHECKSUM_SIZE);</div><div class='del'>-</div><div class='del'>-	desc.shash.tfm = journal-&gt;j_chksum_driver;</div><div class='del'>-	*(u32 *)desc.ctx = crc;</div><div class='del'>-</div><div class='del'>-	err = crypto_shash_update(&amp;desc.shash, address, length);</div><div class='del'>-	BUG_ON(err);</div><div class='del'>-</div><div class='del'>-	return *(u32 *)desc.ctx;</div><div class='add'>+	return crc32c(crc, address, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Return most recent uncommitted transaction */</div><div class='head'>diff --git a/include/linux/jhash.h b/include/linux/jhash.h<br/>index ab7f8c152b89..7c1c1821c694 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/jhash.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/jhash.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/jhash.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/jhash.h</a></div><div class='hunk'>@@ -24,14 +24,14 @@</div><div class='ctx'>  * Jozsef</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/unaligned/packed_struct.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Best hash sizes are of power of two */</div><div class='ctx'> #define jhash_size(n)   ((u32)1&lt;&lt;(n))</div><div class='ctx'> /* Mask the hash value, i.e (value &amp; jhash_mask(n)) instead of (value % n) */</div><div class='ctx'> #define jhash_mask(n)   (jhash_size(n)-1)</div><div class='ctx'> </div><div class='del'>-/* __jhash_mix -- mix 3 32-bit values reversibly. */</div><div class='add'>+/* __jhash_mix - mix 3 32-bit values reversibly. */</div><div class='ctx'> #define __jhash_mix(a, b, c)			\</div><div class='ctx'> {						\</div><div class='ctx'> 	a -= c;  a ^= rol32(c, 4);  c += b;	\</div><div class='hunk'>@@ -60,7 +60,7 @@</div><div class='ctx'> /* jhash - hash an arbitrary key</div><div class='ctx'>  * @k: sequence of bytes as key</div><div class='ctx'>  * @length: the length of the key</div><div class='del'>- * @initval: the previous hash, or an arbitray value</div><div class='add'>+ * @initval: the previous hash, or an arbitrary value</div><div class='ctx'>  *</div><div class='ctx'>  * The generic version, hashes an arbitrary sequence of bytes.</div><div class='ctx'>  * No alignment or length assumptions are made about the input key.</div><div class='hunk'>@@ -77,9 +77,9 @@ static inline u32 jhash(const void *key, u32 length, u32 initval)</div><div class='ctx'> </div><div class='ctx'> 	/* All but the last block: affect some 32 bits of (a,b,c) */</div><div class='ctx'> 	while (length &gt; 12) {</div><div class='del'>-		a += __get_unaligned_cpu32(k);</div><div class='del'>-		b += __get_unaligned_cpu32(k + 4);</div><div class='del'>-		c += __get_unaligned_cpu32(k + 8);</div><div class='add'>+		a += get_unaligned((u32 *)k);</div><div class='add'>+		b += get_unaligned((u32 *)(k + 4));</div><div class='add'>+		c += get_unaligned((u32 *)(k + 8));</div><div class='ctx'> 		__jhash_mix(a, b, c);</div><div class='ctx'> 		length -= 12;</div><div class='ctx'> 		k += 12;</div><div class='hunk'>@@ -110,7 +110,7 @@ static inline u32 jhash(const void *key, u32 length, u32 initval)</div><div class='ctx'> /* jhash2 - hash an array of u32's</div><div class='ctx'>  * @k: the key which must be an array of u32's</div><div class='ctx'>  * @length: the number of u32's in the key</div><div class='del'>- * @initval: the previous hash, or an arbitray value</div><div class='add'>+ * @initval: the previous hash, or an arbitrary value</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the hash value of the key.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h<br/>index d9f1435a5a13..fdef2c155c27 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/jiffies.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/jiffies.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/jiffies.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/jiffies.h</a></div><div class='hunk'>@@ -59,9 +59,9 @@</div><div class='ctx'> /* LATCH is used in the interval timer and ftape setup. */</div><div class='ctx'> #define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */</div><div class='ctx'> </div><div class='del'>-extern int register_refined_jiffies(long clock_tick_rate);</div><div class='add'>+extern void register_refined_jiffies(long clock_tick_rate);</div><div class='ctx'> </div><div class='del'>-/* TICK_USEC is the time between ticks in usec assuming SHIFTED_HZ */</div><div class='add'>+/* TICK_USEC is the time between ticks in usec */</div><div class='ctx'> #define TICK_USEC ((USEC_PER_SEC + HZ/2) / HZ)</div><div class='ctx'> </div><div class='ctx'> /* USER_TICK_USEC is the time between ticks in usec assuming fake USER_HZ */</div><div class='hunk'>@@ -418,7 +418,7 @@ extern unsigned long preset_lpj;</div><div class='ctx'> #define NSEC_CONVERSION ((unsigned long)((((u64)1 &lt;&lt; NSEC_JIFFIE_SC) +\</div><div class='ctx'>                                         TICK_NSEC -1) / (u64)TICK_NSEC))</div><div class='ctx'> /*</div><div class='del'>- * The maximum jiffie value is (MAX_INT &gt;&gt; 1).  Here we translate that</div><div class='add'>+ * The maximum jiffy value is (MAX_INT &gt;&gt; 1).  Here we translate that</div><div class='ctx'>  * into seconds.  The 64-bit case will overflow if we are not careful,</div><div class='ctx'>  * so use the messy SH_DIV macro to do it.  Still all constants.</div><div class='ctx'>  */</div><div class='hunk'>@@ -502,7 +502,7 @@ static inline unsigned long _msecs_to_jiffies(const unsigned int m)</div><div class='ctx'>  * - all other values are converted to jiffies by either multiplying</div><div class='ctx'>  *   the input value by a factor or dividing it with a factor and</div><div class='ctx'>  *   handling any 32-bit overflows.</div><div class='del'>- *   for the details see __msecs_to_jiffies()</div><div class='add'>+ *   for the details see _msecs_to_jiffies()</div><div class='ctx'>  *</div><div class='ctx'>  * msecs_to_jiffies() checks for the passed in value being a constant</div><div class='ctx'>  * via __builtin_constant_p() allowing gcc to eliminate most of the</div><div class='hunk'>@@ -526,6 +526,19 @@ static __always_inline unsigned long msecs_to_jiffies(const unsigned int m)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * secs_to_jiffies: - convert seconds to jiffies</div><div class='add'>+ * @_secs: time in seconds</div><div class='add'>+ *</div><div class='add'>+ * Conversion is done by simple multiplication with HZ</div><div class='add'>+ *</div><div class='add'>+ * secs_to_jiffies() is defined as a macro rather than a static inline</div><div class='add'>+ * function so it can be used in static initializers.</div><div class='add'>+ *</div><div class='add'>+ * Return: jiffies value</div><div class='add'>+ */</div><div class='add'>+#define secs_to_jiffies(_secs) (unsigned long)((_secs) * HZ)</div><div class='add'>+</div><div class='ctx'> extern unsigned long __usecs_to_jiffies(const unsigned int u);</div><div class='ctx'> #if !(USEC_PER_SEC % HZ)</div><div class='ctx'> static inline unsigned long _usecs_to_jiffies(const unsigned int u)</div><div class='hunk'>@@ -598,4 +611,16 @@ extern unsigned long nsecs_to_jiffies(u64 n);</div><div class='ctx'> </div><div class='ctx'> #define TIMESTAMP_SIZE	30</div><div class='ctx'> </div><div class='add'>+struct ctl_table;</div><div class='add'>+int proc_dointvec_jiffies(const struct ctl_table *table, int dir, void *buffer,</div><div class='add'>+			  size_t *lenp, loff_t *ppos);</div><div class='add'>+int proc_dointvec_ms_jiffies_minmax(const struct ctl_table *table, int dir,</div><div class='add'>+				    void *buffer, size_t *lenp, loff_t *ppos);</div><div class='add'>+int proc_dointvec_userhz_jiffies(const struct ctl_table *table, int dir,</div><div class='add'>+				 void *buffer, size_t *lenp, loff_t *ppos);</div><div class='add'>+int proc_dointvec_ms_jiffies(const struct ctl_table *table, int dir, void *buffer,</div><div class='add'>+			     size_t *lenp, loff_t *ppos);</div><div class='add'>+int proc_doulongvec_ms_jiffies_minmax(const struct ctl_table *table, int dir,</div><div class='add'>+				      void *buffer, size_t *lenp, loff_t *ppos);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h<br/>index f0a949b7c973..fdb79dd1ebd8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/jump_label.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/jump_label.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/jump_label.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/jump_label.h</a></div><div class='hunk'>@@ -75,6 +75,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern bool static_key_initialized;</div><div class='ctx'> </div><div class='hunk'>@@ -216,6 +217,7 @@ extern struct jump_entry __start___jump_table[];</div><div class='ctx'> extern struct jump_entry __stop___jump_table[];</div><div class='ctx'> </div><div class='ctx'> extern void jump_label_init(void);</div><div class='add'>+extern void jump_label_init_ro(void);</div><div class='ctx'> extern void jump_label_lock(void);</div><div class='ctx'> extern void jump_label_unlock(void);</div><div class='ctx'> extern void arch_jump_label_transform(struct jump_entry *entry,</div><div class='hunk'>@@ -265,6 +267,8 @@ static __always_inline void jump_label_init(void)</div><div class='ctx'> 	static_key_initialized = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline void jump_label_init_ro(void) { }</div><div class='add'>+</div><div class='ctx'> static __always_inline bool static_key_false(struct static_key *key)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely_notrace(static_key_count(key) &gt; 0))</div><div class='hunk'>@@ -344,6 +348,8 @@ static inline void static_key_disable(struct static_key *key)</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_JUMP_LABEL */</div><div class='ctx'> </div><div class='add'>+DEFINE_LOCK_GUARD_0(jump_label_lock, jump_label_lock(), jump_label_unlock())</div><div class='add'>+</div><div class='ctx'> #define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE</div><div class='ctx'> #define jump_label_enabled static_key_enabled</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h<br/>index c3f075e8f60c..d5dd54c53ace 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kallsyms.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kallsyms.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kallsyms.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kallsyms.h</a></div><div class='hunk'>@@ -55,9 +55,8 @@ static inline void *dereference_symbol_descriptor(void *ptr)</div><div class='ctx'> 	if (is_ksym_addr((unsigned long)ptr))</div><div class='ctx'> 		return ptr;</div><div class='ctx'> </div><div class='del'>-	preempt_disable();</div><div class='add'>+	guard(rcu)();</div><div class='ctx'> 	mod = __module_address((unsigned long)ptr);</div><div class='del'>-	preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 	if (mod)</div><div class='ctx'> 		ptr = dereference_module_function_descriptor(mod, ptr);</div><div class='head'>diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h<br/>index 6f612d69ea0c..9eca967d8526 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kasan-enabled.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kasan-enabled.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kasan-enabled.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kasan-enabled.h</a></div><div class='hunk'>@@ -4,32 +4,46 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/static_key.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KASAN_HW_TAGS</div><div class='del'>-</div><div class='add'>+#if defined(CONFIG_ARCH_DEFER_KASAN) || defined(CONFIG_KASAN_HW_TAGS)</div><div class='add'>+/*</div><div class='add'>+ * Global runtime flag for KASAN modes that need runtime control.</div><div class='add'>+ * Used by ARCH_DEFER_KASAN architectures and HW_TAGS mode.</div><div class='add'>+ */</div><div class='ctx'> DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Runtime control for shadow memory initialization or HW_TAGS mode.</div><div class='add'>+ * Uses static key for architectures that need deferred KASAN or HW_TAGS.</div><div class='add'>+ */</div><div class='ctx'> static __always_inline bool kasan_enabled(void)</div><div class='ctx'> {</div><div class='ctx'> 	return static_branch_likely(&amp;kasan_flag_enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool kasan_hw_tags_enabled(void)</div><div class='add'>+static inline void kasan_enable(void)</div><div class='ctx'> {</div><div class='del'>-	return kasan_enabled();</div><div class='add'>+	static_branch_enable(&amp;kasan_flag_enabled);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_KASAN_HW_TAGS */</div><div class='del'>-</div><div class='del'>-static inline bool kasan_enabled(void)</div><div class='add'>+#else</div><div class='add'>+/* For architectures that can enable KASAN early, use compile-time check. */</div><div class='add'>+static __always_inline bool kasan_enabled(void)</div><div class='ctx'> {</div><div class='ctx'> 	return IS_ENABLED(CONFIG_KASAN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void kasan_enable(void) {}</div><div class='add'>+#endif /* CONFIG_ARCH_DEFER_KASAN || CONFIG_KASAN_HW_TAGS */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KASAN_HW_TAGS</div><div class='add'>+static inline bool kasan_hw_tags_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return kasan_enabled();</div><div class='add'>+}</div><div class='add'>+#else</div><div class='ctx'> static inline bool kasan_hw_tags_enabled(void)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #endif /* CONFIG_KASAN_HW_TAGS */</div><div class='ctx'> </div><div class='ctx'> #endif /* LINUX_KASAN_ENABLED_H */</div><div class='head'>diff --git a/include/linux/kasan.h b/include/linux/kasan.h<br/>index 70d6a8f6e25d..f335c1d7b61d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kasan.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kasan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kasan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kasan.h</a></div><div class='hunk'>@@ -29,6 +29,9 @@ typedef unsigned int __bitwise kasan_vmalloc_flags_t;</div><div class='ctx'> #define KASAN_VMALLOC_VM_ALLOC		((__force kasan_vmalloc_flags_t)0x02u)</div><div class='ctx'> #define KASAN_VMALLOC_PROT_NORMAL	((__force kasan_vmalloc_flags_t)0x04u)</div><div class='ctx'> </div><div class='add'>+#define KASAN_VMALLOC_PAGE_RANGE 0x1 /* Apply exsiting page range */</div><div class='add'>+#define KASAN_VMALLOC_TLB_FLUSH  0x2 /* TLB flush */</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pgtable.h&gt;</div><div class='hunk'>@@ -150,7 +153,7 @@ static __always_inline void kasan_unpoison_new_object(struct kmem_cache *cache,</div><div class='ctx'> </div><div class='ctx'> void __kasan_poison_new_object(struct kmem_cache *cache, void *object);</div><div class='ctx'> /**</div><div class='del'>- * kasan_unpoison_new_object - Repoison a new slab object.</div><div class='add'>+ * kasan_poison_new_object - Repoison a new slab object.</div><div class='ctx'>  * @cache: Cache the object belong to.</div><div class='ctx'>  * @object: Pointer to the object.</div><div class='ctx'>  *</div><div class='hunk'>@@ -175,13 +178,61 @@ static __always_inline void * __must_check kasan_init_slab_obj(</div><div class='ctx'> 	return (void *)object;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool __kasan_slab_free(struct kmem_cache *s, void *object,</div><div class='del'>-			unsigned long ip, bool init);</div><div class='add'>+bool __kasan_slab_pre_free(struct kmem_cache *s, void *object,</div><div class='add'>+			unsigned long ip);</div><div class='add'>+/**</div><div class='add'>+ * kasan_slab_pre_free - Check whether freeing a slab object is safe.</div><div class='add'>+ * @object: Object to be freed.</div><div class='add'>+ *</div><div class='add'>+ * This function checks whether freeing the given object is safe. It may</div><div class='add'>+ * check for double-free and invalid-free bugs and report them.</div><div class='add'>+ *</div><div class='add'>+ * This function is intended only for use by the slab allocator.</div><div class='add'>+ *</div><div class='add'>+ * @Return true if freeing the object is unsafe; false otherwise.</div><div class='add'>+ */</div><div class='add'>+static __always_inline bool kasan_slab_pre_free(struct kmem_cache *s,</div><div class='add'>+						void *object)</div><div class='add'>+{</div><div class='add'>+	if (kasan_enabled())</div><div class='add'>+		return __kasan_slab_pre_free(s, object, _RET_IP_);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool __kasan_slab_free(struct kmem_cache *s, void *object, bool init,</div><div class='add'>+		       bool still_accessible, bool no_quarantine);</div><div class='add'>+/**</div><div class='add'>+ * kasan_slab_free - Poison, initialize, and quarantine a slab object.</div><div class='add'>+ * @object: Object to be freed.</div><div class='add'>+ * @init: Whether to initialize the object.</div><div class='add'>+ * @still_accessible: Whether the object contents are still accessible.</div><div class='add'>+ *</div><div class='add'>+ * This function informs that a slab object has been freed and is not</div><div class='add'>+ * supposed to be accessed anymore, except when @still_accessible is set</div><div class='add'>+ * (indicating that the object is in a SLAB_TYPESAFE_BY_RCU cache and an RCU</div><div class='add'>+ * grace period might not have passed yet).</div><div class='add'>+ *</div><div class='add'>+ * For KASAN modes that have integrated memory initialization</div><div class='add'>+ * (kasan_has_integrated_init() == true), this function also initializes</div><div class='add'>+ * the object's memory. For other modes, the @init argument is ignored.</div><div class='add'>+ *</div><div class='add'>+ * This function might also take ownership of the object to quarantine it.</div><div class='add'>+ * When this happens, KASAN will defer freeing the object to a later</div><div class='add'>+ * stage and handle it internally until then. The return value indicates</div><div class='add'>+ * whether KASAN took ownership of the object.</div><div class='add'>+ *</div><div class='add'>+ * This function is intended only for use by the slab allocator.</div><div class='add'>+ *</div><div class='add'>+ * @Return true if KASAN took ownership of the object; false otherwise.</div><div class='add'>+ */</div><div class='ctx'> static __always_inline bool kasan_slab_free(struct kmem_cache *s,</div><div class='del'>-						void *object, bool init)</div><div class='add'>+					    void *object, bool init,</div><div class='add'>+					    bool still_accessible,</div><div class='add'>+					    bool no_quarantine)</div><div class='ctx'> {</div><div class='ctx'> 	if (kasan_enabled())</div><div class='del'>-		return __kasan_slab_free(s, object, _RET_IP_, init);</div><div class='add'>+		return __kasan_slab_free(s, object, init, still_accessible,</div><div class='add'>+					 no_quarantine);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -371,7 +422,15 @@ static inline void *kasan_init_slab_obj(struct kmem_cache *cache,</div><div class='ctx'> {</div><div class='ctx'> 	return (void *)object;</div><div class='ctx'> }</div><div class='del'>-static inline bool kasan_slab_free(struct kmem_cache *s, void *object, bool init)</div><div class='add'>+</div><div class='add'>+static inline bool kasan_slab_pre_free(struct kmem_cache *s, void *object)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool kasan_slab_free(struct kmem_cache *s, void *object,</div><div class='add'>+				   bool init, bool still_accessible,</div><div class='add'>+				   bool no_quarantine)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -435,7 +494,6 @@ void kasan_cache_create(struct kmem_cache *cache, unsigned int *size,</div><div class='ctx'> void kasan_cache_shrink(struct kmem_cache *cache);</div><div class='ctx'> void kasan_cache_shutdown(struct kmem_cache *cache);</div><div class='ctx'> void kasan_record_aux_stack(void *ptr);</div><div class='del'>-void kasan_record_aux_stack_noalloc(void *ptr);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_KASAN_GENERIC */</div><div class='ctx'> </div><div class='hunk'>@@ -453,7 +511,6 @@ static inline void kasan_cache_create(struct kmem_cache *cache,</div><div class='ctx'> static inline void kasan_cache_shrink(struct kmem_cache *cache) {}</div><div class='ctx'> static inline void kasan_cache_shutdown(struct kmem_cache *cache) {}</div><div class='ctx'> static inline void kasan_record_aux_stack(void *ptr) {}</div><div class='del'>-static inline void kasan_record_aux_stack_noalloc(void *ptr) {}</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_KASAN_GENERIC */</div><div class='ctx'> </div><div class='hunk'>@@ -489,6 +546,12 @@ void kasan_report_async(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_KASAN_HW_TAGS */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KASAN_GENERIC</div><div class='add'>+void __init kasan_init_generic(void);</div><div class='add'>+#else</div><div class='add'>+static inline void kasan_init_generic(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KASAN_SW_TAGS</div><div class='ctx'> void __init kasan_init_sw_tags(void);</div><div class='ctx'> #else</div><div class='hunk'>@@ -508,10 +571,27 @@ static inline void kasan_init_hw_tags(void) { }</div><div class='ctx'> #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)</div><div class='ctx'> </div><div class='ctx'> void kasan_populate_early_vm_area_shadow(void *start, unsigned long size);</div><div class='del'>-int kasan_populate_vmalloc(unsigned long addr, unsigned long size);</div><div class='del'>-void kasan_release_vmalloc(unsigned long start, unsigned long end,</div><div class='add'>+int __kasan_populate_vmalloc(unsigned long addr, unsigned long size, gfp_t gfp_mask);</div><div class='add'>+static inline int kasan_populate_vmalloc(unsigned long addr,</div><div class='add'>+					 unsigned long size, gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	if (kasan_enabled())</div><div class='add'>+		return __kasan_populate_vmalloc(addr, size, gfp_mask);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+void __kasan_release_vmalloc(unsigned long start, unsigned long end,</div><div class='ctx'> 			   unsigned long free_region_start,</div><div class='del'>-			   unsigned long free_region_end);</div><div class='add'>+			   unsigned long free_region_end,</div><div class='add'>+			   unsigned long flags);</div><div class='add'>+static inline void kasan_release_vmalloc(unsigned long start, unsigned long end,</div><div class='add'>+			   unsigned long free_region_start,</div><div class='add'>+			   unsigned long free_region_end,</div><div class='add'>+			   unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	if (kasan_enabled())</div><div class='add'>+		return __kasan_release_vmalloc(start, end, free_region_start,</div><div class='add'>+					 free_region_end, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */</div><div class='ctx'> </div><div class='hunk'>@@ -519,14 +599,15 @@ static inline void kasan_populate_early_vm_area_shadow(void *start,</div><div class='ctx'> 						       unsigned long size)</div><div class='ctx'> { }</div><div class='ctx'> static inline int kasan_populate_vmalloc(unsigned long start,</div><div class='del'>-					unsigned long size)</div><div class='add'>+					unsigned long size, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline void kasan_release_vmalloc(unsigned long start,</div><div class='ctx'> 					 unsigned long end,</div><div class='ctx'> 					 unsigned long free_region_start,</div><div class='del'>-					 unsigned long free_region_end) { }</div><div class='add'>+					 unsigned long free_region_end,</div><div class='add'>+					 unsigned long flags) { }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */</div><div class='ctx'> </div><div class='hunk'>@@ -554,14 +635,15 @@ static __always_inline void kasan_poison_vmalloc(const void *start,</div><div class='ctx'> static inline void kasan_populate_early_vm_area_shadow(void *start,</div><div class='ctx'> 						       unsigned long size) { }</div><div class='ctx'> static inline int kasan_populate_vmalloc(unsigned long start,</div><div class='del'>-					unsigned long size)</div><div class='add'>+					unsigned long size, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline void kasan_release_vmalloc(unsigned long start,</div><div class='ctx'> 					 unsigned long end,</div><div class='ctx'> 					 unsigned long free_region_start,</div><div class='del'>-					 unsigned long free_region_end) { }</div><div class='add'>+					 unsigned long free_region_end,</div><div class='add'>+					 unsigned long flags) { }</div><div class='ctx'> </div><div class='ctx'> static inline void *kasan_unpoison_vmalloc(const void *start,</div><div class='ctx'> 					   unsigned long size,</div><div class='head'>diff --git a/include/linux/kcore.h b/include/linux/kcore.h<br/>index 86c0f1d18998..9a2fa013c91d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kcore.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kcore.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kcore.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kcore.h</a></div><div class='hunk'>@@ -20,19 +20,6 @@ struct kcore_list {</div><div class='ctx'> 	int type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct vmcore {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	unsigned long long paddr;</div><div class='del'>-	unsigned long long size;</div><div class='del'>-	loff_t offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct vmcoredd_node {</div><div class='del'>-	struct list_head list;	/* List of dumps */</div><div class='del'>-	void *buf;		/* Buffer containing device's dump */</div><div class='del'>-	unsigned int size;	/* Size of the buffer */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PROC_KCORE</div><div class='ctx'> void __init kclist_add(struct kcore_list *, void *, size_t, int type);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/kcov.h b/include/linux/kcov.h<br/>index b851ba415e03..0143358874b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kcov.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kcov.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kcov.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kcov.h</a></div><div class='hunk'>@@ -21,6 +21,8 @@ enum kcov_mode {</div><div class='ctx'> 	KCOV_MODE_TRACE_PC = 2,</div><div class='ctx'> 	/* Collecting comparison operands mode. */</div><div class='ctx'> 	KCOV_MODE_TRACE_CMP = 3,</div><div class='add'>+	/* The process owns a KCOV remote reference. */</div><div class='add'>+	KCOV_MODE_REMOTE = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define KCOV_IN_CTXSW	(1 &lt;&lt; 30)</div><div class='hunk'>@@ -62,13 +64,13 @@ static inline void kcov_remote_start_usb(u64 id)</div><div class='ctx'> </div><div class='ctx'> static inline void kcov_remote_start_usb_softirq(u64 id)</div><div class='ctx'> {</div><div class='del'>-	if (in_serving_softirq())</div><div class='add'>+	if (in_serving_softirq() &amp;&amp; !in_hardirq())</div><div class='ctx'> 		kcov_remote_start_usb(id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void kcov_remote_stop_softirq(void)</div><div class='ctx'> {</div><div class='del'>-	if (in_serving_softirq())</div><div class='add'>+	if (in_serving_softirq() &amp;&amp; !in_hardirq())</div><div class='ctx'> 		kcov_remote_stop();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/kdb.h b/include/linux/kdb.h<br/>index f6c2ddb16b95..741c58e86431 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kdb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kdb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kdb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kdb.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Shifted versions of the command enable bits are be used if the command</div><div class='ctx'>  * has no arguments (see kdb_check_flags). This allows commands, such as</div><div class='hunk'>@@ -104,7 +105,7 @@ extern int kdb_initial_cpu;</div><div class='ctx'> #define KDB_NOENVVALUE	(-6)</div><div class='ctx'> #define KDB_NOTIMP	(-7)</div><div class='ctx'> #define KDB_ENVFULL	(-8)</div><div class='del'>-#define KDB_ENVBUFFULL	(-9)</div><div class='add'>+#define KDB_KMALLOCFAILED	(-9)</div><div class='ctx'> #define KDB_TOOMANYBPT	(-10)</div><div class='ctx'> #define KDB_TOOMANYDBREGS (-11)</div><div class='ctx'> #define KDB_DUPBPT	(-12)</div><div class='hunk'>@@ -140,9 +141,6 @@ extern const char *kdb_diemsg;</div><div class='ctx'> </div><div class='ctx'> extern unsigned int kdb_flags;	/* Global flags, see kdb_state for per cpu state */</div><div class='ctx'> </div><div class='del'>-extern void kdb_save_flags(void);</div><div class='del'>-extern void kdb_restore_flags(void);</div><div class='del'>-</div><div class='ctx'> #define KDB_FLAG(flag)		(kdb_flags &amp; KDB_FLAG_##flag)</div><div class='ctx'> #define KDB_FLAG_SET(flag)	((void)(kdb_flags |= KDB_FLAG_##flag))</div><div class='ctx'> #define KDB_FLAG_CLEAR(flag)	((void)(kdb_flags &amp;= ~KDB_FLAG_##flag))</div><div class='hunk'>@@ -210,11 +208,26 @@ static inline const char *kdb_walk_kallsyms(loff_t *pos)</div><div class='ctx'> /* Dynamic kdb shell command registration */</div><div class='ctx'> extern int kdb_register(kdbtab_t *cmd);</div><div class='ctx'> extern void kdb_unregister(kdbtab_t *cmd);</div><div class='add'>+</div><div class='add'>+/* Return true when KDB as locked for printing a message on this CPU. */</div><div class='add'>+static inline</div><div class='add'>+bool kdb_printf_on_this_cpu(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * We can use raw_smp_processor_id() here because the task could</div><div class='add'>+	 * not get migrated when KDB has locked for printing on this CPU.</div><div class='add'>+	 */</div><div class='add'>+	return unlikely(READ_ONCE(kdb_printf_cpu) == raw_smp_processor_id());</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* ! CONFIG_KGDB_KDB */</div><div class='ctx'> static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; }</div><div class='ctx'> static inline void kdb_init(int level) {}</div><div class='ctx'> static inline int kdb_register(kdbtab_t *cmd) { return 0; }</div><div class='ctx'> static inline void kdb_unregister(kdbtab_t *cmd) {}</div><div class='add'>+</div><div class='add'>+static inline bool kdb_printf_on_this_cpu(void) { return false; }</div><div class='add'>+</div><div class='ctx'> #endif	/* CONFIG_KGDB_KDB */</div><div class='ctx'> enum {</div><div class='ctx'> 	KDB_NOT_INITIALIZED,</div><div class='head'>diff --git a/include/linux/kernel-page-flags.h b/include/linux/kernel-page-flags.h<br/>index 859f4b0c1b2b..196778a087c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kernel-page-flags.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernel-page-flags.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kernel-page-flags.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kernel-page-flags.h</a></div><div class='hunk'>@@ -10,12 +10,11 @@</div><div class='ctx'>  */</div><div class='ctx'> #define KPF_RESERVED		32</div><div class='ctx'> #define KPF_MLOCKED		33</div><div class='del'>-#define KPF_MAPPEDTODISK	34</div><div class='add'>+#define KPF_OWNER_2		34</div><div class='ctx'> #define KPF_PRIVATE		35</div><div class='ctx'> #define KPF_PRIVATE_2		36</div><div class='ctx'> #define KPF_OWNER_PRIVATE	37</div><div class='ctx'> #define KPF_ARCH		38</div><div class='del'>-#define KPF_UNCACHED		39</div><div class='ctx'> #define KPF_SOFTDIRTY		40</div><div class='ctx'> #define KPF_ARCH_2		41</div><div class='ctx'> #define KPF_ARCH_3		42</div><div class='head'>diff --git a/include/linux/kernel.h b/include/linux/kernel.h<br/>index d718fbec72dd..5b46924fdff5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kernel.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kernel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kernel.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/sprintf.h&gt;</div><div class='ctx'> #include &lt;linux/static_call_types.h&gt;</div><div class='ctx'> #include &lt;linux/instruction_pointer.h&gt;</div><div class='add'>+#include &lt;linux/util_macros.h&gt;</div><div class='ctx'> #include &lt;linux/wordpart.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='hunk'>@@ -41,19 +42,6 @@</div><div class='ctx'> </div><div class='ctx'> #define STACK_MAGIC	0xdeadbeef</div><div class='ctx'> </div><div class='del'>-/* generic data direction definitions */</div><div class='del'>-#define READ			0</div><div class='del'>-#define WRITE			1</div><div class='del'>-</div><div class='del'>-#define PTR_IF(cond, ptr)	((cond) ? (ptr) : NULL)</div><div class='del'>-</div><div class='del'>-#define u64_to_user_ptr(x) (		\</div><div class='del'>-{					\</div><div class='del'>-	typecheck(u64, (x));		\</div><div class='del'>-	(void __user *)(uintptr_t)(x);	\</div><div class='del'>-}					\</div><div class='del'>-)</div><div class='del'>-</div><div class='ctx'> struct completion;</div><div class='ctx'> struct user;</div><div class='ctx'> </div><div class='hunk'>@@ -176,11 +164,23 @@ extern int root_mountflags;</div><div class='ctx'> </div><div class='ctx'> extern bool early_boot_irqs_disabled;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Values used for system_state. Ordering of the states must not be changed</div><div class='add'>+/**</div><div class='add'>+ * enum system_states - Values used for system_state.</div><div class='add'>+ *</div><div class='add'>+ * @SYSTEM_BOOTING:	%0, no init needed</div><div class='add'>+ * @SYSTEM_SCHEDULING: system is ready for scheduling; OK to use RCU</div><div class='add'>+ * @SYSTEM_FREEING_INITMEM: system is freeing all of initmem; almost running</div><div class='add'>+ * @SYSTEM_RUNNING:	system is up and running</div><div class='add'>+ * @SYSTEM_HALT:	system entered clean system halt state</div><div class='add'>+ * @SYSTEM_POWER_OFF:	system entered shutdown/clean power off state</div><div class='add'>+ * @SYSTEM_RESTART:	system entered emergency power off or normal restart</div><div class='add'>+ * @SYSTEM_SUSPEND:	system entered suspend or hibernate state</div><div class='add'>+ *</div><div class='add'>+ * Note:</div><div class='add'>+ * Ordering of the states must not be changed</div><div class='ctx'>  * as code checks for &lt;, &lt;=, &gt;, &gt;= STATE.</div><div class='ctx'>  */</div><div class='del'>-extern enum system_states {</div><div class='add'>+enum system_states {</div><div class='ctx'> 	SYSTEM_BOOTING,</div><div class='ctx'> 	SYSTEM_SCHEDULING,</div><div class='ctx'> 	SYSTEM_FREEING_INITMEM,</div><div class='hunk'>@@ -189,7 +189,8 @@ extern enum system_states {</div><div class='ctx'> 	SYSTEM_POWER_OFF,</div><div class='ctx'> 	SYSTEM_RESTART,</div><div class='ctx'> 	SYSTEM_SUSPEND,</div><div class='del'>-} system_state;</div><div class='add'>+};</div><div class='add'>+extern enum system_states system_state;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * General tracing related utility functions - trace_printk(),</div><div class='hunk'>@@ -215,6 +216,7 @@ enum ftrace_dump_mode {</div><div class='ctx'> 	DUMP_NONE,</div><div class='ctx'> 	DUMP_ALL,</div><div class='ctx'> 	DUMP_ORIG,</div><div class='add'>+	DUMP_PARAM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TRACING</div><div class='hunk'>@@ -384,9 +386,9 @@ ftrace_vprintk(const char *fmt, va_list ap)</div><div class='ctx'> static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }</div><div class='ctx'> #endif /* CONFIG_TRACING */</div><div class='ctx'> </div><div class='del'>-/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */</div><div class='del'>-#ifdef CONFIG_FTRACE_MCOUNT_RECORD</div><div class='del'>-# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD</div><div class='add'>+/* Rebuild everything on CONFIG_DYNAMIC_FTRACE */</div><div class='add'>+#ifdef CONFIG_DYNAMIC_FTRACE</div><div class='add'>+# define REBUILD_DUE_TO_DYNAMIC_FTRACE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Permissions on a sysfs file: you didn't miss the 0 prefix did you? */</div><div class='head'>diff --git a/include/linux/kernel_read_file.h b/include/linux/kernel_read_file.h<br/>index 90451e2e12bd..d613a7b4dd35 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kernel_read_file.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernel_read_file.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kernel_read_file.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kernel_read_file.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> 	id(KEXEC_INITRAMFS, kexec-initramfs)	\</div><div class='ctx'> 	id(POLICY, security-policy)		\</div><div class='ctx'> 	id(X509_CERTIFICATE, x509-certificate)	\</div><div class='add'>+	id(MODULE_COMPRESSED, kernel-module-compressed) \</div><div class='ctx'> 	id(MAX_ID, )</div><div class='ctx'> </div><div class='ctx'> #define __fid_enumify(ENUM, dummy) READING_ ## ENUM,</div><div class='head'>diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h<br/>index 9935f7ecbfb9..b97ce2df376f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kernel_stat.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernel_stat.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kernel_stat.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kernel_stat.h</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/vtime.h&gt;</div><div class='hunk'>@@ -79,6 +78,14 @@ static inline unsigned int kstat_cpu_softirqs_sum(int cpu)</div><div class='ctx'> 	return sum;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GENERIC_IRQ_STAT_SNAPSHOT</div><div class='add'>+extern void kstat_snapshot_irqs(void);</div><div class='add'>+extern unsigned int kstat_get_irq_since_snapshot(unsigned int irq);</div><div class='add'>+#else</div><div class='add'>+static inline void kstat_snapshot_irqs(void) { }</div><div class='add'>+static inline unsigned int kstat_get_irq_since_snapshot(unsigned int irq) { return 0; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Number of interrupts per specific IRQ source, since bootup</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h<br/>index 99aaa050ccb7..b5a5f32fdfd1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kernfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kernfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kernfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kernfs.h</a></div><div class='hunk'>@@ -147,6 +147,11 @@ enum kernfs_root_flag {</div><div class='ctx'> 	 * Support user xattrs to be written to nodes rooted at this root.</div><div class='ctx'> 	 */</div><div class='ctx'> 	KERNFS_ROOT_SUPPORT_USER_XATTR		= 0x0008,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Renames must not change the parent node.</div><div class='add'>+	 */</div><div class='add'>+	KERNFS_ROOT_INVARIANT_PARENT		= 0x0010,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* type-specific structures for kernfs_node union members */</div><div class='hunk'>@@ -199,30 +204,32 @@ struct kernfs_node {</div><div class='ctx'> 	 * never moved to a different parent, it is safe to access the</div><div class='ctx'> 	 * parent directly.</div><div class='ctx'> 	 */</div><div class='del'>-	struct kernfs_node	*parent;</div><div class='del'>-	const char		*name;</div><div class='add'>+	struct kernfs_node	__rcu *__parent;</div><div class='add'>+	const char		__rcu *name;</div><div class='ctx'> </div><div class='ctx'> 	struct rb_node		rb;</div><div class='ctx'> </div><div class='ctx'> 	const void		*ns;	/* namespace tag */</div><div class='ctx'> 	unsigned int		hash;	/* ns + name hash */</div><div class='add'>+	unsigned short		flags;</div><div class='add'>+	umode_t			mode;</div><div class='add'>+</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct kernfs_elem_dir		dir;</div><div class='ctx'> 		struct kernfs_elem_symlink	symlink;</div><div class='ctx'> 		struct kernfs_elem_attr		attr;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	void			*priv;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 64bit unique ID.  On 64bit ino setups, id is the ino.  On 32bit,</div><div class='ctx'> 	 * the low 32bits are ino and upper generation.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64			id;</div><div class='ctx'> </div><div class='del'>-	unsigned short		flags;</div><div class='del'>-	umode_t			mode;</div><div class='add'>+	void			*priv;</div><div class='ctx'> 	struct kernfs_iattrs	*iattr;</div><div class='add'>+</div><div class='add'>+	struct rcu_head		rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -393,7 +400,7 @@ static inline bool kernfs_ns_enabled(struct kernfs_node *kn)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen);</div><div class='del'>-int kernfs_path_from_node(struct kernfs_node *root_kn, struct kernfs_node *kn,</div><div class='add'>+int kernfs_path_from_node(struct kernfs_node *kn_to, struct kernfs_node *kn_from,</div><div class='ctx'> 			  char *buf, size_t buflen);</div><div class='ctx'> void pr_cont_kernfs_name(struct kernfs_node *kn);</div><div class='ctx'> void pr_cont_kernfs_path(struct kernfs_node *kn);</div><div class='hunk'>@@ -414,6 +421,7 @@ struct dentry *kernfs_node_dentry(struct kernfs_node *kn,</div><div class='ctx'> struct kernfs_root *kernfs_create_root(struct kernfs_syscall_ops *scops,</div><div class='ctx'> 				       unsigned int flags, void *priv);</div><div class='ctx'> void kernfs_destroy_root(struct kernfs_root *root);</div><div class='add'>+unsigned int kernfs_root_flags(struct kernfs_node *kn);</div><div class='ctx'> </div><div class='ctx'> struct kernfs_node *kernfs_create_dir_ns(struct kernfs_node *parent,</div><div class='ctx'> 					 const char *name, umode_t mode,</div><div class='hunk'>@@ -512,6 +520,8 @@ kernfs_create_root(struct kernfs_syscall_ops *scops, unsigned int flags,</div><div class='ctx'> { return ERR_PTR(-ENOSYS); }</div><div class='ctx'> </div><div class='ctx'> static inline void kernfs_destroy_root(struct kernfs_root *root) { }</div><div class='add'>+static inline unsigned int kernfs_root_flags(struct kernfs_node *kn)</div><div class='add'>+{ return 0; }</div><div class='ctx'> </div><div class='ctx'> static inline struct kernfs_node *</div><div class='ctx'> kernfs_create_dir_ns(struct kernfs_node *parent, const char *name,</div><div class='head'>diff --git a/include/linux/kexec.h b/include/linux/kexec.h<br/>index 400cb6c02176..ff7e231b0485 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kexec.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kexec.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kexec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kexec.h</a></div><div class='hunk'>@@ -15,7 +15,8 @@</div><div class='ctx'> </div><div class='ctx'> #if !defined(__ASSEMBLY__)</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/crash_core.h&gt;</div><div class='add'>+#include &lt;linux/vmcore_info.h&gt;</div><div class='add'>+#include &lt;linux/crash_reserve.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/range.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -24,6 +25,10 @@</div><div class='ctx'> </div><div class='ctx'> extern note_buf_t __percpu *crash_notes;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRASH_DUMP</div><div class='add'>+#include &lt;linux/prandom.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KEXEC_CORE</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='hunk'>@@ -31,6 +36,7 @@ extern note_buf_t __percpu *crash_notes;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;asm/kexec.h&gt;</div><div class='add'>+#include &lt;linux/crash_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Verify architecture specific macros are defined */</div><div class='ctx'> </div><div class='hunk'>@@ -66,8 +72,6 @@ extern note_buf_t __percpu *crash_notes;</div><div class='ctx'> #define KEXEC_CRASH_MEM_ALIGN PAGE_SIZE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define KEXEC_CORE_NOTE_NAME	CRASH_CORE_NOTE_NAME</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This structure is used to hold the arguments that are used when loading</div><div class='ctx'>  * kernel binaries.</div><div class='hunk'>@@ -75,6 +79,12 @@ extern note_buf_t __percpu *crash_notes;</div><div class='ctx'> </div><div class='ctx'> typedef unsigned long kimage_entry_t;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This is a copy of the UAPI struct kexec_segment and must be identical</div><div class='add'>+ * to it because it gets copied straight from user space into kernel</div><div class='add'>+ * memory. Do not modify this structure unless you change the way segments</div><div class='add'>+ * get ingested from user space.</div><div class='add'>+ */</div><div class='ctx'> struct kexec_segment {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This pointer can point to user memory if kexec_load() system</div><div class='hunk'>@@ -168,7 +178,9 @@ int kexec_image_post_load_cleanup_default(struct kimage *image);</div><div class='ctx'>  * @buf_align:	Minimum alignment needed.</div><div class='ctx'>  * @buf_min:	The buffer can't be placed below this address.</div><div class='ctx'>  * @buf_max:	The buffer can't be placed above this address.</div><div class='add'>+ * @cma:	CMA page if the buffer is backed by CMA.</div><div class='ctx'>  * @top_down:	Allocate from top of memory.</div><div class='add'>+ * @random:	Place the buffer at a random position.</div><div class='ctx'>  */</div><div class='ctx'> struct kexec_buf {</div><div class='ctx'> 	struct kimage *image;</div><div class='hunk'>@@ -179,9 +191,35 @@ struct kexec_buf {</div><div class='ctx'> 	unsigned long buf_align;</div><div class='ctx'> 	unsigned long buf_min;</div><div class='ctx'> 	unsigned long buf_max;</div><div class='add'>+	struct page *cma;</div><div class='ctx'> 	bool top_down;</div><div class='add'>+#ifdef CONFIG_CRASH_DUMP</div><div class='add'>+	bool random;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CRASH_DUMP</div><div class='add'>+static inline void kexec_random_range_start(unsigned long start,</div><div class='add'>+					    unsigned long end,</div><div class='add'>+					    struct kexec_buf *kbuf,</div><div class='add'>+					    unsigned long *temp_start)</div><div class='add'>+{</div><div class='add'>+	unsigned short i;</div><div class='add'>+</div><div class='add'>+	if (kbuf-&gt;random) {</div><div class='add'>+		get_random_bytes(&amp;i, sizeof(unsigned short));</div><div class='add'>+		*temp_start = start + (end - start) / USHRT_MAX * i;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void kexec_random_range_start(unsigned long start,</div><div class='add'>+					    unsigned long end,</div><div class='add'>+					    struct kexec_buf *kbuf,</div><div class='add'>+					    unsigned long *temp_start)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int kexec_load_purgatory(struct kimage *image, struct kexec_buf *kbuf);</div><div class='ctx'> int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name,</div><div class='ctx'> 				   void *buf, unsigned int size,</div><div class='hunk'>@@ -203,6 +241,15 @@ static inline int arch_kimage_file_post_load_cleanup(struct kimage *image)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef arch_check_excluded_range</div><div class='add'>+static inline int arch_check_excluded_range(struct kimage *image,</div><div class='add'>+					    unsigned long start,</div><div class='add'>+					    unsigned long end)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KEXEC_SIG</div><div class='ctx'> #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION</div><div class='ctx'> int kexec_kernel_verify_pe_sig(const char *kernel, unsigned long kernel_len);</div><div class='hunk'>@@ -301,6 +348,7 @@ struct kimage {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long nr_segments;</div><div class='ctx'> 	struct kexec_segment segment[KEXEC_SEGMENT_MAX];</div><div class='add'>+	struct page *segment_cma[KEXEC_SEGMENT_MAX];</div><div class='ctx'> </div><div class='ctx'> 	struct list_head control_pages;</div><div class='ctx'> 	struct list_head dest_pages;</div><div class='hunk'>@@ -317,9 +365,12 @@ struct kimage {</div><div class='ctx'> 	/* If set, we are using file mode kexec syscall */</div><div class='ctx'> 	unsigned int file_mode:1;</div><div class='ctx'> #ifdef CONFIG_CRASH_HOTPLUG</div><div class='del'>-	/* If set, allow changes to elfcorehdr of kexec_load'd image */</div><div class='del'>-	unsigned int update_elfcorehdr:1;</div><div class='add'>+	/* If set, it is safe to update kexec segments that are</div><div class='add'>+	 * excluded from SHA calculation.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int hotplug_support:1;</div><div class='ctx'> #endif</div><div class='add'>+	unsigned int no_cma:1;</div><div class='ctx'> </div><div class='ctx'> #ifdef ARCH_HAS_KIMAGE_ARCH</div><div class='ctx'> 	struct kimage_arch arch;</div><div class='hunk'>@@ -344,6 +395,9 @@ struct kimage {</div><div class='ctx'> </div><div class='ctx'> 	/* Information for loading purgatory */</div><div class='ctx'> 	struct purgatory_info purgatory_info;</div><div class='add'>+</div><div class='add'>+	/* Force carrying over the DTB from the current boot */</div><div class='add'>+	bool force_dtb;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CRASH_HOTPLUG</div><div class='hunk'>@@ -358,12 +412,24 @@ struct kimage {</div><div class='ctx'> </div><div class='ctx'> 	phys_addr_t ima_buffer_addr;</div><div class='ctx'> 	size_t ima_buffer_size;</div><div class='add'>+</div><div class='add'>+	unsigned long ima_segment_index;</div><div class='add'>+	bool is_ima_segment_index_set;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	struct {</div><div class='add'>+		struct kexec_segment *scratch;</div><div class='add'>+		phys_addr_t fdt;</div><div class='add'>+	} kho;</div><div class='add'>+</div><div class='ctx'> 	/* Core ELF header buffer */</div><div class='ctx'> 	void *elf_headers;</div><div class='ctx'> 	unsigned long elf_headers_sz;</div><div class='ctx'> 	unsigned long elf_load_addr;</div><div class='add'>+</div><div class='add'>+	/* dm crypt keys buffer */</div><div class='add'>+	unsigned long dm_crypt_keys_addr;</div><div class='add'>+	unsigned long dm_crypt_keys_sz;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* kexec interface functions */</div><div class='hunk'>@@ -378,13 +444,6 @@ extern struct page *kimage_alloc_control_pages(struct kimage *image,</div><div class='ctx'> static inline int machine_kexec_post_load(struct kimage *image) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern void __crash_kexec(struct pt_regs *);</div><div class='del'>-extern void crash_kexec(struct pt_regs *);</div><div class='del'>-int kexec_should_crash(struct task_struct *);</div><div class='del'>-int kexec_crash_loaded(void);</div><div class='del'>-void crash_save_cpu(struct pt_regs *regs, int cpu);</div><div class='del'>-extern int kimage_crash_copy_vmcoreinfo(struct kimage *image);</div><div class='del'>-</div><div class='ctx'> extern struct kimage *kexec_image;</div><div class='ctx'> extern struct kimage *kexec_crash_image;</div><div class='ctx'> </div><div class='hunk'>@@ -396,36 +455,20 @@ bool kexec_load_permitted(int kexec_image_type);</div><div class='ctx'> </div><div class='ctx'> /* List of defined/legal kexec flags */</div><div class='ctx'> #ifndef CONFIG_KEXEC_JUMP</div><div class='del'>-#define KEXEC_FLAGS    (KEXEC_ON_CRASH | KEXEC_UPDATE_ELFCOREHDR)</div><div class='add'>+#define KEXEC_FLAGS    (KEXEC_ON_CRASH | KEXEC_UPDATE_ELFCOREHDR | KEXEC_CRASH_HOTPLUG_SUPPORT)</div><div class='ctx'> #else</div><div class='del'>-#define KEXEC_FLAGS    (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT | KEXEC_UPDATE_ELFCOREHDR)</div><div class='add'>+#define KEXEC_FLAGS    (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT | KEXEC_UPDATE_ELFCOREHDR | \</div><div class='add'>+			KEXEC_CRASH_HOTPLUG_SUPPORT)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* List of defined/legal kexec file flags */</div><div class='ctx'> #define KEXEC_FILE_FLAGS	(KEXEC_FILE_UNLOAD | KEXEC_FILE_ON_CRASH | \</div><div class='del'>-				 KEXEC_FILE_NO_INITRAMFS | KEXEC_FILE_DEBUG)</div><div class='add'>+				 KEXEC_FILE_NO_INITRAMFS | KEXEC_FILE_DEBUG | \</div><div class='add'>+				 KEXEC_FILE_NO_CMA | KEXEC_FILE_FORCE_DTB)</div><div class='ctx'> </div><div class='ctx'> /* flag to track if kexec reboot is in progress */</div><div class='ctx'> extern bool kexec_in_progress;</div><div class='ctx'> </div><div class='del'>-int crash_shrink_memory(unsigned long new_size);</div><div class='del'>-ssize_t crash_get_memory_size(void);</div><div class='del'>-</div><div class='del'>-#ifndef arch_kexec_protect_crashkres</div><div class='del'>-/*</div><div class='del'>- * Protection mechanism for crashkernel reserved memory after</div><div class='del'>- * the kdump kernel is loaded.</div><div class='del'>- *</div><div class='del'>- * Provide an empty default implementation here -- architecture</div><div class='del'>- * code may override this</div><div class='del'>- */</div><div class='del'>-static inline void arch_kexec_protect_crashkres(void) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef arch_kexec_unprotect_crashkres</div><div class='del'>-static inline void arch_kexec_unprotect_crashkres(void) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef page_to_boot_pfn</div><div class='ctx'> static inline unsigned long page_to_boot_pfn(struct page *page)</div><div class='ctx'> {</div><div class='hunk'>@@ -482,38 +525,24 @@ static inline int arch_kexec_post_alloc_pages(void *vaddr, unsigned int pages, g</div><div class='ctx'> static inline void arch_kexec_pre_free_pages(void *vaddr, unsigned int pages) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef arch_crash_handle_hotplug_event</div><div class='del'>-static inline void arch_crash_handle_hotplug_event(struct kimage *image) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int crash_check_update_elfcorehdr(void);</div><div class='del'>-</div><div class='del'>-#ifndef crash_hotplug_cpu_support</div><div class='del'>-static inline int crash_hotplug_cpu_support(void) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef crash_hotplug_memory_support</div><div class='del'>-static inline int crash_hotplug_memory_support(void) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef crash_get_elfcorehdr_size</div><div class='del'>-static inline unsigned int crash_get_elfcorehdr_size(void) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern bool kexec_file_dbg_print;</div><div class='ctx'> </div><div class='del'>-#define kexec_dprintk(fmt, ...)					\</div><div class='del'>-	printk("%s" fmt,					\</div><div class='del'>-	       kexec_file_dbg_print ? KERN_INFO : KERN_DEBUG,	\</div><div class='del'>-	       ##__VA_ARGS__)</div><div class='add'>+#define kexec_dprintk(fmt, arg...) \</div><div class='add'>+        do { if (kexec_file_dbg_print) pr_info(fmt, ##arg); } while (0)</div><div class='ctx'> </div><div class='add'>+extern void *kimage_map_segment(struct kimage *image, unsigned long addr, unsigned long size);</div><div class='add'>+extern void kimage_unmap_segment(void *buffer);</div><div class='ctx'> #else /* !CONFIG_KEXEC_CORE */</div><div class='ctx'> struct pt_regs;</div><div class='ctx'> struct task_struct;</div><div class='add'>+struct kimage;</div><div class='ctx'> static inline void __crash_kexec(struct pt_regs *regs) { }</div><div class='ctx'> static inline void crash_kexec(struct pt_regs *regs) { }</div><div class='ctx'> static inline int kexec_should_crash(struct task_struct *p) { return 0; }</div><div class='ctx'> static inline int kexec_crash_loaded(void) { return 0; }</div><div class='add'>+static inline void *kimage_map_segment(struct kimage *image, unsigned long addr, unsigned long size)</div><div class='add'>+{ return NULL; }</div><div class='add'>+static inline void kimage_unmap_segment(void *buffer) { }</div><div class='ctx'> #define kexec_in_progress false</div><div class='ctx'> #endif /* CONFIG_KEXEC_CORE */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h<br/>new file mode 100644<br/>index 000000000000..5f7b9de97e8d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kexec_handover.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kexec_handover.h</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef LINUX_KEXEC_HANDOVER_H</div><div class='add'>+#define LINUX_KEXEC_HANDOVER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct kho_scratch {</div><div class='add'>+	phys_addr_t addr;</div><div class='add'>+	phys_addr_t size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct folio;</div><div class='add'>+struct page;</div><div class='add'>+</div><div class='add'>+#define DECLARE_KHOSER_PTR(name, type) \</div><div class='add'>+	union {                        \</div><div class='add'>+		phys_addr_t phys;      \</div><div class='add'>+		type ptr;              \</div><div class='add'>+	} name</div><div class='add'>+#define KHOSER_STORE_PTR(dest, val)               \</div><div class='add'>+	({                                        \</div><div class='add'>+		typeof(val) v = val;              \</div><div class='add'>+		typecheck(typeof((dest).ptr), v); \</div><div class='add'>+		(dest).phys = virt_to_phys(v);    \</div><div class='add'>+	})</div><div class='add'>+#define KHOSER_LOAD_PTR(src)                                                 \</div><div class='add'>+	({                                                                   \</div><div class='add'>+		typeof(src) s = src;                                         \</div><div class='add'>+		(typeof((s).ptr))((s).phys ? phys_to_virt((s).phys) : NULL); \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+struct kho_vmalloc_chunk;</div><div class='add'>+struct kho_vmalloc {</div><div class='add'>+	DECLARE_KHOSER_PTR(first, struct kho_vmalloc_chunk *);</div><div class='add'>+	unsigned int total_pages;</div><div class='add'>+	unsigned short flags;</div><div class='add'>+	unsigned short order;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KEXEC_HANDOVER</div><div class='add'>+bool kho_is_enabled(void);</div><div class='add'>+bool is_kho_boot(void);</div><div class='add'>+</div><div class='add'>+int kho_preserve_folio(struct folio *folio);</div><div class='add'>+void kho_unpreserve_folio(struct folio *folio);</div><div class='add'>+int kho_preserve_pages(struct page *page, unsigned int nr_pages);</div><div class='add'>+void kho_unpreserve_pages(struct page *page, unsigned int nr_pages);</div><div class='add'>+int kho_preserve_vmalloc(void *ptr, struct kho_vmalloc *preservation);</div><div class='add'>+void kho_unpreserve_vmalloc(struct kho_vmalloc *preservation);</div><div class='add'>+void *kho_alloc_preserve(size_t size);</div><div class='add'>+void kho_unpreserve_free(void *mem);</div><div class='add'>+void kho_restore_free(void *mem);</div><div class='add'>+struct folio *kho_restore_folio(phys_addr_t phys);</div><div class='add'>+struct page *kho_restore_pages(phys_addr_t phys, unsigned int nr_pages);</div><div class='add'>+void *kho_restore_vmalloc(const struct kho_vmalloc *preservation);</div><div class='add'>+int kho_add_subtree(const char *name, void *fdt);</div><div class='add'>+void kho_remove_subtree(void *fdt);</div><div class='add'>+int kho_retrieve_subtree(const char *name, phys_addr_t *phys);</div><div class='add'>+</div><div class='add'>+void kho_memory_init(void);</div><div class='add'>+</div><div class='add'>+void kho_populate(phys_addr_t fdt_phys, u64 fdt_len, phys_addr_t scratch_phys,</div><div class='add'>+		  u64 scratch_len);</div><div class='add'>+#else</div><div class='add'>+static inline bool kho_is_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_kho_boot(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int kho_preserve_folio(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kho_unpreserve_folio(struct folio *folio) { }</div><div class='add'>+</div><div class='add'>+static inline int kho_preserve_pages(struct page *page, unsigned int nr_pages)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kho_unpreserve_pages(struct page *page, unsigned int nr_pages) { }</div><div class='add'>+</div><div class='add'>+static inline int kho_preserve_vmalloc(void *ptr,</div><div class='add'>+				       struct kho_vmalloc *preservation)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kho_unpreserve_vmalloc(struct kho_vmalloc *preservation) { }</div><div class='add'>+</div><div class='add'>+static inline void *kho_alloc_preserve(size_t size)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kho_unpreserve_free(void *mem) { }</div><div class='add'>+static inline void kho_restore_free(void *mem) { }</div><div class='add'>+</div><div class='add'>+static inline struct folio *kho_restore_folio(phys_addr_t phys)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct page *kho_restore_pages(phys_addr_t phys,</div><div class='add'>+					     unsigned int nr_pages)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *kho_restore_vmalloc(const struct kho_vmalloc *preservation)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int kho_add_subtree(const char *name, void *fdt)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kho_remove_subtree(void *fdt) { }</div><div class='add'>+</div><div class='add'>+static inline int kho_retrieve_subtree(const char *name, phys_addr_t *phys)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kho_memory_init(void) { }</div><div class='add'>+</div><div class='add'>+static inline void kho_populate(phys_addr_t fdt_phys, u64 fdt_len,</div><div class='add'>+				phys_addr_t scratch_phys, u64 scratch_len)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_KEXEC_HANDOVER */</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_KEXEC_HANDOVER_H */</div><div class='head'>diff --git a/include/linux/key-type.h b/include/linux/key-type.h<br/>index 5caf3ce82373..bb97bd3e5af4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/key-type.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/key-type.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/key-type.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/key-type.h</a></div><div class='hunk'>@@ -107,11 +107,14 @@ struct key_type {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*match_preparse)(struct key_match_data *match_data);</div><div class='ctx'> </div><div class='del'>-	/* Free preparsed match data (optional).  This should be supplied it</div><div class='del'>-	 * -&gt;match_preparse() is supplied. */</div><div class='add'>+	/*</div><div class='add'>+	 * Free preparsed match data (optional).  This should be supplied if</div><div class='add'>+	 * -&gt;match_preparse() is supplied.</div><div class='add'>+	 */</div><div class='ctx'> 	void (*match_free)(struct key_match_data *match_data);</div><div class='ctx'> </div><div class='del'>-	/* clear some of the data from a key on revokation (optional)</div><div class='add'>+	/*</div><div class='add'>+	 * Clear some of the data from a key on revocation (optional).</div><div class='ctx'> 	 * - the key's semaphore will be write-locked by the caller</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*revoke)(struct key *key);</div><div class='head'>diff --git a/include/linux/key.h b/include/linux/key.h<br/>index 943a432da3ae..81b8f05c6898 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/key.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/key.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/key.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/key.h</a></div><div class='hunk'>@@ -236,6 +236,7 @@ struct key {</div><div class='ctx'> #define KEY_FLAG_ROOT_CAN_INVAL	7	/* set if key can be invalidated by root without permission */</div><div class='ctx'> #define KEY_FLAG_KEEP		8	/* set if key should not be removed */</div><div class='ctx'> #define KEY_FLAG_UID_KEYRING	9	/* set if key is a user or user session keyring */</div><div class='add'>+#define KEY_FLAG_USER_ALIVE	10	/* set if final put has not happened on key yet */</div><div class='ctx'> </div><div class='ctx'> 	/* the key type and key description string</div><div class='ctx'> 	 * - the desc is used to match a key against search criteria</div><div class='hunk'>@@ -436,9 +437,6 @@ extern key_ref_t keyring_search(key_ref_t keyring,</div><div class='ctx'> 				const char *description,</div><div class='ctx'> 				bool recurse);</div><div class='ctx'> </div><div class='del'>-extern int keyring_add_key(struct key *keyring,</div><div class='del'>-			   struct key *key);</div><div class='del'>-</div><div class='ctx'> extern int keyring_restrict(key_ref_t keyring, const char *type,</div><div class='ctx'> 			    const char *restriction);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/kfence.h b/include/linux/kfence.h<br/>index 88100cc9caba..0ad1ddbb8b99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kfence.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kfence.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kfence.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kfence.h</a></div><div class='hunk'>@@ -124,7 +124,7 @@ static __always_inline void *kfence_alloc(struct kmem_cache *s, size_t size, gfp</div><div class='ctx'> 	if (!static_branch_likely(&amp;kfence_allocation_key))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> #endif</div><div class='del'>-	if (likely(atomic_read(&amp;kfence_allocation_gate)))</div><div class='add'>+	if (likely(atomic_read(&amp;kfence_allocation_gate) &gt; 0))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return __kfence_alloc(s, size, flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h<br/>index 0b35a41440ff..8b81ac74829c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kfifo.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kfifo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kfifo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kfifo.h</a></div><div class='hunk'>@@ -36,10 +36,15 @@</div><div class='ctx'>  * to lock the reader.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/barrier.h&gt;</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+</div><div class='add'>+struct scatterlist;</div><div class='ctx'> </div><div class='ctx'> struct __kfifo {</div><div class='ctx'> 	unsigned int	in;</div><div class='hunk'>@@ -304,19 +309,25 @@ __kfifo_uint_must_check_helper( \</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * kfifo_skip - skip output data</div><div class='add'>+ * kfifo_skip_count - skip output data</div><div class='ctx'>  * @fifo: address of the fifo to be used</div><div class='add'>+ * @count: count of data to skip</div><div class='ctx'>  */</div><div class='del'>-#define	kfifo_skip(fifo) \</div><div class='del'>-(void)({ \</div><div class='add'>+#define	kfifo_skip_count(fifo, count) do { \</div><div class='ctx'> 	typeof((fifo) + 1) __tmp = (fifo); \</div><div class='ctx'> 	const size_t __recsize = sizeof(*__tmp-&gt;rectype); \</div><div class='ctx'> 	struct __kfifo *__kfifo = &amp;__tmp-&gt;kfifo; \</div><div class='ctx'> 	if (__recsize) \</div><div class='ctx'> 		__kfifo_skip_r(__kfifo, __recsize); \</div><div class='ctx'> 	else \</div><div class='del'>-		__kfifo-&gt;out++; \</div><div class='del'>-})</div><div class='add'>+		__kfifo-&gt;out += (count); \</div><div class='add'>+} while(0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kfifo_skip - skip output data</div><div class='add'>+ * @fifo: address of the fifo to be used</div><div class='add'>+ */</div><div class='add'>+#define	kfifo_skip(fifo)	kfifo_skip_count(fifo, 1)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kfifo_peek_len - gets the size of the next fifo record</div><div class='hunk'>@@ -359,6 +370,30 @@ __kfifo_int_must_check_helper( \</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * kfifo_alloc_node - dynamically allocates a new fifo buffer on a NUMA node</div><div class='add'>+ * @fifo: pointer to the fifo</div><div class='add'>+ * @size: the number of elements in the fifo, this must be a power of 2</div><div class='add'>+ * @gfp_mask: get_free_pages mask, passed to kmalloc()</div><div class='add'>+ * @node: NUMA node to allocate memory on</div><div class='add'>+ *</div><div class='add'>+ * This macro dynamically allocates a new fifo buffer with NUMA node awareness.</div><div class='add'>+ *</div><div class='add'>+ * The number of elements will be rounded-up to a power of 2.</div><div class='add'>+ * The fifo will be release with kfifo_free().</div><div class='add'>+ * Return 0 if no error, otherwise an error code.</div><div class='add'>+ */</div><div class='add'>+#define kfifo_alloc_node(fifo, size, gfp_mask, node) \</div><div class='add'>+__kfifo_int_must_check_helper( \</div><div class='add'>+({ \</div><div class='add'>+	typeof((fifo) + 1) __tmp = (fifo); \</div><div class='add'>+	struct __kfifo *__kfifo = &amp;__tmp-&gt;kfifo; \</div><div class='add'>+	__is_kfifo_ptr(__tmp) ? \</div><div class='add'>+	__kfifo_alloc_node(__kfifo, size, sizeof(*__tmp-&gt;type), gfp_mask, node) : \</div><div class='add'>+	-EINVAL; \</div><div class='add'>+}) \</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * kfifo_free - frees the fifo</div><div class='ctx'>  * @fifo: the fifo to be freed</div><div class='ctx'>  */</div><div class='hunk'>@@ -578,7 +613,7 @@ __kfifo_uint_must_check_helper( \</div><div class='ctx'>  * @buf: pointer to the storage buffer</div><div class='ctx'>  * @n: max. number of elements to get</div><div class='ctx'>  *</div><div class='del'>- * This macro get some data from the fifo and return the numbers of elements</div><div class='add'>+ * This macro gets some data from the fifo and returns the numbers of elements</div><div class='ctx'>  * copied.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that with only one concurrent reader and one concurrent</div><div class='hunk'>@@ -605,7 +640,7 @@ __kfifo_uint_must_check_helper( \</div><div class='ctx'>  * @n: max. number of elements to get</div><div class='ctx'>  * @lock: pointer to the spinlock to use for locking</div><div class='ctx'>  *</div><div class='del'>- * This macro get the data from the fifo and return the numbers of elements</div><div class='add'>+ * This macro gets the data from the fifo and returns the numbers of elements</div><div class='ctx'>  * copied.</div><div class='ctx'>  */</div><div class='ctx'> #define	kfifo_out_spinlocked(fifo, buf, n, lock) \</div><div class='hunk'>@@ -703,11 +738,12 @@ __kfifo_int_must_check_helper( \</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * kfifo_dma_in_prepare - setup a scatterlist for DMA input</div><div class='add'>+ * kfifo_dma_in_prepare_mapped - setup a scatterlist for DMA input</div><div class='ctx'>  * @fifo: address of the fifo to be used</div><div class='ctx'>  * @sgl: pointer to the scatterlist array</div><div class='ctx'>  * @nents: number of entries in the scatterlist array</div><div class='ctx'>  * @len: number of elements to transfer</div><div class='add'>+ * @dma: mapped dma address to fill into @sgl</div><div class='ctx'>  *</div><div class='ctx'>  * This macro fills a scatterlist for DMA input.</div><div class='ctx'>  * It returns the number entries in the scatterlist array.</div><div class='hunk'>@@ -715,7 +751,7 @@ __kfifo_int_must_check_helper( \</div><div class='ctx'>  * Note that with only one concurrent reader and one concurrent</div><div class='ctx'>  * writer, you don't need extra locking to use these macros.</div><div class='ctx'>  */</div><div class='del'>-#define	kfifo_dma_in_prepare(fifo, sgl, nents, len) \</div><div class='add'>+#define	kfifo_dma_in_prepare_mapped(fifo, sgl, nents, len, dma) \</div><div class='ctx'> ({ \</div><div class='ctx'> 	typeof((fifo) + 1) __tmp = (fifo); \</div><div class='ctx'> 	struct scatterlist *__sgl = (sgl); \</div><div class='hunk'>@@ -724,16 +760,20 @@ __kfifo_int_must_check_helper( \</div><div class='ctx'> 	const size_t __recsize = sizeof(*__tmp-&gt;rectype); \</div><div class='ctx'> 	struct __kfifo *__kfifo = &amp;__tmp-&gt;kfifo; \</div><div class='ctx'> 	(__recsize) ? \</div><div class='del'>-	__kfifo_dma_in_prepare_r(__kfifo, __sgl, __nents, __len, __recsize) : \</div><div class='del'>-	__kfifo_dma_in_prepare(__kfifo, __sgl, __nents, __len); \</div><div class='add'>+	__kfifo_dma_in_prepare_r(__kfifo, __sgl, __nents, __len, __recsize, \</div><div class='add'>+				 dma) : \</div><div class='add'>+	__kfifo_dma_in_prepare(__kfifo, __sgl, __nents, __len, dma); \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+#define kfifo_dma_in_prepare(fifo, sgl, nents, len) \</div><div class='add'>+	kfifo_dma_in_prepare_mapped(fifo, sgl, nents, len, DMA_MAPPING_ERROR)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * kfifo_dma_in_finish - finish a DMA IN operation</div><div class='ctx'>  * @fifo: address of the fifo to be used</div><div class='ctx'>  * @len: number of bytes to received</div><div class='ctx'>  *</div><div class='del'>- * This macro finish a DMA IN operation. The in counter will be updated by</div><div class='add'>+ * This macro finishes a DMA IN operation. The in counter will be updated by</div><div class='ctx'>  * the len parameter. No error checking will be done.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that with only one concurrent reader and one concurrent</div><div class='hunk'>@@ -752,11 +792,12 @@ __kfifo_int_must_check_helper( \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * kfifo_dma_out_prepare - setup a scatterlist for DMA output</div><div class='add'>+ * kfifo_dma_out_prepare_mapped - setup a scatterlist for DMA output</div><div class='ctx'>  * @fifo: address of the fifo to be used</div><div class='ctx'>  * @sgl: pointer to the scatterlist array</div><div class='ctx'>  * @nents: number of entries in the scatterlist array</div><div class='ctx'>  * @len: number of elements to transfer</div><div class='add'>+ * @dma: mapped dma address to fill into @sgl</div><div class='ctx'>  *</div><div class='ctx'>  * This macro fills a scatterlist for DMA output which at most @len bytes</div><div class='ctx'>  * to transfer.</div><div class='hunk'>@@ -766,7 +807,7 @@ __kfifo_int_must_check_helper( \</div><div class='ctx'>  * Note that with only one concurrent reader and one concurrent</div><div class='ctx'>  * writer, you don't need extra locking to use these macros.</div><div class='ctx'>  */</div><div class='del'>-#define	kfifo_dma_out_prepare(fifo, sgl, nents, len) \</div><div class='add'>+#define	kfifo_dma_out_prepare_mapped(fifo, sgl, nents, len, dma) \</div><div class='ctx'> ({ \</div><div class='ctx'> 	typeof((fifo) + 1) __tmp = (fifo);  \</div><div class='ctx'> 	struct scatterlist *__sgl = (sgl); \</div><div class='hunk'>@@ -775,32 +816,29 @@ __kfifo_int_must_check_helper( \</div><div class='ctx'> 	const size_t __recsize = sizeof(*__tmp-&gt;rectype); \</div><div class='ctx'> 	struct __kfifo *__kfifo = &amp;__tmp-&gt;kfifo; \</div><div class='ctx'> 	(__recsize) ? \</div><div class='del'>-	__kfifo_dma_out_prepare_r(__kfifo, __sgl, __nents, __len, __recsize) : \</div><div class='del'>-	__kfifo_dma_out_prepare(__kfifo, __sgl, __nents, __len); \</div><div class='add'>+	__kfifo_dma_out_prepare_r(__kfifo, __sgl, __nents, __len, __recsize, \</div><div class='add'>+				  dma) : \</div><div class='add'>+	__kfifo_dma_out_prepare(__kfifo, __sgl, __nents, __len, dma); \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+#define	kfifo_dma_out_prepare(fifo, sgl, nents, len) \</div><div class='add'>+	kfifo_dma_out_prepare_mapped(fifo, sgl, nents, len, DMA_MAPPING_ERROR)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * kfifo_dma_out_finish - finish a DMA OUT operation</div><div class='ctx'>  * @fifo: address of the fifo to be used</div><div class='ctx'>  * @len: number of bytes transferred</div><div class='ctx'>  *</div><div class='del'>- * This macro finish a DMA OUT operation. The out counter will be updated by</div><div class='add'>+ * This macro finishes a DMA OUT operation. The out counter will be updated by</div><div class='ctx'>  * the len parameter. No error checking will be done.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that with only one concurrent reader and one concurrent</div><div class='ctx'>  * writer, you don't need extra locking to use these macros.</div><div class='ctx'>  */</div><div class='del'>-#define kfifo_dma_out_finish(fifo, len) \</div><div class='del'>-(void)({ \</div><div class='del'>-	typeof((fifo) + 1) __tmp = (fifo); \</div><div class='del'>-	unsigned int __len = (len); \</div><div class='del'>-	const size_t __recsize = sizeof(*__tmp-&gt;rectype); \</div><div class='del'>-	struct __kfifo *__kfifo = &amp;__tmp-&gt;kfifo; \</div><div class='del'>-	if (__recsize) \</div><div class='del'>-		__kfifo_dma_out_finish_r(__kfifo, __recsize); \</div><div class='del'>-	else \</div><div class='del'>-		__kfifo-&gt;out += __len / sizeof(*__tmp-&gt;type); \</div><div class='del'>-})</div><div class='add'>+#define kfifo_dma_out_finish(fifo, len) do { \</div><div class='add'>+	typeof((fifo) + 1) ___tmp = (fifo); \</div><div class='add'>+	kfifo_skip_count(___tmp, (len) / sizeof(*___tmp-&gt;type)); \</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kfifo_out_peek - gets some data from the fifo</div><div class='hunk'>@@ -808,7 +846,7 @@ __kfifo_int_must_check_helper( \</div><div class='ctx'>  * @buf: pointer to the storage buffer</div><div class='ctx'>  * @n: max. number of elements to get</div><div class='ctx'>  *</div><div class='del'>- * This macro get the data from the fifo and return the numbers of elements</div><div class='add'>+ * This macro gets the data from the fifo and returns the numbers of elements</div><div class='ctx'>  * copied. The data is not removed from the fifo.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that with only one concurrent reader and one concurrent</div><div class='hunk'>@@ -828,8 +866,71 @@ __kfifo_uint_must_check_helper( \</div><div class='ctx'> }) \</div><div class='ctx'> )</div><div class='ctx'> </div><div class='del'>-extern int __kfifo_alloc(struct __kfifo *fifo, unsigned int size,</div><div class='del'>-	size_t esize, gfp_t gfp_mask);</div><div class='add'>+/**</div><div class='add'>+ * kfifo_out_linear - gets a tail of/offset to available data</div><div class='add'>+ * @fifo: address of the fifo to be used</div><div class='add'>+ * @tail: pointer to an unsigned int to store the value of tail</div><div class='add'>+ * @n: max. number of elements to point at</div><div class='add'>+ *</div><div class='add'>+ * This macro obtains the offset (tail) to the available data in the fifo</div><div class='add'>+ * buffer and returns the</div><div class='add'>+ * numbers of elements available. It returns the available count till the end</div><div class='add'>+ * of data or till the end of the buffer. So that it can be used for linear</div><div class='add'>+ * data processing (like memcpy() of (@fifo-&gt;data + @tail) with count</div><div class='add'>+ * returned).</div><div class='add'>+ *</div><div class='add'>+ * Note that with only one concurrent reader and one concurrent</div><div class='add'>+ * writer, you don't need extra locking to use these macro.</div><div class='add'>+ */</div><div class='add'>+#define kfifo_out_linear(fifo, tail, n) \</div><div class='add'>+__kfifo_uint_must_check_helper( \</div><div class='add'>+({ \</div><div class='add'>+	typeof((fifo) + 1) __tmp = (fifo); \</div><div class='add'>+	unsigned int *__tail = (tail); \</div><div class='add'>+	unsigned long __n = (n); \</div><div class='add'>+	const size_t __recsize = sizeof(*__tmp-&gt;rectype); \</div><div class='add'>+	struct __kfifo *__kfifo = &amp;__tmp-&gt;kfifo; \</div><div class='add'>+	(__recsize) ? \</div><div class='add'>+	__kfifo_out_linear_r(__kfifo, __tail, __n, __recsize) : \</div><div class='add'>+	__kfifo_out_linear(__kfifo, __tail, __n); \</div><div class='add'>+}) \</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kfifo_out_linear_ptr - gets a pointer to the available data</div><div class='add'>+ * @fifo: address of the fifo to be used</div><div class='add'>+ * @ptr: pointer to data to store the pointer to tail</div><div class='add'>+ * @n: max. number of elements to point at</div><div class='add'>+ *</div><div class='add'>+ * Similarly to kfifo_out_linear(), this macro obtains the pointer to the</div><div class='add'>+ * available data in the fifo buffer and returns the numbers of elements</div><div class='add'>+ * available. It returns the available count till the end of available data or</div><div class='add'>+ * till the end of the buffer. So that it can be used for linear data</div><div class='add'>+ * processing (like memcpy() of @ptr with count returned).</div><div class='add'>+ *</div><div class='add'>+ * Note that with only one concurrent reader and one concurrent</div><div class='add'>+ * writer, you don't need extra locking to use these macro.</div><div class='add'>+ */</div><div class='add'>+#define kfifo_out_linear_ptr(fifo, ptr, n) \</div><div class='add'>+__kfifo_uint_must_check_helper( \</div><div class='add'>+({ \</div><div class='add'>+	typeof((fifo) + 1) ___tmp = (fifo); \</div><div class='add'>+	unsigned int ___tail; \</div><div class='add'>+	unsigned int ___n = kfifo_out_linear(___tmp, &amp;___tail, (n)); \</div><div class='add'>+	*(ptr) = ___tmp-&gt;kfifo.data + ___tail * kfifo_esize(___tmp); \</div><div class='add'>+	___n; \</div><div class='add'>+}) \</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern int __kfifo_alloc_node(struct __kfifo *fifo, unsigned int size,</div><div class='add'>+	size_t esize, gfp_t gfp_mask, int node);</div><div class='add'>+</div><div class='add'>+static inline int __kfifo_alloc(struct __kfifo *fifo, unsigned int size,</div><div class='add'>+				size_t esize, gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	return __kfifo_alloc_node(fifo, size, esize, gfp_mask, NUMA_NO_NODE);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> extern void __kfifo_free(struct __kfifo *fifo);</div><div class='ctx'> </div><div class='hunk'>@@ -849,14 +950,17 @@ extern int __kfifo_to_user(struct __kfifo *fifo,</div><div class='ctx'> 	void __user *to, unsigned long len, unsigned int *copied);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int __kfifo_dma_in_prepare(struct __kfifo *fifo,</div><div class='del'>-	struct scatterlist *sgl, int nents, unsigned int len);</div><div class='add'>+	struct scatterlist *sgl, int nents, unsigned int len, dma_addr_t dma);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int __kfifo_dma_out_prepare(struct __kfifo *fifo,</div><div class='del'>-	struct scatterlist *sgl, int nents, unsigned int len);</div><div class='add'>+	struct scatterlist *sgl, int nents, unsigned int len, dma_addr_t dma);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int __kfifo_out_peek(struct __kfifo *fifo,</div><div class='ctx'> 	void *buf, unsigned int len);</div><div class='ctx'> </div><div class='add'>+extern unsigned int __kfifo_out_linear(struct __kfifo *fifo,</div><div class='add'>+	unsigned int *tail, unsigned int n);</div><div class='add'>+</div><div class='ctx'> extern unsigned int __kfifo_in_r(struct __kfifo *fifo,</div><div class='ctx'> 	const void *buf, unsigned int len, size_t recsize);</div><div class='ctx'> </div><div class='hunk'>@@ -871,15 +975,15 @@ extern int __kfifo_to_user_r(struct __kfifo *fifo, void __user *to,</div><div class='ctx'> 	unsigned long len, unsigned int *copied, size_t recsize);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int __kfifo_dma_in_prepare_r(struct __kfifo *fifo,</div><div class='del'>-	struct scatterlist *sgl, int nents, unsigned int len, size_t recsize);</div><div class='add'>+	struct scatterlist *sgl, int nents, unsigned int len, size_t recsize,</div><div class='add'>+	dma_addr_t dma);</div><div class='ctx'> </div><div class='ctx'> extern void __kfifo_dma_in_finish_r(struct __kfifo *fifo,</div><div class='ctx'> 	unsigned int len, size_t recsize);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int __kfifo_dma_out_prepare_r(struct __kfifo *fifo,</div><div class='del'>-	struct scatterlist *sgl, int nents, unsigned int len, size_t recsize);</div><div class='del'>-</div><div class='del'>-extern void __kfifo_dma_out_finish_r(struct __kfifo *fifo, size_t recsize);</div><div class='add'>+	struct scatterlist *sgl, int nents, unsigned int len, size_t recsize,</div><div class='add'>+	dma_addr_t dma);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int __kfifo_len_r(struct __kfifo *fifo, size_t recsize);</div><div class='ctx'> </div><div class='hunk'>@@ -888,6 +992,9 @@ extern void __kfifo_skip_r(struct __kfifo *fifo, size_t recsize);</div><div class='ctx'> extern unsigned int __kfifo_out_peek_r(struct __kfifo *fifo,</div><div class='ctx'> 	void *buf, unsigned int len, size_t recsize);</div><div class='ctx'> </div><div class='add'>+extern unsigned int __kfifo_out_linear_r(struct __kfifo *fifo,</div><div class='add'>+	unsigned int *tail, unsigned int n, size_t recsize);</div><div class='add'>+</div><div class='ctx'> extern unsigned int __kfifo_max_r(unsigned int len, size_t recsize);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h<br/>index 76e891ee9e37..5eebbe7a3545 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kgdb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kgdb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kgdb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kgdb.h</a></div><div class='hunk'>@@ -257,7 +257,6 @@ extern void kgdb_arch_late(void);</div><div class='ctx'>  * hardware breakpoints.</div><div class='ctx'>  * @correct_hw_break: Allow an architecture to specify how to correct the</div><div class='ctx'>  * hardware debug registers.</div><div class='del'>- * @enable_nmi: Manage NMI-triggered entry to KGDB</div><div class='ctx'>  */</div><div class='ctx'> struct kgdb_arch {</div><div class='ctx'> 	unsigned char		gdb_bpt_instr[BREAK_INSTR_SIZE];</div><div class='hunk'>@@ -270,8 +269,6 @@ struct kgdb_arch {</div><div class='ctx'> 	void	(*disable_hw_break)(struct pt_regs *regs);</div><div class='ctx'> 	void	(*remove_all_hw_break)(void);</div><div class='ctx'> 	void	(*correct_hw_break)(void);</div><div class='del'>-</div><div class='del'>-	void	(*enable_nmi)(bool on);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -306,16 +303,6 @@ extern const struct kgdb_arch		arch_kgdb_ops;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SERIAL_KGDB_NMI</div><div class='del'>-extern int kgdb_register_nmi_console(void);</div><div class='del'>-extern int kgdb_unregister_nmi_console(void);</div><div class='del'>-extern bool kgdb_nmi_poll_knock(void);</div><div class='del'>-#else</div><div class='del'>-static inline int kgdb_register_nmi_console(void) { return 0; }</div><div class='del'>-static inline int kgdb_unregister_nmi_console(void) { return 0; }</div><div class='del'>-static inline bool kgdb_nmi_poll_knock(void) { return true; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern int kgdb_register_io_module(struct kgdb_io *local_kgdb_io_ops);</div><div class='ctx'> extern void kgdb_unregister_io_module(struct kgdb_io *local_kgdb_io_ops);</div><div class='ctx'> extern struct kgdb_io *dbg_io_ops;</div><div class='head'>diff --git a/include/linux/kho/abi/luo.h b/include/linux/kho/abi/luo.h<br/>new file mode 100644<br/>index 000000000000..bb099c92e469<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kho/abi/luo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kho/abi/luo.h</a></div><div class='hunk'>@@ -0,0 +1,166 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Google LLC.</div><div class='add'>+ * Pasha Tatashin &lt;pasha.tatashin@soleen.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: Live Update Orchestrator ABI</div><div class='add'>+ *</div><div class='add'>+ * This header defines the stable Application Binary Interface used by the</div><div class='add'>+ * Live Update Orchestrator to pass state from a pre-update kernel to a</div><div class='add'>+ * post-update kernel. The ABI is built upon the Kexec HandOver framework</div><div class='add'>+ * and uses a Flattened Device Tree to describe the preserved data.</div><div class='add'>+ *</div><div class='add'>+ * This interface is a contract. Any modification to the FDT structure, node</div><div class='add'>+ * properties, compatible strings, or the layout of the `__packed` serialization</div><div class='add'>+ * structures defined here constitutes a breaking change. Such changes require</div><div class='add'>+ * incrementing the version number in the relevant `_COMPATIBLE` string to</div><div class='add'>+ * prevent a new kernel from misinterpreting data from an old kernel.</div><div class='add'>+ *</div><div class='add'>+ * Changes are allowed provided the compatibility version is incremented;</div><div class='add'>+ * however, backward/forward compatibility is only guaranteed for kernels</div><div class='add'>+ * supporting the same ABI version.</div><div class='add'>+ *</div><div class='add'>+ * FDT Structure Overview:</div><div class='add'>+ *   The entire LUO state is encapsulated within a single KHO entry named "LUO".</div><div class='add'>+ *   This entry contains an FDT with the following layout:</div><div class='add'>+ *</div><div class='add'>+ *   .. code-block:: none</div><div class='add'>+ *</div><div class='add'>+ *     / {</div><div class='add'>+ *         compatible = "luo-v1";</div><div class='add'>+ *         liveupdate-number = &lt;...&gt;;</div><div class='add'>+ *</div><div class='add'>+ *         luo-session {</div><div class='add'>+ *             compatible = "luo-session-v1";</div><div class='add'>+ *             luo-session-header = &lt;phys_addr_of_session_header_ser&gt;;</div><div class='add'>+ *         };</div><div class='add'>+ *     };</div><div class='add'>+ *</div><div class='add'>+ * Main LUO Node (/):</div><div class='add'>+ *</div><div class='add'>+ *   - compatible: "luo-v1"</div><div class='add'>+ *     Identifies the overall LUO ABI version.</div><div class='add'>+ *   - liveupdate-number: u64</div><div class='add'>+ *     A counter tracking the number of successful live updates performed.</div><div class='add'>+ *</div><div class='add'>+ * Session Node (luo-session):</div><div class='add'>+ *   This node describes all preserved user-space sessions.</div><div class='add'>+ *</div><div class='add'>+ *   - compatible: "luo-session-v1"</div><div class='add'>+ *     Identifies the session ABI version.</div><div class='add'>+ *   - luo-session-header: u64</div><div class='add'>+ *     The physical address of a `struct luo_session_header_ser`. This structure</div><div class='add'>+ *     is the header for a contiguous block of memory containing an array of</div><div class='add'>+ *     `struct luo_session_ser`, one for each preserved session.</div><div class='add'>+ *</div><div class='add'>+ * Serialization Structures:</div><div class='add'>+ *   The FDT properties point to memory regions containing arrays of simple,</div><div class='add'>+ *   `__packed` structures. These structures contain the actual preserved state.</div><div class='add'>+ *</div><div class='add'>+ *   - struct luo_session_header_ser:</div><div class='add'>+ *     Header for the session array. Contains the total page count of the</div><div class='add'>+ *     preserved memory block and the number of `struct luo_session_ser`</div><div class='add'>+ *     entries that follow.</div><div class='add'>+ *</div><div class='add'>+ *   - struct luo_session_ser:</div><div class='add'>+ *     Metadata for a single session, including its name and a physical pointer</div><div class='add'>+ *     to another preserved memory block containing an array of</div><div class='add'>+ *     `struct luo_file_ser` for all files in that session.</div><div class='add'>+ *</div><div class='add'>+ *   - struct luo_file_ser:</div><div class='add'>+ *     Metadata for a single preserved file. Contains the `compatible` string to</div><div class='add'>+ *     find the correct handler in the new kernel, a user-provided `token` for</div><div class='add'>+ *     identification, and an opaque `data` handle for the handler to use.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_KHO_ABI_LUO_H</div><div class='add'>+#define _LINUX_KHO_ABI_LUO_H</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/liveupdate.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The LUO FDT hooks all LUO state for sessions, fds, etc.</div><div class='add'>+ * In the root it also carries "liveupdate-number" 64-bit property that</div><div class='add'>+ * corresponds to the number of live-updates performed on this machine.</div><div class='add'>+ */</div><div class='add'>+#define LUO_FDT_SIZE		PAGE_SIZE</div><div class='add'>+#define LUO_FDT_KHO_ENTRY_NAME	"LUO"</div><div class='add'>+#define LUO_FDT_COMPATIBLE	"luo-v1"</div><div class='add'>+#define LUO_FDT_LIVEUPDATE_NUM	"liveupdate-number"</div><div class='add'>+</div><div class='add'>+#define LIVEUPDATE_HNDL_COMPAT_LENGTH	48</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct luo_file_ser - Represents the serialized preserves files.</div><div class='add'>+ * @compatible:  File handler compatible string.</div><div class='add'>+ * @data:        Private data</div><div class='add'>+ * @token:       User provided token for this file</div><div class='add'>+ *</div><div class='add'>+ * If this structure is modified, LUO_SESSION_COMPATIBLE must be updated.</div><div class='add'>+ */</div><div class='add'>+struct luo_file_ser {</div><div class='add'>+	char compatible[LIVEUPDATE_HNDL_COMPAT_LENGTH];</div><div class='add'>+	u64 data;</div><div class='add'>+	u64 token;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct luo_file_set_ser - Represents the serialized metadata for file set</div><div class='add'>+ * @files:   The physical address of a contiguous memory block that holds</div><div class='add'>+ *           the serialized state of files (array of luo_file_ser) in this file</div><div class='add'>+ *           set.</div><div class='add'>+ * @count:   The total number of files that were part of this session during</div><div class='add'>+ *           serialization. Used for iteration and validation during</div><div class='add'>+ *           restoration.</div><div class='add'>+ */</div><div class='add'>+struct luo_file_set_ser {</div><div class='add'>+	u64 files;</div><div class='add'>+	u64 count;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LUO FDT session node</div><div class='add'>+ * LUO_FDT_SESSION_HEADER:  is a u64 physical address of struct</div><div class='add'>+ *                          luo_session_header_ser</div><div class='add'>+ */</div><div class='add'>+#define LUO_FDT_SESSION_NODE_NAME	"luo-session"</div><div class='add'>+#define LUO_FDT_SESSION_COMPATIBLE	"luo-session-v2"</div><div class='add'>+#define LUO_FDT_SESSION_HEADER		"luo-session-header"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct luo_session_header_ser - Header for the serialized session data block.</div><div class='add'>+ * @count: The number of `struct luo_session_ser` entries that immediately</div><div class='add'>+ *         follow this header in the memory block.</div><div class='add'>+ *</div><div class='add'>+ * This structure is located at the beginning of a contiguous block of</div><div class='add'>+ * physical memory preserved across the kexec. It provides the necessary</div><div class='add'>+ * metadata to interpret the array of session entries that follow.</div><div class='add'>+ *</div><div class='add'>+ * If this structure is modified, `LUO_FDT_SESSION_COMPATIBLE` must be updated.</div><div class='add'>+ */</div><div class='add'>+struct luo_session_header_ser {</div><div class='add'>+	u64 count;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct luo_session_ser - Represents the serialized metadata for a LUO session.</div><div class='add'>+ * @name:         The unique name of the session, provided by the userspace at</div><div class='add'>+ *                the time of session creation.</div><div class='add'>+ * @file_set_ser: Serialized files belonging to this session,</div><div class='add'>+ *</div><div class='add'>+ * This structure is used to package session-specific metadata for transfer</div><div class='add'>+ * between kernels via Kexec Handover. An array of these structures (one per</div><div class='add'>+ * session) is created and passed to the new kernel, allowing it to reconstruct</div><div class='add'>+ * the session context.</div><div class='add'>+ *</div><div class='add'>+ * If this structure is modified, `LUO_FDT_SESSION_COMPATIBLE` must be updated.</div><div class='add'>+ */</div><div class='add'>+struct luo_session_ser {</div><div class='add'>+	char name[LIVEUPDATE_SESSION_NAME_LENGTH];</div><div class='add'>+	struct luo_file_set_ser file_set_ser;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_KHO_ABI_LUO_H */</div><div class='head'>diff --git a/include/linux/kho/abi/memfd.h b/include/linux/kho/abi/memfd.h<br/>new file mode 100644<br/>index 000000000000..da7d063474a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kho/abi/memfd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kho/abi/memfd.h</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Google LLC.</div><div class='add'>+ * Pasha Tatashin &lt;pasha.tatashin@soleen.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Amazon.com Inc. or its affiliates.</div><div class='add'>+ * Pratyush Yadav &lt;ptyadav@amazon.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_KHO_ABI_MEMFD_H</div><div class='add'>+#define _LINUX_KHO_ABI_MEMFD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kexec_handover.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DOC: memfd Live Update ABI</div><div class='add'>+ *</div><div class='add'>+ * This header defines the ABI for preserving the state of a memfd across a</div><div class='add'>+ * kexec reboot using the LUO.</div><div class='add'>+ *</div><div class='add'>+ * The state is serialized into a packed structure `struct memfd_luo_ser`</div><div class='add'>+ * which is handed over to the next kernel via the KHO mechanism.</div><div class='add'>+ *</div><div class='add'>+ * This interface is a contract. Any modification to the structure layout</div><div class='add'>+ * constitutes a breaking change. Such changes require incrementing the</div><div class='add'>+ * version number in the MEMFD_LUO_FH_COMPATIBLE string.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * MEMFD_LUO_FOLIO_DIRTY - The folio is dirty.</div><div class='add'>+ *</div><div class='add'>+ * This flag indicates the folio contains data from user. A non-dirty folio is</div><div class='add'>+ * one that was allocated (say using fallocate(2)) but not written to.</div><div class='add'>+ */</div><div class='add'>+#define MEMFD_LUO_FOLIO_DIRTY		BIT(0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * MEMFD_LUO_FOLIO_UPTODATE - The folio is up-to-date.</div><div class='add'>+ *</div><div class='add'>+ * An up-to-date folio has been zeroed out. shmem zeroes out folios on first</div><div class='add'>+ * use. This flag tracks which folios need zeroing.</div><div class='add'>+ */</div><div class='add'>+#define MEMFD_LUO_FOLIO_UPTODATE	BIT(1)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct memfd_luo_folio_ser - Serialized state of a single folio.</div><div class='add'>+ * @pfn:       The page frame number of the folio.</div><div class='add'>+ * @flags:     Flags to describe the state of the folio.</div><div class='add'>+ * @index:     The page offset (pgoff_t) of the folio within the original file.</div><div class='add'>+ */</div><div class='add'>+struct memfd_luo_folio_ser {</div><div class='add'>+	u64 pfn:52;</div><div class='add'>+	u64 flags:12;</div><div class='add'>+	u64 index;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct memfd_luo_ser - Main serialization structure for a memfd.</div><div class='add'>+ * @pos:       The file's current position (f_pos).</div><div class='add'>+ * @size:      The total size of the file in bytes (i_size).</div><div class='add'>+ * @nr_folios: Number of folios in the folios array.</div><div class='add'>+ * @folios:    KHO vmalloc descriptor pointing to the array of</div><div class='add'>+ *             struct memfd_luo_folio_ser.</div><div class='add'>+ */</div><div class='add'>+struct memfd_luo_ser {</div><div class='add'>+	u64 pos;</div><div class='add'>+	u64 size;</div><div class='add'>+	u64 nr_folios;</div><div class='add'>+	struct kho_vmalloc folios;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* The compatibility string for memfd file handler */</div><div class='add'>+#define MEMFD_LUO_FH_COMPATIBLE	"memfd-v1"</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_KHO_ABI_MEMFD_H */</div><div class='head'>diff --git a/include/linux/khugepaged.h b/include/linux/khugepaged.h<br/>index f68865e19b0b..eb1946a70cff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/khugepaged.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/khugepaged.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/khugepaged.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/khugepaged.h</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> #ifndef _LINUX_KHUGEPAGED_H</div><div class='ctx'> #define _LINUX_KHUGEPAGED_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sched/coredump.h&gt; /* MMF_VM_HUGEPAGE */</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='add'>+extern unsigned int khugepaged_max_ptes_none __read_mostly;</div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='ctx'> extern struct attribute_group khugepaged_attr_group;</div><div class='ctx'> </div><div class='hunk'>@@ -13,29 +14,21 @@ extern int start_stop_khugepaged(void);</div><div class='ctx'> extern void __khugepaged_enter(struct mm_struct *mm);</div><div class='ctx'> extern void __khugepaged_exit(struct mm_struct *mm);</div><div class='ctx'> extern void khugepaged_enter_vma(struct vm_area_struct *vma,</div><div class='del'>-				 unsigned long vm_flags);</div><div class='add'>+				 vm_flags_t vm_flags);</div><div class='ctx'> extern void khugepaged_min_free_kbytes_update(void);</div><div class='ctx'> extern bool current_is_khugepaged(void);</div><div class='del'>-#ifdef CONFIG_SHMEM</div><div class='ctx'> extern int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 				   bool install_pmd);</div><div class='del'>-#else</div><div class='del'>-static inline int collapse_pte_mapped_thp(struct mm_struct *mm,</div><div class='del'>-					  unsigned long addr, bool install_pmd)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static inline void khugepaged_fork(struct mm_struct *mm, struct mm_struct *oldmm)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(MMF_VM_HUGEPAGE, &amp;oldmm-&gt;flags))</div><div class='add'>+	if (mm_flags_test(MMF_VM_HUGEPAGE, oldmm))</div><div class='ctx'> 		__khugepaged_enter(mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void khugepaged_exit(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(MMF_VM_HUGEPAGE, &amp;mm-&gt;flags))</div><div class='add'>+	if (mm_flags_test(MMF_VM_HUGEPAGE, mm))</div><div class='ctx'> 		__khugepaged_exit(mm);</div><div class='ctx'> }</div><div class='ctx'> #else /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='hunk'>@@ -46,7 +39,7 @@ static inline void khugepaged_exit(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void khugepaged_enter_vma(struct vm_area_struct *vma,</div><div class='del'>-					unsigned long vm_flags)</div><div class='add'>+					vm_flags_t vm_flags)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline int collapse_pte_mapped_thp(struct mm_struct *mm,</div><div class='head'>diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h<br/>index 6a3cd1bf4680..fbd424b2abb1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kmemleak.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmemleak.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kmemleak.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kmemleak.h</a></div><div class='hunk'>@@ -26,7 +26,9 @@ extern void kmemleak_free_part(const void *ptr, size_t size) __ref;</div><div class='ctx'> extern void kmemleak_free_percpu(const void __percpu *ptr) __ref;</div><div class='ctx'> extern void kmemleak_update_trace(const void *ptr) __ref;</div><div class='ctx'> extern void kmemleak_not_leak(const void *ptr) __ref;</div><div class='add'>+extern void kmemleak_transient_leak(const void *ptr) __ref;</div><div class='ctx'> extern void kmemleak_ignore(const void *ptr) __ref;</div><div class='add'>+extern void kmemleak_ignore_percpu(const void __percpu *ptr) __ref;</div><div class='ctx'> extern void kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) __ref;</div><div class='ctx'> extern void kmemleak_no_scan(const void *ptr) __ref;</div><div class='ctx'> extern void kmemleak_alloc_phys(phys_addr_t phys, size_t size,</div><div class='hunk'>@@ -93,6 +95,12 @@ static inline void kmemleak_update_trace(const void *ptr)</div><div class='ctx'> static inline void kmemleak_not_leak(const void *ptr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline void kmemleak_transient_leak(const void *ptr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void kmemleak_ignore_percpu(const void __percpu *ptr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> static inline void kmemleak_ignore(const void *ptr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/kmod.h b/include/linux/kmod.h<br/>index 68f69362d427..9a07c3215389 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kmod.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmod.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kmod.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kmod.h</a></div><div class='hunk'>@@ -14,10 +14,7 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> </div><div class='del'>-#define KMOD_PATH_LEN 256</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='del'>-extern char modprobe_path[]; /* for sysctl */</div><div class='ctx'> /* modprobe exit status on success, -ve on error.  Return value</div><div class='ctx'>  * usually useless though. */</div><div class='ctx'> extern __printf(2, 3)</div><div class='head'>diff --git a/include/linux/kmsan-checks.h b/include/linux/kmsan-checks.h<br/>index c4cae333deec..e1082dc40abc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kmsan-checks.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmsan-checks.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kmsan-checks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kmsan-checks.h</a></div><div class='hunk'>@@ -61,6 +61,17 @@ void kmsan_check_memory(const void *address, size_t size);</div><div class='ctx'> void kmsan_copy_to_user(void __user *to, const void *from, size_t to_copy,</div><div class='ctx'> 			size_t left);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * kmsan_memmove() - Notify KMSAN about a data copy within kernel.</div><div class='add'>+ * @to:   destination address in the kernel.</div><div class='add'>+ * @from: source address in the kernel.</div><div class='add'>+ * @size: number of bytes to copy.</div><div class='add'>+ *</div><div class='add'>+ * Invoked after non-instrumented version (e.g. implemented using assembly</div><div class='add'>+ * code) of memmove()/memcpy() is called, in order to copy KMSAN's metadata.</div><div class='add'>+ */</div><div class='add'>+void kmsan_memmove(void *to, const void *from, size_t to_copy);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline void kmsan_poison_memory(const void *address, size_t size,</div><div class='hunk'>@@ -78,6 +89,10 @@ static inline void kmsan_copy_to_user(void __user *to, const void *from,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void kmsan_memmove(void *to, const void *from, size_t to_copy)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_KMSAN_CHECKS_H */</div><div class='head'>diff --git a/include/linux/kmsan.h b/include/linux/kmsan.h<br/>index e0c23a32cdf0..7da9fd506b39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kmsan.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmsan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kmsan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kmsan.h</a></div><div class='hunk'>@@ -133,6 +133,7 @@ void kmsan_kfree_large(const void *ptr);</div><div class='ctx'>  * @prot:	page protection flags used for vmap.</div><div class='ctx'>  * @pages:	array of pages.</div><div class='ctx'>  * @page_shift:	page_shift passed to vmap_range_noflush().</div><div class='add'>+ * @gfp_mask:	gfp_mask to use internally.</div><div class='ctx'>  *</div><div class='ctx'>  * KMSAN maps shadow and origin pages of @pages into contiguous ranges in</div><div class='ctx'>  * vmalloc metadata address range. Returns 0 on success, callers must check</div><div class='hunk'>@@ -142,7 +143,8 @@ int __must_check kmsan_vmap_pages_range_noflush(unsigned long start,</div><div class='ctx'> 						unsigned long end,</div><div class='ctx'> 						pgprot_t prot,</div><div class='ctx'> 						struct page **pages,</div><div class='del'>-						unsigned int page_shift);</div><div class='add'>+						unsigned int page_shift,</div><div class='add'>+						gfp_t gfp_mask);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kmsan_vunmap_kernel_range_noflush() - Notify KMSAN about a vunmap.</div><div class='hunk'>@@ -182,8 +184,7 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kmsan_handle_dma() - Handle a DMA data transfer.</div><div class='del'>- * @page:   first page of the buffer.</div><div class='del'>- * @offset: offset of the buffer within the first page.</div><div class='add'>+ * @phys:   physical address of the buffer.</div><div class='ctx'>  * @size:   buffer size.</div><div class='ctx'>  * @dir:    one of possible dma_data_direction values.</div><div class='ctx'>  *</div><div class='hunk'>@@ -192,7 +193,7 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end);</div><div class='ctx'>  * * initializes the buffer, if it is copied from device;</div><div class='ctx'>  * * does both, if this is a DMA_BIDIRECTIONAL transfer.</div><div class='ctx'>  */</div><div class='del'>-void kmsan_handle_dma(struct page *page, size_t offset, size_t size,</div><div class='add'>+void kmsan_handle_dma(phys_addr_t phys, size_t size,</div><div class='ctx'> 		      enum dma_data_direction dir);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -230,6 +231,67 @@ void kmsan_handle_urb(const struct urb *urb, bool is_out);</div><div class='ctx'>  */</div><div class='ctx'> void kmsan_unpoison_entry_regs(const struct pt_regs *regs);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * kmsan_get_metadata() - Return a pointer to KMSAN shadow or origins.</div><div class='add'>+ * @addr:      kernel address.</div><div class='add'>+ * @is_origin: whether to return origins or shadow.</div><div class='add'>+ *</div><div class='add'>+ * Return NULL if metadata cannot be found.</div><div class='add'>+ */</div><div class='add'>+void *kmsan_get_metadata(void *addr, bool is_origin);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kmsan_enable_current(): Enable KMSAN for the current task.</div><div class='add'>+ *</div><div class='add'>+ * Each kmsan_enable_current() current call must be preceded by a</div><div class='add'>+ * kmsan_disable_current() call. These call pairs may be nested.</div><div class='add'>+ */</div><div class='add'>+void kmsan_enable_current(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kmsan_disable_current(): Disable KMSAN for the current task.</div><div class='add'>+ *</div><div class='add'>+ * Each kmsan_disable_current() current call must be followed by a</div><div class='add'>+ * kmsan_enable_current() call. These call pairs may be nested.</div><div class='add'>+ */</div><div class='add'>+void kmsan_disable_current(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * memset_no_sanitize_memory(): Fill memory without KMSAN instrumentation.</div><div class='add'>+ * @s: address of kernel memory to fill.</div><div class='add'>+ * @c: constant byte to fill the memory with.</div><div class='add'>+ * @n: number of bytes to fill.</div><div class='add'>+ *</div><div class='add'>+ * This is like memset(), but without KMSAN instrumentation.</div><div class='add'>+ */</div><div class='add'>+static inline void *memset_no_sanitize_memory(void *s, int c, size_t n)</div><div class='add'>+{</div><div class='add'>+	return __memset(s, c, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern bool kmsan_enabled;</div><div class='add'>+extern int panic_on_kmsan;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * KMSAN performs a lot of consistency checks that are currently enabled by</div><div class='add'>+ * default. BUG_ON is normally discouraged in the kernel, unless used for</div><div class='add'>+ * debugging, but KMSAN itself is a debugging tool, so it makes little sense to</div><div class='add'>+ * recover if something goes wrong.</div><div class='add'>+ */</div><div class='add'>+#define KMSAN_WARN_ON(cond)                                           \</div><div class='add'>+	({                                                            \</div><div class='add'>+		const bool __cond = WARN_ON(cond);                    \</div><div class='add'>+		if (unlikely(__cond)) {                               \</div><div class='add'>+			WRITE_ONCE(kmsan_enabled, false);             \</div><div class='add'>+			if (panic_on_kmsan) {                         \</div><div class='add'>+				/* Can't call panic() here because */ \</div><div class='add'>+				/* of uaccess checks. */              \</div><div class='add'>+				BUG();                                \</div><div class='add'>+			}                                             \</div><div class='add'>+		}                                                     \</div><div class='add'>+		__cond;                                               \</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline void kmsan_init_shadow(void)</div><div class='hunk'>@@ -287,7 +349,7 @@ static inline void kmsan_kfree_large(const void *ptr)</div><div class='ctx'> </div><div class='ctx'> static inline int __must_check kmsan_vmap_pages_range_noflush(</div><div class='ctx'> 	unsigned long start, unsigned long end, pgprot_t prot,</div><div class='del'>-	struct page **pages, unsigned int page_shift)</div><div class='add'>+	struct page **pages, unsigned int page_shift, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -311,8 +373,8 @@ static inline void kmsan_iounmap_page_range(unsigned long start,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void kmsan_handle_dma(struct page *page, size_t offset,</div><div class='del'>-				    size_t size, enum dma_data_direction dir)</div><div class='add'>+static inline void kmsan_handle_dma(phys_addr_t phys, size_t size,</div><div class='add'>+				    enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -329,6 +391,21 @@ static inline void kmsan_unpoison_entry_regs(const struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void kmsan_enable_current(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kmsan_disable_current(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *memset_no_sanitize_memory(void *s, int c, size_t n)</div><div class='add'>+{</div><div class='add'>+	return memset(s, c, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define KMSAN_WARN_ON WARN_ON</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_KMSAN_H */</div><div class='head'>diff --git a/include/linux/kmsan_types.h b/include/linux/kmsan_types.h<br/>index 929287981afe..dfc59918b3c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kmsan_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmsan_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kmsan_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kmsan_types.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@ struct kmsan_context_state {</div><div class='ctx'> struct kmsan_ctx {</div><div class='ctx'> 	struct kmsan_context_state cstate;</div><div class='ctx'> 	int kmsan_in_runtime;</div><div class='del'>-	bool allow_reporting;</div><div class='add'>+	unsigned int depth;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_KMSAN_TYPES_H */</div><div class='head'>diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h<br/>index 906521c2329c..6055fc969877 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kmsg_dump.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kmsg_dump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kmsg_dump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kmsg_dump.h</a></div><div class='hunk'>@@ -40,6 +40,17 @@ struct kmsg_dump_iter {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct kmsg_dump_detail - kernel crash detail</div><div class='add'>+ * @reason: reason for the crash, see kmsg_dump_reason.</div><div class='add'>+ * @description: optional short string, to provide additional information.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct kmsg_dump_detail {</div><div class='add'>+	enum kmsg_dump_reason reason;</div><div class='add'>+	const char *description;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct kmsg_dumper - kernel crash message dumper structure</div><div class='ctx'>  * @list:	Entry in the dumper list (private)</div><div class='ctx'>  * @dump:	Call into dumping code which will retrieve the data with</div><div class='hunk'>@@ -49,13 +60,13 @@ struct kmsg_dump_iter {</div><div class='ctx'>  */</div><div class='ctx'> struct kmsg_dumper {</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason);</div><div class='add'>+	void (*dump)(struct kmsg_dumper *dumper, struct kmsg_dump_detail *detail);</div><div class='ctx'> 	enum kmsg_dump_reason max_reason;</div><div class='ctx'> 	bool registered;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PRINTK</div><div class='del'>-void kmsg_dump(enum kmsg_dump_reason reason);</div><div class='add'>+void kmsg_dump_desc(enum kmsg_dump_reason reason, const char *desc);</div><div class='ctx'> </div><div class='ctx'> bool kmsg_dump_get_line(struct kmsg_dump_iter *iter, bool syslog,</div><div class='ctx'> 			char *line, size_t size, size_t *len);</div><div class='hunk'>@@ -71,7 +82,7 @@ int kmsg_dump_unregister(struct kmsg_dumper *dumper);</div><div class='ctx'> </div><div class='ctx'> const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason);</div><div class='ctx'> #else</div><div class='del'>-static inline void kmsg_dump(enum kmsg_dump_reason reason)</div><div class='add'>+static inline void kmsg_dump_desc(enum kmsg_dump_reason reason, const char *desc)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -107,4 +118,9 @@ static inline const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline void kmsg_dump(enum kmsg_dump_reason reason)</div><div class='add'>+{</div><div class='add'>+	kmsg_dump_desc(reason, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_KMSG_DUMP_H */</div><div class='head'>diff --git a/include/linux/kobject.h b/include/linux/kobject.h<br/>index c30affcc43b4..c8219505a79f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kobject.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kobject.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kobject.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kobject.h</a></div><div class='hunk'>@@ -38,7 +38,7 @@ extern char uevent_helper[];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* counter to tag the uevent, read only except for the kobject core */</div><div class='del'>-extern u64 uevent_seqnum;</div><div class='add'>+extern atomic64_t uevent_seqnum;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The actions here must match the index to the string array</div><div class='head'>diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h<br/>index be707748e7ce..150fe2ae1b6b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kobject_ns.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kobject_ns.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kobject_ns.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kobject_ns.h</a></div><div class='hunk'>@@ -52,8 +52,6 @@ const struct kobj_ns_type_operations *kobj_ns_ops(const struct kobject *kobj);</div><div class='ctx'> </div><div class='ctx'> bool kobj_ns_current_may_mount(enum kobj_ns_type type);</div><div class='ctx'> void *kobj_ns_grab_current(enum kobj_ns_type type);</div><div class='del'>-const void *kobj_ns_netlink(enum kobj_ns_type type, struct sock *sk);</div><div class='del'>-const void *kobj_ns_initial(enum kobj_ns_type type);</div><div class='ctx'> void kobj_ns_drop(enum kobj_ns_type type, void *ns);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_KOBJECT_NS_H */</div><div class='head'>diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h<br/>index 0ff44d6633e3..8c4f3bb24429 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kprobes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kprobes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kprobes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kprobes.h</a></div><div class='hunk'>@@ -269,15 +269,6 @@ extern unsigned long __stop_kprobe_blacklist[];</div><div class='ctx'> </div><div class='ctx'> extern struct kretprobe_blackpoint kretprobe_blacklist[];</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KPROBES_SANITY_TEST</div><div class='del'>-extern int init_test_probes(void);</div><div class='del'>-#else /* !CONFIG_KPROBES_SANITY_TEST */</div><div class='del'>-static inline int init_test_probes(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_KPROBES_SANITY_TEST */</div><div class='del'>-</div><div class='ctx'> extern int arch_prepare_kprobe(struct kprobe *p);</div><div class='ctx'> extern void arch_arm_kprobe(struct kprobe *p);</div><div class='ctx'> extern void arch_disarm_kprobe(struct kprobe *p);</div><div class='hunk'>@@ -378,11 +369,15 @@ static inline void wait_for_kprobe_optimizer(void) { }</div><div class='ctx'> extern void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,</div><div class='ctx'> 				  struct ftrace_ops *ops, struct ftrace_regs *fregs);</div><div class='ctx'> extern int arch_prepare_kprobe_ftrace(struct kprobe *p);</div><div class='add'>+/* Set when ftrace has been killed: kprobes on ftrace must be disabled for safety */</div><div class='add'>+extern bool kprobe_ftrace_disabled __read_mostly;</div><div class='add'>+extern void kprobe_ftrace_kill(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline int arch_prepare_kprobe_ftrace(struct kprobe *p)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+static inline void kprobe_ftrace_kill(void) {}</div><div class='ctx'> #endif /* CONFIG_KPROBES_ON_FTRACE */</div><div class='ctx'> </div><div class='ctx'> /* Get the kprobe at this addr (if any) - called with preemption disabled */</div><div class='hunk'>@@ -495,6 +490,9 @@ static inline void kprobe_flush_task(struct task_struct *tk)</div><div class='ctx'> static inline void kprobe_free_init_mem(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline void kprobe_ftrace_kill(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> static inline int disable_kprobe(struct kprobe *kp)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='head'>diff --git a/include/linux/kref.h b/include/linux/kref.h<br/>index d32e21a2538c..88e82ab1367c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kref.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kref.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kref.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kref.h</a></div><div class='hunk'>@@ -46,18 +46,18 @@ static inline void kref_get(struct kref *kref)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * kref_put - decrement refcount for object.</div><div class='del'>- * @kref: object.</div><div class='del'>- * @release: pointer to the function that will clean up the object when the</div><div class='add'>+ * kref_put - Decrement refcount for object</div><div class='add'>+ * @kref: Object</div><div class='add'>+ * @release: Pointer to the function that will clean up the object when the</div><div class='ctx'>  *	     last reference to the object is released.</div><div class='del'>- *	     This pointer is required, and it is not acceptable to pass kfree</div><div class='del'>- *	     in as this function.</div><div class='ctx'>  *</div><div class='del'>- * Decrement the refcount, and if 0, call release().</div><div class='del'>- * Return 1 if the object was removed, otherwise return 0.  Beware, if this</div><div class='del'>- * function returns 0, you still can not count on the kref from remaining in</div><div class='del'>- * memory.  Only use the return value if you want to see if the kref is now</div><div class='del'>- * gone, not present.</div><div class='add'>+ * Decrement the refcount, and if 0, call @release.  The caller may not</div><div class='add'>+ * pass NULL or kfree() as the release function.</div><div class='add'>+ *</div><div class='add'>+ * Return: 1 if this call removed the object, otherwise return 0.  Beware,</div><div class='add'>+ * if this function returns 0, another caller may have removed the object</div><div class='add'>+ * by the time this function returns.  The return value is only certain</div><div class='add'>+ * if you want to see if the object is definitely released.</div><div class='ctx'>  */</div><div class='ctx'> static inline int kref_put(struct kref *kref, void (*release)(struct kref *kref))</div><div class='ctx'> {</div><div class='hunk'>@@ -68,17 +68,37 @@ static inline int kref_put(struct kref *kref, void (*release)(struct kref *kref)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * kref_put_mutex - Decrement refcount for object</div><div class='add'>+ * @kref: Object</div><div class='add'>+ * @release: Pointer to the function that will clean up the object when the</div><div class='add'>+ *	     last reference to the object is released.</div><div class='add'>+ * @mutex: Mutex which protects the release function.</div><div class='add'>+ *</div><div class='add'>+ * This variant of kref_lock() calls the @release function with the @mutex</div><div class='add'>+ * held.  The @release function will release the mutex.</div><div class='add'>+ */</div><div class='ctx'> static inline int kref_put_mutex(struct kref *kref,</div><div class='ctx'> 				 void (*release)(struct kref *kref),</div><div class='del'>-				 struct mutex *lock)</div><div class='add'>+				 struct mutex *mutex)</div><div class='ctx'> {</div><div class='del'>-	if (refcount_dec_and_mutex_lock(&amp;kref-&gt;refcount, lock)) {</div><div class='add'>+	if (refcount_dec_and_mutex_lock(&amp;kref-&gt;refcount, mutex)) {</div><div class='ctx'> 		release(kref);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * kref_put_lock - Decrement refcount for object</div><div class='add'>+ * @kref: Object</div><div class='add'>+ * @release: Pointer to the function that will clean up the object when the</div><div class='add'>+ *	     last reference to the object is released.</div><div class='add'>+ * @lock: Spinlock which protects the release function.</div><div class='add'>+ *</div><div class='add'>+ * This variant of kref_lock() calls the @release function with the @lock</div><div class='add'>+ * held.  The @release function will release the lock.</div><div class='add'>+ */</div><div class='ctx'> static inline int kref_put_lock(struct kref *kref,</div><div class='ctx'> 				void (*release)(struct kref *kref),</div><div class='ctx'> 				spinlock_t *lock)</div><div class='hunk'>@@ -94,8 +114,6 @@ static inline int kref_put_lock(struct kref *kref,</div><div class='ctx'>  * kref_get_unless_zero - Increment refcount for object unless it is zero.</div><div class='ctx'>  * @kref: object.</div><div class='ctx'>  *</div><div class='del'>- * Return non-zero if the increment succeeded. Otherwise return 0.</div><div class='del'>- *</div><div class='ctx'>  * This function is intended to simplify locking around refcounting for</div><div class='ctx'>  * objects that can be looked up from a lookup structure, and which are</div><div class='ctx'>  * removed from that lookup structure in the object destructor.</div><div class='hunk'>@@ -105,6 +123,8 @@ static inline int kref_put_lock(struct kref *kref,</div><div class='ctx'>  * With a lookup followed by a kref_get_unless_zero *with return value check*</div><div class='ctx'>  * locking in the kref_put path can be deferred to the actual removal from</div><div class='ctx'>  * the lookup structure and RCU lookups become trivial.</div><div class='add'>+ *</div><div class='add'>+ * Return: non-zero if the increment succeeded. Otherwise return 0.</div><div class='ctx'>  */</div><div class='ctx'> static inline int __must_check kref_get_unless_zero(struct kref *kref)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/ksm.h b/include/linux/ksm.h<br/>index 401348e9f92b..c982694c987b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ksm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ksm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ksm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ksm.h</a></div><div class='hunk'>@@ -13,13 +13,12 @@</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/rmap.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/sched/coredump.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KSM</div><div class='ctx'> int ksm_madvise(struct vm_area_struct *vma, unsigned long start,</div><div class='del'>-		unsigned long end, int advice, unsigned long *vm_flags);</div><div class='del'>-</div><div class='del'>-void ksm_add_vma(struct vm_area_struct *vma);</div><div class='add'>+		unsigned long end, int advice, vm_flags_t *vm_flags);</div><div class='add'>+vm_flags_t ksm_vma_flags(struct mm_struct *mm, const struct file *file,</div><div class='add'>+			 vm_flags_t vm_flags);</div><div class='ctx'> int ksm_enable_merge_any(struct mm_struct *mm);</div><div class='ctx'> int ksm_disable_merge_any(struct mm_struct *mm);</div><div class='ctx'> int ksm_disable(struct mm_struct *mm);</div><div class='hunk'>@@ -33,35 +32,51 @@ void __ksm_exit(struct mm_struct *mm);</div><div class='ctx'>  */</div><div class='ctx'> #define is_ksm_zero_pte(pte)	(is_zero_pfn(pte_pfn(pte)) &amp;&amp; pte_dirty(pte))</div><div class='ctx'> </div><div class='del'>-extern unsigned long ksm_zero_pages;</div><div class='add'>+extern atomic_long_t ksm_zero_pages;</div><div class='add'>+</div><div class='add'>+static inline void ksm_map_zero_page(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	atomic_long_inc(&amp;ksm_zero_pages);</div><div class='add'>+	atomic_long_inc(&amp;mm-&gt;ksm_zero_pages);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void ksm_might_unmap_zero_page(struct mm_struct *mm, pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> 	if (is_ksm_zero_pte(pte)) {</div><div class='del'>-		ksm_zero_pages--;</div><div class='del'>-		mm-&gt;ksm_zero_pages--;</div><div class='add'>+		atomic_long_dec(&amp;ksm_zero_pages);</div><div class='add'>+		atomic_long_dec(&amp;mm-&gt;ksm_zero_pages);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)</div><div class='add'>+static inline long mm_ksm_zero_pages(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	return atomic_long_read(&amp;mm-&gt;ksm_zero_pages);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(MMF_VM_MERGEABLE, &amp;oldmm-&gt;flags)) {</div><div class='del'>-		ret = __ksm_enter(mm);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+static inline void ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)</div><div class='add'>+{</div><div class='add'>+	/* Adding mm to ksm is best effort on fork. */</div><div class='add'>+	if (mm_flags_test(MMF_VM_MERGEABLE, oldmm)) {</div><div class='add'>+		long nr_ksm_zero_pages = atomic_long_read(&amp;mm-&gt;ksm_zero_pages);</div><div class='add'>+</div><div class='add'>+		mm-&gt;ksm_merging_pages = 0;</div><div class='add'>+		mm-&gt;ksm_rmap_items = 0;</div><div class='add'>+		atomic_long_add(nr_ksm_zero_pages, &amp;ksm_zero_pages);</div><div class='add'>+		__ksm_enter(mm);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(MMF_VM_MERGE_ANY, &amp;oldmm-&gt;flags))</div><div class='del'>-		set_bit(MMF_VM_MERGE_ANY, &amp;mm-&gt;flags);</div><div class='add'>+static inline int ksm_execve(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	if (mm_flags_test(MMF_VM_MERGE_ANY, mm))</div><div class='add'>+		return __ksm_enter(mm);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ksm_exit(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	if (test_bit(MMF_VM_MERGEABLE, &amp;mm-&gt;flags))</div><div class='add'>+	if (mm_flags_test(MMF_VM_MERGEABLE, mm))</div><div class='ctx'> 		__ksm_exit(mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -81,20 +96,17 @@ struct folio *ksm_might_need_to_copy(struct folio *folio,</div><div class='ctx'> </div><div class='ctx'> void rmap_walk_ksm(struct folio *folio, struct rmap_walk_control *rwc);</div><div class='ctx'> void folio_migrate_ksm(struct folio *newfolio, struct folio *folio);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MEMORY_FAILURE</div><div class='del'>-void collect_procs_ksm(struct page *page, struct list_head *to_kill,</div><div class='del'>-		       int force_early);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+void collect_procs_ksm(const struct folio *folio, const struct page *page,</div><div class='add'>+		struct list_head *to_kill, int force_early);</div><div class='ctx'> long ksm_process_profit(struct mm_struct *);</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+bool ksm_process_mergeable(struct mm_struct *mm);</div><div class='ctx'> </div><div class='ctx'> #else  /* !CONFIG_KSM */</div><div class='ctx'> </div><div class='del'>-static inline void ksm_add_vma(struct vm_area_struct *vma)</div><div class='add'>+static inline vm_flags_t ksm_vma_flags(struct mm_struct *mm,</div><div class='add'>+		const struct file *file, vm_flags_t vm_flags)</div><div class='ctx'> {</div><div class='add'>+	return vm_flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ksm_disable(struct mm_struct *mm)</div><div class='hunk'>@@ -102,7 +114,11 @@ static inline int ksm_disable(struct mm_struct *mm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)</div><div class='add'>+static inline void ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ksm_execve(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -115,16 +131,15 @@ static inline void ksm_might_unmap_zero_page(struct mm_struct *mm, pte_t pte)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MEMORY_FAILURE</div><div class='del'>-static inline void collect_procs_ksm(struct page *page,</div><div class='del'>-				     struct list_head *to_kill, int force_early)</div><div class='add'>+static inline void collect_procs_ksm(const struct folio *folio,</div><div class='add'>+		const struct page *page, struct list_head *to_kill,</div><div class='add'>+		int force_early)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> static inline int ksm_madvise(struct vm_area_struct *vma, unsigned long start,</div><div class='del'>-		unsigned long end, int advice, unsigned long *vm_flags)</div><div class='add'>+		unsigned long end, int advice, vm_flags_t *vm_flags)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/stackleak.h b/include/linux/kstack_erase.h<br/>index 3be2cb564710..bf3bf1905557 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/stackleak.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stackleak.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kstack_erase.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kstack_erase.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_STACKLEAK_H</div><div class='del'>-#define _LINUX_STACKLEAK_H</div><div class='add'>+#ifndef _LINUX_KSTACK_ERASE_H</div><div class='add'>+#define _LINUX_KSTACK_ERASE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/sched/task_stack.h&gt;</div><div class='hunk'>@@ -9,10 +9,10 @@</div><div class='ctx'>  * Check that the poison value points to the unused hole in the</div><div class='ctx'>  * virtual memory map for your platform.</div><div class='ctx'>  */</div><div class='del'>-#define STACKLEAK_POISON -0xBEEF</div><div class='del'>-#define STACKLEAK_SEARCH_DEPTH 128</div><div class='add'>+#define KSTACK_ERASE_POISON -0xBEEF</div><div class='add'>+#define KSTACK_ERASE_SEARCH_DEPTH 128</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_GCC_PLUGIN_STACKLEAK</div><div class='add'>+#ifdef CONFIG_KSTACK_ERASE</div><div class='ctx'> #include &lt;asm/stacktrace.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -50,7 +50,7 @@ stackleak_task_high_bound(const struct task_struct *tsk)</div><div class='ctx'> static __always_inline unsigned long</div><div class='ctx'> stackleak_find_top_of_poison(const unsigned long low, const unsigned long high)</div><div class='ctx'> {</div><div class='del'>-	const unsigned int depth = STACKLEAK_SEARCH_DEPTH / sizeof(unsigned long);</div><div class='add'>+	const unsigned int depth = KSTACK_ERASE_SEARCH_DEPTH / sizeof(unsigned long);</div><div class='ctx'> 	unsigned int poison_count = 0;</div><div class='ctx'> 	unsigned long poison_high = high;</div><div class='ctx'> 	unsigned long sp = high;</div><div class='hunk'>@@ -58,7 +58,7 @@ stackleak_find_top_of_poison(const unsigned long low, const unsigned long high)</div><div class='ctx'> 	while (sp &gt; low &amp;&amp; poison_count &lt; depth) {</div><div class='ctx'> 		sp -= sizeof(unsigned long);</div><div class='ctx'> </div><div class='del'>-		if (*(unsigned long *)sp == STACKLEAK_POISON) {</div><div class='add'>+		if (*(unsigned long *)sp == KSTACK_ERASE_POISON) {</div><div class='ctx'> 			poison_count++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			poison_count = 0;</div><div class='hunk'>@@ -72,7 +72,7 @@ stackleak_find_top_of_poison(const unsigned long low, const unsigned long high)</div><div class='ctx'> static inline void stackleak_task_init(struct task_struct *t)</div><div class='ctx'> {</div><div class='ctx'> 	t-&gt;lowest_stack = stackleak_task_low_bound(t);</div><div class='del'>-# ifdef CONFIG_STACKLEAK_METRICS</div><div class='add'>+# ifdef CONFIG_KSTACK_ERASE_METRICS</div><div class='ctx'> 	t-&gt;prev_lowest_stack = t-&gt;lowest_stack;</div><div class='ctx'> # endif</div><div class='ctx'> }</div><div class='hunk'>@@ -80,9 +80,9 @@ static inline void stackleak_task_init(struct task_struct *t)</div><div class='ctx'> asmlinkage void noinstr stackleak_erase(void);</div><div class='ctx'> asmlinkage void noinstr stackleak_erase_on_task_stack(void);</div><div class='ctx'> asmlinkage void noinstr stackleak_erase_off_task_stack(void);</div><div class='del'>-void __no_caller_saved_registers noinstr stackleak_track_stack(void);</div><div class='add'>+void __no_caller_saved_registers noinstr __sanitizer_cov_stack_depth(void);</div><div class='ctx'> </div><div class='del'>-#else /* !CONFIG_GCC_PLUGIN_STACKLEAK */</div><div class='add'>+#else /* !CONFIG_KSTACK_ERASE */</div><div class='ctx'> static inline void stackleak_task_init(struct task_struct *t) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/kstrtox.h b/include/linux/kstrtox.h<br/>index 7fcf29a4e0de..6ea897222af1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kstrtox.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kstrtox.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kstrtox.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kstrtox.h</a></div><div class='hunk'>@@ -143,6 +143,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> extern unsigned long simple_strtoul(const char *,char **,unsigned int);</div><div class='add'>+extern unsigned long simple_strntoul(const char *,char **,unsigned int,size_t);</div><div class='ctx'> extern long simple_strtol(const char *,char **,unsigned int);</div><div class='ctx'> extern unsigned long long simple_strtoull(const char *,char **,unsigned int);</div><div class='ctx'> extern long long simple_strtoll(const char *,char **,unsigned int);</div><div class='head'>diff --git a/include/linux/kthread.h b/include/linux/kthread.h<br/>index b11f53c1ba2e..8d27403888ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kthread.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kthread.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kthread.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kthread.h</a></div><div class='hunk'>@@ -85,6 +85,7 @@ kthread_run_on_cpu(int (*threadfn)(void *data), void *data,</div><div class='ctx'> void free_kthread_struct(struct task_struct *k);</div><div class='ctx'> void kthread_bind(struct task_struct *k, unsigned int cpu);</div><div class='ctx'> void kthread_bind_mask(struct task_struct *k, const struct cpumask *mask);</div><div class='add'>+int kthread_affine_preferred(struct task_struct *p, const struct cpumask *mask);</div><div class='ctx'> int kthread_stop(struct task_struct *k);</div><div class='ctx'> int kthread_stop_put(struct task_struct *k);</div><div class='ctx'> bool kthread_should_stop(void);</div><div class='hunk'>@@ -186,13 +187,58 @@ extern void __kthread_init_worker(struct kthread_worker *worker,</div><div class='ctx'> </div><div class='ctx'> int kthread_worker_fn(void *worker_ptr);</div><div class='ctx'> </div><div class='del'>-__printf(2, 3)</div><div class='del'>-struct kthread_worker *</div><div class='del'>-kthread_create_worker(unsigned int flags, const char namefmt[], ...);</div><div class='add'>+__printf(3, 4)</div><div class='add'>+struct kthread_worker *kthread_create_worker_on_node(unsigned int flags,</div><div class='add'>+						     int node,</div><div class='add'>+						     const char namefmt[], ...);</div><div class='add'>+</div><div class='add'>+#define kthread_create_worker(flags, namefmt, ...) \</div><div class='add'>+	kthread_create_worker_on_node(flags, NUMA_NO_NODE, namefmt, ## __VA_ARGS__);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kthread_run_worker - create and wake a kthread worker.</div><div class='add'>+ * @flags: flags modifying the default behavior of the worker</div><div class='add'>+ * @namefmt: printf-style name for the thread.</div><div class='add'>+ *</div><div class='add'>+ * Description: Convenient wrapper for kthread_create_worker() followed by</div><div class='add'>+ * wake_up_process().  Returns the kthread_worker or ERR_PTR(-ENOMEM).</div><div class='add'>+ */</div><div class='add'>+#define kthread_run_worker(flags, namefmt, ...)					\</div><div class='add'>+({										\</div><div class='add'>+	struct kthread_worker *__kw						\</div><div class='add'>+		= kthread_create_worker(flags, namefmt, ## __VA_ARGS__);	\</div><div class='add'>+	if (!IS_ERR(__kw))							\</div><div class='add'>+		wake_up_process(__kw-&gt;task);					\</div><div class='add'>+	__kw;									\</div><div class='add'>+})</div><div class='ctx'> </div><div class='del'>-__printf(3, 4) struct kthread_worker *</div><div class='add'>+struct kthread_worker *</div><div class='ctx'> kthread_create_worker_on_cpu(int cpu, unsigned int flags,</div><div class='del'>-			     const char namefmt[], ...);</div><div class='add'>+			     const char namefmt[]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kthread_run_worker_on_cpu - create and wake a cpu bound kthread worker.</div><div class='add'>+ * @cpu: CPU number</div><div class='add'>+ * @flags: flags modifying the default behavior of the worker</div><div class='add'>+ * @namefmt: printf-style name for the thread. Format is restricted</div><div class='add'>+ *	     to "name.*%u". Code fills in cpu number.</div><div class='add'>+ *</div><div class='add'>+ * Description: Convenient wrapper for kthread_create_worker_on_cpu()</div><div class='add'>+ * followed by wake_up_process().  Returns the kthread_worker or</div><div class='add'>+ * ERR_PTR(-ENOMEM).</div><div class='add'>+ */</div><div class='add'>+static inline struct kthread_worker *</div><div class='add'>+kthread_run_worker_on_cpu(int cpu, unsigned int flags,</div><div class='add'>+			  const char namefmt[])</div><div class='add'>+{</div><div class='add'>+	struct kthread_worker *kw;</div><div class='add'>+</div><div class='add'>+	kw = kthread_create_worker_on_cpu(cpu, flags, namefmt);</div><div class='add'>+	if (!IS_ERR(kw))</div><div class='add'>+		wake_up_process(kw-&gt;task);</div><div class='add'>+</div><div class='add'>+	return kw;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> bool kthread_queue_work(struct kthread_worker *worker,</div><div class='ctx'> 			struct kthread_work *work);</div><div class='head'>diff --git a/include/linux/ktime.h b/include/linux/ktime.h<br/>index 3a4e723eae0f..383ed9985802 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ktime.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ktime.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ktime.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ktime.h</a></div><div class='hunk'>@@ -222,6 +222,11 @@ static inline ktime_t ns_to_ktime(u64 ns)</div><div class='ctx'> 	return ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline ktime_t us_to_ktime(u64 us)</div><div class='add'>+{</div><div class='add'>+	return us * NSEC_PER_USEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline ktime_t ms_to_ktime(u64 ms)</div><div class='ctx'> {</div><div class='ctx'> 	return ms * NSEC_PER_MSEC;</div><div class='head'>diff --git a/include/linux/kvm_dirty_ring.h b/include/linux/kvm_dirty_ring.h<br/>index 4862c98d80d3..eb10d87adf7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kvm_dirty_ring.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kvm_dirty_ring.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kvm_dirty_ring.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kvm_dirty_ring.h</a></div><div class='hunk'>@@ -32,7 +32,7 @@ struct kvm_dirty_ring {</div><div class='ctx'>  * If CONFIG_HAVE_HVM_DIRTY_RING not defined, kvm_dirty_ring.o should</div><div class='ctx'>  * not be included as well, so define these nop functions for the arch.</div><div class='ctx'>  */</div><div class='del'>-static inline u32 kvm_dirty_ring_get_rsvd_entries(void)</div><div class='add'>+static inline u32 kvm_dirty_ring_get_rsvd_entries(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -42,16 +42,17 @@ static inline bool kvm_use_dirty_bitmap(struct kvm *kvm)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int kvm_dirty_ring_alloc(struct kvm_dirty_ring *ring,</div><div class='add'>+static inline int kvm_dirty_ring_alloc(struct kvm *kvm, struct kvm_dirty_ring *ring,</div><div class='ctx'> 				       int index, u32 size)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int kvm_dirty_ring_reset(struct kvm *kvm,</div><div class='del'>-				       struct kvm_dirty_ring *ring)</div><div class='add'>+				       struct kvm_dirty_ring *ring,</div><div class='add'>+				       int *nr_entries_reset)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void kvm_dirty_ring_push(struct kvm_vcpu *vcpu,</div><div class='hunk'>@@ -71,22 +72,14 @@ static inline void kvm_dirty_ring_free(struct kvm_dirty_ring *ring)</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_HAVE_KVM_DIRTY_RING */</div><div class='ctx'> </div><div class='del'>-int kvm_cpu_dirty_log_size(void);</div><div class='add'>+int kvm_cpu_dirty_log_size(struct kvm *kvm);</div><div class='ctx'> bool kvm_use_dirty_bitmap(struct kvm *kvm);</div><div class='ctx'> bool kvm_arch_allow_write_without_running_vcpu(struct kvm *kvm);</div><div class='del'>-u32 kvm_dirty_ring_get_rsvd_entries(void);</div><div class='del'>-int kvm_dirty_ring_alloc(struct kvm_dirty_ring *ring, int index, u32 size);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * called with kvm-&gt;slots_lock held, returns the number of</div><div class='del'>- * processed pages.</div><div class='del'>- */</div><div class='del'>-int kvm_dirty_ring_reset(struct kvm *kvm, struct kvm_dirty_ring *ring);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * returns =0: successfully pushed</div><div class='del'>- *         &lt;0: unable to push, need to wait</div><div class='del'>- */</div><div class='add'>+u32 kvm_dirty_ring_get_rsvd_entries(struct kvm *kvm);</div><div class='add'>+int kvm_dirty_ring_alloc(struct kvm *kvm, struct kvm_dirty_ring *ring,</div><div class='add'>+			 int index, u32 size);</div><div class='add'>+int kvm_dirty_ring_reset(struct kvm *kvm, struct kvm_dirty_ring *ring,</div><div class='add'>+			 int *nr_entries_reset);</div><div class='ctx'> void kvm_dirty_ring_push(struct kvm_vcpu *vcpu, u32 slot, u64 offset);</div><div class='ctx'> </div><div class='ctx'> bool kvm_dirty_ring_check_request(struct kvm_vcpu *vcpu);</div><div class='head'>diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h<br/>index 179df96b20f8..d93f75b05ae2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kvm_host.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kvm_host.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kvm_host.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kvm_host.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #ifndef __KVM_HOST_H</div><div class='ctx'> #define __KVM_HOST_H</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+#include &lt;linux/entry-virt.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -52,9 +52,10 @@</div><div class='ctx'> /*</div><div class='ctx'>  * The bit 16 ~ bit 31 of kvm_userspace_memory_region::flags are internally</div><div class='ctx'>  * used in kvm, other bits are visible for userspace which are defined in</div><div class='del'>- * include/linux/kvm_h.</div><div class='add'>+ * include/uapi/linux/kvm.h.</div><div class='ctx'>  */</div><div class='del'>-#define KVM_MEMSLOT_INVALID	(1UL &lt;&lt; 16)</div><div class='add'>+#define KVM_MEMSLOT_INVALID			(1UL &lt;&lt; 16)</div><div class='add'>+#define KVM_MEMSLOT_GMEM_ONLY			(1UL &lt;&lt; 17)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Bit 63 of the memslot generation number is an "update in-progress flag",</div><div class='hunk'>@@ -97,6 +98,7 @@</div><div class='ctx'> #define KVM_PFN_ERR_HWPOISON	(KVM_PFN_ERR_MASK + 1)</div><div class='ctx'> #define KVM_PFN_ERR_RO_FAULT	(KVM_PFN_ERR_MASK + 2)</div><div class='ctx'> #define KVM_PFN_ERR_SIGPENDING	(KVM_PFN_ERR_MASK + 3)</div><div class='add'>+#define KVM_PFN_ERR_NEEDS_IO	(KVM_PFN_ERR_MASK + 4)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * error pfns indicate that the gfn is in slot but faild to</div><div class='hunk'>@@ -148,11 +150,9 @@ static inline bool kvm_is_error_hva(unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define KVM_ERR_PTR_BAD_PAGE	(ERR_PTR(-ENOENT))</div><div class='del'>-</div><div class='del'>-static inline bool is_error_page(struct page *page)</div><div class='add'>+static inline bool kvm_is_error_gpa(gpa_t gpa)</div><div class='ctx'> {</div><div class='del'>-	return IS_ERR(page);</div><div class='add'>+	return gpa == INVALID_GPA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define KVM_REQUEST_MASK           GENMASK(7,0)</div><div class='hunk'>@@ -188,11 +188,10 @@ static inline bool is_error_page(struct page *page)</div><div class='ctx'> bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req,</div><div class='ctx'> 				 unsigned long *vcpu_bitmap);</div><div class='ctx'> bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req);</div><div class='del'>-bool kvm_make_all_cpus_request_except(struct kvm *kvm, unsigned int req,</div><div class='del'>-				      struct kvm_vcpu *except);</div><div class='ctx'> </div><div class='ctx'> #define KVM_USERSPACE_IRQ_SOURCE_ID		0</div><div class='ctx'> #define KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID	1</div><div class='add'>+#define KVM_PIT_IRQ_SOURCE_ID			2</div><div class='ctx'> </div><div class='ctx'> extern struct mutex kvm_lock;</div><div class='ctx'> extern struct list_head vm_list;</div><div class='hunk'>@@ -208,6 +207,7 @@ struct kvm_io_range {</div><div class='ctx'> struct kvm_io_bus {</div><div class='ctx'> 	int dev_count;</div><div class='ctx'> 	int ioeventfd_count;</div><div class='add'>+	struct rcu_head rcu;</div><div class='ctx'> 	struct kvm_io_range range[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -216,6 +216,7 @@ enum kvm_bus {</div><div class='ctx'> 	KVM_PIO_BUS,</div><div class='ctx'> 	KVM_VIRTIO_CCW_NOTIFY_BUS,</div><div class='ctx'> 	KVM_FAST_MMIO_BUS,</div><div class='add'>+	KVM_IOCSR_BUS,</div><div class='ctx'> 	KVM_NR_BUSES</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -238,7 +239,6 @@ struct kvm_async_pf {</div><div class='ctx'> 	struct list_head link;</div><div class='ctx'> 	struct list_head queue;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='del'>-	struct mm_struct *mm;</div><div class='ctx'> 	gpa_t cr2_or_gpa;</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> 	struct kvm_arch_async_pf arch;</div><div class='hunk'>@@ -255,21 +255,26 @@ int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER</div><div class='ctx'> union kvm_mmu_notifier_arg {</div><div class='del'>-	pte_t pte;</div><div class='ctx'> 	unsigned long attributes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum kvm_gfn_range_filter {</div><div class='add'>+	KVM_FILTER_SHARED		= BIT(0),</div><div class='add'>+	KVM_FILTER_PRIVATE		= BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct kvm_gfn_range {</div><div class='ctx'> 	struct kvm_memory_slot *slot;</div><div class='ctx'> 	gfn_t start;</div><div class='ctx'> 	gfn_t end;</div><div class='ctx'> 	union kvm_mmu_notifier_arg arg;</div><div class='add'>+	enum kvm_gfn_range_filter attr_filter;</div><div class='ctx'> 	bool may_block;</div><div class='add'>+	bool lockless;</div><div class='ctx'> };</div><div class='ctx'> bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range);</div><div class='ctx'> bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range);</div><div class='ctx'> bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range);</div><div class='del'>-bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -279,21 +284,19 @@ enum {</div><div class='ctx'> 	READING_SHADOW_PAGE_TABLES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define KVM_UNMAPPED_PAGE	((void *) 0x500 + POISON_POINTER_DELTA)</div><div class='del'>-</div><div class='ctx'> struct kvm_host_map {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only valid if the 'pfn' is managed by the host kernel (i.e. There is</div><div class='ctx'> 	 * a 'struct page' for it. When using mem= kernel parameter some memory</div><div class='ctx'> 	 * can be used as guest memory but they are not managed by host</div><div class='ctx'> 	 * kernel).</div><div class='del'>-	 * If 'pfn' is not managed by the host kernel, this field is</div><div class='del'>-	 * initialized to KVM_UNMAPPED_PAGE.</div><div class='ctx'> 	 */</div><div class='add'>+	struct page *pinned_page;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	void *hva;</div><div class='ctx'> 	kvm_pfn_t pfn;</div><div class='ctx'> 	kvm_pfn_t gfn;</div><div class='add'>+	bool writable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -342,7 +345,8 @@ struct kvm_vcpu {</div><div class='ctx'> #ifndef __KVM_HAVE_ARCH_WQP</div><div class='ctx'> 	struct rcuwait wait;</div><div class='ctx'> #endif</div><div class='del'>-	struct pid __rcu *pid;</div><div class='add'>+	struct pid *pid;</div><div class='add'>+	rwlock_t pid_lock;</div><div class='ctx'> 	int sigset_active;</div><div class='ctx'> 	sigset_t sigset;</div><div class='ctx'> 	unsigned int halt_poll_ns;</div><div class='hunk'>@@ -378,8 +382,10 @@ struct kvm_vcpu {</div><div class='ctx'> 		bool dy_eligible;</div><div class='ctx'> 	} spin_loop;</div><div class='ctx'> #endif</div><div class='add'>+	bool wants_to_run;</div><div class='ctx'> 	bool preempted;</div><div class='ctx'> 	bool ready;</div><div class='add'>+	bool scheduled_out;</div><div class='ctx'> 	struct kvm_vcpu_arch arch;</div><div class='ctx'> 	struct kvm_vcpu_stat stat;</div><div class='ctx'> 	char stats_id[KVM_STATS_NAME_SIZE];</div><div class='hunk'>@@ -483,7 +489,15 @@ static __always_inline void guest_state_enter_irqoff(void)</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline void guest_context_exit_irqoff(void)</div><div class='ctx'> {</div><div class='del'>-	context_tracking_guest_exit();</div><div class='add'>+	/*</div><div class='add'>+	 * Guest mode is treated as a quiescent state, see</div><div class='add'>+	 * guest_context_enter_irqoff() for more details.</div><div class='add'>+	 */</div><div class='add'>+	if (!context_tracking_guest_exit()) {</div><div class='add'>+		instrumentation_begin();</div><div class='add'>+		rcu_virt_note_context_switch();</div><div class='add'>+		instrumentation_end();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -590,15 +604,20 @@ struct kvm_memory_slot {</div><div class='ctx'> 	short id;</div><div class='ctx'> 	u16 as_id;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KVM_PRIVATE_MEM</div><div class='add'>+#ifdef CONFIG_KVM_GUEST_MEMFD</div><div class='ctx'> 	struct {</div><div class='del'>-		struct file __rcu *file;</div><div class='add'>+		/*</div><div class='add'>+		 * Writes protected by kvm-&gt;slots_lock.  Acquiring a</div><div class='add'>+		 * reference via kvm_gmem_get_file() is protected by</div><div class='add'>+		 * either kvm-&gt;slots_lock or kvm-&gt;srcu.</div><div class='add'>+		 */</div><div class='add'>+		struct file *file;</div><div class='ctx'> 		pgoff_t pgoff;</div><div class='ctx'> 	} gmem;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool kvm_slot_can_be_private(const struct kvm_memory_slot *slot)</div><div class='add'>+static inline bool kvm_slot_has_gmem(const struct kvm_memory_slot *slot)</div><div class='ctx'> {</div><div class='ctx'> 	return slot &amp;&amp; (slot-&gt;flags &amp; KVM_MEM_GUEST_MEMFD);</div><div class='ctx'> }</div><div class='hunk'>@@ -702,17 +721,34 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Arch code must define kvm_arch_has_private_mem if support for private memory</div><div class='del'>- * is enabled.</div><div class='del'>- */</div><div class='del'>-#if !defined(kvm_arch_has_private_mem) &amp;&amp; !IS_ENABLED(CONFIG_KVM_PRIVATE_MEM)</div><div class='add'>+#ifndef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES</div><div class='ctx'> static inline bool kvm_arch_has_private_mem(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KVM_GUEST_MEMFD</div><div class='add'>+bool kvm_arch_supports_gmem_init_shared(struct kvm *kvm);</div><div class='add'>+</div><div class='add'>+static inline u64 kvm_gmem_get_supported_flags(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	u64 flags = GUEST_MEMFD_FLAG_MMAP;</div><div class='add'>+</div><div class='add'>+	if (!kvm || kvm_arch_supports_gmem_init_shared(kvm))</div><div class='add'>+		flags |= GUEST_MEMFD_FLAG_INIT_SHARED;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef kvm_arch_has_readonly_mem</div><div class='add'>+static inline bool kvm_arch_has_readonly_mem(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_HAVE_KVM_READONLY_MEM);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct kvm_memslots {</div><div class='ctx'> 	u64 generation;</div><div class='ctx'> 	atomic_long_t last_used_slot;</div><div class='hunk'>@@ -836,7 +872,7 @@ struct kvm {</div><div class='ctx'> 	struct notifier_block pm_notifier;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES</div><div class='del'>-	/* Protected by slots_locks (for writes) and RCU (for reads) */</div><div class='add'>+	/* Protected by slots_lock (for writes) and RCU (for reads) */</div><div class='ctx'> 	struct xarray mem_attr_array;</div><div class='ctx'> #endif</div><div class='ctx'> 	char stats_id[KVM_STATS_NAME_SIZE];</div><div class='hunk'>@@ -942,16 +978,29 @@ static inline bool kvm_dirty_log_manual_protect_and_init_set(struct kvm *kvm)</div><div class='ctx'> 	return !!(kvm-&gt;manual_dirty_log_protect &amp; KVM_DIRTY_LOG_INITIALLY_SET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Get a bus reference under the update-side lock. No long-term SRCU reader</div><div class='add'>+ * references are permitted, to avoid stale reads vs concurrent IO</div><div class='add'>+ * registrations.</div><div class='add'>+ */</div><div class='ctx'> static inline struct kvm_io_bus *kvm_get_bus(struct kvm *kvm, enum kvm_bus idx)</div><div class='ctx'> {</div><div class='del'>-	return srcu_dereference_check(kvm-&gt;buses[idx], &amp;kvm-&gt;srcu,</div><div class='del'>-				      lockdep_is_held(&amp;kvm-&gt;slots_lock) ||</div><div class='del'>-				      !refcount_read(&amp;kvm-&gt;users_count));</div><div class='add'>+	return rcu_dereference_protected(kvm-&gt;buses[idx],</div><div class='add'>+					 lockdep_is_held(&amp;kvm-&gt;slots_lock));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct kvm_vcpu *kvm_get_vcpu(struct kvm *kvm, int i)</div><div class='ctx'> {</div><div class='ctx'> 	int num_vcpus = atomic_read(&amp;kvm-&gt;online_vcpus);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Explicitly verify the target vCPU is online, as the anti-speculation</div><div class='add'>+	 * logic only limits the CPU's ability to speculate, e.g. given a "bad"</div><div class='add'>+	 * index, clamping the index to 0 would return vCPU0, not NULL.</div><div class='add'>+	 */</div><div class='add'>+	if (i &gt;= num_vcpus)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	i = array_index_nospec(i, num_vcpus);</div><div class='ctx'> </div><div class='ctx'> 	/* Pairs with smp_wmb() in kvm_vm_ioctl_create_vcpu.  */</div><div class='hunk'>@@ -959,9 +1008,10 @@ static inline struct kvm_vcpu *kvm_get_vcpu(struct kvm *kvm, int i)</div><div class='ctx'> 	return xa_load(&amp;kvm-&gt;vcpu_array, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define kvm_for_each_vcpu(idx, vcpup, kvm)		   \</div><div class='del'>-	xa_for_each_range(&amp;kvm-&gt;vcpu_array, idx, vcpup, 0, \</div><div class='del'>-			  (atomic_read(&amp;kvm-&gt;online_vcpus) - 1))</div><div class='add'>+#define kvm_for_each_vcpu(idx, vcpup, kvm)				\</div><div class='add'>+	if (atomic_read(&amp;kvm-&gt;online_vcpus))				\</div><div class='add'>+		xa_for_each_range(&amp;kvm-&gt;vcpu_array, idx, vcpup, 0,	\</div><div class='add'>+				  (atomic_read(&amp;kvm-&gt;online_vcpus) - 1))</div><div class='ctx'> </div><div class='ctx'> static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id)</div><div class='ctx'> {</div><div class='hunk'>@@ -982,19 +1032,19 @@ static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id)</div><div class='ctx'> </div><div class='ctx'> void kvm_destroy_vcpus(struct kvm *kvm);</div><div class='ctx'> </div><div class='add'>+int kvm_trylock_all_vcpus(struct kvm *kvm);</div><div class='add'>+int kvm_lock_all_vcpus(struct kvm *kvm);</div><div class='add'>+void kvm_unlock_all_vcpus(struct kvm *kvm);</div><div class='add'>+</div><div class='ctx'> void vcpu_load(struct kvm_vcpu *vcpu);</div><div class='ctx'> void vcpu_put(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='del'>-#ifdef __KVM_HAVE_IOAPIC</div><div class='add'>+#ifdef CONFIG_KVM_IOAPIC</div><div class='ctx'> void kvm_arch_post_irq_ack_notifier_list_update(struct kvm *kvm);</div><div class='del'>-void kvm_arch_post_irq_routing_update(struct kvm *kvm);</div><div class='ctx'> #else</div><div class='ctx'> static inline void kvm_arch_post_irq_ack_notifier_list_update(struct kvm *kvm)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline void kvm_arch_post_irq_routing_update(struct kvm *kvm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_KVM_IRQCHIP</div><div class='hunk'>@@ -1159,6 +1209,10 @@ static inline bool kvm_memslot_iter_is_valid(struct kvm_memslot_iter *iter, gfn_</div><div class='ctx'> 	     kvm_memslot_iter_is_valid(iter, end);			\</div><div class='ctx'> 	     kvm_memslot_iter_next(iter))</div><div class='ctx'> </div><div class='add'>+struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);</div><div class='add'>+struct kvm_memslots *kvm_vcpu_memslots(struct kvm_vcpu *vcpu);</div><div class='add'>+struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * KVM_SET_USER_MEMORY_REGION ioctl allows the following operations:</div><div class='ctx'>  * - create a new memory slot</div><div class='hunk'>@@ -1168,7 +1222,7 @@ static inline bool kvm_memslot_iter_is_valid(struct kvm_memslot_iter *iter, gfn_</div><div class='ctx'>  *   -- just change its flags</div><div class='ctx'>  *</div><div class='ctx'>  * Since flags can be changed by some of these operations, the following</div><div class='del'>- * differentiation is the best we can do for __kvm_set_memory_region():</div><div class='add'>+ * differentiation is the best we can do for kvm_set_memory_region():</div><div class='ctx'>  */</div><div class='ctx'> enum kvm_mr_change {</div><div class='ctx'> 	KVM_MR_CREATE,</div><div class='hunk'>@@ -1177,10 +1231,8 @@ enum kvm_mr_change {</div><div class='ctx'> 	KVM_MR_FLAGS_ONLY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int kvm_set_memory_region(struct kvm *kvm,</div><div class='del'>-			  const struct kvm_userspace_memory_region2 *mem);</div><div class='del'>-int __kvm_set_memory_region(struct kvm *kvm,</div><div class='del'>-			    const struct kvm_userspace_memory_region2 *mem);</div><div class='add'>+int kvm_set_internal_memslot(struct kvm *kvm,</div><div class='add'>+			     const struct kvm_userspace_memory_region2 *mem);</div><div class='ctx'> void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot);</div><div class='ctx'> void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen);</div><div class='ctx'> int kvm_arch_prepare_memory_region(struct kvm *kvm,</div><div class='hunk'>@@ -1197,33 +1249,70 @@ void kvm_arch_flush_shadow_all(struct kvm *kvm);</div><div class='ctx'> void kvm_arch_flush_shadow_memslot(struct kvm *kvm,</div><div class='ctx'> 				   struct kvm_memory_slot *slot);</div><div class='ctx'> </div><div class='del'>-int gfn_to_page_many_atomic(struct kvm_memory_slot *slot, gfn_t gfn,</div><div class='del'>-			    struct page **pages, int nr_pages);</div><div class='add'>+int kvm_prefetch_pages(struct kvm_memory_slot *slot, gfn_t gfn,</div><div class='add'>+		       struct page **pages, int nr_pages);</div><div class='add'>+</div><div class='add'>+struct page *__gfn_to_page(struct kvm *kvm, gfn_t gfn, bool write);</div><div class='add'>+static inline struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn)</div><div class='add'>+{</div><div class='add'>+	return __gfn_to_page(kvm, gfn, true);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn);</div><div class='ctx'> unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn);</div><div class='ctx'> unsigned long gfn_to_hva_prot(struct kvm *kvm, gfn_t gfn, bool *writable);</div><div class='ctx'> unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, gfn_t gfn);</div><div class='ctx'> unsigned long gfn_to_hva_memslot_prot(struct kvm_memory_slot *slot, gfn_t gfn,</div><div class='ctx'> 				      bool *writable);</div><div class='add'>+</div><div class='add'>+static inline void kvm_release_page_unused(struct page *page)</div><div class='add'>+{</div><div class='add'>+	if (!page)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	put_page(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void kvm_release_page_clean(struct page *page);</div><div class='ctx'> void kvm_release_page_dirty(struct page *page);</div><div class='ctx'> </div><div class='del'>-kvm_pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn);</div><div class='del'>-kvm_pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,</div><div class='del'>-		      bool *writable);</div><div class='del'>-kvm_pfn_t gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn);</div><div class='del'>-kvm_pfn_t gfn_to_pfn_memslot_atomic(const struct kvm_memory_slot *slot, gfn_t gfn);</div><div class='del'>-kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn,</div><div class='del'>-			       bool atomic, bool interruptible, bool *async,</div><div class='del'>-			       bool write_fault, bool *writable, hva_t *hva);</div><div class='del'>-</div><div class='del'>-void kvm_release_pfn_clean(kvm_pfn_t pfn);</div><div class='del'>-void kvm_release_pfn_dirty(kvm_pfn_t pfn);</div><div class='del'>-void kvm_set_pfn_dirty(kvm_pfn_t pfn);</div><div class='del'>-void kvm_set_pfn_accessed(kvm_pfn_t pfn);</div><div class='del'>-</div><div class='del'>-void kvm_release_pfn(kvm_pfn_t pfn, bool dirty);</div><div class='add'>+static inline void kvm_release_faultin_page(struct kvm *kvm, struct page *page,</div><div class='add'>+					    bool unused, bool dirty)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_once(lockdep_is_held(&amp;kvm-&gt;mmu_lock) || unused);</div><div class='add'>+</div><div class='add'>+	if (!page)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the page that KVM got from the *primary MMU* is writable, and KVM</div><div class='add'>+	 * installed or reused a SPTE, mark the page/folio dirty.  Note, this</div><div class='add'>+	 * may mark a folio dirty even if KVM created a read-only SPTE, e.g. if</div><div class='add'>+	 * the GFN is write-protected.  Folios can't be safely marked dirty</div><div class='add'>+	 * outside of mmu_lock as doing so could race with writeback on the</div><div class='add'>+	 * folio.  As a result, KVM can't mark folios dirty in the fast page</div><div class='add'>+	 * fault handler, and so KVM must (somewhat) speculatively mark the</div><div class='add'>+	 * folio dirty if KVM could locklessly make the SPTE writable.</div><div class='add'>+	 */</div><div class='add'>+	if (unused)</div><div class='add'>+		kvm_release_page_unused(page);</div><div class='add'>+	else if (dirty)</div><div class='add'>+		kvm_release_page_dirty(page);</div><div class='add'>+	else</div><div class='add'>+		kvm_release_page_clean(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+kvm_pfn_t __kvm_faultin_pfn(const struct kvm_memory_slot *slot, gfn_t gfn,</div><div class='add'>+			    unsigned int foll, bool *writable,</div><div class='add'>+			    struct page **refcounted_page);</div><div class='add'>+</div><div class='add'>+static inline kvm_pfn_t kvm_faultin_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,</div><div class='add'>+					bool write, bool *writable,</div><div class='add'>+					struct page **refcounted_page)</div><div class='add'>+{</div><div class='add'>+	return __kvm_faultin_pfn(kvm_vcpu_gfn_to_memslot(vcpu, gfn), gfn,</div><div class='add'>+				 write ? FOLL_WRITE : 0, writable, refcounted_page);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,</div><div class='ctx'> 			int len);</div><div class='ctx'> int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len);</div><div class='hunk'>@@ -1287,19 +1376,28 @@ int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);</div><div class='del'>-struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);</div><div class='ctx'> bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);</div><div class='ctx'> bool kvm_vcpu_is_visible_gfn(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='ctx'> unsigned long kvm_host_page_size(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='ctx'> void mark_page_dirty_in_slot(struct kvm *kvm, const struct kvm_memory_slot *memslot, gfn_t gfn);</div><div class='ctx'> void mark_page_dirty(struct kvm *kvm, gfn_t gfn);</div><div class='ctx'> </div><div class='del'>-struct kvm_memslots *kvm_vcpu_memslots(struct kvm_vcpu *vcpu);</div><div class='del'>-struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='del'>-kvm_pfn_t kvm_vcpu_gfn_to_pfn_atomic(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='del'>-kvm_pfn_t kvm_vcpu_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='del'>-int kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvm_host_map *map);</div><div class='del'>-void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map, bool dirty);</div><div class='add'>+int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa, struct kvm_host_map *map,</div><div class='add'>+		   bool writable);</div><div class='add'>+void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map);</div><div class='add'>+</div><div class='add'>+static inline int kvm_vcpu_map(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='add'>+			       struct kvm_host_map *map)</div><div class='add'>+{</div><div class='add'>+	return __kvm_vcpu_map(vcpu, gpa, map, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int kvm_vcpu_map_readonly(struct kvm_vcpu *vcpu, gpa_t gpa,</div><div class='add'>+					struct kvm_host_map *map)</div><div class='add'>+{</div><div class='add'>+	return __kvm_vcpu_map(vcpu, gpa, map, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned long kvm_vcpu_gfn_to_hva(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='ctx'> unsigned long kvm_vcpu_gfn_to_hva_prot(struct kvm_vcpu *vcpu, gfn_t gfn, bool *writable);</div><div class='ctx'> int kvm_vcpu_read_guest_page(struct kvm_vcpu *vcpu, gfn_t gfn, void *data, int offset,</div><div class='hunk'>@@ -1319,21 +1417,12 @@ void kvm_vcpu_mark_page_dirty(struct kvm_vcpu *vcpu, gfn_t gfn);</div><div class='ctx'>  *</div><div class='ctx'>  * @gpc:	   struct gfn_to_pfn_cache object.</div><div class='ctx'>  * @kvm:	   pointer to kvm instance.</div><div class='del'>- * @vcpu:	   vCPU to be used for marking pages dirty and to be woken on</div><div class='del'>- *		   invalidation.</div><div class='del'>- * @usage:	   indicates if the resulting host physical PFN is used while</div><div class='del'>- *		   the @vcpu is IN_GUEST_MODE (in which case invalidation of </div><div class='del'>- *		   the cache from MMU notifiers---but not for KVM memslot</div><div class='del'>- *		   changes!---will also force @vcpu to exit the guest and</div><div class='del'>- *		   refresh the cache); and/or if the PFN used directly</div><div class='del'>- *		   by KVM (and thus needs a kernel virtual mapping).</div><div class='ctx'>  *</div><div class='ctx'>  * This sets up a gfn_to_pfn_cache by initializing locks and assigning the</div><div class='ctx'>  * immutable attributes.  Note, the cache must be zero-allocated (or zeroed by</div><div class='ctx'>  * the caller before init).</div><div class='ctx'>  */</div><div class='del'>-void kvm_gpc_init(struct gfn_to_pfn_cache *gpc, struct kvm *kvm,</div><div class='del'>-		  struct kvm_vcpu *vcpu, enum pfn_cache_usage usage);</div><div class='add'>+void kvm_gpc_init(struct gfn_to_pfn_cache *gpc, struct kvm *kvm);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kvm_gpc_activate - prepare a cached kernel mapping and HPA for a given guest</div><div class='hunk'>@@ -1354,6 +1443,22 @@ void kvm_gpc_init(struct gfn_to_pfn_cache *gpc, struct kvm *kvm,</div><div class='ctx'> int kvm_gpc_activate(struct gfn_to_pfn_cache *gpc, gpa_t gpa, unsigned long len);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * kvm_gpc_activate_hva - prepare a cached kernel mapping and HPA for a given HVA.</div><div class='add'>+ *</div><div class='add'>+ * @gpc:          struct gfn_to_pfn_cache object.</div><div class='add'>+ * @hva:          userspace virtual address to map.</div><div class='add'>+ * @len:          sanity check; the range being access must fit a single page.</div><div class='add'>+ *</div><div class='add'>+ * @return:       0 for success.</div><div class='add'>+ *                -EINVAL for a mapping which would cross a page boundary.</div><div class='add'>+ *                -EFAULT for an untranslatable guest physical address.</div><div class='add'>+ *</div><div class='add'>+ * The semantics of this function are the same as those of kvm_gpc_activate(). It</div><div class='add'>+ * merely bypasses a layer of address translation.</div><div class='add'>+ */</div><div class='add'>+int kvm_gpc_activate_hva(struct gfn_to_pfn_cache *gpc, unsigned long hva, unsigned long len);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * kvm_gpc_check - check validity of a gfn_to_pfn_cache.</div><div class='ctx'>  *</div><div class='ctx'>  * @gpc:	   struct gfn_to_pfn_cache object.</div><div class='hunk'>@@ -1399,6 +1504,16 @@ int kvm_gpc_refresh(struct gfn_to_pfn_cache *gpc, unsigned long len);</div><div class='ctx'>  */</div><div class='ctx'> void kvm_gpc_deactivate(struct gfn_to_pfn_cache *gpc);</div><div class='ctx'> </div><div class='add'>+static inline bool kvm_gpc_is_gpa_active(struct gfn_to_pfn_cache *gpc)</div><div class='add'>+{</div><div class='add'>+	return gpc-&gt;active &amp;&amp; !kvm_is_error_gpa(gpc-&gt;gpa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool kvm_gpc_is_hva_active(struct gfn_to_pfn_cache *gpc)</div><div class='add'>+{</div><div class='add'>+	return gpc-&gt;active &amp;&amp; kvm_is_error_gpa(gpc-&gt;gpa);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void kvm_sigset_activate(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_sigset_deactivate(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -1407,7 +1522,16 @@ bool kvm_vcpu_block(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu);</div><div class='ctx'> bool kvm_vcpu_wake_up(struct kvm_vcpu *vcpu);</div><div class='del'>-void kvm_vcpu_kick(struct kvm_vcpu *vcpu);</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_S390</div><div class='add'>+void __kvm_vcpu_kick(struct kvm_vcpu *vcpu, bool wait);</div><div class='add'>+</div><div class='add'>+static inline void kvm_vcpu_kick(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	__kvm_vcpu_kick(vcpu, false);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int kvm_vcpu_yield_to(struct kvm_vcpu *target);</div><div class='ctx'> void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu, bool yield_to_kernel_mode);</div><div class='ctx'> </div><div class='hunk'>@@ -1433,6 +1557,8 @@ long kvm_arch_dev_ioctl(struct file *filp,</div><div class='ctx'> 			unsigned int ioctl, unsigned long arg);</div><div class='ctx'> long kvm_arch_vcpu_ioctl(struct file *filp,</div><div class='ctx'> 			 unsigned int ioctl, unsigned long arg);</div><div class='add'>+long kvm_arch_vcpu_unlocked_ioctl(struct file *filp,</div><div class='add'>+				  unsigned int ioctl, unsigned long arg);</div><div class='ctx'> vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf);</div><div class='ctx'> </div><div class='ctx'> int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext);</div><div class='hunk'>@@ -1477,8 +1603,6 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,</div><div class='ctx'> 					struct kvm_guest_debug *dbg);</div><div class='ctx'> int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='del'>-void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu);</div><div class='del'>-</div><div class='ctx'> void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu);</div><div class='ctx'> void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id);</div><div class='hunk'>@@ -1497,17 +1621,32 @@ static inline void kvm_create_vcpu_debugfs(struct kvm_vcpu *vcpu) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING</div><div class='del'>-int kvm_arch_hardware_enable(void);</div><div class='del'>-void kvm_arch_hardware_disable(void);</div><div class='add'>+/*</div><div class='add'>+ * kvm_arch_{enable,disable}_virtualization() are called on one CPU, under</div><div class='add'>+ * kvm_usage_lock, immediately after/before 0=&gt;1 and 1=&gt;0 transitions of</div><div class='add'>+ * kvm_usage_count, i.e. at the beginning of the generic hardware enabling</div><div class='add'>+ * sequence, and at the end of the generic hardware disabling sequence.</div><div class='add'>+ */</div><div class='add'>+void kvm_arch_enable_virtualization(void);</div><div class='add'>+void kvm_arch_disable_virtualization(void);</div><div class='add'>+/*</div><div class='add'>+ * kvm_arch_{enable,disable}_virtualization_cpu() are called on "every" CPU to</div><div class='add'>+ * do the actual twiddling of hardware bits.  The hooks are called on all</div><div class='add'>+ * online CPUs when KVM enables/disabled virtualization, and on a single CPU</div><div class='add'>+ * when that CPU is onlined/offlined (including for Resume/Suspend).</div><div class='add'>+ */</div><div class='add'>+int kvm_arch_enable_virtualization_cpu(void);</div><div class='add'>+void kvm_arch_disable_virtualization_cpu(void);</div><div class='ctx'> #endif</div><div class='add'>+bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);</div><div class='ctx'> bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu);</div><div class='ctx'> int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);</div><div class='ctx'> bool kvm_arch_dy_runnable(struct kvm_vcpu *vcpu);</div><div class='ctx'> bool kvm_arch_dy_has_pending_interrupt(struct kvm_vcpu *vcpu);</div><div class='del'>-int kvm_arch_post_init_vm(struct kvm *kvm);</div><div class='add'>+bool kvm_arch_vcpu_preempted_in_kernel(struct kvm_vcpu *vcpu);</div><div class='ctx'> void kvm_arch_pre_destroy_vm(struct kvm *kvm);</div><div class='del'>-int kvm_arch_create_vm_debugfs(struct kvm *kvm);</div><div class='add'>+void kvm_arch_create_vm_debugfs(struct kvm *kvm);</div><div class='ctx'> </div><div class='ctx'> #ifndef __KVM_HAVE_ARCH_VM_ALLOC</div><div class='ctx'> /*</div><div class='hunk'>@@ -1569,24 +1708,6 @@ static inline bool kvm_arch_has_noncoherent_dma(struct kvm *kvm)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-#ifdef __KVM_HAVE_ARCH_ASSIGNED_DEVICE</div><div class='del'>-void kvm_arch_start_assignment(struct kvm *kvm);</div><div class='del'>-void kvm_arch_end_assignment(struct kvm *kvm);</div><div class='del'>-bool kvm_arch_has_assigned_device(struct kvm *kvm);</div><div class='del'>-#else</div><div class='del'>-static inline void kvm_arch_start_assignment(struct kvm *kvm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void kvm_arch_end_assignment(struct kvm *kvm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool kvm_arch_has_assigned_device(struct kvm *kvm)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static inline struct rcuwait *kvm_arch_vcpu_get_wait(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -1637,13 +1758,9 @@ static inline void kvm_unregister_perf_callbacks(void) {}</div><div class='ctx'> </div><div class='ctx'> int kvm_arch_init_vm(struct kvm *kvm, unsigned long type);</div><div class='ctx'> void kvm_arch_destroy_vm(struct kvm *kvm);</div><div class='del'>-void kvm_arch_sync_events(struct kvm *kvm);</div><div class='ctx'> </div><div class='ctx'> int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu);</div><div class='ctx'> </div><div class='del'>-struct page *kvm_pfn_to_refcounted_page(kvm_pfn_t pfn);</div><div class='del'>-bool kvm_is_zone_device_page(struct page *page);</div><div class='del'>-</div><div class='ctx'> struct kvm_irq_ack_notifier {</div><div class='ctx'> 	struct hlist_node link;</div><div class='ctx'> 	unsigned gsi;</div><div class='hunk'>@@ -1668,8 +1785,6 @@ void kvm_register_irq_ack_notifier(struct kvm *kvm,</div><div class='ctx'> 				   struct kvm_irq_ack_notifier *kian);</div><div class='ctx'> void kvm_unregister_irq_ack_notifier(struct kvm *kvm,</div><div class='ctx'> 				   struct kvm_irq_ack_notifier *kian);</div><div class='del'>-int kvm_request_irq_source_id(struct kvm *kvm);</div><div class='del'>-void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id);</div><div class='ctx'> bool kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm_irqfd *args);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1788,11 +1903,21 @@ static inline hpa_t pfn_to_hpa(kvm_pfn_t pfn)</div><div class='ctx'> 	return (hpa_t)pfn &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool kvm_is_error_gpa(struct kvm *kvm, gpa_t gpa)</div><div class='add'>+static inline bool kvm_is_gpa_in_memslot(struct kvm *kvm, gpa_t gpa)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long hva = gfn_to_hva(kvm, gpa_to_gfn(gpa));</div><div class='ctx'> </div><div class='del'>-	return kvm_is_error_hva(hva);</div><div class='add'>+	return !kvm_is_error_hva(hva);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_gpc_mark_dirty_in_slot(struct gfn_to_pfn_cache *gpc)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;gpc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!gpc-&gt;memslot)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mark_page_dirty_in_slot(gpc-&gt;kvm, gpc-&gt;memslot, gpa_to_gfn(gpc-&gt;gpa));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum kvm_stat_kind {</div><div class='hunk'>@@ -1927,8 +2052,6 @@ struct _kvm_stats_desc {</div><div class='ctx'> 			HALT_POLL_HIST_COUNT),				       \</div><div class='ctx'> 	STATS_DESC_IBOOLEAN(VCPU_GENERIC, blocking)</div><div class='ctx'> </div><div class='del'>-extern struct dentry *kvm_debugfs_dir;</div><div class='del'>-</div><div class='ctx'> ssize_t kvm_stats_read(char *id, const struct kvm_stats_header *header,</div><div class='ctx'> 		       const struct _kvm_stats_desc *desc,</div><div class='ctx'> 		       void *stats, size_t size_stats,</div><div class='hunk'>@@ -2068,6 +2191,7 @@ int kvm_set_irq_routing(struct kvm *kvm,</div><div class='ctx'> 			const struct kvm_irq_routing_entry *entries,</div><div class='ctx'> 			unsigned nr,</div><div class='ctx'> 			unsigned flags);</div><div class='add'>+int kvm_init_irq_routing(struct kvm *kvm);</div><div class='ctx'> int kvm_set_routing_entry(struct kvm *kvm,</div><div class='ctx'> 			  struct kvm_kernel_irq_routing_entry *e,</div><div class='ctx'> 			  const struct kvm_irq_routing_entry *ue);</div><div class='hunk'>@@ -2077,6 +2201,11 @@ void kvm_free_irq_routing(struct kvm *kvm);</div><div class='ctx'> </div><div class='ctx'> static inline void kvm_free_irq_routing(struct kvm *kvm) {}</div><div class='ctx'> </div><div class='add'>+static inline int kvm_init_irq_routing(struct kvm *kvm)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi);</div><div class='hunk'>@@ -2132,6 +2261,14 @@ static __always_inline void kvm_make_request(int req, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	__kvm_make_request(req, vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_S390</div><div class='add'>+static inline void kvm_make_request_and_kick(int req, struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	kvm_make_request(req, vcpu);</div><div class='add'>+	__kvm_vcpu_kick(vcpu, req &amp; KVM_REQUEST_WAIT);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline bool kvm_request_pending(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	return READ_ONCE(vcpu-&gt;requests);</div><div class='hunk'>@@ -2164,6 +2301,7 @@ static inline bool kvm_check_request(int req, struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING</div><div class='add'>+extern bool enable_virt_at_load;</div><div class='ctx'> extern bool kvm_rebooting;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2262,7 +2400,9 @@ static inline bool kvm_is_visible_memslot(struct kvm_memory_slot *memslot)</div><div class='ctx'> struct kvm_vcpu *kvm_get_running_vcpu(void);</div><div class='ctx'> struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HAVE_KVM_IRQ_BYPASS</div><div class='add'>+#if IS_ENABLED(CONFIG_HAVE_KVM_IRQ_BYPASS)</div><div class='add'>+struct kvm_kernel_irqfd;</div><div class='add'>+</div><div class='ctx'> bool kvm_arch_has_irq_bypass(void);</div><div class='ctx'> int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *,</div><div class='ctx'> 			   struct irq_bypass_producer *);</div><div class='hunk'>@@ -2270,10 +2410,9 @@ void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *,</div><div class='ctx'> 			   struct irq_bypass_producer *);</div><div class='ctx'> void kvm_arch_irq_bypass_stop(struct irq_bypass_consumer *);</div><div class='ctx'> void kvm_arch_irq_bypass_start(struct irq_bypass_consumer *);</div><div class='del'>-int kvm_arch_update_irqfd_routing(struct kvm *kvm, unsigned int host_irq,</div><div class='del'>-				  uint32_t guest_irq, bool set);</div><div class='del'>-bool kvm_arch_irqfd_route_changed(struct kvm_kernel_irq_routing_entry *,</div><div class='del'>-				  struct kvm_kernel_irq_routing_entry *);</div><div class='add'>+void kvm_arch_update_irqfd_routing(struct kvm_kernel_irqfd *irqfd,</div><div class='add'>+				   struct kvm_kernel_irq_routing_entry *old,</div><div class='add'>+				   struct kvm_kernel_irq_routing_entry *new);</div><div class='ctx'> #endif /* CONFIG_HAVE_KVM_IRQ_BYPASS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_KVM_INVALID_WAKEUPS</div><div class='hunk'>@@ -2300,18 +2439,6 @@ static inline bool kvm_arch_no_poll(struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_HAVE_KVM_NO_POLL */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL</div><div class='del'>-long kvm_arch_vcpu_async_ioctl(struct file *filp,</div><div class='del'>-			       unsigned int ioctl, unsigned long arg);</div><div class='del'>-#else</div><div class='del'>-static inline long kvm_arch_vcpu_async_ioctl(struct file *filp,</div><div class='del'>-					     unsigned int ioctl,</div><div class='del'>-					     unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	return -ENOIOCTLCMD;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL */</div><div class='del'>-</div><div class='ctx'> void kvm_arch_guest_memory_reclaimed(struct kvm *kvm);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE</div><div class='hunk'>@@ -2323,19 +2450,24 @@ static inline int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE */</div><div class='ctx'> </div><div class='del'>-typedef int (*kvm_vm_thread_fn_t)(struct kvm *kvm, uintptr_t data);</div><div class='del'>-</div><div class='del'>-int kvm_vm_create_worker_thread(struct kvm *kvm, kvm_vm_thread_fn_t thread_fn,</div><div class='del'>-				uintptr_t data, const char *name,</div><div class='del'>-				struct task_struct **thread_ptr);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KVM_XFER_TO_GUEST_WORK</div><div class='add'>+#ifdef CONFIG_VIRT_XFER_TO_GUEST_WORK</div><div class='ctx'> static inline void kvm_handle_signal_exit(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	vcpu-&gt;run-&gt;exit_reason = KVM_EXIT_INTR;</div><div class='ctx'> 	vcpu-&gt;stat.signal_exits++;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_KVM_XFER_TO_GUEST_WORK */</div><div class='add'>+</div><div class='add'>+static inline int kvm_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int r = xfer_to_guest_mode_handle_work();</div><div class='add'>+</div><div class='add'>+	if (r) {</div><div class='add'>+		WARN_ON_ONCE(r != -EINTR);</div><div class='add'>+		kvm_handle_signal_exit(vcpu);</div><div class='add'>+	}</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_VIRT_XFER_TO_GUEST_WORK */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If more than one page is being (un)accounted, @virt must be the address of</div><div class='hunk'>@@ -2375,6 +2507,14 @@ static inline void kvm_prepare_memory_fault_exit(struct kvm_vcpu *vcpu,</div><div class='ctx'> 		vcpu-&gt;run-&gt;memory_fault.flags |= KVM_MEMORY_EXIT_FLAG_PRIVATE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool kvm_memslot_is_gmem_only(const struct kvm_memory_slot *slot)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_KVM_GUEST_MEMFD))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return slot-&gt;flags &amp; KVM_MEMSLOT_GMEM_ONLY;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES</div><div class='ctx'> static inline unsigned long kvm_get_memory_attributes(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> {</div><div class='hunk'>@@ -2382,7 +2522,7 @@ static inline unsigned long kvm_get_memory_attributes(struct kvm *kvm, gfn_t gfn</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool kvm_range_has_memory_attributes(struct kvm *kvm, gfn_t start, gfn_t end,</div><div class='del'>-				     unsigned long attrs);</div><div class='add'>+				     unsigned long mask, unsigned long attrs);</div><div class='ctx'> bool kvm_arch_pre_set_memory_attributes(struct kvm *kvm,</div><div class='ctx'> 					struct kvm_gfn_range *range);</div><div class='ctx'> bool kvm_arch_post_set_memory_attributes(struct kvm *kvm,</div><div class='hunk'>@@ -2390,8 +2530,7 @@ bool kvm_arch_post_set_memory_attributes(struct kvm *kvm,</div><div class='ctx'> </div><div class='ctx'> static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> {</div><div class='del'>-	return IS_ENABLED(CONFIG_KVM_PRIVATE_MEM) &amp;&amp;</div><div class='del'>-	       kvm_get_memory_attributes(kvm, gfn) &amp; KVM_MEMORY_ATTRIBUTE_PRIVATE;</div><div class='add'>+	return kvm_get_memory_attributes(kvm, gfn) &amp; KVM_MEMORY_ATTRIBUTE_PRIVATE;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn)</div><div class='hunk'>@@ -2400,17 +2539,69 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KVM_PRIVATE_MEM</div><div class='add'>+#ifdef CONFIG_KVM_GUEST_MEMFD</div><div class='ctx'> int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot,</div><div class='del'>-		     gfn_t gfn, kvm_pfn_t *pfn, int *max_order);</div><div class='add'>+		     gfn_t gfn, kvm_pfn_t *pfn, struct page **page,</div><div class='add'>+		     int *max_order);</div><div class='ctx'> #else</div><div class='ctx'> static inline int kvm_gmem_get_pfn(struct kvm *kvm,</div><div class='ctx'> 				   struct kvm_memory_slot *slot, gfn_t gfn,</div><div class='del'>-				   kvm_pfn_t *pfn, int *max_order)</div><div class='add'>+				   kvm_pfn_t *pfn, struct page **page,</div><div class='add'>+				   int *max_order)</div><div class='ctx'> {</div><div class='ctx'> 	KVM_BUG_ON(1, kvm);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_KVM_PRIVATE_MEM */</div><div class='add'>+#endif /* CONFIG_KVM_GUEST_MEMFD */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE</div><div class='add'>+int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_order);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_POPULATE</div><div class='add'>+/**</div><div class='add'>+ * kvm_gmem_populate() - Populate/prepare a GPA range with guest data</div><div class='add'>+ *</div><div class='add'>+ * @kvm: KVM instance</div><div class='add'>+ * @gfn: starting GFN to be populated</div><div class='add'>+ * @src: userspace-provided buffer containing data to copy into GFN range</div><div class='add'>+ *       (passed to @post_populate, and incremented on each iteration</div><div class='add'>+ *       if not NULL)</div><div class='add'>+ * @npages: number of pages to copy from userspace-buffer</div><div class='add'>+ * @post_populate: callback to issue for each gmem page that backs the GPA</div><div class='add'>+ *                 range</div><div class='add'>+ * @opaque: opaque data to pass to @post_populate callback</div><div class='add'>+ *</div><div class='add'>+ * This is primarily intended for cases where a gmem-backed GPA range needs</div><div class='add'>+ * to be initialized with userspace-provided data prior to being mapped into</div><div class='add'>+ * the guest as a private page. This should be called with the slots-&gt;lock</div><div class='add'>+ * held so that caller-enforced invariants regarding the expected memory</div><div class='add'>+ * attributes of the GPA range do not race with KVM_SET_MEMORY_ATTRIBUTES.</div><div class='add'>+ *</div><div class='add'>+ * Returns the number of pages that were populated.</div><div class='add'>+ */</div><div class='add'>+typedef int (*kvm_gmem_populate_cb)(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn,</div><div class='add'>+				    void __user *src, int order, void *opaque);</div><div class='add'>+</div><div class='add'>+long kvm_gmem_populate(struct kvm *kvm, gfn_t gfn, void __user *src, long npages,</div><div class='add'>+		       kvm_gmem_populate_cb post_populate, void *opaque);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE</div><div class='add'>+void kvm_arch_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY</div><div class='add'>+long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu,</div><div class='add'>+				    struct kvm_pre_fault_memory *range);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING</div><div class='add'>+int kvm_enable_virtualization(void);</div><div class='add'>+void kvm_disable_virtualization(void);</div><div class='add'>+#else</div><div class='add'>+static inline int kvm_enable_virtualization(void) { return 0; }</div><div class='add'>+static inline void kvm_disable_virtualization(void) { }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h<br/>index 8ad43692e3bb..ef8c134ded8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kvm_irqfd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kvm_irqfd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kvm_irqfd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kvm_irqfd.h</a></div><div class='hunk'>@@ -55,10 +55,13 @@ struct kvm_kernel_irqfd {</div><div class='ctx'> 	/* Used for setup/shutdown */</div><div class='ctx'> 	struct eventfd_ctx *eventfd;</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	poll_table pt;</div><div class='ctx'> 	struct work_struct shutdown;</div><div class='ctx'> 	struct irq_bypass_consumer consumer;</div><div class='ctx'> 	struct irq_bypass_producer *producer;</div><div class='add'>+</div><div class='add'>+	struct kvm_vcpu *irq_bypass_vcpu;</div><div class='add'>+	struct list_head vcpu_list;</div><div class='add'>+	void *irq_bypass_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_KVM_IRQFD_H */</div><div class='head'>diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h<br/>index 9d1f7835d8c1..a568d8e6f4e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/kvm_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/kvm_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/kvm_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/kvm_types.h</a></div><div class='hunk'>@@ -3,6 +3,37 @@</div><div class='ctx'> #ifndef __KVM_TYPES_H__</div><div class='ctx'> #define __KVM_TYPES_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;asm/kvm_types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef KVM_SUB_MODULES</div><div class='add'>+#define EXPORT_SYMBOL_FOR_KVM_INTERNAL(symbol) \</div><div class='add'>+	EXPORT_SYMBOL_FOR_MODULES(symbol, __stringify(KVM_SUB_MODULES))</div><div class='add'>+#define EXPORT_SYMBOL_FOR_KVM(symbol) \</div><div class='add'>+	EXPORT_SYMBOL_FOR_MODULES(symbol, "kvm," __stringify(KVM_SUB_MODULES))</div><div class='add'>+#else</div><div class='add'>+#define EXPORT_SYMBOL_FOR_KVM_INTERNAL(symbol)</div><div class='add'>+/*</div><div class='add'>+ * Allow architectures to provide a custom EXPORT_SYMBOL_FOR_KVM, but only</div><div class='add'>+ * if there are no submodules, e.g. to allow suppressing exports if KVM=m, but</div><div class='add'>+ * kvm.ko won't actually be built (due to lack of at least one submodule).</div><div class='add'>+ */</div><div class='add'>+#ifndef EXPORT_SYMBOL_FOR_KVM</div><div class='add'>+#if IS_MODULE(CONFIG_KVM)</div><div class='add'>+#define EXPORT_SYMBOL_FOR_KVM(symbol) EXPORT_SYMBOL_FOR_MODULES(symbol, "kvm")</div><div class='add'>+#else</div><div class='add'>+#define EXPORT_SYMBOL_FOR_KVM(symbol)</div><div class='add'>+#endif /* IS_MODULE(CONFIG_KVM) */</div><div class='add'>+#endif /* EXPORT_SYMBOL_FOR_KVM */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLER__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/spinlock_types.h&gt;</div><div class='add'>+</div><div class='ctx'> struct kvm;</div><div class='ctx'> struct kvm_async_pf;</div><div class='ctx'> struct kvm_device_ops;</div><div class='hunk'>@@ -19,13 +50,6 @@ struct kvm_memslots;</div><div class='ctx'> </div><div class='ctx'> enum kvm_mr_change;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/bits.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/spinlock_types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/kvm_types.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Address types:</div><div class='ctx'>  *</div><div class='hunk'>@@ -49,12 +73,6 @@ typedef u64            hfn_t;</div><div class='ctx'> </div><div class='ctx'> typedef hfn_t kvm_pfn_t;</div><div class='ctx'> </div><div class='del'>-enum pfn_cache_usage {</div><div class='del'>-	KVM_GUEST_USES_PFN = BIT(0),</div><div class='del'>-	KVM_HOST_USES_PFN  = BIT(1),</div><div class='del'>-	KVM_GUEST_AND_HOST_USE_PFN = KVM_GUEST_USES_PFN | KVM_HOST_USES_PFN,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct gfn_to_hva_cache {</div><div class='ctx'> 	u64 generation;</div><div class='ctx'> 	gpa_t gpa;</div><div class='hunk'>@@ -69,13 +87,11 @@ struct gfn_to_pfn_cache {</div><div class='ctx'> 	unsigned long uhva;</div><div class='ctx'> 	struct kvm_memory_slot *memslot;</div><div class='ctx'> 	struct kvm *kvm;</div><div class='del'>-	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	rwlock_t lock;</div><div class='ctx'> 	struct mutex refresh_lock;</div><div class='ctx'> 	void *khva;</div><div class='ctx'> 	kvm_pfn_t pfn;</div><div class='del'>-	enum pfn_cache_usage usage;</div><div class='ctx'> 	bool active;</div><div class='ctx'> 	bool valid;</div><div class='ctx'> };</div><div class='hunk'>@@ -94,6 +110,7 @@ struct gfn_to_pfn_cache {</div><div class='ctx'> struct kvm_mmu_memory_cache {</div><div class='ctx'> 	gfp_t gfp_zero;</div><div class='ctx'> 	gfp_t gfp_custom;</div><div class='add'>+	u64 init_value;</div><div class='ctx'> 	struct kmem_cache *kmem_cache;</div><div class='ctx'> 	int capacity;</div><div class='ctx'> 	int nobjs;</div><div class='hunk'>@@ -123,5 +140,6 @@ struct kvm_vcpu_stat_generic {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define KVM_STATS_NAME_SIZE	48</div><div class='add'>+#endif /* !__ASSEMBLER__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* __KVM_TYPES_H__ */</div><div class='head'>diff --git a/include/linux/lcd.h b/include/linux/lcd.h<br/>index 238fb1dfed98..d4fa03722b72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lcd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lcd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lcd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lcd.h</a></div><div class='hunk'>@@ -11,8 +11,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='add'>+</div><div class='add'>+#define LCD_POWER_ON			(0)</div><div class='add'>+#define LCD_POWER_REDUCED		(1) // deprecated; don't use in new code</div><div class='add'>+#define LCD_POWER_REDUCED_VSYNC_SUSPEND	(2) // deprecated; don't use in new code</div><div class='add'>+#define LCD_POWER_OFF			(4)</div><div class='ctx'> </div><div class='ctx'> /* Notes on locking:</div><div class='ctx'>  *</div><div class='hunk'>@@ -30,7 +33,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct lcd_device;</div><div class='del'>-struct fb_info;</div><div class='ctx'> </div><div class='ctx'> struct lcd_properties {</div><div class='ctx'> 	/* The maximum value for contrast (read-only) */</div><div class='hunk'>@@ -47,11 +49,23 @@ struct lcd_ops {</div><div class='ctx'> 	int (*get_contrast)(struct lcd_device *);</div><div class='ctx'> 	/* Set LCD panel contrast */</div><div class='ctx'>         int (*set_contrast)(struct lcd_device *, int contrast);</div><div class='del'>-	/* Set LCD panel mode (resolutions ...) */</div><div class='del'>-	int (*set_mode)(struct lcd_device *, struct fb_videomode *);</div><div class='del'>-	/* Check if given framebuffer device is the one LCD is bound to;</div><div class='del'>-	   return 0 if not, !=0 if it is. If NULL, lcd always matches the fb. */</div><div class='del'>-	int (*check_fb)(struct lcd_device *, struct fb_info *);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set LCD panel mode (resolutions ...)</div><div class='add'>+	 */</div><div class='add'>+	int (*set_mode)(struct lcd_device *lcd, u32 xres, u32 yres);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the LCD controls the given display device. This</div><div class='add'>+	 * operation is optional and if not implemented it is assumed that</div><div class='add'>+	 * the display is always the one controlled by the LCD.</div><div class='add'>+	 *</div><div class='add'>+	 * RETURNS:</div><div class='add'>+	 *</div><div class='add'>+	 * If display_dev is NULL or display_dev matches the device controlled by</div><div class='add'>+	 * the LCD, return true. Otherwise return false.</div><div class='add'>+	 */</div><div class='add'>+	bool (*controls_device)(struct lcd_device *lcd, struct device *display_device);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct lcd_device {</div><div class='hunk'>@@ -61,11 +75,14 @@ struct lcd_device {</div><div class='ctx'> 	   points to something in the body of that driver, it is also invalid. */</div><div class='ctx'> 	struct mutex ops_lock;</div><div class='ctx'> 	/* If this is NULL, the backing module is unloaded */</div><div class='del'>-	struct lcd_ops *ops;</div><div class='add'>+	const struct lcd_ops *ops;</div><div class='ctx'> 	/* Serialise access to set_power method */</div><div class='ctx'> 	struct mutex update_lock;</div><div class='del'>-	/* The framebuffer notifier block */</div><div class='del'>-	struct notifier_block fb_notif;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @entry: List entry of all registered lcd devices</div><div class='add'>+	 */</div><div class='add'>+	struct list_head entry;</div><div class='ctx'> </div><div class='ctx'> 	struct device dev;</div><div class='ctx'> };</div><div class='hunk'>@@ -102,14 +119,27 @@ static inline void lcd_set_power(struct lcd_device *ld, int power)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern struct lcd_device *lcd_device_register(const char *name,</div><div class='del'>-	struct device *parent, void *devdata, struct lcd_ops *ops);</div><div class='add'>+	struct device *parent, void *devdata, const struct lcd_ops *ops);</div><div class='ctx'> extern struct lcd_device *devm_lcd_device_register(struct device *dev,</div><div class='ctx'> 	const char *name, struct device *parent,</div><div class='del'>-	void *devdata, struct lcd_ops *ops);</div><div class='add'>+	void *devdata, const struct lcd_ops *ops);</div><div class='ctx'> extern void lcd_device_unregister(struct lcd_device *ld);</div><div class='ctx'> extern void devm_lcd_device_unregister(struct device *dev,</div><div class='ctx'> 	struct lcd_device *ld);</div><div class='ctx'> </div><div class='add'>+#if IS_REACHABLE(CONFIG_LCD_CLASS_DEVICE)</div><div class='add'>+void lcd_notify_blank_all(struct device *display_dev, int power);</div><div class='add'>+void lcd_notify_mode_change_all(struct device *display_dev,</div><div class='add'>+				unsigned int width, unsigned int height);</div><div class='add'>+#else</div><div class='add'>+static inline void lcd_notify_blank_all(struct device *display_dev, int power)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+static inline void lcd_notify_mode_change_all(struct device *display_dev,</div><div class='add'>+					      unsigned int width, unsigned int height)</div><div class='add'>+{}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define to_lcd_device(obj) container_of(obj, struct lcd_device, dev)</div><div class='ctx'> </div><div class='ctx'> static inline void * lcd_get_data(struct lcd_device *ld_dev)</div><div class='head'>diff --git a/include/linux/leafops.h b/include/linux/leafops.h<br/>new file mode 100644<br/>index 000000000000..cfafe7a5e7b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/leafops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/leafops.h</a></div><div class='hunk'>@@ -0,0 +1,619 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Describes operations that can be performed on software-defined page table</div><div class='add'>+ * leaf entries. These are abstracted from the hardware page table entries</div><div class='add'>+ * themselves by the softleaf_t type, see mm_types.h.</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_LEAFOPS_H</div><div class='add'>+#define _LINUX_LEAFOPS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mm_types.h&gt;</div><div class='add'>+#include &lt;linux/swapops.h&gt;</div><div class='add'>+#include &lt;linux/swap.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+</div><div class='add'>+/* Temporary until swp_entry_t eliminated. */</div><div class='add'>+#define LEAF_TYPE_SHIFT SWP_TYPE_SHIFT</div><div class='add'>+</div><div class='add'>+enum softleaf_type {</div><div class='add'>+	/* Fundamental types. */</div><div class='add'>+	SOFTLEAF_NONE,</div><div class='add'>+	SOFTLEAF_SWAP,</div><div class='add'>+	/* Migration types. */</div><div class='add'>+	SOFTLEAF_MIGRATION_READ,</div><div class='add'>+	SOFTLEAF_MIGRATION_READ_EXCLUSIVE,</div><div class='add'>+	SOFTLEAF_MIGRATION_WRITE,</div><div class='add'>+	/* Device types. */</div><div class='add'>+	SOFTLEAF_DEVICE_PRIVATE_READ,</div><div class='add'>+	SOFTLEAF_DEVICE_PRIVATE_WRITE,</div><div class='add'>+	SOFTLEAF_DEVICE_EXCLUSIVE,</div><div class='add'>+	/* H/W posion types. */</div><div class='add'>+	SOFTLEAF_HWPOISON,</div><div class='add'>+	/* Marker types. */</div><div class='add'>+	SOFTLEAF_MARKER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_mk_none() - Create an empty ('none') leaf entry.</div><div class='add'>+ * Returns: empty leaf entry.</div><div class='add'>+ */</div><div class='add'>+static inline softleaf_t softleaf_mk_none(void)</div><div class='add'>+{</div><div class='add'>+	return ((softleaf_t) { 0 });</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_from_pte() - Obtain a leaf entry from a PTE entry.</div><div class='add'>+ * @pte: PTE entry.</div><div class='add'>+ *</div><div class='add'>+ * If @pte is present (therefore not a leaf entry) the function returns an empty</div><div class='add'>+ * leaf entry. Otherwise, it returns a leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: Leaf entry.</div><div class='add'>+ */</div><div class='add'>+static inline softleaf_t softleaf_from_pte(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	softleaf_t arch_entry;</div><div class='add'>+</div><div class='add'>+	if (pte_present(pte) || pte_none(pte))</div><div class='add'>+		return softleaf_mk_none();</div><div class='add'>+</div><div class='add'>+	pte = pte_swp_clear_flags(pte);</div><div class='add'>+	arch_entry = __pte_to_swp_entry(pte);</div><div class='add'>+</div><div class='add'>+	/* Temporary until swp_entry_t eliminated. */</div><div class='add'>+	return swp_entry(__swp_type(arch_entry), __swp_offset(arch_entry));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_to_pte() - Obtain a PTE entry from a leaf entry.</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * This generates an architecture-specific PTE entry that can be utilised to</div><div class='add'>+ * encode the metadata the leaf entry encodes.</div><div class='add'>+ *</div><div class='add'>+ * Returns: Architecture-specific PTE entry encoding leaf entry.</div><div class='add'>+ */</div><div class='add'>+static inline pte_t softleaf_to_pte(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	/* Temporary until swp_entry_t eliminated. */</div><div class='add'>+	return swp_entry_to_pte(entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION</div><div class='add'>+/**</div><div class='add'>+ * softleaf_from_pmd() - Obtain a leaf entry from a PMD entry.</div><div class='add'>+ * @pmd: PMD entry.</div><div class='add'>+ *</div><div class='add'>+ * If @pmd is present (therefore not a leaf entry) the function returns an empty</div><div class='add'>+ * leaf entry. Otherwise, it returns a leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: Leaf entry.</div><div class='add'>+ */</div><div class='add'>+static inline softleaf_t softleaf_from_pmd(pmd_t pmd)</div><div class='add'>+{</div><div class='add'>+	softleaf_t arch_entry;</div><div class='add'>+</div><div class='add'>+	if (pmd_present(pmd) || pmd_none(pmd))</div><div class='add'>+		return softleaf_mk_none();</div><div class='add'>+</div><div class='add'>+	if (pmd_swp_soft_dirty(pmd))</div><div class='add'>+		pmd = pmd_swp_clear_soft_dirty(pmd);</div><div class='add'>+	if (pmd_swp_uffd_wp(pmd))</div><div class='add'>+		pmd = pmd_swp_clear_uffd_wp(pmd);</div><div class='add'>+	arch_entry = __pmd_to_swp_entry(pmd);</div><div class='add'>+</div><div class='add'>+	/* Temporary until swp_entry_t eliminated. */</div><div class='add'>+	return swp_entry(__swp_type(arch_entry), __swp_offset(arch_entry));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline softleaf_t softleaf_from_pmd(pmd_t pmd)</div><div class='add'>+{</div><div class='add'>+	return softleaf_mk_none();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_none() - Is the leaf entry empty?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Empty entries are typically the result of a 'none' page table leaf entry</div><div class='add'>+ * being converted to a leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the entry is empty, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_none(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return entry.val == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_type() - Identify the type of leaf entry.</div><div class='add'>+ * @enntry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: the leaf entry type associated with @entry.</div><div class='add'>+ */</div><div class='add'>+static inline enum softleaf_type softleaf_type(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	unsigned int type_num;</div><div class='add'>+</div><div class='add'>+	if (softleaf_is_none(entry))</div><div class='add'>+		return SOFTLEAF_NONE;</div><div class='add'>+</div><div class='add'>+	type_num = entry.val &gt;&gt; LEAF_TYPE_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (type_num &lt; MAX_SWAPFILES)</div><div class='add'>+		return SOFTLEAF_SWAP;</div><div class='add'>+</div><div class='add'>+	switch (type_num) {</div><div class='add'>+#ifdef CONFIG_MIGRATION</div><div class='add'>+	case SWP_MIGRATION_READ:</div><div class='add'>+		return SOFTLEAF_MIGRATION_READ;</div><div class='add'>+	case SWP_MIGRATION_READ_EXCLUSIVE:</div><div class='add'>+		return SOFTLEAF_MIGRATION_READ_EXCLUSIVE;</div><div class='add'>+	case SWP_MIGRATION_WRITE:</div><div class='add'>+		return SOFTLEAF_MIGRATION_WRITE;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_DEVICE_PRIVATE</div><div class='add'>+	case SWP_DEVICE_WRITE:</div><div class='add'>+		return SOFTLEAF_DEVICE_PRIVATE_WRITE;</div><div class='add'>+	case SWP_DEVICE_READ:</div><div class='add'>+		return SOFTLEAF_DEVICE_PRIVATE_READ;</div><div class='add'>+	case SWP_DEVICE_EXCLUSIVE:</div><div class='add'>+		return SOFTLEAF_DEVICE_EXCLUSIVE;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MEMORY_FAILURE</div><div class='add'>+	case SWP_HWPOISON:</div><div class='add'>+		return SOFTLEAF_HWPOISON;</div><div class='add'>+#endif</div><div class='add'>+	case SWP_PTE_MARKER:</div><div class='add'>+		return SOFTLEAF_MARKER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unknown entry type. */</div><div class='add'>+	VM_WARN_ON_ONCE(1);</div><div class='add'>+	return SOFTLEAF_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_swap() - Is this leaf entry a swap entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a swap entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_swap(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return softleaf_type(entry) == SOFTLEAF_SWAP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_migration_write() - Is this leaf entry a writable migration entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a writable migration entry, otherwise</div><div class='add'>+ * false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_migration_write(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return softleaf_type(entry) == SOFTLEAF_MIGRATION_WRITE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_migration_read() - Is this leaf entry a readable migration entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a readable migration entry, otherwise</div><div class='add'>+ * false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_migration_read(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return softleaf_type(entry) == SOFTLEAF_MIGRATION_READ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_migration_read_exclusive() - Is this leaf entry an exclusive</div><div class='add'>+ * readable migration entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is an exclusive readable migration entry,</div><div class='add'>+ * otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_migration_read_exclusive(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return softleaf_type(entry) == SOFTLEAF_MIGRATION_READ_EXCLUSIVE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_migration() - Is this leaf entry a migration entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a migration entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_migration(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	switch (softleaf_type(entry)) {</div><div class='add'>+	case SOFTLEAF_MIGRATION_READ:</div><div class='add'>+	case SOFTLEAF_MIGRATION_READ_EXCLUSIVE:</div><div class='add'>+	case SOFTLEAF_MIGRATION_WRITE:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_device_private_write() - Is this leaf entry a device private</div><div class='add'>+ * writable entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a device private writable entry, otherwise</div><div class='add'>+ * false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_device_private_write(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return softleaf_type(entry) == SOFTLEAF_DEVICE_PRIVATE_WRITE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_device_private() - Is this leaf entry a device private entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a device private entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_device_private(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	switch (softleaf_type(entry)) {</div><div class='add'>+	case SOFTLEAF_DEVICE_PRIVATE_WRITE:</div><div class='add'>+	case SOFTLEAF_DEVICE_PRIVATE_READ:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_device_exclusive() - Is this leaf entry a device-exclusive entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a device-exclusive entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_device_exclusive(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return softleaf_type(entry) == SOFTLEAF_DEVICE_EXCLUSIVE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_hwpoison() - Is this leaf entry a hardware poison entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a hardware poison entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_hwpoison(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return softleaf_type(entry) == SOFTLEAF_HWPOISON;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_marker() - Is this leaf entry a marker?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a marker entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_marker(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return softleaf_type(entry) == SOFTLEAF_MARKER;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_to_marker() - Obtain marker associated with leaf entry.</div><div class='add'>+ * @entry: Leaf entry, softleaf_is_marker(@entry) must return true.</div><div class='add'>+ *</div><div class='add'>+ * Returns: Marker associated with the leaf entry.</div><div class='add'>+ */</div><div class='add'>+static inline pte_marker softleaf_to_marker(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE(!softleaf_is_marker(entry));</div><div class='add'>+</div><div class='add'>+	return swp_offset(entry) &amp; PTE_MARKER_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_has_pfn() - Does this leaf entry encode a valid PFN number?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * A pfn swap entry is a special type of swap entry that always has a pfn stored</div><div class='add'>+ * in the swap offset. They can either be used to represent unaddressable device</div><div class='add'>+ * memory, to restrict access to a page undergoing migration or to represent a</div><div class='add'>+ * pfn which has been hwpoisoned and unmapped.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry encodes a PFN, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_has_pfn(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	/* Make sure the swp offset can always store the needed fields. */</div><div class='add'>+	BUILD_BUG_ON(SWP_TYPE_SHIFT &lt; SWP_PFN_BITS);</div><div class='add'>+</div><div class='add'>+	if (softleaf_is_migration(entry))</div><div class='add'>+		return true;</div><div class='add'>+	if (softleaf_is_device_private(entry))</div><div class='add'>+		return true;</div><div class='add'>+	if (softleaf_is_device_exclusive(entry))</div><div class='add'>+		return true;</div><div class='add'>+	if (softleaf_is_hwpoison(entry))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_to_pfn() - Obtain PFN encoded within leaf entry.</div><div class='add'>+ * @entry: Leaf entry, softleaf_has_pfn(@entry) must return true.</div><div class='add'>+ *</div><div class='add'>+ * Returns: The PFN associated with the leaf entry.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long softleaf_to_pfn(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE(!softleaf_has_pfn(entry));</div><div class='add'>+</div><div class='add'>+	/* Temporary until swp_entry_t eliminated. */</div><div class='add'>+	return swp_offset(entry) &amp; SWP_PFN_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_to_page() - Obtains struct page for PFN encoded within leaf entry.</div><div class='add'>+ * @entry: Leaf entry, softleaf_has_pfn(@entry) must return true.</div><div class='add'>+ *</div><div class='add'>+ * Returns: Pointer to the struct page associated with the leaf entry's PFN.</div><div class='add'>+ */</div><div class='add'>+static inline struct page *softleaf_to_page(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	struct page *page = pfn_to_page(softleaf_to_pfn(entry));</div><div class='add'>+</div><div class='add'>+	VM_WARN_ON_ONCE(!softleaf_has_pfn(entry));</div><div class='add'>+	/*</div><div class='add'>+	 * Any use of migration entries may only occur while the</div><div class='add'>+	 * corresponding page is locked</div><div class='add'>+	 */</div><div class='add'>+	VM_WARN_ON_ONCE(softleaf_is_migration(entry) &amp;&amp; !PageLocked(page));</div><div class='add'>+</div><div class='add'>+	return page;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_to_folio() - Obtains struct folio for PFN encoded within leaf entry.</div><div class='add'>+ * @entry: Leaf entry, softleaf_has_pfn(@entry) must return true.</div><div class='add'>+ *</div><div class='add'>+ * Returns: Pointer to the struct folio associated with the leaf entry's PFN.</div><div class='add'>+ */</div><div class='add'>+static inline struct folio *softleaf_to_folio(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	struct folio *folio = pfn_folio(softleaf_to_pfn(entry));</div><div class='add'>+</div><div class='add'>+	VM_WARN_ON_ONCE(!softleaf_has_pfn(entry));</div><div class='add'>+	/*</div><div class='add'>+	 * Any use of migration entries may only occur while the</div><div class='add'>+	 * corresponding folio is locked.</div><div class='add'>+	 */</div><div class='add'>+	VM_WARN_ON_ONCE(softleaf_is_migration(entry) &amp;&amp;</div><div class='add'>+			!folio_test_locked(folio));</div><div class='add'>+</div><div class='add'>+	return folio;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_poison_marker() - Is this leaf entry a poison marker?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * The poison marker is set via UFFDIO_POISON. Userfaultfd-specific.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a poison marker, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_poison_marker(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	if (!softleaf_is_marker(entry))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return softleaf_to_marker(entry) &amp; PTE_MARKER_POISONED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_guard_marker() - Is this leaf entry a guard region marker?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a guard marker, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_guard_marker(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	if (!softleaf_is_marker(entry))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return softleaf_to_marker(entry) &amp; PTE_MARKER_GUARD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_uffd_wp_marker() - Is this leaf entry a userfautlfd write protect</div><div class='add'>+ * marker?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * Userfaultfd-specific.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the leaf entry is a UFFD WP marker, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_uffd_wp_marker(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	if (!softleaf_is_marker(entry))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return softleaf_to_marker(entry) &amp; PTE_MARKER_UFFD_WP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MIGRATION</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_migration_young() - Does this migration entry contain an accessed</div><div class='add'>+ * bit?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * If the architecture can support storing A/D bits in migration entries, this</div><div class='add'>+ * determines whether the accessed (or 'young') bit was set on the migrated page</div><div class='add'>+ * table entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the entry contains an accessed bit, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_migration_young(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE(!softleaf_is_migration(entry));</div><div class='add'>+</div><div class='add'>+	if (migration_entry_supports_ad())</div><div class='add'>+		return swp_offset(entry) &amp; SWP_MIG_YOUNG;</div><div class='add'>+	/* Keep the old behavior of aging page after migration */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * softleaf_is_migration_dirty() - Does this migration entry contain a dirty bit?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * If the architecture can support storing A/D bits in migration entries, this</div><div class='add'>+ * determines whether the dirty bit was set on the migrated page table entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the entry contains a dirty bit, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool softleaf_is_migration_dirty(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE(!softleaf_is_migration(entry));</div><div class='add'>+</div><div class='add'>+	if (migration_entry_supports_ad())</div><div class='add'>+		return swp_offset(entry) &amp; SWP_MIG_DIRTY;</div><div class='add'>+	/* Keep the old behavior of clean page after migration */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MIGRATION */</div><div class='add'>+</div><div class='add'>+static inline bool softleaf_is_migration_young(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool softleaf_is_migration_dirty(softleaf_t entry)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MIGRATION */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pte_is_marker() - Does the PTE entry encode a marker leaf entry?</div><div class='add'>+ * @pte: PTE entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if this PTE is a marker leaf entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool pte_is_marker(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return softleaf_is_marker(softleaf_from_pte(pte));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pte_is_uffd_wp_marker() - Does this PTE entry encode a userfaultfd write</div><div class='add'>+ * protect marker leaf entry?</div><div class='add'>+ * @pte: PTE entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if this PTE is a UFFD WP marker leaf entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool pte_is_uffd_wp_marker(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	const softleaf_t entry = softleaf_from_pte(pte);</div><div class='add'>+</div><div class='add'>+	return softleaf_is_uffd_wp_marker(entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pte_is_uffd_marker() - Does this PTE entry encode a userfault-specific marker</div><div class='add'>+ * leaf entry?</div><div class='add'>+ * @entry: Leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * It's useful to be able to determine which leaf entries encode UFFD-specific</div><div class='add'>+ * markers so we can handle these correctly.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if this PTE entry is a UFFD-specific marker, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool pte_is_uffd_marker(pte_t pte)</div><div class='add'>+{</div><div class='add'>+	const softleaf_t entry = softleaf_from_pte(pte);</div><div class='add'>+</div><div class='add'>+	if (!softleaf_is_marker(entry))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* UFFD WP, poisoned swap entries are UFFD-handled. */</div><div class='add'>+	if (softleaf_is_uffd_wp_marker(entry))</div><div class='add'>+		return true;</div><div class='add'>+	if (softleaf_is_poison_marker(entry))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ZONE_DEVICE) &amp;&amp; defined(CONFIG_ARCH_ENABLE_THP_MIGRATION)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pmd_is_device_private_entry() - Check if PMD contains a device private swap</div><div class='add'>+ * entry.</div><div class='add'>+ * @pmd: The PMD to check.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the PMD contains a swap entry that represents a device private</div><div class='add'>+ * page mapping. This is used for zone device private pages that have been</div><div class='add'>+ * swapped out but still need special handling during various memory management</div><div class='add'>+ * operations.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if PMD contains device private entry, false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool pmd_is_device_private_entry(pmd_t pmd)</div><div class='add'>+{</div><div class='add'>+	return softleaf_is_device_private(softleaf_from_pmd(pmd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else  /* CONFIG_ZONE_DEVICE &amp;&amp; CONFIG_ARCH_ENABLE_THP_MIGRATION */</div><div class='add'>+</div><div class='add'>+static inline bool pmd_is_device_private_entry(pmd_t pmd)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_ZONE_DEVICE &amp;&amp; CONFIG_ARCH_ENABLE_THP_MIGRATION */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pmd_is_migration_entry() - Does this PMD entry encode a migration entry?</div><div class='add'>+ * @pmd: PMD entry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the PMD encodes a migration entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool pmd_is_migration_entry(pmd_t pmd)</div><div class='add'>+{</div><div class='add'>+	return softleaf_is_migration(softleaf_from_pmd(pmd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pmd_is_valid_softleaf() - Is this PMD entry a valid leaf entry?</div><div class='add'>+ * @pmd: PMD entry.</div><div class='add'>+ *</div><div class='add'>+ * PMD leaf entries are valid only if they are device private or migration</div><div class='add'>+ * entries. This function asserts that a PMD leaf entry is valid in this</div><div class='add'>+ * respect.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the PMD entry is a valid leaf entry, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool pmd_is_valid_softleaf(pmd_t pmd)</div><div class='add'>+{</div><div class='add'>+	const softleaf_t entry = softleaf_from_pmd(pmd);</div><div class='add'>+</div><div class='add'>+	/* Only device private, migration entries valid for PMD. */</div><div class='add'>+	return softleaf_is_device_private(entry) ||</div><div class='add'>+		softleaf_is_migration(entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /* CONFIG_MMU */</div><div class='add'>+#endif  /* _LINUX_LEAFOPS_H */</div><div class='head'>diff --git a/include/linux/led-class-flash.h b/include/linux/led-class-flash.h<br/>index 612b4cab3819..775a96217518 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/led-class-flash.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/led-class-flash.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/led-class-flash.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/led-class-flash.h</a></div><div class='hunk'>@@ -45,6 +45,8 @@ struct led_flash_ops {</div><div class='ctx'> 	int (*timeout_set)(struct led_classdev_flash *fled_cdev, u32 timeout);</div><div class='ctx'> 	/* get the flash LED fault */</div><div class='ctx'> 	int (*fault_get)(struct led_classdev_flash *fled_cdev, u32 *fault);</div><div class='add'>+	/* set flash duration */</div><div class='add'>+	int (*duration_set)(struct led_classdev_flash *fled_cdev, u32 duration);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -75,6 +77,9 @@ struct led_classdev_flash {</div><div class='ctx'> 	/* flash timeout value in microseconds along with its constraints */</div><div class='ctx'> 	struct led_flash_setting timeout;</div><div class='ctx'> </div><div class='add'>+	/* flash timeout value in microseconds along with its constraints */</div><div class='add'>+	struct led_flash_setting duration;</div><div class='add'>+</div><div class='ctx'> 	/* LED Flash class sysfs groups */</div><div class='ctx'> 	const struct attribute_group *sysfs_groups[LED_FLASH_SYSFS_GROUPS_SIZE];</div><div class='ctx'> };</div><div class='hunk'>@@ -85,7 +90,6 @@ static inline struct led_classdev_flash *lcdev_to_flcdev(</div><div class='ctx'> 	return container_of(lcdev, struct led_classdev_flash, led_cdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_LEDS_CLASS_FLASH)</div><div class='ctx'> /**</div><div class='ctx'>  * led_classdev_flash_register_ext - register a new object of LED class with</div><div class='ctx'>  *				     init data and with support for flash LEDs</div><div class='hunk'>@@ -116,29 +120,6 @@ int devm_led_classdev_flash_register_ext(struct device *parent,</div><div class='ctx'> void devm_led_classdev_flash_unregister(struct device *parent,</div><div class='ctx'> 					struct led_classdev_flash *fled_cdev);</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline int led_classdev_flash_register_ext(struct device *parent,</div><div class='del'>-				    struct led_classdev_flash *fled_cdev,</div><div class='del'>-				    struct led_init_data *init_data)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void led_classdev_flash_unregister(struct led_classdev_flash *fled_cdev) {};</div><div class='del'>-static inline int devm_led_classdev_flash_register_ext(struct device *parent,</div><div class='del'>-				     struct led_classdev_flash *fled_cdev,</div><div class='del'>-				     struct led_init_data *init_data)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void devm_led_classdev_flash_unregister(struct device *parent,</div><div class='del'>-					struct led_classdev_flash *fled_cdev)</div><div class='del'>-{};</div><div class='del'>-</div><div class='del'>-#endif  /* IS_ENABLED(CONFIG_LEDS_CLASS_FLASH) */</div><div class='del'>-</div><div class='ctx'> static inline int led_classdev_flash_register(struct device *parent,</div><div class='ctx'> 					   struct led_classdev_flash *fled_cdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -216,7 +197,7 @@ int led_update_flash_brightness(struct led_classdev_flash *fled_cdev);</div><div class='ctx'>  * @fled_cdev: the flash LED to set</div><div class='ctx'>  * @timeout: the flash timeout to set it to</div><div class='ctx'>  *</div><div class='del'>- * Set the flash strobe duration.</div><div class='add'>+ * Set the flash strobe timeout.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: 0 on success or negative error value on failure</div><div class='ctx'>  */</div><div class='hunk'>@@ -233,4 +214,15 @@ int led_set_flash_timeout(struct led_classdev_flash *fled_cdev, u32 timeout);</div><div class='ctx'>  */</div><div class='ctx'> int led_get_flash_fault(struct led_classdev_flash *fled_cdev, u32 *fault);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * led_set_flash_duration - set flash LED duration</div><div class='add'>+ * @fled_cdev: the flash LED to set</div><div class='add'>+ * @timeout: the flash duration to set it to</div><div class='add'>+ *</div><div class='add'>+ * Set the flash strobe duration.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success or negative error value on failure</div><div class='add'>+ */</div><div class='add'>+int led_set_flash_duration(struct led_classdev_flash *fled_cdev, u32 duration);</div><div class='add'>+</div><div class='ctx'> #endif	/* __LINUX_FLASH_LEDS_H_INCLUDED */</div><div class='head'>diff --git a/include/linux/led-class-multicolor.h b/include/linux/led-class-multicolor.h<br/>index 210d57bcd767..db9f34c6736e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/led-class-multicolor.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/led-class-multicolor.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/led-class-multicolor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/led-class-multicolor.h</a></div><div class='hunk'>@@ -30,7 +30,6 @@ static inline struct led_classdev_mc *lcdev_to_mccdev(</div><div class='ctx'> 	return container_of(led_cdev, struct led_classdev_mc, led_cdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_LEDS_CLASS_MULTICOLOR)</div><div class='ctx'> /**</div><div class='ctx'>  * led_classdev_multicolor_register_ext - register a new object of led_classdev</div><div class='ctx'>  *				      class with support for multicolor LEDs</div><div class='hunk'>@@ -64,34 +63,6 @@ int devm_led_classdev_multicolor_register_ext(struct device *parent,</div><div class='ctx'> </div><div class='ctx'> void devm_led_classdev_multicolor_unregister(struct device *parent,</div><div class='ctx'> 					    struct led_classdev_mc *mcled_cdev);</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline int led_classdev_multicolor_register_ext(struct device *parent,</div><div class='del'>-					    struct led_classdev_mc *mcled_cdev,</div><div class='del'>-					    struct led_init_data *init_data)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void led_classdev_multicolor_unregister(struct led_classdev_mc *mcled_cdev) {};</div><div class='del'>-static inline int led_mc_calc_color_components(struct led_classdev_mc *mcled_cdev,</div><div class='del'>-					       enum led_brightness brightness)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int devm_led_classdev_multicolor_register_ext(struct device *parent,</div><div class='del'>-					  struct led_classdev_mc *mcled_cdev,</div><div class='del'>-					  struct led_init_data *init_data)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void devm_led_classdev_multicolor_unregister(struct device *parent,</div><div class='del'>-					    struct led_classdev_mc *mcled_cdev)</div><div class='del'>-{};</div><div class='del'>-</div><div class='del'>-#endif  /* IS_ENABLED(CONFIG_LEDS_CLASS_MULTICOLOR) */</div><div class='ctx'> </div><div class='ctx'> static inline int led_classdev_multicolor_register(struct device *parent,</div><div class='ctx'> 					    struct led_classdev_mc *mcled_cdev)</div><div class='head'>diff --git a/include/linux/leds-expresswire.h b/include/linux/leds-expresswire.h<br/>new file mode 100644<br/>index 000000000000..a422921f4159<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/leds-expresswire.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/leds-expresswire.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Shared library for Kinetic's ExpressWire protocol.</div><div class='add'>+ * This protocol works by pulsing the ExpressWire IC's control GPIO.</div><div class='add'>+ * ktd2692 and ktd2801 are known to use this protocol.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LEDS_EXPRESSWIRE_H</div><div class='add'>+#define _LEDS_EXPRESSWIRE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct gpio_desc;</div><div class='add'>+</div><div class='add'>+struct expresswire_timing {</div><div class='add'>+	unsigned long poweroff_us;</div><div class='add'>+	unsigned long detect_delay_us;</div><div class='add'>+	unsigned long detect_us;</div><div class='add'>+	unsigned long data_start_us;</div><div class='add'>+	unsigned long end_of_data_low_us;</div><div class='add'>+	unsigned long end_of_data_high_us;</div><div class='add'>+	unsigned long short_bitset_us;</div><div class='add'>+	unsigned long long_bitset_us;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct expresswire_common_props {</div><div class='add'>+	struct gpio_desc *ctrl_gpio;</div><div class='add'>+	struct expresswire_timing timing;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void expresswire_power_off(struct expresswire_common_props *props);</div><div class='add'>+void expresswire_enable(struct expresswire_common_props *props);</div><div class='add'>+void expresswire_start(struct expresswire_common_props *props);</div><div class='add'>+void expresswire_end(struct expresswire_common_props *props);</div><div class='add'>+void expresswire_set_bit(struct expresswire_common_props *props, bool bit);</div><div class='add'>+void expresswire_write_u8(struct expresswire_common_props *props, u8 val);</div><div class='add'>+</div><div class='add'>+#endif /* _LEDS_EXPRESSWIRE_H */</div><div class='head'>diff --git a/include/linux/leds.h b/include/linux/leds.h<br/>index 4754b02d3a2c..b16b803cc1ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/leds.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/leds.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/leds.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/leds.h</a></div><div class='hunk'>@@ -82,15 +82,7 @@ struct led_init_data {</div><div class='ctx'> 	bool devname_mandatory;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_NEW_LEDS)</div><div class='ctx'> enum led_default_state led_init_default_state_get(struct fwnode_handle *fwnode);</div><div class='del'>-#else</div><div class='del'>-static inline enum led_default_state</div><div class='del'>-led_init_default_state_get(struct fwnode_handle *fwnode)</div><div class='del'>-{</div><div class='del'>-	return LEDS_DEFSTATE_OFF;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> struct led_hw_trigger_type {</div><div class='ctx'> 	int dummy;</div><div class='hunk'>@@ -115,6 +107,8 @@ struct led_classdev {</div><div class='ctx'> #define LED_BRIGHT_HW_CHANGED	BIT(21)</div><div class='ctx'> #define LED_RETAIN_AT_SHUTDOWN	BIT(22)</div><div class='ctx'> #define LED_INIT_DEFAULT_TRIGGER BIT(23)</div><div class='add'>+#define LED_REJECT_NAME_CONFLICT BIT(24)</div><div class='add'>+#define LED_MULTI_COLOR		BIT(25)</div><div class='ctx'> </div><div class='ctx'> 	/* set_brightness_work / blink_timer flags, atomic, private. */</div><div class='ctx'> 	unsigned long		work_flags;</div><div class='hunk'>@@ -177,6 +171,7 @@ struct led_classdev {</div><div class='ctx'> 	int			 new_blink_brightness;</div><div class='ctx'> 	void			(*flash_resume)(struct led_classdev *led_cdev);</div><div class='ctx'> </div><div class='add'>+	struct workqueue_struct *wq;			/* LED workqueue */</div><div class='ctx'> 	struct work_struct	set_brightness_work;</div><div class='ctx'> 	int			delayed_set_value;</div><div class='ctx'> 	unsigned long		delayed_delay_on;</div><div class='hunk'>@@ -244,7 +239,7 @@ struct led_classdev {</div><div class='ctx'> 	struct kernfs_node	*brightness_hw_changed_kn;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* Ensures consistent access to the LED Flash Class device */</div><div class='add'>+	/* Ensures consistent access to the LED class device */</div><div class='ctx'> 	struct mutex		led_access;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -279,20 +274,9 @@ static inline int led_classdev_register(struct device *parent,</div><div class='ctx'> 	return led_classdev_register_ext(parent, led_cdev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_LEDS_CLASS)</div><div class='ctx'> int devm_led_classdev_register_ext(struct device *parent,</div><div class='ctx'> 					  struct led_classdev *led_cdev,</div><div class='ctx'> 					  struct led_init_data *init_data);</div><div class='del'>-#else</div><div class='del'>-static inline int</div><div class='del'>-devm_led_classdev_register_ext(struct device *parent,</div><div class='del'>-			       struct led_classdev *led_cdev,</div><div class='del'>-			       struct led_init_data *init_data)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static inline int devm_led_classdev_register(struct device *parent,</div><div class='ctx'> 					     struct led_classdev *led_cdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -310,7 +294,6 @@ void led_remove_lookup(struct led_lookup_data *led_lookup);</div><div class='ctx'> struct led_classdev *__must_check led_get(struct device *dev, char *con_id);</div><div class='ctx'> struct led_classdev *__must_check devm_led_get(struct device *dev, char *con_id);</div><div class='ctx'> </div><div class='del'>-extern struct led_classdev *of_led_get(struct device_node *np, int index);</div><div class='ctx'> extern void led_put(struct led_classdev *led_cdev);</div><div class='ctx'> struct led_classdev *__must_check devm_of_led_get(struct device *dev,</div><div class='ctx'> 						  int index);</div><div class='hunk'>@@ -393,6 +376,25 @@ void led_set_brightness(struct led_classdev *led_cdev, unsigned int brightness);</div><div class='ctx'> int led_set_brightness_sync(struct led_classdev *led_cdev, unsigned int value);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * led_mc_set_brightness - set mc LED color intensity values and brightness</div><div class='add'>+ * @led_cdev: the LED to set</div><div class='add'>+ * @intensity_value: array of per color intensity values to set</div><div class='add'>+ * @num_colors: amount of entries in intensity_value array</div><div class='add'>+ * @brightness: the brightness to set the LED to</div><div class='add'>+ *</div><div class='add'>+ * Set a multi-color LED's per color intensity values and brightness.</div><div class='add'>+ * If necessary, this cancels the software blink timer. This function is</div><div class='add'>+ * guaranteed not to sleep.</div><div class='add'>+ *</div><div class='add'>+ * Calling this function on a non multi-color led_classdev or with the wrong</div><div class='add'>+ * num_colors value is an error. In this case an error will be logged once</div><div class='add'>+ * and the call will do nothing.</div><div class='add'>+ */</div><div class='add'>+void led_mc_set_brightness(struct led_classdev *led_cdev,</div><div class='add'>+			   unsigned int *intensity_value, unsigned int num_colors,</div><div class='add'>+			   unsigned int brightness);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * led_update_brightness - update LED brightness</div><div class='ctx'>  * @led_cdev: the LED to query</div><div class='ctx'>  *</div><div class='hunk'>@@ -447,6 +449,16 @@ int led_compose_name(struct device *dev, struct led_init_data *init_data,</div><div class='ctx'> 		     char *led_classdev_name);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * led_get_color_name - get string representation of color ID</div><div class='add'>+ * @color_id: The LED_COLOR_ID_* constant</div><div class='add'>+ *</div><div class='add'>+ * Get the string name of a LED_COLOR_ID_* constant.</div><div class='add'>+ *</div><div class='add'>+ * Returns: A string constant or NULL on an invalid ID.</div><div class='add'>+ */</div><div class='add'>+const char *led_get_color_name(u8 color_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * led_sysfs_is_disabled - check if LED sysfs interface is disabled</div><div class='ctx'>  * @led_cdev: the LED to query</div><div class='ctx'>  *</div><div class='hunk'>@@ -474,6 +486,9 @@ struct led_trigger {</div><div class='ctx'> 	int		(*activate)(struct led_classdev *led_cdev);</div><div class='ctx'> 	void		(*deactivate)(struct led_classdev *led_cdev);</div><div class='ctx'> </div><div class='add'>+	/* Brightness set by led_trigger_event */</div><div class='add'>+	enum led_brightness brightness;</div><div class='add'>+</div><div class='ctx'> 	/* LED-private triggers have this set */</div><div class='ctx'> 	struct led_hw_trigger_type *trigger_type;</div><div class='ctx'> </div><div class='hunk'>@@ -506,6 +521,9 @@ void led_trigger_register_simple(const char *name,</div><div class='ctx'> 				struct led_trigger **trigger);</div><div class='ctx'> void led_trigger_unregister_simple(struct led_trigger *trigger);</div><div class='ctx'> void led_trigger_event(struct led_trigger *trigger,  enum led_brightness event);</div><div class='add'>+void led_mc_trigger_event(struct led_trigger *trig,</div><div class='add'>+			  unsigned int *intensity_value, unsigned int num_colors,</div><div class='add'>+			  enum led_brightness brightness);</div><div class='ctx'> void led_trigger_blink(struct led_trigger *trigger, unsigned long delay_on,</div><div class='ctx'> 		       unsigned long delay_off);</div><div class='ctx'> void led_trigger_blink_oneshot(struct led_trigger *trigger,</div><div class='hunk'>@@ -527,6 +545,12 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)</div><div class='ctx'> 	return led_cdev-&gt;trigger_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline enum led_brightness</div><div class='add'>+led_trigger_get_brightness(const struct led_trigger *trigger)</div><div class='add'>+{</div><div class='add'>+	return trigger ? trigger-&gt;brightness : LED_OFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define module_led_trigger(__led_trigger) \</div><div class='ctx'> 	module_driver(__led_trigger, led_trigger_register, \</div><div class='ctx'> 		      led_trigger_unregister)</div><div class='hunk'>@@ -542,6 +566,9 @@ static inline void led_trigger_register_simple(const char *name,</div><div class='ctx'> static inline void led_trigger_unregister_simple(struct led_trigger *trigger) {}</div><div class='ctx'> static inline void led_trigger_event(struct led_trigger *trigger,</div><div class='ctx'> 				enum led_brightness event) {}</div><div class='add'>+static inline void led_mc_trigger_event(struct led_trigger *trig,</div><div class='add'>+				unsigned int *intensity_value, unsigned int num_colors,</div><div class='add'>+				enum led_brightness brightness) {}</div><div class='ctx'> static inline void led_trigger_blink(struct led_trigger *trigger,</div><div class='ctx'> 				      unsigned long delay_on,</div><div class='ctx'> 				      unsigned long delay_off) {}</div><div class='hunk'>@@ -563,6 +590,12 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline enum led_brightness</div><div class='add'>+led_trigger_get_brightness(const struct led_trigger *trigger)</div><div class='add'>+{</div><div class='add'>+	return LED_OFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_LEDS_TRIGGERS */</div><div class='ctx'> </div><div class='ctx'> /* Trigger specific enum */</div><div class='hunk'>@@ -578,6 +611,8 @@ enum led_trigger_netdev_modes {</div><div class='ctx'> 	TRIGGER_NETDEV_FULL_DUPLEX,</div><div class='ctx'> 	TRIGGER_NETDEV_TX,</div><div class='ctx'> 	TRIGGER_NETDEV_RX,</div><div class='add'>+	TRIGGER_NETDEV_TX_ERR,</div><div class='add'>+	TRIGGER_NETDEV_RX_ERR,</div><div class='ctx'> </div><div class='ctx'> 	/* Keep last */</div><div class='ctx'> 	__TRIGGER_NETDEV_MAX,</div><div class='hunk'>@@ -604,6 +639,12 @@ static inline void ledtrig_flash_ctrl(bool on) {}</div><div class='ctx'> static inline void ledtrig_torch_ctrl(bool on) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_REACHABLE(CONFIG_LEDS_TRIGGER_BACKLIGHT)</div><div class='add'>+void ledtrig_backlight_blank(bool blank);</div><div class='add'>+#else</div><div class='add'>+static inline void ledtrig_backlight_blank(bool blank) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Generic LED platform data for describing LED names and default triggers.</div><div class='ctx'>  */</div><div class='hunk'>@@ -658,7 +699,7 @@ struct gpio_led_platform_data {</div><div class='ctx'> 	gpio_blink_set_t	gpio_blink_set;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NEW_LEDS</div><div class='add'>+#ifdef CONFIG_LEDS_GPIO_REGISTER</div><div class='ctx'> struct platform_device *gpio_led_register_device(</div><div class='ctx'> 		int id, const struct gpio_led_platform_data *pdata);</div><div class='ctx'> #else</div><div class='hunk'>@@ -709,18 +750,4 @@ enum led_audio {</div><div class='ctx'> 	NUM_AUDIO_LEDS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_LEDS_TRIGGER_AUDIO)</div><div class='del'>-enum led_brightness ledtrig_audio_get(enum led_audio type);</div><div class='del'>-void ledtrig_audio_set(enum led_audio type, enum led_brightness state);</div><div class='del'>-#else</div><div class='del'>-static inline enum led_brightness ledtrig_audio_get(enum led_audio type)</div><div class='del'>-{</div><div class='del'>-	return LED_OFF;</div><div class='del'>-}</div><div class='del'>-static inline void ledtrig_audio_set(enum led_audio type,</div><div class='del'>-				     enum led_brightness state)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif		/* __LINUX_LEDS_H_INCLUDED */</div><div class='head'>diff --git a/include/linux/libata.h b/include/linux/libata.h<br/>index 26d68115afb8..39534fafa36a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/libata.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/libata.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/libata.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/libata.h</a></div><div class='hunk'>@@ -41,20 +41,90 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef ATA_IRQ_TRAP		/* define to ack screaming irqs */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define ata_print_version_once(dev, version)			\</div><div class='del'>-({								\</div><div class='del'>-	static bool __print_once;				\</div><div class='del'>-								\</div><div class='del'>-	if (!__print_once) {					\</div><div class='del'>-		__print_once = true;				\</div><div class='del'>-		ata_print_version(dev, version);		\</div><div class='del'>-	}							\</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> /* defines only for the constants which don't work well as enums */</div><div class='ctx'> #define ATA_TAG_POISON		0xfafbfcfdU</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Quirk flags bits.</div><div class='add'>+ * ata_device-&gt;quirks is an unsigned int, so __ATA_QUIRK_MAX must not exceed 32.</div><div class='add'>+ */</div><div class='add'>+enum ata_quirks {</div><div class='add'>+	__ATA_QUIRK_DIAGNOSTIC,		/* Failed boot diag */</div><div class='add'>+	__ATA_QUIRK_NODMA,		/* DMA problems */</div><div class='add'>+	__ATA_QUIRK_NONCQ,		/* Don't use NCQ */</div><div class='add'>+	__ATA_QUIRK_MAX_SEC_128,	/* Limit max sects to 128 */</div><div class='add'>+	__ATA_QUIRK_BROKEN_HPA,		/* Broken HPA */</div><div class='add'>+	__ATA_QUIRK_DISABLE,		/* Disable it */</div><div class='add'>+	__ATA_QUIRK_HPA_SIZE,		/* Native size off by one */</div><div class='add'>+	__ATA_QUIRK_IVB,		/* cbl det validity bit bugs */</div><div class='add'>+	__ATA_QUIRK_STUCK_ERR,		/* Stuck ERR on next PACKET */</div><div class='add'>+	__ATA_QUIRK_BRIDGE_OK,		/* No bridge limits */</div><div class='add'>+	__ATA_QUIRK_ATAPI_MOD16_DMA,	/* Use ATAPI DMA for commands that */</div><div class='add'>+					/* are not a multiple of 16 bytes */</div><div class='add'>+	__ATA_QUIRK_FIRMWARE_WARN,	/* Firmware update warning */</div><div class='add'>+	__ATA_QUIRK_1_5_GBPS,		/* Force 1.5 Gbps */</div><div class='add'>+	__ATA_QUIRK_NOSETXFER,		/* Skip SETXFER, SATA only */</div><div class='add'>+	__ATA_QUIRK_BROKEN_FPDMA_AA,	/* Skip AA */</div><div class='add'>+	__ATA_QUIRK_DUMP_ID,		/* Dump IDENTIFY data */</div><div class='add'>+	__ATA_QUIRK_MAX_SEC_LBA48,	/* Set max sects to 65535 */</div><div class='add'>+	__ATA_QUIRK_ATAPI_DMADIR,	/* Device requires dmadir */</div><div class='add'>+	__ATA_QUIRK_NO_NCQ_TRIM,	/* Do not use queued TRIM */</div><div class='add'>+	__ATA_QUIRK_NOLPM,		/* Do not use LPM */</div><div class='add'>+	__ATA_QUIRK_WD_BROKEN_LPM,	/* Some WDs have broken LPM */</div><div class='add'>+	__ATA_QUIRK_ZERO_AFTER_TRIM,	/* Guarantees zero after trim */</div><div class='add'>+	__ATA_QUIRK_NO_DMA_LOG,		/* Do not use DMA for log read */</div><div class='add'>+	__ATA_QUIRK_NOTRIM,		/* Do not use TRIM */</div><div class='add'>+	__ATA_QUIRK_MAX_SEC_1024,	/* Limit max sects to 1024 */</div><div class='add'>+	__ATA_QUIRK_MAX_SEC_8191,	/* Limit max sects to 8191 */</div><div class='add'>+	__ATA_QUIRK_MAX_TRIM_128M,	/* Limit max trim size to 128M */</div><div class='add'>+	__ATA_QUIRK_NO_NCQ_ON_ATI,	/* Disable NCQ on ATI chipset */</div><div class='add'>+	__ATA_QUIRK_NO_LPM_ON_ATI,	/* Disable LPM on ATI chipset */</div><div class='add'>+	__ATA_QUIRK_NO_ID_DEV_LOG,	/* Identify device log missing */</div><div class='add'>+	__ATA_QUIRK_NO_LOG_DIR,		/* Do not read log directory */</div><div class='add'>+	__ATA_QUIRK_NO_FUA,		/* Do not use FUA */</div><div class='add'>+</div><div class='add'>+	__ATA_QUIRK_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Quirk flags: may be set by libata or controller drivers on drives.</div><div class='add'>+ * Some quirks may be drive/controller pair dependent.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	ATA_QUIRK_DIAGNOSTIC		= (1U &lt;&lt; __ATA_QUIRK_DIAGNOSTIC),</div><div class='add'>+	ATA_QUIRK_NODMA			= (1U &lt;&lt; __ATA_QUIRK_NODMA),</div><div class='add'>+	ATA_QUIRK_NONCQ			= (1U &lt;&lt; __ATA_QUIRK_NONCQ),</div><div class='add'>+	ATA_QUIRK_MAX_SEC_128		= (1U &lt;&lt; __ATA_QUIRK_MAX_SEC_128),</div><div class='add'>+	ATA_QUIRK_BROKEN_HPA		= (1U &lt;&lt; __ATA_QUIRK_BROKEN_HPA),</div><div class='add'>+	ATA_QUIRK_DISABLE		= (1U &lt;&lt; __ATA_QUIRK_DISABLE),</div><div class='add'>+	ATA_QUIRK_HPA_SIZE		= (1U &lt;&lt; __ATA_QUIRK_HPA_SIZE),</div><div class='add'>+	ATA_QUIRK_IVB			= (1U &lt;&lt; __ATA_QUIRK_IVB),</div><div class='add'>+	ATA_QUIRK_STUCK_ERR		= (1U &lt;&lt; __ATA_QUIRK_STUCK_ERR),</div><div class='add'>+	ATA_QUIRK_BRIDGE_OK		= (1U &lt;&lt; __ATA_QUIRK_BRIDGE_OK),</div><div class='add'>+	ATA_QUIRK_ATAPI_MOD16_DMA	= (1U &lt;&lt; __ATA_QUIRK_ATAPI_MOD16_DMA),</div><div class='add'>+	ATA_QUIRK_FIRMWARE_WARN		= (1U &lt;&lt; __ATA_QUIRK_FIRMWARE_WARN),</div><div class='add'>+	ATA_QUIRK_1_5_GBPS		= (1U &lt;&lt; __ATA_QUIRK_1_5_GBPS),</div><div class='add'>+	ATA_QUIRK_NOSETXFER		= (1U &lt;&lt; __ATA_QUIRK_NOSETXFER),</div><div class='add'>+	ATA_QUIRK_BROKEN_FPDMA_AA	= (1U &lt;&lt; __ATA_QUIRK_BROKEN_FPDMA_AA),</div><div class='add'>+	ATA_QUIRK_DUMP_ID		= (1U &lt;&lt; __ATA_QUIRK_DUMP_ID),</div><div class='add'>+	ATA_QUIRK_MAX_SEC_LBA48		= (1U &lt;&lt; __ATA_QUIRK_MAX_SEC_LBA48),</div><div class='add'>+	ATA_QUIRK_ATAPI_DMADIR		= (1U &lt;&lt; __ATA_QUIRK_ATAPI_DMADIR),</div><div class='add'>+	ATA_QUIRK_NO_NCQ_TRIM		= (1U &lt;&lt; __ATA_QUIRK_NO_NCQ_TRIM),</div><div class='add'>+	ATA_QUIRK_NOLPM			= (1U &lt;&lt; __ATA_QUIRK_NOLPM),</div><div class='add'>+	ATA_QUIRK_WD_BROKEN_LPM		= (1U &lt;&lt; __ATA_QUIRK_WD_BROKEN_LPM),</div><div class='add'>+	ATA_QUIRK_ZERO_AFTER_TRIM	= (1U &lt;&lt; __ATA_QUIRK_ZERO_AFTER_TRIM),</div><div class='add'>+	ATA_QUIRK_NO_DMA_LOG		= (1U &lt;&lt; __ATA_QUIRK_NO_DMA_LOG),</div><div class='add'>+	ATA_QUIRK_NOTRIM		= (1U &lt;&lt; __ATA_QUIRK_NOTRIM),</div><div class='add'>+	ATA_QUIRK_MAX_SEC_1024		= (1U &lt;&lt; __ATA_QUIRK_MAX_SEC_1024),</div><div class='add'>+	ATA_QUIRK_MAX_SEC_8191		= (1U &lt;&lt; __ATA_QUIRK_MAX_SEC_8191),</div><div class='add'>+	ATA_QUIRK_MAX_TRIM_128M		= (1U &lt;&lt; __ATA_QUIRK_MAX_TRIM_128M),</div><div class='add'>+	ATA_QUIRK_NO_NCQ_ON_ATI		= (1U &lt;&lt; __ATA_QUIRK_NO_NCQ_ON_ATI),</div><div class='add'>+	ATA_QUIRK_NO_LPM_ON_ATI		= (1U &lt;&lt; __ATA_QUIRK_NO_LPM_ON_ATI),</div><div class='add'>+	ATA_QUIRK_NO_ID_DEV_LOG		= (1U &lt;&lt; __ATA_QUIRK_NO_ID_DEV_LOG),</div><div class='add'>+	ATA_QUIRK_NO_LOG_DIR		= (1U &lt;&lt; __ATA_QUIRK_NO_LOG_DIR),</div><div class='add'>+	ATA_QUIRK_NO_FUA		= (1U &lt;&lt; __ATA_QUIRK_NO_FUA),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	/* various global constants */</div><div class='ctx'> 	LIBATA_MAX_PRD		= ATA_MAX_PRD / 2,</div><div class='hunk'>@@ -107,13 +177,13 @@ enum {</div><div class='ctx'> </div><div class='ctx'> 	ATA_DFLAG_NCQ_PRIO_ENABLED = (1 &lt;&lt; 20), /* Priority cmds sent to dev */</div><div class='ctx'> 	ATA_DFLAG_CDL_ENABLED	= (1 &lt;&lt; 21), /* cmd duration limits is enabled */</div><div class='add'>+	ATA_DFLAG_RESUMING	= (1 &lt;&lt; 22),  /* Device is resuming */</div><div class='ctx'> 	ATA_DFLAG_DETACH	= (1 &lt;&lt; 24),</div><div class='ctx'> 	ATA_DFLAG_DETACHED	= (1 &lt;&lt; 25),</div><div class='ctx'> 	ATA_DFLAG_DA		= (1 &lt;&lt; 26), /* device supports Device Attention */</div><div class='ctx'> 	ATA_DFLAG_DEVSLP	= (1 &lt;&lt; 27), /* device supports Device Sleep */</div><div class='ctx'> 	ATA_DFLAG_ACPI_DISABLED = (1 &lt;&lt; 28), /* ACPI for the device is disabled */</div><div class='ctx'> 	ATA_DFLAG_D_SENSE	= (1 &lt;&lt; 29), /* Descriptor sense requested */</div><div class='del'>-	ATA_DFLAG_ZAC		= (1 &lt;&lt; 30), /* ZAC device */</div><div class='ctx'> </div><div class='ctx'> 	ATA_DFLAG_FEATURES_MASK	= (ATA_DFLAG_TRUSTED | ATA_DFLAG_DA |	\</div><div class='ctx'> 				   ATA_DFLAG_DEVSLP | ATA_DFLAG_NCQ_SEND_RECV | \</div><div class='hunk'>@@ -229,9 +299,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> 	/* bits 24:31 of host-&gt;flags are reserved for LLD specific flags */</div><div class='ctx'> </div><div class='del'>-	/* various lengths of time */</div><div class='del'>-	ATA_TMOUT_BOOT		= 30000,	/* heuristic */</div><div class='del'>-	ATA_TMOUT_BOOT_QUICK	=  7000,	/* heuristic */</div><div class='add'>+	/* Various lengths of time */</div><div class='ctx'> 	ATA_TMOUT_INTERNAL_QUICK = 5000,</div><div class='ctx'> 	ATA_TMOUT_MAX_PARK	= 30000,</div><div class='ctx'> </div><div class='hunk'>@@ -337,6 +405,7 @@ enum {</div><div class='ctx'> 	ATA_EHI_PRINTINFO	= (1 &lt;&lt; 18), /* print configuration info */</div><div class='ctx'> 	ATA_EHI_SETMODE		= (1 &lt;&lt; 19), /* configure transfer mode */</div><div class='ctx'> 	ATA_EHI_POST_SETMODE	= (1 &lt;&lt; 20), /* revalidating after setmode */</div><div class='add'>+	ATA_EHI_DID_PRINT_QUIRKS = (1 &lt;&lt; 21), /* already printed quirks info */</div><div class='ctx'> </div><div class='ctx'> 	ATA_EHI_DID_RESET	= ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,</div><div class='ctx'> </div><div class='hunk'>@@ -361,43 +430,7 @@ enum {</div><div class='ctx'> 	 */</div><div class='ctx'> 	ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 8,</div><div class='ctx'> </div><div class='del'>-	/* Horkage types. May be set by libata or controller on drives</div><div class='del'>-	   (some horkage may be drive/controller pair dependent */</div><div class='del'>-</div><div class='del'>-	ATA_HORKAGE_DIAGNOSTIC	= (1 &lt;&lt; 0),	/* Failed boot diag */</div><div class='del'>-	ATA_HORKAGE_NODMA	= (1 &lt;&lt; 1),	/* DMA problems */</div><div class='del'>-	ATA_HORKAGE_NONCQ	= (1 &lt;&lt; 2),	/* Don't use NCQ */</div><div class='del'>-	ATA_HORKAGE_MAX_SEC_128	= (1 &lt;&lt; 3),	/* Limit max sects to 128 */</div><div class='del'>-	ATA_HORKAGE_BROKEN_HPA	= (1 &lt;&lt; 4),	/* Broken HPA */</div><div class='del'>-	ATA_HORKAGE_DISABLE	= (1 &lt;&lt; 5),	/* Disable it */</div><div class='del'>-	ATA_HORKAGE_HPA_SIZE	= (1 &lt;&lt; 6),	/* native size off by one */</div><div class='del'>-	ATA_HORKAGE_IVB		= (1 &lt;&lt; 8),	/* cbl det validity bit bugs */</div><div class='del'>-	ATA_HORKAGE_STUCK_ERR	= (1 &lt;&lt; 9),	/* stuck ERR on next PACKET */</div><div class='del'>-	ATA_HORKAGE_BRIDGE_OK	= (1 &lt;&lt; 10),	/* no bridge limits */</div><div class='del'>-	ATA_HORKAGE_ATAPI_MOD16_DMA = (1 &lt;&lt; 11), /* use ATAPI DMA for commands</div><div class='del'>-						    not multiple of 16 bytes */</div><div class='del'>-	ATA_HORKAGE_FIRMWARE_WARN = (1 &lt;&lt; 12),	/* firmware update warning */</div><div class='del'>-	ATA_HORKAGE_1_5_GBPS	= (1 &lt;&lt; 13),	/* force 1.5 Gbps */</div><div class='del'>-	ATA_HORKAGE_NOSETXFER	= (1 &lt;&lt; 14),	/* skip SETXFER, SATA only */</div><div class='del'>-	ATA_HORKAGE_BROKEN_FPDMA_AA	= (1 &lt;&lt; 15),	/* skip AA */</div><div class='del'>-	ATA_HORKAGE_DUMP_ID	= (1 &lt;&lt; 16),	/* dump IDENTIFY data */</div><div class='del'>-	ATA_HORKAGE_MAX_SEC_LBA48 = (1 &lt;&lt; 17),	/* Set max sects to 65535 */</div><div class='del'>-	ATA_HORKAGE_ATAPI_DMADIR = (1 &lt;&lt; 18),	/* device requires dmadir */</div><div class='del'>-	ATA_HORKAGE_NO_NCQ_TRIM	= (1 &lt;&lt; 19),	/* don't use queued TRIM */</div><div class='del'>-	ATA_HORKAGE_NOLPM	= (1 &lt;&lt; 20),	/* don't use LPM */</div><div class='del'>-	ATA_HORKAGE_WD_BROKEN_LPM = (1 &lt;&lt; 21),	/* some WDs have broken LPM */</div><div class='del'>-	ATA_HORKAGE_ZERO_AFTER_TRIM = (1 &lt;&lt; 22),/* guarantees zero after trim */</div><div class='del'>-	ATA_HORKAGE_NO_DMA_LOG	= (1 &lt;&lt; 23),	/* don't use DMA for log read */</div><div class='del'>-	ATA_HORKAGE_NOTRIM	= (1 &lt;&lt; 24),	/* don't use TRIM */</div><div class='del'>-	ATA_HORKAGE_MAX_SEC_1024 = (1 &lt;&lt; 25),	/* Limit max sects to 1024 */</div><div class='del'>-	ATA_HORKAGE_MAX_TRIM_128M = (1 &lt;&lt; 26),	/* Limit max trim size to 128M */</div><div class='del'>-	ATA_HORKAGE_NO_NCQ_ON_ATI = (1 &lt;&lt; 27),	/* Disable NCQ on ATI chipset */</div><div class='del'>-	ATA_HORKAGE_NO_ID_DEV_LOG = (1 &lt;&lt; 28),	/* Identify device log missing */</div><div class='del'>-	ATA_HORKAGE_NO_LOG_DIR	= (1 &lt;&lt; 29),	/* Do not read log directory */</div><div class='del'>-	ATA_HORKAGE_NO_FUA	= (1 &lt;&lt; 30),	/* Do not use FUA */</div><div class='del'>-</div><div class='del'>-	 /* DMA mask for user DMA control: User visible values; DO NOT</div><div class='del'>-	    renumber */</div><div class='add'>+	/* User visible DMA mask for DMA control. DO NOT renumber. */</div><div class='ctx'> 	ATA_DMA_MASK_ATA	= (1 &lt;&lt; 0),	/* DMA on ATA Disk */</div><div class='ctx'> 	ATA_DMA_MASK_ATAPI	= (1 &lt;&lt; 1),	/* DMA on ATAPI */</div><div class='ctx'> 	ATA_DMA_MASK_CFA	= (1 &lt;&lt; 2),	/* DMA on CF Card */</div><div class='hunk'>@@ -470,16 +503,28 @@ enum ata_completion_errors {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Link power management policy: If you alter this, you also need to</div><div class='del'>- * alter libata-sata.c (for the ascii descriptions)</div><div class='add'>+ * Link Power Management (LPM) policies.</div><div class='add'>+ *</div><div class='add'>+ * The default LPM policy to use for a device link is defined using these values</div><div class='add'>+ * with the CONFIG_SATA_MOBILE_LPM_POLICY config option and applied through the</div><div class='add'>+ * target_lpm_policy field of struct ata_port.</div><div class='add'>+ *</div><div class='add'>+ * If you alter this, you also need to alter the policy names used with the</div><div class='add'>+ * sysfs attribute link_power_management_policy defined in libata-sata.c.</div><div class='ctx'>  */</div><div class='ctx'> enum ata_lpm_policy {</div><div class='add'>+	/* Keep firmware settings */</div><div class='ctx'> 	ATA_LPM_UNKNOWN,</div><div class='add'>+	/* No power savings (maximum performance) */</div><div class='ctx'> 	ATA_LPM_MAX_POWER,</div><div class='add'>+	/* HIPM (Partial) */</div><div class='ctx'> 	ATA_LPM_MED_POWER,</div><div class='del'>-	ATA_LPM_MED_POWER_WITH_DIPM, /* Med power + DIPM as win IRST does */</div><div class='del'>-	ATA_LPM_MIN_POWER_WITH_PARTIAL, /* Min Power + partial and slumber */</div><div class='del'>-	ATA_LPM_MIN_POWER, /* Min power + no partial (slumber only) */</div><div class='add'>+	/* HIPM (Partial) and DIPM (Partial and Slumber) */</div><div class='add'>+	ATA_LPM_MED_POWER_WITH_DIPM,</div><div class='add'>+	/* HIPM (Partial and DevSleep) and DIPM (Partial and Slumber) */</div><div class='add'>+	ATA_LPM_MIN_POWER_WITH_PARTIAL,</div><div class='add'>+	/* HIPM (Slumber and DevSleep) and DIPM (Partial and Slumber) */</div><div class='add'>+	ATA_LPM_MIN_POWER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ata_lpm_hints {</div><div class='hunk'>@@ -504,6 +549,7 @@ typedef void (*ata_postreset_fn_t)(struct ata_link *link, unsigned int *classes)</div><div class='ctx'> </div><div class='ctx'> extern struct device_attribute dev_attr_unload_heads;</div><div class='ctx'> #ifdef CONFIG_SATA_HOST</div><div class='add'>+extern struct device_attribute dev_attr_link_power_management_supported;</div><div class='ctx'> extern struct device_attribute dev_attr_link_power_management_policy;</div><div class='ctx'> extern struct device_attribute dev_attr_ncq_prio_supported;</div><div class='ctx'> extern struct device_attribute dev_attr_ncq_prio_enable;</div><div class='hunk'>@@ -659,10 +705,25 @@ struct ata_cpr_log {</div><div class='ctx'> 	struct ata_cpr		cpr[] __counted_by(nr_cpr);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ata_cdl {</div><div class='add'>+	/*</div><div class='add'>+	 * Buffer to cache the CDL log page 18h (command duration descriptors)</div><div class='add'>+	 * for SCSI-ATA translation.</div><div class='add'>+	 */</div><div class='add'>+	u8			desc_log_buf[ATA_LOG_CDL_SIZE];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Buffer to handle reading the sense data for successful NCQ Commands</div><div class='add'>+	 * log page for commands using a CDL with one of the limits policy set</div><div class='add'>+	 * to 0xD (successful completion with sense data available bit set).</div><div class='add'>+	 */</div><div class='add'>+	u8			ncq_sense_log_buf[ATA_LOG_SENSE_NCQ_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ata_device {</div><div class='ctx'> 	struct ata_link		*link;</div><div class='ctx'> 	unsigned int		devno;		/* 0 or 1 */</div><div class='del'>-	unsigned int		horkage;	/* List of broken features */</div><div class='add'>+	unsigned int		quirks;		/* List of broken features */</div><div class='ctx'> 	unsigned long		flags;		/* ATA_DFLAG_xxx */</div><div class='ctx'> 	struct scsi_device	*sdev;		/* attached SCSI device */</div><div class='ctx'> 	void			*private_data;</div><div class='hunk'>@@ -705,6 +766,9 @@ struct ata_device {</div><div class='ctx'> 		u32		gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */</div><div class='ctx'> 	} ____cacheline_aligned;</div><div class='ctx'> </div><div class='add'>+	/* General Purpose Log Directory log page */</div><div class='add'>+	u8			gp_log_dir[ATA_SECT_SIZE] ____cacheline_aligned;</div><div class='add'>+</div><div class='ctx'> 	/* DEVSLP Timing Variables from Identify Device Data Log */</div><div class='ctx'> 	u8			devslp_timing[ATA_LOG_DEVSLP_SIZE];</div><div class='ctx'> </div><div class='hunk'>@@ -721,13 +785,16 @@ struct ata_device {</div><div class='ctx'> 	/* Concurrent positioning ranges */</div><div class='ctx'> 	struct ata_cpr_log	*cpr_log;</div><div class='ctx'> </div><div class='del'>-	/* Command Duration Limits log support */</div><div class='del'>-	u8			cdl[ATA_LOG_CDL_SIZE];</div><div class='add'>+	/* Command Duration Limits support */</div><div class='add'>+	struct ata_cdl		*cdl;</div><div class='ctx'> </div><div class='ctx'> 	/* error history */</div><div class='ctx'> 	int			spdn_cnt;</div><div class='ctx'> 	/* ering is CLEAR_END, read comment above CLEAR_END */</div><div class='ctx'> 	struct ata_ering	ering;</div><div class='add'>+</div><div class='add'>+	/* For EH */</div><div class='add'>+	u8			sector_buf[ATA_SECT_SIZE] ____cacheline_aligned;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Fields between ATA_DEVICE_CLEAR_BEGIN and ATA_DEVICE_CLEAR_END are</div><div class='hunk'>@@ -813,7 +880,6 @@ struct ata_port {</div><div class='ctx'> 	/* Flags that change dynamically, protected by ap-&gt;lock */</div><div class='ctx'> 	unsigned int		pflags; /* ATA_PFLAG_xxx */</div><div class='ctx'> 	unsigned int		print_id; /* user visible unique port ID */</div><div class='del'>-	unsigned int            local_port_no; /* host local port num */</div><div class='ctx'> 	unsigned int		port_no; /* 0 based port no. inside the host */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATA_SFF</div><div class='hunk'>@@ -874,9 +940,6 @@ struct ata_port {</div><div class='ctx'> #ifdef CONFIG_ATA_ACPI</div><div class='ctx'> 	struct ata_acpi_gtm	__acpi_init_gtm; /* use ata_acpi_init_gtm() */</div><div class='ctx'> #endif</div><div class='del'>-	/* owned by EH */</div><div class='del'>-	u8			*ncq_sense_buf;</div><div class='del'>-	u8			sector_buf[ATA_SECT_SIZE] ____cacheline_aligned;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The following initializer overrides a method to NULL whether one of</div><div class='hunk'>@@ -886,6 +949,13 @@ struct ata_port {</div><div class='ctx'>  */</div><div class='ctx'> #define ATA_OP_NULL		(void *)(unsigned long)(-ENOENT)</div><div class='ctx'> </div><div class='add'>+struct ata_reset_operations {</div><div class='add'>+	ata_prereset_fn_t	prereset;</div><div class='add'>+	ata_reset_fn_t		softreset;</div><div class='add'>+	ata_reset_fn_t		hardreset;</div><div class='add'>+	ata_postreset_fn_t	postreset;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ata_port_operations {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Command execution</div><div class='hunk'>@@ -912,14 +982,8 @@ struct ata_port_operations {</div><div class='ctx'> </div><div class='ctx'> 	void (*freeze)(struct ata_port *ap);</div><div class='ctx'> 	void (*thaw)(struct ata_port *ap);</div><div class='del'>-	ata_prereset_fn_t	prereset;</div><div class='del'>-	ata_reset_fn_t		softreset;</div><div class='del'>-	ata_reset_fn_t		hardreset;</div><div class='del'>-	ata_postreset_fn_t	postreset;</div><div class='del'>-	ata_prereset_fn_t	pmp_prereset;</div><div class='del'>-	ata_reset_fn_t		pmp_softreset;</div><div class='del'>-	ata_reset_fn_t		pmp_hardreset;</div><div class='del'>-	ata_postreset_fn_t	pmp_postreset;</div><div class='add'>+	struct ata_reset_operations reset;</div><div class='add'>+	struct ata_reset_operations pmp_reset;</div><div class='ctx'> 	void (*error_handler)(struct ata_port *ap);</div><div class='ctx'> 	void (*lost_interrupt)(struct ata_port *ap);</div><div class='ctx'> 	void (*post_internal_cmd)(struct ata_queued_cmd *qc);</div><div class='hunk'>@@ -1064,11 +1128,9 @@ static inline bool ata_port_is_frozen(const struct ata_port *ap)</div><div class='ctx'> extern int ata_std_prereset(struct ata_link *link, unsigned long deadline);</div><div class='ctx'> extern int ata_wait_after_reset(struct ata_link *link, unsigned long deadline,</div><div class='ctx'> 				int (*check_ready)(struct ata_link *link));</div><div class='del'>-extern int sata_std_hardreset(struct ata_link *link, unsigned int *class,</div><div class='del'>-			      unsigned long deadline);</div><div class='ctx'> extern void ata_std_postreset(struct ata_link *link, unsigned int *classes);</div><div class='ctx'> </div><div class='del'>-extern struct ata_host *ata_host_alloc(struct device *dev, int max_ports);</div><div class='add'>+extern struct ata_host *ata_host_alloc(struct device *dev, int n_ports);</div><div class='ctx'> extern struct ata_host *ata_host_alloc_pinfo(struct device *dev,</div><div class='ctx'> 			const struct ata_port_info * const * ppi, int n_ports);</div><div class='ctx'> extern void ata_host_get(struct ata_host *host);</div><div class='hunk'>@@ -1081,7 +1143,6 @@ extern int ata_host_activate(struct ata_host *host, int irq,</div><div class='ctx'> 			     const struct scsi_host_template *sht);</div><div class='ctx'> extern void ata_host_detach(struct ata_host *host);</div><div class='ctx'> extern void ata_host_init(struct ata_host *, struct device *, struct ata_port_operations *);</div><div class='del'>-extern int ata_scsi_detect(struct scsi_host_template *sht);</div><div class='ctx'> extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd,</div><div class='ctx'> 			  void __user *arg);</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='hunk'>@@ -1130,7 +1191,6 @@ extern int ata_xfer_mode2shift(u8 xfer_mode);</div><div class='ctx'> extern const char *ata_mode_string(unsigned int xfer_mask);</div><div class='ctx'> extern unsigned int ata_id_xfermask(const u16 *id);</div><div class='ctx'> extern int ata_std_qc_defer(struct ata_queued_cmd *qc);</div><div class='del'>-extern enum ata_completion_errors ata_noop_qc_prep(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,</div><div class='ctx'> 		 unsigned int n_elem);</div><div class='ctx'> extern unsigned int ata_dev_classify(const struct ata_taskfile *tf);</div><div class='hunk'>@@ -1147,18 +1207,24 @@ extern void ata_qc_complete(struct ata_queued_cmd *qc);</div><div class='ctx'> extern u64 ata_qc_get_active(struct ata_port *ap);</div><div class='ctx'> extern void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd);</div><div class='ctx'> extern int ata_std_bios_param(struct scsi_device *sdev,</div><div class='del'>-			      struct block_device *bdev,</div><div class='add'>+			      struct gendisk *unused,</div><div class='ctx'> 			      sector_t capacity, int geom[]);</div><div class='ctx'> extern void ata_scsi_unlock_native_capacity(struct scsi_device *sdev);</div><div class='del'>-extern int ata_scsi_slave_alloc(struct scsi_device *sdev);</div><div class='del'>-extern int ata_scsi_slave_config(struct scsi_device *sdev);</div><div class='del'>-extern void ata_scsi_slave_destroy(struct scsi_device *sdev);</div><div class='add'>+extern int ata_scsi_sdev_init(struct scsi_device *sdev);</div><div class='add'>+int ata_scsi_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim);</div><div class='add'>+extern void ata_scsi_sdev_destroy(struct scsi_device *sdev);</div><div class='ctx'> extern int ata_scsi_change_queue_depth(struct scsi_device *sdev,</div><div class='ctx'> 				       int queue_depth);</div><div class='ctx'> extern int ata_change_queue_depth(struct ata_port *ap, struct scsi_device *sdev,</div><div class='ctx'> 				  int queue_depth);</div><div class='add'>+extern int ata_ncq_prio_supported(struct ata_port *ap, struct scsi_device *sdev,</div><div class='add'>+				  bool *supported);</div><div class='add'>+extern int ata_ncq_prio_enabled(struct ata_port *ap, struct scsi_device *sdev,</div><div class='add'>+				bool *enabled);</div><div class='add'>+extern int ata_ncq_prio_enable(struct ata_port *ap, struct scsi_device *sdev,</div><div class='add'>+			       bool enable);</div><div class='ctx'> extern struct ata_device *ata_dev_pair(struct ata_device *adev);</div><div class='del'>-extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);</div><div class='add'>+int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);</div><div class='ctx'> extern void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap);</div><div class='ctx'> extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap, struct list_head *eh_q);</div><div class='ctx'> </div><div class='hunk'>@@ -1184,12 +1250,13 @@ extern int sata_scr_read(struct ata_link *link, int reg, u32 *val);</div><div class='ctx'> extern int sata_scr_write(struct ata_link *link, int reg, u32 val);</div><div class='ctx'> extern int sata_scr_write_flush(struct ata_link *link, int reg, u32 val);</div><div class='ctx'> extern int sata_set_spd(struct ata_link *link);</div><div class='add'>+int sata_std_hardreset(struct ata_link *link, unsigned int *class,</div><div class='add'>+		       unsigned long deadline);</div><div class='ctx'> extern int sata_link_hardreset(struct ata_link *link,</div><div class='ctx'> 			const unsigned int *timing, unsigned long deadline,</div><div class='ctx'> 			bool *online, int (*check_ready)(struct ata_link *));</div><div class='ctx'> extern int sata_link_resume(struct ata_link *link, const unsigned int *params,</div><div class='ctx'> 			    unsigned long deadline);</div><div class='del'>-extern int ata_eh_read_sense_success_ncq_log(struct ata_link *link);</div><div class='ctx'> extern void ata_eh_analyze_ncq_error(struct ata_link *link);</div><div class='ctx'> #else</div><div class='ctx'> static inline const unsigned int *</div><div class='hunk'>@@ -1211,6 +1278,11 @@ static inline int sata_scr_write_flush(struct ata_link *link, int reg, u32 val)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> static inline int sata_set_spd(struct ata_link *link) { return -EOPNOTSUPP; }</div><div class='add'>+static inline int sata_std_hardreset(struct ata_link *link, unsigned int *class,</div><div class='add'>+				     unsigned long deadline)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> static inline int sata_link_hardreset(struct ata_link *link,</div><div class='ctx'> 				      const unsigned int *timing,</div><div class='ctx'> 				      unsigned long deadline,</div><div class='hunk'>@@ -1227,10 +1299,6 @@ static inline int sata_link_resume(struct ata_link *link,</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-static inline int ata_eh_read_sense_success_ncq_log(struct ata_link *link)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='ctx'> static inline void ata_eh_analyze_ncq_error(struct ata_link *link) { }</div><div class='ctx'> #endif</div><div class='ctx'> extern int sata_link_debounce(struct ata_link *link,</div><div class='hunk'>@@ -1238,12 +1306,13 @@ extern int sata_link_debounce(struct ata_link *link,</div><div class='ctx'> extern int sata_link_scr_lpm(struct ata_link *link, enum ata_lpm_policy policy,</div><div class='ctx'> 			     bool spm_wakeup);</div><div class='ctx'> extern int ata_slave_link_init(struct ata_port *ap);</div><div class='del'>-extern struct ata_port *ata_sas_port_alloc(struct ata_host *,</div><div class='del'>-					   struct ata_port_info *, struct Scsi_Host *);</div><div class='ctx'> extern void ata_port_probe(struct ata_port *ap);</div><div class='del'>-extern int ata_sas_tport_add(struct device *parent, struct ata_port *ap);</div><div class='del'>-extern void ata_sas_tport_delete(struct ata_port *ap);</div><div class='del'>-extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);</div><div class='add'>+extern struct ata_port *ata_port_alloc(struct ata_host *host);</div><div class='add'>+extern void ata_port_free(struct ata_port *ap);</div><div class='add'>+extern int ata_tport_add(struct device *parent, struct ata_port *ap);</div><div class='add'>+extern void ata_tport_delete(struct ata_port *ap);</div><div class='add'>+int ata_sas_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim,</div><div class='add'>+			   struct ata_port *ap);</div><div class='ctx'> extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap);</div><div class='ctx'> extern void ata_tf_to_fis(const struct ata_taskfile *tf,</div><div class='ctx'> 			  u8 pmp, int is_cmd, u8 *fis);</div><div class='hunk'>@@ -1303,7 +1372,7 @@ int ata_acpi_stm(struct ata_port *ap, const struct ata_acpi_gtm *stm);</div><div class='ctx'> int ata_acpi_gtm(struct ata_port *ap, struct ata_acpi_gtm *stm);</div><div class='ctx'> unsigned int ata_acpi_gtm_xfermask(struct ata_device *dev,</div><div class='ctx'> 				   const struct ata_acpi_gtm *gtm);</div><div class='del'>-int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm);</div><div class='add'>+int ata_acpi_cbl_pata_type(struct ata_port *ap);</div><div class='ctx'> #else</div><div class='ctx'> static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap)</div><div class='ctx'> {</div><div class='hunk'>@@ -1328,10 +1397,9 @@ static inline unsigned int ata_acpi_gtm_xfermask(struct ata_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ata_acpi_cbl_80wire(struct ata_port *ap,</div><div class='del'>-				      const struct ata_acpi_gtm *gtm)</div><div class='add'>+static inline int ata_acpi_cbl_pata_type(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return ATA_CBL_PATA40;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1350,9 +1418,6 @@ extern void ata_eh_thaw_port(struct ata_port *ap);</div><div class='ctx'> extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);</div><div class='ctx'> </div><div class='del'>-extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,</div><div class='del'>-		      ata_reset_fn_t softreset, ata_reset_fn_t hardreset,</div><div class='del'>-		      ata_postreset_fn_t postreset);</div><div class='ctx'> extern void ata_std_error_handler(struct ata_port *ap);</div><div class='ctx'> extern void ata_std_sched_eh(struct ata_port *ap);</div><div class='ctx'> extern void ata_std_end_eh(struct ata_port *ap);</div><div class='hunk'>@@ -1399,8 +1464,8 @@ extern const struct attribute_group *ata_common_sdev_groups[];</div><div class='ctx'> 	.this_id		= ATA_SHT_THIS_ID,		\</div><div class='ctx'> 	.emulated		= ATA_SHT_EMULATED,		\</div><div class='ctx'> 	.proc_name		= drv_name,			\</div><div class='del'>-	.slave_alloc		= ata_scsi_slave_alloc,		\</div><div class='del'>-	.slave_destroy		= ata_scsi_slave_destroy,	\</div><div class='add'>+	.sdev_init		= ata_scsi_sdev_init,		\</div><div class='add'>+	.sdev_destroy		= ata_scsi_sdev_destroy,	\</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,		\</div><div class='ctx'> 	.unlock_native_capacity	= ata_scsi_unlock_native_capacity,\</div><div class='ctx'> 	.max_sectors		= ATA_MAX_SECTORS_LBA48</div><div class='hunk'>@@ -1408,14 +1473,14 @@ extern const struct attribute_group *ata_common_sdev_groups[];</div><div class='ctx'> #define ATA_SUBBASE_SHT(drv_name)				\</div><div class='ctx'> 	__ATA_BASE_SHT(drv_name),				\</div><div class='ctx'> 	.can_queue		= ATA_DEF_QUEUE,		\</div><div class='del'>-	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,		\</div><div class='del'>-	.slave_configure	= ata_scsi_slave_config</div><div class='add'>+	.tag_alloc_policy_rr	= true,				\</div><div class='add'>+	.sdev_configure		= ata_scsi_sdev_configure</div><div class='ctx'> </div><div class='ctx'> #define ATA_SUBBASE_SHT_QD(drv_name, drv_qd)			\</div><div class='ctx'> 	__ATA_BASE_SHT(drv_name),				\</div><div class='ctx'> 	.can_queue		= drv_qd,			\</div><div class='del'>-	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,		\</div><div class='del'>-	.slave_configure	= ata_scsi_slave_config</div><div class='add'>+	.tag_alloc_policy_rr	= true,				\</div><div class='add'>+	.sdev_configure		= ata_scsi_sdev_configure</div><div class='ctx'> </div><div class='ctx'> #define ATA_BASE_SHT(drv_name)					\</div><div class='ctx'> 	ATA_SUBBASE_SHT(drv_name),				\</div><div class='hunk'>@@ -1533,7 +1598,17 @@ do {								\</div><div class='ctx'> #define ata_dev_dbg(dev, fmt, ...)				\</div><div class='ctx'> 	ata_dev_printk(debug, dev, fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='del'>-void ata_print_version(const struct device *dev, const char *version);</div><div class='add'>+#define ata_dev_warn_once(dev, fmt, ...)			\</div><div class='add'>+	pr_warn_once("ata%u.%02u: " fmt,			\</div><div class='add'>+		     (dev)-&gt;link-&gt;ap-&gt;print_id,			\</div><div class='add'>+		     (dev)-&gt;link-&gt;pmp + (dev)-&gt;devno,		\</div><div class='add'>+		     ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+static inline void ata_print_version_once(const struct device *dev,</div><div class='add'>+					  const char *version)</div><div class='add'>+{</div><div class='add'>+	dev_dbg_once(dev, "version %s\n", version);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ata_eh_info helpers</div><div class='hunk'>@@ -1565,6 +1640,8 @@ static inline void ata_port_desc_misc(struct ata_port *ap, int irq)</div><div class='ctx'> {</div><div class='ctx'> 	ata_port_desc(ap, "irq %d", irq);</div><div class='ctx'> 	ata_port_desc(ap, "lpm-pol %d", ap-&gt;target_lpm_policy);</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_EXTERNAL)</div><div class='add'>+		ata_port_desc(ap, "ext");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool ata_tag_internal(unsigned int tag)</div><div class='hunk'>@@ -1960,7 +2037,6 @@ extern unsigned int ata_sff_data_xfer(struct ata_queued_cmd *qc,</div><div class='ctx'> extern unsigned int ata_sff_data_xfer32(struct ata_queued_cmd *qc,</div><div class='ctx'> 			unsigned char *buf, unsigned int buflen, int rw);</div><div class='ctx'> extern void ata_sff_irq_on(struct ata_port *ap);</div><div class='del'>-extern void ata_sff_irq_clear(struct ata_port *ap);</div><div class='ctx'> extern int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,</div><div class='ctx'> 			    u8 status, int in_wq);</div><div class='ctx'> extern void ata_sff_queue_work(struct work_struct *work);</div><div class='hunk'>@@ -2085,6 +2161,12 @@ static inline u8 ata_wait_idle(struct ata_port *ap)</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='add'>+#else /* CONFIG_ATA_SFF */</div><div class='add'>+static inline int sata_sff_hardreset(struct ata_link *link, unsigned int *class,</div><div class='add'>+				     unsigned long deadline)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_ATA_SFF */</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_LIBATA_H__ */</div><div class='head'>diff --git a/include/linux/libgcc.h b/include/linux/libgcc.h<br/>index fc388da6a027..0d68f9d6a6a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/libgcc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/libgcc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/libgcc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/libgcc.h</a></div><div class='hunk'>@@ -34,4 +34,8 @@ long long notrace __lshrdi3(long long u, word_type b);</div><div class='ctx'> long long notrace __muldi3(long long u, long long v);</div><div class='ctx'> word_type notrace __ucmpdi2(unsigned long long a, unsigned long long b);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HAVE_ARCH_LIBGCC_H</div><div class='add'>+#include &lt;asm/libgcc.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __ASM_LIBGCC_H */</div><div class='head'>diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h<br/>index e772aae71843..28f086c4a187 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/libnvdimm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/libnvdimm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/libnvdimm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/libnvdimm.h</a></div><div class='hunk'>@@ -6,12 +6,12 @@</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __LIBNVDIMM_H__</div><div class='ctx'> #define __LIBNVDIMM_H__</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/sizes.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/uuid.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/bio.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct badrange_entry {</div><div class='ctx'> 	u64 start;</div><div class='hunk'>@@ -80,7 +80,9 @@ typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc,</div><div class='ctx'> 		struct nvdimm *nvdimm, unsigned int cmd, void *buf,</div><div class='ctx'> 		unsigned int buf_len, int *cmd_rc);</div><div class='ctx'> </div><div class='add'>+struct attribute_group;</div><div class='ctx'> struct device_node;</div><div class='add'>+struct module;</div><div class='ctx'> struct nvdimm_bus_descriptor {</div><div class='ctx'> 	const struct attribute_group **attr_groups;</div><div class='ctx'> 	unsigned long cmd_mask;</div><div class='hunk'>@@ -121,6 +123,8 @@ struct nd_mapping_desc {</div><div class='ctx'> 	int position;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct bio;</div><div class='add'>+struct resource;</div><div class='ctx'> struct nd_region;</div><div class='ctx'> struct nd_region_desc {</div><div class='ctx'> 	struct resource *res;</div><div class='hunk'>@@ -147,8 +151,6 @@ static inline void __iomem *devm_nvdimm_ioremap(struct device *dev,</div><div class='ctx'> 	return (void __iomem *) devm_nvdimm_memremap(dev, offset, size, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct nvdimm_bus;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Note that separate bits for locked + unlocked are defined so that</div><div class='ctx'>  * 'flags == 0' corresponds to an error / not-supported state.</div><div class='hunk'>@@ -238,6 +240,9 @@ struct nvdimm_fw_ops {</div><div class='ctx'> 	int (*arm)(struct nvdimm *nvdimm, enum nvdimm_fwa_trigger arg);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct kobject;</div><div class='add'>+struct nvdimm_bus;</div><div class='add'>+</div><div class='ctx'> void badrange_init(struct badrange *badrange);</div><div class='ctx'> int badrange_add(struct badrange *badrange, u64 addr, u64 length);</div><div class='ctx'> void badrange_forget(struct badrange *badrange, phys_addr_t start,</div><div class='head'>diff --git a/include/linux/linkage.h b/include/linux/linkage.h<br/>index 5c8865bb59d9..b11660b706c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/linkage.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/linkage.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/linkage.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/linkage.h</a></div><div class='hunk'>@@ -134,10 +134,6 @@</div><div class='ctx'> 	.size name, .-name</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* If symbol 'name' is treated as a subroutine (gets called, and returns)</div><div class='del'>- * then please use ENDPROC to mark 'name' as STT_FUNC for the benefit of</div><div class='del'>- * static analysis tools such as stack depth analyzer.</div><div class='del'>- */</div><div class='ctx'> #ifndef ENDPROC</div><div class='ctx'> /* deprecated, use SYM_FUNC_END */</div><div class='ctx'> #define ENDPROC(name) \</div><div class='head'>diff --git a/include/linux/linkmode.h b/include/linux/linkmode.h<br/>index 287f590ed56b..3b9de09871f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/linkmode.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/linkmode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/linkmode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/linkmode.h</a></div><div class='hunk'>@@ -37,35 +37,17 @@ static inline bool linkmode_empty(const unsigned long *src)</div><div class='ctx'> 	return bitmap_empty(src, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int linkmode_andnot(unsigned long *dst, const unsigned long *src1,</div><div class='del'>-				  const unsigned long *src2)</div><div class='add'>+static inline bool linkmode_andnot(unsigned long *dst,</div><div class='add'>+				   const unsigned long *src1,</div><div class='add'>+				   const unsigned long *src2)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_andnot(dst, src1, src2,  __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void linkmode_set_bit(int nr, volatile unsigned long *addr)</div><div class='del'>-{</div><div class='del'>-	__set_bit(nr, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void linkmode_clear_bit(int nr, volatile unsigned long *addr)</div><div class='del'>-{</div><div class='del'>-	__clear_bit(nr, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void linkmode_mod_bit(int nr, volatile unsigned long *addr,</div><div class='del'>-				    int set)</div><div class='del'>-{</div><div class='del'>-	if (set)</div><div class='del'>-		linkmode_set_bit(nr, addr);</div><div class='del'>-	else</div><div class='del'>-		linkmode_clear_bit(nr, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int linkmode_test_bit(int nr, const volatile unsigned long *addr)</div><div class='del'>-{</div><div class='del'>-	return test_bit(nr, addr);</div><div class='del'>-}</div><div class='add'>+#define linkmode_test_bit	test_bit</div><div class='add'>+#define linkmode_set_bit	__set_bit</div><div class='add'>+#define linkmode_clear_bit	__clear_bit</div><div class='add'>+#define linkmode_mod_bit	__assign_bit</div><div class='ctx'> </div><div class='ctx'> static inline void linkmode_set_bit_array(const int *array, int array_size,</div><div class='ctx'> 					  unsigned long *addr)</div><div class='head'>diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h<br/>index d4d5b93efe84..e37699b7e839 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/linux_logo.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/linux_logo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/linux_logo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/linux_logo.h</a></div><div class='hunk'>@@ -10,9 +10,6 @@</div><div class='ctx'>  *  Copyright (C) 2001 Greg Banks &lt;gnb@alphalink.com.au&gt;</div><div class='ctx'>  *  Copyright (C) 2001 Jan-Benedict Glaw &lt;jbglaw@lug-owl.de&gt;</div><div class='ctx'>  *  Copyright (C) 2003 Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;</div><div class='del'>- *</div><div class='del'>- *  Serial_console ascii image can be any size,</div><div class='del'>- *  but should contain %s to display the version</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/include/linux/list.h b/include/linux/list.h<br/>index 059aa1fff41e..00ea8e5fb88b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/list.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/list.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/list.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/list.h</a></div><div class='hunk'>@@ -20,8 +20,16 @@</div><div class='ctx'>  * using the generic single-entry routines.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * LIST_HEAD_INIT - initialize a &amp;struct list_head's links to point to itself</div><div class='add'>+ * @name: name of the list_head</div><div class='add'>+ */</div><div class='ctx'> #define LIST_HEAD_INIT(name) { &amp;(name), &amp;(name) }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * LIST_HEAD - definition of a &amp;struct list_head with initialization values</div><div class='add'>+ * @name: name of the list_head</div><div class='add'>+ */</div><div class='ctx'> #define LIST_HEAD(name) \</div><div class='ctx'> 	struct list_head name = LIST_HEAD_INIT(name)</div><div class='ctx'> </div><div class='hunk'>@@ -50,9 +58,9 @@ static inline void INIT_LIST_HEAD(struct list_head *list)</div><div class='ctx'>  * Performs the full set of list corruption checks before __list_add().</div><div class='ctx'>  * On list corruption reports a warning, and returns false.</div><div class='ctx'>  */</div><div class='del'>-extern bool __list_valid_slowpath __list_add_valid_or_report(struct list_head *new,</div><div class='del'>-							     struct list_head *prev,</div><div class='del'>-							     struct list_head *next);</div><div class='add'>+bool __list_valid_slowpath __list_add_valid_or_report(struct list_head *new,</div><div class='add'>+						      struct list_head *prev,</div><div class='add'>+						      struct list_head *next);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Performs list corruption checks before __list_add(). Returns false if a</div><div class='hunk'>@@ -93,7 +101,7 @@ static __always_inline bool __list_add_valid(struct list_head *new,</div><div class='ctx'>  * Performs the full set of list corruption checks before __list_del_entry().</div><div class='ctx'>  * On list corruption reports a warning, and returns false.</div><div class='ctx'>  */</div><div class='del'>-extern bool __list_valid_slowpath __list_del_entry_valid_or_report(struct list_head *entry);</div><div class='add'>+bool __list_valid_slowpath __list_del_entry_valid_or_report(struct list_head *entry);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Performs list corruption checks before __list_del_entry(). Returns false if a</div><div class='hunk'>@@ -637,6 +645,20 @@ static inline void list_splice_tail_init(struct list_head *list,</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * list_last_entry_or_null - get the last element from a list</div><div class='add'>+ * @ptr:	the list head to take the element from.</div><div class='add'>+ * @type:	the type of the struct this is embedded in.</div><div class='add'>+ * @member:	the name of the list_head within the struct.</div><div class='add'>+ *</div><div class='add'>+ * Note that if the list is empty, it returns NULL.</div><div class='add'>+ */</div><div class='add'>+#define list_last_entry_or_null(ptr, type, member) ({ \</div><div class='add'>+	struct list_head *head__ = (ptr); \</div><div class='add'>+	struct list_head *pos__ = READ_ONCE(head__-&gt;prev); \</div><div class='add'>+	pos__ != head__ ? list_entry(pos__, type, member) : NULL; \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * list_next_entry - get the next element in list</div><div class='ctx'>  * @pos:	the type * to cursor</div><div class='ctx'>  * @member:	the name of the list_head within the struct.</div><div class='hunk'>@@ -687,24 +709,6 @@ static inline void list_splice_tail_init(struct list_head *list,</div><div class='ctx'> 	for (pos = (head)-&gt;next; !list_is_head(pos, (head)); pos = pos-&gt;next)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * list_for_each_reverse - iterate backwards over a list</div><div class='del'>- * @pos:	the &amp;struct list_head to use as a loop cursor.</div><div class='del'>- * @head:	the head for your list.</div><div class='del'>- */</div><div class='del'>-#define list_for_each_reverse(pos, head) \</div><div class='del'>-	for (pos = (head)-&gt;prev; pos != (head); pos = pos-&gt;prev)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * list_for_each_rcu - Iterate over a list in an RCU-safe fashion</div><div class='del'>- * @pos:	the &amp;struct list_head to use as a loop cursor.</div><div class='del'>- * @head:	the head for your list.</div><div class='del'>- */</div><div class='del'>-#define list_for_each_rcu(pos, head)		  \</div><div class='del'>-	for (pos = rcu_dereference((head)-&gt;next); \</div><div class='del'>-	     !list_is_head(pos, (head)); \</div><div class='del'>-	     pos = rcu_dereference(pos-&gt;next))</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * list_for_each_continue - continue iteration over a list</div><div class='ctx'>  * @pos:	the &amp;struct list_head to use as a loop cursor.</div><div class='ctx'>  * @head:	the head for your list.</div><div class='hunk'>@@ -766,7 +770,7 @@ static inline size_t list_count_nodes(struct list_head *head)</div><div class='ctx'>  * @member:	the name of the list_head within the struct.</div><div class='ctx'>  */</div><div class='ctx'> #define list_entry_is_head(pos, head, member)				\</div><div class='del'>-	(&amp;pos-&gt;member == (head))</div><div class='add'>+	list_is_head(&amp;pos-&gt;member, (head))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * list_for_each_entry	-	iterate over list of given type</div><div class='hunk'>@@ -1195,4 +1199,19 @@ static inline void hlist_splice_init(struct hlist_head *from,</div><div class='ctx'> 	     pos &amp;&amp; ({ n = pos-&gt;member.next; 1; });			\</div><div class='ctx'> 	     pos = hlist_entry_safe(n, typeof(*pos), member))</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * hlist_count_nodes - count nodes in the hlist</div><div class='add'>+ * @head:	the head for your hlist.</div><div class='add'>+ */</div><div class='add'>+static inline size_t hlist_count_nodes(struct hlist_head *head)</div><div class='add'>+{</div><div class='add'>+	struct hlist_node *pos;</div><div class='add'>+	size_t count = 0;</div><div class='add'>+</div><div class='add'>+	hlist_for_each(pos, head)</div><div class='add'>+		count++;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h<br/>index 7675a48a0701..fe739d35a864 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/list_lru.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/list_lru.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/list_lru.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/list_lru.h</a></div><div class='hunk'>@@ -24,12 +24,16 @@ enum lru_status {</div><div class='ctx'> 	LRU_SKIP,		/* item cannot be locked, skip */</div><div class='ctx'> 	LRU_RETRY,		/* item not freeable. May drop the lock</div><div class='ctx'> 				   internally, but has to return locked. */</div><div class='add'>+	LRU_STOP,		/* stop lru list walking. May drop the lock</div><div class='add'>+				   internally, but has to return locked. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct list_lru_one {</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> 	/* may become negative during memcg reparenting */</div><div class='ctx'> 	long			nr_items;</div><div class='add'>+	/* protects all fields above */</div><div class='add'>+	spinlock_t		lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct list_lru_memcg {</div><div class='hunk'>@@ -39,33 +43,41 @@ struct list_lru_memcg {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct list_lru_node {</div><div class='del'>-	/* protects all lists on the node, including per cgroup */</div><div class='del'>-	spinlock_t		lock;</div><div class='ctx'> 	/* global list, used for the root cgroup in cgroup aware lrus */</div><div class='ctx'> 	struct list_lru_one	lru;</div><div class='del'>-	long			nr_items;</div><div class='add'>+	atomic_long_t		nr_items;</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> struct list_lru {</div><div class='ctx'> 	struct list_lru_node	*node;</div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> 	int			shrinker_id;</div><div class='ctx'> 	bool			memcg_aware;</div><div class='ctx'> 	struct xarray		xa;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	struct lock_class_key	*key;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void list_lru_destroy(struct list_lru *lru);</div><div class='ctx'> int __list_lru_init(struct list_lru *lru, bool memcg_aware,</div><div class='del'>-		    struct lock_class_key *key, struct shrinker *shrinker);</div><div class='add'>+		    struct shrinker *shrinker);</div><div class='ctx'> </div><div class='ctx'> #define list_lru_init(lru)				\</div><div class='del'>-	__list_lru_init((lru), false, NULL, NULL)</div><div class='del'>-#define list_lru_init_key(lru, key)			\</div><div class='del'>-	__list_lru_init((lru), false, (key), NULL)</div><div class='add'>+	__list_lru_init((lru), false, NULL)</div><div class='ctx'> #define list_lru_init_memcg(lru, shrinker)		\</div><div class='del'>-	__list_lru_init((lru), true, NULL, shrinker)</div><div class='add'>+	__list_lru_init((lru), true, shrinker)</div><div class='add'>+</div><div class='add'>+static inline int list_lru_init_memcg_key(struct list_lru *lru, struct shrinker *shrinker,</div><div class='add'>+					  struct lock_class_key *key)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	lru-&gt;key = key;</div><div class='add'>+#endif</div><div class='add'>+	return list_lru_init_memcg(lru, shrinker);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int memcg_list_lru_alloc(struct mem_cgroup *memcg, struct list_lru *lru,</div><div class='ctx'> 			 gfp_t gfp);</div><div class='hunk'>@@ -79,13 +91,24 @@ void memcg_reparent_list_lrus(struct mem_cgroup *memcg, struct mem_cgroup *paren</div><div class='ctx'>  * @memcg: the cgroup of the sublist to add the item to.</div><div class='ctx'>  *</div><div class='ctx'>  * If the element is already part of a list, this function returns doing</div><div class='del'>- * nothing. Therefore the caller does not need to keep state about whether or</div><div class='del'>- * not the element already belongs in the list and is allowed to lazy update</div><div class='del'>- * it. Note however that this is valid for *a* list, not *this* list. If</div><div class='del'>- * the caller organize itself in a way that elements can be in more than</div><div class='del'>- * one type of list, it is up to the caller to fully remove the item from</div><div class='del'>- * the previous list (with list_lru_del() for instance) before moving it</div><div class='del'>- * to @lru.</div><div class='add'>+ * nothing. This means that it is not necessary to keep state about whether or</div><div class='add'>+ * not the element already belongs in the list. That said, this logic only</div><div class='add'>+ * works if the item is in *this* list. If the item might be in some other</div><div class='add'>+ * list, then you cannot rely on this check and you must remove it from the</div><div class='add'>+ * other list before trying to insert it.</div><div class='add'>+ *</div><div class='add'>+ * The lru list consists of many sublists internally; the @nid and @memcg</div><div class='add'>+ * parameters are used to determine which sublist to insert the item into.</div><div class='add'>+ * It's important to use the right value of @nid and @memcg when deleting the</div><div class='add'>+ * item, since it might otherwise get deleted from the wrong sublist.</div><div class='add'>+ *</div><div class='add'>+ * This also applies when attempting to insert the item multiple times - if</div><div class='add'>+ * the item is currently in one sublist and you call list_lru_add() again, you</div><div class='add'>+ * must pass the right @nid and @memcg parameters so that the same sublist is</div><div class='add'>+ * used.</div><div class='add'>+ *</div><div class='add'>+ * You must ensure that the memcg is not freed during this call (e.g., with</div><div class='add'>+ * rcu or by taking a css refcnt).</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the list was updated, false otherwise</div><div class='ctx'>  */</div><div class='hunk'>@@ -101,7 +124,7 @@ bool list_lru_add(struct list_lru *lru, struct list_head *item, int nid,</div><div class='ctx'>  * memcg of the sublist is determined by @item list_head. This assumption is</div><div class='ctx'>  * valid for slab objects LRU such as dentries, inodes, etc.</div><div class='ctx'>  *</div><div class='del'>- * Return value: true if the list was updated, false otherwise</div><div class='add'>+ * Return: true if the list was updated, false otherwise</div><div class='ctx'>  */</div><div class='ctx'> bool list_lru_add_obj(struct list_lru *lru, struct list_head *item);</div><div class='ctx'> </div><div class='hunk'>@@ -113,8 +136,19 @@ bool list_lru_add_obj(struct list_lru *lru, struct list_head *item);</div><div class='ctx'>  * @memcg: the cgroup of the sublist to delete the item from.</div><div class='ctx'>  *</div><div class='ctx'>  * This function works analogously as list_lru_add() in terms of list</div><div class='del'>- * manipulation. The comments about an element already pertaining to</div><div class='del'>- * a list are also valid for list_lru_del().</div><div class='add'>+ * manipulation.</div><div class='add'>+ *</div><div class='add'>+ * The comments in list_lru_add() about an element already being in a list are</div><div class='add'>+ * also valid for list_lru_del(), that is, you can delete an item that has</div><div class='add'>+ * already been removed or never been added. However, if the item is in a</div><div class='add'>+ * list, it must be in *this* list, and you must pass the right value of @nid</div><div class='add'>+ * and @memcg so that the right sublist is used.</div><div class='add'>+ *</div><div class='add'>+ * You must ensure that the memcg is not freed during this call (e.g., with</div><div class='add'>+ * rcu or by taking a css refcnt). When a memcg is deleted, list_lru entries</div><div class='add'>+ * are automatically moved to the parent memcg. This is done in a race-free</div><div class='add'>+ * way, so during deletion of an memcg both the old and new memcg will resolve</div><div class='add'>+ * to the same sublist internally.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: true if the list was updated, false otherwise</div><div class='ctx'>  */</div><div class='hunk'>@@ -130,7 +164,7 @@ bool list_lru_del(struct list_lru *lru, struct list_head *item, int nid,</div><div class='ctx'>  * memcg of the sublist is determined by @item list_head. This assumption is</div><div class='ctx'>  * valid for slab objects LRU such as dentries, inodes, etc.</div><div class='ctx'>  *</div><div class='del'>- * Return value: true if the list was updated, false otherwise.</div><div class='add'>+ * Return: true if the list was updated, false otherwise.</div><div class='ctx'>  */</div><div class='ctx'> bool list_lru_del_obj(struct list_lru *lru, struct list_head *item);</div><div class='ctx'> </div><div class='hunk'>@@ -170,25 +204,9 @@ static inline unsigned long list_lru_count(struct list_lru *lru)</div><div class='ctx'> void list_lru_isolate(struct list_lru_one *list, struct list_head *item);</div><div class='ctx'> void list_lru_isolate_move(struct list_lru_one *list, struct list_head *item,</div><div class='ctx'> 			   struct list_head *head);</div><div class='del'>-/**</div><div class='del'>- * list_lru_putback: undo list_lru_isolate</div><div class='del'>- * @lru: the lru pointer.</div><div class='del'>- * @item: the item to put back.</div><div class='del'>- * @nid: the node id of the sublist to put the item back to.</div><div class='del'>- * @memcg: the cgroup of the sublist to put the item back to.</div><div class='del'>- *</div><div class='del'>- * Put back an isolated item into its original LRU. Note that unlike</div><div class='del'>- * list_lru_add, this does not increment the node LRU count (as</div><div class='del'>- * list_lru_isolate does not originally decrement this count).</div><div class='del'>- *</div><div class='del'>- * Since we might have dropped the LRU lock in between, recompute list_lru_one</div><div class='del'>- * from the node's id and memcg.</div><div class='del'>- */</div><div class='del'>-void list_lru_putback(struct list_lru *lru, struct list_head *item, int nid,</div><div class='del'>-		      struct mem_cgroup *memcg);</div><div class='ctx'> </div><div class='ctx'> typedef enum lru_status (*list_lru_walk_cb)(struct list_head *item,</div><div class='del'>-		struct list_lru_one *list, spinlock_t *lock, void *cb_arg);</div><div class='add'>+		struct list_lru_one *list, void *cb_arg);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * list_lru_walk_one: walk a @lru, isolating and disposing freeable items.</div><div class='head'>diff --git a/include/linux/list_nulls.h b/include/linux/list_nulls.h<br/>index fa6e8471bd22..248db9b77ee2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/list_nulls.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/list_nulls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/list_nulls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/list_nulls.h</a></div><div class='hunk'>@@ -28,6 +28,7 @@ struct hlist_nulls_node {</div><div class='ctx'> #define NULLS_MARKER(value) (1UL | (((long)value) &lt;&lt; 1))</div><div class='ctx'> #define INIT_HLIST_NULLS_HEAD(ptr, nulls) \</div><div class='ctx'> 	((ptr)-&gt;first = (struct hlist_nulls_node *) NULLS_MARKER(nulls))</div><div class='add'>+#define HLIST_NULLS_HEAD_INIT(nulls) {.first = (struct hlist_nulls_node *)NULLS_MARKER(nulls)}</div><div class='ctx'> </div><div class='ctx'> #define hlist_nulls_entry(ptr, type, member) container_of(ptr,type,member)</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h<br/>index 9b9b38e89563..772919e8096a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/livepatch.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/livepatch.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/livepatch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/livepatch.h</a></div><div class='hunk'>@@ -13,14 +13,15 @@</div><div class='ctx'> #include &lt;linux/ftrace.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/livepatch_external.h&gt;</div><div class='ctx'> #include &lt;linux/livepatch_sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_LIVEPATCH)</div><div class='ctx'> </div><div class='ctx'> /* task patch states */</div><div class='del'>-#define KLP_UNDEFINED	-1</div><div class='del'>-#define KLP_UNPATCHED	 0</div><div class='del'>-#define KLP_PATCHED	 1</div><div class='add'>+#define KLP_TRANSITION_IDLE		-1</div><div class='add'>+#define KLP_TRANSITION_UNPATCHED	 0</div><div class='add'>+#define KLP_TRANSITION_PATCHED		 1</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct klp_func - function structure for live patching</div><div class='hunk'>@@ -77,30 +78,6 @@ struct klp_func {</div><div class='ctx'> 	bool transition;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct klp_object;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct klp_callbacks - pre/post live-(un)patch callback structure</div><div class='del'>- * @pre_patch:		executed before code patching</div><div class='del'>- * @post_patch:		executed after code patching</div><div class='del'>- * @pre_unpatch:	executed before code unpatching</div><div class='del'>- * @post_unpatch:	executed after code unpatching</div><div class='del'>- * @post_unpatch_enabled:	flag indicating if post-unpatch callback</div><div class='del'>- * 				should run</div><div class='del'>- *</div><div class='del'>- * All callbacks are optional.  Only the pre-patch callback, if provided,</div><div class='del'>- * will be unconditionally executed.  If the parent klp_object fails to</div><div class='del'>- * patch for any reason, including a non-zero error status returned from</div><div class='del'>- * the pre-patch callback, no further callbacks will be executed.</div><div class='del'>- */</div><div class='del'>-struct klp_callbacks {</div><div class='del'>-	int (*pre_patch)(struct klp_object *obj);</div><div class='del'>-	void (*post_patch)(struct klp_object *obj);</div><div class='del'>-	void (*pre_unpatch)(struct klp_object *obj);</div><div class='del'>-	void (*post_unpatch)(struct klp_object *obj);</div><div class='del'>-	bool post_unpatch_enabled;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct klp_object - kernel object structure for live patching</div><div class='ctx'>  * @name:	module name (or NULL for vmlinux)</div><div class='head'>diff --git a/include/linux/livepatch_external.h b/include/linux/livepatch_external.h<br/>new file mode 100644<br/>index 000000000000..138af19b0f5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/livepatch_external.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/livepatch_external.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * External livepatch interfaces for patch creation tooling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_LIVEPATCH_EXTERNAL_H_</div><div class='add'>+#define _LINUX_LIVEPATCH_EXTERNAL_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define KLP_RELOC_SEC_PREFIX		".klp.rela."</div><div class='add'>+#define KLP_SYM_PREFIX			".klp.sym."</div><div class='add'>+</div><div class='add'>+#define __KLP_PRE_PATCH_PREFIX		__klp_pre_patch_callback_</div><div class='add'>+#define __KLP_POST_PATCH_PREFIX		__klp_post_patch_callback_</div><div class='add'>+#define __KLP_PRE_UNPATCH_PREFIX	__klp_pre_unpatch_callback_</div><div class='add'>+#define __KLP_POST_UNPATCH_PREFIX	__klp_post_unpatch_callback_</div><div class='add'>+</div><div class='add'>+#define KLP_PRE_PATCH_PREFIX		__stringify(__KLP_PRE_PATCH_PREFIX)</div><div class='add'>+#define KLP_POST_PATCH_PREFIX		__stringify(__KLP_POST_PATCH_PREFIX)</div><div class='add'>+#define KLP_PRE_UNPATCH_PREFIX		__stringify(__KLP_PRE_UNPATCH_PREFIX)</div><div class='add'>+#define KLP_POST_UNPATCH_PREFIX		__stringify(__KLP_POST_UNPATCH_PREFIX)</div><div class='add'>+</div><div class='add'>+struct klp_object;</div><div class='add'>+</div><div class='add'>+typedef int (*klp_pre_patch_t)(struct klp_object *obj);</div><div class='add'>+typedef void (*klp_post_patch_t)(struct klp_object *obj);</div><div class='add'>+typedef void (*klp_pre_unpatch_t)(struct klp_object *obj);</div><div class='add'>+typedef void (*klp_post_unpatch_t)(struct klp_object *obj);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct klp_callbacks - pre/post live-(un)patch callback structure</div><div class='add'>+ * @pre_patch:		executed before code patching</div><div class='add'>+ * @post_patch:		executed after code patching</div><div class='add'>+ * @pre_unpatch:	executed before code unpatching</div><div class='add'>+ * @post_unpatch:	executed after code unpatching</div><div class='add'>+ * @post_unpatch_enabled:	flag indicating if post-unpatch callback</div><div class='add'>+ *				should run</div><div class='add'>+ *</div><div class='add'>+ * All callbacks are optional.  Only the pre-patch callback, if provided,</div><div class='add'>+ * will be unconditionally executed.  If the parent klp_object fails to</div><div class='add'>+ * patch for any reason, including a non-zero error status returned from</div><div class='add'>+ * the pre-patch callback, no further callbacks will be executed.</div><div class='add'>+ */</div><div class='add'>+struct klp_callbacks {</div><div class='add'>+	klp_pre_patch_t		pre_patch;</div><div class='add'>+	klp_post_patch_t	post_patch;</div><div class='add'>+	klp_pre_unpatch_t	pre_unpatch;</div><div class='add'>+	klp_post_unpatch_t	post_unpatch;</div><div class='add'>+	bool post_unpatch_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 'struct klp_{func,object}_ext' are compact "external" representations of</div><div class='add'>+ * 'struct klp_{func,object}'.   They are used by objtool for livepatch</div><div class='add'>+ * generation.  The structs are then read by the livepatch module and converted</div><div class='add'>+ * to the real structs before calling klp_enable_patch().</div><div class='add'>+ *</div><div class='add'>+ * TODO make these the official API for klp_enable_patch().  That should</div><div class='add'>+ * simplify livepatch's interface as well as its data structure lifetime</div><div class='add'>+ * management.</div><div class='add'>+ */</div><div class='add'>+struct klp_func_ext {</div><div class='add'>+	const char *old_name;</div><div class='add'>+	void *new_func;</div><div class='add'>+	unsigned long sympos;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct klp_object_ext {</div><div class='add'>+	const char *name;</div><div class='add'>+	struct klp_func_ext *funcs;</div><div class='add'>+	struct klp_callbacks callbacks;</div><div class='add'>+	unsigned int nr_funcs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_LIVEPATCH_EXTERNAL_H_ */</div><div class='head'>diff --git a/include/linux/livepatch_helpers.h b/include/linux/livepatch_helpers.h<br/>new file mode 100644<br/>index 000000000000..99d68d0773fa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/livepatch_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/livepatch_helpers.h</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_LIVEPATCH_HELPERS_H</div><div class='add'>+#define _LINUX_LIVEPATCH_HELPERS_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interfaces for use by livepatch patches</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/livepatch.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef MODULE</div><div class='add'>+#define KLP_OBJNAME __KBUILD_MODNAME</div><div class='add'>+#else</div><div class='add'>+#define KLP_OBJNAME vmlinux</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Livepatch callback registration */</div><div class='add'>+</div><div class='add'>+#define KLP_CALLBACK_PTRS ".discard.klp_callback_ptrs"</div><div class='add'>+</div><div class='add'>+#define KLP_PRE_PATCH_CALLBACK(func)						\</div><div class='add'>+	klp_pre_patch_t __used __section(KLP_CALLBACK_PTRS)			\</div><div class='add'>+		__PASTE(__KLP_PRE_PATCH_PREFIX, KLP_OBJNAME) = func</div><div class='add'>+</div><div class='add'>+#define KLP_POST_PATCH_CALLBACK(func)						\</div><div class='add'>+	klp_post_patch_t __used __section(KLP_CALLBACK_PTRS)			\</div><div class='add'>+		__PASTE(__KLP_POST_PATCH_PREFIX, KLP_OBJNAME) = func</div><div class='add'>+</div><div class='add'>+#define KLP_PRE_UNPATCH_CALLBACK(func)						\</div><div class='add'>+	klp_pre_unpatch_t __used __section(KLP_CALLBACK_PTRS)			\</div><div class='add'>+		__PASTE(__KLP_PRE_UNPATCH_PREFIX, KLP_OBJNAME) = func</div><div class='add'>+</div><div class='add'>+#define KLP_POST_UNPATCH_CALLBACK(func)						\</div><div class='add'>+	klp_post_unpatch_t __used __section(KLP_CALLBACK_PTRS)			\</div><div class='add'>+		__PASTE(__KLP_POST_UNPATCH_PREFIX, KLP_OBJNAME) = func</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Replace static_call() usage with this macro when create-diff-object</div><div class='add'>+ * recommends it due to the original static call key living in a module.</div><div class='add'>+ *</div><div class='add'>+ * This converts the static call to a regular indirect call.</div><div class='add'>+ */</div><div class='add'>+#define KLP_STATIC_CALL(name) \</div><div class='add'>+	((typeof(STATIC_CALL_TRAMP(name))*)(STATIC_CALL_KEY(name).func))</div><div class='add'>+</div><div class='add'>+/* Syscall patching */</div><div class='add'>+</div><div class='add'>+#define KLP_SYSCALL_DEFINE1(name, ...) KLP_SYSCALL_DEFINEx(1, _##name, __VA_ARGS__)</div><div class='add'>+#define KLP_SYSCALL_DEFINE2(name, ...) KLP_SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)</div><div class='add'>+#define KLP_SYSCALL_DEFINE3(name, ...) KLP_SYSCALL_DEFINEx(3, _##name, __VA_ARGS__)</div><div class='add'>+#define KLP_SYSCALL_DEFINE4(name, ...) KLP_SYSCALL_DEFINEx(4, _##name, __VA_ARGS__)</div><div class='add'>+#define KLP_SYSCALL_DEFINE5(name, ...) KLP_SYSCALL_DEFINEx(5, _##name, __VA_ARGS__)</div><div class='add'>+#define KLP_SYSCALL_DEFINE6(name, ...) KLP_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define KLP_SYSCALL_DEFINEx(x, sname, ...)				\</div><div class='add'>+	__KLP_SYSCALL_DEFINEx(x, sname, __VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+// TODO move this to arch/x86/include/asm/syscall_wrapper.h and share code</div><div class='add'>+#define __KLP_SYSCALL_DEFINEx(x, name, ...)			\</div><div class='add'>+	static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));	\</div><div class='add'>+	static inline long __klp_do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\</div><div class='add'>+	__X64_SYS_STUBx(x, name, __VA_ARGS__)				\</div><div class='add'>+	__IA32_SYS_STUBx(x, name, __VA_ARGS__)				\</div><div class='add'>+	static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))	\</div><div class='add'>+	{								\</div><div class='add'>+		long ret = __klp_do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__));\</div><div class='add'>+		__MAP(x,__SC_TEST,__VA_ARGS__);				\</div><div class='add'>+		__PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));	\</div><div class='add'>+		return ret;						\</div><div class='add'>+	}								\</div><div class='add'>+	static inline long __klp_do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_LIVEPATCH_HELPERS_H */</div><div class='head'>diff --git a/include/linux/livepatch_sched.h b/include/linux/livepatch_sched.h<br/>index 013794fb5da0..065c185f2763 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/livepatch_sched.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/livepatch_sched.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/livepatch_sched.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/livepatch_sched.h</a></div><div class='hunk'>@@ -3,27 +3,23 @@</div><div class='ctx'> #define _LINUX_LIVEPATCH_SCHED_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/jump_label.h&gt;</div><div class='del'>-#include &lt;linux/static_call_types.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LIVEPATCH</div><div class='ctx'> </div><div class='ctx'> void __klp_sched_try_switch(void);</div><div class='ctx'> </div><div class='del'>-#if !defined(CONFIG_PREEMPT_DYNAMIC) || !defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL)</div><div class='del'>-</div><div class='ctx'> DECLARE_STATIC_KEY_FALSE(klp_sched_try_switch_key);</div><div class='ctx'> </div><div class='del'>-static __always_inline void klp_sched_try_switch(void)</div><div class='add'>+static __always_inline void klp_sched_try_switch(struct task_struct *curr)</div><div class='ctx'> {</div><div class='del'>-	if (static_branch_unlikely(&amp;klp_sched_try_switch_key))</div><div class='add'>+	if (static_branch_unlikely(&amp;klp_sched_try_switch_key) &amp;&amp;</div><div class='add'>+	    READ_ONCE(curr-&gt;__state) &amp; TASK_FREEZABLE)</div><div class='ctx'> 		__klp_sched_try_switch();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* !CONFIG_PREEMPT_DYNAMIC || !CONFIG_HAVE_PREEMPT_DYNAMIC_CALL */</div><div class='del'>-</div><div class='ctx'> #else /* !CONFIG_LIVEPATCH */</div><div class='del'>-static inline void klp_sched_try_switch(void) {}</div><div class='del'>-static inline void __klp_sched_try_switch(void) {}</div><div class='add'>+static inline void klp_sched_try_switch(struct task_struct *curr) {}</div><div class='ctx'> #endif /* CONFIG_LIVEPATCH */</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_LIVEPATCH_SCHED_H_ */</div><div class='head'>diff --git a/include/linux/liveupdate.h b/include/linux/liveupdate.h<br/>new file mode 100644<br/>index 000000000000..a7f6ee5b6771<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/liveupdate.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/liveupdate.h</a></div><div class='hunk'>@@ -0,0 +1,138 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Google LLC.</div><div class='add'>+ * Pasha Tatashin &lt;pasha.tatashin@soleen.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_LIVEUPDATE_H</div><div class='add'>+#define _LINUX_LIVEUPDATE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/kho/abi/luo.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;uapi/linux/liveupdate.h&gt;</div><div class='add'>+</div><div class='add'>+struct liveupdate_file_handler;</div><div class='add'>+struct file;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct liveupdate_file_op_args - Arguments for file operation callbacks.</div><div class='add'>+ * @handler:          The file handler being called.</div><div class='add'>+ * @retrieved:        The retrieve status for the 'can_finish / finish'</div><div class='add'>+ *                    operation.</div><div class='add'>+ * @file:             The file object. For retrieve: [OUT] The callback sets</div><div class='add'>+ *                    this to the new file. For other ops: [IN] The caller sets</div><div class='add'>+ *                    this to the file being operated on.</div><div class='add'>+ * @serialized_data:  The opaque u64 handle, preserve/prepare/freeze may update</div><div class='add'>+ *                    this field.</div><div class='add'>+ * @private_data:     Private data for the file used to hold runtime state that</div><div class='add'>+ *                    is not preserved. Set by the handler's .preserve()</div><div class='add'>+ *                    callback, and must be freed in the handler's</div><div class='add'>+ *                    .unpreserve() callback.</div><div class='add'>+ *</div><div class='add'>+ * This structure bundles all parameters for the file operation callbacks.</div><div class='add'>+ * The 'data' and 'file' fields are used for both input and output.</div><div class='add'>+ */</div><div class='add'>+struct liveupdate_file_op_args {</div><div class='add'>+	struct liveupdate_file_handler *handler;</div><div class='add'>+	bool retrieved;</div><div class='add'>+	struct file *file;</div><div class='add'>+	u64 serialized_data;</div><div class='add'>+	void *private_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct liveupdate_file_ops - Callbacks for live-updatable files.</div><div class='add'>+ * @can_preserve: Required. Lightweight check to see if this handler is</div><div class='add'>+ *                compatible with the given file.</div><div class='add'>+ * @preserve:     Required. Performs state-saving for the file.</div><div class='add'>+ * @unpreserve:   Required. Cleans up any resources allocated by @preserve.</div><div class='add'>+ * @freeze:       Optional. Final actions just before kernel transition.</div><div class='add'>+ * @unfreeze:     Optional. Undo freeze operations.</div><div class='add'>+ * @retrieve:     Required. Restores the file in the new kernel.</div><div class='add'>+ * @can_finish:   Optional. Check if this FD can finish, i.e. all restoration</div><div class='add'>+ *                pre-requirements for this FD are satisfied. Called prior to</div><div class='add'>+ *                finish, in order to do successful finish calls for all</div><div class='add'>+ *                resources in the session.</div><div class='add'>+ * @finish:       Required. Final cleanup in the new kernel.</div><div class='add'>+ * @owner:        Module reference</div><div class='add'>+ *</div><div class='add'>+ * All operations (except can_preserve) receive a pointer to a</div><div class='add'>+ * 'struct liveupdate_file_op_args' containing the necessary context.</div><div class='add'>+ */</div><div class='add'>+struct liveupdate_file_ops {</div><div class='add'>+	bool (*can_preserve)(struct liveupdate_file_handler *handler,</div><div class='add'>+			     struct file *file);</div><div class='add'>+	int (*preserve)(struct liveupdate_file_op_args *args);</div><div class='add'>+	void (*unpreserve)(struct liveupdate_file_op_args *args);</div><div class='add'>+	int (*freeze)(struct liveupdate_file_op_args *args);</div><div class='add'>+	void (*unfreeze)(struct liveupdate_file_op_args *args);</div><div class='add'>+	int (*retrieve)(struct liveupdate_file_op_args *args);</div><div class='add'>+	bool (*can_finish)(struct liveupdate_file_op_args *args);</div><div class='add'>+	void (*finish)(struct liveupdate_file_op_args *args);</div><div class='add'>+	struct module *owner;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct liveupdate_file_handler - Represents a handler for a live-updatable file type.</div><div class='add'>+ * @ops:                Callback functions</div><div class='add'>+ * @compatible:         The compatibility string (e.g., "memfd-v1", "vfiofd-v1")</div><div class='add'>+ *                      that uniquely identifies the file type this handler</div><div class='add'>+ *                      supports. This is matched against the compatible string</div><div class='add'>+ *                      associated with individual &amp;struct file instances.</div><div class='add'>+ *</div><div class='add'>+ * Modules that want to support live update for specific file types should</div><div class='add'>+ * register an instance of this structure. LUO uses this registration to</div><div class='add'>+ * determine if a given file can be preserved and to find the appropriate</div><div class='add'>+ * operations to manage its state across the update.</div><div class='add'>+ */</div><div class='add'>+struct liveupdate_file_handler {</div><div class='add'>+	const struct liveupdate_file_ops *ops;</div><div class='add'>+	const char compatible[LIVEUPDATE_HNDL_COMPAT_LENGTH];</div><div class='add'>+</div><div class='add'>+	/* private: */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Used for linking this handler instance into a global list of</div><div class='add'>+	 * registered file handlers.</div><div class='add'>+	 */</div><div class='add'>+	struct list_head __private list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LIVEUPDATE</div><div class='add'>+</div><div class='add'>+/* Return true if live update orchestrator is enabled */</div><div class='add'>+bool liveupdate_enabled(void);</div><div class='add'>+</div><div class='add'>+/* Called during kexec to tell LUO that entered into reboot */</div><div class='add'>+int liveupdate_reboot(void);</div><div class='add'>+</div><div class='add'>+int liveupdate_register_file_handler(struct liveupdate_file_handler *fh);</div><div class='add'>+int liveupdate_unregister_file_handler(struct liveupdate_file_handler *fh);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_LIVEUPDATE */</div><div class='add'>+</div><div class='add'>+static inline bool liveupdate_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int liveupdate_reboot(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int liveupdate_register_file_handler(struct liveupdate_file_handler *fh)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int liveupdate_unregister_file_handler(struct liveupdate_file_handler *fh)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_LIVEUPDATE */</div><div class='add'>+#endif /* _LINUX_LIVEUPDATE_H */</div><div class='head'>diff --git a/include/linux/llist.h b/include/linux/llist.h<br/>index 2c982ff7475a..607b2360c938 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/llist.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/llist.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/llist.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/llist.h</a></div><div class='hunk'>@@ -83,7 +83,7 @@ static inline void init_llist_head(struct llist_head *list)</div><div class='ctx'>  */</div><div class='ctx'> static inline void init_llist_node(struct llist_node *node)</div><div class='ctx'> {</div><div class='del'>-	node-&gt;next = node;</div><div class='add'>+	WRITE_ONCE(node-&gt;next, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -97,7 +97,7 @@ static inline void init_llist_node(struct llist_node *node)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool llist_on_list(const struct llist_node *node)</div><div class='ctx'> {</div><div class='del'>-	return node-&gt;next != node;</div><div class='add'>+	return READ_ONCE(node-&gt;next) != node;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -220,12 +220,29 @@ static inline bool llist_empty(const struct llist_head *head)</div><div class='ctx'> </div><div class='ctx'> static inline struct llist_node *llist_next(struct llist_node *node)</div><div class='ctx'> {</div><div class='del'>-	return node-&gt;next;</div><div class='add'>+	return READ_ONCE(node-&gt;next);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern bool llist_add_batch(struct llist_node *new_first,</div><div class='del'>-			    struct llist_node *new_last,</div><div class='del'>-			    struct llist_head *head);</div><div class='add'>+/**</div><div class='add'>+ * llist_add_batch - add several linked entries in batch</div><div class='add'>+ * @new_first:	first entry in batch to be added</div><div class='add'>+ * @new_last:	last entry in batch to be added</div><div class='add'>+ * @head:	the head for your lock-less list</div><div class='add'>+ *</div><div class='add'>+ * Return whether list is empty before adding.</div><div class='add'>+ */</div><div class='add'>+static inline bool llist_add_batch(struct llist_node *new_first,</div><div class='add'>+				   struct llist_node *new_last,</div><div class='add'>+				   struct llist_head *head)</div><div class='add'>+{</div><div class='add'>+	struct llist_node *first = READ_ONCE(head-&gt;first);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		new_last-&gt;next = first;</div><div class='add'>+	} while (!try_cmpxchg(&amp;head-&gt;first, &amp;first, new_first));</div><div class='add'>+</div><div class='add'>+	return !first;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline bool __llist_add_batch(struct llist_node *new_first,</div><div class='ctx'> 				     struct llist_node *new_last,</div><div class='head'>diff --git a/include/linux/local_lock.h b/include/linux/local_lock.h<br/>index e55010fa7329..b0e6ab329b00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/local_lock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/local_lock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/local_lock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/local_lock.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * local_lock_init - Runtime initialize a lock instance</div><div class='add'>+ * @lock:	The lock variable</div><div class='ctx'>  */</div><div class='ctx'> #define local_lock_init(lock)		__local_lock_init(lock)</div><div class='ctx'> </div><div class='hunk'>@@ -13,13 +14,13 @@</div><div class='ctx'>  * local_lock - Acquire a per CPU local lock</div><div class='ctx'>  * @lock:	The lock variable</div><div class='ctx'>  */</div><div class='del'>-#define local_lock(lock)		__local_lock(lock)</div><div class='add'>+#define local_lock(lock)		__local_lock(this_cpu_ptr(lock))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * local_lock_irq - Acquire a per CPU local lock and disable interrupts</div><div class='ctx'>  * @lock:	The lock variable</div><div class='ctx'>  */</div><div class='del'>-#define local_lock_irq(lock)		__local_lock_irq(lock)</div><div class='add'>+#define local_lock_irq(lock)		__local_lock_irq(this_cpu_ptr(lock))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * local_lock_irqsave - Acquire a per CPU local lock, save and disable</div><div class='hunk'>@@ -28,19 +29,19 @@</div><div class='ctx'>  * @flags:	Storage for interrupt flags</div><div class='ctx'>  */</div><div class='ctx'> #define local_lock_irqsave(lock, flags)				\</div><div class='del'>-	__local_lock_irqsave(lock, flags)</div><div class='add'>+	__local_lock_irqsave(this_cpu_ptr(lock), flags)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * local_unlock - Release a per CPU local lock</div><div class='ctx'>  * @lock:	The lock variable</div><div class='ctx'>  */</div><div class='del'>-#define local_unlock(lock)		__local_unlock(lock)</div><div class='add'>+#define local_unlock(lock)		__local_unlock(this_cpu_ptr(lock))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * local_unlock_irq - Release a per CPU local lock and enable interrupts</div><div class='ctx'>  * @lock:	The lock variable</div><div class='ctx'>  */</div><div class='del'>-#define local_unlock_irq(lock)		__local_unlock_irq(lock)</div><div class='add'>+#define local_unlock_irq(lock)		__local_unlock_irq(this_cpu_ptr(lock))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * local_unlock_irqrestore - Release a per CPU local lock and restore</div><div class='hunk'>@@ -49,6 +50,58 @@</div><div class='ctx'>  * @flags:      Interrupt flags to restore</div><div class='ctx'>  */</div><div class='ctx'> #define local_unlock_irqrestore(lock, flags)			\</div><div class='del'>-	__local_unlock_irqrestore(lock, flags)</div><div class='add'>+	__local_unlock_irqrestore(this_cpu_ptr(lock), flags)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * local_trylock_init - Runtime initialize a lock instance</div><div class='add'>+ * @lock:	The lock variable</div><div class='add'>+ */</div><div class='add'>+#define local_trylock_init(lock)	__local_trylock_init(lock)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * local_trylock - Try to acquire a per CPU local lock</div><div class='add'>+ * @lock:	The lock variable</div><div class='add'>+ *</div><div class='add'>+ * The function can be used in any context such as NMI or HARDIRQ. Due to</div><div class='add'>+ * locking constrains it will _always_ fail to acquire the lock in NMI or</div><div class='add'>+ * HARDIRQ context on PREEMPT_RT.</div><div class='add'>+ */</div><div class='add'>+#define local_trylock(lock)		__local_trylock(this_cpu_ptr(lock))</div><div class='add'>+</div><div class='add'>+#define local_lock_is_locked(lock)	__local_lock_is_locked(lock)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * local_trylock_irqsave - Try to acquire a per CPU local lock, save and disable</div><div class='add'>+ *			   interrupts if acquired</div><div class='add'>+ * @lock:	The lock variable</div><div class='add'>+ * @flags:	Storage for interrupt flags</div><div class='add'>+ *</div><div class='add'>+ * The function can be used in any context such as NMI or HARDIRQ. Due to</div><div class='add'>+ * locking constrains it will _always_ fail to acquire the lock in NMI or</div><div class='add'>+ * HARDIRQ context on PREEMPT_RT.</div><div class='add'>+ */</div><div class='add'>+#define local_trylock_irqsave(lock, flags)			\</div><div class='add'>+	__local_trylock_irqsave(this_cpu_ptr(lock), flags)</div><div class='add'>+</div><div class='add'>+DEFINE_GUARD(local_lock, local_lock_t __percpu*,</div><div class='add'>+	     local_lock(_T),</div><div class='add'>+	     local_unlock(_T))</div><div class='add'>+DEFINE_GUARD(local_lock_irq, local_lock_t __percpu*,</div><div class='add'>+	     local_lock_irq(_T),</div><div class='add'>+	     local_unlock_irq(_T))</div><div class='add'>+DEFINE_LOCK_GUARD_1(local_lock_irqsave, local_lock_t __percpu,</div><div class='add'>+		    local_lock_irqsave(_T-&gt;lock, _T-&gt;flags),</div><div class='add'>+		    local_unlock_irqrestore(_T-&gt;lock, _T-&gt;flags),</div><div class='add'>+		    unsigned long flags)</div><div class='add'>+</div><div class='add'>+#define local_lock_nested_bh(_lock)				\</div><div class='add'>+	__local_lock_nested_bh(this_cpu_ptr(_lock))</div><div class='add'>+</div><div class='add'>+#define local_unlock_nested_bh(_lock)				\</div><div class='add'>+	__local_unlock_nested_bh(this_cpu_ptr(_lock))</div><div class='add'>+</div><div class='add'>+DEFINE_GUARD(local_lock_nested_bh, local_lock_t __percpu*,</div><div class='add'>+	     local_lock_nested_bh(_T),</div><div class='add'>+	     local_unlock_nested_bh(_T))</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/local_lock_internal.h b/include/linux/local_lock_internal.h<br/>index 975e33b793a7..8f82b4eb542f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/local_lock_internal.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/local_lock_internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/local_lock_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/local_lock_internal.h</a></div><div class='hunk'>@@ -15,6 +15,15 @@ typedef struct {</div><div class='ctx'> #endif</div><div class='ctx'> } local_lock_t;</div><div class='ctx'> </div><div class='add'>+/* local_trylock() and local_trylock_irqsave() only work with local_trylock_t */</div><div class='add'>+typedef struct {</div><div class='add'>+#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+	struct lockdep_map	dep_map;</div><div class='add'>+	struct task_struct	*owner;</div><div class='add'>+#endif</div><div class='add'>+	u8		acquired;</div><div class='add'>+} local_trylock_t;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='ctx'> # define LOCAL_LOCK_DEBUG_INIT(lockname)		\</div><div class='ctx'> 	.dep_map = {					\</div><div class='hunk'>@@ -24,6 +33,9 @@ typedef struct {</div><div class='ctx'> 	},						\</div><div class='ctx'> 	.owner = NULL,</div><div class='ctx'> </div><div class='add'>+# define LOCAL_TRYLOCK_DEBUG_INIT(lockname)		\</div><div class='add'>+	LOCAL_LOCK_DEBUG_INIT(lockname)</div><div class='add'>+</div><div class='ctx'> static inline void local_lock_acquire(local_lock_t *l)</div><div class='ctx'> {</div><div class='ctx'> 	lock_map_acquire(&amp;l-&gt;dep_map);</div><div class='hunk'>@@ -31,6 +43,13 @@ static inline void local_lock_acquire(local_lock_t *l)</div><div class='ctx'> 	l-&gt;owner = current;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void local_trylock_acquire(local_lock_t *l)</div><div class='add'>+{</div><div class='add'>+	lock_map_acquire_try(&amp;l-&gt;dep_map);</div><div class='add'>+	DEBUG_LOCKS_WARN_ON(l-&gt;owner);</div><div class='add'>+	l-&gt;owner = current;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void local_lock_release(local_lock_t *l)</div><div class='ctx'> {</div><div class='ctx'> 	DEBUG_LOCKS_WARN_ON(l-&gt;owner != current);</div><div class='hunk'>@@ -44,12 +63,15 @@ static inline void local_lock_debug_init(local_lock_t *l)</div><div class='ctx'> }</div><div class='ctx'> #else /* CONFIG_DEBUG_LOCK_ALLOC */</div><div class='ctx'> # define LOCAL_LOCK_DEBUG_INIT(lockname)</div><div class='add'>+# define LOCAL_TRYLOCK_DEBUG_INIT(lockname)</div><div class='ctx'> static inline void local_lock_acquire(local_lock_t *l) { }</div><div class='add'>+static inline void local_trylock_acquire(local_lock_t *l) { }</div><div class='ctx'> static inline void local_lock_release(local_lock_t *l) { }</div><div class='ctx'> static inline void local_lock_debug_init(local_lock_t *l) { }</div><div class='ctx'> #endif /* !CONFIG_DEBUG_LOCK_ALLOC */</div><div class='ctx'> </div><div class='ctx'> #define INIT_LOCAL_LOCK(lockname)	{ LOCAL_LOCK_DEBUG_INIT(lockname) }</div><div class='add'>+#define INIT_LOCAL_TRYLOCK(lockname)	{ LOCAL_TRYLOCK_DEBUG_INIT(lockname) }</div><div class='ctx'> </div><div class='ctx'> #define __local_lock_init(lock)					\</div><div class='ctx'> do {								\</div><div class='hunk'>@@ -62,42 +84,133 @@ do {								\</div><div class='ctx'> 	local_lock_debug_init(lock);				\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+#define __local_trylock_init(lock) __local_lock_init((local_lock_t *)lock)</div><div class='add'>+</div><div class='add'>+#define __spinlock_nested_bh_init(lock)				\</div><div class='add'>+do {								\</div><div class='add'>+	static struct lock_class_key __key;			\</div><div class='add'>+								\</div><div class='add'>+	debug_check_no_locks_freed((void *)lock, sizeof(*lock));\</div><div class='add'>+	lockdep_init_map_type(&amp;(lock)-&gt;dep_map, #lock, &amp;__key,  \</div><div class='add'>+			      0, LD_WAIT_CONFIG, LD_WAIT_INV,	\</div><div class='add'>+			      LD_LOCK_NORMAL);			\</div><div class='add'>+	local_lock_debug_init(lock);				\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define __local_lock_acquire(lock)					\</div><div class='add'>+	do {								\</div><div class='add'>+		local_trylock_t *__tl;					\</div><div class='add'>+		local_lock_t *__l;					\</div><div class='add'>+									\</div><div class='add'>+		__l = (local_lock_t *)(lock);				\</div><div class='add'>+		__tl = (local_trylock_t *)__l;				\</div><div class='add'>+		_Generic((lock),					\</div><div class='add'>+			local_trylock_t *: ({				\</div><div class='add'>+				lockdep_assert(__tl-&gt;acquired == 0);	\</div><div class='add'>+				WRITE_ONCE(__tl-&gt;acquired, 1);		\</div><div class='add'>+			}),						\</div><div class='add'>+			local_lock_t *: (void)0);			\</div><div class='add'>+		local_lock_acquire(__l);				\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='ctx'> #define __local_lock(lock)					\</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		preempt_disable();				\</div><div class='del'>-		local_lock_acquire(this_cpu_ptr(lock));		\</div><div class='add'>+		__local_lock_acquire(lock);			\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define __local_lock_irq(lock)					\</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		local_irq_disable();				\</div><div class='del'>-		local_lock_acquire(this_cpu_ptr(lock));		\</div><div class='add'>+		__local_lock_acquire(lock);			\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define __local_lock_irqsave(lock, flags)			\</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		local_irq_save(flags);				\</div><div class='del'>-		local_lock_acquire(this_cpu_ptr(lock));		\</div><div class='add'>+		__local_lock_acquire(lock);			\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define __local_trylock(lock)					\</div><div class='add'>+	({							\</div><div class='add'>+		local_trylock_t *__tl;				\</div><div class='add'>+								\</div><div class='add'>+		preempt_disable();				\</div><div class='add'>+		__tl = (lock);					\</div><div class='add'>+		if (READ_ONCE(__tl-&gt;acquired)) {		\</div><div class='add'>+			preempt_enable();			\</div><div class='add'>+			__tl = NULL;				\</div><div class='add'>+		} else {					\</div><div class='add'>+			WRITE_ONCE(__tl-&gt;acquired, 1);		\</div><div class='add'>+			local_trylock_acquire(			\</div><div class='add'>+				(local_lock_t *)__tl);		\</div><div class='add'>+		}						\</div><div class='add'>+		!!__tl;						\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __local_trylock_irqsave(lock, flags)			\</div><div class='add'>+	({							\</div><div class='add'>+		local_trylock_t *__tl;				\</div><div class='add'>+								\</div><div class='add'>+		local_irq_save(flags);				\</div><div class='add'>+		__tl = (lock);					\</div><div class='add'>+		if (READ_ONCE(__tl-&gt;acquired)) {		\</div><div class='add'>+			local_irq_restore(flags);		\</div><div class='add'>+			__tl = NULL;				\</div><div class='add'>+		} else {					\</div><div class='add'>+			WRITE_ONCE(__tl-&gt;acquired, 1);		\</div><div class='add'>+			local_trylock_acquire(			\</div><div class='add'>+				(local_lock_t *)__tl);		\</div><div class='add'>+		}						\</div><div class='add'>+		!!__tl;						\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/* preemption or migration must be disabled before calling __local_lock_is_locked */</div><div class='add'>+#define __local_lock_is_locked(lock) READ_ONCE(this_cpu_ptr(lock)-&gt;acquired)</div><div class='add'>+</div><div class='add'>+#define __local_lock_release(lock)					\</div><div class='add'>+	do {								\</div><div class='add'>+		local_trylock_t *__tl;					\</div><div class='add'>+		local_lock_t *__l;					\</div><div class='add'>+									\</div><div class='add'>+		__l = (local_lock_t *)(lock);				\</div><div class='add'>+		__tl = (local_trylock_t *)__l;				\</div><div class='add'>+		local_lock_release(__l);				\</div><div class='add'>+		_Generic((lock),					\</div><div class='add'>+			local_trylock_t *: ({				\</div><div class='add'>+				lockdep_assert(__tl-&gt;acquired == 1);	\</div><div class='add'>+				WRITE_ONCE(__tl-&gt;acquired, 0);		\</div><div class='add'>+			}),						\</div><div class='add'>+			local_lock_t *: (void)0);			\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define __local_unlock(lock)					\</div><div class='ctx'> 	do {							\</div><div class='del'>-		local_lock_release(this_cpu_ptr(lock));		\</div><div class='add'>+		__local_lock_release(lock);			\</div><div class='ctx'> 		preempt_enable();				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define __local_unlock_irq(lock)				\</div><div class='ctx'> 	do {							\</div><div class='del'>-		local_lock_release(this_cpu_ptr(lock));		\</div><div class='add'>+		__local_lock_release(lock);			\</div><div class='ctx'> 		local_irq_enable();				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define __local_unlock_irqrestore(lock, flags)			\</div><div class='ctx'> 	do {							\</div><div class='del'>-		local_lock_release(this_cpu_ptr(lock));		\</div><div class='add'>+		__local_lock_release(lock);			\</div><div class='ctx'> 		local_irq_restore(flags);			\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+#define __local_lock_nested_bh(lock)				\</div><div class='add'>+	do {							\</div><div class='add'>+		lockdep_assert_in_softirq();			\</div><div class='add'>+		local_lock_acquire((lock));			\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define __local_unlock_nested_bh(lock)				\</div><div class='add'>+	local_lock_release((lock))</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_PREEMPT_RT */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -105,18 +218,22 @@ do {								\</div><div class='ctx'>  * critical section while staying preemptible.</div><div class='ctx'>  */</div><div class='ctx'> typedef spinlock_t local_lock_t;</div><div class='add'>+typedef spinlock_t local_trylock_t;</div><div class='ctx'> </div><div class='ctx'> #define INIT_LOCAL_LOCK(lockname) __LOCAL_SPIN_LOCK_UNLOCKED((lockname))</div><div class='add'>+#define INIT_LOCAL_TRYLOCK(lockname) __LOCAL_SPIN_LOCK_UNLOCKED((lockname))</div><div class='ctx'> </div><div class='del'>-#define __local_lock_init(l)					\</div><div class='add'>+#define __local_lock_init(__l)					\</div><div class='ctx'> 	do {							\</div><div class='del'>-		local_spin_lock_init((l));			\</div><div class='add'>+		local_spin_lock_init((__l));			\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+#define __local_trylock_init(__l)			__local_lock_init(__l)</div><div class='add'>+</div><div class='ctx'> #define __local_lock(__lock)					\</div><div class='ctx'> 	do {							\</div><div class='ctx'> 		migrate_disable();				\</div><div class='del'>-		spin_lock(this_cpu_ptr((__lock)));		\</div><div class='add'>+		spin_lock((__lock));				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define __local_lock_irq(lock)			__local_lock(lock)</div><div class='hunk'>@@ -130,7 +247,7 @@ typedef spinlock_t local_lock_t;</div><div class='ctx'> </div><div class='ctx'> #define __local_unlock(__lock)					\</div><div class='ctx'> 	do {							\</div><div class='del'>-		spin_unlock(this_cpu_ptr((__lock)));		\</div><div class='add'>+		spin_unlock((__lock));				\</div><div class='ctx'> 		migrate_enable();				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -138,4 +255,41 @@ typedef spinlock_t local_lock_t;</div><div class='ctx'> </div><div class='ctx'> #define __local_unlock_irqrestore(lock, flags)	__local_unlock(lock)</div><div class='ctx'> </div><div class='add'>+#define __local_lock_nested_bh(lock)				\</div><div class='add'>+do {								\</div><div class='add'>+	lockdep_assert_in_softirq_func();			\</div><div class='add'>+	spin_lock((lock));					\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define __local_unlock_nested_bh(lock)				\</div><div class='add'>+do {								\</div><div class='add'>+	spin_unlock((lock));					\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define __local_trylock(lock)					\</div><div class='add'>+	({							\</div><div class='add'>+		int __locked;					\</div><div class='add'>+								\</div><div class='add'>+		if (in_nmi() | in_hardirq()) {			\</div><div class='add'>+			__locked = 0;				\</div><div class='add'>+		} else {					\</div><div class='add'>+			migrate_disable();			\</div><div class='add'>+			__locked = spin_trylock((lock));	\</div><div class='add'>+			if (!__locked)				\</div><div class='add'>+				migrate_enable();		\</div><div class='add'>+		}						\</div><div class='add'>+		__locked;					\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define __local_trylock_irqsave(lock, flags)			\</div><div class='add'>+	({							\</div><div class='add'>+		typecheck(unsigned long, flags);		\</div><div class='add'>+		flags = 0;					\</div><div class='add'>+		__local_trylock(lock);				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/* migration must be disabled before calling __local_lock_is_locked */</div><div class='add'>+#define __local_lock_is_locked(__lock)					\</div><div class='add'>+	(rt_mutex_owner(&amp;this_cpu_ptr(__lock)-&gt;lock) == current)</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_PREEMPT_RT */</div><div class='head'>diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h<br/>index 1b95fe31051f..330e38776bb2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lockd/lockd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockd/lockd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lockd/lockd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lockd/lockd.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> /* XXX: a lot of this should really be under fs/lockd. */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/exportfs.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='hunk'>@@ -200,7 +201,7 @@ extern const struct svc_procedure nlmsvc_procedures[24];</div><div class='ctx'> extern const struct svc_procedure nlmsvc_procedures4[24];</div><div class='ctx'> #endif</div><div class='ctx'> extern int			nlmsvc_grace_period;</div><div class='del'>-extern unsigned long		nlmsvc_timeout;</div><div class='add'>+extern unsigned long		nlm_timeout;</div><div class='ctx'> extern bool			nsm_use_hostnames;</div><div class='ctx'> extern u32			nsm_local_state;</div><div class='ctx'> </div><div class='hunk'>@@ -278,9 +279,9 @@ __be32		  nlmsvc_lock(struct svc_rqst *, struct nlm_file *,</div><div class='ctx'> 			      struct nlm_host *, struct nlm_lock *, int,</div><div class='ctx'> 			      struct nlm_cookie *, int);</div><div class='ctx'> __be32		  nlmsvc_unlock(struct net *net, struct nlm_file *, struct nlm_lock *);</div><div class='del'>-__be32		  nlmsvc_testlock(struct svc_rqst *, struct nlm_file *,</div><div class='del'>-			struct nlm_host *, struct nlm_lock *,</div><div class='del'>-			struct nlm_lock *, struct nlm_cookie *);</div><div class='add'>+__be32		  nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,</div><div class='add'>+			struct nlm_host *host, struct nlm_lock *lock,</div><div class='add'>+			struct nlm_lock *conflock);</div><div class='ctx'> __be32		  nlmsvc_cancel_blocked(struct net *net, struct nlm_file *, struct nlm_lock *);</div><div class='ctx'> void		  nlmsvc_retry_blocked(struct svc_rqst *rqstp);</div><div class='ctx'> void		  nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,</div><div class='hunk'>@@ -307,7 +308,7 @@ void		  nlmsvc_invalidate_all(void);</div><div class='ctx'> int           nlmsvc_unlock_all_by_sb(struct super_block *sb);</div><div class='ctx'> int           nlmsvc_unlock_all_by_ip(struct sockaddr *server_addr);</div><div class='ctx'> </div><div class='del'>-static inline struct file *nlmsvc_file_file(struct nlm_file *file)</div><div class='add'>+static inline struct file *nlmsvc_file_file(const struct nlm_file *file)</div><div class='ctx'> {</div><div class='ctx'> 	return file-&gt;f_file[O_RDONLY] ?</div><div class='ctx'> 	       file-&gt;f_file[O_RDONLY] : file-&gt;f_file[O_WRONLY];</div><div class='hunk'>@@ -318,6 +319,12 @@ static inline struct inode *nlmsvc_file_inode(struct nlm_file *file)</div><div class='ctx'> 	return file_inode(nlmsvc_file_file(file));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool</div><div class='add'>+nlmsvc_file_cannot_lock(const struct nlm_file *file)</div><div class='add'>+{</div><div class='add'>+	return exportfs_cannot_lock(nlmsvc_file_file(file)-&gt;f_path.dentry-&gt;d_sb-&gt;s_export_op);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int __nlm_privileged_request4(const struct sockaddr *sap)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sockaddr_in *sin = (struct sockaddr_in *)sap;</div><div class='head'>diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h<br/>index 80cca9426761..17d53165d9f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lockd/xdr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockd/xdr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lockd/xdr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lockd/xdr.h</a></div><div class='hunk'>@@ -73,8 +73,6 @@ struct nlm_args {</div><div class='ctx'> 	u32			fsm_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef struct nlm_args nlm_args;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Generic lockd result</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h<br/>index 08b0d1d9d78b..dd634103b014 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lockdep.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockdep.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lockdep.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lockdep.h</a></div><div class='hunk'>@@ -173,14 +173,32 @@ static inline void lockdep_init_map(struct lockdep_map *lock, const char *name,</div><div class='ctx'> 			      (lock)-&gt;dep_map.lock_type)</div><div class='ctx'> </div><div class='ctx'> #define lockdep_set_subclass(lock, sub)					\</div><div class='del'>-	lockdep_init_map_type(&amp;(lock)-&gt;dep_map, #lock, (lock)-&gt;dep_map.key, sub,\</div><div class='add'>+	lockdep_init_map_type(&amp;(lock)-&gt;dep_map, (lock)-&gt;dep_map.name, (lock)-&gt;dep_map.key, sub,\</div><div class='ctx'> 			      (lock)-&gt;dep_map.wait_type_inner,		\</div><div class='ctx'> 			      (lock)-&gt;dep_map.wait_type_outer,		\</div><div class='ctx'> 			      (lock)-&gt;dep_map.lock_type)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lockdep_set_novalidate_class: disable checking of lock ordering on a given</div><div class='add'>+ * lock</div><div class='add'>+ * @lock: Lock to mark</div><div class='add'>+ *</div><div class='add'>+ * Lockdep will still record that this lock has been taken, and print held</div><div class='add'>+ * instances when dumping locks</div><div class='add'>+ */</div><div class='ctx'> #define lockdep_set_novalidate_class(lock) \</div><div class='ctx'> 	lockdep_set_class_and_name(lock, &amp;__lockdep_no_validate__, #lock)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lockdep_set_notrack_class: disable lockdep tracking of a given lock entirely</div><div class='add'>+ * @lock: Lock to mark</div><div class='add'>+ *</div><div class='add'>+ * Bigger hammer than lockdep_set_novalidate_class: so far just for bcachefs,</div><div class='add'>+ * which takes more locks than lockdep is able to track (48).</div><div class='add'>+ */</div><div class='add'>+#define lockdep_set_notrack_class(lock) \</div><div class='add'>+	lockdep_set_class_and_name(lock, &amp;__lockdep_no_track__, #lock)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Compare locking classes</div><div class='ctx'>  */</div><div class='hunk'>@@ -338,6 +356,7 @@ static inline void lockdep_set_selftest_task(struct task_struct *task)</div><div class='ctx'> #define lockdep_set_subclass(lock, sub)		do { } while (0)</div><div class='ctx'> </div><div class='ctx'> #define lockdep_set_novalidate_class(lock) do { } while (0)</div><div class='add'>+#define lockdep_set_notrack_class(lock) do { } while (0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We don't define lockdep_match_class() and lockdep_match_key() for !LOCKDEP</div><div class='hunk'>@@ -597,9 +616,11 @@ do {									\</div><div class='ctx'> #define lockdep_assert_in_softirq()					\</div><div class='ctx'> do {									\</div><div class='ctx'> 	WARN_ON_ONCE(__lockdep_enabled			&amp;&amp;		\</div><div class='del'>-		     (!in_softirq() || in_irq() || in_nmi()));		\</div><div class='add'>+		     (!in_softirq() || in_hardirq() || in_nmi()));	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+extern void lockdep_assert_in_softirq_func(void);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> # define might_lock(lock) do { } while (0)</div><div class='ctx'> # define might_lock_read(lock) do { } while (0)</div><div class='hunk'>@@ -613,6 +634,7 @@ do {									\</div><div class='ctx'> # define lockdep_assert_preemption_enabled() do { } while (0)</div><div class='ctx'> # define lockdep_assert_preemption_disabled() do { } while (0)</div><div class='ctx'> # define lockdep_assert_in_softirq() do { } while (0)</div><div class='add'>+# define lockdep_assert_in_softirq_func() do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROVE_RAW_LOCK_NESTING</div><div class='head'>diff --git a/include/linux/lockdep_types.h b/include/linux/lockdep_types.h<br/>index 70d30d40ea4a..eae115a26488 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lockdep_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockdep_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lockdep_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lockdep_types.h</a></div><div class='hunk'>@@ -80,6 +80,7 @@ struct lock_class_key {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct lock_class_key __lockdep_no_validate__;</div><div class='add'>+extern struct lock_class_key __lockdep_no_track__;</div><div class='ctx'> </div><div class='ctx'> struct lock_trace;</div><div class='ctx'> </div><div class='hunk'>@@ -174,7 +175,7 @@ struct lock_class_stats {</div><div class='ctx'> 	unsigned long			bounces[nr_bounce_types];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct lock_class_stats lock_stats(struct lock_class *class);</div><div class='add'>+void lock_stats(struct lock_class *class, struct lock_class_stats *stats);</div><div class='ctx'> void clear_lock_stats(struct lock_class *class);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/lockref.h b/include/linux/lockref.h<br/>index c3a1f78bc884..815d871fadfc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lockref.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lockref.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lockref.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lockref.h</a></div><div class='hunk'>@@ -34,14 +34,27 @@ struct lockref {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void lockref_get(struct lockref *);</div><div class='del'>-extern int lockref_put_return(struct lockref *);</div><div class='del'>-extern int lockref_get_not_zero(struct lockref *);</div><div class='del'>-extern int lockref_put_not_zero(struct lockref *);</div><div class='del'>-extern int lockref_put_or_lock(struct lockref *);</div><div class='del'>-</div><div class='del'>-extern void lockref_mark_dead(struct lockref *);</div><div class='del'>-extern int lockref_get_not_dead(struct lockref *);</div><div class='add'>+/**</div><div class='add'>+ * lockref_init - Initialize a lockref</div><div class='add'>+ * @lockref: pointer to lockref structure</div><div class='add'>+ *</div><div class='add'>+ * Initializes @lockref-&gt;count to 1.</div><div class='add'>+ */</div><div class='add'>+static inline void lockref_init(struct lockref *lockref)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;lockref-&gt;lock);</div><div class='add'>+	lockref-&gt;count = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lockref_get(struct lockref *lockref);</div><div class='add'>+int lockref_put_return(struct lockref *lockref);</div><div class='add'>+bool lockref_get_not_zero(struct lockref *lockref);</div><div class='add'>+bool lockref_put_or_lock(struct lockref *lockref);</div><div class='add'>+#define lockref_put_or_lock(_lockref) \</div><div class='add'>+	(!__cond_lock((_lockref)-&gt;lock, !lockref_put_or_lock(_lockref)))</div><div class='add'>+</div><div class='add'>+void lockref_mark_dead(struct lockref *lockref);</div><div class='add'>+bool lockref_get_not_dead(struct lockref *lockref);</div><div class='ctx'> </div><div class='ctx'> /* Must be called under spinlock for reliable results */</div><div class='ctx'> static inline bool __lockref_is_dead(const struct lockref *l)</div><div class='head'>diff --git a/include/linux/log2.h b/include/linux/log2.h<br/>index 9f30d087a128..2eac3fc9303d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/log2.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/log2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/log2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/log2.h</a></div><div class='hunk'>@@ -41,7 +41,7 @@ int __ilog2_u64(u64 n)</div><div class='ctx'>  * *not* considered a power of two.</div><div class='ctx'>  * Return: true if @n is a power of 2, otherwise false.</div><div class='ctx'>  */</div><div class='del'>-static inline __attribute__((const))</div><div class='add'>+static __always_inline __attribute__((const))</div><div class='ctx'> bool is_power_of_2(unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	return (n != 0 &amp;&amp; ((n &amp; (n - 1)) == 0));</div><div class='hunk'>@@ -255,4 +255,18 @@ int __bits_per(unsigned long n)</div><div class='ctx'> 	) :					\</div><div class='ctx'> 	__bits_per(n)				\</div><div class='ctx'> )</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * max_pow_of_two_factor - return highest power-of-2 factor</div><div class='add'>+ * @n: parameter</div><div class='add'>+ *</div><div class='add'>+ * find highest power-of-2 which is evenly divisible into n.</div><div class='add'>+ * 0 is returned for n == 0 or 1.</div><div class='add'>+ */</div><div class='add'>+static inline __attribute__((const))</div><div class='add'>+unsigned int max_pow_of_two_factor(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	return n &amp; -n;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_LOG2_H */</div><div class='head'>diff --git a/include/linux/logic_pio.h b/include/linux/logic_pio.h<br/>index babf4e3c28ba..8f1a9408302f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/logic_pio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/logic_pio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/logic_pio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/logic_pio.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> struct logic_pio_hwaddr {</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	struct fwnode_handle *fwnode;</div><div class='add'>+	const struct fwnode_handle *fwnode;</div><div class='ctx'> 	resource_size_t hw_start;</div><div class='ctx'> 	resource_size_t io_start;</div><div class='ctx'> 	resource_size_t size; /* range size populated */</div><div class='hunk'>@@ -110,8 +110,8 @@ void logic_outsl(unsigned long addr, const void *buffer, unsigned int count);</div><div class='ctx'> #endif /* CONFIG_INDIRECT_PIO */</div><div class='ctx'> #define MMIO_UPPER_LIMIT (IO_SPACE_LIMIT - PIO_INDIRECT_SIZE)</div><div class='ctx'> </div><div class='del'>-struct logic_pio_hwaddr *find_io_range_by_fwnode(struct fwnode_handle *fwnode);</div><div class='del'>-unsigned long logic_pio_trans_hwaddr(struct fwnode_handle *fwnode,</div><div class='add'>+struct logic_pio_hwaddr *find_io_range_by_fwnode(const struct fwnode_handle *fwnode);</div><div class='add'>+unsigned long logic_pio_trans_hwaddr(const struct fwnode_handle *fwnode,</div><div class='ctx'> 			resource_size_t hw_addr, resource_size_t size);</div><div class='ctx'> int logic_pio_register_range(struct logic_pio_hwaddr *newrange);</div><div class='ctx'> void logic_pio_unregister_range(struct logic_pio_hwaddr *range);</div><div class='head'>diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h<br/>index c9afcdd9324c..ff82ef85a084 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lru_cache.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lru_cache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lru_cache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lru_cache.h</a></div><div class='hunk'>@@ -119,7 +119,7 @@ write intent log information, three of which are mentioned here.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /* this defines an element in a tracked set</div><div class='del'>- * .colision is for hash table lookup.</div><div class='add'>+ * .collision is for hash table lookup.</div><div class='ctx'>  * When we process a new IO request, we know its sector, thus can deduce the</div><div class='ctx'>  * region number (label) easily.  To do the label -&gt; object lookup without a</div><div class='ctx'>  * full list walk, we use a simple hash table.</div><div class='hunk'>@@ -145,7 +145,7 @@ write intent log information, three of which are mentioned here.</div><div class='ctx'>  * But it avoids high order page allocations in kmalloc.</div><div class='ctx'>  */</div><div class='ctx'> struct lc_element {</div><div class='del'>-	struct hlist_node colision;</div><div class='add'>+	struct hlist_node collision;</div><div class='ctx'> 	struct list_head list;		 /* LRU list or free list */</div><div class='ctx'> 	unsigned refcnt;</div><div class='ctx'> 	/* back "pointer" into lc_cache-&gt;element[index],</div><div class='head'>diff --git a/include/linux/lsm/apparmor.h b/include/linux/lsm/apparmor.h<br/>new file mode 100644<br/>index 000000000000..612cbfacb072<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lsm/apparmor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lsm/apparmor.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Linux Security Module interface to other subsystems.</div><div class='add'>+ * AppArmor presents single pointer to an aa_label structure.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_LSM_APPARMOR_H</div><div class='add'>+#define __LINUX_LSM_APPARMOR_H</div><div class='add'>+</div><div class='add'>+struct aa_label;</div><div class='add'>+</div><div class='add'>+struct lsm_prop_apparmor {</div><div class='add'>+#ifdef CONFIG_SECURITY_APPARMOR</div><div class='add'>+	struct aa_label *label;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* ! __LINUX_LSM_APPARMOR_H */</div><div class='head'>diff --git a/include/linux/lsm/bpf.h b/include/linux/lsm/bpf.h<br/>new file mode 100644<br/>index 000000000000..8106e206fcef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lsm/bpf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lsm/bpf.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Linux Security Module interface to other subsystems.</div><div class='add'>+ * BPF may present a single u32 value.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_LSM_BPF_H</div><div class='add'>+#define __LINUX_LSM_BPF_H</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct lsm_prop_bpf {</div><div class='add'>+#ifdef CONFIG_BPF_LSM</div><div class='add'>+	u32 secid;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* ! __LINUX_LSM_BPF_H */</div><div class='head'>diff --git a/include/linux/lsm/selinux.h b/include/linux/lsm/selinux.h<br/>new file mode 100644<br/>index 000000000000..9455a6b5b910<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lsm/selinux.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lsm/selinux.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Linux Security Module interface to other subsystems.</div><div class='add'>+ * SELinux presents a single u32 value which is known as a secid.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_LSM_SELINUX_H</div><div class='add'>+#define __LINUX_LSM_SELINUX_H</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct lsm_prop_selinux {</div><div class='add'>+#ifdef CONFIG_SECURITY_SELINUX</div><div class='add'>+	u32 secid;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* ! __LINUX_LSM_SELINUX_H */</div><div class='head'>diff --git a/include/linux/lsm/smack.h b/include/linux/lsm/smack.h<br/>new file mode 100644<br/>index 000000000000..ff730dd7a734<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lsm/smack.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lsm/smack.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Linux Security Module interface to other subsystems.</div><div class='add'>+ * Smack presents a pointer into the global Smack label list.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_LSM_SMACK_H</div><div class='add'>+#define __LINUX_LSM_SMACK_H</div><div class='add'>+</div><div class='add'>+struct smack_known;</div><div class='add'>+</div><div class='add'>+struct lsm_prop_smack {</div><div class='add'>+#ifdef CONFIG_SECURITY_SMACK</div><div class='add'>+	struct smack_known *skp;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* ! __LINUX_LSM_SMACK_H */</div><div class='head'>diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h<br/>index 97a8b21eb033..382c56a97bba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lsm_audit.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm_audit.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lsm_audit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lsm_audit.h</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Author : Etienne BASSET  &lt;etienne.basset@ensta.org&gt;</div><div class='ctx'>  *</div><div class='del'>- * All credits to : Stephen Smalley, &lt;sds@tycho.nsa.gov&gt;</div><div class='add'>+ * All credits to : Stephen Smalley</div><div class='ctx'>  * All BUGS to : Etienne BASSET  &lt;etienne.basset@ensta.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _LSM_COMMON_LOGGING_</div><div class='hunk'>@@ -77,6 +77,7 @@ struct common_audit_data {</div><div class='ctx'> #define LSM_AUDIT_DATA_LOCKDOWN 15</div><div class='ctx'> #define LSM_AUDIT_DATA_NOTIFICATION 16</div><div class='ctx'> #define LSM_AUDIT_DATA_ANONINODE	17</div><div class='add'>+#define LSM_AUDIT_DATA_NLMSGTYPE	18</div><div class='ctx'> 	union 	{</div><div class='ctx'> 		struct path path;</div><div class='ctx'> 		struct dentry *dentry;</div><div class='hunk'>@@ -98,6 +99,7 @@ struct common_audit_data {</div><div class='ctx'> 		struct lsm_ibendport_audit *ibendport;</div><div class='ctx'> 		int reason;</div><div class='ctx'> 		const char *anonclass;</div><div class='add'>+		u16 nlmsg_type;</div><div class='ctx'> 	} u;</div><div class='ctx'> 	/* this union contains LSM specific data */</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -116,14 +118,36 @@ struct common_audit_data {</div><div class='ctx'> #define v4info fam.v4</div><div class='ctx'> #define v6info fam.v6</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_AUDIT</div><div class='add'>+</div><div class='ctx'> int ipv4_skb_to_auditdata(struct sk_buff *skb,</div><div class='ctx'> 		struct common_audit_data *ad, u8 *proto);</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> int ipv6_skb_to_auditdata(struct sk_buff *skb,</div><div class='ctx'> 		struct common_audit_data *ad, u8 *proto);</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_IPV6) */</div><div class='ctx'> </div><div class='ctx'> void common_lsm_audit(struct common_audit_data *a,</div><div class='ctx'> 	void (*pre_audit)(struct audit_buffer *, void *),</div><div class='ctx'> 	void (*post_audit)(struct audit_buffer *, void *));</div><div class='ctx'> </div><div class='add'>+void audit_log_lsm_data(struct audit_buffer *ab,</div><div class='add'>+			const struct common_audit_data *a);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_AUDIT */</div><div class='add'>+</div><div class='add'>+static inline void common_lsm_audit(struct common_audit_data *a,</div><div class='add'>+	void (*pre_audit)(struct audit_buffer *, void *),</div><div class='add'>+	void (*post_audit)(struct audit_buffer *, void *))</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void audit_log_lsm_data(struct audit_buffer *ab,</div><div class='add'>+			const struct common_audit_data *a)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_AUDIT */</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/lsm_count.h b/include/linux/lsm_count.h<br/>new file mode 100644<br/>index 000000000000..16eb49761b25<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lsm_count.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lsm_count.h</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Google LLC.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_LSM_COUNT_H</div><div class='add'>+#define __LINUX_LSM_COUNT_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/args.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SECURITY</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Macros to count the number of LSMs enabled in the kernel at compile time.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Capabilities is enabled when CONFIG_SECURITY is enabled.</div><div class='add'>+ */</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY)</div><div class='add'>+#define CAPABILITIES_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define CAPABILITIES_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_SELINUX)</div><div class='add'>+#define SELINUX_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define SELINUX_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_SMACK)</div><div class='add'>+#define SMACK_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define SMACK_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_APPARMOR)</div><div class='add'>+#define APPARMOR_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define APPARMOR_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_TOMOYO)</div><div class='add'>+#define TOMOYO_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define TOMOYO_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_YAMA)</div><div class='add'>+#define YAMA_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define YAMA_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_LOADPIN)</div><div class='add'>+#define LOADPIN_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define LOADPIN_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_LOCKDOWN_LSM)</div><div class='add'>+#define LOCKDOWN_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define LOCKDOWN_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_SAFESETID)</div><div class='add'>+#define SAFESETID_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define SAFESETID_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_BPF_LSM)</div><div class='add'>+#define BPF_LSM_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define BPF_LSM_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_LANDLOCK)</div><div class='add'>+#define LANDLOCK_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define LANDLOCK_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IMA)</div><div class='add'>+#define IMA_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define IMA_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_EVM)</div><div class='add'>+#define EVM_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define EVM_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SECURITY_IPE)</div><div class='add'>+#define IPE_ENABLED 1,</div><div class='add'>+#else</div><div class='add'>+#define IPE_ENABLED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  There is a trailing comma that we need to be accounted for. This is done by</div><div class='add'>+ *  using a skipped argument in __COUNT_LSMS</div><div class='add'>+ */</div><div class='add'>+#define __COUNT_LSMS(skipped_arg, args...) COUNT_ARGS(args...)</div><div class='add'>+#define COUNT_LSMS(args...) __COUNT_LSMS(args)</div><div class='add'>+</div><div class='add'>+#define MAX_LSM_COUNT			\</div><div class='add'>+	COUNT_LSMS(			\</div><div class='add'>+		CAPABILITIES_ENABLED	\</div><div class='add'>+		SELINUX_ENABLED		\</div><div class='add'>+		SMACK_ENABLED		\</div><div class='add'>+		APPARMOR_ENABLED	\</div><div class='add'>+		TOMOYO_ENABLED		\</div><div class='add'>+		YAMA_ENABLED		\</div><div class='add'>+		LOADPIN_ENABLED		\</div><div class='add'>+		LOCKDOWN_ENABLED	\</div><div class='add'>+		SAFESETID_ENABLED	\</div><div class='add'>+		BPF_LSM_ENABLED		\</div><div class='add'>+		LANDLOCK_ENABLED	\</div><div class='add'>+		IMA_ENABLED		\</div><div class='add'>+		EVM_ENABLED		\</div><div class='add'>+		IPE_ENABLED)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define MAX_LSM_COUNT 0</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_SECURITY */</div><div class='add'>+</div><div class='add'>+#endif  /* __LINUX_LSM_COUNT_H */</div><div class='head'>diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h<br/>index a8057a3f8de6..8c42b4bde09c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lsm_hook_defs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm_hook_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lsm_hook_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lsm_hook_defs.h</a></div><div class='hunk'>@@ -48,7 +48,7 @@ LSM_HOOK(int, 0, quota_on, struct dentry *dentry)</div><div class='ctx'> LSM_HOOK(int, 0, syslog, int type)</div><div class='ctx'> LSM_HOOK(int, 0, settime, const struct timespec64 *ts,</div><div class='ctx'> 	 const struct timezone *tz)</div><div class='del'>-LSM_HOOK(int, 1, vm_enough_memory, struct mm_struct *mm, long pages)</div><div class='add'>+LSM_HOOK(int, 0, vm_enough_memory, struct mm_struct *mm, long pages)</div><div class='ctx'> LSM_HOOK(int, 0, bprm_creds_for_exec, struct linux_binprm *bprm)</div><div class='ctx'> LSM_HOOK(int, 0, bprm_creds_from_file, struct linux_binprm *bprm, const struct file *file)</div><div class='ctx'> LSM_HOOK(int, 0, bprm_check_security, struct linux_binprm *bprm)</div><div class='hunk'>@@ -83,9 +83,9 @@ LSM_HOOK(int, 0, move_mount, const struct path *from_path,</div><div class='ctx'> 	 const struct path *to_path)</div><div class='ctx'> LSM_HOOK(int, -EOPNOTSUPP, dentry_init_security, struct dentry *dentry,</div><div class='ctx'> 	 int mode, const struct qstr *name, const char **xattr_name,</div><div class='del'>-	 void **ctx, u32 *ctxlen)</div><div class='add'>+	 struct lsm_context *cp)</div><div class='ctx'> LSM_HOOK(int, 0, dentry_create_files_as, struct dentry *dentry, int mode,</div><div class='del'>-	 struct qstr *name, const struct cred *old, struct cred *new)</div><div class='add'>+	 const struct qstr *name, const struct cred *old, struct cred *new)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SECURITY_PATH</div><div class='ctx'> LSM_HOOK(int, 0, path_unlink, const struct path *dir, struct dentry *dentry)</div><div class='hunk'>@@ -114,6 +114,7 @@ LSM_HOOK(int, 0, path_notify, const struct path *path, u64 mask,</div><div class='ctx'> 	 unsigned int obj_type)</div><div class='ctx'> LSM_HOOK(int, 0, inode_alloc_security, struct inode *inode)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, inode_free_security, struct inode *inode)</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, inode_free_security_rcu, void *inode_security)</div><div class='ctx'> LSM_HOOK(int, -EOPNOTSUPP, inode_init_security, struct inode *inode,</div><div class='ctx'> 	 struct inode *dir, const struct qstr *qstr, struct xattr *xattrs,</div><div class='ctx'> 	 int *xattr_count)</div><div class='hunk'>@@ -144,6 +145,7 @@ LSM_HOOK(int, 0, inode_setattr, struct mnt_idmap *idmap, struct dentry *dentry,</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, inode_post_setattr, struct mnt_idmap *idmap,</div><div class='ctx'> 	 struct dentry *dentry, int ia_valid)</div><div class='ctx'> LSM_HOOK(int, 0, inode_getattr, const struct path *path)</div><div class='add'>+LSM_HOOK(int, 0, inode_xattr_skipcap, const char *name)</div><div class='ctx'> LSM_HOOK(int, 0, inode_setxattr, struct mnt_idmap *idmap,</div><div class='ctx'> 	 struct dentry *dentry, const char *name, const void *value,</div><div class='ctx'> 	 size_t size, int flags)</div><div class='hunk'>@@ -155,6 +157,8 @@ LSM_HOOK(int, 0, inode_removexattr, struct mnt_idmap *idmap,</div><div class='ctx'> 	 struct dentry *dentry, const char *name)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, inode_post_removexattr, struct dentry *dentry,</div><div class='ctx'> 	 const char *name)</div><div class='add'>+LSM_HOOK(int, 0, inode_file_setattr, struct dentry *dentry, struct file_kattr *fa)</div><div class='add'>+LSM_HOOK(int, 0, inode_file_getattr, struct dentry *dentry, struct file_kattr *fa)</div><div class='ctx'> LSM_HOOK(int, 0, inode_set_acl, struct mnt_idmap *idmap,</div><div class='ctx'> 	 struct dentry *dentry, const char *acl_name, struct posix_acl *kacl)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, inode_post_set_acl, struct dentry *dentry,</div><div class='hunk'>@@ -174,9 +178,13 @@ LSM_HOOK(int, -EOPNOTSUPP, inode_setsecurity, struct inode *inode,</div><div class='ctx'> 	 const char *name, const void *value, size_t size, int flags)</div><div class='ctx'> LSM_HOOK(int, 0, inode_listsecurity, struct inode *inode, char *buffer,</div><div class='ctx'> 	 size_t buffer_size)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, inode_getsecid, struct inode *inode, u32 *secid)</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, inode_getlsmprop, struct inode *inode,</div><div class='add'>+	 struct lsm_prop *prop)</div><div class='ctx'> LSM_HOOK(int, 0, inode_copy_up, struct dentry *src, struct cred **new)</div><div class='del'>-LSM_HOOK(int, -EOPNOTSUPP, inode_copy_up_xattr, const char *name)</div><div class='add'>+LSM_HOOK(int, -EOPNOTSUPP, inode_copy_up_xattr, struct dentry *src,</div><div class='add'>+	 const char *name)</div><div class='add'>+LSM_HOOK(int, 0, inode_setintegrity, const struct inode *inode,</div><div class='add'>+	 enum lsm_integrity_type type, const void *value, size_t size)</div><div class='ctx'> LSM_HOOK(int, 0, kernfs_init_security, struct kernfs_node *kn_dir,</div><div class='ctx'> 	 struct kernfs_node *kn)</div><div class='ctx'> LSM_HOOK(int, 0, file_permission, struct file *file, int mask)</div><div class='hunk'>@@ -203,7 +211,7 @@ LSM_HOOK(int, 0, file_open, struct file *file)</div><div class='ctx'> LSM_HOOK(int, 0, file_post_open, struct file *file, int mask)</div><div class='ctx'> LSM_HOOK(int, 0, file_truncate, struct file *file)</div><div class='ctx'> LSM_HOOK(int, 0, task_alloc, struct task_struct *task,</div><div class='del'>-	 unsigned long clone_flags)</div><div class='add'>+	 u64 clone_flags)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, task_free, struct task_struct *task)</div><div class='ctx'> LSM_HOOK(int, 0, cred_alloc_blank, struct cred *cred, gfp_t gfp)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, cred_free, struct cred *cred)</div><div class='hunk'>@@ -212,6 +220,8 @@ LSM_HOOK(int, 0, cred_prepare, struct cred *new, const struct cred *old,</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, cred_transfer, struct cred *new,</div><div class='ctx'> 	 const struct cred *old)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, cred_getsecid, const struct cred *c, u32 *secid)</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, cred_getlsmprop, const struct cred *c,</div><div class='add'>+	 struct lsm_prop *prop)</div><div class='ctx'> LSM_HOOK(int, 0, kernel_act_as, struct cred *new, u32 secid)</div><div class='ctx'> LSM_HOOK(int, 0, kernel_create_files_as, struct cred *new, struct inode *inode)</div><div class='ctx'> LSM_HOOK(int, 0, kernel_module_request, char *kmod_name)</div><div class='hunk'>@@ -230,9 +240,9 @@ LSM_HOOK(int, 0, task_fix_setgroups, struct cred *new, const struct cred * old)</div><div class='ctx'> LSM_HOOK(int, 0, task_setpgid, struct task_struct *p, pid_t pgid)</div><div class='ctx'> LSM_HOOK(int, 0, task_getpgid, struct task_struct *p)</div><div class='ctx'> LSM_HOOK(int, 0, task_getsid, struct task_struct *p)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, current_getsecid_subj, u32 *secid)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, task_getsecid_obj,</div><div class='del'>-	 struct task_struct *p, u32 *secid)</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, current_getlsmprop_subj, struct lsm_prop *prop)</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, task_getlsmprop_obj,</div><div class='add'>+	 struct task_struct *p, struct lsm_prop *prop)</div><div class='ctx'> LSM_HOOK(int, 0, task_setnice, struct task_struct *p, int nice)</div><div class='ctx'> LSM_HOOK(int, 0, task_setioprio, struct task_struct *p, int ioprio)</div><div class='ctx'> LSM_HOOK(int, 0, task_getioprio, struct task_struct *p)</div><div class='hunk'>@@ -251,8 +261,8 @@ LSM_HOOK(void, LSM_RET_VOID, task_to_inode, struct task_struct *p,</div><div class='ctx'> 	 struct inode *inode)</div><div class='ctx'> LSM_HOOK(int, 0, userns_create, const struct cred *cred)</div><div class='ctx'> LSM_HOOK(int, 0, ipc_permission, struct kern_ipc_perm *ipcp, short flag)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, ipc_getsecid, struct kern_ipc_perm *ipcp,</div><div class='del'>-	 u32 *secid)</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, ipc_getlsmprop, struct kern_ipc_perm *ipcp,</div><div class='add'>+	 struct lsm_prop *prop)</div><div class='ctx'> LSM_HOOK(int, 0, msg_msg_alloc_security, struct msg_msg *msg)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, msg_msg_free_security, struct msg_msg *msg)</div><div class='ctx'> LSM_HOOK(int, 0, msg_queue_alloc_security, struct kern_ipc_perm *perm)</div><div class='hunk'>@@ -280,22 +290,23 @@ LSM_HOOK(int, 0, netlink_send, struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, d_instantiate, struct dentry *dentry,</div><div class='ctx'> 	 struct inode *inode)</div><div class='ctx'> LSM_HOOK(int, -EOPNOTSUPP, getselfattr, unsigned int attr,</div><div class='del'>-	 struct lsm_ctx __user *ctx, size_t *size, u32 flags)</div><div class='add'>+	 struct lsm_ctx __user *ctx, u32 *size, u32 flags)</div><div class='ctx'> LSM_HOOK(int, -EOPNOTSUPP, setselfattr, unsigned int attr,</div><div class='del'>-	 struct lsm_ctx *ctx, size_t size, u32 flags)</div><div class='add'>+	 struct lsm_ctx *ctx, u32 size, u32 flags)</div><div class='ctx'> LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct *p, const char *name,</div><div class='ctx'> 	 char **value)</div><div class='ctx'> LSM_HOOK(int, -EINVAL, setprocattr, const char *name, void *value, size_t size)</div><div class='ctx'> LSM_HOOK(int, 0, ismaclabel, const char *name)</div><div class='del'>-LSM_HOOK(int, -EOPNOTSUPP, secid_to_secctx, u32 secid, char **secdata,</div><div class='del'>-	 u32 *seclen)</div><div class='add'>+LSM_HOOK(int, -EOPNOTSUPP, secid_to_secctx, u32 secid, struct lsm_context *cp)</div><div class='add'>+LSM_HOOK(int, -EOPNOTSUPP, lsmprop_to_secctx, struct lsm_prop *prop,</div><div class='add'>+	 struct lsm_context *cp)</div><div class='ctx'> LSM_HOOK(int, 0, secctx_to_secid, const char *secdata, u32 seclen, u32 *secid)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, release_secctx, char *secdata, u32 seclen)</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, release_secctx, struct lsm_context *cp)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, inode_invalidate_secctx, struct inode *inode)</div><div class='ctx'> LSM_HOOK(int, 0, inode_notifysecctx, struct inode *inode, void *ctx, u32 ctxlen)</div><div class='ctx'> LSM_HOOK(int, 0, inode_setsecctx, struct dentry *dentry, void *ctx, u32 ctxlen)</div><div class='del'>-LSM_HOOK(int, -EOPNOTSUPP, inode_getsecctx, struct inode *inode, void **ctx,</div><div class='del'>-	 u32 *ctxlen)</div><div class='add'>+LSM_HOOK(int, -EOPNOTSUPP, inode_getsecctx, struct inode *inode,</div><div class='add'>+	 struct lsm_context *cp)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SECURITY) &amp;&amp; defined(CONFIG_WATCH_QUEUE)</div><div class='ctx'> LSM_HOOK(int, 0, post_notification, const struct cred *w_cred,</div><div class='hunk'>@@ -351,8 +362,7 @@ LSM_HOOK(void, LSM_RET_VOID, secmark_refcount_inc, void)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, secmark_refcount_dec, void)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, req_classify_flow, const struct request_sock *req,</div><div class='ctx'> 	 struct flowi_common *flic)</div><div class='del'>-LSM_HOOK(int, 0, tun_dev_alloc_security, void **security)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, tun_dev_free_security, void *security)</div><div class='add'>+LSM_HOOK(int, 0, tun_dev_alloc_security, void *security)</div><div class='ctx'> LSM_HOOK(int, 0, tun_dev_create, void)</div><div class='ctx'> LSM_HOOK(int, 0, tun_dev_attach_queue, void *security)</div><div class='ctx'> LSM_HOOK(int, 0, tun_dev_attach, struct sock *sk, void *security)</div><div class='hunk'>@@ -372,8 +382,7 @@ LSM_HOOK(int, 0, mptcp_add_subflow, struct sock *sk, struct sock *ssk)</div><div class='ctx'> LSM_HOOK(int, 0, ib_pkey_access, void *sec, u64 subnet_prefix, u16 pkey)</div><div class='ctx'> LSM_HOOK(int, 0, ib_endport_manage_subnet, void *sec, const char *dev_name,</div><div class='ctx'> 	 u8 port_num)</div><div class='del'>-LSM_HOOK(int, 0, ib_alloc_security, void **sec)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, ib_free_security, void *sec)</div><div class='add'>+LSM_HOOK(int, 0, ib_alloc_security, void *sec)</div><div class='ctx'> #endif /* CONFIG_SECURITY_INFINIBAND */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SECURITY_NETWORK_XFRM</div><div class='hunk'>@@ -401,7 +410,6 @@ LSM_HOOK(int, 0, xfrm_decode_session, struct sk_buff *skb, u32 *secid,</div><div class='ctx'> #ifdef CONFIG_KEYS</div><div class='ctx'> LSM_HOOK(int, 0, key_alloc, struct key *key, const struct cred *cred,</div><div class='ctx'> 	 unsigned long flags)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, key_free, struct key *key)</div><div class='ctx'> LSM_HOOK(int, 0, key_permission, key_ref_t key_ref, const struct cred *cred,</div><div class='ctx'> 	 enum key_need_perm need_perm)</div><div class='ctx'> LSM_HOOK(int, 0, key_getsecurity, struct key *key, char **buffer)</div><div class='hunk'>@@ -412,24 +420,25 @@ LSM_HOOK(void, LSM_RET_VOID, key_post_create_or_update, struct key *keyring,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AUDIT</div><div class='ctx'> LSM_HOOK(int, 0, audit_rule_init, u32 field, u32 op, char *rulestr,</div><div class='del'>-	 void **lsmrule)</div><div class='add'>+	 void **lsmrule, gfp_t gfp)</div><div class='ctx'> LSM_HOOK(int, 0, audit_rule_known, struct audit_krule *krule)</div><div class='del'>-LSM_HOOK(int, 0, audit_rule_match, u32 secid, u32 field, u32 op, void *lsmrule)</div><div class='add'>+LSM_HOOK(int, 0, audit_rule_match, struct lsm_prop *prop, u32 field, u32 op,</div><div class='add'>+	 void *lsmrule)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, audit_rule_free, void *lsmrule)</div><div class='ctx'> #endif /* CONFIG_AUDIT */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BPF_SYSCALL</div><div class='del'>-LSM_HOOK(int, 0, bpf, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+LSM_HOOK(int, 0, bpf, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> LSM_HOOK(int, 0, bpf_map, struct bpf_map *map, fmode_t fmode)</div><div class='ctx'> LSM_HOOK(int, 0, bpf_prog, struct bpf_prog *prog)</div><div class='ctx'> LSM_HOOK(int, 0, bpf_map_create, struct bpf_map *map, union bpf_attr *attr,</div><div class='del'>-	 struct bpf_token *token)</div><div class='add'>+	 struct bpf_token *token, bool kernel)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, bpf_map_free, struct bpf_map *map)</div><div class='ctx'> LSM_HOOK(int, 0, bpf_prog_load, struct bpf_prog *prog, union bpf_attr *attr,</div><div class='del'>-	 struct bpf_token *token)</div><div class='add'>+	 struct bpf_token *token, bool kernel)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free, struct bpf_prog *prog)</div><div class='ctx'> LSM_HOOK(int, 0, bpf_token_create, struct bpf_token *token, union bpf_attr *attr,</div><div class='del'>-	 struct path *path)</div><div class='add'>+	 const struct path *path)</div><div class='ctx'> LSM_HOOK(void, LSM_RET_VOID, bpf_token_free, struct bpf_token *token)</div><div class='ctx'> LSM_HOOK(int, 0, bpf_token_cmd, const struct bpf_token *token, enum bpf_cmd cmd)</div><div class='ctx'> LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap)</div><div class='hunk'>@@ -438,9 +447,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap)</div><div class='ctx'> LSM_HOOK(int, 0, locked_down, enum lockdown_reason what)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PERF_EVENTS</div><div class='del'>-LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)</div><div class='add'>+LSM_HOOK(int, 0, perf_event_open, int type)</div><div class='ctx'> LSM_HOOK(int, 0, perf_event_alloc, struct perf_event *event)</div><div class='del'>-LSM_HOOK(void, LSM_RET_VOID, perf_event_free, struct perf_event *event)</div><div class='ctx'> LSM_HOOK(int, 0, perf_event_read, struct perf_event *event)</div><div class='ctx'> LSM_HOOK(int, 0, perf_event_write, struct perf_event *event)</div><div class='ctx'> #endif /* CONFIG_PERF_EVENTS */</div><div class='hunk'>@@ -449,4 +457,12 @@ LSM_HOOK(int, 0, perf_event_write, struct perf_event *event)</div><div class='ctx'> LSM_HOOK(int, 0, uring_override_creds, const struct cred *new)</div><div class='ctx'> LSM_HOOK(int, 0, uring_sqpoll, void)</div><div class='ctx'> LSM_HOOK(int, 0, uring_cmd, struct io_uring_cmd *ioucmd)</div><div class='add'>+LSM_HOOK(int, 0, uring_allowed, void)</div><div class='ctx'> #endif /* CONFIG_IO_URING */</div><div class='add'>+</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, initramfs_populated, void)</div><div class='add'>+</div><div class='add'>+LSM_HOOK(int, 0, bdev_alloc_security, struct block_device *bdev)</div><div class='add'>+LSM_HOOK(void, LSM_RET_VOID, bdev_free_security, struct block_device *bdev)</div><div class='add'>+LSM_HOOK(int, 0, bdev_setintegrity, struct block_device *bdev,</div><div class='add'>+	 enum lsm_integrity_type type, const void *value, size_t size)</div><div class='head'>diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h<br/>index a2ade0ffe9e7..b92008641242 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lsm_hooks.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lsm_hooks.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lsm_hooks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lsm_hooks.h</a></div><div class='hunk'>@@ -30,19 +30,47 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='add'>+#include &lt;linux/static_call.h&gt;</div><div class='add'>+#include &lt;linux/unroll.h&gt;</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='add'>+#include &lt;linux/lsm_count.h&gt;</div><div class='ctx'> </div><div class='ctx'> union security_list_options {</div><div class='ctx'> 	#define LSM_HOOK(RET, DEFAULT, NAME, ...) RET (*NAME)(__VA_ARGS__);</div><div class='ctx'> 	#include "lsm_hook_defs.h"</div><div class='ctx'> 	#undef LSM_HOOK</div><div class='add'>+	void *lsm_func_addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct security_hook_heads {</div><div class='del'>-	#define LSM_HOOK(RET, DEFAULT, NAME, ...) struct hlist_head NAME;</div><div class='del'>-	#include "lsm_hook_defs.h"</div><div class='del'>-	#undef LSM_HOOK</div><div class='add'>+/*</div><div class='add'>+ * @key: static call key as defined by STATIC_CALL_KEY</div><div class='add'>+ * @trampoline: static call trampoline as defined by STATIC_CALL_TRAMP</div><div class='add'>+ * @hl: The security_hook_list as initialized by the owning LSM.</div><div class='add'>+ * @active: Enabled when the static call has an LSM hook associated.</div><div class='add'>+ */</div><div class='add'>+struct lsm_static_call {</div><div class='add'>+	struct static_call_key *key;</div><div class='add'>+	void *trampoline;</div><div class='add'>+	struct security_hook_list *hl;</div><div class='add'>+	/* this needs to be true or false based on what the key defaults to */</div><div class='add'>+	struct static_key_false *active;</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Table of the static calls for each LSM hook.</div><div class='add'>+ * Once the LSMs are initialized, their callbacks will be copied to these</div><div class='add'>+ * tables such that the calls are filled backwards (from last to first).</div><div class='add'>+ * This way, we can jump directly to the first used static call, and execute</div><div class='add'>+ * all of them after. This essentially makes the entry point</div><div class='add'>+ * dynamic to adapt the number of static calls to the number of callbacks.</div><div class='add'>+ */</div><div class='add'>+struct lsm_static_calls_table {</div><div class='add'>+	#define LSM_HOOK(RET, DEFAULT, NAME, ...) \</div><div class='add'>+		struct lsm_static_call NAME[MAX_LSM_COUNT];</div><div class='add'>+	#include &lt;linux/lsm_hook_defs.h&gt;</div><div class='add'>+	#undef LSM_HOOK</div><div class='add'>+} __packed __randomize_layout;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct lsm_id - Identify a Linux Security Module.</div><div class='ctx'>  * @lsm: name of the LSM, must be approved by the LSM maintainers</div><div class='hunk'>@@ -51,53 +79,48 @@ struct security_hook_heads {</div><div class='ctx'>  * Contains the information that identifies the LSM.</div><div class='ctx'>  */</div><div class='ctx'> struct lsm_id {</div><div class='del'>-	const char	*name;</div><div class='del'>-	u64		id;</div><div class='add'>+	const char *name;</div><div class='add'>+	u64 id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Security module hook list structure.</div><div class='ctx'>  * For use with generic list macros for common operations.</div><div class='add'>+ *</div><div class='add'>+ * struct security_hook_list - Contents of a cacheable, mappable object.</div><div class='add'>+ * @scalls: The beginning of the array of static calls assigned to this hook.</div><div class='add'>+ * @hook: The callback for the hook.</div><div class='add'>+ * @lsm: The name of the lsm that owns this hook.</div><div class='ctx'>  */</div><div class='ctx'> struct security_hook_list {</div><div class='del'>-	struct hlist_node		list;</div><div class='del'>-	struct hlist_head		*head;</div><div class='del'>-	union security_list_options	hook;</div><div class='del'>-	const struct lsm_id		*lsmid;</div><div class='add'>+	struct lsm_static_call *scalls;</div><div class='add'>+	union security_list_options hook;</div><div class='add'>+	const struct lsm_id *lsmid;</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Security blob size or offset data.</div><div class='ctx'>  */</div><div class='ctx'> struct lsm_blob_sizes {</div><div class='del'>-	int	lbs_cred;</div><div class='del'>-	int	lbs_file;</div><div class='del'>-	int	lbs_inode;</div><div class='del'>-	int	lbs_superblock;</div><div class='del'>-	int	lbs_ipc;</div><div class='del'>-	int	lbs_msg_msg;</div><div class='del'>-	int	lbs_task;</div><div class='del'>-	int	lbs_xattr_count; /* number of xattr slots in new_xattrs array */</div><div class='add'>+	unsigned int lbs_cred;</div><div class='add'>+	unsigned int lbs_file;</div><div class='add'>+	unsigned int lbs_ib;</div><div class='add'>+	unsigned int lbs_inode;</div><div class='add'>+	unsigned int lbs_sock;</div><div class='add'>+	unsigned int lbs_superblock;</div><div class='add'>+	unsigned int lbs_ipc;</div><div class='add'>+	unsigned int lbs_key;</div><div class='add'>+	unsigned int lbs_msg_msg;</div><div class='add'>+	unsigned int lbs_perf_event;</div><div class='add'>+	unsigned int lbs_task;</div><div class='add'>+	unsigned int lbs_xattr_count; /* num xattr slots in new_xattrs array */</div><div class='add'>+	unsigned int lbs_tun_dev;</div><div class='add'>+	unsigned int lbs_bdev;</div><div class='add'>+	unsigned int lbs_bpf_map;</div><div class='add'>+	unsigned int lbs_bpf_prog;</div><div class='add'>+	unsigned int lbs_bpf_token;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * lsm_get_xattr_slot - Return the next available slot and increment the index</div><div class='del'>- * @xattrs: array storing LSM-provided xattrs</div><div class='del'>- * @xattr_count: number of already stored xattrs (updated)</div><div class='del'>- *</div><div class='del'>- * Retrieve the first available slot in the @xattrs array to fill with an xattr,</div><div class='del'>- * and increment @xattr_count.</div><div class='del'>- *</div><div class='del'>- * Return: The slot to fill in @xattrs if non-NULL, NULL otherwise.</div><div class='del'>- */</div><div class='del'>-static inline struct xattr *lsm_get_xattr_slot(struct xattr *xattrs,</div><div class='del'>-					       int *xattr_count)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(!xattrs))</div><div class='del'>-		return NULL;</div><div class='del'>-	return &amp;xattrs[(*xattr_count)++];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * LSM_RET_VOID is used as the default value in LSM_HOOK definitions for void</div><div class='ctx'>  * LSM hooks (in include/linux/lsm_hook_defs.h).</div><div class='hunk'>@@ -110,11 +133,11 @@ static inline struct xattr *lsm_get_xattr_slot(struct xattr *xattrs,</div><div class='ctx'>  * care of the common case and reduces the amount of</div><div class='ctx'>  * text involved.</div><div class='ctx'>  */</div><div class='del'>-#define LSM_HOOK_INIT(HEAD, HOOK) \</div><div class='del'>-	{ .head = &amp;security_hook_heads.HEAD, .hook = { .HEAD = HOOK } }</div><div class='del'>-</div><div class='del'>-extern struct security_hook_heads security_hook_heads;</div><div class='del'>-extern char *lsm_names;</div><div class='add'>+#define LSM_HOOK_INIT(NAME, HOOK)			\</div><div class='add'>+	{						\</div><div class='add'>+		.scalls = static_calls_table.NAME,	\</div><div class='add'>+		.hook = { .NAME = HOOK }		\</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> extern void security_add_hooks(struct security_hook_list *hooks, int count,</div><div class='ctx'> 			       const struct lsm_id *lsmid);</div><div class='hunk'>@@ -128,18 +151,38 @@ enum lsm_order {</div><div class='ctx'> 	LSM_ORDER_LAST = 1,	/* This is only for integrity. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct lsm_info - Define an individual LSM for the LSM framework.</div><div class='add'>+ * @id: LSM name/ID info</div><div class='add'>+ * @order: ordering with respect to other LSMs, optional</div><div class='add'>+ * @flags: descriptive flags, optional</div><div class='add'>+ * @blobs: LSM blob sharing, optional</div><div class='add'>+ * @enabled: controlled by CONFIG_LSM, optional</div><div class='add'>+ * @init: LSM specific initialization routine</div><div class='add'>+ * @initcall_pure: LSM callback for initcall_pure() setup, optional</div><div class='add'>+ * @initcall_early: LSM callback for early_initcall setup, optional</div><div class='add'>+ * @initcall_core: LSM callback for core_initcall() setup, optional</div><div class='add'>+ * @initcall_subsys: LSM callback for subsys_initcall() setup, optional</div><div class='add'>+ * @initcall_fs: LSM callback for fs_initcall setup, optional</div><div class='add'>+ * @nitcall_device: LSM callback for device_initcall() setup, optional</div><div class='add'>+ * @initcall_late: LSM callback for late_initcall() setup, optional</div><div class='add'>+ */</div><div class='ctx'> struct lsm_info {</div><div class='del'>-	const char *name;	/* Required. */</div><div class='del'>-	enum lsm_order order;	/* Optional: default is LSM_ORDER_MUTABLE */</div><div class='del'>-	unsigned long flags;	/* Optional: flags describing LSM */</div><div class='del'>-	int *enabled;		/* Optional: controlled by CONFIG_LSM */</div><div class='del'>-	int (*init)(void);	/* Required. */</div><div class='del'>-	struct lsm_blob_sizes *blobs; /* Optional: for blob sharing. */</div><div class='add'>+	const struct lsm_id *id;</div><div class='add'>+	enum lsm_order order;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct lsm_blob_sizes *blobs;</div><div class='add'>+	int *enabled;</div><div class='add'>+	int (*init)(void);</div><div class='add'>+	int (*initcall_pure)(void);</div><div class='add'>+	int (*initcall_early)(void);</div><div class='add'>+	int (*initcall_core)(void);</div><div class='add'>+	int (*initcall_subsys)(void);</div><div class='add'>+	int (*initcall_fs)(void);</div><div class='add'>+	int (*initcall_device)(void);</div><div class='add'>+	int (*initcall_late)(void);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct lsm_info __start_lsm_info[], __end_lsm_info[];</div><div class='del'>-extern struct lsm_info __start_early_lsm_info[], __end_early_lsm_info[];</div><div class='del'>-</div><div class='ctx'> #define DEFINE_LSM(lsm)							\</div><div class='ctx'> 	static struct lsm_info __lsm_##lsm				\</div><div class='ctx'> 		__used __section(".lsm_info.init")			\</div><div class='hunk'>@@ -150,6 +193,26 @@ extern struct lsm_info __start_early_lsm_info[], __end_early_lsm_info[];</div><div class='ctx'> 		__used __section(".early_lsm_info.init")		\</div><div class='ctx'> 		__aligned(sizeof(unsigned long))</div><div class='ctx'> </div><div class='del'>-extern int lsm_inode_alloc(struct inode *inode);</div><div class='add'>+</div><div class='add'>+/* DO NOT tamper with these variables outside of the LSM framework */</div><div class='add'>+extern struct lsm_static_calls_table static_calls_table __ro_after_init;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lsm_get_xattr_slot - Return the next available slot and increment the index</div><div class='add'>+ * @xattrs: array storing LSM-provided xattrs</div><div class='add'>+ * @xattr_count: number of already stored xattrs (updated)</div><div class='add'>+ *</div><div class='add'>+ * Retrieve the first available slot in the @xattrs array to fill with an xattr,</div><div class='add'>+ * and increment @xattr_count.</div><div class='add'>+ *</div><div class='add'>+ * Return: The slot to fill in @xattrs if non-NULL, NULL otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline struct xattr *lsm_get_xattr_slot(struct xattr *xattrs,</div><div class='add'>+					       int *xattr_count)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!xattrs))</div><div class='add'>+		return NULL;</div><div class='add'>+	return &amp;xattrs[(*xattr_count)++];</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* ! __LINUX_LSM_HOOKS_H */</div><div class='head'>diff --git a/include/linux/lz4.h b/include/linux/lz4.h<br/>index b16e15b9587a..ad6042a718b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lz4.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lz4.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lz4.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lz4.h</a></div><div class='hunk'>@@ -645,4 +645,10 @@ int LZ4_decompress_safe_usingDict(const char *source, char *dest,</div><div class='ctx'> int LZ4_decompress_fast_usingDict(const char *source, char *dest,</div><div class='ctx'> 	int originalSize, const char *dictStart, int dictSize);</div><div class='ctx'> </div><div class='add'>+#define LZ4_DECOMPRESS_INPLACE_MARGIN(compressedSize)          (((compressedSize) &gt;&gt; 8) + 32)</div><div class='add'>+</div><div class='add'>+#ifndef LZ4_DISTANCE_MAX	/* history window size; can be user-defined at compile time */</div><div class='add'>+#define LZ4_DISTANCE_MAX 65535	/* set to maximum value by default */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/lzo.h b/include/linux/lzo.h<br/>index e95c7d1092b2..4d30e3624acd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/lzo.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/lzo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/lzo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/lzo.h</a></div><div class='hunk'>@@ -24,10 +24,18 @@</div><div class='ctx'> int lzo1x_1_compress(const unsigned char *src, size_t src_len,</div><div class='ctx'> 		     unsigned char *dst, size_t *dst_len, void *wrkmem);</div><div class='ctx'> </div><div class='add'>+/* Same as above but does not write more than dst_len to dst. */</div><div class='add'>+int lzo1x_1_compress_safe(const unsigned char *src, size_t src_len,</div><div class='add'>+			  unsigned char *dst, size_t *dst_len, void *wrkmem);</div><div class='add'>+</div><div class='ctx'> /* This requires 'wrkmem' of size LZO1X_1_MEM_COMPRESS */</div><div class='ctx'> int lzorle1x_1_compress(const unsigned char *src, size_t src_len,</div><div class='ctx'> 		     unsigned char *dst, size_t *dst_len, void *wrkmem);</div><div class='ctx'> </div><div class='add'>+/* Same as above but does not write more than dst_len to dst. */</div><div class='add'>+int lzorle1x_1_compress_safe(const unsigned char *src, size_t src_len,</div><div class='add'>+			     unsigned char *dst, size_t *dst_len, void *wrkmem);</div><div class='add'>+</div><div class='ctx'> /* safe decompression with overrun testing */</div><div class='ctx'> int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,</div><div class='ctx'> 			  unsigned char *dst, size_t *dst_len);</div><div class='head'>diff --git a/include/linux/mailbox/exynos-message.h b/include/linux/mailbox/exynos-message.h<br/>new file mode 100644<br/>index 000000000000..5a9ed5ce2046<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox/exynos-message.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mailbox/exynos-message.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Exynos mailbox message.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2024 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_EXYNOS_MESSAGE_H_</div><div class='add'>+#define _LINUX_EXYNOS_MESSAGE_H_</div><div class='add'>+</div><div class='add'>+#define EXYNOS_MBOX_CHAN_TYPE_DOORBELL		0</div><div class='add'>+#define EXYNOS_MBOX_CHAN_TYPE_DATA		1</div><div class='add'>+</div><div class='add'>+struct exynos_mbox_msg {</div><div class='add'>+	unsigned int chan_id;</div><div class='add'>+	unsigned int chan_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_EXYNOS_MESSAGE_H_ */</div><div class='head'>diff --git a/include/linux/mailbox/mchp-ipc.h b/include/linux/mailbox/mchp-ipc.h<br/>new file mode 100644<br/>index 000000000000..f084ac9e291b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox/mchp-ipc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mailbox/mchp-ipc.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ *Copyright (c) 2024 Microchip Technology Inc. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_MCHP_IPC_H_</div><div class='add'>+#define _LINUX_MCHP_IPC_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mailbox_controller.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct mchp_ipc_msg {</div><div class='add'>+	u32 *buf;</div><div class='add'>+	u16 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mchp_ipc_sbi_chan {</div><div class='add'>+	void *buf_base_tx;</div><div class='add'>+	void *buf_base_rx;</div><div class='add'>+	void *msg_buf_tx;</div><div class='add'>+	void *msg_buf_rx;</div><div class='add'>+	phys_addr_t buf_base_tx_addr;</div><div class='add'>+	phys_addr_t buf_base_rx_addr;</div><div class='add'>+	phys_addr_t msg_buf_tx_addr;</div><div class='add'>+	phys_addr_t msg_buf_rx_addr;</div><div class='add'>+	int chan_aggregated_irq;</div><div class='add'>+	int mp_irq;</div><div class='add'>+	int mc_irq;</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 max_msg_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_MCHP_IPC_H_ */</div><div class='head'>diff --git a/include/linux/mailbox/mtk-cmdq-mailbox.h b/include/linux/mailbox/mtk-cmdq-mailbox.h<br/>index a8f0070c7aa9..e1555e06e7e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox/mtk-cmdq-mailbox.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox/mtk-cmdq-mailbox.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox/mtk-cmdq-mailbox.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mailbox/mtk-cmdq-mailbox.h</a></div><div class='hunk'>@@ -75,9 +75,18 @@ struct cmdq_pkt {</div><div class='ctx'> 	dma_addr_t		pa_base;</div><div class='ctx'> 	size_t			cmd_buf_size; /* command occupied size */</div><div class='ctx'> 	size_t			buf_size; /* real buffer size */</div><div class='del'>-	void			*cl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * cmdq_get_shift_pa() - get the shift bits of physical address</div><div class='add'>+ * @chan: mailbox channel</div><div class='add'>+ *</div><div class='add'>+ * GCE can only fetch the command buffer address from a 32-bit register.</div><div class='add'>+ * Some SOCs support more than 32-bit command buffer address for GCE, which</div><div class='add'>+ * requires some shift bits to make the address fit into the 32-bit register.</div><div class='add'>+ *</div><div class='add'>+ * Return: the shift bits of physical address</div><div class='add'>+ */</div><div class='ctx'> u8 cmdq_get_shift_pa(struct mbox_chan *chan);</div><div class='ctx'> </div><div class='ctx'> #endif /* __MTK_CMDQ_MAILBOX_H__ */</div><div class='head'>diff --git a/include/linux/mailbox/riscv-rpmi-message.h b/include/linux/mailbox/riscv-rpmi-message.h<br/>new file mode 100644<br/>index 000000000000..e135c6564d0c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox/riscv-rpmi-message.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mailbox/riscv-rpmi-message.h</a></div><div class='hunk'>@@ -0,0 +1,243 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2025 Ventana Micro Systems Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_RISCV_RPMI_MESSAGE_H_</div><div class='add'>+#define _LINUX_RISCV_RPMI_MESSAGE_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/mailbox_client.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/wordpart.h&gt;</div><div class='add'>+</div><div class='add'>+/* RPMI version encode/decode macros */</div><div class='add'>+#define RPMI_VER_MAJOR(__ver)		upper_16_bits(__ver)</div><div class='add'>+#define RPMI_VER_MINOR(__ver)		lower_16_bits(__ver)</div><div class='add'>+#define RPMI_MKVER(__maj, __min)	(((u32)(__maj) &lt;&lt; 16) | (u16)(__min))</div><div class='add'>+</div><div class='add'>+/* RPMI message header */</div><div class='add'>+struct rpmi_message_header {</div><div class='add'>+	__le16 servicegroup_id;</div><div class='add'>+	u8 service_id;</div><div class='add'>+	u8 flags;</div><div class='add'>+	__le16 datalen;</div><div class='add'>+	__le16 token;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RPMI message */</div><div class='add'>+struct rpmi_message {</div><div class='add'>+	struct rpmi_message_header header;</div><div class='add'>+	u8 data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RPMI notification event */</div><div class='add'>+struct rpmi_notification_event {</div><div class='add'>+	__le16 event_datalen;</div><div class='add'>+	u8 event_id;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	u8 event_data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RPMI error codes */</div><div class='add'>+enum rpmi_error_codes {</div><div class='add'>+	RPMI_SUCCESS			= 0,</div><div class='add'>+	RPMI_ERR_FAILED			= -1,</div><div class='add'>+	RPMI_ERR_NOTSUPP		= -2,</div><div class='add'>+	RPMI_ERR_INVALID_PARAM		= -3,</div><div class='add'>+	RPMI_ERR_DENIED			= -4,</div><div class='add'>+	RPMI_ERR_INVALID_ADDR		= -5,</div><div class='add'>+	RPMI_ERR_ALREADY		= -6,</div><div class='add'>+	RPMI_ERR_EXTENSION		= -7,</div><div class='add'>+	RPMI_ERR_HW_FAULT		= -8,</div><div class='add'>+	RPMI_ERR_BUSY			= -9,</div><div class='add'>+	RPMI_ERR_INVALID_STATE		= -10,</div><div class='add'>+	RPMI_ERR_BAD_RANGE		= -11,</div><div class='add'>+	RPMI_ERR_TIMEOUT		= -12,</div><div class='add'>+	RPMI_ERR_IO			= -13,</div><div class='add'>+	RPMI_ERR_NO_DATA		= -14,</div><div class='add'>+	RPMI_ERR_RESERVED_START		= -15,</div><div class='add'>+	RPMI_ERR_RESERVED_END		= -127,</div><div class='add'>+	RPMI_ERR_VENDOR_START		= -128,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int rpmi_to_linux_error(int rpmi_error)</div><div class='add'>+{</div><div class='add'>+	switch (rpmi_error) {</div><div class='add'>+	case RPMI_SUCCESS:</div><div class='add'>+		return 0;</div><div class='add'>+	case RPMI_ERR_INVALID_PARAM:</div><div class='add'>+	case RPMI_ERR_BAD_RANGE:</div><div class='add'>+	case RPMI_ERR_INVALID_STATE:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case RPMI_ERR_DENIED:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	case RPMI_ERR_INVALID_ADDR:</div><div class='add'>+	case RPMI_ERR_HW_FAULT:</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	case RPMI_ERR_ALREADY:</div><div class='add'>+		return -EALREADY;</div><div class='add'>+	case RPMI_ERR_BUSY:</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	case RPMI_ERR_TIMEOUT:</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	case RPMI_ERR_IO:</div><div class='add'>+		return -ECOMM;</div><div class='add'>+	case RPMI_ERR_FAILED:</div><div class='add'>+	case RPMI_ERR_NOTSUPP:</div><div class='add'>+	case RPMI_ERR_NO_DATA:</div><div class='add'>+	case RPMI_ERR_EXTENSION:</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RPMI service group IDs */</div><div class='add'>+#define RPMI_SRVGRP_SYSTEM_MSI		0x00002</div><div class='add'>+#define RPMI_SRVGRP_CLOCK		0x00008</div><div class='add'>+</div><div class='add'>+/* RPMI clock service IDs */</div><div class='add'>+enum rpmi_clock_service_id {</div><div class='add'>+	RPMI_CLK_SRV_ENABLE_NOTIFICATION = 0x01,</div><div class='add'>+	RPMI_CLK_SRV_GET_NUM_CLOCKS = 0x02,</div><div class='add'>+	RPMI_CLK_SRV_GET_ATTRIBUTES = 0x03,</div><div class='add'>+	RPMI_CLK_SRV_GET_SUPPORTED_RATES = 0x04,</div><div class='add'>+	RPMI_CLK_SRV_SET_CONFIG = 0x05,</div><div class='add'>+	RPMI_CLK_SRV_GET_CONFIG = 0x06,</div><div class='add'>+	RPMI_CLK_SRV_SET_RATE = 0x07,</div><div class='add'>+	RPMI_CLK_SRV_GET_RATE = 0x08,</div><div class='add'>+	RPMI_CLK_SRV_ID_MAX_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RPMI system MSI service IDs */</div><div class='add'>+enum rpmi_sysmsi_service_id {</div><div class='add'>+	RPMI_SYSMSI_SRV_ENABLE_NOTIFICATION = 0x01,</div><div class='add'>+	RPMI_SYSMSI_SRV_GET_ATTRIBUTES = 0x02,</div><div class='add'>+	RPMI_SYSMSI_SRV_GET_MSI_ATTRIBUTES = 0x03,</div><div class='add'>+	RPMI_SYSMSI_SRV_SET_MSI_STATE = 0x04,</div><div class='add'>+	RPMI_SYSMSI_SRV_GET_MSI_STATE = 0x05,</div><div class='add'>+	RPMI_SYSMSI_SRV_SET_MSI_TARGET = 0x06,</div><div class='add'>+	RPMI_SYSMSI_SRV_GET_MSI_TARGET = 0x07,</div><div class='add'>+	RPMI_SYSMSI_SRV_ID_MAX_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RPMI Linux mailbox attribute IDs */</div><div class='add'>+enum rpmi_mbox_attribute_id {</div><div class='add'>+	RPMI_MBOX_ATTR_SPEC_VERSION,</div><div class='add'>+	RPMI_MBOX_ATTR_MAX_MSG_DATA_SIZE,</div><div class='add'>+	RPMI_MBOX_ATTR_SERVICEGROUP_ID,</div><div class='add'>+	RPMI_MBOX_ATTR_SERVICEGROUP_VERSION,</div><div class='add'>+	RPMI_MBOX_ATTR_IMPL_ID,</div><div class='add'>+	RPMI_MBOX_ATTR_IMPL_VERSION,</div><div class='add'>+	RPMI_MBOX_ATTR_MAX_ID</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RPMI Linux mailbox message types */</div><div class='add'>+enum rpmi_mbox_message_type {</div><div class='add'>+	RPMI_MBOX_MSG_TYPE_GET_ATTRIBUTE,</div><div class='add'>+	RPMI_MBOX_MSG_TYPE_SET_ATTRIBUTE,</div><div class='add'>+	RPMI_MBOX_MSG_TYPE_SEND_WITH_RESPONSE,</div><div class='add'>+	RPMI_MBOX_MSG_TYPE_SEND_WITHOUT_RESPONSE,</div><div class='add'>+	RPMI_MBOX_MSG_TYPE_NOTIFICATION_EVENT,</div><div class='add'>+	RPMI_MBOX_MSG_MAX_TYPE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RPMI Linux mailbox message instance */</div><div class='add'>+struct rpmi_mbox_message {</div><div class='add'>+	enum rpmi_mbox_message_type type;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			enum rpmi_mbox_attribute_id id;</div><div class='add'>+			u32 value;</div><div class='add'>+		} attr;</div><div class='add'>+</div><div class='add'>+		struct {</div><div class='add'>+			u32 service_id;</div><div class='add'>+			void *request;</div><div class='add'>+			unsigned long request_len;</div><div class='add'>+			void *response;</div><div class='add'>+			unsigned long max_response_len;</div><div class='add'>+			unsigned long out_response_len;</div><div class='add'>+		} data;</div><div class='add'>+</div><div class='add'>+		struct {</div><div class='add'>+			u16 event_datalen;</div><div class='add'>+			u8 event_id;</div><div class='add'>+			u8 *event_data;</div><div class='add'>+		} notif;</div><div class='add'>+	};</div><div class='add'>+	int error;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RPMI Linux mailbox message helper routines */</div><div class='add'>+static inline void rpmi_mbox_init_get_attribute(struct rpmi_mbox_message *msg,</div><div class='add'>+						enum rpmi_mbox_attribute_id id)</div><div class='add'>+{</div><div class='add'>+	msg-&gt;type = RPMI_MBOX_MSG_TYPE_GET_ATTRIBUTE;</div><div class='add'>+	msg-&gt;attr.id = id;</div><div class='add'>+	msg-&gt;attr.value = 0;</div><div class='add'>+	msg-&gt;error = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rpmi_mbox_init_set_attribute(struct rpmi_mbox_message *msg,</div><div class='add'>+						enum rpmi_mbox_attribute_id id,</div><div class='add'>+						u32 value)</div><div class='add'>+{</div><div class='add'>+	msg-&gt;type = RPMI_MBOX_MSG_TYPE_SET_ATTRIBUTE;</div><div class='add'>+	msg-&gt;attr.id = id;</div><div class='add'>+	msg-&gt;attr.value = value;</div><div class='add'>+	msg-&gt;error = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rpmi_mbox_init_send_with_response(struct rpmi_mbox_message *msg,</div><div class='add'>+						     u32 service_id,</div><div class='add'>+						     void *request,</div><div class='add'>+						     unsigned long request_len,</div><div class='add'>+						     void *response,</div><div class='add'>+						     unsigned long max_response_len)</div><div class='add'>+{</div><div class='add'>+	msg-&gt;type = RPMI_MBOX_MSG_TYPE_SEND_WITH_RESPONSE;</div><div class='add'>+	msg-&gt;data.service_id = service_id;</div><div class='add'>+	msg-&gt;data.request = request;</div><div class='add'>+	msg-&gt;data.request_len = request_len;</div><div class='add'>+	msg-&gt;data.response = response;</div><div class='add'>+	msg-&gt;data.max_response_len = max_response_len;</div><div class='add'>+	msg-&gt;data.out_response_len = 0;</div><div class='add'>+	msg-&gt;error = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rpmi_mbox_init_send_without_response(struct rpmi_mbox_message *msg,</div><div class='add'>+							u32 service_id,</div><div class='add'>+							void *request,</div><div class='add'>+							unsigned long request_len)</div><div class='add'>+{</div><div class='add'>+	msg-&gt;type = RPMI_MBOX_MSG_TYPE_SEND_WITHOUT_RESPONSE;</div><div class='add'>+	msg-&gt;data.service_id = service_id;</div><div class='add'>+	msg-&gt;data.request = request;</div><div class='add'>+	msg-&gt;data.request_len = request_len;</div><div class='add'>+	msg-&gt;data.response = NULL;</div><div class='add'>+	msg-&gt;data.max_response_len = 0;</div><div class='add'>+	msg-&gt;data.out_response_len = 0;</div><div class='add'>+	msg-&gt;error = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *rpmi_mbox_get_msg_response(struct rpmi_mbox_message *msg)</div><div class='add'>+{</div><div class='add'>+	return msg ? msg-&gt;data.response : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rpmi_mbox_send_message(struct mbox_chan *chan,</div><div class='add'>+					 struct rpmi_mbox_message *msg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Send message for the underlying mailbox channel */</div><div class='add'>+	ret = mbox_send_message(chan, msg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Explicitly signal txdone for mailbox channel */</div><div class='add'>+	ret = msg-&gt;error;</div><div class='add'>+	mbox_client_txdone(chan, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_RISCV_RPMI_MESSAGE_H_ */</div><div class='head'>diff --git a/include/linux/mailbox_client.h b/include/linux/mailbox_client.h<br/>index 734694912ef7..c6eea9afb943 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox_client.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox_client.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox_client.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mailbox_client.h</a></div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'> #ifndef __MAILBOX_CLIENT_H</div><div class='ctx'> #define __MAILBOX_CLIENT_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mbox_chan;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mailbox_controller.h b/include/linux/mailbox_controller.h<br/>index 6fee33cb52f5..80a427c7ca29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox_controller.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mailbox_controller.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mailbox_controller.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mailbox_controller.h</a></div><div class='hunk'>@@ -3,11 +3,11 @@</div><div class='ctx'> #ifndef __MAILBOX_CONTROLLER_H</div><div class='ctx'> #define __MAILBOX_CONTROLLER_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/hrtimer.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/completion.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mbox_chan;</div><div class='ctx'> </div><div class='hunk'>@@ -66,6 +66,7 @@ struct mbox_chan_ops {</div><div class='ctx'>  *			no interrupt rises. Ignored if 'txdone_irq' is set.</div><div class='ctx'>  * @txpoll_period:	If 'txdone_poll' is in effect, the API polls for</div><div class='ctx'>  *			last TX's status after these many millisecs</div><div class='add'>+ * @fw_xlate:		Controller driver specific mapping of channel via fwnode</div><div class='ctx'>  * @of_xlate:		Controller driver specific mapping of channel via DT</div><div class='ctx'>  * @poll_hrt:		API private. hrtimer used to poll for TXDONE on all</div><div class='ctx'>  *			channels.</div><div class='hunk'>@@ -79,6 +80,8 @@ struct mbox_controller {</div><div class='ctx'> 	bool txdone_irq;</div><div class='ctx'> 	bool txdone_poll;</div><div class='ctx'> 	unsigned txpoll_period;</div><div class='add'>+	struct mbox_chan *(*fw_xlate)(struct mbox_controller *mbox,</div><div class='add'>+				      const struct fwnode_reference_args *sp);</div><div class='ctx'> 	struct mbox_chan *(*of_xlate)(struct mbox_controller *mbox,</div><div class='ctx'> 				      const struct of_phandle_args *sp);</div><div class='ctx'> 	/* Internal to API */</div><div class='hunk'>@@ -134,7 +137,4 @@ void mbox_chan_txdone(struct mbox_chan *chan, int r); /* atomic */</div><div class='ctx'> </div><div class='ctx'> int devm_mbox_controller_register(struct device *dev,</div><div class='ctx'> 				  struct mbox_controller *mbox);</div><div class='del'>-void devm_mbox_controller_unregister(struct device *dev,</div><div class='del'>-				     struct mbox_controller *mbox);</div><div class='del'>-</div><div class='ctx'> #endif /* __MAILBOX_CONTROLLER_H */</div><div class='head'>diff --git a/include/linux/maple.h b/include/linux/maple.h<br/>index 9aae44efcfd4..3be4e567473c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/maple.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/maple.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/maple.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/maple.h</a></div><div class='hunk'>@@ -97,7 +97,7 @@ int maple_add_packet(struct maple_device *mdev, u32 function,</div><div class='ctx'> void maple_clear_dev(struct maple_device *mdev);</div><div class='ctx'> </div><div class='ctx'> #define to_maple_dev(n) container_of(n, struct maple_device, dev)</div><div class='del'>-#define to_maple_driver(n) container_of(n, struct maple_driver, drv)</div><div class='add'>+#define to_maple_driver(n) container_of_const(n, struct maple_driver, drv)</div><div class='ctx'> </div><div class='ctx'> #define maple_get_drvdata(d)		dev_get_drvdata(&amp;(d)-&gt;dev)</div><div class='ctx'> #define maple_set_drvdata(d,p)		dev_set_drvdata(&amp;(d)-&gt;dev, (p))</div><div class='head'>diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h<br/>index a53ad4dabd7e..66f98a3da8d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/maple_tree.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/maple_tree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/maple_tree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/maple_tree.h</a></div><div class='hunk'>@@ -52,22 +52,22 @@</div><div class='ctx'>  * bit in the node type.  This is possible by using bit 1 to indicate if bit 2</div><div class='ctx'>  * is part of the type or the slot.</div><div class='ctx'>  *</div><div class='del'>- * Once the type is decided, the decision of an allocation range type or a range</div><div class='del'>- * type is done by examining the immutable tree flag for the MAPLE_ALLOC_RANGE</div><div class='del'>- * flag.</div><div class='add'>+ * Once the type is decided, the decision of an allocation range type or a</div><div class='add'>+ * range type is done by examining the immutable tree flag for the</div><div class='add'>+ * MT_FLAGS_ALLOC_RANGE flag.</div><div class='ctx'>  *</div><div class='ctx'>  *  Node types:</div><div class='del'>- *   0x??1 = Root</div><div class='del'>- *   0x?00 = 16 bit nodes</div><div class='del'>- *   0x010 = 32 bit nodes</div><div class='del'>- *   0x110 = 64 bit nodes</div><div class='add'>+ *   0b??1 = Root</div><div class='add'>+ *   0b?00 = 16 bit nodes</div><div class='add'>+ *   0b010 = 32 bit nodes</div><div class='add'>+ *   0b110 = 64 bit nodes</div><div class='ctx'>  *</div><div class='ctx'>  *  Slot size and location in the parent pointer:</div><div class='ctx'>  *   type  : slot location</div><div class='del'>- *   0x??1 : Root</div><div class='del'>- *   0x?00 : 16 bit values, type in 0-1, slot in 2-6</div><div class='del'>- *   0x010 : 32 bit values, type in 0-2, slot in 3-6</div><div class='del'>- *   0x110 : 64 bit values, type in 0-2, slot in 3-6</div><div class='add'>+ *   0b??1 : Root</div><div class='add'>+ *   0b?00 : 16 bit values, type in 0-1, slot in 2-6</div><div class='add'>+ *   0b010 : 32 bit values, type in 0-2, slot in 3-6</div><div class='add'>+ *   0b110 : 64 bit values, type in 0-2, slot in 3-6</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -75,8 +75,8 @@</div><div class='ctx'>  * searching for gaps or any other code that needs to find the end of the data.</div><div class='ctx'>  */</div><div class='ctx'> struct maple_metadata {</div><div class='del'>-	unsigned char end;</div><div class='del'>-	unsigned char gap;</div><div class='add'>+	unsigned char end;	/* end of data */</div><div class='add'>+	unsigned char gap;	/* offset of largest gap */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -148,6 +148,18 @@ enum maple_type {</div><div class='ctx'> 	maple_arange_64,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum store_type {</div><div class='add'>+	wr_invalid,</div><div class='add'>+	wr_new_root,</div><div class='add'>+	wr_store_root,</div><div class='add'>+	wr_exact_fit,</div><div class='add'>+	wr_spanning_store,</div><div class='add'>+	wr_split_store,</div><div class='add'>+	wr_rebalance,</div><div class='add'>+	wr_append,</div><div class='add'>+	wr_node_store,</div><div class='add'>+	wr_slot_store,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DOC: Maple tree flags</div><div class='hunk'>@@ -182,7 +194,6 @@ enum maple_type {</div><div class='ctx'> #define MAPLE_RESERVED_RANGE	4096</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='del'>-typedef struct lockdep_map *lockdep_map_p;</div><div class='ctx'> #define mt_lock_is_held(mt)                                             \</div><div class='ctx'> 	(!(mt)-&gt;ma_external_lock || lock_is_held((mt)-&gt;ma_external_lock))</div><div class='ctx'> </div><div class='hunk'>@@ -195,7 +206,6 @@ typedef struct lockdep_map *lockdep_map_p;</div><div class='ctx'> </div><div class='ctx'> #define mt_on_stack(mt)			(mt).ma_external_lock = NULL</div><div class='ctx'> #else</div><div class='del'>-typedef struct { /* nothing */ } lockdep_map_p;</div><div class='ctx'> #define mt_lock_is_held(mt)		1</div><div class='ctx'> #define mt_write_lock_is_held(mt)	1</div><div class='ctx'> #define mt_set_external_lock(mt, lock)	do { } while (0)</div><div class='hunk'>@@ -212,14 +222,16 @@ typedef struct { /* nothing */ } lockdep_map_p;</div><div class='ctx'>  * (set at tree creation time) and dynamic information set under the spinlock.</div><div class='ctx'>  *</div><div class='ctx'>  * Another use of flags are to indicate global states of the tree.  This is the</div><div class='del'>- * case with the MAPLE_USE_RCU flag, which indicates the tree is currently in</div><div class='add'>+ * case with the MT_FLAGS_USE_RCU flag, which indicates the tree is currently in</div><div class='ctx'>  * RCU mode.  This mode was added to allow the tree to reuse nodes instead of</div><div class='ctx'>  * re-allocating and RCU freeing nodes when there is a single user.</div><div class='ctx'>  */</div><div class='ctx'> struct maple_tree {</div><div class='ctx'> 	union {</div><div class='del'>-		spinlock_t	ma_lock;</div><div class='del'>-		lockdep_map_p	ma_external_lock;</div><div class='add'>+		spinlock_t		ma_lock;</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+		struct lockdep_map	*ma_external_lock;</div><div class='add'>+#endif</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int	ma_flags;</div><div class='ctx'> 	void __rcu      *ma_root;</div><div class='hunk'>@@ -430,12 +442,15 @@ struct ma_state {</div><div class='ctx'> 	struct maple_enode *node;	/* The node containing this entry */</div><div class='ctx'> 	unsigned long min;		/* The minimum index of this node - implied pivot min */</div><div class='ctx'> 	unsigned long max;		/* The maximum index of this node - implied pivot max */</div><div class='del'>-	struct maple_alloc *alloc;	/* Allocated nodes for this operation */</div><div class='add'>+	struct slab_sheaf *sheaf;	/* Allocated nodes for this operation */</div><div class='add'>+	struct maple_node *alloc;	/* A single allocated node for fast path writes */</div><div class='add'>+	unsigned long node_request;	/* The number of nodes to allocate for this operation */</div><div class='ctx'> 	enum maple_status status;	/* The status of the state (active, start, none, etc) */</div><div class='ctx'> 	unsigned char depth;		/* depth of tree descent during write */</div><div class='ctx'> 	unsigned char offset;</div><div class='ctx'> 	unsigned char mas_flags;</div><div class='ctx'> 	unsigned char end;		/* The end of the node */</div><div class='add'>+	enum store_type store_type;	/* The type of store needed for this operation */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ma_wr_state {</div><div class='hunk'>@@ -450,6 +465,8 @@ struct ma_wr_state {</div><div class='ctx'> 	void __rcu **slots;		/* mas-&gt;node-&gt;slots pointer */</div><div class='ctx'> 	void *entry;			/* The entry to write */</div><div class='ctx'> 	void *content;			/* The existing entry that is being overwritten */</div><div class='add'>+	unsigned char vacant_height;	/* Height of lowest node with free space */</div><div class='add'>+	unsigned char sufficient_height;/* Height of lowest node with min sufficiency + 1 nodes */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define mas_lock(mas)           spin_lock(&amp;((mas)-&gt;tree-&gt;ma_lock))</div><div class='hunk'>@@ -466,6 +483,9 @@ struct ma_wr_state {</div><div class='ctx'> #define MA_ERROR(err) \</div><div class='ctx'> 		((struct maple_enode *)(((unsigned long)err &lt;&lt; 2) | 2UL))</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * When changing MA_STATE, remember to also change rust/kernel/maple_tree.rs</div><div class='add'>+ */</div><div class='ctx'> #define MA_STATE(name, mt, first, end)					\</div><div class='ctx'> 	struct ma_state name = {					\</div><div class='ctx'> 		.tree = mt,						\</div><div class='hunk'>@@ -475,8 +495,11 @@ struct ma_wr_state {</div><div class='ctx'> 		.status = ma_start,					\</div><div class='ctx'> 		.min = 0,						\</div><div class='ctx'> 		.max = ULONG_MAX,					\</div><div class='add'>+		.sheaf = NULL,						\</div><div class='ctx'> 		.alloc = NULL,						\</div><div class='add'>+		.node_request = 0,					\</div><div class='ctx'> 		.mas_flags = 0,						\</div><div class='add'>+		.store_type = wr_invalid,				\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define MA_WR_STATE(name, ma_state, wr_entry)				\</div><div class='hunk'>@@ -484,6 +507,8 @@ struct ma_wr_state {</div><div class='ctx'> 		.mas = ma_state,					\</div><div class='ctx'> 		.content = NULL,					\</div><div class='ctx'> 		.entry = wr_entry,					\</div><div class='add'>+		.vacant_height = 0,					\</div><div class='add'>+		.sufficient_height = 0					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define MA_TOPIARY(name, tree)						\</div><div class='hunk'>@@ -578,6 +603,20 @@ static __always_inline void mas_reset(struct ma_state *mas)</div><div class='ctx'> #define mas_for_each(__mas, __entry, __max) \</div><div class='ctx'> 	while (((__entry) = mas_find((__mas), (__max))) != NULL)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * mas_for_each_rev() - Iterate over a range of the maple tree in reverse order.</div><div class='add'>+ * @__mas: Maple Tree operation state (maple_state)</div><div class='add'>+ * @__entry: Entry retrieved from the tree</div><div class='add'>+ * @__min: minimum index to retrieve from the tree</div><div class='add'>+ *</div><div class='add'>+ * When returned, mas-&gt;index and mas-&gt;last will hold the entire range for the</div><div class='add'>+ * entry.</div><div class='add'>+ *</div><div class='add'>+ * Note: may return the zero entry.</div><div class='add'>+ */</div><div class='add'>+#define mas_for_each_rev(__mas, __entry, __min) \</div><div class='add'>+	while (((__entry) = mas_find_rev((__mas), (__min))) != NULL)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_DEBUG_MAPLE_TREE</div><div class='ctx'> enum mt_dump_format {</div><div class='ctx'> 	mt_dump_dec,</div><div class='head'>diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h<br/>index 693eba9869e4..b1fbe4118414 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/marvell_phy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/marvell_phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/marvell_phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/marvell_phy.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Known PHY IDs */</div><div class='ctx'> #define MARVELL_PHY_ID_88E1101		0x01410c60</div><div class='add'>+#define MARVELL_PHY_ID_88E3082		0x01410c80</div><div class='ctx'> #define MARVELL_PHY_ID_88E1112		0x01410c90</div><div class='ctx'> #define MARVELL_PHY_ID_88E1111		0x01410cc0</div><div class='ctx'> #define MARVELL_PHY_ID_88E1118		0x01410e10</div><div class='hunk'>@@ -31,6 +32,8 @@</div><div class='ctx'> /* Marvel 88E1111 in Finisar SFP module with modified PHY ID */</div><div class='ctx'> #define MARVELL_PHY_ID_88E1111_FINISAR	0x01ff0cc0</div><div class='ctx'> </div><div class='add'>+/* ID from 88E6020, assumed to be the same for the whole 6250 family */</div><div class='add'>+#define MARVELL_PHY_ID_88E6250_FAMILY	0x01410db0</div><div class='ctx'> /* These Ethernet switch families contain embedded PHYs, but they do</div><div class='ctx'>  * not have a model ID. So the switch driver traps reads to the ID2</div><div class='ctx'>  * register and returns the switch family ID</div><div class='head'>diff --git a/include/linux/math.h b/include/linux/math.h<br/>index dd4152711de7..6dc1d1d32fbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/math.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/math.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/math.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/math.h</a></div><div class='hunk'>@@ -34,6 +34,18 @@</div><div class='ctx'>  */</div><div class='ctx'> #define round_down(x, y) ((x) &amp; ~__round_mask(x, y))</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * DIV_ROUND_UP_POW2 - divide and round up</div><div class='add'>+ * @n: numerator</div><div class='add'>+ * @d: denominator (must be a power of 2)</div><div class='add'>+ *</div><div class='add'>+ * Divides @n by @d and rounds up to next multiple of @d (which must be a power</div><div class='add'>+ * of 2). Avoids integer overflows that may occur with __KERNEL_DIV_ROUND_UP().</div><div class='add'>+ * Performance is roughly equivalent to __KERNEL_DIV_ROUND_UP().</div><div class='add'>+ */</div><div class='add'>+#define DIV_ROUND_UP_POW2(n, d) \</div><div class='add'>+	((n) / (d) + !!((n) &amp; ((d) - 1)))</div><div class='add'>+</div><div class='ctx'> #define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP</div><div class='ctx'> </div><div class='ctx'> #define DIV_ROUND_DOWN_ULL(ll, d) \</div><div class='hunk'>@@ -112,6 +124,8 @@ struct type##_fract {					\</div><div class='ctx'> 	__##type numerator;				\</div><div class='ctx'> 	__##type denominator;				\</div><div class='ctx'> };</div><div class='add'>+__STRUCT_FRACT(s8)</div><div class='add'>+__STRUCT_FRACT(u8)</div><div class='ctx'> __STRUCT_FRACT(s16)</div><div class='ctx'> __STRUCT_FRACT(u16)</div><div class='ctx'> __STRUCT_FRACT(s32)</div><div class='hunk'>@@ -134,11 +148,16 @@ __STRUCT_FRACT(u32)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * abs - return absolute value of an argument</div><div class='del'>- * @x: the value.  If it is unsigned type, it is converted to signed type first.</div><div class='del'>- *     char is treated as if it was signed (regardless of whether it really is)</div><div class='del'>- *     but the macro's return type is preserved as char.</div><div class='add'>+ * @x: the value.</div><div class='add'>+ *</div><div class='add'>+ * If it is unsigned type, @x is converted to signed type first.</div><div class='add'>+ * char is treated as if it was signed (regardless of whether it really is)</div><div class='add'>+ * but the macro's return type is preserved as char.</div><div class='add'>+ *</div><div class='add'>+ * NOTE, for signed type if @x is the minimum, the returned result is undefined</div><div class='add'>+ * as there is not enough bits to represent it as a positive number.</div><div class='ctx'>  *</div><div class='del'>- * Return: an absolute value of x.</div><div class='add'>+ * Return: an absolute value of @x.</div><div class='ctx'>  */</div><div class='ctx'> #define abs(x)	__abs_choose_expr(x, long long,				\</div><div class='ctx'> 		__abs_choose_expr(x, long,				\</div><div class='head'>diff --git a/include/linux/math64.h b/include/linux/math64.h<br/>index bf74478926d4..cc305206d89f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/math64.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/math64.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/math64.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/math64.h</a></div><div class='hunk'>@@ -4,8 +4,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/math.h&gt;</div><div class='del'>-#include &lt;vdso/math64.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='add'>+#include &lt;vdso/math64.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if BITS_PER_LONG == 64</div><div class='ctx'> </div><div class='hunk'>@@ -158,6 +158,17 @@ static inline u64 mul_u32_u32(u32 a, u32 b)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef add_u64_u32</div><div class='add'>+/*</div><div class='add'>+ * Many a GCC version also messes this up.</div><div class='add'>+ * Zero extending b and then spilling everything to stack.</div><div class='add'>+ */</div><div class='add'>+static inline u64 add_u64_u32(u64 a, u32 b)</div><div class='add'>+{</div><div class='add'>+	return a + b;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_ARCH_SUPPORTS_INT128) &amp;&amp; defined(__SIZEOF_INT128__)</div><div class='ctx'> </div><div class='ctx'> #ifndef mul_u64_u32_shr</div><div class='hunk'>@@ -179,16 +190,12 @@ static __always_inline u64 mul_u64_u64_shr(u64 a, u64 mul, unsigned int shift)</div><div class='ctx'> #ifndef mul_u64_u32_shr</div><div class='ctx'> static __always_inline u64 mul_u64_u32_shr(u64 a, u32 mul, unsigned int shift)</div><div class='ctx'> {</div><div class='del'>-	u32 ah, al;</div><div class='add'>+	u32 ah = a &gt;&gt; 32, al = a;</div><div class='ctx'> 	u64 ret;</div><div class='ctx'> </div><div class='del'>-	al = a;</div><div class='del'>-	ah = a &gt;&gt; 32;</div><div class='del'>-</div><div class='ctx'> 	ret = mul_u32_u32(al, mul) &gt;&gt; shift;</div><div class='ctx'> 	if (ah)</div><div class='ctx'> 		ret += mul_u32_u32(ah, mul) &lt;&lt; (32 - shift);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> #endif /* mul_u64_u32_shr */</div><div class='hunk'>@@ -286,7 +293,53 @@ static inline u64 mul_u64_u32_div(u64 a, u32 mul, u32 divisor)</div><div class='ctx'> }</div><div class='ctx'> #endif /* mul_u64_u32_div */</div><div class='ctx'> </div><div class='del'>-u64 mul_u64_u64_div_u64(u64 a, u64 mul, u64 div);</div><div class='add'>+/**</div><div class='add'>+ * mul_u64_add_u64_div_u64 - unsigned 64bit multiply, add, and divide</div><div class='add'>+ * @a: first unsigned 64bit multiplicand</div><div class='add'>+ * @b: second unsigned 64bit multiplicand</div><div class='add'>+ * @c: unsigned 64bit addend</div><div class='add'>+ * @d: unsigned 64bit divisor</div><div class='add'>+ *</div><div class='add'>+ * Multiply two 64bit values together to generate a 128bit product</div><div class='add'>+ * add a third value and then divide by a fourth.</div><div class='add'>+ * The Generic code divides by 0 if @d is zero and returns ~0 on overflow.</div><div class='add'>+ * Architecture specific code may trap on zero or overflow.</div><div class='add'>+ *</div><div class='add'>+ * Return: (@a * @b + @c) / @d</div><div class='add'>+ */</div><div class='add'>+u64 mul_u64_add_u64_div_u64(u64 a, u64 b, u64 c, u64 d);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mul_u64_u64_div_u64 - unsigned 64bit multiply and divide</div><div class='add'>+ * @a: first unsigned 64bit multiplicand</div><div class='add'>+ * @b: second unsigned 64bit multiplicand</div><div class='add'>+ * @d: unsigned 64bit divisor</div><div class='add'>+ *</div><div class='add'>+ * Multiply two 64bit values together to generate a 128bit product</div><div class='add'>+ * and then divide by a third value.</div><div class='add'>+ * The Generic code divides by 0 if @d is zero and returns ~0 on overflow.</div><div class='add'>+ * Architecture specific code may trap on zero or overflow.</div><div class='add'>+ *</div><div class='add'>+ * Return: @a * @b / @d</div><div class='add'>+ */</div><div class='add'>+#define mul_u64_u64_div_u64(a, b, d) mul_u64_add_u64_div_u64(a, b, 0, d)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mul_u64_u64_div_u64_roundup - unsigned 64bit multiply and divide rounded up</div><div class='add'>+ * @a: first unsigned 64bit multiplicand</div><div class='add'>+ * @b: second unsigned 64bit multiplicand</div><div class='add'>+ * @d: unsigned 64bit divisor</div><div class='add'>+ *</div><div class='add'>+ * Multiply two 64bit values together to generate a 128bit product</div><div class='add'>+ * and then divide and round up.</div><div class='add'>+ * The Generic code divides by 0 if @d is zero and returns ~0 on overflow.</div><div class='add'>+ * Architecture specific code may trap on zero or overflow.</div><div class='add'>+ *</div><div class='add'>+ * Return: (@a * @b + @d - 1) / @d</div><div class='add'>+ */</div><div class='add'>+#define mul_u64_u64_div_u64_roundup(a, b, d) \</div><div class='add'>+	({ u64 _tmp = (d); mul_u64_add_u64_div_u64(a, b, _tmp - 1, _tmp); })</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * DIV64_U64_ROUND_UP - unsigned 64bit divide with 64bit divisor rounded up</div><div class='hunk'>@@ -302,6 +355,19 @@ u64 mul_u64_u64_div_u64(u64 a, u64 mul, u64 div);</div><div class='ctx'> 	({ u64 _tmp = (d); div64_u64((ll) + _tmp - 1, _tmp); })</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * DIV_U64_ROUND_UP - unsigned 64bit divide with 32bit divisor rounded up</div><div class='add'>+ * @ll: unsigned 64bit dividend</div><div class='add'>+ * @d: unsigned 32bit divisor</div><div class='add'>+ *</div><div class='add'>+ * Divide unsigned 64bit dividend by unsigned 32bit divisor</div><div class='add'>+ * and round up.</div><div class='add'>+ *</div><div class='add'>+ * Return: dividend / divisor rounded up</div><div class='add'>+ */</div><div class='add'>+#define DIV_U64_ROUND_UP(ll, d)		\</div><div class='add'>+	({ u32 _tmp = (d); div_u64((ll) + _tmp - 1, _tmp); })</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * DIV64_U64_ROUND_CLOSEST - unsigned 64bit divide with 64bit divisor rounded to nearest integer</div><div class='ctx'>  * @dividend: unsigned 64bit dividend</div><div class='ctx'>  * @divisor: unsigned 64bit divisor</div><div class='hunk'>@@ -346,4 +412,19 @@ u64 mul_u64_u64_div_u64(u64 a, u64 mul, u64 div);</div><div class='ctx'> 		div_s64((__x - (__d / 2)), __d);	\</div><div class='ctx'> }							\</div><div class='ctx'> )</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * roundup_u64 - Round up a 64bit value to the next specified 32bit multiple</div><div class='add'>+ * @x: the value to up</div><div class='add'>+ * @y: 32bit multiple to round up to</div><div class='add'>+ *</div><div class='add'>+ * Rounds @x to the next multiple of @y. For 32bit @x values, see roundup and</div><div class='add'>+ * the faster round_up() for powers of 2.</div><div class='add'>+ *</div><div class='add'>+ * Return: rounded up value.</div><div class='add'>+ */</div><div class='add'>+static inline u64 roundup_u64(u64 x, u32 y)</div><div class='add'>+{</div><div class='add'>+	return DIV_U64_ROUND_UP(x, y) * y;</div><div class='add'>+}</div><div class='ctx'> #endif /* _LINUX_MATH64_H */</div><div class='head'>diff --git a/include/linux/mc33xs2410.h b/include/linux/mc33xs2410.h<br/>new file mode 100644<br/>index 000000000000..31c0edf10dd7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mc33xs2410.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mc33xs2410.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Liebherr-Electronics and Drives GmbH</div><div class='add'>+ */</div><div class='add'>+#ifndef _MC33XS2410_H</div><div class='add'>+#define _MC33XS2410_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("PWM_MC33XS2410");</div><div class='add'>+</div><div class='add'>+int mc33xs2410_read_reg_ctrl(struct spi_device *spi, u8 reg, u16 *val);</div><div class='add'>+int mc33xs2410_read_reg_diag(struct spi_device *spi, u8 reg, u16 *val);</div><div class='add'>+int mc33xs2410_modify_reg(struct spi_device *spi, u8 reg, u8 mask, u8 val);</div><div class='add'>+</div><div class='add'>+#endif /* _MC33XS2410_H */</div><div class='head'>diff --git a/include/linux/mcb.h b/include/linux/mcb.h<br/>index 0b971b24a804..4ab2691f51a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mcb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mcb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mcb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mcb.h</a></div><div class='hunk'>@@ -94,10 +94,7 @@ struct mcb_driver {</div><div class='ctx'> 	void (*shutdown)(struct mcb_device *mdev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct mcb_driver *to_mcb_driver(struct device_driver *drv)</div><div class='del'>-{</div><div class='del'>-	return container_of(drv, struct mcb_driver, driver);</div><div class='del'>-}</div><div class='add'>+#define to_mcb_driver(__drv)	container_of_const(__drv, struct mcb_driver, driver)</div><div class='ctx'> </div><div class='ctx'> static inline void *mcb_get_drvdata(struct mcb_device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/mdio.h b/include/linux/mdio.h<br/>index 68f8d2e970d4..42d6d47e445b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mdio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mdio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mdio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mdio.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@ struct mdio_device {</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='ctx'> 	char modalias[MDIO_NAME_SIZE];</div><div class='ctx'> </div><div class='del'>-	int (*bus_match)(struct device *dev, struct device_driver *drv);</div><div class='add'>+	int (*bus_match)(struct device *dev, const struct device_driver *drv);</div><div class='ctx'> 	void (*device_free)(struct mdio_device *mdiodev);</div><div class='ctx'> 	void (*device_remove)(struct mdio_device *mdiodev);</div><div class='ctx'> </div><div class='hunk'>@@ -45,10 +45,7 @@ struct mdio_device {</div><div class='ctx'> 	unsigned int reset_deassert_delay;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct mdio_device *to_mdio_device(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return container_of(dev, struct mdio_device, dev);</div><div class='del'>-}</div><div class='add'>+#define to_mdio_device(__dev)	container_of_const(__dev, struct mdio_device, dev)</div><div class='ctx'> </div><div class='ctx'> /* struct mdio_driver_common: Common to all MDIO drivers */</div><div class='ctx'> struct mdio_driver_common {</div><div class='hunk'>@@ -57,11 +54,8 @@ struct mdio_driver_common {</div><div class='ctx'> };</div><div class='ctx'> #define MDIO_DEVICE_FLAG_PHY		1</div><div class='ctx'> </div><div class='del'>-static inline struct mdio_driver_common *</div><div class='del'>-to_mdio_common_driver(const struct device_driver *driver)</div><div class='del'>-{</div><div class='del'>-	return container_of(driver, struct mdio_driver_common, driver);</div><div class='del'>-}</div><div class='add'>+#define to_mdio_common_driver(__drv_c)	container_of_const(__drv_c, struct mdio_driver_common,	\</div><div class='add'>+							   driver)</div><div class='ctx'> </div><div class='ctx'> /* struct mdio_driver: Generic MDIO driver */</div><div class='ctx'> struct mdio_driver {</div><div class='hunk'>@@ -80,12 +74,8 @@ struct mdio_driver {</div><div class='ctx'> 	void (*shutdown)(struct mdio_device *mdiodev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct mdio_driver *</div><div class='del'>-to_mdio_driver(const struct device_driver *driver)</div><div class='del'>-{</div><div class='del'>-	return container_of(to_mdio_common_driver(driver), struct mdio_driver,</div><div class='del'>-			    mdiodrv);</div><div class='del'>-}</div><div class='add'>+#define to_mdio_driver(__drv_m)	container_of_const(to_mdio_common_driver(__drv_m),	\</div><div class='add'>+						   struct mdio_driver, mdiodrv)</div><div class='ctx'> </div><div class='ctx'> /* device driver data */</div><div class='ctx'> static inline void mdiodev_set_drvdata(struct mdio_device *mdio, void *data)</div><div class='hunk'>@@ -105,7 +95,6 @@ void mdio_device_remove(struct mdio_device *mdiodev);</div><div class='ctx'> void mdio_device_reset(struct mdio_device *mdiodev, int value);</div><div class='ctx'> int mdio_driver_register(struct mdio_driver *drv);</div><div class='ctx'> void mdio_driver_unregister(struct mdio_driver *drv);</div><div class='del'>-int mdio_device_bus_match(struct device *dev, struct device_driver *drv);</div><div class='ctx'> </div><div class='ctx'> static inline void mdio_device_get(struct mdio_device *mdiodev)</div><div class='ctx'> {</div><div class='hunk'>@@ -172,31 +161,12 @@ extern int mdio_set_flag(const struct mdio_if_info *mdio,</div><div class='ctx'> 			 bool sense);</div><div class='ctx'> extern int mdio45_links_ok(const struct mdio_if_info *mdio, u32 mmds);</div><div class='ctx'> extern int mdio45_nway_restart(const struct mdio_if_info *mdio);</div><div class='del'>-extern void mdio45_ethtool_gset_npage(const struct mdio_if_info *mdio,</div><div class='del'>-				      struct ethtool_cmd *ecmd,</div><div class='del'>-				      u32 npage_adv, u32 npage_lpa);</div><div class='ctx'> extern void</div><div class='ctx'> mdio45_ethtool_ksettings_get_npage(const struct mdio_if_info *mdio,</div><div class='ctx'> 				   struct ethtool_link_ksettings *cmd,</div><div class='ctx'> 				   u32 npage_adv, u32 npage_lpa);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mdio45_ethtool_gset - get settings for ETHTOOL_GSET</div><div class='del'>- * @mdio: MDIO interface</div><div class='del'>- * @ecmd: Ethtool request structure</div><div class='del'>- *</div><div class='del'>- * Since the CSRs for auto-negotiation using next pages are not fully</div><div class='del'>- * standardised, this function does not attempt to decode them.  Use</div><div class='del'>- * mdio45_ethtool_gset_npage() to specify advertisement bits from next</div><div class='del'>- * pages.</div><div class='del'>- */</div><div class='del'>-static inline void mdio45_ethtool_gset(const struct mdio_if_info *mdio,</div><div class='del'>-				       struct ethtool_cmd *ecmd)</div><div class='del'>-{</div><div class='del'>-	mdio45_ethtool_gset_npage(mdio, ecmd, 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * mdio45_ethtool_ksettings_get - get settings for ETHTOOL_GLINKSETTINGS</div><div class='ctx'>  * @mdio: MDIO interface</div><div class='ctx'>  * @cmd: Ethtool request structure</div><div class='hunk'>@@ -719,16 +689,7 @@ struct phy_device *mdiobus_get_phy(struct mii_bus *bus, int addr);</div><div class='ctx'>  * init/exit. Each module may only use this macro once, and calling it</div><div class='ctx'>  * replaces module_init() and module_exit().</div><div class='ctx'>  */</div><div class='del'>-#define mdio_module_driver(_mdio_driver)				\</div><div class='del'>-static int __init mdio_module_init(void)				\</div><div class='del'>-{									\</div><div class='del'>-	return mdio_driver_register(&amp;_mdio_driver);			\</div><div class='del'>-}									\</div><div class='del'>-module_init(mdio_module_init);						\</div><div class='del'>-static void __exit mdio_module_exit(void)				\</div><div class='del'>-{									\</div><div class='del'>-	mdio_driver_unregister(&amp;_mdio_driver);				\</div><div class='del'>-}									\</div><div class='del'>-module_exit(mdio_module_exit)</div><div class='add'>+#define mdio_module_driver(_mdio_driver) \</div><div class='add'>+	module_driver(_mdio_driver, mdio_driver_register, mdio_driver_unregister)</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_MDIO_H__ */</div><div class='head'>diff --git a/include/linux/mei_cl_bus.h b/include/linux/mei_cl_bus.h<br/>index b38a56a13f39..a82755e1fc40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mei_cl_bus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mei_cl_bus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mei_cl_bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mei_cl_bus.h</a></div><div class='hunk'>@@ -97,8 +97,6 @@ ssize_t mei_cldev_send(struct mei_cl_device *cldev, const u8 *buf,</div><div class='ctx'> ssize_t mei_cldev_send_timeout(struct mei_cl_device *cldev, const u8 *buf,</div><div class='ctx'> 			       size_t length, unsigned long timeout);</div><div class='ctx'> ssize_t mei_cldev_recv(struct mei_cl_device *cldev, u8 *buf, size_t length);</div><div class='del'>-ssize_t mei_cldev_recv_nonblock(struct mei_cl_device *cldev, u8 *buf,</div><div class='del'>-				size_t length);</div><div class='ctx'> ssize_t mei_cldev_recv_timeout(struct mei_cl_device *cldev, u8 *buf, size_t length,</div><div class='ctx'> 			       unsigned long timeout);</div><div class='ctx'> ssize_t mei_cldev_send_vtag(struct mei_cl_device *cldev, const u8 *buf,</div><div class='hunk'>@@ -107,8 +105,6 @@ ssize_t mei_cldev_send_vtag_timeout(struct mei_cl_device *cldev, const u8 *buf,</div><div class='ctx'> 				    size_t length, u8 vtag, unsigned long timeout);</div><div class='ctx'> ssize_t mei_cldev_recv_vtag(struct mei_cl_device *cldev, u8 *buf, size_t length,</div><div class='ctx'> 			    u8 *vtag);</div><div class='del'>-ssize_t mei_cldev_recv_nonblock_vtag(struct mei_cl_device *cldev, u8 *buf,</div><div class='del'>-				     size_t length, u8 *vtag);</div><div class='ctx'> ssize_t mei_cldev_recv_vtag_timeout(struct mei_cl_device *cldev, u8 *buf, size_t length,</div><div class='ctx'> 			    u8 *vtag, unsigned long timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -116,8 +112,8 @@ int mei_cldev_register_rx_cb(struct mei_cl_device *cldev, mei_cldev_cb_t rx_cb);</div><div class='ctx'> int mei_cldev_register_notif_cb(struct mei_cl_device *cldev,</div><div class='ctx'> 				mei_cldev_cb_t notif_cb);</div><div class='ctx'> </div><div class='del'>-const uuid_le *mei_cldev_uuid(const struct mei_cl_device *cldev);</div><div class='ctx'> u8 mei_cldev_ver(const struct mei_cl_device *cldev);</div><div class='add'>+size_t mei_cldev_mtu(const struct mei_cl_device *cldev);</div><div class='ctx'> </div><div class='ctx'> void *mei_cldev_get_drvdata(const struct mei_cl_device *cldev);</div><div class='ctx'> void mei_cldev_set_drvdata(struct mei_cl_device *cldev, void *data);</div><div class='head'>diff --git a/include/linux/mem_encrypt.h b/include/linux/mem_encrypt.h<br/>index ae4526389261..07584c5e36fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mem_encrypt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mem_encrypt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mem_encrypt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mem_encrypt.h</a></div><div class='hunk'>@@ -26,11 +26,34 @@</div><div class='ctx'>  */</div><div class='ctx'> #define __sme_set(x)		((x) | sme_me_mask)</div><div class='ctx'> #define __sme_clr(x)		((x) &amp; ~sme_me_mask)</div><div class='add'>+</div><div class='add'>+#define dma_addr_encrypted(x)	__sme_set(x)</div><div class='add'>+#define dma_addr_canonical(x)	__sme_clr(x)</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> #define __sme_set(x)		(x)</div><div class='ctx'> #define __sme_clr(x)		(x)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * dma_addr_encrypted() and dma_addr_unencrypted() are for converting a given DMA</div><div class='add'>+ * address to the respective type of addressing.</div><div class='add'>+ *</div><div class='add'>+ * dma_addr_canonical() is used to reverse any conversions for encrypted/decrypted</div><div class='add'>+ * back to the canonical address.</div><div class='add'>+ */</div><div class='add'>+#ifndef dma_addr_encrypted</div><div class='add'>+#define dma_addr_encrypted(x)		(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef dma_addr_unencrypted</div><div class='add'>+#define dma_addr_unencrypted(x)		(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef dma_addr_canonical</div><div class='add'>+#define dma_addr_canonical(x)		(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif	/* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #endif	/* __MEM_ENCRYPT_H__ */</div><div class='head'>diff --git a/include/linux/memblock.h b/include/linux/memblock.h<br/>index e2082240586d..221118b5a16e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memblock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memblock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memblock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memblock.h</a></div><div class='hunk'>@@ -40,8 +40,17 @@ extern unsigned long long max_possible_pfn;</div><div class='ctx'>  * via a driver, and never indicated in the firmware-provided memory map as</div><div class='ctx'>  * system RAM. This corresponds to IORESOURCE_SYSRAM_DRIVER_MANAGED in the</div><div class='ctx'>  * kernel resource tree.</div><div class='del'>- * @MEMBLOCK_RSRV_NOINIT: memory region for which struct pages are</div><div class='del'>- * not initialized (only for reserved regions).</div><div class='add'>+ * @MEMBLOCK_RSRV_NOINIT: reserved memory region for which struct pages are not</div><div class='add'>+ * fully initialized. Users of this flag are responsible to properly initialize</div><div class='add'>+ * struct pages of this region</div><div class='add'>+ * @MEMBLOCK_RSRV_KERN: memory region that is reserved for kernel use,</div><div class='add'>+ * either explictitly with memblock_reserve_kern() or via memblock</div><div class='add'>+ * allocation APIs. All memblock allocations set this flag.</div><div class='add'>+ * @MEMBLOCK_KHO_SCRATCH: memory region that kexec can pass to the next</div><div class='add'>+ * kernel in handover mode. During early boot, we do not know about all</div><div class='add'>+ * memory reservations yet, so we get scratch memory from the previous</div><div class='add'>+ * kernel that we know is good to use. It is the only memory that</div><div class='add'>+ * allocations may happen from in this phase.</div><div class='ctx'>  */</div><div class='ctx'> enum memblock_flags {</div><div class='ctx'> 	MEMBLOCK_NONE		= 0x0,	/* No special request */</div><div class='hunk'>@@ -50,6 +59,8 @@ enum memblock_flags {</div><div class='ctx'> 	MEMBLOCK_NOMAP		= 0x4,	/* don't add to kernel direct mapping */</div><div class='ctx'> 	MEMBLOCK_DRIVER_MANAGED = 0x8,	/* always detected via a driver */</div><div class='ctx'> 	MEMBLOCK_RSRV_NOINIT	= 0x10,	/* don't initialize struct pages */</div><div class='add'>+	MEMBLOCK_RSRV_KERN	= 0x20,	/* memory reserved for kernel use */</div><div class='add'>+	MEMBLOCK_KHO_SCRATCH	= 0x40,	/* scratch memory for kexec handover */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -116,7 +127,19 @@ int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid,</div><div class='ctx'> int memblock_add(phys_addr_t base, phys_addr_t size);</div><div class='ctx'> int memblock_remove(phys_addr_t base, phys_addr_t size);</div><div class='ctx'> int memblock_phys_free(phys_addr_t base, phys_addr_t size);</div><div class='del'>-int memblock_reserve(phys_addr_t base, phys_addr_t size);</div><div class='add'>+int __memblock_reserve(phys_addr_t base, phys_addr_t size, int nid,</div><div class='add'>+		       enum memblock_flags flags);</div><div class='add'>+</div><div class='add'>+static __always_inline int memblock_reserve(phys_addr_t base, phys_addr_t size)</div><div class='add'>+{</div><div class='add'>+	return __memblock_reserve(base, size, NUMA_NO_NODE, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline int memblock_reserve_kern(phys_addr_t base, phys_addr_t size)</div><div class='add'>+{</div><div class='add'>+	return __memblock_reserve(base, size, NUMA_NO_NODE, MEMBLOCK_RSRV_KERN);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP</div><div class='ctx'> int memblock_physmem_add(phys_addr_t base, phys_addr_t size);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -132,8 +155,9 @@ int memblock_mark_mirror(phys_addr_t base, phys_addr_t size);</div><div class='ctx'> int memblock_mark_nomap(phys_addr_t base, phys_addr_t size);</div><div class='ctx'> int memblock_clear_nomap(phys_addr_t base, phys_addr_t size);</div><div class='ctx'> int memblock_reserved_mark_noinit(phys_addr_t base, phys_addr_t size);</div><div class='add'>+int memblock_mark_kho_scratch(phys_addr_t base, phys_addr_t size);</div><div class='add'>+int memblock_clear_kho_scratch(phys_addr_t base, phys_addr_t size);</div><div class='ctx'> </div><div class='del'>-void memblock_free_all(void);</div><div class='ctx'> void memblock_free(void *ptr, size_t size);</div><div class='ctx'> void reset_all_zones_managed_pages(void);</div><div class='ctx'> </div><div class='hunk'>@@ -276,6 +300,11 @@ static inline bool memblock_is_driver_managed(struct memblock_region *m)</div><div class='ctx'> 	return m-&gt;flags &amp; MEMBLOCK_DRIVER_MANAGED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool memblock_is_kho_scratch(struct memblock_region *m)</div><div class='add'>+{</div><div class='add'>+	return m-&gt;flags &amp; MEMBLOCK_KHO_SCRATCH;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn,</div><div class='ctx'> 			    unsigned long  *end_pfn);</div><div class='ctx'> void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,</div><div class='hunk'>@@ -295,49 +324,6 @@ void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,</div><div class='ctx'> 	for (i = -1, __next_mem_pfn_range(&amp;i, nid, p_start, p_end, p_nid); \</div><div class='ctx'> 	     i &gt;= 0; __next_mem_pfn_range(&amp;i, nid, p_start, p_end, p_nid))</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT</div><div class='del'>-void __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,</div><div class='del'>-				  unsigned long *out_spfn,</div><div class='del'>-				  unsigned long *out_epfn);</div><div class='del'>-/**</div><div class='del'>- * for_each_free_mem_pfn_range_in_zone - iterate through zone specific free</div><div class='del'>- * memblock areas</div><div class='del'>- * @i: u64 used as loop variable</div><div class='del'>- * @zone: zone in which all of the memory blocks reside</div><div class='del'>- * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL</div><div class='del'>- * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL</div><div class='del'>- *</div><div class='del'>- * Walks over free (memory &amp;&amp; !reserved) areas of memblock in a specific</div><div class='del'>- * zone. Available once memblock and an empty zone is initialized. The main</div><div class='del'>- * assumption is that the zone start, end, and pgdat have been associated.</div><div class='del'>- * This way we can use the zone to determine NUMA node, and if a given part</div><div class='del'>- * of the memblock is valid for the zone.</div><div class='del'>- */</div><div class='del'>-#define for_each_free_mem_pfn_range_in_zone(i, zone, p_start, p_end)	\</div><div class='del'>-	for (i = 0,							\</div><div class='del'>-	     __next_mem_pfn_range_in_zone(&amp;i, zone, p_start, p_end);	\</div><div class='del'>-	     i != U64_MAX;					\</div><div class='del'>-	     __next_mem_pfn_range_in_zone(&amp;i, zone, p_start, p_end))</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * for_each_free_mem_pfn_range_in_zone_from - iterate through zone specific</div><div class='del'>- * free memblock areas from a given point</div><div class='del'>- * @i: u64 used as loop variable</div><div class='del'>- * @zone: zone in which all of the memory blocks reside</div><div class='del'>- * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL</div><div class='del'>- * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL</div><div class='del'>- *</div><div class='del'>- * Walks over free (memory &amp;&amp; !reserved) areas of memblock in a specific</div><div class='del'>- * zone, continuing from current position. Available as soon as memblock is</div><div class='del'>- * initialized.</div><div class='del'>- */</div><div class='del'>-#define for_each_free_mem_pfn_range_in_zone_from(i, zone, p_start, p_end) \</div><div class='del'>-	for (; i != U64_MAX;					  \</div><div class='del'>-	     __next_mem_pfn_range_in_zone(&amp;i, zone, p_start, p_end))</div><div class='del'>-</div><div class='del'>-int __init deferred_page_init_max_threads(const struct cpumask *node_cpumask);</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * for_each_free_mem_range - iterate through free memblock areas</div><div class='hunk'>@@ -399,6 +385,10 @@ static inline int memblock_get_region_node(const struct memblock_region *r)</div><div class='ctx'> /* Flags for memblock allocation APIs */</div><div class='ctx'> #define MEMBLOCK_ALLOC_ANYWHERE	(~(phys_addr_t)0)</div><div class='ctx'> #define MEMBLOCK_ALLOC_ACCESSIBLE	0</div><div class='add'>+/*</div><div class='add'>+ *  MEMBLOCK_ALLOC_NOLEAKTRACE avoids kmemleak tracing. It implies</div><div class='add'>+ *  MEMBLOCK_ALLOC_ACCESSIBLE</div><div class='add'>+ */</div><div class='ctx'> #define MEMBLOCK_ALLOC_NOLEAKTRACE	1</div><div class='ctx'> </div><div class='ctx'> /* We are using top down, so it is safe to use 0 here */</div><div class='hunk'>@@ -438,6 +428,12 @@ static __always_inline void *memblock_alloc(phys_addr_t size, phys_addr_t align)</div><div class='ctx'> 				      MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void *__memblock_alloc_or_panic(phys_addr_t size, phys_addr_t align,</div><div class='add'>+				const char *func);</div><div class='add'>+</div><div class='add'>+#define memblock_alloc_or_panic(size, align)    \</div><div class='add'>+	 __memblock_alloc_or_panic(size, align, __func__)</div><div class='add'>+</div><div class='ctx'> static inline void *memblock_alloc_raw(phys_addr_t size,</div><div class='ctx'> 					       phys_addr_t align)</div><div class='ctx'> {</div><div class='hunk'>@@ -446,7 +442,7 @@ static inline void *memblock_alloc_raw(phys_addr_t size,</div><div class='ctx'> 					  NUMA_NO_NODE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *memblock_alloc_from(phys_addr_t size,</div><div class='add'>+static __always_inline void *memblock_alloc_from(phys_addr_t size,</div><div class='ctx'> 						phys_addr_t align,</div><div class='ctx'> 						phys_addr_t min_addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -488,6 +484,8 @@ static inline __init_memblock bool memblock_bottom_up(void)</div><div class='ctx'> </div><div class='ctx'> phys_addr_t memblock_phys_mem_size(void);</div><div class='ctx'> phys_addr_t memblock_reserved_size(void);</div><div class='add'>+phys_addr_t memblock_reserved_kern_size(phys_addr_t limit, int nid);</div><div class='add'>+unsigned long memblock_estimated_nr_free_pages(void);</div><div class='ctx'> phys_addr_t memblock_start_of_DRAM(void);</div><div class='ctx'> phys_addr_t memblock_end_of_DRAM(void);</div><div class='ctx'> void memblock_enforce_memory_limit(phys_addr_t memory_limit);</div><div class='hunk'>@@ -565,7 +563,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * for_each_mem_region - itereate over memory regions</div><div class='add'>+ * for_each_mem_region - iterate over memory regions</div><div class='ctx'>  * @region: loop variable</div><div class='ctx'>  */</div><div class='ctx'> #define for_each_mem_region(region)					\</div><div class='hunk'>@@ -613,5 +611,14 @@ static inline void early_memtest(phys_addr_t start, phys_addr_t end) { }</div><div class='ctx'> static inline void memtest_report_meminfo(struct seq_file *m) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH</div><div class='add'>+void memblock_set_kho_scratch_only(void);</div><div class='add'>+void memblock_clear_kho_scratch_only(void);</div><div class='add'>+void memmap_init_kho_scratch_pages(void);</div><div class='add'>+#else</div><div class='add'>+static inline void memblock_set_kho_scratch_only(void) { }</div><div class='add'>+static inline void memblock_clear_kho_scratch_only(void) { }</div><div class='add'>+static inline void memmap_init_kho_scratch_pages(void) {}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_MEMBLOCK_H */</div><div class='head'>diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h<br/>index 20ff87f8e001..0651865a4564 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memcontrol.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memcontrol.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memcontrol.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memcontrol.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/vm_event_item.h&gt;</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> #include &lt;linux/jump_label.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/page_counter.h&gt;</div><div class='ctx'> #include &lt;linux/vmpressure.h&gt;</div><div class='ctx'> #include &lt;linux/eventfd.h&gt;</div><div class='hunk'>@@ -51,12 +52,13 @@ enum memcg_memory_event {</div><div class='ctx'> 	MEMCG_SWAP_HIGH,</div><div class='ctx'> 	MEMCG_SWAP_MAX,</div><div class='ctx'> 	MEMCG_SWAP_FAIL,</div><div class='add'>+	MEMCG_SOCK_THROTTLED,</div><div class='ctx'> 	MEMCG_NR_MEMORY_EVENTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mem_cgroup_reclaim_cookie {</div><div class='ctx'> 	pg_data_t *pgdat;</div><div class='del'>-	unsigned int generation;</div><div class='add'>+	int generation;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMCG</div><div class='hunk'>@@ -68,67 +70,56 @@ struct mem_cgroup_id {</div><div class='ctx'> 	refcount_t ref;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Per memcg event counter is incremented at every pagein/pageout. With THP,</div><div class='del'>- * it will be incremented by the number of pages. This counter is used</div><div class='del'>- * to trigger some periodic events. This is straightforward and better</div><div class='del'>- * than using jiffies etc. to handle periodic memcg event.</div><div class='del'>- */</div><div class='del'>-enum mem_cgroup_events_target {</div><div class='del'>-	MEM_CGROUP_TARGET_THRESH,</div><div class='del'>-	MEM_CGROUP_TARGET_SOFTLIMIT,</div><div class='del'>-	MEM_CGROUP_NTARGETS,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct memcg_vmstats_percpu;</div><div class='add'>+struct memcg1_events_percpu;</div><div class='ctx'> struct memcg_vmstats;</div><div class='add'>+struct lruvec_stats_percpu;</div><div class='add'>+struct lruvec_stats;</div><div class='ctx'> </div><div class='ctx'> struct mem_cgroup_reclaim_iter {</div><div class='ctx'> 	struct mem_cgroup *position;</div><div class='ctx'> 	/* scan generation, increased every round-trip */</div><div class='del'>-	unsigned int generation;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lruvec_stats_percpu {</div><div class='del'>-	/* Local (CPU and cgroup) state */</div><div class='del'>-	long state[NR_VM_NODE_STAT_ITEMS];</div><div class='del'>-</div><div class='del'>-	/* Delta calculation for lockless upward propagation */</div><div class='del'>-	long state_prev[NR_VM_NODE_STAT_ITEMS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lruvec_stats {</div><div class='del'>-	/* Aggregated (CPU and subtree) state */</div><div class='del'>-	long state[NR_VM_NODE_STAT_ITEMS];</div><div class='del'>-</div><div class='del'>-	/* Non-hierarchical (CPU aggregated) state */</div><div class='del'>-	long state_local[NR_VM_NODE_STAT_ITEMS];</div><div class='del'>-</div><div class='del'>-	/* Pending child counts during tree propagation */</div><div class='del'>-	long state_pending[NR_VM_NODE_STAT_ITEMS];</div><div class='add'>+	atomic_t generation;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * per-node information in memory controller.</div><div class='ctx'>  */</div><div class='ctx'> struct mem_cgroup_per_node {</div><div class='del'>-	struct lruvec		lruvec;</div><div class='add'>+	/* Keep the read-only fields at the start */</div><div class='add'>+	struct mem_cgroup	*memcg;		/* Back pointer, we cannot */</div><div class='add'>+						/* use container_of	   */</div><div class='ctx'> </div><div class='ctx'> 	struct lruvec_stats_percpu __percpu	*lruvec_stats_percpu;</div><div class='del'>-	struct lruvec_stats			lruvec_stats;</div><div class='del'>-</div><div class='del'>-	unsigned long		lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS];</div><div class='del'>-</div><div class='del'>-	struct mem_cgroup_reclaim_iter	iter;</div><div class='del'>-</div><div class='add'>+	struct lruvec_stats			*lruvec_stats;</div><div class='ctx'> 	struct shrinker_info __rcu	*shrinker_info;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEMCG_V1</div><div class='add'>+	/*</div><div class='add'>+	 * Memcg-v1 only stuff in middle as buffer between read mostly fields</div><div class='add'>+	 * and update often fields to avoid false sharing. If v1 stuff is</div><div class='add'>+	 * not present, an explicit padding is needed.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	struct rb_node		tree_node;	/* RB tree node */</div><div class='ctx'> 	unsigned long		usage_in_excess;/* Set to the value by which */</div><div class='ctx'> 						/* the soft limit is exceeded*/</div><div class='ctx'> 	bool			on_tree;</div><div class='del'>-	struct mem_cgroup	*memcg;		/* Back pointer, we cannot */</div><div class='del'>-						/* use container_of	   */</div><div class='add'>+#else</div><div class='add'>+	CACHELINE_PADDING(_pad1_);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Fields which get updated often at the end. */</div><div class='add'>+	struct lruvec		lruvec;</div><div class='add'>+	CACHELINE_PADDING(_pad2_);</div><div class='add'>+	unsigned long		lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS];</div><div class='add'>+	struct mem_cgroup_reclaim_iter	iter;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMCG_NMI_SAFETY_REQUIRES_ATOMIC</div><div class='add'>+	/* slab stats for nmi context */</div><div class='add'>+	atomic_t		slab_reclaimable;</div><div class='add'>+	atomic_t		slab_unreclaimable;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mem_cgroup_threshold {</div><div class='hunk'>@@ -210,14 +201,15 @@ struct mem_cgroup {</div><div class='ctx'> 		struct page_counter memsw;	/* v1 only */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	/* Legacy consumer-oriented counters */</div><div class='del'>-	struct page_counter kmem;		/* v1 only */</div><div class='del'>-	struct page_counter tcpmem;		/* v1 only */</div><div class='add'>+	/* registered local peak watchers */</div><div class='add'>+	struct list_head memory_peaks;</div><div class='add'>+	struct list_head swap_peaks;</div><div class='add'>+	spinlock_t	 peaks_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* Range enforcement for interrupt charges */</div><div class='ctx'> 	struct work_struct high_work;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MEMCG_KMEM) &amp;&amp; defined(CONFIG_ZSWAP)</div><div class='add'>+#ifdef CONFIG_ZSWAP</div><div class='ctx'> 	unsigned long zswap_max;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -227,8 +219,6 @@ struct mem_cgroup {</div><div class='ctx'> 	bool zswap_writeback;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	unsigned long soft_limit;</div><div class='del'>-</div><div class='ctx'> 	/* vmpressure notifications */</div><div class='ctx'> 	struct vmpressure vmpressure;</div><div class='ctx'> </div><div class='hunk'>@@ -237,13 +227,7 @@ struct mem_cgroup {</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool oom_group;</div><div class='ctx'> </div><div class='del'>-	/* protected by memcg_oom_lock */</div><div class='del'>-	bool		oom_lock;</div><div class='del'>-	int		under_oom;</div><div class='del'>-</div><div class='del'>-	int	swappiness;</div><div class='del'>-	/* OOM-Killer disable */</div><div class='del'>-	int		oom_kill_disable;</div><div class='add'>+	int swappiness;</div><div class='ctx'> </div><div class='ctx'> 	/* memory.events and memory.events.local */</div><div class='ctx'> 	struct cgroup_file events_file;</div><div class='hunk'>@@ -252,29 +236,6 @@ struct mem_cgroup {</div><div class='ctx'> 	/* handle for "memory.swap.events" */</div><div class='ctx'> 	struct cgroup_file swap_events_file;</div><div class='ctx'> </div><div class='del'>-	/* protect arrays of thresholds */</div><div class='del'>-	struct mutex thresholds_lock;</div><div class='del'>-</div><div class='del'>-	/* thresholds for memory usage. RCU-protected */</div><div class='del'>-	struct mem_cgroup_thresholds thresholds;</div><div class='del'>-</div><div class='del'>-	/* thresholds for mem+swap usage. RCU-protected */</div><div class='del'>-	struct mem_cgroup_thresholds memsw_thresholds;</div><div class='del'>-</div><div class='del'>-	/* For oom notifier event fd */</div><div class='del'>-	struct list_head oom_notify;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Should we move charges of a task when a task is moved into this</div><div class='del'>-	 * mem_cgroup ? And what type of charges should we move ?</div><div class='del'>-	 */</div><div class='del'>-	unsigned long move_charge_at_immigrate;</div><div class='del'>-	/* taken only while moving_account &gt; 0 */</div><div class='del'>-	spinlock_t		move_lock;</div><div class='del'>-	unsigned long		move_lock_flags;</div><div class='del'>-</div><div class='del'>-	CACHELINE_PADDING(_pad1_);</div><div class='del'>-</div><div class='ctx'> 	/* memory.stat */</div><div class='ctx'> 	struct memcg_vmstats	*vmstats;</div><div class='ctx'> </div><div class='hunk'>@@ -282,18 +243,19 @@ struct mem_cgroup {</div><div class='ctx'> 	atomic_long_t		memory_events[MEMCG_NR_MEMORY_EVENTS];</div><div class='ctx'> 	atomic_long_t		memory_events_local[MEMCG_NR_MEMORY_EVENTS];</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEMCG_NMI_SAFETY_REQUIRES_ATOMIC</div><div class='add'>+	/* MEMCG_KMEM for nmi context */</div><div class='add'>+	atomic_t		kmem_stat;</div><div class='add'>+#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Hint of reclaim pressure for socket memroy management. Note</div><div class='ctx'> 	 * that this indicator should NOT be used in legacy cgroup mode</div><div class='ctx'> 	 * where socket memory is accounted/charged separately.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned long		socket_pressure;</div><div class='del'>-</div><div class='del'>-	/* Legacy tcp memory accounting */</div><div class='del'>-	bool			tcpmem_active;</div><div class='del'>-	int			tcpmem_pressure;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+	u64			socket_pressure;</div><div class='add'>+#if BITS_PER_LONG &lt; 64</div><div class='add'>+	seqlock_t		socket_pressure_seqlock;</div><div class='add'>+#endif</div><div class='ctx'> 	int kmemcg_id;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * memcg-&gt;objcg is wiped out as a part of the objcg repaprenting</div><div class='hunk'>@@ -304,15 +266,6 @@ struct mem_cgroup {</div><div class='ctx'> 	struct obj_cgroup	*orig_objcg;</div><div class='ctx'> 	/* list of inherited objcgs, protected by objcg_lock */</div><div class='ctx'> 	struct list_head objcg_list;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	CACHELINE_PADDING(_pad2_);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set &gt; 0 if pages under this cgroup are moving to other cgroup.</div><div class='del'>-	 */</div><div class='del'>-	atomic_t		moving_account;</div><div class='del'>-	struct task_struct	*move_lock_task;</div><div class='ctx'> </div><div class='ctx'> 	struct memcg_vmstats_percpu __percpu *vmstats_percpu;</div><div class='ctx'> </div><div class='hunk'>@@ -322,10 +275,6 @@ struct mem_cgroup {</div><div class='ctx'> 	struct memcg_cgwb_frn cgwb_frn[MEMCG_CGWB_FRN_CNT];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* List of events which userspace want to receive */</div><div class='del'>-	struct list_head event_list;</div><div class='del'>-	spinlock_t event_list_lock;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='ctx'> 	struct deferred_split deferred_split_queue;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -335,6 +284,43 @@ struct mem_cgroup {</div><div class='ctx'> 	struct lru_gen_mm_list mm_list;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEMCG_V1</div><div class='add'>+	/* Legacy consumer-oriented counters */</div><div class='add'>+	struct page_counter kmem;		/* v1 only */</div><div class='add'>+	struct page_counter tcpmem;		/* v1 only */</div><div class='add'>+</div><div class='add'>+	struct memcg1_events_percpu __percpu *events_percpu;</div><div class='add'>+</div><div class='add'>+	unsigned long soft_limit;</div><div class='add'>+</div><div class='add'>+	/* protected by memcg_oom_lock */</div><div class='add'>+	bool oom_lock;</div><div class='add'>+	int under_oom;</div><div class='add'>+</div><div class='add'>+	/* OOM-Killer disable */</div><div class='add'>+	int oom_kill_disable;</div><div class='add'>+</div><div class='add'>+	/* protect arrays of thresholds */</div><div class='add'>+	struct mutex thresholds_lock;</div><div class='add'>+</div><div class='add'>+	/* thresholds for memory usage. RCU-protected */</div><div class='add'>+	struct mem_cgroup_thresholds thresholds;</div><div class='add'>+</div><div class='add'>+	/* thresholds for mem+swap usage. RCU-protected */</div><div class='add'>+	struct mem_cgroup_thresholds memsw_thresholds;</div><div class='add'>+</div><div class='add'>+	/* For oom notifier event fd */</div><div class='add'>+	struct list_head oom_notify;</div><div class='add'>+</div><div class='add'>+	/* Legacy tcp memory accounting */</div><div class='add'>+	bool tcpmem_active;</div><div class='add'>+	int tcpmem_pressure;</div><div class='add'>+</div><div class='add'>+	/* List of events which userspace want to receive */</div><div class='add'>+	struct list_head event_list;</div><div class='add'>+	spinlock_t event_list_lock;</div><div class='add'>+#endif /* CONFIG_MEMCG_V1 */</div><div class='add'>+</div><div class='ctx'> 	struct mem_cgroup_per_node *nodeinfo[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -348,15 +334,40 @@ struct mem_cgroup {</div><div class='ctx'> extern struct mem_cgroup *root_mem_cgroup;</div><div class='ctx'> </div><div class='ctx'> enum page_memcg_data_flags {</div><div class='del'>-	/* page-&gt;memcg_data is a pointer to an objcgs vector */</div><div class='del'>-	MEMCG_DATA_OBJCGS = (1UL &lt;&lt; 0),</div><div class='add'>+	/* page-&gt;memcg_data is a pointer to an slabobj_ext vector */</div><div class='add'>+	MEMCG_DATA_OBJEXTS = (1UL &lt;&lt; 0),</div><div class='ctx'> 	/* page has been accounted as a non-slab kernel page */</div><div class='ctx'> 	MEMCG_DATA_KMEM = (1UL &lt;&lt; 1),</div><div class='ctx'> 	/* the next bit after the last actual flag */</div><div class='ctx'> 	__NR_MEMCG_DATA_FLAGS  = (1UL &lt;&lt; 2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MEMCG_DATA_FLAGS_MASK (__NR_MEMCG_DATA_FLAGS - 1)</div><div class='add'>+#define __OBJEXTS_ALLOC_FAIL	MEMCG_DATA_OBJEXTS</div><div class='add'>+#define __FIRST_OBJEXT_FLAG	__NR_MEMCG_DATA_FLAGS</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MEMCG */</div><div class='add'>+</div><div class='add'>+#define __OBJEXTS_ALLOC_FAIL	(1UL &lt;&lt; 0)</div><div class='add'>+#define __FIRST_OBJEXT_FLAG	(1UL &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MEMCG */</div><div class='add'>+</div><div class='add'>+enum objext_flags {</div><div class='add'>+	/*</div><div class='add'>+	 * Use bit 0 with zero other bits to signal that slabobj_ext vector</div><div class='add'>+	 * failed to allocate. The same bit 0 with valid upper bits means</div><div class='add'>+	 * MEMCG_DATA_OBJEXTS.</div><div class='add'>+	 */</div><div class='add'>+	OBJEXTS_ALLOC_FAIL = __OBJEXTS_ALLOC_FAIL,</div><div class='add'>+	/* slabobj_ext vector allocated with kmalloc_nolock() */</div><div class='add'>+	OBJEXTS_NOSPIN_ALLOC = __FIRST_OBJEXT_FLAG,</div><div class='add'>+	/* the next bit after the last actual flag */</div><div class='add'>+	__NR_OBJEXTS_FLAGS  = (__FIRST_OBJEXT_FLAG &lt;&lt; 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OBJEXTS_FLAGS_MASK (__NR_OBJEXTS_FLAGS - 1)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> </div><div class='ctx'> static inline bool folio_memcg_kmem(struct folio *folio);</div><div class='ctx'> </div><div class='hunk'>@@ -364,11 +375,11 @@ static inline bool folio_memcg_kmem(struct folio *folio);</div><div class='ctx'>  * After the initialization objcg-&gt;memcg is always pointing at</div><div class='ctx'>  * a valid memcg, but can be atomically swapped to the parent memcg.</div><div class='ctx'>  *</div><div class='del'>- * The caller must ensure that the returned memcg won't be released:</div><div class='del'>- * e.g. acquire the rcu_read_lock or css_set_lock.</div><div class='add'>+ * The caller must ensure that the returned memcg won't be released.</div><div class='ctx'>  */</div><div class='ctx'> static inline struct mem_cgroup *obj_cgroup_memcg(struct obj_cgroup *objcg)</div><div class='ctx'> {</div><div class='add'>+	lockdep_assert_once(rcu_read_lock_held() || lockdep_is_held(&amp;cgroup_mutex));</div><div class='ctx'> 	return READ_ONCE(objcg-&gt;memcg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -387,10 +398,10 @@ static inline struct mem_cgroup *__folio_memcg(struct folio *folio)</div><div class='ctx'> 	unsigned long memcg_data = folio-&gt;memcg_data;</div><div class='ctx'> </div><div class='ctx'> 	VM_BUG_ON_FOLIO(folio_test_slab(folio), folio);</div><div class='del'>-	VM_BUG_ON_FOLIO(memcg_data &amp; MEMCG_DATA_OBJCGS, folio);</div><div class='add'>+	VM_BUG_ON_FOLIO(memcg_data &amp; MEMCG_DATA_OBJEXTS, folio);</div><div class='ctx'> 	VM_BUG_ON_FOLIO(memcg_data &amp; MEMCG_DATA_KMEM, folio);</div><div class='ctx'> </div><div class='del'>-	return (struct mem_cgroup *)(memcg_data &amp; ~MEMCG_DATA_FLAGS_MASK);</div><div class='add'>+	return (struct mem_cgroup *)(memcg_data &amp; ~OBJEXTS_FLAGS_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -408,10 +419,10 @@ static inline struct obj_cgroup *__folio_objcg(struct folio *folio)</div><div class='ctx'> 	unsigned long memcg_data = folio-&gt;memcg_data;</div><div class='ctx'> </div><div class='ctx'> 	VM_BUG_ON_FOLIO(folio_test_slab(folio), folio);</div><div class='del'>-	VM_BUG_ON_FOLIO(memcg_data &amp; MEMCG_DATA_OBJCGS, folio);</div><div class='add'>+	VM_BUG_ON_FOLIO(memcg_data &amp; MEMCG_DATA_OBJEXTS, folio);</div><div class='ctx'> 	VM_BUG_ON_FOLIO(!(memcg_data &amp; MEMCG_DATA_KMEM), folio);</div><div class='ctx'> </div><div class='del'>-	return (struct obj_cgroup *)(memcg_data &amp; ~MEMCG_DATA_FLAGS_MASK);</div><div class='add'>+	return (struct obj_cgroup *)(memcg_data &amp; ~OBJEXTS_FLAGS_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -428,9 +439,7 @@ static inline struct obj_cgroup *__folio_objcg(struct folio *folio)</div><div class='ctx'>  *</div><div class='ctx'>  * - the folio lock</div><div class='ctx'>  * - LRU isolation</div><div class='del'>- * - folio_memcg_lock()</div><div class='ctx'>  * - exclusive reference</div><div class='del'>- * - mem_cgroup_trylock_pages()</div><div class='ctx'>  *</div><div class='ctx'>  * For a kmem folio a caller should hold an rcu read lock to protect memcg</div><div class='ctx'>  * associated with a kmem folio from being released.</div><div class='hunk'>@@ -442,37 +451,15 @@ static inline struct mem_cgroup *folio_memcg(struct folio *folio)</div><div class='ctx'> 	return __folio_memcg(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct mem_cgroup *page_memcg(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_memcg(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * folio_memcg_rcu - Locklessly get the memory cgroup associated with a folio.</div><div class='add'>+/*</div><div class='add'>+ * folio_memcg_charged - If a folio is charged to a memory cgroup.</div><div class='ctx'>  * @folio: Pointer to the folio.</div><div class='ctx'>  *</div><div class='del'>- * This function assumes that the folio is known to have a</div><div class='del'>- * proper memory cgroup pointer. It's not safe to call this function</div><div class='del'>- * against some type of folios, e.g. slab folios or ex-slab folios.</div><div class='del'>- *</div><div class='del'>- * Return: A pointer to the memory cgroup associated with the folio,</div><div class='del'>- * or NULL.</div><div class='add'>+ * Returns true if folio is charged to a memory cgroup, otherwise returns false.</div><div class='ctx'>  */</div><div class='del'>-static inline struct mem_cgroup *folio_memcg_rcu(struct folio *folio)</div><div class='add'>+static inline bool folio_memcg_charged(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	unsigned long memcg_data = READ_ONCE(folio-&gt;memcg_data);</div><div class='del'>-</div><div class='del'>-	VM_BUG_ON_FOLIO(folio_test_slab(folio), folio);</div><div class='del'>-	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='del'>-</div><div class='del'>-	if (memcg_data &amp; MEMCG_DATA_KMEM) {</div><div class='del'>-		struct obj_cgroup *objcg;</div><div class='del'>-</div><div class='del'>-		objcg = (void *)(memcg_data &amp; ~MEMCG_DATA_FLAGS_MASK);</div><div class='del'>-		return obj_cgroup_memcg(objcg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (struct mem_cgroup *)(memcg_data &amp; ~MEMCG_DATA_FLAGS_MASK);</div><div class='add'>+	return folio-&gt;memcg_data != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -490,9 +477,7 @@ static inline struct mem_cgroup *folio_memcg_rcu(struct folio *folio)</div><div class='ctx'>  *</div><div class='ctx'>  * - the folio lock</div><div class='ctx'>  * - LRU isolation</div><div class='del'>- * - lock_folio_memcg()</div><div class='ctx'>  * - exclusive reference</div><div class='del'>- * - mem_cgroup_trylock_pages()</div><div class='ctx'>  *</div><div class='ctx'>  * For a kmem folio a caller should hold an rcu read lock to protect memcg</div><div class='ctx'>  * associated with a kmem folio from being released.</div><div class='hunk'>@@ -505,17 +490,17 @@ static inline struct mem_cgroup *folio_memcg_check(struct folio *folio)</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long memcg_data = READ_ONCE(folio-&gt;memcg_data);</div><div class='ctx'> </div><div class='del'>-	if (memcg_data &amp; MEMCG_DATA_OBJCGS)</div><div class='add'>+	if (memcg_data &amp; MEMCG_DATA_OBJEXTS)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (memcg_data &amp; MEMCG_DATA_KMEM) {</div><div class='ctx'> 		struct obj_cgroup *objcg;</div><div class='ctx'> </div><div class='del'>-		objcg = (void *)(memcg_data &amp; ~MEMCG_DATA_FLAGS_MASK);</div><div class='add'>+		objcg = (void *)(memcg_data &amp; ~OBJEXTS_FLAGS_MASK);</div><div class='ctx'> 		return obj_cgroup_memcg(objcg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (struct mem_cgroup *)(memcg_data &amp; ~MEMCG_DATA_FLAGS_MASK);</div><div class='add'>+	return (struct mem_cgroup *)(memcg_data &amp; ~OBJEXTS_FLAGS_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct mem_cgroup *page_memcg_check(struct page *page)</div><div class='hunk'>@@ -539,7 +524,6 @@ retry:</div><div class='ctx'> 	return memcg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='ctx'> /*</div><div class='ctx'>  * folio_memcg_kmem - Check if the folio has the memcg_kmem flag set.</div><div class='ctx'>  * @folio: Pointer to the folio.</div><div class='hunk'>@@ -551,19 +535,10 @@ retry:</div><div class='ctx'> static inline bool folio_memcg_kmem(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON_PGFLAGS(PageTail(&amp;folio-&gt;page), &amp;folio-&gt;page);</div><div class='del'>-	VM_BUG_ON_FOLIO(folio-&gt;memcg_data &amp; MEMCG_DATA_OBJCGS, folio);</div><div class='add'>+	VM_BUG_ON_FOLIO(folio-&gt;memcg_data &amp; MEMCG_DATA_OBJEXTS, folio);</div><div class='ctx'> 	return folio-&gt;memcg_data &amp; MEMCG_DATA_KMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-static inline bool folio_memcg_kmem(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static inline bool PageMemcgKmem(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_memcg_kmem(page_folio(page));</div><div class='hunk'>@@ -664,8 +639,6 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *target,</div><div class='ctx'> 		page_counter_read(&amp;memcg-&gt;memory);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mem_cgroup_commit_charge(struct folio *folio, struct mem_cgroup *memcg);</div><div class='del'>-</div><div class='ctx'> int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -690,12 +663,10 @@ static inline int mem_cgroup_charge(struct folio *folio, struct mm_struct *mm,</div><div class='ctx'> 	return __mem_cgroup_charge(folio, mm, gfp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg, gfp_t gfp,</div><div class='del'>-		long nr_pages);</div><div class='add'>+int mem_cgroup_charge_hugetlb(struct folio* folio, gfp_t gfp);</div><div class='ctx'> </div><div class='ctx'> int mem_cgroup_swapin_charge_folio(struct folio *folio, struct mm_struct *mm,</div><div class='ctx'> 				  gfp_t gfp, swp_entry_t entry);</div><div class='del'>-void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry);</div><div class='ctx'> </div><div class='ctx'> void __mem_cgroup_uncharge(struct folio *folio);</div><div class='ctx'> </div><div class='hunk'>@@ -712,18 +683,15 @@ static inline void mem_cgroup_uncharge(struct folio *folio)</div><div class='ctx'> 	__mem_cgroup_uncharge(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __mem_cgroup_uncharge_list(struct list_head *page_list);</div><div class='del'>-static inline void mem_cgroup_uncharge_list(struct list_head *page_list)</div><div class='add'>+void __mem_cgroup_uncharge_folios(struct folio_batch *folios);</div><div class='add'>+static inline void mem_cgroup_uncharge_folios(struct folio_batch *folios)</div><div class='ctx'> {</div><div class='ctx'> 	if (mem_cgroup_disabled())</div><div class='ctx'> 		return;</div><div class='del'>-	__mem_cgroup_uncharge_list(page_list);</div><div class='add'>+	__mem_cgroup_uncharge_folios(folios);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mem_cgroup_cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages);</div><div class='del'>-</div><div class='ctx'> void mem_cgroup_replace_folio(struct folio *old, struct folio *new);</div><div class='del'>-</div><div class='ctx'> void mem_cgroup_migrate(struct folio *old, struct folio *new);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -782,6 +750,8 @@ struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm);</div><div class='ctx'> </div><div class='ctx'> struct mem_cgroup *get_mem_cgroup_from_current(void);</div><div class='ctx'> </div><div class='add'>+struct mem_cgroup *get_mem_cgroup_from_folio(struct folio *folio);</div><div class='add'>+</div><div class='ctx'> struct lruvec *folio_lruvec_lock(struct folio *folio);</div><div class='ctx'> struct lruvec *folio_lruvec_lock_irq(struct folio *folio);</div><div class='ctx'> struct lruvec *folio_lruvec_lock_irqsave(struct folio *folio,</div><div class='hunk'>@@ -819,7 +789,8 @@ static inline void obj_cgroup_get_many(struct obj_cgroup *objcg,</div><div class='ctx'> </div><div class='ctx'> static inline void obj_cgroup_put(struct obj_cgroup *objcg)</div><div class='ctx'> {</div><div class='del'>-	percpu_ref_put(&amp;objcg-&gt;refcnt);</div><div class='add'>+	if (objcg)</div><div class='add'>+		percpu_ref_put(&amp;objcg-&gt;refcnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool mem_cgroup_tryget(struct mem_cgroup *memcg)</div><div class='hunk'>@@ -938,7 +909,13 @@ unsigned long mem_cgroup_get_zone_lru_size(struct lruvec *lruvec,</div><div class='ctx'> 	return READ_ONCE(mz-&gt;lru_zone_size[zone_idx][lru]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mem_cgroup_handle_over_high(gfp_t gfp_mask);</div><div class='add'>+void __mem_cgroup_handle_over_high(gfp_t gfp_mask);</div><div class='add'>+</div><div class='add'>+static inline void mem_cgroup_handle_over_high(gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(current-&gt;memcg_nr_pages_over_high))</div><div class='add'>+		__mem_cgroup_handle_over_high(gfp_mask);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg);</div><div class='ctx'> </div><div class='hunk'>@@ -949,63 +926,16 @@ void mem_cgroup_print_oom_context(struct mem_cgroup *memcg,</div><div class='ctx'> </div><div class='ctx'> void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg);</div><div class='ctx'> </div><div class='del'>-static inline void mem_cgroup_enter_user_fault(void)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(current-&gt;in_user_fault);</div><div class='del'>-	current-&gt;in_user_fault = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mem_cgroup_exit_user_fault(void)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(!current-&gt;in_user_fault);</div><div class='del'>-	current-&gt;in_user_fault = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool task_in_memcg_oom(struct task_struct *p)</div><div class='del'>-{</div><div class='del'>-	return p-&gt;memcg_in_oom;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool mem_cgroup_oom_synchronize(bool wait);</div><div class='ctx'> struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim,</div><div class='ctx'> 					    struct mem_cgroup *oom_domain);</div><div class='ctx'> void mem_cgroup_print_oom_group(struct mem_cgroup *memcg);</div><div class='ctx'> </div><div class='del'>-void folio_memcg_lock(struct folio *folio);</div><div class='del'>-void folio_memcg_unlock(struct folio *folio);</div><div class='del'>-</div><div class='del'>-void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val);</div><div class='del'>-</div><div class='del'>-/* try to stablize folio_memcg() for all the pages in a memcg */</div><div class='del'>-static inline bool mem_cgroup_trylock_pages(struct mem_cgroup *memcg)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-</div><div class='del'>-	if (mem_cgroup_disabled() || !atomic_read(&amp;memcg-&gt;moving_account))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mem_cgroup_unlock_pages(void)</div><div class='del'>-{</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* idx can be of type enum memcg_stat_item or node_stat_item */</div><div class='del'>-static inline void mod_memcg_state(struct mem_cgroup *memcg,</div><div class='del'>-				   int idx, int val)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	__mod_memcg_state(memcg, idx, val);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='add'>+void mod_memcg_state(struct mem_cgroup *memcg,</div><div class='add'>+		     enum memcg_stat_item idx, int val);</div><div class='ctx'> </div><div class='ctx'> static inline void mod_memcg_page_state(struct page *page,</div><div class='del'>-					int idx, int val)</div><div class='add'>+					enum memcg_stat_item idx, int val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mem_cgroup *memcg;</div><div class='ctx'> </div><div class='hunk'>@@ -1013,90 +943,24 @@ static inline void mod_memcg_page_state(struct page *page,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	memcg = page_memcg(page);</div><div class='add'>+	memcg = folio_memcg(page_folio(page));</div><div class='ctx'> 	if (memcg)</div><div class='ctx'> 		mod_memcg_state(memcg, idx, val);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx);</div><div class='del'>-</div><div class='del'>-static inline unsigned long lruvec_page_state(struct lruvec *lruvec,</div><div class='del'>-					      enum node_stat_item idx)</div><div class='del'>-{</div><div class='del'>-	struct mem_cgroup_per_node *pn;</div><div class='del'>-	long x;</div><div class='del'>-</div><div class='del'>-	if (mem_cgroup_disabled())</div><div class='del'>-		return node_page_state(lruvec_pgdat(lruvec), idx);</div><div class='del'>-</div><div class='del'>-	pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec);</div><div class='del'>-	x = READ_ONCE(pn-&gt;lruvec_stats.state[idx]);</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	if (x &lt; 0)</div><div class='del'>-		x = 0;</div><div class='del'>-#endif</div><div class='del'>-	return x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec,</div><div class='del'>-						    enum node_stat_item idx)</div><div class='del'>-{</div><div class='del'>-	struct mem_cgroup_per_node *pn;</div><div class='del'>-	long x = 0;</div><div class='del'>-</div><div class='del'>-	if (mem_cgroup_disabled())</div><div class='del'>-		return node_page_state(lruvec_pgdat(lruvec), idx);</div><div class='del'>-</div><div class='del'>-	pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec);</div><div class='del'>-	x = READ_ONCE(pn-&gt;lruvec_stats.state_local[idx]);</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	if (x &lt; 0)</div><div class='del'>-		x = 0;</div><div class='del'>-#endif</div><div class='del'>-	return x;</div><div class='del'>-}</div><div class='add'>+unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item idx);</div><div class='add'>+unsigned long lruvec_page_state_local(struct lruvec *lruvec,</div><div class='add'>+				      enum node_stat_item idx);</div><div class='ctx'> </div><div class='ctx'> void mem_cgroup_flush_stats(struct mem_cgroup *memcg);</div><div class='ctx'> void mem_cgroup_flush_stats_ratelimited(struct mem_cgroup *memcg);</div><div class='ctx'> </div><div class='del'>-void __mod_memcg_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx,</div><div class='del'>-			      int val);</div><div class='del'>-void __mod_lruvec_kmem_state(void *p, enum node_stat_item idx, int val);</div><div class='del'>-</div><div class='del'>-static inline void mod_lruvec_kmem_state(void *p, enum node_stat_item idx,</div><div class='del'>-					 int val)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	__mod_lruvec_kmem_state(p, idx, val);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mod_memcg_lruvec_state(struct lruvec *lruvec,</div><div class='del'>-					  enum node_stat_item idx, int val)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	__mod_memcg_lruvec_state(lruvec, idx, val);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __count_memcg_events(struct mem_cgroup *memcg, enum vm_event_item idx,</div><div class='del'>-			  unsigned long count);</div><div class='del'>-</div><div class='del'>-static inline void count_memcg_events(struct mem_cgroup *memcg,</div><div class='del'>-				      enum vm_event_item idx,</div><div class='del'>-				      unsigned long count)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='add'>+void mod_lruvec_kmem_state(void *p, enum node_stat_item idx, int val);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	__count_memcg_events(memcg, idx, count);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='add'>+void count_memcg_events(struct mem_cgroup *memcg, enum vm_event_item idx,</div><div class='add'>+			unsigned long count);</div><div class='ctx'> </div><div class='ctx'> static inline void count_memcg_folio_events(struct folio *folio,</div><div class='ctx'> 		enum vm_event_item idx, unsigned long nr)</div><div class='hunk'>@@ -1107,8 +971,8 @@ static inline void count_memcg_folio_events(struct folio *folio,</div><div class='ctx'> 		count_memcg_events(memcg, idx, nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void count_memcg_event_mm(struct mm_struct *mm,</div><div class='del'>-					enum vm_event_item idx)</div><div class='add'>+static inline void count_memcg_events_mm(struct mm_struct *mm,</div><div class='add'>+					enum vm_event_item idx, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct mem_cgroup *memcg;</div><div class='ctx'> </div><div class='hunk'>@@ -1118,33 +982,23 @@ static inline void count_memcg_event_mm(struct mm_struct *mm,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	memcg = mem_cgroup_from_task(rcu_dereference(mm-&gt;owner));</div><div class='ctx'> 	if (likely(memcg))</div><div class='del'>-		count_memcg_events(memcg, idx, 1);</div><div class='add'>+		count_memcg_events(memcg, idx, count);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void memcg_memory_event(struct mem_cgroup *memcg,</div><div class='del'>-				      enum memcg_memory_event event)</div><div class='add'>+static inline void count_memcg_event_mm(struct mm_struct *mm,</div><div class='add'>+					enum vm_event_item idx)</div><div class='ctx'> {</div><div class='del'>-	bool swap_event = event == MEMCG_SWAP_HIGH || event == MEMCG_SWAP_MAX ||</div><div class='del'>-			  event == MEMCG_SWAP_FAIL;</div><div class='del'>-</div><div class='del'>-	atomic_long_inc(&amp;memcg-&gt;memory_events_local[event]);</div><div class='del'>-	if (!swap_event)</div><div class='del'>-		cgroup_file_notify(&amp;memcg-&gt;events_local_file);</div><div class='add'>+	count_memcg_events_mm(mm, idx, 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		atomic_long_inc(&amp;memcg-&gt;memory_events[event]);</div><div class='del'>-		if (swap_event)</div><div class='del'>-			cgroup_file_notify(&amp;memcg-&gt;swap_events_file);</div><div class='del'>-		else</div><div class='del'>-			cgroup_file_notify(&amp;memcg-&gt;events_file);</div><div class='add'>+void __memcg_memory_event(struct mem_cgroup *memcg,</div><div class='add'>+			  enum memcg_memory_event event, bool allow_spinning);</div><div class='ctx'> </div><div class='del'>-		if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))</div><div class='del'>-			break;</div><div class='del'>-		if (cgrp_dfl_root.flags &amp; CGRP_ROOT_MEMORY_LOCAL_EVENTS)</div><div class='del'>-			break;</div><div class='del'>-	} while ((memcg = parent_mem_cgroup(memcg)) &amp;&amp;</div><div class='del'>-		 !mem_cgroup_is_root(memcg));</div><div class='add'>+static inline void memcg_memory_event(struct mem_cgroup *memcg,</div><div class='add'>+				      enum memcg_memory_event event)</div><div class='add'>+{</div><div class='add'>+	__memcg_memory_event(memcg, event, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void memcg_memory_event_mm(struct mm_struct *mm,</div><div class='hunk'>@@ -1162,30 +1016,42 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm,</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void split_page_memcg(struct page *head, unsigned int nr);</div><div class='add'>+void split_page_memcg(struct page *first, unsigned order);</div><div class='add'>+void folio_split_memcg_refs(struct folio *folio, unsigned old_order,</div><div class='add'>+		unsigned new_order);</div><div class='ctx'> </div><div class='del'>-unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order,</div><div class='del'>-						gfp_t gfp_mask,</div><div class='del'>-						unsigned long *total_scanned);</div><div class='add'>+static inline u64 cgroup_id_from_mm(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	struct mem_cgroup *memcg;</div><div class='add'>+	u64 id;</div><div class='ctx'> </div><div class='add'>+	if (mem_cgroup_disabled())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	memcg = mem_cgroup_from_task(rcu_dereference(mm-&gt;owner));</div><div class='add'>+	if (!memcg)</div><div class='add'>+		memcg = root_mem_cgroup;</div><div class='add'>+	id = cgroup_id(memcg-&gt;css.cgroup);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern int mem_cgroup_init(void);</div><div class='ctx'> #else /* CONFIG_MEMCG */</div><div class='ctx'> </div><div class='ctx'> #define MEM_CGROUP_ID_SHIFT	0</div><div class='ctx'> </div><div class='del'>-static inline struct mem_cgroup *folio_memcg(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='add'>+#define root_mem_cgroup		(NULL)</div><div class='ctx'> </div><div class='del'>-static inline struct mem_cgroup *page_memcg(struct page *page)</div><div class='add'>+static inline struct mem_cgroup *folio_memcg(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct mem_cgroup *folio_memcg_rcu(struct folio *folio)</div><div class='add'>+static inline bool folio_memcg_charged(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON_ONCE(!rcu_read_lock_held());</div><div class='del'>-	return NULL;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct mem_cgroup *folio_memcg_check(struct folio *folio)</div><div class='hunk'>@@ -1263,21 +1129,15 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *target,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mem_cgroup_commit_charge(struct folio *folio,</div><div class='del'>-		struct mem_cgroup *memcg)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int mem_cgroup_charge(struct folio *folio,</div><div class='ctx'> 		struct mm_struct *mm, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int mem_cgroup_hugetlb_try_charge(struct mem_cgroup *memcg,</div><div class='del'>-		gfp_t gfp, long nr_pages)</div><div class='add'>+static inline int mem_cgroup_charge_hugetlb(struct folio* folio, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+        return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int mem_cgroup_swapin_charge_folio(struct folio *folio,</div><div class='hunk'>@@ -1286,20 +1146,11 @@ static inline int mem_cgroup_swapin_charge_folio(struct folio *folio,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void mem_cgroup_uncharge(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mem_cgroup_uncharge_list(struct list_head *page_list)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mem_cgroup_cancel_charge(struct mem_cgroup *memcg,</div><div class='del'>-		unsigned int nr_pages)</div><div class='add'>+static inline void mem_cgroup_uncharge_folios(struct folio_batch *folios)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1350,12 +1201,21 @@ static inline struct mem_cgroup *get_mem_cgroup_from_current(void)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct mem_cgroup *get_mem_cgroup_from_folio(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline</div><div class='ctx'> struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void obj_cgroup_get(struct obj_cgroup *objcg)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void obj_cgroup_put(struct obj_cgroup *objcg)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -1483,48 +1343,10 @@ mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void folio_memcg_lock(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void folio_memcg_unlock(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool mem_cgroup_trylock_pages(struct mem_cgroup *memcg)</div><div class='del'>-{</div><div class='del'>-	/* to match folio_memcg_rcu() */</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mem_cgroup_unlock_pages(void)</div><div class='del'>-{</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void mem_cgroup_handle_over_high(gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mem_cgroup_enter_user_fault(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mem_cgroup_exit_user_fault(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool task_in_memcg_oom(struct task_struct *p)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool mem_cgroup_oom_synchronize(bool wait)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct mem_cgroup *mem_cgroup_get_oom_group(</div><div class='ctx'> 	struct task_struct *victim, struct mem_cgroup *oom_domain)</div><div class='ctx'> {</div><div class='hunk'>@@ -1535,20 +1357,14 @@ static inline void mem_cgroup_print_oom_group(struct mem_cgroup *memcg)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __mod_memcg_state(struct mem_cgroup *memcg,</div><div class='del'>-				     int idx,</div><div class='del'>-				     int nr)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void mod_memcg_state(struct mem_cgroup *memcg,</div><div class='del'>-				   int idx,</div><div class='add'>+				   enum memcg_stat_item idx,</div><div class='ctx'> 				   int nr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void mod_memcg_page_state(struct page *page,</div><div class='del'>-					int idx, int val)</div><div class='add'>+					enum memcg_stat_item idx, int val)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1577,19 +1393,6 @@ static inline void mem_cgroup_flush_stats_ratelimited(struct mem_cgroup *memcg)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __mod_memcg_lruvec_state(struct lruvec *lruvec,</div><div class='del'>-					    enum node_stat_item idx, int val)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __mod_lruvec_kmem_state(void *p, enum node_stat_item idx,</div><div class='del'>-					   int val)</div><div class='del'>-{</div><div class='del'>-	struct page *page = virt_to_head_page(p);</div><div class='del'>-</div><div class='del'>-	__mod_node_page_state(page_pgdat(page), idx, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void mod_lruvec_kmem_state(void *p, enum node_stat_item idx,</div><div class='ctx'> 					 int val)</div><div class='ctx'> {</div><div class='hunk'>@@ -1599,12 +1402,6 @@ static inline void mod_lruvec_kmem_state(void *p, enum node_stat_item idx,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void count_memcg_events(struct mem_cgroup *memcg,</div><div class='del'>-				      enum vm_event_item idx,</div><div class='del'>-				      unsigned long count)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __count_memcg_events(struct mem_cgroup *memcg,</div><div class='ctx'> 					enum vm_event_item idx,</div><div class='ctx'> 					unsigned long count)</div><div class='ctx'> {</div><div class='hunk'>@@ -1615,34 +1412,46 @@ static inline void count_memcg_folio_events(struct folio *folio,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-void count_memcg_event_mm(struct mm_struct *mm, enum vm_event_item idx)</div><div class='add'>+static inline void count_memcg_events_mm(struct mm_struct *mm,</div><div class='add'>+					enum vm_event_item idx, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void split_page_memcg(struct page *head, unsigned int nr)</div><div class='add'>+static inline</div><div class='add'>+void count_memcg_event_mm(struct mm_struct *mm, enum vm_event_item idx)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order,</div><div class='del'>-					    gfp_t gfp_mask,</div><div class='del'>-					    unsigned long *total_scanned)</div><div class='add'>+static inline void split_page_memcg(struct page *first, unsigned order)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_MEMCG */</div><div class='ctx'> </div><div class='del'>-static inline void __inc_lruvec_kmem_state(void *p, enum node_stat_item idx)</div><div class='add'>+static inline void folio_split_memcg_refs(struct folio *folio,</div><div class='add'>+		unsigned old_order, unsigned new_order)</div><div class='ctx'> {</div><div class='del'>-	__mod_lruvec_kmem_state(p, idx, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __dec_lruvec_kmem_state(void *p, enum node_stat_item idx)</div><div class='add'>+static inline u64 cgroup_id_from_mm(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	__mod_lruvec_kmem_state(p, idx, -1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int mem_cgroup_init(void) { return 0; }</div><div class='add'>+#endif /* CONFIG_MEMCG */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Extended information for slab objects stored as an array in page-&gt;memcg_data</div><div class='add'>+ * if MEMCG_DATA_OBJEXTS is set.</div><div class='add'>+ */</div><div class='add'>+struct slabobj_ext {</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='add'>+	struct obj_cgroup *objcg;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING</div><div class='add'>+	union codetag_ref ref;</div><div class='add'>+#endif</div><div class='add'>+} __aligned(8);</div><div class='add'>+</div><div class='ctx'> static inline struct lruvec *parent_lruvec(struct lruvec *lruvec)</div><div class='ctx'> {</div><div class='ctx'> 	struct mem_cgroup *memcg;</div><div class='hunk'>@@ -1672,7 +1481,7 @@ static inline void unlock_page_lruvec_irqrestore(struct lruvec *lruvec,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lruvec-&gt;lru_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Test requires a stable page-&gt;memcg binding, see page_memcg() */</div><div class='add'>+/* Test requires a stable folio-&gt;memcg binding, see folio_memcg() */</div><div class='ctx'> static inline bool folio_matches_lruvec(struct folio *folio,</div><div class='ctx'> 		struct lruvec *lruvec)</div><div class='ctx'> {</div><div class='hunk'>@@ -1694,18 +1503,18 @@ static inline struct lruvec *folio_lruvec_relock_irq(struct folio *folio,</div><div class='ctx'> 	return folio_lruvec_lock_irq(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Don't lock again iff page's lruvec locked */</div><div class='del'>-static inline struct lruvec *folio_lruvec_relock_irqsave(struct folio *folio,</div><div class='del'>-		struct lruvec *locked_lruvec, unsigned long *flags)</div><div class='add'>+/* Don't lock again iff folio's lruvec locked */</div><div class='add'>+static inline void folio_lruvec_relock_irqsave(struct folio *folio,</div><div class='add'>+		struct lruvec **lruvecp, unsigned long *flags)</div><div class='ctx'> {</div><div class='del'>-	if (locked_lruvec) {</div><div class='del'>-		if (folio_matches_lruvec(folio, locked_lruvec))</div><div class='del'>-			return locked_lruvec;</div><div class='add'>+	if (*lruvecp) {</div><div class='add'>+		if (folio_matches_lruvec(folio, *lruvecp))</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-		unlock_page_lruvec_irqrestore(locked_lruvec, *flags);</div><div class='add'>+		unlock_page_lruvec_irqrestore(*lruvecp, *flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return folio_lruvec_lock_irqsave(folio, flags);</div><div class='add'>+	*lruvecp = folio_lruvec_lock_irqsave(folio, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CGROUP_WRITEBACK</div><div class='hunk'>@@ -1760,45 +1569,100 @@ static inline void mem_cgroup_flush_foreign(struct bdi_writeback *wb)</div><div class='ctx'> #endif	/* CONFIG_CGROUP_WRITEBACK */</div><div class='ctx'> </div><div class='ctx'> struct sock;</div><div class='del'>-bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages,</div><div class='del'>-			     gfp_t gfp_mask);</div><div class='del'>-void mem_cgroup_uncharge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages);</div><div class='ctx'> #ifdef CONFIG_MEMCG</div><div class='ctx'> extern struct static_key_false memcg_sockets_enabled_key;</div><div class='ctx'> #define mem_cgroup_sockets_enabled static_branch_unlikely(&amp;memcg_sockets_enabled_key)</div><div class='add'>+</div><div class='ctx'> void mem_cgroup_sk_alloc(struct sock *sk);</div><div class='ctx'> void mem_cgroup_sk_free(struct sock *sk);</div><div class='del'>-static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)</div><div class='add'>+void mem_cgroup_sk_inherit(const struct sock *sk, struct sock *newsk);</div><div class='add'>+bool mem_cgroup_sk_charge(const struct sock *sk, unsigned int nr_pages,</div><div class='add'>+			  gfp_t gfp_mask);</div><div class='add'>+void mem_cgroup_sk_uncharge(const struct sock *sk, unsigned int nr_pages);</div><div class='add'>+</div><div class='add'>+#if BITS_PER_LONG &lt; 64</div><div class='add'>+static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg)</div><div class='add'>+{</div><div class='add'>+	u64 val = get_jiffies_64() + HZ;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	write_seqlock_irqsave(&amp;memcg-&gt;socket_pressure_seqlock, flags);</div><div class='add'>+	memcg-&gt;socket_pressure = val;</div><div class='add'>+	write_sequnlock_irqrestore(&amp;memcg-&gt;socket_pressure_seqlock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg)</div><div class='ctx'> {</div><div class='del'>-	if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))</div><div class='del'>-		return !!memcg-&gt;tcpmem_pressure;</div><div class='add'>+	unsigned int seq;</div><div class='add'>+	u64 val;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='del'>-		if (time_before(jiffies, READ_ONCE(memcg-&gt;socket_pressure)))</div><div class='del'>-			return true;</div><div class='del'>-	} while ((memcg = parent_mem_cgroup(memcg)));</div><div class='del'>-	return false;</div><div class='add'>+		seq = read_seqbegin(&amp;memcg-&gt;socket_pressure_seqlock);</div><div class='add'>+		val = memcg-&gt;socket_pressure;</div><div class='add'>+	} while (read_seqretry(&amp;memcg-&gt;socket_pressure_seqlock, seq));</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(memcg-&gt;socket_pressure, jiffies + HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(memcg-&gt;socket_pressure);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int alloc_shrinker_info(struct mem_cgroup *memcg);</div><div class='ctx'> void free_shrinker_info(struct mem_cgroup *memcg);</div><div class='ctx'> void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id);</div><div class='ctx'> void reparent_shrinker_deferred(struct mem_cgroup *memcg);</div><div class='add'>+</div><div class='add'>+static inline int shrinker_id(struct shrinker *shrinker)</div><div class='add'>+{</div><div class='add'>+	return shrinker-&gt;id;</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> #define mem_cgroup_sockets_enabled 0</div><div class='del'>-static inline void mem_cgroup_sk_alloc(struct sock *sk) { };</div><div class='del'>-static inline void mem_cgroup_sk_free(struct sock *sk) { };</div><div class='del'>-static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)</div><div class='add'>+</div><div class='add'>+static inline void mem_cgroup_sk_alloc(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mem_cgroup_sk_free(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mem_cgroup_sk_inherit(const struct sock *sk, struct sock *newsk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mem_cgroup_sk_charge(const struct sock *sk,</div><div class='add'>+					unsigned int nr_pages,</div><div class='add'>+					gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void mem_cgroup_sk_uncharge(const struct sock *sk,</div><div class='add'>+					  unsigned int nr_pages)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void set_shrinker_bit(struct mem_cgroup *memcg,</div><div class='ctx'> 				    int nid, int shrinker_id)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int shrinker_id(struct shrinker *shrinker)</div><div class='add'>+{</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> bool mem_cgroup_kmem_disabled(void);</div><div class='ctx'> int __memcg_kmem_charge_page(struct page *page, gfp_t gfp, int order);</div><div class='ctx'> void __memcg_kmem_uncharge_page(struct page *page, int order);</div><div class='hunk'>@@ -1863,11 +1727,11 @@ static inline int memcg_kmem_id(struct mem_cgroup *memcg)</div><div class='ctx'> 	return memcg ? memcg-&gt;kmemcg_id : -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct mem_cgroup *mem_cgroup_from_obj(void *p);</div><div class='ctx'> struct mem_cgroup *mem_cgroup_from_slab_obj(void *p);</div><div class='ctx'> </div><div class='del'>-static inline void count_objcg_event(struct obj_cgroup *objcg,</div><div class='del'>-				     enum vm_event_item idx)</div><div class='add'>+static inline void count_objcg_events(struct obj_cgroup *objcg,</div><div class='add'>+				      enum vm_event_item idx,</div><div class='add'>+				      unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct mem_cgroup *memcg;</div><div class='ctx'> </div><div class='hunk'>@@ -1876,10 +1740,19 @@ static inline void count_objcg_event(struct obj_cgroup *objcg,</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	memcg = obj_cgroup_memcg(objcg);</div><div class='del'>-	count_memcg_events(memcg, idx, 1);</div><div class='add'>+	count_memcg_events(memcg, idx, count);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool mem_cgroup_node_allowed(struct mem_cgroup *memcg, int nid);</div><div class='add'>+</div><div class='add'>+void mem_cgroup_show_protected_memory(struct mem_cgroup *memcg);</div><div class='add'>+</div><div class='add'>+static inline bool memcg_is_dying(struct mem_cgroup *memcg)</div><div class='add'>+{</div><div class='add'>+	return memcg ? css_is_dying(&amp;memcg-&gt;css) : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline bool mem_cgroup_kmem_disabled(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1926,24 +1799,38 @@ static inline int memcg_kmem_id(struct mem_cgroup *memcg)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct mem_cgroup *mem_cgroup_from_obj(void *p)</div><div class='add'>+static inline struct mem_cgroup *mem_cgroup_from_slab_obj(void *p)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct mem_cgroup *mem_cgroup_from_slab_obj(void *p)</div><div class='add'>+static inline void count_objcg_events(struct obj_cgroup *objcg,</div><div class='add'>+				      enum vm_event_item idx,</div><div class='add'>+				      unsigned long count)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void count_objcg_event(struct obj_cgroup *objcg,</div><div class='del'>-				     enum vm_event_item idx)</div><div class='add'>+static inline ino_t page_cgroup_ino(struct page *page)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mem_cgroup_node_allowed(struct mem_cgroup *memcg, int nid)</div><div class='ctx'> {</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_MEMCG_KMEM */</div><div class='add'>+static inline void mem_cgroup_show_protected_memory(struct mem_cgroup *memcg)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MEMCG_KMEM) &amp;&amp; defined(CONFIG_ZSWAP)</div><div class='add'>+static inline bool memcg_is_dying(struct mem_cgroup *memcg)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MEMCG */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MEMCG) &amp;&amp; defined(CONFIG_ZSWAP)</div><div class='ctx'> bool obj_cgroup_may_zswap(struct obj_cgroup *objcg);</div><div class='ctx'> void obj_cgroup_charge_zswap(struct obj_cgroup *objcg, size_t size);</div><div class='ctx'> void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size);</div><div class='hunk'>@@ -1968,4 +1855,71 @@ static inline bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* Cgroup v1-related declarations */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMCG_V1</div><div class='add'>+unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order,</div><div class='add'>+					gfp_t gfp_mask,</div><div class='add'>+					unsigned long *total_scanned);</div><div class='add'>+</div><div class='add'>+bool mem_cgroup_oom_synchronize(bool wait);</div><div class='add'>+</div><div class='add'>+static inline bool task_in_memcg_oom(struct task_struct *p)</div><div class='add'>+{</div><div class='add'>+	return p-&gt;memcg_in_oom;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mem_cgroup_enter_user_fault(void)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(current-&gt;in_user_fault);</div><div class='add'>+	current-&gt;in_user_fault = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mem_cgroup_exit_user_fault(void)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!current-&gt;in_user_fault);</div><div class='add'>+	current-&gt;in_user_fault = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void memcg1_swapout(struct folio *folio, swp_entry_t entry);</div><div class='add'>+void memcg1_swapin(swp_entry_t entry, unsigned int nr_pages);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MEMCG_V1 */</div><div class='add'>+static inline</div><div class='add'>+unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order,</div><div class='add'>+					gfp_t gfp_mask,</div><div class='add'>+					unsigned long *total_scanned)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool task_in_memcg_oom(struct task_struct *p)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mem_cgroup_oom_synchronize(bool wait)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mem_cgroup_enter_user_fault(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mem_cgroup_exit_user_fault(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void memcg1_swapout(struct folio *folio, swp_entry_t entry)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void memcg1_swapin(swp_entry_t entry, unsigned int nr_pages)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MEMCG_V1 */</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_MEMCONTROL_H */</div><div class='head'>diff --git a/include/linux/memfd.h b/include/linux/memfd.h<br/>index e7abf6fa4c52..cc74de3dbcfe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memfd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memfd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memfd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memfd.h</a></div><div class='hunk'>@@ -4,13 +4,33 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> </div><div class='add'>+#define MEMFD_ANON_NAME "[memfd]"</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MEMFD_CREATE</div><div class='ctx'> extern long memfd_fcntl(struct file *file, unsigned int cmd, unsigned int arg);</div><div class='add'>+struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx);</div><div class='add'>+/*</div><div class='add'>+ * Check for any existing seals on mmap, return an error if access is denied due</div><div class='add'>+ * to sealing, or 0 otherwise.</div><div class='add'>+ *</div><div class='add'>+ * We also update VMA flags if appropriate by manipulating the VMA flags pointed</div><div class='add'>+ * to by vm_flags_ptr.</div><div class='add'>+ */</div><div class='add'>+int memfd_check_seals_mmap(struct file *file, vm_flags_t *vm_flags_ptr);</div><div class='ctx'> #else</div><div class='ctx'> static inline long memfd_fcntl(struct file *f, unsigned int c, unsigned int a)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+static inline struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+static inline int memfd_check_seals_mmap(struct file *file,</div><div class='add'>+					 vm_flags_t *vm_flags_ptr)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_MEMFD_H */</div><div class='head'>diff --git a/include/linux/memory-failure.h b/include/linux/memory-failure.h<br/>new file mode 100644<br/>index 000000000000..bc326503d2d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memory-failure.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memory-failure.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_MEMORY_FAILURE_H</div><div class='add'>+#define _LINUX_MEMORY_FAILURE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/interval_tree.h&gt;</div><div class='add'>+</div><div class='add'>+struct pfn_address_space;</div><div class='add'>+</div><div class='add'>+struct pfn_address_space {</div><div class='add'>+	struct interval_tree_node node;</div><div class='add'>+	struct address_space *mapping;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int register_pfn_address_space(struct pfn_address_space *pfn_space);</div><div class='add'>+void unregister_pfn_address_space(struct pfn_address_space *pfn_space);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_MEMORY_FAILURE_H */</div><div class='head'>diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h<br/>index 69e781900082..7a805796fcfd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memory-tiers.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memory-tiers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memory-tiers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memory-tiers.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'>  * adistance value (slightly faster) than default DRAM adistance to be part of</div><div class='ctx'>  * the same memory tier.</div><div class='ctx'>  */</div><div class='del'>-#define MEMTIER_ADISTANCE_DRAM	((4 * MEMTIER_CHUNK_SIZE) + (MEMTIER_CHUNK_SIZE &gt;&gt; 1))</div><div class='add'>+#define MEMTIER_ADISTANCE_DRAM	((4L * MEMTIER_CHUNK_SIZE) + (MEMTIER_CHUNK_SIZE &gt;&gt; 1))</div><div class='ctx'> </div><div class='ctx'> struct memory_tier;</div><div class='ctx'> struct memory_dev_type {</div><div class='hunk'>@@ -38,6 +38,7 @@ struct access_coordinate;</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> extern bool numa_demotion_enabled;</div><div class='ctx'> extern struct memory_dev_type *default_dram_type;</div><div class='add'>+extern nodemask_t default_dram_nodes;</div><div class='ctx'> struct memory_dev_type *alloc_memory_type(int adistance);</div><div class='ctx'> void put_memory_type(struct memory_dev_type *memtype);</div><div class='ctx'> void init_node_memory_type(int node, struct memory_dev_type *default_type);</div><div class='hunk'>@@ -48,6 +49,9 @@ int mt_calc_adistance(int node, int *adist);</div><div class='ctx'> int mt_set_default_dram_perf(int nid, struct access_coordinate *perf,</div><div class='ctx'> 			     const char *source);</div><div class='ctx'> int mt_perf_to_adistance(struct access_coordinate *perf, int *adist);</div><div class='add'>+struct memory_dev_type *mt_find_alloc_memory_type(int adist,</div><div class='add'>+						  struct list_head *memory_types);</div><div class='add'>+void mt_put_memory_types(struct list_head *memory_types);</div><div class='ctx'> #ifdef CONFIG_MIGRATION</div><div class='ctx'> int next_demotion_node(int node);</div><div class='ctx'> void node_get_allowed_targets(pg_data_t *pgdat, nodemask_t *targets);</div><div class='hunk'>@@ -73,6 +77,7 @@ static inline bool node_is_toptier(int node)</div><div class='ctx'> </div><div class='ctx'> #define numa_demotion_enabled	false</div><div class='ctx'> #define default_dram_type	NULL</div><div class='add'>+#define default_dram_nodes	NODE_MASK_NONE</div><div class='ctx'> /*</div><div class='ctx'>  * CONFIG_NUMA implementation returns non NULL error.</div><div class='ctx'>  */</div><div class='hunk'>@@ -136,5 +141,15 @@ static inline int mt_perf_to_adistance(struct access_coordinate *perf, int *adis</div><div class='ctx'> {</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline struct memory_dev_type *mt_find_alloc_memory_type(int adist,</div><div class='add'>+								struct list_head *memory_types)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mt_put_memory_types(struct list_head *memory_types)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif	/* CONFIG_NUMA */</div><div class='ctx'> #endif  /* _LINUX_MEMORY_TIERS_H */</div><div class='head'>diff --git a/include/linux/memory.h b/include/linux/memory.h<br/>index f53cfdaaaa41..faeaa921e55b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memory.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memory.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memory.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memory.h</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> /**</div><div class='ctx'>  * struct memory_group - a logical group of memory blocks</div><div class='ctx'>  * @nid: The node id for all memory blocks inside the memory group.</div><div class='del'>- * @blocks: List of all memory blocks belonging to this memory group.</div><div class='add'>+ * @memory_blocks: List of all memory blocks belonging to this memory group.</div><div class='ctx'>  * @present_kernel_pages: Present (online) memory outside ZONE_MOVABLE of this</div><div class='ctx'>  *			  memory group.</div><div class='ctx'>  * @present_movable_pages: Present (online) memory in ZONE_MOVABLE of this</div><div class='hunk'>@@ -64,9 +64,19 @@ struct memory_group {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum memory_block_state {</div><div class='add'>+	/* These states are exposed to userspace as text strings in sysfs */</div><div class='add'>+	MEM_ONLINE,		/* exposed to userspace */</div><div class='add'>+	MEM_GOING_OFFLINE,	/* exposed to userspace */</div><div class='add'>+	MEM_OFFLINE,		/* exposed to userspace */</div><div class='add'>+	MEM_GOING_ONLINE,</div><div class='add'>+	MEM_CANCEL_ONLINE,</div><div class='add'>+	MEM_CANCEL_OFFLINE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct memory_block {</div><div class='ctx'> 	unsigned long start_section_nr;</div><div class='del'>-	unsigned long state;		/* serialized by the dev-&gt;lock */</div><div class='add'>+	enum memory_block_state state;	/* serialized by the dev-&gt;lock */</div><div class='ctx'> 	int online_type;		/* for passing data to online routine */</div><div class='ctx'> 	int nid;			/* NID for this memory block */</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -89,31 +99,22 @@ int arch_get_memory_phys_device(unsigned long start_pfn);</div><div class='ctx'> unsigned long memory_block_size_bytes(void);</div><div class='ctx'> int set_memory_block_size_order(unsigned int order);</div><div class='ctx'> </div><div class='del'>-/* These states are exposed to userspace as text strings in sysfs */</div><div class='del'>-#define	MEM_ONLINE		(1&lt;&lt;0) /* exposed to userspace */</div><div class='del'>-#define	MEM_GOING_OFFLINE	(1&lt;&lt;1) /* exposed to userspace */</div><div class='del'>-#define	MEM_OFFLINE		(1&lt;&lt;2) /* exposed to userspace */</div><div class='del'>-#define	MEM_GOING_ONLINE	(1&lt;&lt;3)</div><div class='del'>-#define	MEM_CANCEL_ONLINE	(1&lt;&lt;4)</div><div class='del'>-#define	MEM_CANCEL_OFFLINE	(1&lt;&lt;5)</div><div class='del'>-</div><div class='ctx'> struct memory_notify {</div><div class='ctx'> 	unsigned long start_pfn;</div><div class='ctx'> 	unsigned long nr_pages;</div><div class='del'>-	int status_change_nid_normal;</div><div class='del'>-	int status_change_nid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct notifier_block;</div><div class='ctx'> struct mem_section;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Priorities for the hotplug memory callback routines (stored in decreasing</div><div class='del'>- * order in the callback chain)</div><div class='add'>+ * Priorities for the hotplug memory callback routines. Invoked from</div><div class='add'>+ * high to low. Higher priorities correspond to higher numbers.</div><div class='ctx'>  */</div><div class='ctx'> #define DEFAULT_CALLBACK_PRI	0</div><div class='ctx'> #define SLAB_CALLBACK_PRI	1</div><div class='del'>-#define HMAT_CALLBACK_PRI	2</div><div class='add'>+#define CXL_CALLBACK_PRI	5</div><div class='add'>+#define HMAT_CALLBACK_PRI	6</div><div class='ctx'> #define MM_COMPUTE_BATCH_PRI	10</div><div class='ctx'> #define CPUSET_CALLBACK_PRI	10</div><div class='ctx'> #define MEMTIER_HOTPLUG_PRI	100</div><div class='hunk'>@@ -131,7 +132,7 @@ static inline int register_memory_notifier(struct notifier_block *nb)</div><div class='ctx'> static inline void unregister_memory_notifier(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline int memory_notify(unsigned long val, void *v)</div><div class='add'>+static inline int memory_notify(enum memory_block_state state, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -139,15 +140,23 @@ static inline int hotplug_memory_notifier(notifier_fn_t fn, int pri)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline int memory_block_advise_max_size(unsigned long size)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static inline unsigned long memory_block_advised_max_size(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #else /* CONFIG_MEMORY_HOTPLUG */</div><div class='ctx'> extern int register_memory_notifier(struct notifier_block *nb);</div><div class='ctx'> extern void unregister_memory_notifier(struct notifier_block *nb);</div><div class='ctx'> int create_memory_block_devices(unsigned long start, unsigned long size,</div><div class='del'>-				struct vmem_altmap *altmap,</div><div class='add'>+				int nid, struct vmem_altmap *altmap,</div><div class='ctx'> 				struct memory_group *group);</div><div class='ctx'> void remove_memory_block_devices(unsigned long start, unsigned long size);</div><div class='ctx'> extern void memory_dev_init(void);</div><div class='del'>-extern int memory_notify(unsigned long val, void *v);</div><div class='add'>+extern int memory_notify(enum memory_block_state state, void *v);</div><div class='ctx'> extern struct memory_block *find_memory_block(unsigned long section_nr);</div><div class='ctx'> typedef int (*walk_memory_blocks_func_t)(struct memory_block *, void *);</div><div class='ctx'> extern int walk_memory_blocks(unsigned long start, unsigned long size,</div><div class='hunk'>@@ -161,16 +170,35 @@ struct memory_group *memory_group_find_by_id(int mgid);</div><div class='ctx'> typedef int (*walk_memory_groups_func_t)(struct memory_group *, void *);</div><div class='ctx'> int walk_dynamic_memory_groups(int nid, walk_memory_groups_func_t func,</div><div class='ctx'> 			       struct memory_group *excluded, void *arg);</div><div class='add'>+struct memory_block *find_memory_block_by_id(unsigned long block_id);</div><div class='ctx'> #define hotplug_memory_notifier(fn, pri) ({		\</div><div class='ctx'> 	static __meminitdata struct notifier_block fn##_mem_nb =\</div><div class='ctx'> 		{ .notifier_call = fn, .priority = pri };\</div><div class='ctx'> 	register_memory_notifier(&amp;fn##_mem_nb);			\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+extern int sections_per_block;</div><div class='add'>+</div><div class='add'>+static inline unsigned long memory_block_id(unsigned long section_nr)</div><div class='add'>+{</div><div class='add'>+	return section_nr / sections_per_block;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long pfn_to_block_id(unsigned long pfn)</div><div class='add'>+{</div><div class='add'>+	return memory_block_id(pfn_to_section_nr(pfn));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long phys_to_block_id(unsigned long phys)</div><div class='add'>+{</div><div class='add'>+	return pfn_to_block_id(PFN_DOWN(phys));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='del'>-void memory_block_add_nid(struct memory_block *mem, int nid,</div><div class='del'>-			  enum meminit_context context);</div><div class='add'>+void memory_block_add_nid_early(struct memory_block *mem, int nid);</div><div class='ctx'> #endif /* CONFIG_NUMA */</div><div class='add'>+int memory_block_advise_max_size(unsigned long size);</div><div class='add'>+unsigned long memory_block_advised_max_size(void);</div><div class='ctx'> #endif	/* CONFIG_MEMORY_HOTPLUG */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/memory/ti-aemif.h b/include/linux/memory/ti-aemif.h<br/>new file mode 100644<br/>index 000000000000..da94a9d985e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memory/ti-aemif.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memory/ti-aemif.h</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef __MEMORY_TI_AEMIF_H</div><div class='add'>+#define __MEMORY_TI_AEMIF_H</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct aemif_cs_timings: structure to hold CS timing configuration</div><div class='add'>+ * values are expressed in number of clock cycles - 1</div><div class='add'>+ * @ta: minimum turn around time</div><div class='add'>+ * @rhold: read hold width</div><div class='add'>+ * @rstrobe: read strobe width</div><div class='add'>+ * @rsetup: read setup width</div><div class='add'>+ * @whold: write hold width</div><div class='add'>+ * @wstrobe: write strobe width</div><div class='add'>+ * @wsetup: write setup width</div><div class='add'>+ */</div><div class='add'>+struct aemif_cs_timings {</div><div class='add'>+	u32	ta;</div><div class='add'>+	u32	rhold;</div><div class='add'>+	u32	rstrobe;</div><div class='add'>+	u32	rsetup;</div><div class='add'>+	u32	whold;</div><div class='add'>+	u32	wstrobe;</div><div class='add'>+	u32	wsetup;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aemif_device;</div><div class='add'>+</div><div class='add'>+int aemif_set_cs_timings(struct aemif_device *aemif, u8 cs, struct aemif_cs_timings *timings);</div><div class='add'>+int aemif_check_cs_timings(struct aemif_cs_timings *timings);</div><div class='add'>+</div><div class='add'>+#endif // __MEMORY_TI_AEMIF_H</div><div class='head'>diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h<br/>index 7d2076583494..f2f16cdd73ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memory_hotplug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memory_hotplug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memory_hotplug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memory_hotplug.h</a></div><div class='hunk'>@@ -16,54 +16,6 @@ struct resource;</div><div class='ctx'> struct vmem_altmap;</div><div class='ctx'> struct dev_pagemap;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HAVE_ARCH_NODEDATA_EXTENSION</div><div class='del'>-/*</div><div class='del'>- * For supporting node-hotadd, we have to allocate a new pgdat.</div><div class='del'>- *</div><div class='del'>- * If an arch has generic style NODE_DATA(),</div><div class='del'>- * node_data[nid] = kzalloc() works well. But it depends on the architecture.</div><div class='del'>- *</div><div class='del'>- * In general, generic_alloc_nodedata() is used.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-extern pg_data_t *arch_alloc_nodedata(int nid);</div><div class='del'>-extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat);</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */</div><div class='del'>-</div><div class='del'>-#define arch_alloc_nodedata(nid)	generic_alloc_nodedata(nid)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-/*</div><div class='del'>- * XXX: node aware allocation can't work well to get new node's memory at this time.</div><div class='del'>- *	Because, pgdat for the new node is not allocated/initialized yet itself.</div><div class='del'>- *	To use new node's memory, more consideration will be necessary.</div><div class='del'>- */</div><div class='del'>-#define generic_alloc_nodedata(nid)				\</div><div class='del'>-({								\</div><div class='del'>-	memblock_alloc(sizeof(*pgdat), SMP_CACHE_BYTES);	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-extern pg_data_t *node_data[];</div><div class='del'>-static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)</div><div class='del'>-{</div><div class='del'>-	node_data[nid] = pgdat;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_NUMA */</div><div class='del'>-</div><div class='del'>-/* never called */</div><div class='del'>-static inline pg_data_t *generic_alloc_nodedata(int nid)</div><div class='del'>-{</div><div class='del'>-	BUG();</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_NUMA */</div><div class='del'>-#endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='ctx'> struct page *pfn_to_online_page(unsigned long pfn);</div><div class='ctx'> </div><div class='hunk'>@@ -121,6 +73,7 @@ struct mhp_params {</div><div class='ctx'> </div><div class='ctx'> bool mhp_range_allowed(u64 start, u64 size, bool need_mapping);</div><div class='ctx'> struct range mhp_get_pluggable_range(bool need_mapping);</div><div class='add'>+bool mhp_supports_memmap_on_memory(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Zone resizing functions</div><div class='hunk'>@@ -158,8 +111,8 @@ extern int mhp_init_memmap_on_memory(unsigned long pfn, unsigned long nr_pages,</div><div class='ctx'> extern void mhp_deinit_memmap_on_memory(unsigned long pfn, unsigned long nr_pages);</div><div class='ctx'> extern int online_pages(unsigned long pfn, unsigned long nr_pages,</div><div class='ctx'> 			struct zone *zone, struct memory_group *group);</div><div class='del'>-extern void __offline_isolated_pages(unsigned long start_pfn,</div><div class='del'>-				     unsigned long end_pfn);</div><div class='add'>+extern unsigned long __offline_isolated_pages(unsigned long start_pfn,</div><div class='add'>+		unsigned long end_pfn);</div><div class='ctx'> </div><div class='ctx'> typedef void (*online_page_callback_t)(struct page *page, unsigned int order);</div><div class='ctx'> </div><div class='hunk'>@@ -175,8 +128,6 @@ extern u64 max_mem_size;</div><div class='ctx'> </div><div class='ctx'> extern int mhp_online_type_from_str(const char *str);</div><div class='ctx'> </div><div class='del'>-/* Default online_type (MMOP_*) when new memory blocks are added. */</div><div class='del'>-extern int mhp_default_online_type;</div><div class='ctx'> /* If movable_node boot option specified */</div><div class='ctx'> extern bool movable_node_enabled;</div><div class='ctx'> static inline bool movable_node_is_enabled(void)</div><div class='hunk'>@@ -262,6 +213,11 @@ static inline bool movable_node_is_enabled(void)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool mhp_supports_memmap_on_memory(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void pgdat_kswapd_lock(pg_data_t *pgdat) {}</div><div class='ctx'> static inline void pgdat_kswapd_unlock(pg_data_t *pgdat) {}</div><div class='ctx'> static inline void pgdat_kswapd_lock_init(pg_data_t *pgdat) {}</div><div class='hunk'>@@ -329,6 +285,9 @@ static inline void __remove_memory(u64 start, u64 size) {}</div><div class='ctx'> #endif /* CONFIG_MEMORY_HOTREMOVE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='add'>+/* Default online_type (MMOP_*) when new memory blocks are added. */</div><div class='add'>+extern int mhp_get_default_online_type(void);</div><div class='add'>+extern void mhp_set_default_online_type(int online_type);</div><div class='ctx'> extern void __ref free_area_init_core_hotplug(struct pglist_data *pgdat);</div><div class='ctx'> extern int __add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);</div><div class='ctx'> extern int add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);</div><div class='hunk'>@@ -339,7 +298,8 @@ extern int add_memory_driver_managed(int nid, u64 start, u64 size,</div><div class='ctx'> 				     mhp_t mhp_flags);</div><div class='ctx'> extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,</div><div class='ctx'> 				   unsigned long nr_pages,</div><div class='del'>-				   struct vmem_altmap *altmap, int migratetype);</div><div class='add'>+				   struct vmem_altmap *altmap, int migratetype,</div><div class='add'>+				   bool isolate_pageblock);</div><div class='ctx'> extern void remove_pfn_range_from_zone(struct zone *zone,</div><div class='ctx'> 				       unsigned long start_pfn,</div><div class='ctx'> 				       unsigned long nr_pages);</div><div class='head'>diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h<br/>index 931b118336f4..0fe96f3ab3ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mempolicy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mempolicy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mempolicy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mempolicy.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/node.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/mempolicy.h&gt;</div><div class='hunk'>@@ -47,7 +48,7 @@ struct mempolicy {</div><div class='ctx'> 	atomic_t refcnt;</div><div class='ctx'> 	unsigned short mode; 	/* See MPOL_* above */</div><div class='ctx'> 	unsigned short flags;	/* See set_mempolicy() MPOL_F_* above */</div><div class='del'>-	nodemask_t nodes;	/* interleave/bind/perfer */</div><div class='add'>+	nodemask_t nodes;	/* interleave/bind/preferred/etc */</div><div class='ctx'> 	int home_node;		/* Home node to use for MPOL_BIND and MPOL_PREFERRED_MANY */</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='hunk'>@@ -167,7 +168,8 @@ extern void mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol);</div><div class='ctx'> /* Check if a vma is migratable */</div><div class='ctx'> extern bool vma_migratable(struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='del'>-int mpol_misplaced(struct folio *, struct vm_area_struct *, unsigned long);</div><div class='add'>+int mpol_misplaced(struct folio *folio, struct vm_fault *vmf,</div><div class='add'>+					unsigned long addr);</div><div class='ctx'> extern void mpol_put_task_policy(struct task_struct *);</div><div class='ctx'> </div><div class='ctx'> static inline bool mpol_is_preferred_many(struct mempolicy *pol)</div><div class='hunk'>@@ -177,6 +179,9 @@ static inline bool mpol_is_preferred_many(struct mempolicy *pol)</div><div class='ctx'> </div><div class='ctx'> extern bool apply_policy_zone(struct mempolicy *policy, enum zone_type zone);</div><div class='ctx'> </div><div class='add'>+extern int mempolicy_set_node_perf(unsigned int node,</div><div class='add'>+				   struct access_coordinate *coords);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> struct mempolicy {};</div><div class='hunk'>@@ -282,7 +287,7 @@ static inline int mpol_parse_str(char *str, struct mempolicy **mpol)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline int mpol_misplaced(struct folio *folio,</div><div class='del'>-				 struct vm_area_struct *vma,</div><div class='add'>+				 struct vm_fault *vmf,</div><div class='ctx'> 				 unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	return -1; /* no node preference */</div><div class='head'>diff --git a/include/linux/mempool.h b/include/linux/mempool.h<br/>index 7be1e32e6d42..e8e440e04a06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mempool.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mempool.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mempool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mempool.h</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> #ifndef _LINUX_MEMPOOL_H</div><div class='ctx'> #define _LINUX_MEMPOOL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/alloc_tag.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -13,7 +15,7 @@ struct kmem_cache;</div><div class='ctx'> typedef void * (mempool_alloc_t)(gfp_t gfp_mask, void *pool_data);</div><div class='ctx'> typedef void (mempool_free_t)(void *element, void *pool_data);</div><div class='ctx'> </div><div class='del'>-typedef struct mempool_s {</div><div class='add'>+typedef struct mempool {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	int min_nr;		/* nr of elements at *elements */</div><div class='ctx'> 	int curr_nr;		/* Current nr of elements at *elements */</div><div class='hunk'>@@ -25,34 +27,53 @@ typedef struct mempool_s {</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='ctx'> } mempool_t;</div><div class='ctx'> </div><div class='del'>-static inline bool mempool_initialized(mempool_t *pool)</div><div class='add'>+static inline bool mempool_initialized(struct mempool *pool)</div><div class='ctx'> {</div><div class='ctx'> 	return pool-&gt;elements != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool mempool_is_saturated(mempool_t *pool)</div><div class='add'>+static inline bool mempool_is_saturated(struct mempool *pool)</div><div class='ctx'> {</div><div class='ctx'> 	return READ_ONCE(pool-&gt;curr_nr) &gt;= pool-&gt;min_nr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mempool_exit(mempool_t *pool);</div><div class='del'>-int mempool_init_node(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn,</div><div class='del'>-		      mempool_free_t *free_fn, void *pool_data,</div><div class='del'>-		      gfp_t gfp_mask, int node_id);</div><div class='del'>-int mempool_init(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn,</div><div class='del'>-		 mempool_free_t *free_fn, void *pool_data);</div><div class='del'>-</div><div class='del'>-extern mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,</div><div class='del'>-			mempool_free_t *free_fn, void *pool_data);</div><div class='del'>-extern mempool_t *mempool_create_node(int min_nr, mempool_alloc_t *alloc_fn,</div><div class='del'>-			mempool_free_t *free_fn, void *pool_data,</div><div class='del'>-			gfp_t gfp_mask, int nid);</div><div class='del'>-</div><div class='del'>-extern int mempool_resize(mempool_t *pool, int new_min_nr);</div><div class='del'>-extern void mempool_destroy(mempool_t *pool);</div><div class='del'>-extern void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) __malloc;</div><div class='del'>-extern void *mempool_alloc_preallocated(mempool_t *pool) __malloc;</div><div class='del'>-extern void mempool_free(void *element, mempool_t *pool);</div><div class='add'>+void mempool_exit(struct mempool *pool);</div><div class='add'>+int mempool_init_node(struct mempool *pool, int min_nr,</div><div class='add'>+		mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,</div><div class='add'>+		void *pool_data, gfp_t gfp_mask, int node_id);</div><div class='add'>+int mempool_init_noprof(struct mempool *pool, int min_nr,</div><div class='add'>+		mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,</div><div class='add'>+		void *pool_data);</div><div class='add'>+#define mempool_init(...)						\</div><div class='add'>+	alloc_hooks(mempool_init_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+struct mempool *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,</div><div class='add'>+		mempool_free_t *free_fn, void *pool_data);</div><div class='add'>+struct mempool *mempool_create_node_noprof(int min_nr,</div><div class='add'>+		mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,</div><div class='add'>+		void *pool_data, gfp_t gfp_mask, int nid);</div><div class='add'>+#define mempool_create_node(...)					\</div><div class='add'>+	alloc_hooks(mempool_create_node_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+#define mempool_create(_min_nr, _alloc_fn, _free_fn, _pool_data)	\</div><div class='add'>+	mempool_create_node(_min_nr, _alloc_fn, _free_fn, _pool_data,	\</div><div class='add'>+			    GFP_KERNEL, NUMA_NO_NODE)</div><div class='add'>+</div><div class='add'>+int mempool_resize(struct mempool *pool, int new_min_nr);</div><div class='add'>+void mempool_destroy(struct mempool *pool);</div><div class='add'>+</div><div class='add'>+void *mempool_alloc_noprof(struct mempool *pool, gfp_t gfp_mask) __malloc;</div><div class='add'>+#define mempool_alloc(...)						\</div><div class='add'>+	alloc_hooks(mempool_alloc_noprof(__VA_ARGS__))</div><div class='add'>+int mempool_alloc_bulk_noprof(struct mempool *pool, void **elem,</div><div class='add'>+		unsigned int count, unsigned int allocated);</div><div class='add'>+#define mempool_alloc_bulk(...)						\</div><div class='add'>+	alloc_hooks(mempool_alloc_bulk_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+void *mempool_alloc_preallocated(struct mempool *pool) __malloc;</div><div class='add'>+void mempool_free(void *element, struct mempool *pool);</div><div class='add'>+unsigned int mempool_free_bulk(struct mempool *pool, void **elem,</div><div class='add'>+		unsigned int count);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A mempool_alloc_t and mempool_free_t that get the memory from</div><div class='hunk'>@@ -62,19 +83,10 @@ extern void mempool_free(void *element, mempool_t *pool);</div><div class='ctx'> void *mempool_alloc_slab(gfp_t gfp_mask, void *pool_data);</div><div class='ctx'> void mempool_free_slab(void *element, void *pool_data);</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-mempool_init_slab_pool(mempool_t *pool, int min_nr, struct kmem_cache *kc)</div><div class='del'>-{</div><div class='del'>-	return mempool_init(pool, min_nr, mempool_alloc_slab,</div><div class='del'>-			    mempool_free_slab, (void *) kc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline mempool_t *</div><div class='del'>-mempool_create_slab_pool(int min_nr, struct kmem_cache *kc)</div><div class='del'>-{</div><div class='del'>-	return mempool_create(min_nr, mempool_alloc_slab, mempool_free_slab,</div><div class='del'>-			      (void *) kc);</div><div class='del'>-}</div><div class='add'>+#define mempool_init_slab_pool(_pool, _min_nr, _kc)			\</div><div class='add'>+	mempool_init(_pool, (_min_nr), mempool_alloc_slab, mempool_free_slab, (void *)(_kc))</div><div class='add'>+#define mempool_create_slab_pool(_min_nr, _kc)			\</div><div class='add'>+	mempool_create((_min_nr), mempool_alloc_slab, mempool_free_slab, (void *)(_kc))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * a mempool_alloc_t and a mempool_free_t to kmalloc and kfree the</div><div class='hunk'>@@ -83,17 +95,12 @@ mempool_create_slab_pool(int min_nr, struct kmem_cache *kc)</div><div class='ctx'> void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data);</div><div class='ctx'> void mempool_kfree(void *element, void *pool_data);</div><div class='ctx'> </div><div class='del'>-static inline int mempool_init_kmalloc_pool(mempool_t *pool, int min_nr, size_t size)</div><div class='del'>-{</div><div class='del'>-	return mempool_init(pool, min_nr, mempool_kmalloc,</div><div class='del'>-			    mempool_kfree, (void *) size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline mempool_t *mempool_create_kmalloc_pool(int min_nr, size_t size)</div><div class='del'>-{</div><div class='del'>-	return mempool_create(min_nr, mempool_kmalloc, mempool_kfree,</div><div class='del'>-			      (void *) size);</div><div class='del'>-}</div><div class='add'>+#define mempool_init_kmalloc_pool(_pool, _min_nr, _size)		\</div><div class='add'>+	mempool_init(_pool, (_min_nr), mempool_kmalloc, mempool_kfree,	\</div><div class='add'>+		     (void *)(unsigned long)(_size))</div><div class='add'>+#define mempool_create_kmalloc_pool(_min_nr, _size)			\</div><div class='add'>+	mempool_create((_min_nr), mempool_kmalloc, mempool_kfree,	\</div><div class='add'>+		       (void *)(unsigned long)(_size))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A mempool_alloc_t and mempool_free_t for a simple page allocator that</div><div class='hunk'>@@ -102,16 +109,11 @@ static inline mempool_t *mempool_create_kmalloc_pool(int min_nr, size_t size)</div><div class='ctx'> void *mempool_alloc_pages(gfp_t gfp_mask, void *pool_data);</div><div class='ctx'> void mempool_free_pages(void *element, void *pool_data);</div><div class='ctx'> </div><div class='del'>-static inline int mempool_init_page_pool(mempool_t *pool, int min_nr, int order)</div><div class='del'>-{</div><div class='del'>-	return mempool_init(pool, min_nr, mempool_alloc_pages,</div><div class='del'>-			    mempool_free_pages, (void *)(long)order);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline mempool_t *mempool_create_page_pool(int min_nr, int order)</div><div class='del'>-{</div><div class='del'>-	return mempool_create(min_nr, mempool_alloc_pages, mempool_free_pages,</div><div class='del'>-			      (void *)(long)order);</div><div class='del'>-}</div><div class='add'>+#define mempool_init_page_pool(_pool, _min_nr, _order)			\</div><div class='add'>+	mempool_init(_pool, (_min_nr), mempool_alloc_pages,		\</div><div class='add'>+		     mempool_free_pages, (void *)(long)(_order))</div><div class='add'>+#define mempool_create_page_pool(_min_nr, _order)			\</div><div class='add'>+	mempool_create((_min_nr), mempool_alloc_pages,			\</div><div class='add'>+		       mempool_free_pages, (void *)(long)(_order))</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_MEMPOOL_H */</div><div class='head'>diff --git a/include/linux/memregion.h b/include/linux/memregion.h<br/>index c01321467789..a55f62cc5266 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memregion.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memregion.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memregion.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memregion.h</a></div><div class='hunk'>@@ -26,8 +26,10 @@ static inline void memregion_free(int id)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cpu_cache_invalidate_memregion - drop any CPU cached data for</div><div class='del'>- *     memregions described by @res_desc</div><div class='del'>- * @res_desc: one of the IORES_DESC_* types</div><div class='add'>+ *     memregion</div><div class='add'>+ * @start: start physical address of the target memory region.</div><div class='add'>+ * @len: length of the target memory region. -1 for all the regions of</div><div class='add'>+ *       the target type.</div><div class='ctx'>  *</div><div class='ctx'>  * Perform cache maintenance after a memory event / operation that</div><div class='ctx'>  * changes the contents of physical memory in a cache-incoherent manner.</div><div class='hunk'>@@ -46,7 +48,7 @@ static inline void memregion_free(int id)</div><div class='ctx'>  * the cache maintenance.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION</div><div class='del'>-int cpu_cache_invalidate_memregion(int res_desc);</div><div class='add'>+int cpu_cache_invalidate_memregion(phys_addr_t start, size_t len);</div><div class='ctx'> bool cpu_cache_has_invalidate_memregion(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline bool cpu_cache_has_invalidate_memregion(void)</div><div class='hunk'>@@ -54,10 +56,16 @@ static inline bool cpu_cache_has_invalidate_memregion(void)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int cpu_cache_invalidate_memregion(int res_desc)</div><div class='add'>+static inline int cpu_cache_invalidate_memregion(phys_addr_t start, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE("CPU cache invalidation required");</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+static inline int cpu_cache_invalidate_all(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_cache_invalidate_memregion(0, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _MEMREGION_H_ */</div><div class='head'>diff --git a/include/linux/memremap.h b/include/linux/memremap.h<br/>index 744c830f4b13..713ec0435b48 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memremap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memremap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memremap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memremap.h</a></div><div class='hunk'>@@ -76,11 +76,11 @@ enum memory_type {</div><div class='ctx'> </div><div class='ctx'> struct dev_pagemap_ops {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Called once the page refcount reaches 0.  The reference count will be</div><div class='add'>+	 * Called once the folio refcount reaches 0.  The reference count will be</div><div class='ctx'> 	 * reset to one by the core code after the method is called to prepare</div><div class='del'>-	 * for handing out the page again.</div><div class='add'>+	 * for handing out the folio again.</div><div class='ctx'> 	 */</div><div class='del'>-	void (*page_free)(struct page *page);</div><div class='add'>+	void (*folio_free)(struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Used for private (un-addressable) device memory only.  Must migrate</div><div class='hunk'>@@ -99,6 +99,13 @@ struct dev_pagemap_ops {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*memory_failure)(struct dev_pagemap *pgmap, unsigned long pfn,</div><div class='ctx'> 			      unsigned long nr_pages, int mf_flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Used for private (un-addressable) device memory only.</div><div class='add'>+	 * This callback is used when a folio is split into</div><div class='add'>+	 * a smaller folio</div><div class='add'>+	 */</div><div class='add'>+	void (*folio_split)(struct folio *head, struct folio *tail);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PGMAP_ALTMAP_VALID	(1 &lt;&lt; 0)</div><div class='hunk'>@@ -108,7 +115,7 @@ struct dev_pagemap_ops {</div><div class='ctx'>  * @altmap: pre-allocated/reserved memory for vmemmap allocations</div><div class='ctx'>  * @ref: reference count that pins the devm_memremap_pages() mapping</div><div class='ctx'>  * @done: completion for @ref</div><div class='del'>- * @type: memory type: see MEMORY_* in memory_hotplug.h</div><div class='add'>+ * @type: memory type: see MEMORY_* above in memremap.h</div><div class='ctx'>  * @flags: PGMAP_* flags to specify defailed behavior</div><div class='ctx'>  * @vmemmap_shift: structural definition of how the vmemmap page metadata</div><div class='ctx'>  *      is populated, specifically the metadata page order.</div><div class='hunk'>@@ -156,47 +163,101 @@ static inline unsigned long pgmap_vmemmap_nr(struct dev_pagemap *pgmap)</div><div class='ctx'> 	return 1 &lt;&lt; pgmap-&gt;vmemmap_shift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool folio_is_device_private(const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_DEVICE_PRIVATE) &amp;&amp;</div><div class='add'>+		folio_is_zone_device(folio) &amp;&amp;</div><div class='add'>+		folio-&gt;pgmap-&gt;type == MEMORY_DEVICE_PRIVATE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool is_device_private_page(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return IS_ENABLED(CONFIG_DEVICE_PRIVATE) &amp;&amp;</div><div class='del'>-		is_zone_device_page(page) &amp;&amp;</div><div class='del'>-		page-&gt;pgmap-&gt;type == MEMORY_DEVICE_PRIVATE;</div><div class='add'>+		folio_is_device_private(page_folio(page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool folio_is_device_private(const struct folio *folio)</div><div class='add'>+static inline bool folio_is_pci_p2pdma(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return is_device_private_page(&amp;folio-&gt;page);</div><div class='add'>+	return IS_ENABLED(CONFIG_PCI_P2PDMA) &amp;&amp;</div><div class='add'>+		folio_is_zone_device(folio) &amp;&amp;</div><div class='add'>+		folio-&gt;pgmap-&gt;type == MEMORY_DEVICE_PCI_P2PDMA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *folio_zone_device_data(const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_FOLIO(!folio_is_device_private(folio), folio);</div><div class='add'>+	return folio-&gt;page.zone_device_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void folio_set_zone_device_data(struct folio *folio, void *data)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_FOLIO(!folio_is_device_private(folio), folio);</div><div class='add'>+	folio-&gt;page.zone_device_data = data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_pci_p2pdma_page(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return IS_ENABLED(CONFIG_PCI_P2PDMA) &amp;&amp;</div><div class='del'>-		is_zone_device_page(page) &amp;&amp;</div><div class='del'>-		page-&gt;pgmap-&gt;type == MEMORY_DEVICE_PCI_P2PDMA;</div><div class='add'>+		folio_is_pci_p2pdma(page_folio(page));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool folio_is_device_coherent(const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return folio_is_zone_device(folio) &amp;&amp;</div><div class='add'>+		folio-&gt;pgmap-&gt;type == MEMORY_DEVICE_COHERENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_device_coherent_page(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return is_zone_device_page(page) &amp;&amp;</div><div class='del'>-		page-&gt;pgmap-&gt;type == MEMORY_DEVICE_COHERENT;</div><div class='add'>+	return folio_is_device_coherent(page_folio(page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool folio_is_device_coherent(const struct folio *folio)</div><div class='add'>+static inline bool folio_is_fsdax(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return is_device_coherent_page(&amp;folio-&gt;page);</div><div class='add'>+	return folio_is_zone_device(folio) &amp;&amp;</div><div class='add'>+		folio-&gt;pgmap-&gt;type == MEMORY_DEVICE_FS_DAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_fsdax_page(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return folio_is_fsdax(page_folio(page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ZONE_DEVICE</div><div class='del'>-void zone_device_page_init(struct page *page);</div><div class='add'>+void zone_device_page_init(struct page *page, unsigned int order);</div><div class='ctx'> void *memremap_pages(struct dev_pagemap *pgmap, int nid);</div><div class='ctx'> void memunmap_pages(struct dev_pagemap *pgmap);</div><div class='ctx'> void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap);</div><div class='ctx'> void devm_memunmap_pages(struct device *dev, struct dev_pagemap *pgmap);</div><div class='del'>-struct dev_pagemap *get_dev_pagemap(unsigned long pfn,</div><div class='del'>-		struct dev_pagemap *pgmap);</div><div class='add'>+struct dev_pagemap *get_dev_pagemap(unsigned long pfn);</div><div class='ctx'> bool pgmap_pfn_valid(struct dev_pagemap *pgmap, unsigned long pfn);</div><div class='ctx'> </div><div class='ctx'> unsigned long memremap_compat_align(void);</div><div class='add'>+</div><div class='add'>+static inline void zone_device_folio_init(struct folio *folio, unsigned int order)</div><div class='add'>+{</div><div class='add'>+	zone_device_page_init(&amp;folio-&gt;page, order);</div><div class='add'>+	if (order)</div><div class='add'>+		folio_set_large_rmappable(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void zone_device_private_split_cb(struct folio *original_folio,</div><div class='add'>+						struct folio *new_folio)</div><div class='add'>+{</div><div class='add'>+	if (folio_is_device_private(original_folio)) {</div><div class='add'>+		if (!original_folio-&gt;pgmap-&gt;ops-&gt;folio_split) {</div><div class='add'>+			if (new_folio) {</div><div class='add'>+				new_folio-&gt;pgmap = original_folio-&gt;pgmap;</div><div class='add'>+				new_folio-&gt;page.mapping =</div><div class='add'>+					original_folio-&gt;page.mapping;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			original_folio-&gt;pgmap-&gt;ops-&gt;folio_split(original_folio,</div><div class='add'>+								 new_folio);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline void *devm_memremap_pages(struct device *dev,</div><div class='ctx'> 		struct dev_pagemap *pgmap)</div><div class='hunk'>@@ -215,8 +276,7 @@ static inline void devm_memunmap_pages(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct dev_pagemap *get_dev_pagemap(unsigned long pfn,</div><div class='del'>-		struct dev_pagemap *pgmap)</div><div class='add'>+static inline struct dev_pagemap *get_dev_pagemap(unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -231,6 +291,11 @@ static inline unsigned long memremap_compat_align(void)</div><div class='ctx'> {</div><div class='ctx'> 	return PAGE_SIZE;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void zone_device_private_split_cb(struct folio *original_folio,</div><div class='add'>+						struct folio *new_folio)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_ZONE_DEVICE */</div><div class='ctx'> </div><div class='ctx'> static inline void put_dev_pagemap(struct dev_pagemap *pgmap)</div><div class='head'>diff --git a/include/linux/memstick.h b/include/linux/memstick.h<br/>index ebf73d4ee969..107bdcbedf79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/memstick.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/memstick.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/memstick.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/memstick.h</a></div><div class='hunk'>@@ -293,7 +293,7 @@ struct memstick_host {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct memstick_driver {</div><div class='del'>-	struct memstick_device_id *id_table;</div><div class='add'>+	const struct memstick_device_id *id_table;</div><div class='ctx'> 	int                       (*probe)(struct memstick_dev *card);</div><div class='ctx'> 	void                      (*remove)(struct memstick_dev *card);</div><div class='ctx'> 	int                       (*suspend)(struct memstick_dev *card,</div><div class='head'>diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h<br/>index def5df6e74bf..551ef1c367d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/88pm80x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/88pm80x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/88pm80x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/88pm80x.h</a></div><div class='hunk'>@@ -294,7 +294,7 @@ struct pm80x_chip {</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> 	struct i2c_client *companion;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='del'>-	struct regmap_irq_chip *regmap_irq_chip;</div><div class='add'>+	const struct regmap_irq_chip *regmap_irq_chip;</div><div class='ctx'> 	struct regmap_irq_chip_data *irq_data;</div><div class='ctx'> 	int type;</div><div class='ctx'> 	int irq;</div><div class='head'>diff --git a/include/linux/mfd/88pm886.h b/include/linux/mfd/88pm886.h<br/>new file mode 100644<br/>index 000000000000..38892ba7b8a4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/88pm886.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/88pm886.h</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef __MFD_88PM886_H</div><div class='add'>+#define __MFD_88PM886_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#define PM886_A1_CHIP_ID		0xa1</div><div class='add'>+</div><div class='add'>+#define PM886_IRQ_ONKEY			0</div><div class='add'>+</div><div class='add'>+#define PM886_PAGE_OFFSET_REGULATORS	1</div><div class='add'>+#define PM886_PAGE_OFFSET_GPADC		2</div><div class='add'>+</div><div class='add'>+#define PM886_REG_ID			0x00</div><div class='add'>+</div><div class='add'>+#define PM886_REG_STATUS1		0x01</div><div class='add'>+#define PM886_ONKEY_STS1		BIT(0)</div><div class='add'>+</div><div class='add'>+#define PM886_REG_INT_STATUS1		0x05</div><div class='add'>+</div><div class='add'>+#define PM886_REG_INT_ENA_1		0x0a</div><div class='add'>+#define PM886_INT_ENA1_ONKEY		BIT(0)</div><div class='add'>+</div><div class='add'>+#define PM886_REG_MISC_CONFIG1		0x14</div><div class='add'>+#define PM886_SW_PDOWN			BIT(5)</div><div class='add'>+</div><div class='add'>+#define PM886_REG_MISC_CONFIG2		0x15</div><div class='add'>+#define PM886_INT_INV			BIT(0)</div><div class='add'>+#define PM886_INT_CLEAR			BIT(1)</div><div class='add'>+#define PM886_INT_RC			0x00</div><div class='add'>+#define PM886_INT_WC			BIT(1)</div><div class='add'>+#define PM886_INT_MASK_MODE		BIT(2)</div><div class='add'>+</div><div class='add'>+#define PM886_REG_RTC_CNT1		0xd1</div><div class='add'>+#define PM886_REG_RTC_CNT2		0xd2</div><div class='add'>+#define PM886_REG_RTC_CNT3		0xd3</div><div class='add'>+#define PM886_REG_RTC_CNT4		0xd4</div><div class='add'>+#define PM886_REG_RTC_SPARE1		0xea</div><div class='add'>+#define PM886_REG_RTC_SPARE2		0xeb</div><div class='add'>+#define PM886_REG_RTC_SPARE3		0xec</div><div class='add'>+#define PM886_REG_RTC_SPARE4		0xed</div><div class='add'>+#define PM886_REG_RTC_SPARE5		0xee</div><div class='add'>+#define PM886_REG_RTC_SPARE6		0xef</div><div class='add'>+</div><div class='add'>+#define PM886_REG_BUCK_EN		0x08</div><div class='add'>+#define PM886_REG_LDO_EN1		0x09</div><div class='add'>+#define PM886_REG_LDO_EN2		0x0a</div><div class='add'>+#define PM886_REG_LDO1_VOUT		0x20</div><div class='add'>+#define PM886_REG_LDO2_VOUT		0x26</div><div class='add'>+#define PM886_REG_LDO3_VOUT		0x2c</div><div class='add'>+#define PM886_REG_LDO4_VOUT		0x32</div><div class='add'>+#define PM886_REG_LDO5_VOUT		0x38</div><div class='add'>+#define PM886_REG_LDO6_VOUT		0x3e</div><div class='add'>+#define PM886_REG_LDO7_VOUT		0x44</div><div class='add'>+#define PM886_REG_LDO8_VOUT		0x4a</div><div class='add'>+#define PM886_REG_LDO9_VOUT		0x50</div><div class='add'>+#define PM886_REG_LDO10_VOUT		0x56</div><div class='add'>+#define PM886_REG_LDO11_VOUT		0x5c</div><div class='add'>+#define PM886_REG_LDO12_VOUT		0x62</div><div class='add'>+#define PM886_REG_LDO13_VOUT		0x68</div><div class='add'>+#define PM886_REG_LDO14_VOUT		0x6e</div><div class='add'>+#define PM886_REG_LDO15_VOUT		0x74</div><div class='add'>+#define PM886_REG_LDO16_VOUT		0x7a</div><div class='add'>+#define PM886_REG_BUCK1_VOUT		0xa5</div><div class='add'>+#define PM886_REG_BUCK2_VOUT		0xb3</div><div class='add'>+#define PM886_REG_BUCK3_VOUT		0xc1</div><div class='add'>+#define PM886_REG_BUCK4_VOUT		0xcf</div><div class='add'>+#define PM886_REG_BUCK5_VOUT		0xdd</div><div class='add'>+</div><div class='add'>+#define PM886_LDO_VSEL_MASK		0x0f</div><div class='add'>+#define PM886_BUCK_VSEL_MASK		0x7f</div><div class='add'>+</div><div class='add'>+/* GPADC enable/disable registers */</div><div class='add'>+#define PM886_REG_GPADC_CONFIG(n)	(n)</div><div class='add'>+</div><div class='add'>+#define PM886_GPADC_VSC_EN		BIT(0)</div><div class='add'>+#define PM886_GPADC_VBAT_EN		BIT(1)</div><div class='add'>+#define PM886_GPADC_GNDDET1_EN		BIT(3)</div><div class='add'>+#define PM886_GPADC_VBUS_EN		BIT(4)</div><div class='add'>+#define PM886_GPADC_VCHG_PWR_EN		BIT(5)</div><div class='add'>+#define PM886_GPADC_VCF_OUT_EN		BIT(6)</div><div class='add'>+#define PM886_GPADC_CONFIG1_EN_ALL	\</div><div class='add'>+	(PM886_GPADC_VSC_EN |		\</div><div class='add'>+	 PM886_GPADC_VBAT_EN |		\</div><div class='add'>+	 PM886_GPADC_GNDDET1_EN |	\</div><div class='add'>+	 PM886_GPADC_VBUS_EN |		\</div><div class='add'>+	 PM886_GPADC_VCHG_PWR_EN |	\</div><div class='add'>+	 PM886_GPADC_VCF_OUT_EN)</div><div class='add'>+</div><div class='add'>+#define PM886_GPADC_TINT_EN		BIT(0)</div><div class='add'>+#define PM886_GPADC_PMODE_EN		BIT(1)</div><div class='add'>+#define PM886_GPADC_GPADC0_EN		BIT(2)</div><div class='add'>+#define PM886_GPADC_GPADC1_EN		BIT(3)</div><div class='add'>+#define PM886_GPADC_GPADC2_EN		BIT(4)</div><div class='add'>+#define PM886_GPADC_GPADC3_EN		BIT(5)</div><div class='add'>+#define PM886_GPADC_MIC_DET_EN		BIT(6)</div><div class='add'>+#define PM886_GPADC_CONFIG2_EN_ALL	\</div><div class='add'>+	(PM886_GPADC_TINT_EN |		\</div><div class='add'>+	 PM886_GPADC_GPADC0_EN |	\</div><div class='add'>+	 PM886_GPADC_GPADC1_EN |	\</div><div class='add'>+	 PM886_GPADC_GPADC2_EN |	\</div><div class='add'>+	 PM886_GPADC_GPADC3_EN |	\</div><div class='add'>+	 PM886_GPADC_MIC_DET_EN)</div><div class='add'>+</div><div class='add'>+/* No CONFIG3_EN_ALL because this is the only bit there. */</div><div class='add'>+#define PM886_GPADC_GND_DET2_EN		BIT(0)</div><div class='add'>+</div><div class='add'>+/* GPADC channel registers */</div><div class='add'>+#define PM886_REG_GPADC_VSC		0x40</div><div class='add'>+#define PM886_REG_GPADC_VCHG_PWR	0x4c</div><div class='add'>+#define PM886_REG_GPADC_VCF_OUT		0x4e</div><div class='add'>+#define PM886_REG_GPADC_TINT		0x50</div><div class='add'>+#define PM886_REG_GPADC_GPADC0		0x54</div><div class='add'>+#define PM886_REG_GPADC_GPADC1		0x56</div><div class='add'>+#define PM886_REG_GPADC_GPADC2		0x58</div><div class='add'>+#define PM886_REG_GPADC_VBAT		0xa0</div><div class='add'>+#define PM886_REG_GPADC_GND_DET1	0xa4</div><div class='add'>+#define PM886_REG_GPADC_GND_DET2	0xa6</div><div class='add'>+#define PM886_REG_GPADC_VBUS		0xa8</div><div class='add'>+#define PM886_REG_GPADC_GPADC3		0xaa</div><div class='add'>+#define PM886_REG_GPADC_MIC_DET		0xac</div><div class='add'>+#define PM886_REG_GPADC_VBAT_SLP	0xb0</div><div class='add'>+</div><div class='add'>+/* VBAT_SLP is the last register and is 2 bytes wide like other channels. */</div><div class='add'>+#define PM886_GPADC_MAX_REGISTER	(PM886_REG_GPADC_VBAT_SLP + 1)</div><div class='add'>+</div><div class='add'>+#define PM886_GPADC_BIAS_LEVELS		16</div><div class='add'>+#define PM886_GPADC_INDEX_TO_BIAS_uA(i)	(1 + (i) * 5)</div><div class='add'>+</div><div class='add'>+struct pm886_chip {</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	unsigned int chip_id;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+};</div><div class='add'>+#endif /* __MFD_88PM886_H */</div><div class='head'>diff --git a/include/linux/mfd/aat2870.h b/include/linux/mfd/aat2870.h<br/>index 2445842d482d..c7a3c53eba68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/aat2870.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/aat2870.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/aat2870.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/aat2870.h</a></div><div class='hunk'>@@ -133,9 +133,6 @@ struct aat2870_data {</div><div class='ctx'> 	int (*read)(struct aat2870_data *aat2870, u8 addr, u8 *val);</div><div class='ctx'> 	int (*write)(struct aat2870_data *aat2870, u8 addr, u8 val);</div><div class='ctx'> 	int (*update)(struct aat2870_data *aat2870, u8 addr, u8 mask, u8 val);</div><div class='del'>-</div><div class='del'>-	/* for debugfs */</div><div class='del'>-	struct dentry *dentry_root;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aat2870_subdev_info {</div><div class='head'>diff --git a/include/linux/mfd/adp5585.h b/include/linux/mfd/adp5585.h<br/>new file mode 100644<br/>index 000000000000..5237da6b4a9f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/adp5585.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/adp5585.h</a></div><div class='hunk'>@@ -0,0 +1,226 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Analog Devices ADP5585 I/O expander, PWM controller and keypad controller</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2022 NXP</div><div class='add'>+ * Copyright 2024 Ideas on Board Oy</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MFD_ADP5585_H_</div><div class='add'>+#define __MFD_ADP5585_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+</div><div class='add'>+#define ADP5585_ID			0x00</div><div class='add'>+#define		ADP5585_MAN_ID_VALUE		0x20</div><div class='add'>+#define		ADP5585_MAN_ID_MASK		GENMASK(7, 4)</div><div class='add'>+#define		ADP5585_REV_ID_MASK		GENMASK(3, 0)</div><div class='add'>+#define ADP5585_INT_STATUS		0x01</div><div class='add'>+#define		ADP5585_OVRFLOW_INT		BIT(2)</div><div class='add'>+#define		ADP5585_EVENT_INT		BIT(0)</div><div class='add'>+#define ADP5585_STATUS			0x02</div><div class='add'>+#define		ADP5585_EC_MASK			GENMASK(4, 0)</div><div class='add'>+#define ADP5585_FIFO_1			0x03</div><div class='add'>+#define		ADP5585_KEV_EV_PRESS_MASK	BIT(7)</div><div class='add'>+#define		ADP5585_KEY_EVENT_MASK		GENMASK(6, 0)</div><div class='add'>+#define ADP5585_FIFO_2			0x04</div><div class='add'>+#define ADP5585_FIFO_3			0x05</div><div class='add'>+#define ADP5585_FIFO_4			0x06</div><div class='add'>+#define ADP5585_FIFO_5			0x07</div><div class='add'>+#define ADP5585_FIFO_6			0x08</div><div class='add'>+#define ADP5585_FIFO_7			0x09</div><div class='add'>+#define ADP5585_FIFO_8			0x0a</div><div class='add'>+#define ADP5585_FIFO_9			0x0b</div><div class='add'>+#define ADP5585_FIFO_10			0x0c</div><div class='add'>+#define ADP5585_FIFO_11			0x0d</div><div class='add'>+#define ADP5585_FIFO_12			0x0e</div><div class='add'>+#define ADP5585_FIFO_13			0x0f</div><div class='add'>+#define ADP5585_FIFO_14			0x10</div><div class='add'>+#define ADP5585_FIFO_15			0x11</div><div class='add'>+#define ADP5585_FIFO_16			0x12</div><div class='add'>+#define		ADP5585_EV_MAX			(ADP5585_FIFO_16 - ADP5585_FIFO_1 + 1)</div><div class='add'>+#define ADP5585_GPI_INT_STAT_A		0x13</div><div class='add'>+#define ADP5585_GPI_INT_STAT_B		0x14</div><div class='add'>+#define ADP5585_GPI_STATUS_A		0x15</div><div class='add'>+#define ADP5585_GPI_STATUS_B		0x16</div><div class='add'>+#define ADP5585_RPULL_CONFIG_A		0x17</div><div class='add'>+#define ADP5585_RPULL_CONFIG_B		0x18</div><div class='add'>+#define ADP5585_RPULL_CONFIG_C		0x19</div><div class='add'>+#define ADP5585_RPULL_CONFIG_D		0x1a</div><div class='add'>+#define		ADP5585_Rx_PULL_CFG_PU_300K	0</div><div class='add'>+#define		ADP5585_Rx_PULL_CFG_PD_300K	1</div><div class='add'>+#define		ADP5585_Rx_PULL_CFG_PU_100K	2</div><div class='add'>+#define		ADP5585_Rx_PULL_CFG_DISABLE	3</div><div class='add'>+#define		ADP5585_Rx_PULL_CFG_MASK	3</div><div class='add'>+#define ADP5585_GPI_INT_LEVEL_A		0x1b</div><div class='add'>+#define ADP5585_GPI_INT_LEVEL_B		0x1c</div><div class='add'>+#define ADP5585_GPI_EVENT_EN_A		0x1d</div><div class='add'>+#define ADP5585_GPI_EVENT_EN_B		0x1e</div><div class='add'>+#define ADP5585_GPI_INTERRUPT_EN_A	0x1f</div><div class='add'>+#define ADP5585_GPI_INTERRUPT_EN_B	0x20</div><div class='add'>+#define ADP5585_DEBOUNCE_DIS_A		0x21</div><div class='add'>+#define ADP5585_DEBOUNCE_DIS_B		0x22</div><div class='add'>+#define ADP5585_GPO_DATA_OUT_A		0x23</div><div class='add'>+#define ADP5585_GPO_DATA_OUT_B		0x24</div><div class='add'>+#define ADP5585_GPO_OUT_MODE_A		0x25</div><div class='add'>+#define ADP5585_GPO_OUT_MODE_B		0x26</div><div class='add'>+#define ADP5585_GPIO_DIRECTION_A	0x27</div><div class='add'>+#define ADP5585_GPIO_DIRECTION_B	0x28</div><div class='add'>+#define ADP5585_RESET1_EVENT_A		0x29</div><div class='add'>+#define		ADP5585_RESET_EV_PRESS		BIT(7)</div><div class='add'>+#define ADP5585_RESET1_EVENT_B		0x2a</div><div class='add'>+#define ADP5585_RESET1_EVENT_C		0x2b</div><div class='add'>+#define ADP5585_RESET2_EVENT_A		0x2c</div><div class='add'>+#define ADP5585_RESET2_EVENT_B		0x2d</div><div class='add'>+#define ADP5585_RESET_CFG		0x2e</div><div class='add'>+#define ADP5585_PWM_OFFT_LOW		0x2f</div><div class='add'>+#define ADP5585_PWM_OFFT_HIGH		0x30</div><div class='add'>+#define ADP5585_PWM_ONT_LOW		0x31</div><div class='add'>+#define ADP5585_PWM_ONT_HIGH		0x32</div><div class='add'>+#define ADP5585_PWM_CFG			0x33</div><div class='add'>+#define		ADP5585_PWM_IN_AND		BIT(2)</div><div class='add'>+#define		ADP5585_PWM_MODE		BIT(1)</div><div class='add'>+#define		ADP5585_PWM_EN			BIT(0)</div><div class='add'>+#define ADP5585_LOGIC_CFG		0x34</div><div class='add'>+#define ADP5585_LOGIC_FF_CFG		0x35</div><div class='add'>+#define ADP5585_LOGIC_INT_EVENT_EN	0x36</div><div class='add'>+#define ADP5585_POLL_PTIME_CFG		0x37</div><div class='add'>+#define ADP5585_PIN_CONFIG_A		0x38</div><div class='add'>+#define ADP5585_PIN_CONFIG_B		0x39</div><div class='add'>+#define ADP5585_PIN_CONFIG_C		0x3a</div><div class='add'>+#define		ADP5585_PULL_SELECT		BIT(7)</div><div class='add'>+#define		ADP5585_C4_EXTEND_CFG_GPIO11	(0U &lt;&lt; 6)</div><div class='add'>+#define		ADP5585_C4_EXTEND_CFG_RESET2	(1U &lt;&lt; 6)</div><div class='add'>+#define		ADP5585_C4_EXTEND_CFG_MASK	GENMASK(6, 6)</div><div class='add'>+#define		ADP5585_R4_EXTEND_CFG_GPIO5	(0U &lt;&lt; 5)</div><div class='add'>+#define		ADP5585_R4_EXTEND_CFG_RESET1	(1U &lt;&lt; 5)</div><div class='add'>+#define		ADP5585_R4_EXTEND_CFG_MASK	GENMASK(5, 5)</div><div class='add'>+#define		ADP5585_R3_EXTEND_CFG_GPIO4	(0U &lt;&lt; 2)</div><div class='add'>+#define		ADP5585_R3_EXTEND_CFG_LC	(1U &lt;&lt; 2)</div><div class='add'>+#define		ADP5585_R3_EXTEND_CFG_PWM_OUT	(2U &lt;&lt; 2)</div><div class='add'>+#define		ADP5585_R3_EXTEND_CFG_MASK	GENMASK(3, 2)</div><div class='add'>+#define		ADP5585_R0_EXTEND_CFG_GPIO1	(0U &lt;&lt; 0)</div><div class='add'>+#define		ADP5585_R0_EXTEND_CFG_LY	(1U &lt;&lt; 0)</div><div class='add'>+#define		ADP5585_R0_EXTEND_CFG_MASK	GENMASK(0, 0)</div><div class='add'>+#define ADP5585_GENERAL_CFG		0x3b</div><div class='add'>+#define		ADP5585_OSC_EN			BIT(7)</div><div class='add'>+#define		ADP5585_OSC_FREQ_50KHZ		(0U &lt;&lt; 5)</div><div class='add'>+#define		ADP5585_OSC_FREQ_100KHZ		(1U &lt;&lt; 5)</div><div class='add'>+#define		ADP5585_OSC_FREQ_200KHZ		(2U &lt;&lt; 5)</div><div class='add'>+#define		ADP5585_OSC_FREQ_500KHZ		(3U &lt;&lt; 5)</div><div class='add'>+#define		ADP5585_OSC_FREQ_MASK		GENMASK(6, 5)</div><div class='add'>+#define		ADP5585_INT_CFG			BIT(1)</div><div class='add'>+#define		ADP5585_RST_CFG			BIT(0)</div><div class='add'>+#define ADP5585_INT_EN			0x3c</div><div class='add'>+#define		ADP5585_OVRFLOW_IEN		BIT(2)</div><div class='add'>+#define		ADP5585_EVENT_IEN		BIT(0)</div><div class='add'>+</div><div class='add'>+#define ADP5585_MAX_REG			ADP5585_INT_EN</div><div class='add'>+</div><div class='add'>+#define ADP5585_PIN_MAX			11</div><div class='add'>+#define ADP5585_MAX_UNLOCK_TIME_SEC	7</div><div class='add'>+#define ADP5585_KEY_EVENT_START		1</div><div class='add'>+#define ADP5585_KEY_EVENT_END		25</div><div class='add'>+#define ADP5585_GPI_EVENT_START		37</div><div class='add'>+#define ADP5585_GPI_EVENT_END		47</div><div class='add'>+#define ADP5585_ROW5_KEY_EVENT_START	1</div><div class='add'>+#define ADP5585_ROW5_KEY_EVENT_END	30</div><div class='add'>+#define ADP5585_PWM_OUT			3</div><div class='add'>+#define ADP5585_RESET1_OUT		4</div><div class='add'>+#define ADP5585_RESET2_OUT		9</div><div class='add'>+#define ADP5585_ROW5			5</div><div class='add'>+</div><div class='add'>+/* ADP5589 */</div><div class='add'>+#define		ADP5589_MAN_ID_VALUE		0x10</div><div class='add'>+#define ADP5589_GPI_STATUS_A		0x16</div><div class='add'>+#define ADP5589_GPI_STATUS_C		0x18</div><div class='add'>+#define ADP5589_RPULL_CONFIG_A		0x19</div><div class='add'>+#define ADP5589_GPI_INT_LEVEL_A		0x1e</div><div class='add'>+#define ADP5589_GPI_EVENT_EN_A		0x21</div><div class='add'>+#define ADP5589_DEBOUNCE_DIS_A		0x27</div><div class='add'>+#define ADP5589_GPO_DATA_OUT_A		0x2a</div><div class='add'>+#define ADP5589_GPO_OUT_MODE_A		0x2d</div><div class='add'>+#define		ADP5589_GPIO_DIRECTION_A	0x30</div><div class='add'>+#define ADP5589_UNLOCK1			0x33</div><div class='add'>+#define		ADP5589_UNLOCK_EV_PRESS		BIT(7)</div><div class='add'>+#define ADP5589_UNLOCK_TIMERS		0x36</div><div class='add'>+#define		ADP5589_UNLOCK_TIMER		GENMASK(2, 0)</div><div class='add'>+#define ADP5589_LOCK_CFG		0x37</div><div class='add'>+#define		ADP5589_LOCK_EN			BIT(0)</div><div class='add'>+#define ADP5589_RESET1_EVENT_A		0x38</div><div class='add'>+#define ADP5589_RESET2_EVENT_A		0x3B</div><div class='add'>+#define ADP5589_RESET_CFG		0x3D</div><div class='add'>+#define		ADP5585_RESET2_POL		BIT(7)</div><div class='add'>+#define		ADP5585_RESET1_POL		BIT(6)</div><div class='add'>+#define		ADP5585_RST_PASSTHRU_EN		BIT(5)</div><div class='add'>+#define		ADP5585_RESET_TRIG_TIME		GENMASK(4, 2)</div><div class='add'>+#define		ADP5585_PULSE_WIDTH		GENMASK(1, 0)</div><div class='add'>+#define ADP5589_PWM_OFFT_LOW		0x3e</div><div class='add'>+#define ADP5589_PWM_ONT_LOW		0x40</div><div class='add'>+#define ADP5589_PWM_CFG			0x42</div><div class='add'>+#define ADP5589_POLL_PTIME_CFG		0x48</div><div class='add'>+#define ADP5589_PIN_CONFIG_A		0x49</div><div class='add'>+#define ADP5589_PIN_CONFIG_D		0x4C</div><div class='add'>+#define ADP5589_GENERAL_CFG		0x4d</div><div class='add'>+#define ADP5589_INT_EN			0x4e</div><div class='add'>+#define ADP5589_MAX_REG			ADP5589_INT_EN</div><div class='add'>+</div><div class='add'>+#define ADP5589_PIN_MAX			19</div><div class='add'>+#define ADP5589_KEY_EVENT_START		1</div><div class='add'>+#define ADP5589_KEY_EVENT_END		88</div><div class='add'>+#define ADP5589_GPI_EVENT_START		97</div><div class='add'>+#define ADP5589_GPI_EVENT_END		115</div><div class='add'>+#define ADP5589_UNLOCK_WILDCARD		127</div><div class='add'>+#define ADP5589_RESET2_OUT		12</div><div class='add'>+</div><div class='add'>+struct regmap;</div><div class='add'>+</div><div class='add'>+enum adp5585_variant {</div><div class='add'>+	ADP5585_00 = 1,</div><div class='add'>+	ADP5585_01,</div><div class='add'>+	ADP5585_02,</div><div class='add'>+	ADP5585_03,</div><div class='add'>+	ADP5585_04,</div><div class='add'>+	ADP5589_00,</div><div class='add'>+	ADP5589_01,</div><div class='add'>+	ADP5589_02,</div><div class='add'>+	ADP5585_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct adp5585_regs {</div><div class='add'>+	unsigned int gen_cfg;</div><div class='add'>+	unsigned int ext_cfg;</div><div class='add'>+	unsigned int int_en;</div><div class='add'>+	unsigned int poll_ptime_cfg;</div><div class='add'>+	unsigned int reset_cfg;</div><div class='add'>+	unsigned int reset1_event_a;</div><div class='add'>+	unsigned int reset2_event_a;</div><div class='add'>+	unsigned int pin_cfg_a;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct adp5585_dev {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	const struct adp5585_regs *regs;</div><div class='add'>+	struct blocking_notifier_head event_notifier;</div><div class='add'>+	unsigned long *pin_usage;</div><div class='add'>+	unsigned int n_pins;</div><div class='add'>+	unsigned int reset2_out;</div><div class='add'>+	enum adp5585_variant variant;</div><div class='add'>+	unsigned int id;</div><div class='add'>+	bool has_unlock;</div><div class='add'>+	bool has_pin6;</div><div class='add'>+	int irq;</div><div class='add'>+	unsigned int ev_poll_time;</div><div class='add'>+	unsigned int unlock_time;</div><div class='add'>+	unsigned int unlock_keys[2];</div><div class='add'>+	unsigned int nkeys_unlock;</div><div class='add'>+	unsigned int reset1_keys[3];</div><div class='add'>+	unsigned int nkeys_reset1;</div><div class='add'>+	unsigned int reset2_keys[2];</div><div class='add'>+	unsigned int nkeys_reset2;</div><div class='add'>+	u8 reset_cfg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h<br/>index 2d13bbea4f3a..f72e6d4b14a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/arizona/pdata.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/arizona/pdata.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/arizona/pdata.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/arizona/pdata.h</a></div><div class='hunk'>@@ -117,8 +117,10 @@ struct arizona_pdata {</div><div class='ctx'> 	/** Check for line output with HPDET method */</div><div class='ctx'> 	bool hpdet_acc_id_line;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GPIOLIB_LEGACY</div><div class='ctx'> 	/** GPIO used for mic isolation with HPDET */</div><div class='ctx'> 	int hpdet_id_gpio;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/** Channel to use for headphone detection */</div><div class='ctx'> 	unsigned int hpdet_channel;</div><div class='hunk'>@@ -129,8 +131,10 @@ struct arizona_pdata {</div><div class='ctx'> 	/** Extra debounce timeout used during initial mic detection (ms) */</div><div class='ctx'> 	unsigned int micd_detect_debounce;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GPIOLIB_LEGACY</div><div class='ctx'> 	/** GPIO for mic detection polarity */</div><div class='ctx'> 	int micd_pol_gpio;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/** Mic detect ramp rate */</div><div class='ctx'> 	unsigned int micd_bias_start_time;</div><div class='hunk'>@@ -184,8 +188,10 @@ struct arizona_pdata {</div><div class='ctx'> 	/** Haptic actuator type */</div><div class='ctx'> 	unsigned int hap_act;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GPIOLIB_LEGACY</div><div class='ctx'> 	/** GPIO for primary IRQ (used for edge triggered emulation) */</div><div class='ctx'> 	int irq_gpio;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/** General purpose switch control */</div><div class='ctx'> 	unsigned int gpsw;</div><div class='head'>diff --git a/include/linux/mfd/atmel-hlcdc.h b/include/linux/mfd/atmel-hlcdc.h<br/>index a186119a49b5..80d675a03b39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/atmel-hlcdc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/atmel-hlcdc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/atmel-hlcdc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/atmel-hlcdc.h</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #define ATMEL_HLCDC_DITHER		BIT(6)</div><div class='ctx'> #define ATMEL_HLCDC_DISPDLY		BIT(7)</div><div class='ctx'> #define ATMEL_HLCDC_MODE_MASK		GENMASK(9, 8)</div><div class='add'>+#define ATMEL_XLCDC_MODE_MASK		GENMASK(10, 8)</div><div class='add'>+#define ATMEL_XLCDC_DPI			BIT(11)</div><div class='ctx'> #define ATMEL_HLCDC_PP			BIT(10)</div><div class='ctx'> #define ATMEL_HLCDC_VSPSU		BIT(12)</div><div class='ctx'> #define ATMEL_HLCDC_VSPHO		BIT(13)</div><div class='hunk'>@@ -34,6 +36,12 @@</div><div class='ctx'> #define ATMEL_HLCDC_IDR			0x30</div><div class='ctx'> #define ATMEL_HLCDC_IMR			0x34</div><div class='ctx'> #define ATMEL_HLCDC_ISR			0x38</div><div class='add'>+#define ATMEL_XLCDC_ATTRE		0x3c</div><div class='add'>+</div><div class='add'>+#define ATMEL_XLCDC_BASE_UPDATE		BIT(0)</div><div class='add'>+#define ATMEL_XLCDC_OVR1_UPDATE		BIT(1)</div><div class='add'>+#define ATMEL_XLCDC_OVR3_UPDATE		BIT(2)</div><div class='add'>+#define ATMEL_XLCDC_HEO_UPDATE		BIT(3)</div><div class='ctx'> </div><div class='ctx'> #define ATMEL_HLCDC_CLKPOL		BIT(0)</div><div class='ctx'> #define ATMEL_HLCDC_CLKSEL		BIT(2)</div><div class='hunk'>@@ -48,6 +56,8 @@</div><div class='ctx'> #define ATMEL_HLCDC_DISP		BIT(2)</div><div class='ctx'> #define ATMEL_HLCDC_PWM			BIT(3)</div><div class='ctx'> #define ATMEL_HLCDC_SIP			BIT(4)</div><div class='add'>+#define ATMEL_XLCDC_SD			BIT(5)</div><div class='add'>+#define ATMEL_XLCDC_CM			BIT(6)</div><div class='ctx'> </div><div class='ctx'> #define ATMEL_HLCDC_SOF			BIT(0)</div><div class='ctx'> #define ATMEL_HLCDC_SYNCDIS		BIT(1)</div><div class='head'>diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h<br/>index f1755163dd9f..3c5aecf1d4b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/axp20x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/axp20x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/axp20x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/axp20x.h</a></div><div class='hunk'>@@ -19,6 +19,8 @@ enum axp20x_variants {</div><div class='ctx'> 	AXP223_ID,</div><div class='ctx'> 	AXP288_ID,</div><div class='ctx'> 	AXP313A_ID,</div><div class='add'>+	AXP323_ID,</div><div class='add'>+	AXP717_ID,</div><div class='ctx'> 	AXP803_ID,</div><div class='ctx'> 	AXP806_ID,</div><div class='ctx'> 	AXP809_ID,</div><div class='hunk'>@@ -104,14 +106,74 @@ enum axp20x_variants {</div><div class='ctx'> </div><div class='ctx'> #define AXP313A_ON_INDICATE		0x00</div><div class='ctx'> #define AXP313A_OUTPUT_CONTROL		0x10</div><div class='del'>-#define AXP313A_DCDC1_CONRTOL		0x13</div><div class='del'>-#define AXP313A_DCDC2_CONRTOL		0x14</div><div class='del'>-#define AXP313A_DCDC3_CONRTOL		0x15</div><div class='del'>-#define AXP313A_ALDO1_CONRTOL		0x16</div><div class='del'>-#define AXP313A_DLDO1_CONRTOL		0x17</div><div class='add'>+#define AXP313A_DCDC1_CONTROL		0x13</div><div class='add'>+#define AXP313A_DCDC2_CONTROL		0x14</div><div class='add'>+#define AXP313A_DCDC3_CONTROL		0x15</div><div class='add'>+#define AXP313A_ALDO1_CONTROL		0x16</div><div class='add'>+#define AXP313A_DLDO1_CONTROL		0x17</div><div class='ctx'> #define AXP313A_SHUTDOWN_CTRL		0x1a</div><div class='ctx'> #define AXP313A_IRQ_EN			0x20</div><div class='ctx'> #define AXP313A_IRQ_STATE		0x21</div><div class='add'>+#define AXP323_DCDC_MODE_CTRL2		0x22</div><div class='add'>+</div><div class='add'>+#define AXP717_ON_INDICATE		0x00</div><div class='add'>+#define AXP717_PMU_STATUS_2		0x01</div><div class='add'>+#define AXP717_BC_DETECT		0x05</div><div class='add'>+#define AXP717_PMU_FAULT		0x08</div><div class='add'>+#define AXP717_MODULE_EN_CONTROL_1	0x0b</div><div class='add'>+#define AXP717_MIN_SYS_V_CONTROL	0x15</div><div class='add'>+#define AXP717_INPUT_VOL_LIMIT_CTRL	0x16</div><div class='add'>+#define AXP717_INPUT_CUR_LIMIT_CTRL	0x17</div><div class='add'>+#define AXP717_MODULE_EN_CONTROL_2	0x19</div><div class='add'>+#define AXP717_BOOST_CONTROL		0x1e</div><div class='add'>+#define AXP717_VSYS_V_POWEROFF		0x24</div><div class='add'>+#define AXP717_IRQ0_EN			0x40</div><div class='add'>+#define AXP717_IRQ1_EN			0x41</div><div class='add'>+#define AXP717_IRQ2_EN			0x42</div><div class='add'>+#define AXP717_IRQ3_EN			0x43</div><div class='add'>+#define AXP717_IRQ4_EN			0x44</div><div class='add'>+#define AXP717_IRQ0_STATE		0x48</div><div class='add'>+#define AXP717_IRQ1_STATE		0x49</div><div class='add'>+#define AXP717_IRQ2_STATE		0x4a</div><div class='add'>+#define AXP717_IRQ3_STATE		0x4b</div><div class='add'>+#define AXP717_IRQ4_STATE		0x4c</div><div class='add'>+#define AXP717_TS_PIN_CFG		0x50</div><div class='add'>+#define AXP717_ICC_CHG_SET		0x62</div><div class='add'>+#define AXP717_ITERM_CHG_SET		0x63</div><div class='add'>+#define AXP717_CV_CHG_SET		0x64</div><div class='add'>+#define AXP717_DCDC_OUTPUT_CONTROL	0x80</div><div class='add'>+#define AXP717_DCDC1_CONTROL		0x83</div><div class='add'>+#define AXP717_DCDC2_CONTROL		0x84</div><div class='add'>+#define AXP717_DCDC3_CONTROL		0x85</div><div class='add'>+#define AXP717_DCDC4_CONTROL		0x86</div><div class='add'>+#define AXP717_LDO0_OUTPUT_CONTROL	0x90</div><div class='add'>+#define AXP717_LDO1_OUTPUT_CONTROL	0x91</div><div class='add'>+#define AXP717_ALDO1_CONTROL		0x93</div><div class='add'>+#define AXP717_ALDO2_CONTROL		0x94</div><div class='add'>+#define AXP717_ALDO3_CONTROL		0x95</div><div class='add'>+#define AXP717_ALDO4_CONTROL		0x96</div><div class='add'>+#define AXP717_BLDO1_CONTROL		0x97</div><div class='add'>+#define AXP717_BLDO2_CONTROL		0x98</div><div class='add'>+#define AXP717_BLDO3_CONTROL		0x99</div><div class='add'>+#define AXP717_BLDO4_CONTROL		0x9a</div><div class='add'>+#define AXP717_CLDO1_CONTROL		0x9b</div><div class='add'>+#define AXP717_CLDO2_CONTROL		0x9c</div><div class='add'>+#define AXP717_CLDO3_CONTROL		0x9d</div><div class='add'>+#define AXP717_CLDO4_CONTROL		0x9e</div><div class='add'>+#define AXP717_CPUSLDO_CONTROL		0x9f</div><div class='add'>+#define AXP717_BATT_PERCENT_DATA	0xa4</div><div class='add'>+#define AXP717_ADC_CH_EN_CONTROL	0xc0</div><div class='add'>+#define AXP717_BATT_V_H			0xc4</div><div class='add'>+#define AXP717_BATT_V_L			0xc5</div><div class='add'>+#define AXP717_VBUS_V_H			0xc6</div><div class='add'>+#define AXP717_VBUS_V_L			0xc7</div><div class='add'>+#define AXP717_VSYS_V_H			0xc8</div><div class='add'>+#define AXP717_VSYS_V_L			0xc9</div><div class='add'>+#define AXP717_BATT_CHRG_I_H		0xca</div><div class='add'>+#define AXP717_BATT_CHRG_I_L		0xcb</div><div class='add'>+#define AXP717_ADC_DATA_SEL		0xcd</div><div class='add'>+#define AXP717_ADC_DATA_H		0xce</div><div class='add'>+#define AXP717_ADC_DATA_L		0xcf</div><div class='ctx'> </div><div class='ctx'> #define AXP806_STARTUP_SRC		0x00</div><div class='ctx'> #define AXP806_CHIP_ID			0x03</div><div class='hunk'>@@ -434,6 +496,28 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	AXP717_DCDC1 = 0,</div><div class='add'>+	AXP717_DCDC2,</div><div class='add'>+	AXP717_DCDC3,</div><div class='add'>+	AXP717_DCDC4,</div><div class='add'>+	AXP717_ALDO1,</div><div class='add'>+	AXP717_ALDO2,</div><div class='add'>+	AXP717_ALDO3,</div><div class='add'>+	AXP717_ALDO4,</div><div class='add'>+	AXP717_BLDO1,</div><div class='add'>+	AXP717_BLDO2,</div><div class='add'>+	AXP717_BLDO3,</div><div class='add'>+	AXP717_BLDO4,</div><div class='add'>+	AXP717_CLDO1,</div><div class='add'>+	AXP717_CLDO2,</div><div class='add'>+	AXP717_CLDO3,</div><div class='add'>+	AXP717_CLDO4,</div><div class='add'>+	AXP717_CPUSLDO,</div><div class='add'>+	AXP717_BOOST,</div><div class='add'>+	AXP717_REG_ID_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='ctx'> 	AXP806_DCDCA = 0,</div><div class='ctx'> 	AXP806_DCDCB,</div><div class='ctx'> 	AXP806_DCDCC,</div><div class='hunk'>@@ -732,6 +816,40 @@ enum axp313a_irqs {</div><div class='ctx'> 	AXP313A_IRQ_PEK_RIS_EDGE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum axp717_irqs {</div><div class='add'>+	AXP717_IRQ_VBUS_FAULT,</div><div class='add'>+	AXP717_IRQ_VBUS_OVER_V,</div><div class='add'>+	AXP717_IRQ_BOOST_OVER_V,</div><div class='add'>+	AXP717_IRQ_GAUGE_NEW_SOC = 4,</div><div class='add'>+	AXP717_IRQ_SOC_DROP_LVL1 = 6,</div><div class='add'>+	AXP717_IRQ_SOC_DROP_LVL2,</div><div class='add'>+	AXP717_IRQ_PEK_RIS_EDGE,</div><div class='add'>+	AXP717_IRQ_PEK_FAL_EDGE,</div><div class='add'>+	AXP717_IRQ_PEK_LONG,</div><div class='add'>+	AXP717_IRQ_PEK_SHORT,</div><div class='add'>+	AXP717_IRQ_BATT_REMOVAL,</div><div class='add'>+	AXP717_IRQ_BATT_PLUGIN,</div><div class='add'>+	AXP717_IRQ_VBUS_REMOVAL,</div><div class='add'>+	AXP717_IRQ_VBUS_PLUGIN,</div><div class='add'>+	AXP717_IRQ_BATT_OVER_V,</div><div class='add'>+	AXP717_IRQ_CHARG_TIMER,</div><div class='add'>+	AXP717_IRQ_DIE_TEMP_HIGH,</div><div class='add'>+	AXP717_IRQ_CHARG,</div><div class='add'>+	AXP717_IRQ_CHARG_DONE,</div><div class='add'>+	AXP717_IRQ_BATT_OVER_CURR,</div><div class='add'>+	AXP717_IRQ_LDO_OVER_CURR,</div><div class='add'>+	AXP717_IRQ_WDOG_EXPIRE,</div><div class='add'>+	AXP717_IRQ_BATT_ACT_TEMP_LOW,</div><div class='add'>+	AXP717_IRQ_BATT_ACT_TEMP_HIGH,</div><div class='add'>+	AXP717_IRQ_BATT_CHG_TEMP_LOW,</div><div class='add'>+	AXP717_IRQ_BATT_CHG_TEMP_HIGH,</div><div class='add'>+	AXP717_IRQ_BATT_QUIT_TEMP_HIGH,</div><div class='add'>+	AXP717_IRQ_BC_USB_CHNG = 30,</div><div class='add'>+	AXP717_IRQ_BC_USB_DONE,</div><div class='add'>+	AXP717_IRQ_TYPEC_PLUGIN = 37,</div><div class='add'>+	AXP717_IRQ_TYPEC_REMOVE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum axp803_irqs {</div><div class='ctx'> 	AXP803_IRQ_ACIN_OVER_V = 1,</div><div class='ctx'> 	AXP803_IRQ_ACIN_PLUGIN,</div><div class='hunk'>@@ -844,7 +962,7 @@ struct axp20x_dev {</div><div class='ctx'> 	unsigned long			irq_flags;</div><div class='ctx'> 	struct regmap			*regmap;</div><div class='ctx'> 	struct regmap_irq_chip_data	*regmap_irqc;</div><div class='del'>-	long				variant;</div><div class='add'>+	enum axp20x_variants		variant;</div><div class='ctx'> 	int                             nr_cells;</div><div class='ctx'> 	const struct mfd_cell           *cells;</div><div class='ctx'> 	const struct regmap_config	*regmap_cfg;</div><div class='head'>diff --git a/include/linux/mfd/bcm590xx.h b/include/linux/mfd/bcm590xx.h<br/>index 6b8791da6119..5a5783abd47b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/bcm590xx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/bcm590xx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/bcm590xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/bcm590xx.h</a></div><div class='hunk'>@@ -13,6 +13,26 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='add'>+/* PMU ID register values; also used as device type */</div><div class='add'>+#define BCM590XX_PMUID_BCM59054		0x54</div><div class='add'>+#define BCM590XX_PMUID_BCM59056		0x56</div><div class='add'>+</div><div class='add'>+/* Known chip revision IDs */</div><div class='add'>+#define BCM59054_REV_DIGITAL_A1		1</div><div class='add'>+#define BCM59054_REV_ANALOG_A1		2</div><div class='add'>+</div><div class='add'>+#define BCM59056_REV_DIGITAL_A0		1</div><div class='add'>+#define BCM59056_REV_ANALOG_A0		1</div><div class='add'>+</div><div class='add'>+#define BCM59056_REV_DIGITAL_B0		2</div><div class='add'>+#define BCM59056_REV_ANALOG_B0		2</div><div class='add'>+</div><div class='add'>+/* regmap types */</div><div class='add'>+enum bcm590xx_regmap_type {</div><div class='add'>+	BCM590XX_REGMAP_PRI,</div><div class='add'>+	BCM590XX_REGMAP_SEC,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* max register address */</div><div class='ctx'> #define BCM590XX_MAX_REGISTER_PRI	0xe7</div><div class='ctx'> #define BCM590XX_MAX_REGISTER_SEC	0xf0</div><div class='hunk'>@@ -23,7 +43,13 @@ struct bcm590xx {</div><div class='ctx'> 	struct i2c_client *i2c_sec;</div><div class='ctx'> 	struct regmap *regmap_pri;</div><div class='ctx'> 	struct regmap *regmap_sec;</div><div class='del'>-	unsigned int id;</div><div class='add'>+</div><div class='add'>+	/* PMU ID value; also used as device type */</div><div class='add'>+	u8 pmu_id;</div><div class='add'>+</div><div class='add'>+	/* Chip revision, read from PMUREV reg */</div><div class='add'>+	u8 rev_digital;</div><div class='add'>+	u8 rev_analog;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /*  __LINUX_MFD_BCM590XX_H */</div><div class='head'>diff --git a/include/linux/mfd/bq257xx.h b/include/linux/mfd/bq257xx.h<br/>new file mode 100644<br/>index 000000000000..1d6ddc7fb09f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/bq257xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/bq257xx.h</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Register definitions for TI BQ257XX</div><div class='add'>+ * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define BQ25703_CHARGE_OPTION_0			0x00</div><div class='add'>+#define BQ25703_CHARGE_CURRENT			0x02</div><div class='add'>+#define BQ25703_MAX_CHARGE_VOLT			0x04</div><div class='add'>+#define BQ25703_OTG_VOLT			0x06</div><div class='add'>+#define BQ25703_OTG_CURRENT			0x08</div><div class='add'>+#define BQ25703_INPUT_VOLTAGE			0x0a</div><div class='add'>+#define BQ25703_MIN_VSYS			0x0c</div><div class='add'>+#define BQ25703_IIN_HOST			0x0e</div><div class='add'>+#define BQ25703_CHARGER_STATUS			0x20</div><div class='add'>+#define BQ25703_PROCHOT_STATUS			0x22</div><div class='add'>+#define BQ25703_IIN_DPM				0x24</div><div class='add'>+#define BQ25703_ADCIBAT_CHG			0x28</div><div class='add'>+#define BQ25703_ADCIINCMPIN			0x2a</div><div class='add'>+#define BQ25703_ADCVSYSVBAT			0x2c</div><div class='add'>+#define BQ25703_MANUFACT_DEV_ID			0x2e</div><div class='add'>+#define BQ25703_CHARGE_OPTION_1			0x30</div><div class='add'>+#define BQ25703_CHARGE_OPTION_2			0x32</div><div class='add'>+#define BQ25703_CHARGE_OPTION_3			0x34</div><div class='add'>+#define BQ25703_ADC_OPTION			0x3a</div><div class='add'>+</div><div class='add'>+#define BQ25703_EN_LWPWR			BIT(15)</div><div class='add'>+#define BQ25703_WDTMR_ADJ_MASK			GENMASK(14, 13)</div><div class='add'>+#define BQ25703_WDTMR_DISABLE			0</div><div class='add'>+#define BQ25703_WDTMR_5_SEC			1</div><div class='add'>+#define BQ25703_WDTMR_88_SEC			2</div><div class='add'>+#define BQ25703_WDTMR_175_SEC			3</div><div class='add'>+</div><div class='add'>+#define BQ25703_ICHG_MASK			GENMASK(12, 6)</div><div class='add'>+#define BQ25703_ICHG_STEP_UA			64000</div><div class='add'>+#define BQ25703_ICHG_MIN_UA			64000</div><div class='add'>+#define BQ25703_ICHG_MAX_UA			8128000</div><div class='add'>+</div><div class='add'>+#define BQ25703_MAX_CHARGE_VOLT_MASK		GENMASK(15, 4)</div><div class='add'>+#define BQ25703_VBATREG_STEP_UV			16000</div><div class='add'>+#define BQ25703_VBATREG_MIN_UV			1024000</div><div class='add'>+#define BQ25703_VBATREG_MAX_UV			19200000</div><div class='add'>+</div><div class='add'>+#define BQ25703_OTG_VOLT_MASK			GENMASK(13, 6)</div><div class='add'>+#define BQ25703_OTG_VOLT_STEP_UV		64000</div><div class='add'>+#define BQ25703_OTG_VOLT_MIN_UV			4480000</div><div class='add'>+#define BQ25703_OTG_VOLT_MAX_UV			20800000</div><div class='add'>+#define BQ25703_OTG_VOLT_NUM_VOLT		256</div><div class='add'>+</div><div class='add'>+#define BQ25703_OTG_CUR_MASK			GENMASK(14, 8)</div><div class='add'>+#define BQ25703_OTG_CUR_STEP_UA			50000</div><div class='add'>+#define BQ25703_OTG_CUR_MAX_UA			6350000</div><div class='add'>+</div><div class='add'>+#define BQ25703_MINVSYS_MASK			GENMASK(13, 8)</div><div class='add'>+#define BQ25703_MINVSYS_STEP_UV			256000</div><div class='add'>+#define BQ25703_MINVSYS_MIN_UV			1024000</div><div class='add'>+#define BQ25703_MINVSYS_MAX_UV			16128000</div><div class='add'>+</div><div class='add'>+#define BQ25703_STS_AC_STAT			BIT(15)</div><div class='add'>+#define BQ25703_STS_IN_FCHRG			BIT(10)</div><div class='add'>+#define BQ25703_STS_IN_PCHRG			BIT(9)</div><div class='add'>+#define BQ25703_STS_FAULT_ACOV			BIT(7)</div><div class='add'>+#define BQ25703_STS_FAULT_BATOC			BIT(6)</div><div class='add'>+#define BQ25703_STS_FAULT_ACOC			BIT(5)</div><div class='add'>+</div><div class='add'>+#define BQ25703_IINDPM_MASK			GENMASK(14, 8)</div><div class='add'>+#define BQ25703_IINDPM_STEP_UA			50000</div><div class='add'>+#define BQ25703_IINDPM_MIN_UA			50000</div><div class='add'>+#define BQ25703_IINDPM_MAX_UA			6400000</div><div class='add'>+#define BQ25703_IINDPM_DEFAULT_UA		3300000</div><div class='add'>+#define BQ25703_IINDPM_OFFSET_UA		50000</div><div class='add'>+</div><div class='add'>+#define BQ25703_ADCIBAT_DISCHG_MASK		GENMASK(6, 0)</div><div class='add'>+#define BQ25703_ADCIBAT_CHG_MASK		GENMASK(14, 8)</div><div class='add'>+#define BQ25703_ADCIBAT_CHG_STEP_UA		64000</div><div class='add'>+#define BQ25703_ADCIBAT_DIS_STEP_UA		256000</div><div class='add'>+</div><div class='add'>+#define BQ25703_ADCIIN				GENMASK(15, 8)</div><div class='add'>+#define BQ25703_ADCIINCMPIN_STEP		50000</div><div class='add'>+</div><div class='add'>+#define BQ25703_ADCVSYS_MASK			GENMASK(15, 8)</div><div class='add'>+#define BQ25703_ADCVBAT_MASK			GENMASK(7, 0)</div><div class='add'>+#define BQ25703_ADCVSYSVBAT_OFFSET_UV		2880000</div><div class='add'>+#define BQ25703_ADCVSYSVBAT_STEP		64000</div><div class='add'>+</div><div class='add'>+#define BQ25703_ADC_CH_MASK			GENMASK(7, 0)</div><div class='add'>+#define BQ25703_ADC_CONV_EN			BIT(15)</div><div class='add'>+#define BQ25703_ADC_START			BIT(14)</div><div class='add'>+#define BQ25703_ADC_FULL_SCALE			BIT(13)</div><div class='add'>+#define BQ25703_ADC_CMPIN_EN			BIT(7)</div><div class='add'>+#define BQ25703_ADC_VBUS_EN			BIT(6)</div><div class='add'>+#define BQ25703_ADC_PSYS_EN			BIT(5)</div><div class='add'>+#define BQ25703_ADC_IIN_EN			BIT(4)</div><div class='add'>+#define BQ25703_ADC_IDCHG_EN			BIT(3)</div><div class='add'>+#define BQ25703_ADC_ICHG_EN			BIT(2)</div><div class='add'>+#define BQ25703_ADC_VSYS_EN			BIT(1)</div><div class='add'>+#define BQ25703_ADC_VBAT_EN			BIT(0)</div><div class='add'>+</div><div class='add'>+#define BQ25703_EN_OTG_MASK			BIT(12)</div><div class='add'>+</div><div class='add'>+struct bq257xx_device {</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+};</div><div class='head'>diff --git a/include/linux/mfd/cgbc.h b/include/linux/mfd/cgbc.h<br/>new file mode 100644<br/>index 000000000000..badbec4c7033<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/cgbc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/cgbc.h</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Congatec Board Controller driver definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Bootlin</div><div class='add'>+ * Author: Thomas Richard &lt;thomas.richard@bootlin.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_MFD_CGBC_H_</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cgbc_version - Board Controller device version structure</div><div class='add'>+ * @feature:	Board Controller feature number</div><div class='add'>+ * @major:	Board Controller major revision</div><div class='add'>+ * @minor:	Board Controller minor revision</div><div class='add'>+ */</div><div class='add'>+struct cgbc_version {</div><div class='add'>+	unsigned char feature;</div><div class='add'>+	unsigned char major;</div><div class='add'>+	unsigned char minor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cgbc_device_data - Internal representation of the Board Controller device</div><div class='add'>+ * @io_session:		Pointer to the session IO memory</div><div class='add'>+ * @io_cmd:		Pointer to the command IO memory</div><div class='add'>+ * @session:		Session id returned by the Board Controller</div><div class='add'>+ * @dev:		Pointer to kernel device structure</div><div class='add'>+ * @cgbc_version:	Board Controller version structure</div><div class='add'>+ * @mutex:		Board Controller mutex</div><div class='add'>+ */</div><div class='add'>+struct cgbc_device_data {</div><div class='add'>+	void __iomem		*io_session;</div><div class='add'>+	void __iomem		*io_cmd;</div><div class='add'>+	u8			session;</div><div class='add'>+	struct device		*dev;</div><div class='add'>+	struct cgbc_version	version;</div><div class='add'>+	struct mutex		lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cgbc_command(struct cgbc_device_data *cgbc, void *cmd, unsigned int cmd_size,</div><div class='add'>+		 void *data, unsigned int data_size, u8 *status);</div><div class='add'>+</div><div class='add'>+#endif /*_LINUX_MFD_CGBC_H_*/</div><div class='head'>diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h<br/>index e8bcad641d8c..faeea7abd688 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/core.h</a></div><div class='hunk'>@@ -72,7 +72,7 @@ struct mfd_cell {</div><div class='ctx'> 	int			(*resume)(struct platform_device *dev);</div><div class='ctx'> </div><div class='ctx'> 	/* platform data passed to the sub devices drivers */</div><div class='del'>-	void			*platform_data;</div><div class='add'>+	const void		*platform_data;</div><div class='ctx'> 	size_t			pdata_size;</div><div class='ctx'> </div><div class='ctx'> 	/* Matches ACPI */</div><div class='head'>diff --git a/include/linux/mfd/cs40l50.h b/include/linux/mfd/cs40l50.h<br/>new file mode 100644<br/>index 000000000000..e5dc49860944<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/cs40l50.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/cs40l50.h</a></div><div class='hunk'>@@ -0,0 +1,137 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * CS40L50 Advanced Haptic Driver with waveform memory,</div><div class='add'>+ * integrated DSP, and closed-loop algorithms</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2024 Cirrus Logic, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: James Ogletree &lt;james.ogletree@cirrus.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MFD_CS40L50_H__</div><div class='add'>+#define __MFD_CS40L50_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/firmware/cirrus/cs_dsp.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+/* Power Supply Configuration */</div><div class='add'>+#define CS40L50_BLOCK_ENABLES2		0x201C</div><div class='add'>+#define CS40L50_ERR_RLS			0x2034</div><div class='add'>+#define CS40L50_BST_LPMODE_SEL		0x3810</div><div class='add'>+#define CS40L50_DCM_LOW_POWER		0x1</div><div class='add'>+#define CS40L50_OVERTEMP_WARN		0x4000010</div><div class='add'>+</div><div class='add'>+/* Interrupts */</div><div class='add'>+#define CS40L50_IRQ1_INT_1		0xE010</div><div class='add'>+#define CS40L50_IRQ1_BASE		CS40L50_IRQ1_INT_1</div><div class='add'>+#define CS40L50_IRQ1_INT_2		0xE014</div><div class='add'>+#define CS40L50_IRQ1_INT_8		0xE02C</div><div class='add'>+#define CS40L50_IRQ1_INT_9		0xE030</div><div class='add'>+#define CS40L50_IRQ1_INT_10		0xE034</div><div class='add'>+#define CS40L50_IRQ1_INT_18		0xE054</div><div class='add'>+#define CS40L50_IRQ1_MASK_1		0xE090</div><div class='add'>+#define CS40L50_IRQ1_MASK_2		0xE094</div><div class='add'>+#define CS40L50_IRQ1_MASK_20		0xE0DC</div><div class='add'>+#define CS40L50_IRQ1_INT_1_OFFSET	(CS40L50_IRQ1_INT_1 - CS40L50_IRQ1_BASE)</div><div class='add'>+#define CS40L50_IRQ1_INT_2_OFFSET	(CS40L50_IRQ1_INT_2 - CS40L50_IRQ1_BASE)</div><div class='add'>+#define CS40L50_IRQ1_INT_8_OFFSET	(CS40L50_IRQ1_INT_8 - CS40L50_IRQ1_BASE)</div><div class='add'>+#define CS40L50_IRQ1_INT_9_OFFSET	(CS40L50_IRQ1_INT_9 - CS40L50_IRQ1_BASE)</div><div class='add'>+#define CS40L50_IRQ1_INT_10_OFFSET	(CS40L50_IRQ1_INT_10 - CS40L50_IRQ1_BASE)</div><div class='add'>+#define CS40L50_IRQ1_INT_18_OFFSET	(CS40L50_IRQ1_INT_18 - CS40L50_IRQ1_BASE)</div><div class='add'>+#define CS40L50_IRQ_MASK_2_OVERRIDE	0xFFDF7FFF</div><div class='add'>+#define CS40L50_IRQ_MASK_20_OVERRIDE	0x15C01000</div><div class='add'>+#define CS40L50_AMP_SHORT_MASK		BIT(31)</div><div class='add'>+#define CS40L50_DSP_QUEUE_MASK		BIT(21)</div><div class='add'>+#define CS40L50_TEMP_ERR_MASK		BIT(31)</div><div class='add'>+#define CS40L50_BST_UVP_MASK		BIT(6)</div><div class='add'>+#define CS40L50_BST_SHORT_MASK		BIT(7)</div><div class='add'>+#define CS40L50_BST_ILIMIT_MASK		BIT(18)</div><div class='add'>+#define CS40L50_UVLO_VDDBATT_MASK	BIT(16)</div><div class='add'>+#define CS40L50_GLOBAL_ERROR_MASK	BIT(15)</div><div class='add'>+</div><div class='add'>+enum cs40l50_irq_list {</div><div class='add'>+	CS40L50_DSP_QUEUE_IRQ,</div><div class='add'>+	CS40L50_GLOBAL_ERROR_IRQ,</div><div class='add'>+	CS40L50_UVLO_VDDBATT_IRQ,</div><div class='add'>+	CS40L50_BST_ILIMIT_IRQ,</div><div class='add'>+	CS40L50_BST_SHORT_IRQ,</div><div class='add'>+	CS40L50_BST_UVP_IRQ,</div><div class='add'>+	CS40L50_TEMP_ERR_IRQ,</div><div class='add'>+	CS40L50_AMP_SHORT_IRQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSP */</div><div class='add'>+#define CS40L50_XMEM_PACKED_0		0x2000000</div><div class='add'>+#define CS40L50_XMEM_UNPACKED24_0	0x2800000</div><div class='add'>+#define CS40L50_SYS_INFO_ID		0x25E0000</div><div class='add'>+#define CS40L50_DSP_QUEUE_WT		0x28042C8</div><div class='add'>+#define CS40L50_DSP_QUEUE_RD		0x28042CC</div><div class='add'>+#define CS40L50_NUM_WAVES		0x2805C18</div><div class='add'>+#define CS40L50_CORE_BASE		0x2B80000</div><div class='add'>+#define CS40L50_YMEM_PACKED_0		0x2C00000</div><div class='add'>+#define CS40L50_YMEM_UNPACKED24_0	0x3400000</div><div class='add'>+#define CS40L50_PMEM_0			0x3800000</div><div class='add'>+#define CS40L50_DSP_POLL_US		1000</div><div class='add'>+#define CS40L50_DSP_TIMEOUT_COUNT	100</div><div class='add'>+#define CS40L50_RESET_PULSE_US		2200</div><div class='add'>+#define CS40L50_CP_READY_US		3100</div><div class='add'>+#define CS40L50_AUTOSUSPEND_MS		2000</div><div class='add'>+#define CS40L50_PM_ALGO			0x9F206</div><div class='add'>+#define CS40L50_GLOBAL_ERR_RLS_SET	BIT(11)</div><div class='add'>+#define CS40L50_GLOBAL_ERR_RLS_CLEAR	0</div><div class='add'>+</div><div class='add'>+enum cs40l50_wseqs {</div><div class='add'>+	CS40L50_PWR_ON,</div><div class='add'>+	CS40L50_STANDBY,</div><div class='add'>+	CS40L50_ACTIVE,</div><div class='add'>+	CS40L50_NUM_WSEQS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSP Queue */</div><div class='add'>+#define CS40L50_DSP_QUEUE_BASE		0x11004</div><div class='add'>+#define CS40L50_DSP_QUEUE_END		0x1101C</div><div class='add'>+#define CS40L50_DSP_QUEUE		0x11020</div><div class='add'>+#define CS40L50_PREVENT_HIBER		0x2000003</div><div class='add'>+#define CS40L50_ALLOW_HIBER		0x2000004</div><div class='add'>+#define CS40L50_SHUTDOWN		0x2000005</div><div class='add'>+#define CS40L50_SYSTEM_RESET		0x2000007</div><div class='add'>+#define CS40L50_START_I2S		0x3000002</div><div class='add'>+#define CS40L50_OWT_PUSH		0x3000008</div><div class='add'>+#define CS40L50_STOP_PLAYBACK		0x5000000</div><div class='add'>+#define CS40L50_OWT_DELETE		0xD000000</div><div class='add'>+</div><div class='add'>+/* Firmware files */</div><div class='add'>+#define CS40L50_FW			"cs40l50.wmfw"</div><div class='add'>+#define CS40L50_WT			"cs40l50.bin"</div><div class='add'>+</div><div class='add'>+/* Device */</div><div class='add'>+#define CS40L50_DEVID			0x0</div><div class='add'>+#define CS40L50_REVID			0x4</div><div class='add'>+#define CS40L50_DEVID_A			0x40A50</div><div class='add'>+#define CS40L50_REVID_B0		0xB0</div><div class='add'>+</div><div class='add'>+struct cs40l50 {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	struct cs_dsp dsp;</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+	struct regmap_irq_chip_data *irq_data;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	const struct firmware *bin;</div><div class='add'>+	struct cs_dsp_wseq wseqs[CS40L50_NUM_WSEQS];</div><div class='add'>+	int irq;</div><div class='add'>+	u32 devid;</div><div class='add'>+	u32 revid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cs40l50_dsp_write(struct device *dev, struct regmap *regmap, u32 val);</div><div class='add'>+int cs40l50_probe(struct cs40l50 *cs40l50);</div><div class='add'>+int cs40l50_remove(struct cs40l50 *cs40l50);</div><div class='add'>+</div><div class='add'>+extern const struct regmap_config cs40l50_regmap;</div><div class='add'>+extern const struct dev_pm_ops cs40l50_pm_ops;</div><div class='add'>+</div><div class='add'>+#endif /* __MFD_CS40L50_H__ */</div><div class='head'>diff --git a/include/linux/mfd/cs42l43.h b/include/linux/mfd/cs42l43.h<br/>index cf8263aab41b..2239d8585e78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/cs42l43.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/cs42l43.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/cs42l43.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/cs42l43.h</a></div><div class='hunk'>@@ -6,20 +6,21 @@</div><div class='ctx'>  *                         Cirrus Logic International Semiconductor Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifndef CS42L43_CORE_EXT_H</div><div class='add'>+#define CS42L43_CORE_EXT_H</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='del'>-#include &lt;linux/soundwire/sdw.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef CS42L43_CORE_EXT_H</div><div class='del'>-#define CS42L43_CORE_EXT_H</div><div class='del'>-</div><div class='ctx'> #define CS42L43_N_SUPPLIES		3</div><div class='ctx'> </div><div class='add'>+struct device;</div><div class='add'>+struct gpio_desc;</div><div class='add'>+struct sdw_slave;</div><div class='add'>+</div><div class='ctx'> enum cs42l43_irq_numbers {</div><div class='ctx'> 	CS42L43_PLL_LOST_LOCK,</div><div class='ctx'> 	CS42L43_PLL_READY,</div><div class='head'>diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h<br/>index 76feb3a7066d..9cb2fc2938ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/da9052/da9052.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/da9052/da9052.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/da9052/da9052.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/da9052/da9052.h</a></div><div class='hunk'>@@ -93,6 +93,8 @@ struct da9052 {</div><div class='ctx'> </div><div class='ctx'> 	int chip_irq;</div><div class='ctx'> </div><div class='add'>+	int fault_log;</div><div class='add'>+</div><div class='ctx'> 	/* SOC I/O transfer related fixes for DA9052/53 */</div><div class='ctx'> 	int (*fix_io) (struct da9052 *da9052, unsigned char reg);</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h<br/>index 8db52324f416..eae82f421414 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/da9063/core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/da9063/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/da9063/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/da9063/core.h</a></div><div class='hunk'>@@ -78,6 +78,7 @@ struct da9063 {</div><div class='ctx'> 	enum da9063_type type;</div><div class='ctx'> 	unsigned char	variant_code;</div><div class='ctx'> 	unsigned int	flags;</div><div class='add'>+	bool use_sw_pm;</div><div class='ctx'> </div><div class='ctx'> 	/* Control interface */</div><div class='ctx'> 	struct regmap	*regmap;</div><div class='head'>diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h<br/>index 556375b91316..9acd703dd5ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/davinci_voicecodec.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/davinci_voicecodec.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/davinci_voicecodec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/davinci_voicecodec.h</a></div><div class='hunk'>@@ -10,11 +10,13 @@</div><div class='ctx'> #ifndef __LINUX_MFD_DAVINCI_VOICECODEC_H_</div><div class='ctx'> #define __LINUX_MFD_DAVINCI_VOICECODEC_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/core.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/edma.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+struct clk;</div><div class='add'>+struct device;</div><div class='add'>+struct platform_device;</div><div class='ctx'> struct regmap;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h<br/>index dd0fc891b228..828362b7860c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/dbx500-prcmu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/dbx500-prcmu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/dbx500-prcmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/dbx500-prcmu.h</a></div><div class='hunk'>@@ -213,9 +213,9 @@ struct prcmu_fw_version {</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_UX500_SOC_DB8500)</div><div class='ctx'> </div><div class='del'>-static inline void prcmu_early_init(void)</div><div class='add'>+static inline void __init prcmu_early_init(void)</div><div class='ctx'> {</div><div class='del'>-	return db8500_prcmu_early_init();</div><div class='add'>+	db8500_prcmu_early_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,</div><div class='hunk'>@@ -302,7 +302,7 @@ static inline int prcmu_request_ape_opp_100_voltage(bool enable)</div><div class='ctx'> </div><div class='ctx'> static inline void prcmu_system_reset(u16 reset_code)</div><div class='ctx'> {</div><div class='del'>-	return db8500_prcmu_system_reset(reset_code);</div><div class='add'>+	db8500_prcmu_system_reset(reset_code);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u16 prcmu_get_reset_code(void)</div><div class='hunk'>@@ -314,7 +314,7 @@ int prcmu_ac_wake_req(void);</div><div class='ctx'> void prcmu_ac_sleep_req(void);</div><div class='ctx'> static inline void prcmu_modem_reset(void)</div><div class='ctx'> {</div><div class='del'>-	return db8500_prcmu_modem_reset();</div><div class='add'>+	db8500_prcmu_modem_reset();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool prcmu_is_ac_wake_requested(void)</div><div class='head'>diff --git a/include/linux/mfd/ds1wm.h b/include/linux/mfd/ds1wm.h<br/>deleted file mode 100644<br/>index 43dfca1c9702..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/ds1wm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/ds1wm.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* MFD cell driver data for the DS1WM driver</div><div class='del'>- *</div><div class='del'>- * to be defined in the MFD device that is</div><div class='del'>- * using this driver for one of his sub devices</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ds1wm_driver_data {</div><div class='del'>-	int active_high;</div><div class='del'>-	int clock_rate;</div><div class='del'>-	/* in milliseconds, the amount of time to</div><div class='del'>-	 * sleep following a reset pulse. Zero</div><div class='del'>-	 * should work if your bus devices recover</div><div class='del'>-	 * time respects the 1-wire spec since the</div><div class='del'>-	 * ds1wm implements the precise timings of</div><div class='del'>-	 * a reset pulse/presence detect sequence.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int reset_recover_delay;</div><div class='del'>-</div><div class='del'>-	/* Say 1 here for big endian Hardware</div><div class='del'>-	 * (only relevant with bus-shift &gt; 0</div><div class='del'>-	 */</div><div class='del'>-	bool is_hw_big_endian;</div><div class='del'>-</div><div class='del'>-	/* left shift of register number to get register address offsett.</div><div class='del'>-	 * Only 0,1,2 allowed for 8,16 or 32 bit bus width respectively</div><div class='del'>-	 */</div><div class='del'>-	unsigned int bus_shift;</div><div class='del'>-};</div><div class='head'>diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h<br/>index ffde195e12b7..ea51b1cdca5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/ezx-pcap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/ezx-pcap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/ezx-pcap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/ezx-pcap.h</a></div><div class='hunk'>@@ -31,7 +31,6 @@ int ezx_pcap_set_bits(struct pcap_chip *, u8, u32, u32);</div><div class='ctx'> int pcap_to_irq(struct pcap_chip *, int);</div><div class='ctx'> int irq_to_pcap(struct pcap_chip *, int);</div><div class='ctx'> int pcap_adc_async(struct pcap_chip *, u8, u32, u8[], void *, void *);</div><div class='del'>-int pcap_adc_sync(struct pcap_chip *, u8, u32, u8[], u16[]);</div><div class='ctx'> void pcap_set_ts_bits(struct pcap_chip *, u32);</div><div class='ctx'> </div><div class='ctx'> #define PCAP_SECOND_PORT	1</div><div class='head'>diff --git a/include/linux/mfd/idt8a340_reg.h b/include/linux/mfd/idt8a340_reg.h<br/>index 0c706085c205..53a222605526 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/idt8a340_reg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/idt8a340_reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/idt8a340_reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/idt8a340_reg.h</a></div><div class='hunk'>@@ -61,7 +61,7 @@</div><div class='ctx'> #define HW_Q8_CTRL_SPARE  (0xa7d4)</div><div class='ctx'> #define HW_Q11_CTRL_SPARE (0xa7ec)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Select FOD5 as sync_trigger for Q8 divider.</div><div class='ctx'>  * Transition from logic zero to one</div><div class='ctx'>  * sets trigger to sync Q8 divider.</div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define Q9_TO_Q8_SYNC_TRIG  BIT(1)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Enable FOD5 as driver for clock and sync for Q8 divider.</div><div class='ctx'>  * Enable fanout buffer for FOD5.</div><div class='ctx'>  *</div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define Q9_TO_Q8_FANOUT_AND_CLOCK_SYNC_ENABLE_MASK  (BIT(0) | BIT(2))</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Select FOD6 as sync_trigger for Q11 divider.</div><div class='ctx'>  * Transition from logic zero to one</div><div class='ctx'>  * sets trigger to sync Q11 divider.</div><div class='hunk'>@@ -87,7 +87,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #define Q10_TO_Q11_SYNC_TRIG  BIT(1)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Enable FOD6 as driver for clock and sync for Q11 divider.</div><div class='ctx'>  * Enable fanout buffer for FOD6.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/linux/mfd/intel-m10-bmc.h b/include/linux/mfd/intel-m10-bmc.h<br/>index ee66c9751003..988f1cd90032 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/intel-m10-bmc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/intel-m10-bmc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/intel-m10-bmc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/intel-m10-bmc.h</a></div><div class='hunk'>@@ -205,6 +205,7 @@ struct m10bmc_csr_map {</div><div class='ctx'> 	unsigned int pr_reh_addr;</div><div class='ctx'> 	unsigned int pr_magic;</div><div class='ctx'> 	unsigned int rsu_update_counter;</div><div class='add'>+	unsigned int staging_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/mfd/lm3533.h b/include/linux/mfd/lm3533.h<br/>index 77092f6363ad..69059a7a2ce5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/lm3533.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/lm3533.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/lm3533.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/lm3533.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> 	DEVICE_ATTR(_name, S_IRUGO | S_IWUSR , show_##_name, store_##_name)</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='add'>+struct gpio_desc;</div><div class='ctx'> struct regmap;</div><div class='ctx'> </div><div class='ctx'> struct lm3533 {</div><div class='hunk'>@@ -23,7 +24,7 @@ struct lm3533 {</div><div class='ctx'> </div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> </div><div class='del'>-	int gpio_hwen;</div><div class='add'>+	struct gpio_desc *hwen;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='ctx'> 	unsigned have_als:1;</div><div class='hunk'>@@ -69,8 +70,6 @@ enum lm3533_boost_ovp {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct lm3533_platform_data {</div><div class='del'>-	int gpio_hwen;</div><div class='del'>-</div><div class='ctx'> 	enum lm3533_boost_ovp boost_ovp;</div><div class='ctx'> 	enum lm3533_boost_freq boost_freq;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mfd/loongson-se.h b/include/linux/mfd/loongson-se.h<br/>new file mode 100644<br/>index 000000000000..07afa0c2524d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/loongson-se.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/loongson-se.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/* Copyright (C) 2025 Loongson Technology Corporation Limited */</div><div class='add'>+</div><div class='add'>+#ifndef __MFD_LOONGSON_SE_H__</div><div class='add'>+#define __MFD_LOONGSON_SE_H__</div><div class='add'>+</div><div class='add'>+#define LOONGSON_ENGINE_CMD_TIMEOUT_US	10000</div><div class='add'>+#define SE_SEND_CMD_REG			0x0</div><div class='add'>+#define SE_SEND_CMD_REG_LEN		0x8</div><div class='add'>+/* Controller command ID */</div><div class='add'>+#define SE_CMD_START			0x0</div><div class='add'>+#define SE_CMD_SET_DMA			0x3</div><div class='add'>+#define SE_CMD_SET_ENGINE_CMDBUF	0x4</div><div class='add'>+</div><div class='add'>+#define SE_S2LINT_STAT			0x88</div><div class='add'>+#define SE_S2LINT_EN			0x8c</div><div class='add'>+#define SE_S2LINT_CL			0x94</div><div class='add'>+#define SE_L2SINT_STAT			0x98</div><div class='add'>+#define SE_L2SINT_SET			0xa0</div><div class='add'>+</div><div class='add'>+#define SE_INT_ALL			0xffffffff</div><div class='add'>+#define SE_INT_CONTROLLER		BIT(0)</div><div class='add'>+</div><div class='add'>+#define SE_ENGINE_MAX			16</div><div class='add'>+#define SE_ENGINE_RNG			1</div><div class='add'>+#define SE_CMD_RNG			0x100</div><div class='add'>+</div><div class='add'>+#define SE_ENGINE_TPM			5</div><div class='add'>+#define SE_CMD_TPM			0x500</div><div class='add'>+</div><div class='add'>+#define SE_ENGINE_CMD_SIZE		32</div><div class='add'>+</div><div class='add'>+struct loongson_se_engine {</div><div class='add'>+	struct loongson_se *se;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	/* Command buffer */</div><div class='add'>+	void *command;</div><div class='add'>+	void *command_ret;</div><div class='add'>+</div><div class='add'>+	void *data_buffer;</div><div class='add'>+	uint buffer_size;</div><div class='add'>+	/* Data buffer offset to DMA base */</div><div class='add'>+	uint buffer_off;</div><div class='add'>+</div><div class='add'>+	struct completion completion;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct loongson_se_engine *loongson_se_init_engine(struct device *dev, int id);</div><div class='add'>+int loongson_se_send_engine_cmd(struct loongson_se_engine *engine);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/mfd/lp3943.h b/include/linux/mfd/lp3943.h<br/>index 020a339f96e8..402f01078fcc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/lp3943.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/lp3943.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/lp3943.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/lp3943.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #define __MFD_LP3943_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/pwm.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Registers */</div><div class='head'>diff --git a/include/linux/mfd/lp8788.h b/include/linux/mfd/lp8788.h<br/>index 51b47966a04d..fd17bec2a33e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/lp8788.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/lp8788.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/lp8788.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/lp8788.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #define __MFD_LP8788_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='del'>-#include &lt;linux/pwm.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define LP8788_DEV_BUCK		"lp8788-buck"</div><div class='hunk'>@@ -87,12 +86,6 @@ enum lp8788_charger_event {</div><div class='ctx'> 	CHARGER_DETECTED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum lp8788_bl_ctrl_mode {</div><div class='del'>-	LP8788_BL_REGISTER_ONLY,</div><div class='del'>-	LP8788_BL_COMB_PWM_BASED,	/* PWM + I2C, changed by PWM input */</div><div class='del'>-	LP8788_BL_COMB_REGISTER_BASED,	/* PWM + I2C, changed by I2C */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum lp8788_bl_dim_mode {</div><div class='ctx'> 	LP8788_DIM_EXPONENTIAL,</div><div class='ctx'> 	LP8788_DIM_LINEAR,</div><div class='hunk'>@@ -202,31 +195,6 @@ struct lp8788_charger_platform_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * struct lp8788_backlight_platform_data</div><div class='del'>- * @name                  : backlight driver name. (default: "lcd-backlight")</div><div class='del'>- * @initial_brightness    : initial value of backlight brightness</div><div class='del'>- * @bl_mode               : brightness control by pwm or lp8788 register</div><div class='del'>- * @dim_mode              : dimming mode selection</div><div class='del'>- * @full_scale            : full scale current setting</div><div class='del'>- * @rise_time             : brightness ramp up step time</div><div class='del'>- * @fall_time             : brightness ramp down step time</div><div class='del'>- * @pwm_pol               : pwm polarity setting when bl_mode is pwm based</div><div class='del'>- * @period_ns             : platform specific pwm period value. unit is nano.</div><div class='del'>-			    Only valid when bl_mode is LP8788_BL_COMB_PWM_BASED</div><div class='del'>- */</div><div class='del'>-struct lp8788_backlight_platform_data {</div><div class='del'>-	char *name;</div><div class='del'>-	int initial_brightness;</div><div class='del'>-	enum lp8788_bl_ctrl_mode bl_mode;</div><div class='del'>-	enum lp8788_bl_dim_mode dim_mode;</div><div class='del'>-	enum lp8788_bl_full_scale_current full_scale;</div><div class='del'>-	enum lp8788_bl_ramp_step rise_time;</div><div class='del'>-	enum lp8788_bl_ramp_step fall_time;</div><div class='del'>-	enum pwm_polarity pwm_pol;</div><div class='del'>-	unsigned int period_ns;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * struct lp8788_led_platform_data</div><div class='ctx'>  * @name         : led driver name. (default: "keyboard-backlight")</div><div class='ctx'>  * @scale        : current scale</div><div class='hunk'>@@ -267,7 +235,6 @@ struct lp8788_vib_platform_data {</div><div class='ctx'>  * @buck2_dvs    : configurations for buck2 dvs</div><div class='ctx'>  * @chg_pdata    : platform data for charger driver</div><div class='ctx'>  * @alarm_sel    : rtc alarm selection (1 or 2)</div><div class='del'>- * @bl_pdata     : configurable data for backlight driver</div><div class='ctx'>  * @led_pdata    : configurable data for led driver</div><div class='ctx'>  * @vib_pdata    : configurable data for vibrator driver</div><div class='ctx'>  * @adc_pdata    : iio map data for adc driver</div><div class='hunk'>@@ -289,9 +256,6 @@ struct lp8788_platform_data {</div><div class='ctx'> 	/* rtc alarm */</div><div class='ctx'> 	enum lp8788_alarm_sel alarm_sel;</div><div class='ctx'> </div><div class='del'>-	/* backlight */</div><div class='del'>-	struct lp8788_backlight_platform_data *bl_pdata;</div><div class='del'>-</div><div class='ctx'> 	/* current sinks */</div><div class='ctx'> 	struct lp8788_led_platform_data *led_pdata;</div><div class='ctx'> 	struct lp8788_vib_platform_data *vib_pdata;</div><div class='head'>diff --git a/include/linux/mfd/macsmc.h b/include/linux/mfd/macsmc.h<br/>new file mode 100644<br/>index 000000000000..cc09ecce0df7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/macsmc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/macsmc.h</a></div><div class='hunk'>@@ -0,0 +1,280 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only OR MIT */</div><div class='add'>+/*</div><div class='add'>+ * Apple SMC (System Management Controller) core definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) The Asahi Linux Contributors</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_MFD_MACSMC_H</div><div class='add'>+#define _LINUX_MFD_MACSMC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/soc/apple/rtkit.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * typedef smc_key - Alias for u32 to be used for SMC keys</div><div class='add'>+ *</div><div class='add'>+ * SMC keys are 32bit integers containing packed ASCII characters in natural</div><div class='add'>+ * integer order, i.e. 0xAABBCCDD, which represent the FourCC ABCD.</div><div class='add'>+ * The SMC driver is designed with this assumption and ensures the right</div><div class='add'>+ * endianness is used when these are stored to memory and sent to or received</div><div class='add'>+ * from the actual SMC firmware (which can be done in either shared memory or</div><div class='add'>+ * as 64bit mailbox message on Apple Silicon).</div><div class='add'>+ * Internally, SMC stores these keys in a table sorted lexicographically and</div><div class='add'>+ * allows resolving an index into this table to the corresponding SMC key.</div><div class='add'>+ * Thus, storing keys as u32 is very convenient as it allows to e.g. use</div><div class='add'>+ * normal comparison operators which directly map to the natural order used</div><div class='add'>+ * by SMC firmware.</div><div class='add'>+ *</div><div class='add'>+ * This simple type alias is introduced to allow easy recognition of SMC key</div><div class='add'>+ * variables and arguments.</div><div class='add'>+ */</div><div class='add'>+typedef u32 smc_key;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * SMC_KEY - Convert FourCC SMC keys in source code to smc_key</div><div class='add'>+ *</div><div class='add'>+ * This macro can be used to easily define FourCC SMC keys in source code</div><div class='add'>+ * and convert these to u32 / smc_key, e.g. SMC_KEY(NTAP) will expand to</div><div class='add'>+ * 0x4e544150.</div><div class='add'>+ *</div><div class='add'>+ * @s: FourCC SMC key to be converted</div><div class='add'>+ */</div><div class='add'>+#define SMC_KEY(s) (smc_key)(_SMC_KEY(#s))</div><div class='add'>+#define _SMC_KEY(s) (((s)[0] &lt;&lt; 24) | ((s)[1] &lt;&lt; 16) | ((s)[2] &lt;&lt; 8) | (s)[3])</div><div class='add'>+#define __SMC_KEY(a, b, c, d) (((u32)(a) &lt;&lt; 24) | ((u32)(b) &lt;&lt; 16) | ((u32)(c) &lt;&lt; 8) | ((u32)(d)))</div><div class='add'>+</div><div class='add'>+#define APPLE_SMC_READABLE BIT(7)</div><div class='add'>+#define APPLE_SMC_WRITABLE BIT(6)</div><div class='add'>+#define APPLE_SMC_FUNCTION BIT(4)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct apple_smc_key_info - Information for a SMC key as returned by SMC</div><div class='add'>+ * @type_code: FourCC code indicating the type for this key.</div><div class='add'>+ *             Known types:</div><div class='add'>+ *              ch8*: ASCII string</div><div class='add'>+ *              flag: Boolean, 1 or 0</div><div class='add'>+ *              flt: 32-bit single-precision IEEE 754 float</div><div class='add'>+ *              hex: Binary data</div><div class='add'>+ *              ioft: 64bit Unsigned fixed-point intger (48.16)</div><div class='add'>+ *              {si,ui}{8,16,32,64}: Signed/Unsigned 8-/16-/32-/64-bit integer</div><div class='add'>+ * @size: Size of the buffer associated with this key</div><div class='add'>+ * @flags: Bitfield encoding flags (APPLE_SMC_{READABLE,WRITABLE,FUNCTION})</div><div class='add'>+ */</div><div class='add'>+struct apple_smc_key_info {</div><div class='add'>+	u32 type_code;</div><div class='add'>+	u8 size;</div><div class='add'>+	u8 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum apple_smc_boot_stage - SMC boot stage</div><div class='add'>+ * @APPLE_SMC_BOOTING: SMC is booting</div><div class='add'>+ * @APPLE_SMC_INITIALIZED: SMC is initialized and ready to use</div><div class='add'>+ * @APPLE_SMC_ERROR_NO_SHMEM: Shared memory could not be initialized during boot</div><div class='add'>+ * @APPLE_SMC_ERROR_CRASHED: SMC has crashed</div><div class='add'>+ */</div><div class='add'>+enum apple_smc_boot_stage {</div><div class='add'>+	APPLE_SMC_BOOTING,</div><div class='add'>+	APPLE_SMC_INITIALIZED,</div><div class='add'>+	APPLE_SMC_ERROR_NO_SHMEM,</div><div class='add'>+	APPLE_SMC_ERROR_CRASHED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct apple_smc</div><div class='add'>+ * @dev: Underlying device struct for the physical backend device</div><div class='add'>+ * @key_count: Number of available SMC keys</div><div class='add'>+ * @first_key: First valid SMC key</div><div class='add'>+ * @last_key: Last valid SMC key</div><div class='add'>+ * @event_handlers: Notifier call chain for events received from SMC</div><div class='add'>+ * @rtk: Pointer to Apple RTKit instance</div><div class='add'>+ * @init_done: Completion for initialization</div><div class='add'>+ * @boot_stage: Current boot stage of SMC</div><div class='add'>+ * @sram: Pointer to SRAM resource</div><div class='add'>+ * @sram_base: SRAM base address</div><div class='add'>+ * @shmem: RTKit shared memory structure for SRAM</div><div class='add'>+ * @msg_id: Current message id for commands, will be incremented for each command</div><div class='add'>+ * @atomic_mode: Flag set when atomic mode is entered</div><div class='add'>+ * @atomic_pending: Flag indicating pending atomic command</div><div class='add'>+ * @cmd_done: Completion for command execution in non-atomic mode</div><div class='add'>+ * @cmd_ret: Return value from SMC for last command</div><div class='add'>+ * @mutex: Mutex for non-atomic mode</div><div class='add'>+ * @lock: Spinlock for atomic mode</div><div class='add'>+ */</div><div class='add'>+struct apple_smc {</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	u32 key_count;</div><div class='add'>+	smc_key first_key;</div><div class='add'>+	smc_key last_key;</div><div class='add'>+</div><div class='add'>+	struct blocking_notifier_head event_handlers;</div><div class='add'>+</div><div class='add'>+	struct apple_rtkit *rtk;</div><div class='add'>+</div><div class='add'>+	struct completion init_done;</div><div class='add'>+	enum apple_smc_boot_stage boot_stage;</div><div class='add'>+</div><div class='add'>+	struct resource *sram;</div><div class='add'>+	void __iomem *sram_base;</div><div class='add'>+	struct apple_rtkit_shmem shmem;</div><div class='add'>+</div><div class='add'>+	unsigned int msg_id;</div><div class='add'>+</div><div class='add'>+	bool atomic_mode;</div><div class='add'>+	bool atomic_pending;</div><div class='add'>+	struct completion cmd_done;</div><div class='add'>+	u64 cmd_ret;</div><div class='add'>+</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apple_smc_read - Read size bytes from given SMC key into buf</div><div class='add'>+ * @smc: Pointer to apple_smc struct</div><div class='add'>+ * @key: smc_key to be read</div><div class='add'>+ * @buf: Buffer into which size bytes of data will be read from SMC</div><div class='add'>+ * @size: Number of bytes to be read into buf</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success, negative errno on error</div><div class='add'>+ */</div><div class='add'>+int apple_smc_read(struct apple_smc *smc, smc_key key, void *buf, size_t size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apple_smc_write - Write size bytes into given SMC key from buf</div><div class='add'>+ * @smc: Pointer to apple_smc struct</div><div class='add'>+ * @key: smc_key data will be written to</div><div class='add'>+ * @buf: Buffer from which size bytes of data will be written to SMC</div><div class='add'>+ * @size: Number of bytes to be written</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success, negative errno on error</div><div class='add'>+ */</div><div class='add'>+int apple_smc_write(struct apple_smc *smc, smc_key key, const void *buf, size_t size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apple_smc_enter_atomic - Enter atomic mode to be able to use apple_smc_write_atomic</div><div class='add'>+ * @smc: Pointer to apple_smc struct</div><div class='add'>+ *</div><div class='add'>+ * This function switches the SMC backend to atomic mode which allows the</div><div class='add'>+ * use of apple_smc_write_atomic while disabling *all* other functions.</div><div class='add'>+ * This is only used for shutdown/reboot which requires writing to a SMC</div><div class='add'>+ * key from atomic context.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success, negative errno on error</div><div class='add'>+ */</div><div class='add'>+int apple_smc_enter_atomic(struct apple_smc *smc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apple_smc_write_atomic - Write size bytes into given SMC key from buf without sleeping</div><div class='add'>+ * @smc: Pointer to apple_smc struct</div><div class='add'>+ * @key: smc_key data will be written to</div><div class='add'>+ * @buf: Buffer from which size bytes of data will be written to SMC</div><div class='add'>+ * @size: Number of bytes to be written</div><div class='add'>+ *</div><div class='add'>+ * Note that this function will fail if apple_smc_enter_atomic hasn't been</div><div class='add'>+ * called before.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success, negative errno on error</div><div class='add'>+ */</div><div class='add'>+int apple_smc_write_atomic(struct apple_smc *smc, smc_key key, const void *buf, size_t size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apple_smc_rw - Write and then read using the given SMC key</div><div class='add'>+ * @smc: Pointer to apple_smc struct</div><div class='add'>+ * @key: smc_key data will be written to</div><div class='add'>+ * @wbuf: Buffer from which size bytes of data will be written to SMC</div><div class='add'>+ * @wsize: Number of bytes to be written</div><div class='add'>+ * @rbuf: Buffer to which size bytes of data will be read from SMC</div><div class='add'>+ * @rsize: Number of bytes to be read</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success, negative errno on error</div><div class='add'>+ */</div><div class='add'>+int apple_smc_rw(struct apple_smc *smc, smc_key key, const void *wbuf, size_t wsize,</div><div class='add'>+		 void *rbuf, size_t rsize);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apple_smc_get_key_by_index - Given an index return the corresponding SMC key</div><div class='add'>+ * @smc: Pointer to apple_smc struct</div><div class='add'>+ * @index: Index to be resolved</div><div class='add'>+ * @key: Buffer for SMC key to be returned</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success, negative errno on error</div><div class='add'>+ */</div><div class='add'>+int apple_smc_get_key_by_index(struct apple_smc *smc, int index, smc_key *key);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apple_smc_get_key_info - Get key information from SMC</div><div class='add'>+ * @smc: Pointer to apple_smc struct</div><div class='add'>+ * @key: Key to acquire information for</div><div class='add'>+ * @info: Pointer to struct apple_smc_key_info which will be filled</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success, negative errno on error</div><div class='add'>+ */</div><div class='add'>+int apple_smc_get_key_info(struct apple_smc *smc, smc_key key, struct apple_smc_key_info *info);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apple_smc_key_exists - Check if the given SMC key exists</div><div class='add'>+ * @smc: Pointer to apple_smc struct</div><div class='add'>+ * @key: smc_key to be checked</div><div class='add'>+ *</div><div class='add'>+ * Return: True if the key exists, false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool apple_smc_key_exists(struct apple_smc *smc, smc_key key)</div><div class='add'>+{</div><div class='add'>+	return apple_smc_get_key_info(smc, key, NULL) &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define APPLE_SMC_TYPE_OPS(type) \</div><div class='add'>+	static inline int apple_smc_read_##type(struct apple_smc *smc, smc_key key, type *p) \</div><div class='add'>+	{ \</div><div class='add'>+		int ret = apple_smc_read(smc, key, p, sizeof(*p)); \</div><div class='add'>+		return (ret &lt; 0) ? ret : ((ret != sizeof(*p)) ? -EINVAL : 0); \</div><div class='add'>+	} \</div><div class='add'>+	static inline int apple_smc_write_##type(struct apple_smc *smc, smc_key key, type p) \</div><div class='add'>+	{ \</div><div class='add'>+		return apple_smc_write(smc, key, &amp;p, sizeof(p)); \</div><div class='add'>+	} \</div><div class='add'>+	static inline int apple_smc_write_##type##_atomic(struct apple_smc *smc, smc_key key, type p) \</div><div class='add'>+	{ \</div><div class='add'>+		return apple_smc_write_atomic(smc, key, &amp;p, sizeof(p)); \</div><div class='add'>+	} \</div><div class='add'>+	static inline int apple_smc_rw_##type(struct apple_smc *smc, smc_key key, \</div><div class='add'>+					      type w, type *r) \</div><div class='add'>+	{ \</div><div class='add'>+		int ret = apple_smc_rw(smc, key, &amp;w, sizeof(w), r, sizeof(*r)); \</div><div class='add'>+		return (ret &lt; 0) ? ret : ((ret != sizeof(*r)) ? -EINVAL : 0); \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+APPLE_SMC_TYPE_OPS(u64)</div><div class='add'>+APPLE_SMC_TYPE_OPS(u32)</div><div class='add'>+APPLE_SMC_TYPE_OPS(u16)</div><div class='add'>+APPLE_SMC_TYPE_OPS(u8)</div><div class='add'>+APPLE_SMC_TYPE_OPS(s64)</div><div class='add'>+APPLE_SMC_TYPE_OPS(s32)</div><div class='add'>+APPLE_SMC_TYPE_OPS(s16)</div><div class='add'>+APPLE_SMC_TYPE_OPS(s8)</div><div class='add'>+</div><div class='add'>+static inline int apple_smc_read_flag(struct apple_smc *smc, smc_key key, bool *flag)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+	int ret = apple_smc_read_u8(smc, key, &amp;val);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*flag = val ? true : false;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int apple_smc_write_flag(struct apple_smc *smc, smc_key key, bool state)</div><div class='add'>+{</div><div class='add'>+	return apple_smc_write_u8(smc, key, state ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int apple_smc_write_flag_atomic(struct apple_smc *smc, smc_key key, bool state)</div><div class='add'>+{</div><div class='add'>+	return apple_smc_write_u8_atomic(smc, key, state ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/mfd/madera/pdata.h b/include/linux/mfd/madera/pdata.h<br/>index 32e3470708ed..7e84738cbb20 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/madera/pdata.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/madera/pdata.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/madera/pdata.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/madera/pdata.h</a></div><div class='hunk'>@@ -8,10 +8,11 @@</div><div class='ctx'> #ifndef MADERA_PDATA_H</div><div class='ctx'> #define MADERA_PDATA_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/arizona-ldo1.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/arizona-micsupp.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/machine.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;sound/madera-pdata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MADERA_MAX_MICBIAS		4</div><div class='head'>diff --git a/include/linux/mfd/max14577-private.h b/include/linux/mfd/max14577-private.h<br/>index a21374f8ad26..dd51a37fa37f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max14577-private.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max14577-private.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max14577-private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max14577-private.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max14577-private.h - Common API for the Maxim 14577/77836 internal sub chip</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2014 Samsung Electrnoics</div><div class='add'>+ * Copyright (C) 2014 Samsung Electronics</div><div class='ctx'>  * Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='ctx'>  * Krzysztof Kozlowski &lt;krzk@kernel.org&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/mfd/max14577.h b/include/linux/mfd/max14577.h<br/>index 8b3ef891ba42..0fda5c2e745a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max14577.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max14577.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max14577.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max14577.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max14577.h - Driver for the Maxim 14577/77836</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2014 Samsung Electrnoics</div><div class='add'>+ * Copyright (C) 2014 Samsung Electronics</div><div class='ctx'>  * Chanwoo Choi &lt;cw00.choi@samsung.com&gt;</div><div class='ctx'>  * Krzysztof Kozlowski &lt;krzk@kernel.org&gt;</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/linux/mfd/max5970.h b/include/linux/mfd/max5970.h<br/>index 762a7d40c843..fc50e89edfaa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max5970.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max5970.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max5970.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max5970.h</a></div><div class='hunk'>@@ -16,18 +16,6 @@</div><div class='ctx'> #define MAX5978_NUM_SWITCHES 1</div><div class='ctx'> #define MAX5970_NUM_LEDS     4</div><div class='ctx'> </div><div class='del'>-struct max5970_data {</div><div class='del'>-	int num_switches;</div><div class='del'>-	u32 irng[MAX5970_NUM_SWITCHES];</div><div class='del'>-	u32 mon_rng[MAX5970_NUM_SWITCHES];</div><div class='del'>-	u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum max5970_chip_type {</div><div class='del'>-	TYPE_MAX5978 = 1,</div><div class='del'>-	TYPE_MAX5970,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define MAX5970_REG_CURRENT_L(ch)		(0x01 + (ch) * 4)</div><div class='ctx'> #define MAX5970_REG_CURRENT_H(ch)		(0x00 + (ch) * 4)</div><div class='ctx'> #define MAX5970_REG_VOLTAGE_L(ch)		(0x03 + (ch) * 4)</div><div class='head'>diff --git a/include/linux/mfd/max7360.h b/include/linux/mfd/max7360.h<br/>new file mode 100644<br/>index 000000000000..44cf2bf651a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max7360.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max7360.h</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_MFD_MAX7360_H</div><div class='add'>+#define __LINUX_MFD_MAX7360_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX7360_MAX_KEY_ROWS		8</div><div class='add'>+#define MAX7360_MAX_KEY_COLS		8</div><div class='add'>+#define MAX7360_MAX_KEY_NUM		(MAX7360_MAX_KEY_ROWS * MAX7360_MAX_KEY_COLS)</div><div class='add'>+#define MAX7360_ROW_SHIFT		3</div><div class='add'>+</div><div class='add'>+#define MAX7360_MAX_GPIO		8</div><div class='add'>+#define MAX7360_MAX_GPO			6</div><div class='add'>+#define MAX7360_PORT_PWM_COUNT		8</div><div class='add'>+#define MAX7360_PORT_RTR_PIN		(MAX7360_PORT_PWM_COUNT - 1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MAX7360 registers</div><div class='add'>+ */</div><div class='add'>+#define MAX7360_REG_KEYFIFO		0x00</div><div class='add'>+#define MAX7360_REG_CONFIG		0x01</div><div class='add'>+#define MAX7360_REG_DEBOUNCE		0x02</div><div class='add'>+#define MAX7360_REG_INTERRUPT		0x03</div><div class='add'>+#define MAX7360_REG_PORTS		0x04</div><div class='add'>+#define MAX7360_REG_KEYREP		0x05</div><div class='add'>+#define MAX7360_REG_SLEEP		0x06</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MAX7360 GPIO registers</div><div class='add'>+ *</div><div class='add'>+ * All these registers are reset together when writing bit 3 of</div><div class='add'>+ * MAX7360_REG_GPIOCFG.</div><div class='add'>+ */</div><div class='add'>+#define MAX7360_REG_GPIOCFG		0x40</div><div class='add'>+#define MAX7360_REG_GPIOCTRL		0x41</div><div class='add'>+#define MAX7360_REG_GPIODEB		0x42</div><div class='add'>+#define MAX7360_REG_GPIOCURR		0x43</div><div class='add'>+#define MAX7360_REG_GPIOOUTM		0x44</div><div class='add'>+#define MAX7360_REG_PWMCOM		0x45</div><div class='add'>+#define MAX7360_REG_RTRCFG		0x46</div><div class='add'>+#define MAX7360_REG_I2C_TIMEOUT		0x48</div><div class='add'>+#define MAX7360_REG_GPIOIN		0x49</div><div class='add'>+#define MAX7360_REG_RTR_CNT		0x4A</div><div class='add'>+#define MAX7360_REG_PWMBASE		0x50</div><div class='add'>+#define MAX7360_REG_PWMCFGBASE		0x58</div><div class='add'>+</div><div class='add'>+#define MAX7360_REG_GPIO_LAST		0x5F</div><div class='add'>+</div><div class='add'>+#define MAX7360_REG_PWM(x)		(MAX7360_REG_PWMBASE + (x))</div><div class='add'>+#define MAX7360_REG_PWMCFG(x)		(MAX7360_REG_PWMCFGBASE + (x))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configuration register bits</div><div class='add'>+ */</div><div class='add'>+#define MAX7360_FIFO_EMPTY		0x3F</div><div class='add'>+#define MAX7360_FIFO_OVERFLOW		0x7F</div><div class='add'>+#define MAX7360_FIFO_RELEASE		BIT(6)</div><div class='add'>+#define MAX7360_FIFO_COL		GENMASK(5, 3)</div><div class='add'>+#define MAX7360_FIFO_ROW		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define MAX7360_CFG_SLEEP		BIT(7)</div><div class='add'>+#define MAX7360_CFG_INTERRUPT		BIT(5)</div><div class='add'>+#define MAX7360_CFG_KEY_RELEASE		BIT(3)</div><div class='add'>+#define MAX7360_CFG_WAKEUP		BIT(1)</div><div class='add'>+#define MAX7360_CFG_TIMEOUT		BIT(0)</div><div class='add'>+</div><div class='add'>+#define MAX7360_DEBOUNCE		GENMASK(4, 0)</div><div class='add'>+#define MAX7360_DEBOUNCE_MIN		9</div><div class='add'>+#define MAX7360_DEBOUNCE_MAX		40</div><div class='add'>+#define MAX7360_PORTS			GENMASK(8, 5)</div><div class='add'>+</div><div class='add'>+#define MAX7360_INTERRUPT_TIME_MASK	GENMASK(4, 0)</div><div class='add'>+#define MAX7360_INTERRUPT_FIFO_MASK	GENMASK(7, 5)</div><div class='add'>+</div><div class='add'>+#define MAX7360_PORT_CFG_INTERRUPT_MASK		BIT(7)</div><div class='add'>+#define MAX7360_PORT_CFG_INTERRUPT_EDGES	BIT(6)</div><div class='add'>+#define MAX7360_PORT_CFG_COMMON_PWM		BIT(5)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Autosleep register values</div><div class='add'>+ */</div><div class='add'>+#define MAX7360_AUTOSLEEP_8192MS	0x01</div><div class='add'>+#define MAX7360_AUTOSLEEP_4096MS	0x02</div><div class='add'>+#define MAX7360_AUTOSLEEP_2048MS	0x03</div><div class='add'>+#define MAX7360_AUTOSLEEP_1024MS	0x04</div><div class='add'>+#define MAX7360_AUTOSLEEP_512MS		0x05</div><div class='add'>+#define MAX7360_AUTOSLEEP_256MS		0x06</div><div class='add'>+</div><div class='add'>+#define MAX7360_GPIO_CFG_RTR_EN		BIT(7)</div><div class='add'>+#define MAX7360_GPIO_CFG_GPIO_EN	BIT(4)</div><div class='add'>+#define MAX7360_GPIO_CFG_GPIO_RST	BIT(3)</div><div class='add'>+</div><div class='add'>+#define MAX7360_ROT_DEBOUNCE		GENMASK(3, 0)</div><div class='add'>+#define MAX7360_ROT_DEBOUNCE_MIN	0</div><div class='add'>+#define MAX7360_ROT_DEBOUNCE_MAX	15</div><div class='add'>+#define MAX7360_ROT_INTCNT		GENMASK(6, 4)</div><div class='add'>+#define MAX7360_ROT_INTCNT_DLY		BIT(7)</div><div class='add'>+</div><div class='add'>+#define MAX7360_INT_INTI		0</div><div class='add'>+#define MAX7360_INT_INTK		1</div><div class='add'>+</div><div class='add'>+#define MAX7360_INT_GPIO		0</div><div class='add'>+#define MAX7360_INT_KEYPAD		1</div><div class='add'>+#define MAX7360_INT_ROTARY		2</div><div class='add'>+</div><div class='add'>+#define MAX7360_NR_INTERNAL_IRQS	3</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/mfd/max77686-private.h b/include/linux/mfd/max77686-private.h<br/>index ea635d12a741..e6b8b4014dc0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77686-private.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77686-private.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77686-private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max77686-private.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max77686-private.h - Voltage regulator driver for the Maxim 77686/802</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2012 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2012 Samsung Electronics</div><div class='ctx'>  *  Chiwoong Byun &lt;woong.byun@samsung.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mfd/max77686.h b/include/linux/mfd/max77686.h<br/>index d0fb510875e6..7c4624acd1db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77686.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77686.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77686.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max77686.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max77686.h - Driver for the Maxim 77686/802</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2012 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2012 Samsung Electronics</div><div class='ctx'>  *  Chiwoong Byun &lt;woong.byun@samsung.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This driver is based on max8997.h</div><div class='head'>diff --git a/include/linux/mfd/max77693-common.h b/include/linux/mfd/max77693-common.h<br/>index a5bce099f1ed..ec2e1b2dceb8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77693-common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77693-common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77693-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max77693-common.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0+ */</div><div class='ctx'> /*</div><div class='del'>- * Common data shared between Maxim 77693 and 77843 drivers</div><div class='add'>+ * Common data shared between Maxim 77693, 77705 and 77843 drivers</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2015 Samsung Electronics</div><div class='ctx'>  */</div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> enum max77693_types {</div><div class='ctx'> 	TYPE_MAX77693_UNKNOWN,</div><div class='ctx'> 	TYPE_MAX77693,</div><div class='add'>+	TYPE_MAX77705,</div><div class='ctx'> 	TYPE_MAX77843,</div><div class='ctx'> </div><div class='ctx'> 	TYPE_MAX77693_NUM,</div><div class='hunk'>@@ -32,6 +33,7 @@ struct max77693_dev {</div><div class='ctx'> 	struct regmap *regmap_muic;</div><div class='ctx'> 	struct regmap *regmap_haptic;	/* Only MAX77693 */</div><div class='ctx'> 	struct regmap *regmap_chg;	/* Only MAX77843 */</div><div class='add'>+	struct regmap *regmap_leds;	/* Only MAX77705 */</div><div class='ctx'> </div><div class='ctx'> 	struct regmap_irq_chip_data *irq_data_led;</div><div class='ctx'> 	struct regmap_irq_chip_data *irq_data_topsys;</div><div class='head'>diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h<br/>index 54444ff2a5de..8e7c35b5ea1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77693-private.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77693-private.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77693-private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max77693-private.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max77693-private.h - Voltage regulator driver for the Maxim 77693</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2012 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2012 Samsung Electronics</div><div class='ctx'>  *  SangYoung Son &lt;hello.son@samsung.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is not provided / owned by Maxim Integrated Products.</div><div class='hunk'>@@ -217,6 +217,10 @@ enum max77693_charger_battery_state {</div><div class='ctx'> #define CHG_CNFG_01_CHGRSTRT_MASK	(0x3 &lt;&lt; CHG_CNFG_01_CHGRSTRT_SHIFT)</div><div class='ctx'> #define CHG_CNFG_01_PQEN_MAKS		BIT(CHG_CNFG_01_PQEN_SHIFT)</div><div class='ctx'> </div><div class='add'>+/* MAX77693_CHG_REG_CHG_CNFG_02 register */</div><div class='add'>+#define CHG_CNFG_02_CC_SHIFT		0</div><div class='add'>+#define CHG_CNFG_02_CC_MASK		0x3F</div><div class='add'>+</div><div class='ctx'> /* MAX77693_CHG_REG_CHG_CNFG_03 register */</div><div class='ctx'> #define CHG_CNFG_03_TOITH_SHIFT		0</div><div class='ctx'> #define CHG_CNFG_03_TOTIME_SHIFT	3</div><div class='hunk'>@@ -244,6 +248,7 @@ enum max77693_charger_battery_state {</div><div class='ctx'> #define CHG_CNFG_12_VCHGINREG_MASK	(0x3 &lt;&lt; CHG_CNFG_12_VCHGINREG_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* MAX77693 CHG_CNFG_09 Register */</div><div class='add'>+#define CHG_CNFG_09_CHGIN_ILIM_SHIFT	0</div><div class='ctx'> #define CHG_CNFG_09_CHGIN_ILIM_MASK	0x7F</div><div class='ctx'> </div><div class='ctx'> /* MAX77693 CHG_CTRL Register */</div><div class='hunk'>@@ -414,17 +419,6 @@ enum max77693_haptic_reg {</div><div class='ctx'> #define MAX77693_CONFIG2_MEN            6</div><div class='ctx'> #define MAX77693_CONFIG2_HTYP           5</div><div class='ctx'> </div><div class='del'>-enum max77693_irq_source {</div><div class='del'>-	LED_INT = 0,</div><div class='del'>-	TOPSYS_INT,</div><div class='del'>-	CHG_INT,</div><div class='del'>-	MUIC_INT1,</div><div class='del'>-	MUIC_INT2,</div><div class='del'>-	MUIC_INT3,</div><div class='del'>-</div><div class='del'>-	MAX77693_IRQ_GROUP_NR,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define SRC_IRQ_CHARGER			BIT(0)</div><div class='ctx'> #define SRC_IRQ_TOP			BIT(1)</div><div class='ctx'> #define SRC_IRQ_FLASH			BIT(2)</div><div class='head'>diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h<br/>index c67c16ba8649..8e77ebeb7cf1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77693.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max77693.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77693.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max77693.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max77693.h - Driver for the Maxim 77693</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2012 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2012 Samsung Electronics</div><div class='ctx'>  *  SangYoung Son &lt;hello.son@samsung.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is not provided / owned by Maxim Integrated Products.</div><div class='head'>diff --git a/include/linux/mfd/max77705-private.h b/include/linux/mfd/max77705-private.h<br/>new file mode 100644<br/>index 000000000000..214de7feeb8c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77705-private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max77705-private.h</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Maxim MAX77705 definitions.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015 Samsung Electronics, Inc.</div><div class='add'>+ * Copyright (C) 2025 Dzmitry Sankouski &lt;dsankouski@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_MFD_MAX77705_PRIV_H</div><div class='add'>+#define __LINUX_MFD_MAX77705_PRIV_H</div><div class='add'>+</div><div class='add'>+#define MAX77705_SRC_IRQ_CHG	BIT(0)</div><div class='add'>+#define MAX77705_SRC_IRQ_TOP	BIT(1)</div><div class='add'>+#define MAX77705_SRC_IRQ_FG	BIT(2)</div><div class='add'>+#define MAX77705_SRC_IRQ_USBC	BIT(3)</div><div class='add'>+#define MAX77705_SRC_IRQ_ALL	(MAX77705_SRC_IRQ_CHG | MAX77705_SRC_IRQ_TOP | \</div><div class='add'>+				MAX77705_SRC_IRQ_FG | MAX77705_SRC_IRQ_USBC)</div><div class='add'>+</div><div class='add'>+/* MAX77705_PMIC_REG_PMICREV register */</div><div class='add'>+#define MAX77705_VERSION_SHIFT	3</div><div class='add'>+#define MAX77705_REVISION_MASK	GENMASK(2, 0)</div><div class='add'>+#define MAX77705_VERSION_MASK	GENMASK(7, MAX77705_VERSION_SHIFT)</div><div class='add'>+/* MAX77705_PMIC_REG_MAINCTRL1 register */</div><div class='add'>+#define MAX77705_MAINCTRL1_BIASEN_SHIFT	7</div><div class='add'>+#define MAX77705_MAINCTRL1_BIASEN_MASK	BIT(MAX77705_MAINCTRL1_BIASEN_SHIFT)</div><div class='add'>+/* MAX77705_PMIC_REG_MCONFIG2 (haptics) register */</div><div class='add'>+#define MAX77705_CONFIG2_MEN_SHIFT	6</div><div class='add'>+#define MAX77705_CONFIG2_MODE_SHIFT	7</div><div class='add'>+#define MAX77705_CONFIG2_HTYP_SHIFT	5</div><div class='add'>+/* MAX77705_PMIC_REG_SYSTEM_INT_MASK register */</div><div class='add'>+#define MAX77705_SYSTEM_IRQ_BSTEN_INT	BIT(3)</div><div class='add'>+#define MAX77705_SYSTEM_IRQ_SYSUVLO_INT	BIT(4)</div><div class='add'>+#define MAX77705_SYSTEM_IRQ_SYSOVLO_INT	BIT(5)</div><div class='add'>+#define MAX77705_SYSTEM_IRQ_TSHDN_INT	BIT(6)</div><div class='add'>+#define MAX77705_SYSTEM_IRQ_TM_INT	BIT(7)</div><div class='add'>+/* MAX77705_RGBLED_REG_LEDEN register */</div><div class='add'>+#define MAX77705_RGBLED_EN_WIDTH	2</div><div class='add'>+/* MAX77705_RGBLED_REG_LEDBLNK register */</div><div class='add'>+#define MAX77705_RGB_DELAY_100_STEP_LIM 500</div><div class='add'>+#define MAX77705_RGB_DELAY_100_STEP_COUNT 4</div><div class='add'>+#define MAX77705_RGB_DELAY_100_STEP 100</div><div class='add'>+#define MAX77705_RGB_DELAY_250_STEP_LIM 3250</div><div class='add'>+#define MAX77705_RGB_DELAY_250_STEP 250</div><div class='add'>+#define MAX77705_RGB_DELAY_500_STEP 500</div><div class='add'>+#define MAX77705_RGB_DELAY_500_STEP_COUNT 10</div><div class='add'>+#define MAX77705_RGB_DELAY_500_STEP_LIM 5000</div><div class='add'>+#define MAX77705_RGB_DELAY_1000_STEP_LIM 8000</div><div class='add'>+#define MAX77705_RGB_DELAY_1000_STEP_COUNT 13</div><div class='add'>+#define MAX77705_RGB_DELAY_1000_STEP 1000</div><div class='add'>+#define MAX77705_RGB_DELAY_2000_STEP 2000</div><div class='add'>+#define MAX77705_RGB_DELAY_2000_STEP_COUNT 13</div><div class='add'>+#define MAX77705_RGB_DELAY_2000_STEP_LIM 12000</div><div class='add'>+</div><div class='add'>+enum max77705_hw_rev {</div><div class='add'>+	MAX77705_PASS1 = 1,</div><div class='add'>+	MAX77705_PASS2,</div><div class='add'>+	MAX77705_PASS3</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum max77705_reg {</div><div class='add'>+	MAX77705_PMIC_REG_PMICID1		= 0x00,</div><div class='add'>+	MAX77705_PMIC_REG_PMICREV		= 0x01,</div><div class='add'>+	MAX77705_PMIC_REG_MAINCTRL1		= 0x02,</div><div class='add'>+	MAX77705_PMIC_REG_BSTOUT_MASK		= 0x03,</div><div class='add'>+	MAX77705_PMIC_REG_FORCE_EN_MASK		= 0x08,</div><div class='add'>+	MAX77705_PMIC_REG_MCONFIG		= 0x10,</div><div class='add'>+	MAX77705_PMIC_REG_MCONFIG2		= 0x11,</div><div class='add'>+	MAX77705_PMIC_REG_INTSRC		= 0x22,</div><div class='add'>+	MAX77705_PMIC_REG_INTSRC_MASK		= 0x23,</div><div class='add'>+	MAX77705_PMIC_REG_SYSTEM_INT		= 0x24,</div><div class='add'>+	MAX77705_PMIC_REG_RESERVED_25		= 0x25,</div><div class='add'>+	MAX77705_PMIC_REG_SYSTEM_INT_MASK	= 0x26,</div><div class='add'>+	MAX77705_PMIC_REG_RESERVED_27		= 0x27,</div><div class='add'>+	MAX77705_PMIC_REG_RESERVED_28		= 0x28,</div><div class='add'>+	MAX77705_PMIC_REG_RESERVED_29		= 0x29,</div><div class='add'>+	MAX77705_PMIC_REG_BOOSTCONTROL1		= 0x4C,</div><div class='add'>+	MAX77705_PMIC_REG_BOOSTCONTROL2		= 0x4F,</div><div class='add'>+	MAX77705_PMIC_REG_SW_RESET		= 0x50,</div><div class='add'>+	MAX77705_PMIC_REG_USBC_RESET		= 0x51,</div><div class='add'>+</div><div class='add'>+	MAX77705_PMIC_REG_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum max77705_chg_reg {</div><div class='add'>+	MAX77705_CHG_REG_BASE			= 0xB0,</div><div class='add'>+	MAX77705_CHG_REG_INT			= 0,</div><div class='add'>+	MAX77705_CHG_REG_INT_MASK,</div><div class='add'>+	MAX77705_CHG_REG_INT_OK,</div><div class='add'>+	MAX77705_CHG_REG_DETAILS_00,</div><div class='add'>+	MAX77705_CHG_REG_DETAILS_01,</div><div class='add'>+	MAX77705_CHG_REG_DETAILS_02,</div><div class='add'>+	MAX77705_CHG_REG_DTLS_03,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_00,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_01,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_02,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_03,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_04,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_05,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_06,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_07,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_08,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_09,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_10,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_11,</div><div class='add'>+</div><div class='add'>+	MAX77705_CHG_REG_CNFG_12,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_13,</div><div class='add'>+	MAX77705_CHG_REG_CNFG_14,</div><div class='add'>+	MAX77705_CHG_REG_SAFEOUT_CTRL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum max77705_fuelgauge_reg {</div><div class='add'>+	STATUS_REG				= 0x00,</div><div class='add'>+	VALRT_THRESHOLD_REG			= 0x01,</div><div class='add'>+	TALRT_THRESHOLD_REG			= 0x02,</div><div class='add'>+	SALRT_THRESHOLD_REG			= 0x03,</div><div class='add'>+	REMCAP_REP_REG				= 0x05,</div><div class='add'>+	SOCREP_REG				= 0x06,</div><div class='add'>+	TEMPERATURE_REG				= 0x08,</div><div class='add'>+	VCELL_REG				= 0x09,</div><div class='add'>+	TIME_TO_EMPTY_REG			= 0x11,</div><div class='add'>+	FULLSOCTHR_REG				= 0x13,</div><div class='add'>+	CURRENT_REG				= 0x0A,</div><div class='add'>+	AVG_CURRENT_REG				= 0x0B,</div><div class='add'>+	SOCMIX_REG				= 0x0D,</div><div class='add'>+	SOCAV_REG				= 0x0E,</div><div class='add'>+	REMCAP_MIX_REG				= 0x0F,</div><div class='add'>+	FULLCAP_REG				= 0x10,</div><div class='add'>+	RFAST_REG				= 0x15,</div><div class='add'>+	AVR_TEMPERATURE_REG			= 0x16,</div><div class='add'>+	CYCLES_REG				= 0x17,</div><div class='add'>+	DESIGNCAP_REG				= 0x18,</div><div class='add'>+	AVR_VCELL_REG				= 0x19,</div><div class='add'>+	TIME_TO_FULL_REG			= 0x20,</div><div class='add'>+	CONFIG_REG				= 0x1D,</div><div class='add'>+	ICHGTERM_REG				= 0x1E,</div><div class='add'>+	REMCAP_AV_REG				= 0x1F,</div><div class='add'>+	FULLCAP_NOM_REG				= 0x23,</div><div class='add'>+	LEARN_CFG_REG				= 0x28,</div><div class='add'>+	FILTER_CFG_REG				= 0x29,</div><div class='add'>+	MISCCFG_REG				= 0x2B,</div><div class='add'>+	QRTABLE20_REG				= 0x32,</div><div class='add'>+	FULLCAP_REP_REG				= 0x35,</div><div class='add'>+	RCOMP_REG				= 0x38,</div><div class='add'>+	VEMPTY_REG				= 0x3A,</div><div class='add'>+	FSTAT_REG				= 0x3D,</div><div class='add'>+	DISCHARGE_THRESHOLD_REG			= 0x40,</div><div class='add'>+	QRTABLE30_REG				= 0x42,</div><div class='add'>+	ISYS_REG				= 0x43,</div><div class='add'>+	DQACC_REG				= 0x45,</div><div class='add'>+	DPACC_REG				= 0x46,</div><div class='add'>+	AVGISYS_REG				= 0x4B,</div><div class='add'>+	QH_REG					= 0x4D,</div><div class='add'>+	VSYS_REG				= 0xB1,</div><div class='add'>+	TALRTTH2_REG				= 0xB2,</div><div class='add'>+	VBYP_REG				= 0xB3,</div><div class='add'>+	CONFIG2_REG				= 0xBB,</div><div class='add'>+	IIN_REG					= 0xD0,</div><div class='add'>+	OCV_REG					= 0xEE,</div><div class='add'>+	VFOCV_REG				= 0xFB,</div><div class='add'>+	VFSOC_REG				= 0xFF,</div><div class='add'>+</div><div class='add'>+	MAX77705_FG_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum max77705_led_reg {</div><div class='add'>+	MAX77705_RGBLED_REG_BASE		= 0x30,</div><div class='add'>+	MAX77705_RGBLED_REG_LEDEN		= 0,</div><div class='add'>+	MAX77705_RGBLED_REG_LED0BRT,</div><div class='add'>+	MAX77705_RGBLED_REG_LED1BRT,</div><div class='add'>+	MAX77705_RGBLED_REG_LED2BRT,</div><div class='add'>+	MAX77705_RGBLED_REG_LED3BRT,</div><div class='add'>+	MAX77705_RGBLED_REG_LEDRMP,</div><div class='add'>+	MAX77705_RGBLED_REG_LEDBLNK,</div><div class='add'>+	MAX77705_LED_REG_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum max77705_charger_battery_state {</div><div class='add'>+	MAX77705_BATTERY_NOBAT,</div><div class='add'>+	MAX77705_BATTERY_PREQUALIFICATION,</div><div class='add'>+	MAX77705_BATTERY_DEAD,</div><div class='add'>+	MAX77705_BATTERY_GOOD,</div><div class='add'>+	MAX77705_BATTERY_LOWVOLTAGE,</div><div class='add'>+	MAX77705_BATTERY_OVERVOLTAGE,</div><div class='add'>+	MAX77705_BATTERY_RESERVED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum max77705_charger_charge_type {</div><div class='add'>+	MAX77705_CHARGER_CONSTANT_CURRENT	= 1,</div><div class='add'>+	MAX77705_CHARGER_CONSTANT_VOLTAGE,</div><div class='add'>+	MAX77705_CHARGER_END_OF_CHARGE,</div><div class='add'>+	MAX77705_CHARGER_DONE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_MFD_MAX77705_PRIV_H */</div><div class='head'>diff --git a/include/linux/mfd/max77759.h b/include/linux/mfd/max77759.h<br/>new file mode 100644<br/>index 000000000000..c6face34e385<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max77759.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max77759.h</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2020 Google Inc.</div><div class='add'>+ * Copyright 2025 Linaro Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Maxim MAX77759 core driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_MFD_MAX77759_H</div><div class='add'>+#define __LINUX_MFD_MAX77759_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX77759_PMIC_REG_PMIC_ID               0x00</div><div class='add'>+#define MAX77759_PMIC_REG_PMIC_REVISION         0x01</div><div class='add'>+#define MAX77759_PMIC_REG_OTP_REVISION          0x02</div><div class='add'>+#define MAX77759_PMIC_REG_INTSRC                0x22</div><div class='add'>+#define MAX77759_PMIC_REG_INTSRCMASK            0x23</div><div class='add'>+#define   MAX77759_PMIC_REG_INTSRC_MAXQ         BIT(3)</div><div class='add'>+#define   MAX77759_PMIC_REG_INTSRC_TOPSYS       BIT(1)</div><div class='add'>+#define   MAX77759_PMIC_REG_INTSRC_CHGR         BIT(0)</div><div class='add'>+#define MAX77759_PMIC_REG_TOPSYS_INT            0x24</div><div class='add'>+#define MAX77759_PMIC_REG_TOPSYS_INT_MASK       0x26</div><div class='add'>+#define   MAX77759_PMIC_REG_TOPSYS_INT_TSHDN    BIT(6)</div><div class='add'>+#define   MAX77759_PMIC_REG_TOPSYS_INT_SYSOVLO  BIT(5)</div><div class='add'>+#define   MAX77759_PMIC_REG_TOPSYS_INT_SYSUVLO  BIT(4)</div><div class='add'>+#define   MAX77759_PMIC_REG_TOPSYS_INT_FSHIP    BIT(0)</div><div class='add'>+#define MAX77759_PMIC_REG_I2C_CNFG              0x40</div><div class='add'>+#define MAX77759_PMIC_REG_SWRESET               0x50</div><div class='add'>+#define MAX77759_PMIC_REG_CONTROL_FG            0x51</div><div class='add'>+</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_INT1              0x64</div><div class='add'>+#define   MAX77759_MAXQ_REG_UIC_INT1_APCMDRESI  BIT(7)</div><div class='add'>+#define   MAX77759_MAXQ_REG_UIC_INT1_SYSMSGI    BIT(6)</div><div class='add'>+#define   MAX77759_MAXQ_REG_UIC_INT1_GPIO6I     BIT(1)</div><div class='add'>+#define   MAX77759_MAXQ_REG_UIC_INT1_GPIO5I     BIT(0)</div><div class='add'>+#define   MAX77759_MAXQ_REG_UIC_INT1_GPIOxI(offs, en)  (((en) &amp; 1) &lt;&lt; (offs))</div><div class='add'>+#define   MAX77759_MAXQ_REG_UIC_INT1_GPIOxI_MASK(offs) \</div><div class='add'>+				MAX77759_MAXQ_REG_UIC_INT1_GPIOxI(offs, ~0)</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_INT2              0x65</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_INT3              0x66</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_INT4              0x67</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_UIC_STATUS1       0x68</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_UIC_STATUS2       0x69</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_UIC_STATUS3       0x6a</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_UIC_STATUS4       0x6b</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_UIC_STATUS5       0x6c</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_UIC_STATUS6       0x6d</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_UIC_STATUS7       0x6f</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_UIC_STATUS8       0x6f</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_INT1_M            0x70</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_INT2_M            0x71</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_INT3_M            0x72</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_INT4_M            0x73</div><div class='add'>+#define MAX77759_MAXQ_REG_AP_DATAOUT0           0x81</div><div class='add'>+#define MAX77759_MAXQ_REG_AP_DATAOUT32          0xa1</div><div class='add'>+#define MAX77759_MAXQ_REG_AP_DATAIN0            0xb1</div><div class='add'>+#define MAX77759_MAXQ_REG_UIC_SWRST             0xe0</div><div class='add'>+</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_INT               0xb0</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_INT2              0xb1</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_INT_MASK          0xb2</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_INT2_MASK         0xb3</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_INT_OK            0xb4</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_DETAILS_00        0xb5</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_DETAILS_01        0xb6</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_DETAILS_02        0xb7</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_DETAILS_03        0xb8</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_00           0xb9</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_01           0xba</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_02           0xbb</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_03           0xbc</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_04           0xbd</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_05           0xbe</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_06           0xbf</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_07           0xc0</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_08           0xc1</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_09           0xc2</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_10           0xc3</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_11           0xc4</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_12           0xc5</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_13           0xc6</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_14           0xc7</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_15           0xc8</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_16           0xc9</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_17           0xca</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_18           0xcb</div><div class='add'>+#define MAX77759_CHGR_REG_CHG_CNFG_19           0xcc</div><div class='add'>+</div><div class='add'>+/* MaxQ opcodes for max77759_maxq_command() */</div><div class='add'>+#define MAX77759_MAXQ_OPCODE_MAXLENGTH (MAX77759_MAXQ_REG_AP_DATAOUT32 - \</div><div class='add'>+					MAX77759_MAXQ_REG_AP_DATAOUT0 + \</div><div class='add'>+					1)</div><div class='add'>+</div><div class='add'>+#define MAX77759_MAXQ_OPCODE_GPIO_TRIGGER_READ   0x21</div><div class='add'>+#define MAX77759_MAXQ_OPCODE_GPIO_TRIGGER_WRITE  0x22</div><div class='add'>+#define MAX77759_MAXQ_OPCODE_GPIO_CONTROL_READ   0x23</div><div class='add'>+#define MAX77759_MAXQ_OPCODE_GPIO_CONTROL_WRITE  0x24</div><div class='add'>+#define MAX77759_MAXQ_OPCODE_USER_SPACE_READ     0x81</div><div class='add'>+#define MAX77759_MAXQ_OPCODE_USER_SPACE_WRITE    0x82</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct max77759 - core max77759 internal data structure</div><div class='add'>+ *</div><div class='add'>+ * @regmap_top: Regmap for accessing TOP registers</div><div class='add'>+ * @maxq_lock: Lock for serializing access to MaxQ</div><div class='add'>+ * @regmap_maxq: Regmap for accessing MaxQ registers</div><div class='add'>+ * @cmd_done: Used to signal completion of a MaxQ command</div><div class='add'>+ * @regmap_charger: Regmap for accessing charger registers</div><div class='add'>+ *</div><div class='add'>+ * The MAX77759 comprises several sub-blocks, namely TOP, MaxQ, Charger,</div><div class='add'>+ * Fuel Gauge, and TCPCI.</div><div class='add'>+ */</div><div class='add'>+struct max77759 {</div><div class='add'>+	struct regmap *regmap_top;</div><div class='add'>+</div><div class='add'>+	/* This protects MaxQ commands - only one can be active */</div><div class='add'>+	struct mutex maxq_lock;</div><div class='add'>+	struct regmap *regmap_maxq;</div><div class='add'>+	struct completion cmd_done;</div><div class='add'>+</div><div class='add'>+	struct regmap *regmap_charger;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct max77759_maxq_command - structure containing the MaxQ command to</div><div class='add'>+ * send</div><div class='add'>+ *</div><div class='add'>+ * @length: The number of bytes to send.</div><div class='add'>+ * @cmd: The data to send.</div><div class='add'>+ */</div><div class='add'>+struct max77759_maxq_command {</div><div class='add'>+	u8 length;</div><div class='add'>+	u8 cmd[] __counted_by(length);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct max77759_maxq_response - structure containing the MaxQ response</div><div class='add'>+ *</div><div class='add'>+ * @length: The number of bytes to receive.</div><div class='add'>+ * @rsp: The data received. Must have at least @length bytes space.</div><div class='add'>+ */</div><div class='add'>+struct max77759_maxq_response {</div><div class='add'>+	u8 length;</div><div class='add'>+	u8 rsp[] __counted_by(length);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * max77759_maxq_command() - issue a MaxQ command and wait for the response</div><div class='add'>+ * and associated data</div><div class='add'>+ *</div><div class='add'>+ * @max77759: The core max77759 device handle.</div><div class='add'>+ * @cmd: The command to be sent.</div><div class='add'>+ * @rsp: Any response data associated with the command will be copied here;</div><div class='add'>+ *     can be %NULL if the command has no response (other than ACK).</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative error number otherwise.</div><div class='add'>+ */</div><div class='add'>+int max77759_maxq_command(struct max77759 *max77759,</div><div class='add'>+			  const struct max77759_maxq_command *cmd,</div><div class='add'>+			  struct max77759_maxq_response *rsp);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_MFD_MAX77759_H */</div><div class='head'>diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h<br/>index a10cd6945232..261c0aae7d00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max8997-private.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max8997-private.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max8997-private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max8997-private.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max8997-private.h - Voltage regulator driver for the Maxim 8997</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2010 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2010 Samsung Electronics</div><div class='ctx'>  *  MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +397,6 @@ enum max8997_types {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int max8997_irq_init(struct max8997_dev *max8997);</div><div class='del'>-extern void max8997_irq_exit(struct max8997_dev *max8997);</div><div class='ctx'> extern int max8997_irq_resume(struct max8997_dev *max8997);</div><div class='ctx'> </div><div class='ctx'> extern int max8997_read_reg(struct i2c_client *i2c, u8 reg, u8 *dest);</div><div class='head'>diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h<br/>index 5c2cc1103437..fb36e1386069 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max8997.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max8997.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max8997.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max8997.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max8997.h - Driver for the Maxim 8997/8966</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2009-2010 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2009-2010 Samsung Electronics</div><div class='ctx'>  *  MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This driver is based on max8998.h</div><div class='head'>diff --git a/include/linux/mfd/max8998-private.h b/include/linux/mfd/max8998-private.h<br/>index 6deb5f577602..d77dc18db6eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max8998-private.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max8998-private.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max8998-private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max8998-private.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max8998-private.h - Voltage regulator driver for the Maxim 8998</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2009-2010 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2009-2010 Samsung Electronics</div><div class='ctx'>  *  Kyungmin Park &lt;kyungmin.park@samsung.com&gt;</div><div class='ctx'>  *  Marek Szyprowski &lt;m.szyprowski@samsung.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h<br/>index a054e55c8646..5473f1983e31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max8998.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/max8998.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/max8998.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/max8998.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max8998.h - Voltage regulator driver for the Maxim 8998</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2009-2010 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2009-2010 Samsung Electronics</div><div class='ctx'>  *  Kyungmin Park &lt;kyungmin.park@samsung.com&gt;</div><div class='ctx'>  *  Marek Szyprowski &lt;m.szyprowski@samsung.com&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h<br/>index f372926d5894..dd46fe424a80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/mc13xxx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/mc13xxx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/mc13xxx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/mc13xxx.h</a></div><div class='hunk'>@@ -31,12 +31,6 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx,</div><div class='ctx'> 		unsigned int mode, unsigned int channel,</div><div class='ctx'> 		u8 ato, bool atox, unsigned int *sample);</div><div class='ctx'> </div><div class='del'>-/* Deprecated calls */</div><div class='del'>-static inline int mc13xxx_irq_ack(struct mc13xxx *mc13xxx, int irq)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int mc13xxx_irq_request_nounmask(struct mc13xxx *mc13xxx, int irq,</div><div class='ctx'> 					       irq_handler_t handler,</div><div class='ctx'> 					       const char *name, void *dev)</div><div class='head'>diff --git a/include/linux/mfd/mt6328/core.h b/include/linux/mfd/mt6328/core.h<br/>new file mode 100644<br/>index 000000000000..9a08aed72b9f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/mt6328/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/mt6328/core.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2015 MediaTek Inc.</div><div class='add'>+ * Copyright (c) 2022 Yassine Oudjana &lt;y.oudjana@protonmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MFD_MT6328_CORE_H__</div><div class='add'>+#define __MFD_MT6328_CORE_H__</div><div class='add'>+</div><div class='add'>+enum mt6328_irq_status_numbers {</div><div class='add'>+	MT6328_IRQ_STATUS_PWRKEY = 0,</div><div class='add'>+	MT6328_IRQ_STATUS_HOMEKEY,</div><div class='add'>+	MT6328_IRQ_STATUS_PWRKEY_R,</div><div class='add'>+	MT6328_IRQ_STATUS_HOMEKEY_R,</div><div class='add'>+	MT6328_IRQ_STATUS_THR_H,</div><div class='add'>+	MT6328_IRQ_STATUS_THR_L,</div><div class='add'>+	MT6328_IRQ_STATUS_BAT_H,</div><div class='add'>+	MT6328_IRQ_STATUS_BAT_L,</div><div class='add'>+	MT6328_IRQ_STATUS_RTC,</div><div class='add'>+	MT6328_IRQ_STATUS_AUDIO,</div><div class='add'>+	MT6328_IRQ_STATUS_ACCDET,</div><div class='add'>+	MT6328_IRQ_STATUS_ACCDET_EINT,</div><div class='add'>+	MT6328_IRQ_STATUS_ACCDET_NEGV,</div><div class='add'>+	MT6328_IRQ_STATUS_NI_LBAT_INT,</div><div class='add'>+	MT6328_IRQ_STATUS_VPROC_OC = 16,</div><div class='add'>+	MT6328_IRQ_STATUS_VSYS_OC,</div><div class='add'>+	MT6328_IRQ_STATUS_VLTE_OC,</div><div class='add'>+	MT6328_IRQ_STATUS_VCORE_OC,</div><div class='add'>+	MT6328_IRQ_STATUS_VPA_OC,</div><div class='add'>+	MT6328_IRQ_STATUS_LDO_OC,</div><div class='add'>+	MT6328_IRQ_STATUS_BAT2_H,</div><div class='add'>+	MT6328_IRQ_STATUS_BAT2_L,</div><div class='add'>+	MT6328_IRQ_STATUS_VISMPS0_H,</div><div class='add'>+	MT6328_IRQ_STATUS_VISMPS0_L,</div><div class='add'>+	MT6328_IRQ_STATUS_AUXADC_IMP,</div><div class='add'>+	MT6328_IRQ_STATUS_OV = 32,</div><div class='add'>+	MT6328_IRQ_STATUS_BVALID_DET,</div><div class='add'>+	MT6328_IRQ_STATUS_VBATON_HV,</div><div class='add'>+	MT6328_IRQ_STATUS_VBATON_UNDET,</div><div class='add'>+	MT6328_IRQ_STATUS_WATCHDOG,</div><div class='add'>+	MT6328_IRQ_STATUS_PCHR_CM_VDEC,</div><div class='add'>+	MT6328_IRQ_STATUS_CHRDET,</div><div class='add'>+	MT6328_IRQ_STATUS_PCHR_CM_VINC,</div><div class='add'>+	MT6328_IRQ_STATUS_FG_BAT_H,</div><div class='add'>+	MT6328_IRQ_STATUS_FG_BAT_L,</div><div class='add'>+	MT6328_IRQ_STATUS_FG_CUR_H,</div><div class='add'>+	MT6328_IRQ_STATUS_FG_CUR_L,</div><div class='add'>+	MT6328_IRQ_STATUS_FG_ZCV,</div><div class='add'>+	MT6328_IRQ_STATUS_SPKL_D,</div><div class='add'>+	MT6328_IRQ_STATUS_SPKL_AB,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __MFD_MT6323_CORE_H__ */</div><div class='head'>diff --git a/include/linux/mfd/mt6328/registers.h b/include/linux/mfd/mt6328/registers.h<br/>new file mode 100644<br/>index 000000000000..8199aaea27b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/mt6328/registers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/mt6328/registers.h</a></div><div class='hunk'>@@ -0,0 +1,822 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Yassine Oudjana &lt;y.oudjana@protonmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MFD_MT6328_REGISTERS_H__</div><div class='add'>+#define __MFD_MT6328_REGISTERS_H__</div><div class='add'>+</div><div class='add'>+/* PMIC Registers */</div><div class='add'>+#define MT6328_STRUP_CON0            0x0000</div><div class='add'>+#define MT6328_STRUP_CON2            0x0002</div><div class='add'>+#define MT6328_STRUP_CON3            0x0004</div><div class='add'>+#define MT6328_STRUP_CON4            0x0006</div><div class='add'>+#define MT6328_STRUP_CON5            0x0008</div><div class='add'>+#define MT6328_STRUP_CON6            0x000a</div><div class='add'>+#define MT6328_STRUP_CON7            0x000c</div><div class='add'>+#define MT6328_STRUP_CON8            0x000e</div><div class='add'>+#define MT6328_STRUP_CON9            0x0010</div><div class='add'>+#define MT6328_STRUP_CON10           0x0012</div><div class='add'>+#define MT6328_STRUP_CON11           0x0014</div><div class='add'>+#define MT6328_STRUP_CON12           0x0016</div><div class='add'>+#define MT6328_STRUP_CON13           0x0018</div><div class='add'>+#define MT6328_STRUP_CON14           0x001a</div><div class='add'>+#define MT6328_STRUP_CON15           0x001c</div><div class='add'>+#define MT6328_STRUP_CON16           0x001e</div><div class='add'>+#define MT6328_STRUP_CON17           0x0020</div><div class='add'>+#define MT6328_STRUP_CON18           0x0022</div><div class='add'>+#define MT6328_STRUP_CON19           0x0024</div><div class='add'>+#define MT6328_STRUP_CON20           0x0026</div><div class='add'>+#define MT6328_STRUP_CON21           0x0028</div><div class='add'>+#define MT6328_STRUP_CON22           0x002a</div><div class='add'>+#define MT6328_STRUP_CON23           0x002c</div><div class='add'>+#define MT6328_STRUP_CON24           0x002e</div><div class='add'>+#define MT6328_STRUP_CON25           0x0030</div><div class='add'>+#define MT6328_STRUP_CON26           0x0032</div><div class='add'>+#define MT6328_STRUP_CON27           0x0034</div><div class='add'>+#define MT6328_STRUP_CON28           0x0036</div><div class='add'>+#define MT6328_STRUP_CON29           0x0038</div><div class='add'>+#define MT6328_STRUP_CON30           0x003a</div><div class='add'>+#define MT6328_STRUP_CON31           0x003c</div><div class='add'>+#define MT6328_STRUP_CON32           0x003e</div><div class='add'>+#define MT6328_STRUP_ANA_CON0        0x0040</div><div class='add'>+#define MT6328_HWCID                 0x0200</div><div class='add'>+#define MT6328_SWCID                 0x0202</div><div class='add'>+#define MT6328_TOP_CON               0x0204</div><div class='add'>+#define MT6328_TEST_OUT              0x0206</div><div class='add'>+#define MT6328_TEST_CON0             0x0208</div><div class='add'>+#define MT6328_TEST_CON1             0x020a</div><div class='add'>+#define MT6328_TESTMODE_SW           0x020c</div><div class='add'>+#define MT6328_EN_STATUS0            0x020e</div><div class='add'>+#define MT6328_EN_STATUS1            0x0210</div><div class='add'>+#define MT6328_EN_STATUS2            0x0212</div><div class='add'>+#define MT6328_OCSTATUS0             0x0214</div><div class='add'>+#define MT6328_OCSTATUS1             0x0216</div><div class='add'>+#define MT6328_OCSTATUS2             0x0218</div><div class='add'>+#define MT6328_PGDEBSTATUS           0x021a</div><div class='add'>+#define MT6328_PGSTATUS              0x021c</div><div class='add'>+#define MT6328_THERMALSTATUS         0x021e</div><div class='add'>+#define MT6328_TOPSTATUS             0x0220</div><div class='add'>+#define MT6328_TDSEL_CON             0x0222</div><div class='add'>+#define MT6328_RDSEL_CON             0x0224</div><div class='add'>+#define MT6328_SMT_CON0              0x0226</div><div class='add'>+#define MT6328_SMT_CON1              0x0228</div><div class='add'>+#define MT6328_SMT_CON2              0x022a</div><div class='add'>+#define MT6328_DRV_CON0              0x022c</div><div class='add'>+#define MT6328_DRV_CON1              0x022e</div><div class='add'>+#define MT6328_DRV_CON2              0x0230</div><div class='add'>+#define MT6328_DRV_CON3              0x0232</div><div class='add'>+#define MT6328_TOP_STATUS            0x0234</div><div class='add'>+#define MT6328_TOP_STATUS_SET        0x0236</div><div class='add'>+#define MT6328_TOP_STATUS_CLR        0x0238</div><div class='add'>+#define MT6328_RGS_ANA_MON           0x023a</div><div class='add'>+#define MT6328_TOP_CKPDN_CON0        0x023c</div><div class='add'>+#define MT6328_TOP_CKPDN_CON0_SET    0x023e</div><div class='add'>+#define MT6328_TOP_CKPDN_CON0_CLR    0x0240</div><div class='add'>+#define MT6328_TOP_CKPDN_CON1        0x0242</div><div class='add'>+#define MT6328_TOP_CKPDN_CON1_SET    0x0244</div><div class='add'>+#define MT6328_TOP_CKPDN_CON1_CLR    0x0246</div><div class='add'>+#define MT6328_TOP_CKPDN_CON2        0x0248</div><div class='add'>+#define MT6328_TOP_CKPDN_CON2_SET    0x024a</div><div class='add'>+#define MT6328_TOP_CKPDN_CON2_CLR    0x024c</div><div class='add'>+#define MT6328_TOP_CKPDN_CON3        0x024e</div><div class='add'>+#define MT6328_TOP_CKPDN_CON3_SET    0x0250</div><div class='add'>+#define MT6328_TOP_CKPDN_CON3_CLR    0x0252</div><div class='add'>+#define MT6328_TOP_CKPDN_CON4        0x0254</div><div class='add'>+#define MT6328_TOP_CKPDN_CON4_SET    0x0256</div><div class='add'>+#define MT6328_TOP_CKPDN_CON4_CLR    0x0258</div><div class='add'>+#define MT6328_TOP_CKSEL_CON0        0x025a</div><div class='add'>+#define MT6328_TOP_CKSEL_CON0_SET    0x025c</div><div class='add'>+#define MT6328_TOP_CKSEL_CON0_CLR    0x025e</div><div class='add'>+#define MT6328_TOP_CKSEL_CON1        0x0260</div><div class='add'>+#define MT6328_TOP_CKSEL_CON1_SET    0x0262</div><div class='add'>+#define MT6328_TOP_CKSEL_CON1_CLR    0x0264</div><div class='add'>+#define MT6328_TOP_CKSEL_CON2        0x0266</div><div class='add'>+#define MT6328_TOP_CKSEL_CON2_SET    0x0268</div><div class='add'>+#define MT6328_TOP_CKSEL_CON2_CLR    0x026a</div><div class='add'>+#define MT6328_TOP_CKDIVSEL_CON0     0x026c</div><div class='add'>+#define MT6328_TOP_CKDIVSEL_CON0_SET 0x026e</div><div class='add'>+#define MT6328_TOP_CKDIVSEL_CON0_CLR 0x0270</div><div class='add'>+#define MT6328_TOP_CKDIVSEL_CON1     0x0272</div><div class='add'>+#define MT6328_TOP_CKDIVSEL_CON1_SET 0x0274</div><div class='add'>+#define MT6328_TOP_CKDIVSEL_CON1_CLR 0x0276</div><div class='add'>+#define MT6328_TOP_CKHWEN_CON0       0x0278</div><div class='add'>+#define MT6328_TOP_CKHWEN_CON0_SET   0x027a</div><div class='add'>+#define MT6328_TOP_CKHWEN_CON0_CLR   0x027c</div><div class='add'>+#define MT6328_TOP_CKHWEN_CON1       0x027e</div><div class='add'>+#define MT6328_TOP_CKHWEN_CON1_SET   0x0280</div><div class='add'>+#define MT6328_TOP_CKHWEN_CON1_CLR   0x0282</div><div class='add'>+#define MT6328_TOP_CKTST_CON0        0x0284</div><div class='add'>+#define MT6328_TOP_CKTST_CON1        0x0286</div><div class='add'>+#define MT6328_TOP_CKTST_CON2        0x0288</div><div class='add'>+#define MT6328_TOP_CLKSQ             0x028a</div><div class='add'>+#define MT6328_TOP_CLKSQ_SET         0x028c</div><div class='add'>+#define MT6328_TOP_CLKSQ_CLR         0x028e</div><div class='add'>+#define MT6328_TOP_CLKSQ_RTC         0x0290</div><div class='add'>+#define MT6328_TOP_CLKSQ_RTC_SET     0x0292</div><div class='add'>+#define MT6328_TOP_CLKSQ_RTC_CLR     0x0294</div><div class='add'>+#define MT6328_TOP_CLK_TRIM          0x0296</div><div class='add'>+#define MT6328_TOP_RST_CON0          0x0298</div><div class='add'>+#define MT6328_TOP_RST_CON0_SET      0x029a</div><div class='add'>+#define MT6328_TOP_RST_CON0_CLR      0x029c</div><div class='add'>+#define MT6328_TOP_RST_CON1          0x029e</div><div class='add'>+#define MT6328_TOP_RST_MISC          0x02a0</div><div class='add'>+#define MT6328_TOP_RST_MISC_SET      0x02a2</div><div class='add'>+#define MT6328_TOP_RST_MISC_CLR      0x02a4</div><div class='add'>+#define MT6328_TOP_RST_STATUS        0x02a6</div><div class='add'>+#define MT6328_TOP_RST_STATUS_SET    0x02a8</div><div class='add'>+#define MT6328_TOP_RST_STATUS_CLR    0x02aa</div><div class='add'>+#define MT6328_INT_CON0              0x02ac</div><div class='add'>+#define MT6328_INT_CON0_SET          0x02ae</div><div class='add'>+#define MT6328_INT_CON0_CLR          0x02b0</div><div class='add'>+#define MT6328_INT_CON1              0x02b2</div><div class='add'>+#define MT6328_INT_CON1_SET          0x02b4</div><div class='add'>+#define MT6328_INT_CON1_CLR          0x02b6</div><div class='add'>+#define MT6328_INT_CON2              0x02b8</div><div class='add'>+#define MT6328_INT_CON2_SET          0x02ba</div><div class='add'>+#define MT6328_INT_CON2_CLR          0x02bc</div><div class='add'>+#define MT6328_INT_MISC_CON          0x02be</div><div class='add'>+#define MT6328_INT_MISC_CON_SET      0x02c0</div><div class='add'>+#define MT6328_INT_MISC_CON_CLR      0x02c2</div><div class='add'>+#define MT6328_INT_STATUS0           0x02c4</div><div class='add'>+#define MT6328_INT_STATUS1           0x02c6</div><div class='add'>+#define MT6328_INT_STATUS2           0x02c8</div><div class='add'>+#define MT6328_OC_GEAR_0             0x02ca</div><div class='add'>+#define MT6328_FQMTR_CON0            0x02cc</div><div class='add'>+#define MT6328_FQMTR_CON1            0x02ce</div><div class='add'>+#define MT6328_FQMTR_CON2            0x02d0</div><div class='add'>+#define MT6328_RG_SPI_CON            0x02d2</div><div class='add'>+#define MT6328_DEW_DIO_EN            0x02d4</div><div class='add'>+#define MT6328_DEW_READ_TEST         0x02d6</div><div class='add'>+#define MT6328_DEW_WRITE_TEST        0x02d8</div><div class='add'>+#define MT6328_DEW_CRC_SWRST         0x02da</div><div class='add'>+#define MT6328_DEW_CRC_EN            0x02dc</div><div class='add'>+#define MT6328_DEW_CRC_VAL           0x02de</div><div class='add'>+#define MT6328_DEW_DBG_MON_SEL       0x02e0</div><div class='add'>+#define MT6328_DEW_CIPHER_KEY_SEL    0x02e2</div><div class='add'>+#define MT6328_DEW_CIPHER_IV_SEL     0x02e4</div><div class='add'>+#define MT6328_DEW_CIPHER_EN         0x02e6</div><div class='add'>+#define MT6328_DEW_CIPHER_RDY        0x02e8</div><div class='add'>+#define MT6328_DEW_CIPHER_MODE       0x02ea</div><div class='add'>+#define MT6328_DEW_CIPHER_SWRST      0x02ec</div><div class='add'>+#define MT6328_DEW_RDDMY_NO          0x02ee</div><div class='add'>+#define MT6328_INT_TYPE_CON0         0x02f0</div><div class='add'>+#define MT6328_INT_TYPE_CON0_SET     0x02f2</div><div class='add'>+#define MT6328_INT_TYPE_CON0_CLR     0x02f4</div><div class='add'>+#define MT6328_INT_TYPE_CON1         0x02f6</div><div class='add'>+#define MT6328_INT_TYPE_CON1_SET     0x02f8</div><div class='add'>+#define MT6328_INT_TYPE_CON1_CLR     0x02fa</div><div class='add'>+#define MT6328_INT_TYPE_CON2         0x02fc</div><div class='add'>+#define MT6328_INT_TYPE_CON2_SET     0x02fe</div><div class='add'>+#define MT6328_INT_TYPE_CON2_CLR     0x0300</div><div class='add'>+#define MT6328_INT_STA               0x0302</div><div class='add'>+#define MT6328_BUCK_ALL_CON0         0x0400</div><div class='add'>+#define MT6328_BUCK_ALL_CON1         0x0402</div><div class='add'>+#define MT6328_BUCK_ALL_CON2         0x0404</div><div class='add'>+#define MT6328_BUCK_ALL_CON3         0x0406</div><div class='add'>+#define MT6328_BUCK_ALL_CON4         0x0408</div><div class='add'>+#define MT6328_BUCK_ALL_CON5         0x040a</div><div class='add'>+#define MT6328_BUCK_ALL_CON6         0x040c</div><div class='add'>+#define MT6328_BUCK_ALL_CON9         0x040e</div><div class='add'>+#define MT6328_BUCK_ALL_CON12        0x0410</div><div class='add'>+#define MT6328_BUCK_ALL_CON13        0x0412</div><div class='add'>+#define MT6328_BUCK_ALL_CON14        0x0414</div><div class='add'>+#define MT6328_BUCK_ALL_CON16        0x0416</div><div class='add'>+#define MT6328_BUCK_ALL_CON18        0x0418</div><div class='add'>+#define MT6328_BUCK_ALL_CON19        0x041a</div><div class='add'>+#define MT6328_BUCK_ALL_CON20        0x041c</div><div class='add'>+#define MT6328_BUCK_ALL_CON21        0x041e</div><div class='add'>+#define MT6328_BUCK_ALL_CON22        0x0420</div><div class='add'>+#define MT6328_BUCK_ALL_CON23        0x0422</div><div class='add'>+#define MT6328_BUCK_ALL_CON24        0x0424</div><div class='add'>+#define MT6328_BUCK_ALL_CON25        0x0426</div><div class='add'>+#define MT6328_BUCK_ALL_CON26        0x0428</div><div class='add'>+#define MT6328_BUCK_ALL_CON27        0x042a</div><div class='add'>+#define MT6328_BUCK_ALL_CON28        0x042c</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON0     0x042e</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON1     0x0430</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON2     0x0432</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON3     0x0434</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON4     0x0436</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON5     0x0438</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON6     0x043a</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON7     0x043c</div><div class='add'>+#define MT6328_SMPS_TOP_ANA_CON8     0x043e</div><div class='add'>+#define MT6328_VCORE_ANA_CON0        0x0440</div><div class='add'>+#define MT6328_VCORE_ANA_CON1        0x0442</div><div class='add'>+#define MT6328_VCORE_ANA_CON2        0x0444</div><div class='add'>+#define MT6328_VCORE_ANA_CON3        0x0446</div><div class='add'>+#define MT6328_VCORE_ANA_CON4        0x0448</div><div class='add'>+#define MT6328_VSYS22_ANA_CON0       0x044a</div><div class='add'>+#define MT6328_VSYS22_ANA_CON1       0x044c</div><div class='add'>+#define MT6328_VSYS22_ANA_CON2       0x044e</div><div class='add'>+#define MT6328_VSYS22_ANA_CON3       0x0450</div><div class='add'>+#define MT6328_VSYS22_ANA_CON4       0x0452</div><div class='add'>+#define MT6328_VPROC_ANA_CON0        0x0454</div><div class='add'>+#define MT6328_VPROC_ANA_CON1        0x0456</div><div class='add'>+#define MT6328_VPROC_ANA_CON2        0x0458</div><div class='add'>+#define MT6328_VPROC_ANA_CON3        0x045a</div><div class='add'>+#define MT6328_VPROC_ANA_CON4        0x045c</div><div class='add'>+#define MT6328_OSC32_ANA_CON0        0x045e</div><div class='add'>+#define MT6328_OSC32_ANA_CON1        0x0460</div><div class='add'>+#define MT6328_VPA_ANA_CON0          0x0462</div><div class='add'>+#define MT6328_VPA_ANA_CON1          0x0464</div><div class='add'>+#define MT6328_VPA_ANA_CON2          0x0466</div><div class='add'>+#define MT6328_VPA_ANA_CON3          0x0468</div><div class='add'>+#define MT6328_VLTE_ANA_CON0         0x046a</div><div class='add'>+#define MT6328_VLTE_ANA_CON1         0x046c</div><div class='add'>+#define MT6328_VLTE_ANA_CON2         0x046e</div><div class='add'>+#define MT6328_VLTE_ANA_CON3         0x0470</div><div class='add'>+#define MT6328_VLTE_ANA_CON4         0x0472</div><div class='add'>+#define MT6328_VPROC_CON0            0x0474</div><div class='add'>+#define MT6328_VPROC_CON1            0x0476</div><div class='add'>+#define MT6328_VPROC_CON2            0x0478</div><div class='add'>+#define MT6328_VPROC_CON3            0x047a</div><div class='add'>+#define MT6328_VPROC_CON4            0x047c</div><div class='add'>+#define MT6328_VPROC_CON5            0x047e</div><div class='add'>+#define MT6328_VPROC_CON6            0x0480</div><div class='add'>+#define MT6328_VPROC_CON7            0x0482</div><div class='add'>+#define MT6328_VPROC_CON8            0x0484</div><div class='add'>+#define MT6328_VPROC_CON9            0x0486</div><div class='add'>+#define MT6328_VPROC_CON10           0x0488</div><div class='add'>+#define MT6328_VPROC_CON11           0x048a</div><div class='add'>+#define MT6328_VPROC_CON12           0x048c</div><div class='add'>+#define MT6328_VPROC_CON13           0x048e</div><div class='add'>+#define MT6328_VPROC_CON14           0x0490</div><div class='add'>+#define MT6328_VPROC_CON15           0x0492</div><div class='add'>+#define MT6328_VPROC_CON16           0x0494</div><div class='add'>+#define MT6328_VPROC_CON17           0x0496</div><div class='add'>+#define MT6328_VPROC_CON18           0x0498</div><div class='add'>+#define MT6328_VPROC_CON19           0x049a</div><div class='add'>+#define MT6328_VSRAM_CON0            0x049c</div><div class='add'>+#define MT6328_VSRAM_CON1            0x049e</div><div class='add'>+#define MT6328_VSRAM_CON2            0x04a0</div><div class='add'>+#define MT6328_VSRAM_CON3            0x04a2</div><div class='add'>+#define MT6328_VSRAM_CON4            0x04a4</div><div class='add'>+#define MT6328_VSRAM_CON5            0x04a6</div><div class='add'>+#define MT6328_VSRAM_CON6            0x04a8</div><div class='add'>+#define MT6328_VSRAM_CON7            0x04aa</div><div class='add'>+#define MT6328_VSRAM_CON8            0x04ac</div><div class='add'>+#define MT6328_VSRAM_CON9            0x04ae</div><div class='add'>+#define MT6328_VSRAM_CON10           0x04b0</div><div class='add'>+#define MT6328_VSRAM_CON11           0x04b2</div><div class='add'>+#define MT6328_VSRAM_CON12           0x04b4</div><div class='add'>+#define MT6328_VSRAM_CON13           0x04b6</div><div class='add'>+#define MT6328_VSRAM_CON14           0x04b8</div><div class='add'>+#define MT6328_VSRAM_CON15           0x04ba</div><div class='add'>+#define MT6328_VSRAM_CON16           0x04bc</div><div class='add'>+#define MT6328_VSRAM_CON17           0x04be</div><div class='add'>+#define MT6328_VSRAM_CON18           0x04c0</div><div class='add'>+#define MT6328_VSRAM_CON19           0x04c2</div><div class='add'>+#define MT6328_VLTE_CON0             0x04c4</div><div class='add'>+#define MT6328_VLTE_CON1             0x04c6</div><div class='add'>+#define MT6328_VLTE_CON2             0x04c8</div><div class='add'>+#define MT6328_VLTE_CON3             0x04ca</div><div class='add'>+#define MT6328_VLTE_CON4             0x04cc</div><div class='add'>+#define MT6328_VLTE_CON5             0x04ce</div><div class='add'>+#define MT6328_VLTE_CON6             0x04d0</div><div class='add'>+#define MT6328_VLTE_CON7             0x04d2</div><div class='add'>+#define MT6328_VLTE_CON8             0x04d4</div><div class='add'>+#define MT6328_VLTE_CON9             0x04d6</div><div class='add'>+#define MT6328_VLTE_CON10            0x04d8</div><div class='add'>+#define MT6328_VLTE_CON11            0x04da</div><div class='add'>+#define MT6328_VLTE_CON12            0x04dc</div><div class='add'>+#define MT6328_VLTE_CON13            0x04de</div><div class='add'>+#define MT6328_VLTE_CON14            0x04e0</div><div class='add'>+#define MT6328_VLTE_CON15            0x04e2</div><div class='add'>+#define MT6328_VLTE_CON16            0x04e4</div><div class='add'>+#define MT6328_VLTE_CON17            0x04e6</div><div class='add'>+#define MT6328_VLTE_CON18            0x04e8</div><div class='add'>+#define MT6328_VLTE_CON19            0x04ea</div><div class='add'>+#define MT6328_VCORE1_CON0           0x0600</div><div class='add'>+#define MT6328_VCORE1_CON1           0x0602</div><div class='add'>+#define MT6328_VCORE1_CON2           0x0604</div><div class='add'>+#define MT6328_VCORE1_CON3           0x0606</div><div class='add'>+#define MT6328_VCORE1_CON4           0x0608</div><div class='add'>+#define MT6328_VCORE1_CON5           0x060a</div><div class='add'>+#define MT6328_VCORE1_CON6           0x060c</div><div class='add'>+#define MT6328_VCORE1_CON7           0x060e</div><div class='add'>+#define MT6328_VCORE1_CON8           0x0610</div><div class='add'>+#define MT6328_VCORE1_CON9           0x0612</div><div class='add'>+#define MT6328_VCORE1_CON10          0x0614</div><div class='add'>+#define MT6328_VCORE1_CON11          0x0616</div><div class='add'>+#define MT6328_VCORE1_CON12          0x0618</div><div class='add'>+#define MT6328_VCORE1_CON13          0x061a</div><div class='add'>+#define MT6328_VCORE1_CON14          0x061c</div><div class='add'>+#define MT6328_VCORE1_CON15          0x061e</div><div class='add'>+#define MT6328_VCORE1_CON16          0x0620</div><div class='add'>+#define MT6328_VCORE1_CON17          0x0622</div><div class='add'>+#define MT6328_VCORE1_CON18          0x0624</div><div class='add'>+#define MT6328_VCORE1_CON19          0x0626</div><div class='add'>+#define MT6328_VSYS22_CON0           0x0628</div><div class='add'>+#define MT6328_VSYS22_CON1           0x062a</div><div class='add'>+#define MT6328_VSYS22_CON2           0x062c</div><div class='add'>+#define MT6328_VSYS22_CON3           0x062e</div><div class='add'>+#define MT6328_VSYS22_CON4           0x0630</div><div class='add'>+#define MT6328_VSYS22_CON5           0x0632</div><div class='add'>+#define MT6328_VSYS22_CON6           0x0634</div><div class='add'>+#define MT6328_VSYS22_CON7           0x0636</div><div class='add'>+#define MT6328_VSYS22_CON8           0x0638</div><div class='add'>+#define MT6328_VSYS22_CON9           0x063a</div><div class='add'>+#define MT6328_VSYS22_CON10          0x063c</div><div class='add'>+#define MT6328_VSYS22_CON11          0x063e</div><div class='add'>+#define MT6328_VSYS22_CON12          0x0640</div><div class='add'>+#define MT6328_VSYS22_CON13          0x0642</div><div class='add'>+#define MT6328_VSYS22_CON14          0x0644</div><div class='add'>+#define MT6328_VSYS22_CON15          0x0646</div><div class='add'>+#define MT6328_VSYS22_CON16          0x0648</div><div class='add'>+#define MT6328_VSYS22_CON17          0x064a</div><div class='add'>+#define MT6328_VSYS22_CON18          0x064c</div><div class='add'>+#define MT6328_VSYS22_CON19          0x064e</div><div class='add'>+#define MT6328_VPA_CON0              0x0650</div><div class='add'>+#define MT6328_VPA_CON1              0x0652</div><div class='add'>+#define MT6328_VPA_CON2              0x0654</div><div class='add'>+#define MT6328_VPA_CON3              0x0656</div><div class='add'>+#define MT6328_VPA_CON4              0x0658</div><div class='add'>+#define MT6328_VPA_CON5              0x065a</div><div class='add'>+#define MT6328_VPA_CON6              0x065c</div><div class='add'>+#define MT6328_VPA_CON7              0x065e</div><div class='add'>+#define MT6328_VPA_CON8              0x0660</div><div class='add'>+#define MT6328_VPA_CON9              0x0662</div><div class='add'>+#define MT6328_VPA_CON10             0x0664</div><div class='add'>+#define MT6328_VPA_CON11             0x0666</div><div class='add'>+#define MT6328_VPA_CON12             0x0668</div><div class='add'>+#define MT6328_VPA_CON13             0x066a</div><div class='add'>+#define MT6328_VPA_CON14             0x066c</div><div class='add'>+#define MT6328_VPA_CON15             0x066e</div><div class='add'>+#define MT6328_VPA_CON16             0x0670</div><div class='add'>+#define MT6328_VPA_CON17             0x0672</div><div class='add'>+#define MT6328_VPA_CON18             0x0674</div><div class='add'>+#define MT6328_VPA_CON19             0x0676</div><div class='add'>+#define MT6328_VPA_CON20             0x0678</div><div class='add'>+#define MT6328_VPA_CON21             0x067a</div><div class='add'>+#define MT6328_VPA_CON22             0x067c</div><div class='add'>+#define MT6328_VPA_CON23             0x067e</div><div class='add'>+#define MT6328_VPA_CON24             0x0680</div><div class='add'>+#define MT6328_BUCK_K_CON0           0x0682</div><div class='add'>+#define MT6328_BUCK_K_CON1           0x0684</div><div class='add'>+#define MT6328_BUCK_K_CON2           0x0686</div><div class='add'>+#define MT6328_BUCK_K_CON3           0x0688</div><div class='add'>+#define MT6328_ZCD_CON0              0x0800</div><div class='add'>+#define MT6328_ZCD_CON1              0x0802</div><div class='add'>+#define MT6328_ZCD_CON2              0x0804</div><div class='add'>+#define MT6328_ZCD_CON3              0x0806</div><div class='add'>+#define MT6328_ZCD_CON4              0x0808</div><div class='add'>+#define MT6328_ZCD_CON5              0x080a</div><div class='add'>+#define MT6328_ISINK0_CON0           0x080c</div><div class='add'>+#define MT6328_ISINK0_CON1           0x080e</div><div class='add'>+#define MT6328_ISINK0_CON2           0x0810</div><div class='add'>+#define MT6328_ISINK0_CON3           0x0812</div><div class='add'>+#define MT6328_ISINK1_CON0           0x0814</div><div class='add'>+#define MT6328_ISINK1_CON1           0x0816</div><div class='add'>+#define MT6328_ISINK1_CON2           0x0818</div><div class='add'>+#define MT6328_ISINK1_CON3           0x081a</div><div class='add'>+#define MT6328_ISINK2_CON1           0x081c</div><div class='add'>+#define MT6328_ISINK3_CON1           0x081e</div><div class='add'>+#define MT6328_ISINK_ANA0            0x0820</div><div class='add'>+#define MT6328_ISINK_ANA1            0x0822</div><div class='add'>+#define MT6328_ISINK_PHASE_DLY       0x0824</div><div class='add'>+#define MT6328_ISINK_SFSTR           0x0826</div><div class='add'>+#define MT6328_ISINK_EN_CTRL         0x0828</div><div class='add'>+#define MT6328_ISINK_MODE_CTRL       0x082a</div><div class='add'>+#define MT6328_VTCXO_0_CON0          0x0a00</div><div class='add'>+#define MT6328_VTCXO_1_CON0          0x0a02</div><div class='add'>+#define MT6328_VAUD28_CON0           0x0a04</div><div class='add'>+#define MT6328_VAUX18_CON0           0x0a06</div><div class='add'>+#define MT6328_VRF18_0_CON0          0x0a08</div><div class='add'>+#define MT6328_VRF18_0_CON1          0x0a0a</div><div class='add'>+#define MT6328_VCAMA_CON0            0x0a0c</div><div class='add'>+#define MT6328_VCN28_CON0            0x0a0e</div><div class='add'>+#define MT6328_VCN33_CON0            0x0a10</div><div class='add'>+#define MT6328_VCN33_CON1            0x0a12</div><div class='add'>+#define MT6328_VCN33_CON2            0x0a14</div><div class='add'>+#define MT6328_VRF18_1_CON0          0x0a16</div><div class='add'>+#define MT6328_VRF18_1_CON1          0x0a18</div><div class='add'>+#define MT6328_VUSB33_CON0           0x0a1a</div><div class='add'>+#define MT6328_VMCH_CON0             0x0a1c</div><div class='add'>+#define MT6328_VMCH_CON1             0x0a1e</div><div class='add'>+#define MT6328_VMC_CON0              0x0a20</div><div class='add'>+#define MT6328_VMC_CON1              0x0a22</div><div class='add'>+#define MT6328_VEMC_3V3_CON0         0x0a24</div><div class='add'>+#define MT6328_VEMC_3V3_CON1         0x0a26</div><div class='add'>+#define MT6328_VIO28_CON0            0x0a28</div><div class='add'>+#define MT6328_VCAMAF_CON0           0x0a2a</div><div class='add'>+#define MT6328_VGP1_CON0             0x0a2c</div><div class='add'>+#define MT6328_VGP1_CON1             0x0a2e</div><div class='add'>+#define MT6328_VEFUSE_CON0           0x0a30</div><div class='add'>+#define MT6328_VSIM1_CON0            0x0a32</div><div class='add'>+#define MT6328_VSIM2_CON0            0x0a34</div><div class='add'>+#define MT6328_VIO18_CON0            0x0a36</div><div class='add'>+#define MT6328_VIBR_CON0             0x0a38</div><div class='add'>+#define MT6328_VCN18_CON0            0x0a3a</div><div class='add'>+#define MT6328_VCAM_CON0             0x0a3c</div><div class='add'>+#define MT6328_VCAMIO_CON0           0x0a3e</div><div class='add'>+#define MT6328_LDO_VSRAM_CON0        0x0a40</div><div class='add'>+#define MT6328_LDO_VSRAM_CON1        0x0a42</div><div class='add'>+#define MT6328_VTREF_CON0            0x0a44</div><div class='add'>+#define MT6328_VM_CON0               0x0a46</div><div class='add'>+#define MT6328_VM_CON1               0x0a48</div><div class='add'>+#define MT6328_VRTC_CON0             0x0a4a</div><div class='add'>+#define MT6328_LDO_OCFB0             0x0a4c</div><div class='add'>+#define MT6328_ALDO_ANA_CON0         0x0a4e</div><div class='add'>+#define MT6328_ADLDO_ANA_CON1        0x0a50</div><div class='add'>+#define MT6328_ADLDO_ANA_CON2        0x0a52</div><div class='add'>+#define MT6328_ADLDO_ANA_CON3        0x0a54</div><div class='add'>+#define MT6328_ADLDO_ANA_CON4        0x0a56</div><div class='add'>+#define MT6328_ADLDO_ANA_CON5        0x0a58</div><div class='add'>+#define MT6328_ADLDO_ANA_CON6        0x0a5a</div><div class='add'>+#define MT6328_ADLDO_ANA_CON7        0x0a5c</div><div class='add'>+#define MT6328_ADLDO_ANA_CON8        0x0a5e</div><div class='add'>+#define MT6328_ADLDO_ANA_CON9        0x0a60</div><div class='add'>+#define MT6328_ADLDO_ANA_CON10       0x0a62</div><div class='add'>+#define MT6328_ADLDO_ANA_CON11       0x0a64</div><div class='add'>+#define MT6328_ADLDO_ANA_CON12       0x0a66</div><div class='add'>+#define MT6328_ADLDO_ANA_CON13       0x0a68</div><div class='add'>+#define MT6328_DLDO_ANA_CON0         0x0a6a</div><div class='add'>+#define MT6328_DLDO_ANA_CON1         0x0a6c</div><div class='add'>+#define MT6328_DLDO_ANA_CON2         0x0a6e</div><div class='add'>+#define MT6328_DLDO_ANA_CON3         0x0a70</div><div class='add'>+#define MT6328_DLDO_ANA_CON4         0x0a72</div><div class='add'>+#define MT6328_DLDO_ANA_CON5         0x0a74</div><div class='add'>+#define MT6328_SLDO_ANA_CON0         0x0a76</div><div class='add'>+#define MT6328_SLDO_ANA_CON1         0x0a78</div><div class='add'>+#define MT6328_SLDO_ANA_CON2         0x0a7a</div><div class='add'>+#define MT6328_SLDO_ANA_CON3         0x0a7c</div><div class='add'>+#define MT6328_SLDO_ANA_CON4         0x0a7e</div><div class='add'>+#define MT6328_SLDO_ANA_CON5         0x0a80</div><div class='add'>+#define MT6328_SLDO_ANA_CON6         0x0a82</div><div class='add'>+#define MT6328_SLDO_ANA_CON7         0x0a84</div><div class='add'>+#define MT6328_SLDO_ANA_CON8         0x0a86</div><div class='add'>+#define MT6328_SLDO_ANA_CON9         0x0a88</div><div class='add'>+#define MT6328_SLDO_ANA_CON10        0x0a8a</div><div class='add'>+#define MT6328_LDO_RSV_CON0          0x0a8c</div><div class='add'>+#define MT6328_LDO_RSV_CON1          0x0a8e</div><div class='add'>+#define MT6328_SPK_CON0              0x0a90</div><div class='add'>+#define MT6328_SPK_CON1              0x0a92</div><div class='add'>+#define MT6328_SPK_CON2              0x0a94</div><div class='add'>+#define MT6328_SPK_CON3              0x0a96</div><div class='add'>+#define MT6328_SPK_CON4              0x0a98</div><div class='add'>+#define MT6328_SPK_CON5              0x0a9a</div><div class='add'>+#define MT6328_SPK_CON6              0x0a9c</div><div class='add'>+#define MT6328_SPK_CON7              0x0a9e</div><div class='add'>+#define MT6328_SPK_CON8              0x0aa0</div><div class='add'>+#define MT6328_SPK_CON9              0x0aa2</div><div class='add'>+#define MT6328_SPK_CON10             0x0aa4</div><div class='add'>+#define MT6328_SPK_CON11             0x0aa6</div><div class='add'>+#define MT6328_SPK_CON12             0x0aa8</div><div class='add'>+#define MT6328_SPK_CON13             0x0aaa</div><div class='add'>+#define MT6328_SPK_CON14             0x0aac</div><div class='add'>+#define MT6328_SPK_CON15             0x0aae</div><div class='add'>+#define MT6328_SPK_CON16             0x0ab0</div><div class='add'>+#define MT6328_SPK_ANA_CON0          0x0ab2</div><div class='add'>+#define MT6328_SPK_ANA_CON1          0x0ab4</div><div class='add'>+#define MT6328_SPK_ANA_CON3          0x0ab6</div><div class='add'>+#define MT6328_OTP_CON0              0x0c00</div><div class='add'>+#define MT6328_OTP_CON1              0x0c02</div><div class='add'>+#define MT6328_OTP_CON2              0x0c04</div><div class='add'>+#define MT6328_OTP_CON3              0x0c06</div><div class='add'>+#define MT6328_OTP_CON4              0x0c08</div><div class='add'>+#define MT6328_OTP_CON5              0x0c0a</div><div class='add'>+#define MT6328_OTP_CON6              0x0c0c</div><div class='add'>+#define MT6328_OTP_CON7              0x0c0e</div><div class='add'>+#define MT6328_OTP_CON8              0x0c10</div><div class='add'>+#define MT6328_OTP_CON9              0x0c12</div><div class='add'>+#define MT6328_OTP_CON10             0x0c14</div><div class='add'>+#define MT6328_OTP_CON11             0x0c16</div><div class='add'>+#define MT6328_OTP_CON12             0x0c18</div><div class='add'>+#define MT6328_OTP_CON13             0x0c1a</div><div class='add'>+#define MT6328_OTP_CON14             0x0c1c</div><div class='add'>+#define MT6328_OTP_DOUT_0_15         0x0c1e</div><div class='add'>+#define MT6328_OTP_DOUT_16_31        0x0c20</div><div class='add'>+#define MT6328_OTP_DOUT_32_47        0x0c22</div><div class='add'>+#define MT6328_OTP_DOUT_48_63        0x0c24</div><div class='add'>+#define MT6328_OTP_DOUT_64_79        0x0c26</div><div class='add'>+#define MT6328_OTP_DOUT_80_95        0x0c28</div><div class='add'>+#define MT6328_OTP_DOUT_96_111       0x0c2a</div><div class='add'>+#define MT6328_OTP_DOUT_112_127      0x0c2c</div><div class='add'>+#define MT6328_OTP_DOUT_128_143      0x0c2e</div><div class='add'>+#define MT6328_OTP_DOUT_144_159      0x0c30</div><div class='add'>+#define MT6328_OTP_DOUT_160_175      0x0c32</div><div class='add'>+#define MT6328_OTP_DOUT_176_191      0x0c34</div><div class='add'>+#define MT6328_OTP_DOUT_192_207      0x0c36</div><div class='add'>+#define MT6328_OTP_DOUT_208_223      0x0c38</div><div class='add'>+#define MT6328_OTP_DOUT_224_239      0x0c3a</div><div class='add'>+#define MT6328_OTP_DOUT_240_255      0x0c3c</div><div class='add'>+#define MT6328_OTP_DOUT_256_271      0x0c3e</div><div class='add'>+#define MT6328_OTP_DOUT_272_287      0x0c40</div><div class='add'>+#define MT6328_OTP_DOUT_288_303      0x0c42</div><div class='add'>+#define MT6328_OTP_DOUT_304_319      0x0c44</div><div class='add'>+#define MT6328_OTP_DOUT_320_335      0x0c46</div><div class='add'>+#define MT6328_OTP_DOUT_336_351      0x0c48</div><div class='add'>+#define MT6328_OTP_DOUT_352_367      0x0c4a</div><div class='add'>+#define MT6328_OTP_DOUT_368_383      0x0c4c</div><div class='add'>+#define MT6328_OTP_DOUT_384_399      0x0c4e</div><div class='add'>+#define MT6328_OTP_DOUT_400_415      0x0c50</div><div class='add'>+#define MT6328_OTP_DOUT_416_431      0x0c52</div><div class='add'>+#define MT6328_OTP_DOUT_432_447      0x0c54</div><div class='add'>+#define MT6328_OTP_DOUT_448_463      0x0c56</div><div class='add'>+#define MT6328_OTP_DOUT_464_479      0x0c58</div><div class='add'>+#define MT6328_OTP_DOUT_480_495      0x0c5a</div><div class='add'>+#define MT6328_OTP_DOUT_496_511      0x0c5c</div><div class='add'>+#define MT6328_OTP_VAL_0_15          0x0c5e</div><div class='add'>+#define MT6328_OTP_VAL_16_31         0x0c60</div><div class='add'>+#define MT6328_OTP_VAL_32_47         0x0c62</div><div class='add'>+#define MT6328_OTP_VAL_48_63         0x0c64</div><div class='add'>+#define MT6328_OTP_VAL_64_79         0x0c66</div><div class='add'>+#define MT6328_OTP_VAL_80_95         0x0c68</div><div class='add'>+#define MT6328_OTP_VAL_96_111        0x0c6a</div><div class='add'>+#define MT6328_OTP_VAL_112_127       0x0c6c</div><div class='add'>+#define MT6328_OTP_VAL_128_143       0x0c6e</div><div class='add'>+#define MT6328_OTP_VAL_144_159       0x0c70</div><div class='add'>+#define MT6328_OTP_VAL_160_175       0x0c72</div><div class='add'>+#define MT6328_OTP_VAL_176_191       0x0c74</div><div class='add'>+#define MT6328_OTP_VAL_192_207       0x0c76</div><div class='add'>+#define MT6328_OTP_VAL_208_223       0x0c78</div><div class='add'>+#define MT6328_OTP_VAL_224_239       0x0c7a</div><div class='add'>+#define MT6328_OTP_VAL_240_255       0x0c7c</div><div class='add'>+#define MT6328_OTP_VAL_256_271       0x0c7e</div><div class='add'>+#define MT6328_OTP_VAL_272_287       0x0c80</div><div class='add'>+#define MT6328_OTP_VAL_288_303       0x0c82</div><div class='add'>+#define MT6328_OTP_VAL_304_319       0x0c84</div><div class='add'>+#define MT6328_OTP_VAL_320_335       0x0c86</div><div class='add'>+#define MT6328_OTP_VAL_336_351       0x0c88</div><div class='add'>+#define MT6328_OTP_VAL_352_367       0x0c8a</div><div class='add'>+#define MT6328_OTP_VAL_368_383       0x0c8c</div><div class='add'>+#define MT6328_OTP_VAL_384_399       0x0c8e</div><div class='add'>+#define MT6328_OTP_VAL_400_415       0x0c90</div><div class='add'>+#define MT6328_OTP_VAL_416_431       0x0c92</div><div class='add'>+#define MT6328_OTP_VAL_432_447       0x0c94</div><div class='add'>+#define MT6328_OTP_VAL_448_463       0x0c96</div><div class='add'>+#define MT6328_OTP_VAL_464_479       0x0c98</div><div class='add'>+#define MT6328_OTP_VAL_480_495       0x0c9a</div><div class='add'>+#define MT6328_OTP_VAL_496_511       0x0c9c</div><div class='add'>+#define MT6328_RTC_MIX_CON0          0x0c9e</div><div class='add'>+#define MT6328_RTC_MIX_CON1          0x0ca0</div><div class='add'>+#define MT6328_RTC_MIX_CON2          0x0ca2</div><div class='add'>+#define MT6328_FGADC_CON0            0x0ca4</div><div class='add'>+#define MT6328_FGADC_CON1            0x0ca6</div><div class='add'>+#define MT6328_FGADC_CON2            0x0ca8</div><div class='add'>+#define MT6328_FGADC_CON3            0x0caa</div><div class='add'>+#define MT6328_FGADC_CON4            0x0cac</div><div class='add'>+#define MT6328_FGADC_CON5            0x0cae</div><div class='add'>+#define MT6328_FGADC_CON6            0x0cb0</div><div class='add'>+#define MT6328_FGADC_CON7            0x0cb2</div><div class='add'>+#define MT6328_FGADC_CON8            0x0cb4</div><div class='add'>+#define MT6328_FGADC_CON9            0x0cb6</div><div class='add'>+#define MT6328_FGADC_CON10           0x0cb8</div><div class='add'>+#define MT6328_FGADC_CON11           0x0cba</div><div class='add'>+#define MT6328_FGADC_CON12           0x0cbc</div><div class='add'>+#define MT6328_FGADC_CON13           0x0cbe</div><div class='add'>+#define MT6328_FGADC_CON14           0x0cc0</div><div class='add'>+#define MT6328_FGADC_CON15           0x0cc2</div><div class='add'>+#define MT6328_FGADC_CON16           0x0cc4</div><div class='add'>+#define MT6328_FGADC_CON17           0x0cc6</div><div class='add'>+#define MT6328_FGADC_CON18           0x0cc8</div><div class='add'>+#define MT6328_FGADC_CON19           0x0cca</div><div class='add'>+#define MT6328_FGADC_CON20           0x0ccc</div><div class='add'>+#define MT6328_FGADC_CON21           0x0cce</div><div class='add'>+#define MT6328_FGADC_CON22           0x0cd0</div><div class='add'>+#define MT6328_FGADC_CON23           0x0cd2</div><div class='add'>+#define MT6328_FGADC_CON24           0x0cd4</div><div class='add'>+#define MT6328_FGADC_CON25           0x0cd6</div><div class='add'>+#define MT6328_FGADC_CON26           0x0cd8</div><div class='add'>+#define MT6328_FGADC_CON27           0x0cda</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON0       0x0cdc</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON1       0x0cde</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON2       0x0ce0</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON3       0x0ce2</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON4       0x0ce4</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON5       0x0ce6</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON6       0x0ce8</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON7       0x0cea</div><div class='add'>+#define MT6328_AUDDEC_ANA_CON8       0x0cec</div><div class='add'>+#define MT6328_AUDENC_ANA_CON0       0x0cee</div><div class='add'>+#define MT6328_AUDENC_ANA_CON1       0x0cf0</div><div class='add'>+#define MT6328_AUDENC_ANA_CON2       0x0cf2</div><div class='add'>+#define MT6328_AUDENC_ANA_CON3       0x0cf4</div><div class='add'>+#define MT6328_AUDENC_ANA_CON4       0x0cf6</div><div class='add'>+#define MT6328_AUDENC_ANA_CON5       0x0cf8</div><div class='add'>+#define MT6328_AUDENC_ANA_CON6       0x0cfa</div><div class='add'>+#define MT6328_AUDENC_ANA_CON7       0x0cfc</div><div class='add'>+#define MT6328_AUDENC_ANA_CON8       0x0cfe</div><div class='add'>+#define MT6328_AUDENC_ANA_CON9       0x0d00</div><div class='add'>+#define MT6328_AUDENC_ANA_CON10      0x0d02</div><div class='add'>+#define MT6328_AUDNCP_CLKDIV_CON0    0x0d04</div><div class='add'>+#define MT6328_AUDNCP_CLKDIV_CON1    0x0d06</div><div class='add'>+#define MT6328_AUDNCP_CLKDIV_CON2    0x0d08</div><div class='add'>+#define MT6328_AUDNCP_CLKDIV_CON3    0x0d0a</div><div class='add'>+#define MT6328_AUDNCP_CLKDIV_CON4    0x0d0c</div><div class='add'>+#define MT6328_AUXADC_ADC0           0x0e00</div><div class='add'>+#define MT6328_AUXADC_ADC1           0x0e02</div><div class='add'>+#define MT6328_AUXADC_ADC2           0x0e04</div><div class='add'>+#define MT6328_AUXADC_ADC3           0x0e06</div><div class='add'>+#define MT6328_AUXADC_ADC4           0x0e08</div><div class='add'>+#define MT6328_AUXADC_ADC5           0x0e0a</div><div class='add'>+#define MT6328_AUXADC_ADC6           0x0e0c</div><div class='add'>+#define MT6328_AUXADC_ADC7           0x0e0e</div><div class='add'>+#define MT6328_AUXADC_ADC8           0x0e10</div><div class='add'>+#define MT6328_AUXADC_ADC9           0x0e12</div><div class='add'>+#define MT6328_AUXADC_ADC10          0x0e14</div><div class='add'>+#define MT6328_AUXADC_ADC11          0x0e16</div><div class='add'>+#define MT6328_AUXADC_ADC12          0x0e18</div><div class='add'>+#define MT6328_AUXADC_ADC13          0x0e1a</div><div class='add'>+#define MT6328_AUXADC_ADC14          0x0e1c</div><div class='add'>+#define MT6328_AUXADC_ADC15          0x0e1e</div><div class='add'>+#define MT6328_AUXADC_ADC16          0x0e20</div><div class='add'>+#define MT6328_AUXADC_ADC17          0x0e22</div><div class='add'>+#define MT6328_AUXADC_ADC18          0x0e24</div><div class='add'>+#define MT6328_AUXADC_ADC19          0x0e26</div><div class='add'>+#define MT6328_AUXADC_ADC20          0x0e28</div><div class='add'>+#define MT6328_AUXADC_ADC21          0x0e2a</div><div class='add'>+#define MT6328_AUXADC_ADC22          0x0e2c</div><div class='add'>+#define MT6328_AUXADC_ADC23          0x0e2e</div><div class='add'>+#define MT6328_AUXADC_ADC24          0x0e30</div><div class='add'>+#define MT6328_AUXADC_ADC25          0x0e32</div><div class='add'>+#define MT6328_AUXADC_ADC26          0x0e34</div><div class='add'>+#define MT6328_AUXADC_ADC27          0x0e36</div><div class='add'>+#define MT6328_AUXADC_ADC28          0x0e38</div><div class='add'>+#define MT6328_AUXADC_ADC29          0x0e3a</div><div class='add'>+#define MT6328_AUXADC_ADC30          0x0e3c</div><div class='add'>+#define MT6328_AUXADC_ADC31          0x0e3e</div><div class='add'>+#define MT6328_AUXADC_ADC32          0x0e40</div><div class='add'>+#define MT6328_AUXADC_ADC33          0x0e42</div><div class='add'>+#define MT6328_AUXADC_BUF0           0x0e44</div><div class='add'>+#define MT6328_AUXADC_BUF1           0x0e46</div><div class='add'>+#define MT6328_AUXADC_BUF2           0x0e48</div><div class='add'>+#define MT6328_AUXADC_BUF3           0x0e4a</div><div class='add'>+#define MT6328_AUXADC_BUF4           0x0e4c</div><div class='add'>+#define MT6328_AUXADC_BUF5           0x0e4e</div><div class='add'>+#define MT6328_AUXADC_BUF6           0x0e50</div><div class='add'>+#define MT6328_AUXADC_BUF7           0x0e52</div><div class='add'>+#define MT6328_AUXADC_BUF8           0x0e54</div><div class='add'>+#define MT6328_AUXADC_BUF9           0x0e56</div><div class='add'>+#define MT6328_AUXADC_BUF10          0x0e58</div><div class='add'>+#define MT6328_AUXADC_BUF11          0x0e5a</div><div class='add'>+#define MT6328_AUXADC_BUF12          0x0e5c</div><div class='add'>+#define MT6328_AUXADC_BUF13          0x0e5e</div><div class='add'>+#define MT6328_AUXADC_BUF14          0x0e60</div><div class='add'>+#define MT6328_AUXADC_BUF15          0x0e62</div><div class='add'>+#define MT6328_AUXADC_BUF16          0x0e64</div><div class='add'>+#define MT6328_AUXADC_BUF17          0x0e66</div><div class='add'>+#define MT6328_AUXADC_BUF18          0x0e68</div><div class='add'>+#define MT6328_AUXADC_BUF19          0x0e6a</div><div class='add'>+#define MT6328_AUXADC_BUF20          0x0e6c</div><div class='add'>+#define MT6328_AUXADC_BUF21          0x0e6e</div><div class='add'>+#define MT6328_AUXADC_BUF22          0x0e70</div><div class='add'>+#define MT6328_AUXADC_BUF23          0x0e72</div><div class='add'>+#define MT6328_AUXADC_BUF24          0x0e74</div><div class='add'>+#define MT6328_AUXADC_BUF25          0x0e76</div><div class='add'>+#define MT6328_AUXADC_BUF26          0x0e78</div><div class='add'>+#define MT6328_AUXADC_BUF27          0x0e7a</div><div class='add'>+#define MT6328_AUXADC_BUF28          0x0e7c</div><div class='add'>+#define MT6328_AUXADC_BUF29          0x0e7e</div><div class='add'>+#define MT6328_AUXADC_BUF30          0x0e80</div><div class='add'>+#define MT6328_AUXADC_BUF31          0x0e82</div><div class='add'>+#define MT6328_AUXADC_STA0           0x0e84</div><div class='add'>+#define MT6328_AUXADC_STA1           0x0e86</div><div class='add'>+#define MT6328_AUXADC_RQST0          0x0e88</div><div class='add'>+#define MT6328_AUXADC_RQST0_SET      0x0e8a</div><div class='add'>+#define MT6328_AUXADC_RQST0_CLR      0x0e8c</div><div class='add'>+#define MT6328_AUXADC_RQST1          0x0e8e</div><div class='add'>+#define MT6328_AUXADC_RQST1_SET      0x0e90</div><div class='add'>+#define MT6328_AUXADC_RQST1_CLR      0x0e92</div><div class='add'>+#define MT6328_AUXADC_CON0           0x0e94</div><div class='add'>+#define MT6328_AUXADC_CON0_SET       0x0e96</div><div class='add'>+#define MT6328_AUXADC_CON0_CLR       0x0e98</div><div class='add'>+#define MT6328_AUXADC_CON1           0x0e9a</div><div class='add'>+#define MT6328_AUXADC_CON2           0x0e9c</div><div class='add'>+#define MT6328_AUXADC_CON3           0x0e9e</div><div class='add'>+#define MT6328_AUXADC_CON4           0x0ea0</div><div class='add'>+#define MT6328_AUXADC_CON5           0x0ea2</div><div class='add'>+#define MT6328_AUXADC_CON6           0x0ea4</div><div class='add'>+#define MT6328_AUXADC_CON7           0x0ea6</div><div class='add'>+#define MT6328_AUXADC_CON8           0x0ea8</div><div class='add'>+#define MT6328_AUXADC_CON9           0x0eaa</div><div class='add'>+#define MT6328_AUXADC_CON10          0x0eac</div><div class='add'>+#define MT6328_AUXADC_CON11          0x0eae</div><div class='add'>+#define MT6328_AUXADC_CON12          0x0eb0</div><div class='add'>+#define MT6328_AUXADC_CON13          0x0eb2</div><div class='add'>+#define MT6328_AUXADC_CON14          0x0eb4</div><div class='add'>+#define MT6328_AUXADC_CON15          0x0eb6</div><div class='add'>+#define MT6328_AUXADC_CON16          0x0eb8</div><div class='add'>+#define MT6328_AUXADC_AUTORPT0       0x0eba</div><div class='add'>+#define MT6328_AUXADC_LBAT0          0x0ebc</div><div class='add'>+#define MT6328_AUXADC_LBAT1          0x0ebe</div><div class='add'>+#define MT6328_AUXADC_LBAT2          0x0ec0</div><div class='add'>+#define MT6328_AUXADC_LBAT3          0x0ec2</div><div class='add'>+#define MT6328_AUXADC_LBAT4          0x0ec4</div><div class='add'>+#define MT6328_AUXADC_LBAT5          0x0ec6</div><div class='add'>+#define MT6328_AUXADC_LBAT6          0x0ec8</div><div class='add'>+#define MT6328_AUXADC_ACCDET         0x0eca</div><div class='add'>+#define MT6328_AUXADC_THR0           0x0ecc</div><div class='add'>+#define MT6328_AUXADC_THR1           0x0ece</div><div class='add'>+#define MT6328_AUXADC_THR2           0x0ed0</div><div class='add'>+#define MT6328_AUXADC_THR3           0x0ed2</div><div class='add'>+#define MT6328_AUXADC_THR4           0x0ed4</div><div class='add'>+#define MT6328_AUXADC_THR5           0x0ed6</div><div class='add'>+#define MT6328_AUXADC_THR6           0x0ed8</div><div class='add'>+#define MT6328_AUXADC_EFUSE0         0x0eda</div><div class='add'>+#define MT6328_AUXADC_EFUSE1         0x0edc</div><div class='add'>+#define MT6328_AUXADC_EFUSE2         0x0ede</div><div class='add'>+#define MT6328_AUXADC_EFUSE3         0x0ee0</div><div class='add'>+#define MT6328_AUXADC_EFUSE4         0x0ee2</div><div class='add'>+#define MT6328_AUXADC_EFUSE5         0x0ee4</div><div class='add'>+#define MT6328_AUXADC_DBG0           0x0ee6</div><div class='add'>+#define MT6328_AUXADC_IMP0           0x0ee8</div><div class='add'>+#define MT6328_AUXADC_IMP1           0x0eea</div><div class='add'>+#define MT6328_AUXADC_VISMPS0_1      0x0eec</div><div class='add'>+#define MT6328_AUXADC_VISMPS0_2      0x0eee</div><div class='add'>+#define MT6328_AUXADC_VISMPS0_3      0x0ef0</div><div class='add'>+#define MT6328_AUXADC_VISMPS0_4      0x0ef2</div><div class='add'>+#define MT6328_AUXADC_VISMPS0_5      0x0ef4</div><div class='add'>+#define MT6328_AUXADC_VISMPS0_6      0x0ef6</div><div class='add'>+#define MT6328_AUXADC_VISMPS0_7      0x0ef8</div><div class='add'>+#define MT6328_AUXADC_LBAT2_1        0x0efa</div><div class='add'>+#define MT6328_AUXADC_LBAT2_2        0x0efc</div><div class='add'>+#define MT6328_AUXADC_LBAT2_3        0x0efe</div><div class='add'>+#define MT6328_AUXADC_LBAT2_4        0x0f00</div><div class='add'>+#define MT6328_AUXADC_LBAT2_5        0x0f02</div><div class='add'>+#define MT6328_AUXADC_LBAT2_6        0x0f04</div><div class='add'>+#define MT6328_AUXADC_LBAT2_7        0x0f06</div><div class='add'>+#define MT6328_AUXADC_MDBG_0         0x0f08</div><div class='add'>+#define MT6328_AUXADC_MDBG_1         0x0f0a</div><div class='add'>+#define MT6328_AUXADC_MDBG_2         0x0f0c</div><div class='add'>+#define MT6328_AUXADC_MDRT_0         0x0f0e</div><div class='add'>+#define MT6328_AUXADC_MDRT_1         0x0f10</div><div class='add'>+#define MT6328_AUXADC_MDRT_2         0x0f12</div><div class='add'>+#define MT6328_ACCDET_CON0           0x0f14</div><div class='add'>+#define MT6328_ACCDET_CON1           0x0f16</div><div class='add'>+#define MT6328_ACCDET_CON2           0x0f18</div><div class='add'>+#define MT6328_ACCDET_CON3           0x0f1a</div><div class='add'>+#define MT6328_ACCDET_CON4           0x0f1c</div><div class='add'>+#define MT6328_ACCDET_CON5           0x0f1e</div><div class='add'>+#define MT6328_ACCDET_CON6           0x0f20</div><div class='add'>+#define MT6328_ACCDET_CON7           0x0f22</div><div class='add'>+#define MT6328_ACCDET_CON8           0x0f24</div><div class='add'>+#define MT6328_ACCDET_CON9           0x0f26</div><div class='add'>+#define MT6328_ACCDET_CON10          0x0f28</div><div class='add'>+#define MT6328_ACCDET_CON11          0x0f2a</div><div class='add'>+#define MT6328_ACCDET_CON12          0x0f2c</div><div class='add'>+#define MT6328_ACCDET_CON13          0x0f2e</div><div class='add'>+#define MT6328_ACCDET_CON14          0x0f30</div><div class='add'>+#define MT6328_ACCDET_CON15          0x0f32</div><div class='add'>+#define MT6328_ACCDET_CON16          0x0f34</div><div class='add'>+#define MT6328_ACCDET_CON17          0x0f36</div><div class='add'>+#define MT6328_ACCDET_CON18          0x0f38</div><div class='add'>+#define MT6328_ACCDET_CON19          0x0f3a</div><div class='add'>+#define MT6328_ACCDET_CON20          0x0f3c</div><div class='add'>+#define MT6328_ACCDET_CON21          0x0f3e</div><div class='add'>+#define MT6328_ACCDET_CON22          0x0f40</div><div class='add'>+#define MT6328_ACCDET_CON23          0x0f42</div><div class='add'>+#define MT6328_ACCDET_CON24          0x0f44</div><div class='add'>+#define MT6328_ACCDET_CON25          0x0f46</div><div class='add'>+#define MT6328_CHR_CON0              0x0f48</div><div class='add'>+#define MT6328_CHR_CON1              0x0f4a</div><div class='add'>+#define MT6328_CHR_CON2              0x0f4c</div><div class='add'>+#define MT6328_CHR_CON3              0x0f4e</div><div class='add'>+#define MT6328_CHR_CON4              0x0f50</div><div class='add'>+#define MT6328_CHR_CON5              0x0f52</div><div class='add'>+#define MT6328_CHR_CON6              0x0f54</div><div class='add'>+#define MT6328_CHR_CON7              0x0f56</div><div class='add'>+#define MT6328_CHR_CON8              0x0f58</div><div class='add'>+#define MT6328_CHR_CON9              0x0f5a</div><div class='add'>+#define MT6328_CHR_CON10             0x0f5c</div><div class='add'>+#define MT6328_CHR_CON11             0x0f5e</div><div class='add'>+#define MT6328_CHR_CON12             0x0f60</div><div class='add'>+#define MT6328_CHR_CON13             0x0f62</div><div class='add'>+#define MT6328_CHR_CON14             0x0f64</div><div class='add'>+#define MT6328_CHR_CON15             0x0f66</div><div class='add'>+#define MT6328_CHR_CON16             0x0f68</div><div class='add'>+#define MT6328_CHR_CON17             0x0f6a</div><div class='add'>+#define MT6328_CHR_CON18             0x0f6c</div><div class='add'>+#define MT6328_CHR_CON19             0x0f6e</div><div class='add'>+#define MT6328_CHR_CON20             0x0f70</div><div class='add'>+#define MT6328_CHR_CON21             0x0f72</div><div class='add'>+#define MT6328_CHR_CON22             0x0f74</div><div class='add'>+#define MT6328_CHR_CON23             0x0f76</div><div class='add'>+#define MT6328_CHR_CON24             0x0f78</div><div class='add'>+#define MT6328_CHR_CON25             0x0f7a</div><div class='add'>+#define MT6328_CHR_CON26             0x0f7c</div><div class='add'>+#define MT6328_CHR_CON27             0x0f7e</div><div class='add'>+#define MT6328_CHR_CON28             0x0f80</div><div class='add'>+#define MT6328_CHR_CON29             0x0f82</div><div class='add'>+#define MT6328_CHR_CON30             0x0f84</div><div class='add'>+#define MT6328_CHR_CON31             0x0f86</div><div class='add'>+#define MT6328_CHR_CON32             0x0f88</div><div class='add'>+#define MT6328_CHR_CON33             0x0f8a</div><div class='add'>+#define MT6328_CHR_CON34             0x0f8c</div><div class='add'>+#define MT6328_CHR_CON35             0x0f8e</div><div class='add'>+#define MT6328_CHR_CON36             0x0f90</div><div class='add'>+#define MT6328_CHR_CON37             0x0f92</div><div class='add'>+#define MT6328_CHR_CON38             0x0f94</div><div class='add'>+#define MT6328_CHR_CON39             0x0f96</div><div class='add'>+#define MT6328_CHR_CON40             0x0f98</div><div class='add'>+#define MT6328_CHR_CON41             0x0f9a</div><div class='add'>+#define MT6328_CHR_CON42             0x0f9c</div><div class='add'>+#define MT6328_BATON_CON0            0x0f9e</div><div class='add'>+#define MT6328_CHR_CON43             0x0fa0</div><div class='add'>+#define MT6328_EOSC_CALI_CON0        0x0faa</div><div class='add'>+#define MT6328_EOSC_CALI_CON1        0x0fac</div><div class='add'>+#define MT6328_VRTC_PWM_CON0         0x0fae</div><div class='add'>+</div><div class='add'>+#endif /* __MFD_MT6328_REGISTERS_H__ */</div><div class='head'>diff --git a/include/linux/mfd/mt6397/core.h b/include/linux/mfd/mt6397/core.h<br/>index 627487e26287..b774c3a4bb62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/mt6397/core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/mt6397/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/mt6397/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/mt6397/core.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> enum chip_id {</div><div class='ctx'> 	MT6323_CHIP_ID = 0x23,</div><div class='add'>+	MT6328_CHIP_ID = 0x30,</div><div class='ctx'> 	MT6331_CHIP_ID = 0x20,</div><div class='ctx'> 	MT6332_CHIP_ID = 0x20,</div><div class='ctx'> 	MT6357_CHIP_ID = 0x57,</div><div class='hunk'>@@ -65,11 +66,11 @@ struct mt6397_chip {</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	struct irq_domain *irq_domain;</div><div class='ctx'> 	struct mutex irqlock;</div><div class='del'>-	u16 wake_mask[2];</div><div class='del'>-	u16 irq_masks_cur[2];</div><div class='del'>-	u16 irq_masks_cache[2];</div><div class='del'>-	u16 int_con[2];</div><div class='del'>-	u16 int_status[2];</div><div class='add'>+	u16 wake_mask[3];</div><div class='add'>+	u16 irq_masks_cur[3];</div><div class='add'>+	u16 irq_masks_cache[3];</div><div class='add'>+	u16 int_con[3];</div><div class='add'>+	u16 int_status[3];</div><div class='ctx'> 	u16 chip_id;</div><div class='ctx'> 	void *irq_data;</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/mfd/mt6397/rtc.h b/include/linux/mfd/mt6397/rtc.h<br/>index 068ae1c0f0e8..27883af44f87 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/mt6397/rtc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/mt6397/rtc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/mt6397/rtc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/mt6397/rtc.h</a></div><div class='hunk'>@@ -60,11 +60,6 @@</div><div class='ctx'> #define RTC_PDN2               0x002e</div><div class='ctx'> #define RTC_PDN2_PWRON_ALARM   BIT(4)</div><div class='ctx'> </div><div class='del'>-#define RTC_MIN_YEAR           1968</div><div class='del'>-#define RTC_BASE_YEAR          1900</div><div class='del'>-#define RTC_NUM_YEARS          128</div><div class='del'>-#define RTC_MIN_YEAR_OFFSET    (RTC_MIN_YEAR - RTC_BASE_YEAR)</div><div class='del'>-</div><div class='ctx'> #define MTK_RTC_POLL_DELAY_US  10</div><div class='ctx'> #define MTK_RTC_POLL_TIMEOUT   (jiffies_to_usecs(HZ))</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mfd/nct6694.h b/include/linux/mfd/nct6694.h<br/>new file mode 100644<br/>index 000000000000..6eb9be2cd4a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/nct6694.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/nct6694.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Nuvoton Technology Corp.</div><div class='add'>+ *</div><div class='add'>+ * Nuvoton NCT6694 USB transaction and data structure.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MFD_NCT6694_H</div><div class='add'>+#define __MFD_NCT6694_H</div><div class='add'>+</div><div class='add'>+#define NCT6694_VENDOR_ID	0x0416</div><div class='add'>+#define NCT6694_PRODUCT_ID	0x200B</div><div class='add'>+#define NCT6694_INT_IN_EP	0x81</div><div class='add'>+#define NCT6694_BULK_IN_EP	0x02</div><div class='add'>+#define NCT6694_BULK_OUT_EP	0x03</div><div class='add'>+</div><div class='add'>+#define NCT6694_HCTRL_SET	0x40</div><div class='add'>+#define NCT6694_HCTRL_GET	0x80</div><div class='add'>+</div><div class='add'>+#define NCT6694_URB_TIMEOUT	1000</div><div class='add'>+</div><div class='add'>+enum nct6694_irq_id {</div><div class='add'>+	NCT6694_IRQ_GPIO0 = 0,</div><div class='add'>+	NCT6694_IRQ_GPIO1,</div><div class='add'>+	NCT6694_IRQ_GPIO2,</div><div class='add'>+	NCT6694_IRQ_GPIO3,</div><div class='add'>+	NCT6694_IRQ_GPIO4,</div><div class='add'>+	NCT6694_IRQ_GPIO5,</div><div class='add'>+	NCT6694_IRQ_GPIO6,</div><div class='add'>+	NCT6694_IRQ_GPIO7,</div><div class='add'>+	NCT6694_IRQ_GPIO8,</div><div class='add'>+	NCT6694_IRQ_GPIO9,</div><div class='add'>+	NCT6694_IRQ_GPIOA,</div><div class='add'>+	NCT6694_IRQ_GPIOB,</div><div class='add'>+	NCT6694_IRQ_GPIOC,</div><div class='add'>+	NCT6694_IRQ_GPIOD,</div><div class='add'>+	NCT6694_IRQ_GPIOE,</div><div class='add'>+	NCT6694_IRQ_GPIOF,</div><div class='add'>+	NCT6694_IRQ_CAN0,</div><div class='add'>+	NCT6694_IRQ_CAN1,</div><div class='add'>+	NCT6694_IRQ_RTC,</div><div class='add'>+	NCT6694_NR_IRQS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nct6694_response_err_status {</div><div class='add'>+	NCT6694_NO_ERROR = 0,</div><div class='add'>+	NCT6694_FORMAT_ERROR,</div><div class='add'>+	NCT6694_RESERVED1,</div><div class='add'>+	NCT6694_RESERVED2,</div><div class='add'>+	NCT6694_NOT_SUPPORT_ERROR,</div><div class='add'>+	NCT6694_NO_RESPONSE_ERROR,</div><div class='add'>+	NCT6694_TIMEOUT_ERROR,</div><div class='add'>+	NCT6694_PENDING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed nct6694_cmd_header {</div><div class='add'>+	u8 rsv1;</div><div class='add'>+	u8 mod;</div><div class='add'>+	union __packed {</div><div class='add'>+		__le16 offset;</div><div class='add'>+		struct __packed {</div><div class='add'>+			u8 cmd;</div><div class='add'>+			u8 sel;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	u8 hctrl;</div><div class='add'>+	u8 rsv2;</div><div class='add'>+	__le16 len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed nct6694_response_header {</div><div class='add'>+	u8 sequence_id;</div><div class='add'>+	u8 sts;</div><div class='add'>+	u8 reserved[4];</div><div class='add'>+	__le16 len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union __packed nct6694_usb_msg {</div><div class='add'>+	struct nct6694_cmd_header cmd_header;</div><div class='add'>+	struct nct6694_response_header response_header;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nct6694 {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct ida gpio_ida;</div><div class='add'>+	struct ida i2c_ida;</div><div class='add'>+	struct ida canfd_ida;</div><div class='add'>+	struct ida wdt_ida;</div><div class='add'>+	struct irq_domain *domain;</div><div class='add'>+	struct mutex access_lock;</div><div class='add'>+	spinlock_t irq_lock;</div><div class='add'>+	struct urb *int_in_urb;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	union nct6694_usb_msg *usb_msg;</div><div class='add'>+	__le32 *int_buffer;</div><div class='add'>+	unsigned int irq_enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int nct6694_read_msg(struct nct6694 *nct6694, const struct nct6694_cmd_header *cmd_hd, void *buf);</div><div class='add'>+int nct6694_write_msg(struct nct6694 *nct6694, const struct nct6694_cmd_header *cmd_hd, void *buf);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h<br/>index eda1ffd99c1a..dabcc0dea802 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/palmas.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/palmas.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/palmas.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/palmas.h</a></div><div class='hunk'>@@ -98,8 +98,8 @@ struct palmas_sleep_requestor_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct palmas_regs_info {</div><div class='del'>-	char	*name;</div><div class='del'>-	char	*sname;</div><div class='add'>+	const char	*name;</div><div class='add'>+	const char	*sname;</div><div class='ctx'> 	u8	vsel_addr;</div><div class='ctx'> 	u8	ctrl_addr;</div><div class='ctx'> 	u8	tstep_addr;</div><div class='head'>diff --git a/include/linux/mfd/pcf50633/adc.h b/include/linux/mfd/pcf50633/adc.h<br/>deleted file mode 100644<br/>index 6a81896d4889..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/pcf50633/adc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/adc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * adc.h  -- Driver for NXP PCF50633 ADC</div><div class='del'>- *</div><div class='del'>- * (C) 2006-2008 by Openmoko, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_MFD_PCF50633_ADC_H</div><div class='del'>-#define __LINUX_MFD_PCF50633_ADC_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mfd/pcf50633/core.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-/* ADC Registers */</div><div class='del'>-#define PCF50633_REG_ADCC3		0x52</div><div class='del'>-#define PCF50633_REG_ADCC2		0x53</div><div class='del'>-#define PCF50633_REG_ADCC1		0x54</div><div class='del'>-#define PCF50633_REG_ADCS1		0x55</div><div class='del'>-#define PCF50633_REG_ADCS2		0x56</div><div class='del'>-#define PCF50633_REG_ADCS3		0x57</div><div class='del'>-</div><div class='del'>-#define PCF50633_ADCC1_ADCSTART		0x01</div><div class='del'>-#define PCF50633_ADCC1_RES_8BIT		0x02</div><div class='del'>-#define PCF50633_ADCC1_RES_10BIT	0x00</div><div class='del'>-#define PCF50633_ADCC1_AVERAGE_NO	0x00</div><div class='del'>-#define PCF50633_ADCC1_AVERAGE_4	0x04</div><div class='del'>-#define PCF50633_ADCC1_AVERAGE_8	0x08</div><div class='del'>-#define PCF50633_ADCC1_AVERAGE_16	0x0c</div><div class='del'>-#define PCF50633_ADCC1_MUX_BATSNS_RES	0x00</div><div class='del'>-#define PCF50633_ADCC1_MUX_BATSNS_SUBTR	0x10</div><div class='del'>-#define PCF50633_ADCC1_MUX_ADCIN2_RES	0x20</div><div class='del'>-#define PCF50633_ADCC1_MUX_ADCIN2_SUBTR	0x30</div><div class='del'>-#define PCF50633_ADCC1_MUX_BATTEMP	0x60</div><div class='del'>-#define PCF50633_ADCC1_MUX_ADCIN1	0x70</div><div class='del'>-#define PCF50633_ADCC1_AVERAGE_MASK	0x0c</div><div class='del'>-#define PCF50633_ADCC1_ADCMUX_MASK	0xf0</div><div class='del'>-</div><div class='del'>-#define PCF50633_ADCC2_RATIO_NONE	0x00</div><div class='del'>-#define PCF50633_ADCC2_RATIO_BATTEMP	0x01</div><div class='del'>-#define PCF50633_ADCC2_RATIO_ADCIN1	0x02</div><div class='del'>-#define PCF50633_ADCC2_RATIO_BOTH	0x03</div><div class='del'>-#define PCF50633_ADCC2_RATIOSETTL_100US 0x04</div><div class='del'>-</div><div class='del'>-#define PCF50633_ADCC3_ACCSW_EN		0x01</div><div class='del'>-#define PCF50633_ADCC3_NTCSW_EN		0x04</div><div class='del'>-#define PCF50633_ADCC3_RES_DIV_TWO	0x10</div><div class='del'>-#define PCF50633_ADCC3_RES_DIV_THREE	0x00</div><div class='del'>-</div><div class='del'>-#define PCF50633_ADCS3_REF_NTCSW	0x00</div><div class='del'>-#define PCF50633_ADCS3_REF_ACCSW	0x10</div><div class='del'>-#define PCF50633_ADCS3_REF_2V0		0x20</div><div class='del'>-#define PCF50633_ADCS3_REF_VISA		0x30</div><div class='del'>-#define PCF50633_ADCS3_REF_2V0_2	0x70</div><div class='del'>-#define PCF50633_ADCS3_ADCRDY		0x80</div><div class='del'>-</div><div class='del'>-#define PCF50633_ADCS3_ADCDAT1L_MASK	0x03</div><div class='del'>-#define PCF50633_ADCS3_ADCDAT2L_MASK	0x0c</div><div class='del'>-#define PCF50633_ADCS3_ADCDAT2L_SHIFT	2</div><div class='del'>-#define PCF50633_ASCS3_REF_MASK		0x70</div><div class='del'>-</div><div class='del'>-extern int</div><div class='del'>-pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg,</div><div class='del'>-		void (*callback)(struct pcf50633 *, void *, int),</div><div class='del'>-		void *callback_param);</div><div class='del'>-extern int</div><div class='del'>-pcf50633_adc_sync_read(struct pcf50633 *pcf, int mux, int avg);</div><div class='del'>-</div><div class='del'>-#endif /* __LINUX_PCF50633_ADC_H */</div><div class='head'>diff --git a/include/linux/mfd/pcf50633/backlight.h b/include/linux/mfd/pcf50633/backlight.h<br/>deleted file mode 100644<br/>index fd4a4f8d6c13..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/pcf50633/backlight.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/backlight.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2009-2010, Lars-Peter Clausen &lt;lars@metafoo.de&gt;</div><div class='del'>- *      PCF50633 backlight device driver</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_MFD_PCF50633_BACKLIGHT</div><div class='del'>-#define __LINUX_MFD_PCF50633_BACKLIGHT</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-* @default_brightness: Backlight brightness is initialized to this value</div><div class='del'>-*</div><div class='del'>-* Brightness to be used after the driver has been probed.</div><div class='del'>-* Valid range 0-63.</div><div class='del'>-*</div><div class='del'>-* @default_brightness_limit: The actual brightness is limited by this value</div><div class='del'>-*</div><div class='del'>-* Brightness limit to be used after the driver has been probed. This is useful</div><div class='del'>-* when it is not known how much power is available for the backlight during</div><div class='del'>-* probe.</div><div class='del'>-* Valid range 0-63. Can be changed later with pcf50633_bl_set_brightness_limit.</div><div class='del'>-*</div><div class='del'>-* @ramp_time: Display ramp time when changing brightness</div><div class='del'>-*</div><div class='del'>-* When changing the backlights brightness the change is not instant, instead</div><div class='del'>-* it fades smooth from one state to another. This value specifies how long</div><div class='del'>-* the fade should take. The lower the value the higher the fade time.</div><div class='del'>-* Valid range 0-255</div><div class='del'>-*/</div><div class='del'>-struct pcf50633_bl_platform_data {</div><div class='del'>-	unsigned int	default_brightness;</div><div class='del'>-	unsigned int	default_brightness_limit;</div><div class='del'>-	uint8_t		ramp_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct pcf50633;</div><div class='del'>-</div><div class='del'>-int pcf50633_bl_set_brightness_limit(struct pcf50633 *pcf, unsigned int limit);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h<br/>deleted file mode 100644<br/>index 539f27f8bd89..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/pcf50633/core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/core.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,232 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * core.h  -- Core driver for NXP PCF50633</div><div class='del'>- *</div><div class='del'>- * (C) 2006-2008 by Openmoko, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_MFD_PCF50633_CORE_H</div><div class='del'>-#define __LINUX_MFD_PCF50633_CORE_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/regulator/driver.h&gt;</div><div class='del'>-#include &lt;linux/regulator/machine.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;linux/power_supply.h&gt;</div><div class='del'>-#include &lt;linux/mfd/pcf50633/backlight.h&gt;</div><div class='del'>-</div><div class='del'>-struct pcf50633;</div><div class='del'>-struct regmap;</div><div class='del'>-</div><div class='del'>-#define PCF50633_NUM_REGULATORS	11</div><div class='del'>-</div><div class='del'>-struct pcf50633_platform_data {</div><div class='del'>-	struct regulator_init_data reg_init_data[PCF50633_NUM_REGULATORS];</div><div class='del'>-</div><div class='del'>-	char **batteries;</div><div class='del'>-	int num_batteries;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Should be set accordingly to the reference resistor used, see</div><div class='del'>-	 * I_{ch(ref)} charger reference current in the pcf50633 User</div><div class='del'>-	 * Manual.</div><div class='del'>-	 */</div><div class='del'>-	int charger_reference_current_ma;</div><div class='del'>-</div><div class='del'>-	/* Callbacks */</div><div class='del'>-	void (*probe_done)(struct pcf50633 *);</div><div class='del'>-	void (*mbc_event_callback)(struct pcf50633 *, int);</div><div class='del'>-	void (*regulator_registered)(struct pcf50633 *, int);</div><div class='del'>-	void (*force_shutdown)(struct pcf50633 *);</div><div class='del'>-</div><div class='del'>-	u8 resumers[5];</div><div class='del'>-</div><div class='del'>-	struct pcf50633_bl_platform_data *backlight_data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pcf50633_irq {</div><div class='del'>-	void (*handler) (int, void *);</div><div class='del'>-	void *data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int pcf50633_register_irq(struct pcf50633 *pcf, int irq,</div><div class='del'>-			void (*handler) (int, void *), void *data);</div><div class='del'>-int pcf50633_free_irq(struct pcf50633 *pcf, int irq);</div><div class='del'>-</div><div class='del'>-int pcf50633_irq_mask(struct pcf50633 *pcf, int irq);</div><div class='del'>-int pcf50633_irq_unmask(struct pcf50633 *pcf, int irq);</div><div class='del'>-int pcf50633_irq_mask_get(struct pcf50633 *pcf, int irq);</div><div class='del'>-</div><div class='del'>-int pcf50633_read_block(struct pcf50633 *, u8 reg,</div><div class='del'>-					int nr_regs, u8 *data);</div><div class='del'>-int pcf50633_write_block(struct pcf50633 *pcf, u8 reg,</div><div class='del'>-					int nr_regs, u8 *data);</div><div class='del'>-u8 pcf50633_reg_read(struct pcf50633 *, u8 reg);</div><div class='del'>-int pcf50633_reg_write(struct pcf50633 *pcf, u8 reg, u8 val);</div><div class='del'>-</div><div class='del'>-int pcf50633_reg_set_bit_mask(struct pcf50633 *pcf, u8 reg, u8 mask, u8 val);</div><div class='del'>-int pcf50633_reg_clear_bits(struct pcf50633 *pcf, u8 reg, u8 bits);</div><div class='del'>-</div><div class='del'>-/* Interrupt registers */</div><div class='del'>-</div><div class='del'>-#define PCF50633_REG_INT1	0x02</div><div class='del'>-#define PCF50633_REG_INT2	0x03</div><div class='del'>-#define PCF50633_REG_INT3	0x04</div><div class='del'>-#define PCF50633_REG_INT4	0x05</div><div class='del'>-#define PCF50633_REG_INT5	0x06</div><div class='del'>-</div><div class='del'>-#define PCF50633_REG_INT1M	0x07</div><div class='del'>-#define PCF50633_REG_INT2M	0x08</div><div class='del'>-#define PCF50633_REG_INT3M	0x09</div><div class='del'>-#define PCF50633_REG_INT4M	0x0a</div><div class='del'>-#define PCF50633_REG_INT5M	0x0b</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	/* Chip IRQs */</div><div class='del'>-	PCF50633_IRQ_ADPINS,</div><div class='del'>-	PCF50633_IRQ_ADPREM,</div><div class='del'>-	PCF50633_IRQ_USBINS,</div><div class='del'>-	PCF50633_IRQ_USBREM,</div><div class='del'>-	PCF50633_IRQ_RESERVED1,</div><div class='del'>-	PCF50633_IRQ_RESERVED2,</div><div class='del'>-	PCF50633_IRQ_ALARM,</div><div class='del'>-	PCF50633_IRQ_SECOND,</div><div class='del'>-	PCF50633_IRQ_ONKEYR,</div><div class='del'>-	PCF50633_IRQ_ONKEYF,</div><div class='del'>-	PCF50633_IRQ_EXTON1R,</div><div class='del'>-	PCF50633_IRQ_EXTON1F,</div><div class='del'>-	PCF50633_IRQ_EXTON2R,</div><div class='del'>-	PCF50633_IRQ_EXTON2F,</div><div class='del'>-	PCF50633_IRQ_EXTON3R,</div><div class='del'>-	PCF50633_IRQ_EXTON3F,</div><div class='del'>-	PCF50633_IRQ_BATFULL,</div><div class='del'>-	PCF50633_IRQ_CHGHALT,</div><div class='del'>-	PCF50633_IRQ_THLIMON,</div><div class='del'>-	PCF50633_IRQ_THLIMOFF,</div><div class='del'>-	PCF50633_IRQ_USBLIMON,</div><div class='del'>-	PCF50633_IRQ_USBLIMOFF,</div><div class='del'>-	PCF50633_IRQ_ADCRDY,</div><div class='del'>-	PCF50633_IRQ_ONKEY1S,</div><div class='del'>-	PCF50633_IRQ_LOWSYS,</div><div class='del'>-	PCF50633_IRQ_LOWBAT,</div><div class='del'>-	PCF50633_IRQ_HIGHTMP,</div><div class='del'>-	PCF50633_IRQ_AUTOPWRFAIL,</div><div class='del'>-	PCF50633_IRQ_DWN1PWRFAIL,</div><div class='del'>-	PCF50633_IRQ_DWN2PWRFAIL,</div><div class='del'>-	PCF50633_IRQ_LEDPWRFAIL,</div><div class='del'>-	PCF50633_IRQ_LEDOVP,</div><div class='del'>-	PCF50633_IRQ_LDO1PWRFAIL,</div><div class='del'>-	PCF50633_IRQ_LDO2PWRFAIL,</div><div class='del'>-	PCF50633_IRQ_LDO3PWRFAIL,</div><div class='del'>-	PCF50633_IRQ_LDO4PWRFAIL,</div><div class='del'>-	PCF50633_IRQ_LDO5PWRFAIL,</div><div class='del'>-	PCF50633_IRQ_LDO6PWRFAIL,</div><div class='del'>-	PCF50633_IRQ_HCLDOPWRFAIL,</div><div class='del'>-	PCF50633_IRQ_HCLDOOVL,</div><div class='del'>-</div><div class='del'>-	/* Always last */</div><div class='del'>-	PCF50633_NUM_IRQ,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pcf50633 {</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct regmap *regmap;</div><div class='del'>-</div><div class='del'>-	struct pcf50633_platform_data *pdata;</div><div class='del'>-	int irq;</div><div class='del'>-	struct pcf50633_irq irq_handler[PCF50633_NUM_IRQ];</div><div class='del'>-	struct work_struct irq_work;</div><div class='del'>-	struct workqueue_struct *work_queue;</div><div class='del'>-	struct mutex lock;</div><div class='del'>-</div><div class='del'>-	u8 mask_regs[5];</div><div class='del'>-</div><div class='del'>-	u8 suspend_irq_masks[5];</div><div class='del'>-	u8 resume_reason[5];</div><div class='del'>-	int is_suspended;</div><div class='del'>-</div><div class='del'>-	int onkey1s_held;</div><div class='del'>-</div><div class='del'>-	struct platform_device *rtc_pdev;</div><div class='del'>-	struct platform_device *mbc_pdev;</div><div class='del'>-	struct platform_device *adc_pdev;</div><div class='del'>-	struct platform_device *input_pdev;</div><div class='del'>-	struct platform_device *bl_pdev;</div><div class='del'>-	struct platform_device *regulator_pdev[PCF50633_NUM_REGULATORS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_int1 {</div><div class='del'>-	PCF50633_INT1_ADPINS	= 0x01,	/* Adapter inserted */</div><div class='del'>-	PCF50633_INT1_ADPREM	= 0x02,	/* Adapter removed */</div><div class='del'>-	PCF50633_INT1_USBINS	= 0x04,	/* USB inserted */</div><div class='del'>-	PCF50633_INT1_USBREM	= 0x08,	/* USB removed */</div><div class='del'>-	/* reserved */</div><div class='del'>-	PCF50633_INT1_ALARM	= 0x40, /* RTC alarm time is reached */</div><div class='del'>-	PCF50633_INT1_SECOND	= 0x80,	/* RTC periodic second interrupt */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_int2 {</div><div class='del'>-	PCF50633_INT2_ONKEYR	= 0x01, /* ONKEY rising edge */</div><div class='del'>-	PCF50633_INT2_ONKEYF	= 0x02, /* ONKEY falling edge */</div><div class='del'>-	PCF50633_INT2_EXTON1R	= 0x04, /* EXTON1 rising edge */</div><div class='del'>-	PCF50633_INT2_EXTON1F	= 0x08, /* EXTON1 falling edge */</div><div class='del'>-	PCF50633_INT2_EXTON2R	= 0x10, /* EXTON2 rising edge */</div><div class='del'>-	PCF50633_INT2_EXTON2F	= 0x20, /* EXTON2 falling edge */</div><div class='del'>-	PCF50633_INT2_EXTON3R	= 0x40, /* EXTON3 rising edge */</div><div class='del'>-	PCF50633_INT2_EXTON3F	= 0x80, /* EXTON3 falling edge */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_int3 {</div><div class='del'>-	PCF50633_INT3_BATFULL	= 0x01, /* Battery full */</div><div class='del'>-	PCF50633_INT3_CHGHALT	= 0x02,	/* Charger halt */</div><div class='del'>-	PCF50633_INT3_THLIMON	= 0x04,</div><div class='del'>-	PCF50633_INT3_THLIMOFF	= 0x08,</div><div class='del'>-	PCF50633_INT3_USBLIMON	= 0x10,</div><div class='del'>-	PCF50633_INT3_USBLIMOFF	= 0x20,</div><div class='del'>-	PCF50633_INT3_ADCRDY	= 0x40, /* ADC result ready */</div><div class='del'>-	PCF50633_INT3_ONKEY1S	= 0x80,	/* ONKEY pressed 1 second */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_int4 {</div><div class='del'>-	PCF50633_INT4_LOWSYS		= 0x01,</div><div class='del'>-	PCF50633_INT4_LOWBAT		= 0x02,</div><div class='del'>-	PCF50633_INT4_HIGHTMP		= 0x04,</div><div class='del'>-	PCF50633_INT4_AUTOPWRFAIL	= 0x08,</div><div class='del'>-	PCF50633_INT4_DWN1PWRFAIL	= 0x10,</div><div class='del'>-	PCF50633_INT4_DWN2PWRFAIL	= 0x20,</div><div class='del'>-	PCF50633_INT4_LEDPWRFAIL	= 0x40,</div><div class='del'>-	PCF50633_INT4_LEDOVP		= 0x80,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_int5 {</div><div class='del'>-	PCF50633_INT5_LDO1PWRFAIL	= 0x01,</div><div class='del'>-	PCF50633_INT5_LDO2PWRFAIL	= 0x02,</div><div class='del'>-	PCF50633_INT5_LDO3PWRFAIL	= 0x04,</div><div class='del'>-	PCF50633_INT5_LDO4PWRFAIL	= 0x08,</div><div class='del'>-	PCF50633_INT5_LDO5PWRFAIL	= 0x10,</div><div class='del'>-	PCF50633_INT5_LDO6PWRFAIL	= 0x20,</div><div class='del'>-	PCF50633_INT5_HCLDOPWRFAIL	= 0x40,</div><div class='del'>-	PCF50633_INT5_HCLDOOVL		= 0x80,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* misc. registers */</div><div class='del'>-#define PCF50633_REG_OOCSHDWN	0x0c</div><div class='del'>-</div><div class='del'>-/* LED registers */</div><div class='del'>-#define PCF50633_REG_LEDOUT 0x28</div><div class='del'>-#define PCF50633_REG_LEDENA 0x29</div><div class='del'>-#define PCF50633_REG_LEDCTL 0x2a</div><div class='del'>-#define PCF50633_REG_LEDDIM 0x2b</div><div class='del'>-</div><div class='del'>-static inline struct pcf50633 *dev_to_pcf50633(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev_get_drvdata(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int pcf50633_irq_init(struct pcf50633 *pcf, int irq);</div><div class='del'>-void pcf50633_irq_free(struct pcf50633 *pcf);</div><div class='del'>-extern const struct dev_pm_ops pcf50633_pm;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/mfd/pcf50633/gpio.h b/include/linux/mfd/pcf50633/gpio.h<br/>deleted file mode 100644<br/>index f589e35795f1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/pcf50633/gpio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/gpio.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * gpio.h -- GPIO driver for NXP PCF50633</div><div class='del'>- *</div><div class='del'>- * (C) 2006-2008 by Openmoko, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_MFD_PCF50633_GPIO_H</div><div class='del'>-#define __LINUX_MFD_PCF50633_GPIO_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mfd/pcf50633/core.h&gt;</div><div class='del'>-</div><div class='del'>-#define PCF50633_GPIO1		1</div><div class='del'>-#define PCF50633_GPIO2		2</div><div class='del'>-#define PCF50633_GPIO3		3</div><div class='del'>-#define PCF50633_GPO		4</div><div class='del'>-</div><div class='del'>-#define PCF50633_REG_GPIO1CFG	0x14</div><div class='del'>-#define PCF50633_REG_GPIO2CFG	0x15</div><div class='del'>-#define PCF50633_REG_GPIO3CFG	0x16</div><div class='del'>-#define PCF50633_REG_GPOCFG 	0x17</div><div class='del'>-</div><div class='del'>-#define PCF50633_GPOCFG_GPOSEL_MASK	0x07</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_gpocfg {</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_0	= 0x00,</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_LED_NFET	= 0x01,</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_SYSxOK	= 0x02,</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_CLK32K	= 0x03,</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_ADAPUSB	= 0x04,</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_USBxOK	= 0x05,</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_ACTPH4	= 0x06,</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_1	= 0x07,</div><div class='del'>-	PCF50633_GPOCFG_GPOSEL_INVERSE	= 0x08,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, u8 val);</div><div class='del'>-u8 pcf50633_gpio_get(struct pcf50633 *pcf, int gpio);</div><div class='del'>-</div><div class='del'>-int pcf50633_gpio_invert_set(struct pcf50633 *, int gpio, int invert);</div><div class='del'>-int pcf50633_gpio_invert_get(struct pcf50633 *pcf, int gpio);</div><div class='del'>-</div><div class='del'>-int pcf50633_gpio_power_supply_set(struct pcf50633 *,</div><div class='del'>-					int gpio, int regulator, int on);</div><div class='del'>-#endif /* __LINUX_MFD_PCF50633_GPIO_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h<br/>deleted file mode 100644<br/>index fa5cb9256d99..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/pcf50633/mbc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/mbc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,130 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * mbc.h  -- Driver for NXP PCF50633 Main Battery Charger</div><div class='del'>- *</div><div class='del'>- * (C) 2006-2008 by Openmoko, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_MFD_PCF50633_MBC_H</div><div class='del'>-#define __LINUX_MFD_PCF50633_MBC_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mfd/pcf50633/core.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#define PCF50633_REG_MBCC1	0x43</div><div class='del'>-#define PCF50633_REG_MBCC2	0x44</div><div class='del'>-#define PCF50633_REG_MBCC3	0x45</div><div class='del'>-#define PCF50633_REG_MBCC4	0x46</div><div class='del'>-#define PCF50633_REG_MBCC5	0x47</div><div class='del'>-#define PCF50633_REG_MBCC6	0x48</div><div class='del'>-#define PCF50633_REG_MBCC7	0x49</div><div class='del'>-#define PCF50633_REG_MBCC8	0x4a</div><div class='del'>-#define PCF50633_REG_MBCS1	0x4b</div><div class='del'>-#define PCF50633_REG_MBCS2	0x4c</div><div class='del'>-#define PCF50633_REG_MBCS3	0x4d</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_mbcc1 {</div><div class='del'>-	PCF50633_MBCC1_CHGENA		= 0x01,	/* Charger enable */</div><div class='del'>-	PCF50633_MBCC1_AUTOSTOP		= 0x02,</div><div class='del'>-	PCF50633_MBCC1_AUTORES		= 0x04, /* automatic resume */</div><div class='del'>-	PCF50633_MBCC1_RESUME		= 0x08, /* explicit resume cmd */</div><div class='del'>-	PCF50633_MBCC1_RESTART		= 0x10, /* restart charging */</div><div class='del'>-	PCF50633_MBCC1_PREWDTIME_60M	= 0x20,	/* max. precharging time */</div><div class='del'>-	PCF50633_MBCC1_WDTIME_1H	= 0x00,</div><div class='del'>-	PCF50633_MBCC1_WDTIME_2H	= 0x40,</div><div class='del'>-	PCF50633_MBCC1_WDTIME_4H	= 0x80,</div><div class='del'>-	PCF50633_MBCC1_WDTIME_6H	= 0xc0,</div><div class='del'>-};</div><div class='del'>-#define PCF50633_MBCC1_WDTIME_MASK	  0xc0</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_mbcc2 {</div><div class='del'>-	PCF50633_MBCC2_VBATCOND_2V7	= 0x00,</div><div class='del'>-	PCF50633_MBCC2_VBATCOND_2V85	= 0x01,</div><div class='del'>-	PCF50633_MBCC2_VBATCOND_3V0	= 0x02,</div><div class='del'>-	PCF50633_MBCC2_VBATCOND_3V15	= 0x03,</div><div class='del'>-	PCF50633_MBCC2_VMAX_4V		= 0x00,</div><div class='del'>-	PCF50633_MBCC2_VMAX_4V20	= 0x28,</div><div class='del'>-	PCF50633_MBCC2_VRESDEBTIME_64S	= 0x80,	/* debounce time (32/64sec) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_mbcc7 {</div><div class='del'>-	PCF50633_MBCC7_USB_100mA	= 0x00,</div><div class='del'>-	PCF50633_MBCC7_USB_500mA	= 0x01,</div><div class='del'>-	PCF50633_MBCC7_USB_1000mA	= 0x02,</div><div class='del'>-	PCF50633_MBCC7_USB_SUSPEND	= 0x03,</div><div class='del'>-	PCF50633_MBCC7_BATTEMP_EN	= 0x04,</div><div class='del'>-	PCF50633_MBCC7_BATSYSIMAX_1A6	= 0x00,</div><div class='del'>-	PCF50633_MBCC7_BATSYSIMAX_1A8	= 0x40,</div><div class='del'>-	PCF50633_MBCC7_BATSYSIMAX_2A0	= 0x80,</div><div class='del'>-	PCF50633_MBCC7_BATSYSIMAX_2A2	= 0xc0,</div><div class='del'>-};</div><div class='del'>-#define PCF50633_MBCC7_USB_MASK 0x03</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_mbcc8 {</div><div class='del'>-	PCF50633_MBCC8_USBENASUS	= 0x10,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_mbcs1 {</div><div class='del'>-	PCF50633_MBCS1_USBPRES		= 0x01,</div><div class='del'>-	PCF50633_MBCS1_USBOK		= 0x02,</div><div class='del'>-	PCF50633_MBCS1_ADAPTPRES	= 0x04,</div><div class='del'>-	PCF50633_MBCS1_ADAPTOK		= 0x08,</div><div class='del'>-	PCF50633_MBCS1_TBAT_OK		= 0x00,</div><div class='del'>-	PCF50633_MBCS1_TBAT_ABOVE	= 0x10,</div><div class='del'>-	PCF50633_MBCS1_TBAT_BELOW	= 0x20,</div><div class='del'>-	PCF50633_MBCS1_TBAT_UNDEF	= 0x30,</div><div class='del'>-	PCF50633_MBCS1_PREWDTEXP	= 0x40,</div><div class='del'>-	PCF50633_MBCS1_WDTEXP		= 0x80,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_mbcs2_mbcmod {</div><div class='del'>-	PCF50633_MBCS2_MBC_PLAY		= 0x00,</div><div class='del'>-	PCF50633_MBCS2_MBC_USB_PRE	= 0x01,</div><div class='del'>-	PCF50633_MBCS2_MBC_USB_PRE_WAIT	= 0x02,</div><div class='del'>-	PCF50633_MBCS2_MBC_USB_FAST	= 0x03,</div><div class='del'>-	PCF50633_MBCS2_MBC_USB_FAST_WAIT = 0x04,</div><div class='del'>-	PCF50633_MBCS2_MBC_USB_SUSPEND	= 0x05,</div><div class='del'>-	PCF50633_MBCS2_MBC_ADP_PRE	= 0x06,</div><div class='del'>-	PCF50633_MBCS2_MBC_ADP_PRE_WAIT	= 0x07,</div><div class='del'>-	PCF50633_MBCS2_MBC_ADP_FAST	= 0x08,</div><div class='del'>-	PCF50633_MBCS2_MBC_ADP_FAST_WAIT = 0x09,</div><div class='del'>-	PCF50633_MBCS2_MBC_BAT_FULL	= 0x0a,</div><div class='del'>-	PCF50633_MBCS2_MBC_HALT		= 0x0b,</div><div class='del'>-};</div><div class='del'>-#define PCF50633_MBCS2_MBC_MASK		0x0f</div><div class='del'>-enum pcf50633_reg_mbcs2_chgstat {</div><div class='del'>-	PCF50633_MBCS2_CHGS_NONE	= 0x00,</div><div class='del'>-	PCF50633_MBCS2_CHGS_ADAPTER	= 0x10,</div><div class='del'>-	PCF50633_MBCS2_CHGS_USB		= 0x20,</div><div class='del'>-	PCF50633_MBCS2_CHGS_BOTH	= 0x30,</div><div class='del'>-};</div><div class='del'>-#define PCF50633_MBCS2_RESSTAT_AUTO	0x40</div><div class='del'>-</div><div class='del'>-enum pcf50633_reg_mbcs3 {</div><div class='del'>-	PCF50633_MBCS3_USBLIM_PLAY	= 0x01,</div><div class='del'>-	PCF50633_MBCS3_USBLIM_CGH	= 0x02,</div><div class='del'>-	PCF50633_MBCS3_TLIM_PLAY	= 0x04,</div><div class='del'>-	PCF50633_MBCS3_TLIM_CHG		= 0x08,</div><div class='del'>-	PCF50633_MBCS3_ILIM		= 0x10,	/* 1: Ibat &gt; Icutoff */</div><div class='del'>-	PCF50633_MBCS3_VLIM		= 0x20,	/* 1: Vbat == Vmax */</div><div class='del'>-	PCF50633_MBCS3_VBATSTAT		= 0x40,	/* 1: Vbat &gt; Vbatcond */</div><div class='del'>-	PCF50633_MBCS3_VRES		= 0x80, /* 1: Vbat &gt; Vth(RES) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PCF50633_MBCC2_VBATCOND_MASK	  0x03</div><div class='del'>-#define PCF50633_MBCC2_VMAX_MASK	  0x3c</div><div class='del'>-</div><div class='del'>-/* Charger status */</div><div class='del'>-#define PCF50633_MBC_USB_ONLINE		0x01</div><div class='del'>-#define PCF50633_MBC_USB_ACTIVE		0x02</div><div class='del'>-#define PCF50633_MBC_ADAPTER_ONLINE	0x04</div><div class='del'>-#define PCF50633_MBC_ADAPTER_ACTIVE	0x08</div><div class='del'>-</div><div class='del'>-int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma);</div><div class='del'>-</div><div class='del'>-int pcf50633_mbc_get_status(struct pcf50633 *);</div><div class='del'>-int pcf50633_mbc_get_usb_online_status(struct pcf50633 *);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/include/linux/mfd/pcf50633/pmic.h b/include/linux/mfd/pcf50633/pmic.h<br/>deleted file mode 100644<br/>index eac0c3d8e984..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/pcf50633/pmic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/pcf50633/pmic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __LINUX_MFD_PCF50633_PMIC_H</div><div class='del'>-#define __LINUX_MFD_PCF50633_PMIC_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mfd/pcf50633/core.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#define PCF50633_REG_AUTOOUT	0x1a</div><div class='del'>-#define PCF50633_REG_AUTOENA	0x1b</div><div class='del'>-#define PCF50633_REG_AUTOCTL	0x1c</div><div class='del'>-#define PCF50633_REG_AUTOMXC	0x1d</div><div class='del'>-#define PCF50633_REG_DOWN1OUT	0x1e</div><div class='del'>-#define PCF50633_REG_DOWN1ENA	0x1f</div><div class='del'>-#define PCF50633_REG_DOWN1CTL	0x20</div><div class='del'>-#define PCF50633_REG_DOWN1MXC	0x21</div><div class='del'>-#define PCF50633_REG_DOWN2OUT	0x22</div><div class='del'>-#define PCF50633_REG_DOWN2ENA	0x23</div><div class='del'>-#define PCF50633_REG_DOWN2CTL	0x24</div><div class='del'>-#define PCF50633_REG_DOWN2MXC	0x25</div><div class='del'>-#define PCF50633_REG_MEMLDOOUT	0x26</div><div class='del'>-#define PCF50633_REG_MEMLDOENA	0x27</div><div class='del'>-#define PCF50633_REG_LDO1OUT	0x2d</div><div class='del'>-#define PCF50633_REG_LDO1ENA	0x2e</div><div class='del'>-#define PCF50633_REG_LDO2OUT	0x2f</div><div class='del'>-#define PCF50633_REG_LDO2ENA	0x30</div><div class='del'>-#define PCF50633_REG_LDO3OUT	0x31</div><div class='del'>-#define PCF50633_REG_LDO3ENA	0x32</div><div class='del'>-#define PCF50633_REG_LDO4OUT	0x33</div><div class='del'>-#define PCF50633_REG_LDO4ENA	0x34</div><div class='del'>-#define PCF50633_REG_LDO5OUT	0x35</div><div class='del'>-#define PCF50633_REG_LDO5ENA	0x36</div><div class='del'>-#define PCF50633_REG_LDO6OUT	0x37</div><div class='del'>-#define PCF50633_REG_LDO6ENA	0x38</div><div class='del'>-#define PCF50633_REG_HCLDOOUT	0x39</div><div class='del'>-#define PCF50633_REG_HCLDOENA	0x3a</div><div class='del'>-#define PCF50633_REG_HCLDOOVL	0x40</div><div class='del'>-</div><div class='del'>-enum pcf50633_regulator_enable {</div><div class='del'>-	PCF50633_REGULATOR_ON		= 0x01,</div><div class='del'>-	PCF50633_REGULATOR_ON_GPIO1	= 0x02,</div><div class='del'>-	PCF50633_REGULATOR_ON_GPIO2	= 0x04,</div><div class='del'>-	PCF50633_REGULATOR_ON_GPIO3	= 0x08,</div><div class='del'>-};</div><div class='del'>-#define PCF50633_REGULATOR_ON_MASK	0x0f</div><div class='del'>-</div><div class='del'>-enum pcf50633_regulator_phase {</div><div class='del'>-	PCF50633_REGULATOR_ACTPH1	= 0x00,</div><div class='del'>-	PCF50633_REGULATOR_ACTPH2	= 0x10,</div><div class='del'>-	PCF50633_REGULATOR_ACTPH3	= 0x20,</div><div class='del'>-	PCF50633_REGULATOR_ACTPH4	= 0x30,</div><div class='del'>-};</div><div class='del'>-#define PCF50633_REGULATOR_ACTPH_MASK	0x30</div><div class='del'>-</div><div class='del'>-enum pcf50633_regulator_id {</div><div class='del'>-	PCF50633_REGULATOR_AUTO,</div><div class='del'>-	PCF50633_REGULATOR_DOWN1,</div><div class='del'>-	PCF50633_REGULATOR_DOWN2,</div><div class='del'>-	PCF50633_REGULATOR_LDO1,</div><div class='del'>-	PCF50633_REGULATOR_LDO2,</div><div class='del'>-	PCF50633_REGULATOR_LDO3,</div><div class='del'>-	PCF50633_REGULATOR_LDO4,</div><div class='del'>-	PCF50633_REGULATOR_LDO5,</div><div class='del'>-	PCF50633_REGULATOR_LDO6,</div><div class='del'>-	PCF50633_REGULATOR_HCLDO,</div><div class='del'>-	PCF50633_REGULATOR_MEMLDO,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/include/linux/mfd/pf1550.h b/include/linux/mfd/pf1550.h<br/>new file mode 100644<br/>index 000000000000..7cb2340ff2bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/pf1550.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/pf1550.h</a></div><div class='hunk'>@@ -0,0 +1,273 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Declarations for the PF1550 PMIC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2016 Freescale Semiconductor, Inc.</div><div class='add'>+ * Robin Gong &lt;yibin.gong@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Portions Copyright (c) 2025 Savoir-faire Linux Inc.</div><div class='add'>+ * Samuel Kayode &lt;samuel.kayode@savoirfairelinux.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_MFD_PF1550_H</div><div class='add'>+#define __LINUX_MFD_PF1550_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+enum pf1550_pmic_reg {</div><div class='add'>+	/* PMIC regulator part */</div><div class='add'>+	PF1550_PMIC_REG_DEVICE_ID		= 0x00,</div><div class='add'>+	PF1550_PMIC_REG_OTP_FLAVOR		= 0x01,</div><div class='add'>+	PF1550_PMIC_REG_SILICON_REV		= 0x02,</div><div class='add'>+</div><div class='add'>+	PF1550_PMIC_REG_INT_CATEGORY		= 0x06,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_STAT0		= 0x08,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_MASK0		= 0x09,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_SENSE0		= 0x0a,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_STAT1		= 0x0b,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_MASK1		= 0x0c,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_SENSE1		= 0x0d,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_STAT2		= 0x0e,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_MASK2		= 0x0f,</div><div class='add'>+	PF1550_PMIC_REG_SW_INT_SENSE2		= 0x10,</div><div class='add'>+	PF1550_PMIC_REG_LDO_INT_STAT0		= 0x18,</div><div class='add'>+	PF1550_PMIC_REG_LDO_INT_MASK0		= 0x19,</div><div class='add'>+	PF1550_PMIC_REG_LDO_INT_SENSE0		= 0x1a,</div><div class='add'>+	PF1550_PMIC_REG_TEMP_INT_STAT0		= 0x20,</div><div class='add'>+	PF1550_PMIC_REG_TEMP_INT_MASK0		= 0x21,</div><div class='add'>+	PF1550_PMIC_REG_TEMP_INT_SENSE0		= 0x22,</div><div class='add'>+	PF1550_PMIC_REG_ONKEY_INT_STAT0		= 0x24,</div><div class='add'>+	PF1550_PMIC_REG_ONKEY_INT_MASK0		= 0x25,</div><div class='add'>+	PF1550_PMIC_REG_ONKEY_INT_SENSE0	= 0x26,</div><div class='add'>+	PF1550_PMIC_REG_MISC_INT_STAT0		= 0x28,</div><div class='add'>+	PF1550_PMIC_REG_MISC_INT_MASK0		= 0x29,</div><div class='add'>+	PF1550_PMIC_REG_MISC_INT_SENSE0		= 0x2a,</div><div class='add'>+</div><div class='add'>+	PF1550_PMIC_REG_COINCELL_CONTROL	= 0x30,</div><div class='add'>+</div><div class='add'>+	PF1550_PMIC_REG_SW1_VOLT		= 0x32,</div><div class='add'>+	PF1550_PMIC_REG_SW1_STBY_VOLT		= 0x33,</div><div class='add'>+	PF1550_PMIC_REG_SW1_SLP_VOLT		= 0x34,</div><div class='add'>+	PF1550_PMIC_REG_SW1_CTRL		= 0x35,</div><div class='add'>+	PF1550_PMIC_REG_SW1_CTRL1		= 0x36,</div><div class='add'>+	PF1550_PMIC_REG_SW2_VOLT		= 0x38,</div><div class='add'>+	PF1550_PMIC_REG_SW2_STBY_VOLT		= 0x39,</div><div class='add'>+	PF1550_PMIC_REG_SW2_SLP_VOLT		= 0x3a,</div><div class='add'>+	PF1550_PMIC_REG_SW2_CTRL		= 0x3b,</div><div class='add'>+	PF1550_PMIC_REG_SW2_CTRL1		= 0x3c,</div><div class='add'>+	PF1550_PMIC_REG_SW3_VOLT		= 0x3e,</div><div class='add'>+	PF1550_PMIC_REG_SW3_STBY_VOLT		= 0x3f,</div><div class='add'>+	PF1550_PMIC_REG_SW3_SLP_VOLT		= 0x40,</div><div class='add'>+	PF1550_PMIC_REG_SW3_CTRL		= 0x41,</div><div class='add'>+	PF1550_PMIC_REG_SW3_CTRL1		= 0x42,</div><div class='add'>+	PF1550_PMIC_REG_VSNVS_CTRL		= 0x48,</div><div class='add'>+	PF1550_PMIC_REG_VREFDDR_CTRL		= 0x4a,</div><div class='add'>+	PF1550_PMIC_REG_LDO1_VOLT		= 0x4c,</div><div class='add'>+	PF1550_PMIC_REG_LDO1_CTRL		= 0x4d,</div><div class='add'>+	PF1550_PMIC_REG_LDO2_VOLT		= 0x4f,</div><div class='add'>+	PF1550_PMIC_REG_LDO2_CTRL		= 0x50,</div><div class='add'>+	PF1550_PMIC_REG_LDO3_VOLT		= 0x52,</div><div class='add'>+	PF1550_PMIC_REG_LDO3_CTRL		= 0x53,</div><div class='add'>+	PF1550_PMIC_REG_PWRCTRL0		= 0x58,</div><div class='add'>+	PF1550_PMIC_REG_PWRCTRL1		= 0x59,</div><div class='add'>+	PF1550_PMIC_REG_PWRCTRL2		= 0x5a,</div><div class='add'>+	PF1550_PMIC_REG_PWRCTRL3		= 0x5b,</div><div class='add'>+	PF1550_PMIC_REG_SW1_PWRDN_SEQ		= 0x5f,</div><div class='add'>+	PF1550_PMIC_REG_SW2_PWRDN_SEQ		= 0x60,</div><div class='add'>+	PF1550_PMIC_REG_SW3_PWRDN_SEQ		= 0x61,</div><div class='add'>+	PF1550_PMIC_REG_LDO1_PWRDN_SEQ		= 0x62,</div><div class='add'>+	PF1550_PMIC_REG_LDO2_PWRDN_SEQ		= 0x63,</div><div class='add'>+	PF1550_PMIC_REG_LDO3_PWRDN_SEQ		= 0x64,</div><div class='add'>+	PF1550_PMIC_REG_VREFDDR_PWRDN_SEQ	= 0x65,</div><div class='add'>+</div><div class='add'>+	PF1550_PMIC_REG_STATE_INFO		= 0x67,</div><div class='add'>+	PF1550_PMIC_REG_I2C_ADDR		= 0x68,</div><div class='add'>+	PF1550_PMIC_REG_IO_DRV0			= 0x69,</div><div class='add'>+	PF1550_PMIC_REG_IO_DRV1			= 0x6a,</div><div class='add'>+	PF1550_PMIC_REG_RC_16MHZ		= 0x6b,</div><div class='add'>+	PF1550_PMIC_REG_KEY			= 0x6f,</div><div class='add'>+</div><div class='add'>+	/* Charger part */</div><div class='add'>+	PF1550_CHARG_REG_CHG_INT		= 0x80,</div><div class='add'>+	PF1550_CHARG_REG_CHG_INT_MASK		= 0x82,</div><div class='add'>+	PF1550_CHARG_REG_CHG_INT_OK		= 0x84,</div><div class='add'>+	PF1550_CHARG_REG_VBUS_SNS		= 0x86,</div><div class='add'>+	PF1550_CHARG_REG_CHG_SNS		= 0x87,</div><div class='add'>+	PF1550_CHARG_REG_BATT_SNS		= 0x88,</div><div class='add'>+	PF1550_CHARG_REG_CHG_OPER		= 0x89,</div><div class='add'>+	PF1550_CHARG_REG_CHG_TMR		= 0x8a,</div><div class='add'>+	PF1550_CHARG_REG_CHG_EOC_CNFG		= 0x8d,</div><div class='add'>+	PF1550_CHARG_REG_CHG_CURR_CNFG		= 0x8e,</div><div class='add'>+	PF1550_CHARG_REG_BATT_REG		= 0x8f,</div><div class='add'>+	PF1550_CHARG_REG_BATFET_CNFG		= 0x91,</div><div class='add'>+	PF1550_CHARG_REG_THM_REG_CNFG		= 0x92,</div><div class='add'>+	PF1550_CHARG_REG_VBUS_INLIM_CNFG	= 0x94,</div><div class='add'>+	PF1550_CHARG_REG_VBUS_LIN_DPM		= 0x95,</div><div class='add'>+	PF1550_CHARG_REG_USB_PHY_LDO_CNFG	= 0x96,</div><div class='add'>+	PF1550_CHARG_REG_DBNC_DELAY_TIME	= 0x98,</div><div class='add'>+	PF1550_CHARG_REG_CHG_INT_CNFG		= 0x99,</div><div class='add'>+	PF1550_CHARG_REG_THM_ADJ_SETTING	= 0x9a,</div><div class='add'>+	PF1550_CHARG_REG_VBUS2SYS_CNFG		= 0x9b,</div><div class='add'>+	PF1550_CHARG_REG_LED_PWM		= 0x9c,</div><div class='add'>+	PF1550_CHARG_REG_FAULT_BATFET_CNFG	= 0x9d,</div><div class='add'>+	PF1550_CHARG_REG_LED_CNFG		= 0x9e,</div><div class='add'>+	PF1550_CHARG_REG_CHGR_KEY2		= 0x9f,</div><div class='add'>+</div><div class='add'>+	PF1550_TEST_REG_FMRADDR			= 0xc4,</div><div class='add'>+	PF1550_TEST_REG_FMRDATA			= 0xc5,</div><div class='add'>+	PF1550_TEST_REG_KEY3			= 0xdf,</div><div class='add'>+</div><div class='add'>+	PF1550_PMIC_REG_END			= 0xff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* One-Time Programmable(OTP) memory */</div><div class='add'>+enum pf1550_otp_reg {</div><div class='add'>+	PF1550_OTP_SW1_SW2			= 0x1e,</div><div class='add'>+	PF1550_OTP_SW2_SW3			= 0x1f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PF1550_DEVICE_ID		0x7c</div><div class='add'>+</div><div class='add'>+/* Keys for reading OTP */</div><div class='add'>+#define PF1550_OTP_PMIC_KEY		0x15</div><div class='add'>+#define PF1550_OTP_CHGR_KEY		0x50</div><div class='add'>+#define PF1550_OTP_TEST_KEY		0xab</div><div class='add'>+</div><div class='add'>+/* Supported charger modes */</div><div class='add'>+#define PF1550_CHG_BAT_OFF		1</div><div class='add'>+#define PF1550_CHG_BAT_ON		2</div><div class='add'>+</div><div class='add'>+#define PF1550_CHG_PRECHARGE		0</div><div class='add'>+#define PF1550_CHG_CONSTANT_CURRENT	1</div><div class='add'>+#define PF1550_CHG_CONSTANT_VOL		2</div><div class='add'>+#define PF1550_CHG_EOC			3</div><div class='add'>+#define PF1550_CHG_DONE			4</div><div class='add'>+#define PF1550_CHG_TIMER_FAULT		6</div><div class='add'>+#define PF1550_CHG_SUSPEND		7</div><div class='add'>+#define PF1550_CHG_OFF_INV		8</div><div class='add'>+#define PF1550_CHG_BAT_OVER		9</div><div class='add'>+#define PF1550_CHG_OFF_TEMP		10</div><div class='add'>+#define PF1550_CHG_LINEAR_ONLY		12</div><div class='add'>+#define PF1550_CHG_SNS_MASK		0xf</div><div class='add'>+#define PF1550_CHG_INT_MASK		0x51</div><div class='add'>+</div><div class='add'>+#define PF1550_BAT_NO_VBUS		0</div><div class='add'>+#define PF1550_BAT_LOW_THAN_PRECHARG	1</div><div class='add'>+#define PF1550_BAT_CHARG_FAIL		2</div><div class='add'>+#define PF1550_BAT_HIGH_THAN_PRECHARG	4</div><div class='add'>+#define PF1550_BAT_OVER_VOL		5</div><div class='add'>+#define PF1550_BAT_NO_DETECT		6</div><div class='add'>+#define PF1550_BAT_SNS_MASK		0x7</div><div class='add'>+</div><div class='add'>+#define PF1550_VBUS_UVLO		BIT(2)</div><div class='add'>+#define PF1550_VBUS_IN2SYS		BIT(3)</div><div class='add'>+#define PF1550_VBUS_OVLO		BIT(4)</div><div class='add'>+#define PF1550_VBUS_VALID		BIT(5)</div><div class='add'>+</div><div class='add'>+#define PF1550_CHARG_REG_BATT_REG_CHGCV_MASK		0x3f</div><div class='add'>+#define PF1550_CHARG_REG_BATT_REG_VMINSYS_SHIFT		6</div><div class='add'>+#define PF1550_CHARG_REG_BATT_REG_VMINSYS_MASK		GENMASK(7, 6)</div><div class='add'>+#define PF1550_CHARG_REG_THM_REG_CNFG_REGTEMP_SHIFT	2</div><div class='add'>+#define PF1550_CHARG_REG_THM_REG_CNFG_REGTEMP_MASK	GENMASK(3, 2)</div><div class='add'>+</div><div class='add'>+#define PF1550_ONKEY_RST_EN		BIT(7)</div><div class='add'>+</div><div class='add'>+/* DVS enable masks */</div><div class='add'>+#define OTP_SW1_DVS_ENB		BIT(1)</div><div class='add'>+#define OTP_SW2_DVS_ENB		BIT(3)</div><div class='add'>+</div><div class='add'>+/* Top level interrupt masks */</div><div class='add'>+#define IRQ_REGULATOR		(BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(6))</div><div class='add'>+#define IRQ_ONKEY		BIT(5)</div><div class='add'>+#define IRQ_CHG			BIT(0)</div><div class='add'>+</div><div class='add'>+/* Regulator interrupt masks */</div><div class='add'>+#define PMIC_IRQ_SW1_LS		BIT(0)</div><div class='add'>+#define PMIC_IRQ_SW2_LS		BIT(1)</div><div class='add'>+#define PMIC_IRQ_SW3_LS		BIT(2)</div><div class='add'>+#define PMIC_IRQ_SW1_HS		BIT(0)</div><div class='add'>+#define PMIC_IRQ_SW2_HS		BIT(1)</div><div class='add'>+#define PMIC_IRQ_SW3_HS		BIT(2)</div><div class='add'>+#define PMIC_IRQ_LDO1_FAULT	BIT(0)</div><div class='add'>+#define PMIC_IRQ_LDO2_FAULT	BIT(1)</div><div class='add'>+#define PMIC_IRQ_LDO3_FAULT	BIT(2)</div><div class='add'>+#define PMIC_IRQ_TEMP_110	BIT(0)</div><div class='add'>+#define PMIC_IRQ_TEMP_125	BIT(1)</div><div class='add'>+</div><div class='add'>+/* Onkey interrupt masks */</div><div class='add'>+#define ONKEY_IRQ_PUSHI		BIT(0)</div><div class='add'>+#define ONKEY_IRQ_1SI		BIT(1)</div><div class='add'>+#define ONKEY_IRQ_2SI		BIT(2)</div><div class='add'>+#define ONKEY_IRQ_3SI		BIT(3)</div><div class='add'>+#define ONKEY_IRQ_4SI		BIT(4)</div><div class='add'>+#define ONKEY_IRQ_8SI		BIT(5)</div><div class='add'>+</div><div class='add'>+/* Charger interrupt masks */</div><div class='add'>+#define CHARG_IRQ_BAT2SOCI	BIT(1)</div><div class='add'>+#define CHARG_IRQ_BATI		BIT(2)</div><div class='add'>+#define CHARG_IRQ_CHGI		BIT(3)</div><div class='add'>+#define CHARG_IRQ_VBUSI		BIT(5)</div><div class='add'>+#define CHARG_IRQ_DPMI		BIT(6)</div><div class='add'>+#define CHARG_IRQ_THMI		BIT(7)</div><div class='add'>+</div><div class='add'>+enum pf1550_irq {</div><div class='add'>+	PF1550_IRQ_CHG,</div><div class='add'>+	PF1550_IRQ_REGULATOR,</div><div class='add'>+	PF1550_IRQ_ONKEY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum pf1550_pmic_irq {</div><div class='add'>+	PF1550_PMIC_IRQ_SW1_LS,</div><div class='add'>+	PF1550_PMIC_IRQ_SW2_LS,</div><div class='add'>+	PF1550_PMIC_IRQ_SW3_LS,</div><div class='add'>+	PF1550_PMIC_IRQ_SW1_HS,</div><div class='add'>+	PF1550_PMIC_IRQ_SW2_HS,</div><div class='add'>+	PF1550_PMIC_IRQ_SW3_HS,</div><div class='add'>+	PF1550_PMIC_IRQ_LDO1_FAULT,</div><div class='add'>+	PF1550_PMIC_IRQ_LDO2_FAULT,</div><div class='add'>+	PF1550_PMIC_IRQ_LDO3_FAULT,</div><div class='add'>+	PF1550_PMIC_IRQ_TEMP_110,</div><div class='add'>+	PF1550_PMIC_IRQ_TEMP_125,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum pf1550_onkey_irq {</div><div class='add'>+	PF1550_ONKEY_IRQ_PUSHI,</div><div class='add'>+	PF1550_ONKEY_IRQ_1SI,</div><div class='add'>+	PF1550_ONKEY_IRQ_2SI,</div><div class='add'>+	PF1550_ONKEY_IRQ_3SI,</div><div class='add'>+	PF1550_ONKEY_IRQ_4SI,</div><div class='add'>+	PF1550_ONKEY_IRQ_8SI,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum pf1550_charg_irq {</div><div class='add'>+	PF1550_CHARG_IRQ_BAT2SOCI,</div><div class='add'>+	PF1550_CHARG_IRQ_BATI,</div><div class='add'>+	PF1550_CHARG_IRQ_CHGI,</div><div class='add'>+	PF1550_CHARG_IRQ_VBUSI,</div><div class='add'>+	PF1550_CHARG_IRQ_THMI,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum pf1550_regulators {</div><div class='add'>+	PF1550_SW1,</div><div class='add'>+	PF1550_SW2,</div><div class='add'>+	PF1550_SW3,</div><div class='add'>+	PF1550_VREFDDR,</div><div class='add'>+	PF1550_LDO1,</div><div class='add'>+	PF1550_LDO2,</div><div class='add'>+	PF1550_LDO3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pf1550_ddata {</div><div class='add'>+	struct regmap_irq_chip_data *irq_data_regulator;</div><div class='add'>+	struct regmap_irq_chip_data *irq_data_charger;</div><div class='add'>+	struct regmap_irq_chip_data *irq_data_onkey;</div><div class='add'>+	struct regmap_irq_chip_data *irq_data;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	bool dvs1_enable;</div><div class='add'>+	bool dvs2_enable;</div><div class='add'>+	int irq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_MFD_PF1550_H */</div><div class='head'>diff --git a/include/linux/mfd/qnap-mcu.h b/include/linux/mfd/qnap-mcu.h<br/>new file mode 100644<br/>index 000000000000..42bf523f9a5b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/qnap-mcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/qnap-mcu.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * Core definitions for QNAP MCU MFD driver.</div><div class='add'>+ * Copyright (C) 2024 Heiko Stuebner &lt;heiko@sntech.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_QNAP_MCU_H_</div><div class='add'>+#define _LINUX_QNAP_MCU_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct qnap_mcu;</div><div class='add'>+</div><div class='add'>+struct qnap_mcu_variant {</div><div class='add'>+	u32 baud_rate;</div><div class='add'>+	int num_drives;</div><div class='add'>+	int fan_pwm_min;</div><div class='add'>+	int fan_pwm_max;</div><div class='add'>+	bool usb_led;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int qnap_mcu_exec(struct qnap_mcu *mcu,</div><div class='add'>+		  const u8 *cmd_data, size_t cmd_data_size,</div><div class='add'>+		  u8 *reply_data, size_t reply_data_size);</div><div class='add'>+int qnap_mcu_exec_with_ack(struct qnap_mcu *mcu,</div><div class='add'>+			   const u8 *cmd_data, size_t cmd_data_size);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_QNAP_MCU_H_ */</div><div class='head'>diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h<br/>index 78e167a92483..28170ee08898 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/rk808.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/rk808.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/rk808.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/rk808.h</a></div><div class='hunk'>@@ -113,6 +113,148 @@ enum rk808_reg {</div><div class='ctx'> #define RK808_INT_STS_MSK_REG2	0x4f</div><div class='ctx'> #define RK808_IO_POL_REG	0x50</div><div class='ctx'> </div><div class='add'>+/* RK816 */</div><div class='add'>+enum rk816_reg {</div><div class='add'>+	RK816_ID_DCDC1,</div><div class='add'>+	RK816_ID_DCDC2,</div><div class='add'>+	RK816_ID_DCDC3,</div><div class='add'>+	RK816_ID_DCDC4,</div><div class='add'>+	RK816_ID_LDO1,</div><div class='add'>+	RK816_ID_LDO2,</div><div class='add'>+	RK816_ID_LDO3,</div><div class='add'>+	RK816_ID_LDO4,</div><div class='add'>+	RK816_ID_LDO5,</div><div class='add'>+	RK816_ID_LDO6,</div><div class='add'>+	RK816_ID_BOOST,</div><div class='add'>+	RK816_ID_OTG_SW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rk816_irqs {</div><div class='add'>+	/* INT_STS_REG1 */</div><div class='add'>+	RK816_IRQ_PWRON_FALL,</div><div class='add'>+	RK816_IRQ_PWRON_RISE,</div><div class='add'>+</div><div class='add'>+	/* INT_STS_REG2 */</div><div class='add'>+	RK816_IRQ_VB_LOW,</div><div class='add'>+	RK816_IRQ_PWRON,</div><div class='add'>+	RK816_IRQ_PWRON_LP,</div><div class='add'>+	RK816_IRQ_HOTDIE,</div><div class='add'>+	RK816_IRQ_RTC_ALARM,</div><div class='add'>+	RK816_IRQ_RTC_PERIOD,</div><div class='add'>+	RK816_IRQ_USB_OV,</div><div class='add'>+</div><div class='add'>+	/* INT_STS_REG3 */</div><div class='add'>+	RK816_IRQ_PLUG_IN,</div><div class='add'>+	RK816_IRQ_PLUG_OUT,</div><div class='add'>+	RK816_IRQ_CHG_OK,</div><div class='add'>+	RK816_IRQ_CHG_TE,</div><div class='add'>+	RK816_IRQ_CHG_TS,</div><div class='add'>+	RK816_IRQ_CHG_CVTLIM,</div><div class='add'>+	RK816_IRQ_DISCHG_ILIM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* power channel registers */</div><div class='add'>+#define RK816_DCDC_EN_REG1		0x23</div><div class='add'>+</div><div class='add'>+#define RK816_DCDC_EN_REG2		0x24</div><div class='add'>+#define	RK816_BOOST_EN			BIT(1)</div><div class='add'>+#define RK816_OTG_EN			BIT(2)</div><div class='add'>+#define	RK816_BOOST_EN_MSK		BIT(5)</div><div class='add'>+#define RK816_OTG_EN_MSK		BIT(6)</div><div class='add'>+#define RK816_BUCK_DVS_CONFIRM		BIT(7)</div><div class='add'>+</div><div class='add'>+#define RK816_LDO_EN_REG1		0x27</div><div class='add'>+</div><div class='add'>+#define RK816_LDO_EN_REG2		0x28</div><div class='add'>+</div><div class='add'>+/* interrupt registers and irq definitions */</div><div class='add'>+#define RK816_INT_STS_REG1		0x49</div><div class='add'>+#define RK816_INT_STS_MSK_REG1		0x4a</div><div class='add'>+#define RK816_INT_STS_PWRON_FALL	BIT(5)</div><div class='add'>+#define RK816_INT_STS_PWRON_RISE	BIT(6)</div><div class='add'>+</div><div class='add'>+#define RK816_INT_STS_REG2		0x4c</div><div class='add'>+#define RK816_INT_STS_MSK_REG2		0x4d</div><div class='add'>+#define RK816_INT_STS_VB_LOW		BIT(1)</div><div class='add'>+#define RK816_INT_STS_PWRON		BIT(2)</div><div class='add'>+#define RK816_INT_STS_PWRON_LP		BIT(3)</div><div class='add'>+#define RK816_INT_STS_HOTDIE		BIT(4)</div><div class='add'>+#define RK816_INT_STS_RTC_ALARM		BIT(5)</div><div class='add'>+#define RK816_INT_STS_RTC_PERIOD	BIT(6)</div><div class='add'>+#define RK816_INT_STS_USB_OV		BIT(7)</div><div class='add'>+</div><div class='add'>+#define RK816_INT_STS_REG3		0x4e</div><div class='add'>+#define RK816_INT_STS_MSK_REG3		0x4f</div><div class='add'>+#define RK816_INT_STS_PLUG_IN		BIT(0)</div><div class='add'>+#define RK816_INT_STS_PLUG_OUT		BIT(1)</div><div class='add'>+#define RK816_INT_STS_CHG_OK		BIT(2)</div><div class='add'>+#define RK816_INT_STS_CHG_TE		BIT(3)</div><div class='add'>+#define RK816_INT_STS_CHG_TS		BIT(4)</div><div class='add'>+#define RK816_INT_STS_CHG_CVTLIM	BIT(6)</div><div class='add'>+#define RK816_INT_STS_DISCHG_ILIM	BIT(7)</div><div class='add'>+</div><div class='add'>+#define RK816_IRQ_STS_OFFSET(x)		((x) - RK816_INT_STS_REG1)</div><div class='add'>+#define RK816_IRQ_MSK_OFFSET(x)		((x) - RK816_INT_STS_MSK_REG1)</div><div class='add'>+</div><div class='add'>+/* charger, boost and OTG registers */</div><div class='add'>+#define RK816_OTG_BUCK_LDO_CONFIG_REG	0x2a</div><div class='add'>+#define RK816_CHRG_CONFIG_REG		0x2b</div><div class='add'>+#define RK816_BOOST_ON_VESL_REG		0x54</div><div class='add'>+#define RK816_BOOST_SLP_VSEL_REG	0x55</div><div class='add'>+#define RK816_CHRG_BOOST_CONFIG_REG	0x9a</div><div class='add'>+#define RK816_SUP_STS_REG		0xa0</div><div class='add'>+#define RK816_USB_CTRL_REG		0xa1</div><div class='add'>+#define RK816_CHRG_CTRL(x)		(0xa3 + (x))</div><div class='add'>+#define RK816_BAT_CTRL_REG		0xa6</div><div class='add'>+#define RK816_BAT_HTS_TS_REG		0xa8</div><div class='add'>+#define RK816_BAT_LTS_TS_REG		0xa9</div><div class='add'>+</div><div class='add'>+/* adc and fuel gauge registers */</div><div class='add'>+#define RK816_TS_CTRL_REG		0xac</div><div class='add'>+#define RK816_ADC_CTRL_REG		0xad</div><div class='add'>+#define RK816_GGCON_REG			0xb0</div><div class='add'>+#define RK816_GGSTS_REG			0xb1</div><div class='add'>+#define RK816_ZERO_CUR_ADC_REGH		0xb2</div><div class='add'>+#define RK816_ZERO_CUR_ADC_REGL		0xb3</div><div class='add'>+#define RK816_GASCNT_CAL_REG(x)		(0xb7 - (x))</div><div class='add'>+#define RK816_GASCNT_REG(x)		(0xbb - (x))</div><div class='add'>+#define RK816_BAT_CUR_AVG_REGH		0xbc</div><div class='add'>+#define RK816_BAT_CUR_AVG_REGL		0xbd</div><div class='add'>+#define RK816_TS_ADC_REGH		0xbe</div><div class='add'>+#define RK816_TS_ADC_REGL		0xbf</div><div class='add'>+#define RK816_USB_ADC_REGH		0xc0</div><div class='add'>+#define RK816_USB_ADC_REGL		0xc1</div><div class='add'>+#define RK816_BAT_OCV_REGH		0xc2</div><div class='add'>+#define RK816_BAT_OCV_REGL		0xc3</div><div class='add'>+#define RK816_BAT_VOL_REGH		0xc4</div><div class='add'>+#define RK816_BAT_VOL_REGL		0xc5</div><div class='add'>+#define RK816_RELAX_ENTRY_THRES_REGH	0xc6</div><div class='add'>+#define RK816_RELAX_ENTRY_THRES_REGL	0xc7</div><div class='add'>+#define RK816_RELAX_EXIT_THRES_REGH	0xc8</div><div class='add'>+#define RK816_RELAX_EXIT_THRES_REGL	0xc9</div><div class='add'>+#define RK816_RELAX_VOL1_REGH		0xca</div><div class='add'>+#define RK816_RELAX_VOL1_REGL		0xcb</div><div class='add'>+#define RK816_RELAX_VOL2_REGH		0xcc</div><div class='add'>+#define RK816_RELAX_VOL2_REGL		0xcd</div><div class='add'>+#define RK816_RELAX_CUR1_REGH		0xce</div><div class='add'>+#define RK816_RELAX_CUR1_REGL		0xcf</div><div class='add'>+#define RK816_RELAX_CUR2_REGH		0xd0</div><div class='add'>+#define RK816_RELAX_CUR2_REGL		0xd1</div><div class='add'>+#define RK816_CAL_OFFSET_REGH		0xd2</div><div class='add'>+#define RK816_CAL_OFFSET_REGL		0xd3</div><div class='add'>+#define RK816_NON_ACT_TIMER_CNT_REG	0xd4</div><div class='add'>+#define RK816_VCALIB0_REGH		0xd5</div><div class='add'>+#define RK816_VCALIB0_REGL		0xd6</div><div class='add'>+#define RK816_VCALIB1_REGH		0xd7</div><div class='add'>+#define RK816_VCALIB1_REGL		0xd8</div><div class='add'>+#define RK816_FCC_GASCNT_REG(x)		(0xdc - (x))</div><div class='add'>+#define RK816_IOFFSET_REGH		0xdd</div><div class='add'>+#define RK816_IOFFSET_REGL		0xde</div><div class='add'>+#define RK816_SLEEP_CON_SAMP_CUR_REG	0xdf</div><div class='add'>+</div><div class='add'>+/* general purpose data registers 0xe0 ~ 0xf2 */</div><div class='add'>+#define RK816_DATA_REG(x)		(0xe0 + (x))</div><div class='add'>+</div><div class='ctx'> /* RK818 */</div><div class='ctx'> #define RK818_DCDC1			0</div><div class='ctx'> #define RK818_LDO1			4</div><div class='hunk'>@@ -670,6 +812,8 @@ enum rk806_pin_dr_sel {</div><div class='ctx'> #define RK806_INT_POL_H			BIT(1)</div><div class='ctx'> #define RK806_INT_POL_L			0</div><div class='ctx'> </div><div class='add'>+/* SYS_CFG3 */</div><div class='add'>+#define RK806_RST_FUN_MSK		GENMASK(7, 6)</div><div class='ctx'> #define RK806_SLAVE_RESTART_FUN_MSK	BIT(1)</div><div class='ctx'> #define RK806_SLAVE_RESTART_FUN_EN	BIT(1)</div><div class='ctx'> #define RK806_SLAVE_RESTART_FUN_OFF	0</div><div class='hunk'>@@ -791,6 +935,7 @@ enum rk806_dvs_mode {</div><div class='ctx'> #define VOUT_LO_INT	BIT(0)</div><div class='ctx'> #define CLK32KOUT2_EN	BIT(0)</div><div class='ctx'> </div><div class='add'>+#define TEMP105C			0x08</div><div class='ctx'> #define TEMP115C			0x0c</div><div class='ctx'> #define TEMP_HOTDIE_MSK			0x0c</div><div class='ctx'> #define SLP_SD_MSK			(0x3 &lt;&lt; 2)</div><div class='hunk'>@@ -1191,6 +1336,7 @@ enum {</div><div class='ctx'> 	RK806_ID = 0x8060,</div><div class='ctx'> 	RK808_ID = 0x0000,</div><div class='ctx'> 	RK809_ID = 0x8090,</div><div class='add'>+	RK816_ID = 0x8160,</div><div class='ctx'> 	RK817_ID = 0x8170,</div><div class='ctx'> 	RK818_ID = 0x8180,</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/mfd/rohm-bd71828.h b/include/linux/mfd/rohm-bd71828.h<br/>index 3b5f3a7db4bd..73a71ef69152 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/rohm-bd71828.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/rohm-bd71828.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/rohm-bd71828.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/rohm-bd71828.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #ifndef __LINUX_MFD_BD71828_H__</div><div class='ctx'> #define __LINUX_MFD_BD71828_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/rohm-generic.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/rohm-shared.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,7 +42,8 @@ enum {</div><div class='ctx'> #define BD71828_REG_PS_CTRL_2		0x05</div><div class='ctx'> #define BD71828_REG_PS_CTRL_3		0x06</div><div class='ctx'> </div><div class='del'>-//#define BD71828_REG_SWRESET		0x06</div><div class='add'>+#define BD71828_MASK_STATE_HBNT		BIT(1)</div><div class='add'>+</div><div class='ctx'> #define BD71828_MASK_RUN_LVL_CTRL	0x30</div><div class='ctx'> </div><div class='ctx'> /* Regulator control masks */</div><div class='hunk'>@@ -133,7 +135,6 @@ enum {</div><div class='ctx'> #define BD71828_REG_LDO5_VOLT		0x43</div><div class='ctx'> #define BD71828_REG_LDO5_VOLT_OPT	0x42</div><div class='ctx'> #define BD71828_REG_LDO6_EN		0x44</div><div class='del'>-//#define BD71828_REG_LDO6_VOLT		0x4</div><div class='ctx'> #define BD71828_REG_LDO7_EN		0x45</div><div class='ctx'> #define BD71828_REG_LDO7_VOLT		0x46</div><div class='ctx'> </div><div class='hunk'>@@ -188,6 +189,69 @@ enum {</div><div class='ctx'> /* Charger/Battey */</div><div class='ctx'> #define BD71828_REG_CHG_STATE		0x65</div><div class='ctx'> #define BD71828_REG_CHG_FULL		0xd2</div><div class='add'>+#define BD71828_REG_CHG_EN		0x6F</div><div class='add'>+#define BD71828_REG_DCIN_STAT		0x68</div><div class='add'>+#define BD71828_MASK_DCIN_DET		0x01</div><div class='add'>+#define BD71828_REG_VDCIN_U		0x9c</div><div class='add'>+#define BD71828_MASK_CHG_EN		0x01</div><div class='add'>+#define BD71828_CHG_MASK_DCIN_U		0x0f</div><div class='add'>+#define BD71828_REG_BAT_STAT		0x67</div><div class='add'>+#define BD71828_REG_BAT_TEMP		0x6c</div><div class='add'>+#define BD71828_MASK_BAT_TEMP		0x07</div><div class='add'>+#define BD71828_BAT_TEMP_OPEN		0x07</div><div class='add'>+#define BD71828_MASK_BAT_DET		0x20</div><div class='add'>+#define BD71828_MASK_BAT_DET_DONE	0x10</div><div class='add'>+#define BD71828_REG_CHG_STATE		0x65</div><div class='add'>+#define BD71828_REG_VBAT_U		0x8c</div><div class='add'>+#define BD71828_MASK_VBAT_U		0x0f</div><div class='add'>+#define BD71828_REG_VBAT_REX_AVG_U	0x92</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_OCV_PWRON_U		0x8A</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_VBAT_MIN_AVG_U	0x8e</div><div class='add'>+#define BD71828_REG_VBAT_MIN_AVG_L	0x8f</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_CC_CNT3		0xb5</div><div class='add'>+#define BD71828_REG_CC_CNT2		0xb6</div><div class='add'>+#define BD71828_REG_CC_CNT1		0xb7</div><div class='add'>+#define BD71828_REG_CC_CNT0		0xb8</div><div class='add'>+#define BD71828_REG_CC_CURCD_AVG_U	0xb2</div><div class='add'>+#define BD71828_MASK_CC_CURCD_AVG_U	0x3f</div><div class='add'>+#define BD71828_MASK_CC_CUR_DIR		0x80</div><div class='add'>+#define BD71828_REG_VM_BTMP_U		0xa1</div><div class='add'>+#define BD71828_REG_VM_BTMP_L		0xa2</div><div class='add'>+#define BD71828_MASK_VM_BTMP_U		0x0f</div><div class='add'>+#define BD71828_REG_COULOMB_CTRL	0xc4</div><div class='add'>+#define BD71828_REG_COULOMB_CTRL2	0xd2</div><div class='add'>+#define BD71828_MASK_REX_CC_CLR		0x01</div><div class='add'>+#define BD71828_MASK_FULL_CC_CLR	0x10</div><div class='add'>+#define BD71828_REG_CC_CNT_FULL3	0xbd</div><div class='add'>+#define BD71828_REG_CC_CNT_CHG3		0xc1</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_VBAT_INITIAL1_U	0x86</div><div class='add'>+#define BD71828_REG_VBAT_INITIAL1_L	0x87</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_VBAT_INITIAL2_U	0x88</div><div class='add'>+#define BD71828_REG_VBAT_INITIAL2_L	0x89</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_IBAT_U		0xb0</div><div class='add'>+#define BD71828_REG_IBAT_L		0xb1</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_IBAT_AVG_U		0xb2</div><div class='add'>+#define BD71828_REG_IBAT_AVG_L		0xb3</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_VSYS_AVG_U		0x96</div><div class='add'>+#define BD71828_REG_VSYS_AVG_L		0x97</div><div class='add'>+#define BD71828_REG_VSYS_MIN_AVG_U	0x98</div><div class='add'>+#define BD71828_REG_VSYS_MIN_AVG_L	0x99</div><div class='add'>+#define BD71828_REG_CHG_SET1		0x75</div><div class='add'>+#define BD71828_REG_ALM_VBAT_LIMIT_U	0xaa</div><div class='add'>+#define BD71828_REG_BATCAP_MON_LIMIT_U	0xcc</div><div class='add'>+#define BD71828_REG_CONF		0x64</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_DCIN_CLPS		0x71</div><div class='add'>+</div><div class='add'>+#define BD71828_REG_MEAS_CLEAR		0xaf</div><div class='ctx'> </div><div class='ctx'> /* LEDs */</div><div class='ctx'> #define BD71828_REG_LED_CTRL		0x4A</div><div class='head'>diff --git a/include/linux/mfd/rohm-bd96801.h b/include/linux/mfd/rohm-bd96801.h<br/>new file mode 100644<br/>index 000000000000..68c8ac8ad409<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/rohm-bd96801.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/rohm-bd96801.h</a></div><div class='hunk'>@@ -0,0 +1,217 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* Copyright (C) 2024 ROHM Semiconductors */</div><div class='add'>+</div><div class='add'>+#ifndef __MFD_BD96801_H__</div><div class='add'>+#define __MFD_BD96801_H__</div><div class='add'>+</div><div class='add'>+#define BD96801_REG_SSCG_CTRL		0x09</div><div class='add'>+#define BD96801_REG_SHD_INTB            0x20</div><div class='add'>+#define BD96801_LDO5_VOL_LVL_REG	0x2c</div><div class='add'>+#define BD96801_LDO6_VOL_LVL_REG	0x2d</div><div class='add'>+#define BD96801_LDO7_VOL_LVL_REG	0x2e</div><div class='add'>+#define BD96801_REG_BUCK_OVP		0x30</div><div class='add'>+#define BD96801_REG_BUCK_OVD		0x35</div><div class='add'>+#define BD96801_REG_LDO_OVP		0x31</div><div class='add'>+#define BD96801_REG_LDO_OVD		0x36</div><div class='add'>+#define BD96801_REG_BOOT_OVERTIME	0x3a</div><div class='add'>+#define BD96801_REG_WD_TMO		0x40</div><div class='add'>+#define BD96801_REG_WD_CONF		0x41</div><div class='add'>+#define BD96801_REG_WD_FEED		0x42</div><div class='add'>+#define BD96801_REG_WD_FAILCOUNT	0x43</div><div class='add'>+#define BD96801_REG_WD_ASK		0x46</div><div class='add'>+#define BD96801_REG_WD_STATUS		0x4a</div><div class='add'>+#define BD96801_REG_PMIC_STATE		0x4f</div><div class='add'>+#define BD96801_REG_EXT_STATE		0x50</div><div class='add'>+</div><div class='add'>+#define BD96801_STATE_STBY		0x09</div><div class='add'>+</div><div class='add'>+#define BD96801_LOCK_REG		0x04</div><div class='add'>+#define BD96801_UNLOCK			0x9d</div><div class='add'>+#define BD96801_LOCK			0x00</div><div class='add'>+</div><div class='add'>+/* IRQ register area */</div><div class='add'>+#define BD96801_REG_INT_MAIN		0x51</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The BD96801 has two physical IRQ lines, INTB and ERRB.</div><div class='add'>+ *</div><div class='add'>+ * The 'main status register' is located at 0x51.</div><div class='add'>+ * The ERRB status registers are located at 0x52 ... 0x5B</div><div class='add'>+ * INTB status registers are at range 0x5c ... 0x63</div><div class='add'>+ */</div><div class='add'>+#define BD96801_REG_INT_SYS_ERRB1	0x52</div><div class='add'>+#define BD96801_REG_INT_BUCK2_ERRB	0x56</div><div class='add'>+#define BD96801_REG_INT_SYS_INTB	0x5c</div><div class='add'>+#define BD96801_REG_INT_BUCK2_INTB	0x5e</div><div class='add'>+#define BD96801_REG_INT_LDO7_INTB	0x63</div><div class='add'>+</div><div class='add'>+/* MASK registers */</div><div class='add'>+#define BD96801_REG_MASK_SYS_INTB	0x73</div><div class='add'>+#define BD96801_REG_MASK_SYS_ERRB	0x69</div><div class='add'>+</div><div class='add'>+#define BD96801_MAX_REGISTER		0x7a</div><div class='add'>+</div><div class='add'>+#define BD96801_OTP_ERR_MASK		BIT(0)</div><div class='add'>+#define BD96801_DBIST_ERR_MASK		BIT(1)</div><div class='add'>+#define BD96801_EEP_ERR_MASK		BIT(2)</div><div class='add'>+#define BD96801_ABIST_ERR_MASK		BIT(3)</div><div class='add'>+#define BD96801_PRSTB_ERR_MASK		BIT(4)</div><div class='add'>+#define BD96801_DRMOS1_ERR_MASK		BIT(5)</div><div class='add'>+#define BD96801_DRMOS2_ERR_MASK		BIT(6)</div><div class='add'>+#define BD96801_SLAVE_ERR_MASK		BIT(7)</div><div class='add'>+#define BD96801_VREF_ERR_MASK		BIT(0)</div><div class='add'>+#define BD96801_TSD_ERR_MASK		BIT(1)</div><div class='add'>+#define BD96801_UVLO_ERR_MASK		BIT(2)</div><div class='add'>+#define BD96801_OVLO_ERR_MASK		BIT(3)</div><div class='add'>+#define BD96801_OSC_ERR_MASK		BIT(4)</div><div class='add'>+#define BD96801_PON_ERR_MASK		BIT(5)</div><div class='add'>+#define BD96801_POFF_ERR_MASK		BIT(6)</div><div class='add'>+#define BD96801_CMD_SHDN_ERR_MASK	BIT(7)</div><div class='add'>+#define BD96801_INT_PRSTB_WDT_ERR_MASK	BIT(0)</div><div class='add'>+#define BD96801_INT_CHIP_IF_ERR_MASK	BIT(3)</div><div class='add'>+#define BD96801_INT_SHDN_ERR_MASK	BIT(7)</div><div class='add'>+#define BD96801_OUT_PVIN_ERR_MASK	BIT(0)</div><div class='add'>+#define BD96801_OUT_OVP_ERR_MASK	BIT(1)</div><div class='add'>+#define BD96801_OUT_UVP_ERR_MASK	BIT(2)</div><div class='add'>+#define BD96801_OUT_SHDN_ERR_MASK	BIT(7)</div><div class='add'>+</div><div class='add'>+/* ERRB IRQs */</div><div class='add'>+enum {</div><div class='add'>+	/* Reg 0x52, 0x53, 0x54 - ERRB system IRQs */</div><div class='add'>+	BD96801_OTP_ERR_STAT,</div><div class='add'>+	BD96801_DBIST_ERR_STAT,</div><div class='add'>+	BD96801_EEP_ERR_STAT,</div><div class='add'>+	BD96801_ABIST_ERR_STAT,</div><div class='add'>+	BD96801_PRSTB_ERR_STAT,</div><div class='add'>+	BD96801_DRMOS1_ERR_STAT,</div><div class='add'>+	BD96801_DRMOS2_ERR_STAT,</div><div class='add'>+	BD96801_SLAVE_ERR_STAT,</div><div class='add'>+	BD96801_VREF_ERR_STAT,</div><div class='add'>+	BD96801_TSD_ERR_STAT,</div><div class='add'>+	BD96801_UVLO_ERR_STAT,</div><div class='add'>+	BD96801_OVLO_ERR_STAT,</div><div class='add'>+	BD96801_OSC_ERR_STAT,</div><div class='add'>+	BD96801_PON_ERR_STAT,</div><div class='add'>+	BD96801_POFF_ERR_STAT,</div><div class='add'>+	BD96801_CMD_SHDN_ERR_STAT,</div><div class='add'>+	BD96801_INT_PRSTB_WDT_ERR,</div><div class='add'>+	BD96801_INT_CHIP_IF_ERR,</div><div class='add'>+	BD96801_INT_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x55 BUCK1 ERR IRQs */</div><div class='add'>+	BD96801_BUCK1_PVIN_ERR_STAT,</div><div class='add'>+	BD96801_BUCK1_OVP_ERR_STAT,</div><div class='add'>+	BD96801_BUCK1_UVP_ERR_STAT,</div><div class='add'>+	BD96801_BUCK1_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x56 BUCK2 ERR IRQs */</div><div class='add'>+	BD96801_BUCK2_PVIN_ERR_STAT,</div><div class='add'>+	BD96801_BUCK2_OVP_ERR_STAT,</div><div class='add'>+	BD96801_BUCK2_UVP_ERR_STAT,</div><div class='add'>+	BD96801_BUCK2_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x57 BUCK3 ERR IRQs */</div><div class='add'>+	BD96801_BUCK3_PVIN_ERR_STAT,</div><div class='add'>+	BD96801_BUCK3_OVP_ERR_STAT,</div><div class='add'>+	BD96801_BUCK3_UVP_ERR_STAT,</div><div class='add'>+	BD96801_BUCK3_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x58 BUCK4 ERR IRQs */</div><div class='add'>+	BD96801_BUCK4_PVIN_ERR_STAT,</div><div class='add'>+	BD96801_BUCK4_OVP_ERR_STAT,</div><div class='add'>+	BD96801_BUCK4_UVP_ERR_STAT,</div><div class='add'>+	BD96801_BUCK4_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x59 LDO5 ERR IRQs */</div><div class='add'>+	BD96801_LDO5_PVIN_ERR_STAT,</div><div class='add'>+	BD96801_LDO5_OVP_ERR_STAT,</div><div class='add'>+	BD96801_LDO5_UVP_ERR_STAT,</div><div class='add'>+	BD96801_LDO5_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x5a LDO6 ERR IRQs */</div><div class='add'>+	BD96801_LDO6_PVIN_ERR_STAT,</div><div class='add'>+	BD96801_LDO6_OVP_ERR_STAT,</div><div class='add'>+	BD96801_LDO6_UVP_ERR_STAT,</div><div class='add'>+	BD96801_LDO6_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x5b LDO7 ERR IRQs */</div><div class='add'>+	BD96801_LDO7_PVIN_ERR_STAT,</div><div class='add'>+	BD96801_LDO7_OVP_ERR_STAT,</div><div class='add'>+	BD96801_LDO7_UVP_ERR_STAT,</div><div class='add'>+	BD96801_LDO7_SHDN_ERR_STAT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* INTB IRQs */</div><div class='add'>+enum {</div><div class='add'>+	/* Reg 0x5c (System INTB) */</div><div class='add'>+	BD96801_TW_STAT,</div><div class='add'>+	BD96801_WDT_ERR_STAT,</div><div class='add'>+	BD96801_I2C_ERR_STAT,</div><div class='add'>+	BD96801_CHIP_IF_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x5d (BUCK1 INTB) */</div><div class='add'>+	BD96801_BUCK1_OCPH_STAT,</div><div class='add'>+	BD96801_BUCK1_OCPL_STAT,</div><div class='add'>+	BD96801_BUCK1_OCPN_STAT,</div><div class='add'>+	BD96801_BUCK1_OVD_STAT,</div><div class='add'>+	BD96801_BUCK1_UVD_STAT,</div><div class='add'>+	BD96801_BUCK1_TW_CH_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x5e (BUCK2 INTB) */</div><div class='add'>+	BD96801_BUCK2_OCPH_STAT,</div><div class='add'>+	BD96801_BUCK2_OCPL_STAT,</div><div class='add'>+	BD96801_BUCK2_OCPN_STAT,</div><div class='add'>+	BD96801_BUCK2_OVD_STAT,</div><div class='add'>+	BD96801_BUCK2_UVD_STAT,</div><div class='add'>+	BD96801_BUCK2_TW_CH_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x5f (BUCK3 INTB)*/</div><div class='add'>+	BD96801_BUCK3_OCPH_STAT,</div><div class='add'>+	BD96801_BUCK3_OCPL_STAT,</div><div class='add'>+	BD96801_BUCK3_OCPN_STAT,</div><div class='add'>+	BD96801_BUCK3_OVD_STAT,</div><div class='add'>+	BD96801_BUCK3_UVD_STAT,</div><div class='add'>+	BD96801_BUCK3_TW_CH_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x60 (BUCK4 INTB)*/</div><div class='add'>+	BD96801_BUCK4_OCPH_STAT,</div><div class='add'>+	BD96801_BUCK4_OCPL_STAT,</div><div class='add'>+	BD96801_BUCK4_OCPN_STAT,</div><div class='add'>+	BD96801_BUCK4_OVD_STAT,</div><div class='add'>+	BD96801_BUCK4_UVD_STAT,</div><div class='add'>+	BD96801_BUCK4_TW_CH_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x61 (LDO5 INTB) */</div><div class='add'>+	BD96801_LDO5_OCPH_STAT, /* bit [0] */</div><div class='add'>+	BD96801_LDO5_OVD_STAT,	/* bit [3] */</div><div class='add'>+	BD96801_LDO5_UVD_STAT,  /* bit [4] */</div><div class='add'>+</div><div class='add'>+	/* Reg 0x62 (LDO6 INTB) */</div><div class='add'>+	BD96801_LDO6_OCPH_STAT, /* bit [0] */</div><div class='add'>+	BD96801_LDO6_OVD_STAT,	/* bit [3] */</div><div class='add'>+	BD96801_LDO6_UVD_STAT,  /* bit [4] */</div><div class='add'>+</div><div class='add'>+	/* Reg 0x63 (LDO7 INTB) */</div><div class='add'>+	BD96801_LDO7_OCPH_STAT, /* bit [0] */</div><div class='add'>+	BD96801_LDO7_OVD_STAT,	/* bit [3] */</div><div class='add'>+	BD96801_LDO7_UVD_STAT,  /* bit [4] */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* IRQ MASKs */</div><div class='add'>+#define BD96801_TW_STAT_MASK		BIT(0)</div><div class='add'>+#define BD96801_WDT_ERR_STAT_MASK	BIT(1)</div><div class='add'>+#define BD96801_I2C_ERR_STAT_MASK	BIT(2)</div><div class='add'>+#define BD96801_CHIP_IF_ERR_STAT_MASK	BIT(3)</div><div class='add'>+</div><div class='add'>+#define BD96801_BUCK_OCPH_STAT_MASK	BIT(0)</div><div class='add'>+#define BD96801_BUCK_OCPL_STAT_MASK	BIT(1)</div><div class='add'>+#define BD96801_BUCK_OCPN_STAT_MASK	BIT(2)</div><div class='add'>+#define BD96801_BUCK_OVD_STAT_MASK	BIT(3)</div><div class='add'>+#define BD96801_BUCK_UVD_STAT_MASK	BIT(4)</div><div class='add'>+#define BD96801_BUCK_TW_CH_STAT_MASK	BIT(5)</div><div class='add'>+</div><div class='add'>+#define BD96801_LDO_OCPH_STAT_MASK	BIT(0)</div><div class='add'>+#define BD96801_LDO_OVD_STAT_MASK	BIT(3)</div><div class='add'>+#define BD96801_LDO_UVD_STAT_MASK	BIT(4)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/mfd/rohm-bd96802.h b/include/linux/mfd/rohm-bd96802.h<br/>new file mode 100644<br/>index 000000000000..bf4b77944edf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/rohm-bd96802.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/rohm-bd96802.h</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 ROHM Semiconductors</div><div class='add'>+ *</div><div class='add'>+ * The digital interface of trhe BD96802 PMIC is a reduced version of the</div><div class='add'>+ * BD96801. Hence the BD96801 definitions are used for registers and masks</div><div class='add'>+ * while this header only holds the IRQ definitions - mainly to avoid gaps in</div><div class='add'>+ * IRQ numbers caused by the lack of some BUCKs / LDOs and their respective</div><div class='add'>+ * IRQs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_MFD_BD96802_H__</div><div class='add'>+#define __LINUX_MFD_BD96802_H__</div><div class='add'>+</div><div class='add'>+/* ERRB IRQs */</div><div class='add'>+enum {</div><div class='add'>+	/* Reg 0x52, 0x53, 0x54 - ERRB system IRQs */</div><div class='add'>+	BD96802_OTP_ERR_STAT,</div><div class='add'>+	BD96802_DBIST_ERR_STAT,</div><div class='add'>+	BD96802_EEP_ERR_STAT,</div><div class='add'>+	BD96802_ABIST_ERR_STAT,</div><div class='add'>+	BD96802_PRSTB_ERR_STAT,</div><div class='add'>+	BD96802_DRMOS1_ERR_STAT,</div><div class='add'>+	BD96802_DRMOS2_ERR_STAT,</div><div class='add'>+	BD96802_SLAVE_ERR_STAT,</div><div class='add'>+	BD96802_VREF_ERR_STAT,</div><div class='add'>+	BD96802_TSD_ERR_STAT,</div><div class='add'>+	BD96802_UVLO_ERR_STAT,</div><div class='add'>+	BD96802_OVLO_ERR_STAT,</div><div class='add'>+	BD96802_OSC_ERR_STAT,</div><div class='add'>+	BD96802_PON_ERR_STAT,</div><div class='add'>+	BD96802_POFF_ERR_STAT,</div><div class='add'>+	BD96802_CMD_SHDN_ERR_STAT,</div><div class='add'>+	BD96802_INT_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x55 BUCK1 ERR IRQs */</div><div class='add'>+	BD96802_BUCK1_PVIN_ERR_STAT,</div><div class='add'>+	BD96802_BUCK1_OVP_ERR_STAT,</div><div class='add'>+	BD96802_BUCK1_UVP_ERR_STAT,</div><div class='add'>+	BD96802_BUCK1_SHDN_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x56 BUCK2 ERR IRQs */</div><div class='add'>+	BD96802_BUCK2_PVIN_ERR_STAT,</div><div class='add'>+	BD96802_BUCK2_OVP_ERR_STAT,</div><div class='add'>+	BD96802_BUCK2_UVP_ERR_STAT,</div><div class='add'>+	BD96802_BUCK2_SHDN_ERR_STAT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* INTB IRQs */</div><div class='add'>+enum {</div><div class='add'>+	/* Reg 0x5c (System INTB) */</div><div class='add'>+	BD96802_TW_STAT,</div><div class='add'>+	BD96802_WDT_ERR_STAT,</div><div class='add'>+	BD96802_I2C_ERR_STAT,</div><div class='add'>+	BD96802_CHIP_IF_ERR_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x5d (BUCK1 INTB) */</div><div class='add'>+	BD96802_BUCK1_OCPH_STAT,</div><div class='add'>+	BD96802_BUCK1_OCPL_STAT,</div><div class='add'>+	BD96802_BUCK1_OCPN_STAT,</div><div class='add'>+	BD96802_BUCK1_OVD_STAT,</div><div class='add'>+	BD96802_BUCK1_UVD_STAT,</div><div class='add'>+	BD96802_BUCK1_TW_CH_STAT,</div><div class='add'>+</div><div class='add'>+	/* Reg 0x5e (BUCK2 INTB) */</div><div class='add'>+	BD96802_BUCK2_OCPH_STAT,</div><div class='add'>+	BD96802_BUCK2_OCPL_STAT,</div><div class='add'>+	BD96802_BUCK2_OCPN_STAT,</div><div class='add'>+	BD96802_BUCK2_OVD_STAT,</div><div class='add'>+	BD96802_BUCK2_UVD_STAT,</div><div class='add'>+	BD96802_BUCK2_TW_CH_STAT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/mfd/rohm-generic.h b/include/linux/mfd/rohm-generic.h<br/>index 4eeb22876bad..579e8dcfcca4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/rohm-generic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/rohm-generic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/rohm-generic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/rohm-generic.h</a></div><div class='hunk'>@@ -16,6 +16,10 @@ enum rohm_chip_type {</div><div class='ctx'> 	ROHM_CHIP_TYPE_BD71828,</div><div class='ctx'> 	ROHM_CHIP_TYPE_BD71837,</div><div class='ctx'> 	ROHM_CHIP_TYPE_BD71847,</div><div class='add'>+	ROHM_CHIP_TYPE_BD96801,</div><div class='add'>+	ROHM_CHIP_TYPE_BD96802,</div><div class='add'>+	ROHM_CHIP_TYPE_BD96805,</div><div class='add'>+	ROHM_CHIP_TYPE_BD96806,</div><div class='ctx'> 	ROHM_CHIP_TYPE_AMOUNT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h<br/>index a212b9f72bc9..d785e101fe79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/samsung/core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/samsung/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/samsung/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/samsung/core.h</a></div><div class='hunk'>@@ -37,12 +37,15 @@ struct gpio_desc;</div><div class='ctx'> </div><div class='ctx'> enum sec_device_type {</div><div class='ctx'> 	S5M8767X,</div><div class='add'>+	S2DOS05,</div><div class='ctx'> 	S2MPA01,</div><div class='add'>+	S2MPG10,</div><div class='ctx'> 	S2MPS11X,</div><div class='ctx'> 	S2MPS13X,</div><div class='ctx'> 	S2MPS14X,</div><div class='ctx'> 	S2MPS15X,</div><div class='ctx'> 	S2MPU02,</div><div class='add'>+	S2MPU05,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -64,15 +67,11 @@ struct sec_pmic_dev {</div><div class='ctx'> 	struct regmap *regmap_pmic;</div><div class='ctx'> 	struct i2c_client *i2c;</div><div class='ctx'> </div><div class='del'>-	unsigned long device_type;</div><div class='add'>+	int device_type;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	struct regmap_irq_chip_data *irq_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int sec_irq_init(struct sec_pmic_dev *sec_pmic);</div><div class='del'>-void sec_irq_exit(struct sec_pmic_dev *sec_pmic);</div><div class='del'>-int sec_irq_resume(struct sec_pmic_dev *sec_pmic);</div><div class='del'>-</div><div class='ctx'> struct sec_platform_data {</div><div class='ctx'> 	struct sec_regulator_data	*regulators;</div><div class='ctx'> 	struct sec_opmode_data		*opmode;</div><div class='head'>diff --git a/include/linux/mfd/samsung/irq.h b/include/linux/mfd/samsung/irq.h<br/>index 3fd2775eb9bb..8402a5f8e18a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/samsung/irq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/samsung/irq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/samsung/irq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/samsung/irq.h</a></div><div class='hunk'>@@ -57,6 +57,115 @@ enum s2mpa01_irq {</div><div class='ctx'> #define S2MPA01_IRQ_B24_TSD_MASK	(1 &lt;&lt; 4)</div><div class='ctx'> #define S2MPA01_IRQ_B35_TSD_MASK	(1 &lt;&lt; 5)</div><div class='ctx'> </div><div class='add'>+enum s2mpg10_common_irq {</div><div class='add'>+	/* Top-level (common) block */</div><div class='add'>+	S2MPG10_COMMON_IRQ_PMIC,</div><div class='add'>+	S2MPG10_COMMON_IRQ_UNUSED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum s2mpg10_irq {</div><div class='add'>+	/* PMIC */</div><div class='add'>+	S2MPG10_IRQ_PWRONF,</div><div class='add'>+	S2MPG10_IRQ_PWRONR,</div><div class='add'>+	S2MPG10_IRQ_JIGONBF,</div><div class='add'>+	S2MPG10_IRQ_JIGONBR,</div><div class='add'>+	S2MPG10_IRQ_ACOKBF,</div><div class='add'>+	S2MPG10_IRQ_ACOKBR,</div><div class='add'>+	S2MPG10_IRQ_PWRON1S,</div><div class='add'>+	S2MPG10_IRQ_MRB,</div><div class='add'>+#define S2MPG10_IRQ_PWRONF_MASK		BIT(0)</div><div class='add'>+#define S2MPG10_IRQ_PWRONR_MASK		BIT(1)</div><div class='add'>+#define S2MPG10_IRQ_JIGONBF_MASK	BIT(2)</div><div class='add'>+#define S2MPG10_IRQ_JIGONBR_MASK	BIT(3)</div><div class='add'>+#define S2MPG10_IRQ_ACOKBF_MASK		BIT(4)</div><div class='add'>+#define S2MPG10_IRQ_ACOKBR_MASK		BIT(5)</div><div class='add'>+#define S2MPG10_IRQ_PWRON1S_MASK	BIT(6)</div><div class='add'>+#define S2MPG10_IRQ_MRB_MASK		BIT(7)</div><div class='add'>+</div><div class='add'>+	S2MPG10_IRQ_RTC60S,</div><div class='add'>+	S2MPG10_IRQ_RTCA1,</div><div class='add'>+	S2MPG10_IRQ_RTCA0,</div><div class='add'>+	S2MPG10_IRQ_RTC1S,</div><div class='add'>+	S2MPG10_IRQ_WTSR_COLDRST,</div><div class='add'>+	S2MPG10_IRQ_WTSR,</div><div class='add'>+	S2MPG10_IRQ_WRST,</div><div class='add'>+	S2MPG10_IRQ_SMPL,</div><div class='add'>+#define S2MPG10_IRQ_RTC60S_MASK		BIT(0)</div><div class='add'>+#define S2MPG10_IRQ_RTCA1_MASK		BIT(1)</div><div class='add'>+#define S2MPG10_IRQ_RTCA0_MASK		BIT(2)</div><div class='add'>+#define S2MPG10_IRQ_RTC1S_MASK		BIT(3)</div><div class='add'>+#define S2MPG10_IRQ_WTSR_COLDRST_MASK	BIT(4)</div><div class='add'>+#define S2MPG10_IRQ_WTSR_MASK		BIT(5)</div><div class='add'>+#define S2MPG10_IRQ_WRST_MASK		BIT(6)</div><div class='add'>+#define S2MPG10_IRQ_SMPL_MASK		BIT(7)</div><div class='add'>+</div><div class='add'>+	S2MPG10_IRQ_120C,</div><div class='add'>+	S2MPG10_IRQ_140C,</div><div class='add'>+	S2MPG10_IRQ_TSD,</div><div class='add'>+	S2MPG10_IRQ_PIF_TIMEOUT1,</div><div class='add'>+	S2MPG10_IRQ_PIF_TIMEOUT2,</div><div class='add'>+	S2MPG10_IRQ_SPD_PARITY_ERR,</div><div class='add'>+	S2MPG10_IRQ_SPD_ABNORMAL_STOP,</div><div class='add'>+	S2MPG10_IRQ_PMETER_OVERF,</div><div class='add'>+#define S2MPG10_IRQ_INT120C_MASK		BIT(0)</div><div class='add'>+#define S2MPG10_IRQ_INT140C_MASK		BIT(1)</div><div class='add'>+#define S2MPG10_IRQ_TSD_MASK			BIT(2)</div><div class='add'>+#define S2MPG10_IRQ_PIF_TIMEOUT1_MASK		BIT(3)</div><div class='add'>+#define S2MPG10_IRQ_PIF_TIMEOUT2_MASK		BIT(4)</div><div class='add'>+#define S2MPG10_IRQ_SPD_PARITY_ERR_MASK		BIT(5)</div><div class='add'>+#define S2MPG10_IRQ_SPD_ABNORMAL_STOP_MASK	BIT(6)</div><div class='add'>+#define S2MPG10_IRQ_PMETER_OVERF_MASK		BIT(7)</div><div class='add'>+</div><div class='add'>+	S2MPG10_IRQ_OCP_B1M,</div><div class='add'>+	S2MPG10_IRQ_OCP_B2M,</div><div class='add'>+	S2MPG10_IRQ_OCP_B3M,</div><div class='add'>+	S2MPG10_IRQ_OCP_B4M,</div><div class='add'>+	S2MPG10_IRQ_OCP_B5M,</div><div class='add'>+	S2MPG10_IRQ_OCP_B6M,</div><div class='add'>+	S2MPG10_IRQ_OCP_B7M,</div><div class='add'>+	S2MPG10_IRQ_OCP_B8M,</div><div class='add'>+#define S2MPG10_IRQ_OCP_B1M_MASK	BIT(0)</div><div class='add'>+#define S2MPG10_IRQ_OCP_B2M_MASK	BIT(1)</div><div class='add'>+#define S2MPG10_IRQ_OCP_B3M_MASK	BIT(2)</div><div class='add'>+#define S2MPG10_IRQ_OCP_B4M_MASK	BIT(3)</div><div class='add'>+#define S2MPG10_IRQ_OCP_B5M_MASK	BIT(4)</div><div class='add'>+#define S2MPG10_IRQ_OCP_B6M_MASK	BIT(5)</div><div class='add'>+#define S2MPG10_IRQ_OCP_B7M_MASK	BIT(6)</div><div class='add'>+#define S2MPG10_IRQ_OCP_B8M_MASK	BIT(7)</div><div class='add'>+</div><div class='add'>+	S2MPG10_IRQ_OCP_B9M,</div><div class='add'>+	S2MPG10_IRQ_OCP_B10M,</div><div class='add'>+	S2MPG10_IRQ_WLWP_ACC,</div><div class='add'>+	S2MPG10_IRQ_SMPL_TIMEOUT,</div><div class='add'>+	S2MPG10_IRQ_WTSR_TIMEOUT,</div><div class='add'>+	S2MPG10_IRQ_SPD_SRP_PKT_RST,</div><div class='add'>+#define S2MPG10_IRQ_OCP_B9M_MASK		BIT(0)</div><div class='add'>+#define S2MPG10_IRQ_OCP_B10M_MASK		BIT(1)</div><div class='add'>+#define S2MPG10_IRQ_WLWP_ACC_MASK		BIT(2)</div><div class='add'>+#define S2MPG10_IRQ_SMPL_TIMEOUT_MASK		BIT(5)</div><div class='add'>+#define S2MPG10_IRQ_WTSR_TIMEOUT_MASK		BIT(6)</div><div class='add'>+#define S2MPG10_IRQ_SPD_SRP_PKT_RST_MASK	BIT(7)</div><div class='add'>+</div><div class='add'>+	S2MPG10_IRQ_PWR_WARN_CH0,</div><div class='add'>+	S2MPG10_IRQ_PWR_WARN_CH1,</div><div class='add'>+	S2MPG10_IRQ_PWR_WARN_CH2,</div><div class='add'>+	S2MPG10_IRQ_PWR_WARN_CH3,</div><div class='add'>+	S2MPG10_IRQ_PWR_WARN_CH4,</div><div class='add'>+	S2MPG10_IRQ_PWR_WARN_CH5,</div><div class='add'>+	S2MPG10_IRQ_PWR_WARN_CH6,</div><div class='add'>+	S2MPG10_IRQ_PWR_WARN_CH7,</div><div class='add'>+#define S2MPG10_IRQ_PWR_WARN_CH0_MASK	BIT(0)</div><div class='add'>+#define S2MPG10_IRQ_PWR_WARN_CH1_MASK	BIT(1)</div><div class='add'>+#define S2MPG10_IRQ_PWR_WARN_CH2_MASK	BIT(2)</div><div class='add'>+#define S2MPG10_IRQ_PWR_WARN_CH3_MASK	BIT(3)</div><div class='add'>+#define S2MPG10_IRQ_PWR_WARN_CH4_MASK	BIT(4)</div><div class='add'>+#define S2MPG10_IRQ_PWR_WARN_CH5_MASK	BIT(5)</div><div class='add'>+#define S2MPG10_IRQ_PWR_WARN_CH6_MASK	BIT(6)</div><div class='add'>+#define S2MPG10_IRQ_PWR_WARN_CH7_MASK	BIT(7)</div><div class='add'>+</div><div class='add'>+	S2MPG10_IRQ_NR,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum s2mps11_irq {</div><div class='ctx'> 	S2MPS11_IRQ_PWRONF,</div><div class='ctx'> 	S2MPS11_IRQ_PWRONR,</div><div class='hunk'>@@ -150,6 +259,50 @@ enum s2mpu02_irq {</div><div class='ctx'> /* Masks for interrupts are the same as in s2mps11 */</div><div class='ctx'> #define S2MPS14_IRQ_TSD_MASK		(1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='add'>+enum s2mpu05_irq {</div><div class='add'>+	S2MPU05_IRQ_PWRONF,</div><div class='add'>+	S2MPU05_IRQ_PWRONR,</div><div class='add'>+	S2MPU05_IRQ_JIGONBF,</div><div class='add'>+	S2MPU05_IRQ_JIGONBR,</div><div class='add'>+	S2MPU05_IRQ_ACOKF,</div><div class='add'>+	S2MPU05_IRQ_ACOKR,</div><div class='add'>+	S2MPU05_IRQ_PWRON1S,</div><div class='add'>+	S2MPU05_IRQ_MRB,</div><div class='add'>+</div><div class='add'>+	S2MPU05_IRQ_RTC60S,</div><div class='add'>+	S2MPU05_IRQ_RTCA1,</div><div class='add'>+	S2MPU05_IRQ_RTCA0,</div><div class='add'>+	S2MPU05_IRQ_SMPL,</div><div class='add'>+	S2MPU05_IRQ_RTC1S,</div><div class='add'>+	S2MPU05_IRQ_WTSR,</div><div class='add'>+</div><div class='add'>+	S2MPU05_IRQ_INT120C,</div><div class='add'>+	S2MPU05_IRQ_INT140C,</div><div class='add'>+	S2MPU05_IRQ_TSD,</div><div class='add'>+</div><div class='add'>+	S2MPU05_IRQ_NR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define S2MPU05_IRQ_PWRONF_MASK		BIT(0)</div><div class='add'>+#define S2MPU05_IRQ_PWRONR_MASK		BIT(1)</div><div class='add'>+#define S2MPU05_IRQ_JIGONBF_MASK	BIT(2)</div><div class='add'>+#define S2MPU05_IRQ_JIGONBR_MASK	BIT(3)</div><div class='add'>+#define S2MPU05_IRQ_ACOKF_MASK		BIT(4)</div><div class='add'>+#define S2MPU05_IRQ_ACOKR_MASK		BIT(5)</div><div class='add'>+#define S2MPU05_IRQ_PWRON1S_MASK	BIT(6)</div><div class='add'>+#define S2MPU05_IRQ_MRB_MASK		BIT(7)</div><div class='add'>+</div><div class='add'>+#define S2MPU05_IRQ_RTC60S_MASK		BIT(0)</div><div class='add'>+#define S2MPU05_IRQ_RTCA1_MASK		BIT(1)</div><div class='add'>+#define S2MPU05_IRQ_RTCA0_MASK		BIT(2)</div><div class='add'>+#define S2MPU05_IRQ_SMPL_MASK		BIT(3)</div><div class='add'>+#define S2MPU05_IRQ_RTC1S_MASK		BIT(4)</div><div class='add'>+#define S2MPU05_IRQ_WTSR_MASK		BIT(5)</div><div class='add'>+</div><div class='add'>+#define S2MPU05_IRQ_INT120C_MASK	BIT(0)</div><div class='add'>+#define S2MPU05_IRQ_INT140C_MASK	BIT(1)</div><div class='add'>+#define S2MPU05_IRQ_TSD_MASK		BIT(2)</div><div class='add'>+</div><div class='ctx'> enum s5m8767_irq {</div><div class='ctx'> 	S5M8767_IRQ_PWRR,</div><div class='ctx'> 	S5M8767_IRQ_PWRF,</div><div class='head'>diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/rtc.h<br/>index 0204decfc9aa..51c4239a1fa6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/samsung/rtc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/samsung/rtc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/samsung/rtc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/samsung/rtc.h</a></div><div class='hunk'>@@ -72,6 +72,37 @@ enum s2mps_rtc_reg {</div><div class='ctx'> 	S2MPS_RTC_REG_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum s2mpg10_rtc_reg {</div><div class='add'>+	S2MPG10_RTC_CTRL,</div><div class='add'>+	S2MPG10_RTC_UPDATE,</div><div class='add'>+	S2MPG10_RTC_SMPL,</div><div class='add'>+	S2MPG10_RTC_WTSR,</div><div class='add'>+	S2MPG10_RTC_CAP_SEL,</div><div class='add'>+	S2MPG10_RTC_MSEC,</div><div class='add'>+	S2MPG10_RTC_SEC,</div><div class='add'>+	S2MPG10_RTC_MIN,</div><div class='add'>+	S2MPG10_RTC_HOUR,</div><div class='add'>+	S2MPG10_RTC_WEEK,</div><div class='add'>+	S2MPG10_RTC_DAY,</div><div class='add'>+	S2MPG10_RTC_MON,</div><div class='add'>+	S2MPG10_RTC_YEAR,</div><div class='add'>+	S2MPG10_RTC_A0SEC,</div><div class='add'>+	S2MPG10_RTC_A0MIN,</div><div class='add'>+	S2MPG10_RTC_A0HOUR,</div><div class='add'>+	S2MPG10_RTC_A0WEEK,</div><div class='add'>+	S2MPG10_RTC_A0DAY,</div><div class='add'>+	S2MPG10_RTC_A0MON,</div><div class='add'>+	S2MPG10_RTC_A0YEAR,</div><div class='add'>+	S2MPG10_RTC_A1SEC,</div><div class='add'>+	S2MPG10_RTC_A1MIN,</div><div class='add'>+	S2MPG10_RTC_A1HOUR,</div><div class='add'>+	S2MPG10_RTC_A1WEEK,</div><div class='add'>+	S2MPG10_RTC_A1DAY,</div><div class='add'>+	S2MPG10_RTC_A1MON,</div><div class='add'>+	S2MPG10_RTC_A1YEAR,</div><div class='add'>+	S2MPG10_RTC_OSC_CTRL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define RTC_I2C_ADDR		(0x0C &gt;&gt; 1)</div><div class='ctx'> </div><div class='ctx'> #define HOUR_12			(1 &lt;&lt; 7)</div><div class='hunk'>@@ -124,10 +155,16 @@ enum s2mps_rtc_reg {</div><div class='ctx'> #define ALARM_ENABLE_SHIFT	7</div><div class='ctx'> #define ALARM_ENABLE_MASK	(1 &lt;&lt; ALARM_ENABLE_SHIFT)</div><div class='ctx'> </div><div class='add'>+/* WTSR &amp; SMPL registers */</div><div class='ctx'> #define SMPL_ENABLE_SHIFT	7</div><div class='ctx'> #define SMPL_ENABLE_MASK	(1 &lt;&lt; SMPL_ENABLE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define WTSR_ENABLE_SHIFT	6</div><div class='ctx'> #define WTSR_ENABLE_MASK	(1 &lt;&lt; WTSR_ENABLE_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define S2MPG10_WTSR_COLDTIMER	GENMASK(6, 5)</div><div class='add'>+#define S2MPG10_WTSR_COLDRST	BIT(4)</div><div class='add'>+#define S2MPG10_WTSR_WTSRT	GENMASK(3, 1)</div><div class='add'>+#define S2MPG10_WTSR_WTSR_EN	BIT(0)</div><div class='add'>+</div><div class='ctx'> #endif /*  __LINUX_MFD_SEC_RTC_H */</div><div class='head'>diff --git a/include/linux/mfd/samsung/s2mpg10.h b/include/linux/mfd/samsung/s2mpg10.h<br/>new file mode 100644<br/>index 000000000000..9f5919b89a3c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/samsung/s2mpg10.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/samsung/s2mpg10.h</a></div><div class='hunk'>@@ -0,0 +1,454 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2015 Samsung Electronics</div><div class='add'>+ * Copyright 2020 Google Inc</div><div class='add'>+ * Copyright 2025 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_MFD_S2MPG10_H</div><div class='add'>+#define __LINUX_MFD_S2MPG10_H</div><div class='add'>+</div><div class='add'>+/* Common registers (type 0x000) */</div><div class='add'>+enum s2mpg10_common_reg {</div><div class='add'>+	S2MPG10_COMMON_CHIPID,</div><div class='add'>+	S2MPG10_COMMON_INT,</div><div class='add'>+	S2MPG10_COMMON_INT_MASK,</div><div class='add'>+	S2MPG10_COMMON_SPD_CTRL1 = 0x0a,</div><div class='add'>+	S2MPG10_COMMON_SPD_CTRL2,</div><div class='add'>+	S2MPG10_COMMON_SPD_CTRL3,</div><div class='add'>+	S2MPG10_COMMON_MON1SEL = 0x1a,</div><div class='add'>+	S2MPG10_COMMON_MON2SEL,</div><div class='add'>+	S2MPG10_COMMON_MONR,</div><div class='add'>+	S2MPG10_COMMON_DEBUG_CTRL1,</div><div class='add'>+	S2MPG10_COMMON_DEBUG_CTRL2,</div><div class='add'>+	S2MPG10_COMMON_DEBUG_CTRL3,</div><div class='add'>+	S2MPG10_COMMON_DEBUG_CTRL4,</div><div class='add'>+	S2MPG10_COMMON_DEBUG_CTRL5,</div><div class='add'>+	S2MPG10_COMMON_DEBUG_CTRL6,</div><div class='add'>+	S2MPG10_COMMON_DEBUG_CTRL7,</div><div class='add'>+	S2MPG10_COMMON_DEBUG_CTRL8,</div><div class='add'>+	S2MPG10_COMMON_TEST_MODE1,</div><div class='add'>+	S2MPG10_COMMON_TEST_MODE2,</div><div class='add'>+	S2MPG10_COMMON_SPD_DEBUG1,</div><div class='add'>+	S2MPG10_COMMON_SPD_DEBUG2,</div><div class='add'>+	S2MPG10_COMMON_SPD_DEBUG3,</div><div class='add'>+	S2MPG10_COMMON_SPD_DEBUG4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For S2MPG10_COMMON_INT and S2MPG10_COMMON_INT_MASK */</div><div class='add'>+#define S2MPG10_COMMON_INT_SRC       GENMASK(7, 0)</div><div class='add'>+#define S2MPG10_COMMON_INT_SRC_PMIC  BIT(0)</div><div class='add'>+</div><div class='add'>+/* PMIC registers (type 0x100) */</div><div class='add'>+enum s2mpg10_pmic_reg {</div><div class='add'>+	S2MPG10_PMIC_INT1,</div><div class='add'>+	S2MPG10_PMIC_INT2,</div><div class='add'>+	S2MPG10_PMIC_INT3,</div><div class='add'>+	S2MPG10_PMIC_INT4,</div><div class='add'>+	S2MPG10_PMIC_INT5,</div><div class='add'>+	S2MPG10_PMIC_INT6,</div><div class='add'>+	S2MPG10_PMIC_INT1M,</div><div class='add'>+	S2MPG10_PMIC_INT2M,</div><div class='add'>+	S2MPG10_PMIC_INT3M,</div><div class='add'>+	S2MPG10_PMIC_INT4M,</div><div class='add'>+	S2MPG10_PMIC_INT5M,</div><div class='add'>+	S2MPG10_PMIC_INT6M,</div><div class='add'>+	S2MPG10_PMIC_STATUS1,</div><div class='add'>+	S2MPG10_PMIC_STATUS2,</div><div class='add'>+	S2MPG10_PMIC_PWRONSRC,</div><div class='add'>+	S2MPG10_PMIC_OFFSRC,</div><div class='add'>+	S2MPG10_PMIC_BU_CHG,</div><div class='add'>+	S2MPG10_PMIC_RTCBUF,</div><div class='add'>+	S2MPG10_PMIC_COMMON_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_COMMON_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_COMMON_CTRL3,</div><div class='add'>+	S2MPG10_PMIC_COMMON_CTRL4,</div><div class='add'>+	S2MPG10_PMIC_SMPL_WARN_CTRL,</div><div class='add'>+	S2MPG10_PMIC_MIMICKING_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B1M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B1M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B1M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B2M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B2M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B2M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B3M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B3M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B3M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B4M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B4M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B4M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B5M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B5M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B5M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B6M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B6M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B6M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B7M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B7M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B7M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B8M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B8M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B8M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B9M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B9M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B9M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_B10M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_B10M_OUT1,</div><div class='add'>+	S2MPG10_PMIC_B10M_OUT2,</div><div class='add'>+	S2MPG10_PMIC_BUCK1M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK2M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK3M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK4M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK5M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK6M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK7M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK8M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK9M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_BUCK10M_USONIC,</div><div class='add'>+	S2MPG10_PMIC_L1M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L2M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L3M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L4M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L5M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L6M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L7M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L8M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L9M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L10M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L11M_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_L11M_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_L12M_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_L12M_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_L13M_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_L13M_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_L14M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L15M_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_L15M_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_L16M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L17M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L18M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L19M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L20M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L21M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L22M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L23M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L24M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L25M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L26M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L27M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L28M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L29M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L30M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_L31M_CTRL,</div><div class='add'>+	S2MPG10_PMIC_LDO_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_LDO_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_LDO_DSCH1,</div><div class='add'>+	S2MPG10_PMIC_LDO_DSCH2,</div><div class='add'>+	S2MPG10_PMIC_LDO_DSCH3,</div><div class='add'>+	S2MPG10_PMIC_LDO_DSCH4,</div><div class='add'>+	S2MPG10_PMIC_LDO_BUCK7M_HLIMIT,</div><div class='add'>+	S2MPG10_PMIC_LDO_BUCK7M_LLIMIT,</div><div class='add'>+	S2MPG10_PMIC_LDO_LDO21M_HLIMIT,</div><div class='add'>+	S2MPG10_PMIC_LDO_LDO21M_LLIMIT,</div><div class='add'>+	S2MPG10_PMIC_LDO_LDO11M_HLIMIT,</div><div class='add'>+	S2MPG10_PMIC_DVS_RAMP1,</div><div class='add'>+	S2MPG10_PMIC_DVS_RAMP2,</div><div class='add'>+	S2MPG10_PMIC_DVS_RAMP3,</div><div class='add'>+	S2MPG10_PMIC_DVS_RAMP4,</div><div class='add'>+	S2MPG10_PMIC_DVS_RAMP5,</div><div class='add'>+	S2MPG10_PMIC_DVS_RAMP6,</div><div class='add'>+	S2MPG10_PMIC_DVS_SYNC_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_DVS_SYNC_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_DVS_SYNC_CTRL3,</div><div class='add'>+	S2MPG10_PMIC_DVS_SYNC_CTRL4,</div><div class='add'>+	S2MPG10_PMIC_DVS_SYNC_CTRL5,</div><div class='add'>+	S2MPG10_PMIC_DVS_SYNC_CTRL6,</div><div class='add'>+	S2MPG10_PMIC_OFF_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_OFF_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_OFF_CTRL3,</div><div class='add'>+	S2MPG10_PMIC_OFF_CTRL4,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL3,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL4,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL5,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL6,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL7,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL8,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL9,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL10,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL11,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL12,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL13,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL14,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL15,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL16,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL17,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL18,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL19,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL20,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL21,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL22,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL23,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL24,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL25,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL26,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL27,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL28,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL29,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL30,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL31,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL32,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL33,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL34,</div><div class='add'>+	S2MPG10_PMIC_SEQ_CTRL35,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL3,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL4,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL5,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL6,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL7,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL8,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL9,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL10,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL11,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL12,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL13,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL14,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL15,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL16,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL17,</div><div class='add'>+	S2MPG10_PMIC_OFF_SEQ_CTRL18,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL1,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL2,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL3,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL4,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL5,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL6,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL7,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL8,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL9,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL10,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL11,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL12,</div><div class='add'>+	S2MPG10_PMIC_PCTRLSEL13,</div><div class='add'>+	S2MPG10_PMIC_DCTRLSEL1,</div><div class='add'>+	S2MPG10_PMIC_DCTRLSEL2,</div><div class='add'>+	S2MPG10_PMIC_DCTRLSEL3,</div><div class='add'>+	S2MPG10_PMIC_DCTRLSEL4,</div><div class='add'>+	S2MPG10_PMIC_DCTRLSEL5,</div><div class='add'>+	S2MPG10_PMIC_DCTRLSEL6,</div><div class='add'>+	S2MPG10_PMIC_DCTRLSEL7,</div><div class='add'>+	S2MPG10_PMIC_GPIO_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_GPIO_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_GPIO_CTRL3,</div><div class='add'>+	S2MPG10_PMIC_GPIO_CTRL4,</div><div class='add'>+	S2MPG10_PMIC_GPIO_CTRL5,</div><div class='add'>+	S2MPG10_PMIC_GPIO_CTRL6,</div><div class='add'>+	S2MPG10_PMIC_GPIO_CTRL7,</div><div class='add'>+	S2MPG10_PMIC_B2M_OCP_WARN,</div><div class='add'>+	S2MPG10_PMIC_B2M_OCP_WARN_X,</div><div class='add'>+	S2MPG10_PMIC_B2M_OCP_WARN_Y,</div><div class='add'>+	S2MPG10_PMIC_B2M_OCP_WARN_Z,</div><div class='add'>+	S2MPG10_PMIC_B3M_OCP_WARN,</div><div class='add'>+	S2MPG10_PMIC_B3M_OCP_WARN_X,</div><div class='add'>+	S2MPG10_PMIC_B3M_OCP_WARN_Y,</div><div class='add'>+	S2MPG10_PMIC_B3M_OCP_WARN_Z,</div><div class='add'>+	S2MPG10_PMIC_B10M_OCP_WARN,</div><div class='add'>+	S2MPG10_PMIC_B10M_OCP_WARN_X,</div><div class='add'>+	S2MPG10_PMIC_B10M_OCP_WARN_Y,</div><div class='add'>+	S2MPG10_PMIC_B10M_OCP_WARN_Z,</div><div class='add'>+	S2MPG10_PMIC_B2M_SOFT_OCP_WARN,</div><div class='add'>+	S2MPG10_PMIC_B2M_SOFT_OCP_WARN_X,</div><div class='add'>+	S2MPG10_PMIC_B2M_SOFT_OCP_WARN_Y,</div><div class='add'>+	S2MPG10_PMIC_B2M_SOFT_OCP_WARN_Z,</div><div class='add'>+	S2MPG10_PMIC_B3M_SOFT_OCP_WARN,</div><div class='add'>+	S2MPG10_PMIC_B3M_SOFT_OCP_WARN_X,</div><div class='add'>+	S2MPG10_PMIC_B3M_SOFT_OCP_WARN_Y,</div><div class='add'>+	S2MPG10_PMIC_B3M_SOFT_OCP_WARN_Z,</div><div class='add'>+	S2MPG10_PMIC_B10M_SOFT_OCP_WARN,</div><div class='add'>+	S2MPG10_PMIC_B10M_SOFT_OCP_WARN_X,</div><div class='add'>+	S2MPG10_PMIC_B10M_SOFT_OCP_WARN_Y,</div><div class='add'>+	S2MPG10_PMIC_B10M_SOFT_OCP_WARN_Z,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_EN1,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_EN2,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_PD_EN1,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_PD_EN2,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_CTRL1,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_CTRL2,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_CTRL3,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_CTRL4,</div><div class='add'>+	S2MPG10_PMIC_BUCK_OCP_CTRL5,</div><div class='add'>+	S2MPG10_PMIC_PIF_CTRL,</div><div class='add'>+	S2MPG10_PMIC_BUCK_HR_MODE1,</div><div class='add'>+	S2MPG10_PMIC_BUCK_HR_MODE2,</div><div class='add'>+	S2MPG10_PMIC_FAULTOUT_CTRL,</div><div class='add'>+	S2MPG10_PMIC_LDO_SENSE1,</div><div class='add'>+	S2MPG10_PMIC_LDO_SENSE2,</div><div class='add'>+	S2MPG10_PMIC_LDO_SENSE3,</div><div class='add'>+	S2MPG10_PMIC_LDO_SENSE4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Meter registers (type 0xa00) */</div><div class='add'>+enum s2mpg10_meter_reg {</div><div class='add'>+	S2MPG10_METER_CTRL1,</div><div class='add'>+	S2MPG10_METER_CTRL2,</div><div class='add'>+	S2MPG10_METER_CTRL3,</div><div class='add'>+	S2MPG10_METER_CTRL4,</div><div class='add'>+	S2MPG10_METER_BUCKEN1,</div><div class='add'>+	S2MPG10_METER_BUCKEN2,</div><div class='add'>+	S2MPG10_METER_MUXSEL0,</div><div class='add'>+	S2MPG10_METER_MUXSEL1,</div><div class='add'>+	S2MPG10_METER_MUXSEL2,</div><div class='add'>+	S2MPG10_METER_MUXSEL3,</div><div class='add'>+	S2MPG10_METER_MUXSEL4,</div><div class='add'>+	S2MPG10_METER_MUXSEL5,</div><div class='add'>+	S2MPG10_METER_MUXSEL6,</div><div class='add'>+	S2MPG10_METER_MUXSEL7,</div><div class='add'>+	S2MPG10_METER_LPF_C0_0,</div><div class='add'>+	S2MPG10_METER_LPF_C0_1,</div><div class='add'>+	S2MPG10_METER_LPF_C0_2,</div><div class='add'>+	S2MPG10_METER_LPF_C0_3,</div><div class='add'>+	S2MPG10_METER_LPF_C0_4,</div><div class='add'>+	S2MPG10_METER_LPF_C0_5,</div><div class='add'>+	S2MPG10_METER_LPF_C0_6,</div><div class='add'>+	S2MPG10_METER_LPF_C0_7,</div><div class='add'>+	S2MPG10_METER_PWR_WARN0,</div><div class='add'>+	S2MPG10_METER_PWR_WARN1,</div><div class='add'>+	S2MPG10_METER_PWR_WARN2,</div><div class='add'>+	S2MPG10_METER_PWR_WARN3,</div><div class='add'>+	S2MPG10_METER_PWR_WARN4,</div><div class='add'>+	S2MPG10_METER_PWR_WARN5,</div><div class='add'>+	S2MPG10_METER_PWR_WARN6,</div><div class='add'>+	S2MPG10_METER_PWR_WARN7,</div><div class='add'>+	S2MPG10_METER_PWR_HYS1,</div><div class='add'>+	S2MPG10_METER_PWR_HYS2,</div><div class='add'>+	S2MPG10_METER_PWR_HYS3,</div><div class='add'>+	S2MPG10_METER_PWR_HYS4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH0_1 = 0x40,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH0_2,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH0_3,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH0_4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH0_5,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH0_6,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH1_1,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH1_2,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH1_3,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH1_4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH1_5,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH1_6,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH2_1,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH2_2,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH2_3,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH2_4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH2_5,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH2_6,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH3_1,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH3_2,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH3_3,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH3_4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH3_5,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH3_6,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH4_1,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH4_2,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH4_3,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH4_4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH4_5,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH4_6,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH5_1,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH5_2,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH5_3,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH5_4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH5_5,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH5_6,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH6_1,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH6_2,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH6_3,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH6_4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH6_5,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH6_6,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH7_1,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH7_2,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH7_3,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH7_4,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH7_5,</div><div class='add'>+	S2MPG10_METER_ACC_DATA_CH7_6,</div><div class='add'>+	S2MPG10_METER_ACC_COUNT_1,</div><div class='add'>+	S2MPG10_METER_ACC_COUNT_2,</div><div class='add'>+	S2MPG10_METER_ACC_COUNT_3,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH0_1,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH0_2,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH0_3,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH1_1,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH1_2,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH1_3,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH2_1,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH2_2,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH2_3,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH3_1,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH3_2,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH3_3,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH4_1,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH4_2,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH4_3,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH5_1,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH5_2,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH5_3,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH6_1,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH6_2,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH6_3,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH7_1,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH7_2,</div><div class='add'>+	S2MPG10_METER_LPF_DATA_CH7_3,</div><div class='add'>+	S2MPG10_METER_DSM_TRIM_OFFSET = 0xee,</div><div class='add'>+	S2MPG10_METER_BUCK_METER_TRIM3 = 0xf1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* S2MPG10 regulator IDs */</div><div class='add'>+enum s2mpg10_regulators {</div><div class='add'>+	S2MPG10_LDO1,</div><div class='add'>+	S2MPG10_LDO2,</div><div class='add'>+	S2MPG10_LDO3,</div><div class='add'>+	S2MPG10_LDO4,</div><div class='add'>+	S2MPG10_LDO5,</div><div class='add'>+	S2MPG10_LDO6,</div><div class='add'>+	S2MPG10_LDO7,</div><div class='add'>+	S2MPG10_LDO8,</div><div class='add'>+	S2MPG10_LDO9,</div><div class='add'>+	S2MPG10_LDO10,</div><div class='add'>+	S2MPG10_LDO11,</div><div class='add'>+	S2MPG10_LDO12,</div><div class='add'>+	S2MPG10_LDO13,</div><div class='add'>+	S2MPG10_LDO14,</div><div class='add'>+	S2MPG10_LDO15,</div><div class='add'>+	S2MPG10_LDO16,</div><div class='add'>+	S2MPG10_LDO17,</div><div class='add'>+	S2MPG10_LDO18,</div><div class='add'>+	S2MPG10_LDO19,</div><div class='add'>+	S2MPG10_LDO20,</div><div class='add'>+	S2MPG10_LDO21,</div><div class='add'>+	S2MPG10_LDO22,</div><div class='add'>+	S2MPG10_LDO23,</div><div class='add'>+	S2MPG10_LDO24,</div><div class='add'>+	S2MPG10_LDO25,</div><div class='add'>+	S2MPG10_LDO26,</div><div class='add'>+	S2MPG10_LDO27,</div><div class='add'>+	S2MPG10_LDO28,</div><div class='add'>+	S2MPG10_LDO29,</div><div class='add'>+	S2MPG10_LDO30,</div><div class='add'>+	S2MPG10_LDO31,</div><div class='add'>+	S2MPG10_BUCK1,</div><div class='add'>+	S2MPG10_BUCK2,</div><div class='add'>+	S2MPG10_BUCK3,</div><div class='add'>+	S2MPG10_BUCK4,</div><div class='add'>+	S2MPG10_BUCK5,</div><div class='add'>+	S2MPG10_BUCK6,</div><div class='add'>+	S2MPG10_BUCK7,</div><div class='add'>+	S2MPG10_BUCK8,</div><div class='add'>+	S2MPG10_BUCK9,</div><div class='add'>+	S2MPG10_BUCK10,</div><div class='add'>+	S2MPG10_REGULATOR_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_MFD_S2MPG10_H */</div><div class='head'>diff --git a/include/linux/mfd/samsung/s2mpu05.h b/include/linux/mfd/samsung/s2mpu05.h<br/>new file mode 100644<br/>index 000000000000..fcdb6c8adb03<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/samsung/s2mpu05.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/samsung/s2mpu05.h</a></div><div class='hunk'>@@ -0,0 +1,183 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2015 Samsung Electronics Co., Ltd</div><div class='add'>+ * Copyright (c) 2025 Kaustabh Chakraborty &lt;kauschluss@disroot.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_MFD_S2MPU05_H</div><div class='add'>+#define __LINUX_MFD_S2MPU05_H</div><div class='add'>+</div><div class='add'>+/* S2MPU05 registers */</div><div class='add'>+enum S2MPU05_reg {</div><div class='add'>+	S2MPU05_REG_ID,</div><div class='add'>+	S2MPU05_REG_INT1,</div><div class='add'>+	S2MPU05_REG_INT2,</div><div class='add'>+	S2MPU05_REG_INT3,</div><div class='add'>+	S2MPU05_REG_INT1M,</div><div class='add'>+	S2MPU05_REG_INT2M,</div><div class='add'>+	S2MPU05_REG_INT3M,</div><div class='add'>+	S2MPU05_REG_ST1,</div><div class='add'>+	S2MPU05_REG_ST2,</div><div class='add'>+	S2MPU05_REG_PWRONSRC,</div><div class='add'>+	S2MPU05_REG_OFFSRC,</div><div class='add'>+	S2MPU05_REG_BU_CHG,</div><div class='add'>+	S2MPU05_REG_RTC_BUF,</div><div class='add'>+	S2MPU05_REG_CTRL1,</div><div class='add'>+	S2MPU05_REG_CTRL2,</div><div class='add'>+	S2MPU05_REG_ETC_TEST,</div><div class='add'>+	S2MPU05_REG_OTP_ADRL,</div><div class='add'>+	S2MPU05_REG_OTP_ADRH,</div><div class='add'>+	S2MPU05_REG_OTP_DATA,</div><div class='add'>+	S2MPU05_REG_MON1SEL,</div><div class='add'>+	S2MPU05_REG_MON2SEL,</div><div class='add'>+	S2MPU05_REG_CTRL3,</div><div class='add'>+	S2MPU05_REG_ETC_OTP,</div><div class='add'>+	S2MPU05_REG_UVLO,</div><div class='add'>+	S2MPU05_REG_TIME_CTRL1,</div><div class='add'>+	S2MPU05_REG_TIME_CTRL2,</div><div class='add'>+	S2MPU05_REG_B1CTRL1,</div><div class='add'>+	S2MPU05_REG_B1CTRL2,</div><div class='add'>+	S2MPU05_REG_B2CTRL1,</div><div class='add'>+	S2MPU05_REG_B2CTRL2,</div><div class='add'>+	S2MPU05_REG_B2CTRL3,</div><div class='add'>+	S2MPU05_REG_B2CTRL4,</div><div class='add'>+	S2MPU05_REG_B3CTRL1,</div><div class='add'>+	S2MPU05_REG_B3CTRL2,</div><div class='add'>+	S2MPU05_REG_B3CTRL3,</div><div class='add'>+	S2MPU05_REG_B4CTRL1,</div><div class='add'>+	S2MPU05_REG_B4CTRL2,</div><div class='add'>+	S2MPU05_REG_B5CTRL1,</div><div class='add'>+	S2MPU05_REG_B5CTRL2,</div><div class='add'>+	S2MPU05_REG_BUCK_RAMP,</div><div class='add'>+	S2MPU05_REG_LDO_DVS1,</div><div class='add'>+	S2MPU05_REG_LDO_DVS9,</div><div class='add'>+	S2MPU05_REG_LDO_DVS10,</div><div class='add'>+	S2MPU05_REG_L1CTRL,</div><div class='add'>+	S2MPU05_REG_L2CTRL,</div><div class='add'>+	S2MPU05_REG_L3CTRL,</div><div class='add'>+	S2MPU05_REG_L4CTRL,</div><div class='add'>+	S2MPU05_REG_L5CTRL,</div><div class='add'>+	S2MPU05_REG_L6CTRL,</div><div class='add'>+	S2MPU05_REG_L7CTRL,</div><div class='add'>+	S2MPU05_REG_L8CTRL,</div><div class='add'>+	S2MPU05_REG_L9CTRL1,</div><div class='add'>+	S2MPU05_REG_L9CTRL2,</div><div class='add'>+	S2MPU05_REG_L10CTRL,</div><div class='add'>+	S2MPU05_REG_L11CTRL1,</div><div class='add'>+	S2MPU05_REG_L11CTRL2,</div><div class='add'>+	S2MPU05_REG_L12CTRL,</div><div class='add'>+	S2MPU05_REG_L13CTRL,</div><div class='add'>+	S2MPU05_REG_L14CTRL,</div><div class='add'>+	S2MPU05_REG_L15CTRL,</div><div class='add'>+	S2MPU05_REG_L16CTRL,</div><div class='add'>+	S2MPU05_REG_L17CTRL1,</div><div class='add'>+	S2MPU05_REG_L17CTRL2,</div><div class='add'>+	S2MPU05_REG_L18CTRL1,</div><div class='add'>+	S2MPU05_REG_L18CTRL2,</div><div class='add'>+	S2MPU05_REG_L19CTRL,</div><div class='add'>+	S2MPU05_REG_L20CTRL,</div><div class='add'>+	S2MPU05_REG_L21CTRL,</div><div class='add'>+	S2MPU05_REG_L22CTRL,</div><div class='add'>+	S2MPU05_REG_L23CTRL,</div><div class='add'>+	S2MPU05_REG_L24CTRL,</div><div class='add'>+	S2MPU05_REG_L25CTRL,</div><div class='add'>+	S2MPU05_REG_L26CTRL,</div><div class='add'>+	S2MPU05_REG_L27CTRL,</div><div class='add'>+	S2MPU05_REG_L28CTRL,</div><div class='add'>+	S2MPU05_REG_L29CTRL,</div><div class='add'>+	S2MPU05_REG_L30CTRL,</div><div class='add'>+	S2MPU05_REG_L31CTRL,</div><div class='add'>+	S2MPU05_REG_L32CTRL,</div><div class='add'>+	S2MPU05_REG_L33CTRL,</div><div class='add'>+	S2MPU05_REG_L34CTRL,</div><div class='add'>+	S2MPU05_REG_L35CTRL,</div><div class='add'>+	S2MPU05_REG_LDO_DSCH1,</div><div class='add'>+	S2MPU05_REG_LDO_DSCH2,</div><div class='add'>+	S2MPU05_REG_LDO_DSCH3,</div><div class='add'>+	S2MPU05_REG_LDO_DSCH4,</div><div class='add'>+	S2MPU05_REG_LDO_DSCH5,</div><div class='add'>+	S2MPU05_REG_LDO_CTRL1,</div><div class='add'>+	S2MPU05_REG_LDO_CTRL2,</div><div class='add'>+	S2MPU05_REG_TCXO_CTRL,</div><div class='add'>+	S2MPU05_REG_SELMIF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* S2MPU05 regulator ids */</div><div class='add'>+enum S2MPU05_regulators {</div><div class='add'>+	S2MPU05_LDO1,</div><div class='add'>+	S2MPU05_LDO2,</div><div class='add'>+	S2MPU05_LDO3,</div><div class='add'>+	S2MPU05_LDO4,</div><div class='add'>+	S2MPU05_LDO5,</div><div class='add'>+	S2MPU05_LDO6,</div><div class='add'>+	S2MPU05_LDO7,</div><div class='add'>+	S2MPU05_LDO8,</div><div class='add'>+	S2MPU05_LDO9,</div><div class='add'>+	S2MPU05_LDO10,</div><div class='add'>+	S2MPU05_LDO11,</div><div class='add'>+	S2MPU05_LDO12,</div><div class='add'>+	S2MPU05_LDO13,</div><div class='add'>+	S2MPU05_LDO14,</div><div class='add'>+	S2MPU05_LDO15,</div><div class='add'>+	S2MPU05_LDO16,</div><div class='add'>+	S2MPU05_LDO17,</div><div class='add'>+	S2MPU05_LDO18,</div><div class='add'>+	S2MPU05_LDO19,</div><div class='add'>+	S2MPU05_LDO20,</div><div class='add'>+	S2MPU05_LDO21,</div><div class='add'>+	S2MPU05_LDO22,</div><div class='add'>+	S2MPU05_LDO23,</div><div class='add'>+	S2MPU05_LDO24,</div><div class='add'>+	S2MPU05_LDO25,</div><div class='add'>+	S2MPU05_LDO26,</div><div class='add'>+	S2MPU05_LDO27,</div><div class='add'>+	S2MPU05_LDO28,</div><div class='add'>+	S2MPU05_LDO29,</div><div class='add'>+	S2MPU05_LDO30,</div><div class='add'>+	S2MPU05_LDO31,</div><div class='add'>+	S2MPU05_LDO32,</div><div class='add'>+	S2MPU05_LDO33,</div><div class='add'>+	S2MPU05_LDO34,</div><div class='add'>+	S2MPU05_LDO35,</div><div class='add'>+	S2MPU05_BUCK1,</div><div class='add'>+	S2MPU05_BUCK2,</div><div class='add'>+	S2MPU05_BUCK3,</div><div class='add'>+	S2MPU05_BUCK4,</div><div class='add'>+	S2MPU05_BUCK5,</div><div class='add'>+</div><div class='add'>+	S2MPU05_REGULATOR_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define S2MPU05_SW_ENABLE_MASK	0x03</div><div class='add'>+</div><div class='add'>+#define S2MPU05_ENABLE_TIME_LDO		128</div><div class='add'>+#define S2MPU05_ENABLE_TIME_BUCK1	110</div><div class='add'>+#define S2MPU05_ENABLE_TIME_BUCK2	110</div><div class='add'>+#define S2MPU05_ENABLE_TIME_BUCK3	110</div><div class='add'>+#define S2MPU05_ENABLE_TIME_BUCK4	150</div><div class='add'>+#define S2MPU05_ENABLE_TIME_BUCK5	150</div><div class='add'>+</div><div class='add'>+#define S2MPU05_LDO_MIN1	800000</div><div class='add'>+#define S2MPU05_LDO_MIN2	1800000</div><div class='add'>+#define S2MPU05_LDO_MIN3	400000</div><div class='add'>+#define S2MPU05_LDO_STEP1	12500</div><div class='add'>+#define S2MPU05_LDO_STEP2	25000</div><div class='add'>+</div><div class='add'>+#define S2MPU05_BUCK_MIN1	400000</div><div class='add'>+#define S2MPU05_BUCK_MIN2	600000</div><div class='add'>+#define S2MPU05_BUCK_STEP1	6250</div><div class='add'>+#define S2MPU05_BUCK_STEP2	12500</div><div class='add'>+</div><div class='add'>+#define S2MPU05_RAMP_DELAY	12000	/* uV/uS */</div><div class='add'>+</div><div class='add'>+#define S2MPU05_ENABLE_SHIFT	6</div><div class='add'>+#define S2MPU05_ENABLE_MASK	(0x03 &lt;&lt; S2MPU05_ENABLE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define S2MPU05_LDO_VSEL_MASK	0x3F</div><div class='add'>+#define S2MPU05_BUCK_VSEL_MASK	0xFF</div><div class='add'>+#define S2MPU05_LDO_N_VOLTAGES	(S2MPU05_LDO_VSEL_MASK + 1)</div><div class='add'>+#define S2MPU05_BUCK_N_VOLTAGES (S2MPU05_BUCK_VSEL_MASK + 1)</div><div class='add'>+</div><div class='add'>+#define S2MPU05_PMIC_EN_SHIFT	6</div><div class='add'>+</div><div class='add'>+#endif /*  __LINUX_MFD_S2MPU05_H */</div><div class='head'>diff --git a/include/linux/mfd/sta2x11-mfd.h b/include/linux/mfd/sta2x11-mfd.h<br/>deleted file mode 100644<br/>index 2001ca5c44a9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/sta2x11-mfd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/sta2x11-mfd.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,506 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2009-2011 Wind River Systems, Inc.</div><div class='del'>- * Copyright (c) 2011 ST Microelectronics (Alessandro Rubini)</div><div class='del'>- *</div><div class='del'>- * The STMicroelectronics ConneXt (STA2X11) chip has several unrelated</div><div class='del'>- * functions in one PCI endpoint functions. This driver simply</div><div class='del'>- * registers the platform devices in this iomemregion and exports a few</div><div class='del'>- * functions to access common registers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __STA2X11_MFD_H</div><div class='del'>-#define __STA2X11_MFD_H</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-enum sta2x11_mfd_plat_dev {</div><div class='del'>-	sta2x11_sctl = 0,</div><div class='del'>-	sta2x11_gpio,</div><div class='del'>-	sta2x11_scr,</div><div class='del'>-	sta2x11_time,</div><div class='del'>-	sta2x11_apbreg,</div><div class='del'>-	sta2x11_apb_soc_regs,</div><div class='del'>-	sta2x11_vic,</div><div class='del'>-	sta2x11_n_mfd_plat_devs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STA2X11_MFD_SCTL_NAME	       "sta2x11-sctl"</div><div class='del'>-#define STA2X11_MFD_GPIO_NAME	       "sta2x11-gpio"</div><div class='del'>-#define STA2X11_MFD_SCR_NAME	       "sta2x11-scr"</div><div class='del'>-#define STA2X11_MFD_TIME_NAME	       "sta2x11-time"</div><div class='del'>-#define STA2X11_MFD_APBREG_NAME	       "sta2x11-apbreg"</div><div class='del'>-#define STA2X11_MFD_APB_SOC_REGS_NAME  "sta2x11-apb-soc-regs"</div><div class='del'>-#define STA2X11_MFD_VIC_NAME	       "sta2x11-vic"</div><div class='del'>-</div><div class='del'>-extern u32</div><div class='del'>-__sta2x11_mfd_mask(struct pci_dev *, u32, u32, u32, enum sta2x11_mfd_plat_dev);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The MFD PCI block includes the GPIO peripherals and other register blocks.</div><div class='del'>- * For GPIO, we have 32*4 bits (I use "gsta" for "gpio sta2x11".)</div><div class='del'>- */</div><div class='del'>-#define GSTA_GPIO_PER_BLOCK	32</div><div class='del'>-#define GSTA_NR_BLOCKS		4</div><div class='del'>-#define GSTA_NR_GPIO		(GSTA_GPIO_PER_BLOCK * GSTA_NR_BLOCKS)</div><div class='del'>-</div><div class='del'>-/* Pinconfig is set by the board definition: altfunc, pull-up, pull-down */</div><div class='del'>-struct sta2x11_gpio_pdata {</div><div class='del'>-	unsigned pinconfig[GSTA_NR_GPIO];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Macros below lifted from sh_pfc.h, with minor differences */</div><div class='del'>-#define PINMUX_TYPE_NONE		0</div><div class='del'>-#define PINMUX_TYPE_FUNCTION		1</div><div class='del'>-#define PINMUX_TYPE_OUTPUT_LOW		2</div><div class='del'>-#define PINMUX_TYPE_OUTPUT_HIGH		3</div><div class='del'>-#define PINMUX_TYPE_INPUT		4</div><div class='del'>-#define PINMUX_TYPE_INPUT_PULLUP	5</div><div class='del'>-#define PINMUX_TYPE_INPUT_PULLDOWN	6</div><div class='del'>-</div><div class='del'>-/* Give names to GPIO pins, like PXA does, taken from the manual */</div><div class='del'>-#define STA2X11_GPIO0			0</div><div class='del'>-#define STA2X11_GPIO1			1</div><div class='del'>-#define STA2X11_GPIO2			2</div><div class='del'>-#define STA2X11_GPIO3			3</div><div class='del'>-#define STA2X11_GPIO4			4</div><div class='del'>-#define STA2X11_GPIO5			5</div><div class='del'>-#define STA2X11_GPIO6			6</div><div class='del'>-#define STA2X11_GPIO7			7</div><div class='del'>-#define STA2X11_GPIO8_RGBOUT_RED7	8</div><div class='del'>-#define STA2X11_GPIO9_RGBOUT_RED6	9</div><div class='del'>-#define STA2X11_GPIO10_RGBOUT_RED5	10</div><div class='del'>-#define STA2X11_GPIO11_RGBOUT_RED4	11</div><div class='del'>-#define STA2X11_GPIO12_RGBOUT_RED3	12</div><div class='del'>-#define STA2X11_GPIO13_RGBOUT_RED2	13</div><div class='del'>-#define STA2X11_GPIO14_RGBOUT_RED1	14</div><div class='del'>-#define STA2X11_GPIO15_RGBOUT_RED0	15</div><div class='del'>-#define STA2X11_GPIO16_RGBOUT_GREEN7	16</div><div class='del'>-#define STA2X11_GPIO17_RGBOUT_GREEN6	17</div><div class='del'>-#define STA2X11_GPIO18_RGBOUT_GREEN5	18</div><div class='del'>-#define STA2X11_GPIO19_RGBOUT_GREEN4	19</div><div class='del'>-#define STA2X11_GPIO20_RGBOUT_GREEN3	20</div><div class='del'>-#define STA2X11_GPIO21_RGBOUT_GREEN2	21</div><div class='del'>-#define STA2X11_GPIO22_RGBOUT_GREEN1	22</div><div class='del'>-#define STA2X11_GPIO23_RGBOUT_GREEN0	23</div><div class='del'>-#define STA2X11_GPIO24_RGBOUT_BLUE7	24</div><div class='del'>-#define STA2X11_GPIO25_RGBOUT_BLUE6	25</div><div class='del'>-#define STA2X11_GPIO26_RGBOUT_BLUE5	26</div><div class='del'>-#define STA2X11_GPIO27_RGBOUT_BLUE4	27</div><div class='del'>-#define STA2X11_GPIO28_RGBOUT_BLUE3	28</div><div class='del'>-#define STA2X11_GPIO29_RGBOUT_BLUE2	29</div><div class='del'>-#define STA2X11_GPIO30_RGBOUT_BLUE1	30</div><div class='del'>-#define STA2X11_GPIO31_RGBOUT_BLUE0	31</div><div class='del'>-#define STA2X11_GPIO32_RGBOUT_VSYNCH	32</div><div class='del'>-#define STA2X11_GPIO33_RGBOUT_HSYNCH	33</div><div class='del'>-#define STA2X11_GPIO34_RGBOUT_DEN	34</div><div class='del'>-#define STA2X11_GPIO35_ETH_CRS_DV	35</div><div class='del'>-#define STA2X11_GPIO36_ETH_TXD1		36</div><div class='del'>-#define STA2X11_GPIO37_ETH_TXD0		37</div><div class='del'>-#define STA2X11_GPIO38_ETH_TX_EN	38</div><div class='del'>-#define STA2X11_GPIO39_MDIO		39</div><div class='del'>-#define STA2X11_GPIO40_ETH_REF_CLK	40</div><div class='del'>-#define STA2X11_GPIO41_ETH_RXD1		41</div><div class='del'>-#define STA2X11_GPIO42_ETH_RXD0		42</div><div class='del'>-#define STA2X11_GPIO43_MDC		43</div><div class='del'>-#define STA2X11_GPIO44_CAN_TX		44</div><div class='del'>-#define STA2X11_GPIO45_CAN_RX		45</div><div class='del'>-#define STA2X11_GPIO46_MLB_DAT		46</div><div class='del'>-#define STA2X11_GPIO47_MLB_SIG		47</div><div class='del'>-#define STA2X11_GPIO48_SPI0_CLK		48</div><div class='del'>-#define STA2X11_GPIO49_SPI0_TXD		49</div><div class='del'>-#define STA2X11_GPIO50_SPI0_RXD		50</div><div class='del'>-#define STA2X11_GPIO51_SPI0_FRM		51</div><div class='del'>-#define STA2X11_GPIO52_SPI1_CLK		52</div><div class='del'>-#define STA2X11_GPIO53_SPI1_TXD		53</div><div class='del'>-#define STA2X11_GPIO54_SPI1_RXD		54</div><div class='del'>-#define STA2X11_GPIO55_SPI1_FRM		55</div><div class='del'>-#define STA2X11_GPIO56_SPI2_CLK		56</div><div class='del'>-#define STA2X11_GPIO57_SPI2_TXD		57</div><div class='del'>-#define STA2X11_GPIO58_SPI2_RXD		58</div><div class='del'>-#define STA2X11_GPIO59_SPI2_FRM		59</div><div class='del'>-#define STA2X11_GPIO60_I2C0_SCL		60</div><div class='del'>-#define STA2X11_GPIO61_I2C0_SDA		61</div><div class='del'>-#define STA2X11_GPIO62_I2C1_SCL		62</div><div class='del'>-#define STA2X11_GPIO63_I2C1_SDA		63</div><div class='del'>-#define STA2X11_GPIO64_I2C2_SCL		64</div><div class='del'>-#define STA2X11_GPIO65_I2C2_SDA		65</div><div class='del'>-#define STA2X11_GPIO66_I2C3_SCL		66</div><div class='del'>-#define STA2X11_GPIO67_I2C3_SDA		67</div><div class='del'>-#define STA2X11_GPIO68_MSP0_RCK		68</div><div class='del'>-#define STA2X11_GPIO69_MSP0_RXD		69</div><div class='del'>-#define STA2X11_GPIO70_MSP0_RFS		70</div><div class='del'>-#define STA2X11_GPIO71_MSP0_TCK		71</div><div class='del'>-#define STA2X11_GPIO72_MSP0_TXD		72</div><div class='del'>-#define STA2X11_GPIO73_MSP0_TFS		73</div><div class='del'>-#define STA2X11_GPIO74_MSP0_SCK		74</div><div class='del'>-#define STA2X11_GPIO75_MSP1_CK		75</div><div class='del'>-#define STA2X11_GPIO76_MSP1_RXD		76</div><div class='del'>-#define STA2X11_GPIO77_MSP1_FS		77</div><div class='del'>-#define STA2X11_GPIO78_MSP1_TXD		78</div><div class='del'>-#define STA2X11_GPIO79_MSP2_CK		79</div><div class='del'>-#define STA2X11_GPIO80_MSP2_RXD		80</div><div class='del'>-#define STA2X11_GPIO81_MSP2_FS		81</div><div class='del'>-#define STA2X11_GPIO82_MSP2_TXD		82</div><div class='del'>-#define STA2X11_GPIO83_MSP3_CK		83</div><div class='del'>-#define STA2X11_GPIO84_MSP3_RXD		84</div><div class='del'>-#define STA2X11_GPIO85_MSP3_FS		85</div><div class='del'>-#define STA2X11_GPIO86_MSP3_TXD		86</div><div class='del'>-#define STA2X11_GPIO87_MSP4_CK		87</div><div class='del'>-#define STA2X11_GPIO88_MSP4_RXD		88</div><div class='del'>-#define STA2X11_GPIO89_MSP4_FS		89</div><div class='del'>-#define STA2X11_GPIO90_MSP4_TXD		90</div><div class='del'>-#define STA2X11_GPIO91_MSP5_CK		91</div><div class='del'>-#define STA2X11_GPIO92_MSP5_RXD		92</div><div class='del'>-#define STA2X11_GPIO93_MSP5_FS		93</div><div class='del'>-#define STA2X11_GPIO94_MSP5_TXD		94</div><div class='del'>-#define STA2X11_GPIO95_SDIO3_DAT3	95</div><div class='del'>-#define STA2X11_GPIO96_SDIO3_DAT2	96</div><div class='del'>-#define STA2X11_GPIO97_SDIO3_DAT1	97</div><div class='del'>-#define STA2X11_GPIO98_SDIO3_DAT0	98</div><div class='del'>-#define STA2X11_GPIO99_SDIO3_CLK	99</div><div class='del'>-#define STA2X11_GPIO100_SDIO3_CMD	100</div><div class='del'>-#define STA2X11_GPIO101			101</div><div class='del'>-#define STA2X11_GPIO102			102</div><div class='del'>-#define STA2X11_GPIO103			103</div><div class='del'>-#define STA2X11_GPIO104			104</div><div class='del'>-#define STA2X11_GPIO105_SDIO2_DAT3	105</div><div class='del'>-#define STA2X11_GPIO106_SDIO2_DAT2	106</div><div class='del'>-#define STA2X11_GPIO107_SDIO2_DAT1	107</div><div class='del'>-#define STA2X11_GPIO108_SDIO2_DAT0	108</div><div class='del'>-#define STA2X11_GPIO109_SDIO2_CLK	109</div><div class='del'>-#define STA2X11_GPIO110_SDIO2_CMD	110</div><div class='del'>-#define STA2X11_GPIO111			111</div><div class='del'>-#define STA2X11_GPIO112			112</div><div class='del'>-#define STA2X11_GPIO113			113</div><div class='del'>-#define STA2X11_GPIO114			114</div><div class='del'>-#define STA2X11_GPIO115_SDIO1_DAT3	115</div><div class='del'>-#define STA2X11_GPIO116_SDIO1_DAT2	116</div><div class='del'>-#define STA2X11_GPIO117_SDIO1_DAT1	117</div><div class='del'>-#define STA2X11_GPIO118_SDIO1_DAT0	118</div><div class='del'>-#define STA2X11_GPIO119_SDIO1_CLK	119</div><div class='del'>-#define STA2X11_GPIO120_SDIO1_CMD	120</div><div class='del'>-#define STA2X11_GPIO121			121</div><div class='del'>-#define STA2X11_GPIO122			122</div><div class='del'>-#define STA2X11_GPIO123			123</div><div class='del'>-#define STA2X11_GPIO124			124</div><div class='del'>-#define STA2X11_GPIO125_UART2_TXD	125</div><div class='del'>-#define STA2X11_GPIO126_UART2_RXD	126</div><div class='del'>-#define STA2X11_GPIO127_UART3_TXD	127</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The APB bridge has its own registers, needed by our users as well.</div><div class='del'>- * They are accessed with the following read/mask/write function.</div><div class='del'>- */</div><div class='del'>-static inline u32</div><div class='del'>-sta2x11_apbreg_mask(struct pci_dev *pdev, u32 reg, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	return __sta2x11_mfd_mask(pdev, reg, mask, val, sta2x11_apbreg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* CAN and MLB */</div><div class='del'>-#define APBREG_BSR	0x00	/* Bridge Status Reg */</div><div class='del'>-#define APBREG_PAER	0x08	/* Peripherals Address Error Reg */</div><div class='del'>-#define APBREG_PWAC	0x20	/* Peripheral Write Access Control reg */</div><div class='del'>-#define APBREG_PRAC	0x40	/* Peripheral Read Access Control reg */</div><div class='del'>-#define APBREG_PCG	0x60	/* Peripheral Clock Gating Reg */</div><div class='del'>-#define APBREG_PUR	0x80	/* Peripheral Under Reset Reg */</div><div class='del'>-#define APBREG_EMU_PCG	0xA0	/* Emulator Peripheral Clock Gating Reg */</div><div class='del'>-</div><div class='del'>-#define APBREG_CAN	(1 &lt;&lt; 1)</div><div class='del'>-#define APBREG_MLB	(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-/* SARAC */</div><div class='del'>-#define APBREG_BSR_SARAC     0x100 /* Bridge Status Reg */</div><div class='del'>-#define APBREG_PAER_SARAC    0x108 /* Peripherals Address Error Reg */</div><div class='del'>-#define APBREG_PWAC_SARAC    0x120 /* Peripheral Write Access Control reg */</div><div class='del'>-#define APBREG_PRAC_SARAC    0x140 /* Peripheral Read Access Control reg */</div><div class='del'>-#define APBREG_PCG_SARAC     0x160 /* Peripheral Clock Gating Reg */</div><div class='del'>-#define APBREG_PUR_SARAC     0x180 /* Peripheral Under Reset Reg */</div><div class='del'>-#define APBREG_EMU_PCG_SARAC 0x1A0 /* Emulator Peripheral Clock Gating Reg */</div><div class='del'>-</div><div class='del'>-#define APBREG_SARAC	(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The system controller has its own registers. Some of these are accessed</div><div class='del'>- * by out users as well, using the following read/mask/write/function</div><div class='del'>- */</div><div class='del'>-static inline</div><div class='del'>-u32 sta2x11_sctl_mask(struct pci_dev *pdev, u32 reg, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	return __sta2x11_mfd_mask(pdev, reg, mask, val, sta2x11_sctl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SCTL_SCCTL		0x00	/* System controller control register */</div><div class='del'>-#define SCTL_ARMCFG		0x04	/* ARM configuration register */</div><div class='del'>-#define SCTL_SCPLLCTL		0x08	/* PLL control status register */</div><div class='del'>-</div><div class='del'>-#define SCTL_SCPLLCTL_AUDIO_PLL_PD	     BIT(1)</div><div class='del'>-#define SCTL_SCPLLCTL_FRAC_CONTROL	     BIT(3)</div><div class='del'>-#define SCTL_SCPLLCTL_STRB_BYPASS	     BIT(6)</div><div class='del'>-#define SCTL_SCPLLCTL_STRB_INPUT	     BIT(8)</div><div class='del'>-</div><div class='del'>-#define SCTL_SCPLLFCTRL		0x0c	/* PLL frequency control register */</div><div class='del'>-</div><div class='del'>-#define SCTL_SCPLLFCTRL_AUDIO_PLL_NDIV_MASK	0xff</div><div class='del'>-#define SCTL_SCPLLFCTRL_AUDIO_PLL_NDIV_SHIFT	  10</div><div class='del'>-#define SCTL_SCPLLFCTRL_AUDIO_PLL_IDF_MASK	   7</div><div class='del'>-#define SCTL_SCPLLFCTRL_AUDIO_PLL_IDF_SHIFT	  21</div><div class='del'>-#define SCTL_SCPLLFCTRL_AUDIO_PLL_ODF_MASK	   7</div><div class='del'>-#define SCTL_SCPLLFCTRL_AUDIO_PLL_ODF_SHIFT	  18</div><div class='del'>-#define SCTL_SCPLLFCTRL_DITHER_DISABLE_MASK     0x03</div><div class='del'>-#define SCTL_SCPLLFCTRL_DITHER_DISABLE_SHIFT       4</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define SCTL_SCRESFRACT		0x10	/* PLL fractional input register */</div><div class='del'>-</div><div class='del'>-#define SCTL_SCRESFRACT_MASK	0x0000ffff</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define SCTL_SCRESCTRL1		0x14	/* Peripheral reset control 1 */</div><div class='del'>-#define SCTL_SCRESXTRL2		0x18	/* Peripheral reset control 2 */</div><div class='del'>-#define SCTL_SCPEREN0		0x1c	/* Peripheral clock enable register 0 */</div><div class='del'>-#define SCTL_SCPEREN1		0x20	/* Peripheral clock enable register 1 */</div><div class='del'>-#define SCTL_SCPEREN2		0x24	/* Peripheral clock enable register 2 */</div><div class='del'>-#define SCTL_SCGRST		0x28	/* Peripheral global reset */</div><div class='del'>-#define SCTL_SCPCIECSBRST       0x2c    /* PCIe PAB CSB reset status register */</div><div class='del'>-#define SCTL_SCPCIPMCR1		0x30	/* PCI power management control 1 */</div><div class='del'>-#define SCTL_SCPCIPMCR2		0x34	/* PCI power management control 2 */</div><div class='del'>-#define SCTL_SCPCIPMSR1		0x38	/* PCI power management status 1 */</div><div class='del'>-#define SCTL_SCPCIPMSR2		0x3c	/* PCI power management status 2 */</div><div class='del'>-#define SCTL_SCPCIPMSR3		0x40	/* PCI power management status 3 */</div><div class='del'>-#define SCTL_SCINTREN		0x44	/* Interrupt enable */</div><div class='del'>-#define SCTL_SCRISR		0x48	/* RAW interrupt status */</div><div class='del'>-#define SCTL_SCCLKSTAT0		0x4c	/* Peripheral clocks status 0 */</div><div class='del'>-#define SCTL_SCCLKSTAT1		0x50	/* Peripheral clocks status 1 */</div><div class='del'>-#define SCTL_SCCLKSTAT2		0x54	/* Peripheral clocks status 2 */</div><div class='del'>-#define SCTL_SCRSTSTA		0x58	/* Reset status register */</div><div class='del'>-</div><div class='del'>-#define SCTL_SCRESCTRL1_USB_PHY_POR	(1 &lt;&lt; 0)</div><div class='del'>-#define SCTL_SCRESCTRL1_USB_OTG	(1 &lt;&lt; 1)</div><div class='del'>-#define SCTL_SCRESCTRL1_USB_HRST	(1 &lt;&lt; 2)</div><div class='del'>-#define SCTL_SCRESCTRL1_USB_PHY_HOST	(1 &lt;&lt; 3)</div><div class='del'>-#define SCTL_SCRESCTRL1_SATAII	(1 &lt;&lt; 4)</div><div class='del'>-#define SCTL_SCRESCTRL1_VIP		(1 &lt;&lt; 5)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MMC0	(1 &lt;&lt; 6)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MMC1	(1 &lt;&lt; 7)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_GPIO0	(1 &lt;&lt; 8)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_GPIO1	(1 &lt;&lt; 9)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_GPIO2	(1 &lt;&lt; 10)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_GPIO3	(1 &lt;&lt; 11)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MTU0	(1 &lt;&lt; 12)</div><div class='del'>-#define SCTL_SCRESCTRL1_KER_SPI0	(1 &lt;&lt; 13)</div><div class='del'>-#define SCTL_SCRESCTRL1_KER_SPI1	(1 &lt;&lt; 14)</div><div class='del'>-#define SCTL_SCRESCTRL1_KER_SPI2	(1 &lt;&lt; 15)</div><div class='del'>-#define SCTL_SCRESCTRL1_KER_MCI0	(1 &lt;&lt; 16)</div><div class='del'>-#define SCTL_SCRESCTRL1_KER_MCI1	(1 &lt;&lt; 17)</div><div class='del'>-#define SCTL_SCRESCTRL1_PRE_HSI2C0	(1 &lt;&lt; 18)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_HSI2C1	(1 &lt;&lt; 19)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_HSI2C2	(1 &lt;&lt; 20)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_HSI2C3	(1 &lt;&lt; 21)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MSP0	(1 &lt;&lt; 22)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MSP1	(1 &lt;&lt; 23)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MSP2	(1 &lt;&lt; 24)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MSP3	(1 &lt;&lt; 25)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MSP4	(1 &lt;&lt; 26)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MSP5	(1 &lt;&lt; 27)</div><div class='del'>-#define SCTL_SCRESCTRL1_PER_MMC	(1 &lt;&lt; 28)</div><div class='del'>-#define SCTL_SCRESCTRL1_KER_MSP0	(1 &lt;&lt; 29)</div><div class='del'>-#define SCTL_SCRESCTRL1_KER_MSP1	(1 &lt;&lt; 30)</div><div class='del'>-#define SCTL_SCRESCTRL1_KER_MSP2	(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-#define SCTL_SCPEREN0_UART0		(1 &lt;&lt; 0)</div><div class='del'>-#define SCTL_SCPEREN0_UART1		(1 &lt;&lt; 1)</div><div class='del'>-#define SCTL_SCPEREN0_UART2		(1 &lt;&lt; 2)</div><div class='del'>-#define SCTL_SCPEREN0_UART3		(1 &lt;&lt; 3)</div><div class='del'>-#define SCTL_SCPEREN0_MSP0		(1 &lt;&lt; 4)</div><div class='del'>-#define SCTL_SCPEREN0_MSP1		(1 &lt;&lt; 5)</div><div class='del'>-#define SCTL_SCPEREN0_MSP2		(1 &lt;&lt; 6)</div><div class='del'>-#define SCTL_SCPEREN0_MSP3		(1 &lt;&lt; 7)</div><div class='del'>-#define SCTL_SCPEREN0_MSP4		(1 &lt;&lt; 8)</div><div class='del'>-#define SCTL_SCPEREN0_MSP5		(1 &lt;&lt; 9)</div><div class='del'>-#define SCTL_SCPEREN0_SPI0		(1 &lt;&lt; 10)</div><div class='del'>-#define SCTL_SCPEREN0_SPI1		(1 &lt;&lt; 11)</div><div class='del'>-#define SCTL_SCPEREN0_SPI2		(1 &lt;&lt; 12)</div><div class='del'>-#define SCTL_SCPEREN0_I2C0		(1 &lt;&lt; 13)</div><div class='del'>-#define SCTL_SCPEREN0_I2C1		(1 &lt;&lt; 14)</div><div class='del'>-#define SCTL_SCPEREN0_I2C2		(1 &lt;&lt; 15)</div><div class='del'>-#define SCTL_SCPEREN0_I2C3		(1 &lt;&lt; 16)</div><div class='del'>-#define SCTL_SCPEREN0_SVDO_LVDS		(1 &lt;&lt; 17)</div><div class='del'>-#define SCTL_SCPEREN0_USB_HOST		(1 &lt;&lt; 18)</div><div class='del'>-#define SCTL_SCPEREN0_USB_OTG		(1 &lt;&lt; 19)</div><div class='del'>-#define SCTL_SCPEREN0_MCI0		(1 &lt;&lt; 20)</div><div class='del'>-#define SCTL_SCPEREN0_MCI1		(1 &lt;&lt; 21)</div><div class='del'>-#define SCTL_SCPEREN0_MCI2		(1 &lt;&lt; 22)</div><div class='del'>-#define SCTL_SCPEREN0_MCI3		(1 &lt;&lt; 23)</div><div class='del'>-#define SCTL_SCPEREN0_SATA		(1 &lt;&lt; 24)</div><div class='del'>-#define SCTL_SCPEREN0_ETHERNET		(1 &lt;&lt; 25)</div><div class='del'>-#define SCTL_SCPEREN0_VIC		(1 &lt;&lt; 26)</div><div class='del'>-#define SCTL_SCPEREN0_DMA_AUDIO		(1 &lt;&lt; 27)</div><div class='del'>-#define SCTL_SCPEREN0_DMA_SOC		(1 &lt;&lt; 28)</div><div class='del'>-#define SCTL_SCPEREN0_RAM		(1 &lt;&lt; 29)</div><div class='del'>-#define SCTL_SCPEREN0_VIP		(1 &lt;&lt; 30)</div><div class='del'>-#define SCTL_SCPEREN0_ARM		(1 &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-#define SCTL_SCPEREN1_UART0		(1 &lt;&lt; 0)</div><div class='del'>-#define SCTL_SCPEREN1_UART1		(1 &lt;&lt; 1)</div><div class='del'>-#define SCTL_SCPEREN1_UART2		(1 &lt;&lt; 2)</div><div class='del'>-#define SCTL_SCPEREN1_UART3		(1 &lt;&lt; 3)</div><div class='del'>-#define SCTL_SCPEREN1_MSP0		(1 &lt;&lt; 4)</div><div class='del'>-#define SCTL_SCPEREN1_MSP1		(1 &lt;&lt; 5)</div><div class='del'>-#define SCTL_SCPEREN1_MSP2		(1 &lt;&lt; 6)</div><div class='del'>-#define SCTL_SCPEREN1_MSP3		(1 &lt;&lt; 7)</div><div class='del'>-#define SCTL_SCPEREN1_MSP4		(1 &lt;&lt; 8)</div><div class='del'>-#define SCTL_SCPEREN1_MSP5		(1 &lt;&lt; 9)</div><div class='del'>-#define SCTL_SCPEREN1_SPI0		(1 &lt;&lt; 10)</div><div class='del'>-#define SCTL_SCPEREN1_SPI1		(1 &lt;&lt; 11)</div><div class='del'>-#define SCTL_SCPEREN1_SPI2		(1 &lt;&lt; 12)</div><div class='del'>-#define SCTL_SCPEREN1_I2C0		(1 &lt;&lt; 13)</div><div class='del'>-#define SCTL_SCPEREN1_I2C1		(1 &lt;&lt; 14)</div><div class='del'>-#define SCTL_SCPEREN1_I2C2		(1 &lt;&lt; 15)</div><div class='del'>-#define SCTL_SCPEREN1_I2C3		(1 &lt;&lt; 16)</div><div class='del'>-#define SCTL_SCPEREN1_USB_PHY		(1 &lt;&lt; 17)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * APB-SOC registers</div><div class='del'>- */</div><div class='del'>-static inline</div><div class='del'>-u32 sta2x11_apb_soc_regs_mask(struct pci_dev *pdev, u32 reg, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	return __sta2x11_mfd_mask(pdev, reg, mask, val, sta2x11_apb_soc_regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define PCIE_EP1_FUNC3_0_INTR_REG	0x000</div><div class='del'>-#define PCIE_EP1_FUNC7_4_INTR_REG	0x004</div><div class='del'>-#define PCIE_EP2_FUNC3_0_INTR_REG	0x008</div><div class='del'>-#define PCIE_EP2_FUNC7_4_INTR_REG	0x00c</div><div class='del'>-#define PCIE_EP3_FUNC3_0_INTR_REG	0x010</div><div class='del'>-#define PCIE_EP3_FUNC7_4_INTR_REG	0x014</div><div class='del'>-#define PCIE_EP4_FUNC3_0_INTR_REG	0x018</div><div class='del'>-#define PCIE_EP4_FUNC7_4_INTR_REG	0x01c</div><div class='del'>-#define PCIE_INTR_ENABLE0_REG		0x020</div><div class='del'>-#define PCIE_INTR_ENABLE1_REG		0x024</div><div class='del'>-#define PCIE_EP1_FUNC_TC_REG		0x028</div><div class='del'>-#define PCIE_EP2_FUNC_TC_REG		0x02c</div><div class='del'>-#define PCIE_EP3_FUNC_TC_REG		0x030</div><div class='del'>-#define PCIE_EP4_FUNC_TC_REG		0x034</div><div class='del'>-#define PCIE_EP1_FUNC_F_REG		0x038</div><div class='del'>-#define PCIE_EP2_FUNC_F_REG		0x03c</div><div class='del'>-#define PCIE_EP3_FUNC_F_REG		0x040</div><div class='del'>-#define PCIE_EP4_FUNC_F_REG		0x044</div><div class='del'>-#define PCIE_PAB_AMBA_SW_RST_REG	0x048</div><div class='del'>-#define PCIE_PM_STATUS_0_PORT_0_4	0x04c</div><div class='del'>-#define PCIE_PM_STATUS_7_0_EP1		0x050</div><div class='del'>-#define PCIE_PM_STATUS_7_0_EP2		0x054</div><div class='del'>-#define PCIE_PM_STATUS_7_0_EP3		0x058</div><div class='del'>-#define PCIE_PM_STATUS_7_0_EP4		0x05c</div><div class='del'>-#define PCIE_DEV_ID_0_EP1_REG		0x060</div><div class='del'>-#define PCIE_CC_REV_ID_0_EP1_REG	0x064</div><div class='del'>-#define PCIE_DEV_ID_1_EP1_REG		0x068</div><div class='del'>-#define PCIE_CC_REV_ID_1_EP1_REG	0x06c</div><div class='del'>-#define PCIE_DEV_ID_2_EP1_REG		0x070</div><div class='del'>-#define PCIE_CC_REV_ID_2_EP1_REG	0x074</div><div class='del'>-#define PCIE_DEV_ID_3_EP1_REG		0x078</div><div class='del'>-#define PCIE_CC_REV_ID_3_EP1_REG	0x07c</div><div class='del'>-#define PCIE_DEV_ID_4_EP1_REG		0x080</div><div class='del'>-#define PCIE_CC_REV_ID_4_EP1_REG	0x084</div><div class='del'>-#define PCIE_DEV_ID_5_EP1_REG		0x088</div><div class='del'>-#define PCIE_CC_REV_ID_5_EP1_REG	0x08c</div><div class='del'>-#define PCIE_DEV_ID_6_EP1_REG		0x090</div><div class='del'>-#define PCIE_CC_REV_ID_6_EP1_REG	0x094</div><div class='del'>-#define PCIE_DEV_ID_7_EP1_REG		0x098</div><div class='del'>-#define PCIE_CC_REV_ID_7_EP1_REG	0x09c</div><div class='del'>-#define PCIE_DEV_ID_0_EP2_REG		0x0a0</div><div class='del'>-#define PCIE_CC_REV_ID_0_EP2_REG	0x0a4</div><div class='del'>-#define PCIE_DEV_ID_1_EP2_REG		0x0a8</div><div class='del'>-#define PCIE_CC_REV_ID_1_EP2_REG	0x0ac</div><div class='del'>-#define PCIE_DEV_ID_2_EP2_REG		0x0b0</div><div class='del'>-#define PCIE_CC_REV_ID_2_EP2_REG	0x0b4</div><div class='del'>-#define PCIE_DEV_ID_3_EP2_REG		0x0b8</div><div class='del'>-#define PCIE_CC_REV_ID_3_EP2_REG	0x0bc</div><div class='del'>-#define PCIE_DEV_ID_4_EP2_REG		0x0c0</div><div class='del'>-#define PCIE_CC_REV_ID_4_EP2_REG	0x0c4</div><div class='del'>-#define PCIE_DEV_ID_5_EP2_REG		0x0c8</div><div class='del'>-#define PCIE_CC_REV_ID_5_EP2_REG	0x0cc</div><div class='del'>-#define PCIE_DEV_ID_6_EP2_REG		0x0d0</div><div class='del'>-#define PCIE_CC_REV_ID_6_EP2_REG	0x0d4</div><div class='del'>-#define PCIE_DEV_ID_7_EP2_REG		0x0d8</div><div class='del'>-#define PCIE_CC_REV_ID_7_EP2_REG	0x0dC</div><div class='del'>-#define PCIE_DEV_ID_0_EP3_REG		0x0e0</div><div class='del'>-#define PCIE_CC_REV_ID_0_EP3_REG	0x0e4</div><div class='del'>-#define PCIE_DEV_ID_1_EP3_REG		0x0e8</div><div class='del'>-#define PCIE_CC_REV_ID_1_EP3_REG	0x0ec</div><div class='del'>-#define PCIE_DEV_ID_2_EP3_REG		0x0f0</div><div class='del'>-#define PCIE_CC_REV_ID_2_EP3_REG	0x0f4</div><div class='del'>-#define PCIE_DEV_ID_3_EP3_REG		0x0f8</div><div class='del'>-#define PCIE_CC_REV_ID_3_EP3_REG	0x0fc</div><div class='del'>-#define PCIE_DEV_ID_4_EP3_REG		0x100</div><div class='del'>-#define PCIE_CC_REV_ID_4_EP3_REG	0x104</div><div class='del'>-#define PCIE_DEV_ID_5_EP3_REG		0x108</div><div class='del'>-#define PCIE_CC_REV_ID_5_EP3_REG	0x10c</div><div class='del'>-#define PCIE_DEV_ID_6_EP3_REG		0x110</div><div class='del'>-#define PCIE_CC_REV_ID_6_EP3_REG	0x114</div><div class='del'>-#define PCIE_DEV_ID_7_EP3_REG		0x118</div><div class='del'>-#define PCIE_CC_REV_ID_7_EP3_REG	0x11c</div><div class='del'>-#define PCIE_DEV_ID_0_EP4_REG		0x120</div><div class='del'>-#define PCIE_CC_REV_ID_0_EP4_REG	0x124</div><div class='del'>-#define PCIE_DEV_ID_1_EP4_REG		0x128</div><div class='del'>-#define PCIE_CC_REV_ID_1_EP4_REG	0x12c</div><div class='del'>-#define PCIE_DEV_ID_2_EP4_REG		0x130</div><div class='del'>-#define PCIE_CC_REV_ID_2_EP4_REG	0x134</div><div class='del'>-#define PCIE_DEV_ID_3_EP4_REG		0x138</div><div class='del'>-#define PCIE_CC_REV_ID_3_EP4_REG	0x13c</div><div class='del'>-#define PCIE_DEV_ID_4_EP4_REG		0x140</div><div class='del'>-#define PCIE_CC_REV_ID_4_EP4_REG	0x144</div><div class='del'>-#define PCIE_DEV_ID_5_EP4_REG		0x148</div><div class='del'>-#define PCIE_CC_REV_ID_5_EP4_REG	0x14c</div><div class='del'>-#define PCIE_DEV_ID_6_EP4_REG		0x150</div><div class='del'>-#define PCIE_CC_REV_ID_6_EP4_REG	0x154</div><div class='del'>-#define PCIE_DEV_ID_7_EP4_REG		0x158</div><div class='del'>-#define PCIE_CC_REV_ID_7_EP4_REG	0x15c</div><div class='del'>-#define PCIE_SUBSYS_VEN_ID_REG		0x160</div><div class='del'>-#define PCIE_COMMON_CLOCK_CONFIG_0_4_0	0x164</div><div class='del'>-#define PCIE_MIPHYP_SSC_EN_REG		0x168</div><div class='del'>-#define PCIE_MIPHYP_ADDR_REG		0x16c</div><div class='del'>-#define PCIE_L1_ASPM_READY_REG		0x170</div><div class='del'>-#define PCIE_EXT_CFG_RDY_REG		0x174</div><div class='del'>-#define PCIE_SoC_INT_ROUTER_STATUS0_REG 0x178</div><div class='del'>-#define PCIE_SoC_INT_ROUTER_STATUS1_REG 0x17c</div><div class='del'>-#define PCIE_SoC_INT_ROUTER_STATUS2_REG 0x180</div><div class='del'>-#define PCIE_SoC_INT_ROUTER_STATUS3_REG 0x184</div><div class='del'>-#define DMA_IP_CTRL_REG			0x324</div><div class='del'>-#define DISP_BRIDGE_PU_PD_CTRL_REG	0x328</div><div class='del'>-#define VIP_PU_PD_CTRL_REG		0x32c</div><div class='del'>-#define USB_MLB_PU_PD_CTRL_REG		0x330</div><div class='del'>-#define SDIO_PU_PD_MISCFUNC_CTRL_REG1	0x334</div><div class='del'>-#define SDIO_PU_PD_MISCFUNC_CTRL_REG2	0x338</div><div class='del'>-#define UART_PU_PD_CTRL_REG		0x33c</div><div class='del'>-#define ARM_Lock			0x340</div><div class='del'>-#define SYS_IO_CHAR_REG1		0x344</div><div class='del'>-#define SYS_IO_CHAR_REG2		0x348</div><div class='del'>-#define SATA_CORE_ID_REG		0x34c</div><div class='del'>-#define SATA_CTRL_REG			0x350</div><div class='del'>-#define I2C_HSFIX_MISC_REG		0x354</div><div class='del'>-#define SPARE2_RESERVED			0x358</div><div class='del'>-#define SPARE3_RESERVED			0x35c</div><div class='del'>-#define MASTER_LOCK_REG			0x368</div><div class='del'>-#define SYSTEM_CONFIG_STATUS_REG	0x36c</div><div class='del'>-#define MSP_CLK_CTRL_REG		0x39c</div><div class='del'>-#define COMPENSATION_REG1		0x3c4</div><div class='del'>-#define COMPENSATION_REG2		0x3c8</div><div class='del'>-#define COMPENSATION_REG3		0x3cc</div><div class='del'>-#define TEST_CTL_REG			0x3d0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SECR (OTP) registers</div><div class='del'>- */</div><div class='del'>-#define STA2X11_SECR_CR			0x00</div><div class='del'>-#define STA2X11_SECR_FVR0		0x10</div><div class='del'>-#define STA2X11_SECR_FVR1		0x14</div><div class='del'>-</div><div class='del'>-extern int sta2x11_mfd_get_regs_data(struct platform_device *pdev,</div><div class='del'>-				     enum sta2x11_mfd_plat_dev index,</div><div class='del'>-				     void __iomem **regs,</div><div class='del'>-				     spinlock_t **lock);</div><div class='del'>-</div><div class='del'>-#endif /* __STA2X11_MFD_H */</div><div class='head'>diff --git a/include/linux/mfd/stm32-lptimer.h b/include/linux/mfd/stm32-lptimer.h<br/>index 06d3f11dc3c9..a592c8dc716d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/stm32-lptimer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/stm32-lptimer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/stm32-lptimer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/stm32-lptimer.h</a></div><div class='hunk'>@@ -17,20 +17,30 @@</div><div class='ctx'> #define STM32_LPTIM_IER		0x08	/* Interrupt Enable Reg      */</div><div class='ctx'> #define STM32_LPTIM_CFGR	0x0C	/* Configuration Reg         */</div><div class='ctx'> #define STM32_LPTIM_CR		0x10	/* Control Reg               */</div><div class='del'>-#define STM32_LPTIM_CMP		0x14	/* Compare Reg               */</div><div class='add'>+#define STM32_LPTIM_CMP		0x14	/* Compare Reg (MP25 CCR1)   */</div><div class='ctx'> #define STM32_LPTIM_ARR		0x18	/* Autoreload Reg            */</div><div class='ctx'> #define STM32_LPTIM_CNT		0x1C	/* Counter Reg               */</div><div class='add'>+#define STM32_LPTIM_CCMR1	0x2C	/* Capture/Compare Mode MP25 */</div><div class='add'>+#define STM32_LPTIM_CCR2	0x34	/* Compare Reg2 MP25         */</div><div class='add'>+</div><div class='add'>+#define STM32_LPTIM_HWCFGR2	0x3EC	/* Hardware configuration register 2 - MP25 */</div><div class='add'>+#define STM32_LPTIM_HWCFGR1	0x3F0	/* Hardware configuration register 1 - MP15 */</div><div class='add'>+#define STM32_LPTIM_VERR	0x3F4	/* Version identification register - MP15 */</div><div class='ctx'> </div><div class='ctx'> /* STM32_LPTIM_ISR - bit fields */</div><div class='add'>+#define STM32_LPTIM_DIEROK_ARROK	(BIT(24) | BIT(4)) /* MP25 */</div><div class='add'>+#define STM32_LPTIM_CMP2_ARROK		(BIT(19) | BIT(4))</div><div class='ctx'> #define STM32_LPTIM_CMPOK_ARROK		GENMASK(4, 3)</div><div class='ctx'> #define STM32_LPTIM_ARROK		BIT(4)</div><div class='ctx'> #define STM32_LPTIM_CMPOK		BIT(3)</div><div class='ctx'> </div><div class='ctx'> /* STM32_LPTIM_ICR - bit fields */</div><div class='del'>-#define STM32_LPTIM_ARRMCF		BIT(1)</div><div class='add'>+#define STM32_LPTIM_DIEROKCF_ARROKCF	(BIT(24) | BIT(4)) /* MP25 */</div><div class='add'>+#define STM32_LPTIM_CMP2OKCF_ARROKCF	(BIT(19) | BIT(4))</div><div class='ctx'> #define STM32_LPTIM_CMPOKCF_ARROKCF	GENMASK(4, 3)</div><div class='add'>+#define STM32_LPTIM_ARRMCF		BIT(1)</div><div class='ctx'> </div><div class='del'>-/* STM32_LPTIM_IER - bit flieds */</div><div class='add'>+/* STM32_LPTIM_IER - bit fields */</div><div class='ctx'> #define STM32_LPTIM_ARRMIE	BIT(1)</div><div class='ctx'> </div><div class='ctx'> /* STM32_LPTIM_CR - bit fields */</div><div class='hunk'>@@ -53,16 +63,37 @@</div><div class='ctx'> /* STM32_LPTIM_ARR */</div><div class='ctx'> #define STM32_LPTIM_MAX_ARR	0xFFFF</div><div class='ctx'> </div><div class='add'>+/* STM32_LPTIM_CCMR1 */</div><div class='add'>+#define STM32_LPTIM_CC2P	GENMASK(19, 18)</div><div class='add'>+#define STM32_LPTIM_CC2E	BIT(17)</div><div class='add'>+#define STM32_LPTIM_CC2SEL	BIT(16)</div><div class='add'>+#define STM32_LPTIM_CC1P	GENMASK(3, 2)</div><div class='add'>+#define STM32_LPTIM_CC1E	BIT(1)</div><div class='add'>+#define STM32_LPTIM_CC1SEL	BIT(0)</div><div class='add'>+</div><div class='add'>+/* STM32_LPTIM_HWCFGR1 */</div><div class='add'>+#define STM32_LPTIM_HWCFGR1_ENCODER	BIT(16)</div><div class='add'>+</div><div class='add'>+/* STM32_LPTIM_HWCFGR2 */</div><div class='add'>+#define STM32_LPTIM_HWCFGR2_CHAN_NUM	GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+/* STM32_LPTIM_VERR */</div><div class='add'>+#define STM32_LPTIM_VERR_23	0x23	/* STM32MP25 */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct stm32_lptimer - STM32 Low-Power Timer data assigned by parent device</div><div class='ctx'>  * @clk: clock reference for this instance</div><div class='ctx'>  * @regmap: register map reference for this instance</div><div class='ctx'>  * @has_encoder: indicates this Low-Power Timer supports encoder mode</div><div class='add'>+ * @num_cc_chans: indicates the number of capture/compare channels</div><div class='add'>+ * @version: indicates the major and minor revision of the controller</div><div class='ctx'>  */</div><div class='ctx'> struct stm32_lptimer {</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	bool has_encoder;</div><div class='add'>+	unsigned int num_cc_chans;</div><div class='add'>+	u32 version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/mfd/stm32-timers.h b/include/linux/mfd/stm32-timers.h<br/>index ca35af30745f..23b0cae4a9f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/stm32-timers.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/stm32-timers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/stm32-timers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/stm32-timers.h</a></div><div class='hunk'>@@ -12,84 +12,114 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='del'>-#define TIM_CR1		0x00	/* Control Register 1      */</div><div class='del'>-#define TIM_CR2		0x04	/* Control Register 2      */</div><div class='del'>-#define TIM_SMCR	0x08	/* Slave mode control reg  */</div><div class='del'>-#define TIM_DIER	0x0C	/* DMA/interrupt register  */</div><div class='del'>-#define TIM_SR		0x10	/* Status register	   */</div><div class='del'>-#define TIM_EGR		0x14	/* Event Generation Reg    */</div><div class='del'>-#define TIM_CCMR1	0x18	/* Capt/Comp 1 Mode Reg    */</div><div class='del'>-#define TIM_CCMR2	0x1C	/* Capt/Comp 2 Mode Reg    */</div><div class='del'>-#define TIM_CCER	0x20	/* Capt/Comp Enable Reg    */</div><div class='del'>-#define TIM_CNT		0x24	/* Counter		   */</div><div class='del'>-#define TIM_PSC		0x28	/* Prescaler               */</div><div class='del'>-#define TIM_ARR		0x2c	/* Auto-Reload Register    */</div><div class='del'>-#define TIM_CCR1	0x34	/* Capt/Comp Register 1    */</div><div class='del'>-#define TIM_CCR2	0x38	/* Capt/Comp Register 2    */</div><div class='del'>-#define TIM_CCR3	0x3C	/* Capt/Comp Register 3    */</div><div class='del'>-#define TIM_CCR4	0x40	/* Capt/Comp Register 4    */</div><div class='del'>-#define TIM_BDTR	0x44	/* Break and Dead-Time Reg */</div><div class='del'>-#define TIM_DCR		0x48	/* DMA control register    */</div><div class='del'>-#define TIM_DMAR	0x4C	/* DMA register for transfer */</div><div class='del'>-#define TIM_TISEL	0x68	/* Input Selection         */</div><div class='add'>+#define TIM_CR1		0x00			/* Control Register 1			*/</div><div class='add'>+#define TIM_CR2		0x04			/* Control Register 2			*/</div><div class='add'>+#define TIM_SMCR	0x08			/* Slave mode control reg		*/</div><div class='add'>+#define TIM_DIER	0x0C			/* DMA/interrupt register		*/</div><div class='add'>+#define TIM_SR		0x10			/* Status register			*/</div><div class='add'>+#define TIM_EGR		0x14			/* Event Generation Reg			*/</div><div class='add'>+#define TIM_CCMR1	0x18			/* Capt/Comp 1 Mode Reg			*/</div><div class='add'>+#define TIM_CCMR2	0x1C			/* Capt/Comp 2 Mode Reg			*/</div><div class='add'>+#define TIM_CCER	0x20			/* Capt/Comp Enable Reg			*/</div><div class='add'>+#define TIM_CNT		0x24			/* Counter				*/</div><div class='add'>+#define TIM_PSC		0x28			/* Prescaler				*/</div><div class='add'>+#define TIM_ARR		0x2c			/* Auto-Reload Register			*/</div><div class='add'>+#define TIM_CCRx(x)	(0x34 + 4 * ((x) - 1))	/* Capt/Comp Register x (x ∈ {1, .. 4})	*/</div><div class='add'>+#define TIM_CCR1	TIM_CCRx(1)		/* Capt/Comp Register 1			*/</div><div class='add'>+#define TIM_CCR2	TIM_CCRx(2)		/* Capt/Comp Register 2			*/</div><div class='add'>+#define TIM_CCR3	TIM_CCRx(3)		/* Capt/Comp Register 3			*/</div><div class='add'>+#define TIM_CCR4	TIM_CCRx(4)		/* Capt/Comp Register 4			*/</div><div class='add'>+#define TIM_BDTR	0x44			/* Break and Dead-Time Reg		*/</div><div class='add'>+#define TIM_DCR		0x48			/* DMA control register			*/</div><div class='add'>+#define TIM_DMAR	0x4C			/* DMA register for transfer		*/</div><div class='add'>+#define TIM_TISEL	0x68			/* Input Selection			*/</div><div class='add'>+#define TIM_HWCFGR2	0x3EC			/* hardware configuration 2 Reg (MP25)	*/</div><div class='add'>+#define TIM_HWCFGR1	0x3F0			/* hardware configuration 1 Reg (MP25)	*/</div><div class='add'>+#define TIM_IPIDR	0x3F8			/* IP identification Reg (MP25)		*/</div><div class='ctx'> </div><div class='del'>-#define TIM_CR1_CEN	BIT(0)	/* Counter Enable	   */</div><div class='del'>-#define TIM_CR1_DIR	BIT(4)  /* Counter Direction	   */</div><div class='del'>-#define TIM_CR1_ARPE	BIT(7)	/* Auto-reload Preload Ena */</div><div class='del'>-#define TIM_CR2_MMS	(BIT(4) | BIT(5) | BIT(6)) /* Master mode selection */</div><div class='del'>-#define TIM_CR2_MMS2	GENMASK(23, 20) /* Master mode selection 2 */</div><div class='del'>-#define TIM_SMCR_SMS	(BIT(0) | BIT(1) | BIT(2)) /* Slave mode selection */</div><div class='del'>-#define TIM_SMCR_TS	(BIT(4) | BIT(5) | BIT(6)) /* Trigger selection */</div><div class='del'>-#define TIM_DIER_UIE	BIT(0)	/* Update interrupt	   */</div><div class='del'>-#define TIM_DIER_UDE	BIT(8)  /* Update DMA request Enable */</div><div class='del'>-#define TIM_DIER_CC1DE	BIT(9)  /* CC1 DMA request Enable  */</div><div class='del'>-#define TIM_DIER_CC2DE	BIT(10) /* CC2 DMA request Enable  */</div><div class='del'>-#define TIM_DIER_CC3DE	BIT(11) /* CC3 DMA request Enable  */</div><div class='del'>-#define TIM_DIER_CC4DE	BIT(12) /* CC4 DMA request Enable  */</div><div class='del'>-#define TIM_DIER_COMDE	BIT(13) /* COM DMA request Enable  */</div><div class='del'>-#define TIM_DIER_TDE	BIT(14) /* Trigger DMA request Enable */</div><div class='del'>-#define TIM_SR_UIF	BIT(0)	/* Update interrupt flag   */</div><div class='del'>-#define TIM_EGR_UG	BIT(0)	/* Update Generation       */</div><div class='del'>-#define TIM_CCMR_PE	BIT(3)	/* Channel Preload Enable  */</div><div class='del'>-#define TIM_CCMR_M1	(BIT(6) | BIT(5))  /* Channel PWM Mode 1 */</div><div class='del'>-#define TIM_CCMR_CC1S		(BIT(0) | BIT(1)) /* Capture/compare 1 sel */</div><div class='del'>-#define TIM_CCMR_IC1PSC		GENMASK(3, 2)	/* Input capture 1 prescaler */</div><div class='del'>-#define TIM_CCMR_CC2S		(BIT(8) | BIT(9)) /* Capture/compare 2 sel */</div><div class='del'>-#define TIM_CCMR_IC2PSC		GENMASK(11, 10)	/* Input capture 2 prescaler */</div><div class='del'>-#define TIM_CCMR_CC1S_TI1	BIT(0)	/* IC1/IC3 selects TI1/TI3 */</div><div class='del'>-#define TIM_CCMR_CC1S_TI2	BIT(1)	/* IC1/IC3 selects TI2/TI4 */</div><div class='del'>-#define TIM_CCMR_CC2S_TI2	BIT(8)	/* IC2/IC4 selects TI2/TI4 */</div><div class='del'>-#define TIM_CCMR_CC2S_TI1	BIT(9)	/* IC2/IC4 selects TI1/TI3 */</div><div class='del'>-#define TIM_CCER_CC1E	BIT(0)	/* Capt/Comp 1  out Ena    */</div><div class='del'>-#define TIM_CCER_CC1P	BIT(1)	/* Capt/Comp 1  Polarity   */</div><div class='del'>-#define TIM_CCER_CC1NE	BIT(2)	/* Capt/Comp 1N out Ena    */</div><div class='del'>-#define TIM_CCER_CC1NP	BIT(3)	/* Capt/Comp 1N Polarity   */</div><div class='del'>-#define TIM_CCER_CC2E	BIT(4)	/* Capt/Comp 2  out Ena    */</div><div class='del'>-#define TIM_CCER_CC2P	BIT(5)	/* Capt/Comp 2  Polarity   */</div><div class='del'>-#define TIM_CCER_CC3E	BIT(8)	/* Capt/Comp 3  out Ena    */</div><div class='del'>-#define TIM_CCER_CC3P	BIT(9)	/* Capt/Comp 3  Polarity   */</div><div class='del'>-#define TIM_CCER_CC4E	BIT(12)	/* Capt/Comp 4  out Ena    */</div><div class='del'>-#define TIM_CCER_CC4P	BIT(13)	/* Capt/Comp 4  Polarity   */</div><div class='del'>-#define TIM_CCER_CCXE	(BIT(0) | BIT(4) | BIT(8) | BIT(12))</div><div class='del'>-#define TIM_BDTR_BKE(x)	BIT(12 + (x) * 12) /* Break input enable */</div><div class='del'>-#define TIM_BDTR_BKP(x)	BIT(13 + (x) * 12) /* Break input polarity */</div><div class='del'>-#define TIM_BDTR_AOE	BIT(14)	/* Automatic Output Enable */</div><div class='del'>-#define TIM_BDTR_MOE	BIT(15)	/* Main Output Enable      */</div><div class='del'>-#define TIM_BDTR_BKF(x)	(0xf &lt;&lt; (16 + (x) * 4))</div><div class='del'>-#define TIM_DCR_DBA	GENMASK(4, 0)	/* DMA base addr */</div><div class='del'>-#define TIM_DCR_DBL	GENMASK(12, 8)	/* DMA burst len */</div><div class='add'>+#define TIM_CR1_CEN		BIT(0)					/* Counter Enable				*/</div><div class='add'>+#define TIM_CR1_DIR		BIT(4)					/* Counter Direction				*/</div><div class='add'>+#define TIM_CR1_ARPE		BIT(7)					/* Auto-reload Preload Ena			*/</div><div class='add'>+#define TIM_CR2_MMS		(BIT(4) | BIT(5) | BIT(6))		/* Master mode selection			*/</div><div class='add'>+#define TIM_CR2_MMS2		GENMASK(23, 20)				/* Master mode selection 2			*/</div><div class='add'>+#define TIM_SMCR_SMS		(BIT(0) | BIT(1) | BIT(2))		/* Slave mode selection				*/</div><div class='add'>+#define TIM_SMCR_TS		(BIT(4) | BIT(5) | BIT(6))		/* Trigger selection				*/</div><div class='add'>+#define TIM_DIER_UIE		BIT(0)					/* Update interrupt				*/</div><div class='add'>+#define TIM_DIER_CCxIE(x)	BIT(1 + ((x) - 1))			/* CCx Interrupt Enable	(x ∈ {1, .. 4})		*/</div><div class='add'>+#define TIM_DIER_CC1IE		TIM_DIER_CCxIE(1)			/* CC1 Interrupt Enable				*/</div><div class='add'>+#define TIM_DIER_CC2IE		TIM_DIER_CCxIE(2)			/* CC2 Interrupt Enable				*/</div><div class='add'>+#define TIM_DIER_CC3IE		TIM_DIER_CCxIE(3)			/* CC3 Interrupt Enable				*/</div><div class='add'>+#define TIM_DIER_CC4IE		TIM_DIER_CCxIE(4)			/* CC4 Interrupt Enable				*/</div><div class='add'>+#define TIM_DIER_UDE		BIT(8)					/* Update DMA request Enable			*/</div><div class='add'>+#define TIM_DIER_CCxDE(x)	BIT(9 + ((x) - 1))			/* CCx DMA request Enable (x ∈ {1, .. 4})	*/</div><div class='add'>+#define TIM_DIER_CC1DE		TIM_DIER_CCxDE(1)			/* CC1 DMA request Enable			*/</div><div class='add'>+#define TIM_DIER_CC2DE		TIM_DIER_CCxDE(2)			/* CC2 DMA request Enable			*/</div><div class='add'>+#define TIM_DIER_CC3DE		TIM_DIER_CCxDE(3)			/* CC3 DMA request Enable			*/</div><div class='add'>+#define TIM_DIER_CC4DE		TIM_DIER_CCxDE(4)			/* CC4 DMA request Enable			*/</div><div class='add'>+#define TIM_DIER_COMDE		BIT(13)					/* COM DMA request Enable			*/</div><div class='add'>+#define TIM_DIER_TDE		BIT(14)					/* Trigger DMA request Enable			*/</div><div class='add'>+#define TIM_SR_UIF		BIT(0)					/* Update interrupt flag			*/</div><div class='add'>+#define TIM_SR_CC_IF(x)		BIT((x) + 1)				/* CC1, CC2, CC3, CC4 interrupt flag		*/</div><div class='add'>+#define TIM_EGR_UG		BIT(0)					/* Update Generation				*/</div><div class='add'>+#define TIM_CCMR_PE		BIT(3)					/* Channel Preload Enable			*/</div><div class='add'>+#define TIM_CCMR_M1		(BIT(6) | BIT(5))			/* Channel PWM Mode 1				*/</div><div class='add'>+#define TIM_CCMR_CC1S		(BIT(0) | BIT(1))			/* Capture/compare 1 sel			*/</div><div class='add'>+#define TIM_CCMR_IC1PSC		GENMASK(3, 2)				/* Input capture 1 prescaler			*/</div><div class='add'>+#define TIM_CCMR_CC2S		(BIT(8) | BIT(9))			/* Capture/compare 2 sel			*/</div><div class='add'>+#define TIM_CCMR_IC2PSC		GENMASK(11, 10)				/* Input capture 2 prescaler			*/</div><div class='add'>+#define TIM_CCMR_CC1S_TI1	BIT(0)					/* IC1/IC3 selects TI1/TI3			*/</div><div class='add'>+#define TIM_CCMR_CC1S_TI2	BIT(1)					/* IC1/IC3 selects TI2/TI4			*/</div><div class='add'>+#define TIM_CCMR_CC2S_TI2	BIT(8)					/* IC2/IC4 selects TI2/TI4			*/</div><div class='add'>+#define TIM_CCMR_CC2S_TI1	BIT(9)					/* IC2/IC4 selects TI1/TI3			*/</div><div class='add'>+#define TIM_CCMR_CC3S		(BIT(0) | BIT(1))			/* Capture/compare 3 sel			*/</div><div class='add'>+#define TIM_CCMR_CC4S		(BIT(8) | BIT(9))			/* Capture/compare 4 sel			*/</div><div class='add'>+#define TIM_CCMR_CC3S_TI3	BIT(0)					/* IC3 selects TI3				*/</div><div class='add'>+#define TIM_CCMR_CC4S_TI4	BIT(8)					/* IC4 selects TI4				*/</div><div class='add'>+#define TIM_CCER_CCxE(x)	BIT(0 + 4 * ((x) - 1))			/* Capt/Comp x  out Ena (x ∈ {1, .. 4})		*/</div><div class='add'>+#define TIM_CCER_CCxP(x)	BIT(1 + 4 * ((x) - 1))			/* Capt/Comp x  Polarity (x ∈ {1, .. 4})	*/</div><div class='add'>+#define TIM_CCER_CCxNE(x)	BIT(2 + 4 * ((x) - 1))			/* Capt/Comp xN out Ena (x ∈ {1, .. 4})		*/</div><div class='add'>+#define TIM_CCER_CCxNP(x)	BIT(3 + 4 * ((x) - 1))			/* Capt/Comp xN Polarity (x ∈ {1, .. 4})	*/</div><div class='add'>+#define TIM_CCER_CC1E		TIM_CCER_CCxE(1)			/* Capt/Comp 1  out Ena				*/</div><div class='add'>+#define TIM_CCER_CC1P		TIM_CCER_CCxP(1)			/* Capt/Comp 1  Polarity			*/</div><div class='add'>+#define TIM_CCER_CC1NE		TIM_CCER_CCxNE(1)			/* Capt/Comp 1N out Ena				*/</div><div class='add'>+#define TIM_CCER_CC1NP		TIM_CCER_CCxNP(1)			/* Capt/Comp 1N Polarity			*/</div><div class='add'>+#define TIM_CCER_CC2E		TIM_CCER_CCxE(2)			/* Capt/Comp 2  out Ena				*/</div><div class='add'>+#define TIM_CCER_CC2P		TIM_CCER_CCxP(2)			/* Capt/Comp 2  Polarity			*/</div><div class='add'>+#define TIM_CCER_CC2NE		TIM_CCER_CCxNE(2)			/* Capt/Comp 2N out Ena				*/</div><div class='add'>+#define TIM_CCER_CC2NP		TIM_CCER_CCxNP(2)			/* Capt/Comp 2N Polarity			*/</div><div class='add'>+#define TIM_CCER_CC3E		TIM_CCER_CCxE(3)			/* Capt/Comp 3  out Ena				*/</div><div class='add'>+#define TIM_CCER_CC3P		TIM_CCER_CCxP(3)			/* Capt/Comp 3  Polarity			*/</div><div class='add'>+#define TIM_CCER_CC3NE		TIM_CCER_CCxNE(3)			/* Capt/Comp 3N out Ena				*/</div><div class='add'>+#define TIM_CCER_CC3NP		TIM_CCER_CCxNP(3)			/* Capt/Comp 3N Polarity			*/</div><div class='add'>+#define TIM_CCER_CC4E		TIM_CCER_CCxE(4)			/* Capt/Comp 4  out Ena				*/</div><div class='add'>+#define TIM_CCER_CC4P		TIM_CCER_CCxP(4)			/* Capt/Comp 4  Polarity			*/</div><div class='add'>+#define TIM_CCER_CC4NE		TIM_CCER_CCxNE(4)			/* Capt/Comp 4N out Ena				*/</div><div class='add'>+#define TIM_CCER_CC4NP		TIM_CCER_CCxNP(4)			/* Capt/Comp 4N Polarity			*/</div><div class='add'>+#define TIM_CCER_CCXE		(BIT(0) | BIT(4) | BIT(8) | BIT(12))</div><div class='add'>+#define TIM_BDTR_BKE(x)		BIT(12 + (x) * 12)			/* Break input enable				*/</div><div class='add'>+#define TIM_BDTR_BKP(x)		BIT(13 + (x) * 12)			/* Break input polarity				*/</div><div class='add'>+#define TIM_BDTR_AOE		BIT(14)					/* Automatic Output Enable			*/</div><div class='add'>+#define TIM_BDTR_MOE		BIT(15)					/* Main Output Enable				*/</div><div class='add'>+#define TIM_BDTR_BKF(x)		(0xf &lt;&lt; (16 + (x) * 4))</div><div class='add'>+#define TIM_DCR_DBA		GENMASK(4, 0)				/* DMA base addr				*/</div><div class='add'>+#define TIM_DCR_DBL		GENMASK(12, 8)				/* DMA burst len				*/</div><div class='add'>+#define TIM_HWCFGR1_NB_OF_CC	GENMASK(3, 0)				/* Capture/compare channels			*/</div><div class='add'>+#define TIM_HWCFGR1_NB_OF_DT	GENMASK(7, 4)				/* Complementary outputs &amp; dead-time generators */</div><div class='add'>+#define TIM_HWCFGR2_CNT_WIDTH	GENMASK(15, 8)				/* Counter width				*/</div><div class='ctx'> </div><div class='del'>-#define MAX_TIM_PSC		0xFFFF</div><div class='del'>-#define MAX_TIM_ICPSC		0x3</div><div class='del'>-#define TIM_CR2_MMS_SHIFT	4</div><div class='del'>-#define TIM_CR2_MMS2_SHIFT	20</div><div class='add'>+#define MAX_TIM_PSC				0xFFFF</div><div class='add'>+#define MAX_TIM_ICPSC				0x3</div><div class='add'>+#define TIM_CR2_MMS_SHIFT			4</div><div class='add'>+#define TIM_CR2_MMS2_SHIFT			20</div><div class='ctx'> #define TIM_SMCR_SMS_SLAVE_MODE_DISABLED	0 /* counts on internal clock when CEN=1 */</div><div class='ctx'> #define TIM_SMCR_SMS_ENCODER_MODE_1		1 /* counts TI1FP1 edges, depending on TI2FP2 level */</div><div class='ctx'> #define TIM_SMCR_SMS_ENCODER_MODE_2		2 /* counts TI2FP2 edges, depending on TI1FP1 level */</div><div class='ctx'> #define TIM_SMCR_SMS_ENCODER_MODE_3		3 /* counts on both TI1FP1 and TI2FP2 edges */</div><div class='del'>-#define TIM_SMCR_TS_SHIFT	4</div><div class='del'>-#define TIM_BDTR_BKF_MASK	0xF</div><div class='del'>-#define TIM_BDTR_BKF_SHIFT(x)	(16 + (x) * 4)</div><div class='add'>+#define TIM_SMCR_TS_SHIFT			4</div><div class='add'>+#define TIM_BDTR_BKF_MASK			0xF</div><div class='add'>+#define TIM_BDTR_BKF_SHIFT(x)			(16 + (x) * 4)</div><div class='add'>+</div><div class='add'>+#define STM32MP25_TIM_IPIDR	0x00120002</div><div class='ctx'> </div><div class='ctx'> enum stm32_timers_dmas {</div><div class='ctx'> 	STM32_TIMERS_DMA_CH1,</div><div class='hunk'>@@ -129,6 +159,7 @@ struct stm32_timers_dma {</div><div class='ctx'> </div><div class='ctx'> struct stm32_timers {</div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+	u32 ipidr;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	u32 max_arr;</div><div class='ctx'> 	struct stm32_timers_dma dma; /* Only to be used by the parent */</div><div class='head'>diff --git a/include/linux/mfd/sun4i-gpadc.h b/include/linux/mfd/sun4i-gpadc.h<br/>index ea0ccf33a459..021f820f9d52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/sun4i-gpadc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/sun4i-gpadc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/sun4i-gpadc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/sun4i-gpadc.h</a></div><div class='hunk'>@@ -81,8 +81,8 @@</div><div class='ctx'> #define SUN4I_GPADC_TEMP_DATA				0x20</div><div class='ctx'> #define SUN4I_GPADC_DATA				0x24</div><div class='ctx'> </div><div class='del'>-#define SUN4I_GPADC_IRQ_FIFO_DATA			0</div><div class='del'>-#define SUN4I_GPADC_IRQ_TEMP_DATA			1</div><div class='add'>+#define SUN4I_GPADC_IRQ_FIFO_DATA			1</div><div class='add'>+#define SUN4I_GPADC_IRQ_TEMP_DATA			2</div><div class='ctx'> </div><div class='ctx'> /* 10s delay before suspending the IP */</div><div class='ctx'> #define SUN4I_GPADC_AUTOSUSPEND_DELAY			10000</div><div class='head'>diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h<br/>index fecc2fa2a364..aad9c6b50463 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/syscon.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/syscon.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/syscon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/syscon.h</a></div><div class='hunk'>@@ -17,20 +17,19 @@</div><div class='ctx'> struct device_node;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MFD_SYSCON</div><div class='del'>-extern struct regmap *device_node_to_regmap(struct device_node *np);</div><div class='del'>-extern struct regmap *syscon_node_to_regmap(struct device_node *np);</div><div class='del'>-extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s);</div><div class='del'>-extern struct regmap *syscon_regmap_lookup_by_phandle(</div><div class='del'>-					struct device_node *np,</div><div class='del'>-					const char *property);</div><div class='del'>-extern struct regmap *syscon_regmap_lookup_by_phandle_args(</div><div class='del'>-					struct device_node *np,</div><div class='del'>-					const char *property,</div><div class='del'>-					int arg_count,</div><div class='del'>-					unsigned int *out_args);</div><div class='del'>-extern struct regmap *syscon_regmap_lookup_by_phandle_optional(</div><div class='del'>-					struct device_node *np,</div><div class='del'>-					const char *property);</div><div class='add'>+struct regmap *device_node_to_regmap(struct device_node *np);</div><div class='add'>+struct regmap *syscon_node_to_regmap(struct device_node *np);</div><div class='add'>+struct regmap *syscon_regmap_lookup_by_compatible(const char *s);</div><div class='add'>+struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np,</div><div class='add'>+					       const char *property);</div><div class='add'>+struct regmap *syscon_regmap_lookup_by_phandle_args(struct device_node *np,</div><div class='add'>+						    const char *property,</div><div class='add'>+						    int arg_count,</div><div class='add'>+						    unsigned int *out_args);</div><div class='add'>+struct regmap *syscon_regmap_lookup_by_phandle_optional(struct device_node *np,</div><div class='add'>+							const char *property);</div><div class='add'>+int of_syscon_register_regmap(struct device_node *np,</div><div class='add'>+			      struct regmap *regmap);</div><div class='ctx'> #else</div><div class='ctx'> static inline struct regmap *device_node_to_regmap(struct device_node *np)</div><div class='ctx'> {</div><div class='hunk'>@@ -70,6 +69,12 @@ static inline struct regmap *syscon_regmap_lookup_by_phandle_optional(</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int of_syscon_register_regmap(struct device_node *np,</div><div class='add'>+					struct regmap *regmap)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_MFD_SYSCON_H__ */</div><div class='head'>diff --git a/include/linux/mfd/syscon/atmel-smc.h b/include/linux/mfd/syscon/atmel-smc.h<br/>index e9e24f4c4578..9b9119c742a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/syscon/atmel-smc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/syscon/atmel-smc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/syscon/atmel-smc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/syscon/atmel-smc.h</a></div><div class='hunk'>@@ -11,9 +11,11 @@</div><div class='ctx'> #ifndef _LINUX_MFD_SYSCON_ATMEL_SMC_H_</div><div class='ctx'> #define _LINUX_MFD_SYSCON_ATMEL_SMC_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device_node;</div><div class='add'>+struct regmap;</div><div class='ctx'> </div><div class='ctx'> #define ATMEL_SMC_SETUP(cs)			(((cs) * 0x10))</div><div class='ctx'> #define ATMEL_HSMC_SETUP(layout, cs)		\</div><div class='head'>diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h<br/>deleted file mode 100644<br/>index eace8ea6cda0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/tmio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/tmio.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef MFD_TMIO_H</div><div class='del'>-#define MFD_TMIO_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/mmc/card.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/pm_runtime.h&gt;</div><div class='del'>-</div><div class='del'>-#define tmio_ioread8(addr) readb(addr)</div><div class='del'>-#define tmio_ioread16(addr) readw(addr)</div><div class='del'>-#define tmio_ioread16_rep(r, b, l) readsw(r, b, l)</div><div class='del'>-#define tmio_ioread32(addr) \</div><div class='del'>-	(((u32)readw((addr))) | (((u32)readw((addr) + 2)) &lt;&lt; 16))</div><div class='del'>-</div><div class='del'>-#define tmio_iowrite8(val, addr) writeb((val), (addr))</div><div class='del'>-#define tmio_iowrite16(val, addr) writew((val), (addr))</div><div class='del'>-#define tmio_iowrite16_rep(r, b, l) writesw(r, b, l)</div><div class='del'>-#define tmio_iowrite32(val, addr) \</div><div class='del'>-	do { \</div><div class='del'>-		writew((val),       (addr)); \</div><div class='del'>-		writew((val) &gt;&gt; 16, (addr) + 2); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#define sd_config_write8(base, shift, reg, val) \</div><div class='del'>-	tmio_iowrite8((val), (base) + ((reg) &lt;&lt; (shift)))</div><div class='del'>-#define sd_config_write16(base, shift, reg, val) \</div><div class='del'>-	tmio_iowrite16((val), (base) + ((reg) &lt;&lt; (shift)))</div><div class='del'>-#define sd_config_write32(base, shift, reg, val) \</div><div class='del'>-	do { \</div><div class='del'>-		tmio_iowrite16((val), (base) + ((reg) &lt;&lt; (shift)));   \</div><div class='del'>-		tmio_iowrite16((val) &gt;&gt; 16, (base) + ((reg + 2) &lt;&lt; (shift))); \</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-/* tmio MMC platform flags */</div><div class='del'>-/*</div><div class='del'>- * Some controllers can support a 2-byte block size when the bus width</div><div class='del'>- * is configured in 4-bit mode.</div><div class='del'>- */</div><div class='del'>-#define TMIO_MMC_BLKSZ_2BYTES		BIT(1)</div><div class='del'>-/*</div><div class='del'>- * Some controllers can support SDIO IRQ signalling.</div><div class='del'>- */</div><div class='del'>-#define TMIO_MMC_SDIO_IRQ		BIT(2)</div><div class='del'>-</div><div class='del'>-/* Some features are only available or tested on R-Car Gen2 or later */</div><div class='del'>-#define TMIO_MMC_MIN_RCAR2		BIT(3)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some controllers require waiting for the SD bus to become</div><div class='del'>- * idle before writing to some registers.</div><div class='del'>- */</div><div class='del'>-#define TMIO_MMC_HAS_IDLE_WAIT		BIT(4)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Use the busy timeout feature. Probably all TMIO versions support it. Yet,</div><div class='del'>- * we don't have documentation for old variants, so we enable only known good</div><div class='del'>- * variants with this flag. Can be removed once all variants are known good.</div><div class='del'>- */</div><div class='del'>-#define TMIO_MMC_USE_BUSY_TIMEOUT	BIT(5)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some controllers have CMD12 automatically</div><div class='del'>- * issue/non-issue register</div><div class='del'>- */</div><div class='del'>-#define TMIO_MMC_HAVE_CMD12_CTRL	BIT(7)</div><div class='del'>-</div><div class='del'>-/* Controller has some SDIO status bits which must be 1 */</div><div class='del'>-#define TMIO_MMC_SDIO_STATUS_SETBITS	BIT(8)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some controllers have a 32-bit wide data port register</div><div class='del'>- */</div><div class='del'>-#define TMIO_MMC_32BIT_DATA_PORT	BIT(9)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some controllers allows to set SDx actual clock</div><div class='del'>- */</div><div class='del'>-#define TMIO_MMC_CLK_ACTUAL		BIT(10)</div><div class='del'>-</div><div class='del'>-/* Some controllers have a CBSY bit */</div><div class='del'>-#define TMIO_MMC_HAVE_CBSY		BIT(11)</div><div class='del'>-</div><div class='del'>-struct dma_chan;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * data for the MMC controller</div><div class='del'>- */</div><div class='del'>-struct tmio_mmc_data {</div><div class='del'>-	void				*chan_priv_tx;</div><div class='del'>-	void				*chan_priv_rx;</div><div class='del'>-	unsigned int			hclk;</div><div class='del'>-	unsigned long			capabilities;</div><div class='del'>-	unsigned long			capabilities2;</div><div class='del'>-	unsigned long			flags;</div><div class='del'>-	u32				ocr_mask;	/* available voltages */</div><div class='del'>-	dma_addr_t			dma_rx_offset;</div><div class='del'>-	unsigned int			max_blk_count;</div><div class='del'>-	unsigned short			max_segs;</div><div class='del'>-	void (*set_pwr)(struct platform_device *host, int state);</div><div class='del'>-	void (*set_clk_div)(struct platform_device *host, int state);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * data for the NAND controller</div><div class='del'>- */</div><div class='del'>-struct tmio_nand_data {</div><div class='del'>-	struct nand_bbt_descr	*badblock_pattern;</div><div class='del'>-	struct mtd_partition	*partition;</div><div class='del'>-	unsigned int		num_partitions;</div><div class='del'>-	const char *const	*part_parsers;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define FBIO_TMIO_ACC_WRITE	0x7C639300</div><div class='del'>-#define FBIO_TMIO_ACC_SYNC	0x7C639301</div><div class='del'>-</div><div class='del'>-struct tmio_fb_data {</div><div class='del'>-	int			(*lcd_set_power)(struct platform_device *fb_dev,</div><div class='del'>-						 bool on);</div><div class='del'>-	int			(*lcd_mode)(struct platform_device *fb_dev,</div><div class='del'>-					    const struct fb_videomode *mode);</div><div class='del'>-	int			num_modes;</div><div class='del'>-	struct fb_videomode	*modes;</div><div class='del'>-</div><div class='del'>-	/* in mm: size of screen */</div><div class='del'>-	int			height;</div><div class='del'>-	int			width;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/mfd/tps65219.h b/include/linux/mfd/tps65219.h<br/>index e6826e34e2a6..55234e771ba7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/tps65219.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/tps65219.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/tps65219.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/tps65219.h</a></div><div class='hunk'>@@ -1,25 +1,24 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='del'>- * Functions to access TPS65219 Power Management IC.</div><div class='add'>+ * Functions to access TPS65215/TPS65219 Power Management Integrated Chips</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2022 BayLibre Incorporated - https://www.baylibre.com/</div><div class='add'>+ * Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef MFD_TPS65219_H</div><div class='ctx'> #define MFD_TPS65219_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/driver.h&gt;</div><div class='ctx'> </div><div class='del'>-struct regmap;</div><div class='del'>-struct regmap_irq_chip_data;</div><div class='del'>-</div><div class='del'>-#define TPS65219_1V35					1350000</div><div class='del'>-#define TPS65219_1V8					1800000</div><div class='del'>-</div><div class='del'>-/* TPS chip id list */</div><div class='del'>-#define TPS65219					0xF0</div><div class='add'>+/* Chip id list*/</div><div class='add'>+enum pmic_id {</div><div class='add'>+	TPS65214,</div><div class='add'>+	TPS65215,</div><div class='add'>+	TPS65219,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* I2C ID for TPS65219 part */</div><div class='ctx'> #define TPS65219_I2C_ID					0x24</div><div class='hunk'>@@ -29,15 +28,23 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_REG_NVM_ID				0x01</div><div class='ctx'> #define TPS65219_REG_ENABLE_CTRL			0x02</div><div class='ctx'> #define TPS65219_REG_BUCKS_CONFIG			0x03</div><div class='add'>+#define TPS65214_REG_LOCK				0x03</div><div class='ctx'> #define TPS65219_REG_LDO4_VOUT				0x04</div><div class='add'>+#define TPS65214_REG_LDO1_VOUT_STBY			0x04</div><div class='ctx'> #define TPS65219_REG_LDO3_VOUT				0x05</div><div class='add'>+#define TPS65215_REG_LDO2_VOUT                          0x05</div><div class='add'>+#define TPS65214_REG_LDO1_VOUT				0x05</div><div class='ctx'> #define TPS65219_REG_LDO2_VOUT				0x06</div><div class='add'>+#define TPS65214_REG_LDO2_VOUT				0x06</div><div class='ctx'> #define TPS65219_REG_LDO1_VOUT				0x07</div><div class='add'>+#define TPS65214_REG_LDO2_VOUT_STBY			0x07</div><div class='ctx'> #define TPS65219_REG_BUCK3_VOUT				0x8</div><div class='ctx'> #define TPS65219_REG_BUCK2_VOUT				0x9</div><div class='ctx'> #define TPS65219_REG_BUCK1_VOUT				0xA</div><div class='ctx'> #define TPS65219_REG_LDO4_SEQUENCE_SLOT			0xB</div><div class='ctx'> #define TPS65219_REG_LDO3_SEQUENCE_SLOT			0xC</div><div class='add'>+#define TPS65215_REG_LDO2_SEQUENCE_SLOT                 0xC</div><div class='add'>+#define TPS65214_REG_LDO1_SEQUENCE_SLOT			0xC</div><div class='ctx'> #define TPS65219_REG_LDO2_SEQUENCE_SLOT			0xD</div><div class='ctx'> #define TPS65219_REG_LDO1_SEQUENCE_SLOT			0xE</div><div class='ctx'> #define TPS65219_REG_BUCK3_SEQUENCE_SLOT		0xF</div><div class='hunk'>@@ -46,15 +53,21 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_REG_nRST_SEQUENCE_SLOT			0x12</div><div class='ctx'> #define TPS65219_REG_GPIO_SEQUENCE_SLOT			0x13</div><div class='ctx'> #define TPS65219_REG_GPO2_SEQUENCE_SLOT			0x14</div><div class='add'>+#define TPS65214_REG_GPIO_GPI_SEQUENCE_SLOT		0x14</div><div class='ctx'> #define TPS65219_REG_GPO1_SEQUENCE_SLOT			0x15</div><div class='add'>+#define TPS65214_REG_GPO_SEQUENCE_SLOT			0x15</div><div class='ctx'> #define TPS65219_REG_POWER_UP_SLOT_DURATION_1		0x16</div><div class='ctx'> #define TPS65219_REG_POWER_UP_SLOT_DURATION_2		0x17</div><div class='add'>+/* _SLOT_DURATION_3 doesn't apply to TPS65215*/</div><div class='ctx'> #define TPS65219_REG_POWER_UP_SLOT_DURATION_3		0x18</div><div class='ctx'> #define TPS65219_REG_POWER_UP_SLOT_DURATION_4		0x19</div><div class='add'>+#define TPS65214_REG_BUCK3_VOUT_STBY				0x19</div><div class='ctx'> #define TPS65219_REG_POWER_DOWN_SLOT_DURATION_1		0x1A</div><div class='ctx'> #define TPS65219_REG_POWER_DOWN_SLOT_DURATION_2		0x1B</div><div class='ctx'> #define TPS65219_REG_POWER_DOWN_SLOT_DURATION_3		0x1C</div><div class='add'>+#define TPS65214_REG_BUCK2_VOUT_STBY				0x1C</div><div class='ctx'> #define TPS65219_REG_POWER_DOWN_SLOT_DURATION_4		0x1D</div><div class='add'>+#define TPS65214_REG_BUCK1_VOUT_STBY				0x1D</div><div class='ctx'> #define TPS65219_REG_GENERAL_CONFIG			0x1E</div><div class='ctx'> #define TPS65219_REG_MFP_1_CONFIG			0x1F</div><div class='ctx'> #define TPS65219_REG_MFP_2_CONFIG			0x20</div><div class='hunk'>@@ -72,9 +85,19 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_REG_DISCHARGE_CONFIG			0x2A</div><div class='ctx'> /* main irq registers */</div><div class='ctx'> #define TPS65219_REG_INT_SOURCE				0x2B</div><div class='del'>-/* 'sub irq' registers */</div><div class='add'>+</div><div class='add'>+/* TPS65219 'sub irq' registers */</div><div class='ctx'> #define TPS65219_REG_INT_LDO_3_4			0x2C</div><div class='ctx'> #define TPS65219_REG_INT_LDO_1_2			0x2D</div><div class='add'>+</div><div class='add'>+/* TPS65215 specific 'sub irq' registers */</div><div class='add'>+#define TPS65215_REG_INT_LDO_2				0x2C</div><div class='add'>+#define TPS65215_REG_INT_LDO_1				0x2D</div><div class='add'>+</div><div class='add'>+/* TPS65214 specific 'sub irq' register */</div><div class='add'>+#define TPS65214_REG_INT_LDO_1_2			0x2D</div><div class='add'>+</div><div class='add'>+/* Common TPS65215 &amp; TPS65219 'sub irq' registers */</div><div class='ctx'> #define TPS65219_REG_INT_BUCK_3				0x2E</div><div class='ctx'> #define TPS65219_REG_INT_BUCK_1_2			0x2F</div><div class='ctx'> #define TPS65219_REG_INT_SYSTEM				0x30</div><div class='hunk'>@@ -91,6 +114,17 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_REG_INT_TO_RV_POS			6</div><div class='ctx'> #define TPS65219_REG_INT_PB_POS				7</div><div class='ctx'> </div><div class='add'>+#define TPS65215_REG_INT_LDO_2_POS			0</div><div class='add'>+#define TPS65215_REG_INT_LDO_1_POS			1</div><div class='add'>+</div><div class='add'>+#define TPS65214_REG_INT_LDO_1_2_POS		0</div><div class='add'>+#define TPS65214_REG_INT_BUCK_3_POS			1</div><div class='add'>+#define TPS65214_REG_INT_BUCK_1_2_POS			2</div><div class='add'>+#define TPS65214_REG_INT_SYS_POS			3</div><div class='add'>+#define TPS65214_REG_INT_RV_POS				4</div><div class='add'>+#define TPS65214_REG_INT_TO_RV_POS			5</div><div class='add'>+#define TPS65214_REG_INT_PB_POS				6</div><div class='add'>+</div><div class='ctx'> #define TPS65219_REG_USER_NVM_CMD			0x34</div><div class='ctx'> #define TPS65219_REG_POWER_UP_STATUS			0x35</div><div class='ctx'> #define TPS65219_REG_SPARE_2				0x36</div><div class='hunk'>@@ -112,6 +146,8 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_ENABLE_LDO1_EN_MASK			BIT(3)</div><div class='ctx'> #define TPS65219_ENABLE_LDO2_EN_MASK			BIT(4)</div><div class='ctx'> #define TPS65219_ENABLE_LDO3_EN_MASK			BIT(5)</div><div class='add'>+#define TPS65215_ENABLE_LDO2_EN_MASK                    BIT(5)</div><div class='add'>+#define TPS65214_ENABLE_LDO1_EN_MASK			BIT(5)</div><div class='ctx'> #define TPS65219_ENABLE_LDO4_EN_MASK			BIT(6)</div><div class='ctx'> /* power ON-OFF sequence slot */</div><div class='ctx'> #define TPS65219_BUCKS_LDOS_SEQUENCE_OFF_SLOT_MASK	GENMASK(3, 0)</div><div class='hunk'>@@ -163,20 +199,27 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_REG_MASK_EFFECT_MASK			GENMASK(2, 1)</div><div class='ctx'> #define TPS65219_REG_MASK_INT_FOR_PB_MASK		BIT(7)</div><div class='ctx'> /* UnderVoltage - Short to GND - OverCurrent*/</div><div class='del'>-/* LDO3-4 */</div><div class='add'>+/* LDO3-4: only for TPS65219*/</div><div class='ctx'> #define TPS65219_INT_LDO3_SCG_MASK			BIT(0)</div><div class='ctx'> #define TPS65219_INT_LDO3_OC_MASK			BIT(1)</div><div class='ctx'> #define TPS65219_INT_LDO3_UV_MASK			BIT(2)</div><div class='ctx'> #define TPS65219_INT_LDO4_SCG_MASK			BIT(3)</div><div class='ctx'> #define TPS65219_INT_LDO4_OC_MASK			BIT(4)</div><div class='ctx'> #define TPS65219_INT_LDO4_UV_MASK			BIT(5)</div><div class='del'>-/* LDO1-2 */</div><div class='add'>+/* LDO1-2: TPS65214 &amp; TPS65219 */</div><div class='ctx'> #define TPS65219_INT_LDO1_SCG_MASK			BIT(0)</div><div class='ctx'> #define TPS65219_INT_LDO1_OC_MASK			BIT(1)</div><div class='ctx'> #define TPS65219_INT_LDO1_UV_MASK			BIT(2)</div><div class='ctx'> #define TPS65219_INT_LDO2_SCG_MASK			BIT(3)</div><div class='ctx'> #define TPS65219_INT_LDO2_OC_MASK			BIT(4)</div><div class='ctx'> #define TPS65219_INT_LDO2_UV_MASK			BIT(5)</div><div class='add'>+/* TPS65215 LDO1-2*/</div><div class='add'>+#define TPS65215_INT_LDO1_SCG_MASK			BIT(0)</div><div class='add'>+#define TPS65215_INT_LDO1_OC_MASK			BIT(1)</div><div class='add'>+#define TPS65215_INT_LDO1_UV_MASK			BIT(2)</div><div class='add'>+#define TPS65215_INT_LDO2_SCG_MASK			BIT(0)</div><div class='add'>+#define TPS65215_INT_LDO2_OC_MASK			BIT(1)</div><div class='add'>+#define TPS65215_INT_LDO2_UV_MASK			BIT(2)</div><div class='ctx'> /* BUCK3 */</div><div class='ctx'> #define TPS65219_INT_BUCK3_SCG_MASK			BIT(0)</div><div class='ctx'> #define TPS65219_INT_BUCK3_OC_MASK			BIT(1)</div><div class='hunk'>@@ -191,12 +234,13 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_INT_BUCK2_OC_MASK			BIT(5)</div><div class='ctx'> #define TPS65219_INT_BUCK2_NEG_OC_MASK			BIT(6)</div><div class='ctx'> #define TPS65219_INT_BUCK2_UV_MASK			BIT(7)</div><div class='del'>-/* Thermal Sensor  */</div><div class='add'>+/* Thermal Sensor: TPS65219/TPS65215 */</div><div class='ctx'> #define TPS65219_INT_SENSOR_3_WARM_MASK			BIT(0)</div><div class='add'>+#define TPS65219_INT_SENSOR_3_HOT_MASK			BIT(4)</div><div class='add'>+/* Thermal Sensor: TPS65219/TPS65215/TPS65214 */</div><div class='ctx'> #define TPS65219_INT_SENSOR_2_WARM_MASK			BIT(1)</div><div class='ctx'> #define TPS65219_INT_SENSOR_1_WARM_MASK			BIT(2)</div><div class='ctx'> #define TPS65219_INT_SENSOR_0_WARM_MASK			BIT(3)</div><div class='del'>-#define TPS65219_INT_SENSOR_3_HOT_MASK			BIT(4)</div><div class='ctx'> #define TPS65219_INT_SENSOR_2_HOT_MASK			BIT(5)</div><div class='ctx'> #define TPS65219_INT_SENSOR_1_HOT_MASK			BIT(6)</div><div class='ctx'> #define TPS65219_INT_SENSOR_0_HOT_MASK			BIT(7)</div><div class='hunk'>@@ -207,6 +251,8 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_INT_LDO1_RV_MASK			BIT(3)</div><div class='ctx'> #define TPS65219_INT_LDO2_RV_MASK			BIT(4)</div><div class='ctx'> #define TPS65219_INT_LDO3_RV_MASK			BIT(5)</div><div class='add'>+#define TPS65215_INT_LDO2_RV_MASK			BIT(5)</div><div class='add'>+#define TPS65214_INT_LDO2_RV_MASK			BIT(5)</div><div class='ctx'> #define TPS65219_INT_LDO4_RV_MASK			BIT(6)</div><div class='ctx'> /* Residual Voltage ShutDown */</div><div class='ctx'> #define TPS65219_INT_BUCK1_RV_SD_MASK			BIT(0)</div><div class='hunk'>@@ -215,6 +261,8 @@ struct regmap_irq_chip_data;</div><div class='ctx'> #define TPS65219_INT_LDO1_RV_SD_MASK			BIT(3)</div><div class='ctx'> #define TPS65219_INT_LDO2_RV_SD_MASK			BIT(4)</div><div class='ctx'> #define TPS65219_INT_LDO3_RV_SD_MASK			BIT(5)</div><div class='add'>+#define TPS65215_INT_LDO2_RV_SD_MASK			BIT(5)</div><div class='add'>+#define TPS65214_INT_LDO1_RV_SD_MASK			BIT(5)</div><div class='ctx'> #define TPS65219_INT_LDO4_RV_SD_MASK			BIT(6)</div><div class='ctx'> #define TPS65219_INT_TIMEOUT_MASK			BIT(7)</div><div class='ctx'> /* Power Button */</div><div class='hunk'>@@ -240,7 +288,15 @@ enum {</div><div class='ctx'> 	TPS65219_INT_LDO4_SCG,</div><div class='ctx'> 	TPS65219_INT_LDO4_OC,</div><div class='ctx'> 	TPS65219_INT_LDO4_UV,</div><div class='del'>-	/* LDO1-2 */</div><div class='add'>+	/* TPS65215 LDO1*/</div><div class='add'>+	TPS65215_INT_LDO1_SCG,</div><div class='add'>+	TPS65215_INT_LDO1_OC,</div><div class='add'>+	TPS65215_INT_LDO1_UV,</div><div class='add'>+	/* TPS65215 LDO2*/</div><div class='add'>+	TPS65215_INT_LDO2_SCG,</div><div class='add'>+	TPS65215_INT_LDO2_OC,</div><div class='add'>+	TPS65215_INT_LDO2_UV,</div><div class='add'>+	/* LDO1-2: TPS65219/TPS65214 */</div><div class='ctx'> 	TPS65219_INT_LDO1_SCG,</div><div class='ctx'> 	TPS65219_INT_LDO1_OC,</div><div class='ctx'> 	TPS65219_INT_LDO1_UV,</div><div class='hunk'>@@ -276,6 +332,8 @@ enum {</div><div class='ctx'> 	TPS65219_INT_BUCK3_RV,</div><div class='ctx'> 	TPS65219_INT_LDO1_RV,</div><div class='ctx'> 	TPS65219_INT_LDO2_RV,</div><div class='add'>+	TPS65215_INT_LDO2_RV,</div><div class='add'>+	TPS65214_INT_LDO2_RV,</div><div class='ctx'> 	TPS65219_INT_LDO3_RV,</div><div class='ctx'> 	TPS65219_INT_LDO4_RV,</div><div class='ctx'> 	/* Residual Voltage ShutDown */</div><div class='hunk'>@@ -283,6 +341,8 @@ enum {</div><div class='ctx'> 	TPS65219_INT_BUCK2_RV_SD,</div><div class='ctx'> 	TPS65219_INT_BUCK3_RV_SD,</div><div class='ctx'> 	TPS65219_INT_LDO1_RV_SD,</div><div class='add'>+	TPS65214_INT_LDO1_RV_SD,</div><div class='add'>+	TPS65215_INT_LDO2_RV_SD,</div><div class='ctx'> 	TPS65219_INT_LDO2_RV_SD,</div><div class='ctx'> 	TPS65219_INT_LDO3_RV_SD,</div><div class='ctx'> 	TPS65219_INT_LDO4_RV_SD,</div><div class='hunk'>@@ -292,6 +352,23 @@ enum {</div><div class='ctx'> 	TPS65219_INT_PB_RISING_EDGE_DETECT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum tps65214_regulator_id {</div><div class='add'>+	/*</div><div class='add'>+	 * DCDC's same as TPS65219</div><div class='add'>+	 * LDO1 maps to TPS65219's LDO3</div><div class='add'>+	 * LDO2 is the same as TPS65219</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+	TPS65214_LDO_1 = 3,</div><div class='add'>+	TPS65214_LDO_2 = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tps65215_regulator_id {</div><div class='add'>+	/* DCDC's same as TPS65219 */</div><div class='add'>+	/* LDO1 is the same as TPS65219 */</div><div class='add'>+	TPS65215_LDO_2 = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum tps65219_regulator_id {</div><div class='ctx'> 	/* DCDC's */</div><div class='ctx'> 	TPS65219_BUCK_1,</div><div class='hunk'>@@ -305,11 +382,40 @@ enum tps65219_regulator_id {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Number of step-down converters available */</div><div class='del'>-#define TPS65219_NUM_DCDC		3</div><div class='add'>+#define TPS6521X_NUM_BUCKS		3</div><div class='ctx'> /* Number of LDO voltage regulators available */</div><div class='ctx'> #define TPS65219_NUM_LDO		4</div><div class='add'>+#define TPS65215_NUM_LDO		2</div><div class='add'>+#define TPS65214_NUM_LDO		2</div><div class='ctx'> /* Number of total regulators available */</div><div class='del'>-#define TPS65219_NUM_REGULATOR		(TPS65219_NUM_DCDC + TPS65219_NUM_LDO)</div><div class='add'>+#define TPS65219_NUM_REGULATOR		(TPS6521X_NUM_BUCKS + TPS65219_NUM_LDO)</div><div class='add'>+#define TPS65215_NUM_REGULATOR		(TPS6521X_NUM_BUCKS + TPS65215_NUM_LDO)</div><div class='add'>+#define TPS65214_NUM_REGULATOR		(TPS6521X_NUM_BUCKS + TPS65214_NUM_LDO)</div><div class='add'>+</div><div class='add'>+/* Define the TPS65214 IRQ numbers */</div><div class='add'>+enum tps65214_irqs {</div><div class='add'>+	/* INT source registers */</div><div class='add'>+	TPS65214_TO_RV_SD_SET_IRQ,</div><div class='add'>+	TPS65214_RV_SET_IRQ,</div><div class='add'>+	TPS65214_SYS_SET_IRQ,</div><div class='add'>+	TPS65214_BUCK_1_2_SET_IRQ,</div><div class='add'>+	TPS65214_BUCK_3_SET_IRQ,</div><div class='add'>+	TPS65214_LDO_1_2_SET_IRQ,</div><div class='add'>+	TPS65214_PB_SET_IRQ = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Define the TPS65215 IRQ numbers */</div><div class='add'>+enum tps65215_irqs {</div><div class='add'>+	/* INT source registers */</div><div class='add'>+	TPS65215_TO_RV_SD_SET_IRQ,</div><div class='add'>+	TPS65215_RV_SET_IRQ,</div><div class='add'>+	TPS65215_SYS_SET_IRQ,</div><div class='add'>+	TPS65215_BUCK_1_2_SET_IRQ,</div><div class='add'>+	TPS65215_BUCK_3_SET_IRQ,</div><div class='add'>+	TPS65215_LDO_1_SET_IRQ,</div><div class='add'>+	TPS65215_LDO_2_SET_IRQ,</div><div class='add'>+	TPS65215_PB_SET_IRQ,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Define the TPS65219 IRQ numbers */</div><div class='ctx'> enum tps65219_irqs {</div><div class='hunk'>@@ -332,14 +438,12 @@ enum tps65219_irqs {</div><div class='ctx'>  * @dev: MFD device</div><div class='ctx'>  * @regmap: Regmap for accessing the device registers</div><div class='ctx'>  * @irq_data: Regmap irq data used for the irq chip</div><div class='del'>- * @nb: notifier block for the restart handler</div><div class='ctx'>  */</div><div class='ctx'> struct tps65219 {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> </div><div class='ctx'> 	struct regmap_irq_chip_data *irq_data;</div><div class='del'>-	struct notifier_block nb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* MFD_TPS65219_H */</div><div class='head'>diff --git a/include/linux/mfd/tps65912.h b/include/linux/mfd/tps65912.h<br/>index 860ec0a16c96..e5373c302722 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/tps65912.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/tps65912.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/tps65912.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/tps65912.h</a></div><div class='hunk'>@@ -314,6 +314,5 @@ struct tps65912 {</div><div class='ctx'> extern const struct regmap_config tps65912_regmap_config;</div><div class='ctx'> </div><div class='ctx'> int tps65912_device_init(struct tps65912 *tps);</div><div class='del'>-void tps65912_device_exit(struct tps65912 *tps);</div><div class='ctx'> </div><div class='ctx'> #endif /*  __LINUX_MFD_TPS65912_H */</div><div class='head'>diff --git a/include/linux/mfd/tps6594.h b/include/linux/mfd/tps6594.h<br/>index 3f7c5e23cd4c..021db8875963 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/tps6594.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/tps6594.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/tps6594.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/tps6594.h</a></div><div class='hunk'>@@ -18,12 +18,14 @@ enum pmic_id {</div><div class='ctx'> 	TPS6594,</div><div class='ctx'> 	TPS6593,</div><div class='ctx'> 	LP8764,</div><div class='add'>+	TPS65224,</div><div class='add'>+	TPS652G1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Macro to get page index from register address */</div><div class='ctx'> #define TPS6594_REG_TO_PAGE(reg)	((reg) &gt;&gt; 8)</div><div class='ctx'> </div><div class='del'>-/* Registers for page 0 of TPS6594 */</div><div class='add'>+/* Registers for page 0 */</div><div class='ctx'> #define TPS6594_REG_DEV_REV				0x01</div><div class='ctx'> </div><div class='ctx'> #define TPS6594_REG_NVM_CODE_1				0x02</div><div class='hunk'>@@ -56,9 +58,6 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_REG_GPIOX_OUT(gpio_inst)		(TPS6594_REG_GPIO_OUT_1 + (gpio_inst) / 8)</div><div class='ctx'> #define TPS6594_REG_GPIOX_IN(gpio_inst)			(TPS6594_REG_GPIO_IN_1 + (gpio_inst) / 8)</div><div class='ctx'> </div><div class='del'>-#define TPS6594_REG_GPIO_IN_1				0x3f</div><div class='del'>-#define TPS6594_REG_GPIO_IN_2				0x40</div><div class='del'>-</div><div class='ctx'> #define TPS6594_REG_RAIL_SEL_1				0x41</div><div class='ctx'> #define TPS6594_REG_RAIL_SEL_2				0x42</div><div class='ctx'> #define TPS6594_REG_RAIL_SEL_3				0x43</div><div class='hunk'>@@ -70,13 +69,15 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_REG_FSM_TRIG_MASK_3			0x48</div><div class='ctx'> </div><div class='ctx'> #define TPS6594_REG_MASK_BUCK1_2			0x49</div><div class='add'>+#define TPS65224_REG_MASK_BUCKS				0x49</div><div class='ctx'> #define TPS6594_REG_MASK_BUCK3_4			0x4a</div><div class='ctx'> #define TPS6594_REG_MASK_BUCK5				0x4b</div><div class='ctx'> #define TPS6594_REG_MASK_LDO1_2				0x4c</div><div class='add'>+#define TPS65224_REG_MASK_LDOS				0x4c</div><div class='ctx'> #define TPS6594_REG_MASK_LDO3_4				0x4d</div><div class='ctx'> #define TPS6594_REG_MASK_VMON				0x4e</div><div class='del'>-#define TPS6594_REG_MASK_GPIO1_8_FALL			0x4f</div><div class='del'>-#define TPS6594_REG_MASK_GPIO1_8_RISE			0x50</div><div class='add'>+#define TPS6594_REG_MASK_GPIO_FALL			0x4f</div><div class='add'>+#define TPS6594_REG_MASK_GPIO_RISE			0x50</div><div class='ctx'> #define TPS6594_REG_MASK_GPIO9_11			0x51</div><div class='ctx'> #define TPS6594_REG_MASK_STARTUP			0x52</div><div class='ctx'> #define TPS6594_REG_MASK_MISC				0x53</div><div class='hunk'>@@ -174,6 +175,10 @@ enum pmic_id {</div><div class='ctx'> </div><div class='ctx'> #define TPS6594_REG_REGISTER_LOCK			0xa1</div><div class='ctx'> </div><div class='add'>+#define TPS65224_REG_SRAM_ACCESS_1			0xa2</div><div class='add'>+#define TPS65224_REG_SRAM_ACCESS_2			0xa3</div><div class='add'>+#define TPS65224_REG_SRAM_ADDR_CTRL			0xa4</div><div class='add'>+#define TPS65224_REG_RECOV_CNT_PFSM_INCR		0xa5</div><div class='ctx'> #define TPS6594_REG_MANUFACTURING_VER			0xa6</div><div class='ctx'> </div><div class='ctx'> #define TPS6594_REG_CUSTOMER_NVM_ID_REG			0xa7</div><div class='hunk'>@@ -182,6 +187,9 @@ enum pmic_id {</div><div class='ctx'> </div><div class='ctx'> #define TPS6594_REG_SOFT_REBOOT_REG			0xab</div><div class='ctx'> </div><div class='add'>+#define TPS65224_REG_ADC_CTRL				0xac</div><div class='add'>+#define TPS65224_REG_ADC_RESULT_REG_1			0xad</div><div class='add'>+#define TPS65224_REG_ADC_RESULT_REG_2			0xae</div><div class='ctx'> #define TPS6594_REG_RTC_SECONDS				0xb5</div><div class='ctx'> #define TPS6594_REG_RTC_MINUTES				0xb6</div><div class='ctx'> #define TPS6594_REG_RTC_HOURS				0xb7</div><div class='hunk'>@@ -199,6 +207,7 @@ enum pmic_id {</div><div class='ctx'> </div><div class='ctx'> #define TPS6594_REG_RTC_CTRL_1				0xc2</div><div class='ctx'> #define TPS6594_REG_RTC_CTRL_2				0xc3</div><div class='add'>+#define TPS65224_REG_STARTUP_CTRL			0xc3</div><div class='ctx'> #define TPS6594_REG_RTC_STATUS				0xc4</div><div class='ctx'> #define TPS6594_REG_RTC_INTERRUPTS			0xc5</div><div class='ctx'> #define TPS6594_REG_RTC_COMP_LSB			0xc6</div><div class='hunk'>@@ -214,13 +223,17 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_REG_PFSM_DELAY_REG_2			0xce</div><div class='ctx'> #define TPS6594_REG_PFSM_DELAY_REG_3			0xcf</div><div class='ctx'> #define TPS6594_REG_PFSM_DELAY_REG_4			0xd0</div><div class='add'>+#define TPS65224_REG_ADC_GAIN_COMP_REG			0xd0</div><div class='add'>+#define TPS65224_REG_CRC_CALC_CONTROL			0xef</div><div class='add'>+#define TPS65224_REG_REGMAP_USER_CRC_LOW		0xf0</div><div class='add'>+#define TPS65224_REG_REGMAP_USER_CRC_HIGH		0xf1</div><div class='ctx'> </div><div class='del'>-/* Registers for page 1 of TPS6594 */</div><div class='add'>+/* Registers for page 1 */</div><div class='ctx'> #define TPS6594_REG_SERIAL_IF_CONFIG			0x11a</div><div class='ctx'> #define TPS6594_REG_I2C1_ID				0x122</div><div class='ctx'> #define TPS6594_REG_I2C2_ID				0x123</div><div class='ctx'> </div><div class='del'>-/* Registers for page 4 of TPS6594 */</div><div class='add'>+/* Registers for page 4 */</div><div class='ctx'> #define TPS6594_REG_WD_ANSWER_REG			0x401</div><div class='ctx'> #define TPS6594_REG_WD_QUESTION_ANSW_CNT		0x402</div><div class='ctx'> #define TPS6594_REG_WD_WIN1_CFG				0x403</div><div class='hunk'>@@ -241,16 +254,26 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_BUCK_PLDN				BIT(5)</div><div class='ctx'> #define TPS6594_BIT_BUCK_RV_SEL				BIT(7)</div><div class='ctx'> </div><div class='del'>-/* BUCKX_CONF register field definition */</div><div class='add'>+/* TPS6594 BUCKX_CONF register field definition */</div><div class='ctx'> #define TPS6594_MASK_BUCK_SLEW_RATE			GENMASK(2, 0)</div><div class='ctx'> #define TPS6594_MASK_BUCK_ILIM				GENMASK(5, 3)</div><div class='ctx'> </div><div class='del'>-/* BUCKX_PG_WINDOW register field definition */</div><div class='add'>+/* TPS65224 BUCKX_CONF register field definition */</div><div class='add'>+#define TPS65224_MASK_BUCK_SLEW_RATE			GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+/* TPS6594 BUCKX_PG_WINDOW register field definition */</div><div class='ctx'> #define TPS6594_MASK_BUCK_OV_THR			GENMASK(2, 0)</div><div class='ctx'> #define TPS6594_MASK_BUCK_UV_THR			GENMASK(5, 3)</div><div class='ctx'> </div><div class='del'>-/* BUCKX VSET */</div><div class='del'>-#define TPS6594_MASK_BUCKS_VSET GENMASK(7, 0)</div><div class='add'>+/* TPS65224 BUCKX_PG_WINDOW register field definition */</div><div class='add'>+#define TPS65224_MASK_BUCK_VMON_THR			GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+/* TPS6594 BUCKX_VOUT register field definition */</div><div class='add'>+#define TPS6594_MASK_BUCKS_VSET				GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* TPS65224 BUCKX_VOUT register field definition */</div><div class='add'>+#define TPS65224_MASK_BUCK1_VSET			GENMASK(7, 0)</div><div class='add'>+#define TPS65224_MASK_BUCKS_VSET			GENMASK(6, 0)</div><div class='ctx'> </div><div class='ctx'> /* LDOX_CTRL register field definition */</div><div class='ctx'> #define TPS6594_BIT_LDO_EN				BIT(0)</div><div class='hunk'>@@ -258,6 +281,7 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_LDO_VMON_EN				BIT(4)</div><div class='ctx'> #define TPS6594_MASK_LDO_PLDN				GENMASK(6, 5)</div><div class='ctx'> #define TPS6594_BIT_LDO_RV_SEL				BIT(7)</div><div class='add'>+#define TPS65224_BIT_LDO_DISCHARGE_EN			BIT(5)</div><div class='ctx'> </div><div class='ctx'> /* LDORTC_CTRL register field definition */</div><div class='ctx'> #define TPS6594_BIT_LDORTC_DIS				BIT(0)</div><div class='hunk'>@@ -271,6 +295,9 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_MASK_LDO_OV_THR				GENMASK(2, 0)</div><div class='ctx'> #define TPS6594_MASK_LDO_UV_THR				GENMASK(5, 3)</div><div class='ctx'> </div><div class='add'>+/* LDOX_PG_WINDOW register field definition */</div><div class='add'>+#define TPS65224_MASK_LDO_VMON_THR			GENMASK(1, 0)</div><div class='add'>+</div><div class='ctx'> /* VCCA_VMON_CTRL register field definition */</div><div class='ctx'> #define TPS6594_BIT_VMON_EN				BIT(0)</div><div class='ctx'> #define TPS6594_BIT_VMON1_EN				BIT(1)</div><div class='hunk'>@@ -278,10 +305,12 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_VMON2_EN				BIT(3)</div><div class='ctx'> #define TPS6594_BIT_VMON2_RV_SEL			BIT(4)</div><div class='ctx'> #define TPS6594_BIT_VMON_DEGLITCH_SEL			BIT(5)</div><div class='add'>+#define TPS65224_BIT_VMON_DEGLITCH_SEL			GENMASK(7, 5)</div><div class='ctx'> </div><div class='ctx'> /* VCCA_PG_WINDOW register field definition */</div><div class='ctx'> #define TPS6594_MASK_VCCA_OV_THR			GENMASK(2, 0)</div><div class='ctx'> #define TPS6594_MASK_VCCA_UV_THR			GENMASK(5, 3)</div><div class='add'>+#define TPS65224_MASK_VCCA_VMON_THR			GENMASK(1, 0)</div><div class='ctx'> #define TPS6594_BIT_VCCA_PG_SET				BIT(6)</div><div class='ctx'> </div><div class='ctx'> /* VMONX_PG_WINDOW register field definition */</div><div class='hunk'>@@ -289,6 +318,9 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_MASK_VMONX_UV_THR			GENMASK(5, 3)</div><div class='ctx'> #define TPS6594_BIT_VMONX_RANGE				BIT(6)</div><div class='ctx'> </div><div class='add'>+/* VMONX_PG_WINDOW register field definition */</div><div class='add'>+#define TPS65224_MASK_VMONX_THR				GENMASK(1, 0)</div><div class='add'>+</div><div class='ctx'> /* GPIOX_CONF register field definition */</div><div class='ctx'> #define TPS6594_BIT_GPIO_DIR				BIT(0)</div><div class='ctx'> #define TPS6594_BIT_GPIO_OD				BIT(1)</div><div class='hunk'>@@ -296,6 +328,8 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_GPIO_PU_PD_EN			BIT(3)</div><div class='ctx'> #define TPS6594_BIT_GPIO_DEGLITCH_EN			BIT(4)</div><div class='ctx'> #define TPS6594_MASK_GPIO_SEL				GENMASK(7, 5)</div><div class='add'>+#define TPS65224_MASK_GPIO_SEL				GENMASK(6, 5)</div><div class='add'>+#define TPS65224_MASK_GPIO_SEL_GPIO6			GENMASK(7, 5)</div><div class='ctx'> </div><div class='ctx'> /* NPWRON_CONF register field definition */</div><div class='ctx'> #define TPS6594_BIT_NRSTOUT_OD				BIT(0)</div><div class='hunk'>@@ -305,6 +339,12 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_ENABLE_POL				BIT(5)</div><div class='ctx'> #define TPS6594_MASK_NPWRON_SEL				GENMASK(7, 6)</div><div class='ctx'> </div><div class='add'>+/* POWER_ON_CONFIG register field definition */</div><div class='add'>+#define TPS65224_BIT_NINT_ENDRV_PU_SEL			BIT(0)</div><div class='add'>+#define TPS65224_BIT_NINT_ENDRV_SEL			BIT(1)</div><div class='add'>+#define TPS65224_BIT_EN_PB_DEGL				BIT(5)</div><div class='add'>+#define TPS65224_MASK_EN_PB_VSENSE_CONFIG		GENMASK(7, 6)</div><div class='add'>+</div><div class='ctx'> /* GPIO_OUT_X register field definition */</div><div class='ctx'> #define TPS6594_BIT_GPIOX_OUT(gpio_inst)		BIT((gpio_inst) % 8)</div><div class='ctx'> </div><div class='hunk'>@@ -312,6 +352,12 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_GPIOX_IN(gpio_inst)			BIT((gpio_inst) % 8)</div><div class='ctx'> #define TPS6594_BIT_NPWRON_IN				BIT(3)</div><div class='ctx'> </div><div class='add'>+/* GPIO_OUT_X register field definition */</div><div class='add'>+#define TPS65224_BIT_GPIOX_OUT(gpio_inst)		BIT((gpio_inst))</div><div class='add'>+</div><div class='add'>+/* GPIO_IN_X register field definition */</div><div class='add'>+#define TPS65224_BIT_GPIOX_IN(gpio_inst)		BIT((gpio_inst))</div><div class='add'>+</div><div class='ctx'> /* RAIL_SEL_1 register field definition */</div><div class='ctx'> #define TPS6594_MASK_BUCK1_GRP_SEL			GENMASK(1, 0)</div><div class='ctx'> #define TPS6594_MASK_BUCK2_GRP_SEL			GENMASK(3, 2)</div><div class='hunk'>@@ -343,6 +389,9 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_GPIOX_FSM_MASK(gpio_inst)		BIT(((gpio_inst) &lt;&lt; 1) % 8)</div><div class='ctx'> #define TPS6594_BIT_GPIOX_FSM_MASK_POL(gpio_inst)	BIT(((gpio_inst) &lt;&lt; 1) % 8 + 1)</div><div class='ctx'> </div><div class='add'>+#define TPS65224_BIT_GPIOX_FSM_MASK(gpio_inst)		BIT(((gpio_inst) &lt;&lt; 1) % 6)</div><div class='add'>+#define TPS65224_BIT_GPIOX_FSM_MASK_POL(gpio_inst)	BIT(((gpio_inst) &lt;&lt; 1) % 6 + 1)</div><div class='add'>+</div><div class='ctx'> /* MASK_BUCKX register field definition */</div><div class='ctx'> #define TPS6594_BIT_BUCKX_OV_MASK(buck_inst)		BIT(((buck_inst) &lt;&lt; 2) % 8)</div><div class='ctx'> #define TPS6594_BIT_BUCKX_UV_MASK(buck_inst)		BIT(((buck_inst) &lt;&lt; 2) % 8 + 1)</div><div class='hunk'>@@ -361,22 +410,46 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_VMON2_OV_MASK			BIT(5)</div><div class='ctx'> #define TPS6594_BIT_VMON2_UV_MASK			BIT(6)</div><div class='ctx'> </div><div class='add'>+/* MASK_BUCK Register field definition */</div><div class='add'>+#define TPS65224_BIT_BUCK1_UVOV_MASK			BIT(0)</div><div class='add'>+#define TPS65224_BIT_BUCK2_UVOV_MASK			BIT(1)</div><div class='add'>+#define TPS65224_BIT_BUCK3_UVOV_MASK			BIT(2)</div><div class='add'>+#define TPS65224_BIT_BUCK4_UVOV_MASK			BIT(4)</div><div class='add'>+</div><div class='add'>+/* MASK_LDO_VMON register field definition */</div><div class='add'>+#define TPS65224_BIT_LDO1_UVOV_MASK			BIT(0)</div><div class='add'>+#define TPS65224_BIT_LDO2_UVOV_MASK			BIT(1)</div><div class='add'>+#define TPS65224_BIT_LDO3_UVOV_MASK			BIT(2)</div><div class='add'>+#define TPS65224_BIT_VCCA_UVOV_MASK			BIT(4)</div><div class='add'>+#define TPS65224_BIT_VMON1_UVOV_MASK			BIT(5)</div><div class='add'>+#define TPS65224_BIT_VMON2_UVOV_MASK			BIT(6)</div><div class='add'>+</div><div class='ctx'> /* MASK_GPIOX register field definition */</div><div class='ctx'> #define TPS6594_BIT_GPIOX_FALL_MASK(gpio_inst)		BIT((gpio_inst) &lt; 8 ? \</div><div class='ctx'> 							    (gpio_inst) : (gpio_inst) % 8)</div><div class='ctx'> #define TPS6594_BIT_GPIOX_RISE_MASK(gpio_inst)		BIT((gpio_inst) &lt; 8 ? \</div><div class='ctx'> 							    (gpio_inst) : (gpio_inst) % 8 + 3)</div><div class='add'>+/* MASK_GPIOX register field definition */</div><div class='add'>+#define TPS65224_BIT_GPIOX_FALL_MASK(gpio_inst)		BIT((gpio_inst))</div><div class='add'>+#define TPS65224_BIT_GPIOX_RISE_MASK(gpio_inst)		BIT((gpio_inst))</div><div class='ctx'> </div><div class='ctx'> /* MASK_STARTUP register field definition */</div><div class='ctx'> #define TPS6594_BIT_NPWRON_START_MASK			BIT(0)</div><div class='ctx'> #define TPS6594_BIT_ENABLE_MASK				BIT(1)</div><div class='ctx'> #define TPS6594_BIT_FSD_MASK				BIT(4)</div><div class='ctx'> #define TPS6594_BIT_SOFT_REBOOT_MASK			BIT(5)</div><div class='add'>+#define TPS65224_BIT_VSENSE_MASK			BIT(0)</div><div class='add'>+#define TPS65224_BIT_PB_SHORT_MASK			BIT(2)</div><div class='ctx'> </div><div class='ctx'> /* MASK_MISC register field definition */</div><div class='ctx'> #define TPS6594_BIT_BIST_PASS_MASK			BIT(0)</div><div class='ctx'> #define TPS6594_BIT_EXT_CLK_MASK			BIT(1)</div><div class='add'>+#define TPS65224_BIT_REG_UNLOCK_MASK			BIT(2)</div><div class='ctx'> #define TPS6594_BIT_TWARN_MASK				BIT(3)</div><div class='add'>+#define TPS65224_BIT_PB_LONG_MASK			BIT(4)</div><div class='add'>+#define TPS65224_BIT_PB_FALL_MASK			BIT(5)</div><div class='add'>+#define TPS65224_BIT_PB_RISE_MASK			BIT(6)</div><div class='add'>+#define TPS65224_BIT_ADC_CONV_READY_MASK		BIT(7)</div><div class='ctx'> </div><div class='ctx'> /* MASK_MODERATE_ERR register field definition */</div><div class='ctx'> #define TPS6594_BIT_BIST_FAIL_MASK			BIT(1)</div><div class='hunk'>@@ -391,6 +464,8 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_ORD_SHUTDOWN_MASK			BIT(1)</div><div class='ctx'> #define TPS6594_BIT_MCU_PWR_ERR_MASK			BIT(2)</div><div class='ctx'> #define TPS6594_BIT_SOC_PWR_ERR_MASK			BIT(3)</div><div class='add'>+#define TPS65224_BIT_COMM_ERR_MASK			BIT(4)</div><div class='add'>+#define TPS65224_BIT_I2C2_ERR_MASK			BIT(5)</div><div class='ctx'> </div><div class='ctx'> /* MASK_COMM_ERR register field definition */</div><div class='ctx'> #define TPS6594_BIT_COMM_FRM_ERR_MASK			BIT(0)</div><div class='hunk'>@@ -426,6 +501,12 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_BUCK3_4_INT				BIT(1)</div><div class='ctx'> #define TPS6594_BIT_BUCK5_INT				BIT(2)</div><div class='ctx'> </div><div class='add'>+/* INT_BUCK register field definition */</div><div class='add'>+#define TPS65224_BIT_BUCK1_UVOV_INT			BIT(0)</div><div class='add'>+#define TPS65224_BIT_BUCK2_UVOV_INT			BIT(1)</div><div class='add'>+#define TPS65224_BIT_BUCK3_UVOV_INT			BIT(2)</div><div class='add'>+#define TPS65224_BIT_BUCK4_UVOV_INT			BIT(3)</div><div class='add'>+</div><div class='ctx'> /* INT_BUCKX register field definition */</div><div class='ctx'> #define TPS6594_BIT_BUCKX_OV_INT(buck_inst)		BIT(((buck_inst) &lt;&lt; 2) % 8)</div><div class='ctx'> #define TPS6594_BIT_BUCKX_UV_INT(buck_inst)		BIT(((buck_inst) &lt;&lt; 2) % 8 + 1)</div><div class='hunk'>@@ -437,6 +518,14 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_LDO3_4_INT				BIT(1)</div><div class='ctx'> #define TPS6594_BIT_VCCA_INT				BIT(4)</div><div class='ctx'> </div><div class='add'>+/* INT_LDO_VMON register field definition */</div><div class='add'>+#define TPS65224_BIT_LDO1_UVOV_INT			BIT(0)</div><div class='add'>+#define TPS65224_BIT_LDO2_UVOV_INT			BIT(1)</div><div class='add'>+#define TPS65224_BIT_LDO3_UVOV_INT			BIT(2)</div><div class='add'>+#define TPS65224_BIT_VCCA_UVOV_INT			BIT(4)</div><div class='add'>+#define TPS65224_BIT_VMON1_UVOV_INT			BIT(5)</div><div class='add'>+#define TPS65224_BIT_VMON2_UVOV_INT			BIT(6)</div><div class='add'>+</div><div class='ctx'> /* INT_LDOX register field definition */</div><div class='ctx'> #define TPS6594_BIT_LDOX_OV_INT(ldo_inst)		BIT(((ldo_inst) &lt;&lt; 2) % 8)</div><div class='ctx'> #define TPS6594_BIT_LDOX_UV_INT(ldo_inst)		BIT(((ldo_inst) &lt;&lt; 2) % 8 + 1)</div><div class='hunk'>@@ -462,17 +551,32 @@ enum pmic_id {</div><div class='ctx'> /* INT_GPIOX register field definition */</div><div class='ctx'> #define TPS6594_BIT_GPIOX_INT(gpio_inst)		BIT(gpio_inst)</div><div class='ctx'> </div><div class='add'>+/* INT_GPIO register field definition */</div><div class='add'>+#define TPS65224_BIT_GPIO1_INT				BIT(0)</div><div class='add'>+#define TPS65224_BIT_GPIO2_INT				BIT(1)</div><div class='add'>+#define TPS65224_BIT_GPIO3_INT				BIT(2)</div><div class='add'>+#define TPS65224_BIT_GPIO4_INT				BIT(3)</div><div class='add'>+#define TPS65224_BIT_GPIO5_INT				BIT(4)</div><div class='add'>+#define TPS65224_BIT_GPIO6_INT				BIT(5)</div><div class='add'>+</div><div class='ctx'> /* INT_STARTUP register field definition */</div><div class='ctx'> #define TPS6594_BIT_NPWRON_START_INT			BIT(0)</div><div class='add'>+#define TPS65224_BIT_VSENSE_INT				BIT(0)</div><div class='ctx'> #define TPS6594_BIT_ENABLE_INT				BIT(1)</div><div class='ctx'> #define TPS6594_BIT_RTC_INT				BIT(2)</div><div class='add'>+#define TPS65224_BIT_PB_SHORT_INT			BIT(2)</div><div class='ctx'> #define TPS6594_BIT_FSD_INT				BIT(4)</div><div class='ctx'> #define TPS6594_BIT_SOFT_REBOOT_INT			BIT(5)</div><div class='ctx'> </div><div class='ctx'> /* INT_MISC register field definition */</div><div class='ctx'> #define TPS6594_BIT_BIST_PASS_INT			BIT(0)</div><div class='ctx'> #define TPS6594_BIT_EXT_CLK_INT				BIT(1)</div><div class='add'>+#define TPS65224_BIT_REG_UNLOCK_INT			BIT(2)</div><div class='ctx'> #define TPS6594_BIT_TWARN_INT				BIT(3)</div><div class='add'>+#define TPS65224_BIT_PB_LONG_INT			BIT(4)</div><div class='add'>+#define TPS65224_BIT_PB_FALL_INT			BIT(5)</div><div class='add'>+#define TPS65224_BIT_PB_RISE_INT			BIT(6)</div><div class='add'>+#define TPS65224_BIT_ADC_CONV_READY_INT			BIT(7)</div><div class='ctx'> </div><div class='ctx'> /* INT_MODERATE_ERR register field definition */</div><div class='ctx'> #define TPS6594_BIT_TSD_ORD_INT				BIT(0)</div><div class='hunk'>@@ -488,6 +592,7 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_TSD_IMM_INT				BIT(0)</div><div class='ctx'> #define TPS6594_BIT_VCCA_OVP_INT			BIT(1)</div><div class='ctx'> #define TPS6594_BIT_PFSM_ERR_INT			BIT(2)</div><div class='add'>+#define TPS65224_BIT_BG_XMON_INT			BIT(3)</div><div class='ctx'> </div><div class='ctx'> /* INT_FSM_ERR register field definition */</div><div class='ctx'> #define TPS6594_BIT_IMM_SHUTDOWN_INT			BIT(0)</div><div class='hunk'>@@ -496,6 +601,7 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_SOC_PWR_ERR_INT			BIT(3)</div><div class='ctx'> #define TPS6594_BIT_COMM_ERR_INT			BIT(4)</div><div class='ctx'> #define TPS6594_BIT_READBACK_ERR_INT			BIT(5)</div><div class='add'>+#define TPS65224_BIT_I2C2_ERR_INT			BIT(5)</div><div class='ctx'> #define TPS6594_BIT_ESM_INT				BIT(6)</div><div class='ctx'> #define TPS6594_BIT_WD_INT				BIT(7)</div><div class='ctx'> </div><div class='hunk'>@@ -536,8 +642,18 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_VMON2_OV_STAT			BIT(5)</div><div class='ctx'> #define TPS6594_BIT_VMON2_UV_STAT			BIT(6)</div><div class='ctx'> </div><div class='add'>+/* STAT_LDO_VMON register field definition */</div><div class='add'>+#define TPS65224_BIT_LDO1_UVOV_STAT			BIT(0)</div><div class='add'>+#define TPS65224_BIT_LDO2_UVOV_STAT			BIT(1)</div><div class='add'>+#define TPS65224_BIT_LDO3_UVOV_STAT			BIT(2)</div><div class='add'>+#define TPS65224_BIT_VCCA_UVOV_STAT			BIT(4)</div><div class='add'>+#define TPS65224_BIT_VMON1_UVOV_STAT			BIT(5)</div><div class='add'>+#define TPS65224_BIT_VMON2_UVOV_STAT			BIT(6)</div><div class='add'>+</div><div class='ctx'> /* STAT_STARTUP register field definition */</div><div class='add'>+#define TPS65224_BIT_VSENSE_STAT			BIT(0)</div><div class='ctx'> #define TPS6594_BIT_ENABLE_STAT				BIT(1)</div><div class='add'>+#define TPS65224_BIT_PB_LEVEL_STAT			BIT(2)</div><div class='ctx'> </div><div class='ctx'> /* STAT_MISC register field definition */</div><div class='ctx'> #define TPS6594_BIT_EXT_CLK_STAT			BIT(1)</div><div class='hunk'>@@ -549,6 +665,7 @@ enum pmic_id {</div><div class='ctx'> /* STAT_SEVERE_ERR register field definition */</div><div class='ctx'> #define TPS6594_BIT_TSD_IMM_STAT			BIT(0)</div><div class='ctx'> #define TPS6594_BIT_VCCA_OVP_STAT			BIT(1)</div><div class='add'>+#define TPS65224_BIT_BG_XMON_STAT			BIT(3)</div><div class='ctx'> </div><div class='ctx'> /* STAT_READBACK_ERR register field definition */</div><div class='ctx'> #define TPS6594_BIT_EN_DRV_READBACK_STAT		BIT(0)</div><div class='hunk'>@@ -597,6 +714,8 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_BB_CHARGER_EN			BIT(0)</div><div class='ctx'> #define TPS6594_BIT_BB_ICHR				BIT(1)</div><div class='ctx'> #define TPS6594_MASK_BB_VEOC				GENMASK(3, 2)</div><div class='add'>+#define TPS65224_BIT_I2C1_SPI_CRC_EN			BIT(4)</div><div class='add'>+#define TPS65224_BIT_I2C2_CRC_EN			BIT(5)</div><div class='ctx'> #define TPS6594_BB_EOC_RDY				BIT(7)</div><div class='ctx'> </div><div class='ctx'> /* ENABLE_DRV_REG register field definition */</div><div class='hunk'>@@ -617,6 +736,7 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_NRSTOUT_SOC_IN			BIT(2)</div><div class='ctx'> #define TPS6594_BIT_FORCE_EN_DRV_LOW			BIT(3)</div><div class='ctx'> #define TPS6594_BIT_SPMI_LPM_EN				BIT(4)</div><div class='add'>+#define TPS65224_BIT_TSD_DISABLE			BIT(5)</div><div class='ctx'> </div><div class='ctx'> /* RECOV_CNT_REG_1 register field definition */</div><div class='ctx'> #define TPS6594_MASK_RECOV_CNT				GENMASK(3, 0)</div><div class='hunk'>@@ -671,15 +791,27 @@ enum pmic_id {</div><div class='ctx'> /* ESM_SOC_START_REG register field definition */</div><div class='ctx'> #define TPS6594_BIT_ESM_SOC_START			BIT(0)</div><div class='ctx'> </div><div class='add'>+/* ESM_MCU_START_REG register field definition */</div><div class='add'>+#define TPS65224_BIT_ESM_MCU_START			BIT(0)</div><div class='add'>+</div><div class='ctx'> /* ESM_SOC_MODE_CFG register field definition */</div><div class='ctx'> #define TPS6594_MASK_ESM_SOC_ERR_CNT_TH			GENMASK(3, 0)</div><div class='ctx'> #define TPS6594_BIT_ESM_SOC_ENDRV			BIT(5)</div><div class='ctx'> #define TPS6594_BIT_ESM_SOC_EN				BIT(6)</div><div class='ctx'> #define TPS6594_BIT_ESM_SOC_MODE			BIT(7)</div><div class='ctx'> </div><div class='add'>+/* ESM_MCU_MODE_CFG register field definition */</div><div class='add'>+#define TPS65224_MASK_ESM_MCU_ERR_CNT_TH		GENMASK(3, 0)</div><div class='add'>+#define TPS65224_BIT_ESM_MCU_ENDRV			BIT(5)</div><div class='add'>+#define TPS65224_BIT_ESM_MCU_EN				BIT(6)</div><div class='add'>+#define TPS65224_BIT_ESM_MCU_MODE			BIT(7)</div><div class='add'>+</div><div class='ctx'> /* ESM_SOC_ERR_CNT_REG register field definition */</div><div class='ctx'> #define TPS6594_MASK_ESM_SOC_ERR_CNT			GENMASK(4, 0)</div><div class='ctx'> </div><div class='add'>+/* ESM_MCU_ERR_CNT_REG register field definition */</div><div class='add'>+#define TPS6594_MASK_ESM_MCU_ERR_CNT			GENMASK(4, 0)</div><div class='add'>+</div><div class='ctx'> /* REGISTER_LOCK register field definition */</div><div class='ctx'> #define TPS6594_BIT_REGISTER_LOCK_STATUS		BIT(0)</div><div class='ctx'> </div><div class='hunk'>@@ -687,6 +819,29 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_MASK_VMON1_SLEW_RATE			GENMASK(2, 0)</div><div class='ctx'> #define TPS6594_MASK_VMON2_SLEW_RATE			GENMASK(5, 3)</div><div class='ctx'> </div><div class='add'>+/* SRAM_ACCESS_1 Register field definition */</div><div class='add'>+#define TPS65224_MASk_SRAM_UNLOCK_SEQ			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* SRAM_ACCESS_2 Register field definition */</div><div class='add'>+#define TPS65224_BIT_SRAM_WRITE_MODE			BIT(0)</div><div class='add'>+#define TPS65224_BIT_OTP_PROG_USER			BIT(1)</div><div class='add'>+#define TPS65224_BIT_OTP_PROG_PFSM			BIT(2)</div><div class='add'>+#define TPS65224_BIT_OTP_PROG_STATUS			BIT(3)</div><div class='add'>+#define TPS65224_BIT_SRAM_UNLOCKED			BIT(6)</div><div class='add'>+#define TPS65224_USER_PROG_ALLOWED			BIT(7)</div><div class='add'>+</div><div class='add'>+/* SRAM_ADDR_CTRL Register field definition */</div><div class='add'>+#define TPS65224_MASk_SRAM_SEL				GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+/* RECOV_CNT_PFSM_INCR Register field definition */</div><div class='add'>+#define TPS65224_BIT_INCREMENT_RECOV_CNT		BIT(0)</div><div class='add'>+</div><div class='add'>+/* MANUFACTURING_VER Register field definition */</div><div class='add'>+#define TPS65224_MASK_SILICON_REV			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* CUSTOMER_NVM_ID_REG Register field definition */</div><div class='add'>+#define TPS65224_MASK_CUSTOMER_NVM_ID			GENMASK(7, 0)</div><div class='add'>+</div><div class='ctx'> /* SOFT_REBOOT_REG register field definition */</div><div class='ctx'> #define TPS6594_BIT_SOFT_REBOOT				BIT(0)</div><div class='ctx'> </div><div class='hunk'>@@ -755,14 +910,83 @@ enum pmic_id {</div><div class='ctx'> #define TPS6594_BIT_I2C2_CRC_EN				BIT(2)</div><div class='ctx'> #define TPS6594_MASK_T_CRC				GENMASK(7, 3)</div><div class='ctx'> </div><div class='add'>+/* ADC_CTRL Register field definition */</div><div class='add'>+#define TPS65224_BIT_ADC_START				BIT(0)</div><div class='add'>+#define TPS65224_BIT_ADC_CONT_CONV			BIT(1)</div><div class='add'>+#define TPS65224_BIT_ADC_THERMAL_SEL			BIT(2)</div><div class='add'>+#define TPS65224_BIT_ADC_RDIV_EN			BIT(3)</div><div class='add'>+#define TPS65224_BIT_ADC_STATUS				BIT(7)</div><div class='add'>+</div><div class='add'>+/* ADC_RESULT_REG_1 Register field definition */</div><div class='add'>+#define TPS65224_MASK_ADC_RESULT_11_4			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* ADC_RESULT_REG_2 Register field definition */</div><div class='add'>+#define TPS65224_MASK_ADC_RESULT_3_0			GENMASK(7, 4)</div><div class='add'>+</div><div class='add'>+/* STARTUP_CTRL Register field definition */</div><div class='add'>+#define TPS65224_MASK_STARTUP_DEST			GENMASK(6, 5)</div><div class='add'>+#define TPS65224_BIT_FIRST_STARTUP_DONE			BIT(7)</div><div class='add'>+</div><div class='add'>+/* SCRATCH_PAD_REG_1 Register field definition */</div><div class='add'>+#define TPS6594_MASK_SCRATCH_PAD_1			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* SCRATCH_PAD_REG_2 Register field definition */</div><div class='add'>+#define TPS6594_MASK_SCRATCH_PAD_2			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* SCRATCH_PAD_REG_3 Register field definition */</div><div class='add'>+#define TPS6594_MASK_SCRATCH_PAD_3			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* SCRATCH_PAD_REG_4 Register field definition */</div><div class='add'>+#define TPS6594_MASK_SCRATCH_PAD_4			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* PFSM_DELAY_REG_1 Register field definition */</div><div class='add'>+#define TPS6594_MASK_PFSM_DELAY1			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* PFSM_DELAY_REG_2 Register field definition */</div><div class='add'>+#define TPS6594_MASK_PFSM_DELAY2			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* PFSM_DELAY_REG_3 Register field definition */</div><div class='add'>+#define TPS6594_MASK_PFSM_DELAY3			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* PFSM_DELAY_REG_4 Register field definition */</div><div class='add'>+#define TPS6594_MASK_PFSM_DELAY4			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* CRC_CALC_CONTROL Register field definition */</div><div class='add'>+#define TPS65224_BIT_RUN_CRC_BIST			BIT(0)</div><div class='add'>+#define TPS65224_BIT_RUN_CRC_UPDATE			BIT(1)</div><div class='add'>+</div><div class='add'>+/* ADC_GAIN_COMP_REG Register field definition */</div><div class='add'>+#define TPS65224_MASK_ADC_GAIN_COMP			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* REGMAP_USER_CRC_LOW Register field definition */</div><div class='add'>+#define TPS65224_MASK_REGMAP_USER_CRC16_LOW		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* REGMAP_USER_CRC_HIGH Register field definition */</div><div class='add'>+#define TPS65224_MASK_REGMAP_USER_CRC16_HIGH		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* WD_ANSWER_REG Register field definition */</div><div class='add'>+#define TPS6594_MASK_WD_ANSWER				GENMASK(7, 0)</div><div class='add'>+</div><div class='ctx'> /* WD_QUESTION_ANSW_CNT register field definition */</div><div class='ctx'> #define TPS6594_MASK_WD_QUESTION			GENMASK(3, 0)</div><div class='ctx'> #define TPS6594_MASK_WD_ANSW_CNT			GENMASK(5, 4)</div><div class='add'>+#define TPS65224_BIT_INT_TOP_STATUS			BIT(7)</div><div class='add'>+</div><div class='add'>+/* WD WIN1_CFG register field definition */</div><div class='add'>+#define TPS6594_MASK_WD_WIN1_CFG			GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+/* WD WIN2_CFG register field definition */</div><div class='add'>+#define TPS6594_MASK_WD_WIN2_CFG			GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+/* WD LongWin register field definition */</div><div class='add'>+#define TPS6594_MASK_WD_LONGWIN_CFG			GENMASK(7, 0)</div><div class='ctx'> </div><div class='ctx'> /* WD_MODE_REG register field definition */</div><div class='ctx'> #define TPS6594_BIT_WD_RETURN_LONGWIN			BIT(0)</div><div class='ctx'> #define TPS6594_BIT_WD_MODE_SELECT			BIT(1)</div><div class='ctx'> #define TPS6594_BIT_WD_PWRHOLD				BIT(2)</div><div class='add'>+#define TPS65224_BIT_WD_ENDRV_SEL			BIT(6)</div><div class='add'>+#define TPS65224_BIT_WD_CNT_SEL				BIT(7)</div><div class='ctx'> </div><div class='ctx'> /* WD_QA_CFG register field definition */</div><div class='ctx'> #define TPS6594_MASK_WD_QUESTION_SEED			GENMASK(3, 0)</div><div class='hunk'>@@ -993,6 +1217,106 @@ enum tps6594_irqs {</div><div class='ctx'> #define TPS6594_IRQ_NAME_ALARM			"alarm"</div><div class='ctx'> #define TPS6594_IRQ_NAME_POWERUP		"powerup"</div><div class='ctx'> </div><div class='add'>+/* IRQs */</div><div class='add'>+enum tps65224_irqs {</div><div class='add'>+	/* INT_BUCK register */</div><div class='add'>+	TPS65224_IRQ_BUCK1_UVOV,</div><div class='add'>+	TPS65224_IRQ_BUCK2_UVOV,</div><div class='add'>+	TPS65224_IRQ_BUCK3_UVOV,</div><div class='add'>+	TPS65224_IRQ_BUCK4_UVOV,</div><div class='add'>+	/* INT_LDO_VMON register */</div><div class='add'>+	TPS65224_IRQ_LDO1_UVOV,</div><div class='add'>+	TPS65224_IRQ_LDO2_UVOV,</div><div class='add'>+	TPS65224_IRQ_LDO3_UVOV,</div><div class='add'>+	TPS65224_IRQ_VCCA_UVOV,</div><div class='add'>+	TPS65224_IRQ_VMON1_UVOV,</div><div class='add'>+	TPS65224_IRQ_VMON2_UVOV,</div><div class='add'>+	/* INT_GPIO register */</div><div class='add'>+	TPS65224_IRQ_GPIO1,</div><div class='add'>+	TPS65224_IRQ_GPIO2,</div><div class='add'>+	TPS65224_IRQ_GPIO3,</div><div class='add'>+	TPS65224_IRQ_GPIO4,</div><div class='add'>+	TPS65224_IRQ_GPIO5,</div><div class='add'>+	TPS65224_IRQ_GPIO6,</div><div class='add'>+	/* INT_STARTUP register */</div><div class='add'>+	TPS65224_IRQ_VSENSE,</div><div class='add'>+	TPS65224_IRQ_ENABLE,</div><div class='add'>+	TPS65224_IRQ_PB_SHORT,</div><div class='add'>+	TPS65224_IRQ_FSD,</div><div class='add'>+	TPS65224_IRQ_SOFT_REBOOT,</div><div class='add'>+	/* INT_MISC register */</div><div class='add'>+	TPS65224_IRQ_BIST_PASS,</div><div class='add'>+	TPS65224_IRQ_EXT_CLK,</div><div class='add'>+	TPS65224_IRQ_REG_UNLOCK,</div><div class='add'>+	TPS65224_IRQ_TWARN,</div><div class='add'>+	TPS65224_IRQ_PB_LONG,</div><div class='add'>+	TPS65224_IRQ_PB_FALL,</div><div class='add'>+	TPS65224_IRQ_PB_RISE,</div><div class='add'>+	TPS65224_IRQ_ADC_CONV_READY,</div><div class='add'>+	/* INT_MODERATE_ERR register */</div><div class='add'>+	TPS65224_IRQ_TSD_ORD,</div><div class='add'>+	TPS65224_IRQ_BIST_FAIL,</div><div class='add'>+	TPS65224_IRQ_REG_CRC_ERR,</div><div class='add'>+	TPS65224_IRQ_RECOV_CNT,</div><div class='add'>+	/* INT_SEVERE_ERR register */</div><div class='add'>+	TPS65224_IRQ_TSD_IMM,</div><div class='add'>+	TPS65224_IRQ_VCCA_OVP,</div><div class='add'>+	TPS65224_IRQ_PFSM_ERR,</div><div class='add'>+	TPS65224_IRQ_BG_XMON,</div><div class='add'>+	/* INT_FSM_ERR register */</div><div class='add'>+	TPS65224_IRQ_IMM_SHUTDOWN,</div><div class='add'>+	TPS65224_IRQ_ORD_SHUTDOWN,</div><div class='add'>+	TPS65224_IRQ_MCU_PWR_ERR,</div><div class='add'>+	TPS65224_IRQ_SOC_PWR_ERR,</div><div class='add'>+	TPS65224_IRQ_COMM_ERR,</div><div class='add'>+	TPS65224_IRQ_I2C2_ERR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TPS65224_IRQ_NAME_BUCK1_UVOV		"buck1_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_BUCK2_UVOV		"buck2_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_BUCK3_UVOV		"buck3_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_BUCK4_UVOV		"buck4_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_LDO1_UVOV		"ldo1_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_LDO2_UVOV		"ldo2_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_LDO3_UVOV		"ldo3_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_VCCA_UVOV		"vcca_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_VMON1_UVOV		"vmon1_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_VMON2_UVOV		"vmon2_uvov"</div><div class='add'>+#define TPS65224_IRQ_NAME_GPIO1			"gpio1"</div><div class='add'>+#define TPS65224_IRQ_NAME_GPIO2			"gpio2"</div><div class='add'>+#define TPS65224_IRQ_NAME_GPIO3			"gpio3"</div><div class='add'>+#define TPS65224_IRQ_NAME_GPIO4			"gpio4"</div><div class='add'>+#define TPS65224_IRQ_NAME_GPIO5			"gpio5"</div><div class='add'>+#define TPS65224_IRQ_NAME_GPIO6			"gpio6"</div><div class='add'>+#define TPS65224_IRQ_NAME_VSENSE	        "vsense"</div><div class='add'>+#define TPS65224_IRQ_NAME_ENABLE		"enable"</div><div class='add'>+#define TPS65224_IRQ_NAME_PB_SHORT		"pb_short"</div><div class='add'>+#define TPS65224_IRQ_NAME_FSD			"fsd"</div><div class='add'>+#define TPS65224_IRQ_NAME_SOFT_REBOOT		"soft_reboot"</div><div class='add'>+#define TPS65224_IRQ_NAME_BIST_PASS		"bist_pass"</div><div class='add'>+#define TPS65224_IRQ_NAME_EXT_CLK		"ext_clk"</div><div class='add'>+#define TPS65224_IRQ_NAME_REG_UNLOCK		"reg_unlock"</div><div class='add'>+#define TPS65224_IRQ_NAME_TWARN			"twarn"</div><div class='add'>+#define TPS65224_IRQ_NAME_PB_LONG		"pb_long"</div><div class='add'>+#define TPS65224_IRQ_NAME_PB_FALL		"pb_fall"</div><div class='add'>+#define TPS65224_IRQ_NAME_PB_RISE		"pb_rise"</div><div class='add'>+#define TPS65224_IRQ_NAME_ADC_CONV_READY	"adc_conv_ready"</div><div class='add'>+#define TPS65224_IRQ_NAME_TSD_ORD		"tsd_ord"</div><div class='add'>+#define TPS65224_IRQ_NAME_BIST_FAIL		"bist_fail"</div><div class='add'>+#define TPS65224_IRQ_NAME_REG_CRC_ERR		"reg_crc_err"</div><div class='add'>+#define TPS65224_IRQ_NAME_RECOV_CNT		"recov_cnt"</div><div class='add'>+#define TPS65224_IRQ_NAME_TSD_IMM		"tsd_imm"</div><div class='add'>+#define TPS65224_IRQ_NAME_VCCA_OVP		"vcca_ovp"</div><div class='add'>+#define TPS65224_IRQ_NAME_PFSM_ERR		"pfsm_err"</div><div class='add'>+#define TPS65224_IRQ_NAME_BG_XMON		"bg_xmon"</div><div class='add'>+#define TPS65224_IRQ_NAME_IMM_SHUTDOWN		"imm_shutdown"</div><div class='add'>+#define TPS65224_IRQ_NAME_ORD_SHUTDOWN		"ord_shutdown"</div><div class='add'>+#define TPS65224_IRQ_NAME_MCU_PWR_ERR		"mcu_pwr_err"</div><div class='add'>+#define TPS65224_IRQ_NAME_SOC_PWR_ERR		"soc_pwr_err"</div><div class='add'>+#define TPS65224_IRQ_NAME_COMM_ERR		"comm_err"</div><div class='add'>+#define TPS65224_IRQ_NAME_I2C2_ERR		"i2c2_err"</div><div class='add'>+#define TPS65224_IRQ_NAME_POWERUP		"powerup"</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct tps6594 - device private data structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -1014,7 +1338,9 @@ struct tps6594 {</div><div class='ctx'> 	struct regmap_irq_chip_data *irq_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-bool tps6594_is_volatile_reg(struct device *dev, unsigned int reg);</div><div class='add'>+extern const struct regmap_access_table tps6594_volatile_table;</div><div class='add'>+extern const struct regmap_access_table tps65224_volatile_table;</div><div class='add'>+</div><div class='ctx'> int tps6594_device_init(struct tps6594 *tps, bool enable_crc);</div><div class='ctx'> </div><div class='ctx'> #endif /*  __LINUX_MFD_TPS6594_H */</div><div class='head'>diff --git a/include/linux/mfd/twl.h b/include/linux/mfd/twl.h<br/>index c062d91a67d9..b31e07fa4d51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/twl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/twl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/twl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/twl.h</a></div><div class='hunk'>@@ -205,27 +205,6 @@ int twl_get_hfclk_rate(void);</div><div class='ctx'> int twl6030_interrupt_unmask(u8 bit_mask, u8 offset);</div><div class='ctx'> int twl6030_interrupt_mask(u8 bit_mask, u8 offset);</div><div class='ctx'> </div><div class='del'>-/* Card detect Configuration for MMC1 Controller on OMAP4 */</div><div class='del'>-#ifdef CONFIG_TWL4030_CORE</div><div class='del'>-int twl6030_mmc_card_detect_config(void);</div><div class='del'>-#else</div><div class='del'>-static inline int twl6030_mmc_card_detect_config(void)</div><div class='del'>-{</div><div class='del'>-	pr_debug("twl6030_mmc_card_detect_config not supported\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* MMC1 Controller on OMAP4 uses Phoenix irq for Card detect */</div><div class='del'>-#ifdef CONFIG_TWL4030_CORE</div><div class='del'>-int twl6030_mmc_card_detect(struct device *dev, int slot);</div><div class='del'>-#else</div><div class='del'>-static inline int twl6030_mmc_card_detect(struct device *dev, int slot)</div><div class='del'>-{</div><div class='del'>-	pr_debug("Call back twl6030_mmc_card_detect not supported\n");</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> /*----------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -461,6 +440,7 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)</div><div class='ctx'> </div><div class='ctx'> #define TWL4030_PM_MASTER_GLOBAL_TST		0xb6</div><div class='ctx'> </div><div class='add'>+#define TWL6030_PHOENIX_DEV_ON                  0x06</div><div class='ctx'> /*----------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> /* Power bus message definitions */</div><div class='head'>diff --git a/include/linux/mfd/upboard-fpga.h b/include/linux/mfd/upboard-fpga.h<br/>new file mode 100644<br/>index 000000000000..12231e40f5da<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/upboard-fpga.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/upboard-fpga.h</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * UP Board CPLD/FPGA driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) AAEON. All rights reserved.</div><div class='add'>+ * Copyright (C) 2024 Bootlin</div><div class='add'>+ *</div><div class='add'>+ * Author: Gary Wang &lt;garywang@aaeon.com.tw&gt;</div><div class='add'>+ * Author: Thomas Richard &lt;thomas.richard@bootlin.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_MFD_UPBOARD_FPGA_H</div><div class='add'>+#define __LINUX_MFD_UPBOARD_FPGA_H</div><div class='add'>+</div><div class='add'>+#define UPBOARD_REGISTER_SIZE 16</div><div class='add'>+</div><div class='add'>+enum upboard_fpgareg {</div><div class='add'>+	UPBOARD_REG_PLATFORM_ID   = 0x10,</div><div class='add'>+	UPBOARD_REG_FIRMWARE_ID   = 0x11,</div><div class='add'>+	UPBOARD_REG_FUNC_EN0      = 0x20,</div><div class='add'>+	UPBOARD_REG_FUNC_EN1      = 0x21,</div><div class='add'>+	UPBOARD_REG_GPIO_EN0      = 0x30,</div><div class='add'>+	UPBOARD_REG_GPIO_EN1      = 0x31,</div><div class='add'>+	UPBOARD_REG_GPIO_EN2      = 0x32,</div><div class='add'>+	UPBOARD_REG_GPIO_DIR0     = 0x40,</div><div class='add'>+	UPBOARD_REG_GPIO_DIR1     = 0x41,</div><div class='add'>+	UPBOARD_REG_GPIO_DIR2     = 0x42,</div><div class='add'>+	UPBOARD_REG_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum upboard_fpga_type {</div><div class='add'>+	UPBOARD_UP_FPGA,</div><div class='add'>+	UPBOARD_UP2_FPGA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct upboard_fpga_data {</div><div class='add'>+	enum upboard_fpga_type type;</div><div class='add'>+	const struct regmap_config *regmap_config;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct upboard_fpga {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct gpio_desc *enable_gpio;</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+	struct gpio_desc *clear_gpio;</div><div class='add'>+	struct gpio_desc *strobe_gpio;</div><div class='add'>+	struct gpio_desc *datain_gpio;</div><div class='add'>+	struct gpio_desc *dataout_gpio;</div><div class='add'>+	unsigned int firmware_version;</div><div class='add'>+	const struct upboard_fpga_data *fpga_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /*  __LINUX_MFD_UPBOARD_FPGA_H */</div><div class='head'>diff --git a/include/linux/mfd/wl1273-core.h b/include/linux/mfd/wl1273-core.h<br/>deleted file mode 100644<br/>index c28cf76d5c31..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/wl1273-core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/wl1273-core.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,277 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * include/linux/mfd/wl1273-core.h</div><div class='del'>- *</div><div class='del'>- * Some definitions for the wl1273 radio receiver/transmitter chip.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Nokia Corporation</div><div class='del'>- * Author: Matti J. Aaltonen &lt;matti.j.aaltonen@nokia.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef WL1273_CORE_H</div><div class='del'>-#define WL1273_CORE_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-#include &lt;linux/mfd/core.h&gt;</div><div class='del'>-</div><div class='del'>-#define WL1273_FM_DRIVER_NAME	"wl1273-fm"</div><div class='del'>-#define RX71_FM_I2C_ADDR	0x22</div><div class='del'>-</div><div class='del'>-#define WL1273_STEREO_GET		0</div><div class='del'>-#define WL1273_RSSI_LVL_GET		1</div><div class='del'>-#define WL1273_IF_COUNT_GET		2</div><div class='del'>-#define WL1273_FLAG_GET			3</div><div class='del'>-#define WL1273_RDS_SYNC_GET		4</div><div class='del'>-#define WL1273_RDS_DATA_GET		5</div><div class='del'>-#define WL1273_FREQ_SET			10</div><div class='del'>-#define WL1273_AF_FREQ_SET		11</div><div class='del'>-#define WL1273_MOST_MODE_SET		12</div><div class='del'>-#define WL1273_MOST_BLEND_SET		13</div><div class='del'>-#define WL1273_DEMPH_MODE_SET		14</div><div class='del'>-#define WL1273_SEARCH_LVL_SET		15</div><div class='del'>-#define WL1273_BAND_SET			16</div><div class='del'>-#define WL1273_MUTE_STATUS_SET		17</div><div class='del'>-#define WL1273_RDS_PAUSE_LVL_SET	18</div><div class='del'>-#define WL1273_RDS_PAUSE_DUR_SET	19</div><div class='del'>-#define WL1273_RDS_MEM_SET		20</div><div class='del'>-#define WL1273_RDS_BLK_B_SET		21</div><div class='del'>-#define WL1273_RDS_MSK_B_SET		22</div><div class='del'>-#define WL1273_RDS_PI_MASK_SET		23</div><div class='del'>-#define WL1273_RDS_PI_SET		24</div><div class='del'>-#define WL1273_RDS_SYSTEM_SET		25</div><div class='del'>-#define WL1273_INT_MASK_SET		26</div><div class='del'>-#define WL1273_SEARCH_DIR_SET		27</div><div class='del'>-#define WL1273_VOLUME_SET		28</div><div class='del'>-#define WL1273_AUDIO_ENABLE		29</div><div class='del'>-#define WL1273_PCM_MODE_SET		30</div><div class='del'>-#define WL1273_I2S_MODE_CONFIG_SET	31</div><div class='del'>-#define WL1273_POWER_SET		32</div><div class='del'>-#define WL1273_INTX_CONFIG_SET		33</div><div class='del'>-#define WL1273_PULL_EN_SET		34</div><div class='del'>-#define WL1273_HILO_SET			35</div><div class='del'>-#define WL1273_SWITCH2FREF		36</div><div class='del'>-#define WL1273_FREQ_DRIFT_REPORT	37</div><div class='del'>-</div><div class='del'>-#define WL1273_PCE_GET			40</div><div class='del'>-#define WL1273_FIRM_VER_GET		41</div><div class='del'>-#define WL1273_ASIC_VER_GET		42</div><div class='del'>-#define WL1273_ASIC_ID_GET		43</div><div class='del'>-#define WL1273_MAN_ID_GET		44</div><div class='del'>-#define WL1273_TUNER_MODE_SET		45</div><div class='del'>-#define WL1273_STOP_SEARCH		46</div><div class='del'>-#define WL1273_RDS_CNTRL_SET		47</div><div class='del'>-</div><div class='del'>-#define WL1273_WRITE_HARDWARE_REG	100</div><div class='del'>-#define WL1273_CODE_DOWNLOAD		101</div><div class='del'>-#define WL1273_RESET			102</div><div class='del'>-</div><div class='del'>-#define WL1273_FM_POWER_MODE		254</div><div class='del'>-#define WL1273_FM_INTERRUPT		255</div><div class='del'>-</div><div class='del'>-/* Transmitter API */</div><div class='del'>-</div><div class='del'>-#define WL1273_CHANL_SET			55</div><div class='del'>-#define WL1273_SCAN_SPACING_SET			56</div><div class='del'>-#define WL1273_REF_SET				57</div><div class='del'>-#define WL1273_POWER_ENB_SET			90</div><div class='del'>-#define WL1273_POWER_ATT_SET			58</div><div class='del'>-#define WL1273_POWER_LEV_SET			59</div><div class='del'>-#define WL1273_AUDIO_DEV_SET			60</div><div class='del'>-#define WL1273_PILOT_DEV_SET			61</div><div class='del'>-#define WL1273_RDS_DEV_SET			62</div><div class='del'>-#define WL1273_PUPD_SET				91</div><div class='del'>-#define WL1273_AUDIO_IO_SET			63</div><div class='del'>-#define WL1273_PREMPH_SET			64</div><div class='del'>-#define WL1273_MONO_SET				66</div><div class='del'>-#define WL1273_MUTE				92</div><div class='del'>-#define WL1273_MPX_LMT_ENABLE			67</div><div class='del'>-#define WL1273_PI_SET				93</div><div class='del'>-#define WL1273_ECC_SET				69</div><div class='del'>-#define WL1273_PTY				70</div><div class='del'>-#define WL1273_AF				71</div><div class='del'>-#define WL1273_DISPLAY_MODE			74</div><div class='del'>-#define WL1273_RDS_REP_SET			77</div><div class='del'>-#define WL1273_RDS_CONFIG_DATA_SET		98</div><div class='del'>-#define WL1273_RDS_DATA_SET			99</div><div class='del'>-#define WL1273_RDS_DATA_ENB			94</div><div class='del'>-#define WL1273_TA_SET				78</div><div class='del'>-#define WL1273_TP_SET				79</div><div class='del'>-#define WL1273_DI_SET				80</div><div class='del'>-#define WL1273_MS_SET				81</div><div class='del'>-#define WL1273_PS_SCROLL_SPEED			82</div><div class='del'>-#define WL1273_TX_AUDIO_LEVEL_TEST		96</div><div class='del'>-#define WL1273_TX_AUDIO_LEVEL_TEST_THRESHOLD	73</div><div class='del'>-#define WL1273_TX_AUDIO_INPUT_LEVEL_RANGE_SET	54</div><div class='del'>-#define WL1273_RX_ANTENNA_SELECT		87</div><div class='del'>-#define WL1273_I2C_DEV_ADDR_SET			86</div><div class='del'>-#define WL1273_REF_ERR_CALIB_PARAM_SET		88</div><div class='del'>-#define WL1273_REF_ERR_CALIB_PERIODICITY_SET	89</div><div class='del'>-#define WL1273_SOC_INT_TRIGGER			52</div><div class='del'>-#define WL1273_SOC_AUDIO_PATH_SET		83</div><div class='del'>-#define WL1273_SOC_PCMI_OVERRIDE		84</div><div class='del'>-#define WL1273_SOC_I2S_OVERRIDE			85</div><div class='del'>-#define WL1273_RSSI_BLOCK_SCAN_FREQ_SET		95</div><div class='del'>-#define WL1273_RSSI_BLOCK_SCAN_START		97</div><div class='del'>-#define WL1273_RSSI_BLOCK_SCAN_DATA_GET		5</div><div class='del'>-#define WL1273_READ_FMANT_TUNE_VALUE		104</div><div class='del'>-</div><div class='del'>-#define WL1273_RDS_OFF		0</div><div class='del'>-#define WL1273_RDS_ON		1</div><div class='del'>-#define WL1273_RDS_RESET	2</div><div class='del'>-</div><div class='del'>-#define WL1273_AUDIO_DIGITAL	0</div><div class='del'>-#define WL1273_AUDIO_ANALOG	1</div><div class='del'>-</div><div class='del'>-#define WL1273_MODE_RX		BIT(0)</div><div class='del'>-#define WL1273_MODE_TX		BIT(1)</div><div class='del'>-#define WL1273_MODE_OFF		BIT(2)</div><div class='del'>-#define WL1273_MODE_SUSPENDED	BIT(3)</div><div class='del'>-</div><div class='del'>-#define WL1273_RADIO_CHILD	BIT(0)</div><div class='del'>-#define WL1273_CODEC_CHILD	BIT(1)</div><div class='del'>-</div><div class='del'>-#define WL1273_RX_MONO		1</div><div class='del'>-#define WL1273_RX_STEREO	0</div><div class='del'>-#define WL1273_TX_MONO		0</div><div class='del'>-#define WL1273_TX_STEREO	1</div><div class='del'>-</div><div class='del'>-#define WL1273_MAX_VOLUME	0xffff</div><div class='del'>-#define WL1273_DEFAULT_VOLUME	0x78b8</div><div class='del'>-</div><div class='del'>-/* I2S protocol, left channel first, data width 16 bits */</div><div class='del'>-#define WL1273_PCM_DEF_MODE		0x00</div><div class='del'>-</div><div class='del'>-/* Rx */</div><div class='del'>-#define WL1273_AUDIO_ENABLE_I2S		BIT(0)</div><div class='del'>-#define WL1273_AUDIO_ENABLE_ANALOG	BIT(1)</div><div class='del'>-</div><div class='del'>-/* Tx */</div><div class='del'>-#define WL1273_AUDIO_IO_SET_ANALOG	0</div><div class='del'>-#define WL1273_AUDIO_IO_SET_I2S		1</div><div class='del'>-</div><div class='del'>-#define WL1273_PUPD_SET_OFF		0x00</div><div class='del'>-#define WL1273_PUPD_SET_ON		0x01</div><div class='del'>-#define WL1273_PUPD_SET_RETENTION	0x10</div><div class='del'>-</div><div class='del'>-/* I2S mode */</div><div class='del'>-#define WL1273_IS2_WIDTH_32	0x0</div><div class='del'>-#define WL1273_IS2_WIDTH_40	0x1</div><div class='del'>-#define WL1273_IS2_WIDTH_22_23	0x2</div><div class='del'>-#define WL1273_IS2_WIDTH_23_22	0x3</div><div class='del'>-#define WL1273_IS2_WIDTH_48	0x4</div><div class='del'>-#define WL1273_IS2_WIDTH_50	0x5</div><div class='del'>-#define WL1273_IS2_WIDTH_60	0x6</div><div class='del'>-#define WL1273_IS2_WIDTH_64	0x7</div><div class='del'>-#define WL1273_IS2_WIDTH_80	0x8</div><div class='del'>-#define WL1273_IS2_WIDTH_96	0x9</div><div class='del'>-#define WL1273_IS2_WIDTH_128	0xa</div><div class='del'>-#define WL1273_IS2_WIDTH	0xf</div><div class='del'>-</div><div class='del'>-#define WL1273_IS2_FORMAT_STD	(0x0 &lt;&lt; 4)</div><div class='del'>-#define WL1273_IS2_FORMAT_LEFT	(0x1 &lt;&lt; 4)</div><div class='del'>-#define WL1273_IS2_FORMAT_RIGHT	(0x2 &lt;&lt; 4)</div><div class='del'>-#define WL1273_IS2_FORMAT_USER	(0x3 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-#define WL1273_IS2_MASTER	(0x0 &lt;&lt; 6)</div><div class='del'>-#define WL1273_IS2_SLAVEW	(0x1 &lt;&lt; 6)</div><div class='del'>-</div><div class='del'>-#define WL1273_IS2_TRI_AFTER_SENDING	(0x0 &lt;&lt; 7)</div><div class='del'>-#define WL1273_IS2_TRI_ALWAYS_ACTIVE	(0x1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-#define WL1273_IS2_SDOWS_RR	(0x0 &lt;&lt; 8)</div><div class='del'>-#define WL1273_IS2_SDOWS_RF	(0x1 &lt;&lt; 8)</div><div class='del'>-#define WL1273_IS2_SDOWS_FR	(0x2 &lt;&lt; 8)</div><div class='del'>-#define WL1273_IS2_SDOWS_FF	(0x3 &lt;&lt; 8)</div><div class='del'>-</div><div class='del'>-#define WL1273_IS2_TRI_OPT	(0x0 &lt;&lt; 10)</div><div class='del'>-#define WL1273_IS2_TRI_ALWAYS	(0x1 &lt;&lt; 10)</div><div class='del'>-</div><div class='del'>-#define WL1273_IS2_RATE_48K	(0x0 &lt;&lt; 12)</div><div class='del'>-#define WL1273_IS2_RATE_44_1K	(0x1 &lt;&lt; 12)</div><div class='del'>-#define WL1273_IS2_RATE_32K	(0x2 &lt;&lt; 12)</div><div class='del'>-#define WL1273_IS2_RATE_22_05K	(0x4 &lt;&lt; 12)</div><div class='del'>-#define WL1273_IS2_RATE_16K	(0x5 &lt;&lt; 12)</div><div class='del'>-#define WL1273_IS2_RATE_12K	(0x8 &lt;&lt; 12)</div><div class='del'>-#define WL1273_IS2_RATE_11_025	(0x9 &lt;&lt; 12)</div><div class='del'>-#define WL1273_IS2_RATE_8K	(0xa &lt;&lt; 12)</div><div class='del'>-#define WL1273_IS2_RATE		(0xf &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-#define WL1273_I2S_DEF_MODE	(WL1273_IS2_WIDTH_32 | \</div><div class='del'>-				 WL1273_IS2_FORMAT_STD | \</div><div class='del'>-				 WL1273_IS2_MASTER | \</div><div class='del'>-				 WL1273_IS2_TRI_AFTER_SENDING | \</div><div class='del'>-				 WL1273_IS2_SDOWS_RR | \</div><div class='del'>-				 WL1273_IS2_TRI_OPT | \</div><div class='del'>-				 WL1273_IS2_RATE_48K)</div><div class='del'>-</div><div class='del'>-#define SCHAR_MIN (-128)</div><div class='del'>-#define SCHAR_MAX 127</div><div class='del'>-</div><div class='del'>-#define WL1273_FR_EVENT			BIT(0)</div><div class='del'>-#define WL1273_BL_EVENT			BIT(1)</div><div class='del'>-#define WL1273_RDS_EVENT		BIT(2)</div><div class='del'>-#define WL1273_BBLK_EVENT		BIT(3)</div><div class='del'>-#define WL1273_LSYNC_EVENT		BIT(4)</div><div class='del'>-#define WL1273_LEV_EVENT		BIT(5)</div><div class='del'>-#define WL1273_IFFR_EVENT		BIT(6)</div><div class='del'>-#define WL1273_PI_EVENT			BIT(7)</div><div class='del'>-#define WL1273_PD_EVENT			BIT(8)</div><div class='del'>-#define WL1273_STIC_EVENT		BIT(9)</div><div class='del'>-#define WL1273_MAL_EVENT		BIT(10)</div><div class='del'>-#define WL1273_POW_ENB_EVENT		BIT(11)</div><div class='del'>-#define WL1273_SCAN_OVER_EVENT		BIT(12)</div><div class='del'>-#define WL1273_ERROR_EVENT		BIT(13)</div><div class='del'>-</div><div class='del'>-#define TUNER_MODE_STOP_SEARCH		0</div><div class='del'>-#define TUNER_MODE_PRESET		1</div><div class='del'>-#define TUNER_MODE_AUTO_SEEK		2</div><div class='del'>-#define TUNER_MODE_AF			3</div><div class='del'>-#define TUNER_MODE_AUTO_SEEK_PI		4</div><div class='del'>-#define TUNER_MODE_AUTO_SEEK_BULK	5</div><div class='del'>-</div><div class='del'>-#define RDS_BLOCK_SIZE	3</div><div class='del'>-</div><div class='del'>-struct wl1273_fm_platform_data {</div><div class='del'>-	int (*request_resources) (struct i2c_client *client);</div><div class='del'>-	void (*free_resources) (void);</div><div class='del'>-	void (*enable) (void);</div><div class='del'>-	void (*disable) (void);</div><div class='del'>-</div><div class='del'>-	u8 forbidden_modes;</div><div class='del'>-	unsigned int children;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define WL1273_FM_CORE_CELLS	2</div><div class='del'>-</div><div class='del'>-#define WL1273_BAND_OTHER	0</div><div class='del'>-#define WL1273_BAND_JAPAN	1</div><div class='del'>-</div><div class='del'>-#define WL1273_BAND_JAPAN_LOW	76000</div><div class='del'>-#define WL1273_BAND_JAPAN_HIGH	90000</div><div class='del'>-#define WL1273_BAND_OTHER_LOW	87500</div><div class='del'>-#define WL1273_BAND_OTHER_HIGH	108000</div><div class='del'>-</div><div class='del'>-#define WL1273_BAND_TX_LOW	76000</div><div class='del'>-#define WL1273_BAND_TX_HIGH	108000</div><div class='del'>-</div><div class='del'>-struct wl1273_core {</div><div class='del'>-	struct mfd_cell cells[WL1273_FM_CORE_CELLS];</div><div class='del'>-	struct wl1273_fm_platform_data *pdata;</div><div class='del'>-</div><div class='del'>-	unsigned int mode;</div><div class='del'>-	unsigned int i2s_mode;</div><div class='del'>-	unsigned int volume;</div><div class='del'>-	unsigned int audio_mode;</div><div class='del'>-	unsigned int channel_number;</div><div class='del'>-	struct mutex lock; /* for serializing fm radio operations */</div><div class='del'>-</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-</div><div class='del'>-	int (*read)(struct wl1273_core *core, u8, u16 *);</div><div class='del'>-	int (*write)(struct wl1273_core *core, u8, u16);</div><div class='del'>-	int (*write_data)(struct wl1273_core *core, u8 *, u16);</div><div class='del'>-	int (*set_audio)(struct wl1273_core *core, unsigned int);</div><div class='del'>-	int (*set_volume)(struct wl1273_core *core, unsigned int);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif	/* ifndef WL1273_CORE_H */</div><div class='head'>diff --git a/include/linux/mfd/wm8350/core.h b/include/linux/mfd/wm8350/core.h<br/>index a3241e4d7548..5f70d3b5d1b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/wm8350/core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mfd/wm8350/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mfd/wm8350/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mfd/wm8350/core.h</a></div><div class='hunk'>@@ -8,11 +8,12 @@</div><div class='ctx'> #ifndef __LINUX_MFD_WM8350_CORE_H_</div><div class='ctx'> #define __LINUX_MFD_WM8350_CORE_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mfd/wm8350/audio.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/wm8350/gpio.h&gt;</div><div class='hunk'>@@ -21,6 +22,9 @@</div><div class='ctx'> #include &lt;linux/mfd/wm8350/supply.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/wm8350/wdt.h&gt;</div><div class='ctx'> </div><div class='add'>+struct device;</div><div class='add'>+struct platform_device;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Register values.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/mhi.h b/include/linux/mhi.h<br/>index d0f9b522f328..dd372b0123a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mhi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mhi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mhi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mhi.h</a></div><div class='hunk'>@@ -290,6 +290,7 @@ struct mhi_controller_config {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct mhi_controller - Master MHI controller structure</div><div class='add'>+ * @name: Device name of the MHI controller</div><div class='ctx'>  * @cntrl_dev: Pointer to the struct device of physical bus acting as the MHI</div><div class='ctx'>  *            controller (required)</div><div class='ctx'>  * @mhi_dev: MHI device instance for the controller</div><div class='hunk'>@@ -320,12 +321,7 @@ struct mhi_controller_config {</div><div class='ctx'>  * @hw_ev_rings: Number of hardware event rings</div><div class='ctx'>  * @sw_ev_rings: Number of software event rings</div><div class='ctx'>  * @nr_irqs: Number of IRQ allocated by bus master (required)</div><div class='del'>- * @family_number: MHI controller family number</div><div class='del'>- * @device_number: MHI controller device number</div><div class='del'>- * @major_version: MHI controller major revision number</div><div class='del'>- * @minor_version: MHI controller minor revision number</div><div class='ctx'>  * @serial_number: MHI controller serial number obtained from BHI</div><div class='del'>- * @oem_pk_hash: MHI controller OEM PK Hash obtained from BHI</div><div class='ctx'>  * @mhi_event: MHI event ring configurations table</div><div class='ctx'>  * @mhi_cmd: MHI command ring configurations table</div><div class='ctx'>  * @mhi_ctxt: MHI device context, shared memory between host and device</div><div class='hunk'>@@ -358,6 +354,7 @@ struct mhi_controller_config {</div><div class='ctx'>  * @read_reg: Read a MHI register via the physical link (required)</div><div class='ctx'>  * @write_reg: Write a MHI register via the physical link (required)</div><div class='ctx'>  * @reset: Controller specific reset function (optional)</div><div class='add'>+ * @edl_trigger: CB function to trigger EDL mode (optional)</div><div class='ctx'>  * @buffer_len: Bounce buffer length</div><div class='ctx'>  * @index: Index of the MHI controller instance</div><div class='ctx'>  * @bounce_buf: Use of bounce buffer</div><div class='hunk'>@@ -369,17 +366,9 @@ struct mhi_controller_config {</div><div class='ctx'>  * Fields marked as (required) need to be populated by the controller driver</div><div class='ctx'>  * before calling mhi_register_controller(). For the fields marked as (optional)</div><div class='ctx'>  * they can be populated depending on the usecase.</div><div class='del'>- *</div><div class='del'>- * The following fields are present for the purpose of implementing any device</div><div class='del'>- * specific quirks or customizations for specific MHI revisions used in device</div><div class='del'>- * by the controller drivers. The MHI stack will just populate these fields</div><div class='del'>- * during mhi_register_controller():</div><div class='del'>- *  family_number</div><div class='del'>- *  device_number</div><div class='del'>- *  major_version</div><div class='del'>- *  minor_version</div><div class='ctx'>  */</div><div class='ctx'> struct mhi_controller {</div><div class='add'>+	const char *name;</div><div class='ctx'> 	struct device *cntrl_dev;</div><div class='ctx'> 	struct mhi_device *mhi_dev;</div><div class='ctx'> 	struct dentry *debugfs_dentry;</div><div class='hunk'>@@ -408,12 +397,7 @@ struct mhi_controller {</div><div class='ctx'> 	u32 hw_ev_rings;</div><div class='ctx'> 	u32 sw_ev_rings;</div><div class='ctx'> 	u32 nr_irqs;</div><div class='del'>-	u32 family_number;</div><div class='del'>-	u32 device_number;</div><div class='del'>-	u32 major_version;</div><div class='del'>-	u32 minor_version;</div><div class='ctx'> 	u32 serial_number;</div><div class='del'>-	u32 oem_pk_hash[MHI_MAX_OEM_PK_HASH_SEGMENTS];</div><div class='ctx'> </div><div class='ctx'> 	struct mhi_event *mhi_event;</div><div class='ctx'> 	struct mhi_cmd *mhi_cmd;</div><div class='hunk'>@@ -454,6 +438,7 @@ struct mhi_controller {</div><div class='ctx'> 	void (*write_reg)(struct mhi_controller *mhi_cntrl, void __iomem *addr,</div><div class='ctx'> 			  u32 val);</div><div class='ctx'> 	void (*reset)(struct mhi_controller *mhi_cntrl);</div><div class='add'>+	int (*edl_trigger)(struct mhi_controller *mhi_cntrl);</div><div class='ctx'> </div><div class='ctx'> 	size_t buffer_len;</div><div class='ctx'> 	int index;</div><div class='hunk'>@@ -543,7 +528,7 @@ struct mhi_driver {</div><div class='ctx'> 	struct device_driver driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_mhi_driver(drv) container_of(drv, struct mhi_driver, driver)</div><div class='add'>+#define to_mhi_driver(drv) container_of_const(drv, struct mhi_driver, driver)</div><div class='ctx'> #define to_mhi_device(dev) container_of(dev, struct mhi_device, dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -649,13 +634,29 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl);</div><div class='ctx'> int mhi_sync_power_up(struct mhi_controller *mhi_cntrl);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mhi_power_down - Start MHI power down sequence</div><div class='add'>+ * mhi_power_down - Power down the MHI device and also destroy the</div><div class='add'>+ *                  'struct device' for the channels associated with it.</div><div class='add'>+ *                  See also mhi_power_down_keep_dev() which is a variant</div><div class='add'>+ *                  of this API that keeps the 'struct device' for channels</div><div class='add'>+ *                  (useful during suspend/hibernation).</div><div class='ctx'>  * @mhi_cntrl: MHI controller</div><div class='ctx'>  * @graceful: Link is still accessible, so do a graceful shutdown process</div><div class='ctx'>  */</div><div class='ctx'> void mhi_power_down(struct mhi_controller *mhi_cntrl, bool graceful);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * mhi_power_down_keep_dev - Power down the MHI device but keep the 'struct</div><div class='add'>+ *                           device' for the channels associated with it.</div><div class='add'>+ *                           This is a variant of 'mhi_power_down()' and</div><div class='add'>+ *                           useful in scenarios such as suspend/hibernation</div><div class='add'>+ *                           where destroying of the 'struct device' is not</div><div class='add'>+ *                           needed.</div><div class='add'>+ * @mhi_cntrl: MHI controller</div><div class='add'>+ * @graceful: Link is still accessible, so do a graceful shutdown process</div><div class='add'>+ */</div><div class='add'>+void mhi_power_down_keep_dev(struct mhi_controller *mhi_cntrl, bool graceful);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * mhi_unprepare_after_power_down - Free any allocated memory after power down</div><div class='ctx'>  * @mhi_cntrl: MHI controller</div><div class='ctx'>  */</div><div class='hunk'>@@ -720,12 +721,6 @@ enum mhi_state mhi_get_mhi_state(struct mhi_controller *mhi_cntrl);</div><div class='ctx'> void mhi_soc_reset(struct mhi_controller *mhi_cntrl);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mhi_device_get - Disable device low power mode</div><div class='del'>- * @mhi_dev: Device associated with the channel</div><div class='del'>- */</div><div class='del'>-void mhi_device_get(struct mhi_device *mhi_dev);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * mhi_device_get_sync - Disable device low power mode. Synchronously</div><div class='ctx'>  *                       take the controller out of suspended state</div><div class='ctx'>  * @mhi_dev: Device associated with the channel</div><div class='hunk'>@@ -776,18 +771,6 @@ int mhi_prepare_for_transfer_autoqueue(struct mhi_device *mhi_dev);</div><div class='ctx'> void mhi_unprepare_from_transfer(struct mhi_device *mhi_dev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mhi_queue_dma - Send or receive DMA mapped buffers from client device</div><div class='del'>- *                 over MHI channel</div><div class='del'>- * @mhi_dev: Device associated with the channels</div><div class='del'>- * @dir: DMA direction for the channel</div><div class='del'>- * @mhi_buf: Buffer for holding the DMA mapped data</div><div class='del'>- * @len: Buffer length</div><div class='del'>- * @mflags: MHI transfer flags used for the transfer</div><div class='del'>- */</div><div class='del'>-int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,</div><div class='del'>-		  struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * mhi_queue_buf - Send or receive raw buffers from client device over MHI</div><div class='ctx'>  *                 channel</div><div class='ctx'>  * @mhi_dev: Device associated with the channels</div><div class='hunk'>@@ -817,4 +800,13 @@ int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir,</div><div class='ctx'>  */</div><div class='ctx'> bool mhi_queue_is_full(struct mhi_device *mhi_dev, enum dma_data_direction dir);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * mhi_get_channel_doorbell_offset - Get the channel doorbell offset</div><div class='add'>+ * @mhi_cntrl: MHI controller</div><div class='add'>+ * @chdb_offset: Read channel doorbell offset</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if the read succeeds, a negative error code otherwise</div><div class='add'>+ */</div><div class='add'>+int mhi_get_channel_doorbell_offset(struct mhi_controller *mhi_cntrl, u32 *chdb_offset);</div><div class='add'>+</div><div class='ctx'> #endif /* _MHI_H_ */</div><div class='head'>diff --git a/include/linux/mhi_ep.h b/include/linux/mhi_ep.h<br/>index 11bf3212f782..7b40fc8cbe77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mhi_ep.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mhi_ep.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mhi_ep.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mhi_ep.h</a></div><div class='hunk'>@@ -221,7 +221,7 @@ struct mhi_ep_driver {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_mhi_ep_device(dev) container_of(dev, struct mhi_ep_device, dev)</div><div class='del'>-#define to_mhi_ep_driver(drv) container_of(drv, struct mhi_ep_driver, driver)</div><div class='add'>+#define to_mhi_ep_driver(drv) container_of_const(drv, struct mhi_ep_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * module_mhi_ep_driver() - Helper macro for drivers that don't do</div><div class='head'>diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h<br/>index 591bf5b5e8dc..ca691641788b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/micrel_phy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/micrel_phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/micrel_phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/micrel_phy.h</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> #define PHY_ID_LAN8814		0x00221660</div><div class='ctx'> #define PHY_ID_LAN8804		0x00221670</div><div class='ctx'> #define PHY_ID_LAN8841		0x00221650</div><div class='add'>+#define PHY_ID_LAN8842		0x002216C0</div><div class='ctx'> </div><div class='ctx'> #define PHY_ID_KSZ886X		0x00221430</div><div class='ctx'> #define PHY_ID_KSZ8863		0x00221435</div><div class='hunk'>@@ -44,7 +45,6 @@</div><div class='ctx'> #define MICREL_PHY_50MHZ_CLK	BIT(0)</div><div class='ctx'> #define MICREL_PHY_FXEN		BIT(1)</div><div class='ctx'> #define MICREL_KSZ8_P1_ERRATA	BIT(2)</div><div class='del'>-#define MICREL_NO_EEE		BIT(3)</div><div class='ctx'> </div><div class='ctx'> #define MICREL_KSZ9021_EXTREG_CTRL	0xB</div><div class='ctx'> #define MICREL_KSZ9021_EXTREG_DATA_WRITE	0xC</div><div class='head'>diff --git a/include/linux/migrate.h b/include/linux/migrate.h<br/>index 2ce13e8a309b..26ca00c325d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/migrate.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/migrate.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/migrate.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/migrate.h</a></div><div class='hunk'>@@ -12,14 +12,6 @@ typedef void free_folio_t(struct folio *folio, unsigned long private);</div><div class='ctx'> </div><div class='ctx'> struct migration_target_control;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Return values from addresss_space_operations.migratepage():</div><div class='del'>- * - negative errno on page migration failure;</div><div class='del'>- * - zero on page migration success;</div><div class='del'>- */</div><div class='del'>-#define MIGRATEPAGE_SUCCESS		0</div><div class='del'>-#define MIGRATEPAGE_UNMAP		1</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct movable_operations - Driver page migration</div><div class='ctx'>  * @isolate_page:</div><div class='hunk'>@@ -35,8 +27,7 @@ struct migration_target_control;</div><div class='ctx'>  * @src page.  The driver should copy the contents of the</div><div class='ctx'>  * @src page to the @dst page and set up the fields of @dst page.</div><div class='ctx'>  * Both pages are locked.</div><div class='del'>- * If page migration is successful, the driver should call</div><div class='del'>- * __ClearPageMovable(@src) and return MIGRATEPAGE_SUCCESS.</div><div class='add'>+ * If page migration is successful, the driver should return 0.</div><div class='ctx'>  * If the driver cannot migrate the page at the moment, it can return</div><div class='ctx'>  * -EAGAIN.  The VM interprets this as a temporary migration failure and</div><div class='ctx'>  * will retry it later.  Any other error value is a permanent migration</div><div class='hunk'>@@ -63,24 +54,23 @@ extern const char *migrate_reason_names[MR_TYPES];</div><div class='ctx'> #ifdef CONFIG_MIGRATION</div><div class='ctx'> </div><div class='ctx'> void putback_movable_pages(struct list_head *l);</div><div class='del'>-int migrate_folio_extra(struct address_space *mapping, struct folio *dst,</div><div class='del'>-		struct folio *src, enum migrate_mode mode, int extra_count);</div><div class='ctx'> int migrate_folio(struct address_space *mapping, struct folio *dst,</div><div class='ctx'> 		struct folio *src, enum migrate_mode mode);</div><div class='ctx'> int migrate_pages(struct list_head *l, new_folio_t new, free_folio_t free,</div><div class='ctx'> 		  unsigned long private, enum migrate_mode mode, int reason,</div><div class='ctx'> 		  unsigned int *ret_succeeded);</div><div class='ctx'> struct folio *alloc_migration_target(struct folio *src, unsigned long private);</div><div class='del'>-bool isolate_movable_page(struct page *page, isolate_mode_t mode);</div><div class='add'>+bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode);</div><div class='add'>+bool isolate_folio_to_list(struct folio *folio, struct list_head *list);</div><div class='ctx'> </div><div class='ctx'> int migrate_huge_page_move_mapping(struct address_space *mapping,</div><div class='ctx'> 		struct folio *dst, struct folio *src);</div><div class='del'>-void migration_entry_wait_on_locked(swp_entry_t entry, spinlock_t *ptl)</div><div class='add'>+void migration_entry_wait_on_locked(softleaf_t entry, spinlock_t *ptl)</div><div class='ctx'> 		__releases(ptl);</div><div class='ctx'> void folio_migrate_flags(struct folio *newfolio, struct folio *folio);</div><div class='del'>-void folio_migrate_copy(struct folio *newfolio, struct folio *folio);</div><div class='ctx'> int folio_migrate_mapping(struct address_space *mapping,</div><div class='ctx'> 		struct folio *newfolio, struct folio *folio, int extra_count);</div><div class='add'>+int set_movable_ops(const struct movable_operations *ops, enum pagetype type);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +82,9 @@ static inline int migrate_pages(struct list_head *l, new_folio_t new,</div><div class='ctx'> static inline struct folio *alloc_migration_target(struct folio *src,</div><div class='ctx'> 		unsigned long private)</div><div class='ctx'> 	{ return NULL; }</div><div class='del'>-static inline bool isolate_movable_page(struct page *page, isolate_mode_t mode)</div><div class='add'>+static inline bool isolate_movable_ops_page(struct page *page, isolate_mode_t mode)</div><div class='add'>+	{ return false; }</div><div class='add'>+static inline bool isolate_folio_to_list(struct folio *folio, struct list_head *list)</div><div class='ctx'> 	{ return false; }</div><div class='ctx'> </div><div class='ctx'> static inline int migrate_huge_page_move_mapping(struct address_space *mapping,</div><div class='hunk'>@@ -100,53 +92,24 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping,</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_MIGRATION */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPACTION</div><div class='del'>-bool PageMovable(struct page *page);</div><div class='del'>-void __SetPageMovable(struct page *page, const struct movable_operations *ops);</div><div class='del'>-void __ClearPageMovable(struct page *page);</div><div class='del'>-#else</div><div class='del'>-static inline bool PageMovable(struct page *page) { return false; }</div><div class='del'>-static inline void __SetPageMovable(struct page *page,</div><div class='del'>-		const struct movable_operations *ops)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline void __ClearPageMovable(struct page *page)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline bool folio_test_movable(struct folio *folio)</div><div class='add'>+static inline int set_movable_ops(const struct movable_operations *ops, enum pagetype type)</div><div class='ctx'> {</div><div class='del'>-	return PageMovable(&amp;folio-&gt;page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-const struct movable_operations *folio_movable_ops(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	VM_BUG_ON(!__folio_test_movable(folio));</div><div class='del'>-</div><div class='del'>-	return (const struct movable_operations *)</div><div class='del'>-		((unsigned long)folio-&gt;mapping - PAGE_MAPPING_MOVABLE);</div><div class='add'>+	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-const struct movable_operations *page_movable_ops(struct page *page)</div><div class='del'>-{</div><div class='del'>-	VM_BUG_ON(!__PageMovable(page));</div><div class='del'>-</div><div class='del'>-	return (const struct movable_operations *)</div><div class='del'>-		((unsigned long)page-&gt;mapping - PAGE_MAPPING_MOVABLE);</div><div class='del'>-}</div><div class='add'>+#endif /* CONFIG_MIGRATION */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA_BALANCING</div><div class='del'>-int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma,</div><div class='del'>-			   int node);</div><div class='add'>+int migrate_misplaced_folio_prepare(struct folio *folio,</div><div class='add'>+		struct vm_area_struct *vma, int node);</div><div class='add'>+int migrate_misplaced_folio(struct folio *folio, int node);</div><div class='ctx'> #else</div><div class='del'>-static inline int migrate_misplaced_folio(struct folio *folio,</div><div class='del'>-					 struct vm_area_struct *vma, int node)</div><div class='add'>+static inline int migrate_misplaced_folio_prepare(struct folio *folio,</div><div class='add'>+		struct vm_area_struct *vma, int node)</div><div class='add'>+{</div><div class='add'>+	return -EAGAIN; /* can't migrate now */</div><div class='add'>+}</div><div class='add'>+static inline int migrate_misplaced_folio(struct folio *folio, int node)</div><div class='ctx'> {</div><div class='ctx'> 	return -EAGAIN; /* can't migrate now */</div><div class='ctx'> }</div><div class='hunk'>@@ -162,6 +125,7 @@ static inline int migrate_misplaced_folio(struct folio *folio,</div><div class='ctx'> #define MIGRATE_PFN_VALID	(1UL &lt;&lt; 0)</div><div class='ctx'> #define MIGRATE_PFN_MIGRATE	(1UL &lt;&lt; 1)</div><div class='ctx'> #define MIGRATE_PFN_WRITE	(1UL &lt;&lt; 3)</div><div class='add'>+#define MIGRATE_PFN_COMPOUND	(1UL &lt;&lt; 4)</div><div class='ctx'> #define MIGRATE_PFN_SHIFT	6</div><div class='ctx'> </div><div class='ctx'> static inline struct page *migrate_pfn_to_page(unsigned long mpfn)</div><div class='hunk'>@@ -180,6 +144,7 @@ enum migrate_vma_direction {</div><div class='ctx'> 	MIGRATE_VMA_SELECT_SYSTEM = 1 &lt;&lt; 0,</div><div class='ctx'> 	MIGRATE_VMA_SELECT_DEVICE_PRIVATE = 1 &lt;&lt; 1,</div><div class='ctx'> 	MIGRATE_VMA_SELECT_DEVICE_COHERENT = 1 &lt;&lt; 2,</div><div class='add'>+	MIGRATE_VMA_SELECT_COMPOUND = 1 &lt;&lt; 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct migrate_vma {</div><div class='hunk'>@@ -200,8 +165,8 @@ struct migrate_vma {</div><div class='ctx'> 	unsigned long		end;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Set to the owner value also stored in page-&gt;pgmap-&gt;owner for</div><div class='del'>-	 * migrating out of device private memory. The flags also need to</div><div class='add'>+	 * Set to the owner value also stored in page_pgmap(page)-&gt;owner</div><div class='add'>+	 * for migrating out of device private memory. The flags also need to</div><div class='ctx'> 	 * be set to MIGRATE_VMA_SELECT_DEVICE_PRIVATE.</div><div class='ctx'> 	 * The caller should always set this field when using mmu notifier</div><div class='ctx'> 	 * callbacks to avoid device MMU invalidations for device private</div><div class='hunk'>@@ -222,6 +187,7 @@ void migrate_vma_pages(struct migrate_vma *migrate);</div><div class='ctx'> void migrate_vma_finalize(struct migrate_vma *migrate);</div><div class='ctx'> int migrate_device_range(unsigned long *src_pfns, unsigned long start,</div><div class='ctx'> 			unsigned long npages);</div><div class='add'>+int migrate_device_pfns(unsigned long *src_pfns, unsigned long npages);</div><div class='ctx'> void migrate_device_pages(unsigned long *src_pfns, unsigned long *dst_pfns,</div><div class='ctx'> 			unsigned long npages);</div><div class='ctx'> void migrate_device_finalize(unsigned long *src_pfns,</div><div class='head'>diff --git a/include/linux/migrate_mode.h b/include/linux/migrate_mode.h<br/>index f37cc03f9369..265c4328b36a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/migrate_mode.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/migrate_mode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/migrate_mode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/migrate_mode.h</a></div><div class='hunk'>@@ -7,16 +7,11 @@</div><div class='ctx'>  *	on most operations but not -&gt;writepage as the potential stall time</div><div class='ctx'>  *	is too significant</div><div class='ctx'>  * MIGRATE_SYNC will block when migrating pages</div><div class='del'>- * MIGRATE_SYNC_NO_COPY will block when migrating pages but will not copy pages</div><div class='del'>- *	with the CPU. Instead, page copy happens outside the migratepage()</div><div class='del'>- *	callback and is likely using a DMA engine. See migrate_vma() and HMM</div><div class='del'>- *	(mm/hmm.c) for users of this mode.</div><div class='ctx'>  */</div><div class='ctx'> enum migrate_mode {</div><div class='ctx'> 	MIGRATE_ASYNC,</div><div class='ctx'> 	MIGRATE_SYNC_LIGHT,</div><div class='ctx'> 	MIGRATE_SYNC,</div><div class='del'>-	MIGRATE_SYNC_NO_COPY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum migrate_reason {</div><div class='hunk'>@@ -29,6 +24,7 @@ enum migrate_reason {</div><div class='ctx'> 	MR_CONTIG_RANGE,</div><div class='ctx'> 	MR_LONGTERM_PIN,</div><div class='ctx'> 	MR_DEMOTION,</div><div class='add'>+	MR_DAMON,</div><div class='ctx'> 	MR_TYPES</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mii.h b/include/linux/mii.h<br/>index d5a959ce4877..b8f26d4513c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mii.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mii.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mii.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mii.h</a></div><div class='hunk'>@@ -140,7 +140,7 @@ static inline u32 ethtool_adv_to_mii_adv_t(u32 ethadv)</div><div class='ctx'>  * settings to phy autonegotiation advertisements for the</div><div class='ctx'>  * MII_ADVERTISE register.</div><div class='ctx'>  */</div><div class='del'>-static inline u32 linkmode_adv_to_mii_adv_t(unsigned long *advertising)</div><div class='add'>+static inline u32 linkmode_adv_to_mii_adv_t(const unsigned long *advertising)</div><div class='ctx'> {</div><div class='ctx'> 	u32 result = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +215,8 @@ static inline u32 ethtool_adv_to_mii_ctrl1000_t(u32 ethadv)</div><div class='ctx'>  * settings to phy autonegotiation advertisements for the</div><div class='ctx'>  * MII_CTRL1000 register when in 1000T mode.</div><div class='ctx'>  */</div><div class='del'>-static inline u32 linkmode_adv_to_mii_ctrl1000_t(unsigned long *advertising)</div><div class='add'>+static inline u32</div><div class='add'>+linkmode_adv_to_mii_ctrl1000_t(const unsigned long *advertising)</div><div class='ctx'> {</div><div class='ctx'> 	u32 result = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -453,7 +454,7 @@ static inline void mii_ctrl1000_mod_linkmode_adv_t(unsigned long *advertising,</div><div class='ctx'>  * A small helper function that translates linkmode advertising to LVL</div><div class='ctx'>  * pause capabilities.</div><div class='ctx'>  */</div><div class='del'>-static inline u32 linkmode_adv_to_lcl_adv_t(unsigned long *advertising)</div><div class='add'>+static inline u32 linkmode_adv_to_lcl_adv_t(const unsigned long *advertising)</div><div class='ctx'> {</div><div class='ctx'> 	u32 lcl_adv = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mii_timestamper.h b/include/linux/mii_timestamper.h<br/>index 26b04f73f214..3102c425c8e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mii_timestamper.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mii_timestamper.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mii_timestamper.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mii_timestamper.h</a></div><div class='hunk'>@@ -27,7 +27,9 @@ struct phy_device;</div><div class='ctx'>  *		as soon as a timestamp becomes available. One of the PTP_CLASS_</div><div class='ctx'>  *		values is passed in 'type'.</div><div class='ctx'>  *</div><div class='del'>- * @hwtstamp:	Handles SIOCSHWTSTAMP ioctl for hardware time stamping.</div><div class='add'>+ * @hwtstamp_set: Handles SIOCSHWTSTAMP ioctl for hardware time stamping.</div><div class='add'>+ *</div><div class='add'>+ * @hwtstamp_get: Handles SIOCGHWTSTAMP ioctl for hardware time stamping.</div><div class='ctx'>  *</div><div class='ctx'>  * @link_state: Allows the device to respond to changes in the link</div><div class='ctx'>  *		state.  The caller invokes this function while holding</div><div class='hunk'>@@ -51,15 +53,18 @@ struct mii_timestamper {</div><div class='ctx'> 	void (*txtstamp)(struct mii_timestamper *mii_ts,</div><div class='ctx'> 			 struct sk_buff *skb, int type);</div><div class='ctx'> </div><div class='del'>-	int  (*hwtstamp)(struct mii_timestamper *mii_ts,</div><div class='del'>-			 struct kernel_hwtstamp_config *kernel_config,</div><div class='del'>-			 struct netlink_ext_ack *extack);</div><div class='add'>+	int  (*hwtstamp_set)(struct mii_timestamper *mii_ts,</div><div class='add'>+			     struct kernel_hwtstamp_config *kernel_config,</div><div class='add'>+			     struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+	int  (*hwtstamp_get)(struct mii_timestamper *mii_ts,</div><div class='add'>+			     struct kernel_hwtstamp_config *kernel_config);</div><div class='ctx'> </div><div class='ctx'> 	void (*link_state)(struct mii_timestamper *mii_ts,</div><div class='ctx'> 			   struct phy_device *phydev);</div><div class='ctx'> </div><div class='ctx'> 	int  (*ts_info)(struct mii_timestamper *mii_ts,</div><div class='del'>-			struct ethtool_ts_info *ts_info);</div><div class='add'>+			struct kernel_ethtool_ts_info *ts_info);</div><div class='ctx'> </div><div class='ctx'> 	struct device *device;</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h<br/>index 44077837385f..79ddc0adbf2b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/min_heap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/min_heap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/min_heap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/min_heap.h</a></div><div class='hunk'>@@ -6,129 +6,472 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The Min Heap API provides utilities for managing min-heaps, a binary tree</div><div class='add'>+ * structure where each node's value is less than or equal to its children's</div><div class='add'>+ * values, ensuring the smallest element is at the root.</div><div class='add'>+ *</div><div class='add'>+ * Users should avoid directly calling functions prefixed with __min_heap_*().</div><div class='add'>+ * Instead, use the provided macro wrappers.</div><div class='add'>+ *</div><div class='add'>+ * For further details and examples, refer to Documentation/core-api/min_heap.rst.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * struct min_heap - Data structure to hold a min-heap.</div><div class='del'>- * @data: Start of array holding the heap elements.</div><div class='add'>+ * Data structure to hold a min-heap.</div><div class='ctx'>  * @nr: Number of elements currently in the heap.</div><div class='ctx'>  * @size: Maximum number of elements that can be held in current storage.</div><div class='add'>+ * @data: Pointer to the start of array holding the heap elements.</div><div class='add'>+ * @preallocated: Start of the static preallocated array holding the heap elements.</div><div class='ctx'>  */</div><div class='del'>-struct min_heap {</div><div class='del'>-	void *data;</div><div class='del'>-	int nr;</div><div class='del'>-	int size;</div><div class='del'>-};</div><div class='add'>+#define MIN_HEAP_PREALLOCATED(_type, _name, _nr)	\</div><div class='add'>+struct _name {	\</div><div class='add'>+	size_t nr;	\</div><div class='add'>+	size_t size;	\</div><div class='add'>+	_type *data;	\</div><div class='add'>+	_type preallocated[_nr];	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEFINE_MIN_HEAP(_type, _name) MIN_HEAP_PREALLOCATED(_type, _name, 0)</div><div class='add'>+</div><div class='add'>+typedef DEFINE_MIN_HEAP(char, min_heap_char) min_heap_char;</div><div class='add'>+</div><div class='add'>+#define __minheap_cast(_heap)		(typeof((_heap)-&gt;data[0]) *)</div><div class='add'>+#define __minheap_obj_size(_heap)	sizeof((_heap)-&gt;data[0])</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct min_heap_callbacks - Data/functions to customise the min_heap.</div><div class='del'>- * @elem_size: The nr of each element in bytes.</div><div class='ctx'>  * @less: Partial order function for this heap.</div><div class='ctx'>  * @swp: Swap elements function.</div><div class='ctx'>  */</div><div class='ctx'> struct min_heap_callbacks {</div><div class='del'>-	int elem_size;</div><div class='del'>-	bool (*less)(const void *lhs, const void *rhs);</div><div class='del'>-	void (*swp)(void *lhs, void *rhs);</div><div class='add'>+	bool (*less)(const void *lhs, const void *rhs, void *args);</div><div class='add'>+	void (*swp)(void *lhs, void *rhs, void *args);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * is_aligned - is this pointer &amp; size okay for word-wide copying?</div><div class='add'>+ * @base: pointer to data</div><div class='add'>+ * @size: size of each element</div><div class='add'>+ * @align: required alignment (typically 4 or 8)</div><div class='add'>+ *</div><div class='add'>+ * Returns true if elements can be copied using word loads and stores.</div><div class='add'>+ * The size must be a multiple of the alignment, and the base address must</div><div class='add'>+ * be if we do not have CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS.</div><div class='add'>+ *</div><div class='add'>+ * For some reason, gcc doesn't know to optimize "if (a &amp; mask || b &amp; mask)"</div><div class='add'>+ * to "if ((a | b) &amp; mask)", so we do that by hand.</div><div class='add'>+ */</div><div class='add'>+__attribute_const__ __always_inline</div><div class='add'>+static bool is_aligned(const void *base, size_t size, unsigned char align)</div><div class='add'>+{</div><div class='add'>+	unsigned char lsbits = (unsigned char)size;</div><div class='add'>+</div><div class='add'>+	(void)base;</div><div class='add'>+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='add'>+	lsbits |= (unsigned char)(uintptr_t)base;</div><div class='add'>+#endif</div><div class='add'>+	return (lsbits &amp; (align - 1)) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * swap_words_32 - swap two elements in 32-bit chunks</div><div class='add'>+ * @a: pointer to the first element to swap</div><div class='add'>+ * @b: pointer to the second element to swap</div><div class='add'>+ * @n: element size (must be a multiple of 4)</div><div class='add'>+ *</div><div class='add'>+ * Exchange the two objects in memory.  This exploits base+index addressing,</div><div class='add'>+ * which basically all CPUs have, to minimize loop overhead computations.</div><div class='add'>+ *</div><div class='add'>+ * For some reason, on x86 gcc 7.3.0 adds a redundant test of n at the</div><div class='add'>+ * bottom of the loop, even though the zero flag is still valid from the</div><div class='add'>+ * subtract (since the intervening mov instructions don't alter the flags).</div><div class='add'>+ * Gcc 8.1.0 doesn't have that problem.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+void swap_words_32(void *a, void *b, size_t n)</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+		u32 t = *(u32 *)(a + (n -= 4));</div><div class='add'>+		*(u32 *)(a + n) = *(u32 *)(b + n);</div><div class='add'>+		*(u32 *)(b + n) = t;</div><div class='add'>+	} while (n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * swap_words_64 - swap two elements in 64-bit chunks</div><div class='add'>+ * @a: pointer to the first element to swap</div><div class='add'>+ * @b: pointer to the second element to swap</div><div class='add'>+ * @n: element size (must be a multiple of 8)</div><div class='add'>+ *</div><div class='add'>+ * Exchange the two objects in memory.  This exploits base+index</div><div class='add'>+ * addressing, which basically all CPUs have, to minimize loop overhead</div><div class='add'>+ * computations.</div><div class='add'>+ *</div><div class='add'>+ * We'd like to use 64-bit loads if possible.  If they're not, emulating</div><div class='add'>+ * one requires base+index+4 addressing which x86 has but most other</div><div class='add'>+ * processors do not.  If CONFIG_64BIT, we definitely have 64-bit loads,</div><div class='add'>+ * but it's possible to have 64-bit loads without 64-bit pointers (e.g.</div><div class='add'>+ * x32 ABI).  Are there any cases the kernel needs to worry about?</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+void swap_words_64(void *a, void *b, size_t n)</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+		u64 t = *(u64 *)(a + (n -= 8));</div><div class='add'>+		*(u64 *)(a + n) = *(u64 *)(b + n);</div><div class='add'>+		*(u64 *)(b + n) = t;</div><div class='add'>+#else</div><div class='add'>+		/* Use two 32-bit transfers to avoid base+index+4 addressing */</div><div class='add'>+		u32 t = *(u32 *)(a + (n -= 4));</div><div class='add'>+		*(u32 *)(a + n) = *(u32 *)(b + n);</div><div class='add'>+		*(u32 *)(b + n) = t;</div><div class='add'>+</div><div class='add'>+		t = *(u32 *)(a + (n -= 4));</div><div class='add'>+		*(u32 *)(a + n) = *(u32 *)(b + n);</div><div class='add'>+		*(u32 *)(b + n) = t;</div><div class='add'>+#endif</div><div class='add'>+	} while (n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * swap_bytes - swap two elements a byte at a time</div><div class='add'>+ * @a: pointer to the first element to swap</div><div class='add'>+ * @b: pointer to the second element to swap</div><div class='add'>+ * @n: element size</div><div class='add'>+ *</div><div class='add'>+ * This is the fallback if alignment doesn't allow using larger chunks.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+void swap_bytes(void *a, void *b, size_t n)</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+		char t = ((char *)a)[--n];</div><div class='add'>+		((char *)a)[n] = ((char *)b)[n];</div><div class='add'>+		((char *)b)[n] = t;</div><div class='add'>+	} while (n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The values are arbitrary as long as they can't be confused with</div><div class='add'>+ * a pointer, but small integers make for the smallest compare</div><div class='add'>+ * instructions.</div><div class='add'>+ */</div><div class='add'>+#define SWAP_WORDS_64 ((void (*)(void *, void *, void *))0)</div><div class='add'>+#define SWAP_WORDS_32 ((void (*)(void *, void *, void *))1)</div><div class='add'>+#define SWAP_BYTES    ((void (*)(void *, void *, void *))2)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Selects the appropriate swap function based on the element size.</div><div class='add'>+ */</div><div class='add'>+static __always_inline</div><div class='add'>+void *select_swap_func(const void *base, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (is_aligned(base, size, 8))</div><div class='add'>+		return SWAP_WORDS_64;</div><div class='add'>+	else if (is_aligned(base, size, 4))</div><div class='add'>+		return SWAP_WORDS_32;</div><div class='add'>+	else</div><div class='add'>+		return SWAP_BYTES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline</div><div class='add'>+void do_swap(void *a, void *b, size_t size, void (*swap_func)(void *lhs, void *rhs, void *args),</div><div class='add'>+	     void *priv)</div><div class='add'>+{</div><div class='add'>+	if (swap_func == SWAP_WORDS_64)</div><div class='add'>+		swap_words_64(a, b, size);</div><div class='add'>+	else if (swap_func == SWAP_WORDS_32)</div><div class='add'>+		swap_words_32(a, b, size);</div><div class='add'>+	else if (swap_func == SWAP_BYTES)</div><div class='add'>+		swap_bytes(a, b, size);</div><div class='add'>+	else</div><div class='add'>+		swap_func(a, b, priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * parent - given the offset of the child, find the offset of the parent.</div><div class='add'>+ * @i: the offset of the heap element whose parent is sought.  Non-zero.</div><div class='add'>+ * @lsbit: a precomputed 1-bit mask, equal to "size &amp; -size"</div><div class='add'>+ * @size: size of each element</div><div class='add'>+ *</div><div class='add'>+ * In terms of array indexes, the parent of element j = @i/@size is simply</div><div class='add'>+ * (j-1)/2.  But when working in byte offsets, we can't use implicit</div><div class='add'>+ * truncation of integer divides.</div><div class='add'>+ *</div><div class='add'>+ * Fortunately, we only need one bit of the quotient, not the full divide.</div><div class='add'>+ * @size has a least significant bit.  That bit will be clear if @i is</div><div class='add'>+ * an even multiple of @size, and set if it's an odd multiple.</div><div class='add'>+ *</div><div class='add'>+ * Logically, we're doing "if (i &amp; lsbit) i -= size;", but since the</div><div class='add'>+ * branch is unpredictable, it's done with a bit of clever branch-free</div><div class='add'>+ * code instead.</div><div class='add'>+ */</div><div class='add'>+__attribute_const__ __always_inline</div><div class='add'>+static size_t parent(size_t i, unsigned int lsbit, size_t size)</div><div class='add'>+{</div><div class='add'>+	i -= size;</div><div class='add'>+	i -= size &amp; -(i &amp; lsbit);</div><div class='add'>+	return i / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize a min-heap. */</div><div class='add'>+static __always_inline</div><div class='add'>+void __min_heap_init_inline(min_heap_char *heap, void *data, size_t size)</div><div class='add'>+{</div><div class='add'>+	heap-&gt;nr = 0;</div><div class='add'>+	heap-&gt;size = size;</div><div class='add'>+	if (data)</div><div class='add'>+		heap-&gt;data = data;</div><div class='add'>+	else</div><div class='add'>+		heap-&gt;data = heap-&gt;preallocated;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define min_heap_init_inline(_heap, _data, _size)	\</div><div class='add'>+	__min_heap_init_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr), _data, _size)</div><div class='add'>+</div><div class='add'>+/* Get the minimum element from the heap. */</div><div class='add'>+static __always_inline</div><div class='add'>+void *__min_heap_peek_inline(struct min_heap_char *heap)</div><div class='add'>+{</div><div class='add'>+	return heap-&gt;nr ? heap-&gt;data : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define min_heap_peek_inline(_heap)	\</div><div class='add'>+	(__minheap_cast(_heap)	\</div><div class='add'>+	 __min_heap_peek_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr)))</div><div class='add'>+</div><div class='add'>+/* Check if the heap is full. */</div><div class='add'>+static __always_inline</div><div class='add'>+bool __min_heap_full_inline(min_heap_char *heap)</div><div class='add'>+{</div><div class='add'>+	return heap-&gt;nr == heap-&gt;size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define min_heap_full_inline(_heap)	\</div><div class='add'>+	__min_heap_full_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr))</div><div class='add'>+</div><div class='ctx'> /* Sift the element at pos down the heap. */</div><div class='ctx'> static __always_inline</div><div class='del'>-void min_heapify(struct min_heap *heap, int pos,</div><div class='del'>-		const struct min_heap_callbacks *func)</div><div class='add'>+void __min_heap_sift_down_inline(min_heap_char *heap, size_t pos, size_t elem_size,</div><div class='add'>+				 const struct min_heap_callbacks *func, void *args)</div><div class='ctx'> {</div><div class='del'>-	void *left, *right, *parent, *smallest;</div><div class='add'>+	const unsigned long lsbit = elem_size &amp; -elem_size;</div><div class='ctx'> 	void *data = heap-&gt;data;</div><div class='add'>+	void (*swp)(void *lhs, void *rhs, void *args) = func-&gt;swp;</div><div class='add'>+	/* pre-scale counters for performance */</div><div class='add'>+	size_t a = pos * elem_size;</div><div class='add'>+	size_t b, c, d;</div><div class='add'>+	size_t n = heap-&gt;nr * elem_size;</div><div class='ctx'> </div><div class='del'>-	for (;;) {</div><div class='del'>-		if (pos * 2 + 1 &gt;= heap-&gt;nr)</div><div class='del'>-			break;</div><div class='add'>+	if (!swp)</div><div class='add'>+		swp = select_swap_func(data, elem_size);</div><div class='add'>+</div><div class='add'>+	/* Find the sift-down path all the way to the leaves. */</div><div class='add'>+	for (b = a; c = 2 * b + elem_size, (d = c + elem_size) &lt; n;)</div><div class='add'>+		b = func-&gt;less(data + c, data + d, args) ? c : d;</div><div class='add'>+</div><div class='add'>+	/* Special case for the last leaf with no sibling. */</div><div class='add'>+	if (d == n)</div><div class='add'>+		b = c;</div><div class='add'>+</div><div class='add'>+	/* Backtrack to the correct location. */</div><div class='add'>+	while (b != a &amp;&amp; func-&gt;less(data + a, data + b, args))</div><div class='add'>+		b = parent(b, lsbit, elem_size);</div><div class='add'>+</div><div class='add'>+	/* Shift the element into its correct place. */</div><div class='add'>+	c = b;</div><div class='add'>+	while (b != a) {</div><div class='add'>+		b = parent(b, lsbit, elem_size);</div><div class='add'>+		do_swap(data + b, data + c, elem_size, swp, args);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define min_heap_sift_down_inline(_heap, _pos, _func, _args)	\</div><div class='add'>+	__min_heap_sift_down_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr), _pos,	\</div><div class='add'>+				    __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+</div><div class='add'>+/* Sift up ith element from the heap, O(log2(nr)). */</div><div class='add'>+static __always_inline</div><div class='add'>+void __min_heap_sift_up_inline(min_heap_char *heap, size_t elem_size, size_t idx,</div><div class='add'>+			       const struct min_heap_callbacks *func, void *args)</div><div class='add'>+{</div><div class='add'>+	const unsigned long lsbit = elem_size &amp; -elem_size;</div><div class='add'>+	void *data = heap-&gt;data;</div><div class='add'>+	void (*swp)(void *lhs, void *rhs, void *args) = func-&gt;swp;</div><div class='add'>+	/* pre-scale counters for performance */</div><div class='add'>+	size_t a = idx * elem_size, b;</div><div class='ctx'> </div><div class='del'>-		left = data + ((pos * 2 + 1) * func-&gt;elem_size);</div><div class='del'>-		parent = data + (pos * func-&gt;elem_size);</div><div class='del'>-		smallest = parent;</div><div class='del'>-		if (func-&gt;less(left, smallest))</div><div class='del'>-			smallest = left;</div><div class='del'>-</div><div class='del'>-		if (pos * 2 + 2 &lt; heap-&gt;nr) {</div><div class='del'>-			right = data + ((pos * 2 + 2) * func-&gt;elem_size);</div><div class='del'>-			if (func-&gt;less(right, smallest))</div><div class='del'>-				smallest = right;</div><div class='del'>-		}</div><div class='del'>-		if (smallest == parent)</div><div class='add'>+	if (!swp)</div><div class='add'>+		swp = select_swap_func(data, elem_size);</div><div class='add'>+</div><div class='add'>+	while (a) {</div><div class='add'>+		b = parent(a, lsbit, elem_size);</div><div class='add'>+		if (func-&gt;less(data + b, data + a, args))</div><div class='ctx'> 			break;</div><div class='del'>-		func-&gt;swp(smallest, parent);</div><div class='del'>-		if (smallest == left)</div><div class='del'>-			pos = (pos * 2) + 1;</div><div class='del'>-		else</div><div class='del'>-			pos = (pos * 2) + 2;</div><div class='add'>+		do_swap(data + a, data + b, elem_size, swp, args);</div><div class='add'>+		a = b;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define min_heap_sift_up_inline(_heap, _idx, _func, _args)	\</div><div class='add'>+	__min_heap_sift_up_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr),	\</div><div class='add'>+				  __minheap_obj_size(_heap), _idx, _func, _args)</div><div class='add'>+</div><div class='ctx'> /* Floyd's approach to heapification that is O(nr). */</div><div class='ctx'> static __always_inline</div><div class='del'>-void min_heapify_all(struct min_heap *heap,</div><div class='del'>-		const struct min_heap_callbacks *func)</div><div class='add'>+void __min_heapify_all_inline(min_heap_char *heap, size_t elem_size,</div><div class='add'>+			      const struct min_heap_callbacks *func, void *args)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	ssize_t i;</div><div class='ctx'> </div><div class='del'>-	for (i = heap-&gt;nr / 2; i &gt;= 0; i--)</div><div class='del'>-		min_heapify(heap, i, func);</div><div class='add'>+	for (i = heap-&gt;nr / 2 - 1; i &gt;= 0; i--)</div><div class='add'>+		__min_heap_sift_down_inline(heap, i, elem_size, func, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define min_heapify_all_inline(_heap, _func, _args)	\</div><div class='add'>+	__min_heapify_all_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr),	\</div><div class='add'>+				 __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+</div><div class='ctx'> /* Remove minimum element from the heap, O(log2(nr)). */</div><div class='ctx'> static __always_inline</div><div class='del'>-void min_heap_pop(struct min_heap *heap,</div><div class='del'>-		const struct min_heap_callbacks *func)</div><div class='add'>+bool __min_heap_pop_inline(min_heap_char *heap, size_t elem_size,</div><div class='add'>+			   const struct min_heap_callbacks *func, void *args)</div><div class='ctx'> {</div><div class='ctx'> 	void *data = heap-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ONCE(heap-&gt;nr &lt;= 0, "Popping an empty heap"))</div><div class='del'>-		return;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Place last element at the root (position 0) and then sift down. */</div><div class='ctx'> 	heap-&gt;nr--;</div><div class='del'>-	memcpy(data, data + (heap-&gt;nr * func-&gt;elem_size), func-&gt;elem_size);</div><div class='del'>-	min_heapify(heap, 0, func);</div><div class='add'>+	memcpy(data, data + (heap-&gt;nr * elem_size), elem_size);</div><div class='add'>+	__min_heap_sift_down_inline(heap, 0, elem_size, func, args);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define min_heap_pop_inline(_heap, _func, _args)	\</div><div class='add'>+	__min_heap_pop_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr),	\</div><div class='add'>+			      __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Remove the minimum element and then push the given element. The</div><div class='ctx'>  * implementation performs 1 sift (O(log2(nr))) and is therefore more</div><div class='ctx'>  * efficient than a pop followed by a push that does 2.</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline</div><div class='del'>-void min_heap_pop_push(struct min_heap *heap,</div><div class='del'>-		const void *element,</div><div class='del'>-		const struct min_heap_callbacks *func)</div><div class='add'>+void __min_heap_pop_push_inline(min_heap_char *heap, const void *element, size_t elem_size,</div><div class='add'>+				const struct min_heap_callbacks *func, void *args)</div><div class='ctx'> {</div><div class='del'>-	memcpy(heap-&gt;data, element, func-&gt;elem_size);</div><div class='del'>-	min_heapify(heap, 0, func);</div><div class='add'>+	memcpy(heap-&gt;data, element, elem_size);</div><div class='add'>+	__min_heap_sift_down_inline(heap, 0, elem_size, func, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define min_heap_pop_push_inline(_heap, _element, _func, _args)	\</div><div class='add'>+	__min_heap_pop_push_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr), _element,	\</div><div class='add'>+				   __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+</div><div class='ctx'> /* Push an element on to the heap, O(log2(nr)). */</div><div class='ctx'> static __always_inline</div><div class='del'>-void min_heap_push(struct min_heap *heap, const void *element,</div><div class='del'>-		const struct min_heap_callbacks *func)</div><div class='add'>+bool __min_heap_push_inline(min_heap_char *heap, const void *element, size_t elem_size,</div><div class='add'>+			    const struct min_heap_callbacks *func, void *args)</div><div class='ctx'> {</div><div class='ctx'> 	void *data = heap-&gt;data;</div><div class='del'>-	void *child, *parent;</div><div class='del'>-	int pos;</div><div class='add'>+	size_t pos;</div><div class='ctx'> </div><div class='ctx'> 	if (WARN_ONCE(heap-&gt;nr &gt;= heap-&gt;size, "Pushing on a full heap"))</div><div class='del'>-		return;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* Place at the end of data. */</div><div class='ctx'> 	pos = heap-&gt;nr;</div><div class='del'>-	memcpy(data + (pos * func-&gt;elem_size), element, func-&gt;elem_size);</div><div class='add'>+	memcpy(data + (pos * elem_size), element, elem_size);</div><div class='ctx'> 	heap-&gt;nr++;</div><div class='ctx'> </div><div class='ctx'> 	/* Sift child at pos up. */</div><div class='del'>-	for (; pos &gt; 0; pos = (pos - 1) / 2) {</div><div class='del'>-		child = data + (pos * func-&gt;elem_size);</div><div class='del'>-		parent = data + ((pos - 1) / 2) * func-&gt;elem_size;</div><div class='del'>-		if (func-&gt;less(parent, child))</div><div class='del'>-			break;</div><div class='del'>-		func-&gt;swp(parent, child);</div><div class='del'>-	}</div><div class='add'>+	__min_heap_sift_up_inline(heap, elem_size, pos, func, args);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define min_heap_push_inline(_heap, _element, _func, _args)	\</div><div class='add'>+	__min_heap_push_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr), _element,	\</div><div class='add'>+					    __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+</div><div class='add'>+/* Remove ith element from the heap, O(log2(nr)). */</div><div class='add'>+static __always_inline</div><div class='add'>+bool __min_heap_del_inline(min_heap_char *heap, size_t elem_size, size_t idx,</div><div class='add'>+			   const struct min_heap_callbacks *func, void *args)</div><div class='add'>+{</div><div class='add'>+	void *data = heap-&gt;data;</div><div class='add'>+	void (*swp)(void *lhs, void *rhs, void *args) = func-&gt;swp;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(heap-&gt;nr &lt;= 0, "Popping an empty heap"))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!swp)</div><div class='add'>+		swp = select_swap_func(data, elem_size);</div><div class='add'>+</div><div class='add'>+	/* Place last element at the root (position 0) and then sift down. */</div><div class='add'>+	heap-&gt;nr--;</div><div class='add'>+	if (idx == heap-&gt;nr)</div><div class='add'>+		return true;</div><div class='add'>+	do_swap(data + (idx * elem_size), data + (heap-&gt;nr * elem_size), elem_size, swp, args);</div><div class='add'>+	__min_heap_sift_up_inline(heap, elem_size, idx, func, args);</div><div class='add'>+	__min_heap_sift_down_inline(heap, idx, elem_size, func, args);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define min_heap_del_inline(_heap, _idx, _func, _args)	\</div><div class='add'>+	__min_heap_del_inline(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr),	\</div><div class='add'>+			      __minheap_obj_size(_heap), _idx, _func, _args)</div><div class='add'>+</div><div class='add'>+void __min_heap_init(min_heap_char *heap, void *data, size_t size);</div><div class='add'>+void *__min_heap_peek(struct min_heap_char *heap);</div><div class='add'>+bool __min_heap_full(min_heap_char *heap);</div><div class='add'>+void __min_heap_sift_down(min_heap_char *heap, size_t pos, size_t elem_size,</div><div class='add'>+			  const struct min_heap_callbacks *func, void *args);</div><div class='add'>+void __min_heap_sift_up(min_heap_char *heap, size_t elem_size, size_t idx,</div><div class='add'>+			const struct min_heap_callbacks *func, void *args);</div><div class='add'>+void __min_heapify_all(min_heap_char *heap, size_t elem_size,</div><div class='add'>+		       const struct min_heap_callbacks *func, void *args);</div><div class='add'>+bool __min_heap_pop(min_heap_char *heap, size_t elem_size,</div><div class='add'>+		    const struct min_heap_callbacks *func, void *args);</div><div class='add'>+void __min_heap_pop_push(min_heap_char *heap, const void *element, size_t elem_size,</div><div class='add'>+			 const struct min_heap_callbacks *func, void *args);</div><div class='add'>+bool __min_heap_push(min_heap_char *heap, const void *element, size_t elem_size,</div><div class='add'>+		     const struct min_heap_callbacks *func, void *args);</div><div class='add'>+bool __min_heap_del(min_heap_char *heap, size_t elem_size, size_t idx,</div><div class='add'>+		    const struct min_heap_callbacks *func, void *args);</div><div class='add'>+</div><div class='add'>+#define min_heap_init(_heap, _data, _size)	\</div><div class='add'>+	__min_heap_init(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr), _data, _size)</div><div class='add'>+#define min_heap_peek(_heap)	\</div><div class='add'>+	(__minheap_cast(_heap) __min_heap_peek(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr)))</div><div class='add'>+#define min_heap_full(_heap)	\</div><div class='add'>+	__min_heap_full(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr))</div><div class='add'>+#define min_heap_sift_down(_heap, _pos, _func, _args)	\</div><div class='add'>+	__min_heap_sift_down(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr), _pos,	\</div><div class='add'>+			     __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+#define min_heap_sift_up(_heap, _idx, _func, _args)	\</div><div class='add'>+	__min_heap_sift_up(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr),	\</div><div class='add'>+			   __minheap_obj_size(_heap), _idx, _func, _args)</div><div class='add'>+#define min_heapify_all(_heap, _func, _args)	\</div><div class='add'>+	__min_heapify_all(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr),	\</div><div class='add'>+			  __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+#define min_heap_pop(_heap, _func, _args)	\</div><div class='add'>+	__min_heap_pop(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr),	\</div><div class='add'>+		       __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+#define min_heap_pop_push(_heap, _element, _func, _args)	\</div><div class='add'>+	__min_heap_pop_push(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr), _element,	\</div><div class='add'>+			    __minheap_obj_size(_heap), _func, _args)</div><div class='add'>+#define min_heap_push(_heap, _element, _func, _args)	\</div><div class='add'>+	__min_heap_push(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr), _element,	\</div><div class='add'>+			__minheap_obj_size(_heap), _func, _args)</div><div class='add'>+#define min_heap_del(_heap, _idx, _func, _args)	\</div><div class='add'>+	__min_heap_del(container_of(&amp;(_heap)-&gt;nr, min_heap_char, nr),	\</div><div class='add'>+		       __minheap_obj_size(_heap), _idx, _func, _args)</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_MIN_HEAP_H */</div><div class='head'>diff --git a/include/linux/minmax.h b/include/linux/minmax.h<br/>index 2ec559284a9f..a0158db54a04 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/minmax.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/minmax.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/minmax.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/minmax.h</a></div><div class='hunk'>@@ -8,13 +8,10 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * min()/max()/clamp() macros must accomplish three things:</div><div class='add'>+ * min()/max()/clamp() macros must accomplish several things:</div><div class='ctx'>  *</div><div class='ctx'>  * - Avoid multiple evaluations of the arguments (so side-effects like</div><div class='ctx'>  *   "x++" happen only once) when non-constant.</div><div class='del'>- * - Retain result as a constant expressions when called with only</div><div class='del'>- *   constant expressions (to avoid tripping VLA warnings in stack</div><div class='del'>- *   allocation usage).</div><div class='ctx'>  * - Perform signed v unsigned type-checking (to generate compile</div><div class='ctx'>  *   errors instead of nasty runtime surprises).</div><div class='ctx'>  * - Unsigned char/short are always promoted to signed int and can be</div><div class='hunk'>@@ -26,56 +23,79 @@</div><div class='ctx'> #define __typecheck(x, y) \</div><div class='ctx'> 	(!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))</div><div class='ctx'> </div><div class='del'>-/* is_signed_type() isn't a constexpr for pointer types */</div><div class='del'>-#define __is_signed(x) 								\</div><div class='del'>-	__builtin_choose_expr(__is_constexpr(is_signed_type(typeof(x))),	\</div><div class='del'>-		is_signed_type(typeof(x)), 0)</div><div class='add'>+/*</div><div class='add'>+ * __sign_use for integer expressions:</div><div class='add'>+ *   bit #0 set if ok for unsigned comparisons</div><div class='add'>+ *   bit #1 set if ok for signed comparisons</div><div class='add'>+ *</div><div class='add'>+ * In particular, statically non-negative signed integer expressions</div><div class='add'>+ * are ok for both.</div><div class='add'>+ *</div><div class='add'>+ * NOTE! Unsigned types smaller than 'int' are implicitly converted to 'int'</div><div class='add'>+ * in expressions, and are accepted for signed conversions for now.</div><div class='add'>+ * This is debatable.</div><div class='add'>+ *</div><div class='add'>+ * Note that 'x' is the original expression, and 'ux' is the unique variable</div><div class='add'>+ * that contains the value.</div><div class='add'>+ *</div><div class='add'>+ * We use 'ux' for pure type checking, and 'x' for when we need to look at the</div><div class='add'>+ * value (but without evaluating it for side effects!</div><div class='add'>+ * Careful to only ever evaluate it with sizeof() or __builtin_constant_p() etc).</div><div class='add'>+ *</div><div class='add'>+ * Pointers end up being checked by the normal C type rules at the actual</div><div class='add'>+ * comparison, and these expressions only need to be careful to not cause</div><div class='add'>+ * warnings for pointer use.</div><div class='add'>+ */</div><div class='add'>+#define __sign_use(ux) (is_signed_type(typeof(ux)) ? \</div><div class='add'>+	(2 + __is_nonneg(ux)) : (1 + 2 * (sizeof(ux) &lt; 4)))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check whether a signed value is always non-negative.</div><div class='add'>+ *</div><div class='add'>+ * A cast is needed to avoid any warnings from values that aren't signed</div><div class='add'>+ * integer types (in which case the result doesn't matter).</div><div class='add'>+ *</div><div class='add'>+ * On 64-bit any integer or pointer type can safely be cast to 'long long'.</div><div class='add'>+ * But on 32-bit we need to avoid warnings about casting pointers to integers</div><div class='add'>+ * of different sizes without truncating 64-bit values so 'long' or 'long long'</div><div class='add'>+ * must be used depending on the size of the value.</div><div class='add'>+ *</div><div class='add'>+ * This does not work for 128-bit signed integers since the cast would truncate</div><div class='add'>+ * them, but we do not use s128 types in the kernel (we do use 'u128',</div><div class='add'>+ * but they are handled by the !is_signed_type() case).</div><div class='add'>+ */</div><div class='add'>+#if __SIZEOF_POINTER__ == __SIZEOF_LONG_LONG__</div><div class='add'>+#define __is_nonneg(ux) statically_true((long long)(ux) &gt;= 0)</div><div class='add'>+#else</div><div class='add'>+#define __is_nonneg(ux) statically_true( \</div><div class='add'>+	(typeof(__builtin_choose_expr(sizeof(ux) &gt; 4, 1LL, 1L)))(ux) &gt;= 0)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-/* True for a non-negative signed int constant */</div><div class='del'>-#define __is_noneg_int(x)	\</div><div class='del'>-	(__builtin_choose_expr(__is_constexpr(x) &amp;&amp; __is_signed(x), x, -1) &gt;= 0)</div><div class='add'>+#define __types_ok(ux, uy) \</div><div class='add'>+	(__sign_use(ux) &amp; __sign_use(uy))</div><div class='ctx'> </div><div class='del'>-#define __types_ok(x, y) 					\</div><div class='del'>-	(__is_signed(x) == __is_signed(y) ||			\</div><div class='del'>-		__is_signed((x) + 0) == __is_signed((y) + 0) ||	\</div><div class='del'>-		__is_noneg_int(x) || __is_noneg_int(y))</div><div class='add'>+#define __types_ok3(ux, uy, uz) \</div><div class='add'>+	(__sign_use(ux) &amp; __sign_use(uy) &amp; __sign_use(uz))</div><div class='ctx'> </div><div class='ctx'> #define __cmp_op_min &lt;</div><div class='ctx'> #define __cmp_op_max &gt;</div><div class='ctx'> </div><div class='ctx'> #define __cmp(op, x, y)	((x) __cmp_op_##op (y) ? (x) : (y))</div><div class='ctx'> </div><div class='del'>-#define __cmp_once(op, x, y, unique_x, unique_y) ({	\</div><div class='del'>-	typeof(x) unique_x = (x);			\</div><div class='del'>-	typeof(y) unique_y = (y);			\</div><div class='del'>-	static_assert(__types_ok(x, y),			\</div><div class='del'>-		#op "(" #x ", " #y ") signedness error, fix types or consider u" #op "() before " #op "_t()"); \</div><div class='del'>-	__cmp(op, unique_x, unique_y); })</div><div class='del'>-</div><div class='del'>-#define __careful_cmp(op, x, y)					\</div><div class='del'>-	__builtin_choose_expr(__is_constexpr((x) - (y)),	\</div><div class='del'>-		__cmp(op, x, y),				\</div><div class='del'>-		__cmp_once(op, x, y, __UNIQUE_ID(__x), __UNIQUE_ID(__y)))</div><div class='add'>+#define __cmp_once_unique(op, type, x, y, ux, uy) \</div><div class='add'>+	({ type ux = (x); type uy = (y); __cmp(op, ux, uy); })</div><div class='ctx'> </div><div class='del'>-#define __clamp(val, lo, hi)	\</div><div class='del'>-	((val) &gt;= (hi) ? (hi) : ((val) &lt;= (lo) ? (lo) : (val)))</div><div class='add'>+#define __cmp_once(op, type, x, y) \</div><div class='add'>+	__cmp_once_unique(op, type, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_))</div><div class='ctx'> </div><div class='del'>-#define __clamp_once(val, lo, hi, unique_val, unique_lo, unique_hi) ({		\</div><div class='del'>-	typeof(val) unique_val = (val);						\</div><div class='del'>-	typeof(lo) unique_lo = (lo);						\</div><div class='del'>-	typeof(hi) unique_hi = (hi);						\</div><div class='del'>-	static_assert(__builtin_choose_expr(__is_constexpr((lo) &gt; (hi)), 	\</div><div class='del'>-			(lo) &lt;= (hi), true),					\</div><div class='del'>-		"clamp() low limit " #lo " greater than high limit " #hi);	\</div><div class='del'>-	static_assert(__types_ok(val, lo), "clamp() 'lo' signedness error");	\</div><div class='del'>-	static_assert(__types_ok(val, hi), "clamp() 'hi' signedness error");	\</div><div class='del'>-	__clamp(unique_val, unique_lo, unique_hi); })</div><div class='add'>+#define __careful_cmp_once(op, x, y, ux, uy) ({		\</div><div class='add'>+	auto ux = (x); auto uy = (y);			\</div><div class='add'>+	BUILD_BUG_ON_MSG(!__types_ok(ux, uy),		\</div><div class='add'>+		#op"("#x", "#y") signedness error");	\</div><div class='add'>+	__cmp(op, ux, uy); })</div><div class='ctx'> </div><div class='del'>-#define __careful_clamp(val, lo, hi) ({					\</div><div class='del'>-	__builtin_choose_expr(__is_constexpr((val) - (lo) + (hi)),	\</div><div class='del'>-		__clamp(val, lo, hi),					\</div><div class='del'>-		__clamp_once(val, lo, hi, __UNIQUE_ID(__val),		\</div><div class='del'>-			     __UNIQUE_ID(__lo), __UNIQUE_ID(__hi))); })</div><div class='add'>+#define __careful_cmp(op, x, y) \</div><div class='add'>+	__careful_cmp_once(op, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * min - return minimum of two values of the same or compatible types</div><div class='hunk'>@@ -108,13 +128,20 @@</div><div class='ctx'> #define umax(x, y)	\</div><div class='ctx'> 	__careful_cmp(max, (x) + 0u + 0ul + 0ull, (y) + 0u + 0ul + 0ull)</div><div class='ctx'> </div><div class='add'>+#define __careful_op3(op, x, y, z, ux, uy, uz) ({			\</div><div class='add'>+	auto ux = (x); auto uy = (y); auto uz = (z);			\</div><div class='add'>+	BUILD_BUG_ON_MSG(!__types_ok3(ux, uy, uz),			\</div><div class='add'>+		#op"3("#x", "#y", "#z") signedness error");		\</div><div class='add'>+	__cmp(op, ux, __cmp(op, uy, uz)); })</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * min3 - return minimum of three values</div><div class='ctx'>  * @x: first value</div><div class='ctx'>  * @y: second value</div><div class='ctx'>  * @z: third value</div><div class='ctx'>  */</div><div class='del'>-#define min3(x, y, z) min((typeof(x))min(x, y), z)</div><div class='add'>+#define min3(x, y, z) \</div><div class='add'>+	__careful_op3(min, x, y, z, __UNIQUE_ID(x_), __UNIQUE_ID(y_), __UNIQUE_ID(z_))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * max3 - return maximum of three values</div><div class='hunk'>@@ -122,7 +149,24 @@</div><div class='ctx'>  * @y: second value</div><div class='ctx'>  * @z: third value</div><div class='ctx'>  */</div><div class='del'>-#define max3(x, y, z) max((typeof(x))max(x, y), z)</div><div class='add'>+#define max3(x, y, z) \</div><div class='add'>+	__careful_op3(max, x, y, z, __UNIQUE_ID(x_), __UNIQUE_ID(y_), __UNIQUE_ID(z_))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * min_t - return minimum of two values, using the specified type</div><div class='add'>+ * @type: data type to use</div><div class='add'>+ * @x: first value</div><div class='add'>+ * @y: second value</div><div class='add'>+ */</div><div class='add'>+#define min_t(type, x, y) __cmp_once(min, type, x, y)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * max_t - return maximum of two values, using the specified type</div><div class='add'>+ * @type: data type to use</div><div class='add'>+ * @x: first value</div><div class='add'>+ * @y: second value</div><div class='add'>+ */</div><div class='add'>+#define max_t(type, x, y) __cmp_once(max, type, x, y)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * min_not_zero - return the minimum that is _not_ zero, unless both are zero</div><div class='hunk'>@@ -134,39 +178,57 @@</div><div class='ctx'> 	typeof(y) __y = (y);			\</div><div class='ctx'> 	__x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y)); })</div><div class='ctx'> </div><div class='add'>+#define __clamp(val, lo, hi)	\</div><div class='add'>+	((val) &gt;= (hi) ? (hi) : ((val) &lt;= (lo) ? (lo) : (val)))</div><div class='add'>+</div><div class='add'>+#define __clamp_once(type, val, lo, hi, uval, ulo, uhi) ({			\</div><div class='add'>+	type uval = (val);							\</div><div class='add'>+	type ulo = (lo);							\</div><div class='add'>+	type uhi = (hi);							\</div><div class='add'>+	BUILD_BUG_ON_MSG(statically_true(ulo &gt; uhi),				\</div><div class='add'>+		"clamp() low limit " #lo " greater than high limit " #hi);	\</div><div class='add'>+	BUILD_BUG_ON_MSG(!__types_ok3(uval, ulo, uhi),				\</div><div class='add'>+		"clamp("#val", "#lo", "#hi") signedness error");		\</div><div class='add'>+	__clamp(uval, ulo, uhi); })</div><div class='add'>+</div><div class='add'>+#define __careful_clamp(type, val, lo, hi) \</div><div class='add'>+	__clamp_once(type, val, lo, hi, __UNIQUE_ID(v_), __UNIQUE_ID(l_), __UNIQUE_ID(h_))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * clamp - return a value clamped to a given range with strict typechecking</div><div class='add'>+ * clamp - return a value clamped to a given range with typechecking</div><div class='ctx'>  * @val: current value</div><div class='ctx'>  * @lo: lowest allowable value</div><div class='ctx'>  * @hi: highest allowable value</div><div class='ctx'>  *</div><div class='del'>- * This macro does strict typechecking of @lo/@hi to make sure they are of the</div><div class='del'>- * same type as @val.  See the unnecessary pointer comparisons.</div><div class='del'>- */</div><div class='del'>-#define clamp(val, lo, hi) __careful_clamp(val, lo, hi)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ..and if you can't take the strict</div><div class='del'>- * types, you can specify one yourself.</div><div class='del'>- *</div><div class='del'>- * Or not use min/max/clamp at all, of course.</div><div class='add'>+ * This macro checks @val/@lo/@hi to make sure they have compatible</div><div class='add'>+ * signedness.</div><div class='ctx'>  */</div><div class='add'>+#define clamp(val, lo, hi) __careful_clamp(auto, val, lo, hi)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * min_t - return minimum of two values, using the specified type</div><div class='del'>- * @type: data type to use</div><div class='del'>- * @x: first value</div><div class='del'>- * @y: second value</div><div class='add'>+ * clamp_t - return a value clamped to a given range using a given type</div><div class='add'>+ * @type: the type of variable to use</div><div class='add'>+ * @val: current value</div><div class='add'>+ * @lo: minimum allowable value</div><div class='add'>+ * @hi: maximum allowable value</div><div class='add'>+ *</div><div class='add'>+ * This macro does no typechecking and uses temporary variables of type</div><div class='add'>+ * @type to make all the comparisons.</div><div class='ctx'>  */</div><div class='del'>-#define min_t(type, x, y)	__careful_cmp(min, (type)(x), (type)(y))</div><div class='add'>+#define clamp_t(type, val, lo, hi) __careful_clamp(type, val, lo, hi)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * max_t - return maximum of two values, using the specified type</div><div class='del'>- * @type: data type to use</div><div class='del'>- * @x: first value</div><div class='del'>- * @y: second value</div><div class='add'>+ * clamp_val - return a value clamped to a given range using val's type</div><div class='add'>+ * @val: current value</div><div class='add'>+ * @lo: minimum allowable value</div><div class='add'>+ * @hi: maximum allowable value</div><div class='add'>+ *</div><div class='add'>+ * This macro does no typechecking and uses temporary variables of whatever</div><div class='add'>+ * type the input argument @val is.  This is useful when @val is an unsigned</div><div class='add'>+ * type and @lo and @hi are literals that will otherwise be assigned a signed</div><div class='add'>+ * integer type.</div><div class='ctx'>  */</div><div class='del'>-#define max_t(type, x, y)	__careful_cmp(max, (type)(x), (type)(y))</div><div class='add'>+#define clamp_val(val, lo, hi) __careful_clamp(typeof(val), val, lo, hi)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Do not check the array parameter using __must_be_array().</div><div class='hunk'>@@ -211,31 +273,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #define max_array(array, len) __minmax_array(max, array, len)</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * clamp_t - return a value clamped to a given range using a given type</div><div class='del'>- * @type: the type of variable to use</div><div class='del'>- * @val: current value</div><div class='del'>- * @lo: minimum allowable value</div><div class='del'>- * @hi: maximum allowable value</div><div class='del'>- *</div><div class='del'>- * This macro does no typechecking and uses temporary variables of type</div><div class='del'>- * @type to make all the comparisons.</div><div class='del'>- */</div><div class='del'>-#define clamp_t(type, val, lo, hi) __careful_clamp((type)(val), (type)(lo), (type)(hi))</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * clamp_val - return a value clamped to a given range using val's type</div><div class='del'>- * @val: current value</div><div class='del'>- * @lo: minimum allowable value</div><div class='del'>- * @hi: maximum allowable value</div><div class='del'>- *</div><div class='del'>- * This macro does no typechecking and uses temporary variables of whatever</div><div class='del'>- * type the input argument @val is.  This is useful when @val is an unsigned</div><div class='del'>- * type and @lo and @hi are literals that will otherwise be assigned a signed</div><div class='del'>- * integer type.</div><div class='del'>- */</div><div class='del'>-#define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi)</div><div class='del'>-</div><div class='ctx'> static inline bool in_range64(u64 val, u64 start, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	return (val - start) &lt; len;</div><div class='hunk'>@@ -270,4 +307,13 @@ static inline bool in_range32(u32 val, u32 start, u32 len)</div><div class='ctx'> #define swap(a, b) \</div><div class='ctx'> 	do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Use these carefully: no type checking, and uses the arguments</div><div class='add'>+ * multiple times. Use for obvious constants only.</div><div class='add'>+ */</div><div class='add'>+#define MIN(a, b) __cmp(min, a, b)</div><div class='add'>+#define MAX(a, b) __cmp(max, a, b)</div><div class='add'>+#define MIN_T(type, a, b) __cmp(min, (type)(a), (type)(b))</div><div class='add'>+#define MAX_T(type, a, b) __cmp(max, (type)(a), (type)(b))</div><div class='add'>+</div><div class='ctx'> #endif	/* _LINUX_MINMAX_H */</div><div class='head'>diff --git a/include/linux/misc/keba.h b/include/linux/misc/keba.h<br/>new file mode 100644<br/>index 000000000000..a81d6fa70851<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/misc/keba.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/misc/keba.h</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) 2024, KEBA Industrial Automation Gmbh */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_MISC_KEBA_H</div><div class='add'>+#define _LINUX_MISC_KEBA_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+</div><div class='add'>+struct i2c_board_info;</div><div class='add'>+struct spi_board_info;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct keba_i2c_auxdev - KEBA I2C auxiliary device</div><div class='add'>+ * @auxdev: auxiliary device object</div><div class='add'>+ * @io: address range of I2C controller IO memory</div><div class='add'>+ * @info_size: number of I2C devices to be probed</div><div class='add'>+ * @info: I2C devices to be probed</div><div class='add'>+ */</div><div class='add'>+struct keba_i2c_auxdev {</div><div class='add'>+	struct auxiliary_device auxdev;</div><div class='add'>+	struct resource io;</div><div class='add'>+	int info_size;</div><div class='add'>+	struct i2c_board_info *info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct keba_spi_auxdev - KEBA SPI auxiliary device</div><div class='add'>+ * @auxdev: auxiliary device object</div><div class='add'>+ * @io: address range of SPI controller IO memory</div><div class='add'>+ * @info_size: number of SPI devices to be probed</div><div class='add'>+ * @info: SPI devices to be probed</div><div class='add'>+ */</div><div class='add'>+struct keba_spi_auxdev {</div><div class='add'>+	struct auxiliary_device auxdev;</div><div class='add'>+	struct resource io;</div><div class='add'>+	int info_size;</div><div class='add'>+	struct spi_board_info *info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct keba_fan_auxdev - KEBA fan auxiliary device</div><div class='add'>+ * @auxdev: auxiliary device object</div><div class='add'>+ * @io: address range of fan controller IO memory</div><div class='add'>+ */</div><div class='add'>+struct keba_fan_auxdev {</div><div class='add'>+	struct auxiliary_device auxdev;</div><div class='add'>+	struct resource io;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct keba_batt_auxdev - KEBA battery auxiliary device</div><div class='add'>+ * @auxdev: auxiliary device object</div><div class='add'>+ * @io: address range of battery controller IO memory</div><div class='add'>+ */</div><div class='add'>+struct keba_batt_auxdev {</div><div class='add'>+	struct auxiliary_device auxdev;</div><div class='add'>+	struct resource io;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct keba_uart_auxdev - KEBA UART auxiliary device</div><div class='add'>+ * @auxdev: auxiliary device object</div><div class='add'>+ * @io: address range of UART controller IO memory</div><div class='add'>+ * @irq: number of UART controller interrupt</div><div class='add'>+ */</div><div class='add'>+struct keba_uart_auxdev {</div><div class='add'>+	struct auxiliary_device auxdev;</div><div class='add'>+	struct resource io;</div><div class='add'>+	unsigned int irq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_MISC_KEBA_H */</div><div class='head'>diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h<br/>index e799b1f8d05b..0cb36a3ffc47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/misc_cgroup.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/misc_cgroup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/misc_cgroup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/misc_cgroup.h</a></div><div class='hunk'>@@ -9,15 +9,20 @@</div><div class='ctx'> #define _MISC_CGROUP_H_</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Types of misc cgroup entries supported by the host.</div><div class='add'>+ * enum misc_res_type - Types of misc cgroup entries supported by the host.</div><div class='ctx'>  */</div><div class='ctx'> enum misc_res_type {</div><div class='ctx'> #ifdef CONFIG_KVM_AMD_SEV</div><div class='del'>-	/* AMD SEV ASIDs resource */</div><div class='add'>+	/** @MISC_CG_RES_SEV: AMD SEV ASIDs resource */</div><div class='ctx'> 	MISC_CG_RES_SEV,</div><div class='del'>-	/* AMD SEV-ES ASIDs resource */</div><div class='add'>+	/** @MISC_CG_RES_SEV_ES: AMD SEV-ES ASIDs resource */</div><div class='ctx'> 	MISC_CG_RES_SEV_ES,</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_INTEL_TDX_HOST</div><div class='add'>+	/** @MISC_CG_RES_TDX: Intel TDX HKIDs resource */</div><div class='add'>+	MISC_CG_RES_TDX,</div><div class='add'>+#endif</div><div class='add'>+	/** @MISC_CG_RES_TYPES: count of enum misc_res_type constants */</div><div class='ctx'> 	MISC_CG_RES_TYPES</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -30,13 +35,16 @@ struct misc_cg;</div><div class='ctx'> /**</div><div class='ctx'>  * struct misc_res: Per cgroup per misc type resource</div><div class='ctx'>  * @max: Maximum limit on the resource.</div><div class='add'>+ * @watermark: Historical maximum usage of the resource.</div><div class='ctx'>  * @usage: Current usage of the resource.</div><div class='ctx'>  * @events: Number of times, the resource limit exceeded.</div><div class='ctx'>  */</div><div class='ctx'> struct misc_res {</div><div class='ctx'> 	u64 max;</div><div class='add'>+	atomic64_t watermark;</div><div class='ctx'> 	atomic64_t usage;</div><div class='ctx'> 	atomic64_t events;</div><div class='add'>+	atomic64_t events_local;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -50,11 +58,12 @@ struct misc_cg {</div><div class='ctx'> </div><div class='ctx'> 	/* misc.events */</div><div class='ctx'> 	struct cgroup_file events_file;</div><div class='add'>+	/* misc.events.local */</div><div class='add'>+	struct cgroup_file events_local_file;</div><div class='ctx'> </div><div class='ctx'> 	struct misc_res res[MISC_CG_RES_TYPES];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-u64 misc_cg_res_total_usage(enum misc_res_type type);</div><div class='ctx'> int misc_cg_set_capacity(enum misc_res_type type, u64 capacity);</div><div class='ctx'> int misc_cg_try_charge(enum misc_res_type type, struct misc_cg *cg, u64 amount);</div><div class='ctx'> void misc_cg_uncharge(enum misc_res_type type, struct misc_cg *cg, u64 amount);</div><div class='hunk'>@@ -98,11 +107,6 @@ static inline void put_misc_cg(struct misc_cg *cg)</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_CGROUP_MISC */</div><div class='ctx'> </div><div class='del'>-static inline u64 misc_cg_res_total_usage(enum misc_res_type type)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int misc_cg_set_capacity(enum misc_res_type type, u64 capacity)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h<br/>index c0fea6ca5076..7d0aa718499c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/miscdevice.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/miscdevice.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/miscdevice.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/miscdevice.h</a></div><div class='hunk'>@@ -70,13 +70,19 @@</div><div class='ctx'> #define UHID_MINOR		239</div><div class='ctx'> #define USERIO_MINOR		240</div><div class='ctx'> #define VHOST_VSOCK_MINOR	241</div><div class='add'>+#define EISA_EEPROM_MINOR	241</div><div class='ctx'> #define RFKILL_MINOR		242</div><div class='del'>-#define MISC_DYNAMIC_MINOR	255</div><div class='ctx'> </div><div class='del'>-struct device;</div><div class='del'>-struct attribute_group;</div><div class='add'>+/*</div><div class='add'>+ * Misc char device minor code space division related to below macro:</div><div class='add'>+ *</div><div class='add'>+ * &lt;  255  : Fixed minor code</div><div class='add'>+ * == 255  : Indicator to request dynamic minor code</div><div class='add'>+ * &gt;  255  : Dynamic minor code requested, 1048320 minor codes totally.</div><div class='add'>+ */</div><div class='add'>+#define MISC_DYNAMIC_MINOR	255</div><div class='ctx'> </div><div class='del'>-struct miscdevice  {</div><div class='add'>+struct miscdevice {</div><div class='ctx'> 	int minor;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	const struct file_operations *fops;</div><div class='head'>diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h<br/>index 27f42f713c89..f016263e1fcf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx4/device.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx4/device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx4/device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx4/device.h</a></div><div class='hunk'>@@ -1135,7 +1135,7 @@ int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='ctx'> int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,</div><div class='ctx'> 		       struct mlx4_buf *buf);</div><div class='ctx'> </div><div class='del'>-int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order);</div><div class='add'>+int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, unsigned int order);</div><div class='ctx'> void mlx4_db_free(struct mlx4_dev *dev, struct mlx4_db *db);</div><div class='ctx'> </div><div class='ctx'> int mlx4_alloc_hwq_res(struct mlx4_dev *dev, struct mlx4_hwq_resources *wqres,</div><div class='hunk'>@@ -1415,7 +1415,6 @@ int mlx4_get_is_vlan_offload_disabled(struct mlx4_dev *dev, u8 port,</div><div class='ctx'> 				      bool *vlan_offload_disabled);</div><div class='ctx'> void mlx4_handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl,</div><div class='ctx'> 				       struct _rule_hw *eth_header);</div><div class='del'>-int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx);</div><div class='ctx'> int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);</div><div class='ctx'> int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);</div><div class='ctx'> void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);</div><div class='head'>diff --git a/include/linux/mlx5/cq.h b/include/linux/mlx5/cq.h<br/>index cb15308b5cb0..9d47cdc727ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/cq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/cq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/cq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/cq.h</a></div><div class='hunk'>@@ -41,7 +41,6 @@ struct mlx5_core_cq {</div><div class='ctx'> 	int			cqe_sz;</div><div class='ctx'> 	__be32		       *set_ci_db;</div><div class='ctx'> 	__be32		       *arm_db;</div><div class='del'>-	struct mlx5_uars_page  *uar;</div><div class='ctx'> 	refcount_t		refcount;</div><div class='ctx'> 	struct completion	free;</div><div class='ctx'> 	unsigned		vector;</div><div class='hunk'>@@ -95,9 +94,10 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MLX5_CQ_MODIFY_PERIOD	= 1 &lt;&lt; 0,</div><div class='del'>-	MLX5_CQ_MODIFY_COUNT	= 1 &lt;&lt; 1,</div><div class='del'>-	MLX5_CQ_MODIFY_OVERRUN	= 1 &lt;&lt; 2,</div><div class='add'>+	MLX5_CQ_MODIFY_PERIOD		= BIT(0),</div><div class='add'>+	MLX5_CQ_MODIFY_COUNT		= BIT(1),</div><div class='add'>+	MLX5_CQ_MODIFY_OVERRUN		= BIT(2),</div><div class='add'>+	MLX5_CQ_MODIFY_PERIOD_MODE	= BIT(4),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -183,6 +183,7 @@ static inline void mlx5_cq_put(struct mlx5_core_cq *cq)</div><div class='ctx'> 		complete(&amp;cq-&gt;free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void mlx5_add_cq_to_tasklet(struct mlx5_core_cq *cq, struct mlx5_eqe *eqe);</div><div class='ctx'> int mlx5_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,</div><div class='ctx'> 		   u32 *in, int inlen, u32 *out, int outlen);</div><div class='ctx'> int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,</div><div class='head'>diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h<br/>index 01275c6e8468..d7f46a8fbfa1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/device.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/device.h</a></div><div class='hunk'>@@ -68,7 +68,7 @@</div><div class='ctx'> #define MLX5_UN_SZ_BYTES(typ) (sizeof(union mlx5_ifc_##typ##_bits) / 8)</div><div class='ctx'> #define MLX5_UN_SZ_DW(typ) (sizeof(union mlx5_ifc_##typ##_bits) / 32)</div><div class='ctx'> #define MLX5_BYTE_OFF(typ, fld) (__mlx5_bit_off(typ, fld) / 8)</div><div class='del'>-#define MLX5_ADDR_OF(typ, p, fld) ((void *)((uint8_t *)(p) + MLX5_BYTE_OFF(typ, fld)))</div><div class='add'>+#define MLX5_ADDR_OF(typ, p, fld) ((void *)((u8 *)(p) + MLX5_BYTE_OFF(typ, fld)))</div><div class='ctx'> </div><div class='ctx'> /* insert a value to a struct */</div><div class='ctx'> #define MLX5_SET(typ, p, fld, v) do { \</div><div class='hunk'>@@ -211,6 +211,7 @@ enum {</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_PFAULT_SUBTYPE_WQE = 0,</div><div class='ctx'> 	MLX5_PFAULT_SUBTYPE_RDMA = 1,</div><div class='add'>+	MLX5_PFAULT_SUBTYPE_MEMORY = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum wqe_page_fault_type {</div><div class='hunk'>@@ -279,6 +280,7 @@ enum {</div><div class='ctx'> 	MLX5_MKEY_MASK_SMALL_FENCE	= 1ull &lt;&lt; 23,</div><div class='ctx'> 	MLX5_MKEY_MASK_RELAXED_ORDERING_WRITE	= 1ull &lt;&lt; 25,</div><div class='ctx'> 	MLX5_MKEY_MASK_FREE			= 1ull &lt;&lt; 29,</div><div class='add'>+	MLX5_MKEY_MASK_PAGE_SIZE_5		= 1ull &lt;&lt; 42,</div><div class='ctx'> 	MLX5_MKEY_MASK_RELAXED_ORDERING_READ	= 1ull &lt;&lt; 47,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -294,6 +296,7 @@ enum {</div><div class='ctx'> #define MLX5_UMR_FLEX_ALIGNMENT 0x40</div><div class='ctx'> #define MLX5_UMR_MTT_NUM_ENTRIES_ALIGNMENT (MLX5_UMR_FLEX_ALIGNMENT / sizeof(struct mlx5_mtt))</div><div class='ctx'> #define MLX5_UMR_KLM_NUM_ENTRIES_ALIGNMENT (MLX5_UMR_FLEX_ALIGNMENT / sizeof(struct mlx5_klm))</div><div class='add'>+#define MLX5_UMR_KSM_NUM_ENTRIES_ALIGNMENT (MLX5_UMR_FLEX_ALIGNMENT / sizeof(struct mlx5_ksm))</div><div class='ctx'> </div><div class='ctx'> #define MLX5_USER_INDEX_LEN (MLX5_FLD_SZ_BYTES(qpc, user_index) * 8)</div><div class='ctx'> </div><div class='hunk'>@@ -369,6 +372,7 @@ enum mlx5_driver_event {</div><div class='ctx'> 	MLX5_DRIVER_EVENT_SF_PEER_DEVLINK,</div><div class='ctx'> 	MLX5_DRIVER_EVENT_AFFILIATION_DONE,</div><div class='ctx'> 	MLX5_DRIVER_EVENT_AFFILIATION_REMOVED,</div><div class='add'>+	MLX5_DRIVER_EVENT_ACTIVE_BACKUP_LAG_CHANGE_LOWERSTATE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -535,6 +539,7 @@ struct mlx5_cmd_layout {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum mlx5_rfr_severity_bit_offsets {</div><div class='add'>+	MLX5_CRR_BIT_OFFSET = 0x6,</div><div class='ctx'> 	MLX5_RFR_BIT_OFFSET = 0x7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -645,10 +650,11 @@ struct mlx5_eqe_page_req {</div><div class='ctx'> 	__be32		rsvd1[5];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MEMORY_SCHEME_PAGE_FAULT_GRANULARITY 4096</div><div class='ctx'> struct mlx5_eqe_page_fault {</div><div class='del'>-	__be32 bytes_committed;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='add'>+			__be32  bytes_committed;</div><div class='ctx'> 			u16     reserved1;</div><div class='ctx'> 			__be16  wqe_index;</div><div class='ctx'> 			u16	reserved2;</div><div class='hunk'>@@ -658,6 +664,7 @@ struct mlx5_eqe_page_fault {</div><div class='ctx'> 			__be32  pftype_wq;</div><div class='ctx'> 		} __packed wqe;</div><div class='ctx'> 		struct {</div><div class='add'>+			__be32  bytes_committed;</div><div class='ctx'> 			__be32  r_key;</div><div class='ctx'> 			u16	reserved1;</div><div class='ctx'> 			__be16  packet_length;</div><div class='hunk'>@@ -665,6 +672,23 @@ struct mlx5_eqe_page_fault {</div><div class='ctx'> 			__be64  rdma_va;</div><div class='ctx'> 			__be32  pftype_token;</div><div class='ctx'> 		} __packed rdma;</div><div class='add'>+		struct {</div><div class='add'>+			u8      flags;</div><div class='add'>+			u8      reserved1;</div><div class='add'>+			__be16  post_demand_fault_pages;</div><div class='add'>+			__be16  pre_demand_fault_pages;</div><div class='add'>+			__be16  token47_32;</div><div class='add'>+			__be32  token31_0;</div><div class='add'>+			/*</div><div class='add'>+			 * FW changed from specifying the fault size in byte</div><div class='add'>+			 * count to 4k pages granularity. The size specified</div><div class='add'>+			 * in pages uses bits 31:12, to keep backward</div><div class='add'>+			 * compatibility.</div><div class='add'>+			 */</div><div class='add'>+			__be32 demand_fault_pages;</div><div class='add'>+			__be32  mkey;</div><div class='add'>+			__be64  va;</div><div class='add'>+		} __packed memory;</div><div class='ctx'> 	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -1223,10 +1247,13 @@ enum mlx5_cap_type {</div><div class='ctx'> 	MLX5_CAP_DEV_EVENT = 0x14,</div><div class='ctx'> 	MLX5_CAP_IPSEC,</div><div class='ctx'> 	MLX5_CAP_CRYPTO = 0x1a,</div><div class='add'>+	MLX5_CAP_SHAMPO = 0x1d,</div><div class='add'>+	MLX5_CAP_PSP = 0x1e,</div><div class='ctx'> 	MLX5_CAP_MACSEC = 0x1f,</div><div class='ctx'> 	MLX5_CAP_GENERAL_2 = 0x20,</div><div class='ctx'> 	MLX5_CAP_PORT_SELECTION = 0x25,</div><div class='ctx'> 	MLX5_CAP_ADV_VIRTUALIZATION = 0x26,</div><div class='add'>+	MLX5_CAP_ADV_RDMA = 0x28,</div><div class='ctx'> 	/* NUM OF CAP Types */</div><div class='ctx'> 	MLX5_CAP_NUM</div><div class='ctx'> };</div><div class='hunk'>@@ -1242,7 +1269,8 @@ enum mlx5_pcam_feature_groups {</div><div class='ctx'> enum mlx5_mcam_reg_groups {</div><div class='ctx'> 	MLX5_MCAM_REGS_FIRST_128                    = 0x0,</div><div class='ctx'> 	MLX5_MCAM_REGS_0x9100_0x917F                = 0x2,</div><div class='del'>-	MLX5_MCAM_REGS_NUM                          = 0x3,</div><div class='add'>+	MLX5_MCAM_REGS_0x9180_0x91FF                = 0x3,</div><div class='add'>+	MLX5_MCAM_REGS_NUM                          = 0x4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum mlx5_mcam_feature_groups {</div><div class='hunk'>@@ -1320,6 +1348,12 @@ enum mlx5_qcam_feature_groups {</div><div class='ctx'> #define MLX5_CAP_FLOWTABLE_RDMA_TX(mdev, cap) \</div><div class='ctx'> 	MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_transmit_rdma.cap)</div><div class='ctx'> </div><div class='add'>+#define MLX5_CAP_FLOWTABLE_RDMA_TRANSPORT_RX(mdev, cap) \</div><div class='add'>+	MLX5_CAP_ADV_RDMA(mdev, rdma_transport_rx_flow_table_properties.cap)</div><div class='add'>+</div><div class='add'>+#define MLX5_CAP_FLOWTABLE_RDMA_TRANSPORT_TX(mdev, cap) \</div><div class='add'>+	MLX5_CAP_ADV_RDMA(mdev, rdma_transport_tx_flow_table_properties.cap)</div><div class='add'>+</div><div class='ctx'> #define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \</div><div class='ctx'> 	MLX5_GET(flow_table_eswitch_cap, \</div><div class='ctx'> 		 mdev-&gt;caps.hca[MLX5_CAP_ESWITCH_FLOW_TABLE]-&gt;cur, cap)</div><div class='hunk'>@@ -1336,6 +1370,9 @@ enum mlx5_qcam_feature_groups {</div><div class='ctx'> #define MLX5_CAP_ESW_FT_FIELD_SUPPORT_2(mdev, cap) \</div><div class='ctx'> 	MLX5_CAP_ESW_FLOWTABLE(mdev, ft_field_support_2_esw_fdb.cap)</div><div class='ctx'> </div><div class='add'>+#define MLX5_CAP_NIC_RX_FT_FIELD_SUPPORT_2(mdev, cap) \</div><div class='add'>+		MLX5_CAP_FLOWTABLE(mdev, ft_field_support_2_nic_receive.cap)</div><div class='add'>+</div><div class='ctx'> #define MLX5_CAP_ESW(mdev, cap) \</div><div class='ctx'> 	MLX5_GET(e_switch_cap, \</div><div class='ctx'> 		 mdev-&gt;caps.hca[MLX5_CAP_ESWITCH]-&gt;cur, cap)</div><div class='hunk'>@@ -1356,12 +1393,27 @@ enum mlx5_qcam_feature_groups {</div><div class='ctx'> 	MLX5_GET(adv_virtualization_cap, \</div><div class='ctx'> 		 mdev-&gt;caps.hca[MLX5_CAP_ADV_VIRTUALIZATION]-&gt;cur, cap)</div><div class='ctx'> </div><div class='add'>+#define MLX5_CAP_ADV_RDMA(mdev, cap) \</div><div class='add'>+	MLX5_GET(adv_rdma_cap, \</div><div class='add'>+		 mdev-&gt;caps.hca[MLX5_CAP_ADV_RDMA]-&gt;cur, cap)</div><div class='add'>+</div><div class='ctx'> #define MLX5_CAP_FLOWTABLE_PORT_SELECTION(mdev, cap) \</div><div class='ctx'> 	MLX5_CAP_PORT_SELECTION(mdev, flow_table_properties_port_selection.cap)</div><div class='ctx'> </div><div class='add'>+#define MLX5_CAP_PORT_SELECTION_FT_FIELD_SUPPORT_2(mdev, cap) \</div><div class='add'>+	MLX5_CAP_PORT_SELECTION(mdev, ft_field_support_2_port_selection.cap)</div><div class='add'>+</div><div class='ctx'> #define MLX5_CAP_ODP(mdev, cap)\</div><div class='ctx'> 	MLX5_GET(odp_cap, mdev-&gt;caps.hca[MLX5_CAP_ODP]-&gt;cur, cap)</div><div class='ctx'> </div><div class='add'>+#define MLX5_CAP_ODP_SCHEME(mdev, cap)                                \</div><div class='add'>+	(MLX5_GET(odp_cap, mdev-&gt;caps.hca[MLX5_CAP_ODP]-&gt;cur,         \</div><div class='add'>+		  mem_page_fault) ?                                   \</div><div class='add'>+		 MLX5_GET(odp_cap, mdev-&gt;caps.hca[MLX5_CAP_ODP]-&gt;cur, \</div><div class='add'>+			  memory_page_fault_scheme_cap.cap) :         \</div><div class='add'>+		 MLX5_GET(odp_cap, mdev-&gt;caps.hca[MLX5_CAP_ODP]-&gt;cur, \</div><div class='add'>+			  transport_page_fault_scheme_cap.cap))</div><div class='add'>+</div><div class='ctx'> #define MLX5_CAP_ODP_MAX(mdev, cap)\</div><div class='ctx'> 	MLX5_GET(odp_cap, mdev-&gt;caps.hca[MLX5_CAP_ODP]-&gt;max, cap)</div><div class='ctx'> </div><div class='hunk'>@@ -1385,6 +1437,10 @@ enum mlx5_qcam_feature_groups {</div><div class='ctx'> 	MLX5_GET(mcam_reg, (mdev)-&gt;caps.mcam[MLX5_MCAM_REGS_0x9100_0x917F], \</div><div class='ctx'> 		 mng_access_reg_cap_mask.access_regs2.reg)</div><div class='ctx'> </div><div class='add'>+#define MLX5_CAP_MCAM_REG3(mdev, reg) \</div><div class='add'>+	MLX5_GET(mcam_reg, (mdev)-&gt;caps.mcam[MLX5_MCAM_REGS_0x9180_0x91FF], \</div><div class='add'>+		 mng_access_reg_cap_mask.access_regs3.reg)</div><div class='add'>+</div><div class='ctx'> #define MLX5_CAP_MCAM_FEATURE(mdev, fld) \</div><div class='ctx'> 	MLX5_GET(mcam_reg, (mdev)-&gt;caps.mcam, mng_feature_cap_mask.enhanced_features.fld)</div><div class='ctx'> </div><div class='hunk'>@@ -1429,6 +1485,12 @@ enum mlx5_qcam_feature_groups {</div><div class='ctx'> #define MLX5_CAP_MACSEC(mdev, cap)\</div><div class='ctx'> 	MLX5_GET(macsec_cap, (mdev)-&gt;caps.hca[MLX5_CAP_MACSEC]-&gt;cur, cap)</div><div class='ctx'> </div><div class='add'>+#define MLX5_CAP_SHAMPO(mdev, cap) \</div><div class='add'>+	MLX5_GET(shampo_cap, mdev-&gt;caps.hca[MLX5_CAP_SHAMPO]-&gt;cur, cap)</div><div class='add'>+</div><div class='add'>+#define MLX5_CAP_PSP(mdev, cap)\</div><div class='add'>+	MLX5_GET(psp_cap, (mdev)-&gt;caps.hca[MLX5_CAP_PSP]-&gt;cur, cap)</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_CMD_STAT_OK			= 0x0,</div><div class='ctx'> 	MLX5_CMD_STAT_INT_ERR			= 0x1,</div><div class='hunk'>@@ -1437,6 +1499,7 @@ enum {</div><div class='ctx'> 	MLX5_CMD_STAT_BAD_SYS_STATE_ERR		= 0x4,</div><div class='ctx'> 	MLX5_CMD_STAT_BAD_RES_ERR		= 0x5,</div><div class='ctx'> 	MLX5_CMD_STAT_RES_BUSY			= 0x6,</div><div class='add'>+	MLX5_CMD_STAT_NOT_READY			= 0x7,</div><div class='ctx'> 	MLX5_CMD_STAT_LIM_ERR			= 0x8,</div><div class='ctx'> 	MLX5_CMD_STAT_BAD_RES_STATE_ERR		= 0x9,</div><div class='ctx'> 	MLX5_CMD_STAT_IX_ERR			= 0xa,</div><div class='hunk'>@@ -1459,7 +1522,10 @@ enum {</div><div class='ctx'> 	MLX5_PHYSICAL_LAYER_COUNTERS_GROUP    = 0x12,</div><div class='ctx'> 	MLX5_PER_TRAFFIC_CLASS_CONGESTION_GROUP = 0x13,</div><div class='ctx'> 	MLX5_PHYSICAL_LAYER_STATISTICAL_GROUP = 0x16,</div><div class='add'>+	MLX5_PHYSICAL_LAYER_RECOVERY_GROUP    = 0x1a,</div><div class='ctx'> 	MLX5_INFINIBAND_PORT_COUNTERS_GROUP   = 0x20,</div><div class='add'>+	MLX5_INFINIBAND_EXTENDED_PORT_COUNTERS_GROUP = 0x21,</div><div class='add'>+	MLX5_RS_FEC_HISTOGRAM_GROUP = 0x23,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -1473,8 +1539,8 @@ static inline u16 mlx5_to_sw_pkey_sz(int pkey_sz)</div><div class='ctx'> 	return MLX5_MIN_PKEY_TABLE_SIZE &lt;&lt; pkey_sz;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MLX5_RDMA_RX_NUM_COUNTERS_PRIOS 2</div><div class='del'>-#define MLX5_RDMA_TX_NUM_COUNTERS_PRIOS 1</div><div class='add'>+#define MLX5_RDMA_RX_NUM_COUNTERS_PRIOS 6</div><div class='add'>+#define MLX5_RDMA_TX_NUM_COUNTERS_PRIOS 4</div><div class='ctx'> #define MLX5_BY_PASS_NUM_REGULAR_PRIOS 16</div><div class='ctx'> #define MLX5_BY_PASS_NUM_DONT_TRAP_PRIOS 16</div><div class='ctx'> #define MLX5_BY_PASS_NUM_MULTICAST_PRIOS 1</div><div class='head'>diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h<br/>index bf9324a31ae9..1c54aa6f74fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/driver.h</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/pci-tph.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock_types.h&gt;</div><div class='ctx'> #include &lt;linux/semaphore.h&gt;</div><div class='hunk'>@@ -45,7 +46,6 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/mempool.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='ctx'> #include &lt;linux/auxiliary_bus.h&gt;</div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'> #include &lt;linux/mlx5/doorbell.h&gt;</div><div class='ctx'> #include &lt;linux/mlx5/eq.h&gt;</div><div class='ctx'> #include &lt;linux/timecounter.h&gt;</div><div class='del'>-#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='ctx'> #include &lt;net/devlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MLX5_ADEV_NAME "mlx5_core"</div><div class='hunk'>@@ -85,7 +84,7 @@ enum mlx5_sqp_t {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MLX5_MAX_PORTS	= 4,</div><div class='add'>+	MLX5_MAX_PORTS	= 8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -131,12 +130,14 @@ enum {</div><div class='ctx'> 	MLX5_REG_PDDR		 = 0x5031,</div><div class='ctx'> 	MLX5_REG_PMLP		 = 0x5002,</div><div class='ctx'> 	MLX5_REG_PPLM		 = 0x5023,</div><div class='add'>+	MLX5_REG_PPHCR		 = 0x503E,</div><div class='ctx'> 	MLX5_REG_PCAM		 = 0x507f,</div><div class='ctx'> 	MLX5_REG_NODE_DESC	 = 0x6001,</div><div class='ctx'> 	MLX5_REG_HOST_ENDIANNESS = 0x7004,</div><div class='ctx'> 	MLX5_REG_MTCAP		 = 0x9009,</div><div class='ctx'> 	MLX5_REG_MTMP		 = 0x900A,</div><div class='ctx'> 	MLX5_REG_MCIA		 = 0x9014,</div><div class='add'>+	MLX5_REG_MNVDA		 = 0x9024,</div><div class='ctx'> 	MLX5_REG_MFRL		 = 0x9028,</div><div class='ctx'> 	MLX5_REG_MLCR		 = 0x902b,</div><div class='ctx'> 	MLX5_REG_MRTC		 = 0x902d,</div><div class='hunk'>@@ -159,9 +160,14 @@ enum {</div><div class='ctx'> 	MLX5_REG_MSECQ		 = 0x9155,</div><div class='ctx'> 	MLX5_REG_MSEES		 = 0x9156,</div><div class='ctx'> 	MLX5_REG_MIRC		 = 0x9162,</div><div class='add'>+	MLX5_REG_MTPTM		 = 0x9180,</div><div class='add'>+	MLX5_REG_MTCTR		 = 0x9181,</div><div class='add'>+	MLX5_REG_MRTCQ		 = 0x9182,</div><div class='ctx'> 	MLX5_REG_SBCAM		 = 0xB01F,</div><div class='ctx'> 	MLX5_REG_RESOURCE_DUMP   = 0xC000,</div><div class='add'>+	MLX5_REG_NIC_CAP	 = 0xC00D,</div><div class='ctx'> 	MLX5_REG_DTOR            = 0xC00E,</div><div class='add'>+	MLX5_REG_VHCA_ICM_CTRL	 = 0xC010,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum mlx5_qpts_trust_state {</div><div class='hunk'>@@ -301,6 +307,8 @@ struct mlx5_cmd {</div><div class='ctx'> 		struct semaphore sem;</div><div class='ctx'> 		struct semaphore pages_sem;</div><div class='ctx'> 		struct semaphore throttle_sem;</div><div class='add'>+		struct semaphore unprivileged_sem;</div><div class='add'>+		struct xarray	privileged_uids;</div><div class='ctx'> 	} vars;</div><div class='ctx'> 	enum mlx5_cmdif_state	state;</div><div class='ctx'> 	void	       *cmd_alloc_buf;</div><div class='hunk'>@@ -393,6 +401,7 @@ struct mlx5_core_rsc_common {</div><div class='ctx'> 	enum mlx5_res_type	res;</div><div class='ctx'> 	refcount_t		refcount;</div><div class='ctx'> 	struct completion	free;</div><div class='add'>+	bool			invalid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_uars_page {</div><div class='hunk'>@@ -425,7 +434,6 @@ struct mlx5_sq_bfreg {</div><div class='ctx'> 	struct mlx5_uars_page  *up;</div><div class='ctx'> 	bool			wc;</div><div class='ctx'> 	u32			index;</div><div class='del'>-	unsigned int		offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_core_health {</div><div class='hunk'>@@ -472,36 +480,6 @@ struct mlx5_core_sriov {</div><div class='ctx'> 	u16			max_ec_vfs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mlx5_fc_pool {</div><div class='del'>-	struct mlx5_core_dev *dev;</div><div class='del'>-	struct mutex pool_lock; /* protects pool lists */</div><div class='del'>-	struct list_head fully_used;</div><div class='del'>-	struct list_head partially_used;</div><div class='del'>-	struct list_head unused;</div><div class='del'>-	int available_fcs;</div><div class='del'>-	int used_fcs;</div><div class='del'>-	int threshold;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mlx5_fc_stats {</div><div class='del'>-	spinlock_t counters_idr_lock; /* protects counters_idr */</div><div class='del'>-	struct idr counters_idr;</div><div class='del'>-	struct list_head counters;</div><div class='del'>-	struct llist_head addlist;</div><div class='del'>-	struct llist_head dellist;</div><div class='del'>-</div><div class='del'>-	struct workqueue_struct *wq;</div><div class='del'>-	struct delayed_work work;</div><div class='del'>-	unsigned long next_query;</div><div class='del'>-	unsigned long sampling_interval; /* jiffies */</div><div class='del'>-	u32 *bulk_query_out;</div><div class='del'>-	int bulk_query_len;</div><div class='del'>-	size_t num_counters;</div><div class='del'>-	bool bulk_query_alloc_failed;</div><div class='del'>-	unsigned long next_bulk_query_alloc;</div><div class='del'>-	struct mlx5_fc_pool fc_pool;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct mlx5_events;</div><div class='ctx'> struct mlx5_mpfs;</div><div class='ctx'> struct mlx5_eswitch;</div><div class='hunk'>@@ -510,7 +488,6 @@ struct mlx5_devcom_dev;</div><div class='ctx'> struct mlx5_fw_reset;</div><div class='ctx'> struct mlx5_eq_table;</div><div class='ctx'> struct mlx5_irq_table;</div><div class='del'>-struct mlx5_vhca_state_notifier;</div><div class='ctx'> struct mlx5_sf_dev_table;</div><div class='ctx'> struct mlx5_sf_hw_table;</div><div class='ctx'> struct mlx5_sf_table;</div><div class='hunk'>@@ -553,6 +530,7 @@ enum {</div><div class='ctx'> 	 * creation/deletion on drivers rescan. Unset during device attach.</div><div class='ctx'> 	 */</div><div class='ctx'> 	MLX5_PRIV_FLAGS_DETACH = 1 &lt;&lt; 2,</div><div class='add'>+	MLX5_PRIV_FLAGS_SWITCH_LEGACY = 1 &lt;&lt; 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_adev {</div><div class='hunk'>@@ -620,6 +598,7 @@ struct mlx5_priv {</div><div class='ctx'> </div><div class='ctx'> 	struct mlx5_flow_steering *steering;</div><div class='ctx'> 	struct mlx5_mpfs        *mpfs;</div><div class='add'>+	struct blocking_notifier_head esw_n_head;</div><div class='ctx'> 	struct mlx5_eswitch     *eswitch;</div><div class='ctx'> 	struct mlx5_core_sriov	sriov;</div><div class='ctx'> 	struct mlx5_lag		*lag;</div><div class='hunk'>@@ -628,21 +607,28 @@ struct mlx5_priv {</div><div class='ctx'> 	struct mlx5_devcom_comp_dev *hca_devcom_comp;</div><div class='ctx'> 	struct mlx5_fw_reset	*fw_reset;</div><div class='ctx'> 	struct mlx5_core_roce	roce;</div><div class='del'>-	struct mlx5_fc_stats		fc_stats;</div><div class='add'>+	struct mlx5_fc_stats		*fc_stats;</div><div class='ctx'> 	struct mlx5_rl_table            rl_table;</div><div class='ctx'> 	struct mlx5_ft_pool		*ft_pool;</div><div class='ctx'> </div><div class='ctx'> 	struct mlx5_bfreg_data		bfregs;</div><div class='del'>-	struct mlx5_uars_page	       *uar;</div><div class='add'>+	struct mlx5_sq_bfreg bfreg;</div><div class='ctx'> #ifdef CONFIG_MLX5_SF</div><div class='del'>-	struct mlx5_vhca_state_notifier *vhca_state_notifier;</div><div class='add'>+	struct mlx5_nb vhca_state_nb;</div><div class='add'>+	struct blocking_notifier_head vhca_state_n_head;</div><div class='add'>+	struct notifier_block sf_dev_nb;</div><div class='ctx'> 	struct mlx5_sf_dev_table *sf_dev_table;</div><div class='ctx'> 	struct mlx5_core_dev *parent_mdev;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MLX5_SF_MANAGER</div><div class='add'>+	struct notifier_block sf_hw_table_vhca_nb;</div><div class='ctx'> 	struct mlx5_sf_hw_table *sf_hw_table;</div><div class='add'>+	struct notifier_block sf_table_esw_nb;</div><div class='add'>+	struct notifier_block sf_table_vhca_nb;</div><div class='add'>+	struct notifier_block sf_table_mdev_nb;</div><div class='ctx'> 	struct mlx5_sf_table *sf_table;</div><div class='ctx'> #endif</div><div class='add'>+	struct blocking_notifier_head lag_nh;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum mlx5_device_state {</div><div class='hunk'>@@ -678,12 +664,14 @@ struct mlx5e_resources {</div><div class='ctx'> 		u32                        pdn;</div><div class='ctx'> 		struct mlx5_td             td;</div><div class='ctx'> 		u32			   mkey;</div><div class='del'>-		struct mlx5_sq_bfreg       bfreg;</div><div class='add'>+		struct mlx5_sq_bfreg      *bfregs;</div><div class='add'>+		unsigned int               num_bfregs;</div><div class='ctx'> #define MLX5_MAX_NUM_TC 8</div><div class='ctx'> 		u32                        tisn[MLX5_MAX_PORTS][MLX5_MAX_NUM_TC];</div><div class='ctx'> 		bool			   tisn_valid;</div><div class='ctx'> 	} hw_objs;</div><div class='ctx'> 	struct net_device *uplink_netdev;</div><div class='add'>+	netdevice_tracker tracker;</div><div class='ctx'> 	struct mutex uplink_netdev_lock;</div><div class='ctx'> 	struct mlx5_crypto_dek_priv *dek_priv;</div><div class='ctx'> };</div><div class='hunk'>@@ -703,39 +691,14 @@ struct mlx5_rsvd_gids {</div><div class='ctx'> 	struct ida ida;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MAX_PIN_NUM	8</div><div class='del'>-struct mlx5_pps {</div><div class='del'>-	u8                         pin_caps[MAX_PIN_NUM];</div><div class='del'>-	struct work_struct         out_work;</div><div class='del'>-	u64                        start[MAX_PIN_NUM];</div><div class='del'>-	u8                         enabled;</div><div class='del'>-	u64                        min_npps_period;</div><div class='del'>-	u64                        min_out_pulse_duration_ns;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mlx5_timer {</div><div class='del'>-	struct cyclecounter        cycles;</div><div class='del'>-	struct timecounter         tc;</div><div class='del'>-	u32                        nominal_c_mult;</div><div class='del'>-	unsigned long              overflow_period;</div><div class='del'>-	struct delayed_work        overflow_work;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mlx5_clock {</div><div class='del'>-	struct mlx5_nb             pps_nb;</div><div class='del'>-	seqlock_t                  lock;</div><div class='del'>-	struct hwtstamp_config     hwtstamp_config;</div><div class='del'>-	struct ptp_clock          *ptp;</div><div class='del'>-	struct ptp_clock_info      ptp_info;</div><div class='del'>-	struct mlx5_pps            pps_info;</div><div class='del'>-	struct mlx5_timer          timer;</div><div class='del'>-};</div><div class='del'>-</div><div class='add'>+struct mlx5_clock;</div><div class='add'>+struct mlx5_clock_dev_state;</div><div class='ctx'> struct mlx5_dm;</div><div class='ctx'> struct mlx5_fw_tracer;</div><div class='ctx'> struct mlx5_vxlan;</div><div class='ctx'> struct mlx5_geneve;</div><div class='ctx'> struct mlx5_hv_vhca;</div><div class='add'>+struct mlx5_st;</div><div class='ctx'> </div><div class='ctx'> #define MLX5_LOG_SW_ICM_BLOCK_SIZE(dev) (MLX5_CAP_DEV_MEM(dev, log_sw_icm_alloc_granularity))</div><div class='ctx'> #define MLX5_SW_ICM_BLOCK_SIZE(dev) (1 &lt;&lt; MLX5_LOG_SW_ICM_BLOCK_SIZE(dev))</div><div class='hunk'>@@ -766,6 +729,12 @@ struct mlx5_hca_cap {</div><div class='ctx'> 	u32 max[MLX5_UN_SZ_DW(hca_cap_union)];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mlx5_wc_state {</div><div class='add'>+	MLX5_WC_STATE_UNINITIALIZED,</div><div class='add'>+	MLX5_WC_STATE_UNSUPPORTED,</div><div class='add'>+	MLX5_WC_STATE_SUPPORTED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_core_dev {</div><div class='ctx'> 	struct device *device;</div><div class='ctx'> 	enum mlx5_coredev_type coredev_type;</div><div class='hunk'>@@ -799,6 +768,7 @@ struct mlx5_core_dev {</div><div class='ctx'> 	u32			issi;</div><div class='ctx'> 	struct mlx5e_resources  mlx5e_res;</div><div class='ctx'> 	struct mlx5_dm          *dm;</div><div class='add'>+	struct mlx5_st          *st;</div><div class='ctx'> 	struct mlx5_vxlan       *vxlan;</div><div class='ctx'> 	struct mlx5_geneve      *geneve;</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -808,7 +778,8 @@ struct mlx5_core_dev {</div><div class='ctx'> #ifdef CONFIG_MLX5_FPGA</div><div class='ctx'> 	struct mlx5_fpga_device *fpga;</div><div class='ctx'> #endif</div><div class='del'>-	struct mlx5_clock        clock;</div><div class='add'>+	struct mlx5_clock       *clock;</div><div class='add'>+	struct mlx5_clock_dev_state *clock_state;</div><div class='ctx'> 	struct mlx5_ib_clock_info  *clock_info;</div><div class='ctx'> 	struct mlx5_fw_tracer   *tracer;</div><div class='ctx'> 	struct mlx5_rsc_dump    *rsc_dump;</div><div class='hunk'>@@ -824,6 +795,9 @@ struct mlx5_core_dev {</div><div class='ctx'> #endif</div><div class='ctx'> 	u64 num_ipsec_offloads;</div><div class='ctx'> 	struct mlx5_sd          *sd;</div><div class='add'>+	enum mlx5_wc_state wc_state;</div><div class='add'>+	/* sync write combining state */</div><div class='add'>+	struct mutex wc_state_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_db {</div><div class='hunk'>@@ -836,6 +810,8 @@ struct mlx5_db {</div><div class='ctx'> 	int			index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define MLX5_DEFAULT_NUM_DOORBELLS 8</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_COMP_EQ_SIZE = 1024,</div><div class='ctx'> };</div><div class='hunk'>@@ -849,6 +825,7 @@ typedef void (*mlx5_cmd_cbk_t)(int status, void *context);</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_CMD_ENT_STATE_PENDING_COMP,</div><div class='add'>+	MLX5_CMD_ENT_STATE_TIMEDOUT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_cmd_work_ent {</div><div class='hunk'>@@ -862,6 +839,7 @@ struct mlx5_cmd_work_ent {</div><div class='ctx'> 	void		       *context;</div><div class='ctx'> 	int			idx;</div><div class='ctx'> 	struct completion	handling;</div><div class='add'>+	struct completion	slotted;</div><div class='ctx'> 	struct completion	done;</div><div class='ctx'> 	struct mlx5_cmd        *cmd;</div><div class='ctx'> 	struct work_struct	work;</div><div class='hunk'>@@ -907,6 +885,7 @@ struct mlx5_hca_vport_context {</div><div class='ctx'> 	u16			qkey_violation_counter;</div><div class='ctx'> 	u16			pkey_violation_counter;</div><div class='ctx'> 	bool			grh_required;</div><div class='add'>+	u8			num_plane;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define STRUCT_FIELD(header, field) \</div><div class='hunk'>@@ -1003,6 +982,8 @@ struct mlx5_async_work {</div><div class='ctx'> 	mlx5_async_cbk_t user_callback;</div><div class='ctx'> 	u16 opcode; /* cmd opcode */</div><div class='ctx'> 	u16 op_mod; /* cmd op_mod */</div><div class='add'>+	u8 throttle_locked:1;</div><div class='add'>+	u8 unpriv_locked:1;</div><div class='ctx'> 	void *out; /* pointer to the cmd output buffer */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1033,6 +1014,8 @@ int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,</div><div class='ctx'> int mlx5_cmd_exec_polling(struct mlx5_core_dev *dev, void *in, int in_size,</div><div class='ctx'> 			  void *out, int out_size);</div><div class='ctx'> bool mlx5_cmd_is_down(struct mlx5_core_dev *dev);</div><div class='add'>+int mlx5_cmd_add_privileged_uid(struct mlx5_core_dev *dev, u16 uid);</div><div class='add'>+void mlx5_cmd_remove_privileged_uid(struct mlx5_core_dev *dev, u16 uid);</div><div class='ctx'> </div><div class='ctx'> void mlx5_core_uplink_netdev_set(struct mlx5_core_dev *mdev, struct net_device *netdev);</div><div class='ctx'> void mlx5_core_uplink_netdev_event_replay(struct mlx5_core_dev *mdev);</div><div class='hunk'>@@ -1170,7 +1153,6 @@ bool mlx5_lag_mode_is_hash(struct mlx5_core_dev *dev);</div><div class='ctx'> bool mlx5_lag_is_master(struct mlx5_core_dev *dev);</div><div class='ctx'> bool mlx5_lag_is_shared_fdb(struct mlx5_core_dev *dev);</div><div class='ctx'> bool mlx5_lag_is_mpesw(struct mlx5_core_dev *dev);</div><div class='del'>-struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev);</div><div class='ctx'> u8 mlx5_lag_get_slave_port(struct mlx5_core_dev *dev,</div><div class='ctx'> 			   struct net_device *slave);</div><div class='ctx'> int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,</div><div class='hunk'>@@ -1193,6 +1175,23 @@ int mlx5_dm_sw_icm_alloc(struct mlx5_core_dev *dev, enum mlx5_sw_icm_type type,</div><div class='ctx'> int mlx5_dm_sw_icm_dealloc(struct mlx5_core_dev *dev, enum mlx5_sw_icm_type type,</div><div class='ctx'> 			   u64 length, u16 uid, phys_addr_t addr, u32 obj_id);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCIE_TPH</div><div class='add'>+int mlx5_st_alloc_index(struct mlx5_core_dev *dev, enum tph_mem_type mem_type,</div><div class='add'>+			unsigned int cpu_uid, u16 *st_index);</div><div class='add'>+int mlx5_st_dealloc_index(struct mlx5_core_dev *dev, u16 st_index);</div><div class='add'>+#else</div><div class='add'>+static inline int mlx5_st_alloc_index(struct mlx5_core_dev *dev,</div><div class='add'>+				      enum tph_mem_type mem_type,</div><div class='add'>+				      unsigned int cpu_uid, u16 *st_index)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline int mlx5_st_dealloc_index(struct mlx5_core_dev *dev, u16 st_index)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct mlx5_core_dev *mlx5_vf_get_core_dev(struct pci_dev *pdev);</div><div class='ctx'> void mlx5_vf_put_core_dev(struct mlx5_core_dev *mdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1220,6 +1219,12 @@ static inline bool mlx5_core_is_vf(const struct mlx5_core_dev *dev)</div><div class='ctx'> 	return dev-&gt;coredev_type == MLX5_COREDEV_VF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool mlx5_core_same_coredev_type(const struct mlx5_core_dev *dev1,</div><div class='add'>+					       const struct mlx5_core_dev *dev2)</div><div class='add'>+{</div><div class='add'>+	return dev1-&gt;coredev_type == dev2-&gt;coredev_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool mlx5_core_is_ecpf(const struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dev-&gt;caps.embedded_cpu;</div><div class='hunk'>@@ -1375,10 +1380,13 @@ enum {</div><div class='ctx'> 	MLX5_OCTWORD = 16,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct msi_map mlx5_msix_alloc(struct mlx5_core_dev *dev,</div><div class='del'>-			       irqreturn_t (*handler)(int, void *),</div><div class='del'>-			       const struct irq_affinity_desc *affdesc,</div><div class='del'>-			       const char *name);</div><div class='del'>-void mlx5_msix_free(struct mlx5_core_dev *dev, struct msi_map map);</div><div class='add'>+bool mlx5_wc_support_get(struct mlx5_core_dev *mdev);</div><div class='add'>+</div><div class='add'>+static inline struct net *mlx5_core_net(struct mlx5_core_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return devlink_net(priv_to_devlink(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MLX5_SW_IMAGE_GUID_MAX_BYTES 9</div><div class='ctx'> </div><div class='ctx'> #endif /* MLX5_DRIVER_H */</div><div class='head'>diff --git a/include/linux/mlx5/eswitch.h b/include/linux/mlx5/eswitch.h<br/>index df73a2ccc9af..67256e776566 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/eswitch.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/eswitch.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/eswitch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/eswitch.h</a></div><div class='hunk'>@@ -147,6 +147,8 @@ u32 mlx5_eswitch_get_vport_metadata_for_set(struct mlx5_eswitch *esw,</div><div class='ctx'> </div><div class='ctx'> /* reuse tun_opts for the mapped ipsec obj id when tun_id is 0 (invalid) */</div><div class='ctx'> #define ESW_IPSEC_RX_MAPPED_ID_MASK GENMASK(ESW_TUN_OPTS_BITS - 1, 0)</div><div class='add'>+#define ESW_IPSEC_RX_MAPPED_ID_MATCH_MASK \</div><div class='add'>+	GENMASK(31 - ESW_RESERVED_BITS, ESW_ZONE_ID_BITS)</div><div class='ctx'> </div><div class='ctx'> u8 mlx5_eswitch_mode(const struct mlx5_core_dev *dev);</div><div class='ctx'> u16 mlx5_eswitch_get_total_vports(const struct mlx5_core_dev *dev);</div><div class='head'>diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h<br/>index 3fb428ce7d1c..9cadb1d5e6df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/fs.h</a></div><div class='hunk'>@@ -40,6 +40,9 @@</div><div class='ctx'> </div><div class='ctx'> #define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)</div><div class='ctx'> </div><div class='add'>+#define MLX5_RDMA_TRANSPORT_BYPASS_PRIO 16</div><div class='add'>+#define MLX5_FS_MAX_POOL_SIZE BIT(30)</div><div class='add'>+</div><div class='ctx'> enum mlx5_flow_destination_type {</div><div class='ctx'> 	MLX5_FLOW_DESTINATION_TYPE_NONE,</div><div class='ctx'> 	MLX5_FLOW_DESTINATION_TYPE_VPORT,</div><div class='hunk'>@@ -68,6 +71,7 @@ enum {</div><div class='ctx'> 	MLX5_FLOW_TABLE_UNMANAGED = BIT(3),</div><div class='ctx'> 	MLX5_FLOW_TABLE_OTHER_VPORT = BIT(4),</div><div class='ctx'> 	MLX5_FLOW_TABLE_UPLINK_VPORT = BIT(5),</div><div class='add'>+	MLX5_FLOW_TABLE_OTHER_ESWITCH = BIT(6),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define LEFTOVERS_RULE_NUM	 2</div><div class='hunk'>@@ -108,9 +112,12 @@ enum mlx5_flow_namespace_type {</div><div class='ctx'> 	MLX5_FLOW_NAMESPACE_RDMA_TX_IPSEC,</div><div class='ctx'> 	MLX5_FLOW_NAMESPACE_RDMA_RX_MACSEC,</div><div class='ctx'> 	MLX5_FLOW_NAMESPACE_RDMA_TX_MACSEC,</div><div class='add'>+	MLX5_FLOW_NAMESPACE_RDMA_TRANSPORT_RX,</div><div class='add'>+	MLX5_FLOW_NAMESPACE_RDMA_TRANSPORT_TX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	FDB_DROP_ROOT,</div><div class='ctx'> 	FDB_BYPASS_PATH,</div><div class='ctx'> 	FDB_CRYPTO_INGRESS,</div><div class='ctx'> 	FDB_TC_OFFLOAD,</div><div class='hunk'>@@ -122,6 +129,24 @@ enum {</div><div class='ctx'> 	FDB_PER_VPORT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum fs_flow_table_type {</div><div class='add'>+	FS_FT_NIC_RX          = 0x0,</div><div class='add'>+	FS_FT_NIC_TX          = 0x1,</div><div class='add'>+	FS_FT_ESW_EGRESS_ACL  = 0x2,</div><div class='add'>+	FS_FT_ESW_INGRESS_ACL = 0x3,</div><div class='add'>+	FS_FT_FDB             = 0X4,</div><div class='add'>+	FS_FT_SNIFFER_RX	= 0X5,</div><div class='add'>+	FS_FT_SNIFFER_TX	= 0X6,</div><div class='add'>+	FS_FT_RDMA_RX		= 0X7,</div><div class='add'>+	FS_FT_RDMA_TX		= 0X8,</div><div class='add'>+	FS_FT_PORT_SEL		= 0X9,</div><div class='add'>+	FS_FT_FDB_RX		= 0xa,</div><div class='add'>+	FS_FT_FDB_TX		= 0xb,</div><div class='add'>+	FS_FT_RDMA_TRANSPORT_RX	= 0xd,</div><div class='add'>+	FS_FT_RDMA_TRANSPORT_TX	= 0xe,</div><div class='add'>+	FS_FT_MAX_TYPE = FS_FT_RDMA_TRANSPORT_TX,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_pkt_reformat;</div><div class='ctx'> struct mlx5_modify_hdr;</div><div class='ctx'> struct mlx5_flow_definer;</div><div class='hunk'>@@ -163,7 +188,7 @@ struct mlx5_flow_destination {</div><div class='ctx'> 		u32			tir_num;</div><div class='ctx'> 		u32			ft_num;</div><div class='ctx'> 		struct mlx5_flow_table	*ft;</div><div class='del'>-		u32			counter_id;</div><div class='add'>+		struct mlx5_fc          *counter;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u16		num;</div><div class='ctx'> 			u16		vhca_id;</div><div class='hunk'>@@ -192,9 +217,9 @@ struct mlx5_flow_namespace *</div><div class='ctx'> mlx5_get_flow_namespace(struct mlx5_core_dev *dev,</div><div class='ctx'> 			enum mlx5_flow_namespace_type type);</div><div class='ctx'> struct mlx5_flow_namespace *</div><div class='del'>-mlx5_get_flow_vport_acl_namespace(struct mlx5_core_dev *dev,</div><div class='del'>-				  enum mlx5_flow_namespace_type type,</div><div class='del'>-				  int vport);</div><div class='add'>+mlx5_get_flow_vport_namespace(struct mlx5_core_dev *dev,</div><div class='add'>+			      enum mlx5_flow_namespace_type type,</div><div class='add'>+			      int vport_idx);</div><div class='ctx'> </div><div class='ctx'> struct mlx5_flow_table_attr {</div><div class='ctx'> 	int prio;</div><div class='hunk'>@@ -202,6 +227,8 @@ struct mlx5_flow_table_attr {</div><div class='ctx'> 	u32 level;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	u16 uid;</div><div class='add'>+	u16 vport;</div><div class='add'>+	u16 esw_owner_vhca_id;</div><div class='ctx'> 	struct mlx5_flow_table *next_ft;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -238,6 +265,7 @@ void mlx5_destroy_flow_group(struct mlx5_flow_group *fg);</div><div class='ctx'> </div><div class='ctx'> struct mlx5_exe_aso {</div><div class='ctx'> 	u32 object_id;</div><div class='add'>+	int base_id;</div><div class='ctx'> 	u8 type;</div><div class='ctx'> 	u8 return_reg_id;</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -298,10 +326,11 @@ int mlx5_modify_rule_destination(struct mlx5_flow_handle *handler,</div><div class='ctx'> </div><div class='ctx'> struct mlx5_fc *mlx5_fc_create(struct mlx5_core_dev *dev, bool aging);</div><div class='ctx'> </div><div class='del'>-/* As mlx5_fc_create() but doesn't queue stats refresh thread. */</div><div class='del'>-struct mlx5_fc *mlx5_fc_create_ex(struct mlx5_core_dev *dev, bool aging);</div><div class='del'>-</div><div class='ctx'> void mlx5_fc_destroy(struct mlx5_core_dev *dev, struct mlx5_fc *counter);</div><div class='add'>+struct mlx5_fc *mlx5_fc_local_create(u32 counter_id, u32 offset, u32 bulk_size);</div><div class='add'>+void mlx5_fc_local_destroy(struct mlx5_fc *counter);</div><div class='add'>+void mlx5_fc_local_get(struct mlx5_fc *counter);</div><div class='add'>+void mlx5_fc_local_put(struct mlx5_fc *counter);</div><div class='ctx'> u64 mlx5_fc_query_lastuse(struct mlx5_fc *counter);</div><div class='ctx'> void mlx5_fc_query_cached(struct mlx5_fc *counter,</div><div class='ctx'> 			  u64 *bytes, u64 *packets, u64 *lastuse);</div><div class='hunk'>@@ -342,4 +371,11 @@ void mlx5_packet_reformat_dealloc(struct mlx5_core_dev *dev,</div><div class='ctx'> 				  struct mlx5_pkt_reformat *reformat);</div><div class='ctx'> </div><div class='ctx'> u32 mlx5_flow_table_id(struct mlx5_flow_table *ft);</div><div class='add'>+</div><div class='add'>+struct mlx5_flow_root_namespace *</div><div class='add'>+mlx5_get_root_namespace(struct mlx5_core_dev *dev, enum mlx5_flow_namespace_type ns_type);</div><div class='add'>+</div><div class='add'>+int mlx5_fs_set_root_dev(struct mlx5_core_dev *dev,</div><div class='add'>+			 struct mlx5_core_dev *new_dev,</div><div class='add'>+			 enum fs_flow_table_type table_type);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h<br/>index 49f660563e49..e9dcd4bf355d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/mlx5_ifc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/mlx5_ifc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/mlx5_ifc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/mlx5_ifc.h</a></div><div class='hunk'>@@ -80,23 +80,15 @@ enum {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_OBJ_TYPE_SW_ICM = 0x0008,</div><div class='del'>-	MLX5_OBJ_TYPE_HEADER_MODIFY_ARGUMENT  = 0x23,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MLX5_GENERAL_OBJ_TYPES_CAP_SW_ICM = (1ULL &lt;&lt; MLX5_OBJ_TYPE_SW_ICM),</div><div class='del'>-	MLX5_GENERAL_OBJ_TYPES_CAP_GENEVE_TLV_OPT = (1ULL &lt;&lt; 11),</div><div class='del'>-	MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q = (1ULL &lt;&lt; 13),</div><div class='del'>-	MLX5_GENERAL_OBJ_TYPES_CAP_HEADER_MODIFY_ARGUMENT =</div><div class='del'>-		(1ULL &lt;&lt; MLX5_OBJ_TYPE_HEADER_MODIFY_ARGUMENT),</div><div class='del'>-	MLX5_GENERAL_OBJ_TYPES_CAP_MACSEC_OFFLOAD = (1ULL &lt;&lt; 39),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='ctx'> 	MLX5_OBJ_TYPE_GENEVE_TLV_OPT = 0x000b,</div><div class='ctx'> 	MLX5_OBJ_TYPE_VIRTIO_NET_Q = 0x000d,</div><div class='ctx'> 	MLX5_OBJ_TYPE_VIRTIO_Q_COUNTERS = 0x001c,</div><div class='ctx'> 	MLX5_OBJ_TYPE_MATCH_DEFINER = 0x0018,</div><div class='add'>+	MLX5_OBJ_TYPE_HEADER_MODIFY_ARGUMENT  = 0x23,</div><div class='add'>+	MLX5_OBJ_TYPE_STC = 0x0040,</div><div class='add'>+	MLX5_OBJ_TYPE_RTC = 0x0041,</div><div class='add'>+	MLX5_OBJ_TYPE_STE = 0x0042,</div><div class='add'>+	MLX5_OBJ_TYPE_MODIFY_HDR_PATTERN = 0x0043,</div><div class='ctx'> 	MLX5_OBJ_TYPE_PAGE_TRACK = 0x46,</div><div class='ctx'> 	MLX5_OBJ_TYPE_MKEY = 0xff01,</div><div class='ctx'> 	MLX5_OBJ_TYPE_QP = 0xff02,</div><div class='hunk'>@@ -112,6 +104,16 @@ enum {</div><div class='ctx'> 	MLX5_OBJ_TYPE_RQT = 0xff0e,</div><div class='ctx'> 	MLX5_OBJ_TYPE_FLOW_COUNTER = 0xff0f,</div><div class='ctx'> 	MLX5_OBJ_TYPE_CQ = 0xff10,</div><div class='add'>+	MLX5_OBJ_TYPE_FT_ALIAS = 0xff15,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MLX5_GENERAL_OBJ_TYPES_CAP_SW_ICM = (1ULL &lt;&lt; MLX5_OBJ_TYPE_SW_ICM),</div><div class='add'>+	MLX5_GENERAL_OBJ_TYPES_CAP_GENEVE_TLV_OPT = (1ULL &lt;&lt; 11),</div><div class='add'>+	MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q = (1ULL &lt;&lt; 13),</div><div class='add'>+	MLX5_GENERAL_OBJ_TYPES_CAP_HEADER_MODIFY_ARGUMENT =</div><div class='add'>+		(1ULL &lt;&lt; MLX5_OBJ_TYPE_HEADER_MODIFY_ARGUMENT),</div><div class='add'>+	MLX5_GENERAL_OBJ_TYPES_CAP_MACSEC_OFFLOAD = (1ULL &lt;&lt; 39),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -187,6 +189,9 @@ enum {</div><div class='ctx'> 	MLX5_CMD_OP_QUERY_XRQ_ERROR_PARAMS        = 0x727,</div><div class='ctx'> 	MLX5_CMD_OP_RELEASE_XRQ_ERROR             = 0x729,</div><div class='ctx'> 	MLX5_CMD_OP_MODIFY_XRQ                    = 0x72a,</div><div class='add'>+	MLX5_CMD_OPCODE_QUERY_DELEGATED_VHCA      = 0x732,</div><div class='add'>+	MLX5_CMD_OPCODE_CREATE_ESW_VPORT          = 0x733,</div><div class='add'>+	MLX5_CMD_OPCODE_DESTROY_ESW_VPORT         = 0x734,</div><div class='ctx'> 	MLX5_CMD_OP_QUERY_ESW_FUNCTIONS           = 0x740,</div><div class='ctx'> 	MLX5_CMD_OP_QUERY_VPORT_STATE             = 0x750,</div><div class='ctx'> 	MLX5_CMD_OP_MODIFY_VPORT_STATE            = 0x751,</div><div class='hunk'>@@ -309,10 +314,14 @@ enum {</div><div class='ctx'> 	MLX5_CMD_OP_CREATE_UMEM                   = 0xa08,</div><div class='ctx'> 	MLX5_CMD_OP_DESTROY_UMEM                  = 0xa0a,</div><div class='ctx'> 	MLX5_CMD_OP_SYNC_STEERING                 = 0xb00,</div><div class='add'>+	MLX5_CMD_OP_PSP_GEN_SPI                   = 0xb10,</div><div class='add'>+	MLX5_CMD_OP_PSP_ROTATE_KEY                = 0xb11,</div><div class='ctx'> 	MLX5_CMD_OP_QUERY_VHCA_STATE              = 0xb0d,</div><div class='ctx'> 	MLX5_CMD_OP_MODIFY_VHCA_STATE             = 0xb0e,</div><div class='ctx'> 	MLX5_CMD_OP_SYNC_CRYPTO                   = 0xb12,</div><div class='ctx'> 	MLX5_CMD_OP_ALLOW_OTHER_VHCA_ACCESS       = 0xb16,</div><div class='add'>+	MLX5_CMD_OP_GENERATE_WQE                  = 0xb17,</div><div class='add'>+	MLX5_CMD_OPCODE_QUERY_VUID                = 0xb22,</div><div class='ctx'> 	MLX5_CMD_OP_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -416,13 +425,21 @@ struct mlx5_ifc_flow_table_fields_supported_bits {</div><div class='ctx'> </div><div class='ctx'> /* Table 2170 - Flow Table Fields Supported 2 Format */</div><div class='ctx'> struct mlx5_ifc_flow_table_fields_supported_2_bits {</div><div class='del'>-	u8         reserved_at_0[0xe];</div><div class='add'>+	u8         inner_l4_type_ext[0x1];</div><div class='add'>+	u8         outer_l4_type_ext[0x1];</div><div class='add'>+	u8         inner_l4_type[0x1];</div><div class='add'>+	u8         outer_l4_type[0x1];</div><div class='add'>+	u8         reserved_at_4[0xa];</div><div class='ctx'> 	u8         bth_opcode[0x1];</div><div class='ctx'> 	u8         reserved_at_f[0x1];</div><div class='ctx'> 	u8         tunnel_header_0_1[0x1];</div><div class='ctx'> 	u8         reserved_at_11[0xf];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_20[0x60];</div><div class='add'>+	u8         reserved_at_20[0xf];</div><div class='add'>+	u8         ipsec_next_header[0x1];</div><div class='add'>+	u8         reserved_at_30[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x40];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_flow_table_prop_layout_bits {</div><div class='hunk'>@@ -474,15 +491,23 @@ struct mlx5_ifc_flow_table_prop_layout_bits {</div><div class='ctx'> 	u8         execute_aso[0x1];</div><div class='ctx'> 	u8         reserved_at_47[0x19];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_60[0x2];</div><div class='add'>+	u8         reformat_l2_to_l3_psp_tunnel[0x1];</div><div class='add'>+	u8         reformat_l3_psp_tunnel_to_l2[0x1];</div><div class='ctx'> 	u8         reformat_insert[0x1];</div><div class='ctx'> 	u8         reformat_remove[0x1];</div><div class='ctx'> 	u8         macsec_encrypt[0x1];</div><div class='ctx'> 	u8         macsec_decrypt[0x1];</div><div class='del'>-	u8         reserved_at_66[0x2];</div><div class='add'>+	u8         psp_encrypt[0x1];</div><div class='add'>+	u8         psp_decrypt[0x1];</div><div class='ctx'> 	u8         reformat_add_macsec[0x1];</div><div class='ctx'> 	u8         reformat_remove_macsec[0x1];</div><div class='del'>-	u8         reserved_at_6a[0xe];</div><div class='add'>+	u8         reparse[0x1];</div><div class='add'>+	u8         reserved_at_6b[0x1];</div><div class='add'>+	u8         cross_vhca_object[0x1];</div><div class='add'>+	u8         reformat_l2_to_l3_audp_tunnel[0x1];</div><div class='add'>+	u8         reformat_l3_audp_tunnel_to_l2[0x1];</div><div class='add'>+	u8         ignore_flow_level_rtc_valid[0x1];</div><div class='add'>+	u8         reserved_at_70[0x8];</div><div class='ctx'> 	u8         log_max_ft_num[0x8];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_80[0x10];</div><div class='hunk'>@@ -519,12 +544,33 @@ struct mlx5_ifc_ipv6_layout_bits {</div><div class='ctx'> 	u8         ipv6[16][0x8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_ipv6_simple_layout_bits {</div><div class='add'>+	u8         ipv6_127_96[0x20];</div><div class='add'>+	u8         ipv6_95_64[0x20];</div><div class='add'>+	u8         ipv6_63_32[0x20];</div><div class='add'>+	u8         ipv6_31_0[0x20];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> union mlx5_ifc_ipv6_layout_ipv4_layout_auto_bits {</div><div class='add'>+	struct mlx5_ifc_ipv6_simple_layout_bits ipv6_simple_layout;</div><div class='ctx'> 	struct mlx5_ifc_ipv6_layout_bits ipv6_layout;</div><div class='ctx'> 	struct mlx5_ifc_ipv4_layout_bits ipv4_layout;</div><div class='ctx'> 	u8         reserved_at_0[0x80];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	MLX5_PACKET_L4_TYPE_NONE,</div><div class='add'>+	MLX5_PACKET_L4_TYPE_TCP,</div><div class='add'>+	MLX5_PACKET_L4_TYPE_UDP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MLX5_PACKET_L4_TYPE_EXT_NONE,</div><div class='add'>+	MLX5_PACKET_L4_TYPE_EXT_TCP,</div><div class='add'>+	MLX5_PACKET_L4_TYPE_EXT_UDP,</div><div class='add'>+	MLX5_PACKET_L4_TYPE_EXT_ICMP,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_fte_match_set_lyr_2_4_bits {</div><div class='ctx'> 	u8         smac_47_16[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -550,10 +596,11 @@ struct mlx5_ifc_fte_match_set_lyr_2_4_bits {</div><div class='ctx'> 	u8         tcp_sport[0x10];</div><div class='ctx'> 	u8         tcp_dport[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_c0[0x10];</div><div class='add'>+	u8         l4_type[0x2];</div><div class='add'>+	u8         l4_type_ext[0x4];</div><div class='add'>+	u8         reserved_at_c6[0xa];</div><div class='ctx'> 	u8         ipv4_ihl[0x4];</div><div class='del'>-	u8         reserved_at_c4[0x4];</div><div class='del'>-</div><div class='add'>+	u8         reserved_at_d4[0x4];</div><div class='ctx'> 	u8         ttl_hoplimit[0x8];</div><div class='ctx'> </div><div class='ctx'> 	u8         udp_sport[0x10];</div><div class='hunk'>@@ -660,11 +707,10 @@ struct mlx5_ifc_fte_match_set_misc2_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         metadata_reg_a[0x20];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_1a0[0x8];</div><div class='del'>-</div><div class='add'>+	u8         psp_syndrome[0x8];</div><div class='ctx'> 	u8         macsec_syndrome[0x8];</div><div class='ctx'> 	u8         ipsec_syndrome[0x8];</div><div class='del'>-	u8         reserved_at_1b8[0x8];</div><div class='add'>+	u8         ipsec_next_header[0x8];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_1c0[0x40];</div><div class='ctx'> };</div><div class='hunk'>@@ -783,7 +829,7 @@ struct mlx5_ifc_ads_bits {</div><div class='ctx'> 	u8         reserved_at_2[0xe];</div><div class='ctx'> 	u8         pkey_index[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_20[0x8];</div><div class='add'>+	u8         plane_index[0x8];</div><div class='ctx'> 	u8         grh[0x1];</div><div class='ctx'> 	u8         mlid[0x7];</div><div class='ctx'> 	u8         rlid[0x10];</div><div class='hunk'>@@ -846,7 +892,11 @@ struct mlx5_ifc_flow_table_nic_cap_bits {</div><div class='ctx'> </div><div class='ctx'> 	struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_sniffer;</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_e00[0x700];</div><div class='add'>+	u8         reserved_at_e00[0x600];</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_flow_table_fields_supported_2_bits ft_field_support_2_nic_receive;</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_1480[0x80];</div><div class='ctx'> </div><div class='ctx'> 	struct mlx5_ifc_flow_table_fields_supported_2_bits ft_field_support_2_nic_receive_rdma;</div><div class='ctx'> </div><div class='hunk'>@@ -876,7 +926,9 @@ struct mlx5_ifc_port_selection_cap_bits {</div><div class='ctx'> </div><div class='ctx'> 	struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_port_selection;</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_400[0x7c00];</div><div class='add'>+	struct mlx5_ifc_flow_table_fields_supported_2_bits ft_field_support_2_port_selection;</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_480[0x7b80];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -895,7 +947,9 @@ struct mlx5_ifc_flow_table_eswitch_cap_bits {</div><div class='ctx'> 	u8      reserved_at_8[0x5];</div><div class='ctx'> 	u8      fdb_uplink_hairpin[0x1];</div><div class='ctx'> 	u8      fdb_multi_path_any_table_limit_regc[0x1];</div><div class='del'>-	u8      reserved_at_f[0x3];</div><div class='add'>+	u8      reserved_at_f[0x1];</div><div class='add'>+	u8      fdb_dynamic_tunnel[0x1];</div><div class='add'>+	u8      reserved_at_11[0x1];</div><div class='ctx'> 	u8      fdb_multi_path_any_table[0x1];</div><div class='ctx'> 	u8      reserved_at_13[0x2];</div><div class='ctx'> 	u8      fdb_modify_header_fwd_to_table[0x1];</div><div class='hunk'>@@ -934,6 +988,73 @@ struct mlx5_ifc_flow_table_eswitch_cap_bits {</div><div class='ctx'> 	u8      reserved_at_1900[0x6700];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_wqe_based_flow_table_cap_bits {</div><div class='add'>+	u8         reserved_at_0[0x3];</div><div class='add'>+	u8         log_max_num_ste[0x5];</div><div class='add'>+	u8         reserved_at_8[0x3];</div><div class='add'>+	u8         log_max_num_stc[0x5];</div><div class='add'>+	u8         reserved_at_10[0x3];</div><div class='add'>+	u8         log_max_num_rtc[0x5];</div><div class='add'>+	u8         reserved_at_18[0x3];</div><div class='add'>+	u8         log_max_num_header_modify_pattern[0x5];</div><div class='add'>+</div><div class='add'>+	u8         rtc_hash_split_table[0x1];</div><div class='add'>+	u8         rtc_linear_lookup_table[0x1];</div><div class='add'>+	u8         reserved_at_22[0x1];</div><div class='add'>+	u8         stc_alloc_log_granularity[0x5];</div><div class='add'>+	u8         reserved_at_28[0x3];</div><div class='add'>+	u8         stc_alloc_log_max[0x5];</div><div class='add'>+	u8         reserved_at_30[0x3];</div><div class='add'>+	u8         ste_alloc_log_granularity[0x5];</div><div class='add'>+	u8         reserved_at_38[0x3];</div><div class='add'>+	u8         ste_alloc_log_max[0x5];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0xb];</div><div class='add'>+	u8         rtc_reparse_mode[0x5];</div><div class='add'>+	u8         reserved_at_50[0x3];</div><div class='add'>+	u8         rtc_index_mode[0x5];</div><div class='add'>+	u8         reserved_at_58[0x3];</div><div class='add'>+	u8         rtc_log_depth_max[0x5];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_60[0x10];</div><div class='add'>+	u8         ste_format[0x10];</div><div class='add'>+</div><div class='add'>+	u8         stc_action_type[0x80];</div><div class='add'>+</div><div class='add'>+	u8         header_insert_type[0x10];</div><div class='add'>+	u8         header_remove_type[0x10];</div><div class='add'>+</div><div class='add'>+	u8         trivial_match_definer[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_140[0x1b];</div><div class='add'>+	u8         rtc_max_num_hash_definer_gen_wqe[0x5];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_160[0x18];</div><div class='add'>+	u8         access_index_mode[0x8];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_180[0x10];</div><div class='add'>+	u8         ste_format_gen_wqe[0x10];</div><div class='add'>+</div><div class='add'>+	u8         linear_match_definer_reg_c3[0x20];</div><div class='add'>+</div><div class='add'>+	u8         fdb_jump_to_tir_stc[0x1];</div><div class='add'>+	u8         reserved_at_1c1[0x1f];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_esw_cap_bits {</div><div class='add'>+	u8         reserved_at_0[0x1d];</div><div class='add'>+	u8         merged_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_1e[0x2];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x40];</div><div class='add'>+</div><div class='add'>+	u8         esw_manager_vport_number_valid[0x1];</div><div class='add'>+	u8         reserved_at_61[0xf];</div><div class='add'>+	u8         esw_manager_vport_number[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_80[0x780];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_COUNTER_SOURCE_ESWITCH = 0x0,</div><div class='ctx'> 	MLX5_COUNTER_FLOW_ESWITCH   = 0x1,</div><div class='hunk'>@@ -992,7 +1113,9 @@ struct mlx5_ifc_qos_cap_bits {</div><div class='ctx'> 	u8         log_esw_max_sched_depth[0x4];</div><div class='ctx'> 	u8         reserved_at_10[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_20[0xb];</div><div class='add'>+	u8         reserved_at_20[0x9];</div><div class='add'>+	u8         esw_cross_esw_sched[0x1];</div><div class='add'>+	u8         reserved_at_2a[0x1];</div><div class='ctx'> 	u8         log_max_qos_nic_queue_group[0x5];</div><div class='ctx'> 	u8         reserved_at_30[0x10];</div><div class='ctx'> </div><div class='hunk'>@@ -1000,7 +1123,8 @@ struct mlx5_ifc_qos_cap_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         packet_pacing_min_rate[0x20];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_80[0x10];</div><div class='add'>+	u8         reserved_at_80[0xb];</div><div class='add'>+	u8         log_esw_max_rate_limit[0x5];</div><div class='ctx'> 	u8         packet_pacing_rate_table_size[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         esw_element_type[0x10];</div><div class='hunk'>@@ -1011,7 +1135,8 @@ struct mlx5_ifc_qos_cap_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         max_tsar_bw_share[0x20];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_100[0x20];</div><div class='add'>+	u8         nic_element_type[0x10];</div><div class='add'>+	u8         nic_tsar_type[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_120[0x3];</div><div class='ctx'> 	u8         log_meter_aso_granularity[0x5];</div><div class='hunk'>@@ -1077,7 +1202,8 @@ struct mlx5_ifc_per_protocol_networking_offload_caps_bits {</div><div class='ctx'> 	u8         tunnel_stateless_ip_over_ip_tx[0x1];</div><div class='ctx'> 	u8         reserved_at_2e[0x2];</div><div class='ctx'> 	u8         max_vxlan_udp_ports[0x8];</div><div class='del'>-	u8         reserved_at_38[0x6];</div><div class='add'>+	u8         swp_csum_l4_partial[0x1];</div><div class='add'>+	u8         reserved_at_39[0x5];</div><div class='ctx'> 	u8         max_geneve_opt_len[0x1];</div><div class='ctx'> 	u8         tunnel_stateless_geneve_rx[0x1];</div><div class='ctx'> </div><div class='hunk'>@@ -1308,11 +1434,13 @@ struct mlx5_ifc_atomic_caps_bits {</div><div class='ctx'> 	u8         reserved_at_e0[0x720];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mlx5_ifc_odp_cap_bits {</div><div class='add'>+struct mlx5_ifc_odp_scheme_cap_bits {</div><div class='ctx'> 	u8         reserved_at_0[0x40];</div><div class='ctx'> </div><div class='ctx'> 	u8         sig[0x1];</div><div class='del'>-	u8         reserved_at_41[0x1f];</div><div class='add'>+	u8         reserved_at_41[0x4];</div><div class='add'>+	u8         page_prefetch[0x1];</div><div class='add'>+	u8         reserved_at_46[0x1a];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -1326,7 +1454,20 @@ struct mlx5_ifc_odp_cap_bits {</div><div class='ctx'> </div><div class='ctx'> 	struct mlx5_ifc_odp_per_transport_service_cap_bits dc_odp_caps;</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_120[0x6E0];</div><div class='add'>+	u8         reserved_at_120[0xe0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_odp_cap_bits {</div><div class='add'>+	struct mlx5_ifc_odp_scheme_cap_bits transport_page_fault_scheme_cap;</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_odp_scheme_cap_bits memory_page_fault_scheme_cap;</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_400[0x200];</div><div class='add'>+</div><div class='add'>+	u8         mem_page_fault[0x1];</div><div class='add'>+	u8         reserved_at_601[0x1f];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_620[0x1e0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_tls_cap_bits {</div><div class='hunk'>@@ -1374,6 +1515,21 @@ struct mlx5_ifc_macsec_cap_bits {</div><div class='ctx'> 	u8    reserved_at_40[0x7c0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_psp_cap_bits {</div><div class='add'>+	u8         reserved_at_0[0x1];</div><div class='add'>+	u8         psp_crypto_offload[0x1];</div><div class='add'>+	u8         reserved_at_2[0x1];</div><div class='add'>+	u8         psp_crypto_esp_aes_gcm_256_encrypt[0x1];</div><div class='add'>+	u8         psp_crypto_esp_aes_gcm_128_encrypt[0x1];</div><div class='add'>+	u8         psp_crypto_esp_aes_gcm_256_decrypt[0x1];</div><div class='add'>+	u8         psp_crypto_esp_aes_gcm_128_decrypt[0x1];</div><div class='add'>+	u8         reserved_at_7[0x4];</div><div class='add'>+	u8         log_max_num_of_psp_spi[0x5];</div><div class='add'>+	u8         reserved_at_10[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x7e0];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_WQ_TYPE_LINKED_LIST  = 0x0,</div><div class='ctx'> 	MLX5_WQ_TYPE_CYCLIC       = 0x1,</div><div class='hunk'>@@ -1426,9 +1582,13 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	MLX5_FLEX_IPV4_OVER_VXLAN_ENABLED	= 1 &lt;&lt; 0,</div><div class='add'>+	MLX5_FLEX_IPV6_OVER_VXLAN_ENABLED	= 1 &lt;&lt; 1,</div><div class='add'>+	MLX5_FLEX_IPV6_OVER_IP_ENABLED		= 1 &lt;&lt; 2,</div><div class='ctx'> 	MLX5_FLEX_PARSER_GENEVE_ENABLED		= 1 &lt;&lt; 3,</div><div class='ctx'> 	MLX5_FLEX_PARSER_MPLS_OVER_GRE_ENABLED	= 1 &lt;&lt; 4,</div><div class='ctx'> 	MLX5_FLEX_PARSER_MPLS_OVER_UDP_ENABLED	= 1 &lt;&lt; 5,</div><div class='add'>+	MLX5_FLEX_P_BIT_VXLAN_GPE_ENABLED	= 1 &lt;&lt; 6,</div><div class='ctx'> 	MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED	= 1 &lt;&lt; 7,</div><div class='ctx'> 	MLX5_FLEX_PARSER_ICMP_V4_ENABLED	= 1 &lt;&lt; 8,</div><div class='ctx'> 	MLX5_FLEX_PARSER_ICMP_V6_ENABLED	= 1 &lt;&lt; 9,</div><div class='hunk'>@@ -1443,6 +1603,8 @@ enum {</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_UCTX_CAP_RAW_TX = 1UL &lt;&lt; 0,</div><div class='ctx'> 	MLX5_UCTX_CAP_INTERNAL_DEV_RES = 1UL &lt;&lt; 1,</div><div class='add'>+	MLX5_UCTX_CAP_RDMA_CTRL = 1UL &lt;&lt; 3,</div><div class='add'>+	MLX5_UCTX_CAP_RDMA_CTRL_OTHER_VHCA = 1UL &lt;&lt; 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MLX5_FC_BULK_SIZE_FACTOR 128</div><div class='hunk'>@@ -1466,10 +1628,14 @@ enum {</div><div class='ctx'> 	MLX5_STEERING_FORMAT_CONNECTX_5   = 0,</div><div class='ctx'> 	MLX5_STEERING_FORMAT_CONNECTX_6DX = 1,</div><div class='ctx'> 	MLX5_STEERING_FORMAT_CONNECTX_7   = 2,</div><div class='add'>+	MLX5_STEERING_FORMAT_CONNECTX_8   = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='del'>-	u8         reserved_at_0[0x10];</div><div class='add'>+	u8         reserved_at_0[0x6];</div><div class='add'>+	u8         page_request_disable[0x1];</div><div class='add'>+	u8         abs_native_port_num[0x1];</div><div class='add'>+	u8         reserved_at_8[0x8];</div><div class='ctx'> 	u8         shared_object_to_user_object_allowed[0x1];</div><div class='ctx'> 	u8         reserved_at_13[0xe];</div><div class='ctx'> 	u8         vhca_resource_manager[0x1];</div><div class='hunk'>@@ -1508,8 +1674,7 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8         ts_cqe_to_dest_cqn[0x1];</div><div class='ctx'> 	u8         reserved_at_b3[0x6];</div><div class='ctx'> 	u8         go_back_n[0x1];</div><div class='del'>-	u8         shampo[0x1];</div><div class='del'>-	u8         reserved_at_bb[0x5];</div><div class='add'>+	u8         reserved_at_ba[0x6];</div><div class='ctx'> </div><div class='ctx'> 	u8         max_sgl_for_optimized_performance[0x8];</div><div class='ctx'> 	u8         log_max_cq_sz[0x8];</div><div class='hunk'>@@ -1632,7 +1797,8 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8         pci_sync_for_fw_update_event[0x1];</div><div class='ctx'> 	u8         reserved_at_1f2[0x6];</div><div class='ctx'> 	u8         init2_lag_tx_port_affinity[0x1];</div><div class='del'>-	u8         reserved_at_1fa[0x3];</div><div class='add'>+	u8         reserved_at_1fa[0x2];</div><div class='add'>+	u8         wqe_based_flow_table_update_cap[0x1];</div><div class='ctx'> 	u8         cqe_version[0x4];</div><div class='ctx'> </div><div class='ctx'> 	u8         compact_address_vector[0x1];</div><div class='hunk'>@@ -1668,7 +1834,8 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8         cq_oi[0x1];</div><div class='ctx'> 	u8         cq_resize[0x1];</div><div class='ctx'> 	u8         cq_moderation[0x1];</div><div class='del'>-	u8         reserved_at_223[0x3];</div><div class='add'>+	u8         cq_period_mode_modify[0x1];</div><div class='add'>+	u8         reserved_at_224[0x2];</div><div class='ctx'> 	u8         cq_eq_remap[0x1];</div><div class='ctx'> 	u8         pg[0x1];</div><div class='ctx'> 	u8         block_lb_mc[0x1];</div><div class='hunk'>@@ -1698,7 +1865,7 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8         regexp_params[0x1];</div><div class='ctx'> 	u8         uar_sz[0x6];</div><div class='ctx'> 	u8         port_selection_cap[0x1];</div><div class='del'>-	u8         reserved_at_251[0x1];</div><div class='add'>+	u8         nic_cap_reg[0x1];</div><div class='ctx'> 	u8         umem_uid_0[0x1];</div><div class='ctx'> 	u8         reserved_at_253[0x5];</div><div class='ctx'> 	u8         log_pg_sz[0x8];</div><div class='hunk'>@@ -1712,7 +1879,8 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         log_bf_reg_size[0x5];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_270[0x3];</div><div class='add'>+	u8         disciplined_fr_counter[0x1];</div><div class='add'>+	u8         reserved_at_271[0x2];</div><div class='ctx'> 	u8	   qp_error_syndrome[0x1];</div><div class='ctx'> 	u8	   reserved_at_274[0x2];</div><div class='ctx'> 	u8         lag_dct[0x2];</div><div class='hunk'>@@ -1725,7 +1893,14 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8         reserved_at_280[0x10];</div><div class='ctx'> 	u8         max_wqe_sz_sq[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_2a0[0x10];</div><div class='add'>+	u8         reserved_at_2a0[0x7];</div><div class='add'>+	u8         mkey_pcie_tph[0x1];</div><div class='add'>+	u8         reserved_at_2a8[0x1];</div><div class='add'>+	u8         tis_tir_td_order[0x1];</div><div class='add'>+</div><div class='add'>+	u8         psp[0x1];</div><div class='add'>+	u8         shampo[0x1];</div><div class='add'>+	u8         reserved_at_2ac[0x4];</div><div class='ctx'> 	u8         max_wqe_sz_rq[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         max_flow_counter_31_16[0x10];</div><div class='hunk'>@@ -1743,7 +1918,12 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8         reserved_at_328[0x2];</div><div class='ctx'> 	u8	   relaxed_ordering_read[0x1];</div><div class='ctx'> 	u8         log_max_pd[0x5];</div><div class='del'>-	u8         reserved_at_330[0x6];</div><div class='add'>+	u8         dp_ordering_ooo_all_ud[0x1];</div><div class='add'>+	u8         dp_ordering_ooo_all_uc[0x1];</div><div class='add'>+	u8         dp_ordering_ooo_all_xrc[0x1];</div><div class='add'>+	u8         dp_ordering_ooo_all_dc[0x1];</div><div class='add'>+	u8         dp_ordering_ooo_all_rc[0x1];</div><div class='add'>+	u8         pcie_reset_using_hotreset_method[0x1];</div><div class='ctx'> 	u8         pci_sync_for_fw_update_with_driver_unload[0x1];</div><div class='ctx'> 	u8         vnic_env_cnt_steering_fail[0x1];</div><div class='ctx'> 	u8         vport_counter_local_loopback[0x1];</div><div class='hunk'>@@ -1779,7 +1959,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8         log_max_rqt[0x5];</div><div class='ctx'> 	u8         reserved_at_390[0x3];</div><div class='ctx'> 	u8         log_max_rqt_size[0x5];</div><div class='del'>-	u8         reserved_at_398[0x3];</div><div class='add'>+	u8         reserved_at_398[0x1];</div><div class='add'>+	u8	   vnic_env_cnt_bar_uar_access[0x1];</div><div class='add'>+	u8	   vnic_env_cnt_odp_page_fault[0x1];</div><div class='ctx'> 	u8         log_max_tis_per_sq[0x5];</div><div class='ctx'> </div><div class='ctx'> 	u8         ext_stride_num_range[0x1];</div><div class='hunk'>@@ -1852,7 +2034,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8         max_geneve_tlv_options[0x8];</div><div class='ctx'> 	u8         reserved_at_568[0x3];</div><div class='ctx'> 	u8         max_geneve_tlv_option_data_len[0x5];</div><div class='del'>-	u8         reserved_at_570[0x9];</div><div class='add'>+	u8         reserved_at_570[0x1];</div><div class='add'>+	u8         adv_rdma[0x1];</div><div class='add'>+	u8         reserved_at_572[0x7];</div><div class='ctx'> 	u8         adv_virtualization[0x1];</div><div class='ctx'> 	u8         reserved_at_57a[0x6];</div><div class='ctx'> </div><div class='hunk'>@@ -1864,7 +2048,8 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_5a0[0x10];</div><div class='ctx'> 	u8         enhanced_cqe_compression[0x1];</div><div class='del'>-	u8         reserved_at_5b1[0x2];</div><div class='add'>+	u8         reserved_at_5b1[0x1];</div><div class='add'>+	u8         crossing_vhca_mkey[0x1];</div><div class='ctx'> 	u8         log_max_dek[0x5];</div><div class='ctx'> 	u8         reserved_at_5b8[0x4];</div><div class='ctx'> 	u8         mini_cqe_resp_stride_index[0x1];</div><div class='hunk'>@@ -1933,12 +2118,14 @@ struct mlx5_ifc_cmd_hca_cap_bits {</div><div class='ctx'> 	u8	   dynamic_msix_table_size[0xc];</div><div class='ctx'> 	u8	   reserved_at_740[0xc];</div><div class='ctx'> 	u8	   min_dynamic_vf_msix_table_size[0x4];</div><div class='del'>-	u8	   reserved_at_750[0x4];</div><div class='add'>+	u8	   reserved_at_750[0x2];</div><div class='add'>+	u8	   data_direct[0x1];</div><div class='add'>+	u8	   reserved_at_753[0x1];</div><div class='ctx'> 	u8	   max_dynamic_vf_msix_table_size[0xc];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_760[0x3];</div><div class='ctx'> 	u8         log_max_num_header_modify_argument[0x5];</div><div class='del'>-	u8         reserved_at_768[0x4];</div><div class='add'>+	u8         log_header_modify_argument_granularity_offset[0x4];</div><div class='ctx'> 	u8         log_header_modify_argument_granularity[0x4];</div><div class='ctx'> 	u8         reserved_at_770[0x3];</div><div class='ctx'> 	u8         log_header_modify_argument_max_alloc[0x5];</div><div class='hunk'>@@ -1961,7 +2148,13 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {</div><div class='ctx'> 	u8	   reserved_at_0[0x80];</div><div class='ctx'> </div><div class='ctx'> 	u8         migratable[0x1];</div><div class='del'>-	u8         reserved_at_81[0x1f];</div><div class='add'>+	u8         reserved_at_81[0x7];</div><div class='add'>+	u8         dp_ordering_force[0x1];</div><div class='add'>+	u8         reserved_at_89[0x9];</div><div class='add'>+	u8         query_vuid[0x1];</div><div class='add'>+	u8         reserved_at_93[0x5];</div><div class='add'>+	u8         umr_log_entity_size_5[0x1];</div><div class='add'>+	u8         reserved_at_99[0x7];</div><div class='ctx'> </div><div class='ctx'> 	u8	   max_reformat_insert_size[0x8];</div><div class='ctx'> 	u8	   max_reformat_insert_offset[0x8];</div><div class='hunk'>@@ -1971,9 +2164,14 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {</div><div class='ctx'> 	u8	   reserved_at_c0[0x8];</div><div class='ctx'> 	u8	   migration_multi_load[0x1];</div><div class='ctx'> 	u8	   migration_tracking_state[0x1];</div><div class='del'>-	u8	   reserved_at_ca[0x6];</div><div class='add'>+	u8	   multiplane_qp_ud[0x1];</div><div class='add'>+	u8	   reserved_at_cb[0x5];</div><div class='ctx'> 	u8	   migration_in_chunks[0x1];</div><div class='del'>-	u8	   reserved_at_d1[0xf];</div><div class='add'>+	u8	   reserved_at_d1[0x1];</div><div class='add'>+	u8	   sf_eq_usage[0x1];</div><div class='add'>+	u8	   reserved_at_d3[0x5];</div><div class='add'>+	u8	   multiplane[0x1];</div><div class='add'>+	u8	   reserved_at_d9[0x7];</div><div class='ctx'> </div><div class='ctx'> 	u8	   cross_vhca_object_to_object_supported[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -1982,11 +2180,13 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {</div><div class='ctx'> 	u8	   reserved_at_140[0x60];</div><div class='ctx'> </div><div class='ctx'> 	u8	   flow_table_type_2_type[0x8];</div><div class='del'>-	u8	   reserved_at_1a8[0x3];</div><div class='add'>+	u8	   reserved_at_1a8[0x2];</div><div class='add'>+	u8         format_select_dw_8_6_ext[0x1];</div><div class='ctx'> 	u8	   log_min_mkey_entity_size[0x5];</div><div class='ctx'> 	u8	   reserved_at_1b0[0x10];</div><div class='ctx'> </div><div class='del'>-	u8	   reserved_at_1c0[0x60];</div><div class='add'>+	u8	   general_obj_types_127_64[0x40];</div><div class='add'>+	u8	   reserved_at_200[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8	   reserved_at_220[0x1];</div><div class='ctx'> 	u8	   sw_vhca_id_valid[0x1];</div><div class='hunk'>@@ -1997,14 +2197,60 @@ struct mlx5_ifc_cmd_hca_cap_2_bits {</div><div class='ctx'> 	u8	   ts_cqe_metadata_size2wqe_counter[0x5];</div><div class='ctx'> 	u8	   reserved_at_250[0x10];</div><div class='ctx'> </div><div class='del'>-	u8	   reserved_at_260[0x120];</div><div class='del'>-	u8	   reserved_at_380[0x10];</div><div class='add'>+	u8	   reserved_at_260[0x20];</div><div class='add'>+</div><div class='add'>+	u8	   format_select_dw_gtpu_dw_0[0x8];</div><div class='add'>+	u8	   format_select_dw_gtpu_dw_1[0x8];</div><div class='add'>+	u8	   format_select_dw_gtpu_dw_2[0x8];</div><div class='add'>+	u8	   format_select_dw_gtpu_first_ext_dw_0[0x8];</div><div class='add'>+</div><div class='add'>+	u8	   generate_wqe_type[0x20];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_2c0[0xc0];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_380[0xb];</div><div class='add'>+	u8	   min_mkey_log_entity_size_fixed_buffer[0x5];</div><div class='ctx'> 	u8	   ec_vf_vport_base[0x10];</div><div class='ctx'> </div><div class='del'>-	u8	   reserved_at_3a0[0x10];</div><div class='add'>+	u8	   reserved_at_3a0[0x2];</div><div class='add'>+	u8	   max_mkey_log_entity_size_fixed_buffer[0x6];</div><div class='add'>+	u8	   reserved_at_3a8[0x2];</div><div class='add'>+	u8	   max_mkey_log_entity_size_mtt[0x6];</div><div class='ctx'> 	u8	   max_rqt_vhca_id[0x10];</div><div class='ctx'> </div><div class='del'>-	u8	   reserved_at_3c0[0x440];</div><div class='add'>+	u8	   reserved_at_3c0[0x20];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_3e0[0x10];</div><div class='add'>+	u8	   pcc_ifa2[0x1];</div><div class='add'>+	u8	   reserved_at_3f1[0xf];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_400[0x1];</div><div class='add'>+	u8	   min_mkey_log_entity_size_fixed_buffer_valid[0x1];</div><div class='add'>+	u8	   reserved_at_402[0xe];</div><div class='add'>+	u8	   return_reg_id[0x10];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_420[0x1c];</div><div class='add'>+	u8	   flow_table_hash_type[0x4];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_440[0x8];</div><div class='add'>+	u8	   max_num_eqs_24b[0x18];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_460[0x144];</div><div class='add'>+	u8         load_balance_id[0x4];</div><div class='add'>+	u8         reserved_at_5a8[0x18];</div><div class='add'>+</div><div class='add'>+	u8         query_adjacent_functions_id[0x1];</div><div class='add'>+	u8         ingress_egress_esw_vport_connect[0x1];</div><div class='add'>+	u8         function_id_type_vhca_id[0x1];</div><div class='add'>+	u8         reserved_at_5c3[0x1];</div><div class='add'>+	u8         lag_per_mp_group[0x1];</div><div class='add'>+	u8         reserved_at_5c5[0xb];</div><div class='add'>+	u8         delegate_vhca_management_profiles[0x10];</div><div class='add'>+</div><div class='add'>+	u8         delegated_vhca_max[0x10];</div><div class='add'>+	u8         delegate_vhca_max[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_600[0x200];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum mlx5_ifc_flow_destination_type {</div><div class='hunk'>@@ -2047,7 +2293,7 @@ struct mlx5_ifc_extended_dest_format_bits {</div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-union mlx5_ifc_dest_format_struct_flow_counter_list_auto_bits {</div><div class='add'>+union mlx5_ifc_dest_format_flow_counter_list_auto_bits {</div><div class='ctx'> 	struct mlx5_ifc_extended_dest_format_bits extended_dest_format;</div><div class='ctx'> 	struct mlx5_ifc_flow_counter_list_bits flow_counter_list;</div><div class='ctx'> };</div><div class='hunk'>@@ -2139,12 +2385,17 @@ struct mlx5_ifc_wq_bits {</div><div class='ctx'> 	u8         reserved_at_139[0x4];</div><div class='ctx'> 	u8         log_wqe_stride_size[0x3];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_140[0x80];</div><div class='add'>+	u8         dbr_umem_id[0x20];</div><div class='add'>+	u8         wq_umem_id[0x20];</div><div class='add'>+</div><div class='add'>+	u8         wq_umem_offset[0x40];</div><div class='ctx'> </div><div class='ctx'> 	u8         headers_mkey[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         shampo_enable[0x1];</div><div class='del'>-	u8         reserved_at_1e1[0x4];</div><div class='add'>+	u8         reserved_at_1e1[0x1];</div><div class='add'>+	u8         shampo_mode[0x2];</div><div class='add'>+	u8         reserved_at_1e4[0x1];</div><div class='ctx'> 	u8         log_reservation_size[0x3];</div><div class='ctx'> 	u8         reserved_at_1e8[0x5];</div><div class='ctx'> 	u8         log_max_num_of_packets_per_reservation[0x3];</div><div class='hunk'>@@ -2453,6 +2704,12 @@ struct mlx5_ifc_field_select_802_1qau_rp_bits {</div><div class='ctx'> 	u8         field_select_8021qaurp[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_phys_layer_recovery_cntrs_bits {</div><div class='add'>+	u8         total_successful_recovery_events[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x7a0];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_phys_layer_cntrs_bits {</div><div class='ctx'> 	u8         time_since_last_clear_high[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -2625,6 +2882,46 @@ struct mlx5_ifc_ib_port_cntrs_grp_data_layout_bits {</div><div class='ctx'> 	u8         port_xmit_wait[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_ib_ext_port_cntrs_grp_data_layout_bits {</div><div class='add'>+	u8         reserved_at_0[0x300];</div><div class='add'>+</div><div class='add'>+	u8         port_xmit_data_high[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_xmit_data_low[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_rcv_data_high[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_rcv_data_low[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_xmit_pkts_high[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_xmit_pkts_low[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_rcv_pkts_high[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_rcv_pkts_low[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_400[0x80];</div><div class='add'>+</div><div class='add'>+	u8         port_unicast_xmit_pkts_high[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_unicast_xmit_pkts_low[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_multicast_xmit_pkts_high[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_multicast_xmit_pkts_low[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_unicast_rcv_pkts_high[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_unicast_rcv_pkts_low[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_multicast_rcv_pkts_high[0x20];</div><div class='add'>+</div><div class='add'>+	u8         port_multicast_rcv_pkts_low[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_580[0x240];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_eth_per_tc_prio_grp_data_layout_bits {</div><div class='ctx'> 	u8         transmit_queue_high[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -3102,6 +3399,14 @@ struct mlx5_ifc_dropped_packet_logged_bits {</div><div class='ctx'> 	u8         reserved_at_0[0xe0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_nic_cap_reg_bits {</div><div class='add'>+	u8	   reserved_at_0[0x1a];</div><div class='add'>+	u8	   vhca_icm_ctrl[0x1];</div><div class='add'>+	u8	   reserved_at_1b[0x5];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_20[0x60];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_default_timeout_bits {</div><div class='ctx'> 	u8         to_multiplier[0x3];</div><div class='ctx'> 	u8         reserved_at_3[0x9];</div><div class='hunk'>@@ -3138,6 +3443,18 @@ struct mlx5_ifc_dtor_reg_bits {</div><div class='ctx'> 	u8         reserved_at_1c0[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_vhca_icm_ctrl_reg_bits {</div><div class='add'>+	u8	   vhca_id_valid[0x1];</div><div class='add'>+	u8	   reserved_at_1[0xf];</div><div class='add'>+	u8	   vhca_id[0x10];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_20[0xa0];</div><div class='add'>+</div><div class='add'>+	u8	   cur_alloc_icm[0x20];</div><div class='add'>+</div><div class='add'>+	u8	   reserved_at_e0[0x120];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_CQ_ERROR_SYNDROME_CQ_OVERRUN                 = 0x1,</div><div class='ctx'> 	MLX5_CQ_ERROR_SYNDROME_CQ_ACCESS_VIOLATION_ERROR  = 0x2,</div><div class='hunk'>@@ -3312,7 +3629,8 @@ struct mlx5_ifc_qpc_bits {</div><div class='ctx'> 	u8         latency_sensitive[0x1];</div><div class='ctx'> 	u8         reserved_at_24[0x1];</div><div class='ctx'> 	u8         drain_sigerr[0x1];</div><div class='del'>-	u8         reserved_at_26[0x2];</div><div class='add'>+	u8         reserved_at_26[0x1];</div><div class='add'>+	u8         dp_ordering_force[0x1];</div><div class='ctx'> 	u8         pd[0x18];</div><div class='ctx'> </div><div class='ctx'> 	u8         mtu[0x3];</div><div class='hunk'>@@ -3385,7 +3703,8 @@ struct mlx5_ifc_qpc_bits {</div><div class='ctx'> 	u8         rae[0x1];</div><div class='ctx'> 	u8         reserved_at_493[0x1];</div><div class='ctx'> 	u8         page_offset[0x6];</div><div class='del'>-	u8         reserved_at_49a[0x3];</div><div class='add'>+	u8         reserved_at_49a[0x2];</div><div class='add'>+	u8         dp_ordering_1[0x1];</div><div class='ctx'> 	u8         cd_slave_receive[0x1];</div><div class='ctx'> 	u8         cd_slave_send[0x1];</div><div class='ctx'> 	u8         cd_master[0x1];</div><div class='hunk'>@@ -3474,6 +3793,22 @@ struct mlx5_ifc_crypto_cap_bits {</div><div class='ctx'> 	u8    reserved_at_80[0x780];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_shampo_cap_bits {</div><div class='add'>+	u8    reserved_at_0[0x3];</div><div class='add'>+	u8    shampo_log_max_reservation_size[0x5];</div><div class='add'>+	u8    reserved_at_8[0x3];</div><div class='add'>+	u8    shampo_log_min_reservation_size[0x5];</div><div class='add'>+	u8    shampo_min_mss_size[0x10];</div><div class='add'>+</div><div class='add'>+	u8    shampo_header_split[0x1];</div><div class='add'>+	u8    shampo_header_split_data_merge[0x1];</div><div class='add'>+	u8    reserved_at_22[0x1];</div><div class='add'>+	u8    shampo_log_max_headers_entry_size[0x5];</div><div class='add'>+	u8    reserved_at_28[0x18];</div><div class='add'>+</div><div class='add'>+	u8    reserved_at_40[0x7c0];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> union mlx5_ifc_hca_cap_union_bits {</div><div class='ctx'> 	struct mlx5_ifc_cmd_hca_cap_bits cmd_hca_cap;</div><div class='ctx'> 	struct mlx5_ifc_cmd_hca_cap_2_bits cmd_hca_cap_2;</div><div class='hunk'>@@ -3483,6 +3818,8 @@ union mlx5_ifc_hca_cap_union_bits {</div><div class='ctx'> 	struct mlx5_ifc_per_protocol_networking_offload_caps_bits per_protocol_networking_offload_caps;</div><div class='ctx'> 	struct mlx5_ifc_flow_table_nic_cap_bits flow_table_nic_cap;</div><div class='ctx'> 	struct mlx5_ifc_flow_table_eswitch_cap_bits flow_table_eswitch_cap;</div><div class='add'>+	struct mlx5_ifc_wqe_based_flow_table_cap_bits wqe_based_flow_table_cap;</div><div class='add'>+	struct mlx5_ifc_esw_cap_bits esw_cap;</div><div class='ctx'> 	struct mlx5_ifc_e_switch_cap_bits e_switch_cap;</div><div class='ctx'> 	struct mlx5_ifc_port_selection_cap_bits port_selection_cap;</div><div class='ctx'> 	struct mlx5_ifc_qos_cap_bits qos_cap;</div><div class='hunk'>@@ -3494,6 +3831,7 @@ union mlx5_ifc_hca_cap_union_bits {</div><div class='ctx'> 	struct mlx5_ifc_macsec_cap_bits macsec_cap;</div><div class='ctx'> 	struct mlx5_ifc_crypto_cap_bits crypto_cap;</div><div class='ctx'> 	struct mlx5_ifc_ipsec_cap_bits ipsec_cap;</div><div class='add'>+	struct mlx5_ifc_psp_cap_bits psp_cap;</div><div class='ctx'> 	u8         reserved_at_0[0x8000];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3523,6 +3861,7 @@ enum {</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_FLOW_CONTEXT_ENCRYPT_DECRYPT_TYPE_IPSEC   = 0x0,</div><div class='ctx'> 	MLX5_FLOW_CONTEXT_ENCRYPT_DECRYPT_TYPE_MACSEC  = 0x1,</div><div class='add'>+	MLX5_FLOW_CONTEXT_ENCRYPT_DECRYPT_TYPE_PSP     = 0x2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_vlan_bits {</div><div class='hunk'>@@ -3599,7 +3938,7 @@ struct mlx5_ifc_flow_context_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_1300[0x500];</div><div class='ctx'> </div><div class='del'>-	union mlx5_ifc_dest_format_struct_flow_counter_list_auto_bits destination[];</div><div class='add'>+	union mlx5_ifc_dest_format_flow_counter_list_auto_bits destination[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -3687,7 +4026,13 @@ struct mlx5_ifc_vnic_diagnostic_statistics_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         handled_pkt_steering_fail[0x40];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_360[0xc80];</div><div class='add'>+	u8         bar_uar_access[0x20];</div><div class='add'>+</div><div class='add'>+	u8         odp_local_triggered_page_fault[0x20];</div><div class='add'>+</div><div class='add'>+	u8         odp_remote_triggered_page_fault[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_3c0[0xc20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_traffic_counter_bits {</div><div class='hunk'>@@ -3840,7 +4185,8 @@ struct mlx5_ifc_sqc_bits {</div><div class='ctx'> 	u8         reg_umr[0x1];</div><div class='ctx'> 	u8         allow_swp[0x1];</div><div class='ctx'> 	u8         hairpin[0x1];</div><div class='del'>-	u8         reserved_at_f[0xb];</div><div class='add'>+	u8         non_wire[0x1];</div><div class='add'>+	u8         reserved_at_10[0xa];</div><div class='ctx'> 	u8	   ts_format[0x2];</div><div class='ctx'> 	u8	   reserved_at_1c[0x4];</div><div class='ctx'> </div><div class='hunk'>@@ -3880,20 +4226,65 @@ enum {</div><div class='ctx'> 	SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT_TC = 0x2,</div><div class='ctx'> 	SCHEDULING_CONTEXT_ELEMENT_TYPE_PARA_VPORT_TC = 0x3,</div><div class='ctx'> 	SCHEDULING_CONTEXT_ELEMENT_TYPE_QUEUE_GROUP = 0x4,</div><div class='add'>+	SCHEDULING_CONTEXT_ELEMENT_TYPE_RATE_LIMIT = 0x5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	ELEMENT_TYPE_CAP_MASK_TASR		= 1 &lt;&lt; 0,</div><div class='add'>+	ELEMENT_TYPE_CAP_MASK_TSAR		= 1 &lt;&lt; 0,</div><div class='ctx'> 	ELEMENT_TYPE_CAP_MASK_VPORT		= 1 &lt;&lt; 1,</div><div class='ctx'> 	ELEMENT_TYPE_CAP_MASK_VPORT_TC		= 1 &lt;&lt; 2,</div><div class='ctx'> 	ELEMENT_TYPE_CAP_MASK_PARA_VPORT_TC	= 1 &lt;&lt; 3,</div><div class='add'>+	ELEMENT_TYPE_CAP_MASK_QUEUE_GROUP	= 1 &lt;&lt; 4,</div><div class='add'>+	ELEMENT_TYPE_CAP_MASK_RATE_LIMIT	= 1 &lt;&lt; 5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TSAR_ELEMENT_TSAR_TYPE_DWRR = 0x0,</div><div class='add'>+	TSAR_ELEMENT_TSAR_TYPE_ROUND_ROBIN = 0x1,</div><div class='add'>+	TSAR_ELEMENT_TSAR_TYPE_ETS = 0x2,</div><div class='add'>+	TSAR_ELEMENT_TSAR_TYPE_TC_ARB = 0x3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TSAR_TYPE_CAP_MASK_DWRR		= 1 &lt;&lt; 0,</div><div class='add'>+	TSAR_TYPE_CAP_MASK_ROUND_ROBIN	= 1 &lt;&lt; 1,</div><div class='add'>+	TSAR_TYPE_CAP_MASK_ETS		= 1 &lt;&lt; 2,</div><div class='add'>+	TSAR_TYPE_CAP_MASK_TC_ARB       = 1 &lt;&lt; 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_tsar_element_bits {</div><div class='add'>+	u8         traffic_class[0x4];</div><div class='add'>+	u8         reserved_at_4[0x4];</div><div class='add'>+	u8         tsar_type[0x8];</div><div class='add'>+	u8         reserved_at_10[0x10];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_vport_element_bits {</div><div class='add'>+	u8         reserved_at_0[0x4];</div><div class='add'>+	u8         eswitch_owner_vhca_id_valid[0x1];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0xb];</div><div class='add'>+	u8         vport_number[0x10];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_vport_tc_element_bits {</div><div class='add'>+	u8         traffic_class[0x4];</div><div class='add'>+	u8         eswitch_owner_vhca_id_valid[0x1];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0xb];</div><div class='add'>+	u8         vport_number[0x10];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union mlx5_ifc_element_attributes_bits {</div><div class='add'>+	struct mlx5_ifc_tsar_element_bits tsar;</div><div class='add'>+	struct mlx5_ifc_vport_element_bits vport;</div><div class='add'>+	struct mlx5_ifc_vport_tc_element_bits vport_tc;</div><div class='add'>+	u8 reserved_at_0[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_scheduling_context_bits {</div><div class='ctx'> 	u8         element_type[0x8];</div><div class='ctx'> 	u8         reserved_at_8[0x18];</div><div class='ctx'> </div><div class='del'>-	u8         element_attributes[0x20];</div><div class='add'>+	union mlx5_ifc_element_attributes_bits element_attributes;</div><div class='ctx'> </div><div class='ctx'> 	u8         parent_element_id[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -3903,7 +4294,9 @@ struct mlx5_ifc_scheduling_context_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         max_average_bw[0x20];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_e0[0x120];</div><div class='add'>+	u8         max_bw_obj_id[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_100[0x100];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_rqtc_bits {</div><div class='hunk'>@@ -4075,6 +4468,11 @@ enum {</div><div class='ctx'> 	MLX5_MKC_ACCESS_MODE_KSM   = 0x3,</div><div class='ctx'> 	MLX5_MKC_ACCESS_MODE_SW_ICM = 0x4,</div><div class='ctx'> 	MLX5_MKC_ACCESS_MODE_MEMIC = 0x5,</div><div class='add'>+	MLX5_MKC_ACCESS_MODE_CROSSING = 0x6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MLX5_MKC_PCIE_TPH_NO_STEERING_TAG_INDEX = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_mkc_bits {</div><div class='hunk'>@@ -4117,16 +4515,22 @@ struct mlx5_ifc_mkc_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         bsf_octword_size[0x20];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_120[0x80];</div><div class='add'>+	u8         reserved_at_120[0x60];</div><div class='add'>+</div><div class='add'>+	u8         crossing_target_vhca_id[0x10];</div><div class='add'>+	u8         reserved_at_190[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         translations_octword_size[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_1c0[0x19];</div><div class='ctx'> 	u8         relaxed_ordering_read[0x1];</div><div class='del'>-	u8         reserved_at_1d9[0x1];</div><div class='del'>-	u8         log_page_size[0x5];</div><div class='add'>+	u8         log_page_size[0x6];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_1e0[0x20];</div><div class='add'>+	u8         reserved_at_1e0[0x5];</div><div class='add'>+	u8         pcie_tph_en[0x1];</div><div class='add'>+	u8         pcie_tph_ph[0x2];</div><div class='add'>+	u8         pcie_tph_steering_tag_index[0x8];</div><div class='add'>+	u8         reserved_at_1f0[0x10];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_pkey_bits {</div><div class='hunk'>@@ -4147,7 +4551,8 @@ struct mlx5_ifc_hca_vport_context_bits {</div><div class='ctx'> 	u8         has_smi[0x1];</div><div class='ctx'> 	u8         has_raw[0x1];</div><div class='ctx'> 	u8         grh_required[0x1];</div><div class='del'>-	u8         reserved_at_104[0xc];</div><div class='add'>+	u8         reserved_at_104[0x4];</div><div class='add'>+	u8         num_port_plane[0x8];</div><div class='ctx'> 	u8         port_physical_state[0x4];</div><div class='ctx'> 	u8         vport_state_policy[0x4];</div><div class='ctx'> 	u8         port_state[0x4];</div><div class='hunk'>@@ -4287,7 +4692,8 @@ struct mlx5_ifc_dctc_bits {</div><div class='ctx'> 	u8         state[0x4];</div><div class='ctx'> 	u8         reserved_at_8[0x18];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_20[0x8];</div><div class='add'>+	u8         reserved_at_20[0x7];</div><div class='add'>+	u8         dp_ordering_force[0x1];</div><div class='ctx'> 	u8         user_index[0x18];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_40[0x8];</div><div class='hunk'>@@ -4302,7 +4708,9 @@ struct mlx5_ifc_dctc_bits {</div><div class='ctx'> 	u8         latency_sensitive[0x1];</div><div class='ctx'> 	u8         rlky[0x1];</div><div class='ctx'> 	u8         free_ar[0x1];</div><div class='del'>-	u8         reserved_at_73[0xd];</div><div class='add'>+	u8         reserved_at_73[0x1];</div><div class='add'>+	u8         dp_ordering_1[0x1];</div><div class='add'>+	u8         reserved_at_75[0xb];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_80[0x8];</div><div class='ctx'> 	u8         cs_res[0x8];</div><div class='hunk'>@@ -4361,10 +4769,10 @@ enum {</div><div class='ctx'> 	MLX5_CQC_ST_FIRED                                 = 0xa,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='add'>+enum mlx5_cq_period_mode {</div><div class='ctx'> 	MLX5_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,</div><div class='ctx'> 	MLX5_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,</div><div class='del'>-	MLX5_CQ_PERIOD_NUM_MODES</div><div class='add'>+	MLX5_CQ_PERIOD_NUM_MODES,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_cqc_bits {</div><div class='hunk'>@@ -4506,6 +4914,11 @@ union mlx5_ifc_field_select_802_1_r_roce_auto_bits {</div><div class='ctx'> 	u8         reserved_at_0[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_rs_histogram_cntrs_bits {</div><div class='add'>+	u8         hist[16][0x40];</div><div class='add'>+	u8         reserved_at_400[0x2c0];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> union mlx5_ifc_eth_cntrs_grp_data_layout_auto_bits {</div><div class='ctx'> 	struct mlx5_ifc_eth_802_3_cntrs_grp_data_layout_bits eth_802_3_cntrs_grp_data_layout;</div><div class='ctx'> 	struct mlx5_ifc_eth_2863_cntrs_grp_data_layout_bits eth_2863_cntrs_grp_data_layout;</div><div class='hunk'>@@ -4516,8 +4929,11 @@ union mlx5_ifc_eth_cntrs_grp_data_layout_auto_bits {</div><div class='ctx'> 	struct mlx5_ifc_eth_per_tc_prio_grp_data_layout_bits eth_per_tc_prio_grp_data_layout;</div><div class='ctx'> 	struct mlx5_ifc_eth_per_tc_congest_prio_grp_data_layout_bits eth_per_tc_congest_prio_grp_data_layout;</div><div class='ctx'> 	struct mlx5_ifc_ib_port_cntrs_grp_data_layout_bits ib_port_cntrs_grp_data_layout;</div><div class='add'>+	struct mlx5_ifc_ib_ext_port_cntrs_grp_data_layout_bits ib_ext_port_cntrs_grp_data_layout;</div><div class='ctx'> 	struct mlx5_ifc_phys_layer_cntrs_bits phys_layer_cntrs;</div><div class='ctx'> 	struct mlx5_ifc_phys_layer_statistical_cntrs_bits phys_layer_statistical_cntrs;</div><div class='add'>+	struct mlx5_ifc_phys_layer_recovery_cntrs_bits phys_layer_recovery_cntrs;</div><div class='add'>+	struct mlx5_ifc_rs_histogram_cntrs_bits rs_histogram_cntrs;</div><div class='ctx'> 	u8         reserved_at_0[0x7c0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -4577,29 +4993,6 @@ struct mlx5_ifc_register_loopback_control_bits {</div><div class='ctx'> 	u8         reserved_at_20[0x60];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mlx5_ifc_vport_tc_element_bits {</div><div class='del'>-	u8         traffic_class[0x4];</div><div class='del'>-	u8         reserved_at_4[0xc];</div><div class='del'>-	u8         vport_number[0x10];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mlx5_ifc_vport_element_bits {</div><div class='del'>-	u8         reserved_at_0[0x10];</div><div class='del'>-	u8         vport_number[0x10];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	TSAR_ELEMENT_TSAR_TYPE_DWRR = 0x0,</div><div class='del'>-	TSAR_ELEMENT_TSAR_TYPE_ROUND_ROBIN = 0x1,</div><div class='del'>-	TSAR_ELEMENT_TSAR_TYPE_ETS = 0x2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mlx5_ifc_tsar_element_bits {</div><div class='del'>-	u8         reserved_at_0[0x8];</div><div class='del'>-	u8         tsar_type[0x8];</div><div class='del'>-	u8         reserved_at_10[0x10];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_TEARDOWN_HCA_OUT_FORCE_STATE_SUCCESS = 0x0,</div><div class='ctx'> 	MLX5_TEARDOWN_HCA_OUT_FORCE_STATE_FAIL = 0x1,</div><div class='hunk'>@@ -4823,7 +5216,9 @@ struct mlx5_ifc_set_hca_cap_in_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         other_function[0x1];</div><div class='ctx'> 	u8         ec_vf_function[0x1];</div><div class='del'>-	u8         reserved_at_42[0xe];</div><div class='add'>+	u8         reserved_at_42[0x1];</div><div class='add'>+	u8         function_id_type[0x1];</div><div class='add'>+	u8         reserved_at_44[0xc];</div><div class='ctx'> 	u8         function_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='hunk'>@@ -4856,13 +5251,15 @@ struct mlx5_ifc_set_fte_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         other_vport[0x1];</div><div class='del'>-	u8         reserved_at_41[0xf];</div><div class='add'>+	u8         other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_42[0xe];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         table_type[0x8];</div><div class='del'>-	u8         reserved_at_88[0x18];</div><div class='add'>+	u8         reserved_at_88[0x8];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_a0[0x8];</div><div class='ctx'> 	u8         table_id[0x18];</div><div class='hunk'>@@ -4880,6 +5277,16 @@ struct mlx5_ifc_set_fte_in_bits {</div><div class='ctx'> 	struct mlx5_ifc_flow_context_bits flow_context;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_dest_format_bits {</div><div class='add'>+	u8         destination_type[0x8];</div><div class='add'>+	u8         destination_id[0x18];</div><div class='add'>+</div><div class='add'>+	u8         destination_eswitch_owner_vhca_id_valid[0x1];</div><div class='add'>+	u8         packet_reformat[0x1];</div><div class='add'>+	u8         reserved_at_22[0xe];</div><div class='add'>+	u8         destination_eswitch_owner_vhca_id[0x10];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_rts2rts_qp_out_bits {</div><div class='ctx'> 	u8         status[0x8];</div><div class='ctx'> 	u8         reserved_at_8[0x18];</div><div class='hunk'>@@ -5043,6 +5450,36 @@ struct mlx5_ifc_query_vport_state_out_bits {</div><div class='ctx'> 	u8         state[0x4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_array1024_auto_bits {</div><div class='add'>+	u8         array1024_auto[32][0x20];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_query_vuid_in_bits {</div><div class='add'>+	u8         opcode[0x10];</div><div class='add'>+	u8         uid[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x40];</div><div class='add'>+</div><div class='add'>+	u8         query_vfs_vuid[0x1];</div><div class='add'>+	u8         data_direct[0x1];</div><div class='add'>+	u8         reserved_at_62[0xe];</div><div class='add'>+	u8         vhca_id[0x10];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_query_vuid_out_bits {</div><div class='add'>+	u8        status[0x8];</div><div class='add'>+	u8        reserved_at_8[0x18];</div><div class='add'>+</div><div class='add'>+	u8        syndrome[0x20];</div><div class='add'>+</div><div class='add'>+	u8        reserved_at_40[0x1a0];</div><div class='add'>+</div><div class='add'>+	u8        reserved_at_1e0[0x10];</div><div class='add'>+	u8        num_of_entries[0x10];</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_array1024_auto_bits vuid[];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_VPORT_STATE_OP_MOD_VNIC_VPORT  = 0x0,</div><div class='ctx'> 	MLX5_VPORT_STATE_OP_MOD_ESW_VPORT   = 0x1,</div><div class='hunk'>@@ -5604,7 +6041,11 @@ struct mlx5_ifc_query_q_counter_out_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         local_ack_timeout_err[0x20];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_320[0xa0];</div><div class='add'>+	u8         reserved_at_320[0x60];</div><div class='add'>+</div><div class='add'>+	u8         req_rnr_retries_exceeded[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_3a0[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         resp_local_length_error[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -5977,7 +6418,9 @@ struct mlx5_ifc_query_hca_cap_in_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         other_function[0x1];</div><div class='ctx'> 	u8         ec_vf_function[0x1];</div><div class='del'>-	u8         reserved_at_42[0xe];</div><div class='add'>+	u8         reserved_at_42[0x1];</div><div class='add'>+	u8         function_id_type[0x1];</div><div class='add'>+	u8         reserved_at_44[0xc];</div><div class='ctx'> 	u8         function_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='hunk'>@@ -6035,6 +6478,20 @@ struct mlx5_ifc_modify_other_hca_cap_in_bits {</div><div class='ctx'> 	struct     mlx5_ifc_other_hca_cap_bits other_capability;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_sw_owner_icm_root_params_bits {</div><div class='add'>+	u8         sw_owner_icm_root_1[0x40];</div><div class='add'>+</div><div class='add'>+	u8         sw_owner_icm_root_0[0x40];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_rtc_params_bits {</div><div class='add'>+	u8         rtc_id_0[0x20];</div><div class='add'>+</div><div class='add'>+	u8         rtc_id_1[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x40];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_flow_table_context_bits {</div><div class='ctx'> 	u8         reformat_en[0x1];</div><div class='ctx'> 	u8         decap_en[0x1];</div><div class='hunk'>@@ -6042,7 +6499,8 @@ struct mlx5_ifc_flow_table_context_bits {</div><div class='ctx'> 	u8         termination_table[0x1];</div><div class='ctx'> 	u8         table_miss_action[0x4];</div><div class='ctx'> 	u8         level[0x8];</div><div class='del'>-	u8         reserved_at_10[0x8];</div><div class='add'>+	u8         rtc_valid[0x1];</div><div class='add'>+	u8         reserved_at_11[0x7];</div><div class='ctx'> 	u8         log_size[0x8];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_20[0x8];</div><div class='hunk'>@@ -6053,10 +6511,10 @@ struct mlx5_ifc_flow_table_context_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x60];</div><div class='ctx'> </div><div class='del'>-	u8         sw_owner_icm_root_1[0x40];</div><div class='del'>-</div><div class='del'>-	u8         sw_owner_icm_root_0[0x40];</div><div class='del'>-</div><div class='add'>+	union {</div><div class='add'>+		struct mlx5_ifc_sw_owner_icm_root_params_bits sws;</div><div class='add'>+		struct mlx5_ifc_rtc_params_bits hws;</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_query_flow_table_out_bits {</div><div class='hunk'>@@ -6588,6 +7046,28 @@ struct mlx5_ifc_query_esw_vport_context_in_bits {</div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_destroy_esw_vport_out_bits {</div><div class='add'>+	u8         status[0x8];</div><div class='add'>+	u8         reserved_at_8[0x18];</div><div class='add'>+</div><div class='add'>+	u8         syndrome[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x20];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_destroy_esw_vport_in_bits {</div><div class='add'>+	u8         opcode[0x10];</div><div class='add'>+	u8         uid[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x10];</div><div class='add'>+	u8         op_mod[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x10];</div><div class='add'>+	u8         vport_num[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_60[0x20];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_modify_esw_vport_context_out_bits {</div><div class='ctx'> 	u8         status[0x8];</div><div class='ctx'> 	u8         reserved_at_8[0x18];</div><div class='hunk'>@@ -6704,6 +7184,7 @@ struct mlx5_ifc_alloc_packet_reformat_context_out_bits {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MLX5_REFORMAT_CONTEXT_ANCHOR_MAC_START = 0x1,</div><div class='add'>+	MLX5_REFORMAT_CONTEXT_ANCHOR_VLAN_START = 0x2,</div><div class='ctx'> 	MLX5_REFORMAT_CONTEXT_ANCHOR_IP_START = 0x7,</div><div class='ctx'> 	MLX5_REFORMAT_CONTEXT_ANCHOR_TCP_UDP_START = 0x9,</div><div class='ctx'> };</div><div class='hunk'>@@ -6722,6 +7203,8 @@ enum mlx5_reformat_ctx_type {</div><div class='ctx'> 	MLX5_REFORMAT_TYPE_DEL_ESP_TRANSPORT_OVER_UDP = 0xa,</div><div class='ctx'> 	MLX5_REFORMAT_TYPE_ADD_ESP_TRANSPORT_OVER_IPV6 = 0xb,</div><div class='ctx'> 	MLX5_REFORMAT_TYPE_ADD_ESP_TRANSPORT_OVER_UDPV6 = 0xc,</div><div class='add'>+	MLX5_REFORMAT_TYPE_ADD_PSP_TUNNEL = 0xd,</div><div class='add'>+	MLX5_REFORMAT_TYPE_DEL_PSP_TUNNEL = 0xe,</div><div class='ctx'> 	MLX5_REFORMAT_TYPE_INSERT_HDR = 0xf,</div><div class='ctx'> 	MLX5_REFORMAT_TYPE_REMOVE_HDR = 0x10,</div><div class='ctx'> 	MLX5_REFORMAT_TYPE_ADD_MACSEC = 0x11,</div><div class='hunk'>@@ -6848,6 +7331,7 @@ enum {</div><div class='ctx'> 	MLX5_ACTION_IN_FIELD_IPSEC_SYNDROME    = 0x5D,</div><div class='ctx'> 	MLX5_ACTION_IN_FIELD_OUT_EMD_47_32     = 0x6F,</div><div class='ctx'> 	MLX5_ACTION_IN_FIELD_OUT_EMD_31_0      = 0x70,</div><div class='add'>+	MLX5_ACTION_IN_FIELD_PSP_SYNDROME      = 0x71,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_alloc_modify_header_context_out_bits {</div><div class='hunk'>@@ -7088,6 +7572,85 @@ struct mlx5_ifc_query_adapter_in_bits {</div><div class='ctx'> 	u8         reserved_at_40[0x40];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_function_vhca_rid_info_reg_bits {</div><div class='add'>+	u8         host_number[0x8];</div><div class='add'>+	u8         host_pci_device_function[0x8];</div><div class='add'>+	u8         host_pci_bus[0x8];</div><div class='add'>+	u8         reserved_at_18[0x3];</div><div class='add'>+	u8         pci_bus_assigned[0x1];</div><div class='add'>+	u8         function_type[0x4];</div><div class='add'>+</div><div class='add'>+	u8         parent_pci_device_function[0x8];</div><div class='add'>+	u8         parent_pci_bus[0x8];</div><div class='add'>+	u8         vhca_id[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x10];</div><div class='add'>+	u8         function_id[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_60[0x20];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_delegated_function_vhca_rid_info_bits {</div><div class='add'>+	struct mlx5_ifc_function_vhca_rid_info_reg_bits function_vhca_rid_info;</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_80[0x18];</div><div class='add'>+	u8         manage_profile[0x8];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_a0[0x60];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_query_delegated_vhca_out_bits {</div><div class='add'>+	u8         status[0x8];</div><div class='add'>+	u8         reserved_at_8[0x18];</div><div class='add'>+</div><div class='add'>+	u8         syndrome[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_60[0x10];</div><div class='add'>+	u8         functions_count[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_80[0x80];</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_delegated_function_vhca_rid_info_bits</div><div class='add'>+			delegated_function_vhca_rid_info[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_query_delegated_vhca_in_bits {</div><div class='add'>+	u8         opcode[0x10];</div><div class='add'>+	u8         uid[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x10];</div><div class='add'>+	u8         op_mod[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x40];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_create_esw_vport_out_bits {</div><div class='add'>+	u8         status[0x8];</div><div class='add'>+	u8         reserved_at_8[0x18];</div><div class='add'>+</div><div class='add'>+	u8         syndrome[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_60[0x10];</div><div class='add'>+	u8         vport_num[0x10];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_create_esw_vport_in_bits {</div><div class='add'>+	u8         opcode[0x10];</div><div class='add'>+	u8         reserved_at_10[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x10];</div><div class='add'>+	u8         op_mod[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x10];</div><div class='add'>+	u8         managed_vhca_id[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_60[0x20];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_qp_2rst_out_bits {</div><div class='ctx'> 	u8         status[0x8];</div><div class='ctx'> 	u8         reserved_at_8[0x18];</div><div class='hunk'>@@ -7132,6 +7695,30 @@ struct mlx5_ifc_qp_2err_in_bits {</div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_trans_page_fault_info_bits {</div><div class='add'>+	u8         error[0x1];</div><div class='add'>+	u8         reserved_at_1[0x4];</div><div class='add'>+	u8         page_fault_type[0x3];</div><div class='add'>+	u8         wq_number[0x18];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x8];</div><div class='add'>+	u8         fault_token[0x18];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_mem_page_fault_info_bits {</div><div class='add'>+	u8          error[0x1];</div><div class='add'>+	u8          reserved_at_1[0xf];</div><div class='add'>+	u8          fault_token_47_32[0x10];</div><div class='add'>+</div><div class='add'>+	u8          fault_token_31_0[0x20];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union mlx5_ifc_page_fault_resume_in_page_fault_info_auto_bits {</div><div class='add'>+	struct mlx5_ifc_trans_page_fault_info_bits trans_page_fault_info;</div><div class='add'>+	struct mlx5_ifc_mem_page_fault_info_bits mem_page_fault_info;</div><div class='add'>+	u8          reserved_at_0[0x40];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_page_fault_resume_out_bits {</div><div class='ctx'> 	u8         status[0x8];</div><div class='ctx'> 	u8         reserved_at_8[0x18];</div><div class='hunk'>@@ -7148,13 +7735,8 @@ struct mlx5_ifc_page_fault_resume_in_bits {</div><div class='ctx'> 	u8         reserved_at_20[0x10];</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         error[0x1];</div><div class='del'>-	u8         reserved_at_41[0x4];</div><div class='del'>-	u8         page_fault_type[0x3];</div><div class='del'>-	u8         wq_number[0x18];</div><div class='del'>-</div><div class='del'>-	u8         reserved_at_60[0x8];</div><div class='del'>-	u8         token[0x18];</div><div class='add'>+	union mlx5_ifc_page_fault_resume_in_page_fault_info_auto_bits</div><div class='add'>+		page_fault_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_nop_out_bits {</div><div class='hunk'>@@ -7196,7 +7778,12 @@ struct mlx5_ifc_modify_vport_state_in_bits {</div><div class='ctx'> 	u8         reserved_at_41[0xf];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_60[0x18];</div><div class='add'>+	u8         reserved_at_60[0x10];</div><div class='add'>+	u8         ingress_connect[0x1];</div><div class='add'>+	u8         egress_connect[0x1];</div><div class='add'>+	u8         ingress_connect_valid[0x1];</div><div class='add'>+	u8         egress_connect_valid[0x1];</div><div class='add'>+	u8         reserved_at_74[0x4];</div><div class='ctx'> 	u8         admin_state[0x4];</div><div class='ctx'> 	u8         reserved_at_7c[0x4];</div><div class='ctx'> };</div><div class='hunk'>@@ -7663,7 +8250,7 @@ struct mlx5_ifc_mad_ifc_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         remote_lid[0x10];</div><div class='del'>-	u8         reserved_at_50[0x8];</div><div class='add'>+	u8         plane_index[0x8];</div><div class='ctx'> 	u8         port[0x8];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='hunk'>@@ -8224,13 +8811,15 @@ struct mlx5_ifc_destroy_flow_table_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         other_vport[0x1];</div><div class='del'>-	u8         reserved_at_41[0xf];</div><div class='add'>+	u8         other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_42[0xe];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         table_type[0x8];</div><div class='del'>-	u8         reserved_at_88[0x18];</div><div class='add'>+	u8         reserved_at_88[0x8];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_a0[0x8];</div><div class='ctx'> 	u8         table_id[0x18];</div><div class='hunk'>@@ -8255,13 +8844,15 @@ struct mlx5_ifc_destroy_flow_group_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         other_vport[0x1];</div><div class='del'>-	u8         reserved_at_41[0xf];</div><div class='add'>+	u8         other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_42[0xe];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         table_type[0x8];</div><div class='del'>-	u8         reserved_at_88[0x18];</div><div class='add'>+	u8         reserved_at_88[0x8];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_a0[0x8];</div><div class='ctx'> 	u8         table_id[0x18];</div><div class='hunk'>@@ -8400,13 +8991,15 @@ struct mlx5_ifc_delete_fte_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         other_vport[0x1];</div><div class='del'>-	u8         reserved_at_41[0xf];</div><div class='add'>+	u8         other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_42[0xe];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         table_type[0x8];</div><div class='del'>-	u8         reserved_at_88[0x18];</div><div class='add'>+	u8         reserved_at_88[0x8];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_a0[0x8];</div><div class='ctx'> 	u8         table_id[0x18];</div><div class='hunk'>@@ -8838,7 +9431,9 @@ struct mlx5_ifc_create_qp_in_bits {</div><div class='ctx'> </div><div class='ctx'> 	struct mlx5_ifc_qpc_bits qpc;</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_800[0x60];</div><div class='add'>+	u8         wq_umem_offset[0x40];</div><div class='add'>+</div><div class='add'>+	u8         wq_umem_id[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         wq_umem_valid[0x1];</div><div class='ctx'> 	u8         reserved_at_861[0x1f];</div><div class='hunk'>@@ -8904,7 +9499,8 @@ struct mlx5_ifc_create_mkey_in_bits {</div><div class='ctx'> </div><div class='ctx'> 	u8         pg_access[0x1];</div><div class='ctx'> 	u8         mkey_umem_valid[0x1];</div><div class='del'>-	u8         reserved_at_62[0x1e];</div><div class='add'>+	u8         data_direct[0x1];</div><div class='add'>+	u8         reserved_at_63[0x1d];</div><div class='ctx'> </div><div class='ctx'> 	struct mlx5_ifc_mkc_bits memory_key_mkey_entry;</div><div class='ctx'> </div><div class='hunk'>@@ -8947,13 +9543,15 @@ struct mlx5_ifc_create_flow_table_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         other_vport[0x1];</div><div class='del'>-	u8         reserved_at_41[0xf];</div><div class='add'>+	u8         other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_42[0xe];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='ctx'> </div><div class='ctx'> 	u8         table_type[0x8];</div><div class='del'>-	u8         reserved_at_88[0x18];</div><div class='add'>+	u8         reserved_at_88[0x8];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_a0[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -8992,7 +9590,8 @@ struct mlx5_ifc_create_flow_group_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         other_vport[0x1];</div><div class='del'>-	u8         reserved_at_41[0xf];</div><div class='add'>+	u8         other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_42[0xe];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x20];</div><div class='hunk'>@@ -9000,7 +9599,7 @@ struct mlx5_ifc_create_flow_group_in_bits {</div><div class='ctx'> 	u8         table_type[0x8];</div><div class='ctx'> 	u8         reserved_at_88[0x4];</div><div class='ctx'> 	u8         group_type[0x4];</div><div class='del'>-	u8         reserved_at_90[0x10];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_a0[0x8];</div><div class='ctx'> 	u8         table_id[0x18];</div><div class='hunk'>@@ -9586,13 +10185,19 @@ struct mlx5_ifc_pude_reg_bits {</div><div class='ctx'> 	u8         reserved_at_20[0x60];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	MLX5_PTYS_CONNECTOR_TYPE_PORT_DA = 0x7,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_ptys_reg_bits {</div><div class='ctx'> 	u8         reserved_at_0[0x1];</div><div class='ctx'> 	u8         an_disable_admin[0x1];</div><div class='ctx'> 	u8         an_disable_cap[0x1];</div><div class='ctx'> 	u8         reserved_at_3[0x5];</div><div class='ctx'> 	u8         local_port[0x8];</div><div class='del'>-	u8         reserved_at_10[0xd];</div><div class='add'>+	u8         reserved_at_10[0x8];</div><div class='add'>+	u8         plane_ind[0x4];</div><div class='add'>+	u8         reserved_at_1c[0x1];</div><div class='ctx'> 	u8         proto_mask[0x3];</div><div class='ctx'> </div><div class='ctx'> 	u8         an_status[0x4];</div><div class='hunk'>@@ -9620,7 +10225,8 @@ struct mlx5_ifc_ptys_reg_bits {</div><div class='ctx'> 	u8         ib_link_width_oper[0x10];</div><div class='ctx'> 	u8         ib_proto_oper[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_160[0x1c];</div><div class='add'>+	u8         reserved_at_160[0x8];</div><div class='add'>+	u8         lane_rate_oper[0x14];</div><div class='ctx'> 	u8         connector_type[0x4];</div><div class='ctx'> </div><div class='ctx'> 	u8         eth_proto_lp_advertise[0x20];</div><div class='hunk'>@@ -9793,7 +10399,35 @@ struct mlx5_ifc_pplm_reg_bits {</div><div class='ctx'> 	u8         fec_override_admin_100g_2x[0x10];</div><div class='ctx'> 	u8         fec_override_admin_50g_1x[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_140[0x140];</div><div class='add'>+	u8         fec_override_cap_800g_8x[0x10];</div><div class='add'>+	u8         fec_override_cap_400g_4x[0x10];</div><div class='add'>+</div><div class='add'>+	u8         fec_override_cap_200g_2x[0x10];</div><div class='add'>+	u8         fec_override_cap_100g_1x[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_180[0xa0];</div><div class='add'>+</div><div class='add'>+	u8         fec_override_admin_800g_8x[0x10];</div><div class='add'>+	u8         fec_override_admin_400g_4x[0x10];</div><div class='add'>+</div><div class='add'>+	u8         fec_override_admin_200g_2x[0x10];</div><div class='add'>+	u8         fec_override_admin_100g_1x[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_260[0x60];</div><div class='add'>+</div><div class='add'>+	u8         fec_override_cap_1600g_8x[0x10];</div><div class='add'>+	u8         fec_override_cap_800g_4x[0x10];</div><div class='add'>+</div><div class='add'>+	u8         fec_override_cap_400g_2x[0x10];</div><div class='add'>+	u8         fec_override_cap_200g_1x[0x10];</div><div class='add'>+</div><div class='add'>+	u8         fec_override_admin_1600g_8x[0x10];</div><div class='add'>+	u8         fec_override_admin_800g_4x[0x10];</div><div class='add'>+</div><div class='add'>+	u8         fec_override_admin_400g_2x[0x10];</div><div class='add'>+	u8         fec_override_admin_200g_1x[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_340[0x80];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_ppcnt_reg_bits {</div><div class='hunk'>@@ -9804,8 +10438,10 @@ struct mlx5_ifc_ppcnt_reg_bits {</div><div class='ctx'> 	u8         grp[0x6];</div><div class='ctx'> </div><div class='ctx'> 	u8         clr[0x1];</div><div class='del'>-	u8         reserved_at_21[0x1c];</div><div class='del'>-	u8         prio_tc[0x3];</div><div class='add'>+	u8         reserved_at_21[0x13];</div><div class='add'>+	u8         plane_ind[0x4];</div><div class='add'>+	u8         reserved_at_38[0x3];</div><div class='add'>+	u8         prio_tc[0x5];</div><div class='ctx'> </div><div class='ctx'> 	union mlx5_ifc_eth_cntrs_grp_data_layout_auto_bits counter_set;</div><div class='ctx'> };</div><div class='hunk'>@@ -10034,10 +10670,19 @@ struct mlx5_ifc_pifr_reg_bits {</div><div class='ctx'> 	u8         port_filter_update_en[8][0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	MLX5_BUF_OWNERSHIP_UNKNOWN	= 0x0,</div><div class='add'>+	MLX5_BUF_OWNERSHIP_FW_OWNED	= 0x1,</div><div class='add'>+	MLX5_BUF_OWNERSHIP_SW_OWNED	= 0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_pfcc_reg_bits {</div><div class='del'>-	u8         reserved_at_0[0x8];</div><div class='add'>+	u8         reserved_at_0[0x4];</div><div class='add'>+	u8	   buf_ownership[0x2];</div><div class='add'>+	u8	   reserved_at_6[0x2];</div><div class='ctx'> 	u8         local_port[0x8];</div><div class='del'>-	u8         reserved_at_10[0xb];</div><div class='add'>+	u8         reserved_at_10[0xa];</div><div class='add'>+	u8	   cable_length_mask[0x1];</div><div class='ctx'> 	u8         ppan_mask_n[0x1];</div><div class='ctx'> 	u8         minor_stall_mask[0x1];</div><div class='ctx'> 	u8         critical_stall_mask[0x1];</div><div class='hunk'>@@ -10066,7 +10711,10 @@ struct mlx5_ifc_pfcc_reg_bits {</div><div class='ctx'> 	u8         device_stall_minor_watermark[0x10];</div><div class='ctx'> 	u8         device_stall_critical_watermark[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_a0[0x60];</div><div class='add'>+	u8	   reserved_at_a0[0x18];</div><div class='add'>+	u8	   cable_length[0x8];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_c0[0x40];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_pelc_reg_bits {</div><div class='hunk'>@@ -10165,7 +10813,17 @@ struct mlx5_ifc_mtutc_reg_bits {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_pcam_enhanced_features_bits {</div><div class='del'>-	u8         reserved_at_0[0x68];</div><div class='add'>+	u8         reserved_at_0[0x10];</div><div class='add'>+	u8         ppcnt_recovery_counters[0x1];</div><div class='add'>+	u8         reserved_at_11[0x7];</div><div class='add'>+	u8	   cable_length[0x1];</div><div class='add'>+	u8	   reserved_at_19[0x4];</div><div class='add'>+	u8         fec_200G_per_lane_in_pplm[0x1];</div><div class='add'>+	u8         reserved_at_1e[0x2a];</div><div class='add'>+	u8         fec_100G_per_lane_in_pplm[0x1];</div><div class='add'>+	u8         reserved_at_49[0xa];</div><div class='add'>+	u8	   buffer_ownership[0x1];</div><div class='add'>+	u8	   resereved_at_54[0x14];</div><div class='ctx'> 	u8         fec_50G_per_lane_in_pplm[0x1];</div><div class='ctx'> 	u8         reserved_at_69[0x4];</div><div class='ctx'> 	u8         rx_icrc_encapsulated_counter[0x1];</div><div class='hunk'>@@ -10186,7 +10844,9 @@ struct mlx5_ifc_pcam_regs_5000_to_507f_bits {</div><div class='ctx'> 	u8         port_access_reg_cap_mask_127_to_96[0x20];</div><div class='ctx'> 	u8         port_access_reg_cap_mask_95_to_64[0x20];</div><div class='ctx'> </div><div class='del'>-	u8         port_access_reg_cap_mask_63_to_36[0x1c];</div><div class='add'>+	u8         port_access_reg_cap_mask_63[0x1];</div><div class='add'>+	u8         pphcr[0x1];</div><div class='add'>+	u8         port_access_reg_cap_mask_61_to_36[0x1a];</div><div class='ctx'> 	u8         pplm[0x1];</div><div class='ctx'> 	u8         port_access_reg_cap_mask_34_to_32[0x3];</div><div class='ctx'> </div><div class='hunk'>@@ -10267,9 +10927,9 @@ struct mlx5_ifc_mcam_access_reg_bits {</div><div class='ctx'> 	u8         mfrl[0x1];</div><div class='ctx'> 	u8         regs_39_to_32[0x8];</div><div class='ctx'> </div><div class='del'>-	u8         regs_31_to_10[0x16];</div><div class='add'>+	u8         regs_31_to_11[0x15];</div><div class='ctx'> 	u8         mtmp[0x1];</div><div class='del'>-	u8         regs_8_to_0[0x9];</div><div class='add'>+	u8         regs_9_to_0[0xa];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_mcam_access_reg_bits1 {</div><div class='hunk'>@@ -10296,6 +10956,19 @@ struct mlx5_ifc_mcam_access_reg_bits2 {</div><div class='ctx'> 	u8         regs_31_to_0[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_mcam_access_reg_bits3 {</div><div class='add'>+	u8         regs_127_to_96[0x20];</div><div class='add'>+</div><div class='add'>+	u8         regs_95_to_64[0x20];</div><div class='add'>+</div><div class='add'>+	u8         regs_63_to_32[0x20];</div><div class='add'>+</div><div class='add'>+	u8         regs_31_to_3[0x1d];</div><div class='add'>+	u8         mrtcq[0x1];</div><div class='add'>+	u8         mtctr[0x1];</div><div class='add'>+	u8         mtptm[0x1];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_mcam_reg_bits {</div><div class='ctx'> 	u8         reserved_at_0[0x8];</div><div class='ctx'> 	u8         feature_group[0x8];</div><div class='hunk'>@@ -10308,6 +10981,7 @@ struct mlx5_ifc_mcam_reg_bits {</div><div class='ctx'> 		struct mlx5_ifc_mcam_access_reg_bits access_regs;</div><div class='ctx'> 		struct mlx5_ifc_mcam_access_reg_bits1 access_regs1;</div><div class='ctx'> 		struct mlx5_ifc_mcam_access_reg_bits2 access_regs2;</div><div class='add'>+		struct mlx5_ifc_mcam_access_reg_bits3 access_regs3;</div><div class='ctx'> 		u8         reserved_at_0[0x80];</div><div class='ctx'> 	} mng_access_reg_cap_mask;</div><div class='ctx'> </div><div class='hunk'>@@ -10687,6 +11361,7 @@ enum {</div><div class='ctx'> 	MLX5_INITIAL_SEG_HEALTH_SYNDROME_FFSER_ERR                    = 0xf,</div><div class='ctx'> 	MLX5_INITIAL_SEG_HEALTH_SYNDROME_HIGH_TEMP_ERR                = 0x10,</div><div class='ctx'> 	MLX5_INITIAL_SEG_HEALTH_SYNDROME_ICM_PCI_POISONED_ERR         = 0x12,</div><div class='add'>+	MLX5_INITIAL_SEG_HEALTH_SYNDROME_TRUST_LOCKDOWN_ERR           = 0x13,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_initial_seg_bits {</div><div class='hunk'>@@ -10930,6 +11605,11 @@ struct mlx5_ifc_mcda_reg_bits {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	MLX5_MFRL_REG_PCI_RESET_METHOD_LINK_TOGGLE = 0,</div><div class='add'>+	MLX5_MFRL_REG_PCI_RESET_METHOD_HOT_RESET = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='ctx'> 	MLX5_MFRL_REG_RESET_STATE_IDLE = 0,</div><div class='ctx'> 	MLX5_MFRL_REG_RESET_STATE_IN_NEGOTIATION = 1,</div><div class='ctx'> 	MLX5_MFRL_REG_RESET_STATE_RESET_IN_PROGRESS = 2,</div><div class='hunk'>@@ -10956,7 +11636,8 @@ struct mlx5_ifc_mfrl_reg_bits {</div><div class='ctx'> 	u8         pci_sync_for_fw_update_start[0x1];</div><div class='ctx'> 	u8         pci_sync_for_fw_update_resp[0x2];</div><div class='ctx'> 	u8         rst_type_sel[0x3];</div><div class='del'>-	u8         reserved_at_28[0x4];</div><div class='add'>+	u8         pci_reset_req_method[0x3];</div><div class='add'>+	u8         reserved_at_2b[0x1];</div><div class='ctx'> 	u8         reset_state[0x4];</div><div class='ctx'> 	u8         reset_type[0x8];</div><div class='ctx'> 	u8         reset_level[0x8];</div><div class='hunk'>@@ -11061,6 +11742,56 @@ struct mlx5_ifc_mtmp_reg_bits {</div><div class='ctx'> 	u8         sensor_name_lo[0x20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_mtptm_reg_bits {</div><div class='add'>+	u8         reserved_at_0[0x10];</div><div class='add'>+	u8         psta[0x1];</div><div class='add'>+	u8         reserved_at_11[0xf];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x60];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MLX5_MTCTR_REQUEST_NOP = 0x0,</div><div class='add'>+	MLX5_MTCTR_REQUEST_PTM_ROOT_CLOCK = 0x1,</div><div class='add'>+	MLX5_MTCTR_REQUEST_FREE_RUNNING_COUNTER = 0x2,</div><div class='add'>+	MLX5_MTCTR_REQUEST_REAL_TIME_CLOCK = 0x3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_mtctr_reg_bits {</div><div class='add'>+	u8         first_clock_timestamp_request[0x8];</div><div class='add'>+	u8         second_clock_timestamp_request[0x8];</div><div class='add'>+	u8         reserved_at_10[0x10];</div><div class='add'>+</div><div class='add'>+	u8         first_clock_valid[0x1];</div><div class='add'>+	u8         second_clock_valid[0x1];</div><div class='add'>+	u8         reserved_at_22[0x1e];</div><div class='add'>+</div><div class='add'>+	u8         first_clock_timestamp[0x40];</div><div class='add'>+	u8         second_clock_timestamp[0x40];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_bin_range_layout_bits {</div><div class='add'>+	u8         reserved_at_0[0xa];</div><div class='add'>+	u8         high_val[0x6];</div><div class='add'>+	u8         reserved_at_10[0xa];</div><div class='add'>+	u8         low_val[0x6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_pphcr_reg_bits {</div><div class='add'>+	u8         active_hist_type[0x4];</div><div class='add'>+	u8         reserved_at_4[0x4];</div><div class='add'>+	u8         local_port[0x8];</div><div class='add'>+	u8         reserved_at_10[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x8];</div><div class='add'>+	u8         num_of_bins[0x8];</div><div class='add'>+	u8         reserved_at_30[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x40];</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_bin_range_layout_bits bin_range[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> union mlx5_ifc_ports_control_registers_document_bits {</div><div class='ctx'> 	struct mlx5_ifc_bufferx_reg_bits bufferx_reg;</div><div class='ctx'> 	struct mlx5_ifc_eth_2819_cntrs_grp_data_layout_bits eth_2819_cntrs_grp_data_layout;</div><div class='hunk'>@@ -11125,6 +11856,9 @@ union mlx5_ifc_ports_control_registers_document_bits {</div><div class='ctx'> 	struct mlx5_ifc_mrtc_reg_bits mrtc_reg;</div><div class='ctx'> 	struct mlx5_ifc_mtcap_reg_bits mtcap_reg;</div><div class='ctx'> 	struct mlx5_ifc_mtmp_reg_bits mtmp_reg;</div><div class='add'>+	struct mlx5_ifc_mtptm_reg_bits mtptm_reg;</div><div class='add'>+	struct mlx5_ifc_mtctr_reg_bits mtctr_reg;</div><div class='add'>+	struct mlx5_ifc_pphcr_reg_bits pphcr_reg;</div><div class='ctx'> 	u8         reserved_at_0[0x60e0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -11155,10 +11889,12 @@ struct mlx5_ifc_set_flow_table_root_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         other_vport[0x1];</div><div class='del'>-	u8         reserved_at_41[0xf];</div><div class='add'>+	u8         other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_42[0xe];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='del'>-	u8         reserved_at_60[0x20];</div><div class='add'>+	u8         reserved_at_60[0x10];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         table_type[0x8];</div><div class='ctx'> 	u8         reserved_at_88[0x7];</div><div class='hunk'>@@ -11198,14 +11934,16 @@ struct mlx5_ifc_modify_flow_table_in_bits {</div><div class='ctx'> 	u8         op_mod[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         other_vport[0x1];</div><div class='del'>-	u8         reserved_at_41[0xf];</div><div class='add'>+	u8         other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_42[0xe];</div><div class='ctx'> 	u8         vport_number[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_60[0x10];</div><div class='ctx'> 	u8         modify_field_select[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         table_type[0x8];</div><div class='del'>-	u8         reserved_at_88[0x18];</div><div class='add'>+	u8         reserved_at_88[0x8];</div><div class='add'>+	u8         eswitch_owner_vhca_id[0x10];</div><div class='ctx'> </div><div class='ctx'> 	u8         reserved_at_a0[0x8];</div><div class='ctx'> 	u8         table_id[0x18];</div><div class='hunk'>@@ -11897,7 +12635,9 @@ struct mlx5_ifc_mtrc_ctrl_bits {</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_host_params_context_bits {</div><div class='ctx'> 	u8         host_number[0x8];</div><div class='del'>-	u8         reserved_at_8[0x7];</div><div class='add'>+	u8         reserved_at_8[0x5];</div><div class='add'>+	u8         host_pf_not_exist[0x1];</div><div class='add'>+	u8         reserved_at_14[0x1];</div><div class='ctx'> 	u8         host_pf_disabled[0x1];</div><div class='ctx'> 	u8         host_num_of_vfs[0x10];</div><div class='ctx'> </div><div class='hunk'>@@ -12019,23 +12759,36 @@ struct mlx5_ifc_affiliated_event_header_bits {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY = BIT_ULL(0xc),</div><div class='del'>-	MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_IPSEC = BIT_ULL(0x13),</div><div class='del'>-	MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_SAMPLER = BIT_ULL(0x20),</div><div class='del'>-	MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_FLOW_METER_ASO = BIT_ULL(0x24),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY = 0xc,</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPES_IPSEC = 0x13,</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPES_SAMPLER = 0x20,</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPES_FLOW_METER_ASO = 0x24,</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPES_MACSEC = 0x27,</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPES_INT_KEK = 0x47,</div><div class='add'>+	MLX5_GENERAL_OBJECT_TYPES_RDMA_CTRL = 0x53,</div><div class='add'>+	MLX5_GENERAL_OBJECT_TYPES_PCIE_CONG_EVENT = 0x58,</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPES_FLOW_TABLE_ALIAS = 0xff15,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY =</div><div class='add'>+		BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_ENCRYPTION_KEY),</div><div class='add'>+	MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_IPSEC =</div><div class='add'>+		BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_IPSEC),</div><div class='add'>+	MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_SAMPLER =</div><div class='add'>+		BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_SAMPLER),</div><div class='add'>+	MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_FLOW_METER_ASO =</div><div class='add'>+		BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_FLOW_METER_ASO),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL =</div><div class='add'>+		BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_RDMA_CTRL - 0x40),</div><div class='add'>+	MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_PCIE_CONG_EVENT =</div><div class='add'>+		BIT_ULL(MLX5_GENERAL_OBJECT_TYPES_PCIE_CONG_EVENT - 0x40),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='ctx'> 	MLX5_IPSEC_OBJECT_ICV_LEN_16B,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -12411,6 +13164,7 @@ enum {</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_TLS = 0x1,</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_IPSEC = 0x2,</div><div class='ctx'> 	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_MACSEC = 0x4,</div><div class='add'>+	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_PSP = 0x6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_ifc_tls_static_params_bits {</div><div class='hunk'>@@ -12599,6 +13353,44 @@ struct mlx5_ifc_load_vhca_state_out_bits {</div><div class='ctx'> 	u8         reserved_at_40[0x40];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_adv_rdma_cap_bits {</div><div class='add'>+	u8         rdma_transport_manager[0x1];</div><div class='add'>+	u8         rdma_transport_manager_other_eswitch[0x1];</div><div class='add'>+	u8         reserved_at_2[0x1e];</div><div class='add'>+</div><div class='add'>+	u8         rcx_type[0x8];</div><div class='add'>+	u8         reserved_at_28[0x2];</div><div class='add'>+	u8         ps_entry_log_max_value[0x6];</div><div class='add'>+	u8         reserved_at_30[0x6];</div><div class='add'>+	u8         qp_max_ps_num_entry[0xa];</div><div class='add'>+</div><div class='add'>+	u8         mp_max_num_queues[0x8];</div><div class='add'>+	u8         ps_user_context_max_log_size[0x8];</div><div class='add'>+	u8         message_based_qp_and_striding_wq[0x8];</div><div class='add'>+	u8         reserved_at_58[0x8];</div><div class='add'>+</div><div class='add'>+	u8         max_receive_send_message_size_stride[0x10];</div><div class='add'>+	u8         reserved_at_70[0x10];</div><div class='add'>+</div><div class='add'>+	u8         max_receive_send_message_size_byte[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_a0[0x160];</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_flow_table_prop_layout_bits rdma_transport_rx_flow_table_properties;</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_flow_table_prop_layout_bits rdma_transport_tx_flow_table_properties;</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_flow_table_fields_supported_2_bits rdma_transport_rx_ft_field_support_2;</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_flow_table_fields_supported_2_bits rdma_transport_tx_ft_field_support_2;</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_flow_table_fields_supported_2_bits rdma_transport_rx_ft_field_bitmask_support_2;</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_flow_table_fields_supported_2_bits rdma_transport_tx_ft_field_bitmask_support_2;</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_800[0x3800];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_adv_virtualization_cap_bits {</div><div class='ctx'> 	u8         reserved_at_0[0x3];</div><div class='ctx'> 	u8         pg_track_log_max_num[0x5];</div><div class='hunk'>@@ -12677,6 +13469,11 @@ struct mlx5_ifc_modify_page_track_obj_in_bits {</div><div class='ctx'> 	struct mlx5_ifc_page_track_bits obj_context;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_query_page_track_obj_out_bits {</div><div class='add'>+	struct mlx5_ifc_general_obj_out_cmd_hdr_bits general_obj_out_cmd_hdr;</div><div class='add'>+	struct mlx5_ifc_page_track_bits obj_context;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mlx5_ifc_msecq_reg_bits {</div><div class='ctx'> 	u8         reserved_at_0[0x20];</div><div class='ctx'> </div><div class='hunk'>@@ -12740,4 +13537,109 @@ struct mlx5_ifc_msees_reg_bits {</div><div class='ctx'> 	u8         reserved_at_80[0x180];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct mlx5_ifc_mrtcq_reg_bits {</div><div class='add'>+	u8         reserved_at_0[0x40];</div><div class='add'>+</div><div class='add'>+	u8         rt_clock_identity[0x40];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_80[0x180];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_pcie_cong_event_obj_bits {</div><div class='add'>+	u8         modify_select_field[0x40];</div><div class='add'>+</div><div class='add'>+	u8         inbound_event_en[0x1];</div><div class='add'>+	u8         outbound_event_en[0x1];</div><div class='add'>+	u8         reserved_at_42[0x1e];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_60[0x1];</div><div class='add'>+	u8         inbound_cong_state[0x3];</div><div class='add'>+	u8         reserved_at_64[0x1];</div><div class='add'>+	u8         outbound_cong_state[0x3];</div><div class='add'>+	u8         reserved_at_68[0x18];</div><div class='add'>+</div><div class='add'>+	u8         inbound_cong_low_threshold[0x10];</div><div class='add'>+	u8         inbound_cong_high_threshold[0x10];</div><div class='add'>+</div><div class='add'>+	u8         outbound_cong_low_threshold[0x10];</div><div class='add'>+	u8         outbound_cong_high_threshold[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_e0[0x340];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_pcie_cong_event_cmd_in_bits {</div><div class='add'>+	struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr;</div><div class='add'>+	struct mlx5_ifc_pcie_cong_event_obj_bits cong_obj;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_pcie_cong_event_cmd_out_bits {</div><div class='add'>+	struct mlx5_ifc_general_obj_out_cmd_hdr_bits hdr;</div><div class='add'>+	struct mlx5_ifc_pcie_cong_event_obj_bits cong_obj;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mlx5e_pcie_cong_event_mod_field {</div><div class='add'>+	MLX5_PCIE_CONG_EVENT_MOD_EVENT_EN = BIT(0),</div><div class='add'>+	MLX5_PCIE_CONG_EVENT_MOD_THRESH   = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_psp_rotate_key_in_bits {</div><div class='add'>+	u8         opcode[0x10];</div><div class='add'>+	u8         uid[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x10];</div><div class='add'>+	u8         op_mod[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x40];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_psp_rotate_key_out_bits {</div><div class='add'>+	u8         status[0x8];</div><div class='add'>+	u8         reserved_at_8[0x18];</div><div class='add'>+</div><div class='add'>+	u8         syndrome[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x40];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mlx5_psp_gen_spi_in_key_size {</div><div class='add'>+	MLX5_PSP_GEN_SPI_IN_KEY_SIZE_128 = 0x0,</div><div class='add'>+	MLX5_PSP_GEN_SPI_IN_KEY_SIZE_256 = 0x1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_key_spi_bits {</div><div class='add'>+	u8         spi[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x60];</div><div class='add'>+</div><div class='add'>+	u8         key[8][0x20];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_psp_gen_spi_in_bits {</div><div class='add'>+	u8         opcode[0x10];</div><div class='add'>+	u8         uid[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_20[0x10];</div><div class='add'>+	u8         op_mod[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x20];</div><div class='add'>+</div><div class='add'>+	u8         key_size[0x2];</div><div class='add'>+	u8         reserved_at_62[0xe];</div><div class='add'>+	u8         num_of_spi[0x10];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mlx5_ifc_psp_gen_spi_out_bits {</div><div class='add'>+	u8         status[0x8];</div><div class='add'>+	u8         reserved_at_8[0x18];</div><div class='add'>+</div><div class='add'>+	u8         syndrome[0x20];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_40[0x10];</div><div class='add'>+	u8         num_of_spi[0x10];</div><div class='add'>+</div><div class='add'>+	u8         reserved_at_60[0x20];</div><div class='add'>+</div><div class='add'>+	struct mlx5_ifc_key_spi_bits key_spi[];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* MLX5_IFC_H */</div><div class='head'>diff --git a/include/linux/mlx5/mlx5_ifc_vdpa.h b/include/linux/mlx5/mlx5_ifc_vdpa.h<br/>index 40371c916cf9..58dfa2ee7c83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/mlx5_ifc_vdpa.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/mlx5_ifc_vdpa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/mlx5_ifc_vdpa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/mlx5_ifc_vdpa.h</a></div><div class='hunk'>@@ -148,7 +148,9 @@ enum {</div><div class='ctx'> 	MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_ADDRS           = (u64)1 &lt;&lt; 6,</div><div class='ctx'> 	MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_AVAIL_IDX       = (u64)1 &lt;&lt; 7,</div><div class='ctx'> 	MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_USED_IDX        = (u64)1 &lt;&lt; 8,</div><div class='add'>+	MLX5_VIRTQ_MODIFY_MASK_QUEUE_VIRTIO_VERSION	= (u64)1 &lt;&lt; 10,</div><div class='ctx'> 	MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_MKEY            = (u64)1 &lt;&lt; 11,</div><div class='add'>+	MLX5_VIRTQ_MODIFY_MASK_QUEUE_FEATURES		= (u64)1 &lt;&lt; 12,</div><div class='ctx'> 	MLX5_VIRTQ_MODIFY_MASK_DESC_GROUP_MKEY          = (u64)1 &lt;&lt; 14,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mlx5/port.h b/include/linux/mlx5/port.h<br/>index 26092c78a985..1df9d9a57bbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/port.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/port.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/port.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/port.h</a></div><div class='hunk'>@@ -61,15 +61,6 @@ enum mlx5_an_status {</div><div class='ctx'> #define MLX5_EEPROM_PAGE_LENGTH		256</div><div class='ctx'> #define MLX5_EEPROM_HIGH_PAGE_LENGTH	128</div><div class='ctx'> </div><div class='del'>-struct mlx5_module_eeprom_query_params {</div><div class='del'>-	u16 size;</div><div class='del'>-	u16 offset;</div><div class='del'>-	u16 i2c_address;</div><div class='del'>-	u32 page;</div><div class='del'>-	u32 bank;</div><div class='del'>-	u32 module_number;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum mlx5e_link_mode {</div><div class='ctx'> 	MLX5E_1000BASE_CX_SGMII	 = 0,</div><div class='ctx'> 	MLX5E_1000BASE_KX	 = 1,</div><div class='hunk'>@@ -115,9 +106,13 @@ enum mlx5e_ext_link_mode {</div><div class='ctx'> 	MLX5E_100GAUI_1_100GBASE_CR_KR		= 11,</div><div class='ctx'> 	MLX5E_200GAUI_4_200GBASE_CR4_KR4	= 12,</div><div class='ctx'> 	MLX5E_200GAUI_2_200GBASE_CR2_KR2	= 13,</div><div class='add'>+	MLX5E_200GAUI_1_200GBASE_CR1_KR1	= 14,</div><div class='ctx'> 	MLX5E_400GAUI_8_400GBASE_CR8		= 15,</div><div class='ctx'> 	MLX5E_400GAUI_4_400GBASE_CR4_KR4	= 16,</div><div class='add'>+	MLX5E_400GAUI_2_400GBASE_CR2_KR2	= 17,</div><div class='ctx'> 	MLX5E_800GAUI_8_800GBASE_CR8_KR8	= 19,</div><div class='add'>+	MLX5E_800GAUI_4_800GBASE_CR4_KR4	= 20,</div><div class='add'>+	MLX5E_1600TAUI_8_1600TBASE_CR8_KR8	= 23,</div><div class='ctx'> 	MLX5E_EXT_LINK_MODES_NUMBER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -142,12 +137,6 @@ enum mlx5_ptys_width {</div><div class='ctx'> 	MLX5_PTYS_WIDTH_12X	= 1 &lt;&lt; 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mlx5_port_eth_proto {</div><div class='del'>-	u32 cap;</div><div class='del'>-	u32 admin;</div><div class='del'>-	u32 oper;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define MLX5E_PROT_MASK(link_mode) (1U &lt;&lt; link_mode)</div><div class='ctx'> #define MLX5_GET_ETH_PROTO(reg, out, ext, field)	\</div><div class='ctx'> 	(ext ? MLX5_GET(reg, out, ext_##field) :	\</div><div class='hunk'>@@ -155,18 +144,12 @@ struct mlx5_port_eth_proto {</div><div class='ctx'> </div><div class='ctx'> int mlx5_set_port_caps(struct mlx5_core_dev *dev, u8 port_num, u32 caps);</div><div class='ctx'> int mlx5_query_port_ptys(struct mlx5_core_dev *dev, u32 *ptys,</div><div class='del'>-			 int ptys_size, int proto_mask, u8 local_port);</div><div class='add'>+			 int ptys_size, int proto_mask,</div><div class='add'>+			 u8 local_port, u8 plane_index);</div><div class='ctx'> </div><div class='ctx'> int mlx5_query_ib_port_oper(struct mlx5_core_dev *dev, u16 *link_width_oper,</div><div class='del'>-			    u16 *proto_oper, u8 local_port);</div><div class='del'>-void mlx5_toggle_port_link(struct mlx5_core_dev *dev);</div><div class='del'>-int mlx5_set_port_admin_status(struct mlx5_core_dev *dev,</div><div class='del'>-			       enum mlx5_port_status status);</div><div class='del'>-int mlx5_query_port_admin_status(struct mlx5_core_dev *dev,</div><div class='del'>-				 enum mlx5_port_status *status);</div><div class='del'>-int mlx5_set_port_beacon(struct mlx5_core_dev *dev, u16 beacon_duration);</div><div class='del'>-</div><div class='del'>-int mlx5_set_port_mtu(struct mlx5_core_dev *dev, u16 mtu, u8 port);</div><div class='add'>+			    u16 *proto_oper, u8 local_port, u8 plane_index);</div><div class='add'>+</div><div class='ctx'> void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, u16 *max_mtu, u8 port);</div><div class='ctx'> void mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, u16 *oper_mtu,</div><div class='ctx'> 			      u8 port);</div><div class='hunk'>@@ -174,65 +157,4 @@ void mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, u16 *oper_mtu,</div><div class='ctx'> int mlx5_query_port_vl_hw_cap(struct mlx5_core_dev *dev,</div><div class='ctx'> 			      u8 *vl_hw_cap, u8 local_port);</div><div class='ctx'> </div><div class='del'>-int mlx5_set_port_pause(struct mlx5_core_dev *dev, u32 rx_pause, u32 tx_pause);</div><div class='del'>-int mlx5_query_port_pause(struct mlx5_core_dev *dev,</div><div class='del'>-			  u32 *rx_pause, u32 *tx_pause);</div><div class='del'>-</div><div class='del'>-int mlx5_set_port_pfc(struct mlx5_core_dev *dev, u8 pfc_en_tx, u8 pfc_en_rx);</div><div class='del'>-int mlx5_query_port_pfc(struct mlx5_core_dev *dev, u8 *pfc_en_tx,</div><div class='del'>-			u8 *pfc_en_rx);</div><div class='del'>-</div><div class='del'>-int mlx5_set_port_stall_watermark(struct mlx5_core_dev *dev,</div><div class='del'>-				  u16 stall_critical_watermark,</div><div class='del'>-				  u16 stall_minor_watermark);</div><div class='del'>-int mlx5_query_port_stall_watermark(struct mlx5_core_dev *dev,</div><div class='del'>-				    u16 *stall_critical_watermark, u16 *stall_minor_watermark);</div><div class='del'>-</div><div class='del'>-int mlx5_max_tc(struct mlx5_core_dev *mdev);</div><div class='del'>-</div><div class='del'>-int mlx5_set_port_prio_tc(struct mlx5_core_dev *mdev, u8 *prio_tc);</div><div class='del'>-int mlx5_query_port_prio_tc(struct mlx5_core_dev *mdev,</div><div class='del'>-			    u8 prio, u8 *tc);</div><div class='del'>-int mlx5_set_port_tc_group(struct mlx5_core_dev *mdev, u8 *tc_group);</div><div class='del'>-int mlx5_query_port_tc_group(struct mlx5_core_dev *mdev,</div><div class='del'>-			     u8 tc, u8 *tc_group);</div><div class='del'>-int mlx5_set_port_tc_bw_alloc(struct mlx5_core_dev *mdev, u8 *tc_bw);</div><div class='del'>-int mlx5_query_port_tc_bw_alloc(struct mlx5_core_dev *mdev,</div><div class='del'>-				u8 tc, u8 *bw_pct);</div><div class='del'>-int mlx5_modify_port_ets_rate_limit(struct mlx5_core_dev *mdev,</div><div class='del'>-				    u8 *max_bw_value,</div><div class='del'>-				    u8 *max_bw_unit);</div><div class='del'>-int mlx5_query_port_ets_rate_limit(struct mlx5_core_dev *mdev,</div><div class='del'>-				   u8 *max_bw_value,</div><div class='del'>-				   u8 *max_bw_unit);</div><div class='del'>-int mlx5_set_port_wol(struct mlx5_core_dev *mdev, u8 wol_mode);</div><div class='del'>-int mlx5_query_port_wol(struct mlx5_core_dev *mdev, u8 *wol_mode);</div><div class='del'>-</div><div class='del'>-int mlx5_query_ports_check(struct mlx5_core_dev *mdev, u32 *out, int outlen);</div><div class='del'>-int mlx5_set_ports_check(struct mlx5_core_dev *mdev, u32 *in, int inlen);</div><div class='del'>-int mlx5_set_port_fcs(struct mlx5_core_dev *mdev, u8 enable);</div><div class='del'>-void mlx5_query_port_fcs(struct mlx5_core_dev *mdev, bool *supported,</div><div class='del'>-			 bool *enabled);</div><div class='del'>-int mlx5_query_module_eeprom(struct mlx5_core_dev *dev,</div><div class='del'>-			     u16 offset, u16 size, u8 *data);</div><div class='del'>-int mlx5_query_module_eeprom_by_page(struct mlx5_core_dev *dev,</div><div class='del'>-				     struct mlx5_module_eeprom_query_params *params, u8 *data);</div><div class='del'>-</div><div class='del'>-int mlx5_query_port_dcbx_param(struct mlx5_core_dev *mdev, u32 *out);</div><div class='del'>-int mlx5_set_port_dcbx_param(struct mlx5_core_dev *mdev, u32 *in);</div><div class='del'>-</div><div class='del'>-int mlx5_set_trust_state(struct mlx5_core_dev *mdev, u8 trust_state);</div><div class='del'>-int mlx5_query_trust_state(struct mlx5_core_dev *mdev, u8 *trust_state);</div><div class='del'>-int mlx5_set_dscp2prio(struct mlx5_core_dev *mdev, u8 dscp, u8 prio);</div><div class='del'>-int mlx5_query_dscp2prio(struct mlx5_core_dev *mdev, u8 *dscp2prio);</div><div class='del'>-</div><div class='del'>-int mlx5_port_query_eth_proto(struct mlx5_core_dev *dev, u8 port, bool ext,</div><div class='del'>-			      struct mlx5_port_eth_proto *eproto);</div><div class='del'>-bool mlx5_ptys_ext_supported(struct mlx5_core_dev *mdev);</div><div class='del'>-u32 mlx5_port_ptys2speed(struct mlx5_core_dev *mdev, u32 eth_proto_oper,</div><div class='del'>-			 bool force_legacy);</div><div class='del'>-u32 mlx5_port_speed2linkmodes(struct mlx5_core_dev *mdev, u32 speed,</div><div class='del'>-			      bool force_legacy);</div><div class='del'>-int mlx5_port_max_linkspeed(struct mlx5_core_dev *mdev, u32 *speed);</div><div class='del'>-</div><div class='ctx'> #endif /* __MLX5_PORT_H__ */</div><div class='head'>diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h<br/>index f0e55bf3ec8b..d67aedc6ea68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/qp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/qp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/qp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/qp.h</a></div><div class='hunk'>@@ -149,6 +149,7 @@ enum {</div><div class='ctx'> 	MLX5_WQE_CTRL_CQ_UPDATE		= 2 &lt;&lt; 2,</div><div class='ctx'> 	MLX5_WQE_CTRL_CQ_UPDATE_AND_EQE	= 3 &lt;&lt; 2,</div><div class='ctx'> 	MLX5_WQE_CTRL_SOLICITED		= 1 &lt;&lt; 1,</div><div class='add'>+	MLX5_WQE_CTRL_INITIATOR_SMALL_FENCE = 1 &lt;&lt; 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -236,13 +237,11 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	MLX5_ETH_WQE_SVLAN              = 1 &lt;&lt; 0,</div><div class='ctx'> 	MLX5_ETH_WQE_TRAILER_HDR_OUTER_IP_ASSOC = 1 &lt;&lt; 26,</div><div class='ctx'> 	MLX5_ETH_WQE_TRAILER_HDR_OUTER_L4_ASSOC = 1 &lt;&lt; 27,</div><div class='ctx'> 	MLX5_ETH_WQE_TRAILER_HDR_INNER_IP_ASSOC = 3 &lt;&lt; 26,</div><div class='ctx'> 	MLX5_ETH_WQE_TRAILER_HDR_INNER_L4_ASSOC = 1 &lt;&lt; 28,</div><div class='ctx'> 	MLX5_ETH_WQE_INSERT_TRAILER     = 1 &lt;&lt; 30,</div><div class='del'>-	MLX5_ETH_WQE_INSERT_VLAN        = 1 &lt;&lt; 15,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -252,9 +251,15 @@ enum {</div><div class='ctx'> 	MLX5_ETH_WQE_SWP_OUTER_L4_UDP   = 1 &lt;&lt; 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Metadata bits 0-7 are used by timestamping */</div><div class='add'>+/* Base shift for metadata bits used by IPsec and MACsec */</div><div class='add'>+#define MLX5_ETH_WQE_FT_META_SHIFT 8</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='del'>-	MLX5_ETH_WQE_FT_META_IPSEC = BIT(0),</div><div class='del'>-	MLX5_ETH_WQE_FT_META_MACSEC = BIT(1),</div><div class='add'>+	MLX5_ETH_WQE_FT_META_IPSEC = BIT(0) &lt;&lt; MLX5_ETH_WQE_FT_META_SHIFT,</div><div class='add'>+	MLX5_ETH_WQE_FT_META_MACSEC = BIT(1) &lt;&lt; MLX5_ETH_WQE_FT_META_SHIFT,</div><div class='add'>+	MLX5_ETH_WQE_FT_META_MACSEC_FS_ID_MASK =</div><div class='add'>+		GENMASK(5, 2) &lt;&lt; MLX5_ETH_WQE_FT_META_SHIFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mlx5_wqe_eth_seg {</div><div class='hunk'>@@ -274,10 +279,6 @@ struct mlx5_wqe_eth_seg {</div><div class='ctx'> 				DECLARE_FLEX_ARRAY(u8, data);</div><div class='ctx'> 			};</div><div class='ctx'> 		} inline_hdr;</div><div class='del'>-		struct {</div><div class='del'>-			__be16 type;</div><div class='del'>-			__be16 vlan_tci;</div><div class='del'>-		} insert;</div><div class='ctx'> 		__be32 trailer;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='hunk'>@@ -576,9 +577,12 @@ static inline const char *mlx5_qp_state_str(int state)</div><div class='ctx'> </div><div class='ctx'> static inline int mlx5_get_qp_default_ts(struct mlx5_core_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return !MLX5_CAP_ROCE(dev, qp_ts_format) ?</div><div class='del'>-		       MLX5_TIMESTAMP_FORMAT_FREE_RUNNING :</div><div class='del'>-		       MLX5_TIMESTAMP_FORMAT_DEFAULT;</div><div class='add'>+	u8 supported_ts_cap = mlx5_get_roce_state(dev) ?</div><div class='add'>+			      MLX5_CAP_ROCE(dev, qp_ts_format) :</div><div class='add'>+			      MLX5_CAP_GEN(dev, sq_ts_format);</div><div class='add'>+</div><div class='add'>+	return supported_ts_cap ? MLX5_TIMESTAMP_FORMAT_DEFAULT :</div><div class='add'>+	       MLX5_TIMESTAMP_FORMAT_FREE_RUNNING;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* MLX5_QP_H */</div><div class='head'>diff --git a/include/linux/mlx5/vport.h b/include/linux/mlx5/vport.h<br/>index c36cc6d82926..f876bfc0669c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/vport.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mlx5/vport.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mlx5/vport.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mlx5/vport.h</a></div><div class='hunk'>@@ -73,7 +73,8 @@ int mlx5_modify_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 mtu);</div><div class='ctx'> int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev,</div><div class='ctx'> 					   u64 *system_image_guid);</div><div class='ctx'> int mlx5_query_nic_vport_sd_group(struct mlx5_core_dev *mdev, u8 *sd_group);</div><div class='del'>-int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid);</div><div class='add'>+int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev,</div><div class='add'>+				   u16 vport, bool other_vport, u64 *node_guid);</div><div class='ctx'> int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,</div><div class='ctx'> 				    u16 vport, u64 node_guid);</div><div class='ctx'> int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,</div><div class='hunk'>@@ -135,4 +136,6 @@ int mlx5_nic_vport_unaffiliate_multiport(struct mlx5_core_dev *port_mdev);</div><div class='ctx'> u64 mlx5_query_nic_system_image_guid(struct mlx5_core_dev *mdev);</div><div class='ctx'> int mlx5_vport_get_other_func_cap(struct mlx5_core_dev *dev, u16 vport, void *out,</div><div class='ctx'> 				  u16 opmod);</div><div class='add'>+int mlx5_vport_get_vhca_id(struct mlx5_core_dev *dev, u16 vport, u16 *vhca_id);</div><div class='add'>+</div><div class='ctx'> #endif /* __MLX5_VPORT_H__ */</div><div class='head'>diff --git a/include/linux/mm.h b/include/linux/mm.h<br/>index f5a97dec5169..7a1819c20643 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mm.h</a></div><div class='hunk'>@@ -5,12 +5,14 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mmdebug.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/pgalloc_tag.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/debug_locks.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/mmap_lock.h&gt;</div><div class='ctx'> #include &lt;linux/range.h&gt;</div><div class='hunk'>@@ -30,29 +32,22 @@</div><div class='ctx'> #include &lt;linux/kasan.h&gt;</div><div class='ctx'> #include &lt;linux/memremap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/cacheinfo.h&gt;</div><div class='add'>+#include &lt;linux/rcuwait.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mempolicy;</div><div class='ctx'> struct anon_vma;</div><div class='ctx'> struct anon_vma_chain;</div><div class='ctx'> struct user_struct;</div><div class='ctx'> struct pt_regs;</div><div class='add'>+struct folio_batch;</div><div class='ctx'> </div><div class='del'>-extern int sysctl_page_lock_unfairness;</div><div class='del'>-</div><div class='add'>+void arch_mm_preinit(void);</div><div class='ctx'> void mm_core_init(void);</div><div class='ctx'> void init_mm_internals(void);</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_NUMA		/* Don't use mapnrs, do it properly */</div><div class='del'>-extern unsigned long max_mapnr;</div><div class='del'>-</div><div class='del'>-static inline void set_max_mapnr(unsigned long limit)</div><div class='del'>-{</div><div class='del'>-	max_mapnr = limit;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void set_max_mapnr(unsigned long limit) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern atomic_long_t _totalram_pages;</div><div class='ctx'> static inline unsigned long totalram_pages(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -75,8 +70,15 @@ static inline void totalram_pages_add(long count)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void * high_memory;</div><div class='del'>-extern int page_cluster;</div><div class='del'>-extern const int page_cluster_max;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert between pages and MB</div><div class='add'>+ * 20 is the shift for 1MB (2^20 = 1MB)</div><div class='add'>+ * PAGE_SHIFT is the shift for page size (e.g., 12 for 4KB pages)</div><div class='add'>+ * So (20 - PAGE_SHIFT) converts between pages and MB</div><div class='add'>+ */</div><div class='add'>+#define PAGES_TO_MB(pages) ((pages) &gt;&gt; (20 - PAGE_SHIFT))</div><div class='add'>+#define MB_TO_PAGES(mb)    ((mb) &lt;&lt; (20 - PAGE_SHIFT))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> extern int sysctl_legacy_va_layout;</div><div class='hunk'>@@ -86,7 +88,7 @@ extern int sysctl_legacy_va_layout;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_MMAP_RND_BITS</div><div class='ctx'> extern const int mmap_rnd_bits_min;</div><div class='del'>-extern const int mmap_rnd_bits_max;</div><div class='add'>+extern int mmap_rnd_bits_max __ro_after_init;</div><div class='ctx'> extern int mmap_rnd_bits __read_mostly;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS</div><div class='hunk'>@@ -95,6 +97,16 @@ extern const int mmap_rnd_compat_bits_max;</div><div class='ctx'> extern int mmap_rnd_compat_bits __read_mostly;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef DIRECT_MAP_PHYSMEM_END</div><div class='add'>+# ifdef MAX_PHYSMEM_BITS</div><div class='add'>+# define DIRECT_MAP_PHYSMEM_END	((1ULL &lt;&lt; MAX_PHYSMEM_BITS) - 1)</div><div class='add'>+# else</div><div class='add'>+# define DIRECT_MAP_PHYSMEM_END	(((phys_addr_t)-1)&amp;~(1ULL&lt;&lt;63))</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define INVALID_PHYS_ADDR (~(phys_addr_t)0)</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -198,23 +210,14 @@ extern int sysctl_max_map_count;</div><div class='ctx'> extern unsigned long sysctl_user_reserve_kbytes;</div><div class='ctx'> extern unsigned long sysctl_admin_reserve_kbytes;</div><div class='ctx'> </div><div class='del'>-extern int sysctl_overcommit_memory;</div><div class='del'>-extern int sysctl_overcommit_ratio;</div><div class='del'>-extern unsigned long sysctl_overcommit_kbytes;</div><div class='del'>-</div><div class='del'>-int overcommit_ratio_handler(struct ctl_table *, int, void *, size_t *,</div><div class='del'>-		loff_t *);</div><div class='del'>-int overcommit_kbytes_handler(struct ctl_table *, int, void *, size_t *,</div><div class='del'>-		loff_t *);</div><div class='del'>-int overcommit_policy_handler(struct ctl_table *, int, void *, size_t *,</div><div class='del'>-		loff_t *);</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_SPARSEMEM) &amp;&amp; !defined(CONFIG_SPARSEMEM_VMEMMAP)</div><div class='del'>-#define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))</div><div class='del'>-#define folio_page_idx(folio, p)	(page_to_pfn(p) - folio_pfn(folio))</div><div class='add'>+bool page_range_contiguous(const struct page *page, unsigned long nr_pages);</div><div class='ctx'> #else</div><div class='del'>-#define nth_page(page,n) ((page) + (n))</div><div class='del'>-#define folio_page_idx(folio, p)	((p) - &amp;(folio)-&gt;page)</div><div class='add'>+static inline bool page_range_contiguous(const struct page *page,</div><div class='add'>+		unsigned long nr_pages)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* to align the pointer to the (next) page boundary */</div><div class='hunk'>@@ -226,7 +229,20 @@ int overcommit_policy_handler(struct ctl_table *, int, void *, size_t *,</div><div class='ctx'> /* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */</div><div class='ctx'> #define PAGE_ALIGNED(addr)	IS_ALIGNED((unsigned long)(addr), PAGE_SIZE)</div><div class='ctx'> </div><div class='del'>-#define lru_to_page(head) (list_entry((head)-&gt;prev, struct page, lru))</div><div class='add'>+/**</div><div class='add'>+ * folio_page_idx - Return the number of a page in a folio.</div><div class='add'>+ * @folio: The folio.</div><div class='add'>+ * @page: The folio page.</div><div class='add'>+ *</div><div class='add'>+ * This function expects that the page is actually part of the folio.</div><div class='add'>+ * The returned number is relative to the start of the folio.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long folio_page_idx(const struct folio *folio,</div><div class='add'>+		const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return page - &amp;folio-&gt;page;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct folio *lru_to_folio(struct list_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	return list_entry((head)-&gt;prev, struct folio, lru);</div><div class='hunk'>@@ -247,8 +263,6 @@ void setup_initial_init_mm(void *start_code, void *end_code,</div><div class='ctx'> struct vm_area_struct *vm_area_alloc(struct mm_struct *);</div><div class='ctx'> struct vm_area_struct *vm_area_dup(struct vm_area_struct *);</div><div class='ctx'> void vm_area_free(struct vm_area_struct *);</div><div class='del'>-/* Use only if VMA has no other users */</div><div class='del'>-void __vm_area_free(struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='ctx'> extern struct rb_root nommu_region_tree;</div><div class='hunk'>@@ -261,135 +275,236 @@ extern unsigned int kobjsize(const void *objp);</div><div class='ctx'>  * vm_flags in vm_area_struct, see mm_types.h.</div><div class='ctx'>  * When changing, update also include/trace/events/mmflags.h</div><div class='ctx'>  */</div><div class='del'>-#define VM_NONE		0x00000000</div><div class='ctx'> </div><div class='del'>-#define VM_READ		0x00000001	/* currently active flags */</div><div class='del'>-#define VM_WRITE	0x00000002</div><div class='del'>-#define VM_EXEC		0x00000004</div><div class='del'>-#define VM_SHARED	0x00000008</div><div class='add'>+#define VM_NONE		0x00000000</div><div class='ctx'> </div><div class='del'>-/* mprotect() hardcodes VM_MAYREAD &gt;&gt; 4 == VM_READ, and so for r/w/x bits. */</div><div class='del'>-#define VM_MAYREAD	0x00000010	/* limits for mprotect() etc */</div><div class='del'>-#define VM_MAYWRITE	0x00000020</div><div class='del'>-#define VM_MAYEXEC	0x00000040</div><div class='del'>-#define VM_MAYSHARE	0x00000080</div><div class='add'>+/**</div><div class='add'>+ * typedef vma_flag_t - specifies an individual VMA flag by bit number.</div><div class='add'>+ *</div><div class='add'>+ * This value is made type safe by sparse to avoid passing invalid flag values</div><div class='add'>+ * around.</div><div class='add'>+ */</div><div class='add'>+typedef int __bitwise vma_flag_t;</div><div class='ctx'> </div><div class='del'>-#define VM_GROWSDOWN	0x00000100	/* general info on the segment */</div><div class='add'>+#define DECLARE_VMA_BIT(name, bitnum) \</div><div class='add'>+	VMA_ ## name ## _BIT = ((__force vma_flag_t)bitnum)</div><div class='add'>+#define DECLARE_VMA_BIT_ALIAS(name, aliased) \</div><div class='add'>+	VMA_ ## name ## _BIT = (VMA_ ## aliased ## _BIT)</div><div class='add'>+enum {</div><div class='add'>+	DECLARE_VMA_BIT(READ, 0),</div><div class='add'>+	DECLARE_VMA_BIT(WRITE, 1),</div><div class='add'>+	DECLARE_VMA_BIT(EXEC, 2),</div><div class='add'>+	DECLARE_VMA_BIT(SHARED, 3),</div><div class='add'>+	/* mprotect() hardcodes VM_MAYREAD &gt;&gt; 4 == VM_READ, and so for r/w/x bits. */</div><div class='add'>+	DECLARE_VMA_BIT(MAYREAD, 4),	/* limits for mprotect() etc. */</div><div class='add'>+	DECLARE_VMA_BIT(MAYWRITE, 5),</div><div class='add'>+	DECLARE_VMA_BIT(MAYEXEC, 6),</div><div class='add'>+	DECLARE_VMA_BIT(MAYSHARE, 7),</div><div class='add'>+	DECLARE_VMA_BIT(GROWSDOWN, 8),	/* general info on the segment */</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-#define VM_UFFD_MISSING	0x00000200	/* missing pages tracking */</div><div class='del'>-#else /* CONFIG_MMU */</div><div class='del'>-#define VM_MAYOVERLAY	0x00000200	/* nommu: R/O MAP_PRIVATE mapping that might overlay a file mapping */</div><div class='del'>-#define VM_UFFD_MISSING	0</div><div class='add'>+	DECLARE_VMA_BIT(UFFD_MISSING, 9),/* missing pages tracking */</div><div class='add'>+#else</div><div class='add'>+	/* nommu: R/O MAP_PRIVATE mapping that might overlay a file mapping */</div><div class='add'>+	DECLARE_VMA_BIT(MAYOVERLAY, 9),</div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='del'>-#define VM_PFNMAP	0x00000400	/* Page-ranges managed without "struct page", just pure PFN */</div><div class='del'>-#define VM_UFFD_WP	0x00001000	/* wrprotect pages tracking */</div><div class='del'>-</div><div class='del'>-#define VM_LOCKED	0x00002000</div><div class='del'>-#define VM_IO           0x00004000	/* Memory mapped I/O or similar */</div><div class='del'>-</div><div class='del'>-					/* Used by sys_madvise() */</div><div class='del'>-#define VM_SEQ_READ	0x00008000	/* App will access data sequentially */</div><div class='del'>-#define VM_RAND_READ	0x00010000	/* App will not benefit from clustered reads */</div><div class='del'>-</div><div class='del'>-#define VM_DONTCOPY	0x00020000      /* Do not copy this vma on fork */</div><div class='del'>-#define VM_DONTEXPAND	0x00040000	/* Cannot expand with mremap() */</div><div class='del'>-#define VM_LOCKONFAULT	0x00080000	/* Lock the pages covered when they are faulted in */</div><div class='del'>-#define VM_ACCOUNT	0x00100000	/* Is a VM accounted object */</div><div class='del'>-#define VM_NORESERVE	0x00200000	/* should the VM suppress accounting */</div><div class='del'>-#define VM_HUGETLB	0x00400000	/* Huge TLB Page VM */</div><div class='del'>-#define VM_SYNC		0x00800000	/* Synchronous page faults */</div><div class='del'>-#define VM_ARCH_1	0x01000000	/* Architecture-specific flag */</div><div class='del'>-#define VM_WIPEONFORK	0x02000000	/* Wipe VMA contents in child. */</div><div class='del'>-#define VM_DONTDUMP	0x04000000	/* Do not include in the core dump */</div><div class='del'>-</div><div class='add'>+	/* Page-ranges managed without "struct page", just pure PFN */</div><div class='add'>+	DECLARE_VMA_BIT(PFNMAP, 10),</div><div class='add'>+	DECLARE_VMA_BIT(MAYBE_GUARD, 11),</div><div class='add'>+	DECLARE_VMA_BIT(UFFD_WP, 12),	/* wrprotect pages tracking */</div><div class='add'>+	DECLARE_VMA_BIT(LOCKED, 13),</div><div class='add'>+	DECLARE_VMA_BIT(IO, 14),	/* Memory mapped I/O or similar */</div><div class='add'>+	DECLARE_VMA_BIT(SEQ_READ, 15),	/* App will access data sequentially */</div><div class='add'>+	DECLARE_VMA_BIT(RAND_READ, 16),	/* App will not benefit from clustered reads */</div><div class='add'>+	DECLARE_VMA_BIT(DONTCOPY, 17),	/* Do not copy this vma on fork */</div><div class='add'>+	DECLARE_VMA_BIT(DONTEXPAND, 18),/* Cannot expand with mremap() */</div><div class='add'>+	DECLARE_VMA_BIT(LOCKONFAULT, 19),/* Lock pages covered when faulted in */</div><div class='add'>+	DECLARE_VMA_BIT(ACCOUNT, 20),	/* Is a VM accounted object */</div><div class='add'>+	DECLARE_VMA_BIT(NORESERVE, 21),	/* should the VM suppress accounting */</div><div class='add'>+	DECLARE_VMA_BIT(HUGETLB, 22),	/* Huge TLB Page VM */</div><div class='add'>+	DECLARE_VMA_BIT(SYNC, 23),	/* Synchronous page faults */</div><div class='add'>+	DECLARE_VMA_BIT(ARCH_1, 24),	/* Architecture-specific flag */</div><div class='add'>+	DECLARE_VMA_BIT(WIPEONFORK, 25),/* Wipe VMA contents in child. */</div><div class='add'>+	DECLARE_VMA_BIT(DONTDUMP, 26),	/* Do not include in the core dump */</div><div class='add'>+	DECLARE_VMA_BIT(SOFTDIRTY, 27),	/* NOT soft dirty clean area */</div><div class='add'>+	DECLARE_VMA_BIT(MIXEDMAP, 28),	/* Can contain struct page and pure PFN pages */</div><div class='add'>+	DECLARE_VMA_BIT(HUGEPAGE, 29),	/* MADV_HUGEPAGE marked this vma */</div><div class='add'>+	DECLARE_VMA_BIT(NOHUGEPAGE, 30),/* MADV_NOHUGEPAGE marked this vma */</div><div class='add'>+	DECLARE_VMA_BIT(MERGEABLE, 31),	/* KSM may merge identical pages */</div><div class='add'>+	/* These bits are reused, we define specific uses below. */</div><div class='add'>+	DECLARE_VMA_BIT(HIGH_ARCH_0, 32),</div><div class='add'>+	DECLARE_VMA_BIT(HIGH_ARCH_1, 33),</div><div class='add'>+	DECLARE_VMA_BIT(HIGH_ARCH_2, 34),</div><div class='add'>+	DECLARE_VMA_BIT(HIGH_ARCH_3, 35),</div><div class='add'>+	DECLARE_VMA_BIT(HIGH_ARCH_4, 36),</div><div class='add'>+	DECLARE_VMA_BIT(HIGH_ARCH_5, 37),</div><div class='add'>+	DECLARE_VMA_BIT(HIGH_ARCH_6, 38),</div><div class='add'>+	/*</div><div class='add'>+	 * This flag is used to connect VFIO to arch specific KVM code. It</div><div class='add'>+	 * indicates that the memory under this VMA is safe for use with any</div><div class='add'>+	 * non-cachable memory type inside KVM. Some VFIO devices, on some</div><div class='add'>+	 * platforms, are thought to be unsafe and can cause machine crashes</div><div class='add'>+	 * if KVM does not lock down the memory type.</div><div class='add'>+	 */</div><div class='add'>+	DECLARE_VMA_BIT(ALLOW_ANY_UNCACHED, 39),</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(DROPPABLE, ARCH_1),</div><div class='add'>+#else</div><div class='add'>+	DECLARE_VMA_BIT(DROPPABLE, 40),</div><div class='add'>+#endif</div><div class='add'>+	DECLARE_VMA_BIT(UFFD_MINOR, 41),</div><div class='add'>+	DECLARE_VMA_BIT(SEALED, 42),</div><div class='add'>+	/* Flags that reuse flags above. */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(PKEY_BIT0, HIGH_ARCH_0),</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(PKEY_BIT1, HIGH_ARCH_1),</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(PKEY_BIT2, HIGH_ARCH_2),</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(PKEY_BIT3, HIGH_ARCH_3),</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(PKEY_BIT4, HIGH_ARCH_4),</div><div class='add'>+#if defined(CONFIG_X86_USER_SHADOW_STACK)</div><div class='add'>+	/*</div><div class='add'>+	 * VM_SHADOW_STACK should not be set with VM_SHARED because of lack of</div><div class='add'>+	 * support core mm.</div><div class='add'>+	 *</div><div class='add'>+	 * These VMAs will get a single end guard page. This helps userspace</div><div class='add'>+	 * protect itself from attacks. A single page is enough for current</div><div class='add'>+	 * shadow stack archs (x86). See the comments near alloc_shstk() in</div><div class='add'>+	 * arch/x86/kernel/shstk.c for more details on the guard size.</div><div class='add'>+	 */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(SHADOW_STACK, HIGH_ARCH_5),</div><div class='add'>+#elif defined(CONFIG_ARM64_GCS)</div><div class='add'>+	/*</div><div class='add'>+	 * arm64's Guarded Control Stack implements similar functionality and</div><div class='add'>+	 * has similar constraints to shadow stacks.</div><div class='add'>+	 */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(SHADOW_STACK, HIGH_ARCH_6),</div><div class='add'>+#endif</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(SAO, ARCH_1),		/* Strong Access Ordering (powerpc) */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(GROWSUP, ARCH_1),		/* parisc */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(SPARC_ADI, ARCH_1),	/* sparc64 */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(ARM64_BTI, ARCH_1),	/* arm64 */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(ARCH_CLEAR, ARCH_1),	/* sparc64, arm64 */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(MAPPED_COPY, ARCH_1),	/* !CONFIG_MMU */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(MTE, HIGH_ARCH_4),	/* arm64 */</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(MTE_ALLOWED, HIGH_ARCH_5),/* arm64 */</div><div class='add'>+#ifdef CONFIG_STACK_GROWSUP</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(STACK, GROWSUP),</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(STACK_EARLY, GROWSDOWN),</div><div class='add'>+#else</div><div class='add'>+	DECLARE_VMA_BIT_ALIAS(STACK, GROWSDOWN),</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+#undef DECLARE_VMA_BIT</div><div class='add'>+#undef DECLARE_VMA_BIT_ALIAS</div><div class='add'>+</div><div class='add'>+#define INIT_VM_FLAG(name) BIT((__force int) VMA_ ## name ## _BIT)</div><div class='add'>+#define VM_READ		INIT_VM_FLAG(READ)</div><div class='add'>+#define VM_WRITE	INIT_VM_FLAG(WRITE)</div><div class='add'>+#define VM_EXEC		INIT_VM_FLAG(EXEC)</div><div class='add'>+#define VM_SHARED	INIT_VM_FLAG(SHARED)</div><div class='add'>+#define VM_MAYREAD	INIT_VM_FLAG(MAYREAD)</div><div class='add'>+#define VM_MAYWRITE	INIT_VM_FLAG(MAYWRITE)</div><div class='add'>+#define VM_MAYEXEC	INIT_VM_FLAG(MAYEXEC)</div><div class='add'>+#define VM_MAYSHARE	INIT_VM_FLAG(MAYSHARE)</div><div class='add'>+#define VM_GROWSDOWN	INIT_VM_FLAG(GROWSDOWN)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+#define VM_UFFD_MISSING	INIT_VM_FLAG(UFFD_MISSING)</div><div class='add'>+#else</div><div class='add'>+#define VM_UFFD_MISSING	VM_NONE</div><div class='add'>+#define VM_MAYOVERLAY	INIT_VM_FLAG(MAYOVERLAY)</div><div class='add'>+#endif</div><div class='add'>+#define VM_PFNMAP	INIT_VM_FLAG(PFNMAP)</div><div class='add'>+#define VM_MAYBE_GUARD	INIT_VM_FLAG(MAYBE_GUARD)</div><div class='add'>+#define VM_UFFD_WP	INIT_VM_FLAG(UFFD_WP)</div><div class='add'>+#define VM_LOCKED	INIT_VM_FLAG(LOCKED)</div><div class='add'>+#define VM_IO		INIT_VM_FLAG(IO)</div><div class='add'>+#define VM_SEQ_READ	INIT_VM_FLAG(SEQ_READ)</div><div class='add'>+#define VM_RAND_READ	INIT_VM_FLAG(RAND_READ)</div><div class='add'>+#define VM_DONTCOPY	INIT_VM_FLAG(DONTCOPY)</div><div class='add'>+#define VM_DONTEXPAND	INIT_VM_FLAG(DONTEXPAND)</div><div class='add'>+#define VM_LOCKONFAULT	INIT_VM_FLAG(LOCKONFAULT)</div><div class='add'>+#define VM_ACCOUNT	INIT_VM_FLAG(ACCOUNT)</div><div class='add'>+#define VM_NORESERVE	INIT_VM_FLAG(NORESERVE)</div><div class='add'>+#define VM_HUGETLB	INIT_VM_FLAG(HUGETLB)</div><div class='add'>+#define VM_SYNC		INIT_VM_FLAG(SYNC)</div><div class='add'>+#define VM_ARCH_1	INIT_VM_FLAG(ARCH_1)</div><div class='add'>+#define VM_WIPEONFORK	INIT_VM_FLAG(WIPEONFORK)</div><div class='add'>+#define VM_DONTDUMP	INIT_VM_FLAG(DONTDUMP)</div><div class='ctx'> #ifdef CONFIG_MEM_SOFT_DIRTY</div><div class='del'>-# define VM_SOFTDIRTY	0x08000000	/* Not soft dirty clean area */</div><div class='add'>+#define VM_SOFTDIRTY	INIT_VM_FLAG(SOFTDIRTY)</div><div class='ctx'> #else</div><div class='del'>-# define VM_SOFTDIRTY	0</div><div class='add'>+#define VM_SOFTDIRTY	VM_NONE</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#define VM_MIXEDMAP	0x10000000	/* Can contain "struct page" and pure PFN pages */</div><div class='del'>-#define VM_HUGEPAGE	0x20000000	/* MADV_HUGEPAGE marked this vma */</div><div class='del'>-#define VM_NOHUGEPAGE	0x40000000	/* MADV_NOHUGEPAGE marked this vma */</div><div class='del'>-#define VM_MERGEABLE	0x80000000	/* KSM may merge identical pages */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_USES_HIGH_VMA_FLAGS</div><div class='del'>-#define VM_HIGH_ARCH_BIT_0	32	/* bit only usable on 64-bit architectures */</div><div class='del'>-#define VM_HIGH_ARCH_BIT_1	33	/* bit only usable on 64-bit architectures */</div><div class='del'>-#define VM_HIGH_ARCH_BIT_2	34	/* bit only usable on 64-bit architectures */</div><div class='del'>-#define VM_HIGH_ARCH_BIT_3	35	/* bit only usable on 64-bit architectures */</div><div class='del'>-#define VM_HIGH_ARCH_BIT_4	36	/* bit only usable on 64-bit architectures */</div><div class='del'>-#define VM_HIGH_ARCH_BIT_5	37	/* bit only usable on 64-bit architectures */</div><div class='del'>-#define VM_HIGH_ARCH_0	BIT(VM_HIGH_ARCH_BIT_0)</div><div class='del'>-#define VM_HIGH_ARCH_1	BIT(VM_HIGH_ARCH_BIT_1)</div><div class='del'>-#define VM_HIGH_ARCH_2	BIT(VM_HIGH_ARCH_BIT_2)</div><div class='del'>-#define VM_HIGH_ARCH_3	BIT(VM_HIGH_ARCH_BIT_3)</div><div class='del'>-#define VM_HIGH_ARCH_4	BIT(VM_HIGH_ARCH_BIT_4)</div><div class='del'>-#define VM_HIGH_ARCH_5	BIT(VM_HIGH_ARCH_BIT_5)</div><div class='del'>-#endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_HAS_PKEYS</div><div class='del'>-# define VM_PKEY_SHIFT	VM_HIGH_ARCH_BIT_0</div><div class='del'>-# define VM_PKEY_BIT0	VM_HIGH_ARCH_0	/* A protection key is a 4-bit value */</div><div class='del'>-# define VM_PKEY_BIT1	VM_HIGH_ARCH_1	/* on x86 and 5-bit value on ppc64   */</div><div class='del'>-# define VM_PKEY_BIT2	VM_HIGH_ARCH_2</div><div class='del'>-# define VM_PKEY_BIT3	VM_HIGH_ARCH_3</div><div class='del'>-#ifdef CONFIG_PPC</div><div class='del'>-# define VM_PKEY_BIT4  VM_HIGH_ARCH_4</div><div class='add'>+#define VM_MIXEDMAP	INIT_VM_FLAG(MIXEDMAP)</div><div class='add'>+#define VM_HUGEPAGE	INIT_VM_FLAG(HUGEPAGE)</div><div class='add'>+#define VM_NOHUGEPAGE	INIT_VM_FLAG(NOHUGEPAGE)</div><div class='add'>+#define VM_MERGEABLE	INIT_VM_FLAG(MERGEABLE)</div><div class='add'>+#define VM_STACK	INIT_VM_FLAG(STACK)</div><div class='add'>+#ifdef CONFIG_STACK_GROWS_UP</div><div class='add'>+#define VM_STACK_EARLY	INIT_VM_FLAG(STACK_EARLY)</div><div class='ctx'> #else</div><div class='del'>-# define VM_PKEY_BIT4  0</div><div class='add'>+#define VM_STACK_EARLY	VM_NONE</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_PKEYS</div><div class='add'>+#define VM_PKEY_SHIFT ((__force int)VMA_HIGH_ARCH_0_BIT)</div><div class='add'>+/* Despite the naming, these are FLAGS not bits. */</div><div class='add'>+#define VM_PKEY_BIT0 INIT_VM_FLAG(PKEY_BIT0)</div><div class='add'>+#define VM_PKEY_BIT1 INIT_VM_FLAG(PKEY_BIT1)</div><div class='add'>+#define VM_PKEY_BIT2 INIT_VM_FLAG(PKEY_BIT2)</div><div class='add'>+#if CONFIG_ARCH_PKEY_BITS &gt; 3</div><div class='add'>+#define VM_PKEY_BIT3 INIT_VM_FLAG(PKEY_BIT3)</div><div class='add'>+#else</div><div class='add'>+#define VM_PKEY_BIT3  VM_NONE</div><div class='add'>+#endif /* CONFIG_ARCH_PKEY_BITS &gt; 3 */</div><div class='add'>+#if CONFIG_ARCH_PKEY_BITS &gt; 4</div><div class='add'>+#define VM_PKEY_BIT4 INIT_VM_FLAG(PKEY_BIT4)</div><div class='add'>+#else</div><div class='add'>+#define VM_PKEY_BIT4  VM_NONE</div><div class='add'>+#endif /* CONFIG_ARCH_PKEY_BITS &gt; 4 */</div><div class='ctx'> #endif /* CONFIG_ARCH_HAS_PKEYS */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_X86_USER_SHADOW_STACK</div><div class='del'>-/*</div><div class='del'>- * VM_SHADOW_STACK should not be set with VM_SHARED because of lack of</div><div class='del'>- * support core mm.</div><div class='del'>- *</div><div class='del'>- * These VMAs will get a single end guard page. This helps userspace protect</div><div class='del'>- * itself from attacks. A single page is enough for current shadow stack archs</div><div class='del'>- * (x86). See the comments near alloc_shstk() in arch/x86/kernel/shstk.c</div><div class='del'>- * for more details on the guard size.</div><div class='del'>- */</div><div class='del'>-# define VM_SHADOW_STACK	VM_HIGH_ARCH_5</div><div class='add'>+#if defined(CONFIG_X86_USER_SHADOW_STACK) || defined(CONFIG_ARM64_GCS)</div><div class='add'>+#define VM_SHADOW_STACK	INIT_VM_FLAG(SHADOW_STACK)</div><div class='ctx'> #else</div><div class='del'>-# define VM_SHADOW_STACK	VM_NONE</div><div class='add'>+#define VM_SHADOW_STACK	VM_NONE</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_X86)</div><div class='del'>-# define VM_PAT		VM_ARCH_1	/* PAT reserves whole VMA at once (x86) */</div><div class='del'>-#elif defined(CONFIG_PPC)</div><div class='del'>-# define VM_SAO		VM_ARCH_1	/* Strong Access Ordering (powerpc) */</div><div class='add'>+#if defined(CONFIG_PPC64)</div><div class='add'>+#define VM_SAO		INIT_VM_FLAG(SAO)</div><div class='ctx'> #elif defined(CONFIG_PARISC)</div><div class='del'>-# define VM_GROWSUP	VM_ARCH_1</div><div class='add'>+#define VM_GROWSUP	INIT_VM_FLAG(GROWSUP)</div><div class='ctx'> #elif defined(CONFIG_SPARC64)</div><div class='del'>-# define VM_SPARC_ADI	VM_ARCH_1	/* Uses ADI tag for access control */</div><div class='del'>-# define VM_ARCH_CLEAR	VM_SPARC_ADI</div><div class='add'>+#define VM_SPARC_ADI	INIT_VM_FLAG(SPARC_ADI)</div><div class='add'>+#define VM_ARCH_CLEAR	INIT_VM_FLAG(ARCH_CLEAR)</div><div class='ctx'> #elif defined(CONFIG_ARM64)</div><div class='del'>-# define VM_ARM64_BTI	VM_ARCH_1	/* BTI guarded page, a.k.a. GP bit */</div><div class='del'>-# define VM_ARCH_CLEAR	VM_ARM64_BTI</div><div class='add'>+#define VM_ARM64_BTI	INIT_VM_FLAG(ARM64_BTI)</div><div class='add'>+#define VM_ARCH_CLEAR	INIT_VM_FLAG(ARCH_CLEAR)</div><div class='ctx'> #elif !defined(CONFIG_MMU)</div><div class='del'>-# define VM_MAPPED_COPY	VM_ARCH_1	/* T if mapped copy of data (nommu mmap) */</div><div class='add'>+#define VM_MAPPED_COPY	INIT_VM_FLAG(MAPPED_COPY)</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARM64_MTE)</div><div class='del'>-# define VM_MTE		VM_HIGH_ARCH_0	/* Use Tagged memory for access control */</div><div class='del'>-# define VM_MTE_ALLOWED	VM_HIGH_ARCH_1	/* Tagged memory permitted */</div><div class='del'>-#else</div><div class='del'>-# define VM_MTE		VM_NONE</div><div class='del'>-# define VM_MTE_ALLOWED	VM_NONE</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef VM_GROWSUP</div><div class='del'>-# define VM_GROWSUP	VM_NONE</div><div class='add'>+#define VM_GROWSUP	VM_NONE</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARM64_MTE</div><div class='add'>+#define VM_MTE		INIT_VM_FLAG(MTE)</div><div class='add'>+#define VM_MTE_ALLOWED	INIT_VM_FLAG(MTE_ALLOWED)</div><div class='add'>+#else</div><div class='add'>+#define VM_MTE		VM_NONE</div><div class='add'>+#define VM_MTE_ALLOWED	VM_NONE</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR</div><div class='del'>-# define VM_UFFD_MINOR_BIT	38</div><div class='del'>-# define VM_UFFD_MINOR		BIT(VM_UFFD_MINOR_BIT)	/* UFFD minor faults */</div><div class='del'>-#else /* !CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */</div><div class='del'>-# define VM_UFFD_MINOR		VM_NONE</div><div class='del'>-#endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */</div><div class='add'>+#define VM_UFFD_MINOR	INIT_VM_FLAG(UFFD_MINOR)</div><div class='add'>+#else</div><div class='add'>+#define VM_UFFD_MINOR	VM_NONE</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#define VM_ALLOW_ANY_UNCACHED	INIT_VM_FLAG(ALLOW_ANY_UNCACHED)</div><div class='add'>+#define VM_SEALED		INIT_VM_FLAG(SEALED)</div><div class='add'>+#else</div><div class='add'>+#define VM_ALLOW_ANY_UNCACHED	VM_NONE</div><div class='add'>+#define VM_SEALED		VM_NONE</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_64BIT) || defined(CONFIG_PPC32)</div><div class='add'>+#define VM_DROPPABLE		INIT_VM_FLAG(DROPPABLE)</div><div class='add'>+#else</div><div class='add'>+#define VM_DROPPABLE		VM_NONE</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Bits set in the VMA until the stack is in its final location */</div><div class='ctx'> #define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ | VM_STACK_EARLY)</div><div class='hunk'>@@ -414,12 +529,10 @@ extern unsigned int kobjsize(const void *objp);</div><div class='ctx'> </div><div class='ctx'> #define VM_STARTGAP_FLAGS (VM_GROWSDOWN | VM_SHADOW_STACK)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_STACK_GROWSUP</div><div class='del'>-#define VM_STACK	VM_GROWSUP</div><div class='del'>-#define VM_STACK_EARLY	VM_GROWSDOWN</div><div class='add'>+#ifdef CONFIG_MSEAL_SYSTEM_MAPPINGS</div><div class='add'>+#define VM_SEALED_SYSMAP	VM_SEALED</div><div class='ctx'> #else</div><div class='del'>-#define VM_STACK	VM_GROWSDOWN</div><div class='del'>-#define VM_STACK_EARLY	0</div><div class='add'>+#define VM_SEALED_SYSMAP	VM_NONE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define VM_STACK_FLAGS	(VM_STACK | VM_STACK_DEFAULT_FLAGS | VM_ACCOUNT)</div><div class='hunk'>@@ -427,12 +540,26 @@ extern unsigned int kobjsize(const void *objp);</div><div class='ctx'> /* VMA basic access permission flags */</div><div class='ctx'> #define VM_ACCESS_FLAGS (VM_READ | VM_WRITE | VM_EXEC)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Special vmas that are non-mergable, non-mlock()able.</div><div class='ctx'>  */</div><div class='ctx'> #define VM_SPECIAL (VM_IO | VM_DONTEXPAND | VM_PFNMAP | VM_MIXEDMAP)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Physically remapped pages are special. Tell the</div><div class='add'>+ * rest of the world about it:</div><div class='add'>+ *   VM_IO tells people not to look at these pages</div><div class='add'>+ *	(accesses can have side effects).</div><div class='add'>+ *   VM_PFNMAP tells the core MM that the base pages are just</div><div class='add'>+ *	raw PFN mappings, and do not have a "struct page" associated</div><div class='add'>+ *	with them.</div><div class='add'>+ *   VM_DONTEXPAND</div><div class='add'>+ *      Disable vma merging and expanding with mremap().</div><div class='add'>+ *   VM_DONTDUMP</div><div class='add'>+ *      Omit vma from core dump, even when VM_IO turned off.</div><div class='add'>+ */</div><div class='add'>+#define VM_REMAP_FLAGS (VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP)</div><div class='add'>+</div><div class='ctx'> /* This mask prevents VMA from being scanned with khugepaged */</div><div class='ctx'> #define VM_NO_KHUGEPAGED (VM_SPECIAL | VM_HUGETLB)</div><div class='ctx'> </div><div class='hunk'>@@ -442,13 +569,69 @@ extern unsigned int kobjsize(const void *objp);</div><div class='ctx'> /* This mask represents all the VMA flag bits used by mlock */</div><div class='ctx'> #define VM_LOCKED_MASK	(VM_LOCKED | VM_LOCKONFAULT)</div><div class='ctx'> </div><div class='add'>+/* These flags can be updated atomically via VMA/mmap read lock. */</div><div class='add'>+#define VM_ATOMIC_SET_ALLOWED VM_MAYBE_GUARD</div><div class='add'>+</div><div class='ctx'> /* Arch-specific flags to clear when updating VM flags on protection change */</div><div class='ctx'> #ifndef VM_ARCH_CLEAR</div><div class='del'>-# define VM_ARCH_CLEAR	VM_NONE</div><div class='add'>+#define VM_ARCH_CLEAR	VM_NONE</div><div class='ctx'> #endif</div><div class='ctx'> #define VM_FLAGS_CLEAR	(ARCH_VM_PKEY_FLAGS | VM_ARCH_CLEAR)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Flags which should be 'sticky' on merge - that is, flags which, when one VMA</div><div class='add'>+ * possesses it but the other does not, the merged VMA should nonetheless have</div><div class='add'>+ * applied to it:</div><div class='add'>+ *</div><div class='add'>+ *   VM_SOFTDIRTY - if a VMA is marked soft-dirty, that is has not had its</div><div class='add'>+ *                  references cleared via /proc/$pid/clear_refs, any merged VMA</div><div class='add'>+ *                  should be considered soft-dirty also as it operates at a VMA</div><div class='add'>+ *                  granularity.</div><div class='add'>+ *</div><div class='add'>+ * VM_MAYBE_GUARD - If a VMA may have guard regions in place it implies that</div><div class='add'>+ *                  mapped page tables may contain metadata not described by the</div><div class='add'>+ *                  VMA and thus any merged VMA may also contain this metadata,</div><div class='add'>+ *                  and thus we must make this flag sticky.</div><div class='add'>+ */</div><div class='add'>+#define VM_STICKY (VM_SOFTDIRTY | VM_MAYBE_GUARD)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VMA flags we ignore for the purposes of merge, i.e. one VMA possessing one</div><div class='add'>+ * of these flags and the other not does not preclude a merge.</div><div class='add'>+ *</div><div class='add'>+ *    VM_STICKY - When merging VMAs, VMA flags must match, unless they are</div><div class='add'>+ *                'sticky'. If any sticky flags exist in either VMA, we simply</div><div class='add'>+ *                set all of them on the merged VMA.</div><div class='add'>+ */</div><div class='add'>+#define VM_IGNORE_MERGE VM_STICKY</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flags which should result in page tables being copied on fork. These are</div><div class='add'>+ * flags which indicate that the VMA maps page tables which cannot be</div><div class='add'>+ * reconsistuted upon page fault, so necessitate page table copying upon</div><div class='add'>+ *</div><div class='add'>+ * VM_PFNMAP / VM_MIXEDMAP - These contain kernel-mapped data which cannot be</div><div class='add'>+ *                           reasonably reconstructed on page fault.</div><div class='add'>+ *</div><div class='add'>+ *              VM_UFFD_WP - Encodes metadata about an installed uffd</div><div class='add'>+ *                           write protect handler, which cannot be</div><div class='add'>+ *                           reconstructed on page fault.</div><div class='add'>+ *</div><div class='add'>+ *                           We always copy pgtables when dst_vma has uffd-wp</div><div class='add'>+ *                           enabled even if it's file-backed</div><div class='add'>+ *                           (e.g. shmem). Because when uffd-wp is enabled,</div><div class='add'>+ *                           pgtable contains uffd-wp protection information,</div><div class='add'>+ *                           that's something we can't retrieve from page cache,</div><div class='add'>+ *                           and skip copying will lose those info.</div><div class='add'>+ *</div><div class='add'>+ *          VM_MAYBE_GUARD - Could contain page guard region markers which</div><div class='add'>+ *                           by design are a property of the page tables</div><div class='add'>+ *                           only and thus cannot be reconstructed on page</div><div class='add'>+ *                           fault.</div><div class='add'>+ */</div><div class='add'>+#define VM_COPY_ON_FORK (VM_PFNMAP | VM_MIXEDMAP | VM_UFFD_WP | VM_MAYBE_GUARD)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * mapping from the currently active vm_flags protection bits (the</div><div class='ctx'>  * low four bits) to a page protection mask..</div><div class='ctx'>  */</div><div class='hunk'>@@ -619,13 +802,21 @@ struct vm_operations_struct {</div><div class='ctx'> 	struct mempolicy *(*get_policy)(struct vm_area_struct *vma,</div><div class='ctx'> 					unsigned long addr, pgoff_t *ilx);</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_FIND_NORMAL_PAGE</div><div class='ctx'> 	/*</div><div class='del'>-	 * Called by vm_normal_page() for special PTEs to find the</div><div class='del'>-	 * page for @addr.  This is useful if the default behavior</div><div class='del'>-	 * (using pte_page()) would not find the correct page.</div><div class='add'>+	 * Called by vm_normal_page() for special PTEs in @vma at @addr. This</div><div class='add'>+	 * allows for returning a "normal" page from vm_normal_page() even</div><div class='add'>+	 * though the PTE indicates that the "struct page" either does not exist</div><div class='add'>+	 * or should not be touched: "special".</div><div class='add'>+	 *</div><div class='add'>+	 * Do not add new users: this really only works when a "normal" page</div><div class='add'>+	 * was mapped, but then the PTE got changed to something weird (+</div><div class='add'>+	 * marked special) that would not make pte_pfn() identify the originally</div><div class='add'>+	 * inserted page.</div><div class='ctx'> 	 */</div><div class='del'>-	struct page *(*find_special_page)(struct vm_area_struct *vma,</div><div class='del'>-					  unsigned long addr);</div><div class='add'>+	struct page *(*find_normal_page)(struct vm_area_struct *vma,</div><div class='add'>+					 unsigned long addr);</div><div class='add'>+#endif /* CONFIG_FIND_NORMAL_PAGE */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA_BALANCING</div><div class='hunk'>@@ -642,178 +833,86 @@ static inline void vma_numab_state_init(struct vm_area_struct *vma) {}</div><div class='ctx'> static inline void vma_numab_state_free(struct vm_area_struct *vma) {}</div><div class='ctx'> #endif /* CONFIG_NUMA_BALANCING */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PER_VMA_LOCK</div><div class='ctx'> /*</div><div class='del'>- * Try to read-lock a vma. The function is allowed to occasionally yield false</div><div class='del'>- * locked result to avoid performance overhead, in which case we fall back to</div><div class='del'>- * using mmap_lock. The function should never yield false unlocked result.</div><div class='add'>+ * These must be here rather than mmap_lock.h as dependent on vm_fault type,</div><div class='add'>+ * declared in this header.</div><div class='ctx'>  */</div><div class='del'>-static inline bool vma_start_read(struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Check before locking. A race might cause false locked result.</div><div class='del'>-	 * We can use READ_ONCE() for the mm_lock_seq here, and don't need</div><div class='del'>-	 * ACQUIRE semantics, because this is just a lockless check whose result</div><div class='del'>-	 * we don't rely on for anything - the mm_lock_seq read against which we</div><div class='del'>-	 * need ordering is below.</div><div class='del'>-	 */</div><div class='del'>-	if (READ_ONCE(vma-&gt;vm_lock_seq) == READ_ONCE(vma-&gt;vm_mm-&gt;mm_lock_seq))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	if (unlikely(down_read_trylock(&amp;vma-&gt;vm_lock-&gt;lock) == 0))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Overflow might produce false locked result.</div><div class='del'>-	 * False unlocked result is impossible because we modify and check</div><div class='del'>-	 * vma-&gt;vm_lock_seq under vma-&gt;vm_lock protection and mm-&gt;mm_lock_seq</div><div class='del'>-	 * modification invalidates all existing locks.</div><div class='del'>-	 *</div><div class='del'>-	 * We must use ACQUIRE semantics for the mm_lock_seq so that if we are</div><div class='del'>-	 * racing with vma_end_write_all(), we only start reading from the VMA</div><div class='del'>-	 * after it has been unlocked.</div><div class='del'>-	 * This pairs with RELEASE semantics in vma_end_write_all().</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(vma-&gt;vm_lock_seq == smp_load_acquire(&amp;vma-&gt;vm_mm-&gt;mm_lock_seq))) {</div><div class='del'>-		up_read(&amp;vma-&gt;vm_lock-&gt;lock);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void vma_end_read(struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	rcu_read_lock(); /* keeps vma alive till the end of up_read */</div><div class='del'>-	up_read(&amp;vma-&gt;vm_lock-&gt;lock);</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* WARNING! Can only be used if mmap_lock is expected to be write-locked */</div><div class='del'>-static bool __is_vma_write_locked(struct vm_area_struct *vma, int *mm_lock_seq)</div><div class='add'>+#ifdef CONFIG_PER_VMA_LOCK</div><div class='add'>+static inline void release_fault_lock(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	mmap_assert_write_locked(vma-&gt;vm_mm);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * current task is holding mmap_write_lock, both vma-&gt;vm_lock_seq and</div><div class='del'>-	 * mm-&gt;mm_lock_seq can't be concurrently modified.</div><div class='del'>-	 */</div><div class='del'>-	*mm_lock_seq = vma-&gt;vm_mm-&gt;mm_lock_seq;</div><div class='del'>-	return (vma-&gt;vm_lock_seq == *mm_lock_seq);</div><div class='add'>+	if (vmf-&gt;flags &amp; FAULT_FLAG_VMA_LOCK)</div><div class='add'>+		vma_end_read(vmf-&gt;vma);</div><div class='add'>+	else</div><div class='add'>+		mmap_read_unlock(vmf-&gt;vma-&gt;vm_mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Begin writing to a VMA.</div><div class='del'>- * Exclude concurrent readers under the per-VMA lock until the currently</div><div class='del'>- * write-locked mmap_lock is dropped or downgraded.</div><div class='del'>- */</div><div class='del'>-static inline void vma_start_write(struct vm_area_struct *vma)</div><div class='add'>+static inline void assert_fault_locked(const struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	int mm_lock_seq;</div><div class='del'>-</div><div class='del'>-	if (__is_vma_write_locked(vma, &amp;mm_lock_seq))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;vma-&gt;vm_lock-&gt;lock);</div><div class='del'>-	/*</div><div class='del'>-	 * We should use WRITE_ONCE() here because we can have concurrent reads</div><div class='del'>-	 * from the early lockless pessimistic check in vma_start_read().</div><div class='del'>-	 * We don't really care about the correctness of that early check, but</div><div class='del'>-	 * we should use WRITE_ONCE() for cleanliness and to keep KCSAN happy.</div><div class='del'>-	 */</div><div class='del'>-	WRITE_ONCE(vma-&gt;vm_lock_seq, mm_lock_seq);</div><div class='del'>-	up_write(&amp;vma-&gt;vm_lock-&gt;lock);</div><div class='add'>+	if (vmf-&gt;flags &amp; FAULT_FLAG_VMA_LOCK)</div><div class='add'>+		vma_assert_locked(vmf-&gt;vma);</div><div class='add'>+	else</div><div class='add'>+		mmap_assert_locked(vmf-&gt;vma-&gt;vm_mm);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void vma_assert_write_locked(struct vm_area_struct *vma)</div><div class='add'>+#else</div><div class='add'>+static inline void release_fault_lock(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	int mm_lock_seq;</div><div class='del'>-</div><div class='del'>-	VM_BUG_ON_VMA(!__is_vma_write_locked(vma, &amp;mm_lock_seq), vma);</div><div class='add'>+	mmap_read_unlock(vmf-&gt;vma-&gt;vm_mm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void vma_assert_locked(struct vm_area_struct *vma)</div><div class='add'>+static inline void assert_fault_locked(const struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	if (!rwsem_is_locked(&amp;vma-&gt;vm_lock-&gt;lock))</div><div class='del'>-		vma_assert_write_locked(vma);</div><div class='add'>+	mmap_assert_locked(vmf-&gt;vma-&gt;vm_mm);</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_PER_VMA_LOCK */</div><div class='ctx'> </div><div class='del'>-static inline void vma_mark_detached(struct vm_area_struct *vma, bool detached)</div><div class='add'>+static inline bool mm_flags_test(int flag, const struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	/* When detaching vma should be write-locked */</div><div class='del'>-	if (detached)</div><div class='del'>-		vma_assert_write_locked(vma);</div><div class='del'>-	vma-&gt;detached = detached;</div><div class='add'>+	return test_bit(flag, ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void release_fault_lock(struct vm_fault *vmf)</div><div class='add'>+static inline bool mm_flags_test_and_set(int flag, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	if (vmf-&gt;flags &amp; FAULT_FLAG_VMA_LOCK)</div><div class='del'>-		vma_end_read(vmf-&gt;vma);</div><div class='del'>-	else</div><div class='del'>-		mmap_read_unlock(vmf-&gt;vma-&gt;vm_mm);</div><div class='add'>+	return test_and_set_bit(flag, ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void assert_fault_locked(struct vm_fault *vmf)</div><div class='add'>+static inline bool mm_flags_test_and_clear(int flag, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	if (vmf-&gt;flags &amp; FAULT_FLAG_VMA_LOCK)</div><div class='del'>-		vma_assert_locked(vmf-&gt;vma);</div><div class='del'>-	else</div><div class='del'>-		mmap_assert_locked(vmf-&gt;vma-&gt;vm_mm);</div><div class='add'>+	return test_and_clear_bit(flag, ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct vm_area_struct *lock_vma_under_rcu(struct mm_struct *mm,</div><div class='del'>-					  unsigned long address);</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_PER_VMA_LOCK */</div><div class='del'>-</div><div class='del'>-static inline bool vma_start_read(struct vm_area_struct *vma)</div><div class='del'>-		{ return false; }</div><div class='del'>-static inline void vma_end_read(struct vm_area_struct *vma) {}</div><div class='del'>-static inline void vma_start_write(struct vm_area_struct *vma) {}</div><div class='del'>-static inline void vma_assert_write_locked(struct vm_area_struct *vma)</div><div class='del'>-		{ mmap_assert_write_locked(vma-&gt;vm_mm); }</div><div class='del'>-static inline void vma_mark_detached(struct vm_area_struct *vma,</div><div class='del'>-				     bool detached) {}</div><div class='del'>-</div><div class='del'>-static inline struct vm_area_struct *lock_vma_under_rcu(struct mm_struct *mm,</div><div class='del'>-		unsigned long address)</div><div class='add'>+static inline void mm_flags_set(int flag, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	set_bit(flag, ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void release_fault_lock(struct vm_fault *vmf)</div><div class='add'>+static inline void mm_flags_clear(int flag, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	mmap_read_unlock(vmf-&gt;vma-&gt;vm_mm);</div><div class='add'>+	clear_bit(flag, ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void assert_fault_locked(struct vm_fault *vmf)</div><div class='add'>+static inline void mm_flags_clear_all(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	mmap_assert_locked(vmf-&gt;vma-&gt;vm_mm);</div><div class='add'>+	bitmap_zero(ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags), NUM_MM_FLAG_BITS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PER_VMA_LOCK */</div><div class='del'>-</div><div class='ctx'> extern const struct vm_operations_struct vma_dummy_vm_ops;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * WARNING: vma_init does not initialize vma-&gt;vm_lock.</div><div class='del'>- * Use vm_area_alloc()/vm_area_free() if vma needs locking.</div><div class='del'>- */</div><div class='ctx'> static inline void vma_init(struct vm_area_struct *vma, struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	memset(vma, 0, sizeof(*vma));</div><div class='ctx'> 	vma-&gt;vm_mm = mm;</div><div class='ctx'> 	vma-&gt;vm_ops = &amp;vma_dummy_vm_ops;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;vma-&gt;anon_vma_chain);</div><div class='del'>-	vma_mark_detached(vma, false);</div><div class='del'>-	vma_numab_state_init(vma);</div><div class='add'>+	vma_lock_init(vma, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Use when VMA is not part of the VMA tree and needs no locking */</div><div class='ctx'> static inline void vm_flags_init(struct vm_area_struct *vma,</div><div class='ctx'> 				 vm_flags_t flags)</div><div class='ctx'> {</div><div class='del'>-	ACCESS_PRIVATE(vma, __vm_flags) = flags;</div><div class='add'>+	VM_WARN_ON_ONCE(!pgtable_supports_soft_dirty() &amp;&amp; (flags &amp; VM_SOFTDIRTY));</div><div class='add'>+	vma_flags_clear_all(&amp;vma-&gt;flags);</div><div class='add'>+	vma_flags_overwrite_word(&amp;vma-&gt;flags, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -824,6 +923,7 @@ static inline void vm_flags_init(struct vm_area_struct *vma,</div><div class='ctx'> static inline void vm_flags_reset(struct vm_area_struct *vma,</div><div class='ctx'> 				  vm_flags_t flags)</div><div class='ctx'> {</div><div class='add'>+	VM_WARN_ON_ONCE(!pgtable_supports_soft_dirty() &amp;&amp; (flags &amp; VM_SOFTDIRTY));</div><div class='ctx'> 	vma_assert_write_locked(vma);</div><div class='ctx'> 	vm_flags_init(vma, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -832,21 +932,33 @@ static inline void vm_flags_reset_once(struct vm_area_struct *vma,</div><div class='ctx'> 				       vm_flags_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	vma_assert_write_locked(vma);</div><div class='del'>-	WRITE_ONCE(ACCESS_PRIVATE(vma, __vm_flags), flags);</div><div class='add'>+	/*</div><div class='add'>+	 * If VMA flags exist beyond the first system word, also clear these. It</div><div class='add'>+	 * is assumed the write once behaviour is required only for the first</div><div class='add'>+	 * system word.</div><div class='add'>+	 */</div><div class='add'>+	if (NUM_VMA_FLAG_BITS &gt; BITS_PER_LONG) {</div><div class='add'>+		unsigned long *bitmap = ACCESS_PRIVATE(&amp;vma-&gt;flags, __vma_flags);</div><div class='add'>+</div><div class='add'>+		bitmap_zero(&amp;bitmap[1], NUM_VMA_FLAG_BITS - BITS_PER_LONG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vma_flags_overwrite_word_once(&amp;vma-&gt;flags, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void vm_flags_set(struct vm_area_struct *vma,</div><div class='ctx'> 				vm_flags_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	vma_start_write(vma);</div><div class='del'>-	ACCESS_PRIVATE(vma, __vm_flags) |= flags;</div><div class='add'>+	vma_flags_set_word(&amp;vma-&gt;flags, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void vm_flags_clear(struct vm_area_struct *vma,</div><div class='ctx'> 				  vm_flags_t flags)</div><div class='ctx'> {</div><div class='add'>+	VM_WARN_ON_ONCE(!pgtable_supports_soft_dirty() &amp;&amp; (flags &amp; VM_SOFTDIRTY));</div><div class='ctx'> 	vma_start_write(vma);</div><div class='del'>-	ACCESS_PRIVATE(vma, __vm_flags) &amp;= ~flags;</div><div class='add'>+	vma_flags_clear_word(&amp;vma-&gt;flags, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -870,6 +982,51 @@ static inline void vm_flags_mod(struct vm_area_struct *vma,</div><div class='ctx'> 	__vm_flags_mod(vma, set, clear);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool __vma_flag_atomic_valid(struct vm_area_struct *vma,</div><div class='add'>+					   vma_flag_t bit)</div><div class='add'>+{</div><div class='add'>+	const vm_flags_t mask = BIT((__force int)bit);</div><div class='add'>+</div><div class='add'>+	/* Only specific flags are permitted */</div><div class='add'>+	if (WARN_ON_ONCE(!(mask &amp; VM_ATOMIC_SET_ALLOWED)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set VMA flag atomically. Requires only VMA/mmap read lock. Only specific</div><div class='add'>+ * valid flags are allowed to do this.</div><div class='add'>+ */</div><div class='add'>+static inline void vma_flag_set_atomic(struct vm_area_struct *vma,</div><div class='add'>+				       vma_flag_t bit)</div><div class='add'>+{</div><div class='add'>+	unsigned long *bitmap = ACCESS_PRIVATE(&amp;vma-&gt;flags, __vma_flags);</div><div class='add'>+</div><div class='add'>+	/* mmap read lock/VMA read lock must be held. */</div><div class='add'>+	if (!rwsem_is_locked(&amp;vma-&gt;vm_mm-&gt;mmap_lock))</div><div class='add'>+		vma_assert_locked(vma);</div><div class='add'>+</div><div class='add'>+	if (__vma_flag_atomic_valid(vma, bit))</div><div class='add'>+		set_bit((__force int)bit, bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test for VMA flag atomically. Requires no locks. Only specific valid flags</div><div class='add'>+ * are allowed to do this.</div><div class='add'>+ *</div><div class='add'>+ * This is necessarily racey, so callers must ensure that serialisation is</div><div class='add'>+ * achieved through some other means, or that races are permissible.</div><div class='add'>+ */</div><div class='add'>+static inline bool vma_flag_test_atomic(struct vm_area_struct *vma,</div><div class='add'>+					vma_flag_t bit)</div><div class='add'>+{</div><div class='add'>+	if (__vma_flag_atomic_valid(vma, bit))</div><div class='add'>+		return test_bit((__force int)bit, &amp;vma-&gt;vm_flags);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void vma_set_anonymous(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	vma-&gt;vm_ops = NULL;</div><div class='hunk'>@@ -905,7 +1062,7 @@ static inline bool vma_is_initial_stack(const struct vm_area_struct *vma)</div><div class='ctx'> 		vma-&gt;vm_end &gt;= vma-&gt;vm_mm-&gt;start_stack;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool vma_is_temporary_stack(struct vm_area_struct *vma)</div><div class='add'>+static inline bool vma_is_temporary_stack(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	int maybe_stack = vma-&gt;vm_flags &amp; (VM_GROWSDOWN | VM_GROWSUP);</div><div class='ctx'> </div><div class='hunk'>@@ -919,7 +1076,7 @@ static inline bool vma_is_temporary_stack(struct vm_area_struct *vma)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool vma_is_foreign(struct vm_area_struct *vma)</div><div class='add'>+static inline bool vma_is_foreign(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	if (!current-&gt;mm)</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -930,7 +1087,7 @@ static inline bool vma_is_foreign(struct vm_area_struct *vma)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool vma_is_accessible(struct vm_area_struct *vma)</div><div class='add'>+static inline bool vma_is_accessible(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	return vma-&gt;vm_flags &amp; VM_ACCESS_FLAGS;</div><div class='ctx'> }</div><div class='hunk'>@@ -941,7 +1098,7 @@ static inline bool is_shared_maywrite(vm_flags_t vm_flags)</div><div class='ctx'> 		(VM_SHARED | VM_MAYWRITE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool vma_is_shared_maywrite(struct vm_area_struct *vma)</div><div class='add'>+static inline bool vma_is_shared_maywrite(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	return is_shared_maywrite(vma-&gt;vm_flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -973,27 +1130,6 @@ static inline struct vm_area_struct *vma_prev(struct vma_iterator *vmi)</div><div class='ctx'> 	return mas_prev(&amp;vmi-&gt;mas, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-struct vm_area_struct *vma_iter_prev_range(struct vma_iterator *vmi)</div><div class='del'>-{</div><div class='del'>-	return mas_prev_range(&amp;vmi-&gt;mas, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long vma_iter_addr(struct vma_iterator *vmi)</div><div class='del'>-{</div><div class='del'>-	return vmi-&gt;mas.index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long vma_iter_end(struct vma_iterator *vmi)</div><div class='del'>-{</div><div class='del'>-	return vmi-&gt;mas.last + 1;</div><div class='del'>-}</div><div class='del'>-static inline int vma_iter_bulk_alloc(struct vma_iterator *vmi,</div><div class='del'>-				      unsigned long count)</div><div class='del'>-{</div><div class='del'>-	return mas_expected_entries(&amp;vmi-&gt;mas, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int vma_iter_clear_gfp(struct vma_iterator *vmi,</div><div class='ctx'> 			unsigned long start, unsigned long end, gfp_t gfp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1020,6 +1156,7 @@ static inline int vma_iter_bulk_store(struct vma_iterator *vmi,</div><div class='ctx'> 	if (unlikely(mas_is_err(&amp;vmi-&gt;mas)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	vma_mark_attached(vma);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1045,14 +1182,14 @@ static inline void vma_iter_set(struct vma_iterator *vmi, unsigned long addr)</div><div class='ctx'>  * The vma_is_shmem is not inline because it is used only by slow</div><div class='ctx'>  * paths in userfault.</div><div class='ctx'>  */</div><div class='del'>-bool vma_is_shmem(struct vm_area_struct *vma);</div><div class='del'>-bool vma_is_anon_shmem(struct vm_area_struct *vma);</div><div class='add'>+bool vma_is_shmem(const struct vm_area_struct *vma);</div><div class='add'>+bool vma_is_anon_shmem(const struct vm_area_struct *vma);</div><div class='ctx'> #else</div><div class='del'>-static inline bool vma_is_shmem(struct vm_area_struct *vma) { return false; }</div><div class='del'>-static inline bool vma_is_anon_shmem(struct vm_area_struct *vma) { return false; }</div><div class='add'>+static inline bool vma_is_shmem(const struct vm_area_struct *vma) { return false; }</div><div class='add'>+static inline bool vma_is_anon_shmem(const struct vm_area_struct *vma) { return false; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int vma_is_stack_for_current(struct vm_area_struct *vma);</div><div class='add'>+int vma_is_stack_for_current(const struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='ctx'> /* flush_tlb_range() takes a vma, not a mm, and can care about flags */</div><div class='ctx'> #define TLB_FLUSH_VMA(mm,flags) { .vm_mm = (mm), .vm_flags = (flags) }</div><div class='hunk'>@@ -1060,6 +1197,25 @@ int vma_is_stack_for_current(struct vm_area_struct *vma);</div><div class='ctx'> struct mmu_gather;</div><div class='ctx'> struct inode;</div><div class='ctx'> </div><div class='add'>+extern void prep_compound_page(struct page *page, unsigned int order);</div><div class='add'>+</div><div class='add'>+static inline unsigned int folio_large_order(const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return folio-&gt;_flags_1 &amp; 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef NR_PAGES_IN_LARGE_FOLIO</div><div class='add'>+static inline unsigned long folio_large_nr_pages(const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return folio-&gt;_nr_pages;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline unsigned long folio_large_nr_pages(const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return 1L &lt;&lt; folio_large_order(folio);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * compound_order() can be called without holding a reference, which means</div><div class='ctx'>  * that niceties like page_folio() don't work.  These callers should be</div><div class='hunk'>@@ -1067,13 +1223,13 @@ struct inode;</div><div class='ctx'>  * set before the order is initialised, or this may be a tail page.</div><div class='ctx'>  * See compaction.c for some good examples.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int compound_order(struct page *page)</div><div class='add'>+static inline unsigned int compound_order(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = (struct folio *)page;</div><div class='add'>+	const struct folio *folio = (struct folio *)page;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(PG_head, &amp;folio-&gt;flags))</div><div class='add'>+	if (!test_bit(PG_head, &amp;folio-&gt;flags.f))</div><div class='ctx'> 		return 0;</div><div class='del'>-	return folio-&gt;_flags_1 &amp; 0xff;</div><div class='add'>+	return folio_large_order(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1085,11 +1241,28 @@ static inline unsigned int compound_order(struct page *page)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: The order of the folio.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int folio_order(struct folio *folio)</div><div class='add'>+static inline unsigned int folio_order(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	if (!folio_test_large(folio))</div><div class='ctx'> 		return 0;</div><div class='del'>-	return folio-&gt;_flags_1 &amp; 0xff;</div><div class='add'>+	return folio_large_order(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folio_reset_order - Reset the folio order and derived _nr_pages</div><div class='add'>+ * @folio: The folio.</div><div class='add'>+ *</div><div class='add'>+ * Reset the order and derived _nr_pages to 0. Must only be used in the</div><div class='add'>+ * process of splitting large folios.</div><div class='add'>+ */</div><div class='add'>+static inline void folio_reset_order(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(!folio_test_large(folio)))</div><div class='add'>+		return;</div><div class='add'>+	folio-&gt;_flags_1 &amp;= ~0xffUL;</div><div class='add'>+#ifdef NR_PAGES_IN_LARGE_FOLIO</div><div class='add'>+	folio-&gt;_nr_pages = 0;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/huge_mm.h&gt;</div><div class='hunk'>@@ -1177,82 +1350,53 @@ static inline int is_vmalloc_or_module_addr(const void *x)</div><div class='ctx'> /*</div><div class='ctx'>  * How many times the entire folio is mapped as a single unit (eg by a</div><div class='ctx'>  * PMD or PUD entry).  This is probably not what you want, except for</div><div class='del'>- * debugging purposes - it does not include PTE-mapped sub-pages; look</div><div class='del'>- * at folio_mapcount() or page_mapcount() or total_mapcount() instead.</div><div class='add'>+ * debugging purposes or implementation of other core folio_*() primitives.</div><div class='ctx'>  */</div><div class='del'>-static inline int folio_entire_mapcount(struct folio *folio)</div><div class='add'>+static inline int folio_entire_mapcount(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON_FOLIO(!folio_test_large(folio), folio);</div><div class='add'>+	if (!IS_ENABLED(CONFIG_64BIT) &amp;&amp; unlikely(folio_large_order(folio) == 1))</div><div class='add'>+		return 0;</div><div class='ctx'> 	return atomic_read(&amp;folio-&gt;_entire_mapcount) + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The atomic page-&gt;_mapcount, starts from -1: so that transitions</div><div class='del'>- * both from it and to it can be tracked, using atomic_inc_and_test</div><div class='del'>- * and atomic_add_negative(-1).</div><div class='del'>- */</div><div class='del'>-static inline void page_mapcount_reset(struct page *page)</div><div class='add'>+static inline int folio_large_mapcount(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	atomic_set(&amp;(page)-&gt;_mapcount, -1);</div><div class='add'>+	VM_WARN_ON_FOLIO(!folio_test_large(folio), folio);</div><div class='add'>+	return atomic_read(&amp;folio-&gt;_large_mapcount) + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * page_mapcount() - Number of times this precise page is mapped.</div><div class='del'>- * @page: The page.</div><div class='add'>+ * folio_mapcount() - Number of mappings of this folio.</div><div class='add'>+ * @folio: The folio.</div><div class='ctx'>  *</div><div class='del'>- * The number of times this page is mapped.  If this page is part of</div><div class='del'>- * a large folio, it includes the number of times this page is mapped</div><div class='del'>- * as part of that folio.</div><div class='add'>+ * The folio mapcount corresponds to the number of present user page table</div><div class='add'>+ * entries that reference any part of a folio. Each such present user page</div><div class='add'>+ * table entry must be paired with exactly on folio reference.</div><div class='ctx'>  *</div><div class='del'>- * The result is undefined for pages which cannot be mapped into userspace.</div><div class='del'>- * For example SLAB or special types of pages. See function page_has_type().</div><div class='del'>- * They use this field in struct page differently.</div><div class='del'>- */</div><div class='del'>-static inline int page_mapcount(struct page *page)</div><div class='del'>-{</div><div class='del'>-	int mapcount = atomic_read(&amp;page-&gt;_mapcount) + 1;</div><div class='del'>-</div><div class='del'>-	if (unlikely(PageCompound(page)))</div><div class='del'>-		mapcount += folio_entire_mapcount(page_folio(page));</div><div class='del'>-</div><div class='del'>-	return mapcount;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int folio_total_mapcount(struct folio *folio);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * folio_mapcount() - Calculate the number of mappings of this folio.</div><div class='del'>- * @folio: The folio.</div><div class='add'>+ * For ordindary folios, each user page table entry (PTE/PMD/PUD/...) counts</div><div class='add'>+ * exactly once.</div><div class='ctx'>  *</div><div class='del'>- * A large folio tracks both how many times the entire folio is mapped,</div><div class='del'>- * and how many times each individual page in the folio is mapped.</div><div class='del'>- * This function calculates the total number of times the folio is</div><div class='del'>- * mapped.</div><div class='add'>+ * For hugetlb folios, each abstracted "hugetlb" user page table entry that</div><div class='add'>+ * references the entire folio counts exactly once, even when such special</div><div class='add'>+ * page table entries are comprised of multiple ordinary page table entries.</div><div class='add'>+ *</div><div class='add'>+ * Will report 0 for pages which cannot be mapped into userspace, such as</div><div class='add'>+ * slab, page tables and similar.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: The number of times this folio is mapped.</div><div class='ctx'>  */</div><div class='del'>-static inline int folio_mapcount(struct folio *folio)</div><div class='add'>+static inline int folio_mapcount(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	if (likely(!folio_test_large(folio)))</div><div class='del'>-		return atomic_read(&amp;folio-&gt;_mapcount) + 1;</div><div class='del'>-	return folio_total_mapcount(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int total_mapcount(struct page *page)</div><div class='del'>-{</div><div class='del'>-	if (likely(!PageCompound(page)))</div><div class='del'>-		return atomic_read(&amp;page-&gt;_mapcount) + 1;</div><div class='del'>-	return folio_total_mapcount(page_folio(page));</div><div class='del'>-}</div><div class='add'>+	int mapcount;</div><div class='ctx'> </div><div class='del'>-static inline bool folio_large_is_mapped(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Reading _entire_mapcount below could be omitted if hugetlb</div><div class='del'>-	 * participated in incrementing nr_pages_mapped when compound mapped.</div><div class='del'>-	 */</div><div class='del'>-	return atomic_read(&amp;folio-&gt;_nr_pages_mapped) &gt; 0 ||</div><div class='del'>-		atomic_read(&amp;folio-&gt;_entire_mapcount) &gt;= 0;</div><div class='add'>+	if (likely(!folio_test_large(folio))) {</div><div class='add'>+		mapcount = atomic_read(&amp;folio-&gt;_mapcount) + 1;</div><div class='add'>+		if (page_mapcount_is_type(mapcount))</div><div class='add'>+			mapcount = 0;</div><div class='add'>+		return mapcount;</div><div class='add'>+	}</div><div class='add'>+	return folio_large_mapcount(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1261,11 +1405,9 @@ static inline bool folio_large_is_mapped(struct folio *folio)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: True if any page in this folio is referenced by user page tables.</div><div class='ctx'>  */</div><div class='del'>-static inline bool folio_mapped(struct folio *folio)</div><div class='add'>+static inline bool folio_mapped(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	if (likely(!folio_test_large(folio)))</div><div class='del'>-		return atomic_read(&amp;folio-&gt;_mapcount) &gt;= 0;</div><div class='del'>-	return folio_large_is_mapped(folio);</div><div class='add'>+	return folio_mapcount(folio) &gt;= 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1273,11 +1415,9 @@ static inline bool folio_mapped(struct folio *folio)</div><div class='ctx'>  * For compound page it returns true if any sub-page of compound page is mapped,</div><div class='ctx'>  * even if this particular sub-page is not itself mapped by any PTE or PMD.</div><div class='ctx'>  */</div><div class='del'>-static inline bool page_mapped(struct page *page)</div><div class='add'>+static inline bool page_mapped(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	if (likely(!PageCompound(page)))</div><div class='del'>-		return atomic_read(&amp;page-&gt;_mapcount) &gt;= 0;</div><div class='del'>-	return folio_large_is_mapped(page_folio(page));</div><div class='add'>+	return folio_mapped(page_folio(page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct page *virt_to_head_page(const void *x)</div><div class='hunk'>@@ -1296,17 +1436,14 @@ static inline struct folio *virt_to_folio(const void *x)</div><div class='ctx'> </div><div class='ctx'> void __folio_put(struct folio *folio);</div><div class='ctx'> </div><div class='del'>-void put_pages_list(struct list_head *pages);</div><div class='del'>-</div><div class='ctx'> void split_page(struct page *page, unsigned int order);</div><div class='ctx'> void folio_copy(struct folio *dst, struct folio *src);</div><div class='add'>+int folio_mc_copy(struct folio *dst, struct folio *src);</div><div class='ctx'> </div><div class='ctx'> unsigned long nr_free_buffer_pages(void);</div><div class='ctx'> </div><div class='del'>-void destroy_large_folio(struct folio *folio);</div><div class='del'>-</div><div class='ctx'> /* Returns the number of bytes in this potentially compound page. */</div><div class='del'>-static inline unsigned long page_size(struct page *page)</div><div class='add'>+static inline unsigned long page_size(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return PAGE_SIZE &lt;&lt; compound_order(page);</div><div class='ctx'> }</div><div class='hunk'>@@ -1352,7 +1489,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)</div><div class='ctx'> 	return pte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page);</div><div class='add'>+vm_fault_t do_set_pmd(struct vm_fault *vmf, struct folio *folio, struct page *page);</div><div class='ctx'> void set_pte_range(struct vm_fault *vmf, struct folio *folio,</div><div class='ctx'> 		struct page *page, unsigned int nr, unsigned long addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1393,9 +1530,9 @@ vm_fault_t finish_fault(struct vm_fault *vmf);</div><div class='ctx'>  * the page's disk buffers. PG_private must be set to tell the VM to call</div><div class='ctx'>  * into the filesystem to release these pages.</div><div class='ctx'>  *</div><div class='del'>- * A page may belong to an inode's memory mapping. In this case, page-&gt;mapping</div><div class='del'>- * is the pointer to the inode, and page-&gt;index is the file offset of the page,</div><div class='del'>- * in units of PAGE_SIZE.</div><div class='add'>+ * A folio may belong to an inode's memory mapping. In this case,</div><div class='add'>+ * folio-&gt;mapping points to the inode, and folio-&gt;index is the file</div><div class='add'>+ * offset of the folio, in units of PAGE_SIZE.</div><div class='ctx'>  *</div><div class='ctx'>  * If pagecache pages are not associated with an inode, they are said to be</div><div class='ctx'>  * anonymous pages. These may become associated with the swapcache, and in that</div><div class='hunk'>@@ -1419,30 +1556,6 @@ vm_fault_t finish_fault(struct vm_fault *vmf);</div><div class='ctx'>  *   back into memory.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_ZONE_DEVICE) &amp;&amp; defined(CONFIG_FS_DAX)</div><div class='del'>-DECLARE_STATIC_KEY_FALSE(devmap_managed_key);</div><div class='del'>-</div><div class='del'>-bool __put_devmap_managed_page_refs(struct page *page, int refs);</div><div class='del'>-static inline bool put_devmap_managed_page_refs(struct page *page, int refs)</div><div class='del'>-{</div><div class='del'>-	if (!static_branch_unlikely(&amp;devmap_managed_key))</div><div class='del'>-		return false;</div><div class='del'>-	if (!is_zone_device_page(page))</div><div class='del'>-		return false;</div><div class='del'>-	return __put_devmap_managed_page_refs(page, refs);</div><div class='del'>-}</div><div class='del'>-#else /* CONFIG_ZONE_DEVICE &amp;&amp; CONFIG_FS_DAX */</div><div class='del'>-static inline bool put_devmap_managed_page_refs(struct page *page, int refs)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_ZONE_DEVICE &amp;&amp; CONFIG_FS_DAX */</div><div class='del'>-</div><div class='del'>-static inline bool put_devmap_managed_page(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return put_devmap_managed_page_refs(page, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* 127: arbitrary random number, small enough to assemble well */</div><div class='ctx'> #define folio_ref_zero_or_close_to_overflow(folio) \</div><div class='ctx'> 	((unsigned int) folio_ref_count(folio) + 127u &lt;= 127u)</div><div class='hunk'>@@ -1463,7 +1576,12 @@ static inline void folio_get(struct folio *folio)</div><div class='ctx'> </div><div class='ctx'> static inline void get_page(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	folio_get(page_folio(page));</div><div class='add'>+	struct folio *folio = page_folio(page);</div><div class='add'>+	if (WARN_ON_ONCE(folio_test_slab(folio)))</div><div class='add'>+		return;</div><div class='add'>+	if (WARN_ON_ONCE(folio_test_large_kmalloc(folio)))</div><div class='add'>+		return;</div><div class='add'>+	folio_get(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline __must_check bool try_get_page(struct page *page)</div><div class='hunk'>@@ -1514,6 +1632,8 @@ static inline void folio_put_refs(struct folio *folio, int refs)</div><div class='ctx'> 		__folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void folios_put_refs(struct folio_batch *folios, unsigned int *refs);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * union release_pages_arg - an array of pages or folios</div><div class='ctx'>  *</div><div class='hunk'>@@ -1536,30 +1656,28 @@ void release_pages(release_pages_arg, int nr);</div><div class='ctx'> /**</div><div class='ctx'>  * folios_put - Decrement the reference count on an array of folios.</div><div class='ctx'>  * @folios: The folios.</div><div class='del'>- * @nr: How many folios there are.</div><div class='ctx'>  *</div><div class='del'>- * Like folio_put(), but for an array of folios.  This is more efficient</div><div class='del'>- * than writing the loop yourself as it will optimise the locks which</div><div class='del'>- * need to be taken if the folios are freed.</div><div class='add'>+ * Like folio_put(), but for a batch of folios.  This is more efficient</div><div class='add'>+ * than writing the loop yourself as it will optimise the locks which need</div><div class='add'>+ * to be taken if the folios are freed.  The folios batch is returned</div><div class='add'>+ * empty and ready to be reused for another batch; there is no need to</div><div class='add'>+ * reinitialise it.</div><div class='ctx'>  *</div><div class='ctx'>  * Context: May be called in process or interrupt context, but not in NMI</div><div class='ctx'>  * context.  May be called while holding a spinlock.</div><div class='ctx'>  */</div><div class='del'>-static inline void folios_put(struct folio **folios, unsigned int nr)</div><div class='add'>+static inline void folios_put(struct folio_batch *folios)</div><div class='ctx'> {</div><div class='del'>-	release_pages(folios, nr);</div><div class='add'>+	folios_put_refs(folios, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void put_page(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	struct folio *folio = page_folio(page);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For some devmap managed pages we need to catch refcount transition</div><div class='del'>-	 * from 2 to 1:</div><div class='del'>-	 */</div><div class='del'>-	if (put_devmap_managed_page(&amp;folio-&gt;page))</div><div class='add'>+	if (folio_test_slab(folio) || folio_test_large_kmalloc(folio))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	folio_put(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1590,17 +1708,20 @@ static inline void put_page(struct page *page)</div><div class='ctx'>  * issue.</div><div class='ctx'>  *</div><div class='ctx'>  * Locking: the lockless algorithm described in folio_try_get_rcu()</div><div class='del'>- * provides safe operation for get_user_pages(), page_mkclean() and</div><div class='add'>+ * provides safe operation for get_user_pages(), folio_mkclean() and</div><div class='ctx'>  * other calls that race to set up page table entries.</div><div class='ctx'>  */</div><div class='ctx'> #define GUP_PIN_COUNTING_BIAS (1U &lt;&lt; 10)</div><div class='ctx'> </div><div class='ctx'> void unpin_user_page(struct page *page);</div><div class='add'>+void unpin_folio(struct folio *folio);</div><div class='ctx'> void unpin_user_pages_dirty_lock(struct page **pages, unsigned long npages,</div><div class='ctx'> 				 bool make_dirty);</div><div class='ctx'> void unpin_user_page_range_dirty_lock(struct page *page, unsigned long npages,</div><div class='ctx'> 				      bool make_dirty);</div><div class='ctx'> void unpin_user_pages(struct page **pages, unsigned long npages);</div><div class='add'>+void unpin_user_folio(struct folio *folio, unsigned long npages);</div><div class='add'>+void unpin_folios(struct folio **folios, unsigned long nfolios);</div><div class='ctx'> </div><div class='ctx'> static inline bool is_cow_mapping(vm_flags_t flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -1636,23 +1757,26 @@ static inline bool is_nommu_shared_mapping(vm_flags_t flags)</div><div class='ctx'>  */</div><div class='ctx'> static inline int page_zone_id(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return (page-&gt;flags &gt;&gt; ZONEID_PGSHIFT) &amp; ZONEID_MASK;</div><div class='add'>+	return (page-&gt;flags.f &gt;&gt; ZONEID_PGSHIFT) &amp; ZONEID_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef NODE_NOT_IN_PAGE_FLAGS</div><div class='del'>-extern int page_to_nid(const struct page *page);</div><div class='add'>+int memdesc_nid(memdesc_flags_t mdf);</div><div class='ctx'> #else</div><div class='del'>-static inline int page_to_nid(const struct page *page)</div><div class='add'>+static inline int memdesc_nid(memdesc_flags_t mdf)</div><div class='ctx'> {</div><div class='del'>-	struct page *p = (struct page *)page;</div><div class='del'>-</div><div class='del'>-	return (PF_POISONED_CHECK(p)-&gt;flags &gt;&gt; NODES_PGSHIFT) &amp; NODES_MASK;</div><div class='add'>+	return (mdf.f &gt;&gt; NODES_PGSHIFT) &amp; NODES_MASK;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline int page_to_nid(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return memdesc_nid(PF_POISONED_CHECK(page)-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int folio_nid(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return page_to_nid(&amp;folio-&gt;page);</div><div class='add'>+	return memdesc_nid(folio-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA_BALANCING</div><div class='hunk'>@@ -1721,14 +1845,14 @@ static inline void page_cpupid_reset_last(struct page *page)</div><div class='ctx'> #else</div><div class='ctx'> static inline int folio_last_cpupid(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return (folio-&gt;flags &gt;&gt; LAST_CPUPID_PGSHIFT) &amp; LAST_CPUPID_MASK;</div><div class='add'>+	return (folio-&gt;flags.f &gt;&gt; LAST_CPUPID_PGSHIFT) &amp; LAST_CPUPID_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int folio_xchg_last_cpupid(struct folio *folio, int cpupid);</div><div class='ctx'> </div><div class='ctx'> static inline void page_cpupid_reset_last(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	page-&gt;flags |= LAST_CPUPID_MASK &lt;&lt; LAST_CPUPID_PGSHIFT;</div><div class='add'>+	page-&gt;flags.f |= LAST_CPUPID_MASK &lt;&lt; LAST_CPUPID_PGSHIFT;</div><div class='ctx'> }</div><div class='ctx'> #endif /* LAST_CPUPID_NOT_IN_PAGE_FLAGS */</div><div class='ctx'> </div><div class='hunk'>@@ -1750,6 +1874,8 @@ static inline void vma_set_access_pid_bit(struct vm_area_struct *vma)</div><div class='ctx'> 		__set_bit(pid_bit, &amp;vma-&gt;numab_state-&gt;pids_active[1]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+bool folio_use_access_time(struct folio *folio);</div><div class='ctx'> #else /* !CONFIG_NUMA_BALANCING */</div><div class='ctx'> static inline int folio_xchg_last_cpupid(struct folio *folio, int cpupid)</div><div class='ctx'> {</div><div class='hunk'>@@ -1803,6 +1929,10 @@ static inline bool cpupid_match_pid(struct task_struct *task, int cpupid)</div><div class='ctx'> static inline void vma_set_access_pid_bit(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline bool folio_use_access_time(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_NUMA_BALANCING */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS)</div><div class='hunk'>@@ -1818,7 +1948,7 @@ static inline u8 page_kasan_tag(const struct page *page)</div><div class='ctx'> 	u8 tag = KASAN_TAG_KERNEL;</div><div class='ctx'> </div><div class='ctx'> 	if (kasan_enabled()) {</div><div class='del'>-		tag = (page-&gt;flags &gt;&gt; KASAN_TAG_PGSHIFT) &amp; KASAN_TAG_MASK;</div><div class='add'>+		tag = (page-&gt;flags.f &gt;&gt; KASAN_TAG_PGSHIFT) &amp; KASAN_TAG_MASK;</div><div class='ctx'> 		tag ^= 0xff;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1833,12 +1963,12 @@ static inline void page_kasan_tag_set(struct page *page, u8 tag)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tag ^= 0xff;</div><div class='del'>-	old_flags = READ_ONCE(page-&gt;flags);</div><div class='add'>+	old_flags = READ_ONCE(page-&gt;flags.f);</div><div class='ctx'> 	do {</div><div class='ctx'> 		flags = old_flags;</div><div class='ctx'> 		flags &amp;= ~(KASAN_TAG_MASK &lt;&lt; KASAN_TAG_PGSHIFT);</div><div class='ctx'> 		flags |= (tag &amp; KASAN_TAG_MASK) &lt;&lt; KASAN_TAG_PGSHIFT;</div><div class='del'>-	} while (unlikely(!try_cmpxchg(&amp;page-&gt;flags, &amp;old_flags, flags)));</div><div class='add'>+	} while (unlikely(!try_cmpxchg(&amp;page-&gt;flags.f, &amp;old_flags, flags)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void page_kasan_tag_reset(struct page *page)</div><div class='hunk'>@@ -1869,28 +1999,33 @@ static inline pg_data_t *page_pgdat(const struct page *page)</div><div class='ctx'> 	return NODE_DATA(page_to_nid(page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct zone *folio_zone(const struct folio *folio)</div><div class='add'>+static inline pg_data_t *folio_pgdat(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return page_zone(&amp;folio-&gt;page);</div><div class='add'>+	return NODE_DATA(folio_nid(folio));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline pg_data_t *folio_pgdat(const struct folio *folio)</div><div class='add'>+static inline struct zone *folio_zone(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return page_pgdat(&amp;folio-&gt;page);</div><div class='add'>+	return &amp;folio_pgdat(folio)-&gt;node_zones[folio_zonenum(folio)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef SECTION_IN_PAGE_FLAGS</div><div class='ctx'> static inline void set_page_section(struct page *page, unsigned long section)</div><div class='ctx'> {</div><div class='del'>-	page-&gt;flags &amp;= ~(SECTIONS_MASK &lt;&lt; SECTIONS_PGSHIFT);</div><div class='del'>-	page-&gt;flags |= (section &amp; SECTIONS_MASK) &lt;&lt; SECTIONS_PGSHIFT;</div><div class='add'>+	page-&gt;flags.f &amp;= ~(SECTIONS_MASK &lt;&lt; SECTIONS_PGSHIFT);</div><div class='add'>+	page-&gt;flags.f |= (section &amp; SECTIONS_MASK) &lt;&lt; SECTIONS_PGSHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long page_to_section(const struct page *page)</div><div class='add'>+static inline unsigned long memdesc_section(memdesc_flags_t mdf)</div><div class='ctx'> {</div><div class='del'>-	return (page-&gt;flags &gt;&gt; SECTIONS_PGSHIFT) &amp; SECTIONS_MASK;</div><div class='add'>+	return (mdf.f &gt;&gt; SECTIONS_PGSHIFT) &amp; SECTIONS_MASK;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#else /* !SECTION_IN_PAGE_FLAGS */</div><div class='add'>+static inline unsigned long memdesc_section(memdesc_flags_t mdf)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* SECTION_IN_PAGE_FLAGS */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * folio_pfn - Return the Page Frame Number of a folio.</div><div class='hunk'>@@ -1901,7 +2036,7 @@ static inline unsigned long page_to_section(const struct page *page)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: The Page Frame Number of the first page in the folio.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long folio_pfn(struct folio *folio)</div><div class='add'>+static inline unsigned long folio_pfn(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return page_to_pfn(&amp;folio-&gt;page);</div><div class='ctx'> }</div><div class='hunk'>@@ -1911,6 +2046,69 @@ static inline struct folio *pfn_folio(unsigned long pfn)</div><div class='ctx'> 	return page_folio(pfn_to_page(pfn));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+static inline pte_t mk_pte(const struct page *page, pgprot_t pgprot)</div><div class='add'>+{</div><div class='add'>+	return pfn_pte(page_to_pfn(page), pgprot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * folio_mk_pte - Create a PTE for this folio</div><div class='add'>+ * @folio: The folio to create a PTE for</div><div class='add'>+ * @pgprot: The page protection bits to use</div><div class='add'>+ *</div><div class='add'>+ * Create a page table entry for the first page of this folio.</div><div class='add'>+ * This is suitable for passing to set_ptes().</div><div class='add'>+ *</div><div class='add'>+ * Return: A page table entry suitable for mapping this folio.</div><div class='add'>+ */</div><div class='add'>+static inline pte_t folio_mk_pte(const struct folio *folio, pgprot_t pgprot)</div><div class='add'>+{</div><div class='add'>+	return pfn_pte(folio_pfn(folio), pgprot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+/**</div><div class='add'>+ * folio_mk_pmd - Create a PMD for this folio</div><div class='add'>+ * @folio: The folio to create a PMD for</div><div class='add'>+ * @pgprot: The page protection bits to use</div><div class='add'>+ *</div><div class='add'>+ * Create a page table entry for the first page of this folio.</div><div class='add'>+ * This is suitable for passing to set_pmd_at().</div><div class='add'>+ *</div><div class='add'>+ * Return: A page table entry suitable for mapping this folio.</div><div class='add'>+ */</div><div class='add'>+static inline pmd_t folio_mk_pmd(const struct folio *folio, pgprot_t pgprot)</div><div class='add'>+{</div><div class='add'>+	return pmd_mkhuge(pfn_pmd(folio_pfn(folio), pgprot));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD</div><div class='add'>+/**</div><div class='add'>+ * folio_mk_pud - Create a PUD for this folio</div><div class='add'>+ * @folio: The folio to create a PUD for</div><div class='add'>+ * @pgprot: The page protection bits to use</div><div class='add'>+ *</div><div class='add'>+ * Create a page table entry for the first page of this folio.</div><div class='add'>+ * This is suitable for passing to set_pud_at().</div><div class='add'>+ *</div><div class='add'>+ * Return: A page table entry suitable for mapping this folio.</div><div class='add'>+ */</div><div class='add'>+static inline pud_t folio_mk_pud(const struct folio *folio, pgprot_t pgprot)</div><div class='add'>+{</div><div class='add'>+	return pud_mkhuge(pfn_pud(folio_pfn(folio), pgprot));</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */</div><div class='add'>+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='add'>+</div><div class='add'>+static inline bool folio_has_pincount(const struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_64BIT))</div><div class='add'>+		return folio_test_large(folio);</div><div class='add'>+	return folio_order(folio) &gt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * folio_maybe_dma_pinned - Report if a folio may be pinned for DMA.</div><div class='ctx'>  * @folio: The folio.</div><div class='hunk'>@@ -1927,18 +2125,18 @@ static inline struct folio *pfn_folio(unsigned long pfn)</div><div class='ctx'>  * get that many refcounts, and b) all the callers of this routine are</div><div class='ctx'>  * expected to be able to deal gracefully with a false positive.</div><div class='ctx'>  *</div><div class='del'>- * For large folios, the result will be exactly correct. That's because</div><div class='add'>+ * For most large folios, the result will be exactly correct. That's because</div><div class='ctx'>  * we have more tracking data available: the _pincount field is used</div><div class='ctx'>  * instead of the GUP_PIN_COUNTING_BIAS scheme.</div><div class='ctx'>  *</div><div class='ctx'>  * For more information, please see Documentation/core-api/pin_user_pages.rst.</div><div class='ctx'>  *</div><div class='del'>- * Return: True, if it is likely that the page has been "dma-pinned".</div><div class='del'>- * False, if the page is definitely not dma-pinned.</div><div class='add'>+ * Return: True, if it is likely that the folio has been "dma-pinned".</div><div class='add'>+ * False, if the folio is definitely not dma-pinned.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool folio_maybe_dma_pinned(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	if (folio_test_large(folio))</div><div class='add'>+	if (folio_has_pincount(folio))</div><div class='ctx'> 		return atomic_read(&amp;folio-&gt;_pincount) &gt; 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1953,11 +2151,6 @@ static inline bool folio_maybe_dma_pinned(struct folio *folio)</div><div class='ctx'> 		GUP_PIN_COUNTING_BIAS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool page_maybe_dma_pinned(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_maybe_dma_pinned(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This should most likely only be called during fork() to see whether we</div><div class='ctx'>  * should break the cow immediately for an anon page on the src mm.</div><div class='hunk'>@@ -1969,7 +2162,7 @@ static inline bool folio_needs_cow_for_dma(struct vm_area_struct *vma,</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON(!(raw_read_seqcount(&amp;vma-&gt;vm_mm-&gt;write_protect_seq) &amp; 1));</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(MMF_HAS_PINNED, &amp;vma-&gt;vm_mm-&gt;flags))</div><div class='add'>+	if (!mm_flags_test(MMF_HAS_PINNED, vma-&gt;vm_mm))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	return folio_maybe_dma_pinned(folio);</div><div class='hunk'>@@ -2015,6 +2208,13 @@ static inline bool folio_is_longterm_pinnable(struct folio *folio)</div><div class='ctx'> 	if (folio_is_device_coherent(folio))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Filesystems can only tolerate transient delays to truncate and</div><div class='add'>+	 * hole-punch operations</div><div class='add'>+	 */</div><div class='add'>+	if (folio_is_fsdax(folio))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/* Otherwise, non-movable zone folios can be pinned. */</div><div class='ctx'> 	return !folio_is_zone_movable(folio);</div><div class='ctx'> </div><div class='hunk'>@@ -2028,14 +2228,14 @@ static inline bool folio_is_longterm_pinnable(struct folio *folio)</div><div class='ctx'> </div><div class='ctx'> static inline void set_page_zone(struct page *page, enum zone_type zone)</div><div class='ctx'> {</div><div class='del'>-	page-&gt;flags &amp;= ~(ZONES_MASK &lt;&lt; ZONES_PGSHIFT);</div><div class='del'>-	page-&gt;flags |= (zone &amp; ZONES_MASK) &lt;&lt; ZONES_PGSHIFT;</div><div class='add'>+	page-&gt;flags.f &amp;= ~(ZONES_MASK &lt;&lt; ZONES_PGSHIFT);</div><div class='add'>+	page-&gt;flags.f |= (zone &amp; ZONES_MASK) &lt;&lt; ZONES_PGSHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void set_page_node(struct page *page, unsigned long node)</div><div class='ctx'> {</div><div class='del'>-	page-&gt;flags &amp;= ~(NODES_MASK &lt;&lt; NODES_PGSHIFT);</div><div class='del'>-	page-&gt;flags |= (node &amp; NODES_MASK) &lt;&lt; NODES_PGSHIFT;</div><div class='add'>+	page-&gt;flags.f &amp;= ~(NODES_MASK &lt;&lt; NODES_PGSHIFT);</div><div class='add'>+	page-&gt;flags.f |= (node &amp; NODES_MASK) &lt;&lt; NODES_PGSHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void set_page_links(struct page *page, enum zone_type zone,</div><div class='hunk'>@@ -2054,42 +2254,55 @@ static inline void set_page_links(struct page *page, enum zone_type zone,</div><div class='ctx'>  *</div><div class='ctx'>  * Return: A positive power of two.</div><div class='ctx'>  */</div><div class='del'>-static inline long folio_nr_pages(struct folio *folio)</div><div class='add'>+static inline unsigned long folio_nr_pages(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	if (!folio_test_large(folio))</div><div class='ctx'> 		return 1;</div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='del'>-	return folio-&gt;_folio_nr_pages;</div><div class='add'>+	return folio_large_nr_pages(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if !defined(CONFIG_HAVE_GIGANTIC_FOLIOS)</div><div class='add'>+/*</div><div class='add'>+ * We don't expect any folios that exceed buddy sizes (and consequently</div><div class='add'>+ * memory sections).</div><div class='add'>+ */</div><div class='add'>+#define MAX_FOLIO_ORDER		MAX_PAGE_ORDER</div><div class='add'>+#elif defined(CONFIG_SPARSEMEM) &amp;&amp; !defined(CONFIG_SPARSEMEM_VMEMMAP)</div><div class='add'>+/*</div><div class='add'>+ * Only pages within a single memory section are guaranteed to be</div><div class='add'>+ * contiguous. By limiting folios to a single memory section, all folio</div><div class='add'>+ * pages are guaranteed to be contiguous.</div><div class='add'>+ */</div><div class='add'>+#define MAX_FOLIO_ORDER		PFN_SECTION_SHIFT</div><div class='add'>+#elif defined(CONFIG_HUGETLB_PAGE)</div><div class='add'>+/*</div><div class='add'>+ * There is no real limit on the folio size. We limit them to the maximum we</div><div class='add'>+ * currently expect (see CONFIG_HAVE_GIGANTIC_FOLIOS): with hugetlb, we expect</div><div class='add'>+ * no folios larger than 16 GiB on 64bit and 1 GiB on 32bit.</div><div class='add'>+ */</div><div class='add'>+#define MAX_FOLIO_ORDER		get_order(IS_ENABLED(CONFIG_64BIT) ? SZ_16G : SZ_1G)</div><div class='ctx'> #else</div><div class='del'>-	return 1L &lt;&lt; (folio-&gt;_flags_1 &amp; 0xff);</div><div class='add'>+/*</div><div class='add'>+ * Without hugetlb, gigantic folios that are bigger than a single PUD are</div><div class='add'>+ * currently impossible.</div><div class='add'>+ */</div><div class='add'>+#define MAX_FOLIO_ORDER		PUD_ORDER</div><div class='ctx'> #endif</div><div class='del'>-}</div><div class='add'>+</div><div class='add'>+#define MAX_FOLIO_NR_PAGES	(1UL &lt;&lt; MAX_FOLIO_ORDER)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * compound_nr() returns the number of pages in this potentially compound</div><div class='ctx'>  * page.  compound_nr() can be called on a tail page, and is defined to</div><div class='ctx'>  * return 1 in that case.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long compound_nr(struct page *page)</div><div class='add'>+static inline unsigned long compound_nr(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = (struct folio *)page;</div><div class='add'>+	const struct folio *folio = (struct folio *)page;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(PG_head, &amp;folio-&gt;flags))</div><div class='add'>+	if (!test_bit(PG_head, &amp;folio-&gt;flags.f))</div><div class='ctx'> 		return 1;</div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='del'>-	return folio-&gt;_folio_nr_pages;</div><div class='del'>-#else</div><div class='del'>-	return 1L &lt;&lt; (folio-&gt;_flags_1 &amp; 0xff);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * thp_nr_pages - The number of regular pages in this huge page.</div><div class='del'>- * @page: The head page of a huge page.</div><div class='del'>- */</div><div class='del'>-static inline int thp_nr_pages(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_nr_pages((struct folio *)page);</div><div class='add'>+	return folio_large_nr_pages(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2123,7 +2336,7 @@ static inline struct folio *folio_next(struct folio *folio)</div><div class='ctx'>  * it from being split.  It is not necessary for the folio to be locked.</div><div class='ctx'>  * Return: The base-2 logarithm of the size of this folio.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int folio_shift(struct folio *folio)</div><div class='add'>+static inline unsigned int folio_shift(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return PAGE_SHIFT + folio_order(folio);</div><div class='ctx'> }</div><div class='hunk'>@@ -2136,49 +2349,134 @@ static inline unsigned int folio_shift(struct folio *folio)</div><div class='ctx'>  * it from being split.  It is not necessary for the folio to be locked.</div><div class='ctx'>  * Return: The number of bytes in this folio.</div><div class='ctx'>  */</div><div class='del'>-static inline size_t folio_size(struct folio *folio)</div><div class='add'>+static inline size_t folio_size(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return PAGE_SIZE &lt;&lt; folio_order(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * folio_estimated_sharers - Estimate the number of sharers of a folio.</div><div class='add'>+ * folio_maybe_mapped_shared - Whether the folio is mapped into the page</div><div class='add'>+ *			       tables of more than one MM</div><div class='ctx'>  * @folio: The folio.</div><div class='ctx'>  *</div><div class='del'>- * folio_estimated_sharers() aims to serve as a function to efficiently</div><div class='del'>- * estimate the number of processes sharing a folio. This is done by</div><div class='del'>- * looking at the precise mapcount of the first subpage in the folio, and</div><div class='del'>- * assuming the other subpages are the same. This may not be true for large</div><div class='del'>- * folios. If you want exact mapcounts for exact calculations, look at</div><div class='del'>- * page_mapcount() or folio_total_mapcount().</div><div class='add'>+ * This function checks if the folio maybe currently mapped into more than one</div><div class='add'>+ * MM ("maybe mapped shared"), or if the folio is certainly mapped into a single</div><div class='add'>+ * MM ("mapped exclusively").</div><div class='add'>+ *</div><div class='add'>+ * For KSM folios, this function also returns "mapped shared" when a folio is</div><div class='add'>+ * mapped multiple times into the same MM, because the individual page mappings</div><div class='add'>+ * are independent.</div><div class='add'>+ *</div><div class='add'>+ * For small anonymous folios and anonymous hugetlb folios, the return</div><div class='add'>+ * value will be exactly correct: non-KSM folios can only be mapped at most once</div><div class='add'>+ * into an MM, and they cannot be partially mapped. KSM folios are</div><div class='add'>+ * considered shared even if mapped multiple times into the same MM.</div><div class='add'>+ *</div><div class='add'>+ * For other folios, the result can be fuzzy:</div><div class='add'>+ *    #. For partially-mappable large folios (THP), the return value can wrongly</div><div class='add'>+ *       indicate "mapped shared" (false positive) if a folio was mapped by</div><div class='add'>+ *       more than two MMs at one point in time.</div><div class='add'>+ *    #. For pagecache folios (including hugetlb), the return value can wrongly</div><div class='add'>+ *       indicate "mapped shared" (false positive) when two VMAs in the same MM</div><div class='add'>+ *       cover the same file range.</div><div class='add'>+ *</div><div class='add'>+ * Further, this function only considers current page table mappings that</div><div class='add'>+ * are tracked using the folio mapcount(s).</div><div class='ctx'>  *</div><div class='del'>- * Return: The estimated number of processes sharing a folio.</div><div class='add'>+ * This function does not consider:</div><div class='add'>+ *    #. If the folio might get mapped in the (near) future (e.g., swapcache,</div><div class='add'>+ *       pagecache, temporary unmapping for migration).</div><div class='add'>+ *    #. If the folio is mapped differently (VM_PFNMAP).</div><div class='add'>+ *    #. If hugetlb page table sharing applies. Callers might want to check</div><div class='add'>+ *       hugetlb_pmd_shared().</div><div class='add'>+ *</div><div class='add'>+ * Return: Whether the folio is estimated to be mapped into more than one MM.</div><div class='ctx'>  */</div><div class='del'>-static inline int folio_estimated_sharers(struct folio *folio)</div><div class='add'>+static inline bool folio_maybe_mapped_shared(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return page_mapcount(folio_page(folio, 0));</div><div class='add'>+	int mapcount = folio_mapcount(folio);</div><div class='add'>+</div><div class='add'>+	/* Only partially-mappable folios require more care. */</div><div class='add'>+	if (!folio_test_large(folio) || unlikely(folio_test_hugetlb(folio)))</div><div class='add'>+		return mapcount &gt; 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * vm_insert_page() without CONFIG_TRANSPARENT_HUGEPAGE ...</div><div class='add'>+	 * simply assume "mapped shared", nobody should really care</div><div class='add'>+	 * about this for arbitrary kernel allocations.</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_ENABLED(CONFIG_MM_ID))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A single mapping implies "mapped exclusively", even if the</div><div class='add'>+	 * folio flag says something different: it's easier to handle this</div><div class='add'>+	 * case here instead of on the RMAP hot path.</div><div class='add'>+	 */</div><div class='add'>+	if (mapcount &lt;= 1)</div><div class='add'>+		return false;</div><div class='add'>+	return test_bit(FOLIO_MM_IDS_SHARED_BITNUM, &amp;folio-&gt;_mm_ids);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef HAVE_ARCH_MAKE_PAGE_ACCESSIBLE</div><div class='del'>-static inline int arch_make_page_accessible(struct page *page)</div><div class='add'>+/**</div><div class='add'>+ * folio_expected_ref_count - calculate the expected folio refcount</div><div class='add'>+ * @folio: the folio</div><div class='add'>+ *</div><div class='add'>+ * Calculate the expected folio refcount, taking references from the pagecache,</div><div class='add'>+ * swapcache, PG_private and page table mappings into account. Useful in</div><div class='add'>+ * combination with folio_ref_count() to detect unexpected references (e.g.,</div><div class='add'>+ * GUP or other temporary references).</div><div class='add'>+ *</div><div class='add'>+ * Does currently not consider references from the LRU cache. If the folio</div><div class='add'>+ * was isolated from the LRU (which is the case during migration or split),</div><div class='add'>+ * the LRU cache does not apply.</div><div class='add'>+ *</div><div class='add'>+ * Calling this function on an unmapped folio -- !folio_mapped() -- that is</div><div class='add'>+ * locked will return a stable result.</div><div class='add'>+ *</div><div class='add'>+ * Calling this function on a mapped folio will not result in a stable result,</div><div class='add'>+ * because nothing stops additional page table mappings from coming (e.g.,</div><div class='add'>+ * fork()) or going (e.g., munmap()).</div><div class='add'>+ *</div><div class='add'>+ * Calling this function without the folio lock will also not result in a</div><div class='add'>+ * stable result: for example, the folio might get dropped from the swapcache</div><div class='add'>+ * concurrently.</div><div class='add'>+ *</div><div class='add'>+ * However, even when called without the folio lock or on a mapped folio,</div><div class='add'>+ * this function can be used to detect unexpected references early (for example,</div><div class='add'>+ * if it makes sense to even lock the folio and unmap it).</div><div class='add'>+ *</div><div class='add'>+ * The caller must add any reference (e.g., from folio_try_get()) it might be</div><div class='add'>+ * holding itself to the result.</div><div class='add'>+ *</div><div class='add'>+ * Returns the expected folio refcount.</div><div class='add'>+ */</div><div class='add'>+static inline int folio_expected_ref_count(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	const int order = folio_order(folio);</div><div class='add'>+	int ref_count = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(page_has_type(&amp;folio-&gt;page) &amp;&amp; !folio_test_hugetlb(folio)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (folio_test_anon(folio)) {</div><div class='add'>+		/* One reference per page from the swapcache. */</div><div class='add'>+		ref_count += folio_test_swapcache(folio) &lt;&lt; order;</div><div class='add'>+	} else {</div><div class='add'>+		/* One reference per page from the pagecache. */</div><div class='add'>+		ref_count += !!folio-&gt;mapping &lt;&lt; order;</div><div class='add'>+		/* One reference from PG_private. */</div><div class='add'>+		ref_count += folio_test_private(folio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* One reference per page table mapping. */</div><div class='add'>+	return ref_count + folio_mapcount(folio);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef HAVE_ARCH_MAKE_FOLIO_ACCESSIBLE</div><div class='ctx'> static inline int arch_make_folio_accessible(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	long i, nr = folio_nr_pages(folio);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr; i++) {</div><div class='del'>-		ret = arch_make_page_accessible(folio_page(folio, i));</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2187,11 +2485,6 @@ static inline int arch_make_folio_accessible(struct folio *folio)</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/vmstat.h&gt;</div><div class='ctx'> </div><div class='del'>-static __always_inline void *lowmem_page_address(const struct page *page)</div><div class='del'>-{</div><div class='del'>-	return page_to_virt(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_HIGHMEM) &amp;&amp; !defined(WANT_PAGE_VIRTUAL)</div><div class='ctx'> #define HASHED_PAGE_VIRTUAL</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2214,6 +2507,11 @@ void set_page_address(struct page *page, void *virtual);</div><div class='ctx'> void page_address_init(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static __always_inline void *lowmem_page_address(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return page_to_virt(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if !defined(HASHED_PAGE_VIRTUAL) &amp;&amp; !defined(WANT_PAGE_VIRTUAL)</div><div class='ctx'> #define page_address(page) lowmem_page_address(page)</div><div class='ctx'> #define set_page_address(page, address)  do { } while(0)</div><div class='hunk'>@@ -2225,19 +2523,6 @@ static inline void *folio_address(const struct folio *folio)</div><div class='ctx'> 	return page_address(&amp;folio-&gt;page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern pgoff_t __page_file_index(struct page *page);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Return the pagecache index of the passed page.  Regular pagecache pages</div><div class='del'>- * use -&gt;index whereas swapcache pages use swp_offset(-&gt;private)</div><div class='del'>- */</div><div class='del'>-static inline pgoff_t page_index(struct page *page)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(PageSwapCache(page)))</div><div class='del'>-		return __page_file_index(page);</div><div class='del'>-	return page-&gt;index;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Return true only if the page has been allocated with</div><div class='ctx'>  * ALLOC_NO_WATERMARKS and the low watermark was not</div><div class='hunk'>@@ -2288,7 +2573,6 @@ static inline void clear_page_pfmemalloc(struct page *page)</div><div class='ctx'> extern void pagefault_out_of_memory(void);</div><div class='ctx'> </div><div class='ctx'> #define offset_in_page(p)	((unsigned long)(p) &amp; ~PAGE_MASK)</div><div class='del'>-#define offset_in_thp(page, p)	((unsigned long)(p) &amp; (thp_size(page) - 1))</div><div class='ctx'> #define offset_in_folio(folio, p) ((unsigned long)(p) &amp; (folio_size(folio) - 1))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2297,6 +2581,7 @@ extern void pagefault_out_of_memory(void);</div><div class='ctx'> struct zap_details {</div><div class='ctx'> 	struct folio *single_folio;	/* Locked folio to be unmapped */</div><div class='ctx'> 	bool even_cows;			/* Zap COWed private pages too? */</div><div class='add'>+	bool reclaim_pt;		/* Need reclaim page tables? */</div><div class='ctx'> 	zap_flags_t zap_flags;		/* Extra flags for zapping */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2310,31 +2595,6 @@ struct zap_details {</div><div class='ctx'> /* Set in unmap_vmas() to indicate a final unmap call.  Only used by hugetlb */</div><div class='ctx'> #define  ZAP_FLAG_UNMAP              ((__force zap_flags_t) BIT(1))</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_MM_CID</div><div class='del'>-void sched_mm_cid_before_execve(struct task_struct *t);</div><div class='del'>-void sched_mm_cid_after_execve(struct task_struct *t);</div><div class='del'>-void sched_mm_cid_fork(struct task_struct *t);</div><div class='del'>-void sched_mm_cid_exit_signals(struct task_struct *t);</div><div class='del'>-static inline int task_mm_cid(struct task_struct *t)</div><div class='del'>-{</div><div class='del'>-	return t-&gt;mm_cid;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void sched_mm_cid_before_execve(struct task_struct *t) { }</div><div class='del'>-static inline void sched_mm_cid_after_execve(struct task_struct *t) { }</div><div class='del'>-static inline void sched_mm_cid_fork(struct task_struct *t) { }</div><div class='del'>-static inline void sched_mm_cid_exit_signals(struct task_struct *t) { }</div><div class='del'>-static inline int task_mm_cid(struct task_struct *t)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Use the processor id as a fall-back when the mm cid feature is</div><div class='del'>-	 * disabled. This provides functional per-cpu data structure accesses</div><div class='del'>-	 * in user-space, althrough it won't provide the memory usage benefits.</div><div class='del'>-	 */</div><div class='del'>-	return raw_smp_processor_id();</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> extern bool can_do_mlock(void);</div><div class='ctx'> #else</div><div class='hunk'>@@ -2351,6 +2611,8 @@ struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma,</div><div class='ctx'> 				  unsigned long addr, pmd_t pmd);</div><div class='ctx'> struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 				pmd_t pmd);</div><div class='add'>+struct page *vm_normal_page_pud(struct vm_area_struct *vma, unsigned long addr,</div><div class='add'>+		pud_t pud);</div><div class='ctx'> </div><div class='ctx'> void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,</div><div class='ctx'> 		  unsigned long size);</div><div class='hunk'>@@ -2363,7 +2625,7 @@ static inline void zap_vma_pages(struct vm_area_struct *vma)</div><div class='ctx'> }</div><div class='ctx'> void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,</div><div class='ctx'> 		struct vm_area_struct *start_vma, unsigned long start,</div><div class='del'>-		unsigned long end, unsigned long tree_end, bool mm_wr_locked);</div><div class='add'>+		unsigned long end, unsigned long tree_end);</div><div class='ctx'> </div><div class='ctx'> struct mmu_notifier_range;</div><div class='ctx'> </div><div class='hunk'>@@ -2371,15 +2633,42 @@ void free_pgd_range(struct mmu_gather *tlb, unsigned long addr,</div><div class='ctx'> 		unsigned long end, unsigned long floor, unsigned long ceiling);</div><div class='ctx'> int</div><div class='ctx'> copy_page_range(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma);</div><div class='del'>-int follow_pte(struct mm_struct *mm, unsigned long address,</div><div class='del'>-	       pte_t **ptepp, spinlock_t **ptlp);</div><div class='del'>-int follow_pfn(struct vm_area_struct *vma, unsigned long address,</div><div class='del'>-	unsigned long *pfn);</div><div class='del'>-int follow_phys(struct vm_area_struct *vma, unsigned long address,</div><div class='del'>-		unsigned int flags, unsigned long *prot, resource_size_t *phys);</div><div class='ctx'> int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 			void *buf, int len, int write);</div><div class='ctx'> </div><div class='add'>+struct follow_pfnmap_args {</div><div class='add'>+	/**</div><div class='add'>+	 * Inputs:</div><div class='add'>+	 * @vma: Pointer to @vm_area_struct struct</div><div class='add'>+	 * @address: the virtual address to walk</div><div class='add'>+	 */</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	unsigned long address;</div><div class='add'>+	/**</div><div class='add'>+	 * Internals:</div><div class='add'>+	 *</div><div class='add'>+	 * The caller shouldn't touch any of these.</div><div class='add'>+	 */</div><div class='add'>+	spinlock_t *lock;</div><div class='add'>+	pte_t *ptep;</div><div class='add'>+	/**</div><div class='add'>+	 * Outputs:</div><div class='add'>+	 *</div><div class='add'>+	 * @pfn: the PFN of the address</div><div class='add'>+	 * @addr_mask: address mask covering pfn</div><div class='add'>+	 * @pgprot: the pgprot_t of the mapping</div><div class='add'>+	 * @writable: whether the mapping is writable</div><div class='add'>+	 * @special: whether the mapping is a special mapping (real PFN maps)</div><div class='add'>+	 */</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+	unsigned long addr_mask;</div><div class='add'>+	pgprot_t pgprot;</div><div class='add'>+	bool writable;</div><div class='add'>+	bool special;</div><div class='add'>+};</div><div class='add'>+int follow_pfnmap_start(struct follow_pfnmap_args *args);</div><div class='add'>+void follow_pfnmap_end(struct follow_pfnmap_args *args);</div><div class='add'>+</div><div class='ctx'> extern void truncate_pagecache(struct inode *inode, loff_t new);</div><div class='ctx'> extern void truncate_setsize(struct inode *inode, loff_t newsize);</div><div class='ctx'> void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to);</div><div class='hunk'>@@ -2437,6 +2726,11 @@ extern int access_process_vm(struct task_struct *tsk, unsigned long addr,</div><div class='ctx'> extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 		void *buf, int len, unsigned int gup_flags);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BPF_SYSCALL</div><div class='add'>+extern int copy_remote_vm_str(struct task_struct *tsk, unsigned long addr,</div><div class='add'>+			      void *buf, int len, unsigned int gup_flags);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> long get_user_pages_remote(struct mm_struct *mm,</div><div class='ctx'> 			   unsigned long start, unsigned long nr_pages,</div><div class='ctx'> 			   unsigned int gup_flags, struct page **pages,</div><div class='hunk'>@@ -2484,6 +2778,10 @@ long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,</div><div class='ctx'> 		    struct page **pages, unsigned int gup_flags);</div><div class='ctx'> long pin_user_pages_unlocked(unsigned long start, unsigned long nr_pages,</div><div class='ctx'> 		    struct page **pages, unsigned int gup_flags);</div><div class='add'>+long memfd_pin_folios(struct file *memfd, loff_t start, loff_t end,</div><div class='add'>+		      struct folio **folios, unsigned int max_folios,</div><div class='add'>+		      pgoff_t *offset);</div><div class='add'>+int folio_add_pins(struct folio *folio, unsigned int pins);</div><div class='ctx'> </div><div class='ctx'> int get_user_pages_fast(unsigned long start, int nr_pages,</div><div class='ctx'> 			unsigned int gup_flags, struct page **pages);</div><div class='hunk'>@@ -2493,22 +2791,18 @@ void folio_add_pin(struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> int account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc);</div><div class='ctx'> int __account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc,</div><div class='del'>-			struct task_struct *task, bool bypass_rlim);</div><div class='add'>+			const struct task_struct *task, bool bypass_rlim);</div><div class='ctx'> </div><div class='ctx'> struct kvec;</div><div class='del'>-struct page *get_dump_page(unsigned long addr);</div><div class='add'>+struct page *get_dump_page(unsigned long addr, int *locked);</div><div class='ctx'> </div><div class='ctx'> bool folio_mark_dirty(struct folio *folio);</div><div class='add'>+bool folio_mark_dirty_lock(struct folio *folio);</div><div class='ctx'> bool set_page_dirty(struct page *page);</div><div class='ctx'> int set_page_dirty_lock(struct page *page);</div><div class='ctx'> </div><div class='ctx'> int get_cmdline(struct task_struct *task, char *buffer, int buflen);</div><div class='ctx'> </div><div class='del'>-extern unsigned long move_page_tables(struct vm_area_struct *vma,</div><div class='del'>-		unsigned long old_addr, struct vm_area_struct *new_vma,</div><div class='del'>-		unsigned long new_addr, unsigned long len,</div><div class='del'>-		bool need_rmap_locks, bool for_stack);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Flags used by change_protection().  For now we make it a bitmap so</div><div class='ctx'>  * that we can pass in multiple flags just like parameters.  However</div><div class='hunk'>@@ -2529,21 +2823,6 @@ extern unsigned long move_page_tables(struct vm_area_struct *vma,</div><div class='ctx'> #define  MM_CP_UFFD_WP_ALL                 (MM_CP_UFFD_WP | \</div><div class='ctx'> 					    MM_CP_UFFD_WP_RESOLVE)</div><div class='ctx'> </div><div class='del'>-bool vma_needs_dirty_tracking(struct vm_area_struct *vma);</div><div class='del'>-int vma_wants_writenotify(struct vm_area_struct *vma, pgprot_t vm_page_prot);</div><div class='del'>-static inline bool vma_wants_manual_pte_write_upgrade(struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We want to check manually if we can change individual PTEs writable</div><div class='del'>-	 * if we can't do that automatically for all PTEs in a mapping. For</div><div class='del'>-	 * private mappings, that's always the case when we have write</div><div class='del'>-	 * permissions as we properly have to handle COW.</div><div class='del'>-	 */</div><div class='del'>-	if (vma-&gt;vm_flags &amp; VM_SHARED)</div><div class='del'>-		return vma_wants_writenotify(vma, vma-&gt;vm_page_prot);</div><div class='del'>-	return !!(vma-&gt;vm_flags &amp; VM_WRITE);</div><div class='del'>-</div><div class='del'>-}</div><div class='ctx'> bool can_change_pte_writable(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 			     pte_t pte);</div><div class='ctx'> extern long change_protection(struct mmu_gather *tlb,</div><div class='hunk'>@@ -2551,7 +2830,7 @@ extern long change_protection(struct mmu_gather *tlb,</div><div class='ctx'> 			      unsigned long end, unsigned long cp_flags);</div><div class='ctx'> extern int mprotect_fixup(struct vma_iterator *vmi, struct mmu_gather *tlb,</div><div class='ctx'> 	  struct vm_area_struct *vma, struct vm_area_struct **pprev,</div><div class='del'>-	  unsigned long start, unsigned long end, unsigned long newflags);</div><div class='add'>+	  unsigned long start, unsigned long end, vm_flags_t newflags);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * doesn't attempt to fault and will return short.</div><div class='hunk'>@@ -2572,6 +2851,11 @@ static inline unsigned long get_mm_counter(struct mm_struct *mm, int member)</div><div class='ctx'> 	return percpu_counter_read_positive(&amp;mm-&gt;rss_stat[member]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long get_mm_counter_sum(struct mm_struct *mm, int member)</div><div class='add'>+{</div><div class='add'>+	return percpu_counter_sum_positive(&amp;mm-&gt;rss_stat[member]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mm_trace_rss_stat(struct mm_struct *mm, int member);</div><div class='ctx'> </div><div class='ctx'> static inline void add_mm_counter(struct mm_struct *mm, int member, long value)</div><div class='hunk'>@@ -2595,19 +2879,19 @@ static inline void dec_mm_counter(struct mm_struct *mm, int member)</div><div class='ctx'> 	mm_trace_rss_stat(mm, member);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Optimized variant when page is already known not to be PageAnon */</div><div class='del'>-static inline int mm_counter_file(struct page *page)</div><div class='add'>+/* Optimized variant when folio is already known not to be anon */</div><div class='add'>+static inline int mm_counter_file(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	if (PageSwapBacked(page))</div><div class='add'>+	if (folio_test_swapbacked(folio))</div><div class='ctx'> 		return MM_SHMEMPAGES;</div><div class='ctx'> 	return MM_FILEPAGES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int mm_counter(struct page *page)</div><div class='add'>+static inline int mm_counter(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	if (PageAnon(page))</div><div class='add'>+	if (folio_test_anon(folio))</div><div class='ctx'> 		return MM_ANONPAGES;</div><div class='del'>-	return mm_counter_file(page);</div><div class='add'>+	return mm_counter_file(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long get_mm_rss(struct mm_struct *mm)</div><div class='hunk'>@@ -2631,8 +2915,8 @@ static inline void update_hiwater_rss(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long _rss = get_mm_rss(mm);</div><div class='ctx'> </div><div class='del'>-	if ((mm)-&gt;hiwater_rss &lt; _rss)</div><div class='del'>-		(mm)-&gt;hiwater_rss = _rss;</div><div class='add'>+	if (data_race(mm-&gt;hiwater_rss) &lt; _rss)</div><div class='add'>+		data_race(mm-&gt;hiwater_rss = _rss);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void update_hiwater_vm(struct mm_struct *mm)</div><div class='hunk'>@@ -2667,12 +2951,29 @@ static inline pte_t pte_mkspecial(pte_t pte)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_ARCH_HAS_PTE_DEVMAP</div><div class='del'>-static inline int pte_devmap(pte_t pte)</div><div class='add'>+#ifndef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP</div><div class='add'>+static inline bool pmd_special(pmd_t pmd)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static inline pmd_t pmd_mkspecial(pmd_t pmd)</div><div class='add'>+{</div><div class='add'>+	return pmd;</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_ARCH_SUPPORTS_PMD_PFNMAP */</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP</div><div class='add'>+static inline bool pud_special(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pud_t pud_mkspecial(pud_t pud)</div><div class='add'>+{</div><div class='add'>+	return pud;</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_ARCH_SUPPORTS_PUD_PFNMAP */</div><div class='ctx'> </div><div class='ctx'> extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			       spinlock_t **ptl);</div><div class='hunk'>@@ -2807,16 +3108,23 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long a</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='ctx'> </div><div class='add'>+enum pt_flags {</div><div class='add'>+	PT_kernel = PG_referenced,</div><div class='add'>+	PT_reserved = PG_reserved,</div><div class='add'>+	/* High bits are used for zone/node/section */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline struct ptdesc *virt_to_ptdesc(const void *x)</div><div class='ctx'> {</div><div class='ctx'> 	return page_ptdesc(virt_to_page(x));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *ptdesc_to_virt(const struct ptdesc *pt)</div><div class='del'>-{</div><div class='del'>-	return page_to_virt(ptdesc_page(pt));</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * ptdesc_address - Virtual address of page table.</div><div class='add'>+ * @pt: Page table descriptor.</div><div class='add'>+ *</div><div class='add'>+ * Return: The first byte of the page table described by @pt.</div><div class='add'>+ */</div><div class='ctx'> static inline void *ptdesc_address(const struct ptdesc *pt)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_address(ptdesc_folio(pt));</div><div class='hunk'>@@ -2824,7 +3132,47 @@ static inline void *ptdesc_address(const struct ptdesc *pt)</div><div class='ctx'> </div><div class='ctx'> static inline bool pagetable_is_reserved(struct ptdesc *pt)</div><div class='ctx'> {</div><div class='del'>-	return folio_test_reserved(ptdesc_folio(pt));</div><div class='add'>+	return test_bit(PT_reserved, &amp;pt-&gt;pt_flags.f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ptdesc_set_kernel - Mark a ptdesc used to map the kernel</div><div class='add'>+ * @ptdesc: The ptdesc to be marked</div><div class='add'>+ *</div><div class='add'>+ * Kernel page tables often need special handling. Set a flag so that</div><div class='add'>+ * the handling code knows this ptdesc will not be used for userspace.</div><div class='add'>+ */</div><div class='add'>+static inline void ptdesc_set_kernel(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	set_bit(PT_kernel, &amp;ptdesc-&gt;pt_flags.f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ptdesc_clear_kernel - Mark a ptdesc as no longer used to map the kernel</div><div class='add'>+ * @ptdesc: The ptdesc to be unmarked</div><div class='add'>+ *</div><div class='add'>+ * Use when the ptdesc is no longer used to map the kernel and no longer</div><div class='add'>+ * needs special handling.</div><div class='add'>+ */</div><div class='add'>+static inline void ptdesc_clear_kernel(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Note: the 'PG_referenced' bit does not strictly need to be</div><div class='add'>+	 * cleared before freeing the page. But this is nice for</div><div class='add'>+	 * symmetry.</div><div class='add'>+	 */</div><div class='add'>+	clear_bit(PT_kernel, &amp;ptdesc-&gt;pt_flags.f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ptdesc_test_kernel - Check if a ptdesc is used to map the kernel</div><div class='add'>+ * @ptdesc: The ptdesc being tested</div><div class='add'>+ *</div><div class='add'>+ * Call to tell if the ptdesc used to map the kernel.</div><div class='add'>+ */</div><div class='add'>+static inline bool ptdesc_test_kernel(const struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	return test_bit(PT_kernel, &amp;ptdesc-&gt;pt_flags.f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2837,13 +3185,29 @@ static inline bool pagetable_is_reserved(struct ptdesc *pt)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: The ptdesc describing the allocated page tables.</div><div class='ctx'>  */</div><div class='del'>-static inline struct ptdesc *pagetable_alloc(gfp_t gfp, unsigned int order)</div><div class='add'>+static inline struct ptdesc *pagetable_alloc_noprof(gfp_t gfp, unsigned int order)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = alloc_pages(gfp | __GFP_COMP, order);</div><div class='add'>+	struct page *page = alloc_pages_noprof(gfp | __GFP_COMP, order);</div><div class='ctx'> </div><div class='ctx'> 	return page_ptdesc(page);</div><div class='ctx'> }</div><div class='add'>+#define pagetable_alloc(...)	alloc_hooks(pagetable_alloc_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='add'>+static inline void __pagetable_free(struct ptdesc *pt)</div><div class='add'>+{</div><div class='add'>+	struct page *page = ptdesc_page(pt);</div><div class='add'>+</div><div class='add'>+	__free_pages(page, compound_order(page));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ASYNC_KERNEL_PGTABLE_FREE</div><div class='add'>+void pagetable_free_kernel(struct ptdesc *pt);</div><div class='add'>+#else</div><div class='add'>+static inline void pagetable_free_kernel(struct ptdesc *pt)</div><div class='add'>+{</div><div class='add'>+	__pagetable_free(pt);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> /**</div><div class='ctx'>  * pagetable_free - Free pagetables</div><div class='ctx'>  * @pt:	The page table descriptor</div><div class='hunk'>@@ -2853,12 +3217,15 @@ static inline struct ptdesc *pagetable_alloc(gfp_t gfp, unsigned int order)</div><div class='ctx'>  */</div><div class='ctx'> static inline void pagetable_free(struct ptdesc *pt)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = ptdesc_page(pt);</div><div class='del'>-</div><div class='del'>-	__free_pages(page, compound_order(page));</div><div class='add'>+	if (ptdesc_test_kernel(pt)) {</div><div class='add'>+		ptdesc_clear_kernel(pt);</div><div class='add'>+		pagetable_free_kernel(pt);</div><div class='add'>+	} else {</div><div class='add'>+		__pagetable_free(pt);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if USE_SPLIT_PTE_PTLOCKS</div><div class='add'>+#if defined(CONFIG_SPLIT_PTE_PTLOCKS)</div><div class='ctx'> #if ALLOC_SPLIT_PTLOCKS</div><div class='ctx'> void __init ptlock_cache_init(void);</div><div class='ctx'> bool ptlock_alloc(struct ptdesc *ptdesc);</div><div class='hunk'>@@ -2893,6 +3260,13 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)</div><div class='ctx'> 	return ptlock_ptr(page_ptdesc(pmd_page(*pmd)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(IS_ENABLED(CONFIG_HIGHPTE));</div><div class='add'>+	BUILD_BUG_ON(MAX_PTRS_PER_PTE * sizeof(pte_t) &gt; PAGE_SIZE);</div><div class='add'>+	return ptlock_ptr(virt_to_ptdesc(pte));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool ptlock_init(struct ptdesc *ptdesc)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2909,7 +3283,7 @@ static inline bool ptlock_init(struct ptdesc *ptdesc)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else	/* !USE_SPLIT_PTE_PTLOCKS */</div><div class='add'>+#else	/* !defined(CONFIG_SPLIT_PTE_PTLOCKS) */</div><div class='ctx'> /*</div><div class='ctx'>  * We use mm-&gt;page_table_lock to guard all pagetable pages of the mm.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2917,32 +3291,61 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;mm-&gt;page_table_lock;</div><div class='ctx'> }</div><div class='add'>+static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte)</div><div class='add'>+{</div><div class='add'>+	return &amp;mm-&gt;page_table_lock;</div><div class='add'>+}</div><div class='ctx'> static inline void ptlock_cache_init(void) {}</div><div class='ctx'> static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; }</div><div class='ctx'> static inline void ptlock_free(struct ptdesc *ptdesc) {}</div><div class='del'>-#endif /* USE_SPLIT_PTE_PTLOCKS */</div><div class='add'>+#endif /* defined(CONFIG_SPLIT_PTE_PTLOCKS) */</div><div class='ctx'> </div><div class='del'>-static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc)</div><div class='add'>+static inline unsigned long ptdesc_nr_pages(const struct ptdesc *ptdesc)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = ptdesc_folio(ptdesc);</div><div class='add'>+	return compound_nr(ptdesc_page(ptdesc));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!ptlock_init(ptdesc))</div><div class='del'>-		return false;</div><div class='del'>-	__folio_set_pgtable(folio);</div><div class='del'>-	lruvec_stat_add_folio(folio, NR_PAGETABLE);</div><div class='del'>-	return true;</div><div class='add'>+static inline void __pagetable_ctor(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	pg_data_t *pgdat = NODE_DATA(memdesc_nid(ptdesc-&gt;pt_flags));</div><div class='add'>+</div><div class='add'>+	__SetPageTable(ptdesc_page(ptdesc));</div><div class='add'>+	mod_node_page_state(pgdat, NR_PAGETABLE, ptdesc_nr_pages(ptdesc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pagetable_pte_dtor(struct ptdesc *ptdesc)</div><div class='add'>+static inline void pagetable_dtor(struct ptdesc *ptdesc)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = ptdesc_folio(ptdesc);</div><div class='add'>+	pg_data_t *pgdat = NODE_DATA(memdesc_nid(ptdesc-&gt;pt_flags));</div><div class='ctx'> </div><div class='ctx'> 	ptlock_free(ptdesc);</div><div class='del'>-	__folio_clear_pgtable(folio);</div><div class='del'>-	lruvec_stat_sub_folio(folio, NR_PAGETABLE);</div><div class='add'>+	__ClearPageTable(ptdesc_page(ptdesc));</div><div class='add'>+	mod_node_page_state(pgdat, NR_PAGETABLE, -ptdesc_nr_pages(ptdesc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pagetable_dtor_free(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	pagetable_dtor(ptdesc);</div><div class='add'>+	pagetable_free(ptdesc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pagetable_pte_ctor(struct mm_struct *mm,</div><div class='add'>+				      struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	if (mm != &amp;init_mm &amp;&amp; !ptlock_init(ptdesc))</div><div class='add'>+		return false;</div><div class='add'>+	__pagetable_ctor(ptdesc);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-pte_t *__pte_offset_map(pmd_t *pmd, unsigned long addr, pmd_t *pmdvalp);</div><div class='add'>+pte_t *___pte_offset_map(pmd_t *pmd, unsigned long addr, pmd_t *pmdvalp);</div><div class='add'>+static inline pte_t *__pte_offset_map(pmd_t *pmd, unsigned long addr,</div><div class='add'>+			pmd_t *pmdvalp)</div><div class='add'>+{</div><div class='add'>+	pte_t *pte;</div><div class='add'>+</div><div class='add'>+	__cond_lock(RCU, pte = ___pte_offset_map(pmd, addr, pmdvalp));</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='ctx'> static inline pte_t *pte_offset_map(pmd_t *pmd, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	return __pte_offset_map(pmd, addr, NULL);</div><div class='hunk'>@@ -2955,12 +3358,16 @@ static inline pte_t *pte_offset_map_lock(struct mm_struct *mm, pmd_t *pmd,</div><div class='ctx'> {</div><div class='ctx'> 	pte_t *pte;</div><div class='ctx'> </div><div class='del'>-	__cond_lock(*ptlp, pte = __pte_offset_map_lock(mm, pmd, addr, ptlp));</div><div class='add'>+	__cond_lock(RCU, __cond_lock(*ptlp,</div><div class='add'>+			pte = __pte_offset_map_lock(mm, pmd, addr, ptlp)));</div><div class='ctx'> 	return pte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-pte_t *pte_offset_map_nolock(struct mm_struct *mm, pmd_t *pmd,</div><div class='del'>-			unsigned long addr, spinlock_t **ptlp);</div><div class='add'>+pte_t *pte_offset_map_ro_nolock(struct mm_struct *mm, pmd_t *pmd,</div><div class='add'>+				unsigned long addr, spinlock_t **ptlp);</div><div class='add'>+pte_t *pte_offset_map_rw_nolock(struct mm_struct *mm, pmd_t *pmd,</div><div class='add'>+				unsigned long addr, pmd_t *pmdvalp,</div><div class='add'>+				spinlock_t **ptlp);</div><div class='ctx'> </div><div class='ctx'> #define pte_unmap_unlock(pte, ptl)	do {		\</div><div class='ctx'> 	spin_unlock(ptl);				\</div><div class='hunk'>@@ -2980,7 +3387,7 @@ pte_t *pte_offset_map_nolock(struct mm_struct *mm, pmd_t *pmd,</div><div class='ctx'> 	((unlikely(pmd_none(*(pmd))) &amp;&amp; __pte_alloc_kernel(pmd))? \</div><div class='ctx'> 		NULL: pte_offset_kernel(pmd, address))</div><div class='ctx'> </div><div class='del'>-#if USE_SPLIT_PMD_PTLOCKS</div><div class='add'>+#if defined(CONFIG_SPLIT_PMD_PTLOCKS)</div><div class='ctx'> </div><div class='ctx'> static inline struct page *pmd_pgtable_page(pmd_t *pmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -3006,14 +3413,6 @@ static inline bool pmd_ptlock_init(struct ptdesc *ptdesc)</div><div class='ctx'> 	return ptlock_init(ptdesc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pmd_ptlock_free(struct ptdesc *ptdesc)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='del'>-	VM_BUG_ON_PAGE(ptdesc-&gt;pmd_huge_pte, ptdesc_page(ptdesc));</div><div class='del'>-#endif</div><div class='del'>-	ptlock_free(ptdesc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)-&gt;pmd_huge_pte)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -3024,7 +3423,6 @@ static inline spinlock_t *pmd_lockptr(struct mm_struct *mm, pmd_t *pmd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool pmd_ptlock_init(struct ptdesc *ptdesc) { return true; }</div><div class='del'>-static inline void pmd_ptlock_free(struct ptdesc *ptdesc) {}</div><div class='ctx'> </div><div class='ctx'> #define pmd_huge_pte(mm, pmd) ((mm)-&gt;pmd_huge_pte)</div><div class='ctx'> </div><div class='hunk'>@@ -3037,26 +3435,16 @@ static inline spinlock_t *pmd_lock(struct mm_struct *mm, pmd_t *pmd)</div><div class='ctx'> 	return ptl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool pagetable_pmd_ctor(struct ptdesc *ptdesc)</div><div class='add'>+static inline bool pagetable_pmd_ctor(struct mm_struct *mm,</div><div class='add'>+				      struct ptdesc *ptdesc)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = ptdesc_folio(ptdesc);</div><div class='del'>-</div><div class='del'>-	if (!pmd_ptlock_init(ptdesc))</div><div class='add'>+	if (mm != &amp;init_mm &amp;&amp; !pmd_ptlock_init(ptdesc))</div><div class='ctx'> 		return false;</div><div class='del'>-	__folio_set_pgtable(folio);</div><div class='del'>-	lruvec_stat_add_folio(folio, NR_PAGETABLE);</div><div class='add'>+	ptdesc_pmd_pts_init(ptdesc);</div><div class='add'>+	__pagetable_ctor(ptdesc);</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pagetable_pmd_dtor(struct ptdesc *ptdesc)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = ptdesc_folio(ptdesc);</div><div class='del'>-</div><div class='del'>-	pmd_ptlock_free(ptdesc);</div><div class='del'>-	__folio_clear_pgtable(folio);</div><div class='del'>-	lruvec_stat_sub_folio(folio, NR_PAGETABLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * No scalability reason to split PUD locks yet, but follow the same pattern</div><div class='ctx'>  * as the PMD locks to make it easier if we decide to.  The VM should not be</div><div class='hunk'>@@ -3078,18 +3466,17 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud)</div><div class='ctx'> </div><div class='ctx'> static inline void pagetable_pud_ctor(struct ptdesc *ptdesc)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = ptdesc_folio(ptdesc);</div><div class='del'>-</div><div class='del'>-	__folio_set_pgtable(folio);</div><div class='del'>-	lruvec_stat_add_folio(folio, NR_PAGETABLE);</div><div class='add'>+	__pagetable_ctor(ptdesc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pagetable_pud_dtor(struct ptdesc *ptdesc)</div><div class='add'>+static inline void pagetable_p4d_ctor(struct ptdesc *ptdesc)</div><div class='ctx'> {</div><div class='del'>-	struct folio *folio = ptdesc_folio(ptdesc);</div><div class='add'>+	__pagetable_ctor(ptdesc);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	__folio_clear_pgtable(folio);</div><div class='del'>-	lruvec_stat_sub_folio(folio, NR_PAGETABLE);</div><div class='add'>+static inline void pagetable_pgd_ctor(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	__pagetable_ctor(ptdesc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void __init pagecache_init(void);</div><div class='hunk'>@@ -3110,14 +3497,7 @@ extern void reserve_bootmem_region(phys_addr_t start,</div><div class='ctx'> 				   phys_addr_t end, int nid);</div><div class='ctx'> </div><div class='ctx'> /* Free the reserved page into the buddy system, so it gets managed. */</div><div class='del'>-static inline void free_reserved_page(struct page *page)</div><div class='del'>-{</div><div class='del'>-	ClearPageReserved(page);</div><div class='del'>-	init_page_count(page);</div><div class='del'>-	__free_page(page);</div><div class='del'>-	adjust_managed_page_count(page, 1);</div><div class='del'>-}</div><div class='del'>-#define free_highmem_page(page) free_reserved_page(page)</div><div class='add'>+void free_reserved_page(struct page *page);</div><div class='ctx'> </div><div class='ctx'> static inline void mark_page_reserved(struct page *page)</div><div class='ctx'> {</div><div class='hunk'>@@ -3173,8 +3553,6 @@ static inline unsigned long get_num_physpages(void)</div><div class='ctx'>  */</div><div class='ctx'> void free_area_init(unsigned long *max_zone_pfn);</div><div class='ctx'> unsigned long node_map_pfn_alignment(void);</div><div class='del'>-unsigned long __absent_pages_in_range(int nid, unsigned long start_pfn,</div><div class='del'>-						unsigned long end_pfn);</div><div class='ctx'> extern unsigned long absent_pages_in_range(unsigned long start_pfn,</div><div class='ctx'> 						unsigned long end_pfn);</div><div class='ctx'> extern void get_pfn_range_for_nid(unsigned int nid,</div><div class='hunk'>@@ -3190,7 +3568,6 @@ static inline int early_pfn_to_nid(unsigned long pfn)</div><div class='ctx'> extern int __meminit early_pfn_to_nid(unsigned long pfn);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern void set_dma_reserve(unsigned long new_dma_reserve);</div><div class='ctx'> extern void mem_init(void);</div><div class='ctx'> extern void __init mmap_init(void);</div><div class='ctx'> </div><div class='hunk'>@@ -3202,9 +3579,6 @@ static inline void show_mem(void)</div><div class='ctx'> extern long si_mem_available(void);</div><div class='ctx'> extern void si_meminfo(struct sysinfo * val);</div><div class='ctx'> extern void si_meminfo_node(struct sysinfo *val, int nid);</div><div class='del'>-#ifdef __HAVE_ARCH_RESERVED_KERNEL_PAGES</div><div class='del'>-extern unsigned long arch_reserved_kernel_pages(void);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> extern __printf(3, 4)</div><div class='ctx'> void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...);</div><div class='hunk'>@@ -3223,6 +3597,8 @@ void vma_interval_tree_insert_after(struct vm_area_struct *node,</div><div class='ctx'> 				    struct rb_root_cached *root);</div><div class='ctx'> void vma_interval_tree_remove(struct vm_area_struct *node,</div><div class='ctx'> 			      struct rb_root_cached *root);</div><div class='add'>+struct vm_area_struct *vma_interval_tree_subtree_search(struct vm_area_struct *node,</div><div class='add'>+				unsigned long start, unsigned long last);</div><div class='ctx'> struct vm_area_struct *vma_interval_tree_iter_first(struct rb_root_cached *root,</div><div class='ctx'> 				unsigned long start, unsigned long last);</div><div class='ctx'> struct vm_area_struct *vma_interval_tree_iter_next(struct vm_area_struct *node,</div><div class='hunk'>@@ -3250,79 +3626,11 @@ void anon_vma_interval_tree_verify(struct anon_vma_chain *node);</div><div class='ctx'> 	     avc; avc = anon_vma_interval_tree_iter_next(avc, start, last))</div><div class='ctx'> </div><div class='ctx'> /* mmap.c */</div><div class='del'>-extern int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin);</div><div class='del'>-extern int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,</div><div class='del'>-		      unsigned long start, unsigned long end, pgoff_t pgoff,</div><div class='del'>-		      struct vm_area_struct *next);</div><div class='del'>-extern int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,</div><div class='del'>-		       unsigned long start, unsigned long end, pgoff_t pgoff);</div><div class='del'>-extern struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *);</div><div class='add'>+extern int __vm_enough_memory(const struct mm_struct *mm, long pages, int cap_sys_admin);</div><div class='ctx'> extern int insert_vm_struct(struct mm_struct *, struct vm_area_struct *);</div><div class='del'>-extern void unlink_file_vma(struct vm_area_struct *);</div><div class='del'>-extern struct vm_area_struct *copy_vma(struct vm_area_struct **,</div><div class='del'>-	unsigned long addr, unsigned long len, pgoff_t pgoff,</div><div class='del'>-	bool *need_rmap_locks);</div><div class='ctx'> extern void exit_mmap(struct mm_struct *);</div><div class='del'>-struct vm_area_struct *vma_modify(struct vma_iterator *vmi,</div><div class='del'>-				  struct vm_area_struct *prev,</div><div class='del'>-				  struct vm_area_struct *vma,</div><div class='del'>-				  unsigned long start, unsigned long end,</div><div class='del'>-				  unsigned long vm_flags,</div><div class='del'>-				  struct mempolicy *policy,</div><div class='del'>-				  struct vm_userfaultfd_ctx uffd_ctx,</div><div class='del'>-				  struct anon_vma_name *anon_name);</div><div class='del'>-</div><div class='del'>-/* We are about to modify the VMA's flags. */</div><div class='del'>-static inline struct vm_area_struct</div><div class='del'>-*vma_modify_flags(struct vma_iterator *vmi,</div><div class='del'>-		  struct vm_area_struct *prev,</div><div class='del'>-		  struct vm_area_struct *vma,</div><div class='del'>-		  unsigned long start, unsigned long end,</div><div class='del'>-		  unsigned long new_flags)</div><div class='del'>-{</div><div class='del'>-	return vma_modify(vmi, prev, vma, start, end, new_flags,</div><div class='del'>-			  vma_policy(vma), vma-&gt;vm_userfaultfd_ctx,</div><div class='del'>-			  anon_vma_name(vma));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We are about to modify the VMA's flags and/or anon_name. */</div><div class='del'>-static inline struct vm_area_struct</div><div class='del'>-*vma_modify_flags_name(struct vma_iterator *vmi,</div><div class='del'>-		       struct vm_area_struct *prev,</div><div class='del'>-		       struct vm_area_struct *vma,</div><div class='del'>-		       unsigned long start,</div><div class='del'>-		       unsigned long end,</div><div class='del'>-		       unsigned long new_flags,</div><div class='del'>-		       struct anon_vma_name *new_name)</div><div class='del'>-{</div><div class='del'>-	return vma_modify(vmi, prev, vma, start, end, new_flags,</div><div class='del'>-			  vma_policy(vma), vma-&gt;vm_userfaultfd_ctx, new_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We are about to modify the VMA's memory policy. */</div><div class='del'>-static inline struct vm_area_struct</div><div class='del'>-*vma_modify_policy(struct vma_iterator *vmi,</div><div class='del'>-		   struct vm_area_struct *prev,</div><div class='del'>-		   struct vm_area_struct *vma,</div><div class='del'>-		   unsigned long start, unsigned long end,</div><div class='del'>-		   struct mempolicy *new_pol)</div><div class='del'>-{</div><div class='del'>-	return vma_modify(vmi, prev, vma, start, end, vma-&gt;vm_flags,</div><div class='del'>-			  new_pol, vma-&gt;vm_userfaultfd_ctx, anon_vma_name(vma));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We are about to modify the VMA's flags and/or uffd context. */</div><div class='del'>-static inline struct vm_area_struct</div><div class='del'>-*vma_modify_flags_uffd(struct vma_iterator *vmi,</div><div class='del'>-		       struct vm_area_struct *prev,</div><div class='del'>-		       struct vm_area_struct *vma,</div><div class='del'>-		       unsigned long start, unsigned long end,</div><div class='del'>-		       unsigned long new_flags,</div><div class='del'>-		       struct vm_userfaultfd_ctx new_ctx)</div><div class='del'>-{</div><div class='del'>-	return vma_modify(vmi, prev, vma, start, end, new_flags,</div><div class='del'>-			  vma_policy(vma), new_ctx, anon_vma_name(vma));</div><div class='del'>-}</div><div class='add'>+bool mmap_read_lock_maybe_expand(struct mm_struct *mm, struct vm_area_struct *vma,</div><div class='add'>+				 unsigned long addr, bool write);</div><div class='ctx'> </div><div class='ctx'> static inline int check_data_rlimit(unsigned long rlim,</div><div class='ctx'> 				    unsigned long new,</div><div class='hunk'>@@ -3351,23 +3659,25 @@ extern void vm_stat_account(struct mm_struct *, vm_flags_t, long npages);</div><div class='ctx'> </div><div class='ctx'> extern bool vma_is_special_mapping(const struct vm_area_struct *vma,</div><div class='ctx'> 				   const struct vm_special_mapping *sm);</div><div class='del'>-extern struct vm_area_struct *_install_special_mapping(struct mm_struct *mm,</div><div class='add'>+struct vm_area_struct *_install_special_mapping(struct mm_struct *mm,</div><div class='ctx'> 				   unsigned long addr, unsigned long len,</div><div class='del'>-				   unsigned long flags,</div><div class='add'>+				   vm_flags_t vm_flags,</div><div class='ctx'> 				   const struct vm_special_mapping *spec);</div><div class='del'>-/* This is an obsolete alternative to _install_special_mapping. */</div><div class='del'>-extern int install_special_mapping(struct mm_struct *mm,</div><div class='del'>-				   unsigned long addr, unsigned long len,</div><div class='del'>-				   unsigned long flags, struct page **pages);</div><div class='ctx'> </div><div class='ctx'> unsigned long randomize_stack_top(unsigned long stack_top);</div><div class='ctx'> unsigned long randomize_page(unsigned long start, unsigned long range);</div><div class='ctx'> </div><div class='del'>-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);</div><div class='add'>+unsigned long</div><div class='add'>+__get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,</div><div class='add'>+		    unsigned long pgoff, unsigned long flags, vm_flags_t vm_flags);</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,</div><div class='add'>+		  unsigned long pgoff, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	return __get_unmapped_area(file, addr, len, pgoff, flags, 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-extern unsigned long mmap_region(struct file *file, unsigned long addr,</div><div class='del'>-	unsigned long len, vm_flags_t vm_flags, unsigned long pgoff,</div><div class='del'>-	struct list_head *uf);</div><div class='ctx'> extern unsigned long do_mmap(struct file *file, unsigned long addr,</div><div class='ctx'> 	unsigned long len, unsigned long prot, unsigned long flags,</div><div class='ctx'> 	vm_flags_t vm_flags, unsigned long pgoff, unsigned long *populate,</div><div class='hunk'>@@ -3375,14 +3685,14 @@ extern unsigned long do_mmap(struct file *file, unsigned long addr,</div><div class='ctx'> extern int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm,</div><div class='ctx'> 			 unsigned long start, size_t len, struct list_head *uf,</div><div class='ctx'> 			 bool unlock);</div><div class='add'>+int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,</div><div class='add'>+		    struct mm_struct *mm, unsigned long start,</div><div class='add'>+		    unsigned long end, struct list_head *uf, bool unlock);</div><div class='ctx'> extern int do_munmap(struct mm_struct *, unsigned long, size_t,</div><div class='ctx'> 		     struct list_head *uf);</div><div class='ctx'> extern int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int behavior);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-extern int do_vma_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,</div><div class='del'>-			 unsigned long start, unsigned long end,</div><div class='del'>-			 struct list_head *uf, bool unlock);</div><div class='ctx'> extern int __mm_populate(unsigned long addr, unsigned long len,</div><div class='ctx'> 			 int ignore_errors);</div><div class='ctx'> static inline void mm_populate(unsigned long addr, unsigned long len)</div><div class='hunk'>@@ -3409,15 +3719,16 @@ struct vm_unmapped_area_info {</div><div class='ctx'> 	unsigned long high_limit;</div><div class='ctx'> 	unsigned long align_mask;</div><div class='ctx'> 	unsigned long align_offset;</div><div class='add'>+	unsigned long start_gap;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info);</div><div class='ctx'> </div><div class='ctx'> /* truncate.c */</div><div class='del'>-extern void truncate_inode_pages(struct address_space *, loff_t);</div><div class='del'>-extern void truncate_inode_pages_range(struct address_space *,</div><div class='del'>-				       loff_t lstart, loff_t lend);</div><div class='del'>-extern void truncate_inode_pages_final(struct address_space *);</div><div class='add'>+void truncate_inode_pages(struct address_space *mapping, loff_t lstart);</div><div class='add'>+void truncate_inode_pages_range(struct address_space *mapping, loff_t lstart,</div><div class='add'>+		uoff_t lend);</div><div class='add'>+void truncate_inode_pages_final(struct address_space *mapping);</div><div class='ctx'> </div><div class='ctx'> /* generic vm_area_ops exported for stackable file systems */</div><div class='ctx'> extern vm_fault_t filemap_fault(struct vm_fault *vmf);</div><div class='hunk'>@@ -3430,9 +3741,6 @@ extern unsigned long stack_guard_gap;</div><div class='ctx'> int expand_stack_locked(struct vm_area_struct *vma, unsigned long address);</div><div class='ctx'> struct vm_area_struct *expand_stack(struct mm_struct * mm, unsigned long addr);</div><div class='ctx'> </div><div class='del'>-/* CONFIG_STACK_GROWSUP still needs to grow downwards at some places */</div><div class='del'>-int expand_downwards(struct vm_area_struct *vma, unsigned long address);</div><div class='del'>-</div><div class='ctx'> /* Look up the first VMA which satisfies  addr &lt; vm_end,  NULL if none. */</div><div class='ctx'> extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr);</div><div class='ctx'> extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,</div><div class='hunk'>@@ -3458,7 +3766,7 @@ struct vm_area_struct *vma_lookup(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> 	return mtree_load(&amp;mm-&gt;mm_mt, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long stack_guard_start_gap(struct vm_area_struct *vma)</div><div class='add'>+static inline unsigned long stack_guard_start_gap(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; VM_GROWSDOWN)</div><div class='ctx'> 		return stack_guard_gap;</div><div class='hunk'>@@ -3470,7 +3778,7 @@ static inline unsigned long stack_guard_start_gap(struct vm_area_struct *vma)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long vm_start_gap(struct vm_area_struct *vma)</div><div class='add'>+static inline unsigned long vm_start_gap(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long gap = stack_guard_start_gap(vma);</div><div class='ctx'> 	unsigned long vm_start = vma-&gt;vm_start;</div><div class='hunk'>@@ -3481,7 +3789,7 @@ static inline unsigned long vm_start_gap(struct vm_area_struct *vma)</div><div class='ctx'> 	return vm_start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long vm_end_gap(struct vm_area_struct *vma)</div><div class='add'>+static inline unsigned long vm_end_gap(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long vm_end = vma-&gt;vm_end;</div><div class='ctx'> </div><div class='hunk'>@@ -3493,11 +3801,95 @@ static inline unsigned long vm_end_gap(struct vm_area_struct *vma)</div><div class='ctx'> 	return vm_end;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long vma_pages(struct vm_area_struct *vma)</div><div class='add'>+static inline unsigned long vma_pages(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	return (vma-&gt;vm_end - vma-&gt;vm_start) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long vma_desc_size(const struct vm_area_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return desc-&gt;end - desc-&gt;start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long vma_desc_pages(const struct vm_area_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return vma_desc_size(desc) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mmap_action_remap - helper for mmap_prepare hook to specify that a pure PFN</div><div class='add'>+ * remap is required.</div><div class='add'>+ * @desc: The VMA descriptor for the VMA requiring remap.</div><div class='add'>+ * @start: The virtual address to start the remap from, must be within the VMA.</div><div class='add'>+ * @start_pfn: The first PFN in the range to remap.</div><div class='add'>+ * @size: The size of the range to remap, in bytes, at most spanning to the end</div><div class='add'>+ * of the VMA.</div><div class='add'>+ */</div><div class='add'>+static inline void mmap_action_remap(struct vm_area_desc *desc,</div><div class='add'>+				     unsigned long start,</div><div class='add'>+				     unsigned long start_pfn,</div><div class='add'>+				     unsigned long size)</div><div class='add'>+{</div><div class='add'>+	struct mmap_action *action = &amp;desc-&gt;action;</div><div class='add'>+</div><div class='add'>+	/* [start, start + size) must be within the VMA. */</div><div class='add'>+	WARN_ON_ONCE(start &lt; desc-&gt;start || start &gt;= desc-&gt;end);</div><div class='add'>+	WARN_ON_ONCE(start + size &gt; desc-&gt;end);</div><div class='add'>+</div><div class='add'>+	action-&gt;type = MMAP_REMAP_PFN;</div><div class='add'>+	action-&gt;remap.start = start;</div><div class='add'>+	action-&gt;remap.start_pfn = start_pfn;</div><div class='add'>+	action-&gt;remap.size = size;</div><div class='add'>+	action-&gt;remap.pgprot = desc-&gt;page_prot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mmap_action_remap_full - helper for mmap_prepare hook to specify that the</div><div class='add'>+ * entirety of a VMA should be PFN remapped.</div><div class='add'>+ * @desc: The VMA descriptor for the VMA requiring remap.</div><div class='add'>+ * @start_pfn: The first PFN in the range to remap.</div><div class='add'>+ */</div><div class='add'>+static inline void mmap_action_remap_full(struct vm_area_desc *desc,</div><div class='add'>+					  unsigned long start_pfn)</div><div class='add'>+{</div><div class='add'>+	mmap_action_remap(desc, desc-&gt;start, start_pfn, vma_desc_size(desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mmap_action_ioremap - helper for mmap_prepare hook to specify that a pure PFN</div><div class='add'>+ * I/O remap is required.</div><div class='add'>+ * @desc: The VMA descriptor for the VMA requiring remap.</div><div class='add'>+ * @start: The virtual address to start the remap from, must be within the VMA.</div><div class='add'>+ * @start_pfn: The first PFN in the range to remap.</div><div class='add'>+ * @size: The size of the range to remap, in bytes, at most spanning to the end</div><div class='add'>+ * of the VMA.</div><div class='add'>+ */</div><div class='add'>+static inline void mmap_action_ioremap(struct vm_area_desc *desc,</div><div class='add'>+				       unsigned long start,</div><div class='add'>+				       unsigned long start_pfn,</div><div class='add'>+				       unsigned long size)</div><div class='add'>+{</div><div class='add'>+	mmap_action_remap(desc, start, start_pfn, size);</div><div class='add'>+	desc-&gt;action.type = MMAP_IO_REMAP_PFN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mmap_action_ioremap_full - helper for mmap_prepare hook to specify that the</div><div class='add'>+ * entirety of a VMA should be PFN I/O remapped.</div><div class='add'>+ * @desc: The VMA descriptor for the VMA requiring remap.</div><div class='add'>+ * @start_pfn: The first PFN in the range to remap.</div><div class='add'>+ */</div><div class='add'>+static inline void mmap_action_ioremap_full(struct vm_area_desc *desc,</div><div class='add'>+					  unsigned long start_pfn)</div><div class='add'>+{</div><div class='add'>+	mmap_action_ioremap(desc, desc-&gt;start, start_pfn, vma_desc_size(desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mmap_action_prepare(struct mmap_action *action,</div><div class='add'>+			 struct vm_area_desc *desc);</div><div class='add'>+int mmap_action_complete(struct mmap_action *action,</div><div class='add'>+			 struct vm_area_struct *vma);</div><div class='add'>+</div><div class='ctx'> /* Look up the first VMA which exactly match the interval vm_start ... vm_end */</div><div class='ctx'> static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,</div><div class='ctx'> 				unsigned long vm_start, unsigned long vm_end)</div><div class='hunk'>@@ -3510,17 +3902,17 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,</div><div class='ctx'> 	return vma;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool range_in_vma(struct vm_area_struct *vma,</div><div class='add'>+static inline bool range_in_vma(const struct vm_area_struct *vma,</div><div class='ctx'> 				unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	return (vma &amp;&amp; vma-&gt;vm_start &lt;= start &amp;&amp; end &lt;= vma-&gt;vm_end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-pgprot_t vm_get_page_prot(unsigned long vm_flags);</div><div class='add'>+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);</div><div class='ctx'> void vma_set_page_prot(struct vm_area_struct *vma);</div><div class='ctx'> #else</div><div class='del'>-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)</div><div class='add'>+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)</div><div class='ctx'> {</div><div class='ctx'> 	return __pgprot(0);</div><div class='ctx'> }</div><div class='hunk'>@@ -3539,10 +3931,9 @@ unsigned long change_prot_numa(struct vm_area_struct *vma,</div><div class='ctx'> </div><div class='ctx'> struct vm_area_struct *find_extend_vma_locked(struct mm_struct *,</div><div class='ctx'> 		unsigned long addr);</div><div class='del'>-int remap_pfn_range(struct vm_area_struct *, unsigned long addr,</div><div class='del'>-			unsigned long pfn, unsigned long size, pgprot_t);</div><div class='del'>-int remap_pfn_range_notrack(struct vm_area_struct *vma, unsigned long addr,</div><div class='del'>-		unsigned long pfn, unsigned long size, pgprot_t prot);</div><div class='add'>+int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,</div><div class='add'>+		    unsigned long pfn, unsigned long size, pgprot_t pgprot);</div><div class='add'>+</div><div class='ctx'> int vm_insert_page(struct vm_area_struct *, unsigned long addr, struct page *);</div><div class='ctx'> int vm_insert_pages(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 			struct page **pages, unsigned long *num);</div><div class='hunk'>@@ -3550,14 +3941,16 @@ int vm_map_pages(struct vm_area_struct *vma, struct page **pages,</div><div class='ctx'> 				unsigned long num);</div><div class='ctx'> int vm_map_pages_zero(struct vm_area_struct *vma, struct page **pages,</div><div class='ctx'> 				unsigned long num);</div><div class='add'>+vm_fault_t vmf_insert_page_mkwrite(struct vm_fault *vmf, struct page *page,</div><div class='add'>+			bool write);</div><div class='ctx'> vm_fault_t vmf_insert_pfn(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 			unsigned long pfn);</div><div class='ctx'> vm_fault_t vmf_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 			unsigned long pfn, pgprot_t pgprot);</div><div class='ctx'> vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr,</div><div class='del'>-			pfn_t pfn);</div><div class='add'>+			unsigned long pfn);</div><div class='ctx'> vm_fault_t vmf_insert_mixed_mkwrite(struct vm_area_struct *vma,</div><div class='del'>-		unsigned long addr, pfn_t pfn);</div><div class='add'>+		unsigned long addr, unsigned long pfn);</div><div class='ctx'> int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len);</div><div class='ctx'> </div><div class='ctx'> static inline vm_fault_t vmf_insert_page(struct vm_area_struct *vma,</div><div class='hunk'>@@ -3573,15 +3966,24 @@ static inline vm_fault_t vmf_insert_page(struct vm_area_struct *vma,</div><div class='ctx'> 	return VM_FAULT_NOPAGE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef io_remap_pfn_range</div><div class='del'>-static inline int io_remap_pfn_range(struct vm_area_struct *vma,</div><div class='del'>-				     unsigned long addr, unsigned long pfn,</div><div class='del'>-				     unsigned long size, pgprot_t prot)</div><div class='add'>+#ifndef io_remap_pfn_range_pfn</div><div class='add'>+static inline unsigned long io_remap_pfn_range_pfn(unsigned long pfn,</div><div class='add'>+		unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	return remap_pfn_range(vma, addr, pfn, size, pgprot_decrypted(prot));</div><div class='add'>+	return pfn;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline int io_remap_pfn_range(struct vm_area_struct *vma,</div><div class='add'>+				     unsigned long addr, unsigned long orig_pfn,</div><div class='add'>+				     unsigned long size, pgprot_t orig_prot)</div><div class='add'>+{</div><div class='add'>+	const unsigned long pfn = io_remap_pfn_range_pfn(orig_pfn, size);</div><div class='add'>+	const pgprot_t prot = pgprot_decrypted(orig_prot);</div><div class='add'>+</div><div class='add'>+	return remap_pfn_range(vma, addr, pfn, size, prot);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline vm_fault_t vmf_error(int err)</div><div class='ctx'> {</div><div class='ctx'> 	if (err == -ENOMEM)</div><div class='hunk'>@@ -3609,9 +4011,6 @@ static inline vm_fault_t vmf_fs_error(int err)</div><div class='ctx'> 	return VM_FAULT_SIGBUS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page *follow_page(struct vm_area_struct *vma, unsigned long address,</div><div class='del'>-			 unsigned int foll_flags);</div><div class='del'>-</div><div class='ctx'> static inline int vm_fault_to_errno(vm_fault_t vm_fault, int foll_flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (vm_fault &amp; VM_FAULT_OOM)</div><div class='hunk'>@@ -3627,7 +4026,7 @@ static inline int vm_fault_to_errno(vm_fault_t vm_fault, int foll_flags)</div><div class='ctx'>  * Indicates whether GUP can follow a PROT_NONE mapped page, or whether</div><div class='ctx'>  * a (NUMA hinting) fault is required.</div><div class='ctx'>  */</div><div class='del'>-static inline bool gup_can_follow_protnone(struct vm_area_struct *vma,</div><div class='add'>+static inline bool gup_can_follow_protnone(const struct vm_area_struct *vma,</div><div class='ctx'> 					   unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3757,7 +4156,7 @@ static inline bool debug_guardpage_enabled(void)</div><div class='ctx'> 	return static_branch_unlikely(&amp;_debug_guardpage_enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool page_is_guard(struct page *page)</div><div class='add'>+static inline bool page_is_guard(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	if (!debug_guardpage_enabled())</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -3765,24 +4164,22 @@ static inline bool page_is_guard(struct page *page)</div><div class='ctx'> 	return PageGuard(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool __set_page_guard(struct zone *zone, struct page *page, unsigned int order,</div><div class='del'>-		      int migratetype);</div><div class='add'>+bool __set_page_guard(struct zone *zone, struct page *page, unsigned int order);</div><div class='ctx'> static inline bool set_page_guard(struct zone *zone, struct page *page,</div><div class='del'>-				  unsigned int order, int migratetype)</div><div class='add'>+				  unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	if (!debug_guardpage_enabled())</div><div class='ctx'> 		return false;</div><div class='del'>-	return __set_page_guard(zone, page, order, migratetype);</div><div class='add'>+	return __set_page_guard(zone, page, order);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __clear_page_guard(struct zone *zone, struct page *page, unsigned int order,</div><div class='del'>-			int migratetype);</div><div class='add'>+void __clear_page_guard(struct zone *zone, struct page *page, unsigned int order);</div><div class='ctx'> static inline void clear_page_guard(struct zone *zone, struct page *page,</div><div class='del'>-				    unsigned int order, int migratetype)</div><div class='add'>+				    unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	if (!debug_guardpage_enabled())</div><div class='ctx'> 		return;</div><div class='del'>-	__clear_page_guard(zone, page, order, migratetype);</div><div class='add'>+	__clear_page_guard(zone, page, order);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else	/* CONFIG_DEBUG_PAGEALLOC */</div><div class='hunk'>@@ -3790,11 +4187,11 @@ static inline void debug_pagealloc_map_pages(struct page *page, int numpages) {}</div><div class='ctx'> static inline void debug_pagealloc_unmap_pages(struct page *page, int numpages) {}</div><div class='ctx'> static inline unsigned int debug_guardpage_minorder(void) { return 0; }</div><div class='ctx'> static inline bool debug_guardpage_enabled(void) { return false; }</div><div class='del'>-static inline bool page_is_guard(struct page *page) { return false; }</div><div class='add'>+static inline bool page_is_guard(const struct page *page) { return false; }</div><div class='ctx'> static inline bool set_page_guard(struct zone *zone, struct page *page,</div><div class='del'>-			unsigned int order, int migratetype) { return false; }</div><div class='add'>+			unsigned int order) { return false; }</div><div class='ctx'> static inline void clear_page_guard(struct zone *zone, struct page *page,</div><div class='del'>-				unsigned int order, int migratetype) {}</div><div class='add'>+				unsigned int order) {}</div><div class='ctx'> #endif	/* CONFIG_DEBUG_PAGEALLOC */</div><div class='ctx'> </div><div class='ctx'> #ifdef __HAVE_ARCH_GATE_AREA</div><div class='hunk'>@@ -3813,13 +4210,7 @@ static inline int in_gate_area(struct mm_struct *mm, unsigned long addr)</div><div class='ctx'> }</div><div class='ctx'> #endif	/* __HAVE_ARCH_GATE_AREA */</div><div class='ctx'> </div><div class='del'>-extern bool process_shares_mm(struct task_struct *p, struct mm_struct *mm);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-extern int sysctl_drop_caches;</div><div class='del'>-int drop_caches_sysctl_handler(struct ctl_table *, int, void *, size_t *,</div><div class='del'>-		loff_t *);</div><div class='del'>-#endif</div><div class='add'>+bool process_shares_mm(const struct task_struct *p, const struct mm_struct *mm);</div><div class='ctx'> </div><div class='ctx'> void drop_slab(void);</div><div class='ctx'> </div><div class='hunk'>@@ -3839,17 +4230,17 @@ static inline void print_vma_addr(char *prefix, unsigned long rip)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void *sparse_buffer_alloc(unsigned long size);</div><div class='add'>+unsigned long section_map_size(void);</div><div class='ctx'> struct page * __populate_section_memmap(unsigned long pfn,</div><div class='ctx'> 		unsigned long nr_pages, int nid, struct vmem_altmap *altmap,</div><div class='ctx'> 		struct dev_pagemap *pgmap);</div><div class='del'>-void pmd_init(void *addr);</div><div class='del'>-void pud_init(void *addr);</div><div class='ctx'> pgd_t *vmemmap_pgd_populate(unsigned long addr, int node);</div><div class='ctx'> p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node);</div><div class='ctx'> pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node);</div><div class='ctx'> pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node);</div><div class='ctx'> pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node,</div><div class='del'>-			    struct vmem_altmap *altmap, struct page *reuse);</div><div class='add'>+			    struct vmem_altmap *altmap, unsigned long ptpfn,</div><div class='add'>+			    unsigned long flags);</div><div class='ctx'> void *vmemmap_alloc_block(unsigned long size, int node);</div><div class='ctx'> struct vmem_altmap;</div><div class='ctx'> void *vmemmap_alloc_block_buf(unsigned long size, int node,</div><div class='hunk'>@@ -3865,6 +4256,12 @@ int vmemmap_populate_hugepages(unsigned long start, unsigned long end,</div><div class='ctx'> 			       int node, struct vmem_altmap *altmap);</div><div class='ctx'> int vmemmap_populate(unsigned long start, unsigned long end, int node,</div><div class='ctx'> 		struct vmem_altmap *altmap);</div><div class='add'>+int vmemmap_populate_hvo(unsigned long start, unsigned long end, int node,</div><div class='add'>+			 unsigned long headsize);</div><div class='add'>+int vmemmap_undo_hvo(unsigned long start, unsigned long end, int node,</div><div class='add'>+		     unsigned long headsize);</div><div class='add'>+void vmemmap_wrprotect_hvo(unsigned long start, unsigned long end, int node,</div><div class='add'>+			  unsigned long headsize);</div><div class='ctx'> void vmemmap_populate_print_last(void);</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='ctx'> void vmemmap_free(unsigned long start, unsigned long end,</div><div class='hunk'>@@ -3872,7 +4269,7 @@ void vmemmap_free(unsigned long start, unsigned long end,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPARSEMEM_VMEMMAP</div><div class='del'>-static inline unsigned long vmem_altmap_offset(struct vmem_altmap *altmap)</div><div class='add'>+static inline unsigned long vmem_altmap_offset(const struct vmem_altmap *altmap)</div><div class='ctx'> {</div><div class='ctx'> 	/* number of pfns from base where pfn_to_page() is valid */</div><div class='ctx'> 	if (altmap)</div><div class='hunk'>@@ -3886,7 +4283,7 @@ static inline void vmem_altmap_free(struct vmem_altmap *altmap,</div><div class='ctx'> 	altmap-&gt;alloc -= nr_pfns;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline unsigned long vmem_altmap_offset(struct vmem_altmap *altmap)</div><div class='add'>+static inline unsigned long vmem_altmap_offset(const struct vmem_altmap *altmap)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3931,9 +4328,6 @@ static inline bool vmemmap_can_optimize(struct vmem_altmap *altmap,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void register_page_bootmem_memmap(unsigned long section_nr, struct page *map,</div><div class='del'>-				  unsigned long nr_pages);</div><div class='del'>-</div><div class='ctx'> enum mf_flags {</div><div class='ctx'> 	MF_COUNT_INCREASED = 1 &lt;&lt; 0,</div><div class='ctx'> 	MF_ACTION_REQUIRED = 1 &lt;&lt; 1,</div><div class='hunk'>@@ -3947,9 +4341,7 @@ enum mf_flags {</div><div class='ctx'> int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index,</div><div class='ctx'> 		      unsigned long count, int mf_flags);</div><div class='ctx'> extern int memory_failure(unsigned long pfn, int flags);</div><div class='del'>-extern void memory_failure_queue_kick(int cpu);</div><div class='ctx'> extern int unpoison_memory(unsigned long pfn);</div><div class='del'>-extern void shake_page(struct page *p);</div><div class='ctx'> extern atomic_long_t num_poisoned_pages __read_mostly;</div><div class='ctx'> extern int soft_offline_page(unsigned long pfn, int flags);</div><div class='ctx'> #ifdef CONFIG_MEMORY_FAILURE</div><div class='hunk'>@@ -3962,7 +4354,6 @@ extern int __get_huge_page_for_hwpoison(unsigned long pfn, int flags,</div><div class='ctx'> 					bool *migratable_cleared);</div><div class='ctx'> void num_poisoned_pages_inc(unsigned long pfn);</div><div class='ctx'> void num_poisoned_pages_sub(unsigned long pfn, long i);</div><div class='del'>-struct task_struct *task_early_kill(struct task_struct *tsk, int force_early);</div><div class='ctx'> #else</div><div class='ctx'> static inline void memory_failure_queue(unsigned long pfn, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -3983,12 +4374,6 @@ static inline void num_poisoned_pages_sub(unsigned long pfn, long i)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_MEMORY_FAILURE) &amp;&amp; defined(CONFIG_KSM)</div><div class='del'>-void add_to_kill_ksm(struct task_struct *tsk, struct page *p,</div><div class='del'>-		     struct vm_area_struct *vma, struct list_head *to_kill,</div><div class='del'>-		     unsigned long ksm_addr);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_MEMORY_FAILURE) &amp;&amp; defined(CONFIG_MEMORY_HOTPLUG)</div><div class='ctx'> extern void memblk_nr_poison_inc(unsigned long pfn);</div><div class='ctx'> extern void memblk_nr_poison_sub(unsigned long pfn, long i);</div><div class='hunk'>@@ -4029,10 +4414,10 @@ enum mf_result {</div><div class='ctx'> enum mf_action_page_type {</div><div class='ctx'> 	MF_MSG_KERNEL,</div><div class='ctx'> 	MF_MSG_KERNEL_HIGH_ORDER,</div><div class='del'>-	MF_MSG_SLAB,</div><div class='ctx'> 	MF_MSG_DIFFERENT_COMPOUND,</div><div class='ctx'> 	MF_MSG_HUGE,</div><div class='ctx'> 	MF_MSG_FREE_HUGE,</div><div class='add'>+	MF_MSG_GET_HWPOISON,</div><div class='ctx'> 	MF_MSG_UNMAP_FAILED,</div><div class='ctx'> 	MF_MSG_DIRTY_SWAPCACHE,</div><div class='ctx'> 	MF_MSG_CLEAN_SWAPCACHE,</div><div class='hunk'>@@ -4046,13 +4431,13 @@ enum mf_action_page_type {</div><div class='ctx'> 	MF_MSG_BUDDY,</div><div class='ctx'> 	MF_MSG_DAX,</div><div class='ctx'> 	MF_MSG_UNSPLIT_THP,</div><div class='add'>+	MF_MSG_ALREADY_POISONED,</div><div class='add'>+	MF_MSG_PFN_MAP,</div><div class='ctx'> 	MF_MSG_UNKNOWN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)</div><div class='del'>-extern void clear_huge_page(struct page *page,</div><div class='del'>-			    unsigned long addr_hint,</div><div class='del'>-			    unsigned int pages_per_huge_page);</div><div class='add'>+void folio_zero_user(struct folio *folio, unsigned long addr_hint);</div><div class='ctx'> int copy_user_large_folio(struct folio *dst, struct folio *src,</div><div class='ctx'> 			  unsigned long addr_hint,</div><div class='ctx'> 			  struct vm_area_struct *vma);</div><div class='hunk'>@@ -4103,73 +4488,32 @@ unsigned long wp_shared_mapping_range(struct address_space *mapping,</div><div class='ctx'> 				      pgoff_t first_index, pgoff_t nr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern int sysctl_nr_trim_pages;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PRINTK</div><div class='del'>-void mem_dump_obj(void *object);</div><div class='del'>-#else</div><div class='del'>-static inline void mem_dump_obj(void *object) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * seal_check_write - Check for F_SEAL_WRITE or F_SEAL_FUTURE_WRITE flags and</div><div class='del'>- *                    handle them.</div><div class='del'>- * @seals: the seals to check</div><div class='del'>- * @vma: the vma to operate on</div><div class='del'>- *</div><div class='del'>- * Check whether F_SEAL_WRITE or F_SEAL_FUTURE_WRITE are set; if so, do proper</div><div class='del'>- * check/handling on the vma flags.  Return 0 if check pass, or &lt;0 for errors.</div><div class='del'>- */</div><div class='del'>-static inline int seal_check_write(int seals, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	if (seals &amp; (F_SEAL_WRITE | F_SEAL_FUTURE_WRITE)) {</div><div class='del'>-		/*</div><div class='del'>-		 * New PROT_WRITE and MAP_SHARED mmaps are not allowed when</div><div class='del'>-		 * write seals are active.</div><div class='del'>-		 */</div><div class='del'>-		if ((vma-&gt;vm_flags &amp; VM_SHARED) &amp;&amp; (vma-&gt;vm_flags &amp; VM_WRITE))</div><div class='del'>-			return -EPERM;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Since an F_SEAL_[FUTURE_]WRITE sealed memfd can be mapped as</div><div class='del'>-		 * MAP_SHARED and read-only, take care to not allow mprotect to</div><div class='del'>-		 * revert protections on such mappings. Do this only for shared</div><div class='del'>-		 * mappings. For private mappings, don't need to mask</div><div class='del'>-		 * VM_MAYWRITE as we still want them to be COW-writable.</div><div class='del'>-		 */</div><div class='del'>-		if (vma-&gt;vm_flags &amp; VM_SHARED)</div><div class='del'>-			vm_flags_clear(vma, VM_MAYWRITE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_ANON_VMA_NAME</div><div class='del'>-int madvise_set_anon_name(struct mm_struct *mm, unsigned long start,</div><div class='del'>-			  unsigned long len_in,</div><div class='del'>-			  struct anon_vma_name *anon_name);</div><div class='add'>+int set_anon_vma_name(unsigned long addr, unsigned long size,</div><div class='add'>+		      const char __user *uname);</div><div class='ctx'> #else</div><div class='del'>-static inline int</div><div class='del'>-madvise_set_anon_name(struct mm_struct *mm, unsigned long start,</div><div class='del'>-		      unsigned long len_in, struct anon_vma_name *anon_name) {</div><div class='del'>-	return 0;</div><div class='add'>+static inline</div><div class='add'>+int set_anon_vma_name(unsigned long addr, unsigned long size,</div><div class='add'>+		      const char __user *uname)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_UNACCEPTED_MEMORY</div><div class='ctx'> </div><div class='del'>-bool range_contains_unaccepted_memory(phys_addr_t start, phys_addr_t end);</div><div class='del'>-void accept_memory(phys_addr_t start, phys_addr_t end);</div><div class='add'>+bool range_contains_unaccepted_memory(phys_addr_t start, unsigned long size);</div><div class='add'>+void accept_memory(phys_addr_t start, unsigned long size);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline bool range_contains_unaccepted_memory(phys_addr_t start,</div><div class='del'>-						    phys_addr_t end)</div><div class='add'>+						    unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void accept_memory(phys_addr_t start, phys_addr_t end)</div><div class='add'>+static inline void accept_memory(phys_addr_t start, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4177,9 +4521,125 @@ static inline void accept_memory(phys_addr_t start, phys_addr_t end)</div><div class='ctx'> </div><div class='ctx'> static inline bool pfn_is_unaccepted_memory(unsigned long pfn)</div><div class='ctx'> {</div><div class='del'>-	phys_addr_t paddr = pfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	return range_contains_unaccepted_memory(pfn &lt;&lt; PAGE_SHIFT, PAGE_SIZE);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return range_contains_unaccepted_memory(paddr, paddr + PAGE_SIZE);</div><div class='add'>+void vma_pgtable_walk_begin(struct vm_area_struct *vma);</div><div class='add'>+void vma_pgtable_walk_end(struct vm_area_struct *vma);</div><div class='add'>+</div><div class='add'>+int reserve_mem_find_by_name(const char *name, phys_addr_t *start, phys_addr_t *size);</div><div class='add'>+int reserve_mem_release_by_name(const char *name);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+int do_mseal(unsigned long start, size_t len_in, unsigned long flags);</div><div class='add'>+#else</div><div class='add'>+static inline int do_mseal(unsigned long start, size_t len_in, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	/* noop on 32 bit */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * user_alloc_needs_zeroing checks if a user folio from page allocator needs to</div><div class='add'>+ * be zeroed or not.</div><div class='add'>+ */</div><div class='add'>+static inline bool user_alloc_needs_zeroing(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * for user folios, arch with cache aliasing requires cache flush and</div><div class='add'>+	 * arc changes folio-&gt;flags to make icache coherent with dcache, so</div><div class='add'>+	 * always return false to make caller use</div><div class='add'>+	 * clear_user_page()/clear_user_highpage().</div><div class='add'>+	 */</div><div class='add'>+	return cpu_dcache_is_aliasing() || cpu_icache_is_aliasing() ||</div><div class='add'>+	       !static_branch_maybe(CONFIG_INIT_ON_ALLOC_DEFAULT_ON,</div><div class='add'>+				   &amp;init_on_alloc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int arch_get_shadow_stack_status(struct task_struct *t, unsigned long __user *status);</div><div class='add'>+int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status);</div><div class='add'>+int arch_lock_shadow_stack_status(struct task_struct *t, unsigned long status);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DMA mapping IDs for page_pool</div><div class='add'>+ *</div><div class='add'>+ * When DMA-mapping a page, page_pool allocates an ID (from an xarray) and</div><div class='add'>+ * stashes it in the upper bits of page-&gt;pp_magic. We always want to be able to</div><div class='add'>+ * unambiguously identify page pool pages (using page_pool_page_is_pp()). Non-PP</div><div class='add'>+ * pages can have arbitrary kernel pointers stored in the same field as pp_magic</div><div class='add'>+ * (since it overlaps with page-&gt;lru.next), so we must ensure that we cannot</div><div class='add'>+ * mistake a valid kernel pointer with any of the values we write into this</div><div class='add'>+ * field.</div><div class='add'>+ *</div><div class='add'>+ * On architectures that set POISON_POINTER_DELTA, this is already ensured,</div><div class='add'>+ * since this value becomes part of PP_SIGNATURE; meaning we can just use the</div><div class='add'>+ * space between the PP_SIGNATURE value (without POISON_POINTER_DELTA), and the</div><div class='add'>+ * lowest bits of POISON_POINTER_DELTA. On arches where POISON_POINTER_DELTA is</div><div class='add'>+ * 0, we use the lowest bit of PAGE_OFFSET as the boundary if that value is</div><div class='add'>+ * known at compile-time.</div><div class='add'>+ *</div><div class='add'>+ * If the value of PAGE_OFFSET is not known at compile time, or if it is too</div><div class='add'>+ * small to leave at least 8 bits available above PP_SIGNATURE, we define the</div><div class='add'>+ * number of bits to be 0, which turns off the DMA index tracking altogether</div><div class='add'>+ * (see page_pool_register_dma_index()).</div><div class='add'>+ */</div><div class='add'>+#define PP_DMA_INDEX_SHIFT (1 + __fls(PP_SIGNATURE - POISON_POINTER_DELTA))</div><div class='add'>+#if POISON_POINTER_DELTA &gt; 0</div><div class='add'>+/* PP_SIGNATURE includes POISON_POINTER_DELTA, so limit the size of the DMA</div><div class='add'>+ * index to not overlap with that if set</div><div class='add'>+ */</div><div class='add'>+#define PP_DMA_INDEX_BITS MIN(32, __ffs(POISON_POINTER_DELTA) - PP_DMA_INDEX_SHIFT)</div><div class='add'>+#else</div><div class='add'>+/* Use the lowest bit of PAGE_OFFSET if there's at least 8 bits available; see above */</div><div class='add'>+#define PP_DMA_INDEX_MIN_OFFSET (1 &lt;&lt; (PP_DMA_INDEX_SHIFT + 8))</div><div class='add'>+#define PP_DMA_INDEX_BITS ((__builtin_constant_p(PAGE_OFFSET) &amp;&amp; \</div><div class='add'>+			    PAGE_OFFSET &gt;= PP_DMA_INDEX_MIN_OFFSET &amp;&amp; \</div><div class='add'>+			    !(PAGE_OFFSET &amp; (PP_DMA_INDEX_MIN_OFFSET - 1))) ? \</div><div class='add'>+			      MIN(32, __ffs(PAGE_OFFSET) - PP_DMA_INDEX_SHIFT) : 0)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PP_DMA_INDEX_MASK GENMASK(PP_DMA_INDEX_BITS + PP_DMA_INDEX_SHIFT - 1, \</div><div class='add'>+				  PP_DMA_INDEX_SHIFT)</div><div class='add'>+</div><div class='add'>+/* Mask used for checking in page_pool_page_is_pp() below. page-&gt;pp_magic is</div><div class='add'>+ * OR'ed with PP_SIGNATURE after the allocation in order to preserve bit 0 for</div><div class='add'>+ * the head page of compound page and bit 1 for pfmemalloc page, as well as the</div><div class='add'>+ * bits used for the DMA index. page_is_pfmemalloc() is checked in</div><div class='add'>+ * __page_pool_put_page() to avoid recycling the pfmemalloc page.</div><div class='add'>+ */</div><div class='add'>+#define PP_MAGIC_MASK ~(PP_DMA_INDEX_MASK | 0x3UL)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PAGE_POOL</div><div class='add'>+static inline bool page_pool_page_is_pp(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return (page-&gt;pp_magic &amp; PP_MAGIC_MASK) == PP_SIGNATURE;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool page_pool_page_is_pp(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PAGE_SNAPSHOT_FAITHFUL (1 &lt;&lt; 0)</div><div class='add'>+#define PAGE_SNAPSHOT_PG_BUDDY (1 &lt;&lt; 1)</div><div class='add'>+#define PAGE_SNAPSHOT_PG_IDLE  (1 &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+struct page_snapshot {</div><div class='add'>+	struct folio folio_snapshot;</div><div class='add'>+	struct page page_snapshot;</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+	unsigned long idx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool snapshot_page_is_faithful(const struct page_snapshot *ps)</div><div class='add'>+{</div><div class='add'>+	return ps-&gt;flags &amp; PAGE_SNAPSHOT_FAITHFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snapshot_page(struct page_snapshot *ps, const struct page *page);</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_MM_H */</div><div class='head'>diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h<br/>index f4fe593c1400..fa2d6ba811b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mm_inline.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mm_inline.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mm_inline.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mm_inline.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/userfaultfd_k.h&gt;</div><div class='del'>-#include &lt;linux/swapops.h&gt;</div><div class='add'>+#include &lt;linux/leafops.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * folio_is_file_lru - Should the folio be on a file LRU or anon LRU?</div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'>  * 0 if @folio is a normal anonymous folio, a tmpfs folio or otherwise</div><div class='ctx'>  * ram or swap backed folio.</div><div class='ctx'>  */</div><div class='del'>-static inline int folio_is_file_lru(struct folio *folio)</div><div class='add'>+static inline int folio_is_file_lru(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return !folio_test_swapbacked(folio);</div><div class='ctx'> }</div><div class='hunk'>@@ -44,7 +44,7 @@ static __always_inline void __update_lru_size(struct lruvec *lruvec,</div><div class='ctx'> 	lockdep_assert_held(&amp;lruvec-&gt;lru_lock);</div><div class='ctx'> 	WARN_ON_ONCE(nr_pages != (int)nr_pages);</div><div class='ctx'> </div><div class='del'>-	__mod_lruvec_state(lruvec, NR_LRU_BASE + lru, nr_pages);</div><div class='add'>+	mod_lruvec_state(lruvec, NR_LRU_BASE + lru, nr_pages);</div><div class='ctx'> 	__mod_zone_page_state(&amp;pgdat-&gt;node_zones[zid],</div><div class='ctx'> 				NR_ZONE_LRU_BASE + lru, nr_pages);</div><div class='ctx'> }</div><div class='hunk'>@@ -84,7 +84,7 @@ static __always_inline void __folio_clear_lru_flags(struct folio *folio)</div><div class='ctx'>  * Return: The LRU list a folio should be on, as an index</div><div class='ctx'>  * into the array of LRU lists.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline enum lru_list folio_lru_list(struct folio *folio)</div><div class='add'>+static __always_inline enum lru_list folio_lru_list(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	enum lru_list lru;</div><div class='ctx'> </div><div class='hunk'>@@ -133,36 +133,35 @@ static inline int lru_hist_from_seq(unsigned long seq)</div><div class='ctx'> 	return seq % NR_HIST_GENS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int lru_tier_from_refs(int refs)</div><div class='add'>+static inline int lru_tier_from_refs(int refs, bool workingset)</div><div class='ctx'> {</div><div class='ctx'> 	VM_WARN_ON_ONCE(refs &gt; BIT(LRU_REFS_WIDTH));</div><div class='ctx'> </div><div class='del'>-	/* see the comment in folio_lru_refs() */</div><div class='del'>-	return order_base_2(refs + 1);</div><div class='add'>+	/* see the comment on MAX_NR_TIERS */</div><div class='add'>+	return workingset ? MAX_NR_TIERS - 1 : order_base_2(refs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int folio_lru_refs(struct folio *folio)</div><div class='add'>+static inline int folio_lru_refs(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags = READ_ONCE(folio-&gt;flags);</div><div class='del'>-	bool workingset = flags &amp; BIT(PG_workingset);</div><div class='add'>+	unsigned long flags = READ_ONCE(folio-&gt;flags.f);</div><div class='ctx'> </div><div class='add'>+	if (!(flags &amp; BIT(PG_referenced)))</div><div class='add'>+		return 0;</div><div class='ctx'> 	/*</div><div class='del'>-	 * Return the number of accesses beyond PG_referenced, i.e., N-1 if the</div><div class='del'>-	 * total number of accesses is N&gt;1, since N=0,1 both map to the first</div><div class='del'>-	 * tier. lru_tier_from_refs() will account for this off-by-one. Also see</div><div class='del'>-	 * the comment on MAX_NR_TIERS.</div><div class='add'>+	 * Return the total number of accesses including PG_referenced. Also see</div><div class='add'>+	 * the comment on LRU_REFS_FLAGS.</div><div class='ctx'> 	 */</div><div class='del'>-	return ((flags &amp; LRU_REFS_MASK) &gt;&gt; LRU_REFS_PGOFF) + workingset;</div><div class='add'>+	return ((flags &amp; LRU_REFS_MASK) &gt;&gt; LRU_REFS_PGOFF) + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int folio_lru_gen(struct folio *folio)</div><div class='add'>+static inline int folio_lru_gen(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags = READ_ONCE(folio-&gt;flags);</div><div class='add'>+	unsigned long flags = READ_ONCE(folio-&gt;flags.f);</div><div class='ctx'> </div><div class='ctx'> 	return ((flags &amp; LRU_GEN_MASK) &gt;&gt; LRU_GEN_PGOFF) - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool lru_gen_is_active(struct lruvec *lruvec, int gen)</div><div class='add'>+static inline bool lru_gen_is_active(const struct lruvec *lruvec, int gen)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long max_seq = lruvec-&gt;lrugen.max_seq;</div><div class='ctx'> </div><div class='hunk'>@@ -218,6 +217,40 @@ static inline void lru_gen_update_size(struct lruvec *lruvec, struct folio *foli</div><div class='ctx'> 	VM_WARN_ON_ONCE(lru_gen_is_active(lruvec, old_gen) &amp;&amp; !lru_gen_is_active(lruvec, new_gen));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long lru_gen_folio_seq(const struct lruvec *lruvec,</div><div class='add'>+					      const struct folio *folio,</div><div class='add'>+					      bool reclaiming)</div><div class='add'>+{</div><div class='add'>+	int gen;</div><div class='add'>+	int type = folio_is_file_lru(folio);</div><div class='add'>+	const struct lru_gen_folio *lrugen = &amp;lruvec-&gt;lrugen;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * +-----------------------------------+-----------------------------------+</div><div class='add'>+	 * | Accessed through page tables and  | Accessed through file descriptors |</div><div class='add'>+	 * | promoted by folio_update_gen()    | and protected by folio_inc_gen()  |</div><div class='add'>+	 * +-----------------------------------+-----------------------------------+</div><div class='add'>+	 * | PG_active (set while isolated)    |                                   |</div><div class='add'>+	 * +-----------------+-----------------+-----------------+-----------------+</div><div class='add'>+	 * |  PG_workingset  |  PG_referenced  |  PG_workingset  |  LRU_REFS_FLAGS |</div><div class='add'>+	 * +-----------------------------------+-----------------------------------+</div><div class='add'>+	 * |&lt;---------- MIN_NR_GENS ----------&gt;|                                   |</div><div class='add'>+	 * |&lt;---------------------------- MAX_NR_GENS ----------------------------&gt;|</div><div class='add'>+	 */</div><div class='add'>+	if (folio_test_active(folio))</div><div class='add'>+		gen = MIN_NR_GENS - folio_test_workingset(folio);</div><div class='add'>+	else if (reclaiming)</div><div class='add'>+		gen = MAX_NR_GENS;</div><div class='add'>+	else if ((!folio_is_file_lru(folio) &amp;&amp; !folio_test_swapcache(folio)) ||</div><div class='add'>+		 (folio_test_reclaim(folio) &amp;&amp;</div><div class='add'>+		  (folio_test_dirty(folio) || folio_test_writeback(folio))))</div><div class='add'>+		gen = MIN_NR_GENS;</div><div class='add'>+	else</div><div class='add'>+		gen = MAX_NR_GENS - folio_test_workingset(folio);</div><div class='add'>+</div><div class='add'>+	return max(READ_ONCE(lrugen-&gt;max_seq) - gen + 1, READ_ONCE(lrugen-&gt;min_seq[type]));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool lru_gen_add_folio(struct lruvec *lruvec, struct folio *folio, bool reclaiming)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long seq;</div><div class='hunk'>@@ -231,33 +264,12 @@ static inline bool lru_gen_add_folio(struct lruvec *lruvec, struct folio *folio,</div><div class='ctx'> </div><div class='ctx'> 	if (folio_test_unevictable(folio) || !lrugen-&gt;enabled)</div><div class='ctx'> 		return false;</div><div class='del'>-	/*</div><div class='del'>-	 * There are four common cases for this page:</div><div class='del'>-	 * 1. If it's hot, i.e., freshly faulted in, add it to the youngest</div><div class='del'>-	 *    generation, and it's protected over the rest below.</div><div class='del'>-	 * 2. If it can't be evicted immediately, i.e., a dirty page pending</div><div class='del'>-	 *    writeback, add it to the second youngest generation.</div><div class='del'>-	 * 3. If it should be evicted first, e.g., cold and clean from</div><div class='del'>-	 *    folio_rotate_reclaimable(), add it to the oldest generation.</div><div class='del'>-	 * 4. Everything else falls between 2 &amp; 3 above and is added to the</div><div class='del'>-	 *    second oldest generation if it's considered inactive, or the</div><div class='del'>-	 *    oldest generation otherwise. See lru_gen_is_active().</div><div class='del'>-	 */</div><div class='del'>-	if (folio_test_active(folio))</div><div class='del'>-		seq = lrugen-&gt;max_seq;</div><div class='del'>-	else if ((type == LRU_GEN_ANON &amp;&amp; !folio_test_swapcache(folio)) ||</div><div class='del'>-		 (folio_test_reclaim(folio) &amp;&amp;</div><div class='del'>-		  (folio_test_dirty(folio) || folio_test_writeback(folio))))</div><div class='del'>-		seq = lrugen-&gt;max_seq - 1;</div><div class='del'>-	else if (reclaiming || lrugen-&gt;min_seq[type] + MIN_NR_GENS &gt;= lrugen-&gt;max_seq)</div><div class='del'>-		seq = lrugen-&gt;min_seq[type];</div><div class='del'>-	else</div><div class='del'>-		seq = lrugen-&gt;min_seq[type] + 1;</div><div class='ctx'> </div><div class='add'>+	seq = lru_gen_folio_seq(lruvec, folio, reclaiming);</div><div class='ctx'> 	gen = lru_gen_from_seq(seq);</div><div class='ctx'> 	flags = (gen + 1UL) &lt;&lt; LRU_GEN_PGOFF;</div><div class='ctx'> 	/* see the comment on MIN_NR_GENS about PG_active */</div><div class='del'>-	set_mask_bits(&amp;folio-&gt;flags, LRU_GEN_MASK | BIT(PG_active), flags);</div><div class='add'>+	set_mask_bits(&amp;folio-&gt;flags.f, LRU_GEN_MASK | BIT(PG_active), flags);</div><div class='ctx'> </div><div class='ctx'> 	lru_gen_update_size(lruvec, folio, -1, gen);</div><div class='ctx'> 	/* for folio_rotate_reclaimable() */</div><div class='hunk'>@@ -282,7 +294,7 @@ static inline bool lru_gen_del_folio(struct lruvec *lruvec, struct folio *folio,</div><div class='ctx'> </div><div class='ctx'> 	/* for folio_migrate_flags() */</div><div class='ctx'> 	flags = !reclaiming &amp;&amp; lru_gen_is_active(lruvec, gen) ? BIT(PG_active) : 0;</div><div class='del'>-	flags = set_mask_bits(&amp;folio-&gt;flags, LRU_GEN_MASK, flags);</div><div class='add'>+	flags = set_mask_bits(&amp;folio-&gt;flags.f, LRU_GEN_MASK, flags);</div><div class='ctx'> 	gen = ((flags &amp; LRU_GEN_MASK) &gt;&gt; LRU_GEN_PGOFF) - 1;</div><div class='ctx'> </div><div class='ctx'> 	lru_gen_update_size(lruvec, folio, gen, -1);</div><div class='hunk'>@@ -291,6 +303,12 @@ static inline bool lru_gen_del_folio(struct lruvec *lruvec, struct folio *folio,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void folio_migrate_refs(struct folio *new, const struct folio *old)</div><div class='add'>+{</div><div class='add'>+	unsigned long refs = READ_ONCE(old-&gt;flags.f) &amp; LRU_REFS_MASK;</div><div class='add'>+</div><div class='add'>+	set_mask_bits(&amp;new-&gt;flags.f, LRU_REFS_MASK, refs);</div><div class='add'>+}</div><div class='ctx'> #else /* !CONFIG_LRU_GEN */</div><div class='ctx'> </div><div class='ctx'> static inline bool lru_gen_enabled(void)</div><div class='hunk'>@@ -313,6 +331,10 @@ static inline bool lru_gen_del_folio(struct lruvec *lruvec, struct folio *folio,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void folio_migrate_refs(struct folio *new, const struct folio *old)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_LRU_GEN */</div><div class='ctx'> </div><div class='ctx'> static __always_inline</div><div class='hunk'>@@ -426,6 +448,8 @@ static inline bool anon_vma_name_eq(struct anon_vma_name *anon_name1,</div><div class='ctx'> </div><div class='ctx'> #endif  /* CONFIG_ANON_VMA_NAME */</div><div class='ctx'> </div><div class='add'>+void pfnmap_track_ctx_release(struct kref *ref);</div><div class='add'>+</div><div class='ctx'> static inline void init_tlb_flush_pending(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_set(&amp;mm-&gt;tlb_flush_pending, 0);</div><div class='hunk'>@@ -485,7 +509,7 @@ static inline void dec_tlb_flush_pending(struct mm_struct *mm)</div><div class='ctx'> 	atomic_dec(&amp;mm-&gt;tlb_flush_pending);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool mm_tlb_flush_pending(struct mm_struct *mm)</div><div class='add'>+static inline bool mm_tlb_flush_pending(const struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Must be called after having acquired the PTL; orders against that</div><div class='hunk'>@@ -498,7 +522,7 @@ static inline bool mm_tlb_flush_pending(struct mm_struct *mm)</div><div class='ctx'> 	return atomic_read(&amp;mm-&gt;tlb_flush_pending);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool mm_tlb_flush_nested(struct mm_struct *mm)</div><div class='add'>+static inline bool mm_tlb_flush_nested(const struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Similar to mm_tlb_flush_pending(), we must have acquired the PTL</div><div class='hunk'>@@ -517,11 +541,11 @@ static inline bool mm_tlb_flush_nested(struct mm_struct *mm)</div><div class='ctx'>  * The caller should insert a new pte created with make_pte_marker().</div><div class='ctx'>  */</div><div class='ctx'> static inline pte_marker copy_pte_marker(</div><div class='del'>-		swp_entry_t entry, struct vm_area_struct *dst_vma)</div><div class='add'>+		softleaf_t entry, struct vm_area_struct *dst_vma)</div><div class='ctx'> {</div><div class='del'>-	pte_marker srcm = pte_marker_get(entry);</div><div class='add'>+	const pte_marker srcm = softleaf_to_marker(entry);</div><div class='ctx'> 	/* Always copy error entries. */</div><div class='del'>-	pte_marker dstm = srcm &amp; PTE_MARKER_POISONED;</div><div class='add'>+	pte_marker dstm = srcm &amp; (PTE_MARKER_POISONED | PTE_MARKER_GUARD);</div><div class='ctx'> </div><div class='ctx'> 	/* Only copy PTE markers if UFFD register matches. */</div><div class='ctx'> 	if ((srcm &amp; PTE_MARKER_UFFD_WP) &amp;&amp; userfaultfd_wp(dst_vma))</div><div class='hunk'>@@ -529,7 +553,6 @@ static inline pte_marker copy_pte_marker(</div><div class='ctx'> </div><div class='ctx'> 	return dstm;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If this pte is wr-protected by uffd-wp in any form, arm the special pte to</div><div class='hunk'>@@ -541,15 +564,17 @@ static inline pte_marker copy_pte_marker(</div><div class='ctx'>  * Must be called with pgtable lock held so that no thread will see the none</div><div class='ctx'>  * pte, and if they see it, they'll fault and serialize at the pgtable lock.</div><div class='ctx'>  *</div><div class='del'>- * This function is a no-op if PTE_MARKER_UFFD_WP is not enabled.</div><div class='add'>+ * Returns true if an uffd-wp pte was installed, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-static inline void</div><div class='add'>+static inline bool</div><div class='ctx'> pte_install_uffd_wp_if_needed(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 			      pte_t *pte, pte_t pteval)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PTE_MARKER_UFFD_WP</div><div class='ctx'> 	bool arm_uffd_pte = false;</div><div class='ctx'> </div><div class='add'>+	if (!uffd_supports_wp_marker())</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	/* The current status of the pte should be "cleared" before calling */</div><div class='ctx'> 	WARN_ON_ONCE(!pte_none(ptep_get(pte)));</div><div class='ctx'> </div><div class='hunk'>@@ -560,7 +585,7 @@ pte_install_uffd_wp_if_needed(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 	 * with a swap pte.  There's no way of leaking the bit.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vma_is_anonymous(vma) || !userfaultfd_wp(vma))</div><div class='del'>-		return;</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	/* A uffd-wp wr-protected normal pte */</div><div class='ctx'> 	if (unlikely(pte_present(pteval) &amp;&amp; pte_uffd_wp(pteval)))</div><div class='hunk'>@@ -573,13 +598,16 @@ pte_install_uffd_wp_if_needed(struct vm_area_struct *vma, unsigned long addr,</div><div class='ctx'> 	if (unlikely(pte_swp_uffd_wp_any(pteval)))</div><div class='ctx'> 		arm_uffd_pte = true;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(arm_uffd_pte))</div><div class='add'>+	if (unlikely(arm_uffd_pte)) {</div><div class='ctx'> 		set_pte_at(vma-&gt;vm_mm, addr, pte,</div><div class='ctx'> 			   make_pte_marker(PTE_MARKER_UFFD_WP));</div><div class='del'>-#endif</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool vma_has_recency(struct vm_area_struct *vma)</div><div class='add'>+static inline bool vma_has_recency(const struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; (VM_SEQ_READ | VM_RAND_READ))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -589,5 +617,42 @@ static inline bool vma_has_recency(struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * num_pages_contiguous() - determine the number of contiguous pages</div><div class='add'>+ *			    that represent contiguous PFNs</div><div class='add'>+ * @pages: an array of page pointers</div><div class='add'>+ * @nr_pages: length of the array, at least 1</div><div class='add'>+ *</div><div class='add'>+ * Determine the number of contiguous pages that represent contiguous PFNs</div><div class='add'>+ * in @pages, starting from the first page.</div><div class='add'>+ *</div><div class='add'>+ * In some kernel configs contiguous PFNs will not have contiguous struct</div><div class='add'>+ * pages. In these configurations num_pages_contiguous() will return a num</div><div class='add'>+ * smaller than ideal number. The caller should continue to check for pfn</div><div class='add'>+ * contiguity after each call to num_pages_contiguous().</div><div class='add'>+ *</div><div class='add'>+ * Returns the number of contiguous pages.</div><div class='add'>+ */</div><div class='add'>+static inline size_t num_pages_contiguous(struct page **pages, size_t nr_pages)</div><div class='add'>+{</div><div class='add'>+	struct page *cur_page = pages[0];</div><div class='add'>+	unsigned long section = memdesc_section(cur_page-&gt;flags);</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; nr_pages; i++) {</div><div class='add'>+		if (++cur_page != pages[i])</div><div class='add'>+			break;</div><div class='add'>+		/*</div><div class='add'>+		 * In unproblematic kernel configs, page_to_section() == 0 and</div><div class='add'>+		 * the whole check will get optimized out.</div><div class='add'>+		 */</div><div class='add'>+		if (memdesc_section(cur_page-&gt;flags) != section)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h<br/>index 8b611e13153e..9f6de068295d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mm_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mm_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mm_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mm_types.h</a></div><div class='hunk'>@@ -19,6 +19,9 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/seqlock.h&gt;</div><div class='ctx'> #include &lt;linux/percpu_counter.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/rseq_types.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -27,11 +30,15 @@</div><div class='ctx'> #endif</div><div class='ctx'> #define AT_VECTOR_SIZE (2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))</div><div class='ctx'> </div><div class='del'>-#define INIT_PASID	0</div><div class='ctx'> </div><div class='ctx'> struct address_space;</div><div class='add'>+struct futex_private_hash;</div><div class='ctx'> struct mem_cgroup;</div><div class='ctx'> </div><div class='add'>+typedef struct {</div><div class='add'>+	unsigned long f;</div><div class='add'>+} memdesc_flags_t;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Each physical page in the system has a struct page associated with</div><div class='ctx'>  * it to keep track of whatever it is we are using the page for at the</div><div class='hunk'>@@ -46,9 +53,7 @@ struct mem_cgroup;</div><div class='ctx'>  * which is guaranteed to be aligned.  If you use the same storage as</div><div class='ctx'>  * page-&gt;mapping, you must restore it to NULL before freeing the page.</div><div class='ctx'>  *</div><div class='del'>- * If your page will not be mapped to userspace, you can also use the four</div><div class='del'>- * bytes in the mapcount union, but you must call page_mapcount_reset()</div><div class='del'>- * before freeing it.</div><div class='add'>+ * The mapcount field must not be used for own purposes.</div><div class='ctx'>  *</div><div class='ctx'>  * If you want to use the refcount field, it must be used in such a way</div><div class='ctx'>  * that other CPUs temporarily incrementing and then decrementing the</div><div class='hunk'>@@ -72,7 +77,7 @@ struct mem_cgroup;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct page {</div><div class='del'>-	unsigned long flags;		/* Atomic flags, some possibly</div><div class='add'>+	memdesc_flags_t flags;		/* Atomic flags, some possibly</div><div class='ctx'> 					 * updated asynchronously */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Five words (20/40 bytes) are available in this union.</div><div class='hunk'>@@ -90,29 +95,22 @@ struct page {</div><div class='ctx'> 			union {</div><div class='ctx'> 				struct list_head lru;</div><div class='ctx'> </div><div class='del'>-				/* Or, for the Unevictable "LRU list" slot */</div><div class='del'>-				struct {</div><div class='del'>-					/* Always even, to negate PageTail */</div><div class='del'>-					void *__filler;</div><div class='del'>-					/* Count page's or folio's mlocks */</div><div class='del'>-					unsigned int mlock_count;</div><div class='del'>-				};</div><div class='del'>-</div><div class='ctx'> 				/* Or, free page */</div><div class='ctx'> 				struct list_head buddy_list;</div><div class='ctx'> 				struct list_head pcp_list;</div><div class='add'>+				struct llist_node pcp_llist;</div><div class='ctx'> 			};</div><div class='del'>-			/* See page-flags.h for PAGE_MAPPING_FLAGS */</div><div class='ctx'> 			struct address_space *mapping;</div><div class='ctx'> 			union {</div><div class='del'>-				pgoff_t index;		/* Our offset within mapping. */</div><div class='add'>+				pgoff_t __folio_index;		/* Our offset within mapping. */</div><div class='ctx'> 				unsigned long share;	/* share count for fsdax */</div><div class='ctx'> 			};</div><div class='ctx'> 			/**</div><div class='ctx'> 			 * @private: Mapping-private opaque data.</div><div class='ctx'> 			 * Usually used for buffer_heads if PagePrivate.</div><div class='del'>-			 * Used for swp_entry_t if PageSwapCache.</div><div class='del'>-			 * Indicates order in the buddy system if PageBuddy.</div><div class='add'>+			 * Used for swp_entry_t if swapcache flag set.</div><div class='add'>+			 * Indicates order in the buddy system if PageBuddy</div><div class='add'>+			 * or on pcp_llist.</div><div class='ctx'> 			 */</div><div class='ctx'> 			unsigned long private;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -131,8 +129,11 @@ struct page {</div><div class='ctx'> 			unsigned long compound_head;	/* Bit zero is set */</div><div class='ctx'> 		};</div><div class='ctx'> 		struct {	/* ZONE_DEVICE pages */</div><div class='del'>-			/** @pgmap: Points to the hosting device page map. */</div><div class='del'>-			struct dev_pagemap *pgmap;</div><div class='add'>+			/*</div><div class='add'>+			 * The first word is used for compound_head or folio</div><div class='add'>+			 * pgmap</div><div class='add'>+			 */</div><div class='add'>+			void *_unused_pgmap_compound_head;</div><div class='ctx'> 			void *zone_device_data;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * ZONE_DEVICE private pages are counted as being</div><div class='hunk'>@@ -152,18 +153,31 @@ struct page {</div><div class='ctx'> </div><div class='ctx'> 	union {		/* This union is 4 bytes in size. */</div><div class='ctx'> 		/*</div><div class='del'>-		 * If the page can be mapped to userspace, encodes the number</div><div class='del'>-		 * of times this page is referenced by a page table.</div><div class='add'>+		 * For head pages of typed folios, the value stored here</div><div class='add'>+		 * allows for determining what this page is used for. The</div><div class='add'>+		 * tail pages of typed folios will not store a type</div><div class='add'>+		 * (page_type == _mapcount == -1).</div><div class='add'>+		 *</div><div class='add'>+		 * See page-flags.h for a list of page types which are currently</div><div class='add'>+		 * stored here.</div><div class='add'>+		 *</div><div class='add'>+		 * Owners of typed folios may reuse the lower 16 bit of the</div><div class='add'>+		 * head page page_type field after setting the page type,</div><div class='add'>+		 * but must reset these 16 bit to -1 before clearing the</div><div class='add'>+		 * page type.</div><div class='ctx'> 		 */</div><div class='del'>-		atomic_t _mapcount;</div><div class='add'>+		unsigned int page_type;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * If the page is neither PageSlab nor mappable to userspace,</div><div class='del'>-		 * the value stored here may help determine what this page</div><div class='del'>-		 * is used for.  See page-flags.h for a list of page types</div><div class='del'>-		 * which are currently stored here.</div><div class='add'>+		 * For pages that are part of non-typed folios for which mappings</div><div class='add'>+		 * are tracked via the RMAP, encodes the number of times this page</div><div class='add'>+		 * is directly referenced by a page table.</div><div class='add'>+		 *</div><div class='add'>+		 * Note that the mapcount is always initialized to -1, so that</div><div class='add'>+		 * transitions both from it and to it can be tracked, using</div><div class='add'>+		 * atomic_inc_and_test() and atomic_add_negative(-1).</div><div class='ctx'> 		 */</div><div class='del'>-		unsigned int page_type;</div><div class='add'>+		atomic_t _mapcount;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/* Usage count. *DO NOT USE DIRECTLY*. See page_ref.h */</div><div class='hunk'>@@ -171,6 +185,8 @@ struct page {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMCG</div><div class='ctx'> 	unsigned long memcg_data;</div><div class='add'>+#elif defined(CONFIG_SLAB_OBJ_EXT)</div><div class='add'>+	unsigned long _unused_slab_obj_exts;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -210,8 +226,8 @@ struct page {</div><div class='ctx'>  *</div><div class='ctx'>  * An 'encoded_page' pointer is a pointer to a regular 'struct page', but</div><div class='ctx'>  * with the low bits of the pointer indicating extra context-dependent</div><div class='del'>- * information. Not super-common, but happens in mmu_gather and mlock</div><div class='del'>- * handling, and this acts as a type system check on that use.</div><div class='add'>+ * information. Only used in mmu_gather handling, and this acts as a type</div><div class='add'>+ * system check on that use.</div><div class='ctx'>  *</div><div class='ctx'>  * We only really have two guaranteed bits in general, although you could</div><div class='ctx'>  * play with 'struct page' alignment (see CONFIG_HAVE_ALIGNED_STRUCT_PAGE)</div><div class='hunk'>@@ -220,21 +236,46 @@ struct page {</div><div class='ctx'>  * Use the supplied helper functions to endcode/decode the pointer and bits.</div><div class='ctx'>  */</div><div class='ctx'> struct encoded_page;</div><div class='del'>-#define ENCODE_PAGE_BITS 3ul</div><div class='add'>+</div><div class='add'>+#define ENCODED_PAGE_BITS			3ul</div><div class='add'>+</div><div class='add'>+/* Perform rmap removal after we have flushed the TLB. */</div><div class='add'>+#define ENCODED_PAGE_BIT_DELAY_RMAP		1ul</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The next item in an encoded_page array is the "nr_pages" argument, specifying</div><div class='add'>+ * the number of consecutive pages starting from this page, that all belong to</div><div class='add'>+ * the same folio. For example, "nr_pages" corresponds to the number of folio</div><div class='add'>+ * references that must be dropped. If this bit is not set, "nr_pages" is</div><div class='add'>+ * implicitly 1.</div><div class='add'>+ */</div><div class='add'>+#define ENCODED_PAGE_BIT_NR_PAGES_NEXT		2ul</div><div class='add'>+</div><div class='ctx'> static __always_inline struct encoded_page *encode_page(struct page *page, unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	BUILD_BUG_ON(flags &gt; ENCODE_PAGE_BITS);</div><div class='add'>+	BUILD_BUG_ON(flags &gt; ENCODED_PAGE_BITS);</div><div class='ctx'> 	return (struct encoded_page *)(flags | (unsigned long)page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long encoded_page_flags(struct encoded_page *page)</div><div class='ctx'> {</div><div class='del'>-	return ENCODE_PAGE_BITS &amp; (unsigned long)page;</div><div class='add'>+	return ENCODED_PAGE_BITS &amp; (unsigned long)page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct page *encoded_page_ptr(struct encoded_page *page)</div><div class='ctx'> {</div><div class='del'>-	return (struct page *)(~ENCODE_PAGE_BITS &amp; (unsigned long)page);</div><div class='add'>+	return (struct page *)(~ENCODED_PAGE_BITS &amp; (unsigned long)page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline struct encoded_page *encode_nr_pages(unsigned long nr)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE((nr &lt;&lt; 2) &gt;&gt; 2 != nr);</div><div class='add'>+	return (struct encoded_page *)(nr &lt;&lt; 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline unsigned long encoded_nr_pages(struct encoded_page *page)</div><div class='add'>+{</div><div class='add'>+	return ((unsigned long)page) &gt;&gt; 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -246,6 +287,74 @@ typedef struct {</div><div class='ctx'> } swp_entry_t;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * typedef softleaf_t - Describes a page table software leaf entry, abstracted</div><div class='add'>+ * from its architecture-specific encoding.</div><div class='add'>+ *</div><div class='add'>+ * Page table leaf entries are those which do not reference any descendent page</div><div class='add'>+ * tables but rather either reference a data page, are an empty (or 'none'</div><div class='add'>+ * entry), or contain a non-present entry.</div><div class='add'>+ *</div><div class='add'>+ * If referencing another page table or a data page then the page table entry is</div><div class='add'>+ * pertinent to hardware - that is it tells the hardware how to decode the page</div><div class='add'>+ * table entry.</div><div class='add'>+ *</div><div class='add'>+ * Otherwise it is a software-defined leaf page table entry, which this type</div><div class='add'>+ * describes. See leafops.h and specifically @softleaf_type for a list of all</div><div class='add'>+ * possible kinds of software leaf entry.</div><div class='add'>+ *</div><div class='add'>+ * A softleaf_t entry is abstracted from the hardware page table entry, so is</div><div class='add'>+ * not architecture-specific.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: While we transition from the confusing swp_entry_t type used for this</div><div class='add'>+ *       purpose, we simply alias this type. This will be removed once the</div><div class='add'>+ *       transition is complete.</div><div class='add'>+ */</div><div class='add'>+typedef swp_entry_t softleaf_t;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MEMCG) || defined(CONFIG_SLAB_OBJ_EXT)</div><div class='add'>+/* We have some extra room after the refcount in tail pages. */</div><div class='add'>+#define NR_PAGES_IN_LARGE_FOLIO</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On 32bit, we can cut the required metadata in half, because:</div><div class='add'>+ * (a) PID_MAX_LIMIT implicitly limits the number of MMs we could ever have,</div><div class='add'>+ *     so we can limit MM IDs to 15 bit (32767).</div><div class='add'>+ * (b) We don't expect folios where even a single complete PTE mapping by</div><div class='add'>+ *     one MM would exceed 15 bits (order-15).</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+typedef int mm_id_mapcount_t;</div><div class='add'>+#define MM_ID_MAPCOUNT_MAX		INT_MAX</div><div class='add'>+typedef unsigned int mm_id_t;</div><div class='add'>+#else /* !CONFIG_64BIT */</div><div class='add'>+typedef short mm_id_mapcount_t;</div><div class='add'>+#define MM_ID_MAPCOUNT_MAX		SHRT_MAX</div><div class='add'>+typedef unsigned short mm_id_t;</div><div class='add'>+#endif /* CONFIG_64BIT */</div><div class='add'>+</div><div class='add'>+/* We implicitly use the dummy ID for init-mm etc. where we never rmap pages. */</div><div class='add'>+#define MM_ID_DUMMY			0</div><div class='add'>+#define MM_ID_MIN			(MM_ID_DUMMY + 1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We leave the highest bit of each MM id unused, so we can store a flag</div><div class='add'>+ * in the highest bit of each folio-&gt;_mm_id[].</div><div class='add'>+ */</div><div class='add'>+#define MM_ID_BITS			((sizeof(mm_id_t) * BITS_PER_BYTE) - 1)</div><div class='add'>+#define MM_ID_MASK			((1U &lt;&lt; MM_ID_BITS) - 1)</div><div class='add'>+#define MM_ID_MAX			MM_ID_MASK</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In order to use bit_spin_lock(), which requires an unsigned long, we</div><div class='add'>+ * operate on folio-&gt;_mm_ids when working on flags.</div><div class='add'>+ */</div><div class='add'>+#define FOLIO_MM_IDS_LOCK_BITNUM	MM_ID_BITS</div><div class='add'>+#define FOLIO_MM_IDS_LOCK_BIT		BIT(FOLIO_MM_IDS_LOCK_BITNUM)</div><div class='add'>+#define FOLIO_MM_IDS_SHARED_BITNUM	(2 * MM_ID_BITS + 1)</div><div class='add'>+#define FOLIO_MM_IDS_SHARED_BIT		BIT(FOLIO_MM_IDS_SHARED_BITNUM)</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct folio - Represents a contiguous set of bytes.</div><div class='ctx'>  * @flags: Identical to the page flags.</div><div class='ctx'>  * @lru: Least Recently Used list; tracks how recently this folio was used.</div><div class='hunk'>@@ -254,6 +363,8 @@ typedef struct {</div><div class='ctx'>  *    anonymous memory.</div><div class='ctx'>  * @index: Offset within the file, in units of pages.  For anonymous memory,</div><div class='ctx'>  *    this is the index from the beginning of the mmap.</div><div class='add'>+ * @share: number of DAX mappings that reference this folio. See</div><div class='add'>+ *    dax_associate_entry.</div><div class='ctx'>  * @private: Filesystem per-folio data (see folio_attach_private()).</div><div class='ctx'>  * @swap: Used for swp_entry_t if folio_test_swapcache().</div><div class='ctx'>  * @_mapcount: Do not access this member directly.  Use folio_mapcount() to</div><div class='hunk'>@@ -261,17 +372,23 @@ typedef struct {</div><div class='ctx'>  * @_refcount: Do not access this member directly.  Use folio_ref_count()</div><div class='ctx'>  *    to find how many references there are to this folio.</div><div class='ctx'>  * @memcg_data: Memory Control Group data.</div><div class='add'>+ * @pgmap: Metadata for ZONE_DEVICE mappings</div><div class='ctx'>  * @virtual: Virtual address in the kernel direct map.</div><div class='ctx'>  * @_last_cpupid: IDs of last CPU and last process that accessed the folio.</div><div class='ctx'>  * @_entire_mapcount: Do not use directly, call folio_entire_mapcount().</div><div class='del'>- * @_nr_pages_mapped: Do not use directly, call folio_mapcount().</div><div class='add'>+ * @_large_mapcount: Do not use directly, call folio_mapcount().</div><div class='add'>+ * @_nr_pages_mapped: Do not use outside of rmap and debug code.</div><div class='ctx'>  * @_pincount: Do not use directly, call folio_maybe_dma_pinned().</div><div class='del'>- * @_folio_nr_pages: Do not use directly, call folio_nr_pages().</div><div class='add'>+ * @_nr_pages: Do not use directly, call folio_nr_pages().</div><div class='add'>+ * @_mm_id: Do not use outside of rmap code.</div><div class='add'>+ * @_mm_ids: Do not use outside of rmap code.</div><div class='add'>+ * @_mm_id_mapcount: Do not use outside of rmap code.</div><div class='ctx'>  * @_hugetlb_subpool: Do not use directly, use accessor in hugetlb.h.</div><div class='ctx'>  * @_hugetlb_cgroup: Do not use directly, use accessor in hugetlb_cgroup.h.</div><div class='ctx'>  * @_hugetlb_cgroup_rsvd: Do not use directly, use accessor in hugetlb_cgroup.h.</div><div class='ctx'>  * @_hugetlb_hwpoison: Do not use directly, call raw_hwp_list_head().</div><div class='ctx'>  * @_deferred_list: Folios to be split under memory pressure.</div><div class='add'>+ * @_unused_slab_obj_exts: Placeholder to match obj_exts in struct slab.</div><div class='ctx'>  *</div><div class='ctx'>  * A folio is a physically, virtually and logically contiguous set</div><div class='ctx'>  * of bytes.  It is a power-of-two in size, and it is aligned to that</div><div class='hunk'>@@ -286,20 +403,26 @@ struct folio {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 	/* public: */</div><div class='del'>-			unsigned long flags;</div><div class='add'>+			memdesc_flags_t flags;</div><div class='ctx'> 			union {</div><div class='ctx'> 				struct list_head lru;</div><div class='ctx'> 	/* private: avoid cluttering the output */</div><div class='add'>+				/* For the Unevictable "LRU list" slot */</div><div class='ctx'> 				struct {</div><div class='add'>+					/* Avoid compound_head */</div><div class='ctx'> 					void *__filler;</div><div class='ctx'> 	/* public: */</div><div class='ctx'> 					unsigned int mlock_count;</div><div class='ctx'> 	/* private: */</div><div class='ctx'> 				};</div><div class='ctx'> 	/* public: */</div><div class='add'>+				struct dev_pagemap *pgmap;</div><div class='ctx'> 			};</div><div class='ctx'> 			struct address_space *mapping;</div><div class='del'>-			pgoff_t index;</div><div class='add'>+			union {</div><div class='add'>+				pgoff_t index;</div><div class='add'>+				unsigned long share;</div><div class='add'>+			};</div><div class='ctx'> 			union {</div><div class='ctx'> 				void *private;</div><div class='ctx'> 				swp_entry_t swap;</div><div class='hunk'>@@ -308,6 +431,8 @@ struct folio {</div><div class='ctx'> 			atomic_t _refcount;</div><div class='ctx'> #ifdef CONFIG_MEMCG</div><div class='ctx'> 			unsigned long memcg_data;</div><div class='add'>+#elif defined(CONFIG_SLAB_OBJ_EXT)</div><div class='add'>+			unsigned long _unused_slab_obj_exts;</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(WANT_PAGE_VIRTUAL)</div><div class='ctx'> 			void *virtual;</div><div class='hunk'>@@ -323,14 +448,30 @@ struct folio {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			unsigned long _flags_1;</div><div class='ctx'> 			unsigned long _head_1;</div><div class='del'>-			unsigned long _folio_avail;</div><div class='add'>+			union {</div><div class='add'>+				struct {</div><div class='ctx'> 	/* public: */</div><div class='del'>-			atomic_t _entire_mapcount;</div><div class='del'>-			atomic_t _nr_pages_mapped;</div><div class='del'>-			atomic_t _pincount;</div><div class='add'>+					atomic_t _large_mapcount;</div><div class='add'>+					atomic_t _nr_pages_mapped;</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-			unsigned int _folio_nr_pages;</div><div class='del'>-#endif</div><div class='add'>+					atomic_t _entire_mapcount;</div><div class='add'>+					atomic_t _pincount;</div><div class='add'>+#endif /* CONFIG_64BIT */</div><div class='add'>+					mm_id_mapcount_t _mm_id_mapcount[2];</div><div class='add'>+					union {</div><div class='add'>+						mm_id_t _mm_id[2];</div><div class='add'>+						unsigned long _mm_ids;</div><div class='add'>+					};</div><div class='add'>+	/* private: the union with struct page is transitional */</div><div class='add'>+				};</div><div class='add'>+				unsigned long _usable_1[4];</div><div class='add'>+			};</div><div class='add'>+			atomic_t _mapcount_1;</div><div class='add'>+			atomic_t _refcount_1;</div><div class='add'>+	/* public: */</div><div class='add'>+#ifdef NR_PAGES_IN_LARGE_FOLIO</div><div class='add'>+			unsigned int _nr_pages;</div><div class='add'>+#endif /* NR_PAGES_IN_LARGE_FOLIO */</div><div class='ctx'> 	/* private: the union with struct page is transitional */</div><div class='ctx'> 		};</div><div class='ctx'> 		struct page __page_1;</div><div class='hunk'>@@ -340,20 +481,27 @@ struct folio {</div><div class='ctx'> 			unsigned long _flags_2;</div><div class='ctx'> 			unsigned long _head_2;</div><div class='ctx'> 	/* public: */</div><div class='del'>-			void *_hugetlb_subpool;</div><div class='del'>-			void *_hugetlb_cgroup;</div><div class='del'>-			void *_hugetlb_cgroup_rsvd;</div><div class='del'>-			void *_hugetlb_hwpoison;</div><div class='add'>+			struct list_head _deferred_list;</div><div class='add'>+#ifndef CONFIG_64BIT</div><div class='add'>+			atomic_t _entire_mapcount;</div><div class='add'>+			atomic_t _pincount;</div><div class='add'>+#endif /* !CONFIG_64BIT */</div><div class='ctx'> 	/* private: the union with struct page is transitional */</div><div class='ctx'> 		};</div><div class='add'>+		struct page __page_2;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='ctx'> 		struct {</div><div class='del'>-			unsigned long _flags_2a;</div><div class='del'>-			unsigned long _head_2a;</div><div class='add'>+			unsigned long _flags_3;</div><div class='add'>+			unsigned long _head_3;</div><div class='ctx'> 	/* public: */</div><div class='del'>-			struct list_head _deferred_list;</div><div class='add'>+			void *_hugetlb_subpool;</div><div class='add'>+			void *_hugetlb_cgroup;</div><div class='add'>+			void *_hugetlb_cgroup_rsvd;</div><div class='add'>+			void *_hugetlb_hwpoison;</div><div class='ctx'> 	/* private: the union with struct page is transitional */</div><div class='ctx'> 		};</div><div class='del'>-		struct page __page_2;</div><div class='add'>+		struct page __page_3;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -363,7 +511,7 @@ FOLIO_MATCH(flags, flags);</div><div class='ctx'> FOLIO_MATCH(lru, lru);</div><div class='ctx'> FOLIO_MATCH(mapping, mapping);</div><div class='ctx'> FOLIO_MATCH(compound_head, lru);</div><div class='del'>-FOLIO_MATCH(index, index);</div><div class='add'>+FOLIO_MATCH(__folio_index, index);</div><div class='ctx'> FOLIO_MATCH(private, private);</div><div class='ctx'> FOLIO_MATCH(_mapcount, _mapcount);</div><div class='ctx'> FOLIO_MATCH(_refcount, _refcount);</div><div class='hunk'>@@ -382,26 +530,36 @@ FOLIO_MATCH(_last_cpupid, _last_cpupid);</div><div class='ctx'> 			offsetof(struct page, pg) + sizeof(struct page))</div><div class='ctx'> FOLIO_MATCH(flags, _flags_1);</div><div class='ctx'> FOLIO_MATCH(compound_head, _head_1);</div><div class='add'>+FOLIO_MATCH(_mapcount, _mapcount_1);</div><div class='add'>+FOLIO_MATCH(_refcount, _refcount_1);</div><div class='ctx'> #undef FOLIO_MATCH</div><div class='ctx'> #define FOLIO_MATCH(pg, fl)						\</div><div class='ctx'> 	static_assert(offsetof(struct folio, fl) ==			\</div><div class='ctx'> 			offsetof(struct page, pg) + 2 * sizeof(struct page))</div><div class='ctx'> FOLIO_MATCH(flags, _flags_2);</div><div class='ctx'> FOLIO_MATCH(compound_head, _head_2);</div><div class='del'>-FOLIO_MATCH(flags, _flags_2a);</div><div class='del'>-FOLIO_MATCH(compound_head, _head_2a);</div><div class='add'>+#undef FOLIO_MATCH</div><div class='add'>+#define FOLIO_MATCH(pg, fl)						\</div><div class='add'>+	static_assert(offsetof(struct folio, fl) ==			\</div><div class='add'>+			offsetof(struct page, pg) + 3 * sizeof(struct page))</div><div class='add'>+FOLIO_MATCH(flags, _flags_3);</div><div class='add'>+FOLIO_MATCH(compound_head, _head_3);</div><div class='ctx'> #undef FOLIO_MATCH</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct ptdesc -    Memory descriptor for page tables.</div><div class='del'>- * @__page_flags:     Same as page flags. Unused for page tables.</div><div class='add'>+ * @pt_flags: enum pt_flags plus zone/node/section.</div><div class='ctx'>  * @pt_rcu_head:      For freeing page table pages.</div><div class='del'>- * @pt_list:          List of used page tables. Used for s390 and x86.</div><div class='add'>+ * @pt_list:          List of used page tables. Used for s390 gmap shadow pages</div><div class='add'>+ *                    (which are not linked into the user page tables) and x86</div><div class='add'>+ *                    pgds.</div><div class='ctx'>  * @_pt_pad_1:        Padding that aliases with page's compound head.</div><div class='ctx'>  * @pmd_huge_pte:     Protected by ptdesc-&gt;ptl, used for THPs.</div><div class='ctx'>  * @__page_mapping:   Aliases with page-&gt;mapping. Unused for page tables.</div><div class='add'>+ * @pt_index:         Used for s390 gmap.</div><div class='ctx'>  * @pt_mm:            Used for x86 pgds.</div><div class='ctx'>  * @pt_frag_refcount: For fragmented page table tracking. Powerpc only.</div><div class='add'>+ * @pt_share_count:   Used for HugeTLB PMD page table share count.</div><div class='ctx'>  * @_pt_pad_2:        Padding to ensure proper alignment.</div><div class='ctx'>  * @ptl:              Lock for the page table.</div><div class='ctx'>  * @__page_type:      Same as page-&gt;page_type. Unused for page tables.</div><div class='hunk'>@@ -412,7 +570,7 @@ FOLIO_MATCH(compound_head, _head_2a);</div><div class='ctx'>  * understanding of the issues.</div><div class='ctx'>  */</div><div class='ctx'> struct ptdesc {</div><div class='del'>-	unsigned long __page_flags;</div><div class='add'>+	memdesc_flags_t pt_flags;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct rcu_head pt_rcu_head;</div><div class='hunk'>@@ -425,8 +583,12 @@ struct ptdesc {</div><div class='ctx'> 	unsigned long __page_mapping;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='add'>+		pgoff_t pt_index;</div><div class='ctx'> 		struct mm_struct *pt_mm;</div><div class='ctx'> 		atomic_t pt_frag_refcount;</div><div class='add'>+#ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING</div><div class='add'>+		atomic_t pt_share_count;</div><div class='add'>+#endif</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='hunk'>@@ -446,10 +608,11 @@ struct ptdesc {</div><div class='ctx'> </div><div class='ctx'> #define TABLE_MATCH(pg, pt)						\</div><div class='ctx'> 	static_assert(offsetof(struct page, pg) == offsetof(struct ptdesc, pt))</div><div class='del'>-TABLE_MATCH(flags, __page_flags);</div><div class='add'>+TABLE_MATCH(flags, pt_flags);</div><div class='ctx'> TABLE_MATCH(compound_head, pt_list);</div><div class='ctx'> TABLE_MATCH(compound_head, _pt_pad_1);</div><div class='ctx'> TABLE_MATCH(mapping, __page_mapping);</div><div class='add'>+TABLE_MATCH(__folio_index, pt_index);</div><div class='ctx'> TABLE_MATCH(rcu_head, pt_rcu_head);</div><div class='ctx'> TABLE_MATCH(page_type, __page_type);</div><div class='ctx'> TABLE_MATCH(_refcount, __page_refcount);</div><div class='hunk'>@@ -471,14 +634,42 @@ static_assert(sizeof(struct ptdesc) &lt;= sizeof(struct page));</div><div class='ctx'> 	const struct page *:		(const struct ptdesc *)(p),	\</div><div class='ctx'> 	struct page *:			(struct ptdesc *)(p)))</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING</div><div class='add'>+static inline void ptdesc_pmd_pts_init(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	atomic_set(&amp;ptdesc-&gt;pt_share_count, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ptdesc_pmd_pts_inc(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;ptdesc-&gt;pt_share_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ptdesc_pmd_pts_dec(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	atomic_dec(&amp;ptdesc-&gt;pt_share_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ptdesc_pmd_pts_count(const struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;ptdesc-&gt;pt_share_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ptdesc_pmd_is_shared(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+	return !!ptdesc_pmd_pts_count(ptdesc);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void ptdesc_pmd_pts_init(struct ptdesc *ptdesc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Used for sizing the vmemmap region on some architectures</div><div class='ctx'>  */</div><div class='ctx'> #define STRUCT_PAGE_MAX_SHIFT	(order_base_2(sizeof(struct page)))</div><div class='ctx'> </div><div class='del'>-#define PAGE_FRAG_CACHE_MAX_SIZE	__ALIGN_MASK(32768, ~PAGE_MASK)</div><div class='del'>-#define PAGE_FRAG_CACHE_MAX_ORDER	get_order(PAGE_FRAG_CACHE_MAX_SIZE)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * page_private can be used on tail pages.  However, PagePrivate is only</div><div class='ctx'>  * checked by the VM on the head page.  So page_private on the tail pages</div><div class='hunk'>@@ -492,29 +683,20 @@ static inline void set_page_private(struct page *page, unsigned long private)</div><div class='ctx'> 	page-&gt;private = private;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *folio_get_private(struct folio *folio)</div><div class='add'>+static inline void *folio_get_private(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return folio-&gt;private;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct page_frag_cache {</div><div class='del'>-	void * va;</div><div class='del'>-#if (PAGE_SIZE &lt; PAGE_FRAG_CACHE_MAX_SIZE)</div><div class='del'>-	__u16 offset;</div><div class='del'>-	__u16 size;</div><div class='del'>-#else</div><div class='del'>-	__u32 offset;</div><div class='del'>-#endif</div><div class='del'>-	/* we maintain a pagecount bias, so that we dont dirty cache line</div><div class='del'>-	 * containing page-&gt;_refcount every time we allocate a fragment.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int		pagecnt_bias;</div><div class='del'>-	bool pfmemalloc;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> typedef unsigned long vm_flags_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * freeptr_t represents a SLUB freelist pointer, which might be encoded</div><div class='add'>+ * and not dereferenceable if CONFIG_SLAB_FREELIST_HARDENED is enabled.</div><div class='add'>+ */</div><div class='add'>+typedef struct { unsigned long v; } freeptr_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * A region containing a mapping of a non-memory backed file under NOMMU</div><div class='ctx'>  * conditions.  These are held in a global tree and are pinned by the VMAs that</div><div class='ctx'>  * map parts of them.</div><div class='hunk'>@@ -570,9 +752,8 @@ static inline struct anon_vma_name *anon_vma_name_alloc(const char *name)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct vma_lock {</div><div class='del'>-	struct rw_semaphore lock;</div><div class='del'>-};</div><div class='add'>+#define VMA_LOCK_OFFSET	0x40000000</div><div class='add'>+#define VMA_REF_LIMIT	(VMA_LOCK_OFFSET - 1)</div><div class='ctx'> </div><div class='ctx'> struct vma_numab_state {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -610,11 +791,115 @@ struct vma_numab_state {</div><div class='ctx'> 	int prev_scan_seq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef __HAVE_PFNMAP_TRACKING</div><div class='add'>+struct pfnmap_track_ctx {</div><div class='add'>+	struct kref kref;</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+	unsigned long size;	/* in bytes */</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* What action should be taken after an .mmap_prepare call is complete? */</div><div class='add'>+enum mmap_action_type {</div><div class='add'>+	MMAP_NOTHING,		/* Mapping is complete, no further action. */</div><div class='add'>+	MMAP_REMAP_PFN,		/* Remap PFN range. */</div><div class='add'>+	MMAP_IO_REMAP_PFN,	/* I/O remap PFN range. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Describes an action an mmap_prepare hook can instruct to be taken to complete</div><div class='add'>+ * the mapping of a VMA. Specified in vm_area_desc.</div><div class='add'>+ */</div><div class='add'>+struct mmap_action {</div><div class='add'>+	union {</div><div class='add'>+		/* Remap range. */</div><div class='add'>+		struct {</div><div class='add'>+			unsigned long start;</div><div class='add'>+			unsigned long start_pfn;</div><div class='add'>+			unsigned long size;</div><div class='add'>+			pgprot_t pgprot;</div><div class='add'>+		} remap;</div><div class='add'>+	};</div><div class='add'>+	enum mmap_action_type type;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If specified, this hook is invoked after the selected action has been</div><div class='add'>+	 * successfully completed. Note that the VMA write lock still held.</div><div class='add'>+	 *</div><div class='add'>+	 * The absolute minimum ought to be done here.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns 0 on success, or an error code.</div><div class='add'>+	 */</div><div class='add'>+	int (*success_hook)(const struct vm_area_struct *vma);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If specified, this hook is invoked when an error occurred when</div><div class='add'>+	 * attempting the selection action.</div><div class='add'>+	 *</div><div class='add'>+	 * The hook can return an error code in order to filter the error, but</div><div class='add'>+	 * it is not valid to clear the error here.</div><div class='add'>+	 */</div><div class='add'>+	int (*error_hook)(int err);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This should be set in rare instances where the operation required</div><div class='add'>+	 * that the rmap should not be able to access the VMA until</div><div class='add'>+	 * completely set up.</div><div class='add'>+	 */</div><div class='add'>+	bool hide_from_rmap_until_complete :1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Opaque type representing current VMA (vm_area_struct) flag state. Must be</div><div class='add'>+ * accessed via vma_flags_xxx() helper functions.</div><div class='add'>+ */</div><div class='add'>+#define NUM_VMA_FLAG_BITS BITS_PER_LONG</div><div class='add'>+typedef struct {</div><div class='add'>+	DECLARE_BITMAP(__vma_flags, NUM_VMA_FLAG_BITS);</div><div class='add'>+} __private vma_flags_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Describes a VMA that is about to be mmap()'ed. Drivers may choose to</div><div class='add'>+ * manipulate mutable fields which will cause those fields to be updated in the</div><div class='add'>+ * resultant VMA.</div><div class='add'>+ *</div><div class='add'>+ * Helper functions are not required for manipulating any field.</div><div class='add'>+ */</div><div class='add'>+struct vm_area_desc {</div><div class='add'>+	/* Immutable state. */</div><div class='add'>+	const struct mm_struct *const mm;</div><div class='add'>+	struct file *const file; /* May vary from vm_file in stacked callers. */</div><div class='add'>+	unsigned long start;</div><div class='add'>+	unsigned long end;</div><div class='add'>+</div><div class='add'>+	/* Mutable fields. Populated with initial state. */</div><div class='add'>+	pgoff_t pgoff;</div><div class='add'>+	struct file *vm_file;</div><div class='add'>+	union {</div><div class='add'>+		vm_flags_t vm_flags;</div><div class='add'>+		vma_flags_t vma_flags;</div><div class='add'>+	};</div><div class='add'>+	pgprot_t page_prot;</div><div class='add'>+</div><div class='add'>+	/* Write-only fields. */</div><div class='add'>+	const struct vm_operations_struct *vm_ops;</div><div class='add'>+	void *private_data;</div><div class='add'>+</div><div class='add'>+	/* Take further action? */</div><div class='add'>+	struct mmap_action action;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This struct describes a virtual memory area. There is one of these</div><div class='ctx'>  * per VM-area/task. A VM area is any part of the process virtual memory</div><div class='ctx'>  * space that has a special rule for the page-fault handlers (ie a shared</div><div class='ctx'>  * library, the executable area etc).</div><div class='add'>+ *</div><div class='add'>+ * Only explicitly marked struct members may be accessed by RCU readers before</div><div class='add'>+ * getting a stable reference.</div><div class='add'>+ *</div><div class='add'>+ * WARNING: when adding new members, please update vm_area_init_from() to copy</div><div class='add'>+ * them during vm_area_struct content duplication.</div><div class='ctx'>  */</div><div class='ctx'> struct vm_area_struct {</div><div class='ctx'> 	/* The first cache line has the info for VMA tree walking. */</div><div class='hunk'>@@ -625,31 +910,35 @@ struct vm_area_struct {</div><div class='ctx'> 			unsigned long vm_start;</div><div class='ctx'> 			unsigned long vm_end;</div><div class='ctx'> 		};</div><div class='del'>-#ifdef CONFIG_PER_VMA_LOCK</div><div class='del'>-		struct rcu_head vm_rcu;	/* Used for deferred freeing. */</div><div class='del'>-#endif</div><div class='add'>+		freeptr_t vm_freeptr; /* Pointer used by SLAB_TYPESAFE_BY_RCU */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	struct mm_struct *vm_mm;	/* The address space we belong to. */</div><div class='add'>+	/*</div><div class='add'>+	 * The address space we belong to.</div><div class='add'>+	 * Unstable RCU readers are allowed to read this.</div><div class='add'>+	 */</div><div class='add'>+	struct mm_struct *vm_mm;</div><div class='ctx'> 	pgprot_t vm_page_prot;          /* Access permissions of this VMA. */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Flags, see mm.h.</div><div class='ctx'> 	 * To modify use vm_flags_{init|reset|set|clear|mod} functions.</div><div class='add'>+	 * Preferably, use vma_flags_xxx() functions.</div><div class='ctx'> 	 */</div><div class='ctx'> 	union {</div><div class='add'>+		/* Temporary while VMA flags are being converted. */</div><div class='ctx'> 		const vm_flags_t vm_flags;</div><div class='del'>-		vm_flags_t __private __vm_flags;</div><div class='add'>+		vma_flags_t flags;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PER_VMA_LOCK</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Can only be written (using WRITE_ONCE()) while holding both:</div><div class='ctx'> 	 *  - mmap_lock (in write mode)</div><div class='del'>-	 *  - vm_lock-&gt;lock (in write mode)</div><div class='add'>+	 *  - vm_refcnt bit at VMA_LOCK_OFFSET is set</div><div class='ctx'> 	 * Can be read reliably while holding one of:</div><div class='ctx'> 	 *  - mmap_lock (in read or write mode)</div><div class='del'>-	 *  - vm_lock-&gt;lock (in read or write mode)</div><div class='add'>+	 *  - vm_refcnt bit at VMA_LOCK_OFFSET is set or vm_refcnt &gt; 1</div><div class='ctx'> 	 * Can be read unreliably (using READ_ONCE()) for pessimistic bailout</div><div class='ctx'> 	 * while holding nothing (except RCU to keep the VMA struct allocated).</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -657,23 +946,8 @@ struct vm_area_struct {</div><div class='ctx'> 	 * counter reuse can only lead to occasional unnecessary use of the</div><div class='ctx'> 	 * slowpath.</div><div class='ctx'> 	 */</div><div class='del'>-	int vm_lock_seq;</div><div class='del'>-	struct vma_lock *vm_lock;</div><div class='del'>-</div><div class='del'>-	/* Flag to indicate areas detached from the mm-&gt;mm_mt tree */</div><div class='del'>-	bool detached;</div><div class='add'>+	unsigned int vm_lock_seq;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * For areas with an address space and backing store,</div><div class='del'>-	 * linkage into the address_space-&gt;i_mmap interval tree.</div><div class='del'>-	 *</div><div class='del'>-	 */</div><div class='del'>-	struct {</div><div class='del'>-		struct rb_node rb;</div><div class='del'>-		unsigned long rb_subtree_last;</div><div class='del'>-	} shared;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * A file's MAP_PRIVATE vma can be in both i_mmap tree and anon_vma</div><div class='ctx'> 	 * list, after a COW of one of the file pages.	A MAP_SHARED vma</div><div class='hunk'>@@ -693,14 +967,6 @@ struct vm_area_struct {</div><div class='ctx'> 	struct file * vm_file;		/* File we map to (can be NULL). */</div><div class='ctx'> 	void * vm_private_data;		/* was vm_pte (shared mem) */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ANON_VMA_NAME</div><div class='del'>-	/*</div><div class='del'>-	 * For private and shared anonymous mappings, a pointer to a null</div><div class='del'>-	 * terminated string containing the name given to the vma, or NULL if</div><div class='del'>-	 * unnamed. Serialized by mmap_lock. Use anon_vma_name to access.</div><div class='del'>-	 */</div><div class='del'>-	struct anon_vma_name *anon_name;</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_SWAP</div><div class='ctx'> 	atomic_long_t swap_readahead_info;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -713,21 +979,96 @@ struct vm_area_struct {</div><div class='ctx'> #ifdef CONFIG_NUMA_BALANCING</div><div class='ctx'> 	struct vma_numab_state *numab_state;	/* NUMA Balancing state */</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_PER_VMA_LOCK</div><div class='add'>+	/* Unstable RCU readers are allowed to read this. */</div><div class='add'>+	refcount_t vm_refcnt ____cacheline_aligned_in_smp;</div><div class='add'>+#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+	struct lockdep_map vmlock_dep_map;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * For areas with an address space and backing store,</div><div class='add'>+	 * linkage into the address_space-&gt;i_mmap interval tree.</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+	struct {</div><div class='add'>+		struct rb_node rb;</div><div class='add'>+		unsigned long rb_subtree_last;</div><div class='add'>+	} shared;</div><div class='add'>+#ifdef CONFIG_ANON_VMA_NAME</div><div class='add'>+	/*</div><div class='add'>+	 * For private and shared anonymous mappings, a pointer to a null</div><div class='add'>+	 * terminated string containing the name given to the vma, or NULL if</div><div class='add'>+	 * unnamed. Serialized by mmap_lock. Use anon_vma_name to access.</div><div class='add'>+	 */</div><div class='add'>+	struct anon_vma_name *anon_name;</div><div class='add'>+#endif</div><div class='ctx'> 	struct vm_userfaultfd_ctx vm_userfaultfd_ctx;</div><div class='add'>+#ifdef __HAVE_PFNMAP_TRACKING</div><div class='add'>+	struct pfnmap_track_ctx *pfnmap_track_ctx;</div><div class='add'>+#endif</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='add'>+/* Clears all bits in the VMA flags bitmap, non-atomically. */</div><div class='add'>+static inline void vma_flags_clear_all(vma_flags_t *flags)</div><div class='add'>+{</div><div class='add'>+	bitmap_zero(ACCESS_PRIVATE(flags, __vma_flags), NUM_VMA_FLAG_BITS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy value to the first system word of VMA flags, non-atomically.</div><div class='add'>+ *</div><div class='add'>+ * IMPORTANT: This does not overwrite bytes past the first system word. The</div><div class='add'>+ * caller must account for this.</div><div class='add'>+ */</div><div class='add'>+static inline void vma_flags_overwrite_word(vma_flags_t *flags, unsigned long value)</div><div class='add'>+{</div><div class='add'>+	*ACCESS_PRIVATE(flags, __vma_flags) = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy value to the first system word of VMA flags ONCE, non-atomically.</div><div class='add'>+ *</div><div class='add'>+ * IMPORTANT: This does not overwrite bytes past the first system word. The</div><div class='add'>+ * caller must account for this.</div><div class='add'>+ */</div><div class='add'>+static inline void vma_flags_overwrite_word_once(vma_flags_t *flags, unsigned long value)</div><div class='add'>+{</div><div class='add'>+	unsigned long *bitmap = ACCESS_PRIVATE(flags, __vma_flags);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(*bitmap, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update the first system word of VMA flags setting bits, non-atomically. */</div><div class='add'>+static inline void vma_flags_set_word(vma_flags_t *flags, unsigned long value)</div><div class='add'>+{</div><div class='add'>+	unsigned long *bitmap = ACCESS_PRIVATE(flags, __vma_flags);</div><div class='add'>+</div><div class='add'>+	*bitmap |= value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update the first system word of VMA flags clearing bits, non-atomically. */</div><div class='add'>+static inline void vma_flags_clear_word(vma_flags_t *flags, unsigned long value)</div><div class='add'>+{</div><div class='add'>+	unsigned long *bitmap = ACCESS_PRIVATE(flags, __vma_flags);</div><div class='add'>+</div><div class='add'>+	*bitmap &amp;= ~value;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> #define vma_policy(vma) ((vma)-&gt;vm_policy)</div><div class='ctx'> #else</div><div class='ctx'> #define vma_policy(vma) NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_MM_CID</div><div class='del'>-struct mm_cid {</div><div class='del'>-	u64 time;</div><div class='del'>-	int cid;</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='add'>+/*</div><div class='add'>+ * Opaque type representing current mm_struct flag state. Must be accessed via</div><div class='add'>+ * mm_flags_xxx() helper functions.</div><div class='add'>+ */</div><div class='add'>+#define NUM_MM_FLAG_BITS (64)</div><div class='add'>+typedef struct {</div><div class='add'>+	DECLARE_BITMAP(__mm_flags, NUM_MM_FLAG_BITS);</div><div class='add'>+} __private mm_flags_t;</div><div class='ctx'> </div><div class='ctx'> struct kioctx_table;</div><div class='ctx'> struct iommu_mm_data;</div><div class='hunk'>@@ -749,11 +1090,7 @@ struct mm_struct {</div><div class='ctx'> 		} ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> 		struct maple_tree mm_mt;</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-		unsigned long (*get_unmapped_area) (struct file *filp,</div><div class='del'>-				unsigned long addr, unsigned long len,</div><div class='del'>-				unsigned long pgoff, unsigned long flags);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 		unsigned long mmap_base;	/* base of mmap area */</div><div class='ctx'> 		unsigned long mmap_legacy_base;	/* base of mmap area in bottom-up allocations */</div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES</div><div class='hunk'>@@ -785,22 +1122,9 @@ struct mm_struct {</div><div class='ctx'> 		 */</div><div class='ctx'> 		atomic_t mm_users;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_MM_CID</div><div class='del'>-		/**</div><div class='del'>-		 * @pcpu_cid: Per-cpu current cid.</div><div class='del'>-		 *</div><div class='del'>-		 * Keep track of the currently allocated mm_cid for each cpu.</div><div class='del'>-		 * The per-cpu mm_cid values are serialized by their respective</div><div class='del'>-		 * runqueue locks.</div><div class='del'>-		 */</div><div class='del'>-		struct mm_cid __percpu *pcpu_cid;</div><div class='del'>-		/*</div><div class='del'>-		 * @mm_cid_next_scan: Next mm_cid scan (in jiffies).</div><div class='del'>-		 *</div><div class='del'>-		 * When the next mm_cid scan is due (in jiffies).</div><div class='del'>-		 */</div><div class='del'>-		unsigned long mm_cid_next_scan;</div><div class='del'>-#endif</div><div class='add'>+		/* MM CID related storage */</div><div class='add'>+		struct mm_mm_cid mm_cid;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 		atomic_long_t pgtables_bytes;	/* size of all page tables */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -810,10 +1134,10 @@ struct mm_struct {</div><div class='ctx'> 					     * counters</div><div class='ctx'> 					     */</div><div class='ctx'> 		/*</div><div class='del'>-		 * With some kernel config, the current mmap_lock's offset</div><div class='del'>-		 * inside 'mm_struct' is at 0x120, which is very optimal, as</div><div class='add'>+		 * Typically the current mmap_lock's offset is 56 bytes from</div><div class='add'>+		 * the last cacheline boundary, which is very optimal, as</div><div class='ctx'> 		 * its two hot fields 'count' and 'owner' sit in 2 different</div><div class='del'>-		 * cachelines,  and when mmap_lock is highly contended, both</div><div class='add'>+		 * cachelines, and when mmap_lock is highly contended, both</div><div class='ctx'> 		 * of the 2 fields will be accessed frequently, current layout</div><div class='ctx'> 		 * will help to reduce cache bouncing.</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -829,12 +1153,16 @@ struct mm_struct {</div><div class='ctx'> 					  * by mmlist_lock</div><div class='ctx'> 					  */</div><div class='ctx'> #ifdef CONFIG_PER_VMA_LOCK</div><div class='add'>+		struct rcuwait vma_writer_wait;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This field has lock-like semantics, meaning it is sometimes</div><div class='ctx'> 		 * accessed with ACQUIRE/RELEASE semantics.</div><div class='ctx'> 		 * Roughly speaking, incrementing the sequence number is</div><div class='ctx'> 		 * equivalent to releasing locks on VMAs; reading the sequence</div><div class='ctx'> 		 * number can be part of taking a read lock on a VMA.</div><div class='add'>+		 * Incremented every time mmap_lock is write-locked/unlocked.</div><div class='add'>+		 * Initialized to 0, therefore odd values indicate mmap_lock</div><div class='add'>+		 * is write-locked and even values that it's released.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Can be modified under write mmap_lock using RELEASE</div><div class='ctx'> 		 * semantics.</div><div class='hunk'>@@ -843,9 +1171,18 @@ struct mm_struct {</div><div class='ctx'> 		 * Can be read with ACQUIRE semantics if not holding write</div><div class='ctx'> 		 * mmap_lock.</div><div class='ctx'> 		 */</div><div class='del'>-		int mm_lock_seq;</div><div class='add'>+		seqcount_t mm_lock_seq;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_FUTEX_PRIVATE_HASH</div><div class='add'>+		struct mutex			futex_hash_lock;</div><div class='add'>+		struct futex_private_hash	__rcu *futex_phash;</div><div class='add'>+		struct futex_private_hash	*futex_phash_new;</div><div class='add'>+		/* futex-ref */</div><div class='add'>+		unsigned long			futex_batches;</div><div class='add'>+		struct rcu_head			futex_rcu;</div><div class='add'>+		atomic_long_t			futex_atomic;</div><div class='add'>+		unsigned int			__percpu *futex_ref;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> 		unsigned long hiwater_rss; /* High-watermark of RSS usage */</div><div class='ctx'> 		unsigned long hiwater_vm;  /* High-water virtual memory usage */</div><div class='hunk'>@@ -856,7 +1193,7 @@ struct mm_struct {</div><div class='ctx'> 		unsigned long data_vm;	   /* VM_WRITE &amp; ~VM_SHARED &amp; ~VM_STACK */</div><div class='ctx'> 		unsigned long exec_vm;	   /* VM_EXEC &amp; ~VM_WRITE &amp; ~VM_STACK */</div><div class='ctx'> 		unsigned long stack_vm;	   /* VM_STACK */</div><div class='del'>-		unsigned long def_flags;</div><div class='add'>+		vm_flags_t def_flags;</div><div class='ctx'> </div><div class='ctx'> 		/**</div><div class='ctx'> 		 * @write_protect_seq: Locked when any thread is write</div><div class='hunk'>@@ -873,6 +1210,11 @@ struct mm_struct {</div><div class='ctx'> </div><div class='ctx'> 		unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARCH_HAS_ELF_CORE_EFLAGS</div><div class='add'>+		/* the ABI-related flags from the ELF header. Used for core dump */</div><div class='add'>+		unsigned long saved_e_flags;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 		struct percpu_counter rss_stat[NR_MM_COUNTERS];</div><div class='ctx'> </div><div class='ctx'> 		struct linux_binfmt *binfmt;</div><div class='hunk'>@@ -880,7 +1222,7 @@ struct mm_struct {</div><div class='ctx'> 		/* Architecture-specific MM context */</div><div class='ctx'> 		mm_context_t context;</div><div class='ctx'> </div><div class='del'>-		unsigned long flags; /* Must use atomic bitops to access */</div><div class='add'>+		mm_flags_t flags; /* Must use mm_flags_* hlpers to access */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AIO</div><div class='ctx'> 		spinlock_t			ioctx_lock;</div><div class='hunk'>@@ -906,7 +1248,7 @@ struct mm_struct {</div><div class='ctx'> #ifdef CONFIG_MMU_NOTIFIER</div><div class='ctx'> 		struct mmu_notifier_subscriptions *notifier_subscriptions;</div><div class='ctx'> #endif</div><div class='del'>-#if defined(CONFIG_TRANSPARENT_HUGEPAGE) &amp;&amp; !USE_SPLIT_PMD_PTLOCKS</div><div class='add'>+#if defined(CONFIG_TRANSPARENT_HUGEPAGE) &amp;&amp; !defined(CONFIG_SPLIT_PMD_PTLOCKS)</div><div class='ctx'> 		pgtable_t pmd_huge_pte; /* protected by page_table_lock */</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_NUMA_BALANCING</div><div class='hunk'>@@ -960,7 +1302,7 @@ struct mm_struct {</div><div class='ctx'> 		 * Represent how many empty pages are merged with kernel zero</div><div class='ctx'> 		 * pages when enabling KSM use_zero_pages.</div><div class='ctx'> 		 */</div><div class='del'>-		unsigned long ksm_zero_pages;</div><div class='add'>+		atomic_long_t ksm_zero_pages;</div><div class='ctx'> #endif /* CONFIG_KSM */</div><div class='ctx'> #ifdef CONFIG_LRU_GEN_WALKS_MMU</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -978,6 +1320,9 @@ struct mm_struct {</div><div class='ctx'> #endif</div><div class='ctx'> 		} lru_gen;</div><div class='ctx'> #endif /* CONFIG_LRU_GEN_WALKS_MMU */</div><div class='add'>+#ifdef CONFIG_MM_ID</div><div class='add'>+		mm_id_t mm_id;</div><div class='add'>+#endif /* CONFIG_MM_ID */</div><div class='ctx'> 	} __randomize_layout;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -987,6 +1332,36 @@ struct mm_struct {</div><div class='ctx'> 	unsigned long cpu_bitmap[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Copy value to the first system word of mm flags, non-atomically. */</div><div class='add'>+static inline void __mm_flags_overwrite_word(struct mm_struct *mm, unsigned long value)</div><div class='add'>+{</div><div class='add'>+	*ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags) = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Obtain a read-only view of the mm flags bitmap. */</div><div class='add'>+static inline const unsigned long *__mm_flags_get_bitmap(const struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	return (const unsigned long *)ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read the first system word of mm flags, non-atomically. */</div><div class='add'>+static inline unsigned long __mm_flags_get_word(const struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	return *__mm_flags_get_bitmap(mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update the first system word of mm flags ONLY, applying the specified mask to</div><div class='add'>+ * it, then setting all flags specified by bits.</div><div class='add'>+ */</div><div class='add'>+static inline void __mm_flags_set_mask_bits_word(struct mm_struct *mm,</div><div class='add'>+		unsigned long mask, unsigned long bits)</div><div class='add'>+{</div><div class='add'>+	unsigned long *bitmap = ACCESS_PRIVATE(&amp;mm-&gt;flags, __mm_flags);</div><div class='add'>+</div><div class='add'>+	set_mask_bits(bitmap, mask, bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define MM_MT_FLAGS	(MT_FLAGS_ALLOC_RANGE | MT_FLAGS_LOCK_EXTERN | \</div><div class='ctx'> 			 MT_FLAGS_USE_RCU)</div><div class='ctx'> extern struct mm_struct init_mm;</div><div class='hunk'>@@ -1087,83 +1462,56 @@ static inline void vma_iter_init(struct vma_iterator *vmi,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCHED_MM_CID</div><div class='del'>-</div><div class='del'>-enum mm_cid_state {</div><div class='del'>-	MM_CID_UNSET = -1U,		/* Unset state has lazy_put flag set. */</div><div class='del'>-	MM_CID_LAZY_PUT = (1U &lt;&lt; 31),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline bool mm_cid_is_unset(int cid)</div><div class='del'>-{</div><div class='del'>-	return cid == MM_CID_UNSET;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool mm_cid_is_lazy_put(int cid)</div><div class='del'>-{</div><div class='del'>-	return !mm_cid_is_unset(cid) &amp;&amp; (cid &amp; MM_CID_LAZY_PUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool mm_cid_is_valid(int cid)</div><div class='del'>-{</div><div class='del'>-	return !(cid &amp; MM_CID_LAZY_PUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mm_cid_set_lazy_put(int cid)</div><div class='add'>+/*</div><div class='add'>+ * mm_cpus_allowed: Union of all mm's threads allowed CPUs.</div><div class='add'>+ */</div><div class='add'>+static inline cpumask_t *mm_cpus_allowed(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	return cid | MM_CID_LAZY_PUT;</div><div class='del'>-}</div><div class='add'>+	unsigned long bitmap = (unsigned long)mm;</div><div class='ctx'> </div><div class='del'>-static inline int mm_cid_clear_lazy_put(int cid)</div><div class='del'>-{</div><div class='del'>-	return cid &amp; ~MM_CID_LAZY_PUT;</div><div class='add'>+	bitmap += offsetof(struct mm_struct, cpu_bitmap);</div><div class='add'>+	/* Skip cpu_bitmap */</div><div class='add'>+	bitmap += cpumask_size();</div><div class='add'>+	return (struct cpumask *)bitmap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Accessor for struct mm_struct's cidmask. */</div><div class='del'>-static inline cpumask_t *mm_cidmask(struct mm_struct *mm)</div><div class='add'>+static inline unsigned long *mm_cidmask(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	unsigned long cid_bitmap = (unsigned long)mm;</div><div class='add'>+	unsigned long cid_bitmap = (unsigned long)mm_cpus_allowed(mm);</div><div class='ctx'> </div><div class='del'>-	cid_bitmap += offsetof(struct mm_struct, cpu_bitmap);</div><div class='del'>-	/* Skip cpu_bitmap */</div><div class='add'>+	/* Skip mm_cpus_allowed */</div><div class='ctx'> 	cid_bitmap += cpumask_size();</div><div class='del'>-	return (struct cpumask *)cid_bitmap;</div><div class='add'>+	return (unsigned long *)cid_bitmap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mm_init_cid(struct mm_struct *mm)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		struct mm_cid *pcpu_cid = per_cpu_ptr(mm-&gt;pcpu_cid, i);</div><div class='add'>+void mm_init_cid(struct mm_struct *mm, struct task_struct *p);</div><div class='ctx'> </div><div class='del'>-		pcpu_cid-&gt;cid = MM_CID_UNSET;</div><div class='del'>-		pcpu_cid-&gt;time = 0;</div><div class='del'>-	}</div><div class='del'>-	cpumask_clear(mm_cidmask(mm));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mm_alloc_cid(struct mm_struct *mm)</div><div class='add'>+static inline int mm_alloc_cid_noprof(struct mm_struct *mm, struct task_struct *p)</div><div class='ctx'> {</div><div class='del'>-	mm-&gt;pcpu_cid = alloc_percpu(struct mm_cid);</div><div class='del'>-	if (!mm-&gt;pcpu_cid)</div><div class='add'>+	mm-&gt;mm_cid.pcpu = alloc_percpu_noprof(struct mm_cid_pcpu);</div><div class='add'>+	if (!mm-&gt;mm_cid.pcpu)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	mm_init_cid(mm);</div><div class='add'>+	mm_init_cid(mm, p);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#define mm_alloc_cid(...)	alloc_hooks(mm_alloc_cid_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> static inline void mm_destroy_cid(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	free_percpu(mm-&gt;pcpu_cid);</div><div class='del'>-	mm-&gt;pcpu_cid = NULL;</div><div class='add'>+	free_percpu(mm-&gt;mm_cid.pcpu);</div><div class='add'>+	mm-&gt;mm_cid.pcpu = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int mm_cid_size(void)</div><div class='ctx'> {</div><div class='del'>-	return cpumask_size();</div><div class='add'>+	/* mm_cpus_allowed(), mm_cidmask(). */</div><div class='add'>+	return cpumask_size() + bitmap_size(num_possible_cpus());</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_SCHED_MM_CID */</div><div class='del'>-static inline void mm_init_cid(struct mm_struct *mm) { }</div><div class='del'>-static inline int mm_alloc_cid(struct mm_struct *mm) { return 0; }</div><div class='add'>+static inline void mm_init_cid(struct mm_struct *mm, struct task_struct *p) { }</div><div class='add'>+static inline int mm_alloc_cid(struct mm_struct *mm, struct task_struct *p) { return 0; }</div><div class='ctx'> static inline void mm_destroy_cid(struct mm_struct *mm) { }</div><div class='ctx'> static inline unsigned int mm_cid_size(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1271,6 +1619,9 @@ struct vm_special_mapping {</div><div class='ctx'> </div><div class='ctx'> 	int (*mremap)(const struct vm_special_mapping *sm,</div><div class='ctx'> 		     struct vm_area_struct *new_vma);</div><div class='add'>+</div><div class='add'>+	void (*close)(const struct vm_special_mapping *sm,</div><div class='add'>+		      struct vm_area_struct *vma);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tlb_flush_reason {</div><div class='hunk'>@@ -1279,6 +1630,7 @@ enum tlb_flush_reason {</div><div class='ctx'> 	TLB_LOCAL_SHOOTDOWN,</div><div class='ctx'> 	TLB_LOCAL_MM_SHOOTDOWN,</div><div class='ctx'> 	TLB_REMOTE_SEND_IPI,</div><div class='add'>+	TLB_REMOTE_WRONG_CPU,</div><div class='ctx'> 	NR_TLB_FLUSH_REASONS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1342,6 +1694,15 @@ enum fault_flag {</div><div class='ctx'> </div><div class='ctx'> typedef unsigned int __bitwise zap_flags_t;</div><div class='ctx'> </div><div class='add'>+/* Flags for clear_young_dirty_ptes(). */</div><div class='add'>+typedef int __bitwise cydp_t;</div><div class='add'>+</div><div class='add'>+/* Clear the access bit */</div><div class='add'>+#define CYDP_CLEAR_YOUNG		((__force cydp_t)BIT(0))</div><div class='add'>+</div><div class='add'>+/* Clear the dirty bit */</div><div class='add'>+#define CYDP_CLEAR_DIRTY		((__force cydp_t)BIT(1))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * FOLL_PIN and FOLL_LONGTERM may be used in various combinations with each</div><div class='ctx'>  * other. Here is what they mean, and how to use them:</div><div class='hunk'>@@ -1434,4 +1795,91 @@ enum {</div><div class='ctx'> 	/* See also internal only FOLL flags in mm/internal.h */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* mm flags */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The first two bits represent core dump modes for set-user-ID,</div><div class='add'>+ * the modes are SUID_DUMP_* defined in linux/sched/coredump.h</div><div class='add'>+ */</div><div class='add'>+#define MMF_DUMPABLE_BITS 2</div><div class='add'>+#define MMF_DUMPABLE_MASK (BIT(MMF_DUMPABLE_BITS) - 1)</div><div class='add'>+/* coredump filter bits */</div><div class='add'>+#define MMF_DUMP_ANON_PRIVATE	2</div><div class='add'>+#define MMF_DUMP_ANON_SHARED	3</div><div class='add'>+#define MMF_DUMP_MAPPED_PRIVATE	4</div><div class='add'>+#define MMF_DUMP_MAPPED_SHARED	5</div><div class='add'>+#define MMF_DUMP_ELF_HEADERS	6</div><div class='add'>+#define MMF_DUMP_HUGETLB_PRIVATE 7</div><div class='add'>+#define MMF_DUMP_HUGETLB_SHARED  8</div><div class='add'>+#define MMF_DUMP_DAX_PRIVATE	9</div><div class='add'>+#define MMF_DUMP_DAX_SHARED	10</div><div class='add'>+</div><div class='add'>+#define MMF_DUMP_FILTER_SHIFT	MMF_DUMPABLE_BITS</div><div class='add'>+#define MMF_DUMP_FILTER_BITS	9</div><div class='add'>+#define MMF_DUMP_FILTER_MASK \</div><div class='add'>+	((BIT(MMF_DUMP_FILTER_BITS) - 1) &lt;&lt; MMF_DUMP_FILTER_SHIFT)</div><div class='add'>+#define MMF_DUMP_FILTER_DEFAULT \</div><div class='add'>+	(BIT(MMF_DUMP_ANON_PRIVATE) | BIT(MMF_DUMP_ANON_SHARED) | \</div><div class='add'>+	 BIT(MMF_DUMP_HUGETLB_PRIVATE) | MMF_DUMP_MASK_DEFAULT_ELF)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS</div><div class='add'>+# define MMF_DUMP_MASK_DEFAULT_ELF	BIT(MMF_DUMP_ELF_HEADERS)</div><div class='add'>+#else</div><div class='add'>+# define MMF_DUMP_MASK_DEFAULT_ELF	0</div><div class='add'>+#endif</div><div class='add'>+					/* leave room for more dump flags */</div><div class='add'>+#define MMF_VM_MERGEABLE	16	/* KSM may merge identical pages */</div><div class='add'>+#define MMF_VM_HUGEPAGE		17	/* set when mm is available for khugepaged */</div><div class='add'>+</div><div class='add'>+#define MMF_HUGE_ZERO_FOLIO	18      /* mm has ever used the global huge zero folio */</div><div class='add'>+</div><div class='add'>+#define MMF_HAS_UPROBES		19	/* has uprobes */</div><div class='add'>+#define MMF_RECALC_UPROBES	20	/* MMF_HAS_UPROBES can be wrong */</div><div class='add'>+#define MMF_OOM_SKIP		21	/* mm is of no interest for the OOM killer */</div><div class='add'>+#define MMF_UNSTABLE		22	/* mm is unstable for copy_from_user */</div><div class='add'>+#define MMF_DISABLE_THP_EXCEPT_ADVISED	23	/* no THP except when advised (e.g., VM_HUGEPAGE) */</div><div class='add'>+#define MMF_DISABLE_THP_COMPLETELY	24	/* no THP for all VMAs */</div><div class='add'>+#define MMF_DISABLE_THP_MASK	(BIT(MMF_DISABLE_THP_COMPLETELY) | \</div><div class='add'>+				 BIT(MMF_DISABLE_THP_EXCEPT_ADVISED))</div><div class='add'>+#define MMF_OOM_REAP_QUEUED	25	/* mm was queued for oom_reaper */</div><div class='add'>+#define MMF_MULTIPROCESS	26	/* mm is shared between processes */</div><div class='add'>+/*</div><div class='add'>+ * MMF_HAS_PINNED: Whether this mm has pinned any pages.  This can be either</div><div class='add'>+ * replaced in the future by mm.pinned_vm when it becomes stable, or grow into</div><div class='add'>+ * a counter on its own. We're aggresive on this bit for now: even if the</div><div class='add'>+ * pinned pages were unpinned later on, we'll still keep this bit set for the</div><div class='add'>+ * lifecycle of this mm, just for simplicity.</div><div class='add'>+ */</div><div class='add'>+#define MMF_HAS_PINNED		27	/* FOLL_PIN has run, never cleared */</div><div class='add'>+</div><div class='add'>+#define MMF_HAS_MDWE		28</div><div class='add'>+#define MMF_HAS_MDWE_MASK	BIT(MMF_HAS_MDWE)</div><div class='add'>+</div><div class='add'>+#define MMF_HAS_MDWE_NO_INHERIT	29</div><div class='add'>+</div><div class='add'>+#define MMF_VM_MERGE_ANY	30</div><div class='add'>+#define MMF_VM_MERGE_ANY_MASK	BIT(MMF_VM_MERGE_ANY)</div><div class='add'>+</div><div class='add'>+#define MMF_TOPDOWN		31	/* mm searches top down by default */</div><div class='add'>+#define MMF_TOPDOWN_MASK	BIT(MMF_TOPDOWN)</div><div class='add'>+</div><div class='add'>+#define MMF_INIT_LEGACY_MASK	(MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\</div><div class='add'>+				 MMF_DISABLE_THP_MASK | MMF_HAS_MDWE_MASK |\</div><div class='add'>+				 MMF_VM_MERGE_ANY_MASK | MMF_TOPDOWN_MASK)</div><div class='add'>+</div><div class='add'>+/* Legacy flags must fit within 32 bits. */</div><div class='add'>+static_assert((u64)MMF_INIT_LEGACY_MASK &lt;= (u64)UINT_MAX);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialise legacy flags according to masks, propagating selected flags on</div><div class='add'>+ * fork. Further flag manipulation can be performed by the caller.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long mmf_init_legacy_flags(unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	if (flags &amp; (1UL &lt;&lt; MMF_HAS_MDWE_NO_INHERIT))</div><div class='add'>+		flags &amp;= ~((1UL &lt;&lt; MMF_HAS_MDWE) |</div><div class='add'>+			   (1UL &lt;&lt; MMF_HAS_MDWE_NO_INHERIT));</div><div class='add'>+	return flags &amp; MMF_INIT_LEGACY_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_MM_TYPES_H */</div><div class='head'>diff --git a/include/linux/mm_types_task.h b/include/linux/mm_types_task.h<br/>index a2f6179b672b..a82aa80c0ba4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mm_types_task.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mm_types_task.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mm_types_task.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mm_types_task.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'>  * (These are defined separately to decouple sched.h from mm_types.h as much as possible.)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/align.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -16,9 +17,6 @@</div><div class='ctx'> #include &lt;asm/tlbbatch.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define USE_SPLIT_PTE_PTLOCKS	(NR_CPUS &gt;= CONFIG_SPLIT_PTLOCK_CPUS)</div><div class='del'>-#define USE_SPLIT_PMD_PTLOCKS	(USE_SPLIT_PTE_PTLOCKS &amp;&amp; \</div><div class='del'>-		IS_ENABLED(CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK))</div><div class='ctx'> #define ALLOC_SPLIT_PTLOCKS	(SPINLOCK_SIZE &gt; BITS_PER_LONG/8)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -46,6 +44,26 @@ struct page_frag {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define PAGE_FRAG_CACHE_MAX_SIZE	__ALIGN_MASK(32768, ~PAGE_MASK)</div><div class='add'>+#define PAGE_FRAG_CACHE_MAX_ORDER	get_order(PAGE_FRAG_CACHE_MAX_SIZE)</div><div class='add'>+struct page_frag_cache {</div><div class='add'>+	/* encoded_page consists of the virtual address, pfmemalloc bit and</div><div class='add'>+	 * order of a page.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long encoded_page;</div><div class='add'>+</div><div class='add'>+	/* we maintain a pagecount bias, so that we dont dirty cache line</div><div class='add'>+	 * containing page-&gt;_refcount every time we allocate a fragment.</div><div class='add'>+	 */</div><div class='add'>+#if (PAGE_SIZE &lt; PAGE_FRAG_CACHE_MAX_SIZE) &amp;&amp; (BITS_PER_LONG &lt;= 32)</div><div class='add'>+	__u16 offset;</div><div class='add'>+	__u16 pagecnt_bias;</div><div class='add'>+#else</div><div class='add'>+	__u32 offset;</div><div class='add'>+	__u32 pagecnt_bias;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Track pages that require TLB flushes */</div><div class='ctx'> struct tlbflush_unmap_batch {</div><div class='ctx'> #ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH</div><div class='head'>diff --git a/include/linux/mman.h b/include/linux/mman.h<br/>index dc7048824be8..0ba8a7e8b90a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mman.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mman.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mman.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mman.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #ifndef _LINUX_MMAN_H</div><div class='ctx'> #define _LINUX_MMAN_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/percpu_counter.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -58,8 +59,6 @@</div><div class='ctx'> 		| MAP_HUGE_1GB)</div><div class='ctx'> </div><div class='ctx'> extern int sysctl_overcommit_memory;</div><div class='del'>-extern int sysctl_overcommit_ratio;</div><div class='del'>-extern unsigned long sysctl_overcommit_kbytes;</div><div class='ctx'> extern struct percpu_counter vm_committed_as;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -94,7 +93,7 @@ static inline void vm_unacct_memory(long pages)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef arch_calc_vm_flag_bits</div><div class='del'>-#define arch_calc_vm_flag_bits(flags) 0</div><div class='add'>+#define arch_calc_vm_flag_bits(file, flags) 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef arch_validate_prot</div><div class='hunk'>@@ -138,7 +137,7 @@ static inline bool arch_validate_flags(unsigned long flags)</div><div class='ctx'> /*</div><div class='ctx'>  * Combine the mmap "prot" argument into "vm_flags" used internally.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long</div><div class='add'>+static inline vm_flags_t</div><div class='ctx'> calc_vm_prot_bits(unsigned long prot, unsigned long pkey)</div><div class='ctx'> {</div><div class='ctx'> 	return _calc_vm_trans(prot, PROT_READ,  VM_READ ) |</div><div class='hunk'>@@ -150,18 +149,28 @@ calc_vm_prot_bits(unsigned long prot, unsigned long pkey)</div><div class='ctx'> /*</div><div class='ctx'>  * Combine the mmap "flags" argument into "vm_flags" used internally.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long</div><div class='del'>-calc_vm_flag_bits(unsigned long flags)</div><div class='add'>+static inline vm_flags_t</div><div class='add'>+calc_vm_flag_bits(struct file *file, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	return _calc_vm_trans(flags, MAP_GROWSDOWN,  VM_GROWSDOWN ) |</div><div class='ctx'> 	       _calc_vm_trans(flags, MAP_LOCKED,     VM_LOCKED    ) |</div><div class='ctx'> 	       _calc_vm_trans(flags, MAP_SYNC,	     VM_SYNC      ) |</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='ctx'> 	       _calc_vm_trans(flags, MAP_STACK,	     VM_NOHUGEPAGE) |</div><div class='del'>-	       arch_calc_vm_flag_bits(flags);</div><div class='add'>+#endif</div><div class='add'>+	       arch_calc_vm_flag_bits(file, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long vm_commit_limit(void);</div><div class='ctx'> </div><div class='add'>+#ifndef arch_memory_deny_write_exec_supported</div><div class='add'>+static inline bool arch_memory_deny_write_exec_supported(void)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Denies creating a writable executable mapping or gaining executable permissions.</div><div class='ctx'>  *</div><div class='hunk'>@@ -180,16 +189,31 @@ unsigned long vm_commit_limit(void);</div><div class='ctx'>  *</div><div class='ctx'>  *	d)	mmap(PROT_READ | PROT_EXEC)</div><div class='ctx'>  *		mmap(PROT_READ | PROT_EXEC | PROT_BTI)</div><div class='add'>+ *</div><div class='add'>+ * This is only applicable if the user has set the Memory-Deny-Write-Execute</div><div class='add'>+ * (MDWE) protection mask for the current process.</div><div class='add'>+ *</div><div class='add'>+ * @old specifies the VMA flags the VMA originally possessed, and @new the ones</div><div class='add'>+ * we propose to set.</div><div class='add'>+ *</div><div class='add'>+ * Return: false if proposed change is OK, true if not ok and should be denied.</div><div class='ctx'>  */</div><div class='del'>-static inline bool map_deny_write_exec(struct vm_area_struct *vma,  unsigned long vm_flags)</div><div class='add'>+static inline bool map_deny_write_exec(unsigned long old, unsigned long new)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(MMF_HAS_MDWE, &amp;current-&gt;mm-&gt;flags))</div><div class='add'>+	/* If MDWE is disabled, we have nothing to deny. */</div><div class='add'>+	if (!mm_flags_test(MMF_HAS_MDWE, current-&gt;mm))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* If the new VMA is not executable, we have nothing to deny. */</div><div class='add'>+	if (!(new &amp; VM_EXEC))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if ((vm_flags &amp; VM_EXEC) &amp;&amp; (vm_flags &amp; VM_WRITE))</div><div class='add'>+	/* Under MDWE we do not accept newly writably executable VMAs... */</div><div class='add'>+	if (new &amp; VM_WRITE)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (!(vma-&gt;vm_flags &amp; VM_EXEC) &amp;&amp; (vm_flags &amp; VM_EXEC))</div><div class='add'>+	/* ...nor previously non-executable VMAs becoming executable. */</div><div class='add'>+	if (!(old &amp; VM_EXEC))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='head'>diff --git a/include/linux/mmap_lock.h b/include/linux/mmap_lock.h<br/>index 8d38dcb6d044..d53f72dba7fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmap_lock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmap_lock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmap_lock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmap_lock.h</a></div><div class='hunk'>@@ -1,12 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef _LINUX_MMAP_LOCK_H</div><div class='ctx'> #define _LINUX_MMAP_LOCK_H</div><div class='ctx'> </div><div class='add'>+/* Avoid a dependency loop by declaring here. */</div><div class='add'>+extern int rcuwait_wake_up(struct rcuwait *w);</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/mmdebug.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/tracepoint-defs.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/sched/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MMAP_LOCK_INITIALIZER(name) \</div><div class='ctx'> 	.mmap_lock = __RWSEM_INITIALIZER((name).mmap_lock),</div><div class='hunk'>@@ -60,52 +66,274 @@ static inline void __mmap_lock_trace_released(struct mm_struct *mm, bool write)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_TRACING */</div><div class='ctx'> </div><div class='del'>-static inline void mmap_assert_locked(struct mm_struct *mm)</div><div class='add'>+static inline void mmap_assert_locked(const struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held(&amp;mm-&gt;mmap_lock);</div><div class='del'>-	VM_BUG_ON_MM(!rwsem_is_locked(&amp;mm-&gt;mmap_lock), mm);</div><div class='add'>+	rwsem_assert_held(&amp;mm-&gt;mmap_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mmap_assert_write_locked(struct mm_struct *mm)</div><div class='add'>+static inline void mmap_assert_write_locked(const struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	lockdep_assert_held_write(&amp;mm-&gt;mmap_lock);</div><div class='del'>-	VM_BUG_ON_MM(!rwsem_is_locked(&amp;mm-&gt;mmap_lock), mm);</div><div class='add'>+	rwsem_assert_held_write(&amp;mm-&gt;mmap_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PER_VMA_LOCK</div><div class='add'>+</div><div class='add'>+static inline void mm_lock_seqcount_init(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	seqcount_init(&amp;mm-&gt;mm_lock_seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mm_lock_seqcount_begin(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	do_raw_write_seqcount_begin(&amp;mm-&gt;mm_lock_seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mm_lock_seqcount_end(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	ASSERT_EXCLUSIVE_WRITER(mm-&gt;mm_lock_seq);</div><div class='add'>+	do_raw_write_seqcount_end(&amp;mm-&gt;mm_lock_seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mmap_lock_speculate_try_begin(struct mm_struct *mm, unsigned int *seq)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Since mmap_lock is a sleeping lock, and waiting for it to become</div><div class='add'>+	 * unlocked is more or less equivalent with taking it ourselves, don't</div><div class='add'>+	 * bother with the speculative path if mmap_lock is already write-locked</div><div class='add'>+	 * and take the slow path, which takes the lock.</div><div class='add'>+	 */</div><div class='add'>+	return raw_seqcount_try_begin(&amp;mm-&gt;mm_lock_seq, *seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mmap_lock_speculate_retry(struct mm_struct *mm, unsigned int seq)</div><div class='add'>+{</div><div class='add'>+	return read_seqcount_retry(&amp;mm-&gt;mm_lock_seq, seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vma_lock_init(struct vm_area_struct *vma, bool reset_refcnt)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+	static struct lock_class_key lockdep_key;</div><div class='add'>+</div><div class='add'>+	lockdep_init_map(&amp;vma-&gt;vmlock_dep_map, "vm_lock", &amp;lockdep_key, 0);</div><div class='add'>+#endif</div><div class='add'>+	if (reset_refcnt)</div><div class='add'>+		refcount_set(&amp;vma-&gt;vm_refcnt, 0);</div><div class='add'>+	vma-&gt;vm_lock_seq = UINT_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_vma_writer_only(int refcnt)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * With a writer and no readers, refcnt is VMA_LOCK_OFFSET if the vma</div><div class='add'>+	 * is detached and (VMA_LOCK_OFFSET + 1) if it is attached. Waiting on</div><div class='add'>+	 * a detached vma happens only in vma_mark_detached() and is a rare</div><div class='add'>+	 * case, therefore most of the time there will be no unnecessary wakeup.</div><div class='add'>+	 */</div><div class='add'>+	return (refcnt &amp; VMA_LOCK_OFFSET) &amp;&amp; refcnt &lt;= VMA_LOCK_OFFSET + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vma_refcount_put(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	/* Use a copy of vm_mm in case vma is freed after we drop vm_refcnt */</div><div class='add'>+	struct mm_struct *mm = vma-&gt;vm_mm;</div><div class='add'>+	int oldcnt;</div><div class='add'>+</div><div class='add'>+	rwsem_release(&amp;vma-&gt;vmlock_dep_map, _RET_IP_);</div><div class='add'>+	if (!__refcount_dec_and_test(&amp;vma-&gt;vm_refcnt, &amp;oldcnt)) {</div><div class='add'>+</div><div class='add'>+		if (is_vma_writer_only(oldcnt - 1))</div><div class='add'>+			rcuwait_wake_up(&amp;mm-&gt;vma_writer_wait);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Drop all currently-held per-VMA locks.</div><div class='del'>- * This is called from the mmap_lock implementation directly before releasing</div><div class='del'>- * a write-locked mmap_lock (or downgrading it to read-locked).</div><div class='del'>- * This should normally NOT be called manually from other places.</div><div class='del'>- * If you want to call this manually anyway, keep in mind that this will release</div><div class='del'>- * *all* VMA write locks, including ones from further up the stack.</div><div class='add'>+ * Use only while holding mmap read lock which guarantees that locking will not</div><div class='add'>+ * fail (nobody can concurrently write-lock the vma). vma_start_read() should</div><div class='add'>+ * not be used in such cases because it might fail due to mm_lock_seq overflow.</div><div class='add'>+ * This functionality is used to obtain vma read lock and drop the mmap read lock.</div><div class='ctx'>  */</div><div class='del'>-static inline void vma_end_write_all(struct mm_struct *mm)</div><div class='add'>+static inline bool vma_start_read_locked_nested(struct vm_area_struct *vma, int subclass)</div><div class='ctx'> {</div><div class='del'>-	mmap_assert_write_locked(mm);</div><div class='add'>+	int oldcnt;</div><div class='add'>+</div><div class='add'>+	mmap_assert_locked(vma-&gt;vm_mm);</div><div class='add'>+	if (unlikely(!__refcount_inc_not_zero_limited_acquire(&amp;vma-&gt;vm_refcnt, &amp;oldcnt,</div><div class='add'>+							      VMA_REF_LIMIT)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rwsem_acquire_read(&amp;vma-&gt;vmlock_dep_map, 0, 1, _RET_IP_);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use only while holding mmap read lock which guarantees that locking will not</div><div class='add'>+ * fail (nobody can concurrently write-lock the vma). vma_start_read() should</div><div class='add'>+ * not be used in such cases because it might fail due to mm_lock_seq overflow.</div><div class='add'>+ * This functionality is used to obtain vma read lock and drop the mmap read lock.</div><div class='add'>+ */</div><div class='add'>+static inline bool vma_start_read_locked(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	return vma_start_read_locked_nested(vma, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vma_end_read(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	vma_refcount_put(vma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* WARNING! Can only be used if mmap_lock is expected to be write-locked */</div><div class='add'>+static inline bool __is_vma_write_locked(struct vm_area_struct *vma, unsigned int *mm_lock_seq)</div><div class='add'>+{</div><div class='add'>+	mmap_assert_write_locked(vma-&gt;vm_mm);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Nobody can concurrently modify mm-&gt;mm_lock_seq due to exclusive</div><div class='del'>-	 * mmap_lock being held.</div><div class='del'>-	 * We need RELEASE semantics here to ensure that preceding stores into</div><div class='del'>-	 * the VMA take effect before we unlock it with this store.</div><div class='del'>-	 * Pairs with ACQUIRE semantics in vma_start_read().</div><div class='add'>+	 * current task is holding mmap_write_lock, both vma-&gt;vm_lock_seq and</div><div class='add'>+	 * mm-&gt;mm_lock_seq can't be concurrently modified.</div><div class='ctx'> 	 */</div><div class='del'>-	smp_store_release(&amp;mm-&gt;mm_lock_seq, mm-&gt;mm_lock_seq + 1);</div><div class='add'>+	*mm_lock_seq = vma-&gt;vm_mm-&gt;mm_lock_seq.sequence;</div><div class='add'>+	return (vma-&gt;vm_lock_seq == *mm_lock_seq);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static inline void vma_end_write_all(struct mm_struct *mm) {}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static inline void mmap_init_lock(struct mm_struct *mm)</div><div class='add'>+int __vma_start_write(struct vm_area_struct *vma, unsigned int mm_lock_seq,</div><div class='add'>+		int state);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Begin writing to a VMA.</div><div class='add'>+ * Exclude concurrent readers under the per-VMA lock until the currently</div><div class='add'>+ * write-locked mmap_lock is dropped or downgraded.</div><div class='add'>+ */</div><div class='add'>+static inline void vma_start_write(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	init_rwsem(&amp;mm-&gt;mmap_lock);</div><div class='add'>+	unsigned int mm_lock_seq;</div><div class='add'>+</div><div class='add'>+	if (__is_vma_write_locked(vma, &amp;mm_lock_seq))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__vma_start_write(vma, mm_lock_seq, TASK_UNINTERRUPTIBLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vma_start_write_killable - Begin writing to a VMA.</div><div class='add'>+ * @vma: The VMA we are going to modify.</div><div class='add'>+ *</div><div class='add'>+ * Exclude concurrent readers under the per-VMA lock until the currently</div><div class='add'>+ * write-locked mmap_lock is dropped or downgraded.</div><div class='add'>+ *</div><div class='add'>+ * Context: May sleep while waiting for readers to drop the vma read lock.</div><div class='add'>+ * Caller must already hold the mmap_lock for write.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for a successful acquisition.  -EINTR if a fatal signal was</div><div class='add'>+ * received.</div><div class='add'>+ */</div><div class='add'>+static inline __must_check</div><div class='add'>+int vma_start_write_killable(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	unsigned int mm_lock_seq;</div><div class='add'>+</div><div class='add'>+	if (__is_vma_write_locked(vma, &amp;mm_lock_seq))</div><div class='add'>+		return 0;</div><div class='add'>+	return __vma_start_write(vma, mm_lock_seq, TASK_KILLABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vma_assert_write_locked(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	unsigned int mm_lock_seq;</div><div class='add'>+</div><div class='add'>+	VM_BUG_ON_VMA(!__is_vma_write_locked(vma, &amp;mm_lock_seq), vma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vma_assert_locked(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	unsigned int mm_lock_seq;</div><div class='add'>+</div><div class='add'>+	VM_BUG_ON_VMA(refcount_read(&amp;vma-&gt;vm_refcnt) &lt;= 1 &amp;&amp;</div><div class='add'>+		      !__is_vma_write_locked(vma, &amp;mm_lock_seq), vma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * WARNING: to avoid racing with vma_mark_attached()/vma_mark_detached(), these</div><div class='add'>+ * assertions should be made either under mmap_write_lock or when the object</div><div class='add'>+ * has been isolated under mmap_write_lock, ensuring no competing writers.</div><div class='add'>+ */</div><div class='add'>+static inline void vma_assert_attached(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!refcount_read(&amp;vma-&gt;vm_refcnt));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vma_assert_detached(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(refcount_read(&amp;vma-&gt;vm_refcnt));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vma_mark_attached(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	vma_assert_write_locked(vma);</div><div class='add'>+	vma_assert_detached(vma);</div><div class='add'>+	refcount_set_release(&amp;vma-&gt;vm_refcnt, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vma_mark_detached(struct vm_area_struct *vma);</div><div class='add'>+</div><div class='add'>+struct vm_area_struct *lock_vma_under_rcu(struct mm_struct *mm,</div><div class='add'>+					  unsigned long address);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Locks next vma pointed by the iterator. Confirms the locked vma has not</div><div class='add'>+ * been modified and will retry under mmap_lock protection if modification</div><div class='add'>+ * was detected. Should be called from read RCU section.</div><div class='add'>+ * Returns either a valid locked VMA, NULL if no more VMAs or -EINTR if the</div><div class='add'>+ * process was interrupted.</div><div class='add'>+ */</div><div class='add'>+struct vm_area_struct *lock_next_vma(struct mm_struct *mm,</div><div class='add'>+				     struct vma_iterator *iter,</div><div class='add'>+				     unsigned long address);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_PER_VMA_LOCK */</div><div class='add'>+</div><div class='add'>+static inline void mm_lock_seqcount_init(struct mm_struct *mm) {}</div><div class='add'>+static inline void mm_lock_seqcount_begin(struct mm_struct *mm) {}</div><div class='add'>+static inline void mm_lock_seqcount_end(struct mm_struct *mm) {}</div><div class='add'>+</div><div class='add'>+static inline bool mmap_lock_speculate_try_begin(struct mm_struct *mm, unsigned int *seq)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mmap_lock_speculate_retry(struct mm_struct *mm, unsigned int seq)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+static inline void vma_lock_init(struct vm_area_struct *vma, bool reset_refcnt) {}</div><div class='add'>+static inline void vma_end_read(struct vm_area_struct *vma) {}</div><div class='add'>+static inline void vma_start_write(struct vm_area_struct *vma) {}</div><div class='add'>+static inline __must_check</div><div class='add'>+int vma_start_write_killable(struct vm_area_struct *vma) { return 0; }</div><div class='add'>+static inline void vma_assert_write_locked(struct vm_area_struct *vma)</div><div class='add'>+		{ mmap_assert_write_locked(vma-&gt;vm_mm); }</div><div class='add'>+static inline void vma_assert_attached(struct vm_area_struct *vma) {}</div><div class='add'>+static inline void vma_assert_detached(struct vm_area_struct *vma) {}</div><div class='add'>+static inline void vma_mark_attached(struct vm_area_struct *vma) {}</div><div class='add'>+static inline void vma_mark_detached(struct vm_area_struct *vma) {}</div><div class='add'>+</div><div class='add'>+static inline struct vm_area_struct *lock_vma_under_rcu(struct mm_struct *mm,</div><div class='add'>+		unsigned long address)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void vma_assert_locked(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	mmap_assert_locked(vma-&gt;vm_mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PER_VMA_LOCK */</div><div class='add'>+</div><div class='ctx'> static inline void mmap_write_lock(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	__mmap_lock_trace_start_locking(mm, true);</div><div class='ctx'> 	down_write(&amp;mm-&gt;mmap_lock);</div><div class='add'>+	mm_lock_seqcount_begin(mm);</div><div class='ctx'> 	__mmap_lock_trace_acquire_returned(mm, true, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -113,6 +341,7 @@ static inline void mmap_write_lock_nested(struct mm_struct *mm, int subclass)</div><div class='ctx'> {</div><div class='ctx'> 	__mmap_lock_trace_start_locking(mm, true);</div><div class='ctx'> 	down_write_nested(&amp;mm-&gt;mmap_lock, subclass);</div><div class='add'>+	mm_lock_seqcount_begin(mm);</div><div class='ctx'> 	__mmap_lock_trace_acquire_returned(mm, true, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -122,10 +351,26 @@ static inline int mmap_write_lock_killable(struct mm_struct *mm)</div><div class='ctx'> </div><div class='ctx'> 	__mmap_lock_trace_start_locking(mm, true);</div><div class='ctx'> 	ret = down_write_killable(&amp;mm-&gt;mmap_lock);</div><div class='add'>+	if (!ret)</div><div class='add'>+		mm_lock_seqcount_begin(mm);</div><div class='ctx'> 	__mmap_lock_trace_acquire_returned(mm, true, ret == 0);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Drop all currently-held per-VMA locks.</div><div class='add'>+ * This is called from the mmap_lock implementation directly before releasing</div><div class='add'>+ * a write-locked mmap_lock (or downgrading it to read-locked).</div><div class='add'>+ * This should normally NOT be called manually from other places.</div><div class='add'>+ * If you want to call this manually anyway, keep in mind that this will release</div><div class='add'>+ * *all* VMA write locks, including ones from further up the stack.</div><div class='add'>+ */</div><div class='add'>+static inline void vma_end_write_all(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	mmap_assert_write_locked(mm);</div><div class='add'>+	mm_lock_seqcount_end(mm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void mmap_write_unlock(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	__mmap_lock_trace_released(mm, true);</div><div class='hunk'>@@ -173,6 +418,9 @@ static inline void mmap_read_unlock(struct mm_struct *mm)</div><div class='ctx'> 	up_read(&amp;mm-&gt;mmap_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_GUARD(mmap_read_lock, struct mm_struct *,</div><div class='add'>+	     mmap_read_lock(_T), mmap_read_unlock(_T))</div><div class='add'>+</div><div class='ctx'> static inline void mmap_read_unlock_non_owner(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	__mmap_lock_trace_released(mm, false);</div><div class='head'>diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h<br/>index f34407cc2788..e9e964c20e53 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/card.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/card.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/card.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmc/card.h</a></div><div class='hunk'>@@ -35,7 +35,7 @@ struct mmc_csd {</div><div class='ctx'> 	unsigned int		wp_grp_size;</div><div class='ctx'> 	unsigned int		read_blkbits;</div><div class='ctx'> 	unsigned int		write_blkbits;</div><div class='del'>-	unsigned int		capacity;</div><div class='add'>+	sector_t		capacity;</div><div class='ctx'> 	unsigned int		read_partial:1,</div><div class='ctx'> 				read_misalign:1,</div><div class='ctx'> 				write_partial:1,</div><div class='hunk'>@@ -182,12 +182,17 @@ struct sd_switch_caps {</div><div class='ctx'> #define SD_SET_CURRENT_LIMIT_400	1</div><div class='ctx'> #define SD_SET_CURRENT_LIMIT_600	2</div><div class='ctx'> #define SD_SET_CURRENT_LIMIT_800	3</div><div class='del'>-#define SD_SET_CURRENT_NO_CHANGE	(-1)</div><div class='ctx'> </div><div class='ctx'> #define SD_MAX_CURRENT_200	(1 &lt;&lt; SD_SET_CURRENT_LIMIT_200)</div><div class='ctx'> #define SD_MAX_CURRENT_400	(1 &lt;&lt; SD_SET_CURRENT_LIMIT_400)</div><div class='ctx'> #define SD_MAX_CURRENT_600	(1 &lt;&lt; SD_SET_CURRENT_LIMIT_600)</div><div class='ctx'> #define SD_MAX_CURRENT_800	(1 &lt;&lt; SD_SET_CURRENT_LIMIT_800)</div><div class='add'>+</div><div class='add'>+#define SD4_SET_POWER_LIMIT_0_72W	0</div><div class='add'>+#define SD4_SET_POWER_LIMIT_1_44W	1</div><div class='add'>+#define SD4_SET_POWER_LIMIT_2_16W	2</div><div class='add'>+#define SD4_SET_POWER_LIMIT_2_88W	3</div><div class='add'>+#define SD4_SET_POWER_LIMIT_1_80W	4</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sd_ext_reg {</div><div class='hunk'>@@ -209,6 +214,34 @@ struct sd_ext_reg {</div><div class='ctx'> #define SD_EXT_PERF_CMD_QUEUE	(1&lt;&lt;4)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sd_uhs2_config {</div><div class='add'>+	u32			node_id;</div><div class='add'>+</div><div class='add'>+	u32			n_fcu;</div><div class='add'>+	u32			maxblk_len;</div><div class='add'>+	u8			n_lanes;</div><div class='add'>+	u8			dadr_len;</div><div class='add'>+	u8			app_type;</div><div class='add'>+	u8			phy_minor_rev;</div><div class='add'>+	u8			phy_major_rev;</div><div class='add'>+	u8			can_hibernate;</div><div class='add'>+	u8			n_lss_sync;</div><div class='add'>+	u8			n_lss_dir;</div><div class='add'>+	u8			link_minor_rev;</div><div class='add'>+	u8			link_major_rev;</div><div class='add'>+	u8			dev_type;</div><div class='add'>+	u8			n_data_gap;</div><div class='add'>+</div><div class='add'>+	u32			n_fcu_set;</div><div class='add'>+	u32			maxblk_len_set;</div><div class='add'>+	u8			n_lanes_set;</div><div class='add'>+	u8			speed_range_set;</div><div class='add'>+	u8			n_lss_sync_set;</div><div class='add'>+	u8			n_lss_dir_set;</div><div class='add'>+	u8			n_data_gap_set;</div><div class='add'>+	u8			max_retry_set;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sdio_cccr {</div><div class='ctx'> 	unsigned int		sdio_vsn;</div><div class='ctx'> 	unsigned int		sd_vsn;</div><div class='hunk'>@@ -294,6 +327,8 @@ struct mmc_card {</div><div class='ctx'> #define MMC_QUIRK_BROKEN_SD_DISCARD	(1&lt;&lt;14)	/* Disable broken SD discard support */</div><div class='ctx'> #define MMC_QUIRK_BROKEN_SD_CACHE	(1&lt;&lt;15)	/* Disable broken SD cache support */</div><div class='ctx'> #define MMC_QUIRK_BROKEN_CACHE_FLUSH	(1&lt;&lt;16)	/* Don't flush cache until the write has occurred */</div><div class='add'>+#define MMC_QUIRK_BROKEN_SD_POWEROFF_NOTIFY	(1&lt;&lt;17) /* Disable broken SD poweroff notify support */</div><div class='add'>+#define MMC_QUIRK_NO_UHS_DDR50_TUNING	(1&lt;&lt;18) /* Disable DDR50 tuning */</div><div class='ctx'> </div><div class='ctx'> 	bool			written_flag;	/* Indicates eMMC has been written since power on */</div><div class='ctx'> 	bool			reenable_cmdq;	/* Re-enable Command Queue */</div><div class='hunk'>@@ -319,6 +354,8 @@ struct mmc_card {</div><div class='ctx'> 	struct sd_ext_reg	ext_power;	/* SD extension reg for PM */</div><div class='ctx'> 	struct sd_ext_reg	ext_perf;	/* SD extension reg for PERF */</div><div class='ctx'> </div><div class='add'>+	struct sd_uhs2_config	uhs2_config;	/* SD UHS-II config */</div><div class='add'>+</div><div class='ctx'> 	unsigned int		sdio_funcs;	/* number of SDIO functions */</div><div class='ctx'> 	atomic_t		sdio_funcs_probed; /* number of probed SDIO funcs */</div><div class='ctx'> 	struct sdio_cccr	cccr;		/* common card info */</div><div class='head'>diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h<br/>index 2c7928a50907..01e0f591a20b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmc/core.h</a></div><div class='hunk'>@@ -11,16 +11,18 @@</div><div class='ctx'> struct mmc_data;</div><div class='ctx'> struct mmc_request;</div><div class='ctx'> </div><div class='del'>-enum mmc_blk_status {</div><div class='del'>-	MMC_BLK_SUCCESS = 0,</div><div class='del'>-	MMC_BLK_PARTIAL,</div><div class='del'>-	MMC_BLK_CMD_ERR,</div><div class='del'>-	MMC_BLK_RETRY,</div><div class='del'>-	MMC_BLK_ABORT,</div><div class='del'>-	MMC_BLK_DATA_ERR,</div><div class='del'>-	MMC_BLK_ECC_ERR,</div><div class='del'>-	MMC_BLK_NOMEDIUM,</div><div class='del'>-	MMC_BLK_NEW_REQUEST,</div><div class='add'>+#define UHS2_MAX_PAYLOAD_LEN 2</div><div class='add'>+#define UHS2_MAX_RESP_LEN 20</div><div class='add'>+</div><div class='add'>+struct uhs2_command {</div><div class='add'>+	u16	header;</div><div class='add'>+	u16	arg;</div><div class='add'>+	__be32	payload[UHS2_MAX_PAYLOAD_LEN];</div><div class='add'>+	u8	payload_len;</div><div class='add'>+	u8	packet_len;</div><div class='add'>+	u8	tmode_half_duplex;</div><div class='add'>+	u8	uhs2_resp[UHS2_MAX_RESP_LEN];	/* UHS2 native cmd resp */</div><div class='add'>+	u8	uhs2_resp_len;			/* UHS2 native cmd resp len */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mmc_command {</div><div class='hunk'>@@ -55,6 +57,7 @@ struct mmc_command {</div><div class='ctx'> #define MMC_RSP_NONE	(0)</div><div class='ctx'> #define MMC_RSP_R1	(MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)</div><div class='ctx'> #define MMC_RSP_R1B	(MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)</div><div class='add'>+#define MMC_RSP_R1B_NO_CRC (MMC_RSP_PRESENT|MMC_RSP_OPCODE|MMC_RSP_BUSY)</div><div class='ctx'> #define MMC_RSP_R2	(MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)</div><div class='ctx'> #define MMC_RSP_R3	(MMC_RSP_PRESENT)</div><div class='ctx'> #define MMC_RSP_R4	(MMC_RSP_PRESENT)</div><div class='hunk'>@@ -62,9 +65,6 @@ struct mmc_command {</div><div class='ctx'> #define MMC_RSP_R6	(MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)</div><div class='ctx'> #define MMC_RSP_R7	(MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)</div><div class='ctx'> </div><div class='del'>-/* Can be used by core to poll after switch to MMC HS mode */</div><div class='del'>-#define MMC_RSP_R1_NO_CRC	(MMC_RSP_PRESENT|MMC_RSP_OPCODE)</div><div class='del'>-</div><div class='ctx'> #define mmc_resp_type(cmd)	((cmd)-&gt;flags &amp; (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -108,6 +108,12 @@ struct mmc_command {</div><div class='ctx'> 	unsigned int		busy_timeout;	/* busy detect timeout in ms */</div><div class='ctx'> 	struct mmc_data		*data;		/* data segment associated with cmd */</div><div class='ctx'> 	struct mmc_request	*mrq;		/* associated request */</div><div class='add'>+</div><div class='add'>+	struct uhs2_command	*uhs2_cmd;	/* UHS2 command */</div><div class='add'>+</div><div class='add'>+	/* for SDUC */</div><div class='add'>+	bool has_ext_addr;</div><div class='add'>+	u8 ext_addr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mmc_data {</div><div class='hunk'>@@ -166,6 +172,7 @@ struct mmc_request {</div><div class='ctx'> 	const struct bio_crypt_ctx *crypto_ctx;</div><div class='ctx'> 	int			crypto_key_slot;</div><div class='ctx'> #endif</div><div class='add'>+	struct uhs2_command	uhs2_cmd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mmc_card;</div><div class='head'>diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h<br/>index 5894bf912f7b..e0e2c265e5d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/host.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/host.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/host.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmc/host.h</a></div><div class='hunk'>@@ -10,12 +10,14 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/fault-inject.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mmc/core.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/card.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/pm.h&gt;</div><div class='ctx'> #include &lt;linux/dma-direction.h&gt;</div><div class='ctx'> #include &lt;linux/blk-crypto-profile.h&gt;</div><div class='add'>+#include &lt;linux/mmc/sd_uhs2.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mmc_ios {</div><div class='ctx'> 	unsigned int	clock;			/* clock rate */</div><div class='hunk'>@@ -63,6 +65,10 @@ struct mmc_ios {</div><div class='ctx'> #define MMC_TIMING_MMC_HS400	10</div><div class='ctx'> #define MMC_TIMING_SD_EXP	11</div><div class='ctx'> #define MMC_TIMING_SD_EXP_1_2V	12</div><div class='add'>+#define MMC_TIMING_UHS2_SPEED_A    13</div><div class='add'>+#define MMC_TIMING_UHS2_SPEED_A_HD 14</div><div class='add'>+#define MMC_TIMING_UHS2_SPEED_B    15</div><div class='add'>+#define MMC_TIMING_UHS2_SPEED_B_HD 16</div><div class='ctx'> </div><div class='ctx'> 	unsigned char	signal_voltage;		/* signalling voltage (1.8V or 3.3V) */</div><div class='ctx'> </div><div class='hunk'>@@ -70,6 +76,9 @@ struct mmc_ios {</div><div class='ctx'> #define MMC_SIGNAL_VOLTAGE_180	1</div><div class='ctx'> #define MMC_SIGNAL_VOLTAGE_120	2</div><div class='ctx'> </div><div class='add'>+	unsigned char	vqmmc2_voltage;</div><div class='add'>+#define MMC_VQMMC2_VOLTAGE_180	0</div><div class='add'>+</div><div class='ctx'> 	unsigned char	drv_type;		/* driver type (A, B, C, D) */</div><div class='ctx'> </div><div class='ctx'> #define MMC_SET_DRIVER_TYPE_B	0</div><div class='hunk'>@@ -91,6 +100,43 @@ struct mmc_clk_phase_map {</div><div class='ctx'> 	struct mmc_clk_phase phase[MMC_NUM_CLK_PHASES];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sd_uhs2_caps {</div><div class='add'>+	u32	dap;</div><div class='add'>+	u32	gap;</div><div class='add'>+	u32	group_desc;</div><div class='add'>+	u32	maxblk_len;</div><div class='add'>+	u32	n_fcu;</div><div class='add'>+	u8	n_lanes;</div><div class='add'>+	u8	addr64;</div><div class='add'>+	u8	card_type;</div><div class='add'>+	u8	phy_rev;</div><div class='add'>+	u8	speed_range;</div><div class='add'>+	u8	n_lss_sync;</div><div class='add'>+	u8	n_lss_dir;</div><div class='add'>+	u8	link_rev;</div><div class='add'>+	u8	host_type;</div><div class='add'>+	u8	n_data_gap;</div><div class='add'>+</div><div class='add'>+	u32	maxblk_len_set;</div><div class='add'>+	u32	n_fcu_set;</div><div class='add'>+	u8	n_lanes_set;</div><div class='add'>+	u8	n_lss_sync_set;</div><div class='add'>+	u8	n_lss_dir_set;</div><div class='add'>+	u8	n_data_gap_set;</div><div class='add'>+	u8	max_retry_set;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sd_uhs2_operation {</div><div class='add'>+	UHS2_PHY_INIT = 0,</div><div class='add'>+	UHS2_SET_CONFIG,</div><div class='add'>+	UHS2_ENABLE_INT,</div><div class='add'>+	UHS2_DISABLE_INT,</div><div class='add'>+	UHS2_ENABLE_CLK,</div><div class='add'>+	UHS2_DISABLE_CLK,</div><div class='add'>+	UHS2_CHECK_DORMANT,</div><div class='add'>+	UHS2_SET_IOS,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mmc_host;</div><div class='ctx'> </div><div class='ctx'> enum mmc_err_stat {</div><div class='hunk'>@@ -218,6 +264,14 @@ struct mmc_host_ops {</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize an SD express card, mandatory for MMC_CAP2_SD_EXP. */</div><div class='ctx'> 	int	(*init_sd_express)(struct mmc_host *host, struct mmc_ios *ios);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The uhs2_control callback is used to execute SD UHS-II specific</div><div class='add'>+	 * operations. It's mandatory to implement for hosts that supports the</div><div class='add'>+	 * SD UHS-II interface (MMC_CAP2_SD_UHS2). Expected return values are a</div><div class='add'>+	 * negative errno in case of a failure or zero for success.</div><div class='add'>+	 */</div><div class='add'>+	int	(*uhs2_control)(struct mmc_host *host, enum sd_uhs2_operation op);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mmc_cqe_ops {</div><div class='hunk'>@@ -264,16 +318,6 @@ struct mmc_cqe_ops {</div><div class='ctx'> 	void	(*cqe_recovery_finish)(struct mmc_host *host);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mmc_async_req {</div><div class='del'>-	/* active mmc request */</div><div class='del'>-	struct mmc_request	*mrq;</div><div class='del'>-	/*</div><div class='del'>-	 * Check error status of completed mmc request.</div><div class='del'>-	 * Returns 0 if success otherwise non zero.</div><div class='del'>-	 */</div><div class='del'>-	enum mmc_blk_status (*err_check)(struct mmc_card *, struct mmc_async_req *);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct mmc_slot - MMC slot functions</div><div class='ctx'>  *</div><div class='hunk'>@@ -291,26 +335,17 @@ struct mmc_slot {</div><div class='ctx'> 	void *handler_priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * mmc_context_info - synchronization details for mmc context</div><div class='del'>- * @is_done_rcv		wake up reason was done request</div><div class='del'>- * @is_new_req		wake up reason was new request</div><div class='del'>- * @is_waiting_last_req	mmc context waiting for single running request</div><div class='del'>- * @wait		wait queue</div><div class='del'>- */</div><div class='del'>-struct mmc_context_info {</div><div class='del'>-	bool			is_done_rcv;</div><div class='del'>-	bool			is_new_req;</div><div class='del'>-	bool			is_waiting_last_req;</div><div class='del'>-	wait_queue_head_t	wait;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct regulator;</div><div class='ctx'> struct mmc_pwrseq;</div><div class='add'>+struct notifier_block;</div><div class='ctx'> </div><div class='ctx'> struct mmc_supply {</div><div class='ctx'> 	struct regulator *vmmc;		/* Card power supply */</div><div class='ctx'> 	struct regulator *vqmmc;	/* Optional Vccq supply */</div><div class='add'>+	struct regulator *vqmmc2;	/* Optional supply for phy */</div><div class='add'>+</div><div class='add'>+	struct notifier_block vmmc_nb;	/* Notifier for vmmc */</div><div class='add'>+	struct work_struct uv_work;	/* Undervoltage work */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mmc_ctx {</div><div class='hunk'>@@ -402,6 +437,7 @@ struct mmc_host {</div><div class='ctx'> 				 MMC_CAP2_HS200_1_2V_SDR)</div><div class='ctx'> #define MMC_CAP2_SD_EXP		(1 &lt;&lt; 7)	/* SD express via PCIe */</div><div class='ctx'> #define MMC_CAP2_SD_EXP_1_2V	(1 &lt;&lt; 8)	/* SD express 1.2V */</div><div class='add'>+#define MMC_CAP2_SD_UHS2	(1 &lt;&lt; 9)	/* SD UHS-II support */</div><div class='ctx'> #define MMC_CAP2_CD_ACTIVE_HIGH	(1 &lt;&lt; 10)	/* Card-detect signal active high */</div><div class='ctx'> #define MMC_CAP2_RO_ACTIVE_HIGH	(1 &lt;&lt; 11)	/* Write-protect signal active high */</div><div class='ctx'> #define MMC_CAP2_NO_PRESCAN_POWERUP (1 &lt;&lt; 14)	/* Don't power up before scan */</div><div class='hunk'>@@ -428,13 +464,17 @@ struct mmc_host {</div><div class='ctx'> #endif</div><div class='ctx'> #define MMC_CAP2_ALT_GPT_TEGRA	(1 &lt;&lt; 28)	/* Host with eMMC that has GPT entry at a non-standard location */</div><div class='ctx'> </div><div class='add'>+	bool			uhs2_sd_tran;	/* UHS-II flag for SD_TRAN state */</div><div class='add'>+	bool			uhs2_app_cmd;	/* UHS-II flag for APP command */</div><div class='add'>+	struct sd_uhs2_caps	uhs2_caps;	/* Host UHS-II capabilities */</div><div class='add'>+</div><div class='ctx'> 	int			fixed_drv_type;	/* fixed driver type for non-removable media */</div><div class='ctx'> </div><div class='ctx'> 	mmc_pm_flag_t		pm_caps;	/* supported pm features */</div><div class='ctx'> </div><div class='ctx'> 	/* host specific block data */</div><div class='del'>-	unsigned int		max_seg_size;	/* see blk_queue_max_segment_size */</div><div class='del'>-	unsigned short		max_segs;	/* see blk_queue_max_segments */</div><div class='add'>+	unsigned int		max_seg_size;	/* lim-&gt;max_segment_size */</div><div class='add'>+	unsigned short		max_segs;	/* lim-&gt;max_segments */</div><div class='ctx'> 	unsigned short		unused;</div><div class='ctx'> 	unsigned int		max_req_size;	/* maximum number of bytes in one req */</div><div class='ctx'> 	unsigned int		max_blk_size;	/* maximum size of one mmc block */</div><div class='hunk'>@@ -458,6 +498,13 @@ struct mmc_host {</div><div class='ctx'> 	unsigned int		can_dma_map_merge:1; /* merging can be used */</div><div class='ctx'> 	unsigned int		vqmmc_enabled:1; /* vqmmc regulator is enabled */</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Indicates if an undervoltage event has already been handled.</div><div class='add'>+	 * This prevents repeated regulator notifiers from triggering</div><div class='add'>+	 * multiple REGULATOR_EVENT_UNDER_VOLTAGE events.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int		undervoltage:1;	 /* Undervoltage state */</div><div class='add'>+</div><div class='ctx'> 	int			rescan_disable;	/* disable card detection */</div><div class='ctx'> 	int			rescan_entered;	/* used with nonremovable devices */</div><div class='ctx'> </div><div class='hunk'>@@ -529,6 +576,7 @@ struct mmc_host {</div><div class='ctx'> 	int			hsq_depth;</div><div class='ctx'> </div><div class='ctx'> 	u32			err_stats[MMC_ERR_MAX];</div><div class='add'>+	u32			max_sd_hs_hz;</div><div class='ctx'> 	unsigned long		private[] ____cacheline_aligned;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -554,6 +602,14 @@ static inline struct mmc_host *mmc_from_priv(void *priv)</div><div class='ctx'> 	return container_of(priv, struct mmc_host, private);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MMC_CRYPTO</div><div class='add'>+static inline struct mmc_host *</div><div class='add'>+mmc_from_crypto_profile(struct blk_crypto_profile *profile)</div><div class='add'>+{</div><div class='add'>+	return container_of(profile, struct mmc_host, crypto_profile);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define mmc_host_is_spi(host)	((host)-&gt;caps &amp; MMC_CAP_SPI)</div><div class='ctx'> </div><div class='ctx'> #define mmc_dev(x)	((x)-&gt;parent)</div><div class='hunk'>@@ -590,6 +646,7 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc,</div><div class='ctx'> 			struct regulator *supply,</div><div class='ctx'> 			unsigned short vdd_bit);</div><div class='ctx'> int mmc_regulator_set_vqmmc(struct mmc_host *mmc, struct mmc_ios *ios);</div><div class='add'>+int mmc_regulator_set_vqmmc2(struct mmc_host *mmc, struct mmc_ios *ios);</div><div class='ctx'> #else</div><div class='ctx'> static inline int mmc_regulator_set_ocr(struct mmc_host *mmc,</div><div class='ctx'> 				 struct regulator *supply,</div><div class='hunk'>@@ -603,6 +660,12 @@ static inline int mmc_regulator_set_vqmmc(struct mmc_host *mmc,</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int mmc_regulator_set_vqmmc2(struct mmc_host *mmc,</div><div class='add'>+					   struct mmc_ios *ios)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int mmc_regulator_get_supply(struct mmc_host *mmc);</div><div class='hunk'>@@ -638,6 +701,14 @@ static inline int mmc_card_uhs(struct mmc_card *card)</div><div class='ctx'> 		card-&gt;host-&gt;ios.timing &lt;= MMC_TIMING_UHS_DDR50;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool mmc_card_uhs2(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	return host-&gt;ios.timing == MMC_TIMING_UHS2_SPEED_A ||</div><div class='add'>+	       host-&gt;ios.timing == MMC_TIMING_UHS2_SPEED_A_HD ||</div><div class='add'>+	       host-&gt;ios.timing == MMC_TIMING_UHS2_SPEED_B ||</div><div class='add'>+	       host-&gt;ios.timing == MMC_TIMING_UHS2_SPEED_B_HD;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void mmc_retune_timer_stop(struct mmc_host *host);</div><div class='ctx'> </div><div class='ctx'> static inline void mmc_retune_needed(struct mmc_host *host)</div><div class='hunk'>@@ -672,10 +743,18 @@ static inline void mmc_debugfs_err_stats_inc(struct mmc_host *host,</div><div class='ctx'> 	host-&gt;err_stats[stat] += 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mmc_sd_switch(struct mmc_card *card, int mode, int group, u8 value, u8 *resp);</div><div class='add'>+static inline int mmc_card_uhs2_hd_mode(struct mmc_host *host)</div><div class='add'>+{</div><div class='add'>+	return host-&gt;ios.timing == MMC_TIMING_UHS2_SPEED_A_HD ||</div><div class='add'>+	       host-&gt;ios.timing == MMC_TIMING_UHS2_SPEED_B_HD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mmc_sd_switch(struct mmc_card *card, bool mode, int group,</div><div class='add'>+		u8 value, u8 *resp);</div><div class='ctx'> int mmc_send_status(struct mmc_card *card, u32 *status);</div><div class='ctx'> int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error);</div><div class='ctx'> int mmc_send_abort_tuning(struct mmc_host *host, u32 opcode);</div><div class='ctx'> int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);</div><div class='add'>+int mmc_read_tuning(struct mmc_host *host, unsigned int blksz, unsigned int blocks);</div><div class='ctx'> </div><div class='ctx'> #endif /* LINUX_MMC_HOST_H */</div><div class='head'>diff --git a/include/linux/mmc/sd.h b/include/linux/mmc/sd.h<br/>index 6727576a8755..af5fc70e09a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/sd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/sd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/sd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmc/sd.h</a></div><div class='hunk'>@@ -15,6 +15,9 @@</div><div class='ctx'> #define SD_SEND_IF_COND           8   /* bcr  [11:0] See below   R7  */</div><div class='ctx'> #define SD_SWITCH_VOLTAGE         11  /* ac                      R1  */</div><div class='ctx'> </div><div class='add'>+/* Class 2 */</div><div class='add'>+#define SD_ADDR_EXT		 22   /* ac   [5:0]              R1  */</div><div class='add'>+</div><div class='ctx'>   /* class 10 */</div><div class='ctx'> #define SD_SWITCH                 6   /* adtc [31:0] See below   R1  */</div><div class='ctx'> </div><div class='hunk'>@@ -36,6 +39,7 @@</div><div class='ctx'> /* OCR bit definitions */</div><div class='ctx'> #define SD_OCR_S18R		(1 &lt;&lt; 24)    /* 1.8V switching request */</div><div class='ctx'> #define SD_ROCR_S18A		SD_OCR_S18R  /* 1.8V switching accepted by card */</div><div class='add'>+#define SD_OCR_2T		(1 &lt;&lt; 27)    /* HO2T/CO2T - SDUC support */</div><div class='ctx'> #define SD_OCR_XPC		(1 &lt;&lt; 28)    /* SDXC power control */</div><div class='ctx'> #define SD_OCR_CCS		(1 &lt;&lt; 30)    /* Card Capacity Status */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mmc/sd_uhs2.h b/include/linux/mmc/sd_uhs2.h<br/>new file mode 100644<br/>index 000000000000..7abe9bd870c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/sd_uhs2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmc/sd_uhs2.h</a></div><div class='hunk'>@@ -0,0 +1,240 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Header file for UHS-II packets, Host Controller registers and I/O</div><div class='add'>+ * accessors.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2014 Intel Corp, All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef LINUX_MMC_UHS2_H</div><div class='add'>+#define LINUX_MMC_UHS2_H</div><div class='add'>+</div><div class='add'>+/* LINK Layer definition */</div><div class='add'>+/*</div><div class='add'>+ * UHS2 Header:</div><div class='add'>+ * Refer to UHS-II Addendum Version 1.02 Figure 5-2, the format of CCMD Header is described below:</div><div class='add'>+ *      bit [3:0]  : DID(Destination ID = Node ID of UHS2 card)</div><div class='add'>+ *      bit [6:4]  : TYP(Packet Type)</div><div class='add'>+ *                   000b: CCMD(Control command packet)</div><div class='add'>+ *                   001b: DCMD(Data command packet)</div><div class='add'>+ *                   010b: RES(Response packet)</div><div class='add'>+ *                   011b: DATA(Data payload packet)</div><div class='add'>+ *                   111b: MSG(Message packet)</div><div class='add'>+ *                   Others: Reserved</div><div class='add'>+ *      bit [7]    : NP(Native Packet)</div><div class='add'>+ *      bit [10:8] : TID(Transaction ID)</div><div class='add'>+ *      bit [11]   : Reserved</div><div class='add'>+ *      bit [15:12]: SID(Source ID 0: Node ID of Host)</div><div class='add'>+ *</div><div class='add'>+ * Broadcast CCMD issued by Host is represented as DID=SID=0.</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * UHS2 Argument:</div><div class='add'>+ * Refer to UHS-II Addendum Version 1.02 Figure 6-5, the format of CCMD Argument is described below:</div><div class='add'>+ *      bit [3:0]  : MSB of IOADR</div><div class='add'>+ *      bit [5:4]  : PLEN(Payload Length)</div><div class='add'>+ *                   00b: 0 byte</div><div class='add'>+ *                   01b: 4 bytes</div><div class='add'>+ *                   10b: 8 bytes</div><div class='add'>+ *                   11b: 16 bytes</div><div class='add'>+ *      bit [6]    : Reserved</div><div class='add'>+ *      bit [7]    : R/W(Read/Write)</div><div class='add'>+ *                   0: Control read command</div><div class='add'>+ *                   1: Control write command</div><div class='add'>+ *      bit [15:8] : LSB of IOADR</div><div class='add'>+ *</div><div class='add'>+ * I/O Address specifies the address of register in UHS-II I/O space accessed by CCMD.</div><div class='add'>+ * The unit of I/O Address is 4 Bytes. It is transmitted in MSB first, LSB last.</div><div class='add'>+ */</div><div class='add'>+#define UHS2_NATIVE_PACKET_POS	7</div><div class='add'>+#define UHS2_NATIVE_PACKET	(1 &lt;&lt; UHS2_NATIVE_PACKET_POS)</div><div class='add'>+</div><div class='add'>+#define UHS2_PACKET_TYPE_POS	4</div><div class='add'>+#define UHS2_PACKET_TYPE_CCMD	(0 &lt;&lt; UHS2_PACKET_TYPE_POS)</div><div class='add'>+#define UHS2_PACKET_TYPE_DCMD	(1 &lt;&lt; UHS2_PACKET_TYPE_POS)</div><div class='add'>+#define UHS2_PACKET_TYPE_RES	(2 &lt;&lt; UHS2_PACKET_TYPE_POS)</div><div class='add'>+#define UHS2_PACKET_TYPE_DATA	(3 &lt;&lt; UHS2_PACKET_TYPE_POS)</div><div class='add'>+#define UHS2_PACKET_TYPE_MSG	(7 &lt;&lt; UHS2_PACKET_TYPE_POS)</div><div class='add'>+</div><div class='add'>+#define UHS2_DEST_ID_MASK	0x0F</div><div class='add'>+#define UHS2_DEST_ID		0x1</div><div class='add'>+</div><div class='add'>+#define UHS2_SRC_ID_POS		12</div><div class='add'>+#define UHS2_SRC_ID_MASK	0xF000</div><div class='add'>+</div><div class='add'>+#define UHS2_TRANS_ID_POS	8</div><div class='add'>+#define UHS2_TRANS_ID_MASK	0x0700</div><div class='add'>+</div><div class='add'>+/* UHS2 MSG */</div><div class='add'>+#define UHS2_MSG_CTG_POS	5</div><div class='add'>+#define UHS2_MSG_CTG_LMSG	0x00</div><div class='add'>+#define UHS2_MSG_CTG_INT	0x60</div><div class='add'>+#define UHS2_MSG_CTG_AMSG	0x80</div><div class='add'>+</div><div class='add'>+#define UHS2_MSG_CTG_FCREQ	0x00</div><div class='add'>+#define UHS2_MSG_CTG_FCRDY	0x01</div><div class='add'>+#define UHS2_MSG_CTG_STAT	0x02</div><div class='add'>+</div><div class='add'>+#define UHS2_MSG_CODE_POS			8</div><div class='add'>+#define UHS2_MSG_CODE_FC_UNRECOVER_ERR		0x8</div><div class='add'>+#define UHS2_MSG_CODE_STAT_UNRECOVER_ERR	0x8</div><div class='add'>+#define UHS2_MSG_CODE_STAT_RECOVER_ERR		0x1</div><div class='add'>+</div><div class='add'>+/* TRANS Layer definition */</div><div class='add'>+</div><div class='add'>+/* Native packets*/</div><div class='add'>+#define UHS2_NATIVE_CMD_RW_POS	7</div><div class='add'>+#define UHS2_NATIVE_CMD_WRITE	(1 &lt;&lt; UHS2_NATIVE_CMD_RW_POS)</div><div class='add'>+#define UHS2_NATIVE_CMD_READ	(0 &lt;&lt; UHS2_NATIVE_CMD_RW_POS)</div><div class='add'>+</div><div class='add'>+#define UHS2_NATIVE_CMD_PLEN_POS	4</div><div class='add'>+#define UHS2_NATIVE_CMD_PLEN_4B		(1 &lt;&lt; UHS2_NATIVE_CMD_PLEN_POS)</div><div class='add'>+#define UHS2_NATIVE_CMD_PLEN_8B		(2 &lt;&lt; UHS2_NATIVE_CMD_PLEN_POS)</div><div class='add'>+#define UHS2_NATIVE_CMD_PLEN_16B	(3 &lt;&lt; UHS2_NATIVE_CMD_PLEN_POS)</div><div class='add'>+</div><div class='add'>+#define UHS2_NATIVE_CCMD_GET_MIOADR_MASK	0xF00</div><div class='add'>+#define UHS2_NATIVE_CCMD_MIOADR_MASK		0x0F</div><div class='add'>+</div><div class='add'>+#define UHS2_NATIVE_CCMD_LIOADR_POS		8</div><div class='add'>+#define UHS2_NATIVE_CCMD_GET_LIOADR_MASK	0x0FF</div><div class='add'>+</div><div class='add'>+#define UHS2_CCMD_DEV_INIT_COMPLETE_FLAG	BIT(11)</div><div class='add'>+#define UHS2_DEV_INIT_PAYLOAD_LEN		1</div><div class='add'>+#define UHS2_DEV_INIT_RESP_LEN			6</div><div class='add'>+#define UHS2_DEV_ENUM_PAYLOAD_LEN		1</div><div class='add'>+#define UHS2_DEV_ENUM_RESP_LEN			8</div><div class='add'>+#define UHS2_CFG_WRITE_PAYLOAD_LEN		2</div><div class='add'>+#define UHS2_CFG_WRITE_PHY_SET_RESP_LEN		4</div><div class='add'>+#define UHS2_CFG_WRITE_GENERIC_SET_RESP_LEN	5</div><div class='add'>+#define UHS2_GO_DORMANT_PAYLOAD_LEN		1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * UHS2 Argument:</div><div class='add'>+ * Refer to UHS-II Addendum Version 1.02 Figure 6-8, the format of DCMD Argument is described below:</div><div class='add'>+ *      bit [3:0]  : Reserved</div><div class='add'>+ *      bit [6:3]  : TMODE(Transfer Mode)</div><div class='add'>+ *                   bit 3: DAM(Data Access Mode)</div><div class='add'>+ *                   bit 4: TLUM(TLEN Unit Mode)</div><div class='add'>+ *                   bit 5: LM(Length Mode)</div><div class='add'>+ *                   bit 6: DM(Duplex Mode)</div><div class='add'>+ *      bit [7]    : R/W(Read/Write)</div><div class='add'>+ *                   0: Control read command</div><div class='add'>+ *                   1: Control write command</div><div class='add'>+ *      bit [15:8] : Reserved</div><div class='add'>+ *</div><div class='add'>+ * I/O Address specifies the address of register in UHS-II I/O space accessed by CCMD.</div><div class='add'>+ * The unit of I/O Address is 4 Bytes. It is transmitted in MSB first, LSB last.</div><div class='add'>+ */</div><div class='add'>+#define UHS2_DCMD_DM_POS		6</div><div class='add'>+#define UHS2_DCMD_2L_HD_MODE		(1 &lt;&lt; UHS2_DCMD_DM_POS)</div><div class='add'>+#define UHS2_DCMD_LM_POS		5</div><div class='add'>+#define UHS2_DCMD_LM_TLEN_EXIST		(1 &lt;&lt; UHS2_DCMD_LM_POS)</div><div class='add'>+#define UHS2_DCMD_TLUM_POS		4</div><div class='add'>+#define UHS2_DCMD_TLUM_BYTE_MODE	(1 &lt;&lt; UHS2_DCMD_TLUM_POS)</div><div class='add'>+#define UHS2_NATIVE_DCMD_DAM_POS	3</div><div class='add'>+#define UHS2_NATIVE_DCMD_DAM_IO		(1 &lt;&lt; UHS2_NATIVE_DCMD_DAM_POS)</div><div class='add'>+</div><div class='add'>+#define UHS2_RES_NACK_POS	7</div><div class='add'>+#define UHS2_RES_NACK_MASK	(0x1 &lt;&lt; UHS2_RES_NACK_POS)</div><div class='add'>+</div><div class='add'>+#define UHS2_RES_ECODE_POS	4</div><div class='add'>+#define UHS2_RES_ECODE_MASK	0x7</div><div class='add'>+#define UHS2_RES_ECODE_COND	1</div><div class='add'>+#define UHS2_RES_ECODE_ARG	2</div><div class='add'>+#define UHS2_RES_ECODE_GEN	3</div><div class='add'>+</div><div class='add'>+/* IOADR of device registers */</div><div class='add'>+#define UHS2_IOADR_GENERIC_CAPS		0x00</div><div class='add'>+#define UHS2_IOADR_PHY_CAPS		0x02</div><div class='add'>+#define UHS2_IOADR_LINK_CAPS		0x04</div><div class='add'>+#define UHS2_IOADR_RSV_CAPS		0x06</div><div class='add'>+#define UHS2_IOADR_GENERIC_SETTINGS	0x08</div><div class='add'>+#define UHS2_IOADR_PHY_SETTINGS		0x0A</div><div class='add'>+#define UHS2_IOADR_LINK_SETTINGS	0x0C</div><div class='add'>+#define UHS2_IOADR_PRESET		0x40</div><div class='add'>+</div><div class='add'>+/* SD application packets */</div><div class='add'>+#define UHS2_SD_CMD_INDEX_POS	8</div><div class='add'>+</div><div class='add'>+#define UHS2_SD_CMD_APP_POS	14</div><div class='add'>+#define UHS2_SD_CMD_APP		(1 &lt;&lt; UHS2_SD_CMD_APP_POS)</div><div class='add'>+</div><div class='add'>+/* UHS-II Device Registers */</div><div class='add'>+#define UHS2_DEV_CONFIG_REG	0x000</div><div class='add'>+</div><div class='add'>+/* General Caps and Settings registers */</div><div class='add'>+#define UHS2_DEV_CONFIG_GEN_CAPS	(UHS2_DEV_CONFIG_REG + 0x000)</div><div class='add'>+#define UHS2_DEV_CONFIG_N_LANES_POS	8</div><div class='add'>+#define UHS2_DEV_CONFIG_N_LANES_MASK	0x3F</div><div class='add'>+#define UHS2_DEV_CONFIG_2L_HD_FD	0x1</div><div class='add'>+#define UHS2_DEV_CONFIG_2D1U_FD		0x2</div><div class='add'>+#define UHS2_DEV_CONFIG_1D2U_FD		0x4</div><div class='add'>+#define UHS2_DEV_CONFIG_2D2U_FD		0x8</div><div class='add'>+#define UHS2_DEV_CONFIG_DADR_POS	14</div><div class='add'>+#define UHS2_DEV_CONFIG_DADR_MASK	0x1</div><div class='add'>+#define UHS2_DEV_CONFIG_APP_POS		16</div><div class='add'>+#define UHS2_DEV_CONFIG_APP_MASK	0xFF</div><div class='add'>+#define UHS2_DEV_CONFIG_APP_SD_MEM	0x1</div><div class='add'>+</div><div class='add'>+#define UHS2_DEV_CONFIG_GEN_SET			(UHS2_DEV_CONFIG_REG + 0x008)</div><div class='add'>+#define UHS2_DEV_CONFIG_GEN_SET_N_LANES_POS	8</div><div class='add'>+#define UHS2_DEV_CONFIG_GEN_SET_2L_FD_HD	0x0</div><div class='add'>+#define UHS2_DEV_CONFIG_GEN_SET_2D1U_FD		0x2</div><div class='add'>+#define UHS2_DEV_CONFIG_GEN_SET_1D2U_FD		0x3</div><div class='add'>+#define UHS2_DEV_CONFIG_GEN_SET_2D2U_FD		0x4</div><div class='add'>+#define UHS2_DEV_CONFIG_GEN_SET_CFG_COMPLETE	BIT(31)</div><div class='add'>+</div><div class='add'>+/* PHY Caps and Settings registers */</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_CAPS	(UHS2_DEV_CONFIG_REG + 0x002)</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_MINOR_MASK	0xF</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_MAJOR_POS	4</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_MAJOR_MASK	0x3</div><div class='add'>+#define UHS2_DEV_CONFIG_CAN_HIBER_POS	15</div><div class='add'>+#define UHS2_DEV_CONFIG_CAN_HIBER_MASK	0x1</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_CAPS1	(UHS2_DEV_CONFIG_REG + 0x003)</div><div class='add'>+#define UHS2_DEV_CONFIG_N_LSS_SYN_MASK	0xF</div><div class='add'>+#define UHS2_DEV_CONFIG_N_LSS_DIR_POS	4</div><div class='add'>+#define UHS2_DEV_CONFIG_N_LSS_DIR_MASK	0xF</div><div class='add'>+</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_SET			(UHS2_DEV_CONFIG_REG + 0x00A)</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_SET_SPEED_POS	6</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_SET_SPEED_A		0x0</div><div class='add'>+#define UHS2_DEV_CONFIG_PHY_SET_SPEED_B		0x1</div><div class='add'>+</div><div class='add'>+/* LINK-TRAN Caps and Settings registers */</div><div class='add'>+#define UHS2_DEV_CONFIG_LINK_TRAN_CAPS		(UHS2_DEV_CONFIG_REG + 0x004)</div><div class='add'>+#define UHS2_DEV_CONFIG_LT_MINOR_MASK		0xF</div><div class='add'>+#define UHS2_DEV_CONFIG_LT_MAJOR_POS		4</div><div class='add'>+#define UHS2_DEV_CONFIG_LT_MAJOR_MASK		0x3</div><div class='add'>+#define UHS2_DEV_CONFIG_N_FCU_POS		8</div><div class='add'>+#define UHS2_DEV_CONFIG_N_FCU_MASK		0xFF</div><div class='add'>+#define UHS2_DEV_CONFIG_DEV_TYPE_POS		16</div><div class='add'>+#define UHS2_DEV_CONFIG_DEV_TYPE_MASK		0x7</div><div class='add'>+#define UHS2_DEV_CONFIG_MAX_BLK_LEN_POS		20</div><div class='add'>+#define UHS2_DEV_CONFIG_MAX_BLK_LEN_MASK	0xFFF</div><div class='add'>+#define UHS2_DEV_CONFIG_LINK_TRAN_CAPS1		(UHS2_DEV_CONFIG_REG + 0x005)</div><div class='add'>+#define UHS2_DEV_CONFIG_N_DATA_GAP_MASK		0xFF</div><div class='add'>+</div><div class='add'>+#define UHS2_DEV_CONFIG_LINK_TRAN_SET		(UHS2_DEV_CONFIG_REG + 0x00C)</div><div class='add'>+#define UHS2_DEV_CONFIG_LT_SET_MAX_BLK_LEN	0x200</div><div class='add'>+#define UHS2_DEV_CONFIG_LT_SET_MAX_RETRY_POS	16</div><div class='add'>+</div><div class='add'>+/* Preset register */</div><div class='add'>+#define UHS2_DEV_CONFIG_PRESET	(UHS2_DEV_CONFIG_REG + 0x040)</div><div class='add'>+</div><div class='add'>+#define UHS2_DEV_INT_REG	0x100</div><div class='add'>+</div><div class='add'>+#define UHS2_DEV_STATUS_REG	0x180</div><div class='add'>+</div><div class='add'>+#define UHS2_DEV_CMD_REG		0x200</div><div class='add'>+#define UHS2_DEV_CMD_FULL_RESET		(UHS2_DEV_CMD_REG + 0x000)</div><div class='add'>+#define UHS2_DEV_CMD_GO_DORMANT_STATE	(UHS2_DEV_CMD_REG + 0x001)</div><div class='add'>+#define UHS2_DEV_CMD_DORMANT_HIBER	BIT(7)</div><div class='add'>+#define UHS2_DEV_CMD_DEVICE_INIT	(UHS2_DEV_CMD_REG + 0x002)</div><div class='add'>+#define UHS2_DEV_INIT_COMPLETE_FLAG	BIT(11)</div><div class='add'>+#define UHS2_DEV_CMD_ENUMERATE		(UHS2_DEV_CMD_REG + 0x003)</div><div class='add'>+#define UHS2_DEV_CMD_TRANS_ABORT	(UHS2_DEV_CMD_REG + 0x004)</div><div class='add'>+</div><div class='add'>+#define UHS2_RCLK_MAX	52000000</div><div class='add'>+#define UHS2_RCLK_MIN	26000000</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_MMC_UHS2_H */</div><div class='head'>diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h<br/>index 478855b8e406..fed1f5f4a8d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/sdio_func.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/sdio_func.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/sdio_func.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmc/sdio_func.h</a></div><div class='hunk'>@@ -106,7 +106,10 @@ struct sdio_driver {</div><div class='ctx'> 	.class = (dev_class), \</div><div class='ctx'> 	.vendor = SDIO_ANY_ID, .device = SDIO_ANY_ID</div><div class='ctx'> </div><div class='del'>-extern int sdio_register_driver(struct sdio_driver *);</div><div class='add'>+/* use a macro to avoid include chaining to get THIS_MODULE */</div><div class='add'>+#define sdio_register_driver(drv) \</div><div class='add'>+	__sdio_register_driver(drv, THIS_MODULE)</div><div class='add'>+extern int __sdio_register_driver(struct sdio_driver *, struct module *);</div><div class='ctx'> extern void sdio_unregister_driver(struct sdio_driver *);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h<br/>index 7fada7a714fe..673cbdf43453 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/sdio_ids.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/sdio_ids.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/sdio_ids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmc/sdio_ids.h</a></div><div class='hunk'>@@ -76,7 +76,8 @@</div><div class='ctx'> #define SDIO_DEVICE_ID_BROADCOM_43430		0xa9a6</div><div class='ctx'> #define SDIO_DEVICE_ID_BROADCOM_43439		0xa9af</div><div class='ctx'> #define SDIO_DEVICE_ID_BROADCOM_43455		0xa9bf</div><div class='del'>-#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752	0xaae8</div><div class='add'>+#define SDIO_DEVICE_ID_BROADCOM_43751		0xaae7</div><div class='add'>+#define SDIO_DEVICE_ID_BROADCOM_43752		0xaae8</div><div class='ctx'> </div><div class='ctx'> #define SDIO_VENDOR_ID_CYPRESS			0x04b4</div><div class='ctx'> #define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439	0xbd3d</div><div class='hunk'>@@ -124,6 +125,7 @@</div><div class='ctx'> #define SDIO_DEVICE_ID_REALTEK_RTW8723DS_2ANT	0xd723</div><div class='ctx'> #define SDIO_DEVICE_ID_REALTEK_RTW8723DS_1ANT	0xd724</div><div class='ctx'> #define SDIO_DEVICE_ID_REALTEK_RTW8821DS	0xd821</div><div class='add'>+#define SDIO_DEVICE_ID_REALTEK_RTW8723CS	0xb703</div><div class='ctx'> </div><div class='ctx'> #define SDIO_VENDOR_ID_SIANO			0x039a</div><div class='ctx'> #define SDIO_DEVICE_ID_SIANO_NOVA_B0		0x0201</div><div class='head'>diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h<br/>index 5d3d15e97868..23ac5696fa38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/slot-gpio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmc/slot-gpio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmc/slot-gpio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmc/slot-gpio.h</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'> #ifndef MMC_SLOT_GPIO_H</div><div class='ctx'> #define MMC_SLOT_GPIO_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/irqreturn.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct mmc_host;</div><div class='ctx'> </div><div class='hunk'>@@ -21,11 +21,10 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id,</div><div class='ctx'> 			 unsigned int debounce);</div><div class='ctx'> int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id,</div><div class='ctx'> 			 unsigned int idx, unsigned int debounce);</div><div class='del'>-void mmc_gpio_set_cd_isr(struct mmc_host *host,</div><div class='del'>-			 irqreturn_t (*isr)(int irq, void *dev_id));</div><div class='add'>+int mmc_gpiod_set_cd_config(struct mmc_host *host, unsigned long config);</div><div class='ctx'> int mmc_gpio_set_cd_wake(struct mmc_host *host, bool on);</div><div class='ctx'> void mmc_gpiod_request_cd_irq(struct mmc_host *host);</div><div class='del'>-bool mmc_can_gpio_cd(struct mmc_host *host);</div><div class='del'>-bool mmc_can_gpio_ro(struct mmc_host *host);</div><div class='add'>+bool mmc_host_can_gpio_cd(struct mmc_host *host);</div><div class='add'>+bool mmc_host_can_gpio_ro(struct mmc_host *host);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h<br/>index 7c3e7b0b0e8f..14a45979cccc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmdebug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmdebug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmdebug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmdebug.h</a></div><div class='hunk'>@@ -9,10 +9,12 @@ struct page;</div><div class='ctx'> struct vm_area_struct;</div><div class='ctx'> struct mm_struct;</div><div class='ctx'> struct vma_iterator;</div><div class='add'>+struct vma_merge_struct;</div><div class='ctx'> </div><div class='del'>-void dump_page(struct page *page, const char *reason);</div><div class='add'>+void dump_page(const struct page *page, const char *reason);</div><div class='ctx'> void dump_vma(const struct vm_area_struct *vma);</div><div class='ctx'> void dump_mm(const struct mm_struct *mm);</div><div class='add'>+void dump_vmg(const struct vma_merge_struct *vmg, const char *reason);</div><div class='ctx'> void vma_iter_dump_tree(const struct vma_iterator *vmi);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_VM</div><div class='hunk'>@@ -46,7 +48,7 @@ void vma_iter_dump_tree(const struct vma_iterator *vmi);</div><div class='ctx'> 		}							\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> #define VM_WARN_ON_ONCE_PAGE(cond, page)	({			\</div><div class='del'>-	static bool __section(".data.once") __warned;			\</div><div class='add'>+	static bool __section(".data..once") __warned;			\</div><div class='ctx'> 	int __ret_warn_once = !!(cond);					\</div><div class='ctx'> 									\</div><div class='ctx'> 	if (unlikely(__ret_warn_once &amp;&amp; !__warned)) {			\</div><div class='hunk'>@@ -66,7 +68,7 @@ void vma_iter_dump_tree(const struct vma_iterator *vmi);</div><div class='ctx'> 	unlikely(__ret_warn);						\</div><div class='ctx'> })</div><div class='ctx'> #define VM_WARN_ON_ONCE_FOLIO(cond, folio)	({			\</div><div class='del'>-	static bool __section(".data.once") __warned;			\</div><div class='add'>+	static bool __section(".data..once") __warned;			\</div><div class='ctx'> 	int __ret_warn_once = !!(cond);					\</div><div class='ctx'> 									\</div><div class='ctx'> 	if (unlikely(__ret_warn_once &amp;&amp; !__warned)) {			\</div><div class='hunk'>@@ -77,7 +79,7 @@ void vma_iter_dump_tree(const struct vma_iterator *vmi);</div><div class='ctx'> 	unlikely(__ret_warn_once);					\</div><div class='ctx'> })</div><div class='ctx'> #define VM_WARN_ON_ONCE_MM(cond, mm)		({			\</div><div class='del'>-	static bool __section(".data.once") __warned;			\</div><div class='add'>+	static bool __section(".data..once") __warned;			\</div><div class='ctx'> 	int __ret_warn_once = !!(cond);					\</div><div class='ctx'> 									\</div><div class='ctx'> 	if (unlikely(__ret_warn_once &amp;&amp; !__warned)) {			\</div><div class='hunk'>@@ -87,6 +89,26 @@ void vma_iter_dump_tree(const struct vma_iterator *vmi);</div><div class='ctx'> 	}								\</div><div class='ctx'> 	unlikely(__ret_warn_once);					\</div><div class='ctx'> })</div><div class='add'>+#define VM_WARN_ON_ONCE_VMA(cond, vma)		({			\</div><div class='add'>+	static bool __section(".data..once") __warned;			\</div><div class='add'>+	int __ret_warn_once = !!(cond);					\</div><div class='add'>+									\</div><div class='add'>+	if (unlikely(__ret_warn_once &amp;&amp; !__warned)) {			\</div><div class='add'>+		dump_vma(vma);						\</div><div class='add'>+		__warned = true;					\</div><div class='add'>+		WARN_ON(1);						\</div><div class='add'>+	}								\</div><div class='add'>+	unlikely(__ret_warn_once);					\</div><div class='add'>+})</div><div class='add'>+#define VM_WARN_ON_VMG(cond, vmg)		({			\</div><div class='add'>+	int __ret_warn = !!(cond);					\</div><div class='add'>+									\</div><div class='add'>+	if (unlikely(__ret_warn)) {					\</div><div class='add'>+		dump_vmg(vmg, "VM_WARN_ON_VMG(" __stringify(cond)")");	\</div><div class='add'>+		WARN_ON(1);						\</div><div class='add'>+	}								\</div><div class='add'>+	unlikely(__ret_warn);						\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> #define VM_WARN_ON(cond) (void)WARN_ON(cond)</div><div class='ctx'> #define VM_WARN_ON_ONCE(cond) (void)WARN_ON_ONCE(cond)</div><div class='hunk'>@@ -104,9 +126,11 @@ void vma_iter_dump_tree(const struct vma_iterator *vmi);</div><div class='ctx'> #define VM_WARN_ON_FOLIO(cond, folio)  BUILD_BUG_ON_INVALID(cond)</div><div class='ctx'> #define VM_WARN_ON_ONCE_FOLIO(cond, folio)  BUILD_BUG_ON_INVALID(cond)</div><div class='ctx'> #define VM_WARN_ON_ONCE_MM(cond, mm)  BUILD_BUG_ON_INVALID(cond)</div><div class='add'>+#define VM_WARN_ON_ONCE_VMA(cond, vma)  BUILD_BUG_ON_INVALID(cond)</div><div class='add'>+#define VM_WARN_ON_VMG(cond, vmg)  BUILD_BUG_ON_INVALID(cond)</div><div class='ctx'> #define VM_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond)</div><div class='ctx'> #define VM_WARN(cond, format...) BUILD_BUG_ON_INVALID(cond)</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_DEBUG_VM */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_VM_IRQSOFF</div><div class='ctx'> #define VM_WARN_ON_IRQS_ENABLED() WARN_ON_ONCE(!irqs_disabled())</div><div class='head'>diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h<br/>index f2b7a3f04099..ac01dc4eb2ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmu_context.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmu_context.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmu_context.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmu_context.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef leave_mm</div><div class='del'>-static inline void leave_mm(int cpu) { }</div><div class='add'>+static inline void leave_mm(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -24,6 +24,7 @@ static inline void leave_mm(int cpu) { }</div><div class='ctx'> #ifndef task_cpu_possible_mask</div><div class='ctx'> # define task_cpu_possible_mask(p)	cpu_possible_mask</div><div class='ctx'> # define task_cpu_possible(cpu, p)	true</div><div class='add'>+# define task_cpu_fallback_mask(p)	housekeeping_cpumask(HK_TYPE_TICK)</div><div class='ctx'> #else</div><div class='ctx'> # define task_cpu_possible(cpu, p)	cpumask_test_cpu((cpu), task_cpu_possible_mask(p))</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h<br/>index f349e08a9dfe..d1094c2d5fb6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmu_notifier.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmu_notifier.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmu_notifier.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmu_notifier.h</a></div><div class='hunk'>@@ -43,10 +43,10 @@ struct mmu_interval_notifier;</div><div class='ctx'>  * a device driver to possibly ignore the invalidation if the</div><div class='ctx'>  * owner field matches the driver's device private pgmap owner.</div><div class='ctx'>  *</div><div class='del'>- * @MMU_NOTIFY_EXCLUSIVE: to signal a device driver that the device will no</div><div class='del'>- * longer have exclusive access to the page. When sent during creation of an</div><div class='del'>- * exclusive range the owner will be initialised to the value provided by the</div><div class='del'>- * caller of make_device_exclusive_range(), otherwise the owner will be NULL.</div><div class='add'>+ * @MMU_NOTIFY_EXCLUSIVE: conversion of a page table entry to device-exclusive.</div><div class='add'>+ * The owner is initialized to the value provided by the caller of</div><div class='add'>+ * make_device_exclusive(), such that this caller can filter out these</div><div class='add'>+ * events.</div><div class='ctx'>  */</div><div class='ctx'> enum mmu_notifier_event {</div><div class='ctx'> 	MMU_NOTIFY_UNMAP = 0,</div><div class='hunk'>@@ -123,15 +123,6 @@ struct mmu_notifier_ops {</div><div class='ctx'> 			  unsigned long address);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * change_pte is called in cases that pte mapping to page is changed:</div><div class='del'>-	 * for example, when ksm remaps pte to point to a new shared page.</div><div class='del'>-	 */</div><div class='del'>-	void (*change_pte)(struct mmu_notifier *subscription,</div><div class='del'>-			   struct mm_struct *mm,</div><div class='del'>-			   unsigned long address,</div><div class='del'>-			   pte_t pte);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * invalidate_range_start() and invalidate_range_end() must be</div><div class='ctx'> 	 * paired and are called only when the mmap_lock and/or the</div><div class='ctx'> 	 * locks protecting the reverse maps are held. If the subsystem</div><div class='hunk'>@@ -392,8 +383,6 @@ extern int __mmu_notifier_clear_young(struct mm_struct *mm,</div><div class='ctx'> 				      unsigned long end);</div><div class='ctx'> extern int __mmu_notifier_test_young(struct mm_struct *mm,</div><div class='ctx'> 				     unsigned long address);</div><div class='del'>-extern void __mmu_notifier_change_pte(struct mm_struct *mm,</div><div class='del'>-				      unsigned long address, pte_t pte);</div><div class='ctx'> extern int __mmu_notifier_invalidate_range_start(struct mmu_notifier_range *r);</div><div class='ctx'> extern void __mmu_notifier_invalidate_range_end(struct mmu_notifier_range *r);</div><div class='ctx'> extern void __mmu_notifier_arch_invalidate_secondary_tlbs(struct mm_struct *mm,</div><div class='hunk'>@@ -439,13 +428,6 @@ static inline int mmu_notifier_test_young(struct mm_struct *mm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mmu_notifier_change_pte(struct mm_struct *mm,</div><div class='del'>-					   unsigned long address, pte_t pte)</div><div class='del'>-{</div><div class='del'>-	if (mm_has_notifiers(mm))</div><div class='del'>-		__mmu_notifier_change_pte(mm, address, pte);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void</div><div class='ctx'> mmu_notifier_invalidate_range_start(struct mmu_notifier_range *range)</div><div class='ctx'> {</div><div class='hunk'>@@ -581,26 +563,6 @@ static inline void mmu_notifier_range_init_owner(</div><div class='ctx'> 	__young;							\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * set_pte_at_notify() sets the pte _after_ running the notifier.</div><div class='del'>- * This is safe to start by updating the secondary MMUs, because the primary MMU</div><div class='del'>- * pte invalidate must have already happened with a ptep_clear_flush() before</div><div class='del'>- * set_pte_at_notify() has been invoked.  Updating the secondary MMUs first is</div><div class='del'>- * required when we change both the protection of the mapping from read-only to</div><div class='del'>- * read-write and the pfn (like during copy on write page faults). Otherwise the</div><div class='del'>- * old page would remain mapped readonly in the secondary MMUs after the new</div><div class='del'>- * page is already writable by some CPU through the primary MMU.</div><div class='del'>- */</div><div class='del'>-#define set_pte_at_notify(__mm, __address, __ptep, __pte)		\</div><div class='del'>-({									\</div><div class='del'>-	struct mm_struct *___mm = __mm;					\</div><div class='del'>-	unsigned long ___address = __address;				\</div><div class='del'>-	pte_t ___pte = __pte;						\</div><div class='del'>-									\</div><div class='del'>-	mmu_notifier_change_pte(___mm, ___address, ___pte);		\</div><div class='del'>-	set_pte_at(___mm, ___address, __ptep, ___pte);			\</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> #else /* CONFIG_MMU_NOTIFIER */</div><div class='ctx'> </div><div class='ctx'> struct mmu_notifier_range {</div><div class='hunk'>@@ -644,15 +606,17 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int mmu_notifier_test_young(struct mm_struct *mm,</div><div class='del'>-					  unsigned long address)</div><div class='add'>+static inline int mmu_notifier_clear_young(struct mm_struct *mm,</div><div class='add'>+					   unsigned long start,</div><div class='add'>+					   unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mmu_notifier_change_pte(struct mm_struct *mm,</div><div class='del'>-					   unsigned long address, pte_t pte)</div><div class='add'>+static inline int mmu_notifier_test_young(struct mm_struct *mm,</div><div class='add'>+					  unsigned long address)</div><div class='ctx'> {</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -690,10 +654,6 @@ static inline void mmu_notifier_subscriptions_destroy(struct mm_struct *mm)</div><div class='ctx'> #define pmdp_clear_flush_young_notify pmdp_clear_flush_young</div><div class='ctx'> #define ptep_clear_young_notify ptep_test_and_clear_young</div><div class='ctx'> #define pmdp_clear_young_notify pmdp_test_and_clear_young</div><div class='del'>-#define	ptep_clear_flush_notify ptep_clear_flush</div><div class='del'>-#define pmdp_huge_clear_flush_notify pmdp_huge_clear_flush</div><div class='del'>-#define pudp_huge_clear_flush_notify pudp_huge_clear_flush</div><div class='del'>-#define set_pte_at_notify set_pte_at</div><div class='ctx'> </div><div class='ctx'> static inline void mmu_notifier_synchronize(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h<br/>index a497f189d988..4398e027f450 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mmzone.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mmzone.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mmzone.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mmzone.h</a></div><div class='hunk'>@@ -37,6 +37,22 @@</div><div class='ctx'> </div><div class='ctx'> #define NR_PAGE_ORDERS (MAX_PAGE_ORDER + 1)</div><div class='ctx'> </div><div class='add'>+/* Defines the order for the number of pages that have a migrate type. */</div><div class='add'>+#ifndef CONFIG_PAGE_BLOCK_MAX_ORDER</div><div class='add'>+#define PAGE_BLOCK_MAX_ORDER MAX_PAGE_ORDER</div><div class='add'>+#else</div><div class='add'>+#define PAGE_BLOCK_MAX_ORDER CONFIG_PAGE_BLOCK_MAX_ORDER</div><div class='add'>+#endif /* CONFIG_PAGE_BLOCK_MAX_ORDER */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The MAX_PAGE_ORDER, which defines the max order of pages to be allocated</div><div class='add'>+ * by the buddy allocator, has to be larger or equal to the PAGE_BLOCK_MAX_ORDER,</div><div class='add'>+ * which defines the order for the number of pages that can have a migrate type</div><div class='add'>+ */</div><div class='add'>+#if (PAGE_BLOCK_MAX_ORDER &gt; MAX_PAGE_ORDER)</div><div class='add'>+#error MAX_PAGE_ORDER must be &gt;= PAGE_BLOCK_MAX_ORDER</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * PAGE_ALLOC_COSTLY_ORDER is the order at which allocations are deemed</div><div class='ctx'>  * costly to service.  That is between allocation orders which should</div><div class='hunk'>@@ -63,6 +79,9 @@ enum migratetype {</div><div class='ctx'> 	 * __free_pageblock_cma() function.</div><div class='ctx'> 	 */</div><div class='ctx'> 	MIGRATE_CMA,</div><div class='add'>+	__MIGRATE_TYPE_END = MIGRATE_CMA,</div><div class='add'>+#else</div><div class='add'>+	__MIGRATE_TYPE_END = MIGRATE_HIGHATOMIC,</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MEMORY_ISOLATION</div><div class='ctx'> 	MIGRATE_ISOLATE,	/* can't allocate from here */</div><div class='hunk'>@@ -76,9 +95,16 @@ extern const char * const migratetype_names[MIGRATE_TYPES];</div><div class='ctx'> #ifdef CONFIG_CMA</div><div class='ctx'> #  define is_migrate_cma(migratetype) unlikely((migratetype) == MIGRATE_CMA)</div><div class='ctx'> #  define is_migrate_cma_page(_page) (get_pageblock_migratetype(_page) == MIGRATE_CMA)</div><div class='add'>+/*</div><div class='add'>+ * __dump_folio() in mm/debug.c passes a folio pointer to on-stack struct folio,</div><div class='add'>+ * so folio_pfn() cannot be used and pfn is needed.</div><div class='add'>+ */</div><div class='add'>+#  define is_migrate_cma_folio(folio, pfn) \</div><div class='add'>+	(get_pfnblock_migratetype(&amp;folio-&gt;page, pfn) == MIGRATE_CMA)</div><div class='ctx'> #else</div><div class='ctx'> #  define is_migrate_cma(migratetype) false</div><div class='ctx'> #  define is_migrate_cma_page(_page) false</div><div class='add'>+#  define is_migrate_cma_folio(folio, pfn) false</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline bool is_migrate_movable(int mt)</div><div class='hunk'>@@ -103,14 +129,12 @@ static inline bool migratetype_is_mergeable(int mt)</div><div class='ctx'> </div><div class='ctx'> extern int page_group_by_mobility_disabled;</div><div class='ctx'> </div><div class='del'>-#define MIGRATETYPE_MASK ((1UL &lt;&lt; PB_migratetype_bits) - 1)</div><div class='add'>+#define get_pageblock_migratetype(page) \</div><div class='add'>+	get_pfnblock_migratetype(page, page_to_pfn(page))</div><div class='ctx'> </div><div class='del'>-#define get_pageblock_migratetype(page)					\</div><div class='del'>-	get_pfnblock_flags_mask(page, page_to_pfn(page), MIGRATETYPE_MASK)</div><div class='add'>+#define folio_migratetype(folio) \</div><div class='add'>+	get_pageblock_migratetype(&amp;folio-&gt;page)</div><div class='ctx'> </div><div class='del'>-#define folio_migratetype(folio)				\</div><div class='del'>-	get_pfnblock_flags_mask(&amp;folio-&gt;page, folio_pfn(folio),		\</div><div class='del'>-			MIGRATETYPE_MASK)</div><div class='ctx'> struct free_area {</div><div class='ctx'> 	struct list_head	free_list[MIGRATE_TYPES];</div><div class='ctx'> 	unsigned long		nr_free;</div><div class='hunk'>@@ -135,6 +159,7 @@ enum numa_stat_item {</div><div class='ctx'> enum zone_stat_item {</div><div class='ctx'> 	/* First 128 byte cacheline (assuming 64 bit words) */</div><div class='ctx'> 	NR_FREE_PAGES,</div><div class='add'>+	NR_FREE_PAGES_BLOCKS,</div><div class='ctx'> 	NR_ZONE_LRU_BASE, /* Used only for compaction and reclaim retry */</div><div class='ctx'> 	NR_ZONE_INACTIVE_ANON = NR_ZONE_LRU_BASE,</div><div class='ctx'> 	NR_ZONE_ACTIVE_ANON,</div><div class='hunk'>@@ -144,7 +169,6 @@ enum zone_stat_item {</div><div class='ctx'> 	NR_ZONE_WRITE_PENDING,	/* Count of dirty, writeback and unstable pages */</div><div class='ctx'> 	NR_MLOCK,		/* mlock()ed pages found and moved off LRU */</div><div class='ctx'> 	/* Second 128 byte cacheline */</div><div class='del'>-	NR_BOUNCE,</div><div class='ctx'> #if IS_ENABLED(CONFIG_ZSMALLOC)</div><div class='ctx'> 	NR_ZSPAGES,		/* allocated in zsmalloc */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -182,7 +206,6 @@ enum node_stat_item {</div><div class='ctx'> 	NR_FILE_PAGES,</div><div class='ctx'> 	NR_FILE_DIRTY,</div><div class='ctx'> 	NR_WRITEBACK,</div><div class='del'>-	NR_WRITEBACK_TEMP,	/* Writeback using temporary buffers */</div><div class='ctx'> 	NR_SHMEM,		/* shmem pages (included tmpfs/GEM pages) */</div><div class='ctx'> 	NR_SHMEM_THPS,</div><div class='ctx'> 	NR_SHMEM_PMDMAPPED,</div><div class='hunk'>@@ -202,18 +225,41 @@ enum node_stat_item {</div><div class='ctx'> 	NR_KERNEL_SCS_KB,	/* measured in KiB */</div><div class='ctx'> #endif</div><div class='ctx'> 	NR_PAGETABLE,		/* used for pagetables */</div><div class='del'>-	NR_SECONDARY_PAGETABLE, /* secondary pagetables, e.g. KVM pagetables */</div><div class='add'>+	NR_SECONDARY_PAGETABLE, /* secondary pagetables, KVM &amp; IOMMU */</div><div class='add'>+#ifdef CONFIG_IOMMU_SUPPORT</div><div class='add'>+	NR_IOMMU_PAGES,		/* # of pages allocated by IOMMU */</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_SWAP</div><div class='ctx'> 	NR_SWAPCACHE,</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_NUMA_BALANCING</div><div class='ctx'> 	PGPROMOTE_SUCCESS,	/* promote successfully */</div><div class='del'>-	PGPROMOTE_CANDIDATE,	/* candidate pages to promote */</div><div class='add'>+	/**</div><div class='add'>+	 * Candidate pages for promotion based on hint fault latency.  This</div><div class='add'>+	 * counter is used to control the promotion rate and adjust the hot</div><div class='add'>+	 * threshold.</div><div class='add'>+	 */</div><div class='add'>+	PGPROMOTE_CANDIDATE,</div><div class='add'>+	/**</div><div class='add'>+	 * Not rate-limited (NRL) candidate pages for those can be promoted</div><div class='add'>+	 * without considering hot threshold because of enough free pages in</div><div class='add'>+	 * fast-tier node.  These promotions bypass the regular hotness checks</div><div class='add'>+	 * and do NOT influence the promotion rate-limiter or</div><div class='add'>+	 * threshold-adjustment logic.</div><div class='add'>+	 * This is for statistics/monitoring purposes.</div><div class='add'>+	 */</div><div class='add'>+	PGPROMOTE_CANDIDATE_NRL,</div><div class='ctx'> #endif</div><div class='ctx'> 	/* PGDEMOTE_*: pages demoted */</div><div class='ctx'> 	PGDEMOTE_KSWAPD,</div><div class='ctx'> 	PGDEMOTE_DIRECT,</div><div class='ctx'> 	PGDEMOTE_KHUGEPAGED,</div><div class='add'>+	PGDEMOTE_PROACTIVE,</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+	NR_HUGETLB,</div><div class='add'>+#endif</div><div class='add'>+	NR_BALLOON_PAGES,</div><div class='add'>+	NR_KERNEL_FILE_PAGES,</div><div class='ctx'> 	NR_VM_NODE_STAT_ITEMS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -323,66 +369,88 @@ enum lruvec_flags {</div><div class='ctx'> #endif /* !__GENERATING_BOUNDS_H */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Evictable pages are divided into multiple generations. The youngest and the</div><div class='add'>+ * Evictable folios are divided into multiple generations. The youngest and the</div><div class='ctx'>  * oldest generation numbers, max_seq and min_seq, are monotonically increasing.</div><div class='ctx'>  * They form a sliding window of a variable size [MIN_NR_GENS, MAX_NR_GENS]. An</div><div class='ctx'>  * offset within MAX_NR_GENS, i.e., gen, indexes the LRU list of the</div><div class='ctx'>  * corresponding generation. The gen counter in folio-&gt;flags stores gen+1 while</div><div class='del'>- * a page is on one of lrugen-&gt;folios[]. Otherwise it stores 0.</div><div class='add'>+ * a folio is on one of lrugen-&gt;folios[]. Otherwise it stores 0.</div><div class='ctx'>  *</div><div class='del'>- * A page is added to the youngest generation on faulting. The aging needs to</div><div class='del'>- * check the accessed bit at least twice before handing this page over to the</div><div class='del'>- * eviction. The first check takes care of the accessed bit set on the initial</div><div class='del'>- * fault; the second check makes sure this page hasn't been used since then.</div><div class='del'>- * This process, AKA second chance, requires a minimum of two generations,</div><div class='del'>- * hence MIN_NR_GENS. And to maintain ABI compatibility with the active/inactive</div><div class='del'>- * LRU, e.g., /proc/vmstat, these two generations are considered active; the</div><div class='del'>- * rest of generations, if they exist, are considered inactive. See</div><div class='del'>- * lru_gen_is_active().</div><div class='add'>+ * After a folio is faulted in, the aging needs to check the accessed bit at</div><div class='add'>+ * least twice before handing this folio over to the eviction. The first check</div><div class='add'>+ * clears the accessed bit from the initial fault; the second check makes sure</div><div class='add'>+ * this folio hasn't been used since then. This process, AKA second chance,</div><div class='add'>+ * requires a minimum of two generations, hence MIN_NR_GENS. And to maintain ABI</div><div class='add'>+ * compatibility with the active/inactive LRU, e.g., /proc/vmstat, these two</div><div class='add'>+ * generations are considered active; the rest of generations, if they exist,</div><div class='add'>+ * are considered inactive. See lru_gen_is_active().</div><div class='ctx'>  *</div><div class='del'>- * PG_active is always cleared while a page is on one of lrugen-&gt;folios[] so</div><div class='del'>- * that the aging needs not to worry about it. And it's set again when a page</div><div class='del'>- * considered active is isolated for non-reclaiming purposes, e.g., migration.</div><div class='del'>- * See lru_gen_add_folio() and lru_gen_del_folio().</div><div class='add'>+ * PG_active is always cleared while a folio is on one of lrugen-&gt;folios[] so</div><div class='add'>+ * that the sliding window needs not to worry about it. And it's set again when</div><div class='add'>+ * a folio considered active is isolated for non-reclaiming purposes, e.g.,</div><div class='add'>+ * migration. See lru_gen_add_folio() and lru_gen_del_folio().</div><div class='ctx'>  *</div><div class='ctx'>  * MAX_NR_GENS is set to 4 so that the multi-gen LRU can support twice the</div><div class='ctx'>  * number of categories of the active/inactive LRU when keeping track of</div><div class='ctx'>  * accesses through page tables. This requires order_base_2(MAX_NR_GENS+1) bits</div><div class='del'>- * in folio-&gt;flags.</div><div class='add'>+ * in folio-&gt;flags, masked by LRU_GEN_MASK.</div><div class='ctx'>  */</div><div class='ctx'> #define MIN_NR_GENS		2U</div><div class='ctx'> #define MAX_NR_GENS		4U</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Each generation is divided into multiple tiers. A page accessed N times</div><div class='del'>- * through file descriptors is in tier order_base_2(N). A page in the first tier</div><div class='del'>- * (N=0,1) is marked by PG_referenced unless it was faulted in through page</div><div class='del'>- * tables or read ahead. A page in any other tier (N&gt;1) is marked by</div><div class='del'>- * PG_referenced and PG_workingset. This implies a minimum of two tiers is</div><div class='del'>- * supported without using additional bits in folio-&gt;flags.</div><div class='add'>+ * Each generation is divided into multiple tiers. A folio accessed N times</div><div class='add'>+ * through file descriptors is in tier order_base_2(N). A folio in the first</div><div class='add'>+ * tier (N=0,1) is marked by PG_referenced unless it was faulted in through page</div><div class='add'>+ * tables or read ahead. A folio in the last tier (MAX_NR_TIERS-1) is marked by</div><div class='add'>+ * PG_workingset. A folio in any other tier (1&lt;N&lt;5) between the first and last</div><div class='add'>+ * is marked by additional bits of LRU_REFS_WIDTH in folio-&gt;flags.</div><div class='ctx'>  *</div><div class='ctx'>  * In contrast to moving across generations which requires the LRU lock, moving</div><div class='ctx'>  * across tiers only involves atomic operations on folio-&gt;flags and therefore</div><div class='ctx'>  * has a negligible cost in the buffered access path. In the eviction path,</div><div class='del'>- * comparisons of refaulted/(evicted+protected) from the first tier and the</div><div class='del'>- * rest infer whether pages accessed multiple times through file descriptors</div><div class='del'>- * are statistically hot and thus worth protecting.</div><div class='add'>+ * comparisons of refaulted/(evicted+protected) from the first tier and the rest</div><div class='add'>+ * infer whether folios accessed multiple times through file descriptors are</div><div class='add'>+ * statistically hot and thus worth protecting.</div><div class='ctx'>  *</div><div class='ctx'>  * MAX_NR_TIERS is set to 4 so that the multi-gen LRU can support twice the</div><div class='ctx'>  * number of categories of the active/inactive LRU when keeping track of</div><div class='ctx'>  * accesses through file descriptors. This uses MAX_NR_TIERS-2 spare bits in</div><div class='del'>- * folio-&gt;flags.</div><div class='add'>+ * folio-&gt;flags, masked by LRU_REFS_MASK.</div><div class='ctx'>  */</div><div class='ctx'> #define MAX_NR_TIERS		4U</div><div class='ctx'> </div><div class='ctx'> #ifndef __GENERATING_BOUNDS_H</div><div class='ctx'> </div><div class='del'>-struct lruvec;</div><div class='del'>-struct page_vma_mapped_walk;</div><div class='del'>-</div><div class='ctx'> #define LRU_GEN_MASK		((BIT(LRU_GEN_WIDTH) - 1) &lt;&lt; LRU_GEN_PGOFF)</div><div class='ctx'> #define LRU_REFS_MASK		((BIT(LRU_REFS_WIDTH) - 1) &lt;&lt; LRU_REFS_PGOFF)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * For folios accessed multiple times through file descriptors,</div><div class='add'>+ * lru_gen_inc_refs() sets additional bits of LRU_REFS_WIDTH in folio-&gt;flags</div><div class='add'>+ * after PG_referenced, then PG_workingset after LRU_REFS_WIDTH. After all its</div><div class='add'>+ * bits are set, i.e., LRU_REFS_FLAGS|BIT(PG_workingset), a folio is lazily</div><div class='add'>+ * promoted into the second oldest generation in the eviction path. And when</div><div class='add'>+ * folio_inc_gen() does that, it clears LRU_REFS_FLAGS so that</div><div class='add'>+ * lru_gen_inc_refs() can start over. Note that for this case, LRU_REFS_MASK is</div><div class='add'>+ * only valid when PG_referenced is set.</div><div class='add'>+ *</div><div class='add'>+ * For folios accessed multiple times through page tables, folio_update_gen()</div><div class='add'>+ * from a page table walk or lru_gen_set_refs() from a rmap walk sets</div><div class='add'>+ * PG_referenced after the accessed bit is cleared for the first time.</div><div class='add'>+ * Thereafter, those two paths set PG_workingset and promote folios to the</div><div class='add'>+ * youngest generation. Like folio_inc_gen(), folio_update_gen() also clears</div><div class='add'>+ * PG_referenced. Note that for this case, LRU_REFS_MASK is not used.</div><div class='add'>+ *</div><div class='add'>+ * For both cases above, after PG_workingset is set on a folio, it remains until</div><div class='add'>+ * this folio is either reclaimed, or "deactivated" by lru_gen_clear_refs(). It</div><div class='add'>+ * can be set again if lru_gen_test_recent() returns true upon a refault.</div><div class='add'>+ */</div><div class='add'>+#define LRU_REFS_FLAGS		(LRU_REFS_MASK | BIT(PG_referenced))</div><div class='add'>+</div><div class='add'>+struct lruvec;</div><div class='add'>+struct page_vma_mapped_walk;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_LRU_GEN</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -410,12 +478,11 @@ enum {</div><div class='ctx'> /*</div><div class='ctx'>  * The youngest generation number is stored in max_seq for both anon and file</div><div class='ctx'>  * types as they are aged on an equal footing. The oldest generation numbers are</div><div class='del'>- * stored in min_seq[] separately for anon and file types as clean file pages</div><div class='del'>- * can be evicted regardless of swap constraints.</div><div class='del'>- *</div><div class='del'>- * Normally anon and file min_seq are in sync. But if swapping is constrained,</div><div class='del'>- * e.g., out of swap space, file min_seq is allowed to advance and leave anon</div><div class='del'>- * min_seq behind.</div><div class='add'>+ * stored in min_seq[] separately for anon and file types so that they can be</div><div class='add'>+ * incremented independently. Ideally min_seq[] are kept in sync when both anon</div><div class='add'>+ * and file types are evictable. However, to adapt to situations like extreme</div><div class='add'>+ * swappiness, they are allowed to be out of sync by at most</div><div class='add'>+ * MAX_NR_GENS-MIN_NR_GENS-1.</div><div class='ctx'>  *</div><div class='ctx'>  * The number of pages in each generation is eventually consistent and therefore</div><div class='ctx'>  * can be transiently negative when reset_batch_size() is pending.</div><div class='hunk'>@@ -435,8 +502,8 @@ struct lru_gen_folio {</div><div class='ctx'> 	unsigned long avg_refaulted[ANON_AND_FILE][MAX_NR_TIERS];</div><div class='ctx'> 	/* the exponential moving average of evicted+protected */</div><div class='ctx'> 	unsigned long avg_total[ANON_AND_FILE][MAX_NR_TIERS];</div><div class='del'>-	/* the first tier doesn't need protection, hence the minus one */</div><div class='del'>-	unsigned long protected[NR_HIST_GENS][ANON_AND_FILE][MAX_NR_TIERS - 1];</div><div class='add'>+	/* can only be modified under the LRU lock */</div><div class='add'>+	unsigned long protected[NR_HIST_GENS][ANON_AND_FILE][MAX_NR_TIERS];</div><div class='ctx'> 	/* can be modified without holding the LRU lock */</div><div class='ctx'> 	atomic_long_t evicted[NR_HIST_GENS][ANON_AND_FILE][MAX_NR_TIERS];</div><div class='ctx'> 	atomic_long_t refaulted[NR_HIST_GENS][ANON_AND_FILE][MAX_NR_TIERS];</div><div class='hunk'>@@ -452,9 +519,7 @@ struct lru_gen_folio {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	MM_LEAF_TOTAL,		/* total leaf entries */</div><div class='del'>-	MM_LEAF_OLD,		/* old leaf entries */</div><div class='ctx'> 	MM_LEAF_YOUNG,		/* young leaf entries */</div><div class='del'>-	MM_NONLEAF_TOTAL,	/* total non-leaf entries */</div><div class='ctx'> 	MM_NONLEAF_FOUND,	/* non-leaf entries found in Bloom filters */</div><div class='ctx'> 	MM_NONLEAF_ADDED,	/* non-leaf entries added to Bloom filters */</div><div class='ctx'> 	NR_MM_STATS</div><div class='hunk'>@@ -464,7 +529,7 @@ enum {</div><div class='ctx'> #define NR_BLOOM_FILTERS	2</div><div class='ctx'> </div><div class='ctx'> struct lru_gen_mm_state {</div><div class='del'>-	/* set to max_seq after each iteration */</div><div class='add'>+	/* synced with max_seq after each iteration */</div><div class='ctx'> 	unsigned long seq;</div><div class='ctx'> 	/* where the current iteration continues after */</div><div class='ctx'> 	struct list_head *head;</div><div class='hunk'>@@ -479,8 +544,8 @@ struct lru_gen_mm_state {</div><div class='ctx'> struct lru_gen_mm_walk {</div><div class='ctx'> 	/* the lruvec under reclaim */</div><div class='ctx'> 	struct lruvec *lruvec;</div><div class='del'>-	/* unstable max_seq from lru_gen_folio */</div><div class='del'>-	unsigned long max_seq;</div><div class='add'>+	/* max_seq from lru_gen_folio: can be out of date */</div><div class='add'>+	unsigned long seq;</div><div class='ctx'> 	/* the next address within an mm to scan */</div><div class='ctx'> 	unsigned long next_addr;</div><div class='ctx'> 	/* to batch promoted pages */</div><div class='hunk'>@@ -489,7 +554,7 @@ struct lru_gen_mm_walk {</div><div class='ctx'> 	int mm_stats[NR_MM_STATS];</div><div class='ctx'> 	/* total batched items */</div><div class='ctx'> 	int batched;</div><div class='del'>-	bool can_swap;</div><div class='add'>+	int swappiness;</div><div class='ctx'> 	bool force_scan;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -551,7 +616,7 @@ struct lru_gen_memcg {</div><div class='ctx'> </div><div class='ctx'> void lru_gen_init_pgdat(struct pglist_data *pgdat);</div><div class='ctx'> void lru_gen_init_lruvec(struct lruvec *lruvec);</div><div class='del'>-void lru_gen_look_around(struct page_vma_mapped_walk *pvmw);</div><div class='add'>+bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw);</div><div class='ctx'> </div><div class='ctx'> void lru_gen_init_memcg(struct mem_cgroup *memcg);</div><div class='ctx'> void lru_gen_exit_memcg(struct mem_cgroup *memcg);</div><div class='hunk'>@@ -570,8 +635,9 @@ static inline void lru_gen_init_lruvec(struct lruvec *lruvec)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void lru_gen_look_around(struct page_vma_mapped_walk *pvmw)</div><div class='add'>+static inline bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)</div><div class='ctx'> {</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void lru_gen_init_memcg(struct mem_cgroup *memcg)</div><div class='hunk'>@@ -648,24 +714,18 @@ enum zone_watermarks {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * One per migratetype for each PAGE_ALLOC_COSTLY_ORDER. One additional list</div><div class='del'>- * for THP which will usually be GFP_MOVABLE. Even if it is another type,</div><div class='del'>- * it should not contribute to serious fragmentation causing THP allocation</div><div class='del'>- * failures.</div><div class='add'>+ * One per migratetype for each PAGE_ALLOC_COSTLY_ORDER. Two additional lists</div><div class='add'>+ * are added for THP. One PCP list is used by GPF_MOVABLE, and the other PCP list</div><div class='add'>+ * is used by GFP_UNMOVABLE and GFP_RECLAIMABLE.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='del'>-#define NR_PCP_THP 1</div><div class='add'>+#define NR_PCP_THP 2</div><div class='ctx'> #else</div><div class='ctx'> #define NR_PCP_THP 0</div><div class='ctx'> #endif</div><div class='ctx'> #define NR_LOWORDER_PCP_LISTS (MIGRATE_PCPTYPES * (PAGE_ALLOC_COSTLY_ORDER + 1))</div><div class='ctx'> #define NR_PCP_LISTS (NR_LOWORDER_PCP_LISTS + NR_PCP_THP)</div><div class='ctx'> </div><div class='del'>-#define min_wmark_pages(z) (z-&gt;_watermark[WMARK_MIN] + z-&gt;watermark_boost)</div><div class='del'>-#define low_wmark_pages(z) (z-&gt;_watermark[WMARK_LOW] + z-&gt;watermark_boost)</div><div class='del'>-#define high_wmark_pages(z) (z-&gt;_watermark[WMARK_HIGH] + z-&gt;watermark_boost)</div><div class='del'>-#define wmark_pages(z, i) (z-&gt;_watermark[i] + z-&gt;watermark_boost)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Flags used in pcp-&gt;flags field.</div><div class='ctx'>  *</div><div class='hunk'>@@ -824,6 +884,7 @@ struct zone {</div><div class='ctx'> 	unsigned long watermark_boost;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long nr_reserved_highatomic;</div><div class='add'>+	unsigned long nr_free_highatomic;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't know if the memory that we're going to allocate will be</div><div class='hunk'>@@ -940,6 +1001,9 @@ struct zone {</div><div class='ctx'> #ifdef CONFIG_UNACCEPTED_MEMORY</div><div class='ctx'> 	/* Pages to be accepted. All pages on the list are MAX_PAGE_ORDER */</div><div class='ctx'> 	struct list_head	unaccepted_pages;</div><div class='add'>+</div><div class='add'>+	/* To be called once the last page in the zone is accepted */</div><div class='add'>+	struct work_struct	unaccepted_cleanup;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* zone flags, see below */</div><div class='hunk'>@@ -948,6 +1012,9 @@ struct zone {</div><div class='ctx'> 	/* Primarily protects free_area */</div><div class='ctx'> 	spinlock_t		lock;</div><div class='ctx'> </div><div class='add'>+	/* Pages to be freed when next trylock succeeds */</div><div class='add'>+	struct llist_head	trylock_free_pages;</div><div class='add'>+</div><div class='ctx'> 	/* Write-intensive fields used by compaction and vmstats. */</div><div class='ctx'> 	CACHELINE_PADDING(_pad2_);</div><div class='ctx'> </div><div class='hunk'>@@ -993,10 +1060,6 @@ struct zone {</div><div class='ctx'> } ____cacheline_internodealigned_in_smp;</div><div class='ctx'> </div><div class='ctx'> enum pgdat_flags {</div><div class='del'>-	PGDAT_DIRTY,			/* reclaim scanning has recently found</div><div class='del'>-					 * many dirty file pages at the tail</div><div class='del'>-					 * of the LRU.</div><div class='del'>-					 */</div><div class='ctx'> 	PGDAT_WRITEBACK,		/* reclaim scanning has recently found</div><div class='ctx'> 					 * many pages under writeback</div><div class='ctx'> 					 */</div><div class='hunk'>@@ -1011,7 +1074,33 @@ enum zone_flags {</div><div class='ctx'> 	ZONE_BELOW_HIGH,		/* zone is below high watermark. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline unsigned long zone_managed_pages(struct zone *zone)</div><div class='add'>+static inline unsigned long wmark_pages(const struct zone *z,</div><div class='add'>+					enum zone_watermarks w)</div><div class='add'>+{</div><div class='add'>+	return z-&gt;_watermark[w] + z-&gt;watermark_boost;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long min_wmark_pages(const struct zone *z)</div><div class='add'>+{</div><div class='add'>+	return wmark_pages(z, WMARK_MIN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long low_wmark_pages(const struct zone *z)</div><div class='add'>+{</div><div class='add'>+	return wmark_pages(z, WMARK_LOW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long high_wmark_pages(const struct zone *z)</div><div class='add'>+{</div><div class='add'>+	return wmark_pages(z, WMARK_HIGH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long promo_wmark_pages(const struct zone *z)</div><div class='add'>+{</div><div class='add'>+	return wmark_pages(z, WMARK_PROMO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long zone_managed_pages(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return (unsigned long)atomic_long_read(&amp;zone-&gt;managed_pages);</div><div class='ctx'> }</div><div class='hunk'>@@ -1035,12 +1124,12 @@ static inline bool zone_spans_pfn(const struct zone *zone, unsigned long pfn)</div><div class='ctx'> 	return zone-&gt;zone_start_pfn &lt;= pfn &amp;&amp; pfn &lt; zone_end_pfn(zone);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool zone_is_initialized(struct zone *zone)</div><div class='add'>+static inline bool zone_is_initialized(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return zone-&gt;initialized;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool zone_is_empty(struct zone *zone)</div><div class='add'>+static inline bool zone_is_empty(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return zone-&gt;spanned_pages == 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1091,21 +1180,32 @@ static inline bool zone_is_empty(struct zone *zone)</div><div class='ctx'> #define KASAN_TAG_MASK		((1UL &lt;&lt; KASAN_TAG_WIDTH) - 1)</div><div class='ctx'> #define ZONEID_MASK		((1UL &lt;&lt; ZONEID_SHIFT) - 1)</div><div class='ctx'> </div><div class='add'>+static inline enum zone_type memdesc_zonenum(memdesc_flags_t flags)</div><div class='add'>+{</div><div class='add'>+	ASSERT_EXCLUSIVE_BITS(flags.f, ZONES_MASK &lt;&lt; ZONES_PGSHIFT);</div><div class='add'>+	return (flags.f &gt;&gt; ZONES_PGSHIFT) &amp; ZONES_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline enum zone_type page_zonenum(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	ASSERT_EXCLUSIVE_BITS(page-&gt;flags, ZONES_MASK &lt;&lt; ZONES_PGSHIFT);</div><div class='del'>-	return (page-&gt;flags &gt;&gt; ZONES_PGSHIFT) &amp; ZONES_MASK;</div><div class='add'>+	return memdesc_zonenum(page-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline enum zone_type folio_zonenum(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return page_zonenum(&amp;folio-&gt;page);</div><div class='add'>+	return memdesc_zonenum(folio-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ZONE_DEVICE</div><div class='del'>-static inline bool is_zone_device_page(const struct page *page)</div><div class='add'>+static inline bool memdesc_is_zone_device(memdesc_flags_t mdf)</div><div class='add'>+{</div><div class='add'>+	return memdesc_zonenum(mdf) == ZONE_DEVICE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct dev_pagemap *page_pgmap(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return page_zonenum(page) == ZONE_DEVICE;</div><div class='add'>+	VM_WARN_ON_ONCE_PAGE(!memdesc_is_zone_device(page-&gt;flags), page);</div><div class='add'>+	return page_folio(page)-&gt;pgmap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1119,17 +1219,17 @@ static inline bool is_zone_device_page(const struct page *page)</div><div class='ctx'> static inline bool zone_device_pages_have_same_pgmap(const struct page *a,</div><div class='ctx'> 						     const struct page *b)</div><div class='ctx'> {</div><div class='del'>-	if (is_zone_device_page(a) != is_zone_device_page(b))</div><div class='add'>+	if (memdesc_is_zone_device(a-&gt;flags) != memdesc_is_zone_device(b-&gt;flags))</div><div class='ctx'> 		return false;</div><div class='del'>-	if (!is_zone_device_page(a))</div><div class='add'>+	if (!memdesc_is_zone_device(a-&gt;flags))</div><div class='ctx'> 		return true;</div><div class='del'>-	return a-&gt;pgmap == b-&gt;pgmap;</div><div class='add'>+	return page_pgmap(a) == page_pgmap(b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void memmap_init_zone_device(struct zone *, unsigned long,</div><div class='ctx'> 				    unsigned long, struct dev_pagemap *);</div><div class='ctx'> #else</div><div class='del'>-static inline bool is_zone_device_page(const struct page *page)</div><div class='add'>+static inline bool memdesc_is_zone_device(memdesc_flags_t mdf)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -1138,11 +1238,20 @@ static inline bool zone_device_pages_have_same_pgmap(const struct page *a,</div><div class='ctx'> {</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='add'>+static inline struct dev_pagemap *page_pgmap(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static inline bool is_zone_device_page(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return memdesc_is_zone_device(page-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool folio_is_zone_device(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return is_zone_device_page(&amp;folio-&gt;page);</div><div class='add'>+	return memdesc_is_zone_device(folio-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_zone_movable_page(const struct page *page)</div><div class='hunk'>@@ -1160,7 +1269,7 @@ static inline bool folio_is_zone_movable(const struct folio *folio)</div><div class='ctx'>  * Return true if [start_pfn, start_pfn + nr_pages) range has a non-empty</div><div class='ctx'>  * intersection with the given zone</div><div class='ctx'>  */</div><div class='del'>-static inline bool zone_intersects(struct zone *zone,</div><div class='add'>+static inline bool zone_intersects(const struct zone *zone,</div><div class='ctx'> 		unsigned long start_pfn, unsigned long nr_pages)</div><div class='ctx'> {</div><div class='ctx'> 	if (zone_is_empty(zone))</div><div class='hunk'>@@ -1327,7 +1436,7 @@ typedef struct pglist_data {</div><div class='ctx'> 	int kswapd_order;</div><div class='ctx'> 	enum zone_type kswapd_highest_zoneidx;</div><div class='ctx'> </div><div class='del'>-	int kswapd_failures;		/* Number of 'reclaimed == 0' runs */</div><div class='add'>+	atomic_t kswapd_failures;	/* Number of 'reclaimed == 0' runs */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPACTION</div><div class='ctx'> 	int kcompactd_max_order;</div><div class='hunk'>@@ -1433,8 +1542,6 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark,</div><div class='ctx'> bool zone_watermark_ok(struct zone *z, unsigned int order,</div><div class='ctx'> 		unsigned long mark, int highest_zoneidx,</div><div class='ctx'> 		unsigned int alloc_flags);</div><div class='del'>-bool zone_watermark_ok_safe(struct zone *z, unsigned int order,</div><div class='del'>-		unsigned long mark, int highest_zoneidx);</div><div class='ctx'> /*</div><div class='ctx'>  * Memory initialization context, use to differentiate memory added by</div><div class='ctx'>  * the platform statically or via memory hotplug interface.</div><div class='hunk'>@@ -1470,12 +1577,12 @@ static inline int local_memory_node(int node_id) { return node_id; };</div><div class='ctx'> #define zone_idx(zone)		((zone) - (zone)-&gt;zone_pgdat-&gt;node_zones)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ZONE_DEVICE</div><div class='del'>-static inline bool zone_is_zone_device(struct zone *zone)</div><div class='add'>+static inline bool zone_is_zone_device(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return zone_idx(zone) == ZONE_DEVICE;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline bool zone_is_zone_device(struct zone *zone)</div><div class='add'>+static inline bool zone_is_zone_device(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -1487,19 +1594,19 @@ static inline bool zone_is_zone_device(struct zone *zone)</div><div class='ctx'>  * populated_zone(). If the whole zone is reserved then we can easily</div><div class='ctx'>  * end up with populated_zone() &amp;&amp; !managed_zone().</div><div class='ctx'>  */</div><div class='del'>-static inline bool managed_zone(struct zone *zone)</div><div class='add'>+static inline bool managed_zone(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return zone_managed_pages(zone);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns true if a zone has memory */</div><div class='del'>-static inline bool populated_zone(struct zone *zone)</div><div class='add'>+static inline bool populated_zone(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return zone-&gt;present_pages;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='del'>-static inline int zone_to_nid(struct zone *zone)</div><div class='add'>+static inline int zone_to_nid(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return zone-&gt;node;</div><div class='ctx'> }</div><div class='hunk'>@@ -1509,7 +1616,7 @@ static inline void zone_set_nid(struct zone *zone, int nid)</div><div class='ctx'> 	zone-&gt;node = nid;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline int zone_to_nid(struct zone *zone)</div><div class='add'>+static inline int zone_to_nid(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1536,7 +1643,7 @@ static inline int is_highmem_idx(enum zone_type idx)</div><div class='ctx'>  * @zone: pointer to struct zone variable</div><div class='ctx'>  * Return: 1 for a highmem zone, 0 otherwise</div><div class='ctx'>  */</div><div class='del'>-static inline int is_highmem(struct zone *zone)</div><div class='add'>+static inline int is_highmem(const struct zone *zone)</div><div class='ctx'> {</div><div class='ctx'> 	return is_highmem_idx(zone_idx(zone));</div><div class='ctx'> }</div><div class='hunk'>@@ -1602,12 +1709,12 @@ static inline struct zone *zonelist_zone(struct zoneref *zoneref)</div><div class='ctx'> 	return zoneref-&gt;zone;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int zonelist_zone_idx(struct zoneref *zoneref)</div><div class='add'>+static inline int zonelist_zone_idx(const struct zoneref *zoneref)</div><div class='ctx'> {</div><div class='ctx'> 	return zoneref-&gt;zone_idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int zonelist_node_idx(struct zoneref *zoneref)</div><div class='add'>+static inline int zonelist_node_idx(const struct zoneref *zoneref)</div><div class='ctx'> {</div><div class='ctx'> 	return zone_to_nid(zoneref-&gt;zone);</div><div class='ctx'> }</div><div class='hunk'>@@ -1683,7 +1790,7 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,</div><div class='ctx'> 			zone = zonelist_zone(z))</div><div class='ctx'> </div><div class='ctx'> #define for_next_zone_zonelist_nodemask(zone, z, highidx, nodemask) \</div><div class='del'>-	for (zone = z-&gt;zone;	\</div><div class='add'>+	for (zone = zonelist_zone(z);	\</div><div class='ctx'> 		zone;							\</div><div class='ctx'> 		z = next_zones_zonelist(++z, highidx, nodemask),	\</div><div class='ctx'> 			zone = zonelist_zone(z))</div><div class='hunk'>@@ -1719,7 +1826,7 @@ static inline bool movable_only_nodes(nodemask_t *nodes)</div><div class='ctx'> 	nid = first_node(*nodes);</div><div class='ctx'> 	zonelist = &amp;NODE_DATA(nid)-&gt;node_zonelists[ZONELIST_FALLBACK];</div><div class='ctx'> 	z = first_zones_zonelist(zonelist, ZONE_NORMAL,	nodes);</div><div class='del'>-	return (!z-&gt;zone) ? true : false;</div><div class='add'>+	return (!zonelist_zone(z)) ? true : false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1884,6 +1991,9 @@ enum {</div><div class='ctx'> #ifdef CONFIG_ZONE_DEVICE</div><div class='ctx'> 	SECTION_TAINT_ZONE_DEVICE_BIT,</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT</div><div class='add'>+	SECTION_IS_VMEMMAP_PREINIT_BIT,</div><div class='add'>+#endif</div><div class='ctx'> 	SECTION_MAP_LAST_BIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1894,6 +2004,9 @@ enum {</div><div class='ctx'> #ifdef CONFIG_ZONE_DEVICE</div><div class='ctx'> #define SECTION_TAINT_ZONE_DEVICE	BIT(SECTION_TAINT_ZONE_DEVICE_BIT)</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT</div><div class='add'>+#define SECTION_IS_VMEMMAP_PREINIT	BIT(SECTION_IS_VMEMMAP_PREINIT_BIT)</div><div class='add'>+#endif</div><div class='ctx'> #define SECTION_MAP_MASK		(~(BIT(SECTION_MAP_LAST_BIT) - 1))</div><div class='ctx'> #define SECTION_NID_SHIFT		SECTION_MAP_LAST_BIT</div><div class='ctx'> </div><div class='hunk'>@@ -1904,7 +2017,7 @@ static inline struct page *__section_mem_map_addr(struct mem_section *section)</div><div class='ctx'> 	return (struct page *)map;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int present_section(struct mem_section *section)</div><div class='add'>+static inline int present_section(const struct mem_section *section)</div><div class='ctx'> {</div><div class='ctx'> 	return (section &amp;&amp; (section-&gt;section_mem_map &amp; SECTION_MARKED_PRESENT));</div><div class='ctx'> }</div><div class='hunk'>@@ -1914,12 +2027,12 @@ static inline int present_section_nr(unsigned long nr)</div><div class='ctx'> 	return present_section(__nr_to_section(nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int valid_section(struct mem_section *section)</div><div class='add'>+static inline int valid_section(const struct mem_section *section)</div><div class='ctx'> {</div><div class='ctx'> 	return (section &amp;&amp; (section-&gt;section_mem_map &amp; SECTION_HAS_MEM_MAP));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int early_section(struct mem_section *section)</div><div class='add'>+static inline int early_section(const struct mem_section *section)</div><div class='ctx'> {</div><div class='ctx'> 	return (section &amp;&amp; (section-&gt;section_mem_map &amp; SECTION_IS_EARLY));</div><div class='ctx'> }</div><div class='hunk'>@@ -1929,25 +2042,49 @@ static inline int valid_section_nr(unsigned long nr)</div><div class='ctx'> 	return valid_section(__nr_to_section(nr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int online_section(struct mem_section *section)</div><div class='add'>+static inline int online_section(const struct mem_section *section)</div><div class='ctx'> {</div><div class='ctx'> 	return (section &amp;&amp; (section-&gt;section_mem_map &amp; SECTION_IS_ONLINE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ZONE_DEVICE</div><div class='del'>-static inline int online_device_section(struct mem_section *section)</div><div class='add'>+static inline int online_device_section(const struct mem_section *section)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags = SECTION_IS_ONLINE | SECTION_TAINT_ZONE_DEVICE;</div><div class='ctx'> </div><div class='ctx'> 	return section &amp;&amp; ((section-&gt;section_mem_map &amp; flags) == flags);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline int online_device_section(struct mem_section *section)</div><div class='add'>+static inline int online_device_section(const struct mem_section *section)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT</div><div class='add'>+static inline int preinited_vmemmap_section(const struct mem_section *section)</div><div class='add'>+{</div><div class='add'>+	return (section &amp;&amp;</div><div class='add'>+		(section-&gt;section_mem_map &amp; SECTION_IS_VMEMMAP_PREINIT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sparse_vmemmap_init_nid_early(int nid);</div><div class='add'>+void sparse_vmemmap_init_nid_late(int nid);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline int preinited_vmemmap_section(const struct mem_section *section)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void sparse_vmemmap_init_nid_early(int nid)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sparse_vmemmap_init_nid_late(int nid)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline int online_section_nr(unsigned long nr)</div><div class='ctx'> {</div><div class='ctx'> 	return online_section(__nr_to_section(nr));</div><div class='hunk'>@@ -1974,16 +2111,46 @@ static inline int subsection_map_index(unsigned long pfn)</div><div class='ctx'> static inline int pfn_section_valid(struct mem_section *ms, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	int idx = subsection_map_index(pfn);</div><div class='add'>+	struct mem_section_usage *usage = READ_ONCE(ms-&gt;usage);</div><div class='ctx'> </div><div class='del'>-	return test_bit(idx, READ_ONCE(ms-&gt;usage)-&gt;subsection_map);</div><div class='add'>+	return usage ? test_bit(idx, usage-&gt;subsection_map) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pfn_section_first_valid(struct mem_section *ms, unsigned long *pfn)</div><div class='add'>+{</div><div class='add'>+	struct mem_section_usage *usage = READ_ONCE(ms-&gt;usage);</div><div class='add'>+	int idx = subsection_map_index(*pfn);</div><div class='add'>+	unsigned long bit;</div><div class='add'>+</div><div class='add'>+	if (!usage)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (test_bit(idx, usage-&gt;subsection_map))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Find the next subsection that exists */</div><div class='add'>+	bit = find_next_bit(usage-&gt;subsection_map, SUBSECTIONS_PER_SECTION, idx);</div><div class='add'>+	if (bit == SUBSECTIONS_PER_SECTION)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	*pfn = (*pfn &amp; PAGE_SECTION_MASK) + (bit * PAGES_PER_SUBSECTION);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline int pfn_section_valid(struct mem_section *ms, unsigned long pfn)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline bool pfn_section_first_valid(struct mem_section *ms, unsigned long *pfn)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+void sparse_init_early_section(int nid, struct page *map, unsigned long pnum,</div><div class='add'>+			       unsigned long flags);</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_HAVE_ARCH_PFN_VALID</div><div class='ctx'> /**</div><div class='ctx'>  * pfn_valid - check if there is a valid memory map entry for a PFN</div><div class='hunk'>@@ -2027,6 +2194,58 @@ static inline int pfn_valid(unsigned long pfn)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Returns end_pfn or higher if no valid PFN remaining in range */</div><div class='add'>+static inline unsigned long first_valid_pfn(unsigned long pfn, unsigned long end_pfn)</div><div class='add'>+{</div><div class='add'>+	unsigned long nr = pfn_to_section_nr(pfn);</div><div class='add'>+</div><div class='add'>+	rcu_read_lock_sched();</div><div class='add'>+</div><div class='add'>+	while (nr &lt;= __highest_present_section_nr &amp;&amp; pfn &lt; end_pfn) {</div><div class='add'>+		struct mem_section *ms = __pfn_to_section(pfn);</div><div class='add'>+</div><div class='add'>+		if (valid_section(ms) &amp;&amp;</div><div class='add'>+		    (early_section(ms) || pfn_section_first_valid(ms, &amp;pfn))) {</div><div class='add'>+			rcu_read_unlock_sched();</div><div class='add'>+			return pfn;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Nothing left in this section? Skip to next section */</div><div class='add'>+		nr++;</div><div class='add'>+		pfn = section_nr_to_pfn(nr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock_sched();</div><div class='add'>+	return end_pfn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long next_valid_pfn(unsigned long pfn, unsigned long end_pfn)</div><div class='add'>+{</div><div class='add'>+	pfn++;</div><div class='add'>+</div><div class='add'>+	if (pfn &gt;= end_pfn)</div><div class='add'>+		return end_pfn;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Either every PFN within the section (or subsection for VMEMMAP) is</div><div class='add'>+	 * valid, or none of them are. So there's no point repeating the check</div><div class='add'>+	 * for every PFN; only call first_valid_pfn() again when crossing a</div><div class='add'>+	 * (sub)section boundary (i.e. !(pfn &amp; ~PAGE_{SUB,}SECTION_MASK)).</div><div class='add'>+	 */</div><div class='add'>+	if (pfn &amp; ~(IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP) ?</div><div class='add'>+		   PAGE_SUBSECTION_MASK : PAGE_SECTION_MASK))</div><div class='add'>+		return pfn;</div><div class='add'>+</div><div class='add'>+	return first_valid_pfn(pfn, end_pfn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define for_each_valid_pfn(_pfn, _start_pfn, _end_pfn)			\</div><div class='add'>+	for ((_pfn) = first_valid_pfn((_start_pfn), (_end_pfn));	\</div><div class='add'>+	     (_pfn) &lt; (_end_pfn);					\</div><div class='add'>+	     (_pfn) = next_valid_pfn((_pfn), (_end_pfn)))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline int pfn_in_present_section(unsigned long pfn)</div><div class='hunk'>@@ -2046,6 +2265,11 @@ static inline unsigned long next_present_section_nr(unsigned long section_nr)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define for_each_present_section_nr(start, section_nr)		\</div><div class='add'>+	for (section_nr = next_present_section_nr(start - 1);	\</div><div class='add'>+	     section_nr != -1;					\</div><div class='add'>+	     section_nr = next_present_section_nr(section_nr))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These are _only_ used during initialisation, therefore they</div><div class='ctx'>  * can use __initdata ...  They could have names to indicate</div><div class='hunk'>@@ -2065,10 +2289,22 @@ void sparse_init(void);</div><div class='ctx'> #else</div><div class='ctx'> #define sparse_init()	do {} while (0)</div><div class='ctx'> #define sparse_index_init(_sec, _nid)  do {} while (0)</div><div class='add'>+#define sparse_vmemmap_init_nid_early(_nid, _use) do {} while (0)</div><div class='add'>+#define sparse_vmemmap_init_nid_late(_nid) do {} while (0)</div><div class='ctx'> #define pfn_in_present_section pfn_valid</div><div class='ctx'> #define subsection_map_init(_pfn, _nr_pages) do {} while (0)</div><div class='ctx'> #endif /* CONFIG_SPARSEMEM */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Fallback case for when the architecture provides its own pfn_valid() but</div><div class='add'>+ * not a corresponding for_each_valid_pfn().</div><div class='add'>+ */</div><div class='add'>+#ifndef for_each_valid_pfn</div><div class='add'>+#define for_each_valid_pfn(_pfn, _start_pfn, _end_pfn)			\</div><div class='add'>+	for ((_pfn) = (_start_pfn); (_pfn) &lt; (_end_pfn); (_pfn)++)	\</div><div class='add'>+		if (pfn_valid(_pfn))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* !__GENERATING_BOUNDS.H */</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> #endif /* _LINUX_MMZONE_H */</div><div class='head'>diff --git a/include/linux/mnt_idmapping.h b/include/linux/mnt_idmapping.h<br/>index cd4d5c8781f5..e71a6070a8f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mnt_idmapping.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mnt_idmapping.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mnt_idmapping.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mnt_idmapping.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@ struct mnt_idmap;</div><div class='ctx'> struct user_namespace;</div><div class='ctx'> </div><div class='ctx'> extern struct mnt_idmap nop_mnt_idmap;</div><div class='add'>+extern struct mnt_idmap invalid_mnt_idmap;</div><div class='ctx'> extern struct user_namespace init_user_ns;</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='hunk'>@@ -24,6 +25,11 @@ static_assert(sizeof(vfsgid_t) == sizeof(kgid_t));</div><div class='ctx'> static_assert(offsetof(vfsuid_t, val) == offsetof(kuid_t, val));</div><div class='ctx'> static_assert(offsetof(vfsgid_t, val) == offsetof(kgid_t, val));</div><div class='ctx'> </div><div class='add'>+static inline bool is_valid_mnt_idmap(const struct mnt_idmap *idmap)</div><div class='add'>+{</div><div class='add'>+	return idmap != &amp;nop_mnt_idmap &amp;&amp; idmap != &amp;invalid_mnt_idmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MULTIUSER</div><div class='ctx'> static inline uid_t __vfsuid_val(vfsuid_t uid)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h<br/>index 8f882f5881e8..0acd1089d149 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mnt_namespace.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mnt_namespace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mnt_namespace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mnt_namespace.h</a></div><div class='hunk'>@@ -3,14 +3,20 @@</div><div class='ctx'> #define _NAMESPACE_H_</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+</div><div class='ctx'> struct mnt_namespace;</div><div class='ctx'> struct fs_struct;</div><div class='ctx'> struct user_namespace;</div><div class='ctx'> struct ns_common;</div><div class='ctx'> </div><div class='del'>-extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,</div><div class='add'>+extern struct mnt_namespace init_mnt_ns;</div><div class='add'>+</div><div class='add'>+extern struct mnt_namespace *copy_mnt_ns(u64, struct mnt_namespace *,</div><div class='ctx'> 		struct user_namespace *, struct fs_struct *);</div><div class='ctx'> extern void put_mnt_ns(struct mnt_namespace *ns);</div><div class='add'>+DEFINE_FREE(put_mnt_ns, struct mnt_namespace *, if (!IS_ERR_OR_NULL(_T)) put_mnt_ns(_T))</div><div class='ctx'> extern struct ns_common *from_mnt_ns(struct mnt_namespace *);</div><div class='ctx'> </div><div class='ctx'> extern const struct file_operations proc_mounts_operations;</div><div class='head'>diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h<br/>index 7a9a07ea451b..24eb5a88a5c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mod_devicetable.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mod_devicetable.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mod_devicetable.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mod_devicetable.h</a></div><div class='hunk'>@@ -340,7 +340,7 @@ struct pcmcia_device_id {</div><div class='ctx'> #define INPUT_DEVICE_ID_LED_MAX		0x0f</div><div class='ctx'> #define INPUT_DEVICE_ID_SND_MAX		0x07</div><div class='ctx'> #define INPUT_DEVICE_ID_FF_MAX		0x7f</div><div class='del'>-#define INPUT_DEVICE_ID_SW_MAX		0x10</div><div class='add'>+#define INPUT_DEVICE_ID_SW_MAX		0x11</div><div class='ctx'> #define INPUT_DEVICE_ID_PROP_MAX	0x1f</div><div class='ctx'> </div><div class='ctx'> #define INPUT_DEVICE_ID_MATCH_BUS	1</div><div class='hunk'>@@ -601,7 +601,7 @@ struct dmi_system_id {</div><div class='ctx'> #define DMI_MATCH(a, b)	{ .slot = a, .substr = b }</div><div class='ctx'> #define DMI_EXACT_MATCH(a, b)	{ .slot = a, .substr = b, .exact_match = 1 }</div><div class='ctx'> </div><div class='del'>-#define PLATFORM_NAME_SIZE	20</div><div class='add'>+#define PLATFORM_NAME_SIZE	24</div><div class='ctx'> #define PLATFORM_MODULE_PREFIX	"platform:"</div><div class='ctx'> </div><div class='ctx'> struct platform_device_id {</div><div class='hunk'>@@ -690,6 +690,9 @@ struct x86_cpu_id {</div><div class='ctx'> 	__u16 model;</div><div class='ctx'> 	__u16 steppings;</div><div class='ctx'> 	__u16 feature;	/* bit index */</div><div class='add'>+	/* Solely for kernel-internal use: DO NOT EXPORT to userspace! */</div><div class='add'>+	__u16 flags;</div><div class='add'>+	__u8  type;</div><div class='ctx'> 	kernel_ulong_t driver_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -698,7 +701,10 @@ struct x86_cpu_id {</div><div class='ctx'> #define X86_FAMILY_ANY 0</div><div class='ctx'> #define X86_MODEL_ANY  0</div><div class='ctx'> #define X86_STEPPING_ANY 0</div><div class='add'>+#define X86_STEP_MIN 0</div><div class='add'>+#define X86_STEP_MAX 0xf</div><div class='ctx'> #define X86_FEATURE_ANY 0	/* Same as FPU, you can't test for that */</div><div class='add'>+#define X86_CPU_TYPE_ANY 0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generic table type for matching CPU features.</div><div class='hunk'>@@ -861,7 +867,7 @@ struct mhi_device_id {</div><div class='ctx'> 	kernel_ulong_t driver_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define AUXILIARY_NAME_SIZE 32</div><div class='add'>+#define AUXILIARY_NAME_SIZE 40</div><div class='ctx'> #define AUXILIARY_MODULE_PREFIX "auxiliary:"</div><div class='ctx'> </div><div class='ctx'> struct auxiliary_device_id {</div><div class='head'>diff --git a/include/linux/module.h b/include/linux/module.h<br/>index 1153b0d99a80..d80c3ea57472 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/module.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/module.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/module.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/module.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/buildid.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='hunk'>@@ -32,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;asm/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MODULE_NAME_LEN MAX_PARAM_PREFIX_LEN</div><div class='add'>+#define MODULE_NAME_LEN __MODULE_NAME_LEN</div><div class='ctx'> </div><div class='ctx'> struct modversion_info {</div><div class='ctx'> 	unsigned long crc;</div><div class='hunk'>@@ -52,9 +53,9 @@ struct module_kobject {</div><div class='ctx'> </div><div class='ctx'> struct module_attribute {</div><div class='ctx'> 	struct attribute attr;</div><div class='del'>-	ssize_t (*show)(struct module_attribute *, struct module_kobject *,</div><div class='add'>+	ssize_t (*show)(const struct module_attribute *, struct module_kobject *,</div><div class='ctx'> 			char *);</div><div class='del'>-	ssize_t (*store)(struct module_attribute *, struct module_kobject *,</div><div class='add'>+	ssize_t (*store)(const struct module_attribute *, struct module_kobject *,</div><div class='ctx'> 			 const char *, size_t count);</div><div class='ctx'> 	void (*setup)(struct module *, const char *);</div><div class='ctx'> 	int (*test)(struct module *);</div><div class='hunk'>@@ -67,10 +68,10 @@ struct module_version_attribute {</div><div class='ctx'> 	const char *version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern ssize_t __modver_version_show(struct module_attribute *,</div><div class='add'>+extern ssize_t __modver_version_show(const struct module_attribute *,</div><div class='ctx'> 				     struct module_kobject *, char *);</div><div class='ctx'> </div><div class='del'>-extern struct module_attribute module_uevent;</div><div class='add'>+extern const struct module_attribute module_uevent;</div><div class='ctx'> </div><div class='ctx'> /* These are either module local, or the kernel's dummy ones. */</div><div class='ctx'> extern int init_module(void);</div><div class='hunk'>@@ -162,8 +163,7 @@ extern void cleanup_module(void);</div><div class='ctx'> #define __INITRODATA_OR_MODULE __INITRODATA</div><div class='ctx'> #endif /*CONFIG_MODULES*/</div><div class='ctx'> </div><div class='del'>-/* Generic info of form tag = "info" */</div><div class='del'>-#define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)</div><div class='add'>+struct module_kobject *lookup_or_create_module_kobject(const char *name);</div><div class='ctx'> </div><div class='ctx'> /* For userspace: you can also call me... */</div><div class='ctx'> #define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)</div><div class='hunk'>@@ -174,6 +174,12 @@ extern void cleanup_module(void);</div><div class='ctx'> #define MODULE_SOFTDEP(_softdep) MODULE_INFO(softdep, _softdep)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Weak module dependencies. See man modprobe.d for details.</div><div class='add'>+ * Example: MODULE_WEAKDEP("module-foo")</div><div class='add'>+ */</div><div class='add'>+#define MODULE_WEAKDEP(_weakdep) MODULE_INFO(weakdep, _weakdep)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * MODULE_FILE is used for generating modules.builtin</div><div class='ctx'>  * So, make it no-op when this is being built as a module</div><div class='ctx'>  */</div><div class='hunk'>@@ -238,14 +244,23 @@ extern void cleanup_module(void);</div><div class='ctx'> /* What your module does. */</div><div class='ctx'> #define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='add'>+/*</div><div class='add'>+ * Format: __mod_device_table__kmod_&lt;modname&gt;__&lt;type&gt;__&lt;name&gt;</div><div class='add'>+ * Parts of the string `__kmod_` and `__` are used as delimiters when parsing</div><div class='add'>+ * a symbol in file2alias.c</div><div class='add'>+ */</div><div class='add'>+#define __mod_device_table(type, name)	\</div><div class='add'>+	__PASTE(__mod_device_table__,	\</div><div class='add'>+	__PASTE(kmod_,			\</div><div class='add'>+	__PASTE(__KBUILD_MODNAME,	\</div><div class='add'>+	__PASTE(__,			\</div><div class='add'>+	__PASTE(type,			\</div><div class='add'>+	__PASTE(__, name))))))</div><div class='add'>+</div><div class='ctx'> /* Creates an alias so file2alias.c can find device table. */</div><div class='ctx'> #define MODULE_DEVICE_TABLE(type, name)					\</div><div class='del'>-extern typeof(name) __mod_##type##__##name##_device_table		\</div><div class='del'>-  __attribute__ ((unused, alias(__stringify(name))))</div><div class='del'>-#else  /* !MODULE */</div><div class='del'>-#define MODULE_DEVICE_TABLE(type, name)</div><div class='del'>-#endif</div><div class='add'>+static typeof(name) __mod_device_table(type, name)			\</div><div class='add'>+  __attribute__ ((used, alias(__stringify(name))))</div><div class='ctx'> </div><div class='ctx'> /* Version of form [&lt;epoch&gt;:]&lt;version&gt;[-&lt;extra-version&gt;].</div><div class='ctx'>  * Or for CVS/RCS ID version, everything but the number is stripped.</div><div class='hunk'>@@ -269,7 +284,7 @@ extern typeof(name) __mod_##type##__##name##_device_table		\</div><div class='ctx'> #else</div><div class='ctx'> #define MODULE_VERSION(_version)					\</div><div class='ctx'> 	MODULE_INFO(version, _version);					\</div><div class='del'>-	static struct module_version_attribute __modver_attr		\</div><div class='add'>+	static const struct module_version_attribute __modver_attr	\</div><div class='ctx'> 		__used __section("__modver")				\</div><div class='ctx'> 		__aligned(__alignof__(struct module_version_attribute)) \</div><div class='ctx'> 		= {							\</div><div class='hunk'>@@ -290,25 +305,10 @@ extern typeof(name) __mod_##type##__##name##_device_table		\</div><div class='ctx'>  * files require multiple MODULE_FIRMWARE() specifiers */</div><div class='ctx'> #define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)</div><div class='ctx'> </div><div class='del'>-#define MODULE_IMPORT_NS(ns)	MODULE_INFO(import_ns, __stringify(ns))</div><div class='add'>+#define MODULE_IMPORT_NS(ns)	MODULE_INFO(import_ns, ns)</div><div class='ctx'> </div><div class='ctx'> struct notifier_block;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MODULES</div><div class='del'>-</div><div class='del'>-extern int modules_disabled; /* for sysctl */</div><div class='del'>-/* Get/put a kernel symbol (calls must be symmetric) */</div><div class='del'>-void *__symbol_get(const char *symbol);</div><div class='del'>-void *__symbol_get_gpl(const char *symbol);</div><div class='del'>-#define symbol_get(x) ((typeof(&amp;x))(__symbol_get(__stringify(x))))</div><div class='del'>-</div><div class='del'>-/* modules using other modules: kdb wants to see this. */</div><div class='del'>-struct module_use {</div><div class='del'>-	struct list_head source_list;</div><div class='del'>-	struct list_head target_list;</div><div class='del'>-	struct module *source, *target;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum module_state {</div><div class='ctx'> 	MODULE_STATE_LIVE,	/* Normal state. */</div><div class='ctx'> 	MODULE_STATE_COMING,	/* Full formed, running module_init. */</div><div class='hunk'>@@ -361,6 +361,7 @@ enum mod_mem_type {</div><div class='ctx'> </div><div class='ctx'> struct module_memory {</div><div class='ctx'> 	void *base;</div><div class='add'>+	bool is_rox;</div><div class='ctx'> 	unsigned int size;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MODULES_TREE_LOOKUP</div><div class='hunk'>@@ -422,7 +423,7 @@ struct module {</div><div class='ctx'> </div><div class='ctx'> 	/* Exported symbols */</div><div class='ctx'> 	const struct kernel_symbol *syms;</div><div class='del'>-	const s32 *crcs;</div><div class='add'>+	const u32 *crcs;</div><div class='ctx'> 	unsigned int num_syms;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_USES_CFI_TRAPS</div><div class='hunk'>@@ -440,7 +441,7 @@ struct module {</div><div class='ctx'> 	/* GPL-only exported symbols. */</div><div class='ctx'> 	unsigned int num_gpl_syms;</div><div class='ctx'> 	const struct kernel_symbol *gpl_syms;</div><div class='del'>-	const s32 *gpl_crcs;</div><div class='add'>+	const u32 *gpl_crcs;</div><div class='ctx'> 	bool using_gplonly_symbols;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MODULE_SIG</div><div class='hunk'>@@ -509,7 +510,9 @@ struct module {</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_DEBUG_INFO_BTF_MODULES</div><div class='ctx'> 	unsigned int btf_data_size;</div><div class='add'>+	unsigned int btf_base_data_size;</div><div class='ctx'> 	void *btf_data;</div><div class='add'>+	void *btf_base_data;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_JUMP_LABEL</div><div class='ctx'> 	struct jump_entry *jump_entries;</div><div class='hunk'>@@ -525,7 +528,7 @@ struct module {</div><div class='ctx'> 	struct trace_eval_map **trace_evals;</div><div class='ctx'> 	unsigned int num_trace_evals;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_FTRACE_MCOUNT_RECORD</div><div class='add'>+#ifdef CONFIG_DYNAMIC_FTRACE</div><div class='ctx'> 	unsigned int num_ftrace_callsites;</div><div class='ctx'> 	unsigned long *ftrace_callsites;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -590,6 +593,16 @@ struct module {</div><div class='ctx'> #define MODULE_ARCH_INIT {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+</div><div class='add'>+/* Get/put a kernel symbol (calls must be symmetric) */</div><div class='add'>+void *__symbol_get(const char *symbol);</div><div class='add'>+void *__symbol_get_gpl(const char *symbol);</div><div class='add'>+#define symbol_get(x)	({ \</div><div class='add'>+	static const char __notrim[] \</div><div class='add'>+		__used __section(".no_trim_symbol") = __stringify(x); \</div><div class='add'>+	(typeof(&amp;x))(__symbol_get(__stringify(x))); })</div><div class='add'>+</div><div class='ctx'> #ifndef HAVE_ARCH_KALLSYMS_SYMBOL_VALUE</div><div class='ctx'> static inline unsigned long kallsyms_symbol_value(const Elf_Sym *sym)</div><div class='ctx'> {</div><div class='hunk'>@@ -605,6 +618,11 @@ static inline bool module_is_live(struct module *mod)</div><div class='ctx'> 	return mod-&gt;state != MODULE_STATE_GOING;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool module_is_coming(struct module *mod)</div><div class='add'>+{</div><div class='add'>+        return mod-&gt;state == MODULE_STATE_COMING;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct module *__module_text_address(unsigned long addr);</div><div class='ctx'> struct module *__module_address(unsigned long addr);</div><div class='ctx'> bool is_module_address(unsigned long addr);</div><div class='hunk'>@@ -648,7 +666,7 @@ static inline bool within_module(unsigned long addr, const struct module *mod)</div><div class='ctx'> 	return within_module_init(addr, mod) || within_module_core(addr, mod);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Search for module by name: must be in a RCU-sched critical section. */</div><div class='add'>+/* Search for module by name: must be in a RCU critical section. */</div><div class='ctx'> struct module *find_module(const char *name);</div><div class='ctx'> </div><div class='ctx'> extern void __noreturn __module_put_and_kthread_exit(struct module *mod,</div><div class='hunk'>@@ -754,6 +772,8 @@ static inline bool is_livepatch_module(struct module *mod)</div><div class='ctx'> </div><div class='ctx'> void set_module_sig_enforced(void);</div><div class='ctx'> </div><div class='add'>+void module_for_each_mod(int(*func)(struct module *mod, void *data), void *data);</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_MODULES... */</div><div class='ctx'> </div><div class='ctx'> static inline struct module *__module_address(unsigned long addr)</div><div class='hunk'>@@ -857,6 +877,14 @@ void *dereference_module_function_descriptor(struct module *mod, void *ptr)</div><div class='ctx'> 	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool module_is_coming(struct module *mod)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void module_for_each_mod(int(*func)(struct module *mod, void *data), void *data)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_MODULES */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='hunk'>@@ -922,11 +950,11 @@ int module_kallsyms_on_each_symbol(const char *modname,</div><div class='ctx'>  * least KSYM_NAME_LEN long: a pointer to namebuf is returned if</div><div class='ctx'>  * found, otherwise NULL.</div><div class='ctx'>  */</div><div class='del'>-const char *module_address_lookup(unsigned long addr,</div><div class='del'>-				  unsigned long *symbolsize,</div><div class='del'>-				  unsigned long *offset,</div><div class='del'>-				  char **modname, const unsigned char **modbuildid,</div><div class='del'>-				  char *namebuf);</div><div class='add'>+int module_address_lookup(unsigned long addr,</div><div class='add'>+			  unsigned long *symbolsize,</div><div class='add'>+			  unsigned long *offset,</div><div class='add'>+			  char **modname, const unsigned char **modbuildid,</div><div class='add'>+			  char *namebuf);</div><div class='ctx'> int lookup_module_symbol_name(unsigned long addr, char *symname);</div><div class='ctx'> int lookup_module_symbol_attrs(unsigned long addr,</div><div class='ctx'> 			       unsigned long *size,</div><div class='hunk'>@@ -955,14 +983,14 @@ static inline int module_kallsyms_on_each_symbol(const char *modname,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* For kallsyms to ask for address resolution.  NULL means not found. */</div><div class='del'>-static inline const char *module_address_lookup(unsigned long addr,</div><div class='add'>+static inline int module_address_lookup(unsigned long addr,</div><div class='ctx'> 						unsigned long *symbolsize,</div><div class='ctx'> 						unsigned long *offset,</div><div class='ctx'> 						char **modname,</div><div class='ctx'> 						const unsigned char **modbuildid,</div><div class='ctx'> 						char *namebuf)</div><div class='ctx'> {</div><div class='del'>-	return NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int lookup_module_symbol_name(unsigned long addr, char *symname)</div><div class='hunk'>@@ -990,4 +1018,7 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod,</div><div class='ctx'> </div><div class='ctx'> #endif  /* CONFIG_MODULES &amp;&amp; CONFIG_KALLSYMS */</div><div class='ctx'> </div><div class='add'>+/* Define __free(module_put) macro for struct module *. */</div><div class='add'>+DEFINE_FREE(module_put, struct module *, if (_T) module_put(_T))</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_MODULE_H */</div><div class='head'>diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h<br/>index 001b2ce83832..e395461d59e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/moduleloader.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/moduleloader.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/moduleloader.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/moduleloader.h</a></div><div class='hunk'>@@ -25,13 +25,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,</div><div class='ctx'> /* Additional bytes needed by arch in front of individual sections */</div><div class='ctx'> unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);</div><div class='ctx'> </div><div class='del'>-/* Allocator used for allocating struct module, core sections and init</div><div class='del'>-   sections.  Returns NULL on failure. */</div><div class='del'>-void *module_alloc(unsigned long size);</div><div class='del'>-</div><div class='del'>-/* Free memory returned from module_alloc. */</div><div class='del'>-void module_memfree(void *module_region);</div><div class='del'>-</div><div class='ctx'> /* Determines if the section name is an init section (that is only used during</div><div class='ctx'>  * module loading).</div><div class='ctx'>  */</div><div class='hunk'>@@ -115,18 +108,18 @@ int module_finalize(const Elf_Ehdr *hdr,</div><div class='ctx'> 		    const Elf_Shdr *sechdrs,</div><div class='ctx'> 		    struct module *mod);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+void flush_module_init_free_work(void);</div><div class='add'>+#else</div><div class='add'>+static inline void flush_module_init_free_work(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Any cleanup needed when module leaves. */</div><div class='ctx'> void module_arch_cleanup(struct module *mod);</div><div class='ctx'> </div><div class='ctx'> /* Any cleanup before freeing mod-&gt;module_init */</div><div class='ctx'> void module_arch_freeing_init(struct module *mod);</div><div class='ctx'> </div><div class='del'>-#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) &amp;&amp; \</div><div class='del'>-		!defined(CONFIG_KASAN_VMALLOC)</div><div class='del'>-#include &lt;linux/kasan.h&gt;</div><div class='del'>-#define MODULE_ALIGN (PAGE_SIZE &lt;&lt; KASAN_SHADOW_SCALE_SHIFT)</div><div class='del'>-#else</div><div class='del'>-#define MODULE_ALIGN PAGE_SIZE</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h<br/>index bfb85fd13e1f..915f32f7d888 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/moduleparam.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/moduleparam.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/moduleparam.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/moduleparam.h</a></div><div class='hunk'>@@ -6,6 +6,13 @@</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The maximum module name length, including the NUL byte.</div><div class='add'>+ * Chosen so that structs with an unsigned long line up, specifically</div><div class='add'>+ * modversion_info.</div><div class='add'>+ */</div><div class='add'>+#define __MODULE_NAME_LEN (64 - sizeof(unsigned long))</div><div class='add'>+</div><div class='ctx'> /* You can override this manually, but generally this should match the</div><div class='ctx'>    module name. */</div><div class='ctx'> #ifdef MODULE</div><div class='hunk'>@@ -17,21 +24,22 @@</div><div class='ctx'> #define __MODULE_INFO_PREFIX KBUILD_MODNAME "."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Chosen so that structs with an unsigned long line up. */</div><div class='del'>-#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))</div><div class='del'>-</div><div class='del'>-#define __MODULE_INFO(tag, name, info)					  \</div><div class='del'>-	static const char __UNIQUE_ID(name)[]				  \</div><div class='add'>+/* Generic info of form tag = "info" */</div><div class='add'>+#define MODULE_INFO(tag, info)					  \</div><div class='add'>+	static_assert(						  \</div><div class='add'>+		sizeof(info) - 1 == __builtin_strlen(info),	  \</div><div class='add'>+		"MODULE_INFO(" #tag ", ...) contains embedded NUL byte"); \</div><div class='add'>+	static const char __UNIQUE_ID(modinfo)[]			  \</div><div class='ctx'> 		__used __section(".modinfo") __aligned(1)		  \</div><div class='ctx'> 		= __MODULE_INFO_PREFIX __stringify(tag) "=" info</div><div class='ctx'> </div><div class='ctx'> #define __MODULE_PARM_TYPE(name, _type)					  \</div><div class='del'>-	__MODULE_INFO(parmtype, name##type, #name ":" _type)</div><div class='add'>+	MODULE_INFO(parmtype, #name ":" _type)</div><div class='ctx'> </div><div class='ctx'> /* One for each parameter, describing how to use it.  Some files do</div><div class='ctx'>    multiple of these per line, so can't just use MODULE_INFO. */</div><div class='ctx'> #define MODULE_PARM_DESC(_parm, desc) \</div><div class='del'>-	__MODULE_INFO(parm, _parm, #_parm ":" desc)</div><div class='add'>+	MODULE_INFO(parm, #_parm ":" desc)</div><div class='ctx'> </div><div class='ctx'> struct kernel_param;</div><div class='ctx'> </div><div class='hunk'>@@ -282,10 +290,9 @@ struct kparam_array</div><div class='ctx'> #define __moduleparam_const const</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* This is the fundamental function for registering boot/module</div><div class='del'>-   parameters. */</div><div class='add'>+/* This is the fundamental function for registering boot/module parameters. */</div><div class='ctx'> #define __module_param_call(prefix, name, ops, arg, perm, level, flags)	\</div><div class='del'>-	/* Default value instead of permissions? */			\</div><div class='add'>+	static_assert(sizeof(""prefix) - 1 &lt;= __MODULE_NAME_LEN);	\</div><div class='ctx'> 	static const char __param_str_##name[] = prefix #name;		\</div><div class='ctx'> 	static struct kernel_param __moduleparam_const __param_##name	\</div><div class='ctx'> 	__used __section("__param")					\</div><div class='hunk'>@@ -345,6 +352,19 @@ static inline void kernel_param_unlock(struct module *mod)</div><div class='ctx'> 	__module_param_call("", name, &amp;param_ops_##type, &amp;var, perm,	\</div><div class='ctx'> 			    -1, KERNEL_PARAM_FL_UNSAFE)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * __core_param_cb - similar like core_param, with a set/get ops instead of type.</div><div class='add'>+ * @name: the name of the cmdline and sysfs parameter (often the same as var)</div><div class='add'>+ * @var: the variable</div><div class='add'>+ * @ops: the set &amp; get operations for this parameter.</div><div class='add'>+ * @perm: visibility in sysfs</div><div class='add'>+ *</div><div class='add'>+ * Ideally this should be called 'core_param_cb', but the name has been</div><div class='add'>+ * used for module core parameter, so add the '__' prefix</div><div class='add'>+ */</div><div class='add'>+#define __core_param_cb(name, ops, arg, perm) \</div><div class='add'>+	__module_param_call("", name, ops, arg, perm, -1, 0)</div><div class='add'>+</div><div class='ctx'> #endif /* !MODULE */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/mount.h b/include/linux/mount.h<br/>index c34c18b4e8f3..acfe7ef86a1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mount.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mount.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mount.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mount.h</a></div><div class='hunk'>@@ -22,49 +22,38 @@ struct fs_context;</div><div class='ctx'> struct file;</div><div class='ctx'> struct path;</div><div class='ctx'> </div><div class='del'>-#define MNT_NOSUID	0x01</div><div class='del'>-#define MNT_NODEV	0x02</div><div class='del'>-#define MNT_NOEXEC	0x04</div><div class='del'>-#define MNT_NOATIME	0x08</div><div class='del'>-#define MNT_NODIRATIME	0x10</div><div class='del'>-#define MNT_RELATIME	0x20</div><div class='del'>-#define MNT_READONLY	0x40	/* does the user want this to be r/o? */</div><div class='del'>-#define MNT_NOSYMFOLLOW	0x80</div><div class='del'>-</div><div class='del'>-#define MNT_SHRINKABLE	0x100</div><div class='del'>-#define MNT_WRITE_HOLD	0x200</div><div class='del'>-</div><div class='del'>-#define MNT_SHARED	0x1000	/* if the vfsmount is a shared mount */</div><div class='del'>-#define MNT_UNBINDABLE	0x2000	/* if the vfsmount is a unbindable mount */</div><div class='del'>-/*</div><div class='del'>- * MNT_SHARED_MASK is the set of flags that should be cleared when a</div><div class='del'>- * mount becomes shared.  Currently, this is only the flag that says a</div><div class='del'>- * mount cannot be bind mounted, since this is how we create a mount</div><div class='del'>- * that shares events with another mount.  If you add a new MNT_*</div><div class='del'>- * flag, consider how it interacts with shared mounts.</div><div class='del'>- */</div><div class='del'>-#define MNT_SHARED_MASK	(MNT_UNBINDABLE)</div><div class='del'>-#define MNT_USER_SETTABLE_MASK  (MNT_NOSUID | MNT_NODEV | MNT_NOEXEC \</div><div class='del'>-				 | MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME \</div><div class='del'>-				 | MNT_READONLY | MNT_NOSYMFOLLOW)</div><div class='del'>-#define MNT_ATIME_MASK (MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME )</div><div class='del'>-</div><div class='del'>-#define MNT_INTERNAL_FLAGS (MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL | \</div><div class='del'>-			    MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED | MNT_ONRB)</div><div class='del'>-</div><div class='del'>-#define MNT_INTERNAL	0x4000</div><div class='del'>-</div><div class='del'>-#define MNT_LOCK_ATIME		0x040000</div><div class='del'>-#define MNT_LOCK_NOEXEC		0x080000</div><div class='del'>-#define MNT_LOCK_NOSUID		0x100000</div><div class='del'>-#define MNT_LOCK_NODEV		0x200000</div><div class='del'>-#define MNT_LOCK_READONLY	0x400000</div><div class='del'>-#define MNT_LOCKED		0x800000</div><div class='del'>-#define MNT_DOOMED		0x1000000</div><div class='del'>-#define MNT_SYNC_UMOUNT		0x2000000</div><div class='del'>-#define MNT_MARKED		0x4000000</div><div class='del'>-#define MNT_UMOUNT		0x8000000</div><div class='del'>-#define MNT_ONRB		0x10000000</div><div class='add'>+enum mount_flags {</div><div class='add'>+	MNT_NOSUID	= 0x01,</div><div class='add'>+	MNT_NODEV	= 0x02,</div><div class='add'>+	MNT_NOEXEC	= 0x04,</div><div class='add'>+	MNT_NOATIME	= 0x08,</div><div class='add'>+	MNT_NODIRATIME	= 0x10,</div><div class='add'>+	MNT_RELATIME	= 0x20,</div><div class='add'>+	MNT_READONLY	= 0x40, /* does the user want this to be r/o? */</div><div class='add'>+	MNT_NOSYMFOLLOW	= 0x80,</div><div class='add'>+</div><div class='add'>+	MNT_SHRINKABLE	= 0x100,</div><div class='add'>+</div><div class='add'>+	MNT_INTERNAL	= 0x4000,</div><div class='add'>+</div><div class='add'>+	MNT_LOCK_ATIME		= 0x040000,</div><div class='add'>+	MNT_LOCK_NOEXEC		= 0x080000,</div><div class='add'>+	MNT_LOCK_NOSUID		= 0x100000,</div><div class='add'>+	MNT_LOCK_NODEV		= 0x200000,</div><div class='add'>+	MNT_LOCK_READONLY	= 0x400000,</div><div class='add'>+	MNT_LOCKED		= 0x800000,</div><div class='add'>+	MNT_DOOMED		= 0x1000000,</div><div class='add'>+	MNT_SYNC_UMOUNT		= 0x2000000,</div><div class='add'>+	MNT_UMOUNT		= 0x8000000,</div><div class='add'>+</div><div class='add'>+	MNT_USER_SETTABLE_MASK  = MNT_NOSUID | MNT_NODEV | MNT_NOEXEC</div><div class='add'>+				  | MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME</div><div class='add'>+				  | MNT_READONLY | MNT_NOSYMFOLLOW,</div><div class='add'>+	MNT_ATIME_MASK = MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME,</div><div class='add'>+</div><div class='add'>+	MNT_INTERNAL_FLAGS = MNT_INTERNAL | MNT_DOOMED |</div><div class='add'>+			     MNT_SYNC_UMOUNT | MNT_LOCKED</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct vfsmount {</div><div class='ctx'> 	struct dentry *mnt_root;	/* root of the mounted tree */</div><div class='hunk'>@@ -76,7 +65,7 @@ struct vfsmount {</div><div class='ctx'> static inline struct mnt_idmap *mnt_idmap(const struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	/* Pairs with smp_store_release() in do_idmap_mount(). */</div><div class='del'>-	return smp_load_acquire(&amp;mnt-&gt;mnt_idmap);</div><div class='add'>+	return READ_ONCE(mnt-&gt;mnt_idmap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern int mnt_want_write(struct vfsmount *mnt);</div><div class='hunk'>@@ -87,7 +76,7 @@ extern void mntput(struct vfsmount *mnt);</div><div class='ctx'> extern struct vfsmount *mntget(struct vfsmount *mnt);</div><div class='ctx'> extern void mnt_make_shortterm(struct vfsmount *mnt);</div><div class='ctx'> extern struct vfsmount *mnt_clone_internal(const struct path *path);</div><div class='del'>-extern bool __mnt_is_readonly(struct vfsmount *mnt);</div><div class='add'>+extern bool __mnt_is_readonly(const struct vfsmount *mnt);</div><div class='ctx'> extern bool mnt_may_suid(struct vfsmount *mnt);</div><div class='ctx'> </div><div class='ctx'> extern struct vfsmount *clone_private_mount(const struct path *path);</div><div class='hunk'>@@ -95,13 +84,11 @@ int mnt_get_write_access(struct vfsmount *mnt);</div><div class='ctx'> void mnt_put_write_access(struct vfsmount *mnt);</div><div class='ctx'> </div><div class='ctx'> extern struct vfsmount *fc_mount(struct fs_context *fc);</div><div class='add'>+extern struct vfsmount *fc_mount_longterm(struct fs_context *fc);</div><div class='ctx'> extern struct vfsmount *vfs_create_mount(struct fs_context *fc);</div><div class='ctx'> extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,</div><div class='ctx'> 				      int flags, const char *name,</div><div class='ctx'> 				      void *data);</div><div class='del'>-extern struct vfsmount *vfs_submount(const struct dentry *mountpoint,</div><div class='del'>-				     struct file_system_type *type,</div><div class='del'>-				     const char *name, void *data);</div><div class='ctx'> </div><div class='ctx'> extern void mnt_set_expiry(struct vfsmount *mnt, struct list_head *expiry_list);</div><div class='ctx'> extern void mark_mounts_for_expiry(struct list_head *mounts);</div><div class='hunk'>@@ -114,12 +101,10 @@ extern struct vfsmount *kern_mount(struct file_system_type *);</div><div class='ctx'> extern void kern_unmount(struct vfsmount *mnt);</div><div class='ctx'> extern int may_umount_tree(struct vfsmount *);</div><div class='ctx'> extern int may_umount(struct vfsmount *);</div><div class='del'>-extern long do_mount(const char *, const char __user *,</div><div class='add'>+int do_mount(const char *, const char __user *,</div><div class='ctx'> 		     const char *, unsigned long, void *);</div><div class='del'>-extern struct vfsmount *collect_mounts(const struct path *);</div><div class='del'>-extern void drop_collected_mounts(struct vfsmount *);</div><div class='del'>-extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *,</div><div class='del'>-			  struct vfsmount *);</div><div class='add'>+extern const struct path *collect_paths(const struct path *, struct path *, unsigned);</div><div class='add'>+extern void drop_collected_paths(const struct path *, const struct path *);</div><div class='ctx'> extern void kern_unmount_array(struct vfsmount *mnt[], unsigned int num);</div><div class='ctx'> </div><div class='ctx'> extern int cifs_root_data(char **dev, char **opts);</div><div class='head'>diff --git a/include/linux/moxtet.h b/include/linux/moxtet.h<br/>index ac577699edfd..dfa4800306ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/moxtet.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/moxtet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/moxtet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/moxtet.h</a></div><div class='hunk'>@@ -61,13 +61,8 @@ struct moxtet_driver {</div><div class='ctx'> 	struct device_driver		driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct moxtet_driver *</div><div class='del'>-to_moxtet_driver(struct device_driver *drv)</div><div class='del'>-{</div><div class='del'>-	if (!drv)</div><div class='del'>-		return NULL;</div><div class='del'>-	return container_of(drv, struct moxtet_driver, driver);</div><div class='del'>-}</div><div class='add'>+#define to_moxtet_driver(__drv)	\</div><div class='add'>+	( __drv ? container_of_const(__drv, struct moxtet_driver, driver) : NULL )</div><div class='ctx'> </div><div class='ctx'> extern int __moxtet_register_driver(struct module *owner,</div><div class='ctx'> 				    struct moxtet_driver *mdrv);</div><div class='head'>diff --git a/include/linux/mpi.h b/include/linux/mpi.h<br/>index eb0d1c1db208..47be46f36435 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mpi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mpi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mpi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mpi.h</a></div><div class='hunk'>@@ -40,79 +40,26 @@ struct gcry_mpi {</div><div class='ctx'> typedef struct gcry_mpi *MPI;</div><div class='ctx'> </div><div class='ctx'> #define mpi_get_nlimbs(a)     ((a)-&gt;nlimbs)</div><div class='del'>-#define mpi_has_sign(a)       ((a)-&gt;sign)</div><div class='ctx'> </div><div class='ctx'> /*-- mpiutil.c --*/</div><div class='ctx'> MPI mpi_alloc(unsigned nlimbs);</div><div class='del'>-void mpi_clear(MPI a);</div><div class='ctx'> void mpi_free(MPI a);</div><div class='ctx'> int mpi_resize(MPI a, unsigned nlimbs);</div><div class='ctx'> </div><div class='del'>-static inline MPI mpi_new(unsigned int nbits)</div><div class='del'>-{</div><div class='del'>-	return mpi_alloc((nbits + BITS_PER_MPI_LIMB - 1) / BITS_PER_MPI_LIMB);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> MPI mpi_copy(MPI a);</div><div class='del'>-MPI mpi_alloc_like(MPI a);</div><div class='del'>-void mpi_snatch(MPI w, MPI u);</div><div class='del'>-MPI mpi_set(MPI w, MPI u);</div><div class='del'>-MPI mpi_set_ui(MPI w, unsigned long u);</div><div class='del'>-MPI mpi_alloc_set_ui(unsigned long u);</div><div class='del'>-void mpi_swap_cond(MPI a, MPI b, unsigned long swap);</div><div class='del'>-</div><div class='del'>-/* Constants used to return constant MPIs.  See mpi_init if you</div><div class='del'>- * want to add more constants.</div><div class='del'>- */</div><div class='del'>-#define MPI_NUMBER_OF_CONSTANTS 6</div><div class='del'>-enum gcry_mpi_constants {</div><div class='del'>-	MPI_C_ZERO,</div><div class='del'>-	MPI_C_ONE,</div><div class='del'>-	MPI_C_TWO,</div><div class='del'>-	MPI_C_THREE,</div><div class='del'>-	MPI_C_FOUR,</div><div class='del'>-	MPI_C_EIGHT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MPI mpi_const(enum gcry_mpi_constants no);</div><div class='ctx'> </div><div class='ctx'> /*-- mpicoder.c --*/</div><div class='del'>-</div><div class='del'>-/* Different formats of external big integer representation. */</div><div class='del'>-enum gcry_mpi_format {</div><div class='del'>-	GCRYMPI_FMT_NONE = 0,</div><div class='del'>-	GCRYMPI_FMT_STD = 1,    /* Twos complement stored without length. */</div><div class='del'>-	GCRYMPI_FMT_PGP = 2,    /* As used by OpenPGP (unsigned only). */</div><div class='del'>-	GCRYMPI_FMT_SSH = 3,    /* As used by SSH (like STD but with length). */</div><div class='del'>-	GCRYMPI_FMT_HEX = 4,    /* Hex format. */</div><div class='del'>-	GCRYMPI_FMT_USG = 5,    /* Like STD but unsigned. */</div><div class='del'>-	GCRYMPI_FMT_OPAQUE = 8  /* Opaque format (some functions only). */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes);</div><div class='ctx'> MPI mpi_read_from_buffer(const void *buffer, unsigned *ret_nread);</div><div class='del'>-int mpi_fromstr(MPI val, const char *str);</div><div class='del'>-MPI mpi_scanval(const char *string);</div><div class='ctx'> MPI mpi_read_raw_from_sgl(struct scatterlist *sgl, unsigned int len);</div><div class='ctx'> void *mpi_get_buffer(MPI a, unsigned *nbytes, int *sign);</div><div class='ctx'> int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes,</div><div class='ctx'> 		    int *sign);</div><div class='ctx'> int mpi_write_to_sgl(MPI a, struct scatterlist *sg, unsigned nbytes,</div><div class='ctx'> 		     int *sign);</div><div class='del'>-int mpi_print(enum gcry_mpi_format format, unsigned char *buffer,</div><div class='del'>-			size_t buflen, size_t *nwritten, MPI a);</div><div class='ctx'> </div><div class='ctx'> /*-- mpi-mod.c --*/</div><div class='del'>-void mpi_mod(MPI rem, MPI dividend, MPI divisor);</div><div class='del'>-</div><div class='del'>-/* Context used with Barrett reduction.  */</div><div class='del'>-struct barrett_ctx_s;</div><div class='del'>-typedef struct barrett_ctx_s *mpi_barrett_t;</div><div class='del'>-</div><div class='del'>-mpi_barrett_t mpi_barrett_init(MPI m, int copy);</div><div class='del'>-void mpi_barrett_free(mpi_barrett_t ctx);</div><div class='del'>-void mpi_mod_barrett(MPI r, MPI x, mpi_barrett_t ctx);</div><div class='del'>-void mpi_mul_barrett(MPI w, MPI u, MPI v, mpi_barrett_t ctx);</div><div class='add'>+int mpi_mod(MPI rem, MPI dividend, MPI divisor);</div><div class='ctx'> </div><div class='ctx'> /*-- mpi-pow.c --*/</div><div class='ctx'> int mpi_powm(MPI res, MPI base, MPI exp, MPI mod);</div><div class='hunk'>@@ -120,7 +67,6 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod);</div><div class='ctx'> /*-- mpi-cmp.c --*/</div><div class='ctx'> int mpi_cmp_ui(MPI u, ulong v);</div><div class='ctx'> int mpi_cmp(MPI u, MPI v);</div><div class='del'>-int mpi_cmpabs(MPI u, MPI v);</div><div class='ctx'> </div><div class='ctx'> /*-- mpi-sub-ui.c --*/</div><div class='ctx'> int mpi_sub_ui(MPI w, MPI u, unsigned long vval);</div><div class='hunk'>@@ -129,138 +75,22 @@ int mpi_sub_ui(MPI w, MPI u, unsigned long vval);</div><div class='ctx'> void mpi_normalize(MPI a);</div><div class='ctx'> unsigned mpi_get_nbits(MPI a);</div><div class='ctx'> int mpi_test_bit(MPI a, unsigned int n);</div><div class='del'>-void mpi_set_bit(MPI a, unsigned int n);</div><div class='del'>-void mpi_set_highbit(MPI a, unsigned int n);</div><div class='del'>-void mpi_clear_highbit(MPI a, unsigned int n);</div><div class='del'>-void mpi_clear_bit(MPI a, unsigned int n);</div><div class='del'>-void mpi_rshift_limbs(MPI a, unsigned int count);</div><div class='del'>-void mpi_rshift(MPI x, MPI a, unsigned int n);</div><div class='del'>-void mpi_lshift_limbs(MPI a, unsigned int count);</div><div class='del'>-void mpi_lshift(MPI x, MPI a, unsigned int n);</div><div class='add'>+int mpi_set_bit(MPI a, unsigned int n);</div><div class='add'>+int mpi_rshift(MPI x, MPI a, unsigned int n);</div><div class='ctx'> </div><div class='ctx'> /*-- mpi-add.c --*/</div><div class='del'>-void mpi_add_ui(MPI w, MPI u, unsigned long v);</div><div class='del'>-void mpi_add(MPI w, MPI u, MPI v);</div><div class='del'>-void mpi_sub(MPI w, MPI u, MPI v);</div><div class='del'>-void mpi_addm(MPI w, MPI u, MPI v, MPI m);</div><div class='del'>-void mpi_subm(MPI w, MPI u, MPI v, MPI m);</div><div class='add'>+int mpi_add(MPI w, MPI u, MPI v);</div><div class='add'>+int mpi_sub(MPI w, MPI u, MPI v);</div><div class='add'>+int mpi_addm(MPI w, MPI u, MPI v, MPI m);</div><div class='add'>+int mpi_subm(MPI w, MPI u, MPI v, MPI m);</div><div class='ctx'> </div><div class='ctx'> /*-- mpi-mul.c --*/</div><div class='del'>-void mpi_mul(MPI w, MPI u, MPI v);</div><div class='del'>-void mpi_mulm(MPI w, MPI u, MPI v, MPI m);</div><div class='add'>+int mpi_mul(MPI w, MPI u, MPI v);</div><div class='add'>+int mpi_mulm(MPI w, MPI u, MPI v, MPI m);</div><div class='ctx'> </div><div class='ctx'> /*-- mpi-div.c --*/</div><div class='del'>-void mpi_tdiv_r(MPI rem, MPI num, MPI den);</div><div class='del'>-void mpi_fdiv_r(MPI rem, MPI dividend, MPI divisor);</div><div class='del'>-void mpi_fdiv_q(MPI quot, MPI dividend, MPI divisor);</div><div class='del'>-</div><div class='del'>-/*-- mpi-inv.c --*/</div><div class='del'>-int mpi_invm(MPI x, MPI a, MPI n);</div><div class='del'>-</div><div class='del'>-/*-- ec.c --*/</div><div class='del'>-</div><div class='del'>-/* Object to represent a point in projective coordinates */</div><div class='del'>-struct gcry_mpi_point {</div><div class='del'>-	MPI x;</div><div class='del'>-	MPI y;</div><div class='del'>-	MPI z;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct gcry_mpi_point *MPI_POINT;</div><div class='del'>-</div><div class='del'>-/* Models describing an elliptic curve */</div><div class='del'>-enum gcry_mpi_ec_models {</div><div class='del'>-	/* The Short Weierstrass equation is</div><div class='del'>-	 *      y^2 = x^3 + ax + b</div><div class='del'>-	 */</div><div class='del'>-	MPI_EC_WEIERSTRASS = 0,</div><div class='del'>-	/* The Montgomery equation is</div><div class='del'>-	 *      by^2 = x^3 + ax^2 + x</div><div class='del'>-	 */</div><div class='del'>-	MPI_EC_MONTGOMERY,</div><div class='del'>-	/* The Twisted Edwards equation is</div><div class='del'>-	 *      ax^2 + y^2 = 1 + bx^2y^2</div><div class='del'>-	 * Note that we use 'b' instead of the commonly used 'd'.</div><div class='del'>-	 */</div><div class='del'>-	MPI_EC_EDWARDS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Dialects used with elliptic curves */</div><div class='del'>-enum ecc_dialects {</div><div class='del'>-	ECC_DIALECT_STANDARD = 0,</div><div class='del'>-	ECC_DIALECT_ED25519,</div><div class='del'>-	ECC_DIALECT_SAFECURVE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This context is used with all our EC functions. */</div><div class='del'>-struct mpi_ec_ctx {</div><div class='del'>-	enum gcry_mpi_ec_models model; /* The model describing this curve. */</div><div class='del'>-	enum ecc_dialects dialect;     /* The ECC dialect used with the curve. */</div><div class='del'>-	int flags;                     /* Public key flags (not always used). */</div><div class='del'>-	unsigned int nbits;            /* Number of bits.  */</div><div class='del'>-</div><div class='del'>-	/* Domain parameters.  Note that they may not all be set and if set</div><div class='del'>-	 * the MPIs may be flagged as constant.</div><div class='del'>-	 */</div><div class='del'>-	MPI p;         /* Prime specifying the field GF(p).  */</div><div class='del'>-	MPI a;         /* First coefficient of the Weierstrass equation.  */</div><div class='del'>-	MPI b;         /* Second coefficient of the Weierstrass equation.  */</div><div class='del'>-	MPI_POINT G;   /* Base point (generator).  */</div><div class='del'>-	MPI n;         /* Order of G.  */</div><div class='del'>-	unsigned int h;       /* Cofactor.  */</div><div class='del'>-</div><div class='del'>-	/* The actual key.  May not be set.  */</div><div class='del'>-	MPI_POINT Q;   /* Public key.   */</div><div class='del'>-	MPI d;         /* Private key.  */</div><div class='del'>-</div><div class='del'>-	const char *name;      /* Name of the curve.  */</div><div class='del'>-</div><div class='del'>-	/* This structure is private to mpi/ec.c! */</div><div class='del'>-	struct {</div><div class='del'>-		struct {</div><div class='del'>-			unsigned int a_is_pminus3:1;</div><div class='del'>-			unsigned int two_inv_p:1;</div><div class='del'>-		} valid; /* Flags to help setting the helper vars below.  */</div><div class='del'>-</div><div class='del'>-		int a_is_pminus3;  /* True if A = P - 3. */</div><div class='del'>-</div><div class='del'>-		MPI two_inv_p;</div><div class='del'>-</div><div class='del'>-		mpi_barrett_t p_barrett;</div><div class='del'>-</div><div class='del'>-		/* Scratch variables.  */</div><div class='del'>-		MPI scratch[11];</div><div class='del'>-</div><div class='del'>-		/* Helper for fast reduction.  */</div><div class='del'>-		/*   int nist_nbits; /\* If this is a NIST curve, the # of bits. *\/ */</div><div class='del'>-		/*   MPI s[10]; */</div><div class='del'>-		/*   MPI c; */</div><div class='del'>-	} t;</div><div class='del'>-</div><div class='del'>-	/* Curve specific computation routines for the field.  */</div><div class='del'>-	void (*addm)(MPI w, MPI u, MPI v, struct mpi_ec_ctx *ctx);</div><div class='del'>-	void (*subm)(MPI w, MPI u, MPI v, struct mpi_ec_ctx *ec);</div><div class='del'>-	void (*mulm)(MPI w, MPI u, MPI v, struct mpi_ec_ctx *ctx);</div><div class='del'>-	void (*pow2)(MPI w, const MPI b, struct mpi_ec_ctx *ctx);</div><div class='del'>-	void (*mul2)(MPI w, MPI u, struct mpi_ec_ctx *ctx);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void mpi_ec_init(struct mpi_ec_ctx *ctx, enum gcry_mpi_ec_models model,</div><div class='del'>-			enum ecc_dialects dialect,</div><div class='del'>-			int flags, MPI p, MPI a, MPI b);</div><div class='del'>-void mpi_ec_deinit(struct mpi_ec_ctx *ctx);</div><div class='del'>-MPI_POINT mpi_point_new(unsigned int nbits);</div><div class='del'>-void mpi_point_release(MPI_POINT p);</div><div class='del'>-void mpi_point_init(MPI_POINT p);</div><div class='del'>-void mpi_point_free_parts(MPI_POINT p);</div><div class='del'>-int mpi_ec_get_affine(MPI x, MPI y, MPI_POINT point, struct mpi_ec_ctx *ctx);</div><div class='del'>-void mpi_ec_add_points(MPI_POINT result,</div><div class='del'>-			MPI_POINT p1, MPI_POINT p2,</div><div class='del'>-			struct mpi_ec_ctx *ctx);</div><div class='del'>-void mpi_ec_mul_point(MPI_POINT result,</div><div class='del'>-			MPI scalar, MPI_POINT point,</div><div class='del'>-			struct mpi_ec_ctx *ctx);</div><div class='del'>-int mpi_ec_curve_point(MPI_POINT point, struct mpi_ec_ctx *ctx);</div><div class='add'>+int mpi_tdiv_r(MPI rem, MPI num, MPI den);</div><div class='add'>+int mpi_fdiv_r(MPI rem, MPI dividend, MPI divisor);</div><div class='ctx'> </div><div class='ctx'> /* inline functions */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h<br/>index 63ef5191cc57..fddafdc168f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mroute6.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mroute6.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mroute6.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mroute6.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@ extern int ip6_mroute_getsockopt(struct sock *, int, sockptr_t, sockptr_t);</div><div class='ctx'> extern int ip6_mr_input(struct sk_buff *skb);</div><div class='ctx'> extern int ip6mr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);</div><div class='ctx'> extern int ip6_mr_init(void);</div><div class='add'>+extern int ip6_mr_output(struct net *net, struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> extern void ip6_mr_cleanup(void);</div><div class='ctx'> int ip6mr_ioctl(struct sock *sk, int cmd, void *arg);</div><div class='ctx'> #else</div><div class='hunk'>@@ -58,6 +59,12 @@ static inline int ip6_mr_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int</div><div class='add'>+ip6_mr_output(struct net *net, struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return ip6_output(net, sk, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void ip6_mr_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	return;</div><div class='head'>diff --git a/include/linux/mroute_base.h b/include/linux/mroute_base.h<br/>index 9dd4bf157255..0075f6e5c3da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mroute_base.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mroute_base.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mroute_base.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mroute_base.h</a></div><div class='hunk'>@@ -146,9 +146,9 @@ struct mr_mfc {</div><div class='ctx'> 			unsigned long last_assert;</div><div class='ctx'> 			int minvif;</div><div class='ctx'> 			int maxvif;</div><div class='del'>-			unsigned long bytes;</div><div class='del'>-			unsigned long pkt;</div><div class='del'>-			unsigned long wrong_if;</div><div class='add'>+			atomic_long_t bytes;</div><div class='add'>+			atomic_long_t pkt;</div><div class='add'>+			atomic_long_t wrong_if;</div><div class='ctx'> 			unsigned long lastuse;</div><div class='ctx'> 			unsigned char ttls[MAXVIFS];</div><div class='ctx'> 			refcount_t refcount;</div><div class='hunk'>@@ -262,6 +262,11 @@ struct mr_table {</div><div class='ctx'> 	int			mroute_reg_vif_num;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool mr_can_free_table(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return !check_net(net) || !net_initialized(net);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IP_MROUTE_COMMON</div><div class='ctx'> void vif_device_init(struct vif_device *v,</div><div class='ctx'> 		     struct net_device *dev,</div><div class='head'>diff --git a/include/linux/msi.h b/include/linux/msi.h<br/>index 26d07e23052e..8003e3218c46 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/msi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/msi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/msi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/msi.h</a></div><div class='hunk'>@@ -19,13 +19,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/irqdomain_defs.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> #include &lt;linux/msi_api.h&gt;</div><div class='del'>-#include &lt;linux/xarray.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/bits.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/msi.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -77,11 +73,9 @@ struct msi_msg {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern int pci_msi_ignore_mask;</div><div class='ctx'> /* Helper functions */</div><div class='ctx'> struct msi_desc;</div><div class='ctx'> struct pci_dev;</div><div class='del'>-struct platform_msi_priv_data;</div><div class='ctx'> struct device_attribute;</div><div class='ctx'> struct irq_domain;</div><div class='ctx'> struct irq_affinity_desc;</div><div class='hunk'>@@ -171,6 +165,10 @@ struct msi_desc_data {</div><div class='ctx'>  * @dev:	Pointer to the device which uses this descriptor</div><div class='ctx'>  * @msg:	The last set MSI message cached for reuse</div><div class='ctx'>  * @affinity:	Optional pointer to a cpu affinity mask for this descriptor</div><div class='add'>+ * @iommu_msi_iova: Optional shifted IOVA from the IOMMU to override the msi_addr.</div><div class='add'>+ *                  Only used if iommu_msi_shift != 0</div><div class='add'>+ * @iommu_msi_shift: Indicates how many bits of the original address should be</div><div class='add'>+ *                   preserved when using iommu_msi_iova.</div><div class='ctx'>  * @sysfs_attr:	Pointer to sysfs device attribute</div><div class='ctx'>  *</div><div class='ctx'>  * @write_msi_msg:	Callback that may be called when the MSI message</div><div class='hunk'>@@ -189,7 +187,8 @@ struct msi_desc {</div><div class='ctx'> 	struct msi_msg			msg;</div><div class='ctx'> 	struct irq_affinity_desc	*affinity;</div><div class='ctx'> #ifdef CONFIG_IRQ_MSI_IOMMU</div><div class='del'>-	const void			*iommu_cookie;</div><div class='add'>+	u64				iommu_msi_iova : 58;</div><div class='add'>+	u64				iommu_msi_shift : 6;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> 	struct device_attribute		*sysfs_attrs;</div><div class='hunk'>@@ -228,26 +227,13 @@ struct msi_dev_domain {</div><div class='ctx'> 	struct irq_domain	*domain;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * msi_device_data - MSI per device data</div><div class='del'>- * @properties:		MSI properties which are interesting to drivers</div><div class='del'>- * @platform_data:	Platform-MSI specific data</div><div class='del'>- * @mutex:		Mutex protecting the MSI descriptor store</div><div class='del'>- * @__domains:		Internal data for per device MSI domains</div><div class='del'>- * @__iter_idx:		Index to search the next entry for iterators</div><div class='del'>- */</div><div class='del'>-struct msi_device_data {</div><div class='del'>-	unsigned long			properties;</div><div class='del'>-	struct platform_msi_priv_data	*platform_data;</div><div class='del'>-	struct mutex			mutex;</div><div class='del'>-	struct msi_dev_domain		__domains[MSI_MAX_DEVICE_IRQDOMAINS];</div><div class='del'>-	unsigned long			__iter_idx;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int msi_setup_device_data(struct device *dev);</div><div class='ctx'> </div><div class='del'>-void msi_lock_descs(struct device *dev);</div><div class='del'>-void msi_unlock_descs(struct device *dev);</div><div class='add'>+void __msi_lock_descs(struct device *dev);</div><div class='add'>+void __msi_unlock_descs(struct device *dev);</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_1(msi_descs_lock, struct device, __msi_lock_descs(_T-&gt;lock),</div><div class='add'>+		    __msi_unlock_descs(_T-&gt;lock));</div><div class='ctx'> </div><div class='ctx'> struct msi_desc *msi_domain_first_desc(struct device *dev, unsigned int domid,</div><div class='ctx'> 				       enum msi_desc_filter filter);</div><div class='hunk'>@@ -306,28 +292,42 @@ struct msi_desc *msi_next_desc(struct device *dev, unsigned int domid,</div><div class='ctx'> </div><div class='ctx'> #define msi_desc_to_dev(desc)		((desc)-&gt;dev)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IRQ_MSI_IOMMU</div><div class='del'>-static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc)</div><div class='del'>-{</div><div class='del'>-	return desc-&gt;iommu_cookie;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void msi_desc_set_iommu_cookie(struct msi_desc *desc,</div><div class='del'>-					     const void *iommu_cookie)</div><div class='add'>+static inline void msi_desc_set_iommu_msi_iova(struct msi_desc *desc, u64 msi_iova,</div><div class='add'>+					       unsigned int msi_shift)</div><div class='ctx'> {</div><div class='del'>-	desc-&gt;iommu_cookie = iommu_cookie;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='add'>+#ifdef CONFIG_IRQ_MSI_IOMMU</div><div class='add'>+	desc-&gt;iommu_msi_iova = msi_iova &gt;&gt; msi_shift;</div><div class='add'>+	desc-&gt;iommu_msi_shift = msi_shift;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void msi_desc_set_iommu_cookie(struct msi_desc *desc,</div><div class='del'>-					     const void *iommu_cookie)</div><div class='add'>+/**</div><div class='add'>+ * msi_msg_set_addr() - Set MSI address in an MSI message</div><div class='add'>+ *</div><div class='add'>+ * @desc:	MSI descriptor that may carry an IOVA base address for MSI via @iommu_msi_iova/shift</div><div class='add'>+ * @msg:	Target MSI message to set its address_hi and address_lo</div><div class='add'>+ * @msi_addr:	Physical address to set the MSI message</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *  - Override @msi_addr using the IOVA base address in the @desc if @iommu_msi_shift is set</div><div class='add'>+ *  - Otherwise, simply set @msi_addr to @msg</div><div class='add'>+ */</div><div class='add'>+static inline void msi_msg_set_addr(struct msi_desc *desc, struct msi_msg *msg,</div><div class='add'>+				    phys_addr_t msi_addr)</div><div class='ctx'> {</div><div class='del'>-}</div><div class='add'>+#ifdef CONFIG_IRQ_MSI_IOMMU</div><div class='add'>+	if (desc-&gt;iommu_msi_shift) {</div><div class='add'>+		u64 msi_iova = desc-&gt;iommu_msi_iova &lt;&lt; desc-&gt;iommu_msi_shift;</div><div class='add'>+</div><div class='add'>+		msg-&gt;address_hi = upper_32_bits(msi_iova);</div><div class='add'>+		msg-&gt;address_lo = lower_32_bits(msi_iova) |</div><div class='add'>+				  (msi_addr &amp; ((1 &lt;&lt; desc-&gt;iommu_msi_shift) - 1));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='add'>+	msg-&gt;address_hi = upper_32_bits(msi_addr);</div><div class='add'>+	msg-&gt;address_lo = lower_32_bits(msi_addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int msi_domain_insert_msi_desc(struct device *dev, unsigned int domid,</div><div class='ctx'> 			       struct msi_desc *init_desc);</div><div class='hunk'>@@ -423,6 +423,7 @@ struct msi_domain_info;</div><div class='ctx'>  * @msi_init:		Domain specific init function for MSI interrupts</div><div class='ctx'>  * @msi_free:		Domain specific function to free a MSI interrupts</div><div class='ctx'>  * @msi_prepare:	Prepare the allocation of the interrupts in the domain</div><div class='add'>+ * @msi_teardown:	Reverse the effects of @msi_prepare</div><div class='ctx'>  * @prepare_desc:	Optional function to prepare the allocated MSI descriptor</div><div class='ctx'>  *			in the domain</div><div class='ctx'>  * @set_desc:		Set the msi descriptor for an interrupt</div><div class='hunk'>@@ -430,16 +431,15 @@ struct msi_domain_info;</div><div class='ctx'>  *			function.</div><div class='ctx'>  * @domain_free_irqs:	Optional function to override the default free</div><div class='ctx'>  *			function.</div><div class='del'>- * @msi_post_free:	Optional function which is invoked after freeing</div><div class='del'>- *			all interrupts.</div><div class='ctx'>  * @msi_translate:	Optional translate callback to support the odd wire to</div><div class='ctx'>  *			MSI bridges, e.g. MBIGEN</div><div class='ctx'>  *</div><div class='ctx'>  * @get_hwirq, @msi_init and @msi_free are callbacks used by the underlying</div><div class='ctx'>  * irqdomain.</div><div class='ctx'>  *</div><div class='del'>- * @msi_check, @msi_prepare, @prepare_desc and @set_desc are callbacks used by the</div><div class='del'>- * msi_domain_alloc/free_irqs*() variants.</div><div class='add'>+ * @msi_check, @msi_prepare, @msi_teardown, @prepare_desc and</div><div class='add'>+ * @set_desc are callbacks used by the msi_domain_alloc/free_irqs*()</div><div class='add'>+ * variants.</div><div class='ctx'>  *</div><div class='ctx'>  * @domain_alloc_irqs, @domain_free_irqs can be used to override the</div><div class='ctx'>  * default allocation/free functions (__msi_domain_alloc/free_irqs). This</div><div class='hunk'>@@ -461,6 +461,8 @@ struct msi_domain_ops {</div><div class='ctx'> 	int		(*msi_prepare)(struct irq_domain *domain,</div><div class='ctx'> 				       struct device *dev, int nvec,</div><div class='ctx'> 				       msi_alloc_info_t *arg);</div><div class='add'>+	void		(*msi_teardown)(struct irq_domain *domain,</div><div class='add'>+					msi_alloc_info_t *arg);</div><div class='ctx'> 	void		(*prepare_desc)(struct irq_domain *domain, msi_alloc_info_t *arg,</div><div class='ctx'> 					struct msi_desc *desc);</div><div class='ctx'> 	void		(*set_desc)(msi_alloc_info_t *arg,</div><div class='hunk'>@@ -469,8 +471,6 @@ struct msi_domain_ops {</div><div class='ctx'> 					     struct device *dev, int nvec);</div><div class='ctx'> 	void		(*domain_free_irqs)(struct irq_domain *domain,</div><div class='ctx'> 					    struct device *dev);</div><div class='del'>-	void		(*msi_post_free)(struct irq_domain *domain,</div><div class='del'>-					 struct device *dev);</div><div class='ctx'> 	int		(*msi_translate)(struct irq_domain *domain, struct irq_fwspec *fwspec,</div><div class='ctx'> 					 irq_hw_number_t *hwirq, unsigned int *type);</div><div class='ctx'> };</div><div class='hunk'>@@ -484,11 +484,13 @@ struct msi_domain_ops {</div><div class='ctx'>  *			gets initialized to the maximum software index limit</div><div class='ctx'>  *			by the domain creation code.</div><div class='ctx'>  * @ops:		The callback data structure</div><div class='add'>+ * @dev:		Device which creates the domain</div><div class='ctx'>  * @chip:		Optional: associated interrupt chip</div><div class='ctx'>  * @chip_data:		Optional: associated interrupt chip data</div><div class='ctx'>  * @handler:		Optional: associated interrupt flow handler</div><div class='ctx'>  * @handler_data:	Optional: associated interrupt flow handler data</div><div class='ctx'>  * @handler_name:	Optional: associated interrupt flow handler name</div><div class='add'>+ * @alloc_data:		Optional: associated interrupt allocation data</div><div class='ctx'>  * @data:		Optional: domain specific data</div><div class='ctx'>  */</div><div class='ctx'> struct msi_domain_info {</div><div class='hunk'>@@ -496,11 +498,13 @@ struct msi_domain_info {</div><div class='ctx'> 	enum irq_domain_bus_token	bus_token;</div><div class='ctx'> 	unsigned int			hwsize;</div><div class='ctx'> 	struct msi_domain_ops		*ops;</div><div class='add'>+	struct device			*dev;</div><div class='ctx'> 	struct irq_chip			*chip;</div><div class='ctx'> 	void				*chip_data;</div><div class='ctx'> 	irq_flow_handler_t		handler;</div><div class='ctx'> 	void				*handler_data;</div><div class='ctx'> 	const char			*handler_name;</div><div class='add'>+	msi_alloc_info_t		*alloc_data;</div><div class='ctx'> 	void				*data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -510,12 +514,14 @@ struct msi_domain_info {</div><div class='ctx'>  * @chip:	Interrupt chip for this domain</div><div class='ctx'>  * @ops:	MSI domain ops</div><div class='ctx'>  * @info:	MSI domain info data</div><div class='add'>+ * @alloc_info:	MSI domain allocation data (architecture specific)</div><div class='ctx'>  */</div><div class='ctx'> struct msi_domain_template {</div><div class='ctx'> 	char			name[48];</div><div class='ctx'> 	struct irq_chip		chip;</div><div class='ctx'> 	struct msi_domain_ops	ops;</div><div class='ctx'> 	struct msi_domain_info	info;</div><div class='add'>+	msi_alloc_info_t	alloc_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -556,6 +562,10 @@ enum {</div><div class='ctx'> 	MSI_FLAG_USE_DEV_FWNODE		= (1 &lt;&lt; 7),</div><div class='ctx'> 	/* Set parent-&gt;dev into domain-&gt;pm_dev on device domain creation */</div><div class='ctx'> 	MSI_FLAG_PARENT_PM_DEV		= (1 &lt;&lt; 8),</div><div class='add'>+	/* Support for parent mask/unmask */</div><div class='add'>+	MSI_FLAG_PCI_MSI_MASK_PARENT	= (1 &lt;&lt; 9),</div><div class='add'>+	/* Support for parent startup/shutdown */</div><div class='add'>+	MSI_FLAG_PCI_MSI_STARTUP_PARENT	= (1 &lt;&lt; 10),</div><div class='ctx'> </div><div class='ctx'> 	/* Mask for the generic functionality */</div><div class='ctx'> 	MSI_GENERIC_FLAGS_MASK		= GENMASK(15, 0),</div><div class='hunk'>@@ -573,8 +583,18 @@ enum {</div><div class='ctx'> 	MSI_FLAG_MSIX_CONTIGUOUS	= (1 &lt;&lt; 19),</div><div class='ctx'> 	/* PCI/MSI-X vectors can be dynamically allocated/freed post MSI-X enable */</div><div class='ctx'> 	MSI_FLAG_PCI_MSIX_ALLOC_DYN	= (1 &lt;&lt; 20),</div><div class='del'>-	/* Support for PCI/IMS */</div><div class='del'>-	MSI_FLAG_PCI_IMS		= (1 &lt;&lt; 21),</div><div class='add'>+	/* PCI MSIs cannot be steered separately to CPU cores */</div><div class='add'>+	MSI_FLAG_NO_AFFINITY		= (1 &lt;&lt; 21),</div><div class='add'>+	/* Inhibit usage of entry masking */</div><div class='add'>+	MSI_FLAG_NO_MASK		= (1 &lt;&lt; 22),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flags for msi_parent_ops::chip_flags</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	MSI_CHIP_FLAG_SET_EOI		= (1 &lt;&lt; 0),</div><div class='add'>+	MSI_CHIP_FLAG_SET_ACK		= (1 &lt;&lt; 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -582,6 +602,8 @@ enum {</div><div class='ctx'>  *</div><div class='ctx'>  * @supported_flags:	Required: The supported MSI flags of the parent domain</div><div class='ctx'>  * @required_flags:	Optional: The required MSI flags of the parent MSI domain</div><div class='add'>+ * @chip_flags:		Optional: Select MSI chip callbacks to update with defaults</div><div class='add'>+ *			in msi_lib_init_dev_msi_info().</div><div class='ctx'>  * @bus_select_token:	Optional: The bus token of the real parent domain for</div><div class='ctx'>  *			irq_domain::select()</div><div class='ctx'>  * @bus_select_mask:	Optional: A mask of supported BUS_DOMAINs for</div><div class='hunk'>@@ -594,6 +616,7 @@ enum {</div><div class='ctx'> struct msi_parent_ops {</div><div class='ctx'> 	u32		supported_flags;</div><div class='ctx'> 	u32		required_flags;</div><div class='add'>+	u32		chip_flags;</div><div class='ctx'> 	u32		bus_select_token;</div><div class='ctx'> 	u32		bus_select_mask;</div><div class='ctx'> 	const char	*prefix;</div><div class='hunk'>@@ -613,6 +636,10 @@ struct irq_domain *msi_create_irq_domain(struct fwnode_handle *fwnode,</div><div class='ctx'> 					 struct msi_domain_info *info,</div><div class='ctx'> 					 struct irq_domain *parent);</div><div class='ctx'> </div><div class='add'>+struct irq_domain_info;</div><div class='add'>+struct irq_domain *msi_create_parent_irq_domain(struct irq_domain_info *info,</div><div class='add'>+						const struct msi_parent_ops *msi_parent_ops);</div><div class='add'>+</div><div class='ctx'> bool msi_create_device_irq_domain(struct device *dev, unsigned int domid,</div><div class='ctx'> 				  const struct msi_domain_template *template,</div><div class='ctx'> 				  unsigned int hwsize, void *domain_data,</div><div class='hunk'>@@ -641,41 +668,18 @@ void msi_domain_free_irqs_all(struct device *dev, unsigned int domid);</div><div class='ctx'> </div><div class='ctx'> struct msi_domain_info *msi_get_domain_info(struct irq_domain *domain);</div><div class='ctx'> </div><div class='del'>-struct irq_domain *platform_msi_create_irq_domain(struct fwnode_handle *fwnode,</div><div class='del'>-						  struct msi_domain_info *info,</div><div class='del'>-						  struct irq_domain *parent);</div><div class='del'>-</div><div class='del'>-/* When an MSI domain is used as an intermediate domain */</div><div class='del'>-int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev,</div><div class='del'>-			    int nvec, msi_alloc_info_t *args);</div><div class='del'>-int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev,</div><div class='del'>-			     int virq, int nvec, msi_alloc_info_t *args);</div><div class='del'>-void msi_domain_depopulate_descs(struct device *dev, int virq, int nvec);</div><div class='del'>-</div><div class='del'>-struct irq_domain *</div><div class='del'>-__platform_msi_create_device_domain(struct device *dev,</div><div class='del'>-				    unsigned int nvec,</div><div class='del'>-				    bool is_tree,</div><div class='del'>-				    irq_write_msi_msg_t write_msi_msg,</div><div class='del'>-				    const struct irq_domain_ops *ops,</div><div class='del'>-				    void *host_data);</div><div class='del'>-</div><div class='del'>-#define platform_msi_create_device_domain(dev, nvec, write, ops, data)	\</div><div class='del'>-	__platform_msi_create_device_domain(dev, nvec, false, write, ops, data)</div><div class='del'>-#define platform_msi_create_device_tree_domain(dev, nvec, write, ops, data) \</div><div class='del'>-	__platform_msi_create_device_domain(dev, nvec, true, write, ops, data)</div><div class='del'>-</div><div class='del'>-int platform_msi_device_domain_alloc(struct irq_domain *domain, unsigned int virq,</div><div class='del'>-				     unsigned int nr_irqs);</div><div class='del'>-void platform_msi_device_domain_free(struct irq_domain *domain, unsigned int virq,</div><div class='del'>-				     unsigned int nvec);</div><div class='del'>-void *platform_msi_get_host_data(struct irq_domain *domain);</div><div class='ctx'> /* Per device platform MSI */</div><div class='ctx'> int platform_device_msi_init_and_alloc_irqs(struct device *dev, unsigned int nvec,</div><div class='ctx'> 					    irq_write_msi_msg_t write_msi_msg);</div><div class='ctx'> void platform_device_msi_free_irqs_all(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> bool msi_device_has_isolated_msi(struct device *dev);</div><div class='add'>+</div><div class='add'>+static inline int msi_domain_alloc_irqs(struct device *dev, unsigned int domid, int nirqs)</div><div class='add'>+{</div><div class='add'>+	return msi_domain_alloc_irqs_range(dev, domid, 0, nirqs - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_GENERIC_MSI_IRQ */</div><div class='ctx'> static inline bool msi_device_has_isolated_msi(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -697,11 +701,11 @@ void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);</div><div class='ctx'> void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);</div><div class='ctx'> void pci_msi_mask_irq(struct irq_data *data);</div><div class='ctx'> void pci_msi_unmask_irq(struct irq_data *data);</div><div class='del'>-struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,</div><div class='del'>-					     struct msi_domain_info *info,</div><div class='del'>-					     struct irq_domain *parent);</div><div class='ctx'> u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev);</div><div class='add'>+u32 pci_msi_map_rid_ctlr_node(struct pci_dev *pdev, struct device_node **node);</div><div class='ctx'> struct irq_domain *pci_msi_get_device_domain(struct pci_dev *pdev);</div><div class='add'>+void pci_msix_prepare_desc(struct irq_domain *domain, msi_alloc_info_t *arg,</div><div class='add'>+			   struct msi_desc *desc);</div><div class='ctx'> #else /* CONFIG_PCI_MSI */</div><div class='ctx'> static inline struct irq_domain *pci_msi_get_device_domain(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/msi_api.h b/include/linux/msi_api.h<br/>index 391087ad99b1..5ae72d1912c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/msi_api.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/msi_api.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/msi_api.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/msi_api.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@ struct device;</div><div class='ctx'>  */</div><div class='ctx'> enum msi_domain_ids {</div><div class='ctx'> 	MSI_DEFAULT_DOMAIN,</div><div class='del'>-	MSI_SECONDARY_DOMAIN,</div><div class='ctx'> 	MSI_MAX_DEVICE_IRQDOMAINS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h<br/>index 947410faf9e2..35ca19ae21ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/cfi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/cfi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/cfi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/cfi.h</a></div><div class='hunk'>@@ -308,32 +308,32 @@ static inline uint8_t cfi_read_query(struct map_info *map, uint32_t addr)</div><div class='ctx'> {</div><div class='ctx'> 	map_word val = map_read(map, addr);</div><div class='ctx'> </div><div class='del'>-	if (map_bankwidth_is_1(map)) {</div><div class='add'>+	if (map_bankwidth_is_1(map))</div><div class='ctx'> 		return val.x[0];</div><div class='del'>-	} else if (map_bankwidth_is_2(map)) {</div><div class='add'>+	if (map_bankwidth_is_2(map))</div><div class='ctx'> 		return cfi16_to_cpu(map, val.x[0]);</div><div class='del'>-	} else {</div><div class='del'>-		/* No point in a 64-bit byteswap since that would just be</div><div class='del'>-		   swapping the responses from different chips, and we are</div><div class='del'>-		   only interested in one chip (a representative sample) */</div><div class='del'>-		return cfi32_to_cpu(map, val.x[0]);</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * No point in a 64-bit byteswap since that would just be</div><div class='add'>+	 * swapping the responses from different chips, and we are</div><div class='add'>+	 * only interested in one chip (a representative sample)</div><div class='add'>+	 */</div><div class='add'>+	return cfi32_to_cpu(map, val.x[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline uint16_t cfi_read_query16(struct map_info *map, uint32_t addr)</div><div class='ctx'> {</div><div class='ctx'> 	map_word val = map_read(map, addr);</div><div class='ctx'> </div><div class='del'>-	if (map_bankwidth_is_1(map)) {</div><div class='add'>+	if (map_bankwidth_is_1(map))</div><div class='ctx'> 		return val.x[0] &amp; 0xff;</div><div class='del'>-	} else if (map_bankwidth_is_2(map)) {</div><div class='add'>+	if (map_bankwidth_is_2(map))</div><div class='ctx'> 		return cfi16_to_cpu(map, val.x[0]);</div><div class='del'>-	} else {</div><div class='del'>-		/* No point in a 64-bit byteswap since that would just be</div><div class='del'>-		   swapping the responses from different chips, and we are</div><div class='del'>-		   only interested in one chip (a representative sample) */</div><div class='del'>-		return cfi32_to_cpu(map, val.x[0]);</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * No point in a 64-bit byteswap since that would just be</div><div class='add'>+	 * swapping the responses from different chips, and we are</div><div class='add'>+	 * only interested in one chip (a representative sample)</div><div class='add'>+	 */</div><div class='add'>+	return cfi32_to_cpu(map, val.x[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void cfi_udelay(int us);</div><div class='head'>diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h<br/>index c04f690871ca..9798c1a1d3b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/flashchip.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/flashchip.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/flashchip.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/flashchip.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef enum {</div><div class='ctx'> 	FL_READY,</div><div class='head'>diff --git a/include/linux/mtd/lpc32xx_mlc.h b/include/linux/mtd/lpc32xx_mlc.h<br/>index d168c628c0d5..35e971be0950 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/lpc32xx_mlc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/lpc32xx_mlc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/lpc32xx_mlc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/lpc32xx_mlc.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/dmaengine.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct lpc32xx_mlc_platform_data {</div><div class='del'>-	bool (*dma_filter)(struct dma_chan *chan, void *filter_param);</div><div class='add'>+	dma_filter_fn dma_filter;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif  /* __LINUX_MTD_LPC32XX_MLC_H */</div><div class='head'>diff --git a/include/linux/mtd/lpc32xx_slc.h b/include/linux/mtd/lpc32xx_slc.h<br/>index cf54a9f80460..a044b806566b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/lpc32xx_slc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/lpc32xx_slc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/lpc32xx_slc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/lpc32xx_slc.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/dmaengine.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct lpc32xx_slc_platform_data {</div><div class='del'>-	bool (*dma_filter)(struct dma_chan *chan, void *filter_param);</div><div class='add'>+	dma_filter_fn dma_filter;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif  /* __LINUX_MTD_LPC32XX_SLC_H */</div><div class='head'>diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h<br/>index b4fa92a6e44b..75b0b2abc880 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/map.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/map.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/map.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/map.h</a></div><div class='hunk'>@@ -8,16 +8,17 @@</div><div class='ctx'> #ifndef __LINUX_MTD_MAP_H__</div><div class='ctx'> #define __LINUX_MTD_MAP_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;asm/barrier.h&gt;</div><div class='ctx'> </div><div class='add'>+struct device_node;</div><div class='add'>+struct module;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MTD_MAP_BANK_WIDTH_1</div><div class='ctx'> #define map_bankwidth(map) 1</div><div class='ctx'> #define map_bankwidth_is_1(map) (map_bankwidth(map) == 1)</div><div class='hunk'>@@ -188,6 +189,7 @@ typedef union {</div><div class='ctx'>    of living.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+struct mtd_chip_driver;</div><div class='ctx'> struct map_info {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	unsigned long size;</div><div class='head'>diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h<br/>index 914a9f974baa..8d10d9d2e830 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/mtd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/mtd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/mtd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/mtd.h</a></div><div class='hunk'>@@ -223,7 +223,7 @@ struct mtd_part {</div><div class='ctx'>  * @partitions_lock: lock protecting accesses to the partition list. Protects</div><div class='ctx'>  *		     not only the master partition list, but also all</div><div class='ctx'>  *		     sub-partitions.</div><div class='del'>- * @suspended: et to 1 when the device is suspended, 0 otherwise</div><div class='add'>+ * @suspended: set to 1 when the device is suspended, 0 otherwise</div><div class='ctx'>  *</div><div class='ctx'>  * This struct is embedded in mtd_info and contains master-specific</div><div class='ctx'>  * properties/fields. The master is the root MTD device from the MTD partition</div><div class='head'>diff --git a/include/linux/mtd/nand-ecc-mxic.h b/include/linux/mtd/nand-ecc-mxic.h<br/>index b125926e458c..0da4b2999576 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/nand-ecc-mxic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/nand-ecc-mxic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/nand-ecc-mxic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/nand-ecc-mxic.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@ struct mxic_ecc_engine;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_MTD_NAND_ECC_MXIC) &amp;&amp; IS_REACHABLE(CONFIG_MTD_NAND_CORE)</div><div class='ctx'> </div><div class='del'>-struct nand_ecc_engine_ops *mxic_ecc_get_pipelined_ops(void);</div><div class='add'>+const struct nand_ecc_engine_ops *mxic_ecc_get_pipelined_ops(void);</div><div class='ctx'> struct nand_ecc_engine *mxic_ecc_get_pipelined_engine(struct platform_device *spi_pdev);</div><div class='ctx'> void mxic_ecc_put_pipelined_engine(struct nand_ecc_engine *eng);</div><div class='ctx'> int mxic_ecc_process_data_pipelined(struct nand_ecc_engine *eng,</div><div class='hunk'>@@ -24,7 +24,7 @@ int mxic_ecc_process_data_pipelined(struct nand_ecc_engine *eng,</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_MTD_NAND_ECC_MXIC */</div><div class='ctx'> </div><div class='del'>-static inline struct nand_ecc_engine_ops *mxic_ecc_get_pipelined_ops(void)</div><div class='add'>+static inline const struct nand_ecc_engine_ops *mxic_ecc_get_pipelined_ops(void)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/mtd/nand-qpic-common.h b/include/linux/mtd/nand-qpic-common.h<br/>new file mode 100644<br/>index 000000000000..e8201d1b7cf9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/nand-qpic-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/nand-qpic-common.h</a></div><div class='hunk'>@@ -0,0 +1,483 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * QCOM QPIC common APIs header file</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023 Qualcomm Inc.</div><div class='add'>+ * Authors:	Md sadre Alam	&lt;quic_mdalam@quicinc.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __MTD_NAND_QPIC_COMMON_H__</div><div class='add'>+#define __MTD_NAND_QPIC_COMMON_H__</div><div class='add'>+</div><div class='add'>+/* NANDc reg offsets */</div><div class='add'>+#define	NAND_FLASH_CMD			0x00</div><div class='add'>+#define	NAND_ADDR0			0x04</div><div class='add'>+#define	NAND_ADDR1			0x08</div><div class='add'>+#define	NAND_FLASH_CHIP_SELECT		0x0c</div><div class='add'>+#define	NAND_EXEC_CMD			0x10</div><div class='add'>+#define	NAND_FLASH_STATUS		0x14</div><div class='add'>+#define	NAND_BUFFER_STATUS		0x18</div><div class='add'>+#define	NAND_DEV0_CFG0			0x20</div><div class='add'>+#define	NAND_DEV0_CFG1			0x24</div><div class='add'>+#define	NAND_DEV0_ECC_CFG		0x28</div><div class='add'>+#define	NAND_AUTO_STATUS_EN		0x2c</div><div class='add'>+#define	NAND_DEV1_CFG0			0x30</div><div class='add'>+#define	NAND_DEV1_CFG1			0x34</div><div class='add'>+#define	NAND_READ_ID			0x40</div><div class='add'>+#define	NAND_READ_STATUS		0x44</div><div class='add'>+#define	NAND_DEV_CMD0			0xa0</div><div class='add'>+#define	NAND_DEV_CMD1			0xa4</div><div class='add'>+#define	NAND_DEV_CMD2			0xa8</div><div class='add'>+#define	NAND_DEV_CMD_VLD		0xac</div><div class='add'>+#define	SFLASHC_BURST_CFG		0xe0</div><div class='add'>+#define	NAND_ERASED_CW_DETECT_CFG	0xe8</div><div class='add'>+#define	NAND_ERASED_CW_DETECT_STATUS	0xec</div><div class='add'>+#define	NAND_EBI2_ECC_BUF_CFG		0xf0</div><div class='add'>+#define	FLASH_BUF_ACC			0x100</div><div class='add'>+</div><div class='add'>+#define	NAND_CTRL			0xf00</div><div class='add'>+#define	NAND_VERSION			0xf08</div><div class='add'>+#define	NAND_READ_LOCATION_0		0xf20</div><div class='add'>+#define	NAND_READ_LOCATION_1		0xf24</div><div class='add'>+#define	NAND_READ_LOCATION_2		0xf28</div><div class='add'>+#define	NAND_READ_LOCATION_3		0xf2c</div><div class='add'>+#define	NAND_READ_LOCATION_LAST_CW_0	0xf40</div><div class='add'>+#define	NAND_READ_LOCATION_LAST_CW_1	0xf44</div><div class='add'>+#define	NAND_READ_LOCATION_LAST_CW_2	0xf48</div><div class='add'>+#define	NAND_READ_LOCATION_LAST_CW_3	0xf4c</div><div class='add'>+</div><div class='add'>+/* dummy register offsets, used by qcom_write_reg_dma */</div><div class='add'>+#define	NAND_DEV_CMD1_RESTORE		0xdead</div><div class='add'>+#define	NAND_DEV_CMD_VLD_RESTORE	0xbeef</div><div class='add'>+</div><div class='add'>+/* NAND_FLASH_CMD bits */</div><div class='add'>+#define	PAGE_ACC			BIT(4)</div><div class='add'>+#define	LAST_PAGE			BIT(5)</div><div class='add'>+</div><div class='add'>+/* NAND_FLASH_CHIP_SELECT bits */</div><div class='add'>+#define	NAND_DEV_SEL			0</div><div class='add'>+#define	DM_EN				BIT(2)</div><div class='add'>+</div><div class='add'>+/* NAND_FLASH_STATUS bits */</div><div class='add'>+#define	FS_OP_ERR			BIT(4)</div><div class='add'>+#define	FS_READY_BSY_N			BIT(5)</div><div class='add'>+#define	FS_MPU_ERR			BIT(8)</div><div class='add'>+#define	FS_DEVICE_STS_ERR		BIT(16)</div><div class='add'>+#define	FS_DEVICE_WP			BIT(23)</div><div class='add'>+</div><div class='add'>+/* NAND_BUFFER_STATUS bits */</div><div class='add'>+#define	BS_UNCORRECTABLE_BIT		BIT(8)</div><div class='add'>+#define	BS_CORRECTABLE_ERR_MSK		0x1f</div><div class='add'>+</div><div class='add'>+/* NAND_DEVn_CFG0 bits */</div><div class='add'>+#define	DISABLE_STATUS_AFTER_WRITE	BIT(4)</div><div class='add'>+#define	CW_PER_PAGE_MASK		GENMASK(8, 6)</div><div class='add'>+#define	UD_SIZE_BYTES_MASK		GENMASK(18, 9)</div><div class='add'>+#define	ECC_PARITY_SIZE_BYTES_RS	GENMASK(22, 19)</div><div class='add'>+#define	SPARE_SIZE_BYTES_MASK		GENMASK(26, 23)</div><div class='add'>+#define	NUM_ADDR_CYCLES_MASK		GENMASK(29, 27)</div><div class='add'>+#define	STATUS_BFR_READ			BIT(30)</div><div class='add'>+#define	SET_RD_MODE_AFTER_STATUS	BIT(31)</div><div class='add'>+</div><div class='add'>+/* NAND_DEVn_CFG0 bits */</div><div class='add'>+#define	DEV0_CFG1_ECC_DISABLE		BIT(0)</div><div class='add'>+#define	WIDE_FLASH			BIT(1)</div><div class='add'>+#define	NAND_RECOVERY_CYCLES_MASK	GENMASK(4, 2)</div><div class='add'>+#define	CS_ACTIVE_BSY			BIT(5)</div><div class='add'>+#define	BAD_BLOCK_BYTE_NUM_MASK		GENMASK(15, 6)</div><div class='add'>+#define	BAD_BLOCK_IN_SPARE_AREA		BIT(16)</div><div class='add'>+#define	WR_RD_BSY_GAP_MASK		GENMASK(22, 17)</div><div class='add'>+#define	ENABLE_BCH_ECC			BIT(27)</div><div class='add'>+</div><div class='add'>+/* NAND_DEV0_ECC_CFG bits */</div><div class='add'>+#define	ECC_CFG_ECC_DISABLE		BIT(0)</div><div class='add'>+#define	ECC_SW_RESET			BIT(1)</div><div class='add'>+#define	ECC_MODE_MASK			GENMASK(5, 4)</div><div class='add'>+#define	ECC_MODE_4BIT			0</div><div class='add'>+#define	ECC_MODE_8BIT			1</div><div class='add'>+#define	ECC_PARITY_SIZE_BYTES_BCH_MASK	GENMASK(12, 8)</div><div class='add'>+#define	ECC_NUM_DATA_BYTES_MASK		GENMASK(25, 16)</div><div class='add'>+#define	ECC_FORCE_CLK_OPEN		BIT(30)</div><div class='add'>+</div><div class='add'>+/* NAND_DEV_CMD1 bits */</div><div class='add'>+#define	READ_ADDR_MASK			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* NAND_DEV_CMD_VLD bits */</div><div class='add'>+#define	READ_START_VLD			BIT(0)</div><div class='add'>+#define	READ_STOP_VLD			BIT(1)</div><div class='add'>+#define	WRITE_START_VLD			BIT(2)</div><div class='add'>+#define	ERASE_START_VLD			BIT(3)</div><div class='add'>+#define	SEQ_READ_START_VLD		BIT(4)</div><div class='add'>+</div><div class='add'>+/* NAND_EBI2_ECC_BUF_CFG bits */</div><div class='add'>+#define	NUM_STEPS_MASK			GENMASK(9, 0)</div><div class='add'>+</div><div class='add'>+/* NAND_ERASED_CW_DETECT_CFG bits */</div><div class='add'>+#define	ERASED_CW_ECC_MASK		1</div><div class='add'>+#define	AUTO_DETECT_RES			0</div><div class='add'>+#define	MASK_ECC			BIT(ERASED_CW_ECC_MASK)</div><div class='add'>+#define	RESET_ERASED_DET		BIT(AUTO_DETECT_RES)</div><div class='add'>+#define	ACTIVE_ERASED_DET		(0 &lt;&lt; AUTO_DETECT_RES)</div><div class='add'>+#define	CLR_ERASED_PAGE_DET		(RESET_ERASED_DET | MASK_ECC)</div><div class='add'>+#define	SET_ERASED_PAGE_DET		(ACTIVE_ERASED_DET | MASK_ECC)</div><div class='add'>+</div><div class='add'>+/* NAND_ERASED_CW_DETECT_STATUS bits */</div><div class='add'>+#define	PAGE_ALL_ERASED			BIT(7)</div><div class='add'>+#define	CODEWORD_ALL_ERASED		BIT(6)</div><div class='add'>+#define	PAGE_ERASED			BIT(5)</div><div class='add'>+#define	CODEWORD_ERASED			BIT(4)</div><div class='add'>+#define	ERASED_PAGE			(PAGE_ALL_ERASED | PAGE_ERASED)</div><div class='add'>+#define	ERASED_CW			(CODEWORD_ALL_ERASED | CODEWORD_ERASED)</div><div class='add'>+</div><div class='add'>+/* NAND_READ_LOCATION_n bits */</div><div class='add'>+#define READ_LOCATION_OFFSET_MASK	GENMASK(9, 0)</div><div class='add'>+#define READ_LOCATION_SIZE_MASK		GENMASK(25, 16)</div><div class='add'>+#define READ_LOCATION_LAST_MASK		BIT(31)</div><div class='add'>+</div><div class='add'>+/* Version Mask */</div><div class='add'>+#define	NAND_VERSION_MAJOR_MASK		0xf0000000</div><div class='add'>+#define	NAND_VERSION_MAJOR_SHIFT	28</div><div class='add'>+#define	NAND_VERSION_MINOR_MASK		0x0fff0000</div><div class='add'>+#define	NAND_VERSION_MINOR_SHIFT	16</div><div class='add'>+</div><div class='add'>+/* NAND OP_CMDs */</div><div class='add'>+#define	OP_PAGE_READ			0x2</div><div class='add'>+#define	OP_PAGE_READ_WITH_ECC		0x3</div><div class='add'>+#define	OP_PAGE_READ_WITH_ECC_SPARE	0x4</div><div class='add'>+#define	OP_PAGE_READ_ONFI_READ		0x5</div><div class='add'>+#define	OP_PROGRAM_PAGE			0x6</div><div class='add'>+#define	OP_PAGE_PROGRAM_WITH_ECC	0x7</div><div class='add'>+#define	OP_PROGRAM_PAGE_SPARE		0x9</div><div class='add'>+#define	OP_BLOCK_ERASE			0xa</div><div class='add'>+#define	OP_CHECK_STATUS			0xc</div><div class='add'>+#define	OP_FETCH_ID			0xb</div><div class='add'>+#define	OP_RESET_DEVICE			0xd</div><div class='add'>+</div><div class='add'>+/* Default Value for NAND_DEV_CMD_VLD */</div><div class='add'>+#define NAND_DEV_CMD_VLD_VAL		(READ_START_VLD | WRITE_START_VLD | \</div><div class='add'>+					 ERASE_START_VLD | SEQ_READ_START_VLD)</div><div class='add'>+</div><div class='add'>+/* NAND_CTRL bits */</div><div class='add'>+#define	BAM_MODE_EN			BIT(0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * the NAND controller performs reads/writes with ECC in 516 byte chunks.</div><div class='add'>+ * the driver calls the chunks 'step' or 'codeword' interchangeably</div><div class='add'>+ */</div><div class='add'>+#define	NANDC_STEP_SIZE			512</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * the largest page size we support is 8K, this will have 16 steps/codewords</div><div class='add'>+ * of 512 bytes each</div><div class='add'>+ */</div><div class='add'>+#define	MAX_NUM_STEPS			(SZ_8K / NANDC_STEP_SIZE)</div><div class='add'>+</div><div class='add'>+/* we read at most 3 registers per codeword scan */</div><div class='add'>+#define	MAX_REG_RD			(3 * MAX_NUM_STEPS)</div><div class='add'>+</div><div class='add'>+/* ECC modes supported by the controller */</div><div class='add'>+#define	ECC_NONE	BIT(0)</div><div class='add'>+#define	ECC_RS_4BIT	BIT(1)</div><div class='add'>+#define	ECC_BCH_4BIT	BIT(2)</div><div class='add'>+#define	ECC_BCH_8BIT	BIT(3)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns the actual register address for all NAND_DEV_ registers</div><div class='add'>+ * (i.e. NAND_DEV_CMD0, NAND_DEV_CMD1, NAND_DEV_CMD2 and NAND_DEV_CMD_VLD)</div><div class='add'>+ */</div><div class='add'>+#define dev_cmd_reg_addr(nandc, reg) ((nandc)-&gt;props-&gt;dev_cmd_reg_start + (reg))</div><div class='add'>+</div><div class='add'>+/* Returns the dma address for reg read buffer */</div><div class='add'>+#define reg_buf_dma_addr(chip, vaddr) \</div><div class='add'>+	((chip)-&gt;reg_read_dma + \</div><div class='add'>+	((u8 *)(vaddr) - (u8 *)(chip)-&gt;reg_read_buf))</div><div class='add'>+</div><div class='add'>+#define QPIC_PER_CW_CMD_ELEMENTS	32</div><div class='add'>+#define QPIC_PER_CW_CMD_SGL		32</div><div class='add'>+#define QPIC_PER_CW_DATA_SGL		8</div><div class='add'>+</div><div class='add'>+#define QPIC_NAND_COMPLETION_TIMEOUT	msecs_to_jiffies(2000)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flags used in DMA descriptor preparation helper functions</div><div class='add'>+ * (i.e. qcom_read_reg_dma/qcom_write_reg_dma/qcom_read_data_dma/qcom_write_data_dma)</div><div class='add'>+ */</div><div class='add'>+/* Don't set the EOT in current tx BAM sgl */</div><div class='add'>+#define NAND_BAM_NO_EOT			BIT(0)</div><div class='add'>+/* Set the NWD flag in current BAM sgl */</div><div class='add'>+#define NAND_BAM_NWD			BIT(1)</div><div class='add'>+/* Finish writing in the current BAM sgl and start writing in another BAM sgl */</div><div class='add'>+#define NAND_BAM_NEXT_SGL		BIT(2)</div><div class='add'>+/*</div><div class='add'>+ * Erased codeword status is being used two times in single transfer so this</div><div class='add'>+ * flag will determine the current value of erased codeword status register</div><div class='add'>+ */</div><div class='add'>+#define NAND_ERASED_CW_SET		BIT(4)</div><div class='add'>+</div><div class='add'>+#define MAX_ADDRESS_CYCLE		5</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This data type corresponds to the BAM transaction which will be used for all</div><div class='add'>+ * NAND transfers.</div><div class='add'>+ * @bam_ce - the array of BAM command elements</div><div class='add'>+ * @cmd_sgl - sgl for NAND BAM command pipe</div><div class='add'>+ * @data_sgl - sgl for NAND BAM consumer/producer pipe</div><div class='add'>+ * @last_data_desc - last DMA desc in data channel (tx/rx).</div><div class='add'>+ * @last_cmd_desc - last DMA desc in command channel.</div><div class='add'>+ * @txn_done - completion for NAND transfer.</div><div class='add'>+ * @bam_ce_nitems - the number of elements in the @bam_ce array</div><div class='add'>+ * @cmd_sgl_nitems - the number of elements in the @cmd_sgl array</div><div class='add'>+ * @data_sgl_nitems - the number of elements in the @data_sgl array</div><div class='add'>+ * @bam_ce_pos - the index in bam_ce which is available for next sgl</div><div class='add'>+ * @bam_ce_start - the index in bam_ce which marks the start position ce</div><div class='add'>+ *		   for current sgl. It will be used for size calculation</div><div class='add'>+ *		   for current sgl</div><div class='add'>+ * @cmd_sgl_pos - current index in command sgl.</div><div class='add'>+ * @cmd_sgl_start - start index in command sgl.</div><div class='add'>+ * @tx_sgl_pos - current index in data sgl for tx.</div><div class='add'>+ * @tx_sgl_start - start index in data sgl for tx.</div><div class='add'>+ * @rx_sgl_pos - current index in data sgl for rx.</div><div class='add'>+ * @rx_sgl_start - start index in data sgl for rx.</div><div class='add'>+ */</div><div class='add'>+struct bam_transaction {</div><div class='add'>+	struct bam_cmd_element *bam_ce;</div><div class='add'>+	struct scatterlist *cmd_sgl;</div><div class='add'>+	struct scatterlist *data_sgl;</div><div class='add'>+	struct dma_async_tx_descriptor *last_data_desc;</div><div class='add'>+	struct dma_async_tx_descriptor *last_cmd_desc;</div><div class='add'>+	struct completion txn_done;</div><div class='add'>+</div><div class='add'>+	unsigned int bam_ce_nitems;</div><div class='add'>+	unsigned int cmd_sgl_nitems;</div><div class='add'>+	unsigned int data_sgl_nitems;</div><div class='add'>+</div><div class='add'>+	struct_group(bam_positions,</div><div class='add'>+		u32 bam_ce_pos;</div><div class='add'>+		u32 bam_ce_start;</div><div class='add'>+		u32 cmd_sgl_pos;</div><div class='add'>+		u32 cmd_sgl_start;</div><div class='add'>+		u32 tx_sgl_pos;</div><div class='add'>+		u32 tx_sgl_start;</div><div class='add'>+		u32 rx_sgl_pos;</div><div class='add'>+		u32 rx_sgl_start;</div><div class='add'>+</div><div class='add'>+	);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This data type corresponds to the nand dma descriptor</div><div class='add'>+ * @dma_desc - low level DMA engine descriptor</div><div class='add'>+ * @list - list for desc_info</div><div class='add'>+ *</div><div class='add'>+ * @adm_sgl - sgl which will be used for single sgl dma descriptor. Only used by</div><div class='add'>+ *	      ADM</div><div class='add'>+ * @bam_sgl - sgl which will be used for dma descriptor. Only used by BAM</div><div class='add'>+ * @sgl_cnt - number of SGL in bam_sgl. Only used by BAM</div><div class='add'>+ * @dir - DMA transfer direction</div><div class='add'>+ */</div><div class='add'>+struct desc_info {</div><div class='add'>+	struct dma_async_tx_descriptor *dma_desc;</div><div class='add'>+	struct list_head node;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct scatterlist adm_sgl;</div><div class='add'>+		struct {</div><div class='add'>+			struct scatterlist *bam_sgl;</div><div class='add'>+			int sgl_cnt;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * holds the current register values that we want to write. acts as a contiguous</div><div class='add'>+ * chunk of memory which we use to write the controller registers through DMA.</div><div class='add'>+ */</div><div class='add'>+struct nandc_regs {</div><div class='add'>+	__le32 cmd;</div><div class='add'>+	__le32 addr0;</div><div class='add'>+	__le32 addr1;</div><div class='add'>+	__le32 chip_sel;</div><div class='add'>+	__le32 exec;</div><div class='add'>+</div><div class='add'>+	__le32 cfg0;</div><div class='add'>+	__le32 cfg1;</div><div class='add'>+	__le32 ecc_bch_cfg;</div><div class='add'>+</div><div class='add'>+	__le32 clrflashstatus;</div><div class='add'>+	__le32 clrreadstatus;</div><div class='add'>+</div><div class='add'>+	__le32 cmd1;</div><div class='add'>+	__le32 vld;</div><div class='add'>+</div><div class='add'>+	__le32 orig_cmd1;</div><div class='add'>+	__le32 orig_vld;</div><div class='add'>+</div><div class='add'>+	__le32 ecc_buf_cfg;</div><div class='add'>+	__le32 read_location0;</div><div class='add'>+	__le32 read_location1;</div><div class='add'>+	__le32 read_location2;</div><div class='add'>+	__le32 read_location3;</div><div class='add'>+	__le32 read_location_last0;</div><div class='add'>+	__le32 read_location_last1;</div><div class='add'>+	__le32 read_location_last2;</div><div class='add'>+	__le32 read_location_last3;</div><div class='add'>+	__le32 spi_cfg;</div><div class='add'>+	__le32 num_addr_cycle;</div><div class='add'>+	__le32 busy_wait_cnt;</div><div class='add'>+	__le32 flash_feature;</div><div class='add'>+</div><div class='add'>+	__le32 erased_cw_detect_cfg_clr;</div><div class='add'>+	__le32 erased_cw_detect_cfg_set;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NAND controller data struct</div><div class='add'>+ *</div><div class='add'>+ * @dev:			parent device</div><div class='add'>+ *</div><div class='add'>+ * @base:			MMIO base</div><div class='add'>+ *</div><div class='add'>+ * @core_clk:			controller clock</div><div class='add'>+ * @aon_clk:			another controller clock</div><div class='add'>+ * @iomacro_clk:		io macro clock</div><div class='add'>+ *</div><div class='add'>+ * @regs:			a contiguous chunk of memory for DMA register</div><div class='add'>+ *				writes. contains the register values to be</div><div class='add'>+ *				written to controller</div><div class='add'>+ *</div><div class='add'>+ * @props:			properties of current NAND controller,</div><div class='add'>+ *				initialized via DT match data</div><div class='add'>+ *</div><div class='add'>+ * @controller:			base controller structure</div><div class='add'>+ * @qspi:			qpic spi structure</div><div class='add'>+ * @host_list:			list containing all the chips attached to the</div><div class='add'>+ *				controller</div><div class='add'>+ *</div><div class='add'>+ * @chan:			dma channel</div><div class='add'>+ * @cmd_crci:			ADM DMA CRCI for command flow control</div><div class='add'>+ * @data_crci:			ADM DMA CRCI for data flow control</div><div class='add'>+ *</div><div class='add'>+ * @desc_list:			DMA descriptor list (list of desc_infos)</div><div class='add'>+ *</div><div class='add'>+ * @data_buffer:		our local DMA buffer for page read/writes,</div><div class='add'>+ *				used when we can't use the buffer provided</div><div class='add'>+ *				by upper layers directly</div><div class='add'>+ * @reg_read_buf:		local buffer for reading back registers via DMA</div><div class='add'>+ *</div><div class='add'>+ * @base_phys:			physical base address of controller registers</div><div class='add'>+ * @base_dma:			dma base address of controller registers</div><div class='add'>+ * @reg_read_dma:		contains dma address for register read buffer</div><div class='add'>+ *</div><div class='add'>+ * @buf_size/count/start:	markers for chip-&gt;legacy.read_buf/write_buf</div><div class='add'>+ *				functions</div><div class='add'>+ * @max_cwperpage:		maximum QPIC codewords required. calculated</div><div class='add'>+ *				from all connected NAND devices pagesize</div><div class='add'>+ *</div><div class='add'>+ * @reg_read_pos:		marker for data read in reg_read_buf</div><div class='add'>+ *</div><div class='add'>+ * @cmd1/vld:			some fixed controller register values</div><div class='add'>+ *</div><div class='add'>+ * @exec_opwrite:		flag to select correct number of code word</div><div class='add'>+ *				while reading status</div><div class='add'>+ */</div><div class='add'>+struct qcom_nand_controller {</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	void __iomem *base;</div><div class='add'>+</div><div class='add'>+	struct clk *core_clk;</div><div class='add'>+	struct clk *aon_clk;</div><div class='add'>+</div><div class='add'>+	struct nandc_regs *regs;</div><div class='add'>+	struct bam_transaction *bam_txn;</div><div class='add'>+</div><div class='add'>+	const struct qcom_nandc_props *props;</div><div class='add'>+</div><div class='add'>+	struct nand_controller *controller;</div><div class='add'>+	struct qpic_spi_nand *qspi;</div><div class='add'>+	struct list_head host_list;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		/* will be used only by QPIC for BAM DMA */</div><div class='add'>+		struct {</div><div class='add'>+			struct dma_chan *tx_chan;</div><div class='add'>+			struct dma_chan *rx_chan;</div><div class='add'>+			struct dma_chan *cmd_chan;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/* will be used only by EBI2 for ADM DMA */</div><div class='add'>+		struct {</div><div class='add'>+			struct dma_chan *chan;</div><div class='add'>+			unsigned int cmd_crci;</div><div class='add'>+			unsigned int data_crci;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct list_head desc_list;</div><div class='add'>+</div><div class='add'>+	u8		*data_buffer;</div><div class='add'>+	__le32		*reg_read_buf;</div><div class='add'>+</div><div class='add'>+	phys_addr_t base_phys;</div><div class='add'>+	dma_addr_t base_dma;</div><div class='add'>+	dma_addr_t reg_read_dma;</div><div class='add'>+</div><div class='add'>+	int		buf_size;</div><div class='add'>+	int		buf_count;</div><div class='add'>+	int		buf_start;</div><div class='add'>+	unsigned int	max_cwperpage;</div><div class='add'>+</div><div class='add'>+	int reg_read_pos;</div><div class='add'>+</div><div class='add'>+	u32 cmd1, vld;</div><div class='add'>+	bool exec_opwrite;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This data type corresponds to the NAND controller properties which varies</div><div class='add'>+ * among different NAND controllers.</div><div class='add'>+ * @ecc_modes - ecc mode for NAND</div><div class='add'>+ * @dev_cmd_reg_start - NAND_DEV_CMD_* registers starting offset</div><div class='add'>+ * @supports_bam - whether NAND controller is using BAM</div><div class='add'>+ * @nandc_part_of_qpic - whether NAND controller is part of qpic IP</div><div class='add'>+ * @qpic_version2 - flag to indicate QPIC IP version 2</div><div class='add'>+ * @use_codeword_fixup - whether NAND has different layout for boot partitions</div><div class='add'>+ */</div><div class='add'>+struct qcom_nandc_props {</div><div class='add'>+	u32 ecc_modes;</div><div class='add'>+	u32 dev_cmd_reg_start;</div><div class='add'>+	u32 bam_offset;</div><div class='add'>+	bool supports_bam;</div><div class='add'>+	bool nandc_part_of_qpic;</div><div class='add'>+	bool qpic_version2;</div><div class='add'>+	bool use_codeword_fixup;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void qcom_free_bam_transaction(struct qcom_nand_controller *nandc);</div><div class='add'>+struct bam_transaction *qcom_alloc_bam_transaction(struct qcom_nand_controller *nandc);</div><div class='add'>+void qcom_clear_bam_transaction(struct qcom_nand_controller *nandc);</div><div class='add'>+void qcom_qpic_bam_dma_done(void *data);</div><div class='add'>+void qcom_nandc_dev_to_mem(struct qcom_nand_controller *nandc, bool is_cpu);</div><div class='add'>+int qcom_prepare_bam_async_desc(struct qcom_nand_controller *nandc,</div><div class='add'>+				struct dma_chan *chan, unsigned long flags);</div><div class='add'>+int qcom_prep_bam_dma_desc_cmd(struct qcom_nand_controller *nandc, bool read,</div><div class='add'>+			       int reg_off, const void *vaddr, int size, unsigned int flags);</div><div class='add'>+int qcom_prep_bam_dma_desc_data(struct qcom_nand_controller *nandc, bool read,</div><div class='add'>+				const void *vaddr, int size, unsigned int flags);</div><div class='add'>+int qcom_prep_adm_dma_desc(struct qcom_nand_controller *nandc, bool read, int reg_off,</div><div class='add'>+			   const void *vaddr, int size, bool flow_control);</div><div class='add'>+int qcom_read_reg_dma(struct qcom_nand_controller *nandc, int first, int num_regs,</div><div class='add'>+		      unsigned int flags);</div><div class='add'>+int qcom_write_reg_dma(struct qcom_nand_controller *nandc, __le32 *vaddr, int first,</div><div class='add'>+		       int num_regs, unsigned int flags);</div><div class='add'>+int qcom_read_data_dma(struct qcom_nand_controller *nandc, int reg_off, const u8 *vaddr,</div><div class='add'>+		       int size, unsigned int flags);</div><div class='add'>+int qcom_write_data_dma(struct qcom_nand_controller *nandc, int reg_off, const u8 *vaddr,</div><div class='add'>+			int size, unsigned int flags);</div><div class='add'>+int qcom_submit_descs(struct qcom_nand_controller *nandc);</div><div class='add'>+void qcom_clear_read_regs(struct qcom_nand_controller *nandc);</div><div class='add'>+void qcom_nandc_unalloc(struct qcom_nand_controller *nandc);</div><div class='add'>+int qcom_nandc_alloc(struct qcom_nand_controller *nandc);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h<br/>index b2996dc987ff..09c8c93e4dba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/nand.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/nand.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/nand.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/nand.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@ struct nand_device;</div><div class='ctx'>  * @oobsize: OOB area size</div><div class='ctx'>  * @pages_per_eraseblock: number of pages per eraseblock</div><div class='ctx'>  * @eraseblocks_per_lun: number of eraseblocks per LUN (Logical Unit Number)</div><div class='del'>- * @max_bad_eraseblocks_per_lun: maximum number of eraseblocks per LUN</div><div class='add'>+ * @max_bad_eraseblocks_per_lun: maximum number of bad eraseblocks per LUN</div><div class='ctx'>  * @planes_per_lun: number of planes per LUN</div><div class='ctx'>  * @luns_per_target: number of LUN per target (target is a synonym for die)</div><div class='ctx'>  * @ntargets: total number of targets exposed by the NAND device</div><div class='hunk'>@@ -103,6 +103,8 @@ enum nand_page_io_req_type {</div><div class='ctx'>  * @ooblen: the number of OOB bytes to read from/write to this page</div><div class='ctx'>  * @oobbuf: buffer to store OOB data in or get OOB data from</div><div class='ctx'>  * @mode: one of the %MTD_OPS_XXX mode</div><div class='add'>+ * @continuous: no need to start over the operation at the end of each page, the</div><div class='add'>+ * NAND device will automatically prepare the next one</div><div class='ctx'>  *</div><div class='ctx'>  * This object is used to pass per-page I/O requests to NAND sub-layers. This</div><div class='ctx'>  * way all useful information are already formatted in a useful way and</div><div class='hunk'>@@ -125,6 +127,7 @@ struct nand_page_io_req {</div><div class='ctx'> 		void *in;</div><div class='ctx'> 	} oobbuf;</div><div class='ctx'> 	int mode;</div><div class='add'>+	bool continuous;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct mtd_ooblayout_ops *nand_get_small_page_ooblayout(void);</div><div class='hunk'>@@ -290,7 +293,7 @@ enum nand_ecc_engine_integration {</div><div class='ctx'> struct nand_ecc_engine {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct list_head node;</div><div class='del'>-	struct nand_ecc_engine_ops *ops;</div><div class='add'>+	const struct nand_ecc_engine_ops *ops;</div><div class='ctx'> 	enum nand_ecc_engine_integration integration;</div><div class='ctx'> 	void *priv;</div><div class='ctx'> };</div><div class='hunk'>@@ -906,19 +909,19 @@ static inline void nanddev_pos_next_page(struct nand_device *nand,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_io_iter_init - Initialize a NAND I/O iterator</div><div class='add'>+ * nand_io_page_iter_init - Initialize a NAND I/O iterator</div><div class='ctx'>  * @nand: NAND device</div><div class='ctx'>  * @offs: absolute offset</div><div class='ctx'>  * @req: MTD request</div><div class='ctx'>  * @iter: NAND I/O iterator</div><div class='ctx'>  *</div><div class='ctx'>  * Initializes a NAND iterator based on the information passed by the MTD</div><div class='del'>- * layer.</div><div class='add'>+ * layer for page jumps.</div><div class='ctx'>  */</div><div class='del'>-static inline void nanddev_io_iter_init(struct nand_device *nand,</div><div class='del'>-					enum nand_page_io_req_type reqtype,</div><div class='del'>-					loff_t offs, struct mtd_oob_ops *req,</div><div class='del'>-					struct nand_io_iter *iter)</div><div class='add'>+static inline void nanddev_io_page_iter_init(struct nand_device *nand,</div><div class='add'>+					     enum nand_page_io_req_type reqtype,</div><div class='add'>+					     loff_t offs, struct mtd_oob_ops *req,</div><div class='add'>+					     struct nand_io_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *mtd = nanddev_to_mtd(nand);</div><div class='ctx'> </div><div class='hunk'>@@ -937,6 +940,43 @@ static inline void nanddev_io_iter_init(struct nand_device *nand,</div><div class='ctx'> 	iter-&gt;req.ooblen = min_t(unsigned int,</div><div class='ctx'> 				 iter-&gt;oobbytes_per_page - iter-&gt;req.ooboffs,</div><div class='ctx'> 				 iter-&gt;oobleft);</div><div class='add'>+	iter-&gt;req.continuous = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nand_io_block_iter_init - Initialize a NAND I/O iterator</div><div class='add'>+ * @nand: NAND device</div><div class='add'>+ * @offs: absolute offset</div><div class='add'>+ * @req: MTD request</div><div class='add'>+ * @iter: NAND I/O iterator</div><div class='add'>+ *</div><div class='add'>+ * Initializes a NAND iterator based on the information passed by the MTD</div><div class='add'>+ * layer for block jumps (no OOB)</div><div class='add'>+ *</div><div class='add'>+ * In practice only reads may leverage this iterator.</div><div class='add'>+ */</div><div class='add'>+static inline void nanddev_io_block_iter_init(struct nand_device *nand,</div><div class='add'>+					      enum nand_page_io_req_type reqtype,</div><div class='add'>+					      loff_t offs, struct mtd_oob_ops *req,</div><div class='add'>+					      struct nand_io_iter *iter)</div><div class='add'>+{</div><div class='add'>+	unsigned int offs_in_eb;</div><div class='add'>+</div><div class='add'>+	iter-&gt;req.type = reqtype;</div><div class='add'>+	iter-&gt;req.mode = req-&gt;mode;</div><div class='add'>+	iter-&gt;req.dataoffs = nanddev_offs_to_pos(nand, offs, &amp;iter-&gt;req.pos);</div><div class='add'>+	iter-&gt;req.ooboffs = 0;</div><div class='add'>+	iter-&gt;oobbytes_per_page = 0;</div><div class='add'>+	iter-&gt;dataleft = req-&gt;len;</div><div class='add'>+	iter-&gt;oobleft = 0;</div><div class='add'>+	iter-&gt;req.databuf.in = req-&gt;datbuf;</div><div class='add'>+	offs_in_eb = (nand-&gt;memorg.pagesize * iter-&gt;req.pos.page) + iter-&gt;req.dataoffs;</div><div class='add'>+	iter-&gt;req.datalen = min_t(unsigned int,</div><div class='add'>+				  nanddev_eraseblock_size(nand) - offs_in_eb,</div><div class='add'>+				  iter-&gt;dataleft);</div><div class='add'>+	iter-&gt;req.oobbuf.in = NULL;</div><div class='add'>+	iter-&gt;req.ooblen = 0;</div><div class='add'>+	iter-&gt;req.continuous = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -963,6 +1003,25 @@ static inline void nanddev_io_iter_next_page(struct nand_device *nand,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * nand_io_iter_next_block - Move to the next block</div><div class='add'>+ * @nand: NAND device</div><div class='add'>+ * @iter: NAND I/O iterator</div><div class='add'>+ *</div><div class='add'>+ * Updates the @iter to point to the next block.</div><div class='add'>+ * No OOB handling available.</div><div class='add'>+ */</div><div class='add'>+static inline void nanddev_io_iter_next_block(struct nand_device *nand,</div><div class='add'>+					      struct nand_io_iter *iter)</div><div class='add'>+{</div><div class='add'>+	nanddev_pos_next_eraseblock(nand, &amp;iter-&gt;req.pos);</div><div class='add'>+	iter-&gt;dataleft -= iter-&gt;req.datalen;</div><div class='add'>+	iter-&gt;req.databuf.in += iter-&gt;req.datalen;</div><div class='add'>+	iter-&gt;req.dataoffs = 0;</div><div class='add'>+	iter-&gt;req.datalen = min_t(unsigned int, nanddev_eraseblock_size(nand),</div><div class='add'>+				  iter-&gt;dataleft);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * nand_io_iter_end - Should end iteration or not</div><div class='ctx'>  * @nand: NAND device</div><div class='ctx'>  * @iter: NAND I/O iterator</div><div class='hunk'>@@ -990,13 +1049,28 @@ static inline bool nanddev_io_iter_end(struct nand_device *nand,</div><div class='ctx'>  * @req: MTD I/O request</div><div class='ctx'>  * @iter: NAND I/O iterator</div><div class='ctx'>  *</div><div class='del'>- * Should be used for iterate over pages that are contained in an MTD request.</div><div class='add'>+ * Should be used for iterating over pages that are contained in an MTD request.</div><div class='ctx'>  */</div><div class='ctx'> #define nanddev_io_for_each_page(nand, type, start, req, iter)		\</div><div class='del'>-	for (nanddev_io_iter_init(nand, type, start, req, iter);	\</div><div class='add'>+	for (nanddev_io_page_iter_init(nand, type, start, req, iter);	\</div><div class='ctx'> 	     !nanddev_io_iter_end(nand, iter);				\</div><div class='ctx'> 	     nanddev_io_iter_next_page(nand, iter))</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * nand_io_for_each_block - Iterate over all NAND pages contained in an MTD I/O</div><div class='add'>+ *			    request, one block at a time</div><div class='add'>+ * @nand: NAND device</div><div class='add'>+ * @start: start address to read/write from</div><div class='add'>+ * @req: MTD I/O request</div><div class='add'>+ * @iter: NAND I/O iterator</div><div class='add'>+ *</div><div class='add'>+ * Should be used for iterating over blocks that are contained in an MTD request.</div><div class='add'>+ */</div><div class='add'>+#define nanddev_io_for_each_block(nand, type, start, req, iter)		\</div><div class='add'>+	for (nanddev_io_block_iter_init(nand, type, start, req, iter);	\</div><div class='add'>+	     !nanddev_io_iter_end(nand, iter);				\</div><div class='add'>+	     nanddev_io_iter_next_block(nand, iter))</div><div class='add'>+</div><div class='ctx'> bool nanddev_isbad(struct nand_device *nand, const struct nand_pos *pos);</div><div class='ctx'> bool nanddev_isreserved(struct nand_device *nand, const struct nand_pos *pos);</div><div class='ctx'> int nanddev_markbad(struct nand_device *nand, const struct nand_pos *pos);</div><div class='hunk'>@@ -1062,4 +1136,9 @@ static inline bool nanddev_bbt_is_initialized(struct nand_device *nand)</div><div class='ctx'> int nanddev_mtd_erase(struct mtd_info *mtd, struct erase_info *einfo);</div><div class='ctx'> int nanddev_mtd_max_bad_blocks(struct mtd_info *mtd, loff_t offs, size_t len);</div><div class='ctx'> </div><div class='add'>+int nand_check_erased_ecc_chunk(void *data, int datalen,</div><div class='add'>+				void *ecc, int ecclen,</div><div class='add'>+				void *extraoob, int extraooblen,</div><div class='add'>+				int threshold);</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_MTD_NAND_H */</div><div class='head'>diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h<br/>index e84522e31301..d30bdc3fcfd7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/rawnand.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/rawnand.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/rawnand.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/rawnand.h</a></div><div class='hunk'>@@ -1519,11 +1519,6 @@ int rawnand_sw_bch_correct(struct nand_chip *chip, unsigned char *buf,</div><div class='ctx'> 			   unsigned char *read_ecc, unsigned char *calc_ecc);</div><div class='ctx'> void rawnand_sw_bch_cleanup(struct nand_chip *chip);</div><div class='ctx'> </div><div class='del'>-int nand_check_erased_ecc_chunk(void *data, int datalen,</div><div class='del'>-				void *ecc, int ecclen,</div><div class='del'>-				void *extraoob, int extraooblen,</div><div class='del'>-				int threshold);</div><div class='del'>-</div><div class='ctx'> int nand_ecc_choose_conf(struct nand_chip *chip,</div><div class='ctx'> 			 const struct nand_ecc_caps *caps, int oobavail);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/mtd/spear_smi.h b/include/linux/mtd/spear_smi.h<br/>index 581603ac1277..871634862627 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/spear_smi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/spear_smi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/spear_smi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/spear_smi.h</a></div><div class='hunk'>@@ -31,12 +31,12 @@</div><div class='ctx'>  * struct spear_smi_flash_info - platform structure for passing flash</div><div class='ctx'>  * information</div><div class='ctx'>  *</div><div class='del'>- * name: name of the serial nor flash for identification</div><div class='del'>- * mem_base: the memory base on which the flash is mapped</div><div class='del'>- * size: size of the flash in bytes</div><div class='del'>- * partitions: parition details</div><div class='del'>- * nr_partitions: number of partitions</div><div class='del'>- * fast_mode: whether flash supports fast mode</div><div class='add'>+ * @name: name of the serial nor flash for identification</div><div class='add'>+ * @mem_base: the memory base on which the flash is mapped</div><div class='add'>+ * @size: size of the flash in bytes</div><div class='add'>+ * @partitions: parition details</div><div class='add'>+ * @nr_partitions: number of partitions</div><div class='add'>+ * @fast_mode: whether flash supports fast mode</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct spear_smi_flash_info {</div><div class='hunk'>@@ -51,9 +51,10 @@ struct spear_smi_flash_info {</div><div class='ctx'> /**</div><div class='ctx'>  * struct spear_smi_plat_data - platform structure for configuring smi</div><div class='ctx'>  *</div><div class='del'>- * clk_rate: clk rate at which SMI must operate</div><div class='del'>- * num_flashes: number of flashes present on board</div><div class='del'>- * board_flash_info: specific details of each flash present on board</div><div class='add'>+ * @clk_rate: clk rate at which SMI must operate</div><div class='add'>+ * @num_flashes: number of flashes present on board</div><div class='add'>+ * @board_flash_info: specific details of each flash present on board</div><div class='add'>+ * @np: array of DT node pointers for all possible flash chip devices</div><div class='ctx'>  */</div><div class='ctx'> struct spear_smi_plat_data {</div><div class='ctx'> 	unsigned long clk_rate;</div><div class='head'>diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h<br/>index badb4c1ac079..ce76f5c632e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/spinand.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/spinand.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/spinand.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/spinand.h</a></div><div class='hunk'>@@ -20,126 +20,218 @@</div><div class='ctx'>  * Standard SPI NAND flash operations</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define SPINAND_RESET_OP						\</div><div class='add'>+#define SPINAND_RESET_1S_0_0_OP						\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xff, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_NO_ADDR,					\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DATA)</div><div class='ctx'> </div><div class='del'>-#define SPINAND_WR_EN_DIS_OP(enable)					\</div><div class='add'>+#define SPINAND_WR_EN_DIS_1S_0_0_OP(enable)					\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD((enable) ? 0x06 : 0x04, 1),		\</div><div class='ctx'> 		   SPI_MEM_OP_NO_ADDR,					\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DATA)</div><div class='ctx'> </div><div class='del'>-#define SPINAND_READID_OP(naddr, ndummy, buf, len)			\</div><div class='add'>+#define SPINAND_READID_1S_1S_1S_OP(naddr, ndummy, buf, len)		\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x9f, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(naddr, 0, 1),			\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_DATA_IN(len, buf, 1))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_SET_FEATURE_OP(reg, valptr)				\</div><div class='add'>+#define SPINAND_SET_FEATURE_1S_1S_1S_OP(reg, valptr)			\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x1f, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(1, reg, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_DATA_OUT(1, valptr, 1))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_GET_FEATURE_OP(reg, valptr)				\</div><div class='add'>+#define SPINAND_GET_FEATURE_1S_1S_1S_OP(reg, valptr)			\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0f, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(1, reg, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_DATA_IN(1, valptr, 1))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_BLK_ERASE_OP(addr)					\</div><div class='add'>+#define SPINAND_BLK_ERASE_1S_1S_0_OP(addr)				\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xd8, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(3, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DATA)</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_OP(addr)					\</div><div class='add'>+#define SPINAND_PAGE_READ_1S_1S_0_OP(addr)				\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x13, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(3, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DATA)</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_OP(fast, addr, ndummy, buf, len)	\</div><div class='del'>-	SPI_MEM_OP(SPI_MEM_OP_CMD(fast ? 0x0b : 0x03, 1),		\</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x03, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 1))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 1),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_OP_3A(fast, addr, ndummy, buf, len) \</div><div class='del'>-	SPI_MEM_OP(SPI_MEM_OP_CMD(fast ? 0x0b : 0x03, 1),		\</div><div class='del'>-		   SPI_MEM_OP_ADDR(3, addr, 1),				\</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1),				\</div><div class='add'>+		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 1))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 1),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_X2_OP(addr, ndummy, buf, len)	\</div><div class='del'>-	SPI_MEM_OP(SPI_MEM_OP_CMD(0x3b, 1),				\</div><div class='del'>-		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x03, 1),				\</div><div class='add'>+		   SPI_MEM_OP_ADDR(3, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 2))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 1),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_X2_OP_3A(addr, ndummy, buf, len)	\</div><div class='del'>-	SPI_MEM_OP(SPI_MEM_OP_CMD(0x3b, 1),				\</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(3, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 2))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 1),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_X4_OP(addr, ndummy, buf, len)	\</div><div class='del'>-	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6b, 1),				\</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x0d, 1),				\</div><div class='add'>+		   SPI_MEM_DTR_OP_ADDR(2, addr, 1),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DUMMY(ndummy, 1),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 1),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x3b, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 4))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 2),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(addr, ndummy, buf, len)	\</div><div class='del'>-	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6b, 1),				\</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_2S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x3b, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(3, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 4))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 2),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(addr, ndummy, buf, len)	\</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1D_2D_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x3d, 1),				\</div><div class='add'>+		   SPI_MEM_DTR_OP_ADDR(2, addr, 1),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DUMMY(ndummy, 1),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 2),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(addr, ndummy, buf, len, freq) \</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(2, addr, 2),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 2),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 2))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 2),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP_3A(addr, ndummy, buf, len) \</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_2S_2S_OP(addr, ndummy, buf, len, freq) \</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbb, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(3, addr, 2),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 2),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 2))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 2),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_2D_2D_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0xbd, 1),				\</div><div class='add'>+		   SPI_MEM_DTR_OP_ADDR(2, addr, 2),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DUMMY(ndummy, 2),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 2),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6b, 1),				\</div><div class='add'>+		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='add'>+		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 4),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(addr, ndummy, buf, len)	\</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_4S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6b, 1),				\</div><div class='add'>+		   SPI_MEM_OP_ADDR(3, addr, 1),				\</div><div class='add'>+		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 4),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1D_4D_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x6d, 1),				\</div><div class='add'>+		   SPI_MEM_DTR_OP_ADDR(2, addr, 1),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DUMMY(ndummy, 1),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 4),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(addr, ndummy, buf, len, freq) \</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(2, addr, 4),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 4),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 4))</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 4),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP_3A(addr, ndummy, buf, len) \</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_4S_4S_OP(addr, ndummy, buf, len, freq) \</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0xeb, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(3, addr, 4),				\</div><div class='ctx'> 		   SPI_MEM_OP_DUMMY(ndummy, 4),				\</div><div class='del'>-		   SPI_MEM_OP_DATA_IN(len, buf, 4))</div><div class='del'>-</div><div class='del'>-#define SPINAND_PROG_EXEC_OP(addr)					\</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 4),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_4D_4D_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0xed, 1),				\</div><div class='add'>+		   SPI_MEM_DTR_OP_ADDR(2, addr, 4),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DUMMY(ndummy, 4),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 4),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1S_8S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x8b, 1),				\</div><div class='add'>+		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='add'>+		   SPI_MEM_OP_DUMMY(ndummy, 1),				\</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 8),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_8S_8S_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0xcb, 1),				\</div><div class='add'>+		   SPI_MEM_OP_ADDR(2, addr, 8),				\</div><div class='add'>+		   SPI_MEM_OP_DUMMY(ndummy, 8),				\</div><div class='add'>+		   SPI_MEM_OP_DATA_IN(len, buf, 8),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PAGE_READ_FROM_CACHE_1S_1D_8D_OP(addr, ndummy, buf, len, freq) \</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x9d, 1),				\</div><div class='add'>+		   SPI_MEM_DTR_OP_ADDR(2, addr, 1),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DUMMY(ndummy, 1),			\</div><div class='add'>+		   SPI_MEM_DTR_OP_DATA_IN(len, buf, 8),			\</div><div class='add'>+		   SPI_MEM_OP_MAX_FREQ(freq))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PROG_EXEC_1S_1S_0_OP(addr)				\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(0x10, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(3, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DATA)</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PROG_LOAD(reset, addr, buf, len)			\</div><div class='add'>+#define SPINAND_PROG_LOAD_1S_1S_1S_OP(reset, addr, buf, len)		\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(reset ? 0x02 : 0x84, 1),		\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_DATA_OUT(len, buf, 1))</div><div class='ctx'> </div><div class='del'>-#define SPINAND_PROG_LOAD_X4(reset, addr, buf, len)			\</div><div class='add'>+#define SPINAND_PROG_LOAD_1S_1S_4S_OP(reset, addr, buf, len)		\</div><div class='ctx'> 	SPI_MEM_OP(SPI_MEM_OP_CMD(reset ? 0x32 : 0x34, 1),		\</div><div class='ctx'> 		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='ctx'> 		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='ctx'> 		   SPI_MEM_OP_DATA_OUT(len, buf, 4))</div><div class='ctx'> </div><div class='add'>+#define SPINAND_PROG_LOAD_1S_1S_8S_OP(addr, buf, len)			\</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(0x82, 1),				\</div><div class='add'>+		   SPI_MEM_OP_ADDR(2, addr, 1),				\</div><div class='add'>+		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='add'>+		   SPI_MEM_OP_DATA_OUT(len, buf, 8))</div><div class='add'>+</div><div class='add'>+#define SPINAND_PROG_LOAD_1S_8S_8S_OP(reset, addr, buf, len)		\</div><div class='add'>+	SPI_MEM_OP(SPI_MEM_OP_CMD(reset ? 0xc2 : 0xc4, 1),		\</div><div class='add'>+		   SPI_MEM_OP_ADDR(2, addr, 8),				\</div><div class='add'>+		   SPI_MEM_OP_NO_DUMMY,					\</div><div class='add'>+		   SPI_MEM_OP_DATA_OUT(len, buf, 8))</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Standard SPI NAND flash commands</div><div class='ctx'>  */</div><div class='hunk'>@@ -169,7 +261,7 @@</div><div class='ctx'> struct spinand_op;</div><div class='ctx'> struct spinand_device;</div><div class='ctx'> </div><div class='del'>-#define SPINAND_MAX_ID_LEN	4</div><div class='add'>+#define SPINAND_MAX_ID_LEN	5</div><div class='ctx'> /*</div><div class='ctx'>  * For erase, write and read operation, we got the following timings :</div><div class='ctx'>  * tBERS (erase) 1ms to 4ms</div><div class='hunk'>@@ -262,12 +354,15 @@ struct spinand_manufacturer {</div><div class='ctx'> /* SPI NAND manufacturers */</div><div class='ctx'> extern const struct spinand_manufacturer alliancememory_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer ato_spinand_manufacturer;</div><div class='add'>+extern const struct spinand_manufacturer esmt_8c_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer esmt_c8_spinand_manufacturer;</div><div class='add'>+extern const struct spinand_manufacturer fmsh_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer foresee_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer gigadevice_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer macronix_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer micron_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer paragon_spinand_manufacturer;</div><div class='add'>+extern const struct spinand_manufacturer skyhigh_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer toshiba_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer winbond_spinand_manufacturer;</div><div class='ctx'> extern const struct spinand_manufacturer xtx_spinand_manufacturer;</div><div class='hunk'>@@ -312,6 +407,9 @@ struct spinand_ecc_info {</div><div class='ctx'> </div><div class='ctx'> #define SPINAND_HAS_QE_BIT		BIT(0)</div><div class='ctx'> #define SPINAND_HAS_CR_FEAT_BIT		BIT(1)</div><div class='add'>+#define SPINAND_HAS_PROG_PLANE_SELECT_BIT		BIT(2)</div><div class='add'>+#define SPINAND_HAS_READ_PLANE_SELECT_BIT		BIT(3)</div><div class='add'>+#define SPINAND_NO_RAW_ACCESS				BIT(4)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct spinand_ondie_ecc_conf - private SPI-NAND on-die ECC engine structure</div><div class='hunk'>@@ -323,6 +421,67 @@ struct spinand_ondie_ecc_conf {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct spinand_otp_layout - structure to describe the SPI NAND OTP area</div><div class='add'>+ * @npages: number of pages in the OTP</div><div class='add'>+ * @start_page: start page of the user/factory OTP area.</div><div class='add'>+ */</div><div class='add'>+struct spinand_otp_layout {</div><div class='add'>+	unsigned int npages;</div><div class='add'>+	unsigned int start_page;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct spinand_fact_otp_ops - SPI NAND OTP methods for factory area</div><div class='add'>+ * @info: get the OTP area information</div><div class='add'>+ * @read: read from the SPI NAND OTP area</div><div class='add'>+ */</div><div class='add'>+struct spinand_fact_otp_ops {</div><div class='add'>+	int (*info)(struct spinand_device *spinand, size_t len,</div><div class='add'>+		    struct otp_info *buf, size_t *retlen);</div><div class='add'>+	int (*read)(struct spinand_device *spinand, loff_t from, size_t len,</div><div class='add'>+		    size_t *retlen, u8 *buf);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct spinand_user_otp_ops - SPI NAND OTP methods for user area</div><div class='add'>+ * @info: get the OTP area information</div><div class='add'>+ * @lock: lock an OTP region</div><div class='add'>+ * @erase: erase an OTP region</div><div class='add'>+ * @read: read from the SPI NAND OTP area</div><div class='add'>+ * @write: write to the SPI NAND OTP area</div><div class='add'>+ */</div><div class='add'>+struct spinand_user_otp_ops {</div><div class='add'>+	int (*info)(struct spinand_device *spinand, size_t len,</div><div class='add'>+		    struct otp_info *buf, size_t *retlen);</div><div class='add'>+	int (*lock)(struct spinand_device *spinand, loff_t from, size_t len);</div><div class='add'>+	int (*erase)(struct spinand_device *spinand, loff_t from, size_t len);</div><div class='add'>+	int (*read)(struct spinand_device *spinand, loff_t from, size_t len,</div><div class='add'>+		    size_t *retlen, u8 *buf);</div><div class='add'>+	int (*write)(struct spinand_device *spinand, loff_t from, size_t len,</div><div class='add'>+		     size_t *retlen, const u8 *buf);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct spinand_fact_otp - SPI NAND OTP grouping structure for factory area</div><div class='add'>+ * @layout: OTP region layout</div><div class='add'>+ * @ops: OTP access ops</div><div class='add'>+ */</div><div class='add'>+struct spinand_fact_otp {</div><div class='add'>+	const struct spinand_otp_layout layout;</div><div class='add'>+	const struct spinand_fact_otp_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct spinand_user_otp - SPI NAND OTP grouping structure for user area</div><div class='add'>+ * @layout: OTP region layout</div><div class='add'>+ * @ops: OTP access ops</div><div class='add'>+ */</div><div class='add'>+struct spinand_user_otp {</div><div class='add'>+	const struct spinand_otp_layout layout;</div><div class='add'>+	const struct spinand_user_otp_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct spinand_info - Structure used to describe SPI NAND chips</div><div class='ctx'>  * @model: model name</div><div class='ctx'>  * @devid: device ID</div><div class='hunk'>@@ -336,6 +495,12 @@ struct spinand_ondie_ecc_conf {</div><div class='ctx'>  * @op_variants.update_cache: variants of the update-cache operation</div><div class='ctx'>  * @select_target: function used to select a target/die. Required only for</div><div class='ctx'>  *		   multi-die chips</div><div class='add'>+ * @configure_chip: Align the chip configuration with the core settings</div><div class='add'>+ * @set_cont_read: enable/disable continuous cached reads</div><div class='add'>+ * @fact_otp: SPI NAND factory OTP info.</div><div class='add'>+ * @user_otp: SPI NAND user OTP info.</div><div class='add'>+ * @read_retries: the number of read retry modes supported</div><div class='add'>+ * @set_read_retry: enable/disable read retry for data recovery</div><div class='ctx'>  *</div><div class='ctx'>  * Each SPI NAND manufacturer driver should have a spinand_info table</div><div class='ctx'>  * describing all the chips supported by the driver.</div><div class='hunk'>@@ -354,6 +519,14 @@ struct spinand_info {</div><div class='ctx'> 	} op_variants;</div><div class='ctx'> 	int (*select_target)(struct spinand_device *spinand,</div><div class='ctx'> 			     unsigned int target);</div><div class='add'>+	int (*configure_chip)(struct spinand_device *spinand);</div><div class='add'>+	int (*set_cont_read)(struct spinand_device *spinand,</div><div class='add'>+			     bool enable);</div><div class='add'>+	struct spinand_fact_otp fact_otp;</div><div class='add'>+	struct spinand_user_otp user_otp;</div><div class='add'>+	unsigned int read_retries;</div><div class='add'>+	int (*set_read_retry)(struct spinand_device *spinand,</div><div class='add'>+			     unsigned int read_retry);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define SPINAND_ID(__method, ...)					\</div><div class='hunk'>@@ -377,7 +550,35 @@ struct spinand_info {</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define SPINAND_SELECT_TARGET(__func)					\</div><div class='del'>-	.select_target = __func,</div><div class='add'>+	.select_target = __func</div><div class='add'>+</div><div class='add'>+#define SPINAND_CONFIGURE_CHIP(__configure_chip)			\</div><div class='add'>+	.configure_chip = __configure_chip</div><div class='add'>+</div><div class='add'>+#define SPINAND_CONT_READ(__set_cont_read)				\</div><div class='add'>+	.set_cont_read = __set_cont_read</div><div class='add'>+</div><div class='add'>+#define SPINAND_FACT_OTP_INFO(__npages, __start_page, __ops)		\</div><div class='add'>+	.fact_otp = {							\</div><div class='add'>+		.layout = {						\</div><div class='add'>+			.npages = __npages,				\</div><div class='add'>+			.start_page = __start_page,			\</div><div class='add'>+		},							\</div><div class='add'>+		.ops = __ops,						\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define SPINAND_USER_OTP_INFO(__npages, __start_page, __ops)		\</div><div class='add'>+	.user_otp = {							\</div><div class='add'>+		.layout = {						\</div><div class='add'>+			.npages = __npages,				\</div><div class='add'>+			.start_page = __start_page,			\</div><div class='add'>+		},							\</div><div class='add'>+		.ops = __ops,						\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define SPINAND_READ_RETRY(__read_retries, __set_read_retry)		\</div><div class='add'>+	.read_retries = __read_retries,					\</div><div class='add'>+	.set_read_retry = __set_read_retry</div><div class='ctx'> </div><div class='ctx'> #define SPINAND_INFO(__model, __id, __memorg, __eccreq, __op_variants,	\</div><div class='ctx'> 		     __flags, ...)					\</div><div class='hunk'>@@ -422,7 +623,18 @@ struct spinand_dirmap {</div><div class='ctx'>  *		passed in spi_mem_op be DMA-able, so we can't based the bufs on</div><div class='ctx'>  *		the stack</div><div class='ctx'>  * @manufacturer: SPI NAND manufacturer information</div><div class='add'>+ * @configure_chip: Align the chip configuration with the core settings</div><div class='add'>+ * @cont_read_possible: Field filled by the core once the whole system</div><div class='add'>+ *		configuration is known to tell whether continuous reads are</div><div class='add'>+ *		suitable to use or not in general with this chip/configuration.</div><div class='add'>+ *		A per-transfer check must of course be done to ensure it is</div><div class='add'>+ *		actually relevant to enable this feature.</div><div class='add'>+ * @set_cont_read: Enable/disable the continuous read feature</div><div class='ctx'>  * @priv: manufacturer private data</div><div class='add'>+ * @fact_otp: SPI NAND factory OTP info.</div><div class='add'>+ * @user_otp: SPI NAND user OTP info.</div><div class='add'>+ * @read_retries: the number of read retry modes supported</div><div class='add'>+ * @set_read_retry: Enable/disable the read retry feature</div><div class='ctx'>  */</div><div class='ctx'> struct spinand_device {</div><div class='ctx'> 	struct nand_device base;</div><div class='hunk'>@@ -451,6 +663,18 @@ struct spinand_device {</div><div class='ctx'> 	u8 *scratchbuf;</div><div class='ctx'> 	const struct spinand_manufacturer *manufacturer;</div><div class='ctx'> 	void *priv;</div><div class='add'>+</div><div class='add'>+	int (*configure_chip)(struct spinand_device *spinand);</div><div class='add'>+	bool cont_read_possible;</div><div class='add'>+	int (*set_cont_read)(struct spinand_device *spinand,</div><div class='add'>+			     bool enable);</div><div class='add'>+</div><div class='add'>+	const struct spinand_fact_otp *fact_otp;</div><div class='add'>+	const struct spinand_user_otp *user_otp;</div><div class='add'>+</div><div class='add'>+	unsigned int read_retries;</div><div class='add'>+	int (*set_read_retry)(struct spinand_device *spinand,</div><div class='add'>+			     unsigned int retry_mode);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -517,6 +741,31 @@ int spinand_match_and_init(struct spinand_device *spinand,</div><div class='ctx'> 			   enum spinand_readid_method rdid_method);</div><div class='ctx'> </div><div class='ctx'> int spinand_upd_cfg(struct spinand_device *spinand, u8 mask, u8 val);</div><div class='add'>+int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val);</div><div class='add'>+int spinand_write_reg_op(struct spinand_device *spinand, u8 reg, u8 val);</div><div class='add'>+int spinand_write_enable_op(struct spinand_device *spinand);</div><div class='ctx'> int spinand_select_target(struct spinand_device *spinand, unsigned int target);</div><div class='ctx'> </div><div class='add'>+int spinand_wait(struct spinand_device *spinand, unsigned long initial_delay_us,</div><div class='add'>+		 unsigned long poll_delay_us, u8 *s);</div><div class='add'>+</div><div class='add'>+int spinand_read_page(struct spinand_device *spinand,</div><div class='add'>+		      const struct nand_page_io_req *req);</div><div class='add'>+</div><div class='add'>+int spinand_write_page(struct spinand_device *spinand,</div><div class='add'>+		       const struct nand_page_io_req *req);</div><div class='add'>+</div><div class='add'>+size_t spinand_otp_page_size(struct spinand_device *spinand);</div><div class='add'>+size_t spinand_fact_otp_size(struct spinand_device *spinand);</div><div class='add'>+size_t spinand_user_otp_size(struct spinand_device *spinand);</div><div class='add'>+</div><div class='add'>+int spinand_fact_otp_read(struct spinand_device *spinand, loff_t ofs,</div><div class='add'>+			  size_t len, size_t *retlen, u8 *buf);</div><div class='add'>+int spinand_user_otp_read(struct spinand_device *spinand, loff_t ofs,</div><div class='add'>+			  size_t len, size_t *retlen, u8 *buf);</div><div class='add'>+int spinand_user_otp_write(struct spinand_device *spinand, loff_t ofs,</div><div class='add'>+			   size_t len, size_t *retlen, const u8 *buf);</div><div class='add'>+</div><div class='add'>+int spinand_set_mtd_otp_ops(struct spinand_device *spinand);</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_MTD_SPINAND_H */</div><div class='head'>diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h<br/>index a529347fd75b..c3f79c4be1cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/ubi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mtd/ubi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mtd/ubi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mtd/ubi.h</a></div><div class='hunk'>@@ -192,6 +192,7 @@ struct ubi_device_info {</div><div class='ctx'>  *			or a volume was removed)</div><div class='ctx'>  * @UBI_VOLUME_RESIZED: a volume has been re-sized</div><div class='ctx'>  * @UBI_VOLUME_RENAMED: a volume has been re-named</div><div class='add'>+ * @UBI_VOLUME_SHUTDOWN: a volume is going to removed, shutdown users</div><div class='ctx'>  * @UBI_VOLUME_UPDATED: data has been written to a volume</div><div class='ctx'>  *</div><div class='ctx'>  * These constants define which type of event has happened when a volume</div><div class='hunk'>@@ -202,6 +203,7 @@ enum {</div><div class='ctx'> 	UBI_VOLUME_REMOVED,</div><div class='ctx'> 	UBI_VOLUME_RESIZED,</div><div class='ctx'> 	UBI_VOLUME_RENAMED,</div><div class='add'>+	UBI_VOLUME_SHUTDOWN,</div><div class='ctx'> 	UBI_VOLUME_UPDATED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +250,6 @@ int ubi_leb_unmap(struct ubi_volume_desc *desc, int lnum);</div><div class='ctx'> int ubi_leb_map(struct ubi_volume_desc *desc, int lnum);</div><div class='ctx'> int ubi_is_mapped(struct ubi_volume_desc *desc, int lnum);</div><div class='ctx'> int ubi_sync(int ubi_num);</div><div class='del'>-int ubi_flush(int ubi_num, int vol_id, int lnum);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This function is the same as the 'ubi_leb_read()' function, but it does not</div><div class='head'>diff --git a/include/linux/mutex.h b/include/linux/mutex.h<br/>index 67edc4ca2bee..bf535f0118bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mutex.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mutex.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mutex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mutex.h</a></div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'> #include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/mutex_types.h&gt;</div><div class='ctx'> </div><div class='add'>+struct device;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='ctx'> # define __DEP_MAP_MUTEX_INITIALIZER(lockname)			\</div><div class='ctx'> 		, .dep_map = {					\</div><div class='hunk'>@@ -47,7 +49,6 @@ static inline void mutex_destroy(struct mutex *lock) {}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_PREEMPT_RT</div><div class='ctx'> /**</div><div class='ctx'>  * mutex_init - initialize the mutex</div><div class='ctx'>  * @mutex: the mutex to be initialized</div><div class='hunk'>@@ -63,6 +64,18 @@ do {									\</div><div class='ctx'> 	__mutex_init((mutex), #mutex, &amp;__key);				\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * mutex_init_with_key - initialize a mutex with a given lockdep key</div><div class='add'>+ * @mutex: the mutex to be initialized</div><div class='add'>+ * @key: the lockdep key to be associated with the mutex</div><div class='add'>+ *</div><div class='add'>+ * Initialize the mutex to the unlocked state.</div><div class='add'>+ *</div><div class='add'>+ * It is not allowed to initialize an already locked mutex.</div><div class='add'>+ */</div><div class='add'>+#define mutex_init_with_key(mutex, key) __mutex_init((mutex), #mutex, (key))</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PREEMPT_RT</div><div class='ctx'> #define __MUTEX_INITIALIZER(lockname) \</div><div class='ctx'> 		{ .owner = ATOMIC_LONG_INIT(0) \</div><div class='ctx'> 		, .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(lockname.wait_lock) \</div><div class='hunk'>@@ -73,8 +86,23 @@ do {									\</div><div class='ctx'> #define DEFINE_MUTEX(mutexname) \</div><div class='ctx'> 	struct mutex mutexname = __MUTEX_INITIALIZER(mutexname)</div><div class='ctx'> </div><div class='del'>-extern void __mutex_init(struct mutex *lock, const char *name,</div><div class='del'>-			 struct lock_class_key *key);</div><div class='add'>+#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+void mutex_init_lockep(struct mutex *lock, const char *name, struct lock_class_key *key);</div><div class='add'>+</div><div class='add'>+static inline void __mutex_init(struct mutex *lock, const char *name,</div><div class='add'>+				struct lock_class_key *key)</div><div class='add'>+{</div><div class='add'>+	mutex_init_lockep(lock, name, key);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+extern void mutex_init_generic(struct mutex *lock);</div><div class='add'>+</div><div class='add'>+static inline void __mutex_init(struct mutex *lock, const char *name,</div><div class='add'>+				struct lock_class_key *key)</div><div class='add'>+{</div><div class='add'>+	mutex_init_generic(lock);</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_DEBUG_LOCK_ALLOC */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * mutex_is_locked - is the mutex locked</div><div class='hunk'>@@ -98,25 +126,57 @@ extern bool mutex_is_locked(struct mutex *lock);</div><div class='ctx'> #define DEFINE_MUTEX(mutexname)						\</div><div class='ctx'> 	struct mutex mutexname = __MUTEX_INITIALIZER(mutexname)</div><div class='ctx'> </div><div class='del'>-extern void __mutex_rt_init(struct mutex *lock, const char *name,</div><div class='del'>-			    struct lock_class_key *key);</div><div class='del'>-</div><div class='ctx'> #define mutex_is_locked(l)	rt_mutex_base_is_locked(&amp;(l)-&gt;rtmutex)</div><div class='ctx'> </div><div class='del'>-#define __mutex_init(mutex, name, key)			\</div><div class='del'>-do {							\</div><div class='del'>-	rt_mutex_base_init(&amp;(mutex)-&gt;rtmutex);		\</div><div class='del'>-	__mutex_rt_init((mutex), name, key);		\</div><div class='del'>-} while (0)</div><div class='add'>+#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+extern void mutex_rt_init_lockdep(struct mutex *mutex, const char *name,</div><div class='add'>+			     struct lock_class_key *key);</div><div class='ctx'> </div><div class='del'>-#define mutex_init(mutex)				\</div><div class='del'>-do {							\</div><div class='del'>-	static struct lock_class_key __key;		\</div><div class='del'>-							\</div><div class='del'>-	__mutex_init((mutex), #mutex, &amp;__key);		\</div><div class='del'>-} while (0)</div><div class='add'>+static inline void __mutex_init(struct mutex *lock, const char *name,</div><div class='add'>+				struct lock_class_key *key)</div><div class='add'>+{</div><div class='add'>+	mutex_rt_init_lockdep(lock, name, key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+extern void mutex_rt_init_generic(struct mutex *mutex);</div><div class='add'>+</div><div class='add'>+static inline void __mutex_init(struct mutex *lock, const char *name,</div><div class='add'>+				struct lock_class_key *key)</div><div class='add'>+{</div><div class='add'>+	mutex_rt_init_generic(lock);</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_LOCKDEP */</div><div class='ctx'> #endif /* CONFIG_PREEMPT_RT */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_MUTEXES</div><div class='add'>+</div><div class='add'>+int __must_check __devm_mutex_init(struct device *dev, struct mutex *lock);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int __must_check __devm_mutex_init(struct device *dev, struct mutex *lock)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * When CONFIG_DEBUG_MUTEXES is off mutex_destroy() is just a nop so</div><div class='add'>+	 * no really need to register it in the devm subsystem.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __mutex_init_ret(mutex)				\</div><div class='add'>+({							\</div><div class='add'>+	typeof(mutex) mutex_ = (mutex);			\</div><div class='add'>+							\</div><div class='add'>+	mutex_init(mutex_);				\</div><div class='add'>+	mutex_;						\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define devm_mutex_init(dev, mutex) \</div><div class='add'>+	__devm_mutex_init(dev, __mutex_init_ret(mutex))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * See kernel/locking/mutex.c for detailed documentation of these APIs.</div><div class='ctx'>  * Also see Documentation/locking/mutex-design.rst.</div><div class='hunk'>@@ -124,16 +184,15 @@ do {							\</div><div class='ctx'> #ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='ctx'> extern void mutex_lock_nested(struct mutex *lock, unsigned int subclass);</div><div class='ctx'> extern void _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest_lock);</div><div class='del'>-</div><div class='ctx'> extern int __must_check mutex_lock_interruptible_nested(struct mutex *lock,</div><div class='ctx'> 					unsigned int subclass);</div><div class='del'>-extern int __must_check mutex_lock_killable_nested(struct mutex *lock,</div><div class='del'>-					unsigned int subclass);</div><div class='add'>+extern int __must_check _mutex_lock_killable(struct mutex *lock,</div><div class='add'>+		unsigned int subclass, struct lockdep_map *nest_lock);</div><div class='ctx'> extern void mutex_lock_io_nested(struct mutex *lock, unsigned int subclass);</div><div class='ctx'> </div><div class='ctx'> #define mutex_lock(lock) mutex_lock_nested(lock, 0)</div><div class='ctx'> #define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)</div><div class='del'>-#define mutex_lock_killable(lock) mutex_lock_killable_nested(lock, 0)</div><div class='add'>+#define mutex_lock_killable(lock) _mutex_lock_killable(lock, 0, NULL)</div><div class='ctx'> #define mutex_lock_io(lock) mutex_lock_io_nested(lock, 0)</div><div class='ctx'> </div><div class='ctx'> #define mutex_lock_nest_lock(lock, nest_lock)				\</div><div class='hunk'>@@ -142,6 +201,15 @@ do {									\</div><div class='ctx'> 	_mutex_lock_nest_lock(lock, &amp;(nest_lock)-&gt;dep_map);		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+#define mutex_lock_killable_nest_lock(lock, nest_lock)			\</div><div class='add'>+(									\</div><div class='add'>+	typecheck(struct lockdep_map *, &amp;(nest_lock)-&gt;dep_map),		\</div><div class='add'>+	_mutex_lock_killable(lock, 0, &amp;(nest_lock)-&gt;dep_map)		\</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+#define mutex_lock_killable_nested(lock, subclass) \</div><div class='add'>+	_mutex_lock_killable(lock, subclass, NULL)</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> extern void mutex_lock(struct mutex *lock);</div><div class='ctx'> extern int __must_check mutex_lock_interruptible(struct mutex *lock);</div><div class='hunk'>@@ -151,6 +219,7 @@ extern void mutex_lock_io(struct mutex *lock);</div><div class='ctx'> # define mutex_lock_nested(lock, subclass) mutex_lock(lock)</div><div class='ctx'> # define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)</div><div class='ctx'> # define mutex_lock_killable_nested(lock, subclass) mutex_lock_killable(lock)</div><div class='add'>+# define mutex_lock_killable_nest_lock(lock, nest_lock) mutex_lock_killable(lock)</div><div class='ctx'> # define mutex_lock_nest_lock(lock, nest_lock) mutex_lock(lock)</div><div class='ctx'> # define mutex_lock_io_nested(lock, subclass) mutex_lock_io(lock)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -161,13 +230,30 @@ extern void mutex_lock_io(struct mutex *lock);</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 1 if the mutex has been acquired successfully, and 0 on contention.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+extern int _mutex_trylock_nest_lock(struct mutex *lock, struct lockdep_map *nest_lock);</div><div class='add'>+</div><div class='add'>+#define mutex_trylock_nest_lock(lock, nest_lock)		\</div><div class='add'>+(								\</div><div class='add'>+	typecheck(struct lockdep_map *, &amp;(nest_lock)-&gt;dep_map),	\</div><div class='add'>+	_mutex_trylock_nest_lock(lock, &amp;(nest_lock)-&gt;dep_map)	\</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+#define mutex_trylock(lock) _mutex_trylock_nest_lock(lock, NULL)</div><div class='add'>+#else</div><div class='ctx'> extern int mutex_trylock(struct mutex *lock);</div><div class='add'>+#define mutex_trylock_nest_lock(lock, nest_lock) mutex_trylock(lock)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> extern void mutex_unlock(struct mutex *lock);</div><div class='ctx'> </div><div class='ctx'> extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);</div><div class='ctx'> </div><div class='ctx'> DEFINE_GUARD(mutex, struct mutex *, mutex_lock(_T), mutex_unlock(_T))</div><div class='ctx'> DEFINE_GUARD_COND(mutex, _try, mutex_trylock(_T))</div><div class='del'>-DEFINE_GUARD_COND(mutex, _intr, mutex_lock_interruptible(_T) == 0)</div><div class='add'>+DEFINE_GUARD_COND(mutex, _intr, mutex_lock_interruptible(_T), _RET == 0)</div><div class='add'>+</div><div class='add'>+extern unsigned long mutex_get_owner(struct mutex *lock);</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_MUTEX_H */</div><div class='head'>diff --git a/include/linux/mux/driver.h b/include/linux/mux/driver.h<br/>index 18824064f8c0..e58e59354e23 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mux/driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mux/driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/mux/driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/mux/driver.h</a></div><div class='hunk'>@@ -56,18 +56,18 @@ struct mux_control {</div><div class='ctx'> /**</div><div class='ctx'>  * struct mux_chip -	Represents a chip holding mux controllers.</div><div class='ctx'>  * @controllers:	Number of mux controllers handled by the chip.</div><div class='del'>- * @mux:		Array of mux controllers that are handled.</div><div class='ctx'>  * @dev:		Device structure.</div><div class='ctx'>  * @id:			Used to identify the device internally.</div><div class='ctx'>  * @ops:		Mux controller operations.</div><div class='add'>+ * @mux:		Array of mux controllers that are handled.</div><div class='ctx'>  */</div><div class='ctx'> struct mux_chip {</div><div class='ctx'> 	unsigned int controllers;</div><div class='del'>-	struct mux_control *mux;</div><div class='ctx'> 	struct device dev;</div><div class='ctx'> 	int id;</div><div class='ctx'> </div><div class='ctx'> 	const struct mux_control_ops *ops;</div><div class='add'>+	struct mux_control mux[] __counted_by(controllers);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_mux_chip(x) container_of((x), struct mux_chip, dev)</div><div class='head'>diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h<br/>deleted file mode 100644<br/>index 000b126acfb6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/mv643xx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/mv643xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,921 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * mv643xx.h - MV-643XX Internal registers definition file.</div><div class='del'>- *</div><div class='del'>- * Copyright 2002 Momentum Computer, Inc.</div><div class='del'>- * 	Author: Matthew Dharm &lt;mdharm@momenco.com&gt;</div><div class='del'>- * Copyright 2002 GALILEO TECHNOLOGY, LTD. </div><div class='del'>- */</div><div class='del'>-#ifndef __ASM_MV643XX_H</div><div class='del'>-#define __ASM_MV643XX_H</div><div class='del'>-</div><div class='del'>-#include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;linux/mv643xx_eth.h&gt;</div><div class='del'>-#include &lt;linux/mv643xx_i2c.h&gt;</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* Processor Address Space              */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-/* DDR SDRAM BAR and size registers */</div><div class='del'>-</div><div class='del'>-#define MV64340_CS_0_BASE_ADDR                                      0x008</div><div class='del'>-#define MV64340_CS_0_SIZE                                           0x010</div><div class='del'>-#define MV64340_CS_1_BASE_ADDR                                      0x208</div><div class='del'>-#define MV64340_CS_1_SIZE                                           0x210</div><div class='del'>-#define MV64340_CS_2_BASE_ADDR                                      0x018</div><div class='del'>-#define MV64340_CS_2_SIZE                                           0x020</div><div class='del'>-#define MV64340_CS_3_BASE_ADDR                                      0x218</div><div class='del'>-#define MV64340_CS_3_SIZE                                           0x220</div><div class='del'>-</div><div class='del'>-/* Devices BAR and size registers */</div><div class='del'>-</div><div class='del'>-#define MV64340_DEV_CS0_BASE_ADDR                                   0x028</div><div class='del'>-#define MV64340_DEV_CS0_SIZE                                        0x030</div><div class='del'>-#define MV64340_DEV_CS1_BASE_ADDR                                   0x228</div><div class='del'>-#define MV64340_DEV_CS1_SIZE                                        0x230</div><div class='del'>-#define MV64340_DEV_CS2_BASE_ADDR                                   0x248</div><div class='del'>-#define MV64340_DEV_CS2_SIZE                                        0x250</div><div class='del'>-#define MV64340_DEV_CS3_BASE_ADDR                                   0x038</div><div class='del'>-#define MV64340_DEV_CS3_SIZE                                        0x040</div><div class='del'>-#define MV64340_BOOTCS_BASE_ADDR                                    0x238</div><div class='del'>-#define MV64340_BOOTCS_SIZE                                         0x240</div><div class='del'>-</div><div class='del'>-/* PCI 0 BAR and size registers */</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_0_IO_BASE_ADDR                                  0x048</div><div class='del'>-#define MV64340_PCI_0_IO_SIZE                                       0x050</div><div class='del'>-#define MV64340_PCI_0_MEMORY0_BASE_ADDR                             0x058</div><div class='del'>-#define MV64340_PCI_0_MEMORY0_SIZE                                  0x060</div><div class='del'>-#define MV64340_PCI_0_MEMORY1_BASE_ADDR                             0x080</div><div class='del'>-#define MV64340_PCI_0_MEMORY1_SIZE                                  0x088</div><div class='del'>-#define MV64340_PCI_0_MEMORY2_BASE_ADDR                             0x258</div><div class='del'>-#define MV64340_PCI_0_MEMORY2_SIZE                                  0x260</div><div class='del'>-#define MV64340_PCI_0_MEMORY3_BASE_ADDR                             0x280</div><div class='del'>-#define MV64340_PCI_0_MEMORY3_SIZE                                  0x288</div><div class='del'>-</div><div class='del'>-/* PCI 1 BAR and size registers */</div><div class='del'>-#define MV64340_PCI_1_IO_BASE_ADDR                                  0x090</div><div class='del'>-#define MV64340_PCI_1_IO_SIZE                                       0x098</div><div class='del'>-#define MV64340_PCI_1_MEMORY0_BASE_ADDR                             0x0a0</div><div class='del'>-#define MV64340_PCI_1_MEMORY0_SIZE                                  0x0a8</div><div class='del'>-#define MV64340_PCI_1_MEMORY1_BASE_ADDR                             0x0b0</div><div class='del'>-#define MV64340_PCI_1_MEMORY1_SIZE                                  0x0b8</div><div class='del'>-#define MV64340_PCI_1_MEMORY2_BASE_ADDR                             0x2a0</div><div class='del'>-#define MV64340_PCI_1_MEMORY2_SIZE                                  0x2a8</div><div class='del'>-#define MV64340_PCI_1_MEMORY3_BASE_ADDR                             0x2b0</div><div class='del'>-#define MV64340_PCI_1_MEMORY3_SIZE                                  0x2b8</div><div class='del'>-</div><div class='del'>-/* SRAM base address */</div><div class='del'>-#define MV64340_INTEGRATED_SRAM_BASE_ADDR                           0x268</div><div class='del'>-</div><div class='del'>-/* internal registers space base address */</div><div class='del'>-#define MV64340_INTERNAL_SPACE_BASE_ADDR                            0x068</div><div class='del'>-</div><div class='del'>-/* Enables the CS , DEV_CS , PCI 0 and PCI 1 </div><div class='del'>-   windows above */</div><div class='del'>-#define MV64340_BASE_ADDR_ENABLE                                    0x278</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* PCI remap registers                  */</div><div class='del'>-/****************************************/</div><div class='del'>-      /* PCI 0 */</div><div class='del'>-#define MV64340_PCI_0_IO_ADDR_REMAP                                 0x0f0</div><div class='del'>-#define MV64340_PCI_0_MEMORY0_LOW_ADDR_REMAP                        0x0f8</div><div class='del'>-#define MV64340_PCI_0_MEMORY0_HIGH_ADDR_REMAP                       0x320</div><div class='del'>-#define MV64340_PCI_0_MEMORY1_LOW_ADDR_REMAP                        0x100</div><div class='del'>-#define MV64340_PCI_0_MEMORY1_HIGH_ADDR_REMAP                       0x328</div><div class='del'>-#define MV64340_PCI_0_MEMORY2_LOW_ADDR_REMAP                        0x2f8</div><div class='del'>-#define MV64340_PCI_0_MEMORY2_HIGH_ADDR_REMAP                       0x330</div><div class='del'>-#define MV64340_PCI_0_MEMORY3_LOW_ADDR_REMAP                        0x300</div><div class='del'>-#define MV64340_PCI_0_MEMORY3_HIGH_ADDR_REMAP                       0x338</div><div class='del'>-      /* PCI 1 */</div><div class='del'>-#define MV64340_PCI_1_IO_ADDR_REMAP                                 0x108</div><div class='del'>-#define MV64340_PCI_1_MEMORY0_LOW_ADDR_REMAP                        0x110</div><div class='del'>-#define MV64340_PCI_1_MEMORY0_HIGH_ADDR_REMAP                       0x340</div><div class='del'>-#define MV64340_PCI_1_MEMORY1_LOW_ADDR_REMAP                        0x118</div><div class='del'>-#define MV64340_PCI_1_MEMORY1_HIGH_ADDR_REMAP                       0x348</div><div class='del'>-#define MV64340_PCI_1_MEMORY2_LOW_ADDR_REMAP                        0x310</div><div class='del'>-#define MV64340_PCI_1_MEMORY2_HIGH_ADDR_REMAP                       0x350</div><div class='del'>-#define MV64340_PCI_1_MEMORY3_LOW_ADDR_REMAP                        0x318</div><div class='del'>-#define MV64340_PCI_1_MEMORY3_HIGH_ADDR_REMAP                       0x358</div><div class='del'>- </div><div class='del'>-#define MV64340_CPU_PCI_0_HEADERS_RETARGET_CONTROL                  0x3b0</div><div class='del'>-#define MV64340_CPU_PCI_0_HEADERS_RETARGET_BASE                     0x3b8</div><div class='del'>-#define MV64340_CPU_PCI_1_HEADERS_RETARGET_CONTROL                  0x3c0</div><div class='del'>-#define MV64340_CPU_PCI_1_HEADERS_RETARGET_BASE                     0x3c8</div><div class='del'>-#define MV64340_CPU_GE_HEADERS_RETARGET_CONTROL                     0x3d0</div><div class='del'>-#define MV64340_CPU_GE_HEADERS_RETARGET_BASE                        0x3d8</div><div class='del'>-#define MV64340_CPU_IDMA_HEADERS_RETARGET_CONTROL                   0x3e0</div><div class='del'>-#define MV64340_CPU_IDMA_HEADERS_RETARGET_BASE                      0x3e8</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*         CPU Control Registers        */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_CPU_CONFIG                                          0x000</div><div class='del'>-#define MV64340_CPU_MODE                                            0x120</div><div class='del'>-#define MV64340_CPU_MASTER_CONTROL                                  0x160</div><div class='del'>-#define MV64340_CPU_CROSS_BAR_CONTROL_LOW                           0x150</div><div class='del'>-#define MV64340_CPU_CROSS_BAR_CONTROL_HIGH                          0x158</div><div class='del'>-#define MV64340_CPU_CROSS_BAR_TIMEOUT                               0x168</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* SMP RegisterS                        */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_SMP_WHO_AM_I                                        0x200</div><div class='del'>-#define MV64340_SMP_CPU0_DOORBELL                                   0x214</div><div class='del'>-#define MV64340_SMP_CPU0_DOORBELL_CLEAR                             0x21C</div><div class='del'>-#define MV64340_SMP_CPU1_DOORBELL                                   0x224</div><div class='del'>-#define MV64340_SMP_CPU1_DOORBELL_CLEAR                             0x22C</div><div class='del'>-#define MV64340_SMP_CPU0_DOORBELL_MASK                              0x234</div><div class='del'>-#define MV64340_SMP_CPU1_DOORBELL_MASK                              0x23C</div><div class='del'>-#define MV64340_SMP_SEMAPHOR0                                       0x244</div><div class='del'>-#define MV64340_SMP_SEMAPHOR1                                       0x24c</div><div class='del'>-#define MV64340_SMP_SEMAPHOR2                                       0x254</div><div class='del'>-#define MV64340_SMP_SEMAPHOR3                                       0x25c</div><div class='del'>-#define MV64340_SMP_SEMAPHOR4                                       0x264</div><div class='del'>-#define MV64340_SMP_SEMAPHOR5                                       0x26c</div><div class='del'>-#define MV64340_SMP_SEMAPHOR6                                       0x274</div><div class='del'>-#define MV64340_SMP_SEMAPHOR7                                       0x27c</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*  CPU Sync Barrier Register           */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_CPU_0_SYNC_BARRIER_TRIGGER                          0x0c0</div><div class='del'>-#define MV64340_CPU_0_SYNC_BARRIER_VIRTUAL                          0x0c8</div><div class='del'>-#define MV64340_CPU_1_SYNC_BARRIER_TRIGGER                          0x0d0</div><div class='del'>-#define MV64340_CPU_1_SYNC_BARRIER_VIRTUAL                          0x0d8</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* CPU Access Protect                   */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_CPU_PROTECT_WINDOW_0_BASE_ADDR                      0x180</div><div class='del'>-#define MV64340_CPU_PROTECT_WINDOW_0_SIZE                           0x188</div><div class='del'>-#define MV64340_CPU_PROTECT_WINDOW_1_BASE_ADDR                      0x190</div><div class='del'>-#define MV64340_CPU_PROTECT_WINDOW_1_SIZE                           0x198</div><div class='del'>-#define MV64340_CPU_PROTECT_WINDOW_2_BASE_ADDR                      0x1a0</div><div class='del'>-#define MV64340_CPU_PROTECT_WINDOW_2_SIZE                           0x1a8</div><div class='del'>-#define MV64340_CPU_PROTECT_WINDOW_3_BASE_ADDR                      0x1b0</div><div class='del'>-#define MV64340_CPU_PROTECT_WINDOW_3_SIZE                           0x1b8</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*          CPU Error Report            */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_CPU_ERROR_ADDR_LOW                                  0x070</div><div class='del'>-#define MV64340_CPU_ERROR_ADDR_HIGH                                 0x078</div><div class='del'>-#define MV64340_CPU_ERROR_DATA_LOW                                  0x128</div><div class='del'>-#define MV64340_CPU_ERROR_DATA_HIGH                                 0x130</div><div class='del'>-#define MV64340_CPU_ERROR_PARITY                                    0x138</div><div class='del'>-#define MV64340_CPU_ERROR_CAUSE                                     0x140</div><div class='del'>-#define MV64340_CPU_ERROR_MASK                                      0x148</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*      CPU Interface Debug Registers 	*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PUNIT_SLAVE_DEBUG_LOW                               0x360</div><div class='del'>-#define MV64340_PUNIT_SLAVE_DEBUG_HIGH                              0x368</div><div class='del'>-#define MV64340_PUNIT_MASTER_DEBUG_LOW                              0x370</div><div class='del'>-#define MV64340_PUNIT_MASTER_DEBUG_HIGH                             0x378</div><div class='del'>-#define MV64340_PUNIT_MMASK                                         0x3e4</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*  Integrated SRAM Registers           */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_SRAM_CONFIG                                         0x380</div><div class='del'>-#define MV64340_SRAM_TEST_MODE                                      0X3F4</div><div class='del'>-#define MV64340_SRAM_ERROR_CAUSE                                    0x388</div><div class='del'>-#define MV64340_SRAM_ERROR_ADDR                                     0x390</div><div class='del'>-#define MV64340_SRAM_ERROR_ADDR_HIGH                                0X3F8</div><div class='del'>-#define MV64340_SRAM_ERROR_DATA_LOW                                 0x398</div><div class='del'>-#define MV64340_SRAM_ERROR_DATA_HIGH                                0x3a0</div><div class='del'>-#define MV64340_SRAM_ERROR_DATA_PARITY                              0x3a8</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* SDRAM Configuration                  */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_SDRAM_CONFIG                                        0x1400</div><div class='del'>-#define MV64340_D_UNIT_CONTROL_LOW                                  0x1404</div><div class='del'>-#define MV64340_D_UNIT_CONTROL_HIGH                                 0x1424</div><div class='del'>-#define MV64340_SDRAM_TIMING_CONTROL_LOW                            0x1408</div><div class='del'>-#define MV64340_SDRAM_TIMING_CONTROL_HIGH                           0x140c</div><div class='del'>-#define MV64340_SDRAM_ADDR_CONTROL                                  0x1410</div><div class='del'>-#define MV64340_SDRAM_OPEN_PAGES_CONTROL                            0x1414</div><div class='del'>-#define MV64340_SDRAM_OPERATION                                     0x1418</div><div class='del'>-#define MV64340_SDRAM_MODE                                          0x141c</div><div class='del'>-#define MV64340_EXTENDED_DRAM_MODE                                  0x1420</div><div class='del'>-#define MV64340_SDRAM_CROSS_BAR_CONTROL_LOW                         0x1430</div><div class='del'>-#define MV64340_SDRAM_CROSS_BAR_CONTROL_HIGH                        0x1434</div><div class='del'>-#define MV64340_SDRAM_CROSS_BAR_TIMEOUT                             0x1438</div><div class='del'>-#define MV64340_SDRAM_ADDR_CTRL_PADS_CALIBRATION                    0x14c0</div><div class='del'>-#define MV64340_SDRAM_DATA_PADS_CALIBRATION                         0x14c4</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* SDRAM Error Report                   */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_SDRAM_ERROR_DATA_LOW                                0x1444</div><div class='del'>-#define MV64340_SDRAM_ERROR_DATA_HIGH                               0x1440</div><div class='del'>-#define MV64340_SDRAM_ERROR_ADDR                                    0x1450</div><div class='del'>-#define MV64340_SDRAM_RECEIVED_ECC                                  0x1448</div><div class='del'>-#define MV64340_SDRAM_CALCULATED_ECC                                0x144c</div><div class='del'>-#define MV64340_SDRAM_ECC_CONTROL                                   0x1454</div><div class='del'>-#define MV64340_SDRAM_ECC_ERROR_COUNTER                             0x1458</div><div class='del'>-</div><div class='del'>-/******************************************/</div><div class='del'>-/*  Controlled Delay Line (CDL) Registers */</div><div class='del'>-/******************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_DFCDL_CONFIG0                                       0x1480</div><div class='del'>-#define MV64340_DFCDL_CONFIG1                                       0x1484</div><div class='del'>-#define MV64340_DLL_WRITE                                           0x1488</div><div class='del'>-#define MV64340_DLL_READ                                            0x148c</div><div class='del'>-#define MV64340_SRAM_ADDR                                           0x1490</div><div class='del'>-#define MV64340_SRAM_DATA0                                          0x1494</div><div class='del'>-#define MV64340_SRAM_DATA1                                          0x1498</div><div class='del'>-#define MV64340_SRAM_DATA2                                          0x149c</div><div class='del'>-#define MV64340_DFCL_PROBE                                          0x14a0</div><div class='del'>-</div><div class='del'>-/******************************************/</div><div class='del'>-/*   Debug Registers                      */</div><div class='del'>-/******************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_DUNIT_DEBUG_LOW                                     0x1460</div><div class='del'>-#define MV64340_DUNIT_DEBUG_HIGH                                    0x1464</div><div class='del'>-#define MV64340_DUNIT_MMASK                                         0X1b40</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* Device Parameters			*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_DEVICE_BANK0_PARAMETERS				    0x45c</div><div class='del'>-#define MV64340_DEVICE_BANK1_PARAMETERS				    0x460</div><div class='del'>-#define MV64340_DEVICE_BANK2_PARAMETERS				    0x464</div><div class='del'>-#define MV64340_DEVICE_BANK3_PARAMETERS				    0x468</div><div class='del'>-#define MV64340_DEVICE_BOOT_BANK_PARAMETERS			    0x46c</div><div class='del'>-#define MV64340_DEVICE_INTERFACE_CONTROL                            0x4c0</div><div class='del'>-#define MV64340_DEVICE_INTERFACE_CROSS_BAR_CONTROL_LOW              0x4c8</div><div class='del'>-#define MV64340_DEVICE_INTERFACE_CROSS_BAR_CONTROL_HIGH             0x4cc</div><div class='del'>-#define MV64340_DEVICE_INTERFACE_CROSS_BAR_TIMEOUT                  0x4c4</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* Device interrupt registers		*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_DEVICE_INTERRUPT_CAUSE				    0x4d0</div><div class='del'>-#define MV64340_DEVICE_INTERRUPT_MASK				    0x4d4</div><div class='del'>-#define MV64340_DEVICE_ERROR_ADDR				    0x4d8</div><div class='del'>-#define MV64340_DEVICE_ERROR_DATA   				    0x4dc</div><div class='del'>-#define MV64340_DEVICE_ERROR_PARITY     			    0x4e0</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* Device debug registers   		*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_DEVICE_DEBUG_LOW     				    0x4e4</div><div class='del'>-#define MV64340_DEVICE_DEBUG_HIGH     				    0x4e8</div><div class='del'>-#define MV64340_RUNIT_MMASK                                         0x4f0</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* PCI Slave Address Decoding registers */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_0_CS_0_BANK_SIZE                                0xc08</div><div class='del'>-#define MV64340_PCI_1_CS_0_BANK_SIZE                                0xc88</div><div class='del'>-#define MV64340_PCI_0_CS_1_BANK_SIZE                                0xd08</div><div class='del'>-#define MV64340_PCI_1_CS_1_BANK_SIZE                                0xd88</div><div class='del'>-#define MV64340_PCI_0_CS_2_BANK_SIZE                                0xc0c</div><div class='del'>-#define MV64340_PCI_1_CS_2_BANK_SIZE                                0xc8c</div><div class='del'>-#define MV64340_PCI_0_CS_3_BANK_SIZE                                0xd0c</div><div class='del'>-#define MV64340_PCI_1_CS_3_BANK_SIZE                                0xd8c</div><div class='del'>-#define MV64340_PCI_0_DEVCS_0_BANK_SIZE                             0xc10</div><div class='del'>-#define MV64340_PCI_1_DEVCS_0_BANK_SIZE                             0xc90</div><div class='del'>-#define MV64340_PCI_0_DEVCS_1_BANK_SIZE                             0xd10</div><div class='del'>-#define MV64340_PCI_1_DEVCS_1_BANK_SIZE                             0xd90</div><div class='del'>-#define MV64340_PCI_0_DEVCS_2_BANK_SIZE                             0xd18</div><div class='del'>-#define MV64340_PCI_1_DEVCS_2_BANK_SIZE                             0xd98</div><div class='del'>-#define MV64340_PCI_0_DEVCS_3_BANK_SIZE                             0xc14</div><div class='del'>-#define MV64340_PCI_1_DEVCS_3_BANK_SIZE                             0xc94</div><div class='del'>-#define MV64340_PCI_0_DEVCS_BOOT_BANK_SIZE                          0xd14</div><div class='del'>-#define MV64340_PCI_1_DEVCS_BOOT_BANK_SIZE                          0xd94</div><div class='del'>-#define MV64340_PCI_0_P2P_MEM0_BAR_SIZE                             0xd1c</div><div class='del'>-#define MV64340_PCI_1_P2P_MEM0_BAR_SIZE                             0xd9c</div><div class='del'>-#define MV64340_PCI_0_P2P_MEM1_BAR_SIZE                             0xd20</div><div class='del'>-#define MV64340_PCI_1_P2P_MEM1_BAR_SIZE                             0xda0</div><div class='del'>-#define MV64340_PCI_0_P2P_I_O_BAR_SIZE                              0xd24</div><div class='del'>-#define MV64340_PCI_1_P2P_I_O_BAR_SIZE                              0xda4</div><div class='del'>-#define MV64340_PCI_0_CPU_BAR_SIZE                                  0xd28</div><div class='del'>-#define MV64340_PCI_1_CPU_BAR_SIZE                                  0xda8</div><div class='del'>-#define MV64340_PCI_0_INTERNAL_SRAM_BAR_SIZE                        0xe00</div><div class='del'>-#define MV64340_PCI_1_INTERNAL_SRAM_BAR_SIZE                        0xe80</div><div class='del'>-#define MV64340_PCI_0_EXPANSION_ROM_BAR_SIZE                        0xd2c</div><div class='del'>-#define MV64340_PCI_1_EXPANSION_ROM_BAR_SIZE                        0xd9c</div><div class='del'>-#define MV64340_PCI_0_BASE_ADDR_REG_ENABLE                          0xc3c</div><div class='del'>-#define MV64340_PCI_1_BASE_ADDR_REG_ENABLE                          0xcbc</div><div class='del'>-#define MV64340_PCI_0_CS_0_BASE_ADDR_REMAP			    0xc48</div><div class='del'>-#define MV64340_PCI_1_CS_0_BASE_ADDR_REMAP			    0xcc8</div><div class='del'>-#define MV64340_PCI_0_CS_1_BASE_ADDR_REMAP			    0xd48</div><div class='del'>-#define MV64340_PCI_1_CS_1_BASE_ADDR_REMAP			    0xdc8</div><div class='del'>-#define MV64340_PCI_0_CS_2_BASE_ADDR_REMAP			    0xc4c</div><div class='del'>-#define MV64340_PCI_1_CS_2_BASE_ADDR_REMAP			    0xccc</div><div class='del'>-#define MV64340_PCI_0_CS_3_BASE_ADDR_REMAP			    0xd4c</div><div class='del'>-#define MV64340_PCI_1_CS_3_BASE_ADDR_REMAP			    0xdcc</div><div class='del'>-#define MV64340_PCI_0_CS_0_BASE_HIGH_ADDR_REMAP			    0xF04</div><div class='del'>-#define MV64340_PCI_1_CS_0_BASE_HIGH_ADDR_REMAP			    0xF84</div><div class='del'>-#define MV64340_PCI_0_CS_1_BASE_HIGH_ADDR_REMAP			    0xF08</div><div class='del'>-#define MV64340_PCI_1_CS_1_BASE_HIGH_ADDR_REMAP			    0xF88</div><div class='del'>-#define MV64340_PCI_0_CS_2_BASE_HIGH_ADDR_REMAP			    0xF0C</div><div class='del'>-#define MV64340_PCI_1_CS_2_BASE_HIGH_ADDR_REMAP			    0xF8C</div><div class='del'>-#define MV64340_PCI_0_CS_3_BASE_HIGH_ADDR_REMAP			    0xF10</div><div class='del'>-#define MV64340_PCI_1_CS_3_BASE_HIGH_ADDR_REMAP			    0xF90</div><div class='del'>-#define MV64340_PCI_0_DEVCS_0_BASE_ADDR_REMAP			    0xc50</div><div class='del'>-#define MV64340_PCI_1_DEVCS_0_BASE_ADDR_REMAP			    0xcd0</div><div class='del'>-#define MV64340_PCI_0_DEVCS_1_BASE_ADDR_REMAP			    0xd50</div><div class='del'>-#define MV64340_PCI_1_DEVCS_1_BASE_ADDR_REMAP			    0xdd0</div><div class='del'>-#define MV64340_PCI_0_DEVCS_2_BASE_ADDR_REMAP			    0xd58</div><div class='del'>-#define MV64340_PCI_1_DEVCS_2_BASE_ADDR_REMAP			    0xdd8</div><div class='del'>-#define MV64340_PCI_0_DEVCS_3_BASE_ADDR_REMAP           	    0xc54</div><div class='del'>-#define MV64340_PCI_1_DEVCS_3_BASE_ADDR_REMAP           	    0xcd4</div><div class='del'>-#define MV64340_PCI_0_DEVCS_BOOTCS_BASE_ADDR_REMAP      	    0xd54</div><div class='del'>-#define MV64340_PCI_1_DEVCS_BOOTCS_BASE_ADDR_REMAP      	    0xdd4</div><div class='del'>-#define MV64340_PCI_0_P2P_MEM0_BASE_ADDR_REMAP_LOW                  0xd5c</div><div class='del'>-#define MV64340_PCI_1_P2P_MEM0_BASE_ADDR_REMAP_LOW                  0xddc</div><div class='del'>-#define MV64340_PCI_0_P2P_MEM0_BASE_ADDR_REMAP_HIGH                 0xd60</div><div class='del'>-#define MV64340_PCI_1_P2P_MEM0_BASE_ADDR_REMAP_HIGH                 0xde0</div><div class='del'>-#define MV64340_PCI_0_P2P_MEM1_BASE_ADDR_REMAP_LOW                  0xd64</div><div class='del'>-#define MV64340_PCI_1_P2P_MEM1_BASE_ADDR_REMAP_LOW                  0xde4</div><div class='del'>-#define MV64340_PCI_0_P2P_MEM1_BASE_ADDR_REMAP_HIGH                 0xd68</div><div class='del'>-#define MV64340_PCI_1_P2P_MEM1_BASE_ADDR_REMAP_HIGH                 0xde8</div><div class='del'>-#define MV64340_PCI_0_P2P_I_O_BASE_ADDR_REMAP                       0xd6c</div><div class='del'>-#define MV64340_PCI_1_P2P_I_O_BASE_ADDR_REMAP                       0xdec </div><div class='del'>-#define MV64340_PCI_0_CPU_BASE_ADDR_REMAP_LOW                       0xd70</div><div class='del'>-#define MV64340_PCI_1_CPU_BASE_ADDR_REMAP_LOW                       0xdf0</div><div class='del'>-#define MV64340_PCI_0_CPU_BASE_ADDR_REMAP_HIGH                      0xd74</div><div class='del'>-#define MV64340_PCI_1_CPU_BASE_ADDR_REMAP_HIGH                      0xdf4</div><div class='del'>-#define MV64340_PCI_0_INTEGRATED_SRAM_BASE_ADDR_REMAP               0xf00</div><div class='del'>-#define MV64340_PCI_1_INTEGRATED_SRAM_BASE_ADDR_REMAP               0xf80</div><div class='del'>-#define MV64340_PCI_0_EXPANSION_ROM_BASE_ADDR_REMAP                 0xf38</div><div class='del'>-#define MV64340_PCI_1_EXPANSION_ROM_BASE_ADDR_REMAP                 0xfb8</div><div class='del'>-#define MV64340_PCI_0_ADDR_DECODE_CONTROL                           0xd3c</div><div class='del'>-#define MV64340_PCI_1_ADDR_DECODE_CONTROL                           0xdbc</div><div class='del'>-#define MV64340_PCI_0_HEADERS_RETARGET_CONTROL                      0xF40</div><div class='del'>-#define MV64340_PCI_1_HEADERS_RETARGET_CONTROL                      0xFc0</div><div class='del'>-#define MV64340_PCI_0_HEADERS_RETARGET_BASE                         0xF44</div><div class='del'>-#define MV64340_PCI_1_HEADERS_RETARGET_BASE                         0xFc4</div><div class='del'>-#define MV64340_PCI_0_HEADERS_RETARGET_HIGH                         0xF48</div><div class='del'>-#define MV64340_PCI_1_HEADERS_RETARGET_HIGH                         0xFc8</div><div class='del'>-</div><div class='del'>-/***********************************/</div><div class='del'>-/*   PCI Control Register Map      */</div><div class='del'>-/***********************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_0_DLL_STATUS_AND_COMMAND                        0x1d20</div><div class='del'>-#define MV64340_PCI_1_DLL_STATUS_AND_COMMAND                        0x1da0</div><div class='del'>-#define MV64340_PCI_0_MPP_PADS_DRIVE_CONTROL                        0x1d1C</div><div class='del'>-#define MV64340_PCI_1_MPP_PADS_DRIVE_CONTROL                        0x1d9C</div><div class='del'>-#define MV64340_PCI_0_COMMAND			         	    0xc00</div><div class='del'>-#define MV64340_PCI_1_COMMAND					    0xc80</div><div class='del'>-#define MV64340_PCI_0_MODE                                          0xd00</div><div class='del'>-#define MV64340_PCI_1_MODE                                          0xd80</div><div class='del'>-#define MV64340_PCI_0_RETRY	        	 		    0xc04</div><div class='del'>-#define MV64340_PCI_1_RETRY				            0xc84</div><div class='del'>-#define MV64340_PCI_0_READ_BUFFER_DISCARD_TIMER                     0xd04</div><div class='del'>-#define MV64340_PCI_1_READ_BUFFER_DISCARD_TIMER                     0xd84</div><div class='del'>-#define MV64340_PCI_0_MSI_TRIGGER_TIMER                             0xc38</div><div class='del'>-#define MV64340_PCI_1_MSI_TRIGGER_TIMER                             0xcb8</div><div class='del'>-#define MV64340_PCI_0_ARBITER_CONTROL                               0x1d00</div><div class='del'>-#define MV64340_PCI_1_ARBITER_CONTROL                               0x1d80</div><div class='del'>-#define MV64340_PCI_0_CROSS_BAR_CONTROL_LOW                         0x1d08</div><div class='del'>-#define MV64340_PCI_1_CROSS_BAR_CONTROL_LOW                         0x1d88</div><div class='del'>-#define MV64340_PCI_0_CROSS_BAR_CONTROL_HIGH                        0x1d0c</div><div class='del'>-#define MV64340_PCI_1_CROSS_BAR_CONTROL_HIGH                        0x1d8c</div><div class='del'>-#define MV64340_PCI_0_CROSS_BAR_TIMEOUT                             0x1d04</div><div class='del'>-#define MV64340_PCI_1_CROSS_BAR_TIMEOUT                             0x1d84</div><div class='del'>-#define MV64340_PCI_0_SYNC_BARRIER_TRIGGER_REG                      0x1D18</div><div class='del'>-#define MV64340_PCI_1_SYNC_BARRIER_TRIGGER_REG                      0x1D98</div><div class='del'>-#define MV64340_PCI_0_SYNC_BARRIER_VIRTUAL_REG                      0x1d10</div><div class='del'>-#define MV64340_PCI_1_SYNC_BARRIER_VIRTUAL_REG                      0x1d90</div><div class='del'>-#define MV64340_PCI_0_P2P_CONFIG                                    0x1d14</div><div class='del'>-#define MV64340_PCI_1_P2P_CONFIG                                    0x1d94</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_0_LOW                     0x1e00</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_0_HIGH                    0x1e04</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_0                         0x1e08</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_1_LOW                     0x1e10</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_1_HIGH                    0x1e14</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_1                         0x1e18</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_2_LOW                     0x1e20</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_2_HIGH                    0x1e24</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_2                         0x1e28</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_3_LOW                     0x1e30</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_3_HIGH                    0x1e34</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_3                         0x1e38</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_4_LOW                     0x1e40</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_4_HIGH                    0x1e44</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_4                         0x1e48</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_5_LOW                     0x1e50</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_BASE_5_HIGH                    0x1e54</div><div class='del'>-#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_5                         0x1e58</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_0_LOW                     0x1e80</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_0_HIGH                    0x1e84</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_0                         0x1e88</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_1_LOW                     0x1e90</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_1_HIGH                    0x1e94</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_1                         0x1e98</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_2_LOW                     0x1ea0</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_2_HIGH                    0x1ea4</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_2                         0x1ea8</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_3_LOW                     0x1eb0</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_3_HIGH                    0x1eb4</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_3                         0x1eb8</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_4_LOW                     0x1ec0</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_4_HIGH                    0x1ec4</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_4                         0x1ec8</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_5_LOW                     0x1ed0</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_BASE_5_HIGH                    0x1ed4</div><div class='del'>-#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_5                         0x1ed8</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*   PCI Configuration Access Registers */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_0_CONFIG_ADDR 				    0xcf8</div><div class='del'>-#define MV64340_PCI_0_CONFIG_DATA_VIRTUAL_REG                       0xcfc</div><div class='del'>-#define MV64340_PCI_1_CONFIG_ADDR 				    0xc78</div><div class='del'>-#define MV64340_PCI_1_CONFIG_DATA_VIRTUAL_REG                       0xc7c</div><div class='del'>-#define MV64340_PCI_0_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG	            0xc34</div><div class='del'>-#define MV64340_PCI_1_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG	            0xcb4</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*   PCI Error Report Registers         */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_0_SERR_MASK					    0xc28</div><div class='del'>-#define MV64340_PCI_1_SERR_MASK					    0xca8</div><div class='del'>-#define MV64340_PCI_0_ERROR_ADDR_LOW                                0x1d40</div><div class='del'>-#define MV64340_PCI_1_ERROR_ADDR_LOW                                0x1dc0</div><div class='del'>-#define MV64340_PCI_0_ERROR_ADDR_HIGH                               0x1d44</div><div class='del'>-#define MV64340_PCI_1_ERROR_ADDR_HIGH                               0x1dc4</div><div class='del'>-#define MV64340_PCI_0_ERROR_ATTRIBUTE                               0x1d48</div><div class='del'>-#define MV64340_PCI_1_ERROR_ATTRIBUTE                               0x1dc8</div><div class='del'>-#define MV64340_PCI_0_ERROR_COMMAND                                 0x1d50</div><div class='del'>-#define MV64340_PCI_1_ERROR_COMMAND                                 0x1dd0</div><div class='del'>-#define MV64340_PCI_0_ERROR_CAUSE                                   0x1d58</div><div class='del'>-#define MV64340_PCI_1_ERROR_CAUSE                                   0x1dd8</div><div class='del'>-#define MV64340_PCI_0_ERROR_MASK                                    0x1d5c</div><div class='del'>-#define MV64340_PCI_1_ERROR_MASK                                    0x1ddc</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*   PCI Debug Registers                */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_0_MMASK                                         0X1D24</div><div class='del'>-#define MV64340_PCI_1_MMASK                                         0X1DA4</div><div class='del'>-</div><div class='del'>-/*********************************************/</div><div class='del'>-/* PCI Configuration, Function 0, Registers  */</div><div class='del'>-/*********************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_DEVICE_AND_VENDOR_ID 			    0x000</div><div class='del'>-#define MV64340_PCI_STATUS_AND_COMMAND				    0x004</div><div class='del'>-#define MV64340_PCI_CLASS_CODE_AND_REVISION_ID			    0x008</div><div class='del'>-#define MV64340_PCI_BIST_HEADER_TYPE_LATENCY_TIMER_CACHE_LINE 	    0x00C</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_SCS_0_BASE_ADDR_LOW   	      		    0x010</div><div class='del'>-#define MV64340_PCI_SCS_0_BASE_ADDR_HIGH   		            0x014</div><div class='del'>-#define MV64340_PCI_SCS_1_BASE_ADDR_LOW  	     	            0x018</div><div class='del'>-#define MV64340_PCI_SCS_1_BASE_ADDR_HIGH 		            0x01C</div><div class='del'>-#define MV64340_PCI_INTERNAL_REG_MEM_MAPPED_BASE_ADDR_LOW      	    0x020</div><div class='del'>-#define MV64340_PCI_INTERNAL_REG_MEM_MAPPED_BASE_ADDR_HIGH     	    0x024</div><div class='del'>-#define MV64340_PCI_SUBSYSTEM_ID_AND_SUBSYSTEM_VENDOR_ID	    0x02c</div><div class='del'>-#define MV64340_PCI_EXPANSION_ROM_BASE_ADDR_REG	                    0x030</div><div class='del'>-#define MV64340_PCI_CAPABILTY_LIST_POINTER                          0x034</div><div class='del'>-#define MV64340_PCI_INTERRUPT_PIN_AND_LINE 			    0x03C</div><div class='del'>-       /* capability list */</div><div class='del'>-#define MV64340_PCI_POWER_MANAGEMENT_CAPABILITY                     0x040</div><div class='del'>-#define MV64340_PCI_POWER_MANAGEMENT_STATUS_AND_CONTROL             0x044</div><div class='del'>-#define MV64340_PCI_VPD_ADDR                                        0x048</div><div class='del'>-#define MV64340_PCI_VPD_DATA                                        0x04c</div><div class='del'>-#define MV64340_PCI_MSI_MESSAGE_CONTROL                             0x050</div><div class='del'>-#define MV64340_PCI_MSI_MESSAGE_ADDR                                0x054</div><div class='del'>-#define MV64340_PCI_MSI_MESSAGE_UPPER_ADDR                          0x058</div><div class='del'>-#define MV64340_PCI_MSI_MESSAGE_DATA                                0x05c</div><div class='del'>-#define MV64340_PCI_X_COMMAND                                       0x060</div><div class='del'>-#define MV64340_PCI_X_STATUS                                        0x064</div><div class='del'>-#define MV64340_PCI_COMPACT_PCI_HOT_SWAP                            0x068</div><div class='del'>-</div><div class='del'>-/***********************************************/</div><div class='del'>-/*   PCI Configuration, Function 1, Registers  */</div><div class='del'>-/***********************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_SCS_2_BASE_ADDR_LOW   			    0x110</div><div class='del'>-#define MV64340_PCI_SCS_2_BASE_ADDR_HIGH			    0x114</div><div class='del'>-#define MV64340_PCI_SCS_3_BASE_ADDR_LOW 			    0x118</div><div class='del'>-#define MV64340_PCI_SCS_3_BASE_ADDR_HIGH			    0x11c</div><div class='del'>-#define MV64340_PCI_INTERNAL_SRAM_BASE_ADDR_LOW          	    0x120</div><div class='del'>-#define MV64340_PCI_INTERNAL_SRAM_BASE_ADDR_HIGH         	    0x124</div><div class='del'>-</div><div class='del'>-/***********************************************/</div><div class='del'>-/*  PCI Configuration, Function 2, Registers   */</div><div class='del'>-/***********************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_DEVCS_0_BASE_ADDR_LOW	    		    0x210</div><div class='del'>-#define MV64340_PCI_DEVCS_0_BASE_ADDR_HIGH 			    0x214</div><div class='del'>-#define MV64340_PCI_DEVCS_1_BASE_ADDR_LOW 			    0x218</div><div class='del'>-#define MV64340_PCI_DEVCS_1_BASE_ADDR_HIGH      		    0x21c</div><div class='del'>-#define MV64340_PCI_DEVCS_2_BASE_ADDR_LOW 			    0x220</div><div class='del'>-#define MV64340_PCI_DEVCS_2_BASE_ADDR_HIGH      		    0x224</div><div class='del'>-</div><div class='del'>-/***********************************************/</div><div class='del'>-/*  PCI Configuration, Function 3, Registers   */</div><div class='del'>-/***********************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_DEVCS_3_BASE_ADDR_LOW	    		    0x310</div><div class='del'>-#define MV64340_PCI_DEVCS_3_BASE_ADDR_HIGH 			    0x314</div><div class='del'>-#define MV64340_PCI_BOOT_CS_BASE_ADDR_LOW			    0x318</div><div class='del'>-#define MV64340_PCI_BOOT_CS_BASE_ADDR_HIGH      		    0x31c</div><div class='del'>-#define MV64340_PCI_CPU_BASE_ADDR_LOW 				    0x220</div><div class='del'>-#define MV64340_PCI_CPU_BASE_ADDR_HIGH      			    0x224</div><div class='del'>-</div><div class='del'>-/***********************************************/</div><div class='del'>-/*  PCI Configuration, Function 4, Registers   */</div><div class='del'>-/***********************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_PCI_P2P_MEM0_BASE_ADDR_LOW  			    0x410</div><div class='del'>-#define MV64340_PCI_P2P_MEM0_BASE_ADDR_HIGH 			    0x414</div><div class='del'>-#define MV64340_PCI_P2P_MEM1_BASE_ADDR_LOW   			    0x418</div><div class='del'>-#define MV64340_PCI_P2P_MEM1_BASE_ADDR_HIGH 			    0x41c</div><div class='del'>-#define MV64340_PCI_P2P_I_O_BASE_ADDR                 	            0x420</div><div class='del'>-#define MV64340_PCI_INTERNAL_REGS_I_O_MAPPED_BASE_ADDR              0x424</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* Messaging Unit Registers (I20)   	*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_I2O_INBOUND_MESSAGE_REG0_PCI_0_SIDE		    0x010</div><div class='del'>-#define MV64340_I2O_INBOUND_MESSAGE_REG1_PCI_0_SIDE  		    0x014</div><div class='del'>-#define MV64340_I2O_OUTBOUND_MESSAGE_REG0_PCI_0_SIDE 		    0x018</div><div class='del'>-#define MV64340_I2O_OUTBOUND_MESSAGE_REG1_PCI_0_SIDE  		    0x01C</div><div class='del'>-#define MV64340_I2O_INBOUND_DOORBELL_REG_PCI_0_SIDE  		    0x020</div><div class='del'>-#define MV64340_I2O_INBOUND_INTERRUPT_CAUSE_REG_PCI_0_SIDE          0x024</div><div class='del'>-#define MV64340_I2O_INBOUND_INTERRUPT_MASK_REG_PCI_0_SIDE	    0x028</div><div class='del'>-#define MV64340_I2O_OUTBOUND_DOORBELL_REG_PCI_0_SIDE 		    0x02C</div><div class='del'>-#define MV64340_I2O_OUTBOUND_INTERRUPT_CAUSE_REG_PCI_0_SIDE         0x030</div><div class='del'>-#define MV64340_I2O_OUTBOUND_INTERRUPT_MASK_REG_PCI_0_SIDE          0x034</div><div class='del'>-#define MV64340_I2O_INBOUND_QUEUE_PORT_VIRTUAL_REG_PCI_0_SIDE       0x040</div><div class='del'>-#define MV64340_I2O_OUTBOUND_QUEUE_PORT_VIRTUAL_REG_PCI_0_SIDE      0x044</div><div class='del'>-#define MV64340_I2O_QUEUE_CONTROL_REG_PCI_0_SIDE 		    0x050</div><div class='del'>-#define MV64340_I2O_QUEUE_BASE_ADDR_REG_PCI_0_SIDE 		    0x054</div><div class='del'>-#define MV64340_I2O_INBOUND_FREE_HEAD_POINTER_REG_PCI_0_SIDE        0x060</div><div class='del'>-#define MV64340_I2O_INBOUND_FREE_TAIL_POINTER_REG_PCI_0_SIDE        0x064</div><div class='del'>-#define MV64340_I2O_INBOUND_POST_HEAD_POINTER_REG_PCI_0_SIDE        0x068</div><div class='del'>-#define MV64340_I2O_INBOUND_POST_TAIL_POINTER_REG_PCI_0_SIDE        0x06C</div><div class='del'>-#define MV64340_I2O_OUTBOUND_FREE_HEAD_POINTER_REG_PCI_0_SIDE       0x070</div><div class='del'>-#define MV64340_I2O_OUTBOUND_FREE_TAIL_POINTER_REG_PCI_0_SIDE       0x074</div><div class='del'>-#define MV64340_I2O_OUTBOUND_POST_HEAD_POINTER_REG_PCI_0_SIDE       0x0F8</div><div class='del'>-#define MV64340_I2O_OUTBOUND_POST_TAIL_POINTER_REG_PCI_0_SIDE       0x0FC</div><div class='del'>-</div><div class='del'>-#define MV64340_I2O_INBOUND_MESSAGE_REG0_PCI_1_SIDE		    0x090</div><div class='del'>-#define MV64340_I2O_INBOUND_MESSAGE_REG1_PCI_1_SIDE  		    0x094</div><div class='del'>-#define MV64340_I2O_OUTBOUND_MESSAGE_REG0_PCI_1_SIDE 		    0x098</div><div class='del'>-#define MV64340_I2O_OUTBOUND_MESSAGE_REG1_PCI_1_SIDE  		    0x09C</div><div class='del'>-#define MV64340_I2O_INBOUND_DOORBELL_REG_PCI_1_SIDE  		    0x0A0</div><div class='del'>-#define MV64340_I2O_INBOUND_INTERRUPT_CAUSE_REG_PCI_1_SIDE          0x0A4</div><div class='del'>-#define MV64340_I2O_INBOUND_INTERRUPT_MASK_REG_PCI_1_SIDE	    0x0A8</div><div class='del'>-#define MV64340_I2O_OUTBOUND_DOORBELL_REG_PCI_1_SIDE 		    0x0AC</div><div class='del'>-#define MV64340_I2O_OUTBOUND_INTERRUPT_CAUSE_REG_PCI_1_SIDE         0x0B0</div><div class='del'>-#define MV64340_I2O_OUTBOUND_INTERRUPT_MASK_REG_PCI_1_SIDE          0x0B4</div><div class='del'>-#define MV64340_I2O_INBOUND_QUEUE_PORT_VIRTUAL_REG_PCI_1_SIDE       0x0C0</div><div class='del'>-#define MV64340_I2O_OUTBOUND_QUEUE_PORT_VIRTUAL_REG_PCI_1_SIDE      0x0C4</div><div class='del'>-#define MV64340_I2O_QUEUE_CONTROL_REG_PCI_1_SIDE 		    0x0D0</div><div class='del'>-#define MV64340_I2O_QUEUE_BASE_ADDR_REG_PCI_1_SIDE 		    0x0D4</div><div class='del'>-#define MV64340_I2O_INBOUND_FREE_HEAD_POINTER_REG_PCI_1_SIDE        0x0E0</div><div class='del'>-#define MV64340_I2O_INBOUND_FREE_TAIL_POINTER_REG_PCI_1_SIDE        0x0E4</div><div class='del'>-#define MV64340_I2O_INBOUND_POST_HEAD_POINTER_REG_PCI_1_SIDE        0x0E8</div><div class='del'>-#define MV64340_I2O_INBOUND_POST_TAIL_POINTER_REG_PCI_1_SIDE        0x0EC</div><div class='del'>-#define MV64340_I2O_OUTBOUND_FREE_HEAD_POINTER_REG_PCI_1_SIDE       0x0F0</div><div class='del'>-#define MV64340_I2O_OUTBOUND_FREE_TAIL_POINTER_REG_PCI_1_SIDE       0x0F4</div><div class='del'>-#define MV64340_I2O_OUTBOUND_POST_HEAD_POINTER_REG_PCI_1_SIDE       0x078</div><div class='del'>-#define MV64340_I2O_OUTBOUND_POST_TAIL_POINTER_REG_PCI_1_SIDE       0x07C</div><div class='del'>-</div><div class='del'>-#define MV64340_I2O_INBOUND_MESSAGE_REG0_CPU0_SIDE		    0x1C10</div><div class='del'>-#define MV64340_I2O_INBOUND_MESSAGE_REG1_CPU0_SIDE  		    0x1C14</div><div class='del'>-#define MV64340_I2O_OUTBOUND_MESSAGE_REG0_CPU0_SIDE 		    0x1C18</div><div class='del'>-#define MV64340_I2O_OUTBOUND_MESSAGE_REG1_CPU0_SIDE  		    0x1C1C</div><div class='del'>-#define MV64340_I2O_INBOUND_DOORBELL_REG_CPU0_SIDE  		    0x1C20</div><div class='del'>-#define MV64340_I2O_INBOUND_INTERRUPT_CAUSE_REG_CPU0_SIDE  	    0x1C24</div><div class='del'>-#define MV64340_I2O_INBOUND_INTERRUPT_MASK_REG_CPU0_SIDE	    0x1C28</div><div class='del'>-#define MV64340_I2O_OUTBOUND_DOORBELL_REG_CPU0_SIDE 		    0x1C2C</div><div class='del'>-#define MV64340_I2O_OUTBOUND_INTERRUPT_CAUSE_REG_CPU0_SIDE          0x1C30</div><div class='del'>-#define MV64340_I2O_OUTBOUND_INTERRUPT_MASK_REG_CPU0_SIDE           0x1C34</div><div class='del'>-#define MV64340_I2O_INBOUND_QUEUE_PORT_VIRTUAL_REG_CPU0_SIDE        0x1C40</div><div class='del'>-#define MV64340_I2O_OUTBOUND_QUEUE_PORT_VIRTUAL_REG_CPU0_SIDE       0x1C44</div><div class='del'>-#define MV64340_I2O_QUEUE_CONTROL_REG_CPU0_SIDE 		    0x1C50</div><div class='del'>-#define MV64340_I2O_QUEUE_BASE_ADDR_REG_CPU0_SIDE 		    0x1C54</div><div class='del'>-#define MV64340_I2O_INBOUND_FREE_HEAD_POINTER_REG_CPU0_SIDE         0x1C60</div><div class='del'>-#define MV64340_I2O_INBOUND_FREE_TAIL_POINTER_REG_CPU0_SIDE         0x1C64</div><div class='del'>-#define MV64340_I2O_INBOUND_POST_HEAD_POINTER_REG_CPU0_SIDE         0x1C68</div><div class='del'>-#define MV64340_I2O_INBOUND_POST_TAIL_POINTER_REG_CPU0_SIDE         0x1C6C</div><div class='del'>-#define MV64340_I2O_OUTBOUND_FREE_HEAD_POINTER_REG_CPU0_SIDE        0x1C70</div><div class='del'>-#define MV64340_I2O_OUTBOUND_FREE_TAIL_POINTER_REG_CPU0_SIDE        0x1C74</div><div class='del'>-#define MV64340_I2O_OUTBOUND_POST_HEAD_POINTER_REG_CPU0_SIDE        0x1CF8</div><div class='del'>-#define MV64340_I2O_OUTBOUND_POST_TAIL_POINTER_REG_CPU0_SIDE        0x1CFC</div><div class='del'>-#define MV64340_I2O_INBOUND_MESSAGE_REG0_CPU1_SIDE		    0x1C90</div><div class='del'>-#define MV64340_I2O_INBOUND_MESSAGE_REG1_CPU1_SIDE  		    0x1C94</div><div class='del'>-#define MV64340_I2O_OUTBOUND_MESSAGE_REG0_CPU1_SIDE 		    0x1C98</div><div class='del'>-#define MV64340_I2O_OUTBOUND_MESSAGE_REG1_CPU1_SIDE  		    0x1C9C</div><div class='del'>-#define MV64340_I2O_INBOUND_DOORBELL_REG_CPU1_SIDE  		    0x1CA0</div><div class='del'>-#define MV64340_I2O_INBOUND_INTERRUPT_CAUSE_REG_CPU1_SIDE  	    0x1CA4</div><div class='del'>-#define MV64340_I2O_INBOUND_INTERRUPT_MASK_REG_CPU1_SIDE	    0x1CA8</div><div class='del'>-#define MV64340_I2O_OUTBOUND_DOORBELL_REG_CPU1_SIDE 		    0x1CAC</div><div class='del'>-#define MV64340_I2O_OUTBOUND_INTERRUPT_CAUSE_REG_CPU1_SIDE          0x1CB0</div><div class='del'>-#define MV64340_I2O_OUTBOUND_INTERRUPT_MASK_REG_CPU1_SIDE           0x1CB4</div><div class='del'>-#define MV64340_I2O_INBOUND_QUEUE_PORT_VIRTUAL_REG_CPU1_SIDE        0x1CC0</div><div class='del'>-#define MV64340_I2O_OUTBOUND_QUEUE_PORT_VIRTUAL_REG_CPU1_SIDE       0x1CC4</div><div class='del'>-#define MV64340_I2O_QUEUE_CONTROL_REG_CPU1_SIDE 		    0x1CD0</div><div class='del'>-#define MV64340_I2O_QUEUE_BASE_ADDR_REG_CPU1_SIDE 		    0x1CD4</div><div class='del'>-#define MV64340_I2O_INBOUND_FREE_HEAD_POINTER_REG_CPU1_SIDE         0x1CE0</div><div class='del'>-#define MV64340_I2O_INBOUND_FREE_TAIL_POINTER_REG_CPU1_SIDE         0x1CE4</div><div class='del'>-#define MV64340_I2O_INBOUND_POST_HEAD_POINTER_REG_CPU1_SIDE         0x1CE8</div><div class='del'>-#define MV64340_I2O_INBOUND_POST_TAIL_POINTER_REG_CPU1_SIDE         0x1CEC</div><div class='del'>-#define MV64340_I2O_OUTBOUND_FREE_HEAD_POINTER_REG_CPU1_SIDE        0x1CF0</div><div class='del'>-#define MV64340_I2O_OUTBOUND_FREE_TAIL_POINTER_REG_CPU1_SIDE        0x1CF4</div><div class='del'>-#define MV64340_I2O_OUTBOUND_POST_HEAD_POINTER_REG_CPU1_SIDE        0x1C78</div><div class='del'>-#define MV64340_I2O_OUTBOUND_POST_TAIL_POINTER_REG_CPU1_SIDE        0x1C7C</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*        Ethernet Unit Registers  		*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-/*******************************************/</div><div class='del'>-/*          CUNIT  Registers               */</div><div class='del'>-/*******************************************/</div><div class='del'>-</div><div class='del'>-         /* Address Decoding Register Map */</div><div class='del'>-           </div><div class='del'>-#define MV64340_CUNIT_BASE_ADDR_REG0                                0xf200</div><div class='del'>-#define MV64340_CUNIT_BASE_ADDR_REG1                                0xf208</div><div class='del'>-#define MV64340_CUNIT_BASE_ADDR_REG2                                0xf210</div><div class='del'>-#define MV64340_CUNIT_BASE_ADDR_REG3                                0xf218</div><div class='del'>-#define MV64340_CUNIT_SIZE0                                         0xf204</div><div class='del'>-#define MV64340_CUNIT_SIZE1                                         0xf20c</div><div class='del'>-#define MV64340_CUNIT_SIZE2                                         0xf214</div><div class='del'>-#define MV64340_CUNIT_SIZE3                                         0xf21c</div><div class='del'>-#define MV64340_CUNIT_HIGH_ADDR_REMAP_REG0                          0xf240</div><div class='del'>-#define MV64340_CUNIT_HIGH_ADDR_REMAP_REG1                          0xf244</div><div class='del'>-#define MV64340_CUNIT_BASE_ADDR_ENABLE_REG                          0xf250</div><div class='del'>-#define MV64340_MPSC0_ACCESS_PROTECTION_REG                         0xf254</div><div class='del'>-#define MV64340_MPSC1_ACCESS_PROTECTION_REG                         0xf258</div><div class='del'>-#define MV64340_CUNIT_INTERNAL_SPACE_BASE_ADDR_REG                  0xf25C</div><div class='del'>-</div><div class='del'>-        /*  Error Report Registers  */</div><div class='del'>-</div><div class='del'>-#define MV64340_CUNIT_INTERRUPT_CAUSE_REG                           0xf310</div><div class='del'>-#define MV64340_CUNIT_INTERRUPT_MASK_REG                            0xf314</div><div class='del'>-#define MV64340_CUNIT_ERROR_ADDR                                    0xf318</div><div class='del'>-</div><div class='del'>-        /*  Cunit Control Registers */</div><div class='del'>-</div><div class='del'>-#define MV64340_CUNIT_ARBITER_CONTROL_REG                           0xf300</div><div class='del'>-#define MV64340_CUNIT_CONFIG_REG                                    0xb40c</div><div class='del'>-#define MV64340_CUNIT_CRROSBAR_TIMEOUT_REG                          0xf304</div><div class='del'>-</div><div class='del'>-        /*  Cunit Debug Registers   */</div><div class='del'>-</div><div class='del'>-#define MV64340_CUNIT_DEBUG_LOW                                     0xf340</div><div class='del'>-#define MV64340_CUNIT_DEBUG_HIGH                                    0xf344</div><div class='del'>-#define MV64340_CUNIT_MMASK                                         0xf380</div><div class='del'>-</div><div class='del'>-        /*  MPSCs Clocks Routing Registers  */</div><div class='del'>-</div><div class='del'>-#define MV64340_MPSC_ROUTING_REG                                    0xb400</div><div class='del'>-#define MV64340_MPSC_RX_CLOCK_ROUTING_REG                           0xb404</div><div class='del'>-#define MV64340_MPSC_TX_CLOCK_ROUTING_REG                           0xb408</div><div class='del'>-</div><div class='del'>-        /*  MPSCs Interrupts Registers    */</div><div class='del'>-</div><div class='del'>-#define MV64340_MPSC_CAUSE_REG(port)                               (0xb804 + (port&lt;&lt;3))</div><div class='del'>-#define MV64340_MPSC_MASK_REG(port)                                (0xb884 + (port&lt;&lt;3))</div><div class='del'>- </div><div class='del'>-#define MV64340_MPSC_MAIN_CONFIG_LOW(port)                         (0x8000 + (port&lt;&lt;12))</div><div class='del'>-#define MV64340_MPSC_MAIN_CONFIG_HIGH(port)                        (0x8004 + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_PROTOCOL_CONFIG(port)                         (0x8008 + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG1(port)                            (0x800c + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG2(port)                            (0x8010 + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG3(port)                            (0x8014 + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG4(port)                            (0x8018 + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG5(port)                            (0x801c + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG6(port)                            (0x8020 + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG7(port)                            (0x8024 + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG8(port)                            (0x8028 + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG9(port)                            (0x802c + (port&lt;&lt;12))    </div><div class='del'>-#define MV64340_MPSC_CHANNEL_REG10(port)                           (0x8030 + (port&lt;&lt;12))    </div><div class='del'>-        </div><div class='del'>-        /*  MPSC0 Registers      */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/***************************************/</div><div class='del'>-/*          SDMA Registers             */</div><div class='del'>-/***************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_SDMA_CONFIG_REG(channel)                        (0x4000 + (channel&lt;&lt;13))        </div><div class='del'>-#define MV64340_SDMA_COMMAND_REG(channel)                       (0x4008 + (channel&lt;&lt;13))        </div><div class='del'>-#define MV64340_SDMA_CURRENT_RX_DESCRIPTOR_POINTER(channel)     (0x4810 + (channel&lt;&lt;13))        </div><div class='del'>-#define MV64340_SDMA_CURRENT_TX_DESCRIPTOR_POINTER(channel)     (0x4c10 + (channel&lt;&lt;13))        </div><div class='del'>-#define MV64340_SDMA_FIRST_TX_DESCRIPTOR_POINTER(channel)       (0x4c14 + (channel&lt;&lt;13)) </div><div class='del'>-</div><div class='del'>-#define MV64340_SDMA_CAUSE_REG                                      0xb800</div><div class='del'>-#define MV64340_SDMA_MASK_REG                                       0xb880</div><div class='del'>-         </div><div class='del'>-/* BRG Interrupts */</div><div class='del'>-</div><div class='del'>-#define MV64340_BRG_CONFIG_REG(brg)                              (0xb200 + (brg&lt;&lt;3))</div><div class='del'>-#define MV64340_BRG_BAUDE_TUNING_REG(brg)                        (0xb208 + (brg&lt;&lt;3))</div><div class='del'>-#define MV64340_BRG_CAUSE_REG                                       0xb834</div><div class='del'>-#define MV64340_BRG_MASK_REG                                        0xb8b4</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* DMA Channel Control			*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_DMA_CHANNEL0_CONTROL 				    0x840</div><div class='del'>-#define MV64340_DMA_CHANNEL0_CONTROL_HIGH			    0x880</div><div class='del'>-#define MV64340_DMA_CHANNEL1_CONTROL 				    0x844</div><div class='del'>-#define MV64340_DMA_CHANNEL1_CONTROL_HIGH			    0x884</div><div class='del'>-#define MV64340_DMA_CHANNEL2_CONTROL 				    0x848</div><div class='del'>-#define MV64340_DMA_CHANNEL2_CONTROL_HIGH			    0x888</div><div class='del'>-#define MV64340_DMA_CHANNEL3_CONTROL 				    0x84C</div><div class='del'>-#define MV64340_DMA_CHANNEL3_CONTROL_HIGH			    0x88C</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*           IDMA Registers             */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_DMA_CHANNEL0_BYTE_COUNT                             0x800</div><div class='del'>-#define MV64340_DMA_CHANNEL1_BYTE_COUNT                             0x804</div><div class='del'>-#define MV64340_DMA_CHANNEL2_BYTE_COUNT                             0x808</div><div class='del'>-#define MV64340_DMA_CHANNEL3_BYTE_COUNT                             0x80C</div><div class='del'>-#define MV64340_DMA_CHANNEL0_SOURCE_ADDR                            0x810</div><div class='del'>-#define MV64340_DMA_CHANNEL1_SOURCE_ADDR                            0x814</div><div class='del'>-#define MV64340_DMA_CHANNEL2_SOURCE_ADDR                            0x818</div><div class='del'>-#define MV64340_DMA_CHANNEL3_SOURCE_ADDR                            0x81c</div><div class='del'>-#define MV64340_DMA_CHANNEL0_DESTINATION_ADDR                       0x820</div><div class='del'>-#define MV64340_DMA_CHANNEL1_DESTINATION_ADDR                       0x824</div><div class='del'>-#define MV64340_DMA_CHANNEL2_DESTINATION_ADDR                       0x828</div><div class='del'>-#define MV64340_DMA_CHANNEL3_DESTINATION_ADDR                       0x82C</div><div class='del'>-#define MV64340_DMA_CHANNEL0_NEXT_DESCRIPTOR_POINTER                0x830</div><div class='del'>-#define MV64340_DMA_CHANNEL1_NEXT_DESCRIPTOR_POINTER                0x834</div><div class='del'>-#define MV64340_DMA_CHANNEL2_NEXT_DESCRIPTOR_POINTER                0x838</div><div class='del'>-#define MV64340_DMA_CHANNEL3_NEXT_DESCRIPTOR_POINTER                0x83C</div><div class='del'>-#define MV64340_DMA_CHANNEL0_CURRENT_DESCRIPTOR_POINTER             0x870</div><div class='del'>-#define MV64340_DMA_CHANNEL1_CURRENT_DESCRIPTOR_POINTER             0x874</div><div class='del'>-#define MV64340_DMA_CHANNEL2_CURRENT_DESCRIPTOR_POINTER             0x878</div><div class='del'>-#define MV64340_DMA_CHANNEL3_CURRENT_DESCRIPTOR_POINTER             0x87C</div><div class='del'>-</div><div class='del'>- /*  IDMA Address Decoding Base Address Registers  */</div><div class='del'>- </div><div class='del'>-#define MV64340_DMA_BASE_ADDR_REG0                                  0xa00</div><div class='del'>-#define MV64340_DMA_BASE_ADDR_REG1                                  0xa08</div><div class='del'>-#define MV64340_DMA_BASE_ADDR_REG2                                  0xa10</div><div class='del'>-#define MV64340_DMA_BASE_ADDR_REG3                                  0xa18</div><div class='del'>-#define MV64340_DMA_BASE_ADDR_REG4                                  0xa20</div><div class='del'>-#define MV64340_DMA_BASE_ADDR_REG5                                  0xa28</div><div class='del'>-#define MV64340_DMA_BASE_ADDR_REG6                                  0xa30</div><div class='del'>-#define MV64340_DMA_BASE_ADDR_REG7                                  0xa38</div><div class='del'>- </div><div class='del'>- /*  IDMA Address Decoding Size Address Register   */</div><div class='del'>- </div><div class='del'>-#define MV64340_DMA_SIZE_REG0                                       0xa04</div><div class='del'>-#define MV64340_DMA_SIZE_REG1                                       0xa0c</div><div class='del'>-#define MV64340_DMA_SIZE_REG2                                       0xa14</div><div class='del'>-#define MV64340_DMA_SIZE_REG3                                       0xa1c</div><div class='del'>-#define MV64340_DMA_SIZE_REG4                                       0xa24</div><div class='del'>-#define MV64340_DMA_SIZE_REG5                                       0xa2c</div><div class='del'>-#define MV64340_DMA_SIZE_REG6                                       0xa34</div><div class='del'>-#define MV64340_DMA_SIZE_REG7                                       0xa3C</div><div class='del'>-</div><div class='del'>- /* IDMA Address Decoding High Address Remap and Access </div><div class='del'>-                  Protection Registers                    */</div><div class='del'>-                  </div><div class='del'>-#define MV64340_DMA_HIGH_ADDR_REMAP_REG0                            0xa60</div><div class='del'>-#define MV64340_DMA_HIGH_ADDR_REMAP_REG1                            0xa64</div><div class='del'>-#define MV64340_DMA_HIGH_ADDR_REMAP_REG2                            0xa68</div><div class='del'>-#define MV64340_DMA_HIGH_ADDR_REMAP_REG3                            0xa6C</div><div class='del'>-#define MV64340_DMA_BASE_ADDR_ENABLE_REG                            0xa80</div><div class='del'>-#define MV64340_DMA_CHANNEL0_ACCESS_PROTECTION_REG                  0xa70</div><div class='del'>-#define MV64340_DMA_CHANNEL1_ACCESS_PROTECTION_REG                  0xa74</div><div class='del'>-#define MV64340_DMA_CHANNEL2_ACCESS_PROTECTION_REG                  0xa78</div><div class='del'>-#define MV64340_DMA_CHANNEL3_ACCESS_PROTECTION_REG                  0xa7c</div><div class='del'>-#define MV64340_DMA_ARBITER_CONTROL                                 0x860</div><div class='del'>-#define MV64340_DMA_CROSS_BAR_TIMEOUT                               0x8d0</div><div class='del'>-</div><div class='del'>- /*  IDMA Headers Retarget Registers   */</div><div class='del'>-</div><div class='del'>-#define MV64340_DMA_HEADERS_RETARGET_CONTROL                        0xa84</div><div class='del'>-#define MV64340_DMA_HEADERS_RETARGET_BASE                           0xa88</div><div class='del'>-</div><div class='del'>- /*  IDMA Interrupt Register  */</div><div class='del'>-</div><div class='del'>-#define MV64340_DMA_INTERRUPT_CAUSE_REG                             0x8c0</div><div class='del'>-#define MV64340_DMA_INTERRUPT_CAUSE_MASK                            0x8c4</div><div class='del'>-#define MV64340_DMA_ERROR_ADDR                                      0x8c8</div><div class='del'>-#define MV64340_DMA_ERROR_SELECT                                    0x8cc</div><div class='del'>-</div><div class='del'>- /*  IDMA Debug Register ( for internal use )    */</div><div class='del'>-</div><div class='del'>-#define MV64340_DMA_DEBUG_LOW                                       0x8e0</div><div class='del'>-#define MV64340_DMA_DEBUG_HIGH                                      0x8e4</div><div class='del'>-#define MV64340_DMA_SPARE                                           0xA8C</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* Timer_Counter 			*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_TIMER_COUNTER0					    0x850</div><div class='del'>-#define MV64340_TIMER_COUNTER1					    0x854</div><div class='del'>-#define MV64340_TIMER_COUNTER2					    0x858</div><div class='del'>-#define MV64340_TIMER_COUNTER3					    0x85C</div><div class='del'>-#define MV64340_TIMER_COUNTER_0_3_CONTROL			    0x864</div><div class='del'>-#define MV64340_TIMER_COUNTER_0_3_INTERRUPT_CAUSE		    0x868</div><div class='del'>-#define MV64340_TIMER_COUNTER_0_3_INTERRUPT_MASK      		    0x86c</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*         Watchdog registers  	        */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_WATCHDOG_CONFIG_REG                                 0xb410</div><div class='del'>-#define MV64340_WATCHDOG_VALUE_REG                                  0xb414</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* I2C Registers                        */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64XXX_I2C_OFFSET                                          0xc000</div><div class='del'>-#define MV64XXX_I2C_REG_BLOCK_SIZE                                  0x0020</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* GPP Interface Registers              */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_GPP_IO_CONTROL                                      0xf100</div><div class='del'>-#define MV64340_GPP_LEVEL_CONTROL                                   0xf110</div><div class='del'>-#define MV64340_GPP_VALUE                                           0xf104</div><div class='del'>-#define MV64340_GPP_INTERRUPT_CAUSE                                 0xf108</div><div class='del'>-#define MV64340_GPP_INTERRUPT_MASK0                                 0xf10c</div><div class='del'>-#define MV64340_GPP_INTERRUPT_MASK1                                 0xf114</div><div class='del'>-#define MV64340_GPP_VALUE_SET                                       0xf118</div><div class='del'>-#define MV64340_GPP_VALUE_CLEAR                                     0xf11c</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* Interrupt Controller Registers       */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/* Interrupts	  			*/</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_MAIN_INTERRUPT_CAUSE_LOW                            0x004</div><div class='del'>-#define MV64340_MAIN_INTERRUPT_CAUSE_HIGH                           0x00c</div><div class='del'>-#define MV64340_CPU_INTERRUPT0_MASK_LOW                             0x014</div><div class='del'>-#define MV64340_CPU_INTERRUPT0_MASK_HIGH                            0x01c</div><div class='del'>-#define MV64340_CPU_INTERRUPT0_SELECT_CAUSE                         0x024</div><div class='del'>-#define MV64340_CPU_INTERRUPT1_MASK_LOW                             0x034</div><div class='del'>-#define MV64340_CPU_INTERRUPT1_MASK_HIGH                            0x03c</div><div class='del'>-#define MV64340_CPU_INTERRUPT1_SELECT_CAUSE                         0x044</div><div class='del'>-#define MV64340_INTERRUPT0_MASK_0_LOW                               0x054</div><div class='del'>-#define MV64340_INTERRUPT0_MASK_0_HIGH                              0x05c</div><div class='del'>-#define MV64340_INTERRUPT0_SELECT_CAUSE                             0x064</div><div class='del'>-#define MV64340_INTERRUPT1_MASK_0_LOW                               0x074</div><div class='del'>-#define MV64340_INTERRUPT1_MASK_0_HIGH                              0x07c</div><div class='del'>-#define MV64340_INTERRUPT1_SELECT_CAUSE                             0x084</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*      MPP Interface Registers         */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_MPP_CONTROL0                                        0xf000</div><div class='del'>-#define MV64340_MPP_CONTROL1                                        0xf004</div><div class='del'>-#define MV64340_MPP_CONTROL2                                        0xf008</div><div class='del'>-#define MV64340_MPP_CONTROL3                                        0xf00c</div><div class='del'>-</div><div class='del'>-/****************************************/</div><div class='del'>-/*    Serial Initialization registers   */</div><div class='del'>-/****************************************/</div><div class='del'>-</div><div class='del'>-#define MV64340_SERIAL_INIT_LAST_DATA                               0xf324</div><div class='del'>-#define MV64340_SERIAL_INIT_CONTROL                                 0xf328</div><div class='del'>-#define MV64340_SERIAL_INIT_STATUS                                  0xf32c</div><div class='del'>-</div><div class='del'>-extern void mv64340_irq_init(unsigned int base);</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_MV643XX_H */</div><div class='head'>diff --git a/include/linux/namei.h b/include/linux/namei.h<br/>index 74e0cc14ebf8..58600cf234bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/namei.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/namei.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/namei.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/namei.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/path.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/fs_struct.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum { MAX_NESTED_LINKS = 8 };</div><div class='ctx'> </div><div class='hunk'>@@ -18,72 +19,150 @@ enum { MAX_NESTED_LINKS = 8 };</div><div class='ctx'> enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT};</div><div class='ctx'> </div><div class='ctx'> /* pathwalk mode */</div><div class='del'>-#define LOOKUP_FOLLOW		0x0001	/* follow links at the end */</div><div class='del'>-#define LOOKUP_DIRECTORY	0x0002	/* require a directory */</div><div class='del'>-#define LOOKUP_AUTOMOUNT	0x0004  /* force terminal automount */</div><div class='del'>-#define LOOKUP_EMPTY		0x4000	/* accept empty path [user_... only] */</div><div class='del'>-#define LOOKUP_DOWN		0x8000	/* follow mounts in the starting point */</div><div class='del'>-#define LOOKUP_MOUNTPOINT	0x0080	/* follow mounts in the end */</div><div class='del'>-</div><div class='del'>-#define LOOKUP_REVAL		0x0020	/* tell -&gt;d_revalidate() to trust no cache */</div><div class='del'>-#define LOOKUP_RCU		0x0040	/* RCU pathwalk mode; semi-internal */</div><div class='add'>+#define LOOKUP_FOLLOW		BIT(0)	/* follow links at the end */</div><div class='add'>+#define LOOKUP_DIRECTORY	BIT(1)	/* require a directory */</div><div class='add'>+#define LOOKUP_AUTOMOUNT	BIT(2)  /* force terminal automount */</div><div class='add'>+#define LOOKUP_EMPTY		BIT(3)	/* accept empty path [user_... only] */</div><div class='add'>+#define LOOKUP_LINKAT_EMPTY	BIT(4) /* Linkat request with empty path. */</div><div class='add'>+#define LOOKUP_DOWN		BIT(5)	/* follow mounts in the starting point */</div><div class='add'>+#define LOOKUP_MOUNTPOINT	BIT(6)	/* follow mounts in the end */</div><div class='add'>+#define LOOKUP_REVAL		BIT(7)	/* tell -&gt;d_revalidate() to trust no cache */</div><div class='add'>+#define LOOKUP_RCU		BIT(8)	/* RCU pathwalk mode; semi-internal */</div><div class='add'>+#define LOOKUP_CACHED		BIT(9) /* Only do cached lookup */</div><div class='add'>+#define LOOKUP_PARENT		BIT(10)	/* Looking up final parent in path */</div><div class='add'>+/* 5 spare bits for pathwalk */</div><div class='ctx'> </div><div class='ctx'> /* These tell filesystem methods that we are dealing with the final component... */</div><div class='del'>-#define LOOKUP_OPEN		0x0100	/* ... in open */</div><div class='del'>-#define LOOKUP_CREATE		0x0200	/* ... in object creation */</div><div class='del'>-#define LOOKUP_EXCL		0x0400	/* ... in exclusive creation */</div><div class='del'>-#define LOOKUP_RENAME_TARGET	0x0800	/* ... in destination of rename() */</div><div class='add'>+#define LOOKUP_OPEN		BIT(16)	/* ... in open */</div><div class='add'>+#define LOOKUP_CREATE		BIT(17)	/* ... in object creation */</div><div class='add'>+#define LOOKUP_EXCL		BIT(18)	/* ... in target must not exist */</div><div class='add'>+#define LOOKUP_RENAME_TARGET	BIT(19)	/* ... in destination of rename() */</div><div class='ctx'> </div><div class='del'>-/* internal use only */</div><div class='del'>-#define LOOKUP_PARENT		0x0010</div><div class='add'>+/* 4 spare bits for intent */</div><div class='ctx'> </div><div class='ctx'> /* Scoping flags for lookup. */</div><div class='del'>-#define LOOKUP_NO_SYMLINKS	0x010000 /* No symlink crossing. */</div><div class='del'>-#define LOOKUP_NO_MAGICLINKS	0x020000 /* No nd_jump_link() crossing. */</div><div class='del'>-#define LOOKUP_NO_XDEV		0x040000 /* No mountpoint crossing. */</div><div class='del'>-#define LOOKUP_BENEATH		0x080000 /* No escaping from starting point. */</div><div class='del'>-#define LOOKUP_IN_ROOT		0x100000 /* Treat dirfd as fs root. */</div><div class='del'>-#define LOOKUP_CACHED		0x200000 /* Only do cached lookup */</div><div class='add'>+#define LOOKUP_NO_SYMLINKS	BIT(24) /* No symlink crossing. */</div><div class='add'>+#define LOOKUP_NO_MAGICLINKS	BIT(25) /* No nd_jump_link() crossing. */</div><div class='add'>+#define LOOKUP_NO_XDEV		BIT(26) /* No mountpoint crossing. */</div><div class='add'>+#define LOOKUP_BENEATH		BIT(27) /* No escaping from starting point. */</div><div class='add'>+#define LOOKUP_IN_ROOT		BIT(28) /* Treat dirfd as fs root. */</div><div class='ctx'> /* LOOKUP_* flags which do scope-related checks based on the dirfd. */</div><div class='ctx'> #define LOOKUP_IS_SCOPED (LOOKUP_BENEATH | LOOKUP_IN_ROOT)</div><div class='add'>+/* 3 spare bits for scoping */</div><div class='ctx'> </div><div class='ctx'> extern int path_pts(struct path *path);</div><div class='ctx'> </div><div class='del'>-extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);</div><div class='del'>-</div><div class='del'>-static inline int user_path_at(int dfd, const char __user *name, unsigned flags,</div><div class='del'>-		 struct path *path)</div><div class='del'>-{</div><div class='del'>-	return user_path_at_empty(dfd, name, flags, path, NULL);</div><div class='del'>-}</div><div class='add'>+extern int user_path_at(int, const char __user *, unsigned, struct path *);</div><div class='ctx'> </div><div class='ctx'> struct dentry *lookup_one_qstr_excl(const struct qstr *name,</div><div class='ctx'> 				    struct dentry *base,</div><div class='ctx'> 				    unsigned int flags);</div><div class='ctx'> extern int kern_path(const char *, unsigned, struct path *);</div><div class='del'>-</div><div class='del'>-extern struct dentry *kern_path_create(int, const char *, struct path *, unsigned int);</div><div class='del'>-extern struct dentry *user_path_create(int, const char __user *, struct path *, unsigned int);</div><div class='del'>-extern void done_path_create(struct path *, struct dentry *);</div><div class='del'>-extern struct dentry *kern_path_locked(const char *, struct path *);</div><div class='del'>-extern struct dentry *user_path_locked_at(int , const char __user *, struct path *);</div><div class='add'>+struct dentry *kern_path_parent(const char *name, struct path *parent);</div><div class='add'>+</div><div class='add'>+extern struct dentry *start_creating_path(int, const char *, struct path *, unsigned int);</div><div class='add'>+extern struct dentry *start_creating_user_path(int, const char __user *, struct path *, unsigned int);</div><div class='add'>+extern void end_creating_path(const struct path *, struct dentry *);</div><div class='add'>+extern struct dentry *start_removing_path(const char *, struct path *);</div><div class='add'>+extern struct dentry *start_removing_user_path_at(int , const char __user *, struct path *);</div><div class='add'>+static inline void end_removing_path(const struct path *path , struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	end_creating_path(path, dentry);</div><div class='add'>+}</div><div class='ctx'> int vfs_path_parent_lookup(struct filename *filename, unsigned int flags,</div><div class='ctx'> 			   struct path *parent, struct qstr *last, int *type,</div><div class='ctx'> 			   const struct path *root);</div><div class='ctx'> int vfs_path_lookup(struct dentry *, struct vfsmount *, const char *,</div><div class='ctx'> 		    unsigned int, struct path *);</div><div class='ctx'> </div><div class='del'>-extern struct dentry *try_lookup_one_len(const char *, struct dentry *, int);</div><div class='del'>-extern struct dentry *lookup_one_len(const char *, struct dentry *, int);</div><div class='del'>-extern struct dentry *lookup_one_len_unlocked(const char *, struct dentry *, int);</div><div class='del'>-extern struct dentry *lookup_positive_unlocked(const char *, struct dentry *, int);</div><div class='del'>-struct dentry *lookup_one(struct mnt_idmap *, const char *, struct dentry *, int);</div><div class='add'>+extern struct dentry *try_lookup_noperm(struct qstr *, struct dentry *);</div><div class='add'>+extern struct dentry *lookup_noperm(struct qstr *, struct dentry *);</div><div class='add'>+extern struct dentry *lookup_noperm_unlocked(struct qstr *, struct dentry *);</div><div class='add'>+extern struct dentry *lookup_noperm_positive_unlocked(struct qstr *, struct dentry *);</div><div class='add'>+struct dentry *lookup_one(struct mnt_idmap *, struct qstr *, struct dentry *);</div><div class='ctx'> struct dentry *lookup_one_unlocked(struct mnt_idmap *idmap,</div><div class='del'>-				   const char *name, struct dentry *base,</div><div class='del'>-				   int len);</div><div class='add'>+				   struct qstr *name, struct dentry *base);</div><div class='ctx'> struct dentry *lookup_one_positive_unlocked(struct mnt_idmap *idmap,</div><div class='del'>-					    const char *name,</div><div class='del'>-					    struct dentry *base, int len);</div><div class='add'>+					    struct qstr *name,</div><div class='add'>+					    struct dentry *base);</div><div class='add'>+struct dentry *lookup_one_positive_killable(struct mnt_idmap *idmap,</div><div class='add'>+					    struct qstr *name,</div><div class='add'>+					    struct dentry *base);</div><div class='add'>+</div><div class='add'>+struct dentry *start_creating(struct mnt_idmap *idmap, struct dentry *parent,</div><div class='add'>+			      struct qstr *name);</div><div class='add'>+struct dentry *start_removing(struct mnt_idmap *idmap, struct dentry *parent,</div><div class='add'>+			      struct qstr *name);</div><div class='add'>+struct dentry *start_creating_killable(struct mnt_idmap *idmap,</div><div class='add'>+				       struct dentry *parent,</div><div class='add'>+				       struct qstr *name);</div><div class='add'>+struct dentry *start_removing_killable(struct mnt_idmap *idmap,</div><div class='add'>+				       struct dentry *parent,</div><div class='add'>+				       struct qstr *name);</div><div class='add'>+struct dentry *start_creating_noperm(struct dentry *parent, struct qstr *name);</div><div class='add'>+struct dentry *start_removing_noperm(struct dentry *parent, struct qstr *name);</div><div class='add'>+struct dentry *start_creating_dentry(struct dentry *parent,</div><div class='add'>+				     struct dentry *child);</div><div class='add'>+struct dentry *start_removing_dentry(struct dentry *parent,</div><div class='add'>+				     struct dentry *child);</div><div class='add'>+</div><div class='add'>+/* end_creating - finish action started with start_creating</div><div class='add'>+ * @child: dentry returned by start_creating() or vfs_mkdir()</div><div class='add'>+ *</div><div class='add'>+ * Unlock and release the child. This can be called after</div><div class='add'>+ * start_creating() whether that function succeeded or not,</div><div class='add'>+ * but it is not needed on failure.</div><div class='add'>+ *</div><div class='add'>+ * If vfs_mkdir() was called then the value returned from that function</div><div class='add'>+ * should be given for @child rather than the original dentry, as vfs_mkdir()</div><div class='add'>+ * may have provided a new dentry.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * If vfs_mkdir() was not called, then @child will be a valid dentry and</div><div class='add'>+ * @parent will be ignored.</div><div class='add'>+ */</div><div class='add'>+static inline void end_creating(struct dentry *child)</div><div class='add'>+{</div><div class='add'>+	end_dirop(child);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* end_creating_keep - finish action started with start_creating() and return result</div><div class='add'>+ * @child: dentry returned by start_creating() or vfs_mkdir()</div><div class='add'>+ *</div><div class='add'>+ * Unlock and return the child. This can be called after</div><div class='add'>+ * start_creating() whether that function succeeded or not,</div><div class='add'>+ * but it is not needed on failure.</div><div class='add'>+ *</div><div class='add'>+ * If vfs_mkdir() was called then the value returned from that function</div><div class='add'>+ * should be given for @child rather than the original dentry, as vfs_mkdir()</div><div class='add'>+ * may have provided a new dentry.</div><div class='add'>+ *</div><div class='add'>+ * Returns: @child, which may be a dentry or an error.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static inline struct dentry *end_creating_keep(struct dentry *child)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ERR(child))</div><div class='add'>+		dget(child);</div><div class='add'>+	end_dirop(child);</div><div class='add'>+	return child;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * end_removing - finish action started with start_removing</div><div class='add'>+ * @child:  dentry returned by start_removing()</div><div class='add'>+ * @parent: dentry given to start_removing()</div><div class='add'>+ *</div><div class='add'>+ * Unlock and release the child.</div><div class='add'>+ *</div><div class='add'>+ * This is identical to end_dirop().  It can be passed the result of</div><div class='add'>+ * start_removing() whether that was successful or not, but it not needed</div><div class='add'>+ * if start_removing() failed.</div><div class='add'>+ */</div><div class='add'>+static inline void end_removing(struct dentry *child)</div><div class='add'>+{</div><div class='add'>+	end_dirop(child);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> extern int follow_down_one(struct path *);</div><div class='ctx'> extern int follow_down(struct path *path, unsigned int flags);</div><div class='hunk'>@@ -92,6 +171,13 @@ extern int follow_up(struct path *);</div><div class='ctx'> extern struct dentry *lock_rename(struct dentry *, struct dentry *);</div><div class='ctx'> extern struct dentry *lock_rename_child(struct dentry *, struct dentry *);</div><div class='ctx'> extern void unlock_rename(struct dentry *, struct dentry *);</div><div class='add'>+int start_renaming(struct renamedata *rd, int lookup_flags,</div><div class='add'>+		   struct qstr *old_last, struct qstr *new_last);</div><div class='add'>+int start_renaming_dentry(struct renamedata *rd, int lookup_flags,</div><div class='add'>+			  struct dentry *old_dentry, struct qstr *new_last);</div><div class='add'>+int start_renaming_two_dentries(struct renamedata *rd,</div><div class='add'>+				struct dentry *old_dentry, struct dentry *new_dentry);</div><div class='add'>+void end_renaming(struct renamedata *rd);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * mode_strip_umask - handle vfs umask stripping</div><div class='head'>diff --git a/include/linux/nd.h b/include/linux/nd.h<br/>index b9771ba1ef87..fa099e295f78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nd.h</a></div><div class='hunk'>@@ -84,11 +84,7 @@ struct nd_device_driver {</div><div class='ctx'> 	void (*notify)(struct device *dev, enum nvdimm_event event);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct nd_device_driver *to_nd_device_driver(</div><div class='del'>-		struct device_driver *drv)</div><div class='del'>-{</div><div class='del'>-	return container_of(drv, struct nd_device_driver, drv);</div><div class='del'>-};</div><div class='add'>+#define to_nd_device_driver(__drv)	container_of_const(__drv, struct nd_device_driver, drv)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct nd_namespace_common - core infrastructure of a namespace</div><div class='head'>diff --git a/include/linux/net.h b/include/linux/net.h<br/>index 15df6d5f27a7..f58b38ab37f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/net.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net.h</a></div><div class='hunk'>@@ -36,14 +36,13 @@ struct net;</div><div class='ctx'>  * in sock-&gt;flags, but moved into sk-&gt;sk_wq-&gt;flags to be RCU protected.</div><div class='ctx'>  * Eventually all flags will be in sk-&gt;sk_wq-&gt;flags.</div><div class='ctx'>  */</div><div class='del'>-#define SOCKWQ_ASYNC_NOSPACE	0</div><div class='del'>-#define SOCKWQ_ASYNC_WAITDATA	1</div><div class='del'>-#define SOCK_NOSPACE		2</div><div class='del'>-#define SOCK_PASSCRED		3</div><div class='del'>-#define SOCK_PASSSEC		4</div><div class='del'>-#define SOCK_SUPPORT_ZC		5</div><div class='del'>-#define SOCK_CUSTOM_SOCKOPT	6</div><div class='del'>-#define SOCK_PASSPIDFD		7</div><div class='add'>+enum socket_flags {</div><div class='add'>+	SOCKWQ_ASYNC_NOSPACE,</div><div class='add'>+	SOCKWQ_ASYNC_WAITDATA,</div><div class='add'>+	SOCK_NOSPACE,</div><div class='add'>+	SOCK_SUPPORT_ZC,</div><div class='add'>+	SOCK_CUSTOM_SOCKOPT,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #ifndef ARCH_HAS_SOCKET_TYPES</div><div class='ctx'> /**</div><div class='hunk'>@@ -70,6 +69,7 @@ enum sock_type {</div><div class='ctx'> 	SOCK_DCCP	= 6,</div><div class='ctx'> 	SOCK_PACKET	= 10,</div><div class='ctx'> };</div><div class='add'>+#endif /* ARCH_HAS_SOCKET_TYPES */</div><div class='ctx'> </div><div class='ctx'> #define SOCK_MAX (SOCK_PACKET + 1)</div><div class='ctx'> /* Mask which covers at least up to SOCK_MASK-1.  The</div><div class='hunk'>@@ -81,8 +81,7 @@ enum sock_type {</div><div class='ctx'> #ifndef SOCK_NONBLOCK</div><div class='ctx'> #define SOCK_NONBLOCK	O_NONBLOCK</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#endif /* ARCH_HAS_SOCKET_TYPES */</div><div class='add'>+#define SOCK_COREDUMP	O_NOCTTY</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum sock_shutdown_cmd - Shutdown types</div><div class='hunk'>@@ -149,10 +148,10 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> struct vm_area_struct;</div><div class='ctx'> struct page;</div><div class='del'>-struct sockaddr;</div><div class='ctx'> struct msghdr;</div><div class='ctx'> struct module;</div><div class='ctx'> struct sk_buff;</div><div class='add'>+struct proto_accept_arg;</div><div class='ctx'> typedef int (*sk_read_actor_t)(read_descriptor_t *, struct sk_buff *,</div><div class='ctx'> 			       unsigned int, size_t);</div><div class='ctx'> typedef int (*skb_read_actor_t)(struct sock *, struct sk_buff *);</div><div class='hunk'>@@ -163,15 +162,16 @@ struct proto_ops {</div><div class='ctx'> 	struct module	*owner;</div><div class='ctx'> 	int		(*release)   (struct socket *sock);</div><div class='ctx'> 	int		(*bind)	     (struct socket *sock,</div><div class='del'>-				      struct sockaddr *myaddr,</div><div class='add'>+				      struct sockaddr_unsized *myaddr,</div><div class='ctx'> 				      int sockaddr_len);</div><div class='ctx'> 	int		(*connect)   (struct socket *sock,</div><div class='del'>-				      struct sockaddr *vaddr,</div><div class='add'>+				      struct sockaddr_unsized *vaddr,</div><div class='ctx'> 				      int sockaddr_len, int flags);</div><div class='ctx'> 	int		(*socketpair)(struct socket *sock1,</div><div class='ctx'> 				      struct socket *sock2);</div><div class='ctx'> 	int		(*accept)    (struct socket *sock,</div><div class='del'>-				      struct socket *newsock, int flags, bool kern);</div><div class='add'>+				      struct socket *newsock,</div><div class='add'>+				      struct proto_accept_arg *arg);</div><div class='ctx'> 	int		(*getname)   (struct socket *sock,</div><div class='ctx'> 				      struct sockaddr *addr,</div><div class='ctx'> 				      int peer);</div><div class='hunk'>@@ -320,17 +320,34 @@ static inline bool sendpage_ok(struct page *page)</div><div class='ctx'> 	return !PageSlab(page) &amp;&amp; page_count(page) &gt;= 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Check sendpage_ok on contiguous pages.</div><div class='add'>+ */</div><div class='add'>+static inline bool sendpages_ok(struct page *page, size_t len, size_t offset)</div><div class='add'>+{</div><div class='add'>+	struct page *p = page + (offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	size_t count = 0;</div><div class='add'>+</div><div class='add'>+	while (count &lt; len) {</div><div class='add'>+		if (!sendpage_ok(p))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		p++;</div><div class='add'>+		count += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int kernel_sendmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,</div><div class='ctx'> 		   size_t num, size_t len);</div><div class='del'>-int kernel_sendmsg_locked(struct sock *sk, struct msghdr *msg,</div><div class='del'>-			  struct kvec *vec, size_t num, size_t len);</div><div class='ctx'> int kernel_recvmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,</div><div class='ctx'> 		   size_t num, size_t len, int flags);</div><div class='ctx'> </div><div class='del'>-int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen);</div><div class='add'>+int kernel_bind(struct socket *sock, struct sockaddr_unsized *addr, int addrlen);</div><div class='ctx'> int kernel_listen(struct socket *sock, int backlog);</div><div class='ctx'> int kernel_accept(struct socket *sock, struct socket **newsock, int flags);</div><div class='del'>-int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen,</div><div class='add'>+int kernel_connect(struct socket *sock, struct sockaddr_unsized *addr, int addrlen,</div><div class='ctx'> 		   int flags);</div><div class='ctx'> int kernel_getsockname(struct socket *sock, struct sockaddr *addr);</div><div class='ctx'> int kernel_getpeername(struct socket *sock, struct sockaddr *addr);</div><div class='head'>diff --git a/include/linux/net/intel/iidc.h b/include/linux/net/intel/iidc.h<br/>deleted file mode 100644<br/>index 1c1332e4df26..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/net/intel/iidc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net/intel/iidc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/* Copyright (C) 2021, Intel Corporation. */</div><div class='del'>-</div><div class='del'>-#ifndef _IIDC_H_</div><div class='del'>-#define _IIDC_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/auxiliary_bus.h&gt;</div><div class='del'>-#include &lt;linux/dcbnl.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-</div><div class='del'>-enum iidc_event_type {</div><div class='del'>-	IIDC_EVENT_BEFORE_MTU_CHANGE,</div><div class='del'>-	IIDC_EVENT_AFTER_MTU_CHANGE,</div><div class='del'>-	IIDC_EVENT_BEFORE_TC_CHANGE,</div><div class='del'>-	IIDC_EVENT_AFTER_TC_CHANGE,</div><div class='del'>-	IIDC_EVENT_CRIT_ERR,</div><div class='del'>-	IIDC_EVENT_NBITS		/* must be last */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iidc_reset_type {</div><div class='del'>-	IIDC_PFR,</div><div class='del'>-	IIDC_CORER,</div><div class='del'>-	IIDC_GLOBR,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iidc_rdma_protocol {</div><div class='del'>-	IIDC_RDMA_PROTOCOL_IWARP = BIT(0),</div><div class='del'>-	IIDC_RDMA_PROTOCOL_ROCEV2 = BIT(1),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IIDC_MAX_USER_PRIORITY		8</div><div class='del'>-#define IIDC_MAX_DSCP_MAPPING		64</div><div class='del'>-#define IIDC_DSCP_PFC_MODE		0x1</div><div class='del'>-</div><div class='del'>-/* Struct to hold per RDMA Qset info */</div><div class='del'>-struct iidc_rdma_qset_params {</div><div class='del'>-	/* Qset TEID returned to the RDMA driver in</div><div class='del'>-	 * ice_add_rdma_qset and used by RDMA driver</div><div class='del'>-	 * for calls to ice_del_rdma_qset</div><div class='del'>-	 */</div><div class='del'>-	u32 teid;	/* Qset TEID */</div><div class='del'>-	u16 qs_handle; /* RDMA driver provides this */</div><div class='del'>-	u16 vport_id; /* VSI index */</div><div class='del'>-	u8 tc; /* TC branch the Qset should belong to */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iidc_qos_info {</div><div class='del'>-	u64 tc_ctx;</div><div class='del'>-	u8 rel_bw;</div><div class='del'>-	u8 prio_type;</div><div class='del'>-	u8 egress_virt_up;</div><div class='del'>-	u8 ingress_virt_up;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Struct to pass QoS info */</div><div class='del'>-struct iidc_qos_params {</div><div class='del'>-	struct iidc_qos_info tc_info[IEEE_8021QAZ_MAX_TCS];</div><div class='del'>-	u8 up2tc[IIDC_MAX_USER_PRIORITY];</div><div class='del'>-	u8 vport_relative_bw;</div><div class='del'>-	u8 vport_priority_type;</div><div class='del'>-	u8 num_tc;</div><div class='del'>-	u8 pfc_mode;</div><div class='del'>-	u8 dscp_map[IIDC_MAX_DSCP_MAPPING];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iidc_event {</div><div class='del'>-	DECLARE_BITMAP(type, IIDC_EVENT_NBITS);</div><div class='del'>-	u32 reg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ice_pf;</div><div class='del'>-</div><div class='del'>-int ice_add_rdma_qset(struct ice_pf *pf, struct iidc_rdma_qset_params *qset);</div><div class='del'>-int ice_del_rdma_qset(struct ice_pf *pf, struct iidc_rdma_qset_params *qset);</div><div class='del'>-int ice_rdma_request_reset(struct ice_pf *pf, enum iidc_reset_type reset_type);</div><div class='del'>-int ice_rdma_update_vsi_filter(struct ice_pf *pf, u16 vsi_id, bool enable);</div><div class='del'>-void ice_get_qos_params(struct ice_pf *pf, struct iidc_qos_params *qos);</div><div class='del'>-</div><div class='del'>-/* Structure representing auxiliary driver tailored information about the core</div><div class='del'>- * PCI dev, each auxiliary driver using the IIDC interface will have an</div><div class='del'>- * instance of this struct dedicated to it.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct iidc_auxiliary_dev {</div><div class='del'>-	struct auxiliary_device adev;</div><div class='del'>-	struct ice_pf *pf;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* structure representing the auxiliary driver. This struct is to be</div><div class='del'>- * allocated and populated by the auxiliary driver's owner. The core PCI</div><div class='del'>- * driver will access these ops by performing a container_of on the</div><div class='del'>- * auxiliary_device-&gt;dev.driver.</div><div class='del'>- */</div><div class='del'>-struct iidc_auxiliary_drv {</div><div class='del'>-	struct auxiliary_driver adrv;</div><div class='del'>-	/* This event_handler is meant to be a blocking call.  For instance,</div><div class='del'>-	 * when a BEFORE_MTU_CHANGE event comes in, the event_handler will not</div><div class='del'>-	 * return until the auxiliary driver is ready for the MTU change to</div><div class='del'>-	 * happen.</div><div class='del'>-	 */</div><div class='del'>-	void (*event_handler)(struct ice_pf *pf, struct iidc_event *event);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _IIDC_H_*/</div><div class='head'>diff --git a/include/linux/net/intel/iidc_rdma.h b/include/linux/net/intel/iidc_rdma.h<br/>new file mode 100644<br/>index 000000000000..8baad1082042<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net/intel/iidc_rdma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net/intel/iidc_rdma.h</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) 2021-2025, Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#ifndef _IIDC_RDMA_H_</div><div class='add'>+#define _IIDC_RDMA_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/dscp.h&gt;</div><div class='add'>+</div><div class='add'>+enum iidc_rdma_event_type {</div><div class='add'>+	IIDC_RDMA_EVENT_BEFORE_MTU_CHANGE,</div><div class='add'>+	IIDC_RDMA_EVENT_AFTER_MTU_CHANGE,</div><div class='add'>+	IIDC_RDMA_EVENT_BEFORE_TC_CHANGE,</div><div class='add'>+	IIDC_RDMA_EVENT_AFTER_TC_CHANGE,</div><div class='add'>+	IIDC_RDMA_EVENT_WARN_RESET,</div><div class='add'>+	IIDC_RDMA_EVENT_CRIT_ERR,</div><div class='add'>+	IIDC_RDMA_EVENT_NBITS		/* must be last */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iidc_rdma_event {</div><div class='add'>+	DECLARE_BITMAP(type, IIDC_RDMA_EVENT_NBITS);</div><div class='add'>+	u32 reg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iidc_rdma_reset_type {</div><div class='add'>+	IIDC_FUNC_RESET,</div><div class='add'>+	IIDC_DEV_RESET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iidc_rdma_protocol {</div><div class='add'>+	IIDC_RDMA_PROTOCOL_IWARP = BIT(0),</div><div class='add'>+	IIDC_RDMA_PROTOCOL_ROCEV2 = BIT(1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Structure to be populated by core LAN PCI driver */</div><div class='add'>+struct iidc_rdma_core_dev_info {</div><div class='add'>+	struct pci_dev *pdev; /* PCI device of corresponding to main function */</div><div class='add'>+	struct auxiliary_device *adev;</div><div class='add'>+	/* Current active RDMA protocol */</div><div class='add'>+	enum iidc_rdma_protocol rdma_protocol;</div><div class='add'>+	void *iidc_priv; /* elements unique to each driver */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Structure representing auxiliary driver tailored information about the core</div><div class='add'>+ * PCI dev, each auxiliary driver using the IIDC interface will have an</div><div class='add'>+ * instance of this struct dedicated to it.</div><div class='add'>+ */</div><div class='add'>+struct iidc_rdma_core_auxiliary_dev {</div><div class='add'>+	struct auxiliary_device adev;</div><div class='add'>+	struct iidc_rdma_core_dev_info *cdev_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* structure representing the auxiliary driver. This struct is to be</div><div class='add'>+ * allocated and populated by the auxiliary driver's owner. The core PCI</div><div class='add'>+ * driver will access these ops by performing a container_of on the</div><div class='add'>+ * auxiliary_device-&gt;dev.driver.</div><div class='add'>+ */</div><div class='add'>+struct iidc_rdma_core_auxiliary_drv {</div><div class='add'>+	struct auxiliary_driver adrv;</div><div class='add'>+	void (*event_handler)(struct iidc_rdma_core_dev_info *cdev,</div><div class='add'>+			      struct iidc_rdma_event *event);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _IIDC_RDMA_H_*/</div><div class='head'>diff --git a/include/linux/net/intel/iidc_rdma_ice.h b/include/linux/net/intel/iidc_rdma_ice.h<br/>new file mode 100644<br/>index 000000000000..b40eed0e13fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net/intel/iidc_rdma_ice.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net/intel/iidc_rdma_ice.h</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) 2021-2025, Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#ifndef _IIDC_RDMA_ICE_H_</div><div class='add'>+#define _IIDC_RDMA_ICE_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dcbnl.h&gt;</div><div class='add'>+</div><div class='add'>+#define IIDC_MAX_USER_PRIORITY         8</div><div class='add'>+#define IIDC_DSCP_PFC_MODE             0x1</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iidc_rdma_qset_params - Struct to hold per RDMA Qset info</div><div class='add'>+ * @teid: TEID of the Qset node</div><div class='add'>+ * @qs_handle: SW index of the Qset, RDMA provides this</div><div class='add'>+ * @vport_id: VSI index</div><div class='add'>+ * @tc: Traffic Class branch the QSet should belong to</div><div class='add'>+ */</div><div class='add'>+struct iidc_rdma_qset_params {</div><div class='add'>+	/* Qset TEID returned to the RDMA driver in</div><div class='add'>+	 * ice_add_rdma_qset and used by RDMA driver</div><div class='add'>+	 * for calls to ice_del_rdma_qset</div><div class='add'>+	 */</div><div class='add'>+	u32 teid;</div><div class='add'>+	u16 qs_handle;</div><div class='add'>+	u16 vport_id;</div><div class='add'>+	u8 tc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iidc_rdma_qos_info {</div><div class='add'>+	u64 tc_ctx;</div><div class='add'>+	u8 rel_bw;</div><div class='add'>+	u8 prio_type;</div><div class='add'>+	u8 egress_virt_up;</div><div class='add'>+	u8 ingress_virt_up;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Struct to pass QoS info */</div><div class='add'>+struct iidc_rdma_qos_params {</div><div class='add'>+	struct iidc_rdma_qos_info tc_info[IEEE_8021QAZ_MAX_TCS];</div><div class='add'>+	u8 up2tc[IIDC_MAX_USER_PRIORITY];</div><div class='add'>+	u8 vport_relative_bw;</div><div class='add'>+	u8 vport_priority_type;</div><div class='add'>+	u8 num_tc;</div><div class='add'>+	u8 pfc_mode;</div><div class='add'>+	u8 dscp_map[DSCP_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iidc_rdma_priv_dev_info {</div><div class='add'>+	u8 pf_id;</div><div class='add'>+	u16 vport_id;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct iidc_rdma_qos_params qos_info;</div><div class='add'>+	u8 __iomem *hw_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ice_add_rdma_qset(struct iidc_rdma_core_dev_info *cdev,</div><div class='add'>+		      struct iidc_rdma_qset_params *qset);</div><div class='add'>+int ice_del_rdma_qset(struct iidc_rdma_core_dev_info *cdev,</div><div class='add'>+		      struct iidc_rdma_qset_params *qset);</div><div class='add'>+int ice_rdma_request_reset(struct iidc_rdma_core_dev_info *cdev,</div><div class='add'>+			   enum iidc_rdma_reset_type reset_type);</div><div class='add'>+int ice_rdma_update_vsi_filter(struct iidc_rdma_core_dev_info *cdev, u16 vsi_id,</div><div class='add'>+			       bool enable);</div><div class='add'>+int ice_alloc_rdma_qvector(struct iidc_rdma_core_dev_info *cdev,</div><div class='add'>+			   struct msix_entry *entry);</div><div class='add'>+void ice_free_rdma_qvector(struct iidc_rdma_core_dev_info *cdev,</div><div class='add'>+			   struct msix_entry *entry);</div><div class='add'>+</div><div class='add'>+#endif /* _IIDC_RDMA_ICE_H_*/</div><div class='head'>diff --git a/include/linux/net/intel/iidc_rdma_idpf.h b/include/linux/net/intel/iidc_rdma_idpf.h<br/>new file mode 100644<br/>index 000000000000..bab697e18fd6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net/intel/iidc_rdma_idpf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net/intel/iidc_rdma_idpf.h</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) 2025 Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#ifndef _IIDC_RDMA_IDPF_H_</div><div class='add'>+#define _IIDC_RDMA_IDPF_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+</div><div class='add'>+/* struct to be populated by core LAN PCI driver */</div><div class='add'>+struct iidc_rdma_vport_dev_info {</div><div class='add'>+	struct auxiliary_device *adev;</div><div class='add'>+	struct auxiliary_device *core_adev;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	u16 vport_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iidc_rdma_vport_auxiliary_dev {</div><div class='add'>+	struct auxiliary_device adev;</div><div class='add'>+	struct iidc_rdma_vport_dev_info *vdev_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iidc_rdma_vport_auxiliary_drv {</div><div class='add'>+	struct auxiliary_driver adrv;</div><div class='add'>+	void (*event_handler)(struct iidc_rdma_vport_dev_info *vdev,</div><div class='add'>+			      struct iidc_rdma_event *event);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* struct to be populated by core LAN PCI driver */</div><div class='add'>+enum iidc_function_type {</div><div class='add'>+	IIDC_FUNCTION_TYPE_PF,</div><div class='add'>+	IIDC_FUNCTION_TYPE_VF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iidc_rdma_lan_mapped_mem_region {</div><div class='add'>+	u8 __iomem *region_addr;</div><div class='add'>+	__le64 size;</div><div class='add'>+	__le64 start_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iidc_rdma_priv_dev_info {</div><div class='add'>+	struct msix_entry *msix_entries;</div><div class='add'>+	u16 msix_count; /* How many vectors are reserved for this device */</div><div class='add'>+	enum iidc_function_type ftype;</div><div class='add'>+	__le16 num_memory_regions;</div><div class='add'>+	struct iidc_rdma_lan_mapped_mem_region *mapped_mem_regions;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int idpf_idc_vport_dev_ctrl(struct iidc_rdma_core_dev_info *cdev_info, bool up);</div><div class='add'>+int idpf_idc_request_reset(struct iidc_rdma_core_dev_info *cdev_info,</div><div class='add'>+			   enum iidc_rdma_reset_type __always_unused reset_type);</div><div class='add'>+int idpf_idc_rdma_vc_send_sync(struct iidc_rdma_core_dev_info *cdev_info,</div><div class='add'>+			       u8 *send_msg, u16 msg_size,</div><div class='add'>+			       u8 *recv_msg, u16 *recv_len);</div><div class='add'>+</div><div class='add'>+#endif /* _IIDC_RDMA_IDPF_H_ */</div><div class='head'>diff --git a/include/linux/net/intel/libie/adminq.h b/include/linux/net/intel/libie/adminq.h<br/>new file mode 100644<br/>index 000000000000..ab13bd777a28<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net/intel/libie/adminq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net/intel/libie/adminq.h</a></div><div class='hunk'>@@ -0,0 +1,399 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2025 Intel Corporation */</div><div class='add'>+</div><div class='add'>+#ifndef __LIBIE_ADMINQ_H</div><div class='add'>+#define __LIBIE_ADMINQ_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define LIBIE_CHECK_STRUCT_LEN(n, X)	\</div><div class='add'>+	static_assert((n) == sizeof(struct X))</div><div class='add'>+#define LIBIE_AQ_MAX_BUF_LEN 4096</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct libie_aqc_generic - Generic structure used in adminq communication</div><div class='add'>+ * @param0: generic parameter high 32bit</div><div class='add'>+ * @param1: generic parameter lower 32bit</div><div class='add'>+ * @addr_high: generic address high 32bit</div><div class='add'>+ * @addr_low: generic address lower 32bit</div><div class='add'>+ */</div><div class='add'>+struct libie_aqc_generic {</div><div class='add'>+	__le32 param0;</div><div class='add'>+	__le32 param1;</div><div class='add'>+	__le32 addr_high;</div><div class='add'>+	__le32 addr_low;</div><div class='add'>+};</div><div class='add'>+LIBIE_CHECK_STRUCT_LEN(16, libie_aqc_generic);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct libie_aqc_get_ver -  Used in command get version (direct 0x0001)</div><div class='add'>+ * @rom_ver: rom version</div><div class='add'>+ * @fw_build: number coressponding to firmware build</div><div class='add'>+ * @fw_branch: branch identifier of firmware version</div><div class='add'>+ * @fw_major: major number of firmware version</div><div class='add'>+ * @fw_minor: minor number of firmware version</div><div class='add'>+ * @fw_patch: patch of firmware version</div><div class='add'>+ * @api_branch: brancch identifier of API version</div><div class='add'>+ * @api_major: major number of API version</div><div class='add'>+ * @api_minor: minor number of API version</div><div class='add'>+ * @api_patch: patch of API version</div><div class='add'>+ */</div><div class='add'>+struct libie_aqc_get_ver {</div><div class='add'>+	__le32	rom_ver;</div><div class='add'>+	__le32	fw_build;</div><div class='add'>+	u8	fw_branch;</div><div class='add'>+	u8	fw_major;</div><div class='add'>+	u8	fw_minor;</div><div class='add'>+	u8	fw_patch;</div><div class='add'>+	u8	api_branch;</div><div class='add'>+	u8	api_major;</div><div class='add'>+	u8	api_minor;</div><div class='add'>+	u8	api_patch;</div><div class='add'>+};</div><div class='add'>+LIBIE_CHECK_STRUCT_LEN(16, libie_aqc_get_ver);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct libie_aqc_driver_ver - Used in command send driver version</div><div class='add'>+ *				 (indirect 0x0002)</div><div class='add'>+ * @major_ver: driver major version</div><div class='add'>+ * @minor_ver: driver minor version</div><div class='add'>+ * @build_ver: driver build version</div><div class='add'>+ * @subbuild_ver: driver subbuild version</div><div class='add'>+ * @reserved: for feature use</div><div class='add'>+ * @addr_high: high part of response address buff</div><div class='add'>+ * @addr_low: low part of response address buff</div><div class='add'>+ */</div><div class='add'>+struct libie_aqc_driver_ver {</div><div class='add'>+	u8	major_ver;</div><div class='add'>+	u8	minor_ver;</div><div class='add'>+	u8	build_ver;</div><div class='add'>+	u8	subbuild_ver;</div><div class='add'>+	u8	reserved[4];</div><div class='add'>+	__le32	addr_high;</div><div class='add'>+	__le32	addr_low;</div><div class='add'>+};</div><div class='add'>+LIBIE_CHECK_STRUCT_LEN(16, libie_aqc_driver_ver);</div><div class='add'>+</div><div class='add'>+enum libie_aq_res_id {</div><div class='add'>+	LIBIE_AQC_RES_ID_NVM				= 1,</div><div class='add'>+	LIBIE_AQC_RES_ID_SDP				= 2,</div><div class='add'>+	LIBIE_AQC_RES_ID_CHNG_LOCK			= 3,</div><div class='add'>+	LIBIE_AQC_RES_ID_GLBL_LOCK			= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum libie_aq_res_access_type {</div><div class='add'>+	LIBIE_AQC_RES_ACCESS_READ			= 1,</div><div class='add'>+	LIBIE_AQC_RES_ACCESS_WRITE			= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LIBIE_AQ_RES_NVM_READ_DFLT_TIMEOUT_MS		3000</div><div class='add'>+#define LIBIE_AQ_RES_NVM_WRITE_DFLT_TIMEOUT_MS		180000</div><div class='add'>+#define LIBIE_AQ_RES_CHNG_LOCK_DFLT_TIMEOUT_MS		1000</div><div class='add'>+#define LIBIE_AQ_RES_GLBL_LOCK_DFLT_TIMEOUT_MS		3000</div><div class='add'>+</div><div class='add'>+#define LIBIE_AQ_RES_GLBL_SUCCESS			0</div><div class='add'>+#define LIBIE_AQ_RES_GLBL_IN_PROG			1</div><div class='add'>+#define LIBIE_AQ_RES_GLBL_DONE				2</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct libie_aqc_req_res - Request resource ownership</div><div class='add'>+ * @res_id: resource ID (look at enum definition above)</div><div class='add'>+ * @access_type: read or write (enum definition above)</div><div class='add'>+ * @timeout: Upon successful completion, FW writes this value and driver is</div><div class='add'>+ * expected to release resource before timeout. This value is provided in</div><div class='add'>+ * milliseconds.</div><div class='add'>+ * @res_number: for SDP, this is the pin ID of the SDP</div><div class='add'>+ * @status: status only used for LIBIE_AQC_RES_ID_GLBL_LOCK, for others reserved</div><div class='add'>+ * @reserved: reserved for future use</div><div class='add'>+ *</div><div class='add'>+ * Used in commands:</div><div class='add'>+ * request resource ownership (direct 0x0008)</div><div class='add'>+ * request resource ownership (direct 0x0009)</div><div class='add'>+ */</div><div class='add'>+struct libie_aqc_req_res {</div><div class='add'>+	__le16	res_id;</div><div class='add'>+	__le16	access_type;</div><div class='add'>+</div><div class='add'>+	__le32	timeout;</div><div class='add'>+	__le32	res_number;</div><div class='add'>+	__le16	status;</div><div class='add'>+	u8	reserved[2];</div><div class='add'>+};</div><div class='add'>+LIBIE_CHECK_STRUCT_LEN(16, libie_aqc_req_res);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct libie_aqc_list_caps - Getting capabilities</div><div class='add'>+ * @cmd_flags: command flags</div><div class='add'>+ * @pf_index: index of PF to get caps from</div><div class='add'>+ * @reserved: reserved for future use</div><div class='add'>+ * @count: number of capabilities records</div><div class='add'>+ * @addr_high: high part of response address buff</div><div class='add'>+ * @addr_low: low part of response address buff</div><div class='add'>+ *</div><div class='add'>+ * Used in commands:</div><div class='add'>+ * get function capabilities (indirect 0x000A)</div><div class='add'>+ * get device capabilities (indirect 0x000B)</div><div class='add'>+ */</div><div class='add'>+struct libie_aqc_list_caps {</div><div class='add'>+	u8	cmd_flags;</div><div class='add'>+	u8	pf_index;</div><div class='add'>+	u8	reserved[2];</div><div class='add'>+	__le32	count;</div><div class='add'>+	__le32	addr_high;</div><div class='add'>+	__le32	addr_low;</div><div class='add'>+};</div><div class='add'>+LIBIE_CHECK_STRUCT_LEN(16, libie_aqc_list_caps);</div><div class='add'>+</div><div class='add'>+/* Device/Function buffer entry, repeated per reported capability */</div><div class='add'>+#define LIBIE_AQC_CAPS_SWITCH_MODE			0x0001</div><div class='add'>+#define LIBIE_AQC_CAPS_MNG_MODE				0x0002</div><div class='add'>+#define LIBIE_AQC_CAPS_NPAR_ACTIVE			0x0003</div><div class='add'>+#define LIBIE_AQC_CAPS_OS2BMC_CAP			0x0004</div><div class='add'>+#define LIBIE_AQC_CAPS_VALID_FUNCTIONS			0x0005</div><div class='add'>+#define LIBIE_AQC_MAX_VALID_FUNCTIONS			0x8</div><div class='add'>+#define LIBIE_AQC_CAPS_SRIOV				0x0012</div><div class='add'>+#define LIBIE_AQC_CAPS_VF				0x0013</div><div class='add'>+#define LIBIE_AQC_CAPS_VMDQ				0x0014</div><div class='add'>+#define LIBIE_AQC_CAPS_8021QBG				0x0015</div><div class='add'>+#define LIBIE_AQC_CAPS_8021QBR				0x0016</div><div class='add'>+#define LIBIE_AQC_CAPS_VSI				0x0017</div><div class='add'>+#define LIBIE_AQC_CAPS_DCB				0x0018</div><div class='add'>+#define LIBIE_AQC_CAPS_FCOE				0x0021</div><div class='add'>+#define LIBIE_AQC_CAPS_ISCSI				0x0022</div><div class='add'>+#define LIBIE_AQC_CAPS_RSS				0x0040</div><div class='add'>+#define LIBIE_AQC_CAPS_RXQS				0x0041</div><div class='add'>+#define LIBIE_AQC_CAPS_TXQS				0x0042</div><div class='add'>+#define LIBIE_AQC_CAPS_MSIX				0x0043</div><div class='add'>+#define LIBIE_AQC_CAPS_VF_MSIX				0x0044</div><div class='add'>+#define LIBIE_AQC_CAPS_FD				0x0045</div><div class='add'>+#define LIBIE_AQC_CAPS_1588				0x0046</div><div class='add'>+#define LIBIE_AQC_CAPS_MAX_MTU				0x0047</div><div class='add'>+#define LIBIE_AQC_CAPS_NVM_VER				0x0048</div><div class='add'>+#define LIBIE_AQC_CAPS_PENDING_NVM_VER			0x0049</div><div class='add'>+#define LIBIE_AQC_CAPS_OROM_VER				0x004A</div><div class='add'>+#define LIBIE_AQC_CAPS_PENDING_OROM_VER			0x004B</div><div class='add'>+#define LIBIE_AQC_CAPS_NET_VER				0x004C</div><div class='add'>+#define LIBIE_AQC_CAPS_PENDING_NET_VER			0x004D</div><div class='add'>+#define LIBIE_AQC_CAPS_RDMA				0x0051</div><div class='add'>+#define LIBIE_AQC_CAPS_LED				0x0061</div><div class='add'>+#define LIBIE_AQC_CAPS_SDP				0x0062</div><div class='add'>+#define LIBIE_AQC_CAPS_MDIO				0x0063</div><div class='add'>+#define LIBIE_AQC_CAPS_WSR_PROT				0x0064</div><div class='add'>+#define LIBIE_AQC_CAPS_SENSOR_READING			0x0067</div><div class='add'>+#define LIBIE_AQC_INLINE_IPSEC				0x0070</div><div class='add'>+#define LIBIE_AQC_CAPS_NUM_ENABLED_PORTS		0x0072</div><div class='add'>+#define LIBIE_AQC_CAPS_PCIE_RESET_AVOIDANCE		0x0076</div><div class='add'>+#define LIBIE_AQC_CAPS_POST_UPDATE_RESET_RESTRICT	0x0077</div><div class='add'>+#define LIBIE_AQC_CAPS_NVM_MGMT				0x0080</div><div class='add'>+#define LIBIE_AQC_CAPS_EXT_TOPO_DEV_IMG0		0x0081</div><div class='add'>+#define LIBIE_AQC_CAPS_EXT_TOPO_DEV_IMG1		0x0082</div><div class='add'>+#define LIBIE_AQC_CAPS_EXT_TOPO_DEV_IMG2		0x0083</div><div class='add'>+#define LIBIE_AQC_CAPS_EXT_TOPO_DEV_IMG3		0x0084</div><div class='add'>+#define LIBIE_AQC_CAPS_TX_SCHED_TOPO_COMP_MODE		0x0085</div><div class='add'>+#define LIBIE_AQC_CAPS_NAC_TOPOLOGY			0x0087</div><div class='add'>+#define LIBIE_AQC_CAPS_FW_LAG_SUPPORT			0x0092</div><div class='add'>+#define LIBIE_AQC_BIT_ROCEV2_LAG			BIT(0)</div><div class='add'>+#define LIBIE_AQC_BIT_SRIOV_LAG				BIT(1)</div><div class='add'>+#define LIBIE_AQC_BIT_SRIOV_AA_LAG			BIT(2)</div><div class='add'>+#define LIBIE_AQC_CAPS_FLEX10				0x00F1</div><div class='add'>+#define LIBIE_AQC_CAPS_CEM				0x00F2</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct libie_aqc_list_caps_elem - Getting list of caps elements</div><div class='add'>+ * @cap: one from the defines list above</div><div class='add'>+ * @major_ver: major version</div><div class='add'>+ * @minor_ver: minor version</div><div class='add'>+ * @number: number of resources described by this capability</div><div class='add'>+ * @logical_id: logical ID, only meaningful for some types of resources</div><div class='add'>+ * @phys_id: physical ID, only meaningful for some types of resources</div><div class='add'>+ * @rsvd1: reserved for future use</div><div class='add'>+ * @rsvd2: reserved for future use</div><div class='add'>+ */</div><div class='add'>+struct libie_aqc_list_caps_elem {</div><div class='add'>+	__le16	cap;</div><div class='add'>+</div><div class='add'>+	u8	major_ver;</div><div class='add'>+	u8	minor_ver;</div><div class='add'>+	__le32	number;</div><div class='add'>+	__le32	logical_id;</div><div class='add'>+	__le32	phys_id;</div><div class='add'>+	__le64	rsvd1;</div><div class='add'>+	__le64	rsvd2;</div><div class='add'>+};</div><div class='add'>+LIBIE_CHECK_STRUCT_LEN(32, libie_aqc_list_caps_elem);</div><div class='add'>+</div><div class='add'>+/* Admin Queue command opcodes */</div><div class='add'>+enum libie_adminq_opc {</div><div class='add'>+	/* FW Logging Commands */</div><div class='add'>+	libie_aqc_opc_fw_logs_config			= 0xFF30,</div><div class='add'>+	libie_aqc_opc_fw_logs_register			= 0xFF31,</div><div class='add'>+	libie_aqc_opc_fw_logs_query			= 0xFF32,</div><div class='add'>+	libie_aqc_opc_fw_logs_event			= 0xFF33,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum libie_aqc_fw_logging_mod {</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_GENERAL = 0,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_CTRL,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_LINK,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_LINK_TOPO,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_DNL,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_I2C,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_SDP,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_MDIO,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_ADMINQ,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_HDMA,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_LLDP,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_DCBX,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_DCB,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_XLR,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_NVM,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_AUTH,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_VPD,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_IOSF,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_PARSER,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_SW,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_SCHEDULER,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_TXQ,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_RSVD,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_POST,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_WATCHDOG,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_TASK_DISPATCH,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_MNG,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_SYNCE,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_HEALTH,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_TSDRV,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_PFREG,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_MDLVER,</div><div class='add'>+	LIBIE_AQC_FW_LOG_ID_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Set FW Logging configuration (indirect 0xFF30)</div><div class='add'>+ * Register for FW Logging (indirect 0xFF31)</div><div class='add'>+ * Query FW Logging (indirect 0xFF32)</div><div class='add'>+ * FW Log Event (indirect 0xFF33)</div><div class='add'>+ */</div><div class='add'>+#define LIBIE_AQC_FW_LOG_CONF_UART_EN		BIT(0)</div><div class='add'>+#define LIBIE_AQC_FW_LOG_CONF_AQ_EN		BIT(1)</div><div class='add'>+#define LIBIE_AQC_FW_LOG_QUERY_REGISTERED	BIT(2)</div><div class='add'>+#define LIBIE_AQC_FW_LOG_CONF_SET_VALID		BIT(3)</div><div class='add'>+#define LIBIE_AQC_FW_LOG_AQ_REGISTER		BIT(0)</div><div class='add'>+#define LIBIE_AQC_FW_LOG_AQ_QUERY		BIT(2)</div><div class='add'>+</div><div class='add'>+#define LIBIE_AQC_FW_LOG_MIN_RESOLUTION		1</div><div class='add'>+#define LIBIE_AQC_FW_LOG_MAX_RESOLUTION		128</div><div class='add'>+</div><div class='add'>+struct libie_aqc_fw_log {</div><div class='add'>+	u8 cmd_flags;</div><div class='add'>+</div><div class='add'>+	u8 rsp_flag;</div><div class='add'>+	__le16 fw_rt_msb;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__le32 fw_rt_lsb;</div><div class='add'>+		} sync;</div><div class='add'>+		struct {</div><div class='add'>+			__le16 log_resolution;</div><div class='add'>+			__le16 mdl_cnt;</div><div class='add'>+		} cfg;</div><div class='add'>+	} ops;</div><div class='add'>+	__le32 addr_high;</div><div class='add'>+	__le32 addr_low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Response Buffer for:</div><div class='add'>+ *    Set Firmware Logging Configuration (0xFF30)</div><div class='add'>+ *    Query FW Logging (0xFF32)</div><div class='add'>+ */</div><div class='add'>+struct libie_aqc_fw_log_cfg_resp {</div><div class='add'>+	__le16 module_identifier;</div><div class='add'>+	u8 log_level;</div><div class='add'>+	u8 rsvd0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct libie_aq_desc - Admin Queue (AQ) descriptor</div><div class='add'>+ * @flags: LIBIE_AQ_FLAG_* flags</div><div class='add'>+ * @opcode: AQ command opcode</div><div class='add'>+ * @datalen: length in bytes of indirect/external data buffer</div><div class='add'>+ * @retval: return value from firmware</div><div class='add'>+ * @cookie_high: opaque data high-half</div><div class='add'>+ * @cookie_low: opaque data low-half</div><div class='add'>+ * @params: command-specific parameters</div><div class='add'>+ *</div><div class='add'>+ * Descriptor format for commands the driver posts on the Admin Transmit Queue</div><div class='add'>+ * (ATQ). The firmware writes back onto the command descriptor and returns</div><div class='add'>+ * the result of the command. Asynchronous events that are not an immediate</div><div class='add'>+ * result of the command are written to the Admin Receive Queue (ARQ) using</div><div class='add'>+ * the same descriptor format. Descriptors are in little-endian notation with</div><div class='add'>+ * 32-bit words.</div><div class='add'>+ */</div><div class='add'>+struct libie_aq_desc {</div><div class='add'>+	__le16	flags;</div><div class='add'>+	__le16	opcode;</div><div class='add'>+	__le16	datalen;</div><div class='add'>+	__le16	retval;</div><div class='add'>+	__le32	cookie_high;</div><div class='add'>+	__le32	cookie_low;</div><div class='add'>+	union {</div><div class='add'>+		u8	raw[16];</div><div class='add'>+		struct	libie_aqc_generic generic;</div><div class='add'>+		struct	libie_aqc_get_ver get_ver;</div><div class='add'>+		struct	libie_aqc_driver_ver driver_ver;</div><div class='add'>+		struct	libie_aqc_req_res res_owner;</div><div class='add'>+		struct	libie_aqc_list_caps get_cap;</div><div class='add'>+		struct	libie_aqc_fw_log fw_log;</div><div class='add'>+	} params;</div><div class='add'>+};</div><div class='add'>+LIBIE_CHECK_STRUCT_LEN(32, libie_aq_desc);</div><div class='add'>+</div><div class='add'>+/* FW defined boundary for a large buffer, 4k &gt;= Large buffer &gt; 512 bytes */</div><div class='add'>+#define LIBIE_AQ_LG_BUF				512</div><div class='add'>+</div><div class='add'>+/* Flags sub-structure</div><div class='add'>+ * |0  |1  |2  |3  |4  |5  |6  |7  |8  |9  |10 |11 |12 |13 |14 |15 |</div><div class='add'>+ * |DD |CMP|ERR|VFE| * *  RESERVED * * |LB |RD |VFC|BUF|SI |EI |FE |</div><div class='add'>+ */</div><div class='add'>+#define LIBIE_AQ_FLAG_DD			BIT(0)	/* 0x1    */</div><div class='add'>+#define LIBIE_AQ_FLAG_CMP			BIT(1)	/* 0x2    */</div><div class='add'>+#define LIBIE_AQ_FLAG_ERR			BIT(2)	/* 0x4    */</div><div class='add'>+#define LIBIE_AQ_FLAG_VFE			BIT(3)	/* 0x8    */</div><div class='add'>+#define LIBIE_AQ_FLAG_LB			BIT(9)	/* 0x200  */</div><div class='add'>+#define LIBIE_AQ_FLAG_RD			BIT(10)	/* 0x400  */</div><div class='add'>+#define LIBIE_AQ_FLAG_VFC			BIT(11) /* 0x800  */</div><div class='add'>+#define LIBIE_AQ_FLAG_BUF			BIT(12)	/* 0x1000 */</div><div class='add'>+#define LIBIE_AQ_FLAG_SI			BIT(13)	/* 0x2000 */</div><div class='add'>+#define LIBIE_AQ_FLAG_EI			BIT(14)	/* 0x4000 */</div><div class='add'>+#define LIBIE_AQ_FLAG_FE			BIT(15)	/* 0x8000 */</div><div class='add'>+</div><div class='add'>+/* error codes */</div><div class='add'>+enum libie_aq_err {</div><div class='add'>+	LIBIE_AQ_RC_OK		= 0,  /* Success */</div><div class='add'>+	LIBIE_AQ_RC_EPERM	= 1,  /* Operation not permitted */</div><div class='add'>+	LIBIE_AQ_RC_ENOENT	= 2,  /* No such element */</div><div class='add'>+	LIBIE_AQ_RC_ESRCH	= 3,  /* Bad opcode */</div><div class='add'>+	LIBIE_AQ_RC_EIO		= 5,  /* I/O error */</div><div class='add'>+	LIBIE_AQ_RC_EAGAIN	= 8,  /* Try again */</div><div class='add'>+	LIBIE_AQ_RC_ENOMEM	= 9,  /* Out of memory */</div><div class='add'>+	LIBIE_AQ_RC_EACCES	= 10, /* Permission denied */</div><div class='add'>+	LIBIE_AQ_RC_EBUSY	= 12, /* Device or resource busy */</div><div class='add'>+	LIBIE_AQ_RC_EEXIST	= 13, /* Object already exists */</div><div class='add'>+	LIBIE_AQ_RC_EINVAL	= 14, /* Invalid argument */</div><div class='add'>+	LIBIE_AQ_RC_ENOSPC	= 16, /* No space left or allocation failure */</div><div class='add'>+	LIBIE_AQ_RC_ENOSYS	= 17, /* Function not implemented */</div><div class='add'>+	LIBIE_AQ_RC_EMODE	= 21, /* Op not allowed in current dev mode */</div><div class='add'>+	LIBIE_AQ_RC_ENOSEC	= 24, /* Missing security manifest */</div><div class='add'>+	LIBIE_AQ_RC_EBADSIG	= 25, /* Bad RSA signature */</div><div class='add'>+	LIBIE_AQ_RC_ESVN	= 26, /* SVN number prohibits this package */</div><div class='add'>+	LIBIE_AQ_RC_EBADMAN	= 27, /* Manifest hash mismatch */</div><div class='add'>+	LIBIE_AQ_RC_EBADBUF	= 28, /* Buffer hash mismatches manifest */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void *libie_aq_raw(struct libie_aq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return &amp;desc-&gt;params.raw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *libie_aq_str(enum libie_aq_err err);</div><div class='add'>+</div><div class='add'>+#endif /* __LIBIE_ADMINQ_H */</div><div class='head'>diff --git a/include/linux/net/intel/libie/fwlog.h b/include/linux/net/intel/libie/fwlog.h<br/>new file mode 100644<br/>index 000000000000..7273c78c826b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net/intel/libie/fwlog.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net/intel/libie/fwlog.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) 2022, Intel Corporation. */</div><div class='add'>+</div><div class='add'>+#ifndef _LIBIE_FWLOG_H_</div><div class='add'>+#define _LIBIE_FWLOG_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/net/intel/libie/adminq.h&gt;</div><div class='add'>+</div><div class='add'>+/* Only a single log level should be set and all log levels under the set value</div><div class='add'>+ * are enabled, e.g. if log level is set to LIBIE_FW_LOG_LEVEL_VERBOSE, then all</div><div class='add'>+ * other log levels are included (except LIBIE_FW_LOG_LEVEL_NONE)</div><div class='add'>+ */</div><div class='add'>+enum libie_fwlog_level {</div><div class='add'>+	LIBIE_FWLOG_LEVEL_NONE = 0,</div><div class='add'>+	LIBIE_FWLOG_LEVEL_ERROR = 1,</div><div class='add'>+	LIBIE_FWLOG_LEVEL_WARNING = 2,</div><div class='add'>+	LIBIE_FWLOG_LEVEL_NORMAL = 3,</div><div class='add'>+	LIBIE_FWLOG_LEVEL_VERBOSE = 4,</div><div class='add'>+	LIBIE_FWLOG_LEVEL_INVALID, /* all values &gt;= this entry are invalid */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct libie_fwlog_module_entry {</div><div class='add'>+	/* module ID for the corresponding firmware logging event */</div><div class='add'>+	u16 module_id;</div><div class='add'>+	/* verbosity level for the module_id */</div><div class='add'>+	u8 log_level;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct libie_fwlog_cfg {</div><div class='add'>+	/* list of modules for configuring log level */</div><div class='add'>+	struct libie_fwlog_module_entry module_entries[LIBIE_AQC_FW_LOG_ID_MAX];</div><div class='add'>+	/* options used to configure firmware logging */</div><div class='add'>+	u16 options;</div><div class='add'>+#define LIBIE_FWLOG_OPTION_ARQ_ENA		BIT(0)</div><div class='add'>+#define LIBIE_FWLOG_OPTION_UART_ENA		BIT(1)</div><div class='add'>+	/* set before calling libie_fwlog_init() so the PF registers for</div><div class='add'>+	 * firmware logging on initialization</div><div class='add'>+	 */</div><div class='add'>+#define LIBIE_FWLOG_OPTION_REGISTER_ON_INIT	BIT(2)</div><div class='add'>+	/* set in the libie_aq_fwlog_get() response if the PF is registered for</div><div class='add'>+	 * FW logging events over ARQ</div><div class='add'>+	 */</div><div class='add'>+#define LIBIE_FWLOG_OPTION_IS_REGISTERED	BIT(3)</div><div class='add'>+</div><div class='add'>+	/* minimum number of log events sent per Admin Receive Queue event */</div><div class='add'>+	u16 log_resolution;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct libie_fwlog_data {</div><div class='add'>+	u16 data_size;</div><div class='add'>+	u8 *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct libie_fwlog_ring {</div><div class='add'>+	struct libie_fwlog_data *rings;</div><div class='add'>+	u16 index;</div><div class='add'>+	u16 size;</div><div class='add'>+	u16 head;</div><div class='add'>+	u16 tail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LIBIE_FWLOG_RING_SIZE_INDEX_DFLT 3</div><div class='add'>+#define LIBIE_FWLOG_RING_SIZE_DFLT 256</div><div class='add'>+#define LIBIE_FWLOG_RING_SIZE_MAX 512</div><div class='add'>+</div><div class='add'>+struct libie_fwlog {</div><div class='add'>+	struct libie_fwlog_cfg cfg;</div><div class='add'>+	bool supported; /* does hardware support FW logging? */</div><div class='add'>+	struct libie_fwlog_ring ring;</div><div class='add'>+	struct dentry *debugfs;</div><div class='add'>+	/* keep track of all the dentrys for FW log modules */</div><div class='add'>+	struct dentry **debugfs_modules;</div><div class='add'>+	struct_group_tagged(libie_fwlog_api, api,</div><div class='add'>+		struct pci_dev *pdev;</div><div class='add'>+		int (*send_cmd)(void *, struct libie_aq_desc *, void *, u16);</div><div class='add'>+		void *priv;</div><div class='add'>+		struct dentry *debugfs_root;</div><div class='add'>+	);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_LIBIE_FWLOG)</div><div class='add'>+int libie_fwlog_init(struct libie_fwlog *fwlog, struct libie_fwlog_api *api);</div><div class='add'>+void libie_fwlog_deinit(struct libie_fwlog *fwlog);</div><div class='add'>+void libie_fwlog_reregister(struct libie_fwlog *fwlog);</div><div class='add'>+void libie_get_fwlog_data(struct libie_fwlog *fwlog, u8 *buf, u16 len);</div><div class='add'>+#else</div><div class='add'>+static inline int libie_fwlog_init(struct libie_fwlog *fwlog,</div><div class='add'>+				   struct libie_fwlog_api *api)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline void libie_fwlog_deinit(struct libie_fwlog *fwlog) { }</div><div class='add'>+static inline void libie_fwlog_reregister(struct libie_fwlog *fwlog) { }</div><div class='add'>+static inline void libie_get_fwlog_data(struct libie_fwlog *fwlog, u8 *buf,</div><div class='add'>+					u16 len) { }</div><div class='add'>+#endif /* CONFIG_LIBIE_FWLOG */</div><div class='add'>+#endif /* _LIBIE_FWLOG_H_ */</div><div class='head'>diff --git a/include/linux/net/intel/libie/pctype.h b/include/linux/net/intel/libie/pctype.h<br/>new file mode 100644<br/>index 000000000000..d783417fbf36<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net/intel/libie/pctype.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net/intel/libie/pctype.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2025 Intel Corporation */</div><div class='add'>+</div><div class='add'>+#ifndef __LIBIE_PCTYPE_H</div><div class='add'>+#define __LIBIE_PCTYPE_H</div><div class='add'>+</div><div class='add'>+/* Packet Classifier Type indexes, used to set the xxQF_HENA registers. Also</div><div class='add'>+ * communicated over the virtchnl API as part of struct virtchnl_rss_hashena.</div><div class='add'>+ */</div><div class='add'>+enum libie_filter_pctype {</div><div class='add'>+	/* Note: Values 0-28 are reserved for future use.</div><div class='add'>+	 * Value 29, 30, 32 are not supported on XL710 and X710.</div><div class='add'>+	 */</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP	= 29,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP	= 30,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV4_UDP		= 31,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK	= 32,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV4_TCP		= 33,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV4_SCTP		= 34,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV4_OTHER		= 35,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_FRAG_IPV4			= 36,</div><div class='add'>+	/* Note: Values 37-38 are reserved for future use.</div><div class='add'>+	 * Value 39, 40, 42 are not supported on XL710 and X710.</div><div class='add'>+	 */</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP	= 39,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP	= 40,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV6_UDP		= 41,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK	= 42,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV6_TCP		= 43,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV6_SCTP		= 44,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_NONF_IPV6_OTHER		= 45,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_FRAG_IPV6			= 46,</div><div class='add'>+	/* Note: Value 47 is reserved for future use */</div><div class='add'>+	LIBIE_FILTER_PCTYPE_FCOE_OX			= 48,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_FCOE_RX			= 49,</div><div class='add'>+	LIBIE_FILTER_PCTYPE_FCOE_OTHER			= 50,</div><div class='add'>+	/* Note: Values 51-62 are reserved for future use */</div><div class='add'>+	LIBIE_FILTER_PCTYPE_L2_PAYLOAD			= 63</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __LIBIE_PCTYPE_H */</div><div class='head'>diff --git a/include/linux/net/intel/libie/rx.h b/include/linux/net/intel/libie/rx.h<br/>new file mode 100644<br/>index 000000000000..8e97775f1d66<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net/intel/libie/rx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net/intel/libie/rx.h</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2024 Intel Corporation */</div><div class='add'>+</div><div class='add'>+#ifndef __LIBIE_RX_H</div><div class='add'>+#define __LIBIE_RX_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/libeth/rx.h&gt;</div><div class='add'>+</div><div class='add'>+/* Rx buffer management */</div><div class='add'>+</div><div class='add'>+/* The largest size for a single descriptor as per HW */</div><div class='add'>+#define LIBIE_MAX_RX_BUF_LEN	9728U</div><div class='add'>+/* "True" HW-writeable space: minimum from SW and HW values */</div><div class='add'>+#define LIBIE_RX_BUF_LEN(hr)	min_t(u32, LIBETH_RX_PAGE_LEN(hr),	\</div><div class='add'>+				      LIBIE_MAX_RX_BUF_LEN)</div><div class='add'>+</div><div class='add'>+/* The maximum frame size as per HW (S/G) */</div><div class='add'>+#define __LIBIE_MAX_RX_FRM_LEN	16382U</div><div class='add'>+/* ATST, HW can chain up to 5 Rx descriptors */</div><div class='add'>+#define LIBIE_MAX_RX_FRM_LEN(hr)					\</div><div class='add'>+	min_t(u32, __LIBIE_MAX_RX_FRM_LEN, LIBIE_RX_BUF_LEN(hr) * 5)</div><div class='add'>+/* Maximum frame size minus LL overhead */</div><div class='add'>+#define LIBIE_MAX_MTU							\</div><div class='add'>+	(LIBIE_MAX_RX_FRM_LEN(LIBETH_MAX_HEADROOM) - LIBETH_RX_LL_LEN)</div><div class='add'>+</div><div class='add'>+/* O(1) converting i40e/ice/iavf's 8/10-bit hardware packet type to a parsed</div><div class='add'>+ * bitfield struct.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define LIBIE_RX_PT_NUM		154</div><div class='add'>+</div><div class='add'>+extern const struct libeth_rx_pt libie_rx_pt_lut[LIBIE_RX_PT_NUM];</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * libie_rx_pt_parse - convert HW packet type to software bitfield structure</div><div class='add'>+ * @pt: 10-bit hardware packet type value from the descriptor</div><div class='add'>+ *</div><div class='add'>+ * ```libie_rx_pt_lut``` must be accessed only using this wrapper.</div><div class='add'>+ *</div><div class='add'>+ * Return: parsed bitfield struct corresponding to the provided ptype.</div><div class='add'>+ */</div><div class='add'>+static inline struct libeth_rx_pt libie_rx_pt_parse(u32 pt)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(pt &gt;= LIBIE_RX_PT_NUM))</div><div class='add'>+		pt = 0;</div><div class='add'>+</div><div class='add'>+	return libie_rx_pt_lut[pt];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __LIBIE_RX_H */</div><div class='head'>diff --git a/include/linux/net_tstamp.h b/include/linux/net_tstamp.h<br/>index eb01c37e71e0..f4936d9c2b3c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/net_tstamp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/net_tstamp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/net_tstamp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/net_tstamp.h</a></div><div class='hunk'>@@ -4,10 +4,41 @@</div><div class='ctx'> #define _LINUX_NET_TIMESTAMPING_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;uapi/linux/ethtool_netlink_generated.h&gt;</div><div class='ctx'> </div><div class='del'>-enum hwtstamp_source {</div><div class='del'>-	HWTSTAMP_SOURCE_NETDEV,</div><div class='del'>-	HWTSTAMP_SOURCE_PHYLIB,</div><div class='add'>+#define SOF_TIMESTAMPING_SOFTWARE_MASK	(SOF_TIMESTAMPING_RX_SOFTWARE | \</div><div class='add'>+					 SOF_TIMESTAMPING_TX_SOFTWARE | \</div><div class='add'>+					 SOF_TIMESTAMPING_SOFTWARE)</div><div class='add'>+</div><div class='add'>+#define SOF_TIMESTAMPING_HARDWARE_MASK	(SOF_TIMESTAMPING_RX_HARDWARE | \</div><div class='add'>+					 SOF_TIMESTAMPING_TX_HARDWARE | \</div><div class='add'>+					 SOF_TIMESTAMPING_RAW_HARDWARE)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hwtstamp_provider_desc - hwtstamp provider description</div><div class='add'>+ *</div><div class='add'>+ * @index: index of the hwtstamp provider.</div><div class='add'>+ * @qualifier: hwtstamp provider qualifier.</div><div class='add'>+ */</div><div class='add'>+struct hwtstamp_provider_desc {</div><div class='add'>+	int index;</div><div class='add'>+	enum hwtstamp_provider_qualifier qualifier;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hwtstamp_provider - hwtstamp provider object</div><div class='add'>+ *</div><div class='add'>+ * @rcu_head: RCU callback used to free the struct.</div><div class='add'>+ * @source: source of the hwtstamp provider.</div><div class='add'>+ * @phydev: pointer of the phydev source in case a PTP coming from phylib</div><div class='add'>+ * @desc: hwtstamp provider description.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct hwtstamp_provider {</div><div class='add'>+	struct rcu_head rcu_head;</div><div class='add'>+	enum hwtstamp_source source;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	struct hwtstamp_provider_desc desc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -22,6 +53,7 @@ enum hwtstamp_source {</div><div class='ctx'>  *	copied the ioctl request back to user space</div><div class='ctx'>  * @source: indication whether timestamps should come from the netdev or from</div><div class='ctx'>  *	an attached phylib PHY</div><div class='add'>+ * @qualifier: qualifier of the hwtstamp provider</div><div class='ctx'>  *</div><div class='ctx'>  * Prefer using this structure for in-kernel processing of hardware</div><div class='ctx'>  * timestamping configuration, over the inextensible struct hwtstamp_config</div><div class='hunk'>@@ -34,6 +66,7 @@ struct kernel_hwtstamp_config {</div><div class='ctx'> 	struct ifreq *ifr;</div><div class='ctx'> 	bool copied_to_user;</div><div class='ctx'> 	enum hwtstamp_source source;</div><div class='add'>+	enum hwtstamp_provider_qualifier qualifier;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void hwtstamp_config_to_kernel(struct kernel_hwtstamp_config *kernel_cfg,</div><div class='head'>diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h<br/>index 7c2d77d75a88..93e4da7046a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netdev_features.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netdev_features.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netdev_features.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netdev_features.h</a></div><div class='hunk'>@@ -24,9 +24,8 @@ enum {</div><div class='ctx'> 	NETIF_F_HW_VLAN_CTAG_FILTER_BIT,/* Receive filtering on VLAN CTAGs */</div><div class='ctx'> 	NETIF_F_VLAN_CHALLENGED_BIT,	/* Device cannot handle VLAN packets */</div><div class='ctx'> 	NETIF_F_GSO_BIT,		/* Enable software GSO. */</div><div class='del'>-	NETIF_F_LLTX_BIT,		/* LockLess TX - deprecated. Please */</div><div class='del'>-					/* do not use LLTX in new drivers */</div><div class='del'>-	NETIF_F_NETNS_LOCAL_BIT,	/* Does not change network namespaces */</div><div class='add'>+	__UNUSED_NETIF_F_12,</div><div class='add'>+	__UNUSED_NETIF_F_13,</div><div class='ctx'> 	NETIF_F_GRO_BIT,		/* Generic receive offload */</div><div class='ctx'> 	NETIF_F_LRO_BIT,		/* large receive offload */</div><div class='ctx'> </div><div class='hunk'>@@ -54,12 +53,12 @@ enum {</div><div class='ctx'> 	NETIF_F_GSO_UDP_BIT,		/* ... UFO, deprecated except tuntap */</div><div class='ctx'> 	NETIF_F_GSO_UDP_L4_BIT,		/* ... UDP payload GSO (not UFO) */</div><div class='ctx'> 	NETIF_F_GSO_FRAGLIST_BIT,		/* ... Fraglist GSO */</div><div class='add'>+	NETIF_F_GSO_ACCECN_BIT,		/* TCP AccECN w/ TSO (no clear CWR) */</div><div class='ctx'> 	/**/NETIF_F_GSO_LAST =		/* last bit, see GSO_MASK */</div><div class='del'>-		NETIF_F_GSO_FRAGLIST_BIT,</div><div class='add'>+		NETIF_F_GSO_ACCECN_BIT,</div><div class='ctx'> </div><div class='ctx'> 	NETIF_F_FCOE_CRC_BIT,		/* FCoE CRC32 */</div><div class='ctx'> 	NETIF_F_SCTP_CRC_BIT,		/* SCTP checksum offload */</div><div class='del'>-	NETIF_F_FCOE_MTU_BIT,		/* Supports max FCoE MTU, 2158 bytes*/</div><div class='ctx'> 	NETIF_F_NTUPLE_BIT,		/* N-tuple filters supported */</div><div class='ctx'> 	NETIF_F_RXHASH_BIT,		/* Receive hashing offload */</div><div class='ctx'> 	NETIF_F_RXCSUM_BIT,		/* Receive checksumming offload */</div><div class='hunk'>@@ -106,7 +105,6 @@ enum {</div><div class='ctx'> #define __NETIF_F(name)		__NETIF_F_BIT(NETIF_F_##name##_BIT)</div><div class='ctx'> </div><div class='ctx'> #define NETIF_F_FCOE_CRC	__NETIF_F(FCOE_CRC)</div><div class='del'>-#define NETIF_F_FCOE_MTU	__NETIF_F(FCOE_MTU)</div><div class='ctx'> #define NETIF_F_FRAGLIST	__NETIF_F(FRAGLIST)</div><div class='ctx'> #define NETIF_F_FSO		__NETIF_F(FSO)</div><div class='ctx'> #define NETIF_F_GRO		__NETIF_F(GRO)</div><div class='hunk'>@@ -120,10 +118,8 @@ enum {</div><div class='ctx'> #define NETIF_F_HW_VLAN_CTAG_TX	__NETIF_F(HW_VLAN_CTAG_TX)</div><div class='ctx'> #define NETIF_F_IP_CSUM		__NETIF_F(IP_CSUM)</div><div class='ctx'> #define NETIF_F_IPV6_CSUM	__NETIF_F(IPV6_CSUM)</div><div class='del'>-#define NETIF_F_LLTX		__NETIF_F(LLTX)</div><div class='ctx'> #define NETIF_F_LOOPBACK	__NETIF_F(LOOPBACK)</div><div class='ctx'> #define NETIF_F_LRO		__NETIF_F(LRO)</div><div class='del'>-#define NETIF_F_NETNS_LOCAL	__NETIF_F(NETNS_LOCAL)</div><div class='ctx'> #define NETIF_F_NOCACHE_COPY	__NETIF_F(NOCACHE_COPY)</div><div class='ctx'> #define NETIF_F_NTUPLE		__NETIF_F(NTUPLE)</div><div class='ctx'> #define NETIF_F_RXCSUM		__NETIF_F(RXCSUM)</div><div class='hunk'>@@ -132,6 +128,7 @@ enum {</div><div class='ctx'> #define NETIF_F_SG		__NETIF_F(SG)</div><div class='ctx'> #define NETIF_F_TSO6		__NETIF_F(TSO6)</div><div class='ctx'> #define NETIF_F_TSO_ECN		__NETIF_F(TSO_ECN)</div><div class='add'>+#define NETIF_F_GSO_ACCECN	__NETIF_F(GSO_ACCECN)</div><div class='ctx'> #define NETIF_F_TSO		__NETIF_F(TSO)</div><div class='ctx'> #define NETIF_F_VLAN_CHALLENGED	__NETIF_F(VLAN_CHALLENGED)</div><div class='ctx'> #define NETIF_F_RXFCS		__NETIF_F(RXFCS)</div><div class='hunk'>@@ -192,8 +189,7 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)</div><div class='ctx'> </div><div class='ctx'> /* Features valid for ethtool to change */</div><div class='ctx'> /* = all defined minus driver/device-class-related */</div><div class='del'>-#define NETIF_F_NEVER_CHANGE	(NETIF_F_VLAN_CHALLENGED | \</div><div class='del'>-				 NETIF_F_LLTX | NETIF_F_NETNS_LOCAL)</div><div class='add'>+#define NETIF_F_NEVER_CHANGE	NETIF_F_VLAN_CHALLENGED</div><div class='ctx'> </div><div class='ctx'> /* remember that ((t)1 &lt;&lt; t_BITS) is undefined in C99 */</div><div class='ctx'> #define NETIF_F_ETHTOOL_BITS	((__NETIF_F_BIT(NETDEV_FEATURE_COUNT - 1) | \</div><div class='hunk'>@@ -214,11 +210,9 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)</div><div class='ctx'> #define NETIF_F_ALL_TSO 	(NETIF_F_TSO | NETIF_F_TSO6 | \</div><div class='ctx'> 				 NETIF_F_TSO_ECN | NETIF_F_TSO_MANGLEID)</div><div class='ctx'> </div><div class='del'>-#define NETIF_F_ALL_FCOE	(NETIF_F_FCOE_CRC | NETIF_F_FCOE_MTU | \</div><div class='del'>-				 NETIF_F_FSO)</div><div class='del'>-</div><div class='ctx'> /* List of features with software fallbacks. */</div><div class='del'>-#define NETIF_F_GSO_SOFTWARE	(NETIF_F_ALL_TSO | NETIF_F_GSO_SCTP |	     \</div><div class='add'>+#define NETIF_F_GSO_SOFTWARE	(NETIF_F_ALL_TSO | \</div><div class='add'>+				 NETIF_F_GSO_ACCECN | NETIF_F_GSO_SCTP | \</div><div class='ctx'> 				 NETIF_F_GSO_UDP_L4 | NETIF_F_GSO_FRAGLIST)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -261,4 +255,29 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)</div><div class='ctx'> 				 NETIF_F_GSO_UDP_TUNNEL |		\</div><div class='ctx'> 				 NETIF_F_GSO_UDP_TUNNEL_CSUM)</div><div class='ctx'> </div><div class='add'>+/* virtual device features */</div><div class='add'>+#define MASTER_UPPER_DEV_VLAN_FEATURES	 (NETIF_F_HW_CSUM | NETIF_F_SG | \</div><div class='add'>+					  NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | \</div><div class='add'>+					  NETIF_F_GSO_ENCAP_ALL | \</div><div class='add'>+					  NETIF_F_HIGHDMA | NETIF_F_LRO)</div><div class='add'>+</div><div class='add'>+#define MASTER_UPPER_DEV_ENC_FEATURES	 (NETIF_F_HW_CSUM | NETIF_F_SG | \</div><div class='add'>+					  NETIF_F_RXCSUM | NETIF_F_GSO_SOFTWARE | \</div><div class='add'>+					  NETIF_F_GSO_PARTIAL)</div><div class='add'>+</div><div class='add'>+#define MASTER_UPPER_DEV_MPLS_FEATURES	 (NETIF_F_HW_CSUM | NETIF_F_SG | \</div><div class='add'>+					  NETIF_F_GSO_SOFTWARE)</div><div class='add'>+</div><div class='add'>+#define MASTER_UPPER_DEV_XFRM_FEATURES	 (NETIF_F_HW_ESP | NETIF_F_HW_ESP_TX_CSUM | \</div><div class='add'>+					  NETIF_F_GSO_ESP)</div><div class='add'>+</div><div class='add'>+#define MASTER_UPPER_DEV_GSO_PARTIAL_FEATURES (NETIF_F_GSO_ESP)</div><div class='add'>+</div><div class='add'>+static inline netdev_features_t netdev_base_features(netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	features &amp;= ~NETIF_F_ONE_FOR_ALL;</div><div class='add'>+	features |= NETIF_F_ALL_FOR_ALL;</div><div class='add'>+	return features;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* _LINUX_NETDEV_FEATURES_H */</div><div class='head'>diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h<br/>index c6f6ac779b34..5870a9e514a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netdevice.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netdevice.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netdevice.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netdevice.h</a></div><div class='hunk'>@@ -40,9 +40,9 @@</div><div class='ctx'> #include &lt;net/dcbnl.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;net/netprio_cgroup.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/netdev_features.h&gt;</div><div class='ctx'> #include &lt;linux/neighbour.h&gt;</div><div class='add'>+#include &lt;linux/netdevice_xmit.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/if_bonding.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/pkt_cls.h&gt;</div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;net/net_trackers.h&gt;</div><div class='ctx'> #include &lt;net/net_debug.h&gt;</div><div class='ctx'> #include &lt;net/dropreason-core.h&gt;</div><div class='add'>+#include &lt;net/neighbour_tables.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct netpoll_info;</div><div class='ctx'> struct device;</div><div class='hunk'>@@ -59,9 +60,10 @@ struct ethtool_ops;</div><div class='ctx'> struct kernel_hwtstamp_config;</div><div class='ctx'> struct phy_device;</div><div class='ctx'> struct dsa_port;</div><div class='del'>-struct ip_tunnel_parm;</div><div class='add'>+struct ip_tunnel_parm_kern;</div><div class='ctx'> struct macsec_context;</div><div class='ctx'> struct macsec_ops;</div><div class='add'>+struct netdev_config;</div><div class='ctx'> struct netdev_name_node;</div><div class='ctx'> struct sd_flow_limit;</div><div class='ctx'> struct sfp_bus;</div><div class='hunk'>@@ -79,6 +81,9 @@ struct xdp_buff;</div><div class='ctx'> struct xdp_frame;</div><div class='ctx'> struct xdp_metadata_ops;</div><div class='ctx'> struct xdp_md;</div><div class='add'>+struct ethtool_netdev_state;</div><div class='add'>+struct phy_link_topology;</div><div class='add'>+struct hwtstamp_provider;</div><div class='ctx'> </div><div class='ctx'> typedef u32 xdp_features_t;</div><div class='ctx'> </div><div class='hunk'>@@ -335,15 +340,45 @@ struct gro_list {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * size of gro hash buckets, must less than bit number of</div><div class='del'>- * napi_struct::gro_bitmask</div><div class='add'>+ * size of gro hash buckets, must be &lt;= the number of bits in</div><div class='add'>+ * gro_node::bitmask</div><div class='ctx'>  */</div><div class='ctx'> #define GRO_HASH_BUCKETS	8</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct gro_node - structure to support Generic Receive Offload</div><div class='add'>+ * @bitmask: bitmask to indicate used buckets in @hash</div><div class='add'>+ * @hash: hashtable of pending aggregated skbs, separated by flows</div><div class='add'>+ * @rx_list: list of pending ``GRO_NORMAL`` skbs</div><div class='add'>+ * @rx_count: cached current length of @rx_list</div><div class='add'>+ * @cached_napi_id: napi_struct::napi_id cached for hotpath, 0 for standalone</div><div class='add'>+ */</div><div class='add'>+struct gro_node {</div><div class='add'>+	unsigned long		bitmask;</div><div class='add'>+	struct gro_list		hash[GRO_HASH_BUCKETS];</div><div class='add'>+	struct list_head	rx_list;</div><div class='add'>+	u32			rx_count;</div><div class='add'>+	u32			cached_napi_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Structure for per-NAPI config</div><div class='add'>+ */</div><div class='add'>+struct napi_config {</div><div class='add'>+	u64 gro_flush_timeout;</div><div class='add'>+	u64 irq_suspend_timeout;</div><div class='add'>+	u32 defer_hard_irqs;</div><div class='add'>+	cpumask_t affinity_mask;</div><div class='add'>+	u8 threaded;</div><div class='add'>+	unsigned int napi_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Structure for NAPI scheduling similar to tasklet but with weighting</div><div class='ctx'>  */</div><div class='ctx'> struct napi_struct {</div><div class='add'>+	/* This field should be first or softnet_data.backlog needs tweaks. */</div><div class='add'>+	unsigned long		state;</div><div class='ctx'> 	/* The poll_list must only be managed by the entity which</div><div class='ctx'> 	 * changes the state of the NAPI_STATE_SCHED bit.  This means</div><div class='ctx'> 	 * whoever atomically sets that bit can add this napi_struct</div><div class='hunk'>@@ -352,10 +387,8 @@ struct napi_struct {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct list_head	poll_list;</div><div class='ctx'> </div><div class='del'>-	unsigned long		state;</div><div class='ctx'> 	int			weight;</div><div class='del'>-	int			defer_hard_irqs_count;</div><div class='del'>-	unsigned long		gro_bitmask;</div><div class='add'>+	u32			defer_hard_irqs_count;</div><div class='ctx'> 	int			(*poll)(struct napi_struct *, int);</div><div class='ctx'> #ifdef CONFIG_NETPOLL</div><div class='ctx'> 	/* CPU actively polling if netpoll is configured */</div><div class='hunk'>@@ -364,17 +397,23 @@ struct napi_struct {</div><div class='ctx'> 	/* CPU on which NAPI has been scheduled for processing */</div><div class='ctx'> 	int			list_owner;</div><div class='ctx'> 	struct net_device	*dev;</div><div class='del'>-	struct gro_list		gro_hash[GRO_HASH_BUCKETS];</div><div class='ctx'> 	struct sk_buff		*skb;</div><div class='del'>-	struct list_head	rx_list; /* Pending GRO_NORMAL skbs */</div><div class='del'>-	int			rx_count; /* length of rx_list */</div><div class='del'>-	unsigned int		napi_id;</div><div class='add'>+	struct gro_node		gro;</div><div class='ctx'> 	struct hrtimer		timer;</div><div class='add'>+	/* all fields past this point are write-protected by netdev_lock */</div><div class='ctx'> 	struct task_struct	*thread;</div><div class='add'>+	unsigned long		gro_flush_timeout;</div><div class='add'>+	unsigned long		irq_suspend_timeout;</div><div class='add'>+	u32			defer_hard_irqs;</div><div class='ctx'> 	/* control-path-only fields follow */</div><div class='add'>+	u32			napi_id;</div><div class='ctx'> 	struct list_head	dev_list;</div><div class='ctx'> 	struct hlist_node	napi_hash_node;</div><div class='ctx'> 	int			irq;</div><div class='add'>+	struct irq_affinity_notify notify;</div><div class='add'>+	int			napi_rmap_idx;</div><div class='add'>+	int			index;</div><div class='add'>+	struct napi_config	*config;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -384,10 +423,12 @@ enum {</div><div class='ctx'> 	NAPI_STATE_NPSVC,		/* Netpoll - don't dequeue from poll_list */</div><div class='ctx'> 	NAPI_STATE_LISTED,		/* NAPI added to system lists */</div><div class='ctx'> 	NAPI_STATE_NO_BUSY_POLL,	/* Do not add in napi_hash, no busy polling */</div><div class='del'>-	NAPI_STATE_IN_BUSY_POLL,	/* sk_busy_loop() owns this NAPI */</div><div class='add'>+	NAPI_STATE_IN_BUSY_POLL,	/* Do not rearm NAPI interrupt */</div><div class='ctx'> 	NAPI_STATE_PREFER_BUSY_POLL,	/* prefer busy-polling over softirq processing*/</div><div class='ctx'> 	NAPI_STATE_THREADED,		/* The poll is performed inside its own thread*/</div><div class='ctx'> 	NAPI_STATE_SCHED_THREADED,	/* Napi is currently scheduled in threaded mode */</div><div class='add'>+	NAPI_STATE_HAS_NOTIFIER,	/* Napi has an IRQ notifier */</div><div class='add'>+	NAPI_STATE_THREADED_BUSY_POLL,	/* The threaded NAPI poller will busy poll */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -401,6 +442,8 @@ enum {</div><div class='ctx'> 	NAPIF_STATE_PREFER_BUSY_POLL	= BIT(NAPI_STATE_PREFER_BUSY_POLL),</div><div class='ctx'> 	NAPIF_STATE_THREADED		= BIT(NAPI_STATE_THREADED),</div><div class='ctx'> 	NAPIF_STATE_SCHED_THREADED	= BIT(NAPI_STATE_SCHED_THREADED),</div><div class='add'>+	NAPIF_STATE_HAS_NOTIFIER	= BIT(NAPI_STATE_HAS_NOTIFIER),</div><div class='add'>+	NAPIF_STATE_THREADED_BUSY_POLL	= BIT(NAPI_STATE_THREADED_BUSY_POLL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum gro_result {</div><div class='hunk'>@@ -491,7 +534,7 @@ static inline bool napi_prefer_busy_poll(struct napi_struct *n)</div><div class='ctx'>  * is scheduled for example in the context of delayed timer</div><div class='ctx'>  * that can be skipped if a NAPI is already scheduled.</div><div class='ctx'>  *</div><div class='del'>- * Return True if NAPI is scheduled, False otherwise.</div><div class='add'>+ * Return: True if NAPI is scheduled, False otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool napi_is_scheduled(struct napi_struct *n)</div><div class='ctx'> {</div><div class='hunk'>@@ -506,7 +549,7 @@ bool napi_schedule_prep(struct napi_struct *n);</div><div class='ctx'>  *</div><div class='ctx'>  * Schedule NAPI poll routine to be called if it is not already</div><div class='ctx'>  * running.</div><div class='del'>- * Return true if we schedule a NAPI or false if not.</div><div class='add'>+ * Return: true if we schedule a NAPI or false if not.</div><div class='ctx'>  * Refer to napi_schedule_prep() for additional reason on why</div><div class='ctx'>  * a NAPI might not be scheduled.</div><div class='ctx'>  */</div><div class='hunk'>@@ -540,7 +583,7 @@ static inline void napi_schedule_irqoff(struct napi_struct *n)</div><div class='ctx'>  * Mark NAPI processing as complete. Should only be called if poll budget</div><div class='ctx'>  * has not been completely consumed.</div><div class='ctx'>  * Prefer over napi_complete().</div><div class='del'>- * Return false if device should avoid rearming interrupts.</div><div class='add'>+ * Return: false if device should avoid rearming interrupts.</div><div class='ctx'>  */</div><div class='ctx'> bool napi_complete_done(struct napi_struct *n, int work_done);</div><div class='ctx'> </div><div class='hunk'>@@ -549,18 +592,15 @@ static inline bool napi_complete(struct napi_struct *n)</div><div class='ctx'> 	return napi_complete_done(n, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dev_set_threaded(struct net_device *dev, bool threaded);</div><div class='add'>+void netif_threaded_enable(struct net_device *dev);</div><div class='add'>+int dev_set_threaded(struct net_device *dev,</div><div class='add'>+		     enum netdev_napi_threaded threaded);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	napi_disable - prevent NAPI from scheduling</div><div class='del'>- *	@n: NAPI context</div><div class='del'>- *</div><div class='del'>- * Stop NAPI from being scheduled on this context.</div><div class='del'>- * Waits till any outstanding processing completes.</div><div class='del'>- */</div><div class='ctx'> void napi_disable(struct napi_struct *n);</div><div class='add'>+void napi_disable_locked(struct napi_struct *n);</div><div class='ctx'> </div><div class='ctx'> void napi_enable(struct napi_struct *n);</div><div class='add'>+void napi_enable_locked(struct napi_struct *n);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	napi_synchronize - wait until NAPI is not running</div><div class='hunk'>@@ -642,9 +682,7 @@ struct netdev_queue {</div><div class='ctx'> 	struct Qdisc __rcu	*qdisc_sleeping;</div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> 	struct kobject		kobj;</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_XPS) &amp;&amp; defined(CONFIG_NUMA)</div><div class='del'>-	int			numa_node;</div><div class='add'>+	const struct attribute_group	**groups;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned long		tx_maxrate;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -656,15 +694,16 @@ struct netdev_queue {</div><div class='ctx'> 	/* Subordinate device that the queue has been assigned to */</div><div class='ctx'> 	struct net_device	*sb_dev;</div><div class='ctx'> #ifdef CONFIG_XDP_SOCKETS</div><div class='add'>+	/* "ops protected", see comment about net_device::lock */</div><div class='ctx'> 	struct xsk_buff_pool    *pool;</div><div class='ctx'> #endif</div><div class='del'>-	/* NAPI instance for the queue</div><div class='del'>-	 * Readers and writers must hold RTNL</div><div class='del'>-	 */</div><div class='del'>-	struct napi_struct      *napi;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * write-mostly part</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_BQL</div><div class='add'>+	struct dql		dql;</div><div class='add'>+#endif</div><div class='ctx'> 	spinlock_t		_xmit_lock ____cacheline_aligned_in_smp;</div><div class='ctx'> 	int			xmit_lock_owner;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -674,8 +713,16 @@ struct netdev_queue {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		state;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BQL</div><div class='del'>-	struct dql		dql;</div><div class='add'>+/*</div><div class='add'>+ * slow- / control-path part</div><div class='add'>+ */</div><div class='add'>+	/* NAPI instance for the queue</div><div class='add'>+	 * "ops protected", see comment about net_device::lock</div><div class='add'>+	 */</div><div class='add'>+	struct napi_struct	*napi;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_XPS) &amp;&amp; defined(CONFIG_NUMA)</div><div class='add'>+	int			numa_node;</div><div class='ctx'> #endif</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='hunk'>@@ -830,6 +877,7 @@ enum net_device_path_type {</div><div class='ctx'> 	DEV_PATH_PPPOE,</div><div class='ctx'> 	DEV_PATH_DSA,</div><div class='ctx'> 	DEV_PATH_MTK_WDMA,</div><div class='add'>+	DEV_PATH_TUN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct net_device_path {</div><div class='hunk'>@@ -842,6 +890,18 @@ struct net_device_path {</div><div class='ctx'> 			u8		h_dest[ETH_ALEN];</div><div class='ctx'> 		} encap;</div><div class='ctx'> 		struct {</div><div class='add'>+			union {</div><div class='add'>+				struct in_addr	src_v4;</div><div class='add'>+				struct in6_addr	src_v6;</div><div class='add'>+			};</div><div class='add'>+			union {</div><div class='add'>+				struct in_addr	dst_v4;</div><div class='add'>+				struct in6_addr	dst_v6;</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			u8	l3_proto;</div><div class='add'>+		} tun;</div><div class='add'>+		struct {</div><div class='ctx'> 			enum {</div><div class='ctx'> 				DEV_PATH_BR_VLAN_KEEP,</div><div class='ctx'> 				DEV_PATH_BR_VLAN_TAG,</div><div class='hunk'>@@ -972,9 +1032,13 @@ struct netdev_bpf {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XFRM_OFFLOAD</div><div class='ctx'> struct xfrmdev_ops {</div><div class='del'>-	int	(*xdo_dev_state_add) (struct xfrm_state *x, struct netlink_ext_ack *extack);</div><div class='del'>-	void	(*xdo_dev_state_delete) (struct xfrm_state *x);</div><div class='del'>-	void	(*xdo_dev_state_free) (struct xfrm_state *x);</div><div class='add'>+	int	(*xdo_dev_state_add)(struct net_device *dev,</div><div class='add'>+				     struct xfrm_state *x,</div><div class='add'>+				     struct netlink_ext_ack *extack);</div><div class='add'>+	void	(*xdo_dev_state_delete)(struct net_device *dev,</div><div class='add'>+					struct xfrm_state *x);</div><div class='add'>+	void	(*xdo_dev_state_free)(struct net_device *dev,</div><div class='add'>+				      struct xfrm_state *x);</div><div class='ctx'> 	bool	(*xdo_dev_offload_ok) (struct sk_buff *skb,</div><div class='ctx'> 				       struct xfrm_state *x);</div><div class='ctx'> 	void	(*xdo_dev_state_advance_esn) (struct xfrm_state *x);</div><div class='hunk'>@@ -1064,8 +1128,8 @@ struct netdev_net_notifier {</div><div class='ctx'>  *</div><div class='ctx'>  * int (*ndo_do_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='ctx'>  *	Old-style ioctl entry point. This is used internally by the</div><div class='del'>- *	appletalk and ieee802154 subsystems but is no longer called by</div><div class='del'>- *	the device ioctl handler.</div><div class='add'>+ *	ieee802154 subsystem but is no longer called by the device</div><div class='add'>+ *	ioctl handler.</div><div class='ctx'>  *</div><div class='ctx'>  * int (*ndo_siocbond)(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='ctx'>  *	Used by the bonding driver for its device specific ioctls:</div><div class='hunk'>@@ -1225,12 +1289,17 @@ struct netdev_net_notifier {</div><div class='ctx'>  * int (*ndo_fdb_add)(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'>  *		      struct net_device *dev,</div><div class='ctx'>  *		      const unsigned char *addr, u16 vid, u16 flags,</div><div class='del'>- *		      struct netlink_ext_ack *extack);</div><div class='add'>+ *		      bool *notified, struct netlink_ext_ack *extack);</div><div class='ctx'>  *	Adds an FDB entry to dev for addr.</div><div class='add'>+ *	Callee shall set *notified to true if it sent any appropriate</div><div class='add'>+ *	notification(s). Otherwise core will send a generic one.</div><div class='ctx'>  * int (*ndo_fdb_del)(struct ndmsg *ndm, struct nlattr *tb[],</div><div class='ctx'>  *		      struct net_device *dev,</div><div class='del'>- *		      const unsigned char *addr, u16 vid)</div><div class='del'>- *	Deletes the FDB entry from dev coresponding to addr.</div><div class='add'>+ *		      const unsigned char *addr, u16 vid</div><div class='add'>+ *		      bool *notified, struct netlink_ext_ack *extack);</div><div class='add'>+ *	Deletes the FDB entry from dev corresponding to addr.</div><div class='add'>+ *	Callee shall set *notified to true if it sent any appropriate</div><div class='add'>+ *	notification(s). Otherwise core will send a generic one.</div><div class='ctx'>  * int (*ndo_fdb_del_bulk)(struct nlmsghdr *nlh, struct net_device *dev,</div><div class='ctx'>  *			   struct netlink_ext_ack *extack);</div><div class='ctx'>  * int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='hunk'>@@ -1327,7 +1396,7 @@ struct netdev_net_notifier {</div><div class='ctx'>  *	queue id bound to an AF_XDP socket. The flags field specifies if</div><div class='ctx'>  *	only RX, only Tx, or both should be woken up using the flags</div><div class='ctx'>  *	XDP_WAKEUP_RX and XDP_WAKEUP_TX.</div><div class='del'>- * int (*ndo_tunnel_ctl)(struct net_device *dev, struct ip_tunnel_parm *p,</div><div class='add'>+ * int (*ndo_tunnel_ctl)(struct net_device *dev, struct ip_tunnel_parm_kern *p,</div><div class='ctx'>  *			 int cmd);</div><div class='ctx'>  *	Add, change, delete or get information on an IPv4 tunnel.</div><div class='ctx'>  * struct net_device *(*ndo_get_peer_dev)(struct net_device *dev);</div><div class='hunk'>@@ -1405,8 +1474,7 @@ struct net_device_ops {</div><div class='ctx'> 						        __be16 proto, u16 vid);</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	void                    (*ndo_poll_controller)(struct net_device *dev);</div><div class='del'>-	int			(*ndo_netpoll_setup)(struct net_device *dev,</div><div class='del'>-						     struct netpoll_info *info);</div><div class='add'>+	int			(*ndo_netpoll_setup)(struct net_device *dev);</div><div class='ctx'> 	void			(*ndo_netpoll_cleanup)(struct net_device *dev);</div><div class='ctx'> #endif</div><div class='ctx'> 	int			(*ndo_set_vf_mac)(struct net_device *dev,</div><div class='hunk'>@@ -1503,12 +1571,15 @@ struct net_device_ops {</div><div class='ctx'> 					       const unsigned char *addr,</div><div class='ctx'> 					       u16 vid,</div><div class='ctx'> 					       u16 flags,</div><div class='add'>+					       bool *notified,</div><div class='ctx'> 					       struct netlink_ext_ack *extack);</div><div class='ctx'> 	int			(*ndo_fdb_del)(struct ndmsg *ndm,</div><div class='ctx'> 					       struct nlattr *tb[],</div><div class='ctx'> 					       struct net_device *dev,</div><div class='ctx'> 					       const unsigned char *addr,</div><div class='del'>-					       u16 vid, struct netlink_ext_ack *extack);</div><div class='add'>+					       u16 vid,</div><div class='add'>+					       bool *notified,</div><div class='add'>+					       struct netlink_ext_ack *extack);</div><div class='ctx'> 	int			(*ndo_fdb_del_bulk)(struct nlmsghdr *nlh,</div><div class='ctx'> 						    struct net_device *dev,</div><div class='ctx'> 						    struct netlink_ext_ack *extack);</div><div class='hunk'>@@ -1583,7 +1654,8 @@ struct net_device_ops {</div><div class='ctx'> 	int			(*ndo_xsk_wakeup)(struct net_device *dev,</div><div class='ctx'> 						  u32 queue_id, u32 flags);</div><div class='ctx'> 	int			(*ndo_tunnel_ctl)(struct net_device *dev,</div><div class='del'>-						  struct ip_tunnel_parm *p, int cmd);</div><div class='add'>+						  struct ip_tunnel_parm_kern *p,</div><div class='add'>+						  int cmd);</div><div class='ctx'> 	struct net_device *	(*ndo_get_peer_dev)(struct net_device *dev);</div><div class='ctx'> 	int                     (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx,</div><div class='ctx'>                                                          struct net_device_path *path);</div><div class='hunk'>@@ -1595,6 +1667,14 @@ struct net_device_ops {</div><div class='ctx'> 	int			(*ndo_hwtstamp_set)(struct net_device *dev,</div><div class='ctx'> 						    struct kernel_hwtstamp_config *kernel_config,</div><div class='ctx'> 						    struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_SHAPER)</div><div class='add'>+	/**</div><div class='add'>+	 * @net_shaper_ops: Device shaping offload operations</div><div class='add'>+	 * see include/net/net_shapers.h</div><div class='add'>+	 */</div><div class='add'>+	const struct net_shaper_ops *net_shaper_ops;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1605,7 +1685,8 @@ struct net_device_ops {</div><div class='ctx'>  * userspace; this means that the order of these flags can change</div><div class='ctx'>  * during any kernel release.</div><div class='ctx'>  *</div><div class='del'>- * You should have a pretty good reason to be extending these flags.</div><div class='add'>+ * You should add bitfield booleans after either net_device::priv_flags</div><div class='add'>+ * (hotpath) or ::threaded (slowpath) instead of extending these flags.</div><div class='ctx'>  *</div><div class='ctx'>  * @IFF_802_1Q_VLAN: 802.1Q VLAN device</div><div class='ctx'>  * @IFF_EBRIDGE: Ethernet bridging device</div><div class='hunk'>@@ -1644,10 +1725,6 @@ struct net_device_ops {</div><div class='ctx'>  * @IFF_NO_ADDRCONF: prevent ipv6 addrconf</div><div class='ctx'>  * @IFF_TX_SKB_NO_LINEAR: device/driver is capable of xmitting frames with</div><div class='ctx'>  *	skb_headlen(skb) == 0 (data starts from frag0)</div><div class='del'>- * @IFF_CHANGE_PROTO_DOWN: device supports setting carrier via IFLA_PROTO_DOWN</div><div class='del'>- * @IFF_SEE_ALL_HWTSTAMP_REQUESTS: device wants to see calls to</div><div class='del'>- *	ndo_hwtstamp_set() for all timestamp requests regardless of source,</div><div class='del'>- *	even if those aren't HWTSTAMP_SOURCE_NETDEV.</div><div class='ctx'>  */</div><div class='ctx'> enum netdev_priv_flags {</div><div class='ctx'> 	IFF_802_1Q_VLAN			= 1&lt;&lt;0,</div><div class='hunk'>@@ -1682,42 +1759,8 @@ enum netdev_priv_flags {</div><div class='ctx'> 	IFF_L3MDEV_RX_HANDLER		= 1&lt;&lt;29,</div><div class='ctx'> 	IFF_NO_ADDRCONF			= BIT_ULL(30),</div><div class='ctx'> 	IFF_TX_SKB_NO_LINEAR		= BIT_ULL(31),</div><div class='del'>-	IFF_CHANGE_PROTO_DOWN		= BIT_ULL(32),</div><div class='del'>-	IFF_SEE_ALL_HWTSTAMP_REQUESTS	= BIT_ULL(33),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN</div><div class='del'>-#define IFF_EBRIDGE			IFF_EBRIDGE</div><div class='del'>-#define IFF_BONDING			IFF_BONDING</div><div class='del'>-#define IFF_ISATAP			IFF_ISATAP</div><div class='del'>-#define IFF_WAN_HDLC			IFF_WAN_HDLC</div><div class='del'>-#define IFF_XMIT_DST_RELEASE		IFF_XMIT_DST_RELEASE</div><div class='del'>-#define IFF_DONT_BRIDGE			IFF_DONT_BRIDGE</div><div class='del'>-#define IFF_DISABLE_NETPOLL		IFF_DISABLE_NETPOLL</div><div class='del'>-#define IFF_MACVLAN_PORT		IFF_MACVLAN_PORT</div><div class='del'>-#define IFF_BRIDGE_PORT			IFF_BRIDGE_PORT</div><div class='del'>-#define IFF_OVS_DATAPATH		IFF_OVS_DATAPATH</div><div class='del'>-#define IFF_TX_SKB_SHARING		IFF_TX_SKB_SHARING</div><div class='del'>-#define IFF_UNICAST_FLT			IFF_UNICAST_FLT</div><div class='del'>-#define IFF_TEAM_PORT			IFF_TEAM_PORT</div><div class='del'>-#define IFF_SUPP_NOFCS			IFF_SUPP_NOFCS</div><div class='del'>-#define IFF_LIVE_ADDR_CHANGE		IFF_LIVE_ADDR_CHANGE</div><div class='del'>-#define IFF_MACVLAN			IFF_MACVLAN</div><div class='del'>-#define IFF_XMIT_DST_RELEASE_PERM	IFF_XMIT_DST_RELEASE_PERM</div><div class='del'>-#define IFF_L3MDEV_MASTER		IFF_L3MDEV_MASTER</div><div class='del'>-#define IFF_NO_QUEUE			IFF_NO_QUEUE</div><div class='del'>-#define IFF_OPENVSWITCH			IFF_OPENVSWITCH</div><div class='del'>-#define IFF_L3MDEV_SLAVE		IFF_L3MDEV_SLAVE</div><div class='del'>-#define IFF_TEAM			IFF_TEAM</div><div class='del'>-#define IFF_RXFH_CONFIGURED		IFF_RXFH_CONFIGURED</div><div class='del'>-#define IFF_PHONY_HEADROOM		IFF_PHONY_HEADROOM</div><div class='del'>-#define IFF_MACSEC			IFF_MACSEC</div><div class='del'>-#define IFF_NO_RX_HANDLER		IFF_NO_RX_HANDLER</div><div class='del'>-#define IFF_FAILOVER			IFF_FAILOVER</div><div class='del'>-#define IFF_FAILOVER_SLAVE		IFF_FAILOVER_SLAVE</div><div class='del'>-#define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER</div><div class='del'>-#define IFF_TX_SKB_NO_LINEAR		IFF_TX_SKB_NO_LINEAR</div><div class='del'>-</div><div class='ctx'> /* Specifies the type of the struct net_device::ml_priv pointer */</div><div class='ctx'> enum netdev_ml_priv_type {</div><div class='ctx'> 	ML_PRIV_NONE,</div><div class='hunk'>@@ -1747,6 +1790,13 @@ enum netdev_reg_state {</div><div class='ctx'>  *	data with strictly "high-level" data, and it has to know about</div><div class='ctx'>  *	almost every data structure used in the INET module.</div><div class='ctx'>  *</div><div class='add'>+ *	@priv_flags:	flags invisible to userspace defined as bits, see</div><div class='add'>+ *			enum netdev_priv_flags for the definitions</div><div class='add'>+ *	@lltx:		device supports lockless Tx. Deprecated for real HW</div><div class='add'>+ *			drivers. Mainly used by logical interfaces, such as</div><div class='add'>+ *			bonding and tunnels</div><div class='add'>+ *	@netmem_tx:	device support netmem_tx.</div><div class='add'>+ *</div><div class='ctx'>  *	@name:	This is the first field of the "visible" part of this structure</div><div class='ctx'>  *		(i.e. as seen by users in the "Space.c" file).  It is the name</div><div class='ctx'>  *		of the interface.</div><div class='hunk'>@@ -1796,7 +1846,6 @@ enum netdev_reg_state {</div><div class='ctx'>  *	@wireless_handlers:	List of functions to handle Wireless Extensions,</div><div class='ctx'>  *				instead of ioctl,</div><div class='ctx'>  *				see &lt;net/iw_handler.h&gt; for details.</div><div class='del'>- *	@wireless_data:	Instance data managed by the core of wireless extensions</div><div class='ctx'>  *</div><div class='ctx'>  *	@netdev_ops:	Includes several pointers to callbacks,</div><div class='ctx'>  *			if one wants to override the ndo_*() functions</div><div class='hunk'>@@ -1813,10 +1862,9 @@ enum netdev_reg_state {</div><div class='ctx'>  *</div><div class='ctx'>  *	@flags:		Interface flags (a la BSD)</div><div class='ctx'>  *	@xdp_features:	XDP capability supported by the device</div><div class='del'>- *	@priv_flags:	Like 'flags' but invisible to userspace,</div><div class='del'>- *			see if.h for the definitions</div><div class='ctx'>  *	@gflags:	Global flags ( kept as legacy )</div><div class='del'>- *	@padded:	How much padding added by alloc_netdev()</div><div class='add'>+ *	@priv_len:	Size of the -&gt;priv flexible array</div><div class='add'>+ *	@priv:		Flexible array containing private data</div><div class='ctx'>  *	@operstate:	RFC2863 operstate</div><div class='ctx'>  *	@link_mode:	Mapping policy to operstate</div><div class='ctx'>  *	@if_port:	Selectable AUI, TP, ...</div><div class='hunk'>@@ -1841,6 +1889,7 @@ enum netdev_reg_state {</div><div class='ctx'>  * 	@addr_len:		Hardware address length</div><div class='ctx'>  *	@upper_level:		Maximum depth level of upper devices.</div><div class='ctx'>  *	@lower_level:		Maximum depth level of lower devices.</div><div class='add'>+ *	@threaded:		napi threaded state.</div><div class='ctx'>  *	@neigh_priv_len:	Used in neigh_alloc()</div><div class='ctx'>  * 	@dev_id:		Used to differentiate devices that share</div><div class='ctx'>  * 				the same link layer address</div><div class='hunk'>@@ -1873,6 +1922,7 @@ enum netdev_reg_state {</div><div class='ctx'>  *			 device struct</div><div class='ctx'>  *	@mpls_ptr:	mpls_dev struct pointer</div><div class='ctx'>  *	@mctp_ptr:	MCTP specific data</div><div class='add'>+ *	@psp_dev:	PSP crypto device registered for this netdev</div><div class='ctx'>  *</div><div class='ctx'>  *	@dev_addr:	Hw address (before bcast,</div><div class='ctx'>  *			because most packets are unicast)</div><div class='hunk'>@@ -1882,9 +1932,6 @@ enum netdev_reg_state {</div><div class='ctx'>  *				allocated at register_netdev() time</div><div class='ctx'>  *	@real_num_rx_queues: 	Number of RX queues currently active in device</div><div class='ctx'>  *	@xdp_prog:		XDP sockets filter program pointer</div><div class='del'>- *	@gro_flush_timeout:	timeout for GRO layer in NAPI</div><div class='del'>- *	@napi_defer_hard_irqs:	If not zero, provides a counter that would</div><div class='del'>- *				allow to avoid NIC hard IRQ, on busy queues.</div><div class='ctx'>  *</div><div class='ctx'>  *	@rx_handler:		handler for received packets</div><div class='ctx'>  *	@rx_handler_data: 	XXX: need comments on this one</div><div class='hunk'>@@ -1925,13 +1972,11 @@ enum netdev_reg_state {</div><div class='ctx'>  *</div><div class='ctx'>  *	@reg_state:		Register/unregister state machine</div><div class='ctx'>  *	@dismantle:		Device is going to be freed</div><div class='del'>- *	@rtnl_link_state:	This enum represents the phases of creating</div><div class='del'>- *				a new link</div><div class='del'>- *</div><div class='ctx'>  *	@needs_free_netdev:	Should unregister perform free_netdev?</div><div class='ctx'>  *	@priv_destructor:	Called from unregister</div><div class='ctx'>  *	@npinfo:		XXX: need comments on this one</div><div class='ctx'>  * 	@nd_net:		Network namespace this network device is inside</div><div class='add'>+ *				protected by @lock</div><div class='ctx'>  *</div><div class='ctx'>  * 	@ml_priv:	Mid-layer private</div><div class='ctx'>  *	@ml_priv_type:  Mid-layer private type</div><div class='hunk'>@@ -1956,6 +2001,7 @@ enum netdev_reg_state {</div><div class='ctx'>  *	@sysfs_rx_queue_group:	Space for optional per-rx queue attributes</div><div class='ctx'>  *	@rtnl_link_ops:	Rtnl_link_ops</div><div class='ctx'>  *	@stat_ops:	Optional ops for queue-aware statistics</div><div class='add'>+ *	@queue_mgmt_ops:	Optional ops for queue management</div><div class='ctx'>  *</div><div class='ctx'>  *	@gso_max_size:	Maximum size of generic segmentation offload</div><div class='ctx'>  *	@tso_max_size:	Device (as in HW) limit on the max TSO request size</div><div class='hunk'>@@ -1973,6 +2019,7 @@ enum netdev_reg_state {</div><div class='ctx'>  *	@fcoe_ddp_xid:	Max exchange id for FCoE LRO by ddp</div><div class='ctx'>  *</div><div class='ctx'>  *	@priomap:	XXX: need comments on this one</div><div class='add'>+ *	@link_topo:	Physical link topology tracking attached PHYs</div><div class='ctx'>  *	@phydev:	Physical device may attach itself</div><div class='ctx'>  *			for hardware timestamping</div><div class='ctx'>  *	@sfp_bus:	attached &amp;struct sfp_bus structure.</div><div class='hunk'>@@ -1983,9 +2030,22 @@ enum netdev_reg_state {</div><div class='ctx'>  *			switch driver and used to set the phys state of the</div><div class='ctx'>  *			switch port.</div><div class='ctx'>  *</div><div class='del'>- *	@wol_enabled:	Wake-on-LAN is enabled</div><div class='add'>+ *	@irq_affinity_auto: driver wants the core to store and re-assign the IRQ</div><div class='add'>+ *			    affinity. Set by netif_enable_irq_affinity(), then</div><div class='add'>+ *			    the driver must create a persistent napi by</div><div class='add'>+ *			    netif_napi_add_config() and finally bind the napi to</div><div class='add'>+ *			    IRQ (via netif_napi_set_irq()).</div><div class='add'>+ *</div><div class='add'>+ *	@rx_cpu_rmap_auto: driver wants the core to manage the ARFS rmap.</div><div class='add'>+ *	                   Set by calling netif_enable_cpu_rmap().</div><div class='ctx'>  *</div><div class='del'>- *	@threaded:	napi threaded mode is enabled</div><div class='add'>+ *	@see_all_hwtstamp_requests: device wants to see calls to</div><div class='add'>+ *			ndo_hwtstamp_set() for all timestamp requests</div><div class='add'>+ *			regardless of source, even if those aren't</div><div class='add'>+ *			HWTSTAMP_SOURCE_NETDEV</div><div class='add'>+ *	@change_proto_down: device supports setting carrier via IFLA_PROTO_DOWN</div><div class='add'>+ *	@netns_immutable: interface can't change network namespaces</div><div class='add'>+ *	@fcoe_mtu:	device supports maximum FCoE MTU, 2158 bytes</div><div class='ctx'>  *</div><div class='ctx'>  *	@net_notifier_list:	List of per-net netdev notifier block</div><div class='ctx'>  *				that follow this device when it is moved</div><div class='hunk'>@@ -1996,6 +2056,7 @@ enum netdev_reg_state {</div><div class='ctx'>  *	@udp_tunnel_nic_info:	static structure describing the UDP tunnel</div><div class='ctx'>  *				offload capabilities of the device</div><div class='ctx'>  *	@udp_tunnel_nic:	UDP tunnel offload state</div><div class='add'>+ *	@ethtool:	ethtool related state</div><div class='ctx'>  *	@xdp_state:		stores info on attached XDP BPF programs</div><div class='ctx'>  *</div><div class='ctx'>  *	@nested_level:	Used as a parameter of spin_lock_nested() of</div><div class='hunk'>@@ -2024,6 +2085,19 @@ enum netdev_reg_state {</div><div class='ctx'>  *	@dpll_pin: Pointer to the SyncE source pin of a DPLL subsystem,</div><div class='ctx'>  *		   where the clock is recovered.</div><div class='ctx'>  *</div><div class='add'>+ *	@max_pacing_offload_horizon: max EDT offload horizon in nsec.</div><div class='add'>+ *	@napi_config: An array of napi_config structures containing per-NAPI</div><div class='add'>+ *		      settings.</div><div class='add'>+ *	@num_napi_configs:	number of allocated NAPI config structs,</div><div class='add'>+ *		always &gt;= max(num_rx_queues, num_tx_queues).</div><div class='add'>+ *	@gro_flush_timeout:	timeout for GRO layer in NAPI</div><div class='add'>+ *	@napi_defer_hard_irqs:	If not zero, provides a counter that would</div><div class='add'>+ *				allow to avoid NIC hard IRQ, on busy queues.</div><div class='add'>+ *</div><div class='add'>+ *	@neighbours:	List heads pointing to this device's neighbours'</div><div class='add'>+ *			dev_list, one per address-family.</div><div class='add'>+ *	@hwprov: Tracks which PTP performs hardware packet time stamping.</div><div class='add'>+ *</div><div class='ctx'>  *	FIXME: cleanup struct net_device such that network protocol info</div><div class='ctx'>  *	moves out.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2036,7 +2110,11 @@ struct net_device {</div><div class='ctx'> </div><div class='ctx'> 	/* TX read-mostly hotpath */</div><div class='ctx'> 	__cacheline_group_begin(net_device_read_tx);</div><div class='del'>-	unsigned long long	priv_flags;</div><div class='add'>+	struct_group(priv_flags_fast,</div><div class='add'>+		unsigned long		priv_flags:32;</div><div class='add'>+		unsigned long		lltx:1;</div><div class='add'>+		unsigned long		netmem_tx:1;</div><div class='add'>+	);</div><div class='ctx'> 	const struct net_device_ops *netdev_ops;</div><div class='ctx'> 	const struct header_ops *header_ops;</div><div class='ctx'> 	struct netdev_queue	*_tx;</div><div class='hunk'>@@ -2072,6 +2150,7 @@ struct net_device {</div><div class='ctx'> 		struct pcpu_sw_netstats __percpu	*tstats;</div><div class='ctx'> 		struct pcpu_dstats __percpu		*dstats;</div><div class='ctx'> 	};</div><div class='add'>+	unsigned long		state;</div><div class='ctx'> 	unsigned int		flags;</div><div class='ctx'> 	unsigned short		hard_header_len;</div><div class='ctx'> 	netdev_features_t	features;</div><div class='hunk'>@@ -2085,8 +2164,6 @@ struct net_device {</div><div class='ctx'> 	int			ifindex;</div><div class='ctx'> 	unsigned int		real_num_rx_queues;</div><div class='ctx'> 	struct netdev_rx_queue	*_rx;</div><div class='del'>-	unsigned long		gro_flush_timeout;</div><div class='del'>-	int			napi_defer_hard_irqs;</div><div class='ctx'> 	unsigned int		gro_max_size;</div><div class='ctx'> 	unsigned int		gro_ipv4_max_size;</div><div class='ctx'> 	rx_handler_func_t __rcu	*rx_handler;</div><div class='hunk'>@@ -2117,7 +2194,6 @@ struct net_device {</div><div class='ctx'> 	 *	part of the usual set specified in Space.c.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	unsigned long		state;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	dev_list;</div><div class='ctx'> 	struct list_head	napi_list;</div><div class='hunk'>@@ -2162,7 +2238,6 @@ struct net_device {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_WIRELESS_EXT</div><div class='ctx'> 	const struct iw_handler_def *wireless_handlers;</div><div class='del'>-	struct iw_public_data	*wireless_data;</div><div class='ctx'> #endif</div><div class='ctx'> 	const struct ethtool_ops *ethtool_ops;</div><div class='ctx'> #ifdef CONFIG_NET_L3_MASTER_DEV</div><div class='hunk'>@@ -2192,14 +2267,15 @@ struct net_device {</div><div class='ctx'> 	unsigned char		addr_len;</div><div class='ctx'> 	unsigned char		upper_level;</div><div class='ctx'> 	unsigned char		lower_level;</div><div class='add'>+	u8			threaded;</div><div class='ctx'> </div><div class='ctx'> 	unsigned short		neigh_priv_len;</div><div class='ctx'> 	unsigned short          dev_id;</div><div class='ctx'> 	unsigned short          dev_port;</div><div class='del'>-	unsigned short		padded;</div><div class='add'>+	int			irq;</div><div class='add'>+	u32			priv_len;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t		addr_list_lock;</div><div class='del'>-	int			irq;</div><div class='ctx'> </div><div class='ctx'> 	struct netdev_hw_addr_list	uc;</div><div class='ctx'> 	struct netdev_hw_addr_list	mc;</div><div class='hunk'>@@ -2221,6 +2297,9 @@ struct net_device {</div><div class='ctx'> </div><div class='ctx'> 	/* Protocol-specific pointers */</div><div class='ctx'> 	struct in_device __rcu	*ip_ptr;</div><div class='add'>+	/** @fib_nh_head: nexthops associated with this netdev */</div><div class='add'>+	struct hlist_head	fib_nh_head;</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_VLAN_8021Q)</div><div class='ctx'> 	struct vlan_info __rcu	*vlan_info;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2234,7 +2313,7 @@ struct net_device {</div><div class='ctx'> 	void 			*atalk_ptr;</div><div class='ctx'> #endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_AX25)</div><div class='del'>-	void			*ax25_ptr;</div><div class='add'>+	struct ax25_dev	__rcu	*ax25_ptr;</div><div class='ctx'> #endif</div><div class='ctx'> #if IS_ENABLED(CONFIG_CFG80211)</div><div class='ctx'> 	struct wireless_dev	*ieee80211_ptr;</div><div class='hunk'>@@ -2248,6 +2327,9 @@ struct net_device {</div><div class='ctx'> #if IS_ENABLED(CONFIG_MCTP)</div><div class='ctx'> 	struct mctp_dev __rcu	*mctp_ptr;</div><div class='ctx'> #endif</div><div class='add'>+#if IS_ENABLED(CONFIG_INET_PSP)</div><div class='add'>+	struct psp_dev __rcu	*psp_dev;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Cache lines mostly used on receive path (including eth_type_trans())</div><div class='hunk'>@@ -2307,10 +2389,10 @@ struct net_device {</div><div class='ctx'> </div><div class='ctx'> 	bool dismantle;</div><div class='ctx'> </div><div class='del'>-	enum {</div><div class='del'>-		RTNL_LINK_INITIALIZED,</div><div class='del'>-		RTNL_LINK_INITIALIZING,</div><div class='del'>-	} rtnl_link_state:16;</div><div class='add'>+	/** @moving_ns: device is changing netns, protected by @lock */</div><div class='add'>+	bool moving_ns;</div><div class='add'>+	/** @rtnl_link_initializing: Device being created, suppress events */</div><div class='add'>+	bool rtnl_link_initializing;</div><div class='ctx'> </div><div class='ctx'> 	bool needs_free_netdev;</div><div class='ctx'> 	void (*priv_destructor)(struct net_device *dev);</div><div class='hunk'>@@ -2331,13 +2413,15 @@ struct net_device {</div><div class='ctx'> 	struct dm_hw_stat_delta __rcu *dm_private;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct device		dev;</div><div class='del'>-	const struct attribute_group *sysfs_groups[4];</div><div class='add'>+	const struct attribute_group *sysfs_groups[5];</div><div class='ctx'> 	const struct attribute_group *sysfs_rx_queue_group;</div><div class='ctx'> </div><div class='ctx'> 	const struct rtnl_link_ops *rtnl_link_ops;</div><div class='ctx'> </div><div class='ctx'> 	const struct netdev_stat_ops *stat_ops;</div><div class='ctx'> </div><div class='add'>+	const struct netdev_queue_mgmt_ops *queue_mgmt_ops;</div><div class='add'>+</div><div class='ctx'> 	/* for setting kernel sock attribute on TCP connection setup */</div><div class='ctx'> #define GSO_MAX_SEGS		65535u</div><div class='ctx'> #define GSO_LEGACY_MAX_SIZE	65536u</div><div class='hunk'>@@ -2363,12 +2447,19 @@ struct net_device {</div><div class='ctx'> #if IS_ENABLED(CONFIG_CGROUP_NET_PRIO)</div><div class='ctx'> 	struct netprio_map __rcu *priomap;</div><div class='ctx'> #endif</div><div class='add'>+	struct phy_link_topology	*link_topo;</div><div class='ctx'> 	struct phy_device	*phydev;</div><div class='ctx'> 	struct sfp_bus		*sfp_bus;</div><div class='ctx'> 	struct lock_class_key	*qdisc_tx_busylock;</div><div class='ctx'> 	bool			proto_down;</div><div class='del'>-	unsigned		wol_enabled:1;</div><div class='del'>-	unsigned		threaded:1;</div><div class='add'>+	bool			irq_affinity_auto;</div><div class='add'>+	bool			rx_cpu_rmap_auto;</div><div class='add'>+</div><div class='add'>+	/* priv_flags_slow, ungrouped to save space */</div><div class='add'>+	unsigned long		see_all_hwtstamp_requests:1;</div><div class='add'>+	unsigned long		change_proto_down:1;</div><div class='add'>+	unsigned long		netns_immutable:1;</div><div class='add'>+	unsigned long		fcoe_mtu:1;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head	net_notifier_list;</div><div class='ctx'> </div><div class='hunk'>@@ -2379,6 +2470,16 @@ struct net_device {</div><div class='ctx'> 	const struct udp_tunnel_nic_info	*udp_tunnel_nic_info;</div><div class='ctx'> 	struct udp_tunnel_nic	*udp_tunnel_nic;</div><div class='ctx'> </div><div class='add'>+	/** @cfg: net_device queue-related configuration */</div><div class='add'>+	struct netdev_config	*cfg;</div><div class='add'>+	/**</div><div class='add'>+	 * @cfg_pending: same as @cfg but when device is being actively</div><div class='add'>+	 *	reconfigured includes any changes to the configuration</div><div class='add'>+	 *	requested by the user, but which may or may not be rejected.</div><div class='add'>+	 */</div><div class='add'>+	struct netdev_config	*cfg_pending;</div><div class='add'>+	struct ethtool_netdev_state *ethtool;</div><div class='add'>+</div><div class='ctx'> 	/* protected by rtnl_lock */</div><div class='ctx'> 	struct bpf_xdp_entity	xdp_state[__MAX_XDP_MODE];</div><div class='ctx'> </div><div class='hunk'>@@ -2397,7 +2498,86 @@ struct net_device {</div><div class='ctx'> 	/** @page_pools: page pools created for this netdevice */</div><div class='ctx'> 	struct hlist_head	page_pools;</div><div class='ctx'> #endif</div><div class='del'>-};</div><div class='add'>+</div><div class='add'>+	/** @irq_moder: dim parameters used if IS_ENABLED(CONFIG_DIMLIB). */</div><div class='add'>+	struct dim_irq_moder	*irq_moder;</div><div class='add'>+</div><div class='add'>+	u64			max_pacing_offload_horizon;</div><div class='add'>+	struct napi_config	*napi_config;</div><div class='add'>+	u32			num_napi_configs;</div><div class='add'>+	u32			napi_defer_hard_irqs;</div><div class='add'>+	unsigned long		gro_flush_timeout;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @up: copy of @state's IFF_UP, but safe to read with just @lock.</div><div class='add'>+	 *	May report false negatives while the device is being opened</div><div class='add'>+	 *	or closed (@lock does not protect .ndo_open, or .ndo_close).</div><div class='add'>+	 */</div><div class='add'>+	bool			up;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @request_ops_lock: request the core to run all @netdev_ops and</div><div class='add'>+	 * @ethtool_ops under the @lock.</div><div class='add'>+	 */</div><div class='add'>+	bool			request_ops_lock;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @lock: netdev-scope lock, protects a small selection of fields.</div><div class='add'>+	 * Should always be taken using netdev_lock() / netdev_unlock() helpers.</div><div class='add'>+	 * Drivers are free to use it for other protection.</div><div class='add'>+	 *</div><div class='add'>+	 * For the drivers that implement shaper or queue API, the scope</div><div class='add'>+	 * of this lock is expanded to cover most ndo/queue/ethtool/sysfs</div><div class='add'>+	 * operations. Drivers may opt-in to this behavior by setting</div><div class='add'>+	 * @request_ops_lock.</div><div class='add'>+	 *</div><div class='add'>+	 * @lock protection mixes with rtnl_lock in multiple ways, fields are</div><div class='add'>+	 * either:</div><div class='add'>+	 *</div><div class='add'>+	 * - simply protected by the instance @lock;</div><div class='add'>+	 *</div><div class='add'>+	 * - double protected - writers hold both locks, readers hold either;</div><div class='add'>+	 *</div><div class='add'>+	 * - ops protected - protected by the lock held around the NDOs</div><div class='add'>+	 *   and other callbacks, that is the instance lock on devices for</div><div class='add'>+	 *   which netdev_need_ops_lock() returns true, otherwise by rtnl_lock;</div><div class='add'>+	 *</div><div class='add'>+	 * - double ops protected - always protected by rtnl_lock but for</div><div class='add'>+	 *   devices for which netdev_need_ops_lock() returns true - also</div><div class='add'>+	 *   the instance lock.</div><div class='add'>+	 *</div><div class='add'>+	 * Simply protects:</div><div class='add'>+	 *	@gro_flush_timeout, @napi_defer_hard_irqs, @napi_list,</div><div class='add'>+	 *	@net_shaper_hierarchy, @reg_state, @threaded</div><div class='add'>+	 *</div><div class='add'>+	 * Double protects:</div><div class='add'>+	 *	@up, @moving_ns, @nd_net, @xdp_features</div><div class='add'>+	 *</div><div class='add'>+	 * Double ops protects:</div><div class='add'>+	 *	@real_num_rx_queues, @real_num_tx_queues</div><div class='add'>+	 *</div><div class='add'>+	 * Also protects some fields in:</div><div class='add'>+	 *	struct napi_struct, struct netdev_queue, struct netdev_rx_queue</div><div class='add'>+	 *</div><div class='add'>+	 * Ordering: take after rtnl_lock.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex		lock;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_SHAPER)</div><div class='add'>+	/**</div><div class='add'>+	 * @net_shaper_hierarchy: data tracking the current shaper status</div><div class='add'>+	 *  see include/net/net_shapers.h</div><div class='add'>+	 */</div><div class='add'>+	struct net_shaper_hierarchy *net_shaper_hierarchy;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	struct hlist_head neighbours[NEIGH_NR_TABLES];</div><div class='add'>+</div><div class='add'>+	struct hwtstamp_provider __rcu	*hwprov;</div><div class='add'>+</div><div class='add'>+	u8			priv[] ____cacheline_aligned</div><div class='add'>+				       __counted_by(priv_len);</div><div class='add'>+} ____cacheline_aligned;</div><div class='ctx'> #define to_net_dev(d) container_of(d, struct net_device, dev)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2500,21 +2680,6 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev,</div><div class='ctx'> 		f(dev, &amp;dev-&gt;_tx[i], arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define netdev_lockdep_set_classes(dev)				\</div><div class='del'>-{								\</div><div class='del'>-	static struct lock_class_key qdisc_tx_busylock_key;	\</div><div class='del'>-	static struct lock_class_key qdisc_xmit_lock_key;	\</div><div class='del'>-	static struct lock_class_key dev_addr_list_lock_key;	\</div><div class='del'>-	unsigned int i;						\</div><div class='del'>-								\</div><div class='del'>-	(dev)-&gt;qdisc_tx_busylock = &amp;qdisc_tx_busylock_key;	\</div><div class='del'>-	lockdep_set_class(&amp;(dev)-&gt;addr_list_lock,		\</div><div class='del'>-			  &amp;dev_addr_list_lock_key);		\</div><div class='del'>-	for (i = 0; i &lt; (dev)-&gt;num_tx_queues; i++)		\</div><div class='del'>-		lockdep_set_class(&amp;(dev)-&gt;_tx[i]._xmit_lock,	\</div><div class='del'>-				  &amp;qdisc_xmit_lock_key);	\</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> u16 netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 		     struct net_device *sb_dev);</div><div class='ctx'> struct netdev_queue *netdev_core_pick_tx(struct net_device *dev,</div><div class='hunk'>@@ -2574,6 +2739,12 @@ struct net *dev_net(const struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='add'>+struct net *dev_net_rcu(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return read_pnet_rcu(&amp;dev-&gt;nd_net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='ctx'> void dev_net_set(struct net_device *dev, struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	write_pnet(&amp;dev-&gt;nd_net, net);</div><div class='hunk'>@@ -2587,7 +2758,7 @@ void dev_net_set(struct net_device *dev, struct net *net)</div><div class='ctx'>  */</div><div class='ctx'> static inline void *netdev_priv(const struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return (char *)dev + ALIGN(sizeof(struct net_device), NETDEV_ALIGN);</div><div class='add'>+	return (void *)dev-&gt;priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set the sysfs physical device reference for the network logical device</div><div class='hunk'>@@ -2605,9 +2776,24 @@ void netif_queue_set_napi(struct net_device *dev, unsigned int queue_index,</div><div class='ctx'> 			  enum netdev_queue_type type,</div><div class='ctx'> 			  struct napi_struct *napi);</div><div class='ctx'> </div><div class='add'>+static inline void netdev_lock(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;dev-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netdev_unlock(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock);</div><div class='add'>+}</div><div class='add'>+/* Additional netdev_lock()-related helpers are in net/netdev_lock.h */</div><div class='add'>+</div><div class='add'>+void netif_napi_set_irq_locked(struct napi_struct *napi, int irq);</div><div class='add'>+</div><div class='ctx'> static inline void netif_napi_set_irq(struct napi_struct *napi, int irq)</div><div class='ctx'> {</div><div class='del'>-	napi-&gt;irq = irq;</div><div class='add'>+	netdev_lock(napi-&gt;dev);</div><div class='add'>+	netif_napi_set_irq_locked(napi, irq);</div><div class='add'>+	netdev_unlock(napi-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Default NAPI poll() weight</div><div class='hunk'>@@ -2615,8 +2801,19 @@ static inline void netif_napi_set_irq(struct napi_struct *napi, int irq)</div><div class='ctx'>  */</div><div class='ctx'> #define NAPI_POLL_WEIGHT 64</div><div class='ctx'> </div><div class='del'>-void netif_napi_add_weight(struct net_device *dev, struct napi_struct *napi,</div><div class='del'>-			   int (*poll)(struct napi_struct *, int), int weight);</div><div class='add'>+void netif_napi_add_weight_locked(struct net_device *dev,</div><div class='add'>+				  struct napi_struct *napi,</div><div class='add'>+				  int (*poll)(struct napi_struct *, int),</div><div class='add'>+				  int weight);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+netif_napi_add_weight(struct net_device *dev, struct napi_struct *napi,</div><div class='add'>+		      int (*poll)(struct napi_struct *, int), int weight)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	netif_napi_add_weight_locked(dev, napi, poll, weight);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * netif_napi_add() - initialize a NAPI context</div><div class='hunk'>@@ -2635,6 +2832,13 @@ netif_napi_add(struct net_device *dev, struct napi_struct *napi,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='add'>+netif_napi_add_locked(struct net_device *dev, struct napi_struct *napi,</div><div class='add'>+		      int (*poll)(struct napi_struct *, int))</div><div class='add'>+{</div><div class='add'>+	netif_napi_add_weight_locked(dev, napi, poll, NAPI_POLL_WEIGHT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='ctx'> netif_napi_add_tx_weight(struct net_device *dev,</div><div class='ctx'> 			 struct napi_struct *napi,</div><div class='ctx'> 			 int (*poll)(struct napi_struct *, int),</div><div class='hunk'>@@ -2644,6 +2848,31 @@ netif_napi_add_tx_weight(struct net_device *dev,</div><div class='ctx'> 	netif_napi_add_weight(dev, napi, poll, weight);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void</div><div class='add'>+netif_napi_add_config_locked(struct net_device *dev, struct napi_struct *napi,</div><div class='add'>+			     int (*poll)(struct napi_struct *, int), int index)</div><div class='add'>+{</div><div class='add'>+	napi-&gt;index = index;</div><div class='add'>+	napi-&gt;config = &amp;dev-&gt;napi_config[index];</div><div class='add'>+	netif_napi_add_weight_locked(dev, napi, poll, NAPI_POLL_WEIGHT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netif_napi_add_config - initialize a NAPI context with persistent config</div><div class='add'>+ * @dev: network device</div><div class='add'>+ * @napi: NAPI context</div><div class='add'>+ * @poll: polling function</div><div class='add'>+ * @index: the NAPI index</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+netif_napi_add_config(struct net_device *dev, struct napi_struct *napi,</div><div class='add'>+		      int (*poll)(struct napi_struct *, int), int index)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	netif_napi_add_config_locked(dev, napi, poll, index);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netif_napi_add_tx() - initialize a NAPI context to be used for Tx only</div><div class='ctx'>  * @dev:  network device</div><div class='hunk'>@@ -2661,6 +2890,8 @@ static inline void netif_napi_add_tx(struct net_device *dev,</div><div class='ctx'> 	netif_napi_add_tx_weight(dev, napi, poll, NAPI_POLL_WEIGHT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __netif_napi_del_locked(struct napi_struct *napi);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *  __netif_napi_del - remove a NAPI context</div><div class='ctx'>  *  @napi: NAPI context</div><div class='hunk'>@@ -2669,7 +2900,18 @@ static inline void netif_napi_add_tx(struct net_device *dev,</div><div class='ctx'>  * containing @napi. Drivers might want to call this helper to combine</div><div class='ctx'>  * all the needed RCU grace periods into a single one.</div><div class='ctx'>  */</div><div class='del'>-void __netif_napi_del(struct napi_struct *napi);</div><div class='add'>+static inline void __netif_napi_del(struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	netdev_lock(napi-&gt;dev);</div><div class='add'>+	__netif_napi_del_locked(napi);</div><div class='add'>+	netdev_unlock(napi-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netif_napi_del_locked(struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	__netif_napi_del_locked(napi);</div><div class='add'>+	synchronize_net();</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *  netif_napi_del - remove a NAPI context</div><div class='hunk'>@@ -2683,6 +2925,9 @@ static inline void netif_napi_del(struct napi_struct *napi)</div><div class='ctx'> 	synchronize_net();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int netif_enable_cpu_rmap(struct net_device *dev, unsigned int num_irqs);</div><div class='add'>+void netif_set_affinity_auto(struct net_device *dev);</div><div class='add'>+</div><div class='ctx'> struct packet_type {</div><div class='ctx'> 	__be16			type;	/* This is really htons(ether_type). */</div><div class='ctx'> 	bool			ignore_outgoing;</div><div class='hunk'>@@ -2727,12 +2972,12 @@ struct pcpu_sw_netstats {</div><div class='ctx'> } __aligned(4 * sizeof(u64));</div><div class='ctx'> </div><div class='ctx'> struct pcpu_dstats {</div><div class='del'>-	u64			rx_packets;</div><div class='del'>-	u64			rx_bytes;</div><div class='del'>-	u64			rx_drops;</div><div class='del'>-	u64			tx_packets;</div><div class='del'>-	u64			tx_bytes;</div><div class='del'>-	u64			tx_drops;</div><div class='add'>+	u64_stats_t		rx_packets;</div><div class='add'>+	u64_stats_t		rx_bytes;</div><div class='add'>+	u64_stats_t		tx_packets;</div><div class='add'>+	u64_stats_t		tx_bytes;</div><div class='add'>+	u64_stats_t		rx_drops;</div><div class='add'>+	u64_stats_t		tx_drops;</div><div class='ctx'> 	struct u64_stats_sync	syncp;</div><div class='ctx'> } __aligned(8 * sizeof(u64));</div><div class='ctx'> </div><div class='hunk'>@@ -2776,6 +3021,56 @@ static inline void dev_lstats_add(struct net_device *dev, unsigned int len)</div><div class='ctx'> 	u64_stats_update_end(&amp;lstats-&gt;syncp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void dev_dstats_rx_add(struct net_device *dev,</div><div class='add'>+				     unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct pcpu_dstats *dstats = this_cpu_ptr(dev-&gt;dstats);</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;dstats-&gt;syncp);</div><div class='add'>+	u64_stats_inc(&amp;dstats-&gt;rx_packets);</div><div class='add'>+	u64_stats_add(&amp;dstats-&gt;rx_bytes, len);</div><div class='add'>+	u64_stats_update_end(&amp;dstats-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_dstats_rx_dropped(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pcpu_dstats *dstats = this_cpu_ptr(dev-&gt;dstats);</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;dstats-&gt;syncp);</div><div class='add'>+	u64_stats_inc(&amp;dstats-&gt;rx_drops);</div><div class='add'>+	u64_stats_update_end(&amp;dstats-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_dstats_rx_dropped_add(struct net_device *dev,</div><div class='add'>+					     unsigned int packets)</div><div class='add'>+{</div><div class='add'>+	struct pcpu_dstats *dstats = this_cpu_ptr(dev-&gt;dstats);</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;dstats-&gt;syncp);</div><div class='add'>+	u64_stats_add(&amp;dstats-&gt;rx_drops, packets);</div><div class='add'>+	u64_stats_update_end(&amp;dstats-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_dstats_tx_add(struct net_device *dev,</div><div class='add'>+				     unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct pcpu_dstats *dstats = this_cpu_ptr(dev-&gt;dstats);</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;dstats-&gt;syncp);</div><div class='add'>+	u64_stats_inc(&amp;dstats-&gt;tx_packets);</div><div class='add'>+	u64_stats_add(&amp;dstats-&gt;tx_bytes, len);</div><div class='add'>+	u64_stats_update_end(&amp;dstats-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dev_dstats_tx_dropped(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pcpu_dstats *dstats = this_cpu_ptr(dev-&gt;dstats);</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;dstats-&gt;syncp);</div><div class='add'>+	u64_stats_inc(&amp;dstats-&gt;tx_drops);</div><div class='add'>+	u64_stats_update_end(&amp;dstats-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define __netdev_alloc_pcpu_stats(type, gfp)				\</div><div class='ctx'> ({									\</div><div class='ctx'> 	typeof(type) __percpu *pcpu_stats = alloc_percpu_gfp(type, gfp);\</div><div class='hunk'>@@ -3012,12 +3307,13 @@ int call_netdevice_notifiers_info(unsigned long val,</div><div class='ctx'> #define for_each_netdev_continue_rcu(net, d)		\</div><div class='ctx'> 	list_for_each_entry_continue_rcu(d, &amp;(net)-&gt;dev_base_head, dev_list)</div><div class='ctx'> #define for_each_netdev_in_bond_rcu(bond, slave)	\</div><div class='del'>-		for_each_netdev_rcu(&amp;init_net, slave)	\</div><div class='add'>+		for_each_netdev_rcu(dev_net_rcu(bond), slave)	\</div><div class='ctx'> 			if (netdev_master_upper_dev_get_rcu(slave) == (bond))</div><div class='ctx'> #define net_device_entry(lh)	list_entry(lh, struct net_device, dev_list)</div><div class='ctx'> </div><div class='ctx'> #define for_each_netdev_dump(net, d, ifindex)				\</div><div class='del'>-	xa_for_each_start(&amp;(net)-&gt;dev_by_index, (ifindex), (d), (ifindex))</div><div class='add'>+	for (; (d = xa_find(&amp;(net)-&gt;dev_by_index, &amp;ifindex,		\</div><div class='add'>+			    ULONG_MAX, XA_PRESENT)); ifindex++)</div><div class='ctx'> </div><div class='ctx'> static inline struct net_device *next_net_device(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -3045,14 +3341,9 @@ static inline struct net_device *first_net_device(struct net *net)</div><div class='ctx'> 		net_device_entry(net-&gt;dev_base_head.next);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct net_device *first_net_device_rcu(struct net *net)</div><div class='del'>-{</div><div class='del'>-	struct list_head *lh = rcu_dereference(list_next_rcu(&amp;net-&gt;dev_base_head));</div><div class='del'>-</div><div class='del'>-	return lh == &amp;net-&gt;dev_base_head ? NULL : net_device_entry(lh);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int netdev_boot_setup_check(struct net_device *dev);</div><div class='add'>+struct net_device *dev_getbyhwaddr(struct net *net, unsigned short type,</div><div class='add'>+				   const char *hwaddr);</div><div class='ctx'> struct net_device *dev_getbyhwaddr_rcu(struct net *net, unsigned short type,</div><div class='ctx'> 				       const char *hwaddr);</div><div class='ctx'> struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type);</div><div class='hunk'>@@ -3066,22 +3357,21 @@ int dev_get_iflink(const struct net_device *dev);</div><div class='ctx'> int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb);</div><div class='ctx'> int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,</div><div class='ctx'> 			  struct net_device_path_stack *stack);</div><div class='del'>-struct net_device *__dev_get_by_flags(struct net *net, unsigned short flags,</div><div class='del'>-				      unsigned short mask);</div><div class='ctx'> struct net_device *dev_get_by_name(struct net *net, const char *name);</div><div class='ctx'> struct net_device *dev_get_by_name_rcu(struct net *net, const char *name);</div><div class='ctx'> struct net_device *__dev_get_by_name(struct net *net, const char *name);</div><div class='ctx'> bool netdev_name_in_use(struct net *net, const char *name);</div><div class='ctx'> int dev_alloc_name(struct net_device *dev, const char *name);</div><div class='add'>+int netif_open(struct net_device *dev, struct netlink_ext_ack *extack);</div><div class='ctx'> int dev_open(struct net_device *dev, struct netlink_ext_ack *extack);</div><div class='add'>+void netif_close(struct net_device *dev);</div><div class='ctx'> void dev_close(struct net_device *dev);</div><div class='del'>-void dev_close_many(struct list_head *head, bool unlink);</div><div class='add'>+void netif_close_many(struct list_head *head, bool unlink);</div><div class='add'>+void netif_disable_lro(struct net_device *dev);</div><div class='ctx'> void dev_disable_lro(struct net_device *dev);</div><div class='ctx'> int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *newskb);</div><div class='ctx'> u16 dev_pick_tx_zero(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 		     struct net_device *sb_dev);</div><div class='del'>-u16 dev_pick_tx_cpu_id(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-		       struct net_device *sb_dev);</div><div class='ctx'> </div><div class='ctx'> int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev);</div><div class='ctx'> int __dev_direct_xmit(struct sk_buff *skb, u16 queue_id);</div><div class='hunk'>@@ -3117,8 +3407,6 @@ static inline void unregister_netdevice(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> int netdev_refcnt_read(const struct net_device *dev);</div><div class='ctx'> void free_netdev(struct net_device *dev);</div><div class='del'>-void netdev_freemem(struct net_device *dev);</div><div class='del'>-void init_dummy_netdev(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> struct net_device *netdev_get_xmit_slave(struct net_device *dev,</div><div class='ctx'> 					 struct sk_buff *skb,</div><div class='hunk'>@@ -3129,10 +3417,13 @@ struct net_device *dev_get_by_index(struct net *net, int ifindex);</div><div class='ctx'> struct net_device *__dev_get_by_index(struct net *net, int ifindex);</div><div class='ctx'> struct net_device *netdev_get_by_index(struct net *net, int ifindex,</div><div class='ctx'> 				       netdevice_tracker *tracker, gfp_t gfp);</div><div class='add'>+struct net_device *netdev_get_by_index_lock(struct net *net, int ifindex);</div><div class='ctx'> struct net_device *netdev_get_by_name(struct net *net, const char *name,</div><div class='ctx'> 				      netdevice_tracker *tracker, gfp_t gfp);</div><div class='add'>+struct net_device *netdev_get_by_flags_rcu(struct net *net, netdevice_tracker *tracker,</div><div class='add'>+					   unsigned short flags, unsigned short mask);</div><div class='ctx'> struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);</div><div class='del'>-struct net_device *dev_get_by_napi_id(unsigned int napi_id);</div><div class='add'>+void netdev_copy_name(struct net_device *dev, char *name);</div><div class='ctx'> </div><div class='ctx'> static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 				  unsigned short type,</div><div class='hunk'>@@ -3189,12 +3480,39 @@ static inline bool dev_has_header(const struct net_device *dev)</div><div class='ctx'> 	return dev-&gt;header_ops &amp;&amp; dev-&gt;header_ops-&gt;create;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct numa_drop_counters {</div><div class='add'>+	atomic_t	drops0 ____cacheline_aligned_in_smp;</div><div class='add'>+	atomic_t	drops1 ____cacheline_aligned_in_smp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int numa_drop_read(const struct numa_drop_counters *ndc)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;ndc-&gt;drops0) + atomic_read(&amp;ndc-&gt;drops1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void numa_drop_add(struct numa_drop_counters *ndc, int val)</div><div class='add'>+{</div><div class='add'>+	int n = numa_node_id() % 2;</div><div class='add'>+</div><div class='add'>+	if (n)</div><div class='add'>+		atomic_add(val, &amp;ndc-&gt;drops1);</div><div class='add'>+	else</div><div class='add'>+		atomic_add(val, &amp;ndc-&gt;drops0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void numa_drop_reset(struct numa_drop_counters *ndc)</div><div class='add'>+{</div><div class='add'>+	atomic_set(&amp;ndc-&gt;drops0, 0);</div><div class='add'>+	atomic_set(&amp;ndc-&gt;drops1, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Incoming packets are placed on per-CPU queues</div><div class='ctx'>  */</div><div class='ctx'> struct softnet_data {</div><div class='ctx'> 	struct list_head	poll_list;</div><div class='ctx'> 	struct sk_buff_head	process_queue;</div><div class='add'>+	local_lock_t		process_queue_bh_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* stats */</div><div class='ctx'> 	unsigned int		processed;</div><div class='hunk'>@@ -3203,6 +3521,7 @@ struct softnet_data {</div><div class='ctx'> 	struct softnet_data	*rps_ipi_list;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	unsigned int		received_rps;</div><div class='ctx'> 	bool			in_net_rx_action;</div><div class='ctx'> 	bool			in_napi_threaded_poll;</div><div class='ctx'> </div><div class='hunk'>@@ -3216,13 +3535,7 @@ struct softnet_data {</div><div class='ctx'> 	struct sk_buff_head	xfrm_backlog;</div><div class='ctx'> #endif</div><div class='ctx'> 	/* written and read only by owning cpu: */</div><div class='del'>-	struct {</div><div class='del'>-		u16 recursion;</div><div class='del'>-		u8  more;</div><div class='del'>-#ifdef CONFIG_NET_EGRESS</div><div class='del'>-		u8  skip_txqueue;</div><div class='del'>-#endif</div><div class='del'>-	} xmit;</div><div class='add'>+	struct netdev_xmit xmit;</div><div class='ctx'> #ifdef CONFIG_RPS</div><div class='ctx'> 	/* input_queue_head should be written by cpu owning this struct,</div><div class='ctx'> 	 * and only read by other cpus. Worth using a cache line.</div><div class='hunk'>@@ -3233,59 +3546,45 @@ struct softnet_data {</div><div class='ctx'> 	call_single_data_t	csd ____cacheline_aligned_in_smp;</div><div class='ctx'> 	struct softnet_data	*rps_ipi_next;</div><div class='ctx'> 	unsigned int		cpu;</div><div class='add'>+</div><div class='add'>+	/* We force a cacheline alignment from here, to hold together</div><div class='add'>+	 * input_queue_tail, input_pkt_queue and backlog.state.</div><div class='add'>+	 * We add holes so that backlog.state is the last field</div><div class='add'>+	 * of this cache line.</div><div class='add'>+	 */</div><div class='add'>+	long			pad[3] ____cacheline_aligned_in_smp;</div><div class='ctx'> 	unsigned int		input_queue_tail;</div><div class='ctx'> #endif</div><div class='del'>-	unsigned int		received_rps;</div><div class='del'>-	unsigned int		dropped;</div><div class='ctx'> 	struct sk_buff_head	input_pkt_queue;</div><div class='add'>+</div><div class='ctx'> 	struct napi_struct	backlog;</div><div class='ctx'> </div><div class='del'>-	/* Another possibly contended cache line */</div><div class='del'>-	spinlock_t		defer_lock ____cacheline_aligned_in_smp;</div><div class='del'>-	int			defer_count;</div><div class='del'>-	int			defer_ipi_scheduled;</div><div class='del'>-	struct sk_buff		*defer_list;</div><div class='add'>+	struct numa_drop_counters drop_counters;</div><div class='add'>+</div><div class='add'>+	int			defer_ipi_scheduled ____cacheline_aligned_in_smp;</div><div class='ctx'> 	call_single_data_t	defer_csd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void input_queue_head_incr(struct softnet_data *sd)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_RPS</div><div class='del'>-	sd-&gt;input_queue_head++;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void input_queue_tail_incr_save(struct softnet_data *sd,</div><div class='del'>-					      unsigned int *qtail)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_RPS</div><div class='del'>-	*qtail = ++sd-&gt;input_queue_tail;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> DECLARE_PER_CPU_ALIGNED(struct softnet_data, softnet_data);</div><div class='ctx'> </div><div class='add'>+struct page_pool_bh {</div><div class='add'>+	struct page_pool *pool;</div><div class='add'>+	local_lock_t bh_lock;</div><div class='add'>+};</div><div class='add'>+DECLARE_PER_CPU(struct page_pool_bh, system_page_pool);</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PREEMPT_RT</div><div class='ctx'> static inline int dev_recursion_level(void)</div><div class='ctx'> {</div><div class='ctx'> 	return this_cpu_read(softnet_data.xmit.recursion);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#define XMIT_RECURSION_LIMIT	8</div><div class='del'>-static inline bool dev_xmit_recursion(void)</div><div class='del'>-{</div><div class='del'>-	return unlikely(__this_cpu_read(softnet_data.xmit.recursion) &gt;</div><div class='del'>-			XMIT_RECURSION_LIMIT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dev_xmit_recursion_inc(void)</div><div class='add'>+#else</div><div class='add'>+static inline int dev_recursion_level(void)</div><div class='ctx'> {</div><div class='del'>-	__this_cpu_inc(softnet_data.xmit.recursion);</div><div class='add'>+	return current-&gt;net_xmit.recursion;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void dev_xmit_recursion_dec(void)</div><div class='del'>-{</div><div class='del'>-	__this_cpu_dec(softnet_data.xmit.recursion);</div><div class='del'>-}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void __netif_schedule(struct Qdisc *q);</div><div class='ctx'> void netif_schedule_queue(struct netdev_queue *txq);</div><div class='hunk'>@@ -3350,6 +3649,12 @@ static inline void netif_tx_wake_all_queues(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static __always_inline void netif_tx_stop_queue(struct netdev_queue *dev_queue)</div><div class='ctx'> {</div><div class='add'>+	/* Paired with READ_ONCE() from dev_watchdog() */</div><div class='add'>+	WRITE_ONCE(dev_queue-&gt;trans_start, jiffies);</div><div class='add'>+</div><div class='add'>+	/* This barrier is paired with smp_mb() from dev_watchdog() */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+</div><div class='ctx'> 	/* Must be an atomic op see netif_txq_try_stop() */</div><div class='ctx'> 	set_bit(__QUEUE_STATE_DRV_XOFF, &amp;dev_queue-&gt;state);</div><div class='ctx'> }</div><div class='hunk'>@@ -3476,6 +3781,12 @@ static inline void netdev_tx_sent_queue(struct netdev_queue *dev_queue,</div><div class='ctx'> 	if (likely(dql_avail(&amp;dev_queue-&gt;dql) &gt;= 0))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* Paired with READ_ONCE() from dev_watchdog() */</div><div class='add'>+	WRITE_ONCE(dev_queue-&gt;trans_start, jiffies);</div><div class='add'>+</div><div class='add'>+	/* This barrier is paired with smp_mb() from dev_watchdog() */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+</div><div class='ctx'> 	set_bit(__QUEUE_STATE_STACK_XOFF, &amp;dev_queue-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3483,7 +3794,7 @@ static inline void netdev_tx_sent_queue(struct netdev_queue *dev_queue,</div><div class='ctx'> 	 * because in netdev_tx_completed_queue we update the dql_completed</div><div class='ctx'> 	 * before checking the XOFF flag.</div><div class='ctx'> 	 */</div><div class='del'>-	smp_mb();</div><div class='add'>+	smp_mb__after_atomic();</div><div class='ctx'> </div><div class='ctx'> 	/* check again in case another CPU has just made room avail */</div><div class='ctx'> 	if (unlikely(dql_avail(&amp;dev_queue-&gt;dql) &gt;= 0))</div><div class='hunk'>@@ -3553,7 +3864,7 @@ static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue,</div><div class='ctx'> 	dql_completed(&amp;dev_queue-&gt;dql, bytes);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Without the memory barrier there is a small possiblity that</div><div class='add'>+	 * Without the memory barrier there is a small possibility that</div><div class='ctx'> 	 * netdev_tx_sent_queue will miss the update and cause the queue to</div><div class='ctx'> 	 * be stopped forever</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3592,6 +3903,17 @@ static inline void netdev_tx_reset_queue(struct netdev_queue *q)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * netdev_tx_reset_subqueue - reset the BQL stats and state of a netdev queue</div><div class='add'>+ * @dev: network device</div><div class='add'>+ * @qid: stack index of the queue to reset</div><div class='add'>+ */</div><div class='add'>+static inline void netdev_tx_reset_subqueue(const struct net_device *dev,</div><div class='add'>+					    u32 qid)</div><div class='add'>+{</div><div class='add'>+	netdev_tx_reset_queue(netdev_get_tx_queue(dev, qid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * 	netdev_reset_queue - reset the packets and bytes count of a network device</div><div class='ctx'>  * 	@dev_queue: network device</div><div class='ctx'>  *</div><div class='hunk'>@@ -3600,7 +3922,7 @@ static inline void netdev_tx_reset_queue(struct netdev_queue *q)</div><div class='ctx'>  */</div><div class='ctx'> static inline void netdev_reset_queue(struct net_device *dev_queue)</div><div class='ctx'> {</div><div class='del'>-	netdev_tx_reset_queue(netdev_get_tx_queue(dev_queue, 0));</div><div class='add'>+	netdev_tx_reset_subqueue(dev_queue, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3738,7 +4060,7 @@ static inline bool netif_attr_test_mask(unsigned long j,</div><div class='ctx'>  *	@online_mask: bitmask for CPUs/Rx queues that are online</div><div class='ctx'>  *	@nr_bits: number of bits in the bitmask</div><div class='ctx'>  *</div><div class='del'>- * Returns true if a CPU/Rx queue is online.</div><div class='add'>+ * Returns: true if a CPU/Rx queue is online.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool netif_attr_test_online(unsigned long j,</div><div class='ctx'> 					  const unsigned long *online_mask,</div><div class='hunk'>@@ -3758,7 +4080,8 @@ static inline bool netif_attr_test_online(unsigned long j,</div><div class='ctx'>  *	@srcp: the cpumask/Rx queue mask pointer</div><div class='ctx'>  *	@nr_bits: number of bits in the bitmask</div><div class='ctx'>  *</div><div class='del'>- * Returns &gt;= nr_bits if no further CPUs/Rx queues set.</div><div class='add'>+ * Returns: next (after n) CPU/Rx queue index in the mask;</div><div class='add'>+ * &gt;= nr_bits if no further CPUs/Rx queues set.</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned int netif_attrmask_next(int n, const unsigned long *srcp,</div><div class='ctx'> 					       unsigned int nr_bits)</div><div class='hunk'>@@ -3780,7 +4103,8 @@ static inline unsigned int netif_attrmask_next(int n, const unsigned long *srcp,</div><div class='ctx'>  *	@src2p: the second CPUs/Rx queues mask pointer</div><div class='ctx'>  *	@nr_bits: number of bits in the bitmask</div><div class='ctx'>  *</div><div class='del'>- * Returns &gt;= nr_bits if no further CPUs/Rx queues set in both.</div><div class='add'>+ * Returns: next (after n) CPU/Rx queue index set in both masks;</div><div class='add'>+ * &gt;= nr_bits if no further CPUs/Rx queues set in both.</div><div class='ctx'>  */</div><div class='ctx'> static inline int netif_attrmask_next_and(int n, const unsigned long *src1p,</div><div class='ctx'> 					  const unsigned long *src2p,</div><div class='hunk'>@@ -3827,17 +4151,7 @@ static inline bool netif_is_multiqueue(const struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSFS</div><div class='ctx'> int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq);</div><div class='del'>-#else</div><div class='del'>-static inline int netif_set_real_num_rx_queues(struct net_device *dev,</div><div class='del'>-						unsigned int rxqs)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;real_num_rx_queues = rxqs;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> int netif_set_real_num_queues(struct net_device *dev,</div><div class='ctx'> 			      unsigned int txq, unsigned int rxq);</div><div class='ctx'> </div><div class='hunk'>@@ -3886,9 +4200,9 @@ static inline void dev_consume_skb_any(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 bpf_prog_run_generic_xdp(struct sk_buff *skb, struct xdp_buff *xdp,</div><div class='del'>-			     struct bpf_prog *xdp_prog);</div><div class='del'>-void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog);</div><div class='del'>-int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff **pskb);</div><div class='add'>+			     const struct bpf_prog *xdp_prog);</div><div class='add'>+void generic_xdp_tx(struct sk_buff *skb, const struct bpf_prog *xdp_prog);</div><div class='add'>+int do_xdp_generic(const struct bpf_prog *xdp_prog, struct sk_buff **pskb);</div><div class='ctx'> int netif_rx(struct sk_buff *skb);</div><div class='ctx'> int __netif_rx(struct sk_buff *skb);</div><div class='ctx'> </div><div class='hunk'>@@ -3896,10 +4210,15 @@ int netif_receive_skb(struct sk_buff *skb);</div><div class='ctx'> int netif_receive_skb_core(struct sk_buff *skb);</div><div class='ctx'> void netif_receive_skb_list_internal(struct list_head *head);</div><div class='ctx'> void netif_receive_skb_list(struct list_head *head);</div><div class='del'>-gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb);</div><div class='del'>-void napi_gro_flush(struct napi_struct *napi, bool flush_old);</div><div class='add'>+gro_result_t gro_receive_skb(struct gro_node *gro, struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+static inline gro_result_t napi_gro_receive(struct napi_struct *napi,</div><div class='add'>+					    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return gro_receive_skb(&amp;napi-&gt;gro, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct sk_buff *napi_get_frags(struct napi_struct *napi);</div><div class='del'>-void napi_get_frags_check(struct napi_struct *napi);</div><div class='ctx'> gro_result_t napi_gro_frags(struct napi_struct *napi);</div><div class='ctx'> </div><div class='ctx'> static inline void napi_free_frags(struct napi_struct *napi)</div><div class='hunk'>@@ -3924,41 +4243,43 @@ int put_user_ifreq(struct ifreq *ifr, void __user *arg);</div><div class='ctx'> int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr,</div><div class='ctx'> 		void __user *data, bool *need_copyout);</div><div class='ctx'> int dev_ifconf(struct net *net, struct ifconf __user *ifc);</div><div class='add'>+int dev_eth_ioctl(struct net_device *dev,</div><div class='add'>+		  struct ifreq *ifr, unsigned int cmd);</div><div class='ctx'> int generic_hwtstamp_get_lower(struct net_device *dev,</div><div class='ctx'> 			       struct kernel_hwtstamp_config *kernel_cfg);</div><div class='ctx'> int generic_hwtstamp_set_lower(struct net_device *dev,</div><div class='ctx'> 			       struct kernel_hwtstamp_config *kernel_cfg,</div><div class='ctx'> 			       struct netlink_ext_ack *extack);</div><div class='del'>-int dev_set_hwtstamp_phylib(struct net_device *dev,</div><div class='del'>-			    struct kernel_hwtstamp_config *cfg,</div><div class='del'>-			    struct netlink_ext_ack *extack);</div><div class='ctx'> int dev_ethtool(struct net *net, struct ifreq *ifr, void __user *userdata);</div><div class='del'>-unsigned int dev_get_flags(const struct net_device *);</div><div class='add'>+unsigned int netif_get_flags(const struct net_device *dev);</div><div class='ctx'> int __dev_change_flags(struct net_device *dev, unsigned int flags,</div><div class='ctx'> 		       struct netlink_ext_ack *extack);</div><div class='add'>+int netif_change_flags(struct net_device *dev, unsigned int flags,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='ctx'> int dev_change_flags(struct net_device *dev, unsigned int flags,</div><div class='ctx'> 		     struct netlink_ext_ack *extack);</div><div class='add'>+int netif_set_alias(struct net_device *dev, const char *alias, size_t len);</div><div class='ctx'> int dev_set_alias(struct net_device *, const char *, size_t);</div><div class='ctx'> int dev_get_alias(const struct net_device *, char *, size_t);</div><div class='ctx'> int __dev_change_net_namespace(struct net_device *dev, struct net *net,</div><div class='del'>-			       const char *pat, int new_ifindex);</div><div class='del'>-static inline</div><div class='add'>+			       const char *pat, int new_ifindex,</div><div class='add'>+			       struct netlink_ext_ack *extack);</div><div class='ctx'> int dev_change_net_namespace(struct net_device *dev, struct net *net,</div><div class='del'>-			     const char *pat)</div><div class='del'>-{</div><div class='del'>-	return __dev_change_net_namespace(dev, net, pat, 0);</div><div class='del'>-}</div><div class='del'>-int __dev_set_mtu(struct net_device *, int);</div><div class='add'>+			     const char *pat);</div><div class='add'>+int __netif_set_mtu(struct net_device *dev, int new_mtu);</div><div class='add'>+int netif_set_mtu(struct net_device *dev, int new_mtu);</div><div class='ctx'> int dev_set_mtu(struct net_device *, int);</div><div class='del'>-int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr,</div><div class='del'>-			      struct netlink_ext_ack *extack);</div><div class='del'>-int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa,</div><div class='add'>+int netif_pre_changeaddr_notify(struct net_device *dev, const char *addr,</div><div class='add'>+				struct netlink_ext_ack *extack);</div><div class='add'>+int netif_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,</div><div class='add'>+			  struct netlink_ext_ack *extack);</div><div class='add'>+int dev_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,</div><div class='ctx'> 			struct netlink_ext_ack *extack);</div><div class='del'>-int dev_set_mac_address_user(struct net_device *dev, struct sockaddr *sa,</div><div class='add'>+int dev_set_mac_address_user(struct net_device *dev, struct sockaddr_storage *ss,</div><div class='ctx'> 			     struct netlink_ext_ack *extack);</div><div class='del'>-int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name);</div><div class='del'>-int dev_get_port_parent_id(struct net_device *dev,</div><div class='del'>-			   struct netdev_phys_item_id *ppid, bool recurse);</div><div class='add'>+int netif_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name);</div><div class='add'>+int netif_get_port_parent_id(struct net_device *dev,</div><div class='add'>+			     struct netdev_phys_item_id *ppid, bool recurse);</div><div class='ctx'> bool netdev_port_same_parent_id(struct net_device *a, struct net_device *b);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev, bool *again);</div><div class='hunk'>@@ -3967,8 +4288,13 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);</div><div class='ctx'> u8 dev_xdp_prog_count(struct net_device *dev);</div><div class='add'>+int netif_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf);</div><div class='add'>+int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf);</div><div class='add'>+u8 dev_xdp_sb_prog_count(struct net_device *dev);</div><div class='ctx'> u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode);</div><div class='ctx'> </div><div class='add'>+u32 dev_get_min_mp_channel_count(const struct net_device *dev);</div><div class='add'>+</div><div class='ctx'> int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb);</div><div class='ctx'> int dev_forward_skb(struct net_device *dev, struct sk_buff *skb);</div><div class='ctx'> int dev_forward_skb_nomtu(struct net_device *dev, struct sk_buff *skb);</div><div class='hunk'>@@ -4031,7 +4357,17 @@ static __always_inline int ____dev_forward_skb(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool dev_nit_active(struct net_device *dev);</div><div class='add'>+bool dev_nit_active_rcu(const struct net_device *dev);</div><div class='add'>+static inline bool dev_nit_active(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ret = dev_nit_active_rcu(dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> static inline void __dev_put(struct net_device *dev)</div><div class='hunk'>@@ -4127,6 +4463,8 @@ static inline void dev_put(struct net_device *dev)</div><div class='ctx'> 	netdev_put(dev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_FREE(dev_put, struct net_device *, if (_T) dev_put(_T))</div><div class='add'>+</div><div class='ctx'> static inline void netdev_ref_replace(struct net_device *odev,</div><div class='ctx'> 				      struct net_device *ndev,</div><div class='ctx'> 				      netdevice_tracker *tracker,</div><div class='hunk'>@@ -4160,6 +4498,7 @@ void linkwatch_fire_event(struct net_device *dev);</div><div class='ctx'>  * pending work list (if queued).</div><div class='ctx'>  */</div><div class='ctx'> void linkwatch_sync_dev(struct net_device *dev);</div><div class='add'>+void __linkwatch_sync_dev(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	netif_carrier_ok - test if carrier present</div><div class='hunk'>@@ -4174,7 +4513,7 @@ static inline bool netif_carrier_ok(const struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> unsigned long dev_trans_start(struct net_device *dev);</div><div class='ctx'> </div><div class='del'>-void __netdev_watchdog_up(struct net_device *dev);</div><div class='add'>+void netdev_watchdog_up(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> void netif_carrier_on(struct net_device *dev);</div><div class='ctx'> void netif_carrier_off(struct net_device *dev);</div><div class='hunk'>@@ -4419,9 +4758,10 @@ static inline void __netif_tx_unlock_bh(struct netdev_queue *txq)</div><div class='ctx'> /*</div><div class='ctx'>  * txq-&gt;trans_start can be read locklessly from dev_watchdog()</div><div class='ctx'>  */</div><div class='del'>-static inline void txq_trans_update(struct netdev_queue *txq)</div><div class='add'>+static inline void txq_trans_update(const struct net_device *dev,</div><div class='add'>+				    struct netdev_queue *txq)</div><div class='ctx'> {</div><div class='del'>-	if (txq-&gt;xmit_lock_owner != -1)</div><div class='add'>+	if (!dev-&gt;lltx)</div><div class='ctx'> 		WRITE_ONCE(txq-&gt;trans_start, jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4464,7 +4804,7 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define HARD_TX_LOCK(dev, txq, cpu) {			\</div><div class='del'>-	if ((dev-&gt;features &amp; NETIF_F_LLTX) == 0) {	\</div><div class='add'>+	if (!(dev)-&gt;lltx) {				\</div><div class='ctx'> 		__netif_tx_lock(txq, cpu);		\</div><div class='ctx'> 	} else {					\</div><div class='ctx'> 		__netif_tx_acquire(txq);		\</div><div class='hunk'>@@ -4472,12 +4812,12 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define HARD_TX_TRYLOCK(dev, txq)			\</div><div class='del'>-	(((dev-&gt;features &amp; NETIF_F_LLTX) == 0) ?	\</div><div class='add'>+	(!(dev)-&gt;lltx ?					\</div><div class='ctx'> 		__netif_tx_trylock(txq) :		\</div><div class='ctx'> 		__netif_tx_acquire(txq))</div><div class='ctx'> </div><div class='ctx'> #define HARD_TX_UNLOCK(dev, txq) {			\</div><div class='del'>-	if ((dev-&gt;features &amp; NETIF_F_LLTX) == 0) {	\</div><div class='add'>+	if (!(dev)-&gt;lltx) {				\</div><div class='ctx'> 		__netif_tx_unlock(txq);			\</div><div class='ctx'> 	} else {					\</div><div class='ctx'> 		__netif_tx_release(txq);		\</div><div class='hunk'>@@ -4545,6 +4885,9 @@ static inline void netif_addr_unlock_bh(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> void ether_setup(struct net_device *dev);</div><div class='ctx'> </div><div class='add'>+/* Allocate dummy net_device */</div><div class='add'>+struct net_device *alloc_netdev_dummy(int sizeof_priv);</div><div class='add'>+</div><div class='ctx'> /* Support for loadable net-drivers */</div><div class='ctx'> struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,</div><div class='ctx'> 				    unsigned char name_assign_type,</div><div class='hunk'>@@ -4565,6 +4908,9 @@ int devm_register_netdev(struct device *dev, struct net_device *ndev);</div><div class='ctx'> /* General hardware address lists handling functions */</div><div class='ctx'> int __hw_addr_sync(struct netdev_hw_addr_list *to_list,</div><div class='ctx'> 		   struct netdev_hw_addr_list *from_list, int addr_len);</div><div class='add'>+int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list,</div><div class='add'>+			    struct netdev_hw_addr_list *from_list,</div><div class='add'>+			    int addr_len);</div><div class='ctx'> void __hw_addr_unsync(struct netdev_hw_addr_list *to_list,</div><div class='ctx'> 		      struct netdev_hw_addr_list *from_list, int addr_len);</div><div class='ctx'> int __hw_addr_sync_dev(struct netdev_hw_addr_list *list,</div><div class='hunk'>@@ -4619,7 +4965,7 @@ void dev_uc_flush(struct net_device *dev);</div><div class='ctx'> void dev_uc_init(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  __dev_uc_sync - Synchonize device's unicast list</div><div class='add'>+ *  __dev_uc_sync - Synchronize device's unicast list</div><div class='ctx'>  *  @dev:  device to sync</div><div class='ctx'>  *  @sync: function to call if address should be added</div><div class='ctx'>  *  @unsync: function to call if address should be removed</div><div class='hunk'>@@ -4663,7 +5009,7 @@ void dev_mc_flush(struct net_device *dev);</div><div class='ctx'> void dev_mc_init(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  __dev_mc_sync - Synchonize device's multicast list</div><div class='add'>+ *  __dev_mc_sync - Synchronize device's multicast list</div><div class='ctx'>  *  @dev:  device to sync</div><div class='ctx'>  *  @sync: function to call if address should be added</div><div class='ctx'>  *  @unsync: function to call if address should be removed</div><div class='hunk'>@@ -4696,8 +5042,11 @@ static inline void __dev_mc_unsync(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> /* Functions used for secondary unicast and multicast support */</div><div class='ctx'> void dev_set_rx_mode(struct net_device *dev);</div><div class='add'>+int netif_set_promiscuity(struct net_device *dev, int inc);</div><div class='ctx'> int dev_set_promiscuity(struct net_device *dev, int inc);</div><div class='add'>+int netif_set_allmulti(struct net_device *dev, int inc, bool notify);</div><div class='ctx'> int dev_set_allmulti(struct net_device *dev, int inc);</div><div class='add'>+void netif_state_change(struct net_device *dev);</div><div class='ctx'> void netdev_state_change(struct net_device *dev);</div><div class='ctx'> void __netdev_notify_peers(struct net_device *dev);</div><div class='ctx'> void netdev_notify_peers(struct net_device *dev);</div><div class='hunk'>@@ -4838,10 +5187,9 @@ void netdev_bonding_info_change(struct net_device *dev,</div><div class='ctx'> 				struct netdev_bonding_info *bonding_info);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_ETHTOOL_NETLINK)</div><div class='del'>-void ethtool_notify(struct net_device *dev, unsigned int cmd, const void *data);</div><div class='add'>+void ethtool_notify(struct net_device *dev, unsigned int cmd);</div><div class='ctx'> #else</div><div class='del'>-static inline void ethtool_notify(struct net_device *dev, unsigned int cmd,</div><div class='del'>-				  const void *data)</div><div class='add'>+static inline void ethtool_notify(struct net_device *dev, unsigned int cmd)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -4895,18 +5243,35 @@ static inline ktime_t netdev_get_tstamp(struct net_device *dev,</div><div class='ctx'> 	return hwtstamps-&gt;hwtstamp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline netdev_tx_t __netdev_start_xmit(const struct net_device_ops *ops,</div><div class='del'>-					      struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-					      bool more)</div><div class='add'>+#ifndef CONFIG_PREEMPT_RT</div><div class='add'>+static inline void netdev_xmit_set_more(bool more)</div><div class='ctx'> {</div><div class='ctx'> 	__this_cpu_write(softnet_data.xmit.more, more);</div><div class='del'>-	return ops-&gt;ndo_start_xmit(skb, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool netdev_xmit_more(void)</div><div class='ctx'> {</div><div class='ctx'> 	return __this_cpu_read(softnet_data.xmit.more);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+static inline void netdev_xmit_set_more(bool more)</div><div class='add'>+{</div><div class='add'>+	current-&gt;net_xmit.more = more;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool netdev_xmit_more(void)</div><div class='add'>+{</div><div class='add'>+	return current-&gt;net_xmit.more;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline netdev_tx_t __netdev_start_xmit(const struct net_device_ops *ops,</div><div class='add'>+					      struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+					      bool more)</div><div class='add'>+{</div><div class='add'>+	netdev_xmit_set_more(more);</div><div class='add'>+	return ops-&gt;ndo_start_xmit(skb, dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline netdev_tx_t netdev_start_xmit(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 					    struct netdev_queue *txq, bool more)</div><div class='hunk'>@@ -4916,7 +5281,7 @@ static inline netdev_tx_t netdev_start_xmit(struct sk_buff *skb, struct net_devi</div><div class='ctx'> </div><div class='ctx'> 	rc = __netdev_start_xmit(ops, skb, dev, more);</div><div class='ctx'> 	if (rc == NETDEV_TX_OK)</div><div class='del'>-		txq_trans_update(txq);</div><div class='add'>+		txq_trans_update(dev, txq);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -4964,6 +5329,7 @@ static inline netdev_features_t netdev_add_tso_features(netdev_features_t featur</div><div class='ctx'> int __netdev_update_features(struct net_device *dev);</div><div class='ctx'> void netdev_update_features(struct net_device *dev);</div><div class='ctx'> void netdev_change_features(struct net_device *dev);</div><div class='add'>+void netdev_compute_master_upper_features(struct net_device *dev, bool update_header);</div><div class='ctx'> </div><div class='ctx'> void netif_stacked_transfer_operstate(const struct net_device *rootdev,</div><div class='ctx'> 					struct net_device *dev);</div><div class='hunk'>@@ -4976,13 +5342,18 @@ void skb_warn_bad_offload(const struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> static inline bool net_gso_ok(netdev_features_t features, int gso_type)</div><div class='ctx'> {</div><div class='del'>-	netdev_features_t feature = (netdev_features_t)gso_type &lt;&lt; NETIF_F_GSO_SHIFT;</div><div class='add'>+	netdev_features_t feature;</div><div class='add'>+</div><div class='add'>+	if (gso_type &amp; (SKB_GSO_TCP_FIXEDID | SKB_GSO_TCP_FIXEDID_INNER))</div><div class='add'>+		gso_type |= __SKB_GSO_TCP_FIXEDID;</div><div class='add'>+</div><div class='add'>+	feature = ((netdev_features_t)gso_type &lt;&lt; NETIF_F_GSO_SHIFT) &amp; NETIF_F_GSO_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* check flags correspondence */</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_TCPV4   != (NETIF_F_TSO &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_DODGY   != (NETIF_F_GSO_ROBUST &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_TCP_ECN != (NETIF_F_TSO_ECN &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='del'>-	BUILD_BUG_ON(SKB_GSO_TCP_FIXEDID != (NETIF_F_TSO_MANGLEID &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='add'>+	BUILD_BUG_ON(__SKB_GSO_TCP_FIXEDID != (NETIF_F_TSO_MANGLEID &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_TCPV6   != (NETIF_F_TSO6 &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_FCOE    != (NETIF_F_FSO &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_GRE     != (NETIF_F_GSO_GRE &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='hunk'>@@ -4998,6 +5369,8 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type)</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_UDP != (NETIF_F_GSO_UDP &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_UDP_L4 != (NETIF_F_GSO_UDP_L4 &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='ctx'> 	BUILD_BUG_ON(SKB_GSO_FRAGLIST != (NETIF_F_GSO_FRAGLIST &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='add'>+	BUILD_BUG_ON(SKB_GSO_TCP_ACCECN !=</div><div class='add'>+		     (NETIF_F_GSO_ACCECN &gt;&gt; NETIF_F_GSO_SHIFT));</div><div class='ctx'> </div><div class='ctx'> 	return (features &amp; feature) == feature;</div><div class='ctx'> }</div><div class='hunk'>@@ -5021,6 +5394,24 @@ void netif_set_tso_max_segs(struct net_device *dev, unsigned int segs);</div><div class='ctx'> void netif_inherit_tso_max(struct net_device *to,</div><div class='ctx'> 			   const struct net_device *from);</div><div class='ctx'> </div><div class='add'>+static inline unsigned int</div><div class='add'>+netif_get_gro_max_size(const struct net_device *dev, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* pairs with WRITE_ONCE() in netif_set_gro(_ipv4)_max_size() */</div><div class='add'>+	return skb-&gt;protocol == htons(ETH_P_IPV6) ?</div><div class='add'>+	       READ_ONCE(dev-&gt;gro_max_size) :</div><div class='add'>+	       READ_ONCE(dev-&gt;gro_ipv4_max_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+netif_get_gso_max_size(const struct net_device *dev, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* pairs with WRITE_ONCE() in netif_set_gso(_ipv4)_max_size() */</div><div class='add'>+	return skb-&gt;protocol == htons(ETH_P_IPV6) ?</div><div class='add'>+	       READ_ONCE(dev-&gt;gso_max_size) :</div><div class='add'>+	       READ_ONCE(dev-&gt;gso_ipv4_max_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool netif_is_macsec(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dev-&gt;priv_flags &amp; IFF_MACSEC;</div><div class='head'>diff --git a/include/linux/netdevice_xmit.h b/include/linux/netdevice_xmit.h<br/>new file mode 100644<br/>index 000000000000..cc232508e695<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netdevice_xmit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netdevice_xmit.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef _LINUX_NETDEVICE_XMIT_H</div><div class='add'>+#define _LINUX_NETDEVICE_XMIT_H</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_ACT_MIRRED)</div><div class='add'>+#define MIRRED_NEST_LIMIT	4</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct net_device;</div><div class='add'>+</div><div class='add'>+struct netdev_xmit {</div><div class='add'>+	u16 recursion;</div><div class='add'>+	u8  more;</div><div class='add'>+#ifdef CONFIG_NET_EGRESS</div><div class='add'>+	u8  skip_txqueue;</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_ACT_MIRRED)</div><div class='add'>+	u8			sched_mirred_nest;</div><div class='add'>+	struct net_device	*sched_mirred_dev[MIRRED_NEST_LIMIT];</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_NF_DUP_NETDEV)</div><div class='add'>+	u8 nf_dup_skb_recursion;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h<br/>index 2683b2b77612..efbbfa770d66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netfilter.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfilter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netfilter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netfilter.h</a></div><div class='hunk'>@@ -92,9 +92,13 @@ enum nf_hook_ops_type {</div><div class='ctx'> 	NF_HOOK_OP_UNDEFINED,</div><div class='ctx'> 	NF_HOOK_OP_NF_TABLES,</div><div class='ctx'> 	NF_HOOK_OP_BPF,</div><div class='add'>+	NF_HOOK_OP_NFT_FT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nf_hook_ops {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	struct rcu_head		rcu;</div><div class='add'>+</div><div class='ctx'> 	/* User fills in from here down. */</div><div class='ctx'> 	nf_hookfn		*hook;</div><div class='ctx'> 	struct net_device	*dev;</div><div class='hunk'>@@ -376,15 +380,11 @@ int nf_route(struct net *net, struct dst_entry **dst, struct flowi *fl,</div><div class='ctx'> struct nf_conn;</div><div class='ctx'> enum nf_nat_manip_type;</div><div class='ctx'> struct nlattr;</div><div class='del'>-enum ip_conntrack_dir;</div><div class='ctx'> </div><div class='ctx'> struct nf_nat_hook {</div><div class='ctx'> 	int (*parse_nat_setup)(struct nf_conn *ct, enum nf_nat_manip_type manip,</div><div class='ctx'> 			       const struct nlattr *attr);</div><div class='ctx'> 	void (*decode_session)(struct sk_buff *skb, struct flowi *fl);</div><div class='del'>-	unsigned int (*manip_pkt)(struct sk_buff *skb, struct nf_conn *ct,</div><div class='del'>-				  enum nf_nat_manip_type mtype,</div><div class='del'>-				  enum ip_conntrack_dir dir);</div><div class='ctx'> 	void (*remove_nat_bysrc)(struct nf_conn *ct);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -474,6 +474,7 @@ struct nf_ct_hook {</div><div class='ctx'> 	void (*attach)(struct sk_buff *nskb, const struct sk_buff *skb);</div><div class='ctx'> 	void (*set_closing)(struct nf_conntrack *nfct);</div><div class='ctx'> 	int (*confirm)(struct sk_buff *skb);</div><div class='add'>+	u32 (*get_id)(const struct nf_conntrack *nfct);</div><div class='ctx'> };</div><div class='ctx'> extern const struct nf_ct_hook __rcu *nf_ct_hook;</div><div class='ctx'> </div><div class='hunk'>@@ -502,17 +503,6 @@ extern const struct nf_defrag_hook __rcu *nf_defrag_v4_hook;</div><div class='ctx'> extern const struct nf_defrag_hook __rcu *nf_defrag_v6_hook;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * nf_skb_duplicated - TEE target has sent a packet</div><div class='del'>- *</div><div class='del'>- * When a xtables target sends a packet, the OUTPUT and POSTROUTING</div><div class='del'>- * hooks are traversed again, i.e. nft and xtables are invoked recursively.</div><div class='del'>- *</div><div class='del'>- * This is used by xtables TEE target to prevent the duplicated skb from</div><div class='del'>- * being duplicated again.</div><div class='del'>- */</div><div class='del'>-DECLARE_PER_CPU(bool, nf_skb_duplicated);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Contains bitmask of ctnetlink event subscribers, if any.</div><div class='ctx'>  * Can't be pernet due to NETLINK_LISTEN_ALL_NSID setsockopt flag.</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/netfilter/nf_conntrack_dccp.h b/include/linux/netfilter/nf_conntrack_dccp.h<br/>deleted file mode 100644<br/>index c509ed76e714..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netfilter/nf_conntrack_dccp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfilter/nf_conntrack_dccp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,38 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _NF_CONNTRACK_DCCP_H</div><div class='del'>-#define _NF_CONNTRACK_DCCP_H</div><div class='del'>-</div><div class='del'>-/* Exposed to userspace over nfnetlink */</div><div class='del'>-enum ct_dccp_states {</div><div class='del'>-	CT_DCCP_NONE,</div><div class='del'>-	CT_DCCP_REQUEST,</div><div class='del'>-	CT_DCCP_RESPOND,</div><div class='del'>-	CT_DCCP_PARTOPEN,</div><div class='del'>-	CT_DCCP_OPEN,</div><div class='del'>-	CT_DCCP_CLOSEREQ,</div><div class='del'>-	CT_DCCP_CLOSING,</div><div class='del'>-	CT_DCCP_TIMEWAIT,</div><div class='del'>-	CT_DCCP_IGNORE,</div><div class='del'>-	CT_DCCP_INVALID,</div><div class='del'>-	__CT_DCCP_MAX</div><div class='del'>-};</div><div class='del'>-#define CT_DCCP_MAX		(__CT_DCCP_MAX - 1)</div><div class='del'>-</div><div class='del'>-enum ct_dccp_roles {</div><div class='del'>-	CT_DCCP_ROLE_CLIENT,</div><div class='del'>-	CT_DCCP_ROLE_SERVER,</div><div class='del'>-	__CT_DCCP_ROLE_MAX</div><div class='del'>-};</div><div class='del'>-#define CT_DCCP_ROLE_MAX	(__CT_DCCP_ROLE_MAX - 1)</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netfilter/nf_conntrack_tuple_common.h&gt;</div><div class='del'>-</div><div class='del'>-struct nf_ct_dccp {</div><div class='del'>-	u_int8_t	role[IP_CT_DIR_MAX];</div><div class='del'>-	u_int8_t	state;</div><div class='del'>-	u_int8_t	last_pkt;</div><div class='del'>-	u_int8_t	last_dir;</div><div class='del'>-	u_int64_t	handshake_seq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _NF_CONNTRACK_DCCP_H */</div><div class='head'>diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h<br/>index 5897f3dbaf7c..77c778d84d4c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netfilter/x_tables.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfilter/x_tables.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netfilter/x_tables.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netfilter/x_tables.h</a></div><div class='hunk'>@@ -51,21 +51,11 @@ static inline struct net_device *xt_in(const struct xt_action_param *par)</div><div class='ctx'> 	return par-&gt;state-&gt;in;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const char *xt_inname(const struct xt_action_param *par)</div><div class='del'>-{</div><div class='del'>-	return par-&gt;state-&gt;in-&gt;name;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct net_device *xt_out(const struct xt_action_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	return par-&gt;state-&gt;out;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const char *xt_outname(const struct xt_action_param *par)</div><div class='del'>-{</div><div class='del'>-	return par-&gt;state-&gt;out-&gt;name;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned int xt_hooknum(const struct xt_action_param *par)</div><div class='ctx'> {</div><div class='ctx'> 	return par-&gt;state-&gt;hook;</div><div class='hunk'>@@ -357,7 +347,7 @@ extern struct static_key xt_tee_enabled;</div><div class='ctx'>  * Begin packet processing : all readers must wait the end</div><div class='ctx'>  * 1) Must be called with preemption disabled</div><div class='ctx'>  * 2) softirqs must be disabled too (or we should use this_cpu_add())</div><div class='del'>- * Returns :</div><div class='add'>+ * Returns:</div><div class='ctx'>  *  1 if no recursion on this cpu</div><div class='ctx'>  *  0 if recursion detected</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/netfilter_netdev.h b/include/linux/netfilter_netdev.h<br/>index 8676316547cc..3175073a66ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netfilter_netdev.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfilter_netdev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netfilter_netdev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netfilter_netdev.h</a></div><div class='hunk'>@@ -66,7 +66,6 @@ static inline bool nf_hook_egress_active(void)</div><div class='ctx'>  * @rc: result code which shall be returned by __dev_queue_xmit() on failure</div><div class='ctx'>  * @dev: netdev whose egress hooks shall be applied to @skb</div><div class='ctx'>  *</div><div class='del'>- * Returns @skb on success or %NULL if the packet was consumed or filtered.</div><div class='ctx'>  * Caller must hold rcu_read_lock.</div><div class='ctx'>  *</div><div class='ctx'>  * On ingress, packets are classified first by tc, then by netfilter.</div><div class='hunk'>@@ -81,6 +80,8 @@ static inline bool nf_hook_egress_active(void)</div><div class='ctx'>  * called recursively by tunnel drivers such as vxlan, the flag is reverted to</div><div class='ctx'>  * false after sch_handle_egress().  This ensures that netfilter is applied</div><div class='ctx'>  * both on the overlay and underlying network.</div><div class='add'>+ *</div><div class='add'>+ * Returns: @skb on success or %NULL if the packet was consumed or filtered.</div><div class='ctx'>  */</div><div class='ctx'> static inline struct sk_buff *nf_hook_egress(struct sk_buff *skb, int *rc,</div><div class='ctx'> 					     struct net_device *dev)</div><div class='head'>diff --git a/include/linux/netfs.h b/include/linux/netfs.h<br/>index 100cbb261269..72ee7d210a74 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netfs.h</a></div><div class='hunk'>@@ -18,113 +18,39 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/rolling_buffer.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum netfs_sreq_ref_trace;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overload PG_private_2 to give us PG_fscache - this is used to indicate that</div><div class='del'>- * a page is currently backed by a local disk cache</div><div class='del'>- */</div><div class='del'>-#define folio_test_fscache(folio)	folio_test_private_2(folio)</div><div class='del'>-#define PageFsCache(page)		PagePrivate2((page))</div><div class='del'>-#define SetPageFsCache(page)		SetPagePrivate2((page))</div><div class='del'>-#define ClearPageFsCache(page)		ClearPagePrivate2((page))</div><div class='del'>-#define TestSetPageFsCache(page)	TestSetPagePrivate2((page))</div><div class='del'>-#define TestClearPageFsCache(page)	TestClearPagePrivate2((page))</div><div class='add'>+typedef struct mempool mempool_t;</div><div class='add'>+struct folio_queue;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * folio_start_fscache - Start an fscache write on a folio.</div><div class='add'>+ * folio_start_private_2 - Start an fscache write on a folio.  [DEPRECATED]</div><div class='ctx'>  * @folio: The folio.</div><div class='ctx'>  *</div><div class='ctx'>  * Call this function before writing a folio to a local cache.  Starting a</div><div class='ctx'>  * second write before the first one finishes is not allowed.</div><div class='add'>+ *</div><div class='add'>+ * Note that this should no longer be used.</div><div class='ctx'>  */</div><div class='del'>-static inline void folio_start_fscache(struct folio *folio)</div><div class='add'>+static inline void folio_start_private_2(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON_FOLIO(folio_test_private_2(folio), folio);</div><div class='ctx'> 	folio_get(folio);</div><div class='ctx'> 	folio_set_private_2(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * folio_end_fscache - End an fscache write on a folio.</div><div class='del'>- * @folio: The folio.</div><div class='del'>- *</div><div class='del'>- * Call this function after the folio has been written to the local cache.</div><div class='del'>- * This will wake any sleepers waiting on this folio.</div><div class='del'>- */</div><div class='del'>-static inline void folio_end_fscache(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	folio_end_private_2(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * folio_wait_fscache - Wait for an fscache write on this folio to end.</div><div class='del'>- * @folio: The folio.</div><div class='del'>- *</div><div class='del'>- * If this folio is currently being written to a local cache, wait for</div><div class='del'>- * the write to finish.  Another write may start after this one finishes,</div><div class='del'>- * unless the caller holds the folio lock.</div><div class='del'>- */</div><div class='del'>-static inline void folio_wait_fscache(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	folio_wait_private_2(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * folio_wait_fscache_killable - Wait for an fscache write on this folio to end.</div><div class='del'>- * @folio: The folio.</div><div class='del'>- *</div><div class='del'>- * If this folio is currently being written to a local cache, wait</div><div class='del'>- * for the write to finish or for a fatal signal to be received.</div><div class='del'>- * Another write may start after this one finishes, unless the caller</div><div class='del'>- * holds the folio lock.</div><div class='del'>- *</div><div class='del'>- * Return:</div><div class='del'>- * - 0 if successful.</div><div class='del'>- * - -EINTR if a fatal signal was encountered.</div><div class='del'>- */</div><div class='del'>-static inline int folio_wait_fscache_killable(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return folio_wait_private_2_killable(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_page_fscache(struct page *page)</div><div class='del'>-{</div><div class='del'>-	folio_start_fscache(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void end_page_fscache(struct page *page)</div><div class='del'>-{</div><div class='del'>-	folio_end_private_2(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void wait_on_page_fscache(struct page *page)</div><div class='del'>-{</div><div class='del'>-	folio_wait_private_2(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int wait_on_page_fscache_killable(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_wait_private_2_killable(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Marks used on xarray-based buffers */</div><div class='del'>-#define NETFS_BUF_PUT_MARK	XA_MARK_0	/* - Page needs putting  */</div><div class='del'>-#define NETFS_BUF_PAGECACHE_MARK XA_MARK_1	/* - Page needs wb/dirty flag wrangling */</div><div class='del'>-</div><div class='ctx'> enum netfs_io_source {</div><div class='add'>+	NETFS_SOURCE_UNKNOWN,</div><div class='ctx'> 	NETFS_FILL_WITH_ZEROES,</div><div class='ctx'> 	NETFS_DOWNLOAD_FROM_SERVER,</div><div class='ctx'> 	NETFS_READ_FROM_CACHE,</div><div class='ctx'> 	NETFS_INVALID_READ,</div><div class='ctx'> 	NETFS_UPLOAD_TO_SERVER,</div><div class='ctx'> 	NETFS_WRITE_TO_CACHE,</div><div class='del'>-	NETFS_INVALID_WRITE,</div><div class='ctx'> } __mode(byte);</div><div class='ctx'> </div><div class='del'>-typedef void (*netfs_io_terminated_t)(void *priv, ssize_t transferred_or_error,</div><div class='del'>-				      bool was_async);</div><div class='add'>+typedef void (*netfs_io_terminated_t)(void *priv, ssize_t transferred_or_error);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Per-inode context.  This wraps the VFS inode.</div><div class='hunk'>@@ -135,14 +61,16 @@ struct netfs_inode {</div><div class='ctx'> #if IS_ENABLED(CONFIG_FSCACHE)</div><div class='ctx'> 	struct fscache_cookie	*cache;</div><div class='ctx'> #endif</div><div class='add'>+	struct mutex		wb_lock;	/* Writeback serialisation */</div><div class='ctx'> 	loff_t			remote_i_size;	/* Size of the remote file */</div><div class='ctx'> 	loff_t			zero_point;	/* Size after which we assume there's no data</div><div class='ctx'> 						 * on the server */</div><div class='add'>+	atomic_t		io_count;	/* Number of outstanding reqs */</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> #define NETFS_ICTX_ODIRECT	0		/* The file has DIO in progress */</div><div class='ctx'> #define NETFS_ICTX_UNBUFFERED	1		/* I/O should not use the pagecache */</div><div class='del'>-#define NETFS_ICTX_WRITETHROUGH	2		/* Write-through caching */</div><div class='del'>-#define NETFS_ICTX_NO_WRITE_STREAMING	3	/* Don't engage in write-streaming */</div><div class='add'>+#define NETFS_ICTX_MODIFIED_ATTR 3		/* Indicate change in mtime/ctime */</div><div class='add'>+#define NETFS_ICTX_SINGLE_NO_UPLOAD 4		/* Monolithic payload, cache but no upload */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -165,16 +93,25 @@ struct netfs_folio {</div><div class='ctx'> 	unsigned int		dirty_len;	/* Write-streaming dirty data length */</div><div class='ctx'> };</div><div class='ctx'> #define NETFS_FOLIO_INFO	0x1UL	/* OR'd with folio-&gt;private. */</div><div class='add'>+#define NETFS_FOLIO_COPY_TO_CACHE ((struct netfs_group *)0x356UL) /* Write to the cache only */</div><div class='ctx'> </div><div class='del'>-static inline struct netfs_folio *netfs_folio_info(struct folio *folio)</div><div class='add'>+static inline bool netfs_is_folio_info(const void *priv)</div><div class='ctx'> {</div><div class='del'>-	void *priv = folio_get_private(folio);</div><div class='add'>+	return (unsigned long)priv &amp; NETFS_FOLIO_INFO;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if ((unsigned long)priv &amp; NETFS_FOLIO_INFO)</div><div class='add'>+static inline struct netfs_folio *__netfs_folio_info(const void *priv)</div><div class='add'>+{</div><div class='add'>+	if (netfs_is_folio_info(priv))</div><div class='ctx'> 		return (struct netfs_folio *)((unsigned long)priv &amp; ~NETFS_FOLIO_INFO);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct netfs_folio *netfs_folio_info(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return __netfs_folio_info(folio_get_private(folio));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct netfs_group *netfs_folio_group(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct netfs_folio *finfo;</div><div class='hunk'>@@ -187,6 +124,36 @@ static inline struct netfs_group *netfs_folio_group(struct folio *folio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Stream of I/O subrequests going to a particular destination, such as the</div><div class='add'>+ * server or the local cache.  This is mainly intended for writing where we may</div><div class='add'>+ * have to write to multiple destinations concurrently.</div><div class='add'>+ */</div><div class='add'>+struct netfs_io_stream {</div><div class='add'>+	/* Submission tracking */</div><div class='add'>+	struct netfs_io_subrequest *construct;	/* Op being constructed */</div><div class='add'>+	size_t			sreq_max_len;	/* Maximum size of a subrequest */</div><div class='add'>+	unsigned int		sreq_max_segs;	/* 0 or max number of segments in an iterator */</div><div class='add'>+	unsigned int		submit_off;	/* Folio offset we're submitting from */</div><div class='add'>+	unsigned int		submit_len;	/* Amount of data left to submit */</div><div class='add'>+	unsigned int		submit_extendable_to; /* Amount I/O can be rounded up to */</div><div class='add'>+	void (*prepare_write)(struct netfs_io_subrequest *subreq);</div><div class='add'>+	void (*issue_write)(struct netfs_io_subrequest *subreq);</div><div class='add'>+	/* Collection tracking */</div><div class='add'>+	struct list_head	subrequests;	/* Contributory I/O operations */</div><div class='add'>+	struct netfs_io_subrequest *front;	/* Op being collected */</div><div class='add'>+	unsigned long long	collected_to;	/* Position we've collected results to */</div><div class='add'>+	size_t			transferred;	/* The amount transferred from this stream */</div><div class='add'>+	unsigned short		error;		/* Aggregate error for the stream */</div><div class='add'>+	enum netfs_io_source	source;		/* Where to read from/write to */</div><div class='add'>+	unsigned char		stream_nr;	/* Index of stream in parent table */</div><div class='add'>+	bool			avail;		/* T if stream is available */</div><div class='add'>+	bool			active;		/* T if stream is active */</div><div class='add'>+	bool			need_retry;	/* T if this stream needs retrying */</div><div class='add'>+	bool			failed;		/* T if this stream failed */</div><div class='add'>+	bool			transferred_valid; /* T is -&gt;transferred is valid */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Resources required to do operations on a cache.</div><div class='ctx'>  */</div><div class='ctx'> struct netfs_cache_resources {</div><div class='hunk'>@@ -209,33 +176,42 @@ struct netfs_io_subrequest {</div><div class='ctx'> 	struct work_struct	work;</div><div class='ctx'> 	struct list_head	rreq_link;	/* Link in rreq-&gt;subrequests */</div><div class='ctx'> 	struct iov_iter		io_iter;	/* Iterator for this subrequest */</div><div class='del'>-	loff_t			start;		/* Where to start the I/O */</div><div class='add'>+	unsigned long long	start;		/* Where to start the I/O */</div><div class='ctx'> 	size_t			len;		/* Size of the I/O */</div><div class='ctx'> 	size_t			transferred;	/* Amount of data transferred */</div><div class='ctx'> 	refcount_t		ref;</div><div class='ctx'> 	short			error;		/* 0 or error that occurred */</div><div class='ctx'> 	unsigned short		debug_index;	/* Index in list (for debugging output) */</div><div class='del'>-	unsigned int		max_nr_segs;	/* 0 or max number of segments in an iterator */</div><div class='add'>+	unsigned int		nr_segs;	/* Number of segs in io_iter */</div><div class='add'>+	u8			retry_count;	/* The number of retries (0 on initial pass) */</div><div class='ctx'> 	enum netfs_io_source	source;		/* Where to read from/write to */</div><div class='add'>+	unsigned char		stream_nr;	/* I/O stream this belongs to */</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> #define NETFS_SREQ_COPY_TO_CACHE	0	/* Set if should copy the data to the cache */</div><div class='ctx'> #define NETFS_SREQ_CLEAR_TAIL		1	/* Set if the rest of the read should be cleared */</div><div class='del'>-#define NETFS_SREQ_SHORT_IO		2	/* Set if the I/O was short */</div><div class='del'>-#define NETFS_SREQ_SEEK_DATA_READ	3	/* Set if -&gt;read() should SEEK_DATA first */</div><div class='del'>-#define NETFS_SREQ_NO_PROGRESS		4	/* Set if we didn't manage to read any data */</div><div class='add'>+#define NETFS_SREQ_MADE_PROGRESS	4	/* Set if we transferred at least some data */</div><div class='ctx'> #define NETFS_SREQ_ONDEMAND		5	/* Set if it's from on-demand read mode */</div><div class='add'>+#define NETFS_SREQ_BOUNDARY		6	/* Set if ends on hard boundary (eg. ceph object) */</div><div class='add'>+#define NETFS_SREQ_HIT_EOF		7	/* Set if short due to EOF */</div><div class='add'>+#define NETFS_SREQ_IN_PROGRESS		8	/* Unlocked when the subrequest completes */</div><div class='add'>+#define NETFS_SREQ_NEED_RETRY		9	/* Set if the filesystem requests a retry */</div><div class='add'>+#define NETFS_SREQ_FAILED		10	/* Set if the subreq failed unretryably */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum netfs_io_origin {</div><div class='ctx'> 	NETFS_READAHEAD,		/* This read was triggered by readahead */</div><div class='ctx'> 	NETFS_READPAGE,			/* This read is a synchronous read */</div><div class='add'>+	NETFS_READ_GAPS,		/* This read is a synchronous read to fill gaps */</div><div class='add'>+	NETFS_READ_SINGLE,		/* This read should be treated as a single object */</div><div class='ctx'> 	NETFS_READ_FOR_WRITE,		/* This read is to prepare a write */</div><div class='add'>+	NETFS_UNBUFFERED_READ,		/* This is an unbuffered read */</div><div class='add'>+	NETFS_DIO_READ,			/* This is a direct I/O read */</div><div class='ctx'> 	NETFS_WRITEBACK,		/* This write was triggered by writepages */</div><div class='add'>+	NETFS_WRITEBACK_SINGLE,		/* This monolithic write was triggered by writepages */</div><div class='ctx'> 	NETFS_WRITETHROUGH,		/* This write was made by netfs_perform_write() */</div><div class='del'>-	NETFS_LAUNDER_WRITE,		/* This is triggered by -&gt;launder_folio() */</div><div class='ctx'> 	NETFS_UNBUFFERED_WRITE,		/* This is an unbuffered write */</div><div class='del'>-	NETFS_DIO_READ,			/* This is a direct I/O read */</div><div class='ctx'> 	NETFS_DIO_WRITE,		/* This is a direct I/O write */</div><div class='add'>+	NETFS_PGPRIV2_COPY_TO_CACHE,	/* [DEPRECATED] This is writing read data to the cache */</div><div class='ctx'> 	nr__netfs_io_origin</div><div class='ctx'> } __mode(byte);</div><div class='ctx'> </div><div class='hunk'>@@ -245,65 +221,80 @@ enum netfs_io_origin {</div><div class='ctx'>  */</div><div class='ctx'> struct netfs_io_request {</div><div class='ctx'> 	union {</div><div class='del'>-		struct work_struct work;</div><div class='add'>+		struct work_struct cleanup_work; /* Deferred cleanup work */</div><div class='ctx'> 		struct rcu_head rcu;</div><div class='ctx'> 	};</div><div class='add'>+	struct work_struct	work;		/* Result collector work */</div><div class='ctx'> 	struct inode		*inode;		/* The file being accessed */</div><div class='ctx'> 	struct address_space	*mapping;	/* The mapping being accessed */</div><div class='ctx'> 	struct kiocb		*iocb;		/* AIO completion vector */</div><div class='ctx'> 	struct netfs_cache_resources cache_resources;</div><div class='add'>+	struct netfs_io_request	*copy_to_cache;	/* Request to write just-read data to the cache */</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='ctx'> 	struct list_head	proc_link;	/* Link in netfs_iorequests */</div><div class='del'>-	struct list_head	subrequests;	/* Contributory I/O operations */</div><div class='del'>-	struct iov_iter		iter;		/* Unencrypted-side iterator */</div><div class='del'>-	struct iov_iter		io_iter;	/* I/O (Encrypted-side) iterator */</div><div class='add'>+#endif</div><div class='add'>+	struct netfs_io_stream	io_streams[2];	/* Streams of parallel I/O operations */</div><div class='add'>+#define NR_IO_STREAMS 2 //wreq-&gt;nr_io_streams</div><div class='add'>+	struct netfs_group	*group;		/* Writeback group being written back */</div><div class='add'>+	struct rolling_buffer	buffer;		/* Unencrypted buffer */</div><div class='add'>+#define NETFS_ROLLBUF_PUT_MARK		ROLLBUF_MARK_1</div><div class='add'>+#define NETFS_ROLLBUF_PAGECACHE_MARK	ROLLBUF_MARK_2</div><div class='add'>+	wait_queue_head_t	waitq;		/* Processor waiter */</div><div class='ctx'> 	void			*netfs_priv;	/* Private data for the netfs */</div><div class='add'>+	void			*netfs_priv2;	/* Private data for the netfs */</div><div class='ctx'> 	struct bio_vec		*direct_bv;	/* DIO buffer list (when handling iovec-iter) */</div><div class='add'>+	unsigned long long	submitted;	/* Amount submitted for I/O so far */</div><div class='add'>+	unsigned long long	len;		/* Length of the request */</div><div class='add'>+	size_t			transferred;	/* Amount to be indicated as transferred */</div><div class='add'>+	long			error;		/* 0 or error that occurred */</div><div class='add'>+	unsigned long long	i_size;		/* Size of the file */</div><div class='add'>+	unsigned long long	start;		/* Start position */</div><div class='add'>+	atomic64_t		issued_to;	/* Write issuer folio cursor */</div><div class='add'>+	unsigned long long	collected_to;	/* Point we've collected to */</div><div class='add'>+	unsigned long long	cleaned_to;	/* Position we've cleaned folios to */</div><div class='add'>+	unsigned long long	abandon_to;	/* Position to abandon folios to */</div><div class='add'>+	pgoff_t			no_unlock_folio; /* Don't unlock this folio after read */</div><div class='ctx'> 	unsigned int		direct_bv_count; /* Number of elements in direct_bv[] */</div><div class='ctx'> 	unsigned int		debug_id;</div><div class='ctx'> 	unsigned int		rsize;		/* Maximum read size (0 for none) */</div><div class='ctx'> 	unsigned int		wsize;		/* Maximum write size (0 for none) */</div><div class='del'>-	unsigned int		subreq_counter;	/* Next subreq-&gt;debug_index */</div><div class='del'>-	atomic_t		nr_outstanding;	/* Number of ops in progress */</div><div class='del'>-	atomic_t		nr_copy_ops;	/* Number of copy-to-cache ops in progress */</div><div class='del'>-	size_t			submitted;	/* Amount submitted for I/O so far */</div><div class='del'>-	size_t			len;		/* Length of the request */</div><div class='del'>-	size_t			upper_len;	/* Length can be extended to here */</div><div class='del'>-	size_t			transferred;	/* Amount to be indicated as transferred */</div><div class='del'>-	short			error;		/* 0 or error that occurred */</div><div class='add'>+	atomic_t		subreq_counter;	/* Next subreq-&gt;debug_index */</div><div class='add'>+	unsigned int		nr_group_rel;	/* Number of refs to release on -&gt;group */</div><div class='add'>+	spinlock_t		lock;		/* Lock for queuing subreqs */</div><div class='add'>+	unsigned char		front_folio_order; /* Order (size) of front folio */</div><div class='ctx'> 	enum netfs_io_origin	origin;		/* Origin of the request */</div><div class='ctx'> 	bool			direct_bv_unpin; /* T if direct_bv[] must be unpinned */</div><div class='del'>-	loff_t			i_size;		/* Size of the file */</div><div class='del'>-	loff_t			start;		/* Start position */</div><div class='del'>-	pgoff_t			no_unlock_folio; /* Don't unlock this folio after read */</div><div class='ctx'> 	refcount_t		ref;</div><div class='ctx'> 	unsigned long		flags;</div><div class='del'>-#define NETFS_RREQ_INCOMPLETE_IO	0	/* Some ioreqs terminated short or with error */</div><div class='del'>-#define NETFS_RREQ_COPY_TO_CACHE	1	/* Need to write to the cache */</div><div class='del'>-#define NETFS_RREQ_NO_UNLOCK_FOLIO	2	/* Don't unlock no_unlock_folio on completion */</div><div class='del'>-#define NETFS_RREQ_DONT_UNLOCK_FOLIOS	3	/* Don't unlock the folios on completion */</div><div class='del'>-#define NETFS_RREQ_FAILED		4	/* The request failed */</div><div class='del'>-#define NETFS_RREQ_IN_PROGRESS		5	/* Unlocked when the request completes */</div><div class='del'>-#define NETFS_RREQ_WRITE_TO_CACHE	7	/* Need to write to the cache */</div><div class='del'>-#define NETFS_RREQ_UPLOAD_TO_SERVER	8	/* Need to write to the server */</div><div class='del'>-#define NETFS_RREQ_NONBLOCK		9	/* Don't block if possible (O_NONBLOCK) */</div><div class='del'>-#define NETFS_RREQ_BLOCKED		10	/* We blocked */</div><div class='add'>+#define NETFS_RREQ_IN_PROGRESS		0	/* Unlocked when the request completes (has ref) */</div><div class='add'>+#define NETFS_RREQ_ALL_QUEUED		1	/* All subreqs are now queued */</div><div class='add'>+#define NETFS_RREQ_PAUSE		2	/* Pause subrequest generation */</div><div class='add'>+#define NETFS_RREQ_FAILED		3	/* The request failed */</div><div class='add'>+#define NETFS_RREQ_RETRYING		4	/* Set if we're in the retry path */</div><div class='add'>+#define NETFS_RREQ_SHORT_TRANSFER	5	/* Set if we have a short transfer */</div><div class='add'>+#define NETFS_RREQ_OFFLOAD_COLLECTION	8	/* Offload collection to workqueue */</div><div class='add'>+#define NETFS_RREQ_NO_UNLOCK_FOLIO	9	/* Don't unlock no_unlock_folio on completion */</div><div class='add'>+#define NETFS_RREQ_FOLIO_COPY_TO_CACHE	10	/* Copy current folio to cache from read */</div><div class='add'>+#define NETFS_RREQ_UPLOAD_TO_SERVER	11	/* Need to write to the server */</div><div class='add'>+#define NETFS_RREQ_USE_IO_ITER		12	/* Use -&gt;io_iter rather than -&gt;i_pages */</div><div class='add'>+#define NETFS_RREQ_USE_PGPRIV2		31	/* [DEPRECATED] Use PG_private_2 to mark</div><div class='add'>+						 * write to cache on read */</div><div class='ctx'> 	const struct netfs_request_ops *netfs_ops;</div><div class='del'>-	void (*cleanup)(struct netfs_io_request *req);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Operations the network filesystem can/must provide to the helpers.</div><div class='ctx'>  */</div><div class='ctx'> struct netfs_request_ops {</div><div class='del'>-	unsigned int	io_request_size;	/* Alloc size for netfs_io_request struct */</div><div class='del'>-	unsigned int	io_subrequest_size;	/* Alloc size for netfs_io_subrequest struct */</div><div class='add'>+	mempool_t *request_pool;</div><div class='add'>+	mempool_t *subrequest_pool;</div><div class='ctx'> 	int (*init_request)(struct netfs_io_request *rreq, struct file *file);</div><div class='ctx'> 	void (*free_request)(struct netfs_io_request *rreq);</div><div class='ctx'> 	void (*free_subrequest)(struct netfs_io_subrequest *rreq);</div><div class='ctx'> </div><div class='ctx'> 	/* Read request handling */</div><div class='ctx'> 	void (*expand_readahead)(struct netfs_io_request *rreq);</div><div class='del'>-	bool (*clamp_length)(struct netfs_io_subrequest *subreq);</div><div class='add'>+	int (*prepare_read)(struct netfs_io_subrequest *subreq);</div><div class='ctx'> 	void (*issue_read)(struct netfs_io_subrequest *subreq);</div><div class='ctx'> 	bool (*is_still_valid)(struct netfs_io_request *rreq);</div><div class='ctx'> 	int (*check_write_begin)(struct file *file, loff_t pos, unsigned len,</div><div class='hunk'>@@ -312,10 +303,13 @@ struct netfs_request_ops {</div><div class='ctx'> </div><div class='ctx'> 	/* Modification handling */</div><div class='ctx'> 	void (*update_i_size)(struct inode *inode, loff_t i_size);</div><div class='add'>+	void (*post_modify)(struct inode *inode);</div><div class='ctx'> </div><div class='ctx'> 	/* Write request handling */</div><div class='del'>-	void (*create_write_requests)(struct netfs_io_request *wreq,</div><div class='del'>-				      loff_t start, size_t len);</div><div class='add'>+	void (*begin_writeback)(struct netfs_io_request *wreq);</div><div class='add'>+	void (*prepare_write)(struct netfs_io_subrequest *subreq);</div><div class='add'>+	void (*issue_write)(struct netfs_io_subrequest *subreq);</div><div class='add'>+	void (*retry_request)(struct netfs_io_request *wreq, struct netfs_io_stream *stream);</div><div class='ctx'> 	void (*invalidate_cache)(struct netfs_io_request *wreq);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -324,7 +318,6 @@ struct netfs_request_ops {</div><div class='ctx'>  */</div><div class='ctx'> enum netfs_read_from_hole {</div><div class='ctx'> 	NETFS_READ_HOLE_IGNORE,</div><div class='del'>-	NETFS_READ_HOLE_CLEAR,</div><div class='ctx'> 	NETFS_READ_HOLE_FAIL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -350,15 +343,27 @@ struct netfs_cache_ops {</div><div class='ctx'> 		     netfs_io_terminated_t term_func,</div><div class='ctx'> 		     void *term_func_priv);</div><div class='ctx'> </div><div class='add'>+	/* Write data to the cache from a netfs subrequest. */</div><div class='add'>+	void (*issue_write)(struct netfs_io_subrequest *subreq);</div><div class='add'>+</div><div class='ctx'> 	/* Expand readahead request */</div><div class='ctx'> 	void (*expand_readahead)(struct netfs_cache_resources *cres,</div><div class='del'>-				 loff_t *_start, size_t *_len, loff_t i_size);</div><div class='add'>+				 unsigned long long *_start,</div><div class='add'>+				 unsigned long long *_len,</div><div class='add'>+				 unsigned long long i_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare a read operation, shortening it to a cached/uncached</div><div class='ctx'> 	 * boundary as appropriate.</div><div class='ctx'> 	 */</div><div class='ctx'> 	enum netfs_io_source (*prepare_read)(struct netfs_io_subrequest *subreq,</div><div class='del'>-					     loff_t i_size);</div><div class='add'>+					     unsigned long long i_size);</div><div class='add'>+</div><div class='add'>+	/* Prepare a write subrequest, working out if we're allowed to do it</div><div class='add'>+	 * and finding out the maximum amount of data to gather before</div><div class='add'>+	 * attempting to submit.  If we're not permitted to do it, the</div><div class='add'>+	 * subrequest should be marked failed.</div><div class='add'>+	 */</div><div class='add'>+	void (*prepare_write_subreq)(struct netfs_io_subrequest *subreq);</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare a write operation, working out what part of the write we can</div><div class='ctx'> 	 * actually do.</div><div class='hunk'>@@ -384,6 +389,7 @@ struct netfs_cache_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* High-level read API. */</div><div class='add'>+ssize_t netfs_unbuffered_read_iter_locked(struct kiocb *iocb, struct iov_iter *iter);</div><div class='ctx'> ssize_t netfs_unbuffered_read_iter(struct kiocb *iocb, struct iov_iter *iter);</div><div class='ctx'> ssize_t netfs_buffered_read_iter(struct kiocb *iocb, struct iov_iter *iter);</div><div class='ctx'> ssize_t netfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter);</div><div class='hunk'>@@ -394,8 +400,17 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,</div><div class='ctx'> ssize_t netfs_buffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *from,</div><div class='ctx'> 					 struct netfs_group *netfs_group);</div><div class='ctx'> ssize_t netfs_unbuffered_write_iter(struct kiocb *iocb, struct iov_iter *from);</div><div class='add'>+ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov_iter *iter,</div><div class='add'>+					   struct netfs_group *netfs_group);</div><div class='ctx'> ssize_t netfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from);</div><div class='ctx'> </div><div class='add'>+/* Single, monolithic object read/write API. */</div><div class='add'>+void netfs_single_mark_inode_dirty(struct inode *inode);</div><div class='add'>+ssize_t netfs_read_single(struct inode *inode, struct file *file, struct iov_iter *iter);</div><div class='add'>+int netfs_writeback_single(struct address_space *mapping,</div><div class='add'>+			   struct writeback_control *wbc,</div><div class='add'>+			   struct iov_iter *iter);</div><div class='add'>+</div><div class='ctx'> /* Address operations API */</div><div class='ctx'> struct readahead_control;</div><div class='ctx'> void netfs_readahead(struct readahead_control *);</div><div class='hunk'>@@ -410,28 +425,24 @@ int netfs_unpin_writeback(struct inode *inode, struct writeback_control *wbc);</div><div class='ctx'> void netfs_clear_inode_writeback(struct inode *inode, const void *aux);</div><div class='ctx'> void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length);</div><div class='ctx'> bool netfs_release_folio(struct folio *folio, gfp_t gfp);</div><div class='del'>-int netfs_launder_folio(struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> /* VMA operations API. */</div><div class='ctx'> vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_group);</div><div class='ctx'> </div><div class='ctx'> /* (Sub)request management API. */</div><div class='del'>-void netfs_subreq_terminated(struct netfs_io_subrequest *, ssize_t, bool);</div><div class='add'>+void netfs_read_subreq_progress(struct netfs_io_subrequest *subreq);</div><div class='add'>+void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq);</div><div class='ctx'> void netfs_get_subrequest(struct netfs_io_subrequest *subreq,</div><div class='ctx'> 			  enum netfs_sreq_ref_trace what);</div><div class='ctx'> void netfs_put_subrequest(struct netfs_io_subrequest *subreq,</div><div class='del'>-			  bool was_async, enum netfs_sreq_ref_trace what);</div><div class='add'>+			  enum netfs_sreq_ref_trace what);</div><div class='ctx'> ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len,</div><div class='ctx'> 				struct iov_iter *new,</div><div class='ctx'> 				iov_iter_extraction_t extraction_flags);</div><div class='ctx'> size_t netfs_limit_iter(const struct iov_iter *iter, size_t start_offset,</div><div class='ctx'> 			size_t max_size, size_t max_segs);</div><div class='del'>-struct netfs_io_subrequest *netfs_create_write_request(</div><div class='del'>-	struct netfs_io_request *wreq, enum netfs_io_source dest,</div><div class='del'>-	loff_t start, size_t len, work_func_t worker);</div><div class='del'>-void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error,</div><div class='del'>-				       bool was_async);</div><div class='del'>-void netfs_queue_write_request(struct netfs_io_subrequest *subreq);</div><div class='add'>+void netfs_prepare_write_failed(struct netfs_io_subrequest *subreq);</div><div class='add'>+void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error);</div><div class='ctx'> </div><div class='ctx'> int netfs_start_io_read(struct inode *inode);</div><div class='ctx'> void netfs_end_io_read(struct inode *inode);</div><div class='hunk'>@@ -440,6 +451,18 @@ void netfs_end_io_write(struct inode *inode);</div><div class='ctx'> int netfs_start_io_direct(struct inode *inode);</div><div class='ctx'> void netfs_end_io_direct(struct inode *inode);</div><div class='ctx'> </div><div class='add'>+/* Miscellaneous APIs. */</div><div class='add'>+struct folio_queue *netfs_folioq_alloc(unsigned int rreq_id, gfp_t gfp,</div><div class='add'>+				       unsigned int trace /*enum netfs_folioq_trace*/);</div><div class='add'>+void netfs_folioq_free(struct folio_queue *folioq,</div><div class='add'>+		       unsigned int trace /*enum netfs_trace_folioq*/);</div><div class='add'>+</div><div class='add'>+/* Buffer wrangling helpers API. */</div><div class='add'>+int netfs_alloc_folioq_buffer(struct address_space *mapping,</div><div class='add'>+			      struct folio_queue **_buffer,</div><div class='add'>+			      size_t *_cur_size, ssize_t size, gfp_t gfp);</div><div class='add'>+void netfs_free_folioq_buffer(struct folio_queue *fq);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * netfs_inode - Get the netfs inode context from the inode</div><div class='ctx'>  * @inode: The inode to query</div><div class='hunk'>@@ -469,9 +492,11 @@ static inline void netfs_inode_init(struct netfs_inode *ctx,</div><div class='ctx'> 	ctx-&gt;remote_i_size = i_size_read(&amp;ctx-&gt;inode);</div><div class='ctx'> 	ctx-&gt;zero_point = LLONG_MAX;</div><div class='ctx'> 	ctx-&gt;flags = 0;</div><div class='add'>+	atomic_set(&amp;ctx-&gt;io_count, 0);</div><div class='ctx'> #if IS_ENABLED(CONFIG_FSCACHE)</div><div class='ctx'> 	ctx-&gt;cache = NULL;</div><div class='ctx'> #endif</div><div class='add'>+	mutex_init(&amp;ctx-&gt;wb_lock);</div><div class='ctx'> 	/* -&gt;releasepage() drives zero_point */</div><div class='ctx'> 	if (use_zero_point) {</div><div class='ctx'> 		ctx-&gt;zero_point = ctx-&gt;remote_i_size;</div><div class='hunk'>@@ -511,4 +536,20 @@ static inline struct fscache_cookie *netfs_i_cookie(struct netfs_inode *ctx)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * netfs_wait_for_outstanding_io - Wait for outstanding I/O to complete</div><div class='add'>+ * @inode: The netfs inode to wait on</div><div class='add'>+ *</div><div class='add'>+ * Wait for outstanding I/O requests of any type to complete.  This is intended</div><div class='add'>+ * to be called from inode eviction routines.  This makes sure that any</div><div class='add'>+ * resources held by those requests are cleaned up before we let the inode get</div><div class='add'>+ * cleaned up.</div><div class='add'>+ */</div><div class='add'>+static inline void netfs_wait_for_outstanding_io(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct netfs_inode *ictx = netfs_inode(inode);</div><div class='add'>+</div><div class='add'>+	wait_var_event(&amp;ictx-&gt;io_count, atomic_read(&amp;ictx-&gt;io_count) == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_NETFS_H */</div><div class='head'>diff --git a/include/linux/netlink.h b/include/linux/netlink.h<br/>index 5df7340d4dab..882e9c1b6c1d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netlink.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netlink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netlink.h</a></div><div class='hunk'>@@ -34,6 +34,7 @@ struct netlink_skb_parms {</div><div class='ctx'> </div><div class='ctx'> #define NETLINK_CB(skb)		(*(struct netlink_skb_parms*)&amp;((skb)-&gt;cb))</div><div class='ctx'> #define NETLINK_CREDS(skb)	(&amp;NETLINK_CB((skb)).creds)</div><div class='add'>+#define NETLINK_CTX_SIZE	48</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void netlink_table_grab(void);</div><div class='hunk'>@@ -47,7 +48,6 @@ struct netlink_kernel_cfg {</div><div class='ctx'> 	unsigned int	groups;</div><div class='ctx'> 	unsigned int	flags;</div><div class='ctx'> 	void		(*input)(struct sk_buff *skb);</div><div class='del'>-	struct mutex	*cb_mutex;</div><div class='ctx'> 	int		(*bind)(struct net *net, int group);</div><div class='ctx'> 	void		(*unbind)(struct net *net, int group);</div><div class='ctx'> 	void            (*release) (struct sock *sk, unsigned long *groups);</div><div class='hunk'>@@ -63,7 +63,7 @@ netlink_kernel_create(struct net *net, int unit, struct netlink_kernel_cfg *cfg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* this can be increased when necessary - don't expose to userland */</div><div class='del'>-#define NETLINK_MAX_COOKIE_LEN	20</div><div class='add'>+#define NETLINK_MAX_COOKIE_LEN	8</div><div class='ctx'> #define NETLINK_MAX_FMTMSG_LEN	80</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -212,6 +212,7 @@ static inline void nl_set_extack_cookie_u64(struct netlink_ext_ack *extack,</div><div class='ctx'> {</div><div class='ctx'> 	if (!extack)</div><div class='ctx'> 		return;</div><div class='add'>+	BUILD_BUG_ON(sizeof(extack-&gt;cookie) &lt; sizeof(cookie));</div><div class='ctx'> 	memcpy(extack-&gt;cookie, &amp;cookie, sizeof(cookie));</div><div class='ctx'> 	extack-&gt;cookie_len = sizeof(cookie);</div><div class='ctx'> }</div><div class='hunk'>@@ -240,7 +241,7 @@ int netlink_register_notifier(struct notifier_block *nb);</div><div class='ctx'> int netlink_unregister_notifier(struct notifier_block *nb);</div><div class='ctx'> </div><div class='ctx'> /* finegrained unicast helpers: */</div><div class='del'>-struct sock *netlink_getsockbyfilp(struct file *filp);</div><div class='add'>+struct sock *netlink_getsockbyfd(int fd);</div><div class='ctx'> int netlink_attachskb(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 		      long *timeo, struct sock *ssk);</div><div class='ctx'> void netlink_detachskb(struct sock *sk, struct sk_buff *skb);</div><div class='hunk'>@@ -294,7 +295,7 @@ struct netlink_callback {</div><div class='ctx'> 	int			flags;</div><div class='ctx'> 	bool			strict_check;</div><div class='ctx'> 	union {</div><div class='del'>-		u8		ctx[48];</div><div class='add'>+		u8		ctx[NETLINK_CTX_SIZE];</div><div class='ctx'> </div><div class='ctx'> 		/* args is deprecated. Cast a struct over ctx instead</div><div class='ctx'> 		 * for proper type safety.</div><div class='hunk'>@@ -303,7 +304,7 @@ struct netlink_callback {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NL_ASSERT_DUMP_CTX_FITS(type_name)				\</div><div class='add'>+#define NL_ASSERT_CTX_FITS(type_name)					\</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(type_name) &gt;				\</div><div class='ctx'> 		     sizeof_field(struct netlink_callback, ctx))</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h<br/>index bd19c4b91e31..f22eec466040 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/netpoll.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/netpoll.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/netpoll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/netpoll.h</a></div><div class='hunk'>@@ -15,25 +15,37 @@</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='ctx'> </div><div class='ctx'> union inet_addr {</div><div class='del'>-	__u32		all[4];</div><div class='ctx'> 	__be32		ip;</div><div class='del'>-	__be32		ip6[4];</div><div class='del'>-	struct in_addr	in;</div><div class='ctx'> 	struct in6_addr	in6;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct netpoll {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	netdevice_tracker dev_tracker;</div><div class='add'>+	/*</div><div class='add'>+	 * Either dev_name or dev_mac can be used to specify the local</div><div class='add'>+	 * interface - dev_name is used if it is a nonempty string, else</div><div class='add'>+	 * dev_mac is used.</div><div class='add'>+	 */</div><div class='ctx'> 	char dev_name[IFNAMSIZ];</div><div class='add'>+	u8 dev_mac[ETH_ALEN];</div><div class='ctx'> 	const char *name;</div><div class='ctx'> </div><div class='ctx'> 	union inet_addr local_ip, remote_ip;</div><div class='ctx'> 	bool ipv6;</div><div class='ctx'> 	u16 local_port, remote_port;</div><div class='ctx'> 	u8 remote_mac[ETH_ALEN];</div><div class='add'>+	struct sk_buff_head skb_pool;</div><div class='add'>+	struct work_struct refill_wq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define np_info(np, fmt, ...)				\</div><div class='add'>+	pr_info("%s: " fmt, np-&gt;name, ##__VA_ARGS__)</div><div class='add'>+#define np_err(np, fmt, ...)				\</div><div class='add'>+	pr_err("%s: " fmt, np-&gt;name, ##__VA_ARGS__)</div><div class='add'>+#define np_notice(np, fmt, ...)				\</div><div class='add'>+	pr_notice("%s: " fmt, np-&gt;name, ##__VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> struct netpoll_info {</div><div class='ctx'> 	refcount_t refcnt;</div><div class='ctx'> </div><div class='hunk'>@@ -43,7 +55,6 @@ struct netpoll_info {</div><div class='ctx'> </div><div class='ctx'> 	struct delayed_work tx_work;</div><div class='ctx'> </div><div class='del'>-	struct netpoll *netpoll;</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -56,14 +67,12 @@ static inline void netpoll_poll_disable(struct net_device *dev) { return; }</div><div class='ctx'> static inline void netpoll_poll_enable(struct net_device *dev) { return; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void netpoll_send_udp(struct netpoll *np, const char *msg, int len);</div><div class='del'>-void netpoll_print_options(struct netpoll *np);</div><div class='del'>-int netpoll_parse_options(struct netpoll *np, char *opt);</div><div class='add'>+int netpoll_send_udp(struct netpoll *np, const char *msg, int len);</div><div class='ctx'> int __netpoll_setup(struct netpoll *np, struct net_device *ndev);</div><div class='ctx'> int netpoll_setup(struct netpoll *np);</div><div class='del'>-void __netpoll_cleanup(struct netpoll *np);</div><div class='ctx'> void __netpoll_free(struct netpoll *np);</div><div class='ctx'> void netpoll_cleanup(struct netpoll *np);</div><div class='add'>+void do_netpoll_cleanup(struct netpoll *np);</div><div class='ctx'> netdev_tx_t netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NETPOLL</div><div class='hunk'>@@ -71,7 +80,7 @@ static inline void *netpoll_poll_lock(struct napi_struct *napi)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = napi-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (dev &amp;&amp; dev-&gt;npinfo) {</div><div class='add'>+	if (dev &amp;&amp; rcu_access_pointer(dev-&gt;npinfo)) {</div><div class='ctx'> 		int owner = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 		while (cmpxchg(&amp;napi-&gt;poll_owner, -1, owner) != -1)</div><div class='head'>diff --git a/include/linux/nfs.h b/include/linux/nfs.h<br/>index ceb70a926b95..0906a0b40c6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nfs.h</a></div><div class='hunk'>@@ -8,11 +8,20 @@</div><div class='ctx'> #ifndef _LINUX_NFS_H</div><div class='ctx'> #define _LINUX_NFS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cred.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/auth.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/msg_prot.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/nfs.h&gt;</div><div class='ctx'> </div><div class='add'>+/* The LOCALIO program is entirely private to Linux and is</div><div class='add'>+ * NOT part of the uapi.</div><div class='add'>+ */</div><div class='add'>+#define NFS_LOCALIO_PROGRAM		400122</div><div class='add'>+#define LOCALIOPROC_NULL		0</div><div class='add'>+#define LOCALIOPROC_UUID_IS_LOCAL	1</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the kernel NFS client file handle representation</div><div class='ctx'>  */</div><div class='hunk'>@@ -46,7 +55,6 @@ enum nfs3_stable_how {</div><div class='ctx'> 	NFS_INVALID_STABLE_HOW = -1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRC32</div><div class='ctx'> /**</div><div class='ctx'>  * nfs_fhandle_hash - calculate the crc32 hash for the filehandle</div><div class='ctx'>  * @fh - pointer to filehandle</div><div class='hunk'>@@ -58,10 +66,4 @@ static inline u32 nfs_fhandle_hash(const struct nfs_fh *fh)</div><div class='ctx'> {</div><div class='ctx'> 	return ~crc32_le(0xFFFFFFFF, &amp;fh-&gt;data[0], fh-&gt;size);</div><div class='ctx'> }</div><div class='del'>-#else /* CONFIG_CRC32 */</div><div class='del'>-static inline u32 nfs_fhandle_hash(const struct nfs_fh *fh)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_CRC32 */</div><div class='ctx'> #endif /* _LINUX_NFS_H */</div><div class='head'>diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h<br/>index ef8d2d618d5b..e947af6a3684 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nfs4.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs4.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nfs4.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nfs4.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/uidgid.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/nfs4.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/msg_prot.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/xdrgen/nfs4_1.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum nfs4_acl_whotype {</div><div class='ctx'> 	NFS4_ACL_WHO_NAMED = 0,</div><div class='hunk'>@@ -46,6 +47,7 @@ struct nfs4_acl {</div><div class='ctx'> struct nfs4_label {</div><div class='ctx'> 	uint32_t	lfs;</div><div class='ctx'> 	uint32_t	pi;</div><div class='add'>+	u32		lsmid;</div><div class='ctx'> 	u32		len;</div><div class='ctx'> 	char	*label;</div><div class='ctx'> };</div><div class='hunk'>@@ -70,6 +72,7 @@ struct nfs4_stateid_struct {</div><div class='ctx'> 		NFS4_LAYOUT_STATEID_TYPE,</div><div class='ctx'> 		NFS4_PNFS_DS_STATEID_TYPE,</div><div class='ctx'> 		NFS4_REVOKED_STATEID_TYPE,</div><div class='add'>+		NFS4_FREED_STATEID_TYPE,</div><div class='ctx'> 	} type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -281,20 +284,24 @@ enum nfsstat4 {</div><div class='ctx'> 	/* nfs42 */</div><div class='ctx'> 	NFS4ERR_PARTNER_NOTSUPP	= 10088,</div><div class='ctx'> 	NFS4ERR_PARTNER_NO_AUTH	= 10089,</div><div class='del'>-	NFS4ERR_UNION_NOTSUPP = 10090,</div><div class='del'>-	NFS4ERR_OFFLOAD_DENIED = 10091,</div><div class='del'>-	NFS4ERR_WRONG_LFS = 10092,</div><div class='del'>-	NFS4ERR_BADLABEL = 10093,</div><div class='del'>-	NFS4ERR_OFFLOAD_NO_REQS = 10094,</div><div class='add'>+	NFS4ERR_UNION_NOTSUPP	= 10090,</div><div class='add'>+	NFS4ERR_OFFLOAD_DENIED	= 10091,</div><div class='add'>+	NFS4ERR_WRONG_LFS	= 10092,</div><div class='add'>+	NFS4ERR_BADLABEL	= 10093,</div><div class='add'>+	NFS4ERR_OFFLOAD_NO_REQS	= 10094,</div><div class='ctx'> </div><div class='ctx'> 	/* xattr (RFC8276) */</div><div class='del'>-	NFS4ERR_NOXATTR        = 10095,</div><div class='del'>-	NFS4ERR_XATTR2BIG      = 10096,</div><div class='add'>+	NFS4ERR_NOXATTR		= 10095,</div><div class='add'>+	NFS4ERR_XATTR2BIG	= 10096,</div><div class='add'>+</div><div class='add'>+	/* can be used for internal errors */</div><div class='add'>+	NFS4ERR_FIRST_FREE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* error codes for internal client use */</div><div class='ctx'> #define NFS4ERR_RESET_TO_MDS   12001</div><div class='ctx'> #define NFS4ERR_RESET_TO_PNFS  12002</div><div class='add'>+#define NFS4ERR_FATAL_IOERROR  12003</div><div class='ctx'> </div><div class='ctx'> static inline bool seqid_mutating_err(u32 err)</div><div class='ctx'> {</div><div class='hunk'>@@ -362,11 +369,13 @@ enum limit_by4 {</div><div class='ctx'> 	NFS4_LIMIT_BLOCKS = 2</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum open_delegation_type4 {</div><div class='add'>+enum nfs4_open_delegation_type4 {</div><div class='ctx'> 	NFS4_OPEN_DELEGATE_NONE = 0,</div><div class='ctx'> 	NFS4_OPEN_DELEGATE_READ = 1,</div><div class='ctx'> 	NFS4_OPEN_DELEGATE_WRITE = 2,</div><div class='ctx'> 	NFS4_OPEN_DELEGATE_NONE_EXT = 3, /* 4.1 */</div><div class='add'>+	NFS4_OPEN_DELEGATE_READ_ATTRS_DELEG = 4,</div><div class='add'>+	NFS4_OPEN_DELEGATE_WRITE_ATTRS_DELEG = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum why_no_delegation4 { /* new to v4.1 */</div><div class='hunk'>@@ -586,6 +595,9 @@ enum {</div><div class='ctx'> #define FATTR4_WORD2_SECURITY_LABEL     BIT(FATTR4_SEC_LABEL - 64)</div><div class='ctx'> #define FATTR4_WORD2_MODE_UMASK		BIT(FATTR4_MODE_UMASK - 64)</div><div class='ctx'> #define FATTR4_WORD2_XATTR_SUPPORT	BIT(FATTR4_XATTR_SUPPORT - 64)</div><div class='add'>+#define FATTR4_WORD2_TIME_DELEG_ACCESS	BIT(FATTR4_TIME_DELEG_ACCESS - 64)</div><div class='add'>+#define FATTR4_WORD2_TIME_DELEG_MODIFY	BIT(FATTR4_TIME_DELEG_MODIFY - 64)</div><div class='add'>+#define FATTR4_WORD2_OPEN_ARGUMENTS	BIT(FATTR4_OPEN_ARGUMENTS - 64)</div><div class='ctx'> </div><div class='ctx'> /* MDS threshold bitmap bits */</div><div class='ctx'> #define THRESHOLD_RD                    (1UL &lt;&lt; 0)</div><div class='hunk'>@@ -667,6 +679,7 @@ enum {</div><div class='ctx'> 	NFSPROC4_CLNT_SEEK,</div><div class='ctx'> 	NFSPROC4_CLNT_ALLOCATE,</div><div class='ctx'> 	NFSPROC4_CLNT_DEALLOCATE,</div><div class='add'>+	NFSPROC4_CLNT_ZERO_RANGE,</div><div class='ctx'> 	NFSPROC4_CLNT_LAYOUTSTATS,</div><div class='ctx'> 	NFSPROC4_CLNT_CLONE,</div><div class='ctx'> 	NFSPROC4_CLNT_COPY,</div><div class='hunk'>@@ -681,6 +694,7 @@ enum {</div><div class='ctx'> 	NFSPROC4_CLNT_LISTXATTRS,</div><div class='ctx'> 	NFSPROC4_CLNT_REMOVEXATTR,</div><div class='ctx'> 	NFSPROC4_CLNT_READ_PLUS,</div><div class='add'>+	NFSPROC4_CLNT_OFFLOAD_STATUS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* nfs41 types */</div><div class='hunk'>@@ -701,6 +715,12 @@ enum state_protect_how4 {</div><div class='ctx'> 	SP4_SSV		= 2</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* GET_DIR_DELEGATION non-fatal status codes */</div><div class='add'>+enum gddrnf4_status {</div><div class='add'>+	GDD4_OK		= 0,</div><div class='add'>+	GDD4_UNAVAIL	= 1</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum pnfs_layouttype {</div><div class='ctx'> 	LAYOUT_NFSV4_1_FILES  = 1,</div><div class='ctx'> 	LAYOUT_OSD2_OBJECTS = 2,</div><div class='head'>diff --git a/include/linux/nfs_common.h b/include/linux/nfs_common.h<br/>new file mode 100644<br/>index 000000000000..a541c3a02887<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nfs_common.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * This file contains constants and methods used by both NFS client and server.</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_NFS_COMMON_H</div><div class='add'>+#define _LINUX_NFS_COMMON_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;uapi/linux/nfs.h&gt;</div><div class='add'>+</div><div class='add'>+/* Mapping from NFS error code to "errno" error code. */</div><div class='add'>+</div><div class='add'>+int nfs_stat_to_errno(enum nfs_stat status);</div><div class='add'>+int nfs4_stat_to_errno(int stat);</div><div class='add'>+</div><div class='add'>+__u32 nfs_localio_errno_to_nfs4_stat(int errno);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_NFS_COMMON_H */</div><div class='head'>diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h<br/>index f5ce7b101146..c585939b6cd6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nfs_fs.h</a></div><div class='hunk'>@@ -77,6 +77,23 @@ struct nfs_lock_context {</div><div class='ctx'> 	struct rcu_head	rcu_head;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nfs_file_localio {</div><div class='add'>+	struct nfsd_file __rcu *ro_file;</div><div class='add'>+	struct nfsd_file __rcu *rw_file;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	void __rcu *nfs_uuid; /* opaque pointer to 'nfs_uuid_t' */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void nfs_localio_file_init(struct nfs_file_localio *nfl)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	nfl-&gt;ro_file = NULL;</div><div class='add'>+	nfl-&gt;rw_file = NULL;</div><div class='add'>+	INIT_LIST_HEAD(&amp;nfl-&gt;list);</div><div class='add'>+	nfl-&gt;nfs_uuid = NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct nfs4_state;</div><div class='ctx'> struct nfs_open_context {</div><div class='ctx'> 	struct nfs_lock_context lock_context;</div><div class='hunk'>@@ -87,15 +104,16 @@ struct nfs_open_context {</div><div class='ctx'> 	struct nfs4_state *state;</div><div class='ctx'> 	fmode_t mode;</div><div class='ctx'> </div><div class='add'>+	int error;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> #define NFS_CONTEXT_BAD			(2)</div><div class='ctx'> #define NFS_CONTEXT_UNLOCK	(3)</div><div class='ctx'> #define NFS_CONTEXT_FILE_OPEN		(4)</div><div class='del'>-	int error;</div><div class='ctx'> </div><div class='del'>-	struct list_head list;</div><div class='ctx'> 	struct nfs4_threshold	*mdsthreshold;</div><div class='add'>+	struct list_head list;</div><div class='ctx'> 	struct rcu_head	rcu_head;</div><div class='add'>+	struct nfs_file_localio nfl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfs_open_dir_context {</div><div class='hunk'>@@ -143,6 +161,12 @@ struct nfs_inode {</div><div class='ctx'> 	unsigned long		cache_validity;		/* bit mask */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * NFS Attributes not included in struct inode</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	struct timespec64	btime;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * read_cache_jiffies is when we started read-caching this inode.</div><div class='ctx'> 	 * attrtimeo is for how long the cached information is assumed</div><div class='ctx'> 	 * to be valid. A successful attribute revalidation doubles</div><div class='hunk'>@@ -298,10 +322,12 @@ struct nfs4_copy_state {</div><div class='ctx'> #define NFS_INO_INVALID_XATTR	BIT(15)		/* xattrs are invalid */</div><div class='ctx'> #define NFS_INO_INVALID_NLINK	BIT(16)		/* cached nlinks is invalid */</div><div class='ctx'> #define NFS_INO_INVALID_MODE	BIT(17)		/* cached mode is invalid */</div><div class='add'>+#define NFS_INO_INVALID_BTIME	BIT(18)		/* cached btime is invalid */</div><div class='ctx'> </div><div class='ctx'> #define NFS_INO_INVALID_ATTR	(NFS_INO_INVALID_CHANGE \</div><div class='ctx'> 		| NFS_INO_INVALID_CTIME \</div><div class='ctx'> 		| NFS_INO_INVALID_MTIME \</div><div class='add'>+		| NFS_INO_INVALID_BTIME \</div><div class='ctx'> 		| NFS_INO_INVALID_SIZE \</div><div class='ctx'> 		| NFS_INO_INVALID_NLINK \</div><div class='ctx'> 		| NFS_INO_INVALID_MODE \</div><div class='hunk'>@@ -561,6 +587,9 @@ extern int nfs_may_open(struct inode *inode, const struct cred *cred, int openfl</div><div class='ctx'> extern void nfs_access_zap_cache(struct inode *inode);</div><div class='ctx'> extern int nfs_access_get_cached(struct inode *inode, const struct cred *cred,</div><div class='ctx'> 				 u32 *mask, bool may_block);</div><div class='add'>+extern int nfs_atomic_open_v23(struct inode *dir, struct dentry *dentry,</div><div class='add'>+			       struct file *file, unsigned int open_flags,</div><div class='add'>+			       umode_t mode);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * linux/fs/nfs/symlink.c</div><div class='hunk'>@@ -611,6 +640,7 @@ int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio);</div><div class='ctx'> extern int  nfs_commit_inode(struct inode *, int);</div><div class='ctx'> extern struct nfs_commit_data *nfs_commitdata_alloc(void);</div><div class='ctx'> extern void nfs_commit_free(struct nfs_commit_data *data);</div><div class='add'>+void nfs_commit_begin(struct nfs_mds_commit_info *cinfo);</div><div class='ctx'> bool nfs_commit_end(struct nfs_mds_commit_info *cinfo);</div><div class='ctx'> </div><div class='ctx'> static inline bool nfs_have_writebacks(const struct inode *inode)</div><div class='head'>diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h<br/>index 92de074e63b9..d30c0245031c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_fs_sb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_fs_sb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_fs_sb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nfs_fs_sb.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_xdr.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/xprt.h&gt;</div><div class='add'>+#include &lt;linux/nfslocalio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='hunk'>@@ -49,6 +50,7 @@ struct nfs_client {</div><div class='ctx'> #define NFS_CS_DS		7		/* - Server is a DS */</div><div class='ctx'> #define NFS_CS_REUSEPORT	8		/* - reuse src port on reconnect */</div><div class='ctx'> #define NFS_CS_PNFS		9		/* - Server used for pnfs */</div><div class='add'>+#define NFS_CS_NETUNREACH_FATAL	10		/* - ENETUNREACH errors are fatal */</div><div class='ctx'> 	struct sockaddr_storage	cl_addr;	/* server identifier */</div><div class='ctx'> 	size_t			cl_addrlen;</div><div class='ctx'> 	char *			cl_hostname;	/* hostname of server */</div><div class='hunk'>@@ -123,8 +125,16 @@ struct nfs_client {</div><div class='ctx'> 	 */</div><div class='ctx'> 	char			cl_ipaddr[48];</div><div class='ctx'> 	struct net		*cl_net;</div><div class='add'>+	netns_tracker		cl_ns_tracker;</div><div class='ctx'> 	struct list_head	pending_cb_stateids;</div><div class='ctx'> 	struct rcu_head		rcu;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+	struct timespec64	cl_nfssvc_boot;</div><div class='add'>+	seqlock_t		cl_boot_lock;</div><div class='add'>+	nfs_uuid_t		cl_uuid;</div><div class='add'>+	struct work_struct	cl_local_probe_work;</div><div class='add'>+#endif /* CONFIG_NFS_LOCALIO */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -140,6 +150,7 @@ struct nfs_server {</div><div class='ctx'> 	struct rpc_clnt *	client_acl;	/* ACL RPC client handle */</div><div class='ctx'> 	struct nlm_host		*nlm_host;	/* NLM client handle */</div><div class='ctx'> 	struct nfs_iostats __percpu *io_stats;	/* I/O statistics */</div><div class='add'>+	wait_queue_head_t	write_congestion_wait;	/* wait until write congestion eases */</div><div class='ctx'> 	atomic_long_t		writeback;	/* number of writeback pages */</div><div class='ctx'> 	unsigned int		write_congested;/* flag set when writeback gets too high */</div><div class='ctx'> 	unsigned int		flags;		/* various flags */</div><div class='hunk'>@@ -157,13 +168,15 @@ struct nfs_server {</div><div class='ctx'> #define NFS_MOUNT_WRITE_WAIT		0x02000000</div><div class='ctx'> #define NFS_MOUNT_TRUNK_DISCOVERY	0x04000000</div><div class='ctx'> #define NFS_MOUNT_SHUTDOWN			0x08000000</div><div class='add'>+#define NFS_MOUNT_NO_ALIGNWRITE		0x10000000</div><div class='add'>+#define NFS_MOUNT_FORCE_RDIRPLUS	0x20000000</div><div class='add'>+#define NFS_MOUNT_NETUNREACH_FATAL	0x40000000</div><div class='ctx'> </div><div class='del'>-	unsigned int		fattr_valid;	/* Valid attributes */</div><div class='ctx'> 	unsigned int		caps;		/* server capabilities */</div><div class='add'>+	__u64			fattr_valid;	/* Valid attributes */</div><div class='ctx'> 	unsigned int		rsize;		/* read size */</div><div class='ctx'> 	unsigned int		rpages;		/* read size (in pages) */</div><div class='ctx'> 	unsigned int		wsize;		/* write size */</div><div class='del'>-	unsigned int		wpages;		/* write size (in pages) */</div><div class='ctx'> 	unsigned int		wtmult;		/* server disk block size */</div><div class='ctx'> 	unsigned int		dtsize;		/* readdir size */</div><div class='ctx'> 	unsigned short		port;		/* "port=" setting */</div><div class='hunk'>@@ -189,7 +202,6 @@ struct nfs_server {</div><div class='ctx'> 	struct nfs_fsid		fsid;</div><div class='ctx'> 	int			s_sysfs_id;	/* sysfs dentry index */</div><div class='ctx'> 	__u64			maxfilesize;	/* maximum file size */</div><div class='del'>-	struct timespec64	time_delta;	/* smallest time granularity */</div><div class='ctx'> 	unsigned long		mount_time;	/* when this fs was mounted */</div><div class='ctx'> 	struct super_block	*super;		/* VFS super block */</div><div class='ctx'> 	dev_t			s_dev;		/* superblock dev numbers */</div><div class='hunk'>@@ -200,6 +212,15 @@ struct nfs_server {</div><div class='ctx'> 	char			*fscache_uniq;	/* Uniquifier (or NULL) */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/* The following #defines numerically match the NFSv4 equivalents */</div><div class='add'>+#define NFS_FH_NOEXPIRE_WITH_OPEN (0x1)</div><div class='add'>+#define NFS_FH_VOLATILE_ANY (0x2)</div><div class='add'>+#define NFS_FH_VOL_MIGRATION (0x4)</div><div class='add'>+#define NFS_FH_VOL_RENAME (0x8)</div><div class='add'>+#define NFS_FH_RENAME_UNSAFE (NFS_FH_VOLATILE_ANY | NFS_FH_VOL_RENAME)</div><div class='add'>+	u32			fh_expire_type;	/* V4 bitmask representing file</div><div class='add'>+						   handle volatility type for</div><div class='add'>+						   this filesystem */</div><div class='ctx'> 	u32			pnfs_blksize;	/* layout_blksize attr */</div><div class='ctx'> #if IS_ENABLED(CONFIG_NFS_V4)</div><div class='ctx'> 	u32			attr_bitmask[3];/* V4 bitmask representing the set</div><div class='hunk'>@@ -223,23 +244,26 @@ struct nfs_server {</div><div class='ctx'> 	u32			acl_bitmask;	/* V4 bitmask representing the ACEs</div><div class='ctx'> 						   that are supported on this</div><div class='ctx'> 						   filesystem */</div><div class='del'>-	u32			fh_expire_type;	/* V4 bitmask representing file</div><div class='del'>-						   handle volatility type for</div><div class='del'>-						   this filesystem */</div><div class='ctx'> 	struct pnfs_layoutdriver_type  *pnfs_curr_ld; /* Active layout driver */</div><div class='ctx'> 	struct rpc_wait_queue	roc_rpcwaitq;</div><div class='del'>-	void			*pnfs_ld_data;	/* per mount point data */</div><div class='ctx'> </div><div class='ctx'> 	/* the following fields are protected by nfs_client-&gt;cl_lock */</div><div class='ctx'> 	struct rb_root		state_owners;</div><div class='ctx'> #endif</div><div class='del'>-	struct ida		openowner_id;</div><div class='del'>-	struct ida		lockowner_id;</div><div class='add'>+	atomic64_t		owner_ctr;</div><div class='ctx'> 	struct list_head	state_owners_lru;</div><div class='ctx'> 	struct list_head	layouts;</div><div class='ctx'> 	struct list_head	delegations;</div><div class='add'>+	atomic_long_t		nr_active_delegations;</div><div class='add'>+	unsigned int		delegation_hash_mask;</div><div class='add'>+	struct hlist_head	*delegation_hash_table;</div><div class='ctx'> 	struct list_head	ss_copies;</div><div class='add'>+	struct list_head	ss_src_copies;</div><div class='ctx'> </div><div class='add'>+	unsigned long		delegation_flags;</div><div class='add'>+#define NFS4SERV_DELEGRETURN		(1)</div><div class='add'>+#define NFS4SERV_DELEGATION_EXPIRED	(2)</div><div class='add'>+#define NFS4SERV_DELEGRETURN_DELAYED	(3)</div><div class='ctx'> 	unsigned long		delegation_gen;</div><div class='ctx'> 	unsigned long		mig_gen;</div><div class='ctx'> 	unsigned long		mig_status;</div><div class='hunk'>@@ -278,6 +302,11 @@ struct nfs_server {</div><div class='ctx'> #define NFS_CAP_LGOPEN		(1U &lt;&lt; 5)</div><div class='ctx'> #define NFS_CAP_CASE_INSENSITIVE	(1U &lt;&lt; 6)</div><div class='ctx'> #define NFS_CAP_CASE_PRESERVING	(1U &lt;&lt; 7)</div><div class='add'>+#define NFS_CAP_REBOOT_LAYOUTRETURN	(1U &lt;&lt; 8)</div><div class='add'>+#define NFS_CAP_OFFLOAD_STATUS	(1U &lt;&lt; 9)</div><div class='add'>+#define NFS_CAP_ZERO_RANGE	(1U &lt;&lt; 10)</div><div class='add'>+#define NFS_CAP_OPEN_XOR	(1U &lt;&lt; 12)</div><div class='add'>+#define NFS_CAP_DELEGTIME	(1U &lt;&lt; 13)</div><div class='ctx'> #define NFS_CAP_POSIX_LOCK	(1U &lt;&lt; 14)</div><div class='ctx'> #define NFS_CAP_UIDGID_NOMAP	(1U &lt;&lt; 15)</div><div class='ctx'> #define NFS_CAP_STATEID_NFSV41	(1U &lt;&lt; 16)</div><div class='head'>diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h<br/>index 1c315f854ea8..afe1d8f09d89 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_page.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_page.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_page.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nfs_page.h</a></div><div class='hunk'>@@ -122,8 +122,6 @@ struct nfs_pageio_descriptor {</div><div class='ctx'> /* arbitrarily selected limit to number of mirrors */</div><div class='ctx'> #define NFS_PAGEIO_DESCRIPTOR_MIRROR_MAX 16</div><div class='ctx'> </div><div class='del'>-#define NFS_WBACK_BUSY(req)	(test_bit(PG_BUSY,&amp;(req)-&gt;wb_flags))</div><div class='del'>-</div><div class='ctx'> extern struct nfs_page *nfs_page_create_from_page(struct nfs_open_context *ctx,</div><div class='ctx'> 						  struct page *page,</div><div class='ctx'> 						  unsigned int pgbase,</div><div class='hunk'>@@ -152,17 +150,15 @@ extern	void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *, pgoff_t);</div><div class='ctx'> extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,</div><div class='ctx'> 				struct nfs_page *prev,</div><div class='ctx'> 				struct nfs_page *req);</div><div class='del'>-extern  int nfs_wait_on_request(struct nfs_page *);</div><div class='ctx'> extern	void nfs_unlock_request(struct nfs_page *req);</div><div class='ctx'> extern	void nfs_unlock_and_release_request(struct nfs_page *);</div><div class='del'>-extern	struct nfs_page *nfs_page_group_lock_head(struct nfs_page *req);</div><div class='del'>-extern	int nfs_page_group_lock_subrequests(struct nfs_page *head);</div><div class='ctx'> extern void nfs_join_page_group(struct nfs_page *head,</div><div class='ctx'> 				struct nfs_commit_info *cinfo,</div><div class='ctx'> 				struct inode *inode);</div><div class='ctx'> extern int nfs_page_group_lock(struct nfs_page *);</div><div class='ctx'> extern void nfs_page_group_unlock(struct nfs_page *);</div><div class='ctx'> extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int);</div><div class='add'>+extern bool nfs_page_group_sync_on_bit_locked(struct nfs_page *, unsigned int);</div><div class='ctx'> extern	int nfs_page_set_headlock(struct nfs_page *req);</div><div class='ctx'> extern void nfs_page_clear_headlock(struct nfs_page *req);</div><div class='ctx'> extern bool nfs_async_iocounter_wait(struct rpc_task *, struct nfs_lock_context *);</div><div class='hunk'>@@ -208,8 +204,8 @@ static inline struct inode *nfs_page_to_inode(const struct nfs_page *req)</div><div class='ctx'> 	struct folio *folio = nfs_page_to_folio(req);</div><div class='ctx'> </div><div class='ctx'> 	if (folio == NULL)</div><div class='del'>-		return page_file_mapping(req-&gt;wb_page)-&gt;host;</div><div class='del'>-	return folio_file_mapping(folio)-&gt;host;</div><div class='add'>+		return req-&gt;wb_page-&gt;mapping-&gt;host;</div><div class='add'>+	return folio-&gt;mapping-&gt;host;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h<br/>index 539b57fbf3ce..31463286402f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_xdr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nfs_xdr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nfs_xdr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nfs_xdr.h</a></div><div class='hunk'>@@ -45,7 +45,7 @@ struct nfs4_threshold {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfs_fattr {</div><div class='del'>-	unsigned int		valid;		/* which fields are valid */</div><div class='add'>+	__u64			valid;		/* which fields are valid */</div><div class='ctx'> 	umode_t			mode;</div><div class='ctx'> 	__u32			nlink;</div><div class='ctx'> 	kuid_t			uid;</div><div class='hunk'>@@ -67,6 +67,7 @@ struct nfs_fattr {</div><div class='ctx'> 	struct timespec64	atime;</div><div class='ctx'> 	struct timespec64	mtime;</div><div class='ctx'> 	struct timespec64	ctime;</div><div class='add'>+	struct timespec64	btime;</div><div class='ctx'> 	__u64			change_attr;	/* NFSv4 change attribute */</div><div class='ctx'> 	__u64			pre_change_attr;/* pre-op NFSv4 change attribute */</div><div class='ctx'> 	__u64			pre_size;	/* pre_op_attr.size	  */</div><div class='hunk'>@@ -80,32 +81,33 @@ struct nfs_fattr {</div><div class='ctx'> 	struct nfs4_label	*label;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NFS_ATTR_FATTR_TYPE		(1U &lt;&lt; 0)</div><div class='del'>-#define NFS_ATTR_FATTR_MODE		(1U &lt;&lt; 1)</div><div class='del'>-#define NFS_ATTR_FATTR_NLINK		(1U &lt;&lt; 2)</div><div class='del'>-#define NFS_ATTR_FATTR_OWNER		(1U &lt;&lt; 3)</div><div class='del'>-#define NFS_ATTR_FATTR_GROUP		(1U &lt;&lt; 4)</div><div class='del'>-#define NFS_ATTR_FATTR_RDEV		(1U &lt;&lt; 5)</div><div class='del'>-#define NFS_ATTR_FATTR_SIZE		(1U &lt;&lt; 6)</div><div class='del'>-#define NFS_ATTR_FATTR_PRESIZE		(1U &lt;&lt; 7)</div><div class='del'>-#define NFS_ATTR_FATTR_BLOCKS_USED	(1U &lt;&lt; 8)</div><div class='del'>-#define NFS_ATTR_FATTR_SPACE_USED	(1U &lt;&lt; 9)</div><div class='del'>-#define NFS_ATTR_FATTR_FSID		(1U &lt;&lt; 10)</div><div class='del'>-#define NFS_ATTR_FATTR_FILEID		(1U &lt;&lt; 11)</div><div class='del'>-#define NFS_ATTR_FATTR_ATIME		(1U &lt;&lt; 12)</div><div class='del'>-#define NFS_ATTR_FATTR_MTIME		(1U &lt;&lt; 13)</div><div class='del'>-#define NFS_ATTR_FATTR_CTIME		(1U &lt;&lt; 14)</div><div class='del'>-#define NFS_ATTR_FATTR_PREMTIME		(1U &lt;&lt; 15)</div><div class='del'>-#define NFS_ATTR_FATTR_PRECTIME		(1U &lt;&lt; 16)</div><div class='del'>-#define NFS_ATTR_FATTR_CHANGE		(1U &lt;&lt; 17)</div><div class='del'>-#define NFS_ATTR_FATTR_PRECHANGE	(1U &lt;&lt; 18)</div><div class='del'>-#define NFS_ATTR_FATTR_V4_LOCATIONS	(1U &lt;&lt; 19)</div><div class='del'>-#define NFS_ATTR_FATTR_V4_REFERRAL	(1U &lt;&lt; 20)</div><div class='del'>-#define NFS_ATTR_FATTR_MOUNTPOINT	(1U &lt;&lt; 21)</div><div class='del'>-#define NFS_ATTR_FATTR_MOUNTED_ON_FILEID (1U &lt;&lt; 22)</div><div class='del'>-#define NFS_ATTR_FATTR_OWNER_NAME	(1U &lt;&lt; 23)</div><div class='del'>-#define NFS_ATTR_FATTR_GROUP_NAME	(1U &lt;&lt; 24)</div><div class='del'>-#define NFS_ATTR_FATTR_V4_SECURITY_LABEL (1U &lt;&lt; 25)</div><div class='add'>+#define NFS_ATTR_FATTR_TYPE		BIT_ULL(0)</div><div class='add'>+#define NFS_ATTR_FATTR_MODE		BIT_ULL(1)</div><div class='add'>+#define NFS_ATTR_FATTR_NLINK		BIT_ULL(2)</div><div class='add'>+#define NFS_ATTR_FATTR_OWNER		BIT_ULL(3)</div><div class='add'>+#define NFS_ATTR_FATTR_GROUP		BIT_ULL(4)</div><div class='add'>+#define NFS_ATTR_FATTR_RDEV		BIT_ULL(5)</div><div class='add'>+#define NFS_ATTR_FATTR_SIZE		BIT_ULL(6)</div><div class='add'>+#define NFS_ATTR_FATTR_PRESIZE		BIT_ULL(7)</div><div class='add'>+#define NFS_ATTR_FATTR_BLOCKS_USED	BIT_ULL(8)</div><div class='add'>+#define NFS_ATTR_FATTR_SPACE_USED	BIT_ULL(9)</div><div class='add'>+#define NFS_ATTR_FATTR_FSID		BIT_ULL(10)</div><div class='add'>+#define NFS_ATTR_FATTR_FILEID		BIT_ULL(11)</div><div class='add'>+#define NFS_ATTR_FATTR_ATIME		BIT_ULL(12)</div><div class='add'>+#define NFS_ATTR_FATTR_MTIME		BIT_ULL(13)</div><div class='add'>+#define NFS_ATTR_FATTR_CTIME		BIT_ULL(14)</div><div class='add'>+#define NFS_ATTR_FATTR_PREMTIME		BIT_ULL(15)</div><div class='add'>+#define NFS_ATTR_FATTR_PRECTIME		BIT_ULL(16)</div><div class='add'>+#define NFS_ATTR_FATTR_CHANGE		BIT_ULL(17)</div><div class='add'>+#define NFS_ATTR_FATTR_PRECHANGE	BIT_ULL(18)</div><div class='add'>+#define NFS_ATTR_FATTR_V4_LOCATIONS	BIT_ULL(19)</div><div class='add'>+#define NFS_ATTR_FATTR_V4_REFERRAL	BIT_ULL(20)</div><div class='add'>+#define NFS_ATTR_FATTR_MOUNTPOINT	BIT_ULL(21)</div><div class='add'>+#define NFS_ATTR_FATTR_MOUNTED_ON_FILEID BIT_ULL(22)</div><div class='add'>+#define NFS_ATTR_FATTR_OWNER_NAME	BIT_ULL(23)</div><div class='add'>+#define NFS_ATTR_FATTR_GROUP_NAME	BIT_ULL(24)</div><div class='add'>+#define NFS_ATTR_FATTR_V4_SECURITY_LABEL BIT_ULL(25)</div><div class='add'>+#define NFS_ATTR_FATTR_BTIME		BIT_ULL(26)</div><div class='ctx'> </div><div class='ctx'> #define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \</div><div class='ctx'> 		| NFS_ATTR_FATTR_MODE \</div><div class='hunk'>@@ -126,6 +128,7 @@ struct nfs_fattr {</div><div class='ctx'> 		| NFS_ATTR_FATTR_SPACE_USED)</div><div class='ctx'> #define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \</div><div class='ctx'> 		| NFS_ATTR_FATTR_SPACE_USED \</div><div class='add'>+		| NFS_ATTR_FATTR_BTIME \</div><div class='ctx'> 		| NFS_ATTR_FATTR_V4_SECURITY_LABEL)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -446,7 +449,23 @@ struct nfs42_clone_res {</div><div class='ctx'> </div><div class='ctx'> struct stateowner_id {</div><div class='ctx'> 	__u64	create_time;</div><div class='del'>-	__u32	uniquifier;</div><div class='add'>+	__u64	uniquifier;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nfs4_open_delegation {</div><div class='add'>+	__u32 open_delegation_type;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			fmode_t			type;</div><div class='add'>+			__u32			do_recall;</div><div class='add'>+			nfs4_stateid		stateid;</div><div class='add'>+			unsigned long		pagemod_limit;</div><div class='add'>+		};</div><div class='add'>+		struct {</div><div class='add'>+			__u32			why_no_delegation;</div><div class='add'>+			__u32			will_notify;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -468,7 +487,7 @@ struct nfs_openargs {</div><div class='ctx'> 			nfs4_verifier   verifier; /* EXCLUSIVE */</div><div class='ctx'> 		};</div><div class='ctx'> 		nfs4_stateid	delegation;		/* CLAIM_DELEGATE_CUR */</div><div class='del'>-		fmode_t		delegation_type;	/* CLAIM_PREVIOUS */</div><div class='add'>+		__u32		delegation_type;	/* CLAIM_PREVIOUS */</div><div class='ctx'> 	} u;</div><div class='ctx'> 	const struct qstr *	name;</div><div class='ctx'> 	const struct nfs_server *server;	 /* Needed for ID mapping */</div><div class='hunk'>@@ -490,13 +509,10 @@ struct nfs_openres {</div><div class='ctx'> 	struct nfs_fattr *      f_attr;</div><div class='ctx'> 	struct nfs_seqid *	seqid;</div><div class='ctx'> 	const struct nfs_server *server;</div><div class='del'>-	fmode_t			delegation_type;</div><div class='del'>-	nfs4_stateid		delegation;</div><div class='del'>-	unsigned long		pagemod_limit;</div><div class='del'>-	__u32			do_recall;</div><div class='ctx'> 	__u32			attrset[NFS4_BITMAP_SIZE];</div><div class='ctx'> 	struct nfs4_string	*owner;</div><div class='ctx'> 	struct nfs4_string	*group_owner;</div><div class='add'>+	struct nfs4_open_delegation	delegation;</div><div class='ctx'> 	__u32			access_request;</div><div class='ctx'> 	__u32			access_supported;</div><div class='ctx'> 	__u32			access_result;</div><div class='hunk'>@@ -609,6 +625,13 @@ struct nfs_release_lockowner_res {</div><div class='ctx'> 	struct nfs4_sequence_res	seq_res;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nfs4_delegattr {</div><div class='add'>+	struct timespec64	atime;</div><div class='add'>+	struct timespec64	mtime;</div><div class='add'>+	bool			atime_set;</div><div class='add'>+	bool			mtime_set;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct nfs4_delegreturnargs {</div><div class='ctx'> 	struct nfs4_sequence_args	seq_args;</div><div class='ctx'> 	const struct nfs_fh *fhandle;</div><div class='hunk'>@@ -616,6 +639,7 @@ struct nfs4_delegreturnargs {</div><div class='ctx'> 	const u32 *bitmask;</div><div class='ctx'> 	u32 bitmask_store[NFS_BITMASK_SZ];</div><div class='ctx'> 	struct nfs4_layoutreturn_args *lr_args;</div><div class='add'>+	struct nfs4_delegattr *sattr_args;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfs4_delegreturnres {</div><div class='hunk'>@@ -624,6 +648,8 @@ struct nfs4_delegreturnres {</div><div class='ctx'> 	struct nfs_server *server;</div><div class='ctx'> 	struct nfs4_layoutreturn_res *lr_res;</div><div class='ctx'> 	int lr_ret;</div><div class='add'>+	bool sattr_res;</div><div class='add'>+	int sattr_ret;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -836,7 +862,7 @@ struct nfs_getaclres {</div><div class='ctx'> 	size_t				acl_len;</div><div class='ctx'> 	size_t				acl_data_offset;</div><div class='ctx'> 	int				acl_flags;</div><div class='del'>-	struct page *			acl_scratch;</div><div class='add'>+	struct folio *			acl_scratch;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfs_setattrres {</div><div class='hunk'>@@ -1190,6 +1216,14 @@ struct nfs4_statfs_res {</div><div class='ctx'> 	struct nfs_fsstat	       *fsstat;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nfs4_open_caps {</div><div class='add'>+	u32				oa_share_access[1];</div><div class='add'>+	u32				oa_share_deny[1];</div><div class='add'>+	u32				oa_share_access_want[1];</div><div class='add'>+	u32				oa_open_claim[1];</div><div class='add'>+	u32				oa_createmode[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct nfs4_server_caps_arg {</div><div class='ctx'> 	struct nfs4_sequence_args	seq_args;</div><div class='ctx'> 	struct nfs_fh		       *fhandle;</div><div class='hunk'>@@ -1206,6 +1240,7 @@ struct nfs4_server_caps_res {</div><div class='ctx'> 	u32				fh_expire_type;</div><div class='ctx'> 	u32				case_insensitive;</div><div class='ctx'> 	u32				case_preserving;</div><div class='add'>+	struct nfs4_open_caps		open_caps;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NFS4_PATHNAME_MAXCOMPONENTS 512</div><div class='hunk'>@@ -1283,11 +1318,6 @@ struct nfs4_fsid_present_res {</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_NFS_V4 */</div><div class='ctx'> </div><div class='del'>-struct nfstime4 {</div><div class='del'>-	u64	seconds;</div><div class='del'>-	u32	nseconds;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NFS_V4_1</div><div class='ctx'> </div><div class='ctx'> struct pnfs_commit_bucket {</div><div class='hunk'>@@ -1304,7 +1334,7 @@ struct pnfs_commit_array {</div><div class='ctx'> 	struct rcu_head rcu;</div><div class='ctx'> 	refcount_t refcount;</div><div class='ctx'> 	unsigned int nbuckets;</div><div class='del'>-	struct pnfs_commit_bucket buckets[];</div><div class='add'>+	struct pnfs_commit_bucket buckets[] __counted_by(nbuckets);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pnfs_ds_commit_info {</div><div class='hunk'>@@ -1406,7 +1436,7 @@ struct nfs41_secinfo_no_name_args {</div><div class='ctx'> </div><div class='ctx'> struct nfs41_test_stateid_args {</div><div class='ctx'> 	struct nfs4_sequence_args	seq_args;</div><div class='del'>-	nfs4_stateid			*stateid;</div><div class='add'>+	nfs4_stateid			stateid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfs41_test_stateid_res {</div><div class='hunk'>@@ -1488,8 +1518,9 @@ struct nfs42_offload_status_args {</div><div class='ctx'> </div><div class='ctx'> struct nfs42_offload_status_res {</div><div class='ctx'> 	struct nfs4_sequence_res	osr_seq_res;</div><div class='del'>-	uint64_t			osr_count;</div><div class='del'>-	int				osr_status;</div><div class='add'>+	u64				osr_count;</div><div class='add'>+	int				complete_count;</div><div class='add'>+	u32				osr_complete;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfs42_copy_notify_args {</div><div class='hunk'>@@ -1565,7 +1596,7 @@ struct nfs42_listxattrsargs {</div><div class='ctx'> </div><div class='ctx'> struct nfs42_listxattrsres {</div><div class='ctx'> 	struct nfs4_sequence_res	seq_res;</div><div class='del'>-	struct page			*scratch;</div><div class='add'>+	struct folio			*scratch;</div><div class='ctx'> 	void				*xattr_buf;</div><div class='ctx'> 	size_t				xattr_len;</div><div class='ctx'> 	u64				cookie;</div><div class='hunk'>@@ -1605,6 +1636,7 @@ enum {</div><div class='ctx'> 	NFS_IOHDR_RESEND_PNFS,</div><div class='ctx'> 	NFS_IOHDR_RESEND_MDS,</div><div class='ctx'> 	NFS_IOHDR_UNSTABLE_WRITES,</div><div class='add'>+	NFS_IOHDR_ODIRECT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nfs_io_completion;</div><div class='hunk'>@@ -1627,6 +1659,7 @@ struct nfs_pgio_header {</div><div class='ctx'> 	void			*netfs;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	unsigned short		retrans;</div><div class='ctx'> 	int			pnfs_error;</div><div class='ctx'> 	int			error;		/* merge with pnfs_error */</div><div class='ctx'> 	unsigned int		good_bytes;	/* boundary of good data */</div><div class='hunk'>@@ -1753,7 +1786,7 @@ struct nfs_rpc_ops {</div><div class='ctx'> 			    struct nfs_fattr *, struct inode *);</div><div class='ctx'> 	int	(*setattr) (struct dentry *, struct nfs_fattr *,</div><div class='ctx'> 			    struct iattr *);</div><div class='del'>-	int	(*lookup)  (struct inode *, struct dentry *,</div><div class='add'>+	int	(*lookup)  (struct inode *, struct dentry *, const struct qstr *,</div><div class='ctx'> 			    struct nfs_fh *, struct nfs_fattr *);</div><div class='ctx'> 	int	(*lookupp) (struct inode *, struct nfs_fh *,</div><div class='ctx'> 			    struct nfs_fattr *);</div><div class='hunk'>@@ -1774,7 +1807,7 @@ struct nfs_rpc_ops {</div><div class='ctx'> 	int	(*link)    (struct inode *, struct inode *, const struct qstr *);</div><div class='ctx'> 	int	(*symlink) (struct inode *, struct dentry *, struct folio *,</div><div class='ctx'> 			    unsigned int, struct iattr *);</div><div class='del'>-	int	(*mkdir)   (struct inode *, struct dentry *, struct iattr *);</div><div class='add'>+	struct dentry *(*mkdir)   (struct inode *, struct dentry *, struct iattr *);</div><div class='ctx'> 	int	(*rmdir)   (struct inode *, const struct qstr *);</div><div class='ctx'> 	int	(*readdir) (struct nfs_readdir_arg *, struct nfs_readdir_res *);</div><div class='ctx'> 	int	(*mknod)   (struct inode *, struct dentry *, struct iattr *,</div><div class='hunk'>@@ -1807,7 +1840,8 @@ struct nfs_rpc_ops {</div><div class='ctx'> 				int open_flags,</div><div class='ctx'> 				struct iattr *iattr,</div><div class='ctx'> 				int *);</div><div class='del'>-	int (*have_delegation)(struct inode *, fmode_t);</div><div class='add'>+	int (*have_delegation)(struct inode *, fmode_t, int);</div><div class='add'>+	int (*return_delegation)(struct inode *);</div><div class='ctx'> 	struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *);</div><div class='ctx'> 	struct nfs_client *(*init_client) (struct nfs_client *,</div><div class='ctx'> 				const struct nfs_client_initdata *);</div><div class='hunk'>@@ -1821,11 +1855,22 @@ struct nfs_rpc_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * 	NFS_CALL(getattr, inode, (fattr));</div><div class='del'>- * into</div><div class='del'>- *	NFS_PROTO(inode)-&gt;getattr(fattr);</div><div class='add'>+ * Helper functions used by NFS client and/or server</div><div class='ctx'>  */</div><div class='del'>-#define NFS_CALL(op, inode, args)	NFS_PROTO(inode)-&gt;op args</div><div class='add'>+static inline void encode_opaque_fixed(struct xdr_stream *xdr,</div><div class='add'>+				       const void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) &lt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int decode_opaque_fixed(struct xdr_stream *xdr,</div><div class='add'>+				      void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret = xdr_stream_decode_opaque_fixed(xdr, buf, len);</div><div class='add'>+	if (unlikely(ret &lt; 0))</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Function vectors etc. for the NFS client</div><div class='hunk'>@@ -1840,4 +1885,4 @@ extern const struct rpc_version nfs_version4;</div><div class='ctx'> extern const struct rpc_version nfsacl_version3;</div><div class='ctx'> extern const struct rpc_program nfsacl_program;</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#endif /* _LINUX_NFS_XDR_H */</div><div class='head'>diff --git a/include/linux/nfslocalio.h b/include/linux/nfslocalio.h<br/>new file mode 100644<br/>index 000000000000..3d91043254e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nfslocalio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nfslocalio.h</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Mike Snitzer &lt;snitzer@hammerspace.com&gt;</div><div class='add'>+ * Copyright (C) 2024 NeilBrown &lt;neilb@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef __LINUX_NFSLOCALIO_H</div><div class='add'>+#define __LINUX_NFSLOCALIO_H</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NFS_LOCALIO)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/clnt.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/svcauth.h&gt;</div><div class='add'>+#include &lt;linux/nfs.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+</div><div class='add'>+struct nfs_client;</div><div class='add'>+struct nfs_file_localio;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Useful to allow a client to negotiate if localio</div><div class='add'>+ * possible with its server.</div><div class='add'>+ *</div><div class='add'>+ * See Documentation/filesystems/nfs/localio.rst for more detail.</div><div class='add'>+ */</div><div class='add'>+typedef struct {</div><div class='add'>+	uuid_t uuid;</div><div class='add'>+	unsigned nfs3_localio_probe_count;</div><div class='add'>+	/* this struct is over a cacheline, avoid bouncing */</div><div class='add'>+	spinlock_t ____cacheline_aligned lock;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	spinlock_t *list_lock; /* nn-&gt;local_clients_lock */</div><div class='add'>+	struct net __rcu *net; /* nfsd's network namespace */</div><div class='add'>+	struct auth_domain *dom; /* auth_domain for localio */</div><div class='add'>+	/* Local files to close when net is shut down or exports change */</div><div class='add'>+	struct list_head files;</div><div class='add'>+} nfs_uuid_t;</div><div class='add'>+</div><div class='add'>+void nfs_uuid_init(nfs_uuid_t *);</div><div class='add'>+bool nfs_uuid_begin(nfs_uuid_t *);</div><div class='add'>+void nfs_uuid_end(nfs_uuid_t *);</div><div class='add'>+void nfs_uuid_is_local(const uuid_t *, struct list_head *, spinlock_t *,</div><div class='add'>+		       struct net *, struct auth_domain *, struct module *);</div><div class='add'>+</div><div class='add'>+void nfs_localio_enable_client(struct nfs_client *clp);</div><div class='add'>+void nfs_localio_disable_client(struct nfs_client *clp);</div><div class='add'>+void nfs_localio_invalidate_clients(struct list_head *nn_local_clients,</div><div class='add'>+				    spinlock_t *nn_local_clients_lock);</div><div class='add'>+</div><div class='add'>+/* localio needs to map filehandle -&gt; struct nfsd_file */</div><div class='add'>+void nfs_close_local_fh(struct nfs_file_localio *);</div><div class='add'>+</div><div class='add'>+struct nfsd_localio_operations {</div><div class='add'>+	bool (*nfsd_net_try_get)(struct net *);</div><div class='add'>+	void (*nfsd_net_put)(struct net *);</div><div class='add'>+	struct nfsd_file *(*nfsd_open_local_fh)(struct net *,</div><div class='add'>+						struct auth_domain *,</div><div class='add'>+						struct rpc_clnt *,</div><div class='add'>+						const struct cred *,</div><div class='add'>+						const struct nfs_fh *,</div><div class='add'>+						struct nfsd_file __rcu **pnf,</div><div class='add'>+						const fmode_t);</div><div class='add'>+	struct net *(*nfsd_file_put_local)(struct nfsd_file __rcu **);</div><div class='add'>+	struct file *(*nfsd_file_file)(struct nfsd_file *);</div><div class='add'>+	void (*nfsd_file_dio_alignment)(struct nfsd_file *,</div><div class='add'>+					u32 *, u32 *, u32 *);</div><div class='add'>+} ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+extern void nfsd_localio_ops_init(void);</div><div class='add'>+extern const struct nfsd_localio_operations *nfs_to;</div><div class='add'>+</div><div class='add'>+struct nfsd_file *nfs_open_local_fh(nfs_uuid_t *,</div><div class='add'>+		   struct rpc_clnt *, const struct cred *,</div><div class='add'>+		   const struct nfs_fh *, struct nfs_file_localio *,</div><div class='add'>+		   struct nfsd_file __rcu **pnf,</div><div class='add'>+		   const fmode_t);</div><div class='add'>+</div><div class='add'>+static inline void nfs_to_nfsd_net_put(struct net *net)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Once reference to net (and associated nfsd_serv) is dropped, NFSD</div><div class='add'>+	 * could be unloaded, so ensure safe return from nfsd_net_put() by</div><div class='add'>+	 * always taking RCU.</div><div class='add'>+	 */</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	nfs_to-&gt;nfsd_net_put(net);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nfs_to_nfsd_file_put_local(struct nfsd_file __rcu **localio)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Either *localio must be guaranteed to be non-NULL, or caller</div><div class='add'>+	 * must prevent nfsd shutdown from completing as nfs_close_local_fh()</div><div class='add'>+	 * does by blocking the nfs_uuid from being finally put.</div><div class='add'>+	 */</div><div class='add'>+	struct net *net;</div><div class='add'>+</div><div class='add'>+	net = nfs_to-&gt;nfsd_file_put_local(localio);</div><div class='add'>+</div><div class='add'>+	if (net)</div><div class='add'>+		nfs_to_nfsd_net_put(net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else   /* CONFIG_NFS_LOCALIO */</div><div class='add'>+</div><div class='add'>+struct nfs_file_localio;</div><div class='add'>+static inline void nfs_close_local_fh(struct nfs_file_localio *nfl)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void nfsd_localio_ops_init(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+struct nfs_client;</div><div class='add'>+static inline void nfs_localio_disable_client(struct nfs_client *clp)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /* CONFIG_NFS_LOCALIO */</div><div class='add'>+</div><div class='add'>+#endif  /* __LINUX_NFSLOCALIO_H */</div><div class='head'>diff --git a/include/linux/nmi.h b/include/linux/nmi.h<br/>index e92e378df000..cf3c6ab408aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nmi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nmi.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> void lockup_detector_init(void);</div><div class='ctx'> void lockup_detector_retry_init(void);</div><div class='ctx'> void lockup_detector_soft_poweroff(void);</div><div class='del'>-void lockup_detector_cleanup(void);</div><div class='ctx'> </div><div class='ctx'> extern int watchdog_user_enabled;</div><div class='ctx'> extern int watchdog_thresh;</div><div class='hunk'>@@ -37,7 +36,6 @@ extern int sysctl_hardlockup_all_cpu_backtrace;</div><div class='ctx'> static inline void lockup_detector_init(void) { }</div><div class='ctx'> static inline void lockup_detector_retry_init(void) { }</div><div class='ctx'> static inline void lockup_detector_soft_poweroff(void) { }</div><div class='del'>-static inline void lockup_detector_cleanup(void) { }</div><div class='ctx'> #endif /* !CONFIG_LOCKUP_DETECTOR */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SOFTLOCKUP_DETECTOR</div><div class='hunk'>@@ -104,11 +102,13 @@ void watchdog_hardlockup_check(unsigned int cpu, struct pt_regs *regs);</div><div class='ctx'> #if defined(CONFIG_HARDLOCKUP_DETECTOR_PERF)</div><div class='ctx'> extern void hardlockup_detector_perf_stop(void);</div><div class='ctx'> extern void hardlockup_detector_perf_restart(void);</div><div class='del'>-extern void hardlockup_detector_perf_cleanup(void);</div><div class='add'>+extern void hardlockup_config_perf_event(const char *str);</div><div class='add'>+extern void hardlockup_detector_perf_adjust_period(u64 period);</div><div class='ctx'> #else</div><div class='ctx'> static inline void hardlockup_detector_perf_stop(void) { }</div><div class='ctx'> static inline void hardlockup_detector_perf_restart(void) { }</div><div class='del'>-static inline void hardlockup_detector_perf_cleanup(void) { }</div><div class='add'>+static inline void hardlockup_config_perf_event(const char *str) { }</div><div class='add'>+static inline void hardlockup_detector_perf_adjust_period(u64 period) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void watchdog_hardlockup_stop(void);</div><div class='hunk'>@@ -216,13 +216,6 @@ void watchdog_update_hrtimer_threshold(u64 period);</div><div class='ctx'> static inline void watchdog_update_hrtimer_threshold(u64 period) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct ctl_table;</div><div class='del'>-int proc_watchdog(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-int proc_nmi_watchdog(struct ctl_table *, int , void *, size_t *, loff_t *);</div><div class='del'>-int proc_soft_watchdog(struct ctl_table *, int , void *, size_t *, loff_t *);</div><div class='del'>-int proc_watchdog_thresh(struct ctl_table *, int , void *, size_t *, loff_t *);</div><div class='del'>-int proc_watchdog_cpumask(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HAVE_ACPI_APEI_NMI</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/node.h b/include/linux/node.h<br/>index 25b66d705ee2..0269b064ba65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/node.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/node.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/node.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/node.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #define _LINUX_NODE_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -34,6 +33,18 @@ struct access_coordinate {</div><div class='ctx'> 	unsigned int write_latency;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ACCESS_COORDINATE_LOCAL correlates to ACCESS CLASS 0</div><div class='add'>+ *	- access_coordinate between target node and nearest initiator node</div><div class='add'>+ * ACCESS_COORDINATE_CPU correlates to ACCESS CLASS 1</div><div class='add'>+ *	- access_coordinate between target node and nearest CPU node</div><div class='add'>+ */</div><div class='add'>+enum access_coordinate_class {</div><div class='add'>+	ACCESS_COORDINATE_LOCAL,</div><div class='add'>+	ACCESS_COORDINATE_CPU,</div><div class='add'>+	ACCESS_COORDINATE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum cache_indexing {</div><div class='ctx'> 	NODE_CACHE_DIRECT_MAP,</div><div class='ctx'> 	NODE_CACHE_INDEXED,</div><div class='hunk'>@@ -46,6 +57,11 @@ enum cache_write_policy {</div><div class='ctx'> 	NODE_CACHE_WRITE_OTHER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum cache_mode {</div><div class='add'>+	NODE_CACHE_ADDR_MODE_RESERVED,</div><div class='add'>+	NODE_CACHE_ADDR_MODE_EXTENDED_LINEAR,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct node_cache_attrs - system memory caching attributes</div><div class='ctx'>  *</div><div class='hunk'>@@ -54,6 +70,7 @@ enum cache_write_policy {</div><div class='ctx'>  * @size:		Total size of cache in bytes</div><div class='ctx'>  * @line_size:		Number of bytes fetched on a cache miss</div><div class='ctx'>  * @level:		The cache hierarchy level</div><div class='add'>+ * @address_mode:		The address mode</div><div class='ctx'>  */</div><div class='ctx'> struct node_cache_attrs {</div><div class='ctx'> 	enum cache_indexing indexing;</div><div class='hunk'>@@ -61,12 +78,15 @@ struct node_cache_attrs {</div><div class='ctx'> 	u64 size;</div><div class='ctx'> 	u16 line_size;</div><div class='ctx'> 	u8 level;</div><div class='add'>+	u16 address_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HMEM_REPORTING</div><div class='ctx'> void node_add_cache(unsigned int nid, struct node_cache_attrs *cache_attrs);</div><div class='ctx'> void node_set_perf_attrs(unsigned int nid, struct access_coordinate *coord,</div><div class='del'>-			 unsigned access);</div><div class='add'>+			 enum access_coordinate_class access);</div><div class='add'>+void node_update_perf_attrs(unsigned int nid, struct access_coordinate *coord,</div><div class='add'>+			    enum access_coordinate_class access);</div><div class='ctx'> #else</div><div class='ctx'> static inline void node_add_cache(unsigned int nid,</div><div class='ctx'> 				  struct node_cache_attrs *cache_attrs)</div><div class='hunk'>@@ -75,7 +95,13 @@ static inline void node_add_cache(unsigned int nid,</div><div class='ctx'> </div><div class='ctx'> static inline void node_set_perf_attrs(unsigned int nid,</div><div class='ctx'> 				       struct access_coordinate *coord,</div><div class='del'>-				       unsigned access)</div><div class='add'>+				       enum access_coordinate_class access)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void node_update_perf_attrs(unsigned int nid,</div><div class='add'>+					  struct access_coordinate *coord,</div><div class='add'>+					  enum access_coordinate_class access)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -93,64 +119,79 @@ struct memory_block;</div><div class='ctx'> extern struct node *node_devices[];</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MEMORY_HOTPLUG) &amp;&amp; defined(CONFIG_NUMA)</div><div class='del'>-void register_memory_blocks_under_node(int nid, unsigned long start_pfn,</div><div class='del'>-				       unsigned long end_pfn,</div><div class='del'>-				       enum meminit_context context);</div><div class='add'>+void register_memory_blocks_under_node_hotplug(int nid, unsigned long start_pfn,</div><div class='add'>+					       unsigned long end_pfn);</div><div class='ctx'> #else</div><div class='del'>-static inline void register_memory_blocks_under_node(int nid, unsigned long start_pfn,</div><div class='del'>-						     unsigned long end_pfn,</div><div class='del'>-						     enum meminit_context context)</div><div class='add'>+static inline void register_memory_blocks_under_node_hotplug(int nid,</div><div class='add'>+							     unsigned long start_pfn,</div><div class='add'>+							     unsigned long end_pfn)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-extern void unregister_node(struct node *node);</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-extern void node_dev_init(void);</div><div class='del'>-/* Core of the node registration - only memory hotplug should use this */</div><div class='del'>-extern int __register_one_node(int nid);</div><div class='del'>-</div><div class='del'>-/* Registers an online node */</div><div class='del'>-static inline int register_one_node(int nid)</div><div class='add'>+static inline void register_memory_blocks_under_nodes(void)</div><div class='ctx'> {</div><div class='del'>-	int error = 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	if (node_online(nid)) {</div><div class='del'>-		struct pglist_data *pgdat = NODE_DATA(nid);</div><div class='del'>-		unsigned long start_pfn = pgdat-&gt;node_start_pfn;</div><div class='del'>-		unsigned long end_pfn = start_pfn + pgdat-&gt;node_spanned_pages;</div><div class='add'>+struct node_notify {</div><div class='add'>+	int nid;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		error = __register_one_node(nid);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='del'>-		register_memory_blocks_under_node(nid, start_pfn, end_pfn,</div><div class='del'>-						  MEMINIT_EARLY);</div><div class='del'>-	}</div><div class='add'>+#define NODE_ADDING_FIRST_MEMORY                (1&lt;&lt;0)</div><div class='add'>+#define NODE_ADDED_FIRST_MEMORY                 (1&lt;&lt;1)</div><div class='add'>+#define NODE_CANCEL_ADDING_FIRST_MEMORY         (1&lt;&lt;2)</div><div class='add'>+#define NODE_REMOVING_LAST_MEMORY               (1&lt;&lt;3)</div><div class='add'>+#define NODE_REMOVED_LAST_MEMORY                (1&lt;&lt;4)</div><div class='add'>+#define NODE_CANCEL_REMOVING_LAST_MEMORY        (1&lt;&lt;5)</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+#if defined(CONFIG_MEMORY_HOTPLUG) &amp;&amp; defined(CONFIG_NUMA)</div><div class='add'>+extern int register_node_notifier(struct notifier_block *nb);</div><div class='add'>+extern void unregister_node_notifier(struct notifier_block *nb);</div><div class='add'>+extern int node_notify(unsigned long val, void *v);</div><div class='add'>+</div><div class='add'>+#define hotplug_node_notifier(fn, pri) ({		\</div><div class='add'>+	static __meminitdata struct notifier_block fn##_node_nb =\</div><div class='add'>+		{ .notifier_call = fn, .priority = pri };\</div><div class='add'>+	register_node_notifier(&amp;fn##_node_nb);			\</div><div class='add'>+})</div><div class='add'>+#else</div><div class='add'>+static inline int register_node_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void unregister_node_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline int node_notify(unsigned long val, void *v)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int hotplug_node_notifier(notifier_fn_t fn, int pri)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-extern void unregister_one_node(int nid);</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+extern void node_dev_init(void);</div><div class='add'>+/* Core of the node registration - only memory hotplug should use this */</div><div class='add'>+int register_node(int nid);</div><div class='add'>+void unregister_node(int nid);</div><div class='ctx'> extern int register_cpu_under_node(unsigned int cpu, unsigned int nid);</div><div class='ctx'> extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);</div><div class='ctx'> extern void unregister_memory_block_under_nodes(struct memory_block *mem_blk);</div><div class='ctx'> </div><div class='ctx'> extern int register_memory_node_under_compute_node(unsigned int mem_nid,</div><div class='ctx'> 						   unsigned int cpu_nid,</div><div class='del'>-						   unsigned access);</div><div class='add'>+						   enum access_coordinate_class access);</div><div class='ctx'> #else</div><div class='ctx'> static inline void node_dev_init(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline int __register_one_node(int nid)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline int register_one_node(int nid)</div><div class='add'>+static inline int register_node(int nid)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static inline int unregister_one_node(int nid)</div><div class='add'>+static inline int unregister_node(int nid)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h<br/>index b61438313a73..bd38648c998d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nodemask.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nodemask.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nodemask.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nodemask.h</a></div><div class='hunk'>@@ -39,9 +39,6 @@</div><div class='ctx'>  * int nodes_full(mask)			Is mask full (all bits sets)?</div><div class='ctx'>  * int nodes_weight(mask)		Hamming weight - number of set bits</div><div class='ctx'>  *</div><div class='del'>- * void nodes_shift_right(dst, src, n)	Shift right</div><div class='del'>- * void nodes_shift_left(dst, src, n)	Shift left</div><div class='del'>- *</div><div class='ctx'>  * unsigned int first_node(mask)	Number lowest set bit, or MAX_NUMNODES</div><div class='ctx'>  * unsigend int next_node(node, mask)	Next node past 'node', or MAX_NUMNODES</div><div class='ctx'>  * unsigned int next_node_in(node, mask) Next node past 'node', or wrap to first,</div><div class='hunk'>@@ -94,7 +91,6 @@</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask_types.h&gt;</div><div class='del'>-#include &lt;linux/numa.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern nodemask_t _unused_nodemask_arg_;</div><div class='hunk'>@@ -107,11 +103,11 @@ extern nodemask_t _unused_nodemask_arg_;</div><div class='ctx'>  */</div><div class='ctx'> #define nodemask_pr_args(maskp)	__nodemask_pr_numnodes(maskp), \</div><div class='ctx'> 				__nodemask_pr_bits(maskp)</div><div class='del'>-static inline unsigned int __nodemask_pr_numnodes(const nodemask_t *m)</div><div class='add'>+static __always_inline unsigned int __nodemask_pr_numnodes(const nodemask_t *m)</div><div class='ctx'> {</div><div class='ctx'> 	return m ? MAX_NUMNODES : 0;</div><div class='ctx'> }</div><div class='del'>-static inline const unsigned long *__nodemask_pr_bits(const nodemask_t *m)</div><div class='add'>+static __always_inline const unsigned long *__nodemask_pr_bits(const nodemask_t *m)</div><div class='ctx'> {</div><div class='ctx'> 	return m ? m-&gt;bits : NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -132,19 +128,19 @@ static __always_inline void __node_set(int node, volatile nodemask_t *dstp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define node_clear(node, dst) __node_clear((node), &amp;(dst))</div><div class='del'>-static inline void __node_clear(int node, volatile nodemask_t *dstp)</div><div class='add'>+static __always_inline void __node_clear(int node, volatile nodemask_t *dstp)</div><div class='ctx'> {</div><div class='ctx'> 	clear_bit(node, dstp-&gt;bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define nodes_setall(dst) __nodes_setall(&amp;(dst), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_setall(nodemask_t *dstp, unsigned int nbits)</div><div class='add'>+static __always_inline void __nodes_setall(nodemask_t *dstp, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_fill(dstp-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define nodes_clear(dst) __nodes_clear(&amp;(dst), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_clear(nodemask_t *dstp, unsigned int nbits)</div><div class='add'>+static __always_inline void __nodes_clear(nodemask_t *dstp, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_zero(dstp-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='hunk'>@@ -154,14 +150,14 @@ static inline void __nodes_clear(nodemask_t *dstp, unsigned int nbits)</div><div class='ctx'> </div><div class='ctx'> #define node_test_and_set(node, nodemask) \</div><div class='ctx'> 			__node_test_and_set((node), &amp;(nodemask))</div><div class='del'>-static inline bool __node_test_and_set(int node, nodemask_t *addr)</div><div class='add'>+static __always_inline bool __node_test_and_set(int node, nodemask_t *addr)</div><div class='ctx'> {</div><div class='ctx'> 	return test_and_set_bit(node, addr-&gt;bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define nodes_and(dst, src1, src2) \</div><div class='ctx'> 			__nodes_and(&amp;(dst), &amp;(src1), &amp;(src2), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_and(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='add'>+static __always_inline void __nodes_and(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='ctx'> 					const nodemask_t *src2p, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_and(dstp-&gt;bits, src1p-&gt;bits, src2p-&gt;bits, nbits);</div><div class='hunk'>@@ -169,7 +165,7 @@ static inline void __nodes_and(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='ctx'> </div><div class='ctx'> #define nodes_or(dst, src1, src2) \</div><div class='ctx'> 			__nodes_or(&amp;(dst), &amp;(src1), &amp;(src2), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_or(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='add'>+static __always_inline void __nodes_or(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='ctx'> 					const nodemask_t *src2p, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_or(dstp-&gt;bits, src1p-&gt;bits, src2p-&gt;bits, nbits);</div><div class='hunk'>@@ -177,7 +173,7 @@ static inline void __nodes_or(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='ctx'> </div><div class='ctx'> #define nodes_xor(dst, src1, src2) \</div><div class='ctx'> 			__nodes_xor(&amp;(dst), &amp;(src1), &amp;(src2), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_xor(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='add'>+static __always_inline void __nodes_xor(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='ctx'> 					const nodemask_t *src2p, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_xor(dstp-&gt;bits, src1p-&gt;bits, src2p-&gt;bits, nbits);</div><div class='hunk'>@@ -185,15 +181,22 @@ static inline void __nodes_xor(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='ctx'> </div><div class='ctx'> #define nodes_andnot(dst, src1, src2) \</div><div class='ctx'> 			__nodes_andnot(&amp;(dst), &amp;(src1), &amp;(src2), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_andnot(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='add'>+static __always_inline void __nodes_andnot(nodemask_t *dstp, const nodemask_t *src1p,</div><div class='ctx'> 					const nodemask_t *src2p, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_andnot(dstp-&gt;bits, src1p-&gt;bits, src2p-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define nodes_copy(dst, src) __nodes_copy(&amp;(dst), &amp;(src), MAX_NUMNODES)</div><div class='add'>+static __always_inline void __nodes_copy(nodemask_t *dstp,</div><div class='add'>+					const nodemask_t *srcp, unsigned int nbits)</div><div class='add'>+{</div><div class='add'>+	bitmap_copy(dstp-&gt;bits, srcp-&gt;bits, nbits);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define nodes_complement(dst, src) \</div><div class='ctx'> 			__nodes_complement(&amp;(dst), &amp;(src), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_complement(nodemask_t *dstp,</div><div class='add'>+static __always_inline void __nodes_complement(nodemask_t *dstp,</div><div class='ctx'> 					const nodemask_t *srcp, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_complement(dstp-&gt;bits, srcp-&gt;bits, nbits);</div><div class='hunk'>@@ -201,7 +204,7 @@ static inline void __nodes_complement(nodemask_t *dstp,</div><div class='ctx'> </div><div class='ctx'> #define nodes_equal(src1, src2) \</div><div class='ctx'> 			__nodes_equal(&amp;(src1), &amp;(src2), MAX_NUMNODES)</div><div class='del'>-static inline bool __nodes_equal(const nodemask_t *src1p,</div><div class='add'>+static __always_inline bool __nodes_equal(const nodemask_t *src1p,</div><div class='ctx'> 					const nodemask_t *src2p, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_equal(src1p-&gt;bits, src2p-&gt;bits, nbits);</div><div class='hunk'>@@ -209,7 +212,7 @@ static inline bool __nodes_equal(const nodemask_t *src1p,</div><div class='ctx'> </div><div class='ctx'> #define nodes_intersects(src1, src2) \</div><div class='ctx'> 			__nodes_intersects(&amp;(src1), &amp;(src2), MAX_NUMNODES)</div><div class='del'>-static inline bool __nodes_intersects(const nodemask_t *src1p,</div><div class='add'>+static __always_inline bool __nodes_intersects(const nodemask_t *src1p,</div><div class='ctx'> 					const nodemask_t *src2p, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_intersects(src1p-&gt;bits, src2p-&gt;bits, nbits);</div><div class='hunk'>@@ -217,59 +220,43 @@ static inline bool __nodes_intersects(const nodemask_t *src1p,</div><div class='ctx'> </div><div class='ctx'> #define nodes_subset(src1, src2) \</div><div class='ctx'> 			__nodes_subset(&amp;(src1), &amp;(src2), MAX_NUMNODES)</div><div class='del'>-static inline bool __nodes_subset(const nodemask_t *src1p,</div><div class='add'>+static __always_inline bool __nodes_subset(const nodemask_t *src1p,</div><div class='ctx'> 					const nodemask_t *src2p, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_subset(src1p-&gt;bits, src2p-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define nodes_empty(src) __nodes_empty(&amp;(src), MAX_NUMNODES)</div><div class='del'>-static inline bool __nodes_empty(const nodemask_t *srcp, unsigned int nbits)</div><div class='add'>+static __always_inline bool __nodes_empty(const nodemask_t *srcp, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_empty(srcp-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define nodes_full(nodemask) __nodes_full(&amp;(nodemask), MAX_NUMNODES)</div><div class='del'>-static inline bool __nodes_full(const nodemask_t *srcp, unsigned int nbits)</div><div class='add'>+static __always_inline bool __nodes_full(const nodemask_t *srcp, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_full(srcp-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define nodes_weight(nodemask) __nodes_weight(&amp;(nodemask), MAX_NUMNODES)</div><div class='del'>-static inline int __nodes_weight(const nodemask_t *srcp, unsigned int nbits)</div><div class='add'>+static __always_inline int __nodes_weight(const nodemask_t *srcp, unsigned int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_weight(srcp-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define nodes_shift_right(dst, src, n) \</div><div class='del'>-			__nodes_shift_right(&amp;(dst), &amp;(src), (n), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_shift_right(nodemask_t *dstp,</div><div class='del'>-					const nodemask_t *srcp, int n, int nbits)</div><div class='del'>-{</div><div class='del'>-	bitmap_shift_right(dstp-&gt;bits, srcp-&gt;bits, n, nbits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define nodes_shift_left(dst, src, n) \</div><div class='del'>-			__nodes_shift_left(&amp;(dst), &amp;(src), (n), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_shift_left(nodemask_t *dstp,</div><div class='del'>-					const nodemask_t *srcp, int n, int nbits)</div><div class='del'>-{</div><div class='del'>-	bitmap_shift_left(dstp-&gt;bits, srcp-&gt;bits, n, nbits);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* FIXME: better would be to fix all architectures to never return</div><div class='del'>-          &gt; MAX_NUMNODES, then the silly min_ts could be dropped. */</div><div class='add'>+          &gt; MAX_NUMNODES, then the silly min()s could be dropped. */</div><div class='ctx'> </div><div class='ctx'> #define first_node(src) __first_node(&amp;(src))</div><div class='del'>-static inline unsigned int __first_node(const nodemask_t *srcp)</div><div class='add'>+static __always_inline unsigned int __first_node(const nodemask_t *srcp)</div><div class='ctx'> {</div><div class='del'>-	return min_t(unsigned int, MAX_NUMNODES, find_first_bit(srcp-&gt;bits, MAX_NUMNODES));</div><div class='add'>+	return min(MAX_NUMNODES, find_first_bit(srcp-&gt;bits, MAX_NUMNODES));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define next_node(n, src) __next_node((n), &amp;(src))</div><div class='del'>-static inline unsigned int __next_node(int n, const nodemask_t *srcp)</div><div class='add'>+static __always_inline unsigned int __next_node(int n, const nodemask_t *srcp)</div><div class='ctx'> {</div><div class='del'>-	return min_t(unsigned int, MAX_NUMNODES, find_next_bit(srcp-&gt;bits, MAX_NUMNODES, n+1));</div><div class='add'>+	return min(MAX_NUMNODES, find_next_bit(srcp-&gt;bits, MAX_NUMNODES, n+1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -277,7 +264,7 @@ static inline unsigned int __next_node(int n, const nodemask_t *srcp)</div><div class='ctx'>  * the first node in src if needed.  Returns MAX_NUMNODES if src is empty.</div><div class='ctx'>  */</div><div class='ctx'> #define next_node_in(n, src) __next_node_in((n), &amp;(src))</div><div class='del'>-static inline unsigned int __next_node_in(int node, const nodemask_t *srcp)</div><div class='add'>+static __always_inline unsigned int __next_node_in(int node, const nodemask_t *srcp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ret = __next_node(node, srcp);</div><div class='ctx'> </div><div class='hunk'>@@ -286,7 +273,7 @@ static inline unsigned int __next_node_in(int node, const nodemask_t *srcp)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void init_nodemask_of_node(nodemask_t *mask, int node)</div><div class='add'>+static __always_inline void init_nodemask_of_node(nodemask_t *mask, int node)</div><div class='ctx'> {</div><div class='ctx'> 	nodes_clear(*mask);</div><div class='ctx'> 	node_set(node, *mask);</div><div class='hunk'>@@ -304,10 +291,9 @@ static inline void init_nodemask_of_node(nodemask_t *mask, int node)</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> #define first_unset_node(mask) __first_unset_node(&amp;(mask))</div><div class='del'>-static inline unsigned int __first_unset_node(const nodemask_t *maskp)</div><div class='add'>+static __always_inline unsigned int __first_unset_node(const nodemask_t *maskp)</div><div class='ctx'> {</div><div class='del'>-	return min_t(unsigned int, MAX_NUMNODES,</div><div class='del'>-			find_first_zero_bit(maskp-&gt;bits, MAX_NUMNODES));</div><div class='add'>+	return min(MAX_NUMNODES, find_first_zero_bit(maskp-&gt;bits, MAX_NUMNODES));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define NODE_MASK_LAST_WORD BITMAP_LAST_WORD_MASK(MAX_NUMNODES)</div><div class='hunk'>@@ -338,21 +324,21 @@ static inline unsigned int __first_unset_node(const nodemask_t *maskp)</div><div class='ctx'> </div><div class='ctx'> #define nodemask_parse_user(ubuf, ulen, dst) \</div><div class='ctx'> 		__nodemask_parse_user((ubuf), (ulen), &amp;(dst), MAX_NUMNODES)</div><div class='del'>-static inline int __nodemask_parse_user(const char __user *buf, int len,</div><div class='add'>+static __always_inline int __nodemask_parse_user(const char __user *buf, int len,</div><div class='ctx'> 					nodemask_t *dstp, int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_parse_user(buf, len, dstp-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define nodelist_parse(buf, dst) __nodelist_parse((buf), &amp;(dst), MAX_NUMNODES)</div><div class='del'>-static inline int __nodelist_parse(const char *buf, nodemask_t *dstp, int nbits)</div><div class='add'>+static __always_inline int __nodelist_parse(const char *buf, nodemask_t *dstp, int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_parselist(buf, dstp-&gt;bits, nbits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define node_remap(oldbit, old, new) \</div><div class='ctx'> 		__node_remap((oldbit), &amp;(old), &amp;(new), MAX_NUMNODES)</div><div class='del'>-static inline int __node_remap(int oldbit,</div><div class='add'>+static __always_inline int __node_remap(int oldbit,</div><div class='ctx'> 		const nodemask_t *oldp, const nodemask_t *newp, int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	return bitmap_bitremap(oldbit, oldp-&gt;bits, newp-&gt;bits, nbits);</div><div class='hunk'>@@ -360,7 +346,7 @@ static inline int __node_remap(int oldbit,</div><div class='ctx'> </div><div class='ctx'> #define nodes_remap(dst, src, old, new) \</div><div class='ctx'> 		__nodes_remap(&amp;(dst), &amp;(src), &amp;(old), &amp;(new), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_remap(nodemask_t *dstp, const nodemask_t *srcp,</div><div class='add'>+static __always_inline void __nodes_remap(nodemask_t *dstp, const nodemask_t *srcp,</div><div class='ctx'> 		const nodemask_t *oldp, const nodemask_t *newp, int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_remap(dstp-&gt;bits, srcp-&gt;bits, oldp-&gt;bits, newp-&gt;bits, nbits);</div><div class='hunk'>@@ -368,7 +354,7 @@ static inline void __nodes_remap(nodemask_t *dstp, const nodemask_t *srcp,</div><div class='ctx'> </div><div class='ctx'> #define nodes_onto(dst, orig, relmap) \</div><div class='ctx'> 		__nodes_onto(&amp;(dst), &amp;(orig), &amp;(relmap), MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_onto(nodemask_t *dstp, const nodemask_t *origp,</div><div class='add'>+static __always_inline void __nodes_onto(nodemask_t *dstp, const nodemask_t *origp,</div><div class='ctx'> 		const nodemask_t *relmapp, int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_onto(dstp-&gt;bits, origp-&gt;bits, relmapp-&gt;bits, nbits);</div><div class='hunk'>@@ -376,7 +362,7 @@ static inline void __nodes_onto(nodemask_t *dstp, const nodemask_t *origp,</div><div class='ctx'> </div><div class='ctx'> #define nodes_fold(dst, orig, sz) \</div><div class='ctx'> 		__nodes_fold(&amp;(dst), &amp;(orig), sz, MAX_NUMNODES)</div><div class='del'>-static inline void __nodes_fold(nodemask_t *dstp, const nodemask_t *origp,</div><div class='add'>+static __always_inline void __nodes_fold(nodemask_t *dstp, const nodemask_t *origp,</div><div class='ctx'> 		int sz, int nbits)</div><div class='ctx'> {</div><div class='ctx'> 	bitmap_fold(dstp-&gt;bits, origp-&gt;bits, sz, nbits);</div><div class='hunk'>@@ -418,22 +404,22 @@ enum node_states {</div><div class='ctx'> extern nodemask_t node_states[NR_NODE_STATES];</div><div class='ctx'> </div><div class='ctx'> #if MAX_NUMNODES &gt; 1</div><div class='del'>-static inline int node_state(int node, enum node_states state)</div><div class='add'>+static __always_inline int node_state(int node, enum node_states state)</div><div class='ctx'> {</div><div class='ctx'> 	return node_isset(node, node_states[state]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void node_set_state(int node, enum node_states state)</div><div class='add'>+static __always_inline void node_set_state(int node, enum node_states state)</div><div class='ctx'> {</div><div class='ctx'> 	__node_set(node, &amp;node_states[state]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void node_clear_state(int node, enum node_states state)</div><div class='add'>+static __always_inline void node_clear_state(int node, enum node_states state)</div><div class='ctx'> {</div><div class='ctx'> 	__node_clear(node, &amp;node_states[state]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int num_node_state(enum node_states state)</div><div class='add'>+static __always_inline int num_node_state(enum node_states state)</div><div class='ctx'> {</div><div class='ctx'> 	return nodes_weight(node_states[state]);</div><div class='ctx'> }</div><div class='hunk'>@@ -443,11 +429,11 @@ static inline int num_node_state(enum node_states state)</div><div class='ctx'> </div><div class='ctx'> #define first_online_node	first_node(node_states[N_ONLINE])</div><div class='ctx'> #define first_memory_node	first_node(node_states[N_MEMORY])</div><div class='del'>-static inline unsigned int next_online_node(int nid)</div><div class='add'>+static __always_inline unsigned int next_online_node(int nid)</div><div class='ctx'> {</div><div class='ctx'> 	return next_node(nid, node_states[N_ONLINE]);</div><div class='ctx'> }</div><div class='del'>-static inline unsigned int next_memory_node(int nid)</div><div class='add'>+static __always_inline unsigned int next_memory_node(int nid)</div><div class='ctx'> {</div><div class='ctx'> 	return next_node(nid, node_states[N_MEMORY]);</div><div class='ctx'> }</div><div class='hunk'>@@ -455,13 +441,13 @@ static inline unsigned int next_memory_node(int nid)</div><div class='ctx'> extern unsigned int nr_node_ids;</div><div class='ctx'> extern unsigned int nr_online_nodes;</div><div class='ctx'> </div><div class='del'>-static inline void node_set_online(int nid)</div><div class='add'>+static __always_inline void node_set_online(int nid)</div><div class='ctx'> {</div><div class='ctx'> 	node_set_state(nid, N_ONLINE);</div><div class='ctx'> 	nr_online_nodes = num_node_state(N_ONLINE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void node_set_offline(int nid)</div><div class='add'>+static __always_inline void node_set_offline(int nid)</div><div class='ctx'> {</div><div class='ctx'> 	node_clear_state(nid, N_ONLINE);</div><div class='ctx'> 	nr_online_nodes = num_node_state(N_ONLINE);</div><div class='hunk'>@@ -469,20 +455,20 @@ static inline void node_set_offline(int nid)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static inline int node_state(int node, enum node_states state)</div><div class='add'>+static __always_inline int node_state(int node, enum node_states state)</div><div class='ctx'> {</div><div class='ctx'> 	return node == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void node_set_state(int node, enum node_states state)</div><div class='add'>+static __always_inline void node_set_state(int node, enum node_states state)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void node_clear_state(int node, enum node_states state)</div><div class='add'>+static __always_inline void node_clear_state(int node, enum node_states state)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int num_node_state(enum node_states state)</div><div class='add'>+static __always_inline int num_node_state(enum node_states state)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -502,24 +488,12 @@ static inline int num_node_state(enum node_states state)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline int node_random(const nodemask_t *maskp)</div><div class='add'>+static __always_inline int node_random(const nodemask_t *maskp)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_NUMA) &amp;&amp; (MAX_NUMNODES &gt; 1)</div><div class='del'>-	int w, bit;</div><div class='del'>-</div><div class='del'>-	w = nodes_weight(*maskp);</div><div class='del'>-	switch (w) {</div><div class='del'>-	case 0:</div><div class='del'>-		bit = NUMA_NO_NODE;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		bit = first_node(*maskp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		bit = find_nth_bit(maskp-&gt;bits, MAX_NUMNODES, get_random_u32_below(w));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return bit;</div><div class='add'>+	int node = find_random_bit(maskp-&gt;bits, MAX_NUMNODES);</div><div class='add'>+</div><div class='add'>+	return node &lt; MAX_NUMNODES ? node : NUMA_NO_NODE;</div><div class='ctx'> #else</div><div class='ctx'> 	return 0;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -535,6 +509,7 @@ static inline int node_random(const nodemask_t *maskp)</div><div class='ctx'> </div><div class='ctx'> #define for_each_node(node)	   for_each_node_state(node, N_POSSIBLE)</div><div class='ctx'> #define for_each_online_node(node) for_each_node_state(node, N_ONLINE)</div><div class='add'>+#define for_each_node_with_cpus(node)	for_each_node_state(node, N_CPU)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * For nodemask scratch area.</div><div class='head'>diff --git a/include/linux/nodemask_types.h b/include/linux/nodemask_types.h<br/>index 6b28d97ea6ed..f850a48742f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nodemask_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nodemask_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nodemask_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nodemask_types.h</a></div><div class='hunk'>@@ -3,7 +3,16 @@</div><div class='ctx'> #define __LINUX_NODEMASK_TYPES_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/numa.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NODES_SHIFT</div><div class='add'>+#define NODES_SHIFT     CONFIG_NODES_SHIFT</div><div class='add'>+#else</div><div class='add'>+#define NODES_SHIFT     0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define MAX_NUMNODES    (1 &lt;&lt; NODES_SHIFT)</div><div class='add'>+</div><div class='add'>+#define	NUMA_NO_NODE	(-1)</div><div class='ctx'> </div><div class='ctx'> typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/notifier.h b/include/linux/notifier.h<br/>index 45702bdcbceb..01b6c9d9956f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/notifier.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/notifier.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/notifier.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/notifier.h</a></div><div class='hunk'>@@ -109,7 +109,7 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);</div><div class='ctx'> 		.mutex = __MUTEX_INITIALIZER(name.mutex),	\</div><div class='ctx'> 		.head = NULL,					\</div><div class='ctx'> 		.srcuu = __SRCU_USAGE_INIT(name.srcuu),		\</div><div class='del'>-		.srcu = __SRCU_STRUCT_INIT(name.srcu, name.srcuu, pcpu), \</div><div class='add'>+		.srcu = __SRCU_STRUCT_INIT(name.srcu, name.srcuu, pcpu, 0), \</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define ATOMIC_NOTIFIER_HEAD(name)				\</div><div class='hunk'>@@ -237,7 +237,5 @@ static inline int notifier_to_errno(int ret)</div><div class='ctx'> #define KBD_KEYSYM		0x0004 /* Keyboard keysym */</div><div class='ctx'> #define KBD_POST_KEYSYM		0x0005 /* Called after keyboard keysym interpretation */</div><div class='ctx'> </div><div class='del'>-extern struct blocking_notifier_head reboot_notifier_list;</div><div class='del'>-</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* _LINUX_NOTIFIER_H */</div><div class='head'>diff --git a/include/linux/ns/ns_common_types.h b/include/linux/ns/ns_common_types.h<br/>new file mode 100644<br/>index 000000000000..b332b019b29c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ns/ns_common_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ns/ns_common_types.h</a></div><div class='hunk'>@@ -0,0 +1,196 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_NS_COMMON_TYPES_H</div><div class='add'>+#define _LINUX_NS_COMMON_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/ns/nstree_types.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct cgroup_namespace;</div><div class='add'>+struct dentry;</div><div class='add'>+struct ipc_namespace;</div><div class='add'>+struct mnt_namespace;</div><div class='add'>+struct net;</div><div class='add'>+struct pid_namespace;</div><div class='add'>+struct proc_ns_operations;</div><div class='add'>+struct time_namespace;</div><div class='add'>+struct user_namespace;</div><div class='add'>+struct uts_namespace;</div><div class='add'>+</div><div class='add'>+extern struct cgroup_namespace init_cgroup_ns;</div><div class='add'>+extern struct ipc_namespace init_ipc_ns;</div><div class='add'>+extern struct mnt_namespace init_mnt_ns;</div><div class='add'>+extern struct net init_net;</div><div class='add'>+extern struct pid_namespace init_pid_ns;</div><div class='add'>+extern struct time_namespace init_time_ns;</div><div class='add'>+extern struct user_namespace init_user_ns;</div><div class='add'>+extern struct uts_namespace init_uts_ns;</div><div class='add'>+</div><div class='add'>+extern const struct proc_ns_operations cgroupns_operations;</div><div class='add'>+extern const struct proc_ns_operations ipcns_operations;</div><div class='add'>+extern const struct proc_ns_operations mntns_operations;</div><div class='add'>+extern const struct proc_ns_operations netns_operations;</div><div class='add'>+extern const struct proc_ns_operations pidns_operations;</div><div class='add'>+extern const struct proc_ns_operations pidns_for_children_operations;</div><div class='add'>+extern const struct proc_ns_operations timens_operations;</div><div class='add'>+extern const struct proc_ns_operations timens_for_children_operations;</div><div class='add'>+extern const struct proc_ns_operations userns_operations;</div><div class='add'>+extern const struct proc_ns_operations utsns_operations;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Namespace lifetimes are managed via a two-tier reference counting model:</div><div class='add'>+ *</div><div class='add'>+ * (1) __ns_ref (refcount_t): Main reference count tracking memory</div><div class='add'>+ *     lifetime. Controls when the namespace structure itself is freed.</div><div class='add'>+ *     It also pins the namespace on the namespace trees whereas (2)</div><div class='add'>+ *     only regulates their visibility to userspace.</div><div class='add'>+ *</div><div class='add'>+ * (2) __ns_ref_active (atomic_t): Reference count tracking active users.</div><div class='add'>+ *     Controls visibility of the namespace in the namespace trees.</div><div class='add'>+ *     Any live task that uses the namespace (via nsproxy or cred) holds</div><div class='add'>+ *     an active reference. Any open file descriptor or bind-mount of</div><div class='add'>+ *     the namespace holds an active reference. Once all tasks have</div><div class='add'>+ *     called exited their namespaces and all file descriptors and</div><div class='add'>+ *     bind-mounts have been released the active reference count drops</div><div class='add'>+ *     to zero and the namespace becomes inactive. IOW, the namespace</div><div class='add'>+ *     cannot be listed or opened via file handles anymore.</div><div class='add'>+ *</div><div class='add'>+ *     Note that it is valid to transition from active to inactive and</div><div class='add'>+ *     back from inactive to active e.g., when resurrecting an inactive</div><div class='add'>+ *     namespace tree via the SIOCGSKNS ioctl().</div><div class='add'>+ *</div><div class='add'>+ * Relationship and lifecycle states:</div><div class='add'>+ *</div><div class='add'>+ * - Active (__ns_ref_active &gt; 0):</div><div class='add'>+ *   Namespace is actively used and visible to userspace. The namespace</div><div class='add'>+ *   can be reopened via /proc/&lt;pid&gt;/ns/&lt;ns_type&gt;, via namespace file</div><div class='add'>+ *   handles, or discovered via listns().</div><div class='add'>+ *</div><div class='add'>+ * - Inactive (__ns_ref_active == 0, __ns_ref &gt; 0):</div><div class='add'>+ *   No tasks are actively using the namespace and it isn't pinned by</div><div class='add'>+ *   any bind-mounts or open file descriptors anymore. But the namespace</div><div class='add'>+ *   is still kept alive by internal references. For example, the user</div><div class='add'>+ *   namespace could be pinned by an open file through file-&gt;f_cred</div><div class='add'>+ *   references when one of the now defunct tasks had opened a file and</div><div class='add'>+ *   handed the file descriptor off to another process via a UNIX</div><div class='add'>+ *   sockets. Such references keep the namespace structure alive through</div><div class='add'>+ *   __ns_ref but will not hold an active reference.</div><div class='add'>+ *</div><div class='add'>+ * - Destroyed (__ns_ref == 0):</div><div class='add'>+ *   No references remain. The namespace is removed from the tree and freed.</div><div class='add'>+ *</div><div class='add'>+ * State transitions:</div><div class='add'>+ *</div><div class='add'>+ * Active -&gt; Inactive:</div><div class='add'>+ *   When the last task using the namespace exits it drops its active</div><div class='add'>+ *   references to all namespaces. However, user and pid namespaces</div><div class='add'>+ *   remain accessible until the task has been reaped.</div><div class='add'>+ *</div><div class='add'>+ * Inactive -&gt; Active:</div><div class='add'>+ *   An inactive namespace tree might be resurrected due to e.g., the</div><div class='add'>+ *   SIOCGSKNS ioctl() on a socket.</div><div class='add'>+ *</div><div class='add'>+ * Inactive -&gt; Destroyed:</div><div class='add'>+ *   When __ns_ref drops to zero the namespace is removed from the</div><div class='add'>+ *   namespaces trees and the memory is freed (after RCU grace period).</div><div class='add'>+ *</div><div class='add'>+ * Initial namespaces:</div><div class='add'>+ *   Boot-time namespaces (init_net, init_pid_ns, etc.) start with</div><div class='add'>+ *   __ns_ref_active = 1 and remain active forever.</div><div class='add'>+ *</div><div class='add'>+ * @ns_type: type of namespace (e.g., CLONE_NEWNET)</div><div class='add'>+ * @stashed: cached dentry to be used by the vfs</div><div class='add'>+ * @ops: namespace operations</div><div class='add'>+ * @inum: namespace inode number (quickly recycled for non-initial namespaces)</div><div class='add'>+ * @__ns_ref: main reference count (do not use directly)</div><div class='add'>+ * @ns_tree: namespace tree nodes and active reference count</div><div class='add'>+ */</div><div class='add'>+struct ns_common {</div><div class='add'>+	u32 ns_type;</div><div class='add'>+	struct dentry *stashed;</div><div class='add'>+	const struct proc_ns_operations *ops;</div><div class='add'>+	unsigned int inum;</div><div class='add'>+	refcount_t __ns_ref; /* do not use directly */</div><div class='add'>+	union {</div><div class='add'>+		struct ns_tree;</div><div class='add'>+		struct rcu_head ns_rcu;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_ns_common(__ns)                                    \</div><div class='add'>+	_Generic((__ns),                                      \</div><div class='add'>+		struct cgroup_namespace *:       &amp;(__ns)-&gt;ns, \</div><div class='add'>+		const struct cgroup_namespace *: &amp;(__ns)-&gt;ns, \</div><div class='add'>+		struct ipc_namespace *:          &amp;(__ns)-&gt;ns, \</div><div class='add'>+		const struct ipc_namespace *:    &amp;(__ns)-&gt;ns, \</div><div class='add'>+		struct mnt_namespace *:          &amp;(__ns)-&gt;ns, \</div><div class='add'>+		const struct mnt_namespace *:    &amp;(__ns)-&gt;ns, \</div><div class='add'>+		struct net *:                    &amp;(__ns)-&gt;ns, \</div><div class='add'>+		const struct net *:              &amp;(__ns)-&gt;ns, \</div><div class='add'>+		struct pid_namespace *:          &amp;(__ns)-&gt;ns, \</div><div class='add'>+		const struct pid_namespace *:    &amp;(__ns)-&gt;ns, \</div><div class='add'>+		struct time_namespace *:         &amp;(__ns)-&gt;ns, \</div><div class='add'>+		const struct time_namespace *:   &amp;(__ns)-&gt;ns, \</div><div class='add'>+		struct user_namespace *:         &amp;(__ns)-&gt;ns, \</div><div class='add'>+		const struct user_namespace *:   &amp;(__ns)-&gt;ns, \</div><div class='add'>+		struct uts_namespace *:          &amp;(__ns)-&gt;ns, \</div><div class='add'>+		const struct uts_namespace *:    &amp;(__ns)-&gt;ns)</div><div class='add'>+</div><div class='add'>+#define ns_init_inum(__ns)                                     \</div><div class='add'>+	_Generic((__ns),                                       \</div><div class='add'>+		struct cgroup_namespace *: CGROUP_NS_INIT_INO, \</div><div class='add'>+		struct ipc_namespace *:    IPC_NS_INIT_INO,    \</div><div class='add'>+		struct mnt_namespace *:    MNT_NS_INIT_INO,    \</div><div class='add'>+		struct net *:              NET_NS_INIT_INO,    \</div><div class='add'>+		struct pid_namespace *:    PID_NS_INIT_INO,    \</div><div class='add'>+		struct time_namespace *:   TIME_NS_INIT_INO,   \</div><div class='add'>+		struct user_namespace *:   USER_NS_INIT_INO,   \</div><div class='add'>+		struct uts_namespace *:    UTS_NS_INIT_INO)</div><div class='add'>+</div><div class='add'>+#define ns_init_ns(__ns)                                    \</div><div class='add'>+	_Generic((__ns),                                    \</div><div class='add'>+		struct cgroup_namespace *: &amp;init_cgroup_ns, \</div><div class='add'>+		struct ipc_namespace *:    &amp;init_ipc_ns,    \</div><div class='add'>+		struct mnt_namespace *:    &amp;init_mnt_ns,     \</div><div class='add'>+		struct net *:              &amp;init_net,       \</div><div class='add'>+		struct pid_namespace *:    &amp;init_pid_ns,    \</div><div class='add'>+		struct time_namespace *:   &amp;init_time_ns,   \</div><div class='add'>+		struct user_namespace *:   &amp;init_user_ns,   \</div><div class='add'>+		struct uts_namespace *:    &amp;init_uts_ns)</div><div class='add'>+</div><div class='add'>+#define ns_init_id(__ns)						\</div><div class='add'>+	_Generic((__ns),						\</div><div class='add'>+		struct cgroup_namespace *:	CGROUP_NS_INIT_ID,	\</div><div class='add'>+		struct ipc_namespace *:		IPC_NS_INIT_ID,		\</div><div class='add'>+		struct mnt_namespace *:		MNT_NS_INIT_ID,		\</div><div class='add'>+		struct net *:			NET_NS_INIT_ID,		\</div><div class='add'>+		struct pid_namespace *:		PID_NS_INIT_ID,		\</div><div class='add'>+		struct time_namespace *:	TIME_NS_INIT_ID,	\</div><div class='add'>+		struct user_namespace *:	USER_NS_INIT_ID,	\</div><div class='add'>+		struct uts_namespace *:		UTS_NS_INIT_ID)</div><div class='add'>+</div><div class='add'>+#define to_ns_operations(__ns)                                                                         \</div><div class='add'>+	_Generic((__ns),                                                                               \</div><div class='add'>+		struct cgroup_namespace *: (IS_ENABLED(CONFIG_CGROUPS) ? &amp;cgroupns_operations : NULL), \</div><div class='add'>+		struct ipc_namespace *:    (IS_ENABLED(CONFIG_IPC_NS)  ? &amp;ipcns_operations    : NULL), \</div><div class='add'>+		struct mnt_namespace *:    &amp;mntns_operations,                                          \</div><div class='add'>+		struct net *:              (IS_ENABLED(CONFIG_NET_NS)  ? &amp;netns_operations    : NULL), \</div><div class='add'>+		struct pid_namespace *:    (IS_ENABLED(CONFIG_PID_NS)  ? &amp;pidns_operations    : NULL), \</div><div class='add'>+		struct time_namespace *:   (IS_ENABLED(CONFIG_TIME_NS) ? &amp;timens_operations   : NULL), \</div><div class='add'>+		struct user_namespace *:   (IS_ENABLED(CONFIG_USER_NS) ? &amp;userns_operations   : NULL), \</div><div class='add'>+		struct uts_namespace *:    (IS_ENABLED(CONFIG_UTS_NS)  ? &amp;utsns_operations    : NULL))</div><div class='add'>+</div><div class='add'>+#define ns_common_type(__ns)                                \</div><div class='add'>+	_Generic((__ns),                                    \</div><div class='add'>+		struct cgroup_namespace *: CLONE_NEWCGROUP, \</div><div class='add'>+		struct ipc_namespace *:    CLONE_NEWIPC,    \</div><div class='add'>+		struct mnt_namespace *:    CLONE_NEWNS,     \</div><div class='add'>+		struct net *:              CLONE_NEWNET,    \</div><div class='add'>+		struct pid_namespace *:    CLONE_NEWPID,    \</div><div class='add'>+		struct time_namespace *:   CLONE_NEWTIME,   \</div><div class='add'>+		struct user_namespace *:   CLONE_NEWUSER,   \</div><div class='add'>+		struct uts_namespace *:    CLONE_NEWUTS)</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_NS_COMMON_TYPES_H */</div><div class='head'>diff --git a/include/linux/ns/nstree_types.h b/include/linux/ns/nstree_types.h<br/>new file mode 100644<br/>index 000000000000..2fb28ee31efb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ns/nstree_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ns/nstree_types.h</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Christian Brauner &lt;brauner@kernel.org&gt; */</div><div class='add'>+#ifndef _LINUX_NSTREE_TYPES_H</div><div class='add'>+#define _LINUX_NSTREE_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ns_tree_root - Root of a namespace tree</div><div class='add'>+ * @ns_rb: Red-black tree root for efficient lookups</div><div class='add'>+ * @ns_list_head: List head for sequential iteration</div><div class='add'>+ *</div><div class='add'>+ * Each namespace tree maintains both an rbtree (for O(log n) lookups)</div><div class='add'>+ * and a list (for efficient sequential iteration). The list is kept in</div><div class='add'>+ * the same sorted order as the rbtree.</div><div class='add'>+ */</div><div class='add'>+struct ns_tree_root {</div><div class='add'>+	struct rb_root ns_rb;</div><div class='add'>+	struct list_head ns_list_head;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ns_tree_node - Node in a namespace tree</div><div class='add'>+ * @ns_node: Red-black tree node</div><div class='add'>+ * @ns_list_entry: List entry for sequential iteration</div><div class='add'>+ *</div><div class='add'>+ * Represents a namespace's position in a tree. Each namespace has</div><div class='add'>+ * multiple tree nodes for different trees (unified, per-type, owner).</div><div class='add'>+ */</div><div class='add'>+struct ns_tree_node {</div><div class='add'>+	struct rb_node ns_node;</div><div class='add'>+	struct list_head ns_list_entry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ns_tree - Namespace tree nodes and active reference count</div><div class='add'>+ * @ns_id: Unique namespace identifier</div><div class='add'>+ * @__ns_ref_active: Active reference count (do not use directly)</div><div class='add'>+ * @ns_unified_node: Node in the global namespace tree</div><div class='add'>+ * @ns_tree_node: Node in the per-type namespace tree</div><div class='add'>+ * @ns_owner_node: Node in the owner namespace's tree of owned namespaces</div><div class='add'>+ * @ns_owner_root: Root of the tree of namespaces owned by this namespace</div><div class='add'>+ *                 (only used when this namespace is an owner)</div><div class='add'>+ */</div><div class='add'>+struct ns_tree {</div><div class='add'>+	u64 ns_id;</div><div class='add'>+	atomic_t __ns_ref_active;</div><div class='add'>+	struct ns_tree_node ns_unified_node;</div><div class='add'>+	struct ns_tree_node ns_tree_node;</div><div class='add'>+	struct ns_tree_node ns_owner_node;</div><div class='add'>+	struct ns_tree_root ns_owner_root;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_NSTREE_TYPES_H */</div><div class='head'>diff --git a/include/linux/ns_common.h b/include/linux/ns_common.h<br/>index 7d22ea50b098..825f5865bfc5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ns_common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ns_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ns_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ns_common.h</a></div><div class='hunk'>@@ -2,15 +2,149 @@</div><div class='ctx'> #ifndef _LINUX_NS_COMMON_H</div><div class='ctx'> #define _LINUX_NS_COMMON_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ns/ns_common_types.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/vfsdebug.h&gt;</div><div class='add'>+#include &lt;uapi/linux/sched.h&gt;</div><div class='add'>+#include &lt;uapi/linux/nsfs.h&gt;</div><div class='ctx'> </div><div class='del'>-struct proc_ns_operations;</div><div class='add'>+bool is_current_namespace(struct ns_common *ns);</div><div class='add'>+int __ns_common_init(struct ns_common *ns, u32 ns_type, const struct proc_ns_operations *ops, int inum);</div><div class='add'>+void __ns_common_free(struct ns_common *ns);</div><div class='add'>+struct ns_common *__must_check ns_owner(struct ns_common *ns);</div><div class='ctx'> </div><div class='del'>-struct ns_common {</div><div class='del'>-	struct dentry *stashed;</div><div class='del'>-	const struct proc_ns_operations *ops;</div><div class='del'>-	unsigned int inum;</div><div class='del'>-	refcount_t count;</div><div class='del'>-};</div><div class='add'>+static __always_inline bool is_ns_init_inum(const struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	VFS_WARN_ON_ONCE(ns-&gt;inum == 0);</div><div class='add'>+	return unlikely(in_range(ns-&gt;inum, MNT_NS_INIT_INO,</div><div class='add'>+				 IPC_NS_INIT_INO - MNT_NS_INIT_INO + 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline bool is_ns_init_id(const struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	VFS_WARN_ON_ONCE(ns-&gt;ns_id == 0);</div><div class='add'>+	return ns-&gt;ns_id &lt;= NS_LAST_INIT_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NS_COMMON_INIT(nsname)										\</div><div class='add'>+{													\</div><div class='add'>+	.ns_type			= ns_common_type(&amp;nsname),					\</div><div class='add'>+	.ns_id				= ns_init_id(&amp;nsname),						\</div><div class='add'>+	.inum				= ns_init_inum(&amp;nsname),					\</div><div class='add'>+	.ops				= to_ns_operations(&amp;nsname),					\</div><div class='add'>+	.stashed			= NULL,								\</div><div class='add'>+	.__ns_ref			= REFCOUNT_INIT(1),						\</div><div class='add'>+	.__ns_ref_active		= ATOMIC_INIT(1),						\</div><div class='add'>+	.ns_unified_node.ns_list_entry	= LIST_HEAD_INIT(nsname.ns.ns_unified_node.ns_list_entry),	\</div><div class='add'>+	.ns_tree_node.ns_list_entry	= LIST_HEAD_INIT(nsname.ns.ns_tree_node.ns_list_entry),		\</div><div class='add'>+	.ns_owner_node.ns_list_entry	= LIST_HEAD_INIT(nsname.ns.ns_owner_node.ns_list_entry),	\</div><div class='add'>+	.ns_owner_root.ns_list_head	= LIST_HEAD_INIT(nsname.ns.ns_owner_root.ns_list_head),		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ns_common_init(__ns)                     \</div><div class='add'>+	__ns_common_init(to_ns_common(__ns),     \</div><div class='add'>+			 ns_common_type(__ns),   \</div><div class='add'>+			 to_ns_operations(__ns), \</div><div class='add'>+			 (((__ns) == ns_init_ns(__ns)) ? ns_init_inum(__ns) : 0))</div><div class='add'>+</div><div class='add'>+#define ns_common_init_inum(__ns, __inum)        \</div><div class='add'>+	__ns_common_init(to_ns_common(__ns),     \</div><div class='add'>+			 ns_common_type(__ns),   \</div><div class='add'>+			 to_ns_operations(__ns), \</div><div class='add'>+			 __inum)</div><div class='add'>+</div><div class='add'>+#define ns_common_free(__ns) __ns_common_free(to_ns_common((__ns)))</div><div class='add'>+</div><div class='add'>+static __always_inline __must_check int __ns_ref_active_read(const struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;ns-&gt;__ns_ref_active);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline __must_check int __ns_ref_read(const struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	return refcount_read(&amp;ns-&gt;__ns_ref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline __must_check bool __ns_ref_put(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	if (is_ns_init_id(ns)) {</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_read(ns) != 1);</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_active_read(ns) != 1);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (refcount_dec_and_test(&amp;ns-&gt;__ns_ref)) {</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_active_read(ns));</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline __must_check bool __ns_ref_get(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	if (is_ns_init_id(ns)) {</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_read(ns) != 1);</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_active_read(ns) != 1);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	if (refcount_inc_not_zero(&amp;ns-&gt;__ns_ref))</div><div class='add'>+		return true;</div><div class='add'>+	VFS_WARN_ON_ONCE(__ns_ref_active_read(ns));</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void __ns_ref_inc(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	if (is_ns_init_id(ns)) {</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_read(ns) != 1);</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_active_read(ns) != 1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	refcount_inc(&amp;ns-&gt;__ns_ref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline __must_check bool __ns_ref_dec_and_lock(struct ns_common *ns,</div><div class='add'>+							       spinlock_t *ns_lock)</div><div class='add'>+{</div><div class='add'>+	if (is_ns_init_id(ns)) {</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_read(ns) != 1);</div><div class='add'>+		VFS_WARN_ON_ONCE(__ns_ref_active_read(ns) != 1);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	return refcount_dec_and_lock(&amp;ns-&gt;__ns_ref, ns_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ns_ref_read(__ns) __ns_ref_read(to_ns_common((__ns)))</div><div class='add'>+#define ns_ref_inc(__ns) \</div><div class='add'>+	do { if (__ns) __ns_ref_inc(to_ns_common((__ns))); } while (0)</div><div class='add'>+#define ns_ref_get(__ns) \</div><div class='add'>+	((__ns) ? __ns_ref_get(to_ns_common((__ns))) : false)</div><div class='add'>+#define ns_ref_put(__ns) \</div><div class='add'>+	((__ns) ? __ns_ref_put(to_ns_common((__ns))) : false)</div><div class='add'>+#define ns_ref_put_and_lock(__ns, __ns_lock) \</div><div class='add'>+	((__ns) ? __ns_ref_dec_and_lock(to_ns_common((__ns)), __ns_lock) : false)</div><div class='add'>+</div><div class='add'>+#define ns_ref_active_read(__ns) \</div><div class='add'>+	((__ns) ? __ns_ref_active_read(to_ns_common(__ns)) : 0)</div><div class='add'>+</div><div class='add'>+void __ns_ref_active_put(struct ns_common *ns);</div><div class='add'>+</div><div class='add'>+#define ns_ref_active_put(__ns) \</div><div class='add'>+	do { if (__ns) __ns_ref_active_put(to_ns_common(__ns)); } while (0)</div><div class='add'>+</div><div class='add'>+static __always_inline struct ns_common *__must_check ns_get_unless_inactive(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	if (!__ns_ref_active_read(ns)) {</div><div class='add'>+		VFS_WARN_ON_ONCE(is_ns_init_id(ns));</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (!__ns_ref_get(ns))</div><div class='add'>+		return NULL;</div><div class='add'>+	return ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __ns_ref_active_get(struct ns_common *ns);</div><div class='add'>+</div><div class='add'>+#define ns_ref_active_get(__ns) \</div><div class='add'>+	do { if (__ns) __ns_ref_active_get(to_ns_common(__ns)); } while (0)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/nsfs.h b/include/linux/nsfs.h<br/>new file mode 100644<br/>index 000000000000..731b67fc2fec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nsfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nsfs.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Christian Brauner &lt;brauner@kernel.org&gt; */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_NSFS_H</div><div class='add'>+#define _LINUX_NSFS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ns_common.h&gt;</div><div class='add'>+#include &lt;linux/cred.h&gt;</div><div class='add'>+#include &lt;linux/pid_namespace.h&gt;</div><div class='add'>+</div><div class='add'>+struct path;</div><div class='add'>+struct task_struct;</div><div class='add'>+struct proc_ns_operations;</div><div class='add'>+</div><div class='add'>+int ns_get_path(struct path *path, struct task_struct *task,</div><div class='add'>+		const struct proc_ns_operations *ns_ops);</div><div class='add'>+typedef struct ns_common *ns_get_path_helper_t(void *);</div><div class='add'>+int ns_get_path_cb(struct path *path, ns_get_path_helper_t ns_get_cb,</div><div class='add'>+		   void *private_data);</div><div class='add'>+</div><div class='add'>+bool ns_match(const struct ns_common *ns, dev_t dev, ino_t ino);</div><div class='add'>+</div><div class='add'>+int ns_get_name(char *buf, size_t size, struct task_struct *task,</div><div class='add'>+			const struct proc_ns_operations *ns_ops);</div><div class='add'>+void nsfs_init(void);</div><div class='add'>+</div><div class='add'>+#define __current_namespace_from_type(__ns)				\</div><div class='add'>+	_Generic((__ns),						\</div><div class='add'>+		struct cgroup_namespace *: current-&gt;nsproxy-&gt;cgroup_ns,	\</div><div class='add'>+		struct ipc_namespace *:    current-&gt;nsproxy-&gt;ipc_ns,	\</div><div class='add'>+		struct net *:              current-&gt;nsproxy-&gt;net_ns,	\</div><div class='add'>+		struct pid_namespace *:    task_active_pid_ns(current),	\</div><div class='add'>+		struct mnt_namespace *:    current-&gt;nsproxy-&gt;mnt_ns,	\</div><div class='add'>+		struct time_namespace *:   current-&gt;nsproxy-&gt;time_ns,	\</div><div class='add'>+		struct user_namespace *:   current_user_ns(),		\</div><div class='add'>+		struct uts_namespace *:    current-&gt;nsproxy-&gt;uts_ns)</div><div class='add'>+</div><div class='add'>+#define current_in_namespace(__ns) (__current_namespace_from_type(__ns) == __ns)</div><div class='add'>+</div><div class='add'>+void nsproxy_ns_active_get(struct nsproxy *ns);</div><div class='add'>+void nsproxy_ns_active_put(struct nsproxy *ns);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_NSFS_H */</div><div class='head'>diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h<br/>index 5601d14e2886..5a67648721c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nsproxy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nsproxy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nsproxy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nsproxy.h</a></div><div class='hunk'>@@ -92,11 +92,14 @@ static inline struct cred *nsset_cred(struct nsset *set)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int copy_namespaces(unsigned long flags, struct task_struct *tsk);</div><div class='del'>-void exit_task_namespaces(struct task_struct *tsk);</div><div class='add'>+int copy_namespaces(u64 flags, struct task_struct *tsk);</div><div class='add'>+void switch_cred_namespaces(const struct cred *old, const struct cred *new);</div><div class='add'>+void exit_nsproxy_namespaces(struct task_struct *tsk);</div><div class='add'>+void get_cred_namespaces(struct task_struct *tsk);</div><div class='add'>+void exit_cred_namespaces(struct task_struct *tsk);</div><div class='ctx'> void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);</div><div class='ctx'> int exec_task_namespaces(void);</div><div class='del'>-void free_nsproxy(struct nsproxy *ns);</div><div class='add'>+void deactivate_nsproxy(struct nsproxy *ns);</div><div class='ctx'> int unshare_nsproxy_namespaces(unsigned long, struct nsproxy **,</div><div class='ctx'> 	struct cred *, struct fs_struct *);</div><div class='ctx'> int __init nsproxy_cache_init(void);</div><div class='hunk'>@@ -104,7 +107,7 @@ int __init nsproxy_cache_init(void);</div><div class='ctx'> static inline void put_nsproxy(struct nsproxy *ns)</div><div class='ctx'> {</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;ns-&gt;count))</div><div class='del'>-		free_nsproxy(ns);</div><div class='add'>+		deactivate_nsproxy(ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void get_nsproxy(struct nsproxy *ns)</div><div class='hunk'>@@ -112,4 +115,6 @@ static inline void get_nsproxy(struct nsproxy *ns)</div><div class='ctx'> 	refcount_inc(&amp;ns-&gt;count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_FREE(put_nsproxy, struct nsproxy *, if (_T) put_nsproxy(_T))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/nstree.h b/include/linux/nstree.h<br/>new file mode 100644<br/>index 000000000000..175e4625bfa6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nstree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nstree.h</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Christian Brauner &lt;brauner@kernel.org&gt; */</div><div class='add'>+#ifndef _LINUX_NSTREE_H</div><div class='add'>+#define _LINUX_NSTREE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ns/nstree_types.h&gt;</div><div class='add'>+#include &lt;linux/nsproxy.h&gt;</div><div class='add'>+#include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/seqlock.h&gt;</div><div class='add'>+#include &lt;linux/rculist.h&gt;</div><div class='add'>+#include &lt;linux/cookie.h&gt;</div><div class='add'>+#include &lt;uapi/linux/nsfs.h&gt;</div><div class='add'>+</div><div class='add'>+struct ns_common;</div><div class='add'>+</div><div class='add'>+extern struct ns_tree_root cgroup_ns_tree;</div><div class='add'>+extern struct ns_tree_root ipc_ns_tree;</div><div class='add'>+extern struct ns_tree_root mnt_ns_tree;</div><div class='add'>+extern struct ns_tree_root net_ns_tree;</div><div class='add'>+extern struct ns_tree_root pid_ns_tree;</div><div class='add'>+extern struct ns_tree_root time_ns_tree;</div><div class='add'>+extern struct ns_tree_root user_ns_tree;</div><div class='add'>+extern struct ns_tree_root uts_ns_tree;</div><div class='add'>+</div><div class='add'>+void ns_tree_node_init(struct ns_tree_node *node);</div><div class='add'>+void ns_tree_root_init(struct ns_tree_root *root);</div><div class='add'>+bool ns_tree_node_empty(const struct ns_tree_node *node);</div><div class='add'>+struct rb_node *ns_tree_node_add(struct ns_tree_node *node,</div><div class='add'>+				  struct ns_tree_root *root,</div><div class='add'>+				  int (*cmp)(struct rb_node *, const struct rb_node *));</div><div class='add'>+void ns_tree_node_del(struct ns_tree_node *node, struct ns_tree_root *root);</div><div class='add'>+</div><div class='add'>+#define to_ns_tree(__ns)					\</div><div class='add'>+	_Generic((__ns),					\</div><div class='add'>+		struct cgroup_namespace *: &amp;(cgroup_ns_tree),	\</div><div class='add'>+		struct ipc_namespace *:    &amp;(ipc_ns_tree),	\</div><div class='add'>+		struct net *:              &amp;(net_ns_tree),	\</div><div class='add'>+		struct pid_namespace *:    &amp;(pid_ns_tree),	\</div><div class='add'>+		struct mnt_namespace *:    &amp;(mnt_ns_tree),	\</div><div class='add'>+		struct time_namespace *:   &amp;(time_ns_tree),	\</div><div class='add'>+		struct user_namespace *:   &amp;(user_ns_tree),	\</div><div class='add'>+		struct uts_namespace *:    &amp;(uts_ns_tree))</div><div class='add'>+</div><div class='add'>+#define ns_tree_gen_id(__ns)                 \</div><div class='add'>+	__ns_tree_gen_id(to_ns_common(__ns), \</div><div class='add'>+			 (((__ns) == ns_init_ns(__ns)) ? ns_init_id(__ns) : 0))</div><div class='add'>+</div><div class='add'>+u64 __ns_tree_gen_id(struct ns_common *ns, u64 id);</div><div class='add'>+void __ns_tree_add_raw(struct ns_common *ns, struct ns_tree_root *ns_tree);</div><div class='add'>+void __ns_tree_remove(struct ns_common *ns, struct ns_tree_root *ns_tree);</div><div class='add'>+struct ns_common *ns_tree_lookup_rcu(u64 ns_id, int ns_type);</div><div class='add'>+struct ns_common *__ns_tree_adjoined_rcu(struct ns_common *ns,</div><div class='add'>+					 struct ns_tree_root *ns_tree,</div><div class='add'>+					 bool previous);</div><div class='add'>+</div><div class='add'>+static inline void __ns_tree_add(struct ns_common *ns, struct ns_tree_root *ns_tree, u64 id)</div><div class='add'>+{</div><div class='add'>+	__ns_tree_gen_id(ns, id);</div><div class='add'>+	__ns_tree_add_raw(ns, ns_tree);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ns_tree_add_raw - Add a namespace to a namespace</div><div class='add'>+ * @ns: Namespace to add</div><div class='add'>+ *</div><div class='add'>+ * This function adds a namespace to the appropriate namespace tree</div><div class='add'>+ * without assigning a id.</div><div class='add'>+ */</div><div class='add'>+#define ns_tree_add_raw(__ns) __ns_tree_add_raw(to_ns_common(__ns), to_ns_tree(__ns))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ns_tree_add - Add a namespace to a namespace tree</div><div class='add'>+ * @ns: Namespace to add</div><div class='add'>+ *</div><div class='add'>+ * This function assigns a new id to the namespace and adds it to the</div><div class='add'>+ * appropriate namespace tree and list.</div><div class='add'>+ */</div><div class='add'>+#define ns_tree_add(__ns)                                   \</div><div class='add'>+	__ns_tree_add(to_ns_common(__ns), to_ns_tree(__ns), \</div><div class='add'>+		      (((__ns) == ns_init_ns(__ns)) ? ns_init_id(__ns) : 0))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ns_tree_remove - Remove a namespace from a namespace tree</div><div class='add'>+ * @ns: Namespace to remove</div><div class='add'>+ *</div><div class='add'>+ * This function removes a namespace from the appropriate namespace</div><div class='add'>+ * tree and list.</div><div class='add'>+ */</div><div class='add'>+#define ns_tree_remove(__ns)  __ns_tree_remove(to_ns_common(__ns), to_ns_tree(__ns))</div><div class='add'>+</div><div class='add'>+#define ns_tree_adjoined_rcu(__ns, __previous) \</div><div class='add'>+	__ns_tree_adjoined_rcu(to_ns_common(__ns), to_ns_tree(__ns), __previous)</div><div class='add'>+</div><div class='add'>+#define ns_tree_active(__ns) (!RB_EMPTY_NODE(&amp;to_ns_common(__ns)-&gt;ns_tree_node.ns_node))</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_NSTREE_H */</div><div class='head'>diff --git a/include/linux/numa.h b/include/linux/numa.h<br/>index 915033a75731..e6baaf6051bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/numa.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/numa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/numa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/numa.h</a></div><div class='hunk'>@@ -3,18 +3,15 @@</div><div class='ctx'> #define _LINUX_NUMA_H</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/nodemask.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NODES_SHIFT</div><div class='del'>-#define NODES_SHIFT     CONFIG_NODES_SHIFT</div><div class='del'>-#else</div><div class='del'>-#define NODES_SHIFT     0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define MAX_NUMNODES    (1 &lt;&lt; NODES_SHIFT)</div><div class='del'>-</div><div class='del'>-#define	NUMA_NO_NODE	(-1)</div><div class='ctx'> #define	NUMA_NO_MEMBLK	(-1)</div><div class='ctx'> </div><div class='add'>+static inline bool numa_valid_node(int nid)</div><div class='add'>+{</div><div class='add'>+	return nid &gt;= 0 &amp;&amp; nid &lt; MAX_NUMNODES;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* optionally keep NUMA memory info available post init */</div><div class='ctx'> #ifdef CONFIG_NUMA_KEEP_MEMINFO</div><div class='ctx'> #define __initdata_or_meminfo</div><div class='hunk'>@@ -25,9 +22,17 @@</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> #include &lt;asm/sparsemem.h&gt;</div><div class='ctx'> </div><div class='add'>+extern struct pglist_data *node_data[];</div><div class='add'>+#define NODE_DATA(nid)	(node_data[nid])</div><div class='add'>+</div><div class='add'>+void __init alloc_node_data(int nid);</div><div class='add'>+void __init alloc_offline_node_data(int nid);</div><div class='add'>+</div><div class='ctx'> /* Generic implementation available */</div><div class='ctx'> int numa_nearest_node(int node, unsigned int state);</div><div class='ctx'> </div><div class='add'>+int nearest_node_nodemask(int node, nodemask_t *mask);</div><div class='add'>+</div><div class='ctx'> #ifndef memory_add_physaddr_to_nid</div><div class='ctx'> int memory_add_physaddr_to_nid(u64 start);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -36,12 +41,7 @@ int memory_add_physaddr_to_nid(u64 start);</div><div class='ctx'> int phys_to_target_node(u64 start);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef numa_fill_memblks</div><div class='del'>-static inline int __init numa_fill_memblks(u64 start, u64 end)</div><div class='del'>-{</div><div class='del'>-	return NUMA_NO_MEMBLK;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+int numa_fill_memblks(u64 start, u64 end);</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_NUMA */</div><div class='ctx'> static inline int numa_nearest_node(int node, unsigned int state)</div><div class='hunk'>@@ -49,6 +49,11 @@ static inline int numa_nearest_node(int node, unsigned int state)</div><div class='ctx'> 	return NUMA_NO_NODE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int nearest_node_nodemask(int node, nodemask_t *mask)</div><div class='add'>+{</div><div class='add'>+	return NUMA_NO_NODE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int memory_add_physaddr_to_nid(u64 start)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -57,6 +62,8 @@ static inline int phys_to_target_node(u64 start)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void alloc_offline_node_data(int nid) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define numa_map_to_online_node(node) numa_nearest_node(node, N_ONLINE)</div><div class='head'>diff --git a/include/linux/numa_memblks.h b/include/linux/numa_memblks.h<br/>new file mode 100644<br/>index 000000000000..991076cba7c5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/numa_memblks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/numa_memblks.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __NUMA_MEMBLKS_H</div><div class='add'>+#define __NUMA_MEMBLKS_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NUMA_MEMBLKS</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define NR_NODE_MEMBLKS		(MAX_NUMNODES * 2)</div><div class='add'>+</div><div class='add'>+void __init numa_set_distance(int from, int to, int distance);</div><div class='add'>+void __init numa_reset_distance(void);</div><div class='add'>+</div><div class='add'>+struct numa_memblk {</div><div class='add'>+	u64			start;</div><div class='add'>+	u64			end;</div><div class='add'>+	int			nid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct numa_meminfo {</div><div class='add'>+	int			nr_blks;</div><div class='add'>+	struct numa_memblk	blk[NR_NODE_MEMBLKS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init numa_add_memblk(int nodeid, u64 start, u64 end);</div><div class='add'>+int __init numa_add_reserved_memblk(int nid, u64 start, u64 end);</div><div class='add'>+void __init numa_remove_memblk_from(int idx, struct numa_meminfo *mi);</div><div class='add'>+</div><div class='add'>+int __init numa_cleanup_meminfo(struct numa_meminfo *mi);</div><div class='add'>+</div><div class='add'>+int __init numa_memblks_init(int (*init_func)(void),</div><div class='add'>+			     bool memblock_force_top_down);</div><div class='add'>+</div><div class='add'>+extern int numa_distance_cnt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NUMA_EMU</div><div class='add'>+extern int emu_nid_to_phys[MAX_NUMNODES];</div><div class='add'>+int numa_emu_cmdline(char *str);</div><div class='add'>+void __init numa_emu_update_cpu_to_node(int *emu_nid_to_phys,</div><div class='add'>+					unsigned int nr_emu_nids);</div><div class='add'>+u64 __init numa_emu_dma_end(void);</div><div class='add'>+void __init numa_emulation(struct numa_meminfo *numa_meminfo,</div><div class='add'>+			   int numa_dist_cnt);</div><div class='add'>+#else</div><div class='add'>+static inline void numa_emulation(struct numa_meminfo *numa_meminfo,</div><div class='add'>+				  int numa_dist_cnt)</div><div class='add'>+{ }</div><div class='add'>+static inline int numa_emu_cmdline(char *str)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_NUMA_EMU */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NUMA_KEEP_MEMINFO</div><div class='add'>+extern int phys_to_target_node(u64 start);</div><div class='add'>+#define phys_to_target_node phys_to_target_node</div><div class='add'>+extern int memory_add_physaddr_to_nid(u64 start);</div><div class='add'>+#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid</div><div class='add'>+#endif /* CONFIG_NUMA_KEEP_MEMINFO */</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_NUMA_MEMBLKS */</div><div class='add'>+</div><div class='add'>+#endif	/* __NUMA_MEMBLKS_H */</div><div class='head'>diff --git a/include/linux/nvme-auth.h b/include/linux/nvme-auth.h<br/>index c1d0bc5d9624..60e069a6757f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-auth.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-auth.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-auth.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nvme-auth.h</a></div><div class='hunk'>@@ -40,5 +40,12 @@ int nvme_auth_gen_pubkey(struct crypto_kpp *dh_tfm,</div><div class='ctx'> int nvme_auth_gen_shared_secret(struct crypto_kpp *dh_tfm,</div><div class='ctx'> 				u8 *ctrl_key, size_t ctrl_key_len,</div><div class='ctx'> 				u8 *sess_key, size_t sess_key_len);</div><div class='add'>+int nvme_auth_generate_psk(u8 hmac_id, u8 *skey, size_t skey_len,</div><div class='add'>+			   u8 *c1, u8 *c2, size_t hash_len,</div><div class='add'>+			   u8 **ret_psk, size_t *ret_len);</div><div class='add'>+int nvme_auth_generate_digest(u8 hmac_id, u8 *psk, size_t psk_len,</div><div class='add'>+		char *subsysnqn, char *hostnqn, u8 **ret_digest);</div><div class='add'>+int nvme_auth_derive_tls_psk(int hmac_id, u8 *psk, size_t psk_len,</div><div class='add'>+		u8 *psk_digest, u8 **ret_psk);</div><div class='ctx'> </div><div class='ctx'> #endif /* _NVME_AUTH_H */</div><div class='head'>diff --git a/include/linux/nvme-fc-driver.h b/include/linux/nvme-fc-driver.h<br/>index 4109f1bd6128..9f6acadfe0c8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-fc-driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-fc-driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-fc-driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nvme-fc-driver.h</a></div><div class='hunk'>@@ -620,7 +620,7 @@ enum {</div><div class='ctx'>  *</div><div class='ctx'>  * Structure used between LLDD and nvmet-fc layer to represent the exchange</div><div class='ctx'>  * context for a FC-NVME FCP I/O operation (e.g. a nvme sqe, the sqe-related</div><div class='del'>- * memory transfers, and its assocated cqe transfer).</div><div class='add'>+ * memory transfers, and its associated cqe transfer).</div><div class='ctx'>  *</div><div class='ctx'>  * The structure is allocated by the LLDD whenever a FCP CMD IU is received</div><div class='ctx'>  * from the FC link. The address of the structure is passed to the nvmet-fc</div><div class='hunk'>@@ -920,6 +920,9 @@ struct nvmet_fc_target_port {</div><div class='ctx'>  *       further references to hosthandle.</div><div class='ctx'>  *       Entrypoint is Mandatory if the lldd calls nvmet_fc_invalidate_host().</div><div class='ctx'>  *</div><div class='add'>+ * @host_traddr: called by the transport to retrieve the node name and</div><div class='add'>+ *       port name of the host port address.</div><div class='add'>+ *</div><div class='ctx'>  * @max_hw_queues:  indicates the maximum number of hw queues the LLDD</div><div class='ctx'>  *       supports for cpu affinitization.</div><div class='ctx'>  *       Value is Mandatory. Must be at least 1.</div><div class='hunk'>@@ -975,6 +978,7 @@ struct nvmet_fc_target_template {</div><div class='ctx'> 	void (*ls_abort)(struct nvmet_fc_target_port *targetport,</div><div class='ctx'> 				void *hosthandle, struct nvmefc_ls_req *lsreq);</div><div class='ctx'> 	void (*host_release)(void *hosthandle);</div><div class='add'>+	int (*host_traddr)(void *hosthandle, u64 *wwnn, u64 *wwpn);</div><div class='ctx'> </div><div class='ctx'> 	u32	max_hw_queues;</div><div class='ctx'> 	u16	max_sgl_segments;</div><div class='head'>diff --git a/include/linux/nvme-keyring.h b/include/linux/nvme-keyring.h<br/>index e10333d78dbb..ab8971afa973 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-keyring.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-keyring.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-keyring.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nvme-keyring.h</a></div><div class='hunk'>@@ -6,15 +6,25 @@</div><div class='ctx'> #ifndef _NVME_KEYRING_H</div><div class='ctx'> #define _NVME_KEYRING_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/key.h&gt;</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_NVME_KEYRING)</div><div class='ctx'> </div><div class='add'>+struct key *nvme_tls_psk_refresh(struct key *keyring,</div><div class='add'>+		const char *hostnqn, const char *subnqn, u8 hmac_id,</div><div class='add'>+		u8 *data, size_t data_len, const char *digest);</div><div class='ctx'> key_serial_t nvme_tls_psk_default(struct key *keyring,</div><div class='ctx'> 		const char *hostnqn, const char *subnqn);</div><div class='ctx'> </div><div class='ctx'> key_serial_t nvme_keyring_id(void);</div><div class='del'>-</div><div class='add'>+struct key *nvme_tls_key_lookup(key_serial_t key_id);</div><div class='ctx'> #else</div><div class='del'>-</div><div class='add'>+static inline struct key *nvme_tls_psk_refresh(struct key *keyring,</div><div class='add'>+		const char *hostnqn, char *subnqn, u8 hmac_id,</div><div class='add'>+		u8 *data, size_t data_len, const char *digest)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENOTSUPP);</div><div class='add'>+}</div><div class='ctx'> static inline key_serial_t nvme_tls_psk_default(struct key *keyring,</div><div class='ctx'> 		const char *hostnqn, const char *subnqn)</div><div class='ctx'> {</div><div class='hunk'>@@ -24,5 +34,9 @@ static inline key_serial_t nvme_keyring_id(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline struct key *nvme_tls_key_lookup(key_serial_t key_id)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENOTSUPP);</div><div class='add'>+}</div><div class='ctx'> #endif /* !CONFIG_NVME_KEYRING */</div><div class='ctx'> #endif /* _NVME_KEYRING_H */</div><div class='head'>diff --git a/include/linux/nvme-rdma.h b/include/linux/nvme-rdma.h<br/>index eb2f04d636c8..97c5f00b9aa3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-rdma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-rdma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-rdma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nvme-rdma.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@ enum nvme_rdma_cm_status {</div><div class='ctx'> 	NVME_RDMA_CM_NO_RSC		= 0x06,</div><div class='ctx'> 	NVME_RDMA_CM_INVALID_IRD	= 0x07,</div><div class='ctx'> 	NVME_RDMA_CM_INVALID_ORD	= 0x08,</div><div class='add'>+	NVME_RDMA_CM_INVALID_CNTLID	= 0x09,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline const char *nvme_rdma_cm_msg(enum nvme_rdma_cm_status status)</div><div class='hunk'>@@ -46,6 +47,8 @@ static inline const char *nvme_rdma_cm_msg(enum nvme_rdma_cm_status status)</div><div class='ctx'> 		return "invalid IRD";</div><div class='ctx'> 	case NVME_RDMA_CM_INVALID_ORD:</div><div class='ctx'> 		return "Invalid ORD";</div><div class='add'>+	case NVME_RDMA_CM_INVALID_CNTLID:</div><div class='add'>+		return "invalid controller ID";</div><div class='ctx'> 	default:</div><div class='ctx'> 		return "unrecognized reason";</div><div class='ctx'> 	}</div><div class='hunk'>@@ -64,7 +67,8 @@ struct nvme_rdma_cm_req {</div><div class='ctx'> 	__le16		qid;</div><div class='ctx'> 	__le16		hrqsize;</div><div class='ctx'> 	__le16		hsqsize;</div><div class='del'>-	u8		rsvd[24];</div><div class='add'>+	__le16		cntlid;</div><div class='add'>+	u8		rsvd[22];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/nvme-tcp.h b/include/linux/nvme-tcp.h<br/>index e07e8978d691..e435250fcb4d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-tcp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme-tcp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nvme-tcp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nvme-tcp.h</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'> #define NVME_TCP_ADMIN_CCSZ	SZ_8K</div><div class='ctx'> #define NVME_TCP_DIGEST_LENGTH	4</div><div class='ctx'> #define NVME_TCP_MIN_MAXH2CDATA 4096</div><div class='add'>+#define NVME_TCP_MIN_C2HTERM_PLEN	24</div><div class='add'>+#define NVME_TCP_MAX_C2HTERM_PLEN	152</div><div class='ctx'> </div><div class='ctx'> enum nvme_tcp_pfv {</div><div class='ctx'> 	NVME_TCP_PFV_1_0 = 0x0,</div><div class='head'>diff --git a/include/linux/nvme.h b/include/linux/nvme.h<br/>index 425573202295..655d194f8e72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nvme.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvme.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nvme.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nvme.h</a></div><div class='hunk'>@@ -25,6 +25,9 @@</div><div class='ctx'> </div><div class='ctx'> #define NVME_NSID_ALL		0xffffffff</div><div class='ctx'> </div><div class='add'>+/* Special NSSR value, 'NVMe' */</div><div class='add'>+#define NVME_SUBSYS_RESET	0x4E564D65</div><div class='add'>+</div><div class='ctx'> enum nvme_subsys_type {</div><div class='ctx'> 	/* Referral to another discovery type target subsystem */</div><div class='ctx'> 	NVME_NQN_DISC	= 1,</div><div class='hunk'>@@ -61,6 +64,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> /* Transport Type codes for Discovery Log Page entry TRTYPE field */</div><div class='ctx'> enum {</div><div class='add'>+	NVMF_TRTYPE_PCI		= 0,	/* PCI */</div><div class='ctx'> 	NVMF_TRTYPE_RDMA	= 1,	/* RDMA */</div><div class='ctx'> 	NVMF_TRTYPE_FC		= 2,	/* Fibre Channel */</div><div class='ctx'> 	NVMF_TRTYPE_TCP		= 3,	/* TCP/IP */</div><div class='hunk'>@@ -85,10 +89,11 @@ enum {</div><div class='ctx'> enum {</div><div class='ctx'> 	NVMF_RDMA_QPTYPE_CONNECTED	= 1, /* Reliable Connected */</div><div class='ctx'> 	NVMF_RDMA_QPTYPE_DATAGRAM	= 2, /* Reliable Datagram */</div><div class='add'>+	NVMF_RDMA_QPTYPE_INVALID	= 0xff,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* RDMA QP Service Type codes for Discovery Log Page entry TSAS</div><div class='del'>- * RDMA_QPTYPE field</div><div class='add'>+/* RDMA Provider Type codes for Discovery Log Page entry TSAS</div><div class='add'>+ * RDMA_PRTYPE field</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	NVMF_RDMA_PRTYPE_NOT_SPECIFIED	= 1, /* No Provider Specified */</div><div class='hunk'>@@ -110,6 +115,7 @@ enum {</div><div class='ctx'> 	NVMF_TCP_SECTYPE_NONE = 0, /* No Security */</div><div class='ctx'> 	NVMF_TCP_SECTYPE_TLS12 = 1, /* TLSv1.2, NVMe-oF 1.1 and NVMe-TCP 3.6.1.1 */</div><div class='ctx'> 	NVMF_TCP_SECTYPE_TLS13 = 2, /* TLSv1.3, NVMe-oF 1.1 and NVMe-TCP 3.6.1.1 */</div><div class='add'>+	NVMF_TCP_SECTYPE_INVALID = 0xff,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NVME_AQ_DEPTH		32</div><div class='hunk'>@@ -193,28 +199,54 @@ enum {</div><div class='ctx'> #define NVME_NVM_IOSQES		6</div><div class='ctx'> #define NVME_NVM_IOCQES		4</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Controller Configuration (CC) register (Offset 14h)</div><div class='add'>+ */</div><div class='ctx'> enum {</div><div class='add'>+	/* Enable (EN): bit 0 */</div><div class='ctx'> 	NVME_CC_ENABLE		= 1 &lt;&lt; 0,</div><div class='ctx'> 	NVME_CC_EN_SHIFT	= 0,</div><div class='add'>+</div><div class='add'>+	/* Bits 03:01 are reserved (NVMe Base Specification rev 2.1) */</div><div class='add'>+</div><div class='add'>+	/* I/O Command Set Selected (CSS): bits 06:04 */</div><div class='ctx'> 	NVME_CC_CSS_SHIFT	= 4,</div><div class='del'>-	NVME_CC_MPS_SHIFT	= 7,</div><div class='del'>-	NVME_CC_AMS_SHIFT	= 11,</div><div class='del'>-	NVME_CC_SHN_SHIFT	= 14,</div><div class='del'>-	NVME_CC_IOSQES_SHIFT	= 16,</div><div class='del'>-	NVME_CC_IOCQES_SHIFT	= 20,</div><div class='add'>+	NVME_CC_CSS_MASK	= 7 &lt;&lt; NVME_CC_CSS_SHIFT,</div><div class='ctx'> 	NVME_CC_CSS_NVM		= 0 &lt;&lt; NVME_CC_CSS_SHIFT,</div><div class='ctx'> 	NVME_CC_CSS_CSI		= 6 &lt;&lt; NVME_CC_CSS_SHIFT,</div><div class='del'>-	NVME_CC_CSS_MASK	= 7 &lt;&lt; NVME_CC_CSS_SHIFT,</div><div class='add'>+</div><div class='add'>+	/* Memory Page Size (MPS): bits 10:07 */</div><div class='add'>+	NVME_CC_MPS_SHIFT	= 7,</div><div class='add'>+	NVME_CC_MPS_MASK	= 0xf &lt;&lt; NVME_CC_MPS_SHIFT,</div><div class='add'>+</div><div class='add'>+	/* Arbitration Mechanism Selected (AMS): bits 13:11 */</div><div class='add'>+	NVME_CC_AMS_SHIFT	= 11,</div><div class='add'>+	NVME_CC_AMS_MASK	= 7 &lt;&lt; NVME_CC_AMS_SHIFT,</div><div class='ctx'> 	NVME_CC_AMS_RR		= 0 &lt;&lt; NVME_CC_AMS_SHIFT,</div><div class='ctx'> 	NVME_CC_AMS_WRRU	= 1 &lt;&lt; NVME_CC_AMS_SHIFT,</div><div class='ctx'> 	NVME_CC_AMS_VS		= 7 &lt;&lt; NVME_CC_AMS_SHIFT,</div><div class='add'>+</div><div class='add'>+	/* Shutdown Notification (SHN): bits 15:14 */</div><div class='add'>+	NVME_CC_SHN_SHIFT	= 14,</div><div class='add'>+	NVME_CC_SHN_MASK	= 3 &lt;&lt; NVME_CC_SHN_SHIFT,</div><div class='ctx'> 	NVME_CC_SHN_NONE	= 0 &lt;&lt; NVME_CC_SHN_SHIFT,</div><div class='ctx'> 	NVME_CC_SHN_NORMAL	= 1 &lt;&lt; NVME_CC_SHN_SHIFT,</div><div class='ctx'> 	NVME_CC_SHN_ABRUPT	= 2 &lt;&lt; NVME_CC_SHN_SHIFT,</div><div class='del'>-	NVME_CC_SHN_MASK	= 3 &lt;&lt; NVME_CC_SHN_SHIFT,</div><div class='add'>+</div><div class='add'>+	/* I/O Submission Queue Entry Size (IOSQES): bits 19:16 */</div><div class='add'>+	NVME_CC_IOSQES_SHIFT	= 16,</div><div class='add'>+	NVME_CC_IOSQES_MASK	= 0xf &lt;&lt; NVME_CC_IOSQES_SHIFT,</div><div class='ctx'> 	NVME_CC_IOSQES		= NVME_NVM_IOSQES &lt;&lt; NVME_CC_IOSQES_SHIFT,</div><div class='add'>+</div><div class='add'>+	/* I/O Completion Queue Entry Size (IOCQES): bits 23:20 */</div><div class='add'>+	NVME_CC_IOCQES_SHIFT	= 20,</div><div class='add'>+	NVME_CC_IOCQES_MASK	= 0xf &lt;&lt; NVME_CC_IOCQES_SHIFT,</div><div class='ctx'> 	NVME_CC_IOCQES		= NVME_NVM_IOCQES &lt;&lt; NVME_CC_IOCQES_SHIFT,</div><div class='add'>+</div><div class='add'>+	/* Controller Ready Independent of Media Enable (CRIME): bit 24 */</div><div class='ctx'> 	NVME_CC_CRIME		= 1 &lt;&lt; 24,</div><div class='add'>+</div><div class='add'>+	/* Bits 25:31 are reserved (NVMe Base Specification rev 2.1) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -270,6 +302,8 @@ enum nvme_ctrl_attr {</div><div class='ctx'> 	NVME_CTRL_ATTR_HID_128_BIT	= (1 &lt;&lt; 0),</div><div class='ctx'> 	NVME_CTRL_ATTR_TBKAS		= (1 &lt;&lt; 6),</div><div class='ctx'> 	NVME_CTRL_ATTR_ELBAS		= (1 &lt;&lt; 15),</div><div class='add'>+	NVME_CTRL_ATTR_RHII		= (1 &lt;&lt; 18),</div><div class='add'>+	NVME_CTRL_ATTR_FDPS		= (1 &lt;&lt; 19),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nvme_id_ctrl {</div><div class='hunk'>@@ -322,7 +356,8 @@ struct nvme_id_ctrl {</div><div class='ctx'> 	__le32			sanicap;</div><div class='ctx'> 	__le32			hmminds;</div><div class='ctx'> 	__le16			hmmaxd;</div><div class='del'>-	__u8			rsvd338[4];</div><div class='add'>+	__le16			nvmsetidmax;</div><div class='add'>+	__le16			endgidmax;</div><div class='ctx'> 	__u8			anatt;</div><div class='ctx'> 	__u8			anacap;</div><div class='ctx'> 	__le32			anagrpmax;</div><div class='hunk'>@@ -383,6 +418,11 @@ enum {</div><div class='ctx'> 	NVME_CTRL_CTRATT_PREDICTABLE_LAT	= 1 &lt;&lt; 5,</div><div class='ctx'> 	NVME_CTRL_CTRATT_NAMESPACE_GRANULARITY	= 1 &lt;&lt; 7,</div><div class='ctx'> 	NVME_CTRL_CTRATT_UUID_LIST		= 1 &lt;&lt; 9,</div><div class='add'>+	NVME_CTRL_SGLS_BYTE_ALIGNED             = 1,</div><div class='add'>+	NVME_CTRL_SGLS_DWORD_ALIGNED            = 2,</div><div class='add'>+	NVME_CTRL_SGLS_KSDBDS			= 1 &lt;&lt; 2,</div><div class='add'>+	NVME_CTRL_SGLS_MSDS                     = 1 &lt;&lt; 19,</div><div class='add'>+	NVME_CTRL_SGLS_SAOS                     = 1 &lt;&lt; 20,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct nvme_lbaf {</div><div class='hunk'>@@ -480,6 +520,9 @@ enum {</div><div class='ctx'> 	NVME_ID_NS_NVM_STS_MASK		= 0x7f,</div><div class='ctx'> 	NVME_ID_NS_NVM_GUARD_SHIFT	= 7,</div><div class='ctx'> 	NVME_ID_NS_NVM_GUARD_MASK	= 0x3,</div><div class='add'>+	NVME_ID_NS_NVM_QPIF_SHIFT	= 9,</div><div class='add'>+	NVME_ID_NS_NVM_QPIF_MASK	= 0xf,</div><div class='add'>+	NVME_ID_NS_NVM_QPIFS		= 1 &lt;&lt; 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline __u8 nvme_elbaf_sts(__u32 elbaf)</div><div class='hunk'>@@ -492,6 +535,11 @@ static inline __u8 nvme_elbaf_guard_type(__u32 elbaf)</div><div class='ctx'> 	return (elbaf &gt;&gt; NVME_ID_NS_NVM_GUARD_SHIFT) &amp; NVME_ID_NS_NVM_GUARD_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline __u8 nvme_elbaf_qualified_guard_type(__u32 elbaf)</div><div class='add'>+{</div><div class='add'>+	return (elbaf &gt;&gt; NVME_ID_NS_NVM_QPIF_SHIFT) &amp; NVME_ID_NS_NVM_QPIF_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct nvme_id_ctrl_nvm {</div><div class='ctx'> 	__u8	vsl;</div><div class='ctx'> 	__u8	wzsl;</div><div class='hunk'>@@ -509,6 +557,7 @@ enum {</div><div class='ctx'> 	NVME_ID_CNS_NS_DESC_LIST	= 0x03,</div><div class='ctx'> 	NVME_ID_CNS_CS_NS		= 0x05,</div><div class='ctx'> 	NVME_ID_CNS_CS_CTRL		= 0x06,</div><div class='add'>+	NVME_ID_CNS_NS_ACTIVE_LIST_CS	= 0x07,</div><div class='ctx'> 	NVME_ID_CNS_NS_CS_INDEP		= 0x08,</div><div class='ctx'> 	NVME_ID_CNS_NS_PRESENT_LIST	= 0x10,</div><div class='ctx'> 	NVME_ID_CNS_NS_PRESENT		= 0x11,</div><div class='hunk'>@@ -517,6 +566,7 @@ enum {</div><div class='ctx'> 	NVME_ID_CNS_SCNDRY_CTRL_LIST	= 0x15,</div><div class='ctx'> 	NVME_ID_CNS_NS_GRANULARITY	= 0x16,</div><div class='ctx'> 	NVME_ID_CNS_UUID_LIST		= 0x17,</div><div class='add'>+	NVME_ID_CNS_ENDGRP_LIST		= 0x19,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -547,6 +597,8 @@ enum {</div><div class='ctx'> 	NVME_NS_FLBAS_LBA_SHIFT	= 1,</div><div class='ctx'> 	NVME_NS_FLBAS_META_EXT	= 0x10,</div><div class='ctx'> 	NVME_NS_NMIC_SHARED	= 1 &lt;&lt; 0,</div><div class='add'>+	NVME_NS_ROTATIONAL	= 1 &lt;&lt; 4,</div><div class='add'>+	NVME_NS_VWC_NOT_PRESENT = 1 &lt;&lt; 5,</div><div class='ctx'> 	NVME_LBAF_RP_BEST	= 0,</div><div class='ctx'> 	NVME_LBAF_RP_BETTER	= 1,</div><div class='ctx'> 	NVME_LBAF_RP_GOOD	= 2,</div><div class='hunk'>@@ -571,6 +623,7 @@ enum {</div><div class='ctx'> 	NVME_NVM_NS_16B_GUARD	= 0,</div><div class='ctx'> 	NVME_NVM_NS_32B_GUARD	= 1,</div><div class='ctx'> 	NVME_NVM_NS_64B_GUARD	= 2,</div><div class='add'>+	NVME_NVM_NS_QTYPE_GUARD	= 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline __u8 nvme_lbaf_index(__u8 flbas)</div><div class='hunk'>@@ -603,6 +656,78 @@ enum {</div><div class='ctx'> 	NVME_NIDT_CSI		= 0x04,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nvme_endurance_group_log {</div><div class='add'>+	__u8	egcw;</div><div class='add'>+	__u8	egfeat;</div><div class='add'>+	__u8	rsvd2;</div><div class='add'>+	__u8	avsp;</div><div class='add'>+	__u8	avspt;</div><div class='add'>+	__u8	pused;</div><div class='add'>+	__le16	did;</div><div class='add'>+	__u8	rsvd8[24];</div><div class='add'>+	__u8	ee[16];</div><div class='add'>+	__u8	dur[16];</div><div class='add'>+	__u8	duw[16];</div><div class='add'>+	__u8	muw[16];</div><div class='add'>+	__u8	hrc[16];</div><div class='add'>+	__u8	hwc[16];</div><div class='add'>+	__u8	mdie[16];</div><div class='add'>+	__u8	neile[16];</div><div class='add'>+	__u8	tegcap[16];</div><div class='add'>+	__u8	uegcap[16];</div><div class='add'>+	__u8	rsvd192[320];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_rotational_media_log {</div><div class='add'>+	__le16	endgid;</div><div class='add'>+	__le16	numa;</div><div class='add'>+	__le16	nrs;</div><div class='add'>+	__u8	rsvd6[2];</div><div class='add'>+	__le32	spinc;</div><div class='add'>+	__le32	fspinc;</div><div class='add'>+	__le32	ldc;</div><div class='add'>+	__le32	fldc;</div><div class='add'>+	__u8	rsvd24[488];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_fdp_config {</div><div class='add'>+	__u8			flags;</div><div class='add'>+#define FDPCFG_FDPE	(1U &lt;&lt; 0)</div><div class='add'>+	__u8			fdpcidx;</div><div class='add'>+	__le16			reserved;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_fdp_ruh_desc {</div><div class='add'>+	__u8			ruht;</div><div class='add'>+	__u8			reserved[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_fdp_config_desc {</div><div class='add'>+	__le16			dsze;</div><div class='add'>+	__u8			fdpa;</div><div class='add'>+	__u8			vss;</div><div class='add'>+	__le32			nrg;</div><div class='add'>+	__le16			nruh;</div><div class='add'>+	__le16			maxpids;</div><div class='add'>+	__le32			nns;</div><div class='add'>+	__le64			runs;</div><div class='add'>+	__le32			erutl;</div><div class='add'>+	__u8			rsvd28[36];</div><div class='add'>+	struct nvme_fdp_ruh_desc ruhs[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_fdp_config_log {</div><div class='add'>+	__le16			numfdpc;</div><div class='add'>+	__u8			ver;</div><div class='add'>+	__u8			rsvd3;</div><div class='add'>+	__le32			sze;</div><div class='add'>+	__u8			rsvd8[8];</div><div class='add'>+	/*</div><div class='add'>+	 * This is followed by variable number of nvme_fdp_config_desc</div><div class='add'>+	 * structures, but sparse doesn't like nested variable sized arrays.</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct nvme_smart_log {</div><div class='ctx'> 	__u8			critical_warning;</div><div class='ctx'> 	__u8			temperature[2];</div><div class='hunk'>@@ -829,6 +954,7 @@ enum nvme_opcode {</div><div class='ctx'> 	nvme_cmd_resv_register	= 0x0d,</div><div class='ctx'> 	nvme_cmd_resv_report	= 0x0e,</div><div class='ctx'> 	nvme_cmd_resv_acquire	= 0x11,</div><div class='add'>+	nvme_cmd_io_mgmt_recv	= 0x12,</div><div class='ctx'> 	nvme_cmd_resv_release	= 0x15,</div><div class='ctx'> 	nvme_cmd_zone_mgmt_send	= 0x79,</div><div class='ctx'> 	nvme_cmd_zone_mgmt_recv	= 0x7a,</div><div class='hunk'>@@ -850,6 +976,7 @@ enum nvme_opcode {</div><div class='ctx'> 		nvme_opcode_name(nvme_cmd_resv_register),	\</div><div class='ctx'> 		nvme_opcode_name(nvme_cmd_resv_report),		\</div><div class='ctx'> 		nvme_opcode_name(nvme_cmd_resv_acquire),	\</div><div class='add'>+		nvme_opcode_name(nvme_cmd_io_mgmt_recv),	\</div><div class='ctx'> 		nvme_opcode_name(nvme_cmd_resv_release),	\</div><div class='ctx'> 		nvme_opcode_name(nvme_cmd_zone_mgmt_send),	\</div><div class='ctx'> 		nvme_opcode_name(nvme_cmd_zone_mgmt_recv),	\</div><div class='hunk'>@@ -973,8 +1100,8 @@ struct nvme_rw_command {</div><div class='ctx'> 	__le16			control;</div><div class='ctx'> 	__le32			dsmgmt;</div><div class='ctx'> 	__le32			reftag;</div><div class='del'>-	__le16			apptag;</div><div class='del'>-	__le16			appmask;</div><div class='add'>+	__le16			lbat;</div><div class='add'>+	__le16			lbatm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -1001,6 +1128,7 @@ enum {</div><div class='ctx'> 	NVME_RW_PRINFO_PRCHK_GUARD	= 1 &lt;&lt; 12,</div><div class='ctx'> 	NVME_RW_PRINFO_PRACT		= 1 &lt;&lt; 13,</div><div class='ctx'> 	NVME_RW_DTYPE_STREAMS		= 1 &lt;&lt; 4,</div><div class='add'>+	NVME_RW_DTYPE_DPLCMT		= 2 &lt;&lt; 4,</div><div class='ctx'> 	NVME_WZ_DEAC			= 1 &lt;&lt; 9,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1043,8 +1171,8 @@ struct nvme_write_zeroes_cmd {</div><div class='ctx'> 	__le16			control;</div><div class='ctx'> 	__le32			dsmgmt;</div><div class='ctx'> 	__le32			reftag;</div><div class='del'>-	__le16			apptag;</div><div class='del'>-	__le16			appmask;</div><div class='add'>+	__le16			lbat;</div><div class='add'>+	__le16			lbatm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum nvme_zone_mgmt_action {</div><div class='hunk'>@@ -1088,6 +1216,38 @@ struct nvme_zone_mgmt_recv_cmd {</div><div class='ctx'> 	__le32			cdw14[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nvme_io_mgmt_recv_cmd {</div><div class='add'>+	__u8			opcode;</div><div class='add'>+	__u8			flags;</div><div class='add'>+	__u16			command_id;</div><div class='add'>+	__le32			nsid;</div><div class='add'>+	__le64			rsvd2[2];</div><div class='add'>+	union nvme_data_ptr	dptr;</div><div class='add'>+	__u8			mo;</div><div class='add'>+	__u8			rsvd11;</div><div class='add'>+	__u16			mos;</div><div class='add'>+	__le32			numd;</div><div class='add'>+	__le32			cdw12[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NVME_IO_MGMT_RECV_MO_RUHS	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_fdp_ruh_status_desc {</div><div class='add'>+	__le16			pid;</div><div class='add'>+	__le16			ruhid;</div><div class='add'>+	__le32			earutr;</div><div class='add'>+	__le64			ruamw;</div><div class='add'>+	__u8			reserved[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_fdp_ruh_status {</div><div class='add'>+	__u8			rsvd0[14];</div><div class='add'>+	__le16			nruhsd;</div><div class='add'>+	struct nvme_fdp_ruh_status_desc ruhsd[];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	NVME_ZRA_ZONE_REPORT		= 0,</div><div class='ctx'> 	NVME_ZRASF_ZONE_REPORT_ALL	= 0,</div><div class='hunk'>@@ -1223,6 +1383,7 @@ enum {</div><div class='ctx'> 	NVME_FEAT_PLM_WINDOW	= 0x14,</div><div class='ctx'> 	NVME_FEAT_HOST_BEHAVIOR	= 0x16,</div><div class='ctx'> 	NVME_FEAT_SANITIZE	= 0x17,</div><div class='add'>+	NVME_FEAT_FDP		= 0x1d,</div><div class='ctx'> 	NVME_FEAT_SW_PROGRESS	= 0x80,</div><div class='ctx'> 	NVME_FEAT_HOST_ID	= 0x81,</div><div class='ctx'> 	NVME_FEAT_RESV_MASK	= 0x82,</div><div class='hunk'>@@ -1230,6 +1391,7 @@ enum {</div><div class='ctx'> 	NVME_FEAT_WRITE_PROTECT	= 0x84,</div><div class='ctx'> 	NVME_FEAT_VENDOR_START	= 0xC0,</div><div class='ctx'> 	NVME_FEAT_VENDOR_END	= 0xFF,</div><div class='add'>+	NVME_LOG_SUPPORTED	= 0x00,</div><div class='ctx'> 	NVME_LOG_ERROR		= 0x01,</div><div class='ctx'> 	NVME_LOG_SMART		= 0x02,</div><div class='ctx'> 	NVME_LOG_FW_SLOT	= 0x03,</div><div class='hunk'>@@ -1240,6 +1402,9 @@ enum {</div><div class='ctx'> 	NVME_LOG_TELEMETRY_CTRL = 0x08,</div><div class='ctx'> 	NVME_LOG_ENDURANCE_GROUP = 0x09,</div><div class='ctx'> 	NVME_LOG_ANA		= 0x0c,</div><div class='add'>+	NVME_LOG_FEATURES	= 0x12,</div><div class='add'>+	NVME_LOG_RMI		= 0x16,</div><div class='add'>+	NVME_LOG_FDP_CONFIGS	= 0x20,</div><div class='ctx'> 	NVME_LOG_DISC		= 0x70,</div><div class='ctx'> 	NVME_LOG_RESERVATION	= 0x80,</div><div class='ctx'> 	NVME_FWACT_REPL		= (0 &lt;&lt; 3),</div><div class='hunk'>@@ -1247,6 +1412,24 @@ enum {</div><div class='ctx'> 	NVME_FWACT_ACTV		= (2 &lt;&lt; 3),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct nvme_supported_log {</div><div class='add'>+	__le32	lids[256];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NVME_LIDS_LSUPP	= 1 &lt;&lt; 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_supported_features_log {</div><div class='add'>+	__le32	fis[256];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NVME_FIS_FSUPP	= 1 &lt;&lt; 0,</div><div class='add'>+	NVME_FIS_NSCPE	= 1 &lt;&lt; 20,</div><div class='add'>+	NVME_FIS_CSCPE	= 1 &lt;&lt; 21,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* NVMe Namespace Write Protect State */</div><div class='ctx'> enum {</div><div class='ctx'> 	NVME_NS_NO_WRITE_PROTECT = 0,</div><div class='hunk'>@@ -1267,7 +1450,8 @@ struct nvme_identify {</div><div class='ctx'> 	__u8			cns;</div><div class='ctx'> 	__u8			rsvd3;</div><div class='ctx'> 	__le16			ctrlid;</div><div class='del'>-	__u8			rsvd11[3];</div><div class='add'>+	__le16			cnssid;</div><div class='add'>+	__u8			rsvd11;</div><div class='ctx'> 	__u8			csi;</div><div class='ctx'> 	__u32			rsvd12[4];</div><div class='ctx'> };</div><div class='hunk'>@@ -1375,7 +1559,7 @@ struct nvme_get_log_page_command {</div><div class='ctx'> 	__u8			lsp; /* upper 4 bits reserved */</div><div class='ctx'> 	__le16			numdl;</div><div class='ctx'> 	__le16			numdu;</div><div class='del'>-	__u16			rsvd11;</div><div class='add'>+	__le16			lsi;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			__le32 lpol;</div><div class='hunk'>@@ -1664,6 +1848,13 @@ enum {</div><div class='ctx'> 	NVME_AUTH_DHGROUP_INVALID	= 0xff,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	NVME_AUTH_SECP_NOSC		= 0x00,</div><div class='add'>+	NVME_AUTH_SECP_SC		= 0x01,</div><div class='add'>+	NVME_AUTH_SECP_NEWTLSPSK	= 0x02,</div><div class='add'>+	NVME_AUTH_SECP_REPLACETLSPSK	= 0x03,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> union nvmf_auth_protocol {</div><div class='ctx'> 	struct nvmf_auth_dhchap_protocol_descriptor dhchap;</div><div class='ctx'> };</div><div class='hunk'>@@ -1808,6 +1999,7 @@ struct nvme_command {</div><div class='ctx'> 		struct nvmf_auth_receive_command auth_receive;</div><div class='ctx'> 		struct nvme_dbbuf dbbuf;</div><div class='ctx'> 		struct nvme_directive_cmd directive;</div><div class='add'>+		struct nvme_io_mgmt_recv_cmd imr;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1816,6 +2008,46 @@ static inline bool nvme_is_fabrics(const struct nvme_command *cmd)</div><div class='ctx'> 	return cmd-&gt;common.opcode == nvme_fabrics_command;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NVME_VERBOSE_ERRORS</div><div class='add'>+const char *nvme_get_error_status_str(u16 status);</div><div class='add'>+const char *nvme_get_opcode_str(u8 opcode);</div><div class='add'>+const char *nvme_get_admin_opcode_str(u8 opcode);</div><div class='add'>+const char *nvme_get_fabrics_opcode_str(u8 opcode);</div><div class='add'>+#else /* CONFIG_NVME_VERBOSE_ERRORS */</div><div class='add'>+static inline const char *nvme_get_error_status_str(u16 status)</div><div class='add'>+{</div><div class='add'>+	return "I/O Error";</div><div class='add'>+}</div><div class='add'>+static inline const char *nvme_get_opcode_str(u8 opcode)</div><div class='add'>+{</div><div class='add'>+	return "I/O Cmd";</div><div class='add'>+}</div><div class='add'>+static inline const char *nvme_get_admin_opcode_str(u8 opcode)</div><div class='add'>+{</div><div class='add'>+	return "Admin Cmd";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *nvme_get_fabrics_opcode_str(u8 opcode)</div><div class='add'>+{</div><div class='add'>+	return "Fabrics Cmd";</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_NVME_VERBOSE_ERRORS */</div><div class='add'>+</div><div class='add'>+static inline const char *nvme_opcode_str(int qid, u8 opcode)</div><div class='add'>+{</div><div class='add'>+	return qid ? nvme_get_opcode_str(opcode) :</div><div class='add'>+		nvme_get_admin_opcode_str(opcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *nvme_fabrics_opcode_str(</div><div class='add'>+		int qid, const struct nvme_command *cmd)</div><div class='add'>+{</div><div class='add'>+	if (nvme_is_fabrics(cmd))</div><div class='add'>+		return nvme_get_fabrics_opcode_str(cmd-&gt;fabrics.fctype);</div><div class='add'>+</div><div class='add'>+	return nvme_opcode_str(qid, cmd-&gt;common.opcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct nvme_error_slot {</div><div class='ctx'> 	__le64		error_count;</div><div class='ctx'> 	__le16		sqid;</div><div class='hunk'>@@ -1846,6 +2078,7 @@ enum {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Generic Command Status:</div><div class='ctx'> 	 */</div><div class='add'>+	NVME_SCT_GENERIC		= 0x0,</div><div class='ctx'> 	NVME_SC_SUCCESS			= 0x0,</div><div class='ctx'> 	NVME_SC_INVALID_OPCODE		= 0x1,</div><div class='ctx'> 	NVME_SC_INVALID_FIELD		= 0x2,</div><div class='hunk'>@@ -1893,6 +2126,7 @@ enum {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Command Specific Status:</div><div class='ctx'> 	 */</div><div class='add'>+	NVME_SCT_COMMAND_SPECIFIC	= 0x100,</div><div class='ctx'> 	NVME_SC_CQ_INVALID		= 0x100,</div><div class='ctx'> 	NVME_SC_QID_INVALID		= 0x101,</div><div class='ctx'> 	NVME_SC_QUEUE_SIZE		= 0x102,</div><div class='hunk'>@@ -1921,7 +2155,7 @@ enum {</div><div class='ctx'> 	NVME_SC_NS_NOT_ATTACHED		= 0x11a,</div><div class='ctx'> 	NVME_SC_THIN_PROV_NOT_SUPP	= 0x11b,</div><div class='ctx'> 	NVME_SC_CTRL_LIST_INVALID	= 0x11c,</div><div class='del'>-	NVME_SC_SELT_TEST_IN_PROGRESS	= 0x11d,</div><div class='add'>+	NVME_SC_SELF_TEST_IN_PROGRESS	= 0x11d,</div><div class='ctx'> 	NVME_SC_BP_WRITE_PROHIBITED	= 0x11e,</div><div class='ctx'> 	NVME_SC_CTRL_ID_INVALID		= 0x11f,</div><div class='ctx'> 	NVME_SC_SEC_CTRL_STATE_INVALID	= 0x120,</div><div class='hunk'>@@ -1937,7 +2171,7 @@ enum {</div><div class='ctx'> 	NVME_SC_BAD_ATTRIBUTES		= 0x180,</div><div class='ctx'> 	NVME_SC_INVALID_PI		= 0x181,</div><div class='ctx'> 	NVME_SC_READ_ONLY		= 0x182,</div><div class='del'>-	NVME_SC_ONCS_NOT_SUPPORTED	= 0x183,</div><div class='add'>+	NVME_SC_CMD_SIZE_LIM_EXCEEDED	= 0x183,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * I/O Command Set Specific - Fabrics commands:</div><div class='hunk'>@@ -1966,6 +2200,7 @@ enum {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Media and Data Integrity Errors:</div><div class='ctx'> 	 */</div><div class='add'>+	NVME_SCT_MEDIA_ERROR		= 0x200,</div><div class='ctx'> 	NVME_SC_WRITE_FAULT		= 0x280,</div><div class='ctx'> 	NVME_SC_READ_ERROR		= 0x281,</div><div class='ctx'> 	NVME_SC_GUARD_CHECK		= 0x282,</div><div class='hunk'>@@ -1978,6 +2213,7 @@ enum {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Path-related Errors:</div><div class='ctx'> 	 */</div><div class='add'>+	NVME_SCT_PATH			= 0x300,</div><div class='ctx'> 	NVME_SC_INTERNAL_PATH_ERROR	= 0x300,</div><div class='ctx'> 	NVME_SC_ANA_PERSISTENT_LOSS	= 0x301,</div><div class='ctx'> 	NVME_SC_ANA_INACCESSIBLE	= 0x302,</div><div class='hunk'>@@ -1986,11 +2222,17 @@ enum {</div><div class='ctx'> 	NVME_SC_HOST_PATH_ERROR		= 0x370,</div><div class='ctx'> 	NVME_SC_HOST_ABORTED_CMD	= 0x371,</div><div class='ctx'> </div><div class='del'>-	NVME_SC_CRD			= 0x1800,</div><div class='del'>-	NVME_SC_MORE			= 0x2000,</div><div class='del'>-	NVME_SC_DNR			= 0x4000,</div><div class='add'>+	NVME_SC_MASK			= 0x00ff, /* Status Code */</div><div class='add'>+	NVME_SCT_MASK			= 0x0700, /* Status Code Type */</div><div class='add'>+	NVME_SCT_SC_MASK		= NVME_SCT_MASK | NVME_SC_MASK,</div><div class='add'>+</div><div class='add'>+	NVME_STATUS_CRD			= 0x1800, /* Command Retry Delayed */</div><div class='add'>+	NVME_STATUS_MORE		= 0x2000,</div><div class='add'>+	NVME_STATUS_DNR			= 0x4000, /* Do Not Retry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define NVME_SCT(status) ((status) &gt;&gt; 8 &amp; 7)</div><div class='add'>+</div><div class='ctx'> struct nvme_completion {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Used by Admin and Fabrics commands to return data:</div><div class='hunk'>@@ -2013,4 +2255,81 @@ struct nvme_completion {</div><div class='ctx'> #define NVME_MINOR(ver)		(((ver) &gt;&gt; 8) &amp; 0xff)</div><div class='ctx'> #define NVME_TERTIARY(ver)	((ver) &amp; 0xff)</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	NVME_AEN_RESV_LOG_PAGE_AVALIABLE	= 0x00,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NVME_PR_LOG_EMPTY_LOG_PAGE			= 0x00,</div><div class='add'>+	NVME_PR_LOG_REGISTRATION_PREEMPTED		= 0x01,</div><div class='add'>+	NVME_PR_LOG_RESERVATION_RELEASED		= 0x02,</div><div class='add'>+	NVME_PR_LOG_RESERVATOIN_PREEMPTED		= 0x03,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NVME_PR_NOTIFY_BIT_REG_PREEMPTED		= 1,</div><div class='add'>+	NVME_PR_NOTIFY_BIT_RESV_RELEASED		= 2,</div><div class='add'>+	NVME_PR_NOTIFY_BIT_RESV_PREEMPTED		= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvme_pr_log {</div><div class='add'>+	__le64			count;</div><div class='add'>+	__u8			type;</div><div class='add'>+	__u8			nr_pages;</div><div class='add'>+	__u8			rsvd1[2];</div><div class='add'>+	__le32			nsid;</div><div class='add'>+	__u8			rsvd2[48];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvmet_pr_register_data {</div><div class='add'>+	__le64	crkey;</div><div class='add'>+	__le64	nrkey;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvmet_pr_acquire_data {</div><div class='add'>+	__le64	crkey;</div><div class='add'>+	__le64	prkey;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nvmet_pr_release_data {</div><div class='add'>+	__le64	crkey;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nvme_pr_capabilities {</div><div class='add'>+	NVME_PR_SUPPORT_PTPL				= 1,</div><div class='add'>+	NVME_PR_SUPPORT_WRITE_EXCLUSIVE			= 1 &lt;&lt; 1,</div><div class='add'>+	NVME_PR_SUPPORT_EXCLUSIVE_ACCESS		= 1 &lt;&lt; 2,</div><div class='add'>+	NVME_PR_SUPPORT_WRITE_EXCLUSIVE_REG_ONLY	= 1 &lt;&lt; 3,</div><div class='add'>+	NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_REG_ONLY	= 1 &lt;&lt; 4,</div><div class='add'>+	NVME_PR_SUPPORT_WRITE_EXCLUSIVE_ALL_REGS	= 1 &lt;&lt; 5,</div><div class='add'>+	NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_ALL_REGS	= 1 &lt;&lt; 6,</div><div class='add'>+	NVME_PR_SUPPORT_IEKEY_VER_1_3_DEF		= 1 &lt;&lt; 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nvme_pr_register_action {</div><div class='add'>+	NVME_PR_REGISTER_ACT_REG		= 0,</div><div class='add'>+	NVME_PR_REGISTER_ACT_UNREG		= 1,</div><div class='add'>+	NVME_PR_REGISTER_ACT_REPLACE		= 1 &lt;&lt; 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nvme_pr_acquire_action {</div><div class='add'>+	NVME_PR_ACQUIRE_ACT_ACQUIRE		= 0,</div><div class='add'>+	NVME_PR_ACQUIRE_ACT_PREEMPT		= 1,</div><div class='add'>+	NVME_PR_ACQUIRE_ACT_PREEMPT_AND_ABORT	= 1 &lt;&lt; 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nvme_pr_release_action {</div><div class='add'>+	NVME_PR_RELEASE_ACT_RELEASE		= 0,</div><div class='add'>+	NVME_PR_RELEASE_ACT_CLEAR		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nvme_pr_change_ptpl {</div><div class='add'>+	NVME_PR_CPTPL_NO_CHANGE			= 0,</div><div class='add'>+	NVME_PR_CPTPL_RESV			= 1 &lt;&lt; 30,</div><div class='add'>+	NVME_PR_CPTPL_CLEARED			= 2 &lt;&lt; 30,</div><div class='add'>+	NVME_PR_CPTPL_PERSIST			= 3 &lt;&lt; 30,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NVME_PR_IGNORE_KEY (1 &lt;&lt; 3)</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_NVME_H */</div><div class='head'>diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h<br/>index f0ba0e03218f..f3b13da78aac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/nvmem-provider.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/nvmem-provider.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/nvmem-provider.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/nvmem-provider.h</a></div><div class='hunk'>@@ -92,8 +92,8 @@ struct nvmem_cell_info {</div><div class='ctx'>  * @read_only:	Device is read-only.</div><div class='ctx'>  * @root_only:	Device is accessibly to root only.</div><div class='ctx'>  * @of_node:	If given, this will be used instead of the parent's of_node.</div><div class='del'>- * @reg_read:	Callback to read data.</div><div class='del'>- * @reg_write:	Callback to write data.</div><div class='add'>+ * @reg_read:	Callback to read data; return zero if successful.</div><div class='add'>+ * @reg_write:	Callback to write data; return zero if successful.</div><div class='ctx'>  * @size:	Device size.</div><div class='ctx'>  * @word_size:	Minimum read/write access granularity.</div><div class='ctx'>  * @stride:	Minimum read/write access stride.</div><div class='hunk'>@@ -103,7 +103,7 @@ struct nvmem_cell_info {</div><div class='ctx'>  *</div><div class='ctx'>  * Note: A default "nvmem&lt;id&gt;" name will be assigned to the device if</div><div class='ctx'>  * no name is specified in its configuration. In such case "&lt;id&gt;" is</div><div class='del'>- * generated with ida_simple_get() and provided id field is ignored.</div><div class='add'>+ * generated with ida_alloc() and provided id field is ignored.</div><div class='ctx'>  *</div><div class='ctx'>  * Note: Specifying name and setting id to -1 implies a unique device</div><div class='ctx'>  * whose name is provided as-is (kept unaltered).</div><div class='hunk'>@@ -138,25 +138,6 @@ struct nvmem_config {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct nvmem_cell_table - NVMEM cell definitions for given provider</div><div class='del'>- *</div><div class='del'>- * @nvmem_name:		Provider name.</div><div class='del'>- * @cells:		Array of cell definitions.</div><div class='del'>- * @ncells:		Number of cell definitions in the array.</div><div class='del'>- * @node:		List node.</div><div class='del'>- *</div><div class='del'>- * This structure together with related helper functions is provided for users</div><div class='del'>- * that don't can't access the nvmem provided structure but wish to register</div><div class='del'>- * cell definitions for it e.g. board files registering an EEPROM device.</div><div class='del'>- */</div><div class='del'>-struct nvmem_cell_table {</div><div class='del'>-	const char		*nvmem_name;</div><div class='del'>-	const struct nvmem_cell_info	*cells;</div><div class='del'>-	size_t			ncells;</div><div class='del'>-	struct list_head	node;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct nvmem_layout - NVMEM layout definitions</div><div class='ctx'>  *</div><div class='ctx'>  * @dev:		Device-model layout device.</div><div class='hunk'>@@ -190,16 +171,16 @@ void nvmem_unregister(struct nvmem_device *nvmem);</div><div class='ctx'> struct nvmem_device *devm_nvmem_register(struct device *dev,</div><div class='ctx'> 					 const struct nvmem_config *cfg);</div><div class='ctx'> </div><div class='del'>-void nvmem_add_cell_table(struct nvmem_cell_table *table);</div><div class='del'>-void nvmem_del_cell_table(struct nvmem_cell_table *table);</div><div class='del'>-</div><div class='ctx'> int nvmem_add_one_cell(struct nvmem_device *nvmem,</div><div class='ctx'> 		       const struct nvmem_cell_info *info);</div><div class='ctx'> </div><div class='ctx'> int nvmem_layout_register(struct nvmem_layout *layout);</div><div class='ctx'> void nvmem_layout_unregister(struct nvmem_layout *layout);</div><div class='ctx'> </div><div class='del'>-int nvmem_layout_driver_register(struct nvmem_layout_driver *drv);</div><div class='add'>+#define nvmem_layout_driver_register(drv) \</div><div class='add'>+	__nvmem_layout_driver_register(drv, THIS_MODULE)</div><div class='add'>+int __nvmem_layout_driver_register(struct nvmem_layout_driver *drv,</div><div class='add'>+				   struct module *owner);</div><div class='ctx'> void nvmem_layout_driver_unregister(struct nvmem_layout_driver *drv);</div><div class='ctx'> #define module_nvmem_layout_driver(__nvmem_layout_driver)		\</div><div class='ctx'> 	module_driver(__nvmem_layout_driver, nvmem_layout_driver_register, \</div><div class='hunk'>@@ -220,8 +201,6 @@ devm_nvmem_register(struct device *dev, const struct nvmem_config *c)</div><div class='ctx'> 	return nvmem_register(c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void nvmem_add_cell_table(struct nvmem_cell_table *table) {}</div><div class='del'>-static inline void nvmem_del_cell_table(struct nvmem_cell_table *table) {}</div><div class='ctx'> static inline int nvmem_add_one_cell(struct nvmem_device *nvmem,</div><div class='ctx'> 				     const struct nvmem_cell_info *info)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/oa_tc6.h b/include/linux/oa_tc6.h<br/>new file mode 100644<br/>index 000000000000..15f58e3c56c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/oa_tc6.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/oa_tc6.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * OPEN Alliance 10BASE‑T1x MAC‑PHY Serial Interface framework</div><div class='add'>+ *</div><div class='add'>+ * Link: https://opensig.org/download/document/OPEN_Alliance_10BASET1x_MAC-PHY_Serial_Interface_V1.1.pdf</div><div class='add'>+ *</div><div class='add'>+ * Author: Parthiban Veerasooran &lt;parthiban.veerasooran@microchip.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+struct oa_tc6;</div><div class='add'>+</div><div class='add'>+struct oa_tc6 *oa_tc6_init(struct spi_device *spi, struct net_device *netdev);</div><div class='add'>+void oa_tc6_exit(struct oa_tc6 *tc6);</div><div class='add'>+int oa_tc6_write_register(struct oa_tc6 *tc6, u32 address, u32 value);</div><div class='add'>+int oa_tc6_write_registers(struct oa_tc6 *tc6, u32 address, u32 value[],</div><div class='add'>+			   u8 length);</div><div class='add'>+int oa_tc6_read_register(struct oa_tc6 *tc6, u32 address, u32 *value);</div><div class='add'>+int oa_tc6_read_registers(struct oa_tc6 *tc6, u32 address, u32 value[],</div><div class='add'>+			  u8 length);</div><div class='add'>+netdev_tx_t oa_tc6_start_xmit(struct oa_tc6 *tc6, struct sk_buff *skb);</div><div class='add'>+int oa_tc6_zero_align_receive_frame_enable(struct oa_tc6 *tc6);</div><div class='head'>diff --git a/include/linux/objagg.h b/include/linux/objagg.h<br/>index 78021777df46..6df5b887dc54 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/objagg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/objagg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/objagg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/objagg.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@ struct objagg_ops {</div><div class='ctx'> 	size_t obj_size;</div><div class='ctx'> 	bool (*delta_check)(void *priv, const void *parent_obj,</div><div class='ctx'> 			    const void *obj);</div><div class='del'>-	int (*hints_obj_cmp)(const void *obj1, const void *obj2);</div><div class='ctx'> 	void * (*delta_create)(void *priv, void *parent_obj, void *obj);</div><div class='ctx'> 	void (*delta_destroy)(void *priv, void *delta_priv);</div><div class='ctx'> 	void * (*root_create)(void *priv, void *obj, unsigned int root_id);</div><div class='head'>diff --git a/include/linux/objpool.h b/include/linux/objpool.h<br/>index 15aff4a17f0c..b713a1fe7521 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/objpool.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/objpool.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/objpool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/objpool.h</a></div><div class='hunk'>@@ -5,6 +5,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/irqflags.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * objpool: ring-array based lockless MPMC queue</div><div class='hunk'>@@ -69,7 +73,7 @@ typedef int (*objpool_fini_cb)(struct objpool_head *head, void *context);</div><div class='ctx'>  * struct objpool_head - object pooling metadata</div><div class='ctx'>  * @obj_size:   object size, aligned to sizeof(void *)</div><div class='ctx'>  * @nr_objs:    total objs (to be pre-allocated with objpool)</div><div class='del'>- * @nr_cpus:    local copy of nr_cpu_ids</div><div class='add'>+ * @nr_possible_cpus: cached value of num_possible_cpus()</div><div class='ctx'>  * @capacity:   max objs can be managed by one objpool_slot</div><div class='ctx'>  * @gfp:        gfp flags for kmalloc &amp; vmalloc</div><div class='ctx'>  * @ref:        refcount of objpool</div><div class='hunk'>@@ -81,7 +85,7 @@ typedef int (*objpool_fini_cb)(struct objpool_head *head, void *context);</div><div class='ctx'> struct objpool_head {</div><div class='ctx'> 	int                     obj_size;</div><div class='ctx'> 	int                     nr_objs;</div><div class='del'>-	int                     nr_cpus;</div><div class='add'>+	int                     nr_possible_cpus;</div><div class='ctx'> 	int                     capacity;</div><div class='ctx'> 	gfp_t                   gfp;</div><div class='ctx'> 	refcount_t              ref;</div><div class='hunk'>@@ -118,13 +122,93 @@ int objpool_init(struct objpool_head *pool, int nr_objs, int object_size,</div><div class='ctx'> 		 gfp_t gfp, void *context, objpool_init_obj_cb objinit,</div><div class='ctx'> 		 objpool_fini_cb release);</div><div class='ctx'> </div><div class='add'>+/* try to retrieve object from slot */</div><div class='add'>+static inline void *__objpool_try_get_slot(struct objpool_head *pool, int cpu)</div><div class='add'>+{</div><div class='add'>+	struct objpool_slot *slot = pool-&gt;cpu_slots[cpu];</div><div class='add'>+	/* load head snapshot, other cpus may change it */</div><div class='add'>+	uint32_t head = smp_load_acquire(&amp;slot-&gt;head);</div><div class='add'>+</div><div class='add'>+	while (head != READ_ONCE(slot-&gt;last)) {</div><div class='add'>+		void *obj;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * data visibility of 'last' and 'head' could be out of</div><div class='add'>+		 * order since memory updating of 'last' and 'head' are</div><div class='add'>+		 * performed in push() and pop() independently</div><div class='add'>+		 *</div><div class='add'>+		 * before any retrieving attempts, pop() must guarantee</div><div class='add'>+		 * 'last' is behind 'head', that is to say, there must</div><div class='add'>+		 * be available objects in slot, which could be ensured</div><div class='add'>+		 * by condition 'last != head &amp;&amp; last - head &lt;= nr_objs'</div><div class='add'>+		 * that is equivalent to 'last - head - 1 &lt; nr_objs' as</div><div class='add'>+		 * 'last' and 'head' are both unsigned int32</div><div class='add'>+		 */</div><div class='add'>+		if (READ_ONCE(slot-&gt;last) - head - 1 &gt;= pool-&gt;nr_objs) {</div><div class='add'>+			head = READ_ONCE(slot-&gt;head);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* obj must be retrieved before moving forward head */</div><div class='add'>+		obj = READ_ONCE(slot-&gt;entries[head &amp; slot-&gt;mask]);</div><div class='add'>+</div><div class='add'>+		/* move head forward to mark it's consumption */</div><div class='add'>+		if (try_cmpxchg_release(&amp;slot-&gt;head, &amp;head, head + 1))</div><div class='add'>+			return obj;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * objpool_pop() - allocate an object from objpool</div><div class='ctx'>  * @pool: object pool</div><div class='ctx'>  *</div><div class='ctx'>  * return value: object ptr or NULL if failed</div><div class='ctx'>  */</div><div class='del'>-void *objpool_pop(struct objpool_head *pool);</div><div class='add'>+static inline void *objpool_pop(struct objpool_head *pool)</div><div class='add'>+{</div><div class='add'>+	void *obj = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int start, cpu;</div><div class='add'>+</div><div class='add'>+	/* disable local irq to avoid preemption &amp; interruption */</div><div class='add'>+	raw_local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	start = raw_smp_processor_id();</div><div class='add'>+	for_each_possible_cpu_wrap(cpu, start) {</div><div class='add'>+		obj = __objpool_try_get_slot(pool, cpu);</div><div class='add'>+		if (obj)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	raw_local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return obj;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* adding object to slot, abort if the slot was already full */</div><div class='add'>+static inline int</div><div class='add'>+__objpool_try_add_slot(void *obj, struct objpool_head *pool, int cpu)</div><div class='add'>+{</div><div class='add'>+	struct objpool_slot *slot = pool-&gt;cpu_slots[cpu];</div><div class='add'>+	uint32_t head, tail;</div><div class='add'>+</div><div class='add'>+	/* loading tail and head as a local snapshot, tail first */</div><div class='add'>+	tail = READ_ONCE(slot-&gt;tail);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		head = READ_ONCE(slot-&gt;head);</div><div class='add'>+		/* fault caught: something must be wrong */</div><div class='add'>+		WARN_ON_ONCE(tail - head &gt; pool-&gt;nr_objs);</div><div class='add'>+	} while (!try_cmpxchg_acquire(&amp;slot-&gt;tail, &amp;tail, tail + 1));</div><div class='add'>+</div><div class='add'>+	/* now the tail position is reserved for the given obj */</div><div class='add'>+	WRITE_ONCE(slot-&gt;entries[tail &amp; slot-&gt;mask], obj);</div><div class='add'>+	/* update sequence to make this obj available for pop() */</div><div class='add'>+	smp_store_release(&amp;slot-&gt;last, tail + 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * objpool_push() - reclaim the object and return back to objpool</div><div class='hunk'>@@ -134,7 +218,19 @@ void *objpool_pop(struct objpool_head *pool);</div><div class='ctx'>  * return: 0 or error code (it fails only when user tries to push</div><div class='ctx'>  * the same object multiple times or wrong "objects" into objpool)</div><div class='ctx'>  */</div><div class='del'>-int objpool_push(void *obj, struct objpool_head *pool);</div><div class='add'>+static inline int objpool_push(void *obj, struct objpool_head *pool)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* disable local irq to avoid preemption &amp; interruption */</div><div class='add'>+	raw_local_irq_save(flags);</div><div class='add'>+	rc = __objpool_try_add_slot(obj, pool, raw_smp_processor_id());</div><div class='add'>+	raw_local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * objpool_drop() - discard the object and deref objpool</div><div class='head'>diff --git a/include/linux/objtool.h b/include/linux/objtool.h<br/>index b3b8d3dab52d..9a00e701454c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/objtool.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/objtool.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/objtool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/objtool.h</a></div><div class='hunk'>@@ -3,16 +3,16 @@</div><div class='ctx'> #define _LINUX_OBJTOOL_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/objtool_types.h&gt;</div><div class='add'>+#include &lt;linux/annotate.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OBJTOOL</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-</div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-#define UNWIND_HINT(type, sp_reg, sp_offset, signal)	\</div><div class='add'>+#define UNWIND_HINT(type, sp_reg, sp_offset, signal)		\</div><div class='ctx'> 	"987: \n\t"						\</div><div class='ctx'> 	".pushsection .discard.unwind_hints\n\t"		\</div><div class='add'>+	ANNOTATE_DATA_SPECIAL "\n\t"				\</div><div class='ctx'> 	/* struct unwind_hint */				\</div><div class='ctx'> 	".long 987b - .\n\t"					\</div><div class='ctx'> 	".short " __stringify(sp_offset) "\n\t"			\</div><div class='hunk'>@@ -45,35 +45,21 @@</div><div class='ctx'> #define STACK_FRAME_NON_STANDARD_FP(func)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define ANNOTATE_NOENDBR					\</div><div class='del'>-	"986: \n\t"						\</div><div class='del'>-	".pushsection .discard.noendbr\n\t"			\</div><div class='del'>-	".long 986b\n\t"					\</div><div class='del'>-	".popsection\n\t"</div><div class='del'>-</div><div class='ctx'> #define ASM_REACHABLE							\</div><div class='ctx'> 	"998:\n\t"							\</div><div class='ctx'> 	".pushsection .discard.reachable\n\t"				\</div><div class='ctx'> 	".long 998b\n\t"						\</div><div class='ctx'> 	".popsection\n\t"</div><div class='ctx'> </div><div class='del'>-#else /* __ASSEMBLY__ */</div><div class='add'>+#define __ASM_BREF(label)	label ## b</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This macro indicates that the following intra-function call is valid.</div><div class='del'>- * Any non-annotated intra-function call will cause objtool to issue a warning.</div><div class='del'>- */</div><div class='del'>-#define ANNOTATE_INTRA_FUNCTION_CALL				\</div><div class='del'>-	999:							\</div><div class='del'>-	.pushsection .discard.intra_function_calls;		\</div><div class='del'>-	.long 999b;						\</div><div class='del'>-	.popsection;</div><div class='add'>+#else /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * In asm, there are two kinds of code: normal C-type callable functions and</div><div class='ctx'>  * the rest.  The normal callable functions can be called by other code, and</div><div class='ctx'>  * don't do anything unusual with the stack.  Such normal callable functions</div><div class='del'>- * are annotated with the ENTRY/ENDPROC macros.  Most asm code falls in this</div><div class='add'>+ * are annotated with SYM_FUNC_{START,END}.  Most asm code falls in this</div><div class='ctx'>  * category.  In this case, no special debugging annotations are needed because</div><div class='ctx'>  * objtool can automatically generate the ORC data for the ORC unwinder to read</div><div class='ctx'>  * at runtime.</div><div class='hunk'>@@ -93,6 +79,7 @@</div><div class='ctx'> .macro UNWIND_HINT type:req sp_reg=0 sp_offset=0 signal=0</div><div class='ctx'> .Lhere_\@:</div><div class='ctx'> 	.pushsection .discard.unwind_hints</div><div class='add'>+		ANNOTATE_DATA_SPECIAL</div><div class='ctx'> 		/* struct unwind_hint */</div><div class='ctx'> 		.long .Lhere_\@ - .</div><div class='ctx'> 		.short \sp_offset</div><div class='hunk'>@@ -105,7 +92,7 @@</div><div class='ctx'> </div><div class='ctx'> .macro STACK_FRAME_NON_STANDARD func:req</div><div class='ctx'> 	.pushsection .discard.func_stack_frame_non_standard, "aw"</div><div class='del'>-	.long \func - .</div><div class='add'>+	.quad \func</div><div class='ctx'> 	.popsection</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='hunk'>@@ -115,37 +102,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='del'>-.macro ANNOTATE_NOENDBR</div><div class='del'>-.Lhere_\@:</div><div class='del'>-	.pushsection .discard.noendbr</div><div class='del'>-	.long	.Lhere_\@</div><div class='del'>-	.popsection</div><div class='del'>-.endm</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Use objtool to validate the entry requirement that all code paths do</div><div class='del'>- * VALIDATE_UNRET_END before RET.</div><div class='del'>- *</div><div class='del'>- * NOTE: The macro must be used at the beginning of a global symbol, otherwise</div><div class='del'>- * it will be ignored.</div><div class='del'>- */</div><div class='del'>-.macro VALIDATE_UNRET_BEGIN</div><div class='del'>-#if defined(CONFIG_NOINSTR_VALIDATION) &amp;&amp; \</div><div class='del'>-	(defined(CONFIG_MITIGATION_UNRET_ENTRY) || defined(CONFIG_MITIGATION_SRSO))</div><div class='del'>-.Lhere_\@:</div><div class='del'>-	.pushsection .discard.validate_unret</div><div class='del'>-	.long	.Lhere_\@ - .</div><div class='del'>-	.popsection</div><div class='del'>-#endif</div><div class='del'>-.endm</div><div class='del'>-</div><div class='del'>-.macro REACHABLE</div><div class='del'>-.Lhere_\@:</div><div class='del'>-	.pushsection .discard.reachable</div><div class='del'>-	.long	.Lhere_\@</div><div class='del'>-	.popsection</div><div class='del'>-.endm</div><div class='del'>-</div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_OBJTOOL */</div><div class='hunk'>@@ -155,20 +111,20 @@</div><div class='ctx'> #define UNWIND_HINT(type, sp_reg, sp_offset, signal) "\n\t"</div><div class='ctx'> #define STACK_FRAME_NON_STANDARD(func)</div><div class='ctx'> #define STACK_FRAME_NON_STANDARD_FP(func)</div><div class='del'>-#define ANNOTATE_NOENDBR</div><div class='del'>-#define ASM_REACHABLE</div><div class='ctx'> #else</div><div class='del'>-#define ANNOTATE_INTRA_FUNCTION_CALL</div><div class='ctx'> .macro UNWIND_HINT type:req sp_reg=0 sp_offset=0 signal=0</div><div class='ctx'> .endm</div><div class='ctx'> .macro STACK_FRAME_NON_STANDARD func:req</div><div class='ctx'> .endm</div><div class='del'>-.macro ANNOTATE_NOENDBR</div><div class='del'>-.endm</div><div class='del'>-.macro REACHABLE</div><div class='del'>-.endm</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_OBJTOOL */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_NOINSTR_VALIDATION) &amp;&amp; \</div><div class='add'>+	(defined(CONFIG_MITIGATION_UNRET_ENTRY) || defined(CONFIG_MITIGATION_SRSO))</div><div class='add'>+#define VALIDATE_UNRET_BEGIN	ANNOTATE_UNRET_BEGIN</div><div class='add'>+#else</div><div class='add'>+#define VALIDATE_UNRET_BEGIN</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_OBJTOOL_H */</div><div class='head'>diff --git a/include/linux/objtool_types.h b/include/linux/objtool_types.h<br/>index 453a4f4ef39d..c6def4049b1a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/objtool_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/objtool_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/objtool_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/objtool_types.h</a></div><div class='hunk'>@@ -54,4 +54,19 @@ struct unwind_hint {</div><div class='ctx'> #define UNWIND_HINT_TYPE_SAVE		6</div><div class='ctx'> #define UNWIND_HINT_TYPE_RESTORE	7</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Annotate types</div><div class='add'>+ */</div><div class='add'>+#define ANNOTYPE_NOENDBR		1</div><div class='add'>+#define ANNOTYPE_RETPOLINE_SAFE		2</div><div class='add'>+#define ANNOTYPE_INSTR_BEGIN		3</div><div class='add'>+#define ANNOTYPE_INSTR_END		4</div><div class='add'>+#define ANNOTYPE_UNRET_BEGIN		5</div><div class='add'>+#define ANNOTYPE_IGNORE_ALTS		6</div><div class='add'>+#define ANNOTYPE_INTRA_FUNCTION_CALL	7</div><div class='add'>+#define ANNOTYPE_REACHABLE		8</div><div class='add'>+#define ANNOTYPE_NOCFI			9</div><div class='add'>+</div><div class='add'>+#define ANNOTYPE_DATA_SPECIAL		1</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_OBJTOOL_TYPES_H */</div><div class='head'>diff --git a/include/linux/of.h b/include/linux/of.h<br/>index 6a9ddf20e79a..01bb3affcd49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/of.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/of.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/of.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='hunk'>@@ -66,7 +67,7 @@ struct device_node {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MAX_PHANDLE_ARGS 16</div><div class='add'>+#define MAX_PHANDLE_ARGS NR_FWNODE_REFERENCE_ARGS</div><div class='ctx'> struct of_phandle_args {</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	int args_count;</div><div class='hunk'>@@ -134,6 +135,7 @@ static inline struct device_node *of_node_get(struct device_node *node)</div><div class='ctx'> }</div><div class='ctx'> static inline void of_node_put(struct device_node *node) { }</div><div class='ctx'> #endif /* !CONFIG_OF_DYNAMIC */</div><div class='add'>+DEFINE_FREE(device_node, struct device_node *, if (_T) of_node_put(_T))</div><div class='ctx'> </div><div class='ctx'> /* Pointer for first entry in chain of all nodes. */</div><div class='ctx'> extern struct device_node *of_root;</div><div class='hunk'>@@ -180,11 +182,6 @@ static inline bool is_of_node(const struct fwnode_handle *fwnode)</div><div class='ctx'> 			&amp;__of_fwnode_handle_node-&gt;fwnode : NULL;	\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='del'>-static inline bool of_have_populated_dt(void)</div><div class='del'>-{</div><div class='del'>-	return of_root != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool of_node_is_root(const struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	return node &amp;&amp; (node-&gt;parent == NULL);</div><div class='hunk'>@@ -292,13 +289,20 @@ extern struct device_node *of_get_parent(const struct device_node *node);</div><div class='ctx'> extern struct device_node *of_get_next_parent(struct device_node *node);</div><div class='ctx'> extern struct device_node *of_get_next_child(const struct device_node *node,</div><div class='ctx'> 					     struct device_node *prev);</div><div class='add'>+extern struct device_node *of_get_next_child_with_prefix(const struct device_node *node,</div><div class='add'>+							 struct device_node *prev,</div><div class='add'>+							 const char *prefix);</div><div class='ctx'> extern struct device_node *of_get_next_available_child(</div><div class='ctx'> 	const struct device_node *node, struct device_node *prev);</div><div class='add'>+extern struct device_node *of_get_next_reserved_child(</div><div class='add'>+	const struct device_node *node, struct device_node *prev);</div><div class='ctx'> </div><div class='ctx'> extern struct device_node *of_get_compatible_child(const struct device_node *parent,</div><div class='ctx'> 					const char *compatible);</div><div class='ctx'> extern struct device_node *of_get_child_by_name(const struct device_node *node,</div><div class='ctx'> 					const char *name);</div><div class='add'>+extern struct device_node *of_get_available_child_by_name(const struct device_node *node,</div><div class='add'>+							  const char *name);</div><div class='ctx'> </div><div class='ctx'> /* cache lookup */</div><div class='ctx'> extern struct device_node *of_find_next_cache_node(const struct device_node *);</div><div class='hunk'>@@ -309,8 +313,12 @@ extern struct device_node *of_find_node_with_property(</div><div class='ctx'> extern struct property *of_find_property(const struct device_node *np,</div><div class='ctx'> 					 const char *name,</div><div class='ctx'> 					 int *lenp);</div><div class='add'>+extern bool of_property_read_bool(const struct device_node *np, const char *propname);</div><div class='ctx'> extern int of_property_count_elems_of_size(const struct device_node *np,</div><div class='ctx'> 				const char *propname, int elem_size);</div><div class='add'>+extern int of_property_read_u16_index(const struct device_node *np,</div><div class='add'>+				       const char *propname,</div><div class='add'>+				       u32 index, u16 *out_value);</div><div class='ctx'> extern int of_property_read_u32_index(const struct device_node *np,</div><div class='ctx'> 				       const char *propname,</div><div class='ctx'> 				       u32 index, u32 *out_value);</div><div class='hunk'>@@ -358,13 +366,10 @@ extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);</div><div class='ctx'> extern struct device_node *of_cpu_device_node_get(int cpu);</div><div class='ctx'> extern int of_cpu_node_to_id(struct device_node *np);</div><div class='ctx'> extern struct device_node *of_get_next_cpu_node(struct device_node *prev);</div><div class='del'>-extern struct device_node *of_get_cpu_state_node(struct device_node *cpu_node,</div><div class='add'>+extern struct device_node *of_get_cpu_state_node(const struct device_node *cpu_node,</div><div class='ctx'> 						 int index);</div><div class='ctx'> extern u64 of_get_cpu_hwid(struct device_node *cpun, unsigned int thread);</div><div class='ctx'> </div><div class='del'>-#define for_each_property_of_node(dn, pp) \</div><div class='del'>-	for (pp = dn-&gt;properties; pp != NULL; pp = pp-&gt;next)</div><div class='del'>-</div><div class='ctx'> extern int of_n_addr_cells(struct device_node *np);</div><div class='ctx'> extern int of_n_size_cells(struct device_node *np);</div><div class='ctx'> extern const struct of_device_id *of_match_node(</div><div class='hunk'>@@ -398,11 +403,25 @@ extern int of_phandle_iterator_args(struct of_phandle_iterator *it,</div><div class='ctx'> 				    uint32_t *args,</div><div class='ctx'> 				    int size);</div><div class='ctx'> </div><div class='del'>-extern void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align));</div><div class='del'>-extern int of_alias_get_id(struct device_node *np, const char *stem);</div><div class='add'>+extern int of_alias_get_id(const struct device_node *np, const char *stem);</div><div class='ctx'> extern int of_alias_get_highest_id(const char *stem);</div><div class='ctx'> </div><div class='del'>-extern int of_machine_is_compatible(const char *compat);</div><div class='add'>+bool of_machine_compatible_match(const char *const *compats);</div><div class='add'>+bool of_machine_device_match(const struct of_device_id *matches);</div><div class='add'>+const void *of_machine_get_match_data(const struct of_device_id *matches);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_machine_is_compatible - Test root of device tree for a given compatible value</div><div class='add'>+ * @compat: compatible string to look for in root node's compatible property.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the root node has the given value in its compatible property.</div><div class='add'>+ */</div><div class='add'>+static inline bool of_machine_is_compatible(const char *compat)</div><div class='add'>+{</div><div class='add'>+	const char *compats[] = { compat, NULL };</div><div class='add'>+</div><div class='add'>+	return of_machine_compatible_match(compats);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> extern int of_add_property(struct device_node *np, struct property *prop);</div><div class='ctx'> extern int of_remove_property(struct device_node *np, struct property *prop);</div><div class='hunk'>@@ -421,14 +440,12 @@ extern int of_detach_node(struct device_node *);</div><div class='ctx'> #define of_match_ptr(_ptr)	(_ptr)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * struct property *prop;</div><div class='del'>- * const __be32 *p;</div><div class='ctx'>  * u32 u;</div><div class='ctx'>  *</div><div class='del'>- * of_property_for_each_u32(np, "propname", prop, p, u)</div><div class='add'>+ * of_property_for_each_u32(np, "propname", u)</div><div class='ctx'>  *         printk("U32 value: %x\n", u);</div><div class='ctx'>  */</div><div class='del'>-const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,</div><div class='add'>+const __be32 *of_prop_next_u32(const struct property *prop, const __be32 *cur,</div><div class='ctx'> 			       u32 *pu);</div><div class='ctx'> /*</div><div class='ctx'>  * struct property *prop;</div><div class='hunk'>@@ -437,11 +454,11 @@ const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,</div><div class='ctx'>  * of_property_for_each_string(np, "propname", prop, s)</div><div class='ctx'>  *         printk("String value: %s\n", s);</div><div class='ctx'>  */</div><div class='del'>-const char *of_prop_next_string(struct property *prop, const char *cur);</div><div class='add'>+const char *of_prop_next_string(const struct property *prop, const char *cur);</div><div class='ctx'> </div><div class='del'>-bool of_console_check(struct device_node *dn, char *name, int index);</div><div class='add'>+bool of_console_check(const struct device_node *dn, char *name, int index);</div><div class='ctx'> </div><div class='del'>-int of_map_id(struct device_node *np, u32 id,</div><div class='add'>+int of_map_id(const struct device_node *np, u32 id,</div><div class='ctx'> 	       const char *map_name, const char *map_mask_name,</div><div class='ctx'> 	       struct device_node **target, u32 *id_out);</div><div class='ctx'> </div><div class='hunk'>@@ -535,12 +552,25 @@ static inline struct device_node *of_get_next_child(</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct device_node *of_get_next_child_with_prefix(</div><div class='add'>+	const struct device_node *node, struct device_node *prev,</div><div class='add'>+	const char *prefix)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct device_node *of_get_next_available_child(</div><div class='ctx'> 	const struct device_node *node, struct device_node *prev)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct device_node *of_get_next_reserved_child(</div><div class='add'>+	const struct device_node *node, struct device_node *prev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct device_node *of_find_node_with_property(</div><div class='ctx'> 	struct device_node *from, const char *prop_name)</div><div class='ctx'> {</div><div class='hunk'>@@ -549,11 +579,6 @@ static inline struct device_node *of_find_node_with_property(</div><div class='ctx'> </div><div class='ctx'> #define of_fwnode_handle(node) NULL</div><div class='ctx'> </div><div class='del'>-static inline bool of_have_populated_dt(void)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct device_node *of_get_compatible_child(const struct device_node *parent,</div><div class='ctx'> 					const char *compatible)</div><div class='ctx'> {</div><div class='hunk'>@@ -567,6 +592,13 @@ static inline struct device_node *of_get_child_by_name(</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct device_node *of_get_available_child_by_name(</div><div class='add'>+					const struct device_node *node,</div><div class='add'>+					const char *name)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int of_device_is_compatible(const struct device_node *device,</div><div class='ctx'> 					  const char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -604,12 +636,24 @@ static inline struct device_node *of_find_compatible_node(</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool of_property_read_bool(const struct device_node *np,</div><div class='add'>+					const char *propname)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int of_property_count_elems_of_size(const struct device_node *np,</div><div class='ctx'> 			const char *propname, int elem_size)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int of_property_read_u16_index(const struct device_node *np,</div><div class='add'>+			const char *propname, u32 index, u16 *out_value)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int of_property_read_u32_index(const struct device_node *np,</div><div class='ctx'> 			const char *propname, u32 index, u32 *out_value)</div><div class='ctx'> {</div><div class='hunk'>@@ -808,18 +852,34 @@ static inline int of_remove_property(struct device_node *np, struct property *pr</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool of_machine_compatible_match(const char *const *compats)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool of_machine_device_match(const struct of_device_id *matches)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const void *</div><div class='add'>+of_machine_get_match_data(const struct of_device_id *matches)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool of_console_check(const struct device_node *dn, const char *name, int index)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const __be32 *of_prop_next_u32(struct property *prop,</div><div class='add'>+static inline const __be32 *of_prop_next_u32(const struct property *prop,</div><div class='ctx'> 		const __be32 *cur, u32 *pu)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline const char *of_prop_next_string(struct property *prop,</div><div class='add'>+static inline const char *of_prop_next_string(const struct property *prop,</div><div class='ctx'> 		const char *cur)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -858,7 +918,7 @@ static inline void of_property_clear_flag(struct property *p, unsigned long flag</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int of_map_id(struct device_node *np, u32 id,</div><div class='add'>+static inline int of_map_id(const struct device_node *np, u32 id,</div><div class='ctx'> 			     const char *map_name, const char *map_mask_name,</div><div class='ctx'> 			     struct device_node **target, u32 *id_out)</div><div class='ctx'> {</div><div class='hunk'>@@ -886,11 +946,8 @@ static inline const void *of_device_get_match_data(const struct device *dev)</div><div class='ctx'> #define of_node_cmp(s1, s2)		strcasecmp((s1), (s2))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline int of_prop_val_eq(struct property *p1, struct property *p2)</div><div class='del'>-{</div><div class='del'>-	return p1-&gt;length == p2-&gt;length &amp;&amp;</div><div class='del'>-	       !memcmp(p1-&gt;value, p2-&gt;value, (size_t)p1-&gt;length);</div><div class='del'>-}</div><div class='add'>+#define for_each_property_of_node(dn, pp) \</div><div class='add'>+	for (pp = dn-&gt;properties; pp != NULL; pp = pp-&gt;next)</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_OF) &amp;&amp; defined(CONFIG_NUMA)</div><div class='ctx'> extern int of_node_to_nid(struct device_node *np);</div><div class='hunk'>@@ -1066,6 +1123,22 @@ static inline int of_parse_phandle_with_optional_args(const struct device_node *</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * of_phandle_args_equal() - Compare two of_phandle_args</div><div class='add'>+ * @a1:		First of_phandle_args to compare</div><div class='add'>+ * @a2:		Second of_phandle_args to compare</div><div class='add'>+ *</div><div class='add'>+ * Return: True if a1 and a2 are the same (same node pointer, same phandle</div><div class='add'>+ * args), false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool of_phandle_args_equal(const struct of_phandle_args *a1,</div><div class='add'>+					 const struct of_phandle_args *a2)</div><div class='add'>+{</div><div class='add'>+	return a1-&gt;np == a2-&gt;np &amp;&amp;</div><div class='add'>+	       a1-&gt;args_count == a2-&gt;args_count &amp;&amp;</div><div class='add'>+	       !memcmp(a1-&gt;args, a2-&gt;args, sizeof(a1-&gt;args[0]) * a1-&gt;args_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * of_property_count_u8_elems - Count the number of u8 elements in a property</div><div class='ctx'>  *</div><div class='ctx'>  * @np:		device node from which the property value is to be read.</div><div class='hunk'>@@ -1074,7 +1147,7 @@ static inline int of_parse_phandle_with_optional_args(const struct device_node *</div><div class='ctx'>  * Search for a property in a device node and count the number of u8 elements</div><div class='ctx'>  * in it.</div><div class='ctx'>  *</div><div class='del'>- * Return: The number of elements on sucess, -EINVAL if the property does</div><div class='add'>+ * Return: The number of elements on success, -EINVAL if the property does</div><div class='ctx'>  * not exist or its length does not match a multiple of u8 and -ENODATA if the</div><div class='ctx'>  * property does not have a value.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1093,7 +1166,7 @@ static inline int of_property_count_u8_elems(const struct device_node *np,</div><div class='ctx'>  * Search for a property in a device node and count the number of u16 elements</div><div class='ctx'>  * in it.</div><div class='ctx'>  *</div><div class='del'>- * Return: The number of elements on sucess, -EINVAL if the property does</div><div class='add'>+ * Return: The number of elements on success, -EINVAL if the property does</div><div class='ctx'>  * not exist or its length does not match a multiple of u16 and -ENODATA if the</div><div class='ctx'>  * property does not have a value.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1112,7 +1185,7 @@ static inline int of_property_count_u16_elems(const struct device_node *np,</div><div class='ctx'>  * Search for a property in a device node and count the number of u32 elements</div><div class='ctx'>  * in it.</div><div class='ctx'>  *</div><div class='del'>- * Return: The number of elements on sucess, -EINVAL if the property does</div><div class='add'>+ * Return: The number of elements on success, -EINVAL if the property does</div><div class='ctx'>  * not exist or its length does not match a multiple of u32 and -ENODATA if the</div><div class='ctx'>  * property does not have a value.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1131,7 +1204,7 @@ static inline int of_property_count_u32_elems(const struct device_node *np,</div><div class='ctx'>  * Search for a property in a device node and count the number of u64 elements</div><div class='ctx'>  * in it.</div><div class='ctx'>  *</div><div class='del'>- * Return: The number of elements on sucess, -EINVAL if the property does</div><div class='add'>+ * Return: The number of elements on success, -EINVAL if the property does</div><div class='ctx'>  * not exist or its length does not match a multiple of u64 and -ENODATA if the</div><div class='ctx'>  * property does not have a value.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1208,24 +1281,6 @@ static inline int of_property_read_string_index(const struct device_node *np,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * of_property_read_bool - Find a property</div><div class='del'>- * @np:		device node from which the property value is to be read.</div><div class='del'>- * @propname:	name of the property to be searched.</div><div class='del'>- *</div><div class='del'>- * Search for a boolean property in a device node. Usage on non-boolean</div><div class='del'>- * property types is deprecated.</div><div class='del'>- *</div><div class='del'>- * Return: true if the property exists false otherwise.</div><div class='del'>- */</div><div class='del'>-static inline bool of_property_read_bool(const struct device_node *np,</div><div class='del'>-					 const char *propname)</div><div class='del'>-{</div><div class='del'>-	struct property *prop = of_find_property(np, propname, NULL);</div><div class='del'>-</div><div class='del'>-	return prop ? true : false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * of_property_present - Test if a property is present in a node</div><div class='ctx'>  * @np:		device node to search for the property.</div><div class='ctx'>  * @propname:	name of the property to be searched.</div><div class='hunk'>@@ -1236,7 +1291,9 @@ static inline bool of_property_read_bool(const struct device_node *np,</div><div class='ctx'>  */</div><div class='ctx'> static inline bool of_property_present(const struct device_node *np, const char *propname)</div><div class='ctx'> {</div><div class='del'>-	return of_property_read_bool(np, propname);</div><div class='add'>+	struct property *prop = of_find_property(np, propname, NULL);</div><div class='add'>+</div><div class='add'>+	return prop ? true : false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1397,11 +1454,12 @@ static inline int of_property_read_s32(const struct device_node *np,</div><div class='ctx'> 	     err == 0;							\</div><div class='ctx'> 	     err = of_phandle_iterator_next(it))</div><div class='ctx'> </div><div class='del'>-#define of_property_for_each_u32(np, propname, prop, p, u)	\</div><div class='del'>-	for (prop = of_find_property(np, propname, NULL),	\</div><div class='del'>-		p = of_prop_next_u32(prop, NULL, &amp;u);		\</div><div class='del'>-		p;						\</div><div class='del'>-		p = of_prop_next_u32(prop, p, &amp;u))</div><div class='add'>+#define of_property_for_each_u32(np, propname, u)			\</div><div class='add'>+	for (struct {const struct property *prop; const __be32 *item; } _it =	\</div><div class='add'>+		{of_find_property(np, propname, NULL),			\</div><div class='add'>+		 of_prop_next_u32(_it.prop, NULL, &amp;u)};			\</div><div class='add'>+	     _it.item;							\</div><div class='add'>+	     _it.item = of_prop_next_u32(_it.prop, _it.item, &amp;u))</div><div class='ctx'> </div><div class='ctx'> #define of_property_for_each_string(np, propname, prop, s)	\</div><div class='ctx'> 	for (prop = of_find_property(np, propname, NULL),	\</div><div class='hunk'>@@ -1428,9 +1486,31 @@ static inline int of_property_read_s32(const struct device_node *np,</div><div class='ctx'> #define for_each_child_of_node(parent, child) \</div><div class='ctx'> 	for (child = of_get_next_child(parent, NULL); child != NULL; \</div><div class='ctx'> 	     child = of_get_next_child(parent, child))</div><div class='add'>+</div><div class='add'>+#define for_each_child_of_node_scoped(parent, child) \</div><div class='add'>+	for (struct device_node *child __free(device_node) =		\</div><div class='add'>+	     of_get_next_child(parent, NULL);				\</div><div class='add'>+	     child != NULL;						\</div><div class='add'>+	     child = of_get_next_child(parent, child))</div><div class='add'>+</div><div class='add'>+#define for_each_child_of_node_with_prefix(parent, child, prefix)	\</div><div class='add'>+	for (struct device_node *child __free(device_node) =		\</div><div class='add'>+	     of_get_next_child_with_prefix(parent, NULL, prefix);	\</div><div class='add'>+	     child != NULL;						\</div><div class='add'>+	     child = of_get_next_child_with_prefix(parent, child, prefix))</div><div class='add'>+</div><div class='ctx'> #define for_each_available_child_of_node(parent, child) \</div><div class='ctx'> 	for (child = of_get_next_available_child(parent, NULL); child != NULL; \</div><div class='ctx'> 	     child = of_get_next_available_child(parent, child))</div><div class='add'>+#define for_each_reserved_child_of_node(parent, child)			\</div><div class='add'>+	for (child = of_get_next_reserved_child(parent, NULL); child != NULL; \</div><div class='add'>+	     child = of_get_next_reserved_child(parent, child))</div><div class='add'>+</div><div class='add'>+#define for_each_available_child_of_node_scoped(parent, child) \</div><div class='add'>+	for (struct device_node *child __free(device_node) =		\</div><div class='add'>+	     of_get_next_available_child(parent, NULL);			\</div><div class='add'>+	     child != NULL;						\</div><div class='add'>+	     child = of_get_next_available_child(parent, child))</div><div class='ctx'> </div><div class='ctx'> #define for_each_of_cpu_node(cpu) \</div><div class='ctx'> 	for (cpu = of_get_next_cpu_node(NULL); cpu != NULL; \</div><div class='hunk'>@@ -1589,7 +1669,7 @@ int of_changeset_add_prop_string(struct of_changeset *ocs,</div><div class='ctx'> int of_changeset_add_prop_string_array(struct of_changeset *ocs,</div><div class='ctx'> 				       struct device_node *np,</div><div class='ctx'> 				       const char *prop_name,</div><div class='del'>-				       const char **str_array, size_t sz);</div><div class='add'>+				       const char * const *str_array, size_t sz);</div><div class='ctx'> int of_changeset_add_prop_u32_array(struct of_changeset *ocs,</div><div class='ctx'> 				    struct device_node *np,</div><div class='ctx'> 				    const char *prop_name,</div><div class='hunk'>@@ -1602,6 +1682,13 @@ static inline int of_changeset_add_prop_u32(struct of_changeset *ocs,</div><div class='ctx'> 	return of_changeset_add_prop_u32_array(ocs, np, prop_name, &amp;val, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int of_changeset_update_prop_string(struct of_changeset *ocs,</div><div class='add'>+				    struct device_node *np,</div><div class='add'>+				    const char *prop_name, const char *str);</div><div class='add'>+</div><div class='add'>+int of_changeset_add_prop_bool(struct of_changeset *ocs, struct device_node *np,</div><div class='add'>+			       const char *prop_name);</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_OF_DYNAMIC */</div><div class='ctx'> static inline int of_reconfig_notifier_register(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='hunk'>@@ -1634,6 +1721,21 @@ static inline bool of_device_is_system_power_controller(const struct device_node</div><div class='ctx'> 	return of_property_read_bool(np, "system-power-controller");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * of_have_populated_dt() - Has DT been populated by bootloader</div><div class='add'>+ *</div><div class='add'>+ * Return: True if a DTB has been populated by the bootloader and it isn't the</div><div class='add'>+ * empty builtin one. False otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool of_have_populated_dt(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+	return of_property_present(of_root, "compatible");</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Overlay support</div><div class='ctx'>  */</div><div class='hunk'>@@ -1667,7 +1769,7 @@ struct of_overlay_notify_data {</div><div class='ctx'> #ifdef CONFIG_OF_OVERLAY</div><div class='ctx'> </div><div class='ctx'> int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,</div><div class='del'>-			 int *ovcs_id, struct device_node *target_base);</div><div class='add'>+			 int *ovcs_id, const struct device_node *target_base);</div><div class='ctx'> int of_overlay_remove(int *ovcs_id);</div><div class='ctx'> int of_overlay_remove_all(void);</div><div class='ctx'> </div><div class='hunk'>@@ -1677,7 +1779,7 @@ int of_overlay_notifier_unregister(struct notifier_block *nb);</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,</div><div class='del'>-				       int *ovcs_id, struct device_node *target_base)</div><div class='add'>+				       int *ovcs_id, const struct device_node *target_base)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOTSUPP;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/of_address.h b/include/linux/of_address.h<br/>index 26a19daf0d09..0cff90365391 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/of_address.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_address.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/of_address.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/of_address.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@ struct of_bus;</div><div class='ctx'> </div><div class='ctx'> struct of_pci_range_parser {</div><div class='ctx'> 	struct device_node *node;</div><div class='del'>-	struct of_bus *bus;</div><div class='add'>+	const struct of_bus *bus;</div><div class='ctx'> 	const __be32 *range;</div><div class='ctx'> 	const __be32 *end;</div><div class='ctx'> 	int na;</div><div class='hunk'>@@ -26,6 +26,7 @@ struct of_pci_range {</div><div class='ctx'> 		u64 bus_addr;</div><div class='ctx'> 	};</div><div class='ctx'> 	u64 cpu_addr;</div><div class='add'>+	u64 parent_bus_addr;</div><div class='ctx'> 	u64 size;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> };</div><div class='hunk'>@@ -83,8 +84,8 @@ extern struct of_pci_range *of_pci_range_parser_one(</div><div class='ctx'> 					struct of_pci_range *range);</div><div class='ctx'> extern int of_pci_address_to_resource(struct device_node *dev, int bar,</div><div class='ctx'> 				      struct resource *r);</div><div class='del'>-extern int of_pci_range_to_resource(struct of_pci_range *range,</div><div class='del'>-				    struct device_node *np,</div><div class='add'>+extern int of_pci_range_to_resource(const struct of_pci_range *range,</div><div class='add'>+				    const struct device_node *np,</div><div class='ctx'> 				    struct resource *res);</div><div class='ctx'> extern int of_range_to_resource(struct device_node *np, int index,</div><div class='ctx'> 				struct resource *res);</div><div class='head'>diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h<br/>index d69ad5bb1eb1..51dadbaa3d63 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/of_fdt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_fdt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/of_fdt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/of_fdt.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@ extern void *of_fdt_unflatten_tree(const unsigned long *blob,</div><div class='ctx'> extern int __initdata dt_root_addr_cells;</div><div class='ctx'> extern int __initdata dt_root_size_cells;</div><div class='ctx'> extern void *initial_boot_params;</div><div class='add'>+extern phys_addr_t initial_boot_params_pa;</div><div class='ctx'> </div><div class='ctx'> extern char __dtb_start[];</div><div class='ctx'> extern char __dtb_end[];</div><div class='hunk'>@@ -54,6 +55,15 @@ extern int of_get_flat_dt_subnode_by_name(unsigned long node,</div><div class='ctx'> 					  const char *uname);</div><div class='ctx'> extern const void *of_get_flat_dt_prop(unsigned long node, const char *name,</div><div class='ctx'> 				       int *size);</div><div class='add'>+</div><div class='add'>+extern const __be32 *of_flat_dt_get_addr_size_prop(unsigned long node,</div><div class='add'>+						   const char *name,</div><div class='add'>+						   int *entries);</div><div class='add'>+extern bool of_flat_dt_get_addr_size(unsigned long node, const char *name,</div><div class='add'>+				     u64 *addr, u64 *size);</div><div class='add'>+extern void of_flat_dt_read_addr_size(const __be32 *prop, int entry_index,</div><div class='add'>+				      u64 *addr, u64 *size);</div><div class='add'>+</div><div class='ctx'> extern int of_flat_dt_is_compatible(unsigned long node, const char *name);</div><div class='ctx'> extern unsigned long of_get_flat_dt_root(void);</div><div class='ctx'> extern uint32_t of_get_flat_dt_phandle(unsigned long node);</div><div class='hunk'>@@ -70,8 +80,8 @@ extern u64 dt_mem_next_cell(int s, const __be32 **cellp);</div><div class='ctx'> /* Early flat tree scan hooks */</div><div class='ctx'> extern int early_init_dt_scan_root(void);</div><div class='ctx'> </div><div class='del'>-extern bool early_init_dt_scan(void *params);</div><div class='del'>-extern bool early_init_dt_verify(void *params);</div><div class='add'>+extern bool early_init_dt_scan(void *dt_virt, phys_addr_t dt_phys);</div><div class='add'>+extern bool early_init_dt_verify(void *dt_virt, phys_addr_t dt_phys);</div><div class='ctx'> extern void early_init_dt_scan_nodes(void);</div><div class='ctx'> </div><div class='ctx'> extern const char *of_flat_dt_get_machine_name(void);</div><div class='head'>diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h<br/>index 4d7756087b6b..a692d9d979a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/of_graph.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_graph.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/of_graph.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/of_graph.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #ifndef __LINUX_OF_GRAPH_H</div><div class='ctx'> #define __LINUX_OF_GRAPH_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -37,14 +38,43 @@ struct of_endpoint {</div><div class='ctx'> 	for (child = of_graph_get_next_endpoint(parent, NULL); child != NULL; \</div><div class='ctx'> 	     child = of_graph_get_next_endpoint(parent, child))</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * for_each_of_graph_port - iterate over every port in a device or ports node</div><div class='add'>+ * @parent: parent device or ports node containing port</div><div class='add'>+ * @child: loop variable pointing to the current port node</div><div class='add'>+ *</div><div class='add'>+ * When breaking out of the loop, and continue to use the @child, you need to</div><div class='add'>+ * use return_ptr(@child) or no_free_ptr(@child) not to call __free() for it.</div><div class='add'>+ */</div><div class='add'>+#define for_each_of_graph_port(parent, child)			\</div><div class='add'>+	for (struct device_node *child __free(device_node) = of_graph_get_next_port(parent, NULL);\</div><div class='add'>+	     child != NULL; child = of_graph_get_next_port(parent, child))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * for_each_of_graph_port_endpoint - iterate over every endpoint in a port node</div><div class='add'>+ * @parent: parent port node</div><div class='add'>+ * @child: loop variable pointing to the current endpoint node</div><div class='add'>+ *</div><div class='add'>+ * When breaking out of the loop, and continue to use the @child, you need to</div><div class='add'>+ * use return_ptr(@child) or no_free_ptr(@child) not to call __free() for it.</div><div class='add'>+ */</div><div class='add'>+#define for_each_of_graph_port_endpoint(parent, child)			\</div><div class='add'>+	for (struct device_node *child __free(device_node) = of_graph_get_next_port_endpoint(parent, NULL);\</div><div class='add'>+	     child != NULL; child = of_graph_get_next_port_endpoint(parent, child))</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_OF</div><div class='ctx'> bool of_graph_is_present(const struct device_node *node);</div><div class='ctx'> int of_graph_parse_endpoint(const struct device_node *node,</div><div class='ctx'> 				struct of_endpoint *endpoint);</div><div class='del'>-int of_graph_get_endpoint_count(const struct device_node *np);</div><div class='add'>+unsigned int of_graph_get_endpoint_count(const struct device_node *np);</div><div class='add'>+unsigned int of_graph_get_port_count(struct device_node *np);</div><div class='ctx'> struct device_node *of_graph_get_port_by_id(struct device_node *node, u32 id);</div><div class='ctx'> struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,</div><div class='ctx'> 					struct device_node *previous);</div><div class='add'>+struct device_node *of_graph_get_next_port(const struct device_node *parent,</div><div class='add'>+					   struct device_node *port);</div><div class='add'>+struct device_node *of_graph_get_next_port_endpoint(const struct device_node *port,</div><div class='add'>+						    struct device_node *prev);</div><div class='ctx'> struct device_node *of_graph_get_endpoint_by_regs(</div><div class='ctx'> 		const struct device_node *parent, int port_reg, int reg);</div><div class='ctx'> struct device_node *of_graph_get_remote_endpoint(</div><div class='hunk'>@@ -68,7 +98,12 @@ static inline int of_graph_parse_endpoint(const struct device_node *node,</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int of_graph_get_endpoint_count(const struct device_node *np)</div><div class='add'>+static inline unsigned int of_graph_get_endpoint_count(const struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int of_graph_get_port_count(struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -86,6 +121,20 @@ static inline struct device_node *of_graph_get_next_endpoint(</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct device_node *of_graph_get_next_port(</div><div class='add'>+					const struct device_node *parent,</div><div class='add'>+					struct device_node *previous)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct device_node *of_graph_get_next_port_endpoint(</div><div class='add'>+					const struct device_node *parent,</div><div class='add'>+					struct device_node *previous)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct device_node *of_graph_get_endpoint_by_regs(</div><div class='ctx'> 		const struct device_node *parent, int port_reg, int reg)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h<br/>index d6d3eae2f145..1c2bc0281807 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/of_irq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_irq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/of_irq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/of_irq.h</a></div><div class='hunk'>@@ -43,18 +43,20 @@ extern int of_irq_parse_one(struct device_node *device, int index,</div><div class='ctx'> 			  struct of_phandle_args *out_irq);</div><div class='ctx'> extern int of_irq_count(struct device_node *dev);</div><div class='ctx'> extern int of_irq_get(struct device_node *dev, int index);</div><div class='add'>+extern const struct cpumask *of_irq_get_affinity(struct device_node *dev,</div><div class='add'>+						      int index);</div><div class='ctx'> extern int of_irq_get_byname(struct device_node *dev, const char *name);</div><div class='ctx'> extern int of_irq_to_resource_table(struct device_node *dev,</div><div class='ctx'> 		struct resource *res, int nr_irqs);</div><div class='ctx'> extern struct device_node *of_irq_find_parent(struct device_node *child);</div><div class='ctx'> extern struct irq_domain *of_msi_get_domain(struct device *dev,</div><div class='del'>-					    struct device_node *np,</div><div class='add'>+					    const struct device_node *np,</div><div class='ctx'> 					    enum irq_domain_bus_token token);</div><div class='ctx'> extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev,</div><div class='ctx'> 							u32 id,</div><div class='ctx'> 							u32 bus_token);</div><div class='del'>-extern void of_msi_configure(struct device *dev, struct device_node *np);</div><div class='del'>-u32 of_msi_map_id(struct device *dev, struct device_node *msi_np, u32 id_in);</div><div class='add'>+extern void of_msi_configure(struct device *dev, const struct device_node *np);</div><div class='add'>+extern u32 of_msi_xlate(struct device *dev, struct device_node **msi_np, u32 id_in);</div><div class='ctx'> #else</div><div class='ctx'> static inline void of_irq_init(const struct of_device_id *matches)</div><div class='ctx'> {</div><div class='hunk'>@@ -76,6 +78,11 @@ static inline int of_irq_get_byname(struct device_node *dev, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline const struct cpumask *of_irq_get_affinity(struct device_node *dev,</div><div class='add'>+							int index)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> static inline int of_irq_to_resource_table(struct device_node *dev,</div><div class='ctx'> 					   struct resource *res, int nr_irqs)</div><div class='ctx'> {</div><div class='hunk'>@@ -100,8 +107,7 @@ static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev</div><div class='ctx'> static inline void of_msi_configure(struct device *dev, struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline u32 of_msi_map_id(struct device *dev,</div><div class='del'>-				 struct device_node *msi_np, u32 id_in)</div><div class='add'>+static inline u32 of_msi_xlate(struct device *dev, struct device_node **msi_np, u32 id_in)</div><div class='ctx'> {</div><div class='ctx'> 	return id_in;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h<br/>index a2ff1ad48f7f..17471ef8e092 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/of_platform.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_platform.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/of_platform.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/of_platform.h</a></div><div class='hunk'>@@ -47,8 +47,6 @@ struct of_dev_auxdata {</div><div class='ctx'> 	{ .compatible = _compat, .phys_addr = _phys, .name = _name, \</div><div class='ctx'> 	  .platform_data = _pdata }</div><div class='ctx'> </div><div class='del'>-extern const struct of_device_id of_default_bus_match_table[];</div><div class='del'>-</div><div class='ctx'> /* Platform drivers register/unregister */</div><div class='ctx'> extern struct platform_device *of_device_alloc(struct device_node *np,</div><div class='ctx'> 					 const char *bus_id,</div><div class='head'>diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h<br/>index 4de2a24cadc9..f573423359f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/of_reserved_mem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/of_reserved_mem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/of_reserved_mem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/of_reserved_mem.h</a></div><div class='hunk'>@@ -7,11 +7,11 @@</div><div class='ctx'> </div><div class='ctx'> struct of_phandle_args;</div><div class='ctx'> struct reserved_mem_ops;</div><div class='add'>+struct resource;</div><div class='ctx'> </div><div class='ctx'> struct reserved_mem {</div><div class='ctx'> 	const char			*name;</div><div class='ctx'> 	unsigned long			fdt_node;</div><div class='del'>-	unsigned long			phandle;</div><div class='ctx'> 	const struct reserved_mem_ops	*ops;</div><div class='ctx'> 	phys_addr_t			base;</div><div class='ctx'> 	phys_addr_t			size;</div><div class='hunk'>@@ -40,6 +40,12 @@ int of_reserved_mem_device_init_by_name(struct device *dev,</div><div class='ctx'> void of_reserved_mem_device_release(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> struct reserved_mem *of_reserved_mem_lookup(struct device_node *np);</div><div class='add'>+int of_reserved_mem_region_to_resource(const struct device_node *np,</div><div class='add'>+				       unsigned int idx, struct resource *res);</div><div class='add'>+int of_reserved_mem_region_to_resource_byname(const struct device_node *np,</div><div class='add'>+					      const char *name, struct resource *res);</div><div class='add'>+int of_reserved_mem_region_count(const struct device_node *np);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define RESERVEDMEM_OF_DECLARE(name, compat, init)			\</div><div class='hunk'>@@ -64,6 +70,25 @@ static inline struct reserved_mem *of_reserved_mem_lookup(struct device_node *np</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int of_reserved_mem_region_to_resource(const struct device_node *np,</div><div class='add'>+						     unsigned int idx,</div><div class='add'>+						     struct resource *res)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int of_reserved_mem_region_to_resource_byname(const struct device_node *np,</div><div class='add'>+							    const char *name,</div><div class='add'>+							    struct resource *res)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int of_reserved_mem_region_count(const struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h<br/>index 3921fbed0b28..6de479ebbe5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/oid_registry.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/oid_registry.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/oid_registry.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/oid_registry.h</a></div><div class='hunk'>@@ -17,10 +17,12 @@</div><div class='ctx'>  *	  build_OID_registry.pl to generate the data for look_up_OID().</div><div class='ctx'>  */</div><div class='ctx'> enum OID {</div><div class='add'>+	OID_id_dsa_with_sha1,		/* 1.2.840.10030.4.3 */</div><div class='ctx'> 	OID_id_dsa,			/* 1.2.840.10040.4.1 */</div><div class='ctx'> 	OID_id_ecPublicKey,		/* 1.2.840.10045.2.1 */</div><div class='ctx'> 	OID_id_prime192v1,		/* 1.2.840.10045.3.1.1 */</div><div class='ctx'> 	OID_id_prime256v1,		/* 1.2.840.10045.3.1.7 */</div><div class='add'>+	OID_id_ecdsa_with_sha1,		/* 1.2.840.10045.4.1 */</div><div class='ctx'> 	OID_id_ecdsa_with_sha224,	/* 1.2.840.10045.4.3.1 */</div><div class='ctx'> 	OID_id_ecdsa_with_sha256,	/* 1.2.840.10045.4.3.2 */</div><div class='ctx'> 	OID_id_ecdsa_with_sha384,	/* 1.2.840.10045.4.3.3 */</div><div class='hunk'>@@ -28,6 +30,7 @@ enum OID {</div><div class='ctx'> </div><div class='ctx'> 	/* PKCS#1 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1)} */</div><div class='ctx'> 	OID_rsaEncryption,		/* 1.2.840.113549.1.1.1 */</div><div class='add'>+	OID_sha1WithRSAEncryption,	/* 1.2.840.113549.1.1.5 */</div><div class='ctx'> 	OID_sha256WithRSAEncryption,	/* 1.2.840.113549.1.1.11 */</div><div class='ctx'> 	OID_sha384WithRSAEncryption,	/* 1.2.840.113549.1.1.12 */</div><div class='ctx'> 	OID_sha512WithRSAEncryption,	/* 1.2.840.113549.1.1.13 */</div><div class='hunk'>@@ -64,7 +67,9 @@ enum OID {</div><div class='ctx'> 	OID_PKU2U,			/* 1.3.5.1.5.2.7 */</div><div class='ctx'> 	OID_Scram,			/* 1.3.6.1.5.5.14 */</div><div class='ctx'> 	OID_certAuthInfoAccess,		/* 1.3.6.1.5.5.7.1.1 */</div><div class='add'>+	OID_sha1,			/* 1.3.14.3.2.26 */</div><div class='ctx'> 	OID_id_ansip384r1,		/* 1.3.132.0.34 */</div><div class='add'>+	OID_id_ansip521r1,		/* 1.3.132.0.35 */</div><div class='ctx'> 	OID_sha256,			/* 2.16.840.1.101.3.4.2.1 */</div><div class='ctx'> 	OID_sha384,			/* 2.16.840.1.101.3.4.2.2 */</div><div class='ctx'> 	OID_sha512,			/* 2.16.840.1.101.3.4.2.3 */</div><div class='hunk'>@@ -146,6 +151,5 @@ enum OID {</div><div class='ctx'> extern enum OID look_up_OID(const void *data, size_t datasize);</div><div class='ctx'> extern int parse_OID(const void *data, size_t datasize, enum OID *oid);</div><div class='ctx'> extern int sprint_oid(const void *, size_t, char *, size_t);</div><div class='del'>-extern int sprint_OID(enum OID, char *, size_t);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_OID_REGISTRY_H */</div><div class='head'>diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h<br/>index 082841908fe7..263b915df1fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/omap-gpmc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/omap-gpmc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/omap-gpmc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/omap-gpmc.h</a></div><div class='hunk'>@@ -66,10 +66,6 @@ extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t,</div><div class='ctx'> </div><div class='ctx'> struct device_node;</div><div class='ctx'> </div><div class='del'>-extern int gpmc_get_client_irq(unsigned irq_config);</div><div class='del'>-</div><div class='del'>-extern unsigned int gpmc_ticks_to_ns(unsigned int ticks);</div><div class='del'>-</div><div class='ctx'> extern void gpmc_cs_write_reg(int cs, int idx, u32 val);</div><div class='ctx'> extern int gpmc_calc_divider(unsigned int sync_clk);</div><div class='ctx'> extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t,</div><div class='hunk'>@@ -84,13 +80,3 @@ extern void gpmc_read_settings_dt(struct device_node *np,</div><div class='ctx'> struct gpmc_timings;</div><div class='ctx'> struct omap_nand_platform_data;</div><div class='ctx'> struct omap_onenand_platform_data;</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)</div><div class='del'>-extern int gpmc_onenand_init(struct omap_onenand_platform_data *d);</div><div class='del'>-#else</div><div class='del'>-#define board_onenand_data	NULL</div><div class='del'>-static inline int gpmc_onenand_init(struct omap_onenand_platform_data *d)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/omap-mailbox.h b/include/linux/omap-mailbox.h<br/>index 8aa984ec1f38..3cc5c4ed7f5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/omap-mailbox.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/omap-mailbox.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/omap-mailbox.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/omap-mailbox.h</a></div><div class='hunk'>@@ -10,17 +10,4 @@ typedef uintptr_t mbox_msg_t;</div><div class='ctx'> </div><div class='ctx'> #define omap_mbox_message(data) (u32)(mbox_msg_t)(data)</div><div class='ctx'> </div><div class='del'>-typedef int __bitwise omap_mbox_irq_t;</div><div class='del'>-#define IRQ_TX ((__force omap_mbox_irq_t) 1)</div><div class='del'>-#define IRQ_RX ((__force omap_mbox_irq_t) 2)</div><div class='del'>-</div><div class='del'>-struct mbox_chan;</div><div class='del'>-struct mbox_client;</div><div class='del'>-</div><div class='del'>-struct mbox_chan *omap_mbox_request_channel(struct mbox_client *cl,</div><div class='del'>-					    const char *chan_name);</div><div class='del'>-</div><div class='del'>-void omap_mbox_enable_irq(struct mbox_chan *chan, omap_mbox_irq_t irq);</div><div class='del'>-void omap_mbox_disable_irq(struct mbox_chan *chan, omap_mbox_irq_t irq);</div><div class='del'>-</div><div class='ctx'> #endif /* OMAP_MAILBOX_H */</div><div class='head'>diff --git a/include/linux/once.h b/include/linux/once.h<br/>index bc714d414448..449a0e34ad5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/once.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/once.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/once.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/once.h</a></div><div class='hunk'>@@ -46,7 +46,7 @@ void __do_once_sleepable_done(bool *done, struct static_key_true *once_key,</div><div class='ctx'> #define DO_ONCE(func, ...)						     \</div><div class='ctx'> 	({								     \</div><div class='ctx'> 		bool ___ret = false;					     \</div><div class='del'>-		static bool __section(".data.once") ___done = false;	     \</div><div class='add'>+		static bool __section(".data..do_once") ___done = false;     \</div><div class='ctx'> 		static DEFINE_STATIC_KEY_TRUE(___once_key);		     \</div><div class='ctx'> 		if (static_branch_unlikely(&amp;___once_key)) {		     \</div><div class='ctx'> 			unsigned long ___flags;				     \</div><div class='hunk'>@@ -64,7 +64,7 @@ void __do_once_sleepable_done(bool *done, struct static_key_true *once_key,</div><div class='ctx'> #define DO_ONCE_SLEEPABLE(func, ...)						\</div><div class='ctx'> 	({									\</div><div class='ctx'> 		bool ___ret = false;						\</div><div class='del'>-		static bool __section(".data.once") ___done = false;		\</div><div class='add'>+		static bool __section(".data..do_once") ___done = false;	\</div><div class='ctx'> 		static DEFINE_STATIC_KEY_TRUE(___once_key);			\</div><div class='ctx'> 		if (static_branch_unlikely(&amp;___once_key)) {			\</div><div class='ctx'> 			___ret = __do_once_sleepable_start(&amp;___done);		\</div><div class='head'>diff --git a/include/linux/once_lite.h b/include/linux/once_lite.h<br/>index b7bce4983638..236592c4eeb1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/once_lite.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/once_lite.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/once_lite.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/once_lite.h</a></div><div class='hunk'>@@ -12,11 +12,11 @@</div><div class='ctx'> </div><div class='ctx'> #define __ONCE_LITE_IF(condition)					\</div><div class='ctx'> 	({								\</div><div class='del'>-		static bool __section(".data.once") __already_done;	\</div><div class='add'>+		static bool __section(".data..once") __already_done;	\</div><div class='ctx'> 		bool __ret_cond = !!(condition);			\</div><div class='ctx'> 		bool __ret_once = false;				\</div><div class='ctx'> 									\</div><div class='del'>-		if (unlikely(__ret_cond &amp;&amp; !__already_done)) {		\</div><div class='add'>+		if (unlikely(__ret_cond) &amp;&amp; unlikely(!__already_done)) {\</div><div class='ctx'> 			__already_done = true;				\</div><div class='ctx'> 			__ret_once = true;				\</div><div class='ctx'> 		}							\</div><div class='head'>diff --git a/include/linux/oom.h b/include/linux/oom.h<br/>index 7d0c9c48a0c5..7b02bc1d0a7e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/oom.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/oom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/oom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/oom.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/oom.h&gt;</div><div class='del'>-#include &lt;linux/sched/coredump.h&gt; /* MMF_* */</div><div class='ctx'> #include &lt;linux/mm.h&gt; /* VM_FAULT* */</div><div class='ctx'> </div><div class='ctx'> struct zonelist;</div><div class='hunk'>@@ -92,7 +91,7 @@ static inline bool tsk_is_oom_victim(struct task_struct * tsk)</div><div class='ctx'>  */</div><div class='ctx'> static inline vm_fault_t check_stable_address_space(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(test_bit(MMF_UNSTABLE, &amp;mm-&gt;flags)))</div><div class='add'>+	if (unlikely(mm_flags_test(MMF_UNSTABLE, mm)))</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/overflow.h b/include/linux/overflow.h<br/>index aa691f2119b0..736f633b2d5f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/overflow.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/overflow.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/overflow.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/overflow.h</a></div><div class='hunk'>@@ -239,6 +239,76 @@ static inline bool __must_check __must_check_overflow(bool overflow)</div><div class='ctx'> 			      __overflows_type(n, T))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * range_overflows() - Check if a range is out of bounds</div><div class='add'>+ * @start: Start of the range.</div><div class='add'>+ * @size:  Size of the range.</div><div class='add'>+ * @max:   Exclusive upper boundary.</div><div class='add'>+ *</div><div class='add'>+ * A strict check to determine if the range [@start, @start + @size) is</div><div class='add'>+ * invalid with respect to the allowable range [0, @max). Any range</div><div class='add'>+ * starting at or beyond @max is considered an overflow, even if @size is 0.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the range is out of bounds.</div><div class='add'>+ */</div><div class='add'>+#define range_overflows(start, size, max) ({ \</div><div class='add'>+	typeof(start) start__ = (start); \</div><div class='add'>+	typeof(size) size__ = (size); \</div><div class='add'>+	typeof(max) max__ = (max); \</div><div class='add'>+	(void)(&amp;start__ == &amp;size__); \</div><div class='add'>+	(void)(&amp;start__ == &amp;max__); \</div><div class='add'>+	start__ &gt;= max__ || size__ &gt; max__ - start__; \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * range_overflows_t() - Check if a range is out of bounds</div><div class='add'>+ * @type:  Data type to use.</div><div class='add'>+ * @start: Start of the range.</div><div class='add'>+ * @size:  Size of the range.</div><div class='add'>+ * @max:   Exclusive upper boundary.</div><div class='add'>+ *</div><div class='add'>+ * Same as range_overflows() but forcing the parameters to @type.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the range is out of bounds.</div><div class='add'>+ */</div><div class='add'>+#define range_overflows_t(type, start, size, max) \</div><div class='add'>+	range_overflows((type)(start), (type)(size), (type)(max))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * range_end_overflows() - Check if a range's endpoint is out of bounds</div><div class='add'>+ * @start: Start of the range.</div><div class='add'>+ * @size:  Size of the range.</div><div class='add'>+ * @max:   Exclusive upper boundary.</div><div class='add'>+ *</div><div class='add'>+ * Checks only if the endpoint of a range (@start + @size) exceeds @max.</div><div class='add'>+ * Unlike range_overflows(), a zero-sized range at the boundary (@start == @max)</div><div class='add'>+ * is not considered an overflow. Useful for iterator-style checks.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the endpoint exceeds the boundary.</div><div class='add'>+ */</div><div class='add'>+#define range_end_overflows(start, size, max) ({ \</div><div class='add'>+	typeof(start) start__ = (start); \</div><div class='add'>+	typeof(size) size__ = (size); \</div><div class='add'>+	typeof(max) max__ = (max); \</div><div class='add'>+	(void)(&amp;start__ == &amp;size__); \</div><div class='add'>+	(void)(&amp;start__ == &amp;max__); \</div><div class='add'>+	start__ &gt; max__ || size__ &gt; max__ - start__; \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * range_end_overflows_t() - Check if a range's endpoint is out of bounds</div><div class='add'>+ * @type:  Data type to use.</div><div class='add'>+ * @start: Start of the range.</div><div class='add'>+ * @size:  Size of the range.</div><div class='add'>+ * @max:   Exclusive upper boundary.</div><div class='add'>+ *</div><div class='add'>+ * Same as range_end_overflows() but forcing the parameters to @type.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the endpoint exceeds the boundary.</div><div class='add'>+ */</div><div class='add'>+#define range_end_overflows_t(type, start, size, max) \</div><div class='add'>+	range_end_overflows((type)(start), (type)(size), (type)(max))</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * castable_to_type - like __same_type(), but also allows for casted literals</div><div class='ctx'>  *</div><div class='ctx'>  * @n: variable or constant value</div><div class='hunk'>@@ -389,27 +459,52 @@ static inline size_t __must_check size_sub(size_t minuend, size_t subtrahend)</div><div class='ctx'> 	struct_size((type *)NULL, member, count)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * _DEFINE_FLEX() - helper macro for DEFINE_FLEX() family.</div><div class='del'>- * Enables caller macro to pass (different) initializer.</div><div class='add'>+ * struct_offset() - Calculate the offset of a member within a struct</div><div class='add'>+ * @p: Pointer to the struct</div><div class='add'>+ * @member: Name of the member to get the offset of</div><div class='add'>+ *</div><div class='add'>+ * Calculates the offset of a particular @member of the structure pointed</div><div class='add'>+ * to by @p.</div><div class='add'>+ *</div><div class='add'>+ * Return: number of bytes to the location of @member.</div><div class='add'>+ */</div><div class='add'>+#define struct_offset(p, member) (offsetof(typeof(*(p)), member))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __DEFINE_FLEX() - helper macro for DEFINE_FLEX() family.</div><div class='add'>+ * Enables caller macro to pass arbitrary trailing expressions</div><div class='ctx'>  *</div><div class='ctx'>  * @type: structure type name, including "struct" keyword.</div><div class='ctx'>  * @name: Name for a variable to define.</div><div class='ctx'>  * @member: Name of the array member.</div><div class='ctx'>  * @count: Number of elements in the array; must be compile-time const.</div><div class='del'>- * @initializer: initializer expression (could be empty for no init).</div><div class='add'>+ * @trailer: Trailing expressions for attributes and/or initializers.</div><div class='ctx'>  */</div><div class='del'>-#define _DEFINE_FLEX(type, name, member, count, initializer)			\</div><div class='add'>+#define __DEFINE_FLEX(type, name, member, count, trailer...)			\</div><div class='ctx'> 	_Static_assert(__builtin_constant_p(count),				\</div><div class='ctx'> 		       "onstack flex array members require compile-time const count"); \</div><div class='ctx'> 	union {									\</div><div class='ctx'> 		u8 bytes[struct_size_t(type, member, count)];			\</div><div class='ctx'> 		type obj;							\</div><div class='del'>-	} name##_u initializer;							\</div><div class='add'>+	} name##_u trailer;							\</div><div class='ctx'> 	type *name = (type *)&amp;name##_u</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * DEFINE_FLEX() - Define an on-stack instance of structure with a trailing</div><div class='del'>- * flexible array member.</div><div class='add'>+ * _DEFINE_FLEX() - helper macro for DEFINE_FLEX() family.</div><div class='add'>+ * Enables caller macro to pass (different) initializer.</div><div class='add'>+ *</div><div class='add'>+ * @type: structure type name, including "struct" keyword.</div><div class='add'>+ * @name: Name for a variable to define.</div><div class='add'>+ * @member: Name of the array member.</div><div class='add'>+ * @count: Number of elements in the array; must be compile-time const.</div><div class='add'>+ * @initializer: Initializer expression (e.g., pass `= { }` at minimum).</div><div class='add'>+ */</div><div class='add'>+#define _DEFINE_FLEX(type, name, member, count, initializer...)			\</div><div class='add'>+	__DEFINE_FLEX(type, name, member, count, = { .obj initializer })</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DEFINE_RAW_FLEX() - Define an on-stack instance of structure with a trailing</div><div class='add'>+ * flexible array member, when it does not have a __counted_by annotation.</div><div class='ctx'>  *</div><div class='ctx'>  * @type: structure type name, including "struct" keyword.</div><div class='ctx'>  * @name: Name for a variable to define.</div><div class='hunk'>@@ -419,8 +514,42 @@ static inline size_t __must_check size_sub(size_t minuend, size_t subtrahend)</div><div class='ctx'>  * Define a zeroed, on-stack, instance of @type structure with a trailing</div><div class='ctx'>  * flexible array member.</div><div class='ctx'>  * Use __struct_size(@name) to get compile-time size of it afterwards.</div><div class='add'>+ * Use __member_size(@name-&gt;member) to get compile-time size of @name members.</div><div class='add'>+ * Use STACK_FLEX_ARRAY_SIZE(@name, @member) to get compile-time number of</div><div class='add'>+ * elements in array @member.</div><div class='add'>+ */</div><div class='add'>+#define DEFINE_RAW_FLEX(type, name, member, count)	\</div><div class='add'>+	__DEFINE_FLEX(type, name, member, count, = { })</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DEFINE_FLEX() - Define an on-stack instance of structure with a trailing</div><div class='add'>+ * flexible array member.</div><div class='add'>+ *</div><div class='add'>+ * @TYPE: structure type name, including "struct" keyword.</div><div class='add'>+ * @NAME: Name for a variable to define.</div><div class='add'>+ * @MEMBER: Name of the array member.</div><div class='add'>+ * @COUNTER: Name of the __counted_by member.</div><div class='add'>+ * @COUNT: Number of elements in the array; must be compile-time const.</div><div class='add'>+ *</div><div class='add'>+ * Define a zeroed, on-stack, instance of @TYPE structure with a trailing</div><div class='add'>+ * flexible array member.</div><div class='add'>+ * Use __struct_size(@NAME) to get compile-time size of it afterwards.</div><div class='add'>+ * Use __member_size(@NAME-&gt;member) to get compile-time size of @NAME members.</div><div class='add'>+ * Use STACK_FLEX_ARRAY_SIZE(@name, @member) to get compile-time number of</div><div class='add'>+ * elements in array @member.</div><div class='add'>+ */</div><div class='add'>+#define DEFINE_FLEX(TYPE, NAME, MEMBER, COUNTER, COUNT)	\</div><div class='add'>+	_DEFINE_FLEX(TYPE, NAME, MEMBER, COUNT, = { .COUNTER = COUNT, })</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * STACK_FLEX_ARRAY_SIZE() - helper macro for DEFINE_FLEX() family.</div><div class='add'>+ * Returns the number of elements in @array.</div><div class='add'>+ *</div><div class='add'>+ * @name: Name for a variable defined in DEFINE_RAW_FLEX()/DEFINE_FLEX().</div><div class='add'>+ * @array: Name of the array member.</div><div class='ctx'>  */</div><div class='del'>-#define DEFINE_FLEX(type, name, member, count)			\</div><div class='del'>-	_DEFINE_FLEX(type, name, member, count, = {})</div><div class='add'>+#define STACK_FLEX_ARRAY_SIZE(name, array)						\</div><div class='add'>+	(__member_size((name)-&gt;array) / sizeof(*(name)-&gt;array) +			\</div><div class='add'>+						__must_be_array((name)-&gt;array))</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_OVERFLOW_H */</div><div class='head'>diff --git a/include/linux/packing.h b/include/linux/packing.h<br/>index 8d6571feb95d..20ae4d452c7b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/packing.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/packing.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/packing.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/packing.h</a></div><div class='hunk'>@@ -5,8 +5,89 @@</div><div class='ctx'> #ifndef _LINUX_PACKING_H</div><div class='ctx'> #define _LINUX_PACKING_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define GEN_PACKED_FIELD_STRUCT(__type) \</div><div class='add'>+	struct packed_field_ ## __type { \</div><div class='add'>+		__type startbit; \</div><div class='add'>+		__type endbit; \</div><div class='add'>+		__type offset; \</div><div class='add'>+		__type size; \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/* struct packed_field_u8. Use with bit offsets &lt; 256, buffers &lt; 32B and</div><div class='add'>+ * unpacked structures &lt; 256B.</div><div class='add'>+ */</div><div class='add'>+GEN_PACKED_FIELD_STRUCT(u8);</div><div class='add'>+</div><div class='add'>+/* struct packed_field_u16. Use with bit offsets &lt; 65536, buffers &lt; 8KB and</div><div class='add'>+ * unpacked structures &lt; 64KB.</div><div class='add'>+ */</div><div class='add'>+GEN_PACKED_FIELD_STRUCT(u16);</div><div class='add'>+</div><div class='add'>+#define PACKED_FIELD(start, end, struct_name, struct_field) \</div><div class='add'>+{ \</div><div class='add'>+	(start), \</div><div class='add'>+	(end), \</div><div class='add'>+	offsetof(struct_name, struct_field), \</div><div class='add'>+	sizeof_field(struct_name, struct_field), \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELD_OVERLAP(fields, index1, index2) ({ \</div><div class='add'>+	typeof(&amp;(fields)[0]) __f = (fields); \</div><div class='add'>+	typeof(__f[0]) _f1 = __f[index1]; typeof(__f[0]) _f2 = __f[index2]; \</div><div class='add'>+	const bool _ascending = __f[0].startbit &lt; __f[1].startbit; \</div><div class='add'>+	BUILD_BUG_ON_MSG(_ascending &amp;&amp; _f1.startbit &gt;= _f2.startbit, \</div><div class='add'>+			 __stringify(fields) " field " __stringify(index2) \</div><div class='add'>+			 " breaks ascending order"); \</div><div class='add'>+	BUILD_BUG_ON_MSG(!_ascending &amp;&amp; _f1.startbit &lt;= _f2.startbit, \</div><div class='add'>+			 __stringify(fields) " field " __stringify(index2) \</div><div class='add'>+			 " breaks descending order"); \</div><div class='add'>+	BUILD_BUG_ON_MSG(max(_f1.endbit, _f2.endbit) &lt;= \</div><div class='add'>+			 min(_f1.startbit, _f2.startbit), \</div><div class='add'>+			 __stringify(fields) " field " __stringify(index2) \</div><div class='add'>+			 " overlaps with previous field"); \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELD(fields, index) ({ \</div><div class='add'>+	typeof(&amp;(fields)[0]) _f = (fields); \</div><div class='add'>+	typeof(_f[0]) __f = _f[index]; \</div><div class='add'>+	BUILD_BUG_ON_MSG(__f.startbit &lt; __f.endbit, \</div><div class='add'>+			 __stringify(fields) " field " __stringify(index) \</div><div class='add'>+			 " start bit must not be smaller than end bit"); \</div><div class='add'>+	BUILD_BUG_ON_MSG(__f.size != 1 &amp;&amp; __f.size != 2 &amp;&amp; \</div><div class='add'>+			 __f.size != 4 &amp;&amp; __f.size != 8, \</div><div class='add'>+			 __stringify(fields) " field " __stringify(index) \</div><div class='add'>+			" has unsupported unpacked storage size"); \</div><div class='add'>+	BUILD_BUG_ON_MSG(__f.startbit - __f.endbit &gt;= BITS_PER_BYTE * __f.size, \</div><div class='add'>+			 __stringify(fields) " field " __stringify(index) \</div><div class='add'>+			 " exceeds unpacked storage size"); \</div><div class='add'>+	__builtin_choose_expr(index != 0, \</div><div class='add'>+			      CHECK_PACKED_FIELD_OVERLAP(fields, index - 1, index), \</div><div class='add'>+			      1); \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/* Note that the packed fields may be either in ascending or descending order.</div><div class='add'>+ * Thus, we must check that both the first and last field wit within the</div><div class='add'>+ * packed buffer size.</div><div class='add'>+ */</div><div class='add'>+#define CHECK_PACKED_FIELDS_SIZE(fields, pbuflen) ({ \</div><div class='add'>+	typeof(&amp;(fields)[0]) _f = (fields); \</div><div class='add'>+	typeof(pbuflen) _len = (pbuflen); \</div><div class='add'>+	const size_t num_fields = ARRAY_SIZE(fields); \</div><div class='add'>+	BUILD_BUG_ON_MSG(!__builtin_constant_p(_len), \</div><div class='add'>+			 __stringify(fields) " pbuflen " __stringify(pbuflen) \</div><div class='add'>+			 " must be a compile time constant"); \</div><div class='add'>+	BUILD_BUG_ON_MSG(_f[0].startbit &gt;= BITS_PER_BYTE * _len, \</div><div class='add'>+			 __stringify(fields) " first field exceeds packed buffer size"); \</div><div class='add'>+	BUILD_BUG_ON_MSG(_f[num_fields - 1].startbit &gt;= BITS_PER_BYTE * _len, \</div><div class='add'>+			 __stringify(fields) " last field exceeds packed buffer size"); \</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> #define QUIRK_MSB_ON_THE_RIGHT	BIT(0)</div><div class='ctx'> #define QUIRK_LITTLE_ENDIAN	BIT(1)</div><div class='hunk'>@@ -17,33 +98,361 @@ enum packing_op {</div><div class='ctx'> 	UNPACK,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * packing - Convert numbers (currently u64) between a packed and an unpacked</div><div class='del'>- *	     format. Unpacked means laid out in memory in the CPU's native</div><div class='del'>- *	     understanding of integers, while packed means anything else that</div><div class='del'>- *	     requires translation.</div><div class='del'>- *</div><div class='del'>- * @pbuf: Pointer to a buffer holding the packed value.</div><div class='del'>- * @uval: Pointer to an u64 holding the unpacked value.</div><div class='del'>- * @startbit: The index (in logical notation, compensated for quirks) where</div><div class='del'>- *	      the packed value starts within pbuf. Must be larger than, or</div><div class='del'>- *	      equal to, endbit.</div><div class='del'>- * @endbit: The index (in logical notation, compensated for quirks) where</div><div class='del'>- *	    the packed value ends within pbuf. Must be smaller than, or equal</div><div class='del'>- *	    to, startbit.</div><div class='del'>- * @op: If PACK, then uval will be treated as const pointer and copied (packed)</div><div class='del'>- *	into pbuf, between startbit and endbit.</div><div class='del'>- *	If UNPACK, then pbuf will be treated as const pointer and the logical</div><div class='del'>- *	value between startbit and endbit will be copied (unpacked) to uval.</div><div class='del'>- * @quirks: A bit mask of QUIRK_LITTLE_ENDIAN, QUIRK_LSW32_IS_FIRST and</div><div class='del'>- *	    QUIRK_MSB_ON_THE_RIGHT.</div><div class='del'>- *</div><div class='del'>- * Return: 0 on success, EINVAL or ERANGE if called incorrectly. Assuming</div><div class='del'>- *	   correct usage, return code may be discarded.</div><div class='del'>- *	   If op is PACK, pbuf is modified.</div><div class='del'>- *	   If op is UNPACK, uval is modified.</div><div class='del'>- */</div><div class='ctx'> int packing(void *pbuf, u64 *uval, int startbit, int endbit, size_t pbuflen,</div><div class='ctx'> 	    enum packing_op op, u8 quirks);</div><div class='ctx'> </div><div class='add'>+int pack(void *pbuf, u64 uval, size_t startbit, size_t endbit, size_t pbuflen,</div><div class='add'>+	 u8 quirks);</div><div class='add'>+</div><div class='add'>+int unpack(const void *pbuf, u64 *uval, size_t startbit, size_t endbit,</div><div class='add'>+	   size_t pbuflen, u8 quirks);</div><div class='add'>+</div><div class='add'>+void pack_fields_u8(void *pbuf, size_t pbuflen, const void *ustruct,</div><div class='add'>+		    const struct packed_field_u8 *fields, size_t num_fields,</div><div class='add'>+		    u8 quirks);</div><div class='add'>+</div><div class='add'>+void pack_fields_u16(void *pbuf, size_t pbuflen, const void *ustruct,</div><div class='add'>+		     const struct packed_field_u16 *fields, size_t num_fields,</div><div class='add'>+		     u8 quirks);</div><div class='add'>+</div><div class='add'>+void unpack_fields_u8(const void *pbuf, size_t pbuflen, void *ustruct,</div><div class='add'>+		      const struct packed_field_u8 *fields, size_t num_fields,</div><div class='add'>+		      u8 quirks);</div><div class='add'>+</div><div class='add'>+void unpack_fields_u16(const void *pbuf, size_t pbuflen, void *ustruct,</div><div class='add'>+		       const struct packed_field_u16 *fields, size_t num_fields,</div><div class='add'>+		       u8 quirks);</div><div class='add'>+</div><div class='add'>+/* Do not hand-edit the following packed field check macros!</div><div class='add'>+ *</div><div class='add'>+ * They are generated using scripts/gen_packed_field_checks.c, which may be</div><div class='add'>+ * built via "make scripts_gen_packed_field_checks". If larger macro sizes are</div><div class='add'>+ * needed in the future, please use this program to re-generate the macros and</div><div class='add'>+ * insert them here.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_1(fields) \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_2(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_1(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 1); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_3(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_2(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 2); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_4(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_3(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 3); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_5(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_4(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 4); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_6(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_5(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 5); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_7(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_6(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 6); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_8(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_7(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 7); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_9(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_8(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 8); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_10(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_9(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 9); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_11(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_10(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 10); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_12(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_11(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 11); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_13(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_12(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 12); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_14(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_13(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 13); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_15(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_14(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 14); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_16(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_15(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 15); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_17(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_16(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 16); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_18(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_17(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 17); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_19(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_18(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 18); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_20(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_19(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 19); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_21(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_20(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 20); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_22(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_21(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 21); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_23(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_22(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 22); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_24(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_23(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 23); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_25(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_24(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 24); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_26(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_25(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 25); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_27(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_26(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 26); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_28(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_27(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 27); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_29(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_28(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 28); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_30(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_29(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 29); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_31(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_30(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 30); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_32(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_31(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 31); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_33(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_32(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 32); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_34(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_33(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 33); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_35(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_34(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 34); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_36(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_35(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 35); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_37(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_36(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 36); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_38(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_37(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 37); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_39(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_38(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 38); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_40(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_39(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 39); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_41(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_40(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 40); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_42(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_41(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 41); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_43(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_42(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 42); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_44(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_43(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 43); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_45(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_44(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 44); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_46(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_45(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 45); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_47(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_46(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 46); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_48(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_47(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 47); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_49(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_48(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 48); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS_50(fields) do { \</div><div class='add'>+	CHECK_PACKED_FIELDS_49(fields); \</div><div class='add'>+	CHECK_PACKED_FIELD(fields, 49); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define CHECK_PACKED_FIELDS(fields) \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 1, ({ CHECK_PACKED_FIELDS_1(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 2, ({ CHECK_PACKED_FIELDS_2(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 3, ({ CHECK_PACKED_FIELDS_3(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 4, ({ CHECK_PACKED_FIELDS_4(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 5, ({ CHECK_PACKED_FIELDS_5(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 6, ({ CHECK_PACKED_FIELDS_6(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 7, ({ CHECK_PACKED_FIELDS_7(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 8, ({ CHECK_PACKED_FIELDS_8(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 9, ({ CHECK_PACKED_FIELDS_9(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 10, ({ CHECK_PACKED_FIELDS_10(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 11, ({ CHECK_PACKED_FIELDS_11(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 12, ({ CHECK_PACKED_FIELDS_12(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 13, ({ CHECK_PACKED_FIELDS_13(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 14, ({ CHECK_PACKED_FIELDS_14(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 15, ({ CHECK_PACKED_FIELDS_15(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 16, ({ CHECK_PACKED_FIELDS_16(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 17, ({ CHECK_PACKED_FIELDS_17(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 18, ({ CHECK_PACKED_FIELDS_18(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 19, ({ CHECK_PACKED_FIELDS_19(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 20, ({ CHECK_PACKED_FIELDS_20(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 21, ({ CHECK_PACKED_FIELDS_21(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 22, ({ CHECK_PACKED_FIELDS_22(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 23, ({ CHECK_PACKED_FIELDS_23(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 24, ({ CHECK_PACKED_FIELDS_24(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 25, ({ CHECK_PACKED_FIELDS_25(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 26, ({ CHECK_PACKED_FIELDS_26(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 27, ({ CHECK_PACKED_FIELDS_27(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 28, ({ CHECK_PACKED_FIELDS_28(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 29, ({ CHECK_PACKED_FIELDS_29(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 30, ({ CHECK_PACKED_FIELDS_30(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 31, ({ CHECK_PACKED_FIELDS_31(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 32, ({ CHECK_PACKED_FIELDS_32(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 33, ({ CHECK_PACKED_FIELDS_33(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 34, ({ CHECK_PACKED_FIELDS_34(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 35, ({ CHECK_PACKED_FIELDS_35(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 36, ({ CHECK_PACKED_FIELDS_36(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 37, ({ CHECK_PACKED_FIELDS_37(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 38, ({ CHECK_PACKED_FIELDS_38(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 39, ({ CHECK_PACKED_FIELDS_39(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 40, ({ CHECK_PACKED_FIELDS_40(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 41, ({ CHECK_PACKED_FIELDS_41(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 42, ({ CHECK_PACKED_FIELDS_42(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 43, ({ CHECK_PACKED_FIELDS_43(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 44, ({ CHECK_PACKED_FIELDS_44(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 45, ({ CHECK_PACKED_FIELDS_45(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 46, ({ CHECK_PACKED_FIELDS_46(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 47, ({ CHECK_PACKED_FIELDS_47(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 48, ({ CHECK_PACKED_FIELDS_48(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 49, ({ CHECK_PACKED_FIELDS_49(fields); }), \</div><div class='add'>+	__builtin_choose_expr(ARRAY_SIZE(fields) == 50, ({ CHECK_PACKED_FIELDS_50(fields); }), \</div><div class='add'>+	({ BUILD_BUG_ON_MSG(1, "CHECK_PACKED_FIELDS() must be regenerated to support array sizes larger than 50."); }) \</div><div class='add'>+))))))))))))))))))))))))))))))))))))))))))))))))))</div><div class='add'>+</div><div class='add'>+/* End of generated content */</div><div class='add'>+</div><div class='add'>+#define pack_fields(pbuf, pbuflen, ustruct, fields, quirks) \</div><div class='add'>+	({ \</div><div class='add'>+		CHECK_PACKED_FIELDS(fields); \</div><div class='add'>+		CHECK_PACKED_FIELDS_SIZE((fields), (pbuflen)); \</div><div class='add'>+		_Generic((fields), \</div><div class='add'>+			 const struct packed_field_u8 * : pack_fields_u8, \</div><div class='add'>+			 const struct packed_field_u16 * : pack_fields_u16 \</div><div class='add'>+			)((pbuf), (pbuflen), (ustruct), (fields), ARRAY_SIZE(fields), (quirks)); \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define unpack_fields(pbuf, pbuflen, ustruct, fields, quirks) \</div><div class='add'>+	({ \</div><div class='add'>+		CHECK_PACKED_FIELDS(fields); \</div><div class='add'>+		CHECK_PACKED_FIELDS_SIZE((fields), (pbuflen)); \</div><div class='add'>+		_Generic((fields), \</div><div class='add'>+			 const struct packed_field_u8 * : unpack_fields_u8, \</div><div class='add'>+			 const struct packed_field_u16 * : unpack_fields_u16 \</div><div class='add'>+			)((pbuf), (pbuflen), (ustruct), (fields), ARRAY_SIZE(fields), (quirks)); \</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/padata.h b/include/linux/padata.h<br/>index 495b16b6b4d7..765f2778e264 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/padata.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/padata.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/padata.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/padata.h</a></div><div class='hunk'>@@ -90,8 +90,6 @@ struct padata_cpumask {</div><div class='ctx'>  * @processed: Number of already processed objects.</div><div class='ctx'>  * @cpu: Next CPU to be processed.</div><div class='ctx'>  * @cpumask: The cpumasks in use for parallel and serial workers.</div><div class='del'>- * @reorder_work: work struct for reordering.</div><div class='del'>- * @lock: Reorder lock.</div><div class='ctx'>  */</div><div class='ctx'> struct parallel_data {</div><div class='ctx'> 	struct padata_shell		*ps;</div><div class='hunk'>@@ -102,8 +100,6 @@ struct parallel_data {</div><div class='ctx'> 	unsigned int			processed;</div><div class='ctx'> 	int				cpu;</div><div class='ctx'> 	struct padata_cpumask		cpumask;</div><div class='del'>-	struct work_struct		reorder_work;</div><div class='del'>-	spinlock_t                      ____cacheline_aligned lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -137,6 +133,7 @@ struct padata_shell {</div><div class='ctx'>  *             appropriate for one worker thread to do at once.</div><div class='ctx'>  * @max_threads: Max threads to use for the job, actual number may be less</div><div class='ctx'>  *               depending on task size and minimum chunk size.</div><div class='add'>+ * @numa_aware: Distribute jobs to different nodes with CPU in a round robin fashion.</div><div class='ctx'>  */</div><div class='ctx'> struct padata_mt_job {</div><div class='ctx'> 	void (*thread_fn)(unsigned long start, unsigned long end, void *arg);</div><div class='hunk'>@@ -146,6 +143,7 @@ struct padata_mt_job {</div><div class='ctx'> 	unsigned long		align;</div><div class='ctx'> 	unsigned long		min_chunk;</div><div class='ctx'> 	int			max_threads;</div><div class='add'>+	bool			numa_aware;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -178,10 +176,6 @@ struct padata_instance {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PADATA</div><div class='ctx'> extern void __init padata_init(void);</div><div class='del'>-#else</div><div class='del'>-static inline void __init padata_init(void) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern struct padata_instance *padata_alloc(const char *name);</div><div class='ctx'> extern void padata_free(struct padata_instance *pinst);</div><div class='ctx'> extern struct padata_shell *padata_alloc_shell(struct padata_instance *pinst);</div><div class='hunk'>@@ -192,4 +186,12 @@ extern void padata_do_serial(struct padata_priv *padata);</div><div class='ctx'> extern void __init padata_do_multithreaded(struct padata_mt_job *job);</div><div class='ctx'> extern int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type,</div><div class='ctx'> 			      cpumask_var_t cpumask);</div><div class='add'>+#else</div><div class='add'>+static inline void __init padata_init(void) {}</div><div class='add'>+static inline void __init padata_do_multithreaded(struct padata_mt_job *job)</div><div class='add'>+{</div><div class='add'>+	job-&gt;thread_fn(job-&gt;start, job-&gt;start + job-&gt;size, job-&gt;fn_arg);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/page-flags-layout.h b/include/linux/page-flags-layout.h<br/>index 7d79818dc065..760006b1c480 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page-flags-layout.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page-flags-layout.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page-flags-layout.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page-flags-layout.h</a></div><div class='hunk'>@@ -72,8 +72,10 @@</div><div class='ctx'> #define NODE_NOT_IN_PAGE_FLAGS	1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS)</div><div class='add'>+#if defined(CONFIG_KASAN_SW_TAGS)</div><div class='ctx'> #define KASAN_TAG_WIDTH 8</div><div class='add'>+#elif defined(CONFIG_KASAN_HW_TAGS)</div><div class='add'>+#define KASAN_TAG_WIDTH 4</div><div class='ctx'> #else</div><div class='ctx'> #define KASAN_TAG_WIDTH 0</div><div class='ctx'> #endif</div><div class='hunk'>@@ -111,5 +113,12 @@</div><div class='ctx'> 			    ZONES_WIDTH - LRU_GEN_WIDTH - SECTIONS_WIDTH - \</div><div class='ctx'> 			    NODES_WIDTH - KASAN_TAG_WIDTH - LAST_CPUPID_WIDTH)</div><div class='ctx'> </div><div class='add'>+#define NR_NON_PAGEFLAG_BITS	(SECTIONS_WIDTH + NODES_WIDTH + ZONES_WIDTH + \</div><div class='add'>+				LAST_CPUPID_SHIFT + KASAN_TAG_WIDTH + \</div><div class='add'>+				LRU_GEN_WIDTH + LRU_REFS_WIDTH)</div><div class='add'>+</div><div class='add'>+#define NR_UNUSED_PAGEFLAG_BITS	(BITS_PER_LONG - \</div><div class='add'>+				(NR_NON_PAGEFLAG_BITS + NR_PAGEFLAGS))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* _LINUX_PAGE_FLAGS_LAYOUT */</div><div class='head'>diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h<br/>index 735cddc13d20..f7a0e4af0c73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page-flags.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page-flags.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page-flags.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page-flags.h</a></div><div class='hunk'>@@ -30,16 +30,11 @@</div><div class='ctx'>  * - Pages falling into physical memory gaps - not IORESOURCE_SYSRAM. Trying</div><div class='ctx'>  *   to read/write these pages might end badly. Don't touch!</div><div class='ctx'>  * - The zero page(s)</div><div class='del'>- * - Pages not added to the page allocator when onlining a section because</div><div class='del'>- *   they were excluded via the online_page_callback() or because they are</div><div class='del'>- *   PG_hwpoison.</div><div class='ctx'>  * - Pages allocated in the context of kexec/kdump (loaded kernel image,</div><div class='ctx'>  *   control pages, vmcoreinfo)</div><div class='ctx'>  * - MMIO/DMA pages. Some architectures don't allow to ioremap pages that are</div><div class='ctx'>  *   not marked PG_reserved (as they might be in use by somebody else who does</div><div class='ctx'>  *   not respect the caching strategy).</div><div class='del'>- * - Pages part of an offline section (struct pages of offline sections should</div><div class='del'>- *   not be trusted as they will be initialized when first onlined).</div><div class='ctx'>  * - MCA pages on ia64</div><div class='ctx'>  * - Pages holding CPU notes for POWER Firmware Assisted Dump</div><div class='ctx'>  * - Device memory (e.g. PMEM, DAX, HMM)</div><div class='hunk'>@@ -71,8 +66,6 @@</div><div class='ctx'>  * PG_referenced, PG_reclaim are used for page reclaim for anonymous and</div><div class='ctx'>  * file-backed pagecache (see mm/vmscan.c).</div><div class='ctx'>  *</div><div class='del'>- * PG_error is set to indicate that an I/O error occurred on this page.</div><div class='del'>- *</div><div class='ctx'>  * PG_arch_1 is an architecture specific page state bit.  The generic code</div><div class='ctx'>  * guarantees that this bit is cleared for a page when it first is entered into</div><div class='ctx'>  * the page cache.</div><div class='hunk'>@@ -108,23 +101,19 @@ enum pageflags {</div><div class='ctx'> 	PG_waiters,		/* Page has waiters, check its waitqueue. Must be bit #7 and in the same byte as "PG_locked" */</div><div class='ctx'> 	PG_active,</div><div class='ctx'> 	PG_workingset,</div><div class='del'>-	PG_error,</div><div class='del'>-	PG_slab,</div><div class='del'>-	PG_owner_priv_1,	/* Owner use. If pagecache, fs may use*/</div><div class='add'>+	PG_owner_priv_1,	/* Owner use. If pagecache, fs may use */</div><div class='add'>+	PG_owner_2,		/* Owner use. If pagecache, fs may use */</div><div class='ctx'> 	PG_arch_1,</div><div class='ctx'> 	PG_reserved,</div><div class='ctx'> 	PG_private,		/* If pagecache, has fs-private data */</div><div class='ctx'> 	PG_private_2,		/* If pagecache, has fs aux data */</div><div class='del'>-	PG_mappedtodisk,	/* Has blocks allocated on-disk */</div><div class='ctx'> 	PG_reclaim,		/* To be reclaimed asap */</div><div class='ctx'> 	PG_swapbacked,		/* Page is backed by RAM/swap */</div><div class='ctx'> 	PG_unevictable,		/* Page is "unevictable"  */</div><div class='add'>+	PG_dropbehind,		/* drop pages on IO completion */</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	PG_mlocked,		/* Page is vma mlocked */</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_ARCH_USES_PG_UNCACHED</div><div class='del'>-	PG_uncached,		/* Page has been mapped as uncached */</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_MEMORY_FAILURE</div><div class='ctx'> 	PG_hwpoison,		/* hardware poisoned page. Don't touch */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -132,14 +121,21 @@ enum pageflags {</div><div class='ctx'> 	PG_young,</div><div class='ctx'> 	PG_idle,</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_ARCH_USES_PG_ARCH_X</div><div class='add'>+#ifdef CONFIG_ARCH_USES_PG_ARCH_2</div><div class='ctx'> 	PG_arch_2,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_ARCH_USES_PG_ARCH_3</div><div class='ctx'> 	PG_arch_3,</div><div class='ctx'> #endif</div><div class='ctx'> 	__NR_PAGEFLAGS,</div><div class='ctx'> </div><div class='ctx'> 	PG_readahead = PG_reclaim,</div><div class='ctx'> </div><div class='add'>+	/* Anonymous memory (and shmem) */</div><div class='add'>+	PG_swapcache = PG_owner_priv_1, /* Swap page: swp_entry_t in private */</div><div class='add'>+	/* Some filesystems */</div><div class='add'>+	PG_checked = PG_owner_priv_1,</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Depending on the way an anonymous folio can be mapped into a page</div><div class='ctx'> 	 * table (e.g., single PMD/PUD/CONT of the head page vs. PTE-mapped</div><div class='hunk'>@@ -147,13 +143,13 @@ enum pageflags {</div><div class='ctx'> 	 * tail pages of an anonymous folio. For now, we only expect it to be</div><div class='ctx'> 	 * set on tail pages for PTE-mapped THP.</div><div class='ctx'> 	 */</div><div class='del'>-	PG_anon_exclusive = PG_mappedtodisk,</div><div class='del'>-</div><div class='del'>-	/* Filesystems */</div><div class='del'>-	PG_checked = PG_owner_priv_1,</div><div class='add'>+	PG_anon_exclusive = PG_owner_2,</div><div class='ctx'> </div><div class='del'>-	/* SwapBacked */</div><div class='del'>-	PG_swapcache = PG_owner_priv_1,	/* Swap page: swp_entry_t in private */</div><div class='add'>+	/*</div><div class='add'>+	 * Set if all buffer heads in the folio are mapped.</div><div class='add'>+	 * Filesystems which do not use BHs can use it for their own purpose.</div><div class='add'>+	 */</div><div class='add'>+	PG_mappedtodisk = PG_owner_2,</div><div class='ctx'> </div><div class='ctx'> 	/* Two page bits are conscripted by FS-Cache to maintain local caching</div><div class='ctx'> 	 * state.  These bits are set on pages belonging to the netfs's inodes</div><div class='hunk'>@@ -171,8 +167,12 @@ enum pageflags {</div><div class='ctx'> 	/* Remapped by swiotlb-xen. */</div><div class='ctx'> 	PG_xen_remapped = PG_owner_priv_1,</div><div class='ctx'> </div><div class='del'>-	/* non-lru isolated movable page */</div><div class='del'>-	PG_isolated = PG_reclaim,</div><div class='add'>+#ifdef CONFIG_MIGRATION</div><div class='add'>+	/* movable_ops page that is isolated for migration */</div><div class='add'>+	PG_movable_ops_isolated = PG_reclaim,</div><div class='add'>+	/* this is a movable_ops page (for selected typed pages only) */</div><div class='add'>+	PG_movable_ops = PG_uptodate,</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Only valid for buddy pages. Used to track pages that are reported */</div><div class='ctx'> 	PG_reported = PG_uptodate,</div><div class='hunk'>@@ -189,9 +189,9 @@ enum pageflags {</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* At least one page in this folio has the hwpoison flag set */</div><div class='del'>-	PG_has_hwpoisoned = PG_error,</div><div class='del'>-	PG_hugetlb = PG_active,</div><div class='add'>+	PG_has_hwpoisoned = PG_active,</div><div class='ctx'> 	PG_large_rmappable = PG_workingset, /* anon or file-backed */</div><div class='add'>+	PG_partially_mapped = PG_reclaim, /* was identified to be partially mapped */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PAGEFLAGS_MASK		((1UL &lt;&lt; NR_PAGEFLAGS) - 1)</div><div class='hunk'>@@ -217,7 +217,7 @@ static __always_inline const struct page *page_fixed_fake_head(const struct page</div><div class='ctx'> 	 * cold cacheline in some cases.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (IS_ALIGNED((unsigned long)page, PAGE_SIZE) &amp;&amp;</div><div class='del'>-	    test_bit(PG_head, &amp;page-&gt;flags)) {</div><div class='add'>+	    test_bit(PG_head, &amp;page-&gt;flags.f)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We can safely access the field of the @page[1] with PG_head</div><div class='ctx'> 		 * because the @page is a compound page composed with at least</div><div class='hunk'>@@ -230,19 +230,56 @@ static __always_inline const struct page *page_fixed_fake_head(const struct page</div><div class='ctx'> 	}</div><div class='ctx'> 	return page;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static __always_inline bool page_count_writable(const struct page *page, int u)</div><div class='add'>+{</div><div class='add'>+	if (!static_branch_unlikely(&amp;hugetlb_optimize_vmemmap_key))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The refcount check is ordered before the fake-head check to prevent</div><div class='add'>+	 * the following race:</div><div class='add'>+	 *   CPU 1 (HVO)                     CPU 2 (speculative PFN walker)</div><div class='add'>+	 *</div><div class='add'>+	 *   page_ref_freeze()</div><div class='add'>+	 *   synchronize_rcu()</div><div class='add'>+	 *                                   rcu_read_lock()</div><div class='add'>+	 *                                   page_is_fake_head() is false</div><div class='add'>+	 *   vmemmap_remap_pte()</div><div class='add'>+	 *   XXX: struct page[] becomes r/o</div><div class='add'>+	 *</div><div class='add'>+	 *   page_ref_unfreeze()</div><div class='add'>+	 *                                   page_ref_count() is not zero</div><div class='add'>+	 *</div><div class='add'>+	 *                                   atomic_add_unless(&amp;page-&gt;_refcount)</div><div class='add'>+	 *                                   XXX: try to modify r/o struct page[]</div><div class='add'>+	 *</div><div class='add'>+	 * The refcount check also prevents modification attempts to other (r/o)</div><div class='add'>+	 * tail pages that are not fake heads.</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_read_acquire(&amp;page-&gt;_refcount) == u)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return page_fixed_fake_head(page) == page;</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline const struct page *page_fixed_fake_head(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return page;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline bool page_count_writable(const struct page *page, int u)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static __always_inline int page_is_fake_head(struct page *page)</div><div class='add'>+static __always_inline int page_is_fake_head(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return page_fixed_fake_head(page) != page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long _compound_head(const struct page *page)</div><div class='add'>+static __always_inline unsigned long _compound_head(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long head = READ_ONCE(page-&gt;compound_head);</div><div class='ctx'> </div><div class='hunk'>@@ -279,23 +316,23 @@ static inline unsigned long _compound_head(const struct page *page)</div><div class='ctx'>  * check that the page number lies within @folio; the caller is presumed</div><div class='ctx'>  * to have a reference to the page.</div><div class='ctx'>  */</div><div class='del'>-#define folio_page(folio, n)	nth_page(&amp;(folio)-&gt;page, n)</div><div class='add'>+#define folio_page(folio, n)	(&amp;(folio)-&gt;page + (n))</div><div class='ctx'> </div><div class='del'>-static __always_inline int PageTail(struct page *page)</div><div class='add'>+static __always_inline int PageTail(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return READ_ONCE(page-&gt;compound_head) &amp; 1 || page_is_fake_head(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline int PageCompound(struct page *page)</div><div class='add'>+static __always_inline int PageCompound(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(PG_head, &amp;page-&gt;flags) ||</div><div class='add'>+	return test_bit(PG_head, &amp;page-&gt;flags.f) ||</div><div class='ctx'> 	       READ_ONCE(page-&gt;compound_head) &amp; 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define	PAGE_POISON_PATTERN	-1l</div><div class='ctx'> static inline int PagePoisoned(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return READ_ONCE(page-&gt;flags) == PAGE_POISON_PATTERN;</div><div class='add'>+	return READ_ONCE(page-&gt;flags.f) == PAGE_POISON_PATTERN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_VM</div><div class='hunk'>@@ -306,13 +343,23 @@ static inline void page_init_poison(struct page *page, size_t size)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static const unsigned long *const_folio_flags(const struct folio *folio,</div><div class='add'>+		unsigned n)</div><div class='add'>+{</div><div class='add'>+	const struct page *page = &amp;folio-&gt;page;</div><div class='add'>+</div><div class='add'>+	VM_BUG_ON_PGFLAGS(page-&gt;compound_head &amp; 1, page);</div><div class='add'>+	VM_BUG_ON_PGFLAGS(n &gt; 0 &amp;&amp; !test_bit(PG_head, &amp;page-&gt;flags.f), page);</div><div class='add'>+	return &amp;page[n].flags.f;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned long *folio_flags(struct folio *folio, unsigned n)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = &amp;folio-&gt;page;</div><div class='ctx'> </div><div class='del'>-	VM_BUG_ON_PGFLAGS(PageTail(page), page);</div><div class='del'>-	VM_BUG_ON_PGFLAGS(n &gt; 0 &amp;&amp; !test_bit(PG_head, &amp;page-&gt;flags), page);</div><div class='del'>-	return &amp;page[n].flags;</div><div class='add'>+	VM_BUG_ON_PGFLAGS(page-&gt;compound_head &amp; 1, page);</div><div class='add'>+	VM_BUG_ON_PGFLAGS(n &gt; 0 &amp;&amp; !test_bit(PG_head, &amp;page-&gt;flags.f), page);</div><div class='add'>+	return &amp;page[n].flags.f;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -328,9 +375,6 @@ static unsigned long *folio_flags(struct folio *folio, unsigned n)</div><div class='ctx'>  *     for compound page all operations related to the page flag applied to</div><div class='ctx'>  *     head page.</div><div class='ctx'>  *</div><div class='del'>- * PF_ONLY_HEAD:</div><div class='del'>- *     for compound page, callers only ever operate on the head page.</div><div class='del'>- *</div><div class='ctx'>  * PF_NO_TAIL:</div><div class='ctx'>  *     modifications of the page flag must be done on small or head pages,</div><div class='ctx'>  *     checks can be done on tail pages too.</div><div class='hunk'>@@ -346,9 +390,6 @@ static unsigned long *folio_flags(struct folio *folio, unsigned n)</div><div class='ctx'> 		page; })</div><div class='ctx'> #define PF_ANY(page, enforce)	PF_POISONED_CHECK(page)</div><div class='ctx'> #define PF_HEAD(page, enforce)	PF_POISONED_CHECK(compound_head(page))</div><div class='del'>-#define PF_ONLY_HEAD(page, enforce) ({					\</div><div class='del'>-		VM_BUG_ON_PGFLAGS(PageTail(page), page);		\</div><div class='del'>-		PF_POISONED_CHECK(page); })</div><div class='ctx'> #define PF_NO_TAIL(page, enforce) ({					\</div><div class='ctx'> 		VM_BUG_ON_PGFLAGS(enforce &amp;&amp; PageTail(page), page);	\</div><div class='ctx'> 		PF_POISONED_CHECK(compound_head(page)); })</div><div class='hunk'>@@ -362,61 +403,83 @@ static unsigned long *folio_flags(struct folio *folio, unsigned n)</div><div class='ctx'> /* Which page is the flag stored in */</div><div class='ctx'> #define FOLIO_PF_ANY		0</div><div class='ctx'> #define FOLIO_PF_HEAD		0</div><div class='del'>-#define FOLIO_PF_ONLY_HEAD	0</div><div class='ctx'> #define FOLIO_PF_NO_TAIL	0</div><div class='ctx'> #define FOLIO_PF_NO_COMPOUND	0</div><div class='ctx'> #define FOLIO_PF_SECOND		1</div><div class='ctx'> </div><div class='add'>+#define FOLIO_HEAD_PAGE		0</div><div class='add'>+#define FOLIO_SECOND_PAGE	1</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Macros to create function definitions for page flags</div><div class='ctx'>  */</div><div class='add'>+#define FOLIO_TEST_FLAG(name, page)					\</div><div class='add'>+static __always_inline bool folio_test_##name(const struct folio *folio) \</div><div class='add'>+{ return test_bit(PG_##name, const_folio_flags(folio, page)); }</div><div class='add'>+</div><div class='add'>+#define FOLIO_SET_FLAG(name, page)					\</div><div class='add'>+static __always_inline void folio_set_##name(struct folio *folio)	\</div><div class='add'>+{ set_bit(PG_##name, folio_flags(folio, page)); }</div><div class='add'>+</div><div class='add'>+#define FOLIO_CLEAR_FLAG(name, page)					\</div><div class='add'>+static __always_inline void folio_clear_##name(struct folio *folio)	\</div><div class='add'>+{ clear_bit(PG_##name, folio_flags(folio, page)); }</div><div class='add'>+</div><div class='add'>+#define __FOLIO_SET_FLAG(name, page)					\</div><div class='add'>+static __always_inline void __folio_set_##name(struct folio *folio)	\</div><div class='add'>+{ __set_bit(PG_##name, folio_flags(folio, page)); }</div><div class='add'>+</div><div class='add'>+#define __FOLIO_CLEAR_FLAG(name, page)					\</div><div class='add'>+static __always_inline void __folio_clear_##name(struct folio *folio)	\</div><div class='add'>+{ __clear_bit(PG_##name, folio_flags(folio, page)); }</div><div class='add'>+</div><div class='add'>+#define FOLIO_TEST_SET_FLAG(name, page)					\</div><div class='add'>+static __always_inline bool folio_test_set_##name(struct folio *folio)	\</div><div class='add'>+{ return test_and_set_bit(PG_##name, folio_flags(folio, page)); }</div><div class='add'>+</div><div class='add'>+#define FOLIO_TEST_CLEAR_FLAG(name, page)				\</div><div class='add'>+static __always_inline bool folio_test_clear_##name(struct folio *folio) \</div><div class='add'>+{ return test_and_clear_bit(PG_##name, folio_flags(folio, page)); }</div><div class='add'>+</div><div class='add'>+#define FOLIO_FLAG(name, page)						\</div><div class='add'>+FOLIO_TEST_FLAG(name, page)						\</div><div class='add'>+FOLIO_SET_FLAG(name, page)						\</div><div class='add'>+FOLIO_CLEAR_FLAG(name, page)</div><div class='add'>+</div><div class='ctx'> #define TESTPAGEFLAG(uname, lname, policy)				\</div><div class='del'>-static __always_inline bool folio_test_##lname(struct folio *folio)	\</div><div class='del'>-{ return test_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }	\</div><div class='del'>-static __always_inline int Page##uname(struct page *page)		\</div><div class='del'>-{ return test_bit(PG_##lname, &amp;policy(page, 0)-&gt;flags); }</div><div class='add'>+FOLIO_TEST_FLAG(lname, FOLIO_##policy)					\</div><div class='add'>+static __always_inline int Page##uname(const struct page *page)		\</div><div class='add'>+{ return test_bit(PG_##lname, &amp;policy(page, 0)-&gt;flags.f); }</div><div class='ctx'> </div><div class='ctx'> #define SETPAGEFLAG(uname, lname, policy)				\</div><div class='del'>-static __always_inline							\</div><div class='del'>-void folio_set_##lname(struct folio *folio)				\</div><div class='del'>-{ set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }		\</div><div class='add'>+FOLIO_SET_FLAG(lname, FOLIO_##policy)					\</div><div class='ctx'> static __always_inline void SetPage##uname(struct page *page)		\</div><div class='del'>-{ set_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags); }</div><div class='add'>+{ set_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags.f); }</div><div class='ctx'> </div><div class='ctx'> #define CLEARPAGEFLAG(uname, lname, policy)				\</div><div class='del'>-static __always_inline							\</div><div class='del'>-void folio_clear_##lname(struct folio *folio)				\</div><div class='del'>-{ clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }		\</div><div class='add'>+FOLIO_CLEAR_FLAG(lname, FOLIO_##policy)					\</div><div class='ctx'> static __always_inline void ClearPage##uname(struct page *page)		\</div><div class='del'>-{ clear_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags); }</div><div class='add'>+{ clear_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags.f); }</div><div class='ctx'> </div><div class='ctx'> #define __SETPAGEFLAG(uname, lname, policy)				\</div><div class='del'>-static __always_inline							\</div><div class='del'>-void __folio_set_##lname(struct folio *folio)				\</div><div class='del'>-{ __set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }		\</div><div class='add'>+__FOLIO_SET_FLAG(lname, FOLIO_##policy)					\</div><div class='ctx'> static __always_inline void __SetPage##uname(struct page *page)		\</div><div class='del'>-{ __set_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags); }</div><div class='add'>+{ __set_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags.f); }</div><div class='ctx'> </div><div class='ctx'> #define __CLEARPAGEFLAG(uname, lname, policy)				\</div><div class='del'>-static __always_inline							\</div><div class='del'>-void __folio_clear_##lname(struct folio *folio)				\</div><div class='del'>-{ __clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }	\</div><div class='add'>+__FOLIO_CLEAR_FLAG(lname, FOLIO_##policy)				\</div><div class='ctx'> static __always_inline void __ClearPage##uname(struct page *page)	\</div><div class='del'>-{ __clear_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags); }</div><div class='add'>+{ __clear_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags.f); }</div><div class='ctx'> </div><div class='ctx'> #define TESTSETFLAG(uname, lname, policy)				\</div><div class='del'>-static __always_inline							\</div><div class='del'>-bool folio_test_set_##lname(struct folio *folio)			\</div><div class='del'>-{ return test_and_set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \</div><div class='add'>+FOLIO_TEST_SET_FLAG(lname, FOLIO_##policy)				\</div><div class='ctx'> static __always_inline int TestSetPage##uname(struct page *page)	\</div><div class='del'>-{ return test_and_set_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags); }</div><div class='add'>+{ return test_and_set_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags.f); }</div><div class='ctx'> </div><div class='ctx'> #define TESTCLEARFLAG(uname, lname, policy)				\</div><div class='del'>-static __always_inline							\</div><div class='del'>-bool folio_test_clear_##lname(struct folio *folio)			\</div><div class='del'>-{ return test_and_clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \</div><div class='add'>+FOLIO_TEST_CLEAR_FLAG(lname, FOLIO_##policy)				\</div><div class='ctx'> static __always_inline int TestClearPage##uname(struct page *page)	\</div><div class='del'>-{ return test_and_clear_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags); }</div><div class='add'>+{ return test_and_clear_bit(PG_##lname, &amp;policy(page, 1)-&gt;flags.f); }</div><div class='ctx'> </div><div class='ctx'> #define PAGEFLAG(uname, lname, policy)					\</div><div class='ctx'> 	TESTPAGEFLAG(uname, lname, policy)				\</div><div class='hunk'>@@ -432,30 +495,51 @@ static __always_inline int TestClearPage##uname(struct page *page)	\</div><div class='ctx'> 	TESTSETFLAG(uname, lname, policy)				\</div><div class='ctx'> 	TESTCLEARFLAG(uname, lname, policy)</div><div class='ctx'> </div><div class='add'>+#define FOLIO_TEST_FLAG_FALSE(name)					\</div><div class='add'>+static inline bool folio_test_##name(const struct folio *folio)		\</div><div class='add'>+{ return false; }</div><div class='add'>+#define FOLIO_SET_FLAG_NOOP(name)					\</div><div class='add'>+static inline void folio_set_##name(struct folio *folio) { }</div><div class='add'>+#define FOLIO_CLEAR_FLAG_NOOP(name)					\</div><div class='add'>+static inline void folio_clear_##name(struct folio *folio) { }</div><div class='add'>+#define __FOLIO_SET_FLAG_NOOP(name)					\</div><div class='add'>+static inline void __folio_set_##name(struct folio *folio) { }</div><div class='add'>+#define __FOLIO_CLEAR_FLAG_NOOP(name)					\</div><div class='add'>+static inline void __folio_clear_##name(struct folio *folio) { }</div><div class='add'>+#define FOLIO_TEST_SET_FLAG_FALSE(name)					\</div><div class='add'>+static inline bool folio_test_set_##name(struct folio *folio)		\</div><div class='add'>+{ return false; }</div><div class='add'>+#define FOLIO_TEST_CLEAR_FLAG_FALSE(name)				\</div><div class='add'>+static inline bool folio_test_clear_##name(struct folio *folio)		\</div><div class='add'>+{ return false; }</div><div class='add'>+</div><div class='add'>+#define FOLIO_FLAG_FALSE(name)						\</div><div class='add'>+FOLIO_TEST_FLAG_FALSE(name)						\</div><div class='add'>+FOLIO_SET_FLAG_NOOP(name)						\</div><div class='add'>+FOLIO_CLEAR_FLAG_NOOP(name)</div><div class='add'>+</div><div class='ctx'> #define TESTPAGEFLAG_FALSE(uname, lname)				\</div><div class='del'>-static inline bool folio_test_##lname(const struct folio *folio) { return false; } \</div><div class='add'>+FOLIO_TEST_FLAG_FALSE(lname)						\</div><div class='ctx'> static inline int Page##uname(const struct page *page) { return 0; }</div><div class='ctx'> </div><div class='ctx'> #define SETPAGEFLAG_NOOP(uname, lname)					\</div><div class='del'>-static inline void folio_set_##lname(struct folio *folio) { }		\</div><div class='add'>+FOLIO_SET_FLAG_NOOP(lname)						\</div><div class='ctx'> static inline void SetPage##uname(struct page *page) {  }</div><div class='ctx'> </div><div class='ctx'> #define CLEARPAGEFLAG_NOOP(uname, lname)				\</div><div class='del'>-static inline void folio_clear_##lname(struct folio *folio) { }		\</div><div class='add'>+FOLIO_CLEAR_FLAG_NOOP(lname)						\</div><div class='ctx'> static inline void ClearPage##uname(struct page *page) {  }</div><div class='ctx'> </div><div class='ctx'> #define __CLEARPAGEFLAG_NOOP(uname, lname)				\</div><div class='del'>-static inline void __folio_clear_##lname(struct folio *folio) { }	\</div><div class='add'>+__FOLIO_CLEAR_FLAG_NOOP(lname)						\</div><div class='ctx'> static inline void __ClearPage##uname(struct page *page) {  }</div><div class='ctx'> </div><div class='ctx'> #define TESTSETFLAG_FALSE(uname, lname)					\</div><div class='del'>-static inline bool folio_test_set_##lname(struct folio *folio)		\</div><div class='del'>-{ return 0; }								\</div><div class='add'>+FOLIO_TEST_SET_FLAG_FALSE(lname)					\</div><div class='ctx'> static inline int TestSetPage##uname(struct page *page) { return 0; }</div><div class='ctx'> </div><div class='ctx'> #define TESTCLEARFLAG_FALSE(uname, lname)				\</div><div class='del'>-static inline bool folio_test_clear_##lname(struct folio *folio)	\</div><div class='del'>-{ return 0; }								\</div><div class='add'>+FOLIO_TEST_CLEAR_FLAG_FALSE(lname)					\</div><div class='ctx'> static inline int TestClearPage##uname(struct page *page) { return 0; }</div><div class='ctx'> </div><div class='ctx'> #define PAGEFLAG_FALSE(uname, lname) TESTPAGEFLAG_FALSE(uname, lname)	\</div><div class='hunk'>@@ -465,20 +549,19 @@ static inline int TestClearPage##uname(struct page *page) { return 0; }</div><div class='ctx'> 	TESTSETFLAG_FALSE(uname, lname) TESTCLEARFLAG_FALSE(uname, lname)</div><div class='ctx'> </div><div class='ctx'> __PAGEFLAG(Locked, locked, PF_NO_TAIL)</div><div class='del'>-PAGEFLAG(Waiters, waiters, PF_ONLY_HEAD)</div><div class='del'>-PAGEFLAG(Error, error, PF_NO_TAIL) TESTCLEARFLAG(Error, error, PF_NO_TAIL)</div><div class='del'>-PAGEFLAG(Referenced, referenced, PF_HEAD)</div><div class='del'>-	TESTCLEARFLAG(Referenced, referenced, PF_HEAD)</div><div class='del'>-	__SETPAGEFLAG(Referenced, referenced, PF_HEAD)</div><div class='add'>+FOLIO_FLAG(waiters, FOLIO_HEAD_PAGE)</div><div class='add'>+FOLIO_FLAG(referenced, FOLIO_HEAD_PAGE)</div><div class='add'>+	FOLIO_TEST_CLEAR_FLAG(referenced, FOLIO_HEAD_PAGE)</div><div class='add'>+	__FOLIO_SET_FLAG(referenced, FOLIO_HEAD_PAGE)</div><div class='ctx'> PAGEFLAG(Dirty, dirty, PF_HEAD) TESTSCFLAG(Dirty, dirty, PF_HEAD)</div><div class='ctx'> 	__CLEARPAGEFLAG(Dirty, dirty, PF_HEAD)</div><div class='ctx'> PAGEFLAG(LRU, lru, PF_HEAD) __CLEARPAGEFLAG(LRU, lru, PF_HEAD)</div><div class='ctx'> 	TESTCLEARFLAG(LRU, lru, PF_HEAD)</div><div class='del'>-PAGEFLAG(Active, active, PF_HEAD) __CLEARPAGEFLAG(Active, active, PF_HEAD)</div><div class='del'>-	TESTCLEARFLAG(Active, active, PF_HEAD)</div><div class='add'>+FOLIO_FLAG(active, FOLIO_HEAD_PAGE)</div><div class='add'>+	__FOLIO_CLEAR_FLAG(active, FOLIO_HEAD_PAGE)</div><div class='add'>+	FOLIO_TEST_CLEAR_FLAG(active, FOLIO_HEAD_PAGE)</div><div class='ctx'> PAGEFLAG(Workingset, workingset, PF_HEAD)</div><div class='ctx'> 	TESTCLEARFLAG(Workingset, workingset, PF_HEAD)</div><div class='del'>-__PAGEFLAG(Slab, slab, PF_NO_TAIL)</div><div class='ctx'> PAGEFLAG(Checked, checked, PF_NO_COMPOUND)	   /* Used by some filesystems */</div><div class='ctx'> </div><div class='ctx'> /* Xen */</div><div class='hunk'>@@ -492,9 +575,9 @@ PAGEFLAG(XenRemapped, xen_remapped, PF_NO_COMPOUND)</div><div class='ctx'> PAGEFLAG(Reserved, reserved, PF_NO_COMPOUND)</div><div class='ctx'> 	__CLEARPAGEFLAG(Reserved, reserved, PF_NO_COMPOUND)</div><div class='ctx'> 	__SETPAGEFLAG(Reserved, reserved, PF_NO_COMPOUND)</div><div class='del'>-PAGEFLAG(SwapBacked, swapbacked, PF_NO_TAIL)</div><div class='del'>-	__CLEARPAGEFLAG(SwapBacked, swapbacked, PF_NO_TAIL)</div><div class='del'>-	__SETPAGEFLAG(SwapBacked, swapbacked, PF_NO_TAIL)</div><div class='add'>+FOLIO_FLAG(swapbacked, FOLIO_HEAD_PAGE)</div><div class='add'>+	__FOLIO_CLEAR_FLAG(swapbacked, FOLIO_HEAD_PAGE)</div><div class='add'>+	__FOLIO_SET_FLAG(swapbacked, FOLIO_HEAD_PAGE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Private page markings that may be used by the filesystem that owns the page</div><div class='hunk'>@@ -502,9 +585,10 @@ PAGEFLAG(SwapBacked, swapbacked, PF_NO_TAIL)</div><div class='ctx'>  * - PG_private and PG_private_2 cause release_folio() and co to be invoked</div><div class='ctx'>  */</div><div class='ctx'> PAGEFLAG(Private, private, PF_ANY)</div><div class='del'>-PAGEFLAG(Private2, private_2, PF_ANY) TESTSCFLAG(Private2, private_2, PF_ANY)</div><div class='del'>-PAGEFLAG(OwnerPriv1, owner_priv_1, PF_ANY)</div><div class='del'>-	TESTCLEARFLAG(OwnerPriv1, owner_priv_1, PF_ANY)</div><div class='add'>+FOLIO_FLAG(private_2, FOLIO_HEAD_PAGE)</div><div class='add'>+</div><div class='add'>+/* owner_2 can be set on tail pages for anon memory */</div><div class='add'>+FOLIO_FLAG(owner_2, FOLIO_HEAD_PAGE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Only test-and-set exist for PG_writeback.  The unconditional operators are</div><div class='hunk'>@@ -512,13 +596,17 @@ PAGEFLAG(OwnerPriv1, owner_priv_1, PF_ANY)</div><div class='ctx'>  */</div><div class='ctx'> TESTPAGEFLAG(Writeback, writeback, PF_NO_TAIL)</div><div class='ctx'> 	TESTSCFLAG(Writeback, writeback, PF_NO_TAIL)</div><div class='del'>-PAGEFLAG(MappedToDisk, mappedtodisk, PF_NO_TAIL)</div><div class='add'>+FOLIO_FLAG(mappedtodisk, FOLIO_HEAD_PAGE)</div><div class='ctx'> </div><div class='ctx'> /* PG_readahead is only used for reads; PG_reclaim is only for writes */</div><div class='ctx'> PAGEFLAG(Reclaim, reclaim, PF_NO_TAIL)</div><div class='ctx'> 	TESTCLEARFLAG(Reclaim, reclaim, PF_NO_TAIL)</div><div class='del'>-PAGEFLAG(Readahead, readahead, PF_NO_COMPOUND)</div><div class='del'>-	TESTCLEARFLAG(Readahead, readahead, PF_NO_COMPOUND)</div><div class='add'>+FOLIO_FLAG(readahead, FOLIO_HEAD_PAGE)</div><div class='add'>+	FOLIO_TEST_CLEAR_FLAG(readahead, FOLIO_HEAD_PAGE)</div><div class='add'>+</div><div class='add'>+FOLIO_FLAG(dropbehind, FOLIO_HEAD_PAGE)</div><div class='add'>+	FOLIO_TEST_CLEAR_FLAG(dropbehind, FOLIO_HEAD_PAGE)</div><div class='add'>+	__FOLIO_SET_FLAG(dropbehind, FOLIO_HEAD_PAGE)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='ctx'> /*</div><div class='hunk'>@@ -530,63 +618,65 @@ PAGEFLAG(Readahead, readahead, PF_NO_COMPOUND)</div><div class='ctx'> #else</div><div class='ctx'> PAGEFLAG_FALSE(HighMem, highmem)</div><div class='ctx'> #endif</div><div class='add'>+#define PhysHighMem(__p) (PageHighMem(phys_to_page(__p)))</div><div class='add'>+</div><div class='add'>+/* Does kmap_local_folio() only allow access to one page of the folio? */</div><div class='add'>+#ifdef CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP</div><div class='add'>+#define folio_test_partial_kmap(f)	true</div><div class='add'>+#else</div><div class='add'>+#define folio_test_partial_kmap(f)	folio_test_highmem(f)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SWAP</div><div class='del'>-static __always_inline bool folio_test_swapcache(struct folio *folio)</div><div class='add'>+static __always_inline bool folio_test_swapcache(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_test_swapbacked(folio) &amp;&amp;</div><div class='del'>-			test_bit(PG_swapcache, folio_flags(folio, 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool PageSwapCache(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_test_swapcache(page_folio(page));</div><div class='add'>+			test_bit(PG_swapcache, const_folio_flags(folio, 0));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SETPAGEFLAG(SwapCache, swapcache, PF_NO_TAIL)</div><div class='del'>-CLEARPAGEFLAG(SwapCache, swapcache, PF_NO_TAIL)</div><div class='add'>+FOLIO_SET_FLAG(swapcache, FOLIO_HEAD_PAGE)</div><div class='add'>+FOLIO_CLEAR_FLAG(swapcache, FOLIO_HEAD_PAGE)</div><div class='ctx'> #else</div><div class='del'>-PAGEFLAG_FALSE(SwapCache, swapcache)</div><div class='add'>+FOLIO_FLAG_FALSE(swapcache)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-PAGEFLAG(Unevictable, unevictable, PF_HEAD)</div><div class='del'>-	__CLEARPAGEFLAG(Unevictable, unevictable, PF_HEAD)</div><div class='del'>-	TESTCLEARFLAG(Unevictable, unevictable, PF_HEAD)</div><div class='add'>+FOLIO_FLAG(unevictable, FOLIO_HEAD_PAGE)</div><div class='add'>+	__FOLIO_CLEAR_FLAG(unevictable, FOLIO_HEAD_PAGE)</div><div class='add'>+	FOLIO_TEST_CLEAR_FLAG(unevictable, FOLIO_HEAD_PAGE)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-PAGEFLAG(Mlocked, mlocked, PF_NO_TAIL)</div><div class='del'>-	__CLEARPAGEFLAG(Mlocked, mlocked, PF_NO_TAIL)</div><div class='del'>-	TESTSCFLAG(Mlocked, mlocked, PF_NO_TAIL)</div><div class='del'>-#else</div><div class='del'>-PAGEFLAG_FALSE(Mlocked, mlocked) __CLEARPAGEFLAG_NOOP(Mlocked, mlocked)</div><div class='del'>-	TESTSCFLAG_FALSE(Mlocked, mlocked)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_USES_PG_UNCACHED</div><div class='del'>-PAGEFLAG(Uncached, uncached, PF_NO_COMPOUND)</div><div class='add'>+FOLIO_FLAG(mlocked, FOLIO_HEAD_PAGE)</div><div class='add'>+	__FOLIO_CLEAR_FLAG(mlocked, FOLIO_HEAD_PAGE)</div><div class='add'>+	FOLIO_TEST_CLEAR_FLAG(mlocked, FOLIO_HEAD_PAGE)</div><div class='add'>+	FOLIO_TEST_SET_FLAG(mlocked, FOLIO_HEAD_PAGE)</div><div class='ctx'> #else</div><div class='del'>-PAGEFLAG_FALSE(Uncached, uncached)</div><div class='add'>+FOLIO_FLAG_FALSE(mlocked)</div><div class='add'>+	__FOLIO_CLEAR_FLAG_NOOP(mlocked)</div><div class='add'>+	FOLIO_TEST_CLEAR_FLAG_FALSE(mlocked)</div><div class='add'>+	FOLIO_TEST_SET_FLAG_FALSE(mlocked)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMORY_FAILURE</div><div class='ctx'> PAGEFLAG(HWPoison, hwpoison, PF_ANY)</div><div class='ctx'> TESTSCFLAG(HWPoison, hwpoison, PF_ANY)</div><div class='ctx'> #define __PG_HWPOISON (1UL &lt;&lt; PG_hwpoison)</div><div class='del'>-#define MAGIC_HWPOISON	0x48575053U	/* HWPS */</div><div class='del'>-extern void SetPageHWPoisonTakenOff(struct page *page);</div><div class='del'>-extern void ClearPageHWPoisonTakenOff(struct page *page);</div><div class='del'>-extern bool take_page_off_buddy(struct page *page);</div><div class='del'>-extern bool put_page_back_buddy(struct page *page);</div><div class='ctx'> #else</div><div class='ctx'> PAGEFLAG_FALSE(HWPoison, hwpoison)</div><div class='ctx'> #define __PG_HWPOISON 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PAGE_IDLE_FLAG) &amp;&amp; defined(CONFIG_64BIT)</div><div class='del'>-TESTPAGEFLAG(Young, young, PF_ANY)</div><div class='del'>-SETPAGEFLAG(Young, young, PF_ANY)</div><div class='del'>-TESTCLEARFLAG(Young, young, PF_ANY)</div><div class='del'>-PAGEFLAG(Idle, idle, PF_ANY)</div><div class='add'>+#ifdef CONFIG_PAGE_IDLE_FLAG</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+FOLIO_TEST_FLAG(young, FOLIO_HEAD_PAGE)</div><div class='add'>+FOLIO_SET_FLAG(young, FOLIO_HEAD_PAGE)</div><div class='add'>+FOLIO_TEST_CLEAR_FLAG(young, FOLIO_HEAD_PAGE)</div><div class='add'>+FOLIO_FLAG(idle, FOLIO_HEAD_PAGE)</div><div class='add'>+#endif</div><div class='add'>+/* See page_idle.h for !64BIT workaround */</div><div class='add'>+#else /* !CONFIG_PAGE_IDLE_FLAG */</div><div class='add'>+FOLIO_FLAG_FALSE(young)</div><div class='add'>+FOLIO_TEST_CLEAR_FLAG_FALSE(young)</div><div class='add'>+FOLIO_FLAG_FALSE(idle)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -604,71 +694,47 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * On an anonymous page mapped into a user virtual memory area,</div><div class='del'>- * page-&gt;mapping points to its anon_vma, not to a struct address_space;</div><div class='del'>- * with the PAGE_MAPPING_ANON bit set to distinguish it.  See rmap.h.</div><div class='del'>- *</div><div class='del'>- * On an anonymous page in a VM_MERGEABLE area, if CONFIG_KSM is enabled,</div><div class='del'>- * the PAGE_MAPPING_MOVABLE bit may be set along with the PAGE_MAPPING_ANON</div><div class='del'>- * bit; and then page-&gt;mapping points, not to an anon_vma, but to a private</div><div class='del'>- * structure which KSM associates with that merged page.  See ksm.h.</div><div class='add'>+ * On an anonymous folio mapped into a user virtual memory area,</div><div class='add'>+ * folio-&gt;mapping points to its anon_vma, not to a struct address_space;</div><div class='add'>+ * with the FOLIO_MAPPING_ANON bit set to distinguish it.  See rmap.h.</div><div class='ctx'>  *</div><div class='del'>- * PAGE_MAPPING_KSM without PAGE_MAPPING_ANON is used for non-lru movable</div><div class='del'>- * page and then page-&gt;mapping points to a struct movable_operations.</div><div class='add'>+ * On an anonymous folio in a VM_MERGEABLE area, if CONFIG_KSM is enabled,</div><div class='add'>+ * the FOLIO_MAPPING_ANON_KSM bit may be set along with the FOLIO_MAPPING_ANON</div><div class='add'>+ * bit; and then folio-&gt;mapping points, not to an anon_vma, but to a private</div><div class='add'>+ * structure which KSM associates with that merged folio.  See ksm.h.</div><div class='ctx'>  *</div><div class='del'>- * Please note that, confusingly, "page_mapping" refers to the inode</div><div class='del'>- * address_space which maps the page from disk; whereas "page_mapped"</div><div class='del'>- * refers to user virtual address space into which the page is mapped.</div><div class='add'>+ * Please note that, confusingly, "folio_mapping" refers to the inode</div><div class='add'>+ * address_space which maps the folio from disk; whereas "folio_mapped"</div><div class='add'>+ * refers to user virtual address space into which the folio is mapped.</div><div class='ctx'>  *</div><div class='ctx'>  * For slab pages, since slab reuses the bits in struct page to store its</div><div class='del'>- * internal states, the page-&gt;mapping does not exist as such, nor do these</div><div class='del'>- * flags below.  So in order to avoid testing non-existent bits, please</div><div class='del'>- * make sure that PageSlab(page) actually evaluates to false before calling</div><div class='del'>- * the following functions (e.g., PageAnon).  See mm/slab.h.</div><div class='add'>+ * internal states, the folio-&gt;mapping does not exist as such, nor do</div><div class='add'>+ * these flags below.  So in order to avoid testing non-existent bits,</div><div class='add'>+ * please make sure that folio_test_slab(folio) actually evaluates to</div><div class='add'>+ * false before calling the following functions (e.g., folio_test_anon).</div><div class='add'>+ * See mm/slab.h.</div><div class='ctx'>  */</div><div class='del'>-#define PAGE_MAPPING_ANON	0x1</div><div class='del'>-#define PAGE_MAPPING_MOVABLE	0x2</div><div class='del'>-#define PAGE_MAPPING_KSM	(PAGE_MAPPING_ANON | PAGE_MAPPING_MOVABLE)</div><div class='del'>-#define PAGE_MAPPING_FLAGS	(PAGE_MAPPING_ANON | PAGE_MAPPING_MOVABLE)</div><div class='add'>+#define FOLIO_MAPPING_ANON	0x1</div><div class='add'>+#define FOLIO_MAPPING_ANON_KSM	0x2</div><div class='add'>+#define FOLIO_MAPPING_KSM	(FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM)</div><div class='add'>+#define FOLIO_MAPPING_FLAGS	(FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Different with flags above, this flag is used only for fsdax mode.  It</div><div class='del'>- * indicates that this page-&gt;mapping is now under reflink case.</div><div class='del'>- */</div><div class='del'>-#define PAGE_MAPPING_DAX_SHARED	((void *)0x1)</div><div class='del'>-</div><div class='del'>-static __always_inline bool folio_mapping_flags(struct folio *folio)</div><div class='add'>+static __always_inline bool folio_test_anon(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return ((unsigned long)folio-&gt;mapping &amp; PAGE_MAPPING_FLAGS) != 0;</div><div class='add'>+	return ((unsigned long)folio-&gt;mapping &amp; FOLIO_MAPPING_ANON) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline int PageMappingFlags(struct page *page)</div><div class='add'>+static __always_inline bool PageAnonNotKsm(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return ((unsigned long)page-&gt;mapping &amp; PAGE_MAPPING_FLAGS) != 0;</div><div class='del'>-}</div><div class='add'>+	unsigned long flags = (unsigned long)page_folio(page)-&gt;mapping;</div><div class='ctx'> </div><div class='del'>-static __always_inline bool folio_test_anon(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return ((unsigned long)folio-&gt;mapping &amp; PAGE_MAPPING_ANON) != 0;</div><div class='add'>+	return (flags &amp; FOLIO_MAPPING_FLAGS) == FOLIO_MAPPING_ANON;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline bool PageAnon(struct page *page)</div><div class='add'>+static __always_inline bool PageAnon(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_test_anon(page_folio(page));</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static __always_inline bool __folio_test_movable(const struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return ((unsigned long)folio-&gt;mapping &amp; PAGE_MAPPING_FLAGS) ==</div><div class='del'>-			PAGE_MAPPING_MOVABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline int __PageMovable(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return ((unsigned long)page-&gt;mapping &amp; PAGE_MAPPING_FLAGS) ==</div><div class='del'>-				PAGE_MAPPING_MOVABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_KSM</div><div class='ctx'> /*</div><div class='ctx'>  * A KSM page is one of those write-protected "shared pages" or "merged pages"</div><div class='hunk'>@@ -676,21 +742,16 @@ static __always_inline int __PageMovable(struct page *page)</div><div class='ctx'>  * is found in VM_MERGEABLE vmas.  It's a PageAnon page, pointing not to any</div><div class='ctx'>  * anon_vma, but to that page's node of the stable tree.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline bool folio_test_ksm(struct folio *folio)</div><div class='add'>+static __always_inline bool folio_test_ksm(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return ((unsigned long)folio-&gt;mapping &amp; PAGE_MAPPING_FLAGS) ==</div><div class='del'>-				PAGE_MAPPING_KSM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline bool PageKsm(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_test_ksm(page_folio(page));</div><div class='add'>+	return ((unsigned long)folio-&gt;mapping &amp; FOLIO_MAPPING_FLAGS) ==</div><div class='add'>+				FOLIO_MAPPING_KSM;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-TESTPAGEFLAG_FALSE(Ksm, ksm)</div><div class='add'>+FOLIO_TEST_FLAG_FALSE(ksm)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-u64 stable_page_flags(struct page *page);</div><div class='add'>+u64 stable_page_flags(const struct page *page);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * folio_xor_flags_has_waiters - Change some folio flags.</div><div class='hunk'>@@ -721,9 +782,9 @@ static inline bool folio_xor_flags_has_waiters(struct folio *folio,</div><div class='ctx'>  * some of the bytes in it may be; see the is_partially_uptodate()</div><div class='ctx'>  * address_space operation.</div><div class='ctx'>  */</div><div class='del'>-static inline bool folio_test_uptodate(struct folio *folio)</div><div class='add'>+static inline bool folio_test_uptodate(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	bool ret = test_bit(PG_uptodate, folio_flags(folio, 0));</div><div class='add'>+	bool ret = test_bit(PG_uptodate, const_folio_flags(folio, 0));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Must ensure that the data we read out of the folio is loaded</div><div class='ctx'> 	 * _after_ we've loaded folio-&gt;flags to check the uptodate bit.</div><div class='hunk'>@@ -738,7 +799,7 @@ static inline bool folio_test_uptodate(struct folio *folio)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int PageUptodate(struct page *page)</div><div class='add'>+static inline bool PageUptodate(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_test_uptodate(page_folio(page));</div><div class='ctx'> }</div><div class='hunk'>@@ -777,18 +838,16 @@ void set_page_writeback(struct page *page);</div><div class='ctx'> </div><div class='ctx'> #define folio_start_writeback(folio)			\</div><div class='ctx'> 	__folio_start_writeback(folio, false)</div><div class='del'>-#define folio_start_writeback_keepwrite(folio)	\</div><div class='del'>-	__folio_start_writeback(folio, true)</div><div class='ctx'> </div><div class='del'>-static __always_inline bool folio_test_head(struct folio *folio)</div><div class='add'>+static __always_inline bool folio_test_head(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(PG_head, folio_flags(folio, FOLIO_PF_ANY));</div><div class='add'>+	return test_bit(PG_head, const_folio_flags(folio, FOLIO_PF_ANY));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline int PageHead(struct page *page)</div><div class='add'>+static __always_inline int PageHead(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	PF_POISONED_CHECK(page);</div><div class='del'>-	return test_bit(PG_head, &amp;page-&gt;flags) &amp;&amp; !page_is_fake_head(page);</div><div class='add'>+	return test_bit(PG_head, &amp;page-&gt;flags.f) &amp;&amp; !page_is_fake_head(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __SETPAGEFLAG(Head, head, PF_ANY)</div><div class='hunk'>@@ -801,7 +860,7 @@ CLEARPAGEFLAG(Head, head, PF_ANY)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: True if the folio is larger than one page.</div><div class='ctx'>  */</div><div class='del'>-static inline bool folio_test_large(struct folio *folio)</div><div class='add'>+static inline bool folio_test_large(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_test_head(folio);</div><div class='ctx'> }</div><div class='hunk'>@@ -822,75 +881,27 @@ static inline void ClearPageCompound(struct page *page)</div><div class='ctx'> 	BUG_ON(!PageHead(page));</div><div class='ctx'> 	ClearPageHead(page);</div><div class='ctx'> }</div><div class='del'>-PAGEFLAG(LargeRmappable, large_rmappable, PF_SECOND)</div><div class='add'>+FOLIO_FLAG(large_rmappable, FOLIO_SECOND_PAGE)</div><div class='add'>+FOLIO_FLAG(partially_mapped, FOLIO_SECOND_PAGE)</div><div class='ctx'> #else</div><div class='del'>-TESTPAGEFLAG_FALSE(LargeRmappable, large_rmappable)</div><div class='add'>+FOLIO_FLAG_FALSE(large_rmappable)</div><div class='add'>+FOLIO_FLAG_FALSE(partially_mapped)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define PG_head_mask ((1UL &lt;&lt; PG_head))</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HUGETLB_PAGE</div><div class='del'>-int PageHuge(struct page *page);</div><div class='del'>-SETPAGEFLAG(HugeTLB, hugetlb, PF_SECOND)</div><div class='del'>-CLEARPAGEFLAG(HugeTLB, hugetlb, PF_SECOND)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * folio_test_hugetlb - Determine if the folio belongs to hugetlbfs</div><div class='del'>- * @folio: The folio to test.</div><div class='del'>- *</div><div class='del'>- * Context: Any context.  Caller should have a reference on the folio to</div><div class='del'>- * prevent it from being turned into a tail page.</div><div class='del'>- * Return: True for hugetlbfs folios, false for anon folios or folios</div><div class='del'>- * belonging to other filesystems.</div><div class='del'>- */</div><div class='del'>-static inline bool folio_test_hugetlb(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return folio_test_large(folio) &amp;&amp;</div><div class='del'>-		test_bit(PG_hugetlb, folio_flags(folio, 1));</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-TESTPAGEFLAG_FALSE(Huge, hugetlb)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='ctx'> /*</div><div class='del'>- * PageHuge() only returns true for hugetlbfs pages, but not for</div><div class='del'>- * normal or transparent huge pages.</div><div class='del'>- *</div><div class='del'>- * PageTransHuge() returns true for both transparent huge and</div><div class='del'>- * hugetlbfs pages, but not normal pages. PageTransHuge() can only be</div><div class='del'>- * called only in the core VM paths where hugetlbfs pages can't exist.</div><div class='del'>- */</div><div class='del'>-static inline int PageTransHuge(struct page *page)</div><div class='del'>-{</div><div class='del'>-	VM_BUG_ON_PAGE(PageTail(page), page);</div><div class='del'>-	return PageHead(page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * PageTransCompound returns true for both transparent huge pages</div><div class='ctx'>  * and hugetlbfs pages, so it should only be called when it's known</div><div class='ctx'>  * that hugetlbfs pages aren't involved.</div><div class='ctx'>  */</div><div class='del'>-static inline int PageTransCompound(struct page *page)</div><div class='add'>+static inline int PageTransCompound(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return PageCompound(page);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PageTransTail returns true for both transparent huge pages</div><div class='del'>- * and hugetlbfs pages, so it should only be called when it's known</div><div class='del'>- * that hugetlbfs pages aren't involved.</div><div class='del'>- */</div><div class='del'>-static inline int PageTransTail(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return PageTail(page);</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='del'>-TESTPAGEFLAG_FALSE(TransHuge, transhuge)</div><div class='ctx'> TESTPAGEFLAG_FALSE(TransCompound, transcompound)</div><div class='del'>-TESTPAGEFLAG_FALSE(TransCompoundMap, transcompoundmap)</div><div class='del'>-TESTPAGEFLAG_FALSE(TransTail, transtail)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MEMORY_FAILURE) &amp;&amp; defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='hunk'>@@ -900,86 +911,90 @@ TESTPAGEFLAG_FALSE(TransTail, transtail)</div><div class='ctx'>  *</div><div class='ctx'>  * This flag is set by hwpoison handler.  Cleared by THP split or free page.</div><div class='ctx'>  */</div><div class='del'>-PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)</div><div class='del'>-	TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)</div><div class='add'>+FOLIO_FLAG(has_hwpoisoned, FOLIO_SECOND_PAGE)</div><div class='ctx'> #else</div><div class='del'>-PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)</div><div class='del'>-	TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)</div><div class='add'>+FOLIO_FLAG_FALSE(has_hwpoisoned)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Check if a page is currently marked HWPoisoned. Note that this check is</div><div class='del'>- * best effort only and inherently racy: there is no way to synchronize with</div><div class='del'>- * failing hardware.</div><div class='add'>+ * For pages that do not use mapcount, page_type may be used.</div><div class='add'>+ * The low 24 bits of pagetype may be used for your own purposes, as long</div><div class='add'>+ * as you are careful to not affect the top 8 bits.  The low bits of</div><div class='add'>+ * pagetype will be overwritten when you clear the page_type from the page.</div><div class='ctx'>  */</div><div class='del'>-static inline bool is_page_hwpoison(struct page *page)</div><div class='add'>+enum pagetype {</div><div class='add'>+	/* 0x00-0x7f are positive numbers, ie mapcount */</div><div class='add'>+	/* Reserve 0x80-0xef for mapcount overflow. */</div><div class='add'>+	PGTY_buddy		= 0xf0,</div><div class='add'>+	PGTY_offline		= 0xf1,</div><div class='add'>+	PGTY_table		= 0xf2,</div><div class='add'>+	PGTY_guard		= 0xf3,</div><div class='add'>+	PGTY_hugetlb		= 0xf4,</div><div class='add'>+	PGTY_slab		= 0xf5,</div><div class='add'>+	PGTY_zsmalloc		= 0xf6,</div><div class='add'>+	PGTY_unaccepted		= 0xf7,</div><div class='add'>+	PGTY_large_kmalloc	= 0xf8,</div><div class='add'>+</div><div class='add'>+	PGTY_mapcount_underflow = 0xff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool page_type_has_type(int page_type)</div><div class='ctx'> {</div><div class='del'>-	if (PageHWPoison(page))</div><div class='del'>-		return true;</div><div class='del'>-	return PageHuge(page) &amp;&amp; PageHWPoison(compound_head(page));</div><div class='add'>+	return page_type &lt; (PGTY_mapcount_underflow &lt;&lt; 24);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * For pages that are never mapped to userspace (and aren't PageSlab),</div><div class='del'>- * page_type may be used.  Because it is initialised to -1, we invert the</div><div class='del'>- * sense of the bit, so __SetPageFoo *clears* the bit used for PageFoo, and</div><div class='del'>- * __ClearPageFoo *sets* the bit used for PageFoo.  We reserve a few high and</div><div class='del'>- * low bits so that an underflow or overflow of page_mapcount() won't be</div><div class='del'>- * mistaken for a page type value.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define PAGE_TYPE_BASE	0xf0000000</div><div class='del'>-/* Reserve		0x0000007f to catch underflows of page_mapcount */</div><div class='del'>-#define PAGE_MAPCOUNT_RESERVE	-128</div><div class='del'>-#define PG_buddy	0x00000080</div><div class='del'>-#define PG_offline	0x00000100</div><div class='del'>-#define PG_table	0x00000200</div><div class='del'>-#define PG_guard	0x00000400</div><div class='del'>-</div><div class='del'>-#define PageType(page, flag)						\</div><div class='del'>-	((page-&gt;page_type &amp; (PAGE_TYPE_BASE | flag)) == PAGE_TYPE_BASE)</div><div class='del'>-#define folio_test_type(folio, flag)					\</div><div class='del'>-	((folio-&gt;page.page_type &amp; (PAGE_TYPE_BASE | flag)) == PAGE_TYPE_BASE)</div><div class='del'>-</div><div class='del'>-static inline int page_type_has_type(unsigned int page_type)</div><div class='add'>+/* This takes a mapcount which is one more than page-&gt;_mapcount */</div><div class='add'>+static inline bool page_mapcount_is_type(unsigned int mapcount)</div><div class='ctx'> {</div><div class='del'>-	return (int)page_type &lt; PAGE_MAPCOUNT_RESERVE;</div><div class='add'>+	return page_type_has_type(mapcount - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int page_has_type(struct page *page)</div><div class='add'>+static inline bool page_has_type(const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return page_type_has_type(page-&gt;page_type);</div><div class='add'>+	return page_type_has_type(data_race(page-&gt;page_type));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define PAGE_TYPE_OPS(uname, lname, fname)				\</div><div class='del'>-static __always_inline int Page##uname(const struct page *page)		\</div><div class='add'>+#define FOLIO_TYPE_OPS(lname, fname)					\</div><div class='add'>+static __always_inline bool folio_test_##fname(const struct folio *folio) \</div><div class='ctx'> {									\</div><div class='del'>-	return PageType(page, PG_##lname);				\</div><div class='add'>+	return data_race(folio-&gt;page.page_type &gt;&gt; 24) == PGTY_##lname;	\</div><div class='ctx'> }									\</div><div class='del'>-static __always_inline int folio_test_##fname(const struct folio *folio)\</div><div class='add'>+static __always_inline void __folio_set_##fname(struct folio *folio)	\</div><div class='ctx'> {									\</div><div class='del'>-	return folio_test_type(folio, PG_##lname);			\</div><div class='add'>+	if (folio_test_##fname(folio))					\</div><div class='add'>+		return;							\</div><div class='add'>+	VM_BUG_ON_FOLIO(data_race(folio-&gt;page.page_type) != UINT_MAX,	\</div><div class='add'>+			folio);						\</div><div class='add'>+	folio-&gt;page.page_type = (unsigned int)PGTY_##lname &lt;&lt; 24;	\</div><div class='ctx'> }									\</div><div class='del'>-static __always_inline void __SetPage##uname(struct page *page)		\</div><div class='add'>+static __always_inline void __folio_clear_##fname(struct folio *folio)	\</div><div class='add'>+{									\</div><div class='add'>+	if (folio-&gt;page.page_type == UINT_MAX)				\</div><div class='add'>+		return;							\</div><div class='add'>+	VM_BUG_ON_FOLIO(!folio_test_##fname(folio), folio);		\</div><div class='add'>+	folio-&gt;page.page_type = UINT_MAX;				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PAGE_TYPE_OPS(uname, lname, fname)				\</div><div class='add'>+FOLIO_TYPE_OPS(lname, fname)						\</div><div class='add'>+static __always_inline int Page##uname(const struct page *page)		\</div><div class='ctx'> {									\</div><div class='del'>-	VM_BUG_ON_PAGE(!PageType(page, 0), page);			\</div><div class='del'>-	page-&gt;page_type &amp;= ~PG_##lname;					\</div><div class='add'>+	return data_race(page-&gt;page_type &gt;&gt; 24) == PGTY_##lname;	\</div><div class='ctx'> }									\</div><div class='del'>-static __always_inline void __folio_set_##fname(struct folio *folio)	\</div><div class='add'>+static __always_inline void __SetPage##uname(struct page *page)		\</div><div class='ctx'> {									\</div><div class='del'>-	VM_BUG_ON_FOLIO(!folio_test_type(folio, 0), folio);		\</div><div class='del'>-	folio-&gt;page.page_type &amp;= ~PG_##lname;				\</div><div class='add'>+	if (Page##uname(page))						\</div><div class='add'>+		return;							\</div><div class='add'>+	VM_BUG_ON_PAGE(data_race(page-&gt;page_type) != UINT_MAX, page);	\</div><div class='add'>+	page-&gt;page_type = (unsigned int)PGTY_##lname &lt;&lt; 24;		\</div><div class='ctx'> }									\</div><div class='ctx'> static __always_inline void __ClearPage##uname(struct page *page)	\</div><div class='ctx'> {									\</div><div class='add'>+	if (page-&gt;page_type == UINT_MAX)				\</div><div class='add'>+		return;							\</div><div class='ctx'> 	VM_BUG_ON_PAGE(!Page##uname(page), page);			\</div><div class='del'>-	page-&gt;page_type |= PG_##lname;					\</div><div class='del'>-}									\</div><div class='del'>-static __always_inline void __folio_clear_##fname(struct folio *folio)	\</div><div class='del'>-{									\</div><div class='del'>-	VM_BUG_ON_FOLIO(!folio_test_##fname(folio), folio);		\</div><div class='del'>-	folio-&gt;page.page_type |= PG_##lname;				\</div><div class='del'>-}									\</div><div class='add'>+	page-&gt;page_type = UINT_MAX;					\</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PageBuddy() indicates that the page is free and in the buddy system</div><div class='hunk'>@@ -994,15 +1009,22 @@ PAGE_TYPE_OPS(Buddy, buddy, buddy)</div><div class='ctx'>  * The content of these pages is effectively stale. Such pages should not</div><div class='ctx'>  * be touched (read/write/dump/save) except by their owner.</div><div class='ctx'>  *</div><div class='add'>+ * When a memory block gets onlined, all pages are initialized with a</div><div class='add'>+ * refcount of 1 and PageOffline(). generic_online_page() will</div><div class='add'>+ * take care of clearing PageOffline().</div><div class='add'>+ *</div><div class='ctx'>  * If a driver wants to allow to offline unmovable PageOffline() pages without</div><div class='ctx'>  * putting them back to the buddy, it can do so via the memory notifier by</div><div class='ctx'>  * decrementing the reference count in MEM_GOING_OFFLINE and incrementing the</div><div class='ctx'>  * reference count in MEM_CANCEL_OFFLINE. When offlining, the PageOffline()</div><div class='del'>- * pages (now with a reference count of zero) are treated like free pages,</div><div class='del'>- * allowing the containing memory block to get offlined. A driver that</div><div class='add'>+ * pages (now with a reference count of zero) are treated like free (unmanaged)</div><div class='add'>+ * pages, allowing the containing memory block to get offlined. A driver that</div><div class='ctx'>  * relies on this feature is aware that re-onlining the memory block will</div><div class='del'>- * require to re-set the pages PageOffline() and not giving them to the</div><div class='del'>- * buddy via online_page_callback_t.</div><div class='add'>+ * require not giving them to the buddy via generic_online_page().</div><div class='add'>+ *</div><div class='add'>+ * Memory offlining code will not adjust the managed page count for any</div><div class='add'>+ * PageOffline() pages, treating them like they were never exposed to the</div><div class='add'>+ * buddy using generic_online_page().</div><div class='ctx'>  *</div><div class='ctx'>  * There are drivers that mark a page PageOffline() and expect there won't be</div><div class='ctx'>  * any further access to page content. PFN walkers that read content of random</div><div class='hunk'>@@ -1026,36 +1048,139 @@ PAGE_TYPE_OPS(Table, table, pgtable)</div><div class='ctx'>  */</div><div class='ctx'> PAGE_TYPE_OPS(Guard, guard, guard)</div><div class='ctx'> </div><div class='del'>-extern bool is_free_buddy_page(struct page *page);</div><div class='add'>+PAGE_TYPE_OPS(Slab, slab, slab)</div><div class='ctx'> </div><div class='del'>-PAGEFLAG(Isolated, isolated, PF_ANY);</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+FOLIO_TYPE_OPS(hugetlb, hugetlb)</div><div class='add'>+#else</div><div class='add'>+FOLIO_TEST_FLAG_FALSE(hugetlb)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+PAGE_TYPE_OPS(Zsmalloc, zsmalloc, zsmalloc)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mark pages that has to be accepted before touched for the first time.</div><div class='add'>+ *</div><div class='add'>+ * Serialized with zone lock.</div><div class='add'>+ */</div><div class='add'>+PAGE_TYPE_OPS(Unaccepted, unaccepted, unaccepted)</div><div class='add'>+PAGE_TYPE_OPS(LargeKmalloc, large_kmalloc, large_kmalloc)</div><div class='ctx'> </div><div class='del'>-static __always_inline int PageAnonExclusive(struct page *page)</div><div class='add'>+/**</div><div class='add'>+ * PageHuge - Determine if the page belongs to hugetlbfs</div><div class='add'>+ * @page: The page to test.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any context.</div><div class='add'>+ * Return: True for hugetlbfs pages, false for anon pages or pages</div><div class='add'>+ * belonging to other filesystems.</div><div class='add'>+ */</div><div class='add'>+static inline bool PageHuge(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return folio_test_hugetlb(page_folio(page));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if a page is currently marked HWPoisoned. Note that this check is</div><div class='add'>+ * best effort only and inherently racy: there is no way to synchronize with</div><div class='add'>+ * failing hardware.</div><div class='add'>+ */</div><div class='add'>+static inline bool is_page_hwpoison(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	const struct folio *folio;</div><div class='add'>+</div><div class='add'>+	if (PageHWPoison(page))</div><div class='add'>+		return true;</div><div class='add'>+	folio = page_folio(page);</div><div class='add'>+	return folio_test_hugetlb(folio) &amp;&amp; PageHWPoison(&amp;folio-&gt;page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool folio_contain_hwpoisoned_page(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	return folio_test_hwpoison(folio) ||</div><div class='add'>+	    (folio_test_large(folio) &amp;&amp; folio_test_has_hwpoisoned(folio));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool is_free_buddy_page(const struct page *page);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MIGRATION</div><div class='add'>+/*</div><div class='add'>+ * This page is migratable through movable_ops (for selected typed pages</div><div class='add'>+ * only).</div><div class='add'>+ *</div><div class='add'>+ * Page migration of such pages might fail, for example, if the page is</div><div class='add'>+ * already isolated by somebody else, or if the page is about to get freed.</div><div class='add'>+ *</div><div class='add'>+ * While a subsystem might set selected typed pages that support page migration</div><div class='add'>+ * as being movable through movable_ops, it must never clear this flag.</div><div class='add'>+ *</div><div class='add'>+ * This flag is only cleared when the page is freed back to the buddy.</div><div class='add'>+ *</div><div class='add'>+ * Only selected page types support this flag (see page_movable_ops()) and</div><div class='add'>+ * the flag might be used in other context for other pages. Always use</div><div class='add'>+ * page_has_movable_ops() instead.</div><div class='add'>+ */</div><div class='add'>+TESTPAGEFLAG(MovableOps, movable_ops, PF_NO_TAIL);</div><div class='add'>+SETPAGEFLAG(MovableOps, movable_ops, PF_NO_TAIL);</div><div class='add'>+/*</div><div class='add'>+ * A movable_ops page has this flag set while it is isolated for migration.</div><div class='add'>+ * This flag primarily protects against concurrent migration attempts.</div><div class='add'>+ *</div><div class='add'>+ * Once migration ended (success or failure), the flag is cleared. The</div><div class='add'>+ * flag is managed by the migration core.</div><div class='add'>+ */</div><div class='add'>+PAGEFLAG(MovableOpsIsolated, movable_ops_isolated, PF_NO_TAIL);</div><div class='add'>+#else /* !CONFIG_MIGRATION */</div><div class='add'>+TESTPAGEFLAG_FALSE(MovableOps, movable_ops);</div><div class='add'>+SETPAGEFLAG_NOOP(MovableOps, movable_ops);</div><div class='add'>+PAGEFLAG_FALSE(MovableOpsIsolated, movable_ops_isolated);</div><div class='add'>+#endif /* CONFIG_MIGRATION */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_has_movable_ops - test for a movable_ops page</div><div class='add'>+ * @page: The page to test.</div><div class='add'>+ *</div><div class='add'>+ * Test whether this is a movable_ops page. Such pages will stay that</div><div class='add'>+ * way until freed.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if this is a movable_ops page, otherwise false.</div><div class='add'>+ */</div><div class='add'>+static inline bool page_has_movable_ops(const struct page *page)</div><div class='add'>+{</div><div class='add'>+	return PageMovableOps(page) &amp;&amp;</div><div class='add'>+	       (PageOffline(page) || PageZsmalloc(page));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline int PageAnonExclusive(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON_PGFLAGS(!PageAnon(page), page);</div><div class='del'>-	VM_BUG_ON_PGFLAGS(PageHuge(page) &amp;&amp; !PageHead(page), page);</div><div class='del'>-	return test_bit(PG_anon_exclusive, &amp;PF_ANY(page, 1)-&gt;flags);</div><div class='add'>+	/*</div><div class='add'>+	 * HugeTLB stores this information on the head page; THP keeps it per</div><div class='add'>+	 * page</div><div class='add'>+	 */</div><div class='add'>+	if (PageHuge(page))</div><div class='add'>+		page = compound_head(page);</div><div class='add'>+	return test_bit(PG_anon_exclusive, &amp;PF_ANY(page, 1)-&gt;flags.f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline void SetPageAnonExclusive(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	VM_BUG_ON_PGFLAGS(!PageAnon(page) || PageKsm(page), page);</div><div class='add'>+	VM_BUG_ON_PGFLAGS(!PageAnonNotKsm(page), page);</div><div class='ctx'> 	VM_BUG_ON_PGFLAGS(PageHuge(page) &amp;&amp; !PageHead(page), page);</div><div class='del'>-	set_bit(PG_anon_exclusive, &amp;PF_ANY(page, 1)-&gt;flags);</div><div class='add'>+	set_bit(PG_anon_exclusive, &amp;PF_ANY(page, 1)-&gt;flags.f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline void ClearPageAnonExclusive(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	VM_BUG_ON_PGFLAGS(!PageAnon(page) || PageKsm(page), page);</div><div class='add'>+	VM_BUG_ON_PGFLAGS(!PageAnonNotKsm(page), page);</div><div class='ctx'> 	VM_BUG_ON_PGFLAGS(PageHuge(page) &amp;&amp; !PageHead(page), page);</div><div class='del'>-	clear_bit(PG_anon_exclusive, &amp;PF_ANY(page, 1)-&gt;flags);</div><div class='add'>+	clear_bit(PG_anon_exclusive, &amp;PF_ANY(page, 1)-&gt;flags.f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline void __ClearPageAnonExclusive(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	VM_BUG_ON_PGFLAGS(!PageAnon(page), page);</div><div class='ctx'> 	VM_BUG_ON_PGFLAGS(PageHuge(page) &amp;&amp; !PageHead(page), page);</div><div class='del'>-	__clear_bit(PG_anon_exclusive, &amp;PF_ANY(page, 1)-&gt;flags);</div><div class='add'>+	__clear_bit(PG_anon_exclusive, &amp;PF_ANY(page, 1)-&gt;flags.f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='hunk'>@@ -1072,7 +1197,7 @@ static __always_inline void __ClearPageAnonExclusive(struct page *page)</div><div class='ctx'> 	(1UL &lt;&lt; PG_lru		| 1UL &lt;&lt; PG_locked	|	\</div><div class='ctx'> 	 1UL &lt;&lt; PG_private	| 1UL &lt;&lt; PG_private_2	|	\</div><div class='ctx'> 	 1UL &lt;&lt; PG_writeback	| 1UL &lt;&lt; PG_reserved	|	\</div><div class='del'>-	 1UL &lt;&lt; PG_slab		| 1UL &lt;&lt; PG_active 	|	\</div><div class='add'>+	 1UL &lt;&lt; PG_active 	|				\</div><div class='ctx'> 	 1UL &lt;&lt; PG_unevictable	| __PG_MLOCKED | LRU_GEN_MASK)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1092,30 +1217,24 @@ static __always_inline void __ClearPageAnonExclusive(struct page *page)</div><div class='ctx'>  */</div><div class='ctx'> #define PAGE_FLAGS_SECOND						\</div><div class='ctx'> 	(0xffUL /* order */		| 1UL &lt;&lt; PG_has_hwpoisoned |	\</div><div class='del'>-	 1UL &lt;&lt; PG_hugetlb		| 1UL &lt;&lt; PG_large_rmappable)</div><div class='add'>+	 1UL &lt;&lt; PG_large_rmappable	| 1UL &lt;&lt; PG_partially_mapped)</div><div class='ctx'> </div><div class='ctx'> #define PAGE_FLAGS_PRIVATE				\</div><div class='ctx'> 	(1UL &lt;&lt; PG_private | 1UL &lt;&lt; PG_private_2)</div><div class='ctx'> /**</div><div class='del'>- * page_has_private - Determine if page has private stuff</div><div class='del'>- * @page: The page to be checked</div><div class='add'>+ * folio_has_private - Determine if folio has private stuff</div><div class='add'>+ * @folio: The folio to be checked</div><div class='ctx'>  *</div><div class='del'>- * Determine if a page has private stuff, indicating that release routines</div><div class='add'>+ * Determine if a folio has private stuff, indicating that release routines</div><div class='ctx'>  * should be invoked upon it.</div><div class='ctx'>  */</div><div class='del'>-static inline int page_has_private(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return !!(page-&gt;flags &amp; PAGE_FLAGS_PRIVATE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool folio_has_private(struct folio *folio)</div><div class='add'>+static inline int folio_has_private(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return page_has_private(&amp;folio-&gt;page);</div><div class='add'>+	return !!(folio-&gt;flags.f &amp; PAGE_FLAGS_PRIVATE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #undef PF_ANY</div><div class='ctx'> #undef PF_HEAD</div><div class='del'>-#undef PF_ONLY_HEAD</div><div class='ctx'> #undef PF_NO_TAIL</div><div class='ctx'> #undef PF_NO_COMPOUND</div><div class='ctx'> #undef PF_SECOND</div><div class='head'>diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h<br/>index 4ac34392823a..3e2f960e166c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page-isolation.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page-isolation.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page-isolation.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page-isolation.h</a></div><div class='hunk'>@@ -3,10 +3,6 @@</div><div class='ctx'> #define __LINUX_PAGEISOLATION_H</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMORY_ISOLATION</div><div class='del'>-static inline bool has_isolate_pageblock(struct zone *zone)</div><div class='del'>-{</div><div class='del'>-	return zone-&gt;nr_isolate_pageblock;</div><div class='del'>-}</div><div class='ctx'> static inline bool is_migrate_isolate_page(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return get_pageblock_migratetype(page) == MIGRATE_ISOLATE;</div><div class='hunk'>@@ -15,34 +11,60 @@ static inline bool is_migrate_isolate(int migratetype)</div><div class='ctx'> {</div><div class='ctx'> 	return migratetype == MIGRATE_ISOLATE;</div><div class='ctx'> }</div><div class='add'>+#define get_pageblock_isolate(page) \</div><div class='add'>+	get_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate)</div><div class='add'>+#define clear_pageblock_isolate(page) \</div><div class='add'>+	clear_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate)</div><div class='add'>+#define set_pageblock_isolate(page) \</div><div class='add'>+	set_pfnblock_bit(page, page_to_pfn(page), PB_migrate_isolate)</div><div class='ctx'> #else</div><div class='del'>-static inline bool has_isolate_pageblock(struct zone *zone)</div><div class='add'>+static inline bool is_migrate_isolate_page(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-static inline bool is_migrate_isolate_page(struct page *page)</div><div class='add'>+static inline bool is_migrate_isolate(int migratetype)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='del'>-static inline bool is_migrate_isolate(int migratetype)</div><div class='add'>+static inline bool get_pageblock_isolate(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='add'>+static inline void clear_pageblock_isolate(struct page *page)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void set_pageblock_isolate(struct page *page)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define MEMORY_OFFLINE	0x1</div><div class='del'>-#define REPORT_FAILURE	0x2</div><div class='add'>+/*</div><div class='add'>+ * Pageblock isolation modes:</div><div class='add'>+ * PB_ISOLATE_MODE_MEM_OFFLINE - isolate to offline (!allocate) memory</div><div class='add'>+ *				 e.g., skip over PageHWPoison() pages and</div><div class='add'>+ *				 PageOffline() pages. Unmovable pages will be</div><div class='add'>+ *				 reported in this mode.</div><div class='add'>+ * PB_ISOLATE_MODE_CMA_ALLOC   - isolate for CMA allocations</div><div class='add'>+ * PB_ISOLATE_MODE_OTHER       - isolate for other purposes</div><div class='add'>+ */</div><div class='add'>+enum pb_isolate_mode {</div><div class='add'>+	PB_ISOLATE_MODE_MEM_OFFLINE,</div><div class='add'>+	PB_ISOLATE_MODE_CMA_ALLOC,</div><div class='add'>+	PB_ISOLATE_MODE_OTHER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __meminit init_pageblock_migratetype(struct page *page,</div><div class='add'>+					  enum migratetype migratetype,</div><div class='add'>+					  bool isolate);</div><div class='ctx'> </div><div class='del'>-void set_pageblock_migratetype(struct page *page, int migratetype);</div><div class='del'>-int move_freepages_block(struct zone *zone, struct page *page,</div><div class='del'>-				int migratetype, int *num_movable);</div><div class='add'>+bool pageblock_isolate_and_move_free_pages(struct zone *zone, struct page *page);</div><div class='add'>+bool pageblock_unisolate_and_move_free_pages(struct zone *zone, struct page *page);</div><div class='ctx'> </div><div class='ctx'> int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,</div><div class='del'>-			     int migratetype, int flags, gfp_t gfp_flags);</div><div class='add'>+			     enum pb_isolate_mode mode);</div><div class='ctx'> </div><div class='del'>-void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,</div><div class='del'>-			     int migratetype);</div><div class='add'>+void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn);</div><div class='ctx'> </div><div class='ctx'> int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,</div><div class='del'>-			int isol_flags);</div><div class='add'>+			enum pb_isolate_mode mode);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/page_counter.h b/include/linux/page_counter.h<br/>index c141ea9a95ef..d649b6bbbc87 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page_counter.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_counter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page_counter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page_counter.h</a></div><div class='hunk'>@@ -4,15 +4,17 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct page_counter {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Make sure 'usage' does not share cacheline with any other field. The</div><div class='del'>-	 * memcg-&gt;memory.usage is a hot member of struct mem_cgroup.</div><div class='add'>+	 * Make sure 'usage' does not share cacheline with any other field in</div><div class='add'>+	 * v2. The memcg-&gt;memory.usage is a hot member of struct mem_cgroup.</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_long_t usage;</div><div class='add'>+	unsigned long failcnt; /* v1-only field */</div><div class='add'>+</div><div class='ctx'> 	CACHELINE_PADDING(_pad1_);</div><div class='ctx'> </div><div class='ctx'> 	/* effective memory.min and memory.min usage tracking */</div><div class='hunk'>@@ -26,11 +28,14 @@ struct page_counter {</div><div class='ctx'> 	atomic_long_t children_low_usage;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long watermark;</div><div class='del'>-	unsigned long failcnt;</div><div class='add'>+	/* Latest cg2 reset watermark */</div><div class='add'>+	unsigned long local_watermark;</div><div class='ctx'> </div><div class='ctx'> 	/* Keep all the read most fields in a separete cacheline. */</div><div class='ctx'> 	CACHELINE_PADDING(_pad2_);</div><div class='ctx'> </div><div class='add'>+	bool protection_support;</div><div class='add'>+	bool track_failcnt;</div><div class='ctx'> 	unsigned long min;</div><div class='ctx'> 	unsigned long low;</div><div class='ctx'> 	unsigned long high;</div><div class='hunk'>@@ -44,12 +49,18 @@ struct page_counter {</div><div class='ctx'> #define PAGE_COUNTER_MAX (LONG_MAX / PAGE_SIZE)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Protection is supported only for the first counter (with id 0).</div><div class='add'>+ */</div><div class='ctx'> static inline void page_counter_init(struct page_counter *counter,</div><div class='del'>-				     struct page_counter *parent)</div><div class='add'>+				     struct page_counter *parent,</div><div class='add'>+				     bool protection_support)</div><div class='ctx'> {</div><div class='del'>-	atomic_long_set(&amp;counter-&gt;usage, 0);</div><div class='add'>+	counter-&gt;usage = (atomic_long_t)ATOMIC_LONG_INIT(0);</div><div class='ctx'> 	counter-&gt;max = PAGE_COUNTER_MAX;</div><div class='ctx'> 	counter-&gt;parent = parent;</div><div class='add'>+	counter-&gt;protection_support = protection_support;</div><div class='add'>+	counter-&gt;track_failcnt = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long page_counter_read(struct page_counter *counter)</div><div class='hunk'>@@ -78,7 +89,24 @@ int page_counter_memparse(const char *buf, const char *max,</div><div class='ctx'> </div><div class='ctx'> static inline void page_counter_reset_watermark(struct page_counter *counter)</div><div class='ctx'> {</div><div class='del'>-	counter-&gt;watermark = page_counter_read(counter);</div><div class='add'>+	unsigned long usage = page_counter_read(counter);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Update local_watermark first, so it's always &lt;= watermark</div><div class='add'>+	 * (modulo CPU/compiler re-ordering)</div><div class='add'>+	 */</div><div class='add'>+	counter-&gt;local_watermark = usage;</div><div class='add'>+	counter-&gt;watermark = usage;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_MEMCG) || IS_ENABLED(CONFIG_CGROUP_DMEM)</div><div class='add'>+void page_counter_calculate_protection(struct page_counter *root,</div><div class='add'>+				       struct page_counter *counter,</div><div class='add'>+				       bool recursive_protection);</div><div class='add'>+#else</div><div class='add'>+static inline void page_counter_calculate_protection(struct page_counter *root,</div><div class='add'>+						     struct page_counter *counter,</div><div class='add'>+						     bool recursive_protection) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_PAGE_COUNTER_H */</div><div class='head'>diff --git a/include/linux/page_ext.h b/include/linux/page_ext.h<br/>index be98564191e6..76c817162d2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page_ext.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_ext.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page_ext.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page_ext.h</a></div><div class='hunk'>@@ -3,8 +3,8 @@</div><div class='ctx'> #define __LINUX_PAGE_EXT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;linux/stacktrace.h&gt;</div><div class='del'>-#include &lt;linux/stackdepot.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pglist_data;</div><div class='ctx'> </div><div class='hunk'>@@ -70,16 +70,31 @@ extern void page_ext_init(void);</div><div class='ctx'> static inline void page_ext_init_flatmem_late(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline bool page_ext_iter_next_fast_possible(unsigned long next_pfn)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * page_ext is allocated per memory section. Once we cross a</div><div class='add'>+	 * memory section, we have to fetch the new pointer.</div><div class='add'>+	 */</div><div class='add'>+	return next_pfn % PAGES_PER_SECTION;</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> extern void page_ext_init_flatmem(void);</div><div class='ctx'> extern void page_ext_init_flatmem_late(void);</div><div class='ctx'> static inline void page_ext_init(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline bool page_ext_iter_next_fast_possible(unsigned long next_pfn)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct page_ext *page_ext_get(struct page *page);</div><div class='add'>+extern struct page_ext *page_ext_get(const struct page *page);</div><div class='ctx'> extern void page_ext_put(struct page_ext *page_ext);</div><div class='add'>+extern struct page_ext *page_ext_lookup(unsigned long pfn);</div><div class='ctx'> </div><div class='ctx'> static inline void *page_ext_data(struct page_ext *page_ext,</div><div class='ctx'> 				  struct page_ext_operations *ops)</div><div class='hunk'>@@ -94,6 +109,83 @@ static inline struct page_ext *page_ext_next(struct page_ext *curr)</div><div class='ctx'> 	return next;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct page_ext_iter {</div><div class='add'>+	unsigned long index;</div><div class='add'>+	unsigned long start_pfn;</div><div class='add'>+	struct page_ext *page_ext;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_ext_iter_begin() - Prepare for iterating through page extensions.</div><div class='add'>+ * @iter: page extension iterator.</div><div class='add'>+ * @pfn: PFN of the page we're interested in.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with RCU read lock taken.</div><div class='add'>+ *</div><div class='add'>+ * Return: NULL if no page_ext exists for this page.</div><div class='add'>+ */</div><div class='add'>+static inline struct page_ext *page_ext_iter_begin(struct page_ext_iter *iter,</div><div class='add'>+						unsigned long pfn)</div><div class='add'>+{</div><div class='add'>+	iter-&gt;index = 0;</div><div class='add'>+	iter-&gt;start_pfn = pfn;</div><div class='add'>+	iter-&gt;page_ext = page_ext_lookup(pfn);</div><div class='add'>+</div><div class='add'>+	return iter-&gt;page_ext;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_ext_iter_next() - Get next page extension</div><div class='add'>+ * @iter: page extension iterator.</div><div class='add'>+ *</div><div class='add'>+ * Must be called with RCU read lock taken.</div><div class='add'>+ *</div><div class='add'>+ * Return: NULL if no next page_ext exists.</div><div class='add'>+ */</div><div class='add'>+static inline struct page_ext *page_ext_iter_next(struct page_ext_iter *iter)</div><div class='add'>+{</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(!iter-&gt;page_ext))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	iter-&gt;index++;</div><div class='add'>+	pfn = iter-&gt;start_pfn + iter-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (page_ext_iter_next_fast_possible(pfn))</div><div class='add'>+		iter-&gt;page_ext = page_ext_next(iter-&gt;page_ext);</div><div class='add'>+	else</div><div class='add'>+		iter-&gt;page_ext = page_ext_lookup(pfn);</div><div class='add'>+</div><div class='add'>+	return iter-&gt;page_ext;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * page_ext_iter_get() - Get current page extension</div><div class='add'>+ * @iter: page extension iterator.</div><div class='add'>+ *</div><div class='add'>+ * Return: NULL if no page_ext exists for this iterator.</div><div class='add'>+ */</div><div class='add'>+static inline struct page_ext *page_ext_iter_get(const struct page_ext_iter *iter)</div><div class='add'>+{</div><div class='add'>+	return iter-&gt;page_ext;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * for_each_page_ext(): iterate through page_ext objects.</div><div class='add'>+ * @__page: the page we're interested in</div><div class='add'>+ * @__pgcount: how many pages to iterate through</div><div class='add'>+ * @__page_ext: struct page_ext pointer where the current page_ext</div><div class='add'>+ *              object is returned</div><div class='add'>+ * @__iter: struct page_ext_iter object (defined in the stack)</div><div class='add'>+ *</div><div class='add'>+ * IMPORTANT: must be called with RCU read lock taken.</div><div class='add'>+ */</div><div class='add'>+#define for_each_page_ext(__page, __pgcount, __page_ext, __iter) \</div><div class='add'>+	for (__page_ext = page_ext_iter_begin(&amp;__iter, page_to_pfn(__page));\</div><div class='add'>+		__page_ext &amp;&amp; __iter.index &lt; __pgcount;          \</div><div class='add'>+		__page_ext = page_ext_iter_next(&amp;__iter))</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_PAGE_EXTENSION */</div><div class='ctx'> struct page_ext;</div><div class='ctx'> </div><div class='hunk'>@@ -118,7 +210,7 @@ static inline void page_ext_init_flatmem(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct page_ext *page_ext_get(struct page *page)</div><div class='add'>+static inline struct page_ext *page_ext_get(const struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/page_frag_cache.h b/include/linux/page_frag_cache.h<br/>new file mode 100644<br/>index 000000000000..41a91df82631<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page_frag_cache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page_frag_cache.h</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_PAGE_FRAG_CACHE_H</div><div class='add'>+#define _LINUX_PAGE_FRAG_CACHE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+#include &lt;linux/mm_types_task.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#if (PAGE_SIZE &lt; PAGE_FRAG_CACHE_MAX_SIZE)</div><div class='add'>+/* Use a full byte here to enable assembler optimization as the shift</div><div class='add'>+ * operation is usually expecting a byte.</div><div class='add'>+ */</div><div class='add'>+#define PAGE_FRAG_CACHE_ORDER_MASK		GENMASK(7, 0)</div><div class='add'>+#else</div><div class='add'>+/* Compiler should be able to figure out we don't read things as any value</div><div class='add'>+ * ANDed with 0 is 0.</div><div class='add'>+ */</div><div class='add'>+#define PAGE_FRAG_CACHE_ORDER_MASK		0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define PAGE_FRAG_CACHE_PFMEMALLOC_BIT		(PAGE_FRAG_CACHE_ORDER_MASK + 1)</div><div class='add'>+</div><div class='add'>+static inline bool encoded_page_decode_pfmemalloc(unsigned long encoded_page)</div><div class='add'>+{</div><div class='add'>+	return !!(encoded_page &amp; PAGE_FRAG_CACHE_PFMEMALLOC_BIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void page_frag_cache_init(struct page_frag_cache *nc)</div><div class='add'>+{</div><div class='add'>+	nc-&gt;encoded_page = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool page_frag_cache_is_pfmemalloc(struct page_frag_cache *nc)</div><div class='add'>+{</div><div class='add'>+	return encoded_page_decode_pfmemalloc(nc-&gt;encoded_page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void page_frag_cache_drain(struct page_frag_cache *nc);</div><div class='add'>+void __page_frag_cache_drain(struct page *page, unsigned int count);</div><div class='add'>+void *__page_frag_alloc_align(struct page_frag_cache *nc, unsigned int fragsz,</div><div class='add'>+			      gfp_t gfp_mask, unsigned int align_mask);</div><div class='add'>+</div><div class='add'>+static inline void *page_frag_alloc_align(struct page_frag_cache *nc,</div><div class='add'>+					  unsigned int fragsz, gfp_t gfp_mask,</div><div class='add'>+					  unsigned int align)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!is_power_of_2(align));</div><div class='add'>+	return __page_frag_alloc_align(nc, fragsz, gfp_mask, -align);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *page_frag_alloc(struct page_frag_cache *nc,</div><div class='add'>+				    unsigned int fragsz, gfp_t gfp_mask)</div><div class='add'>+{</div><div class='add'>+	return __page_frag_alloc_align(nc, fragsz, gfp_mask, ~0u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void page_frag_free(void *addr);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/page_idle.h b/include/linux/page_idle.h<br/>index d8f344840643..89ca0d5dc1e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page_idle.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_idle.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page_idle.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page_idle.h</a></div><div class='hunk'>@@ -6,14 +6,12 @@</div><div class='ctx'> #include &lt;linux/page-flags.h&gt;</div><div class='ctx'> #include &lt;linux/page_ext.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PAGE_IDLE_FLAG</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_64BIT</div><div class='add'>+#if defined(CONFIG_PAGE_IDLE_FLAG) &amp;&amp; !defined(CONFIG_64BIT)</div><div class='ctx'> /*</div><div class='ctx'>  * If there is not enough space to store Idle and Young bits in page flags, use</div><div class='ctx'>  * page ext flags instead.</div><div class='ctx'>  */</div><div class='del'>-static inline bool folio_test_young(struct folio *folio)</div><div class='add'>+static inline bool folio_test_young(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct page_ext *page_ext = page_ext_get(&amp;folio-&gt;page);</div><div class='ctx'> 	bool page_young;</div><div class='hunk'>@@ -52,7 +50,7 @@ static inline bool folio_test_clear_young(struct folio *folio)</div><div class='ctx'> 	return page_young;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool folio_test_idle(struct folio *folio)</div><div class='add'>+static inline bool folio_test_idle(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	struct page_ext *page_ext = page_ext_get(&amp;folio-&gt;page);</div><div class='ctx'> 	bool page_idle;</div><div class='hunk'>@@ -60,7 +58,7 @@ static inline bool folio_test_idle(struct folio *folio)</div><div class='ctx'> 	if (unlikely(!page_ext))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	page_idle =  test_bit(PAGE_EXT_IDLE, &amp;page_ext-&gt;flags);</div><div class='add'>+	page_idle = test_bit(PAGE_EXT_IDLE, &amp;page_ext-&gt;flags);</div><div class='ctx'> 	page_ext_put(page_ext);</div><div class='ctx'> </div><div class='ctx'> 	return page_idle;</div><div class='hunk'>@@ -87,61 +85,5 @@ static inline void folio_clear_idle(struct folio *folio)</div><div class='ctx'> 	clear_bit(PAGE_EXT_IDLE, &amp;page_ext-&gt;flags);</div><div class='ctx'> 	page_ext_put(page_ext);</div><div class='ctx'> }</div><div class='del'>-#endif /* !CONFIG_64BIT */</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_PAGE_IDLE_FLAG */</div><div class='del'>-</div><div class='del'>-static inline bool folio_test_young(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void folio_set_young(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool folio_test_clear_young(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool folio_test_idle(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void folio_set_idle(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void folio_clear_idle(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PAGE_IDLE_FLAG */</div><div class='del'>-</div><div class='del'>-static inline bool page_is_young(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_test_young(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_page_young(struct page *page)</div><div class='del'>-{</div><div class='del'>-	folio_set_young(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool test_and_clear_page_young(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_test_clear_young(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool page_is_idle(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_test_idle(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_page_idle(struct page *page)</div><div class='del'>-{</div><div class='del'>-	folio_set_idle(page_folio(page));</div><div class='del'>-}</div><div class='add'>+#endif /* CONFIG_PAGE_IDLE_FLAG &amp;&amp; !64BIT */</div><div class='ctx'> #endif /* _LINUX_MM_PAGE_IDLE_H */</div><div class='head'>diff --git a/include/linux/page_owner.h b/include/linux/page_owner.h<br/>index 119a0c9d2a8b..3328357f6dba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page_owner.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_owner.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page_owner.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page_owner.h</a></div><div class='hunk'>@@ -11,9 +11,10 @@ extern struct page_ext_operations page_owner_ops;</div><div class='ctx'> extern void __reset_page_owner(struct page *page, unsigned short order);</div><div class='ctx'> extern void __set_page_owner(struct page *page,</div><div class='ctx'> 			unsigned short order, gfp_t gfp_mask);</div><div class='del'>-extern void __split_page_owner(struct page *page, unsigned int nr);</div><div class='add'>+extern void __split_page_owner(struct page *page, int old_order,</div><div class='add'>+			int new_order);</div><div class='ctx'> extern void __folio_copy_owner(struct folio *newfolio, struct folio *old);</div><div class='del'>-extern void __set_page_owner_migrate_reason(struct page *page, int reason);</div><div class='add'>+extern void __folio_set_owner_migrate_reason(struct folio *folio, int reason);</div><div class='ctx'> extern void __dump_page_owner(const struct page *page);</div><div class='ctx'> extern void pagetypeinfo_showmixedcount_print(struct seq_file *m,</div><div class='ctx'> 					pg_data_t *pgdat, struct zone *zone);</div><div class='hunk'>@@ -31,20 +32,21 @@ static inline void set_page_owner(struct page *page,</div><div class='ctx'> 		__set_page_owner(page, order, gfp_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void split_page_owner(struct page *page, unsigned int nr)</div><div class='add'>+static inline void split_page_owner(struct page *page, int old_order,</div><div class='add'>+			int new_order)</div><div class='ctx'> {</div><div class='ctx'> 	if (static_branch_unlikely(&amp;page_owner_inited))</div><div class='del'>-		__split_page_owner(page, nr);</div><div class='add'>+		__split_page_owner(page, old_order, new_order);</div><div class='ctx'> }</div><div class='ctx'> static inline void folio_copy_owner(struct folio *newfolio, struct folio *old)</div><div class='ctx'> {</div><div class='ctx'> 	if (static_branch_unlikely(&amp;page_owner_inited))</div><div class='ctx'> 		__folio_copy_owner(newfolio, old);</div><div class='ctx'> }</div><div class='del'>-static inline void set_page_owner_migrate_reason(struct page *page, int reason)</div><div class='add'>+static inline void folio_set_owner_migrate_reason(struct folio *folio, int reason)</div><div class='ctx'> {</div><div class='ctx'> 	if (static_branch_unlikely(&amp;page_owner_inited))</div><div class='del'>-		__set_page_owner_migrate_reason(page, reason);</div><div class='add'>+		__folio_set_owner_migrate_reason(folio, reason);</div><div class='ctx'> }</div><div class='ctx'> static inline void dump_page_owner(const struct page *page)</div><div class='ctx'> {</div><div class='hunk'>@@ -56,17 +58,17 @@ static inline void reset_page_owner(struct page *page, unsigned short order)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void set_page_owner(struct page *page,</div><div class='del'>-			unsigned int order, gfp_t gfp_mask)</div><div class='add'>+			unsigned short order, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline void split_page_owner(struct page *page,</div><div class='del'>-			unsigned short order)</div><div class='add'>+static inline void split_page_owner(struct page *page, int old_order,</div><div class='add'>+			int new_order)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline void set_page_owner_migrate_reason(struct page *page, int reason)</div><div class='add'>+static inline void folio_set_owner_migrate_reason(struct folio *folio, int reason)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void dump_page_owner(const struct page *page)</div><div class='head'>diff --git a/include/linux/page_ref.h b/include/linux/page_ref.h<br/>index d7c2d33baa7f..544150d1d5fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page_ref.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_ref.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page_ref.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page_ref.h</a></div><div class='hunk'>@@ -139,20 +139,15 @@ static inline void folio_ref_sub(struct folio *folio, int nr)</div><div class='ctx'> 	page_ref_sub(&amp;folio-&gt;page, nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int page_ref_sub_return(struct page *page, int nr)</div><div class='add'>+static inline int folio_ref_sub_return(struct folio *folio, int nr)</div><div class='ctx'> {</div><div class='del'>-	int ret = atomic_sub_return(nr, &amp;page-&gt;_refcount);</div><div class='add'>+	int ret = atomic_sub_return(nr, &amp;folio-&gt;_refcount);</div><div class='ctx'> </div><div class='ctx'> 	if (page_ref_tracepoint_active(page_ref_mod_and_return))</div><div class='del'>-		__page_ref_mod_and_return(page, -nr, ret);</div><div class='add'>+		__page_ref_mod_and_return(&amp;folio-&gt;page, -nr, ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int folio_ref_sub_return(struct folio *folio, int nr)</div><div class='del'>-{</div><div class='del'>-	return page_ref_sub_return(&amp;folio-&gt;page, nr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void page_ref_inc(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;page-&gt;_refcount);</div><div class='hunk'>@@ -235,7 +230,13 @@ static inline int folio_ref_dec_return(struct folio *folio)</div><div class='ctx'> </div><div class='ctx'> static inline bool page_ref_add_unless(struct page *page, int nr, int u)</div><div class='ctx'> {</div><div class='del'>-	bool ret = atomic_add_unless(&amp;page-&gt;_refcount, nr, u);</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	/* avoid writing to the vmemmap area being remapped */</div><div class='add'>+	if (page_count_writable(page, u))</div><div class='add'>+		ret = atomic_add_unless(&amp;page-&gt;_refcount, nr, u);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (page_ref_tracepoint_active(page_ref_mod_unless))</div><div class='ctx'> 		__page_ref_mod_unless(page, nr, ret);</div><div class='hunk'>@@ -263,54 +264,9 @@ static inline bool folio_try_get(struct folio *folio)</div><div class='ctx'> 	return folio_ref_add_unless(folio, 1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool folio_ref_try_add_rcu(struct folio *folio, int count)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_TINY_RCU</div><div class='del'>-	/*</div><div class='del'>-	 * The caller guarantees the folio will not be freed from interrupt</div><div class='del'>-	 * context, so (on !SMP) we only need preemption to be disabled</div><div class='del'>-	 * and TINY_RCU does that for us.</div><div class='del'>-	 */</div><div class='del'>-# ifdef CONFIG_PREEMPT_COUNT</div><div class='del'>-	VM_BUG_ON(!in_atomic() &amp;&amp; !irqs_disabled());</div><div class='del'>-# endif</div><div class='del'>-	VM_BUG_ON_FOLIO(folio_ref_count(folio) == 0, folio);</div><div class='del'>-	folio_ref_add(folio, count);</div><div class='del'>-#else</div><div class='del'>-	if (unlikely(!folio_ref_add_unless(folio, count, 0))) {</div><div class='del'>-		/* Either the folio has been freed, or will be freed. */</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * folio_try_get_rcu - Attempt to increase the refcount on a folio.</div><div class='del'>- * @folio: The folio.</div><div class='del'>- *</div><div class='del'>- * This is a version of folio_try_get() optimised for non-SMP kernels.</div><div class='del'>- * If you are still holding the rcu_read_lock() after looking up the</div><div class='del'>- * page and know that the page cannot have its refcount decreased to</div><div class='del'>- * zero in interrupt context, you can use this instead of folio_try_get().</div><div class='del'>- *</div><div class='del'>- * Example users include get_user_pages_fast() (as pages are not unmapped</div><div class='del'>- * from interrupt context) and the page cache lookups (as pages are not</div><div class='del'>- * truncated from interrupt context).  We also know that pages are not</div><div class='del'>- * frozen in interrupt context for the purposes of splitting or migration.</div><div class='del'>- *</div><div class='del'>- * You can also use this function if you're holding a lock that prevents</div><div class='del'>- * pages being frozen &amp; removed; eg the i_pages lock for the page cache</div><div class='del'>- * or the mmap_lock or page table lock for page tables.  In this case,</div><div class='del'>- * it will always succeed, and you could have used a plain folio_get(),</div><div class='del'>- * but it's sometimes more convenient to have a common function called</div><div class='del'>- * from both locked and RCU-protected contexts.</div><div class='del'>- *</div><div class='del'>- * Return: True if the reference count was successfully incremented.</div><div class='del'>- */</div><div class='del'>-static inline bool folio_try_get_rcu(struct folio *folio)</div><div class='add'>+static inline bool folio_ref_try_add(struct folio *folio, int count)</div><div class='ctx'> {</div><div class='del'>-	return folio_ref_try_add_rcu(folio, 1);</div><div class='add'>+	return folio_ref_add_unless(folio, count, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int page_ref_freeze(struct page *page, int count)</div><div class='head'>diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h<br/>index 6722941c7cb8..289620d4aad3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/page_table_check.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/page_table_check.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/page_table_check.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/page_table_check.h</a></div><div class='hunk'>@@ -19,8 +19,10 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd);</div><div class='ctx'> void __page_table_check_pud_clear(struct mm_struct *mm, pud_t pud);</div><div class='ctx'> void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte,</div><div class='ctx'> 		unsigned int nr);</div><div class='del'>-void __page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd);</div><div class='del'>-void __page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, pud_t pud);</div><div class='add'>+void __page_table_check_pmds_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd,</div><div class='add'>+		unsigned int nr);</div><div class='add'>+void __page_table_check_puds_set(struct mm_struct *mm, pud_t *pudp, pud_t pud,</div><div class='add'>+		unsigned int nr);</div><div class='ctx'> void __page_table_check_pte_clear_range(struct mm_struct *mm,</div><div class='ctx'> 					unsigned long addr,</div><div class='ctx'> 					pmd_t pmd);</div><div class='hunk'>@@ -74,22 +76,22 @@ static inline void page_table_check_ptes_set(struct mm_struct *mm,</div><div class='ctx'> 	__page_table_check_ptes_set(mm, ptep, pte, nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp,</div><div class='del'>-					    pmd_t pmd)</div><div class='add'>+static inline void page_table_check_pmds_set(struct mm_struct *mm,</div><div class='add'>+		pmd_t *pmdp, pmd_t pmd, unsigned int nr)</div><div class='ctx'> {</div><div class='ctx'> 	if (static_branch_likely(&amp;page_table_check_disabled))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	__page_table_check_pmd_set(mm, pmdp, pmd);</div><div class='add'>+	__page_table_check_pmds_set(mm, pmdp, pmd, nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp,</div><div class='del'>-					    pud_t pud)</div><div class='add'>+static inline void page_table_check_puds_set(struct mm_struct *mm,</div><div class='add'>+		pud_t *pudp, pud_t pud, unsigned int nr)</div><div class='ctx'> {</div><div class='ctx'> 	if (static_branch_likely(&amp;page_table_check_disabled))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	__page_table_check_pud_set(mm, pudp, pud);</div><div class='add'>+	__page_table_check_puds_set(mm, pudp, pud, nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void page_table_check_pte_clear_range(struct mm_struct *mm,</div><div class='hunk'>@@ -129,13 +131,13 @@ static inline void page_table_check_ptes_set(struct mm_struct *mm,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp,</div><div class='del'>-					    pmd_t pmd)</div><div class='add'>+static inline void page_table_check_pmds_set(struct mm_struct *mm,</div><div class='add'>+		pmd_t *pmdp, pmd_t pmd, unsigned int nr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp,</div><div class='del'>-					    pud_t pud)</div><div class='add'>+static inline void page_table_check_puds_set(struct mm_struct *mm,</div><div class='add'>+		pud_t *pudp, pud_t pud, unsigned int nr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -146,4 +148,8 @@ static inline void page_table_check_pte_clear_range(struct mm_struct *mm,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PAGE_TABLE_CHECK */</div><div class='add'>+</div><div class='add'>+#define page_table_check_pmd_set(mm, pmdp, pmd)	page_table_check_pmds_set(mm, pmdp, pmd, 1)</div><div class='add'>+#define page_table_check_pud_set(mm, pudp, pud)	page_table_check_puds_set(mm, pudp, pud, 1)</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_PAGE_TABLE_CHECK_H */</div><div class='head'>diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h<br/>index 3f2409b968ec..e046278a01fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pageblock-flags.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pageblock-flags.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pageblock-flags.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pageblock-flags.h</a></div><div class='hunk'>@@ -13,22 +13,38 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PB_migratetype_bits 3</div><div class='ctx'> /* Bit indices that affect a whole block of pages */</div><div class='ctx'> enum pageblock_bits {</div><div class='del'>-	PB_migrate,</div><div class='del'>-	PB_migrate_end = PB_migrate + PB_migratetype_bits - 1,</div><div class='del'>-			/* 3 bits required for migrate types */</div><div class='del'>-	PB_migrate_skip,/* If set the block is skipped by compaction */</div><div class='add'>+	PB_migrate_0,</div><div class='add'>+	PB_migrate_1,</div><div class='add'>+	PB_migrate_2,</div><div class='add'>+	PB_compact_skip,/* If set the block is skipped by compaction */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEMORY_ISOLATION</div><div class='add'>+	/*</div><div class='add'>+	 * Pageblock isolation is represented with a separate bit, so that</div><div class='add'>+	 * the migratetype of a block is not overwritten by isolation.</div><div class='add'>+	 */</div><div class='add'>+	PB_migrate_isolate, /* If set the block is isolated */</div><div class='add'>+#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Assume the bits will always align on a word. If this assumption</div><div class='ctx'> 	 * changes then get/set pageblock needs updating.</div><div class='ctx'> 	 */</div><div class='del'>-	NR_PAGEBLOCK_BITS</div><div class='add'>+	__NR_PAGEBLOCK_BITS</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HUGETLB_PAGE</div><div class='add'>+#define NR_PAGEBLOCK_BITS (roundup_pow_of_two(__NR_PAGEBLOCK_BITS))</div><div class='add'>+</div><div class='add'>+#define MIGRATETYPE_MASK (BIT(PB_migrate_0)|BIT(PB_migrate_1)|BIT(PB_migrate_2))</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMORY_ISOLATION</div><div class='add'>+#define MIGRATETYPE_AND_ISO_MASK (MIGRATETYPE_MASK | BIT(PB_migrate_isolate))</div><div class='add'>+#else</div><div class='add'>+#define MIGRATETYPE_AND_ISO_MASK MIGRATETYPE_MASK</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_HUGETLB_PAGE)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE</div><div class='ctx'> </div><div class='hunk'>@@ -41,14 +57,18 @@ extern unsigned int pageblock_order;</div><div class='ctx'>  * Huge pages are a constant size, but don't exceed the maximum allocation</div><div class='ctx'>  * granularity.</div><div class='ctx'>  */</div><div class='del'>-#define pageblock_order		min_t(unsigned int, HUGETLB_PAGE_ORDER, MAX_PAGE_ORDER)</div><div class='add'>+#define pageblock_order		MIN_T(unsigned int, HUGETLB_PAGE_ORDER, PAGE_BLOCK_MAX_ORDER)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */</div><div class='ctx'> </div><div class='del'>-#else /* CONFIG_HUGETLB_PAGE */</div><div class='add'>+#elif defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='add'>+</div><div class='add'>+#define pageblock_order		MIN_T(unsigned int, HPAGE_PMD_ORDER, PAGE_BLOCK_MAX_ORDER)</div><div class='ctx'> </div><div class='del'>-/* If huge pages are not used, group by MAX_ORDER_NR_PAGES */</div><div class='del'>-#define pageblock_order		MAX_PAGE_ORDER</div><div class='add'>+#else /* CONFIG_TRANSPARENT_HUGEPAGE */</div><div class='add'>+</div><div class='add'>+/* If huge pages are not used, group by PAGE_BLOCK_MAX_ORDER */</div><div class='add'>+#define pageblock_order		PAGE_BLOCK_MAX_ORDER</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='hunk'>@@ -61,27 +81,23 @@ extern unsigned int pageblock_order;</div><div class='ctx'> /* Forward declaration */</div><div class='ctx'> struct page;</div><div class='ctx'> </div><div class='del'>-unsigned long get_pfnblock_flags_mask(const struct page *page,</div><div class='del'>-				unsigned long pfn,</div><div class='del'>-				unsigned long mask);</div><div class='del'>-</div><div class='del'>-void set_pfnblock_flags_mask(struct page *page,</div><div class='del'>-				unsigned long flags,</div><div class='del'>-				unsigned long pfn,</div><div class='del'>-				unsigned long mask);</div><div class='add'>+enum migratetype get_pfnblock_migratetype(const struct page *page,</div><div class='add'>+					  unsigned long pfn);</div><div class='add'>+bool get_pfnblock_bit(const struct page *page, unsigned long pfn,</div><div class='add'>+		      enum pageblock_bits pb_bit);</div><div class='add'>+void set_pfnblock_bit(const struct page *page, unsigned long pfn,</div><div class='add'>+		      enum pageblock_bits pb_bit);</div><div class='add'>+void clear_pfnblock_bit(const struct page *page, unsigned long pfn,</div><div class='add'>+			enum pageblock_bits pb_bit);</div><div class='ctx'> </div><div class='ctx'> /* Declarations for getting and setting flags. See mm/page_alloc.c */</div><div class='ctx'> #ifdef CONFIG_COMPACTION</div><div class='ctx'> #define get_pageblock_skip(page) \</div><div class='del'>-	get_pfnblock_flags_mask(page, page_to_pfn(page),	\</div><div class='del'>-			(1 &lt;&lt; (PB_migrate_skip)))</div><div class='add'>+	get_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip)</div><div class='ctx'> #define clear_pageblock_skip(page) \</div><div class='del'>-	set_pfnblock_flags_mask(page, 0, page_to_pfn(page),	\</div><div class='del'>-			(1 &lt;&lt; PB_migrate_skip))</div><div class='add'>+	clear_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip)</div><div class='ctx'> #define set_pageblock_skip(page) \</div><div class='del'>-	set_pfnblock_flags_mask(page, (1 &lt;&lt; PB_migrate_skip),	\</div><div class='del'>-			page_to_pfn(page),			\</div><div class='del'>-			(1 &lt;&lt; PB_migrate_skip))</div><div class='add'>+	set_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip)</div><div class='ctx'> #else</div><div class='ctx'> static inline bool get_pageblock_skip(struct page *page)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h<br/>index 2df35e65557d..31a848485ad9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pagemap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pagemap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pagemap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pagemap.h</a></div><div class='hunk'>@@ -32,14 +32,19 @@ int invalidate_inode_pages2_range(struct address_space *mapping,</div><div class='ctx'> 		pgoff_t start, pgoff_t end);</div><div class='ctx'> int kiocb_invalidate_pages(struct kiocb *iocb, size_t count);</div><div class='ctx'> void kiocb_invalidate_post_direct_write(struct kiocb *iocb, size_t count);</div><div class='add'>+int filemap_invalidate_pages(struct address_space *mapping,</div><div class='add'>+			     loff_t pos, loff_t end, bool nowait);</div><div class='ctx'> </div><div class='ctx'> int write_inode_now(struct inode *, int sync);</div><div class='ctx'> int filemap_fdatawrite(struct address_space *);</div><div class='ctx'> int filemap_flush(struct address_space *);</div><div class='add'>+int filemap_flush_nr(struct address_space *mapping, long *nr_to_write);</div><div class='ctx'> int filemap_fdatawait_keep_errors(struct address_space *mapping);</div><div class='ctx'> int filemap_fdatawait_range(struct address_space *, loff_t lstart, loff_t lend);</div><div class='ctx'> int filemap_fdatawait_range_keep_errors(struct address_space *mapping,</div><div class='ctx'> 		loff_t start_byte, loff_t end_byte);</div><div class='add'>+int filemap_invalidate_inode(struct inode *inode, bool flush,</div><div class='add'>+			     loff_t start, loff_t end);</div><div class='ctx'> </div><div class='ctx'> static inline int filemap_fdatawait(struct address_space *mapping)</div><div class='ctx'> {</div><div class='hunk'>@@ -49,14 +54,10 @@ static inline int filemap_fdatawait(struct address_space *mapping)</div><div class='ctx'> bool filemap_range_has_page(struct address_space *, loff_t lstart, loff_t lend);</div><div class='ctx'> int filemap_write_and_wait_range(struct address_space *mapping,</div><div class='ctx'> 		loff_t lstart, loff_t lend);</div><div class='del'>-int __filemap_fdatawrite_range(struct address_space *mapping,</div><div class='del'>-		loff_t start, loff_t end, int sync_mode);</div><div class='ctx'> int filemap_fdatawrite_range(struct address_space *mapping,</div><div class='ctx'> 		loff_t start, loff_t end);</div><div class='ctx'> int filemap_check_errors(struct address_space *mapping);</div><div class='ctx'> void __filemap_set_wb_err(struct address_space *mapping, int err);</div><div class='del'>-int filemap_fdatawrite_wbc(struct address_space *mapping,</div><div class='del'>-			   struct writeback_control *wbc);</div><div class='ctx'> int kiocb_write_and_wait(struct kiocb *iocb, size_t count);</div><div class='ctx'> </div><div class='ctx'> static inline int filemap_write_and_wait(struct address_space *mapping)</div><div class='hunk'>@@ -136,7 +137,7 @@ static inline int inode_drain_writes(struct inode *inode)</div><div class='ctx'> 	return filemap_write_and_wait(inode-&gt;i_mapping);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool mapping_empty(struct address_space *mapping)</div><div class='add'>+static inline bool mapping_empty(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return xa_empty(&amp;mapping-&gt;i_pages);</div><div class='ctx'> }</div><div class='hunk'>@@ -162,7 +163,7 @@ static inline bool mapping_empty(struct address_space *mapping)</div><div class='ctx'>  * refcount and the referenced bit, which will be elevated or set in</div><div class='ctx'>  * the process of adding new cache pages to an inode.</div><div class='ctx'>  */</div><div class='del'>-static inline bool mapping_shrinkable(struct address_space *mapping)</div><div class='add'>+static inline bool mapping_shrinkable(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	void *head;</div><div class='ctx'> </div><div class='hunk'>@@ -202,13 +203,24 @@ enum mapping_flags {</div><div class='ctx'> 	AS_EXITING	= 4, 	/* final truncate in progress */</div><div class='ctx'> 	/* writeback related tags are not used */</div><div class='ctx'> 	AS_NO_WRITEBACK_TAGS = 5,</div><div class='del'>-	AS_LARGE_FOLIO_SUPPORT = 6,</div><div class='del'>-	AS_RELEASE_ALWAYS,	/* Call -&gt;release_folio(), even if no private data */</div><div class='del'>-	AS_STABLE_WRITES,	/* must wait for writeback before modifying</div><div class='add'>+	AS_RELEASE_ALWAYS = 6,	/* Call -&gt;release_folio(), even if no private data */</div><div class='add'>+	AS_STABLE_WRITES = 7,	/* must wait for writeback before modifying</div><div class='ctx'> 				   folio contents */</div><div class='del'>-	AS_UNMOVABLE,		/* The mapping cannot be moved, ever */</div><div class='add'>+	AS_INACCESSIBLE = 8,	/* Do not attempt direct R/W access to the mapping */</div><div class='add'>+	AS_WRITEBACK_MAY_DEADLOCK_ON_RECLAIM = 9,</div><div class='add'>+	AS_KERNEL_FILE = 10,	/* mapping for a fake kernel file that shouldn't</div><div class='add'>+				   account usage to user cgroups */</div><div class='add'>+	/* Bits 16-25 are used for FOLIO_ORDER */</div><div class='add'>+	AS_FOLIO_ORDER_BITS = 5,</div><div class='add'>+	AS_FOLIO_ORDER_MIN = 16,</div><div class='add'>+	AS_FOLIO_ORDER_MAX = AS_FOLIO_ORDER_MIN + AS_FOLIO_ORDER_BITS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define AS_FOLIO_ORDER_BITS_MASK ((1u &lt;&lt; AS_FOLIO_ORDER_BITS) - 1)</div><div class='add'>+#define AS_FOLIO_ORDER_MIN_MASK (AS_FOLIO_ORDER_BITS_MASK &lt;&lt; AS_FOLIO_ORDER_MIN)</div><div class='add'>+#define AS_FOLIO_ORDER_MAX_MASK (AS_FOLIO_ORDER_BITS_MASK &lt;&lt; AS_FOLIO_ORDER_MAX)</div><div class='add'>+#define AS_FOLIO_ORDER_MASK (AS_FOLIO_ORDER_MIN_MASK | AS_FOLIO_ORDER_MAX_MASK)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * mapping_set_error - record a writeback error in the address_space</div><div class='ctx'>  * @mapping: the mapping in which an error should be set</div><div class='hunk'>@@ -252,7 +264,7 @@ static inline void mapping_clear_unevictable(struct address_space *mapping)</div><div class='ctx'> 	clear_bit(AS_UNEVICTABLE, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool mapping_unevictable(struct address_space *mapping)</div><div class='add'>+static inline bool mapping_unevictable(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return mapping &amp;&amp; test_bit(AS_UNEVICTABLE, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -262,7 +274,7 @@ static inline void mapping_set_exiting(struct address_space *mapping)</div><div class='ctx'> 	set_bit(AS_EXITING, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int mapping_exiting(struct address_space *mapping)</div><div class='add'>+static inline int mapping_exiting(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return test_bit(AS_EXITING, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -272,7 +284,7 @@ static inline void mapping_set_no_writeback_tags(struct address_space *mapping)</div><div class='ctx'> 	set_bit(AS_NO_WRITEBACK_TAGS, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int mapping_use_writeback_tags(struct address_space *mapping)</div><div class='add'>+static inline int mapping_use_writeback_tags(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return !test_bit(AS_NO_WRITEBACK_TAGS, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -307,29 +319,39 @@ static inline void mapping_clear_stable_writes(struct address_space *mapping)</div><div class='ctx'> 	clear_bit(AS_STABLE_WRITES, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mapping_set_unmovable(struct address_space *mapping)</div><div class='add'>+static inline void mapping_set_inaccessible(struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	 * It's expected unmovable mappings are also unevictable. Compaction</div><div class='add'>+	 * It's expected inaccessible mappings are also unevictable. Compaction</div><div class='ctx'> 	 * migrate scanner (isolate_migratepages_block()) relies on this to</div><div class='ctx'> 	 * reduce page locking.</div><div class='ctx'> 	 */</div><div class='ctx'> 	set_bit(AS_UNEVICTABLE, &amp;mapping-&gt;flags);</div><div class='del'>-	set_bit(AS_UNMOVABLE, &amp;mapping-&gt;flags);</div><div class='add'>+	set_bit(AS_INACCESSIBLE, &amp;mapping-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mapping_inaccessible(const struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	return test_bit(AS_INACCESSIBLE, &amp;mapping-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mapping_set_writeback_may_deadlock_on_reclaim(struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	set_bit(AS_WRITEBACK_MAY_DEADLOCK_ON_RECLAIM, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool mapping_unmovable(struct address_space *mapping)</div><div class='add'>+static inline bool mapping_writeback_may_deadlock_on_reclaim(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(AS_UNMOVABLE, &amp;mapping-&gt;flags);</div><div class='add'>+	return test_bit(AS_WRITEBACK_MAY_DEADLOCK_ON_RECLAIM, &amp;mapping-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline gfp_t mapping_gfp_mask(struct address_space * mapping)</div><div class='add'>+static inline gfp_t mapping_gfp_mask(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return mapping-&gt;gfp_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Restricts the given gfp_mask to what the mapping allows. */</div><div class='del'>-static inline gfp_t mapping_gfp_constraint(struct address_space *mapping,</div><div class='add'>+static inline gfp_t mapping_gfp_constraint(const struct address_space *mapping,</div><div class='ctx'> 		gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	return mapping_gfp_mask(mapping) &amp; gfp_mask;</div><div class='hunk'>@@ -344,9 +366,84 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)</div><div class='ctx'> 	m-&gt;gfp_mask = mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * There are some parts of the kernel which assume that PMD entries</div><div class='add'>+ * are exactly HPAGE_PMD_ORDER.  Those should be fixed, but until then,</div><div class='add'>+ * limit the maximum allocation order to PMD size.  I'm not aware of any</div><div class='add'>+ * assumptions about maximum order if THP are disabled, but 8 seems like</div><div class='add'>+ * a good order (that's 1MB if you're using 4kB pages)</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+#define PREFERRED_MAX_PAGECACHE_ORDER	HPAGE_PMD_ORDER</div><div class='add'>+#else</div><div class='add'>+#define PREFERRED_MAX_PAGECACHE_ORDER	8</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * xas_split_alloc() does not support arbitrary orders. This implies no</div><div class='add'>+ * 512MB THP on ARM64 with 64KB base page size.</div><div class='add'>+ */</div><div class='add'>+#define MAX_XAS_ORDER		(XA_CHUNK_SHIFT * 2 - 1)</div><div class='add'>+#define MAX_PAGECACHE_ORDER	min(MAX_XAS_ORDER, PREFERRED_MAX_PAGECACHE_ORDER)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mapping_max_folio_size_supported() - Check the max folio size supported</div><div class='add'>+ *</div><div class='add'>+ * The filesystem should call this function at mount time if there is a</div><div class='add'>+ * requirement on the folio mapping size in the page cache.</div><div class='add'>+ */</div><div class='add'>+static inline size_t mapping_max_folio_size_supported(void)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE))</div><div class='add'>+		return 1U &lt;&lt; (PAGE_SHIFT + MAX_PAGECACHE_ORDER);</div><div class='add'>+	return PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mapping_set_folio_order_range() - Set the orders supported by a file.</div><div class='add'>+ * @mapping: The address space of the file.</div><div class='add'>+ * @min: Minimum folio order (between 0-MAX_PAGECACHE_ORDER inclusive).</div><div class='add'>+ * @max: Maximum folio order (between @min-MAX_PAGECACHE_ORDER inclusive).</div><div class='add'>+ *</div><div class='add'>+ * The filesystem should call this function in its inode constructor to</div><div class='add'>+ * indicate which base size (min) and maximum size (max) of folio the VFS</div><div class='add'>+ * can use to cache the contents of the file.  This should only be used</div><div class='add'>+ * if the filesystem needs special handling of folio sizes (ie there is</div><div class='add'>+ * something the core cannot know).</div><div class='add'>+ * Do not tune it based on, eg, i_size.</div><div class='add'>+ *</div><div class='add'>+ * Context: This should not be called while the inode is active as it</div><div class='add'>+ * is non-atomic.</div><div class='add'>+ */</div><div class='add'>+static inline void mapping_set_folio_order_range(struct address_space *mapping,</div><div class='add'>+						 unsigned int min,</div><div class='add'>+						 unsigned int max)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (min &gt; MAX_PAGECACHE_ORDER)</div><div class='add'>+		min = MAX_PAGECACHE_ORDER;</div><div class='add'>+</div><div class='add'>+	if (max &gt; MAX_PAGECACHE_ORDER)</div><div class='add'>+		max = MAX_PAGECACHE_ORDER;</div><div class='add'>+</div><div class='add'>+	if (max &lt; min)</div><div class='add'>+		max = min;</div><div class='add'>+</div><div class='add'>+	mapping-&gt;flags = (mapping-&gt;flags &amp; ~AS_FOLIO_ORDER_MASK) |</div><div class='add'>+		(min &lt;&lt; AS_FOLIO_ORDER_MIN) | (max &lt;&lt; AS_FOLIO_ORDER_MAX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mapping_set_folio_min_order(struct address_space *mapping,</div><div class='add'>+					       unsigned int min)</div><div class='add'>+{</div><div class='add'>+	mapping_set_folio_order_range(mapping, min, MAX_PAGECACHE_ORDER);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * mapping_set_large_folios() - Indicate the file supports large folios.</div><div class='del'>- * @mapping: The file.</div><div class='add'>+ * @mapping: The address space of the file.</div><div class='ctx'>  *</div><div class='ctx'>  * The filesystem should call this function in its inode constructor to</div><div class='ctx'>  * indicate that the VFS can use large folios to cache the contents of</div><div class='hunk'>@@ -357,20 +454,72 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)</div><div class='ctx'>  */</div><div class='ctx'> static inline void mapping_set_large_folios(struct address_space *mapping)</div><div class='ctx'> {</div><div class='del'>-	__set_bit(AS_LARGE_FOLIO_SUPPORT, &amp;mapping-&gt;flags);</div><div class='add'>+	mapping_set_folio_order_range(mapping, 0, MAX_PAGECACHE_ORDER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+mapping_max_folio_order(const struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE))</div><div class='add'>+		return 0;</div><div class='add'>+	return (mapping-&gt;flags &amp; AS_FOLIO_ORDER_MAX_MASK) &gt;&gt; AS_FOLIO_ORDER_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+mapping_min_folio_order(const struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE))</div><div class='add'>+		return 0;</div><div class='add'>+	return (mapping-&gt;flags &amp; AS_FOLIO_ORDER_MIN_MASK) &gt;&gt; AS_FOLIO_ORDER_MIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+mapping_min_folio_nrpages(const struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	return 1UL &lt;&lt; mapping_min_folio_order(mapping);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+mapping_min_folio_nrbytes(const struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	return mapping_min_folio_nrpages(mapping) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mapping_align_index() - Align index for this mapping.</div><div class='add'>+ * @mapping: The address_space.</div><div class='add'>+ * @index: The page index.</div><div class='add'>+ *</div><div class='add'>+ * The index of a folio must be naturally aligned.  If you are adding a</div><div class='add'>+ * new folio to the page cache and need to know what index to give it,</div><div class='add'>+ * call this function.</div><div class='add'>+ */</div><div class='add'>+static inline pgoff_t mapping_align_index(const struct address_space *mapping,</div><div class='add'>+					  pgoff_t index)</div><div class='add'>+{</div><div class='add'>+	return round_down(index, mapping_min_folio_nrpages(mapping));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Large folio support currently depends on THP.  These dependencies are</div><div class='ctx'>  * being worked on but are not yet fixed.</div><div class='ctx'>  */</div><div class='del'>-static inline bool mapping_large_folio_support(struct address_space *mapping)</div><div class='add'>+static inline bool mapping_large_folio_support(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='del'>-	return IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) &amp;&amp;</div><div class='del'>-		test_bit(AS_LARGE_FOLIO_SUPPORT, &amp;mapping-&gt;flags);</div><div class='add'>+	/* AS_FOLIO_ORDER is only reasonable for pagecache folios */</div><div class='add'>+	VM_WARN_ONCE((unsigned long)mapping &amp; FOLIO_MAPPING_ANON,</div><div class='add'>+			"Anonymous mapping always supports large folio");</div><div class='add'>+</div><div class='add'>+	return mapping_max_folio_order(mapping) &gt; 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int filemap_nr_thps(struct address_space *mapping)</div><div class='add'>+/* Return the maximum folio size for this pagecache mapping, in bytes. */</div><div class='add'>+static inline size_t mapping_max_folio_size(const struct address_space *mapping)</div><div class='add'>+{</div><div class='add'>+	return PAGE_SIZE &lt;&lt; mapping_max_folio_order(mapping);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int filemap_nr_thps(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_READ_ONLY_THP_FOR_FS</div><div class='ctx'> 	return atomic_read(&amp;mapping-&gt;nr_thps);</div><div class='hunk'>@@ -399,29 +548,7 @@ static inline void filemap_nr_thps_dec(struct address_space *mapping)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space *page_mapping(struct page *);</div><div class='del'>-struct address_space *folio_mapping(struct folio *);</div><div class='del'>-struct address_space *swapcache_mapping(struct folio *);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * folio_file_mapping - Find the mapping this folio belongs to.</div><div class='del'>- * @folio: The folio.</div><div class='del'>- *</div><div class='del'>- * For folios which are in the page cache, return the mapping that this</div><div class='del'>- * page belongs to.  Folios in the swap cache return the mapping of the</div><div class='del'>- * swap file or swap device where the data is stored.  This is different</div><div class='del'>- * from the mapping returned by folio_mapping().  The only reason to</div><div class='del'>- * use it is if, like NFS, you return 0 from -&gt;activate_swapfile.</div><div class='del'>- *</div><div class='del'>- * Do not call this for folios which aren't in the page cache or swap cache.</div><div class='del'>- */</div><div class='del'>-static inline struct address_space *folio_file_mapping(struct folio *folio)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(folio_test_swapcache(folio)))</div><div class='del'>-		return swapcache_mapping(folio);</div><div class='del'>-</div><div class='del'>-	return folio-&gt;mapping;</div><div class='del'>-}</div><div class='add'>+struct address_space *folio_mapping(const struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * folio_flush_mapping - Find the file mapping this folio belongs to.</div><div class='hunk'>@@ -443,11 +570,6 @@ static inline struct address_space *folio_flush_mapping(struct folio *folio)</div><div class='ctx'> 	return folio_mapping(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct address_space *page_file_mapping(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_file_mapping(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * folio_inode - Get the host inode for this folio.</div><div class='ctx'>  * @folio: The folio.</div><div class='hunk'>@@ -528,36 +650,23 @@ static inline void *detach_page_private(struct page *page)</div><div class='ctx'> 	return folio_detach_private(page_folio(page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * There are some parts of the kernel which assume that PMD entries</div><div class='del'>- * are exactly HPAGE_PMD_ORDER.  Those should be fixed, but until then,</div><div class='del'>- * limit the maximum allocation order to PMD size.  I'm not aware of any</div><div class='del'>- * assumptions about maximum order if THP are disabled, but 8 seems like</div><div class='del'>- * a good order (that's 1MB if you're using 4kB pages)</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='del'>-#define MAX_PAGECACHE_ORDER	HPAGE_PMD_ORDER</div><div class='del'>-#else</div><div class='del'>-#define MAX_PAGECACHE_ORDER	8</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='del'>-struct folio *filemap_alloc_folio(gfp_t gfp, unsigned int order);</div><div class='add'>+struct folio *filemap_alloc_folio_noprof(gfp_t gfp, unsigned int order,</div><div class='add'>+		struct mempolicy *policy);</div><div class='ctx'> #else</div><div class='del'>-static inline struct folio *filemap_alloc_folio(gfp_t gfp, unsigned int order)</div><div class='add'>+static inline struct folio *filemap_alloc_folio_noprof(gfp_t gfp, unsigned int order,</div><div class='add'>+		struct mempolicy *policy)</div><div class='ctx'> {</div><div class='del'>-	return folio_alloc(gfp, order);</div><div class='add'>+	return folio_alloc_noprof(gfp, order);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline struct page *__page_cache_alloc(gfp_t gfp)</div><div class='del'>-{</div><div class='del'>-	return &amp;filemap_alloc_folio(gfp, 0)-&gt;page;</div><div class='del'>-}</div><div class='add'>+#define filemap_alloc_folio(...)				\</div><div class='add'>+	alloc_hooks(filemap_alloc_folio_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-static inline struct page *page_cache_alloc(struct address_space *x)</div><div class='add'>+static inline struct page *__page_cache_alloc(gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	return __page_cache_alloc(mapping_gfp_mask(x));</div><div class='add'>+	return &amp;filemap_alloc_folio(gfp, 0, NULL)-&gt;page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline gfp_t readahead_gfp_mask(struct address_space *x)</div><div class='hunk'>@@ -593,6 +702,7 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping,</div><div class='ctx'>  * * %FGP_NOFS - __GFP_FS will get cleared in gfp.</div><div class='ctx'>  * * %FGP_NOWAIT - Don't block on the folio lock.</div><div class='ctx'>  * * %FGP_STABLE - Wait for the folio to be stable (finished writeback)</div><div class='add'>+ * * %FGP_DONTCACHE - Uncached buffered IO</div><div class='ctx'>  * * %FGP_WRITEBEGIN - The flags to use in a filesystem write_begin()</div><div class='ctx'>  *   implementation.</div><div class='ctx'>  */</div><div class='hunk'>@@ -606,10 +716,21 @@ typedef unsigned int __bitwise fgf_t;</div><div class='ctx'> #define FGP_NOWAIT		((__force fgf_t)0x00000020)</div><div class='ctx'> #define FGP_FOR_MMAP		((__force fgf_t)0x00000040)</div><div class='ctx'> #define FGP_STABLE		((__force fgf_t)0x00000080)</div><div class='add'>+#define FGP_DONTCACHE		((__force fgf_t)0x00000100)</div><div class='ctx'> #define FGF_GET_ORDER(fgf)	(((__force unsigned)fgf) &gt;&gt; 26)	/* top 6 bits */</div><div class='ctx'> </div><div class='ctx'> #define FGP_WRITEBEGIN		(FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE)</div><div class='ctx'> </div><div class='add'>+static inline unsigned int filemap_get_order(size_t size)</div><div class='add'>+{</div><div class='add'>+	unsigned int shift = ilog2(size);</div><div class='add'>+</div><div class='add'>+	if (shift &lt;= PAGE_SHIFT)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return shift - PAGE_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * fgf_set_order - Encode a length in the fgf_t flags.</div><div class='ctx'>  * @size: The suggested size of the folio to create.</div><div class='hunk'>@@ -623,19 +744,52 @@ typedef unsigned int __bitwise fgf_t;</div><div class='ctx'>  */</div><div class='ctx'> static inline fgf_t fgf_set_order(size_t size)</div><div class='ctx'> {</div><div class='del'>-	unsigned int shift = ilog2(size);</div><div class='add'>+	unsigned int order = filemap_get_order(size);</div><div class='ctx'> </div><div class='del'>-	if (shift &lt;= PAGE_SHIFT)</div><div class='add'>+	if (!order)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return (__force fgf_t)((shift - PAGE_SHIFT) &lt;&lt; 26);</div><div class='add'>+	return (__force fgf_t)(order &lt;&lt; 26);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void *filemap_get_entry(struct address_space *mapping, pgoff_t index);</div><div class='del'>-struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index,</div><div class='del'>-		fgf_t fgp_flags, gfp_t gfp);</div><div class='add'>+struct folio *__filemap_get_folio_mpol(struct address_space *mapping,</div><div class='add'>+		pgoff_t index, fgf_t fgf_flags, gfp_t gfp, struct mempolicy *policy);</div><div class='ctx'> struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index,</div><div class='ctx'> 		fgf_t fgp_flags, gfp_t gfp);</div><div class='ctx'> </div><div class='add'>+static inline struct folio *__filemap_get_folio(struct address_space *mapping,</div><div class='add'>+		pgoff_t index, fgf_t fgf_flags, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return __filemap_get_folio_mpol(mapping, index, fgf_flags, gfp, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * write_begin_get_folio - Get folio for write_begin with flags.</div><div class='add'>+ * @iocb: The kiocb passed from write_begin (may be NULL).</div><div class='add'>+ * @mapping: The address space to search.</div><div class='add'>+ * @index: The page cache index.</div><div class='add'>+ * @len: Length of data being written.</div><div class='add'>+ *</div><div class='add'>+ * This is a helper for filesystem write_begin() implementations.</div><div class='add'>+ * It wraps __filemap_get_folio(), setting appropriate flags in</div><div class='add'>+ * the write begin context.</div><div class='add'>+ *</div><div class='add'>+ * Return: A folio or an ERR_PTR.</div><div class='add'>+ */</div><div class='add'>+static inline struct folio *write_begin_get_folio(const struct kiocb *iocb,</div><div class='add'>+		  struct address_space *mapping, pgoff_t index, size_t len)</div><div class='add'>+{</div><div class='add'>+        fgf_t fgp_flags = FGP_WRITEBEGIN;</div><div class='add'>+</div><div class='add'>+        fgp_flags |= fgf_set_order(len);</div><div class='add'>+</div><div class='add'>+        if (iocb &amp;&amp; iocb-&gt;ki_flags &amp; IOCB_DONTCACHE)</div><div class='add'>+                fgp_flags |= FGP_DONTCACHE;</div><div class='add'>+</div><div class='add'>+        return __filemap_get_folio(mapping, index, fgp_flags,</div><div class='add'>+                                   mapping_gfp_mask(mapping));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * filemap_get_folio - Find and get a folio.</div><div class='ctx'>  * @mapping: The address_space to search.</div><div class='hunk'>@@ -764,7 +918,8 @@ static inline struct page *find_or_create_page(struct address_space *mapping,</div><div class='ctx'>  * @mapping: target address_space</div><div class='ctx'>  * @index: the page index</div><div class='ctx'>  *</div><div class='del'>- * Same as grab_cache_page(), but do not wait if the page is unavailable.</div><div class='add'>+ * Returns locked page at given index in given cache, creating it if</div><div class='add'>+ * needed, but do not wait if the page is locked or to reclaim memory.</div><div class='ctx'>  * This is intended for speculative data generators, where the data can</div><div class='ctx'>  * be regenerated if the page couldn't be grabbed.  This routine should</div><div class='ctx'>  * be safe to call while holding the lock for another page.</div><div class='hunk'>@@ -780,35 +935,26 @@ static inline struct page *grab_cache_page_nowait(struct address_space *mapping,</div><div class='ctx'> 			mapping_gfp_mask(mapping));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define swapcache_index(folio)	__page_file_index(&amp;(folio)-&gt;page)</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * folio_index - File index of a folio.</div><div class='del'>- * @folio: The folio.</div><div class='del'>- *</div><div class='del'>- * For a folio which is either in the page cache or the swap cache,</div><div class='del'>- * return its index within the address_space it belongs to.  If you know</div><div class='del'>- * the page is definitely in the page cache, you can look at the folio's</div><div class='del'>- * index directly.</div><div class='add'>+ * folio_next_index - Get the index of the next folio.</div><div class='add'>+ * @folio: The current folio.</div><div class='ctx'>  *</div><div class='del'>- * Return: The index (offset in units of pages) of a folio in its file.</div><div class='add'>+ * Return: The index of the folio which follows this folio in the file.</div><div class='ctx'>  */</div><div class='del'>-static inline pgoff_t folio_index(struct folio *folio)</div><div class='add'>+static inline pgoff_t folio_next_index(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-        if (unlikely(folio_test_swapcache(folio)))</div><div class='del'>-                return swapcache_index(folio);</div><div class='del'>-        return folio-&gt;index;</div><div class='add'>+	return folio-&gt;index + folio_nr_pages(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * folio_next_index - Get the index of the next folio.</div><div class='add'>+ * folio_next_pos - Get the file position of the next folio.</div><div class='ctx'>  * @folio: The current folio.</div><div class='ctx'>  *</div><div class='del'>- * Return: The index of the folio which follows this folio in the file.</div><div class='add'>+ * Return: The position of the folio which follows this folio in the file.</div><div class='ctx'>  */</div><div class='del'>-static inline pgoff_t folio_next_index(struct folio *folio)</div><div class='add'>+static inline loff_t folio_next_pos(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return folio-&gt;index + folio_nr_pages(folio);</div><div class='add'>+	return (loff_t)folio_next_index(folio) &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -831,27 +977,14 @@ static inline struct page *folio_file_page(struct folio *folio, pgoff_t index)</div><div class='ctx'>  * @folio: The folio.</div><div class='ctx'>  * @index: The page index within the file.</div><div class='ctx'>  *</div><div class='del'>- * Context: The caller should have the page locked in order to prevent</div><div class='del'>- * (eg) shmem from moving the page between the page cache and swap cache</div><div class='del'>- * and changing its index in the middle of the operation.</div><div class='add'>+ * Context: The caller should have the folio locked and ensure</div><div class='add'>+ * e.g., shmem did not move this folio to the swap cache.</div><div class='ctx'>  * Return: true or false.</div><div class='ctx'>  */</div><div class='del'>-static inline bool folio_contains(struct folio *folio, pgoff_t index)</div><div class='add'>+static inline bool folio_contains(const struct folio *folio, pgoff_t index)</div><div class='ctx'> {</div><div class='del'>-	return index - folio_index(folio) &lt; folio_nr_pages(folio);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Given the page we found in the page cache, return the page corresponding</div><div class='del'>- * to this index in the file</div><div class='del'>- */</div><div class='del'>-static inline struct page *find_subpage(struct page *head, pgoff_t index)</div><div class='del'>-{</div><div class='del'>-	/* HugeTLBfs wants the head page regardless */</div><div class='del'>-	if (PageHuge(head))</div><div class='del'>-		return head;</div><div class='del'>-</div><div class='del'>-	return head + (index &amp; (thp_nr_pages(head) - 1));</div><div class='add'>+	VM_WARN_ON_ONCE_FOLIO(folio_test_swapcache(folio), folio);</div><div class='add'>+	return index - folio-&gt;index &lt; folio_nr_pages(folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned filemap_get_folios(struct address_space *mapping, pgoff_t *start,</div><div class='hunk'>@@ -860,18 +993,8 @@ unsigned filemap_get_folios_contig(struct address_space *mapping,</div><div class='ctx'> 		pgoff_t *start, pgoff_t end, struct folio_batch *fbatch);</div><div class='ctx'> unsigned filemap_get_folios_tag(struct address_space *mapping, pgoff_t *start,</div><div class='ctx'> 		pgoff_t end, xa_mark_t tag, struct folio_batch *fbatch);</div><div class='del'>-</div><div class='del'>-struct page *grab_cache_page_write_begin(struct address_space *mapping,</div><div class='del'>-			pgoff_t index);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Returns locked page at given index in given cache, creating it if needed.</div><div class='del'>- */</div><div class='del'>-static inline struct page *grab_cache_page(struct address_space *mapping,</div><div class='del'>-								pgoff_t index)</div><div class='del'>-{</div><div class='del'>-	return find_or_create_page(mapping, index, mapping_gfp_mask(mapping));</div><div class='del'>-}</div><div class='add'>+unsigned filemap_get_folios_dirty(struct address_space *mapping,</div><div class='add'>+		pgoff_t *start, pgoff_t end, struct folio_batch *fbatch);</div><div class='ctx'> </div><div class='ctx'> struct folio *read_cache_folio(struct address_space *, pgoff_t index,</div><div class='ctx'> 		filler_t *filler, struct file *file);</div><div class='hunk'>@@ -894,68 +1017,56 @@ static inline struct folio *read_mapping_folio(struct address_space *mapping,</div><div class='ctx'> 	return read_cache_folio(mapping, index, NULL, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Get the offset in PAGE_SIZE (even for hugetlb pages).</div><div class='del'>- */</div><div class='del'>-static inline pgoff_t page_to_pgoff(struct page *page)</div><div class='del'>-{</div><div class='del'>-	struct page *head;</div><div class='del'>-</div><div class='del'>-	if (likely(!PageTransTail(page)))</div><div class='del'>-		return page-&gt;index;</div><div class='del'>-</div><div class='del'>-	head = compound_head(page);</div><div class='del'>-	/*</div><div class='del'>-	 *  We don't initialize -&gt;index for tail pages: calculate based on</div><div class='del'>-	 *  head page</div><div class='del'>-	 */</div><div class='del'>-	return head-&gt;index + page - head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Return byte-offset into filesystem object for page.</div><div class='add'>+/**</div><div class='add'>+ * page_pgoff - Calculate the logical page offset of this page.</div><div class='add'>+ * @folio: The folio containing this page.</div><div class='add'>+ * @page: The page which we need the offset of.</div><div class='add'>+ *</div><div class='add'>+ * For file pages, this is the offset from the beginning of the file</div><div class='add'>+ * in units of PAGE_SIZE.  For anonymous pages, this is the offset from</div><div class='add'>+ * the beginning of the anon_vma in units of PAGE_SIZE.  This will</div><div class='add'>+ * return nonsense for KSM pages.</div><div class='add'>+ *</div><div class='add'>+ * Context: Caller must have a reference on the folio or otherwise</div><div class='add'>+ * prevent it from being split or freed.</div><div class='add'>+ *</div><div class='add'>+ * Return: The offset in units of PAGE_SIZE.</div><div class='ctx'>  */</div><div class='del'>-static inline loff_t page_offset(struct page *page)</div><div class='add'>+static inline pgoff_t page_pgoff(const struct folio *folio,</div><div class='add'>+		const struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return ((loff_t)page-&gt;index) &lt;&lt; PAGE_SHIFT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline loff_t page_file_offset(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return ((loff_t)page_index(page)) &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	return folio-&gt;index + folio_page_idx(folio, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * folio_pos - Returns the byte position of this folio in its file.</div><div class='ctx'>  * @folio: The folio.</div><div class='ctx'>  */</div><div class='del'>-static inline loff_t folio_pos(struct folio *folio)</div><div class='add'>+static inline loff_t folio_pos(const struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	return page_offset(&amp;folio-&gt;page);</div><div class='add'>+	return ((loff_t)folio-&gt;index) * PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * folio_file_pos - Returns the byte position of this folio in its file.</div><div class='del'>- * @folio: The folio.</div><div class='del'>- *</div><div class='del'>- * This differs from folio_pos() for folios which belong to a swap file.</div><div class='del'>- * NFS is the only filesystem today which needs to use folio_file_pos().</div><div class='add'>+/*</div><div class='add'>+ * Return byte-offset into filesystem object for page.</div><div class='ctx'>  */</div><div class='del'>-static inline loff_t folio_file_pos(struct folio *folio)</div><div class='add'>+static inline loff_t page_offset(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return page_file_offset(&amp;folio-&gt;page);</div><div class='add'>+	struct folio *folio = page_folio(page);</div><div class='add'>+</div><div class='add'>+	return folio_pos(folio) + folio_page_idx(folio, page) * PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Get the offset in PAGE_SIZE (even for hugetlb folios).</div><div class='ctx'>  */</div><div class='del'>-static inline pgoff_t folio_pgoff(struct folio *folio)</div><div class='add'>+static inline pgoff_t folio_pgoff(const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return folio-&gt;index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline pgoff_t linear_page_index(struct vm_area_struct *vma,</div><div class='del'>-					unsigned long address)</div><div class='add'>+static inline pgoff_t linear_page_index(const struct vm_area_struct *vma,</div><div class='add'>+					const unsigned long address)</div><div class='ctx'> {</div><div class='ctx'> 	pgoff_t pgoff;</div><div class='ctx'> 	pgoff = (address - vma-&gt;vm_start) &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -1014,7 +1125,7 @@ static inline bool folio_trylock(struct folio *folio)</div><div class='ctx'> /*</div><div class='ctx'>  * Return true if the page was successfully locked</div><div class='ctx'>  */</div><div class='del'>-static inline int trylock_page(struct page *page)</div><div class='add'>+static inline bool trylock_page(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_trylock(page_folio(page));</div><div class='ctx'> }</div><div class='hunk'>@@ -1130,25 +1241,16 @@ static inline int folio_wait_locked_killable(struct folio *folio)</div><div class='ctx'> 	return folio_wait_bit_killable(folio, PG_locked);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void wait_on_page_locked(struct page *page)</div><div class='del'>-{</div><div class='del'>-	folio_wait_locked(page_folio(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void folio_end_read(struct folio *folio, bool success);</div><div class='ctx'> void wait_on_page_writeback(struct page *page);</div><div class='ctx'> void folio_wait_writeback(struct folio *folio);</div><div class='ctx'> int folio_wait_writeback_killable(struct folio *folio);</div><div class='ctx'> void end_page_writeback(struct page *page);</div><div class='ctx'> void folio_end_writeback(struct folio *folio);</div><div class='del'>-void wait_for_stable_page(struct page *page);</div><div class='add'>+void folio_end_writeback_no_dropbehind(struct folio *folio);</div><div class='add'>+void folio_end_dropbehind(struct folio *folio);</div><div class='ctx'> void folio_wait_stable(struct folio *folio);</div><div class='ctx'> void __folio_mark_dirty(struct folio *folio, struct address_space *, int warn);</div><div class='del'>-static inline void __set_page_dirty(struct page *page,</div><div class='del'>-		struct address_space *mapping, int warn)</div><div class='del'>-{</div><div class='del'>-	__folio_mark_dirty(page_folio(page), mapping, warn);</div><div class='del'>-}</div><div class='ctx'> void folio_account_cleaned(struct folio *folio, struct bdi_writeback *wb);</div><div class='ctx'> void __folio_cancel_dirty(struct folio *folio);</div><div class='ctx'> static inline void folio_cancel_dirty(struct folio *folio)</div><div class='hunk'>@@ -1160,7 +1262,6 @@ static inline void folio_cancel_dirty(struct folio *folio)</div><div class='ctx'> bool folio_clear_dirty_for_io(struct folio *folio);</div><div class='ctx'> bool clear_page_dirty_for_io(struct page *page);</div><div class='ctx'> void folio_invalidate(struct folio *folio, size_t offset, size_t length);</div><div class='del'>-int __set_page_dirty_nobuffers(struct page *page);</div><div class='ctx'> bool noop_dirty_folio(struct address_space *mapping, struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MIGRATION</div><div class='hunk'>@@ -1174,11 +1275,6 @@ void folio_wait_private_2(struct folio *folio);</div><div class='ctx'> int folio_wait_private_2_killable(struct folio *folio);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Add an arbitrary waiter to a page's wait queue</div><div class='del'>- */</div><div class='del'>-void folio_add_wait_queue(struct folio *folio, wait_queue_entry_t *waiter);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Fault in userspace address range.</div><div class='ctx'>  */</div><div class='ctx'> size_t fault_in_writeable(char __user *uaddr, size_t size);</div><div class='hunk'>@@ -1236,9 +1332,9 @@ static inline bool filemap_range_needs_writeback(struct address_space *mapping,</div><div class='ctx'>  * struct readahead_control - Describes a readahead request.</div><div class='ctx'>  *</div><div class='ctx'>  * A readahead request is for consecutive pages.  Filesystems which</div><div class='del'>- * implement the -&gt;readahead method should call readahead_page() or</div><div class='del'>- * readahead_page_batch() in a loop and attempt to start I/O against</div><div class='del'>- * each page in the request.</div><div class='add'>+ * implement the -&gt;readahead method should call readahead_folio() or</div><div class='add'>+ * __readahead_batch() in a loop and attempt to start reads into each</div><div class='add'>+ * folio in the request.</div><div class='ctx'>  *</div><div class='ctx'>  * Most of the fields in this struct are private and should be accessed</div><div class='ctx'>  * by the functions below.</div><div class='hunk'>@@ -1256,6 +1352,7 @@ struct readahead_control {</div><div class='ctx'> 	pgoff_t _index;</div><div class='ctx'> 	unsigned int _nr_pages;</div><div class='ctx'> 	unsigned int _batch_count;</div><div class='add'>+	bool dropbehind;</div><div class='ctx'> 	bool _workingset;</div><div class='ctx'> 	unsigned long _pflags;</div><div class='ctx'> };</div><div class='hunk'>@@ -1305,8 +1402,7 @@ void page_cache_sync_readahead(struct address_space *mapping,</div><div class='ctx'>  * @mapping: address_space which holds the pagecache and I/O vectors</div><div class='ctx'>  * @ra: file_ra_state which holds the readahead state</div><div class='ctx'>  * @file: Used by the filesystem for authentication.</div><div class='del'>- * @folio: The folio at @index which triggered the readahead call.</div><div class='del'>- * @index: Index of first page to be read.</div><div class='add'>+ * @folio: The folio which triggered the readahead call.</div><div class='ctx'>  * @req_count: Total number of pages being read by the caller.</div><div class='ctx'>  *</div><div class='ctx'>  * page_cache_async_readahead() should be called when a page is used which</div><div class='hunk'>@@ -1317,9 +1413,9 @@ void page_cache_sync_readahead(struct address_space *mapping,</div><div class='ctx'> static inline</div><div class='ctx'> void page_cache_async_readahead(struct address_space *mapping,</div><div class='ctx'> 		struct file_ra_state *ra, struct file *file,</div><div class='del'>-		struct folio *folio, pgoff_t index, unsigned long req_count)</div><div class='add'>+		struct folio *folio, unsigned long req_count)</div><div class='ctx'> {</div><div class='del'>-	DEFINE_READAHEAD(ractl, file, ra, mapping, index);</div><div class='add'>+	DEFINE_READAHEAD(ractl, file, ra, mapping, folio-&gt;index);</div><div class='ctx'> 	page_cache_async_ra(&amp;ractl, folio, req_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1344,22 +1440,6 @@ static inline struct folio *__readahead_folio(struct readahead_control *ractl)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * readahead_page - Get the next page to read.</div><div class='del'>- * @ractl: The current readahead request.</div><div class='del'>- *</div><div class='del'>- * Context: The page is locked and has an elevated refcount.  The caller</div><div class='del'>- * should decreases the refcount once the page has been submitted for I/O</div><div class='del'>- * and unlock the page once all I/O to that page has completed.</div><div class='del'>- * Return: A pointer to the next page, or %NULL if we are done.</div><div class='del'>- */</div><div class='del'>-static inline struct page *readahead_page(struct readahead_control *ractl)</div><div class='del'>-{</div><div class='del'>-	struct folio *folio = __readahead_folio(ractl);</div><div class='del'>-</div><div class='del'>-	return &amp;folio-&gt;page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * readahead_folio - Get the next folio to read.</div><div class='ctx'>  * @ractl: The current readahead request.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1381,7 +1461,7 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i = 0;</div><div class='ctx'> 	XA_STATE(xas, &amp;rac-&gt;mapping-&gt;i_pages, 0);</div><div class='del'>-	struct page *page;</div><div class='add'>+	struct folio *folio;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(rac-&gt;_batch_count &gt; rac-&gt;_nr_pages);</div><div class='ctx'> 	rac-&gt;_nr_pages -= rac-&gt;_batch_count;</div><div class='hunk'>@@ -1390,13 +1470,12 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac,</div><div class='ctx'> </div><div class='ctx'> 	xas_set(&amp;xas, rac-&gt;_index);</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	xas_for_each(&amp;xas, page, rac-&gt;_index + rac-&gt;_nr_pages - 1) {</div><div class='del'>-		if (xas_retry(&amp;xas, page))</div><div class='add'>+	xas_for_each(&amp;xas, folio, rac-&gt;_index + rac-&gt;_nr_pages - 1) {</div><div class='add'>+		if (xas_retry(&amp;xas, folio))</div><div class='ctx'> 			continue;</div><div class='del'>-		VM_BUG_ON_PAGE(!PageLocked(page), page);</div><div class='del'>-		VM_BUG_ON_PAGE(PageTail(page), page);</div><div class='del'>-		array[i++] = page;</div><div class='del'>-		rac-&gt;_batch_count += thp_nr_pages(page);</div><div class='add'>+		VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);</div><div class='add'>+		array[i++] = folio_page(folio, 0);</div><div class='add'>+		rac-&gt;_batch_count += folio_nr_pages(folio);</div><div class='ctx'> 		if (i == array_sz)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1406,24 +1485,10 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * readahead_page_batch - Get a batch of pages to read.</div><div class='del'>- * @rac: The current readahead request.</div><div class='del'>- * @array: An array of pointers to struct page.</div><div class='del'>- *</div><div class='del'>- * Context: The pages are locked and have an elevated refcount.  The caller</div><div class='del'>- * should decreases the refcount once the page has been submitted for I/O</div><div class='del'>- * and unlock the page once all I/O to that page has completed.</div><div class='del'>- * Return: The number of pages placed in the array.  0 indicates the request</div><div class='del'>- * is complete.</div><div class='del'>- */</div><div class='del'>-#define readahead_page_batch(rac, array)				\</div><div class='del'>-	__readahead_batch(rac, array, ARRAY_SIZE(array))</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * readahead_pos - The byte offset into the file of this readahead request.</div><div class='ctx'>  * @rac: The readahead request.</div><div class='ctx'>  */</div><div class='del'>-static inline loff_t readahead_pos(struct readahead_control *rac)</div><div class='add'>+static inline loff_t readahead_pos(const struct readahead_control *rac)</div><div class='ctx'> {</div><div class='ctx'> 	return (loff_t)rac-&gt;_index * PAGE_SIZE;</div><div class='ctx'> }</div><div class='hunk'>@@ -1432,7 +1497,7 @@ static inline loff_t readahead_pos(struct readahead_control *rac)</div><div class='ctx'>  * readahead_length - The number of bytes in this readahead request.</div><div class='ctx'>  * @rac: The readahead request.</div><div class='ctx'>  */</div><div class='del'>-static inline size_t readahead_length(struct readahead_control *rac)</div><div class='add'>+static inline size_t readahead_length(const struct readahead_control *rac)</div><div class='ctx'> {</div><div class='ctx'> 	return rac-&gt;_nr_pages * PAGE_SIZE;</div><div class='ctx'> }</div><div class='hunk'>@@ -1441,7 +1506,7 @@ static inline size_t readahead_length(struct readahead_control *rac)</div><div class='ctx'>  * readahead_index - The index of the first page in this readahead request.</div><div class='ctx'>  * @rac: The readahead request.</div><div class='ctx'>  */</div><div class='del'>-static inline pgoff_t readahead_index(struct readahead_control *rac)</div><div class='add'>+static inline pgoff_t readahead_index(const struct readahead_control *rac)</div><div class='ctx'> {</div><div class='ctx'> 	return rac-&gt;_index;</div><div class='ctx'> }</div><div class='hunk'>@@ -1450,7 +1515,7 @@ static inline pgoff_t readahead_index(struct readahead_control *rac)</div><div class='ctx'>  * readahead_count - The number of pages in this readahead request.</div><div class='ctx'>  * @rac: The readahead request.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int readahead_count(struct readahead_control *rac)</div><div class='add'>+static inline unsigned int readahead_count(const struct readahead_control *rac)</div><div class='ctx'> {</div><div class='ctx'> 	return rac-&gt;_nr_pages;</div><div class='ctx'> }</div><div class='hunk'>@@ -1459,12 +1524,12 @@ static inline unsigned int readahead_count(struct readahead_control *rac)</div><div class='ctx'>  * readahead_batch_length - The number of bytes in the current batch.</div><div class='ctx'>  * @rac: The readahead request.</div><div class='ctx'>  */</div><div class='del'>-static inline size_t readahead_batch_length(struct readahead_control *rac)</div><div class='add'>+static inline size_t readahead_batch_length(const struct readahead_control *rac)</div><div class='ctx'> {</div><div class='ctx'> 	return rac-&gt;_batch_count * PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long dir_pages(struct inode *inode)</div><div class='add'>+static inline unsigned long dir_pages(const struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return (unsigned long)(inode-&gt;i_size + PAGE_SIZE - 1) &gt;&gt;</div><div class='ctx'> 			       PAGE_SHIFT;</div><div class='hunk'>@@ -1478,8 +1543,8 @@ static inline unsigned long dir_pages(struct inode *inode)</div><div class='ctx'>  * Return: the number of bytes in the folio up to EOF,</div><div class='ctx'>  * or -EFAULT if the folio was truncated.</div><div class='ctx'>  */</div><div class='del'>-static inline ssize_t folio_mkwrite_check_truncate(struct folio *folio,</div><div class='del'>-					      struct inode *inode)</div><div class='add'>+static inline ssize_t folio_mkwrite_check_truncate(const struct folio *folio,</div><div class='add'>+						   const struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t size = i_size_read(inode);</div><div class='ctx'> 	pgoff_t index = size &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -1499,34 +1564,6 @@ static inline ssize_t folio_mkwrite_check_truncate(struct folio *folio,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * page_mkwrite_check_truncate - check if page was truncated</div><div class='del'>- * @page: the page to check</div><div class='del'>- * @inode: the inode to check the page against</div><div class='del'>- *</div><div class='del'>- * Returns the number of bytes in the page up to EOF,</div><div class='del'>- * or -EFAULT if the page was truncated.</div><div class='del'>- */</div><div class='del'>-static inline int page_mkwrite_check_truncate(struct page *page,</div><div class='del'>-					      struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	loff_t size = i_size_read(inode);</div><div class='del'>-	pgoff_t index = size &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	int offset = offset_in_page(size);</div><div class='del'>-</div><div class='del'>-	if (page-&gt;mapping != inode-&gt;i_mapping)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	/* page is wholly inside EOF */</div><div class='del'>-	if (page-&gt;index &lt; index)</div><div class='del'>-		return PAGE_SIZE;</div><div class='del'>-	/* page is wholly past EOF */</div><div class='del'>-	if (page-&gt;index &gt; index || !offset)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	/* page is partially inside EOF */</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * i_blocks_per_folio - How many blocks fit in this folio.</div><div class='ctx'>  * @inode: The inode which contains the blocks.</div><div class='ctx'>  * @folio: The folio.</div><div class='hunk'>@@ -1538,14 +1575,9 @@ static inline int page_mkwrite_check_truncate(struct page *page,</div><div class='ctx'>  * Return: The number of filesystem blocks covered by this folio.</div><div class='ctx'>  */</div><div class='ctx'> static inline</div><div class='del'>-unsigned int i_blocks_per_folio(struct inode *inode, struct folio *folio)</div><div class='add'>+unsigned int i_blocks_per_folio(const struct inode *inode,</div><div class='add'>+				const struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return folio_size(folio) &gt;&gt; inode-&gt;i_blkbits;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-unsigned int i_blocks_per_page(struct inode *inode, struct page *page)</div><div class='del'>-{</div><div class='del'>-	return i_blocks_per_folio(inode, page_folio(page));</div><div class='del'>-}</div><div class='ctx'> #endif /* _LINUX_PAGEMAP_H */</div><div class='head'>diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h<br/>index 87cc678adc85..63be5a451627 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pagevec.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pagevec.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pagevec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pagevec.h</a></div><div class='hunk'>@@ -11,8 +11,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-/* 15 pointers + header align the folio_batch structure to a power of two */</div><div class='del'>-#define PAGEVEC_SIZE	15</div><div class='add'>+/* 31 pointers + header align the folio_batch structure to a power of two */</div><div class='add'>+#define PAGEVEC_SIZE	31</div><div class='ctx'> </div><div class='ctx'> struct folio;</div><div class='ctx'> </div><div class='hunk'>@@ -27,6 +27,7 @@ struct folio;</div><div class='ctx'>  */</div><div class='ctx'> struct folio_batch {</div><div class='ctx'> 	unsigned char nr;</div><div class='add'>+	unsigned char i;</div><div class='ctx'> 	bool percpu_pvec_drained;</div><div class='ctx'> 	struct folio *folios[PAGEVEC_SIZE];</div><div class='ctx'> };</div><div class='hunk'>@@ -40,20 +41,22 @@ struct folio_batch {</div><div class='ctx'> static inline void folio_batch_init(struct folio_batch *fbatch)</div><div class='ctx'> {</div><div class='ctx'> 	fbatch-&gt;nr = 0;</div><div class='add'>+	fbatch-&gt;i = 0;</div><div class='ctx'> 	fbatch-&gt;percpu_pvec_drained = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void folio_batch_reinit(struct folio_batch *fbatch)</div><div class='ctx'> {</div><div class='ctx'> 	fbatch-&gt;nr = 0;</div><div class='add'>+	fbatch-&gt;i = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int folio_batch_count(struct folio_batch *fbatch)</div><div class='add'>+static inline unsigned int folio_batch_count(const struct folio_batch *fbatch)</div><div class='ctx'> {</div><div class='ctx'> 	return fbatch-&gt;nr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int folio_batch_space(struct folio_batch *fbatch)</div><div class='add'>+static inline unsigned int folio_batch_space(const struct folio_batch *fbatch)</div><div class='ctx'> {</div><div class='ctx'> 	return PAGEVEC_SIZE - fbatch-&gt;nr;</div><div class='ctx'> }</div><div class='hunk'>@@ -75,6 +78,21 @@ static inline unsigned folio_batch_add(struct folio_batch *fbatch,</div><div class='ctx'> 	return folio_batch_space(fbatch);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * folio_batch_next - Return the next folio to process.</div><div class='add'>+ * @fbatch: The folio batch being processed.</div><div class='add'>+ *</div><div class='add'>+ * Use this function to implement a queue of folios.</div><div class='add'>+ *</div><div class='add'>+ * Return: The next folio in the queue, or NULL if the queue is empty.</div><div class='add'>+ */</div><div class='add'>+static inline struct folio *folio_batch_next(struct folio_batch *fbatch)</div><div class='add'>+{</div><div class='add'>+	if (fbatch-&gt;i == fbatch-&gt;nr)</div><div class='add'>+		return NULL;</div><div class='add'>+	return fbatch-&gt;folios[fbatch-&gt;i++];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __folio_batch_release(struct folio_batch *pvec);</div><div class='ctx'> </div><div class='ctx'> static inline void folio_batch_release(struct folio_batch *fbatch)</div><div class='head'>diff --git a/include/linux/pagewalk.h b/include/linux/pagewalk.h<br/>index 27cd1e59ccf7..88e18615dd72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pagewalk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pagewalk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pagewalk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pagewalk.h</a></div><div class='hunk'>@@ -14,6 +14,8 @@ enum page_walk_lock {</div><div class='ctx'> 	PGWALK_WRLOCK = 1,</div><div class='ctx'> 	/* vma is expected to be already write-locked during the walk */</div><div class='ctx'> 	PGWALK_WRLOCK_VERIFY = 2,</div><div class='add'>+	/* vma is expected to be already read-locked during the walk */</div><div class='add'>+	PGWALK_VMA_RDLOCK_VERIFY = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -25,12 +27,15 @@ enum page_walk_lock {</div><div class='ctx'>  *			this handler is required to be able to handle</div><div class='ctx'>  *			pmd_trans_huge() pmds.  They may simply choose to</div><div class='ctx'>  *			split_huge_page() instead of handling it explicitly.</div><div class='del'>- * @pte_entry:		if set, called for each PTE (lowest-level) entry,</div><div class='del'>- *			including empty ones</div><div class='add'>+ * @pte_entry:		if set, called for each PTE (lowest-level) entry</div><div class='add'>+ *			including empty ones, except if @install_pte is set.</div><div class='add'>+ *			If @install_pte is set, @pte_entry is called only for</div><div class='add'>+ *			existing PTEs.</div><div class='ctx'>  * @pte_hole:		if set, called for each hole at all levels,</div><div class='ctx'>  *			depth is -1 if not known, 0:PGD, 1:P4D, 2:PUD, 3:PMD.</div><div class='ctx'>  *			Any folded depths (where PTRS_PER_P?D is equal to 1)</div><div class='del'>- *			are skipped.</div><div class='add'>+ *			are skipped. If @install_pte is specified, this will</div><div class='add'>+ *			not trigger for any populated ranges.</div><div class='ctx'>  * @hugetlb_entry:	if set, called for each hugetlb entry. This hook</div><div class='ctx'>  *			function is called with the vma lock held, in order to</div><div class='ctx'>  *			protect against a concurrent freeing of the pte_t* or</div><div class='hunk'>@@ -51,6 +56,13 @@ enum page_walk_lock {</div><div class='ctx'>  * @pre_vma:            if set, called before starting walk on a non-null vma.</div><div class='ctx'>  * @post_vma:           if set, called after a walk on a non-null vma, provided</div><div class='ctx'>  *                      that @pre_vma and the vma walk succeeded.</div><div class='add'>+ * @install_pte:        if set, missing page table entries are installed and</div><div class='add'>+ *                      thus all levels are always walked in the specified</div><div class='add'>+ *                      range. This callback is then invoked at the PTE level</div><div class='add'>+ *                      (having split any THP pages prior), providing the PTE to</div><div class='add'>+ *                      install. If allocations fail, the walk is aborted. This</div><div class='add'>+ *                      operation is only available for userland memory. Not</div><div class='add'>+ *                      usable for hugetlb ranges.</div><div class='ctx'>  *</div><div class='ctx'>  * p?d_entry callbacks are called even if those levels are folded on a</div><div class='ctx'>  * particular architecture/configuration.</div><div class='hunk'>@@ -76,6 +88,8 @@ struct mm_walk_ops {</div><div class='ctx'> 	int (*pre_vma)(unsigned long start, unsigned long end,</div><div class='ctx'> 		       struct mm_walk *walk);</div><div class='ctx'> 	void (*post_vma)(struct mm_walk *walk);</div><div class='add'>+	int (*install_pte)(unsigned long addr, unsigned long next,</div><div class='add'>+			   pte_t *ptep, struct mm_walk *walk);</div><div class='ctx'> 	enum page_walk_lock walk_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -117,10 +131,12 @@ struct mm_walk {</div><div class='ctx'> int walk_page_range(struct mm_struct *mm, unsigned long start,</div><div class='ctx'> 		unsigned long end, const struct mm_walk_ops *ops,</div><div class='ctx'> 		void *private);</div><div class='del'>-int walk_page_range_novma(struct mm_struct *mm, unsigned long start,</div><div class='del'>-			  unsigned long end, const struct mm_walk_ops *ops,</div><div class='del'>-			  pgd_t *pgd,</div><div class='del'>-			  void *private);</div><div class='add'>+int walk_kernel_page_table_range(unsigned long start,</div><div class='add'>+		unsigned long end, const struct mm_walk_ops *ops,</div><div class='add'>+		pgd_t *pgd, void *private);</div><div class='add'>+int walk_kernel_page_table_range_lockless(unsigned long start,</div><div class='add'>+		unsigned long end, const struct mm_walk_ops *ops,</div><div class='add'>+		pgd_t *pgd, void *private);</div><div class='ctx'> int walk_page_range_vma(struct vm_area_struct *vma, unsigned long start,</div><div class='ctx'> 			unsigned long end, const struct mm_walk_ops *ops,</div><div class='ctx'> 			void *private);</div><div class='hunk'>@@ -130,4 +146,62 @@ int walk_page_mapping(struct address_space *mapping, pgoff_t first_index,</div><div class='ctx'> 		      pgoff_t nr, const struct mm_walk_ops *ops,</div><div class='ctx'> 		      void *private);</div><div class='ctx'> </div><div class='add'>+typedef int __bitwise folio_walk_flags_t;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Walk migration entries as well. Careful: a large folio might get split</div><div class='add'>+ * concurrently.</div><div class='add'>+ */</div><div class='add'>+#define FW_MIGRATION			((__force folio_walk_flags_t)BIT(0))</div><div class='add'>+</div><div class='add'>+/* Walk shared zeropages (small + huge) as well. */</div><div class='add'>+#define FW_ZEROPAGE			((__force folio_walk_flags_t)BIT(1))</div><div class='add'>+</div><div class='add'>+enum folio_walk_level {</div><div class='add'>+	FW_LEVEL_PTE,</div><div class='add'>+	FW_LEVEL_PMD,</div><div class='add'>+	FW_LEVEL_PUD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct folio_walk - folio_walk_start() / folio_walk_end() data</div><div class='add'>+ * @page:	exact folio page referenced (if applicable)</div><div class='add'>+ * @level:	page table level identifying the entry type</div><div class='add'>+ * @pte:	pointer to the page table entry (FW_LEVEL_PTE).</div><div class='add'>+ * @pmd:	pointer to the page table entry (FW_LEVEL_PMD).</div><div class='add'>+ * @pud:	pointer to the page table entry (FW_LEVEL_PUD).</div><div class='add'>+ * @ptl:	pointer to the page table lock.</div><div class='add'>+ *</div><div class='add'>+ * (see folio_walk_start() documentation for more details)</div><div class='add'>+ */</div><div class='add'>+struct folio_walk {</div><div class='add'>+	/* public */</div><div class='add'>+	struct page *page;</div><div class='add'>+	enum folio_walk_level level;</div><div class='add'>+	union {</div><div class='add'>+		pte_t *ptep;</div><div class='add'>+		pud_t *pudp;</div><div class='add'>+		pmd_t *pmdp;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		pte_t pte;</div><div class='add'>+		pud_t pud;</div><div class='add'>+		pmd_t pmd;</div><div class='add'>+	};</div><div class='add'>+	/* private */</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	spinlock_t *ptl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct folio *folio_walk_start(struct folio_walk *fw,</div><div class='add'>+		struct vm_area_struct *vma, unsigned long addr,</div><div class='add'>+		folio_walk_flags_t flags);</div><div class='add'>+</div><div class='add'>+#define folio_walk_end(__fw, __vma) do { \</div><div class='add'>+	spin_unlock((__fw)-&gt;ptl); \</div><div class='add'>+	if (likely((__fw)-&gt;level == FW_LEVEL_PTE)) \</div><div class='add'>+		pte_unmap((__fw)-&gt;ptep); \</div><div class='add'>+	vma_pgtable_walk_end(__vma); \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_PAGEWALK_H */</div><div class='head'>diff --git a/include/linux/panic.h b/include/linux/panic.h<br/>index 6717b15e798c..a00bc0937698 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/panic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/panic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/panic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/panic.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #define _LINUX_PANIC_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler_attributes.h&gt;</div><div class='add'>+#include &lt;linux/stdarg.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pt_regs;</div><div class='hunk'>@@ -10,24 +11,23 @@ struct pt_regs;</div><div class='ctx'> extern long (*panic_blink)(int state);</div><div class='ctx'> __printf(1, 2)</div><div class='ctx'> void panic(const char *fmt, ...) __noreturn __cold;</div><div class='add'>+__printf(1, 0)</div><div class='add'>+void vpanic(const char *fmt, va_list args) __noreturn __cold;</div><div class='ctx'> void nmi_panic(struct pt_regs *regs, const char *msg);</div><div class='ctx'> void check_panic_on_warn(const char *origin);</div><div class='ctx'> extern void oops_enter(void);</div><div class='ctx'> extern void oops_exit(void);</div><div class='ctx'> extern bool oops_may_print(void);</div><div class='ctx'> </div><div class='add'>+extern bool panic_triggering_all_cpu_backtrace;</div><div class='ctx'> extern int panic_timeout;</div><div class='ctx'> extern unsigned long panic_print;</div><div class='ctx'> extern int panic_on_oops;</div><div class='del'>-extern int panic_on_unrecovered_nmi;</div><div class='del'>-extern int panic_on_io_nmi;</div><div class='ctx'> extern int panic_on_warn;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long panic_on_taint;</div><div class='ctx'> extern bool panic_on_taint_nousertaint;</div><div class='ctx'> </div><div class='del'>-extern int sysctl_panic_on_rcu_stall;</div><div class='del'>-extern int sysctl_max_rcu_stall_to_panic;</div><div class='ctx'> extern int sysctl_panic_on_stackoverflow;</div><div class='ctx'> </div><div class='ctx'> extern bool crash_kexec_post_notifiers;</div><div class='hunk'>@@ -43,6 +43,12 @@ void abort(void);</div><div class='ctx'> extern atomic_t panic_cpu;</div><div class='ctx'> #define PANIC_CPU_INVALID	-1</div><div class='ctx'> </div><div class='add'>+bool panic_try_start(void);</div><div class='add'>+void panic_reset(void);</div><div class='add'>+bool panic_in_progress(void);</div><div class='add'>+bool panic_on_this_cpu(void);</div><div class='add'>+bool panic_on_other_cpu(void);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Only to be used by arch init code. If the user over-wrote the default</div><div class='ctx'>  * CONFIG_PANIC_TIMEOUT, honor it.</div><div class='hunk'>@@ -73,13 +79,14 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout)</div><div class='ctx'> #define TAINT_AUX			16</div><div class='ctx'> #define TAINT_RANDSTRUCT		17</div><div class='ctx'> #define TAINT_TEST			18</div><div class='del'>-#define TAINT_FLAGS_COUNT		19</div><div class='add'>+#define TAINT_FWCTL			19</div><div class='add'>+#define TAINT_FLAGS_COUNT		20</div><div class='ctx'> #define TAINT_FLAGS_MAX			((1UL &lt;&lt; TAINT_FLAGS_COUNT) - 1)</div><div class='ctx'> </div><div class='ctx'> struct taint_flag {</div><div class='del'>-	char c_true;	/* character printed when tainted */</div><div class='del'>-	char c_false;	/* character printed when not tainted */</div><div class='del'>-	bool module;	/* also show as a per-module taint flag */</div><div class='add'>+	char c_true;		/* character printed when tainted */</div><div class='add'>+	char c_false;		/* character printed when not tainted */</div><div class='add'>+	const char *desc;	/* verbose description of the set taint flag */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct taint_flag taint_flags[TAINT_FLAGS_COUNT];</div><div class='hunk'>@@ -90,6 +97,7 @@ enum lockdep_ok {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const char *print_tainted(void);</div><div class='add'>+extern const char *print_tainted_verbose(void);</div><div class='ctx'> extern void add_taint(unsigned flag, enum lockdep_ok);</div><div class='ctx'> extern int test_taint(unsigned flag);</div><div class='ctx'> extern unsigned long get_taint(void);</div><div class='head'>diff --git a/include/linux/papr_scm.h b/include/linux/papr_scm.h<br/>new file mode 100644<br/>index 000000000000..eb36453813db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/papr_scm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/papr_scm.h</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef __LINUX_PAPR_SCM_H</div><div class='add'>+#define __LINUX_PAPR_SCM_H</div><div class='add'>+</div><div class='add'>+/* DIMM health bitmap indicators */</div><div class='add'>+/* SCM device is unable to persist memory contents */</div><div class='add'>+#define PAPR_PMEM_UNARMED                   (1ULL &lt;&lt; (63 - 0))</div><div class='add'>+/* SCM device failed to persist memory contents */</div><div class='add'>+#define PAPR_PMEM_SHUTDOWN_DIRTY            (1ULL &lt;&lt; (63 - 1))</div><div class='add'>+/* SCM device contents are persisted from previous IPL */</div><div class='add'>+#define PAPR_PMEM_SHUTDOWN_CLEAN            (1ULL &lt;&lt; (63 - 2))</div><div class='add'>+/* SCM device contents are not persisted from previous IPL */</div><div class='add'>+#define PAPR_PMEM_EMPTY                     (1ULL &lt;&lt; (63 - 3))</div><div class='add'>+/* SCM device memory life remaining is critically low */</div><div class='add'>+#define PAPR_PMEM_HEALTH_CRITICAL           (1ULL &lt;&lt; (63 - 4))</div><div class='add'>+/* SCM device will be garded off next IPL due to failure */</div><div class='add'>+#define PAPR_PMEM_HEALTH_FATAL              (1ULL &lt;&lt; (63 - 5))</div><div class='add'>+/* SCM contents cannot persist due to current platform health status */</div><div class='add'>+#define PAPR_PMEM_HEALTH_UNHEALTHY          (1ULL &lt;&lt; (63 - 6))</div><div class='add'>+/* SCM device is unable to persist memory contents in certain conditions */</div><div class='add'>+#define PAPR_PMEM_HEALTH_NON_CRITICAL       (1ULL &lt;&lt; (63 - 7))</div><div class='add'>+/* SCM device is encrypted */</div><div class='add'>+#define PAPR_PMEM_ENCRYPTED                 (1ULL &lt;&lt; (63 - 8))</div><div class='add'>+/* SCM device has been scrubbed and locked */</div><div class='add'>+#define PAPR_PMEM_SCRUBBED_AND_LOCKED       (1ULL &lt;&lt; (63 - 9))</div><div class='add'>+</div><div class='add'>+#define PAPR_PMEM_SAVE_FAILED               (1ULL &lt;&lt; (63 - 10))</div><div class='add'>+</div><div class='add'>+/* Bits status indicators for health bitmap indicating unarmed dimm */</div><div class='add'>+#define PAPR_PMEM_UNARMED_MASK (PAPR_PMEM_UNARMED |            \</div><div class='add'>+				PAPR_PMEM_HEALTH_UNHEALTHY)</div><div class='add'>+</div><div class='add'>+/* Bits status indicators for health bitmap indicating unflushed dimm */</div><div class='add'>+#define PAPR_PMEM_BAD_SHUTDOWN_MASK (PAPR_PMEM_SHUTDOWN_DIRTY)</div><div class='add'>+</div><div class='add'>+/* Bits status indicators for health bitmap indicating unrestored dimm */</div><div class='add'>+#define PAPR_PMEM_BAD_RESTORE_MASK  (PAPR_PMEM_EMPTY)</div><div class='add'>+</div><div class='add'>+/* Bit status indicators for smart event notification */</div><div class='add'>+#define PAPR_PMEM_SMART_EVENT_MASK (PAPR_PMEM_HEALTH_CRITICAL | \</div><div class='add'>+					PAPR_PMEM_HEALTH_FATAL | \</div><div class='add'>+					PAPR_PMEM_HEALTH_UNHEALTHY)</div><div class='add'>+</div><div class='add'>+#define PAPR_PMEM_SAVE_MASK                (PAPR_PMEM_SAVE_FAILED)</div><div class='add'>+</div><div class='add'>+#define PAPR_SCM_PERF_STATS_EYECATCHER __stringify(SCMSTATS)</div><div class='add'>+#define PAPR_SCM_PERF_STATS_VERSION 0x1</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_PAPR_SCM_H */</div><div class='head'>diff --git a/include/linux/parport.h b/include/linux/parport.h<br/>index fff39bc30629..464c2ad28039 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/parport.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/parport.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/parport.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/parport.h</a></div><div class='hunk'>@@ -252,13 +252,10 @@ struct parport {</div><div class='ctx'> </div><div class='ctx'> struct parport_driver {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	void (*attach) (struct parport *);</div><div class='ctx'> 	void (*detach) (struct parport *);</div><div class='ctx'> 	void (*match_port)(struct parport *);</div><div class='ctx'> 	int (*probe)(struct pardevice *);</div><div class='ctx'> 	struct device_driver driver;</div><div class='del'>-	bool devmodel;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_parport_driver(n) container_of(n, struct parport_driver, driver)</div><div class='hunk'>@@ -301,9 +298,6 @@ int __must_check __parport_register_driver(struct parport_driver *,</div><div class='ctx'>  *	to receive notifications about ports being found in the</div><div class='ctx'>  *	system, as well as ports no longer available.</div><div class='ctx'>  *</div><div class='del'>- *	If devmodel is true then the new device model is used</div><div class='del'>- *	for registration.</div><div class='del'>- *</div><div class='ctx'>  *	The @driver structure is allocated by the caller and must not be</div><div class='ctx'>  *	deallocated until after calling parport_unregister_driver().</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/linux/part_stat.h b/include/linux/part_stat.h<br/>index abeba356bc3f..729415e91215 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/part_stat.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/part_stat.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/part_stat.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/part_stat.h</a></div><div class='hunk'>@@ -17,8 +17,8 @@ struct disk_stats {</div><div class='ctx'> /*</div><div class='ctx'>  * Macros to operate on percpu disk statistics:</div><div class='ctx'>  *</div><div class='del'>- * {disk|part|all}_stat_{add|sub|inc|dec}() modify the stat counters and should</div><div class='del'>- * be called between disk_stat_lock() and disk_stat_unlock().</div><div class='add'>+ * part_stat_{add|sub|inc|dec}() modify the stat counters and should</div><div class='add'>+ * be called between part_stat_lock() and part_stat_unlock().</div><div class='ctx'>  *</div><div class='ctx'>  * part_stat_read() can be called at any time.</div><div class='ctx'>  */</div><div class='hunk'>@@ -33,7 +33,7 @@ struct disk_stats {</div><div class='ctx'> </div><div class='ctx'> #define part_stat_read(part, field)					\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof((part)-&gt;bd_stats-&gt;field) res = 0;			\</div><div class='add'>+	TYPEOF_UNQUAL((part)-&gt;bd_stats-&gt;field) res = 0;			\</div><div class='ctx'> 	unsigned int _cpu;						\</div><div class='ctx'> 	for_each_possible_cpu(_cpu)					\</div><div class='ctx'> 		res += per_cpu_ptr((part)-&gt;bd_stats, _cpu)-&gt;field; \</div><div class='hunk'>@@ -59,7 +59,7 @@ static inline void part_stat_set_all(struct block_device *part, int value)</div><div class='ctx'> </div><div class='ctx'> #define part_stat_add(part, field, addnd)	do {			\</div><div class='ctx'> 	__part_stat_add((part), field, addnd);				\</div><div class='del'>-	if ((part)-&gt;bd_partno)						\</div><div class='add'>+	if (bdev_is_partition(part))					\</div><div class='ctx'> 		__part_stat_add(bdev_whole(part), field, addnd);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -79,4 +79,6 @@ static inline void part_stat_set_all(struct block_device *part, int value)</div><div class='ctx'> #define part_stat_local_read_cpu(part, field, cpu)			\</div><div class='ctx'> 	local_read(&amp;(part_stat_get_cpu(part, field, cpu)))</div><div class='ctx'> </div><div class='add'>+unsigned int bdev_count_inflight(struct block_device *part);</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_PART_STAT_H */</div><div class='head'>diff --git a/include/linux/path.h b/include/linux/path.h<br/>index 475225a03d0d..7ea389dc764b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/path.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/path.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/path.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/path.h</a></div><div class='hunk'>@@ -18,10 +18,13 @@ static inline int path_equal(const struct path *path1, const struct path *path2)</div><div class='ctx'> 	return path1-&gt;mnt == path2-&gt;mnt &amp;&amp; path1-&gt;dentry == path2-&gt;dentry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void path_put_init(struct path *path)</div><div class='del'>-{</div><div class='del'>-	path_put(path);</div><div class='del'>-	*path = (struct path) { };</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * Cleanup macro for use with __free(path_put). Avoids dereference and</div><div class='add'>+ * copying @path unlike DEFINE_FREE(). path_put() will handle the empty</div><div class='add'>+ * path correctly just ensure @path is initialized:</div><div class='add'>+ *</div><div class='add'>+ * struct path path __free(path_put) = {};</div><div class='add'>+ */</div><div class='add'>+#define __free_path_put path_put</div><div class='ctx'> </div><div class='ctx'> #endif  /* _LINUX_PATH_H */</div><div class='head'>diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h<br/>index df54cd5b15db..75c6c86cf09d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci-ats.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-ats.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-ats.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-ats.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> /* Address Translation Service */</div><div class='ctx'> bool pci_ats_supported(struct pci_dev *dev);</div><div class='ctx'> int pci_enable_ats(struct pci_dev *dev, int ps);</div><div class='add'>+int pci_prepare_ats(struct pci_dev *dev, int ps);</div><div class='ctx'> void pci_disable_ats(struct pci_dev *dev);</div><div class='ctx'> int pci_ats_queue_depth(struct pci_dev *dev);</div><div class='ctx'> int pci_ats_page_aligned(struct pci_dev *dev);</div><div class='hunk'>@@ -16,6 +17,8 @@ static inline bool pci_ats_supported(struct pci_dev *d)</div><div class='ctx'> { return false; }</div><div class='ctx'> static inline int pci_enable_ats(struct pci_dev *d, int ps)</div><div class='ctx'> { return -ENODEV; }</div><div class='add'>+static inline int pci_prepare_ats(struct pci_dev *dev, int ps)</div><div class='add'>+{ return -ENODEV; }</div><div class='ctx'> static inline void pci_disable_ats(struct pci_dev *d) { }</div><div class='ctx'> static inline int pci_ats_queue_depth(struct pci_dev *d)</div><div class='ctx'> { return -ENODEV; }</div><div class='hunk'>@@ -39,6 +42,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features);</div><div class='ctx'> void pci_disable_pasid(struct pci_dev *pdev);</div><div class='ctx'> int pci_pasid_features(struct pci_dev *pdev);</div><div class='ctx'> int pci_max_pasids(struct pci_dev *pdev);</div><div class='add'>+int pci_pasid_status(struct pci_dev *pdev);</div><div class='ctx'> #else /* CONFIG_PCI_PASID */</div><div class='ctx'> static inline int pci_enable_pasid(struct pci_dev *pdev, int features)</div><div class='ctx'> { return -EINVAL; }</div><div class='hunk'>@@ -47,6 +51,8 @@ static inline int pci_pasid_features(struct pci_dev *pdev)</div><div class='ctx'> { return -EINVAL; }</div><div class='ctx'> static inline int pci_max_pasids(struct pci_dev *pdev)</div><div class='ctx'> { return -EINVAL; }</div><div class='add'>+static inline int pci_pasid_status(struct pci_dev *pdev)</div><div class='add'>+{ return -EINVAL; }</div><div class='ctx'> #endif /* CONFIG_PCI_PASID */</div><div class='ctx'> </div><div class='ctx'> #endif /* LINUX_PCI_ATS_H */</div><div class='head'>diff --git a/include/linux/pci-bwctrl.h b/include/linux/pci-bwctrl.h<br/>new file mode 100644<br/>index 000000000000..cee07127455b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-bwctrl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-bwctrl.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * PCIe bandwidth controller</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2023-2024 Intel Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_PCI_BWCTRL_H</div><div class='add'>+#define LINUX_PCI_BWCTRL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+struct thermal_cooling_device;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCIE_THERMAL</div><div class='add'>+struct thermal_cooling_device *pcie_cooling_device_register(struct pci_dev *port);</div><div class='add'>+void pcie_cooling_device_unregister(struct thermal_cooling_device *cdev);</div><div class='add'>+#else</div><div class='add'>+static inline struct thermal_cooling_device *pcie_cooling_device_register(struct pci_dev *port)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+static inline void pcie_cooling_device_unregister(struct thermal_cooling_device *cdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/pci-doe.h b/include/linux/pci-doe.h<br/>index 1f14aed4354b..bd4346a7c4e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci-doe.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-doe.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-doe.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-doe.h</a></div><div class='hunk'>@@ -15,6 +15,10 @@</div><div class='ctx'> </div><div class='ctx'> struct pci_doe_mb;</div><div class='ctx'> </div><div class='add'>+#define PCI_DOE_FEATURE_DISCOVERY 0</div><div class='add'>+#define PCI_DOE_FEATURE_CMA 1</div><div class='add'>+#define PCI_DOE_FEATURE_SSESSION 2</div><div class='add'>+</div><div class='ctx'> struct pci_doe_mb *pci_find_doe_mailbox(struct pci_dev *pdev, u16 vendor,</div><div class='ctx'> 					u8 type);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h<br/>index 3a4860bd2758..d930651473b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci-ecam.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-ecam.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-ecam.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-ecam.h</a></div><div class='hunk'>@@ -45,6 +45,10 @@ struct pci_ecam_ops {</div><div class='ctx'> 	unsigned int			bus_shift;</div><div class='ctx'> 	struct pci_ops			pci_ops;</div><div class='ctx'> 	int				(*init)(struct pci_config_window *);</div><div class='add'>+	int				(*enable_device)(struct pci_host_bridge *,</div><div class='add'>+							 struct pci_dev *);</div><div class='add'>+	void				(*disable_device)(struct pci_host_bridge *,</div><div class='add'>+							  struct pci_dev *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -89,10 +93,4 @@ extern const struct pci_ecam_ops al_pcie_ops;	/* Amazon Annapurna Labs PCIe */</div><div class='ctx'> extern const struct pci_ecam_ops tegra194_pcie_ops; /* Tegra194 PCIe */</div><div class='ctx'> extern const struct pci_ecam_ops loongson_pci_ecam_ops; /* Loongson PCIe */</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_PCI_HOST_COMMON)</div><div class='del'>-/* for DT-based PCI controllers that support ECAM */</div><div class='del'>-int pci_host_common_probe(struct platform_device *pdev);</div><div class='del'>-void pci_host_common_remove(struct platform_device *pdev);</div><div class='del'>-#endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/pci-ep-msi.h b/include/linux/pci-ep-msi.h<br/>new file mode 100644<br/>index 000000000000..7c5db90f9620<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-ep-msi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-ep-msi.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * PCI Endpoint *Function* side MSI header file</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 NXP</div><div class='add'>+ * Author: Frank Li &lt;Frank.Li@nxp.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PCI_EP_MSI__</div><div class='add'>+#define __PCI_EP_MSI__</div><div class='add'>+</div><div class='add'>+struct pci_epf;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI_ENDPOINT_MSI_DOORBELL</div><div class='add'>+int pci_epf_alloc_doorbell(struct pci_epf *epf, u16 nums);</div><div class='add'>+void pci_epf_free_doorbell(struct pci_epf *epf);</div><div class='add'>+#else</div><div class='add'>+static inline int pci_epf_alloc_doorbell(struct pci_epf *epf, u16 nums)</div><div class='add'>+{</div><div class='add'>+	return -ENODATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pci_epf_free_doorbell(struct pci_epf *epf)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_GENERIC_MSI_IRQ */</div><div class='add'>+</div><div class='add'>+#endif /* __PCI_EP_MSI__ */</div><div class='head'>diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h<br/>index 40ea18f5aa02..4286bfdbfdfa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci-epc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-epc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-epc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-epc.h</a></div><div class='hunk'>@@ -33,10 +33,42 @@ pci_epc_interface_string(enum pci_epc_interface_type type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct pci_epc_map - information about EPC memory for mapping a RC PCI</div><div class='add'>+ *                      address range</div><div class='add'>+ * @pci_addr: start address of the RC PCI address range to map</div><div class='add'>+ * @pci_size: size of the RC PCI address range mapped from @pci_addr</div><div class='add'>+ * @map_pci_addr: RC PCI address used as the first address mapped (may be lower</div><div class='add'>+ *                than @pci_addr)</div><div class='add'>+ * @map_size: size of the controller memory needed for mapping the RC PCI address</div><div class='add'>+ *            range @map_pci_addr..@pci_addr+@pci_size</div><div class='add'>+ * @phys_base: base physical address of the allocated EPC memory for mapping the</div><div class='add'>+ *             RC PCI address range</div><div class='add'>+ * @phys_addr: physical address at which @pci_addr is mapped</div><div class='add'>+ * @virt_base: base virtual address of the allocated EPC memory for mapping the</div><div class='add'>+ *             RC PCI address range</div><div class='add'>+ * @virt_addr: virtual address at which @pci_addr is mapped</div><div class='add'>+ */</div><div class='add'>+struct pci_epc_map {</div><div class='add'>+	u64		pci_addr;</div><div class='add'>+	size_t		pci_size;</div><div class='add'>+</div><div class='add'>+	u64		map_pci_addr;</div><div class='add'>+	size_t		map_size;</div><div class='add'>+</div><div class='add'>+	phys_addr_t	phys_base;</div><div class='add'>+	phys_addr_t	phys_addr;</div><div class='add'>+	void __iomem	*virt_base;</div><div class='add'>+	void __iomem	*virt_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct pci_epc_ops - set of function pointers for performing EPC operations</div><div class='ctx'>  * @write_header: ops to populate configuration space header</div><div class='ctx'>  * @set_bar: ops to configure the BAR</div><div class='ctx'>  * @clear_bar: ops to reset the BAR</div><div class='add'>+ * @align_addr: operation to get the mapping address, mapping size and offset</div><div class='add'>+ *		into a controller memory window needed to map an RC PCI address</div><div class='add'>+ *		region</div><div class='ctx'>  * @map_addr: ops to map CPU address to PCI address</div><div class='ctx'>  * @unmap_addr: ops to unmap CPU address and PCI address</div><div class='ctx'>  * @set_msi: ops to set the requested number of MSI interrupts in the MSI</div><div class='hunk'>@@ -61,15 +93,17 @@ struct pci_epc_ops {</div><div class='ctx'> 			   struct pci_epf_bar *epf_bar);</div><div class='ctx'> 	void	(*clear_bar)(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 			     struct pci_epf_bar *epf_bar);</div><div class='add'>+	u64	(*align_addr)(struct pci_epc *epc, u64 pci_addr, size_t *size,</div><div class='add'>+			      size_t *offset);</div><div class='ctx'> 	int	(*map_addr)(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 			    phys_addr_t addr, u64 pci_addr, size_t size);</div><div class='ctx'> 	void	(*unmap_addr)(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 			      phys_addr_t addr);</div><div class='ctx'> 	int	(*set_msi)(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='del'>-			   u8 interrupts);</div><div class='add'>+			   u8 nr_irqs);</div><div class='ctx'> 	int	(*get_msi)(struct pci_epc *epc, u8 func_no, u8 vfunc_no);</div><div class='ctx'> 	int	(*set_msix)(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='del'>-			    u16 interrupts, enum pci_barno, u32 offset);</div><div class='add'>+			    u16 nr_irqs, enum pci_barno, u32 offset);</div><div class='ctx'> 	int	(*get_msix)(struct pci_epc *epc, u8 func_no, u8 vfunc_no);</div><div class='ctx'> 	int	(*raise_irq)(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 			     unsigned int type, u16 interrupt_num);</div><div class='hunk'>@@ -128,6 +162,9 @@ struct pci_epc_mem {</div><div class='ctx'>  * @group: configfs group representing the PCI EPC device</div><div class='ctx'>  * @lock: mutex to protect pci_epc ops</div><div class='ctx'>  * @function_num_map: bitmap to manage physical function number</div><div class='add'>+ * @domain_nr: PCI domain number of the endpoint controller</div><div class='add'>+ * @init_complete: flag to indicate whether the EPC initialization is complete</div><div class='add'>+ *                 or not</div><div class='ctx'>  */</div><div class='ctx'> struct pci_epc {</div><div class='ctx'> 	struct device			dev;</div><div class='hunk'>@@ -143,33 +180,68 @@ struct pci_epc {</div><div class='ctx'> 	/* mutex to protect against concurrent access of EP controller */</div><div class='ctx'> 	struct mutex			lock;</div><div class='ctx'> 	unsigned long			function_num_map;</div><div class='add'>+	int				domain_nr;</div><div class='add'>+	bool				init_complete;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum pci_epc_bar_type - configurability of endpoint BAR</div><div class='add'>+ * @BAR_PROGRAMMABLE: The BAR mask can be configured by the EPC.</div><div class='add'>+ * @BAR_FIXED: The BAR mask is fixed by the hardware.</div><div class='add'>+ * @BAR_RESIZABLE: The BAR implements the PCI-SIG Resizable BAR Capability.</div><div class='add'>+ *		   NOTE: An EPC driver can currently only set a single supported</div><div class='add'>+ *		   size.</div><div class='add'>+ * @BAR_RESERVED: The BAR should not be touched by an EPF driver.</div><div class='add'>+ */</div><div class='add'>+enum pci_epc_bar_type {</div><div class='add'>+	BAR_PROGRAMMABLE = 0,</div><div class='add'>+	BAR_FIXED,</div><div class='add'>+	BAR_RESIZABLE,</div><div class='add'>+	BAR_RESERVED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pci_epc_bar_desc - hardware description for a BAR</div><div class='add'>+ * @type: the type of the BAR</div><div class='add'>+ * @fixed_size: the fixed size, only applicable if type is BAR_FIXED_MASK.</div><div class='add'>+ * @only_64bit: if true, an EPF driver is not allowed to choose if this BAR</div><div class='add'>+ *		should be configured as 32-bit or 64-bit, the EPF driver must</div><div class='add'>+ *		configure this BAR as 64-bit. Additionally, the BAR succeeding</div><div class='add'>+ *		this BAR must be set to type BAR_RESERVED.</div><div class='add'>+ *</div><div class='add'>+ *		only_64bit should not be set on a BAR of type BAR_RESERVED.</div><div class='add'>+ *		(If BARx is a 64-bit BAR that an EPF driver is not allowed to</div><div class='add'>+ *		touch, then both BARx and BARx+1 must be set to type</div><div class='add'>+ *		BAR_RESERVED.)</div><div class='add'>+ */</div><div class='add'>+struct pci_epc_bar_desc {</div><div class='add'>+	enum pci_epc_bar_type type;</div><div class='add'>+	u64 fixed_size;</div><div class='add'>+	bool only_64bit;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct pci_epc_features - features supported by a EPC device per function</div><div class='ctx'>  * @linkup_notifier: indicate if the EPC device can notify EPF driver on link up</div><div class='del'>- * @core_init_notifier: indicate cores that can notify about their availability</div><div class='del'>- *			for initialization</div><div class='ctx'>  * @msi_capable: indicate if the endpoint function has MSI capability</div><div class='ctx'>  * @msix_capable: indicate if the endpoint function has MSI-X capability</div><div class='del'>- * @reserved_bar: bitmap to indicate reserved BAR unavailable to function driver</div><div class='del'>- * @bar_fixed_64bit: bitmap to indicate fixed 64bit BARs</div><div class='del'>- * @bar_fixed_size: Array specifying the size supported by each BAR</div><div class='add'>+ * @intx_capable: indicate if the endpoint can raise INTx interrupts</div><div class='add'>+ * @bar: array specifying the hardware description for each BAR</div><div class='ctx'>  * @align: alignment size required for BAR buffer allocation</div><div class='ctx'>  */</div><div class='ctx'> struct pci_epc_features {</div><div class='ctx'> 	unsigned int	linkup_notifier : 1;</div><div class='del'>-	unsigned int	core_init_notifier : 1;</div><div class='ctx'> 	unsigned int	msi_capable : 1;</div><div class='ctx'> 	unsigned int	msix_capable : 1;</div><div class='del'>-	u8	reserved_bar;</div><div class='del'>-	u8	bar_fixed_64bit;</div><div class='del'>-	u64	bar_fixed_size[PCI_STD_NUM_BARS];</div><div class='add'>+	unsigned int	intx_capable : 1;</div><div class='add'>+	struct	pci_epc_bar_desc bar[PCI_STD_NUM_BARS];</div><div class='ctx'> 	size_t	align;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_pci_epc(device) container_of((device), struct pci_epc, dev)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI_ENDPOINT</div><div class='add'>+</div><div class='ctx'> #define pci_epc_create(dev, ops)    \</div><div class='ctx'> 		__pci_epc_create((dev), (ops), THIS_MODULE)</div><div class='ctx'> #define devm_pci_epc_create(dev, ops)    \</div><div class='hunk'>@@ -191,18 +263,20 @@ __devm_pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,</div><div class='ctx'> struct pci_epc *</div><div class='ctx'> __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,</div><div class='ctx'> 		 struct module *owner);</div><div class='del'>-void devm_pci_epc_destroy(struct device *dev, struct pci_epc *epc);</div><div class='ctx'> void pci_epc_destroy(struct pci_epc *epc);</div><div class='ctx'> int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf,</div><div class='ctx'> 		    enum pci_epc_interface_type type);</div><div class='ctx'> void pci_epc_linkup(struct pci_epc *epc);</div><div class='ctx'> void pci_epc_linkdown(struct pci_epc *epc);</div><div class='ctx'> void pci_epc_init_notify(struct pci_epc *epc);</div><div class='del'>-void pci_epc_bme_notify(struct pci_epc *epc);</div><div class='add'>+void pci_epc_notify_pending_init(struct pci_epc *epc, struct pci_epf *epf);</div><div class='add'>+void pci_epc_deinit_notify(struct pci_epc *epc);</div><div class='add'>+void pci_epc_bus_master_enable_notify(struct pci_epc *epc);</div><div class='ctx'> void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf,</div><div class='ctx'> 			enum pci_epc_interface_type type);</div><div class='ctx'> int pci_epc_write_header(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 			 struct pci_epf_header *hdr);</div><div class='add'>+int pci_epc_bar_size_to_rebar_cap(size_t size, u32 *cap);</div><div class='ctx'> int pci_epc_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 		    struct pci_epf_bar *epf_bar);</div><div class='ctx'> void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='hunk'>@@ -212,11 +286,10 @@ int pci_epc_map_addr(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 		     u64 pci_addr, size_t size);</div><div class='ctx'> void pci_epc_unmap_addr(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 			phys_addr_t phys_addr);</div><div class='del'>-int pci_epc_set_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='del'>-		    u8 interrupts);</div><div class='add'>+int pci_epc_set_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no, u8 nr_irqs);</div><div class='ctx'> int pci_epc_get_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no);</div><div class='del'>-int pci_epc_set_msix(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='del'>-		     u16 interrupts, enum pci_barno, u32 offset);</div><div class='add'>+int pci_epc_set_msix(struct pci_epc *epc, u8 func_no, u8 vfunc_no, u16 nr_irqs,</div><div class='add'>+		     enum pci_barno, u32 offset);</div><div class='ctx'> int pci_epc_get_msix(struct pci_epc *epc, u8 func_no, u8 vfunc_no);</div><div class='ctx'> int pci_epc_map_msi_irq(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='ctx'> 			phys_addr_t phys_addr, u8 interrupt_num,</div><div class='hunk'>@@ -244,4 +317,18 @@ void __iomem *pci_epc_mem_alloc_addr(struct pci_epc *epc,</div><div class='ctx'> 				     phys_addr_t *phys_addr, size_t size);</div><div class='ctx'> void pci_epc_mem_free_addr(struct pci_epc *epc, phys_addr_t phys_addr,</div><div class='ctx'> 			   void __iomem *virt_addr, size_t size);</div><div class='add'>+int pci_epc_mem_map(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='add'>+		    u64 pci_addr, size_t pci_size, struct pci_epc_map *map);</div><div class='add'>+void pci_epc_mem_unmap(struct pci_epc *epc, u8 func_no, u8 vfunc_no,</div><div class='add'>+		       struct pci_epc_map *map);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline void pci_epc_init_notify(struct pci_epc *epc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pci_epc_deinit_notify(struct pci_epc *epc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PCI_ENDPOINT */</div><div class='ctx'> #endif /* __LINUX_PCI_EPC_H */</div><div class='head'>diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h<br/>index 77b146e0f672..48f68c4dcfa5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci-epf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-epf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-epf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-epf.h</a></div><div class='hunk'>@@ -12,9 +12,11 @@</div><div class='ctx'> #include &lt;linux/configfs.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pci_epf;</div><div class='add'>+struct pci_epc_features;</div><div class='ctx'> enum pci_epc_interface_type;</div><div class='ctx'> </div><div class='ctx'> enum pci_barno {</div><div class='hunk'>@@ -37,7 +39,7 @@ enum pci_barno {</div><div class='ctx'>  * @baseclass_code: broadly classifies the type of function the device performs</div><div class='ctx'>  * @cache_line_size: specifies the system cacheline size in units of DWORDs</div><div class='ctx'>  * @subsys_vendor_id: vendor of the add-in card or subsystem</div><div class='del'>- * @subsys_id: id specific to vendor</div><div class='add'>+ * @subsys_id: ID specific to vendor</div><div class='ctx'>  * @interrupt_pin: interrupt pin the device (or device function) uses</div><div class='ctx'>  */</div><div class='ctx'> struct pci_epf_header {</div><div class='hunk'>@@ -58,7 +60,7 @@ struct pci_epf_header {</div><div class='ctx'>  * @bind: ops to perform when a EPC device has been bound to EPF device</div><div class='ctx'>  * @unbind: ops to perform when a binding has been lost between a EPC device</div><div class='ctx'>  *	    and EPF device</div><div class='del'>- * @add_cfs: ops to initialize function specific configfs attributes</div><div class='add'>+ * @add_cfs: ops to initialize function-specific configfs attributes</div><div class='ctx'>  */</div><div class='ctx'> struct pci_epf_ops {</div><div class='ctx'> 	int	(*bind)(struct pci_epf *epf);</div><div class='hunk'>@@ -69,16 +71,18 @@ struct pci_epf_ops {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct pci_epc_event_ops - Callbacks for capturing the EPC events</div><div class='del'>- * @core_init: Callback for the EPC initialization complete event</div><div class='add'>+ * @epc_init: Callback for the EPC initialization complete event</div><div class='add'>+ * @epc_deinit: Callback for the EPC deinitialization event</div><div class='ctx'>  * @link_up: Callback for the EPC link up event</div><div class='ctx'>  * @link_down: Callback for the EPC link down event</div><div class='del'>- * @bme: Callback for the EPC BME (Bus Master Enable) event</div><div class='add'>+ * @bus_master_enable: Callback for the EPC Bus Master Enable event</div><div class='ctx'>  */</div><div class='ctx'> struct pci_epc_event_ops {</div><div class='del'>-	int (*core_init)(struct pci_epf *epf);</div><div class='add'>+	int (*epc_init)(struct pci_epf *epf);</div><div class='add'>+	void (*epc_deinit)(struct pci_epf *epf);</div><div class='ctx'> 	int (*link_up)(struct pci_epf *epf);</div><div class='ctx'> 	int (*link_down)(struct pci_epf *epf);</div><div class='del'>-	int (*bme)(struct pci_epf *epf);</div><div class='add'>+	int (*bus_master_enable)(struct pci_epf *epf);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -104,14 +108,15 @@ struct pci_epf_driver {</div><div class='ctx'> 	const struct pci_epf_device_id	*id_table;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_pci_epf_driver(drv) (container_of((drv), struct pci_epf_driver, \</div><div class='del'>-				driver))</div><div class='add'>+#define to_pci_epf_driver(drv) container_of_const((drv), struct pci_epf_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct pci_epf_bar - represents the BAR of EPF device</div><div class='ctx'>  * @phys_addr: physical address that should be mapped to the BAR</div><div class='ctx'>  * @addr: virtual address corresponding to the @phys_addr</div><div class='ctx'>  * @size: the size of the address space present in BAR</div><div class='add'>+ * @mem_size: the size actually allocated to accommodate the iATU alignment</div><div class='add'>+ *            requirement</div><div class='ctx'>  * @barno: BAR number</div><div class='ctx'>  * @flags: flags that are set for the BAR</div><div class='ctx'>  */</div><div class='hunk'>@@ -119,11 +124,22 @@ struct pci_epf_bar {</div><div class='ctx'> 	dma_addr_t	phys_addr;</div><div class='ctx'> 	void		*addr;</div><div class='ctx'> 	size_t		size;</div><div class='add'>+	size_t		mem_size;</div><div class='ctx'> 	enum pci_barno	barno;</div><div class='ctx'> 	int		flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct pci_epf_doorbell_msg - represents doorbell message</div><div class='add'>+ * @msg: MSI message</div><div class='add'>+ * @virq: IRQ number of this doorbell MSI message</div><div class='add'>+ */</div><div class='add'>+struct pci_epf_doorbell_msg {</div><div class='add'>+	struct msi_msg msg;</div><div class='add'>+	int virq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct pci_epf - represents the PCI EPF device</div><div class='ctx'>  * @dev: the PCI EPF device</div><div class='ctx'>  * @name: the name of the PCI EPF device</div><div class='hunk'>@@ -136,7 +152,7 @@ struct pci_epf_bar {</div><div class='ctx'>  * @epc: the EPC device to which this EPF device is bound</div><div class='ctx'>  * @epf_pf: the physical EPF device to which this virtual EPF device is bound</div><div class='ctx'>  * @driver: the EPF driver to which this EPF device is bound</div><div class='del'>- * @id: Pointer to the EPF device ID</div><div class='add'>+ * @id: pointer to the EPF device ID</div><div class='ctx'>  * @list: to add pci_epf as a list of PCI endpoint functions to pci_epc</div><div class='ctx'>  * @lock: mutex to protect pci_epf_ops</div><div class='ctx'>  * @sec_epc: the secondary EPC device to which this EPF device is bound</div><div class='hunk'>@@ -149,13 +165,15 @@ struct pci_epf_bar {</div><div class='ctx'>  * @is_vf: true - virtual function, false - physical function</div><div class='ctx'>  * @vfunction_num_map: bitmap to manage virtual function number</div><div class='ctx'>  * @pci_vepf: list of virtual endpoint functions associated with this function</div><div class='del'>- * @event_ops: Callbacks for capturing the EPC events</div><div class='add'>+ * @event_ops: callbacks for capturing the EPC events</div><div class='add'>+ * @db_msg: data for MSI from RC side</div><div class='add'>+ * @num_db: number of doorbells</div><div class='ctx'>  */</div><div class='ctx'> struct pci_epf {</div><div class='ctx'> 	struct device		dev;</div><div class='ctx'> 	const char		*name;</div><div class='ctx'> 	struct pci_epf_header	*header;</div><div class='del'>-	struct pci_epf_bar	bar[6];</div><div class='add'>+	struct pci_epf_bar	bar[PCI_STD_NUM_BARS];</div><div class='ctx'> 	u8			msi_interrupts;</div><div class='ctx'> 	u16			msix_interrupts;</div><div class='ctx'> 	u8			func_no;</div><div class='hunk'>@@ -172,7 +190,7 @@ struct pci_epf {</div><div class='ctx'> 	/* Below members are to attach secondary EPC to an endpoint function */</div><div class='ctx'> 	struct pci_epc		*sec_epc;</div><div class='ctx'> 	struct list_head	sec_epc_list;</div><div class='del'>-	struct pci_epf_bar	sec_epc_bar[6];</div><div class='add'>+	struct pci_epf_bar	sec_epc_bar[PCI_STD_NUM_BARS];</div><div class='ctx'> 	u8			sec_epc_func_no;</div><div class='ctx'> 	struct config_group	*group;</div><div class='ctx'> 	unsigned int		is_bound;</div><div class='hunk'>@@ -180,14 +198,17 @@ struct pci_epf {</div><div class='ctx'> 	unsigned long		vfunction_num_map;</div><div class='ctx'> 	struct list_head	pci_vepf;</div><div class='ctx'> 	const struct pci_epc_event_ops *event_ops;</div><div class='add'>+	struct pci_epf_doorbell_msg *db_msg;</div><div class='add'>+	u16 num_db;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct pci_epf_msix_tbl - represents the MSIX table entry structure</div><div class='del'>- * @msg_addr: Writes to this address will trigger MSIX interrupt in host</div><div class='del'>- * @msg_data: Data that should be written to @msg_addr to trigger MSIX interrupt</div><div class='add'>+ * struct pci_epf_msix_tbl - represents the MSI-X table entry structure</div><div class='add'>+ * @msg_addr: Writes to this address will trigger MSI-X interrupt in host</div><div class='add'>+ * @msg_data: Data that should be written to @msg_addr to trigger MSI-X</div><div class='add'>+ *   interrupt</div><div class='ctx'>  * @vector_ctrl: Identifies if the function is prohibited from sending a message</div><div class='del'>- * using this MSIX table entry</div><div class='add'>+ *   using this MSI-X table entry</div><div class='ctx'>  */</div><div class='ctx'> struct pci_epf_msix_tbl {</div><div class='ctx'> 	u64 msg_addr;</div><div class='hunk'>@@ -216,9 +237,19 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver,</div><div class='ctx'> 			      struct module *owner);</div><div class='ctx'> void pci_epf_unregister_driver(struct pci_epf_driver *driver);</div><div class='ctx'> void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar,</div><div class='del'>-			  size_t align, enum pci_epc_interface_type type);</div><div class='add'>+			  const struct pci_epc_features *epc_features,</div><div class='add'>+			  enum pci_epc_interface_type type);</div><div class='ctx'> void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar,</div><div class='ctx'> 			enum pci_epc_interface_type type);</div><div class='add'>+</div><div class='add'>+int pci_epf_assign_bar_space(struct pci_epf *epf, size_t size,</div><div class='add'>+			     enum pci_barno bar,</div><div class='add'>+			     const struct pci_epc_features *epc_features,</div><div class='add'>+			     enum pci_epc_interface_type type,</div><div class='add'>+			     dma_addr_t bar_addr);</div><div class='add'>+</div><div class='add'>+int pci_epf_align_inbound_addr(struct pci_epf *epf, enum pci_barno bar,</div><div class='add'>+			       u64 addr, dma_addr_t *base, size_t *off);</div><div class='ctx'> int pci_epf_bind(struct pci_epf *epf);</div><div class='ctx'> void pci_epf_unbind(struct pci_epf *epf);</div><div class='ctx'> int pci_epf_add_vepf(struct pci_epf *epf_pf, struct pci_epf *epf_vf);</div><div class='head'>diff --git a/include/linux/pci-ide.h b/include/linux/pci-ide.h<br/>new file mode 100644<br/>index 000000000000..37a1ad9501b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-ide.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-ide.h</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Common helpers for drivers (e.g. low-level PCI/TSM drivers) implementing the</div><div class='add'>+ * IDE key management protocol (IDE_KM) as defined by:</div><div class='add'>+ * PCIe r7.0 section 6.33 Integrity &amp; Data Encryption (IDE)</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2024-2025 Intel Corporation. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PCI_IDE_H__</div><div class='add'>+#define __PCI_IDE_H__</div><div class='add'>+</div><div class='add'>+enum pci_ide_partner_select {</div><div class='add'>+	PCI_IDE_EP,</div><div class='add'>+	PCI_IDE_RP,</div><div class='add'>+	PCI_IDE_PARTNER_MAX,</div><div class='add'>+	/*</div><div class='add'>+	 * In addition to the resources in each partner port the</div><div class='add'>+	 * platform / host-bridge additionally has a Stream ID pool that</div><div class='add'>+	 * it shares across root ports. Let pci_ide_stream_alloc() use</div><div class='add'>+	 * the alloc_stream_index() helper as endpoints and root ports.</div><div class='add'>+	 */</div><div class='add'>+	PCI_IDE_HB = PCI_IDE_PARTNER_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pci_ide_partner - Per port pair Selective IDE Stream settings</div><div class='add'>+ * @rid_start: Partner Port Requester ID range start</div><div class='add'>+ * @rid_end: Partner Port Requester ID range end</div><div class='add'>+ * @stream_index: Selective IDE Stream Register Block selection</div><div class='add'>+ * @mem_assoc: PCI bus memory address association for targeting peer partner</div><div class='add'>+ * @pref_assoc: PCI bus prefetchable memory address association for</div><div class='add'>+ *		targeting peer partner</div><div class='add'>+ * @default_stream: Endpoint uses this stream for all upstream TLPs regardless of</div><div class='add'>+ *		    address and RID association registers</div><div class='add'>+ * @setup: flag to track whether to run pci_ide_stream_teardown() for this</div><div class='add'>+ *	   partner slot</div><div class='add'>+ * @enable: flag whether to run pci_ide_stream_disable() for this partner slot</div><div class='add'>+ *</div><div class='add'>+ * By default, pci_ide_stream_alloc() initializes @mem_assoc and @pref_assoc</div><div class='add'>+ * with the immediate ancestor downstream port memory ranges (i.e. Type 1</div><div class='add'>+ * Configuration Space Header values). Caller may zero size ({0, -1}) the range</div><div class='add'>+ * to drop it from consideration at pci_ide_stream_setup() time.</div><div class='add'>+ */</div><div class='add'>+struct pci_ide_partner {</div><div class='add'>+	u16 rid_start;</div><div class='add'>+	u16 rid_end;</div><div class='add'>+	u8 stream_index;</div><div class='add'>+	struct pci_bus_region mem_assoc;</div><div class='add'>+	struct pci_bus_region pref_assoc;</div><div class='add'>+	unsigned int default_stream:1;</div><div class='add'>+	unsigned int setup:1;</div><div class='add'>+	unsigned int enable:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pci_ide_regs - Hardware register association settings for Selective</div><div class='add'>+ *			 IDE Streams</div><div class='add'>+ * @rid1: IDE RID Association Register 1</div><div class='add'>+ * @rid2: IDE RID Association Register 2</div><div class='add'>+ * @addr: Up to two address association blocks (IDE Address Association Register</div><div class='add'>+ *	  1 through 3) for MMIO and prefetchable MMIO</div><div class='add'>+ * @nr_addr: Number of address association blocks initialized</div><div class='add'>+ *</div><div class='add'>+ * See pci_ide_stream_to_regs()</div><div class='add'>+ */</div><div class='add'>+struct pci_ide_regs {</div><div class='add'>+	u32 rid1;</div><div class='add'>+	u32 rid2;</div><div class='add'>+	struct {</div><div class='add'>+		u32 assoc1;</div><div class='add'>+		u32 assoc2;</div><div class='add'>+		u32 assoc3;</div><div class='add'>+	} addr[2];</div><div class='add'>+	int nr_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pci_ide - PCIe Selective IDE Stream descriptor</div><div class='add'>+ * @pdev: PCIe Endpoint in the pci_ide_partner pair</div><div class='add'>+ * @partner: per-partner settings</div><div class='add'>+ * @host_bridge_stream: allocated from host bridge @ide_stream_ida pool</div><div class='add'>+ * @stream_id: unique Stream ID (within Partner Port pairing)</div><div class='add'>+ * @name: name of the established Selective IDE Stream in sysfs</div><div class='add'>+ * @tsm_dev: For TSM established IDE, the TSM device context</div><div class='add'>+ *</div><div class='add'>+ * Negative @stream_id values indicate "uninitialized" on the</div><div class='add'>+ * expectation that with TSM established IDE the TSM owns the stream_id</div><div class='add'>+ * allocation.</div><div class='add'>+ */</div><div class='add'>+struct pci_ide {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct pci_ide_partner partner[PCI_IDE_PARTNER_MAX];</div><div class='add'>+	u8 host_bridge_stream;</div><div class='add'>+	int stream_id;</div><div class='add'>+	const char *name;</div><div class='add'>+	struct tsm_dev *tsm_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some devices need help with aliased stream-ids even for idle streams. Use</div><div class='add'>+ * this id as the "never enabled" place holder.</div><div class='add'>+ */</div><div class='add'>+#define PCI_IDE_RESERVED_STREAM_ID 255</div><div class='add'>+</div><div class='add'>+void pci_ide_set_nr_streams(struct pci_host_bridge *hb, u16 nr);</div><div class='add'>+struct pci_ide_partner *pci_ide_to_settings(struct pci_dev *pdev,</div><div class='add'>+					    struct pci_ide *ide);</div><div class='add'>+struct pci_ide *pci_ide_stream_alloc(struct pci_dev *pdev);</div><div class='add'>+void pci_ide_stream_free(struct pci_ide *ide);</div><div class='add'>+int  pci_ide_stream_register(struct pci_ide *ide);</div><div class='add'>+void pci_ide_stream_unregister(struct pci_ide *ide);</div><div class='add'>+void pci_ide_stream_setup(struct pci_dev *pdev, struct pci_ide *ide);</div><div class='add'>+void pci_ide_stream_teardown(struct pci_dev *pdev, struct pci_ide *ide);</div><div class='add'>+int pci_ide_stream_enable(struct pci_dev *pdev, struct pci_ide *ide);</div><div class='add'>+void pci_ide_stream_disable(struct pci_dev *pdev, struct pci_ide *ide);</div><div class='add'>+void pci_ide_stream_release(struct pci_ide *ide);</div><div class='add'>+DEFINE_FREE(pci_ide_stream_release, struct pci_ide *, if (_T) pci_ide_stream_release(_T))</div><div class='add'>+#endif /* __PCI_IDE_H__ */</div><div class='head'>diff --git a/include/linux/pci-p2pdma.h b/include/linux/pci-p2pdma.h<br/>index 2c07aa6b7665..517e121d2598 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci-p2pdma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci-p2pdma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-p2pdma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-p2pdma.h</a></div><div class='hunk'>@@ -16,12 +16,62 @@</div><div class='ctx'> struct block_device;</div><div class='ctx'> struct scatterlist;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct p2pdma_provider</div><div class='add'>+ *</div><div class='add'>+ * A p2pdma provider is a range of MMIO address space available to the CPU.</div><div class='add'>+ */</div><div class='add'>+struct p2pdma_provider {</div><div class='add'>+	struct device *owner;</div><div class='add'>+	u64 bus_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum pci_p2pdma_map_type {</div><div class='add'>+	/*</div><div class='add'>+	 * PCI_P2PDMA_MAP_UNKNOWN: Used internally as an initial state before</div><div class='add'>+	 * the mapping type has been calculated. Exported routines for the API</div><div class='add'>+	 * will never return this value.</div><div class='add'>+	 */</div><div class='add'>+	PCI_P2PDMA_MAP_UNKNOWN = 0,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not a PCI P2PDMA transfer.</div><div class='add'>+	 */</div><div class='add'>+	PCI_P2PDMA_MAP_NONE,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PCI_P2PDMA_MAP_NOT_SUPPORTED: Indicates the transaction will</div><div class='add'>+	 * traverse the host bridge and the host bridge is not in the</div><div class='add'>+	 * allowlist. DMA Mapping routines should return an error when</div><div class='add'>+	 * this is returned.</div><div class='add'>+	 */</div><div class='add'>+	PCI_P2PDMA_MAP_NOT_SUPPORTED,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PCI_P2PDMA_MAP_BUS_ADDR: Indicates that two devices can talk to</div><div class='add'>+	 * each other directly through a PCI switch and the transaction will</div><div class='add'>+	 * not traverse the host bridge. Such a mapping should program</div><div class='add'>+	 * the DMA engine with PCI bus addresses.</div><div class='add'>+	 */</div><div class='add'>+	PCI_P2PDMA_MAP_BUS_ADDR,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * PCI_P2PDMA_MAP_THRU_HOST_BRIDGE: Indicates two devices can talk</div><div class='add'>+	 * to each other, but the transaction traverses a host bridge on the</div><div class='add'>+	 * allowlist. In this case, a normal mapping either with CPU physical</div><div class='add'>+	 * addresses (in the case of dma-direct) or IOVA addresses (in the</div><div class='add'>+	 * case of IOMMUs) should be used to program the DMA engine.</div><div class='add'>+	 */</div><div class='add'>+	PCI_P2PDMA_MAP_THRU_HOST_BRIDGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI_P2PDMA</div><div class='add'>+int pcim_p2pdma_init(struct pci_dev *pdev);</div><div class='add'>+struct p2pdma_provider *pcim_p2pdma_provider(struct pci_dev *pdev, int bar);</div><div class='ctx'> int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar, size_t size,</div><div class='ctx'> 		u64 offset);</div><div class='ctx'> int pci_p2pdma_distance_many(struct pci_dev *provider, struct device **clients,</div><div class='ctx'> 			     int num_clients, bool verbose);</div><div class='del'>-bool pci_has_p2pmem(struct pci_dev *pdev);</div><div class='ctx'> struct pci_dev *pci_p2pmem_find_many(struct device **clients, int num_clients);</div><div class='ctx'> void *pci_alloc_p2pmem(struct pci_dev *pdev, size_t size);</div><div class='ctx'> void pci_free_p2pmem(struct pci_dev *pdev, void *addr, size_t size);</div><div class='hunk'>@@ -34,7 +84,18 @@ int pci_p2pdma_enable_store(const char *page, struct pci_dev **p2p_dev,</div><div class='ctx'> 			    bool *use_p2pdma);</div><div class='ctx'> ssize_t pci_p2pdma_enable_show(char *page, struct pci_dev *p2p_dev,</div><div class='ctx'> 			       bool use_p2pdma);</div><div class='add'>+enum pci_p2pdma_map_type pci_p2pdma_map_type(struct p2pdma_provider *provider,</div><div class='add'>+					     struct device *dev);</div><div class='ctx'> #else /* CONFIG_PCI_P2PDMA */</div><div class='add'>+static inline int pcim_p2pdma_init(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+static inline struct p2pdma_provider *pcim_p2pdma_provider(struct pci_dev *pdev,</div><div class='add'>+							   int bar)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> static inline int pci_p2pdma_add_resource(struct pci_dev *pdev, int bar,</div><div class='ctx'> 		size_t size, u64 offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -45,10 +106,6 @@ static inline int pci_p2pdma_distance_many(struct pci_dev *provider,</div><div class='ctx'> {</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='del'>-static inline bool pci_has_p2pmem(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='ctx'> static inline struct pci_dev *pci_p2pmem_find_many(struct device **clients,</div><div class='ctx'> 						   int num_clients)</div><div class='ctx'> {</div><div class='hunk'>@@ -90,6 +147,11 @@ static inline ssize_t pci_p2pdma_enable_show(char *page,</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(page, "none\n");</div><div class='ctx'> }</div><div class='add'>+static inline enum pci_p2pdma_map_type</div><div class='add'>+pci_p2pdma_map_type(struct p2pdma_provider *provider, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return PCI_P2PDMA_MAP_NOT_SUPPORTED;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_PCI_P2PDMA */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -104,4 +166,48 @@ static inline struct pci_dev *pci_p2pmem_find(struct device *client)</div><div class='ctx'> 	return pci_p2pmem_find_many(&amp;client, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct pci_p2pdma_map_state {</div><div class='add'>+	struct p2pdma_provider *mem;</div><div class='add'>+	enum pci_p2pdma_map_type map;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* helper for pci_p2pdma_state(), do not use directly */</div><div class='add'>+void __pci_p2pdma_update_state(struct pci_p2pdma_map_state *state,</div><div class='add'>+		struct device *dev, struct page *page);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pci_p2pdma_state - check the P2P transfer state of a page</div><div class='add'>+ * @state:	P2P state structure</div><div class='add'>+ * @dev:	device to transfer to/from</div><div class='add'>+ * @page:	page to map</div><div class='add'>+ *</div><div class='add'>+ * Check if @page is a PCI P2PDMA page, and if yes of what kind.  Returns the</div><div class='add'>+ * map type, and updates @state with all information needed for a P2P transfer.</div><div class='add'>+ */</div><div class='add'>+static inline enum pci_p2pdma_map_type</div><div class='add'>+pci_p2pdma_state(struct pci_p2pdma_map_state *state, struct device *dev,</div><div class='add'>+		struct page *page)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_PCI_P2PDMA) &amp;&amp; is_pci_p2pdma_page(page)) {</div><div class='add'>+		__pci_p2pdma_update_state(state, dev, page);</div><div class='add'>+		return state-&gt;map;</div><div class='add'>+	}</div><div class='add'>+	return PCI_P2PDMA_MAP_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pci_p2pdma_bus_addr_map - Translate a physical address to a bus address</div><div class='add'>+ *			     for a PCI_P2PDMA_MAP_BUS_ADDR transfer.</div><div class='add'>+ * @provider:	P2P provider structure</div><div class='add'>+ * @paddr:	physical address to map</div><div class='add'>+ *</div><div class='add'>+ * Map a physically contiguous PCI_P2PDMA_MAP_BUS_ADDR transfer.</div><div class='add'>+ */</div><div class='add'>+static inline dma_addr_t</div><div class='add'>+pci_p2pdma_bus_addr_map(struct p2pdma_provider *provider, phys_addr_t paddr)</div><div class='add'>+{</div><div class='add'>+	return paddr + provider-&gt;bus_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_PCI_P2P_H */</div><div class='head'>diff --git a/include/linux/pci-pwrctrl.h b/include/linux/pci-pwrctrl.h<br/>new file mode 100644<br/>index 000000000000..4aefc7901cd1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-pwrctrl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-pwrctrl.h</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PCI_PWRCTRL_H__</div><div class='add'>+#define __PCI_PWRCTRL_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct device_link;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is a simple framework for solving the issue of PCI devices that require</div><div class='add'>+ * certain resources (regulators, GPIOs, clocks) to be enabled before the</div><div class='add'>+ * device can actually be detected on the PCI bus.</div><div class='add'>+ *</div><div class='add'>+ * The idea is to reuse the platform bus to populate OF nodes describing the</div><div class='add'>+ * PCI device and its resources, let these platform devices probe and enable</div><div class='add'>+ * relevant resources and then trigger a rescan of the PCI bus allowing for the</div><div class='add'>+ * same device (with a second associated struct device) to be registered with</div><div class='add'>+ * the PCI subsystem.</div><div class='add'>+ *</div><div class='add'>+ * To preserve a correct hierarchy for PCI power management and device reset,</div><div class='add'>+ * we create a device link between the power control platform device (parent)</div><div class='add'>+ * and the supplied PCI device (child).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pci_pwrctrl - PCI device power control context.</div><div class='add'>+ * @dev: Address of the power controlling device.</div><div class='add'>+ *</div><div class='add'>+ * An object of this type must be allocated by the PCI power control device and</div><div class='add'>+ * passed to the pwrctrl subsystem to trigger a bus rescan and setup a device</div><div class='add'>+ * link with the device once it's up.</div><div class='add'>+ */</div><div class='add'>+struct pci_pwrctrl {</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	/* private: internal use only */</div><div class='add'>+	struct notifier_block nb;</div><div class='add'>+	struct device_link *link;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void pci_pwrctrl_init(struct pci_pwrctrl *pwrctrl, struct device *dev);</div><div class='add'>+int pci_pwrctrl_device_set_ready(struct pci_pwrctrl *pwrctrl);</div><div class='add'>+void pci_pwrctrl_device_unset_ready(struct pci_pwrctrl *pwrctrl);</div><div class='add'>+int devm_pci_pwrctrl_device_set_ready(struct device *dev,</div><div class='add'>+				     struct pci_pwrctrl *pwrctrl);</div><div class='add'>+</div><div class='add'>+#endif /* __PCI_PWRCTRL_H__ */</div><div class='head'>diff --git a/include/linux/pci-tph.h b/include/linux/pci-tph.h<br/>new file mode 100644<br/>index 000000000000..ba28140ce670<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-tph.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-tph.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * TPH (TLP Processing Hints)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Advanced Micro Devices, Inc.</div><div class='add'>+ *     Eric Van Tassell &lt;Eric.VanTassell@amd.com&gt;</div><div class='add'>+ *     Wei Huang &lt;wei.huang2@amd.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef LINUX_PCI_TPH_H</div><div class='add'>+#define LINUX_PCI_TPH_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * According to the ECN for PCI Firmware Spec, Steering Tag can be different</div><div class='add'>+ * depending on the memory type: Volatile Memory or Persistent Memory. When a</div><div class='add'>+ * caller query about a target's Steering Tag, it must provide the target's</div><div class='add'>+ * tph_mem_type. ECN link: https://members.pcisig.com/wg/PCI-SIG/document/15470.</div><div class='add'>+ */</div><div class='add'>+enum tph_mem_type {</div><div class='add'>+	TPH_MEM_TYPE_VM,	/* volatile memory */</div><div class='add'>+	TPH_MEM_TYPE_PM		/* persistent memory */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCIE_TPH</div><div class='add'>+int pcie_tph_set_st_entry(struct pci_dev *pdev,</div><div class='add'>+			  unsigned int index, u16 tag);</div><div class='add'>+int pcie_tph_get_cpu_st(struct pci_dev *dev,</div><div class='add'>+			enum tph_mem_type mem_type,</div><div class='add'>+			unsigned int cpu_uid, u16 *tag);</div><div class='add'>+void pcie_disable_tph(struct pci_dev *pdev);</div><div class='add'>+int pcie_enable_tph(struct pci_dev *pdev, int mode);</div><div class='add'>+u16 pcie_tph_get_st_table_size(struct pci_dev *pdev);</div><div class='add'>+u32 pcie_tph_get_st_table_loc(struct pci_dev *pdev);</div><div class='add'>+#else</div><div class='add'>+static inline int pcie_tph_set_st_entry(struct pci_dev *pdev,</div><div class='add'>+					unsigned int index, u16 tag)</div><div class='add'>+{ return -EINVAL; }</div><div class='add'>+static inline int pcie_tph_get_cpu_st(struct pci_dev *dev,</div><div class='add'>+				      enum tph_mem_type mem_type,</div><div class='add'>+				      unsigned int cpu_uid, u16 *tag)</div><div class='add'>+{ return -EINVAL; }</div><div class='add'>+static inline void pcie_disable_tph(struct pci_dev *pdev) { }</div><div class='add'>+static inline int pcie_enable_tph(struct pci_dev *pdev, int mode)</div><div class='add'>+{ return -EINVAL; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_PCI_TPH_H */</div><div class='head'>diff --git a/include/linux/pci-tsm.h b/include/linux/pci-tsm.h<br/>new file mode 100644<br/>index 000000000000..a6435aba03f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci-tsm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci-tsm.h</a></div><div class='hunk'>@@ -0,0 +1,243 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __PCI_TSM_H</div><div class='add'>+#define __PCI_TSM_H</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/sockptr.h&gt;</div><div class='add'>+</div><div class='add'>+struct pci_tsm;</div><div class='add'>+struct tsm_dev;</div><div class='add'>+struct kvm;</div><div class='add'>+enum pci_tsm_req_scope;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct pci_tsm_ops - manage confidential links and security state</div><div class='add'>+ * @link_ops: Coordinate PCIe SPDM and IDE establishment via a platform TSM.</div><div class='add'>+ *	      Provide a secure session transport for TDISP state management</div><div class='add'>+ *	      (typically bare metal physical function operations).</div><div class='add'>+ * @devsec_ops: Lock, unlock, and interrogate the security state of the</div><div class='add'>+ *		function via the platform TSM (typically virtual function</div><div class='add'>+ *		operations).</div><div class='add'>+ *</div><div class='add'>+ * This operations are mutually exclusive either a tsm_dev instance</div><div class='add'>+ * manages physical link properties or it manages function security</div><div class='add'>+ * states like TDISP lock/unlock.</div><div class='add'>+ */</div><div class='add'>+struct pci_tsm_ops {</div><div class='add'>+	/*</div><div class='add'>+	 * struct pci_tsm_link_ops - Manage physical link and the TSM/DSM session</div><div class='add'>+	 * @probe: establish context with the TSM (allocate / wrap 'struct</div><div class='add'>+	 *	   pci_tsm') for follow-on link operations</div><div class='add'>+	 * @remove: destroy link operations context</div><div class='add'>+	 * @connect: establish / validate a secure connection (e.g. IDE)</div><div class='add'>+	 *	     with the device</div><div class='add'>+	 * @disconnect: teardown the secure link</div><div class='add'>+	 * @bind: bind a TDI in preparation for it to be accepted by a TVM</div><div class='add'>+	 * @unbind: remove a TDI from secure operation with a TVM</div><div class='add'>+	 * @guest_req: marshal TVM information and state change requests</div><div class='add'>+	 *</div><div class='add'>+	 * Context: @probe, @remove, @connect, and @disconnect run under</div><div class='add'>+	 * pci_tsm_rwsem held for write to sync with TSM unregistration and</div><div class='add'>+	 * mutual exclusion of @connect and @disconnect. @connect and</div><div class='add'>+	 * @disconnect additionally run under the DSM lock (struct</div><div class='add'>+	 * pci_tsm_pf0::lock) as well as @probe and @remove of the subfunctions.</div><div class='add'>+	 * @bind, @unbind, and @guest_req run under pci_tsm_rwsem held for read</div><div class='add'>+	 * and the DSM lock.</div><div class='add'>+	 */</div><div class='add'>+	struct_group_tagged(pci_tsm_link_ops, link_ops,</div><div class='add'>+		struct pci_tsm *(*probe)(struct tsm_dev *tsm_dev,</div><div class='add'>+					 struct pci_dev *pdev);</div><div class='add'>+		void (*remove)(struct pci_tsm *tsm);</div><div class='add'>+		int (*connect)(struct pci_dev *pdev);</div><div class='add'>+		void (*disconnect)(struct pci_dev *pdev);</div><div class='add'>+		struct pci_tdi *(*bind)(struct pci_dev *pdev,</div><div class='add'>+					struct kvm *kvm, u32 tdi_id);</div><div class='add'>+		void (*unbind)(struct pci_tdi *tdi);</div><div class='add'>+		ssize_t (*guest_req)(struct pci_tdi *tdi,</div><div class='add'>+				     enum pci_tsm_req_scope scope,</div><div class='add'>+				     sockptr_t req_in, size_t in_len,</div><div class='add'>+				     sockptr_t req_out, size_t out_len,</div><div class='add'>+				     u64 *tsm_code);</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * struct pci_tsm_devsec_ops - Manage the security state of the function</div><div class='add'>+	 * @lock: establish context with the TSM (allocate / wrap 'struct</div><div class='add'>+	 *	  pci_tsm') for follow-on security state transitions from the</div><div class='add'>+	 *	  LOCKED state</div><div class='add'>+	 * @unlock: destroy TSM context and return device to UNLOCKED state</div><div class='add'>+	 *</div><div class='add'>+	 * Context: @lock and @unlock run under pci_tsm_rwsem held for write to</div><div class='add'>+	 * sync with TSM unregistration and each other</div><div class='add'>+	 */</div><div class='add'>+	struct_group_tagged(pci_tsm_devsec_ops, devsec_ops,</div><div class='add'>+		struct pci_tsm *(*lock)(struct tsm_dev *tsm_dev,</div><div class='add'>+					struct pci_dev *pdev);</div><div class='add'>+		void (*unlock)(struct pci_tsm *tsm);</div><div class='add'>+	);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pci_tdi - Core TEE I/O Device Interface (TDI) context</div><div class='add'>+ * @pdev: host side representation of guest-side TDI</div><div class='add'>+ * @kvm: TEE VM context of bound TDI</div><div class='add'>+ * @tdi_id: Identifier (virtual BDF) for the TDI as referenced by the TSM and DSM</div><div class='add'>+ */</div><div class='add'>+struct pci_tdi {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct kvm *kvm;</div><div class='add'>+	u32 tdi_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pci_tsm - Core TSM context for a given PCIe endpoint</div><div class='add'>+ * @pdev: Back ref to device function, distinguishes type of pci_tsm context</div><div class='add'>+ * @dsm_dev: PCI Device Security Manager for link operations on @pdev</div><div class='add'>+ * @tsm_dev: PCI TEE Security Manager device for Link Confidentiality or Device</div><div class='add'>+ *	     Function Security operations</div><div class='add'>+ * @tdi: TDI context established by the @bind link operation</div><div class='add'>+ *</div><div class='add'>+ * This structure is wrapped by low level TSM driver data and returned by</div><div class='add'>+ * probe()/lock(), it is freed by the corresponding remove()/unlock().</div><div class='add'>+ *</div><div class='add'>+ * For link operations it serves to cache the association between a Device</div><div class='add'>+ * Security Manager (DSM) and the functions that manager can assign to a TVM.</div><div class='add'>+ * That can be "self", for assigning function0 of a TEE I/O device, a</div><div class='add'>+ * sub-function (SR-IOV virtual function, or non-function0</div><div class='add'>+ * multifunction-device), or a downstream endpoint (PCIe upstream switch-port as</div><div class='add'>+ * DSM).</div><div class='add'>+ */</div><div class='add'>+struct pci_tsm {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct pci_dev *dsm_dev;</div><div class='add'>+	struct tsm_dev *tsm_dev;</div><div class='add'>+	struct pci_tdi *tdi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pci_tsm_pf0 - Physical Function 0 TDISP link context</div><div class='add'>+ * @base_tsm: generic core "tsm" context</div><div class='add'>+ * @lock: mutual exclustion for pci_tsm_ops invocation</div><div class='add'>+ * @doe_mb: PCIe Data Object Exchange mailbox</div><div class='add'>+ */</div><div class='add'>+struct pci_tsm_pf0 {</div><div class='add'>+	struct pci_tsm base_tsm;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	struct pci_doe_mb *doe_mb;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* physical function0 and capable of 'connect' */</div><div class='add'>+static inline bool is_pci_tsm_pf0(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!pci_is_pcie(pdev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;is_virtfn)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allow for a Device Security Manager (DSM) associated with function0</div><div class='add'>+	 * of an Endpoint to coordinate TDISP requests for other functions</div><div class='add'>+	 * (physical or virtual) of the device, or allow for an Upstream Port</div><div class='add'>+	 * DSM to accept TDISP requests for the Endpoints downstream of the</div><div class='add'>+	 * switch.</div><div class='add'>+	 */</div><div class='add'>+	switch (pci_pcie_type(pdev)) {</div><div class='add'>+	case PCI_EXP_TYPE_ENDPOINT:</div><div class='add'>+	case PCI_EXP_TYPE_UPSTREAM:</div><div class='add'>+	case PCI_EXP_TYPE_RC_END:</div><div class='add'>+		if (pdev-&gt;ide_cap || (pdev-&gt;devcap &amp; PCI_EXP_DEVCAP_TEE))</div><div class='add'>+			break;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PCI_FUNC(pdev-&gt;devfn) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum pci_tsm_req_scope - Scope of guest requests to be validated by TSM</div><div class='add'>+ *</div><div class='add'>+ * Guest requests are a transport for a TVM to communicate with a TSM + DSM for</div><div class='add'>+ * a given TDI. A TSM driver is responsible for maintaining the kernel security</div><div class='add'>+ * model and limit commands that may affect the host, or are otherwise outside</div><div class='add'>+ * the typical TDISP operational model.</div><div class='add'>+ */</div><div class='add'>+enum pci_tsm_req_scope {</div><div class='add'>+	/**</div><div class='add'>+	 * @PCI_TSM_REQ_INFO: Read-only, without side effects, request for</div><div class='add'>+	 * typical TDISP collateral information like Device Interface Reports.</div><div class='add'>+	 * No device secrets are permitted, and no device state is changed.</div><div class='add'>+	 */</div><div class='add'>+	PCI_TSM_REQ_INFO = 0,</div><div class='add'>+	/**</div><div class='add'>+	 * @PCI_TSM_REQ_STATE_CHANGE: Request to change the TDISP state from</div><div class='add'>+	 * UNLOCKED-&gt;LOCKED, LOCKED-&gt;RUN, or other architecture specific state</div><div class='add'>+	 * changes to support those transitions for a TDI. No other (unrelated</div><div class='add'>+	 * to TDISP) device / host state, configuration, or data change is</div><div class='add'>+	 * permitted.</div><div class='add'>+	 */</div><div class='add'>+	PCI_TSM_REQ_STATE_CHANGE = 1,</div><div class='add'>+	/**</div><div class='add'>+	 * @PCI_TSM_REQ_DEBUG_READ: Read-only request for debug information</div><div class='add'>+	 *</div><div class='add'>+	 * A method to facilitate TVM information retrieval outside of typical</div><div class='add'>+	 * TDISP operational requirements. No device secrets are permitted.</div><div class='add'>+	 */</div><div class='add'>+	PCI_TSM_REQ_DEBUG_READ = 2,</div><div class='add'>+	/**</div><div class='add'>+	 * @PCI_TSM_REQ_DEBUG_WRITE: Device state changes for debug purposes</div><div class='add'>+	 *</div><div class='add'>+	 * The request may affect the operational state of the device outside of</div><div class='add'>+	 * the TDISP operational model. If allowed, requires CAP_SYS_RAW_IO, and</div><div class='add'>+	 * will taint the kernel.</div><div class='add'>+	 */</div><div class='add'>+	PCI_TSM_REQ_DEBUG_WRITE = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI_TSM</div><div class='add'>+int pci_tsm_register(struct tsm_dev *tsm_dev);</div><div class='add'>+void pci_tsm_unregister(struct tsm_dev *tsm_dev);</div><div class='add'>+int pci_tsm_link_constructor(struct pci_dev *pdev, struct pci_tsm *tsm,</div><div class='add'>+			     struct tsm_dev *tsm_dev);</div><div class='add'>+int pci_tsm_pf0_constructor(struct pci_dev *pdev, struct pci_tsm_pf0 *tsm,</div><div class='add'>+			    struct tsm_dev *tsm_dev);</div><div class='add'>+void pci_tsm_pf0_destructor(struct pci_tsm_pf0 *tsm);</div><div class='add'>+int pci_tsm_doe_transfer(struct pci_dev *pdev, u8 type, const void *req,</div><div class='add'>+			 size_t req_sz, void *resp, size_t resp_sz);</div><div class='add'>+int pci_tsm_bind(struct pci_dev *pdev, struct kvm *kvm, u32 tdi_id);</div><div class='add'>+void pci_tsm_unbind(struct pci_dev *pdev);</div><div class='add'>+void pci_tsm_tdi_constructor(struct pci_dev *pdev, struct pci_tdi *tdi,</div><div class='add'>+			     struct kvm *kvm, u32 tdi_id);</div><div class='add'>+ssize_t pci_tsm_guest_req(struct pci_dev *pdev, enum pci_tsm_req_scope scope,</div><div class='add'>+			  sockptr_t req_in, size_t in_len, sockptr_t req_out,</div><div class='add'>+			  size_t out_len, u64 *tsm_code);</div><div class='add'>+#else</div><div class='add'>+static inline int pci_tsm_register(struct tsm_dev *tsm_dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void pci_tsm_unregister(struct tsm_dev *tsm_dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline int pci_tsm_bind(struct pci_dev *pdev, struct kvm *kvm, u64 tdi_id)</div><div class='add'>+{</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+static inline void pci_tsm_unbind(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline ssize_t pci_tsm_guest_req(struct pci_dev *pdev,</div><div class='add'>+					enum pci_tsm_req_scope scope,</div><div class='add'>+					sockptr_t req_in, size_t in_len,</div><div class='add'>+					sockptr_t req_out, size_t out_len,</div><div class='add'>+					u64 *tsm_code)</div><div class='add'>+{</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif /*__PCI_TSM_H */</div><div class='head'>diff --git a/include/linux/pci.h b/include/linux/pci.h<br/>index 213109d3c601..864775651c6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci.h</a></div><div class='hunk'>@@ -51,7 +51,7 @@</div><div class='ctx'> 			       PCI_STATUS_PARITY)</div><div class='ctx'> </div><div class='ctx'> /* Number of reset methods used in pci_reset_fn_methods array in pci.c */</div><div class='del'>-#define PCI_NUM_RESET_METHODS 7</div><div class='add'>+#define PCI_NUM_RESET_METHODS 8</div><div class='ctx'> </div><div class='ctx'> #define PCI_RESET_PROBE		true</div><div class='ctx'> #define PCI_RESET_DO_RESET	false</div><div class='hunk'>@@ -119,7 +119,8 @@ enum {</div><div class='ctx'> #define PCI_CB_BRIDGE_MEM_1_WINDOW	(PCI_BRIDGE_RESOURCES + 3)</div><div class='ctx'> </div><div class='ctx'> /* Total number of bridge resources for P2P and CardBus */</div><div class='del'>-#define PCI_BRIDGE_RESOURCE_NUM 4</div><div class='add'>+#define PCI_P2P_BRIDGE_RESOURCE_NUM	3</div><div class='add'>+#define PCI_BRIDGE_RESOURCE_NUM		4</div><div class='ctx'> </div><div class='ctx'> 	/* Resources assigned to buses behind the bridge */</div><div class='ctx'> 	PCI_BRIDGE_RESOURCES,</div><div class='hunk'>@@ -245,6 +246,8 @@ enum pci_dev_flags {</div><div class='ctx'> 	PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 &lt;&lt; 11),</div><div class='ctx'> 	/* Device does honor MSI masking despite saying otherwise */</div><div class='ctx'> 	PCI_DEV_FLAGS_HAS_MSI_MASKING = (__force pci_dev_flags_t) (1 &lt;&lt; 12),</div><div class='add'>+	/* Device requires write to PCI_MSIX_ENTRY_DATA before any MSIX reads */</div><div class='add'>+	PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST = (__force pci_dev_flags_t) (1 &lt;&lt; 13),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum pci_irq_reroute_variant {</div><div class='hunk'>@@ -313,12 +316,25 @@ struct pci_vpd {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct irq_affinity;</div><div class='add'>+struct pcie_bwctrl_data;</div><div class='ctx'> struct pcie_link_state;</div><div class='ctx'> struct pci_sriov;</div><div class='ctx'> struct pci_p2pdma;</div><div class='ctx'> struct rcec_ea;</div><div class='ctx'> </div><div class='del'>-/* The pci_dev structure describes PCI devices */</div><div class='add'>+/* struct pci_dev - describes a PCI device</div><div class='add'>+ *</div><div class='add'>+ * @supported_speeds:	PCIe Supported Link Speeds Vector (+ reserved 0 at</div><div class='add'>+ *			LSB). 0 when the supported speeds cannot be</div><div class='add'>+ *			determined (e.g., for Root Complex Integrated</div><div class='add'>+ *			Endpoints without the relevant Capability</div><div class='add'>+ *			Registers).</div><div class='add'>+ * @is_hotplug_bridge:	Hotplug bridge of any kind (e.g. PCIe Hot-Plug Capable,</div><div class='add'>+ *			Conventional PCI Hot-Plug, ACPI slot).</div><div class='add'>+ *			Such bridges are allocated additional MMIO and bus</div><div class='add'>+ *			number resources to allow for hierarchy expansion.</div><div class='add'>+ * @is_pciehp:		PCIe Hot-Plug Capable bridge.</div><div class='add'>+ */</div><div class='ctx'> struct pci_dev {</div><div class='ctx'> 	struct list_head bus_list;	/* Node in per-bus list */</div><div class='ctx'> 	struct pci_bus	*bus;		/* Bus this device is on */</div><div class='hunk'>@@ -338,13 +354,14 @@ struct pci_dev {</div><div class='ctx'> 	u8		hdr_type;	/* PCI header type (`multi' flag masked out) */</div><div class='ctx'> #ifdef CONFIG_PCIEAER</div><div class='ctx'> 	u16		aer_cap;	/* AER capability offset */</div><div class='del'>-	struct aer_stats *aer_stats;	/* AER stats for this device */</div><div class='add'>+	struct aer_info	*aer_info;	/* AER info for this device */</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_PCIEPORTBUS</div><div class='ctx'> 	struct rcec_ea	*rcec_ea;	/* RCEC cached endpoint association */</div><div class='ctx'> 	struct pci_dev  *rcec;          /* Associated RCEC device */</div><div class='ctx'> #endif</div><div class='ctx'> 	u32		devcap;		/* PCIe Device Capabilities */</div><div class='add'>+	u16		rebar_cap;	/* Resizable BAR capability offset */</div><div class='ctx'> 	u8		pcie_cap;	/* PCIe capability offset */</div><div class='ctx'> 	u8		msi_cap;	/* MSI capability offset */</div><div class='ctx'> 	u8		msix_cap;	/* MSI-X capability offset */</div><div class='hunk'>@@ -367,10 +384,12 @@ struct pci_dev {</div><div class='ctx'> 					   this is D0-D3, D0 being fully</div><div class='ctx'> 					   functional, and D3 being off. */</div><div class='ctx'> 	u8		pm_cap;		/* PM capability offset */</div><div class='del'>-	unsigned int	imm_ready:1;	/* Supports Immediate Readiness */</div><div class='ctx'> 	unsigned int	pme_support:5;	/* Bitmask of states from which PME#</div><div class='ctx'> 					   can be generated */</div><div class='ctx'> 	unsigned int	pme_poll:1;	/* Poll device's PME status bit */</div><div class='add'>+	unsigned int	pinned:1;	/* Whether this dev is pinned */</div><div class='add'>+	unsigned int	config_rrs_sv:1; /* Config RRS software visibility */</div><div class='add'>+	unsigned int	imm_ready:1;	/* Supports Immediate Readiness */</div><div class='ctx'> 	unsigned int	d1_support:1;	/* Low power state D1 is supported */</div><div class='ctx'> 	unsigned int	d2_support:1;	/* Low power state D2 is supported */</div><div class='ctx'> 	unsigned int	no_d1d2:1;	/* D1 and D2 are forbidden */</div><div class='hunk'>@@ -390,14 +409,16 @@ struct pci_dev {</div><div class='ctx'> 	unsigned int	d3hot_delay;	/* D3hot-&gt;D0 transition time in ms */</div><div class='ctx'> 	unsigned int	d3cold_delay;	/* D3cold-&gt;D0 transition time in ms */</div><div class='ctx'> </div><div class='add'>+	u16		l1ss;		/* L1SS Capability pointer */</div><div class='ctx'> #ifdef CONFIG_PCIEASPM</div><div class='ctx'> 	struct pcie_link_state	*link_state;	/* ASPM link state */</div><div class='del'>-	u16		l1ss;		/* L1SS Capability pointer */</div><div class='add'>+	unsigned int	aspm_l0s_support:1;	/* ASPM L0s support */</div><div class='add'>+	unsigned int	aspm_l1_support:1;	/* ASPM L1 support */</div><div class='ctx'> 	unsigned int	ltr_path:1;	/* Latency Tolerance Reporting</div><div class='ctx'> 					   supported from root to here */</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned int	pasid_no_tlp:1;		/* PASID works without TLP Prefix */</div><div class='del'>-	unsigned int	eetlp_prefix_path:1;	/* End-to-End TLP Prefix */</div><div class='add'>+	unsigned int	eetlp_prefix_max:3;	/* Max # of End-End TLP Prefixes, 0=not supported */</div><div class='ctx'> </div><div class='ctx'> 	pci_channel_state_t error_state;	/* Current connectivity state */</div><div class='ctx'> 	struct device	dev;			/* Generic device interface */</div><div class='hunk'>@@ -412,8 +433,6 @@ struct pci_dev {</div><div class='ctx'> 	struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */</div><div class='ctx'> 	struct resource driver_exclusive_resource;	 /* driver exclusive resource ranges */</div><div class='ctx'> </div><div class='del'>-	bool		match_driver;		/* Skip attaching driver */</div><div class='del'>-</div><div class='ctx'> 	unsigned int	transparent:1;		/* Subtractive decode bridge */</div><div class='ctx'> 	unsigned int	io_window:1;		/* Bridge has I/O window */</div><div class='ctx'> 	unsigned int	pref_window:1;		/* Bridge has pref mem window */</div><div class='hunk'>@@ -432,6 +451,8 @@ struct pci_dev {</div><div class='ctx'> 	unsigned int	ats_enabled:1;		/* Address Translation Svc */</div><div class='ctx'> 	unsigned int	pasid_enabled:1;	/* Process Address Space ID */</div><div class='ctx'> 	unsigned int	pri_enabled:1;		/* Page Request Interface */</div><div class='add'>+	unsigned int	tph_enabled:1;		/* TLP Processing Hints */</div><div class='add'>+	unsigned int	fm_enabled:1;		/* Flit Mode (segment captured) */</div><div class='ctx'> 	unsigned int	is_managed:1;		/* Managed via devres */</div><div class='ctx'> 	unsigned int	is_msi_managed:1;	/* MSI release via devres installed */</div><div class='ctx'> 	unsigned int	needs_freset:1;		/* Requires fundamental reset */</div><div class='hunk'>@@ -439,6 +460,7 @@ struct pci_dev {</div><div class='ctx'> 	unsigned int	is_physfn:1;</div><div class='ctx'> 	unsigned int	is_virtfn:1;</div><div class='ctx'> 	unsigned int	is_hotplug_bridge:1;</div><div class='add'>+	unsigned int	is_pciehp:1;</div><div class='ctx'> 	unsigned int	shpc_managed:1;		/* SHPC owned by shpchp */</div><div class='ctx'> 	unsigned int	is_thunderbolt:1;	/* Thunderbolt controller */</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -465,6 +487,7 @@ struct pci_dev {</div><div class='ctx'> 	unsigned int	no_command_memory:1;	/* No PCI_COMMAND_MEMORY */</div><div class='ctx'> 	unsigned int	rom_bar_overlap:1;	/* ROM BAR disable broken */</div><div class='ctx'> 	unsigned int	rom_attr_enabled:1;	/* Display of ROM attribute enabled? */</div><div class='add'>+	unsigned int	non_mappable_bars:1;	/* BARs can't be mapped to user-space  */</div><div class='ctx'> 	pci_dev_flags_t dev_flags;</div><div class='ctx'> 	atomic_t	enable_cnt;	/* pci_enable_device has been called */</div><div class='ctx'> </div><div class='hunk'>@@ -480,6 +503,8 @@ struct pci_dev {</div><div class='ctx'> #ifdef CONFIG_PCIE_PTM</div><div class='ctx'> 	u16		ptm_cap;		/* PTM Capability */</div><div class='ctx'> 	unsigned int	ptm_root:1;</div><div class='add'>+	unsigned int	ptm_responder:1;</div><div class='add'>+	unsigned int	ptm_requester:1;</div><div class='ctx'> 	unsigned int	ptm_enabled:1;</div><div class='ctx'> 	u8		ptm_granularity;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -493,6 +518,7 @@ struct pci_dev {</div><div class='ctx'> 	unsigned int	dpc_rp_extensions:1;</div><div class='ctx'> 	u8		dpc_rp_log_size;</div><div class='ctx'> #endif</div><div class='add'>+	struct pcie_bwctrl_data		*link_bwctrl;</div><div class='ctx'> #ifdef CONFIG_PCI_ATS</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct pci_sriov	*sriov;		/* PF: SR-IOV info */</div><div class='hunk'>@@ -516,7 +542,23 @@ struct pci_dev {</div><div class='ctx'> #ifdef CONFIG_PCI_DOE</div><div class='ctx'> 	struct xarray	doe_mbs;	/* Data Object Exchange mailboxes */</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_PCI_NPEM</div><div class='add'>+	struct npem	*npem;		/* Native PCIe Enclosure Management */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PCI_IDE</div><div class='add'>+	u16		ide_cap;	/* Link Integrity &amp; Data Encryption */</div><div class='add'>+	u8		nr_ide_mem;	/* Address association resources for streams */</div><div class='add'>+	u8		nr_link_ide;	/* Link Stream count (Selective Stream offset) */</div><div class='add'>+	u16		nr_sel_ide;	/* Selective Stream count (register block allocator) */</div><div class='add'>+	struct ida	ide_stream_ida;</div><div class='add'>+	unsigned int	ide_cfg:1;	/* Config cycles over IDE */</div><div class='add'>+	unsigned int	ide_tee_limit:1; /* Disallow T=0 traffic over IDE */</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PCI_TSM</div><div class='add'>+	struct pci_tsm *tsm;		/* TSM operation state */</div><div class='add'>+#endif</div><div class='ctx'> 	u16		acs_cap;	/* ACS Capability offset */</div><div class='add'>+	u8		supported_speeds; /* Supported Link Speeds Vector */</div><div class='ctx'> 	phys_addr_t	rom;		/* Physical address if not from BAR */</div><div class='ctx'> 	size_t		romlen;		/* Length if not from BAR */</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -529,6 +571,12 @@ struct pci_dev {</div><div class='ctx'> </div><div class='ctx'> 	/* These methods index pci_reset_fn_methods[] */</div><div class='ctx'> 	u8 reset_methods[PCI_NUM_RESET_METHODS]; /* In priority order */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCIE_TPH</div><div class='add'>+	u16		tph_cap;	/* TPH capability offset */</div><div class='add'>+	u8		tph_mode;	/* TPH mode */</div><div class='add'>+	u8		tph_req_type;	/* TPH requester type */</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct pci_dev *pci_physfn(struct pci_dev *dev)</div><div class='hunk'>@@ -544,6 +592,8 @@ struct pci_dev *pci_alloc_dev(struct pci_bus *bus);</div><div class='ctx'> </div><div class='ctx'> #define	to_pci_dev(n) container_of(n, struct pci_dev, dev)</div><div class='ctx'> #define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)</div><div class='add'>+#define for_each_pci_dev_reverse(d) \</div><div class='add'>+	while ((d = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)</div><div class='ctx'> </div><div class='ctx'> static inline int pci_channel_offline(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -570,9 +620,16 @@ struct pci_host_bridge {</div><div class='ctx'> 	int		domain_nr;</div><div class='ctx'> 	struct list_head windows;	/* resource_entry */</div><div class='ctx'> 	struct list_head dma_ranges;	/* dma ranges resource list */</div><div class='add'>+#ifdef CONFIG_PCI_IDE</div><div class='add'>+	u16 nr_ide_streams; /* Max streams possibly active in @ide_stream_ida */</div><div class='add'>+	struct ida ide_stream_ida;</div><div class='add'>+	struct ida ide_stream_ids_ida; /* track unique ids per domain */</div><div class='add'>+#endif</div><div class='ctx'> 	u8 (*swizzle_irq)(struct pci_dev *, u8 *); /* Platform IRQ swizzler */</div><div class='ctx'> 	int (*map_irq)(const struct pci_dev *, u8, u8);</div><div class='ctx'> 	void (*release_fn)(struct pci_host_bridge *);</div><div class='add'>+	int (*enable_device)(struct pci_host_bridge *bridge, struct pci_dev *dev);</div><div class='add'>+	void (*disable_device)(struct pci_host_bridge *bridge, struct pci_dev *dev);</div><div class='ctx'> 	void		*release_data;</div><div class='ctx'> 	unsigned int	ignore_reset_delay:1;	/* For entire hierarchy */</div><div class='ctx'> 	unsigned int	no_ext_tags:1;		/* No Extended Tags */</div><div class='hunk'>@@ -613,6 +670,7 @@ struct pci_host_bridge *pci_alloc_host_bridge(size_t priv);</div><div class='ctx'> struct pci_host_bridge *devm_pci_alloc_host_bridge(struct device *dev,</div><div class='ctx'> 						   size_t priv);</div><div class='ctx'> void pci_free_host_bridge(struct pci_host_bridge *bridge);</div><div class='add'>+struct device *pci_get_host_bridge_device(struct pci_dev *dev);</div><div class='ctx'> struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus);</div><div class='ctx'> </div><div class='ctx'> void pci_set_host_bridge_release(struct pci_host_bridge *bridge,</div><div class='hunk'>@@ -621,27 +679,6 @@ void pci_set_host_bridge_release(struct pci_host_bridge *bridge,</div><div class='ctx'> </div><div class='ctx'> int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond</div><div class='del'>- * to P2P or CardBus bridge windows) go in a table.  Additional ones (for</div><div class='del'>- * buses below host bridges or subtractive decode bridges) go in the list.</div><div class='del'>- * Use pci_bus_for_each_resource() to iterate through all the resources.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCI_SUBTRACTIVE_DECODE means the bridge forwards the window implicitly</div><div class='del'>- * and there's no way to program the bridge with the details of the window.</div><div class='del'>- * This does not apply to ACPI _CRS windows, even with the _DEC subtractive-</div><div class='del'>- * decode bit set, because they are explicit and can be programmed with _SRS.</div><div class='del'>- */</div><div class='del'>-#define PCI_SUBTRACTIVE_DECODE	0x1</div><div class='del'>-</div><div class='del'>-struct pci_bus_resource {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	struct resource		*res;</div><div class='del'>-	unsigned int		flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define PCI_REGION_FLAG_MASK	0x0fU	/* These bits of resource flags tell us the PCI region flags */</div><div class='ctx'> </div><div class='ctx'> struct pci_bus {</div><div class='hunk'>@@ -678,6 +715,7 @@ struct pci_bus {</div><div class='ctx'> 	struct bin_attribute	*legacy_mem;	/* Legacy mem */</div><div class='ctx'> 	unsigned int		is_added:1;</div><div class='ctx'> 	unsigned int		unsafe_warn:1;	/* warned about RW1C config write */</div><div class='add'>+	unsigned int		flit_mode:1;	/* Link in Flit mode */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_pci_bus(n)	container_of(n, struct pci_bus, dev)</div><div class='hunk'>@@ -738,6 +776,21 @@ static inline bool pci_is_vga(struct pci_dev *pdev)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * pci_is_display - check if the PCI device is a display controller</div><div class='add'>+ * @pdev: PCI device</div><div class='add'>+ *</div><div class='add'>+ * Determine whether the given PCI device corresponds to a display</div><div class='add'>+ * controller. Display controllers are typically used for graphical output</div><div class='add'>+ * and are identified based on their class code.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the PCI device is a display controller, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool pci_is_display(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	return (pdev-&gt;class &gt;&gt; 16) == PCI_BASE_CLASS_DISPLAY;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define for_each_pci_bridge(dev, bus)				\</div><div class='ctx'> 	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list)	\</div><div class='ctx'> 		if (!pci_is_bridge(dev)) {} else</div><div class='hunk'>@@ -801,6 +854,7 @@ struct pci_ops {</div><div class='ctx'> 	void __iomem *(*map_bus)(struct pci_bus *bus, unsigned int devfn, int where);</div><div class='ctx'> 	int (*read)(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val);</div><div class='ctx'> 	int (*write)(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val);</div><div class='add'>+	int (*assert_perst)(struct pci_bus *bus, bool assert);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -823,6 +877,11 @@ struct pci_bus_region {</div><div class='ctx'> 	pci_bus_addr_t	end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline pci_bus_addr_t pci_bus_region_size(const struct pci_bus_region *region)</div><div class='add'>+{</div><div class='add'>+	return region-&gt;end - region-&gt;start + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct pci_dynids {</div><div class='ctx'> 	spinlock_t		lock;	/* Protects list, index */</div><div class='ctx'> 	struct list_head	list;	/* For IDs added at runtime */</div><div class='hunk'>@@ -958,10 +1017,8 @@ struct pci_driver {</div><div class='ctx'> 	bool driver_managed_dma;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct pci_driver *to_pci_driver(struct device_driver *drv)</div><div class='del'>-{</div><div class='del'>-    return drv ? container_of(drv, struct pci_driver, driver) : NULL;</div><div class='del'>-}</div><div class='add'>+#define to_pci_driver(__drv)	\</div><div class='add'>+	( __drv ? container_of_const(__drv, struct pci_driver, driver) : NULL )</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * PCI_DEVICE - macro used to describe a specific PCI device</div><div class='hunk'>@@ -1048,6 +1105,20 @@ static inline struct pci_driver *to_pci_driver(struct device_driver *drv)</div><div class='ctx'> 	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * PCI_VDEVICE_SUB - describe a specific PCI device/subdevice in a short form</div><div class='add'>+ * @vend: the vendor name</div><div class='add'>+ * @dev: the 16 bit PCI Device ID</div><div class='add'>+ * @subvend: the 16 bit PCI Subvendor ID</div><div class='add'>+ * @subdev: the 16 bit PCI Subdevice ID</div><div class='add'>+ *</div><div class='add'>+ * Generate the pci_device_id struct layout for the specific PCI</div><div class='add'>+ * device/subdevice. Private data may follow the output.</div><div class='add'>+ */</div><div class='add'>+#define PCI_VDEVICE_SUB(vend, dev, subvend, subdev) \</div><div class='add'>+	.vendor = PCI_VENDOR_ID_##vend, .device = (dev), \</div><div class='add'>+	.subvendor = (subvend), .subdevice = (subdev), 0, 0</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * PCI_DEVICE_DATA - macro used to describe a specific PCI device in very short form</div><div class='ctx'>  * @vend: the vendor name (without PCI_VENDOR_ID_ prefix)</div><div class='ctx'>  * @dev: the device name (without PCI_DEVICE_ID_&lt;vend&gt;_ prefix)</div><div class='hunk'>@@ -1077,8 +1148,6 @@ enum {</div><div class='ctx'> #define PCI_IRQ_MSIX		(1 &lt;&lt; 2) /* Allow MSI-X interrupts */</div><div class='ctx'> #define PCI_IRQ_AFFINITY	(1 &lt;&lt; 3) /* Auto-assign affinity */</div><div class='ctx'> </div><div class='del'>-#define PCI_IRQ_LEGACY		PCI_IRQ_INTX /* Deprecated! Use PCI_IRQ_INTX */</div><div class='del'>-</div><div class='ctx'> /* These external functions are only available when PCI support is enabled */</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> </div><div class='hunk'>@@ -1101,7 +1170,7 @@ enum pcie_bus_config_types {</div><div class='ctx'> </div><div class='ctx'> extern enum pcie_bus_config_types pcie_bus_config;</div><div class='ctx'> </div><div class='del'>-extern struct bus_type pci_bus_type;</div><div class='add'>+extern const struct bus_type pci_bus_type;</div><div class='ctx'> </div><div class='ctx'> /* Do NOT directly access these two variables, unless you are arch-specific PCI</div><div class='ctx'>  * code, or PCI core code. */</div><div class='hunk'>@@ -1123,9 +1192,6 @@ resource_size_t pcibios_align_resource(void *, const struct resource *,</div><div class='ctx'> 				resource_size_t,</div><div class='ctx'> 				resource_size_t);</div><div class='ctx'> </div><div class='del'>-/* Weak but can be overridden by arch */</div><div class='del'>-void pci_fixup_cardbus(struct pci_bus *);</div><div class='del'>-</div><div class='ctx'> /* Generic PCI functions used internally */</div><div class='ctx'> </div><div class='ctx'> void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,</div><div class='hunk'>@@ -1200,6 +1266,8 @@ u64 pci_get_dsn(struct pci_dev *dev);</div><div class='ctx'> </div><div class='ctx'> struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,</div><div class='ctx'> 			       struct pci_dev *from);</div><div class='add'>+struct pci_dev *pci_get_device_reverse(unsigned int vendor, unsigned int device,</div><div class='add'>+				       struct pci_dev *from);</div><div class='ctx'> struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,</div><div class='ctx'> 			       unsigned int ss_vendor, unsigned int ss_device,</div><div class='ctx'> 			       struct pci_dev *from);</div><div class='hunk'>@@ -1273,6 +1341,7 @@ static inline int pcie_capability_clear_and_set_word(struct pci_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	switch (pos) {</div><div class='ctx'> 	case PCI_EXP_LNKCTL:</div><div class='add'>+	case PCI_EXP_LNKCTL2:</div><div class='ctx'> 	case PCI_EXP_RTCTL:</div><div class='ctx'> 		return pcie_capability_clear_and_set_word_locked(dev, pos,</div><div class='ctx'> 								 clear, set);</div><div class='hunk'>@@ -1315,7 +1384,6 @@ int pci_user_write_config_word(struct pci_dev *dev, int where, u16 val);</div><div class='ctx'> int pci_user_write_config_dword(struct pci_dev *dev, int where, u32 val);</div><div class='ctx'> </div><div class='ctx'> int __must_check pci_enable_device(struct pci_dev *dev);</div><div class='del'>-int __must_check pci_enable_device_io(struct pci_dev *dev);</div><div class='ctx'> int __must_check pci_enable_device_mem(struct pci_dev *dev);</div><div class='ctx'> int __must_check pci_reenable_device(struct pci_dev *);</div><div class='ctx'> int __must_check pcim_enable_device(struct pci_dev *pdev);</div><div class='hunk'>@@ -1383,18 +1451,17 @@ void pci_reset_secondary_bus(struct pci_dev *dev);</div><div class='ctx'> void pcibios_reset_secondary_bus(struct pci_dev *dev);</div><div class='ctx'> void pci_update_resource(struct pci_dev *dev, int resno);</div><div class='ctx'> int __must_check pci_assign_resource(struct pci_dev *dev, int i);</div><div class='del'>-int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);</div><div class='del'>-void pci_release_resource(struct pci_dev *dev, int resno);</div><div class='del'>-static inline int pci_rebar_bytes_to_size(u64 bytes)</div><div class='del'>-{</div><div class='del'>-	bytes = roundup_pow_of_two(bytes);</div><div class='add'>+int pci_release_resource(struct pci_dev *dev, int resno);</div><div class='ctx'> </div><div class='del'>-	/* Return BAR size as defined in the resizable BAR specification */</div><div class='del'>-	return max(ilog2(bytes), 20) - 20;</div><div class='del'>-}</div><div class='add'>+/* Resizable BAR related routines */</div><div class='add'>+int pci_rebar_bytes_to_size(u64 bytes);</div><div class='add'>+resource_size_t pci_rebar_size_to_bytes(int size);</div><div class='add'>+u64 pci_rebar_get_possible_sizes(struct pci_dev *pdev, int bar);</div><div class='add'>+bool pci_rebar_size_supported(struct pci_dev *pdev, int bar, int size);</div><div class='add'>+int pci_rebar_get_max_size(struct pci_dev *pdev, int bar);</div><div class='add'>+int __must_check pci_resize_resource(struct pci_dev *dev, int i, int size,</div><div class='add'>+				     int exclude_bars);</div><div class='ctx'> </div><div class='del'>-u32 pci_rebar_get_possible_sizes(struct pci_dev *pdev, int bar);</div><div class='del'>-int __must_check pci_resize_resource(struct pci_dev *dev, int i, int size);</div><div class='ctx'> int pci_select_bars(struct pci_dev *dev, unsigned long flags);</div><div class='ctx'> bool pci_device_is_present(struct pci_dev *pdev);</div><div class='ctx'> void pci_ignore_hotplug(struct pci_dev *dev);</div><div class='hunk'>@@ -1442,7 +1509,6 @@ void set_pcie_port_type(struct pci_dev *pdev);</div><div class='ctx'> void set_pcie_hotplug_bridge(struct pci_dev *pdev);</div><div class='ctx'> </div><div class='ctx'> /* Functions for PCI Hotplug drivers to use */</div><div class='del'>-unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge);</div><div class='ctx'> unsigned int pci_rescan_bus(struct pci_bus *bus);</div><div class='ctx'> void pci_lock_rescan_remove(void);</div><div class='ctx'> void pci_unlock_rescan_remove(void);</div><div class='hunk'>@@ -1464,7 +1530,6 @@ void pci_assign_unassigned_resources(void);</div><div class='ctx'> void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge);</div><div class='ctx'> void pci_assign_unassigned_bus_resources(struct pci_bus *bus);</div><div class='ctx'> void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus);</div><div class='del'>-int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type);</div><div class='ctx'> int pci_enable_resources(struct pci_dev *, int mask);</div><div class='ctx'> void pci_assign_irq(struct pci_dev *dev);</div><div class='ctx'> struct resource *pci_find_resource(struct pci_dev *dev, struct resource *res);</div><div class='hunk'>@@ -1498,8 +1563,7 @@ void pci_add_resource(struct list_head *resources, struct resource *res);</div><div class='ctx'> void pci_add_resource_offset(struct list_head *resources, struct resource *res,</div><div class='ctx'> 			     resource_size_t offset);</div><div class='ctx'> void pci_free_resource_list(struct list_head *resources);</div><div class='del'>-void pci_bus_add_resource(struct pci_bus *bus, struct resource *res,</div><div class='del'>-			  unsigned int flags);</div><div class='add'>+void pci_bus_add_resource(struct pci_bus *bus, struct resource *res);</div><div class='ctx'> struct resource *pci_bus_resource_n(const struct pci_bus *bus, int n);</div><div class='ctx'> void pci_bus_remove_resources(struct pci_bus *bus);</div><div class='ctx'> void pci_bus_remove_resource(struct pci_bus *bus, struct resource *res);</div><div class='hunk'>@@ -1552,14 +1616,11 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,</div><div class='ctx'> 			struct resource *res, resource_size_t size,</div><div class='ctx'> 			resource_size_t align, resource_size_t min,</div><div class='ctx'> 			unsigned long type_mask,</div><div class='del'>-			resource_size_t (*alignf)(void *,</div><div class='del'>-						  const struct resource *,</div><div class='del'>-						  resource_size_t,</div><div class='del'>-						  resource_size_t),</div><div class='add'>+			resource_alignf alignf,</div><div class='ctx'> 			void *alignf_data);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr,</div><div class='add'>+int pci_register_io_range(const struct fwnode_handle *fwnode, phys_addr_t addr,</div><div class='ctx'> 			resource_size_t size);</div><div class='ctx'> unsigned long pci_address_to_pio(phys_addr_t addr);</div><div class='ctx'> phys_addr_t pci_pio_to_address(unsigned long pio);</div><div class='hunk'>@@ -1626,11 +1687,10 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,</div><div class='ctx'> </div><div class='ctx'> void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *),</div><div class='ctx'> 		  void *userdata);</div><div class='del'>-void pci_walk_bus_locked(struct pci_bus *top, int (*cb)(struct pci_dev *, void *),</div><div class='del'>-			 void *userdata);</div><div class='add'>+void pci_walk_bus_reverse(struct pci_bus *top,</div><div class='add'>+			  int (*cb)(struct pci_dev *, void *), void *userdata);</div><div class='ctx'> int pci_cfg_space_size(struct pci_dev *dev);</div><div class='ctx'> unsigned char pci_bus_max_busnr(struct pci_bus *bus);</div><div class='del'>-void pci_setup_bridge(struct pci_bus *bus);</div><div class='ctx'> resource_size_t pcibios_window_alignment(struct pci_bus *bus,</div><div class='ctx'> 					 unsigned long type);</div><div class='ctx'> </div><div class='hunk'>@@ -1648,8 +1708,7 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode,</div><div class='ctx'>  */</div><div class='ctx'> #define PCI_IRQ_VIRTUAL		(1 &lt;&lt; 4)</div><div class='ctx'> </div><div class='del'>-#define PCI_IRQ_ALL_TYPES \</div><div class='del'>-	(PCI_IRQ_LEGACY | PCI_IRQ_MSI | PCI_IRQ_MSIX)</div><div class='add'>+#define PCI_IRQ_ALL_TYPES	(PCI_IRQ_INTX | PCI_IRQ_MSI | PCI_IRQ_MSIX)</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dmapool.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -1658,15 +1717,13 @@ struct msix_entry {</div><div class='ctx'> 	u16	entry;	/* Driver uses to specify entry, OS writes */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct msi_domain_template;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='ctx'> int pci_msi_vec_count(struct pci_dev *dev);</div><div class='ctx'> void pci_disable_msi(struct pci_dev *dev);</div><div class='ctx'> int pci_msix_vec_count(struct pci_dev *dev);</div><div class='ctx'> void pci_disable_msix(struct pci_dev *dev);</div><div class='ctx'> void pci_restore_msi_state(struct pci_dev *dev);</div><div class='del'>-int pci_msi_enabled(void);</div><div class='add'>+bool pci_msi_enabled(void);</div><div class='ctx'> int pci_enable_msi(struct pci_dev *dev);</div><div class='ctx'> int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries,</div><div class='ctx'> 			  int minvec, int maxvec);</div><div class='hunk'>@@ -1692,11 +1749,6 @@ void pci_msix_free_irq(struct pci_dev *pdev, struct msi_map map);</div><div class='ctx'> void pci_free_irq_vectors(struct pci_dev *dev);</div><div class='ctx'> int pci_irq_vector(struct pci_dev *dev, unsigned int nr);</div><div class='ctx'> const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);</div><div class='del'>-bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,</div><div class='del'>-			   unsigned int hwsize, void *data);</div><div class='del'>-struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,</div><div class='del'>-				 const struct irq_affinity_desc *affdesc);</div><div class='del'>-void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }</div><div class='hunk'>@@ -1704,7 +1756,7 @@ static inline void pci_disable_msi(struct pci_dev *dev) { }</div><div class='ctx'> static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; }</div><div class='ctx'> static inline void pci_disable_msix(struct pci_dev *dev) { }</div><div class='ctx'> static inline void pci_restore_msi_state(struct pci_dev *dev) { }</div><div class='del'>-static inline int pci_msi_enabled(void) { return 0; }</div><div class='add'>+static inline bool pci_msi_enabled(void) { return false; }</div><div class='ctx'> static inline int pci_enable_msi(struct pci_dev *dev)</div><div class='ctx'> { return -ENOSYS; }</div><div class='ctx'> static inline int pci_enable_msix_range(struct pci_dev *dev,</div><div class='hunk'>@@ -1719,7 +1771,7 @@ pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,</div><div class='ctx'> 			       unsigned int max_vecs, unsigned int flags,</div><div class='ctx'> 			       struct irq_affinity *aff_desc)</div><div class='ctx'> {</div><div class='del'>-	if ((flags &amp; PCI_IRQ_LEGACY) &amp;&amp; min_vecs == 1 &amp;&amp; dev-&gt;irq)</div><div class='add'>+	if ((flags &amp; PCI_IRQ_INTX) &amp;&amp; min_vecs == 1 &amp;&amp; dev-&gt;irq)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return -ENOSPC;</div><div class='ctx'> }</div><div class='hunk'>@@ -1760,25 +1812,6 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev,</div><div class='ctx'> {</div><div class='ctx'> 	return cpu_possible_mask;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline bool pci_create_ims_domain(struct pci_dev *pdev,</div><div class='del'>-					 const struct msi_domain_template *template,</div><div class='del'>-					 unsigned int hwsize, void *data)</div><div class='del'>-{ return false; }</div><div class='del'>-</div><div class='del'>-static inline struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev,</div><div class='del'>-					       union msi_instance_cookie *icookie,</div><div class='del'>-					       const struct irq_affinity_desc *affdesc)</div><div class='del'>-{</div><div class='del'>-	struct msi_map map = { .index = -ENOSYS, };</div><div class='del'>-</div><div class='del'>-	return map;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1816,22 +1849,36 @@ static inline int pci_irqd_intx_xlate(struct irq_domain *d,</div><div class='ctx'> #ifdef CONFIG_PCIEPORTBUS</div><div class='ctx'> extern bool pcie_ports_disabled;</div><div class='ctx'> extern bool pcie_ports_native;</div><div class='add'>+</div><div class='add'>+int pcie_set_target_speed(struct pci_dev *port, enum pci_bus_speed speed_req,</div><div class='add'>+			  bool use_lt);</div><div class='ctx'> #else</div><div class='ctx'> #define pcie_ports_disabled	true</div><div class='ctx'> #define pcie_ports_native	false</div><div class='add'>+</div><div class='add'>+static inline int pcie_set_target_speed(struct pci_dev *port,</div><div class='add'>+					enum pci_bus_speed speed_req,</div><div class='add'>+					bool use_lt)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define PCIE_LINK_STATE_L0S		BIT(0)</div><div class='del'>-#define PCIE_LINK_STATE_L1		BIT(1)</div><div class='del'>-#define PCIE_LINK_STATE_CLKPM		BIT(2)</div><div class='del'>-#define PCIE_LINK_STATE_L1_1		BIT(3)</div><div class='del'>-#define PCIE_LINK_STATE_L1_2		BIT(4)</div><div class='del'>-#define PCIE_LINK_STATE_L1_1_PCIPM	BIT(5)</div><div class='del'>-#define PCIE_LINK_STATE_L1_2_PCIPM	BIT(6)</div><div class='del'>-#define PCIE_LINK_STATE_ALL		(PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |\</div><div class='del'>-					 PCIE_LINK_STATE_CLKPM | PCIE_LINK_STATE_L1_1 |\</div><div class='del'>-					 PCIE_LINK_STATE_L1_2 | PCIE_LINK_STATE_L1_1_PCIPM |\</div><div class='add'>+#define PCIE_LINK_STATE_L0S		(BIT(0) | BIT(1)) /* Upstr/dwnstr L0s */</div><div class='add'>+#define PCIE_LINK_STATE_L1		BIT(2)	/* L1 state */</div><div class='add'>+#define PCIE_LINK_STATE_L1_1		BIT(3)	/* ASPM L1.1 state */</div><div class='add'>+#define PCIE_LINK_STATE_L1_2		BIT(4)	/* ASPM L1.2 state */</div><div class='add'>+#define PCIE_LINK_STATE_L1_1_PCIPM	BIT(5)	/* PCI-PM L1.1 state */</div><div class='add'>+#define PCIE_LINK_STATE_L1_2_PCIPM	BIT(6)	/* PCI-PM L1.2 state */</div><div class='add'>+#define PCIE_LINK_STATE_ASPM_ALL	(PCIE_LINK_STATE_L0S		|\</div><div class='add'>+					 PCIE_LINK_STATE_L1		|\</div><div class='add'>+					 PCIE_LINK_STATE_L1_1		|\</div><div class='add'>+					 PCIE_LINK_STATE_L1_2		|\</div><div class='add'>+					 PCIE_LINK_STATE_L1_1_PCIPM	|\</div><div class='ctx'> 					 PCIE_LINK_STATE_L1_2_PCIPM)</div><div class='add'>+#define PCIE_LINK_STATE_CLKPM		BIT(7)</div><div class='add'>+#define PCIE_LINK_STATE_ALL		(PCIE_LINK_STATE_ASPM_ALL	|\</div><div class='add'>+					 PCIE_LINK_STATE_CLKPM)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCIEASPM</div><div class='ctx'> int pci_disable_link_state(struct pci_dev *pdev, int state);</div><div class='hunk'>@@ -1855,6 +1902,14 @@ static inline bool pcie_aspm_support_enabled(void) { return false; }</div><div class='ctx'> static inline bool pcie_aspm_enabled(struct pci_dev *pdev) { return false; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HOTPLUG_PCI</div><div class='add'>+void pci_hp_ignore_link_change(struct pci_dev *pdev);</div><div class='add'>+void pci_hp_unignore_link_change(struct pci_dev *pdev);</div><div class='add'>+#else</div><div class='add'>+static inline void pci_hp_ignore_link_change(struct pci_dev *pdev) { }</div><div class='add'>+static inline void pci_hp_unignore_link_change(struct pci_dev *pdev) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCIEAER</div><div class='ctx'> bool pci_aer_available(void);</div><div class='ctx'> #else</div><div class='hunk'>@@ -1863,6 +1918,39 @@ static inline bool pci_aer_available(void) { return false; }</div><div class='ctx'> </div><div class='ctx'> bool pci_ats_disabled(void);</div><div class='ctx'> </div><div class='add'>+#define PCIE_PTM_CONTEXT_UPDATE_AUTO 0</div><div class='add'>+#define PCIE_PTM_CONTEXT_UPDATE_MANUAL 1</div><div class='add'>+</div><div class='add'>+struct pcie_ptm_ops {</div><div class='add'>+	int (*check_capability)(void *drvdata);</div><div class='add'>+	int (*context_update_write)(void *drvdata, u8 mode);</div><div class='add'>+	int (*context_update_read)(void *drvdata, u8 *mode);</div><div class='add'>+	int (*context_valid_write)(void *drvdata, bool valid);</div><div class='add'>+	int (*context_valid_read)(void *drvdata, bool *valid);</div><div class='add'>+	int (*local_clock_read)(void *drvdata, u64 *clock);</div><div class='add'>+	int (*master_clock_read)(void *drvdata, u64 *clock);</div><div class='add'>+	int (*t1_read)(void *drvdata, u64 *clock);</div><div class='add'>+	int (*t2_read)(void *drvdata, u64 *clock);</div><div class='add'>+	int (*t3_read)(void *drvdata, u64 *clock);</div><div class='add'>+	int (*t4_read)(void *drvdata, u64 *clock);</div><div class='add'>+</div><div class='add'>+	bool (*context_update_visible)(void *drvdata);</div><div class='add'>+	bool (*context_valid_visible)(void *drvdata);</div><div class='add'>+	bool (*local_clock_visible)(void *drvdata);</div><div class='add'>+	bool (*master_clock_visible)(void *drvdata);</div><div class='add'>+	bool (*t1_visible)(void *drvdata);</div><div class='add'>+	bool (*t2_visible)(void *drvdata);</div><div class='add'>+	bool (*t3_visible)(void *drvdata);</div><div class='add'>+	bool (*t4_visible)(void *drvdata);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pci_ptm_debugfs {</div><div class='add'>+	struct dentry *debugfs;</div><div class='add'>+	const struct pcie_ptm_ops *ops;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	void *pdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCIE_PTM</div><div class='ctx'> int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);</div><div class='ctx'> void pci_disable_ptm(struct pci_dev *dev);</div><div class='hunk'>@@ -1875,6 +1963,18 @@ static inline bool pcie_ptm_enabled(struct pci_dev *dev)</div><div class='ctx'> { return false; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_DEBUG_FS) &amp;&amp; IS_ENABLED(CONFIG_PCIE_PTM)</div><div class='add'>+struct pci_ptm_debugfs *pcie_ptm_create_debugfs(struct device *dev, void *pdata,</div><div class='add'>+						const struct pcie_ptm_ops *ops);</div><div class='add'>+void pcie_ptm_destroy_debugfs(struct pci_ptm_debugfs *ptm_debugfs);</div><div class='add'>+#else</div><div class='add'>+static inline struct pci_ptm_debugfs</div><div class='add'>+*pcie_ptm_create_debugfs(struct device *dev, void *pdata,</div><div class='add'>+			 const struct pcie_ptm_ops *ops) { return NULL; }</div><div class='add'>+static inline void</div><div class='add'>+pcie_ptm_destroy_debugfs(struct pci_ptm_debugfs *ptm_debugfs) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void pci_cfg_access_lock(struct pci_dev *dev);</div><div class='ctx'> bool pci_cfg_access_trylock(struct pci_dev *dev);</div><div class='ctx'> void pci_cfg_access_unlock(struct pci_dev *dev);</div><div class='hunk'>@@ -1891,10 +1991,17 @@ DEFINE_GUARD(pci_dev, struct pci_dev *, pci_dev_lock(_T), pci_dev_unlock(_T))</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_PCI_DOMAINS</div><div class='ctx'> extern int pci_domains_supported;</div><div class='add'>+int pci_bus_find_emul_domain_nr(u32 hint, u32 min, u32 max);</div><div class='add'>+void pci_bus_release_emul_domain_nr(int domain_nr);</div><div class='ctx'> #else</div><div class='ctx'> enum { pci_domains_supported = 0 };</div><div class='ctx'> static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }</div><div class='ctx'> static inline int pci_proc_domain(struct pci_bus *bus) { return 0; }</div><div class='add'>+static inline int pci_bus_find_emul_domain_nr(u32 hint, u32 min, u32 max)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void pci_bus_release_emul_domain_nr(int domain_nr) { }</div><div class='ctx'> #endif /* CONFIG_PCI_DOMAINS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1914,7 +2021,7 @@ static inline int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)</div><div class='ctx'> { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent);</div><div class='del'>-void pci_bus_release_domain_nr(struct pci_bus *bus, struct device *parent);</div><div class='add'>+void pci_bus_release_domain_nr(struct device *parent, int domain_nr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Some architectures require additional setup to direct VGA traffic */</div><div class='hunk'>@@ -1977,6 +2084,11 @@ static inline struct pci_dev *pci_get_device(unsigned int vendor,</div><div class='ctx'> 					     struct pci_dev *from)</div><div class='ctx'> { return NULL; }</div><div class='ctx'> </div><div class='add'>+static inline struct pci_dev *pci_get_device_reverse(unsigned int vendor,</div><div class='add'>+						     unsigned int device,</div><div class='add'>+						     struct pci_dev *from)</div><div class='add'>+{ return NULL; }</div><div class='add'>+</div><div class='ctx'> static inline struct pci_dev *pci_get_subsys(unsigned int vendor,</div><div class='ctx'> 					     unsigned int device,</div><div class='ctx'> 					     unsigned int ss_vendor,</div><div class='hunk'>@@ -2014,10 +2126,9 @@ static inline int pci_register_driver(struct pci_driver *drv)</div><div class='ctx'> static inline void pci_unregister_driver(struct pci_driver *drv) { }</div><div class='ctx'> static inline u8 pci_find_capability(struct pci_dev *dev, int cap)</div><div class='ctx'> { return 0; }</div><div class='del'>-static inline int pci_find_next_capability(struct pci_dev *dev, u8 post,</div><div class='del'>-					   int cap)</div><div class='add'>+static inline u8 pci_find_next_capability(struct pci_dev *dev, u8 post, int cap)</div><div class='ctx'> { return 0; }</div><div class='del'>-static inline int pci_find_ext_capability(struct pci_dev *dev, int cap)</div><div class='add'>+static inline u16 pci_find_ext_capability(struct pci_dev *dev, int cap)</div><div class='ctx'> { return 0; }</div><div class='ctx'> </div><div class='ctx'> static inline u64 pci_get_dsn(struct pci_dev *dev)</div><div class='hunk'>@@ -2046,7 +2157,7 @@ static inline int pci_request_regions(struct pci_dev *dev, const char *res_name)</div><div class='ctx'> { return -EIO; }</div><div class='ctx'> static inline void pci_release_regions(struct pci_dev *dev) { }</div><div class='ctx'> </div><div class='del'>-static inline int pci_register_io_range(struct fwnode_handle *fwnode,</div><div class='add'>+static inline int pci_register_io_range(const struct fwnode_handle *fwnode,</div><div class='ctx'> 					phys_addr_t addr, resource_size_t size)</div><div class='ctx'> { return -EINVAL; }</div><div class='ctx'> </div><div class='hunk'>@@ -2320,13 +2431,18 @@ static inline void pci_fixup_device(enum pci_fixup_pass pass,</div><div class='ctx'> 				    struct pci_dev *dev) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int pcim_intx(struct pci_dev *pdev, int enabled);</div><div class='add'>+int pcim_request_all_regions(struct pci_dev *pdev, const char *name);</div><div class='ctx'> void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);</div><div class='add'>+void __iomem *pcim_iomap_region(struct pci_dev *pdev, int bar,</div><div class='add'>+				const char *name);</div><div class='add'>+void pcim_iounmap_region(struct pci_dev *pdev, int bar);</div><div class='ctx'> void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr);</div><div class='ctx'> void __iomem * const *pcim_iomap_table(struct pci_dev *pdev);</div><div class='add'>+int pcim_request_region(struct pci_dev *pdev, int bar, const char *name);</div><div class='ctx'> int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name);</div><div class='del'>-int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask,</div><div class='del'>-				   const char *name);</div><div class='del'>-void pcim_iounmap_regions(struct pci_dev *pdev, int mask);</div><div class='add'>+void __iomem *pcim_iomap_range(struct pci_dev *pdev, int bar,</div><div class='add'>+				unsigned long offset, unsigned long len);</div><div class='ctx'> </div><div class='ctx'> extern int pci_pci_problems;</div><div class='ctx'> #define PCIPCI_FAIL		1	/* No PCI PCI DMA */</div><div class='hunk'>@@ -2337,8 +2453,6 @@ extern int pci_pci_problems;</div><div class='ctx'> #define PCIPCI_ALIMAGIK		32	/* Need low latency setting */</div><div class='ctx'> #define PCIAGP_FAIL		64	/* No PCI to AGP DMA */</div><div class='ctx'> </div><div class='del'>-extern unsigned long pci_cardbus_io_size;</div><div class='del'>-extern unsigned long pci_cardbus_mem_size;</div><div class='ctx'> extern u8 pci_dfl_cache_line_size;</div><div class='ctx'> extern u8 pci_cache_line_size;</div><div class='ctx'> </div><div class='hunk'>@@ -2393,6 +2507,8 @@ int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);</div><div class='ctx'> int pci_sriov_get_totalvfs(struct pci_dev *dev);</div><div class='ctx'> int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn);</div><div class='ctx'> resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno);</div><div class='add'>+int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size);</div><div class='add'>+u32 pci_iov_vf_bar_get_sizes(struct pci_dev *dev, int resno, int num_vfs);</div><div class='ctx'> void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe);</div><div class='ctx'> </div><div class='ctx'> /* Arch may override these (weak) */</div><div class='hunk'>@@ -2445,14 +2561,13 @@ static inline int pci_sriov_get_totalvfs(struct pci_dev *dev)</div><div class='ctx'> #define pci_sriov_configure_simple	NULL</div><div class='ctx'> static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno)</div><div class='ctx'> { return 0; }</div><div class='add'>+static inline int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size)</div><div class='add'>+{ return -ENODEV; }</div><div class='add'>+static inline u32 pci_iov_vf_bar_get_sizes(struct pci_dev *dev, int resno, int num_vfs)</div><div class='add'>+{ return 0; }</div><div class='ctx'> static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)</div><div class='del'>-void pci_hp_create_module_link(struct pci_slot *pci_slot);</div><div class='del'>-void pci_hp_remove_module_link(struct pci_slot *pci_slot);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * pci_pcie_cap - get the saved PCIe capability offset</div><div class='ctx'>  * @dev: PCI device</div><div class='hunk'>@@ -2519,7 +2634,12 @@ static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> static inline bool pci_dev_is_disconnected(const struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	return dev-&gt;error_state == pci_channel_io_perm_failure;</div><div class='add'>+	/*</div><div class='add'>+	 * error_state is set in pci_dev_set_io_state() using xchg/cmpxchg()</div><div class='add'>+	 * and read w/o common lock. READ_ONCE() ensures compiler cannot cache</div><div class='add'>+	 * the value (e.g. inside the loop in pci_dev_wait()).</div><div class='add'>+	 */</div><div class='add'>+	return READ_ONCE(dev-&gt;error_state) == pci_channel_io_perm_failure;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pci_request_acs(void);</div><div class='hunk'>@@ -2626,6 +2746,12 @@ pci_host_bridge_acpi_msi_domain(struct pci_bus *bus) { return NULL; }</div><div class='ctx'> static inline bool pci_pr3_present(struct pci_dev *pdev) { return false; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_X86) &amp;&amp; defined(CONFIG_ACPI)</div><div class='add'>+bool arch_pci_dev_is_removable(struct pci_dev *pdev);</div><div class='add'>+#else</div><div class='add'>+static inline bool arch_pci_dev_is_removable(struct pci_dev *pdev) { return false; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_EEH</div><div class='ctx'> static inline struct eeh_dev *pci_dev_to_eeh_dev(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2686,15 +2812,12 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PCIEPORTBUS) || defined(CONFIG_EEH)</div><div class='add'>+#if defined(CONFIG_PCIEPORTBUS) || defined(CONFIG_EEH) || defined(CONFIG_S390)</div><div class='ctx'> void pci_uevent_ers(struct pci_dev *pdev, enum  pci_ers_result err_type);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='del'>-#define pci_printk(level, pdev, fmt, arg...) \</div><div class='del'>-	dev_printk(level, &amp;(pdev)-&gt;dev, fmt, ##arg)</div><div class='del'>-</div><div class='ctx'> #define pci_emerg(pdev, fmt, arg...)	dev_emerg(&amp;(pdev)-&gt;dev, fmt, ##arg)</div><div class='ctx'> #define pci_alert(pdev, fmt, arg...)	dev_alert(&amp;(pdev)-&gt;dev, fmt, ##arg)</div><div class='ctx'> #define pci_crit(pdev, fmt, arg...)	dev_crit(&amp;(pdev)-&gt;dev, fmt, ##arg)</div><div class='head'>diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h<br/>index 3a10d6ec3ee7..ddf79641917f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci_hotplug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci_hotplug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci_hotplug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci_hotplug.h</a></div><div class='hunk'>@@ -50,7 +50,6 @@ struct hotplug_slot_ops {</div><div class='ctx'> /**</div><div class='ctx'>  * struct hotplug_slot - used to register a physical slot with the hotplug pci core</div><div class='ctx'>  * @ops: pointer to the &amp;struct hotplug_slot_ops to be used for this slot</div><div class='del'>- * @slot_list: internal list used to track hotplug PCI slots</div><div class='ctx'>  * @pci_slot: represents a physical slot</div><div class='ctx'>  * @owner: The module owner of this structure</div><div class='ctx'>  * @mod_name: The module name (KBUILD_MODNAME) of this structure</div><div class='hunk'>@@ -59,7 +58,6 @@ struct hotplug_slot {</div><div class='ctx'> 	const struct hotplug_slot_ops	*ops;</div><div class='ctx'> </div><div class='ctx'> 	/* Variables below this are for use only by the hotplug pci core. */</div><div class='del'>-	struct list_head		slot_list;</div><div class='ctx'> 	struct pci_slot			*pci_slot;</div><div class='ctx'> 	struct module			*owner;</div><div class='ctx'> 	const char			*mod_name;</div><div class='hunk'>@@ -106,6 +104,7 @@ static inline bool shpchp_is_native(struct pci_dev *bridge) { return true; }</div><div class='ctx'> </div><div class='ctx'> static inline bool hotplug_is_native(struct pci_dev *bridge)</div><div class='ctx'> {</div><div class='del'>-	return pciehp_is_native(bridge) || shpchp_is_native(bridge);</div><div class='add'>+	return (bridge-&gt;is_pciehp &amp;&amp; pciehp_is_native(bridge)) ||</div><div class='add'>+	       shpchp_is_native(bridge);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h<br/>index a0c75e467df3..a9a089566b7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pci_ids.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pci_ids.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pci_ids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pci_ids.h</a></div><div class='hunk'>@@ -121,6 +121,7 @@</div><div class='ctx'> #define PCI_CLASS_SERIAL_USB_OHCI	0x0c0310</div><div class='ctx'> #define PCI_CLASS_SERIAL_USB_EHCI	0x0c0320</div><div class='ctx'> #define PCI_CLASS_SERIAL_USB_XHCI	0x0c0330</div><div class='add'>+#define PCI_CLASS_SERIAL_USB_CDNS	0x0c0380</div><div class='ctx'> #define PCI_CLASS_SERIAL_USB_DEVICE	0x0c03fe</div><div class='ctx'> #define PCI_CLASS_SERIAL_FIBER		0x0c04</div><div class='ctx'> #define PCI_CLASS_SERIAL_SMBUS		0x0c05</div><div class='hunk'>@@ -517,6 +518,7 @@</div><div class='ctx'> #define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM	0x0251</div><div class='ctx'> #define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE 0x0361</div><div class='ctx'> #define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL	0x252</div><div class='add'>+#define PCI_DEVICE_ID_IBM_ISM		0x04ed</div><div class='ctx'> </div><div class='ctx'> #define PCI_SUBVENDOR_ID_IBM		0x1014</div><div class='ctx'> #define PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT	0x03d4</div><div class='hunk'>@@ -568,6 +570,7 @@</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_DF_F3	0x1463</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493</div><div class='add'>+#define PCI_DEVICE_ID_AMD_17H_M40H_DF_F3 0x13f3</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3 0x1727</div><div class='hunk'>@@ -580,6 +583,8 @@</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb</div><div class='add'>+#define PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3 0x124b</div><div class='add'>+#define PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3 0x12bb</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_MI300_DF_F3	0x152b</div><div class='ctx'> #define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a</div><div class='hunk'>@@ -2125,6 +2130,8 @@</div><div class='ctx'> </div><div class='ctx'> #define PCI_VENDOR_ID_CHELSIO		0x1425</div><div class='ctx'> </div><div class='add'>+#define PCI_VENDOR_ID_EDIMAX		0x1432</div><div class='add'>+</div><div class='ctx'> #define PCI_VENDOR_ID_ADLINK		0x144a</div><div class='ctx'> </div><div class='ctx'> #define PCI_VENDOR_ID_SAMSUNG		0x144d</div><div class='hunk'>@@ -2417,6 +2424,9 @@</div><div class='ctx'> #define PCI_VENDOR_ID_QCOM		0x17cb</div><div class='ctx'> </div><div class='ctx'> #define PCI_VENDOR_ID_CDNS		0x17cd</div><div class='add'>+#define PCI_DEVICE_ID_CDNS_USBSS	0x0100</div><div class='add'>+#define PCI_DEVICE_ID_CDNS_USB		0x0120</div><div class='add'>+#define PCI_DEVICE_ID_CDNS_USBSSP	0x0200</div><div class='ctx'> </div><div class='ctx'> #define PCI_VENDOR_ID_ARECA		0x17d3</div><div class='ctx'> #define PCI_DEVICE_ID_ARECA_1110	0x1110</div><div class='hunk'>@@ -2585,6 +2595,11 @@</div><div class='ctx'> </div><div class='ctx'> #define PCI_VENDOR_ID_REDHAT		0x1b36</div><div class='ctx'> </div><div class='add'>+#define PCI_VENDOR_ID_WCHIC		0x1c00</div><div class='add'>+#define PCI_DEVICE_ID_WCHIC_CH382_0S1P	0x3050</div><div class='add'>+#define PCI_DEVICE_ID_WCHIC_CH382_2S1P	0x3250</div><div class='add'>+#define PCI_DEVICE_ID_WCHIC_CH382_2S	0x3253</div><div class='add'>+</div><div class='ctx'> #define PCI_VENDOR_ID_SILICOM_DENMARK	0x1c2c</div><div class='ctx'> </div><div class='ctx'> #define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS	0x1c36</div><div class='hunk'>@@ -2596,8 +2611,12 @@</div><div class='ctx'> </div><div class='ctx'> #define PCI_VENDOR_ID_ZHAOXIN		0x1d17</div><div class='ctx'> </div><div class='add'>+#define PCI_VENDOR_ID_ROCKCHIP		0x1d87</div><div class='add'>+</div><div class='ctx'> #define PCI_VENDOR_ID_HYGON		0x1d94</div><div class='ctx'> </div><div class='add'>+#define PCI_VENDOR_ID_META		0x1d9b</div><div class='add'>+</div><div class='ctx'> #define PCI_VENDOR_ID_FUNGIBLE		0x1dad</div><div class='ctx'> </div><div class='ctx'> #define PCI_VENDOR_ID_HXT		0x1dbf</div><div class='hunk'>@@ -2605,8 +2624,13 @@</div><div class='ctx'> #define PCI_VENDOR_ID_TEKRAM		0x1de1</div><div class='ctx'> #define PCI_DEVICE_ID_TEKRAM_DC290	0xdc29</div><div class='ctx'> </div><div class='add'>+#define PCI_VENDOR_ID_RPI		0x1de4</div><div class='add'>+#define PCI_DEVICE_ID_RPI_RP1_C0	0x0001</div><div class='add'>+</div><div class='ctx'> #define PCI_VENDOR_ID_ALIBABA		0x1ded</div><div class='ctx'> </div><div class='add'>+#define PCI_VENDOR_ID_CXL		0x1e98</div><div class='add'>+</div><div class='ctx'> #define PCI_VENDOR_ID_TEHUTI		0x1fc9</div><div class='ctx'> #define PCI_DEVICE_ID_TEHUTI_3009	0x3009</div><div class='ctx'> #define PCI_DEVICE_ID_TEHUTI_3010	0x3010</div><div class='hunk'>@@ -2635,6 +2659,12 @@</div><div class='ctx'> #define PCI_VENDOR_ID_AKS		0x416c</div><div class='ctx'> #define PCI_DEVICE_ID_AKS_ALADDINCARD	0x0100</div><div class='ctx'> </div><div class='add'>+#define PCI_VENDOR_ID_WCHCN		0x4348</div><div class='add'>+#define PCI_DEVICE_ID_WCHCN_CH353_4S	0x3453</div><div class='add'>+#define PCI_DEVICE_ID_WCHCN_CH353_2S1PF	0x5046</div><div class='add'>+#define PCI_DEVICE_ID_WCHCN_CH353_1S1P	0x5053</div><div class='add'>+#define PCI_DEVICE_ID_WCHCN_CH353_2S1P	0x7053</div><div class='add'>+</div><div class='ctx'> #define PCI_VENDOR_ID_ACCESSIO		0x494f</div><div class='ctx'> #define PCI_DEVICE_ID_ACCESSIO_WDG_CSM	0x22c0</div><div class='ctx'> </div><div class='hunk'>@@ -2654,6 +2684,8 @@</div><div class='ctx'> #define PCI_DEVICE_ID_DCI_PCCOM8	0x0002</div><div class='ctx'> #define PCI_DEVICE_ID_DCI_PCCOM2	0x0004</div><div class='ctx'> </div><div class='add'>+#define PCI_VENDOR_ID_GLENFLY		0x6766</div><div class='add'>+</div><div class='ctx'> #define PCI_VENDOR_ID_INTEL		0x8086</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_EESSC	0x0008</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_CML_LP	0x02c8</div><div class='hunk'>@@ -2686,8 +2718,10 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_I960	0x0960</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_I960RM	0x0962</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_HSW_0	0x0a0c</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_DSA_SPR0	0x0b25</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_HSW_2	0x0c0c</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_CENTERTON_ILB	0x0c60</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_IAX_SPR0	0x0cfe</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_HSW_3	0x0d0c</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_BYT	0x0f04</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_SST_BYT	0x0f28</div><div class='hunk'>@@ -3018,6 +3052,7 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_DG1	0x490d</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_EHL_0	0x4b55</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_EHL_3	0x4b58</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_HDA_WCL	0x4d28</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_JSL_N	0x4dc8</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_DG2_0	0x4f90</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_DG2_1	0x4f91</div><div class='hunk'>@@ -3039,6 +3074,8 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_5100_22	0x65f6</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_HDA_FCL	0x67a8</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_HDA_NVL_S	0x6e50</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020</div><div class='hunk'>@@ -3106,6 +3143,9 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_CML_S	0xa3f0</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_LNL_P	0xa828</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_S21152BB	0xb152</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_HDA_BMG	0xe2f7</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_HDA_PTL_H	0xe328</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_HDA_PTL	0xe428</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_CML_R	0xf0c8</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_HDA_RKL_S	0xf1c8</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/pcie-dwc.h b/include/linux/pcie-dwc.h<br/>new file mode 100644<br/>index 000000000000..8ff778e7aec0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pcie-dwc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pcie-dwc.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021-2023 Alibaba Inc.</div><div class='add'>+ * Copyright (C) 2025 Linaro Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Author: Manivannan Sadhasivam &lt;manivannan.sadhasivam@linaro.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_PCIE_DWC_H</div><div class='add'>+#define LINUX_PCIE_DWC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+</div><div class='add'>+struct dwc_pcie_vsec_id {</div><div class='add'>+	u16 vendor_id;</div><div class='add'>+	u16 vsec_id;</div><div class='add'>+	u8 vsec_rev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VSEC IDs are allocated by the vendor, so a given ID may mean different</div><div class='add'>+ * things to different vendors.  See PCIe r6.0, sec 7.9.5.2.</div><div class='add'>+ */</div><div class='add'>+static const struct dwc_pcie_vsec_id dwc_pcie_rasdes_vsec_ids[] = {</div><div class='add'>+	{ .vendor_id = PCI_VENDOR_ID_ALIBABA,</div><div class='add'>+	  .vsec_id = 0x02, .vsec_rev = 0x4 },</div><div class='add'>+	{ .vendor_id = PCI_VENDOR_ID_AMPERE,</div><div class='add'>+	  .vsec_id = 0x02, .vsec_rev = 0x4 },</div><div class='add'>+	{ .vendor_id = PCI_VENDOR_ID_QCOM,</div><div class='add'>+	  .vsec_id = 0x02, .vsec_rev = 0x4 },</div><div class='add'>+	{ .vendor_id = PCI_VENDOR_ID_ROCKCHIP,</div><div class='add'>+	  .vsec_id = 0x02, .vsec_rev = 0x4 },</div><div class='add'>+	{ .vendor_id = PCI_VENDOR_ID_SAMSUNG,</div><div class='add'>+	  .vsec_id = 0x02, .vsec_rev = 0x4 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_PCIE_DWC_H */</div><div class='head'>diff --git a/include/linux/pcs/pcs-xpcs.h b/include/linux/pcs/pcs-xpcs.h<br/>index da3a6c30f6d2..36073f7b6bb4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pcs/pcs-xpcs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pcs/pcs-xpcs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pcs/pcs-xpcs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pcs/pcs-xpcs.h</a></div><div class='hunk'>@@ -7,11 +7,12 @@</div><div class='ctx'> #ifndef __LINUX_PCS_XPCS_H</div><div class='ctx'> #define __LINUX_PCS_XPCS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/fwnode.h&gt;</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/phylink.h&gt;</div><div class='del'>-</div><div class='del'>-#define NXP_SJA1105_XPCS_ID		0x00000010</div><div class='del'>-#define NXP_SJA1110_XPCS_ID		0x00000020</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* AN mode */</div><div class='ctx'> #define DW_AN_C73			1</div><div class='hunk'>@@ -20,32 +21,43 @@</div><div class='ctx'> #define DW_AN_C37_1000BASEX		4</div><div class='ctx'> #define DW_10GBASER			5</div><div class='ctx'> </div><div class='del'>-/* device vendor OUI */</div><div class='del'>-#define DW_OUI_WX			0x0018fc80</div><div class='del'>-</div><div class='del'>-/* dev_flag */</div><div class='del'>-#define DW_DEV_TXGBE			BIT(0)</div><div class='add'>+enum dw_xpcs_pcs_id {</div><div class='add'>+	DW_XPCS_ID_NATIVE = 0,</div><div class='add'>+	NXP_SJA1105_XPCS_ID = 0x00000010,</div><div class='add'>+	NXP_SJA1110_XPCS_ID = 0x00000020,</div><div class='add'>+	DW_XPCS_ID = 0x7996ced0,</div><div class='add'>+	DW_XPCS_ID_MASK = 0xffffffff,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct xpcs_id;</div><div class='add'>+enum dw_xpcs_pma_id {</div><div class='add'>+	DW_XPCS_PMA_ID_NATIVE = 0,</div><div class='add'>+	DW_XPCS_PMA_GEN1_3G_ID,</div><div class='add'>+	DW_XPCS_PMA_GEN2_3G_ID,</div><div class='add'>+	DW_XPCS_PMA_GEN2_6G_ID,</div><div class='add'>+	DW_XPCS_PMA_GEN4_3G_ID,</div><div class='add'>+	DW_XPCS_PMA_GEN4_6G_ID,</div><div class='add'>+	DW_XPCS_PMA_GEN5_10G_ID,</div><div class='add'>+	DW_XPCS_PMA_GEN5_12G_ID,</div><div class='add'>+	WX_TXGBE_XPCS_PMA_10G_ID = 0xfc806000,</div><div class='add'>+	/* Meta Platforms OUI 88:25:08, model 0, revision 0 */</div><div class='add'>+	MP_FBNIC_XPCS_PMA_100G_ID = 0x46904000,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct dw_xpcs {</div><div class='del'>-	struct mdio_device *mdiodev;</div><div class='del'>-	const struct xpcs_id *id;</div><div class='del'>-	struct phylink_pcs pcs;</div><div class='del'>-	phy_interface_t interface;</div><div class='del'>-	int dev_flag;</div><div class='add'>+struct dw_xpcs_info {</div><div class='add'>+	u32 pcs;</div><div class='add'>+	u32 pma;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct dw_xpcs;</div><div class='add'>+</div><div class='add'>+struct phylink_pcs *xpcs_to_phylink_pcs(struct dw_xpcs *xpcs);</div><div class='ctx'> int xpcs_get_an_mode(struct dw_xpcs *xpcs, phy_interface_t interface);</div><div class='del'>-void xpcs_link_up(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='del'>-		  phy_interface_t interface, int speed, int duplex);</div><div class='del'>-int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,</div><div class='del'>-		   const unsigned long *advertising, unsigned int neg_mode);</div><div class='del'>-void xpcs_get_interfaces(struct dw_xpcs *xpcs, unsigned long *interfaces);</div><div class='del'>-int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,</div><div class='del'>-		    int enable);</div><div class='del'>-struct dw_xpcs *xpcs_create_mdiodev(struct mii_bus *bus, int addr,</div><div class='del'>-				    phy_interface_t interface);</div><div class='add'>+void xpcs_config_eee_mult_fact(struct dw_xpcs *xpcs, u8 mult_fact);</div><div class='add'>+struct dw_xpcs *xpcs_create_mdiodev(struct mii_bus *bus, int addr);</div><div class='add'>+struct dw_xpcs *xpcs_create_fwnode(struct fwnode_handle *fwnode);</div><div class='ctx'> void xpcs_destroy(struct dw_xpcs *xpcs);</div><div class='ctx'> </div><div class='add'>+struct phylink_pcs *xpcs_create_pcs_mdiodev(struct mii_bus *bus, int addr);</div><div class='add'>+void xpcs_destroy_pcs(struct phylink_pcs *pcs);</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_PCS_XPCS_H */</div><div class='head'>diff --git a/include/linux/pds/pds_adminq.h b/include/linux/pds/pds_adminq.h<br/>index 4b4e9a98b37b..40ff0ec2b879 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pds/pds_adminq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pds/pds_adminq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pds/pds_adminq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pds/pds_adminq.h</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #ifndef _PDS_CORE_ADMINQ_H_</div><div class='ctx'> #define _PDS_CORE_ADMINQ_H_</div><div class='ctx'> </div><div class='del'>-#define PDSC_ADMINQ_MAX_POLL_INTERVAL	256</div><div class='add'>+#define PDSC_ADMINQ_MAX_POLL_INTERVAL	256000	/* usecs */</div><div class='ctx'> </div><div class='ctx'> enum pds_core_adminq_flags {</div><div class='ctx'> 	PDS_AQ_FLAG_FASTPOLL	= BIT(1),	/* completion poll at 1ms */</div><div class='hunk'>@@ -463,7 +463,6 @@ struct pds_core_lif_getattr_cmd {</div><div class='ctx'>  * @rsvd:       Word boundary padding</div><div class='ctx'>  * @comp_index: Index in the descriptor ring for which this is the completion</div><div class='ctx'>  * @state:	LIF state (enum pds_core_lif_state)</div><div class='del'>- * @name:	LIF name string, 0 terminated</div><div class='ctx'>  * @features:	Features (enum pds_core_hw_features)</div><div class='ctx'>  * @rsvd2:      Word boundary padding</div><div class='ctx'>  * @color:	Color bit</div><div class='hunk'>@@ -1179,6 +1178,274 @@ struct pds_lm_host_vf_status_cmd {</div><div class='ctx'> 	u8     status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum pds_fwctl_cmd_opcode {</div><div class='add'>+	PDS_FWCTL_CMD_IDENT = 70,</div><div class='add'>+	PDS_FWCTL_CMD_RPC   = 71,</div><div class='add'>+	PDS_FWCTL_CMD_QUERY = 72,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_cmd - Firmware control command structure</div><div class='add'>+ * @opcode: Opcode</div><div class='add'>+ * @rsvd:   Reserved</div><div class='add'>+ * @ep:     Endpoint identifier</div><div class='add'>+ * @op:     Operation identifier</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_cmd {</div><div class='add'>+	u8     opcode;</div><div class='add'>+	u8     rsvd[3];</div><div class='add'>+	__le32 ep;</div><div class='add'>+	__le32 op;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_comp - Firmware control completion structure</div><div class='add'>+ * @status:     Status of the firmware control operation</div><div class='add'>+ * @rsvd:       Reserved</div><div class='add'>+ * @comp_index: Completion index in little-endian format</div><div class='add'>+ * @rsvd2:      Reserved</div><div class='add'>+ * @color:      Color bit indicating the state of the completion</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_comp {</div><div class='add'>+	u8     status;</div><div class='add'>+	u8     rsvd;</div><div class='add'>+	__le16 comp_index;</div><div class='add'>+	u8     rsvd2[11];</div><div class='add'>+	u8     color;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_ident_cmd - Firmware control identification command structure</div><div class='add'>+ * @opcode:   Operation code for the command</div><div class='add'>+ * @rsvd:     Reserved</div><div class='add'>+ * @version:  Interface version</div><div class='add'>+ * @rsvd2:    Reserved</div><div class='add'>+ * @len:      Length of the identification data</div><div class='add'>+ * @ident_pa: Physical address of the identification data</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_ident_cmd {</div><div class='add'>+	u8     opcode;</div><div class='add'>+	u8     rsvd;</div><div class='add'>+	u8     version;</div><div class='add'>+	u8     rsvd2;</div><div class='add'>+	__le32 len;</div><div class='add'>+	__le64 ident_pa;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* future feature bits here</div><div class='add'>+ * enum pds_fwctl_features {</div><div class='add'>+ * };</div><div class='add'>+ * (compilers don't like empty enums)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_ident - Firmware control identification structure</div><div class='add'>+ * @features:    Supported features (enum pds_fwctl_features)</div><div class='add'>+ * @version:     Interface version</div><div class='add'>+ * @rsvd:        Reserved</div><div class='add'>+ * @max_req_sz:  Maximum request size</div><div class='add'>+ * @max_resp_sz: Maximum response size</div><div class='add'>+ * @max_req_sg_elems:  Maximum number of request SGs</div><div class='add'>+ * @max_resp_sg_elems: Maximum number of response SGs</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_ident {</div><div class='add'>+	__le64 features;</div><div class='add'>+	u8     version;</div><div class='add'>+	u8     rsvd[3];</div><div class='add'>+	__le32 max_req_sz;</div><div class='add'>+	__le32 max_resp_sz;</div><div class='add'>+	u8     max_req_sg_elems;</div><div class='add'>+	u8     max_resp_sg_elems;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum pds_fwctl_query_entity {</div><div class='add'>+	PDS_FWCTL_RPC_ROOT	= 0,</div><div class='add'>+	PDS_FWCTL_RPC_ENDPOINT	= 1,</div><div class='add'>+	PDS_FWCTL_RPC_OPERATION	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PDS_FWCTL_RPC_OPCODE_CMD_SHIFT	0</div><div class='add'>+#define PDS_FWCTL_RPC_OPCODE_CMD_MASK	GENMASK(15, PDS_FWCTL_RPC_OPCODE_CMD_SHIFT)</div><div class='add'>+#define PDS_FWCTL_RPC_OPCODE_VER_SHIFT	16</div><div class='add'>+#define PDS_FWCTL_RPC_OPCODE_VER_MASK	GENMASK(23, PDS_FWCTL_RPC_OPCODE_VER_SHIFT)</div><div class='add'>+</div><div class='add'>+#define PDS_FWCTL_RPC_OPCODE_GET_CMD(op)  FIELD_GET(PDS_FWCTL_RPC_OPCODE_CMD_MASK, op)</div><div class='add'>+#define PDS_FWCTL_RPC_OPCODE_GET_VER(op)  FIELD_GET(PDS_FWCTL_RPC_OPCODE_VER_MASK, op)</div><div class='add'>+</div><div class='add'>+#define PDS_FWCTL_RPC_OPCODE_CMP(op1, op2) \</div><div class='add'>+	(PDS_FWCTL_RPC_OPCODE_GET_CMD(op1) == PDS_FWCTL_RPC_OPCODE_GET_CMD(op2) &amp;&amp; \</div><div class='add'>+	 PDS_FWCTL_RPC_OPCODE_GET_VER(op1) &lt;= PDS_FWCTL_RPC_OPCODE_GET_VER(op2))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * FW command attributes that map to the FWCTL scope values</div><div class='add'>+ */</div><div class='add'>+#define PDSFC_FW_CMD_ATTR_READ               0x00</div><div class='add'>+#define PDSFC_FW_CMD_ATTR_DEBUG_READ         0x02</div><div class='add'>+#define PDSFC_FW_CMD_ATTR_WRITE              0x04</div><div class='add'>+#define PDSFC_FW_CMD_ATTR_DEBUG_WRITE        0x08</div><div class='add'>+#define PDSFC_FW_CMD_ATTR_SYNC               0x10</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_query_cmd - Firmware control query command structure</div><div class='add'>+ * @opcode: Operation code for the command</div><div class='add'>+ * @entity:  Entity type to query (enum pds_fwctl_query_entity)</div><div class='add'>+ * @version: Version of the query data structure supported by the driver</div><div class='add'>+ * @rsvd:    Reserved</div><div class='add'>+ * @query_data_buf_len: Length of the query data buffer</div><div class='add'>+ * @query_data_buf_pa:  Physical address of the query data buffer</div><div class='add'>+ * @ep:      Endpoint identifier to query  (when entity is PDS_FWCTL_RPC_ENDPOINT)</div><div class='add'>+ * @op:      Operation identifier to query (when entity is PDS_FWCTL_RPC_OPERATION)</div><div class='add'>+ *</div><div class='add'>+ * This structure is used to send a query command to the firmware control</div><div class='add'>+ * interface. The structure is packed to ensure there is no padding between</div><div class='add'>+ * the fields.</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_query_cmd {</div><div class='add'>+	u8     opcode;</div><div class='add'>+	u8     entity;</div><div class='add'>+	u8     version;</div><div class='add'>+	u8     rsvd;</div><div class='add'>+	__le32 query_data_buf_len;</div><div class='add'>+	__le64 query_data_buf_pa;</div><div class='add'>+	union {</div><div class='add'>+		__le32 ep;</div><div class='add'>+		__le32 op;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_query_comp - Firmware control query completion structure</div><div class='add'>+ * @status:     Status of the query command</div><div class='add'>+ * @rsvd:       Reserved</div><div class='add'>+ * @comp_index: Completion index in little-endian format</div><div class='add'>+ * @version:    Version of the query data structure returned by firmware. This</div><div class='add'>+ *		 should be less than or equal to the version supported by the driver</div><div class='add'>+ * @rsvd2:      Reserved</div><div class='add'>+ * @color:      Color bit indicating the state of the completion</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_query_comp {</div><div class='add'>+	u8     status;</div><div class='add'>+	u8     rsvd;</div><div class='add'>+	__le16 comp_index;</div><div class='add'>+	u8     version;</div><div class='add'>+	u8     rsvd2[2];</div><div class='add'>+	u8     color;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_query_data_endpoint - query data for entity PDS_FWCTL_RPC_ROOT</div><div class='add'>+ * @id: The identifier for the data endpoint</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_query_data_endpoint {</div><div class='add'>+	__le32 id;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_query_data_operation - query data for entity PDS_FWCTL_RPC_ENDPOINT</div><div class='add'>+ * @id:    Operation identifier</div><div class='add'>+ * @scope: Scope of the operation (enum fwctl_rpc_scope)</div><div class='add'>+ * @rsvd:  Reserved</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_query_data_operation {</div><div class='add'>+	__le32 id;</div><div class='add'>+	u8     scope;</div><div class='add'>+	u8     rsvd[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_query_data - query data structure</div><div class='add'>+ * @version:     Version of the query data structure</div><div class='add'>+ * @rsvd:        Reserved</div><div class='add'>+ * @num_entries: Number of entries in the union</div><div class='add'>+ * @entries:     Array of query data entries, depending on the entity type</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_query_data {</div><div class='add'>+	u8      version;</div><div class='add'>+	u8      rsvd[3];</div><div class='add'>+	__le32  num_entries;</div><div class='add'>+	u8      entries[] __counted_by_le(num_entries);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_rpc_cmd - Firmware control RPC command</div><div class='add'>+ * @opcode:        opcode PDS_FWCTL_CMD_RPC</div><div class='add'>+ * @rsvd:          Reserved</div><div class='add'>+ * @flags:         Indicates indirect request and/or response handling</div><div class='add'>+ * @ep:            Endpoint identifier</div><div class='add'>+ * @op:            Operation identifier</div><div class='add'>+ * @inline_req0:   Buffer for inline request</div><div class='add'>+ * @inline_req1:   Buffer for inline request</div><div class='add'>+ * @req_pa:        Physical address of request data</div><div class='add'>+ * @req_sz:        Size of the request</div><div class='add'>+ * @req_sg_elems:  Number of request SGs</div><div class='add'>+ * @req_rsvd:      Reserved</div><div class='add'>+ * @inline_req2:   Buffer for inline request</div><div class='add'>+ * @resp_pa:       Physical address of response data</div><div class='add'>+ * @resp_sz:       Size of the response</div><div class='add'>+ * @resp_sg_elems: Number of response SGs</div><div class='add'>+ * @resp_rsvd:     Reserved</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_rpc_cmd {</div><div class='add'>+	u8     opcode;</div><div class='add'>+	u8     rsvd;</div><div class='add'>+	__le16 flags;</div><div class='add'>+#define PDS_FWCTL_RPC_IND_REQ		0x1</div><div class='add'>+#define PDS_FWCTL_RPC_IND_RESP		0x2</div><div class='add'>+	__le32 ep;</div><div class='add'>+	__le32 op;</div><div class='add'>+	u8 inline_req0[16];</div><div class='add'>+	union {</div><div class='add'>+		u8 inline_req1[16];</div><div class='add'>+		struct {</div><div class='add'>+			__le64 req_pa;</div><div class='add'>+			__le32 req_sz;</div><div class='add'>+			u8     req_sg_elems;</div><div class='add'>+			u8     req_rsvd[3];</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		u8 inline_req2[16];</div><div class='add'>+		struct {</div><div class='add'>+			__le64 resp_pa;</div><div class='add'>+			__le32 resp_sz;</div><div class='add'>+			u8     resp_sg_elems;</div><div class='add'>+			u8     resp_rsvd[3];</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_sg_elem - Transmit scatter-gather (SG) descriptor element</div><div class='add'>+ * @addr:	DMA address of SG element data buffer</div><div class='add'>+ * @len:	Length of SG element data buffer, in bytes</div><div class='add'>+ * @rsvd:	Reserved</div><div class='add'>+ */</div><div class='add'>+struct pds_sg_elem {</div><div class='add'>+	__le64 addr;</div><div class='add'>+	__le32 len;</div><div class='add'>+	u8     rsvd[4];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pds_fwctl_rpc_comp - Completion of a firmware control RPC</div><div class='add'>+ * @status:     Status of the command</div><div class='add'>+ * @rsvd:       Reserved</div><div class='add'>+ * @comp_index: Completion index of the command</div><div class='add'>+ * @err:        Error code, if any, from the RPC</div><div class='add'>+ * @resp_sz:    Size of the response</div><div class='add'>+ * @rsvd2:      Reserved</div><div class='add'>+ * @color:      Color bit indicating the state of the completion</div><div class='add'>+ */</div><div class='add'>+struct pds_fwctl_rpc_comp {</div><div class='add'>+	u8     status;</div><div class='add'>+	u8     rsvd;</div><div class='add'>+	__le16 comp_index;</div><div class='add'>+	__le32 err;</div><div class='add'>+	__le32 resp_sz;</div><div class='add'>+	u8     rsvd2[3];</div><div class='add'>+	u8     color;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> union pds_core_adminq_cmd {</div><div class='ctx'> 	u8     opcode;</div><div class='ctx'> 	u8     bytes[64];</div><div class='hunk'>@@ -1216,6 +1483,11 @@ union pds_core_adminq_cmd {</div><div class='ctx'> 	struct pds_lm_dirty_enable_cmd	  lm_dirty_enable;</div><div class='ctx'> 	struct pds_lm_dirty_disable_cmd	  lm_dirty_disable;</div><div class='ctx'> 	struct pds_lm_dirty_seq_ack_cmd	  lm_dirty_seq_ack;</div><div class='add'>+</div><div class='add'>+	struct pds_fwctl_cmd		  fwctl;</div><div class='add'>+	struct pds_fwctl_ident_cmd	  fwctl_ident;</div><div class='add'>+	struct pds_fwctl_rpc_cmd	  fwctl_rpc;</div><div class='add'>+	struct pds_fwctl_query_cmd	  fwctl_query;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union pds_core_adminq_comp {</div><div class='hunk'>@@ -1243,6 +1515,10 @@ union pds_core_adminq_comp {</div><div class='ctx'> </div><div class='ctx'> 	struct pds_lm_state_size_comp	  lm_state_size;</div><div class='ctx'> 	struct pds_lm_dirty_status_comp	  lm_dirty_status;</div><div class='add'>+</div><div class='add'>+	struct pds_fwctl_comp		  fwctl;</div><div class='add'>+	struct pds_fwctl_rpc_comp	  fwctl_rpc;</div><div class='add'>+	struct pds_fwctl_query_comp	  fwctl_query;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifndef __CHECKER__</div><div class='head'>diff --git a/include/linux/pds/pds_common.h b/include/linux/pds/pds_common.h<br/>index 30581e2e04cc..b193adbe7cc3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pds/pds_common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pds/pds_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pds/pds_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pds/pds_common.h</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'> #ifndef _PDS_COMMON_H_</div><div class='ctx'> #define _PDS_COMMON_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+</div><div class='ctx'> #define PDS_CORE_DRV_NAME			"pds_core"</div><div class='ctx'> </div><div class='ctx'> /* the device's internal addressing uses up to 52 bits */</div><div class='hunk'>@@ -27,6 +29,7 @@ enum pds_core_vif_types {</div><div class='ctx'> 	PDS_DEV_TYPE_ETH	= 3,</div><div class='ctx'> 	PDS_DEV_TYPE_RDMA	= 4,</div><div class='ctx'> 	PDS_DEV_TYPE_LM		= 5,</div><div class='add'>+	PDS_DEV_TYPE_FWCTL	= 6,</div><div class='ctx'> </div><div class='ctx'> 	/* new ones added before this line */</div><div class='ctx'> 	PDS_DEV_TYPE_MAX	= 16   /* don't change - used in struct size */</div><div class='hunk'>@@ -38,6 +41,7 @@ enum pds_core_vif_types {</div><div class='ctx'> #define PDS_DEV_TYPE_ETH_STR	"Eth"</div><div class='ctx'> #define PDS_DEV_TYPE_RDMA_STR	"RDMA"</div><div class='ctx'> #define PDS_DEV_TYPE_LM_STR	"LM"</div><div class='add'>+#define PDS_DEV_TYPE_FWCTL_STR	"fwctl"</div><div class='ctx'> </div><div class='ctx'> #define PDS_VDPA_DEV_NAME	PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_VDPA_STR</div><div class='ctx'> #define PDS_VFIO_LM_DEV_NAME	PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_LM_STR "." PDS_DEV_TYPE_VFIO_STR</div><div class='head'>diff --git a/include/linux/pe.h b/include/linux/pe.h<br/>index fdf9c95709ba..cd2b7275385f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pe.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pe.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pe.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pe.h</a></div><div class='hunk'>@@ -39,113 +39,160 @@</div><div class='ctx'>  */</div><div class='ctx'> #define LINUX_PE_MAGIC	0x818223cd</div><div class='ctx'> </div><div class='del'>-#define MZ_MAGIC	0x5a4d	/* "MZ" */</div><div class='add'>+#define IMAGE_DOS_SIGNATURE	0x5a4d /* "MZ" */</div><div class='ctx'> </div><div class='del'>-#define PE_MAGIC		0x00004550	/* "PE\0\0" */</div><div class='del'>-#define PE_OPT_MAGIC_PE32	0x010b</div><div class='del'>-#define PE_OPT_MAGIC_PE32_ROM	0x0107</div><div class='del'>-#define PE_OPT_MAGIC_PE32PLUS	0x020b</div><div class='add'>+#define IMAGE_NT_SIGNATURE	0x00004550 /* "PE\0\0" */</div><div class='add'>+</div><div class='add'>+#define IMAGE_ROM_OPTIONAL_HDR_MAGIC	0x0107 /* ROM image (for R3000/R4000/R10000/ALPHA), without MZ and PE\0\0 sign */</div><div class='add'>+#define IMAGE_NT_OPTIONAL_HDR32_MAGIC	0x010b /* PE32 executable image */</div><div class='add'>+#define IMAGE_NT_OPTIONAL_HDR64_MAGIC	0x020b /* PE32+ executable image */</div><div class='ctx'> </div><div class='ctx'> /* machine type */</div><div class='del'>-#define	IMAGE_FILE_MACHINE_UNKNOWN	0x0000</div><div class='del'>-#define	IMAGE_FILE_MACHINE_AM33		0x01d3</div><div class='del'>-#define	IMAGE_FILE_MACHINE_AMD64	0x8664</div><div class='del'>-#define	IMAGE_FILE_MACHINE_ARM		0x01c0</div><div class='del'>-#define	IMAGE_FILE_MACHINE_ARMV7	0x01c4</div><div class='del'>-#define	IMAGE_FILE_MACHINE_ARM64	0xaa64</div><div class='del'>-#define	IMAGE_FILE_MACHINE_EBC		0x0ebc</div><div class='del'>-#define	IMAGE_FILE_MACHINE_I386		0x014c</div><div class='del'>-#define	IMAGE_FILE_MACHINE_IA64		0x0200</div><div class='del'>-#define	IMAGE_FILE_MACHINE_M32R		0x9041</div><div class='del'>-#define	IMAGE_FILE_MACHINE_MIPS16	0x0266</div><div class='del'>-#define	IMAGE_FILE_MACHINE_MIPSFPU	0x0366</div><div class='del'>-#define	IMAGE_FILE_MACHINE_MIPSFPU16	0x0466</div><div class='del'>-#define	IMAGE_FILE_MACHINE_POWERPC	0x01f0</div><div class='del'>-#define	IMAGE_FILE_MACHINE_POWERPCFP	0x01f1</div><div class='del'>-#define	IMAGE_FILE_MACHINE_R4000	0x0166</div><div class='del'>-#define	IMAGE_FILE_MACHINE_RISCV32	0x5032</div><div class='del'>-#define	IMAGE_FILE_MACHINE_RISCV64	0x5064</div><div class='del'>-#define	IMAGE_FILE_MACHINE_RISCV128	0x5128</div><div class='del'>-#define	IMAGE_FILE_MACHINE_SH3		0x01a2</div><div class='del'>-#define	IMAGE_FILE_MACHINE_SH3DSP	0x01a3</div><div class='del'>-#define	IMAGE_FILE_MACHINE_SH3E		0x01a4</div><div class='del'>-#define	IMAGE_FILE_MACHINE_SH4		0x01a6</div><div class='del'>-#define	IMAGE_FILE_MACHINE_SH5		0x01a8</div><div class='del'>-#define	IMAGE_FILE_MACHINE_THUMB	0x01c2</div><div class='del'>-#define	IMAGE_FILE_MACHINE_WCEMIPSV2	0x0169</div><div class='del'>-#define	IMAGE_FILE_MACHINE_LOONGARCH32	0x6232</div><div class='del'>-#define	IMAGE_FILE_MACHINE_LOONGARCH64	0x6264</div><div class='add'>+#define	IMAGE_FILE_MACHINE_UNKNOWN	0x0000 /* Unknown architecture */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_TARGET_HOST	0x0001 /* Interacts with the host and not a WOW64 guest (not for file image) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ALPHA_OLD	0x0183 /* DEC Alpha AXP 32-bit (old images) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ALPHA	0x0184 /* DEC Alpha AXP 32-bit */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ALPHA64	0x0284 /* DEC Alpha AXP 64-bit (with 8kB page size) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_AXP64	IMAGE_FILE_MACHINE_ALPHA64</div><div class='add'>+#define	IMAGE_FILE_MACHINE_AM33		0x01d3 /* Matsushita AM33, now Panasonic MN103 */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_AMD64	0x8664 /* AMD64 (x64) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ARM		0x01c0 /* ARM Little-Endian (ARMv4) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_THUMB	0x01c2 /* ARM Thumb Little-Endian (ARMv4T) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ARMNT	0x01c4 /* ARM Thumb-2 Little-Endian (ARMv7) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ARMV7	IMAGE_FILE_MACHINE_ARMNT</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ARM64	0xaa64 /* ARM64 Little-Endian (Classic ABI) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ARM64EC	0xa641 /* ARM64 Little-Endian (Emulation Compatible ABI for AMD64) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_ARM64X	0xa64e /* ARM64 Little-Endian (fat binary with both Classic ABI and EC ABI code) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_CEE		0xc0ee /* COM+ Execution Engine (CLR pure MSIL object files) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_CEF		0x0cef /* Windows CE 3.0 Common Executable Format (CEF bytecode) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_CHPE_X86	0x3a64 /* ARM64 Little-Endian (Compiled Hybrid PE ABI for I386) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_HYBRID_X86	IMAGE_FILE_MACHINE_CHPE_X86</div><div class='add'>+#define	IMAGE_FILE_MACHINE_EBC		0x0ebc /* EFI/UEFI Byte Code */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_I386		0x014c /* Intel 386 (x86) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_I860		0x014d /* Intel 860 (N10) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_IA64		0x0200 /* Intel IA-64 (with 8kB page size) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_LOONGARCH32	0x6232 /* LoongArch 32-bit processor family */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_LOONGARCH64	0x6264 /* LoongArch 64-bit processor family */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_M32R		0x9041 /* Mitsubishi M32R 32-bit Little-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_M68K		0x0268 /* Motorola 68000 series */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_MIPS16	0x0266 /* MIPS III with MIPS16 ASE Little-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_MIPSFPU	0x0366 /* MIPS III with FPU Little-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_MIPSFPU16	0x0466 /* MIPS III with MIPS16 ASE and FPU Little-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_MPPC_601	0x0601 /* PowerPC 32-bit Big-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_OMNI		0xace1 /* Microsoft OMNI VM (omniprox.dll) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_PARISC	0x0290 /* HP PA-RISC */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_POWERPC	0x01f0 /* PowerPC 32-bit Little-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_POWERPCFP	0x01f1 /* PowerPC 32-bit with FPU Little-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_POWERPCBE	0x01f2 /* PowerPC 64-bit Big-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_R3000	0x0162 /* MIPS I Little-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_R3000_BE	0x0160 /* MIPS I Big-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_R4000	0x0166 /* MIPS III Little-Endian (with 1kB or 4kB page size) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_R10000	0x0168 /* MIPS IV Little-Endian */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_RISCV32	0x5032 /* RISC-V 32-bit address space */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_RISCV64	0x5064 /* RISC-V 64-bit address space */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_RISCV128	0x5128 /* RISC-V 128-bit address space */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_SH3		0x01a2 /* Hitachi SH-3 32-bit Little-Endian (with 1kB page size) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_SH3DSP	0x01a3 /* Hitachi SH-3 DSP 32-bit (with 1kB page size) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_SH3E		0x01a4 /* Hitachi SH-3E Little-Endian (with 1kB page size) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_SH4		0x01a6 /* Hitachi SH-4 32-bit Little-Endian (with 1kB page size) */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_SH5		0x01a8 /* Hitachi SH-5 64-bit */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_TAHOE	0x07cc /* Intel EM machine */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_TRICORE	0x0520 /* Infineon AUDO 32-bit */</div><div class='add'>+#define	IMAGE_FILE_MACHINE_WCEMIPSV2	0x0169 /* MIPS Windows CE v2 Little-Endian */</div><div class='ctx'> </div><div class='ctx'> /* flags */</div><div class='del'>-#define IMAGE_FILE_RELOCS_STRIPPED           0x0001</div><div class='del'>-#define IMAGE_FILE_EXECUTABLE_IMAGE          0x0002</div><div class='del'>-#define IMAGE_FILE_LINE_NUMS_STRIPPED        0x0004</div><div class='del'>-#define IMAGE_FILE_LOCAL_SYMS_STRIPPED       0x0008</div><div class='del'>-#define IMAGE_FILE_AGGRESSIVE_WS_TRIM        0x0010</div><div class='del'>-#define IMAGE_FILE_LARGE_ADDRESS_AWARE       0x0020</div><div class='del'>-#define IMAGE_FILE_16BIT_MACHINE             0x0040</div><div class='del'>-#define IMAGE_FILE_BYTES_REVERSED_LO         0x0080</div><div class='del'>-#define IMAGE_FILE_32BIT_MACHINE             0x0100</div><div class='del'>-#define IMAGE_FILE_DEBUG_STRIPPED            0x0200</div><div class='del'>-#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP   0x0400</div><div class='del'>-#define IMAGE_FILE_NET_RUN_FROM_SWAP         0x0800</div><div class='del'>-#define IMAGE_FILE_SYSTEM                    0x1000</div><div class='del'>-#define IMAGE_FILE_DLL                       0x2000</div><div class='del'>-#define IMAGE_FILE_UP_SYSTEM_ONLY            0x4000</div><div class='del'>-#define IMAGE_FILE_BYTES_REVERSED_HI         0x8000</div><div class='del'>-</div><div class='del'>-#define IMAGE_FILE_OPT_ROM_MAGIC	0x107</div><div class='del'>-#define IMAGE_FILE_OPT_PE32_MAGIC	0x10b</div><div class='del'>-#define IMAGE_FILE_OPT_PE32_PLUS_MAGIC	0x20b</div><div class='del'>-</div><div class='del'>-#define IMAGE_SUBSYSTEM_UNKNOWN			 0</div><div class='del'>-#define IMAGE_SUBSYSTEM_NATIVE			 1</div><div class='del'>-#define IMAGE_SUBSYSTEM_WINDOWS_GUI		 2</div><div class='del'>-#define IMAGE_SUBSYSTEM_WINDOWS_CUI		 3</div><div class='del'>-#define IMAGE_SUBSYSTEM_POSIX_CUI		 7</div><div class='del'>-#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI		 9</div><div class='del'>-#define IMAGE_SUBSYSTEM_EFI_APPLICATION		10</div><div class='del'>-#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER	11</div><div class='del'>-#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER	12</div><div class='del'>-#define IMAGE_SUBSYSTEM_EFI_ROM_IMAGE		13</div><div class='del'>-#define IMAGE_SUBSYSTEM_XBOX			14</div><div class='del'>-</div><div class='del'>-#define IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE          0x0040</div><div class='del'>-#define IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY       0x0080</div><div class='del'>-#define IMAGE_DLL_CHARACTERISTICS_NX_COMPAT             0x0100</div><div class='del'>-#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION           0x0200</div><div class='del'>-#define IMAGE_DLLCHARACTERISTICS_NO_SEH                 0x0400</div><div class='del'>-#define IMAGE_DLLCHARACTERISTICS_NO_BIND                0x0800</div><div class='del'>-#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER             0x2000</div><div class='del'>-#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE  0x8000</div><div class='del'>-</div><div class='del'>-#define IMAGE_DLLCHARACTERISTICS_EX_CET_COMPAT		0x0001</div><div class='del'>-#define IMAGE_DLLCHARACTERISTICS_EX_FORWARD_CFI_COMPAT	0x0040</div><div class='del'>-</div><div class='del'>-/* they actually defined 0x00000000 as well, but I think we'll skip that one. */</div><div class='del'>-#define IMAGE_SCN_RESERVED_0	0x00000001</div><div class='del'>-#define IMAGE_SCN_RESERVED_1	0x00000002</div><div class='del'>-#define IMAGE_SCN_RESERVED_2	0x00000004</div><div class='del'>-#define IMAGE_SCN_TYPE_NO_PAD	0x00000008 /* don't pad - obsolete */</div><div class='del'>-#define IMAGE_SCN_RESERVED_3	0x00000010</div><div class='add'>+#define IMAGE_FILE_RELOCS_STRIPPED		0x0001 /* Relocation info stripped from file */</div><div class='add'>+#define IMAGE_FILE_EXECUTABLE_IMAGE		0x0002 /* File is executable (i.e. no unresolved external references) */</div><div class='add'>+#define IMAGE_FILE_LINE_NUMS_STRIPPED		0x0004 /* Line nunbers stripped from file */</div><div class='add'>+#define IMAGE_FILE_LOCAL_SYMS_STRIPPED		0x0008 /* Local symbols stripped from file */</div><div class='add'>+#define IMAGE_FILE_AGGRESSIVE_WS_TRIM		0x0010 /* Aggressively trim working set */</div><div class='add'>+#define IMAGE_FILE_LARGE_ADDRESS_AWARE		0x0020 /* App can handle &gt;2gb addresses (image can be loaded at address above 2GB) */</div><div class='add'>+#define IMAGE_FILE_16BIT_MACHINE		0x0040 /* 16 bit word machine */</div><div class='add'>+#define IMAGE_FILE_BYTES_REVERSED_LO		0x0080 /* Bytes of machine word are reversed (should be set together with IMAGE_FILE_BYTES_REVERSED_HI) */</div><div class='add'>+#define IMAGE_FILE_32BIT_MACHINE		0x0100 /* 32 bit word machine */</div><div class='add'>+#define IMAGE_FILE_DEBUG_STRIPPED		0x0200 /* Debugging info stripped from file in .DBG file */</div><div class='add'>+#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP	0x0400 /* If Image is on removable media, copy and run from the swap file */</div><div class='add'>+#define IMAGE_FILE_NET_RUN_FROM_SWAP		0x0800 /* If Image is on Net, copy and run from the swap file */</div><div class='add'>+#define IMAGE_FILE_SYSTEM			0x1000 /* System kernel-mode file (can't be loaded in user-mode) */</div><div class='add'>+#define IMAGE_FILE_DLL				0x2000 /* File is a DLL */</div><div class='add'>+#define IMAGE_FILE_UP_SYSTEM_ONLY		0x4000 /* File should only be run on a UP (uniprocessor) machine */</div><div class='add'>+#define IMAGE_FILE_BYTES_REVERSED_HI		0x8000 /* Bytes of machine word are reversed (should be set together with IMAGE_FILE_BYTES_REVERSED_LO) */</div><div class='add'>+</div><div class='add'>+/* subsys */</div><div class='add'>+#define IMAGE_SUBSYSTEM_UNKNOWN				 0 /* Unknown subsystem */</div><div class='add'>+#define IMAGE_SUBSYSTEM_NATIVE				 1 /* No subsystem required (NT device drivers and NT native system processes) */</div><div class='add'>+#define IMAGE_SUBSYSTEM_WINDOWS_GUI			 2 /* Windows graphical user interface (GUI) subsystem */</div><div class='add'>+#define IMAGE_SUBSYSTEM_WINDOWS_CUI			 3 /* Windows character-mode user interface (CUI) subsystem */</div><div class='add'>+#define IMAGE_SUBSYSTEM_WINDOWS_OLD_CE_GUI		 4 /* Old Windows CE subsystem */</div><div class='add'>+#define IMAGE_SUBSYSTEM_OS2_CUI				 5 /* OS/2 CUI subsystem */</div><div class='add'>+#define IMAGE_SUBSYSTEM_RESERVED_6			 6</div><div class='add'>+#define IMAGE_SUBSYSTEM_POSIX_CUI			 7 /* POSIX CUI subsystem */</div><div class='add'>+#define IMAGE_SUBSYSTEM_MMOSA				 8 /* MMOSA/Native Win32E */</div><div class='add'>+#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI			 9 /* Windows CE subsystem */</div><div class='add'>+#define IMAGE_SUBSYSTEM_EFI_APPLICATION			10 /* Extensible Firmware Interface (EFI) application */</div><div class='add'>+#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER		11 /* EFI driver with boot services */</div><div class='add'>+#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER		12 /* EFI driver with run-time services */</div><div class='add'>+#define IMAGE_SUBSYSTEM_EFI_ROM_IMAGE			13 /* EFI ROM image */</div><div class='add'>+#define IMAGE_SUBSYSTEM_XBOX				14 /* Xbox system */</div><div class='add'>+#define IMAGE_SUBSYSTEM_RESERVED_15			15</div><div class='add'>+#define IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION	16 /* Windows Boot application */</div><div class='add'>+#define IMAGE_SUBSYSTEM_XBOX_CODE_CATALOG		17 /* Xbox Code Catalog */</div><div class='add'>+</div><div class='add'>+/* dll_flags */</div><div class='add'>+#define IMAGE_LIBRARY_PROCESS_INIT			0x0001 /* DLL initialization function called just after process initialization */</div><div class='add'>+#define IMAGE_LIBRARY_PROCESS_TERM			0x0002 /* DLL initialization function called just before process termination */</div><div class='add'>+#define IMAGE_LIBRARY_THREAD_INIT			0x0004 /* DLL initialization function called just after thread initialization */</div><div class='add'>+#define IMAGE_LIBRARY_THREAD_TERM			0x0008 /* DLL initialization function called just before thread initialization */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_RESERVED_4		0x0010</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA	0x0020 /* ASLR with 64 bit address space (image can be loaded at address above 4GB) */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE		0x0040 /* The DLL can be relocated at load time */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY	0x0080 /* Code integrity checks are forced */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT		0x0100 /* Image is compatible with data execution prevention */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION		0x0200 /* Image is isolation aware, but should not be isolated (prevents loading of manifest file) */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_NO_SEH			0x0400 /* Image does not use SEH, no SE handler may reside in this image */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_NO_BIND		0x0800 /* Do not bind the image */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_X86_THUNK		0x1000 /* Image is a Wx86 Thunk DLL (for non-x86/risc DLL files) */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_APPCONTAINER		0x1000 /* Image should execute in an AppContainer (for EXE Metro Apps in Windows 8) */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER		0x2000 /* A WDM driver */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_GUARD_CF		0x4000 /* Image supports Control Flow Guard */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE	0x8000 /* The image is terminal server (Remote Desktop Services) aware */</div><div class='add'>+</div><div class='add'>+/* IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS flags */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_EX_CET_COMPAT					0x0001 /* Image is Control-flow Enforcement Technology Shadow Stack compatible */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_EX_CET_COMPAT_STRICT_MODE			0x0002 /* CET is enforced in strict mode */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_EX_CET_SET_CONTEXT_IP_VALIDATION_RELAXED_MODE	0x0004 /* Relaxed mode for Context IP Validation under CET is allowed */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_EX_CET_DYNAMIC_APIS_ALLOW_IN_PROC		0x0008 /* Use of dynamic APIs is restricted to processes only */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_EX_CET_RESERVED_1				0x0010</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_EX_CET_RESERVED_2				0x0020</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_EX_FORWARD_CFI_COMPAT				0x0040 /* All branch targets in all image code sections are annotated with forward-edge control flow integrity guard instructions */</div><div class='add'>+#define IMAGE_DLLCHARACTERISTICS_EX_HOTPATCH_COMPATIBLE				0x0080 /* Image can be modified while in use, hotpatch-compatible */</div><div class='add'>+</div><div class='add'>+/* section_header flags */</div><div class='add'>+#define IMAGE_SCN_SCALE_INDEX	0x00000001 /* address of tls index is scaled = multiplied by 4 (for .tls section on MIPS only) */</div><div class='add'>+#define IMAGE_SCN_TYPE_NO_LOAD	0x00000002 /* reserved */</div><div class='add'>+#define IMAGE_SCN_TYPE_GROUPED	0x00000004 /* obsolete (used for 16-bit offset code) */</div><div class='add'>+#define IMAGE_SCN_TYPE_NO_PAD	0x00000008 /* .o only - don't pad - obsolete (same as IMAGE_SCN_ALIGN_1BYTES) */</div><div class='add'>+#define IMAGE_SCN_TYPE_COPY	0x00000010 /* reserved */</div><div class='ctx'> #define IMAGE_SCN_CNT_CODE	0x00000020 /* .text */</div><div class='ctx'> #define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 /* .data */</div><div class='ctx'> #define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 /* .bss */</div><div class='del'>-#define IMAGE_SCN_LNK_OTHER	0x00000100 /* reserved */</div><div class='del'>-#define IMAGE_SCN_LNK_INFO	0x00000200 /* .drectve comments */</div><div class='del'>-#define IMAGE_SCN_RESERVED_4	0x00000400</div><div class='add'>+#define IMAGE_SCN_LNK_OTHER	0x00000100 /* .o only - other type than code, data or info */</div><div class='add'>+#define IMAGE_SCN_LNK_INFO	0x00000200 /* .o only - .drectve comments */</div><div class='add'>+#define IMAGE_SCN_LNK_OVERLAY	0x00000400 /* section contains overlay */</div><div class='ctx'> #define IMAGE_SCN_LNK_REMOVE	0x00000800 /* .o only - scn to be rm'd*/</div><div class='ctx'> #define IMAGE_SCN_LNK_COMDAT	0x00001000 /* .o only - COMDAT data */</div><div class='del'>-#define IMAGE_SCN_RESERVED_5	0x00002000 /* spec omits this */</div><div class='del'>-#define IMAGE_SCN_RESERVED_6	0x00004000 /* spec omits this */</div><div class='del'>-#define IMAGE_SCN_GPREL		0x00008000 /* global pointer referenced data */</div><div class='del'>-/* spec lists 0x20000 twice, I suspect they meant 0x10000 for one of them */</div><div class='del'>-#define IMAGE_SCN_MEM_PURGEABLE	0x00010000 /* reserved for "future" use */</div><div class='del'>-#define IMAGE_SCN_16BIT		0x00020000 /* reserved for "future" use */</div><div class='del'>-#define IMAGE_SCN_LOCKED	0x00040000 /* reserved for "future" use */</div><div class='del'>-#define IMAGE_SCN_PRELOAD	0x00080000 /* reserved for "future" use */</div><div class='add'>+#define IMAGE_SCN_RESERVED_13	0x00002000 /* spec omits this */</div><div class='add'>+#define IMAGE_SCN_MEM_PROTECTED	0x00004000 /* section is memory protected (for M68K) */</div><div class='add'>+#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 /* reset speculative exceptions handling bits in the TLB entries (for non-M68K) */</div><div class='add'>+#define IMAGE_SCN_MEM_FARDATA	0x00008000 /* section uses FAR_EXTERNAL relocations (for M68K) */</div><div class='add'>+#define IMAGE_SCN_GPREL		0x00008000 /* global pointer referenced data (for non-M68K) */</div><div class='add'>+#define IMAGE_SCN_MEM_SYSHEAP	0x00010000 /* use system heap (for M68K) */</div><div class='add'>+#define IMAGE_SCN_MEM_PURGEABLE	0x00020000 /* section can be released from RAM (for M68K) */</div><div class='add'>+#define IMAGE_SCN_MEM_16BIT	0x00020000 /* section is 16-bit (for non-M68K where it makes sense: I386, THUMB, MIPS16, MIPSFPU16, ...) */</div><div class='add'>+#define IMAGE_SCN_MEM_LOCKED	0x00040000 /* prevent the section from being moved (for M68K and .o I386) */</div><div class='add'>+#define IMAGE_SCN_MEM_PRELOAD	0x00080000 /* section is preload to RAM (for M68K and .o I386) */</div><div class='ctx'> /* and here they just stuck a 1-byte integer in the middle of a bitfield */</div><div class='del'>-#define IMAGE_SCN_ALIGN_1BYTES	0x00100000 /* it does what it says on the box */</div><div class='add'>+#define IMAGE_SCN_ALIGN_1BYTES	0x00100000 /* .o only - it does what it says on the box */</div><div class='ctx'> #define IMAGE_SCN_ALIGN_2BYTES	0x00200000</div><div class='ctx'> #define IMAGE_SCN_ALIGN_4BYTES	0x00300000</div><div class='ctx'> #define IMAGE_SCN_ALIGN_8BYTES	0x00400000</div><div class='hunk'>@@ -159,7 +206,9 @@</div><div class='ctx'> #define IMAGE_SCN_ALIGN_2048BYTES 0x00c00000</div><div class='ctx'> #define IMAGE_SCN_ALIGN_4096BYTES 0x00d00000</div><div class='ctx'> #define IMAGE_SCN_ALIGN_8192BYTES 0x00e00000</div><div class='del'>-#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 /* extended relocations */</div><div class='add'>+#define IMAGE_SCN_ALIGN_RESERVED 0x00f00000</div><div class='add'>+#define IMAGE_SCN_ALIGN_MASK	0x00f00000</div><div class='add'>+#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 /* .o only - extended relocations */</div><div class='ctx'> #define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 /* scn can be discarded */</div><div class='ctx'> #define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 /* cannot be cached */</div><div class='ctx'> #define IMAGE_SCN_MEM_NOT_PAGED	0x08000000 /* not pageable */</div><div class='hunk'>@@ -168,8 +217,28 @@</div><div class='ctx'> #define IMAGE_SCN_MEM_READ	0x40000000 /* readable */</div><div class='ctx'> #define IMAGE_SCN_MEM_WRITE	0x80000000 /* writeable */</div><div class='ctx'> </div><div class='del'>-#define IMAGE_DEBUG_TYPE_CODEVIEW	2</div><div class='del'>-#define IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS	20</div><div class='add'>+#define IMAGE_DEBUG_TYPE_UNKNOWN		 0 /* Unknown value, ignored by all tools */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_COFF			 1 /* COFF debugging information */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_CODEVIEW		 2 /* CodeView debugging information or Visual C++ Program Database debugging information */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_FPO			 3 /* Frame pointer omission (FPO) information */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_MISC			 4 /* Location of DBG file with CodeView debugging information */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_EXCEPTION		 5 /* Exception information, copy of .pdata section */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_FIXUP			 6 /* Fixup information */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_OMAP_TO_SRC		 7 /* The mapping from an RVA in image to an RVA in source image */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_OMAP_FROM_SRC		 8 /* The mapping from an RVA in source image to an RVA in image */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_BORLAND		 9 /* Borland debugging information */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_RESERVED10		10 /* Coldpath / Hotpatch debug information */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_CLSID			11 /* CLSID */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_VC_FEATURE		12 /* Visual C++ counts / statistics */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_POGO			13 /* COFF group information, data for profile-guided optimization */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_ILTCG			14 /* Incremental link-time code generation */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_MPX			15 /* Intel Memory Protection Extensions */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_REPRO			16 /* PE determinism or reproducibility */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_EMBEDDED_PORTABLE_PDB	17 /* Embedded Portable PDB debugging information */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_SPGO			18 /* Sample profile-guided optimization */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_PDBCHECKSUM		19 /* PDB Checksum */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS	20 /* Extended DLL characteristics bits */</div><div class='add'>+#define IMAGE_DEBUG_TYPE_PERFMAP		21 /* Location of associated Ready To Run PerfMap file */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='hunk'>@@ -235,7 +304,7 @@ struct pe32_opt_hdr {</div><div class='ctx'> 	uint16_t image_minor;	/* minor image version */</div><div class='ctx'> 	uint16_t subsys_major;	/* major subsystem version */</div><div class='ctx'> 	uint16_t subsys_minor;	/* minor subsystem version */</div><div class='del'>-	uint32_t win32_version;	/* reserved, must be 0 */</div><div class='add'>+	uint32_t win32_version;	/* win32 version reported at runtime */</div><div class='ctx'> 	uint32_t image_size;	/* image size */</div><div class='ctx'> 	uint32_t header_size;	/* header size rounded up to</div><div class='ctx'> 				   file_align */</div><div class='hunk'>@@ -246,7 +315,7 @@ struct pe32_opt_hdr {</div><div class='ctx'> 	uint32_t stack_size;	/* amt of stack required */</div><div class='ctx'> 	uint32_t heap_size_req;	/* amt of heap requested */</div><div class='ctx'> 	uint32_t heap_size;	/* amt of heap required */</div><div class='del'>-	uint32_t loader_flags;	/* reserved, must be 0 */</div><div class='add'>+	uint32_t loader_flags;	/* loader flags */</div><div class='ctx'> 	uint32_t data_dirs;	/* number of data dir entries */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +338,7 @@ struct pe32plus_opt_hdr {</div><div class='ctx'> 	uint16_t image_minor;	/* minor image version */</div><div class='ctx'> 	uint16_t subsys_major;	/* major subsystem version */</div><div class='ctx'> 	uint16_t subsys_minor;	/* minor subsystem version */</div><div class='del'>-	uint32_t win32_version;	/* reserved, must be 0 */</div><div class='add'>+	uint32_t win32_version;	/* win32 version reported at runtime */</div><div class='ctx'> 	uint32_t image_size;	/* image size */</div><div class='ctx'> 	uint32_t header_size;	/* header size rounded up to</div><div class='ctx'> 				   file_align */</div><div class='hunk'>@@ -280,7 +349,7 @@ struct pe32plus_opt_hdr {</div><div class='ctx'> 	uint64_t stack_size;	/* amt of stack required */</div><div class='ctx'> 	uint64_t heap_size_req;	/* amt of heap requested */</div><div class='ctx'> 	uint64_t heap_size;	/* amt of heap required */</div><div class='del'>-	uint32_t loader_flags;	/* reserved, must be 0 */</div><div class='add'>+	uint32_t loader_flags;	/* loader flags */</div><div class='ctx'> 	uint32_t data_dirs;	/* number of data dir entries */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -301,10 +370,10 @@ struct data_directory {</div><div class='ctx'> 	struct data_dirent global_ptr;		/* global pointer reg. Size=0 */</div><div class='ctx'> 	struct data_dirent tls;			/* .tls */</div><div class='ctx'> 	struct data_dirent load_config;		/* load configuration structure */</div><div class='del'>-	struct data_dirent bound_imports;	/* no idea */</div><div class='add'>+	struct data_dirent bound_imports;	/* bound import table */</div><div class='ctx'> 	struct data_dirent import_addrs;	/* import address table */</div><div class='ctx'> 	struct data_dirent delay_imports;	/* delay-load import table */</div><div class='del'>-	struct data_dirent clr_runtime_hdr;	/* .cor (object only) */</div><div class='add'>+	struct data_dirent clr_runtime_hdr;	/* .cor (clr/.net executables) */</div><div class='ctx'> 	struct data_dirent reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/peci-cpu.h b/include/linux/peci-cpu.h<br/>index ff8ae9c26c80..601cdd086bf6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/peci-cpu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/peci-cpu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/peci-cpu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/peci-cpu.h</a></div><div class='hunk'>@@ -6,6 +6,30 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Copied from x86 &lt;asm/processor.h&gt; */</div><div class='add'>+#define X86_VENDOR_INTEL       0</div><div class='add'>+</div><div class='add'>+/* Copied from x86 &lt;asm/cpu_device_id.h&gt; */</div><div class='add'>+#define VFM_MODEL_BIT	0</div><div class='add'>+#define VFM_FAMILY_BIT	8</div><div class='add'>+#define VFM_VENDOR_BIT	16</div><div class='add'>+#define VFM_RSVD_BIT	24</div><div class='add'>+</div><div class='add'>+#define	VFM_MODEL_MASK	GENMASK(VFM_FAMILY_BIT - 1, VFM_MODEL_BIT)</div><div class='add'>+#define	VFM_FAMILY_MASK	GENMASK(VFM_VENDOR_BIT - 1, VFM_FAMILY_BIT)</div><div class='add'>+#define	VFM_VENDOR_MASK	GENMASK(VFM_RSVD_BIT - 1, VFM_VENDOR_BIT)</div><div class='add'>+</div><div class='add'>+#define VFM_MODEL(vfm)	(((vfm) &amp; VFM_MODEL_MASK) &gt;&gt; VFM_MODEL_BIT)</div><div class='add'>+#define VFM_FAMILY(vfm)	(((vfm) &amp; VFM_FAMILY_MASK) &gt;&gt; VFM_FAMILY_BIT)</div><div class='add'>+#define VFM_VENDOR(vfm)	(((vfm) &amp; VFM_VENDOR_MASK) &gt;&gt; VFM_VENDOR_BIT)</div><div class='add'>+</div><div class='add'>+#define	VFM_MAKE(_vendor, _family, _model) (	\</div><div class='add'>+	((_model) &lt;&lt; VFM_MODEL_BIT) |		\</div><div class='add'>+	((_family) &lt;&lt; VFM_FAMILY_BIT) |		\</div><div class='add'>+	((_vendor) &lt;&lt; VFM_VENDOR_BIT)		\</div><div class='add'>+)</div><div class='add'>+/* End of copied code */</div><div class='add'>+</div><div class='ctx'> #include "../../arch/x86/include/asm/intel-family.h"</div><div class='ctx'> </div><div class='ctx'> #define PECI_PCS_PKG_ID			0  /* Package Identifier Read */</div><div class='head'>diff --git a/include/linux/peci.h b/include/linux/peci.h<br/>index 9b3d36aff431..3e0bc37591d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/peci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/peci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/peci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/peci.h</a></div><div class='hunk'>@@ -58,10 +58,8 @@ static inline struct peci_controller *to_peci_controller(void *d)</div><div class='ctx'> /**</div><div class='ctx'>  * struct peci_device - PECI device</div><div class='ctx'>  * @dev: device object to register PECI device to the device model</div><div class='del'>- * @controller: manages the bus segment hosting this PECI device</div><div class='ctx'>  * @info: PECI device characteristics</div><div class='del'>- * @info.family: device family</div><div class='del'>- * @info.model: device model</div><div class='add'>+ * @info.x86_vfm: device vendor-family-model</div><div class='ctx'>  * @info.peci_revision: PECI revision supported by the PECI device</div><div class='ctx'>  * @info.socket_id: the socket ID represented by the PECI device</div><div class='ctx'>  * @addr: address used on the PECI bus connected to the parent controller</div><div class='hunk'>@@ -74,8 +72,7 @@ static inline struct peci_controller *to_peci_controller(void *d)</div><div class='ctx'> struct peci_device {</div><div class='ctx'> 	struct device dev;</div><div class='ctx'> 	struct {</div><div class='del'>-		u16 family;</div><div class='del'>-		u8 model;</div><div class='add'>+		u32 x86_vfm;</div><div class='ctx'> 		u8 peci_revision;</div><div class='ctx'> 		u8 socket_id;</div><div class='ctx'> 	} info;</div><div class='head'>diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h<br/>index ec3573119923..43c854a273c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/percpu-defs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/percpu-defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/percpu-defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/percpu-defs.h</a></div><div class='hunk'>@@ -26,13 +26,11 @@</div><div class='ctx'> #define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned"</div><div class='ctx'> #define PER_CPU_ALIGNED_SECTION "..shared_aligned"</div><div class='ctx'> #endif</div><div class='del'>-#define PER_CPU_FIRST_SECTION "..first"</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define PER_CPU_SHARED_ALIGNED_SECTION ""</div><div class='ctx'> #define PER_CPU_ALIGNED_SECTION "..shared_aligned"</div><div class='del'>-#define PER_CPU_FIRST_SECTION ""</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -54,7 +52,7 @@</div><div class='ctx'> 	__section(".discard") __attribute__((unused))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * s390 and alpha modules require percpu variables to be defined as</div><div class='add'>+ * alpha modules require percpu variables to be defined as</div><div class='ctx'>  * weak to force the compiler to generate GOT based external</div><div class='ctx'>  * references for them.  This is necessary because percpu sections</div><div class='ctx'>  * will be located outside of the usually addressable area.</div><div class='hunk'>@@ -65,14 +63,15 @@</div><div class='ctx'>  * 1. The symbol must be globally unique, even the static ones.</div><div class='ctx'>  * 2. Static percpu variables cannot be defined inside a function.</div><div class='ctx'>  *</div><div class='del'>- * Archs which need weak percpu definitions should define</div><div class='del'>- * ARCH_NEEDS_WEAK_PER_CPU in asm/percpu.h when necessary.</div><div class='add'>+ * Archs which need weak percpu definitions should set</div><div class='add'>+ * CONFIG_ARCH_MODULE_NEEDS_WEAK_PER_CPU when necessary.</div><div class='ctx'>  *</div><div class='ctx'>  * To ensure that the generic code observes the above two</div><div class='ctx'>  * restrictions, if CONFIG_DEBUG_FORCE_WEAK_PER_CPU is set weak</div><div class='ctx'>  * definition is used for all cases.</div><div class='ctx'>  */</div><div class='del'>-#if defined(ARCH_NEEDS_WEAK_PER_CPU) || defined(CONFIG_DEBUG_FORCE_WEAK_PER_CPU)</div><div class='add'>+#if (defined(CONFIG_ARCH_MODULE_NEEDS_WEAK_PER_CPU) &amp;&amp; defined(MODULE)) || \</div><div class='add'>+	defined(CONFIG_DEBUG_FORCE_WEAK_PER_CPU)</div><div class='ctx'> /*</div><div class='ctx'>  * __pcpu_scope_* dummy variable is used to enforce scope.  It</div><div class='ctx'>  * receives the static modifier when it's used in front of</div><div class='hunk'>@@ -115,14 +114,17 @@</div><div class='ctx'> 	DEFINE_PER_CPU_SECTION(type, name, "")</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Declaration/definition used for per-CPU variables that must come first in</div><div class='del'>- * the set of variables.</div><div class='add'>+ * Declaration/definition used for per-CPU variables that are frequently</div><div class='add'>+ * accessed and should be in a single cacheline.</div><div class='add'>+ *</div><div class='add'>+ * For use only by architecture and core code.  Only use scalar or pointer</div><div class='add'>+ * types to maximize density.</div><div class='ctx'>  */</div><div class='del'>-#define DECLARE_PER_CPU_FIRST(type, name)				\</div><div class='del'>-	DECLARE_PER_CPU_SECTION(type, name, PER_CPU_FIRST_SECTION)</div><div class='add'>+#define DECLARE_PER_CPU_CACHE_HOT(type, name)				\</div><div class='add'>+	DECLARE_PER_CPU_SECTION(type, name, "..hot.." #name)</div><div class='ctx'> </div><div class='del'>-#define DEFINE_PER_CPU_FIRST(type, name)				\</div><div class='del'>-	DEFINE_PER_CPU_SECTION(type, name, PER_CPU_FIRST_SECTION)</div><div class='add'>+#define DEFINE_PER_CPU_CACHE_HOT(type, name)				\</div><div class='add'>+	DEFINE_PER_CPU_SECTION(type, name, "..hot.." #name)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Declaration/definition used for per-CPU variables that must be cacheline</div><div class='hunk'>@@ -220,15 +222,17 @@ do {									\</div><div class='ctx'> 	(void)__vpp_verify;						\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+#define PERCPU_PTR(__p)							\</div><div class='add'>+	(TYPEOF_UNQUAL(*(__p)) __force __kernel *)((__force unsigned long)(__p))</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Add an offset to a pointer but keep the pointer as-is.  Use RELOC_HIDE()</div><div class='del'>- * to prevent the compiler from making incorrect assumptions about the</div><div class='del'>- * pointer value.  The weird cast keeps both GCC and sparse happy.</div><div class='add'>+ * Add an offset to a pointer.  Use RELOC_HIDE() to prevent the compiler</div><div class='add'>+ * from making incorrect assumptions about the pointer value.</div><div class='ctx'>  */</div><div class='ctx'> #define SHIFT_PERCPU_PTR(__p, __offset)					\</div><div class='del'>-	RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset))</div><div class='add'>+	RELOC_HIDE(PERCPU_PTR(__p), (__offset))</div><div class='ctx'> </div><div class='ctx'> #define per_cpu_ptr(ptr, cpu)						\</div><div class='ctx'> ({									\</div><div class='hunk'>@@ -254,13 +258,13 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> #else	/* CONFIG_SMP */</div><div class='ctx'> </div><div class='del'>-#define VERIFY_PERCPU_PTR(__p)						\</div><div class='add'>+#define per_cpu_ptr(ptr, cpu)						\</div><div class='ctx'> ({									\</div><div class='del'>-	__verify_pcpu_ptr(__p);						\</div><div class='del'>-	(typeof(*(__p)) __kernel __force *)(__p);			\</div><div class='add'>+	(void)(cpu);							\</div><div class='add'>+	__verify_pcpu_ptr(ptr);						\</div><div class='add'>+	PERCPU_PTR(ptr);						\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#define per_cpu_ptr(ptr, cpu)	({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })</div><div class='ctx'> #define raw_cpu_ptr(ptr)	per_cpu_ptr(ptr, 0)</div><div class='ctx'> #define this_cpu_ptr(ptr)	raw_cpu_ptr(ptr)</div><div class='ctx'> </div><div class='hunk'>@@ -315,7 +319,7 @@ static __always_inline void __this_cpu_preempt_check(const char *op) { }</div><div class='ctx'> </div><div class='ctx'> #define __pcpu_size_call_return(stem, variable)				\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(variable) pscr_ret__;					\</div><div class='add'>+	TYPEOF_UNQUAL(variable) pscr_ret__;				\</div><div class='ctx'> 	__verify_pcpu_ptr(&amp;(variable));					\</div><div class='ctx'> 	switch(sizeof(variable)) {					\</div><div class='ctx'> 	case 1: pscr_ret__ = stem##1(variable); break;			\</div><div class='hunk'>@@ -330,7 +334,7 @@ static __always_inline void __this_cpu_preempt_check(const char *op) { }</div><div class='ctx'> </div><div class='ctx'> #define __pcpu_size_call_return2(stem, variable, ...)			\</div><div class='ctx'> ({									\</div><div class='del'>-	typeof(variable) pscr2_ret__;					\</div><div class='add'>+	TYPEOF_UNQUAL(variable) pscr2_ret__;				\</div><div class='ctx'> 	__verify_pcpu_ptr(&amp;(variable));					\</div><div class='ctx'> 	switch(sizeof(variable)) {					\</div><div class='ctx'> 	case 1: pscr2_ret__ = stem##1(variable, __VA_ARGS__); break;	\</div><div class='hunk'>@@ -372,7 +376,7 @@ do {									\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * this_cpu operations (C) 2008-2013 Christoph Lameter &lt;cl@linux.com&gt;</div><div class='add'>+ * this_cpu operations (C) 2008-2013 Christoph Lameter &lt;cl@gentwo.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Optimized manipulation for memory allocated through the per cpu</div><div class='ctx'>  * allocator or for addresses of per cpu variables.</div><div class='hunk'>@@ -475,6 +479,12 @@ do {									\</div><div class='ctx'> 	raw_cpu_cmpxchg(pcp, oval, nval);				\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+#define __this_cpu_try_cmpxchg(pcp, ovalp, nval)			\</div><div class='add'>+({									\</div><div class='add'>+	__this_cpu_preempt_check("try_cmpxchg");			\</div><div class='add'>+	raw_cpu_try_cmpxchg(pcp, ovalp, nval);				\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> #define __this_cpu_sub(pcp, val)	__this_cpu_add(pcp, -(typeof(pcp))(val))</div><div class='ctx'> #define __this_cpu_inc(pcp)		__this_cpu_add(pcp, 1)</div><div class='ctx'> #define __this_cpu_dec(pcp)		__this_cpu_sub(pcp, 1)</div><div class='head'>diff --git a/include/linux/percpu-rwsem.h b/include/linux/percpu-rwsem.h<br/>index 36b942b67b7d..288f5235649a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/percpu-rwsem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/percpu-rwsem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/percpu-rwsem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/percpu-rwsem.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/rcu_sync.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct percpu_rw_semaphore {</div><div class='ctx'> 	struct rcu_sync		rss;</div><div class='hunk'>@@ -42,9 +43,10 @@ is_static struct percpu_rw_semaphore name = {				\</div><div class='ctx'> #define DEFINE_STATIC_PERCPU_RWSEM(name)	\</div><div class='ctx'> 	__DEFINE_PERCPU_RWSEM(name, static)</div><div class='ctx'> </div><div class='del'>-extern bool __percpu_down_read(struct percpu_rw_semaphore *, bool);</div><div class='add'>+extern bool __percpu_down_read(struct percpu_rw_semaphore *, bool, bool);</div><div class='ctx'> </div><div class='del'>-static inline void percpu_down_read(struct percpu_rw_semaphore *sem)</div><div class='add'>+static inline void percpu_down_read_internal(struct percpu_rw_semaphore *sem,</div><div class='add'>+					     bool freezable)</div><div class='ctx'> {</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='hunk'>@@ -62,7 +64,7 @@ static inline void percpu_down_read(struct percpu_rw_semaphore *sem)</div><div class='ctx'> 	if (likely(rcu_sync_is_idle(&amp;sem-&gt;rss)))</div><div class='ctx'> 		this_cpu_inc(*sem-&gt;read_count);</div><div class='ctx'> 	else</div><div class='del'>-		__percpu_down_read(sem, false); /* Unconditional memory barrier */</div><div class='add'>+		__percpu_down_read(sem, false, freezable); /* Unconditional memory barrier */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The preempt_enable() prevents the compiler from</div><div class='ctx'> 	 * bleeding the critical section out.</div><div class='hunk'>@@ -70,6 +72,17 @@ static inline void percpu_down_read(struct percpu_rw_semaphore *sem)</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void percpu_down_read(struct percpu_rw_semaphore *sem)</div><div class='add'>+{</div><div class='add'>+	percpu_down_read_internal(sem, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void percpu_down_read_freezable(struct percpu_rw_semaphore *sem,</div><div class='add'>+					      bool freeze)</div><div class='add'>+{</div><div class='add'>+	percpu_down_read_internal(sem, freeze);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool percpu_down_read_trylock(struct percpu_rw_semaphore *sem)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret = true;</div><div class='hunk'>@@ -81,7 +94,7 @@ static inline bool percpu_down_read_trylock(struct percpu_rw_semaphore *sem)</div><div class='ctx'> 	if (likely(rcu_sync_is_idle(&amp;sem-&gt;rss)))</div><div class='ctx'> 		this_cpu_inc(*sem-&gt;read_count);</div><div class='ctx'> 	else</div><div class='del'>-		ret = __percpu_down_read(sem, true); /* Unconditional memory barrier */</div><div class='add'>+		ret = __percpu_down_read(sem, true, false); /* Unconditional memory barrier */</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The barrier() from preempt_enable() prevents the compiler from</div><div class='hunk'>@@ -125,6 +138,13 @@ extern bool percpu_is_read_locked(struct percpu_rw_semaphore *);</div><div class='ctx'> extern void percpu_down_write(struct percpu_rw_semaphore *);</div><div class='ctx'> extern void percpu_up_write(struct percpu_rw_semaphore *);</div><div class='ctx'> </div><div class='add'>+DEFINE_GUARD(percpu_read, struct percpu_rw_semaphore *,</div><div class='add'>+	     percpu_down_read(_T), percpu_up_read(_T))</div><div class='add'>+DEFINE_GUARD_COND(percpu_read, _try, percpu_down_read_trylock(_T))</div><div class='add'>+</div><div class='add'>+DEFINE_GUARD(percpu_write, struct percpu_rw_semaphore *,</div><div class='add'>+	     percpu_down_write(_T), percpu_up_write(_T))</div><div class='add'>+</div><div class='ctx'> static inline bool percpu_is_write_locked(struct percpu_rw_semaphore *sem)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic_read(&amp;sem-&gt;block);</div><div class='hunk'>@@ -145,7 +165,7 @@ extern void percpu_free_rwsem(struct percpu_rw_semaphore *);</div><div class='ctx'> #define percpu_rwsem_assert_held(sem)	lockdep_assert_held(sem)</div><div class='ctx'> </div><div class='ctx'> static inline void percpu_rwsem_release(struct percpu_rw_semaphore *sem,</div><div class='del'>-					bool read, unsigned long ip)</div><div class='add'>+					unsigned long ip)</div><div class='ctx'> {</div><div class='ctx'> 	lock_release(&amp;sem-&gt;dep_map, ip);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/percpu.h b/include/linux/percpu.h<br/>index 8c677f185901..85bf8dd9f087 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/percpu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/percpu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/percpu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/percpu.h</a></div><div class='hunk'>@@ -2,13 +2,14 @@</div><div class='ctx'> #ifndef __LINUX_PERCPU_H</div><div class='ctx'> #define __LINUX_PERCPU_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/alloc_tag.h&gt;</div><div class='ctx'> #include &lt;linux/mmdebug.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/pfn.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/percpu.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -36,7 +37,11 @@</div><div class='ctx'> 					 PCPU_MIN_ALLOC_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RANDOM_KMALLOC_CACHES</div><div class='del'>-#define PERCPU_DYNAMIC_SIZE_SHIFT      12</div><div class='add'>+# if defined(CONFIG_LOCKDEP) &amp;&amp; !defined(CONFIG_PAGE_SIZE_4KB)</div><div class='add'>+# define PERCPU_DYNAMIC_SIZE_SHIFT      13</div><div class='add'>+# else</div><div class='add'>+# define PERCPU_DYNAMIC_SIZE_SHIFT      12</div><div class='add'>+#endif /* LOCKDEP and PAGE_SIZE &gt; 4KiB */</div><div class='ctx'> #else</div><div class='ctx'> #define PERCPU_DYNAMIC_SIZE_SHIFT      10</div><div class='ctx'> #endif</div><div class='hunk'>@@ -121,7 +126,6 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,</div><div class='ctx'> 				pcpu_fc_cpu_to_node_fn_t cpu_to_nd_fn);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __alloc_size(1);</div><div class='ctx'> extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr);</div><div class='ctx'> extern bool is_kernel_percpu_address(unsigned long addr);</div><div class='ctx'> </div><div class='hunk'>@@ -129,14 +133,15 @@ extern bool is_kernel_percpu_address(unsigned long addr);</div><div class='ctx'> extern void __init setup_per_cpu_areas(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp) __alloc_size(1);</div><div class='del'>-extern void __percpu *__alloc_percpu(size_t size, size_t align) __alloc_size(1);</div><div class='del'>-extern void free_percpu(void __percpu *__pdata);</div><div class='del'>-extern size_t pcpu_alloc_size(void __percpu *__pdata);</div><div class='add'>+extern void __percpu *pcpu_alloc_noprof(size_t size, size_t align, bool reserved,</div><div class='add'>+				   gfp_t gfp) __alloc_size(1);</div><div class='ctx'> </div><div class='del'>-DEFINE_FREE(free_percpu, void __percpu *, free_percpu(_T))</div><div class='del'>-</div><div class='del'>-extern phys_addr_t per_cpu_ptr_to_phys(void *addr);</div><div class='add'>+#define __alloc_percpu_gfp(_size, _align, _gfp)				\</div><div class='add'>+	alloc_hooks(pcpu_alloc_noprof(_size, _align, false, _gfp))</div><div class='add'>+#define __alloc_percpu(_size, _align)					\</div><div class='add'>+	alloc_hooks(pcpu_alloc_noprof(_size, _align, false, GFP_KERNEL))</div><div class='add'>+#define __alloc_reserved_percpu(_size, _align)				\</div><div class='add'>+	alloc_hooks(pcpu_alloc_noprof(_size, _align, true, GFP_KERNEL))</div><div class='ctx'> </div><div class='ctx'> #define alloc_percpu_gfp(type, gfp)					\</div><div class='ctx'> 	(typeof(type) __percpu *)__alloc_percpu_gfp(sizeof(type),	\</div><div class='hunk'>@@ -144,6 +149,15 @@ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);</div><div class='ctx'> #define alloc_percpu(type)						\</div><div class='ctx'> 	(typeof(type) __percpu *)__alloc_percpu(sizeof(type),		\</div><div class='ctx'> 						__alignof__(type))</div><div class='add'>+#define alloc_percpu_noprof(type)					\</div><div class='add'>+	((typeof(type) __percpu *)pcpu_alloc_noprof(sizeof(type),	\</div><div class='add'>+					__alignof__(type), false, GFP_KERNEL))</div><div class='add'>+</div><div class='add'>+extern void free_percpu(void __percpu *__pdata);</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(free_percpu, void __percpu *, free_percpu(_T))</div><div class='add'>+</div><div class='add'>+extern phys_addr_t per_cpu_ptr_to_phys(void *addr);</div><div class='ctx'> </div><div class='ctx'> extern unsigned long pcpu_nr_pages(void);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h<br/>index b3b34f6670cf..52b37f7bdbf9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/perf/arm_pmu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/perf/arm_pmu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/perf/arm_pmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/perf/arm_pmu.h</a></div><div class='hunk'>@@ -17,10 +17,14 @@</div><div class='ctx'> #ifdef CONFIG_ARM_PMU</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The ARMv7 CPU PMU supports up to 32 event counters.</div><div class='add'>+ * The Armv7 and Armv8.8 or less CPU PMU supports up to 32 event counters.</div><div class='add'>+ * The Armv8.9/9.4 CPU PMU supports up to 33 event counters.</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_ARM</div><div class='ctx'> #define ARMPMU_MAX_HWEVENTS		32</div><div class='del'>-</div><div class='add'>+#else</div><div class='add'>+#define ARMPMU_MAX_HWEVENTS		33</div><div class='add'>+#endif</div><div class='ctx'> /*</div><div class='ctx'>  * ARM PMU hw_event flags</div><div class='ctx'>  */</div><div class='hunk'>@@ -66,6 +70,11 @@ struct pmu_hw_events {</div><div class='ctx'> 	struct arm_pmu		*percpu_pmu;</div><div class='ctx'> </div><div class='ctx'> 	int irq;</div><div class='add'>+</div><div class='add'>+	struct perf_branch_stack	*branch_stack;</div><div class='add'>+</div><div class='add'>+	/* Active events requesting branch records */</div><div class='add'>+	unsigned int		branch_users;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum armpmu_attr_groups {</div><div class='hunk'>@@ -80,7 +89,6 @@ struct arm_pmu {</div><div class='ctx'> 	struct pmu	pmu;</div><div class='ctx'> 	cpumask_t	supported_cpus;</div><div class='ctx'> 	char		*name;</div><div class='del'>-	int		pmuver;</div><div class='ctx'> 	irqreturn_t	(*handle_irq)(struct arm_pmu *pmu);</div><div class='ctx'> 	void		(*enable)(struct perf_event *event);</div><div class='ctx'> 	void		(*disable)(struct perf_event *event);</div><div class='hunk'>@@ -96,20 +104,28 @@ struct arm_pmu {</div><div class='ctx'> 	void		(*stop)(struct arm_pmu *);</div><div class='ctx'> 	void		(*reset)(void *);</div><div class='ctx'> 	int		(*map_event)(struct perf_event *event);</div><div class='del'>-	int		num_events;</div><div class='add'>+	/*</div><div class='add'>+	 * Called by KVM to map the PMUv3 event space onto non-PMUv3 hardware.</div><div class='add'>+	 */</div><div class='add'>+	int		(*map_pmuv3_event)(unsigned int eventsel);</div><div class='add'>+	DECLARE_BITMAP(cntr_mask, ARMPMU_MAX_HWEVENTS);</div><div class='ctx'> 	bool		secure_access; /* 32-bit ARM only */</div><div class='del'>-#define ARMV8_PMUV3_MAX_COMMON_EVENTS		0x40</div><div class='del'>-	DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);</div><div class='del'>-#define ARMV8_PMUV3_EXT_COMMON_EVENT_BASE	0x4000</div><div class='del'>-	DECLARE_BITMAP(pmceid_ext_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);</div><div class='ctx'> 	struct platform_device	*plat_device;</div><div class='ctx'> 	struct pmu_hw_events	__percpu *hw_events;</div><div class='ctx'> 	struct hlist_node	node;</div><div class='ctx'> 	struct notifier_block	cpu_pm_nb;</div><div class='ctx'> 	/* the attr_groups array must be NULL-terminated */</div><div class='ctx'> 	const struct attribute_group *attr_groups[ARMPMU_NR_ATTR_GROUPS + 1];</div><div class='del'>-	/* store the PMMIR_EL1 to expose slots */</div><div class='add'>+</div><div class='add'>+	/* PMUv3 only */</div><div class='add'>+	int		pmuver;</div><div class='add'>+	bool		has_smt;</div><div class='ctx'> 	u64		reg_pmmir;</div><div class='add'>+	u64		reg_brbidr;</div><div class='add'>+#define ARMV8_PMUV3_MAX_COMMON_EVENTS		0x40</div><div class='add'>+	DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);</div><div class='add'>+#define ARMV8_PMUV3_EXT_COMMON_EVENT_BASE	0x4000</div><div class='add'>+	DECLARE_BITMAP(pmceid_ext_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);</div><div class='ctx'> </div><div class='ctx'> 	/* Only to be used by ACPI probing code */</div><div class='ctx'> 	unsigned long acpi_cpuid;</div><div class='hunk'>@@ -173,8 +189,8 @@ bool arm_pmu_irq_is_nmi(void);</div><div class='ctx'> struct arm_pmu *armpmu_alloc(void);</div><div class='ctx'> void armpmu_free(struct arm_pmu *pmu);</div><div class='ctx'> int armpmu_register(struct arm_pmu *pmu);</div><div class='del'>-int armpmu_request_irq(int irq, int cpu);</div><div class='del'>-void armpmu_free_irq(int irq, int cpu);</div><div class='add'>+int armpmu_request_irq(struct arm_pmu * __percpu *armpmu, int irq, int cpu);</div><div class='add'>+void armpmu_free_irq(struct arm_pmu * __percpu *armpmu, int irq, int cpu);</div><div class='ctx'> </div><div class='ctx'> #define ARMV8_PMU_PDEV_NAME "armv8-pmu"</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/perf/arm_pmuv3.h b/include/linux/perf/arm_pmuv3.h<br/>index 46377e134d67..d698efba28a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/perf/arm_pmuv3.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/perf/arm_pmuv3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/perf/arm_pmuv3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/perf/arm_pmuv3.h</a></div><div class='hunk'>@@ -6,8 +6,9 @@</div><div class='ctx'> #ifndef __PERF_ARM_PMUV3_H</div><div class='ctx'> #define __PERF_ARM_PMUV3_H</div><div class='ctx'> </div><div class='del'>-#define ARMV8_PMU_MAX_COUNTERS	32</div><div class='del'>-#define ARMV8_PMU_COUNTER_MASK	(ARMV8_PMU_MAX_COUNTERS - 1)</div><div class='add'>+#define ARMV8_PMU_MAX_GENERAL_COUNTERS	31</div><div class='add'>+#define ARMV8_PMU_CYCLE_IDX		31</div><div class='add'>+#define ARMV8_PMU_INSTR_IDX		32 /* Not accessible from AArch32 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Common architectural and microarchitectural event numbers.</div><div class='hunk'>@@ -227,8 +228,10 @@</div><div class='ctx'>  */</div><div class='ctx'> #define ARMV8_PMU_OVSR_P		GENMASK(30, 0)</div><div class='ctx'> #define ARMV8_PMU_OVSR_C		BIT(31)</div><div class='add'>+#define ARMV8_PMU_OVSR_F		BIT_ULL(32) /* arm64 only */</div><div class='ctx'> /* Mask for writable bits is both P and C fields */</div><div class='del'>-#define ARMV8_PMU_OVERFLOWED_MASK	(ARMV8_PMU_OVSR_P | ARMV8_PMU_OVSR_C)</div><div class='add'>+#define ARMV8_PMU_OVERFLOWED_MASK	(ARMV8_PMU_OVSR_P | ARMV8_PMU_OVSR_C | \</div><div class='add'>+					ARMV8_PMU_OVSR_F)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * PMXEVTYPER: Event selection reg</div><div class='hunk'>@@ -254,6 +257,7 @@</div><div class='ctx'> #define ARMV8_PMU_USERENR_SW	(1 &lt;&lt; 1) /* PMSWINC can be written at EL0 */</div><div class='ctx'> #define ARMV8_PMU_USERENR_CR	(1 &lt;&lt; 2) /* Cycle counter can be read at EL0 */</div><div class='ctx'> #define ARMV8_PMU_USERENR_ER	(1 &lt;&lt; 3) /* Event counter can be read at EL0 */</div><div class='add'>+#define ARMV8_PMU_USERENR_UEN	(1 &lt;&lt; 4) /* Fine grained per counter access at EL0 */</div><div class='ctx'> /* Mask for writable bits */</div><div class='ctx'> #define ARMV8_PMU_USERENR_MASK	(ARMV8_PMU_USERENR_EN | ARMV8_PMU_USERENR_SW | \</div><div class='ctx'> 				 ARMV8_PMU_USERENR_CR | ARMV8_PMU_USERENR_ER)</div><div class='hunk'>@@ -309,4 +313,6 @@</div><div class='ctx'> 		}						\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/arm_pmuv3.h&gt;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/perf/riscv_pmu.h b/include/linux/perf/riscv_pmu.h<br/>index 43282e22ebe1..f82a28040594 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/perf/riscv_pmu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/perf/riscv_pmu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/perf/riscv_pmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/perf/riscv_pmu.h</a></div><div class='hunk'>@@ -39,6 +39,14 @@ struct cpu_hw_events {</div><div class='ctx'> 	DECLARE_BITMAP(used_hw_ctrs, RISCV_MAX_COUNTERS);</div><div class='ctx'> 	/* currently enabled firmware counters */</div><div class='ctx'> 	DECLARE_BITMAP(used_fw_ctrs, RISCV_MAX_COUNTERS);</div><div class='add'>+	/* The virtual address of the shared memory where counter snapshot will be taken */</div><div class='add'>+	void *snapshot_addr;</div><div class='add'>+	/* The physical address of the shared memory where counter snapshot will be taken */</div><div class='add'>+	phys_addr_t snapshot_addr_phys;</div><div class='add'>+	/* Boolean flag to indicate setup is already done */</div><div class='add'>+	bool snapshot_set_done;</div><div class='add'>+	/* A shadow copy of the counter values to avoid clobbering during multiple SBI calls */</div><div class='add'>+	u64 snapshot_cval_shcopy[RISCV_MAX_COUNTERS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct riscv_pmu {</div><div class='hunk'>@@ -81,6 +89,7 @@ static inline void riscv_pmu_legacy_skip_init(void) {};</div><div class='ctx'> struct riscv_pmu *riscv_pmu_alloc(void);</div><div class='ctx'> #ifdef CONFIG_RISCV_PMU_SBI</div><div class='ctx'> int riscv_pmu_get_hpm_info(u32 *hw_ctr_width, u32 *num_hw_ctr);</div><div class='add'>+int riscv_pmu_get_event_info(u32 type, u64 config, u64 *econfig);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_RISCV_PMU */</div><div class='head'>diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h<br/>index d2a15c0c6f8a..9870d768db4c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/perf_event.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/perf_event.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/perf_event.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/perf_event.h</a></div><div class='hunk'>@@ -26,18 +26,9 @@</div><div class='ctx'> # include &lt;asm/local64.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define PERF_GUEST_ACTIVE	0x01</div><div class='del'>-#define PERF_GUEST_USER	0x02</div><div class='del'>-</div><div class='del'>-struct perf_guest_info_callbacks {</div><div class='del'>-	unsigned int			(*state)(void);</div><div class='del'>-	unsigned long			(*get_ip)(void);</div><div class='del'>-	unsigned int			(*handle_intel_pt_intr)(void);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HAVE_HW_BREAKPOINT</div><div class='del'>-#include &lt;linux/rhashtable-types.h&gt;</div><div class='del'>-#include &lt;asm/hw_breakpoint.h&gt;</div><div class='add'>+# include &lt;linux/rhashtable-types.h&gt;</div><div class='add'>+# include &lt;asm/hw_breakpoint.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -62,19 +53,20 @@ struct perf_guest_info_callbacks {</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/static_call.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/local.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct perf_callchain_entry {</div><div class='del'>-	__u64				nr;</div><div class='del'>-	__u64				ip[]; /* /proc/sys/kernel/perf_event_max_stack */</div><div class='add'>+	u64				nr;</div><div class='add'>+	u64				ip[]; /* /proc/sys/kernel/perf_event_max_stack */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct perf_callchain_entry_ctx {</div><div class='del'>-	struct perf_callchain_entry *entry;</div><div class='del'>-	u32			    max_stack;</div><div class='del'>-	u32			    nr;</div><div class='del'>-	short			    contexts;</div><div class='del'>-	bool			    contexts_maxed;</div><div class='add'>+	struct perf_callchain_entry	*entry;</div><div class='add'>+	u32				max_stack;</div><div class='add'>+	u32				nr;</div><div class='add'>+	short				contexts;</div><div class='add'>+	bool				contexts_maxed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef unsigned long (*perf_copy_f)(void *dst, const void *src,</div><div class='hunk'>@@ -121,8 +113,8 @@ static __always_inline bool perf_raw_frag_last(const struct perf_raw_frag *frag)</div><div class='ctx'>  * already stored in age order, the hw_idx should be 0.</div><div class='ctx'>  */</div><div class='ctx'> struct perf_branch_stack {</div><div class='del'>-	__u64				nr;</div><div class='del'>-	__u64				hw_idx;</div><div class='add'>+	u64				nr;</div><div class='add'>+	u64				hw_idx;</div><div class='ctx'> 	struct perf_branch_entry	entries[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -132,10 +124,10 @@ struct task_struct;</div><div class='ctx'>  * extra PMU register associated with an event</div><div class='ctx'>  */</div><div class='ctx'> struct hw_perf_event_extra {</div><div class='del'>-	u64		config;	/* register value */</div><div class='del'>-	unsigned int	reg;	/* register address or index */</div><div class='del'>-	int		alloc;	/* extra register already allocated */</div><div class='del'>-	int		idx;	/* index in shared_regs-&gt;regs[] */</div><div class='add'>+	u64				config;	/* register value */</div><div class='add'>+	unsigned int			reg;	/* register address or index */</div><div class='add'>+	int				alloc;	/* extra register already allocated */</div><div class='add'>+	int				idx;	/* index in shared_regs-&gt;regs[] */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -144,8 +136,8 @@ struct hw_perf_event_extra {</div><div class='ctx'>  * PERF_EVENT_FLAG_ARCH bits are reserved for architecture-specific</div><div class='ctx'>  * usage.</div><div class='ctx'>  */</div><div class='del'>-#define PERF_EVENT_FLAG_ARCH			0x000fffff</div><div class='del'>-#define PERF_EVENT_FLAG_USER_READ_CNT		0x80000000</div><div class='add'>+#define PERF_EVENT_FLAG_ARCH		0x0fffffff</div><div class='add'>+#define PERF_EVENT_FLAG_USER_READ_CNT	0x80000000</div><div class='ctx'> </div><div class='ctx'> static_assert((PERF_EVENT_FLAG_USER_READ_CNT &amp; PERF_EVENT_FLAG_ARCH) == 0);</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +149,9 @@ struct hw_perf_event {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct { /* hardware */</div><div class='ctx'> 			u64		config;</div><div class='add'>+			u64		config1;</div><div class='ctx'> 			u64		last_tag;</div><div class='add'>+			u64		dyn_constraint;</div><div class='ctx'> 			unsigned long	config_base;</div><div class='ctx'> 			unsigned long	event_base;</div><div class='ctx'> 			int		event_base_rdpmc;</div><div class='hunk'>@@ -168,6 +162,15 @@ struct hw_perf_event {</div><div class='ctx'> 			struct hw_perf_event_extra extra_reg;</div><div class='ctx'> 			struct hw_perf_event_extra branch_reg;</div><div class='ctx'> 		};</div><div class='add'>+		struct { /* aux / Intel-PT */</div><div class='add'>+			u64		aux_config;</div><div class='add'>+			/*</div><div class='add'>+			 * For AUX area events, aux_paused cannot be a state</div><div class='add'>+			 * flag because it can be updated asynchronously to</div><div class='add'>+			 * state.</div><div class='add'>+			 */</div><div class='add'>+			unsigned int	aux_paused;</div><div class='add'>+		};</div><div class='ctx'> 		struct { /* software */</div><div class='ctx'> 			struct hrtimer	hrtimer;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -216,9 +219,14 @@ struct hw_perf_event {</div><div class='ctx'> /*</div><div class='ctx'>  * hw_perf_event::state flags; used to track the PERF_EF_* state.</div><div class='ctx'>  */</div><div class='del'>-#define PERF_HES_STOPPED	0x01 /* the counter is stopped */</div><div class='del'>-#define PERF_HES_UPTODATE	0x02 /* event-&gt;count up-to-date */</div><div class='del'>-#define PERF_HES_ARCH		0x04</div><div class='add'>+</div><div class='add'>+/* the counter is stopped */</div><div class='add'>+#define PERF_HES_STOPPED		0x01</div><div class='add'>+</div><div class='add'>+/* event-&gt;count up-to-date */</div><div class='add'>+#define PERF_HES_UPTODATE		0x02</div><div class='add'>+</div><div class='add'>+#define PERF_HES_ARCH			0x04</div><div class='ctx'> </div><div class='ctx'> 	int				state;</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +275,7 @@ struct hw_perf_event {</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64				freq_time_stamp;</div><div class='ctx'> 	u64				freq_count_stamp;</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_PERF_EVENTS */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct perf_event;</div><div class='hunk'>@@ -276,21 +284,40 @@ struct perf_event_pmu_context;</div><div class='ctx'> /*</div><div class='ctx'>  * Common implementation detail of pmu::{start,commit,cancel}_txn</div><div class='ctx'>  */</div><div class='del'>-#define PERF_PMU_TXN_ADD  0x1		/* txn to add/schedule event on PMU */</div><div class='del'>-#define PERF_PMU_TXN_READ 0x2		/* txn to read event group from PMU */</div><div class='add'>+</div><div class='add'>+/* txn to add/schedule event on PMU */</div><div class='add'>+#define PERF_PMU_TXN_ADD		0x1</div><div class='add'>+</div><div class='add'>+/* txn to read event group from PMU */</div><div class='add'>+#define PERF_PMU_TXN_READ		0x2</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pmu::capabilities flags</div><div class='ctx'>  */</div><div class='del'>-#define PERF_PMU_CAP_NO_INTERRUPT		0x0001</div><div class='del'>-#define PERF_PMU_CAP_NO_NMI			0x0002</div><div class='del'>-#define PERF_PMU_CAP_AUX_NO_SG			0x0004</div><div class='del'>-#define PERF_PMU_CAP_EXTENDED_REGS		0x0008</div><div class='del'>-#define PERF_PMU_CAP_EXCLUSIVE			0x0010</div><div class='del'>-#define PERF_PMU_CAP_ITRACE			0x0020</div><div class='del'>-#define PERF_PMU_CAP_NO_EXCLUDE			0x0040</div><div class='del'>-#define PERF_PMU_CAP_AUX_OUTPUT			0x0080</div><div class='del'>-#define PERF_PMU_CAP_EXTENDED_HW_TYPE		0x0100</div><div class='add'>+#define PERF_PMU_CAP_NO_INTERRUPT	0x0001</div><div class='add'>+#define PERF_PMU_CAP_NO_NMI		0x0002</div><div class='add'>+#define PERF_PMU_CAP_AUX_NO_SG		0x0004</div><div class='add'>+#define PERF_PMU_CAP_EXTENDED_REGS	0x0008</div><div class='add'>+#define PERF_PMU_CAP_EXCLUSIVE		0x0010</div><div class='add'>+#define PERF_PMU_CAP_ITRACE		0x0020</div><div class='add'>+#define PERF_PMU_CAP_NO_EXCLUDE		0x0040</div><div class='add'>+#define PERF_PMU_CAP_AUX_OUTPUT		0x0080</div><div class='add'>+#define PERF_PMU_CAP_EXTENDED_HW_TYPE	0x0100</div><div class='add'>+#define PERF_PMU_CAP_AUX_PAUSE		0x0200</div><div class='add'>+#define PERF_PMU_CAP_AUX_PREFER_LARGE	0x0400</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pmu::scope</div><div class='add'>+ */</div><div class='add'>+enum perf_pmu_scope {</div><div class='add'>+	PERF_PMU_SCOPE_NONE = 0,</div><div class='add'>+	PERF_PMU_SCOPE_CORE,</div><div class='add'>+	PERF_PMU_SCOPE_DIE,</div><div class='add'>+	PERF_PMU_SCOPE_CLUSTER,</div><div class='add'>+	PERF_PMU_SCOPE_PKG,</div><div class='add'>+	PERF_PMU_SCOPE_SYS_WIDE,</div><div class='add'>+	PERF_PMU_MAX_SCOPE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct perf_output_handle;</div><div class='ctx'> </div><div class='hunk'>@@ -302,6 +329,9 @@ struct perf_output_handle;</div><div class='ctx'> struct pmu {</div><div class='ctx'> 	struct list_head		entry;</div><div class='ctx'> </div><div class='add'>+	spinlock_t			events_lock;</div><div class='add'>+	struct list_head		events;</div><div class='add'>+</div><div class='ctx'> 	struct module			*module;</div><div class='ctx'> 	struct device			*dev;</div><div class='ctx'> 	struct device			*parent;</div><div class='hunk'>@@ -315,8 +345,12 @@ struct pmu {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int				capabilities;</div><div class='ctx'> </div><div class='del'>-	int __percpu			*pmu_disable_count;</div><div class='del'>-	struct perf_cpu_pmu_context __percpu *cpu_pmu_context;</div><div class='add'>+	/*</div><div class='add'>+	 * PMU scope</div><div class='add'>+	 */</div><div class='add'>+	unsigned int			scope;</div><div class='add'>+</div><div class='add'>+	struct perf_cpu_pmu_context * __percpu *cpu_pmu_context;</div><div class='ctx'> 	atomic_t			exclusive_cnt; /* &lt; 0: cpu; &gt; 0: tsk */</div><div class='ctx'> 	int				task_ctx_nr;</div><div class='ctx'> 	int				hrtimer_interval_ms;</div><div class='hunk'>@@ -360,9 +394,21 @@ struct pmu {</div><div class='ctx'> 	 * Flags for -&gt;add()/-&gt;del()/ -&gt;start()/-&gt;stop(). There are</div><div class='ctx'> 	 * matching hw_perf_event::state flags.</div><div class='ctx'> 	 */</div><div class='del'>-#define PERF_EF_START	0x01		/* start the counter when adding    */</div><div class='del'>-#define PERF_EF_RELOAD	0x02		/* reload the counter when starting */</div><div class='del'>-#define PERF_EF_UPDATE	0x04		/* update the counter when stopping */</div><div class='add'>+</div><div class='add'>+/* start the counter when adding    */</div><div class='add'>+#define PERF_EF_START			0x01</div><div class='add'>+</div><div class='add'>+/* reload the counter when starting */</div><div class='add'>+#define PERF_EF_RELOAD			0x02</div><div class='add'>+</div><div class='add'>+/* update the counter when stopping */</div><div class='add'>+#define PERF_EF_UPDATE			0x04</div><div class='add'>+</div><div class='add'>+/* AUX area event, pause tracing */</div><div class='add'>+#define PERF_EF_PAUSE			0x08</div><div class='add'>+</div><div class='add'>+/* AUX area event, resume tracing */</div><div class='add'>+#define PERF_EF_RESUME			0x10</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Adds/Removes a counter to/from the PMU, can be done inside a</div><div class='hunk'>@@ -402,6 +448,18 @@ struct pmu {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * -&gt;start() with PERF_EF_RELOAD will reprogram the counter</div><div class='ctx'> 	 *  value, must be preceded by a -&gt;stop() with PERF_EF_UPDATE.</div><div class='add'>+	 *</div><div class='add'>+	 * -&gt;stop() with PERF_EF_PAUSE will stop as simply as possible. Will not</div><div class='add'>+	 * overlap another -&gt;stop() with PERF_EF_PAUSE nor -&gt;start() with</div><div class='add'>+	 * PERF_EF_RESUME.</div><div class='add'>+	 *</div><div class='add'>+	 * -&gt;start() with PERF_EF_RESUME will start as simply as possible but</div><div class='add'>+	 * only if the counter is not otherwise stopped. Will not overlap</div><div class='add'>+	 * another -&gt;start() with PERF_EF_RESUME nor -&gt;stop() with</div><div class='add'>+	 * PERF_EF_PAUSE.</div><div class='add'>+	 *</div><div class='add'>+	 * Notably, PERF_EF_PAUSE/PERF_EF_RESUME *can* be concurrent with other</div><div class='add'>+	 * -&gt;stop()/-&gt;start() invocations, just not itself.</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*start)			(struct perf_event *event, int flags);</div><div class='ctx'> 	void (*stop)			(struct perf_event *event, int flags);</div><div class='hunk'>@@ -453,7 +511,7 @@ struct pmu {</div><div class='ctx'> 	 * context-switches callback</div><div class='ctx'> 	 */</div><div class='ctx'> 	void (*sched_task)		(struct perf_event_pmu_context *pmu_ctx,</div><div class='del'>-					bool sched_in);</div><div class='add'>+					 struct task_struct *task, bool sched_in);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Kmem cache of PMU specific data</div><div class='hunk'>@@ -461,16 +519,6 @@ struct pmu {</div><div class='ctx'> 	struct kmem_cache		*task_ctx_cache;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * PMU specific parts of task perf event context (i.e. ctx-&gt;task_ctx_data)</div><div class='del'>-	 * can be synchronized using this function. See Intel LBR callstack support</div><div class='del'>-	 * implementation and Perf core context switch handling callbacks for usage</div><div class='del'>-	 * examples.</div><div class='del'>-	 */</div><div class='del'>-	void (*swap_task_ctx)		(struct perf_event_pmu_context *prev_epc,</div><div class='del'>-					 struct perf_event_pmu_context *next_epc);</div><div class='del'>-					/* optional */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Set up pmu-private data structures for an AUX area</div><div class='ctx'> 	 */</div><div class='ctx'> 	void *(*setup_aux)		(struct perf_event *event, void **pages,</div><div class='hunk'>@@ -559,10 +607,10 @@ enum perf_addr_filter_action_t {</div><div class='ctx'>  * This is a hardware-agnostic filter configuration as specified by the user.</div><div class='ctx'>  */</div><div class='ctx'> struct perf_addr_filter {</div><div class='del'>-	struct list_head	entry;</div><div class='del'>-	struct path		path;</div><div class='del'>-	unsigned long		offset;</div><div class='del'>-	unsigned long		size;</div><div class='add'>+	struct list_head		entry;</div><div class='add'>+	struct path			path;</div><div class='add'>+	unsigned long			offset;</div><div class='add'>+	unsigned long			size;</div><div class='ctx'> 	enum perf_addr_filter_action_t	action;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -577,23 +625,62 @@ struct perf_addr_filter {</div><div class='ctx'>  * bundled together; see perf_event_addr_filters().</div><div class='ctx'>  */</div><div class='ctx'> struct perf_addr_filters_head {</div><div class='del'>-	struct list_head	list;</div><div class='del'>-	raw_spinlock_t		lock;</div><div class='del'>-	unsigned int		nr_file_filters;</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	raw_spinlock_t			lock;</div><div class='add'>+	unsigned int			nr_file_filters;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct perf_addr_filter_range {</div><div class='del'>-	unsigned long		start;</div><div class='del'>-	unsigned long		size;</div><div class='add'>+	unsigned long			start;</div><div class='add'>+	unsigned long			size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * enum perf_event_state - the states of an event:</div><div class='add'>+/*</div><div class='add'>+ * The normal states are:</div><div class='add'>+ *</div><div class='add'>+ *            ACTIVE    --.</div><div class='add'>+ *               ^        |</div><div class='add'>+ *               |        |</div><div class='add'>+ *       sched_{in,out}() |</div><div class='add'>+ *               |        |</div><div class='add'>+ *               v        |</div><div class='add'>+ *      ,---&gt; INACTIVE  --+ &lt;-.</div><div class='add'>+ *      |                 |   |</div><div class='add'>+ *      |                {dis,en}able()</div><div class='add'>+ *   sched_in()           |   |</div><div class='add'>+ *      |       OFF    &lt;--' --+</div><div class='add'>+ *      |                     |</div><div class='add'>+ *      `---&gt;  ERROR    ------'</div><div class='add'>+ *</div><div class='add'>+ * That is:</div><div class='add'>+ *</div><div class='add'>+ * sched_in:       INACTIVE          -&gt; {ACTIVE,ERROR}</div><div class='add'>+ * sched_out:      ACTIVE            -&gt; INACTIVE</div><div class='add'>+ * disable:        {ACTIVE,INACTIVE} -&gt; OFF</div><div class='add'>+ * enable:         {OFF,ERROR}       -&gt; INACTIVE</div><div class='add'>+ *</div><div class='add'>+ * Where {OFF,ERROR} are disabled states.</div><div class='add'>+ *</div><div class='add'>+ * Then we have the {EXIT,REVOKED,DEAD} states which are various shades of</div><div class='add'>+ * defunct events:</div><div class='add'>+ *</div><div class='add'>+ *  - EXIT means task that the even was assigned to died, but child events</div><div class='add'>+ *    still live, and further children can still be created. But the event</div><div class='add'>+ *    itself will never be active again. It can only transition to</div><div class='add'>+ *    {REVOKED,DEAD};</div><div class='add'>+ *</div><div class='add'>+ *  - REVOKED means the PMU the event was associated with is gone; all</div><div class='add'>+ *    functionality is stopped but the event is still alive. Can only</div><div class='add'>+ *    transition to DEAD;</div><div class='add'>+ *</div><div class='add'>+ *  - DEAD event really is DYING tearing down state and freeing bits.</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> enum perf_event_state {</div><div class='del'>-	PERF_EVENT_STATE_DEAD		= -4,</div><div class='del'>-	PERF_EVENT_STATE_EXIT		= -3,</div><div class='del'>-	PERF_EVENT_STATE_ERROR		= -2,</div><div class='add'>+	PERF_EVENT_STATE_DEAD		= -5,</div><div class='add'>+	PERF_EVENT_STATE_REVOKED	= -4, /* pmu gone, must not touch */</div><div class='add'>+	PERF_EVENT_STATE_EXIT		= -3, /* task died, still inherit */</div><div class='add'>+	PERF_EVENT_STATE_ERROR		= -2, /* scheduling error, can enable */</div><div class='ctx'> 	PERF_EVENT_STATE_OFF		= -1,</div><div class='ctx'> 	PERF_EVENT_STATE_INACTIVE	=  0,</div><div class='ctx'> 	PERF_EVENT_STATE_ACTIVE		=  1,</div><div class='hunk'>@@ -615,10 +702,13 @@ typedef void (*perf_overflow_handler_t)(struct perf_event *,</div><div class='ctx'>  * PERF_EV_CAP_SIBLING: An event with this flag must be a group sibling and</div><div class='ctx'>  * cannot be a group leader. If an event with this flag is detached from the</div><div class='ctx'>  * group it is scheduled out and moved into an unrecoverable ERROR state.</div><div class='add'>+ * PERF_EV_CAP_READ_SCOPE: A CPU event that can be read from any CPU of the</div><div class='add'>+ * PMU scope where it is active.</div><div class='ctx'>  */</div><div class='ctx'> #define PERF_EV_CAP_SOFTWARE		BIT(0)</div><div class='ctx'> #define PERF_EV_CAP_READ_ACTIVE_PKG	BIT(1)</div><div class='ctx'> #define PERF_EV_CAP_SIBLING		BIT(2)</div><div class='add'>+#define PERF_EV_CAP_READ_SCOPE		BIT(3)</div><div class='ctx'> </div><div class='ctx'> #define SWEVENT_HLIST_BITS		8</div><div class='ctx'> #define SWEVENT_HLIST_SIZE		(1 &lt;&lt; SWEVENT_HLIST_BITS)</div><div class='hunk'>@@ -628,21 +718,24 @@ struct swevent_hlist {</div><div class='ctx'> 	struct rcu_head			rcu_head;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define PERF_ATTACH_CONTEXT	0x01</div><div class='del'>-#define PERF_ATTACH_GROUP	0x02</div><div class='del'>-#define PERF_ATTACH_TASK	0x04</div><div class='del'>-#define PERF_ATTACH_TASK_DATA	0x08</div><div class='del'>-#define PERF_ATTACH_ITRACE	0x10</div><div class='del'>-#define PERF_ATTACH_SCHED_CB	0x20</div><div class='del'>-#define PERF_ATTACH_CHILD	0x40</div><div class='add'>+#define PERF_ATTACH_CONTEXT		0x0001</div><div class='add'>+#define PERF_ATTACH_GROUP		0x0002</div><div class='add'>+#define PERF_ATTACH_TASK		0x0004</div><div class='add'>+#define PERF_ATTACH_TASK_DATA		0x0008</div><div class='add'>+#define PERF_ATTACH_GLOBAL_DATA		0x0010</div><div class='add'>+#define PERF_ATTACH_SCHED_CB		0x0020</div><div class='add'>+#define PERF_ATTACH_CHILD		0x0040</div><div class='add'>+#define PERF_ATTACH_EXCLUSIVE		0x0080</div><div class='add'>+#define PERF_ATTACH_CALLCHAIN		0x0100</div><div class='add'>+#define PERF_ATTACH_ITRACE		0x0200</div><div class='ctx'> </div><div class='ctx'> struct bpf_prog;</div><div class='ctx'> struct perf_cgroup;</div><div class='ctx'> struct perf_buffer;</div><div class='ctx'> </div><div class='ctx'> struct pmu_event_list {</div><div class='del'>-	raw_spinlock_t		lock;</div><div class='del'>-	struct list_head	list;</div><div class='add'>+	raw_spinlock_t			lock;</div><div class='add'>+	struct list_head		list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -652,12 +745,12 @@ struct pmu_event_list {</div><div class='ctx'>  * disabled is sufficient since it will hold-off the IPIs.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_PROVE_LOCKING</div><div class='del'>-#define lockdep_assert_event_ctx(event)				\</div><div class='add'>+# define lockdep_assert_event_ctx(event)			\</div><div class='ctx'> 	WARN_ON_ONCE(__lockdep_enabled &amp;&amp;			\</div><div class='ctx'> 		     (this_cpu_read(hardirqs_enabled) &amp;&amp;	\</div><div class='ctx'> 		      lockdep_is_held(&amp;(event)-&gt;ctx-&gt;mutex) != LOCK_STATE_HELD))</div><div class='ctx'> #else</div><div class='del'>-#define lockdep_assert_event_ctx(event)</div><div class='add'>+# define lockdep_assert_event_ctx(event)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define for_each_sibling_event(sibling, event)			\</div><div class='hunk'>@@ -766,7 +859,7 @@ struct perf_event {</div><div class='ctx'> </div><div class='ctx'> 	/* mmap bits */</div><div class='ctx'> 	struct mutex			mmap_mutex;</div><div class='del'>-	atomic_t			mmap_count;</div><div class='add'>+	refcount_t			mmap_count;</div><div class='ctx'> </div><div class='ctx'> 	struct perf_buffer		*rb;</div><div class='ctx'> 	struct list_head		rb_entry;</div><div class='hunk'>@@ -781,9 +874,9 @@ struct perf_event {</div><div class='ctx'> 	unsigned int			pending_wakeup;</div><div class='ctx'> 	unsigned int			pending_kill;</div><div class='ctx'> 	unsigned int			pending_disable;</div><div class='del'>-	unsigned int			pending_sigtrap;</div><div class='ctx'> 	unsigned long			pending_addr;	/* SIGTRAP */</div><div class='ctx'> 	struct irq_work			pending_irq;</div><div class='add'>+	struct irq_work			pending_disable_irq;</div><div class='ctx'> 	struct callback_head		pending_task;</div><div class='ctx'> 	unsigned int			pending_work;</div><div class='ctx'> </div><div class='hunk'>@@ -809,18 +902,15 @@ struct perf_event {</div><div class='ctx'> 	u64				(*clock)(void);</div><div class='ctx'> 	perf_overflow_handler_t		overflow_handler;</div><div class='ctx'> 	void				*overflow_handler_context;</div><div class='del'>-#ifdef CONFIG_BPF_SYSCALL</div><div class='del'>-	perf_overflow_handler_t		orig_overflow_handler;</div><div class='ctx'> 	struct bpf_prog			*prog;</div><div class='ctx'> 	u64				bpf_cookie;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EVENT_TRACING</div><div class='ctx'> 	struct trace_event_call		*tp_event;</div><div class='ctx'> 	struct event_filter		*filter;</div><div class='del'>-#ifdef CONFIG_FUNCTION_TRACER</div><div class='add'>+# ifdef CONFIG_FUNCTION_TRACER</div><div class='ctx'> 	struct ftrace_ops               ftrace_ops;</div><div class='del'>-#endif</div><div class='add'>+# endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CGROUP_PERF</div><div class='hunk'>@@ -831,6 +921,7 @@ struct perf_event {</div><div class='ctx'> 	void *security;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct list_head		sb_list;</div><div class='add'>+	struct list_head		pmu_list;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Certain events gets forwarded to another pmu internally by over-</div><div class='hunk'>@@ -838,7 +929,7 @@ struct perf_event {</div><div class='ctx'> 	 * of it. event-&gt;orig_type contains original 'type' requested by</div><div class='ctx'> 	 * user.</div><div class='ctx'> 	 */</div><div class='del'>-	__u32				orig_type;</div><div class='add'>+	u32				orig_type;</div><div class='ctx'> #endif /* CONFIG_PERF_EVENTS */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -878,16 +969,16 @@ struct perf_event_pmu_context {</div><div class='ctx'> 	struct list_head		pinned_active;</div><div class='ctx'> 	struct list_head		flexible_active;</div><div class='ctx'> </div><div class='del'>-	/* Used to avoid freeing per-cpu perf_event_pmu_context */</div><div class='add'>+	/* Used to identify the per-cpu perf_event_pmu_context */</div><div class='ctx'> 	unsigned int			embedded : 1;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int			nr_events;</div><div class='ctx'> 	unsigned int			nr_cgroups;</div><div class='add'>+	unsigned int			nr_freq;</div><div class='ctx'> </div><div class='ctx'> 	atomic_t			refcount; /* event &lt;-&gt; epc */</div><div class='ctx'> 	struct rcu_head			rcu_head;</div><div class='ctx'> </div><div class='del'>-	void				*task_ctx_data; /* pmu specific data */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set when one or more (plausibly active) event can't be scheduled</div><div class='ctx'> 	 * due to pmu overcommit or pmu constraints, except tolerant to</div><div class='hunk'>@@ -897,9 +988,14 @@ struct perf_event_pmu_context {</div><div class='ctx'> 	int				rotate_necessary;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool perf_pmu_ctx_is_active(struct perf_event_pmu_context *epc)</div><div class='add'>+{</div><div class='add'>+	return !list_empty(&amp;epc-&gt;flexible_active) || !list_empty(&amp;epc-&gt;pinned_active);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct perf_event_groups {</div><div class='del'>-	struct rb_root	tree;</div><div class='del'>-	u64		index;</div><div class='add'>+	struct rb_root			tree;</div><div class='add'>+	u64				index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -930,7 +1026,6 @@ struct perf_event_context {</div><div class='ctx'> 	int				nr_user;</div><div class='ctx'> 	int				is_active;</div><div class='ctx'> </div><div class='del'>-	int				nr_task_data;</div><div class='ctx'> 	int				nr_stat;</div><div class='ctx'> 	int				nr_freq;</div><div class='ctx'> 	int				rotate_disable;</div><div class='hunk'>@@ -959,19 +1054,52 @@ struct perf_event_context {</div><div class='ctx'> 	struct rcu_head			rcu_head;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Sum (event-&gt;pending_sigtrap + event-&gt;pending_work)</div><div class='add'>+	 * The count of events for which using the switch-out fast path</div><div class='add'>+	 * should be avoided.</div><div class='add'>+	 *</div><div class='add'>+	 * Sum (event-&gt;pending_work + events with</div><div class='add'>+	 *    (attr-&gt;inherit &amp;&amp; (attr-&gt;sample_type &amp; PERF_SAMPLE_READ)))</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The SIGTRAP is targeted at ctx-&gt;task, as such it won't do changing</div><div class='ctx'> 	 * that until the signal is delivered.</div><div class='ctx'> 	 */</div><div class='del'>-	local_t				nr_pending;</div><div class='add'>+	local_t				nr_no_switch_fast;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Number of contexts where an event can trigger:</div><div class='del'>- *	task, softirq, hardirq, nmi.</div><div class='add'>+/**</div><div class='add'>+ * struct perf_ctx_data - PMU specific data for a task</div><div class='add'>+ * @rcu_head:  To avoid the race on free PMU specific data</div><div class='add'>+ * @refcount:  To track users</div><div class='add'>+ * @global:    To track system-wide users</div><div class='add'>+ * @ctx_cache: Kmem cache of PMU specific data</div><div class='add'>+ * @data:      PMU specific data</div><div class='add'>+ *</div><div class='add'>+ * Currently, the struct is only used in Intel LBR call stack mode to</div><div class='add'>+ * save/restore the call stack of a task on context switches.</div><div class='add'>+ *</div><div class='add'>+ * The rcu_head is used to prevent the race on free the data.</div><div class='add'>+ * The data only be allocated when Intel LBR call stack mode is enabled.</div><div class='add'>+ * The data will be freed when the mode is disabled.</div><div class='add'>+ * The content of the data will only be accessed in context switch, which</div><div class='add'>+ * should be protected by rcu_read_lock().</div><div class='add'>+ *</div><div class='add'>+ * Because of the alignment requirement of Intel Arch LBR, the Kmem cache</div><div class='add'>+ * is used to allocate the PMU specific data. The ctx_cache is to track</div><div class='add'>+ * the Kmem cache.</div><div class='add'>+ *</div><div class='add'>+ * Careful: Struct perf_ctx_data is added as a pointer in struct task_struct.</div><div class='add'>+ * When system-wide Intel LBR call stack mode is enabled, a buffer with</div><div class='add'>+ * constant size will be allocated for each task.</div><div class='add'>+ * Also, system memory consumption can further grow when the size of</div><div class='add'>+ * struct perf_ctx_data enlarges.</div><div class='ctx'>  */</div><div class='del'>-#define PERF_NR_CONTEXTS	4</div><div class='add'>+struct perf_ctx_data {</div><div class='add'>+	struct rcu_head			rcu_head;</div><div class='add'>+	refcount_t			refcount;</div><div class='add'>+	int				global;</div><div class='add'>+	struct kmem_cache		*ctx_cache;</div><div class='add'>+	void				*data;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct perf_cpu_pmu_context {</div><div class='ctx'> 	struct perf_event_pmu_context	epc;</div><div class='hunk'>@@ -982,6 +1110,7 @@ struct perf_cpu_pmu_context {</div><div class='ctx'> </div><div class='ctx'> 	int				active_oncpu;</div><div class='ctx'> 	int				exclusive;</div><div class='add'>+	int				pmu_disable_count;</div><div class='ctx'> </div><div class='ctx'> 	raw_spinlock_t			hrtimer_lock;</div><div class='ctx'> 	struct hrtimer			hrtimer;</div><div class='hunk'>@@ -1015,7 +1144,13 @@ struct perf_output_handle {</div><div class='ctx'> 	struct perf_buffer		*rb;</div><div class='ctx'> 	unsigned long			wakeup;</div><div class='ctx'> 	unsigned long			size;</div><div class='del'>-	u64				aux_flags;</div><div class='add'>+	union {</div><div class='add'>+		u64			flags;		/* perf_output*() */</div><div class='add'>+		u64			aux_flags;	/* perf_aux_output*() */</div><div class='add'>+		struct {</div><div class='add'>+			u64		skip_read : 1;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> 	union {</div><div class='ctx'> 		void			*addr;</div><div class='ctx'> 		unsigned long		head;</div><div class='hunk'>@@ -1077,7 +1212,7 @@ extern void perf_aux_output_flag(struct perf_output_handle *handle, u64 flags);</div><div class='ctx'> extern void perf_event_itrace_started(struct perf_event *event);</div><div class='ctx'> </div><div class='ctx'> extern int perf_pmu_register(struct pmu *pmu, const char *name, int type);</div><div class='del'>-extern void perf_pmu_unregister(struct pmu *pmu);</div><div class='add'>+extern int perf_pmu_unregister(struct pmu *pmu);</div><div class='ctx'> </div><div class='ctx'> extern void __perf_event_task_sched_in(struct task_struct *prev,</div><div class='ctx'> 				       struct task_struct *task);</div><div class='hunk'>@@ -1103,16 +1238,18 @@ extern void perf_pmu_resched(struct pmu *pmu);</div><div class='ctx'> extern int perf_event_refresh(struct perf_event *event, int refresh);</div><div class='ctx'> extern void perf_event_update_userpage(struct perf_event *event);</div><div class='ctx'> extern int perf_event_release_kernel(struct perf_event *event);</div><div class='add'>+</div><div class='ctx'> extern struct perf_event *</div><div class='ctx'> perf_event_create_kernel_counter(struct perf_event_attr *attr,</div><div class='del'>-				int cpu,</div><div class='del'>-				struct task_struct *task,</div><div class='del'>-				perf_overflow_handler_t callback,</div><div class='del'>-				void *context);</div><div class='add'>+				 int cpu,</div><div class='add'>+				 struct task_struct *task,</div><div class='add'>+				 perf_overflow_handler_t callback,</div><div class='add'>+				 void *context);</div><div class='add'>+</div><div class='ctx'> extern void perf_pmu_migrate_context(struct pmu *pmu,</div><div class='del'>-				int src_cpu, int dst_cpu);</div><div class='del'>-int perf_event_read_local(struct perf_event *event, u64 *value,</div><div class='del'>-			  u64 *enabled, u64 *running);</div><div class='add'>+				     int src_cpu, int dst_cpu);</div><div class='add'>+extern int perf_event_read_local(struct perf_event *event, u64 *value,</div><div class='add'>+				 u64 *enabled, u64 *running);</div><div class='ctx'> extern u64 perf_event_read_value(struct perf_event *event,</div><div class='ctx'> 				 u64 *enabled, u64 *running);</div><div class='ctx'> </div><div class='hunk'>@@ -1232,6 +1369,11 @@ static inline void perf_sample_save_callchain(struct perf_sample_data *data,</div><div class='ctx'> {</div><div class='ctx'> 	int size = 1;</div><div class='ctx'> </div><div class='add'>+	if (!(event-&gt;attr.sample_type &amp; PERF_SAMPLE_CALLCHAIN))</div><div class='add'>+		return;</div><div class='add'>+	if (WARN_ON_ONCE(data-&gt;sample_flags &amp; PERF_SAMPLE_CALLCHAIN))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	data-&gt;callchain = perf_callchain(event, regs);</div><div class='ctx'> 	size += data-&gt;callchain-&gt;nr;</div><div class='ctx'> </div><div class='hunk'>@@ -1240,12 +1382,18 @@ static inline void perf_sample_save_callchain(struct perf_sample_data *data,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void perf_sample_save_raw_data(struct perf_sample_data *data,</div><div class='add'>+					     struct perf_event *event,</div><div class='ctx'> 					     struct perf_raw_record *raw)</div><div class='ctx'> {</div><div class='ctx'> 	struct perf_raw_frag *frag = &amp;raw-&gt;frag;</div><div class='ctx'> 	u32 sum = 0;</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='add'>+	if (!(event-&gt;attr.sample_type &amp; PERF_SAMPLE_RAW))</div><div class='add'>+		return;</div><div class='add'>+	if (WARN_ON_ONCE(data-&gt;sample_flags &amp; PERF_SAMPLE_RAW))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		sum += frag-&gt;size;</div><div class='ctx'> 		if (perf_raw_frag_last(frag))</div><div class='hunk'>@@ -1262,6 +1410,11 @@ static inline void perf_sample_save_raw_data(struct perf_sample_data *data,</div><div class='ctx'> 	data-&gt;sample_flags |= PERF_SAMPLE_RAW;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool has_branch_stack(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	return event-&gt;attr.sample_type &amp; PERF_SAMPLE_BRANCH_STACK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void perf_sample_save_brstack(struct perf_sample_data *data,</div><div class='ctx'> 					    struct perf_event *event,</div><div class='ctx'> 					    struct perf_branch_stack *brs,</div><div class='hunk'>@@ -1269,8 +1422,16 @@ static inline void perf_sample_save_brstack(struct perf_sample_data *data,</div><div class='ctx'> {</div><div class='ctx'> 	int size = sizeof(u64); /* nr */</div><div class='ctx'> </div><div class='add'>+	if (!has_branch_stack(event))</div><div class='add'>+		return;</div><div class='add'>+	if (WARN_ON_ONCE(data-&gt;sample_flags &amp; PERF_SAMPLE_BRANCH_STACK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (branch_sample_hw_index(event))</div><div class='ctx'> 		size += sizeof(u64);</div><div class='add'>+</div><div class='add'>+	brs-&gt;nr = min_t(u16, event-&gt;attr.sample_max_stack, brs-&gt;nr);</div><div class='add'>+</div><div class='ctx'> 	size += brs-&gt;nr * sizeof(struct perf_branch_entry);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1305,14 +1466,14 @@ static inline u32 perf_sample_data_size(struct perf_sample_data *data,</div><div class='ctx'>  */</div><div class='ctx'> static inline void perf_clear_branch_entry_bitfields(struct perf_branch_entry *br)</div><div class='ctx'> {</div><div class='del'>-	br-&gt;mispred = 0;</div><div class='del'>-	br-&gt;predicted = 0;</div><div class='del'>-	br-&gt;in_tx = 0;</div><div class='del'>-	br-&gt;abort = 0;</div><div class='del'>-	br-&gt;cycles = 0;</div><div class='del'>-	br-&gt;type = 0;</div><div class='del'>-	br-&gt;spec = PERF_BR_SPEC_NA;</div><div class='del'>-	br-&gt;reserved = 0;</div><div class='add'>+	br-&gt;mispred	= 0;</div><div class='add'>+	br-&gt;predicted	= 0;</div><div class='add'>+	br-&gt;in_tx	= 0;</div><div class='add'>+	br-&gt;abort	= 0;</div><div class='add'>+	br-&gt;cycles	= 0;</div><div class='add'>+	br-&gt;type	= 0;</div><div class='add'>+	br-&gt;spec	= PERF_BR_SPEC_NA;</div><div class='add'>+	br-&gt;reserved	= 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void perf_output_sample(struct perf_output_handle *handle,</div><div class='hunk'>@@ -1342,8 +1503,10 @@ extern int perf_event_output(struct perf_event *event,</div><div class='ctx'> 			     struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='del'>-__is_default_overflow_handler(perf_overflow_handler_t overflow_handler)</div><div class='add'>+is_default_overflow_handler(struct perf_event *event)</div><div class='ctx'> {</div><div class='add'>+	perf_overflow_handler_t overflow_handler = event-&gt;overflow_handler;</div><div class='add'>+</div><div class='ctx'> 	if (likely(overflow_handler == perf_event_output_forward))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	if (unlikely(overflow_handler == perf_event_output_backward))</div><div class='hunk'>@@ -1351,22 +1514,6 @@ __is_default_overflow_handler(perf_overflow_handler_t overflow_handler)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define is_default_overflow_handler(event) \</div><div class='del'>-	__is_default_overflow_handler((event)-&gt;overflow_handler)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BPF_SYSCALL</div><div class='del'>-static inline bool uses_default_overflow_handler(struct perf_event *event)</div><div class='del'>-{</div><div class='del'>-	if (likely(is_default_overflow_handler(event)))</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return __is_default_overflow_handler(event-&gt;orig_overflow_handler);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define uses_default_overflow_handler(event) \</div><div class='del'>-	is_default_overflow_handler(event)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> extern void</div><div class='ctx'> perf_event_header__init_id(struct perf_event_header *header,</div><div class='ctx'> 			   struct perf_sample_data *data,</div><div class='hunk'>@@ -1515,7 +1662,17 @@ extern void perf_event_bpf_event(struct bpf_prog *prog,</div><div class='ctx'> 				 enum perf_bpf_event_type type,</div><div class='ctx'> 				 u16 flags);</div><div class='ctx'> </div><div class='add'>+#define PERF_GUEST_ACTIVE		0x01</div><div class='add'>+#define PERF_GUEST_USER			0x02</div><div class='add'>+</div><div class='add'>+struct perf_guest_info_callbacks {</div><div class='add'>+	unsigned int			(*state)(void);</div><div class='add'>+	unsigned long			(*get_ip)(void);</div><div class='add'>+	unsigned int			(*handle_intel_pt_intr)(void);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_GUEST_PERF_EVENTS</div><div class='add'>+</div><div class='ctx'> extern struct perf_guest_info_callbacks __rcu *perf_guest_cbs;</div><div class='ctx'> </div><div class='ctx'> DECLARE_STATIC_CALL(__perf_guest_state, *perf_guest_cbs-&gt;state);</div><div class='hunk'>@@ -1526,21 +1683,27 @@ static inline unsigned int perf_guest_state(void)</div><div class='ctx'> {</div><div class='ctx'> 	return static_call(__perf_guest_state)();</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static inline unsigned long perf_guest_get_ip(void)</div><div class='ctx'> {</div><div class='ctx'> 	return static_call(__perf_guest_get_ip)();</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static inline unsigned int perf_guest_handle_intel_pt_intr(void)</div><div class='ctx'> {</div><div class='ctx'> 	return static_call(__perf_guest_handle_intel_pt_intr)();</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> extern void perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *cbs);</div><div class='ctx'> extern void perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *cbs);</div><div class='del'>-#else</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_GUEST_PERF_EVENTS: */</div><div class='add'>+</div><div class='ctx'> static inline unsigned int perf_guest_state(void)		 { return 0; }</div><div class='ctx'> static inline unsigned long perf_guest_get_ip(void)		 { return 0; }</div><div class='ctx'> static inline unsigned int perf_guest_handle_intel_pt_intr(void) { return 0; }</div><div class='del'>-#endif /* CONFIG_GUEST_PERF_EVENTS */</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_GUEST_PERF_EVENTS */</div><div class='ctx'> </div><div class='ctx'> extern void perf_event_exec(void);</div><div class='ctx'> extern void perf_event_comm(struct task_struct *tsk, bool exec);</div><div class='hunk'>@@ -1556,8 +1719,8 @@ DECLARE_PER_CPU(struct perf_callchain_entry, perf_callchain_entry);</div><div class='ctx'> extern void perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs);</div><div class='ctx'> extern void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs);</div><div class='ctx'> extern struct perf_callchain_entry *</div><div class='del'>-get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user,</div><div class='del'>-		   u32 max_stack, bool crosstask, bool add_mark);</div><div class='add'>+get_perf_callchain(struct pt_regs *regs, bool kernel, bool user,</div><div class='add'>+		   u32 max_stack, bool crosstask, bool add_mark, u64 defer_cookie);</div><div class='ctx'> extern int get_callchain_buffers(int max_stack);</div><div class='ctx'> extern void put_callchain_buffers(void);</div><div class='ctx'> extern struct perf_callchain_entry *get_callchain_entry(int *rctx);</div><div class='hunk'>@@ -1570,6 +1733,7 @@ static inline int perf_callchain_store_context(struct perf_callchain_entry_ctx *</div><div class='ctx'> {</div><div class='ctx'> 	if (ctx-&gt;contexts &lt; sysctl_perf_event_max_contexts_per_stack) {</div><div class='ctx'> 		struct perf_callchain_entry *entry = ctx-&gt;entry;</div><div class='add'>+</div><div class='ctx'> 		entry-&gt;ip[entry-&gt;nr++] = ip;</div><div class='ctx'> 		++ctx-&gt;contexts;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1583,6 +1747,7 @@ static inline int perf_callchain_store(struct perf_callchain_entry_ctx *ctx, u64</div><div class='ctx'> {</div><div class='ctx'> 	if (ctx-&gt;nr &lt; ctx-&gt;max_stack &amp;&amp; !ctx-&gt;contexts_maxed) {</div><div class='ctx'> 		struct perf_callchain_entry *entry = ctx-&gt;entry;</div><div class='add'>+</div><div class='ctx'> 		entry-&gt;ip[entry-&gt;nr++] = ip;</div><div class='ctx'> 		++ctx-&gt;nr;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1592,19 +1757,10 @@ static inline int perf_callchain_store(struct perf_callchain_entry_ctx *ctx, u64</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern int sysctl_perf_event_paranoid;</div><div class='del'>-extern int sysctl_perf_event_mlock;</div><div class='ctx'> extern int sysctl_perf_event_sample_rate;</div><div class='del'>-extern int sysctl_perf_cpu_time_max_percent;</div><div class='ctx'> </div><div class='ctx'> extern void perf_sample_event_took(u64 sample_len_ns);</div><div class='ctx'> </div><div class='del'>-int perf_event_max_sample_rate_handler(struct ctl_table *table, int write,</div><div class='del'>-		void *buffer, size_t *lenp, loff_t *ppos);</div><div class='del'>-int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,</div><div class='del'>-		void *buffer, size_t *lenp, loff_t *ppos);</div><div class='del'>-int perf_event_max_stack_handler(struct ctl_table *table, int write,</div><div class='del'>-		void *buffer, size_t *lenp, loff_t *ppos);</div><div class='del'>-</div><div class='ctx'> /* Access to perf_event_open(2) syscall. */</div><div class='ctx'> #define PERF_SECURITY_OPEN		0</div><div class='ctx'> </div><div class='hunk'>@@ -1618,30 +1774,26 @@ static inline int perf_is_paranoid(void)</div><div class='ctx'> 	return sysctl_perf_event_paranoid &gt; -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int perf_allow_kernel(struct perf_event_attr *attr)</div><div class='del'>-{</div><div class='del'>-	if (sysctl_perf_event_paranoid &gt; 1 &amp;&amp; !perfmon_capable())</div><div class='del'>-		return -EACCES;</div><div class='add'>+extern int perf_allow_kernel(void);</div><div class='ctx'> </div><div class='del'>-	return security_perf_event_open(attr, PERF_SECURITY_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int perf_allow_cpu(struct perf_event_attr *attr)</div><div class='add'>+static inline int perf_allow_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (sysctl_perf_event_paranoid &gt; 0 &amp;&amp; !perfmon_capable())</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='del'>-	return security_perf_event_open(attr, PERF_SECURITY_CPU);</div><div class='add'>+	return security_perf_event_open(PERF_SECURITY_CPU);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int perf_allow_tracepoint(struct perf_event_attr *attr)</div><div class='add'>+static inline int perf_allow_tracepoint(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (sysctl_perf_event_paranoid &gt; -1 &amp;&amp; !perfmon_capable())</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	return security_perf_event_open(attr, PERF_SECURITY_TRACEPOINT);</div><div class='add'>+	return security_perf_event_open(PERF_SECURITY_TRACEPOINT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern int perf_exclude_event(struct perf_event *event, struct pt_regs *regs);</div><div class='add'>+</div><div class='ctx'> extern void perf_event_init(void);</div><div class='ctx'> extern void perf_tp_event(u16 event_type, u64 count, void *record,</div><div class='ctx'> 			  int entry_size, struct pt_regs *regs,</div><div class='hunk'>@@ -1649,19 +1801,34 @@ extern void perf_tp_event(u16 event_type, u64 count, void *record,</div><div class='ctx'> 			  struct task_struct *task);</div><div class='ctx'> extern void perf_bp_event(struct perf_event *event, void *data);</div><div class='ctx'> </div><div class='del'>-#ifndef perf_misc_flags</div><div class='del'>-# define perf_misc_flags(regs) \</div><div class='add'>+extern unsigned long perf_misc_flags(struct perf_event *event, struct pt_regs *regs);</div><div class='add'>+extern unsigned long perf_instruction_pointer(struct perf_event *event,</div><div class='add'>+					      struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+#ifndef perf_arch_misc_flags</div><div class='add'>+# define perf_arch_misc_flags(regs) \</div><div class='ctx'> 		(user_mode(regs) ? PERF_RECORD_MISC_USER : PERF_RECORD_MISC_KERNEL)</div><div class='del'>-# define perf_instruction_pointer(regs)	instruction_pointer(regs)</div><div class='add'>+# define perf_arch_instruction_pointer(regs)	instruction_pointer(regs)</div><div class='ctx'> #endif</div><div class='ctx'> #ifndef perf_arch_bpf_user_pt_regs</div><div class='ctx'> # define perf_arch_bpf_user_pt_regs(regs) regs</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline bool has_branch_stack(struct perf_event *event)</div><div class='add'>+#ifndef perf_arch_guest_misc_flags</div><div class='add'>+static inline unsigned long perf_arch_guest_misc_flags(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	return event-&gt;attr.sample_type &amp; PERF_SAMPLE_BRANCH_STACK;</div><div class='add'>+	unsigned long guest_state = perf_guest_state();</div><div class='add'>+</div><div class='add'>+	if (!(guest_state &amp; PERF_GUEST_ACTIVE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (guest_state &amp; PERF_GUEST_USER)</div><div class='add'>+		return PERF_RECORD_MISC_GUEST_USER;</div><div class='add'>+	else</div><div class='add'>+		return PERF_RECORD_MISC_GUEST_KERNEL;</div><div class='ctx'> }</div><div class='add'>+# define perf_arch_guest_misc_flags(regs)	perf_arch_guest_misc_flags(regs)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static inline bool needs_branch_stack(struct perf_event *event)</div><div class='ctx'> {</div><div class='hunk'>@@ -1670,7 +1837,14 @@ static inline bool needs_branch_stack(struct perf_event *event)</div><div class='ctx'> </div><div class='ctx'> static inline bool has_aux(struct perf_event *event)</div><div class='ctx'> {</div><div class='del'>-	return event-&gt;pmu-&gt;setup_aux;</div><div class='add'>+	return event-&gt;pmu &amp;&amp; event-&gt;pmu-&gt;setup_aux;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool has_aux_action(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	return event-&gt;attr.aux_sample_size ||</div><div class='add'>+	       event-&gt;attr.aux_pause ||</div><div class='add'>+	       event-&gt;attr.aux_resume;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_write_backward(struct perf_event *event)</div><div class='hunk'>@@ -1697,6 +1871,14 @@ perf_event_addr_filters(struct perf_event *event)</div><div class='ctx'> 	return ifh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct fasync_struct **perf_event_fasync(struct perf_event *event)</div><div class='add'>+{</div><div class='add'>+	/* Only the parent has fasync state */</div><div class='add'>+	if (event-&gt;parent)</div><div class='add'>+		event = event-&gt;parent;</div><div class='add'>+	return &amp;event-&gt;fasync;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void perf_event_addr_filters_sync(struct perf_event *event);</div><div class='ctx'> extern void perf_report_aux_output_id(struct perf_event *event, u64 hw_id);</div><div class='ctx'> </div><div class='hunk'>@@ -1714,7 +1896,7 @@ extern int perf_output_begin_backward(struct perf_output_handle *handle,</div><div class='ctx'> </div><div class='ctx'> extern void perf_output_end(struct perf_output_handle *handle);</div><div class='ctx'> extern unsigned int perf_output_copy(struct perf_output_handle *handle,</div><div class='del'>-			     const void *buf, unsigned int len);</div><div class='add'>+				     const void *buf, unsigned int len);</div><div class='ctx'> extern unsigned int perf_output_skip(struct perf_output_handle *handle,</div><div class='ctx'> 				     unsigned int len);</div><div class='ctx'> extern long perf_output_copy_aux(struct perf_output_handle *aux_handle,</div><div class='hunk'>@@ -1731,7 +1913,9 @@ extern void perf_event_task_tick(void);</div><div class='ctx'> extern int perf_event_account_interrupt(struct perf_event *event);</div><div class='ctx'> extern int perf_event_period(struct perf_event *event, u64 value);</div><div class='ctx'> extern u64 perf_event_pause(struct perf_event *event, bool reset);</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_PERF_EVENTS: */</div><div class='add'>+</div><div class='ctx'> static inline void *</div><div class='ctx'> perf_aux_output_begin(struct perf_output_handle *handle,</div><div class='ctx'> 		      struct perf_event *event)				{ return NULL; }</div><div class='hunk'>@@ -1809,15 +1993,14 @@ static inline void perf_event_disable(struct perf_event *event)		{ }</div><div class='ctx'> static inline int __perf_event_disable(void *info)			{ return -1; }</div><div class='ctx'> static inline void perf_event_task_tick(void)				{ }</div><div class='ctx'> static inline int perf_event_release_kernel(struct perf_event *event)	{ return 0; }</div><div class='del'>-static inline int perf_event_period(struct perf_event *event, u64 value)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-static inline u64 perf_event_pause(struct perf_event *event, bool reset)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+static inline int</div><div class='add'>+perf_event_period(struct perf_event *event, u64 value)			{ return -EINVAL; }</div><div class='add'>+static inline u64</div><div class='add'>+perf_event_pause(struct perf_event *event, bool reset)			{ return 0; }</div><div class='add'>+static inline int</div><div class='add'>+perf_exclude_event(struct perf_event *event, struct pt_regs *regs)	{ return 0; }</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_PERF_EVENTS */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PERF_EVENTS) &amp;&amp; defined(CONFIG_CPU_SUP_INTEL)</div><div class='ctx'> extern void perf_restore_debug_store(void);</div><div class='hunk'>@@ -1825,31 +2008,31 @@ extern void perf_restore_debug_store(void);</div><div class='ctx'> static inline void perf_restore_debug_store(void)			{ }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define perf_output_put(handle, x) perf_output_copy((handle), &amp;(x), sizeof(x))</div><div class='add'>+#define perf_output_put(handle, x)	perf_output_copy((handle), &amp;(x), sizeof(x))</div><div class='ctx'> </div><div class='ctx'> struct perf_pmu_events_attr {</div><div class='del'>-	struct device_attribute attr;</div><div class='del'>-	u64 id;</div><div class='del'>-	const char *event_str;</div><div class='add'>+	struct device_attribute		attr;</div><div class='add'>+	u64				id;</div><div class='add'>+	const char			*event_str;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct perf_pmu_events_ht_attr {</div><div class='del'>-	struct device_attribute			attr;</div><div class='del'>-	u64					id;</div><div class='del'>-	const char				*event_str_ht;</div><div class='del'>-	const char				*event_str_noht;</div><div class='add'>+	struct device_attribute		attr;</div><div class='add'>+	u64				id;</div><div class='add'>+	const char			*event_str_ht;</div><div class='add'>+	const char			*event_str_noht;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct perf_pmu_events_hybrid_attr {</div><div class='del'>-	struct device_attribute			attr;</div><div class='del'>-	u64					id;</div><div class='del'>-	const char				*event_str;</div><div class='del'>-	u64					pmu_type;</div><div class='add'>+	struct device_attribute		attr;</div><div class='add'>+	u64				id;</div><div class='add'>+	const char			*event_str;</div><div class='add'>+	u64				pmu_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct perf_pmu_format_hybrid_attr {</div><div class='del'>-	struct device_attribute			attr;</div><div class='del'>-	u64					pmu_type;</div><div class='add'>+	struct device_attribute		attr;</div><div class='add'>+	u64				pmu_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -1891,11 +2074,11 @@ static struct device_attribute format_attr_##_name = __ATTR_RO(_name)</div><div class='ctx'> </div><div class='ctx'> /* Performance counter hotplug functions */</div><div class='ctx'> #ifdef CONFIG_PERF_EVENTS</div><div class='del'>-int perf_event_init_cpu(unsigned int cpu);</div><div class='del'>-int perf_event_exit_cpu(unsigned int cpu);</div><div class='add'>+extern int perf_event_init_cpu(unsigned int cpu);</div><div class='add'>+extern int perf_event_exit_cpu(unsigned int cpu);</div><div class='ctx'> #else</div><div class='del'>-#define perf_event_init_cpu	NULL</div><div class='del'>-#define perf_event_exit_cpu	NULL</div><div class='add'>+# define perf_event_init_cpu		NULL</div><div class='add'>+# define perf_event_exit_cpu		NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern void arch_perf_update_userpage(struct perf_event *event,</div><div class='head'>diff --git a/include/linux/pfn.h b/include/linux/pfn.h<br/>index 14bc053c53d8..b90ca0b6c331 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pfn.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pfn.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pfn.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pfn.h</a></div><div class='hunk'>@@ -4,15 +4,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pfn_t: encapsulates a page-frame number that is optionally backed</div><div class='del'>- * by memmap (struct page).  Whether a pfn_t has a 'struct page'</div><div class='del'>- * backing is indicated by flags in the high bits of the value.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	u64 val;</div><div class='del'>-} pfn_t;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define PFN_ALIGN(x)	(((unsigned long)(x) + (PAGE_SIZE - 1)) &amp; PAGE_MASK)</div><div class='head'>diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h<br/>deleted file mode 100644<br/>index 2d9148221e9a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pfn_t.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pfn_t.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_PFN_T_H_</div><div class='del'>-#define _LINUX_PFN_T_H_</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PFN_FLAGS_MASK - mask of all the possible valid pfn_t flags</div><div class='del'>- * PFN_SG_CHAIN - pfn is a pointer to the next scatterlist entry</div><div class='del'>- * PFN_SG_LAST - pfn references a page and is the last scatterlist entry</div><div class='del'>- * PFN_DEV - pfn is not covered by system memmap by default</div><div class='del'>- * PFN_MAP - pfn has a dynamic page mapping established by a device driver</div><div class='del'>- * PFN_SPECIAL - for CONFIG_FS_DAX_LIMITED builds to allow XIP, but not</div><div class='del'>- *		 get_user_pages</div><div class='del'>- */</div><div class='del'>-#define PFN_FLAGS_MASK (((u64) (~PAGE_MASK)) &lt;&lt; (BITS_PER_LONG_LONG - PAGE_SHIFT))</div><div class='del'>-#define PFN_SG_CHAIN (1ULL &lt;&lt; (BITS_PER_LONG_LONG - 1))</div><div class='del'>-#define PFN_SG_LAST (1ULL &lt;&lt; (BITS_PER_LONG_LONG - 2))</div><div class='del'>-#define PFN_DEV (1ULL &lt;&lt; (BITS_PER_LONG_LONG - 3))</div><div class='del'>-#define PFN_MAP (1ULL &lt;&lt; (BITS_PER_LONG_LONG - 4))</div><div class='del'>-#define PFN_SPECIAL (1ULL &lt;&lt; (BITS_PER_LONG_LONG - 5))</div><div class='del'>-</div><div class='del'>-#define PFN_FLAGS_TRACE \</div><div class='del'>-	{ PFN_SPECIAL,	"SPECIAL" }, \</div><div class='del'>-	{ PFN_SG_CHAIN,	"SG_CHAIN" }, \</div><div class='del'>-	{ PFN_SG_LAST,	"SG_LAST" }, \</div><div class='del'>-	{ PFN_DEV,	"DEV" }, \</div><div class='del'>-	{ PFN_MAP,	"MAP" }</div><div class='del'>-</div><div class='del'>-static inline pfn_t __pfn_to_pfn_t(unsigned long pfn, u64 flags)</div><div class='del'>-{</div><div class='del'>-	pfn_t pfn_t = { .val = pfn | (flags &amp; PFN_FLAGS_MASK), };</div><div class='del'>-</div><div class='del'>-	return pfn_t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* a default pfn to pfn_t conversion assumes that @pfn is pfn_valid() */</div><div class='del'>-static inline pfn_t pfn_to_pfn_t(unsigned long pfn)</div><div class='del'>-{</div><div class='del'>-	return __pfn_to_pfn_t(pfn, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline pfn_t phys_to_pfn_t(phys_addr_t addr, u64 flags)</div><div class='del'>-{</div><div class='del'>-	return __pfn_to_pfn_t(addr &gt;&gt; PAGE_SHIFT, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool pfn_t_has_page(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	return (pfn.val &amp; PFN_MAP) == PFN_MAP || (pfn.val &amp; PFN_DEV) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long pfn_t_to_pfn(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	return pfn.val &amp; ~PFN_FLAGS_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct page *pfn_t_to_page(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	if (pfn_t_has_page(pfn))</div><div class='del'>-		return pfn_to_page(pfn_t_to_pfn(pfn));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline phys_addr_t pfn_t_to_phys(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	return PFN_PHYS(pfn_t_to_pfn(pfn));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline pfn_t page_to_pfn_t(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return pfn_to_pfn_t(page_to_pfn(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int pfn_t_valid(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	return pfn_valid(pfn_t_to_pfn(pfn));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='del'>-static inline pte_t pfn_t_pte(pfn_t pfn, pgprot_t pgprot)</div><div class='del'>-{</div><div class='del'>-	return pfn_pte(pfn_t_to_pfn(pfn), pgprot);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='del'>-static inline pmd_t pfn_t_pmd(pfn_t pfn, pgprot_t pgprot)</div><div class='del'>-{</div><div class='del'>-	return pfn_pmd(pfn_t_to_pfn(pfn), pgprot);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD</div><div class='del'>-static inline pud_t pfn_t_pud(pfn_t pfn, pgprot_t pgprot)</div><div class='del'>-{</div><div class='del'>-	return pfn_pud(pfn_t_to_pfn(pfn), pgprot);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_HAS_PTE_DEVMAP</div><div class='del'>-static inline bool pfn_t_devmap(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	const u64 flags = PFN_DEV|PFN_MAP;</div><div class='del'>-</div><div class='del'>-	return (pfn.val &amp; flags) == flags;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline bool pfn_t_devmap(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-pte_t pte_mkdevmap(pte_t pte);</div><div class='del'>-pmd_t pmd_mkdevmap(pmd_t pmd);</div><div class='del'>-#if defined(CONFIG_TRANSPARENT_HUGEPAGE) &amp;&amp; \</div><div class='del'>-	defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)</div><div class='del'>-pud_t pud_mkdevmap(pud_t pud);</div><div class='del'>-#endif</div><div class='del'>-#endif /* CONFIG_ARCH_HAS_PTE_DEVMAP */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_HAS_PTE_SPECIAL</div><div class='del'>-static inline bool pfn_t_special(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	return (pfn.val &amp; PFN_SPECIAL) == PFN_SPECIAL;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline bool pfn_t_special(pfn_t pfn)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_ARCH_HAS_PTE_SPECIAL */</div><div class='del'>-#endif /* _LINUX_PFN_T_H_ */</div><div class='head'>diff --git a/include/linux/pgalloc.h b/include/linux/pgalloc.h<br/>new file mode 100644<br/>index 000000000000..9174fa59bbc5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pgalloc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pgalloc.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_PGALLOC_H</div><div class='add'>+#define _LINUX_PGALLOC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * {pgd,p4d}_populate_kernel() are defined as macros to allow</div><div class='add'>+ * compile-time optimization based on the configured page table levels.</div><div class='add'>+ * Without this, linking may fail because callers (e.g., KASAN) may rely</div><div class='add'>+ * on calls to these functions being optimized away when passing symbols</div><div class='add'>+ * that exist only for certain page table levels.</div><div class='add'>+ */</div><div class='add'>+#define pgd_populate_kernel(addr, pgd, p4d)				\</div><div class='add'>+	do {								\</div><div class='add'>+		pgd_populate(&amp;init_mm, pgd, p4d);			\</div><div class='add'>+		if (ARCH_PAGE_TABLE_SYNC_MASK &amp; PGTBL_PGD_MODIFIED)	\</div><div class='add'>+			arch_sync_kernel_mappings(addr, addr);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define p4d_populate_kernel(addr, p4d, pud)				\</div><div class='add'>+	do {								\</div><div class='add'>+		p4d_populate(&amp;init_mm, p4d, pud);			\</div><div class='add'>+		if (ARCH_PAGE_TABLE_SYNC_MASK &amp; PGTBL_P4D_MODIFIED)	\</div><div class='add'>+			arch_sync_kernel_mappings(addr, addr);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_PGALLOC_H */</div><div class='head'>diff --git a/include/linux/pgalloc_tag.h b/include/linux/pgalloc_tag.h<br/>new file mode 100644<br/>index 000000000000..38a82d65e58e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pgalloc_tag.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pgalloc_tag.h</a></div><div class='hunk'>@@ -0,0 +1,214 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * page allocation tagging</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_PGALLOC_TAG_H</div><div class='add'>+#define _LINUX_PGALLOC_TAG_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/alloc_tag.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING</div><div class='add'>+</div><div class='add'>+#include &lt;linux/page_ext.h&gt;</div><div class='add'>+</div><div class='add'>+extern struct page_ext_operations page_alloc_tagging_ops;</div><div class='add'>+extern unsigned long alloc_tag_ref_mask;</div><div class='add'>+extern int alloc_tag_ref_offs;</div><div class='add'>+extern struct alloc_tag_kernel_section kernel_tags;</div><div class='add'>+</div><div class='add'>+DECLARE_STATIC_KEY_FALSE(mem_profiling_compressed);</div><div class='add'>+</div><div class='add'>+typedef u16	pgalloc_tag_idx;</div><div class='add'>+</div><div class='add'>+union pgtag_ref_handle {</div><div class='add'>+	union codetag_ref *ref;	/* reference in page extension */</div><div class='add'>+	struct page *page;	/* reference in page flags */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Reserved indexes */</div><div class='add'>+#define CODETAG_ID_NULL		0</div><div class='add'>+#define CODETAG_ID_EMPTY	1</div><div class='add'>+#define CODETAG_ID_FIRST	2</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+</div><div class='add'>+extern struct alloc_tag_module_section module_tags;</div><div class='add'>+</div><div class='add'>+static inline struct alloc_tag *module_idx_to_tag(pgalloc_tag_idx idx)</div><div class='add'>+{</div><div class='add'>+	return &amp;module_tags.first_tag[idx - kernel_tags.count];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pgalloc_tag_idx module_tag_to_idx(struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	return CODETAG_ID_FIRST + kernel_tags.count + (tag - module_tags.first_tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MODULES */</div><div class='add'>+</div><div class='add'>+static inline struct alloc_tag *module_idx_to_tag(pgalloc_tag_idx idx)</div><div class='add'>+{</div><div class='add'>+	pr_warn("invalid page tag reference %lu\n", (unsigned long)idx);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pgalloc_tag_idx module_tag_to_idx(struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	pr_warn("invalid page tag 0x%lx\n", (unsigned long)tag);</div><div class='add'>+	return CODETAG_ID_NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MODULES */</div><div class='add'>+</div><div class='add'>+static inline void idx_to_ref(pgalloc_tag_idx idx, union codetag_ref *ref)</div><div class='add'>+{</div><div class='add'>+	switch (idx) {</div><div class='add'>+	case (CODETAG_ID_NULL):</div><div class='add'>+		ref-&gt;ct = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case (CODETAG_ID_EMPTY):</div><div class='add'>+		set_codetag_empty(ref);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		idx -= CODETAG_ID_FIRST;</div><div class='add'>+		ref-&gt;ct = idx &lt; kernel_tags.count ?</div><div class='add'>+			&amp;kernel_tags.first_tag[idx].ct :</div><div class='add'>+			&amp;module_idx_to_tag(idx)-&gt;ct;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline pgalloc_tag_idx ref_to_idx(union codetag_ref *ref)</div><div class='add'>+{</div><div class='add'>+	struct alloc_tag *tag;</div><div class='add'>+</div><div class='add'>+	if (!ref-&gt;ct)</div><div class='add'>+		return CODETAG_ID_NULL;</div><div class='add'>+</div><div class='add'>+	if (is_codetag_empty(ref))</div><div class='add'>+		return CODETAG_ID_EMPTY;</div><div class='add'>+</div><div class='add'>+	tag = ct_to_alloc_tag(ref-&gt;ct);</div><div class='add'>+	if (tag &gt;= kernel_tags.first_tag &amp;&amp; tag &lt; kernel_tags.first_tag + kernel_tags.count)</div><div class='add'>+		return CODETAG_ID_FIRST + (tag - kernel_tags.first_tag);</div><div class='add'>+</div><div class='add'>+	return module_tag_to_idx(tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Should be called only if mem_alloc_profiling_enabled() */</div><div class='add'>+static inline bool get_page_tag_ref(struct page *page, union codetag_ref *ref,</div><div class='add'>+				    union pgtag_ref_handle *handle)</div><div class='add'>+{</div><div class='add'>+	if (!page)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (static_key_enabled(&amp;mem_profiling_compressed)) {</div><div class='add'>+		pgalloc_tag_idx idx;</div><div class='add'>+</div><div class='add'>+		idx = (page-&gt;flags.f &gt;&gt; alloc_tag_ref_offs) &amp;</div><div class='add'>+			alloc_tag_ref_mask;</div><div class='add'>+		idx_to_ref(idx, ref);</div><div class='add'>+		handle-&gt;page = page;</div><div class='add'>+	} else {</div><div class='add'>+		struct page_ext *page_ext;</div><div class='add'>+		union codetag_ref *tmp;</div><div class='add'>+</div><div class='add'>+		page_ext = page_ext_get(page);</div><div class='add'>+		if (!page_ext)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		tmp = (union codetag_ref *)page_ext_data(page_ext, &amp;page_alloc_tagging_ops);</div><div class='add'>+		ref-&gt;ct = tmp-&gt;ct;</div><div class='add'>+		handle-&gt;ref = tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void put_page_tag_ref(union pgtag_ref_handle handle)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!handle.ref))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!static_key_enabled(&amp;mem_profiling_compressed))</div><div class='add'>+		page_ext_put((void *)handle.ref - page_alloc_tagging_ops.offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void update_page_tag_ref(union pgtag_ref_handle handle, union codetag_ref *ref)</div><div class='add'>+{</div><div class='add'>+	if (static_key_enabled(&amp;mem_profiling_compressed)) {</div><div class='add'>+		struct page *page = handle.page;</div><div class='add'>+		unsigned long old_flags;</div><div class='add'>+		unsigned long flags;</div><div class='add'>+		unsigned long idx;</div><div class='add'>+</div><div class='add'>+		if (WARN_ON(!page || !ref))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		idx = (unsigned long)ref_to_idx(ref);</div><div class='add'>+		idx = (idx &amp; alloc_tag_ref_mask) &lt;&lt; alloc_tag_ref_offs;</div><div class='add'>+		do {</div><div class='add'>+			old_flags = READ_ONCE(page-&gt;flags.f);</div><div class='add'>+			flags = old_flags;</div><div class='add'>+			flags &amp;= ~(alloc_tag_ref_mask &lt;&lt; alloc_tag_ref_offs);</div><div class='add'>+			flags |= idx;</div><div class='add'>+		} while (unlikely(!try_cmpxchg(&amp;page-&gt;flags.f, &amp;old_flags, flags)));</div><div class='add'>+	} else {</div><div class='add'>+		if (WARN_ON(!handle.ref || !ref))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		handle.ref-&gt;ct = ref-&gt;ct;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Should be called only if mem_alloc_profiling_enabled() */</div><div class='add'>+void __clear_page_tag_ref(struct page *page);</div><div class='add'>+</div><div class='add'>+static inline void clear_page_tag_ref(struct page *page)</div><div class='add'>+{</div><div class='add'>+	if (mem_alloc_profiling_enabled())</div><div class='add'>+		__clear_page_tag_ref(page);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Should be called only if mem_alloc_profiling_enabled() */</div><div class='add'>+static inline struct alloc_tag *__pgalloc_tag_get(struct page *page)</div><div class='add'>+{</div><div class='add'>+	struct alloc_tag *tag = NULL;</div><div class='add'>+	union pgtag_ref_handle handle;</div><div class='add'>+	union codetag_ref ref;</div><div class='add'>+</div><div class='add'>+	if (get_page_tag_ref(page, &amp;ref, &amp;handle)) {</div><div class='add'>+		alloc_tag_sub_check(&amp;ref);</div><div class='add'>+		if (ref.ct)</div><div class='add'>+			tag = ct_to_alloc_tag(ref.ct);</div><div class='add'>+		put_page_tag_ref(handle);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct alloc_tag *pgalloc_tag_get(struct page *page)</div><div class='add'>+{</div><div class='add'>+	if (mem_alloc_profiling_enabled())</div><div class='add'>+		return __pgalloc_tag_get(page);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pgalloc_tag_split(struct folio *folio, int old_order, int new_order);</div><div class='add'>+void pgalloc_tag_swap(struct folio *new, struct folio *old);</div><div class='add'>+</div><div class='add'>+void __init alloc_tag_sec_init(void);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_MEM_ALLOC_PROFILING */</div><div class='add'>+</div><div class='add'>+static inline void clear_page_tag_ref(struct page *page) {}</div><div class='add'>+static inline void alloc_tag_sec_init(void) {}</div><div class='add'>+static inline void pgalloc_tag_split(struct folio *folio, int old_order, int new_order) {}</div><div class='add'>+static inline void pgalloc_tag_swap(struct folio *new, struct folio *old) {}</div><div class='add'>+static inline struct alloc_tag *pgalloc_tag_get(struct page *page) { return NULL; }</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MEM_ALLOC_PROFILING */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_PGALLOC_TAG_H */</div><div class='head'>diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h<br/>index f6d0e3513948..652f287c1ef6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pgtable.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pgtable.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pgtable.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pgtable.h</a></div><div class='hunk'>@@ -50,6 +50,8 @@</div><div class='ctx'> #define pmd_pgtable(pmd) pmd_page(pmd)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define pmd_folio(pmd) page_folio(pmd_page(pmd))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * A page table page can be thought of an array like this: pXd_t[PTRS_PER_PxD]</div><div class='ctx'>  *</div><div class='hunk'>@@ -88,6 +90,27 @@ static inline unsigned long pud_index(unsigned long address)</div><div class='ctx'> #define pgd_index(a)  (((a) &gt;&gt; PGDIR_SHIFT) &amp; (PTRS_PER_PGD - 1))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef kernel_pte_init</div><div class='add'>+static inline void kernel_pte_init(void *addr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#define kernel_pte_init kernel_pte_init</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef pmd_init</div><div class='add'>+static inline void pmd_init(void *addr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#define pmd_init pmd_init</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef pud_init</div><div class='add'>+static inline void pud_init(void *addr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#define pud_init pud_init</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef pte_offset_kernel</div><div class='ctx'> static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)</div><div class='ctx'> {</div><div class='hunk'>@@ -149,9 +172,7 @@ static inline pgd_t *pgd_offset_pgd(pgd_t *pgd, unsigned long address)</div><div class='ctx'>  * a shortcut which implies the use of the kernel's pgd, instead</div><div class='ctx'>  * of a process's</div><div class='ctx'>  */</div><div class='del'>-#ifndef pgd_offset_k</div><div class='ctx'> #define pgd_offset_k(address)		pgd_offset(&amp;init_mm, (address))</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * In many cases it is known that a virtual address is mapped at PMD or PTE</div><div class='hunk'>@@ -201,26 +222,52 @@ static inline int pmd_dirty(pmd_t pmd)</div><div class='ctx'>  * hazard could result in the direct mode hypervisor case, since the actual</div><div class='ctx'>  * write to the page tables may not yet have taken place, so reads though</div><div class='ctx'>  * a raw PTE pointer after it has been modified are not guaranteed to be</div><div class='del'>- * up to date.  This mode can only be entered and left under the protection of</div><div class='del'>- * the page table locks for all page tables which may be modified.  In the UP</div><div class='del'>- * case, this is required so that preemption is disabled, and in the SMP case,</div><div class='del'>- * it must synchronize the delayed page table writes properly on other CPUs.</div><div class='add'>+ * up to date.</div><div class='add'>+ *</div><div class='add'>+ * In the general case, no lock is guaranteed to be held between entry and exit</div><div class='add'>+ * of the lazy mode. So the implementation must assume preemption may be enabled</div><div class='add'>+ * and cpu migration is possible; it must take steps to be robust against this.</div><div class='add'>+ * (In practice, for user PTE updates, the appropriate page table lock(s) are</div><div class='add'>+ * held, but for kernel PTE updates, no lock is held). Nesting is not permitted</div><div class='add'>+ * and the mode cannot be used in interrupt context.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __HAVE_ARCH_ENTER_LAZY_MMU_MODE</div><div class='del'>-#define arch_enter_lazy_mmu_mode()	do {} while (0)</div><div class='del'>-#define arch_leave_lazy_mmu_mode()	do {} while (0)</div><div class='del'>-#define arch_flush_lazy_mmu_mode()	do {} while (0)</div><div class='add'>+static inline void arch_enter_lazy_mmu_mode(void) {}</div><div class='add'>+static inline void arch_leave_lazy_mmu_mode(void) {}</div><div class='add'>+static inline void arch_flush_lazy_mmu_mode(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef set_ptes</div><div class='add'>+#ifndef pte_batch_hint</div><div class='add'>+/**</div><div class='add'>+ * pte_batch_hint - Number of pages that can be added to batch without scanning.</div><div class='add'>+ * @ptep: Page table pointer for the entry.</div><div class='add'>+ * @pte: Page table entry.</div><div class='add'>+ *</div><div class='add'>+ * Some architectures know that a set of contiguous ptes all map the same</div><div class='add'>+ * contiguous memory with the same permissions. In this case, it can provide a</div><div class='add'>+ * hint to aid pte batching without the core code needing to scan every pte.</div><div class='add'>+ *</div><div class='add'>+ * An architecture implementation may ignore the PTE accessed state. Further,</div><div class='add'>+ * the dirty state must apply atomically to all the PTEs described by the hint.</div><div class='add'>+ *</div><div class='add'>+ * May be overridden by the architecture, else pte_batch_hint is always 1.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int pte_batch_hint(pte_t *ptep, pte_t pte)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#ifndef pte_next_pfn</div><div class='del'>-static inline pte_t pte_next_pfn(pte_t pte)</div><div class='add'>+#ifndef pte_advance_pfn</div><div class='add'>+static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr)</div><div class='ctx'> {</div><div class='del'>-	return __pte(pte_val(pte) + (1UL &lt;&lt; PFN_PTE_SHIFT));</div><div class='add'>+	return __pte(pte_val(pte) + (nr &lt;&lt; PFN_PTE_SHIFT));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define pte_next_pfn(pte) pte_advance_pfn(pte, 1)</div><div class='add'>+</div><div class='add'>+#ifndef set_ptes</div><div class='ctx'> /**</div><div class='ctx'>  * set_ptes - Map consecutive pages to a contiguous range of addresses.</div><div class='ctx'>  * @mm: Address space to map the pages into.</div><div class='hunk'>@@ -229,6 +276,10 @@ static inline pte_t pte_next_pfn(pte_t pte)</div><div class='ctx'>  * @pte: Page table entry for the first page.</div><div class='ctx'>  * @nr: Number of pages to map.</div><div class='ctx'>  *</div><div class='add'>+ * When nr==1, initial state of pte may be present or not present, and new state</div><div class='add'>+ * may be present or not present. When nr&gt;1, initial state of all ptes must be</div><div class='add'>+ * not present, and new state must be present.</div><div class='add'>+ *</div><div class='ctx'>  * May be overridden by the architecture, or the architecture can define</div><div class='ctx'>  * set_pte() and PFN_PTE_SHIFT.</div><div class='ctx'>  *</div><div class='hunk'>@@ -240,7 +291,6 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> {</div><div class='ctx'> 	page_table_check_ptes_set(mm, ptep, pte, nr);</div><div class='ctx'> </div><div class='del'>-	arch_enter_lazy_mmu_mode();</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		set_pte(ptep, pte);</div><div class='ctx'> 		if (--nr == 0)</div><div class='hunk'>@@ -248,7 +298,6 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 		ptep++;</div><div class='ctx'> 		pte = pte_next_pfn(pte);</div><div class='ctx'> 	}</div><div class='del'>-	arch_leave_lazy_mmu_mode();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1)</div><div class='hunk'>@@ -407,6 +456,17 @@ static inline bool arch_has_hw_pte_young(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef exec_folio_order</div><div class='add'>+/*</div><div class='add'>+ * Returns preferred minimum folio order for executable file-backed memory. Must</div><div class='add'>+ * be in range [0, PMD_ORDER). Default to order-0.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int exec_folio_order(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef arch_check_zapped_pte</div><div class='ctx'> static inline void arch_check_zapped_pte(struct vm_area_struct *vma,</div><div class='ctx'> 					 pte_t pte)</div><div class='hunk'>@@ -421,6 +481,12 @@ static inline void arch_check_zapped_pmd(struct vm_area_struct *vma,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef arch_check_zapped_pud</div><div class='add'>+static inline void arch_check_zapped_pud(struct vm_area_struct *vma, pud_t pud)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR</div><div class='ctx'> static inline pte_t ptep_get_and_clear(struct mm_struct *mm,</div><div class='ctx'> 				       unsigned long address,</div><div class='hunk'>@@ -433,10 +499,61 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef clear_young_dirty_ptes</div><div class='add'>+/**</div><div class='add'>+ * clear_young_dirty_ptes - Mark PTEs that map consecutive pages of the</div><div class='add'>+ *		same folio as old/clean.</div><div class='add'>+ * @mm: Address space the pages are mapped into.</div><div class='add'>+ * @addr: Address the first page is mapped at.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @nr: Number of entries to mark old/clean.</div><div class='add'>+ * @flags: Flags to modify the PTE batch semantics.</div><div class='add'>+ *</div><div class='add'>+ * May be overridden by the architecture; otherwise, implemented by</div><div class='add'>+ * get_and_clear/modify/set for each pte in the range.</div><div class='add'>+ *</div><div class='add'>+ * Note that PTE bits in the PTE range besides the PFN can differ. For example,</div><div class='add'>+ * some PTEs might be write-protected.</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock.  The PTEs map consecutive</div><div class='add'>+ * pages that belong to the same folio.  The PTEs are all in the same PMD.</div><div class='add'>+ */</div><div class='add'>+static inline void clear_young_dirty_ptes(struct vm_area_struct *vma,</div><div class='add'>+					  unsigned long addr, pte_t *ptep,</div><div class='add'>+					  unsigned int nr, cydp_t flags)</div><div class='add'>+{</div><div class='add'>+	pte_t pte;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (flags == CYDP_CLEAR_YOUNG)</div><div class='add'>+			ptep_test_and_clear_young(vma, addr, ptep);</div><div class='add'>+		else {</div><div class='add'>+			pte = ptep_get_and_clear(vma-&gt;vm_mm, addr, ptep);</div><div class='add'>+			if (flags &amp; CYDP_CLEAR_YOUNG)</div><div class='add'>+				pte = pte_mkold(pte);</div><div class='add'>+			if (flags &amp; CYDP_CLEAR_DIRTY)</div><div class='add'>+				pte = pte_mkclean(pte);</div><div class='add'>+			set_pte_at(vma-&gt;vm_mm, addr, ptep, pte);</div><div class='add'>+		}</div><div class='add'>+		if (--nr == 0)</div><div class='add'>+			break;</div><div class='add'>+		ptep++;</div><div class='add'>+		addr += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void ptep_clear(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> 			      pte_t *ptep)</div><div class='ctx'> {</div><div class='del'>-	ptep_get_and_clear(mm, addr, ptep);</div><div class='add'>+	pte_t pte = ptep_get(ptep);</div><div class='add'>+</div><div class='add'>+	pte_clear(mm, addr, ptep);</div><div class='add'>+	/*</div><div class='add'>+	 * No need for ptep_get_and_clear(): page table check doesn't care about</div><div class='add'>+	 * any bits that could have been set by HW concurrently.</div><div class='add'>+	 */</div><div class='add'>+	page_table_check_pte_clear(mm, pte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_GUP_GET_PXX_LOW_HIGH</div><div class='hunk'>@@ -580,6 +697,121 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef get_and_clear_full_ptes</div><div class='add'>+/**</div><div class='add'>+ * get_and_clear_full_ptes - Clear present PTEs that map consecutive pages of</div><div class='add'>+ *			     the same folio, collecting dirty/accessed bits.</div><div class='add'>+ * @mm: Address space the pages are mapped into.</div><div class='add'>+ * @addr: Address the first page is mapped at.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @nr: Number of entries to clear.</div><div class='add'>+ * @full: Whether we are clearing a full mm.</div><div class='add'>+ *</div><div class='add'>+ * May be overridden by the architecture; otherwise, implemented as a simple</div><div class='add'>+ * loop over ptep_get_and_clear_full(), merging dirty/accessed bits into the</div><div class='add'>+ * returned PTE.</div><div class='add'>+ *</div><div class='add'>+ * Note that PTE bits in the PTE range besides the PFN can differ. For example,</div><div class='add'>+ * some PTEs might be write-protected.</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock.  The PTEs map consecutive</div><div class='add'>+ * pages that belong to the same folio.  The PTEs are all in the same PMD.</div><div class='add'>+ */</div><div class='add'>+static inline pte_t get_and_clear_full_ptes(struct mm_struct *mm,</div><div class='add'>+		unsigned long addr, pte_t *ptep, unsigned int nr, int full)</div><div class='add'>+{</div><div class='add'>+	pte_t pte, tmp_pte;</div><div class='add'>+</div><div class='add'>+	pte = ptep_get_and_clear_full(mm, addr, ptep, full);</div><div class='add'>+	while (--nr) {</div><div class='add'>+		ptep++;</div><div class='add'>+		addr += PAGE_SIZE;</div><div class='add'>+		tmp_pte = ptep_get_and_clear_full(mm, addr, ptep, full);</div><div class='add'>+		if (pte_dirty(tmp_pte))</div><div class='add'>+			pte = pte_mkdirty(pte);</div><div class='add'>+		if (pte_young(tmp_pte))</div><div class='add'>+			pte = pte_mkyoung(pte);</div><div class='add'>+	}</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * get_and_clear_ptes - Clear present PTEs that map consecutive pages of</div><div class='add'>+ *			the same folio, collecting dirty/accessed bits.</div><div class='add'>+ * @mm: Address space the pages are mapped into.</div><div class='add'>+ * @addr: Address the first page is mapped at.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @nr: Number of entries to clear.</div><div class='add'>+ *</div><div class='add'>+ * Use this instead of get_and_clear_full_ptes() if it is known that we don't</div><div class='add'>+ * need to clear the full mm, which is mostly the case.</div><div class='add'>+ *</div><div class='add'>+ * Note that PTE bits in the PTE range besides the PFN can differ. For example,</div><div class='add'>+ * some PTEs might be write-protected.</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock.  The PTEs map consecutive</div><div class='add'>+ * pages that belong to the same folio.  The PTEs are all in the same PMD.</div><div class='add'>+ */</div><div class='add'>+static inline pte_t get_and_clear_ptes(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+		pte_t *ptep, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	return get_and_clear_full_ptes(mm, addr, ptep, nr, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef clear_full_ptes</div><div class='add'>+/**</div><div class='add'>+ * clear_full_ptes - Clear present PTEs that map consecutive pages of the same</div><div class='add'>+ *		     folio.</div><div class='add'>+ * @mm: Address space the pages are mapped into.</div><div class='add'>+ * @addr: Address the first page is mapped at.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @nr: Number of entries to clear.</div><div class='add'>+ * @full: Whether we are clearing a full mm.</div><div class='add'>+ *</div><div class='add'>+ * May be overridden by the architecture; otherwise, implemented as a simple</div><div class='add'>+ * loop over ptep_get_and_clear_full().</div><div class='add'>+ *</div><div class='add'>+ * Note that PTE bits in the PTE range besides the PFN can differ. For example,</div><div class='add'>+ * some PTEs might be write-protected.</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock.  The PTEs map consecutive</div><div class='add'>+ * pages that belong to the same folio.  The PTEs are all in the same PMD.</div><div class='add'>+ */</div><div class='add'>+static inline void clear_full_ptes(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+		pte_t *ptep, unsigned int nr, int full)</div><div class='add'>+{</div><div class='add'>+	for (;;) {</div><div class='add'>+		ptep_get_and_clear_full(mm, addr, ptep, full);</div><div class='add'>+		if (--nr == 0)</div><div class='add'>+			break;</div><div class='add'>+		ptep++;</div><div class='add'>+		addr += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clear_ptes - Clear present PTEs that map consecutive pages of the same folio.</div><div class='add'>+ * @mm: Address space the pages are mapped into.</div><div class='add'>+ * @addr: Address the first page is mapped at.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @nr: Number of entries to clear.</div><div class='add'>+ *</div><div class='add'>+ * Use this instead of clear_full_ptes() if it is known that we don't need to</div><div class='add'>+ * clear the full mm, which is mostly the case.</div><div class='add'>+ *</div><div class='add'>+ * Note that PTE bits in the PTE range besides the PFN can differ. For example,</div><div class='add'>+ * some PTEs might be write-protected.</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock.  The PTEs map consecutive</div><div class='add'>+ * pages that belong to the same folio.  The PTEs are all in the same PMD.</div><div class='add'>+ */</div><div class='add'>+static inline void clear_ptes(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+		pte_t *ptep, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	clear_full_ptes(mm, addr, ptep, nr, 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If two threads concurrently fault at the same page, the thread that</div><div class='hunk'>@@ -589,13 +821,18 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,</div><div class='ctx'>  * fault. This function updates TLB only, do nothing with cache or others.</div><div class='ctx'>  * It is the difference with function update_mmu_cache.</div><div class='ctx'>  */</div><div class='del'>-#ifndef __HAVE_ARCH_UPDATE_MMU_TLB</div><div class='add'>+#ifndef update_mmu_tlb_range</div><div class='add'>+static inline void update_mmu_tlb_range(struct vm_area_struct *vma,</div><div class='add'>+				unsigned long address, pte_t *ptep, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline void update_mmu_tlb(struct vm_area_struct *vma,</div><div class='ctx'> 				unsigned long address, pte_t *ptep)</div><div class='ctx'> {</div><div class='add'>+	update_mmu_tlb_range(vma, address, ptep, 1);</div><div class='ctx'> }</div><div class='del'>-#define __HAVE_ARCH_UPDATE_MMU_TLB</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some architectures may be able to avoid expensive synchronization</div><div class='hunk'>@@ -612,6 +849,35 @@ static inline void pte_clear_not_present_full(struct mm_struct *mm,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef clear_not_present_full_ptes</div><div class='add'>+/**</div><div class='add'>+ * clear_not_present_full_ptes - Clear multiple not present PTEs which are</div><div class='add'>+ *				 consecutive in the pgtable.</div><div class='add'>+ * @mm: Address space the ptes represent.</div><div class='add'>+ * @addr: Address of the first pte.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @nr: Number of entries to clear.</div><div class='add'>+ * @full: Whether we are clearing a full mm.</div><div class='add'>+ *</div><div class='add'>+ * May be overridden by the architecture; otherwise, implemented as a simple</div><div class='add'>+ * loop over pte_clear_not_present_full().</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock.  The PTEs are all not present.</div><div class='add'>+ * The PTEs are all in the same PMD.</div><div class='add'>+ */</div><div class='add'>+static inline void clear_not_present_full_ptes(struct mm_struct *mm,</div><div class='add'>+		unsigned long addr, pte_t *ptep, unsigned int nr, int full)</div><div class='add'>+{</div><div class='add'>+	for (;;) {</div><div class='add'>+		pte_clear_not_present_full(mm, addr, ptep, full);</div><div class='add'>+		if (--nr == 0)</div><div class='add'>+			break;</div><div class='add'>+		ptep++;</div><div class='add'>+		addr += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef __HAVE_ARCH_PTEP_CLEAR_FLUSH</div><div class='ctx'> extern pte_t ptep_clear_flush(struct vm_area_struct *vma,</div><div class='ctx'> 			      unsigned long address,</div><div class='hunk'>@@ -650,6 +916,37 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef wrprotect_ptes</div><div class='add'>+/**</div><div class='add'>+ * wrprotect_ptes - Write-protect PTEs that map consecutive pages of the same</div><div class='add'>+ *		    folio.</div><div class='add'>+ * @mm: Address space the pages are mapped into.</div><div class='add'>+ * @addr: Address the first page is mapped at.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @nr: Number of entries to write-protect.</div><div class='add'>+ *</div><div class='add'>+ * May be overridden by the architecture; otherwise, implemented as a simple</div><div class='add'>+ * loop over ptep_set_wrprotect().</div><div class='add'>+ *</div><div class='add'>+ * Note that PTE bits in the PTE range besides the PFN can differ. For example,</div><div class='add'>+ * some PTEs might be write-protected.</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock.  The PTEs map consecutive</div><div class='add'>+ * pages that belong to the same folio.  The PTEs are all in the same PMD.</div><div class='add'>+ */</div><div class='add'>+static inline void wrprotect_ptes(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+		pte_t *ptep, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	for (;;) {</div><div class='add'>+		ptep_set_wrprotect(mm, addr, ptep);</div><div class='add'>+		if (--nr == 0)</div><div class='add'>+			break;</div><div class='add'>+		ptep++;</div><div class='add'>+		addr += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * On some architectures hardware does not set page access bit when accessing</div><div class='ctx'>  * memory page, it is responsibility of software setting this bit. It brings</div><div class='hunk'>@@ -845,45 +1142,16 @@ static inline int pgd_same(pgd_t pgd_a, pgd_t pgd_b)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Use set_p*_safe(), and elide TLB flushing, when confident that *no*</div><div class='del'>- * TLB flush will be required as a result of the "set". For example, use</div><div class='del'>- * in scenarios where it is known ahead of time that the routine is</div><div class='del'>- * setting non-present entries, or re-setting an existing entry to the</div><div class='del'>- * same value. Otherwise, use the typical "set" helpers and flush the</div><div class='del'>- * TLB.</div><div class='del'>- */</div><div class='del'>-#define set_pte_safe(ptep, pte) \</div><div class='del'>-({ \</div><div class='del'>-	WARN_ON_ONCE(pte_present(*ptep) &amp;&amp; !pte_same(*ptep, pte)); \</div><div class='del'>-	set_pte(ptep, pte); \</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define set_pmd_safe(pmdp, pmd) \</div><div class='del'>-({ \</div><div class='del'>-	WARN_ON_ONCE(pmd_present(*pmdp) &amp;&amp; !pmd_same(*pmdp, pmd)); \</div><div class='del'>-	set_pmd(pmdp, pmd); \</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define set_pud_safe(pudp, pud) \</div><div class='del'>-({ \</div><div class='del'>-	WARN_ON_ONCE(pud_present(*pudp) &amp;&amp; !pud_same(*pudp, pud)); \</div><div class='del'>-	set_pud(pudp, pud); \</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define set_p4d_safe(p4dp, p4d) \</div><div class='del'>-({ \</div><div class='del'>-	WARN_ON_ONCE(p4d_present(*p4dp) &amp;&amp; !p4d_same(*p4dp, p4d)); \</div><div class='del'>-	set_p4d(p4dp, p4d); \</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define set_pgd_safe(pgdp, pgd) \</div><div class='del'>-({ \</div><div class='del'>-	WARN_ON_ONCE(pgd_present(*pgdp) &amp;&amp; !pgd_same(*pgdp, pgd)); \</div><div class='del'>-	set_pgd(pgdp, pgd); \</div><div class='del'>-})</div><div class='del'>-</div><div class='ctx'> #ifndef __HAVE_ARCH_DO_SWAP_PAGE</div><div class='add'>+static inline void arch_do_swap_page_nr(struct mm_struct *mm,</div><div class='add'>+				     struct vm_area_struct *vma,</div><div class='add'>+				     unsigned long addr,</div><div class='add'>+				     pte_t pte, pte_t oldpte,</div><div class='add'>+				     int nr)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+#else</div><div class='ctx'> /*</div><div class='ctx'>  * Some architectures support metadata associated with a page. When a</div><div class='ctx'>  * page is being swapped out, this metadata must be saved so it can be</div><div class='hunk'>@@ -892,12 +1160,17 @@ static inline int pgd_same(pgd_t pgd_a, pgd_t pgd_b)</div><div class='ctx'>  * page as metadata for the page. arch_do_swap_page() can restore this</div><div class='ctx'>  * metadata when a page is swapped back in.</div><div class='ctx'>  */</div><div class='del'>-static inline void arch_do_swap_page(struct mm_struct *mm,</div><div class='del'>-				     struct vm_area_struct *vma,</div><div class='del'>-				     unsigned long addr,</div><div class='del'>-				     pte_t pte, pte_t oldpte)</div><div class='del'>-{</div><div class='del'>-</div><div class='add'>+static inline void arch_do_swap_page_nr(struct mm_struct *mm,</div><div class='add'>+					struct vm_area_struct *vma,</div><div class='add'>+					unsigned long addr,</div><div class='add'>+					pte_t pte, pte_t oldpte,</div><div class='add'>+					int nr)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; nr; i++) {</div><div class='add'>+		arch_do_swap_page(vma-&gt;vm_mm, vma, addr + i * PAGE_SIZE,</div><div class='add'>+				pte_advance_pfn(pte, i),</div><div class='add'>+				pte_advance_pfn(oldpte, i));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -925,7 +1198,7 @@ static inline int arch_unmap_one(struct mm_struct *mm,</div><div class='ctx'>  * prototypes must be defined in the arch-specific asm/pgtable.h file.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __HAVE_ARCH_PREPARE_TO_SWAP</div><div class='del'>-static inline int arch_prepare_to_swap(struct page *page)</div><div class='add'>+static inline int arch_prepare_to_swap(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -947,12 +1220,8 @@ static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef __HAVE_ARCH_PGD_OFFSET_GATE</div><div class='del'>-#define pgd_offset_gate(mm, addr)	pgd_offset(mm, addr)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef __HAVE_ARCH_MOVE_PTE</div><div class='del'>-#define move_pte(pte, prot, old_addr, new_addr)	(pte)</div><div class='add'>+#define move_pte(pte, old_addr, new_addr)	(pte)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef pte_accessible</div><div class='hunk'>@@ -963,6 +1232,10 @@ static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio)</div><div class='ctx'> #define flush_tlb_fix_spurious_fault(vma, address, ptep) flush_tlb_page(vma, address)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef flush_tlb_fix_spurious_fault_pmd</div><div class='add'>+#define flush_tlb_fix_spurious_fault_pmd(vma, address, pmdp) do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * When walking page tables, get the address of the next boundary,</div><div class='ctx'>  * or the end address of the range if that comes earlier.  Although no</div><div class='hunk'>@@ -1107,7 +1380,9 @@ static inline pte_t ptep_modify_prot_start(struct vm_area_struct *vma,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Commit an update to a pte, leaving any hardware-controlled bits in</div><div class='del'>- * the PTE unmodified.</div><div class='add'>+ * the PTE unmodified. The pte returned from ptep_modify_prot_start() may</div><div class='add'>+ * additionally have young and/or dirty bits set where previously they were not,</div><div class='add'>+ * so the updated pte may have these additional changes.</div><div class='ctx'>  */</div><div class='ctx'> static inline void ptep_modify_prot_commit(struct vm_area_struct *vma,</div><div class='ctx'> 					   unsigned long addr,</div><div class='hunk'>@@ -1116,6 +1391,102 @@ static inline void ptep_modify_prot_commit(struct vm_area_struct *vma,</div><div class='ctx'> 	__ptep_modify_prot_commit(vma, addr, ptep, pte);</div><div class='ctx'> }</div><div class='ctx'> #endif /* __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * modify_prot_start_ptes - Start a pte protection read-modify-write transaction</div><div class='add'>+ * over a batch of ptes, which protects against asynchronous hardware</div><div class='add'>+ * modifications to the ptes. The intention is not to prevent the hardware from</div><div class='add'>+ * making pte updates, but to prevent any updates it may make from being lost.</div><div class='add'>+ * Please see the comment above ptep_modify_prot_start() for full description.</div><div class='add'>+ *</div><div class='add'>+ * @vma: The virtual memory area the pages are mapped into.</div><div class='add'>+ * @addr: Address the first page is mapped at.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @nr: Number of entries.</div><div class='add'>+ *</div><div class='add'>+ * May be overridden by the architecture; otherwise, implemented as a simple</div><div class='add'>+ * loop over ptep_modify_prot_start(), collecting the a/d bits from each pte</div><div class='add'>+ * in the batch.</div><div class='add'>+ *</div><div class='add'>+ * Note that PTE bits in the PTE batch besides the PFN can differ.</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock.  The PTEs map consecutive</div><div class='add'>+ * pages that belong to the same folio. All other PTE bits must be identical for</div><div class='add'>+ * all PTEs in the batch except for young and dirty bits.  The PTEs are all in</div><div class='add'>+ * the same PMD.</div><div class='add'>+ */</div><div class='add'>+#ifndef modify_prot_start_ptes</div><div class='add'>+static inline pte_t modify_prot_start_ptes(struct vm_area_struct *vma,</div><div class='add'>+		unsigned long addr, pte_t *ptep, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	pte_t pte, tmp_pte;</div><div class='add'>+</div><div class='add'>+	pte = ptep_modify_prot_start(vma, addr, ptep);</div><div class='add'>+	while (--nr) {</div><div class='add'>+		ptep++;</div><div class='add'>+		addr += PAGE_SIZE;</div><div class='add'>+		tmp_pte = ptep_modify_prot_start(vma, addr, ptep);</div><div class='add'>+		if (pte_dirty(tmp_pte))</div><div class='add'>+			pte = pte_mkdirty(pte);</div><div class='add'>+		if (pte_young(tmp_pte))</div><div class='add'>+			pte = pte_mkyoung(pte);</div><div class='add'>+	}</div><div class='add'>+	return pte;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * modify_prot_commit_ptes - Commit an update to a batch of ptes, leaving any</div><div class='add'>+ * hardware-controlled bits in the PTE unmodified.</div><div class='add'>+ *</div><div class='add'>+ * @vma: The virtual memory area the pages are mapped into.</div><div class='add'>+ * @addr: Address the first page is mapped at.</div><div class='add'>+ * @ptep: Page table pointer for the first entry.</div><div class='add'>+ * @old_pte: Old page table entry (for the first entry) which is now cleared.</div><div class='add'>+ * @pte: New page table entry to be set.</div><div class='add'>+ * @nr: Number of entries.</div><div class='add'>+ *</div><div class='add'>+ * May be overridden by the architecture; otherwise, implemented as a simple</div><div class='add'>+ * loop over ptep_modify_prot_commit().</div><div class='add'>+ *</div><div class='add'>+ * Context: The caller holds the page table lock. The PTEs are all in the same</div><div class='add'>+ * PMD. On exit, the set ptes in the batch map the same folio. The ptes set by</div><div class='add'>+ * ptep_modify_prot_start() may additionally have young and/or dirty bits set</div><div class='add'>+ * where previously they were not, so the updated ptes may have these</div><div class='add'>+ * additional changes.</div><div class='add'>+ */</div><div class='add'>+#ifndef modify_prot_commit_ptes</div><div class='add'>+static inline void modify_prot_commit_ptes(struct vm_area_struct *vma, unsigned long addr,</div><div class='add'>+		pte_t *ptep, pte_t old_pte, pte_t pte, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr; ++i, ++ptep, addr += PAGE_SIZE) {</div><div class='add'>+		ptep_modify_prot_commit(vma, addr, ptep, old_pte, pte);</div><div class='add'>+</div><div class='add'>+		/* Advance PFN only, set same prot */</div><div class='add'>+		old_pte = pte_next_pfn(old_pte);</div><div class='add'>+		pte = pte_next_pfn(pte);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Architectures can set this mask to a combination of PGTBL_P?D_MODIFIED values</div><div class='add'>+ * and let generic vmalloc, ioremap and page table update code know when</div><div class='add'>+ * arch_sync_kernel_mappings() needs to be called.</div><div class='add'>+ */</div><div class='add'>+#ifndef ARCH_PAGE_TABLE_SYNC_MASK</div><div class='add'>+#define ARCH_PAGE_TABLE_SYNC_MASK 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * There is no default implementation for arch_sync_kernel_mappings(). It is</div><div class='add'>+ * relied upon the compiler to optimize calls out if ARCH_PAGE_TABLE_SYNC_MASK</div><div class='add'>+ * is 0.</div><div class='add'>+ */</div><div class='add'>+void arch_sync_kernel_mappings(unsigned long start, unsigned long end);</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1186,6 +1557,18 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)</div><div class='ctx'> #define arch_start_context_switch(prev)	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Some platforms can customize the PTE soft-dirty bit making it unavailable</div><div class='add'>+ * even if the architecture provides the resource.</div><div class='add'>+ * Adding this API allows architectures to add their own checks for the</div><div class='add'>+ * devices on which the kernel is running.</div><div class='add'>+ * Note: When overriding it, please make sure the CONFIG_MEM_SOFT_DIRTY</div><div class='add'>+ * is part of this macro.</div><div class='add'>+ */</div><div class='add'>+#ifndef pgtable_supports_soft_dirty</div><div class='add'>+#define pgtable_supports_soft_dirty()	IS_ENABLED(CONFIG_MEM_SOFT_DIRTY)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY</div><div class='ctx'> #ifndef CONFIG_ARCH_ENABLE_THP_MIGRATION</div><div class='ctx'> static inline pmd_t pmd_swp_mksoft_dirty(pmd_t pmd)</div><div class='hunk'>@@ -1272,64 +1655,92 @@ static inline pmd_t pmd_swp_clear_soft_dirty(pmd_t pmd)</div><div class='ctx'>  * vmf_insert_pfn.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * track_pfn_remap is called when a _new_ pfn mapping is being established</div><div class='del'>- * by remap_pfn_range() for physical range indicated by pfn and size.</div><div class='del'>- */</div><div class='del'>-static inline int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot,</div><div class='del'>-				  unsigned long pfn, unsigned long addr,</div><div class='del'>-				  unsigned long size)</div><div class='add'>+static inline int pfnmap_setup_cachemode(unsigned long pfn, unsigned long size,</div><div class='add'>+		pgprot_t *prot)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * track_pfn_insert is called when a _new_ single pfn is established</div><div class='del'>- * by vmf_insert_pfn().</div><div class='del'>- */</div><div class='del'>-static inline void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,</div><div class='del'>-				    pfn_t pfn)</div><div class='add'>+static inline int pfnmap_track(unsigned long pfn, unsigned long size,</div><div class='add'>+		pgprot_t *prot)</div><div class='ctx'> {</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * track_pfn_copy is called when vma that is covering the pfnmap gets</div><div class='del'>- * copied through copy_page_range().</div><div class='del'>- */</div><div class='del'>-static inline int track_pfn_copy(struct vm_area_struct *vma)</div><div class='add'>+static inline void pfnmap_untrack(unsigned long pfn, unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+/**</div><div class='add'>+ * pfnmap_setup_cachemode - setup the cachemode in the pgprot for a pfn range</div><div class='add'>+ * @pfn: the start of the pfn range</div><div class='add'>+ * @size: the size of the pfn range in bytes</div><div class='add'>+ * @prot: the pgprot to modify</div><div class='add'>+ *</div><div class='add'>+ * Lookup the cachemode for the pfn range starting at @pfn with the size</div><div class='add'>+ * @size and store it in @prot, leaving other data in @prot unchanged.</div><div class='add'>+ *</div><div class='add'>+ * This allows for a hardware implementation to have fine-grained control of</div><div class='add'>+ * memory cache behavior at page level granularity. Without a hardware</div><div class='add'>+ * implementation, this function does nothing.</div><div class='add'>+ *</div><div class='add'>+ * Currently there is only one implementation for this - x86 Page Attribute</div><div class='add'>+ * Table (PAT). See Documentation/arch/x86/pat.rst for more details.</div><div class='add'>+ *</div><div class='add'>+ * This function can fail if the pfn range spans pfns that require differing</div><div class='add'>+ * cachemodes. If the pfn range was previously verified to have a single</div><div class='add'>+ * cachemode, it is sufficient to query only a single pfn. The assumption is</div><div class='add'>+ * that this is the case for drivers using the vmf_insert_pfn*() interface.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success and -EINVAL on error.</div><div class='add'>+ */</div><div class='add'>+int pfnmap_setup_cachemode(unsigned long pfn, unsigned long size,</div><div class='add'>+		pgprot_t *prot);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * untrack_pfn is called while unmapping a pfnmap for a region.</div><div class='del'>- * untrack can be called for a specific region indicated by pfn and size or</div><div class='del'>- * can be for the entire vma (in which case pfn, size are zero).</div><div class='add'>+/**</div><div class='add'>+ * pfnmap_track - track a pfn range</div><div class='add'>+ * @pfn: the start of the pfn range</div><div class='add'>+ * @size: the size of the pfn range in bytes</div><div class='add'>+ * @prot: the pgprot to track</div><div class='add'>+ *</div><div class='add'>+ * Requested the pfn range to be 'tracked' by a hardware implementation and</div><div class='add'>+ * setup the cachemode in @prot similar to pfnmap_setup_cachemode().</div><div class='add'>+ *</div><div class='add'>+ * This allows for fine-grained control of memory cache behaviour at page</div><div class='add'>+ * level granularity. Tracking memory this way is persisted across VMA splits</div><div class='add'>+ * (VMA merging does not apply for VM_PFNMAP).</div><div class='add'>+ *</div><div class='add'>+ * Currently, there is only one implementation for this - x86 Page Attribute</div><div class='add'>+ * Table (PAT). See Documentation/arch/x86/pat.rst for more details.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success and -EINVAL on error.</div><div class='ctx'>  */</div><div class='del'>-static inline void untrack_pfn(struct vm_area_struct *vma,</div><div class='del'>-			       unsigned long pfn, unsigned long size,</div><div class='del'>-			       bool mm_wr_locked)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+int pfnmap_track(unsigned long pfn, unsigned long size, pgprot_t *prot);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * untrack_pfn_clear is called while mremapping a pfnmap for a new region</div><div class='del'>- * or fails to copy pgtable during duplicate vm area.</div><div class='add'>+/**</div><div class='add'>+ * pfnmap_untrack - untrack a pfn range</div><div class='add'>+ * @pfn: the start of the pfn range</div><div class='add'>+ * @size: the size of the pfn range in bytes</div><div class='add'>+ *</div><div class='add'>+ * Untrack a pfn range previously tracked through pfnmap_track().</div><div class='add'>+ */</div><div class='add'>+void pfnmap_untrack(unsigned long pfn, unsigned long size);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pfnmap_setup_cachemode_pfn - setup the cachemode in the pgprot for a pfn</div><div class='add'>+ * @pfn: the pfn</div><div class='add'>+ * @prot: the pgprot to modify</div><div class='add'>+ *</div><div class='add'>+ * Lookup the cachemode for @pfn and store it in @prot, leaving other</div><div class='add'>+ * data in @prot unchanged.</div><div class='add'>+ *</div><div class='add'>+ * See pfnmap_setup_cachemode() for details.</div><div class='ctx'>  */</div><div class='del'>-static inline void untrack_pfn_clear(struct vm_area_struct *vma)</div><div class='add'>+static inline void pfnmap_setup_cachemode_pfn(unsigned long pfn, pgprot_t *prot)</div><div class='ctx'> {</div><div class='add'>+	pfnmap_setup_cachemode(pfn, PAGE_SIZE, prot);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-extern int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot,</div><div class='del'>-			   unsigned long pfn, unsigned long addr,</div><div class='del'>-			   unsigned long size);</div><div class='del'>-extern void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,</div><div class='del'>-			     pfn_t pfn);</div><div class='del'>-extern int track_pfn_copy(struct vm_area_struct *vma);</div><div class='del'>-extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,</div><div class='del'>-			unsigned long size, bool mm_wr_locked);</div><div class='del'>-extern void untrack_pfn_clear(struct vm_area_struct *vma);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> #ifdef __HAVE_COLOR_ZERO_PAGE</div><div class='hunk'>@@ -1391,21 +1802,6 @@ static inline int pud_write(pud_t pud)</div><div class='ctx'> }</div><div class='ctx'> #endif /* pud_write */</div><div class='ctx'> </div><div class='del'>-#if !defined(CONFIG_ARCH_HAS_PTE_DEVMAP) || !defined(CONFIG_TRANSPARENT_HUGEPAGE)</div><div class='del'>-static inline int pmd_devmap(pmd_t pmd)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline int pud_devmap(pud_t pud)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline int pgd_devmap(pgd_t pgd)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if !defined(CONFIG_TRANSPARENT_HUGEPAGE) || \</div><div class='ctx'> 	!defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)</div><div class='ctx'> static inline int pud_trans_huge(pud_t pud)</div><div class='hunk'>@@ -1420,7 +1816,7 @@ static inline int pud_trans_unstable(pud_t *pud)</div><div class='ctx'> 	defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD)</div><div class='ctx'> 	pud_t pudval = READ_ONCE(*pud);</div><div class='ctx'> </div><div class='del'>-	if (pud_none(pudval) || pud_trans_huge(pudval) || pud_devmap(pudval))</div><div class='add'>+	if (pud_none(pudval) || pud_trans_huge(pudval))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (unlikely(pud_bad(pudval))) {</div><div class='ctx'> 		pud_clear_bad(pud);</div><div class='hunk'>@@ -1574,10 +1970,11 @@ static inline bool arch_has_pfn_modify_check(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Page Table Modification bits for pgtbl_mod_mask.</div><div class='ctx'>  *</div><div class='del'>- * These are used by the p?d_alloc_track*() set of functions an in the generic</div><div class='del'>- * vmalloc/ioremap code to track at which page-table levels entries have been</div><div class='del'>- * modified. Based on that the code can better decide when vmalloc and ioremap</div><div class='del'>- * mapping changes need to be synchronized to other page-tables in the system.</div><div class='add'>+ * These are used by the p?d_alloc_track*() and p*d_populate_kernel()</div><div class='add'>+ * functions in the generic vmalloc, ioremap and page table update code</div><div class='add'>+ * to track at which page-table levels entries have been modified.</div><div class='add'>+ * Based on that the code can better decide when page table changes need</div><div class='add'>+ * to be synchronized to other page-tables in the system.</div><div class='ctx'>  */</div><div class='ctx'> #define		__PGTBL_PGD_MODIFIED	0</div><div class='ctx'> #define		__PGTBL_P4D_MODIFIED	1</div><div class='hunk'>@@ -1594,6 +1991,32 @@ static inline bool arch_has_pfn_modify_check(void)</div><div class='ctx'> /* Page-Table Modification Mask */</div><div class='ctx'> typedef unsigned int pgtbl_mod_mask;</div><div class='ctx'> </div><div class='add'>+enum pgtable_level {</div><div class='add'>+	PGTABLE_LEVEL_PTE = 0,</div><div class='add'>+	PGTABLE_LEVEL_PMD,</div><div class='add'>+	PGTABLE_LEVEL_PUD,</div><div class='add'>+	PGTABLE_LEVEL_P4D,</div><div class='add'>+	PGTABLE_LEVEL_PGD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline const char *pgtable_level_to_str(enum pgtable_level level)</div><div class='add'>+{</div><div class='add'>+	switch (level) {</div><div class='add'>+	case PGTABLE_LEVEL_PTE:</div><div class='add'>+		return "pte";</div><div class='add'>+	case PGTABLE_LEVEL_PMD:</div><div class='add'>+		return "pmd";</div><div class='add'>+	case PGTABLE_LEVEL_PUD:</div><div class='add'>+		return "pud";</div><div class='add'>+	case PGTABLE_LEVEL_P4D:</div><div class='add'>+		return "p4d";</div><div class='add'>+	case PGTABLE_LEVEL_PGD:</div><div class='add'>+		return "pgd";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* !__ASSEMBLY__ */</div><div class='ctx'> </div><div class='ctx'> #if !defined(MAX_POSSIBLE_PHYSMEM_BITS) &amp;&amp; !defined(CONFIG_64BIT)</div><div class='hunk'>@@ -1643,23 +2066,37 @@ typedef unsigned int pgtbl_mod_mask;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * p?d_leaf() - true if this entry is a final mapping to a physical address.</div><div class='del'>- * This differs from p?d_huge() by the fact that they are always available (if</div><div class='del'>- * the architecture supports large pages at the appropriate level) even</div><div class='del'>- * if CONFIG_HUGETLB_PAGE is not defined.</div><div class='del'>- * Only meaningful when called on a valid entry.</div><div class='add'>+ * pXd_leaf() is the API to check whether a pgtable entry is a huge page</div><div class='add'>+ * mapping.  It should work globally across all archs, without any</div><div class='add'>+ * dependency on CONFIG_* options.  For architectures that do not support</div><div class='add'>+ * huge mappings on specific levels, below fallbacks will be used.</div><div class='add'>+ *</div><div class='add'>+ * A leaf pgtable entry should always imply the following:</div><div class='add'>+ *</div><div class='add'>+ * - It is a "present" entry.  IOW, before using this API, please check it</div><div class='add'>+ *   with pXd_present() first. NOTE: it may not always mean the "present</div><div class='add'>+ *   bit" is set.  For example, PROT_NONE entries are always "present".</div><div class='add'>+ *</div><div class='add'>+ * - It should _never_ be a swap entry of any type.  Above "present" check</div><div class='add'>+ *   should have guarded this, but let's be crystal clear on this.</div><div class='add'>+ *</div><div class='add'>+ * - It should contain a huge PFN, which points to a huge page larger than</div><div class='add'>+ *   PAGE_SIZE of the platform.  The PFN format isn't important here.</div><div class='add'>+ *</div><div class='add'>+ * - It should cover all kinds of huge mappings (i.e. pXd_trans_huge()</div><div class='add'>+ *   or hugetlb mappings).</div><div class='ctx'>  */</div><div class='ctx'> #ifndef pgd_leaf</div><div class='del'>-#define pgd_leaf(x)	0</div><div class='add'>+#define pgd_leaf(x)	false</div><div class='ctx'> #endif</div><div class='ctx'> #ifndef p4d_leaf</div><div class='del'>-#define p4d_leaf(x)	0</div><div class='add'>+#define p4d_leaf(x)	false</div><div class='ctx'> #endif</div><div class='ctx'> #ifndef pud_leaf</div><div class='del'>-#define pud_leaf(x)	0</div><div class='add'>+#define pud_leaf(x)	false</div><div class='ctx'> #endif</div><div class='ctx'> #ifndef pmd_leaf</div><div class='del'>-#define pmd_leaf(x)	0</div><div class='add'>+#define pmd_leaf(x)	false</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef pgd_leaf_size</div><div class='hunk'>@@ -1674,9 +2111,26 @@ typedef unsigned int pgtbl_mod_mask;</div><div class='ctx'> #ifndef pmd_leaf_size</div><div class='ctx'> #define pmd_leaf_size(x) PMD_SIZE</div><div class='ctx'> #endif</div><div class='add'>+#ifndef __pte_leaf_size</div><div class='ctx'> #ifndef pte_leaf_size</div><div class='ctx'> #define pte_leaf_size(x) PAGE_SIZE</div><div class='ctx'> #endif</div><div class='add'>+#define __pte_leaf_size(x,y) pte_leaf_size(y)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We always define pmd_pfn for all archs as it's used in lots of generic</div><div class='add'>+ * code.  Now it happens too for pud_pfn (and can happen for larger</div><div class='add'>+ * mappings too in the future; we're not there yet).  Instead of defining</div><div class='add'>+ * it for all archs (like pmd_pfn), provide a fallback.</div><div class='add'>+ *</div><div class='add'>+ * Note that returning 0 here means any arch that didn't define this can</div><div class='add'>+ * get severely wrong when it hits a real pud leaf.  It's arch's</div><div class='add'>+ * responsibility to properly define it when a huge pud is possible.</div><div class='add'>+ */</div><div class='add'>+#ifndef pud_pfn</div><div class='add'>+#define pud_pfn(x) 0</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some architectures have MMUs that are configurable or selectable at boot</div><div class='hunk'>@@ -1700,6 +2154,18 @@ typedef unsigned int pgtbl_mod_mask;</div><div class='ctx'> #define MAX_PTRS_PER_P4D PTRS_PER_P4D</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef pte_pgprot</div><div class='add'>+#define pte_pgprot(x) ((pgprot_t) {0})</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef pmd_pgprot</div><div class='add'>+#define pmd_pgprot(x) ((pgprot_t) {0})</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef pud_pgprot</div><div class='add'>+#define pud_pgprot(x) ((pgprot_t) {0})</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* description of effects of mapping type and prot in current implementation.</div><div class='ctx'>  * this is due to the limited x86 page protection hardware.  The expected</div><div class='ctx'>  * behavior is in parens:</div><div class='hunk'>@@ -1721,7 +2187,7 @@ typedef unsigned int pgtbl_mod_mask;</div><div class='ctx'>  *								x: (yes) yes</div><div class='ctx'>  */</div><div class='ctx'> #define DECLARE_VM_GET_PAGE_PROT					\</div><div class='del'>-pgprot_t vm_get_page_prot(unsigned long vm_flags)			\</div><div class='add'>+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)				\</div><div class='ctx'> {									\</div><div class='ctx'> 		return protection_map[vm_flags &amp;			\</div><div class='ctx'> 			(VM_READ | VM_WRITE | VM_EXEC | VM_SHARED)];	\</div><div class='head'>diff --git a/include/linux/phy.h b/include/linux/phy.h<br/>index 3f68b8239bb1..fbbe028cc4b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/phy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phy.h</a></div><div class='hunk'>@@ -32,28 +32,12 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;net/eee.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PHY_DEFAULT_FEATURES	(SUPPORTED_Autoneg | \</div><div class='del'>-				 SUPPORTED_TP | \</div><div class='del'>-				 SUPPORTED_MII)</div><div class='del'>-</div><div class='del'>-#define PHY_10BT_FEATURES	(SUPPORTED_10baseT_Half | \</div><div class='del'>-				 SUPPORTED_10baseT_Full)</div><div class='del'>-</div><div class='del'>-#define PHY_100BT_FEATURES	(SUPPORTED_100baseT_Half | \</div><div class='del'>-				 SUPPORTED_100baseT_Full)</div><div class='del'>-</div><div class='del'>-#define PHY_1000BT_FEATURES	(SUPPORTED_1000baseT_Half | \</div><div class='del'>-				 SUPPORTED_1000baseT_Full)</div><div class='del'>-</div><div class='ctx'> extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_basic_features) __ro_after_init;</div><div class='ctx'> extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_basic_t1_features) __ro_after_init;</div><div class='ctx'> extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_basic_t1s_p2mp_features) __ro_after_init;</div><div class='ctx'> extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_gbit_features) __ro_after_init;</div><div class='ctx'> extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_gbit_fibre_features) __ro_after_init;</div><div class='del'>-extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_gbit_all_ports_features) __ro_after_init;</div><div class='ctx'> extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_10gbit_features) __ro_after_init;</div><div class='del'>-extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_10gbit_fec_features) __ro_after_init;</div><div class='del'>-extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_10gbit_full_features) __ro_after_init;</div><div class='ctx'> extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_eee_cap1_features) __ro_after_init;</div><div class='ctx'> extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_eee_cap2_features) __ro_after_init;</div><div class='ctx'> </div><div class='hunk'>@@ -62,21 +46,11 @@ extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_eee_cap2_features) __ro_after_init;</div><div class='ctx'> #define PHY_BASIC_T1S_P2MP_FEATURES ((unsigned long *)&amp;phy_basic_t1s_p2mp_features)</div><div class='ctx'> #define PHY_GBIT_FEATURES ((unsigned long *)&amp;phy_gbit_features)</div><div class='ctx'> #define PHY_GBIT_FIBRE_FEATURES ((unsigned long *)&amp;phy_gbit_fibre_features)</div><div class='del'>-#define PHY_GBIT_ALL_PORTS_FEATURES ((unsigned long *)&amp;phy_gbit_all_ports_features)</div><div class='ctx'> #define PHY_10GBIT_FEATURES ((unsigned long *)&amp;phy_10gbit_features)</div><div class='del'>-#define PHY_10GBIT_FEC_FEATURES ((unsigned long *)&amp;phy_10gbit_fec_features)</div><div class='del'>-#define PHY_10GBIT_FULL_FEATURES ((unsigned long *)&amp;phy_10gbit_full_features)</div><div class='ctx'> #define PHY_EEE_CAP1_FEATURES ((unsigned long *)&amp;phy_eee_cap1_features)</div><div class='ctx'> #define PHY_EEE_CAP2_FEATURES ((unsigned long *)&amp;phy_eee_cap2_features)</div><div class='ctx'> </div><div class='ctx'> extern const int phy_basic_ports_array[3];</div><div class='del'>-extern const int phy_fibre_port_array[1];</div><div class='del'>-extern const int phy_all_ports_features_array[7];</div><div class='del'>-extern const int phy_10_100_features_array[4];</div><div class='del'>-extern const int phy_basic_t1_features_array[3];</div><div class='del'>-extern const int phy_basic_t1s_p2mp_features_array[2];</div><div class='del'>-extern const int phy_gbit_features_array[2];</div><div class='del'>-extern const int phy_10gbit_features_array[1];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Set phydev-&gt;irq to PHY_POLL if interrupts are not supported,</div><div class='hunk'>@@ -107,7 +81,7 @@ extern const int phy_10gbit_features_array[1];</div><div class='ctx'>  * @PHY_INTERFACE_MODE_RGMII: Reduced gigabit media-independent interface</div><div class='ctx'>  * @PHY_INTERFACE_MODE_RGMII_ID: RGMII with Internal RX+TX delay</div><div class='ctx'>  * @PHY_INTERFACE_MODE_RGMII_RXID: RGMII with Internal RX delay</div><div class='del'>- * @PHY_INTERFACE_MODE_RGMII_TXID: RGMII with Internal RX delay</div><div class='add'>+ * @PHY_INTERFACE_MODE_RGMII_TXID: RGMII with Internal TX delay</div><div class='ctx'>  * @PHY_INTERFACE_MODE_RTBI: Reduced TBI</div><div class='ctx'>  * @PHY_INTERFACE_MODE_SMII: Serial MII</div><div class='ctx'>  * @PHY_INTERFACE_MODE_XGMII: 10 gigabit media-independent interface</div><div class='hunk'>@@ -128,6 +102,11 @@ extern const int phy_10gbit_features_array[1];</div><div class='ctx'>  * @PHY_INTERFACE_MODE_10GKR: 10GBASE-KR - with Clause 73 AN</div><div class='ctx'>  * @PHY_INTERFACE_MODE_QUSGMII: Quad Universal SGMII</div><div class='ctx'>  * @PHY_INTERFACE_MODE_1000BASEKX: 1000Base-KX - with Clause 73 AN</div><div class='add'>+ * @PHY_INTERFACE_MODE_10G_QXGMII: 10G-QXGMII - 4 ports over 10G USXGMII</div><div class='add'>+ * @PHY_INTERFACE_MODE_50GBASER: 50GBase-R - with Clause 134 FEC</div><div class='add'>+ * @PHY_INTERFACE_MODE_LAUI: 50 Gigabit Attachment Unit Interface</div><div class='add'>+ * @PHY_INTERFACE_MODE_100GBASEP: 100GBase-P - with Clause 134 FEC</div><div class='add'>+ * @PHY_INTERFACE_MODE_MIILITE: MII-Lite - MII without RXER TXER CRS COL</div><div class='ctx'>  * @PHY_INTERFACE_MODE_MAX: Book keeping</div><div class='ctx'>  *</div><div class='ctx'>  * Describes the interface between the MAC and PHY.</div><div class='hunk'>@@ -168,6 +147,11 @@ typedef enum {</div><div class='ctx'> 	PHY_INTERFACE_MODE_10GKR,</div><div class='ctx'> 	PHY_INTERFACE_MODE_QUSGMII,</div><div class='ctx'> 	PHY_INTERFACE_MODE_1000BASEKX,</div><div class='add'>+	PHY_INTERFACE_MODE_10G_QXGMII,</div><div class='add'>+	PHY_INTERFACE_MODE_50GBASER,</div><div class='add'>+	PHY_INTERFACE_MODE_LAUI,</div><div class='add'>+	PHY_INTERFACE_MODE_100GBASEP,</div><div class='add'>+	PHY_INTERFACE_MODE_MIILITE,</div><div class='ctx'> 	PHY_INTERFACE_MODE_MAX,</div><div class='ctx'> } phy_interface_t;</div><div class='ctx'> </div><div class='hunk'>@@ -185,6 +169,16 @@ static inline bool phy_interface_empty(const unsigned long *intf)</div><div class='ctx'> 	return bitmap_empty(intf, PHY_INTERFACE_MODE_MAX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void phy_interface_copy(unsigned long *d, const unsigned long *s)</div><div class='add'>+{</div><div class='add'>+	bitmap_copy(d, s, PHY_INTERFACE_MODE_MAX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int phy_interface_weight(const unsigned long *intf)</div><div class='add'>+{</div><div class='add'>+	return bitmap_weight(intf, PHY_INTERFACE_MODE_MAX);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void phy_interface_and(unsigned long *dst, const unsigned long *a,</div><div class='ctx'> 				     const unsigned long *b)</div><div class='ctx'> {</div><div class='hunk'>@@ -205,13 +199,6 @@ static inline void phy_interface_set_rgmii(unsigned long *intf)</div><div class='ctx'> 	__set_bit(PHY_INTERFACE_MODE_RGMII_TXID, intf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * phy_supported_speeds - return all speeds currently supported by a PHY device</div><div class='del'>- */</div><div class='del'>-unsigned int phy_supported_speeds(struct phy_device *phy,</div><div class='del'>-				      unsigned int *speeds,</div><div class='del'>-				      unsigned int size);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * phy_modes - map phy_interface_t enum to device tree binding of phy-mode</div><div class='ctx'>  * @interface: enum phy_interface_t value</div><div class='hunk'>@@ -289,18 +276,51 @@ static inline const char *phy_modes(phy_interface_t interface)</div><div class='ctx'> 		return "100base-x";</div><div class='ctx'> 	case PHY_INTERFACE_MODE_QUSGMII:</div><div class='ctx'> 		return "qusgmii";</div><div class='add'>+	case PHY_INTERFACE_MODE_10G_QXGMII:</div><div class='add'>+		return "10g-qxgmii";</div><div class='add'>+	case PHY_INTERFACE_MODE_50GBASER:</div><div class='add'>+		return "50gbase-r";</div><div class='add'>+	case PHY_INTERFACE_MODE_LAUI:</div><div class='add'>+		return "laui";</div><div class='add'>+	case PHY_INTERFACE_MODE_100GBASEP:</div><div class='add'>+		return "100gbase-p";</div><div class='add'>+	case PHY_INTERFACE_MODE_MIILITE:</div><div class='add'>+		return "mii-lite";</div><div class='ctx'> 	default:</div><div class='ctx'> 		return "unknown";</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define PHY_INIT_TIMEOUT	100000</div><div class='del'>-#define PHY_FORCE_TIMEOUT	10</div><div class='add'>+/**</div><div class='add'>+ * rgmii_clock - map link speed to the clock rate</div><div class='add'>+ * @speed: link speed value</div><div class='add'>+ *</div><div class='add'>+ * Description: maps RGMII supported link speeds into the clock rates.</div><div class='add'>+ * This can also be used for MII, GMII, and RMII interface modes as the</div><div class='add'>+ * clock rates are identical, but the caller must be aware that errors</div><div class='add'>+ * for unsupported clock rates will not be signalled.</div><div class='add'>+ *</div><div class='add'>+ * Returns: clock rate or negative errno</div><div class='add'>+ */</div><div class='add'>+static inline long rgmii_clock(int speed)</div><div class='add'>+{</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		return 2500000;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		return 25000000;</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		return 125000000;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define PHY_MAX_ADDR	32</div><div class='ctx'> </div><div class='ctx'> /* Used when trying to connect to a specific phy (mii bus id:phy device id) */</div><div class='ctx'> #define PHY_ID_FMT "%s:%02x"</div><div class='add'>+#define PHY_ID_SIZE	(MII_BUS_ID_SIZE + 3)</div><div class='ctx'> </div><div class='ctx'> #define MII_BUS_ID_SIZE	61</div><div class='ctx'> </div><div class='hunk'>@@ -329,41 +349,6 @@ struct mdio_bus_stats {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct phy_package_shared - Shared information in PHY packages</div><div class='del'>- * @base_addr: Base PHY address of PHY package used to combine PHYs</div><div class='del'>- *   in one package and for offset calculation of phy_package_read/write</div><div class='del'>- * @np: Pointer to the Device Node if PHY package defined in DT</div><div class='del'>- * @refcnt: Number of PHYs connected to this shared data</div><div class='del'>- * @flags: Initialization of PHY package</div><div class='del'>- * @priv_size: Size of the shared private data @priv</div><div class='del'>- * @priv: Driver private data shared across a PHY package</div><div class='del'>- *</div><div class='del'>- * Represents a shared structure between different phydev's in the same</div><div class='del'>- * package, for example a quad PHY. See phy_package_join() and</div><div class='del'>- * phy_package_leave().</div><div class='del'>- */</div><div class='del'>-struct phy_package_shared {</div><div class='del'>-	u8 base_addr;</div><div class='del'>-	/* With PHY package defined in DT this points to the PHY package node */</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	refcount_t refcnt;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	size_t priv_size;</div><div class='del'>-</div><div class='del'>-	/* private data pointer */</div><div class='del'>-	/* note that this pointer is shared between different phydevs and</div><div class='del'>-	 * the user has to take care of appropriate locking. It is allocated</div><div class='del'>-	 * and freed automatically by phy_package_join() and</div><div class='del'>-	 * phy_package_leave().</div><div class='del'>-	 */</div><div class='del'>-	void *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* used as bit number in atomic bitops */</div><div class='del'>-#define PHY_SHARED_F_INIT_DONE  0</div><div class='del'>-#define PHY_SHARED_F_PROBE_DONE 1</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct mii_bus - Represents an MDIO bus</div><div class='ctx'>  *</div><div class='ctx'>  * @owner: Who owns this device</div><div class='hunk'>@@ -438,8 +423,10 @@ struct mii_bus {</div><div class='ctx'> 	/** @shared_lock: protect access to the shared element */</div><div class='ctx'> 	struct mutex shared_lock;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_PHY_PACKAGE)</div><div class='ctx'> 	/** @shared: shared state across different PHYs */</div><div class='ctx'> 	struct phy_package_shared *shared[PHY_MAX_ADDR];</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> #define to_mii_bus(d) container_of(d, struct mii_bus, dev)</div><div class='ctx'> </div><div class='hunk'>@@ -532,7 +519,7 @@ enum phy_state {</div><div class='ctx'>  * struct phy_c45_device_ids - 802.3-c45 Device Identifiers</div><div class='ctx'>  * @devices_in_package: IEEE 802.3 devices in package register value.</div><div class='ctx'>  * @mmds_present: bit vector of MMDs present.</div><div class='del'>- * @device_ids: The device identifer for each present device.</div><div class='add'>+ * @device_ids: The device identifier for each present device.</div><div class='ctx'>  */</div><div class='ctx'> struct phy_c45_device_ids {</div><div class='ctx'> 	u32 devices_in_package;</div><div class='hunk'>@@ -544,12 +531,39 @@ struct macsec_context;</div><div class='ctx'> struct macsec_ops;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct phy_oatc14_sqi_capability - SQI capability information for OATC14</div><div class='add'>+ *                                    10Base-T1S PHY</div><div class='add'>+ * @updated: Indicates whether the SQI capability fields have been updated.</div><div class='add'>+ * @sqi_max: Maximum supported Signal Quality Indicator (SQI) level reported by</div><div class='add'>+ *           the PHY.</div><div class='add'>+ * @sqiplus_bits: Bits for SQI+ levels supported by the PHY.</div><div class='add'>+ *                0 - SQI+ is not supported</div><div class='add'>+ *                3 - SQI+ is supported, using 3 bits (8 levels)</div><div class='add'>+ *                4 - SQI+ is supported, using 4 bits (16 levels)</div><div class='add'>+ *                5 - SQI+ is supported, using 5 bits (32 levels)</div><div class='add'>+ *                6 - SQI+ is supported, using 6 bits (64 levels)</div><div class='add'>+ *                7 - SQI+ is supported, using 7 bits (128 levels)</div><div class='add'>+ *                8 - SQI+ is supported, using 8 bits (256 levels)</div><div class='add'>+ *</div><div class='add'>+ * This structure is used by the OATC14 10Base-T1S PHY driver to store the SQI</div><div class='add'>+ * and SQI+ capability information retrieved from the PHY.</div><div class='add'>+ */</div><div class='add'>+struct phy_oatc14_sqi_capability {</div><div class='add'>+	bool updated;</div><div class='add'>+	int sqi_max;</div><div class='add'>+	u8 sqiplus_bits;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct phy_device - An instance of a PHY</div><div class='ctx'>  *</div><div class='ctx'>  * @mdio: MDIO bus this PHY is on</div><div class='ctx'>  * @drv: Pointer to the driver for this PHY instance</div><div class='ctx'>  * @devlink: Create a link between phy dev and mac dev, if the external phy</div><div class='ctx'>  *           used by current mac interface is managed by another mac interface.</div><div class='add'>+ * @phyindex: Unique id across the phy's parent tree of phys to address the PHY</div><div class='add'>+ *	      from userspace, similar to ifindex. A zero index means the PHY</div><div class='add'>+ *	      wasn't assigned an id yet.</div><div class='ctx'>  * @phy_id: UID for this device found during discovery</div><div class='ctx'>  * @c45_ids: 802.3-c45 Device Identifiers if is_c45.</div><div class='ctx'>  * @is_c45:  Set to true if this PHY uses clause 45 addressing.</div><div class='hunk'>@@ -566,6 +580,7 @@ struct macsec_ops;</div><div class='ctx'>  * @mac_managed_pm: Set true if MAC driver takes of suspending/resuming PHY</div><div class='ctx'>  * @wol_enabled: Set to true if the PHY or the attached MAC have Wake-on-LAN</div><div class='ctx'>  * 		 enabled.</div><div class='add'>+ * @is_genphy_driven: PHY is driven by one of the generic PHY drivers</div><div class='ctx'>  * @state: State of the PHY for management purposes</div><div class='ctx'>  * @dev_flags: Device-specific flags used by the PHY driver.</div><div class='ctx'>  *</div><div class='hunk'>@@ -594,12 +609,12 @@ struct macsec_ops;</div><div class='ctx'>  * @adv_old: Saved advertised while power saving for WoL</div><div class='ctx'>  * @supported_eee: supported PHY EEE linkmodes</div><div class='ctx'>  * @advertising_eee: Currently advertised EEE linkmodes</div><div class='del'>- * @eee_enabled: Flag indicating whether the EEE feature is enabled</div><div class='ctx'>  * @enable_tx_lpi: When True, MAC should transmit LPI to PHY</div><div class='add'>+ * @eee_active: phylib private state, indicating that EEE has been negotiated</div><div class='ctx'>  * @eee_cfg: User configuration of EEE</div><div class='ctx'>  * @lp_advertising: Current link partner advertised linkmodes</div><div class='ctx'>  * @host_interfaces: PHY interface modes supported by host</div><div class='del'>- * @eee_broken_modes: Energy efficient ethernet modes which should be prohibited</div><div class='add'>+ * @eee_disabled_modes: Energy efficient ethernet modes not to be advertised</div><div class='ctx'>  * @autoneg: Flag autoneg being used</div><div class='ctx'>  * @rate_matching: Current rate matching mode</div><div class='ctx'>  * @link: Current link state</div><div class='hunk'>@@ -612,6 +627,8 @@ struct macsec_ops;</div><div class='ctx'>  *                 handling shall be postponed until PHY has resumed</div><div class='ctx'>  * @irq_rerun: Flag indicating interrupts occurred while PHY was suspended,</div><div class='ctx'>  *             requiring a rerun of the interrupt handler after resume</div><div class='add'>+ * @default_timestamp: Flag indicating whether we are using the phy</div><div class='add'>+ *		       timestamp as the default one</div><div class='ctx'>  * @interface: enum phy_interface_t value</div><div class='ctx'>  * @possible_interfaces: bitmap if interface modes that the attached PHY</div><div class='ctx'>  *			 will switch between depending on media speed.</div><div class='hunk'>@@ -633,6 +650,7 @@ struct macsec_ops;</div><div class='ctx'>  * @link_down_events: Number of times link was lost</div><div class='ctx'>  * @shared: Pointer to private data shared by phys in one package</div><div class='ctx'>  * @priv: Pointer to driver private data</div><div class='add'>+ * @oatc14_sqi_capability: SQI capability information for OATC14 10Base-T1S PHY</div><div class='ctx'>  *</div><div class='ctx'>  * interrupts currently only supports enabled or disabled,</div><div class='ctx'>  * but could be changed in the future to support enabling</div><div class='hunk'>@@ -650,6 +668,7 @@ struct phy_device {</div><div class='ctx'> </div><div class='ctx'> 	struct device_link *devlink;</div><div class='ctx'> </div><div class='add'>+	u32 phyindex;</div><div class='ctx'> 	u32 phy_id;</div><div class='ctx'> </div><div class='ctx'> 	struct phy_c45_device_ids c45_ids;</div><div class='hunk'>@@ -666,17 +685,22 @@ struct phy_device {</div><div class='ctx'> 	unsigned is_on_sfp_module:1;</div><div class='ctx'> 	unsigned mac_managed_pm:1;</div><div class='ctx'> 	unsigned wol_enabled:1;</div><div class='add'>+	unsigned is_genphy_driven:1;</div><div class='ctx'> </div><div class='ctx'> 	unsigned autoneg:1;</div><div class='ctx'> 	/* The most recently read link state */</div><div class='ctx'> 	unsigned link:1;</div><div class='ctx'> 	unsigned autoneg_complete:1;</div><div class='add'>+	bool pause:1;</div><div class='add'>+	bool asym_pause:1;</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupts are enabled */</div><div class='ctx'> 	unsigned interrupts:1;</div><div class='ctx'> 	unsigned irq_suspended:1;</div><div class='ctx'> 	unsigned irq_rerun:1;</div><div class='ctx'> </div><div class='add'>+	unsigned default_timestamp:1;</div><div class='add'>+</div><div class='ctx'> 	int rate_matching;</div><div class='ctx'> </div><div class='ctx'> 	enum phy_state state;</div><div class='hunk'>@@ -693,8 +717,6 @@ struct phy_device {</div><div class='ctx'> 	int speed;</div><div class='ctx'> 	int duplex;</div><div class='ctx'> 	int port;</div><div class='del'>-	int pause;</div><div class='del'>-	int asym_pause;</div><div class='ctx'> 	u8 master_slave_get;</div><div class='ctx'> 	u8 master_slave_set;</div><div class='ctx'> 	u8 master_slave_state;</div><div class='hunk'>@@ -709,16 +731,15 @@ struct phy_device {</div><div class='ctx'> 	/* used for eee validation and configuration*/</div><div class='ctx'> 	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported_eee);</div><div class='ctx'> 	__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising_eee);</div><div class='del'>-	bool eee_enabled;</div><div class='del'>-</div><div class='del'>-	/* Host supported PHY interface types. Should be ignored if empty. */</div><div class='del'>-	DECLARE_PHY_INTERFACE_MASK(host_interfaces);</div><div class='del'>-</div><div class='ctx'> 	/* Energy efficient ethernet modes which should be prohibited */</div><div class='del'>-	u32 eee_broken_modes;</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(eee_disabled_modes);</div><div class='ctx'> 	bool enable_tx_lpi;</div><div class='add'>+	bool eee_active;</div><div class='ctx'> 	struct eee_config eee_cfg;</div><div class='ctx'> </div><div class='add'>+	/* Host supported PHY interface types. Should be ignored if empty. */</div><div class='add'>+	DECLARE_PHY_INTERFACE_MASK(host_interfaces);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_LED_TRIGGER_PHY</div><div class='ctx'> 	struct phy_led_trigger *phy_led_triggers;</div><div class='ctx'> 	unsigned int phy_num_led_triggers;</div><div class='hunk'>@@ -738,9 +759,11 @@ struct phy_device {</div><div class='ctx'> 	/* For use by PHYs to maintain extra state */</div><div class='ctx'> 	void *priv;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_PHY_PACKAGE)</div><div class='ctx'> 	/* shared data pointer */</div><div class='ctx'> 	/* For use by PHYs inside the same package that need a shared state. */</div><div class='ctx'> 	struct phy_package_shared *shared;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Reporting cable test results */</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -774,15 +797,15 @@ struct phy_device {</div><div class='ctx'> 	/* MACsec management functions */</div><div class='ctx'> 	const struct macsec_ops *macsec_ops;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	struct phy_oatc14_sqi_capability oatc14_sqi_capability;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Generic phy_device::dev_flags */</div><div class='ctx'> #define PHY_F_NO_IRQ		0x80000000</div><div class='add'>+#define PHY_F_RXC_ALWAYS_ON	0x40000000</div><div class='ctx'> </div><div class='del'>-static inline struct phy_device *to_phy_device(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return container_of(to_mdio_device(dev), struct phy_device, mdio);</div><div class='del'>-}</div><div class='add'>+#define to_phy_device(__dev)	container_of_const(to_mdio_device(__dev), struct phy_device, mdio)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct phy_tdr_config - Configuration of a TDR raw test</div><div class='hunk'>@@ -806,6 +829,24 @@ struct phy_tdr_config {</div><div class='ctx'> #define PHY_PAIR_ALL -1</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum link_inband_signalling - in-band signalling modes that are supported</div><div class='add'>+ *</div><div class='add'>+ * @LINK_INBAND_DISABLE: in-band signalling can be disabled</div><div class='add'>+ * @LINK_INBAND_ENABLE: in-band signalling can be enabled without bypass</div><div class='add'>+ * @LINK_INBAND_BYPASS: in-band signalling can be enabled with bypass</div><div class='add'>+ *</div><div class='add'>+ * The possible and required bits can only be used if the valid bit is set.</div><div class='add'>+ * If possible is clear, that means inband signalling can not be used.</div><div class='add'>+ * Required is only valid when possible is set, and means that inband</div><div class='add'>+ * signalling must be used.</div><div class='add'>+ */</div><div class='add'>+enum link_inband_signalling {</div><div class='add'>+	LINK_INBAND_DISABLE		= BIT(0),</div><div class='add'>+	LINK_INBAND_ENABLE		= BIT(1),</div><div class='add'>+	LINK_INBAND_BYPASS		= BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct phy_plca_cfg - Configuration of the PLCA (Physical Layer Collision</div><div class='ctx'>  * Avoidance) Reconciliation Sublayer.</div><div class='ctx'>  *</div><div class='hunk'>@@ -864,8 +905,9 @@ struct phy_plca_status {</div><div class='ctx'> </div><div class='ctx'> /* Modes for PHY LED configuration */</div><div class='ctx'> enum phy_led_modes {</div><div class='del'>-	PHY_LED_ACTIVE_LOW = 0,</div><div class='del'>-	PHY_LED_INACTIVE_HIGH_IMPEDANCE = 1,</div><div class='add'>+	PHY_LED_ACTIVE_HIGH = 0,</div><div class='add'>+	PHY_LED_ACTIVE_LOW = 1,</div><div class='add'>+	PHY_LED_INACTIVE_HIGH_IMPEDANCE = 2,</div><div class='ctx'> </div><div class='ctx'> 	/* keep it last */</div><div class='ctx'> 	__PHY_LED_MODES_NUM,</div><div class='hunk'>@@ -888,6 +930,165 @@ struct phy_led {</div><div class='ctx'> </div><div class='ctx'> #define to_phy_led(d) container_of(d, struct phy_led, led_cdev)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * PHY_MSE_CAP_* - Bitmask flags for Mean Square Error (MSE) capabilities</div><div class='add'>+ *</div><div class='add'>+ * These flags describe which MSE metrics and selectors are implemented</div><div class='add'>+ * by the PHY for the current link mode. They are used in</div><div class='add'>+ * struct phy_mse_capability.supported_caps.</div><div class='add'>+ *</div><div class='add'>+ * Standardization:</div><div class='add'>+ *   The OPEN Alliance (OA) defines the presence of MSE/SQI/pMSE but not their</div><div class='add'>+ *   numeric scaling, update intervals, or aggregation windows.  See:</div><div class='add'>+ *     OA 100BASE-T1 TC1 v1.0, sections 6.1.1-6.1.3</div><div class='add'>+ *     OA 1000BASE-T1 TC12 v2.2, sections 6.1.1-6.1.2</div><div class='add'>+ *</div><div class='add'>+ * Description of flags:</div><div class='add'>+ *</div><div class='add'>+ *   PHY_MSE_CAP_CHANNEL_A</div><div class='add'>+ *     Per-pair diagnostics for Channel A are supported.  Mapping to the</div><div class='add'>+ *     physical wire pair may depend on MDI/MDI-X polarity.</div><div class='add'>+ *</div><div class='add'>+ *   PHY_MSE_CAP_CHANNEL_B, _C, _D</div><div class='add'>+ *     Same as above for channels B-D.</div><div class='add'>+ *</div><div class='add'>+ *   PHY_MSE_CAP_WORST_CHANNEL</div><div class='add'>+ *     The PHY or driver can identify and report the single worst-performing</div><div class='add'>+ *     channel without querying each one individually.</div><div class='add'>+ *</div><div class='add'>+ *   PHY_MSE_CAP_LINK</div><div class='add'>+ *     The PHY provides only a link-wide aggregate measurement or cannot map</div><div class='add'>+ *     results to a specific pair (for example 100BASE-TX with unknown</div><div class='add'>+ *     MDI/MDI-X).</div><div class='add'>+ *</div><div class='add'>+ *   PHY_MSE_CAP_AVG</div><div class='add'>+ *     Average MSE (mean DCQ metric) is supported.  For 100/1000BASE-T1 the OA</div><div class='add'>+ *     recommends 2^16 symbols, scaled 0..511, but the exact scaling is</div><div class='add'>+ *     vendor-specific.</div><div class='add'>+ *</div><div class='add'>+ *   PHY_MSE_CAP_PEAK</div><div class='add'>+ *     Peak MSE (current peak within the measurement window) is supported.</div><div class='add'>+ *     Defined as pMSE for 100BASE-T1; vendor-specific for others.</div><div class='add'>+ *</div><div class='add'>+ *   PHY_MSE_CAP_WORST_PEAK</div><div class='add'>+ *     Latched worst-case peak MSE since the last read (read-to-clear if</div><div class='add'>+ *     implemented).  Optional in OA 100BASE-T1 TC1 6.1.3.</div><div class='add'>+ */</div><div class='add'>+#define PHY_MSE_CAP_CHANNEL_A BIT(0)</div><div class='add'>+#define PHY_MSE_CAP_CHANNEL_B BIT(1)</div><div class='add'>+#define PHY_MSE_CAP_CHANNEL_C BIT(2)</div><div class='add'>+#define PHY_MSE_CAP_CHANNEL_D BIT(3)</div><div class='add'>+#define PHY_MSE_CAP_WORST_CHANNEL BIT(4)</div><div class='add'>+#define PHY_MSE_CAP_LINK BIT(5)</div><div class='add'>+#define PHY_MSE_CAP_AVG BIT(6)</div><div class='add'>+#define PHY_MSE_CAP_PEAK BIT(7)</div><div class='add'>+#define PHY_MSE_CAP_WORST_PEAK BIT(8)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * enum phy_mse_channel - Identifiers for selecting MSE measurement channels</div><div class='add'>+ *</div><div class='add'>+ * PHY_MSE_CHANNEL_A - PHY_MSE_CHANNEL_D</div><div class='add'>+ *   Select per-pair measurement for the corresponding channel.</div><div class='add'>+ *</div><div class='add'>+ * PHY_MSE_CHANNEL_WORST</div><div class='add'>+ *   Select the single worst-performing channel reported by hardware.</div><div class='add'>+ *</div><div class='add'>+ * PHY_MSE_CHANNEL_LINK</div><div class='add'>+ *   Select link-wide aggregate data (used when per-pair results are</div><div class='add'>+ *   unavailable).</div><div class='add'>+ */</div><div class='add'>+enum phy_mse_channel {</div><div class='add'>+	PHY_MSE_CHANNEL_A,</div><div class='add'>+	PHY_MSE_CHANNEL_B,</div><div class='add'>+	PHY_MSE_CHANNEL_C,</div><div class='add'>+	PHY_MSE_CHANNEL_D,</div><div class='add'>+	PHY_MSE_CHANNEL_WORST,</div><div class='add'>+	PHY_MSE_CHANNEL_LINK,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct phy_mse_capability - Capabilities of Mean Square Error (MSE)</div><div class='add'>+ *                             measurement interface</div><div class='add'>+ *</div><div class='add'>+ * Standardization notes:</div><div class='add'>+ *</div><div class='add'>+ * - Presence of MSE/SQI/pMSE is defined by OPEN Alliance specs, but numeric</div><div class='add'>+ *   scaling, refresh/update rate and aggregation windows are not fixed and</div><div class='add'>+ *   are vendor-/product-specific. (OA 100BASE-T1 TC1 v1.0 6.1.*;</div><div class='add'>+ *   OA 1000BASE-T1 TC12 v2.2 6.1.*)</div><div class='add'>+ *</div><div class='add'>+ * - Typical recommendations: 2^16 symbols and 0..511 scaling for MSE; pMSE only</div><div class='add'>+ *   defined for 100BASE-T1 (sliding window example), others are vendor</div><div class='add'>+ *   extensions. Drivers must report actual scale/limits here.</div><div class='add'>+ *</div><div class='add'>+ * Describes the MSE measurement capabilities for the current link mode. These</div><div class='add'>+ * properties are dynamic and may change when link settings are modified.</div><div class='add'>+ * Callers should re-query this capability after any link state change to</div><div class='add'>+ * ensure they have the most up-to-date information.</div><div class='add'>+ *</div><div class='add'>+ * Callers should only request measurements for channels and types that are</div><div class='add'>+ * indicated as supported by the @supported_caps bitmask. If @supported_caps</div><div class='add'>+ * is 0, the device provides no MSE diagnostics, and driver operations should</div><div class='add'>+ * typically return -EOPNOTSUPP.</div><div class='add'>+ *</div><div class='add'>+ * Snapshot values for average and peak MSE can be normalized to a 0..1 ratio</div><div class='add'>+ * by dividing the raw snapshot by the corresponding @max_average_mse or</div><div class='add'>+ * @max_peak_mse value.</div><div class='add'>+ *</div><div class='add'>+ * @max_average_mse: The maximum value for an average MSE snapshot. This</div><div class='add'>+ *   defines the scale for the measurement. If the PHY_MSE_CAP_AVG capability is</div><div class='add'>+ *   supported, this value MUST be greater than 0. (vendor-specific units).</div><div class='add'>+ * @max_peak_mse: The maximum value for a peak MSE snapshot. If either</div><div class='add'>+ *   PHY_MSE_CAP_PEAK or PHY_MSE_CAP_WORST_PEAK is supported, this value MUST</div><div class='add'>+ *   be greater than 0. (vendor-specific units).</div><div class='add'>+ * @refresh_rate_ps: The typical interval, in picoseconds, between hardware</div><div class='add'>+ *   updates of the MSE values. This is an estimate, and callers should not</div><div class='add'>+ *   assume synchronous sampling. (vendor-specific units).</div><div class='add'>+ * @num_symbols: The number of symbols aggregated per hardware sample to</div><div class='add'>+ *   calculate the MSE. (vendor-specific units).</div><div class='add'>+ * @supported_caps: A bitmask of PHY_MSE_CAP_* values indicating which</div><div class='add'>+ *   measurement types (e.g., average, peak) and channels</div><div class='add'>+ *   (e.g., per-pair or link-wide) are supported.</div><div class='add'>+ */</div><div class='add'>+struct phy_mse_capability {</div><div class='add'>+	u64 max_average_mse;</div><div class='add'>+	u64 max_peak_mse;</div><div class='add'>+	u64 refresh_rate_ps;</div><div class='add'>+	u64 num_symbols;</div><div class='add'>+	u32 supported_caps;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct phy_mse_snapshot - A snapshot of Mean Square Error (MSE) diagnostics</div><div class='add'>+ *</div><div class='add'>+ * Holds a set of MSE diagnostic values that were all captured from a single</div><div class='add'>+ * measurement window.</div><div class='add'>+ *</div><div class='add'>+ * Values are raw, device-scaled and not normalized. Use struct</div><div class='add'>+ * phy_mse_capability to interpret the scale and sampling window.</div><div class='add'>+ *</div><div class='add'>+ * @average_mse: The average MSE value over the measurement window.</div><div class='add'>+ *   OPEN Alliance references MSE as a DCQ metric; recommends 2^16 symbols and</div><div class='add'>+ *   0..511 scaling. Exact scale and refresh are vendor-specific.</div><div class='add'>+ *   (100BASE-T1 TC1 v1.0 6.1.1; 1000BASE-T1 TC12 v2.2 6.1.1).</div><div class='add'>+ *</div><div class='add'>+ * @peak_mse: The peak MSE value observed within the measurement window.</div><div class='add'>+ *   For 100BASE-T1, "pMSE" is optional and may be implemented via a sliding</div><div class='add'>+ *   128-symbol window with periodic capture; not standardized for 1000BASE-T1.</div><div class='add'>+ *   (100BASE-T1 TC1 v1.0 6.1.3, Table "DCQ.peakMSE").</div><div class='add'>+ *</div><div class='add'>+ * @worst_peak_mse: A latched high-water mark of the peak MSE since last read</div><div class='add'>+ *   (read-to-clear if implemented). OPEN Alliance shows a latched "worst case</div><div class='add'>+ *   peak MSE" for 100BASE-T1 pMSE; availability/semantics outside that are</div><div class='add'>+ *   vendor-specific. (100BASE-T1 TC1 v1.0 6.1.3, DCQ.peakMSE high byte;</div><div class='add'>+ *   1000BASE-T1 TC12 v2.2 treats DCQ details as vendor-specific.)</div><div class='add'>+ */</div><div class='add'>+struct phy_mse_snapshot {</div><div class='add'>+	u64 average_mse;</div><div class='add'>+	u64 peak_mse;</div><div class='add'>+	u64 worst_peak_mse;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct phy_driver - Driver structure for a particular PHY type</div><div class='ctx'>  *</div><div class='hunk'>@@ -944,6 +1145,19 @@ struct phy_driver {</div><div class='ctx'> 	int (*get_features)(struct phy_device *phydev);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='add'>+	 * @inband_caps: query whether in-band is supported for the given PHY</div><div class='add'>+	 * interface mode. Returns a bitmask of bits defined by enum</div><div class='add'>+	 * link_inband_signalling.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int (*inband_caps)(struct phy_device *phydev,</div><div class='add'>+				    phy_interface_t interface);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @config_inband: configure in-band mode for the PHY</div><div class='add'>+	 */</div><div class='add'>+	int (*config_inband)(struct phy_device *phydev, unsigned int modes);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='ctx'> 	 * @get_rate_matching: Get the supported type of rate matching for a</div><div class='ctx'> 	 * particular phy interface. This is used by phy consumers to determine</div><div class='ctx'> 	 * whether to advertise lower-speed modes for that interface. It is</div><div class='hunk'>@@ -993,7 +1207,8 @@ struct phy_driver {</div><div class='ctx'> 	 * driver for the given phydev.	 If NULL, matching is based on</div><div class='ctx'> 	 * phy_id and phy_id_mask.</div><div class='ctx'> 	 */</div><div class='del'>-	int (*match_phy_device)(struct phy_device *phydev);</div><div class='add'>+	int (*match_phy_device)(struct phy_device *phydev,</div><div class='add'>+				const struct phy_driver *phydrv);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='ctx'> 	 * @set_wol: Some devices (e.g. qnap TS-119P II) require PHY</div><div class='hunk'>@@ -1077,6 +1292,53 @@ struct phy_driver {</div><div class='ctx'> 	int (*cable_test_get_status)(struct phy_device *dev, bool *finished);</div><div class='ctx'> </div><div class='ctx'> 	/* Get statistics from the PHY using ethtool */</div><div class='add'>+	/**</div><div class='add'>+	 * @get_phy_stats: Retrieve PHY statistics.</div><div class='add'>+	 * @dev: The PHY device for which the statistics are retrieved.</div><div class='add'>+	 * @eth_stats: structure where Ethernet PHY stats will be stored.</div><div class='add'>+	 * @stats: structure where additional PHY-specific stats will be stored.</div><div class='add'>+	 *</div><div class='add'>+	 * Retrieves the supported PHY statistics and populates the provided</div><div class='add'>+	 * structures. The input structures are pre-initialized with</div><div class='add'>+	 * `ETHTOOL_STAT_NOT_SET`, and the driver must only modify members</div><div class='add'>+	 * corresponding to supported statistics. Unmodified members will remain</div><div class='add'>+	 * set to `ETHTOOL_STAT_NOT_SET` and will not be returned to userspace.</div><div class='add'>+	 */</div><div class='add'>+	void (*get_phy_stats)(struct phy_device *dev,</div><div class='add'>+			      struct ethtool_eth_phy_stats *eth_stats,</div><div class='add'>+			      struct ethtool_phy_stats *stats);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @get_link_stats: Retrieve link statistics.</div><div class='add'>+	 * @dev: The PHY device for which the statistics are retrieved.</div><div class='add'>+	 * @link_stats: structure where link-specific stats will be stored.</div><div class='add'>+	 *</div><div class='add'>+	 * Retrieves link-related statistics for the given PHY device. The input</div><div class='add'>+	 * structure is pre-initialized with `ETHTOOL_STAT_NOT_SET`, and the</div><div class='add'>+	 * driver must only modify members corresponding to supported</div><div class='add'>+	 * statistics. Unmodified members will remain set to</div><div class='add'>+	 * `ETHTOOL_STAT_NOT_SET` and will not be returned to userspace.</div><div class='add'>+	 */</div><div class='add'>+	void (*get_link_stats)(struct phy_device *dev,</div><div class='add'>+			       struct ethtool_link_ext_stats *link_stats);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @update_stats: Trigger periodic statistics updates.</div><div class='add'>+	 * @dev: The PHY device for which statistics updates are triggered.</div><div class='add'>+	 *</div><div class='add'>+	 * Periodically gathers statistics from the PHY device to update locally</div><div class='add'>+	 * maintained 64-bit counters. This is necessary for PHYs that implement</div><div class='add'>+	 * reduced-width counters (e.g., 16-bit or 32-bit) which can overflow</div><div class='add'>+	 * more frequently compared to 64-bit counters. By invoking this</div><div class='add'>+	 * callback, drivers can fetch the current counter values, handle</div><div class='add'>+	 * overflow detection, and accumulate the results into local 64-bit</div><div class='add'>+	 * counters for accurate reporting through the `get_phy_stats` and</div><div class='add'>+	 * `get_link_stats` interfaces.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: 0 on success or a negative error code on failure.</div><div class='add'>+	 */</div><div class='add'>+	int (*update_stats)(struct phy_device *dev);</div><div class='add'>+</div><div class='ctx'> 	/** @get_sset_count: Number of statistic counters */</div><div class='ctx'> 	int (*get_sset_count)(struct phy_device *dev);</div><div class='ctx'> 	/** @get_strings: Names of the statistic counters */</div><div class='hunk'>@@ -1093,13 +1355,68 @@ struct phy_driver {</div><div class='ctx'> 	int (*set_tunable)(struct phy_device *dev,</div><div class='ctx'> 			    struct ethtool_tunable *tuna,</div><div class='ctx'> 			    const void *data);</div><div class='del'>-	/** @set_loopback: Set the loopback mood of the PHY */</div><div class='del'>-	int (*set_loopback)(struct phy_device *dev, bool enable);</div><div class='add'>+	/**</div><div class='add'>+	 * @set_loopback: Set the loopback mode of the PHY</div><div class='add'>+	 * enable selects if the loopback mode is enabled or disabled. If the</div><div class='add'>+	 * loopback mode is enabled, then the speed of the loopback mode can be</div><div class='add'>+	 * requested with the speed argument. If the speed argument is zero,</div><div class='add'>+	 * then any speed can be selected. If the speed argument is &gt; 0, then</div><div class='add'>+	 * this speed shall be selected for the loopback mode or EOPNOTSUPP</div><div class='add'>+	 * shall be returned if speed selection is not supported.</div><div class='add'>+	 */</div><div class='add'>+	int (*set_loopback)(struct phy_device *dev, bool enable, int speed);</div><div class='ctx'> 	/** @get_sqi: Get the signal quality indication */</div><div class='ctx'> 	int (*get_sqi)(struct phy_device *dev);</div><div class='ctx'> 	/** @get_sqi_max: Get the maximum signal quality indication */</div><div class='ctx'> 	int (*get_sqi_max)(struct phy_device *dev);</div><div class='ctx'> </div><div class='add'>+	/**</div><div class='add'>+	 * @get_mse_capability: Get capabilities and scale of MSE measurement</div><div class='add'>+	 * @dev:    PHY device</div><div class='add'>+	 * @cap: Output (filled on success)</div><div class='add'>+	 *</div><div class='add'>+	 * Fill @cap with the PHY's MSE capability for the current</div><div class='add'>+	 * link mode: scale limits (max_average_mse, max_peak_mse), update</div><div class='add'>+	 * interval (refresh_rate_ps), sample length (num_symbols) and the</div><div class='add'>+	 * capability bitmask (supported_caps).</div><div class='add'>+	 *</div><div class='add'>+	 * Implementations may defer capability report until hardware has</div><div class='add'>+	 * converged; in that case they should return -EAGAIN and allow the</div><div class='add'>+	 * caller to retry later.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: 0 on success. On failure, returns a negative errno code, such</div><div class='add'>+	 * as -EOPNOTSUPP if MSE measurement is not supported by the PHY or in</div><div class='add'>+	 * the current link mode, or -EAGAIN if the capability information is</div><div class='add'>+	 * not yet available.</div><div class='add'>+	 */</div><div class='add'>+	int (*get_mse_capability)(struct phy_device *dev,</div><div class='add'>+				  struct phy_mse_capability *cap);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @get_mse_snapshot: Retrieve a snapshot of MSE diagnostic values</div><div class='add'>+	 * @dev:      PHY device</div><div class='add'>+	 * @channel:  Channel identifier (PHY_MSE_CHANNEL_*)</div><div class='add'>+	 * @snapshot: Output (filled on success)</div><div class='add'>+	 *</div><div class='add'>+	 * Fill @snapshot with a correlated set of MSE values from the most</div><div class='add'>+	 * recent measurement window.</div><div class='add'>+	 *</div><div class='add'>+	 * Callers must validate @channel against supported_caps returned by</div><div class='add'>+	 * get_mse_capability(). Drivers must not coerce @channel; if the</div><div class='add'>+	 * requested selector is not implemented by the device or current link</div><div class='add'>+	 * mode, the operation must fail.</div><div class='add'>+	 *</div><div class='add'>+	 * worst_peak_mse is latched and must be treated as read-to-clear.</div><div class='add'>+	 *</div><div class='add'>+	 * Return: 0 on success. On failure, returns a negative errno code, such</div><div class='add'>+	 * as -EOPNOTSUPP if MSE measurement is not supported by the PHY or in</div><div class='add'>+	 * the current link mode, or -EAGAIN if measurements are not yet</div><div class='add'>+	 * available.</div><div class='add'>+	 */</div><div class='add'>+	int (*get_mse_snapshot)(struct phy_device *dev,</div><div class='add'>+				enum phy_mse_channel channel,</div><div class='add'>+				struct phy_mse_snapshot *snapshot);</div><div class='add'>+</div><div class='ctx'> 	/* PLCA RS interface */</div><div class='ctx'> 	/** @get_plca_cfg: Return the current PLCA configuration */</div><div class='ctx'> 	int (*get_plca_cfg)(struct phy_device *dev,</div><div class='hunk'>@@ -1121,7 +1438,7 @@ struct phy_driver {</div><div class='ctx'> 				  u8 index, enum led_brightness value);</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='del'>-	 * @led_blink_set: Set a PHY LED brightness.  Index indicates</div><div class='add'>+	 * @led_blink_set: Set a PHY LED blinking.  Index indicates</div><div class='ctx'> 	 * which of the PHYs led should be configured to blink. Delays</div><div class='ctx'> 	 * are in milliseconds and if both are zero then a sensible</div><div class='ctx'> 	 * default should be chosen.  The call should adjust the</div><div class='hunk'>@@ -1177,16 +1494,30 @@ struct phy_driver {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*led_polarity_set)(struct phy_device *dev, int index,</div><div class='ctx'> 				unsigned long modes);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @get_next_update_time: Get the time until the next update event</div><div class='add'>+	 * @dev: PHY device</div><div class='add'>+	 *</div><div class='add'>+	 * Callback to determine the time (in jiffies) until the next</div><div class='add'>+	 * update event for the PHY state  machine. Allows PHY drivers to</div><div class='add'>+	 * dynamically adjust polling intervals based on link state or other</div><div class='add'>+	 * conditions.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns the time in jiffies until the next update event.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int (*get_next_update_time)(struct phy_device *dev);</div><div class='ctx'> };</div><div class='del'>-#define to_phy_driver(d) container_of(to_mdio_common_driver(d),		\</div><div class='add'>+#define to_phy_driver(d) container_of_const(to_mdio_common_driver(d),		\</div><div class='ctx'> 				      struct phy_driver, mdiodrv)</div><div class='ctx'> </div><div class='del'>-#define PHY_ANY_ID "MATCH ANY PHY"</div><div class='del'>-#define PHY_ANY_UID 0xffffffff</div><div class='add'>+#define PHY_ID_MATCH_EXTACT_MASK GENMASK(31, 0)</div><div class='add'>+#define PHY_ID_MATCH_MODEL_MASK GENMASK(31, 4)</div><div class='add'>+#define PHY_ID_MATCH_VENDOR_MASK GENMASK(31, 10)</div><div class='ctx'> </div><div class='del'>-#define PHY_ID_MATCH_EXACT(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 0)</div><div class='del'>-#define PHY_ID_MATCH_MODEL(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 4)</div><div class='del'>-#define PHY_ID_MATCH_VENDOR(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 10)</div><div class='add'>+#define PHY_ID_MATCH_EXACT(id) .phy_id = (id), .phy_id_mask = PHY_ID_MATCH_EXTACT_MASK</div><div class='add'>+#define PHY_ID_MATCH_MODEL(id) .phy_id = (id), .phy_id_mask = PHY_ID_MATCH_MODEL_MASK</div><div class='add'>+#define PHY_ID_MATCH_VENDOR(id) .phy_id = (id), .phy_id_mask = PHY_ID_MATCH_VENDOR_MASK</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * phy_id_compare - compare @id1 with @id2 taking account of @mask</div><div class='hunk'>@@ -1203,6 +1534,32 @@ static inline bool phy_id_compare(u32 id1, u32 id2, u32 mask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * phy_id_compare_vendor - compare @id with @vendor mask</div><div class='add'>+ * @id: PHY ID</div><div class='add'>+ * @vendor_mask: PHY Vendor mask</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the bits from @id match @vendor using the</div><div class='add'>+ *	   generic PHY Vendor mask.</div><div class='add'>+ */</div><div class='add'>+static inline bool phy_id_compare_vendor(u32 id, u32 vendor_mask)</div><div class='add'>+{</div><div class='add'>+	return phy_id_compare(id, vendor_mask, PHY_ID_MATCH_VENDOR_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * phy_id_compare_model - compare @id with @model mask</div><div class='add'>+ * @id: PHY ID</div><div class='add'>+ * @model_mask: PHY Model mask</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the bits from @id match @model using the</div><div class='add'>+ *	   generic PHY Model mask.</div><div class='add'>+ */</div><div class='add'>+static inline bool phy_id_compare_model(u32 id, u32 model_mask)</div><div class='add'>+{</div><div class='add'>+	return phy_id_compare(id, model_mask, PHY_ID_MATCH_MODEL_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * phydev_id_compare - compare @id with the PHY's Clause 22 ID</div><div class='ctx'>  * @phydev: the PHY device</div><div class='ctx'>  * @id: the PHY ID to be matched</div><div class='hunk'>@@ -1216,39 +1573,12 @@ static inline bool phydev_id_compare(struct phy_device *phydev, u32 id)</div><div class='ctx'> 	return phy_id_compare(id, phydev-&gt;phy_id, phydev-&gt;drv-&gt;phy_id_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* A Structure for boards to register fixups with the PHY Lib */</div><div class='del'>-struct phy_fixup {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	char bus_id[MII_BUS_ID_SIZE + 3];</div><div class='del'>-	u32 phy_uid;</div><div class='del'>-	u32 phy_uid_mask;</div><div class='del'>-	int (*run)(struct phy_device *phydev);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> const char *phy_speed_to_str(int speed);</div><div class='ctx'> const char *phy_duplex_to_str(unsigned int duplex);</div><div class='ctx'> const char *phy_rate_matching_to_str(int rate_matching);</div><div class='ctx'> </div><div class='ctx'> int phy_interface_num_ports(phy_interface_t interface);</div><div class='ctx'> </div><div class='del'>-/* A structure for mapping a particular speed and duplex</div><div class='del'>- * combination to a particular SUPPORTED and ADVERTISED value</div><div class='del'>- */</div><div class='del'>-struct phy_setting {</div><div class='del'>-	u32 speed;</div><div class='del'>-	u8 duplex;</div><div class='del'>-	u8 bit;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct phy_setting *</div><div class='del'>-phy_lookup_setting(int speed, int duplex, const unsigned long *mask,</div><div class='del'>-		   bool exact);</div><div class='del'>-size_t phy_speeds(unsigned int *speeds, size_t size,</div><div class='del'>-		  unsigned long *mask);</div><div class='del'>-void of_set_phy_supported(struct phy_device *phydev);</div><div class='del'>-void of_set_phy_eee_broken(struct phy_device *phydev);</div><div class='del'>-int phy_speed_down_core(struct phy_device *phydev);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * phy_is_started - Convenience function to check whether PHY is started</div><div class='ctx'>  * @phydev: The phy_device struct</div><div class='hunk'>@@ -1258,9 +1588,53 @@ static inline bool phy_is_started(struct phy_device *phydev)</div><div class='ctx'> 	return phydev-&gt;state &gt;= PHY_UP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * phy_driver_is_genphy - Convenience function to check whether PHY is driven</div><div class='add'>+ *                        by one of the generic PHY drivers</div><div class='add'>+ * @phydev: The phy_device struct</div><div class='add'>+ * Return: true if PHY is driven by one of the genphy drivers</div><div class='add'>+ */</div><div class='add'>+static inline bool phy_driver_is_genphy(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	return phydev-&gt;is_genphy_driven;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * phy_disable_eee_mode - Don't advertise an EEE mode.</div><div class='add'>+ * @phydev: The phy_device struct</div><div class='add'>+ * @link_mode: The EEE mode to be disabled</div><div class='add'>+ */</div><div class='add'>+static inline void phy_disable_eee_mode(struct phy_device *phydev, u32 link_mode)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(phy_is_started(phydev));</div><div class='add'>+</div><div class='add'>+	linkmode_set_bit(link_mode, phydev-&gt;eee_disabled_modes);</div><div class='add'>+	linkmode_clear_bit(link_mode, phydev-&gt;advertising_eee);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * phy_can_wakeup() - indicate whether PHY has driver model wakeup capabilities</div><div class='add'>+ * @phydev: The phy_device struct</div><div class='add'>+ *</div><div class='add'>+ * Returns: true/false depending on the PHY driver's device_set_wakeup_capable()</div><div class='add'>+ * setting.</div><div class='add'>+ */</div><div class='add'>+static inline bool phy_can_wakeup(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	return device_can_wakeup(&amp;phydev-&gt;mdio.dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * phy_may_wakeup() - indicate whether PHY has wakeup enabled</div><div class='add'>+ * @phydev: The phy_device struct</div><div class='add'>+ *</div><div class='add'>+ * Returns: true/false depending on the PHY driver's device_set_wakeup_enabled()</div><div class='add'>+ * setting if using the driver model, otherwise the legacy determination.</div><div class='add'>+ */</div><div class='add'>+bool phy_may_wakeup(struct phy_device *phydev);</div><div class='add'>+</div><div class='ctx'> void phy_resolve_aneg_pause(struct phy_device *phydev);</div><div class='ctx'> void phy_resolve_aneg_linkmode(struct phy_device *phydev);</div><div class='del'>-void phy_check_downshift(struct phy_device *phydev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * phy_read - Convenience function for reading a given PHY register</div><div class='hunk'>@@ -1365,12 +1739,13 @@ int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum);</div><div class='ctx'>  * @regnum: The register on the MMD to read</div><div class='ctx'>  * @val: Variable to read the register into</div><div class='ctx'>  * @cond: Break condition (usually involving @val)</div><div class='del'>- * @sleep_us: Maximum time to sleep between reads in us (0</div><div class='del'>- *            tight-loops).  Should be less than ~20ms since usleep_range</div><div class='del'>- *            is used (see Documentation/timers/timers-howto.rst).</div><div class='add'>+ * @sleep_us: Maximum time to sleep between reads in us (0 tight-loops). Please</div><div class='add'>+ *            read usleep_range() function description for details and</div><div class='add'>+ *            limitations.</div><div class='ctx'>  * @timeout_us: Timeout in us, 0 means never timeout</div><div class='ctx'>  * @sleep_before_read: if it is true, sleep @sleep_us before read.</div><div class='del'>- * Returns 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout. In either</div><div class='ctx'>  * case, the last read value at @args is stored in @val. Must not</div><div class='ctx'>  * be called from atomic context if sleep_us or timeout_us are used.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1555,6 +1930,9 @@ static inline bool phy_polling_mode(struct phy_device *phydev)</div><div class='ctx'> 		if (phydev-&gt;drv-&gt;flags &amp; PHY_POLL_CABLE_TEST)</div><div class='ctx'> 			return true;</div><div class='ctx'> </div><div class='add'>+	if (phydev-&gt;drv-&gt;update_stats)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	return phydev-&gt;irq == PHY_POLL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1564,7 +1942,7 @@ static inline bool phy_polling_mode(struct phy_device *phydev)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool phy_has_hwtstamp(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	return phydev &amp;&amp; phydev-&gt;mii_ts &amp;&amp; phydev-&gt;mii_ts-&gt;hwtstamp;</div><div class='add'>+	return phydev &amp;&amp; phydev-&gt;mii_ts &amp;&amp; phydev-&gt;mii_ts-&gt;hwtstamp_set;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1599,7 +1977,7 @@ static inline int phy_hwtstamp(struct phy_device *phydev,</div><div class='ctx'> 			       struct kernel_hwtstamp_config *cfg,</div><div class='ctx'> 			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	return phydev-&gt;mii_ts-&gt;hwtstamp(phydev-&gt;mii_ts, cfg, extack);</div><div class='add'>+	return phydev-&gt;mii_ts-&gt;hwtstamp_set(phydev-&gt;mii_ts, cfg, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool phy_rxtstamp(struct phy_device *phydev, struct sk_buff *skb,</div><div class='hunk'>@@ -1609,7 +1987,7 @@ static inline bool phy_rxtstamp(struct phy_device *phydev, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int phy_ts_info(struct phy_device *phydev,</div><div class='del'>-			      struct ethtool_ts_info *tsinfo)</div><div class='add'>+			      struct kernel_ethtool_ts_info *tsinfo)</div><div class='ctx'> {</div><div class='ctx'> 	return phydev-&gt;mii_ts-&gt;ts_info(phydev-&gt;mii_ts, tsinfo);</div><div class='ctx'> }</div><div class='hunk'>@@ -1621,12 +1999,18 @@ static inline void phy_txtstamp(struct phy_device *phydev, struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * phy_is_internal - Convenience function for testing if a PHY is internal</div><div class='del'>- * @phydev: the phy_device struct</div><div class='add'>+ * phy_is_default_hwtstamp - Is the PHY hwtstamp the default timestamp</div><div class='add'>+ * @phydev: Pointer to phy_device</div><div class='add'>+ *</div><div class='add'>+ * This is used to get default timestamping device taking into account</div><div class='add'>+ * the new API choice, which is selecting the timestamping from MAC by</div><div class='add'>+ * default if the phydev does not have default_timestamp flag enabled.</div><div class='add'>+ *</div><div class='add'>+ * Return: True if phy is the default hw timestamp, false otherwise.</div><div class='ctx'>  */</div><div class='del'>-static inline bool phy_is_internal(struct phy_device *phydev)</div><div class='add'>+static inline bool phy_is_default_hwtstamp(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='del'>-	return phydev-&gt;is_internal;</div><div class='add'>+	return phy_has_hwtstamp(phydev) &amp;&amp; phydev-&gt;default_timestamp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1683,6 +2067,9 @@ static inline bool phy_is_pseudo_fixed_link(struct phy_device *phydev)</div><div class='ctx'> 	return phydev-&gt;is_pseudo_fixed_link;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+phy_interface_t phy_fix_phy_mode_for_mac_delays(phy_interface_t interface,</div><div class='add'>+						bool mac_txid, bool mac_rxid);</div><div class='add'>+</div><div class='ctx'> int phy_save_page(struct phy_device *phydev);</div><div class='ctx'> int phy_select_page(struct phy_device *phydev, int page);</div><div class='ctx'> int phy_restore_page(struct phy_device *phydev, int oldpage, int ret);</div><div class='hunk'>@@ -1696,70 +2083,29 @@ int phy_modify_paged(struct phy_device *phydev, int page, u32 regnum,</div><div class='ctx'> struct phy_device *phy_device_create(struct mii_bus *bus, int addr, u32 phy_id,</div><div class='ctx'> 				     bool is_c45,</div><div class='ctx'> 				     struct phy_c45_device_ids *c45_ids);</div><div class='del'>-#if IS_ENABLED(CONFIG_PHYLIB)</div><div class='ctx'> int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id);</div><div class='ctx'> struct mdio_device *fwnode_mdio_find_device(struct fwnode_handle *fwnode);</div><div class='ctx'> struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode);</div><div class='del'>-struct phy_device *device_phy_find_device(struct device *dev);</div><div class='ctx'> struct fwnode_handle *fwnode_get_phy_node(const struct fwnode_handle *fwnode);</div><div class='ctx'> struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);</div><div class='ctx'> int phy_device_register(struct phy_device *phy);</div><div class='ctx'> void phy_device_free(struct phy_device *phydev);</div><div class='del'>-#else</div><div class='del'>-static inline int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline</div><div class='del'>-struct mdio_device *fwnode_mdio_find_device(struct fwnode_handle *fwnode)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-struct phy_device *fwnode_phy_find_device(struct fwnode_handle *phy_fwnode)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct phy_device *device_phy_find_device(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-struct fwnode_handle *fwnode_get_phy_node(struct fwnode_handle *fwnode)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int phy_device_register(struct phy_device *phy)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void phy_device_free(struct phy_device *phydev) { }</div><div class='del'>-#endif /* CONFIG_PHYLIB */</div><div class='ctx'> void phy_device_remove(struct phy_device *phydev);</div><div class='ctx'> int phy_get_c45_ids(struct phy_device *phydev);</div><div class='ctx'> int phy_init_hw(struct phy_device *phydev);</div><div class='ctx'> int phy_suspend(struct phy_device *phydev);</div><div class='ctx'> int phy_resume(struct phy_device *phydev);</div><div class='ctx'> int __phy_resume(struct phy_device *phydev);</div><div class='del'>-int phy_loopback(struct phy_device *phydev, bool enable);</div><div class='add'>+int phy_loopback(struct phy_device *phydev, bool enable, int speed);</div><div class='add'>+int phy_sfp_connect_phy(void *upstream, struct phy_device *phy);</div><div class='add'>+void phy_sfp_disconnect_phy(void *upstream, struct phy_device *phy);</div><div class='ctx'> void phy_sfp_attach(void *upstream, struct sfp_bus *bus);</div><div class='ctx'> void phy_sfp_detach(void *upstream, struct sfp_bus *bus);</div><div class='ctx'> int phy_sfp_probe(struct phy_device *phydev,</div><div class='ctx'> 	          const struct sfp_upstream_ops *ops);</div><div class='ctx'> struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,</div><div class='ctx'> 			      phy_interface_t interface);</div><div class='del'>-struct phy_device *phy_find_first(struct mii_bus *bus);</div><div class='add'>+struct phy_device *phy_find_next(struct mii_bus *bus, struct phy_device *pos);</div><div class='ctx'> int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,</div><div class='ctx'> 		      u32 flags, phy_interface_t interface);</div><div class='ctx'> int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,</div><div class='hunk'>@@ -1776,6 +2122,9 @@ int phy_config_aneg(struct phy_device *phydev);</div><div class='ctx'> int _phy_start_aneg(struct phy_device *phydev);</div><div class='ctx'> int phy_start_aneg(struct phy_device *phydev);</div><div class='ctx'> int phy_aneg_done(struct phy_device *phydev);</div><div class='add'>+unsigned int phy_inband_caps(struct phy_device *phydev,</div><div class='add'>+			     phy_interface_t interface);</div><div class='add'>+int phy_config_inband(struct phy_device *phydev, unsigned int modes);</div><div class='ctx'> int phy_speed_down(struct phy_device *phydev, bool sync);</div><div class='ctx'> int phy_speed_up(struct phy_device *phydev);</div><div class='ctx'> bool phy_check_valid(int speed, int duplex, unsigned long *features);</div><div class='hunk'>@@ -1783,6 +2132,15 @@ bool phy_check_valid(int speed, int duplex, unsigned long *features);</div><div class='ctx'> int phy_restart_aneg(struct phy_device *phydev);</div><div class='ctx'> int phy_reset_after_clk_enable(struct phy_device *phydev);</div><div class='ctx'> </div><div class='add'>+static inline struct phy_device *phy_find_first(struct mii_bus *bus)</div><div class='add'>+{</div><div class='add'>+	return phy_find_next(bus, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define mdiobus_for_each_phy(_bus, _phydev)		\</div><div class='add'>+	for (_phydev = phy_find_first(_bus); _phydev;	\</div><div class='add'>+	     _phydev = phy_find_next(_bus, _phydev))</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_PHYLIB)</div><div class='ctx'> int phy_start_cable_test(struct phy_device *phydev,</div><div class='ctx'> 			 struct netlink_ext_ack *extack);</div><div class='hunk'>@@ -1848,12 +2206,14 @@ char *phy_attached_info_irq(struct phy_device *phydev)</div><div class='ctx'> 	__malloc;</div><div class='ctx'> void phy_attached_info(struct phy_device *phydev);</div><div class='ctx'> </div><div class='add'>+int genphy_match_phy_device(struct phy_device *phydev,</div><div class='add'>+			    const struct phy_driver *phydrv);</div><div class='add'>+</div><div class='ctx'> /* Clause 22 PHY */</div><div class='ctx'> int genphy_read_abilities(struct phy_device *phydev);</div><div class='ctx'> int genphy_setup_forced(struct phy_device *phydev);</div><div class='ctx'> int genphy_restart_aneg(struct phy_device *phydev);</div><div class='ctx'> int genphy_check_and_restart_aneg(struct phy_device *phydev, bool restart);</div><div class='del'>-int genphy_config_eee_advert(struct phy_device *phydev);</div><div class='ctx'> int __genphy_config_aneg(struct phy_device *phydev, bool changed);</div><div class='ctx'> int genphy_aneg_done(struct phy_device *phydev);</div><div class='ctx'> int genphy_update_link(struct phy_device *phydev);</div><div class='hunk'>@@ -1863,7 +2223,7 @@ int genphy_read_status(struct phy_device *phydev);</div><div class='ctx'> int genphy_read_master_slave(struct phy_device *phydev);</div><div class='ctx'> int genphy_suspend(struct phy_device *phydev);</div><div class='ctx'> int genphy_resume(struct phy_device *phydev);</div><div class='del'>-int genphy_loopback(struct phy_device *phydev, bool enable);</div><div class='add'>+int genphy_loopback(struct phy_device *phydev, bool enable, int speed);</div><div class='ctx'> int genphy_soft_reset(struct phy_device *phydev);</div><div class='ctx'> irqreturn_t genphy_handle_interrupt_no_ack(struct phy_device *phydev);</div><div class='ctx'> </div><div class='hunk'>@@ -1905,7 +2265,7 @@ int genphy_c45_pma_baset1_read_master_slave(struct phy_device *phydev);</div><div class='ctx'> int genphy_c45_read_status(struct phy_device *phydev);</div><div class='ctx'> int genphy_c45_baset1_read_status(struct phy_device *phydev);</div><div class='ctx'> int genphy_c45_config_aneg(struct phy_device *phydev);</div><div class='del'>-int genphy_c45_loopback(struct phy_device *phydev, bool enable);</div><div class='add'>+int genphy_c45_loopback(struct phy_device *phydev, bool enable, int speed);</div><div class='ctx'> int genphy_c45_pma_resume(struct phy_device *phydev);</div><div class='ctx'> int genphy_c45_pma_suspend(struct phy_device *phydev);</div><div class='ctx'> int genphy_c45_fast_retrain(struct phy_device *phydev, bool enable);</div><div class='hunk'>@@ -1915,18 +2275,17 @@ int genphy_c45_plca_set_cfg(struct phy_device *phydev,</div><div class='ctx'> 			    const struct phy_plca_cfg *plca_cfg);</div><div class='ctx'> int genphy_c45_plca_get_status(struct phy_device *phydev,</div><div class='ctx'> 			       struct phy_plca_status *plca_st);</div><div class='del'>-int genphy_c45_eee_is_active(struct phy_device *phydev, unsigned long *adv,</div><div class='del'>-			     unsigned long *lp, bool *is_enabled);</div><div class='add'>+int genphy_c45_eee_is_active(struct phy_device *phydev, unsigned long *lp);</div><div class='ctx'> int genphy_c45_ethtool_get_eee(struct phy_device *phydev,</div><div class='ctx'> 			       struct ethtool_keee *data);</div><div class='ctx'> int genphy_c45_ethtool_set_eee(struct phy_device *phydev,</div><div class='ctx'> 			       struct ethtool_keee *data);</div><div class='del'>-int genphy_c45_write_eee_adv(struct phy_device *phydev, unsigned long *adv);</div><div class='ctx'> int genphy_c45_an_config_eee_aneg(struct phy_device *phydev);</div><div class='del'>-int genphy_c45_read_eee_adv(struct phy_device *phydev, unsigned long *adv);</div><div class='del'>-</div><div class='del'>-/* Generic C45 PHY driver */</div><div class='del'>-extern struct phy_driver genphy_c45_driver;</div><div class='add'>+int genphy_c45_oatc14_cable_test_start(struct phy_device *phydev);</div><div class='add'>+int genphy_c45_oatc14_cable_test_get_status(struct phy_device *phydev,</div><div class='add'>+					    bool *finished);</div><div class='add'>+int genphy_c45_oatc14_get_sqi_max(struct phy_device *phydev);</div><div class='add'>+int genphy_c45_oatc14_get_sqi(struct phy_device *phydev);</div><div class='ctx'> </div><div class='ctx'> /* The gen10g_* functions are the old Clause 45 stub */</div><div class='ctx'> int gen10g_config_aneg(struct phy_device *phydev);</div><div class='hunk'>@@ -1942,14 +2301,11 @@ static inline int phy_read_status(struct phy_device *phydev)</div><div class='ctx'> 		return genphy_read_status(phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void phy_driver_unregister(struct phy_driver *drv);</div><div class='ctx'> void phy_drivers_unregister(struct phy_driver *drv, int n);</div><div class='del'>-int phy_driver_register(struct phy_driver *new_driver, struct module *owner);</div><div class='ctx'> int phy_drivers_register(struct phy_driver *new_driver, int n,</div><div class='ctx'> 			 struct module *owner);</div><div class='ctx'> void phy_error(struct phy_device *phydev);</div><div class='ctx'> void phy_state_machine(struct work_struct *work);</div><div class='del'>-void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies);</div><div class='ctx'> void phy_trigger_machine(struct phy_device *phydev);</div><div class='ctx'> void phy_mac_interrupt(struct phy_device *phydev);</div><div class='ctx'> void phy_start_machine(struct phy_device *phydev);</div><div class='hunk'>@@ -1974,6 +2330,7 @@ void phy_advertise_eee_all(struct phy_device *phydev);</div><div class='ctx'> void phy_support_sym_pause(struct phy_device *phydev);</div><div class='ctx'> void phy_support_asym_pause(struct phy_device *phydev);</div><div class='ctx'> void phy_support_eee(struct phy_device *phydev);</div><div class='add'>+void phy_disable_eee(struct phy_device *phydev);</div><div class='ctx'> void phy_set_sym_pause(struct phy_device *phydev, bool rx, bool tx,</div><div class='ctx'> 		       bool autoneg);</div><div class='ctx'> void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx);</div><div class='hunk'>@@ -1981,14 +2338,19 @@ bool phy_validate_pause(struct phy_device *phydev,</div><div class='ctx'> 			struct ethtool_pauseparam *pp);</div><div class='ctx'> void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause);</div><div class='ctx'> </div><div class='del'>-s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev,</div><div class='del'>-			   const int *delay_values, int size, bool is_rx);</div><div class='add'>+s32 phy_get_internal_delay(struct phy_device *phydev, const int *delay_values,</div><div class='add'>+			   int size, bool is_rx);</div><div class='add'>+</div><div class='add'>+int phy_get_tx_amplitude_gain(struct phy_device *phydev, struct device *dev,</div><div class='add'>+			      enum ethtool_link_mode_bit_indices linkmode,</div><div class='add'>+			      u32 *val);</div><div class='add'>+</div><div class='add'>+int phy_get_mac_termination(struct phy_device *phydev, struct device *dev,</div><div class='add'>+			    u32 *val);</div><div class='ctx'> </div><div class='ctx'> void phy_resolve_pause(unsigned long *local_adv, unsigned long *partner_adv,</div><div class='ctx'> 		       bool *tx_pause, bool *rx_pause);</div><div class='ctx'> </div><div class='del'>-int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,</div><div class='del'>-		       int (*run)(struct phy_device *));</div><div class='ctx'> int phy_register_fixup_for_id(const char *bus_id,</div><div class='ctx'> 			      int (*run)(struct phy_device *));</div><div class='ctx'> int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,</div><div class='hunk'>@@ -1998,6 +2360,8 @@ int phy_unregister_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask);</div><div class='ctx'> int phy_unregister_fixup_for_id(const char *bus_id);</div><div class='ctx'> int phy_unregister_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask);</div><div class='ctx'> </div><div class='add'>+int phy_eee_tx_clock_stop_capable(struct phy_device *phydev);</div><div class='add'>+int phy_eee_rx_clock_stop(struct phy_device *phydev, bool clk_stop_enable);</div><div class='ctx'> int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable);</div><div class='ctx'> int phy_get_eee_err(struct phy_device *phydev);</div><div class='ctx'> int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_keee *data);</div><div class='hunk'>@@ -2010,21 +2374,18 @@ int phy_ethtool_get_link_ksettings(struct net_device *ndev,</div><div class='ctx'> int phy_ethtool_set_link_ksettings(struct net_device *ndev,</div><div class='ctx'> 				   const struct ethtool_link_ksettings *cmd);</div><div class='ctx'> int phy_ethtool_nway_reset(struct net_device *ndev);</div><div class='del'>-int phy_package_join(struct phy_device *phydev, int base_addr, size_t priv_size);</div><div class='del'>-int of_phy_package_join(struct phy_device *phydev, size_t priv_size);</div><div class='del'>-void phy_package_leave(struct phy_device *phydev);</div><div class='del'>-int devm_phy_package_join(struct device *dev, struct phy_device *phydev,</div><div class='del'>-			  int base_addr, size_t priv_size);</div><div class='del'>-int devm_of_phy_package_join(struct device *dev, struct phy_device *phydev,</div><div class='del'>-			     size_t priv_size);</div><div class='del'>-</div><div class='del'>-int __init mdio_bus_init(void);</div><div class='del'>-void mdio_bus_exit(void);</div><div class='ctx'> </div><div class='ctx'> int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data);</div><div class='ctx'> int phy_ethtool_get_sset_count(struct phy_device *phydev);</div><div class='ctx'> int phy_ethtool_get_stats(struct phy_device *phydev,</div><div class='ctx'> 			  struct ethtool_stats *stats, u64 *data);</div><div class='add'>+</div><div class='add'>+void __phy_ethtool_get_phy_stats(struct phy_device *phydev,</div><div class='add'>+			 struct ethtool_eth_phy_stats *phy_stats,</div><div class='add'>+			 struct ethtool_phy_stats *phydev_stats);</div><div class='add'>+void __phy_ethtool_get_link_ext_stats(struct phy_device *phydev,</div><div class='add'>+				      struct ethtool_link_ext_stats *link_stats);</div><div class='add'>+</div><div class='ctx'> int phy_ethtool_get_plca_cfg(struct phy_device *phydev,</div><div class='ctx'> 			     struct phy_plca_cfg *plca_cfg);</div><div class='ctx'> int phy_ethtool_set_plca_cfg(struct phy_device *phydev,</div><div class='hunk'>@@ -2039,124 +2400,8 @@ int __phy_hwtstamp_set(struct phy_device *phydev,</div><div class='ctx'> 		       struct kernel_hwtstamp_config *config,</div><div class='ctx'> 		       struct netlink_ext_ack *extack);</div><div class='ctx'> </div><div class='del'>-static inline int phy_package_address(struct phy_device *phydev,</div><div class='del'>-				      unsigned int addr_offset)</div><div class='del'>-{</div><div class='del'>-	struct phy_package_shared *shared = phydev-&gt;shared;</div><div class='del'>-	u8 base_addr = shared-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	if (addr_offset &gt;= PHY_MAX_ADDR - base_addr)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	/* we know that addr will be in the range 0..31 and thus the</div><div class='del'>-	 * implicit cast to a signed int is not a problem.</div><div class='del'>-	 */</div><div class='del'>-	return base_addr + addr_offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int phy_package_read(struct phy_device *phydev,</div><div class='del'>-				   unsigned int addr_offset, u32 regnum)</div><div class='del'>-{</div><div class='del'>-	int addr = phy_package_address(phydev, addr_offset);</div><div class='del'>-</div><div class='del'>-	if (addr &lt; 0)</div><div class='del'>-		return addr;</div><div class='del'>-</div><div class='del'>-	return mdiobus_read(phydev-&gt;mdio.bus, addr, regnum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __phy_package_read(struct phy_device *phydev,</div><div class='del'>-				     unsigned int addr_offset, u32 regnum)</div><div class='del'>-{</div><div class='del'>-	int addr = phy_package_address(phydev, addr_offset);</div><div class='del'>-</div><div class='del'>-	if (addr &lt; 0)</div><div class='del'>-		return addr;</div><div class='del'>-</div><div class='del'>-	return __mdiobus_read(phydev-&gt;mdio.bus, addr, regnum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int phy_package_write(struct phy_device *phydev,</div><div class='del'>-				    unsigned int addr_offset, u32 regnum,</div><div class='del'>-				    u16 val)</div><div class='del'>-{</div><div class='del'>-	int addr = phy_package_address(phydev, addr_offset);</div><div class='del'>-</div><div class='del'>-	if (addr &lt; 0)</div><div class='del'>-		return addr;</div><div class='del'>-</div><div class='del'>-	return mdiobus_write(phydev-&gt;mdio.bus, addr, regnum, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __phy_package_write(struct phy_device *phydev,</div><div class='del'>-				      unsigned int addr_offset, u32 regnum,</div><div class='del'>-				      u16 val)</div><div class='del'>-{</div><div class='del'>-	int addr = phy_package_address(phydev, addr_offset);</div><div class='del'>-</div><div class='del'>-	if (addr &lt; 0)</div><div class='del'>-		return addr;</div><div class='del'>-</div><div class='del'>-	return __mdiobus_write(phydev-&gt;mdio.bus, addr, regnum, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __phy_package_read_mmd(struct phy_device *phydev,</div><div class='del'>-			   unsigned int addr_offset, int devad,</div><div class='del'>-			   u32 regnum);</div><div class='del'>-</div><div class='del'>-int phy_package_read_mmd(struct phy_device *phydev,</div><div class='del'>-			 unsigned int addr_offset, int devad,</div><div class='del'>-			 u32 regnum);</div><div class='del'>-</div><div class='del'>-int __phy_package_write_mmd(struct phy_device *phydev,</div><div class='del'>-			    unsigned int addr_offset, int devad,</div><div class='del'>-			    u32 regnum, u16 val);</div><div class='del'>-</div><div class='del'>-int phy_package_write_mmd(struct phy_device *phydev,</div><div class='del'>-			  unsigned int addr_offset, int devad,</div><div class='del'>-			  u32 regnum, u16 val);</div><div class='del'>-</div><div class='del'>-static inline bool __phy_package_set_once(struct phy_device *phydev,</div><div class='del'>-					  unsigned int b)</div><div class='del'>-{</div><div class='del'>-	struct phy_package_shared *shared = phydev-&gt;shared;</div><div class='del'>-</div><div class='del'>-	if (!shared)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return !test_and_set_bit(b, &amp;shared-&gt;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool phy_package_init_once(struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	return __phy_package_set_once(phydev, PHY_SHARED_F_INIT_DONE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool phy_package_probe_once(struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	return __phy_package_set_once(phydev, PHY_SHARED_F_PROBE_DONE);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern const struct bus_type mdio_bus_type;</div><div class='del'>-</div><div class='del'>-struct mdio_board_info {</div><div class='del'>-	const char	*bus_id;</div><div class='del'>-	char		modalias[MDIO_NAME_SIZE];</div><div class='del'>-	int		mdio_addr;</div><div class='del'>-	const void	*platform_data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_MDIO_DEVICE)</div><div class='del'>-int mdiobus_register_board_info(const struct mdio_board_info *info,</div><div class='del'>-				unsigned int n);</div><div class='del'>-#else</div><div class='del'>-static inline int mdiobus_register_board_info(const struct mdio_board_info *i,</div><div class='del'>-					      unsigned int n)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+extern const struct class mdio_bus_class;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * phy_module_driver() - Helper macro for registering PHY drivers</div><div class='hunk'>@@ -2182,7 +2427,4 @@ module_exit(phy_module_exit)</div><div class='ctx'> #define module_phy_driver(__phy_drivers)				\</div><div class='ctx'> 	phy_module_driver(__phy_drivers, ARRAY_SIZE(__phy_drivers))</div><div class='ctx'> </div><div class='del'>-bool phy_driver_is_genphy(struct phy_device *phydev);</div><div class='del'>-bool phy_driver_is_genphy_10g(struct phy_device *phydev);</div><div class='del'>-</div><div class='ctx'> #endif /* __PHY_H */</div><div class='head'>diff --git a/include/linux/phy/phy-dp.h b/include/linux/phy/phy-dp.h<br/>index 18cad23642cd..9cce5766bc0b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/phy/phy-dp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/phy-dp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phy/phy-dp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phy/phy-dp.h</a></div><div class='hunk'>@@ -8,6 +8,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#define PHY_SUBMODE_DP	0</div><div class='add'>+#define PHY_SUBMODE_EDP	1</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct phy_configure_opts_dp - DisplayPort PHY configuration set</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/linux/phy/phy-hdmi.h b/include/linux/phy/phy-hdmi.h<br/>new file mode 100644<br/>index 000000000000..f0ec963c6e84<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phy/phy-hdmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phy/phy-hdmi.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2022,2024 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PHY_HDMI_H_</div><div class='add'>+#define __PHY_HDMI_H_</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct phy_configure_opts_hdmi - HDMI configuration set</div><div class='add'>+ * @tmds_char_rate: HDMI TMDS Character Rate in Hertz.</div><div class='add'>+ * @bpc: Bits per color channel.</div><div class='add'>+ *</div><div class='add'>+ * This structure is used to represent the configuration state of a HDMI phy.</div><div class='add'>+ */</div><div class='add'>+struct phy_configure_opts_hdmi {</div><div class='add'>+	unsigned long long tmds_char_rate;</div><div class='add'>+	unsigned int bpc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __PHY_HDMI_H_ */</div><div class='head'>diff --git a/include/linux/phy/phy-sun4i-usb.h b/include/linux/phy/phy-sun4i-usb.h<br/>index 91eb755ee73b..f3e7b13608e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/phy/phy-sun4i-usb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/phy-sun4i-usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phy/phy-sun4i-usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phy/phy-sun4i-usb.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> /**</div><div class='ctx'>  * sun4i_usb_phy_set_squelch_detect() - Enable/disable squelch detect</div><div class='ctx'>  * @phy: reference to a sun4i usb phy</div><div class='del'>- * @enabled: wether to enable or disable squelch detect</div><div class='add'>+ * @enabled: whether to enable or disable squelch detect</div><div class='ctx'>  */</div><div class='ctx'> void sun4i_usb_phy_set_squelch_detect(struct phy *phy, bool enabled);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h<br/>index f6d607ef0e80..2af0d01ebb39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/phy/phy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phy/phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phy/phy.h</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/phy/phy-dp.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy-hdmi.h&gt;</div><div class='ctx'> #include &lt;linux/phy/phy-lvds.h&gt;</div><div class='ctx'> #include &lt;linux/phy/phy-mipi-dphy.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -42,7 +43,8 @@ enum phy_mode {</div><div class='ctx'> 	PHY_MODE_MIPI_DPHY,</div><div class='ctx'> 	PHY_MODE_SATA,</div><div class='ctx'> 	PHY_MODE_LVDS,</div><div class='del'>-	PHY_MODE_DP</div><div class='add'>+	PHY_MODE_DP,</div><div class='add'>+	PHY_MODE_HDMI,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum phy_media {</div><div class='hunk'>@@ -51,6 +53,15 @@ enum phy_media {</div><div class='ctx'> 	PHY_MEDIA_DAC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum phy_ufs_state {</div><div class='add'>+	PHY_UFS_HIBERN8_ENTER,</div><div class='add'>+	PHY_UFS_HIBERN8_EXIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union phy_notify {</div><div class='add'>+	enum phy_ufs_state ufs_state;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * union phy_configure_opts - Opaque generic phy configuration</div><div class='ctx'>  *</div><div class='hunk'>@@ -60,11 +71,14 @@ enum phy_media {</div><div class='ctx'>  *		the DisplayPort protocol.</div><div class='ctx'>  * @lvds:	Configuration set applicable for phys supporting</div><div class='ctx'>  *		the LVDS phy mode.</div><div class='add'>+ * @hdmi:	Configuration set applicable for phys supporting</div><div class='add'>+ *		the HDMI phy mode.</div><div class='ctx'>  */</div><div class='ctx'> union phy_configure_opts {</div><div class='ctx'> 	struct phy_configure_opts_mipi_dphy	mipi_dphy;</div><div class='ctx'> 	struct phy_configure_opts_dp		dp;</div><div class='ctx'> 	struct phy_configure_opts_lvds		lvds;</div><div class='add'>+	struct phy_configure_opts_hdmi		hdmi;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -78,6 +92,7 @@ union phy_configure_opts {</div><div class='ctx'>  * @set_speed: set the speed of the phy (optional)</div><div class='ctx'>  * @reset: resetting the phy</div><div class='ctx'>  * @calibrate: calibrate the phy</div><div class='add'>+ * @notify_phystate: notify and configure the phy for a particular state</div><div class='ctx'>  * @release: ops to be performed while the consumer relinquishes the PHY</div><div class='ctx'>  * @owner: the module owner containing the ops</div><div class='ctx'>  */</div><div class='hunk'>@@ -122,6 +137,12 @@ struct phy_ops {</div><div class='ctx'> 			    union phy_configure_opts *opts);</div><div class='ctx'> 	int	(*reset)(struct phy *phy);</div><div class='ctx'> 	int	(*calibrate)(struct phy *phy);</div><div class='add'>+</div><div class='add'>+	/* notify phy connect status change */</div><div class='add'>+	int	(*connect)(struct phy *phy, int port);</div><div class='add'>+	int	(*disconnect)(struct phy *phy, int port);</div><div class='add'>+</div><div class='add'>+	int	(*notify_phystate)(struct phy *phy, union phy_notify state);</div><div class='ctx'> 	void	(*release)(struct phy *phy);</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> };</div><div class='hunk'>@@ -144,6 +165,7 @@ struct phy_attrs {</div><div class='ctx'>  * @id: id of the phy device</div><div class='ctx'>  * @ops: function pointers for performing phy operations</div><div class='ctx'>  * @mutex: mutex to protect phy_ops</div><div class='add'>+ * @lockdep_key: lockdep information for this mutex</div><div class='ctx'>  * @init_count: used to protect when the PHY is used by multiple consumers</div><div class='ctx'>  * @power_count: used to protect when the PHY is used by multiple consumers</div><div class='ctx'>  * @attrs: used to specify PHY specific attributes</div><div class='hunk'>@@ -155,6 +177,7 @@ struct phy {</div><div class='ctx'> 	int			id;</div><div class='ctx'> 	const struct phy_ops	*ops;</div><div class='ctx'> 	struct mutex		mutex;</div><div class='add'>+	struct lock_class_key	lockdep_key;</div><div class='ctx'> 	int			init_count;</div><div class='ctx'> 	int			power_count;</div><div class='ctx'> 	struct phy_attrs	attrs;</div><div class='hunk'>@@ -176,7 +199,7 @@ struct phy_provider {</div><div class='ctx'> 	struct module		*owner;</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> 	struct phy * (*of_xlate)(struct device *dev,</div><div class='del'>-		struct of_phandle_args *args);</div><div class='add'>+				 const struct of_phandle_args *args);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -222,8 +245,6 @@ int phy_pm_runtime_get(struct phy *phy);</div><div class='ctx'> int phy_pm_runtime_get_sync(struct phy *phy);</div><div class='ctx'> int phy_pm_runtime_put(struct phy *phy);</div><div class='ctx'> int phy_pm_runtime_put_sync(struct phy *phy);</div><div class='del'>-void phy_pm_runtime_allow(struct phy *phy);</div><div class='del'>-void phy_pm_runtime_forbid(struct phy *phy);</div><div class='ctx'> int phy_init(struct phy *phy);</div><div class='ctx'> int phy_exit(struct phy *phy);</div><div class='ctx'> int phy_power_on(struct phy *phy);</div><div class='hunk'>@@ -243,6 +264,9 @@ static inline enum phy_mode phy_get_mode(struct phy *phy)</div><div class='ctx'> }</div><div class='ctx'> int phy_reset(struct phy *phy);</div><div class='ctx'> int phy_calibrate(struct phy *phy);</div><div class='add'>+int phy_notify_connect(struct phy *phy, int port);</div><div class='add'>+int phy_notify_disconnect(struct phy *phy, int port);</div><div class='add'>+int phy_notify_state(struct phy *phy, union phy_notify state);</div><div class='ctx'> static inline int phy_get_bus_width(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	return phy-&gt;attrs.bus_width;</div><div class='hunk'>@@ -265,7 +289,7 @@ void phy_put(struct device *dev, struct phy *phy);</div><div class='ctx'> void devm_phy_put(struct device *dev, struct phy *phy);</div><div class='ctx'> struct phy *of_phy_get(struct device_node *np, const char *con_id);</div><div class='ctx'> struct phy *of_phy_simple_xlate(struct device *dev,</div><div class='del'>-	struct of_phandle_args *args);</div><div class='add'>+				const struct of_phandle_args *args);</div><div class='ctx'> struct phy *phy_create(struct device *dev, struct device_node *node,</div><div class='ctx'> 		       const struct phy_ops *ops);</div><div class='ctx'> struct phy *devm_phy_create(struct device *dev, struct device_node *node,</div><div class='hunk'>@@ -275,11 +299,11 @@ void devm_phy_destroy(struct device *dev, struct phy *phy);</div><div class='ctx'> struct phy_provider *__of_phy_provider_register(struct device *dev,</div><div class='ctx'> 	struct device_node *children, struct module *owner,</div><div class='ctx'> 	struct phy * (*of_xlate)(struct device *dev,</div><div class='del'>-				 struct of_phandle_args *args));</div><div class='add'>+				 const struct of_phandle_args *args));</div><div class='ctx'> struct phy_provider *__devm_of_phy_provider_register(struct device *dev,</div><div class='ctx'> 	struct device_node *children, struct module *owner,</div><div class='ctx'> 	struct phy * (*of_xlate)(struct device *dev,</div><div class='del'>-				 struct of_phandle_args *args));</div><div class='add'>+				 const struct of_phandle_args *args));</div><div class='ctx'> void of_phy_provider_unregister(struct phy_provider *phy_provider);</div><div class='ctx'> void devm_of_phy_provider_unregister(struct device *dev,</div><div class='ctx'> 	struct phy_provider *phy_provider);</div><div class='hunk'>@@ -314,16 +338,6 @@ static inline int phy_pm_runtime_put_sync(struct phy *phy)</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void phy_pm_runtime_allow(struct phy *phy)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void phy_pm_runtime_forbid(struct phy *phy)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int phy_init(struct phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	if (!phy)</div><div class='hunk'>@@ -396,6 +410,27 @@ static inline int phy_calibrate(struct phy *phy)</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int phy_notify_connect(struct phy *phy, int index)</div><div class='add'>+{</div><div class='add'>+	if (!phy)</div><div class='add'>+		return 0;</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int phy_notify_disconnect(struct phy *phy, int index)</div><div class='add'>+{</div><div class='add'>+	if (!phy)</div><div class='add'>+		return 0;</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int phy_notify_state(struct phy *phy, union phy_notify state)</div><div class='add'>+{</div><div class='add'>+	if (!phy)</div><div class='add'>+		return 0;</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int phy_configure(struct phy *phy,</div><div class='ctx'> 				union phy_configure_opts *opts)</div><div class='ctx'> {</div><div class='hunk'>@@ -479,7 +514,7 @@ static inline struct phy *of_phy_get(struct device_node *np, const char *con_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct phy *of_phy_simple_xlate(struct device *dev,</div><div class='del'>-	struct of_phandle_args *args)</div><div class='add'>+					      const struct of_phandle_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENOSYS);</div><div class='ctx'> }</div><div class='hunk'>@@ -509,7 +544,7 @@ static inline void devm_phy_destroy(struct device *dev, struct phy *phy)</div><div class='ctx'> static inline struct phy_provider *__of_phy_provider_register(</div><div class='ctx'> 	struct device *dev, struct device_node *children, struct module *owner,</div><div class='ctx'> 	struct phy * (*of_xlate)(struct device *dev,</div><div class='del'>-				 struct of_phandle_args *args))</div><div class='add'>+				 const struct of_phandle_args *args))</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENOSYS);</div><div class='ctx'> }</div><div class='hunk'>@@ -517,7 +552,7 @@ static inline struct phy_provider *__of_phy_provider_register(</div><div class='ctx'> static inline struct phy_provider *__devm_of_phy_provider_register(struct device</div><div class='ctx'> 	*dev, struct device_node *children, struct module *owner,</div><div class='ctx'> 	struct phy * (*of_xlate)(struct device *dev,</div><div class='del'>-				 struct of_phandle_args *args))</div><div class='add'>+				 const struct of_phandle_args *args))</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENOSYS);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/phy/tegra/xusb.h b/include/linux/phy/tegra/xusb.h<br/>index 70998e6dd6fd..6ca51e0080ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/phy/tegra/xusb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy/tegra/xusb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phy/tegra/xusb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phy/tegra/xusb.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@ void tegra_phy_xusb_utmi_pad_power_down(struct phy *phy);</div><div class='ctx'> int tegra_phy_xusb_utmi_port_reset(struct phy *phy);</div><div class='ctx'> int tegra_xusb_padctl_get_usb3_companion(struct tegra_xusb_padctl *padctl,</div><div class='ctx'> 					 unsigned int port);</div><div class='add'>+int tegra_xusb_padctl_get_port_number(struct phy *phy);</div><div class='ctx'> int tegra_xusb_padctl_enable_phy_sleepwalk(struct tegra_xusb_padctl *padctl, struct phy *phy,</div><div class='ctx'> 					   enum usb_device_speed speed);</div><div class='ctx'> int tegra_xusb_padctl_disable_phy_sleepwalk(struct tegra_xusb_padctl *padctl, struct phy *phy);</div><div class='head'>diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h<br/>index 1acafd86ab13..436bff20f324 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/phy_fixed.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phy_fixed.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phy_fixed.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phy_fixed.h</a></div><div class='hunk'>@@ -5,51 +5,35 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct fixed_phy_status {</div><div class='del'>-	int link;</div><div class='ctx'> 	int speed;</div><div class='ctx'> 	int duplex;</div><div class='del'>-	int pause;</div><div class='del'>-	int asym_pause;</div><div class='add'>+	bool link:1;</div><div class='add'>+	bool pause:1;</div><div class='add'>+	bool asym_pause:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct device_node;</div><div class='del'>-struct gpio_desc;</div><div class='ctx'> struct net_device;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_FIXED_PHY)</div><div class='ctx'> extern int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier);</div><div class='del'>-extern int fixed_phy_add(unsigned int irq, int phy_id,</div><div class='del'>-			 struct fixed_phy_status *status);</div><div class='del'>-extern struct phy_device *fixed_phy_register(unsigned int irq,</div><div class='del'>-					     struct fixed_phy_status *status,</div><div class='del'>-					     struct device_node *np);</div><div class='del'>-</div><div class='del'>-extern struct phy_device *</div><div class='del'>-fixed_phy_register_with_gpiod(unsigned int irq,</div><div class='del'>-			      struct fixed_phy_status *status,</div><div class='del'>-			      struct gpio_desc *gpiod);</div><div class='add'>+struct phy_device *fixed_phy_register(const struct fixed_phy_status *status,</div><div class='add'>+				      struct device_node *np);</div><div class='add'>+struct phy_device *fixed_phy_register_100fd(void);</div><div class='ctx'> </div><div class='ctx'> extern void fixed_phy_unregister(struct phy_device *phydev);</div><div class='ctx'> extern int fixed_phy_set_link_update(struct phy_device *phydev,</div><div class='ctx'> 			int (*link_update)(struct net_device *,</div><div class='ctx'> 					   struct fixed_phy_status *));</div><div class='ctx'> #else</div><div class='del'>-static inline int fixed_phy_add(unsigned int irq, int phy_id,</div><div class='del'>-				struct fixed_phy_status *status)</div><div class='del'>-{</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-static inline struct phy_device *fixed_phy_register(unsigned int irq,</div><div class='del'>-						struct fixed_phy_status *status,</div><div class='del'>-						struct device_node *np)</div><div class='add'>+static inline struct phy_device *</div><div class='add'>+fixed_phy_register(const struct fixed_phy_status *status,</div><div class='add'>+		   struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct phy_device *</div><div class='del'>-fixed_phy_register_with_gpiod(unsigned int irq,</div><div class='del'>-			      struct fixed_phy_status *status,</div><div class='del'>-			      struct gpio_desc *gpiod)</div><div class='add'>+static inline struct phy_device *fixed_phy_register_100fd(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='hunk'>@@ -57,16 +41,6 @@ fixed_phy_register_with_gpiod(unsigned int irq,</div><div class='ctx'> static inline void fixed_phy_unregister(struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline int fixed_phy_set_link_update(struct phy_device *phydev,</div><div class='del'>-			int (*link_update)(struct net_device *,</div><div class='del'>-					   struct fixed_phy_status *))</div><div class='del'>-{</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-static inline int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='ctx'> #endif /* CONFIG_FIXED_PHY */</div><div class='ctx'> </div><div class='ctx'> #endif /* __PHY_FIXED_H */</div><div class='head'>diff --git a/include/linux/phy_link_topology.h b/include/linux/phy_link_topology.h<br/>new file mode 100644<br/>index 000000000000..68a59e25821c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phy_link_topology.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phy_link_topology.h</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * PHY device list allow maintaining a list of PHY devices that are</div><div class='add'>+ * part of a netdevice's link topology. PHYs can for example be chained,</div><div class='add'>+ * as is the case when using a PHY that exposes an SFP module, on which an</div><div class='add'>+ * SFP transceiver that embeds a PHY is connected.</div><div class='add'>+ *</div><div class='add'>+ * This list can then be used by userspace to leverage individual PHY</div><div class='add'>+ * capabilities.</div><div class='add'>+ */</div><div class='add'>+#ifndef __PHY_LINK_TOPOLOGY_H</div><div class='add'>+#define __PHY_LINK_TOPOLOGY_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+struct xarray;</div><div class='add'>+struct phy_device;</div><div class='add'>+struct sfp_bus;</div><div class='add'>+</div><div class='add'>+struct phy_link_topology {</div><div class='add'>+	struct xarray phys;</div><div class='add'>+	u32 next_phy_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct phy_device_node {</div><div class='add'>+	enum phy_upstream upstream_type;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct net_device	*netdev;</div><div class='add'>+		struct phy_device	*phydev;</div><div class='add'>+	} upstream;</div><div class='add'>+</div><div class='add'>+	struct sfp_bus *parent_sfp_bus;</div><div class='add'>+</div><div class='add'>+	struct phy_device *phy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_PHYLIB)</div><div class='add'>+int phy_link_topo_add_phy(struct net_device *dev,</div><div class='add'>+			  struct phy_device *phy,</div><div class='add'>+			  enum phy_upstream upt, void *upstream);</div><div class='add'>+</div><div class='add'>+void phy_link_topo_del_phy(struct net_device *dev, struct phy_device *phy);</div><div class='add'>+</div><div class='add'>+static inline struct phy_device *</div><div class='add'>+phy_link_topo_get_phy(struct net_device *dev, u32 phyindex)</div><div class='add'>+{</div><div class='add'>+	struct phy_link_topology *topo = dev-&gt;link_topo;</div><div class='add'>+	struct phy_device_node *pdn;</div><div class='add'>+</div><div class='add'>+	if (!topo)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pdn = xa_load(&amp;topo-&gt;phys, phyindex);</div><div class='add'>+	if (pdn)</div><div class='add'>+		return pdn-&gt;phy;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline int phy_link_topo_add_phy(struct net_device *dev,</div><div class='add'>+					struct phy_device *phy,</div><div class='add'>+					enum phy_upstream upt, void *upstream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void phy_link_topo_del_phy(struct net_device *dev,</div><div class='add'>+					 struct phy_device *phy)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct phy_device *</div><div class='add'>+phy_link_topo_get_phy(struct net_device *dev, u32 phyindex)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __PHY_LINK_TOPOLOGY_H */</div><div class='head'>diff --git a/include/linux/phylib_stubs.h b/include/linux/phylib_stubs.h<br/>index 1279f48c8a70..9d2d6090c86d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/phylib_stubs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phylib_stubs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phylib_stubs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phylib_stubs.h</a></div><div class='hunk'>@@ -5,6 +5,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> </div><div class='add'>+struct ethtool_eth_phy_stats;</div><div class='add'>+struct ethtool_link_ext_stats;</div><div class='add'>+struct ethtool_phy_stats;</div><div class='ctx'> struct kernel_hwtstamp_config;</div><div class='ctx'> struct netlink_ext_ack;</div><div class='ctx'> struct phy_device;</div><div class='hunk'>@@ -19,6 +22,11 @@ struct phylib_stubs {</div><div class='ctx'> 	int (*hwtstamp_set)(struct phy_device *phydev,</div><div class='ctx'> 			    struct kernel_hwtstamp_config *config,</div><div class='ctx'> 			    struct netlink_ext_ack *extack);</div><div class='add'>+	void (*get_phy_stats)(struct phy_device *phydev,</div><div class='add'>+			      struct ethtool_eth_phy_stats *phy_stats,</div><div class='add'>+			      struct ethtool_phy_stats *phydev_stats);</div><div class='add'>+	void (*get_link_ext_stats)(struct phy_device *phydev,</div><div class='add'>+				   struct ethtool_link_ext_stats *link_stats);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int phy_hwtstamp_get(struct phy_device *phydev,</div><div class='hunk'>@@ -50,6 +58,29 @@ static inline int phy_hwtstamp_set(struct phy_device *phydev,</div><div class='ctx'> 	return phylib_stubs-&gt;hwtstamp_set(phydev, config, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void phy_ethtool_get_phy_stats(struct phy_device *phydev,</div><div class='add'>+					struct ethtool_eth_phy_stats *phy_stats,</div><div class='add'>+					struct ethtool_phy_stats *phydev_stats)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!phylib_stubs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	phylib_stubs-&gt;get_phy_stats(phydev, phy_stats, phydev_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void phy_ethtool_get_link_ext_stats(struct phy_device *phydev,</div><div class='add'>+				    struct ethtool_link_ext_stats *link_stats)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!phylib_stubs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	phylib_stubs-&gt;get_link_ext_stats(phydev, link_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline int phy_hwtstamp_get(struct phy_device *phydev,</div><div class='hunk'>@@ -65,4 +96,15 @@ static inline int phy_hwtstamp_set(struct phy_device *phydev,</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void phy_ethtool_get_phy_stats(struct phy_device *phydev,</div><div class='add'>+					struct ethtool_eth_phy_stats *phy_stats,</div><div class='add'>+					struct ethtool_phy_stats *phydev_stats)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void phy_ethtool_get_link_ext_stats(struct phy_device *phydev,</div><div class='add'>+				    struct ethtool_link_ext_stats *link_stats)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/phylink.h b/include/linux/phylink.h<br/>index 9a57deefcb07..38363e566ac3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/phylink.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/phylink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/phylink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/phylink.h</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/eee.h&gt;</div><div class='add'>+</div><div class='ctx'> struct device_node;</div><div class='ctx'> struct ethtool_cmd;</div><div class='ctx'> struct fwnode_handle;</div><div class='hunk'>@@ -138,23 +140,47 @@ enum phylink_op_type {</div><div class='ctx'>  * @poll_fixed_state: if true, starts link_poll,</div><div class='ctx'>  *		      if MAC link is at %MLO_AN_FIXED mode.</div><div class='ctx'>  * @mac_managed_pm: if true, indicate the MAC driver is responsible for PHY PM.</div><div class='del'>- * @ovr_an_inband: if true, override PCS to MLO_AN_INBAND</div><div class='add'>+ * @mac_requires_rxc: if true, the MAC always requires a receive clock from PHY.</div><div class='add'>+ *                    The PHY driver should start the clock signal as soon as</div><div class='add'>+ *                    possible and avoid stopping it during suspend events.</div><div class='add'>+ * @default_an_inband: if true, defaults to MLO_AN_INBAND rather than</div><div class='add'>+ *		       MLO_AN_PHY. A fixed-link specification will override.</div><div class='add'>+ * @eee_rx_clk_stop_enable: if true, PHY can stop the receive clock during LPI</div><div class='ctx'>  * @get_fixed_state: callback to execute to determine the fixed link state,</div><div class='ctx'>  *		     if MAC link is at %MLO_AN_FIXED mode.</div><div class='ctx'>  * @supported_interfaces: bitmap describing which PHY_INTERFACE_MODE_xxx</div><div class='ctx'>  *                        are supported by the MAC/PCS.</div><div class='add'>+ * @lpi_interfaces: bitmap describing which PHY interface modes can support</div><div class='add'>+ *		    LPI signalling.</div><div class='ctx'>  * @mac_capabilities: MAC pause/speed/duplex capabilities.</div><div class='add'>+ * @lpi_capabilities: MAC speeds which can support LPI signalling</div><div class='add'>+ * @lpi_timer_default: Default EEE LPI timer setting.</div><div class='add'>+ * @eee_enabled_default: If set, EEE will be enabled by phylink at creation time</div><div class='add'>+ * @wol_phy_legacy: Use Wake-on-Lan with PHY even if phy_can_wakeup() is false</div><div class='add'>+ * @wol_phy_speed_ctrl: Use phy speed control on suspend/resume</div><div class='add'>+ * @wol_mac_support: Bitmask of MAC supported %WAKE_* options</div><div class='ctx'>  */</div><div class='ctx'> struct phylink_config {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	enum phylink_op_type type;</div><div class='ctx'> 	bool poll_fixed_state;</div><div class='ctx'> 	bool mac_managed_pm;</div><div class='del'>-	bool ovr_an_inband;</div><div class='add'>+	bool mac_requires_rxc;</div><div class='add'>+	bool default_an_inband;</div><div class='add'>+	bool eee_rx_clk_stop_enable;</div><div class='ctx'> 	void (*get_fixed_state)(struct phylink_config *config,</div><div class='ctx'> 				struct phylink_link_state *state);</div><div class='ctx'> 	DECLARE_PHY_INTERFACE_MASK(supported_interfaces);</div><div class='add'>+	DECLARE_PHY_INTERFACE_MASK(lpi_interfaces);</div><div class='ctx'> 	unsigned long mac_capabilities;</div><div class='add'>+	unsigned long lpi_capabilities;</div><div class='add'>+	u32 lpi_timer_default;</div><div class='add'>+	bool eee_enabled_default;</div><div class='add'>+</div><div class='add'>+	/* Wake-on-Lan support */</div><div class='add'>+	bool wol_phy_legacy;</div><div class='add'>+	bool wol_phy_speed_ctrl;</div><div class='add'>+	u32 wol_mac_support;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void phylink_limit_mac_speed(struct phylink_config *config, u32 max_speed);</div><div class='hunk'>@@ -168,6 +194,9 @@ void phylink_limit_mac_speed(struct phylink_config *config, u32 max_speed);</div><div class='ctx'>  * @mac_finish: finish a major reconfiguration of the interface.</div><div class='ctx'>  * @mac_link_down: take the link down.</div><div class='ctx'>  * @mac_link_up: allow the link to come up.</div><div class='add'>+ * @mac_disable_tx_lpi: disable LPI.</div><div class='add'>+ * @mac_enable_tx_lpi: enable and configure LPI.</div><div class='add'>+ * @mac_wol_set: configure Wake-on-Lan settings at the MAC.</div><div class='ctx'>  *</div><div class='ctx'>  * The individual methods are described more fully below.</div><div class='ctx'>  */</div><div class='hunk'>@@ -188,6 +217,12 @@ struct phylink_mac_ops {</div><div class='ctx'> 			    struct phy_device *phy, unsigned int mode,</div><div class='ctx'> 			    phy_interface_t interface, int speed, int duplex,</div><div class='ctx'> 			    bool tx_pause, bool rx_pause);</div><div class='add'>+	void (*mac_disable_tx_lpi)(struct phylink_config *config);</div><div class='add'>+	int (*mac_enable_tx_lpi)(struct phylink_config *config, u32 timer,</div><div class='add'>+				 bool tx_clk_stop);</div><div class='add'>+</div><div class='add'>+	int (*mac_wol_set)(struct phylink_config *config, u32 wolopts,</div><div class='add'>+			   const u8 *sopass);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if 0 /* For kernel-doc purposes only. */</div><div class='hunk'>@@ -297,9 +332,8 @@ int mac_prepare(struct phylink_config *config, unsigned int mode,</div><div class='ctx'>  *   If in 802.3z mode, the link speed is fixed, dependent on the</div><div class='ctx'>  *   @state-&gt;interface. Duplex and pause modes are negotiated via</div><div class='ctx'>  *   the in-band configuration word. Advertised pause modes are set</div><div class='del'>- *   according to the @state-&gt;an_enabled and @state-&gt;advertising</div><div class='del'>- *   flags. Beware of MACs which only support full duplex at gigabit</div><div class='del'>- *   and higher speeds.</div><div class='add'>+ *   according to @state-&gt;advertising. Beware of MACs which only</div><div class='add'>+ *   support full duplex at gigabit and higher speeds.</div><div class='ctx'>  *</div><div class='ctx'>  *   If in Cisco SGMII mode, the link speed and duplex mode are passed</div><div class='ctx'>  *   in the serial bitstream 16-bit configuration word, and the MAC</div><div class='hunk'>@@ -308,7 +342,7 @@ int mac_prepare(struct phylink_config *config, unsigned int mode,</div><div class='ctx'>  *   responsible for reading the configuration word and configuring</div><div class='ctx'>  *   itself accordingly.</div><div class='ctx'>  *</div><div class='del'>- *   Valid state members: interface, an_enabled, pause, advertising.</div><div class='add'>+ *   Valid state members: interface, pause, advertising.</div><div class='ctx'>  *</div><div class='ctx'>  * Implementations are expected to update the MAC to reflect the</div><div class='ctx'>  * requested settings - i.o.w., if nothing has changed between two</div><div class='hunk'>@@ -338,23 +372,29 @@ int mac_finish(struct phylink_config *config, unsigned int mode,</div><div class='ctx'> 		phy_interface_t iface);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mac_link_down() - take the link down</div><div class='add'>+ * mac_link_down() - notification that the link has gone down</div><div class='ctx'>  * @config: a pointer to a &amp;struct phylink_config.</div><div class='ctx'>  * @mode: link autonegotiation mode</div><div class='ctx'>  * @interface: link &amp;typedef phy_interface_t mode</div><div class='ctx'>  *</div><div class='del'>- * If @mode is not an in-band negotiation mode (as defined by</div><div class='del'>- * phylink_autoneg_inband()), force the link down and disable any</div><div class='del'>- * Energy Efficient Ethernet MAC configuration. Interface type</div><div class='del'>- * selection must be done in mac_config().</div><div class='add'>+ * Notifies the MAC that the link has gone down. This will not be called</div><div class='add'>+ * unless mac_link_up() has been previously called.</div><div class='add'>+ *</div><div class='add'>+ * The MAC should stop processing packets for transmission and reception.</div><div class='add'>+ * phylink will have called netif_carrier_off() to notify the networking</div><div class='add'>+ * stack that the link has gone down, so MAC drivers should not make this</div><div class='add'>+ * call.</div><div class='add'>+ *</div><div class='add'>+ * If @mode is %MLO_AN_INBAND, then this function must not prevent the</div><div class='add'>+ * link coming up.</div><div class='ctx'>  */</div><div class='ctx'> void mac_link_down(struct phylink_config *config, unsigned int mode,</div><div class='ctx'> 		   phy_interface_t interface);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mac_link_up() - allow the link to come up</div><div class='add'>+ * mac_link_up() - notification that the link has come up</div><div class='ctx'>  * @config: a pointer to a &amp;struct phylink_config.</div><div class='del'>- * @phy: any attached phy</div><div class='add'>+ * @phy: any attached phy (deprecated - please use LPI interfaces)</div><div class='ctx'>  * @mode: link autonegotiation mode</div><div class='ctx'>  * @interface: link &amp;typedef phy_interface_t mode</div><div class='ctx'>  * @speed: link speed</div><div class='hunk'>@@ -362,7 +402,10 @@ void mac_link_down(struct phylink_config *config, unsigned int mode,</div><div class='ctx'>  * @tx_pause: link transmit pause enablement status</div><div class='ctx'>  * @rx_pause: link receive pause enablement status</div><div class='ctx'>  *</div><div class='del'>- * Configure the MAC for an established link.</div><div class='add'>+ * Notifies the MAC that the link has come up, and the parameters of the</div><div class='add'>+ * link as seen from the MACs point of view. If mac_link_up() has been</div><div class='add'>+ * called previously, there will be an intervening call to mac_link_down()</div><div class='add'>+ * before this method will be subsequently called.</div><div class='ctx'>  *</div><div class='ctx'>  * @speed, @duplex, @tx_pause and @rx_pause indicate the finalised link</div><div class='ctx'>  * settings, and should be used to configure the MAC block appropriately</div><div class='hunk'>@@ -374,24 +417,72 @@ void mac_link_down(struct phylink_config *config, unsigned int mode,</div><div class='ctx'>  * that the user wishes to override the pause settings, and this should</div><div class='ctx'>  * be allowed when considering the implementation of this method.</div><div class='ctx'>  *</div><div class='del'>- * If in-band negotiation mode is disabled, allow the link to come up. If</div><div class='del'>- * @phy is non-%NULL, configure Energy Efficient Ethernet by calling</div><div class='del'>- * phy_init_eee() and perform appropriate MAC configuration for EEE.</div><div class='add'>+ * Once configured, the MAC may begin to process packets for transmission</div><div class='add'>+ * and reception.</div><div class='add'>+ *</div><div class='ctx'>  * Interface type selection must be done in mac_config().</div><div class='ctx'>  */</div><div class='ctx'> void mac_link_up(struct phylink_config *config, struct phy_device *phy,</div><div class='ctx'> 		 unsigned int mode, phy_interface_t interface,</div><div class='ctx'> 		 int speed, int duplex, bool tx_pause, bool rx_pause);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mac_disable_tx_lpi() - disable LPI generation at the MAC</div><div class='add'>+ * @config: a pointer to a &amp;struct phylink_config.</div><div class='add'>+ *</div><div class='add'>+ * Disable generation of LPI at the MAC, effectively preventing the MAC</div><div class='add'>+ * from indicating that it is idle.</div><div class='add'>+ */</div><div class='add'>+void mac_disable_tx_lpi(struct phylink_config *config);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mac_enable_tx_lpi() - configure and enable LPI generation at the MAC</div><div class='add'>+ * @config: a pointer to a &amp;struct phylink_config.</div><div class='add'>+ * @timer: LPI timeout in microseconds.</div><div class='add'>+ * @tx_clk_stop: allow xMII transmit clock to be stopped during LPI</div><div class='add'>+ *</div><div class='add'>+ * Configure the LPI timeout accordingly. This will only be called when</div><div class='add'>+ * the link is already up, to cater for situations where the hardware</div><div class='add'>+ * needs to be programmed according to the link speed.</div><div class='add'>+ *</div><div class='add'>+ * Enable LPI generation at the MAC, and configure whether the xMII transmit</div><div class='add'>+ * clock may be stopped.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success. Please consult with rmk before returning an error.</div><div class='add'>+ */</div><div class='add'>+int mac_enable_tx_lpi(struct phylink_config *config, u32 timer,</div><div class='add'>+		      bool tx_clk_stop);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mac_wol_set() - configure the Wake-on-Lan parameters</div><div class='add'>+ * @config: a pointer to a &amp;struct phylink_config.</div><div class='add'>+ * @wolopts: Bitmask of %WAKE_* flags for enabled Wake-On-Lan modes.</div><div class='add'>+ * @sopass: SecureOn(tm) password; meaningful only for %WAKE_MAGICSECURE</div><div class='add'>+ *</div><div class='add'>+ * Enable the specified Wake-on-Lan options at the MAC. Options that the</div><div class='add'>+ * PHY can handle will have been removed from @wolopts.</div><div class='add'>+ *</div><div class='add'>+ * The presence of this method enables phylink-managed WoL support.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success.</div><div class='add'>+ */</div><div class='add'>+int (*mac_wol_set)(struct phylink_config *config, u32 wolopts,</div><div class='add'>+		   const u8 *sopass);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct phylink_pcs_ops;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct phylink_pcs - PHYLINK PCS instance</div><div class='add'>+ * @supported_interfaces: describing which PHY_INTERFACE_MODE_xxx</div><div class='add'>+ *                        are supported by this PCS.</div><div class='ctx'>  * @ops: a pointer to the &amp;struct phylink_pcs_ops structure</div><div class='ctx'>  * @phylink: pointer to &amp;struct phylink_config</div><div class='del'>- * @neg_mode: provide PCS neg mode via "mode" argument</div><div class='ctx'>  * @poll: poll the PCS for link changes</div><div class='add'>+ * @rxc_always_on: The MAC driver requires the reference clock</div><div class='add'>+ *                 to always be on. Standalone PCS drivers which</div><div class='add'>+ *                 do not have access to a PHY device can check</div><div class='add'>+ *                 this instead of PHY_F_RXC_ALWAYS_ON.</div><div class='ctx'>  *</div><div class='ctx'>  * This structure is designed to be embedded within the PCS private data,</div><div class='ctx'>  * and will be passed between phylink and the PCS.</div><div class='hunk'>@@ -400,15 +491,17 @@ struct phylink_pcs_ops;</div><div class='ctx'>  * the PCS driver.</div><div class='ctx'>  */</div><div class='ctx'> struct phylink_pcs {</div><div class='add'>+	DECLARE_PHY_INTERFACE_MASK(supported_interfaces);</div><div class='ctx'> 	const struct phylink_pcs_ops *ops;</div><div class='ctx'> 	struct phylink *phylink;</div><div class='del'>-	bool neg_mode;</div><div class='ctx'> 	bool poll;</div><div class='add'>+	bool rxc_always_on;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct phylink_pcs_ops - MAC PCS operations structure.</div><div class='ctx'>  * @pcs_validate: validate the link configuration.</div><div class='add'>+ * @pcs_inband_caps: query inband support for interface mode.</div><div class='ctx'>  * @pcs_enable: enable the PCS.</div><div class='ctx'>  * @pcs_disable: disable the PCS.</div><div class='ctx'>  * @pcs_pre_config: pre-mac_config method (for errata)</div><div class='hunk'>@@ -418,17 +511,25 @@ struct phylink_pcs {</div><div class='ctx'>  * @pcs_an_restart: restart 802.3z BaseX autonegotiation.</div><div class='ctx'>  * @pcs_link_up: program the PCS for the resolved link configuration</div><div class='ctx'>  *               (where necessary).</div><div class='add'>+ * @pcs_disable_eee: optional notification to PCS that EEE has been disabled</div><div class='add'>+ *		     at the MAC.</div><div class='add'>+ * @pcs_enable_eee: optional notification to PCS that EEE will be enabled at</div><div class='add'>+ *		    the MAC.</div><div class='add'>+ * @pcs_pre_init: configure PCS components necessary for MAC hardware</div><div class='add'>+ *                initialization e.g. RX clock for stmmac.</div><div class='ctx'>  */</div><div class='ctx'> struct phylink_pcs_ops {</div><div class='ctx'> 	int (*pcs_validate)(struct phylink_pcs *pcs, unsigned long *supported,</div><div class='ctx'> 			    const struct phylink_link_state *state);</div><div class='add'>+	unsigned int (*pcs_inband_caps)(struct phylink_pcs *pcs,</div><div class='add'>+					phy_interface_t interface);</div><div class='ctx'> 	int (*pcs_enable)(struct phylink_pcs *pcs);</div><div class='ctx'> 	void (*pcs_disable)(struct phylink_pcs *pcs);</div><div class='ctx'> 	void (*pcs_pre_config)(struct phylink_pcs *pcs,</div><div class='ctx'> 			       phy_interface_t interface);</div><div class='ctx'> 	int (*pcs_post_config)(struct phylink_pcs *pcs,</div><div class='ctx'> 			       phy_interface_t interface);</div><div class='del'>-	void (*pcs_get_state)(struct phylink_pcs *pcs,</div><div class='add'>+	void (*pcs_get_state)(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='ctx'> 			      struct phylink_link_state *state);</div><div class='ctx'> 	int (*pcs_config)(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='ctx'> 			  phy_interface_t interface,</div><div class='hunk'>@@ -437,6 +538,9 @@ struct phylink_pcs_ops {</div><div class='ctx'> 	void (*pcs_an_restart)(struct phylink_pcs *pcs);</div><div class='ctx'> 	void (*pcs_link_up)(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='ctx'> 			    phy_interface_t interface, int speed, int duplex);</div><div class='add'>+	void (*pcs_disable_eee)(struct phylink_pcs *pcs);</div><div class='add'>+	void (*pcs_enable_eee)(struct phylink_pcs *pcs);</div><div class='add'>+	int (*pcs_pre_init)(struct phylink_pcs *pcs);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if 0 /* For kernel-doc purposes only. */</div><div class='hunk'>@@ -458,6 +562,20 @@ int pcs_validate(struct phylink_pcs *pcs, unsigned long *supported,</div><div class='ctx'> 		 const struct phylink_link_state *state);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pcs_inband_caps - query PCS in-band capabilities for interface mode.</div><div class='add'>+ * @pcs: a pointer to a &amp;struct phylink_pcs.</div><div class='add'>+ * @interface: interface mode to be queried</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if it is unknown what in-band signalling is supported by the</div><div class='add'>+ * PHY (e.g. because the PHY driver doesn't implement the method.) Otherwise,</div><div class='add'>+ * returns a bit mask of the LINK_INBAND_* values from</div><div class='add'>+ * &amp;enum link_inband_signalling to describe which inband modes are supported</div><div class='add'>+ * for this interface mode.</div><div class='add'>+ */</div><div class='add'>+unsigned int pcs_inband_caps(struct phylink_pcs *pcs,</div><div class='add'>+			     phy_interface_t interface);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pcs_enable() - enable the PCS.</div><div class='ctx'>  * @pcs: a pointer to a &amp;struct phylink_pcs.</div><div class='ctx'>  */</div><div class='hunk'>@@ -472,6 +590,7 @@ void pcs_disable(struct phylink_pcs *pcs);</div><div class='ctx'> /**</div><div class='ctx'>  * pcs_get_state() - Read the current inband link state from the hardware</div><div class='ctx'>  * @pcs: a pointer to a &amp;struct phylink_pcs.</div><div class='add'>+ * @neg_mode: link negotiation mode (PHYLINK_PCS_NEG_xxx)</div><div class='ctx'>  * @state: a pointer to a &amp;struct phylink_link_state.</div><div class='ctx'>  *</div><div class='ctx'>  * Read the current inband link state from the MAC PCS, reporting the</div><div class='hunk'>@@ -480,8 +599,11 @@ void pcs_disable(struct phylink_pcs *pcs);</div><div class='ctx'>  * negotiation completion state in @state-&gt;an_complete, and link up state</div><div class='ctx'>  * in @state-&gt;link. If possible, @state-&gt;lp_advertising should also be</div><div class='ctx'>  * populated.</div><div class='add'>+ *</div><div class='add'>+ * Note that the @neg_mode parameter is always the PHYLINK_PCS_NEG_xxx</div><div class='add'>+ * state, not MLO_AN_xxx.</div><div class='ctx'>  */</div><div class='del'>-void pcs_get_state(struct phylink_pcs *pcs,</div><div class='add'>+void pcs_get_state(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='ctx'> 		   struct phylink_link_state *state);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -509,6 +631,14 @@ void pcs_get_state(struct phylink_pcs *pcs,</div><div class='ctx'>  * The %neg_mode argument should be tested via the phylink_mode_*() family of</div><div class='ctx'>  * functions, or for PCS that set pcs-&gt;neg_mode true, should be tested</div><div class='ctx'>  * against the PHYLINK_PCS_NEG_* definitions.</div><div class='add'>+ *</div><div class='add'>+ * pcs_config() will be called when configuration of the PCS is required</div><div class='add'>+ * or when the advertisement is possibly updated. It must not unnecessarily</div><div class='add'>+ * disrupt an established link.</div><div class='add'>+ *</div><div class='add'>+ * When an autonegotiation restart is required for 802.3z modes, .pcs_config()</div><div class='add'>+ * should return a positive non-zero integer (e.g. 1) to indicate to phylink</div><div class='add'>+ * to call the pcs_an_restart() method.</div><div class='ctx'>  */</div><div class='ctx'> int pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='ctx'> 	       phy_interface_t interface, const unsigned long *advertising,</div><div class='hunk'>@@ -542,6 +672,50 @@ void pcs_an_restart(struct phylink_pcs *pcs);</div><div class='ctx'>  */</div><div class='ctx'> void pcs_link_up(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='ctx'> 		 phy_interface_t interface, int speed, int duplex);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pcs_disable_eee() - Disable EEE at the PCS</div><div class='add'>+ * @pcs: a pointer to a &amp;struct phylink_pcs</div><div class='add'>+ *</div><div class='add'>+ * Optional method informing the PCS that EEE has been disabled at the MAC.</div><div class='add'>+ */</div><div class='add'>+void pcs_disable_eee(struct phylink_pcs *pcs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pcs_enable_eee() - Enable EEE at the PCS</div><div class='add'>+ * @pcs: a pointer to a &amp;struct phylink_pcs</div><div class='add'>+ *</div><div class='add'>+ * Optional method informing the PCS that EEE is about to be enabled at the MAC.</div><div class='add'>+ */</div><div class='add'>+void pcs_enable_eee(struct phylink_pcs *pcs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pcs_pre_init() - Configure PCS components necessary for MAC initialization</div><div class='add'>+ * @pcs: a pointer to a &amp;struct phylink_pcs.</div><div class='add'>+ *</div><div class='add'>+ * This function can be called by MAC drivers through the</div><div class='add'>+ * phylink_pcs_pre_init() wrapper, before their hardware is initialized. It</div><div class='add'>+ * should not be called after the link is brought up, as reconfiguring the PCS</div><div class='add'>+ * at this point could break the link.</div><div class='add'>+ *</div><div class='add'>+ * Some MAC devices require specific hardware initialization to be performed by</div><div class='add'>+ * their associated PCS device before they can properly initialize their own</div><div class='add'>+ * hardware. An example of this is the initialization of stmmac controllers,</div><div class='add'>+ * which requires an active REF_CLK signal to be provided by the PHY/PCS.</div><div class='add'>+ *</div><div class='add'>+ * By calling phylink_pcs_pre_init(), MAC drivers can ensure that the PCS is</div><div class='add'>+ * setup in a way that allows for successful hardware initialization.</div><div class='add'>+ *</div><div class='add'>+ * The specific configuration performed by pcs_pre_init() is dependent on the</div><div class='add'>+ * model of PCS and the requirements of the MAC device attached to it. PCS</div><div class='add'>+ * driver authors should consider whether their target device is to be used in</div><div class='add'>+ * conjunction with a MAC device whose driver calls phylink_pcs_pre_init(). MAC</div><div class='add'>+ * driver authors should document their requirements for the PCS</div><div class='add'>+ * pre-initialization.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int pcs_pre_init(struct phylink_pcs *pcs);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct phylink *phylink_create(struct phylink_config *,</div><div class='hunk'>@@ -557,14 +731,22 @@ int phylink_fwnode_phy_connect(struct phylink *pl,</div><div class='ctx'> 			       const struct fwnode_handle *fwnode,</div><div class='ctx'> 			       u32 flags);</div><div class='ctx'> void phylink_disconnect_phy(struct phylink *);</div><div class='add'>+int phylink_set_fixed_link(struct phylink *,</div><div class='add'>+			   const struct phylink_link_state *);</div><div class='ctx'> </div><div class='ctx'> void phylink_mac_change(struct phylink *, bool up);</div><div class='ctx'> void phylink_pcs_change(struct phylink_pcs *, bool up);</div><div class='ctx'> </div><div class='add'>+int phylink_pcs_pre_init(struct phylink *pl, struct phylink_pcs *pcs);</div><div class='add'>+</div><div class='ctx'> void phylink_start(struct phylink *);</div><div class='ctx'> void phylink_stop(struct phylink *);</div><div class='ctx'> </div><div class='add'>+void phylink_rx_clk_stop_block(struct phylink *);</div><div class='add'>+void phylink_rx_clk_stop_unblock(struct phylink *);</div><div class='add'>+</div><div class='ctx'> void phylink_suspend(struct phylink *pl, bool mac_wol);</div><div class='add'>+void phylink_prepare_resume(struct phylink *pl);</div><div class='ctx'> void phylink_resume(struct phylink *pl);</div><div class='ctx'> </div><div class='ctx'> void phylink_ethtool_get_wol(struct phylink *, struct ethtool_wolinfo *);</div><div class='hunk'>@@ -580,7 +762,6 @@ void phylink_ethtool_get_pauseparam(struct phylink *,</div><div class='ctx'> int phylink_ethtool_set_pauseparam(struct phylink *,</div><div class='ctx'> 				   struct ethtool_pauseparam *);</div><div class='ctx'> int phylink_get_eee_err(struct phylink *);</div><div class='del'>-int phylink_init_eee(struct phylink *, bool);</div><div class='ctx'> int phylink_ethtool_get_eee(struct phylink *link, struct ethtool_keee *eee);</div><div class='ctx'> int phylink_ethtool_set_eee(struct phylink *link, struct ethtool_keee *eee);</div><div class='ctx'> int phylink_mii_ioctl(struct phylink *, struct ifreq *, int);</div><div class='hunk'>@@ -611,6 +792,7 @@ static inline int phylink_get_link_timer_ns(phy_interface_t interface)</div><div class='ctx'> 	case PHY_INTERFACE_MODE_SGMII:</div><div class='ctx'> 	case PHY_INTERFACE_MODE_QSGMII:</div><div class='ctx'> 	case PHY_INTERFACE_MODE_USXGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_10G_QXGMII:</div><div class='ctx'> 		return 1600000;</div><div class='ctx'> </div><div class='ctx'> 	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='hunk'>@@ -622,9 +804,22 @@ static inline int phylink_get_link_timer_ns(phy_interface_t interface)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * phylink_mac_implements_lpi() - determine if MAC implements LPI ops</div><div class='add'>+ * @ops: phylink_mac_ops structure</div><div class='add'>+ *</div><div class='add'>+ * Returns true if the phylink MAC operations structure indicates that the</div><div class='add'>+ * LPI operations have been implemented, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool phylink_mac_implements_lpi(const struct phylink_mac_ops *ops)</div><div class='add'>+{</div><div class='add'>+	return ops &amp;&amp; ops-&gt;mac_disable_tx_lpi &amp;&amp; ops-&gt;mac_enable_tx_lpi;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void phylink_mii_c22_pcs_decode_state(struct phylink_link_state *state,</div><div class='del'>-				      u16 bmsr, u16 lpa);</div><div class='add'>+				      unsigned int neg_mode, u16 bmsr, u16 lpa);</div><div class='ctx'> void phylink_mii_c22_pcs_get_state(struct mdio_device *pcs,</div><div class='add'>+				   unsigned int neg_mode,</div><div class='ctx'> 				   struct phylink_link_state *state);</div><div class='ctx'> int phylink_mii_c22_pcs_encode_advertisement(phy_interface_t interface,</div><div class='ctx'> 					     const unsigned long *advertising);</div><div class='head'>diff --git a/include/linux/pid.h b/include/linux/pid.h<br/>index c79a0efd0258..003a1027d219 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pid.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pid.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pid.h</a></div><div class='hunk'>@@ -45,20 +45,25 @@</div><div class='ctx'>  * find_pid_ns() using the int nr and struct pid_namespace *ns.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define RESERVED_PIDS 300</div><div class='add'>+</div><div class='add'>+struct pidfs_attr;</div><div class='add'>+</div><div class='ctx'> struct upid {</div><div class='ctx'> 	int nr;</div><div class='ctx'> 	struct pid_namespace *ns;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct pid</div><div class='del'>-{</div><div class='add'>+struct pid {</div><div class='ctx'> 	refcount_t count;</div><div class='ctx'> 	unsigned int level;</div><div class='ctx'> 	spinlock_t lock;</div><div class='del'>-#ifdef CONFIG_FS_PID</div><div class='del'>-	struct dentry *stashed;</div><div class='del'>-	unsigned long ino;</div><div class='del'>-#endif</div><div class='add'>+	struct {</div><div class='add'>+		u64 ino;</div><div class='add'>+		struct rb_node pidfs_node;</div><div class='add'>+		struct dentry *stashed;</div><div class='add'>+		struct pidfs_attr *attr;</div><div class='add'>+	};</div><div class='ctx'> 	/* lists of tasks that use this pid */</div><div class='ctx'> 	struct hlist_head tasks[PIDTYPE_MAX];</div><div class='ctx'> 	struct hlist_head inodes;</div><div class='hunk'>@@ -68,6 +73,7 @@ struct pid</div><div class='ctx'> 	struct upid numbers[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+extern seqcount_spinlock_t pidmap_lock_seq;</div><div class='ctx'> extern struct pid init_struct_pid;</div><div class='ctx'> </div><div class='ctx'> struct file;</div><div class='hunk'>@@ -75,7 +81,7 @@ struct file;</div><div class='ctx'> struct pid *pidfd_pid(const struct file *file);</div><div class='ctx'> struct pid *pidfd_get_pid(unsigned int fd, unsigned int *flags);</div><div class='ctx'> struct task_struct *pidfd_get_task(int pidfd, unsigned int *flags);</div><div class='del'>-int pidfd_prepare(struct pid *pid, unsigned int flags, struct file **ret);</div><div class='add'>+int pidfd_prepare(struct pid *pid, unsigned int flags, struct file **ret_file);</div><div class='ctx'> void do_notify_pidfd(struct task_struct *task);</div><div class='ctx'> </div><div class='ctx'> static inline struct pid *get_pid(struct pid *pid)</div><div class='hunk'>@@ -99,16 +105,13 @@ extern struct pid *get_task_pid(struct task_struct *task, enum pid_type type);</div><div class='ctx'>  * these helpers must be called with the tasklist_lock write-held.</div><div class='ctx'>  */</div><div class='ctx'> extern void attach_pid(struct task_struct *task, enum pid_type);</div><div class='del'>-extern void detach_pid(struct task_struct *task, enum pid_type);</div><div class='del'>-extern void change_pid(struct task_struct *task, enum pid_type,</div><div class='del'>-			struct pid *pid);</div><div class='add'>+void detach_pid(struct pid **pids, struct task_struct *task, enum pid_type);</div><div class='add'>+void change_pid(struct pid **pids, struct task_struct *task, enum pid_type,</div><div class='add'>+		struct pid *pid);</div><div class='ctx'> extern void exchange_tids(struct task_struct *task, struct task_struct *old);</div><div class='ctx'> extern void transfer_pid(struct task_struct *old, struct task_struct *new,</div><div class='ctx'> 			 enum pid_type);</div><div class='ctx'> </div><div class='del'>-extern int pid_max;</div><div class='del'>-extern int pid_max_min, pid_max_max;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * look up a PID in the hash table. Must be called with the tasklist_lock</div><div class='ctx'>  * or rcu_read_lock() held.</div><div class='hunk'>@@ -130,6 +133,7 @@ extern struct pid *find_ge_pid(int nr, struct pid_namespace *);</div><div class='ctx'> extern struct pid *alloc_pid(struct pid_namespace *ns, pid_t *set_tid,</div><div class='ctx'> 			     size_t set_tid_size);</div><div class='ctx'> extern void free_pid(struct pid *pid);</div><div class='add'>+void free_pids(struct pid **pids);</div><div class='ctx'> extern void disable_pid_allocation(struct pid_namespace *ns);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h<br/>index f9f9931e02d6..0e7ae12c96d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pid_namespace.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pid_namespace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pid_namespace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pid_namespace.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@ struct pid_namespace {</div><div class='ctx'> 	struct task_struct *child_reaper;</div><div class='ctx'> 	struct kmem_cache *pid_cachep;</div><div class='ctx'> 	unsigned int level;</div><div class='add'>+	int pid_max;</div><div class='ctx'> 	struct pid_namespace *parent;</div><div class='ctx'> #ifdef CONFIG_BSD_PROCESS_ACCT</div><div class='ctx'> 	struct fs_pin *bacct;</div><div class='hunk'>@@ -38,9 +39,14 @@ struct pid_namespace {</div><div class='ctx'> 	struct ucounts *ucounts;</div><div class='ctx'> 	int reboot;	/* group exit code if this pidns was rebooted */</div><div class='ctx'> 	struct ns_common ns;</div><div class='del'>-#if defined(CONFIG_SYSCTL) &amp;&amp; defined(CONFIG_MEMFD_CREATE)</div><div class='add'>+	struct work_struct	work;</div><div class='add'>+#ifdef CONFIG_SYSCTL</div><div class='add'>+	struct ctl_table_set	set;</div><div class='add'>+	struct ctl_table_header *sysctls;</div><div class='add'>+#if defined(CONFIG_MEMFD_CREATE)</div><div class='ctx'> 	int memfd_noexec_scope;</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='ctx'> extern struct pid_namespace init_pid_ns;</div><div class='hunk'>@@ -48,10 +54,14 @@ extern struct pid_namespace init_pid_ns;</div><div class='ctx'> #define PIDNS_ADDING (1U &lt;&lt; 31)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PID_NS</div><div class='add'>+static inline struct pid_namespace *to_pid_ns(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	return container_of(ns, struct pid_namespace, ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns)</div><div class='ctx'> {</div><div class='del'>-	if (ns != &amp;init_pid_ns)</div><div class='del'>-		refcount_inc(&amp;ns-&gt;ns.count);</div><div class='add'>+	ns_ref_inc(ns);</div><div class='ctx'> 	return ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -72,12 +82,15 @@ static inline int pidns_memfd_noexec_scope(struct pid_namespace *ns)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct pid_namespace *copy_pid_ns(unsigned long flags,</div><div class='add'>+extern struct pid_namespace *copy_pid_ns(u64 flags,</div><div class='ctx'> 	struct user_namespace *user_ns, struct pid_namespace *ns);</div><div class='ctx'> extern void zap_pid_ns_processes(struct pid_namespace *pid_ns);</div><div class='ctx'> extern int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd);</div><div class='ctx'> extern void put_pid_ns(struct pid_namespace *ns);</div><div class='ctx'> </div><div class='add'>+extern bool pidns_is_ancestor(struct pid_namespace *child,</div><div class='add'>+			      struct pid_namespace *ancestor);</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_PID_NS */</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -91,7 +104,7 @@ static inline int pidns_memfd_noexec_scope(struct pid_namespace *ns)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct pid_namespace *copy_pid_ns(unsigned long flags,</div><div class='add'>+static inline struct pid_namespace *copy_pid_ns(u64 flags,</div><div class='ctx'> 	struct user_namespace *user_ns, struct pid_namespace *ns)</div><div class='ctx'> {</div><div class='ctx'> 	if (flags &amp; CLONE_NEWPID)</div><div class='hunk'>@@ -112,11 +125,19 @@ static inline int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline bool pidns_is_ancestor(struct pid_namespace *child,</div><div class='add'>+				     struct pid_namespace *ancestor)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_PID_NS */</div><div class='ctx'> </div><div class='ctx'> extern struct pid_namespace *task_active_pid_ns(struct task_struct *tsk);</div><div class='ctx'> void pidhash_init(void);</div><div class='ctx'> void pid_idr_init(void);</div><div class='add'>+int register_pidns_sysctls(struct pid_namespace *pidns);</div><div class='add'>+void unregister_pidns_sysctls(struct pid_namespace *pidns);</div><div class='ctx'> </div><div class='ctx'> static inline bool task_is_in_init_pid_ns(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/pidfs.h b/include/linux/pidfs.h<br/>index 40dd325a32a6..3e08c33da2df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pidfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pidfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pidfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pidfs.h</a></div><div class='hunk'>@@ -2,8 +2,18 @@</div><div class='ctx'> #ifndef _LINUX_PID_FS_H</div><div class='ctx'> #define _LINUX_PID_FS_H</div><div class='ctx'> </div><div class='add'>+struct coredump_params;</div><div class='add'>+</div><div class='ctx'> struct file *pidfs_alloc_file(struct pid *pid, unsigned int flags);</div><div class='ctx'> void __init pidfs_init(void);</div><div class='del'>-bool is_pidfs_sb(const struct super_block *sb);</div><div class='add'>+void pidfs_add_pid(struct pid *pid);</div><div class='add'>+void pidfs_remove_pid(struct pid *pid);</div><div class='add'>+void pidfs_exit(struct task_struct *tsk);</div><div class='add'>+#ifdef CONFIG_COREDUMP</div><div class='add'>+void pidfs_coredump(const struct coredump_params *cprm);</div><div class='add'>+#endif</div><div class='add'>+extern const struct dentry_operations pidfs_dentry_operations;</div><div class='add'>+int pidfs_register_pid(struct pid *pid);</div><div class='add'>+void pidfs_free_pid(struct pid *pid);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_PID_FS_H */</div><div class='head'>diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h<br/>index 73de70362b98..63ce16191eb9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/consumer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/consumer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/consumer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pinctrl/consumer.h</a></div><div class='hunk'>@@ -48,6 +48,7 @@ int pinctrl_select_default_state(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> int pinctrl_pm_select_default_state(struct device *dev);</div><div class='add'>+int pinctrl_pm_select_init_state(struct device *dev);</div><div class='ctx'> int pinctrl_pm_select_sleep_state(struct device *dev);</div><div class='ctx'> int pinctrl_pm_select_idle_state(struct device *dev);</div><div class='ctx'> #else</div><div class='hunk'>@@ -55,6 +56,10 @@ static inline int pinctrl_pm_select_default_state(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline int pinctrl_pm_select_init_state(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> static inline int pinctrl_pm_select_sleep_state(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -143,6 +148,11 @@ static inline int pinctrl_pm_select_default_state(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int pinctrl_pm_select_init_state(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int pinctrl_pm_select_sleep_state(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h<br/>index 673e96df453b..25620229b1d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/machine.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/machine.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/machine.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pinctrl/machine.h</a></div><div class='hunk'>@@ -149,14 +149,18 @@ struct pinctrl_map {</div><div class='ctx'> #define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs)		\</div><div class='ctx'> 	PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs)</div><div class='ctx'> </div><div class='add'>+struct device;</div><div class='ctx'> struct pinctrl_map;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PINCTRL</div><div class='ctx'> </div><div class='del'>-extern int pinctrl_register_mappings(const struct pinctrl_map *map,</div><div class='del'>-				     unsigned int num_maps);</div><div class='del'>-extern void pinctrl_unregister_mappings(const struct pinctrl_map *map);</div><div class='del'>-extern void pinctrl_provide_dummies(void);</div><div class='add'>+int pinctrl_register_mappings(const struct pinctrl_map *map,</div><div class='add'>+			      unsigned int num_maps);</div><div class='add'>+int devm_pinctrl_register_mappings(struct device *dev,</div><div class='add'>+				   const struct pinctrl_map *map,</div><div class='add'>+				   unsigned int num_maps);</div><div class='add'>+void pinctrl_unregister_mappings(const struct pinctrl_map *map);</div><div class='add'>+void pinctrl_provide_dummies(void);</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline int pinctrl_register_mappings(const struct pinctrl_map *map,</div><div class='hunk'>@@ -165,6 +169,13 @@ static inline int pinctrl_register_mappings(const struct pinctrl_map *map,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int devm_pinctrl_register_mappings(struct device *dev,</div><div class='add'>+						 const struct pinctrl_map *map,</div><div class='add'>+						 unsigned int num_maps)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void pinctrl_unregister_mappings(const struct pinctrl_map *map)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h<br/>index a65d3d078e58..1be4032071c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/pinconf-generic.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/pinconf-generic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/pinconf-generic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pinctrl/pinconf-generic.h</a></div><div class='hunk'>@@ -81,14 +81,20 @@ struct pinctrl_map;</div><div class='ctx'>  * @PIN_CONFIG_INPUT_SCHMITT_ENABLE: control schmitt-trigger mode on the pin.</div><div class='ctx'>  *      If the argument != 0, schmitt-trigger mode is enabled. If it's 0,</div><div class='ctx'>  *      schmitt-trigger mode is disabled.</div><div class='add'>+ * @PIN_CONFIG_INPUT_SCHMITT_UV: this will configure an input pin to run in</div><div class='add'>+ *	schmitt-trigger mode. The argument is in uV.</div><div class='ctx'>  * @PIN_CONFIG_MODE_LOW_POWER: this will configure the pin for low power</div><div class='ctx'>  *	operation, if several modes of operation are supported these can be</div><div class='ctx'>  *	passed in the argument on a custom form, else just use argument 1</div><div class='ctx'>  *	to indicate low power mode, argument 0 turns low power mode off.</div><div class='ctx'>  * @PIN_CONFIG_MODE_PWM: this will configure the pin for PWM</div><div class='del'>- * @PIN_CONFIG_OUTPUT: this will configure the pin as an output and drive a</div><div class='del'>- * 	value on the line. Use argument 1 to indicate high level, argument 0 to</div><div class='del'>- *	indicate low level. (Please see Documentation/driver-api/pin-control.rst,</div><div class='add'>+ * @PIN_CONFIG_LEVEL: setting this will configure the pin as an output and</div><div class='add'>+ *	drive a value on the line. Use argument 1 to indicate high level,</div><div class='add'>+ *	argument 0 to indicate low level. Conversely the value of the line</div><div class='add'>+ *	can be read using this parameter, if and only if that value can be</div><div class='add'>+ *	represented as a binary 0 or 1 where 0 indicate a low voltage level</div><div class='add'>+ *	and 1 indicate a high voltage level.</div><div class='add'>+ *	(Please see Documentation/driver-api/pin-control.rst,</div><div class='ctx'>  *	section "GPIO mode pitfalls" for a discussion around this parameter.)</div><div class='ctx'>  * @PIN_CONFIG_OUTPUT_ENABLE: this will enable the pin's output mode</div><div class='ctx'>  * 	without driving a value there. For most platforms this reduces to</div><div class='hunk'>@@ -106,6 +112,12 @@ struct pinctrl_map;</div><div class='ctx'>  *	or latch delay (on outputs) this parameter (in a custom format)</div><div class='ctx'>  *	specifies the clock skew or latch delay. It typically controls how</div><div class='ctx'>  *	many double inverters are put in front of the line.</div><div class='add'>+ * @PIN_CONFIG_SKEW_DELAY_INPUT_PS: if the pin has independent values for the</div><div class='add'>+ *	programmable skew rate (on inputs) and latch delay (on outputs), then</div><div class='add'>+ *	this parameter specifies the clock skew only. The argument is in ps.</div><div class='add'>+ * @PIN_CONFIG_SKEW_DELAY_OUPUT_PS: if the pin has independent values for the</div><div class='add'>+ *	programmable skew rate (on inputs) and latch delay (on outputs), then</div><div class='add'>+ *	this parameter specifies the latch delay only. The argument is in ps.</div><div class='ctx'>  * @PIN_CONFIG_SLEEP_HARDWARE_STATE: indicate this is sleep related state.</div><div class='ctx'>  * @PIN_CONFIG_SLEW_RATE: if the pin can select slew rate, the argument to</div><div class='ctx'>  *	this parameter (on a custom format) tells the driver which alternative</div><div class='hunk'>@@ -132,14 +144,17 @@ enum pin_config_param {</div><div class='ctx'> 	PIN_CONFIG_INPUT_ENABLE,</div><div class='ctx'> 	PIN_CONFIG_INPUT_SCHMITT,</div><div class='ctx'> 	PIN_CONFIG_INPUT_SCHMITT_ENABLE,</div><div class='add'>+	PIN_CONFIG_INPUT_SCHMITT_UV,</div><div class='ctx'> 	PIN_CONFIG_MODE_LOW_POWER,</div><div class='ctx'> 	PIN_CONFIG_MODE_PWM,</div><div class='del'>-	PIN_CONFIG_OUTPUT,</div><div class='add'>+	PIN_CONFIG_LEVEL,</div><div class='ctx'> 	PIN_CONFIG_OUTPUT_ENABLE,</div><div class='ctx'> 	PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS,</div><div class='ctx'> 	PIN_CONFIG_PERSIST_STATE,</div><div class='ctx'> 	PIN_CONFIG_POWER_SOURCE,</div><div class='ctx'> 	PIN_CONFIG_SKEW_DELAY,</div><div class='add'>+	PIN_CONFIG_SKEW_DELAY_INPUT_PS,</div><div class='add'>+	PIN_CONFIG_SKEW_DELAY_OUTPUT_PS,</div><div class='ctx'> 	PIN_CONFIG_SLEEP_HARDWARE_STATE,</div><div class='ctx'> 	PIN_CONFIG_SLEW_RATE,</div><div class='ctx'> 	PIN_CONFIG_END = 0x7F,</div><div class='hunk'>@@ -174,21 +189,28 @@ static inline unsigned long pinconf_to_config_packed(enum pin_config_param param</div><div class='ctx'> 	return PIN_CONF_PACKED(param, argument);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define PCONFDUMP(a, b, c, d) {					\</div><div class='del'>-	.param = a, .display = b, .format = c, .has_arg = d	\</div><div class='add'>+#define PCONFDUMP_WITH_VALUES(a, b, c, d, e, f) {		\</div><div class='add'>+	.param = a, .display = b, .format = c, .has_arg = d,	\</div><div class='add'>+	.values = e, .num_values = f				\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define PCONFDUMP(a, b, c, d)	PCONFDUMP_WITH_VALUES(a, b, c, d, NULL, 0)</div><div class='add'>+</div><div class='ctx'> struct pin_config_item {</div><div class='ctx'> 	const enum pin_config_param param;</div><div class='ctx'> 	const char * const display;</div><div class='ctx'> 	const char * const format;</div><div class='ctx'> 	bool has_arg;</div><div class='add'>+	const char * const *values;</div><div class='add'>+	size_t num_values;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pinconf_generic_params {</div><div class='ctx'> 	const char * const property;</div><div class='ctx'> 	enum pin_config_param param;</div><div class='ctx'> 	u32 default_value;</div><div class='add'>+	const char * const *values;</div><div class='add'>+	size_t num_values;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,</div><div class='hunk'>@@ -229,4 +251,8 @@ static inline int pinconf_generic_dt_node_to_map_all(struct pinctrl_dev *pctldev</div><div class='ctx'> 			PIN_MAP_TYPE_INVALID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int pinconf_generic_dt_node_to_map_pinmux(struct pinctrl_dev *pctldev,</div><div class='add'>+					  struct device_node *np,</div><div class='add'>+					  struct pinctrl_map **map,</div><div class='add'>+					  unsigned int *num_maps);</div><div class='ctx'> #endif /* __LINUX_PINCTRL_PINCONF_GENERIC_H */</div><div class='head'>diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h<br/>index 9a8189ffd0f2..1a8084e29405 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/pinctrl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/pinctrl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/pinctrl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pinctrl/pinctrl.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #ifndef __LINUX_PINCTRL_PINCTRL_H</div><div class='ctx'> #define __LINUX_PINCTRL_PINCTRL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='hunk'>@@ -165,25 +166,25 @@ struct pinctrl_desc {</div><div class='ctx'> </div><div class='ctx'> /* External interface to pin controller */</div><div class='ctx'> </div><div class='del'>-extern int pinctrl_register_and_init(struct pinctrl_desc *pctldesc,</div><div class='add'>+extern int pinctrl_register_and_init(const struct pinctrl_desc *pctldesc,</div><div class='ctx'> 				     struct device *dev, void *driver_data,</div><div class='ctx'> 				     struct pinctrl_dev **pctldev);</div><div class='ctx'> extern int pinctrl_enable(struct pinctrl_dev *pctldev);</div><div class='ctx'> </div><div class='ctx'> /* Please use pinctrl_register_and_init() and pinctrl_enable() instead */</div><div class='del'>-extern struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,</div><div class='add'>+extern struct pinctrl_dev *pinctrl_register(const struct pinctrl_desc *pctldesc,</div><div class='ctx'> 				struct device *dev, void *driver_data);</div><div class='ctx'> </div><div class='ctx'> extern void pinctrl_unregister(struct pinctrl_dev *pctldev);</div><div class='ctx'> </div><div class='ctx'> extern int devm_pinctrl_register_and_init(struct device *dev,</div><div class='del'>-				struct pinctrl_desc *pctldesc,</div><div class='add'>+				const struct pinctrl_desc *pctldesc,</div><div class='ctx'> 				void *driver_data,</div><div class='ctx'> 				struct pinctrl_dev **pctldev);</div><div class='ctx'> </div><div class='ctx'> /* Please use devm_pinctrl_register_and_init() instead */</div><div class='ctx'> extern struct pinctrl_dev *devm_pinctrl_register(struct device *dev,</div><div class='del'>-				struct pinctrl_desc *pctldesc,</div><div class='add'>+				const struct pinctrl_desc *pctldesc,</div><div class='ctx'> 				void *driver_data);</div><div class='ctx'> </div><div class='ctx'> extern void devm_pinctrl_unregister(struct device *dev,</div><div class='hunk'>@@ -206,16 +207,20 @@ extern int pinctrl_get_group_pins(struct pinctrl_dev *pctldev,</div><div class='ctx'> 				  const char *pin_group, const unsigned int **pins,</div><div class='ctx'> 				  unsigned int *num_pins);</div><div class='ctx'> </div><div class='add'>+#define PINFUNCTION_FLAG_GPIO	BIT(0)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct pinfunction - Description about a function</div><div class='ctx'>  * @name: Name of the function</div><div class='ctx'>  * @groups: An array of groups for this function</div><div class='ctx'>  * @ngroups: Number of groups in @groups</div><div class='add'>+ * @flags: Additional pin function flags</div><div class='ctx'>  */</div><div class='ctx'> struct pinfunction {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	const char * const *groups;</div><div class='ctx'> 	size_t ngroups;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Convenience macro to define a single named pinfunction */</div><div class='hunk'>@@ -226,6 +231,15 @@ struct pinfunction {</div><div class='ctx'> 		.ngroups = (_ngroups),			\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+/* Same as PINCTRL_PINFUNCTION() but for the GPIO category of functions */</div><div class='add'>+#define PINCTRL_GPIO_PINFUNCTION(_name, _groups, _ngroups)	\</div><div class='add'>+(struct pinfunction) {						\</div><div class='add'>+		.name = (_name),				\</div><div class='add'>+		.groups = (_groups),				\</div><div class='add'>+		.ngroups = (_ngroups),				\</div><div class='add'>+		.flags = PINFUNCTION_FLAG_GPIO,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #if IS_ENABLED(CONFIG_OF) &amp;&amp; IS_ENABLED(CONFIG_PINCTRL)</div><div class='ctx'> extern struct pinctrl_dev *of_pinctrl_get(struct device_node *np);</div><div class='ctx'> #else</div><div class='head'>diff --git a/include/linux/pinctrl/pinmux.h b/include/linux/pinctrl/pinmux.h<br/>index d6f7b58d6ad0..094bbe2fd6fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/pinmux.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pinctrl/pinmux.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pinctrl/pinmux.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pinctrl/pinmux.h</a></div><div class='hunk'>@@ -35,6 +35,16 @@ struct pinctrl_gpio_range;</div><div class='ctx'>  *	name can be used with the generic @pinctrl_ops to retrieve the</div><div class='ctx'>  *	actual pins affected. The applicable groups will be returned in</div><div class='ctx'>  *	@groups and the number of groups in @num_groups</div><div class='add'>+ * @function_is_gpio: determine if the indicated function selector passed</div><div class='add'>+ *	corresponds to the GPIO function which is used by the accelerated GPIO</div><div class='add'>+ *	functions @gpio_request_enable, @gpio_disable_free and</div><div class='add'>+ *	@gpio_set_direction. When the pin control core can properly determine</div><div class='add'>+ *	if a function is a GPIO function, it is easier to use the @strict mode</div><div class='add'>+ *	on the pin controller. Since a single function is passed, this is</div><div class='add'>+ *	only useful on pin controllers that use a specific function for GPIO,</div><div class='add'>+ *	and that usually presupposes that a one-group-per-pin approach is</div><div class='add'>+ *	used, so that a single function can be set on a single pin to turn</div><div class='add'>+ *	it to GPIO mode.</div><div class='ctx'>  * @set_mux: enable a certain muxing function with a certain pin group. The</div><div class='ctx'>  *	driver does not need to figure out whether enabling this function</div><div class='ctx'>  *	conflicts some other use of the pins in that group, such collisions</div><div class='hunk'>@@ -66,6 +76,8 @@ struct pinmux_ops {</div><div class='ctx'> 				    unsigned int selector,</div><div class='ctx'> 				    const char * const **groups,</div><div class='ctx'> 				    unsigned int *num_groups);</div><div class='add'>+	bool (*function_is_gpio) (struct pinctrl_dev *pctldev,</div><div class='add'>+				  unsigned int selector);</div><div class='ctx'> 	int (*set_mux) (struct pinctrl_dev *pctldev, unsigned int func_selector,</div><div class='ctx'> 			unsigned int group_selector);</div><div class='ctx'> 	int (*gpio_request_enable) (struct pinctrl_dev *pctldev,</div><div class='head'>diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h<br/>index 8ff23bf5a819..7f6a92ac9704 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pipe_fs_i.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pipe_fs_i.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pipe_fs_i.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pipe_fs_i.h</a></div><div class='hunk'>@@ -31,13 +31,39 @@ struct pipe_buffer {</div><div class='ctx'> 	unsigned long private;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Really only alpha needs 32-bit fields, but</div><div class='add'>+ * might as well do it for 64-bit architectures</div><div class='add'>+ * since that's what we've historically done,</div><div class='add'>+ * and it makes 'head_tail' always be a simple</div><div class='add'>+ * 'unsigned long'.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+typedef unsigned int pipe_index_t;</div><div class='add'>+#else</div><div class='add'>+typedef unsigned short pipe_index_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	struct pipe_index - pipe indeces</div><div class='add'>+ *	@head: The point of buffer production</div><div class='add'>+ *	@tail: The point of buffer consumption</div><div class='add'>+ *	@head_tail: unsigned long union of @head and @tail</div><div class='add'>+ */</div><div class='add'>+union pipe_index {</div><div class='add'>+	unsigned long head_tail;</div><div class='add'>+	struct {</div><div class='add'>+		pipe_index_t head;</div><div class='add'>+		pipe_index_t tail;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	struct pipe_inode_info - a linux kernel pipe</div><div class='ctx'>  *	@mutex: mutex protecting the whole thing</div><div class='ctx'>  *	@rd_wait: reader wait point in case of empty pipe</div><div class='ctx'>  *	@wr_wait: writer wait point in case of full pipe</div><div class='del'>- *	@head: The point of buffer production</div><div class='del'>- *	@tail: The point of buffer consumption</div><div class='add'>+ *	@pipe_index: the pipe indeces</div><div class='ctx'>  *	@note_loss: The next read() should insert a data-lost message</div><div class='ctx'>  *	@max_usage: The maximum number of slots that may be used in the ring</div><div class='ctx'>  *	@ring_size: total number of buffers (should be a power of 2)</div><div class='hunk'>@@ -58,8 +84,9 @@ struct pipe_buffer {</div><div class='ctx'> struct pipe_inode_info {</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> 	wait_queue_head_t rd_wait, wr_wait;</div><div class='del'>-	unsigned int head;</div><div class='del'>-	unsigned int tail;</div><div class='add'>+</div><div class='add'>+	union pipe_index;</div><div class='add'>+</div><div class='ctx'> 	unsigned int max_usage;</div><div class='ctx'> 	unsigned int ring_size;</div><div class='ctx'> 	unsigned int nr_accounted;</div><div class='hunk'>@@ -72,7 +99,7 @@ struct pipe_inode_info {</div><div class='ctx'> #ifdef CONFIG_WATCH_QUEUE</div><div class='ctx'> 	bool note_loss;</div><div class='ctx'> #endif</div><div class='del'>-	struct page *tmp_page;</div><div class='add'>+	struct page *tmp_page[2];</div><div class='ctx'> 	struct fasync_struct *fasync_readers;</div><div class='ctx'> 	struct fasync_struct *fasync_writers;</div><div class='ctx'> 	struct pipe_buffer *bufs;</div><div class='hunk'>@@ -141,23 +168,23 @@ static inline bool pipe_has_watch_queue(const struct pipe_inode_info *pipe)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pipe_empty - Return true if the pipe is empty</div><div class='add'>+ * pipe_occupancy - Return number of slots used in the pipe</div><div class='ctx'>  * @head: The pipe ring head pointer</div><div class='ctx'>  * @tail: The pipe ring tail pointer</div><div class='ctx'>  */</div><div class='del'>-static inline bool pipe_empty(unsigned int head, unsigned int tail)</div><div class='add'>+static inline unsigned int pipe_occupancy(unsigned int head, unsigned int tail)</div><div class='ctx'> {</div><div class='del'>-	return head == tail;</div><div class='add'>+	return (pipe_index_t)(head - tail);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pipe_occupancy - Return number of slots used in the pipe</div><div class='add'>+ * pipe_empty - Return true if the pipe is empty</div><div class='ctx'>  * @head: The pipe ring head pointer</div><div class='ctx'>  * @tail: The pipe ring tail pointer</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned int pipe_occupancy(unsigned int head, unsigned int tail)</div><div class='add'>+static inline bool pipe_empty(unsigned int head, unsigned int tail)</div><div class='ctx'> {</div><div class='del'>-	return head - tail;</div><div class='add'>+	return !pipe_occupancy(head, tail);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -173,6 +200,33 @@ static inline bool pipe_full(unsigned int head, unsigned int tail,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pipe_is_full - Return true if the pipe is full</div><div class='add'>+ * @pipe: the pipe</div><div class='add'>+ */</div><div class='add'>+static inline bool pipe_is_full(const struct pipe_inode_info *pipe)</div><div class='add'>+{</div><div class='add'>+	return pipe_full(pipe-&gt;head, pipe-&gt;tail, pipe-&gt;max_usage);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pipe_is_empty - Return true if the pipe is empty</div><div class='add'>+ * @pipe: the pipe</div><div class='add'>+ */</div><div class='add'>+static inline bool pipe_is_empty(const struct pipe_inode_info *pipe)</div><div class='add'>+{</div><div class='add'>+	return pipe_empty(pipe-&gt;head, pipe-&gt;tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pipe_buf_usage - Return how many pipe buffers are in use</div><div class='add'>+ * @pipe: the pipe</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int pipe_buf_usage(const struct pipe_inode_info *pipe)</div><div class='add'>+{</div><div class='add'>+	return pipe_occupancy(pipe-&gt;head, pipe-&gt;tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pipe_buf - Return the pipe buffer for the specified slot in the pipe ring</div><div class='ctx'>  * @pipe: The pipe to access</div><div class='ctx'>  * @slot: The slot of interest</div><div class='hunk'>@@ -245,15 +299,6 @@ static inline bool pipe_buf_try_steal(struct pipe_inode_info *pipe,</div><div class='ctx'> 	return buf-&gt;ops-&gt;try_steal(pipe, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pipe_discard_from(struct pipe_inode_info *pipe,</div><div class='del'>-		unsigned int old_head)</div><div class='del'>-{</div><div class='del'>-	unsigned int mask = pipe-&gt;ring_size - 1;</div><div class='del'>-</div><div class='del'>-	while (pipe-&gt;head &gt; old_head)</div><div class='del'>-		pipe_buf_release(pipe, &amp;pipe-&gt;bufs[--pipe-&gt;head &amp; mask]);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual</div><div class='ctx'>    memory allocation, whereas PIPE_BUF makes atomicity guarantees.  */</div><div class='ctx'> #define PIPE_SIZE		PAGE_SIZE</div><div class='head'>diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h<br/>deleted file mode 100644<br/>index 2f1b952d596a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pktcdvd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pktcdvd.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,198 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2000 Jens Axboe &lt;axboe@suse.de&gt;</div><div class='del'>- * Copyright (C) 2001-2004 Peter Osterlund &lt;petero2@telia.com&gt;</div><div class='del'>- *</div><div class='del'>- * May be copied or modified under the terms of the GNU General Public</div><div class='del'>- * License.  See linux/COPYING for more information.</div><div class='del'>- *</div><div class='del'>- * Packet writing layer for ATAPI and SCSI CD-R, CD-RW, DVD-R, and</div><div class='del'>- * DVD-RW devices.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#ifndef __PKTCDVD_H</div><div class='del'>-#define __PKTCDVD_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;linux/cdrom.h&gt;</div><div class='del'>-#include &lt;linux/kobject.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include &lt;linux/mempool.h&gt;</div><div class='del'>-#include &lt;uapi/linux/pktcdvd.h&gt;</div><div class='del'>-</div><div class='del'>-/* default bio write queue congestion marks */</div><div class='del'>-#define PKT_WRITE_CONGESTION_ON    10000</div><div class='del'>-#define PKT_WRITE_CONGESTION_OFF   9000</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct packet_settings</div><div class='del'>-{</div><div class='del'>-	__u32			size;		/* packet size in (512 byte) sectors */</div><div class='del'>-	__u8			fp;		/* fixed packets */</div><div class='del'>-	__u8			link_loss;	/* the rest is specified</div><div class='del'>-						 * as per Mt Fuji */</div><div class='del'>-	__u8			write_type;</div><div class='del'>-	__u8			track_mode;</div><div class='del'>-	__u8			block_mode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Very crude stats for now</div><div class='del'>- */</div><div class='del'>-struct packet_stats</div><div class='del'>-{</div><div class='del'>-	unsigned long		pkt_started;</div><div class='del'>-	unsigned long		pkt_ended;</div><div class='del'>-	unsigned long		secs_w;</div><div class='del'>-	unsigned long		secs_rg;</div><div class='del'>-	unsigned long		secs_r;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct packet_cdrw</div><div class='del'>-{</div><div class='del'>-	struct list_head	pkt_free_list;</div><div class='del'>-	struct list_head	pkt_active_list;</div><div class='del'>-	spinlock_t		active_list_lock; /* Serialize access to pkt_active_list */</div><div class='del'>-	struct task_struct	*thread;</div><div class='del'>-	atomic_t		pending_bios;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Switch to high speed reading after reading this many kilobytes</div><div class='del'>- * with no interspersed writes.</div><div class='del'>- */</div><div class='del'>-#define HI_SPEED_SWITCH 512</div><div class='del'>-</div><div class='del'>-struct packet_iosched</div><div class='del'>-{</div><div class='del'>-	atomic_t		attention;	/* Set to non-zero when queue processing is needed */</div><div class='del'>-	int			writing;	/* Non-zero when writing, zero when reading */</div><div class='del'>-	spinlock_t		lock;		/* Protecting read/write queue manipulations */</div><div class='del'>-	struct bio_list		read_queue;</div><div class='del'>-	struct bio_list		write_queue;</div><div class='del'>-	sector_t		last_write;	/* The sector where the last write ended */</div><div class='del'>-	int			successive_reads;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 32 buffers of 2048 bytes</div><div class='del'>- */</div><div class='del'>-#if (PAGE_SIZE % CD_FRAMESIZE) != 0</div><div class='del'>-#error "PAGE_SIZE must be a multiple of CD_FRAMESIZE"</div><div class='del'>-#endif</div><div class='del'>-#define PACKET_MAX_SIZE		128</div><div class='del'>-#define FRAMES_PER_PAGE		(PAGE_SIZE / CD_FRAMESIZE)</div><div class='del'>-#define PACKET_MAX_SECTORS	(PACKET_MAX_SIZE * CD_FRAMESIZE &gt;&gt; 9)</div><div class='del'>-</div><div class='del'>-enum packet_data_state {</div><div class='del'>-	PACKET_IDLE_STATE,			/* Not used at the moment */</div><div class='del'>-	PACKET_WAITING_STATE,			/* Waiting for more bios to arrive, so */</div><div class='del'>-						/* we don't have to do as much */</div><div class='del'>-						/* data gathering */</div><div class='del'>-	PACKET_READ_WAIT_STATE,			/* Waiting for reads to fill in holes */</div><div class='del'>-	PACKET_WRITE_WAIT_STATE,		/* Waiting for the write to complete */</div><div class='del'>-	PACKET_RECOVERY_STATE,			/* Recover after read/write errors */</div><div class='del'>-	PACKET_FINISHED_STATE,			/* After write has finished */</div><div class='del'>-</div><div class='del'>-	PACKET_NUM_STATES			/* Number of possible states */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Information needed for writing a single packet</div><div class='del'>- */</div><div class='del'>-struct pktcdvd_device;</div><div class='del'>-</div><div class='del'>-struct packet_data</div><div class='del'>-{</div><div class='del'>-	struct list_head	list;</div><div class='del'>-</div><div class='del'>-	spinlock_t		lock;		/* Lock protecting state transitions and */</div><div class='del'>-						/* orig_bios list */</div><div class='del'>-</div><div class='del'>-	struct bio_list		orig_bios;	/* Original bios passed to pkt_make_request */</div><div class='del'>-						/* that will be handled by this packet */</div><div class='del'>-	int			write_size;	/* Total size of all bios in the orig_bios */</div><div class='del'>-						/* list, measured in number of frames */</div><div class='del'>-</div><div class='del'>-	struct bio		*w_bio;		/* The bio we will send to the real CD */</div><div class='del'>-						/* device once we have all data for the */</div><div class='del'>-						/* packet we are going to write */</div><div class='del'>-	sector_t		sector;		/* First sector in this packet */</div><div class='del'>-	int			frames;		/* Number of frames in this packet */</div><div class='del'>-</div><div class='del'>-	enum packet_data_state	state;		/* Current state */</div><div class='del'>-	atomic_t		run_sm;		/* Incremented whenever the state */</div><div class='del'>-						/* machine needs to be run */</div><div class='del'>-	long			sleep_time;	/* Set this to non-zero to make the state */</div><div class='del'>-						/* machine run after this many jiffies. */</div><div class='del'>-</div><div class='del'>-	atomic_t		io_wait;	/* Number of pending IO operations */</div><div class='del'>-	atomic_t		io_errors;	/* Number of read/write errors during IO */</div><div class='del'>-</div><div class='del'>-	struct bio		*r_bios[PACKET_MAX_SIZE]; /* bios to use during data gathering */</div><div class='del'>-	struct page		*pages[PACKET_MAX_SIZE / FRAMES_PER_PAGE];</div><div class='del'>-</div><div class='del'>-	int			cache_valid;	/* If non-zero, the data for the zone defined */</div><div class='del'>-						/* by the sector variable is completely cached */</div><div class='del'>-						/* in the pages[] vector. */</div><div class='del'>-</div><div class='del'>-	int			id;		/* ID number for debugging */</div><div class='del'>-	struct pktcdvd_device	*pd;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pkt_rb_node {</div><div class='del'>-	struct rb_node		rb_node;</div><div class='del'>-	struct bio		*bio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct packet_stacked_data</div><div class='del'>-{</div><div class='del'>-	struct bio		*bio;		/* Original read request bio */</div><div class='del'>-	struct pktcdvd_device	*pd;</div><div class='del'>-};</div><div class='del'>-#define PSD_POOL_SIZE		64</div><div class='del'>-</div><div class='del'>-struct pktcdvd_device</div><div class='del'>-{</div><div class='del'>-	struct file		*bdev_file;	/* dev attached */</div><div class='del'>-	/* handle acquired for bdev during pkt_open_dev() */</div><div class='del'>-	struct file		*f_open_bdev;</div><div class='del'>-	dev_t			pkt_dev;	/* our dev */</div><div class='del'>-	struct packet_settings	settings;</div><div class='del'>-	struct packet_stats	stats;</div><div class='del'>-	int			refcnt;		/* Open count */</div><div class='del'>-	int			write_speed;	/* current write speed, kB/s */</div><div class='del'>-	int			read_speed;	/* current read speed, kB/s */</div><div class='del'>-	unsigned long		offset;		/* start offset */</div><div class='del'>-	__u8			mode_offset;	/* 0 / 8 */</div><div class='del'>-	__u8			type;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	__u16			mmc3_profile;</div><div class='del'>-	__u32			nwa;		/* next writable address */</div><div class='del'>-	__u32			lra;		/* last recorded address */</div><div class='del'>-	struct packet_cdrw	cdrw;</div><div class='del'>-	wait_queue_head_t	wqueue;</div><div class='del'>-</div><div class='del'>-	spinlock_t		lock;		/* Serialize access to bio_queue */</div><div class='del'>-	struct rb_root		bio_queue;	/* Work queue of bios we need to handle */</div><div class='del'>-	int			bio_queue_size;	/* Number of nodes in bio_queue */</div><div class='del'>-	bool			congested;	/* Someone is waiting for bio_queue_size</div><div class='del'>-						 * to drop. */</div><div class='del'>-	sector_t		current_sector;	/* Keep track of where the elevator is */</div><div class='del'>-	atomic_t		scan_queue;	/* Set to non-zero when pkt_handle_queue */</div><div class='del'>-						/* needs to be run. */</div><div class='del'>-	mempool_t		rb_pool;	/* mempool for pkt_rb_node allocations */</div><div class='del'>-</div><div class='del'>-	struct packet_iosched   iosched;</div><div class='del'>-	struct gendisk		*disk;</div><div class='del'>-</div><div class='del'>-	int			write_congestion_off;</div><div class='del'>-	int			write_congestion_on;</div><div class='del'>-</div><div class='del'>-	struct device		*dev;		/* sysfs pktcdvd[0-7] dev */</div><div class='del'>-</div><div class='del'>-	struct dentry		*dfs_d_root;	/* debugfs: devname directory */</div><div class='del'>-	struct dentry		*dfs_f_info;	/* debugfs: info file */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __PKTCDVD_H */</div><div class='head'>diff --git a/include/linux/platform_data/ad5449.h b/include/linux/platform_data/ad5449.h<br/>deleted file mode 100644<br/>index d687ef5726c2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/ad5449.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/ad5449.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * AD5415, AD5426, AD5429, AD5432, AD5439, AD5443, AD5449 Digital to Analog</div><div class='del'>- * Converter driver.</div><div class='del'>- *</div><div class='del'>- * Copyright 2012 Analog Devices Inc.</div><div class='del'>- *  Author: Lars-Peter Clausen &lt;lars@metafoo.de&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_PLATFORM_DATA_AD5449_H__</div><div class='del'>-#define __LINUX_PLATFORM_DATA_AD5449_H__</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * enum ad5449_sdo_mode - AD5449 SDO pin configuration</div><div class='del'>- * @AD5449_SDO_DRIVE_FULL: Drive the SDO pin with full strength.</div><div class='del'>- * @AD5449_SDO_DRIVE_WEAK: Drive the SDO pin with not full strength.</div><div class='del'>- * @AD5449_SDO_OPEN_DRAIN: Operate the SDO pin in open-drain mode.</div><div class='del'>- * @AD5449_SDO_DISABLED: Disable the SDO pin, in this mode it is not possible to</div><div class='del'>- *			read back from the device.</div><div class='del'>- */</div><div class='del'>-enum ad5449_sdo_mode {</div><div class='del'>-	AD5449_SDO_DRIVE_FULL = 0x0,</div><div class='del'>-	AD5449_SDO_DRIVE_WEAK = 0x1,</div><div class='del'>-	AD5449_SDO_OPEN_DRAIN = 0x2,</div><div class='del'>-	AD5449_SDO_DISABLED = 0x3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ad5449_platform_data - Platform data for the ad5449 DAC driver</div><div class='del'>- * @sdo_mode: SDO pin mode</div><div class='del'>- * @hardware_clear_to_midscale: Whether asserting the hardware CLR pin sets the</div><div class='del'>- *			outputs to midscale (true) or to zero scale(false).</div><div class='del'>- */</div><div class='del'>-struct ad5449_platform_data {</div><div class='del'>-	enum ad5449_sdo_mode sdo_mode;</div><div class='del'>-	bool hardware_clear_to_midscale;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/platform_data/amd_qdma.h b/include/linux/platform_data/amd_qdma.h<br/>new file mode 100644<br/>index 000000000000..967a6ef31cf9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/amd_qdma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/amd_qdma.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023-2024, Advanced Micro Devices, Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _PLATDATA_AMD_QDMA_H</div><div class='add'>+#define _PLATDATA_AMD_QDMA_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct qdma_queue_info - DMA queue information. This information is used to</div><div class='add'>+ *			    match queue when DMA channel is requested</div><div class='add'>+ * @dir: Channel transfer direction</div><div class='add'>+ */</div><div class='add'>+struct qdma_queue_info {</div><div class='add'>+	enum dma_transfer_direction dir;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QDMA_FILTER_PARAM(qinfo)	((void *)(qinfo))</div><div class='add'>+</div><div class='add'>+struct dma_slave_map;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct qdma_platdata - Platform specific data for QDMA engine</div><div class='add'>+ * @max_mm_channels: Maximum number of MM DMA channels in each direction</div><div class='add'>+ * @device_map: DMA slave map</div><div class='add'>+ * @irq_index: The index of first IRQ</div><div class='add'>+ * @dma_dev: The device pointer for dma operations</div><div class='add'>+ */</div><div class='add'>+struct qdma_platdata {</div><div class='add'>+	u32			max_mm_channels;</div><div class='add'>+	u32			irq_index;</div><div class='add'>+	struct dma_slave_map	*device_map;</div><div class='add'>+	struct device		*dma_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _PLATDATA_AMD_QDMA_H */</div><div class='head'>diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h<br/>index f9c00f839e9f..085dd8e8af76 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/asoc-s3c.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/asoc-s3c.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/asoc-s3c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/asoc-s3c.h</a></div><div class='hunk'>@@ -13,8 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dmaengine.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void s3c64xx_ac97_setup_gpio(int);</div><div class='del'>-</div><div class='ctx'> struct samsung_i2s_type {</div><div class='ctx'> /* If the Primary DAI has 5.1 Channels */</div><div class='ctx'> #define QUIRK_PRI_6CHAN		(1 &lt;&lt; 0)</div><div class='head'>diff --git a/include/linux/platform_data/bcmgenet.h b/include/linux/platform_data/bcmgenet.h<br/>deleted file mode 100644<br/>index d8f8738629d2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/bcmgenet.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/bcmgenet.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __LINUX_PLATFORM_DATA_BCMGENET_H__</div><div class='del'>-#define __LINUX_PLATFORM_DATA_BCMGENET_H__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-</div><div class='del'>-struct bcmgenet_platform_data {</div><div class='del'>-	bool		mdio_enabled;</div><div class='del'>-	phy_interface_t	phy_interface;</div><div class='del'>-	int		phy_address;</div><div class='del'>-	int		phy_speed;</div><div class='del'>-	int		phy_duplex;</div><div class='del'>-	u8		mac_address[ETH_ALEN];</div><div class='del'>-	int		genet_version;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/platform_data/clk-davinci-pll.h b/include/linux/platform_data/clk-davinci-pll.h<br/>deleted file mode 100644<br/>index e55dab1d578b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/clk-davinci-pll.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/clk-davinci-pll.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * PLL clock driver for TI Davinci SoCs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2018 David Lechner &lt;david@lechnology.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_PLATFORM_DATA_CLK_DAVINCI_PLL_H__</div><div class='del'>-#define __LINUX_PLATFORM_DATA_CLK_DAVINCI_PLL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/regmap.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * davinci_pll_platform_data</div><div class='del'>- * @cfgchip: CFGCHIP syscon regmap</div><div class='del'>- */</div><div class='del'>-struct davinci_pll_platform_data {</div><div class='del'>-	struct regmap *cfgchip;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __LINUX_PLATFORM_DATA_CLK_DAVINCI_PLL_H__ */</div><div class='head'>diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h<br/>index 7dae17b62a4d..69294f79cc88 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/cros_ec_commands.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/cros_ec_commands.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/cros_ec_commands.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/cros_ec_commands.h</a></div><div class='hunk'>@@ -1312,6 +1312,38 @@ enum ec_feature_code {</div><div class='ctx'> 	 * The EC supports the AP composing VDMs for us to send.</div><div class='ctx'> 	 */</div><div class='ctx'> 	EC_FEATURE_TYPEC_AP_VDM_SEND = 46,</div><div class='add'>+	/*</div><div class='add'>+	 * The EC supports system safe mode panic recovery.</div><div class='add'>+	 */</div><div class='add'>+	EC_FEATURE_SYSTEM_SAFE_MODE = 47,</div><div class='add'>+	/*</div><div class='add'>+	 * The EC will reboot on runtime assertion failures.</div><div class='add'>+	 */</div><div class='add'>+	EC_FEATURE_ASSERT_REBOOTS = 48,</div><div class='add'>+	/*</div><div class='add'>+	 * The EC image is built with tokenized logging enabled.</div><div class='add'>+	 */</div><div class='add'>+	EC_FEATURE_TOKENIZED_LOGGING = 49,</div><div class='add'>+	/*</div><div class='add'>+	 * The EC supports triggering an STB dump.</div><div class='add'>+	 */</div><div class='add'>+	EC_FEATURE_AMD_STB_DUMP = 50,</div><div class='add'>+	/*</div><div class='add'>+	 * The EC supports memory dump commands.</div><div class='add'>+	 */</div><div class='add'>+	EC_FEATURE_MEMORY_DUMP = 51,</div><div class='add'>+	/*</div><div class='add'>+	 * The EC supports DP2.1 capability</div><div class='add'>+	 */</div><div class='add'>+	EC_FEATURE_TYPEC_DP2_1 = 52,</div><div class='add'>+	/*</div><div class='add'>+	 * The MCU is System Companion Processor Core 1</div><div class='add'>+	 */</div><div class='add'>+	EC_FEATURE_SCP_C1 = 53,</div><div class='add'>+	/*</div><div class='add'>+	 * The EC supports UCSI PPM.</div><div class='add'>+	 */</div><div class='add'>+	EC_FEATURE_UCSI_PPM = 54,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define EC_FEATURE_MASK_0(event_code) BIT(event_code % 32)</div><div class='hunk'>@@ -1793,6 +1825,16 @@ struct ec_response_pwm_get_duty {</div><div class='ctx'> 	uint16_t duty;     /* Duty cycle, EC_PWM_MAX_DUTY = 100% */</div><div class='ctx'> } __ec_align2;</div><div class='ctx'> </div><div class='add'>+#define EC_CMD_PWM_GET_FAN_DUTY 0x0027</div><div class='add'>+</div><div class='add'>+struct ec_params_pwm_get_fan_duty {</div><div class='add'>+	uint8_t fan_idx;</div><div class='add'>+} __ec_align1;</div><div class='add'>+</div><div class='add'>+struct ec_response_pwm_get_fan_duty {</div><div class='add'>+	uint32_t percent; /* Percentage of duty cycle, ranging from 0 ~ 100 */</div><div class='add'>+} __ec_align4;</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*</div><div class='ctx'>  * Lightbar commands. This looks worse than it is. Since we only use one HOST</div><div class='hunk'>@@ -2356,6 +2398,12 @@ enum motionsense_command {</div><div class='ctx'> 	 */</div><div class='ctx'> 	MOTIONSENSE_CMD_SENSOR_SCALE = 18,</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Activity management</div><div class='add'>+	 * Retrieve current status of given activity.</div><div class='add'>+	 */</div><div class='add'>+	MOTIONSENSE_CMD_GET_ACTIVITY = 20,</div><div class='add'>+</div><div class='ctx'> 	/* Number of motionsense sub-commands. */</div><div class='ctx'> 	MOTIONSENSE_NUM_CMDS</div><div class='ctx'> };</div><div class='hunk'>@@ -2415,6 +2463,11 @@ enum motionsensor_orientation {</div><div class='ctx'> 	MOTIONSENSE_ORIENTATION_UNKNOWN = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ec_response_activity_data {</div><div class='add'>+	uint8_t activity; /* motionsensor_activity */</div><div class='add'>+	uint8_t state;</div><div class='add'>+} __ec_todo_packed;</div><div class='add'>+</div><div class='ctx'> struct ec_response_motion_sensor_data {</div><div class='ctx'> 	/* Flags for each sensor. */</div><div class='ctx'> 	uint8_t flags;</div><div class='hunk'>@@ -2428,8 +2481,7 @@ struct ec_response_motion_sensor_data {</div><div class='ctx'> 			uint32_t    timestamp;</div><div class='ctx'> 		};</div><div class='ctx'> 		struct __ec_todo_unpacked {</div><div class='del'>-			uint8_t     activity; /* motionsensor_activity */</div><div class='del'>-			uint8_t     state;</div><div class='add'>+			struct ec_response_activity_data activity_data;</div><div class='ctx'> 			int16_t     add_info[2];</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='hunk'>@@ -2462,6 +2514,7 @@ enum motionsensor_activity {</div><div class='ctx'> 	MOTIONSENSE_ACTIVITY_SIG_MOTION = 1,</div><div class='ctx'> 	MOTIONSENSE_ACTIVITY_DOUBLE_TAP = 2,</div><div class='ctx'> 	MOTIONSENSE_ACTIVITY_ORIENTATION = 3,</div><div class='add'>+	MOTIONSENSE_ACTIVITY_BODY_DETECTION = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ec_motion_sense_activity {</div><div class='hunk'>@@ -2639,6 +2692,7 @@ struct ec_params_motion_sense {</div><div class='ctx'> 			uint32_t max_data_vector;</div><div class='ctx'> 		} fifo_read;</div><div class='ctx'> </div><div class='add'>+		/* Used for MOTIONSENSE_CMD_SET_ACTIVITY */</div><div class='ctx'> 		struct ec_motion_sense_activity set_activity;</div><div class='ctx'> </div><div class='ctx'> 		/* Used for MOTIONSENSE_CMD_LID_ANGLE */</div><div class='hunk'>@@ -2684,6 +2738,12 @@ struct ec_params_motion_sense {</div><div class='ctx'> 			 */</div><div class='ctx'> 			int16_t hys_degree;</div><div class='ctx'> 		} tablet_mode_threshold;</div><div class='add'>+</div><div class='add'>+		/* Used for MOTIONSENSE_CMD_GET_ACTIVITY */</div><div class='add'>+		struct __ec_todo_unpacked {</div><div class='add'>+			uint8_t sensor_num;</div><div class='add'>+			uint8_t activity;  /* enum motionsensor_activity */</div><div class='add'>+		} get_activity;</div><div class='ctx'> 	};</div><div class='ctx'> } __ec_todo_packed;</div><div class='ctx'> </div><div class='hunk'>@@ -2801,6 +2861,10 @@ struct ec_response_motion_sense {</div><div class='ctx'> 			uint16_t hys_degree;</div><div class='ctx'> 		} tablet_mode_threshold;</div><div class='ctx'> </div><div class='add'>+		/* USED for MOTIONSENSE_CMD_GET_ACTIVITY. */</div><div class='add'>+		struct __ec_todo_unpacked {</div><div class='add'>+			uint8_t     state;</div><div class='add'>+		} get_activity;</div><div class='ctx'> 	};</div><div class='ctx'> } __ec_todo_packed;</div><div class='ctx'> </div><div class='hunk'>@@ -3073,14 +3137,31 @@ struct ec_params_thermal_set_threshold_v1 {</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* Toggle automatic fan control */</div><div class='add'>+/* Set or get fan control mode */</div><div class='ctx'> #define EC_CMD_THERMAL_AUTO_FAN_CTRL 0x0052</div><div class='ctx'> </div><div class='add'>+enum ec_auto_fan_ctrl_cmd {</div><div class='add'>+	EC_AUTO_FAN_CONTROL_CMD_SET = 0,</div><div class='add'>+	EC_AUTO_FAN_CONTROL_CMD_GET,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Version 1 of input params */</div><div class='ctx'> struct ec_params_auto_fan_ctrl_v1 {</div><div class='ctx'> 	uint8_t fan_idx;</div><div class='ctx'> } __ec_align1;</div><div class='ctx'> </div><div class='add'>+/* Version 2 of input params */</div><div class='add'>+struct ec_params_auto_fan_ctrl_v2 {</div><div class='add'>+	uint8_t fan_idx;</div><div class='add'>+	uint8_t cmd; /* enum ec_auto_fan_ctrl_cmd */</div><div class='add'>+	uint8_t set_auto; /* only used with EC_AUTO_FAN_CONTROL_CMD_SET - bool</div><div class='add'>+			   */</div><div class='add'>+} __ec_align4;</div><div class='add'>+</div><div class='add'>+struct ec_response_auto_fan_control {</div><div class='add'>+	uint8_t is_auto; /* bool */</div><div class='add'>+} __ec_align1;</div><div class='add'>+</div><div class='ctx'> /* Get/Set TMP006 calibration data */</div><div class='ctx'> #define EC_CMD_TMP006_GET_CALIBRATION 0x0053</div><div class='ctx'> #define EC_CMD_TMP006_SET_CALIBRATION 0x0054</div><div class='hunk'>@@ -3463,6 +3544,34 @@ union __ec_align_offset1 ec_response_get_next_data_v1 {</div><div class='ctx'> };</div><div class='ctx'> BUILD_ASSERT(sizeof(union ec_response_get_next_data_v1) == 16);</div><div class='ctx'> </div><div class='add'>+union __ec_align_offset1 ec_response_get_next_data_v3 {</div><div class='add'>+	uint8_t key_matrix[18];</div><div class='add'>+</div><div class='add'>+	/* Unaligned */</div><div class='add'>+	uint32_t host_event;</div><div class='add'>+	uint64_t host_event64;</div><div class='add'>+</div><div class='add'>+	struct __ec_todo_unpacked {</div><div class='add'>+		/* For aligning the fifo_info */</div><div class='add'>+		uint8_t reserved[3];</div><div class='add'>+		struct ec_response_motion_sense_fifo_info info;</div><div class='add'>+	} sensor_fifo;</div><div class='add'>+</div><div class='add'>+	uint32_t buttons;</div><div class='add'>+</div><div class='add'>+	uint32_t switches;</div><div class='add'>+</div><div class='add'>+	uint32_t fp_events;</div><div class='add'>+</div><div class='add'>+	uint32_t sysrq;</div><div class='add'>+</div><div class='add'>+	/* CEC events from enum mkbp_cec_event */</div><div class='add'>+	uint32_t cec_events;</div><div class='add'>+</div><div class='add'>+	uint8_t cec_message[16];</div><div class='add'>+};</div><div class='add'>+BUILD_ASSERT(sizeof(union ec_response_get_next_data_v3) == 18);</div><div class='add'>+</div><div class='ctx'> struct ec_response_get_next_event {</div><div class='ctx'> 	uint8_t event_type;</div><div class='ctx'> 	/* Followed by event data if any */</div><div class='hunk'>@@ -3475,6 +3584,12 @@ struct ec_response_get_next_event_v1 {</div><div class='ctx'> 	union ec_response_get_next_data_v1 data;</div><div class='ctx'> } __ec_align1;</div><div class='ctx'> </div><div class='add'>+struct ec_response_get_next_event_v3 {</div><div class='add'>+	uint8_t event_type;</div><div class='add'>+	/* Followed by event data if any */</div><div class='add'>+	union ec_response_get_next_data_v3 data;</div><div class='add'>+} __ec_align1;</div><div class='add'>+</div><div class='ctx'> /* Bit indices for buttons and switches.*/</div><div class='ctx'> /* Buttons */</div><div class='ctx'> #define EC_MKBP_POWER_BUTTON	0</div><div class='hunk'>@@ -3809,16 +3924,61 @@ struct ec_params_i2c_write {</div><div class='ctx'>  * discharge the battery.</div><div class='ctx'>  */</div><div class='ctx'> #define EC_CMD_CHARGE_CONTROL 0x0096</div><div class='del'>-#define EC_VER_CHARGE_CONTROL 1</div><div class='add'>+#define EC_VER_CHARGE_CONTROL 3</div><div class='ctx'> </div><div class='ctx'> enum ec_charge_control_mode {</div><div class='ctx'> 	CHARGE_CONTROL_NORMAL = 0,</div><div class='ctx'> 	CHARGE_CONTROL_IDLE,</div><div class='ctx'> 	CHARGE_CONTROL_DISCHARGE,</div><div class='add'>+	/* Add no more entry below. */</div><div class='add'>+	CHARGE_CONTROL_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EC_CHARGE_MODE_TEXT                               \</div><div class='add'>+	{                                                 \</div><div class='add'>+		[CHARGE_CONTROL_NORMAL] = "NORMAL",       \</div><div class='add'>+		[CHARGE_CONTROL_IDLE] = "IDLE",           \</div><div class='add'>+		[CHARGE_CONTROL_DISCHARGE] = "DISCHARGE", \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+enum ec_charge_control_cmd {</div><div class='add'>+	EC_CHARGE_CONTROL_CMD_SET = 0,</div><div class='add'>+	EC_CHARGE_CONTROL_CMD_GET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ec_charge_control_flag {</div><div class='add'>+	EC_CHARGE_CONTROL_FLAG_NO_IDLE = BIT(0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ec_params_charge_control {</div><div class='del'>-	uint32_t mode;  /* enum charge_control_mode */</div><div class='add'>+	uint32_t mode; /* enum charge_control_mode */</div><div class='add'>+</div><div class='add'>+	/* Below are the fields added in V2. */</div><div class='add'>+	uint8_t cmd; /* enum ec_charge_control_cmd. */</div><div class='add'>+	uint8_t flags; /* enum ec_charge_control_flag (v3+) */</div><div class='add'>+	/*</div><div class='add'>+	 * Lower and upper thresholds for battery sustainer. This struct isn't</div><div class='add'>+	 * named to avoid tainting foreign projects' name spaces.</div><div class='add'>+	 *</div><div class='add'>+	 * If charge mode is explicitly set (e.g. DISCHARGE), battery sustainer</div><div class='add'>+	 * will be disabled. To disable battery sustainer, set mode=NORMAL,</div><div class='add'>+	 * lower=-1, upper=-1.</div><div class='add'>+	 */</div><div class='add'>+	struct {</div><div class='add'>+		int8_t lower; /* Display SoC in percentage. */</div><div class='add'>+		int8_t upper; /* Display SoC in percentage. */</div><div class='add'>+	} sustain_soc;</div><div class='add'>+} __ec_align4;</div><div class='add'>+</div><div class='add'>+/* Added in v2 */</div><div class='add'>+struct ec_response_charge_control {</div><div class='add'>+	uint32_t mode; /* enum charge_control_mode */</div><div class='add'>+	struct { /* Battery sustainer thresholds */</div><div class='add'>+		int8_t lower;</div><div class='add'>+		int8_t upper;</div><div class='add'>+	} sustain_soc;</div><div class='add'>+	uint8_t flags; /* enum ec_charge_control_flag (v3+) */</div><div class='add'>+	uint8_t reserved;</div><div class='ctx'> } __ec_align4;</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3961,60 +4121,52 @@ struct ec_response_i2c_passthru {</div><div class='ctx'> } __ec_align1;</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='del'>-/* Power button hang detect */</div><div class='del'>-</div><div class='add'>+/* AP hang detect */</div><div class='ctx'> #define EC_CMD_HANG_DETECT 0x009F</div><div class='ctx'> </div><div class='del'>-/* Reasons to start hang detection timer */</div><div class='del'>-/* Power button pressed */</div><div class='del'>-#define EC_HANG_START_ON_POWER_PRESS  BIT(0)</div><div class='del'>-</div><div class='del'>-/* Lid closed */</div><div class='del'>-#define EC_HANG_START_ON_LID_CLOSE    BIT(1)</div><div class='del'>-</div><div class='del'>- /* Lid opened */</div><div class='del'>-#define EC_HANG_START_ON_LID_OPEN     BIT(2)</div><div class='add'>+#define EC_HANG_DETECT_MIN_TIMEOUT 5</div><div class='add'>+#define EC_HANG_DETECT_MAX_TIMEOUT 65535</div><div class='ctx'> </div><div class='del'>-/* Start of AP S3-&gt;S0 transition (booting or resuming from suspend) */</div><div class='del'>-#define EC_HANG_START_ON_RESUME       BIT(3)</div><div class='add'>+/* EC hang detect commands */</div><div class='add'>+enum ec_hang_detect_cmds {</div><div class='add'>+	/* Reload AP hang detect timer. */</div><div class='add'>+	EC_HANG_DETECT_CMD_RELOAD = 0x0,</div><div class='ctx'> </div><div class='del'>-/* Reasons to cancel hang detection */</div><div class='add'>+	/* Stop AP hang detect timer. */</div><div class='add'>+	EC_HANG_DETECT_CMD_CANCEL = 0x1,</div><div class='ctx'> </div><div class='del'>-/* Power button released */</div><div class='del'>-#define EC_HANG_STOP_ON_POWER_RELEASE BIT(8)</div><div class='del'>-</div><div class='del'>-/* Any host command from AP received */</div><div class='del'>-#define EC_HANG_STOP_ON_HOST_COMMAND  BIT(9)</div><div class='del'>-</div><div class='del'>-/* Stop on end of AP S0-&gt;S3 transition (suspending or shutting down) */</div><div class='del'>-#define EC_HANG_STOP_ON_SUSPEND       BIT(10)</div><div class='add'>+	/* Configure watchdog with given reboot timeout and</div><div class='add'>+	 * cancel currently running AP hang detect timer.</div><div class='add'>+	 */</div><div class='add'>+	EC_HANG_DETECT_CMD_SET_TIMEOUT = 0x2,</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * If this flag is set, all the other fields are ignored, and the hang detect</div><div class='del'>- * timer is started.  This provides the AP a way to start the hang timer</div><div class='del'>- * without reconfiguring any of the other hang detect settings.  Note that</div><div class='del'>- * you must previously have configured the timeouts.</div><div class='del'>- */</div><div class='del'>-#define EC_HANG_START_NOW             BIT(30)</div><div class='add'>+	/* Get last hang status - whether the AP boot was clear or not */</div><div class='add'>+	EC_HANG_DETECT_CMD_GET_STATUS = 0x3,</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * If this flag is set, all the other fields are ignored (including</div><div class='del'>- * EC_HANG_START_NOW).  This provides the AP a way to stop the hang timer</div><div class='del'>- * without reconfiguring any of the other hang detect settings.</div><div class='del'>- */</div><div class='del'>-#define EC_HANG_STOP_NOW              BIT(31)</div><div class='add'>+	/* Clear last hang status. Called when AP is rebooting/shutting down</div><div class='add'>+	 * gracefully.</div><div class='add'>+	 */</div><div class='add'>+	EC_HANG_DETECT_CMD_CLEAR_STATUS = 0x4</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct ec_params_hang_detect {</div><div class='del'>-	/* Flags; see EC_HANG_* */</div><div class='del'>-	uint32_t flags;</div><div class='del'>-</div><div class='del'>-	/* Timeout in msec before generating host event, if enabled */</div><div class='del'>-	uint16_t host_event_timeout_msec;</div><div class='add'>+	uint16_t command; /* enum ec_hang_detect_cmds */</div><div class='add'>+	/* Timeout in seconds before generating reboot */</div><div class='add'>+	uint16_t reboot_timeout_sec;</div><div class='add'>+} __ec_align2;</div><div class='ctx'> </div><div class='del'>-	/* Timeout in msec before generating warm reboot, if enabled */</div><div class='del'>-	uint16_t warm_reboot_timeout_msec;</div><div class='del'>-} __ec_align4;</div><div class='add'>+/* Status codes that describe whether AP has boot normally or the hang has been</div><div class='add'>+ * detected and EC has reset AP</div><div class='add'>+ */</div><div class='add'>+enum ec_hang_detect_status {</div><div class='add'>+	EC_HANG_DETECT_AP_BOOT_NORMAL = 0x0,</div><div class='add'>+	EC_HANG_DETECT_AP_BOOT_EC_WDT = 0x1,</div><div class='add'>+	EC_HANG_DETECT_AP_BOOT_COUNT,</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+struct ec_response_hang_detect {</div><div class='add'>+	uint8_t status; /* enum ec_hang_detect_status */</div><div class='add'>+} __ec_align1;</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /* Commands for battery charging */</div><div class='ctx'> </div><div class='hunk'>@@ -4941,8 +5093,12 @@ struct ec_response_pd_status {</div><div class='ctx'> #define PD_EVENT_POWER_CHANGE      BIT(1)</div><div class='ctx'> #define PD_EVENT_IDENTITY_RECEIVED BIT(2)</div><div class='ctx'> #define PD_EVENT_DATA_SWAP         BIT(3)</div><div class='add'>+#define PD_EVENT_TYPEC             BIT(4)</div><div class='add'>+#define PD_EVENT_PPM               BIT(5)</div><div class='add'>+#define PD_EVENT_INIT              BIT(6)</div><div class='add'>+</div><div class='ctx'> struct ec_response_host_event_status {</div><div class='del'>-	uint32_t status;      /* PD MCU host event status */</div><div class='add'>+	uint32_t status; /* PD MCU host event status */</div><div class='ctx'> } __ec_align4;</div><div class='ctx'> </div><div class='ctx'> /* Set USB type-C port role and muxes */</div><div class='hunk'>@@ -6002,6 +6158,29 @@ struct ec_response_typec_vdm_response {</div><div class='ctx'> </div><div class='ctx'> #undef VDO_MAX_SIZE</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * UCSI OPM-PPM commands</div><div class='add'>+ *</div><div class='add'>+ * These commands are used for communication between OPM and PPM.</div><div class='add'>+ * Only UCSI3.0 is tested.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define EC_CMD_UCSI_PPM_SET 0x0140</div><div class='add'>+</div><div class='add'>+/* The data size is stored in the host command protocol header. */</div><div class='add'>+struct ec_params_ucsi_ppm_set {</div><div class='add'>+	uint16_t offset;</div><div class='add'>+	uint8_t data[];</div><div class='add'>+} __ec_align2;</div><div class='add'>+</div><div class='add'>+#define EC_CMD_UCSI_PPM_GET 0x0141</div><div class='add'>+</div><div class='add'>+/* For 'GET' sub-commands, data will be returned as a raw payload. */</div><div class='add'>+struct ec_params_ucsi_ppm_get {</div><div class='add'>+	uint16_t offset;</div><div class='add'>+	uint8_t size;</div><div class='add'>+} __ec_align2;</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /* The command range 0x200-0x2FF is reserved for Rotor. */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h<br/>index 8865e350c12a..de14923720a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/cros_ec_proto.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/cros_ec_proto.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/cros_ec_proto.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/cros_ec_proto.h</a></div><div class='hunk'>@@ -33,15 +33,26 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Max bus-specific overhead incurred by request/responses.</div><div class='del'>- * I2C requires 1 additional byte for requests.</div><div class='del'>- * I2C requires 2 additional bytes for responses.</div><div class='del'>- * SPI requires up to 32 additional bytes for responses.</div><div class='add'>+ *</div><div class='add'>+ * Request:</div><div class='add'>+ * - I2C requires 1 byte (see struct ec_host_request_i2c).</div><div class='add'>+ * - ISHTP requires 4 bytes (see struct cros_ish_out_msg).</div><div class='add'>+ *</div><div class='add'>+ * Response:</div><div class='add'>+ * - I2C requires 2 bytes (see struct ec_host_response_i2c).</div><div class='add'>+ * - ISHTP requires 4 bytes (see struct cros_ish_in_msg).</div><div class='add'>+ * - SPI requires 32 bytes (see EC_MSG_PREAMBLE_COUNT).</div><div class='ctx'>  */</div><div class='ctx'> #define EC_PROTO_VERSION_UNKNOWN	0</div><div class='del'>-#define EC_MAX_REQUEST_OVERHEAD		1</div><div class='add'>+#define EC_MAX_REQUEST_OVERHEAD		4</div><div class='ctx'> #define EC_MAX_RESPONSE_OVERHEAD	32</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * ACPI notify value for MKBP host event.</div><div class='add'>+ */</div><div class='add'>+#define ACPI_NOTIFY_CROS_EC_MKBP 0x80</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * EC panic is not covered by the standard (0-F) ACPI notify values.</div><div class='ctx'>  * Arbitrarily choosing B0 to notify ec panic, which is in the 84-BF</div><div class='ctx'>  * device specific ACPI notify range.</div><div class='hunk'>@@ -117,6 +128,7 @@ struct cros_ec_command {</div><div class='ctx'>  * @dout_size: Size of dout buffer to allocate (zero to use static dout).</div><div class='ctx'>  * @wake_enabled: True if this device can wake the system from sleep.</div><div class='ctx'>  * @suspended: True if this device had been suspended.</div><div class='add'>+ * @registered: True if this device had been registered.</div><div class='ctx'>  * @cmd_xfer: Send command to EC and get response.</div><div class='ctx'>  *            Returns the number of bytes received if the communication</div><div class='ctx'>  *            succeeded, but that doesn't mean the EC was happy with the</div><div class='hunk'>@@ -175,6 +187,7 @@ struct cros_ec_device {</div><div class='ctx'> 	int dout_size;</div><div class='ctx'> 	bool wake_enabled;</div><div class='ctx'> 	bool suspended;</div><div class='add'>+	bool registered;</div><div class='ctx'> 	int (*cmd_xfer)(struct cros_ec_device *ec,</div><div class='ctx'> 			struct cros_ec_command *msg);</div><div class='ctx'> 	int (*pkt_xfer)(struct cros_ec_device *ec,</div><div class='hunk'>@@ -185,7 +198,7 @@ struct cros_ec_device {</div><div class='ctx'> 	bool host_sleep_v1;</div><div class='ctx'> 	struct blocking_notifier_head event_notifier;</div><div class='ctx'> </div><div class='del'>-	struct ec_response_get_next_event_v1 event_data;</div><div class='add'>+	struct ec_response_get_next_event_v3 event_data;</div><div class='ctx'> 	int event_size;</div><div class='ctx'> 	u32 host_event_wake_mask;</div><div class='ctx'> 	u32 last_resume_result;</div><div class='hunk'>@@ -246,6 +259,8 @@ int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev,</div><div class='ctx'> int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev,</div><div class='ctx'> 			    struct cros_ec_command *msg);</div><div class='ctx'> </div><div class='add'>+int cros_ec_rwsig_continue(struct cros_ec_device *ec_dev);</div><div class='add'>+</div><div class='ctx'> int cros_ec_query_all(struct cros_ec_device *ec_dev);</div><div class='ctx'> </div><div class='ctx'> int cros_ec_get_next_event(struct cros_ec_device *ec_dev,</div><div class='hunk'>@@ -261,6 +276,12 @@ int cros_ec_get_sensor_count(struct cros_ec_dev *ec);</div><div class='ctx'> int cros_ec_cmd(struct cros_ec_device *ec_dev, unsigned int version, int command, const void *outdata,</div><div class='ctx'> 		    size_t outsize, void *indata, size_t insize);</div><div class='ctx'> </div><div class='add'>+int cros_ec_cmd_readmem(struct cros_ec_device *ec_dev, u8 offset, u8 size, void *dest);</div><div class='add'>+</div><div class='add'>+int cros_ec_get_cmd_versions(struct cros_ec_device *ec_dev, u16 cmd);</div><div class='add'>+</div><div class='add'>+bool cros_ec_device_registered(struct cros_ec_device *ec_dev);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * cros_ec_get_time_ns() - Return time in ns.</div><div class='ctx'>  *</div><div class='head'>diff --git a/include/linux/platform_data/cyttsp4.h b/include/linux/platform_data/cyttsp4.h<br/>deleted file mode 100644<br/>index 5dc9d2be384b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/cyttsp4.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/cyttsp4.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Header file for:</div><div class='del'>- * Cypress TrueTouch(TM) Standard Product (TTSP) touchscreen drivers.</div><div class='del'>- * For use with Cypress Txx3xx parts.</div><div class='del'>- * Supported parts include:</div><div class='del'>- * CY8CTST341</div><div class='del'>- * CY8CTMA340</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009, 2010, 2011 Cypress Semiconductor, Inc.</div><div class='del'>- * Copyright (C) 2012 Javier Martinez Canillas &lt;javier@dowhile0.org&gt;</div><div class='del'>- *</div><div class='del'>- * Contact Cypress Semiconductor at www.cypress.com (kev@cypress.com)</div><div class='del'>- */</div><div class='del'>-#ifndef _CYTTSP4_H_</div><div class='del'>-#define _CYTTSP4_H_</div><div class='del'>-</div><div class='del'>-#define CYTTSP4_MT_NAME "cyttsp4_mt"</div><div class='del'>-#define CYTTSP4_I2C_NAME "cyttsp4_i2c_adapter"</div><div class='del'>-#define CYTTSP4_SPI_NAME "cyttsp4_spi_adapter"</div><div class='del'>-</div><div class='del'>-#define CY_TOUCH_SETTINGS_MAX 32</div><div class='del'>-</div><div class='del'>-struct touch_framework {</div><div class='del'>-	const uint16_t  *abs;</div><div class='del'>-	uint8_t         size;</div><div class='del'>-	uint8_t         enable_vkeys;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct cyttsp4_mt_platform_data {</div><div class='del'>-	struct touch_framework *frmwrk;</div><div class='del'>-	unsigned short flags;</div><div class='del'>-	char const *inp_dev_name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct touch_settings {</div><div class='del'>-	const uint8_t *data;</div><div class='del'>-	uint32_t size;</div><div class='del'>-	uint8_t tag;</div><div class='del'>-} __packed;</div><div class='del'>-</div><div class='del'>-struct cyttsp4_core_platform_data {</div><div class='del'>-	int irq_gpio;</div><div class='del'>-	int rst_gpio;</div><div class='del'>-	int level_irq_udelay;</div><div class='del'>-	int (*xres)(struct cyttsp4_core_platform_data *pdata,</div><div class='del'>-		struct device *dev);</div><div class='del'>-	int (*init)(struct cyttsp4_core_platform_data *pdata,</div><div class='del'>-		int on, struct device *dev);</div><div class='del'>-	int (*power)(struct cyttsp4_core_platform_data *pdata,</div><div class='del'>-		int on, struct device *dev, atomic_t *ignore_irq);</div><div class='del'>-	int (*irq_stat)(struct cyttsp4_core_platform_data *pdata,</div><div class='del'>-		struct device *dev);</div><div class='del'>-	struct touch_settings *sett[CY_TOUCH_SETTINGS_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cyttsp4_platform_data {</div><div class='del'>-	struct cyttsp4_core_platform_data *core_pdata;</div><div class='del'>-	struct cyttsp4_mt_platform_data *mt_pdata;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _CYTTSP4_H_ */</div><div class='head'>diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h<br/>index c8645b2ed3c0..b9c8520b4bd3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/davinci_asp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/davinci_asp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/davinci_asp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/davinci_asp.h</a></div><div class='hunk'>@@ -26,16 +26,6 @@ struct davinci_mcasp_pdata {</div><div class='ctx'> 	struct gen_pool *sram_pool;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If McBSP peripheral gets the clock from an external pin,</div><div class='del'>-	 * there are three chooses, that are MCBSP_CLKX, MCBSP_CLKR</div><div class='del'>-	 * and MCBSP_CLKS.</div><div class='del'>-	 * Depending on different hardware connections it is possible</div><div class='del'>-	 * to use this setting to change the behaviour of McBSP</div><div class='del'>-	 * driver.</div><div class='del'>-	 */</div><div class='del'>-	int clk_input_pin;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * This flag works when both clock and FS are outputs for the cpu</div><div class='ctx'> 	 * and makes clock more accurate (FS is not symmetrical and the</div><div class='ctx'> 	 * clock is very fast.</div><div class='hunk'>@@ -91,11 +81,6 @@ enum {</div><div class='ctx'> 	MCASP_VERSION_OMAP,	/* OMAP4/5 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum mcbsp_clk_input_pin {</div><div class='del'>-	MCBSP_CLKR = 0,		/* as in DM365 */</div><div class='del'>-	MCBSP_CLKS,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define INACTIVE_MODE	0</div><div class='ctx'> #define TX_MODE		1</div><div class='ctx'> #define RX_MODE		2</div><div class='head'>diff --git a/include/linux/platform_data/dma-ep93xx.h b/include/linux/platform_data/dma-ep93xx.h<br/>deleted file mode 100644<br/>index eb9805bb3fe8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/dma-ep93xx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/dma-ep93xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __ASM_ARCH_DMA_H</div><div class='del'>-#define __ASM_ARCH_DMA_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/dmaengine.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * M2P channels.</div><div class='del'>- *</div><div class='del'>- * Note that these values are also directly used for setting the PPALLOC</div><div class='del'>- * register.</div><div class='del'>- */</div><div class='del'>-#define EP93XX_DMA_I2S1		0</div><div class='del'>-#define EP93XX_DMA_I2S2		1</div><div class='del'>-#define EP93XX_DMA_AAC1		2</div><div class='del'>-#define EP93XX_DMA_AAC2		3</div><div class='del'>-#define EP93XX_DMA_AAC3		4</div><div class='del'>-#define EP93XX_DMA_I2S3		5</div><div class='del'>-#define EP93XX_DMA_UART1	6</div><div class='del'>-#define EP93XX_DMA_UART2	7</div><div class='del'>-#define EP93XX_DMA_UART3	8</div><div class='del'>-#define EP93XX_DMA_IRDA		9</div><div class='del'>-/* M2M channels */</div><div class='del'>-#define EP93XX_DMA_SSP		10</div><div class='del'>-#define EP93XX_DMA_IDE		11</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ep93xx_dma_data - configuration data for the EP93xx dmaengine</div><div class='del'>- * @port: peripheral which is requesting the channel</div><div class='del'>- * @direction: TX/RX channel</div><div class='del'>- * @name: optional name for the channel, this is displayed in /proc/interrupts</div><div class='del'>- *</div><div class='del'>- * This information is passed as private channel parameter in a filter</div><div class='del'>- * function. Note that this is only needed for slave/cyclic channels.  For</div><div class='del'>- * memcpy channels %NULL data should be passed.</div><div class='del'>- */</div><div class='del'>-struct ep93xx_dma_data {</div><div class='del'>-	int				port;</div><div class='del'>-	enum dma_transfer_direction	direction;</div><div class='del'>-	const char			*name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ep93xx_dma_chan_data - platform specific data for a DMA channel</div><div class='del'>- * @name: name of the channel, used for getting the right clock for the channel</div><div class='del'>- * @base: mapped registers</div><div class='del'>- * @irq: interrupt number used by this channel</div><div class='del'>- */</div><div class='del'>-struct ep93xx_dma_chan_data {</div><div class='del'>-	const char			*name;</div><div class='del'>-	void __iomem			*base;</div><div class='del'>-	int				irq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ep93xx_dma_platform_data - platform data for the dmaengine driver</div><div class='del'>- * @channels: array of channels which are passed to the driver</div><div class='del'>- * @num_channels: number of channels in the array</div><div class='del'>- *</div><div class='del'>- * This structure is passed to the DMA engine driver via platform data. For</div><div class='del'>- * M2P channels, contract is that even channels are for TX and odd for RX.</div><div class='del'>- * There is no requirement for the M2M channels.</div><div class='del'>- */</div><div class='del'>-struct ep93xx_dma_platform_data {</div><div class='del'>-	struct ep93xx_dma_chan_data	*channels;</div><div class='del'>-	size_t				num_channels;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan)</div><div class='del'>-{</div><div class='del'>-	return !strcmp(dev_name(chan-&gt;device-&gt;dev), "ep93xx-dma-m2p");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ep93xx_dma_chan_direction - returns direction the channel can be used</div><div class='del'>- * @chan: channel</div><div class='del'>- *</div><div class='del'>- * This function can be used in filter functions to find out whether the</div><div class='del'>- * channel supports given DMA direction. Only M2P channels have such</div><div class='del'>- * limitation, for M2M channels the direction is configurable.</div><div class='del'>- */</div><div class='del'>-static inline enum dma_transfer_direction</div><div class='del'>-ep93xx_dma_chan_direction(struct dma_chan *chan)</div><div class='del'>-{</div><div class='del'>-	if (!ep93xx_dma_chan_is_m2p(chan))</div><div class='del'>-		return DMA_TRANS_NONE;</div><div class='del'>-</div><div class='del'>-	/* even channels are for TX, odd for RX */</div><div class='del'>-	return (chan-&gt;chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_DMA_H */</div><div class='head'>diff --git a/include/linux/platform_data/dmtimer-omap.h b/include/linux/platform_data/dmtimer-omap.h<br/>index 95d852aef130..726d89143842 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/dmtimer-omap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/dmtimer-omap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/dmtimer-omap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/dmtimer-omap.h</a></div><div class='hunk'>@@ -36,9 +36,13 @@ struct omap_dm_timer_ops {</div><div class='ctx'> 	int	(*set_pwm)(struct omap_dm_timer *timer, int def_on,</div><div class='ctx'> 			   int toggle, int trigger, int autoreload);</div><div class='ctx'> 	int	(*get_pwm_status)(struct omap_dm_timer *timer);</div><div class='add'>+	int	(*set_cap)(struct omap_dm_timer *timer,</div><div class='add'>+			   int autoreload, bool config_period);</div><div class='add'>+	int	(*get_cap_status)(struct omap_dm_timer *timer);</div><div class='ctx'> 	int	(*set_prescaler)(struct omap_dm_timer *timer, int prescaler);</div><div class='ctx'> </div><div class='ctx'> 	unsigned int (*read_counter)(struct omap_dm_timer *timer);</div><div class='add'>+	unsigned int (*read_cap)(struct omap_dm_timer *timer, bool is_period);</div><div class='ctx'> 	int	(*write_counter)(struct omap_dm_timer *timer,</div><div class='ctx'> 				 unsigned int value);</div><div class='ctx'> 	unsigned int (*read_status)(struct omap_dm_timer *timer);</div><div class='head'>diff --git a/include/linux/platform_data/emc2305.h b/include/linux/platform_data/emc2305.h<br/>index 54d672dd6f7d..76043a97f975 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/emc2305.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/emc2305.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/emc2305.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/emc2305.h</a></div><div class='hunk'>@@ -9,14 +9,20 @@</div><div class='ctx'>  * struct emc2305_platform_data - EMC2305 driver platform data</div><div class='ctx'>  * @max_state: maximum cooling state of the cooling device;</div><div class='ctx'>  * @pwm_num: number of active channels;</div><div class='add'>+ * @pwm_output_mask: PWM output mask</div><div class='add'>+ * @pwm_polarity_mask: PWM polarity mask</div><div class='ctx'>  * @pwm_separate: separate PWM settings for every channel;</div><div class='ctx'>  * @pwm_min: array of minimum PWM per channel;</div><div class='add'>+ * @pwm_freq: array of PWM frequency per channel</div><div class='ctx'>  */</div><div class='ctx'> struct emc2305_platform_data {</div><div class='ctx'> 	u8 max_state;</div><div class='ctx'> 	u8 pwm_num;</div><div class='add'>+	u8 pwm_output_mask;</div><div class='add'>+	u8 pwm_polarity_mask;</div><div class='ctx'> 	bool pwm_separate;</div><div class='ctx'> 	u8 pwm_min[EMC2305_PWM_MAX];</div><div class='add'>+	u16 pwm_freq[EMC2305_PWM_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/platform_data/eth-ep93xx.h b/include/linux/platform_data/eth-ep93xx.h<br/>deleted file mode 100644<br/>index 8eef637a804d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/eth-ep93xx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/eth-ep93xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_PLATFORM_DATA_ETH_EP93XX</div><div class='del'>-#define _LINUX_PLATFORM_DATA_ETH_EP93XX</div><div class='del'>-</div><div class='del'>-struct ep93xx_eth_data {</div><div class='del'>-	unsigned char	dev_addr[6];</div><div class='del'>-	unsigned char	phy_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/platform_data/gpio-ath79.h b/include/linux/platform_data/gpio-ath79.h<br/>deleted file mode 100644<br/>index 3ea6dd942c27..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/gpio-ath79.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/gpio-ath79.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- *  Atheros AR7XXX/AR9XXX GPIO controller platform data</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2015 Alban Bedel &lt;albeu@free.fr&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_PLATFORM_DATA_GPIO_ATH79_H</div><div class='del'>-#define __LINUX_PLATFORM_DATA_GPIO_ATH79_H</div><div class='del'>-</div><div class='del'>-struct ath79_gpio_platform_data {</div><div class='del'>-	unsigned ngpios;</div><div class='del'>-	bool oe_inverted;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/platform_data/gpio-davinci.h b/include/linux/platform_data/gpio-davinci.h<br/>deleted file mode 100644<br/>index b82e44662efe..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/gpio-davinci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/gpio-davinci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * DaVinci GPIO Platform Related Defines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2013 Texas Instruments Incorporated - https://www.ti.com/</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DAVINCI_GPIO_PLATFORM_H</div><div class='del'>-#define __DAVINCI_GPIO_PLATFORM_H</div><div class='del'>-</div><div class='del'>-struct davinci_gpio_platform_data {</div><div class='del'>-	bool	no_auto_base;</div><div class='del'>-	u32	base;</div><div class='del'>-	u32	ngpio;</div><div class='del'>-	u32	gpio_unbanked;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Convert GPIO signal to GPIO pin number */</div><div class='del'>-#define GPIO_TO_PIN(bank, gpio)	(16 * (bank) + (gpio))</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/platform_data/huawei-gaokun-ec.h b/include/linux/platform_data/huawei-gaokun-ec.h<br/>new file mode 100644<br/>index 000000000000..faa15d315128<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/huawei-gaokun-ec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/huawei-gaokun-ec.h</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Huawei Matebook E Go Embedded Controller</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024-2025 Pengyu Luo &lt;mitltlatltl@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __HUAWEI_GAOKUN_EC_H__</div><div class='add'>+#define __HUAWEI_GAOKUN_EC_H__</div><div class='add'>+</div><div class='add'>+#define GAOKUN_UCSI_CCI_SIZE	4</div><div class='add'>+#define GAOKUN_UCSI_MSGI_SIZE	16</div><div class='add'>+#define GAOKUN_UCSI_READ_SIZE	(GAOKUN_UCSI_CCI_SIZE + GAOKUN_UCSI_MSGI_SIZE)</div><div class='add'>+#define GAOKUN_UCSI_WRITE_SIZE	24 /* 8B CTRL, 16B MSGO */</div><div class='add'>+</div><div class='add'>+#define GAOKUN_UCSI_NO_PORT_UPDATE	(-1)</div><div class='add'>+</div><div class='add'>+#define GAOKUN_SMART_CHARGE_DATA_SIZE	4 /* mode, delay, start, end */</div><div class='add'>+</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+struct gaokun_ec;</div><div class='add'>+struct gaokun_ucsi_reg;</div><div class='add'>+struct notifier_block;</div><div class='add'>+</div><div class='add'>+#define GAOKUN_MOD_NAME			"huawei_gaokun_ec"</div><div class='add'>+#define GAOKUN_DEV_PSY			"psy"</div><div class='add'>+#define GAOKUN_DEV_UCSI			"ucsi"</div><div class='add'>+</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+/* Common API */</div><div class='add'>+</div><div class='add'>+int gaokun_ec_register_notify(struct gaokun_ec *ec,</div><div class='add'>+			      struct notifier_block *nb);</div><div class='add'>+void gaokun_ec_unregister_notify(struct gaokun_ec *ec,</div><div class='add'>+				 struct notifier_block *nb);</div><div class='add'>+</div><div class='add'>+int gaokun_ec_read(struct gaokun_ec *ec, const u8 *req,</div><div class='add'>+		   size_t resp_len, u8 *resp);</div><div class='add'>+int gaokun_ec_write(struct gaokun_ec *ec, const u8 *req);</div><div class='add'>+int gaokun_ec_read_byte(struct gaokun_ec *ec, const u8 *req, u8 *byte);</div><div class='add'>+</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+/* API for PSY */</div><div class='add'>+</div><div class='add'>+int gaokun_ec_psy_multi_read(struct gaokun_ec *ec, u8 reg,</div><div class='add'>+			     size_t resp_len, u8 *resp);</div><div class='add'>+</div><div class='add'>+static inline int gaokun_ec_psy_read_byte(struct gaokun_ec *ec,</div><div class='add'>+					  u8 reg, u8 *byte)</div><div class='add'>+{</div><div class='add'>+	return gaokun_ec_psy_multi_read(ec, reg, sizeof(*byte), byte);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gaokun_ec_psy_read_word(struct gaokun_ec *ec,</div><div class='add'>+					  u8 reg, u16 *word)</div><div class='add'>+{</div><div class='add'>+	return gaokun_ec_psy_multi_read(ec, reg, sizeof(*word), (u8 *)word);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gaokun_ec_psy_get_smart_charge(struct gaokun_ec *ec,</div><div class='add'>+				   u8 resp[GAOKUN_SMART_CHARGE_DATA_SIZE]);</div><div class='add'>+int gaokun_ec_psy_set_smart_charge(struct gaokun_ec *ec,</div><div class='add'>+				   const u8 req[GAOKUN_SMART_CHARGE_DATA_SIZE]);</div><div class='add'>+</div><div class='add'>+int gaokun_ec_psy_get_smart_charge_enable(struct gaokun_ec *ec, bool *on);</div><div class='add'>+int gaokun_ec_psy_set_smart_charge_enable(struct gaokun_ec *ec, bool on);</div><div class='add'>+</div><div class='add'>+/* -------------------------------------------------------------------------- */</div><div class='add'>+/* API for UCSI */</div><div class='add'>+</div><div class='add'>+int gaokun_ec_ucsi_read(struct gaokun_ec *ec, u8 resp[GAOKUN_UCSI_READ_SIZE]);</div><div class='add'>+int gaokun_ec_ucsi_write(struct gaokun_ec *ec,</div><div class='add'>+			 const u8 req[GAOKUN_UCSI_WRITE_SIZE]);</div><div class='add'>+</div><div class='add'>+int gaokun_ec_ucsi_get_reg(struct gaokun_ec *ec, struct gaokun_ucsi_reg *ureg);</div><div class='add'>+int gaokun_ec_ucsi_pan_ack(struct gaokun_ec *ec, int port_id);</div><div class='add'>+</div><div class='add'>+#endif /* __HUAWEI_GAOKUN_EC_H__ */</div><div class='head'>diff --git a/include/linux/platform_data/hwmon-s3c.h b/include/linux/platform_data/hwmon-s3c.h<br/>index 1707ad4147df..7d21e0c41037 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/hwmon-s3c.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/hwmon-s3c.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/hwmon-s3c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/hwmon-s3c.h</a></div><div class='hunk'>@@ -33,14 +33,4 @@ struct s3c_hwmon_pdata {</div><div class='ctx'> 	struct s3c_hwmon_chcfg	*in[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * s3c_hwmon_set_platdata - Set platform data for S3C HWMON device</div><div class='del'>- * @pd: Platform data to register to device.</div><div class='del'>- *</div><div class='del'>- * Register the given platform data for use with the S3C HWMON device.</div><div class='del'>- * The call will copy the platform data, so the board definitions can</div><div class='del'>- * make the structure itself __initdata.</div><div class='del'>- */</div><div class='del'>-extern void __init s3c_hwmon_set_platdata(struct s3c_hwmon_pdata *pd);</div><div class='del'>-</div><div class='ctx'> #endif /* __HWMON_S3C_H__ */</div><div class='head'>diff --git a/include/linux/platform_data/i2c-davinci.h b/include/linux/platform_data/i2c-davinci.h<br/>deleted file mode 100644<br/>index 98967df07468..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/i2c-davinci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/i2c-davinci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * DaVinci I2C controller platform_device info</div><div class='del'>- *</div><div class='del'>- * Author: Vladimir Barinov, MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>- *</div><div class='del'>- * 2007 (c) MontaVista Software, Inc. This file is licensed under</div><div class='del'>- * the terms of the GNU General Public License version 2. This program</div><div class='del'>- * is licensed "as is" without any warranty of any kind, whether express</div><div class='del'>- * or implied.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_I2C_H</div><div class='del'>-#define __ASM_ARCH_I2C_H</div><div class='del'>-</div><div class='del'>-/* All frequencies are expressed in kHz */</div><div class='del'>-struct davinci_i2c_platform_data {</div><div class='del'>-	unsigned int	bus_freq;	/* standard bus frequency (kHz) */</div><div class='del'>-	unsigned int	bus_delay;	/* post-transaction delay (usec) */</div><div class='del'>-	bool		gpio_recovery;	/* Use GPIO recovery method */</div><div class='del'>-	bool		has_pfunc;	/* Chip has a ICPFUNC register */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* for board setup code */</div><div class='del'>-void davinci_init_i2c(struct davinci_i2c_platform_data *);</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_I2C_H */</div><div class='head'>diff --git a/include/linux/platform_data/i2c-mux-gpio.h b/include/linux/platform_data/i2c-mux-gpio.h<br/>index 5e4c2c272a73..96843aab4d1e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/i2c-mux-gpio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/i2c-mux-gpio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/i2c-mux-gpio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/i2c-mux-gpio.h</a></div><div class='hunk'>@@ -18,16 +18,16 @@</div><div class='ctx'>  * @values: Array of bitmasks of GPIO settings (low/high) for each</div><div class='ctx'>  *	position</div><div class='ctx'>  * @n_values: Number of multiplexer positions (busses to instantiate)</div><div class='del'>- * @classes: Optional I2C auto-detection classes</div><div class='ctx'>  * @idle: Bitmask to write to MUX when idle or GPIO_I2CMUX_NO_IDLE if not used</div><div class='add'>+ * @settle_time: Delay to wait when a new bus is selected</div><div class='ctx'>  */</div><div class='ctx'> struct i2c_mux_gpio_platform_data {</div><div class='ctx'> 	int parent;</div><div class='ctx'> 	int base_nr;</div><div class='ctx'> 	const unsigned *values;</div><div class='ctx'> 	int n_values;</div><div class='del'>-	const unsigned *classes;</div><div class='ctx'> 	unsigned idle;</div><div class='add'>+	u32 settle_time;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_I2C_MUX_GPIO_H */</div><div class='head'>diff --git a/include/linux/platform_data/keyboard-spear.h b/include/linux/platform_data/keyboard-spear.h<br/>deleted file mode 100644<br/>index 5e3ff653900c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/keyboard-spear.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keyboard-spear.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,164 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2010 ST Microelectronics</div><div class='del'>- * Rajeev Kumar &lt;rajeevkumar.linux@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PLAT_KEYBOARD_H</div><div class='del'>-#define __PLAT_KEYBOARD_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/input/matrix_keypad.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define DECLARE_9x9_KEYMAP(_name) \</div><div class='del'>-int _name[] = { \</div><div class='del'>-	KEY(0, 0, KEY_ESC), \</div><div class='del'>-	KEY(0, 1, KEY_1), \</div><div class='del'>-	KEY(0, 2, KEY_2), \</div><div class='del'>-	KEY(0, 3, KEY_3), \</div><div class='del'>-	KEY(0, 4, KEY_4), \</div><div class='del'>-	KEY(0, 5, KEY_5), \</div><div class='del'>-	KEY(0, 6, KEY_6), \</div><div class='del'>-	KEY(0, 7, KEY_7), \</div><div class='del'>-	KEY(0, 8, KEY_8), \</div><div class='del'>-	KEY(1, 0, KEY_9), \</div><div class='del'>-	KEY(1, 1, KEY_MINUS), \</div><div class='del'>-	KEY(1, 2, KEY_EQUAL), \</div><div class='del'>-	KEY(1, 3, KEY_BACKSPACE), \</div><div class='del'>-	KEY(1, 4, KEY_TAB), \</div><div class='del'>-	KEY(1, 5, KEY_Q), \</div><div class='del'>-	KEY(1, 6, KEY_W), \</div><div class='del'>-	KEY(1, 7, KEY_E), \</div><div class='del'>-	KEY(1, 8, KEY_R), \</div><div class='del'>-	KEY(2, 0, KEY_T), \</div><div class='del'>-	KEY(2, 1, KEY_Y), \</div><div class='del'>-	KEY(2, 2, KEY_U), \</div><div class='del'>-	KEY(2, 3, KEY_I), \</div><div class='del'>-	KEY(2, 4, KEY_O), \</div><div class='del'>-	KEY(2, 5, KEY_P), \</div><div class='del'>-	KEY(2, 6, KEY_LEFTBRACE), \</div><div class='del'>-	KEY(2, 7, KEY_RIGHTBRACE), \</div><div class='del'>-	KEY(2, 8, KEY_ENTER), \</div><div class='del'>-	KEY(3, 0, KEY_LEFTCTRL), \</div><div class='del'>-	KEY(3, 1, KEY_A), \</div><div class='del'>-	KEY(3, 2, KEY_S), \</div><div class='del'>-	KEY(3, 3, KEY_D), \</div><div class='del'>-	KEY(3, 4, KEY_F), \</div><div class='del'>-	KEY(3, 5, KEY_G), \</div><div class='del'>-	KEY(3, 6, KEY_H), \</div><div class='del'>-	KEY(3, 7, KEY_J), \</div><div class='del'>-	KEY(3, 8, KEY_K), \</div><div class='del'>-	KEY(4, 0, KEY_L), \</div><div class='del'>-	KEY(4, 1, KEY_SEMICOLON), \</div><div class='del'>-	KEY(4, 2, KEY_APOSTROPHE), \</div><div class='del'>-	KEY(4, 3, KEY_GRAVE), \</div><div class='del'>-	KEY(4, 4, KEY_LEFTSHIFT), \</div><div class='del'>-	KEY(4, 5, KEY_BACKSLASH), \</div><div class='del'>-	KEY(4, 6, KEY_Z), \</div><div class='del'>-	KEY(4, 7, KEY_X), \</div><div class='del'>-	KEY(4, 8, KEY_C), \</div><div class='del'>-	KEY(5, 0, KEY_V), \</div><div class='del'>-	KEY(5, 1, KEY_B), \</div><div class='del'>-	KEY(5, 2, KEY_N), \</div><div class='del'>-	KEY(5, 3, KEY_M), \</div><div class='del'>-	KEY(5, 4, KEY_COMMA), \</div><div class='del'>-	KEY(5, 5, KEY_DOT), \</div><div class='del'>-	KEY(5, 6, KEY_SLASH), \</div><div class='del'>-	KEY(5, 7, KEY_RIGHTSHIFT), \</div><div class='del'>-	KEY(5, 8, KEY_KPASTERISK), \</div><div class='del'>-	KEY(6, 0, KEY_LEFTALT), \</div><div class='del'>-	KEY(6, 1, KEY_SPACE), \</div><div class='del'>-	KEY(6, 2, KEY_CAPSLOCK), \</div><div class='del'>-	KEY(6, 3, KEY_F1), \</div><div class='del'>-	KEY(6, 4, KEY_F2), \</div><div class='del'>-	KEY(6, 5, KEY_F3), \</div><div class='del'>-	KEY(6, 6, KEY_F4), \</div><div class='del'>-	KEY(6, 7, KEY_F5), \</div><div class='del'>-	KEY(6, 8, KEY_F6), \</div><div class='del'>-	KEY(7, 0, KEY_F7), \</div><div class='del'>-	KEY(7, 1, KEY_F8), \</div><div class='del'>-	KEY(7, 2, KEY_F9), \</div><div class='del'>-	KEY(7, 3, KEY_F10), \</div><div class='del'>-	KEY(7, 4, KEY_NUMLOCK), \</div><div class='del'>-	KEY(7, 5, KEY_SCROLLLOCK), \</div><div class='del'>-	KEY(7, 6, KEY_KP7), \</div><div class='del'>-	KEY(7, 7, KEY_KP8), \</div><div class='del'>-	KEY(7, 8, KEY_KP9), \</div><div class='del'>-	KEY(8, 0, KEY_KPMINUS), \</div><div class='del'>-	KEY(8, 1, KEY_KP4), \</div><div class='del'>-	KEY(8, 2, KEY_KP5), \</div><div class='del'>-	KEY(8, 3, KEY_KP6), \</div><div class='del'>-	KEY(8, 4, KEY_KPPLUS), \</div><div class='del'>-	KEY(8, 5, KEY_KP1), \</div><div class='del'>-	KEY(8, 6, KEY_KP2), \</div><div class='del'>-	KEY(8, 7, KEY_KP3), \</div><div class='del'>-	KEY(8, 8, KEY_KP0), \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DECLARE_6x6_KEYMAP(_name) \</div><div class='del'>-int _name[] = { \</div><div class='del'>-	KEY(0, 0, KEY_RESERVED), \</div><div class='del'>-	KEY(0, 1, KEY_1), \</div><div class='del'>-	KEY(0, 2, KEY_2), \</div><div class='del'>-	KEY(0, 3, KEY_3), \</div><div class='del'>-	KEY(0, 4, KEY_4), \</div><div class='del'>-	KEY(0, 5, KEY_5), \</div><div class='del'>-	KEY(1, 0, KEY_Q), \</div><div class='del'>-	KEY(1, 1, KEY_W), \</div><div class='del'>-	KEY(1, 2, KEY_E), \</div><div class='del'>-	KEY(1, 3, KEY_R), \</div><div class='del'>-	KEY(1, 4, KEY_T), \</div><div class='del'>-	KEY(1, 5, KEY_Y), \</div><div class='del'>-	KEY(2, 0, KEY_D), \</div><div class='del'>-	KEY(2, 1, KEY_F), \</div><div class='del'>-	KEY(2, 2, KEY_G), \</div><div class='del'>-	KEY(2, 3, KEY_H), \</div><div class='del'>-	KEY(2, 4, KEY_J), \</div><div class='del'>-	KEY(2, 5, KEY_K), \</div><div class='del'>-	KEY(3, 0, KEY_B), \</div><div class='del'>-	KEY(3, 1, KEY_N), \</div><div class='del'>-	KEY(3, 2, KEY_M), \</div><div class='del'>-	KEY(3, 3, KEY_COMMA), \</div><div class='del'>-	KEY(3, 4, KEY_DOT), \</div><div class='del'>-	KEY(3, 5, KEY_SLASH), \</div><div class='del'>-	KEY(4, 0, KEY_F6), \</div><div class='del'>-	KEY(4, 1, KEY_F7), \</div><div class='del'>-	KEY(4, 2, KEY_F8), \</div><div class='del'>-	KEY(4, 3, KEY_F9), \</div><div class='del'>-	KEY(4, 4, KEY_F10), \</div><div class='del'>-	KEY(4, 5, KEY_NUMLOCK), \</div><div class='del'>-	KEY(5, 0, KEY_KP2), \</div><div class='del'>-	KEY(5, 1, KEY_KP3), \</div><div class='del'>-	KEY(5, 2, KEY_KP0), \</div><div class='del'>-	KEY(5, 3, KEY_KPDOT), \</div><div class='del'>-	KEY(5, 4, KEY_RO), \</div><div class='del'>-	KEY(5, 5, KEY_ZENKAKUHANKAKU), \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define KEYPAD_9x9     0</div><div class='del'>-#define KEYPAD_6x6     1</div><div class='del'>-#define KEYPAD_2x2     2</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct kbd_platform_data - spear keyboard platform data</div><div class='del'>- * keymap: pointer to keymap data (table and size)</div><div class='del'>- * rep: enables key autorepeat</div><div class='del'>- * mode: choose keyboard support(9x9, 6x6, 2x2)</div><div class='del'>- * suspended_rate: rate at which keyboard would operate in suspended mode</div><div class='del'>- *</div><div class='del'>- * This structure is supposed to be used by platform code to supply</div><div class='del'>- * keymaps to drivers that implement keyboards.</div><div class='del'>- */</div><div class='del'>-struct kbd_platform_data {</div><div class='del'>-	const struct matrix_keymap_data *keymap;</div><div class='del'>-	bool rep;</div><div class='del'>-	unsigned int mode;</div><div class='del'>-	unsigned int suspended_rate;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __PLAT_KEYBOARD_H */</div><div class='head'>diff --git a/include/linux/platform_data/keypad-ep93xx.h b/include/linux/platform_data/keypad-ep93xx.h<br/>deleted file mode 100644<br/>index 3054fced8509..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/keypad-ep93xx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keypad-ep93xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __KEYPAD_EP93XX_H</div><div class='del'>-#define __KEYPAD_EP93XX_H</div><div class='del'>-</div><div class='del'>-struct matrix_keymap_data;</div><div class='del'>-</div><div class='del'>-/* flags for the ep93xx_keypad driver */</div><div class='del'>-#define EP93XX_KEYPAD_DISABLE_3_KEY	(1&lt;&lt;0)	/* disable 3-key reset */</div><div class='del'>-#define EP93XX_KEYPAD_DIAG_MODE		(1&lt;&lt;1)	/* diagnostic mode */</div><div class='del'>-#define EP93XX_KEYPAD_BACK_DRIVE	(1&lt;&lt;2)	/* back driving mode */</div><div class='del'>-#define EP93XX_KEYPAD_TEST_MODE		(1&lt;&lt;3)	/* scan only column 0 */</div><div class='del'>-#define EP93XX_KEYPAD_AUTOREPEAT	(1&lt;&lt;4)	/* enable key autorepeat */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ep93xx_keypad_platform_data - platform specific device structure</div><div class='del'>- * @keymap_data:	pointer to &amp;matrix_keymap_data</div><div class='del'>- * @debounce:		debounce start count; terminal count is 0xff</div><div class='del'>- * @prescale:		row/column counter pre-scaler load value</div><div class='del'>- * @flags:		see above</div><div class='del'>- */</div><div class='del'>-struct ep93xx_keypad_platform_data {</div><div class='del'>-	struct matrix_keymap_data *keymap_data;</div><div class='del'>-	unsigned int	debounce;</div><div class='del'>-	unsigned int	prescale;</div><div class='del'>-	unsigned int	flags;</div><div class='del'>-	unsigned int	clk_rate;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define EP93XX_MATRIX_ROWS		(8)</div><div class='del'>-#define EP93XX_MATRIX_COLS		(8)</div><div class='del'>-</div><div class='del'>-#endif	/* __KEYPAD_EP93XX_H */</div><div class='head'>diff --git a/include/linux/platform_data/keypad-nomadik-ske.h b/include/linux/platform_data/keypad-nomadik-ske.h<br/>deleted file mode 100644<br/>index 7efabbca1dca..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/keypad-nomadik-ske.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keypad-nomadik-ske.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) ST-Ericsson SA 2010</div><div class='del'>- *</div><div class='del'>- * Author: Naveen Kumar Gaddipati &lt;naveen.gaddipati@stericsson.com&gt;</div><div class='del'>- *</div><div class='del'>- * ux500 Scroll key and Keypad Encoder (SKE) header</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __SKE_H</div><div class='del'>-#define __SKE_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/input/matrix_keypad.h&gt;</div><div class='del'>-</div><div class='del'>-/* register definitions for SKE peripheral */</div><div class='del'>-#define SKE_CR		0x00</div><div class='del'>-#define SKE_VAL0	0x04</div><div class='del'>-#define SKE_VAL1	0x08</div><div class='del'>-#define SKE_DBCR	0x0C</div><div class='del'>-#define SKE_IMSC	0x10</div><div class='del'>-#define SKE_RIS		0x14</div><div class='del'>-#define SKE_MIS		0x18</div><div class='del'>-#define SKE_ICR		0x1C</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Keypad module</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct keypad_platform_data - structure for platform specific data</div><div class='del'>- * @init:	pointer to keypad init function</div><div class='del'>- * @exit:	pointer to keypad deinitialisation function</div><div class='del'>- * @keymap_data: matrix scan code table for keycodes</div><div class='del'>- * @krow:	maximum number of rows</div><div class='del'>- * @kcol:	maximum number of columns</div><div class='del'>- * @debounce_ms: platform specific debounce time</div><div class='del'>- * @no_autorepeat: flag for auto repetition</div><div class='del'>- * @wakeup_enable: allow waking up the system</div><div class='del'>- */</div><div class='del'>-struct ske_keypad_platform_data {</div><div class='del'>-	int (*init)(void);</div><div class='del'>-	int (*exit)(void);</div><div class='del'>-	const struct matrix_keymap_data *keymap_data;</div><div class='del'>-	u8 krow;</div><div class='del'>-	u8 kcol;</div><div class='del'>-	u8 debounce_ms;</div><div class='del'>-	bool no_autorepeat;</div><div class='del'>-	bool wakeup_enable;</div><div class='del'>-};</div><div class='del'>-#endif	/*__SKE_KPD_H*/</div><div class='head'>diff --git a/include/linux/platform_data/keypad-pxa27x.h b/include/linux/platform_data/keypad-pxa27x.h<br/>deleted file mode 100644<br/>index a376442b9935..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/keypad-pxa27x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keypad-pxa27x.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __ASM_ARCH_PXA27x_KEYPAD_H</div><div class='del'>-#define __ASM_ARCH_PXA27x_KEYPAD_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/input/matrix_keypad.h&gt;</div><div class='del'>-</div><div class='del'>-#define MAX_MATRIX_KEY_ROWS	(8)</div><div class='del'>-#define MAX_MATRIX_KEY_COLS	(8)</div><div class='del'>-#define MATRIX_ROW_SHIFT	(3)</div><div class='del'>-#define MAX_DIRECT_KEY_NUM	(8)</div><div class='del'>-</div><div class='del'>-/* pxa3xx keypad platform specific parameters</div><div class='del'>- *</div><div class='del'>- * NOTE:</div><div class='del'>- * 1. direct_key_num indicates the number of keys in the direct keypad</div><div class='del'>- *    _plus_ the number of rotary-encoder sensor inputs,  this can be</div><div class='del'>- *    left as 0 if only rotary encoders are enabled,  the driver will</div><div class='del'>- *    automatically calculate this</div><div class='del'>- *</div><div class='del'>- * 2. direct_key_map is the key code map for the direct keys, if rotary</div><div class='del'>- *    encoder(s) are enabled, direct key 0/1(2/3) will be ignored</div><div class='del'>- *</div><div class='del'>- * 3. rotary can be either interpreted as a relative input event (e.g.</div><div class='del'>- *    REL_WHEEL/REL_HWHEEL) or specific keys (e.g. UP/DOWN/LEFT/RIGHT)</div><div class='del'>- *</div><div class='del'>- * 4. matrix key and direct key will use the same debounce_interval by</div><div class='del'>- *    default, which should be sufficient in most cases</div><div class='del'>- *</div><div class='del'>- * pxa168 keypad platform specific parameter</div><div class='del'>- *</div><div class='del'>- * NOTE:</div><div class='del'>- * clear_wakeup_event callback is a workaround required to clear the</div><div class='del'>- * keypad interrupt. The keypad wake must be cleared in addition to</div><div class='del'>- * reading the MI/DI bits in the KPC register.</div><div class='del'>- */</div><div class='del'>-struct pxa27x_keypad_platform_data {</div><div class='del'>-</div><div class='del'>-	/* code map for the matrix keys */</div><div class='del'>-	const struct matrix_keymap_data *matrix_keymap_data;</div><div class='del'>-	unsigned int	matrix_key_rows;</div><div class='del'>-	unsigned int	matrix_key_cols;</div><div class='del'>-</div><div class='del'>-	/* direct keys */</div><div class='del'>-	int		direct_key_num;</div><div class='del'>-	unsigned int	direct_key_map[MAX_DIRECT_KEY_NUM];</div><div class='del'>-	/* the key output may be low active */</div><div class='del'>-	int		direct_key_low_active;</div><div class='del'>-	/* give board a chance to choose the start direct key */</div><div class='del'>-	unsigned int	direct_key_mask;</div><div class='del'>-</div><div class='del'>-	/* rotary encoders 0 */</div><div class='del'>-	int		enable_rotary0;</div><div class='del'>-	int		rotary0_rel_code;</div><div class='del'>-	int		rotary0_up_key;</div><div class='del'>-	int		rotary0_down_key;</div><div class='del'>-</div><div class='del'>-	/* rotary encoders 1 */</div><div class='del'>-	int		enable_rotary1;</div><div class='del'>-	int		rotary1_rel_code;</div><div class='del'>-	int		rotary1_up_key;</div><div class='del'>-	int		rotary1_down_key;</div><div class='del'>-</div><div class='del'>-	/* key debounce interval */</div><div class='del'>-	unsigned int	debounce_interval;</div><div class='del'>-</div><div class='del'>-	/* clear wakeup event requirement for pxa168 */</div><div class='del'>-	void		(*clear_wakeup_event)(void);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern void pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_ARCH_PXA27x_KEYPAD_H */</div><div class='head'>diff --git a/include/linux/platform_data/keyscan-davinci.h b/include/linux/platform_data/keyscan-davinci.h<br/>deleted file mode 100644<br/>index 260d596ba0af..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/keyscan-davinci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/keyscan-davinci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Texas Instruments, Inc</div><div class='del'>- *</div><div class='del'>- * Author: Miguel Aguilar &lt;miguel.aguilar@ridgerun.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef DAVINCI_KEYSCAN_H</div><div class='del'>-#define DAVINCI_KEYSCAN_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-enum davinci_matrix_types {</div><div class='del'>-	DAVINCI_KEYSCAN_MATRIX_4X4,</div><div class='del'>-	DAVINCI_KEYSCAN_MATRIX_5X3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct davinci_ks_platform_data {</div><div class='del'>-	int		(*device_enable)(struct device *dev);</div><div class='del'>-	unsigned short	*keymap;</div><div class='del'>-	u32		keymapsize;</div><div class='del'>-	u8		rep:1;</div><div class='del'>-	u8		strobe;</div><div class='del'>-	u8		interval;</div><div class='del'>-	u8		matrix_type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/include/linux/platform_data/lenovo-yoga-c630.h b/include/linux/platform_data/lenovo-yoga-c630.h<br/>new file mode 100644<br/>index 000000000000..5d1f9fb33cfc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/lenovo-yoga-c630.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/lenovo-yoga-c630.h</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022-2024, Linaro Ltd</div><div class='add'>+ * Authors:</div><div class='add'>+ *    Bjorn Andersson</div><div class='add'>+ *    Dmitry Baryshkov</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LENOVO_YOGA_C630_DATA_H</div><div class='add'>+#define _LENOVO_YOGA_C630_DATA_H</div><div class='add'>+</div><div class='add'>+struct yoga_c630_ec;</div><div class='add'>+struct notifier_block;</div><div class='add'>+</div><div class='add'>+#define YOGA_C630_MOD_NAME	"lenovo_yoga_c630"</div><div class='add'>+</div><div class='add'>+#define YOGA_C630_DEV_UCSI	"ucsi"</div><div class='add'>+#define YOGA_C630_DEV_PSY	"psy"</div><div class='add'>+</div><div class='add'>+int yoga_c630_ec_read8(struct yoga_c630_ec *ec, u8 addr);</div><div class='add'>+int yoga_c630_ec_read16(struct yoga_c630_ec *ec, u8 addr);</div><div class='add'>+</div><div class='add'>+int yoga_c630_ec_register_notify(struct yoga_c630_ec *ec, struct notifier_block *nb);</div><div class='add'>+void yoga_c630_ec_unregister_notify(struct yoga_c630_ec *ec, struct notifier_block *nb);</div><div class='add'>+</div><div class='add'>+#define YOGA_C630_UCSI_WRITE_SIZE	8</div><div class='add'>+#define YOGA_C630_UCSI_CCI_SIZE		4</div><div class='add'>+#define YOGA_C630_UCSI_DATA_SIZE	16</div><div class='add'>+#define YOGA_C630_UCSI_READ_SIZE	(YOGA_C630_UCSI_CCI_SIZE + YOGA_C630_UCSI_DATA_SIZE)</div><div class='add'>+</div><div class='add'>+u16 yoga_c630_ec_ucsi_get_version(struct yoga_c630_ec *ec);</div><div class='add'>+int yoga_c630_ec_ucsi_write(struct yoga_c630_ec *ec,</div><div class='add'>+			    const u8 req[YOGA_C630_UCSI_WRITE_SIZE]);</div><div class='add'>+int yoga_c630_ec_ucsi_read(struct yoga_c630_ec *ec,</div><div class='add'>+			   u8 resp[YOGA_C630_UCSI_READ_SIZE]);</div><div class='add'>+</div><div class='add'>+#define LENOVO_EC_EVENT_USB		0x20</div><div class='add'>+#define LENOVO_EC_EVENT_UCSI		0x21</div><div class='add'>+#define LENOVO_EC_EVENT_HPD		0x22</div><div class='add'>+#define LENOVO_EC_EVENT_BAT_STATUS	0x24</div><div class='add'>+#define LENOVO_EC_EVENT_BAT_INFO	0x25</div><div class='add'>+#define LENOVO_EC_EVENT_BAT_ADPT_STATUS	0x37</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h<br/>index ab222dd05bbc..3b4a891acefe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/lp855x.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/lp855x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/lp855x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/lp855x.h</a></div><div class='hunk'>@@ -124,12 +124,12 @@ struct lp855x_rom_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct lp855x_platform_data</div><div class='add'>+ * struct lp855x_platform_data - lp855 platform-specific data</div><div class='ctx'>  * @name : Backlight driver name. If it is not defined, default name is set.</div><div class='ctx'>  * @device_control : value of DEVICE CONTROL register</div><div class='ctx'>  * @initial_brightness : initial value of backlight brightness</div><div class='ctx'>  * @period_ns : platform specific pwm period value. unit is nano.</div><div class='del'>-		Only valid when mode is PWM_BASED.</div><div class='add'>+ *		Only valid when mode is PWM_BASED.</div><div class='ctx'>  * @size_program : total size of lp855x_rom_data</div><div class='ctx'>  * @rom_data : list of new eeprom/eprom registers</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/platform_data/max6639.h b/include/linux/platform_data/max6639.h<br/>deleted file mode 100644<br/>index 65bfdb4fdc15..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/max6639.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/max6639.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_MAX6639_H</div><div class='del'>-#define _LINUX_MAX6639_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/* platform data for the MAX6639 temperature sensor and fan control */</div><div class='del'>-</div><div class='del'>-struct max6639_platform_data {</div><div class='del'>-	bool pwm_polarity;	/* Polarity low (0) or high (1, default) */</div><div class='del'>-	int ppr;		/* Pulses per rotation 1..4 (default == 2) */</div><div class='del'>-	int rpm_range;		/* 2000, 4000 (default), 8000 or 16000 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_MAX6639_H */</div><div class='head'>diff --git a/include/linux/platform_data/max6697.h b/include/linux/platform_data/max6697.h<br/>deleted file mode 100644<br/>index 6fbb70005541..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/max6697.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/max6697.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * max6697.h</div><div class='del'>- *     Copyright (c) 2012 Guenter Roeck &lt;linux@roeck-us.net&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef MAX6697_H</div><div class='del'>-#define MAX6697_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For all bit masks:</div><div class='del'>- * bit 0:    local temperature</div><div class='del'>- * bit 1..7: remote temperatures</div><div class='del'>- */</div><div class='del'>-struct max6697_platform_data {</div><div class='del'>-	bool smbus_timeout_disable;	/* set to disable SMBus timeouts */</div><div class='del'>-	bool extended_range_enable;	/* set to enable extended temp range */</div><div class='del'>-	bool beta_compensation;		/* set to enable beta compensation */</div><div class='del'>-	u8 alert_mask;			/* set bit to 1 to disable alert */</div><div class='del'>-	u8 over_temperature_mask;	/* set bit to 1 to disable */</div><div class='del'>-	u8 resistance_cancellation;	/* set bit to 0 to disable</div><div class='del'>-					 * bit mask for MAX6581,</div><div class='del'>-					 * boolean for other chips</div><div class='del'>-					 */</div><div class='del'>-	u8 ideality_mask;		/* set bit to 0 to disable */</div><div class='del'>-	u8 ideality_value;		/* transistor ideality as per</div><div class='del'>-					 * MAX6581 datasheet</div><div class='del'>-					 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* MAX6697_H */</div><div class='head'>diff --git a/include/linux/platform_data/mcs.h b/include/linux/platform_data/mcs.h<br/>deleted file mode 100644<br/>index fcc6f2a1f5c3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/mcs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mcs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 - 2010 Samsung Electronics Co.Ltd</div><div class='del'>- * Author: Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;</div><div class='del'>- * Author: HeungJun Kim &lt;riverful.kim@samsung.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_MCS_H</div><div class='del'>-#define __LINUX_MCS_H</div><div class='del'>-</div><div class='del'>-#define MCS_KEY_MAP(v, c)	((((v) &amp; 0xff) &lt;&lt; 16) | ((c) &amp; 0xffff))</div><div class='del'>-#define MCS_KEY_VAL(v)		(((v) &gt;&gt; 16) &amp; 0xff)</div><div class='del'>-#define MCS_KEY_CODE(v)		((v) &amp; 0xffff)</div><div class='del'>-</div><div class='del'>-struct mcs_platform_data {</div><div class='del'>-	void (*poweron)(bool);</div><div class='del'>-	void (*cfg_pin)(void);</div><div class='del'>-</div><div class='del'>-	/* touchscreen */</div><div class='del'>-	unsigned int x_size;</div><div class='del'>-	unsigned int y_size;</div><div class='del'>-</div><div class='del'>-	/* touchkey */</div><div class='del'>-	const u32 *keymap;</div><div class='del'>-	unsigned int keymap_size;</div><div class='del'>-	unsigned int key_maxval;</div><div class='del'>-	bool no_autorepeat;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif	/* __LINUX_MCS_H */</div><div class='head'>diff --git a/include/linux/platform_data/media/omap4iss.h b/include/linux/platform_data/media/omap4iss.h<br/>deleted file mode 100644<br/>index 2a511a8fcda7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/media/omap4iss.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/media/omap4iss.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef ARCH_ARM_PLAT_OMAP4_ISS_H</div><div class='del'>-#define ARCH_ARM_PLAT_OMAP4_ISS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/i2c.h&gt;</div><div class='del'>-</div><div class='del'>-struct iss_device;</div><div class='del'>-</div><div class='del'>-enum iss_interface_type {</div><div class='del'>-	ISS_INTERFACE_CSI2A_PHY1,</div><div class='del'>-	ISS_INTERFACE_CSI2B_PHY2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iss_csiphy_lane: CSI2 lane position and polarity</div><div class='del'>- * @pos: position of the lane</div><div class='del'>- * @pol: polarity of the lane</div><div class='del'>- */</div><div class='del'>-struct iss_csiphy_lane {</div><div class='del'>-	u8 pos;</div><div class='del'>-	u8 pol;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define ISS_CSIPHY1_NUM_DATA_LANES	4</div><div class='del'>-#define ISS_CSIPHY2_NUM_DATA_LANES	1</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iss_csiphy_lanes_cfg - CSI2 lane configuration</div><div class='del'>- * @data: Configuration of one or two data lanes</div><div class='del'>- * @clk: Clock lane configuration</div><div class='del'>- */</div><div class='del'>-struct iss_csiphy_lanes_cfg {</div><div class='del'>-	struct iss_csiphy_lane data[ISS_CSIPHY1_NUM_DATA_LANES];</div><div class='del'>-	struct iss_csiphy_lane clk;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct iss_csi2_platform_data - CSI2 interface platform data</div><div class='del'>- * @crc: Enable the cyclic redundancy check</div><div class='del'>- * @vpclk_div: Video port output clock control</div><div class='del'>- */</div><div class='del'>-struct iss_csi2_platform_data {</div><div class='del'>-	unsigned crc:1;</div><div class='del'>-	unsigned vpclk_div:2;</div><div class='del'>-	struct iss_csiphy_lanes_cfg lanecfg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iss_subdev_i2c_board_info {</div><div class='del'>-	struct i2c_board_info *board_info;</div><div class='del'>-	int i2c_adapter_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iss_v4l2_subdevs_group {</div><div class='del'>-	struct iss_subdev_i2c_board_info *subdevs;</div><div class='del'>-	enum iss_interface_type interface;</div><div class='del'>-	union {</div><div class='del'>-		struct iss_csi2_platform_data csi2;</div><div class='del'>-	} bus; /* gcc &lt; 4.6.0 chokes on anonymous union initializers */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iss_platform_data {</div><div class='del'>-	struct iss_v4l2_subdevs_group *subdevs;</div><div class='del'>-	void (*set_constraints)(struct iss_device *iss, bool enable);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/platform_data/microchip-ksz.h b/include/linux/platform_data/microchip-ksz.h<br/>index 8c659db4da6b..028781ad4059 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/microchip-ksz.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/microchip-ksz.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/microchip-ksz.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/microchip-ksz.h</a></div><div class='hunk'>@@ -23,11 +23,14 @@</div><div class='ctx'> #include &lt;linux/platform_data/dsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum ksz_chip_id {</div><div class='add'>+	KSZ8463_CHIP_ID = 0x8463,</div><div class='ctx'> 	KSZ8563_CHIP_ID = 0x8563,</div><div class='ctx'> 	KSZ8795_CHIP_ID = 0x8795,</div><div class='ctx'> 	KSZ8794_CHIP_ID = 0x8794,</div><div class='ctx'> 	KSZ8765_CHIP_ID = 0x8765,</div><div class='del'>-	KSZ8830_CHIP_ID = 0x8830,</div><div class='add'>+	KSZ88X3_CHIP_ID = 0x8830,</div><div class='add'>+	KSZ8864_CHIP_ID = 0x8864,</div><div class='add'>+	KSZ8895_CHIP_ID = 0x8895,</div><div class='ctx'> 	KSZ9477_CHIP_ID = 0x00947700,</div><div class='ctx'> 	KSZ9896_CHIP_ID = 0x00989600,</div><div class='ctx'> 	KSZ9897_CHIP_ID = 0x00989700,</div><div class='hunk'>@@ -40,6 +43,7 @@ enum ksz_chip_id {</div><div class='ctx'> 	LAN9372_CHIP_ID = 0x00937200,</div><div class='ctx'> 	LAN9373_CHIP_ID = 0x00937300,</div><div class='ctx'> 	LAN9374_CHIP_ID = 0x00937400,</div><div class='add'>+	LAN9646_CHIP_ID = 0x00964600,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ksz_platform_data {</div><div class='head'>diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h<br/>index 0b9f81a6f753..f6cca7a035c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/mlxreg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mlxreg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/mlxreg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/mlxreg.h</a></div><div class='hunk'>@@ -209,7 +209,7 @@ struct mlxreg_core_platform_data {</div><div class='ctx'>  * @items: same type components with the hotplug capability;</div><div class='ctx'>  * @irq: platform interrupt number;</div><div class='ctx'>  * @regmap: register map of parent device;</div><div class='del'>- * @counter: number of the components with the hotplug capability;</div><div class='add'>+ * @count: number of the components with the hotplug capability;</div><div class='ctx'>  * @cell: location of top aggregation interrupt register;</div><div class='ctx'>  * @mask: top aggregation interrupt common mask;</div><div class='ctx'>  * @cell_low: location of low aggregation interrupt register;</div><div class='hunk'>@@ -224,7 +224,7 @@ struct mlxreg_core_hotplug_platform_data {</div><div class='ctx'> 	struct mlxreg_core_item *items;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	void *regmap;</div><div class='del'>-	int counter;</div><div class='add'>+	int count;</div><div class='ctx'> 	u32 cell;</div><div class='ctx'> 	u32 mask;</div><div class='ctx'> 	u32 cell_low;</div><div class='head'>diff --git a/include/linux/platform_data/mmc-pxamci.h b/include/linux/platform_data/mmc-pxamci.h<br/>index 7e44e84e7150..652f323b5ecc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/mmc-pxamci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mmc-pxamci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/mmc-pxamci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/mmc-pxamci.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='ctx'> struct mmc_host;</div><div class='add'>+struct property_entry;</div><div class='ctx'> </div><div class='ctx'> struct pxamci_platform_data {</div><div class='ctx'> 	unsigned int ocr_mask;			/* available voltages */</div><div class='hunk'>@@ -18,7 +19,8 @@ struct pxamci_platform_data {</div><div class='ctx'> 	bool gpio_card_ro_invert;		/* gpio ro is inverted */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void pxa_set_mci_info(struct pxamci_platform_data *info);</div><div class='add'>+extern void pxa_set_mci_info(const struct pxamci_platform_data *info,</div><div class='add'>+			     const struct property_entry *props);</div><div class='ctx'> extern void pxa3xx_set_mci2_info(struct pxamci_platform_data *info);</div><div class='ctx'> extern void pxa3xx_set_mci3_info(struct pxamci_platform_data *info);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/platform_data/mtd-davinci-aemif.h b/include/linux/platform_data/mtd-davinci-aemif.h<br/>deleted file mode 100644<br/>index a49826214a39..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/mtd-davinci-aemif.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mtd-davinci-aemif.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * TI DaVinci AEMIF support</div><div class='del'>- *</div><div class='del'>- * Copyright 2010 (C) Texas Instruments, Inc. https://www.ti.com/</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GNU General Public License</div><div class='del'>- * version 2. This program is licensed "as is" without any warranty of any</div><div class='del'>- * kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-#ifndef _MACH_DAVINCI_AEMIF_H</div><div class='del'>-#define _MACH_DAVINCI_AEMIF_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#define NRCSR_OFFSET		0x00</div><div class='del'>-#define AWCCR_OFFSET		0x04</div><div class='del'>-#define A1CR_OFFSET		0x10</div><div class='del'>-</div><div class='del'>-#define ACR_ASIZE_MASK		0x3</div><div class='del'>-#define ACR_EW_MASK		BIT(30)</div><div class='del'>-#define ACR_SS_MASK		BIT(31)</div><div class='del'>-</div><div class='del'>-/* All timings in nanoseconds */</div><div class='del'>-struct davinci_aemif_timing {</div><div class='del'>-	u8	wsetup;</div><div class='del'>-	u8	wstrobe;</div><div class='del'>-	u8	whold;</div><div class='del'>-</div><div class='del'>-	u8	rsetup;</div><div class='del'>-	u8	rstrobe;</div><div class='del'>-	u8	rhold;</div><div class='del'>-</div><div class='del'>-	u8	ta;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h<br/>deleted file mode 100644<br/>index dd474dd44848..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/mtd-davinci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mtd-davinci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * mach-davinci/nand.h</div><div class='del'>- *</div><div class='del'>- * Copyright © 2006 Texas Instruments.</div><div class='del'>- *</div><div class='del'>- * Ported to 2.6.23 Copyright © 2008 by</div><div class='del'>- *   Sander Huijsen &lt;Shuijsen@optelecom-nkf.com&gt;</div><div class='del'>- *   Troy Kisky &lt;troy.kisky@boundarydevices.com&gt;</div><div class='del'>- *   Dirk Behme &lt;Dirk.Behme@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- * --------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ARCH_ARM_DAVINCI_NAND_H</div><div class='del'>-#define __ARCH_ARM_DAVINCI_NAND_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mtd/rawnand.h&gt;</div><div class='del'>-</div><div class='del'>-#define NANDFCR_OFFSET		0x60</div><div class='del'>-#define NANDFSR_OFFSET		0x64</div><div class='del'>-#define NANDF1ECC_OFFSET	0x70</div><div class='del'>-</div><div class='del'>-/* 4-bit ECC syndrome registers */</div><div class='del'>-#define NAND_4BIT_ECC_LOAD_OFFSET	0xbc</div><div class='del'>-#define NAND_4BIT_ECC1_OFFSET		0xc0</div><div class='del'>-#define NAND_4BIT_ECC2_OFFSET		0xc4</div><div class='del'>-#define NAND_4BIT_ECC3_OFFSET		0xc8</div><div class='del'>-#define NAND_4BIT_ECC4_OFFSET		0xcc</div><div class='del'>-#define NAND_ERR_ADD1_OFFSET		0xd0</div><div class='del'>-#define NAND_ERR_ADD2_OFFSET		0xd4</div><div class='del'>-#define NAND_ERR_ERRVAL1_OFFSET		0xd8</div><div class='del'>-#define NAND_ERR_ERRVAL2_OFFSET		0xdc</div><div class='del'>-</div><div class='del'>-/* NOTE:  boards don't need to use these address bits</div><div class='del'>- * for ALE/CLE unless they support booting from NAND.</div><div class='del'>- * They're used unless platform data overrides them.</div><div class='del'>- */</div><div class='del'>-#define	MASK_ALE		0x08</div><div class='del'>-#define	MASK_CLE		0x10</div><div class='del'>-</div><div class='del'>-struct davinci_nand_pdata {		/* platform_data */</div><div class='del'>-	uint32_t		mask_ale;</div><div class='del'>-	uint32_t		mask_cle;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 0-indexed chip-select number of the asynchronous</div><div class='del'>-	 * interface to which the NAND device has been connected.</div><div class='del'>-	 *</div><div class='del'>-	 * So, if you have NAND connected to CS3 of DA850, you</div><div class='del'>-	 * will pass '1' here. Since the asynchronous interface</div><div class='del'>-	 * on DA850 starts from CS2.</div><div class='del'>-	 */</div><div class='del'>-	uint32_t		core_chipsel;</div><div class='del'>-</div><div class='del'>-	/* for packages using two chipselects */</div><div class='del'>-	uint32_t		mask_chipsel;</div><div class='del'>-</div><div class='del'>-	/* board's default static partition info */</div><div class='del'>-	struct mtd_partition	*parts;</div><div class='del'>-	unsigned		nr_parts;</div><div class='del'>-</div><div class='del'>-	/* none  == NAND_ECC_ENGINE_TYPE_NONE (strongly *not* advised!!)</div><div class='del'>-	 * soft  == NAND_ECC_ENGINE_TYPE_SOFT</div><div class='del'>-	 * else  == NAND_ECC_ENGINE_TYPE_ON_HOST, according to ecc_bits</div><div class='del'>-	 *</div><div class='del'>-	 * All DaVinci-family chips support 1-bit hardware ECC.</div><div class='del'>-	 * Newer ones also support 4-bit ECC, but are awkward</div><div class='del'>-	 * using it with large page chips.</div><div class='del'>-	 */</div><div class='del'>-	enum nand_ecc_engine_type engine_type;</div><div class='del'>-	enum nand_ecc_placement ecc_placement;</div><div class='del'>-	u8			ecc_bits;</div><div class='del'>-</div><div class='del'>-	/* e.g. NAND_BUSWIDTH_16 */</div><div class='del'>-	unsigned		options;</div><div class='del'>-	/* e.g. NAND_BBT_USE_FLASH */</div><div class='del'>-	unsigned		bbt_options;</div><div class='del'>-</div><div class='del'>-	/* Main and mirror bbt descriptor overrides */</div><div class='del'>-	struct nand_bbt_descr	*bbt_td;</div><div class='del'>-	struct nand_bbt_descr	*bbt_md;</div><div class='del'>-</div><div class='del'>-	/* Access timings */</div><div class='del'>-	struct davinci_aemif_timing	*timing;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif	/* __ARCH_ARM_DAVINCI_NAND_H */</div><div class='head'>diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h<br/>deleted file mode 100644<br/>index 25390fc3e795..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/mtd-nand-s3c2410.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/mtd-nand-s3c2410.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2004 Simtec Electronics</div><div class='del'>- *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='del'>- *</div><div class='del'>- * S3C2410 - NAND device controller platform_device info</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __MTD_NAND_S3C2410_H</div><div class='del'>-#define __MTD_NAND_S3C2410_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mtd/rawnand.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct s3c2410_nand_set - define a set of one or more nand chips</div><div class='del'>- * @flash_bbt: 		Openmoko u-boot can create a Bad Block Table</div><div class='del'>- *			Setting this flag will allow the kernel to</div><div class='del'>- *			look for it at boot time and also skip the NAND</div><div class='del'>- *			scan.</div><div class='del'>- * @options:		Default value to set into 'struct nand_chip' options.</div><div class='del'>- * @nr_chips:		Number of chips in this set</div><div class='del'>- * @nr_partitions:	Number of partitions pointed to by @partitions</div><div class='del'>- * @name:		Name of set (optional)</div><div class='del'>- * @nr_map:		Map for low-layer logical to physical chip numbers (option)</div><div class='del'>- * @partitions:		The mtd partition list</div><div class='del'>- *</div><div class='del'>- * define a set of one or more nand chips registered with an unique mtd. Also</div><div class='del'>- * allows to pass flag to the underlying NAND layer. 'disable_ecc' will trigger</div><div class='del'>- * a warning at boot time.</div><div class='del'>- */</div><div class='del'>-struct s3c2410_nand_set {</div><div class='del'>-	unsigned int		flash_bbt:1;</div><div class='del'>-</div><div class='del'>-	unsigned int		options;</div><div class='del'>-	int			nr_chips;</div><div class='del'>-	int			nr_partitions;</div><div class='del'>-	char			*name;</div><div class='del'>-	int			*nr_map;</div><div class='del'>-	struct mtd_partition	*partitions;</div><div class='del'>-	struct device_node	*of_node;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct s3c2410_platform_nand {</div><div class='del'>-	/* timing information for controller, all times in nanoseconds */</div><div class='del'>-</div><div class='del'>-	int	tacls;	/* time for active CLE/ALE to nWE/nOE */</div><div class='del'>-	int	twrph0;	/* active time for nWE/nOE */</div><div class='del'>-	int	twrph1;	/* time for release CLE/ALE from nWE/nOE inactive */</div><div class='del'>-</div><div class='del'>-	unsigned int	ignore_unset_ecc:1;</div><div class='del'>-</div><div class='del'>-	enum nand_ecc_engine_type engine_type;</div><div class='del'>-</div><div class='del'>-	int			nr_sets;</div><div class='del'>-	struct s3c2410_nand_set *sets;</div><div class='del'>-</div><div class='del'>-	void			(*select_chip)(struct s3c2410_nand_set *,</div><div class='del'>-					       int chip);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * s3c_nand_set_platdata() - register NAND platform data.</div><div class='del'>- * @nand: The NAND platform data to register with s3c_device_nand.</div><div class='del'>- *</div><div class='del'>- * This function copies the given NAND platform data, @nand and registers</div><div class='del'>- * it with the s3c_device_nand. This allows @nand to be __initdata.</div><div class='del'>-*/</div><div class='del'>-extern void s3c_nand_set_platdata(struct s3c2410_platform_nand *nand);</div><div class='del'>-</div><div class='del'>-#endif /*__MTD_NAND_S3C2410_H */</div><div class='head'>diff --git a/include/linux/platform_data/omap1_bl.h b/include/linux/platform_data/omap1_bl.h<br/>index 5e8b17d77a5f..3d0bab31a0a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/omap1_bl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/omap1_bl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/omap1_bl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/omap1_bl.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> </div><div class='ctx'> struct omap_backlight_config {</div><div class='ctx'> 	int default_intensity;</div><div class='del'>-	int (*set_power)(struct device *dev, int state);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/platform_data/sa11x0-serial.h b/include/linux/platform_data/sa11x0-serial.h<br/>index 8b79ab08af45..a88096bc74e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/sa11x0-serial.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/sa11x0-serial.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/sa11x0-serial.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/sa11x0-serial.h</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #define SA11X0_SERIAL_H</div><div class='ctx'> </div><div class='ctx'> struct uart_port;</div><div class='del'>-struct uart_info;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is a temporary structure for registering these</div><div class='head'>diff --git a/include/linux/platform_data/spi-davinci.h b/include/linux/platform_data/spi-davinci.h<br/>deleted file mode 100644<br/>index 2cb5cc70fd9d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/spi-davinci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/spi-davinci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright 2009 Texas Instruments.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ARCH_ARM_DAVINCI_SPI_H</div><div class='del'>-#define __ARCH_ARM_DAVINCI_SPI_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_data/edma.h&gt;</div><div class='del'>-</div><div class='del'>-#define SPI_INTERN_CS	0xFF</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	SPI_VERSION_1, /* For DM355/DM365/DM6467 */</div><div class='del'>-	SPI_VERSION_2, /* For DA8xx */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * davinci_spi_platform_data - Platform data for SPI master device on DaVinci</div><div class='del'>- *</div><div class='del'>- * @version:	version of the SPI IP. Different DaVinci devices have slightly</div><div class='del'>- *		varying versions of the same IP.</div><div class='del'>- * @num_chipselect: number of chipselects supported by this SPI master</div><div class='del'>- * @intr_line:	interrupt line used to connect the SPI IP to the ARM interrupt</div><div class='del'>- *		controller withn the SoC. Possible values are 0 and 1.</div><div class='del'>- * @cshold_bug:	set this to true if the SPI controller on your chip requires</div><div class='del'>- *		a write to CSHOLD bit in between transfers (like in DM355).</div><div class='del'>- * @dma_event_q: DMA event queue to use if SPI_IO_TYPE_DMA is used for any</div><div class='del'>- *		device on the bus.</div><div class='del'>- */</div><div class='del'>-struct davinci_spi_platform_data {</div><div class='del'>-	u8			version;</div><div class='del'>-	u8			num_chipselect;</div><div class='del'>-	u8			intr_line;</div><div class='del'>-	u8			prescaler_limit;</div><div class='del'>-	bool			cshold_bug;</div><div class='del'>-	enum dma_event_q	dma_event_q;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * davinci_spi_config - Per-chip-select configuration for SPI slave devices</div><div class='del'>- *</div><div class='del'>- * @wdelay:	amount of delay between transmissions. Measured in number of</div><div class='del'>- *		SPI module clocks.</div><div class='del'>- * @odd_parity:	polarity of parity flag at the end of transmit data stream.</div><div class='del'>- *		0 - odd parity, 1 - even parity.</div><div class='del'>- * @parity_enable: enable transmission of parity at end of each transmit</div><div class='del'>- *		data stream.</div><div class='del'>- * @io_type:	type of IO transfer. Choose between polled, interrupt and DMA.</div><div class='del'>- * @timer_disable: disable chip-select timers (setup and hold)</div><div class='del'>- * @c2tdelay:	chip-select setup time. Measured in number of SPI module clocks.</div><div class='del'>- * @t2cdelay:	chip-select hold time. Measured in number of SPI module clocks.</div><div class='del'>- * @t2edelay:	transmit data finished to SPI ENAn pin inactive time. Measured</div><div class='del'>- *		in number of SPI clocks.</div><div class='del'>- * @c2edelay:	chip-select active to SPI ENAn signal active time. Measured in</div><div class='del'>- *		number of SPI clocks.</div><div class='del'>- */</div><div class='del'>-struct davinci_spi_config {</div><div class='del'>-	u8	wdelay;</div><div class='del'>-	u8	odd_parity;</div><div class='del'>-	u8	parity_enable;</div><div class='del'>-#define SPI_IO_TYPE_INTR	0</div><div class='del'>-#define SPI_IO_TYPE_POLL	1</div><div class='del'>-#define SPI_IO_TYPE_DMA		2</div><div class='del'>-	u8	io_type;</div><div class='del'>-	u8	timer_disable;</div><div class='del'>-	u8	c2tdelay;</div><div class='del'>-	u8	t2cdelay;</div><div class='del'>-	u8	t2edelay;</div><div class='del'>-	u8	c2edelay;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif	/* __ARCH_ARM_DAVINCI_SPI_H */</div><div class='head'>diff --git a/include/linux/platform_data/spi-ep93xx.h b/include/linux/platform_data/spi-ep93xx.h<br/>deleted file mode 100644<br/>index b439f2a896e0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/spi-ep93xx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/spi-ep93xx.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __ASM_MACH_EP93XX_SPI_H</div><div class='del'>-#define __ASM_MACH_EP93XX_SPI_H</div><div class='del'>-</div><div class='del'>-struct spi_device;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ep93xx_spi_info - EP93xx specific SPI descriptor</div><div class='del'>- * @use_dma: use DMA for the transfers</div><div class='del'>- */</div><div class='del'>-struct ep93xx_spi_info {</div><div class='del'>-	bool	use_dma;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __ASM_MACH_EP93XX_SPI_H */</div><div class='head'>diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h<br/>index 3b400b1919a9..9e3c15b4ac91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/spi-omap2-mcspi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/spi-omap2-mcspi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/spi-omap2-mcspi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/spi-omap2-mcspi.h</a></div><div class='hunk'>@@ -16,9 +16,6 @@ struct omap2_mcspi_platform_config {</div><div class='ctx'> </div><div class='ctx'> struct omap2_mcspi_device_config {</div><div class='ctx'> 	unsigned turbo_mode:1;</div><div class='del'>-</div><div class='del'>-	/* toggle chip select after every word */</div><div class='del'>-	unsigned cs_per_word:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/platform_data/syscon.h b/include/linux/platform_data/syscon.h<br/>deleted file mode 100644<br/>index 2c089dd3e2bd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/syscon.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/syscon.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef PLATFORM_DATA_SYSCON_H</div><div class='del'>-#define PLATFORM_DATA_SYSCON_H</div><div class='del'>-</div><div class='del'>-struct syscon_platform_data {</div><div class='del'>-	const char *label;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/platform_data/ti-aemif.h b/include/linux/platform_data/ti-aemif.h<br/>deleted file mode 100644<br/>index 77625251df07..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/ti-aemif.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/ti-aemif.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * TI DaVinci AEMIF platform glue.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2017 BayLibre SAS</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Bartosz Golaszewski &lt;bgolaszewski@baylibre.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __TI_DAVINCI_AEMIF_DATA_H__</div><div class='del'>-#define __TI_DAVINCI_AEMIF_DATA_H__</div><div class='del'>-</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct aemif_abus_data - Async bus configuration parameters.</div><div class='del'>- *</div><div class='del'>- * @cs - Chip-select number.</div><div class='del'>- */</div><div class='del'>-struct aemif_abus_data {</div><div class='del'>-	u32 cs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct aemif_platform_data - Data to set up the TI aemif driver.</div><div class='del'>- *</div><div class='del'>- * @dev_lookup: of_dev_auxdata passed to of_platform_populate() for aemif</div><div class='del'>- *              subdevices.</div><div class='del'>- * @cs_offset: Lowest allowed chip-select number.</div><div class='del'>- * @abus_data: Array of async bus configuration entries.</div><div class='del'>- * @num_abus_data: Number of abus entries.</div><div class='del'>- * @sub_devices: Array of platform subdevices.</div><div class='del'>- * @num_sub_devices: Number of subdevices.</div><div class='del'>- */</div><div class='del'>-struct aemif_platform_data {</div><div class='del'>-	struct of_dev_auxdata *dev_lookup;</div><div class='del'>-	u32 cs_offset;</div><div class='del'>-	struct aemif_abus_data *abus_data;</div><div class='del'>-	size_t num_abus_data;</div><div class='del'>-	struct platform_device *sub_devices;</div><div class='del'>-	size_t num_sub_devices;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __TI_DAVINCI_AEMIF_DATA_H__ */</div><div class='head'>diff --git a/include/linux/platform_data/ti-sysc.h b/include/linux/platform_data/ti-sysc.h<br/>index eb556f988d57..d8f15770a522 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/ti-sysc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/ti-sysc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/ti-sysc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/ti-sysc.h</a></div><div class='hunk'>@@ -71,7 +71,6 @@ struct sysc_regbits {</div><div class='ctx'> #define SYSC_QUIRK_SWSUP_SIDLE_ACT	BIT(12)</div><div class='ctx'> #define SYSC_QUIRK_SWSUP_SIDLE		BIT(11)</div><div class='ctx'> #define SYSC_QUIRK_EXT_OPT_CLOCK	BIT(10)</div><div class='del'>-#define SYSC_QUIRK_LEGACY_IDLE		BIT(9)</div><div class='ctx'> #define SYSC_QUIRK_RESET_STATUS		BIT(8)</div><div class='ctx'> #define SYSC_QUIRK_NO_IDLE		BIT(7)</div><div class='ctx'> #define SYSC_QUIRK_NO_IDLE_ON_INIT	BIT(6)</div><div class='head'>diff --git a/include/linux/platform_data/tmio.h b/include/linux/platform_data/tmio.h<br/>new file mode 100644<br/>index 000000000000..426291713b83<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/tmio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/tmio.h</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef MFD_TMIO_H</div><div class='add'>+#define MFD_TMIO_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* TMIO MMC platform flags */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some controllers can support a 2-byte block size when the bus width is</div><div class='add'>+ * configured in 4-bit mode.</div><div class='add'>+ */</div><div class='add'>+#define TMIO_MMC_BLKSZ_2BYTES		BIT(1)</div><div class='add'>+</div><div class='add'>+/* Some controllers can support SDIO IRQ signalling */</div><div class='add'>+#define TMIO_MMC_SDIO_IRQ		BIT(2)</div><div class='add'>+</div><div class='add'>+/* Some features are only available or tested on R-Car Gen2 or later */</div><div class='add'>+#define TMIO_MMC_MIN_RCAR2		BIT(3)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some controllers require waiting for the SD bus to become idle before</div><div class='add'>+ * writing to some registers.</div><div class='add'>+ */</div><div class='add'>+#define TMIO_MMC_HAS_IDLE_WAIT		BIT(4)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use the busy timeout feature. Probably all TMIO versions support it. Yet,</div><div class='add'>+ * we don't have documentation for old variants, so we enable only known good</div><div class='add'>+ * variants with this flag. Can be removed once all variants are known good.</div><div class='add'>+ */</div><div class='add'>+#define TMIO_MMC_USE_BUSY_TIMEOUT	BIT(5)</div><div class='add'>+</div><div class='add'>+/* Some controllers have CMD12 automatically issue/non-issue register */</div><div class='add'>+#define TMIO_MMC_HAVE_CMD12_CTRL	BIT(7)</div><div class='add'>+</div><div class='add'>+/* Controller has some SDIO status bits which must be 1 */</div><div class='add'>+#define TMIO_MMC_SDIO_STATUS_SETBITS	BIT(8)</div><div class='add'>+</div><div class='add'>+/* Some controllers have a 32-bit wide data port register */</div><div class='add'>+#define TMIO_MMC_32BIT_DATA_PORT	BIT(9)</div><div class='add'>+</div><div class='add'>+/* Some controllers allows to set SDx actual clock */</div><div class='add'>+#define TMIO_MMC_CLK_ACTUAL		BIT(10)</div><div class='add'>+</div><div class='add'>+/* Some controllers have a CBSY bit */</div><div class='add'>+#define TMIO_MMC_HAVE_CBSY		BIT(11)</div><div class='add'>+</div><div class='add'>+/* Some controllers have a 64-bit wide data port register */</div><div class='add'>+#define TMIO_MMC_64BIT_DATA_PORT	BIT(12)</div><div class='add'>+</div><div class='add'>+struct tmio_mmc_data {</div><div class='add'>+	void				*chan_priv_tx;</div><div class='add'>+	void				*chan_priv_rx;</div><div class='add'>+	unsigned int			hclk;</div><div class='add'>+	unsigned long			capabilities;</div><div class='add'>+	unsigned long			capabilities2;</div><div class='add'>+	unsigned long			flags;</div><div class='add'>+	u32				ocr_mask;	/* available voltages */</div><div class='add'>+	dma_addr_t			dma_rx_offset;</div><div class='add'>+	unsigned int			max_blk_count;</div><div class='add'>+	unsigned short			max_segs;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/platform_data/touchscreen-s3c2410.h b/include/linux/platform_data/touchscreen-s3c2410.h<br/>deleted file mode 100644<br/>index bf8d3b9d7c6a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/touchscreen-s3c2410.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/touchscreen-s3c2410.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2005 Arnaud Patard &lt;arnaud.patard@rtp-net.org&gt;</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef __TOUCHSCREEN_S3C2410_H</div><div class='del'>-#define __TOUCHSCREEN_S3C2410_H</div><div class='del'>-</div><div class='del'>-struct s3c2410_ts_mach_info {</div><div class='del'>-	int delay;</div><div class='del'>-	int presc;</div><div class='del'>-	int oversampling_shift;</div><div class='del'>-	void (*cfg_gpio)(struct platform_device *dev);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern void s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *);</div><div class='del'>-extern void s3c64xx_ts_set_platdata(struct s3c2410_ts_mach_info *);</div><div class='del'>-</div><div class='del'>-/* defined by architecture to configure gpio */</div><div class='del'>-extern void s3c24xx_ts_cfg_gpio(struct platform_device *dev);</div><div class='del'>-</div><div class='del'>-#endif /*__TOUCHSCREEN_S3C2410_H */</div><div class='head'>diff --git a/include/linux/platform_data/uio_pruss.h b/include/linux/platform_data/uio_pruss.h<br/>deleted file mode 100644<br/>index f76fa393b802..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/uio_pruss.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/uio_pruss.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * include/linux/platform_data/uio_pruss.h</div><div class='del'>- *</div><div class='del'>- * Platform data for uio_pruss driver</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010-11 Texas Instruments Incorporated - https://www.ti.com/</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _UIO_PRUSS_H_</div><div class='del'>-#define _UIO_PRUSS_H_</div><div class='del'>-</div><div class='del'>-/* To configure the PRUSS INTC base offset for UIO driver */</div><div class='del'>-struct uio_pruss_pdata {</div><div class='del'>-	u32		pintc_base;</div><div class='del'>-	struct gen_pool *sram_pool;</div><div class='del'>-};</div><div class='del'>-#endif /* _UIO_PRUSS_H_ */</div><div class='head'>diff --git a/include/linux/platform_data/usb-davinci.h b/include/linux/platform_data/usb-davinci.h<br/>deleted file mode 100644<br/>index 879f5c78b91a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/usb-davinci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/usb-davinci.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * USB related definitions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2009 MontaVista Software, Inc. &lt;source@mvista.com&gt;</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GNU General Public License</div><div class='del'>- * version 2. This program is licensed "as is" without any warranty of any</div><div class='del'>- * kind, whether express or implied.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ASM_ARCH_USB_H</div><div class='del'>-#define __ASM_ARCH_USB_H</div><div class='del'>-</div><div class='del'>-/* Passed as the platform data to the OHCI driver */</div><div class='del'>-struct	da8xx_ohci_root_hub {</div><div class='del'>-	/* Time from power on to power good (in 2 ms units) */</div><div class='del'>-	u8	potpgt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void davinci_setup_usb(unsigned mA, unsigned potpgt_ms);</div><div class='del'>-</div><div class='del'>-#endif	/* ifndef __ASM_ARCH_USB_H */</div><div class='head'>diff --git a/include/linux/platform_data/video-pxafb.h b/include/linux/platform_data/video-pxafb.h<br/>index 6333bac166a5..38c24c77ba43 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/video-pxafb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/video-pxafb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/video-pxafb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/video-pxafb.h</a></div><div class='hunk'>@@ -150,7 +150,6 @@ struct pxafb_mach_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void pxa_set_fb_info(struct device *, struct pxafb_mach_info *);</div><div class='del'>-unsigned long pxafb_get_hsync_time(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> /* smartpanel related */</div><div class='ctx'> #define SMART_CMD_A0			 (0x1 &lt;&lt; 8)</div><div class='head'>diff --git a/include/linux/platform_data/x86/amd-fch.h b/include/linux/platform_data/x86/amd-fch.h<br/>new file mode 100644<br/>index 000000000000..2cf5153edbc2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/amd-fch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/amd-fch.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _ASM_X86_AMD_FCH_H_</div><div class='add'>+#define _ASM_X86_AMD_FCH_H_</div><div class='add'>+</div><div class='add'>+#define FCH_PM_BASE			0xFED80300</div><div class='add'>+</div><div class='add'>+/* Register offsets from PM base: */</div><div class='add'>+#define FCH_PM_DECODEEN			0x00</div><div class='add'>+#define FCH_PM_DECODEEN_SMBUS0SEL	GENMASK(20, 19)</div><div class='add'>+#define FCH_PM_SCRATCH			0x80</div><div class='add'>+#define FCH_PM_S5_RESET_STATUS		0xC0</div><div class='add'>+</div><div class='add'>+#endif /* _ASM_X86_AMD_FCH_H_ */</div><div class='head'>diff --git a/include/linux/platform_data/x86/asus-wmi-leds-ids.h b/include/linux/platform_data/x86/asus-wmi-leds-ids.h<br/>new file mode 100644<br/>index 000000000000..034a039c4e37<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/asus-wmi-leds-ids.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/asus-wmi-leds-ids.h</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H</div><div class='add'>+#define __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* To be used by both hid-asus and asus-wmi to determine which controls kbd_brightness */</div><div class='add'>+#if IS_REACHABLE(CONFIG_ASUS_WMI) || IS_REACHABLE(CONFIG_HID_ASUS)</div><div class='add'>+static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Zephyrus"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Strix"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt P16"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_BOARD_NAME, "GA403U"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_BOARD_NAME, "GU605M"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_BOARD_NAME, "RC71L"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif	/* __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H */</div><div class='head'>diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h<br/>index ab1c7deff118..419491d4abca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/asus-wmi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/asus-wmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/asus-wmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/asus-wmi.h</a></div><div class='hunk'>@@ -5,6 +5,9 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#define ASUS_WMI_MGMT_GUID	"97845ED0-4E6D-11DE-8A39-0800200C9A66"</div><div class='add'>+#define ASUS_ACPI_UID_ASUSWMI	"ASUSWMI"</div><div class='add'>+</div><div class='ctx'> /* WMI Methods */</div><div class='ctx'> #define ASUS_WMI_METHODID_SPEC	        0x43455053 /* BIOS SPECification */</div><div class='ctx'> #define ASUS_WMI_METHODID_SFBD		0x44424653 /* Set First Boot Device */</div><div class='hunk'>@@ -51,6 +54,10 @@</div><div class='ctx'> #define ASUS_WMI_DEVID_LED6		0x00020016</div><div class='ctx'> #define ASUS_WMI_DEVID_MICMUTE_LED		0x00040017</div><div class='ctx'> </div><div class='add'>+/* Disable Camera LED */</div><div class='add'>+#define ASUS_WMI_DEVID_CAMERA_LED_NEG	0x00060078 /* 0 = on (unused) */</div><div class='add'>+#define ASUS_WMI_DEVID_CAMERA_LED	0x00060079 /* 1 = on */</div><div class='add'>+</div><div class='ctx'> /* Backlight and Brightness */</div><div class='ctx'> #define ASUS_WMI_DEVID_ALS_ENABLE	0x00050001 /* Ambient Light Sensor */</div><div class='ctx'> #define ASUS_WMI_DEVID_BACKLIGHT	0x00050011</div><div class='hunk'>@@ -58,19 +65,24 @@</div><div class='ctx'> #define ASUS_WMI_DEVID_KBD_BACKLIGHT	0x00050021</div><div class='ctx'> #define ASUS_WMI_DEVID_LIGHT_SENSOR	0x00050022 /* ?? */</div><div class='ctx'> #define ASUS_WMI_DEVID_LIGHTBAR		0x00050025</div><div class='add'>+#define ASUS_WMI_DEVID_OOBE		0x0005002F</div><div class='ctx'> /* This can only be used to disable the screen, not re-enable */</div><div class='ctx'> #define ASUS_WMI_DEVID_SCREENPAD_POWER	0x00050031</div><div class='ctx'> /* Writing a brightness re-enables the screen if disabled */</div><div class='ctx'> #define ASUS_WMI_DEVID_SCREENPAD_LIGHT	0x00050032</div><div class='ctx'> #define ASUS_WMI_DEVID_FAN_BOOST_MODE	0x00110018</div><div class='ctx'> #define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075</div><div class='add'>+#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO 0x00110019</div><div class='ctx'> </div><div class='ctx'> /* Misc */</div><div class='add'>+#define ASUS_WMI_DEVID_PANEL_HD		0x0005001C</div><div class='ctx'> #define ASUS_WMI_DEVID_PANEL_OD		0x00050019</div><div class='ctx'> #define ASUS_WMI_DEVID_CAMERA		0x00060013</div><div class='ctx'> #define ASUS_WMI_DEVID_LID_FLIP		0x00060062</div><div class='ctx'> #define ASUS_WMI_DEVID_LID_FLIP_ROG	0x00060077</div><div class='ctx'> #define ASUS_WMI_DEVID_MINI_LED_MODE	0x0005001E</div><div class='add'>+#define ASUS_WMI_DEVID_MINI_LED_MODE2	0x0005002E</div><div class='add'>+#define ASUS_WMI_DEVID_SCREEN_AUTO_BRIGHTNESS	0x0005002A</div><div class='ctx'> </div><div class='ctx'> /* Storage */</div><div class='ctx'> #define ASUS_WMI_DEVID_CARDREADER	0x00080013</div><div class='hunk'>@@ -95,7 +107,7 @@</div><div class='ctx'> #define ASUS_WMI_DEVID_PPT_PL1_SPL		0x001200A3</div><div class='ctx'> #define ASUS_WMI_DEVID_PPT_APU_SPPT		0x001200B0</div><div class='ctx'> #define ASUS_WMI_DEVID_PPT_PLAT_SPPT	0x001200B1</div><div class='del'>-#define ASUS_WMI_DEVID_PPT_FPPT			0x001200C1</div><div class='add'>+#define ASUS_WMI_DEVID_PPT_PL3_FPPT		0x001200C1</div><div class='ctx'> #define ASUS_WMI_DEVID_NV_DYN_BOOST		0x001200C0</div><div class='ctx'> #define ASUS_WMI_DEVID_NV_THERM_TARGET	0x001200C2</div><div class='ctx'> </div><div class='hunk'>@@ -125,15 +137,25 @@</div><div class='ctx'> /* dgpu on/off */</div><div class='ctx'> #define ASUS_WMI_DEVID_DGPU		0x00090020</div><div class='ctx'> </div><div class='add'>+#define ASUS_WMI_DEVID_APU_MEM		0x000600C1</div><div class='add'>+</div><div class='add'>+#define ASUS_WMI_DEVID_DGPU_BASE_TGP	0x00120099</div><div class='add'>+#define ASUS_WMI_DEVID_DGPU_SET_TGP	0x00120098</div><div class='add'>+</div><div class='ctx'> /* gpu mux switch, 0 = dGPU, 1 = Optimus */</div><div class='ctx'> #define ASUS_WMI_DEVID_GPU_MUX		0x00090016</div><div class='add'>+#define ASUS_WMI_DEVID_GPU_MUX_VIVO	0x00090026</div><div class='ctx'> </div><div class='ctx'> /* TUF laptop RGB modes/colours */</div><div class='ctx'> #define ASUS_WMI_DEVID_TUF_RGB_MODE	0x00100056</div><div class='add'>+#define ASUS_WMI_DEVID_TUF_RGB_MODE2	0x0010005A</div><div class='ctx'> </div><div class='ctx'> /* TUF laptop RGB power/state */</div><div class='ctx'> #define ASUS_WMI_DEVID_TUF_RGB_STATE	0x00100057</div><div class='ctx'> </div><div class='add'>+/* Bootup sound control */</div><div class='add'>+#define ASUS_WMI_DEVID_BOOT_SOUND	0x00130022</div><div class='add'>+</div><div class='ctx'> /* DSTS masks */</div><div class='ctx'> #define ASUS_WMI_DSTS_STATUS_BIT	0x00000001</div><div class='ctx'> #define ASUS_WMI_DSTS_UNKNOWN_BIT	0x00000002</div><div class='hunk'>@@ -144,9 +166,33 @@</div><div class='ctx'> #define ASUS_WMI_DSTS_MAX_BRIGTH_MASK	0x0000FF00</div><div class='ctx'> #define ASUS_WMI_DSTS_LIGHTBAR_MASK	0x0000000F</div><div class='ctx'> </div><div class='add'>+enum asus_ally_mcu_hack {</div><div class='add'>+	ASUS_WMI_ALLY_MCU_HACK_INIT,</div><div class='add'>+	ASUS_WMI_ALLY_MCU_HACK_ENABLED,</div><div class='add'>+	ASUS_WMI_ALLY_MCU_HACK_DISABLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if IS_REACHABLE(CONFIG_ASUS_WMI)</div><div class='add'>+void set_ally_mcu_hack(enum asus_ally_mcu_hack status);</div><div class='add'>+void set_ally_mcu_powersave(bool enabled);</div><div class='add'>+int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval);</div><div class='add'>+int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval);</div><div class='ctx'> int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retval);</div><div class='ctx'> #else</div><div class='add'>+static inline void set_ally_mcu_hack(enum asus_ally_mcu_hack status)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void set_ally_mcu_powersave(bool enabled)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+static inline int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='ctx'> static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1,</div><div class='ctx'> 					   u32 *retval)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/platform_data/x86/int3472.h b/include/linux/platform_data/x86/int3472.h<br/>new file mode 100644<br/>index 000000000000..b1b837583d54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/int3472.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/int3472.h</a></div><div class='hunk'>@@ -0,0 +1,166 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Intel INT3472 ACPI camera sensor power-management support</div><div class='add'>+ *</div><div class='add'>+ * Author: Dan Scally &lt;djrscally@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PLATFORM_DATA_X86_INT3472_H</div><div class='add'>+#define __PLATFORM_DATA_X86_INT3472_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='add'>+#include &lt;linux/gpio/machine.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/regulator/driver.h&gt;</div><div class='add'>+#include &lt;linux/regulator/machine.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* FIXME drop this once the I2C_DEV_NAME_FORMAT macro has been added to include/linux/i2c.h */</div><div class='add'>+#ifndef I2C_DEV_NAME_FORMAT</div><div class='add'>+#define I2C_DEV_NAME_FORMAT					"i2c-%s"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* PMIC GPIO Types */</div><div class='add'>+#define INT3472_GPIO_TYPE_RESET					0x00</div><div class='add'>+#define INT3472_GPIO_TYPE_POWERDOWN				0x01</div><div class='add'>+#define INT3472_GPIO_TYPE_POWER_ENABLE				0x0b</div><div class='add'>+#define INT3472_GPIO_TYPE_CLK_ENABLE				0x0c</div><div class='add'>+#define INT3472_GPIO_TYPE_PRIVACY_LED				0x0d</div><div class='add'>+#define INT3472_GPIO_TYPE_HANDSHAKE				0x12</div><div class='add'>+#define INT3472_GPIO_TYPE_HOTPLUG_DETECT			0x13</div><div class='add'>+</div><div class='add'>+#define INT3472_PDEV_MAX_NAME_LEN				23</div><div class='add'>+#define INT3472_MAX_SENSOR_GPIOS				3</div><div class='add'>+#define INT3472_MAX_REGULATORS					3</div><div class='add'>+</div><div class='add'>+/* E.g. "avdd\0" */</div><div class='add'>+#define GPIO_SUPPLY_NAME_LENGTH				5</div><div class='add'>+/* 12 chars for acpi_dev_name() + "-", e.g. "ABCD1234:00-" */</div><div class='add'>+#define GPIO_REGULATOR_NAME_LENGTH				(12 + GPIO_SUPPLY_NAME_LENGTH)</div><div class='add'>+/* lower- and upper-case mapping */</div><div class='add'>+#define GPIO_REGULATOR_SUPPLY_MAP_COUNT				2</div><div class='add'>+/*</div><div class='add'>+ * Ensure the GPIO is driven low/high for at least 2 ms before changing.</div><div class='add'>+ *</div><div class='add'>+ * 2 ms has been chosen because it is the minimum time ovXXXX sensors need to</div><div class='add'>+ * have their reset line driven logical high to properly register a reset.</div><div class='add'>+ */</div><div class='add'>+#define GPIO_REGULATOR_ENABLE_TIME				(2 * USEC_PER_MSEC)</div><div class='add'>+#define GPIO_REGULATOR_OFF_ON_DELAY				(2 * USEC_PER_MSEC)</div><div class='add'>+</div><div class='add'>+#define INT3472_LED_MAX_NAME_LEN				32</div><div class='add'>+</div><div class='add'>+#define CIO2_SENSOR_SSDB_MCLKSPEED_OFFSET			86</div><div class='add'>+</div><div class='add'>+#define INT3472_REGULATOR(_name, _ops, _enable_time, _off_on_delay) \</div><div class='add'>+	(const struct regulator_desc) {				\</div><div class='add'>+		.name = _name,					\</div><div class='add'>+		.type = REGULATOR_VOLTAGE,			\</div><div class='add'>+		.ops = _ops,					\</div><div class='add'>+		.owner = THIS_MODULE,				\</div><div class='add'>+		.enable_time = _enable_time,			\</div><div class='add'>+		.off_on_delay = _off_on_delay,			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define to_int3472_clk(hw)					\</div><div class='add'>+	container_of(hw, struct int3472_clock, clk_hw)</div><div class='add'>+</div><div class='add'>+#define to_int3472_device(clk)					\</div><div class='add'>+	container_of(clk, struct int3472_discrete_device, clock)</div><div class='add'>+</div><div class='add'>+struct acpi_device;</div><div class='add'>+struct dmi_system_id;</div><div class='add'>+struct i2c_client;</div><div class='add'>+struct platform_device;</div><div class='add'>+</div><div class='add'>+struct int3472_cldb {</div><div class='add'>+	u8 version;</div><div class='add'>+	/*</div><div class='add'>+	 * control logic type</div><div class='add'>+	 * 0: UNKNOWN</div><div class='add'>+	 * 1: DISCRETE(CRD-D)</div><div class='add'>+	 * 2: PMIC TPS68470</div><div class='add'>+	 * 3: PMIC uP6641</div><div class='add'>+	 */</div><div class='add'>+	u8 control_logic_type;</div><div class='add'>+	u8 control_logic_id;</div><div class='add'>+	u8 sensor_card_sku;</div><div class='add'>+	u8 reserved[10];</div><div class='add'>+	u8 clock_source;</div><div class='add'>+	u8 reserved2[17];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct int3472_discrete_quirks {</div><div class='add'>+	/* For models where AVDD GPIO is shared between sensors */</div><div class='add'>+	const char *avdd_second_sensor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct int3472_gpio_regulator {</div><div class='add'>+	/* SUPPLY_MAP_COUNT * 2 to make room for second sensor mappings */</div><div class='add'>+	struct regulator_consumer_supply supply_map[GPIO_REGULATOR_SUPPLY_MAP_COUNT * 2];</div><div class='add'>+	char supply_name_upper[GPIO_SUPPLY_NAME_LENGTH];</div><div class='add'>+	char regulator_name[GPIO_REGULATOR_NAME_LENGTH];</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	struct regulator_desc rdesc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct int3472_discrete_device {</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct acpi_device *sensor;</div><div class='add'>+	const char *sensor_name;</div><div class='add'>+</div><div class='add'>+	struct int3472_gpio_regulator regulators[INT3472_MAX_REGULATORS];</div><div class='add'>+</div><div class='add'>+	struct int3472_clock {</div><div class='add'>+		struct clk *clk;</div><div class='add'>+		struct clk_hw clk_hw;</div><div class='add'>+		struct clk_lookup *cl;</div><div class='add'>+		struct gpio_desc *ena_gpio;</div><div class='add'>+		u32 frequency;</div><div class='add'>+		u8 imgclk_index;</div><div class='add'>+	} clock;</div><div class='add'>+</div><div class='add'>+	struct int3472_pled {</div><div class='add'>+		struct led_classdev classdev;</div><div class='add'>+		struct led_lookup_data lookup;</div><div class='add'>+		char name[INT3472_LED_MAX_NAME_LEN];</div><div class='add'>+		struct gpio_desc *gpio;</div><div class='add'>+	} pled;</div><div class='add'>+</div><div class='add'>+	struct int3472_discrete_quirks quirks;</div><div class='add'>+</div><div class='add'>+	unsigned int ngpios; /* how many GPIOs have we seen */</div><div class='add'>+	unsigned int n_sensor_gpios; /* how many have we mapped to sensor */</div><div class='add'>+	unsigned int n_regulator_gpios; /* how many have we mapped to a regulator */</div><div class='add'>+	struct gpiod_lookup_table gpios;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct dmi_system_id skl_int3472_discrete_quirks[];</div><div class='add'>+</div><div class='add'>+union acpi_object *skl_int3472_get_acpi_buffer(struct acpi_device *adev,</div><div class='add'>+					       char *id);</div><div class='add'>+int skl_int3472_fill_cldb(struct acpi_device *adev, struct int3472_cldb *cldb);</div><div class='add'>+int skl_int3472_get_sensor_adev_and_name(struct device *dev,</div><div class='add'>+					 struct acpi_device **sensor_adev_ret,</div><div class='add'>+					 const char **name_ret);</div><div class='add'>+</div><div class='add'>+int int3472_discrete_parse_crs(struct int3472_discrete_device *int3472);</div><div class='add'>+void int3472_discrete_cleanup(struct int3472_discrete_device *int3472);</div><div class='add'>+</div><div class='add'>+int skl_int3472_register_gpio_clock(struct int3472_discrete_device *int3472,</div><div class='add'>+				    struct gpio_desc *gpio);</div><div class='add'>+int skl_int3472_register_dsm_clock(struct int3472_discrete_device *int3472);</div><div class='add'>+void skl_int3472_unregister_clock(struct int3472_discrete_device *int3472);</div><div class='add'>+</div><div class='add'>+int skl_int3472_register_regulator(struct int3472_discrete_device *int3472,</div><div class='add'>+				   struct gpio_desc *gpio,</div><div class='add'>+				   unsigned int enable_time,</div><div class='add'>+				   const char *supply_name,</div><div class='add'>+				   const char *second_sensor);</div><div class='add'>+void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472);</div><div class='add'>+</div><div class='add'>+int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gpio_desc *gpio);</div><div class='add'>+void skl_int3472_unregister_pled(struct int3472_discrete_device *int3472);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/platform_data/intel-mid_wdt.h b/include/linux/platform_data/x86/intel-mid_wdt.h<br/>index 8dba70b4b020..e5c0210d0fec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/intel-mid_wdt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/intel-mid_wdt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/intel-mid_wdt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/intel-mid_wdt.h</a></div><div class='hunk'>@@ -6,8 +6,8 @@</div><div class='ctx'>  *      Contact: David Cohen &lt;david.a.cohen@linux.intel.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __INTEL_MID_WDT_H__</div><div class='del'>-#define __INTEL_MID_WDT_H__</div><div class='add'>+#ifndef __PLATFORM_X86_INTEL_MID_WDT_H_</div><div class='add'>+#define __PLATFORM_X86_INTEL_MID_WDT_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -16,4 +16,4 @@ struct intel_mid_wdt_pdata {</div><div class='ctx'> 	int (*probe)(struct platform_device *pdev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif /*__INTEL_MID_WDT_H__*/</div><div class='add'>+#endif	/* __PLATFORM_X86_INTEL_MID_WDT_H_ */</div><div class='head'>diff --git a/include/linux/platform_data/x86/intel_pmc_ipc.h b/include/linux/platform_data/x86/intel_pmc_ipc.h<br/>new file mode 100644<br/>index 000000000000..85ea381e4a27<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/intel_pmc_ipc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/intel_pmc_ipc.h</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Intel Core SoC Power Management Controller Header File</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2025, Intel Corporation.</div><div class='add'>+ * All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef INTEL_PMC_IPC_H</div><div class='add'>+#define INTEL_PMC_IPC_H</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+</div><div class='add'>+#define IPC_SOC_REGISTER_ACCESS			0xAA</div><div class='add'>+#define IPC_SOC_SUB_CMD_READ			0x00</div><div class='add'>+#define IPC_SOC_SUB_CMD_WRITE			0x01</div><div class='add'>+#define PMC_IPCS_PARAM_COUNT			7</div><div class='add'>+#define VALID_IPC_RESPONSE			5</div><div class='add'>+</div><div class='add'>+struct pmc_ipc_cmd {</div><div class='add'>+	u32 cmd;</div><div class='add'>+	u32 sub_cmd;</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 wbuf[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pmc_ipc_rbuf {</div><div class='add'>+	u32 buf[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * intel_pmc_ipc() - PMC IPC Mailbox accessor</div><div class='add'>+ * @ipc_cmd:  Prepared input command to send</div><div class='add'>+ * @rbuf:     Allocated array for returned IPC data</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success. Non-zero on mailbox error</div><div class='add'>+ */</div><div class='add'>+static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf *rbuf)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='add'>+	union acpi_object params[PMC_IPCS_PARAM_COUNT] = {</div><div class='add'>+		{.type = ACPI_TYPE_INTEGER,},</div><div class='add'>+		{.type = ACPI_TYPE_INTEGER,},</div><div class='add'>+		{.type = ACPI_TYPE_INTEGER,},</div><div class='add'>+		{.type = ACPI_TYPE_INTEGER,},</div><div class='add'>+		{.type = ACPI_TYPE_INTEGER,},</div><div class='add'>+		{.type = ACPI_TYPE_INTEGER,},</div><div class='add'>+		{.type = ACPI_TYPE_INTEGER,},</div><div class='add'>+	};</div><div class='add'>+	struct acpi_object_list arg_list = { PMC_IPCS_PARAM_COUNT, params };</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (!ipc_cmd || !rbuf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 0: IPC Command</div><div class='add'>+	 * 1: IPC Sub Command</div><div class='add'>+	 * 2: Size</div><div class='add'>+	 * 3-6: Write Buffer for offset</div><div class='add'>+	 */</div><div class='add'>+	params[0].integer.value = ipc_cmd-&gt;cmd;</div><div class='add'>+	params[1].integer.value = ipc_cmd-&gt;sub_cmd;</div><div class='add'>+	params[2].integer.value = ipc_cmd-&gt;size;</div><div class='add'>+	params[3].integer.value = ipc_cmd-&gt;wbuf[0];</div><div class='add'>+	params[4].integer.value = ipc_cmd-&gt;wbuf[1];</div><div class='add'>+	params[5].integer.value = ipc_cmd-&gt;wbuf[2];</div><div class='add'>+	params[6].integer.value = ipc_cmd-&gt;wbuf[3];</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_object(NULL, "\\IPCS", &amp;arg_list, &amp;buffer);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	union acpi_object *obj __free(kfree) = buffer.pointer;</div><div class='add'>+</div><div class='add'>+	if (obj &amp;&amp; obj-&gt;type == ACPI_TYPE_PACKAGE &amp;&amp;</div><div class='add'>+	    obj-&gt;package.count == VALID_IPC_RESPONSE) {</div><div class='add'>+		const union acpi_object *objs = obj-&gt;package.elements;</div><div class='add'>+</div><div class='add'>+		if ((u8)objs[0].integer.value != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		rbuf-&gt;buf[0] = objs[1].integer.value;</div><div class='add'>+		rbuf-&gt;buf[1] = objs[2].integer.value;</div><div class='add'>+		rbuf-&gt;buf[2] = objs[3].integer.value;</div><div class='add'>+		rbuf-&gt;buf[3] = objs[4].integer.value;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+#else</div><div class='add'>+	return -ENODEV;</div><div class='add'>+#endif /* CONFIG_ACPI */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* INTEL_PMC_IPC_H */</div><div class='head'>diff --git a/include/linux/platform_data/x86/intel_scu_ipc.h b/include/linux/platform_data/x86/intel_scu_ipc.h<br/>new file mode 100644<br/>index 000000000000..b287627759f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/intel_scu_ipc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/intel_scu_ipc.h</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __PLATFORM_X86_INTEL_SCU_IPC_H_</div><div class='add'>+#define __PLATFORM_X86_INTEL_SCU_IPC_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct module;</div><div class='add'>+</div><div class='add'>+struct intel_scu_ipc_dev;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct intel_scu_ipc_data - Data used to configure SCU IPC</div><div class='add'>+ * @mem: Base address of SCU IPC MMIO registers</div><div class='add'>+ * @irq: The IRQ number used for SCU (optional)</div><div class='add'>+ */</div><div class='add'>+struct intel_scu_ipc_data {</div><div class='add'>+	struct resource mem;</div><div class='add'>+	int irq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct intel_scu_ipc_dev *</div><div class='add'>+__intel_scu_ipc_register(struct device *parent,</div><div class='add'>+			 const struct intel_scu_ipc_data *scu_data,</div><div class='add'>+			 struct module *owner);</div><div class='add'>+</div><div class='add'>+#define intel_scu_ipc_register(parent, scu_data)  \</div><div class='add'>+	__intel_scu_ipc_register(parent, scu_data, THIS_MODULE)</div><div class='add'>+</div><div class='add'>+void intel_scu_ipc_unregister(struct intel_scu_ipc_dev *scu);</div><div class='add'>+</div><div class='add'>+struct intel_scu_ipc_dev *</div><div class='add'>+__devm_intel_scu_ipc_register(struct device *parent,</div><div class='add'>+			      const struct intel_scu_ipc_data *scu_data,</div><div class='add'>+			      struct module *owner);</div><div class='add'>+</div><div class='add'>+#define devm_intel_scu_ipc_register(parent, scu_data)  \</div><div class='add'>+	__devm_intel_scu_ipc_register(parent, scu_data, THIS_MODULE)</div><div class='add'>+</div><div class='add'>+struct intel_scu_ipc_dev *intel_scu_ipc_dev_get(void);</div><div class='add'>+void intel_scu_ipc_dev_put(struct intel_scu_ipc_dev *scu);</div><div class='add'>+struct intel_scu_ipc_dev *devm_intel_scu_ipc_dev_get(struct device *dev);</div><div class='add'>+</div><div class='add'>+int intel_scu_ipc_dev_ioread8(struct intel_scu_ipc_dev *scu, u16 addr,</div><div class='add'>+			      u8 *data);</div><div class='add'>+int intel_scu_ipc_dev_iowrite8(struct intel_scu_ipc_dev *scu, u16 addr,</div><div class='add'>+			       u8 data);</div><div class='add'>+int intel_scu_ipc_dev_readv(struct intel_scu_ipc_dev *scu, u16 *addr,</div><div class='add'>+			    u8 *data, size_t len);</div><div class='add'>+int intel_scu_ipc_dev_writev(struct intel_scu_ipc_dev *scu, u16 *addr,</div><div class='add'>+			     u8 *data, size_t len);</div><div class='add'>+</div><div class='add'>+int intel_scu_ipc_dev_update(struct intel_scu_ipc_dev *scu, u16 addr,</div><div class='add'>+			     u8 data, u8 mask);</div><div class='add'>+</div><div class='add'>+int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd,</div><div class='add'>+				     int sub);</div><div class='add'>+int intel_scu_ipc_dev_command_with_size(struct intel_scu_ipc_dev *scu, int cmd,</div><div class='add'>+					int sub, const void *in, size_t inlen,</div><div class='add'>+					size_t size, void *out, size_t outlen);</div><div class='add'>+</div><div class='add'>+static inline int intel_scu_ipc_dev_command(struct intel_scu_ipc_dev *scu, int cmd,</div><div class='add'>+					    int sub, const void *in, size_t inlen,</div><div class='add'>+					    void *out, size_t outlen)</div><div class='add'>+{</div><div class='add'>+	return intel_scu_ipc_dev_command_with_size(scu, cmd, sub, in, inlen,</div><div class='add'>+						   inlen, out, outlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/platform_data/x86/pmc_atom.h b/include/linux/platform_data/x86/pmc_atom.h<br/>index b8a701c77fd0..161e4bc1c9ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/pmc_atom.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/pmc_atom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/pmc_atom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/pmc_atom.h</a></div><div class='hunk'>@@ -43,6 +43,19 @@</div><div class='ctx'> 				BIT_ORED_DEDICATED_IRQ_GPSC | \</div><div class='ctx'> 				BIT_SHARED_IRQ_GPSS)</div><div class='ctx'> </div><div class='add'>+/* External clk generator settings */</div><div class='add'>+#define PMC_CLK_CTL_OFFSET		0x60</div><div class='add'>+#define PMC_CLK_CTL_SIZE		4</div><div class='add'>+#define PMC_CLK_NUM			6</div><div class='add'>+#define PMC_CLK_CTL_GATED_ON_D3		0x0</div><div class='add'>+#define PMC_CLK_CTL_FORCE_ON		0x1</div><div class='add'>+#define PMC_CLK_CTL_FORCE_OFF		0x2</div><div class='add'>+#define PMC_CLK_CTL_RESERVED		0x3</div><div class='add'>+#define PMC_MASK_CLK_CTL		GENMASK(1, 0)</div><div class='add'>+#define PMC_MASK_CLK_FREQ		BIT(2)</div><div class='add'>+#define PMC_CLK_FREQ_XTAL		(0 &lt;&lt; 2)	/* 25 MHz */</div><div class='add'>+#define PMC_CLK_FREQ_PLL		(1 &lt;&lt; 2)	/* 19.2 MHz */</div><div class='add'>+</div><div class='ctx'> /* The timers accumulate time spent in sleep state */</div><div class='ctx'> #define	PMC_S0IR_TMR		0x80</div><div class='ctx'> #define	PMC_S0I1_TMR		0x84</div><div class='hunk'>@@ -104,14 +117,14 @@</div><div class='ctx'> #define	BIT_SCC_SDIO		BIT(9)</div><div class='ctx'> #define	BIT_SCC_SDCARD		BIT(10)</div><div class='ctx'> #define	BIT_SCC_MIPI		BIT(11)</div><div class='del'>-#define	BIT_HDA			BIT(12)</div><div class='add'>+#define	BIT_HDA			BIT(12) /* CHT datasheet: reserved */</div><div class='ctx'> #define	BIT_LPE			BIT(13)</div><div class='ctx'> #define	BIT_OTG			BIT(14)</div><div class='del'>-#define	BIT_USH			BIT(15)</div><div class='del'>-#define	BIT_GBE			BIT(16)</div><div class='del'>-#define	BIT_SATA		BIT(17)</div><div class='del'>-#define	BIT_USB_EHCI		BIT(18)</div><div class='del'>-#define	BIT_SEC			BIT(19)</div><div class='add'>+#define	BIT_USH			BIT(15) /* CHT datasheet: reserved */</div><div class='add'>+#define	BIT_GBE			BIT(16) /* CHT datasheet: reserved */</div><div class='add'>+#define	BIT_SATA		BIT(17) /* CHT datasheet: reserved */</div><div class='add'>+#define	BIT_USB_EHCI		BIT(18) /* CHT datasheet: XHCI!    */</div><div class='add'>+#define	BIT_SEC			BIT(19) /* BYT datasheet: reserved */</div><div class='ctx'> #define	BIT_PCIE_PORT0		BIT(20)</div><div class='ctx'> #define	BIT_PCIE_PORT1		BIT(21)</div><div class='ctx'> #define	BIT_PCIE_PORT2		BIT(22)</div><div class='head'>diff --git a/include/linux/platform_data/x86/pwm-lpss.h b/include/linux/platform_data/x86/pwm-lpss.h<br/>index 752c06b47cc8..f0349edb47f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/pwm-lpss.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/pwm-lpss.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/pwm-lpss.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/pwm-lpss.h</a></div><div class='hunk'>@@ -15,9 +15,36 @@ struct pwm_lpss_boardinfo {</div><div class='ctx'> 	unsigned int npwm;</div><div class='ctx'> 	unsigned long base_unit_bits;</div><div class='ctx'> 	/*</div><div class='del'>-	 * Some versions of the IP may stuck in the state machine if enable</div><div class='del'>-	 * bit is not set, and hence update bit will show busy status till</div><div class='del'>-	 * the reset. For the rest it may be otherwise.</div><div class='add'>+	 * NOTE:</div><div class='add'>+	 * Intel Broxton, Apollo Lake, and Gemini Lake have different programming flow.</div><div class='add'>+	 *</div><div class='add'>+	 * Initial Enable or First Activation</div><div class='add'>+	 * 1. Program the base unit and on time divisor values.</div><div class='add'>+	 * 2. Set the software update bit.</div><div class='add'>+	 * 3. Poll in a loop on the PWMCTRL bit until software update bit is cleared.+</div><div class='add'>+	 * 4. Enable the PWM output by setting PWM Enable.</div><div class='add'>+	 * 5. Repeat the above steps for the next PWM Module.</div><div class='add'>+	 *</div><div class='add'>+	 * Dynamic update while PWM is Enabled</div><div class='add'>+	 * 1. Program the base unit and on-time divisor values.</div><div class='add'>+	 * 2. Set the software update bit.</div><div class='add'>+	 * 3. Repeat the above steps for the next PWM module.</div><div class='add'>+	 *</div><div class='add'>+	 * + After setting PWMCTRL register's SW update bit, hardware automatically</div><div class='add'>+	 * deasserts the SW update bit after a brief delay. It was observed that</div><div class='add'>+	 * setting of PWM enable is typically done via read-modify-write of the PWMCTRL</div><div class='add'>+	 * register. If there is no/little delay between setting software update bit</div><div class='add'>+	 * and setting enable bit via read-modify-write, it is possible that the read</div><div class='add'>+	 * could return with software enable as 1. In that case, the last write to set</div><div class='add'>+	 * enable to 1 could also set sw_update to 1. If this happens, sw_update gets</div><div class='add'>+	 * stuck and the driver code can hang as it explicitly waits for sw_update bit</div><div class='add'>+	 * to be 0 after setting the enable bit to 1. To avoid this race condition,</div><div class='add'>+	 * SW should poll on the software update bit to make sure that it is 0 before</div><div class='add'>+	 * doing the read-modify-write to set the enable bit to 1.</div><div class='add'>+	 *</div><div class='add'>+	 * Also, we noted that if sw_update bit was set in step #1 above then when it</div><div class='add'>+	 * is set again in step #2, sw_update bit never gets cleared and the flow hangs.</div><div class='add'>+	 * As such, we need to make sure that sw_update bit is 0 when doing step #1.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool bypass;</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h<br/>index a5705189e2ac..f981907a5cb0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/soc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/x86/soc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/x86/soc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_data/x86/soc.h</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> static inline bool soc_intel_is_##soc(void)			\</div><div class='ctx'> {								\</div><div class='ctx'> 	static const struct x86_cpu_id soc##_cpu_ids[] = {	\</div><div class='del'>-		X86_MATCH_INTEL_FAM6_MODEL(type, NULL),		\</div><div class='add'>+		X86_MATCH_VFM(type, NULL),			\</div><div class='ctx'> 		{}						\</div><div class='ctx'> 	};							\</div><div class='ctx'> 	const struct x86_cpu_id *id;				\</div><div class='hunk'>@@ -31,11 +31,11 @@ static inline bool soc_intel_is_##soc(void)			\</div><div class='ctx'> 	return false;						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT);</div><div class='del'>-SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT);</div><div class='del'>-SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT);</div><div class='del'>-SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS);</div><div class='del'>-SOC_INTEL_IS_CPU(cml, KABYLAKE_L);</div><div class='add'>+SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT);</div><div class='add'>+SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT);</div><div class='add'>+SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT);</div><div class='add'>+SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS);</div><div class='add'>+SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L);</div><div class='ctx'> </div><div class='ctx'> #undef SOC_INTEL_IS_CPU</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/platform_data/zforce_ts.h b/include/linux/platform_data/zforce_ts.h<br/>deleted file mode 100644<br/>index 2463a4a856a6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_data/zforce_ts.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_data/zforce_ts.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/* drivers/input/touchscreen/zforce.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2012-2013 MundoReader S.L.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_INPUT_ZFORCE_TS_H</div><div class='del'>-#define _LINUX_INPUT_ZFORCE_TS_H</div><div class='del'>-</div><div class='del'>-struct zforce_ts_platdata {</div><div class='del'>-	unsigned int x_max;</div><div class='del'>-	unsigned int y_max;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_INPUT_ZFORCE_TS_H */</div><div class='head'>diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h<br/>index 7a41c72c1959..813da101b5bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_device.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_device.h</a></div><div class='hunk'>@@ -52,7 +52,7 @@ struct platform_device {</div><div class='ctx'> extern int platform_device_register(struct platform_device *);</div><div class='ctx'> extern void platform_device_unregister(struct platform_device *);</div><div class='ctx'> </div><div class='del'>-extern struct bus_type platform_bus_type;</div><div class='add'>+extern const struct bus_type platform_bus_type;</div><div class='ctx'> extern struct device platform_bus;</div><div class='ctx'> </div><div class='ctx'> extern struct resource *platform_get_resource(struct platform_device *,</div><div class='hunk'>@@ -80,7 +80,7 @@ static inline void __iomem *</div><div class='ctx'> devm_platform_get_and_ioremap_resource(struct platform_device *pdev,</div><div class='ctx'> 				unsigned int index, struct resource **res)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='add'>+	return IOMEM_ERR_PTR(-EINVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -88,20 +88,22 @@ static inline void __iomem *</div><div class='ctx'> devm_platform_ioremap_resource(struct platform_device *pdev,</div><div class='ctx'> 			       unsigned int index)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='add'>+	return IOMEM_ERR_PTR(-EINVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void __iomem *</div><div class='ctx'> devm_platform_ioremap_resource_byname(struct platform_device *pdev,</div><div class='ctx'> 				      const char *name)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='add'>+	return IOMEM_ERR_PTR(-EINVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern int platform_get_irq(struct platform_device *, unsigned int);</div><div class='ctx'> extern int platform_get_irq_optional(struct platform_device *, unsigned int);</div><div class='add'>+extern int platform_get_irq_affinity(struct platform_device *, unsigned int,</div><div class='add'>+				     const struct cpumask **);</div><div class='ctx'> extern int platform_irq_count(struct platform_device *);</div><div class='ctx'> extern int devm_platform_get_irqs_affinity(struct platform_device *dev,</div><div class='ctx'> 					   struct irq_affinity *affd,</div><div class='hunk'>@@ -232,21 +234,11 @@ extern int platform_device_add_data(struct platform_device *pdev,</div><div class='ctx'> extern int platform_device_add(struct platform_device *pdev);</div><div class='ctx'> extern void platform_device_del(struct platform_device *pdev);</div><div class='ctx'> extern void platform_device_put(struct platform_device *pdev);</div><div class='add'>+DEFINE_FREE(platform_device_put, struct platform_device *, if (_T) platform_device_put(_T))</div><div class='ctx'> </div><div class='ctx'> struct platform_driver {</div><div class='ctx'> 	int (*probe)(struct platform_device *);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Traditionally the remove callback returned an int which however is</div><div class='del'>-	 * ignored by the driver core. This led to wrong expectations by driver</div><div class='del'>-	 * authors who thought returning an error code was a valid error</div><div class='del'>-	 * handling strategy. To convert to a callback returning void, new</div><div class='del'>-	 * drivers should implement .remove_new() until the conversion it done</div><div class='del'>-	 * that eventually makes .remove() return void.</div><div class='del'>-	 */</div><div class='del'>-	int (*remove)(struct platform_device *);</div><div class='del'>-	void (*remove_new)(struct platform_device *);</div><div class='del'>-</div><div class='add'>+	void (*remove)(struct platform_device *);</div><div class='ctx'> 	void (*shutdown)(struct platform_device *);</div><div class='ctx'> 	int (*suspend)(struct platform_device *, pm_message_t state);</div><div class='ctx'> 	int (*resume)(struct platform_device *);</div><div class='head'>diff --git a/include/linux/platform_profile.h b/include/linux/platform_profile.h<br/>index e5cbb6841f3a..855b28340e95 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/platform_profile.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/platform_profile.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/platform_profile.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/platform_profile.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #ifndef _PLATFORM_PROFILE_H_</div><div class='ctx'> #define _PLATFORM_PROFILE_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -23,19 +24,38 @@ enum platform_profile_option {</div><div class='ctx'> 	PLATFORM_PROFILE_BALANCED,</div><div class='ctx'> 	PLATFORM_PROFILE_BALANCED_PERFORMANCE,</div><div class='ctx'> 	PLATFORM_PROFILE_PERFORMANCE,</div><div class='add'>+	PLATFORM_PROFILE_MAX_POWER,</div><div class='add'>+	PLATFORM_PROFILE_CUSTOM,</div><div class='ctx'> 	PLATFORM_PROFILE_LAST, /*must always be last */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct platform_profile_handler {</div><div class='del'>-	unsigned long choices[BITS_TO_LONGS(PLATFORM_PROFILE_LAST)];</div><div class='del'>-	int (*profile_get)(struct platform_profile_handler *pprof,</div><div class='del'>-				enum platform_profile_option *profile);</div><div class='del'>-	int (*profile_set)(struct platform_profile_handler *pprof,</div><div class='del'>-				enum platform_profile_option profile);</div><div class='add'>+/**</div><div class='add'>+ * struct platform_profile_ops - platform profile operations</div><div class='add'>+ * @probe: Callback to setup choices available to the new class device. These</div><div class='add'>+ *	   choices will only be enforced when setting a new profile, not when</div><div class='add'>+ *	   getting the current one.</div><div class='add'>+ * @hidden_choices: Callback to setup choices that are not visible to the user</div><div class='add'>+ *		    but can be set by the driver.</div><div class='add'>+ * @profile_get: Callback that will be called when showing the current platform</div><div class='add'>+ *		 profile in sysfs.</div><div class='add'>+ * @profile_set: Callback that will be called when storing a new platform</div><div class='add'>+ *		 profile in sysfs.</div><div class='add'>+ */</div><div class='add'>+struct platform_profile_ops {</div><div class='add'>+	int (*probe)(void *drvdata, unsigned long *choices);</div><div class='add'>+	int (*hidden_choices)(void *drvdata, unsigned long *choices);</div><div class='add'>+	int (*profile_get)(struct device *dev, enum platform_profile_option *profile);</div><div class='add'>+	int (*profile_set)(struct device *dev, enum platform_profile_option profile);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int platform_profile_register(struct platform_profile_handler *pprof);</div><div class='del'>-int platform_profile_remove(void);</div><div class='del'>-void platform_profile_notify(void);</div><div class='add'>+struct device *platform_profile_register(struct device *dev, const char *name,</div><div class='add'>+					 void *drvdata,</div><div class='add'>+					 const struct platform_profile_ops *ops);</div><div class='add'>+void platform_profile_remove(struct device *dev);</div><div class='add'>+struct device *devm_platform_profile_register(struct device *dev, const char *name,</div><div class='add'>+					      void *drvdata,</div><div class='add'>+					      const struct platform_profile_ops *ops);</div><div class='add'>+int platform_profile_cycle(void);</div><div class='add'>+void platform_profile_notify(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> #endif  /*_PLATFORM_PROFILE_H_*/</div><div class='head'>diff --git a/include/linux/pldmfw.h b/include/linux/pldmfw.h<br/>index 0fc831338226..f5047983004f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pldmfw.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pldmfw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pldmfw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pldmfw.h</a></div><div class='hunk'>@@ -125,9 +125,17 @@ struct pldmfw_ops;</div><div class='ctx'>  * a pointer to their own data, used to implement the device specific</div><div class='ctx'>  * operations.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+enum pldmfw_update_mode {</div><div class='add'>+	PLDMFW_UPDATE_MODE_FULL,</div><div class='add'>+	PLDMFW_UPDATE_MODE_SINGLE_COMPONENT,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct pldmfw {</div><div class='ctx'> 	const struct pldmfw_ops *ops;</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	u16 component_identifier;</div><div class='add'>+	enum pldmfw_update_mode mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> bool pldmfw_op_pci_match_record(struct pldmfw *context, struct pldmfw_record *record);</div><div class='head'>diff --git a/include/linux/pm.h b/include/linux/pm.h<br/>index 97b0e23363c8..98a899858ece 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pm.h</a></div><div class='hunk'>@@ -8,14 +8,15 @@</div><div class='ctx'> #ifndef _LINUX_PM_H</div><div class='ctx'> #define _LINUX_PM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer_types.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/util_macros.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/hrtimer.h&gt;</div><div class='del'>-#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/workqueue_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Callbacks for platform drivers to implement.</div><div class='hunk'>@@ -24,11 +25,12 @@ extern void (*pm_power_off)(void);</div><div class='ctx'> </div><div class='ctx'> struct device; /* we have a circular dep with device.h */</div><div class='ctx'> #ifdef CONFIG_VT_CONSOLE_SLEEP</div><div class='del'>-extern void pm_vt_switch_required(struct device *dev, bool required);</div><div class='add'>+extern int pm_vt_switch_required(struct device *dev, bool required);</div><div class='ctx'> extern void pm_vt_switch_unregister(struct device *dev);</div><div class='ctx'> #else</div><div class='del'>-static inline void pm_vt_switch_required(struct device *dev, bool required)</div><div class='add'>+static inline int pm_vt_switch_required(struct device *dev, bool required)</div><div class='ctx'> {</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline void pm_vt_switch_unregister(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -384,12 +386,8 @@ const struct dev_pm_ops name = { \</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> #define _EXPORT_DEV_PM_OPS(name, license, ns)		_EXPORT_PM_OPS(name, license, ns)</div><div class='del'>-#define EXPORT_PM_FN_GPL(name)				EXPORT_SYMBOL_GPL(name)</div><div class='del'>-#define EXPORT_PM_FN_NS_GPL(name, ns)			EXPORT_SYMBOL_NS_GPL(name, ns)</div><div class='ctx'> #else</div><div class='ctx'> #define _EXPORT_DEV_PM_OPS(name, license, ns)		_DISCARD_PM_OPS(name, license, ns)</div><div class='del'>-#define EXPORT_PM_FN_GPL(name)</div><div class='del'>-#define EXPORT_PM_FN_NS_GPL(name, ns)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='hunk'>@@ -510,6 +508,7 @@ const struct dev_pm_ops name = { \</div><div class='ctx'>  * RECOVER	Creation of a hibernation image or restoration of the main</div><div class='ctx'>  *		memory contents from a hibernation image has failed, call</div><div class='ctx'>  *		-&gt;thaw() and -&gt;complete() for all devices.</div><div class='add'>+ * POWEROFF	System will poweroff, call -&gt;poweroff() for all devices.</div><div class='ctx'>  *</div><div class='ctx'>  * The following PM_EVENT_ messages are defined for internal use by</div><div class='ctx'>  * kernel subsystems.  They are never issued by the PM core.</div><div class='hunk'>@@ -540,6 +539,7 @@ const struct dev_pm_ops name = { \</div><div class='ctx'> #define PM_EVENT_USER		0x0100</div><div class='ctx'> #define PM_EVENT_REMOTE		0x0200</div><div class='ctx'> #define PM_EVENT_AUTO		0x0400</div><div class='add'>+#define PM_EVENT_POWEROFF	0x0800</div><div class='ctx'> </div><div class='ctx'> #define PM_EVENT_SLEEP		(PM_EVENT_SUSPEND | PM_EVENT_HIBERNATE)</div><div class='ctx'> #define PM_EVENT_USER_SUSPEND	(PM_EVENT_USER | PM_EVENT_SUSPEND)</div><div class='hunk'>@@ -554,6 +554,7 @@ const struct dev_pm_ops name = { \</div><div class='ctx'> #define PMSG_QUIESCE	((struct pm_message){ .event = PM_EVENT_QUIESCE, })</div><div class='ctx'> #define PMSG_SUSPEND	((struct pm_message){ .event = PM_EVENT_SUSPEND, })</div><div class='ctx'> #define PMSG_HIBERNATE	((struct pm_message){ .event = PM_EVENT_HIBERNATE, })</div><div class='add'>+#define PMSG_POWEROFF	((struct pm_message){ .event = PM_EVENT_POWEROFF, })</div><div class='ctx'> #define PMSG_RESUME	((struct pm_message){ .event = PM_EVENT_RESUME, })</div><div class='ctx'> #define PMSG_THAW	((struct pm_message){ .event = PM_EVENT_THAW, })</div><div class='ctx'> #define PMSG_RESTORE	((struct pm_message){ .event = PM_EVENT_RESTORE, })</div><div class='hunk'>@@ -570,7 +571,8 @@ const struct dev_pm_ops name = { \</div><div class='ctx'> 					{ .event = PM_EVENT_AUTO_RESUME, })</div><div class='ctx'> </div><div class='ctx'> #define PMSG_IS_AUTO(msg)	(((msg).event &amp; PM_EVENT_AUTO) != 0)</div><div class='del'>-</div><div class='add'>+#define PMSG_NO_WAKEUP(msg)	(((msg).event &amp; \</div><div class='add'>+				(PM_EVENT_FREEZE | PM_EVENT_QUIESCE)) != 0)</div><div class='ctx'> /*</div><div class='ctx'>  * Device run-time power management status.</div><div class='ctx'>  *</div><div class='hunk'>@@ -600,6 +602,7 @@ enum rpm_status {</div><div class='ctx'> 	RPM_RESUMING,</div><div class='ctx'> 	RPM_SUSPENDED,</div><div class='ctx'> 	RPM_SUSPENDING,</div><div class='add'>+	RPM_BLOCKED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -681,9 +684,12 @@ struct dev_pm_info {</div><div class='ctx'> 	bool			wakeup_path:1;</div><div class='ctx'> 	bool			syscore:1;</div><div class='ctx'> 	bool			no_pm_callbacks:1;	/* Owned by the PM core */</div><div class='del'>-	bool			async_in_progress:1;	/* Owned by the PM core */</div><div class='add'>+	bool			work_in_progress:1;	/* Owned by the PM core */</div><div class='add'>+	bool			smart_suspend:1;	/* Owned by the PM core */</div><div class='ctx'> 	bool			must_resume:1;		/* Owned by the PM core */</div><div class='ctx'> 	bool			may_skip_resume:1;	/* Set by subsystems */</div><div class='add'>+	bool			out_band_wakeup:1;</div><div class='add'>+	bool			strict_midlayer:1;</div><div class='ctx'> #else</div><div class='ctx'> 	bool			should_wakeup:1;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -721,6 +727,7 @@ struct dev_pm_info {</div><div class='ctx'> 	struct pm_subsys_data	*subsys_data;  /* Owned by the subsystem. */</div><div class='ctx'> 	void (*set_latency_tolerance)(struct device *, s32);</div><div class='ctx'> 	struct dev_pm_qos	*qos;</div><div class='add'>+	bool			detach_power_off:1;	/* Owned by the driver core */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int dev_pm_get_subsys_data(struct device *dev);</div><div class='hunk'>@@ -840,10 +847,8 @@ extern int pm_generic_resume_early(struct device *dev);</div><div class='ctx'> extern int pm_generic_resume_noirq(struct device *dev);</div><div class='ctx'> extern int pm_generic_resume(struct device *dev);</div><div class='ctx'> extern int pm_generic_freeze_noirq(struct device *dev);</div><div class='del'>-extern int pm_generic_freeze_late(struct device *dev);</div><div class='ctx'> extern int pm_generic_freeze(struct device *dev);</div><div class='ctx'> extern int pm_generic_thaw_noirq(struct device *dev);</div><div class='del'>-extern int pm_generic_thaw_early(struct device *dev);</div><div class='ctx'> extern int pm_generic_thaw(struct device *dev);</div><div class='ctx'> extern int pm_generic_restore_noirq(struct device *dev);</div><div class='ctx'> extern int pm_generic_restore_early(struct device *dev);</div><div class='hunk'>@@ -885,10 +890,8 @@ static inline void dpm_for_each_dev(void *data, void (*fn)(struct device *, void</div><div class='ctx'> #define pm_generic_resume_noirq		NULL</div><div class='ctx'> #define pm_generic_resume		NULL</div><div class='ctx'> #define pm_generic_freeze_noirq		NULL</div><div class='del'>-#define pm_generic_freeze_late		NULL</div><div class='ctx'> #define pm_generic_freeze		NULL</div><div class='ctx'> #define pm_generic_thaw_noirq		NULL</div><div class='del'>-#define pm_generic_thaw_early		NULL</div><div class='ctx'> #define pm_generic_thaw			NULL</div><div class='ctx'> #define pm_generic_restore_noirq	NULL</div><div class='ctx'> #define pm_generic_restore_early	NULL</div><div class='head'>diff --git a/include/linux/pm_clock.h b/include/linux/pm_clock.h<br/>index 68669ce18720..c3b46fa358d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pm_clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pm_clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pm_clock.h</a></div><div class='hunk'>@@ -41,9 +41,7 @@ extern int pm_clk_create(struct device *dev);</div><div class='ctx'> extern void pm_clk_destroy(struct device *dev);</div><div class='ctx'> extern int pm_clk_add(struct device *dev, const char *con_id);</div><div class='ctx'> extern int pm_clk_add_clk(struct device *dev, struct clk *clk);</div><div class='del'>-extern int of_pm_clk_add_clk(struct device *dev, const char *name);</div><div class='ctx'> extern int of_pm_clk_add_clks(struct device *dev);</div><div class='del'>-extern void pm_clk_remove(struct device *dev, const char *con_id);</div><div class='ctx'> extern void pm_clk_remove_clk(struct device *dev, struct clk *clk);</div><div class='ctx'> extern int pm_clk_suspend(struct device *dev);</div><div class='ctx'> extern int pm_clk_resume(struct device *dev);</div><div class='hunk'>@@ -76,9 +74,6 @@ static inline int of_pm_clk_add_clks(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-static inline void pm_clk_remove(struct device *dev, const char *con_id)</div><div class='del'>-{</div><div class='del'>-}</div><div class='ctx'> #define pm_clk_suspend	NULL</div><div class='ctx'> #define pm_clk_resume	NULL</div><div class='ctx'> static inline void pm_clk_remove_clk(struct device *dev, struct clk *clk)</div><div class='head'>diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h<br/>index 772d3280d35f..93ba0143ca47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pm_domain.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_domain.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pm_domain.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pm_domain.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> #include &lt;linux/time64.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -30,9 +30,22 @@</div><div class='ctx'>  *				supplier and its PM domain when creating the</div><div class='ctx'>  *				device-links.</div><div class='ctx'>  *</div><div class='add'>+ * PD_FLAG_REQUIRED_OPP:	Assign required_devs for the required OPPs. The</div><div class='add'>+ *				index of the required OPP must correspond to the</div><div class='add'>+ *				index in the array of the pd_names. If pd_names</div><div class='add'>+ *				isn't specified, the index just follows the</div><div class='add'>+ *				index for the attached PM domain.</div><div class='add'>+ *</div><div class='add'>+ * PD_FLAG_ATTACH_POWER_ON:	Power on the domain during attach.</div><div class='add'>+ *</div><div class='add'>+ * PD_FLAG_DETACH_POWER_OFF:	Power off the domain during detach.</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> #define PD_FLAG_NO_DEV_LINK		BIT(0)</div><div class='ctx'> #define PD_FLAG_DEV_LINK_ON		BIT(1)</div><div class='add'>+#define PD_FLAG_REQUIRED_OPP		BIT(2)</div><div class='add'>+#define PD_FLAG_ATTACH_POWER_ON		BIT(3)</div><div class='add'>+#define PD_FLAG_DETACH_POWER_OFF	BIT(4)</div><div class='ctx'> </div><div class='ctx'> struct dev_pm_domain_attach_data {</div><div class='ctx'> 	const char * const *pd_names;</div><div class='hunk'>@@ -43,6 +56,7 @@ struct dev_pm_domain_attach_data {</div><div class='ctx'> struct dev_pm_domain_list {</div><div class='ctx'> 	struct device **pd_devs;</div><div class='ctx'> 	struct device_link **pd_links;</div><div class='add'>+	u32 *opp_tokens;</div><div class='ctx'> 	u32 num_pds;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -92,6 +106,21 @@ struct dev_pm_domain_list {</div><div class='ctx'>  * GENPD_FLAG_OPP_TABLE_FW:	The genpd provider supports performance states,</div><div class='ctx'>  *				but its corresponding OPP tables are not</div><div class='ctx'>  *				described in DT, but are given directly by FW.</div><div class='add'>+ *</div><div class='add'>+ * GENPD_FLAG_DEV_NAME_FW:	Instructs genpd to generate an unique device name</div><div class='add'>+ *				using ida. It is used by genpd providers which</div><div class='add'>+ *				get their genpd-names directly from FW.</div><div class='add'>+ *</div><div class='add'>+ * GENPD_FLAG_NO_SYNC_STATE:	The -&gt;sync_state() support is implemented in a</div><div class='add'>+ *				genpd provider specific way, likely through a</div><div class='add'>+ *				parent device node. This flag makes genpd to</div><div class='add'>+ *				skip its internal support for this.</div><div class='add'>+ *</div><div class='add'>+ * GENPD_FLAG_NO_STAY_ON:	For genpd OF providers a powered-on PM domain at</div><div class='add'>+ *				initialization is prevented from being</div><div class='add'>+ *				powered-off until the -&gt;sync_state() callback is</div><div class='add'>+ *				invoked. This flag informs genpd to allow a</div><div class='add'>+ *				power-off without waiting for -&gt;sync_state().</div><div class='ctx'>  */</div><div class='ctx'> #define GENPD_FLAG_PM_CLK	 (1U &lt;&lt; 0)</div><div class='ctx'> #define GENPD_FLAG_IRQ_SAFE	 (1U &lt;&lt; 1)</div><div class='hunk'>@@ -101,6 +130,9 @@ struct dev_pm_domain_list {</div><div class='ctx'> #define GENPD_FLAG_RPM_ALWAYS_ON (1U &lt;&lt; 5)</div><div class='ctx'> #define GENPD_FLAG_MIN_RESIDENCY (1U &lt;&lt; 6)</div><div class='ctx'> #define GENPD_FLAG_OPP_TABLE_FW	 (1U &lt;&lt; 7)</div><div class='add'>+#define GENPD_FLAG_DEV_NAME_FW	 (1U &lt;&lt; 8)</div><div class='add'>+#define GENPD_FLAG_NO_SYNC_STATE (1U &lt;&lt; 9)</div><div class='add'>+#define GENPD_FLAG_NO_STAY_ON	 (1U &lt;&lt; 10)</div><div class='ctx'> </div><div class='ctx'> enum gpd_status {</div><div class='ctx'> 	GENPD_STATE_ON = 0,	/* PM domain is on */</div><div class='hunk'>@@ -114,7 +146,14 @@ enum genpd_notication {</div><div class='ctx'> 	GENPD_NOTIFY_ON,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum genpd_sync_state {</div><div class='add'>+	GENPD_SYNC_STATE_OFF = 0,</div><div class='add'>+	GENPD_SYNC_STATE_SIMPLE,</div><div class='add'>+	GENPD_SYNC_STATE_ONECELL,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dev_power_governor {</div><div class='add'>+	bool (*system_power_down_ok)(struct dev_pm_domain *domain);</div><div class='ctx'> 	bool (*power_down_ok)(struct dev_pm_domain *domain);</div><div class='ctx'> 	bool (*suspend_ok)(struct device *dev);</div><div class='ctx'> };</div><div class='hunk'>@@ -129,16 +168,21 @@ struct genpd_governor_data {</div><div class='ctx'> 	bool max_off_time_changed;</div><div class='ctx'> 	ktime_t next_wakeup;</div><div class='ctx'> 	ktime_t next_hrtimer;</div><div class='add'>+	ktime_t last_enter;</div><div class='add'>+	bool reflect_residency;</div><div class='ctx'> 	bool cached_power_down_ok;</div><div class='ctx'> 	bool cached_power_down_state_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct genpd_power_state {</div><div class='add'>+	const char *name;</div><div class='ctx'> 	s64 power_off_latency_ns;</div><div class='ctx'> 	s64 power_on_latency_ns;</div><div class='ctx'> 	s64 residency_ns;</div><div class='ctx'> 	u64 usage;</div><div class='ctx'> 	u64 rejected;</div><div class='add'>+	u64 above;</div><div class='add'>+	u64 below;</div><div class='ctx'> 	struct fwnode_handle *fwnode;</div><div class='ctx'> 	u64 idle_time;</div><div class='ctx'> 	void *data;</div><div class='hunk'>@@ -163,11 +207,14 @@ struct generic_pm_domain {</div><div class='ctx'> 	atomic_t sd_count;	/* Number of subdomains with power "on" */</div><div class='ctx'> 	enum gpd_status status;	/* Current state of the domain */</div><div class='ctx'> 	unsigned int device_count;	/* Number of devices */</div><div class='add'>+	unsigned int device_id;		/* unique device id */</div><div class='ctx'> 	unsigned int suspended_count;	/* System suspend device counter */</div><div class='ctx'> 	unsigned int prepared_count;	/* Suspend counter of prepared devices */</div><div class='ctx'> 	unsigned int performance_state;	/* Aggregated max performance state */</div><div class='ctx'> 	cpumask_var_t cpus;		/* A cpumask of the attached CPUs */</div><div class='ctx'> 	bool synced_poweroff;		/* A consumer needs a synced poweroff */</div><div class='add'>+	bool stay_on;			/* Stay powered-on during boot. */</div><div class='add'>+	enum genpd_sync_state sync_state; /* How sync_state is managed. */</div><div class='ctx'> 	int (*power_off)(struct generic_pm_domain *domain);</div><div class='ctx'> 	int (*power_on)(struct generic_pm_domain *domain);</div><div class='ctx'> 	struct raw_notifier_head power_notifiers; /* Power on/off notifiers */</div><div class='hunk'>@@ -175,6 +222,10 @@ struct generic_pm_domain {</div><div class='ctx'> 	int (*set_performance_state)(struct generic_pm_domain *genpd,</div><div class='ctx'> 				     unsigned int state);</div><div class='ctx'> 	struct gpd_dev_ops dev_ops;</div><div class='add'>+	int (*set_hwmode_dev)(struct generic_pm_domain *domain,</div><div class='add'>+			      struct device *dev, bool enable);</div><div class='add'>+	bool (*get_hwmode_dev)(struct generic_pm_domain *domain,</div><div class='add'>+			      struct device *dev);</div><div class='ctx'> 	int (*attach_dev)(struct generic_pm_domain *domain,</div><div class='ctx'> 			  struct device *dev);</div><div class='ctx'> 	void (*detach_dev)(struct generic_pm_domain *domain,</div><div class='hunk'>@@ -194,8 +245,11 @@ struct generic_pm_domain {</div><div class='ctx'> 			spinlock_t slock;</div><div class='ctx'> 			unsigned long lock_flags;</div><div class='ctx'> 		};</div><div class='add'>+		struct {</div><div class='add'>+			raw_spinlock_t raw_slock;</div><div class='add'>+			unsigned long raw_lock_flags;</div><div class='add'>+		};</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd)</div><div class='hunk'>@@ -237,6 +291,9 @@ struct generic_pm_domain_data {</div><div class='ctx'> 	unsigned int performance_state;</div><div class='ctx'> 	unsigned int default_pstate;</div><div class='ctx'> 	unsigned int rpm_pstate;</div><div class='add'>+	unsigned int opp_token;</div><div class='add'>+	bool hw_mode;</div><div class='add'>+	bool rpm_always_on;</div><div class='ctx'> 	void *data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -260,12 +317,19 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,</div><div class='ctx'> int pm_genpd_init(struct generic_pm_domain *genpd,</div><div class='ctx'> 		  struct dev_power_governor *gov, bool is_off);</div><div class='ctx'> int pm_genpd_remove(struct generic_pm_domain *genpd);</div><div class='add'>+void pm_genpd_inc_rejected(struct generic_pm_domain *genpd,</div><div class='add'>+			   unsigned int state_idx);</div><div class='add'>+struct device *dev_to_genpd_dev(struct device *dev);</div><div class='ctx'> int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state);</div><div class='ctx'> int dev_pm_genpd_add_notifier(struct device *dev, struct notifier_block *nb);</div><div class='ctx'> int dev_pm_genpd_remove_notifier(struct device *dev);</div><div class='ctx'> void dev_pm_genpd_set_next_wakeup(struct device *dev, ktime_t next);</div><div class='ctx'> ktime_t dev_pm_genpd_get_next_hrtimer(struct device *dev);</div><div class='ctx'> void dev_pm_genpd_synced_poweroff(struct device *dev);</div><div class='add'>+int dev_pm_genpd_set_hwmode(struct device *dev, bool enable);</div><div class='add'>+bool dev_pm_genpd_get_hwmode(struct device *dev);</div><div class='add'>+int dev_pm_genpd_rpm_always_on(struct device *dev, bool on);</div><div class='add'>+bool dev_pm_genpd_is_on(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> extern struct dev_power_governor simple_qos_governor;</div><div class='ctx'> extern struct dev_power_governor pm_domain_always_on_gov;</div><div class='hunk'>@@ -307,6 +371,15 @@ static inline int pm_genpd_remove(struct generic_pm_domain *genpd)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void pm_genpd_inc_rejected(struct generic_pm_domain *genpd,</div><div class='add'>+					 unsigned int state_idx)</div><div class='add'>+{ }</div><div class='add'>+</div><div class='add'>+static inline struct device *dev_to_genpd_dev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int dev_pm_genpd_set_performance_state(struct device *dev,</div><div class='ctx'> 						     unsigned int state)</div><div class='ctx'> {</div><div class='hunk'>@@ -334,6 +407,26 @@ static inline ktime_t dev_pm_genpd_get_next_hrtimer(struct device *dev)</div><div class='ctx'> static inline void dev_pm_genpd_synced_poweroff(struct device *dev)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='add'>+static inline int dev_pm_genpd_set_hwmode(struct device *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dev_pm_genpd_get_hwmode(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int dev_pm_genpd_rpm_always_on(struct device *dev, bool on)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dev_pm_genpd_is_on(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define simple_qos_governor		(*(struct dev_power_governor *)(NULL))</div><div class='ctx'> #define pm_domain_always_on_gov		(*(struct dev_power_governor *)(NULL))</div><div class='ctx'> #endif</div><div class='hunk'>@@ -372,6 +465,7 @@ int of_genpd_remove_subdomain(const struct of_phandle_args *parent_spec,</div><div class='ctx'> struct generic_pm_domain *of_genpd_remove_last(struct device_node *np);</div><div class='ctx'> int of_genpd_parse_idle_states(struct device_node *dn,</div><div class='ctx'> 			       struct genpd_power_state **states, int *n);</div><div class='add'>+void of_genpd_sync_state(struct device_node *np);</div><div class='ctx'> </div><div class='ctx'> int genpd_dev_pm_attach(struct device *dev);</div><div class='ctx'> struct device *genpd_dev_pm_attach_by_id(struct device *dev,</div><div class='hunk'>@@ -417,6 +511,8 @@ static inline int of_genpd_parse_idle_states(struct device_node *dn,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void of_genpd_sync_state(struct device_node *np) {}</div><div class='add'>+</div><div class='ctx'> static inline int genpd_dev_pm_attach(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -442,7 +538,7 @@ struct generic_pm_domain *of_genpd_remove_last(struct device_node *np)</div><div class='ctx'> #endif /* CONFIG_PM_GENERIC_DOMAINS_OF */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-int dev_pm_domain_attach(struct device *dev, bool power_on);</div><div class='add'>+int dev_pm_domain_attach(struct device *dev, u32 flags);</div><div class='ctx'> struct device *dev_pm_domain_attach_by_id(struct device *dev,</div><div class='ctx'> 					  unsigned int index);</div><div class='ctx'> struct device *dev_pm_domain_attach_by_name(struct device *dev,</div><div class='hunk'>@@ -450,13 +546,16 @@ struct device *dev_pm_domain_attach_by_name(struct device *dev,</div><div class='ctx'> int dev_pm_domain_attach_list(struct device *dev,</div><div class='ctx'> 			      const struct dev_pm_domain_attach_data *data,</div><div class='ctx'> 			      struct dev_pm_domain_list **list);</div><div class='add'>+int devm_pm_domain_attach_list(struct device *dev,</div><div class='add'>+			       const struct dev_pm_domain_attach_data *data,</div><div class='add'>+			       struct dev_pm_domain_list **list);</div><div class='ctx'> void dev_pm_domain_detach(struct device *dev, bool power_off);</div><div class='ctx'> void dev_pm_domain_detach_list(struct dev_pm_domain_list *list);</div><div class='ctx'> int dev_pm_domain_start(struct device *dev);</div><div class='ctx'> void dev_pm_domain_set(struct device *dev, struct dev_pm_domain *pd);</div><div class='ctx'> int dev_pm_domain_set_performance_state(struct device *dev, unsigned int state);</div><div class='ctx'> #else</div><div class='del'>-static inline int dev_pm_domain_attach(struct device *dev, bool power_on)</div><div class='add'>+static inline int dev_pm_domain_attach(struct device *dev, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -476,6 +575,14 @@ static inline int dev_pm_domain_attach_list(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int devm_pm_domain_attach_list(struct device *dev,</div><div class='add'>+					     const struct dev_pm_domain_attach_data *data,</div><div class='add'>+					     struct dev_pm_domain_list **list)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void dev_pm_domain_detach(struct device *dev, bool power_off) {}</div><div class='ctx'> static inline void dev_pm_domain_detach_list(struct dev_pm_domain_list *list) {}</div><div class='ctx'> static inline int dev_pm_domain_start(struct device *dev)</div><div class='head'>diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h<br/>index 065a47382302..789406d95e69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pm_opp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_opp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pm_opp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pm_opp.h</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #ifndef __LINUX_OPP_H__</div><div class='ctx'> #define __LINUX_OPP_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/energy_model.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='hunk'>@@ -62,11 +63,8 @@ typedef int (*config_clks_t)(struct device *dev, struct opp_table *opp_table,</div><div class='ctx'>  * @supported_hw: Array of hierarchy of versions to match.</div><div class='ctx'>  * @supported_hw_count: Number of elements in the array.</div><div class='ctx'>  * @regulator_names: Array of pointers to the names of the regulator, NULL terminated.</div><div class='del'>- * @genpd_names: Null terminated array of pointers containing names of genpd to</div><div class='del'>- *		attach. Mutually exclusive with required_devs.</div><div class='del'>- * @virt_devs: Pointer to return the array of genpd virtual devices. Mutually</div><div class='del'>- *		exclusive with required_devs.</div><div class='del'>- * @required_devs: Required OPP devices. Mutually exclusive with genpd_names/virt_devs.</div><div class='add'>+ * @required_dev: The required OPP device.</div><div class='add'>+ * @required_dev_index: The index of the required OPP for the @required_dev.</div><div class='ctx'>  *</div><div class='ctx'>  * This structure contains platform specific OPP configurations for the device.</div><div class='ctx'>  */</div><div class='hunk'>@@ -79,9 +77,8 @@ struct dev_pm_opp_config {</div><div class='ctx'> 	const unsigned int *supported_hw;</div><div class='ctx'> 	unsigned int supported_hw_count;</div><div class='ctx'> 	const char * const *regulator_names;</div><div class='del'>-	const char * const *genpd_names;</div><div class='del'>-	struct device ***virt_devs;</div><div class='del'>-	struct device **required_devs;</div><div class='add'>+	struct device *required_dev;</div><div class='add'>+	unsigned int required_dev_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define OPP_LEVEL_UNSET			U32_MAX</div><div class='hunk'>@@ -101,11 +98,33 @@ struct dev_pm_opp_data {</div><div class='ctx'> 	unsigned long u_volt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct dev_pm_opp_key - Key used to identify OPP entries</div><div class='add'>+ * @freq:       Frequency in Hz. Use 0 if frequency is not to be matched.</div><div class='add'>+ * @level:      Performance level associated with the OPP entry.</div><div class='add'>+ *              Use OPP_LEVEL_UNSET if level is not to be matched.</div><div class='add'>+ * @bw:         Bandwidth associated with the OPP entry.</div><div class='add'>+ *              Use 0 if bandwidth is not to be matched.</div><div class='add'>+ *</div><div class='add'>+ * This structure is used to uniquely identify an OPP entry based on</div><div class='add'>+ * frequency, performance level, and bandwidth. Each field can be</div><div class='add'>+ * selectively ignored during matching by setting it to its respective</div><div class='add'>+ * NOP value.</div><div class='add'>+ */</div><div class='add'>+struct dev_pm_opp_key {</div><div class='add'>+	unsigned long freq;</div><div class='add'>+	unsigned int level;</div><div class='add'>+	u32 bw;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_PM_OPP)</div><div class='ctx'> </div><div class='ctx'> struct opp_table *dev_pm_opp_get_opp_table(struct device *dev);</div><div class='add'>+struct opp_table *dev_pm_opp_get_opp_table_ref(struct opp_table *opp_table);</div><div class='ctx'> void dev_pm_opp_put_opp_table(struct opp_table *opp_table);</div><div class='ctx'> </div><div class='add'>+unsigned long dev_pm_opp_get_bw(struct dev_pm_opp *opp, bool peak, int index);</div><div class='add'>+</div><div class='ctx'> unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp);</div><div class='ctx'> </div><div class='ctx'> int dev_pm_opp_get_supplies(struct dev_pm_opp *opp, struct dev_pm_opp_supply *supplies);</div><div class='hunk'>@@ -131,6 +150,10 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,</div><div class='ctx'> 					      unsigned long freq,</div><div class='ctx'> 					      bool available);</div><div class='ctx'> </div><div class='add'>+struct dev_pm_opp *dev_pm_opp_find_key_exact(struct device *dev,</div><div class='add'>+					     struct dev_pm_opp_key *key,</div><div class='add'>+					     bool available);</div><div class='add'>+</div><div class='ctx'> struct dev_pm_opp *</div><div class='ctx'> dev_pm_opp_find_freq_exact_indexed(struct device *dev, unsigned long freq,</div><div class='ctx'> 				   u32 index, bool available);</div><div class='hunk'>@@ -162,6 +185,7 @@ struct dev_pm_opp *dev_pm_opp_find_bw_ceil(struct device *dev,</div><div class='ctx'> struct dev_pm_opp *dev_pm_opp_find_bw_floor(struct device *dev,</div><div class='ctx'> 					   unsigned int *bw, int index);</div><div class='ctx'> </div><div class='add'>+struct dev_pm_opp *dev_pm_opp_get(struct dev_pm_opp *opp);</div><div class='ctx'> void dev_pm_opp_put(struct dev_pm_opp *opp);</div><div class='ctx'> </div><div class='ctx'> int dev_pm_opp_add_dynamic(struct device *dev, struct dev_pm_opp_data *opp);</div><div class='hunk'>@@ -196,6 +220,7 @@ int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)</div><div class='ctx'> void dev_pm_opp_remove_table(struct device *dev);</div><div class='ctx'> void dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask);</div><div class='ctx'> int dev_pm_opp_sync_regulators(struct device *dev);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline struct opp_table *dev_pm_opp_get_opp_table(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -207,8 +232,18 @@ static inline struct opp_table *dev_pm_opp_get_opp_table_indexed(struct device *</div><div class='ctx'> 	return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct opp_table *dev_pm_opp_get_opp_table_ref(struct opp_table *opp_table)</div><div class='add'>+{</div><div class='add'>+	return opp_table;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void dev_pm_opp_put_opp_table(struct opp_table *opp_table) {}</div><div class='ctx'> </div><div class='add'>+static inline unsigned long dev_pm_opp_get_bw(struct dev_pm_opp *opp, bool peak, int index)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -277,6 +312,13 @@ static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,</div><div class='ctx'> 	return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct dev_pm_opp *dev_pm_opp_find_key_exact(struct device *dev,</div><div class='add'>+							   struct dev_pm_opp_key *key,</div><div class='add'>+							   bool available)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct dev_pm_opp *</div><div class='ctx'> dev_pm_opp_find_freq_exact_indexed(struct device *dev, unsigned long freq,</div><div class='ctx'> 				   u32 index, bool available)</div><div class='hunk'>@@ -338,6 +380,11 @@ static inline struct dev_pm_opp *dev_pm_opp_find_bw_floor(struct device *dev,</div><div class='ctx'> 	return ERR_PTR(-EOPNOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct dev_pm_opp *dev_pm_opp_get(struct dev_pm_opp *opp)</div><div class='add'>+{</div><div class='add'>+	return opp;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void dev_pm_opp_put(struct dev_pm_opp *opp) {}</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='hunk'>@@ -474,8 +521,11 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpuma</div><div class='ctx'> struct device_node *dev_pm_opp_of_get_opp_desc_node(struct device *dev);</div><div class='ctx'> struct device_node *dev_pm_opp_get_of_node(struct dev_pm_opp *opp);</div><div class='ctx'> int of_get_required_opp_performance_state(struct device_node *np, int index);</div><div class='add'>+bool dev_pm_opp_of_has_required_opp(struct device *dev);</div><div class='ctx'> int dev_pm_opp_of_find_icc_paths(struct device *dev, struct opp_table *opp_table);</div><div class='ctx'> int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus);</div><div class='add'>+int dev_pm_opp_calc_power(struct device *dev, unsigned long *uW,</div><div class='add'>+			  unsigned long *kHz);</div><div class='ctx'> static inline void dev_pm_opp_of_unregister_em(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	em_dev_unregister_perf_domain(dev);</div><div class='hunk'>@@ -539,17 +589,34 @@ static inline void dev_pm_opp_of_unregister_em(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int dev_pm_opp_calc_power(struct device *dev, unsigned long *uW,</div><div class='add'>+					unsigned long *kHz)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int of_get_required_opp_performance_state(struct device_node *np, int index)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool dev_pm_opp_of_has_required_opp(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int dev_pm_opp_of_find_icc_paths(struct device *dev, struct opp_table *opp_table)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Scope based cleanup macro for OPP reference counting */</div><div class='add'>+DEFINE_FREE(put_opp, struct dev_pm_opp *, if (!IS_ERR_OR_NULL(_T)) dev_pm_opp_put(_T))</div><div class='add'>+</div><div class='add'>+/* Scope based cleanup macro for OPP table reference counting */</div><div class='add'>+DEFINE_FREE(put_opp_table, struct opp_table *, if (!IS_ERR_OR_NULL(_T)) dev_pm_opp_put_opp_table(_T))</div><div class='add'>+</div><div class='ctx'> /* OPP Configuration helpers */</div><div class='ctx'> </div><div class='ctx'> static inline int dev_pm_opp_add(struct device *dev, unsigned long freq,</div><div class='hunk'>@@ -661,36 +728,6 @@ static inline void dev_pm_opp_put_config_regulators(int token)</div><div class='ctx'> 	dev_pm_opp_clear_config(token);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* genpd helpers */</div><div class='del'>-static inline int dev_pm_opp_attach_genpd(struct device *dev,</div><div class='del'>-					  const char * const *names,</div><div class='del'>-					  struct device ***virt_devs)</div><div class='del'>-{</div><div class='del'>-	struct dev_pm_opp_config config = {</div><div class='del'>-		.genpd_names = names,</div><div class='del'>-		.virt_devs = virt_devs,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return dev_pm_opp_set_config(dev, &amp;config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dev_pm_opp_detach_genpd(int token)</div><div class='del'>-{</div><div class='del'>-	dev_pm_opp_clear_config(token);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int devm_pm_opp_attach_genpd(struct device *dev,</div><div class='del'>-					   const char * const *names,</div><div class='del'>-					   struct device ***virt_devs)</div><div class='del'>-{</div><div class='del'>-	struct dev_pm_opp_config config = {</div><div class='del'>-		.genpd_names = names,</div><div class='del'>-		.virt_devs = virt_devs,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return devm_pm_opp_set_config(dev, &amp;config);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* prop-name helpers */</div><div class='ctx'> static inline int dev_pm_opp_set_prop_name(struct device *dev, const char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -711,4 +748,14 @@ static inline unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)</div><div class='ctx'> 	return dev_pm_opp_get_freq_indexed(opp, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int dev_pm_opp_set_level(struct device *dev, unsigned int level)</div><div class='add'>+{</div><div class='add'>+	struct dev_pm_opp *opp __free(put_opp) = dev_pm_opp_find_level_exact(dev, level);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(opp))</div><div class='add'>+		return PTR_ERR(opp);</div><div class='add'>+</div><div class='add'>+	return dev_pm_opp_set_opp(dev, opp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif		/* __LINUX_OPP_H__ */</div><div class='head'>diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h<br/>index 4a69d4af3ff8..6cea4455f867 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pm_qos.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_qos.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pm_qos.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pm_qos.h</a></div><div class='hunk'>@@ -162,6 +162,15 @@ static inline void cpu_latency_qos_update_request(struct pm_qos_request *req,</div><div class='ctx'> static inline void cpu_latency_qos_remove_request(struct pm_qos_request *req) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP</div><div class='add'>+s32 cpu_wakeup_latency_qos_limit(void);</div><div class='add'>+#else</div><div class='add'>+static inline s32 cpu_wakeup_latency_qos_limit(void)</div><div class='add'>+{</div><div class='add'>+	return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, s32 mask);</div><div class='ctx'> enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev, s32 mask);</div><div class='head'>diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h<br/>index d39dc863f612..41037c513f06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pm_runtime.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_runtime.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pm_runtime.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pm_runtime.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #define RPM_GET_PUT		0x04	/* Increment/decrement the</div><div class='ctx'> 					    usage_count */</div><div class='ctx'> #define RPM_AUTO		0x08	/* Use autosuspend_delay */</div><div class='add'>+#define RPM_TRANSPARENT	0x10	/* Succeed if runtime PM is disabled */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Use this for defining a set of PM operations to be used in all situations</div><div class='hunk'>@@ -67,7 +68,6 @@ static inline bool queue_pm_work(struct work_struct *work)</div><div class='ctx'> extern int pm_generic_runtime_suspend(struct device *dev);</div><div class='ctx'> extern int pm_generic_runtime_resume(struct device *dev);</div><div class='ctx'> extern int pm_runtime_force_suspend(struct device *dev);</div><div class='del'>-extern int pm_runtime_force_resume(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> extern int __pm_runtime_idle(struct device *dev, int rpmflags);</div><div class='ctx'> extern int __pm_runtime_suspend(struct device *dev, int rpmflags);</div><div class='hunk'>@@ -76,7 +76,9 @@ extern int pm_runtime_get_if_active(struct device *dev);</div><div class='ctx'> extern int pm_runtime_get_if_in_use(struct device *dev);</div><div class='ctx'> extern int pm_schedule_suspend(struct device *dev, unsigned int delay);</div><div class='ctx'> extern int __pm_runtime_set_status(struct device *dev, unsigned int status);</div><div class='del'>-extern int pm_runtime_barrier(struct device *dev);</div><div class='add'>+extern void pm_runtime_barrier(struct device *dev);</div><div class='add'>+extern bool pm_runtime_block_if_disabled(struct device *dev);</div><div class='add'>+extern void pm_runtime_unblock(struct device *dev);</div><div class='ctx'> extern void pm_runtime_enable(struct device *dev);</div><div class='ctx'> extern void __pm_runtime_disable(struct device *dev, bool check_resume);</div><div class='ctx'> extern void pm_runtime_allow(struct device *dev);</div><div class='hunk'>@@ -93,7 +95,9 @@ extern void pm_runtime_new_link(struct device *dev);</div><div class='ctx'> extern void pm_runtime_drop_link(struct device_link *link);</div><div class='ctx'> extern void pm_runtime_release_supplier(struct device_link *link);</div><div class='ctx'> </div><div class='add'>+int devm_pm_runtime_set_active_enabled(struct device *dev);</div><div class='ctx'> extern int devm_pm_runtime_enable(struct device *dev);</div><div class='add'>+int devm_pm_runtime_get_noresume(struct device *dev);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pm_suspend_ignore_children - Set runtime PM behavior regarding children.</div><div class='hunk'>@@ -197,6 +201,17 @@ static inline bool pm_runtime_enabled(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pm_runtime_blocked - Check if runtime PM enabling is blocked.</div><div class='add'>+ * @dev: Target device.</div><div class='add'>+ *</div><div class='add'>+ * Do not call this function outside system suspend/resume code paths.</div><div class='add'>+ */</div><div class='add'>+static inline bool pm_runtime_blocked(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;power.last_status == RPM_BLOCKED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pm_runtime_has_no_callbacks - Check if runtime PM callbacks may be present.</div><div class='ctx'>  * @dev: Target device.</div><div class='ctx'>  *</div><div class='hunk'>@@ -242,7 +257,6 @@ static inline bool queue_pm_work(struct work_struct *work) { return false; }</div><div class='ctx'> static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }</div><div class='ctx'> static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }</div><div class='ctx'> static inline int pm_runtime_force_suspend(struct device *dev) { return 0; }</div><div class='del'>-static inline int pm_runtime_force_resume(struct device *dev) { return 0; }</div><div class='ctx'> </div><div class='ctx'> static inline int __pm_runtime_idle(struct device *dev, int rpmflags)</div><div class='ctx'> {</div><div class='hunk'>@@ -270,13 +284,18 @@ static inline int pm_runtime_get_if_active(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> static inline int __pm_runtime_set_status(struct device *dev,</div><div class='ctx'> 					    unsigned int status) { return 0; }</div><div class='del'>-static inline int pm_runtime_barrier(struct device *dev) { return 0; }</div><div class='add'>+static inline void pm_runtime_barrier(struct device *dev) {}</div><div class='add'>+static inline bool pm_runtime_block_if_disabled(struct device *dev) { return true; }</div><div class='add'>+static inline void pm_runtime_unblock(struct device *dev) {}</div><div class='ctx'> static inline void pm_runtime_enable(struct device *dev) {}</div><div class='ctx'> static inline void __pm_runtime_disable(struct device *dev, bool c) {}</div><div class='add'>+static inline bool pm_runtime_blocked(struct device *dev) { return true; }</div><div class='ctx'> static inline void pm_runtime_allow(struct device *dev) {}</div><div class='ctx'> static inline void pm_runtime_forbid(struct device *dev) {}</div><div class='ctx'> </div><div class='add'>+static inline int devm_pm_runtime_set_active_enabled(struct device *dev) { return 0; }</div><div class='ctx'> static inline int devm_pm_runtime_enable(struct device *dev) { return 0; }</div><div class='add'>+static inline int devm_pm_runtime_get_noresume(struct device *dev) { return 0; }</div><div class='ctx'> </div><div class='ctx'> static inline void pm_suspend_ignore_children(struct device *dev, bool enable) {}</div><div class='ctx'> static inline void pm_runtime_get_noresume(struct device *dev) {}</div><div class='hunk'>@@ -308,6 +327,18 @@ static inline void pm_runtime_release_supplier(struct device_link *link) {}</div><div class='ctx'> </div><div class='ctx'> #endif /* !CONFIG_PM */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+</div><div class='add'>+bool pm_runtime_need_not_resume(struct device *dev);</div><div class='add'>+int pm_runtime_force_resume(struct device *dev);</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static inline bool pm_runtime_need_not_resume(struct device *dev) {return true; }</div><div class='add'>+static inline int pm_runtime_force_resume(struct device *dev) { return -ENXIO; }</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pm_runtime_idle - Conditionally set up autosuspend of a device or suspend it.</div><div class='ctx'>  * @dev: Target device.</div><div class='hunk'>@@ -315,6 +346,19 @@ static inline void pm_runtime_release_supplier(struct device_link *link) {}</div><div class='ctx'>  * Invoke the "idle check" callback of @dev and, depending on its return value,</div><div class='ctx'>  * set up autosuspend of @dev or suspend it (depending on whether or not</div><div class='ctx'>  * autosuspend has been enabled for it).</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter non-zero, Runtime PM status change</div><div class='add'>+ *            ongoing or device not in %RPM_ACTIVE state.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -EINPROGRESS: Suspend already in progress.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='add'>+ * Other values and conditions for the above values are possible as returned by</div><div class='add'>+ * Runtime PM idle and suspend callbacks.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_idle(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -324,6 +368,19 @@ static inline int pm_runtime_idle(struct device *dev)</div><div class='ctx'> /**</div><div class='ctx'>  * pm_runtime_suspend - Suspend a device synchronously.</div><div class='ctx'>  * @dev: Target device.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success; device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter non-zero or Runtime PM status change</div><div class='add'>+ *            ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='add'>+ * Other values and conditions for the above values are possible as returned by</div><div class='add'>+ * Runtime PM suspend callbacks.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -331,14 +388,30 @@ static inline int pm_runtime_suspend(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pm_runtime_autosuspend - Set up autosuspend of a device or suspend it.</div><div class='add'>+ * pm_runtime_autosuspend - Update the last access time and set up autosuspend</div><div class='add'>+ * of a device.</div><div class='ctx'>  * @dev: Target device.</div><div class='ctx'>  *</div><div class='del'>- * Set up autosuspend of @dev or suspend it (depending on whether or not</div><div class='del'>- * autosuspend is enabled for it) without engaging its "idle check" callback.</div><div class='add'>+ * First update the last access time, then set up autosuspend of @dev or suspend</div><div class='add'>+ * it (depending on whether or not autosuspend is enabled for it) without</div><div class='add'>+ * engaging its "idle check" callback.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success; device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter non-zero or Runtime PM status change</div><div class='add'>+ *            ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='add'>+ * Other values and conditions for the above values are possible as returned by</div><div class='add'>+ * Runtime PM suspend callbacks.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_autosuspend(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	pm_runtime_mark_last_busy(dev);</div><div class='ctx'> 	return __pm_runtime_suspend(dev, RPM_AUTO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -357,6 +430,17 @@ static inline int pm_runtime_resume(struct device *dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Queue up a work item to run an equivalent of pm_runtime_idle() for @dev</div><div class='ctx'>  * asynchronously.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter non-zero, Runtime PM status change</div><div class='add'>+ *            ongoing or device not in %RPM_ACTIVE state.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -EINPROGRESS: Suspend already in progress.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_request_idle(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -373,14 +457,28 @@ static inline int pm_request_resume(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pm_request_autosuspend - Queue up autosuspend of a device.</div><div class='add'>+ * pm_request_autosuspend - Update the last access time and queue up autosuspend</div><div class='add'>+ * of a device.</div><div class='ctx'>  * @dev: Target device.</div><div class='ctx'>  *</div><div class='del'>- * Queue up a work item to run an equivalent pm_runtime_autosuspend() for @dev</div><div class='del'>- * asynchronously.</div><div class='add'>+ * Update the last access time of a device and queue up a work item to run an</div><div class='add'>+ * equivalent pm_runtime_autosuspend() for @dev asynchronously.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success; device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter non-zero or Runtime PM status change</div><div class='add'>+ *            ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -EINPROGRESS: Suspend already in progress.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_request_autosuspend(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	pm_runtime_mark_last_busy(dev);</div><div class='ctx'> 	return __pm_runtime_suspend(dev, RPM_ASYNC | RPM_AUTO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -415,6 +513,19 @@ static inline int pm_runtime_get_sync(struct device *dev)</div><div class='ctx'> 	return __pm_runtime_resume(dev, RPM_GET_PUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int pm_runtime_get_active(struct device *dev, int rpmflags)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = __pm_runtime_resume(dev, RPM_GET_PUT | rpmflags);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pm_runtime_put_noidle(dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pm_runtime_resume_and_get - Bump up usage counter of a device and resume it.</div><div class='ctx'>  * @dev: Target device.</div><div class='hunk'>@@ -425,15 +536,7 @@ static inline int pm_runtime_get_sync(struct device *dev)</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_resume_and_get(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = __pm_runtime_resume(dev, RPM_GET_PUT);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		pm_runtime_put_noidle(dev);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return pm_runtime_get_active(dev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -442,6 +545,18 @@ static inline int pm_runtime_resume_and_get(struct device *dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Decrement the runtime PM usage counter of @dev and if it turns out to be</div><div class='ctx'>  * equal to 0, queue up a work item for @dev like in pm_request_idle().</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success. Usage counter dropped to zero, but device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter became non-zero or Runtime PM status</div><div class='add'>+ *            change ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -EINPROGRESS: Suspend already in progress.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_put(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -454,6 +569,18 @@ static inline int pm_runtime_put(struct device *dev)</div><div class='ctx'>  *</div><div class='ctx'>  * Decrement the runtime PM usage counter of @dev and if it turns out to be</div><div class='ctx'>  * equal to 0, queue up a work item for @dev like in pm_request_autosuspend().</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success. Usage counter dropped to zero, but device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter became non-zero or Runtime PM status</div><div class='add'>+ *            change ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -EINPROGRESS: Suspend already in progress.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='ctx'>  */</div><div class='ctx'> static inline int __pm_runtime_put_autosuspend(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -461,18 +588,79 @@ static inline int __pm_runtime_put_autosuspend(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pm_runtime_put_autosuspend - Drop device usage counter and queue autosuspend if 0.</div><div class='add'>+ * pm_runtime_put_autosuspend - Update the last access time of a device, drop</div><div class='add'>+ * its usage counter and queue autosuspend if the usage counter becomes 0.</div><div class='ctx'>  * @dev: Target device.</div><div class='ctx'>  *</div><div class='del'>- * Decrement the runtime PM usage counter of @dev and if it turns out to be</div><div class='del'>- * equal to 0, queue up a work item for @dev like in pm_request_autosuspend().</div><div class='add'>+ * Update the last access time of @dev, decrement runtime PM usage counter of</div><div class='add'>+ * @dev and if it turns out to be equal to 0, queue up a work item for @dev like</div><div class='add'>+ * in pm_request_autosuspend().</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success. Usage counter dropped to zero, but device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter became non-zero or Runtime PM status</div><div class='add'>+ *            change ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -EINPROGRESS: Suspend already in progress.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_put_autosuspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return __pm_runtime_suspend(dev,</div><div class='del'>-	    RPM_GET_PUT | RPM_ASYNC | RPM_AUTO);</div><div class='add'>+	pm_runtime_mark_last_busy(dev);</div><div class='add'>+	return __pm_runtime_put_autosuspend(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_GUARD(pm_runtime_noresume, struct device *,</div><div class='add'>+	     pm_runtime_get_noresume(_T), pm_runtime_put_noidle(_T));</div><div class='add'>+</div><div class='add'>+DEFINE_GUARD(pm_runtime_active, struct device *,</div><div class='add'>+	     pm_runtime_get_sync(_T), pm_runtime_put(_T));</div><div class='add'>+DEFINE_GUARD(pm_runtime_active_auto, struct device *,</div><div class='add'>+	     pm_runtime_get_sync(_T), pm_runtime_put_autosuspend(_T));</div><div class='add'>+/*</div><div class='add'>+ * Use the following guards with ACQUIRE()/ACQUIRE_ERR().</div><div class='add'>+ *</div><div class='add'>+ * The difference between the "_try" and "_try_enabled" variants is that the</div><div class='add'>+ * former do not produce an error when runtime PM is disabled for the given</div><div class='add'>+ * device.</div><div class='add'>+ */</div><div class='add'>+DEFINE_GUARD_COND(pm_runtime_active, _try,</div><div class='add'>+		  pm_runtime_get_active(_T, RPM_TRANSPARENT), _RET == 0)</div><div class='add'>+DEFINE_GUARD_COND(pm_runtime_active, _try_enabled,</div><div class='add'>+		  pm_runtime_resume_and_get(_T), _RET == 0)</div><div class='add'>+DEFINE_GUARD_COND(pm_runtime_active_auto, _try,</div><div class='add'>+		  pm_runtime_get_active(_T, RPM_TRANSPARENT), _RET == 0)</div><div class='add'>+DEFINE_GUARD_COND(pm_runtime_active_auto, _try_enabled,</div><div class='add'>+		  pm_runtime_resume_and_get(_T), _RET == 0)</div><div class='add'>+</div><div class='add'>+/* ACQUIRE() wrapper macros for the guards defined above. */</div><div class='add'>+</div><div class='add'>+#define PM_RUNTIME_ACQUIRE(_dev, _var)			\</div><div class='add'>+	ACQUIRE(pm_runtime_active_try, _var)(_dev)</div><div class='add'>+</div><div class='add'>+#define PM_RUNTIME_ACQUIRE_AUTOSUSPEND(_dev, _var)	\</div><div class='add'>+	ACQUIRE(pm_runtime_active_auto_try, _var)(_dev)</div><div class='add'>+</div><div class='add'>+#define PM_RUNTIME_ACQUIRE_IF_ENABLED(_dev, _var)	\</div><div class='add'>+	ACQUIRE(pm_runtime_active_try_enabled, _var)(_dev)</div><div class='add'>+</div><div class='add'>+#define PM_RUNTIME_ACQUIRE_IF_ENABLED_AUTOSUSPEND(_dev, _var)	\</div><div class='add'>+	ACQUIRE(pm_runtime_active_auto_try_enabled, _var)(_dev)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ACQUIRE_ERR() wrapper macro for guard pm_runtime_active.</div><div class='add'>+ *</div><div class='add'>+ * Always check PM_RUNTIME_ACQUIRE_ERR() after using one of the</div><div class='add'>+ * PM_RUNTIME_ACQUIRE*() macros defined above (yes, it can be used with</div><div class='add'>+ * any of them) and if it is nonzero, avoid accessing the given device.</div><div class='add'>+ */</div><div class='add'>+#define PM_RUNTIME_ACQUIRE_ERR(_var_ptr)	\</div><div class='add'>+	ACQUIRE_ERR(pm_runtime_active, _var_ptr)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * pm_runtime_put_sync - Drop device usage counter and run "idle check" if 0.</div><div class='ctx'>  * @dev: Target device.</div><div class='hunk'>@@ -482,9 +670,21 @@ static inline int pm_runtime_put_autosuspend(struct device *dev)</div><div class='ctx'>  * return value, set up autosuspend of @dev or suspend it (depending on whether</div><div class='ctx'>  * or not autosuspend has been enabled for it).</div><div class='ctx'>  *</div><div class='del'>- * The possible return values of this function are the same as for</div><div class='del'>- * pm_runtime_idle() and the runtime PM usage counter of @dev remains</div><div class='del'>- * decremented in all cases, even if it returns an error code.</div><div class='add'>+ * The runtime PM usage counter of @dev remains decremented in all cases, even</div><div class='add'>+ * if it returns an error code.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success. Usage counter dropped to zero, but device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter became non-zero or Runtime PM status</div><div class='add'>+ *            change ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='add'>+ * Other values and conditions for the above values are possible as returned by</div><div class='add'>+ * Runtime PM suspend callbacks.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_put_sync(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -498,9 +698,21 @@ static inline int pm_runtime_put_sync(struct device *dev)</div><div class='ctx'>  * Decrement the runtime PM usage counter of @dev and if it turns out to be</div><div class='ctx'>  * equal to 0, carry out runtime-suspend of @dev synchronously.</div><div class='ctx'>  *</div><div class='del'>- * The possible return values of this function are the same as for</div><div class='del'>- * pm_runtime_suspend() and the runtime PM usage counter of @dev remains</div><div class='del'>- * decremented in all cases, even if it returns an error code.</div><div class='add'>+ * The runtime PM usage counter of @dev remains decremented in all cases, even</div><div class='add'>+ * if it returns an error code.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success. Usage counter dropped to zero, but device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter became non-zero or Runtime PM status</div><div class='add'>+ *            change ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='add'>+ * Other values and conditions for the above values are possible as returned by</div><div class='add'>+ * Runtime PM suspend callbacks.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_put_sync_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -508,19 +720,35 @@ static inline int pm_runtime_put_sync_suspend(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pm_runtime_put_sync_autosuspend - Drop device usage counter and autosuspend if 0.</div><div class='add'>+ * pm_runtime_put_sync_autosuspend - Update the last access time of a device,</div><div class='add'>+ * drop device usage counter and autosuspend if 0.</div><div class='ctx'>  * @dev: Target device.</div><div class='ctx'>  *</div><div class='del'>- * Decrement the runtime PM usage counter of @dev and if it turns out to be</div><div class='del'>- * equal to 0, set up autosuspend of @dev or suspend it synchronously (depending</div><div class='del'>- * on whether or not autosuspend has been enabled for it).</div><div class='del'>- *</div><div class='del'>- * The possible return values of this function are the same as for</div><div class='del'>- * pm_runtime_autosuspend() and the runtime PM usage counter of @dev remains</div><div class='del'>- * decremented in all cases, even if it returns an error code.</div><div class='add'>+ * Update the last access time of @dev, decrement the runtime PM usage counter</div><div class='add'>+ * of @dev and if it turns out to be equal to 0, set up autosuspend of @dev or</div><div class='add'>+ * suspend it synchronously (depending on whether or not autosuspend has been</div><div class='add'>+ * enabled for it).</div><div class='add'>+ *</div><div class='add'>+ * The runtime PM usage counter of @dev remains decremented in all cases, even</div><div class='add'>+ * if it returns an error code.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * 1: Success. Usage counter dropped to zero, but device was already suspended.</div><div class='add'>+ * * 0: Success.</div><div class='add'>+ * * -EINVAL: Runtime PM error.</div><div class='add'>+ * * -EACCES: Runtime PM disabled.</div><div class='add'>+ * * -EAGAIN: Runtime PM usage counter became non-zero or Runtime PM status</div><div class='add'>+ *            change ongoing.</div><div class='add'>+ * * -EBUSY: Runtime PM child_count non-zero.</div><div class='add'>+ * * -EPERM: Device PM QoS resume latency 0.</div><div class='add'>+ * * -EINPROGRESS: Suspend already in progress.</div><div class='add'>+ * * -ENOSYS: CONFIG_PM not enabled.</div><div class='add'>+ * Other values and conditions for the above values are possible as returned by</div><div class='add'>+ * Runtime PM suspend callbacks.</div><div class='ctx'>  */</div><div class='ctx'> static inline int pm_runtime_put_sync_autosuspend(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	pm_runtime_mark_last_busy(dev);</div><div class='ctx'> 	return __pm_runtime_suspend(dev, RPM_GET_PUT | RPM_AUTO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -556,11 +784,18 @@ static inline int pm_runtime_set_suspended(struct device *dev)</div><div class='ctx'>  * pm_runtime_disable - Disable runtime PM for a device.</div><div class='ctx'>  * @dev: Target device.</div><div class='ctx'>  *</div><div class='del'>- * Prevent the runtime PM framework from working with @dev (by incrementing its</div><div class='del'>- * "blocking" counter).</div><div class='add'>+ * Prevent the runtime PM framework from working with @dev by incrementing its</div><div class='add'>+ * "disable" counter.</div><div class='add'>+ *</div><div class='add'>+ * If the counter is zero when this function runs and there is a pending runtime</div><div class='add'>+ * resume request for @dev, it will be resumed.  If the counter is still zero at</div><div class='add'>+ * that point, all of the pending runtime PM requests for @dev will be canceled</div><div class='add'>+ * and all runtime PM operations in progress involving it will be waited for to</div><div class='add'>+ * complete.</div><div class='ctx'>  *</div><div class='del'>- * For each invocation of this function for @dev there must be a matching</div><div class='del'>- * pm_runtime_enable() call in order for runtime PM to be enabled for it.</div><div class='add'>+ * For each invocation of this function for @dev, there must be a matching</div><div class='add'>+ * pm_runtime_enable() call, so that runtime PM is eventually enabled for it</div><div class='add'>+ * again.</div><div class='ctx'>  */</div><div class='ctx'> static inline void pm_runtime_disable(struct device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/pm_wakeirq.h b/include/linux/pm_wakeirq.h<br/>index d9642c6cf852..25b63ed51b76 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pm_wakeirq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_wakeirq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pm_wakeirq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pm_wakeirq.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@ extern int dev_pm_set_wake_irq(struct device *dev, int irq);</div><div class='ctx'> extern int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq);</div><div class='ctx'> extern int dev_pm_set_dedicated_wake_irq_reverse(struct device *dev, int irq);</div><div class='ctx'> extern void dev_pm_clear_wake_irq(struct device *dev);</div><div class='add'>+extern int devm_pm_set_wake_irq(struct device *dev, int irq);</div><div class='ctx'> </div><div class='ctx'> #else	/* !CONFIG_PM */</div><div class='ctx'> </div><div class='hunk'>@@ -32,5 +33,10 @@ static inline void dev_pm_clear_wake_irq(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int devm_pm_set_wake_irq(struct device *dev, int irq)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* CONFIG_PM */</div><div class='ctx'> #endif	/* _LINUX_PM_WAKEIRQ_H */</div><div class='head'>diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h<br/>index 6eb9adaef52b..41e8f344a205 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pm_wakeup.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pm_wakeup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pm_wakeup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pm_wakeup.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #define _LINUX_PM_WAKEUP_H</div><div class='ctx'> </div><div class='ctx'> #ifndef _DEVICE_H_</div><div class='del'>-# error "please don't include this file directly"</div><div class='add'>+# error "Please do not include this file directly."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -94,11 +94,17 @@ static inline void device_set_wakeup_path(struct device *dev)</div><div class='ctx'> 	dev-&gt;power.wakeup_path = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void device_set_out_band_wakeup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;power.out_band_wakeup = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool device_out_band_wakeup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;power.out_band_wakeup;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* drivers/base/power/wakeup.c */</div><div class='del'>-extern struct wakeup_source *wakeup_source_create(const char *name);</div><div class='del'>-extern void wakeup_source_destroy(struct wakeup_source *ws);</div><div class='del'>-extern void wakeup_source_add(struct wakeup_source *ws);</div><div class='del'>-extern void wakeup_source_remove(struct wakeup_source *ws);</div><div class='ctx'> extern struct wakeup_source *wakeup_source_register(struct device *dev,</div><div class='ctx'> 						    const char *name);</div><div class='ctx'> extern void wakeup_source_unregister(struct wakeup_source *ws);</div><div class='hunk'>@@ -107,7 +113,7 @@ extern void wakeup_sources_read_unlock(int idx);</div><div class='ctx'> extern struct wakeup_source *wakeup_sources_walk_start(void);</div><div class='ctx'> extern struct wakeup_source *wakeup_sources_walk_next(struct wakeup_source *ws);</div><div class='ctx'> extern int device_wakeup_enable(struct device *dev);</div><div class='del'>-extern int device_wakeup_disable(struct device *dev);</div><div class='add'>+extern void device_wakeup_disable(struct device *dev);</div><div class='ctx'> extern void device_set_wakeup_capable(struct device *dev, bool capable);</div><div class='ctx'> extern int device_set_wakeup_enable(struct device *dev, bool enable);</div><div class='ctx'> extern void __pm_stay_awake(struct wakeup_source *ws);</div><div class='hunk'>@@ -129,17 +135,6 @@ static inline bool device_can_wakeup(struct device *dev)</div><div class='ctx'> 	return dev-&gt;power.can_wakeup;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct wakeup_source *wakeup_source_create(const char *name)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void wakeup_source_destroy(struct wakeup_source *ws) {}</div><div class='del'>-</div><div class='del'>-static inline void wakeup_source_add(struct wakeup_source *ws) {}</div><div class='del'>-</div><div class='del'>-static inline void wakeup_source_remove(struct wakeup_source *ws) {}</div><div class='del'>-</div><div class='ctx'> static inline struct wakeup_source *wakeup_source_register(struct device *dev,</div><div class='ctx'> 							   const char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -154,10 +149,9 @@ static inline int device_wakeup_enable(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int device_wakeup_disable(struct device *dev)</div><div class='add'>+static inline void device_wakeup_disable(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;power.should_wakeup = false;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int device_set_wakeup_enable(struct device *dev, bool enable)</div><div class='hunk'>@@ -178,6 +172,13 @@ static inline bool device_wakeup_path(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static inline void device_set_wakeup_path(struct device *dev) {}</div><div class='ctx'> </div><div class='add'>+static inline void device_set_out_band_wakeup(struct device *dev) {}</div><div class='add'>+</div><div class='add'>+static inline bool device_out_band_wakeup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void __pm_stay_awake(struct wakeup_source *ws) {}</div><div class='ctx'> </div><div class='ctx'> static inline void pm_stay_awake(struct device *dev) {}</div><div class='hunk'>@@ -206,17 +207,17 @@ static inline void device_set_awake_path(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static inline void __pm_wakeup_event(struct wakeup_source *ws, unsigned int msec)</div><div class='ctx'> {</div><div class='del'>-	return pm_wakeup_ws_event(ws, msec, false);</div><div class='add'>+	pm_wakeup_ws_event(ws, msec, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pm_wakeup_event(struct device *dev, unsigned int msec)</div><div class='ctx'> {</div><div class='del'>-	return pm_wakeup_dev_event(dev, msec, false);</div><div class='add'>+	pm_wakeup_dev_event(dev, msec, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pm_wakeup_hard_event(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return pm_wakeup_dev_event(dev, 0, true);</div><div class='add'>+	pm_wakeup_dev_event(dev, 0, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -235,11 +236,27 @@ static inline int device_init_wakeup(struct device *dev, bool enable)</div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		device_set_wakeup_capable(dev, true);</div><div class='ctx'> 		return device_wakeup_enable(dev);</div><div class='del'>-	} else {</div><div class='del'>-		device_wakeup_disable(dev);</div><div class='del'>-		device_set_wakeup_capable(dev, false);</div><div class='del'>-		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	device_wakeup_disable(dev);</div><div class='add'>+	device_set_wakeup_capable(dev, false);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_disable_wakeup(void *dev)</div><div class='add'>+{</div><div class='add'>+	device_init_wakeup(dev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_device_init_wakeup - Resource managed device wakeup initialization.</div><div class='add'>+ * @dev: Device to handle.</div><div class='add'>+ *</div><div class='add'>+ * This function is the devm managed version of device_init_wakeup(dev, true).</div><div class='add'>+ */</div><div class='add'>+static inline int devm_device_init_wakeup(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	device_init_wakeup(dev, true);</div><div class='add'>+	return devm_add_action_or_reset(dev, device_disable_wakeup, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_PM_WAKEUP_H */</div><div class='head'>diff --git a/include/linux/pmbus.h b/include/linux/pmbus.h<br/>index fa9f08164c36..884040e1383b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pmbus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pmbus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pmbus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pmbus.h</a></div><div class='hunk'>@@ -73,6 +73,20 @@</div><div class='ctx'>  */</div><div class='ctx'> #define PMBUS_USE_COEFFICIENTS_CMD		BIT(5)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * PMBUS_OP_PROTECTED</div><div class='add'>+ * Set if the chip OPERATION command is protected and protection is not</div><div class='add'>+ * determined by the standard WRITE_PROTECT command.</div><div class='add'>+ */</div><div class='add'>+#define PMBUS_OP_PROTECTED			BIT(6)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PMBUS_VOUT_PROTECTED</div><div class='add'>+ * Set if the chip VOUT_COMMAND command is protected and protection is not</div><div class='add'>+ * determined by the standard WRITE_PROTECT command.</div><div class='add'>+ */</div><div class='add'>+#define PMBUS_VOUT_PROTECTED			BIT(7)</div><div class='add'>+</div><div class='ctx'> struct pmbus_platform_data {</div><div class='ctx'> 	u32 flags;		/* Device specific flags */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/pnp.h b/include/linux/pnp.h<br/>index ddbe7c3ca4ce..23fe3eaf242d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pnp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pnp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pnp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pnp.h</a></div><div class='hunk'>@@ -290,7 +290,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct pnp_fixup {</div><div class='del'>-	char id[7];</div><div class='add'>+	char id[8];</div><div class='ctx'> 	void (*quirk_function) (struct pnp_dev *dev);	/* fixup function */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -383,7 +383,7 @@ struct pnp_driver {</div><div class='ctx'> 	struct device_driver driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define	to_pnp_driver(drv) container_of(drv, struct pnp_driver, driver)</div><div class='add'>+#define	to_pnp_driver(drv) container_of_const(drv, struct pnp_driver, driver)</div><div class='ctx'> </div><div class='ctx'> struct pnp_card_driver {</div><div class='ctx'> 	struct list_head global_list;</div><div class='hunk'>@@ -435,8 +435,6 @@ struct pnp_protocol {</div><div class='ctx'> #define protocol_for_each_dev(protocol, dev)	\</div><div class='ctx'> 	list_for_each_entry(dev, &amp;(protocol)-&gt;devices, protocol_list)</div><div class='ctx'> </div><div class='del'>-extern const struct bus_type pnp_bus_type;</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_PNP)</div><div class='ctx'> </div><div class='ctx'> /* device management */</div><div class='hunk'>@@ -469,6 +467,8 @@ int compare_pnp_id(struct pnp_id *pos, const char *id);</div><div class='ctx'> int pnp_register_driver(struct pnp_driver *drv);</div><div class='ctx'> void pnp_unregister_driver(struct pnp_driver *drv);</div><div class='ctx'> </div><div class='add'>+bool dev_is_pnp(const struct device *dev);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> /* device management */</div><div class='hunk'>@@ -500,6 +500,8 @@ static inline int compare_pnp_id(struct pnp_id *pos, const char *id) { return -E</div><div class='ctx'> static inline int pnp_register_driver(struct pnp_driver *drv) { return -ENODEV; }</div><div class='ctx'> static inline void pnp_unregister_driver(struct pnp_driver *drv) { }</div><div class='ctx'> </div><div class='add'>+static inline bool dev_is_pnp(const struct device *dev) { return false; }</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_PNP */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/poison.h b/include/linux/poison.h<br/>index 1f0ee2459f2a..299e2dd7da6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/poison.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/poison.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/poison.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/poison.h</a></div><div class='hunk'>@@ -38,11 +38,8 @@</div><div class='ctx'>  * Magic nums for obj red zoning.</div><div class='ctx'>  * Placed in the first word before and the first word after an obj.</div><div class='ctx'>  */</div><div class='del'>-#define	RED_INACTIVE	0x09F911029D74E35BULL	/* when obj is inactive */</div><div class='del'>-#define	RED_ACTIVE	0xD84156C5635688C0ULL	/* when obj is active */</div><div class='del'>-</div><div class='del'>-#define SLUB_RED_INACTIVE	0xbb</div><div class='del'>-#define SLUB_RED_ACTIVE		0xcc</div><div class='add'>+#define SLUB_RED_INACTIVE	0xbb	/* when obj is inactive */</div><div class='add'>+#define SLUB_RED_ACTIVE		0xcc	/* when obj is active */</div><div class='ctx'> </div><div class='ctx'> /* ...and for poisoning */</div><div class='ctx'> #define	POISON_INUSE	0x5a	/* for use-uninitialised poisoning */</div><div class='hunk'>@@ -52,12 +49,6 @@</div><div class='ctx'> /********** arch/$ARCH/mm/init.c **********/</div><div class='ctx'> #define POISON_FREE_INITMEM	0xcc</div><div class='ctx'> </div><div class='del'>-/********** arch/ia64/hp/common/sba_iommu.c **********/</div><div class='del'>-/*</div><div class='del'>- * arch/ia64/hp/common/sba_iommu.c uses a 16-byte poison string with a</div><div class='del'>- * value of "SBAIOMMU POISON\0" for spill-over poisoning.</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> /********** fs/jbd/journal.c **********/</div><div class='ctx'> #define JBD_POISON_FREE		0x5b</div><div class='ctx'> #define JBD2_POISON_FREE	0x5c</div><div class='hunk'>@@ -79,6 +70,10 @@</div><div class='ctx'> #define KEY_DESTROY		0xbd</div><div class='ctx'> </div><div class='ctx'> /********** net/core/page_pool.c **********/</div><div class='add'>+/*</div><div class='add'>+ * page_pool uses additional free bits within this value to store data, see the</div><div class='add'>+ * definition of PP_DMA_INDEX_MASK in mm.h</div><div class='add'>+ */</div><div class='ctx'> #define PP_SIGNATURE		(0x40 + POISON_POINTER_DELTA)</div><div class='ctx'> </div><div class='ctx'> /********** net/core/skbuff.c **********/</div><div class='hunk'>@@ -95,4 +90,7 @@</div><div class='ctx'> /********** lib/stackdepot.c **********/</div><div class='ctx'> #define STACK_DEPOT_POISON ((void *)(0xD390 + POISON_POINTER_DELTA))</div><div class='ctx'> </div><div class='add'>+/********** io_uring/ **********/</div><div class='add'>+#define IO_URING_PTR_POISON ((void *)(0x1091UL + POISON_POINTER_DELTA))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/poll.h b/include/linux/poll.h<br/>index d1ea4f3714a8..12bb18e8b978 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/poll.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/poll.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/poll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/poll.h</a></div><div class='hunk'>@@ -25,14 +25,14 @@</div><div class='ctx'> </div><div class='ctx'> struct poll_table_struct;</div><div class='ctx'> </div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * structures and helpers for f_op-&gt;poll implementations</div><div class='ctx'>  */</div><div class='ctx'> typedef void (*poll_queue_proc)(struct file *, wait_queue_head_t *, struct poll_table_struct *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Do not touch the structure directly, use the access functions</div><div class='del'>- * poll_does_not_wait() and poll_requested_events() instead.</div><div class='add'>+ * Do not touch the structure directly, use the access function</div><div class='add'>+ * poll_requested_events() instead.</div><div class='ctx'>  */</div><div class='ctx'> typedef struct poll_table_struct {</div><div class='ctx'> 	poll_queue_proc _qproc;</div><div class='hunk'>@@ -41,18 +41,16 @@ typedef struct poll_table_struct {</div><div class='ctx'> </div><div class='ctx'> static inline void poll_wait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p)</div><div class='ctx'> {</div><div class='del'>-	if (p &amp;&amp; p-&gt;_qproc &amp;&amp; wait_address)</div><div class='add'>+	if (p &amp;&amp; p-&gt;_qproc) {</div><div class='ctx'> 		p-&gt;_qproc(filp, wait_address, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Return true if it is guaranteed that poll will not wait. This is the case</div><div class='del'>- * if the poll() of another file descriptor in the set got an event, so there</div><div class='del'>- * is no need for waiting.</div><div class='del'>- */</div><div class='del'>-static inline bool poll_does_not_wait(const poll_table *p)</div><div class='del'>-{</div><div class='del'>-	return p == NULL || p-&gt;_qproc == NULL;</div><div class='add'>+		/*</div><div class='add'>+		 * This memory barrier is paired in the wq_has_sleeper().</div><div class='add'>+		 * See the comment above prepare_to_wait(), we need to</div><div class='add'>+		 * ensure that subsequent tests in this thread can't be</div><div class='add'>+		 * reordered with __add_wait_queue() in _qproc() paths.</div><div class='add'>+		 */</div><div class='add'>+		smp_mb();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/posix-clock.h b/include/linux/posix-clock.h<br/>index ef8619f48920..a500d3160fe8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/posix-clock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/posix-clock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/posix-clock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/posix-clock.h</a></div><div class='hunk'>@@ -95,10 +95,13 @@ struct posix_clock {</div><div class='ctx'>  * struct posix_clock_context - represents clock file operations context</div><div class='ctx'>  *</div><div class='ctx'>  * @clk:              Pointer to the clock</div><div class='add'>+ * @fp:               Pointer to the file used to open the clock</div><div class='ctx'>  * @private_clkdata:  Pointer to user data</div><div class='ctx'>  *</div><div class='ctx'>  * Drivers should use struct posix_clock_context during specific character</div><div class='del'>- * device file operation methods to access the posix clock.</div><div class='add'>+ * device file operation methods to access the posix clock. In particular,</div><div class='add'>+ * the file pointer can be used to verify correct access mode for ioctl()</div><div class='add'>+ * calls.</div><div class='ctx'>  *</div><div class='ctx'>  * Drivers can store a private data structure during the open operation</div><div class='ctx'>  * if they have specific information that is required in other file</div><div class='hunk'>@@ -106,6 +109,7 @@ struct posix_clock {</div><div class='ctx'>  */</div><div class='ctx'> struct posix_clock_context {</div><div class='ctx'> 	struct posix_clock *clk;</div><div class='add'>+	struct file *fp;</div><div class='ctx'> 	void *private_clkdata;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h<br/>index dc7b738de299..4d3dbcef379e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/posix-timers.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/posix-timers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/posix-timers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/posix-timers.h</a></div><div class='hunk'>@@ -5,12 +5,16 @@</div><div class='ctx'> #include &lt;linux/alarmtimer.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/pid.h&gt;</div><div class='ctx'> #include &lt;linux/posix-timers_types.h&gt;</div><div class='add'>+#include &lt;linux/rcuref.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/timerqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct kernel_siginfo;</div><div class='ctx'> struct task_struct;</div><div class='add'>+struct sigqueue;</div><div class='add'>+struct k_itimer;</div><div class='ctx'> </div><div class='ctx'> static inline clockid_t make_process_cpuclock(const unsigned int pid,</div><div class='ctx'> 		const clockid_t clock)</div><div class='hunk'>@@ -33,8 +37,15 @@ static inline int clockid_to_fd(const clockid_t clk)</div><div class='ctx'> 	return ~(clk &gt;&gt; 3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool clockid_aux_valid(clockid_t id)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_POSIX_AUX_CLOCKS) &amp;&amp; id &gt;= CLOCK_AUX &amp;&amp; id &lt;= CLOCK_AUX_LAST;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_POSIX_TIMERS</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/signal_types.h&gt;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * cpu_timer - Posix CPU timer representation for k_itimer</div><div class='ctx'>  * @node:	timerqueue node to queue in the task/sig</div><div class='hunk'>@@ -42,6 +53,7 @@ static inline int clockid_to_fd(const clockid_t clk)</div><div class='ctx'>  * @pid:	Pointer to target task PID</div><div class='ctx'>  * @elist:	List head for the expiry list</div><div class='ctx'>  * @firing:	Timer is currently firing</div><div class='add'>+ * @nanosleep:	Timer is used for nanosleep and is not a regular posix-timer</div><div class='ctx'>  * @handling:	Pointer to the task which handles expiry</div><div class='ctx'>  */</div><div class='ctx'> struct cpu_timer {</div><div class='hunk'>@@ -49,7 +61,8 @@ struct cpu_timer {</div><div class='ctx'> 	struct timerqueue_head		*head;</div><div class='ctx'> 	struct pid			*pid;</div><div class='ctx'> 	struct list_head		elist;</div><div class='del'>-	int				firing;</div><div class='add'>+	bool				firing;</div><div class='add'>+	bool				nanosleep;</div><div class='ctx'> 	struct task_struct __rcu	*handling;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -101,6 +114,13 @@ static inline void posix_cputimers_rt_watchdog(struct posix_cputimers *pct,</div><div class='ctx'> 	pct-&gt;bases[CPUCLOCK_SCHED].nextevt = runtime;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void posixtimer_rearm_itimer(struct task_struct *p);</div><div class='add'>+bool posixtimer_init_sigqueue(struct sigqueue *q);</div><div class='add'>+void posixtimer_send_sigqueue(struct k_itimer *tmr);</div><div class='add'>+bool posixtimer_deliver_signal(struct kernel_siginfo *info, struct sigqueue *timer_sigq);</div><div class='add'>+void posixtimer_free_timer(struct k_itimer *timer);</div><div class='add'>+long posixtimer_create_prctl(unsigned long ctrl);</div><div class='add'>+</div><div class='ctx'> /* Init task static initializer */</div><div class='ctx'> #define INIT_CPU_TIMERBASE(b) {						\</div><div class='ctx'> 	.nextevt	= U64_MAX,					\</div><div class='hunk'>@@ -122,6 +142,11 @@ struct cpu_timer { };</div><div class='ctx'> static inline void posix_cputimers_init(struct posix_cputimers *pct) { }</div><div class='ctx'> static inline void posix_cputimers_group_init(struct posix_cputimers *pct,</div><div class='ctx'> 					      u64 cpu_limit) { }</div><div class='add'>+static inline void posixtimer_rearm_itimer(struct task_struct *p) { }</div><div class='add'>+static inline bool posixtimer_deliver_signal(struct kernel_siginfo *info,</div><div class='add'>+					     struct sigqueue *timer_sigq) { return false; }</div><div class='add'>+static inline void posixtimer_free_timer(struct k_itimer *timer) { }</div><div class='add'>+static inline long posixtimer_create_prctl(unsigned long ctrl) { return -EINVAL; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_POSIX_CPU_TIMERS_TASK_WORK</div><div class='hunk'>@@ -132,50 +157,59 @@ static inline void clear_posix_cputimers_work(struct task_struct *p) { }</div><div class='ctx'> static inline void posix_cputimers_init_work(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define REQUEUE_PENDING 1</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct k_itimer - POSIX.1b interval timer structure.</div><div class='del'>- * @list:		List head for binding the timer to signals-&gt;posix_timers</div><div class='add'>+ * @list:		List node for binding the timer to tsk::signal::posix_timers</div><div class='add'>+ * @ignored_list:	List node for tracking ignored timers in tsk::signal::ignored_posix_timers</div><div class='ctx'>  * @t_hash:		Entry in the posix timer hash table</div><div class='ctx'>  * @it_lock:		Lock protecting the timer</div><div class='ctx'>  * @kclock:		Pointer to the k_clock struct handling this timer</div><div class='ctx'>  * @it_clock:		The posix timer clock id</div><div class='ctx'>  * @it_id:		The posix timer id for identifying the timer</div><div class='del'>- * @it_active:		Marker that timer is active</div><div class='add'>+ * @it_status:		The status of the timer</div><div class='add'>+ * @it_sig_periodic:	The periodic status at signal delivery</div><div class='ctx'>  * @it_overrun:		The overrun counter for pending signals</div><div class='ctx'>  * @it_overrun_last:	The overrun at the time of the last delivered signal</div><div class='del'>- * @it_requeue_pending:	Indicator that timer waits for being requeued on</div><div class='del'>- *			signal delivery</div><div class='add'>+ * @it_signal_seq:	Sequence count to control signal delivery</div><div class='add'>+ * @it_sigqueue_seq:	The sequence count at the point where the signal was queued</div><div class='ctx'>  * @it_sigev_notify:	The notify word of sigevent struct for signal delivery</div><div class='ctx'>  * @it_interval:	The interval for periodic timers</div><div class='ctx'>  * @it_signal:		Pointer to the creators signal struct</div><div class='ctx'>  * @it_pid:		The pid of the process/task targeted by the signal</div><div class='ctx'>  * @it_process:		The task to wakeup on clock_nanosleep (CPU timers)</div><div class='del'>- * @sigq:		Pointer to preallocated sigqueue</div><div class='add'>+ * @rcuref:		Reference count for life time management</div><div class='add'>+ * @sigq:		Embedded sigqueue</div><div class='ctx'>  * @it:			Union representing the various posix timer type</div><div class='ctx'>  *			internals.</div><div class='ctx'>  * @rcu:		RCU head for freeing the timer.</div><div class='ctx'>  */</div><div class='ctx'> struct k_itimer {</div><div class='del'>-	struct list_head	list;</div><div class='add'>+	/* 1st cacheline contains read-mostly fields */</div><div class='ctx'> 	struct hlist_node	t_hash;</div><div class='del'>-	spinlock_t		it_lock;</div><div class='del'>-	const struct k_clock	*kclock;</div><div class='del'>-	clockid_t		it_clock;</div><div class='add'>+	struct hlist_node	list;</div><div class='ctx'> 	timer_t			it_id;</div><div class='del'>-	int			it_active;</div><div class='add'>+	clockid_t		it_clock;</div><div class='add'>+	int			it_sigev_notify;</div><div class='add'>+	enum pid_type		it_pid_type;</div><div class='add'>+	struct signal_struct	*it_signal;</div><div class='add'>+	const struct k_clock	*kclock;</div><div class='add'>+</div><div class='add'>+	/* 2nd cacheline and above contain fields which are modified regularly */</div><div class='add'>+	spinlock_t		it_lock;</div><div class='add'>+	int			it_status;</div><div class='add'>+	bool			it_sig_periodic;</div><div class='ctx'> 	s64			it_overrun;</div><div class='ctx'> 	s64			it_overrun_last;</div><div class='del'>-	int			it_requeue_pending;</div><div class='del'>-	int			it_sigev_notify;</div><div class='add'>+	unsigned int		it_signal_seq;</div><div class='add'>+	unsigned int		it_sigqueue_seq;</div><div class='ctx'> 	ktime_t			it_interval;</div><div class='del'>-	struct signal_struct	*it_signal;</div><div class='add'>+	struct hlist_node	ignored_list;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct pid		*it_pid;</div><div class='ctx'> 		struct task_struct	*it_process;</div><div class='ctx'> 	};</div><div class='del'>-	struct sigqueue		*sigq;</div><div class='add'>+	struct sigqueue		sigq;</div><div class='add'>+	rcuref_t		rcuref;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct hrtimer	timer;</div><div class='hunk'>@@ -186,7 +220,7 @@ struct k_itimer {</div><div class='ctx'> 		} alarm;</div><div class='ctx'> 	} it;</div><div class='ctx'> 	struct rcu_head		rcu;</div><div class='del'>-};</div><div class='add'>+} ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> void run_posix_cpu_timers(void);</div><div class='ctx'> void posix_cpu_timers_exit(struct task_struct *task);</div><div class='hunk'>@@ -196,5 +230,36 @@ void set_process_cpu_timer(struct task_struct *task, unsigned int clock_idx,</div><div class='ctx'> </div><div class='ctx'> int update_rlimit_cpu(struct task_struct *task, unsigned long rlim_new);</div><div class='ctx'> </div><div class='del'>-void posixtimer_rearm(struct kernel_siginfo *info);</div><div class='add'>+#ifdef CONFIG_POSIX_TIMERS</div><div class='add'>+static inline void posixtimer_putref(struct k_itimer *tmr)</div><div class='add'>+{</div><div class='add'>+	if (rcuref_put(&amp;tmr-&gt;rcuref))</div><div class='add'>+		posixtimer_free_timer(tmr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void posixtimer_sigqueue_getref(struct sigqueue *q)</div><div class='add'>+{</div><div class='add'>+	struct k_itimer *tmr = container_of(q, struct k_itimer, sigq);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!rcuref_get(&amp;tmr-&gt;rcuref));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void posixtimer_sigqueue_putref(struct sigqueue *q)</div><div class='add'>+{</div><div class='add'>+	struct k_itimer *tmr = container_of(q, struct k_itimer, sigq);</div><div class='add'>+</div><div class='add'>+	posixtimer_putref(tmr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool posixtimer_valid(const struct k_itimer *timer)</div><div class='add'>+{</div><div class='add'>+	unsigned long val = (unsigned long)timer-&gt;it_signal;</div><div class='add'>+</div><div class='add'>+	return !(val &amp; 0x1UL);</div><div class='add'>+}</div><div class='add'>+#else  /* CONFIG_POSIX_TIMERS */</div><div class='add'>+static inline void posixtimer_sigqueue_getref(struct sigqueue *q) { }</div><div class='add'>+static inline void posixtimer_sigqueue_putref(struct sigqueue *q) { }</div><div class='add'>+#endif /* !CONFIG_POSIX_TIMERS */</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h<br/>index 0e65b3d634d9..62d497763e25 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/posix_acl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/posix_acl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/posix_acl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/posix_acl.h</a></div><div class='hunk'>@@ -27,11 +27,16 @@ struct posix_acl_entry {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct posix_acl {</div><div class='del'>-	refcount_t		a_refcount;</div><div class='del'>-	struct rcu_head		a_rcu;</div><div class='del'>-	unsigned int		a_count;</div><div class='del'>-	struct posix_acl_entry	a_entries[];</div><div class='add'>+	/* New members MUST be added within the struct_group() macro below. */</div><div class='add'>+	struct_group_tagged(posix_acl_hdr, hdr,</div><div class='add'>+		refcount_t		a_refcount;</div><div class='add'>+		unsigned int		a_count;</div><div class='add'>+		struct rcu_head		a_rcu;</div><div class='add'>+	);</div><div class='add'>+	struct posix_acl_entry	a_entries[] __counted_by(a_count);</div><div class='ctx'> };</div><div class='add'>+static_assert(offsetof(struct posix_acl, a_entries) == sizeof(struct posix_acl_hdr),</div><div class='add'>+	      "struct member likely outside of struct_group_tagged()");</div><div class='ctx'> </div><div class='ctx'> #define FOREACH_ACL_ENTRY(pa, acl, pe) \</div><div class='ctx'> 	for(pa=(acl)-&gt;a_entries, pe=pa+(acl)-&gt;a_count; pa&lt;pe; pa++)</div><div class='hunk'>@@ -62,7 +67,7 @@ posix_acl_release(struct posix_acl *acl)</div><div class='ctx'> /* posix_acl.c */</div><div class='ctx'> </div><div class='ctx'> extern void posix_acl_init(struct posix_acl *, int);</div><div class='del'>-extern struct posix_acl *posix_acl_alloc(int, gfp_t);</div><div class='add'>+extern struct posix_acl *posix_acl_alloc(unsigned int count, gfp_t flags);</div><div class='ctx'> extern struct posix_acl *posix_acl_from_mode(umode_t, gfp_t);</div><div class='ctx'> extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *);</div><div class='ctx'> extern int __posix_acl_create(struct posix_acl **, gfp_t, umode_t *);</div><div class='head'>diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h<br/>index 7d8025fb74b7..d56e1276aafe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/power/bq27xxx_battery.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/power/bq27xxx_battery.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/power/bq27xxx_battery.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/power/bq27xxx_battery.h</a></div><div class='hunk'>@@ -47,21 +47,12 @@ struct bq27xxx_access_methods {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bq27xxx_reg_cache {</div><div class='del'>-	int temperature;</div><div class='del'>-	int time_to_empty;</div><div class='del'>-	int time_to_empty_avg;</div><div class='del'>-	int time_to_full;</div><div class='del'>-	int charge_full;</div><div class='del'>-	int cycle_count;</div><div class='ctx'> 	int capacity;</div><div class='del'>-	int energy;</div><div class='ctx'> 	int flags;</div><div class='del'>-	int health;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bq27xxx_device_info {</div><div class='ctx'> 	struct device *dev;</div><div class='del'>-	int id;</div><div class='ctx'> 	enum bq27xxx_chip chip;</div><div class='ctx'> 	u32 opts;</div><div class='ctx'> 	const char *name;</div><div class='hunk'>@@ -70,6 +61,8 @@ struct bq27xxx_device_info {</div><div class='ctx'> 	struct bq27xxx_access_methods bus;</div><div class='ctx'> 	struct bq27xxx_reg_cache cache;</div><div class='ctx'> 	int charge_design_full;</div><div class='add'>+	int voltage_min_design;</div><div class='add'>+	int voltage_max_design;</div><div class='ctx'> 	bool removed;</div><div class='ctx'> 	unsigned long last_update;</div><div class='ctx'> 	union power_supply_propval last_status;</div><div class='head'>diff --git a/include/linux/power/max77705_charger.h b/include/linux/power/max77705_charger.h<br/>new file mode 100644<br/>index 000000000000..b3950ce0625e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/power/max77705_charger.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/power/max77705_charger.h</a></div><div class='hunk'>@@ -0,0 +1,193 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Maxim MAX77705 definitions.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015 Samsung Electronics, Inc.</div><div class='add'>+ * Copyright (C) 2025 Dzmitry Sankouski &lt;dsankouski@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MAX77705_CHARGER_H</div><div class='add'>+#define __MAX77705_CHARGER_H __FILE__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CHG_INT */</div><div class='add'>+#define MAX77705_BYP_I		(0)</div><div class='add'>+#define MAX77705_INP_LIMIT_I	(1)</div><div class='add'>+#define MAX77705_BATP_I		(2)</div><div class='add'>+#define MAX77705_BAT_I		(3)</div><div class='add'>+#define MAX77705_CHG_I		(4)</div><div class='add'>+#define MAX77705_WCIN_I		(5)</div><div class='add'>+#define MAX77705_CHGIN_I	(6)</div><div class='add'>+#define MAX77705_AICL_I		(7)</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CHG_INT_OK */</div><div class='add'>+#define MAX77705_BYP_OK		BIT(MAX77705_BYP_I)</div><div class='add'>+#define MAX77705_DISQBAT_OK	BIT(MAX77705_INP_LIMIT_I)</div><div class='add'>+#define MAX77705_BATP_OK	BIT(MAX77705_BATP_I)</div><div class='add'>+#define MAX77705_BAT_OK		BIT(MAX77705_BAT_I)</div><div class='add'>+#define MAX77705_CHG_OK		BIT(MAX77705_CHG_I)</div><div class='add'>+#define MAX77705_WCIN_OK	BIT(MAX77705_WCIN_I)</div><div class='add'>+#define MAX77705_CHGIN_OK	BIT(MAX77705_CHGIN_I)</div><div class='add'>+#define MAX77705_AICL_OK	BIT(MAX77705_AICL_I)</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_DETAILS_00 */</div><div class='add'>+#define MAX77705_BATP_DTLS		BIT(0)</div><div class='add'>+#define MAX77705_WCIN_DTLS		GENMASK(4, 3)</div><div class='add'>+#define MAX77705_WCIN_DTLS_SHIFT	3</div><div class='add'>+#define MAX77705_CHGIN_DTLS		GENMASK(6, 5)</div><div class='add'>+#define MAX77705_CHGIN_DTLS_SHIFT	5</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_DETAILS_01 */</div><div class='add'>+#define MAX77705_CHG_DTLS	GENMASK(3, 0)</div><div class='add'>+#define MAX77705_CHG_DTLS_SHIFT	0</div><div class='add'>+#define MAX77705_BAT_DTLS	GENMASK(6, 4)</div><div class='add'>+#define MAX77705_BAT_DTLS_SHIFT	4</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_DETAILS_02 */</div><div class='add'>+#define MAX77705_BYP_DTLS	GENMASK(3, 0)</div><div class='add'>+#define MAX77705_BYP_DTLS_SHIFT	0</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_00 */</div><div class='add'>+#define MAX77705_CHG_SHIFT	0</div><div class='add'>+#define MAX77705_UNO_SHIFT	1</div><div class='add'>+#define MAX77705_OTG_SHIFT	1</div><div class='add'>+#define MAX77705_BUCK_SHIFT	2</div><div class='add'>+#define MAX77705_BOOST_SHIFT	3</div><div class='add'>+#define MAX77705_WDTEN_SHIFT	4</div><div class='add'>+#define MAX77705_CHG_MASK	BIT(MAX77705_CHG_SHIFT)</div><div class='add'>+#define MAX77705_UNO_MASK	BIT(MAX77705_UNO_SHIFT)</div><div class='add'>+#define MAX77705_OTG_MASK	BIT(MAX77705_OTG_SHIFT)</div><div class='add'>+#define MAX77705_BUCK_MASK	BIT(MAX77705_BUCK_SHIFT)</div><div class='add'>+#define MAX77705_BOOST_MASK	BIT(MAX77705_BOOST_SHIFT)</div><div class='add'>+#define MAX77705_WDTEN_MASK	BIT(MAX77705_WDTEN_SHIFT)</div><div class='add'>+#define MAX77705_UNO_CTRL	(MAX77705_UNO_MASK | MAX77705_BOOST_MASK)</div><div class='add'>+#define MAX77705_OTG_CTRL	(MAX77705_OTG_MASK | MAX77705_BOOST_MASK)</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_01 */</div><div class='add'>+#define MAX77705_FCHGTIME_DISABLE	0</div><div class='add'>+#define MAX77705_CHG_RSTRT_DISABLE	0x3</div><div class='add'>+</div><div class='add'>+#define MAX77705_CHG_PQEN_DISABLE	0</div><div class='add'>+#define MAX77705_CHG_PQEN_ENABLE	1</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_02 */</div><div class='add'>+#define MAX77705_OTG_ILIM_500		0</div><div class='add'>+#define MAX77705_OTG_ILIM_900		1</div><div class='add'>+#define MAX77705_OTG_ILIM_1200		2</div><div class='add'>+#define MAX77705_OTG_ILIM_1500		3</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_03 */</div><div class='add'>+#define MAX77705_TO_ITH_150MA		0</div><div class='add'>+#define MAX77705_TO_TIME_30M		3</div><div class='add'>+#define MAX77705_SYS_TRACK_ENABLE	0</div><div class='add'>+#define MAX77705_SYS_TRACK_DISABLE	1</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_04 */</div><div class='add'>+#define MAX77705_CHG_MINVSYS_SHIFT	6</div><div class='add'>+#define MAX77705_CHG_MINVSYS_MASK	GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_05 */</div><div class='add'>+#define MAX77705_B2SOVRC_DISABLE	0</div><div class='add'>+#define MAX77705_B2SOVRC_4_5A		6</div><div class='add'>+#define MAX77705_B2SOVRC_4_8A		8</div><div class='add'>+#define MAX77705_B2SOVRC_5_0A		9</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_CNFG_06 */</div><div class='add'>+#define MAX77705_WDTCLR_SHIFT		0</div><div class='add'>+#define MAX77705_WDTCLR_MASK		GENMASK(1, 0)</div><div class='add'>+#define MAX77705_WDTCLR			1</div><div class='add'>+#define MAX77705_CHGPROT_UNLOCKED	3</div><div class='add'>+#define MAX77705_SLOWEST_LX_SLOPE	3</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_07 */</div><div class='add'>+#define MAX77705_CHG_FMBST		4</div><div class='add'>+#define MAX77705_REG_FMBST_SHIFT	2</div><div class='add'>+#define MAX77705_REG_FMBST_MASK		BIT(MAX77705_REG_FMBST_SHIFT)</div><div class='add'>+#define MAX77705_REG_FGSRC_SHIFT	1</div><div class='add'>+#define MAX77705_REG_FGSRC_MASK		BIT(MAX77705_REG_FGSRC_SHIFT)</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_08 */</div><div class='add'>+#define MAX77705_CHG_FSW_3MHz		0</div><div class='add'>+#define MAX77705_CHG_FSW_2MHz		1</div><div class='add'>+#define MAX77705_CHG_FSW_1_5MHz		2</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_09 */</div><div class='add'>+#define MAX77705_CHG_DISABLE			0</div><div class='add'>+</div><div class='add'>+/* MAX77705_CHG_REG_CNFG_12 */</div><div class='add'>+/* REG=4.5V, UVLO=4.7V */</div><div class='add'>+#define MAX77705_VCHGIN_4_5		0</div><div class='add'>+/* REG=4.5V, UVLO=4.7V */</div><div class='add'>+#define MAX77705_WCIN_4_5		0</div><div class='add'>+#define MAX77705_DISABLE_SKIP		1</div><div class='add'>+#define MAX77705_AUTO_SKIP		0</div><div class='add'>+</div><div class='add'>+#define AICL_WORK_DELAY_MS		100</div><div class='add'>+</div><div class='add'>+/* uA */</div><div class='add'>+#define MAX77705_CURRENT_CHGIN_STEP	25000</div><div class='add'>+#define MAX77705_CURRENT_CHG_STEP	50000</div><div class='add'>+#define MAX77705_CURRENT_CHGIN_MIN	100000</div><div class='add'>+#define MAX77705_CURRENT_CHGIN_MAX	3200000</div><div class='add'>+</div><div class='add'>+enum max77705_field_idx {</div><div class='add'>+	MAX77705_CHGPROT,</div><div class='add'>+	MAX77705_CHG_EN,</div><div class='add'>+	MAX77705_CHG_CC_LIM,</div><div class='add'>+	MAX77705_CHG_CHGIN_LIM,</div><div class='add'>+	MAX77705_CHG_CV_PRM,</div><div class='add'>+	MAX77705_CHG_PQEN,</div><div class='add'>+	MAX77705_CHG_RSTRT,</div><div class='add'>+	MAX77705_CHG_WCIN,</div><div class='add'>+	MAX77705_FCHGTIME,</div><div class='add'>+	MAX77705_LX_SLOPE,</div><div class='add'>+	MAX77705_MODE,</div><div class='add'>+	MAX77705_OTG_ILIM,</div><div class='add'>+	MAX77705_REG_B2SOVRC,</div><div class='add'>+	MAX77705_REG_DISKIP,</div><div class='add'>+	MAX77705_REG_FSW,</div><div class='add'>+	MAX77705_SYS_TRACK,</div><div class='add'>+	MAX77705_TO,</div><div class='add'>+	MAX77705_TO_TIME,</div><div class='add'>+	MAX77705_VBYPSET,</div><div class='add'>+	MAX77705_VCHGIN,</div><div class='add'>+	MAX77705_WCIN,</div><div class='add'>+	MAX77705_N_REGMAP_FIELDS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_field max77705_reg_field[MAX77705_N_REGMAP_FIELDS] = {</div><div class='add'>+	[MAX77705_MODE]			= REG_FIELD(MAX77705_CHG_REG_CNFG_00,   0, 3),</div><div class='add'>+	[MAX77705_FCHGTIME]		= REG_FIELD(MAX77705_CHG_REG_CNFG_01,   0, 2),</div><div class='add'>+	[MAX77705_CHG_RSTRT]		= REG_FIELD(MAX77705_CHG_REG_CNFG_01,   4, 5),</div><div class='add'>+	[MAX77705_CHG_PQEN]		= REG_FIELD(MAX77705_CHG_REG_CNFG_01,   7, 7),</div><div class='add'>+	[MAX77705_CHG_CC_LIM]		= REG_FIELD(MAX77705_CHG_REG_CNFG_02,   0, 5),</div><div class='add'>+	[MAX77705_OTG_ILIM]		= REG_FIELD(MAX77705_CHG_REG_CNFG_02,   6, 7),</div><div class='add'>+	[MAX77705_TO]			= REG_FIELD(MAX77705_CHG_REG_CNFG_03,   0, 2),</div><div class='add'>+	[MAX77705_TO_TIME]		= REG_FIELD(MAX77705_CHG_REG_CNFG_03,   3, 5),</div><div class='add'>+	[MAX77705_SYS_TRACK]		= REG_FIELD(MAX77705_CHG_REG_CNFG_03,   7, 7),</div><div class='add'>+	[MAX77705_CHG_CV_PRM]		= REG_FIELD(MAX77705_CHG_REG_CNFG_04,   0, 5),</div><div class='add'>+	[MAX77705_REG_B2SOVRC]		= REG_FIELD(MAX77705_CHG_REG_CNFG_05,   0, 3),</div><div class='add'>+	[MAX77705_CHGPROT]		= REG_FIELD(MAX77705_CHG_REG_CNFG_06,   2, 3),</div><div class='add'>+	[MAX77705_LX_SLOPE]		= REG_FIELD(MAX77705_CHG_REG_CNFG_06,   5, 6),</div><div class='add'>+	[MAX77705_REG_FSW]		= REG_FIELD(MAX77705_CHG_REG_CNFG_08,   0, 1),</div><div class='add'>+	[MAX77705_CHG_CHGIN_LIM]	= REG_FIELD(MAX77705_CHG_REG_CNFG_09,   0, 6),</div><div class='add'>+	[MAX77705_CHG_EN]		= REG_FIELD(MAX77705_CHG_REG_CNFG_09,   7, 7),</div><div class='add'>+	[MAX77705_CHG_WCIN]		= REG_FIELD(MAX77705_CHG_REG_CNFG_10,   0, 5),</div><div class='add'>+	[MAX77705_VBYPSET]		= REG_FIELD(MAX77705_CHG_REG_CNFG_11,   0, 6),</div><div class='add'>+	[MAX77705_REG_DISKIP]		= REG_FIELD(MAX77705_CHG_REG_CNFG_12,   0, 0),</div><div class='add'>+	[MAX77705_WCIN]			= REG_FIELD(MAX77705_CHG_REG_CNFG_12,   1, 2),</div><div class='add'>+	[MAX77705_VCHGIN]		= REG_FIELD(MAX77705_CHG_REG_CNFG_12,   3, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct max77705_charger_data {</div><div class='add'>+	struct device			*dev;</div><div class='add'>+	struct regmap		*regmap;</div><div class='add'>+	struct regmap_field	*rfield[MAX77705_N_REGMAP_FIELDS];</div><div class='add'>+	struct power_supply_battery_info *bat_info;</div><div class='add'>+	struct workqueue_struct *wqueue;</div><div class='add'>+	struct work_struct	chgin_work;</div><div class='add'>+	struct power_supply	*psy_chg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __MAX77705_CHARGER_H */</div><div class='head'>diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h<br/>index c0992a77feea..360ffdf272da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/power_supply.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/power_supply.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/power_supply.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/power_supply.h</a></div><div class='hunk'>@@ -15,6 +15,8 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/rwsem.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -40,7 +42,7 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* What algorithm is the charger using? */</div><div class='del'>-enum {</div><div class='add'>+enum power_supply_charge_type {</div><div class='ctx'> 	POWER_SUPPLY_CHARGE_TYPE_UNKNOWN = 0,</div><div class='ctx'> 	POWER_SUPPLY_CHARGE_TYPE_NONE,</div><div class='ctx'> 	POWER_SUPPLY_CHARGE_TYPE_TRICKLE,	/* slow speed */</div><div class='hunk'>@@ -58,6 +60,7 @@ enum {</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_OVERHEAT,</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_DEAD,</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_OVERVOLTAGE,</div><div class='add'>+	POWER_SUPPLY_HEALTH_UNDERVOLTAGE,</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_UNSPEC_FAILURE,</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_COLD,</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_WATCHDOG_TIMER_EXPIRE,</div><div class='hunk'>@@ -68,6 +71,8 @@ enum {</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_COOL,</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_HOT,</div><div class='ctx'> 	POWER_SUPPLY_HEALTH_NO_BATTERY,</div><div class='add'>+	POWER_SUPPLY_HEALTH_BLOWN_FUSE,</div><div class='add'>+	POWER_SUPPLY_HEALTH_CELL_IMBALANCE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -99,6 +104,7 @@ enum power_supply_property {</div><div class='ctx'> 	/* Properties of type `int' */</div><div class='ctx'> 	POWER_SUPPLY_PROP_STATUS = 0,</div><div class='ctx'> 	POWER_SUPPLY_PROP_CHARGE_TYPE,</div><div class='add'>+	POWER_SUPPLY_PROP_CHARGE_TYPES,</div><div class='ctx'> 	POWER_SUPPLY_PROP_HEALTH,</div><div class='ctx'> 	POWER_SUPPLY_PROP_PRESENT,</div><div class='ctx'> 	POWER_SUPPLY_PROP_ONLINE,</div><div class='hunk'>@@ -170,6 +176,8 @@ enum power_supply_property {</div><div class='ctx'> 	POWER_SUPPLY_PROP_MANUFACTURE_YEAR,</div><div class='ctx'> 	POWER_SUPPLY_PROP_MANUFACTURE_MONTH,</div><div class='ctx'> 	POWER_SUPPLY_PROP_MANUFACTURE_DAY,</div><div class='add'>+	POWER_SUPPLY_PROP_INTERNAL_RESISTANCE,</div><div class='add'>+	POWER_SUPPLY_PROP_STATE_OF_HEALTH,</div><div class='ctx'> 	/* Properties of type `const char *' */</div><div class='ctx'> 	POWER_SUPPLY_PROP_MODEL_NAME,</div><div class='ctx'> 	POWER_SUPPLY_PROP_MANUFACTURER,</div><div class='hunk'>@@ -208,6 +216,7 @@ enum power_supply_usb_type {</div><div class='ctx'> enum power_supply_charge_behaviour {</div><div class='ctx'> 	POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO = 0,</div><div class='ctx'> 	POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE,</div><div class='add'>+	POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE_AWAKE,</div><div class='ctx'> 	POWER_SUPPLY_CHARGE_BEHAVIOUR_FORCE_DISCHARGE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -225,7 +234,6 @@ struct power_supply;</div><div class='ctx'> </div><div class='ctx'> /* Run-time specific power supply configuration */</div><div class='ctx'> struct power_supply_config {</div><div class='del'>-	struct device_node *of_node;</div><div class='ctx'> 	struct fwnode_handle *fwnode;</div><div class='ctx'> </div><div class='ctx'> 	/* Driver private data */</div><div class='hunk'>@@ -236,14 +244,17 @@ struct power_supply_config {</div><div class='ctx'> </div><div class='ctx'> 	char **supplied_to;</div><div class='ctx'> 	size_t num_supplicants;</div><div class='add'>+</div><div class='add'>+	bool no_wakeup_source;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Description of power supply */</div><div class='ctx'> struct power_supply_desc {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	enum power_supply_type type;</div><div class='del'>-	const enum power_supply_usb_type *usb_types;</div><div class='del'>-	size_t num_usb_types;</div><div class='add'>+	u8 charge_behaviours;</div><div class='add'>+	u32 charge_types;</div><div class='add'>+	u32 usb_types;</div><div class='ctx'> 	const enum power_supply_property *properties;</div><div class='ctx'> 	size_t num_properties;</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +278,6 @@ struct power_supply_desc {</div><div class='ctx'> 	int (*property_is_writeable)(struct power_supply *psy,</div><div class='ctx'> 				     enum power_supply_property psp);</div><div class='ctx'> 	void (*external_power_changed)(struct power_supply *psy);</div><div class='del'>-	void (*set_charged)(struct power_supply *psy);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set if thermal zone should not be created for this power supply.</div><div class='hunk'>@@ -279,6 +289,29 @@ struct power_supply_desc {</div><div class='ctx'> 	int use_for_apm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct power_supply_ext {</div><div class='add'>+	const char *const name;</div><div class='add'>+	u8 charge_behaviours;</div><div class='add'>+	u32 charge_types;</div><div class='add'>+	const enum power_supply_property *properties;</div><div class='add'>+	size_t num_properties;</div><div class='add'>+</div><div class='add'>+	int (*get_property)(struct power_supply *psy,</div><div class='add'>+			    const struct power_supply_ext *ext,</div><div class='add'>+			    void *data,</div><div class='add'>+			    enum power_supply_property psp,</div><div class='add'>+			    union power_supply_propval *val);</div><div class='add'>+	int (*set_property)(struct power_supply *psy,</div><div class='add'>+			    const struct power_supply_ext *ext,</div><div class='add'>+			    void *data,</div><div class='add'>+			    enum power_supply_property psp,</div><div class='add'>+			    const union power_supply_propval *val);</div><div class='add'>+	int (*property_is_writeable)(struct power_supply *psy,</div><div class='add'>+				     const struct power_supply_ext *ext,</div><div class='add'>+				     void *data,</div><div class='add'>+				     enum power_supply_property psp);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct power_supply {</div><div class='ctx'> 	const struct power_supply_desc *desc;</div><div class='ctx'> </div><div class='hunk'>@@ -287,7 +320,6 @@ struct power_supply {</div><div class='ctx'> </div><div class='ctx'> 	char **supplied_from;</div><div class='ctx'> 	size_t num_supplies;</div><div class='del'>-	struct device_node *of_node;</div><div class='ctx'> </div><div class='ctx'> 	/* Driver private data */</div><div class='ctx'> 	void *drv_data;</div><div class='hunk'>@@ -298,29 +330,29 @@ struct power_supply {</div><div class='ctx'> 	struct delayed_work deferred_register_work;</div><div class='ctx'> 	spinlock_t changed_lock;</div><div class='ctx'> 	bool changed;</div><div class='add'>+	bool update_groups;</div><div class='ctx'> 	bool initialized;</div><div class='ctx'> 	bool removing;</div><div class='ctx'> 	atomic_t use_cnt;</div><div class='ctx'> 	struct power_supply_battery_info *battery_info;</div><div class='add'>+	struct rw_semaphore extensions_sem; /* protects "extensions" */</div><div class='add'>+	struct list_head extensions;</div><div class='ctx'> #ifdef CONFIG_THERMAL</div><div class='ctx'> 	struct thermal_zone_device *tzd;</div><div class='ctx'> 	struct thermal_cooling_device *tcd;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LEDS_TRIGGERS</div><div class='del'>-	struct led_trigger *charging_full_trig;</div><div class='del'>-	char *charging_full_trig_name;</div><div class='add'>+	struct led_trigger *trig;</div><div class='ctx'> 	struct led_trigger *charging_trig;</div><div class='del'>-	char *charging_trig_name;</div><div class='ctx'> 	struct led_trigger *full_trig;</div><div class='del'>-	char *full_trig_name;</div><div class='del'>-	struct led_trigger *online_trig;</div><div class='del'>-	char *online_trig_name;</div><div class='ctx'> 	struct led_trigger *charging_blink_full_solid_trig;</div><div class='del'>-	char *charging_blink_full_solid_trig_name;</div><div class='add'>+	struct led_trigger *charging_orange_full_green_trig;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define dev_to_psy(__dev)	container_of_const(__dev, struct power_supply, dev)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is recommended structure to specify static power supply parameters.</div><div class='ctx'>  * Generic one, parametrizable for different power supplies. Power supply</div><div class='hunk'>@@ -740,7 +772,7 @@ struct power_supply_battery_info {</div><div class='ctx'> 	int overvoltage_limit_uv;</div><div class='ctx'> 	int constant_charge_current_max_ua;</div><div class='ctx'> 	int constant_charge_voltage_max_uv;</div><div class='del'>-	struct power_supply_maintenance_charge_table *maintenance_charge;</div><div class='add'>+	const struct power_supply_maintenance_charge_table *maintenance_charge;</div><div class='ctx'> 	int maintenance_charge_size;</div><div class='ctx'> 	int alert_low_temp_charge_current_ua;</div><div class='ctx'> 	int alert_low_temp_charge_voltage_uv;</div><div class='hunk'>@@ -755,13 +787,13 @@ struct power_supply_battery_info {</div><div class='ctx'> 	int temp_alert_max;</div><div class='ctx'> 	int temp_min;</div><div class='ctx'> 	int temp_max;</div><div class='del'>-	struct power_supply_battery_ocv_table *ocv_table[POWER_SUPPLY_OCV_TEMP_MAX];</div><div class='add'>+	const struct power_supply_battery_ocv_table *ocv_table[POWER_SUPPLY_OCV_TEMP_MAX];</div><div class='ctx'> 	int ocv_table_size[POWER_SUPPLY_OCV_TEMP_MAX];</div><div class='del'>-	struct power_supply_resistance_temp_table *resist_table;</div><div class='add'>+	const struct power_supply_resistance_temp_table *resist_table;</div><div class='ctx'> 	int resist_table_size;</div><div class='del'>-	struct power_supply_vbat_ri_table *vbat2ri_discharging;</div><div class='add'>+	const struct power_supply_vbat_ri_table *vbat2ri_discharging;</div><div class='ctx'> 	int vbat2ri_discharging_size;</div><div class='del'>-	struct power_supply_vbat_ri_table *vbat2ri_charging;</div><div class='add'>+	const struct power_supply_vbat_ri_table *vbat2ri_charging;</div><div class='ctx'> 	int vbat2ri_charging_size;</div><div class='ctx'> 	int bti_resistance_ohm;</div><div class='ctx'> 	int bti_resistance_tolerance;</div><div class='hunk'>@@ -777,19 +809,10 @@ static inline void power_supply_put(struct power_supply *psy) {}</div><div class='ctx'> static inline struct power_supply *power_supply_get_by_name(const char *name)</div><div class='ctx'> { return NULL; }</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-extern struct power_supply *power_supply_get_by_phandle(struct device_node *np,</div><div class='del'>-							const char *property);</div><div class='del'>-extern struct power_supply *devm_power_supply_get_by_phandle(</div><div class='add'>+extern struct power_supply *power_supply_get_by_reference(struct fwnode_handle *fwnode,</div><div class='add'>+							  const char *property);</div><div class='add'>+extern struct power_supply *devm_power_supply_get_by_reference(</div><div class='ctx'> 				    struct device *dev, const char *property);</div><div class='del'>-#else /* !CONFIG_OF */</div><div class='del'>-static inline struct power_supply *</div><div class='del'>-power_supply_get_by_phandle(struct device_node *np, const char *property)</div><div class='del'>-{ return NULL; }</div><div class='del'>-static inline struct power_supply *</div><div class='del'>-devm_power_supply_get_by_phandle(struct device *dev, const char *property)</div><div class='del'>-{ return NULL; }</div><div class='del'>-#endif /* CONFIG_OF */</div><div class='ctx'> </div><div class='ctx'> extern const enum power_supply_property power_supply_battery_info_properties[];</div><div class='ctx'> extern const size_t power_supply_battery_info_properties_size;</div><div class='hunk'>@@ -802,19 +825,19 @@ extern bool power_supply_battery_info_has_prop(struct power_supply_battery_info</div><div class='ctx'> extern int power_supply_battery_info_get_prop(struct power_supply_battery_info *info,</div><div class='ctx'> 					      enum power_supply_property psp,</div><div class='ctx'> 					      union power_supply_propval *val);</div><div class='del'>-extern int power_supply_ocv2cap_simple(struct power_supply_battery_ocv_table *table,</div><div class='add'>+extern int power_supply_ocv2cap_simple(const struct power_supply_battery_ocv_table *table,</div><div class='ctx'> 				       int table_len, int ocv);</div><div class='del'>-extern struct power_supply_battery_ocv_table *</div><div class='add'>+extern const struct power_supply_battery_ocv_table *</div><div class='ctx'> power_supply_find_ocv2cap_table(struct power_supply_battery_info *info,</div><div class='ctx'> 				int temp, int *table_len);</div><div class='ctx'> extern int power_supply_batinfo_ocv2cap(struct power_supply_battery_info *info,</div><div class='ctx'> 					int ocv, int temp);</div><div class='ctx'> extern int</div><div class='del'>-power_supply_temp2resist_simple(struct power_supply_resistance_temp_table *table,</div><div class='add'>+power_supply_temp2resist_simple(const struct power_supply_resistance_temp_table *table,</div><div class='ctx'> 				int table_len, int temp);</div><div class='ctx'> extern int power_supply_vbat2ri(struct power_supply_battery_info *info,</div><div class='ctx'> 				int vbat_uv, bool charging);</div><div class='del'>-extern struct power_supply_maintenance_charge_table *</div><div class='add'>+extern const struct power_supply_maintenance_charge_table *</div><div class='ctx'> power_supply_get_maintenance_charging_setting(struct power_supply_battery_info *info, int index);</div><div class='ctx'> extern bool power_supply_battery_bti_in_range(struct power_supply_battery_info *info,</div><div class='ctx'> 					      int resistance);</div><div class='hunk'>@@ -823,12 +846,11 @@ extern int power_supply_am_i_supplied(struct power_supply *psy);</div><div class='ctx'> int power_supply_get_property_from_supplier(struct power_supply *psy,</div><div class='ctx'> 					    enum power_supply_property psp,</div><div class='ctx'> 					    union power_supply_propval *val);</div><div class='del'>-extern int power_supply_set_battery_charged(struct power_supply *psy);</div><div class='ctx'> </div><div class='ctx'> static inline bool</div><div class='ctx'> power_supply_supports_maintenance_charging(struct power_supply_battery_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct power_supply_maintenance_charge_table *mt;</div><div class='add'>+	const struct power_supply_maintenance_charge_table *mt;</div><div class='ctx'> </div><div class='ctx'> 	mt = power_supply_get_maintenance_charging_setting(info, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -858,18 +880,24 @@ static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }</div><div class='ctx'> extern int power_supply_get_property(struct power_supply *psy,</div><div class='ctx'> 			    enum power_supply_property psp,</div><div class='ctx'> 			    union power_supply_propval *val);</div><div class='add'>+int power_supply_get_property_direct(struct power_supply *psy, enum power_supply_property psp,</div><div class='add'>+				     union power_supply_propval *val);</div><div class='ctx'> #if IS_ENABLED(CONFIG_POWER_SUPPLY)</div><div class='ctx'> extern int power_supply_set_property(struct power_supply *psy,</div><div class='ctx'> 			    enum power_supply_property psp,</div><div class='ctx'> 			    const union power_supply_propval *val);</div><div class='add'>+int power_supply_set_property_direct(struct power_supply *psy, enum power_supply_property psp,</div><div class='add'>+				     const union power_supply_propval *val);</div><div class='ctx'> #else</div><div class='ctx'> static inline int power_supply_set_property(struct power_supply *psy,</div><div class='ctx'> 			    enum power_supply_property psp,</div><div class='ctx'> 			    const union power_supply_propval *val)</div><div class='ctx'> { return 0; }</div><div class='add'>+static inline int power_supply_set_property_direct(struct power_supply *psy,</div><div class='add'>+						   enum power_supply_property psp,</div><div class='add'>+						   const union power_supply_propval *val)</div><div class='add'>+{ return 0; }</div><div class='ctx'> #endif</div><div class='del'>-extern int power_supply_property_is_writeable(struct power_supply *psy,</div><div class='del'>-					enum power_supply_property psp);</div><div class='ctx'> extern void power_supply_external_power_changed(struct power_supply *psy);</div><div class='ctx'> </div><div class='ctx'> extern struct power_supply *__must_check</div><div class='hunk'>@@ -877,25 +905,24 @@ power_supply_register(struct device *parent,</div><div class='ctx'> 				 const struct power_supply_desc *desc,</div><div class='ctx'> 				 const struct power_supply_config *cfg);</div><div class='ctx'> extern struct power_supply *__must_check</div><div class='del'>-power_supply_register_no_ws(struct device *parent,</div><div class='del'>-				 const struct power_supply_desc *desc,</div><div class='del'>-				 const struct power_supply_config *cfg);</div><div class='del'>-extern struct power_supply *__must_check</div><div class='ctx'> devm_power_supply_register(struct device *parent,</div><div class='ctx'> 				 const struct power_supply_desc *desc,</div><div class='ctx'> 				 const struct power_supply_config *cfg);</div><div class='del'>-extern struct power_supply *__must_check</div><div class='del'>-devm_power_supply_register_no_ws(struct device *parent,</div><div class='del'>-				 const struct power_supply_desc *desc,</div><div class='del'>-				 const struct power_supply_config *cfg);</div><div class='ctx'> extern void power_supply_unregister(struct power_supply *psy);</div><div class='ctx'> extern int power_supply_powers(struct power_supply *psy, struct device *dev);</div><div class='ctx'> </div><div class='add'>+extern int __must_check</div><div class='add'>+power_supply_register_extension(struct power_supply *psy,</div><div class='add'>+				const struct power_supply_ext *ext,</div><div class='add'>+				struct device *dev,</div><div class='add'>+				void *data);</div><div class='add'>+extern void power_supply_unregister_extension(struct power_supply *psy,</div><div class='add'>+					      const struct power_supply_ext *ext);</div><div class='add'>+</div><div class='ctx'> #define to_power_supply(device) container_of(device, struct power_supply, dev)</div><div class='ctx'> </div><div class='ctx'> extern void *power_supply_get_drvdata(struct power_supply *psy);</div><div class='del'>-/* For APM emulation, think legacy userspace. */</div><div class='del'>-extern struct class *power_supply_class;</div><div class='add'>+extern int power_supply_for_each_psy(void *data, int (*fn)(struct power_supply *psy, void *data));</div><div class='ctx'> </div><div class='ctx'> static inline bool power_supply_is_amp_property(enum power_supply_property psp)</div><div class='ctx'> {</div><div class='hunk'>@@ -951,19 +978,6 @@ static inline bool power_supply_is_watt_property(enum power_supply_property psp)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_POWER_SUPPLY_HWMON</div><div class='del'>-int power_supply_add_hwmon_sysfs(struct power_supply *psy);</div><div class='del'>-void power_supply_remove_hwmon_sysfs(struct power_supply *psy);</div><div class='del'>-#else</div><div class='del'>-static inline int power_supply_add_hwmon_sysfs(struct power_supply *psy)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline</div><div class='del'>-void power_supply_remove_hwmon_sysfs(struct power_supply *psy) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SYSFS</div><div class='ctx'> ssize_t power_supply_charge_behaviour_show(struct device *dev,</div><div class='ctx'> 					   unsigned int available_behaviours,</div><div class='hunk'>@@ -971,6 +985,11 @@ ssize_t power_supply_charge_behaviour_show(struct device *dev,</div><div class='ctx'> 					   char *buf);</div><div class='ctx'> </div><div class='ctx'> int power_supply_charge_behaviour_parse(unsigned int available_behaviours, const char *buf);</div><div class='add'>+ssize_t power_supply_charge_types_show(struct device *dev,</div><div class='add'>+				       unsigned int available_types,</div><div class='add'>+				       enum power_supply_charge_type current_type,</div><div class='add'>+				       char *buf);</div><div class='add'>+int power_supply_charge_types_parse(unsigned int available_types, const char *buf);</div><div class='ctx'> #else</div><div class='ctx'> static inline</div><div class='ctx'> ssize_t power_supply_charge_behaviour_show(struct device *dev,</div><div class='hunk'>@@ -986,6 +1005,20 @@ static inline int power_supply_charge_behaviour_parse(unsigned int available_beh</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+ssize_t power_supply_charge_types_show(struct device *dev,</div><div class='add'>+				       unsigned int available_types,</div><div class='add'>+				       enum power_supply_charge_type current_type,</div><div class='add'>+				       char *buf)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int power_supply_charge_types_parse(unsigned int available_types, const char *buf)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_POWER_SUPPLY_H__ */</div><div class='head'>diff --git a/include/linux/ppp_channel.h b/include/linux/ppp_channel.h<br/>index 45e6e427ceb8..f73fbea0dbc2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ppp_channel.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ppp_channel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ppp_channel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ppp_channel.h</a></div><div class='hunk'>@@ -42,8 +42,7 @@ struct ppp_channel {</div><div class='ctx'> 	int		hdrlen;		/* amount of headroom channel needs */</div><div class='ctx'> 	void		*ppp;		/* opaque to channel */</div><div class='ctx'> 	int		speed;		/* transfer rate (bytes/second) */</div><div class='del'>-	/* the following is not used at present */</div><div class='del'>-	int		latency;	/* overhead time in milliseconds */</div><div class='add'>+	bool		direct_xmit;	/* no qdisc, xmit directly */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='head'>diff --git a/include/linux/pps_gen_kernel.h b/include/linux/pps_gen_kernel.h<br/>new file mode 100644<br/>index 000000000000..6214c8aa2e02<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pps_gen_kernel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pps_gen_kernel.h</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * PPS generator API kernel header</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Rodolfo Giometti &lt;giometti@enneenne.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LINUX_PPS_GEN_KERNEL_H</div><div class='add'>+#define LINUX_PPS_GEN_KERNEL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pps_gen.h&gt;</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global defines</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PPS_GEN_MAX_SOURCES	16		/* should be enough... */</div><div class='add'>+</div><div class='add'>+struct pps_gen_device;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pps_gen_source_info - the specific PPS generator info</div><div class='add'>+ * @use_system_clock: true, if the system clock is used to generate pulses</div><div class='add'>+ * @get_time: query the time stored into the generator clock</div><div class='add'>+ * @enable: enable/disable the PPS pulses generation</div><div class='add'>+ *</div><div class='add'>+ * This is the main generator struct where all needed information must be</div><div class='add'>+ * placed before calling the pps_gen_register_source().</div><div class='add'>+ */</div><div class='add'>+struct pps_gen_source_info {</div><div class='add'>+	bool use_system_clock;</div><div class='add'>+</div><div class='add'>+	int (*get_time)(struct pps_gen_device *pps_gen,</div><div class='add'>+					struct timespec64 *time);</div><div class='add'>+	int (*enable)(struct pps_gen_device *pps_gen, bool enable);</div><div class='add'>+</div><div class='add'>+/* private: internal use only */</div><div class='add'>+	struct module *owner;</div><div class='add'>+	struct device *parent;			/* for device_create */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The main struct */</div><div class='add'>+struct pps_gen_device {</div><div class='add'>+	const struct pps_gen_source_info *info;	/* PSS generator info */</div><div class='add'>+	bool enabled;				/* PSS generator status */</div><div class='add'>+</div><div class='add'>+	unsigned int event;</div><div class='add'>+	unsigned int sequence;</div><div class='add'>+</div><div class='add'>+	unsigned int last_ev;			/* last PPS event id */</div><div class='add'>+	wait_queue_head_t queue;		/* PPS event queue */</div><div class='add'>+</div><div class='add'>+	unsigned int id;			/* PPS generator unique ID */</div><div class='add'>+	struct cdev cdev;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct fasync_struct *async_queue;	/* fasync method */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global variables</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern const struct attribute_group *pps_gen_groups[];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Exported functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern struct pps_gen_device *pps_gen_register_source(</div><div class='add'>+				const struct pps_gen_source_info *info);</div><div class='add'>+extern void pps_gen_unregister_source(struct pps_gen_device *pps_gen);</div><div class='add'>+extern void pps_gen_event(struct pps_gen_device *pps_gen,</div><div class='add'>+				unsigned int event, void *data);</div><div class='add'>+</div><div class='add'>+#endif /* LINUX_PPS_GEN_KERNEL_H */</div><div class='head'>diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h<br/>index 78c8ac4951b5..aab0aebb529e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pps_kernel.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pps_kernel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pps_kernel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pps_kernel.h</a></div><div class='hunk'>@@ -52,12 +52,12 @@ struct pps_device {</div><div class='ctx'> 	int current_mode;			/* PPS mode at event time */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int last_ev;			/* last PPS event id */</div><div class='add'>+	unsigned int last_fetched_ev;		/* last fetched PPS event id */</div><div class='ctx'> 	wait_queue_head_t queue;		/* PPS event queue */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int id;			/* PPS source unique ID */</div><div class='ctx'> 	void const *lookup_cookie;		/* For pps_lookup_dev() only */</div><div class='del'>-	struct cdev cdev;</div><div class='del'>-	struct device *dev;</div><div class='add'>+	struct device dev;</div><div class='ctx'> 	struct fasync_struct *async_queue;	/* fasync method */</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/prandom.h b/include/linux/prandom.h<br/>index f7f1e5251c67..ff7dcc3fa105 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/prandom.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/prandom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/prandom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/prandom.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/once.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct rnd_state {</div><div class='hunk'>@@ -46,10 +47,4 @@ static inline void prandom_seed_state(struct rnd_state *state, u64 seed)</div><div class='ctx'> 	state-&gt;s4 = __seed(i, 128U);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Pseudo random number generator from numerical recipes. */</div><div class='del'>-static inline u32 next_pseudo_random32(u32 seed)</div><div class='del'>-{</div><div class='del'>-	return seed * 1664525 + 1013904223;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/preempt.h b/include/linux/preempt.h<br/>index 7233e9cf1bab..d964f965c8ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/preempt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/preempt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/preempt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/preempt.h</a></div><div class='hunk'>@@ -134,11 +134,9 @@ static __always_inline unsigned char interrupt_context_level(void)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following macros are deprecated and should not be used in new code:</div><div class='del'>- * in_irq()       - Obsolete version of in_hardirq()</div><div class='ctx'>  * in_softirq()   - We have BH disabled, or are processing softirqs</div><div class='ctx'>  * in_interrupt() - We're in NMI,IRQ,SoftIRQ context or have BH disabled</div><div class='ctx'>  */</div><div class='del'>-#define in_irq()		(hardirq_count())</div><div class='ctx'> #define in_softirq()		(softirq_count())</div><div class='ctx'> #define in_interrupt()		(irq_count())</div><div class='ctx'> </div><div class='hunk'>@@ -319,6 +317,7 @@ do { \</div><div class='ctx'> #ifdef CONFIG_PREEMPT_NOTIFIERS</div><div class='ctx'> </div><div class='ctx'> struct preempt_notifier;</div><div class='add'>+struct task_struct;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * preempt_ops - notifiers called when a task is preempted and rescheduled</div><div class='hunk'>@@ -368,12 +367,10 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Migrate-Disable and why it is undesired.</div><div class='ctx'>  *</div><div class='del'>- * When a preempted task becomes elegible to run under the ideal model (IOW it</div><div class='add'>+ * When a preempted task becomes eligible to run under the ideal model (IOW it</div><div class='ctx'>  * becomes one of the M highest priority tasks), it might still have to wait</div><div class='ctx'>  * for the preemptee's migrate_disable() section to complete. Thereby suffering</div><div class='ctx'>  * a reduction in bandwidth in the exact duration of the migrate_disable()</div><div class='hunk'>@@ -388,7 +385,7 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,</div><div class='ctx'>  * - a lower priority tasks; which under preempt_disable() could've instantly</div><div class='ctx'>  *   migrated away when another CPU becomes available, is now constrained</div><div class='ctx'>  *   by the ability to push the higher priority task away, which might itself be</div><div class='del'>- *   in a migrate_disable() section, reducing it's available bandwidth.</div><div class='add'>+ *   in a migrate_disable() section, reducing its available bandwidth.</div><div class='ctx'>  *</div><div class='ctx'>  * IOW it trades latency / moves the interference term, but it stays in the</div><div class='ctx'>  * system, and as long as it remains unbounded, the system is not fully</div><div class='hunk'>@@ -400,7 +397,7 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,</div><div class='ctx'>  * PREEMPT_RT breaks a number of assumptions traditionally held. By forcing a</div><div class='ctx'>  * number of primitives into becoming preemptible, they would also allow</div><div class='ctx'>  * migration. This turns out to break a bunch of per-cpu usage. To this end,</div><div class='del'>- * all these primitives employ migirate_disable() to restore this implicit</div><div class='add'>+ * all these primitives employ migrate_disable() to restore this implicit</div><div class='ctx'>  * assumption.</div><div class='ctx'>  *</div><div class='ctx'>  * This is a 'temporary' work-around at best. The correct solution is getting</div><div class='hunk'>@@ -408,7 +405,7 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,</div><div class='ctx'>  * per-cpu locking or short preempt-disable regions.</div><div class='ctx'>  *</div><div class='ctx'>  * The end goal must be to get rid of migrate_disable(), alternatively we need</div><div class='del'>- * a schedulability theory that does not depend on abritrary migration.</div><div class='add'>+ * a schedulability theory that does not depend on arbitrary migration.</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='ctx'>  * Notes on the implementation.</div><div class='hunk'>@@ -425,15 +422,6 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,</div><div class='ctx'>  *       work-conserving schedulers.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-extern void migrate_disable(void);</div><div class='del'>-extern void migrate_enable(void);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void migrate_disable(void) { }</div><div class='del'>-static inline void migrate_enable(void) { }</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * preempt_disable_nested - Disable preemption inside a normally preempt disabled section</div><div class='hunk'>@@ -479,6 +467,54 @@ static __always_inline void preempt_enable_nested(void)</div><div class='ctx'> </div><div class='ctx'> DEFINE_LOCK_GUARD_0(preempt, preempt_disable(), preempt_enable())</div><div class='ctx'> DEFINE_LOCK_GUARD_0(preempt_notrace, preempt_disable_notrace(), preempt_enable_notrace())</div><div class='del'>-DEFINE_LOCK_GUARD_0(migrate, migrate_disable(), migrate_enable())</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PREEMPT_DYNAMIC</div><div class='add'>+</div><div class='add'>+extern bool preempt_model_none(void);</div><div class='add'>+extern bool preempt_model_voluntary(void);</div><div class='add'>+extern bool preempt_model_full(void);</div><div class='add'>+extern bool preempt_model_lazy(void);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline bool preempt_model_none(void)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_PREEMPT_NONE);</div><div class='add'>+}</div><div class='add'>+static inline bool preempt_model_voluntary(void)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_PREEMPT_VOLUNTARY);</div><div class='add'>+}</div><div class='add'>+static inline bool preempt_model_full(void)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_PREEMPT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool preempt_model_lazy(void)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_PREEMPT_LAZY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline bool preempt_model_rt(void)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_PREEMPT_RT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern const char *preempt_model_str(void);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Does the preemption model allow non-cooperative preemption?</div><div class='add'>+ *</div><div class='add'>+ * For !CONFIG_PREEMPT_DYNAMIC kernels this is an exact match with</div><div class='add'>+ * CONFIG_PREEMPTION; for CONFIG_PREEMPT_DYNAMIC this doesn't work as the</div><div class='add'>+ * kernel is *built* with CONFIG_PREEMPTION=y but may run with e.g. the</div><div class='add'>+ * PREEMPT_NONE model.</div><div class='add'>+ */</div><div class='add'>+static inline bool preempt_model_preemptible(void)</div><div class='add'>+{</div><div class='add'>+	return preempt_model_full() || preempt_model_lazy() || preempt_model_rt();</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_PREEMPT_H */</div><div class='head'>diff --git a/include/linux/printk.h b/include/linux/printk.h<br/>index 955e31860095..45c663124c9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/printk.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/printk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/printk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/printk.h</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> #include &lt;linux/ratelimit_types.h&gt;</div><div class='ctx'> #include &lt;linux/once_lite.h&gt;</div><div class='ctx'> </div><div class='add'>+struct console;</div><div class='add'>+</div><div class='ctx'> extern const char linux_banner[];</div><div class='ctx'> extern const char linux_proc_banner[];</div><div class='ctx'> </div><div class='hunk'>@@ -60,6 +62,10 @@ static inline const char *printk_skip_headers(const char *buffer)</div><div class='ctx'> #define CONSOLE_LOGLEVEL_DEFAULT CONFIG_CONSOLE_LOGLEVEL_DEFAULT</div><div class='ctx'> #define CONSOLE_LOGLEVEL_QUIET	 CONFIG_CONSOLE_LOGLEVEL_QUIET</div><div class='ctx'> </div><div class='add'>+int match_devname_and_update_preferred_console(const char *match,</div><div class='add'>+					       const char *name,</div><div class='add'>+					       const short idx);</div><div class='add'>+</div><div class='ctx'> extern int console_printk[];</div><div class='ctx'> </div><div class='ctx'> #define console_loglevel (console_printk[0])</div><div class='hunk'>@@ -71,7 +77,7 @@ extern void console_verbose(void);</div><div class='ctx'> </div><div class='ctx'> /* strlen("ratelimit") + 1 */</div><div class='ctx'> #define DEVKMSG_STR_MAX_SIZE 10</div><div class='del'>-extern char devkmsg_log_str[];</div><div class='add'>+extern char devkmsg_log_str[DEVKMSG_STR_MAX_SIZE];</div><div class='ctx'> struct ctl_table;</div><div class='ctx'> </div><div class='ctx'> extern int suppress_printk;</div><div class='hunk'>@@ -126,7 +132,7 @@ struct va_format {</div><div class='ctx'> #define no_printk(fmt, ...)				\</div><div class='ctx'> ({							\</div><div class='ctx'> 	if (0)						\</div><div class='del'>-		printk(fmt, ##__VA_ARGS__);		\</div><div class='add'>+		_printk(fmt, ##__VA_ARGS__);		\</div><div class='ctx'> 	0;						\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='hunk'>@@ -148,6 +154,8 @@ int vprintk_emit(int facility, int level,</div><div class='ctx'> </div><div class='ctx'> asmlinkage __printf(1, 0)</div><div class='ctx'> int vprintk(const char *fmt, va_list args);</div><div class='add'>+__printf(1, 0)</div><div class='add'>+int vprintk_deferred(const char *fmt, va_list args);</div><div class='ctx'> </div><div class='ctx'> asmlinkage __printf(1, 2) __cold</div><div class='ctx'> int _printk(const char *fmt, ...);</div><div class='hunk'>@@ -157,15 +165,19 @@ int _printk(const char *fmt, ...);</div><div class='ctx'>  */</div><div class='ctx'> __printf(1, 2) __cold int _printk_deferred(const char *fmt, ...);</div><div class='ctx'> </div><div class='del'>-extern void __printk_safe_enter(void);</div><div class='del'>-extern void __printk_safe_exit(void);</div><div class='add'>+extern void __printk_deferred_enter(void);</div><div class='add'>+extern void __printk_deferred_exit(void);</div><div class='add'>+</div><div class='add'>+extern void printk_force_console_enter(void);</div><div class='add'>+extern void printk_force_console_exit(void);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The printk_deferred_enter/exit macros are available only as a hack for</div><div class='ctx'>  * some code paths that need to defer all printk console printing. Interrupts</div><div class='ctx'>  * must be disabled for the deferred duration.</div><div class='ctx'>  */</div><div class='del'>-#define printk_deferred_enter __printk_safe_enter</div><div class='del'>-#define printk_deferred_exit __printk_safe_exit</div><div class='add'>+#define printk_deferred_enter() __printk_deferred_enter()</div><div class='add'>+#define printk_deferred_exit() __printk_deferred_exit()</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Please don't use printk_ratelimit(), because it shares ratelimiting state</div><div class='hunk'>@@ -192,12 +204,23 @@ void show_regs_print_info(const char *log_lvl);</div><div class='ctx'> extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold;</div><div class='ctx'> extern asmlinkage void dump_stack(void) __cold;</div><div class='ctx'> void printk_trigger_flush(void);</div><div class='add'>+void console_try_replay_all(void);</div><div class='add'>+void printk_legacy_allow_panic_sync(void);</div><div class='add'>+extern bool nbcon_device_try_acquire(struct console *con);</div><div class='add'>+extern void nbcon_device_release(struct console *con);</div><div class='add'>+void nbcon_atomic_flush_unsafe(void);</div><div class='add'>+bool pr_flush(int timeout_ms, bool reset_on_progress);</div><div class='ctx'> #else</div><div class='ctx'> static inline __printf(1, 0)</div><div class='ctx'> int vprintk(const char *s, va_list args)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline __printf(1, 0)</div><div class='add'>+int vprintk_deferred(const char *fmt, va_list args)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> static inline __printf(1, 2) __cold</div><div class='ctx'> int _printk(const char *s, ...)</div><div class='ctx'> {</div><div class='hunk'>@@ -217,6 +240,14 @@ static inline void printk_deferred_exit(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void printk_force_console_enter(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void printk_force_console_exit(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int printk_ratelimit(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -271,9 +302,33 @@ static inline void dump_stack(void)</div><div class='ctx'> static inline void printk_trigger_flush(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+static inline void console_try_replay_all(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-bool this_cpu_in_panic(void);</div><div class='add'>+static inline void printk_legacy_allow_panic_sync(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool nbcon_device_try_acquire(struct console *con)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nbcon_device_release(struct console *con)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void nbcon_atomic_flush_unsafe(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pr_flush(int timeout_ms, bool reset_on_progress)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> extern int __printk_cpu_sync_try_get(void);</div><div class='head'>diff --git a/include/linux/prmt.h b/include/linux/prmt.h<br/>index 24da8364b919..8cdc987de963 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/prmt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/prmt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/prmt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/prmt.h</a></div><div class='hunk'>@@ -1,7 +1,16 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_ACPI_PRMT</div><div class='ctx'> void init_prmt(void);</div><div class='add'>+bool acpi_prm_handler_available(const guid_t *handler_guid);</div><div class='add'>+int acpi_call_prm_handler(guid_t handler_guid, void *param_buffer);</div><div class='ctx'> #else</div><div class='ctx'> static inline void init_prmt(void) { }</div><div class='add'>+static inline bool acpi_prm_handler_available(const guid_t *handler_guid) { return false; }</div><div class='add'>+static inline int acpi_call_prm_handler(guid_t handler_guid, void *param_buffer)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h<br/>index 0b2a89854440..19d1c5e5f335 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/proc_fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/proc_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/proc_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/proc_fs.h</a></div><div class='hunk'>@@ -20,10 +20,16 @@ enum {</div><div class='ctx'> 	 * If in doubt, ignore this flag.</div><div class='ctx'> 	 */</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-	PROC_ENTRY_PERMANENT = 0U,</div><div class='add'>+	PROC_ENTRY_PERMANENT		= 0U,</div><div class='ctx'> #else</div><div class='del'>-	PROC_ENTRY_PERMANENT = 1U &lt;&lt; 0,</div><div class='add'>+	PROC_ENTRY_PERMANENT		= 1U &lt;&lt; 0,</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	PROC_ENTRY_proc_read_iter	= 1U &lt;&lt; 1,</div><div class='add'>+	PROC_ENTRY_proc_compat_ioctl	= 1U &lt;&lt; 2,</div><div class='add'>+	PROC_ENTRY_proc_lseek		= 1U &lt;&lt; 3,</div><div class='add'>+</div><div class='add'>+	PROC_ENTRY_FORCE_LOOKUP		= 1U &lt;&lt; 7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct proc_ops {</div><div class='hunk'>@@ -60,8 +66,6 @@ enum proc_pidonly {</div><div class='ctx'> </div><div class='ctx'> struct proc_fs_info {</div><div class='ctx'> 	struct pid_namespace *pid_ns;</div><div class='del'>-	struct dentry *proc_self;        /* For /proc/self */</div><div class='del'>-	struct dentry *proc_thread_self; /* For /proc/thread-self */</div><div class='ctx'> 	kgid_t pid_gid;</div><div class='ctx'> 	enum proc_hidepid hide_pid;</div><div class='ctx'> 	enum proc_pidonly pidonly;</div><div class='head'>diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h<br/>index 5ea470eb4d76..e81b8e596e4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/proc_ns.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/proc_ns.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/proc_ns.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/proc_ns.h</a></div><div class='hunk'>@@ -5,7 +5,8 @@</div><div class='ctx'> #ifndef _LINUX_PROC_NS_H</div><div class='ctx'> #define _LINUX_PROC_NS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/ns_common.h&gt;</div><div class='add'>+#include &lt;linux/nsfs.h&gt;</div><div class='add'>+#include &lt;uapi/linux/nsfs.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pid_namespace;</div><div class='ctx'> struct nsset;</div><div class='hunk'>@@ -16,7 +17,6 @@ struct inode;</div><div class='ctx'> struct proc_ns_operations {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	const char *real_ns_name;</div><div class='del'>-	int type;</div><div class='ctx'> 	struct ns_common *(*get)(struct task_struct *task);</div><div class='ctx'> 	void (*put)(struct ns_common *ns);</div><div class='ctx'> 	int (*install)(struct nsset *nsset, struct ns_common *ns);</div><div class='hunk'>@@ -39,13 +39,14 @@ extern const struct proc_ns_operations timens_for_children_operations;</div><div class='ctx'>  * We always define these enumerators</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='del'>-	PROC_ROOT_INO		= 1,</div><div class='del'>-	PROC_IPC_INIT_INO	= 0xEFFFFFFFU,</div><div class='del'>-	PROC_UTS_INIT_INO	= 0xEFFFFFFEU,</div><div class='del'>-	PROC_USER_INIT_INO	= 0xEFFFFFFDU,</div><div class='del'>-	PROC_PID_INIT_INO	= 0xEFFFFFFCU,</div><div class='del'>-	PROC_CGROUP_INIT_INO	= 0xEFFFFFFBU,</div><div class='del'>-	PROC_TIME_INIT_INO	= 0xEFFFFFFAU,</div><div class='add'>+	PROC_IPC_INIT_INO	= IPC_NS_INIT_INO,</div><div class='add'>+	PROC_UTS_INIT_INO	= UTS_NS_INIT_INO,</div><div class='add'>+	PROC_USER_INIT_INO	= USER_NS_INIT_INO,</div><div class='add'>+	PROC_PID_INIT_INO	= PID_NS_INIT_INO,</div><div class='add'>+	PROC_CGROUP_INIT_INO	= CGROUP_NS_INIT_INO,</div><div class='add'>+	PROC_TIME_INIT_INO	= TIME_NS_INIT_INO,</div><div class='add'>+	PROC_NET_INIT_INO	= NET_NS_INIT_INO,</div><div class='add'>+	PROC_MNT_INIT_INO	= MNT_NS_INIT_INO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='hunk'>@@ -64,25 +65,6 @@ static inline void proc_free_inum(unsigned int inum) {}</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='del'>-static inline int ns_alloc_inum(struct ns_common *ns)</div><div class='del'>-{</div><div class='del'>-	WRITE_ONCE(ns-&gt;stashed, NULL);</div><div class='del'>-	return proc_alloc_inum(&amp;ns-&gt;inum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ns_free_inum(ns) proc_free_inum((ns)-&gt;inum)</div><div class='del'>-</div><div class='ctx'> #define get_proc_ns(inode) ((struct ns_common *)(inode)-&gt;i_private)</div><div class='del'>-extern int ns_get_path(struct path *path, struct task_struct *task,</div><div class='del'>-			const struct proc_ns_operations *ns_ops);</div><div class='del'>-typedef struct ns_common *ns_get_path_helper_t(void *);</div><div class='del'>-extern int ns_get_path_cb(struct path *path, ns_get_path_helper_t ns_get_cb,</div><div class='del'>-			    void *private_data);</div><div class='del'>-</div><div class='del'>-extern bool ns_match(const struct ns_common *ns, dev_t dev, ino_t ino);</div><div class='del'>-</div><div class='del'>-extern int ns_get_name(char *buf, size_t size, struct task_struct *task,</div><div class='del'>-			const struct proc_ns_operations *ns_ops);</div><div class='del'>-extern void nsfs_init(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_PROC_NS_H */</div><div class='head'>diff --git a/include/linux/profile.h b/include/linux/profile.h<br/>index 11db1ec516e2..3f53cdb0c27c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/profile.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/profile.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/profile.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/profile.h</a></div><div class='hunk'>@@ -4,27 +4,20 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CPU_PROFILING	1</div><div class='ctx'> #define SCHED_PROFILING	2</div><div class='del'>-#define SLEEP_PROFILING	3</div><div class='ctx'> #define KVM_PROFILING	4</div><div class='ctx'> </div><div class='ctx'> struct proc_dir_entry;</div><div class='ctx'> struct notifier_block;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PROFILING) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='del'>-void create_prof_cpu_mask(void);</div><div class='ctx'> int create_proc_profile(void);</div><div class='ctx'> #else</div><div class='del'>-static inline void create_prof_cpu_mask(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int create_proc_profile(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/include/linux/property.h b/include/linux/property.h<br/>index e6516d0b7d52..272bfbdea7bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/property.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/property.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/property.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/property.h</a></div><div class='hunk'>@@ -11,10 +11,13 @@</div><div class='ctx'> #define _LINUX_PROPERTY_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/args.h&gt;</div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='ctx'> #include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/fwnode.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/util_macros.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct device;</div><div class='ctx'> </div><div class='hunk'>@@ -27,12 +30,6 @@ enum dev_prop_type {</div><div class='ctx'> 	DEV_PROP_REF,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum dev_dma_attr {</div><div class='del'>-	DEV_DMA_NOT_SUPPORTED,</div><div class='del'>-	DEV_DMA_NON_COHERENT,</div><div class='del'>-	DEV_DMA_COHERENT,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> const struct fwnode_handle *__dev_fwnode_const(const struct device *dev);</div><div class='ctx'> struct fwnode_handle *__dev_fwnode(struct device *dev);</div><div class='ctx'> #define dev_fwnode(dev)							\</div><div class='hunk'>@@ -41,6 +38,7 @@ struct fwnode_handle *__dev_fwnode(struct device *dev);</div><div class='ctx'> 		 struct device *: __dev_fwnode)(dev)</div><div class='ctx'> </div><div class='ctx'> bool device_property_present(const struct device *dev, const char *propname);</div><div class='add'>+bool device_property_read_bool(const struct device *dev, const char *propname);</div><div class='ctx'> int device_property_read_u8_array(const struct device *dev, const char *propname,</div><div class='ctx'> 				  u8 *val, size_t nval);</div><div class='ctx'> int device_property_read_u16_array(const struct device *dev, const char *propname,</div><div class='hunk'>@@ -58,6 +56,8 @@ int device_property_match_string(const struct device *dev,</div><div class='ctx'> </div><div class='ctx'> bool fwnode_property_present(const struct fwnode_handle *fwnode,</div><div class='ctx'> 			     const char *propname);</div><div class='add'>+bool fwnode_property_read_bool(const struct fwnode_handle *fwnode,</div><div class='add'>+			     const char *propname);</div><div class='ctx'> int fwnode_property_read_u8_array(const struct fwnode_handle *fwnode,</div><div class='ctx'> 				  const char *propname, u8 *val,</div><div class='ctx'> 				  size_t nval);</div><div class='hunk'>@@ -156,11 +156,9 @@ struct fwnode_handle *fwnode_get_next_parent(struct fwnode_handle *fwnode);</div><div class='ctx'> 	for (parent = fwnode_get_parent(fwnode); parent;	\</div><div class='ctx'> 	     parent = fwnode_get_next_parent(parent))</div><div class='ctx'> </div><div class='del'>-struct device *fwnode_get_next_parent_dev(const struct fwnode_handle *fwnode);</div><div class='ctx'> unsigned int fwnode_count_parents(const struct fwnode_handle *fwn);</div><div class='ctx'> struct fwnode_handle *fwnode_get_nth_parent(struct fwnode_handle *fwn,</div><div class='ctx'> 					    unsigned int depth);</div><div class='del'>-bool fwnode_is_ancestor_of(const struct fwnode_handle *ancestor, const struct fwnode_handle *child);</div><div class='ctx'> struct fwnode_handle *fwnode_get_next_child_node(</div><div class='ctx'> 	const struct fwnode_handle *fwnode, struct fwnode_handle *child);</div><div class='ctx'> struct fwnode_handle *fwnode_get_next_available_child_node(</div><div class='hunk'>@@ -170,10 +168,24 @@ struct fwnode_handle *fwnode_get_next_available_child_node(</div><div class='ctx'> 	for (child = fwnode_get_next_child_node(fwnode, NULL); child;	\</div><div class='ctx'> 	     child = fwnode_get_next_child_node(fwnode, child))</div><div class='ctx'> </div><div class='add'>+#define fwnode_for_each_named_child_node(fwnode, child, name)		\</div><div class='add'>+	fwnode_for_each_child_node(fwnode, child)			\</div><div class='add'>+		for_each_if(fwnode_name_eq(child, name))</div><div class='add'>+</div><div class='ctx'> #define fwnode_for_each_available_child_node(fwnode, child)		       \</div><div class='ctx'> 	for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\</div><div class='ctx'> 	     child = fwnode_get_next_available_child_node(fwnode, child))</div><div class='ctx'> </div><div class='add'>+#define fwnode_for_each_child_node_scoped(fwnode, child)		\</div><div class='add'>+	for (struct fwnode_handle *child __free(fwnode_handle) =	\</div><div class='add'>+		fwnode_get_next_child_node(fwnode, NULL);		\</div><div class='add'>+	     child; child = fwnode_get_next_child_node(fwnode, child))</div><div class='add'>+</div><div class='add'>+#define fwnode_for_each_available_child_node_scoped(fwnode, child)	\</div><div class='add'>+	for (struct fwnode_handle *child __free(fwnode_handle) =	\</div><div class='add'>+		fwnode_get_next_available_child_node(fwnode, NULL);	\</div><div class='add'>+	     child; child = fwnode_get_next_available_child_node(fwnode, child))</div><div class='add'>+</div><div class='ctx'> struct fwnode_handle *device_get_next_child_node(const struct device *dev,</div><div class='ctx'> 						 struct fwnode_handle *child);</div><div class='ctx'> </div><div class='hunk'>@@ -181,23 +193,57 @@ struct fwnode_handle *device_get_next_child_node(const struct device *dev,</div><div class='ctx'> 	for (child = device_get_next_child_node(dev, NULL); child;	\</div><div class='ctx'> 	     child = device_get_next_child_node(dev, child))</div><div class='ctx'> </div><div class='add'>+#define device_for_each_named_child_node(dev, child, name)		\</div><div class='add'>+	device_for_each_child_node(dev, child)				\</div><div class='add'>+		for_each_if(fwnode_name_eq(child, name))</div><div class='add'>+</div><div class='add'>+#define device_for_each_child_node_scoped(dev, child)			\</div><div class='add'>+	for (struct fwnode_handle *child __free(fwnode_handle) =	\</div><div class='add'>+		device_get_next_child_node(dev, NULL);			\</div><div class='add'>+	     child; child = device_get_next_child_node(dev, child))</div><div class='add'>+</div><div class='add'>+#define device_for_each_named_child_node_scoped(dev, child, name)	\</div><div class='add'>+	device_for_each_child_node_scoped(dev, child)			\</div><div class='add'>+		for_each_if(fwnode_name_eq(child, name))</div><div class='add'>+</div><div class='ctx'> struct fwnode_handle *fwnode_get_named_child_node(const struct fwnode_handle *fwnode,</div><div class='ctx'> 						  const char *childname);</div><div class='ctx'> struct fwnode_handle *device_get_named_child_node(const struct device *dev,</div><div class='ctx'> 						  const char *childname);</div><div class='ctx'> </div><div class='ctx'> struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode);</div><div class='del'>-void fwnode_handle_put(struct fwnode_handle *fwnode);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fwnode_handle_put - Drop reference to a device node</div><div class='add'>+ * @fwnode: Pointer to the device node to drop the reference to.</div><div class='add'>+ *</div><div class='add'>+ * This has to be used when terminating device_for_each_child_node() iteration</div><div class='add'>+ * with break or return to prevent stale device node references from being left</div><div class='add'>+ * behind.</div><div class='add'>+ */</div><div class='add'>+static inline void fwnode_handle_put(struct fwnode_handle *fwnode)</div><div class='add'>+{</div><div class='add'>+	fwnode_call_void_op(fwnode, put);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(fwnode_handle, struct fwnode_handle *, fwnode_handle_put(_T))</div><div class='ctx'> </div><div class='ctx'> int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index);</div><div class='ctx'> int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name);</div><div class='ctx'> </div><div class='del'>-unsigned int device_get_child_node_count(const struct device *dev);</div><div class='add'>+unsigned int fwnode_get_child_node_count(const struct fwnode_handle *fwnode);</div><div class='ctx'> </div><div class='del'>-static inline bool device_property_read_bool(const struct device *dev,</div><div class='del'>-					     const char *propname)</div><div class='add'>+static inline unsigned int device_get_child_node_count(const struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return device_property_present(dev, propname);</div><div class='add'>+	return fwnode_get_child_node_count(dev_fwnode(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int fwnode_get_named_child_node_count(const struct fwnode_handle *fwnode,</div><div class='add'>+					       const char *name);</div><div class='add'>+static inline unsigned int device_get_named_child_node_count(const struct device *dev,</div><div class='add'>+							     const char *name)</div><div class='add'>+{</div><div class='add'>+	return fwnode_get_named_child_node_count(dev_fwnode(dev), name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int device_property_read_u8(const struct device *dev,</div><div class='hunk'>@@ -250,12 +296,6 @@ static inline int device_property_string_array_count(const struct device *dev,</div><div class='ctx'> 	return device_property_read_string_array(dev, propname, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool fwnode_property_read_bool(const struct fwnode_handle *fwnode,</div><div class='del'>-					     const char *propname)</div><div class='del'>-{</div><div class='del'>-	return fwnode_property_present(fwnode, propname);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int fwnode_property_read_u8(const struct fwnode_handle *fwnode,</div><div class='ctx'> 					  const char *propname, u8 *val)</div><div class='ctx'> {</div><div class='hunk'>@@ -315,19 +355,26 @@ struct software_node;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct software_node_ref_args - Reference property with additional arguments</div><div class='del'>- * @node: Reference to a software node</div><div class='add'>+ * @swnode: Reference to a software node</div><div class='add'>+ * @fwnode: Alternative reference to a firmware node handle</div><div class='ctx'>  * @nargs: Number of elements in @args array</div><div class='ctx'>  * @args: Integer arguments</div><div class='ctx'>  */</div><div class='ctx'> struct software_node_ref_args {</div><div class='del'>-	const struct software_node *node;</div><div class='add'>+	const struct software_node *swnode;</div><div class='add'>+	struct fwnode_handle *fwnode;</div><div class='ctx'> 	unsigned int nargs;</div><div class='ctx'> 	u64 args[NR_FWNODE_REFERENCE_ARGS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define SOFTWARE_NODE_REFERENCE(_ref_, ...)			\</div><div class='ctx'> (const struct software_node_ref_args) {				\</div><div class='del'>-	.node = _ref_,						\</div><div class='add'>+	.swnode = _Generic(_ref_,				\</div><div class='add'>+			   const struct software_node *: _ref_,	\</div><div class='add'>+			   default: NULL),			\</div><div class='add'>+	.fwnode = _Generic(_ref_,				\</div><div class='add'>+			   struct fwnode_handle *: _ref_,	\</div><div class='add'>+			   default: NULL),			\</div><div class='ctx'> 	.nargs = COUNT_ARGS(__VA_ARGS__),			\</div><div class='ctx'> 	.args = { __VA_ARGS__ },				\</div><div class='ctx'> }</div><div class='hunk'>@@ -544,8 +591,8 @@ const struct software_node *</div><div class='ctx'> software_node_find_by_name(const struct software_node *parent,</div><div class='ctx'> 			   const char *name);</div><div class='ctx'> </div><div class='del'>-int software_node_register_node_group(const struct software_node **node_group);</div><div class='del'>-void software_node_unregister_node_group(const struct software_node **node_group);</div><div class='add'>+int software_node_register_node_group(const struct software_node * const *node_group);</div><div class='add'>+void software_node_unregister_node_group(const struct software_node * const *node_group);</div><div class='ctx'> </div><div class='ctx'> int software_node_register(const struct software_node *node);</div><div class='ctx'> void software_node_unregister(const struct software_node *node);</div><div class='head'>diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h<br/>index c9a31c567e85..2e18fef1a2e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pruss_driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pruss_driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pruss_driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pruss_driver.h</a></div><div class='hunk'>@@ -144,32 +144,32 @@ static inline int pruss_release_mem_region(struct pruss *pruss,</div><div class='ctx'> static inline int pruss_cfg_get_gpmux(struct pruss *pruss,</div><div class='ctx'> 				      enum pruss_pru_id pru_id, u8 *mux)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pruss_cfg_set_gpmux(struct pruss *pruss,</div><div class='ctx'> 				      enum pruss_pru_id pru_id, u8 mux)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pruss_cfg_gpimode(struct pruss *pruss,</div><div class='ctx'> 				    enum pruss_pru_id pru_id,</div><div class='ctx'> 				    enum pruss_gpi_mode mode)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pruss_cfg_xfr_enable(struct pruss *pruss,</div><div class='ctx'> 				       enum pru_type pru_type,</div><div class='del'>-				       bool enable);</div><div class='add'>+				       bool enable)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_TI_PRUSS */</div><div class='head'>diff --git a/include/linux/pse-pd/pse.h b/include/linux/pse-pd/pse.h<br/>index fb724c65c77b..4e5696cfade7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pse-pd/pse.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pse-pd/pse.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pse-pd/pse.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pse-pd/pse.h</a></div><div class='hunk'>@@ -5,55 +5,277 @@</div><div class='ctx'> #ifndef _LINUX_PSE_CONTROLLER_H</div><div class='ctx'> #define _LINUX_PSE_CONTROLLER_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/kfifo.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/ethtool.h&gt;</div><div class='add'>+#include &lt;uapi/linux/ethtool_netlink_generated.h&gt;</div><div class='add'>+#include &lt;linux/regulator/driver.h&gt;</div><div class='ctx'> </div><div class='add'>+/* Maximum current in uA according to IEEE 802.3-2022 Table 145-1 */</div><div class='add'>+#define MAX_PI_CURRENT 1920000</div><div class='add'>+/* Maximum power in mW according to IEEE 802.3-2022 Table 145-16 */</div><div class='add'>+#define MAX_PI_PW 99900</div><div class='add'>+</div><div class='add'>+struct net_device;</div><div class='ctx'> struct phy_device;</div><div class='ctx'> struct pse_controller_dev;</div><div class='add'>+struct netlink_ext_ack;</div><div class='add'>+</div><div class='add'>+/* C33 PSE extended state and substate. */</div><div class='add'>+struct ethtool_c33_pse_ext_state_info {</div><div class='add'>+	enum ethtool_c33_pse_ext_state c33_pse_ext_state;</div><div class='add'>+	union {</div><div class='add'>+		enum ethtool_c33_pse_ext_substate_error_condition error_condition;</div><div class='add'>+		enum ethtool_c33_pse_ext_substate_mr_pse_enable mr_pse_enable;</div><div class='add'>+		enum ethtool_c33_pse_ext_substate_option_detect_ted option_detect_ted;</div><div class='add'>+		enum ethtool_c33_pse_ext_substate_option_vport_lim option_vport_lim;</div><div class='add'>+		enum ethtool_c33_pse_ext_substate_ovld_detected ovld_detected;</div><div class='add'>+		enum ethtool_c33_pse_ext_substate_power_not_available power_not_available;</div><div class='add'>+		enum ethtool_c33_pse_ext_substate_short_detected short_detected;</div><div class='add'>+		u32 __c33_pse_ext_substate;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ethtool_c33_pse_pw_limit_range {</div><div class='add'>+	u32 min;</div><div class='add'>+	u32 max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pse_irq_desc - notification sender description for IRQ based events.</div><div class='add'>+ *</div><div class='add'>+ * @name: the visible name for the IRQ</div><div class='add'>+ * @map_event: driver callback to map IRQ status into PSE devices with events.</div><div class='add'>+ */</div><div class='add'>+struct pse_irq_desc {</div><div class='add'>+	const char *name;</div><div class='add'>+	int (*map_event)(int irq, struct pse_controller_dev *pcdev,</div><div class='add'>+			 unsigned long *notifs,</div><div class='add'>+			 unsigned long *notifs_mask);</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct pse_control_config - PSE control/channel configuration.</div><div class='ctx'>  *</div><div class='del'>- * @admin_cotrol: set PoDL PSE admin control as described in</div><div class='add'>+ * @podl_admin_control: set PoDL PSE admin control as described in</div><div class='ctx'>  *	IEEE 802.3-2018 30.15.1.2.1 acPoDLPSEAdminControl</div><div class='add'>+ * @c33_admin_control: set PSE admin control as described in</div><div class='add'>+ *	IEEE 802.3-2022 30.9.1.2.1 acPSEAdminControl</div><div class='ctx'>  */</div><div class='ctx'> struct pse_control_config {</div><div class='del'>-	enum ethtool_podl_pse_admin_state admin_cotrol;</div><div class='add'>+	enum ethtool_podl_pse_admin_state podl_admin_control;</div><div class='add'>+	enum ethtool_c33_pse_admin_state c33_admin_control;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pse_admin_state - PSE operational state</div><div class='add'>+ *</div><div class='add'>+ * @podl_admin_state: operational state of the PoDL PSE</div><div class='add'>+ *	functions. IEEE 802.3-2018 30.15.1.1.2 aPoDLPSEAdminState</div><div class='add'>+ * @c33_admin_state: operational state of the PSE</div><div class='add'>+ *	functions. IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState</div><div class='add'>+ */</div><div class='add'>+struct pse_admin_state {</div><div class='add'>+	enum ethtool_podl_pse_admin_state podl_admin_state;</div><div class='add'>+	enum ethtool_c33_pse_admin_state c33_admin_state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pse_pw_status - PSE power detection status</div><div class='add'>+ *</div><div class='add'>+ * @podl_pw_status: power detection status of the PoDL PSE.</div><div class='add'>+ *	IEEE 802.3-2018 30.15.1.1.3 aPoDLPSEPowerDetectionStatus:</div><div class='add'>+ * @c33_pw_status: power detection status of the PSE.</div><div class='add'>+ *	IEEE 802.3-2022 30.9.1.1.5 aPSEPowerDetectionStatus:</div><div class='add'>+ */</div><div class='add'>+struct pse_pw_status {</div><div class='add'>+	enum ethtool_podl_pse_pw_d_status podl_pw_status;</div><div class='add'>+	enum ethtool_c33_pse_pw_d_status c33_pw_status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pse_ext_state_info - PSE extended state information</div><div class='add'>+ *</div><div class='add'>+ * @c33_ext_state_info: extended state information of the PSE</div><div class='add'>+ */</div><div class='add'>+struct pse_ext_state_info {</div><div class='add'>+	struct ethtool_c33_pse_ext_state_info c33_ext_state_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pse_pw_limit_ranges - PSE power limit configuration range</div><div class='add'>+ *</div><div class='add'>+ * @c33_pw_limit_ranges: supported power limit configuration range. The driver</div><div class='add'>+ *			 is in charge of the memory allocation.</div><div class='add'>+ */</div><div class='add'>+struct pse_pw_limit_ranges {</div><div class='add'>+	struct ethtool_c33_pse_pw_limit_range *c33_pw_limit_ranges;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct pse_control_status - PSE control/channel status.</div><div class='add'>+ * struct ethtool_pse_control_status - PSE control/channel status.</div><div class='ctx'>  *</div><div class='add'>+ * @pw_d_id: PSE power domain index.</div><div class='ctx'>  * @podl_admin_state: operational state of the PoDL PSE</div><div class='ctx'>  *	functions. IEEE 802.3-2018 30.15.1.1.2 aPoDLPSEAdminState</div><div class='ctx'>  * @podl_pw_status: power detection status of the PoDL PSE.</div><div class='ctx'>  *	IEEE 802.3-2018 30.15.1.1.3 aPoDLPSEPowerDetectionStatus:</div><div class='add'>+ * @c33_admin_state: operational state of the PSE</div><div class='add'>+ *	functions. IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState</div><div class='add'>+ * @c33_pw_status: power detection status of the PSE.</div><div class='add'>+ *	IEEE 802.3-2022 30.9.1.1.5 aPSEPowerDetectionStatus:</div><div class='add'>+ * @c33_pw_class: detected class of a powered PD</div><div class='add'>+ *	IEEE 802.3-2022 30.9.1.1.8 aPSEPowerClassification</div><div class='add'>+ * @c33_actual_pw: power currently delivered by the PSE in mW</div><div class='add'>+ *	IEEE 802.3-2022 30.9.1.1.23 aPSEActualPower</div><div class='add'>+ * @c33_ext_state_info: extended state information of the PSE</div><div class='add'>+ * @c33_avail_pw_limit: available power limit of the PSE in mW</div><div class='add'>+ *	IEEE 802.3-2022 145.2.5.4 pse_avail_pwr</div><div class='add'>+ * @c33_pw_limit_ranges: supported power limit configuration range. The driver</div><div class='add'>+ *	is in charge of the memory allocation</div><div class='add'>+ * @c33_pw_limit_nb_ranges: number of supported power limit configuration</div><div class='add'>+ *	ranges</div><div class='add'>+ * @prio_max: max priority allowed for the c33_prio variable value.</div><div class='add'>+ * @prio: priority of the PSE. Managed by PSE core in case of static budget</div><div class='add'>+ *	evaluation strategy.</div><div class='ctx'>  */</div><div class='del'>-struct pse_control_status {</div><div class='add'>+struct ethtool_pse_control_status {</div><div class='add'>+	u32 pw_d_id;</div><div class='ctx'> 	enum ethtool_podl_pse_admin_state podl_admin_state;</div><div class='ctx'> 	enum ethtool_podl_pse_pw_d_status podl_pw_status;</div><div class='add'>+	enum ethtool_c33_pse_admin_state c33_admin_state;</div><div class='add'>+	enum ethtool_c33_pse_pw_d_status c33_pw_status;</div><div class='add'>+	u32 c33_pw_class;</div><div class='add'>+	u32 c33_actual_pw;</div><div class='add'>+	struct ethtool_c33_pse_ext_state_info c33_ext_state_info;</div><div class='add'>+	u32 c33_avail_pw_limit;</div><div class='add'>+	struct ethtool_c33_pse_pw_limit_range *c33_pw_limit_ranges;</div><div class='add'>+	u32 c33_pw_limit_nb_ranges;</div><div class='add'>+	u32 prio_max;</div><div class='add'>+	u32 prio;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct pse_controller_ops - PSE controller driver callbacks</div><div class='ctx'>  *</div><div class='del'>- * @ethtool_get_status: get PSE control status for ethtool interface</div><div class='del'>- * @ethtool_set_config: set PSE control configuration over ethtool interface</div><div class='add'>+ * @setup_pi_matrix: Setup PI matrix of the PSE controller.</div><div class='add'>+ *		     The PSE PIs devicetree nodes have already been parsed by</div><div class='add'>+ *		     of_load_pse_pis() and the pcdev-&gt;pi[x]-&gt;pairset[y].np</div><div class='add'>+ *		     populated. This callback should establish the</div><div class='add'>+ *		     relationship between the PSE controller hardware ports</div><div class='add'>+ *		     and the PSE Power Interfaces, either through software</div><div class='add'>+ *		     mapping or hardware configuration.</div><div class='add'>+ * @pi_get_admin_state: Get the operational state of the PSE PI. This ops</div><div class='add'>+ *			is mandatory.</div><div class='add'>+ * @pi_get_pw_status: Get the power detection status of the PSE PI. This</div><div class='add'>+ *		      ops is mandatory.</div><div class='add'>+ * @pi_get_ext_state: Get the extended state of the PSE PI.</div><div class='add'>+ * @pi_get_pw_class: Get the power class of the PSE PI.</div><div class='add'>+ * @pi_get_actual_pw: Get actual power of the PSE PI in mW.</div><div class='add'>+ * @pi_enable: Configure the PSE PI as enabled.</div><div class='add'>+ * @pi_disable: Configure the PSE PI as disabled.</div><div class='add'>+ * @pi_get_voltage: Return voltage similarly to get_voltage regulator</div><div class='add'>+ *		    callback in uV.</div><div class='add'>+ * @pi_get_pw_limit: Get the configured power limit of the PSE PI in mW.</div><div class='add'>+ * @pi_set_pw_limit: Configure the power limit of the PSE PI in mW.</div><div class='add'>+ * @pi_get_pw_limit_ranges: Get the supported power limit configuration</div><div class='add'>+ *			    range. The driver is in charge of the memory</div><div class='add'>+ *			    allocation and should return the number of</div><div class='add'>+ *			    ranges.</div><div class='add'>+ * @pi_get_prio: Get the PSE PI priority.</div><div class='add'>+ * @pi_set_prio: Configure the PSE PI priority.</div><div class='add'>+ * @pi_get_pw_req: Get the power requested by a PD before enabling the PSE PI.</div><div class='add'>+ *		   This is only relevant when an interrupt is registered using</div><div class='add'>+ *		   devm_pse_irq_helper helper.</div><div class='ctx'>  */</div><div class='ctx'> struct pse_controller_ops {</div><div class='del'>-	int (*ethtool_get_status)(struct pse_controller_dev *pcdev,</div><div class='del'>-		unsigned long id, struct netlink_ext_ack *extack,</div><div class='del'>-		struct pse_control_status *status);</div><div class='del'>-	int (*ethtool_set_config)(struct pse_controller_dev *pcdev,</div><div class='del'>-		unsigned long id, struct netlink_ext_ack *extack,</div><div class='del'>-		const struct pse_control_config *config);</div><div class='add'>+	int (*setup_pi_matrix)(struct pse_controller_dev *pcdev);</div><div class='add'>+	int (*pi_get_admin_state)(struct pse_controller_dev *pcdev, int id,</div><div class='add'>+				  struct pse_admin_state *admin_state);</div><div class='add'>+	int (*pi_get_pw_status)(struct pse_controller_dev *pcdev, int id,</div><div class='add'>+				struct pse_pw_status *pw_status);</div><div class='add'>+	int (*pi_get_ext_state)(struct pse_controller_dev *pcdev, int id,</div><div class='add'>+				struct pse_ext_state_info *ext_state_info);</div><div class='add'>+	int (*pi_get_pw_class)(struct pse_controller_dev *pcdev, int id);</div><div class='add'>+	int (*pi_get_actual_pw)(struct pse_controller_dev *pcdev, int id);</div><div class='add'>+	int (*pi_enable)(struct pse_controller_dev *pcdev, int id);</div><div class='add'>+	int (*pi_disable)(struct pse_controller_dev *pcdev, int id);</div><div class='add'>+	int (*pi_get_voltage)(struct pse_controller_dev *pcdev, int id);</div><div class='add'>+	int (*pi_get_pw_limit)(struct pse_controller_dev *pcdev,</div><div class='add'>+			       int id);</div><div class='add'>+	int (*pi_set_pw_limit)(struct pse_controller_dev *pcdev,</div><div class='add'>+			       int id, int max_mW);</div><div class='add'>+	int (*pi_get_pw_limit_ranges)(struct pse_controller_dev *pcdev, int id,</div><div class='add'>+				      struct pse_pw_limit_ranges *pw_limit_ranges);</div><div class='add'>+	int (*pi_get_prio)(struct pse_controller_dev *pcdev, int id);</div><div class='add'>+	int (*pi_set_prio)(struct pse_controller_dev *pcdev, int id,</div><div class='add'>+			   unsigned int prio);</div><div class='add'>+	int (*pi_get_pw_req)(struct pse_controller_dev *pcdev, int id);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct module;</div><div class='ctx'> struct device_node;</div><div class='ctx'> struct of_phandle_args;</div><div class='ctx'> struct pse_control;</div><div class='add'>+struct ethtool_pse_control_status;</div><div class='add'>+</div><div class='add'>+/* PSE PI pairset pinout can either be Alternative A or Alternative B */</div><div class='add'>+enum pse_pi_pairset_pinout {</div><div class='add'>+	ALTERNATIVE_A,</div><div class='add'>+	ALTERNATIVE_B,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pse_pi_pairset - PSE PI pairset entity describing the pinout</div><div class='add'>+ *			   alternative ant its phandle</div><div class='add'>+ *</div><div class='add'>+ * @pinout: description of the pinout alternative</div><div class='add'>+ * @np: device node pointer describing the pairset phandle</div><div class='add'>+ */</div><div class='add'>+struct pse_pi_pairset {</div><div class='add'>+	enum pse_pi_pairset_pinout pinout;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pse_pi - PSE PI (Power Interface) entity as described in</div><div class='add'>+ *		   IEEE 802.3-2022 145.2.4</div><div class='add'>+ *</div><div class='add'>+ * @pairset: table of the PSE PI pinout alternative for the two pairset</div><div class='add'>+ * @np: device node pointer of the PSE PI node</div><div class='add'>+ * @rdev: regulator represented by the PSE PI</div><div class='add'>+ * @admin_state_enabled: PI enabled state</div><div class='add'>+ * @pw_d: Power domain of the PSE PI</div><div class='add'>+ * @prio: Priority of the PSE PI. Used in static budget evaluation strategy</div><div class='add'>+ * @isr_pd_detected: PSE PI detection status managed by the interruption</div><div class='add'>+ *		     handler. This variable is relevant when the power enabled</div><div class='add'>+ *		     management is managed in software like the static</div><div class='add'>+ *		     budget evaluation strategy.</div><div class='add'>+ * @pw_allocated_mW: Power allocated to a PSE PI to manage power budget in</div><div class='add'>+ *		     static budget evaluation strategy.</div><div class='add'>+ */</div><div class='add'>+struct pse_pi {</div><div class='add'>+	struct pse_pi_pairset pairset[2];</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct regulator_dev *rdev;</div><div class='add'>+	bool admin_state_enabled;</div><div class='add'>+	struct pse_power_domain *pw_d;</div><div class='add'>+	int prio;</div><div class='add'>+	bool isr_pd_detected;</div><div class='add'>+	int pw_allocated_mW;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pse_ntf - PSE notification element</div><div class='add'>+ *</div><div class='add'>+ * @id: ID of the PSE control</div><div class='add'>+ * @notifs: PSE notifications to be reported</div><div class='add'>+ */</div><div class='add'>+struct pse_ntf {</div><div class='add'>+	int id;</div><div class='add'>+	unsigned long notifs;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct pse_controller_dev - PSE controller entity that might</div><div class='hunk'>@@ -64,10 +286,18 @@ struct pse_control;</div><div class='ctx'>  * @pse_control_head: head of internal list of requested PSE controls</div><div class='ctx'>  * @dev: corresponding driver model device struct</div><div class='ctx'>  * @of_pse_n_cells: number of cells in PSE line specifiers</div><div class='del'>- * @of_xlate: translation function to translate from specifier as found in the</div><div class='del'>- *            device tree to id as given to the PSE control ops</div><div class='ctx'>  * @nr_lines: number of PSE controls in this controller device</div><div class='ctx'>  * @lock: Mutex for serialization access to the PSE controller</div><div class='add'>+ * @types: types of the PSE controller</div><div class='add'>+ * @pi: table of PSE PIs described in this controller device</div><div class='add'>+ * @no_of_pse_pi: flag set if the pse_pis devicetree node is not used</div><div class='add'>+ * @irq: PSE interrupt</div><div class='add'>+ * @pis_prio_max: Maximum value allowed for the PSE PIs priority</div><div class='add'>+ * @supp_budget_eval_strategies: budget evaluation strategies supported</div><div class='add'>+ *				 by the PSE</div><div class='add'>+ * @ntf_work: workqueue for PSE notification management</div><div class='add'>+ * @ntf_fifo: PSE notifications FIFO</div><div class='add'>+ * @ntf_fifo_lock: protect @ntf_fifo writer</div><div class='ctx'>  */</div><div class='ctx'> struct pse_controller_dev {</div><div class='ctx'> 	const struct pse_controller_ops *ops;</div><div class='hunk'>@@ -76,10 +306,35 @@ struct pse_controller_dev {</div><div class='ctx'> 	struct list_head pse_control_head;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	int of_pse_n_cells;</div><div class='del'>-	int (*of_xlate)(struct pse_controller_dev *pcdev,</div><div class='del'>-			const struct of_phandle_args *pse_spec);</div><div class='ctx'> 	unsigned int nr_lines;</div><div class='ctx'> 	struct mutex lock;</div><div class='add'>+	enum ethtool_pse_types types;</div><div class='add'>+	struct pse_pi *pi;</div><div class='add'>+	bool no_of_pse_pi;</div><div class='add'>+	int irq;</div><div class='add'>+	unsigned int pis_prio_max;</div><div class='add'>+	u32 supp_budget_eval_strategies;</div><div class='add'>+	struct work_struct ntf_work;</div><div class='add'>+	DECLARE_KFIFO_PTR(ntf_fifo, struct pse_ntf);</div><div class='add'>+	spinlock_t ntf_fifo_lock; /* Protect @ntf_fifo writer */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum pse_budget_eval_strategies - PSE budget evaluation strategies.</div><div class='add'>+ * @PSE_BUDGET_EVAL_STRAT_DISABLED: Budget evaluation strategy disabled.</div><div class='add'>+ * @PSE_BUDGET_EVAL_STRAT_STATIC: PSE static budget evaluation strategy.</div><div class='add'>+ *	Budget evaluation strategy based on the power requested during PD</div><div class='add'>+ *	classification. This strategy is managed by the PSE core.</div><div class='add'>+ * @PSE_BUDGET_EVAL_STRAT_DYNAMIC: PSE dynamic budget evaluation</div><div class='add'>+ *	strategy. Budget evaluation strategy based on the current consumption</div><div class='add'>+ *	per ports compared to the total	power budget. This mode is managed by</div><div class='add'>+ *	the PSE controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum pse_budget_eval_strategies {</div><div class='add'>+	PSE_BUDGET_EVAL_STRAT_DISABLED	= 1 &lt;&lt; 0,</div><div class='add'>+	PSE_BUDGET_EVAL_STRAT_STATIC	= 1 &lt;&lt; 1,</div><div class='add'>+	PSE_BUDGET_EVAL_STRAT_DYNAMIC	= 1 &lt;&lt; 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_PSE_CONTROLLER)</div><div class='hunk'>@@ -88,20 +343,33 @@ void pse_controller_unregister(struct pse_controller_dev *pcdev);</div><div class='ctx'> struct device;</div><div class='ctx'> int devm_pse_controller_register(struct device *dev,</div><div class='ctx'> 				 struct pse_controller_dev *pcdev);</div><div class='add'>+int devm_pse_irq_helper(struct pse_controller_dev *pcdev, int irq,</div><div class='add'>+			int irq_flags, const struct pse_irq_desc *d);</div><div class='ctx'> </div><div class='del'>-struct pse_control *of_pse_control_get(struct device_node *node);</div><div class='add'>+struct pse_control *of_pse_control_get(struct device_node *node,</div><div class='add'>+				       struct phy_device *phydev);</div><div class='ctx'> void pse_control_put(struct pse_control *psec);</div><div class='ctx'> </div><div class='ctx'> int pse_ethtool_get_status(struct pse_control *psec,</div><div class='ctx'> 			   struct netlink_ext_ack *extack,</div><div class='del'>-			   struct pse_control_status *status);</div><div class='add'>+			   struct ethtool_pse_control_status *status);</div><div class='ctx'> int pse_ethtool_set_config(struct pse_control *psec,</div><div class='ctx'> 			   struct netlink_ext_ack *extack,</div><div class='ctx'> 			   const struct pse_control_config *config);</div><div class='add'>+int pse_ethtool_set_pw_limit(struct pse_control *psec,</div><div class='add'>+			     struct netlink_ext_ack *extack,</div><div class='add'>+			     const unsigned int pw_limit);</div><div class='add'>+int pse_ethtool_set_prio(struct pse_control *psec,</div><div class='add'>+			 struct netlink_ext_ack *extack,</div><div class='add'>+			 unsigned int prio);</div><div class='add'>+</div><div class='add'>+bool pse_has_podl(struct pse_control *psec);</div><div class='add'>+bool pse_has_c33(struct pse_control *psec);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static inline struct pse_control *of_pse_control_get(struct device_node *node)</div><div class='add'>+static inline struct pse_control *of_pse_control_get(struct device_node *node,</div><div class='add'>+						     struct phy_device *phydev)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENOENT);</div><div class='ctx'> }</div><div class='hunk'>@@ -112,16 +380,40 @@ static inline void pse_control_put(struct pse_control *psec)</div><div class='ctx'> </div><div class='ctx'> static inline int pse_ethtool_get_status(struct pse_control *psec,</div><div class='ctx'> 					 struct netlink_ext_ack *extack,</div><div class='del'>-					 struct pse_control_status *status)</div><div class='add'>+					 struct ethtool_pse_control_status *status)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int pse_ethtool_set_config(struct pse_control *psec,</div><div class='ctx'> 					 struct netlink_ext_ack *extack,</div><div class='ctx'> 					 const struct pse_control_config *config)</div><div class='ctx'> {</div><div class='del'>-	return -ENOTSUPP;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pse_ethtool_set_pw_limit(struct pse_control *psec,</div><div class='add'>+					   struct netlink_ext_ack *extack,</div><div class='add'>+					   const unsigned int pw_limit)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pse_ethtool_set_prio(struct pse_control *psec,</div><div class='add'>+				       struct netlink_ext_ack *extack,</div><div class='add'>+				       unsigned int prio)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pse_has_podl(struct pse_control *psec)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool pse_has_c33(struct pse_control *psec)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/pseudo_fs.h b/include/linux/pseudo_fs.h<br/>index 730f77381d55..a651e60d9410 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pseudo_fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pseudo_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pseudo_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pseudo_fs.h</a></div><div class='hunk'>@@ -5,9 +5,11 @@</div><div class='ctx'> </div><div class='ctx'> struct pseudo_fs_context {</div><div class='ctx'> 	const struct super_operations *ops;</div><div class='add'>+	const struct export_operations *eops;</div><div class='ctx'> 	const struct xattr_handler * const *xattr;</div><div class='ctx'> 	const struct dentry_operations *dops;</div><div class='ctx'> 	unsigned long magic;</div><div class='add'>+	unsigned int s_d_flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pseudo_fs_context *init_pseudo(struct fs_context *fc,</div><div class='head'>diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h<br/>index f1fd3a8044e0..dd10c22299ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/psi_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/psi_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/psi_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/psi_types.h</a></div><div class='hunk'>@@ -84,11 +84,9 @@ enum psi_aggregators {</div><div class='ctx'> struct psi_group_cpu {</div><div class='ctx'> 	/* 1st cacheline updated by the scheduler */</div><div class='ctx'> </div><div class='del'>-	/* Aggregator needs to know of concurrent changes */</div><div class='del'>-	seqcount_t seq ____cacheline_aligned_in_smp;</div><div class='del'>-</div><div class='ctx'> 	/* States of the tasks belonging to this group */</div><div class='del'>-	unsigned int tasks[NR_PSI_TASK_COUNTS];</div><div class='add'>+	unsigned int tasks[NR_PSI_TASK_COUNTS]</div><div class='add'>+			____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> 	/* Aggregate pressure state derived from the tasks */</div><div class='ctx'> 	u32 state_mask;</div><div class='head'>diff --git a/include/linux/psp-platform-access.h b/include/linux/psp-platform-access.h<br/>index c1dc87fc536b..540abf7de048 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/psp-platform-access.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/psp-platform-access.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/psp-platform-access.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/psp-platform-access.h</a></div><div class='hunk'>@@ -6,8 +6,11 @@</div><div class='ctx'> #include &lt;linux/psp.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum psp_platform_access_msg {</div><div class='del'>-	PSP_CMD_NONE = 0x0,</div><div class='del'>-	PSP_I2C_REQ_BUS_CMD = 0x64,</div><div class='add'>+	PSP_CMD_NONE			= 0x0,</div><div class='add'>+	PSP_SFS_GET_FW_VERSIONS,</div><div class='add'>+	PSP_SFS_UPDATE,</div><div class='add'>+	PSP_CMD_HSTI_QUERY		= 0x14,</div><div class='add'>+	PSP_I2C_REQ_BUS_CMD		= 0x64,</div><div class='ctx'> 	PSP_DYNAMIC_BOOST_GET_NONCE,</div><div class='ctx'> 	PSP_DYNAMIC_BOOST_SET_UID,</div><div class='ctx'> 	PSP_DYNAMIC_BOOST_GET_PARAMETER,</div><div class='head'>diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h<br/>index 3705c2044fc0..69ffa4b4d1fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/psp-sev.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/psp-sev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/psp-sev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/psp-sev.h</a></div><div class='hunk'>@@ -14,6 +14,39 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/psp-sev.h&gt;</div><div class='ctx'> </div><div class='add'>+/* As defined by SEV API, under "Guest Policy". */</div><div class='add'>+#define SEV_POLICY_MASK_NODBG			BIT(0)</div><div class='add'>+#define SEV_POLICY_MASK_NOKS			BIT(1)</div><div class='add'>+#define SEV_POLICY_MASK_ES			BIT(2)</div><div class='add'>+#define SEV_POLICY_MASK_NOSEND			BIT(3)</div><div class='add'>+#define SEV_POLICY_MASK_DOMAIN			BIT(4)</div><div class='add'>+#define SEV_POLICY_MASK_SEV			BIT(5)</div><div class='add'>+#define SEV_POLICY_MASK_API_MAJOR		GENMASK(23, 16)</div><div class='add'>+#define SEV_POLICY_MASK_API_MINOR		GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+/* As defined by SEV-SNP Firmware ABI, under "Guest Policy". */</div><div class='add'>+#define SNP_POLICY_MASK_API_MINOR		GENMASK_ULL(7, 0)</div><div class='add'>+#define SNP_POLICY_MASK_API_MAJOR		GENMASK_ULL(15, 8)</div><div class='add'>+#define SNP_POLICY_MASK_SMT			BIT_ULL(16)</div><div class='add'>+#define SNP_POLICY_MASK_RSVD_MBO		BIT_ULL(17)</div><div class='add'>+#define SNP_POLICY_MASK_MIGRATE_MA		BIT_ULL(18)</div><div class='add'>+#define SNP_POLICY_MASK_DEBUG			BIT_ULL(19)</div><div class='add'>+#define SNP_POLICY_MASK_SINGLE_SOCKET		BIT_ULL(20)</div><div class='add'>+#define SNP_POLICY_MASK_CXL_ALLOW		BIT_ULL(21)</div><div class='add'>+#define SNP_POLICY_MASK_MEM_AES_256_XTS		BIT_ULL(22)</div><div class='add'>+#define SNP_POLICY_MASK_RAPL_DIS		BIT_ULL(23)</div><div class='add'>+#define SNP_POLICY_MASK_CIPHERTEXT_HIDING_DRAM	BIT_ULL(24)</div><div class='add'>+#define SNP_POLICY_MASK_PAGE_SWAP_DISABLE	BIT_ULL(25)</div><div class='add'>+</div><div class='add'>+/* Base SEV-SNP policy bitmask for minimum supported SEV firmware version */</div><div class='add'>+#define SNP_POLICY_MASK_BASE	(SNP_POLICY_MASK_API_MINOR		| \</div><div class='add'>+				 SNP_POLICY_MASK_API_MAJOR		| \</div><div class='add'>+				 SNP_POLICY_MASK_SMT			| \</div><div class='add'>+				 SNP_POLICY_MASK_RSVD_MBO		| \</div><div class='add'>+				 SNP_POLICY_MASK_MIGRATE_MA		| \</div><div class='add'>+				 SNP_POLICY_MASK_DEBUG			| \</div><div class='add'>+				 SNP_POLICY_MASK_SINGLE_SOCKET)</div><div class='add'>+</div><div class='ctx'> #define SEV_FW_BLOB_MAX_SIZE	0x4000	/* 16KB */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -107,7 +140,15 @@ enum sev_cmd {</div><div class='ctx'> 	SEV_CMD_SNP_DOWNLOAD_FIRMWARE_EX = 0x0CA,</div><div class='ctx'> 	SEV_CMD_SNP_COMMIT		= 0x0CB,</div><div class='ctx'> 	SEV_CMD_SNP_VLEK_LOAD		= 0x0CD,</div><div class='del'>-</div><div class='add'>+	SEV_CMD_SNP_FEATURE_INFO	= 0x0CE,</div><div class='add'>+</div><div class='add'>+	/* SEV-TIO commands */</div><div class='add'>+	SEV_CMD_TIO_STATUS		= 0x0D0,</div><div class='add'>+	SEV_CMD_TIO_INIT		= 0x0D1,</div><div class='add'>+	SEV_CMD_TIO_DEV_CREATE		= 0x0D2,</div><div class='add'>+	SEV_CMD_TIO_DEV_RECLAIM		= 0x0D3,</div><div class='add'>+	SEV_CMD_TIO_DEV_CONNECT		= 0x0D4,</div><div class='add'>+	SEV_CMD_TIO_DEV_DISCONNECT	= 0x0D5,</div><div class='ctx'> 	SEV_CMD_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -594,6 +635,7 @@ struct sev_data_snp_addr {</div><div class='ctx'>  * @imi_en: launch flow is launching an IMI (Incoming Migration Image) for the</div><div class='ctx'>  *          purpose of guest-assisted migration.</div><div class='ctx'>  * @rsvd: reserved</div><div class='add'>+ * @desired_tsc_khz: hypervisor desired mean TSC freq in kHz of the guest</div><div class='ctx'>  * @gosvw: guest OS-visible workarounds, as defined by hypervisor</div><div class='ctx'>  */</div><div class='ctx'> struct sev_data_snp_launch_start {</div><div class='hunk'>@@ -603,6 +645,7 @@ struct sev_data_snp_launch_start {</div><div class='ctx'> 	u32 ma_en:1;				/* In */</div><div class='ctx'> 	u32 imi_en:1;				/* In */</div><div class='ctx'> 	u32 rsvd:30;</div><div class='add'>+	u32 desired_tsc_khz;			/* In */</div><div class='ctx'> 	u8 gosvw[16];				/* In */</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -658,6 +701,7 @@ struct sev_data_snp_launch_update {</div><div class='ctx'>  * @id_auth_paddr: system physical address of ID block authentication structure</div><div class='ctx'>  * @id_block_en: indicates whether ID block is present</div><div class='ctx'>  * @auth_key_en: indicates whether author key is present in authentication structure</div><div class='add'>+ * @vcek_disabled: indicates whether use of VCEK is allowed for attestation reports</div><div class='ctx'>  * @rsvd: reserved</div><div class='ctx'>  * @host_data: host-supplied data for guest, not interpreted by firmware</div><div class='ctx'>  */</div><div class='hunk'>@@ -667,7 +711,8 @@ struct sev_data_snp_launch_finish {</div><div class='ctx'> 	u64 id_auth_paddr;</div><div class='ctx'> 	u8 id_block_en:1;</div><div class='ctx'> 	u8 auth_key_en:1;</div><div class='del'>-	u64 rsvd:62;</div><div class='add'>+	u8 vcek_disabled:1;</div><div class='add'>+	u64 rsvd:61;</div><div class='ctx'> 	u8 host_data[32];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -743,10 +788,14 @@ struct sev_data_snp_guest_request {</div><div class='ctx'> struct sev_data_snp_init_ex {</div><div class='ctx'> 	u32 init_rmp:1;</div><div class='ctx'> 	u32 list_paddr_en:1;</div><div class='del'>-	u32 rsvd:30;</div><div class='add'>+	u32 rapl_dis:1;</div><div class='add'>+	u32 ciphertext_hiding_en:1;</div><div class='add'>+	u32 tio_en:1;</div><div class='add'>+	u32 rsvd:27;</div><div class='ctx'> 	u32 rsvd1;</div><div class='ctx'> 	u64 list_paddr;</div><div class='del'>-	u8  rsvd2[48];</div><div class='add'>+	u16 max_snp_asid;</div><div class='add'>+	u8  rsvd2[46];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -795,10 +844,13 @@ struct sev_data_snp_shutdown_ex {</div><div class='ctx'>  * @probe: True if this is being called as part of CCP module probe, which</div><div class='ctx'>  *  will defer SEV_INIT/SEV_INIT_EX firmware initialization until needed</div><div class='ctx'>  *  unless psp_init_on_probe module param is set</div><div class='add'>+ * @max_snp_asid: When non-zero, enable ciphertext hiding and specify the</div><div class='add'>+ *  maximum ASID that can be used for an SEV-SNP guest.</div><div class='ctx'>  */</div><div class='ctx'> struct sev_platform_init_args {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	bool probe;</div><div class='add'>+	unsigned int max_snp_asid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -810,9 +862,55 @@ struct sev_data_snp_commit {</div><div class='ctx'> 	u32 len;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct sev_data_snp_feature_info - SEV_SNP_FEATURE_INFO structure</div><div class='add'>+ *</div><div class='add'>+ * @length: len of the command buffer read by the PSP</div><div class='add'>+ * @ecx_in: subfunction index</div><div class='add'>+ * @feature_info_paddr : System Physical Address of the FEATURE_INFO structure</div><div class='add'>+ */</div><div class='add'>+struct sev_data_snp_feature_info {</div><div class='add'>+	u32 length;</div><div class='add'>+	u32 ecx_in;</div><div class='add'>+	u64 feature_info_paddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct feature_info - FEATURE_INFO structure</div><div class='add'>+ *</div><div class='add'>+ * @eax: output of SNP_FEATURE_INFO command</div><div class='add'>+ * @ebx: output of SNP_FEATURE_INFO command</div><div class='add'>+ * @ecx: output of SNP_FEATURE_INFO command</div><div class='add'>+ * #edx: output of SNP_FEATURE_INFO command</div><div class='add'>+ */</div><div class='add'>+struct snp_feature_info {</div><div class='add'>+	u32 eax;</div><div class='add'>+	u32 ebx;</div><div class='add'>+	u32 ecx;</div><div class='add'>+	u32 edx;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Feature bits in ECX */</div><div class='add'>+#define SNP_RAPL_DISABLE_SUPPORTED		BIT(2)</div><div class='add'>+#define SNP_CIPHER_TEXT_HIDING_SUPPORTED	BIT(3)</div><div class='add'>+#define SNP_AES_256_XTS_POLICY_SUPPORTED	BIT(4)</div><div class='add'>+#define SNP_CXL_ALLOW_POLICY_SUPPORTED		BIT(5)</div><div class='add'>+</div><div class='add'>+/* Feature bits in EBX */</div><div class='add'>+#define SNP_SEV_TIO_SUPPORTED			BIT(1)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CRYPTO_DEV_SP_PSP</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * sev_module_init - perform PSP SEV module initialization</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * 0 if the PSP module is successfully initialized</div><div class='add'>+ * negative value if the PSP module initialization fails</div><div class='add'>+ */</div><div class='add'>+int sev_module_init(void);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * sev_platform_init - perform SEV INIT command</div><div class='ctx'>  *</div><div class='ctx'>  * @args: struct sev_platform_init_args to pass in arguments</div><div class='hunk'>@@ -942,7 +1040,11 @@ int sev_do_cmd(int cmd, void *data, int *psp_ret);</div><div class='ctx'> </div><div class='ctx'> void *psp_copy_user_blob(u64 uaddr, u32 len);</div><div class='ctx'> void *snp_alloc_firmware_page(gfp_t mask);</div><div class='add'>+int snp_reclaim_pages(unsigned long paddr, unsigned int npages, bool locked);</div><div class='ctx'> void snp_free_firmware_page(void *addr);</div><div class='add'>+void sev_platform_shutdown(void);</div><div class='add'>+bool sev_is_snp_ciphertext_hiding_supported(void);</div><div class='add'>+u64 sev_get_snp_policy_bits(void);</div><div class='ctx'> </div><div class='ctx'> #else	/* !CONFIG_CRYPTO_DEV_SP_PSP */</div><div class='ctx'> </div><div class='hunk'>@@ -975,8 +1077,17 @@ static inline void *snp_alloc_firmware_page(gfp_t mask)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int snp_reclaim_pages(unsigned long paddr, unsigned int npages, bool locked)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void snp_free_firmware_page(void *addr) { }</div><div class='ctx'> </div><div class='add'>+static inline void sev_platform_shutdown(void) { }</div><div class='add'>+</div><div class='add'>+static inline bool sev_is_snp_ciphertext_hiding_supported(void) { return false; }</div><div class='add'>+</div><div class='ctx'> #endif	/* CONFIG_CRYPTO_DEV_SP_PSP */</div><div class='ctx'> </div><div class='ctx'> #endif	/* __PSP_SEV_H__ */</div><div class='head'>diff --git a/include/linux/pstore.h b/include/linux/pstore.h<br/>index 638507a3c8ff..fed601053c51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pstore.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pstore.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pstore.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pstore.h</a></div><div class='hunk'>@@ -182,7 +182,7 @@ struct pstore_info {</div><div class='ctx'> 	struct module	*owner;</div><div class='ctx'> 	const char	*name;</div><div class='ctx'> </div><div class='del'>-	spinlock_t	buf_lock;</div><div class='add'>+	raw_spinlock_t	buf_lock;</div><div class='ctx'> 	char		*buf;</div><div class='ctx'> 	size_t		bufsize;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/ptdump.h b/include/linux/ptdump.h<br/>index 2a3a95586425..240bd3bff18d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ptdump.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ptdump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ptdump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ptdump.h</a></div><div class='hunk'>@@ -11,13 +11,30 @@ struct ptdump_range {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ptdump_state {</div><div class='del'>-	/* level is 0:PGD to 4:PTE, or -1 if unknown */</div><div class='del'>-	void (*note_page)(struct ptdump_state *st, unsigned long addr,</div><div class='del'>-			  int level, u64 val);</div><div class='del'>-	void (*effective_prot)(struct ptdump_state *st, int level, u64 val);</div><div class='add'>+	void (*note_page_pte)(struct ptdump_state *st, unsigned long addr, pte_t pte);</div><div class='add'>+	void (*note_page_pmd)(struct ptdump_state *st, unsigned long addr, pmd_t pmd);</div><div class='add'>+	void (*note_page_pud)(struct ptdump_state *st, unsigned long addr, pud_t pud);</div><div class='add'>+	void (*note_page_p4d)(struct ptdump_state *st, unsigned long addr, p4d_t p4d);</div><div class='add'>+	void (*note_page_pgd)(struct ptdump_state *st, unsigned long addr, pgd_t pgd);</div><div class='add'>+	void (*note_page_flush)(struct ptdump_state *st);</div><div class='add'>+	void (*effective_prot_pte)(struct ptdump_state *st, pte_t pte);</div><div class='add'>+	void (*effective_prot_pmd)(struct ptdump_state *st, pmd_t pmd);</div><div class='add'>+	void (*effective_prot_pud)(struct ptdump_state *st, pud_t pud);</div><div class='add'>+	void (*effective_prot_p4d)(struct ptdump_state *st, p4d_t p4d);</div><div class='add'>+	void (*effective_prot_pgd)(struct ptdump_state *st, pgd_t pgd);</div><div class='ctx'> 	const struct ptdump_range *range;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+bool ptdump_walk_pgd_level_core(struct seq_file *m,</div><div class='add'>+				struct mm_struct *mm, pgd_t *pgd,</div><div class='add'>+				bool checkwx, bool dmesg);</div><div class='ctx'> void ptdump_walk_pgd(struct ptdump_state *st, struct mm_struct *mm, pgd_t *pgd);</div><div class='add'>+bool ptdump_check_wx(void);</div><div class='add'>+</div><div class='add'>+static inline void debug_checkwx(void)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_DEBUG_WX))</div><div class='add'>+		ptdump_check_wx();</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_PTDUMP_H */</div><div class='head'>diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h<br/>index 1b5a953c6bbc..3a74f69e0b59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ptp_classify.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ptp_classify.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ptp_classify.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ptp_classify.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #ifndef _PTP_CLASSIFY_H_</div><div class='ctx'> #define _PTP_CLASSIFY_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='head'>diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h<br/>index 6e4b8206c7d0..884364596dd3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ptp_clock_kernel.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ptp_clock_kernel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ptp_clock_kernel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ptp_clock_kernel.h</a></div><div class='hunk'>@@ -47,10 +47,12 @@ struct system_device_crosststamp;</div><div class='ctx'>  * struct ptp_system_timestamp - system time corresponding to a PHC timestamp</div><div class='ctx'>  * @pre_ts: system timestamp before capturing PHC</div><div class='ctx'>  * @post_ts: system timestamp after capturing PHC</div><div class='add'>+ * @clockid: clock-base used for capturing the system timestamps</div><div class='ctx'>  */</div><div class='ctx'> struct ptp_system_timestamp {</div><div class='ctx'> 	struct timespec64 pre_ts;</div><div class='ctx'> 	struct timespec64 post_ts;</div><div class='add'>+	clockid_t clockid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -65,7 +67,25 @@ struct ptp_system_timestamp {</div><div class='ctx'>  * @n_ext_ts:  The number of external time stamp channels.</div><div class='ctx'>  * @n_per_out: The number of programmable periodic signals.</div><div class='ctx'>  * @n_pins:    The number of programmable pins.</div><div class='add'>+ * @n_per_lp:  The number of channels that support loopback the periodic</div><div class='add'>+ *             output signal.</div><div class='ctx'>  * @pps:       Indicates whether the clock supports a PPS callback.</div><div class='add'>+ *</div><div class='add'>+ * @supported_perout_flags:  The set of flags the driver supports for the</div><div class='add'>+ *                           PTP_PEROUT_REQUEST ioctl. The PTP core will</div><div class='add'>+ *                           reject a request with any flag not specified</div><div class='add'>+ *                           here.</div><div class='add'>+ *</div><div class='add'>+ * @supported_extts_flags:  The set of flags the driver supports for the</div><div class='add'>+ *                          PTP_EXTTS_REQUEST ioctl. The PTP core will use</div><div class='add'>+ *                          this list to reject unsupported requests.</div><div class='add'>+ *                          PTP_ENABLE_FEATURE is assumed and does not need to</div><div class='add'>+ *                          be included. If PTP_STRICT_FLAGS is *not* set,</div><div class='add'>+ *                          then both PTP_RISING_EDGE and PTP_FALLING_EDGE</div><div class='add'>+ *                          will be assumed. Note that PTP_STRICT_FLAGS must</div><div class='add'>+ *                          be set if the drivers wants to honor</div><div class='add'>+ *                          PTP_EXTTS_REQUEST2 and any future flags.</div><div class='add'>+ *</div><div class='ctx'>  * @pin_config: Array of length 'n_pins'. If the number of</div><div class='ctx'>  *              programmable pins is nonzero, then drivers must</div><div class='ctx'>  *              allocate and initialize this array.</div><div class='hunk'>@@ -157,6 +177,11 @@ struct ptp_system_timestamp {</div><div class='ctx'>  *                scheduling time (&gt;=0) or negative value in case further</div><div class='ctx'>  *                scheduling is not required.</div><div class='ctx'>  *</div><div class='add'>+ * @perout_loopback: Request driver to enable or disable the periodic output</div><div class='add'>+ *                   signal loopback.</div><div class='add'>+ *                   parameter index: index of the periodic output signal channel.</div><div class='add'>+ *                   parameter on: caller passes one to enable or zero to disable.</div><div class='add'>+ *</div><div class='ctx'>  * Drivers should embed their ptp_clock_info within a private</div><div class='ctx'>  * structure, obtaining a reference to it using container_of().</div><div class='ctx'>  *</div><div class='hunk'>@@ -171,7 +196,10 @@ struct ptp_clock_info {</div><div class='ctx'> 	int n_ext_ts;</div><div class='ctx'> 	int n_per_out;</div><div class='ctx'> 	int n_pins;</div><div class='add'>+	int n_per_lp;</div><div class='ctx'> 	int pps;</div><div class='add'>+	unsigned int supported_perout_flags;</div><div class='add'>+	unsigned int supported_extts_flags;</div><div class='ctx'> 	struct ptp_pin_desc *pin_config;</div><div class='ctx'> 	int (*adjfine)(struct ptp_clock_info *ptp, long scaled_ppm);</div><div class='ctx'> 	int (*adjphase)(struct ptp_clock_info *ptp, s32 phase);</div><div class='hunk'>@@ -193,6 +221,8 @@ struct ptp_clock_info {</div><div class='ctx'> 	int (*verify)(struct ptp_clock_info *ptp, unsigned int pin,</div><div class='ctx'> 		      enum ptp_pin_function func, unsigned int chan);</div><div class='ctx'> 	long (*do_aux_work)(struct ptp_clock_info *ptp);</div><div class='add'>+	int (*perout_loopback)(struct ptp_clock_info *ptp, unsigned int index,</div><div class='add'>+			       int on);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ptp_clock;</div><div class='hunk'>@@ -305,7 +335,7 @@ static inline u64 adjust_by_scaled_ppm(u64 base, long scaled_ppm)</div><div class='ctx'>  * @info:   Structure describing the new clock.</div><div class='ctx'>  * @parent: Pointer to the parent device of the new clock.</div><div class='ctx'>  *</div><div class='del'>- * Returns a valid pointer on success or PTR_ERR on failure.  If PHC</div><div class='add'>+ * Returns: a valid pointer on success or PTR_ERR on failure.  If PHC</div><div class='ctx'>  * support is missing at the configuration level, this function</div><div class='ctx'>  * returns NULL, and drivers are expected to gracefully handle that</div><div class='ctx'>  * case separately.</div><div class='hunk'>@@ -341,6 +371,24 @@ extern void ptp_clock_event(struct ptp_clock *ptp,</div><div class='ctx'> extern int ptp_clock_index(struct ptp_clock *ptp);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ptp_clock_index_by_of_node() - obtain the device index of</div><div class='add'>+ * a PTP clock based on the PTP device of_node</div><div class='add'>+ *</div><div class='add'>+ * @np:    The device of_node pointer of the PTP device.</div><div class='add'>+ * Return: The PHC index on success or -1 on failure.</div><div class='add'>+ */</div><div class='add'>+int ptp_clock_index_by_of_node(struct device_node *np);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ptp_clock_index_by_dev() - obtain the device index of</div><div class='add'>+ * a PTP clock based on the PTP device.</div><div class='add'>+ *</div><div class='add'>+ * @parent:    The parent device (PTP device) pointer of the PTP clock.</div><div class='add'>+ * Return: The PHC index on success or -1 on failure.</div><div class='add'>+ */</div><div class='add'>+int ptp_clock_index_by_dev(struct device *parent);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ptp_find_pin() - obtain the pin index of a given auxiliary function</div><div class='ctx'>  *</div><div class='ctx'>  * The caller must hold ptp_clock::pincfg_mux.  Drivers do not have</div><div class='hunk'>@@ -405,6 +453,10 @@ static inline void ptp_clock_event(struct ptp_clock *ptp,</div><div class='ctx'> { }</div><div class='ctx'> static inline int ptp_clock_index(struct ptp_clock *ptp)</div><div class='ctx'> { return -1; }</div><div class='add'>+static inline int ptp_clock_index_by_of_node(struct device_node *np)</div><div class='add'>+{ return -1; }</div><div class='add'>+static inline int ptp_clock_index_by_dev(struct device *parent)</div><div class='add'>+{ return -1; }</div><div class='ctx'> static inline int ptp_find_pin(struct ptp_clock *ptp,</div><div class='ctx'> 			       enum ptp_pin_function func, unsigned int chan)</div><div class='ctx'> { return -1; }</div><div class='hunk'>@@ -443,7 +495,7 @@ int ptp_get_vclocks_index(int pclock_index, int **vclock_index);</div><div class='ctx'>  * @hwtstamp:     timestamp</div><div class='ctx'>  * @vclock_index: phc index of ptp vclock.</div><div class='ctx'>  *</div><div class='del'>- * Returns converted timestamp, or 0 on error.</div><div class='add'>+ * Returns: converted timestamp, or 0 on error.</div><div class='ctx'>  */</div><div class='ctx'> ktime_t ptp_convert_timestamp(const ktime_t *hwtstamp, int vclock_index);</div><div class='ctx'> #else</div><div class='hunk'>@@ -458,13 +510,13 @@ static inline ktime_t ptp_convert_timestamp(const ktime_t *hwtstamp,</div><div class='ctx'> static inline void ptp_read_system_prets(struct ptp_system_timestamp *sts)</div><div class='ctx'> {</div><div class='ctx'> 	if (sts)</div><div class='del'>-		ktime_get_real_ts64(&amp;sts-&gt;pre_ts);</div><div class='add'>+		ktime_get_clock_ts64(sts-&gt;clockid, &amp;sts-&gt;pre_ts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ptp_read_system_postts(struct ptp_system_timestamp *sts)</div><div class='ctx'> {</div><div class='ctx'> 	if (sts)</div><div class='del'>-		ktime_get_real_ts64(&amp;sts-&gt;post_ts);</div><div class='add'>+		ktime_get_clock_ts64(sts-&gt;clockid, &amp;sts-&gt;post_ts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/ptr_ring.h b/include/linux/ptr_ring.h<br/>index 808f9d3ee546..534531807d95 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ptr_ring.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ptr_ring.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ptr_ring.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ptr_ring.h</a></div><div class='hunk'>@@ -243,6 +243,24 @@ static inline bool ptr_ring_empty_bh(struct ptr_ring *r)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Zero entries from tail to specified head.</div><div class='add'>+ * NB: if consumer_head can be &gt;= r-&gt;size need to fixup tail later.</div><div class='add'>+ */</div><div class='add'>+static inline void __ptr_ring_zero_tail(struct ptr_ring *r, int consumer_head)</div><div class='add'>+{</div><div class='add'>+	int head = consumer_head;</div><div class='add'>+</div><div class='add'>+	/* Zero out entries in the reverse order: this way we touch the</div><div class='add'>+	 * cache line that producer might currently be reading the last;</div><div class='add'>+	 * producer won't make progress and touch other cache lines</div><div class='add'>+	 * besides the first one until we write out all entries.</div><div class='add'>+	 */</div><div class='add'>+	while (likely(head &gt; r-&gt;consumer_tail))</div><div class='add'>+		r-&gt;queue[--head] = NULL;</div><div class='add'>+</div><div class='add'>+	r-&gt;consumer_tail = consumer_head;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Must only be called after __ptr_ring_peek returned !NULL */</div><div class='ctx'> static inline void __ptr_ring_discard_one(struct ptr_ring *r)</div><div class='ctx'> {</div><div class='hunk'>@@ -261,8 +279,7 @@ static inline void __ptr_ring_discard_one(struct ptr_ring *r)</div><div class='ctx'> 	/* Note: we must keep consumer_head valid at all times for __ptr_ring_empty</div><div class='ctx'> 	 * to work correctly.</div><div class='ctx'> 	 */</div><div class='del'>-	int consumer_head = r-&gt;consumer_head;</div><div class='del'>-	int head = consumer_head++;</div><div class='add'>+	int consumer_head = r-&gt;consumer_head + 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Once we have processed enough entries invalidate them in</div><div class='ctx'> 	 * the ring all at once so producer can reuse their space in the ring.</div><div class='hunk'>@@ -270,16 +287,9 @@ static inline void __ptr_ring_discard_one(struct ptr_ring *r)</div><div class='ctx'> 	 * but helps keep the implementation simple.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(consumer_head - r-&gt;consumer_tail &gt;= r-&gt;batch ||</div><div class='del'>-		     consumer_head &gt;= r-&gt;size)) {</div><div class='del'>-		/* Zero out entries in the reverse order: this way we touch the</div><div class='del'>-		 * cache line that producer might currently be reading the last;</div><div class='del'>-		 * producer won't make progress and touch other cache lines</div><div class='del'>-		 * besides the first one until we write out all entries.</div><div class='del'>-		 */</div><div class='del'>-		while (likely(head &gt;= r-&gt;consumer_tail))</div><div class='del'>-			r-&gt;queue[head--] = NULL;</div><div class='del'>-		r-&gt;consumer_tail = consumer_head;</div><div class='del'>-	}</div><div class='add'>+		     consumer_head &gt;= r-&gt;size))</div><div class='add'>+		__ptr_ring_zero_tail(r, consumer_head);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(consumer_head &gt;= r-&gt;size)) {</div><div class='ctx'> 		consumer_head = 0;</div><div class='ctx'> 		r-&gt;consumer_tail = 0;</div><div class='hunk'>@@ -464,11 +474,11 @@ static inline int ptr_ring_consume_batched_bh(struct ptr_ring *r,</div><div class='ctx'> /* Not all gfp_t flags (besides GFP_KERNEL) are allowed. See</div><div class='ctx'>  * documentation for vmalloc for which of them are legal.</div><div class='ctx'>  */</div><div class='del'>-static inline void **__ptr_ring_init_queue_alloc(unsigned int size, gfp_t gfp)</div><div class='add'>+static inline void **__ptr_ring_init_queue_alloc_noprof(unsigned int size, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	if (size &gt; KMALLOC_MAX_SIZE / sizeof(void *))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	return kvmalloc_array(size, sizeof(void *), gfp | __GFP_ZERO);</div><div class='add'>+	return kvmalloc_array_noprof(size, sizeof(void *), gfp | __GFP_ZERO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void __ptr_ring_set_size(struct ptr_ring *r, int size)</div><div class='hunk'>@@ -484,9 +494,9 @@ static inline void __ptr_ring_set_size(struct ptr_ring *r, int size)</div><div class='ctx'> 		r-&gt;batch = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ptr_ring_init(struct ptr_ring *r, int size, gfp_t gfp)</div><div class='add'>+static inline int ptr_ring_init_noprof(struct ptr_ring *r, int size, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	r-&gt;queue = __ptr_ring_init_queue_alloc(size, gfp);</div><div class='add'>+	r-&gt;queue = __ptr_ring_init_queue_alloc_noprof(size, gfp);</div><div class='ctx'> 	if (!r-&gt;queue)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -497,6 +507,7 @@ static inline int ptr_ring_init(struct ptr_ring *r, int size, gfp_t gfp)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#define ptr_ring_init(...)	alloc_hooks(ptr_ring_init_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return entries into ring. Destroy entries that don't fit.</div><div class='hunk'>@@ -512,7 +523,6 @@ static inline void ptr_ring_unconsume(struct ptr_ring *r, void **batch, int n,</div><div class='ctx'> 				      void (*destroy)(void *))</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int head;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;r-&gt;consumer_lock, flags);</div><div class='ctx'> 	spin_lock(&amp;r-&gt;producer_lock);</div><div class='hunk'>@@ -524,17 +534,14 @@ static inline void ptr_ring_unconsume(struct ptr_ring *r, void **batch, int n,</div><div class='ctx'> 	 * Clean out buffered entries (for simplicity). This way following code</div><div class='ctx'> 	 * can test entries for NULL and if not assume they are valid.</div><div class='ctx'> 	 */</div><div class='del'>-	head = r-&gt;consumer_head - 1;</div><div class='del'>-	while (likely(head &gt;= r-&gt;consumer_tail))</div><div class='del'>-		r-&gt;queue[head--] = NULL;</div><div class='del'>-	r-&gt;consumer_tail = r-&gt;consumer_head;</div><div class='add'>+	__ptr_ring_zero_tail(r, r-&gt;consumer_head);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Go over entries in batch, start moving head back and copy entries.</div><div class='ctx'> 	 * Stop when we run into previously unconsumed entries.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (n) {</div><div class='del'>-		head = r-&gt;consumer_head - 1;</div><div class='add'>+		int head = r-&gt;consumer_head - 1;</div><div class='ctx'> 		if (head &lt; 0)</div><div class='ctx'> 			head = r-&gt;size - 1;</div><div class='ctx'> 		if (r-&gt;queue[head]) {</div><div class='hunk'>@@ -587,11 +594,11 @@ static inline void **__ptr_ring_swap_queue(struct ptr_ring *r, void **queue,</div><div class='ctx'>  * In particular if you consume ring in interrupt or BH context, you must</div><div class='ctx'>  * disable interrupts/BH when doing so.</div><div class='ctx'>  */</div><div class='del'>-static inline int ptr_ring_resize(struct ptr_ring *r, int size, gfp_t gfp,</div><div class='add'>+static inline int ptr_ring_resize_noprof(struct ptr_ring *r, int size, gfp_t gfp,</div><div class='ctx'> 				  void (*destroy)(void *))</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	void **queue = __ptr_ring_init_queue_alloc(size, gfp);</div><div class='add'>+	void **queue = __ptr_ring_init_queue_alloc_noprof(size, gfp);</div><div class='ctx'> 	void **old;</div><div class='ctx'> </div><div class='ctx'> 	if (!queue)</div><div class='hunk'>@@ -609,39 +616,39 @@ static inline int ptr_ring_resize(struct ptr_ring *r, int size, gfp_t gfp,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#define ptr_ring_resize(...)	alloc_hooks(ptr_ring_resize_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Note: producer lock is nested within consumer lock, so if you</div><div class='ctx'>  * resize you must make sure all uses nest correctly.</div><div class='del'>- * In particular if you consume ring in interrupt or BH context, you must</div><div class='del'>- * disable interrupts/BH when doing so.</div><div class='add'>+ * In particular if you consume ring in BH context, you must</div><div class='add'>+ * disable BH when doing so.</div><div class='ctx'>  */</div><div class='del'>-static inline int ptr_ring_resize_multiple(struct ptr_ring **rings,</div><div class='del'>-					   unsigned int nrings,</div><div class='del'>-					   int size,</div><div class='del'>-					   gfp_t gfp, void (*destroy)(void *))</div><div class='add'>+static inline int ptr_ring_resize_multiple_bh_noprof(struct ptr_ring **rings,</div><div class='add'>+						     unsigned int nrings,</div><div class='add'>+						     int size, gfp_t gfp,</div><div class='add'>+						     void (*destroy)(void *))</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	void ***queues;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	queues = kmalloc_array(nrings, sizeof(*queues), gfp);</div><div class='add'>+	queues = kmalloc_array_noprof(nrings, sizeof(*queues), gfp);</div><div class='ctx'> 	if (!queues)</div><div class='ctx'> 		goto noqueues;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nrings; ++i) {</div><div class='del'>-		queues[i] = __ptr_ring_init_queue_alloc(size, gfp);</div><div class='add'>+		queues[i] = __ptr_ring_init_queue_alloc_noprof(size, gfp);</div><div class='ctx'> 		if (!queues[i])</div><div class='ctx'> 			goto nomem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nrings; ++i) {</div><div class='del'>-		spin_lock_irqsave(&amp;(rings[i])-&gt;consumer_lock, flags);</div><div class='add'>+		spin_lock_bh(&amp;(rings[i])-&gt;consumer_lock);</div><div class='ctx'> 		spin_lock(&amp;(rings[i])-&gt;producer_lock);</div><div class='ctx'> 		queues[i] = __ptr_ring_swap_queue(rings[i], queues[i],</div><div class='ctx'> 						  size, gfp, destroy);</div><div class='ctx'> 		spin_unlock(&amp;(rings[i])-&gt;producer_lock);</div><div class='del'>-		spin_unlock_irqrestore(&amp;(rings[i])-&gt;consumer_lock, flags);</div><div class='add'>+		spin_unlock_bh(&amp;(rings[i])-&gt;consumer_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nrings; ++i)</div><div class='hunk'>@@ -660,6 +667,8 @@ nomem:</div><div class='ctx'> noqueues:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='add'>+#define ptr_ring_resize_multiple_bh(...) \</div><div class='add'>+		alloc_hooks(ptr_ring_resize_multiple_bh_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> static inline void ptr_ring_cleanup(struct ptr_ring *r, void (*destroy)(void *))</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/pwm.h b/include/linux/pwm.h<br/>index 4a6568dfdf3f..b11ae91723f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pwm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pwm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pwm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pwm.h</a></div><div class='hunk'>@@ -2,10 +2,16 @@</div><div class='ctx'> #ifndef __LINUX_PWM_H</div><div class='ctx'> #define __LINUX_PWM_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> </div><div class='add'>+MODULE_IMPORT_NS("PWM");</div><div class='add'>+</div><div class='ctx'> struct pwm_chip;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -45,6 +51,31 @@ enum {</div><div class='ctx'> 	PWMF_EXPORTED = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct pwm_waveform - description of a PWM waveform</div><div class='add'>+ * @period_length_ns: PWM period</div><div class='add'>+ * @duty_length_ns: PWM duty cycle</div><div class='add'>+ * @duty_offset_ns: offset of the rising edge from the period's start</div><div class='add'>+ *</div><div class='add'>+ * This is a representation of a PWM waveform alternative to struct pwm_state</div><div class='add'>+ * below. It's more expressive than struct pwm_state as it contains a</div><div class='add'>+ * duty_offset_ns and so can represent offsets other than zero (with .polarity =</div><div class='add'>+ * PWM_POLARITY_NORMAL) and period - duty_cycle (.polarity =</div><div class='add'>+ * PWM_POLARITY_INVERSED).</div><div class='add'>+ *</div><div class='add'>+ * Note there is no explicit bool for enabled. A "disabled" PWM is represented</div><div class='add'>+ * by .period_length_ns = 0. Note further that the behaviour of a "disabled" PWM</div><div class='add'>+ * is undefined. Depending on the hardware's capabilities it might drive the</div><div class='add'>+ * active or inactive level, go high-z or even continue to toggle.</div><div class='add'>+ *</div><div class='add'>+ * The unit for all three members is nanoseconds.</div><div class='add'>+ */</div><div class='add'>+struct pwm_waveform {</div><div class='add'>+	u64 period_length_ns;</div><div class='add'>+	u64 duty_length_ns;</div><div class='add'>+	u64 duty_offset_ns;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * struct pwm_state - state of a PWM channel</div><div class='ctx'>  * @period: PWM period (in nanoseconds)</div><div class='hunk'>@@ -189,6 +220,8 @@ static inline void pwm_init_state(const struct pwm_device *pwm,</div><div class='ctx'>  *</div><div class='ctx'>  * pwm_get_state(pwm, &amp;state);</div><div class='ctx'>  * duty = pwm_get_relative_duty_cycle(&amp;state, 100);</div><div class='add'>+ *</div><div class='add'>+ * Returns: rounded relative duty cycle multiplied by @scale</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned int</div><div class='ctx'> pwm_get_relative_duty_cycle(const struct pwm_state *state, unsigned int scale)</div><div class='hunk'>@@ -215,8 +248,8 @@ pwm_get_relative_duty_cycle(const struct pwm_state *state, unsigned int scale)</div><div class='ctx'>  * pwm_set_relative_duty_cycle(&amp;state, 50, 100);</div><div class='ctx'>  * pwm_apply_might_sleep(pwm, &amp;state);</div><div class='ctx'>  *</div><div class='del'>- * This functions returns -EINVAL if @duty_cycle and/or @scale are</div><div class='del'>- * inconsistent (@scale == 0 or @duty_cycle &gt; @scale).</div><div class='add'>+ * Returns: 0 on success or ``-EINVAL`` if @duty_cycle and/or @scale are</div><div class='add'>+ * inconsistent (@scale == 0 or @duty_cycle &gt; @scale)</div><div class='ctx'>  */</div><div class='ctx'> static inline int</div><div class='ctx'> pwm_set_relative_duty_cycle(struct pwm_state *state, unsigned int duty_cycle,</div><div class='hunk'>@@ -242,21 +275,37 @@ struct pwm_capture {</div><div class='ctx'> 	unsigned int duty_cycle;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define PWM_WFHWSIZE 20</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct pwm_ops - PWM controller operations</div><div class='ctx'>  * @request: optional hook for requesting a PWM</div><div class='ctx'>  * @free: optional hook for freeing a PWM</div><div class='ctx'>  * @capture: capture and report PWM signal</div><div class='add'>+ * @sizeof_wfhw: size (in bytes) of driver specific waveform presentation</div><div class='add'>+ * @round_waveform_tohw: convert a struct pwm_waveform to driver specific presentation</div><div class='add'>+ * @round_waveform_fromhw: convert a driver specific waveform presentation to struct pwm_waveform</div><div class='add'>+ * @read_waveform: read driver specific waveform presentation from hardware</div><div class='add'>+ * @write_waveform: write driver specific waveform presentation to hardware</div><div class='ctx'>  * @apply: atomically apply a new PWM config</div><div class='del'>- * @get_state: get the current PWM state. This function is only</div><div class='del'>- *	       called once per PWM device when the PWM chip is</div><div class='del'>- *	       registered.</div><div class='add'>+ * @get_state: get the current PWM state.</div><div class='ctx'>  */</div><div class='ctx'> struct pwm_ops {</div><div class='ctx'> 	int (*request)(struct pwm_chip *chip, struct pwm_device *pwm);</div><div class='ctx'> 	void (*free)(struct pwm_chip *chip, struct pwm_device *pwm);</div><div class='ctx'> 	int (*capture)(struct pwm_chip *chip, struct pwm_device *pwm,</div><div class='ctx'> 		       struct pwm_capture *result, unsigned long timeout);</div><div class='add'>+</div><div class='add'>+	size_t sizeof_wfhw;</div><div class='add'>+	int (*round_waveform_tohw)(struct pwm_chip *chip, struct pwm_device *pwm,</div><div class='add'>+				   const struct pwm_waveform *wf, void *wfhw);</div><div class='add'>+	int (*round_waveform_fromhw)(struct pwm_chip *chip, struct pwm_device *pwm,</div><div class='add'>+				     const void *wfhw, struct pwm_waveform *wf);</div><div class='add'>+	int (*read_waveform)(struct pwm_chip *chip, struct pwm_device *pwm,</div><div class='add'>+			    void *wfhw);</div><div class='add'>+	int (*write_waveform)(struct pwm_chip *chip, struct pwm_device *pwm,</div><div class='add'>+			      const void *wfhw);</div><div class='add'>+</div><div class='ctx'> 	int (*apply)(struct pwm_chip *chip, struct pwm_device *pwm,</div><div class='ctx'> 		     const struct pwm_state *state);</div><div class='ctx'> 	int (*get_state)(struct pwm_chip *chip, struct pwm_device *pwm,</div><div class='hunk'>@@ -266,17 +315,23 @@ struct pwm_ops {</div><div class='ctx'> /**</div><div class='ctx'>  * struct pwm_chip - abstract a PWM controller</div><div class='ctx'>  * @dev: device providing the PWMs</div><div class='add'>+ * @cdev: &amp;struct cdev for this device</div><div class='ctx'>  * @ops: callbacks for this PWM controller</div><div class='ctx'>  * @owner: module providing this chip</div><div class='ctx'>  * @id: unique number of this PWM chip</div><div class='ctx'>  * @npwm: number of PWMs controlled by this chip</div><div class='ctx'>  * @of_xlate: request a PWM device given a device tree PWM specifier</div><div class='ctx'>  * @atomic: can the driver's -&gt;apply() be called in atomic context</div><div class='del'>- * @driver_data: Private pointer for driver specific info</div><div class='add'>+ * @gpio: &amp;struct gpio_chip to operate this PWM chip's lines as GPO</div><div class='add'>+ * @uses_pwmchip_alloc: signals if pwmchip_allow was used to allocate this chip</div><div class='add'>+ * @operational: signals if the chip can be used (or is already deregistered)</div><div class='add'>+ * @nonatomic_lock: mutex for nonatomic chips</div><div class='add'>+ * @atomic_lock: mutex for atomic chips</div><div class='ctx'>  * @pwms: array of PWM devices allocated by the framework</div><div class='ctx'>  */</div><div class='ctx'> struct pwm_chip {</div><div class='del'>-	struct device *dev;</div><div class='add'>+	struct device dev;</div><div class='add'>+	struct cdev cdev;</div><div class='ctx'> 	const struct pwm_ops *ops;</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> 	unsigned int id;</div><div class='hunk'>@@ -287,37 +342,62 @@ struct pwm_chip {</div><div class='ctx'> 	bool atomic;</div><div class='ctx'> </div><div class='ctx'> 	/* only used internally by the PWM framework */</div><div class='del'>-	void *driver_data;</div><div class='del'>-	struct pwm_device *pwms;</div><div class='add'>+	struct gpio_chip gpio;</div><div class='add'>+	bool uses_pwmchip_alloc;</div><div class='add'>+	bool operational;</div><div class='add'>+	union {</div><div class='add'>+		/*</div><div class='add'>+		 * depending on the chip being atomic or not either the mutex or</div><div class='add'>+		 * the spinlock is used. It protects .operational and</div><div class='add'>+		 * synchronizes the callbacks in .ops</div><div class='add'>+		 */</div><div class='add'>+		struct mutex nonatomic_lock;</div><div class='add'>+		spinlock_t atomic_lock;</div><div class='add'>+	};</div><div class='add'>+	struct pwm_device pwms[] __counted_by(npwm);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * pwmchip_supports_waveform() - checks if the given chip supports waveform callbacks</div><div class='add'>+ * @chip: The pwm_chip to test</div><div class='add'>+ *</div><div class='add'>+ * Returns: true iff the pwm chip support the waveform functions like</div><div class='add'>+ * pwm_set_waveform_might_sleep() and pwm_round_waveform_might_sleep()</div><div class='add'>+ */</div><div class='add'>+static inline bool pwmchip_supports_waveform(struct pwm_chip *chip)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * only check for .write_waveform(). If that is available,</div><div class='add'>+	 * .round_waveform_tohw() and .round_waveform_fromhw() asserted to be</div><div class='add'>+	 * available, too, in pwmchip_add().</div><div class='add'>+	 */</div><div class='add'>+	return chip-&gt;ops-&gt;write_waveform != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct device *pwmchip_parent(const struct pwm_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return chip-&gt;dev;</div><div class='add'>+	return chip-&gt;dev.parent;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *pwmchip_get_drvdata(struct pwm_chip *chip)</div><div class='add'>+static inline void *pwmchip_get_drvdata(const struct pwm_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * After pwm_chip got a dedicated struct device, this can be replaced by</div><div class='del'>-	 * dev_get_drvdata(&amp;chip-&gt;dev);</div><div class='del'>-	 */</div><div class='del'>-	return chip-&gt;driver_data;</div><div class='add'>+	return dev_get_drvdata(&amp;chip-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pwmchip_set_drvdata(struct pwm_chip *chip, void *data)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * After pwm_chip got a dedicated struct device, this can be replaced by</div><div class='del'>-	 * dev_set_drvdata(&amp;chip-&gt;dev, data);</div><div class='del'>-	 */</div><div class='del'>-	chip-&gt;driver_data = data;</div><div class='add'>+	dev_set_drvdata(&amp;chip-&gt;dev, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_PWM)</div><div class='del'>-/* PWM user APIs */</div><div class='add'>+#if IS_REACHABLE(CONFIG_PWM)</div><div class='add'>+</div><div class='add'>+/* PWM consumer APIs */</div><div class='add'>+int pwm_round_waveform_might_sleep(struct pwm_device *pwm, struct pwm_waveform *wf);</div><div class='add'>+int pwm_get_waveform_might_sleep(struct pwm_device *pwm, struct pwm_waveform *wf);</div><div class='add'>+int pwm_set_waveform_might_sleep(struct pwm_device *pwm, const struct pwm_waveform *wf, bool exact);</div><div class='ctx'> int pwm_apply_might_sleep(struct pwm_device *pwm, const struct pwm_state *state);</div><div class='ctx'> int pwm_apply_atomic(struct pwm_device *pwm, const struct pwm_state *state);</div><div class='add'>+int pwm_get_state_hw(struct pwm_device *pwm, struct pwm_state *state);</div><div class='ctx'> int pwm_adjust_config(struct pwm_device *pwm);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -400,9 +480,6 @@ static inline bool pwm_might_sleep(struct pwm_device *pwm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* PWM provider APIs */</div><div class='del'>-int pwm_capture(struct pwm_device *pwm, struct pwm_capture *result,</div><div class='del'>-		unsigned long timeout);</div><div class='del'>-</div><div class='ctx'> void pwmchip_put(struct pwm_chip *chip);</div><div class='ctx'> struct pwm_chip *pwmchip_alloc(struct device *parent, unsigned int npwm, size_t sizeof_priv);</div><div class='ctx'> struct pwm_chip *devm_pwmchip_alloc(struct device *parent, unsigned int npwm, size_t sizeof_priv);</div><div class='hunk'>@@ -411,13 +488,15 @@ int __pwmchip_add(struct pwm_chip *chip, struct module *owner);</div><div class='ctx'> #define pwmchip_add(chip) __pwmchip_add(chip, THIS_MODULE)</div><div class='ctx'> void pwmchip_remove(struct pwm_chip *chip);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * For FFI wrapper use only:</div><div class='add'>+ * The Rust PWM abstraction needs this to properly free the pwm_chip.</div><div class='add'>+ */</div><div class='add'>+void pwmchip_release(struct device *dev);</div><div class='add'>+</div><div class='ctx'> int __devm_pwmchip_add(struct device *dev, struct pwm_chip *chip, struct module *owner);</div><div class='ctx'> #define devm_pwmchip_add(dev, chip) __devm_pwmchip_add(dev, chip, THIS_MODULE)</div><div class='ctx'> </div><div class='del'>-struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,</div><div class='del'>-					 unsigned int index,</div><div class='del'>-					 const char *label);</div><div class='del'>-</div><div class='ctx'> struct pwm_device *of_pwm_xlate_with_flags(struct pwm_chip *chip,</div><div class='ctx'> 		const struct of_phandle_args *args);</div><div class='ctx'> struct pwm_device *of_pwm_single_xlate(struct pwm_chip *chip,</div><div class='hunk'>@@ -449,6 +528,11 @@ static inline int pwm_apply_atomic(struct pwm_device *pwm,</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int pwm_get_state_hw(struct pwm_device *pwm, struct pwm_state *state)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int pwm_adjust_config(struct pwm_device *pwm)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='hunk'>@@ -472,13 +556,6 @@ static inline void pwm_disable(struct pwm_device *pwm)</div><div class='ctx'> 	might_sleep();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwm_capture(struct pwm_device *pwm,</div><div class='del'>-			      struct pwm_capture *result,</div><div class='del'>-			      unsigned long timeout)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void pwmchip_put(struct pwm_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -512,14 +589,6 @@ static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,</div><div class='del'>-						       unsigned int index,</div><div class='del'>-						       const char *label)</div><div class='del'>-{</div><div class='del'>-	might_sleep();</div><div class='del'>-	return ERR_PTR(-ENODEV);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct pwm_device *pwm_get(struct device *dev,</div><div class='ctx'> 					 const char *consumer)</div><div class='ctx'> {</div><div class='hunk'>@@ -548,46 +617,6 @@ devm_fwnode_pwm_get(struct device *dev, struct fwnode_handle *fwnode,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline void pwm_apply_args(struct pwm_device *pwm)</div><div class='del'>-{</div><div class='del'>-	struct pwm_state state = { };</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * PWM users calling pwm_apply_args() expect to have a fresh config</div><div class='del'>-	 * where the polarity and period are set according to pwm_args info.</div><div class='del'>-	 * The problem is, polarity can only be changed when the PWM is</div><div class='del'>-	 * disabled.</div><div class='del'>-	 *</div><div class='del'>-	 * PWM drivers supporting hardware readout may declare the PWM device</div><div class='del'>-	 * as enabled, and prevent polarity setting, which changes from the</div><div class='del'>-	 * existing behavior, where all PWM devices are declared as disabled</div><div class='del'>-	 * at startup (even if they are actually enabled), thus authorizing</div><div class='del'>-	 * polarity setting.</div><div class='del'>-	 *</div><div class='del'>-	 * To fulfill this requirement, we apply a new state which disables</div><div class='del'>-	 * the PWM device and set the reference period and polarity config.</div><div class='del'>-	 *</div><div class='del'>-	 * Note that PWM users requiring a smooth handover between the</div><div class='del'>-	 * bootloader and the kernel (like critical regulators controlled by</div><div class='del'>-	 * PWM devices) will have to switch to the atomic API and avoid calling</div><div class='del'>-	 * pwm_apply_args().</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	state.enabled = false;</div><div class='del'>-	state.polarity = pwm-&gt;args.polarity;</div><div class='del'>-	state.period = pwm-&gt;args.period;</div><div class='del'>-	state.usage_power = false;</div><div class='del'>-</div><div class='del'>-	pwm_apply_might_sleep(pwm, &amp;state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* only for backwards-compatibility, new code should not use this */</div><div class='del'>-static inline int pwm_apply_state(struct pwm_device *pwm,</div><div class='del'>-				  const struct pwm_state *state)</div><div class='del'>-{</div><div class='del'>-	return pwm_apply_might_sleep(pwm, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct pwm_lookup {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	const char *provider;</div><div class='hunk'>@@ -615,7 +644,7 @@ struct pwm_lookup {</div><div class='ctx'> 	PWM_LOOKUP_WITH_MODULE(_provider, _index, _dev_id, _con_id, _period, \</div><div class='ctx'> 			       _polarity, NULL)</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_PWM)</div><div class='add'>+#if IS_REACHABLE(CONFIG_PWM)</div><div class='ctx'> void pwm_add_table(struct pwm_lookup *table, size_t num);</div><div class='ctx'> void pwm_remove_table(struct pwm_lookup *table, size_t num);</div><div class='ctx'> #else</div><div class='hunk'>@@ -628,17 +657,4 @@ static inline void pwm_remove_table(struct pwm_lookup *table, size_t num)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PWM_SYSFS</div><div class='del'>-void pwmchip_sysfs_export(struct pwm_chip *chip);</div><div class='del'>-void pwmchip_sysfs_unexport(struct pwm_chip *chip);</div><div class='del'>-#else</div><div class='del'>-static inline void pwmchip_sysfs_export(struct pwm_chip *chip)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void pwmchip_sysfs_unexport(struct pwm_chip *chip)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PWM_SYSFS */</div><div class='del'>-</div><div class='ctx'> #endif /* __LINUX_PWM_H */</div><div class='head'>diff --git a/include/linux/pwm_backlight.h b/include/linux/pwm_backlight.h<br/>index cdd2ac366bc7..0bf80e98d5b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pwm_backlight.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pwm_backlight.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pwm_backlight.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pwm_backlight.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@ struct platform_pwm_backlight_data {</div><div class='ctx'> 	int (*notify)(struct device *dev, int brightness);</div><div class='ctx'> 	void (*notify_after)(struct device *dev, int brightness);</div><div class='ctx'> 	void (*exit)(struct device *dev);</div><div class='del'>-	int (*check_fb)(struct device *dev, struct fb_info *info);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/pwrseq/consumer.h b/include/linux/pwrseq/consumer.h<br/>new file mode 100644<br/>index 000000000000..7d583b4f266e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pwrseq/consumer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pwrseq/consumer.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __POWER_SEQUENCING_CONSUMER_H__</div><div class='add'>+#define __POWER_SEQUENCING_CONSUMER_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct pwrseq_desc;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_POWER_SEQUENCING)</div><div class='add'>+</div><div class='add'>+struct pwrseq_desc * __must_check</div><div class='add'>+pwrseq_get(struct device *dev, const char *target);</div><div class='add'>+void pwrseq_put(struct pwrseq_desc *desc);</div><div class='add'>+</div><div class='add'>+struct pwrseq_desc * __must_check</div><div class='add'>+devm_pwrseq_get(struct device *dev, const char *target);</div><div class='add'>+</div><div class='add'>+int pwrseq_power_on(struct pwrseq_desc *desc);</div><div class='add'>+int pwrseq_power_off(struct pwrseq_desc *desc);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_POWER_SEQUENCING */</div><div class='add'>+</div><div class='add'>+static inline struct pwrseq_desc * __must_check</div><div class='add'>+pwrseq_get(struct device *dev, const char *target)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENOSYS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pwrseq_put(struct pwrseq_desc *desc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct pwrseq_desc * __must_check</div><div class='add'>+devm_pwrseq_get(struct device *dev, const char *target)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENOSYS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pwrseq_power_on(struct pwrseq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pwrseq_power_off(struct pwrseq_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return -ENOSYS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_POWER_SEQUENCING */</div><div class='add'>+</div><div class='add'>+#endif /* __POWER_SEQUENCING_CONSUMER_H__ */</div><div class='head'>diff --git a/include/linux/pwrseq/provider.h b/include/linux/pwrseq/provider.h<br/>new file mode 100644<br/>index 000000000000..33b3d2c2e39d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pwrseq/provider.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pwrseq/provider.h</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Linaro Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __POWER_SEQUENCING_PROVIDER_H__</div><div class='add'>+#define __POWER_SEQUENCING_PROVIDER_H__</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct module;</div><div class='add'>+struct pwrseq_device;</div><div class='add'>+</div><div class='add'>+typedef int (*pwrseq_power_state_func)(struct pwrseq_device *);</div><div class='add'>+typedef int (*pwrseq_match_func)(struct pwrseq_device *, struct device *);</div><div class='add'>+</div><div class='add'>+#define PWRSEQ_NO_MATCH 0</div><div class='add'>+#define PWRSEQ_MATCH_OK 1</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pwrseq_unit_data - Configuration of a single power sequencing</div><div class='add'>+ *                           unit.</div><div class='add'>+ * @name: Name of the unit.</div><div class='add'>+ * @deps: Units that must be enabled before this one and disabled after it</div><div class='add'>+ *        in the order they come in this array. Must be NULL-terminated.</div><div class='add'>+ * @enable: Callback running the part of the power-on sequence provided by</div><div class='add'>+ *          this unit.</div><div class='add'>+ * @disable: Callback running the part of the power-off sequence provided</div><div class='add'>+ *           by this unit.</div><div class='add'>+ */</div><div class='add'>+struct pwrseq_unit_data {</div><div class='add'>+	const char *name;</div><div class='add'>+	const struct pwrseq_unit_data **deps;</div><div class='add'>+	pwrseq_power_state_func enable;</div><div class='add'>+	pwrseq_power_state_func disable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pwrseq_target_data - Configuration of a power sequencing target.</div><div class='add'>+ * @name: Name of the target.</div><div class='add'>+ * @unit: Final unit that this target must reach in order to be considered</div><div class='add'>+ *        enabled.</div><div class='add'>+ * @post_enable: Callback run after the target unit has been enabled, *after*</div><div class='add'>+ *               the state lock has been released. It's useful for implementing</div><div class='add'>+ *               boot-up delays without blocking other users from powering up</div><div class='add'>+ *               using the same power sequencer.</div><div class='add'>+ */</div><div class='add'>+struct pwrseq_target_data {</div><div class='add'>+	const char *name;</div><div class='add'>+	const struct pwrseq_unit_data *unit;</div><div class='add'>+	pwrseq_power_state_func post_enable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct pwrseq_config - Configuration used for registering a new provider.</div><div class='add'>+ * @parent: Parent device for the sequencer. Must be set.</div><div class='add'>+ * @owner: Module providing this device.</div><div class='add'>+ * @drvdata: Private driver data.</div><div class='add'>+ * @match: Provider callback used to match the consumer device to the sequencer.</div><div class='add'>+ * @targets: Array of targets for this power sequencer. Must be NULL-terminated.</div><div class='add'>+ */</div><div class='add'>+struct pwrseq_config {</div><div class='add'>+	struct device *parent;</div><div class='add'>+	struct module *owner;</div><div class='add'>+	void *drvdata;</div><div class='add'>+	pwrseq_match_func match;</div><div class='add'>+	const struct pwrseq_target_data **targets;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pwrseq_device *</div><div class='add'>+pwrseq_device_register(const struct pwrseq_config *config);</div><div class='add'>+void pwrseq_device_unregister(struct pwrseq_device *pwrseq);</div><div class='add'>+struct pwrseq_device *</div><div class='add'>+devm_pwrseq_device_register(struct device *dev,</div><div class='add'>+			    const struct pwrseq_config *config);</div><div class='add'>+</div><div class='add'>+void *pwrseq_device_get_drvdata(struct pwrseq_device *pwrseq);</div><div class='add'>+</div><div class='add'>+#endif /* __POWER_SEQUENCING_PROVIDER_H__ */</div><div class='head'>diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h<br/>index cd1973e6ac4b..844a2743ca94 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/pxa2xx_ssp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/pxa2xx_ssp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/pxa2xx_ssp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/pxa2xx_ssp.h</a></div><div class='hunk'>@@ -217,9 +217,9 @@ enum pxa_ssp_type {</div><div class='ctx'> 	PXA27x_SSP,</div><div class='ctx'> 	PXA3xx_SSP,</div><div class='ctx'> 	PXA168_SSP,</div><div class='del'>-	MMP2_SSP,</div><div class='ctx'> 	PXA910_SSP,</div><div class='ctx'> 	CE4100_SSP,</div><div class='add'>+	MMP2_SSP,</div><div class='ctx'> 	MRFLD_SSP,</div><div class='ctx'> 	QUARK_X1000_SSP,</div><div class='ctx'> 	/* Keep LPSS types sorted with lpss_platforms[] */</div><div class='head'>diff --git a/include/linux/qat/qat_mig_dev.h b/include/linux/qat/qat_mig_dev.h<br/>new file mode 100644<br/>index 000000000000..dbbb6a063dd2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/qat/qat_mig_dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/qat/qat_mig_dev.h</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright(c) 2024 Intel Corporation */</div><div class='add'>+#ifndef QAT_MIG_DEV_H_</div><div class='add'>+#define QAT_MIG_DEV_H_</div><div class='add'>+</div><div class='add'>+struct pci_dev;</div><div class='add'>+</div><div class='add'>+struct qat_mig_dev {</div><div class='add'>+	void *parent_accel_dev;</div><div class='add'>+	u8 *state;</div><div class='add'>+	u32 setup_size;</div><div class='add'>+	u32 remote_setup_size;</div><div class='add'>+	u32 state_size;</div><div class='add'>+	s32 vf_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qat_mig_dev *qat_vfmig_create(struct pci_dev *pdev, int vf_id);</div><div class='add'>+int qat_vfmig_init(struct qat_mig_dev *mdev);</div><div class='add'>+void qat_vfmig_cleanup(struct qat_mig_dev *mdev);</div><div class='add'>+void qat_vfmig_reset(struct qat_mig_dev *mdev);</div><div class='add'>+int qat_vfmig_open(struct qat_mig_dev *mdev);</div><div class='add'>+void qat_vfmig_close(struct qat_mig_dev *mdev);</div><div class='add'>+int qat_vfmig_suspend(struct qat_mig_dev *mdev);</div><div class='add'>+int qat_vfmig_resume(struct qat_mig_dev *mdev);</div><div class='add'>+int qat_vfmig_save_state(struct qat_mig_dev *mdev);</div><div class='add'>+int qat_vfmig_save_setup(struct qat_mig_dev *mdev);</div><div class='add'>+int qat_vfmig_load_state(struct qat_mig_dev *mdev);</div><div class='add'>+int qat_vfmig_load_setup(struct qat_mig_dev *mdev, int size);</div><div class='add'>+void qat_vfmig_destroy(struct qat_mig_dev *mdev);</div><div class='add'>+</div><div class='add'>+#endif /*QAT_MIG_DEV_H_*/</div><div class='head'>diff --git a/include/linux/qed/qed_ll2_if.h b/include/linux/qed/qed_ll2_if.h<br/>index 5b67cd03276e..aa29ac53b833 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/qed/qed_ll2_if.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/qed/qed_ll2_if.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/qed/qed_ll2_if.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/qed/qed_ll2_if.h</a></div><div class='hunk'>@@ -267,7 +267,7 @@ struct qed_ll2_ops {</div><div class='ctx'> int qed_ll2_alloc_if(struct qed_dev *);</div><div class='ctx'> void qed_ll2_dealloc_if(struct qed_dev *);</div><div class='ctx'> #else</div><div class='del'>-static const struct qed_ll2_ops qed_ll2_ops_pass = {</div><div class='add'>+static __maybe_unused const struct qed_ll2_ops qed_ll2_ops_pass = {</div><div class='ctx'> 	.start = NULL,</div><div class='ctx'> 	.stop = NULL,</div><div class='ctx'> 	.start_xmit = NULL,</div><div class='head'>diff --git a/include/linux/quota.h b/include/linux/quota.h<br/>index 07071e64abf3..89a0d83ddad0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/quota.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/quota.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/quota.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/quota.h</a></div><div class='hunk'>@@ -526,7 +526,7 @@ struct quota_info {</div><div class='ctx'> 	const struct quota_format_ops *ops[MAXQUOTAS];	/* Operations for each type */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int register_quota_format(struct quota_format_type *fmt);</div><div class='add'>+void register_quota_format(struct quota_format_type *fmt);</div><div class='ctx'> void unregister_quota_format(struct quota_format_type *fmt);</div><div class='ctx'> </div><div class='ctx'> struct quota_module_name {</div><div class='head'>diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h<br/>index 06cc8888199e..c334f82ed385 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/quotaops.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/quotaops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/quotaops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/quotaops.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@ static inline struct quota_info *sb_dqopt(struct super_block *sb)</div><div class='ctx'> 	return &amp;sb-&gt;s_dquot;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* i_mutex must being held */</div><div class='add'>+/* i_rwsem must being held */</div><div class='ctx'> static inline bool is_quota_modification(struct mnt_idmap *idmap,</div><div class='ctx'> 					 struct inode *inode, struct iattr *ia)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h<br/>index 98030accf641..2467b3be15c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/raid/pq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/raid/pq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/raid/pq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/raid/pq.h</a></div><div class='hunk'>@@ -11,8 +11,13 @@</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='del'>-extern const char raid6_empty_zero_page[PAGE_SIZE];</div><div class='add'>+/* This should be const but the raid6 code is too convoluted for that. */</div><div class='add'>+static inline void *raid6_get_zero_page(void)</div><div class='add'>+{</div><div class='add'>+	return page_address(ZERO_PAGE(0));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #else /* ! __KERNEL__ */</div><div class='ctx'> /* Used for testing in user space */</div><div class='hunk'>@@ -108,6 +113,10 @@ extern const struct raid6_calls raid6_vpermxor4;</div><div class='ctx'> extern const struct raid6_calls raid6_vpermxor8;</div><div class='ctx'> extern const struct raid6_calls raid6_lsx;</div><div class='ctx'> extern const struct raid6_calls raid6_lasx;</div><div class='add'>+extern const struct raid6_calls raid6_rvvx1;</div><div class='add'>+extern const struct raid6_calls raid6_rvvx2;</div><div class='add'>+extern const struct raid6_calls raid6_rvvx4;</div><div class='add'>+extern const struct raid6_calls raid6_rvvx8;</div><div class='ctx'> </div><div class='ctx'> struct raid6_recov_calls {</div><div class='ctx'> 	void (*data2)(int, size_t, int, int, void **);</div><div class='hunk'>@@ -125,6 +134,7 @@ extern const struct raid6_recov_calls raid6_recov_s390xc;</div><div class='ctx'> extern const struct raid6_recov_calls raid6_recov_neon;</div><div class='ctx'> extern const struct raid6_recov_calls raid6_recov_lsx;</div><div class='ctx'> extern const struct raid6_recov_calls raid6_recov_lasx;</div><div class='add'>+extern const struct raid6_recov_calls raid6_recov_rvv;</div><div class='ctx'> </div><div class='ctx'> extern const struct raid6_calls raid6_neonx1;</div><div class='ctx'> extern const struct raid6_calls raid6_neonx2;</div><div class='hunk'>@@ -186,6 +196,11 @@ static inline uint32_t raid6_jiffies(void)</div><div class='ctx'> 	return tv.tv_sec*1000 + tv.tv_usec/1000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void *raid6_get_zero_page(void)</div><div class='add'>+{</div><div class='add'>+	return raid6_empty_zero_page;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* ! __KERNEL__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* LINUX_RAID_RAID6_H */</div><div class='head'>diff --git a/include/linux/random.h b/include/linux/random.h<br/>index b0a940af4fff..8a8064dc3970 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/random.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/random.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/random.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/random.h</a></div><div class='hunk'>@@ -130,28 +130,6 @@ static inline int get_random_bytes_wait(void *buf, size_t nbytes)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define declare_get_random_var_wait(name, ret_type) \</div><div class='del'>-	static inline int get_random_ ## name ## _wait(ret_type *out) { \</div><div class='del'>-		int ret = wait_for_random_bytes(); \</div><div class='del'>-		if (unlikely(ret)) \</div><div class='del'>-			return ret; \</div><div class='del'>-		*out = get_random_ ## name(); \</div><div class='del'>-		return 0; \</div><div class='del'>-	}</div><div class='del'>-declare_get_random_var_wait(u8, u8)</div><div class='del'>-declare_get_random_var_wait(u16, u16)</div><div class='del'>-declare_get_random_var_wait(u32, u32)</div><div class='del'>-declare_get_random_var_wait(u64, u32)</div><div class='del'>-declare_get_random_var_wait(long, unsigned long)</div><div class='del'>-#undef declare_get_random_var</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is designed to be standalone for just prandom</div><div class='del'>- * users, but for now we include it from &lt;linux/random.h&gt;</div><div class='del'>- * for legacy reasons.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/prandom.h&gt;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> int random_prepare_cpu(unsigned int cpu);</div><div class='ctx'> int random_online_cpu(unsigned int cpu);</div><div class='head'>diff --git a/include/linux/randomize_kstack.h b/include/linux/randomize_kstack.h<br/>index 5d868505a94e..1d982dbdd0d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/randomize_kstack.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/randomize_kstack.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/randomize_kstack.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/randomize_kstack.h</a></div><div class='hunk'>@@ -32,13 +32,19 @@ DECLARE_PER_CPU(u32, kstack_offset);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Use, at most, 10 bits of entropy. We explicitly cap this to keep the</div><div class='del'>- * "VLA" from being unbounded (see above). 10 bits leaves enough room for</div><div class='del'>- * per-arch offset masks to reduce entropy (by removing higher bits, since</div><div class='del'>- * high entropy may overly constrain usable stack space), and for</div><div class='del'>- * compiler/arch-specific stack alignment to remove the lower bits.</div><div class='add'>+ * Use, at most, 6 bits of entropy (on 64-bit; 8 on 32-bit). This cap is</div><div class='add'>+ * to keep the "VLA" from being unbounded (see above). Additionally clear</div><div class='add'>+ * the bottom 4 bits (on 64-bit systems, 2 for 32-bit), since stack</div><div class='add'>+ * alignment will always be at least word size. This makes the compiler</div><div class='add'>+ * code gen better when it is applying the actual per-arch alignment to</div><div class='add'>+ * the final offset. The resulting randomness is reasonable without overly</div><div class='add'>+ * constraining usable stack space.</div><div class='ctx'>  */</div><div class='del'>-#define KSTACK_OFFSET_MAX(x)	((x) &amp; 0x3FF)</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#define KSTACK_OFFSET_MAX(x)	((x) &amp; 0b1111110000)</div><div class='add'>+#else</div><div class='add'>+#define KSTACK_OFFSET_MAX(x)	((x) &amp; 0b1111111100)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * add_random_kstack_offset - Increase stack utilization by previously</div><div class='hunk'>@@ -80,7 +86,7 @@ DECLARE_PER_CPU(u32, kstack_offset);</div><div class='ctx'> 	if (static_branch_maybe(CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT,	\</div><div class='ctx'> 				&amp;randomize_kstack_offset)) {		\</div><div class='ctx'> 		u32 offset = raw_cpu_read(kstack_offset);		\</div><div class='del'>-		offset ^= (rand);					\</div><div class='add'>+		offset = ror32(offset, 5) ^ (rand);			\</div><div class='ctx'> 		raw_cpu_write(kstack_offset, offset);			\</div><div class='ctx'> 	}								\</div><div class='ctx'> } while (0)</div><div class='head'>diff --git a/include/linux/range.h b/include/linux/range.h<br/>index 6ad0b73cb7ad..d7f98e1285d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/range.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/range.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/range.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/range.h</a></div><div class='hunk'>@@ -13,11 +13,20 @@ static inline u64 range_len(const struct range *range)</div><div class='ctx'> 	return range-&gt;end - range-&gt;start + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool range_contains(struct range *r1, struct range *r2)</div><div class='add'>+/* True if r1 completely contains r2 */</div><div class='add'>+static inline bool range_contains(const struct range *r1,</div><div class='add'>+				  const struct range *r2)</div><div class='ctx'> {</div><div class='ctx'> 	return r1-&gt;start &lt;= r2-&gt;start &amp;&amp; r1-&gt;end &gt;= r2-&gt;end;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* True if any part of r1 overlaps r2 */</div><div class='add'>+static inline bool range_overlaps(const struct range *r1,</div><div class='add'>+				  const struct range *r2)</div><div class='add'>+{</div><div class='add'>+	return r1-&gt;start &lt;= r2-&gt;end &amp;&amp; r1-&gt;end &gt;= r2-&gt;start;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int add_range(struct range *range, int az, int nr_range,</div><div class='ctx'> 		u64 start, u64 end);</div><div class='ctx'> </div><div class='hunk'>@@ -31,4 +40,10 @@ int clean_sort_range(struct range *range, int az);</div><div class='ctx'> </div><div class='ctx'> void sort_range(struct range *range, int nr_range);</div><div class='ctx'> </div><div class='add'>+#define DEFINE_RANGE(_start, _end)		\</div><div class='add'>+(struct range) {				\</div><div class='add'>+		.start = (_start),		\</div><div class='add'>+		.end = (_end),			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/ras.h b/include/linux/ras.h<br/>index a64182bc72ad..468941bfe855 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ras.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ras.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ras.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ras.h</a></div><div class='hunk'>@@ -24,8 +24,7 @@ int __init parse_cec_param(char *str);</div><div class='ctx'> void log_non_standard_event(const guid_t *sec_type,</div><div class='ctx'> 			    const guid_t *fru_id, const char *fru_text,</div><div class='ctx'> 			    const u8 sev, const u8 *err, const u32 len);</div><div class='del'>-void log_arm_hw_error(struct cper_sec_proc_arm *err);</div><div class='del'>-</div><div class='add'>+void log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev);</div><div class='ctx'> #else</div><div class='ctx'> static inline void</div><div class='ctx'> log_non_standard_event(const guid_t *sec_type,</div><div class='hunk'>@@ -33,7 +32,7 @@ log_non_standard_event(const guid_t *sec_type,</div><div class='ctx'> 		       const u8 sev, const u8 *err, const u32 len)</div><div class='ctx'> { return; }</div><div class='ctx'> static inline void</div><div class='del'>-log_arm_hw_error(struct cper_sec_proc_arm *err) { return; }</div><div class='add'>+log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev) { return; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct atl_err {</div><div class='hunk'>@@ -53,4 +52,15 @@ static inline unsigned long</div><div class='ctx'> amd_convert_umc_mca_addr_to_sys_addr(struct atl_err *err) { return -EINVAL; }</div><div class='ctx'> #endif /* CONFIG_AMD_ATL */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)</div><div class='add'>+#include &lt;asm/smp_plat.h&gt;</div><div class='add'>+/*</div><div class='add'>+ * Include ARM-specific SMP header which provides a function mapping mpidr to</div><div class='add'>+ * CPU logical index.</div><div class='add'>+ */</div><div class='add'>+#define GET_LOGICAL_INDEX(mpidr) get_logical_index(mpidr &amp; MPIDR_HWID_BITMASK)</div><div class='add'>+#else</div><div class='add'>+#define GET_LOGICAL_INDEX(mpidr) -EINVAL</div><div class='add'>+#endif /* CONFIG_ARM || CONFIG_ARM64 */</div><div class='add'>+</div><div class='ctx'> #endif /* __RAS_H__ */</div><div class='head'>diff --git a/include/linux/raspberrypi/vchiq.h b/include/linux/raspberrypi/vchiq.h<br/>new file mode 100644<br/>index 000000000000..ee4469f4fc51<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/raspberrypi/vchiq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/raspberrypi/vchiq.h</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright (c) 2010-2012 Broadcom. All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef VCHIQ_H</div><div class='add'>+#define VCHIQ_H</div><div class='add'>+</div><div class='add'>+#define VCHIQ_MAKE_FOURCC(x0, x1, x2, x3) \</div><div class='add'>+			(((x0) &lt;&lt; 24) | ((x1) &lt;&lt; 16) | ((x2) &lt;&lt; 8) | (x3))</div><div class='add'>+</div><div class='add'>+enum vchiq_reason {</div><div class='add'>+	VCHIQ_SERVICE_OPENED,         /* service, -, -             */</div><div class='add'>+	VCHIQ_SERVICE_CLOSED,         /* service, -, -             */</div><div class='add'>+	VCHIQ_MESSAGE_AVAILABLE,      /* service, header, -        */</div><div class='add'>+	VCHIQ_BULK_TRANSMIT_DONE,     /* service, -, bulk_userdata */</div><div class='add'>+	VCHIQ_BULK_RECEIVE_DONE,      /* service, -, bulk_userdata */</div><div class='add'>+	VCHIQ_BULK_TRANSMIT_ABORTED,  /* service, -, bulk_userdata */</div><div class='add'>+	VCHIQ_BULK_RECEIVE_ABORTED    /* service, -, bulk_userdata */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum vchiq_bulk_mode {</div><div class='add'>+	VCHIQ_BULK_MODE_CALLBACK,</div><div class='add'>+	VCHIQ_BULK_MODE_BLOCKING,</div><div class='add'>+	VCHIQ_BULK_MODE_NOCALLBACK,</div><div class='add'>+	VCHIQ_BULK_MODE_WAITING		/* Reserved for internal use */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum vchiq_service_option {</div><div class='add'>+	VCHIQ_SERVICE_OPTION_AUTOCLOSE,</div><div class='add'>+	VCHIQ_SERVICE_OPTION_SLOT_QUOTA,</div><div class='add'>+	VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA,</div><div class='add'>+	VCHIQ_SERVICE_OPTION_SYNCHRONOUS,</div><div class='add'>+	VCHIQ_SERVICE_OPTION_TRACE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_header {</div><div class='add'>+	/* The message identifier - opaque to applications. */</div><div class='add'>+	int msgid;</div><div class='add'>+</div><div class='add'>+	/* Size of message data. */</div><div class='add'>+	unsigned int size;</div><div class='add'>+</div><div class='add'>+	char data[];           /* message */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_element {</div><div class='add'>+	const void __user *data;</div><div class='add'>+	unsigned int size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_instance;</div><div class='add'>+struct vchiq_state;</div><div class='add'>+</div><div class='add'>+struct vchiq_service_base {</div><div class='add'>+	int fourcc;</div><div class='add'>+	int (*callback)(struct vchiq_instance *instance,</div><div class='add'>+			enum vchiq_reason reason,</div><div class='add'>+			struct vchiq_header *header,</div><div class='add'>+			unsigned int handle,</div><div class='add'>+			void *cb_data, void __user *cb_userdata);</div><div class='add'>+	void *userdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_completion_data_kernel {</div><div class='add'>+	enum vchiq_reason reason;</div><div class='add'>+	struct vchiq_header *header;</div><div class='add'>+	void *service_userdata;</div><div class='add'>+	void *cb_data;</div><div class='add'>+	void  __user *cb_userdata;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_service_params_kernel {</div><div class='add'>+	int fourcc;</div><div class='add'>+	int (*callback)(struct vchiq_instance *instance,</div><div class='add'>+			enum vchiq_reason reason,</div><div class='add'>+			struct vchiq_header *header,</div><div class='add'>+			unsigned int handle,</div><div class='add'>+			void *cb_data, void __user *cb_userdata);</div><div class='add'>+	void *userdata;</div><div class='add'>+	short version;       /* Increment for non-trivial changes */</div><div class='add'>+	short version_min;   /* Update for incompatible changes */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int vchiq_initialise(struct vchiq_state *state,</div><div class='add'>+			    struct vchiq_instance **pinstance);</div><div class='add'>+extern int vchiq_shutdown(struct vchiq_instance *instance);</div><div class='add'>+extern int vchiq_connect(struct vchiq_instance *instance);</div><div class='add'>+extern int vchiq_open_service(struct vchiq_instance *instance,</div><div class='add'>+			      const struct vchiq_service_params_kernel *params,</div><div class='add'>+			      unsigned int *pservice);</div><div class='add'>+extern int vchiq_close_service(struct vchiq_instance *instance,</div><div class='add'>+			       unsigned int service);</div><div class='add'>+extern int vchiq_use_service(struct vchiq_instance *instance, unsigned int service);</div><div class='add'>+extern int vchiq_release_service(struct vchiq_instance *instance,</div><div class='add'>+				 unsigned int service);</div><div class='add'>+extern void vchiq_msg_queue_push(struct vchiq_instance *instance, unsigned int handle,</div><div class='add'>+				 struct vchiq_header *header);</div><div class='add'>+extern void vchiq_release_message(struct vchiq_instance *instance, unsigned int service,</div><div class='add'>+				  struct vchiq_header *header);</div><div class='add'>+extern int vchiq_queue_kernel_message(struct vchiq_instance *instance, unsigned int handle,</div><div class='add'>+				      void *data, unsigned int size);</div><div class='add'>+extern int vchiq_bulk_transmit(struct vchiq_instance *instance, unsigned int service,</div><div class='add'>+			       const void *data, unsigned int size, void *userdata,</div><div class='add'>+			       enum vchiq_bulk_mode mode);</div><div class='add'>+extern int vchiq_bulk_receive(struct vchiq_instance *instance, unsigned int service,</div><div class='add'>+			      void *data, unsigned int size, void *userdata,</div><div class='add'>+			      enum vchiq_bulk_mode mode);</div><div class='add'>+extern void *vchiq_get_service_userdata(struct vchiq_instance *instance, unsigned int service);</div><div class='add'>+extern int vchiq_get_peer_version(struct vchiq_instance *instance, unsigned int handle,</div><div class='add'>+				  short *peer_version);</div><div class='add'>+extern struct vchiq_header *vchiq_msg_hold(struct vchiq_instance *instance, unsigned int handle);</div><div class='add'>+</div><div class='add'>+#endif /* VCHIQ_H */</div><div class='head'>diff --git a/include/linux/raspberrypi/vchiq_arm.h b/include/linux/raspberrypi/vchiq_arm.h<br/>new file mode 100644<br/>index 000000000000..e32b02f99024<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/raspberrypi/vchiq_arm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/raspberrypi/vchiq_arm.h</a></div><div class='hunk'>@@ -0,0 +1,164 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved.</div><div class='add'>+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef VCHIQ_ARM_H</div><div class='add'>+#define VCHIQ_ARM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include "vchiq_core.h"</div><div class='add'>+#include "vchiq_debugfs.h"</div><div class='add'>+</div><div class='add'>+/* Some per-instance constants */</div><div class='add'>+#define MAX_COMPLETIONS 128</div><div class='add'>+#define MAX_SERVICES 64</div><div class='add'>+#define MAX_ELEMENTS 8</div><div class='add'>+#define MSG_QUEUE_SIZE 128</div><div class='add'>+</div><div class='add'>+#define VCHIQ_DRV_MAX_CALLBACKS 10</div><div class='add'>+</div><div class='add'>+struct rpi_firmware;</div><div class='add'>+struct vchiq_device;</div><div class='add'>+</div><div class='add'>+enum USE_TYPE_E {</div><div class='add'>+	USE_TYPE_SERVICE,</div><div class='add'>+	USE_TYPE_VCHIQ</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_platform_info {</div><div class='add'>+	unsigned int cache_line_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_drv_mgmt {</div><div class='add'>+	struct rpi_firmware *fw;</div><div class='add'>+	const struct vchiq_platform_info *info;</div><div class='add'>+</div><div class='add'>+	bool connected;</div><div class='add'>+	int num_deferred_callbacks;</div><div class='add'>+	/* Protects connected and num_deferred_callbacks */</div><div class='add'>+	struct mutex connected_mutex;</div><div class='add'>+</div><div class='add'>+	void (*deferred_callback[VCHIQ_DRV_MAX_CALLBACKS])(void);</div><div class='add'>+</div><div class='add'>+	struct semaphore free_fragments_sema;</div><div class='add'>+	struct semaphore free_fragments_mutex;</div><div class='add'>+	char *fragments_base;</div><div class='add'>+	char *free_fragments;</div><div class='add'>+	unsigned int fragments_size;</div><div class='add'>+</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+</div><div class='add'>+	struct vchiq_state state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct user_service {</div><div class='add'>+	struct vchiq_service *service;</div><div class='add'>+	void __user *userdata;</div><div class='add'>+	struct vchiq_instance *instance;</div><div class='add'>+	char is_vchi;</div><div class='add'>+	char dequeue_pending;</div><div class='add'>+	char close_pending;</div><div class='add'>+	int message_available_pos;</div><div class='add'>+	int msg_insert;</div><div class='add'>+	int msg_remove;</div><div class='add'>+	struct completion insert_event;</div><div class='add'>+	struct completion remove_event;</div><div class='add'>+	struct completion close_event;</div><div class='add'>+	struct vchiq_header *msg_queue[MSG_QUEUE_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bulk_waiter_node {</div><div class='add'>+	struct bulk_waiter bulk_waiter;</div><div class='add'>+	int pid;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_instance {</div><div class='add'>+	struct vchiq_state *state;</div><div class='add'>+	struct vchiq_completion_data_kernel completions[MAX_COMPLETIONS];</div><div class='add'>+	int completion_insert;</div><div class='add'>+	int completion_remove;</div><div class='add'>+	struct completion insert_event;</div><div class='add'>+	struct completion remove_event;</div><div class='add'>+	struct mutex completion_mutex;</div><div class='add'>+</div><div class='add'>+	int connected;</div><div class='add'>+	int closing;</div><div class='add'>+	int pid;</div><div class='add'>+	int mark;</div><div class='add'>+	int use_close_delivered;</div><div class='add'>+	int trace;</div><div class='add'>+</div><div class='add'>+	struct list_head bulk_waiter_list;</div><div class='add'>+	struct mutex bulk_waiter_list_mutex;</div><div class='add'>+</div><div class='add'>+	struct vchiq_debugfs_node debugfs_node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+vchiq_use_service(struct vchiq_instance *instance, unsigned int handle);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_release_service(struct vchiq_instance *instance, unsigned int handle);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_check_service(struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_dump_service_use_state(struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,</div><div class='add'>+		   enum USE_TYPE_E use_type);</div><div class='add'>+extern int</div><div class='add'>+vchiq_release_internal(struct vchiq_state *state,</div><div class='add'>+		       struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+extern struct vchiq_debugfs_node *</div><div class='add'>+vchiq_instance_get_debugfs_node(struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_instance_get_use_count(struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_instance_get_pid(struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_instance_get_trace(struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_instance_set_trace(struct vchiq_instance *instance, int trace);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_add_connected_callback(struct vchiq_device *device,</div><div class='add'>+			     void (*callback)(void));</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_VCHIQ_CDEV)</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_deregister_chrdev(void);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_register_chrdev(struct device *parent);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void vchiq_deregister_chrdev(void) { }</div><div class='add'>+static inline int vchiq_register_chrdev(struct device *parent) { return 0; }</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_VCHIQ_CDEV) */</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+service_callback(struct vchiq_instance *vchiq_instance, enum vchiq_reason reason,</div><div class='add'>+		 struct vchiq_header *header, unsigned int handle,</div><div class='add'>+		 void *cb_data, void __user *cb_userdata);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+free_bulk_waiter(struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+#endif /* VCHIQ_ARM_H */</div><div class='head'>diff --git a/include/linux/raspberrypi/vchiq_bus.h b/include/linux/raspberrypi/vchiq_bus.h<br/>new file mode 100644<br/>index 000000000000..9de179b39f85<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/raspberrypi/vchiq_bus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/raspberrypi/vchiq_bus.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2023 Ideas On Board Oy</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _VCHIQ_DEVICE_H</div><div class='add'>+#define _VCHIQ_DEVICE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+</div><div class='add'>+struct vchiq_drv_mgmt;</div><div class='add'>+</div><div class='add'>+struct vchiq_device {</div><div class='add'>+	struct device dev;</div><div class='add'>+	struct vchiq_drv_mgmt *drv_mgmt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_driver {</div><div class='add'>+	int		(*probe)(struct vchiq_device *device);</div><div class='add'>+	void		(*remove)(struct vchiq_device *device);</div><div class='add'>+	int		(*resume)(struct vchiq_device *device);</div><div class='add'>+	int		(*suspend)(struct vchiq_device *device,</div><div class='add'>+				   pm_message_t state);</div><div class='add'>+</div><div class='add'>+	const struct vchiq_device_id *id_table;</div><div class='add'>+	struct device_driver driver;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct vchiq_device *to_vchiq_device(struct device *d)</div><div class='add'>+{</div><div class='add'>+	return container_of(d, struct vchiq_device, dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct vchiq_driver *to_vchiq_driver(struct device_driver *d)</div><div class='add'>+{</div><div class='add'>+	return container_of(d, struct vchiq_driver, driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern const struct bus_type vchiq_bus_type;</div><div class='add'>+</div><div class='add'>+struct vchiq_device *</div><div class='add'>+vchiq_device_register(struct device *parent, const char *name);</div><div class='add'>+void vchiq_device_unregister(struct vchiq_device *dev);</div><div class='add'>+</div><div class='add'>+int vchiq_driver_register(struct vchiq_driver *vchiq_drv);</div><div class='add'>+void vchiq_driver_unregister(struct vchiq_driver *vchiq_drv);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * module_vchiq_driver() - Helper macro for registering a vchiq driver</div><div class='add'>+ * @__vchiq_driver: vchiq driver struct</div><div class='add'>+ *</div><div class='add'>+ * Helper macro for vchiq drivers which do not do anything special in</div><div class='add'>+ * module init/exit. This eliminates a lot of boilerplate. Each module may only</div><div class='add'>+ * use this macro once, and calling it replaces module_init() and module_exit()</div><div class='add'>+ */</div><div class='add'>+#define module_vchiq_driver(__vchiq_driver) \</div><div class='add'>+	module_driver(__vchiq_driver, vchiq_driver_register, vchiq_driver_unregister)</div><div class='add'>+</div><div class='add'>+#endif /* _VCHIQ_DEVICE_H */</div><div class='head'>diff --git a/include/linux/raspberrypi/vchiq_cfg.h b/include/linux/raspberrypi/vchiq_cfg.h<br/>new file mode 100644<br/>index 000000000000..a16d0299996c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/raspberrypi/vchiq_cfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/raspberrypi/vchiq_cfg.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright (c) 2010-2014 Broadcom. All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef VCHIQ_CFG_H</div><div class='add'>+#define VCHIQ_CFG_H</div><div class='add'>+</div><div class='add'>+#define VCHIQ_MAGIC              VCHIQ_MAKE_FOURCC('V', 'C', 'H', 'I')</div><div class='add'>+/* The version of VCHIQ - change with any non-trivial change */</div><div class='add'>+#define VCHIQ_VERSION            8</div><div class='add'>+/*</div><div class='add'>+ * The minimum compatible version - update to match VCHIQ_VERSION with any</div><div class='add'>+ * incompatible change</div><div class='add'>+ */</div><div class='add'>+#define VCHIQ_VERSION_MIN        3</div><div class='add'>+</div><div class='add'>+/* The version that introduced the VCHIQ_IOC_LIB_VERSION ioctl */</div><div class='add'>+#define VCHIQ_VERSION_LIB_VERSION 7</div><div class='add'>+</div><div class='add'>+/* The version that introduced the VCHIQ_IOC_CLOSE_DELIVERED ioctl */</div><div class='add'>+#define VCHIQ_VERSION_CLOSE_DELIVERED 7</div><div class='add'>+</div><div class='add'>+/* The version that made it safe to use SYNCHRONOUS mode */</div><div class='add'>+#define VCHIQ_VERSION_SYNCHRONOUS_MODE 8</div><div class='add'>+</div><div class='add'>+#define VCHIQ_MAX_STATES         1</div><div class='add'>+#define VCHIQ_MAX_SERVICES       4096</div><div class='add'>+#define VCHIQ_MAX_SLOTS          128</div><div class='add'>+#define VCHIQ_MAX_SLOTS_PER_SIDE 64</div><div class='add'>+</div><div class='add'>+#define VCHIQ_NUM_CURRENT_BULKS        32</div><div class='add'>+#define VCHIQ_NUM_SERVICE_BULKS        4</div><div class='add'>+</div><div class='add'>+#ifndef VCHIQ_ENABLE_DEBUG</div><div class='add'>+#define VCHIQ_ENABLE_DEBUG             1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef VCHIQ_ENABLE_STATS</div><div class='add'>+#define VCHIQ_ENABLE_STATS             1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* VCHIQ_CFG_H */</div><div class='head'>diff --git a/include/linux/raspberrypi/vchiq_core.h b/include/linux/raspberrypi/vchiq_core.h<br/>new file mode 100644<br/>index 000000000000..e7bf7a114985<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/raspberrypi/vchiq_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/raspberrypi/vchiq_core.h</a></div><div class='hunk'>@@ -0,0 +1,646 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright (c) 2010-2012 Broadcom. All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef VCHIQ_CORE_H</div><div class='add'>+#define VCHIQ_CORE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/dev_printk.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/spinlock_types.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vchiq.h"</div><div class='add'>+#include "vchiq_cfg.h"</div><div class='add'>+</div><div class='add'>+/* Do this so that we can test-build the code on non-rpi systems */</div><div class='add'>+#if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#ifndef dsb</div><div class='add'>+#define dsb(a)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif	/* IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE) */</div><div class='add'>+</div><div class='add'>+#define VCHIQ_SERVICE_HANDLE_INVALID 0</div><div class='add'>+</div><div class='add'>+#define VCHIQ_SLOT_SIZE     4096</div><div class='add'>+#define VCHIQ_MAX_MSG_SIZE  (VCHIQ_SLOT_SIZE - sizeof(struct vchiq_header))</div><div class='add'>+</div><div class='add'>+#define VCHIQ_SLOT_MASK        (VCHIQ_SLOT_SIZE - 1)</div><div class='add'>+#define VCHIQ_SLOT_QUEUE_MASK  (VCHIQ_MAX_SLOTS_PER_SIDE - 1)</div><div class='add'>+#define VCHIQ_SLOT_ZERO_SLOTS  DIV_ROUND_UP(sizeof(struct vchiq_slot_zero), \</div><div class='add'>+					    VCHIQ_SLOT_SIZE)</div><div class='add'>+</div><div class='add'>+#define BITSET_SIZE(b)        ((b + 31) &gt;&gt; 5)</div><div class='add'>+#define BITSET_WORD(b)        (b &gt;&gt; 5)</div><div class='add'>+#define BITSET_BIT(b)         (1 &lt;&lt; (b &amp; 31))</div><div class='add'>+#define BITSET_IS_SET(bs, b)  (bs[BITSET_WORD(b)] &amp; BITSET_BIT(b))</div><div class='add'>+#define BITSET_SET(bs, b)     (bs[BITSET_WORD(b)] |= BITSET_BIT(b))</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DEBUG_ENTRIES,</div><div class='add'>+#if VCHIQ_ENABLE_DEBUG</div><div class='add'>+	DEBUG_SLOT_HANDLER_COUNT,</div><div class='add'>+	DEBUG_SLOT_HANDLER_LINE,</div><div class='add'>+	DEBUG_PARSE_LINE,</div><div class='add'>+	DEBUG_PARSE_HEADER,</div><div class='add'>+	DEBUG_PARSE_MSGID,</div><div class='add'>+	DEBUG_AWAIT_COMPLETION_LINE,</div><div class='add'>+	DEBUG_DEQUEUE_MESSAGE_LINE,</div><div class='add'>+	DEBUG_SERVICE_CALLBACK_LINE,</div><div class='add'>+	DEBUG_MSG_QUEUE_FULL_COUNT,</div><div class='add'>+	DEBUG_COMPLETION_QUEUE_FULL_COUNT,</div><div class='add'>+#endif</div><div class='add'>+	DEBUG_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if VCHIQ_ENABLE_DEBUG</div><div class='add'>+</div><div class='add'>+#define DEBUG_INITIALISE(local) int *debug_ptr = (local)-&gt;debug</div><div class='add'>+#define DEBUG_TRACE(d) \</div><div class='add'>+	do { debug_ptr[DEBUG_ ## d] = __LINE__; dsb(sy); } while (0)</div><div class='add'>+#define DEBUG_VALUE(d, v) \</div><div class='add'>+	do { debug_ptr[DEBUG_ ## d] = (v); dsb(sy); } while (0)</div><div class='add'>+#define DEBUG_COUNT(d) \</div><div class='add'>+	do { debug_ptr[DEBUG_ ## d]++; dsb(sy); } while (0)</div><div class='add'>+</div><div class='add'>+#else /* VCHIQ_ENABLE_DEBUG */</div><div class='add'>+</div><div class='add'>+#define DEBUG_INITIALISE(local)</div><div class='add'>+#define DEBUG_TRACE(d)</div><div class='add'>+#define DEBUG_VALUE(d, v)</div><div class='add'>+#define DEBUG_COUNT(d)</div><div class='add'>+</div><div class='add'>+#endif /* VCHIQ_ENABLE_DEBUG */</div><div class='add'>+</div><div class='add'>+enum vchiq_connstate {</div><div class='add'>+	VCHIQ_CONNSTATE_DISCONNECTED,</div><div class='add'>+	VCHIQ_CONNSTATE_CONNECTING,</div><div class='add'>+	VCHIQ_CONNSTATE_CONNECTED,</div><div class='add'>+	VCHIQ_CONNSTATE_PAUSING,</div><div class='add'>+	VCHIQ_CONNSTATE_PAUSE_SENT,</div><div class='add'>+	VCHIQ_CONNSTATE_PAUSED,</div><div class='add'>+	VCHIQ_CONNSTATE_RESUMING,</div><div class='add'>+	VCHIQ_CONNSTATE_PAUSE_TIMEOUT,</div><div class='add'>+	VCHIQ_CONNSTATE_RESUME_TIMEOUT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	VCHIQ_SRVSTATE_FREE,</div><div class='add'>+	VCHIQ_SRVSTATE_HIDDEN,</div><div class='add'>+	VCHIQ_SRVSTATE_LISTENING,</div><div class='add'>+	VCHIQ_SRVSTATE_OPENING,</div><div class='add'>+	VCHIQ_SRVSTATE_OPEN,</div><div class='add'>+	VCHIQ_SRVSTATE_OPENSYNC,</div><div class='add'>+	VCHIQ_SRVSTATE_CLOSESENT,</div><div class='add'>+	VCHIQ_SRVSTATE_CLOSERECVD,</div><div class='add'>+	VCHIQ_SRVSTATE_CLOSEWAIT,</div><div class='add'>+	VCHIQ_SRVSTATE_CLOSED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum vchiq_bulk_dir {</div><div class='add'>+	VCHIQ_BULK_TRANSMIT,</div><div class='add'>+	VCHIQ_BULK_RECEIVE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_bulk {</div><div class='add'>+	short mode;</div><div class='add'>+	short dir;</div><div class='add'>+	void *cb_data;</div><div class='add'>+	void __user *cb_userdata;</div><div class='add'>+	struct bulk_waiter *waiter;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	int size;</div><div class='add'>+	void *remote_data;</div><div class='add'>+	int remote_size;</div><div class='add'>+	int actual;</div><div class='add'>+	void *offset;</div><div class='add'>+	void __user *uoffset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_bulk_queue {</div><div class='add'>+	int local_insert;  /* Where to insert the next local bulk */</div><div class='add'>+	int remote_insert; /* Where to insert the next remote bulk (master) */</div><div class='add'>+	int process;       /* Bulk to transfer next */</div><div class='add'>+	int remote_notify; /* Bulk to notify the remote client of next (mstr) */</div><div class='add'>+	int remove;        /* Bulk to notify the local client of, and remove, next */</div><div class='add'>+	struct vchiq_bulk bulks[VCHIQ_NUM_SERVICE_BULKS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Remote events provide a way of presenting several virtual doorbells to a</div><div class='add'>+ * peer (ARM host to VPU) using only one physical doorbell. They can be thought</div><div class='add'>+ * of as a way for the peer to signal a semaphore, in this case implemented as</div><div class='add'>+ * a workqueue.</div><div class='add'>+ *</div><div class='add'>+ * Remote events remain signalled until acknowledged by the receiver, and they</div><div class='add'>+ * are non-counting. They are designed in such a way as to minimise the number</div><div class='add'>+ * of interrupts and avoid unnecessary waiting.</div><div class='add'>+ *</div><div class='add'>+ * A remote_event is as small data structures that live in shared memory. It</div><div class='add'>+ * comprises two booleans - armed and fired:</div><div class='add'>+ *</div><div class='add'>+ * The sender sets fired when they signal the receiver.</div><div class='add'>+ * If fired is set, the receiver has been signalled and need not wait.</div><div class='add'>+ * The receiver sets the armed field before they begin to wait.</div><div class='add'>+ * If armed is set, the receiver is waiting and wishes to be woken by interrupt.</div><div class='add'>+ */</div><div class='add'>+struct remote_event {</div><div class='add'>+	int armed;</div><div class='add'>+	int fired;</div><div class='add'>+	u32 __unused;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct opaque_platform_state;</div><div class='add'>+</div><div class='add'>+struct vchiq_slot {</div><div class='add'>+	char data[VCHIQ_SLOT_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_slot_info {</div><div class='add'>+	/* Use two counters rather than one to avoid the need for a mutex. */</div><div class='add'>+	short use_count;</div><div class='add'>+	short release_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * VCHIQ is a reliable connection-oriented datagram protocol.</div><div class='add'>+ *</div><div class='add'>+ * A VCHIQ service is equivalent to a TCP connection, except:</div><div class='add'>+ * + FOURCCs are used for the rendezvous, and port numbers are assigned at the</div><div class='add'>+ *   time the connection is established.</div><div class='add'>+ * + There is less of a distinction between server and client sockets, the only</div><div class='add'>+ *   difference being which end makes the first move.</div><div class='add'>+ * + For a multi-client server, the server creates new "listening" services as</div><div class='add'>+ *   the existing one becomes connected - there is no need to specify the</div><div class='add'>+ *   maximum number of clients up front.</div><div class='add'>+ * + Data transfer is reliable but packetized (messages have defined ends).</div><div class='add'>+ * + Messages can be either short (capable of fitting in a slot) and in-band,</div><div class='add'>+ *   or copied between external buffers (bulk transfers).</div><div class='add'>+ */</div><div class='add'>+struct vchiq_service {</div><div class='add'>+	struct vchiq_service_base base;</div><div class='add'>+	unsigned int handle;</div><div class='add'>+	struct kref ref_count;</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+	int srvstate;</div><div class='add'>+	void (*userdata_term)(void *userdata);</div><div class='add'>+	unsigned int localport;</div><div class='add'>+	unsigned int remoteport;</div><div class='add'>+	int public_fourcc;</div><div class='add'>+	int client_id;</div><div class='add'>+	char auto_close;</div><div class='add'>+	char sync;</div><div class='add'>+	char closing;</div><div class='add'>+	char trace;</div><div class='add'>+	atomic_t poll_flags;</div><div class='add'>+	short version;</div><div class='add'>+	short version_min;</div><div class='add'>+	short peer_version;</div><div class='add'>+</div><div class='add'>+	struct vchiq_state *state;</div><div class='add'>+	struct vchiq_instance *instance;</div><div class='add'>+</div><div class='add'>+	int service_use_count;</div><div class='add'>+</div><div class='add'>+	struct vchiq_bulk_queue bulk_tx;</div><div class='add'>+	struct vchiq_bulk_queue bulk_rx;</div><div class='add'>+</div><div class='add'>+	struct completion remove_event;</div><div class='add'>+	struct completion bulk_remove_event;</div><div class='add'>+	struct mutex bulk_mutex;</div><div class='add'>+</div><div class='add'>+	struct service_stats_struct {</div><div class='add'>+		int quota_stalls;</div><div class='add'>+		int slot_stalls;</div><div class='add'>+		int bulk_stalls;</div><div class='add'>+		int error_count;</div><div class='add'>+		int ctrl_tx_count;</div><div class='add'>+		int ctrl_rx_count;</div><div class='add'>+		int bulk_tx_count;</div><div class='add'>+		int bulk_rx_count;</div><div class='add'>+		int bulk_aborted_count;</div><div class='add'>+		u64 ctrl_tx_bytes;</div><div class='add'>+		u64 ctrl_rx_bytes;</div><div class='add'>+		u64 bulk_tx_bytes;</div><div class='add'>+		u64 bulk_rx_bytes;</div><div class='add'>+	} stats;</div><div class='add'>+</div><div class='add'>+	int msg_queue_read;</div><div class='add'>+	int msg_queue_write;</div><div class='add'>+	struct completion msg_queue_pop;</div><div class='add'>+	struct completion msg_queue_push;</div><div class='add'>+	struct vchiq_header *msg_queue[VCHIQ_MAX_SLOTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The quota information is outside struct vchiq_service so that it can</div><div class='add'>+ * be statically allocated, since for accounting reasons a service's slot</div><div class='add'>+ * usage is carried over between users of the same port number.</div><div class='add'>+ */</div><div class='add'>+struct vchiq_service_quota {</div><div class='add'>+	unsigned short slot_quota;</div><div class='add'>+	unsigned short slot_use_count;</div><div class='add'>+	unsigned short message_quota;</div><div class='add'>+	unsigned short message_use_count;</div><div class='add'>+	struct completion quota_event;</div><div class='add'>+	int previous_tx_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_shared_state {</div><div class='add'>+	/* A non-zero value here indicates that the content is valid. */</div><div class='add'>+	int initialised;</div><div class='add'>+</div><div class='add'>+	/* The first and last (inclusive) slots allocated to the owner. */</div><div class='add'>+	int slot_first;</div><div class='add'>+	int slot_last;</div><div class='add'>+</div><div class='add'>+	/* The slot allocated to synchronous messages from the owner. */</div><div class='add'>+	int slot_sync;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Signalling this event indicates that owner's slot handler thread</div><div class='add'>+	 * should run.</div><div class='add'>+	 */</div><div class='add'>+	struct remote_event trigger;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Indicates the byte position within the stream where the next message</div><div class='add'>+	 * will be written. The least significant bits are an index into the</div><div class='add'>+	 * slot. The next bits are the index of the slot in slot_queue.</div><div class='add'>+	 */</div><div class='add'>+	int tx_pos;</div><div class='add'>+</div><div class='add'>+	/* This event should be signalled when a slot is recycled. */</div><div class='add'>+	struct remote_event recycle;</div><div class='add'>+</div><div class='add'>+	/* The slot_queue index where the next recycled slot will be written. */</div><div class='add'>+	int slot_queue_recycle;</div><div class='add'>+</div><div class='add'>+	/* This event should be signalled when a synchronous message is sent. */</div><div class='add'>+	struct remote_event sync_trigger;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This event should be signalled when a synchronous message has been</div><div class='add'>+	 * released.</div><div class='add'>+	 */</div><div class='add'>+	struct remote_event sync_release;</div><div class='add'>+</div><div class='add'>+	/* A circular buffer of slot indexes. */</div><div class='add'>+	int slot_queue[VCHIQ_MAX_SLOTS_PER_SIDE];</div><div class='add'>+</div><div class='add'>+	/* Debugging state */</div><div class='add'>+	int debug[DEBUG_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * vchiq_slot_zero describes the memory shared between the ARM host and the</div><div class='add'>+ * VideoCore VPU. The "master" and "slave" states are owned by the respective</div><div class='add'>+ * sides but visible to the other; the slots are shared, and the remaining</div><div class='add'>+ * fields are read-only.</div><div class='add'>+ *</div><div class='add'>+ * In the configuration used by this implementation, the memory is allocated</div><div class='add'>+ * by the host, the VPU is the master (the side which controls the DMA for bulk</div><div class='add'>+ * transfers), and the host is the slave.</div><div class='add'>+ *</div><div class='add'>+ * The ownership of slots changes with use:</div><div class='add'>+ * + When empty they are owned by the sender.</div><div class='add'>+ * + When partially filled they are shared with the receiver.</div><div class='add'>+ * + When completely full they are owned by the receiver.</div><div class='add'>+ * + When the receiver has finished processing the contents, they are recycled</div><div class='add'>+ *   back to the sender.</div><div class='add'>+ */</div><div class='add'>+struct vchiq_slot_zero {</div><div class='add'>+	int magic;</div><div class='add'>+	short version;</div><div class='add'>+	short version_min;</div><div class='add'>+	int slot_zero_size;</div><div class='add'>+	int slot_size;</div><div class='add'>+	int max_slots;</div><div class='add'>+	int max_slots_per_side;</div><div class='add'>+	int platform_data[2];</div><div class='add'>+	struct vchiq_shared_state master;</div><div class='add'>+	struct vchiq_shared_state slave;</div><div class='add'>+	struct vchiq_slot_info slots[VCHIQ_MAX_SLOTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the private runtime state used by each side. The same structure was</div><div class='add'>+ * originally used by both sides, but implementations have since diverged.</div><div class='add'>+ */</div><div class='add'>+struct vchiq_state {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int id;</div><div class='add'>+	int initialised;</div><div class='add'>+	enum vchiq_connstate conn_state;</div><div class='add'>+	short version_common;</div><div class='add'>+</div><div class='add'>+	struct vchiq_shared_state *local;</div><div class='add'>+	struct vchiq_shared_state *remote;</div><div class='add'>+	struct vchiq_slot *slot_data;</div><div class='add'>+</div><div class='add'>+	unsigned short default_slot_quota;</div><div class='add'>+	unsigned short default_message_quota;</div><div class='add'>+</div><div class='add'>+	/* Event indicating connect message received */</div><div class='add'>+	struct completion connect;</div><div class='add'>+</div><div class='add'>+	/* Mutex protecting services */</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	struct vchiq_instance **instance;</div><div class='add'>+</div><div class='add'>+	/* Processes all incoming messages which aren't synchronous */</div><div class='add'>+	struct task_struct *slot_handler_thread;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Slots which have been fully processed and released by the (peer)</div><div class='add'>+	 * receiver are added to the receiver queue, which is asynchronously</div><div class='add'>+	 * processed by the recycle thread.</div><div class='add'>+	 */</div><div class='add'>+	struct task_struct *recycle_thread;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Processes incoming synchronous messages</div><div class='add'>+	 *</div><div class='add'>+	 * The synchronous message channel is shared between all synchronous</div><div class='add'>+	 * services, and provides a way for urgent messages to bypass</div><div class='add'>+	 * potentially long queues of asynchronous messages in the normal slots.</div><div class='add'>+	 *</div><div class='add'>+	 * There can be only one outstanding synchronous message in</div><div class='add'>+	 * each direction, and as a precious shared resource synchronous</div><div class='add'>+	 * services should be used sparingly.</div><div class='add'>+	 */</div><div class='add'>+	struct task_struct *sync_thread;</div><div class='add'>+</div><div class='add'>+	/* Local implementation of the trigger remote event */</div><div class='add'>+	wait_queue_head_t trigger_event;</div><div class='add'>+</div><div class='add'>+	/* Local implementation of the recycle remote event */</div><div class='add'>+	wait_queue_head_t recycle_event;</div><div class='add'>+</div><div class='add'>+	/* Local implementation of the sync trigger remote event */</div><div class='add'>+	wait_queue_head_t sync_trigger_event;</div><div class='add'>+</div><div class='add'>+	/* Local implementation of the sync release remote event */</div><div class='add'>+	wait_queue_head_t sync_release_event;</div><div class='add'>+</div><div class='add'>+	char *tx_data;</div><div class='add'>+	char *rx_data;</div><div class='add'>+	struct vchiq_slot_info *rx_info;</div><div class='add'>+</div><div class='add'>+	struct mutex slot_mutex;</div><div class='add'>+</div><div class='add'>+	struct mutex recycle_mutex;</div><div class='add'>+</div><div class='add'>+	struct mutex sync_mutex;</div><div class='add'>+</div><div class='add'>+	spinlock_t msg_queue_spinlock;</div><div class='add'>+</div><div class='add'>+	spinlock_t bulk_waiter_spinlock;</div><div class='add'>+</div><div class='add'>+	spinlock_t quota_spinlock;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Indicates the byte position within the stream from where the next</div><div class='add'>+	 * message will be read. The least significant bits are an index into</div><div class='add'>+	 * the slot.The next bits are the index of the slot in</div><div class='add'>+	 * remote-&gt;slot_queue.</div><div class='add'>+	 */</div><div class='add'>+	int rx_pos;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A cached copy of local-&gt;tx_pos. Only write to local-&gt;tx_pos, and read</div><div class='add'>+	 * from remote-&gt;tx_pos.</div><div class='add'>+	 */</div><div class='add'>+	int local_tx_pos;</div><div class='add'>+</div><div class='add'>+	/* The slot_queue index of the slot to become available next. */</div><div class='add'>+	int slot_queue_available;</div><div class='add'>+</div><div class='add'>+	/* A flag to indicate if any poll has been requested */</div><div class='add'>+	int poll_needed;</div><div class='add'>+</div><div class='add'>+	/* Ths index of the previous slot used for data messages. */</div><div class='add'>+	int previous_data_index;</div><div class='add'>+</div><div class='add'>+	/* The number of slots occupied by data messages. */</div><div class='add'>+	unsigned short data_use_count;</div><div class='add'>+</div><div class='add'>+	/* The maximum number of slots to be occupied by data messages. */</div><div class='add'>+	unsigned short data_quota;</div><div class='add'>+</div><div class='add'>+	/* An array of bit sets indicating which services must be polled. */</div><div class='add'>+	atomic_t poll_services[BITSET_SIZE(VCHIQ_MAX_SERVICES)];</div><div class='add'>+</div><div class='add'>+	/* The number of the first unused service */</div><div class='add'>+	int unused_service;</div><div class='add'>+</div><div class='add'>+	/* Signalled when a free slot becomes available. */</div><div class='add'>+	struct completion slot_available_event;</div><div class='add'>+</div><div class='add'>+	/* Signalled when a free data slot becomes available. */</div><div class='add'>+	struct completion data_quota_event;</div><div class='add'>+</div><div class='add'>+	struct state_stats_struct {</div><div class='add'>+		int slot_stalls;</div><div class='add'>+		int data_stalls;</div><div class='add'>+		int ctrl_tx_count;</div><div class='add'>+		int ctrl_rx_count;</div><div class='add'>+		int error_count;</div><div class='add'>+	} stats;</div><div class='add'>+</div><div class='add'>+	struct vchiq_service __rcu *services[VCHIQ_MAX_SERVICES];</div><div class='add'>+	struct vchiq_service_quota service_quotas[VCHIQ_MAX_SERVICES];</div><div class='add'>+	struct vchiq_slot_info slot_info[VCHIQ_MAX_SLOTS];</div><div class='add'>+</div><div class='add'>+	struct opaque_platform_state *platform_state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pagelist {</div><div class='add'>+	u32 length;</div><div class='add'>+	u16 type;</div><div class='add'>+	u16 offset;</div><div class='add'>+	u32 addrs[1];	/* N.B. 12 LSBs hold the number</div><div class='add'>+			 * of following pages at consecutive</div><div class='add'>+			 * addresses.</div><div class='add'>+			 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_pagelist_info {</div><div class='add'>+	struct pagelist *pagelist;</div><div class='add'>+	size_t pagelist_buffer_size;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	enum dma_data_direction dma_dir;</div><div class='add'>+	unsigned int num_pages;</div><div class='add'>+	unsigned int pages_need_release;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	struct scatterlist *scatterlist;</div><div class='add'>+	unsigned int scatterlist_mapped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool vchiq_remote_initialised(const struct vchiq_state *state)</div><div class='add'>+{</div><div class='add'>+	return state-&gt;remote &amp;&amp; state-&gt;remote-&gt;initialised;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bulk_waiter {</div><div class='add'>+	struct vchiq_bulk *bulk;</div><div class='add'>+	struct completion event;</div><div class='add'>+	int actual;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vchiq_config {</div><div class='add'>+	unsigned int max_msg_size;</div><div class='add'>+	unsigned int bulk_threshold;	/* The message size above which it</div><div class='add'>+					 * is better to use a bulk transfer</div><div class='add'>+					 * (&lt;= max_msg_size)</div><div class='add'>+					 */</div><div class='add'>+	unsigned int max_outstanding_bulks;</div><div class='add'>+	unsigned int max_services;</div><div class='add'>+	short version;      /* The version of VCHIQ */</div><div class='add'>+	short version_min;  /* The minimum compatible version of VCHIQ */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern spinlock_t bulk_waiter_spinlock;</div><div class='add'>+</div><div class='add'>+extern const char *</div><div class='add'>+get_conn_state_name(enum vchiq_connstate conn_state);</div><div class='add'>+</div><div class='add'>+extern struct vchiq_slot_zero *</div><div class='add'>+vchiq_init_slots(struct device *dev, void *mem_base, int mem_size);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero, struct device *dev);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_connect_internal(struct vchiq_state *state, struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+struct vchiq_service *</div><div class='add'>+vchiq_add_service_internal(struct vchiq_state *state,</div><div class='add'>+			   const struct vchiq_service_params_kernel *params,</div><div class='add'>+			   int srvstate, struct vchiq_instance *instance,</div><div class='add'>+			   void (*userdata_term)(void *userdata));</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_open_service_internal(struct vchiq_service *service, int client_id);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_close_service_internal(struct vchiq_service *service, int close_recvd);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_terminate_service_internal(struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_free_service_internal(struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+remote_event_pollall(struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_bulk_xfer_waiting(struct vchiq_instance *instance, unsigned int handle,</div><div class='add'>+			struct bulk_waiter *userdata);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_bulk_xfer_blocking(struct vchiq_instance *instance, unsigned int handle,</div><div class='add'>+			 struct vchiq_bulk *bulk);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_bulk_xfer_callback(struct vchiq_instance *instance, unsigned int handle,</div><div class='add'>+			 struct vchiq_bulk *bulk);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_dump_state(struct seq_file *f, struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+request_poll(struct vchiq_state *state, struct vchiq_service *service,</div><div class='add'>+	     int poll_type);</div><div class='add'>+</div><div class='add'>+struct vchiq_service *handle_to_service(struct vchiq_instance *instance, unsigned int handle);</div><div class='add'>+</div><div class='add'>+extern struct vchiq_service *</div><div class='add'>+find_service_by_handle(struct vchiq_instance *instance, unsigned int handle);</div><div class='add'>+</div><div class='add'>+extern struct vchiq_service *</div><div class='add'>+find_service_by_port(struct vchiq_state *state, unsigned int localport);</div><div class='add'>+</div><div class='add'>+extern struct vchiq_service *</div><div class='add'>+find_service_for_instance(struct vchiq_instance *instance, unsigned int handle);</div><div class='add'>+</div><div class='add'>+extern struct vchiq_service *</div><div class='add'>+find_closed_service_for_instance(struct vchiq_instance *instance, unsigned int handle);</div><div class='add'>+</div><div class='add'>+extern struct vchiq_service *</div><div class='add'>+__next_service_by_instance(struct vchiq_state *state,</div><div class='add'>+			   struct vchiq_instance *instance,</div><div class='add'>+			   int *pidx);</div><div class='add'>+</div><div class='add'>+extern struct vchiq_service *</div><div class='add'>+next_service_by_instance(struct vchiq_state *state,</div><div class='add'>+			 struct vchiq_instance *instance,</div><div class='add'>+			 int *pidx);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_service_get(struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+extern void</div><div class='add'>+vchiq_service_put(struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+vchiq_queue_message(struct vchiq_instance *instance, unsigned int handle,</div><div class='add'>+		    ssize_t (*copy_callback)(void *context, void *dest,</div><div class='add'>+					     size_t offset, size_t maxsize),</div><div class='add'>+		    void *context,</div><div class='add'>+		    size_t size);</div><div class='add'>+</div><div class='add'>+void vchiq_dump_platform_state(struct seq_file *f);</div><div class='add'>+</div><div class='add'>+void vchiq_dump_platform_instances(struct vchiq_state *state, struct seq_file *f);</div><div class='add'>+</div><div class='add'>+void vchiq_dump_platform_service_state(struct seq_file *f, struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+int vchiq_use_service_internal(struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+int vchiq_release_service_internal(struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+void vchiq_on_remote_use(struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+void vchiq_on_remote_release(struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+int vchiq_platform_init_state(struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+int vchiq_check_service(struct vchiq_service *service);</div><div class='add'>+</div><div class='add'>+int vchiq_send_remote_use(struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+int vchiq_send_remote_use_active(struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+void vchiq_platform_conn_state_changed(struct vchiq_state *state,</div><div class='add'>+				       enum vchiq_connstate oldstate,</div><div class='add'>+				  enum vchiq_connstate newstate);</div><div class='add'>+</div><div class='add'>+void vchiq_set_conn_state(struct vchiq_state *state, enum vchiq_connstate newstate);</div><div class='add'>+</div><div class='add'>+void vchiq_log_dump_mem(struct device *dev, const char *label, u32 addr,</div><div class='add'>+			const void *void_mem, size_t num_bytes);</div><div class='add'>+</div><div class='add'>+int vchiq_remove_service(struct vchiq_instance *instance, unsigned int service);</div><div class='add'>+</div><div class='add'>+int vchiq_get_client_id(struct vchiq_instance *instance, unsigned int service);</div><div class='add'>+</div><div class='add'>+void vchiq_get_config(struct vchiq_config *config);</div><div class='add'>+</div><div class='add'>+int vchiq_set_service_option(struct vchiq_instance *instance, unsigned int service,</div><div class='add'>+			     enum vchiq_service_option option, int value);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/raspberrypi/vchiq_debugfs.h b/include/linux/raspberrypi/vchiq_debugfs.h<br/>new file mode 100644<br/>index 000000000000..b29e6693c949<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/raspberrypi/vchiq_debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/raspberrypi/vchiq_debugfs.h</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/* Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef VCHIQ_DEBUGFS_H</div><div class='add'>+#define VCHIQ_DEBUGFS_H</div><div class='add'>+</div><div class='add'>+struct vchiq_state;</div><div class='add'>+struct vchiq_instance;</div><div class='add'>+</div><div class='add'>+struct vchiq_debugfs_node {</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void vchiq_debugfs_init(struct vchiq_state *state);</div><div class='add'>+</div><div class='add'>+void vchiq_debugfs_deinit(void);</div><div class='add'>+</div><div class='add'>+void vchiq_debugfs_add_instance(struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+void vchiq_debugfs_remove_instance(struct vchiq_instance *instance);</div><div class='add'>+</div><div class='add'>+#endif /* VCHIQ_DEBUGFS_H */</div><div class='head'>diff --git a/include/linux/ratelimit.h b/include/linux/ratelimit.h<br/>index b17e0cd0a30c..7aaad158ee37 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ratelimit.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ratelimit.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ratelimit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ratelimit.h</a></div><div class='hunk'>@@ -22,16 +22,43 @@ static inline void ratelimit_default_init(struct ratelimit_state *rs)</div><div class='ctx'> 					DEFAULT_RATELIMIT_BURST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ratelimit_state_inc_miss(struct ratelimit_state *rs)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;rs-&gt;missed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ratelimit_state_get_miss(struct ratelimit_state *rs)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;rs-&gt;missed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ratelimit_state_reset_miss(struct ratelimit_state *rs)</div><div class='add'>+{</div><div class='add'>+	return atomic_xchg_relaxed(&amp;rs-&gt;missed, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ratelimit_state_reset_interval(struct ratelimit_state *rs, int interval_init)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	raw_spin_lock_irqsave(&amp;rs-&gt;lock, flags);</div><div class='add'>+	rs-&gt;interval = interval_init;</div><div class='add'>+	rs-&gt;flags &amp;= ~RATELIMIT_INITIALIZED;</div><div class='add'>+	atomic_set(&amp;rs-&gt;rs_n_left, rs-&gt;burst);</div><div class='add'>+	ratelimit_state_reset_miss(rs);</div><div class='add'>+	raw_spin_unlock_irqrestore(&amp;rs-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void ratelimit_state_exit(struct ratelimit_state *rs)</div><div class='ctx'> {</div><div class='add'>+	int m;</div><div class='add'>+</div><div class='ctx'> 	if (!(rs-&gt;flags &amp; RATELIMIT_MSG_ON_RELEASE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (rs-&gt;missed) {</div><div class='del'>-		pr_warn("%s: %d output lines suppressed due to ratelimiting\n",</div><div class='del'>-			current-&gt;comm, rs-&gt;missed);</div><div class='del'>-		rs-&gt;missed = 0;</div><div class='del'>-	}</div><div class='add'>+	m = ratelimit_state_reset_miss(rs);</div><div class='add'>+	if (m)</div><div class='add'>+		pr_warn("%s: %d output lines suppressed due to ratelimiting\n", current-&gt;comm, m);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='head'>diff --git a/include/linux/ratelimit_types.h b/include/linux/ratelimit_types.h<br/>index 002266693e50..b19c4354540a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ratelimit_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ratelimit_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ratelimit_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ratelimit_types.h</a></div><div class='hunk'>@@ -11,16 +11,17 @@</div><div class='ctx'> </div><div class='ctx'> /* issue num suppressed message on exit */</div><div class='ctx'> #define RATELIMIT_MSG_ON_RELEASE	BIT(0)</div><div class='add'>+#define RATELIMIT_INITIALIZED		BIT(1)</div><div class='ctx'> </div><div class='ctx'> struct ratelimit_state {</div><div class='ctx'> 	raw_spinlock_t	lock;		/* protect the state */</div><div class='ctx'> </div><div class='ctx'> 	int		interval;</div><div class='ctx'> 	int		burst;</div><div class='del'>-	int		printed;</div><div class='del'>-	int		missed;</div><div class='add'>+	atomic_t	rs_n_left;</div><div class='add'>+	atomic_t	missed;</div><div class='add'>+	unsigned int	flags;</div><div class='ctx'> 	unsigned long	begin;</div><div class='del'>-	unsigned long	flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define RATELIMIT_STATE_INIT_FLAGS(name, interval_init, burst_init, flags_init) { \</div><div class='head'>diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h<br/>index f7edca369eda..4091e978aef2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rbtree.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rbtree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rbtree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rbtree.h</a></div><div class='hunk'>@@ -43,8 +43,36 @@ extern void rb_erase(struct rb_node *, struct rb_root *);</div><div class='ctx'> /* Find logical next and previous nodes in a tree */</div><div class='ctx'> extern struct rb_node *rb_next(const struct rb_node *);</div><div class='ctx'> extern struct rb_node *rb_prev(const struct rb_node *);</div><div class='del'>-extern struct rb_node *rb_first(const struct rb_root *);</div><div class='del'>-extern struct rb_node *rb_last(const struct rb_root *);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function returns the first node (in sort order) of the tree.</div><div class='add'>+ */</div><div class='add'>+static inline struct rb_node *rb_first(const struct rb_root *root)</div><div class='add'>+{</div><div class='add'>+	struct rb_node	*n;</div><div class='add'>+</div><div class='add'>+	n = root-&gt;rb_node;</div><div class='add'>+	if (!n)</div><div class='add'>+		return NULL;</div><div class='add'>+	while (n-&gt;rb_left)</div><div class='add'>+		n = n-&gt;rb_left;</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function returns the last node (in sort order) of the tree.</div><div class='add'>+ */</div><div class='add'>+static inline struct rb_node *rb_last(const struct rb_root *root)</div><div class='add'>+{</div><div class='add'>+	struct rb_node	*n;</div><div class='add'>+</div><div class='add'>+	n = root-&gt;rb_node;</div><div class='add'>+	if (!n)</div><div class='add'>+		return NULL;</div><div class='add'>+	while (n-&gt;rb_right)</div><div class='add'>+		n = n-&gt;rb_right;</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Postorder iteration - always visit the parent after its children */</div><div class='ctx'> extern struct rb_node *rb_first_postorder(const struct rb_root *);</div><div class='hunk'>@@ -211,6 +239,43 @@ rb_add(struct rb_node *node, struct rb_root *tree,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * rb_find_add_cached() - find equivalent @node in @tree, or add @node</div><div class='add'>+ * @node: node to look-for / insert</div><div class='add'>+ * @tree: tree to search / modify</div><div class='add'>+ * @cmp: operator defining the node order</div><div class='add'>+ *</div><div class='add'>+ * Returns the rb_node matching @node, or NULL when no match is found and @node</div><div class='add'>+ * is inserted.</div><div class='add'>+ */</div><div class='add'>+static __always_inline struct rb_node *</div><div class='add'>+rb_find_add_cached(struct rb_node *node, struct rb_root_cached *tree,</div><div class='add'>+	    int (*cmp)(const struct rb_node *new, const struct rb_node *exist))</div><div class='add'>+{</div><div class='add'>+	bool leftmost = true;</div><div class='add'>+	struct rb_node **link = &amp;tree-&gt;rb_root.rb_node;</div><div class='add'>+	struct rb_node *parent = NULL;</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	while (*link) {</div><div class='add'>+		parent = *link;</div><div class='add'>+		c = cmp(node, parent);</div><div class='add'>+</div><div class='add'>+		if (c &lt; 0) {</div><div class='add'>+			link = &amp;parent-&gt;rb_left;</div><div class='add'>+		} else if (c &gt; 0) {</div><div class='add'>+			link = &amp;parent-&gt;rb_right;</div><div class='add'>+			leftmost = false;</div><div class='add'>+		} else {</div><div class='add'>+			return parent;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rb_link_node(node, parent, link);</div><div class='add'>+	rb_insert_color_cached(node, tree, leftmost);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * rb_find_add() - find equivalent @node in @tree, or add @node</div><div class='ctx'>  * @node: node to look-for / insert</div><div class='ctx'>  * @tree: tree to search / modify</div><div class='hunk'>@@ -245,6 +310,42 @@ rb_find_add(struct rb_node *node, struct rb_root *tree,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * rb_find_add_rcu() - find equivalent @node in @tree, or add @node</div><div class='add'>+ * @node: node to look-for / insert</div><div class='add'>+ * @tree: tree to search / modify</div><div class='add'>+ * @cmp: operator defining the node order</div><div class='add'>+ *</div><div class='add'>+ * Adds a Store-Release for link_node.</div><div class='add'>+ *</div><div class='add'>+ * Returns the rb_node matching @node, or NULL when no match is found and @node</div><div class='add'>+ * is inserted.</div><div class='add'>+ */</div><div class='add'>+static __always_inline struct rb_node *</div><div class='add'>+rb_find_add_rcu(struct rb_node *node, struct rb_root *tree,</div><div class='add'>+		int (*cmp)(struct rb_node *, const struct rb_node *))</div><div class='add'>+{</div><div class='add'>+	struct rb_node **link = &amp;tree-&gt;rb_node;</div><div class='add'>+	struct rb_node *parent = NULL;</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	while (*link) {</div><div class='add'>+		parent = *link;</div><div class='add'>+		c = cmp(node, parent);</div><div class='add'>+</div><div class='add'>+		if (c &lt; 0)</div><div class='add'>+			link = &amp;parent-&gt;rb_left;</div><div class='add'>+		else if (c &gt; 0)</div><div class='add'>+			link = &amp;parent-&gt;rb_right;</div><div class='add'>+		else</div><div class='add'>+			return parent;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rb_link_node_rcu(node, parent, link);</div><div class='add'>+	rb_insert_color(node, tree);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * rb_find() - find @key in tree @tree</div><div class='ctx'>  * @key: key to match</div><div class='ctx'>  * @tree: tree to search</div><div class='hunk'>@@ -273,6 +374,37 @@ rb_find(const void *key, const struct rb_root *tree,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * rb_find_rcu() - find @key in tree @tree</div><div class='add'>+ * @key: key to match</div><div class='add'>+ * @tree: tree to search</div><div class='add'>+ * @cmp: operator defining the node order</div><div class='add'>+ *</div><div class='add'>+ * Notably, tree descent vs concurrent tree rotations is unsound and can result</div><div class='add'>+ * in false-negatives.</div><div class='add'>+ *</div><div class='add'>+ * Returns the rb_node matching @key or NULL.</div><div class='add'>+ */</div><div class='add'>+static __always_inline struct rb_node *</div><div class='add'>+rb_find_rcu(const void *key, const struct rb_root *tree,</div><div class='add'>+	    int (*cmp)(const void *key, const struct rb_node *))</div><div class='add'>+{</div><div class='add'>+	struct rb_node *node = tree-&gt;rb_node;</div><div class='add'>+</div><div class='add'>+	while (node) {</div><div class='add'>+		int c = cmp(key, node);</div><div class='add'>+</div><div class='add'>+		if (c &lt; 0)</div><div class='add'>+			node = rcu_dereference_raw(node-&gt;rb_left);</div><div class='add'>+		else if (c &gt; 0)</div><div class='add'>+			node = rcu_dereference_raw(node-&gt;rb_right);</div><div class='add'>+		else</div><div class='add'>+			return node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * rb_find_first() - find the first @key in @tree</div><div class='ctx'>  * @key: key to match</div><div class='ctx'>  * @tree: tree to search</div><div class='head'>diff --git a/include/linux/rbtree_latch.h b/include/linux/rbtree_latch.h<br/>index 6a0999c26c7c..2f630eb8307e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rbtree_latch.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rbtree_latch.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rbtree_latch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rbtree_latch.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * If we need to allow unconditional lookups (say as required for NMI context</div><div class='ctx'>  * usage) we need a more complex setup; this data structure provides this by</div><div class='del'>- * employing the latch technique -- see @raw_write_seqcount_latch -- to</div><div class='add'>+ * employing the latch technique -- see @write_seqcount_latch_begin -- to</div><div class='ctx'>  * implement a latched RB-tree which does allow for unconditional lookups by</div><div class='ctx'>  * virtue of always having (at least) one stable copy of the tree.</div><div class='ctx'>  *</div><div class='hunk'>@@ -132,7 +132,7 @@ __lt_find(void *key, struct latch_tree_root *ltr, int idx,</div><div class='ctx'>  * @ops: operators defining the node order</div><div class='ctx'>  *</div><div class='ctx'>  * It inserts @node into @root in an ordered fashion such that we can always</div><div class='del'>- * observe one complete tree. See the comment for raw_write_seqcount_latch().</div><div class='add'>+ * observe one complete tree. See the comment for write_seqcount_latch_begin().</div><div class='ctx'>  *</div><div class='ctx'>  * The inserts use rcu_assign_pointer() to publish the element such that the</div><div class='ctx'>  * tree structure is stored before we can observe the new @node.</div><div class='hunk'>@@ -145,10 +145,11 @@ latch_tree_insert(struct latch_tree_node *node,</div><div class='ctx'> 		  struct latch_tree_root *root,</div><div class='ctx'> 		  const struct latch_tree_ops *ops)</div><div class='ctx'> {</div><div class='del'>-	raw_write_seqcount_latch(&amp;root-&gt;seq);</div><div class='add'>+	write_seqcount_latch_begin(&amp;root-&gt;seq);</div><div class='ctx'> 	__lt_insert(node, root, 0, ops-&gt;less);</div><div class='del'>-	raw_write_seqcount_latch(&amp;root-&gt;seq);</div><div class='add'>+	write_seqcount_latch(&amp;root-&gt;seq);</div><div class='ctx'> 	__lt_insert(node, root, 1, ops-&gt;less);</div><div class='add'>+	write_seqcount_latch_end(&amp;root-&gt;seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -159,7 +160,7 @@ latch_tree_insert(struct latch_tree_node *node,</div><div class='ctx'>  *</div><div class='ctx'>  * Removes @node from the trees @root in an ordered fashion such that we can</div><div class='ctx'>  * always observe one complete tree. See the comment for</div><div class='del'>- * raw_write_seqcount_latch().</div><div class='add'>+ * write_seqcount_latch_begin().</div><div class='ctx'>  *</div><div class='ctx'>  * It is assumed that @node will observe one RCU quiescent state before being</div><div class='ctx'>  * reused of freed.</div><div class='hunk'>@@ -172,10 +173,11 @@ latch_tree_erase(struct latch_tree_node *node,</div><div class='ctx'> 		 struct latch_tree_root *root,</div><div class='ctx'> 		 const struct latch_tree_ops *ops)</div><div class='ctx'> {</div><div class='del'>-	raw_write_seqcount_latch(&amp;root-&gt;seq);</div><div class='add'>+	write_seqcount_latch_begin(&amp;root-&gt;seq);</div><div class='ctx'> 	__lt_erase(node, root, 0);</div><div class='del'>-	raw_write_seqcount_latch(&amp;root-&gt;seq);</div><div class='add'>+	write_seqcount_latch(&amp;root-&gt;seq);</div><div class='ctx'> 	__lt_erase(node, root, 1);</div><div class='add'>+	write_seqcount_latch_end(&amp;root-&gt;seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -204,9 +206,9 @@ latch_tree_find(void *key, struct latch_tree_root *root,</div><div class='ctx'> 	unsigned int seq;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		seq = raw_read_seqcount_latch(&amp;root-&gt;seq);</div><div class='add'>+		seq = read_seqcount_latch(&amp;root-&gt;seq);</div><div class='ctx'> 		node = __lt_find(key, root, seq &amp; 1, ops-&gt;comp);</div><div class='del'>-	} while (raw_read_seqcount_latch_retry(&amp;root-&gt;seq, seq));</div><div class='add'>+	} while (read_seqcount_latch_retry(&amp;root-&gt;seq, seq));</div><div class='ctx'> </div><div class='ctx'> 	return node;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/rcu_segcblist.h b/include/linux/rcu_segcblist.h<br/>index 659d13a7ddaa..2fdc2208f1ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rcu_segcblist.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcu_segcblist.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rcu_segcblist.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rcu_segcblist.h</a></div><div class='hunk'>@@ -80,36 +80,35 @@ struct rcu_cblist {</div><div class='ctx'>  *  |       SEGCBLIST_RCU_CORE | SEGCBLIST_LOCKING | SEGCBLIST_OFFLOADED       |</div><div class='ctx'>  *  |                                                                          |</div><div class='ctx'>  *  | Callbacks processed by rcu_core() from softirqs or local                 |</div><div class='del'>- *  | rcuc kthread, while holding nocb_lock. Waking up CB and GP kthreads,     |</div><div class='del'>- *  | allowing nocb_timer to be armed.                                         |</div><div class='add'>+ *  | rcuc kthread, while holding nocb_lock. Waking up CB and GP kthreads.     |</div><div class='ctx'>  *  ----------------------------------------------------------------------------</div><div class='ctx'>  *                                         |</div><div class='ctx'>  *                                         v</div><div class='del'>- *                        -----------------------------------</div><div class='del'>- *                        |                                 |</div><div class='del'>- *                        v                                 v</div><div class='del'>- *  ---------------------------------------  ----------------------------------|</div><div class='del'>- *  |        SEGCBLIST_RCU_CORE   |       |  |     SEGCBLIST_RCU_CORE   |      |</div><div class='del'>- *  |        SEGCBLIST_LOCKING    |       |  |     SEGCBLIST_LOCKING    |      |</div><div class='del'>- *  |        SEGCBLIST_OFFLOADED  |       |  |     SEGCBLIST_OFFLOADED  |      |</div><div class='del'>- *  |        SEGCBLIST_KTHREAD_CB         |  |     SEGCBLIST_KTHREAD_GP        |</div><div class='del'>- *  |                                     |  |                                 |</div><div class='del'>- *  |                                     |  |                                 |</div><div class='del'>- *  | CB kthread woke up and              |  | GP kthread woke up and          |</div><div class='del'>- *  | acknowledged SEGCBLIST_OFFLOADED.   |  | acknowledged SEGCBLIST_OFFLOADED|</div><div class='del'>- *  | Processes callbacks concurrently    |  |                                 |</div><div class='del'>- *  | with rcu_core(), holding            |  |                                 |</div><div class='del'>- *  | nocb_lock.                          |  |                                 |</div><div class='del'>- *  ---------------------------------------  -----------------------------------</div><div class='del'>- *                        |                                 |</div><div class='del'>- *                        -----------------------------------</div><div class='add'>+ *  ----------------------------------------------------------------------------</div><div class='add'>+ *  |        SEGCBLIST_RCU_CORE | SEGCBLIST_LOCKING | SEGCBLIST_OFFLOADED      |</div><div class='add'>+ *  |                              + unparked CB kthread                       |</div><div class='add'>+ *  |                                                                          |</div><div class='add'>+ *  | CB kthread got unparked and processes callbacks concurrently with        |</div><div class='add'>+ *  | rcu_core(), holding nocb_lock.                                           |</div><div class='add'>+ *  ---------------------------------------------------------------------------</div><div class='add'>+ *                                         |</div><div class='add'>+ *                                         v</div><div class='add'>+ *  ---------------------------------------------------------------------------|</div><div class='add'>+ *  |                           SEGCBLIST_RCU_CORE |                           |</div><div class='add'>+ *  |                           SEGCBLIST_LOCKING |                            |</div><div class='add'>+ *  |                           SEGCBLIST_OFFLOADED |                          |</div><div class='add'>+ *  |                           SEGCBLIST_KTHREAD_GP                           |</div><div class='add'>+ *  |                           + unparked CB kthread                          |</div><div class='add'>+ *  |                                                                          |</div><div class='add'>+ *  | GP kthread woke up and acknowledged nocb_lock.                           |</div><div class='add'>+ *  ---------------------------------------- -----------------------------------</div><div class='ctx'>  *                                         |</div><div class='ctx'>  *                                         v</div><div class='ctx'>  *  |--------------------------------------------------------------------------|</div><div class='del'>- *  |                           SEGCBLIST_LOCKING    |                         |</div><div class='del'>- *  |                           SEGCBLIST_OFFLOADED  |                         |</div><div class='add'>+ *  |                           SEGCBLIST_LOCKING |                            |</div><div class='add'>+ *  |                           SEGCBLIST_OFFLOADED |                          |</div><div class='ctx'>  *  |                           SEGCBLIST_KTHREAD_GP |                         |</div><div class='del'>- *  |                           SEGCBLIST_KTHREAD_CB                           |</div><div class='add'>+ *  |                           + unparked CB kthread                          |</div><div class='ctx'>  *  |                                                                          |</div><div class='ctx'>  *  |   Kthreads handle callbacks holding nocb_lock, local rcu_core() stops    |</div><div class='ctx'>  *  |   handling callbacks. Enable bypass queueing.                            |</div><div class='hunk'>@@ -125,8 +124,8 @@ struct rcu_cblist {</div><div class='ctx'>  *  |--------------------------------------------------------------------------|</div><div class='ctx'>  *  |                           SEGCBLIST_LOCKING    |                         |</div><div class='ctx'>  *  |                           SEGCBLIST_OFFLOADED  |                         |</div><div class='del'>- *  |                           SEGCBLIST_KTHREAD_CB |                         |</div><div class='ctx'>  *  |                           SEGCBLIST_KTHREAD_GP                           |</div><div class='add'>+ *  |                           + unparked CB kthread                          |</div><div class='ctx'>  *  |                                                                          |</div><div class='ctx'>  *  |   CB/GP kthreads handle callbacks holding nocb_lock, local rcu_core()    |</div><div class='ctx'>  *  |   ignores callbacks. Bypass enqueue is enabled.                          |</div><div class='hunk'>@@ -137,11 +136,11 @@ struct rcu_cblist {</div><div class='ctx'>  *  |                           SEGCBLIST_RCU_CORE   |                         |</div><div class='ctx'>  *  |                           SEGCBLIST_LOCKING    |                         |</div><div class='ctx'>  *  |                           SEGCBLIST_OFFLOADED  |                         |</div><div class='del'>- *  |                           SEGCBLIST_KTHREAD_CB |                         |</div><div class='ctx'>  *  |                           SEGCBLIST_KTHREAD_GP                           |</div><div class='add'>+ *  |                           + unparked CB kthread                          |</div><div class='ctx'>  *  |                                                                          |</div><div class='ctx'>  *  |   CB/GP kthreads handle callbacks holding nocb_lock, local rcu_core()    |</div><div class='del'>- *  |   handles callbacks concurrently. Bypass enqueue is enabled.             |</div><div class='add'>+ *  |   handles callbacks concurrently. Bypass enqueue is disabled.            |</div><div class='ctx'>  *  |   Invoke RCU core so we make sure not to preempt it in the middle with   |</div><div class='ctx'>  *  |   leaving some urgent work unattended within a jiffy.                    |</div><div class='ctx'>  *  ----------------------------------------------------------------------------</div><div class='hunk'>@@ -150,42 +149,31 @@ struct rcu_cblist {</div><div class='ctx'>  *  |--------------------------------------------------------------------------|</div><div class='ctx'>  *  |                           SEGCBLIST_RCU_CORE   |                         |</div><div class='ctx'>  *  |                           SEGCBLIST_LOCKING    |                         |</div><div class='del'>- *  |                           SEGCBLIST_KTHREAD_CB |                         |</div><div class='ctx'>  *  |                           SEGCBLIST_KTHREAD_GP                           |</div><div class='add'>+ *  |                           + unparked CB kthread                          |</div><div class='ctx'>  *  |                                                                          |</div><div class='ctx'>  *  |   CB/GP kthreads and local rcu_core() handle callbacks concurrently      |</div><div class='del'>- *  |   holding nocb_lock. Wake up CB and GP kthreads if necessary. Disable    |</div><div class='del'>- *  |   bypass enqueue.                                                        |</div><div class='add'>+ *  |   holding nocb_lock. Wake up GP kthread if necessary.                    |</div><div class='ctx'>  *  ----------------------------------------------------------------------------</div><div class='ctx'>  *                                      |</div><div class='ctx'>  *                                      v</div><div class='del'>- *                     -----------------------------------</div><div class='del'>- *                     |                                 |</div><div class='del'>- *                     v                                 v</div><div class='del'>- *  ---------------------------------------------------------------------------|</div><div class='del'>- *  |                                     |                                    |</div><div class='del'>- *  |        SEGCBLIST_RCU_CORE |         |       SEGCBLIST_RCU_CORE |         |</div><div class='del'>- *  |        SEGCBLIST_LOCKING  |         |       SEGCBLIST_LOCKING  |         |</div><div class='del'>- *  |        SEGCBLIST_KTHREAD_CB         |       SEGCBLIST_KTHREAD_GP         |</div><div class='del'>- *  |                                     |                                    |</div><div class='del'>- *  | GP kthread woke up and              |   CB kthread woke up and           |</div><div class='del'>- *  | acknowledged the fact that          |   acknowledged the fact that       |</div><div class='del'>- *  | SEGCBLIST_OFFLOADED got cleared.    |   SEGCBLIST_OFFLOADED got cleared. |</div><div class='del'>- *  |                                     |   The CB kthread goes to sleep     |</div><div class='del'>- *  | The callbacks from the target CPU   |   until it ever gets re-offloaded. |</div><div class='del'>- *  | will be ignored from the GP kthread |                                    |</div><div class='del'>- *  | loop.                               |                                    |</div><div class='add'>+ *  |--------------------------------------------------------------------------|</div><div class='add'>+ *  |                           SEGCBLIST_RCU_CORE   |                         |</div><div class='add'>+ *  |                           SEGCBLIST_LOCKING    |                         |</div><div class='add'>+ *  |                           + unparked CB kthread                          |</div><div class='add'>+ *  |                                                                          |</div><div class='add'>+ *  |   GP kthread woke up and acknowledged the fact that SEGCBLIST_OFFLOADED  |</div><div class='add'>+ *  |   got cleared. The callbacks from the target CPU will be ignored from the|</div><div class='add'>+ *  |   GP kthread loop.                                                       |</div><div class='ctx'>  *  ----------------------------------------------------------------------------</div><div class='del'>- *                      |                                 |</div><div class='del'>- *                      -----------------------------------</div><div class='ctx'>  *                                      |</div><div class='ctx'>  *                                      v</div><div class='ctx'>  *  ----------------------------------------------------------------------------</div><div class='ctx'>  *  |                SEGCBLIST_RCU_CORE | SEGCBLIST_LOCKING                    |</div><div class='add'>+ *  |                          + parked CB kthread                             |</div><div class='ctx'>  *  |                                                                          |</div><div class='del'>- *  | Callbacks processed by rcu_core() from softirqs or local                 |</div><div class='del'>- *  | rcuc kthread, while holding nocb_lock. Forbid nocb_timer to be armed.    |</div><div class='del'>- *  | Flush pending nocb_timer. Flush nocb bypass callbacks.                   |</div><div class='add'>+ *  | CB kthread is parked. Callbacks processed by rcu_core() from softirqs or |</div><div class='add'>+ *  | local rcuc kthread, while holding nocb_lock.                             |</div><div class='ctx'>  *  ----------------------------------------------------------------------------</div><div class='ctx'>  *                                      |</div><div class='ctx'>  *                                      v</div><div class='hunk'>@@ -197,11 +185,7 @@ struct rcu_cblist {</div><div class='ctx'>  *  ----------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> #define SEGCBLIST_ENABLED	BIT(0)</div><div class='del'>-#define SEGCBLIST_RCU_CORE	BIT(1)</div><div class='del'>-#define SEGCBLIST_LOCKING	BIT(2)</div><div class='del'>-#define SEGCBLIST_KTHREAD_CB	BIT(3)</div><div class='del'>-#define SEGCBLIST_KTHREAD_GP	BIT(4)</div><div class='del'>-#define SEGCBLIST_OFFLOADED	BIT(5)</div><div class='add'>+#define SEGCBLIST_OFFLOADED	BIT(1)</div><div class='ctx'> </div><div class='ctx'> struct rcu_segcblist {</div><div class='ctx'> 	struct rcu_head *head;</div><div class='head'>diff --git a/include/linux/rculist.h b/include/linux/rculist.h<br/>index 3dc1e58865f7..2abba7552605 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rculist.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rculist.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rculist.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rculist.h</a></div><div class='hunk'>@@ -30,6 +30,27 @@ static inline void INIT_LIST_HEAD_RCU(struct list_head *list)</div><div class='ctx'>  * way, we must not access it directly</div><div class='ctx'>  */</div><div class='ctx'> #define list_next_rcu(list)	(*((struct list_head __rcu **)(&amp;(list)-&gt;next)))</div><div class='add'>+/*</div><div class='add'>+ * Return the -&gt;prev pointer of a list_head in an rcu safe way. Don't</div><div class='add'>+ * access it directly.</div><div class='add'>+ *</div><div class='add'>+ * Any list traversed with list_bidir_prev_rcu() must never use</div><div class='add'>+ * list_del_rcu().  Doing so will poison the -&gt;prev pointer that</div><div class='add'>+ * list_bidir_prev_rcu() relies on, which will result in segfaults.</div><div class='add'>+ * To prevent these segfaults, use list_bidir_del_rcu() instead</div><div class='add'>+ * of list_del_rcu().</div><div class='add'>+ */</div><div class='add'>+#define list_bidir_prev_rcu(list) (*((struct list_head __rcu **)(&amp;(list)-&gt;prev)))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * list_for_each_rcu - Iterate over a list in an RCU-safe fashion</div><div class='add'>+ * @pos:	the &amp;struct list_head to use as a loop cursor.</div><div class='add'>+ * @head:	the head for your list.</div><div class='add'>+ */</div><div class='add'>+#define list_for_each_rcu(pos, head)		  \</div><div class='add'>+	for (pos = rcu_dereference((head)-&gt;next); \</div><div class='add'>+	     !list_is_head(pos, (head)); \</div><div class='add'>+	     pos = rcu_dereference(pos-&gt;next))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * list_tail_rcu - returns the prev pointer of the head of the list</div><div class='hunk'>@@ -159,6 +180,39 @@ static inline void list_del_rcu(struct list_head *entry)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * list_bidir_del_rcu - deletes entry from list without re-initialization</div><div class='add'>+ * @entry: the element to delete from the list.</div><div class='add'>+ *</div><div class='add'>+ * In contrast to list_del_rcu() doesn't poison the prev pointer thus</div><div class='add'>+ * allowing backwards traversal via list_bidir_prev_rcu().</div><div class='add'>+ *</div><div class='add'>+ * Note: list_empty() on entry does not return true after this because</div><div class='add'>+ * the entry is in a special undefined state that permits RCU-based</div><div class='add'>+ * lockfree reverse traversal. In particular this means that we can not</div><div class='add'>+ * poison the forward and backwards pointers that may still be used for</div><div class='add'>+ * walking the list.</div><div class='add'>+ *</div><div class='add'>+ * The caller must take whatever precautions are necessary (such as</div><div class='add'>+ * holding appropriate locks) to avoid racing with another list-mutation</div><div class='add'>+ * primitive, such as list_bidir_del_rcu() or list_add_rcu(), running on</div><div class='add'>+ * this same list. However, it is perfectly legal to run concurrently</div><div class='add'>+ * with the _rcu list-traversal primitives, such as</div><div class='add'>+ * list_for_each_entry_rcu().</div><div class='add'>+ *</div><div class='add'>+ * Note that list_del_rcu() and list_bidir_del_rcu() must not be used on</div><div class='add'>+ * the same list.</div><div class='add'>+ *</div><div class='add'>+ * Note that the caller is not permitted to immediately free</div><div class='add'>+ * the newly deleted entry.  Instead, either synchronize_rcu()</div><div class='add'>+ * or call_rcu() must be used to defer freeing until an RCU</div><div class='add'>+ * grace period has elapsed.</div><div class='add'>+ */</div><div class='add'>+static inline void list_bidir_del_rcu(struct list_head *entry)</div><div class='add'>+{</div><div class='add'>+	__list_del_entry(entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * hlist_del_init_rcu - deletes entry from hash list with re-initialization</div><div class='ctx'>  * @n: the element to delete from the hash list.</div><div class='ctx'>  *</div><div class='hunk'>@@ -191,7 +245,10 @@ static inline void hlist_del_init_rcu(struct hlist_node *n)</div><div class='ctx'>  * @old : the element to be replaced</div><div class='ctx'>  * @new : the new element to insert</div><div class='ctx'>  *</div><div class='del'>- * The @old entry will be replaced with the @new entry atomically.</div><div class='add'>+ * The @old entry will be replaced with the @new entry atomically from</div><div class='add'>+ * the perspective of concurrent readers.  It is the caller's responsibility</div><div class='add'>+ * to synchronize with concurrent updaters, if any.</div><div class='add'>+ *</div><div class='ctx'>  * Note: @old should not be empty.</div><div class='ctx'>  */</div><div class='ctx'> static inline void list_replace_rcu(struct list_head *old,</div><div class='hunk'>@@ -519,7 +576,9 @@ static inline void hlist_del_rcu(struct hlist_node *n)</div><div class='ctx'>  * @old : the element to be replaced</div><div class='ctx'>  * @new : the new element to insert</div><div class='ctx'>  *</div><div class='del'>- * The @old entry will be replaced with the @new entry atomically.</div><div class='add'>+ * The @old entry will be replaced with the @new entry atomically from</div><div class='add'>+ * the perspective of concurrent readers.  It is the caller's responsibility</div><div class='add'>+ * to synchronize with concurrent updaters, if any.</div><div class='ctx'>  */</div><div class='ctx'> static inline void hlist_replace_rcu(struct hlist_node *old,</div><div class='ctx'> 					struct hlist_node *new)</div><div class='head'>diff --git a/include/linux/rculist_nulls.h b/include/linux/rculist_nulls.h<br/>index 89186c499dd4..a97c3bcb1656 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rculist_nulls.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rculist_nulls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rculist_nulls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rculist_nulls.h</a></div><div class='hunk'>@@ -53,6 +53,13 @@ static inline void hlist_nulls_del_init_rcu(struct hlist_nulls_node *n)</div><div class='ctx'> 	(*((struct hlist_nulls_node __rcu __force **)&amp;(node)-&gt;next))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * hlist_nulls_pprev_rcu - returns the dereferenced pprev of @node.</div><div class='add'>+ * @node: element of the list.</div><div class='add'>+ */</div><div class='add'>+#define hlist_nulls_pprev_rcu(node) \</div><div class='add'>+	(*((struct hlist_nulls_node __rcu __force **)(node)-&gt;pprev))</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * hlist_nulls_del_rcu - deletes entry from hash list without re-initialization</div><div class='ctx'>  * @n: the element to delete from the hash list.</div><div class='ctx'>  *</div><div class='hunk'>@@ -138,7 +145,7 @@ static inline void hlist_nulls_add_tail_rcu(struct hlist_nulls_node *n,</div><div class='ctx'> </div><div class='ctx'> 	if (last) {</div><div class='ctx'> 		WRITE_ONCE(n-&gt;next, last-&gt;next);</div><div class='del'>-		n-&gt;pprev = &amp;last-&gt;next;</div><div class='add'>+		WRITE_ONCE(n-&gt;pprev, &amp;last-&gt;next);</div><div class='ctx'> 		rcu_assign_pointer(hlist_nulls_next_rcu(last), n);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hlist_nulls_add_head_rcu(n, h);</div><div class='hunk'>@@ -148,8 +155,60 @@ static inline void hlist_nulls_add_tail_rcu(struct hlist_nulls_node *n,</div><div class='ctx'> /* after that hlist_nulls_del will work */</div><div class='ctx'> static inline void hlist_nulls_add_fake(struct hlist_nulls_node *n)</div><div class='ctx'> {</div><div class='del'>-	n-&gt;pprev = &amp;n-&gt;next;</div><div class='del'>-	n-&gt;next = (struct hlist_nulls_node *)NULLS_MARKER(NULL);</div><div class='add'>+	WRITE_ONCE(n-&gt;pprev, &amp;n-&gt;next);</div><div class='add'>+	WRITE_ONCE(n-&gt;next, (struct hlist_nulls_node *)NULLS_MARKER(NULL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hlist_nulls_replace_rcu - replace an old entry by a new one</div><div class='add'>+ * @old: the element to be replaced</div><div class='add'>+ * @new: the new element to insert</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Replace the old entry with the new one in a RCU-protected hlist_nulls, while</div><div class='add'>+ * permitting racing traversals.</div><div class='add'>+ *</div><div class='add'>+ * The caller must take whatever precautions are necessary (such as holding</div><div class='add'>+ * appropriate locks) to avoid racing with another list-mutation primitive, such</div><div class='add'>+ * as hlist_nulls_add_head_rcu() or hlist_nulls_del_rcu(), running on this same</div><div class='add'>+ * list.  However, it is perfectly legal to run concurrently with the _rcu</div><div class='add'>+ * list-traversal primitives, such as hlist_nulls_for_each_entry_rcu().</div><div class='add'>+ */</div><div class='add'>+static inline void hlist_nulls_replace_rcu(struct hlist_nulls_node *old,</div><div class='add'>+					   struct hlist_nulls_node *new)</div><div class='add'>+{</div><div class='add'>+	struct hlist_nulls_node *next = old-&gt;next;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(new-&gt;next, next);</div><div class='add'>+	WRITE_ONCE(new-&gt;pprev, old-&gt;pprev);</div><div class='add'>+	rcu_assign_pointer(hlist_nulls_pprev_rcu(new), new);</div><div class='add'>+	if (!is_a_nulls(next))</div><div class='add'>+		WRITE_ONCE(next-&gt;pprev, &amp;new-&gt;next);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hlist_nulls_replace_init_rcu - replace an old entry by a new one and</div><div class='add'>+ * initialize the old</div><div class='add'>+ * @old: the element to be replaced</div><div class='add'>+ * @new: the new element to insert</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * Replace the old entry with the new one in a RCU-protected hlist_nulls, while</div><div class='add'>+ * permitting racing traversals, and reinitialize the old entry.</div><div class='add'>+ *</div><div class='add'>+ * Note: @old must be hashed.</div><div class='add'>+ *</div><div class='add'>+ * The caller must take whatever precautions are necessary (such as holding</div><div class='add'>+ * appropriate locks) to avoid racing with another list-mutation primitive, such</div><div class='add'>+ * as hlist_nulls_add_head_rcu() or hlist_nulls_del_rcu(), running on this same</div><div class='add'>+ * list. However, it is perfectly legal to run concurrently with the _rcu</div><div class='add'>+ * list-traversal primitives, such as hlist_nulls_for_each_entry_rcu().</div><div class='add'>+ */</div><div class='add'>+static inline void hlist_nulls_replace_init_rcu(struct hlist_nulls_node *old,</div><div class='add'>+						struct hlist_nulls_node *new)</div><div class='add'>+{</div><div class='add'>+	hlist_nulls_replace_rcu(old, new);</div><div class='add'>+	WRITE_ONCE(old-&gt;pprev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h<br/>index 16f519914415..c5b30054cd01 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rcupdate.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcupdate.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rcupdate.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rcupdate.h</a></div><div class='hunk'>@@ -24,21 +24,22 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/irqflags.h&gt;</div><div class='del'>-#include &lt;linux/preempt.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/bottom_half.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/context_tracking_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ULONG_CMP_GE(a, b)	(ULONG_MAX / 2 &gt;= (a) - (b))</div><div class='ctx'> #define ULONG_CMP_LT(a, b)	(ULONG_MAX / 2 &lt; (a) - (b))</div><div class='ctx'> </div><div class='add'>+#define RCU_SEQ_CTR_SHIFT    2</div><div class='add'>+#define RCU_SEQ_STATE_MASK   ((1 &lt;&lt; RCU_SEQ_CTR_SHIFT) - 1)</div><div class='add'>+</div><div class='ctx'> /* Exported common interfaces */</div><div class='ctx'> void call_rcu(struct rcu_head *head, rcu_callback_t func);</div><div class='ctx'> void rcu_barrier_tasks(void);</div><div class='del'>-void rcu_barrier_tasks_rude(void);</div><div class='ctx'> void synchronize_rcu(void);</div><div class='ctx'> </div><div class='ctx'> struct rcu_gp_oldstate;</div><div class='hunk'>@@ -94,9 +95,9 @@ static inline void __rcu_read_lock(void)</div><div class='ctx'> </div><div class='ctx'> static inline void __rcu_read_unlock(void)</div><div class='ctx'> {</div><div class='del'>-	preempt_enable();</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_RCU_STRICT_GRACE_PERIOD))</div><div class='ctx'> 		rcu_read_unlock_strict();</div><div class='add'>+	preempt_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int rcu_preempt_depth(void)</div><div class='hunk'>@@ -120,12 +121,6 @@ void rcu_init(void);</div><div class='ctx'> extern int rcu_scheduler_active;</div><div class='ctx'> void rcu_sched_clock_irq(int user);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TASKS_RCU_GENERIC</div><div class='del'>-void rcu_init_tasks_generic(void);</div><div class='del'>-#else</div><div class='del'>-static inline void rcu_init_tasks_generic(void) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_RCU_STALL_COMMON</div><div class='ctx'> void rcu_sysrq_start(void);</div><div class='ctx'> void rcu_sysrq_end(void);</div><div class='hunk'>@@ -134,10 +129,10 @@ static inline void rcu_sysrq_start(void) { }</div><div class='ctx'> static inline void rcu_sysrq_end(void) { }</div><div class='ctx'> #endif /* #else #ifdef CONFIG_RCU_STALL_COMMON */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_NO_HZ_FULL) &amp;&amp; (!defined(CONFIG_GENERIC_ENTRY) || !defined(CONFIG_KVM_XFER_TO_GUEST_WORK))</div><div class='add'>+#if defined(CONFIG_NO_HZ_FULL) &amp;&amp; (!defined(CONFIG_GENERIC_ENTRY) || !defined(CONFIG_VIRT_XFER_TO_GUEST_WORK))</div><div class='ctx'> void rcu_irq_work_resched(void);</div><div class='ctx'> #else</div><div class='del'>-static inline void rcu_irq_work_resched(void) { }</div><div class='add'>+static __always_inline void rcu_irq_work_resched(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RCU_NOCB_CPU</div><div class='hunk'>@@ -145,11 +140,18 @@ void rcu_init_nohz(void);</div><div class='ctx'> int rcu_nocb_cpu_offload(int cpu);</div><div class='ctx'> int rcu_nocb_cpu_deoffload(int cpu);</div><div class='ctx'> void rcu_nocb_flush_deferred_wakeup(void);</div><div class='add'>+</div><div class='add'>+#define RCU_NOCB_LOCKDEP_WARN(c, s) RCU_LOCKDEP_WARN(c, s)</div><div class='add'>+</div><div class='ctx'> #else /* #ifdef CONFIG_RCU_NOCB_CPU */</div><div class='add'>+</div><div class='ctx'> static inline void rcu_init_nohz(void) { }</div><div class='ctx'> static inline int rcu_nocb_cpu_offload(int cpu) { return -EINVAL; }</div><div class='ctx'> static inline int rcu_nocb_cpu_deoffload(int cpu) { return 0; }</div><div class='ctx'> static inline void rcu_nocb_flush_deferred_wakeup(void) { }</div><div class='add'>+</div><div class='add'>+#define RCU_NOCB_LOCKDEP_WARN(c, s)</div><div class='add'>+</div><div class='ctx'> #endif /* #else #ifdef CONFIG_RCU_NOCB_CPU */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -166,6 +168,7 @@ static inline void rcu_nocb_flush_deferred_wakeup(void) { }</div><div class='ctx'> 	} while (0)</div><div class='ctx'> void call_rcu_tasks(struct rcu_head *head, rcu_callback_t func);</div><div class='ctx'> void synchronize_rcu_tasks(void);</div><div class='add'>+void rcu_tasks_torture_stats_print(char *tt, char *tf);</div><div class='ctx'> # else</div><div class='ctx'> # define rcu_tasks_classic_qs(t, preempt) do { } while (0)</div><div class='ctx'> # define call_rcu_tasks call_rcu</div><div class='hunk'>@@ -192,6 +195,7 @@ void rcu_tasks_trace_qs_blkd(struct task_struct *t);</div><div class='ctx'> 			rcu_tasks_trace_qs_blkd(t);				\</div><div class='ctx'> 		}								\</div><div class='ctx'> 	} while (0)</div><div class='add'>+void rcu_tasks_trace_torture_stats_print(char *tt, char *tf);</div><div class='ctx'> # else</div><div class='ctx'> # define rcu_tasks_trace_qs(t) do { } while (0)</div><div class='ctx'> # endif</div><div class='hunk'>@@ -203,13 +207,12 @@ do {									\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> # ifdef CONFIG_TASKS_RUDE_RCU</div><div class='del'>-void call_rcu_tasks_rude(struct rcu_head *head, rcu_callback_t func);</div><div class='ctx'> void synchronize_rcu_tasks_rude(void);</div><div class='add'>+void rcu_tasks_rude_torture_stats_print(char *tt, char *tf);</div><div class='ctx'> # endif</div><div class='ctx'> </div><div class='ctx'> #define rcu_note_voluntary_context_switch(t) rcu_tasks_qs(t, false)</div><div class='ctx'> void exit_tasks_rcu_start(void);</div><div class='del'>-void exit_tasks_rcu_stop(void);</div><div class='ctx'> void exit_tasks_rcu_finish(void);</div><div class='ctx'> #else /* #ifdef CONFIG_TASKS_RCU_GENERIC */</div><div class='ctx'> #define rcu_tasks_classic_qs(t, preempt) do { } while (0)</div><div class='hunk'>@@ -218,7 +221,6 @@ void exit_tasks_rcu_finish(void);</div><div class='ctx'> #define call_rcu_tasks call_rcu</div><div class='ctx'> #define synchronize_rcu_tasks synchronize_rcu</div><div class='ctx'> static inline void exit_tasks_rcu_start(void) { }</div><div class='del'>-static inline void exit_tasks_rcu_stop(void) { }</div><div class='ctx'> static inline void exit_tasks_rcu_finish(void) { }</div><div class='ctx'> #endif /* #else #ifdef CONFIG_TASKS_RCU_GENERIC */</div><div class='ctx'> </div><div class='hunk'>@@ -247,6 +249,37 @@ do { \</div><div class='ctx'> 	cond_resched(); \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * rcu_softirq_qs_periodic - Report RCU and RCU-Tasks quiescent states</div><div class='add'>+ * @old_ts: jiffies at start of processing.</div><div class='add'>+ *</div><div class='add'>+ * This helper is for long-running softirq handlers, such as NAPI threads in</div><div class='add'>+ * networking. The caller should initialize the variable passed in as @old_ts</div><div class='add'>+ * at the beginning of the softirq handler. When invoked frequently, this macro</div><div class='add'>+ * will invoke rcu_softirq_qs() every 100 milliseconds thereafter, which will</div><div class='add'>+ * provide both RCU and RCU-Tasks quiescent states. Note that this macro</div><div class='add'>+ * modifies its old_ts argument.</div><div class='add'>+ *</div><div class='add'>+ * Because regions of code that have disabled softirq act as RCU read-side</div><div class='add'>+ * critical sections, this macro should be invoked with softirq (and</div><div class='add'>+ * preemption) enabled.</div><div class='add'>+ *</div><div class='add'>+ * The macro is not needed when CONFIG_PREEMPT_RT is defined. RT kernels would</div><div class='add'>+ * have more chance to invoke schedule() calls and provide necessary quiescent</div><div class='add'>+ * states. As a contrast, calling cond_resched() only won't achieve the same</div><div class='add'>+ * effect because cond_resched() does not provide RCU-Tasks quiescent states.</div><div class='add'>+ */</div><div class='add'>+#define rcu_softirq_qs_periodic(old_ts) \</div><div class='add'>+do { \</div><div class='add'>+	if (!IS_ENABLED(CONFIG_PREEMPT_RT) &amp;&amp; \</div><div class='add'>+	    time_after(jiffies, (old_ts) + HZ / 10)) { \</div><div class='add'>+		preempt_disable(); \</div><div class='add'>+		rcu_softirq_qs(); \</div><div class='add'>+		preempt_enable(); \</div><div class='add'>+		(old_ts) = jiffies; \</div><div class='add'>+	} \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Infrastructure to implement the synchronize_() primitives in</div><div class='ctx'>  * TREE_RCU and rcu_barrier_() primitives in TINY_RCU.</div><div class='hunk'>@@ -362,7 +395,7 @@ static inline int debug_lockdep_rcu_enabled(void)</div><div class='ctx'>  */</div><div class='ctx'> #define RCU_LOCKDEP_WARN(c, s)						\</div><div class='ctx'> 	do {								\</div><div class='del'>-		static bool __section(".data.unlikely") __warned;	\</div><div class='add'>+		static bool __section(".data..unlikely") __warned;	\</div><div class='ctx'> 		if (debug_lockdep_rcu_enabled() &amp;&amp; (c) &amp;&amp;		\</div><div class='ctx'> 		    debug_lockdep_rcu_enabled() &amp;&amp; !__warned) {		\</div><div class='ctx'> 			__warned = true;				\</div><div class='hunk'>@@ -370,15 +403,15 @@ static inline int debug_lockdep_rcu_enabled(void)</div><div class='ctx'> 		}							\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PROVE_RCU) &amp;&amp; !defined(CONFIG_PREEMPT_RCU)</div><div class='add'>+#ifndef CONFIG_PREEMPT_RCU</div><div class='ctx'> static inline void rcu_preempt_sleep_check(void)</div><div class='ctx'> {</div><div class='ctx'> 	RCU_LOCKDEP_WARN(lock_is_held(&amp;rcu_lock_map),</div><div class='ctx'> 			 "Illegal context switch in RCU read-side critical section");</div><div class='ctx'> }</div><div class='del'>-#else /* #ifdef CONFIG_PROVE_RCU */</div><div class='add'>+#else // #ifndef CONFIG_PREEMPT_RCU</div><div class='ctx'> static inline void rcu_preempt_sleep_check(void) { }</div><div class='del'>-#endif /* #else #ifdef CONFIG_PROVE_RCU */</div><div class='add'>+#endif // #else // #ifndef CONFIG_PREEMPT_RCU</div><div class='ctx'> </div><div class='ctx'> #define rcu_sleep_check()						\</div><div class='ctx'> 	do {								\</div><div class='hunk'>@@ -390,11 +423,71 @@ static inline void rcu_preempt_sleep_check(void) { }</div><div class='ctx'> 				 "Illegal context switch in RCU-sched read-side critical section"); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+// See RCU_LOCKDEP_WARN() for an explanation of the double call to</div><div class='add'>+// debug_lockdep_rcu_enabled().</div><div class='add'>+static inline bool lockdep_assert_rcu_helper(bool c)</div><div class='add'>+{</div><div class='add'>+	return debug_lockdep_rcu_enabled() &amp;&amp;</div><div class='add'>+	       (c || !rcu_is_watching() || !rcu_lockdep_current_cpu_online()) &amp;&amp;</div><div class='add'>+	       debug_lockdep_rcu_enabled();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lockdep_assert_in_rcu_read_lock - WARN if not protected by rcu_read_lock()</div><div class='add'>+ *</div><div class='add'>+ * Splats if lockdep is enabled and there is no rcu_read_lock() in effect.</div><div class='add'>+ */</div><div class='add'>+#define lockdep_assert_in_rcu_read_lock() \</div><div class='add'>+	WARN_ON_ONCE(lockdep_assert_rcu_helper(!lock_is_held(&amp;rcu_lock_map)))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lockdep_assert_in_rcu_read_lock_bh - WARN if not protected by rcu_read_lock_bh()</div><div class='add'>+ *</div><div class='add'>+ * Splats if lockdep is enabled and there is no rcu_read_lock_bh() in effect.</div><div class='add'>+ * Note that local_bh_disable() and friends do not suffice here, instead an</div><div class='add'>+ * actual rcu_read_lock_bh() is required.</div><div class='add'>+ */</div><div class='add'>+#define lockdep_assert_in_rcu_read_lock_bh() \</div><div class='add'>+	WARN_ON_ONCE(lockdep_assert_rcu_helper(!lock_is_held(&amp;rcu_bh_lock_map)))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lockdep_assert_in_rcu_read_lock_sched - WARN if not protected by rcu_read_lock_sched()</div><div class='add'>+ *</div><div class='add'>+ * Splats if lockdep is enabled and there is no rcu_read_lock_sched()</div><div class='add'>+ * in effect.  Note that preempt_disable() and friends do not suffice here,</div><div class='add'>+ * instead an actual rcu_read_lock_sched() is required.</div><div class='add'>+ */</div><div class='add'>+#define lockdep_assert_in_rcu_read_lock_sched() \</div><div class='add'>+	WARN_ON_ONCE(lockdep_assert_rcu_helper(!lock_is_held(&amp;rcu_sched_lock_map)))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lockdep_assert_in_rcu_reader - WARN if not within some type of RCU reader</div><div class='add'>+ *</div><div class='add'>+ * Splats if lockdep is enabled and there is no RCU reader of any</div><div class='add'>+ * type in effect.  Note that regions of code protected by things like</div><div class='add'>+ * preempt_disable, local_bh_disable(), and local_irq_disable() all qualify</div><div class='add'>+ * as RCU readers.</div><div class='add'>+ *</div><div class='add'>+ * Note that this will never trigger in PREEMPT_NONE or PREEMPT_VOLUNTARY</div><div class='add'>+ * kernels that are not also built with PREEMPT_COUNT.  But if you have</div><div class='add'>+ * lockdep enabled, you might as well also enable PREEMPT_COUNT.</div><div class='add'>+ */</div><div class='add'>+#define lockdep_assert_in_rcu_reader()								\</div><div class='add'>+	WARN_ON_ONCE(lockdep_assert_rcu_helper(!lock_is_held(&amp;rcu_lock_map) &amp;&amp;			\</div><div class='add'>+					       !lock_is_held(&amp;rcu_bh_lock_map) &amp;&amp;		\</div><div class='add'>+					       !lock_is_held(&amp;rcu_sched_lock_map) &amp;&amp;		\</div><div class='add'>+					       preemptible()))</div><div class='add'>+</div><div class='ctx'> #else /* #ifdef CONFIG_PROVE_RCU */</div><div class='ctx'> </div><div class='ctx'> #define RCU_LOCKDEP_WARN(c, s) do { } while (0 &amp;&amp; (c))</div><div class='ctx'> #define rcu_sleep_check() do { } while (0)</div><div class='ctx'> </div><div class='add'>+#define lockdep_assert_in_rcu_read_lock() do { } while (0)</div><div class='add'>+#define lockdep_assert_in_rcu_read_lock_bh() do { } while (0)</div><div class='add'>+#define lockdep_assert_in_rcu_read_lock_sched() do { } while (0)</div><div class='add'>+#define lockdep_assert_in_rcu_reader() do { } while (0)</div><div class='add'>+</div><div class='ctx'> #endif /* #else #ifdef CONFIG_PROVE_RCU */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -620,6 +713,24 @@ do {									      \</div><div class='ctx'> 				(c) || rcu_read_lock_sched_held(), \</div><div class='ctx'> 				__rcu)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * rcu_dereference_all_check() - rcu_dereference_all with debug checking</div><div class='add'>+ * @p: The pointer to read, prior to dereferencing</div><div class='add'>+ * @c: The conditions under which the dereference will take place</div><div class='add'>+ *</div><div class='add'>+ * This is similar to rcu_dereference_check(), but allows protection</div><div class='add'>+ * by all forms of vanilla RCU readers, including preemption disabled,</div><div class='add'>+ * bh-disabled, and interrupt-disabled regions of code.  Note that "vanilla</div><div class='add'>+ * RCU" excludes SRCU and the various Tasks RCU flavors.  Please note</div><div class='add'>+ * that this macro should not be backported to any Linux-kernel version</div><div class='add'>+ * preceding v5.0 due to changes in synchronize_rcu() semantics prior</div><div class='add'>+ * to that version.</div><div class='add'>+ */</div><div class='add'>+#define rcu_dereference_all_check(p, c) \</div><div class='add'>+	__rcu_dereference_check((p), __UNIQUE_ID(rcu), \</div><div class='add'>+				(c) || rcu_read_lock_any_held(), \</div><div class='add'>+				__rcu)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The tracing infrastructure traces RCU (we want that), but unfortunately</div><div class='ctx'>  * some of the RCU checks causes tracing to lock up the system.</div><div class='hunk'>@@ -675,6 +786,14 @@ do {									      \</div><div class='ctx'> #define rcu_dereference_sched(p) rcu_dereference_sched_check(p, 0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * rcu_dereference_all() - fetch RCU-all-protected pointer for dereferencing</div><div class='add'>+ * @p: The pointer to read, prior to dereferencing</div><div class='add'>+ *</div><div class='add'>+ * Makes rcu_dereference_check() do the dirty work.</div><div class='add'>+ */</div><div class='add'>+#define rcu_dereference_all(p) rcu_dereference_all_check(p, 0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * rcu_pointer_handoff() - Hand off a pointer from RCU to other mechanism</div><div class='ctx'>  * @p: The pointer to hand off</div><div class='ctx'>  *</div><div class='hunk'>@@ -707,11 +826,9 @@ do {									      \</div><div class='ctx'>  * sections, invocation of the corresponding RCU callback is deferred</div><div class='ctx'>  * until after the all the other CPUs exit their critical sections.</div><div class='ctx'>  *</div><div class='del'>- * In v5.0 and later kernels, synchronize_rcu() and call_rcu() also</div><div class='del'>- * wait for regions of code with preemption disabled, including regions of</div><div class='del'>- * code with interrupts or softirqs disabled.  In pre-v5.0 kernels, which</div><div class='del'>- * define synchronize_sched(), only code enclosed within rcu_read_lock()</div><div class='del'>- * and rcu_read_unlock() are guaranteed to be waited for.</div><div class='add'>+ * Both synchronize_rcu() and call_rcu() also wait for regions of code</div><div class='add'>+ * with preemption disabled, including regions of code with interrupts or</div><div class='add'>+ * softirqs disabled.</div><div class='ctx'>  *</div><div class='ctx'>  * Note, however, that RCU callbacks are permitted to run concurrently</div><div class='ctx'>  * with new RCU read-side critical sections.  One way that this can happen</div><div class='hunk'>@@ -766,11 +883,10 @@ static __always_inline void rcu_read_lock(void)</div><div class='ctx'>  * rcu_read_unlock() - marks the end of an RCU read-side critical section.</div><div class='ctx'>  *</div><div class='ctx'>  * In almost all situations, rcu_read_unlock() is immune from deadlock.</div><div class='del'>- * In recent kernels that have consolidated synchronize_sched() and</div><div class='del'>- * synchronize_rcu_bh() into synchronize_rcu(), this deadlock immunity</div><div class='del'>- * also extends to the scheduler's runqueue and priority-inheritance</div><div class='del'>- * spinlocks, courtesy of the quiescent-state deferral that is carried</div><div class='del'>- * out when rcu_read_unlock() is invoked with interrupts disabled.</div><div class='add'>+ * This deadlock immunity also extends to the scheduler's runqueue</div><div class='add'>+ * and priority-inheritance spinlocks, courtesy of the quiescent-state</div><div class='add'>+ * deferral that is carried out when rcu_read_unlock() is invoked with</div><div class='add'>+ * interrupts disabled.</div><div class='ctx'>  *</div><div class='ctx'>  * See rcu_read_lock() for more information.</div><div class='ctx'>  */</div><div class='hunk'>@@ -778,9 +894,9 @@ static inline void rcu_read_unlock(void)</div><div class='ctx'> {</div><div class='ctx'> 	RCU_LOCKDEP_WARN(!rcu_is_watching(),</div><div class='ctx'> 			 "rcu_read_unlock() used illegally while idle");</div><div class='add'>+	rcu_lock_release(&amp;rcu_lock_map); /* Keep acq info for rls diags. */</div><div class='ctx'> 	__release(RCU);</div><div class='ctx'> 	__rcu_read_unlock();</div><div class='del'>-	rcu_lock_release(&amp;rcu_lock_map); /* Keep acq info for rls diags. */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -872,6 +988,20 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)</div><div class='ctx'> 	preempt_enable_notrace();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline void rcu_read_lock_dont_migrate(void)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_PREEMPT_RCU))</div><div class='add'>+		migrate_disable();</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rcu_read_unlock_migrate(void)</div><div class='add'>+{</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (IS_ENABLED(CONFIG_PREEMPT_RCU))</div><div class='add'>+		migrate_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * RCU_INIT_POINTER() - initialize an RCU protected pointer</div><div class='ctx'>  * @p: The pointer to be initialized.</div><div class='hunk'>@@ -926,12 +1056,6 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)</div><div class='ctx'> #define RCU_POINTER_INITIALIZER(p, v) \</div><div class='ctx'> 		.p = RCU_INITIALIZER(v)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Does the specified offset indicate that the corresponding rcu_head</div><div class='del'>- * structure can be handled by kvfree_rcu()?</div><div class='del'>- */</div><div class='del'>-#define __is_kvfree_rcu_offset(offset) ((offset) &lt; 4096)</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * kfree_rcu() - kfree an object after a grace period.</div><div class='ctx'>  * @ptr: pointer to kfree for double-argument invocations.</div><div class='hunk'>@@ -942,11 +1066,11 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)</div><div class='ctx'>  * when they are used in a kernel module, that module must invoke the</div><div class='ctx'>  * high-latency rcu_barrier() function at module-unload time.</div><div class='ctx'>  *</div><div class='del'>- * The kfree_rcu() function handles this issue.  Rather than encoding a</div><div class='del'>- * function address in the embedded rcu_head structure, kfree_rcu() instead</div><div class='del'>- * encodes the offset of the rcu_head structure within the base structure.</div><div class='del'>- * Because the functions are not allowed in the low-order 4096 bytes of</div><div class='del'>- * kernel virtual memory, offsets up to 4095 bytes can be accommodated.</div><div class='add'>+ * The kfree_rcu() function handles this issue. In order to have a universal</div><div class='add'>+ * callback function handling different offsets of rcu_head, the callback needs</div><div class='add'>+ * to determine the starting address of the freed object, which can be a large</div><div class='add'>+ * kmalloc or vmalloc allocation. To allow simply aligning the pointer down to</div><div class='add'>+ * page boundary for those, only offsets up to 4095 bytes can be accommodated.</div><div class='ctx'>  * If the offset is larger than 4095 bytes, a compile-time error will</div><div class='ctx'>  * be generated in kvfree_rcu_arg_2(). If this error is triggered, you can</div><div class='ctx'>  * either fall back to use of call_rcu() or rearrange the structure to</div><div class='hunk'>@@ -983,14 +1107,23 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)</div><div class='ctx'> #define kfree_rcu_mightsleep(ptr) kvfree_rcu_arg_1(ptr)</div><div class='ctx'> #define kvfree_rcu_mightsleep(ptr) kvfree_rcu_arg_1(ptr)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * In mm/slab_common.c, no suitable header to include here.</div><div class='add'>+ */</div><div class='add'>+void kvfree_call_rcu(struct rcu_head *head, void *ptr);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The BUILD_BUG_ON() makes sure the rcu_head offset can be handled. See the</div><div class='add'>+ * comment of kfree_rcu() for details.</div><div class='add'>+ */</div><div class='ctx'> #define kvfree_rcu_arg_2(ptr, rhf)					\</div><div class='ctx'> do {									\</div><div class='ctx'> 	typeof (ptr) ___p = (ptr);					\</div><div class='ctx'> 									\</div><div class='del'>-	if (___p) {									\</div><div class='del'>-		BUILD_BUG_ON(!__is_kvfree_rcu_offset(offsetof(typeof(*(ptr)), rhf)));	\</div><div class='del'>-		kvfree_call_rcu(&amp;((___p)-&gt;rhf), (void *) (___p));			\</div><div class='del'>-	}										\</div><div class='add'>+	if (___p) {							\</div><div class='add'>+		BUILD_BUG_ON(offsetof(typeof(*(ptr)), rhf) &gt;= 4096);	\</div><div class='add'>+		kvfree_call_rcu(&amp;((___p)-&gt;rhf), (void *) (___p));	\</div><div class='add'>+	}								\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define kvfree_rcu_arg_1(ptr)					\</div><div class='hunk'>@@ -1059,6 +1192,18 @@ rcu_head_after_call_rcu(struct rcu_head *rhp, rcu_callback_t f)</div><div class='ctx'> extern int rcu_expedited;</div><div class='ctx'> extern int rcu_normal;</div><div class='ctx'> </div><div class='del'>-DEFINE_LOCK_GUARD_0(rcu, rcu_read_lock(), rcu_read_unlock())</div><div class='add'>+DEFINE_LOCK_GUARD_0(rcu,</div><div class='add'>+	do {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		/*</div><div class='add'>+		 * sparse doesn't call the cleanup function,</div><div class='add'>+		 * so just release immediately and don't track</div><div class='add'>+		 * the context. We don't need to anyway, since</div><div class='add'>+		 * the whole point of the guard is to not need</div><div class='add'>+		 * the explicit unlock.</div><div class='add'>+		 */</div><div class='add'>+		__release(RCU);</div><div class='add'>+	} while (0),</div><div class='add'>+	rcu_read_unlock())</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_RCUPDATE_H */</div><div class='head'>diff --git a/include/linux/rcupdate_trace.h b/include/linux/rcupdate_trace.h<br/>index eda493200663..e6c44eb428ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rcupdate_trace.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcupdate_trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rcupdate_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rcupdate_trace.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern struct lockdep_map rcu_trace_lock_map;</div><div class='ctx'> </div><div class='hunk'>@@ -98,4 +99,8 @@ static inline void rcu_read_lock_trace(void) { BUG(); }</div><div class='ctx'> static inline void rcu_read_unlock_trace(void) { BUG(); }</div><div class='ctx'> #endif /* #ifdef CONFIG_TASKS_TRACE_RCU */</div><div class='ctx'> </div><div class='add'>+DEFINE_LOCK_GUARD_0(rcu_tasks_trace,</div><div class='add'>+	rcu_read_lock_trace(),</div><div class='add'>+	rcu_read_unlock_trace())</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_RCUPDATE_TRACE_H */</div><div class='head'>diff --git a/include/linux/rcupdate_wait.h b/include/linux/rcupdate_wait.h<br/>index d07f0848802e..4c92d4291cce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rcupdate_wait.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcupdate_wait.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rcupdate_wait.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rcupdate_wait.h</a></div><div class='hunk'>@@ -16,21 +16,24 @@</div><div class='ctx'> struct rcu_synchronize {</div><div class='ctx'> 	struct rcu_head head;</div><div class='ctx'> 	struct completion completion;</div><div class='add'>+</div><div class='add'>+	/* This is for debugging. */</div><div class='add'>+	struct rcu_gp_oldstate oldstate;</div><div class='ctx'> };</div><div class='ctx'> void wakeme_after_rcu(struct rcu_head *head);</div><div class='ctx'> </div><div class='del'>-void __wait_rcu_gp(bool checktiny, int n, call_rcu_func_t *crcu_array,</div><div class='add'>+void __wait_rcu_gp(bool checktiny, unsigned int state, int n, call_rcu_func_t *crcu_array,</div><div class='ctx'> 		   struct rcu_synchronize *rs_array);</div><div class='ctx'> </div><div class='del'>-#define _wait_rcu_gp(checktiny, ...) \</div><div class='del'>-do {									\</div><div class='del'>-	call_rcu_func_t __crcu_array[] = { __VA_ARGS__ };		\</div><div class='del'>-	struct rcu_synchronize __rs_array[ARRAY_SIZE(__crcu_array)];	\</div><div class='del'>-	__wait_rcu_gp(checktiny, ARRAY_SIZE(__crcu_array),		\</div><div class='del'>-			__crcu_array, __rs_array);			\</div><div class='add'>+#define _wait_rcu_gp(checktiny, state, ...) \</div><div class='add'>+do {												\</div><div class='add'>+	call_rcu_func_t __crcu_array[] = { __VA_ARGS__ };					\</div><div class='add'>+	struct rcu_synchronize __rs_array[ARRAY_SIZE(__crcu_array)];				\</div><div class='add'>+	__wait_rcu_gp(checktiny, state, ARRAY_SIZE(__crcu_array), __crcu_array, __rs_array);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define wait_rcu_gp(...) _wait_rcu_gp(false, __VA_ARGS__)</div><div class='add'>+#define wait_rcu_gp(...) _wait_rcu_gp(false, TASK_UNINTERRUPTIBLE, __VA_ARGS__)</div><div class='add'>+#define wait_rcu_gp_state(state, ...) _wait_rcu_gp(false, state, __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * synchronize_rcu_mult - Wait concurrently for multiple grace periods</div><div class='hunk'>@@ -54,7 +57,7 @@ do {									\</div><div class='ctx'>  * grace period.</div><div class='ctx'>  */</div><div class='ctx'> #define synchronize_rcu_mult(...) \</div><div class='del'>-	_wait_rcu_gp(IS_ENABLED(CONFIG_TINY_RCU), __VA_ARGS__)</div><div class='add'>+	_wait_rcu_gp(IS_ENABLED(CONFIG_TINY_RCU), TASK_UNINTERRUPTIBLE, __VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> static inline void cond_resched_rcu(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -65,4 +68,15 @@ static inline void cond_resched_rcu(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+// Has the current task blocked within its current RCU read-side</div><div class='add'>+// critical section?</div><div class='add'>+static inline bool has_rcu_reader_blocked(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PREEMPT_RCU</div><div class='add'>+	return !list_empty(&amp;current-&gt;rcu_node_entry);</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_SCHED_RCUPDATE_WAIT_H */</div><div class='head'>diff --git a/include/linux/rcuref.h b/include/linux/rcuref.h<br/>index 2c8bfd0f1b6b..2fb2af6d9824 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rcuref.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcuref.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rcuref.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rcuref.h</a></div><div class='hunk'>@@ -30,7 +30,11 @@ static inline void rcuref_init(rcuref_t *ref, unsigned int cnt)</div><div class='ctx'>  * rcuref_read - Read the number of held reference counts of a rcuref</div><div class='ctx'>  * @ref:	Pointer to the reference count</div><div class='ctx'>  *</div><div class='del'>- * Return: The number of held references (0 ... N)</div><div class='add'>+ * Return: The number of held references (0 ... N). The value 0 does not</div><div class='add'>+ * indicate that it is safe to schedule the object, protected by this reference</div><div class='add'>+ * counter, for deconstruction.</div><div class='add'>+ * If you want to know if the reference counter has been marked DEAD (as</div><div class='add'>+ * signaled by rcuref_put()) please use rcuread_is_dead().</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned int rcuref_read(rcuref_t *ref)</div><div class='ctx'> {</div><div class='hunk'>@@ -40,6 +44,22 @@ static inline unsigned int rcuref_read(rcuref_t *ref)</div><div class='ctx'> 	return c &gt;= RCUREF_RELEASED ? 0 : c + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * rcuref_is_dead -	Check if the rcuref has been already marked dead</div><div class='add'>+ * @ref:		Pointer to the reference count</div><div class='add'>+ *</div><div class='add'>+ * Return: True if the object has been marked DEAD. This signals that a previous</div><div class='add'>+ * invocation of rcuref_put() returned true on this reference counter meaning</div><div class='add'>+ * the protected object can safely be scheduled for deconstruction.</div><div class='add'>+ * Otherwise, returns false.</div><div class='add'>+ */</div><div class='add'>+static inline bool rcuref_is_dead(rcuref_t *ref)</div><div class='add'>+{</div><div class='add'>+	unsigned int c = atomic_read(&amp;ref-&gt;refcnt);</div><div class='add'>+</div><div class='add'>+	return (c &gt;= RCUREF_RELEASED) &amp;&amp; (c &lt; RCUREF_NOREF);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern __must_check bool rcuref_get_slowpath(rcuref_t *ref);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -71,27 +91,30 @@ static inline __must_check bool rcuref_get(rcuref_t *ref)</div><div class='ctx'> 	return rcuref_get_slowpath(ref);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern __must_check bool rcuref_put_slowpath(rcuref_t *ref);</div><div class='add'>+extern __must_check bool rcuref_put_slowpath(rcuref_t *ref, unsigned int cnt);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Internal helper. Do not invoke directly.</div><div class='ctx'>  */</div><div class='ctx'> static __always_inline __must_check bool __rcuref_put(rcuref_t *ref)</div><div class='ctx'> {</div><div class='add'>+	int cnt;</div><div class='add'>+</div><div class='ctx'> 	RCU_LOCKDEP_WARN(!rcu_read_lock_held() &amp;&amp; preemptible(),</div><div class='ctx'> 			 "suspicious rcuref_put_rcusafe() usage");</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Unconditionally decrease the reference count. The saturation and</div><div class='ctx'> 	 * dead zones provide enough tolerance for this.</div><div class='ctx'> 	 */</div><div class='del'>-	if (likely(!atomic_add_negative_release(-1, &amp;ref-&gt;refcnt)))</div><div class='add'>+	cnt = atomic_sub_return_release(1, &amp;ref-&gt;refcnt);</div><div class='add'>+	if (likely(cnt &gt;= 0))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Handle the last reference drop and cases inside the saturation</div><div class='ctx'> 	 * and dead zones.</div><div class='ctx'> 	 */</div><div class='del'>-	return rcuref_put_slowpath(ref);</div><div class='add'>+	return rcuref_put_slowpath(ref, cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h<br/>index d9ac7b136aea..f519cd680228 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rcutiny.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcutiny.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rcutiny.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rcutiny.h</a></div><div class='hunk'>@@ -90,36 +90,6 @@ static inline void synchronize_rcu_expedited(void)</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Add one more declaration of kvfree() here. It is</div><div class='del'>- * not so straight forward to just include &lt;linux/mm.h&gt;</div><div class='del'>- * where it is defined due to getting many compile</div><div class='del'>- * errors caused by that include.</div><div class='del'>- */</div><div class='del'>-extern void kvfree(const void *addr);</div><div class='del'>-</div><div class='del'>-static inline void __kvfree_call_rcu(struct rcu_head *head, void *ptr)</div><div class='del'>-{</div><div class='del'>-	if (head) {</div><div class='del'>-		call_rcu(head, (rcu_callback_t) ((void *) head - ptr));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	// kvfree_rcu(one_arg) call.</div><div class='del'>-	might_sleep();</div><div class='del'>-	synchronize_rcu();</div><div class='del'>-	kvfree(ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KASAN_GENERIC</div><div class='del'>-void kvfree_call_rcu(struct rcu_head *head, void *ptr);</div><div class='del'>-#else</div><div class='del'>-static inline void kvfree_call_rcu(struct rcu_head *head, void *ptr)</div><div class='del'>-{</div><div class='del'>-	__kvfree_call_rcu(head, ptr);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> void rcu_qs(void);</div><div class='ctx'> </div><div class='ctx'> static inline void rcu_softirq_qs(void)</div><div class='hunk'>@@ -158,9 +128,7 @@ void rcu_scheduler_starting(void);</div><div class='ctx'> static inline void rcu_end_inkernel_boot(void) { }</div><div class='ctx'> static inline bool rcu_inkernel_boot_has_ended(void) { return true; }</div><div class='ctx'> static inline bool rcu_is_watching(void) { return true; }</div><div class='del'>-static inline void rcu_momentary_dyntick_idle(void) { }</div><div class='del'>-static inline void kfree_rcu_scheduler_running(void) { }</div><div class='del'>-static inline bool rcu_gp_might_be_stalled(void) { return false; }</div><div class='add'>+static inline void rcu_momentary_eqs(void) { }</div><div class='ctx'> </div><div class='ctx'> /* Avoid RCU read-side critical sections leaking across. */</div><div class='ctx'> static inline void rcu_all_qs(void) { barrier(); }</div><div class='head'>diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h<br/>index 254244202ea9..9d2d7bd251d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rcutree.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcutree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rcutree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rcutree.h</a></div><div class='hunk'>@@ -34,12 +34,9 @@ static inline void rcu_virt_note_context_switch(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void synchronize_rcu_expedited(void);</div><div class='del'>-void kvfree_call_rcu(struct rcu_head *head, void *ptr);</div><div class='ctx'> </div><div class='ctx'> void rcu_barrier(void);</div><div class='del'>-void rcu_momentary_dyntick_idle(void);</div><div class='del'>-void kfree_rcu_scheduler_running(void);</div><div class='del'>-bool rcu_gp_might_be_stalled(void);</div><div class='add'>+void rcu_momentary_eqs(void);</div><div class='ctx'> </div><div class='ctx'> struct rcu_gp_oldstate {</div><div class='ctx'> 	unsigned long rgos_norm;</div><div class='hunk'>@@ -103,7 +100,7 @@ extern int rcu_scheduler_active;</div><div class='ctx'> void rcu_end_inkernel_boot(void);</div><div class='ctx'> bool rcu_inkernel_boot_has_ended(void);</div><div class='ctx'> bool rcu_is_watching(void);</div><div class='del'>-#ifndef CONFIG_PREEMPTION</div><div class='add'>+#ifndef CONFIG_PREEMPT_RCU</div><div class='ctx'> void rcu_all_qs(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/rcuwait.h b/include/linux/rcuwait.h<br/>index 27343424225c..9ad134a04b41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rcuwait.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rcuwait.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rcuwait.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rcuwait.h</a></div><div class='hunk'>@@ -4,18 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * rcuwait provides a way of blocking and waking up a single</div><div class='del'>- * task in an rcu-safe manner.</div><div class='del'>- *</div><div class='del'>- * The only time @task is non-nil is when a user is blocked (or</div><div class='del'>- * checking if it needs to) on a condition, and reset as soon as we</div><div class='del'>- * know that the condition has succeeded and are awoken.</div><div class='del'>- */</div><div class='del'>-struct rcuwait {</div><div class='del'>-	struct task_struct __rcu *task;</div><div class='del'>-};</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __RCUWAIT_INITIALIZER(name)		\</div><div class='ctx'> 	{ .task = NULL, }</div><div class='head'>diff --git a/include/linux/reboot.h b/include/linux/reboot.h<br/>index abcdde4df697..aa08c3bbbf59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/reboot.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/reboot.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/reboot.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/reboot.h</a></div><div class='hunk'>@@ -177,16 +177,38 @@ void ctrl_alt_del(void);</div><div class='ctx'> </div><div class='ctx'> extern void orderly_poweroff(bool force);</div><div class='ctx'> extern void orderly_reboot(void);</div><div class='del'>-void __hw_protection_shutdown(const char *reason, int ms_until_forced, bool shutdown);</div><div class='ctx'> </div><div class='del'>-static inline void hw_protection_reboot(const char *reason, int ms_until_forced)</div><div class='del'>-{</div><div class='del'>-	__hw_protection_shutdown(reason, ms_until_forced, false);</div><div class='del'>-}</div><div class='add'>+/**</div><div class='add'>+ * enum hw_protection_action - Hardware protection action</div><div class='add'>+ *</div><div class='add'>+ * @HWPROT_ACT_DEFAULT:</div><div class='add'>+ *      The default action should be taken. This is HWPROT_ACT_SHUTDOWN</div><div class='add'>+ *      by default, but can be overridden.</div><div class='add'>+ * @HWPROT_ACT_SHUTDOWN:</div><div class='add'>+ *	The system should be shut down (powered off) for HW protection.</div><div class='add'>+ * @HWPROT_ACT_REBOOT:</div><div class='add'>+ *	The system should be rebooted for HW protection.</div><div class='add'>+ */</div><div class='add'>+enum hw_protection_action { HWPROT_ACT_DEFAULT, HWPROT_ACT_SHUTDOWN, HWPROT_ACT_REBOOT };</div><div class='ctx'> </div><div class='del'>-static inline void hw_protection_shutdown(const char *reason, int ms_until_forced)</div><div class='add'>+void __hw_protection_trigger(const char *reason, int ms_until_forced,</div><div class='add'>+			     enum hw_protection_action action);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hw_protection_trigger - Trigger default emergency system hardware protection action</div><div class='add'>+ *</div><div class='add'>+ * @reason:		Reason of emergency shutdown or reboot to be printed.</div><div class='add'>+ * @ms_until_forced:	Time to wait for orderly shutdown or reboot before</div><div class='add'>+ *			triggering it. Negative value disables the forced</div><div class='add'>+ *			shutdown or reboot.</div><div class='add'>+ *</div><div class='add'>+ * Initiate an emergency system shutdown or reboot in order to protect</div><div class='add'>+ * hardware from further damage. The exact action taken is controllable at</div><div class='add'>+ * runtime and defaults to shutdown.</div><div class='add'>+ */</div><div class='add'>+static inline void hw_protection_trigger(const char *reason, int ms_until_forced)</div><div class='ctx'> {</div><div class='del'>-	__hw_protection_shutdown(reason, ms_until_forced, true);</div><div class='add'>+	__hw_protection_trigger(reason, ms_until_forced, HWPROT_ACT_DEFAULT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/ref_tracker.h b/include/linux/ref_tracker.h<br/>index 8eac4f3d5254..d10563afd91c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ref_tracker.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ref_tracker.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ref_tracker.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ref_tracker.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stackdepot.h&gt;</div><div class='ctx'> </div><div class='add'>+#define __ostream_printf __printf(2, 3)</div><div class='add'>+</div><div class='ctx'> struct ref_tracker;</div><div class='ctx'> </div><div class='ctx'> struct ref_tracker_dir {</div><div class='hunk'>@@ -17,15 +19,45 @@ struct ref_tracker_dir {</div><div class='ctx'> 	bool			dead;</div><div class='ctx'> 	struct list_head	list; /* List of active trackers */</div><div class='ctx'> 	struct list_head	quarantine; /* List of dead trackers */</div><div class='del'>-	char			name[32];</div><div class='add'>+	const char		*class; /* object classname */</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_REF_TRACKER</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+void ref_tracker_dir_debugfs(struct ref_tracker_dir *dir);</div><div class='add'>+void ref_tracker_dir_symlink(struct ref_tracker_dir *dir, const char *fmt, ...);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+static inline void ref_tracker_dir_debugfs(struct ref_tracker_dir *dir)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __ostream_printf</div><div class='add'>+void ref_tracker_dir_symlink(struct ref_tracker_dir *dir, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ref_tracker_dir_init - initialize a ref_tracker dir</div><div class='add'>+ * @dir: ref_tracker_dir to be initialized</div><div class='add'>+ * @quarantine_count: max number of entries to be tracked</div><div class='add'>+ * @class: pointer to static string that describes object type</div><div class='add'>+ *</div><div class='add'>+ * Initialize a ref_tracker_dir. If debugfs is configured, then a file</div><div class='add'>+ * will also be created for it under the top-level ref_tracker debugfs</div><div class='add'>+ * directory.</div><div class='add'>+ *</div><div class='add'>+ * Note that @class must point to a static string.</div><div class='add'>+ */</div><div class='ctx'> static inline void ref_tracker_dir_init(struct ref_tracker_dir *dir,</div><div class='ctx'> 					unsigned int quarantine_count,</div><div class='del'>-					const char *name)</div><div class='add'>+					const char *class)</div><div class='ctx'> {</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dir-&gt;list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dir-&gt;quarantine);</div><div class='hunk'>@@ -34,7 +66,8 @@ static inline void ref_tracker_dir_init(struct ref_tracker_dir *dir,</div><div class='ctx'> 	dir-&gt;dead = false;</div><div class='ctx'> 	refcount_set(&amp;dir-&gt;untracked, 1);</div><div class='ctx'> 	refcount_set(&amp;dir-&gt;no_tracker, 1);</div><div class='del'>-	strscpy(dir-&gt;name, name, sizeof(dir-&gt;name));</div><div class='add'>+	dir-&gt;class = class;</div><div class='add'>+	ref_tracker_dir_debugfs(dir);</div><div class='ctx'> 	stack_depot_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +91,16 @@ int ref_tracker_free(struct ref_tracker_dir *dir,</div><div class='ctx'> </div><div class='ctx'> static inline void ref_tracker_dir_init(struct ref_tracker_dir *dir,</div><div class='ctx'> 					unsigned int quarantine_count,</div><div class='del'>-					const char *name)</div><div class='add'>+					const char *class)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ref_tracker_dir_debugfs(struct ref_tracker_dir *dir)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __ostream_printf</div><div class='add'>+void ref_tracker_dir_symlink(struct ref_tracker_dir *dir, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/refcount.h b/include/linux/refcount.h<br/>index 59b3b752394d..80dc023ac2bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/refcount.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/refcount.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/refcount.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/refcount.h</a></div><div class='hunk'>@@ -87,6 +87,15 @@</div><div class='ctx'>  * The decrements dec_and_test() and sub_and_test() also provide acquire</div><div class='ctx'>  * ordering on success.</div><div class='ctx'>  *</div><div class='add'>+ * refcount_{add|inc}_not_zero_acquire() and refcount_set_release() provide</div><div class='add'>+ * acquire and release ordering for cases when the memory occupied by the</div><div class='add'>+ * object might be reused to store another object. This is important for the</div><div class='add'>+ * cases where secondary validation is required to detect such reuse, e.g.</div><div class='add'>+ * SLAB_TYPESAFE_BY_RCU. The secondary validation checks have to happen after</div><div class='add'>+ * the refcount is taken, hence acquire order is necessary. Similarly, when the</div><div class='add'>+ * object is initialized, all stores to its attributes should be visible before</div><div class='add'>+ * the refcount is set, otherwise a stale attribute value might be used by</div><div class='add'>+ * another task which succeeds in taking a refcount to the new object.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _LINUX_REFCOUNT_H</div><div class='hunk'>@@ -126,6 +135,31 @@ static inline void refcount_set(refcount_t *r, int n)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * refcount_set_release - set a refcount's value with release ordering</div><div class='add'>+ * @r: the refcount</div><div class='add'>+ * @n: value to which the refcount will be set</div><div class='add'>+ *</div><div class='add'>+ * This function should be used when memory occupied by the object might be</div><div class='add'>+ * reused to store another object -- consider SLAB_TYPESAFE_BY_RCU.</div><div class='add'>+ *</div><div class='add'>+ * Provides release memory ordering which will order previous memory operations</div><div class='add'>+ * against this store. This ensures all updates to this object are visible</div><div class='add'>+ * once the refcount is set and stale values from the object previously</div><div class='add'>+ * occupying this memory are overwritten with new ones.</div><div class='add'>+ *</div><div class='add'>+ * This function should be called only after new object is fully initialized.</div><div class='add'>+ * After this call the object should be considered visible to other tasks even</div><div class='add'>+ * if it was not yet added into an object collection normally used to discover</div><div class='add'>+ * it. This is because other tasks might have discovered the object previously</div><div class='add'>+ * occupying the same memory and after memory reuse they can succeed in taking</div><div class='add'>+ * refcount to the new object and start using it.</div><div class='add'>+ */</div><div class='add'>+static inline void refcount_set_release(refcount_t *r, int n)</div><div class='add'>+{</div><div class='add'>+	atomic_set_release(&amp;r-&gt;refs, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * refcount_read - get a refcount's value</div><div class='ctx'>  * @r: the refcount</div><div class='ctx'>  *</div><div class='hunk'>@@ -178,6 +212,71 @@ static inline __must_check bool refcount_add_not_zero(int i, refcount_t *r)</div><div class='ctx'> 	return __refcount_add_not_zero(i, r, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline __must_check __signed_wrap</div><div class='add'>+bool __refcount_add_not_zero_limited_acquire(int i, refcount_t *r, int *oldp,</div><div class='add'>+					     int limit)</div><div class='add'>+{</div><div class='add'>+	int old = refcount_read(r);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (!old)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (i &gt; limit - old) {</div><div class='add'>+			if (oldp)</div><div class='add'>+				*oldp = old;</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	} while (!atomic_try_cmpxchg_acquire(&amp;r-&gt;refs, &amp;old, old + i));</div><div class='add'>+</div><div class='add'>+	if (oldp)</div><div class='add'>+		*oldp = old;</div><div class='add'>+</div><div class='add'>+	if (unlikely(old &lt; 0 || old + i &lt; 0))</div><div class='add'>+		refcount_warn_saturate(r, REFCOUNT_ADD_NOT_ZERO_OVF);</div><div class='add'>+</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __must_check bool</div><div class='add'>+__refcount_inc_not_zero_limited_acquire(refcount_t *r, int *oldp, int limit)</div><div class='add'>+{</div><div class='add'>+	return __refcount_add_not_zero_limited_acquire(1, r, oldp, limit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __must_check __signed_wrap</div><div class='add'>+bool __refcount_add_not_zero_acquire(int i, refcount_t *r, int *oldp)</div><div class='add'>+{</div><div class='add'>+	return __refcount_add_not_zero_limited_acquire(i, r, oldp, INT_MAX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * refcount_add_not_zero_acquire - add a value to a refcount with acquire ordering unless it is 0</div><div class='add'>+ *</div><div class='add'>+ * @i: the value to add to the refcount</div><div class='add'>+ * @r: the refcount</div><div class='add'>+ *</div><div class='add'>+ * Will saturate at REFCOUNT_SATURATED and WARN.</div><div class='add'>+ *</div><div class='add'>+ * This function should be used when memory occupied by the object might be</div><div class='add'>+ * reused to store another object -- consider SLAB_TYPESAFE_BY_RCU.</div><div class='add'>+ *</div><div class='add'>+ * Provides acquire memory ordering on success, it is assumed the caller has</div><div class='add'>+ * guaranteed the object memory to be stable (RCU, etc.). It does provide a</div><div class='add'>+ * control dependency and thereby orders future stores. See the comment on top.</div><div class='add'>+ *</div><div class='add'>+ * Use of this function is not recommended for the normal reference counting</div><div class='add'>+ * use case in which references are taken and released one at a time.  In these</div><div class='add'>+ * cases, refcount_inc_not_zero_acquire() should instead be used to increment a</div><div class='add'>+ * reference count.</div><div class='add'>+ *</div><div class='add'>+ * Return: false if the passed refcount is 0, true otherwise</div><div class='add'>+ */</div><div class='add'>+static inline __must_check bool refcount_add_not_zero_acquire(int i, refcount_t *r)</div><div class='add'>+{</div><div class='add'>+	return __refcount_add_not_zero_acquire(i, r, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline __signed_wrap</div><div class='ctx'> void __refcount_add(int i, refcount_t *r, int *oldp)</div><div class='ctx'> {</div><div class='hunk'>@@ -236,6 +335,32 @@ static inline __must_check bool refcount_inc_not_zero(refcount_t *r)</div><div class='ctx'> 	return __refcount_inc_not_zero(r, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline __must_check bool __refcount_inc_not_zero_acquire(refcount_t *r, int *oldp)</div><div class='add'>+{</div><div class='add'>+	return __refcount_add_not_zero_acquire(1, r, oldp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * refcount_inc_not_zero_acquire - increment a refcount with acquire ordering unless it is 0</div><div class='add'>+ * @r: the refcount to increment</div><div class='add'>+ *</div><div class='add'>+ * Similar to refcount_inc_not_zero(), but provides acquire memory ordering on</div><div class='add'>+ * success.</div><div class='add'>+ *</div><div class='add'>+ * This function should be used when memory occupied by the object might be</div><div class='add'>+ * reused to store another object -- consider SLAB_TYPESAFE_BY_RCU.</div><div class='add'>+ *</div><div class='add'>+ * Provides acquire memory ordering on success, it is assumed the caller has</div><div class='add'>+ * guaranteed the object memory to be stable (RCU, etc.). It does provide a</div><div class='add'>+ * control dependency and thereby orders future stores. See the comment on top.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the increment was successful, false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline __must_check bool refcount_inc_not_zero_acquire(refcount_t *r)</div><div class='add'>+{</div><div class='add'>+	return __refcount_inc_not_zero_acquire(r, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void __refcount_inc(refcount_t *r, int *oldp)</div><div class='ctx'> {</div><div class='ctx'> 	__refcount_add(1, r, oldp);</div><div class='hunk'>@@ -266,12 +391,12 @@ bool __refcount_sub_and_test(int i, refcount_t *r, int *oldp)</div><div class='ctx'> 	if (oldp)</div><div class='ctx'> 		*oldp = old;</div><div class='ctx'> </div><div class='del'>-	if (old == i) {</div><div class='add'>+	if (old &gt; 0 &amp;&amp; old == i) {</div><div class='ctx'> 		smp_acquire__after_ctrl_dep();</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(old &lt; 0 || old - i &lt; 0))</div><div class='add'>+	if (unlikely(old &lt;= 0 || old - i &lt; 0))</div><div class='ctx'> 		refcount_warn_saturate(r, REFCOUNT_SUB_UAF);</div><div class='ctx'> </div><div class='ctx'> 	return false;</div><div class='head'>diff --git a/include/linux/regmap.h b/include/linux/regmap.h<br/>index b743241cfb7c..b0b9be750d93 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/regmap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regmap.h</a></div><div class='hunk'>@@ -54,12 +54,24 @@ struct sdw_slave;</div><div class='ctx'> #define REGMAP_UPSHIFT(s)	(-(s))</div><div class='ctx'> #define REGMAP_DOWNSHIFT(s)	(s)</div><div class='ctx'> </div><div class='del'>-/* An enum of all the supported cache types */</div><div class='add'>+/*</div><div class='add'>+ * The supported cache types, the default is no cache.  Any new caches should</div><div class='add'>+ * usually use the maple tree cache unless they specifically require that there</div><div class='add'>+ * are never any allocations at runtime in which case they should use the sparse</div><div class='add'>+ * flat cache.  The rbtree cache *may* have some performance advantage for very</div><div class='add'>+ * low end systems that make heavy use of cache syncs but is mainly legacy.</div><div class='add'>+ * These caches are sparse and entries will be initialized from hardware if no</div><div class='add'>+ * default has been provided.</div><div class='add'>+ * The non-sparse flat cache is provided for compatibility with existing users</div><div class='add'>+ * and will zero-initialize cache entries for which no defaults are provided.</div><div class='add'>+ * New users should use the sparse flat cache.</div><div class='add'>+ */</div><div class='ctx'> enum regcache_type {</div><div class='ctx'> 	REGCACHE_NONE,</div><div class='ctx'> 	REGCACHE_RBTREE,</div><div class='ctx'> 	REGCACHE_FLAT,</div><div class='ctx'> 	REGCACHE_MAPLE,</div><div class='add'>+	REGCACHE_FLAT_S,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -106,17 +118,17 @@ struct reg_sequence {</div><div class='ctx'>  * @addr: Address to poll</div><div class='ctx'>  * @val: Unsigned integer variable to read the value into</div><div class='ctx'>  * @cond: Break condition (usually involving @val)</div><div class='del'>- * @sleep_us: Maximum time to sleep between reads in us (0</div><div class='del'>- *            tight-loops).  Should be less than ~20ms since usleep_range</div><div class='del'>- *            is used (see Documentation/timers/timers-howto.rst).</div><div class='add'>+ * @sleep_us: Maximum time to sleep between reads in us (0 tight-loops). Please</div><div class='add'>+ *            read usleep_range() function description for details and</div><div class='add'>+ *            limitations.</div><div class='ctx'>  * @timeout_us: Timeout in us, 0 means never timeout</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success and -ETIMEDOUT upon a timeout or the regmap_read</div><div class='add'>+ * This is modelled after the readx_poll_timeout macros in linux/iopoll.h.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout or the regmap_read</div><div class='ctx'>  * error return value in case of a error read. In the two former cases,</div><div class='ctx'>  * the last read value at @addr is stored in @val. Must not be called</div><div class='ctx'>  * from atomic context if sleep_us or timeout_us are used.</div><div class='del'>- *</div><div class='del'>- * This is modelled after the readx_poll_timeout macros in linux/iopoll.h.</div><div class='ctx'>  */</div><div class='ctx'> #define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_us) \</div><div class='ctx'> ({ \</div><div class='hunk'>@@ -133,20 +145,20 @@ struct reg_sequence {</div><div class='ctx'>  * @addr: Address to poll</div><div class='ctx'>  * @val: Unsigned integer variable to read the value into</div><div class='ctx'>  * @cond: Break condition (usually involving @val)</div><div class='del'>- * @delay_us: Time to udelay between reads in us (0 tight-loops).</div><div class='del'>- *            Should be less than ~10us since udelay is used</div><div class='del'>- *            (see Documentation/timers/timers-howto.rst).</div><div class='add'>+ * @delay_us: Time to udelay between reads in us (0 tight-loops). Please</div><div class='add'>+ *            read udelay() function description for details and</div><div class='add'>+ *            limitations.</div><div class='ctx'>  * @timeout_us: Timeout in us, 0 means never timeout</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success and -ETIMEDOUT upon a timeout or the regmap_read</div><div class='del'>- * error return value in case of a error read. In the two former cases,</div><div class='del'>- * the last read value at @addr is stored in @val.</div><div class='del'>- *</div><div class='ctx'>  * This is modelled after the readx_poll_timeout_atomic macros in linux/iopoll.h.</div><div class='ctx'>  *</div><div class='ctx'>  * Note: In general regmap cannot be used in atomic context. If you want to use</div><div class='ctx'>  * this macro then first setup your regmap for atomic use (flat or no cache</div><div class='ctx'>  * and MMIO regmap).</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout or the regmap_read</div><div class='add'>+ * error return value in case of a error read. In the two former cases,</div><div class='add'>+ * the last read value at @addr is stored in @val.</div><div class='ctx'>  */</div><div class='ctx'> #define regmap_read_poll_timeout_atomic(map, addr, val, cond, delay_us, timeout_us) \</div><div class='ctx'> ({ \</div><div class='hunk'>@@ -177,17 +189,17 @@ struct reg_sequence {</div><div class='ctx'>  * @field: Regmap field to read from</div><div class='ctx'>  * @val: Unsigned integer variable to read the value into</div><div class='ctx'>  * @cond: Break condition (usually involving @val)</div><div class='del'>- * @sleep_us: Maximum time to sleep between reads in us (0</div><div class='del'>- *            tight-loops).  Should be less than ~20ms since usleep_range</div><div class='del'>- *            is used (see Documentation/timers/timers-howto.rst).</div><div class='add'>+ * @sleep_us: Maximum time to sleep between reads in us (0 tight-loops). Please</div><div class='add'>+ *            read usleep_range() function description for details and</div><div class='add'>+ *            limitations.</div><div class='ctx'>  * @timeout_us: Timeout in us, 0 means never timeout</div><div class='ctx'>  *</div><div class='del'>- * Returns 0 on success and -ETIMEDOUT upon a timeout or the regmap_field_read</div><div class='add'>+ * This is modelled after the readx_poll_timeout macros in linux/iopoll.h.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success and -ETIMEDOUT upon a timeout or the regmap_field_read</div><div class='ctx'>  * error return value in case of a error read. In the two former cases,</div><div class='ctx'>  * the last read value at @addr is stored in @val. Must not be called</div><div class='ctx'>  * from atomic context if sleep_us or timeout_us are used.</div><div class='del'>- *</div><div class='del'>- * This is modelled after the readx_poll_timeout macros in linux/iopoll.h.</div><div class='ctx'>  */</div><div class='ctx'> #define regmap_field_read_poll_timeout(field, val, cond, sleep_us, timeout_us) \</div><div class='ctx'> ({ \</div><div class='hunk'>@@ -297,15 +309,6 @@ typedef void (*regmap_unlock)(void *);</div><div class='ctx'>  *			performed on such table (a register is no increment</div><div class='ctx'>  *			readable if it belongs to one of the ranges specified</div><div class='ctx'>  *			by rd_noinc_table).</div><div class='del'>- * @disable_locking: This regmap is either protected by external means or</div><div class='del'>- *                   is guaranteed not to be accessed from multiple threads.</div><div class='del'>- *                   Don't use any locking mechanisms.</div><div class='del'>- * @lock:	  Optional lock callback (overrides regmap's default lock</div><div class='del'>- *		  function, based on spinlock or mutex).</div><div class='del'>- * @unlock:	  As above for unlocking.</div><div class='del'>- * @lock_arg:	  this field is passed as the only argument of lock/unlock</div><div class='del'>- *		  functions (ignored in case regular lock/unlock functions</div><div class='del'>- *		  are not overridden).</div><div class='ctx'>  * @reg_read:	  Optional callback that if filled will be used to perform</div><div class='ctx'>  *           	  all the reads from the registers. Should only be provided for</div><div class='ctx'>  *		  devices whose read operation cannot be represented as a simple</div><div class='hunk'>@@ -323,6 +326,7 @@ typedef void (*regmap_unlock)(void *);</div><div class='ctx'>  * @write: Same as above for writing.</div><div class='ctx'>  * @max_raw_read: Max raw read size that can be used on the device.</div><div class='ctx'>  * @max_raw_write: Max raw write size that can be used on the device.</div><div class='add'>+ * @can_sleep:	  Optional, specifies whether regmap operations can sleep.</div><div class='ctx'>  * @fast_io:	  Register IO is fast. Use a spinlock instead of a mutex</div><div class='ctx'>  *	     	  to perform locking. This field is ignored if custom lock/unlock</div><div class='ctx'>  *	     	  functions are used (see fields lock/unlock of struct regmap_config).</div><div class='hunk'>@@ -331,6 +335,15 @@ typedef void (*regmap_unlock)(void *);</div><div class='ctx'>  *		   Use it only for "no-bus" cases.</div><div class='ctx'>  * @io_port:	  Support IO port accessors. Makes sense only when MMIO vs. IO port</div><div class='ctx'>  *		  access can be distinguished.</div><div class='add'>+ * @disable_locking: This regmap is either protected by external means or</div><div class='add'>+ *		     is guaranteed not to be accessed from multiple threads.</div><div class='add'>+ *		     Don't use any locking mechanisms.</div><div class='add'>+ * @lock:	  Optional lock callback (overrides regmap's default lock</div><div class='add'>+ *		  function, based on spinlock or mutex).</div><div class='add'>+ * @unlock:	  As above for unlocking.</div><div class='add'>+ * @lock_arg:	  This field is passed as the only argument of lock/unlock</div><div class='add'>+ *		  functions (ignored in case regular lock/unlock functions</div><div class='add'>+ *		  are not overridden).</div><div class='ctx'>  * @max_register: Optional, specifies the maximum valid register address.</div><div class='ctx'>  * @max_register_is_0: Optional, specifies that zero value in @max_register</div><div class='ctx'>  *                     should be taken into account. This is a workaround to</div><div class='hunk'>@@ -373,21 +386,20 @@ typedef void (*regmap_unlock)(void *);</div><div class='ctx'>  * @reg_defaults_raw: Power on reset values for registers (for use with</div><div class='ctx'>  *                    register cache support).</div><div class='ctx'>  * @num_reg_defaults_raw: Number of elements in reg_defaults_raw.</div><div class='del'>- * @reg_format_endian: Endianness for formatted register addresses. If this is</div><div class='del'>- *                     DEFAULT, the @reg_format_endian_default value from the</div><div class='del'>- *                     regmap bus is used.</div><div class='del'>- * @val_format_endian: Endianness for formatted register values. If this is</div><div class='del'>- *                     DEFAULT, the @reg_format_endian_default value from the</div><div class='del'>- *                     regmap bus is used.</div><div class='del'>- *</div><div class='del'>- * @ranges: Array of configuration entries for virtual address ranges.</div><div class='del'>- * @num_ranges: Number of range configuration entries.</div><div class='ctx'>  * @use_hwlock: Indicate if a hardware spinlock should be used.</div><div class='ctx'>  * @use_raw_spinlock: Indicate if a raw spinlock should be used.</div><div class='ctx'>  * @hwlock_id: Specify the hardware spinlock id.</div><div class='ctx'>  * @hwlock_mode: The hardware spinlock mode, should be HWLOCK_IRQSTATE,</div><div class='ctx'>  *		 HWLOCK_IRQ or 0.</div><div class='del'>- * @can_sleep: Optional, specifies whether regmap operations can sleep.</div><div class='add'>+ * @reg_format_endian: Endianness for formatted register addresses. If this is</div><div class='add'>+ *		       DEFAULT, the @reg_format_endian_default value from the</div><div class='add'>+ *		       regmap bus is used.</div><div class='add'>+ * @val_format_endian: Endianness for formatted register values. If this is</div><div class='add'>+ *		       DEFAULT, the @reg_format_endian_default value from the</div><div class='add'>+ *		       regmap bus is used.</div><div class='add'>+ *</div><div class='add'>+ * @ranges: Array of configuration entries for virtual address ranges.</div><div class='add'>+ * @num_ranges: Number of range configuration entries.</div><div class='ctx'>  */</div><div class='ctx'> struct regmap_config {</div><div class='ctx'> 	const char *name;</div><div class='hunk'>@@ -406,11 +418,6 @@ struct regmap_config {</div><div class='ctx'> 	bool (*writeable_noinc_reg)(struct device *dev, unsigned int reg);</div><div class='ctx'> 	bool (*readable_noinc_reg)(struct device *dev, unsigned int reg);</div><div class='ctx'> </div><div class='del'>-	bool disable_locking;</div><div class='del'>-	regmap_lock lock;</div><div class='del'>-	regmap_unlock unlock;</div><div class='del'>-	void *lock_arg;</div><div class='del'>-</div><div class='ctx'> 	int (*reg_read)(void *context, unsigned int reg, unsigned int *val);</div><div class='ctx'> 	int (*reg_write)(void *context, unsigned int reg, unsigned int val);</div><div class='ctx'> 	int (*reg_update_bits)(void *context, unsigned int reg,</div><div class='hunk'>@@ -422,9 +429,16 @@ struct regmap_config {</div><div class='ctx'> 	size_t max_raw_read;</div><div class='ctx'> 	size_t max_raw_write;</div><div class='ctx'> </div><div class='add'>+	bool can_sleep;</div><div class='add'>+</div><div class='ctx'> 	bool fast_io;</div><div class='ctx'> 	bool io_port;</div><div class='ctx'> </div><div class='add'>+	bool disable_locking;</div><div class='add'>+	regmap_lock lock;</div><div class='add'>+	regmap_unlock unlock;</div><div class='add'>+	void *lock_arg;</div><div class='add'>+</div><div class='ctx'> 	unsigned int max_register;</div><div class='ctx'> 	bool max_register_is_0;</div><div class='ctx'> 	const struct regmap_access_table *wr_table;</div><div class='hunk'>@@ -448,18 +462,16 @@ struct regmap_config {</div><div class='ctx'> 	bool use_relaxed_mmio;</div><div class='ctx'> 	bool can_multi_write;</div><div class='ctx'> </div><div class='del'>-	enum regmap_endian reg_format_endian;</div><div class='del'>-	enum regmap_endian val_format_endian;</div><div class='del'>-</div><div class='del'>-	const struct regmap_range_cfg *ranges;</div><div class='del'>-	unsigned int num_ranges;</div><div class='del'>-</div><div class='ctx'> 	bool use_hwlock;</div><div class='ctx'> 	bool use_raw_spinlock;</div><div class='ctx'> 	unsigned int hwlock_id;</div><div class='ctx'> 	unsigned int hwlock_mode;</div><div class='ctx'> </div><div class='del'>-	bool can_sleep;</div><div class='add'>+	enum regmap_endian reg_format_endian;</div><div class='add'>+	enum regmap_endian val_format_endian;</div><div class='add'>+</div><div class='add'>+	const struct regmap_range_cfg *ranges;</div><div class='add'>+	unsigned int num_ranges;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -499,6 +511,32 @@ struct regmap_range_cfg {</div><div class='ctx'> 	unsigned int window_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct regmap_sdw_mbq_cfg - Configuration for Multi-Byte Quantities</div><div class='add'>+ *</div><div class='add'>+ * @mbq_size: Callback returning the actual size of the given register.</div><div class='add'>+ * @deferrable: Callback returning true if the hardware can defer</div><div class='add'>+ *              transactions to the given register. Deferral should</div><div class='add'>+ *              only be used by SDCA parts and typically which controls</div><div class='add'>+ *              are deferrable will be specified in either as a hard</div><div class='add'>+ *              coded list or from the DisCo tables in the platform</div><div class='add'>+ *              firmware.</div><div class='add'>+ *</div><div class='add'>+ * @timeout_us: The time in microseconds after which waiting for a deferred</div><div class='add'>+ *              transaction should time out.</div><div class='add'>+ * @retry_us: The time in microseconds between polls of the function busy</div><div class='add'>+ *            status whilst waiting for an opportunity to retry a deferred</div><div class='add'>+ *            transaction.</div><div class='add'>+ *</div><div class='add'>+ * Provides additional configuration required for SoundWire MBQ register maps.</div><div class='add'>+ */</div><div class='add'>+struct regmap_sdw_mbq_cfg {</div><div class='add'>+	int (*mbq_size)(struct device *dev, unsigned int reg);</div><div class='add'>+	bool (*deferrable)(struct device *dev, unsigned int reg);</div><div class='add'>+	unsigned long timeout_us;</div><div class='add'>+	unsigned long retry_us;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct regmap_async;</div><div class='ctx'> </div><div class='ctx'> typedef int (*regmap_hw_write)(void *context, const void *data,</div><div class='hunk'>@@ -643,8 +681,9 @@ struct regmap *__regmap_init_sdw(struct sdw_slave *sdw,</div><div class='ctx'> 				 const struct regmap_config *config,</div><div class='ctx'> 				 struct lock_class_key *lock_key,</div><div class='ctx'> 				 const char *lock_name);</div><div class='del'>-struct regmap *__regmap_init_sdw_mbq(struct sdw_slave *sdw,</div><div class='add'>+struct regmap *__regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw,</div><div class='ctx'> 				     const struct regmap_config *config,</div><div class='add'>+				     const struct regmap_sdw_mbq_cfg *mbq_config,</div><div class='ctx'> 				     struct lock_class_key *lock_key,</div><div class='ctx'> 				     const char *lock_name);</div><div class='ctx'> struct regmap *__regmap_init_spi_avmm(struct spi_device *spi,</div><div class='hunk'>@@ -704,8 +743,9 @@ struct regmap *__devm_regmap_init_sdw(struct sdw_slave *sdw,</div><div class='ctx'> 				 const struct regmap_config *config,</div><div class='ctx'> 				 struct lock_class_key *lock_key,</div><div class='ctx'> 				 const char *lock_name);</div><div class='del'>-struct regmap *__devm_regmap_init_sdw_mbq(struct sdw_slave *sdw,</div><div class='add'>+struct regmap *__devm_regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw,</div><div class='ctx'> 					  const struct regmap_config *config,</div><div class='add'>+					  const struct regmap_sdw_mbq_cfg *mbq_config,</div><div class='ctx'> 					  struct lock_class_key *lock_key,</div><div class='ctx'> 					  const char *lock_name);</div><div class='ctx'> struct regmap *__devm_regmap_init_slimbus(struct slim_device *slimbus,</div><div class='hunk'>@@ -878,7 +918,7 @@ int regmap_attach_dev(struct device *dev, struct regmap *map,</div><div class='ctx'>  * @config: Configuration for register map</div><div class='ctx'>  *</div><div class='ctx'>  * The return value will be an ERR_PTR() on error or a valid pointer to</div><div class='del'>- * a struct regmap.</div><div class='add'>+ * a struct regmap. Implies 'fast_io'.</div><div class='ctx'>  */</div><div class='ctx'> #define regmap_init_mmio_clk(dev, clk_id, regs, config)			\</div><div class='ctx'> 	__regmap_lockdep_wrapper(__regmap_init_mmio_clk, #config,	\</div><div class='hunk'>@@ -892,7 +932,7 @@ int regmap_attach_dev(struct device *dev, struct regmap *map,</div><div class='ctx'>  * @config: Configuration for register map</div><div class='ctx'>  *</div><div class='ctx'>  * The return value will be an ERR_PTR() on error or a valid pointer to</div><div class='del'>- * a struct regmap.</div><div class='add'>+ * a struct regmap. Implies 'fast_io'.</div><div class='ctx'>  */</div><div class='ctx'> #define regmap_init_mmio(dev, regs, config)		\</div><div class='ctx'> 	regmap_init_mmio_clk(dev, NULL, regs, config)</div><div class='hunk'>@@ -935,7 +975,22 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);</div><div class='ctx'>  */</div><div class='ctx'> #define regmap_init_sdw_mbq(sdw, config)					\</div><div class='ctx'> 	__regmap_lockdep_wrapper(__regmap_init_sdw_mbq, #config,		\</div><div class='del'>-				sdw, config)</div><div class='add'>+				&amp;sdw-&gt;dev, sdw, config, NULL)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * regmap_init_sdw_mbq_cfg() - Initialise MBQ SDW register map with config</div><div class='add'>+ *</div><div class='add'>+ * @sdw: Device that will be interacted with</div><div class='add'>+ * @config: Configuration for register map</div><div class='add'>+ * @mbq_config: Properties for the MBQ registers</div><div class='add'>+ *</div><div class='add'>+ * The return value will be an ERR_PTR() on error or a valid pointer</div><div class='add'>+ * to a struct regmap. The regmap will be automatically freed by the</div><div class='add'>+ * device management code.</div><div class='add'>+ */</div><div class='add'>+#define regmap_init_sdw_mbq_cfg(dev, sdw, config, mbq_config)		\</div><div class='add'>+	__regmap_lockdep_wrapper(__regmap_init_sdw_mbq, #config,	\</div><div class='add'>+				dev, sdw, config, mbq_config)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * regmap_init_spi_avmm() - Initialize register map for Intel SPI Slave</div><div class='hunk'>@@ -1088,7 +1143,7 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);</div><div class='ctx'>  *</div><div class='ctx'>  * The return value will be an ERR_PTR() on error or a valid pointer</div><div class='ctx'>  * to a struct regmap.  The regmap will be automatically freed by the</div><div class='del'>- * device management code.</div><div class='add'>+ * device management code. Implies 'fast_io'.</div><div class='ctx'>  */</div><div class='ctx'> #define devm_regmap_init_mmio_clk(dev, clk_id, regs, config)		\</div><div class='ctx'> 	__regmap_lockdep_wrapper(__devm_regmap_init_mmio_clk, #config,	\</div><div class='hunk'>@@ -1103,7 +1158,7 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);</div><div class='ctx'>  *</div><div class='ctx'>  * The return value will be an ERR_PTR() on error or a valid pointer</div><div class='ctx'>  * to a struct regmap.  The regmap will be automatically freed by the</div><div class='del'>- * device management code.</div><div class='add'>+ * device management code. Implies 'fast_io'.</div><div class='ctx'>  */</div><div class='ctx'> #define devm_regmap_init_mmio(dev, regs, config)		\</div><div class='ctx'> 	devm_regmap_init_mmio_clk(dev, NULL, regs, config)</div><div class='hunk'>@@ -1148,7 +1203,23 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);</div><div class='ctx'>  */</div><div class='ctx'> #define devm_regmap_init_sdw_mbq(sdw, config)			\</div><div class='ctx'> 	__regmap_lockdep_wrapper(__devm_regmap_init_sdw_mbq, #config,   \</div><div class='del'>-				sdw, config)</div><div class='add'>+				&amp;sdw-&gt;dev, sdw, config, NULL)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_regmap_init_sdw_mbq_cfg() - Initialise managed MBQ SDW register map with config</div><div class='add'>+ *</div><div class='add'>+ * @dev: Device that will be interacted with</div><div class='add'>+ * @sdw: SoundWire Device that will be interacted with</div><div class='add'>+ * @config: Configuration for register map</div><div class='add'>+ * @mbq_config: Properties for the MBQ registers</div><div class='add'>+ *</div><div class='add'>+ * The return value will be an ERR_PTR() on error or a valid pointer</div><div class='add'>+ * to a struct regmap. The regmap will be automatically freed by the</div><div class='add'>+ * device management code.</div><div class='add'>+ */</div><div class='add'>+#define devm_regmap_init_sdw_mbq_cfg(dev, sdw, config, mbq_config)	\</div><div class='add'>+	__regmap_lockdep_wrapper(__devm_regmap_init_sdw_mbq,		\</div><div class='add'>+				#config, dev, sdw, config, mbq_config)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * devm_regmap_init_slimbus() - Initialise managed register map</div><div class='hunk'>@@ -1230,12 +1301,15 @@ int regmap_multi_reg_write_bypassed(struct regmap *map,</div><div class='ctx'> int regmap_raw_write_async(struct regmap *map, unsigned int reg,</div><div class='ctx'> 			   const void *val, size_t val_len);</div><div class='ctx'> int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val);</div><div class='add'>+int regmap_read_bypassed(struct regmap *map, unsigned int reg, unsigned int *val);</div><div class='ctx'> int regmap_raw_read(struct regmap *map, unsigned int reg,</div><div class='ctx'> 		    void *val, size_t val_len);</div><div class='ctx'> int regmap_noinc_read(struct regmap *map, unsigned int reg,</div><div class='ctx'> 		      void *val, size_t val_len);</div><div class='ctx'> int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,</div><div class='ctx'> 		     size_t val_count);</div><div class='add'>+int regmap_multi_reg_read(struct regmap *map, const unsigned int *reg, void *val,</div><div class='add'>+			  size_t val_count);</div><div class='ctx'> int regmap_update_bits_base(struct regmap *map, unsigned int reg,</div><div class='ctx'> 			    unsigned int mask, unsigned int val,</div><div class='ctx'> 			    bool *change, bool async, bool force);</div><div class='hunk'>@@ -1284,6 +1358,7 @@ bool regmap_can_raw_write(struct regmap *map);</div><div class='ctx'> size_t regmap_get_raw_read_max(struct regmap *map);</div><div class='ctx'> size_t regmap_get_raw_write_max(struct regmap *map);</div><div class='ctx'> </div><div class='add'>+void regcache_sort_defaults(struct reg_default *defaults, unsigned int ndefaults);</div><div class='ctx'> int regcache_sync(struct regmap *map);</div><div class='ctx'> int regcache_sync_region(struct regmap *map, unsigned int min,</div><div class='ctx'> 			 unsigned int max);</div><div class='hunk'>@@ -1325,6 +1400,15 @@ static inline int regmap_clear_bits(struct regmap *map,</div><div class='ctx'> 	return regmap_update_bits_base(map, reg, bits, 0, NULL, false, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int regmap_assign_bits(struct regmap *map, unsigned int reg,</div><div class='add'>+				     unsigned int bits, bool value)</div><div class='add'>+{</div><div class='add'>+	if (value)</div><div class='add'>+		return regmap_set_bits(map, reg, bits);</div><div class='add'>+	else</div><div class='add'>+		return regmap_clear_bits(map, reg, bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int regmap_test_bits(struct regmap *map, unsigned int reg, unsigned int bits);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1518,6 +1602,9 @@ struct regmap_irq_chip_data;</div><div class='ctx'>  * struct regmap_irq_chip - Description of a generic regmap irq_chip.</div><div class='ctx'>  *</div><div class='ctx'>  * @name:        Descriptive name for IRQ controller.</div><div class='add'>+ * @domain_suffix: Name suffix to be appended to end of IRQ domain name. Needed</div><div class='add'>+ *		   when multiple regmap-IRQ controllers are created from same</div><div class='add'>+ *		   device.</div><div class='ctx'>  *</div><div class='ctx'>  * @main_status: Base main status register address. For chips which have</div><div class='ctx'>  *		 interrupts arranged in separate sub-irq blocks with own IRQ</div><div class='hunk'>@@ -1560,7 +1647,9 @@ struct regmap_irq_chip_data;</div><div class='ctx'>  * @ack_invert:  Inverted ack register: cleared bits for ack.</div><div class='ctx'>  * @clear_ack:  Use this to set 1 and 0 or vice-versa to clear interrupts.</div><div class='ctx'>  * @status_invert: Inverted status register: cleared bits are active interrupts.</div><div class='del'>- * @wake_invert: Inverted wake register: cleared bits are wake enabled.</div><div class='add'>+ * @status_is_level: Status register is actuall signal level: Xor status</div><div class='add'>+ *		     register with previous value to get active interrupts.</div><div class='add'>+ * @wake_invert: Inverted wake register: cleared bits are wake disabled.</div><div class='ctx'>  * @type_in_mask: Use the mask registers for controlling irq type. Use this if</div><div class='ctx'>  *		  the hardware provides separate bits for rising/falling edge</div><div class='ctx'>  *		  or low/high level interrupts and they should be combined into</div><div class='hunk'>@@ -1603,10 +1692,11 @@ struct regmap_irq_chip_data;</div><div class='ctx'>  */</div><div class='ctx'> struct regmap_irq_chip {</div><div class='ctx'> 	const char *name;</div><div class='add'>+	const char *domain_suffix;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int main_status;</div><div class='ctx'> 	unsigned int num_main_status_bits;</div><div class='del'>-	struct regmap_irq_sub_irq_map *sub_reg_offsets;</div><div class='add'>+	const struct regmap_irq_sub_irq_map *sub_reg_offsets;</div><div class='ctx'> 	int num_main_regs;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int status_base;</div><div class='hunk'>@@ -1622,6 +1712,7 @@ struct regmap_irq_chip {</div><div class='ctx'> 	unsigned int ack_invert:1;</div><div class='ctx'> 	unsigned int clear_ack:1;</div><div class='ctx'> 	unsigned int status_invert:1;</div><div class='add'>+	unsigned int status_is_level:1;</div><div class='ctx'> 	unsigned int wake_invert:1;</div><div class='ctx'> 	unsigned int type_in_mask:1;</div><div class='ctx'> 	unsigned int clear_on_unmask:1;</div><div class='hunk'>@@ -1739,6 +1830,13 @@ static inline int regmap_read(struct regmap *map, unsigned int reg,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int regmap_read_bypassed(struct regmap *map, unsigned int reg,</div><div class='add'>+				       unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	WARN_ONCE(1, "regmap API is disabled");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int regmap_raw_read(struct regmap *map, unsigned int reg,</div><div class='ctx'> 				  void *val, size_t val_len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1782,6 +1880,13 @@ static inline int regmap_clear_bits(struct regmap *map,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int regmap_assign_bits(struct regmap *map, unsigned int reg,</div><div class='add'>+				     unsigned int bits, bool value)</div><div class='add'>+{</div><div class='add'>+	WARN_ONCE(1, "regmap API is disabled");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int regmap_test_bits(struct regmap *map,</div><div class='ctx'> 				   unsigned int reg, unsigned int bits)</div><div class='ctx'> {</div><div class='hunk'>@@ -1948,6 +2053,12 @@ static inline bool regmap_might_sleep(struct regmap *map)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void regcache_sort_defaults(struct reg_default *defaults,</div><div class='add'>+					  unsigned int ndefaults)</div><div class='add'>+{</div><div class='add'>+	WARN_ONCE(1, "regmap API is disabled");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int regcache_sync(struct regmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ONCE(1, "regmap API is disabled");</div><div class='head'>diff --git a/include/linux/regset.h b/include/linux/regset.h<br/>index 9061266dd8de..ad1ca6fe04f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/regset.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regset.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regset.h</a></div><div class='hunk'>@@ -151,7 +151,8 @@ typedef int user_regset_writeback_fn(struct task_struct *target,</div><div class='ctx'>  * @align:		Required alignment, in bytes.</div><div class='ctx'>  * @bias:		Bias from natural indexing.</div><div class='ctx'>  * @core_note_type:	ELF note @n_type value used in core dumps.</div><div class='del'>- * @get:		Function to fetch values.</div><div class='add'>+ * @core_note_name:	ELF note name to qualify the note type.</div><div class='add'>+ * @regset_get:		Function to fetch values.</div><div class='ctx'>  * @set:		Function to store values.</div><div class='ctx'>  * @active:		Function to report if regset is active, or %NULL.</div><div class='ctx'>  * @writeback:		Function to write data back to user memory, or %NULL.</div><div class='hunk'>@@ -190,6 +191,10 @@ typedef int user_regset_writeback_fn(struct task_struct *target,</div><div class='ctx'>  *</div><div class='ctx'>  * If nonzero, @core_note_type gives the n_type field (NT_* value)</div><div class='ctx'>  * of the core file note in which this regset's data appears.</div><div class='add'>+ * @core_note_name specifies the note name.  The preferred way to</div><div class='add'>+ * specify these two fields is to use the @USER_REGSET_NOTE_TYPE()</div><div class='add'>+ * macro.</div><div class='add'>+ *</div><div class='ctx'>  * NT_PRSTATUS is a special case in that the regset data starts at</div><div class='ctx'>  * offsetof(struct elf_prstatus, pr_reg) into the note data; that is</div><div class='ctx'>  * part of the per-machine ELF formats userland knows about.  In</div><div class='hunk'>@@ -207,8 +212,13 @@ struct user_regset {</div><div class='ctx'> 	unsigned int 			align;</div><div class='ctx'> 	unsigned int 			bias;</div><div class='ctx'> 	unsigned int 			core_note_type;</div><div class='add'>+	const char			*core_note_name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define USER_REGSET_NOTE_TYPE(type) \</div><div class='add'>+	.core_note_type			= (NT_ ## type), \</div><div class='add'>+	.core_note_name			= (NN_ ## type)</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct user_regset_view - available regsets</div><div class='ctx'>  * @name:	Identifier, e.g. UTS_MACHINE string.</div><div class='head'>diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h<br/>index 4660582a3302..56fe2693d9b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/consumer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/consumer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/consumer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regulator/consumer.h</a></div><div class='hunk'>@@ -128,11 +128,11 @@ struct regulator;</div><div class='ctx'>  *</div><div class='ctx'>  * @supply:       The name of the supply.  Initialised by the user before</div><div class='ctx'>  *                using the bulk regulator APIs.</div><div class='add'>+ * @consumer:     The regulator consumer for the supply.  This will be managed</div><div class='add'>+ *                by the bulk API.</div><div class='ctx'>  * @init_load_uA: After getting the regulator, regulator_set_load() will be</div><div class='ctx'>  *                called with this load.  Initialised by the user before</div><div class='ctx'>  *                using the bulk regulator APIs.</div><div class='del'>- * @consumer:     The regulator consumer for the supply.  This will be managed</div><div class='del'>- *                by the bulk API.</div><div class='ctx'>  *</div><div class='ctx'>  * The regulator APIs provide a series of regulator_bulk_() API calls as</div><div class='ctx'>  * a convenience to consumers which require multiple supplies.  This</div><div class='hunk'>@@ -140,8 +140,8 @@ struct regulator;</div><div class='ctx'>  */</div><div class='ctx'> struct regulator_bulk_data {</div><div class='ctx'> 	const char *supply;</div><div class='del'>-	int init_load_uA;</div><div class='ctx'> 	struct regulator *consumer;</div><div class='add'>+	int init_load_uA;</div><div class='ctx'> </div><div class='ctx'> 	/* private: Internal use */</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -164,6 +164,7 @@ struct regulator *__must_check devm_regulator_get_optional(struct device *dev,</div><div class='ctx'> 							   const char *id);</div><div class='ctx'> int devm_regulator_get_enable(struct device *dev, const char *id);</div><div class='ctx'> int devm_regulator_get_enable_optional(struct device *dev, const char *id);</div><div class='add'>+int devm_regulator_get_enable_read_voltage(struct device *dev, const char *id);</div><div class='ctx'> void regulator_put(struct regulator *regulator);</div><div class='ctx'> void devm_regulator_put(struct regulator *regulator);</div><div class='ctx'> </div><div class='hunk'>@@ -199,8 +200,6 @@ int regulator_disable_deferred(struct regulator *regulator, int ms);</div><div class='ctx'> </div><div class='ctx'> int __must_check regulator_bulk_get(struct device *dev, int num_consumers,</div><div class='ctx'> 				    struct regulator_bulk_data *consumers);</div><div class='del'>-int __must_check of_regulator_bulk_get_all(struct device *dev, struct device_node *np,</div><div class='del'>-					   struct regulator_bulk_data **consumers);</div><div class='ctx'> int __must_check devm_regulator_bulk_get(struct device *dev, int num_consumers,</div><div class='ctx'> 					 struct regulator_bulk_data *consumers);</div><div class='ctx'> void devm_regulator_bulk_put(struct regulator_bulk_data *consumers);</div><div class='hunk'>@@ -234,6 +233,11 @@ int regulator_sync_voltage(struct regulator *regulator);</div><div class='ctx'> int regulator_set_current_limit(struct regulator *regulator,</div><div class='ctx'> 			       int min_uA, int max_uA);</div><div class='ctx'> int regulator_get_current_limit(struct regulator *regulator);</div><div class='add'>+int regulator_get_unclaimed_power_budget(struct regulator *regulator);</div><div class='add'>+int regulator_request_power_budget(struct regulator *regulator,</div><div class='add'>+				   unsigned int pw_req);</div><div class='add'>+void regulator_free_power_budget(struct regulator *regulator,</div><div class='add'>+				 unsigned int pw);</div><div class='ctx'> </div><div class='ctx'> int regulator_set_mode(struct regulator *regulator, unsigned int mode);</div><div class='ctx'> unsigned int regulator_get_mode(struct regulator *regulator);</div><div class='hunk'>@@ -249,6 +253,7 @@ int regulator_get_hardware_vsel_register(struct regulator *regulator,</div><div class='ctx'> 					 unsigned *vsel_mask);</div><div class='ctx'> int regulator_list_hardware_vsel(struct regulator *regulator,</div><div class='ctx'> 				 unsigned selector);</div><div class='add'>+int regulator_hardware_enable(struct regulator *regulator, bool enable);</div><div class='ctx'> </div><div class='ctx'> /* regulator notifier block */</div><div class='ctx'> int regulator_register_notifier(struct regulator *regulator,</div><div class='hunk'>@@ -320,12 +325,18 @@ devm_regulator_get_exclusive(struct device *dev, const char *id)</div><div class='ctx'> </div><div class='ctx'> static inline int devm_regulator_get_enable(struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return -ENODEV;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int devm_regulator_get_enable_optional(struct device *dev,</div><div class='ctx'> 						     const char *id)</div><div class='ctx'> {</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int devm_regulator_get_enable_read_voltage(struct device *dev,</div><div class='add'>+							 const char *id)</div><div class='add'>+{</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -438,8 +449,10 @@ static inline int devm_regulator_bulk_get(struct device *dev, int num_consumers,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int of_regulator_bulk_get_all(struct device *dev, struct device_node *np,</div><div class='del'>-					    struct regulator_bulk_data **consumers)</div><div class='add'>+static inline int devm_regulator_bulk_get_const(</div><div class='add'>+	struct device *dev, int num_consumers,</div><div class='add'>+	const struct regulator_bulk_data *in_consumers,</div><div class='add'>+	struct regulator_bulk_data **out_consumers)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -518,6 +531,22 @@ static inline int regulator_get_current_limit(struct regulator *regulator)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int regulator_get_unclaimed_power_budget(struct regulator *regulator)</div><div class='add'>+{</div><div class='add'>+	return INT_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int regulator_request_power_budget(struct regulator *regulator,</div><div class='add'>+						 unsigned int pw_req)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void regulator_free_power_budget(struct regulator *regulator,</div><div class='add'>+					       unsigned int pw)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int regulator_set_mode(struct regulator *regulator,</div><div class='ctx'> 	unsigned int mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -564,6 +593,12 @@ static inline int regulator_list_hardware_vsel(struct regulator *regulator,</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int regulator_hardware_enable(struct regulator *regulator,</div><div class='add'>+					    bool enable)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int regulator_register_notifier(struct regulator *regulator,</div><div class='ctx'> 			      struct notifier_block *nb)</div><div class='ctx'> {</div><div class='hunk'>@@ -641,6 +676,44 @@ regulator_is_equal(struct regulator *reg1, struct regulator *reg2)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_OF) &amp;&amp; IS_ENABLED(CONFIG_REGULATOR)</div><div class='add'>+struct regulator *__must_check of_regulator_get(struct device *dev,</div><div class='add'>+						struct device_node *node,</div><div class='add'>+						const char *id);</div><div class='add'>+struct regulator *__must_check devm_of_regulator_get(struct device *dev,</div><div class='add'>+						     struct device_node *node,</div><div class='add'>+						     const char *id);</div><div class='add'>+struct regulator *__must_check of_regulator_get_optional(struct device *dev,</div><div class='add'>+							 struct device_node *node,</div><div class='add'>+							 const char *id);</div><div class='add'>+struct regulator *__must_check devm_of_regulator_get_optional(struct device *dev,</div><div class='add'>+							      struct device_node *node,</div><div class='add'>+							      const char *id);</div><div class='add'>+int __must_check of_regulator_bulk_get_all(struct device *dev, struct device_node *np,</div><div class='add'>+					   struct regulator_bulk_data **consumers);</div><div class='add'>+#else</div><div class='add'>+static inline struct regulator *__must_check of_regulator_get_optional(struct device *dev,</div><div class='add'>+								       struct device_node *node,</div><div class='add'>+								       const char *id)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct regulator *__must_check devm_of_regulator_get_optional(struct device *dev,</div><div class='add'>+									    struct device_node *node,</div><div class='add'>+									    const char *id)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int of_regulator_bulk_get_all(struct device *dev, struct device_node *np,</div><div class='add'>+					    struct regulator_bulk_data **consumers)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline int regulator_set_voltage_triplet(struct regulator *regulator,</div><div class='ctx'> 						int min_uV, int target_uV,</div><div class='ctx'> 						int max_uV)</div><div class='head'>diff --git a/include/linux/regulator/coupler.h b/include/linux/regulator/coupler.h<br/>index 73291f280a23..5e314a4294fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/coupler.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/coupler.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/coupler.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regulator/coupler.h</a></div><div class='hunk'>@@ -8,7 +8,8 @@</div><div class='ctx'> #ifndef __LINUX_REGULATOR_COUPLER_H_</div><div class='ctx'> #define __LINUX_REGULATOR_COUPLER_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct regulator_coupler;</div><div class='head'>diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h<br/>index 22a07c0900a4..978cf593b662 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regulator/driver.h</a></div><div class='hunk'>@@ -269,6 +269,11 @@ enum regulator_type {</div><div class='ctx'>  *               config but it cannot store it for later usage.</div><div class='ctx'>  *               Callback should return 0 on success or negative ERRNO</div><div class='ctx'>  *               indicating failure.</div><div class='add'>+ * @init_cb: Optional callback called after the parsing of init_data.</div><div class='add'>+ *           Allows the regulator to perform runtime init if necessary,</div><div class='add'>+ *           such as synching the regulator and the parsed constraints.</div><div class='add'>+ *           Callback should return 0 on success or negative ERRNO</div><div class='add'>+ *           indicating failure.</div><div class='ctx'>  * @id: Numerical identifier for the regulator.</div><div class='ctx'>  * @ops: Regulator operations table.</div><div class='ctx'>  * @irq: Interrupt number for the regulator.</div><div class='hunk'>@@ -299,6 +304,8 @@ enum regulator_type {</div><div class='ctx'>  * @vsel_range_reg: Register for range selector when using pickable ranges</div><div class='ctx'>  *		    and ``regulator_map_*_voltage_*_pickable`` functions.</div><div class='ctx'>  * @vsel_range_mask: Mask for register bitfield used for range selector</div><div class='add'>+ * @range_applied_by_vsel: A flag to indicate that changes to vsel_range_reg</div><div class='add'>+ *			   are only effective after vsel_reg is written</div><div class='ctx'>  * @vsel_reg: Register for selector when using ``regulator_map_*_voltage_*``</div><div class='ctx'>  * @vsel_mask: Mask for register bitfield used for selector</div><div class='ctx'>  * @vsel_step: Specify the resolution of selector stepping when setting</div><div class='hunk'>@@ -363,6 +370,8 @@ struct regulator_desc {</div><div class='ctx'> 	int (*of_parse_cb)(struct device_node *,</div><div class='ctx'> 			    const struct regulator_desc *,</div><div class='ctx'> 			    struct regulator_config *);</div><div class='add'>+	int (*init_cb)(struct regulator_dev *,</div><div class='add'>+		       struct regulator_config *);</div><div class='ctx'> 	int id;</div><div class='ctx'> 	unsigned int continuous_voltage_range:1;</div><div class='ctx'> 	unsigned n_voltages;</div><div class='hunk'>@@ -389,6 +398,7 @@ struct regulator_desc {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int vsel_range_reg;</div><div class='ctx'> 	unsigned int vsel_range_mask;</div><div class='add'>+	bool range_applied_by_vsel;</div><div class='ctx'> 	unsigned int vsel_reg;</div><div class='ctx'> 	unsigned int vsel_mask;</div><div class='ctx'> 	unsigned int vsel_step;</div><div class='hunk'>@@ -646,6 +656,11 @@ struct regulator_dev {</div><div class='ctx'> 	int cached_err;</div><div class='ctx'> 	bool use_cached_err;</div><div class='ctx'> 	spinlock_t err_lock;</div><div class='add'>+</div><div class='add'>+	int pw_requested_mW;</div><div class='add'>+</div><div class='add'>+	/* regulator notification forwarding */</div><div class='add'>+	struct notifier_block supply_fwd_nb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h<br/>index 0cd76d264727..1fc440c5c4c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/machine.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/machine.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/machine.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regulator/machine.h</a></div><div class='hunk'>@@ -113,6 +113,7 @@ struct notification_limit {</div><div class='ctx'>  * @min_uA: Smallest current consumers may set.</div><div class='ctx'>  * @max_uA: Largest current consumers may set.</div><div class='ctx'>  * @ilim_uA: Maximum input current.</div><div class='add'>+ * @pw_budget_mW: Power budget for the regulator in mW.</div><div class='ctx'>  * @system_load: Load that isn't captured by any consumer requests.</div><div class='ctx'>  *</div><div class='ctx'>  * @over_curr_limits:		Limits for acting on over current.</div><div class='hunk'>@@ -185,6 +186,7 @@ struct regulation_constraints {</div><div class='ctx'> 	int max_uA;</div><div class='ctx'> 	int ilim_uA;</div><div class='ctx'> </div><div class='add'>+	int pw_budget_mW;</div><div class='ctx'> 	int system_load;</div><div class='ctx'> </div><div class='ctx'> 	/* used for coupled regulators */</div><div class='hunk'>@@ -273,8 +275,6 @@ struct regulator_consumer_supply {</div><div class='ctx'>  *               be usable.</div><div class='ctx'>  * @num_consumer_supplies: Number of consumer device supplies.</div><div class='ctx'>  * @consumer_supplies: Consumer device supply configuration.</div><div class='del'>- *</div><div class='del'>- * @regulator_init: Callback invoked when the regulator has been registered.</div><div class='ctx'>  * @driver_data: Data passed to regulator_init.</div><div class='ctx'>  */</div><div class='ctx'> struct regulator_init_data {</div><div class='hunk'>@@ -285,8 +285,7 @@ struct regulator_init_data {</div><div class='ctx'> 	int num_consumer_supplies;</div><div class='ctx'> 	struct regulator_consumer_supply *consumer_supplies;</div><div class='ctx'> </div><div class='del'>-	/* optional regulator machine specific init */</div><div class='del'>-	int (*regulator_init)(void *driver_data);</div><div class='add'>+	/* optional regulator machine specific data */</div><div class='ctx'> 	void *driver_data;	/* core does not touch this */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/regulator/max8952.h b/include/linux/regulator/max8952.h<br/>index 8712c091abf0..61dcd8e00a2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/max8952.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/max8952.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/max8952.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regulator/max8952.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * max8952.h - Voltage regulation for the Maxim 8952</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2010 Samsung Electrnoics</div><div class='add'>+ *  Copyright (C) 2010 Samsung Electronics</div><div class='ctx'>  *  MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/regulator/mt6363-regulator.h b/include/linux/regulator/mt6363-regulator.h<br/>new file mode 100644<br/>index 000000000000..60761f01d3ad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/mt6363-regulator.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regulator/mt6363-regulator.h</a></div><div class='hunk'>@@ -0,0 +1,330 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 MediaTek Inc.</div><div class='add'>+ * Copyright (c) 2025 Collabora Ltd</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_REGULATOR_MT6363_H</div><div class='add'>+#define __LINUX_REGULATOR_MT6363_H</div><div class='add'>+</div><div class='add'>+/* Register */</div><div class='add'>+#define MT6363_TOP_TRAP				0x6</div><div class='add'>+#define MT6363_TOP_TMA_KEY_L			0x36e</div><div class='add'>+#define MT6363_RG_BUCK0_EN_ADDR			0x210</div><div class='add'>+#define MT6363_RG_BUCK_VS2_EN_BIT		0</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK1_EN_BIT		1</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK2_EN_BIT		2</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK3_EN_BIT		3</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK4_EN_BIT		4</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK5_EN_BIT		5</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK6_EN_BIT		6</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK7_EN_BIT		7</div><div class='add'>+#define MT6363_RG_BUCK1_EN_ADDR			0x213</div><div class='add'>+#define MT6363_RG_BUCK_VS1_EN_BIT		0</div><div class='add'>+#define MT6363_RG_BUCK_VS3_EN_BIT		1</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_DIGRF_EN_BIT	4</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_MDFE_EN_BIT		5</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_MODEM_EN_BIT	6</div><div class='add'>+#define MT6363_RG_BUCK0_LP_ADDR			0x216</div><div class='add'>+#define MT6363_RG_BUCK_VS2_LP_BIT		0</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK1_LP_BIT		1</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK2_LP_BIT		2</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK3_LP_BIT		3</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK4_LP_BIT		4</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK5_LP_BIT		5</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK6_LP_BIT		6</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK7_LP_BIT		7</div><div class='add'>+#define MT6363_RG_BUCK1_LP_ADDR			0x219</div><div class='add'>+#define MT6363_RG_BUCK_VS1_LP_BIT		0</div><div class='add'>+#define MT6363_RG_BUCK_VS3_LP_BIT		1</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_DIGRF_LP_BIT	4</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_MDFE_LP_BIT		5</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_MODEM_LP_BIT	6</div><div class='add'>+#define MT6363_RG_BUCK_VS2_VOSEL_ADDR		0x21c</div><div class='add'>+#define MT6363_RG_BUCK_VS2_VOSEL_MASK		GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK1_VOSEL_ADDR	0x21d</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK1_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK2_VOSEL_ADDR	0x21e</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK2_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK3_VOSEL_ADDR	0x21f</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK3_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK4_VOSEL_ADDR	0x220</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK4_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK5_VOSEL_ADDR	0x221</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK5_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK6_VOSEL_ADDR	0x222</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK6_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK7_VOSEL_ADDR	0x223</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK7_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VS1_VOSEL_ADDR		0x224</div><div class='add'>+#define MT6363_RG_BUCK_VS1_VOSEL_MASK		GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_BUCK_VS3_VOSEL_ADDR		0x225</div><div class='add'>+#define MT6363_RG_BUCK_VS3_VOSEL_MASK		GENMASK(7, 0)</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_DIGRF_VOSEL_ADDR	0x228</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_DIGRF_VOSEL_MASK	GENMASK(6, 0)</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_MDFE_VOSEL_ADDR	0x229</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_MDFE_VOSEL_MASK	GENMASK(6, 0)</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_MODEM_VOSEL_ADDR	0x22a</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_MODEM_VOSEL_MASK	GENMASK(6, 0)</div><div class='add'>+#define MT6363_BUCK_TOP_KEY_PROT_LO		0x13fa</div><div class='add'>+#define MT6363_BUCK_VS2_WDTDBG_VOSEL_ADDR	0x13fc</div><div class='add'>+#define MT6363_BUCK_VBUCK1_WDTDBG_VOSEL_ADDR	0x13fd</div><div class='add'>+#define MT6363_BUCK_VBUCK2_WDTDBG_VOSEL_ADDR	0x13fe</div><div class='add'>+#define MT6363_BUCK_VBUCK3_WDTDBG_VOSEL_ADDR	0x13ff</div><div class='add'>+#define MT6363_BUCK_VBUCK4_WDTDBG_VOSEL_ADDR	0x1400</div><div class='add'>+#define MT6363_BUCK_VBUCK5_WDTDBG_VOSEL_ADDR	0x1401</div><div class='add'>+#define MT6363_BUCK_VBUCK6_WDTDBG_VOSEL_ADDR	0x1402</div><div class='add'>+#define MT6363_BUCK_VBUCK7_WDTDBG_VOSEL_ADDR	0x1403</div><div class='add'>+#define MT6363_BUCK_VS1_WDTDBG_VOSEL_ADDR	0x1404</div><div class='add'>+#define MT6363_BUCK_VS3_WDTDBG_VOSEL_ADDR	0x1405</div><div class='add'>+#define MT6363_RG_BUCK_EFUSE_RSV1		0x1417</div><div class='add'>+#define MT6363_RG_BUCK_EFUSE_RSV1_MASK		GENMASK(7, 4)</div><div class='add'>+#define MT6363_BUCK_VS2_OP_EN_0			0x145d</div><div class='add'>+#define MT6363_BUCK_VS2_HW_LP_MODE		0x1468</div><div class='add'>+#define MT6363_BUCK_VBUCK1_OP_EN_0		0x14dd</div><div class='add'>+#define MT6363_BUCK_VBUCK1_HW_LP_MODE		0x14e8</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK1_SSHUB_EN_ADDR	0x14ea</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK1_SSHUB_VOSEL_ADDR	0x14eb</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK1_SSHUB_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_BUCK_VBUCK2_OP_EN_0		0x155d</div><div class='add'>+#define MT6363_BUCK_VBUCK2_HW_LP_MODE		0x1568</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK2_SSHUB_EN_ADDR	0x156a</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK2_SSHUB_VOSEL_ADDR	0x156b</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK2_SSHUB_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_BUCK_VBUCK3_OP_EN_0		0x15dd</div><div class='add'>+#define MT6363_BUCK_VBUCK3_HW_LP_MODE		0x15e8</div><div class='add'>+#define MT6363_BUCK_VBUCK4_OP_EN_0		0x165d</div><div class='add'>+#define MT6363_BUCK_VBUCK4_HW_LP_MODE		0x1668</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK4_SSHUB_EN_ADDR	0x166a</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK4_SSHUB_VOSEL_ADDR	0x166b</div><div class='add'>+#define MT6363_RG_BUCK_VBUCK4_SSHUB_VOSEL_MASK	GENMASK(7, 0)</div><div class='add'>+#define MT6363_BUCK_VBUCK5_OP_EN_0		0x16dd</div><div class='add'>+#define MT6363_BUCK_VBUCK5_HW_LP_MODE		0x16e8</div><div class='add'>+#define MT6363_BUCK_VBUCK6_OP_EN_0		0x175d</div><div class='add'>+#define MT6363_BUCK_VBUCK6_HW_LP_MODE		0x1768</div><div class='add'>+#define MT6363_BUCK_VBUCK7_OP_EN_0		0x17dd</div><div class='add'>+#define MT6363_BUCK_VBUCK7_HW_LP_MODE		0x17e8</div><div class='add'>+#define MT6363_BUCK_VS1_OP_EN_0			0x185d</div><div class='add'>+#define MT6363_BUCK_VS1_HW_LP_MODE		0x1868</div><div class='add'>+#define MT6363_BUCK_VS3_OP_EN_0			0x18dd</div><div class='add'>+#define MT6363_BUCK_VS3_HW_LP_MODE		0x18e8</div><div class='add'>+#define MT6363_RG_VS1_FCCM_ADDR			0x1964</div><div class='add'>+#define MT6363_RG_VS1_FCCM_BIT			0</div><div class='add'>+#define MT6363_RG_VS3_FCCM_ADDR			0x1973</div><div class='add'>+#define MT6363_RG_VS3_FCCM_BIT			0</div><div class='add'>+#define MT6363_RG_BUCK0_FCCM_ADDR		0x1a02</div><div class='add'>+#define MT6363_RG_VBUCK1_FCCM_BIT		0</div><div class='add'>+#define MT6363_RG_VBUCK2_FCCM_BIT		1</div><div class='add'>+#define MT6363_RG_VBUCK3_FCCM_BIT		2</div><div class='add'>+#define MT6363_RG_VS2_FCCM_BIT			3</div><div class='add'>+#define MT6363_RG_BUCK0_1_FCCM_ADDR		0x1a82</div><div class='add'>+#define MT6363_RG_VBUCK4_FCCM_BIT		0</div><div class='add'>+#define MT6363_RG_VBUCK5_FCCM_BIT		1</div><div class='add'>+#define MT6363_RG_VBUCK6_FCCM_BIT		2</div><div class='add'>+#define MT6363_RG_VBUCK7_FCCM_BIT		3</div><div class='add'>+#define MT6363_RG_VCN13_VOSEL_ADDR		0x1b0f</div><div class='add'>+#define MT6363_RG_VCN13_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VEMC_VOSEL_ADDR		0x1b10</div><div class='add'>+#define MT6363_RG_VEMC_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VEMC_VOSEL_1_MASK		GENMASK(7, 4)</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUB_VOSEL_ADDR	0x1b14</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUB_VOSEL_MASK	GENMASK(6, 0)</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUM_VOSEL_ADDR	0x1b15</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUM_VOSEL_MASK	GENMASK(6, 0)</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUL_VOSEL_ADDR	0x1b16</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUL_VOSEL_MASK	GENMASK(6, 0)</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_APU_VOSEL_ADDR	0x1b17</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_APU_VOSEL_MASK	GENMASK(6, 0)</div><div class='add'>+#define MT6363_RG_VEMC_VOCAL_ADDR		0x1b1b</div><div class='add'>+#define MT6363_RG_VEMC_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_LDO_VCN15_ADDR		0x1b57</div><div class='add'>+#define MT6363_RG_LDO_VCN15_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VCN15_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VCN15_HW_LP_MODE		0x1b5b</div><div class='add'>+#define MT6363_LDO_VCN15_OP_EN0			0x1b5c</div><div class='add'>+#define MT6363_RG_LDO_VRF09_ADDR		0x1b65</div><div class='add'>+#define MT6363_RG_LDO_VRF09_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VRF09_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VRF09_HW_LP_MODE		0x1b69</div><div class='add'>+#define MT6363_LDO_VRF09_OP_EN0			0x1b6a</div><div class='add'>+#define MT6363_RG_LDO_VRF12_ADDR		0x1b73</div><div class='add'>+#define MT6363_RG_LDO_VRF12_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VRF12_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VRF12_HW_LP_MODE		0x1b77</div><div class='add'>+#define MT6363_LDO_VRF12_OP_EN0			0x1b78</div><div class='add'>+#define MT6363_RG_LDO_VRF13_ADDR		0x1b81</div><div class='add'>+#define MT6363_RG_LDO_VRF13_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VRF13_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VRF13_HW_LP_MODE		0x1b85</div><div class='add'>+#define MT6363_LDO_VRF13_OP_EN0			0x1b86</div><div class='add'>+#define MT6363_RG_LDO_VRF18_ADDR		0x1b8f</div><div class='add'>+#define MT6363_RG_LDO_VRF18_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VRF18_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VRF18_HW_LP_MODE		0x1b93</div><div class='add'>+#define MT6363_LDO_VRF18_OP_EN0			0x1b94</div><div class='add'>+#define MT6363_RG_LDO_VRFIO18_ADDR		0x1b9d</div><div class='add'>+#define MT6363_RG_LDO_VRFIO18_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VRFIO18_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VRFIO18_HW_LP_MODE		0x1ba1</div><div class='add'>+#define MT6363_LDO_VRFIO18_OP_EN0		0x1ba2</div><div class='add'>+#define MT6363_RG_LDO_VTREF18_ADDR		0x1bd7</div><div class='add'>+#define MT6363_RG_LDO_VTREF18_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VTREF18_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VTREF18_HW_LP_MODE		0x1bdb</div><div class='add'>+#define MT6363_LDO_VTREF18_OP_EN0		0x1bdc</div><div class='add'>+#define MT6363_RG_LDO_VAUX18_ADDR		0x1be5</div><div class='add'>+#define MT6363_RG_LDO_VAUX18_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VAUX18_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VAUX18_HW_LP_MODE		0x1be9</div><div class='add'>+#define MT6363_LDO_VAUX18_OP_EN0		0x1bea</div><div class='add'>+#define MT6363_RG_LDO_VEMC_ADDR			0x1bf3</div><div class='add'>+#define MT6363_RG_LDO_VEMC_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VEMC_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VEMC_HW_LP_MODE		0x1bf7</div><div class='add'>+#define MT6363_LDO_VEMC_OP_EN0			0x1bf8</div><div class='add'>+#define MT6363_RG_LDO_VUFS12_ADDR		0x1c01</div><div class='add'>+#define MT6363_RG_LDO_VUFS12_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VUFS12_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VUFS12_HW_LP_MODE		0x1c05</div><div class='add'>+#define MT6363_LDO_VUFS12_OP_EN0		0x1c06</div><div class='add'>+#define MT6363_RG_LDO_VUFS18_ADDR		0x1c0f</div><div class='add'>+#define MT6363_RG_LDO_VUFS18_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VUFS18_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VUFS18_HW_LP_MODE		0x1c13</div><div class='add'>+#define MT6363_LDO_VUFS18_OP_EN0		0x1c14</div><div class='add'>+#define MT6363_RG_LDO_VIO18_ADDR		0x1c1d</div><div class='add'>+#define MT6363_RG_LDO_VIO18_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VIO18_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VIO18_HW_LP_MODE		0x1c21</div><div class='add'>+#define MT6363_LDO_VIO18_OP_EN0			0x1c22</div><div class='add'>+#define MT6363_RG_LDO_VIO075_ADDR		0x1c57</div><div class='add'>+#define MT6363_RG_LDO_VIO075_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VIO075_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VIO075_HW_LP_MODE		0x1c5b</div><div class='add'>+#define MT6363_LDO_VIO075_OP_EN0		0x1c5c</div><div class='add'>+#define MT6363_RG_LDO_VA12_1_ADDR		0x1c65</div><div class='add'>+#define MT6363_RG_LDO_VA12_1_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VA12_1_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VA12_1_HW_LP_MODE		0x1c69</div><div class='add'>+#define MT6363_LDO_VA12_1_OP_EN0		0x1c6a</div><div class='add'>+#define MT6363_RG_LDO_VA12_2_ADDR		0x1c73</div><div class='add'>+#define MT6363_RG_LDO_VA12_2_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VA12_2_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VA12_2_HW_LP_MODE		0x1c77</div><div class='add'>+#define MT6363_LDO_VA12_2_OP_EN0		0x1c78</div><div class='add'>+#define MT6363_RG_LDO_VA15_ADDR			0x1c81</div><div class='add'>+#define MT6363_RG_LDO_VA15_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VA15_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VA15_HW_LP_MODE		0x1c85</div><div class='add'>+#define MT6363_LDO_VA15_OP_EN0			0x1c86</div><div class='add'>+#define MT6363_RG_LDO_VM18_ADDR			0x1c8f</div><div class='add'>+#define MT6363_RG_LDO_VM18_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VM18_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VM18_HW_LP_MODE		0x1c93</div><div class='add'>+#define MT6363_LDO_VM18_OP_EN0			0x1c94</div><div class='add'>+#define MT6363_RG_LDO_VCN13_ADDR		0x1cd7</div><div class='add'>+#define MT6363_RG_LDO_VCN13_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VCN13_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VCN13_HW_LP_MODE		0x1cdb</div><div class='add'>+#define MT6363_LDO_VCN13_OP_EN0			0x1ce4</div><div class='add'>+#define MT6363_LDO_VSRAM_DIGRF_HW_LP_MODE	0x1cf1</div><div class='add'>+#define MT6363_LDO_VSRAM_DIGRF_OP_EN0		0x1cfa</div><div class='add'>+#define MT6363_LDO_VSRAM_MDFE_HW_LP_MODE	0x1d5b</div><div class='add'>+#define MT6363_LDO_VSRAM_MDFE_OP_EN0		0x1d64</div><div class='add'>+#define MT6363_LDO_VSRAM_MODEM_HW_LP_MODE	0x1d76</div><div class='add'>+#define MT6363_LDO_VSRAM_MODEM_OP_EN0		0x1d7f</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUB_ADDR		0x1dd7</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUB_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUB_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VSRAM_CPUB_HW_LP_MODE	0x1ddb</div><div class='add'>+#define MT6363_LDO_VSRAM_CPUB_OP_EN0		0x1de4</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUM_ADDR		0x1ded</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUM_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUM_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VSRAM_CPUM_HW_LP_MODE	0x1df1</div><div class='add'>+#define MT6363_LDO_VSRAM_CPUM_OP_EN0		0x1dfa</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUL_ADDR		0x1e57</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUL_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_CPUL_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VSRAM_CPUL_HW_LP_MODE	0x1e5b</div><div class='add'>+#define MT6363_LDO_VSRAM_CPUL_OP_EN0		0x1e64</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_APU_ADDR		0x1e6d</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_APU_EN_BIT		0</div><div class='add'>+#define MT6363_RG_LDO_VSRAM_APU_LP_BIT		1</div><div class='add'>+#define MT6363_LDO_VSRAM_APU_HW_LP_MODE		0x1e71</div><div class='add'>+#define MT6363_LDO_VSRAM_APU_OP_EN0		0x1e7a</div><div class='add'>+#define MT6363_RG_VTREF18_VOCAL_ADDR		0x1ed8</div><div class='add'>+#define MT6363_RG_VTREF18_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VTREF18_VOSEL_ADDR		0x1ed9</div><div class='add'>+#define MT6363_RG_VTREF18_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VAUX18_VOCAL_ADDR		0x1edc</div><div class='add'>+#define MT6363_RG_VAUX18_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VAUX18_VOSEL_ADDR		0x1edd</div><div class='add'>+#define MT6363_RG_VAUX18_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VCN15_VOCAL_ADDR		0x1ee3</div><div class='add'>+#define MT6363_RG_VCN15_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VCN15_VOSEL_ADDR		0x1ee4</div><div class='add'>+#define MT6363_RG_VCN15_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VUFS18_VOCAL_ADDR		0x1ee7</div><div class='add'>+#define MT6363_RG_VUFS18_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VUFS18_VOSEL_ADDR		0x1ee8</div><div class='add'>+#define MT6363_RG_VUFS18_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VIO18_VOCAL_ADDR		0x1eeb</div><div class='add'>+#define MT6363_RG_VIO18_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VIO18_VOSEL_ADDR		0x1eec</div><div class='add'>+#define MT6363_RG_VIO18_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VM18_VOCAL_ADDR		0x1eef</div><div class='add'>+#define MT6363_RG_VM18_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VM18_VOSEL_ADDR		0x1ef0</div><div class='add'>+#define MT6363_RG_VM18_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VA15_VOCAL_ADDR		0x1ef3</div><div class='add'>+#define MT6363_RG_VA15_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VA15_VOSEL_ADDR		0x1ef4</div><div class='add'>+#define MT6363_RG_VA15_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRF18_VOCAL_ADDR		0x1ef7</div><div class='add'>+#define MT6363_RG_VRF18_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRF18_VOSEL_ADDR		0x1ef8</div><div class='add'>+#define MT6363_RG_VRF18_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRFIO18_VOCAL_ADDR		0x1efb</div><div class='add'>+#define MT6363_RG_VRFIO18_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRFIO18_VOSEL_ADDR		0x1efc</div><div class='add'>+#define MT6363_RG_VRFIO18_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VIO075_VOCFG_ADDR		0x1f01</div><div class='add'>+#define MT6363_RG_VIO075_VOCAL_ADDR		MT6363_RG_VIO075_VOCFG_ADDR</div><div class='add'>+#define MT6363_RG_VIO075_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VIO075_VOSEL_ADDR		MT6363_RG_VIO075_VOCFG_ADDR</div><div class='add'>+#define MT6363_RG_VIO075_VOSEL_MASK		GENMASK(6, 4)</div><div class='add'>+#define MT6363_RG_VCN13_VOCAL_ADDR		0x1f58</div><div class='add'>+#define MT6363_RG_VCN13_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VUFS12_VOCAL_ADDR		0x1f61</div><div class='add'>+#define MT6363_RG_VUFS12_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VUFS12_VOSEL_ADDR		0x1f62</div><div class='add'>+#define MT6363_RG_VUFS12_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VA12_1_VOCAL_ADDR		0x1f65</div><div class='add'>+#define MT6363_RG_VA12_1_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VA12_1_VOSEL_ADDR		0x1f66</div><div class='add'>+#define MT6363_RG_VA12_1_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VA12_2_VOCAL_ADDR		0x1f69</div><div class='add'>+#define MT6363_RG_VA12_2_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VA12_2_VOSEL_ADDR		0x1f6a</div><div class='add'>+#define MT6363_RG_VA12_2_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRF12_VOCAL_ADDR		0x1f6d</div><div class='add'>+#define MT6363_RG_VRF12_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRF12_VOSEL_ADDR		0x1f6e</div><div class='add'>+#define MT6363_RG_VRF12_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRF13_VOCAL_ADDR		0x1f71</div><div class='add'>+#define MT6363_RG_VRF13_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRF13_VOSEL_ADDR		0x1f72</div><div class='add'>+#define MT6363_RG_VRF13_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRF09_VOCAL_ADDR		0x1f78</div><div class='add'>+#define MT6363_RG_VRF09_VOCAL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_RG_VRF09_VOSEL_ADDR		0x1f79</div><div class='add'>+#define MT6363_RG_VRF09_VOSEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MT6363_ISINK_EN_CTRL0			0x21db</div><div class='add'>+#define MT6363_ISINK_CTRL0_MASK			GENMASK(7, 0)</div><div class='add'>+#define MT6363_ISINK_EN_CTRL1			0x21dc</div><div class='add'>+#define MT6363_ISINK_CTRL1_MASK			GENMASK(7, 4)</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_REGULATOR_MT6363_H */</div><div class='head'>diff --git a/include/linux/regulator/pca9450.h b/include/linux/regulator/pca9450.h<br/>index 505c908dbb81..0df8b3c48082 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/pca9450.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/regulator/pca9450.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/pca9450.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regulator/pca9450.h</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> enum pca9450_chip_type {</div><div class='ctx'> 	PCA9450_TYPE_PCA9450A = 0,</div><div class='ctx'> 	PCA9450_TYPE_PCA9450BC,</div><div class='add'>+	PCA9450_TYPE_PCA9451A,</div><div class='add'>+	PCA9450_TYPE_PCA9452,</div><div class='ctx'> 	PCA9450_TYPE_AMOUNT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +35,8 @@ enum {</div><div class='ctx'> 	PCA9450_DVS_LEVEL_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define PCA9450_RESTART_HANDLER_PRIORITY 130</div><div class='add'>+</div><div class='ctx'> #define PCA9450_BUCK1_VOLTAGE_NUM	0x80</div><div class='ctx'> #define PCA9450_BUCK2_VOLTAGE_NUM	0x80</div><div class='ctx'> #define PCA9450_BUCK3_VOLTAGE_NUM	0x80</div><div class='hunk'>@@ -219,12 +223,44 @@ enum {</div><div class='ctx'> #define IRQ_THERM_105			0x02</div><div class='ctx'> #define IRQ_THERM_125			0x01</div><div class='ctx'> </div><div class='add'>+/* PCA9450_REG_PWRCTRL bits */</div><div class='add'>+#define T_ON_DEB_MASK			0xC0</div><div class='add'>+#define T_ON_DEB_120US			(0 &lt;&lt; 6)</div><div class='add'>+#define T_ON_DEB_20MS			(1 &lt;&lt; 6)</div><div class='add'>+#define T_ON_DEB_100MS			(2 &lt;&lt; 6)</div><div class='add'>+#define T_ON_DEB_750MS			(3 &lt;&lt; 6)</div><div class='add'>+#define T_OFF_DEB_MASK			0x20</div><div class='add'>+#define T_OFF_DEB_120US			(0 &lt;&lt; 5)</div><div class='add'>+#define T_OFF_DEB_2MS			(1 &lt;&lt; 5)</div><div class='add'>+#define T_ON_STEP_MASK			0x18</div><div class='add'>+#define T_ON_STEP_1MS			(0 &lt;&lt; 3)</div><div class='add'>+#define T_ON_STEP_2MS			(1 &lt;&lt; 3)</div><div class='add'>+#define T_ON_STEP_4MS			(2 &lt;&lt; 3)</div><div class='add'>+#define T_ON_STEP_8MS			(3 &lt;&lt; 3)</div><div class='add'>+#define T_OFF_STEP_MASK			0x06</div><div class='add'>+#define T_OFF_STEP_2MS			(0 &lt;&lt; 1)</div><div class='add'>+#define T_OFF_STEP_4MS			(1 &lt;&lt; 1)</div><div class='add'>+#define T_OFF_STEP_8MS			(2 &lt;&lt; 1)</div><div class='add'>+#define T_OFF_STEP_16MS			(3 &lt;&lt; 1)</div><div class='add'>+#define T_RESTART_MASK			0x01</div><div class='add'>+#define T_RESTART_250MS			0</div><div class='add'>+#define T_RESTART_500MS			1</div><div class='add'>+</div><div class='ctx'> /* PCA9450_REG_RESET_CTRL bits */</div><div class='ctx'> #define WDOG_B_CFG_MASK			0xC0</div><div class='ctx'> #define WDOG_B_CFG_NONE			0x00</div><div class='ctx'> #define WDOG_B_CFG_WARM			0x40</div><div class='ctx'> #define WDOG_B_CFG_COLD_LDO12		0x80</div><div class='ctx'> #define WDOG_B_CFG_COLD			0xC0</div><div class='add'>+#define T_PMIC_RST_DEB_MASK		0x07</div><div class='add'>+#define T_PMIC_RST_DEB_10MS		0x00</div><div class='add'>+#define T_PMIC_RST_DEB_50MS		0x01</div><div class='add'>+#define T_PMIC_RST_DEB_100MS		0x02</div><div class='add'>+#define T_PMIC_RST_DEB_500MS		0x03</div><div class='add'>+#define T_PMIC_RST_DEB_1S		0x04</div><div class='add'>+#define T_PMIC_RST_DEB_2S		0x05</div><div class='add'>+#define T_PMIC_RST_DEB_4S		0x06</div><div class='add'>+#define T_PMIC_RST_DEB_8S		0x07</div><div class='ctx'> </div><div class='ctx'> /* PCA9450_REG_CONFIG2 bits */</div><div class='ctx'> #define I2C_LT_MASK			0x03</div><div class='hunk'>@@ -233,4 +269,7 @@ enum {</div><div class='ctx'> #define I2C_LT_ON_RUN			0x02</div><div class='ctx'> #define I2C_LT_FORCE_ENABLE		0x03</div><div class='ctx'> </div><div class='add'>+/* PCA9450_REG_SW_RST command */</div><div class='add'>+#define SW_RST_COMMAND			0x14</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_REG_PCA9450_H__ */</div><div class='head'>diff --git a/include/linux/regulator/s2dos05.h b/include/linux/regulator/s2dos05.h<br/>new file mode 100644<br/>index 000000000000..2e89fcbce769<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/regulator/s2dos05.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/regulator/s2dos05.h</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+// s2dos05.h</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2016 Samsung Electronics Co., Ltd</div><div class='add'>+//              http://www.samsung.com</div><div class='add'>+// Copyright (C) 2024 Dzmitry Sankouski &lt;dsankouski@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_S2DOS05_H</div><div class='add'>+#define __LINUX_S2DOS05_H</div><div class='add'>+</div><div class='add'>+// S2DOS05 registers</div><div class='add'>+// Slave Addr : 0xC0</div><div class='add'>+enum S2DOS05_reg {</div><div class='add'>+	S2DOS05_REG_DEV_ID,</div><div class='add'>+	S2DOS05_REG_TOPSYS_STAT,</div><div class='add'>+	S2DOS05_REG_STAT,</div><div class='add'>+	S2DOS05_REG_EN,</div><div class='add'>+	S2DOS05_REG_LDO1_CFG,</div><div class='add'>+	S2DOS05_REG_LDO2_CFG,</div><div class='add'>+	S2DOS05_REG_LDO3_CFG,</div><div class='add'>+	S2DOS05_REG_LDO4_CFG,</div><div class='add'>+	S2DOS05_REG_BUCK_CFG,</div><div class='add'>+	S2DOS05_REG_BUCK_VOUT,</div><div class='add'>+	S2DOS05_REG_IRQ_MASK = 0x0D,</div><div class='add'>+	S2DOS05_REG_SSD_TSD = 0x0E,</div><div class='add'>+	S2DOS05_REG_OCL = 0x10,</div><div class='add'>+	S2DOS05_REG_IRQ = 0x11</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// S2DOS05 regulator ids</div><div class='add'>+enum S2DOS05_regulators {</div><div class='add'>+	S2DOS05_LDO1,</div><div class='add'>+	S2DOS05_LDO2,</div><div class='add'>+	S2DOS05_LDO3,</div><div class='add'>+	S2DOS05_LDO4,</div><div class='add'>+	S2DOS05_BUCK1,</div><div class='add'>+	S2DOS05_REG_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define S2DOS05_IRQ_PWRMT_MASK	BIT(5)</div><div class='add'>+#define S2DOS05_IRQ_TSD_MASK	BIT(4)</div><div class='add'>+#define S2DOS05_IRQ_SSD_MASK	BIT(3)</div><div class='add'>+#define S2DOS05_IRQ_SCP_MASK	BIT(2)</div><div class='add'>+#define S2DOS05_IRQ_UVLO_MASK	BIT(1)</div><div class='add'>+#define S2DOS05_IRQ_OCD_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define S2DOS05_BUCK_MIN1	506250</div><div class='add'>+#define S2DOS05_LDO_MIN1	1500000</div><div class='add'>+#define S2DOS05_LDO_MIN2	2700000</div><div class='add'>+#define S2DOS05_BUCK_STEP1	6250</div><div class='add'>+#define S2DOS05_LDO_STEP1	25000</div><div class='add'>+#define S2DOS05_LDO_VSEL_MASK	0x7F</div><div class='add'>+#define S2DOS05_LDO_FD_MASK	0x80</div><div class='add'>+#define S2DOS05_BUCK_VSEL_MASK	0xFF</div><div class='add'>+#define S2DOS05_BUCK_FD_MASK	0x08</div><div class='add'>+</div><div class='add'>+#define S2DOS05_ENABLE_MASK_L1	BIT(0)</div><div class='add'>+#define S2DOS05_ENABLE_MASK_L2	BIT(1)</div><div class='add'>+#define S2DOS05_ENABLE_MASK_L3	BIT(2)</div><div class='add'>+#define S2DOS05_ENABLE_MASK_L4	BIT(3)</div><div class='add'>+#define S2DOS05_ENABLE_MASK_B1	BIT(4)</div><div class='add'>+</div><div class='add'>+#define S2DOS05_RAMP_DELAY	12000</div><div class='add'>+</div><div class='add'>+#define S2DOS05_ENABLE_TIME_LDO		50</div><div class='add'>+#define S2DOS05_ENABLE_TIME_BUCK	350</div><div class='add'>+</div><div class='add'>+#define S2DOS05_LDO_N_VOLTAGES	(S2DOS05_LDO_VSEL_MASK + 1)</div><div class='add'>+#define S2DOS05_BUCK_N_VOLTAGES (S2DOS05_BUCK_VSEL_MASK + 1)</div><div class='add'>+</div><div class='add'>+#define S2DOS05_REGULATOR_MAX	(S2DOS05_REG_MAX)</div><div class='add'>+</div><div class='add'>+#endif // __LINUX_S2DOS05_H</div><div class='head'>diff --git a/include/linux/relay.h b/include/linux/relay.h<br/>index 72b876dd5cb8..6772a7075840 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/relay.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/relay.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/relay.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/relay.h</a></div><div class='hunk'>@@ -29,6 +29,22 @@</div><div class='ctx'> #define RELAYFS_CHANNEL_VERSION		7</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Relay buffer statistics</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	RELAY_STATS_BUF_FULL = (1 &lt;&lt; 0),</div><div class='add'>+	RELAY_STATS_WRT_BIG = (1 &lt;&lt; 1),</div><div class='add'>+</div><div class='add'>+	RELAY_STATS_LAST = RELAY_STATS_WRT_BIG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rchan_buf_stats</div><div class='add'>+{</div><div class='add'>+	unsigned int full_count;	/* counter for buffer full */</div><div class='add'>+	unsigned int big_count;		/* counter for too big to write */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Per-cpu relay channel buffer</div><div class='ctx'>  */</div><div class='ctx'> struct rchan_buf</div><div class='hunk'>@@ -43,11 +59,11 @@ struct rchan_buf</div><div class='ctx'> 	struct irq_work wakeup_work;	/* reader wakeup */</div><div class='ctx'> 	struct dentry *dentry;		/* channel file dentry */</div><div class='ctx'> 	struct kref kref;		/* channel buffer refcount */</div><div class='add'>+	struct rchan_buf_stats stats;	/* buffer stats */</div><div class='ctx'> 	struct page **page_array;	/* array of current buffer pages */</div><div class='ctx'> 	unsigned int page_count;	/* number of current buffer pages */</div><div class='ctx'> 	unsigned int finalized;		/* buffer has been finalized */</div><div class='ctx'> 	size_t *padding;		/* padding counts per sub-buffer */</div><div class='del'>-	size_t prev_padding;		/* temporary variable */</div><div class='ctx'> 	size_t bytes_consumed;		/* bytes consumed in cur read subbuf */</div><div class='ctx'> 	size_t early_bytes;		/* bytes consumed before VFS inited */</div><div class='ctx'> 	unsigned int cpu;		/* this buf's cpu */</div><div class='hunk'>@@ -65,7 +81,6 @@ struct rchan</div><div class='ctx'> 	const struct rchan_callbacks *cb; /* client callbacks */</div><div class='ctx'> 	struct kref kref;		/* channel refcount */</div><div class='ctx'> 	void *private_data;		/* for user-defined data */</div><div class='del'>-	size_t last_toobig;		/* tried to log event &gt; subbuf size */</div><div class='ctx'> 	struct rchan_buf * __percpu *buf; /* per-cpu channel buffers */</div><div class='ctx'> 	int is_global;			/* One global buffer ? */</div><div class='ctx'> 	struct list_head list;		/* for channel list */</div><div class='hunk'>@@ -84,7 +99,6 @@ struct rchan_callbacks</div><div class='ctx'> 	 * @buf: the channel buffer containing the new sub-buffer</div><div class='ctx'> 	 * @subbuf: the start of the new sub-buffer</div><div class='ctx'> 	 * @prev_subbuf: the start of the previous sub-buffer</div><div class='del'>-	 * @prev_padding: unused space at the end of previous sub-buffer</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * The client should return 1 to continue logging, 0 to stop</div><div class='ctx'> 	 * logging.</div><div class='hunk'>@@ -100,8 +114,7 @@ struct rchan_callbacks</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*subbuf_start) (struct rchan_buf *buf,</div><div class='ctx'> 			     void *subbuf,</div><div class='del'>-			     void *prev_subbuf,</div><div class='del'>-			     size_t prev_padding);</div><div class='add'>+			     void *prev_subbuf);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * create_buf_file - create file to represent a relay channel buffer</div><div class='hunk'>@@ -159,11 +172,9 @@ struct rchan *relay_open(const char *base_filename,</div><div class='ctx'> 			 size_t n_subbufs,</div><div class='ctx'> 			 const struct rchan_callbacks *cb,</div><div class='ctx'> 			 void *private_data);</div><div class='del'>-extern int relay_late_setup_files(struct rchan *chan,</div><div class='del'>-				  const char *base_filename,</div><div class='del'>-				  struct dentry *parent);</div><div class='ctx'> extern void relay_close(struct rchan *chan);</div><div class='ctx'> extern void relay_flush(struct rchan *chan);</div><div class='add'>+size_t relay_stats(struct rchan *chan, int flags);</div><div class='ctx'> extern void relay_subbufs_consumed(struct rchan *chan,</div><div class='ctx'> 				   unsigned int cpu,</div><div class='ctx'> 				   size_t consumed);</div><div class='head'>diff --git a/include/linux/remoteproc/mtk_scp.h b/include/linux/remoteproc/mtk_scp.h<br/>index 7c2b7cc9fe6c..344ff41c22c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/remoteproc/mtk_scp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/remoteproc/mtk_scp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/remoteproc/mtk_scp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/remoteproc/mtk_scp.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@ enum scp_ipi_id {</div><div class='ctx'> 	SCP_IPI_CROS_HOST_CMD,</div><div class='ctx'> 	SCP_IPI_VDEC_LAT,</div><div class='ctx'> 	SCP_IPI_VDEC_CORE,</div><div class='add'>+	SCP_IPI_IMGSYS_CMD,</div><div class='ctx'> 	SCP_IPI_NS_SERVICE = 0xFF,</div><div class='ctx'> 	SCP_IPI_MAX = 0x100,</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h<br/>index a365f67131ec..54701668b3df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/resctrl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/resctrl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/resctrl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/resctrl.h</a></div><div class='hunk'>@@ -2,9 +2,15 @@</div><div class='ctx'> #ifndef _RESCTRL_H</div><div class='ctx'> #define _RESCTRL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cacheinfo.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/pid.h&gt;</div><div class='add'>+#include &lt;linux/resctrl_types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_CPU_RESCTRL</div><div class='add'>+#include &lt;asm/resctrl.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* CLOSID, RMID value used by the default control group */</div><div class='ctx'> #define RESCTRL_RESERVED_CLOSID		0</div><div class='hunk'>@@ -24,6 +30,34 @@ int proc_resctrl_show(struct seq_file *m,</div><div class='ctx'> /* max value for struct rdt_domain's mbps_val */</div><div class='ctx'> #define MBA_MAX_MBPS   U32_MAX</div><div class='ctx'> </div><div class='add'>+/* Walk all possible resources, with variants for only controls or monitors. */</div><div class='add'>+#define for_each_rdt_resource(_r)						\</div><div class='add'>+	for ((_r) = resctrl_arch_get_resource(0);				\</div><div class='add'>+	     (_r) &amp;&amp; (_r)-&gt;rid &lt; RDT_NUM_RESOURCES;				\</div><div class='add'>+	     (_r) = resctrl_arch_get_resource((_r)-&gt;rid + 1))</div><div class='add'>+</div><div class='add'>+#define for_each_capable_rdt_resource(r)				      \</div><div class='add'>+	for_each_rdt_resource((r))					      \</div><div class='add'>+		if ((r)-&gt;alloc_capable || (r)-&gt;mon_capable)</div><div class='add'>+</div><div class='add'>+#define for_each_alloc_capable_rdt_resource(r)				      \</div><div class='add'>+	for_each_rdt_resource((r))					      \</div><div class='add'>+		if ((r)-&gt;alloc_capable)</div><div class='add'>+</div><div class='add'>+#define for_each_mon_capable_rdt_resource(r)				      \</div><div class='add'>+	for_each_rdt_resource((r))					      \</div><div class='add'>+		if ((r)-&gt;mon_capable)</div><div class='add'>+</div><div class='add'>+enum resctrl_res_level {</div><div class='add'>+	RDT_RESOURCE_L3,</div><div class='add'>+	RDT_RESOURCE_L2,</div><div class='add'>+	RDT_RESOURCE_MBA,</div><div class='add'>+	RDT_RESOURCE_SMBA,</div><div class='add'>+</div><div class='add'>+	/* Must be the last */</div><div class='add'>+	RDT_NUM_RESOURCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * enum resctrl_conf_type - The type of configuration.</div><div class='ctx'>  * @CDP_NONE:	No prioritisation, both code and data are controlled or monitored.</div><div class='hunk'>@@ -39,13 +73,42 @@ enum resctrl_conf_type {</div><div class='ctx'> #define CDP_NUM_TYPES	(CDP_DATA + 1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Event IDs, the values match those used to program IA32_QM_EVTSEL before</div><div class='del'>- * reading IA32_QM_CTR on RDT systems.</div><div class='add'>+ * struct pseudo_lock_region - pseudo-lock region information</div><div class='add'>+ * @s:			Resctrl schema for the resource to which this</div><div class='add'>+ *			pseudo-locked region belongs</div><div class='add'>+ * @closid:		The closid that this pseudo-locked region uses</div><div class='add'>+ * @d:			RDT domain to which this pseudo-locked region</div><div class='add'>+ *			belongs</div><div class='add'>+ * @cbm:		bitmask of the pseudo-locked region</div><div class='add'>+ * @lock_thread_wq:	waitqueue used to wait on the pseudo-locking thread</div><div class='add'>+ *			completion</div><div class='add'>+ * @thread_done:	variable used by waitqueue to test if pseudo-locking</div><div class='add'>+ *			thread completed</div><div class='add'>+ * @cpu:		core associated with the cache on which the setup code</div><div class='add'>+ *			will be run</div><div class='add'>+ * @line_size:		size of the cache lines</div><div class='add'>+ * @size:		size of pseudo-locked region in bytes</div><div class='add'>+ * @kmem:		the kernel memory associated with pseudo-locked region</div><div class='add'>+ * @minor:		minor number of character device associated with this</div><div class='add'>+ *			region</div><div class='add'>+ * @debugfs_dir:	pointer to this region's directory in the debugfs</div><div class='add'>+ *			filesystem</div><div class='add'>+ * @pm_reqs:		Power management QoS requests related to this region</div><div class='ctx'>  */</div><div class='del'>-enum resctrl_event_id {</div><div class='del'>-	QOS_L3_OCCUP_EVENT_ID		= 0x01,</div><div class='del'>-	QOS_L3_MBM_TOTAL_EVENT_ID	= 0x02,</div><div class='del'>-	QOS_L3_MBM_LOCAL_EVENT_ID	= 0x03,</div><div class='add'>+struct pseudo_lock_region {</div><div class='add'>+	struct resctrl_schema	*s;</div><div class='add'>+	u32			closid;</div><div class='add'>+	struct rdt_ctrl_domain	*d;</div><div class='add'>+	u32			cbm;</div><div class='add'>+	wait_queue_head_t	lock_thread_wq;</div><div class='add'>+	int			thread_done;</div><div class='add'>+	int			cpu;</div><div class='add'>+	unsigned int		line_size;</div><div class='add'>+	unsigned int		size;</div><div class='add'>+	void			*kmem;</div><div class='add'>+	unsigned int		minor;</div><div class='add'>+	struct dentry		*debugfs_dir;</div><div class='add'>+	struct list_head	pm_reqs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -58,38 +121,78 @@ struct resctrl_staged_config {</div><div class='ctx'> 	bool			have_new_ctrl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum resctrl_domain_type {</div><div class='add'>+	RESCTRL_CTRL_DOMAIN,</div><div class='add'>+	RESCTRL_MON_DOMAIN,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * struct rdt_domain - group of CPUs sharing a resctrl resource</div><div class='add'>+ * struct rdt_domain_hdr - common header for different domain types</div><div class='ctx'>  * @list:		all instances of this resource</div><div class='ctx'>  * @id:			unique id for this instance</div><div class='add'>+ * @type:		type of this instance</div><div class='ctx'>  * @cpu_mask:		which CPUs share this resource</div><div class='del'>- * @rmid_busy_llc:	bitmap of which limbo RMIDs are above threshold</div><div class='del'>- * @mbm_total:		saved state for MBM total bandwidth</div><div class='del'>- * @mbm_local:		saved state for MBM local bandwidth</div><div class='del'>- * @mbm_over:		worker to periodically read MBM h/w counters</div><div class='del'>- * @cqm_limbo:		worker to periodically read CQM h/w counters</div><div class='del'>- * @mbm_work_cpu:	worker CPU for MBM h/w counters</div><div class='del'>- * @cqm_work_cpu:	worker CPU for CQM h/w counters</div><div class='add'>+ */</div><div class='add'>+struct rdt_domain_hdr {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	int				id;</div><div class='add'>+	enum resctrl_domain_type	type;</div><div class='add'>+	struct cpumask			cpu_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rdt_ctrl_domain - group of CPUs sharing a resctrl control resource</div><div class='add'>+ * @hdr:		common header for different domain types</div><div class='ctx'>  * @plr:		pseudo-locked region (if any) associated with domain</div><div class='ctx'>  * @staged_config:	parsed configuration to be applied</div><div class='ctx'>  * @mbps_val:		When mba_sc is enabled, this holds the array of user</div><div class='ctx'>  *			specified control values for mba_sc in MBps, indexed</div><div class='ctx'>  *			by closid</div><div class='ctx'>  */</div><div class='del'>-struct rdt_domain {</div><div class='del'>-	struct list_head		list;</div><div class='del'>-	int				id;</div><div class='del'>-	struct cpumask			cpu_mask;</div><div class='add'>+struct rdt_ctrl_domain {</div><div class='add'>+	struct rdt_domain_hdr		hdr;</div><div class='add'>+	struct pseudo_lock_region	*plr;</div><div class='add'>+	struct resctrl_staged_config	staged_config[CDP_NUM_TYPES];</div><div class='add'>+	u32				*mbps_val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mbm_cntr_cfg - Assignable counter configuration.</div><div class='add'>+ * @evtid:		MBM event to which the counter is assigned. Only valid</div><div class='add'>+ *			if @rdtgroup is not NULL.</div><div class='add'>+ * @rdtgrp:		resctrl group assigned to the counter. NULL if the</div><div class='add'>+ *			counter is free.</div><div class='add'>+ */</div><div class='add'>+struct mbm_cntr_cfg {</div><div class='add'>+	enum resctrl_event_id	evtid;</div><div class='add'>+	struct rdtgroup		*rdtgrp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rdt_mon_domain - group of CPUs sharing a resctrl monitor resource</div><div class='add'>+ * @hdr:		common header for different domain types</div><div class='add'>+ * @ci_id:		cache info id for this domain</div><div class='add'>+ * @rmid_busy_llc:	bitmap of which limbo RMIDs are above threshold</div><div class='add'>+ * @mbm_states:		Per-event pointer to the MBM event's saved state.</div><div class='add'>+ *			An MBM event's state is an array of struct mbm_state</div><div class='add'>+ *			indexed by RMID on x86 or combined CLOSID, RMID on Arm.</div><div class='add'>+ * @mbm_over:		worker to periodically read MBM h/w counters</div><div class='add'>+ * @cqm_limbo:		worker to periodically read CQM h/w counters</div><div class='add'>+ * @mbm_work_cpu:	worker CPU for MBM h/w counters</div><div class='add'>+ * @cqm_work_cpu:	worker CPU for CQM h/w counters</div><div class='add'>+ * @cntr_cfg:		array of assignable counters' configuration (indexed</div><div class='add'>+ *			by counter ID)</div><div class='add'>+ */</div><div class='add'>+struct rdt_mon_domain {</div><div class='add'>+	struct rdt_domain_hdr		hdr;</div><div class='add'>+	unsigned int			ci_id;</div><div class='ctx'> 	unsigned long			*rmid_busy_llc;</div><div class='del'>-	struct mbm_state		*mbm_total;</div><div class='del'>-	struct mbm_state		*mbm_local;</div><div class='add'>+	struct mbm_state		*mbm_states[QOS_NUM_L3_MBM_EVENTS];</div><div class='ctx'> 	struct delayed_work		mbm_over;</div><div class='ctx'> 	struct delayed_work		cqm_limbo;</div><div class='ctx'> 	int				mbm_work_cpu;</div><div class='ctx'> 	int				cqm_work_cpu;</div><div class='del'>-	struct pseudo_lock_region	*plr;</div><div class='del'>-	struct resctrl_staged_config	staged_config[CDP_NUM_TYPES];</div><div class='del'>-	u32				*mbps_val;</div><div class='add'>+	struct mbm_cntr_cfg		*cntr_cfg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -103,6 +206,8 @@ struct rdt_domain {</div><div class='ctx'>  * @arch_has_sparse_bitmasks:	True if a bitmask like f00f is valid.</div><div class='ctx'>  * @arch_has_per_cpu_cfg:	True if QOS_CFG register for this cache</div><div class='ctx'>  *				level has CPU scope.</div><div class='add'>+ * @io_alloc_capable:	True if portion of the cache can be configured</div><div class='add'>+ *			for I/O traffic.</div><div class='ctx'>  */</div><div class='ctx'> struct resctrl_cache {</div><div class='ctx'> 	unsigned int	cbm_len;</div><div class='hunk'>@@ -110,6 +215,7 @@ struct resctrl_cache {</div><div class='ctx'> 	unsigned int	shareable_bits;</div><div class='ctx'> 	bool		arch_has_sparse_bitmasks;</div><div class='ctx'> 	bool		arch_has_per_cpu_cfg;</div><div class='add'>+	bool		io_alloc_capable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -129,6 +235,7 @@ enum membw_throttle_mode {</div><div class='ctx'> /**</div><div class='ctx'>  * struct resctrl_membw - Memory bandwidth allocation related data</div><div class='ctx'>  * @min_bw:		Minimum memory bandwidth percentage user can request</div><div class='add'>+ * @max_bw:		Maximum memory bandwidth value, used as the reset value</div><div class='ctx'>  * @bw_gran:		Granularity at which the memory bandwidth is allocated</div><div class='ctx'>  * @delay_linear:	True if memory B/W delay is in linear scale</div><div class='ctx'>  * @arch_needs_linear:	True if we can't configure non-linear resources</div><div class='hunk'>@@ -139,6 +246,7 @@ enum membw_throttle_mode {</div><div class='ctx'>  */</div><div class='ctx'> struct resctrl_membw {</div><div class='ctx'> 	u32				min_bw;</div><div class='add'>+	u32				max_bw;</div><div class='ctx'> 	u32				bw_gran;</div><div class='ctx'> 	u32				delay_linear;</div><div class='ctx'> 	bool				arch_needs_linear;</div><div class='hunk'>@@ -147,54 +255,87 @@ struct resctrl_membw {</div><div class='ctx'> 	u32				*mb_map;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct rdt_parse_data;</div><div class='ctx'> struct resctrl_schema;</div><div class='ctx'> </div><div class='add'>+enum resctrl_scope {</div><div class='add'>+	RESCTRL_L2_CACHE = 2,</div><div class='add'>+	RESCTRL_L3_CACHE = 3,</div><div class='add'>+	RESCTRL_L3_NODE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum resctrl_schema_fmt - The format user-space provides for a schema.</div><div class='add'>+ * @RESCTRL_SCHEMA_BITMAP:	The schema is a bitmap in hex.</div><div class='add'>+ * @RESCTRL_SCHEMA_RANGE:	The schema is a decimal number.</div><div class='add'>+ */</div><div class='add'>+enum resctrl_schema_fmt {</div><div class='add'>+	RESCTRL_SCHEMA_BITMAP,</div><div class='add'>+	RESCTRL_SCHEMA_RANGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct resctrl_mon - Monitoring related data of a resctrl resource.</div><div class='add'>+ * @num_rmid:		Number of RMIDs available.</div><div class='add'>+ * @mbm_cfg_mask:	Memory transactions that can be tracked when bandwidth</div><div class='add'>+ *			monitoring events can be configured.</div><div class='add'>+ * @num_mbm_cntrs:	Number of assignable counters.</div><div class='add'>+ * @mbm_cntr_assignable:Is system capable of supporting counter assignment?</div><div class='add'>+ * @mbm_assign_on_mkdir:True if counters should automatically be assigned to MBM</div><div class='add'>+ *			events of monitor groups created via mkdir.</div><div class='add'>+ */</div><div class='add'>+struct resctrl_mon {</div><div class='add'>+	int			num_rmid;</div><div class='add'>+	unsigned int		mbm_cfg_mask;</div><div class='add'>+	int			num_mbm_cntrs;</div><div class='add'>+	bool			mbm_cntr_assignable;</div><div class='add'>+	bool			mbm_assign_on_mkdir;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct rdt_resource - attributes of a resctrl resource</div><div class='ctx'>  * @rid:		The index of the resource</div><div class='ctx'>  * @alloc_capable:	Is allocation available on this machine</div><div class='ctx'>  * @mon_capable:	Is monitor feature available on this machine</div><div class='del'>- * @num_rmid:		Number of RMIDs available</div><div class='del'>- * @cache_level:	Which cache level defines scope of this resource</div><div class='add'>+ * @ctrl_scope:		Scope of this resource for control functions</div><div class='add'>+ * @mon_scope:		Scope of this resource for monitor functions</div><div class='ctx'>  * @cache:		Cache allocation related data</div><div class='ctx'>  * @membw:		If the component has bandwidth controls, their properties.</div><div class='del'>- * @domains:		RCU list of all domains for this resource</div><div class='add'>+ * @mon:		Monitoring related data.</div><div class='add'>+ * @ctrl_domains:	RCU list of all control domains for this resource</div><div class='add'>+ * @mon_domains:	RCU list of all monitor domains for this resource</div><div class='ctx'>  * @name:		Name to use in "schemata" file.</div><div class='del'>- * @data_width:		Character width of data when displaying</div><div class='del'>- * @default_ctrl:	Specifies default cache cbm or memory B/W percent.</div><div class='del'>- * @format_str:		Per resource format string to show domain value</div><div class='del'>- * @parse_ctrlval:	Per resource function pointer to parse control values</div><div class='del'>- * @evt_list:		List of monitoring events</div><div class='del'>- * @fflags:		flags to choose base and info files</div><div class='add'>+ * @schema_fmt:		Which format string and parser is used for this schema.</div><div class='ctx'>  * @cdp_capable:	Is the CDP feature available on this resource</div><div class='ctx'>  */</div><div class='ctx'> struct rdt_resource {</div><div class='ctx'> 	int			rid;</div><div class='ctx'> 	bool			alloc_capable;</div><div class='ctx'> 	bool			mon_capable;</div><div class='del'>-	int			num_rmid;</div><div class='del'>-	int			cache_level;</div><div class='add'>+	enum resctrl_scope	ctrl_scope;</div><div class='add'>+	enum resctrl_scope	mon_scope;</div><div class='ctx'> 	struct resctrl_cache	cache;</div><div class='ctx'> 	struct resctrl_membw	membw;</div><div class='del'>-	struct list_head	domains;</div><div class='add'>+	struct resctrl_mon	mon;</div><div class='add'>+	struct list_head	ctrl_domains;</div><div class='add'>+	struct list_head	mon_domains;</div><div class='ctx'> 	char			*name;</div><div class='del'>-	int			data_width;</div><div class='del'>-	u32			default_ctrl;</div><div class='del'>-	const char		*format_str;</div><div class='del'>-	int			(*parse_ctrlval)(struct rdt_parse_data *data,</div><div class='del'>-						 struct resctrl_schema *s,</div><div class='del'>-						 struct rdt_domain *d);</div><div class='del'>-	struct list_head	evt_list;</div><div class='del'>-	unsigned long		fflags;</div><div class='add'>+	enum resctrl_schema_fmt	schema_fmt;</div><div class='ctx'> 	bool			cdp_capable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Get the resource that exists at this level. If the level is not supported</div><div class='add'>+ * a dummy/not-capable resource can be returned. Levels &gt;= RDT_NUM_RESOURCES</div><div class='add'>+ * will return NULL.</div><div class='add'>+ */</div><div class='add'>+struct rdt_resource *resctrl_arch_get_resource(enum resctrl_res_level l);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct resctrl_schema - configuration abilities of a resource presented to</div><div class='ctx'>  *			   user-space</div><div class='ctx'>  * @list:	Member of resctrl_schema_all.</div><div class='ctx'>  * @name:	The name to use in the "schemata" file.</div><div class='add'>+ * @fmt_str:	Format string to show domain value.</div><div class='ctx'>  * @conf_type:	Whether this schema is specific to code/data.</div><div class='ctx'>  * @res:	The resource structure exported by the architecture to describe</div><div class='ctx'>  *		the hardware that is configured by this schema.</div><div class='hunk'>@@ -205,26 +346,161 @@ struct rdt_resource {</div><div class='ctx'> struct resctrl_schema {</div><div class='ctx'> 	struct list_head		list;</div><div class='ctx'> 	char				name[8];</div><div class='add'>+	const char			*fmt_str;</div><div class='ctx'> 	enum resctrl_conf_type		conf_type;</div><div class='ctx'> 	struct rdt_resource		*res;</div><div class='ctx'> 	u32				num_closid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct resctrl_cpu_defaults {</div><div class='add'>+	u32 closid;</div><div class='add'>+	u32 rmid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct resctrl_mon_config_info {</div><div class='add'>+	struct rdt_resource	*r;</div><div class='add'>+	struct rdt_mon_domain	*d;</div><div class='add'>+	u32			evtid;</div><div class='add'>+	u32			mon_config;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_sync_cpu_closid_rmid() - Refresh this CPU's CLOSID and RMID.</div><div class='add'>+ *					 Call via IPI.</div><div class='add'>+ * @info:	If non-NULL, a pointer to a struct resctrl_cpu_defaults</div><div class='add'>+ *		specifying the new CLOSID and RMID for tasks in the default</div><div class='add'>+ *		resctrl ctrl and mon group when running on this CPU.  If NULL,</div><div class='add'>+ *		this CPU is not re-assigned to a different default group.</div><div class='add'>+ *</div><div class='add'>+ * Propagates reassignment of CPUs and/or tasks to different resctrl groups</div><div class='add'>+ * when requested by the resctrl core code.</div><div class='add'>+ *</div><div class='add'>+ * This function records the per-cpu defaults specified by @info (if any),</div><div class='add'>+ * and then reconfigures the CPU's hardware CLOSID and RMID for subsequent</div><div class='add'>+ * execution based on @current, in the same way as during a task switch.</div><div class='add'>+ */</div><div class='add'>+void resctrl_arch_sync_cpu_closid_rmid(void *info);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_get_default_ctrl() - Return the default control value for this</div><div class='add'>+ *                              resource.</div><div class='add'>+ * @r:		The resource whose default control type is queried.</div><div class='add'>+ */</div><div class='add'>+static inline u32 resctrl_get_default_ctrl(struct rdt_resource *r)</div><div class='add'>+{</div><div class='add'>+	switch (r-&gt;schema_fmt) {</div><div class='add'>+	case RESCTRL_SCHEMA_BITMAP:</div><div class='add'>+		return BIT_MASK(r-&gt;cache.cbm_len) - 1;</div><div class='add'>+	case RESCTRL_SCHEMA_RANGE:</div><div class='add'>+		return r-&gt;membw.max_bw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return WARN_ON_ONCE(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The number of closid supported by this resource regardless of CDP */</div><div class='ctx'> u32 resctrl_arch_get_num_closid(struct rdt_resource *r);</div><div class='add'>+u32 resctrl_arch_system_num_rmid_idx(void);</div><div class='ctx'> int resctrl_arch_update_domains(struct rdt_resource *r, u32 closid);</div><div class='ctx'> </div><div class='add'>+void resctrl_enable_mon_event(enum resctrl_event_id eventid);</div><div class='add'>+</div><div class='add'>+bool resctrl_is_mon_event_enabled(enum resctrl_event_id eventid);</div><div class='add'>+</div><div class='add'>+bool resctrl_arch_is_evt_configurable(enum resctrl_event_id evt);</div><div class='add'>+</div><div class='add'>+static inline bool resctrl_is_mbm_event(enum resctrl_event_id eventid)</div><div class='add'>+{</div><div class='add'>+	return (eventid &gt;= QOS_L3_MBM_TOTAL_EVENT_ID &amp;&amp;</div><div class='add'>+		eventid &lt;= QOS_L3_MBM_LOCAL_EVENT_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 resctrl_get_mon_evt_cfg(enum resctrl_event_id eventid);</div><div class='add'>+</div><div class='add'>+/* Iterate over all memory bandwidth events */</div><div class='add'>+#define for_each_mbm_event_id(eventid)				\</div><div class='add'>+	for (eventid = QOS_L3_MBM_TOTAL_EVENT_ID;		\</div><div class='add'>+	     eventid &lt;= QOS_L3_MBM_LOCAL_EVENT_ID; eventid++)</div><div class='add'>+</div><div class='add'>+/* Iterate over memory bandwidth arrays in domain structures */</div><div class='add'>+#define for_each_mbm_idx(idx)					\</div><div class='add'>+	for (idx = 0; idx &lt; QOS_NUM_L3_MBM_EVENTS; idx++)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_mon_event_config_write() - Write the config for an event.</div><div class='add'>+ * @config_info: struct resctrl_mon_config_info describing the resource, domain</div><div class='add'>+ *		 and event.</div><div class='add'>+ *</div><div class='add'>+ * Reads resource, domain and eventid from @config_info and writes the</div><div class='add'>+ * event config_info-&gt;mon_config into hardware.</div><div class='add'>+ *</div><div class='add'>+ * Called via IPI to reach a CPU that is a member of the specified domain.</div><div class='add'>+ */</div><div class='add'>+void resctrl_arch_mon_event_config_write(void *config_info);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_mon_event_config_read() - Read the config for an event.</div><div class='add'>+ * @config_info: struct resctrl_mon_config_info describing the resource, domain</div><div class='add'>+ *		 and event.</div><div class='add'>+ *</div><div class='add'>+ * Reads resource, domain and eventid from @config_info and reads the</div><div class='add'>+ * hardware config value into config_info-&gt;mon_config.</div><div class='add'>+ *</div><div class='add'>+ * Called via IPI to reach a CPU that is a member of the specified domain.</div><div class='add'>+ */</div><div class='add'>+void resctrl_arch_mon_event_config_read(void *config_info);</div><div class='add'>+</div><div class='add'>+/* For use by arch code to remap resctrl's smaller CDP CLOSID range */</div><div class='add'>+static inline u32 resctrl_get_config_index(u32 closid,</div><div class='add'>+					   enum resctrl_conf_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	default:</div><div class='add'>+	case CDP_NONE:</div><div class='add'>+		return closid;</div><div class='add'>+	case CDP_CODE:</div><div class='add'>+		return closid * 2 + 1;</div><div class='add'>+	case CDP_DATA:</div><div class='add'>+		return closid * 2;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool resctrl_arch_get_cdp_enabled(enum resctrl_res_level l);</div><div class='add'>+int resctrl_arch_set_cdp_enabled(enum resctrl_res_level l, bool enable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_mbm_cntr_assign_enabled() - Check if MBM counter assignment</div><div class='add'>+ *					    mode is enabled.</div><div class='add'>+ * @r:		Pointer to the resource structure.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * true if the assignment mode is enabled, false otherwise.</div><div class='add'>+ */</div><div class='add'>+bool resctrl_arch_mbm_cntr_assign_enabled(struct rdt_resource *r);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_mbm_cntr_assign_set() - Configure the MBM counter assignment mode.</div><div class='add'>+ * @r:		Pointer to the resource structure.</div><div class='add'>+ * @enable:	Set to true to enable, false to disable the assignment mode.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * 0 on success, &lt; 0 on error.</div><div class='add'>+ */</div><div class='add'>+int resctrl_arch_mbm_cntr_assign_set(struct rdt_resource *r, bool enable);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Update the ctrl_val and apply this config right now.</div><div class='ctx'>  * Must be called on one of the domain's CPUs.</div><div class='ctx'>  */</div><div class='del'>-int resctrl_arch_update_one(struct rdt_resource *r, struct rdt_domain *d,</div><div class='add'>+int resctrl_arch_update_one(struct rdt_resource *r, struct rdt_ctrl_domain *d,</div><div class='ctx'> 			    u32 closid, enum resctrl_conf_type t, u32 cfg_val);</div><div class='ctx'> </div><div class='del'>-u32 resctrl_arch_get_config(struct rdt_resource *r, struct rdt_domain *d,</div><div class='add'>+u32 resctrl_arch_get_config(struct rdt_resource *r, struct rdt_ctrl_domain *d,</div><div class='ctx'> 			    u32 closid, enum resctrl_conf_type type);</div><div class='del'>-int resctrl_online_domain(struct rdt_resource *r, struct rdt_domain *d);</div><div class='del'>-void resctrl_offline_domain(struct rdt_resource *r, struct rdt_domain *d);</div><div class='add'>+int resctrl_online_ctrl_domain(struct rdt_resource *r, struct rdt_ctrl_domain *d);</div><div class='add'>+int resctrl_online_mon_domain(struct rdt_resource *r, struct rdt_mon_domain *d);</div><div class='add'>+void resctrl_offline_ctrl_domain(struct rdt_resource *r, struct rdt_ctrl_domain *d);</div><div class='add'>+void resctrl_offline_mon_domain(struct rdt_resource *r, struct rdt_mon_domain *d);</div><div class='ctx'> void resctrl_online_cpu(unsigned int cpu);</div><div class='ctx'> void resctrl_offline_cpu(unsigned int cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +529,7 @@ void resctrl_offline_cpu(unsigned int cpu);</div><div class='ctx'>  * Return:</div><div class='ctx'>  * 0 on success, or -EIO, -EINVAL etc on error.</div><div class='ctx'>  */</div><div class='del'>-int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain *d,</div><div class='add'>+int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='ctx'> 			   u32 closid, u32 rmid, enum resctrl_event_id eventid,</div><div class='ctx'> 			   u64 *val, void *arch_mon_ctx);</div><div class='ctx'> </div><div class='hunk'>@@ -275,6 +551,20 @@ static inline void resctrl_arch_rmid_read_context_check(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * resctrl_find_domain() - Search for a domain id in a resource domain list.</div><div class='add'>+ * @h:		The domain list to search.</div><div class='add'>+ * @id:		The domain id to search for.</div><div class='add'>+ * @pos:	A pointer to position in the list id should be inserted.</div><div class='add'>+ *</div><div class='add'>+ * Search the domain list to find the domain id. If the domain id is</div><div class='add'>+ * found, return the domain. NULL otherwise.  If the domain id is not</div><div class='add'>+ * found (and NULL returned) then the first domain with id bigger than</div><div class='add'>+ * the input id can be returned to the caller via @pos.</div><div class='add'>+ */</div><div class='add'>+struct rdt_domain_hdr *resctrl_find_domain(struct list_head *h, int id,</div><div class='add'>+					   struct list_head **pos);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * resctrl_arch_reset_rmid() - Reset any private state associated with rmid</div><div class='ctx'>  *			       and eventid.</div><div class='ctx'>  * @r:		The domain's resource.</div><div class='hunk'>@@ -286,7 +576,7 @@ static inline void resctrl_arch_rmid_read_context_check(void)</div><div class='ctx'>  *</div><div class='ctx'>  * This can be called from any CPU.</div><div class='ctx'>  */</div><div class='del'>-void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_domain *d,</div><div class='add'>+void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='ctx'> 			     u32 closid, u32 rmid,</div><div class='ctx'> 			     enum resctrl_event_id eventid);</div><div class='ctx'> </div><div class='hunk'>@@ -299,9 +589,112 @@ void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_domain *d,</div><div class='ctx'>  *</div><div class='ctx'>  * This can be called from any CPU.</div><div class='ctx'>  */</div><div class='del'>-void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_domain *d);</div><div class='add'>+void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_mon_domain *d);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_reset_all_ctrls() - Reset the control for each CLOSID to its</div><div class='add'>+ *				    default.</div><div class='add'>+ * @r:		The resctrl resource to reset.</div><div class='add'>+ *</div><div class='add'>+ * This can be called from any CPU.</div><div class='add'>+ */</div><div class='add'>+void resctrl_arch_reset_all_ctrls(struct rdt_resource *r);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_config_cntr() - Configure the counter with its new RMID</div><div class='add'>+ *				and event details.</div><div class='add'>+ * @r:			Resource structure.</div><div class='add'>+ * @d:			The domain in which counter with ID @cntr_id should be configured.</div><div class='add'>+ * @evtid:		Monitoring event type (e.g., QOS_L3_MBM_TOTAL_EVENT_ID</div><div class='add'>+ *			or QOS_L3_MBM_LOCAL_EVENT_ID).</div><div class='add'>+ * @rmid:		RMID.</div><div class='add'>+ * @closid:		CLOSID.</div><div class='add'>+ * @cntr_id:		Counter ID to configure.</div><div class='add'>+ * @assign:		True to assign the counter or update an existing assignment,</div><div class='add'>+ *			false to unassign the counter.</div><div class='add'>+ *</div><div class='add'>+ * This can be called from any CPU.</div><div class='add'>+ */</div><div class='add'>+void resctrl_arch_config_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+			      enum resctrl_event_id evtid, u32 rmid, u32 closid,</div><div class='add'>+			      u32 cntr_id, bool assign);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_cntr_read() - Read the event data corresponding to the counter ID</div><div class='add'>+ *			      assigned to the RMID, event pair for this resource</div><div class='add'>+ *			      and domain.</div><div class='add'>+ * @r:		Resource that the counter should be read from.</div><div class='add'>+ * @d:		Domain that the counter should be read from.</div><div class='add'>+ * @closid:	CLOSID that matches the RMID.</div><div class='add'>+ * @rmid:	The RMID to which @cntr_id is assigned.</div><div class='add'>+ * @cntr_id:	The counter to read.</div><div class='add'>+ * @eventid:	The MBM event to which @cntr_id is assigned.</div><div class='add'>+ * @val:	Result of the counter read in bytes.</div><div class='add'>+ *</div><div class='add'>+ * Called on a CPU that belongs to domain @d when "mbm_event" mode is enabled.</div><div class='add'>+ * Called from a non-migrateable process context via smp_call_on_cpu() unless all</div><div class='add'>+ * CPUs are nohz_full, in which case it is called via IPI (smp_call_function_any()).</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * 0 on success, or -EIO, -EINVAL etc on error.</div><div class='add'>+ */</div><div class='add'>+int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+			   u32 closid, u32 rmid, int cntr_id,</div><div class='add'>+			   enum resctrl_event_id eventid, u64 *val);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_reset_cntr() - Reset any private state associated with counter ID.</div><div class='add'>+ * @r:		The domain's resource.</div><div class='add'>+ * @d:		The counter ID's domain.</div><div class='add'>+ * @closid:	CLOSID that matches the RMID.</div><div class='add'>+ * @rmid:	The RMID to which @cntr_id is assigned.</div><div class='add'>+ * @cntr_id:	The counter to reset.</div><div class='add'>+ * @eventid:	The MBM event to which @cntr_id is assigned.</div><div class='add'>+ *</div><div class='add'>+ * This can be called from any CPU.</div><div class='add'>+ */</div><div class='add'>+void resctrl_arch_reset_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,</div><div class='add'>+			     u32 closid, u32 rmid, int cntr_id,</div><div class='add'>+			     enum resctrl_event_id eventid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_io_alloc_enable() - Enable/disable io_alloc feature.</div><div class='add'>+ * @r:		The resctrl resource.</div><div class='add'>+ * @enable:	Enable (true) or disable (false) io_alloc on resource @r.</div><div class='add'>+ *</div><div class='add'>+ * This can be called from any CPU.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * 0 on success, &lt;0 on error.</div><div class='add'>+ */</div><div class='add'>+int resctrl_arch_io_alloc_enable(struct rdt_resource *r, bool enable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * resctrl_arch_get_io_alloc_enabled() - Get io_alloc feature state.</div><div class='add'>+ * @r:		The resctrl resource.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * true if io_alloc is enabled or false if disabled.</div><div class='add'>+ */</div><div class='add'>+bool resctrl_arch_get_io_alloc_enabled(struct rdt_resource *r);</div><div class='ctx'> </div><div class='ctx'> extern unsigned int resctrl_rmid_realloc_threshold;</div><div class='ctx'> extern unsigned int resctrl_rmid_realloc_limit;</div><div class='ctx'> </div><div class='add'>+int resctrl_init(void);</div><div class='add'>+void resctrl_exit(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RESCTRL_FS_PSEUDO_LOCK</div><div class='add'>+u64 resctrl_arch_get_prefetch_disable_bits(void);</div><div class='add'>+int resctrl_arch_pseudo_lock_fn(void *_plr);</div><div class='add'>+int resctrl_arch_measure_cycles_lat_fn(void *_plr);</div><div class='add'>+int resctrl_arch_measure_l2_residency(void *_plr);</div><div class='add'>+int resctrl_arch_measure_l3_residency(void *_plr);</div><div class='add'>+#else</div><div class='add'>+static inline u64 resctrl_arch_get_prefetch_disable_bits(void) { return 0; }</div><div class='add'>+static inline int resctrl_arch_pseudo_lock_fn(void *_plr) { return 0; }</div><div class='add'>+static inline int resctrl_arch_measure_cycles_lat_fn(void *_plr) { return 0; }</div><div class='add'>+static inline int resctrl_arch_measure_l2_residency(void *_plr) { return 0; }</div><div class='add'>+static inline int resctrl_arch_measure_l3_residency(void *_plr) { return 0; }</div><div class='add'>+#endif /* CONFIG_RESCTRL_FS_PSEUDO_LOCK */</div><div class='ctx'> #endif /* _RESCTRL_H */</div><div class='head'>diff --git a/include/linux/resctrl_types.h b/include/linux/resctrl_types.h<br/>new file mode 100644<br/>index 000000000000..acfe07860b34<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/resctrl_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/resctrl_types.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Arm Ltd.</div><div class='add'>+ * Based on arch/x86/kernel/cpu/resctrl/internal.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_RESCTRL_TYPES_H</div><div class='add'>+#define __LINUX_RESCTRL_TYPES_H</div><div class='add'>+</div><div class='add'>+#define MAX_MBA_BW			100u</div><div class='add'>+#define MBM_OVERFLOW_INTERVAL		1000</div><div class='add'>+</div><div class='add'>+/* Reads to Local DRAM Memory */</div><div class='add'>+#define READS_TO_LOCAL_MEM		BIT(0)</div><div class='add'>+</div><div class='add'>+/* Reads to Remote DRAM Memory */</div><div class='add'>+#define READS_TO_REMOTE_MEM		BIT(1)</div><div class='add'>+</div><div class='add'>+/* Non-Temporal Writes to Local Memory */</div><div class='add'>+#define NON_TEMP_WRITE_TO_LOCAL_MEM	BIT(2)</div><div class='add'>+</div><div class='add'>+/* Non-Temporal Writes to Remote Memory */</div><div class='add'>+#define NON_TEMP_WRITE_TO_REMOTE_MEM	BIT(3)</div><div class='add'>+</div><div class='add'>+/* Reads to Local Memory the system identifies as "Slow Memory" */</div><div class='add'>+#define READS_TO_LOCAL_S_MEM		BIT(4)</div><div class='add'>+</div><div class='add'>+/* Reads to Remote Memory the system identifies as "Slow Memory" */</div><div class='add'>+#define READS_TO_REMOTE_S_MEM		BIT(5)</div><div class='add'>+</div><div class='add'>+/* Dirty Victims to All Types of Memory */</div><div class='add'>+#define DIRTY_VICTIMS_TO_ALL_MEM	BIT(6)</div><div class='add'>+</div><div class='add'>+/* Max event bits supported */</div><div class='add'>+#define MAX_EVT_CONFIG_BITS		GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+/* Number of memory transactions that an MBM event can be configured with */</div><div class='add'>+#define NUM_MBM_TRANSACTIONS		7</div><div class='add'>+</div><div class='add'>+/* Event IDs */</div><div class='add'>+enum resctrl_event_id {</div><div class='add'>+	/* Must match value of first event below */</div><div class='add'>+	QOS_FIRST_EVENT			= 0x01,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These values match those used to program IA32_QM_EVTSEL before</div><div class='add'>+	 * reading IA32_QM_CTR on RDT systems.</div><div class='add'>+	 */</div><div class='add'>+	QOS_L3_OCCUP_EVENT_ID		= 0x01,</div><div class='add'>+	QOS_L3_MBM_TOTAL_EVENT_ID	= 0x02,</div><div class='add'>+	QOS_L3_MBM_LOCAL_EVENT_ID	= 0x03,</div><div class='add'>+</div><div class='add'>+	/* Must be the last */</div><div class='add'>+	QOS_NUM_EVENTS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define QOS_NUM_L3_MBM_EVENTS	(QOS_L3_MBM_LOCAL_EVENT_ID - QOS_L3_MBM_TOTAL_EVENT_ID + 1)</div><div class='add'>+#define MBM_STATE_IDX(evt)	((evt) - QOS_L3_MBM_TOTAL_EVENT_ID)</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_RESCTRL_TYPES_H */</div><div class='head'>diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h<br/>index 0fa4f60e1186..46514cb1b9e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/reset-controller.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/reset-controller.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/reset-controller.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/reset-controller.h</a></div><div class='hunk'>@@ -27,31 +27,6 @@ struct device_node;</div><div class='ctx'> struct of_phandle_args;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct reset_control_lookup - represents a single lookup entry</div><div class='del'>- *</div><div class='del'>- * @list: internal list of all reset lookup entries</div><div class='del'>- * @provider: name of the reset controller device controlling this reset line</div><div class='del'>- * @index: ID of the reset controller in the reset controller device</div><div class='del'>- * @dev_id: name of the device associated with this reset line</div><div class='del'>- * @con_id: name of the reset line (can be NULL)</div><div class='del'>- */</div><div class='del'>-struct reset_control_lookup {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	const char *provider;</div><div class='del'>-	unsigned int index;</div><div class='del'>-	const char *dev_id;</div><div class='del'>-	const char *con_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define RESET_LOOKUP(_provider, _index, _dev_id, _con_id)		\</div><div class='del'>-	{								\</div><div class='del'>-		.provider = _provider,					\</div><div class='del'>-		.index = _index,					\</div><div class='del'>-		.dev_id = _dev_id,					\</div><div class='del'>-		.con_id = _con_id,					\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct reset_controller_dev - reset controller entity that might</div><div class='ctx'>  *                               provide multiple reset controls</div><div class='ctx'>  * @ops: a pointer to device specific struct reset_control_ops</div><div class='hunk'>@@ -60,6 +35,9 @@ struct reset_control_lookup {</div><div class='ctx'>  * @reset_control_head: head of internal list of requested reset controls</div><div class='ctx'>  * @dev: corresponding driver model device struct</div><div class='ctx'>  * @of_node: corresponding device tree node as phandle target</div><div class='add'>+ * @of_args: for reset-gpios controllers: corresponding phandle args with</div><div class='add'>+ *           of_node and GPIO number complementing of_node; either this or</div><div class='add'>+ *           of_node should be present</div><div class='ctx'>  * @of_reset_n_cells: number of cells in reset line specifiers</div><div class='ctx'>  * @of_xlate: translation function to translate from specifier as found in the</div><div class='ctx'>  *            device tree to id as given to the reset control ops, defaults</div><div class='hunk'>@@ -73,6 +51,7 @@ struct reset_controller_dev {</div><div class='ctx'> 	struct list_head reset_control_head;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct device_node *of_node;</div><div class='add'>+	const struct of_phandle_args *of_args;</div><div class='ctx'> 	int of_reset_n_cells;</div><div class='ctx'> 	int (*of_xlate)(struct reset_controller_dev *rcdev,</div><div class='ctx'> 			const struct of_phandle_args *reset_spec);</div><div class='hunk'>@@ -86,9 +65,6 @@ void reset_controller_unregister(struct reset_controller_dev *rcdev);</div><div class='ctx'> struct device;</div><div class='ctx'> int devm_reset_controller_register(struct device *dev,</div><div class='ctx'> 				   struct reset_controller_dev *rcdev);</div><div class='del'>-</div><div class='del'>-void reset_controller_add_lookup(struct reset_control_lookup *lookup,</div><div class='del'>-				 unsigned int num_entries);</div><div class='ctx'> #else</div><div class='ctx'> static inline int reset_controller_register(struct reset_controller_dev *rcdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -104,11 +80,6 @@ static inline int devm_reset_controller_register(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void reset_controller_add_lookup(struct reset_control_lookup *lookup,</div><div class='del'>-					       unsigned int num_entries)</div><div class='del'>-{</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/reset.h b/include/linux/reset.h<br/>index 514ddf003efc..44f9e3415f92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/reset.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/reset.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/reset.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/reset.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #ifndef _LINUX_RESET_H_</div><div class='ctx'> #define _LINUX_RESET_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -25,6 +26,48 @@ struct reset_control_bulk_data {</div><div class='ctx'> 	struct reset_control		*rstc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define RESET_CONTROL_FLAGS_BIT_SHARED		BIT(0)	/* not exclusive */</div><div class='add'>+#define RESET_CONTROL_FLAGS_BIT_OPTIONAL	BIT(1)</div><div class='add'>+#define RESET_CONTROL_FLAGS_BIT_ACQUIRED	BIT(2)	/* iff exclusive, not released */</div><div class='add'>+#define RESET_CONTROL_FLAGS_BIT_DEASSERTED	BIT(3)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum reset_control_flags - Flags that can be passed to the reset_control_get functions</div><div class='add'>+ *                    to determine the type of reset control.</div><div class='add'>+ *                    These values cannot be OR'd.</div><div class='add'>+ *</div><div class='add'>+ * @RESET_CONTROL_EXCLUSIVE:				exclusive, acquired,</div><div class='add'>+ * @RESET_CONTROL_EXCLUSIVE_DEASSERTED:			exclusive, acquired, deasserted</div><div class='add'>+ * @RESET_CONTROL_EXCLUSIVE_RELEASED:			exclusive, released,</div><div class='add'>+ * @RESET_CONTROL_SHARED:				shared</div><div class='add'>+ * @RESET_CONTROL_SHARED_DEASSERTED:			shared, deasserted</div><div class='add'>+ * @RESET_CONTROL_OPTIONAL_EXCLUSIVE:			optional, exclusive, acquired</div><div class='add'>+ * @RESET_CONTROL_OPTIONAL_EXCLUSIVE_DEASSERTED:	optional, exclusive, acquired, deasserted</div><div class='add'>+ * @RESET_CONTROL_OPTIONAL_EXCLUSIVE_RELEASED:		optional, exclusive, released</div><div class='add'>+ * @RESET_CONTROL_OPTIONAL_SHARED:			optional, shared</div><div class='add'>+ * @RESET_CONTROL_OPTIONAL_SHARED_DEASSERTED:		optional, shared, deasserted</div><div class='add'>+ */</div><div class='add'>+enum reset_control_flags {</div><div class='add'>+	RESET_CONTROL_EXCLUSIVE				= RESET_CONTROL_FLAGS_BIT_ACQUIRED,</div><div class='add'>+	RESET_CONTROL_EXCLUSIVE_DEASSERTED		= RESET_CONTROL_FLAGS_BIT_ACQUIRED |</div><div class='add'>+							  RESET_CONTROL_FLAGS_BIT_DEASSERTED,</div><div class='add'>+	RESET_CONTROL_EXCLUSIVE_RELEASED		= 0,</div><div class='add'>+	RESET_CONTROL_SHARED				= RESET_CONTROL_FLAGS_BIT_SHARED,</div><div class='add'>+	RESET_CONTROL_SHARED_DEASSERTED			= RESET_CONTROL_FLAGS_BIT_SHARED |</div><div class='add'>+							  RESET_CONTROL_FLAGS_BIT_DEASSERTED,</div><div class='add'>+	RESET_CONTROL_OPTIONAL_EXCLUSIVE		= RESET_CONTROL_FLAGS_BIT_OPTIONAL |</div><div class='add'>+							  RESET_CONTROL_FLAGS_BIT_ACQUIRED,</div><div class='add'>+	RESET_CONTROL_OPTIONAL_EXCLUSIVE_DEASSERTED	= RESET_CONTROL_FLAGS_BIT_OPTIONAL |</div><div class='add'>+							  RESET_CONTROL_FLAGS_BIT_ACQUIRED |</div><div class='add'>+							  RESET_CONTROL_FLAGS_BIT_DEASSERTED,</div><div class='add'>+	RESET_CONTROL_OPTIONAL_EXCLUSIVE_RELEASED	= RESET_CONTROL_FLAGS_BIT_OPTIONAL,</div><div class='add'>+	RESET_CONTROL_OPTIONAL_SHARED			= RESET_CONTROL_FLAGS_BIT_OPTIONAL |</div><div class='add'>+							  RESET_CONTROL_FLAGS_BIT_SHARED,</div><div class='add'>+	RESET_CONTROL_OPTIONAL_SHARED_DEASSERTED	= RESET_CONTROL_FLAGS_BIT_OPTIONAL |</div><div class='add'>+							  RESET_CONTROL_FLAGS_BIT_SHARED |</div><div class='add'>+							  RESET_CONTROL_FLAGS_BIT_DEASSERTED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_RESET_CONTROLLER</div><div class='ctx'> </div><div class='ctx'> int reset_control_reset(struct reset_control *rstc);</div><div class='hunk'>@@ -42,30 +85,25 @@ int reset_control_bulk_acquire(int num_rstcs, struct reset_control_bulk_data *rs</div><div class='ctx'> void reset_control_bulk_release(int num_rstcs, struct reset_control_bulk_data *rstcs);</div><div class='ctx'> </div><div class='ctx'> struct reset_control *__of_reset_control_get(struct device_node *node,</div><div class='del'>-				     const char *id, int index, bool shared,</div><div class='del'>-				     bool optional, bool acquired);</div><div class='add'>+				     const char *id, int index, enum reset_control_flags flags);</div><div class='ctx'> struct reset_control *__reset_control_get(struct device *dev, const char *id,</div><div class='del'>-					  int index, bool shared,</div><div class='del'>-					  bool optional, bool acquired);</div><div class='add'>+					  int index, enum reset_control_flags flags);</div><div class='ctx'> void reset_control_put(struct reset_control *rstc);</div><div class='ctx'> int __reset_control_bulk_get(struct device *dev, int num_rstcs,</div><div class='ctx'> 			     struct reset_control_bulk_data *rstcs,</div><div class='del'>-			     bool shared, bool optional, bool acquired);</div><div class='add'>+			     enum reset_control_flags flags);</div><div class='ctx'> void reset_control_bulk_put(int num_rstcs, struct reset_control_bulk_data *rstcs);</div><div class='ctx'> </div><div class='ctx'> int __device_reset(struct device *dev, bool optional);</div><div class='ctx'> struct reset_control *__devm_reset_control_get(struct device *dev,</div><div class='del'>-				     const char *id, int index, bool shared,</div><div class='del'>-				     bool optional, bool acquired);</div><div class='add'>+				     const char *id, int index, enum reset_control_flags flags);</div><div class='ctx'> int __devm_reset_control_bulk_get(struct device *dev, int num_rstcs,</div><div class='ctx'> 				  struct reset_control_bulk_data *rstcs,</div><div class='del'>-				  bool shared, bool optional, bool acquired);</div><div class='add'>+				  enum reset_control_flags flags);</div><div class='ctx'> </div><div class='ctx'> struct reset_control *devm_reset_control_array_get(struct device *dev,</div><div class='del'>-						   bool shared, bool optional);</div><div class='del'>-struct reset_control *of_reset_control_array_get(struct device_node *np,</div><div class='del'>-						 bool shared, bool optional,</div><div class='del'>-						 bool acquired);</div><div class='add'>+						   enum reset_control_flags flags);</div><div class='add'>+struct reset_control *of_reset_control_array_get(struct device_node *np, enum reset_control_flags);</div><div class='ctx'> </div><div class='ctx'> int reset_control_get_count(struct device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -116,17 +154,19 @@ static inline int __device_reset(struct device *dev, bool optional)</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *__of_reset_control_get(</div><div class='ctx'> 					struct device_node *node,</div><div class='del'>-					const char *id, int index, bool shared,</div><div class='del'>-					bool optional, bool acquired)</div><div class='add'>+					const char *id, int index, enum reset_control_flags flags)</div><div class='ctx'> {</div><div class='add'>+	bool optional = flags &amp; RESET_CONTROL_FLAGS_BIT_OPTIONAL;</div><div class='add'>+</div><div class='ctx'> 	return optional ? NULL : ERR_PTR(-ENOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *__reset_control_get(</div><div class='ctx'> 					struct device *dev, const char *id,</div><div class='del'>-					int index, bool shared, bool optional,</div><div class='del'>-					bool acquired)</div><div class='add'>+					int index, enum reset_control_flags flags)</div><div class='ctx'> {</div><div class='add'>+	bool optional = flags &amp; RESET_CONTROL_FLAGS_BIT_OPTIONAL;</div><div class='add'>+</div><div class='ctx'> 	return optional ? NULL : ERR_PTR(-ENOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -162,8 +202,10 @@ reset_control_bulk_release(int num_rstcs, struct reset_control_bulk_data *rstcs)</div><div class='ctx'> static inline int</div><div class='ctx'> __reset_control_bulk_get(struct device *dev, int num_rstcs,</div><div class='ctx'> 			 struct reset_control_bulk_data *rstcs,</div><div class='del'>-			 bool shared, bool optional, bool acquired)</div><div class='add'>+			 enum reset_control_flags flags)</div><div class='ctx'> {</div><div class='add'>+	bool optional = flags &amp; RESET_CONTROL_FLAGS_BIT_OPTIONAL;</div><div class='add'>+</div><div class='ctx'> 	return optional ? 0 : -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -174,30 +216,36 @@ reset_control_bulk_put(int num_rstcs, struct reset_control_bulk_data *rstcs)</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *__devm_reset_control_get(</div><div class='ctx'> 					struct device *dev, const char *id,</div><div class='del'>-					int index, bool shared, bool optional,</div><div class='del'>-					bool acquired)</div><div class='add'>+					int index, enum reset_control_flags flags)</div><div class='ctx'> {</div><div class='add'>+	bool optional = flags &amp; RESET_CONTROL_FLAGS_BIT_OPTIONAL;</div><div class='add'>+</div><div class='ctx'> 	return optional ? NULL : ERR_PTR(-ENOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> __devm_reset_control_bulk_get(struct device *dev, int num_rstcs,</div><div class='ctx'> 			      struct reset_control_bulk_data *rstcs,</div><div class='del'>-			      bool shared, bool optional, bool acquired)</div><div class='add'>+			      enum reset_control_flags flags)</div><div class='ctx'> {</div><div class='add'>+	bool optional = flags &amp; RESET_CONTROL_FLAGS_BIT_OPTIONAL;</div><div class='add'>+</div><div class='ctx'> 	return optional ? 0 : -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='del'>-devm_reset_control_array_get(struct device *dev, bool shared, bool optional)</div><div class='add'>+devm_reset_control_array_get(struct device *dev, enum reset_control_flags flags)</div><div class='ctx'> {</div><div class='add'>+	bool optional = flags &amp; RESET_CONTROL_FLAGS_BIT_OPTIONAL;</div><div class='add'>+</div><div class='ctx'> 	return optional ? NULL : ERR_PTR(-ENOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='del'>-of_reset_control_array_get(struct device_node *np, bool shared, bool optional,</div><div class='del'>-			   bool acquired)</div><div class='add'>+of_reset_control_array_get(struct device_node *np, enum reset_control_flags flags)</div><div class='ctx'> {</div><div class='add'>+	bool optional = flags &amp; RESET_CONTROL_FLAGS_BIT_OPTIONAL;</div><div class='add'>+</div><div class='ctx'> 	return optional ? NULL : ERR_PTR(-ENOTSUPP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +284,7 @@ static inline int device_reset_optional(struct device *dev)</div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> __must_check reset_control_get_exclusive(struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_get(dev, id, 0, false, false, true);</div><div class='add'>+	return __reset_control_get(dev, id, 0, RESET_CONTROL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -253,7 +301,7 @@ static inline int __must_check</div><div class='ctx'> reset_control_bulk_get_exclusive(struct device *dev, int num_rstcs,</div><div class='ctx'> 				 struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_bulk_get(dev, num_rstcs, rstcs, false, false, true);</div><div class='add'>+	return __reset_control_bulk_get(dev, num_rstcs, rstcs, RESET_CONTROL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -274,7 +322,7 @@ static inline struct reset_control *</div><div class='ctx'> __must_check reset_control_get_exclusive_released(struct device *dev,</div><div class='ctx'> 						  const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_get(dev, id, 0, false, false, false);</div><div class='add'>+	return __reset_control_get(dev, id, 0, RESET_CONTROL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -295,7 +343,7 @@ static inline int __must_check</div><div class='ctx'> reset_control_bulk_get_exclusive_released(struct device *dev, int num_rstcs,</div><div class='ctx'> 					  struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_bulk_get(dev, num_rstcs, rstcs, false, false, false);</div><div class='add'>+	return __reset_control_bulk_get(dev, num_rstcs, rstcs, RESET_CONTROL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -316,7 +364,8 @@ static inline int __must_check</div><div class='ctx'> reset_control_bulk_get_optional_exclusive_released(struct device *dev, int num_rstcs,</div><div class='ctx'> 						   struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_bulk_get(dev, num_rstcs, rstcs, false, true, false);</div><div class='add'>+	return __reset_control_bulk_get(dev, num_rstcs, rstcs,</div><div class='add'>+					RESET_CONTROL_OPTIONAL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -344,7 +393,7 @@ reset_control_bulk_get_optional_exclusive_released(struct device *dev, int num_r</div><div class='ctx'> static inline struct reset_control *reset_control_get_shared(</div><div class='ctx'> 					struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_get(dev, id, 0, true, false, false);</div><div class='add'>+	return __reset_control_get(dev, id, 0, RESET_CONTROL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -361,7 +410,7 @@ static inline int __must_check</div><div class='ctx'> reset_control_bulk_get_shared(struct device *dev, int num_rstcs,</div><div class='ctx'> 			      struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_bulk_get(dev, num_rstcs, rstcs, true, false, false);</div><div class='add'>+	return __reset_control_bulk_get(dev, num_rstcs, rstcs, RESET_CONTROL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -378,7 +427,7 @@ reset_control_bulk_get_shared(struct device *dev, int num_rstcs,</div><div class='ctx'> static inline struct reset_control *reset_control_get_optional_exclusive(</div><div class='ctx'> 					struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_get(dev, id, 0, false, true, true);</div><div class='add'>+	return __reset_control_get(dev, id, 0, RESET_CONTROL_OPTIONAL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -398,7 +447,7 @@ static inline int __must_check</div><div class='ctx'> reset_control_bulk_get_optional_exclusive(struct device *dev, int num_rstcs,</div><div class='ctx'> 					  struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_bulk_get(dev, num_rstcs, rstcs, false, true, true);</div><div class='add'>+	return __reset_control_bulk_get(dev, num_rstcs, rstcs, RESET_CONTROL_OPTIONAL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -415,7 +464,7 @@ reset_control_bulk_get_optional_exclusive(struct device *dev, int num_rstcs,</div><div class='ctx'> static inline struct reset_control *reset_control_get_optional_shared(</div><div class='ctx'> 					struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_get(dev, id, 0, true, true, false);</div><div class='add'>+	return __reset_control_get(dev, id, 0, RESET_CONTROL_OPTIONAL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -435,7 +484,7 @@ static inline int __must_check</div><div class='ctx'> reset_control_bulk_get_optional_shared(struct device *dev, int num_rstcs,</div><div class='ctx'> 				       struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __reset_control_bulk_get(dev, num_rstcs, rstcs, true, true, false);</div><div class='add'>+	return __reset_control_bulk_get(dev, num_rstcs, rstcs, RESET_CONTROL_OPTIONAL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -451,7 +500,7 @@ reset_control_bulk_get_optional_shared(struct device *dev, int num_rstcs,</div><div class='ctx'> static inline struct reset_control *of_reset_control_get_exclusive(</div><div class='ctx'> 				struct device_node *node, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __of_reset_control_get(node, id, 0, false, false, true);</div><div class='add'>+	return __of_reset_control_get(node, id, 0, RESET_CONTROL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -471,7 +520,7 @@ static inline struct reset_control *of_reset_control_get_exclusive(</div><div class='ctx'> static inline struct reset_control *of_reset_control_get_optional_exclusive(</div><div class='ctx'> 				struct device_node *node, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __of_reset_control_get(node, id, 0, false, true, true);</div><div class='add'>+	return __of_reset_control_get(node, id, 0, RESET_CONTROL_OPTIONAL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -496,7 +545,7 @@ static inline struct reset_control *of_reset_control_get_optional_exclusive(</div><div class='ctx'> static inline struct reset_control *of_reset_control_get_shared(</div><div class='ctx'> 				struct device_node *node, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __of_reset_control_get(node, id, 0, true, false, false);</div><div class='add'>+	return __of_reset_control_get(node, id, 0, RESET_CONTROL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -513,7 +562,7 @@ static inline struct reset_control *of_reset_control_get_shared(</div><div class='ctx'> static inline struct reset_control *of_reset_control_get_exclusive_by_index(</div><div class='ctx'> 					struct device_node *node, int index)</div><div class='ctx'> {</div><div class='del'>-	return __of_reset_control_get(node, NULL, index, false, false, true);</div><div class='add'>+	return __of_reset_control_get(node, NULL, index, RESET_CONTROL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -541,7 +590,7 @@ static inline struct reset_control *of_reset_control_get_exclusive_by_index(</div><div class='ctx'> static inline struct reset_control *of_reset_control_get_shared_by_index(</div><div class='ctx'> 					struct device_node *node, int index)</div><div class='ctx'> {</div><div class='del'>-	return __of_reset_control_get(node, NULL, index, true, false, false);</div><div class='add'>+	return __of_reset_control_get(node, NULL, index, RESET_CONTROL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -560,7 +609,26 @@ static inline struct reset_control *</div><div class='ctx'> __must_check devm_reset_control_get_exclusive(struct device *dev,</div><div class='ctx'> 					      const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_get(dev, id, 0, false, false, true);</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_EXCLUSIVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_reset_control_get_exclusive_deasserted - resource managed</div><div class='add'>+ *                                    reset_control_get_exclusive() +</div><div class='add'>+ *                                    reset_control_deassert()</div><div class='add'>+ * @dev: device to be reset by the controller</div><div class='add'>+ * @id: reset line name</div><div class='add'>+ *</div><div class='add'>+ * Managed reset_control_get_exclusive() + reset_control_deassert(). For reset</div><div class='add'>+ * controllers returned from this function, reset_control_assert() +</div><div class='add'>+ * reset_control_put() is called automatically on driver detach.</div><div class='add'>+ *</div><div class='add'>+ * See reset_control_get_exclusive() for more information.</div><div class='add'>+ */</div><div class='add'>+static inline struct reset_control * __must_check</div><div class='add'>+devm_reset_control_get_exclusive_deasserted(struct device *dev, const char *id)</div><div class='add'>+{</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_EXCLUSIVE_DEASSERTED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -580,7 +648,8 @@ static inline int __must_check</div><div class='ctx'> devm_reset_control_bulk_get_exclusive(struct device *dev, int num_rstcs,</div><div class='ctx'> 				      struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, false, false, true);</div><div class='add'>+	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs,</div><div class='add'>+					     RESET_CONTROL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -599,7 +668,7 @@ static inline struct reset_control *</div><div class='ctx'> __must_check devm_reset_control_get_exclusive_released(struct device *dev,</div><div class='ctx'> 						       const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_get(dev, id, 0, false, false, false);</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -619,7 +688,8 @@ static inline int __must_check</div><div class='ctx'> devm_reset_control_bulk_get_exclusive_released(struct device *dev, int num_rstcs,</div><div class='ctx'> 					       struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, false, false, false);</div><div class='add'>+	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs,</div><div class='add'>+					     RESET_CONTROL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -638,7 +708,7 @@ static inline struct reset_control *</div><div class='ctx'> __must_check devm_reset_control_get_optional_exclusive_released(struct device *dev,</div><div class='ctx'> 								const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_get(dev, id, 0, false, true, false);</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_OPTIONAL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -658,7 +728,8 @@ static inline int __must_check</div><div class='ctx'> devm_reset_control_bulk_get_optional_exclusive_released(struct device *dev, int num_rstcs,</div><div class='ctx'> 							struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, false, true, false);</div><div class='add'>+	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs,</div><div class='add'>+					     RESET_CONTROL_OPTIONAL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -673,7 +744,26 @@ devm_reset_control_bulk_get_optional_exclusive_released(struct device *dev, int</div><div class='ctx'> static inline struct reset_control *devm_reset_control_get_shared(</div><div class='ctx'> 					struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_get(dev, id, 0, true, false, false);</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_SHARED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_reset_control_get_shared_deasserted - resource managed</div><div class='add'>+ *                                            reset_control_get_shared() +</div><div class='add'>+ *                                            reset_control_deassert()</div><div class='add'>+ * @dev: device to be reset by the controller</div><div class='add'>+ * @id: reset line name</div><div class='add'>+ *</div><div class='add'>+ * Managed reset_control_get_shared() + reset_control_deassert(). For reset</div><div class='add'>+ * controllers returned from this function, reset_control_assert() +</div><div class='add'>+ * reset_control_put() is called automatically on driver detach.</div><div class='add'>+ *</div><div class='add'>+ * See devm_reset_control_get_shared() for more information.</div><div class='add'>+ */</div><div class='add'>+static inline struct reset_control * __must_check</div><div class='add'>+devm_reset_control_get_shared_deasserted(struct device *dev, const char *id)</div><div class='add'>+{</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_SHARED_DEASSERTED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -693,7 +783,29 @@ static inline int __must_check</div><div class='ctx'> devm_reset_control_bulk_get_shared(struct device *dev, int num_rstcs,</div><div class='ctx'> 				   struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, true, false, false);</div><div class='add'>+	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, RESET_CONTROL_SHARED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_reset_control_bulk_get_shared_deasserted - resource managed</div><div class='add'>+ *                                                 reset_control_bulk_get_shared() +</div><div class='add'>+ *                                                 reset_control_bulk_deassert()</div><div class='add'>+ * @dev: device to be reset by the controller</div><div class='add'>+ * @num_rstcs: number of entries in rstcs array</div><div class='add'>+ * @rstcs: array of struct reset_control_bulk_data with reset line names set</div><div class='add'>+ *</div><div class='add'>+ * Managed reset_control_bulk_get_shared() + reset_control_bulk_deassert(). For</div><div class='add'>+ * reset controllers returned from this function, reset_control_bulk_assert() +</div><div class='add'>+ * reset_control_bulk_put() are called automatically on driver detach.</div><div class='add'>+ *</div><div class='add'>+ * See devm_reset_control_bulk_get_shared() for more information.</div><div class='add'>+ */</div><div class='add'>+static inline int __must_check</div><div class='add'>+devm_reset_control_bulk_get_shared_deasserted(struct device *dev, int num_rstcs,</div><div class='add'>+					      struct reset_control_bulk_data *rstcs)</div><div class='add'>+{</div><div class='add'>+	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs,</div><div class='add'>+					     RESET_CONTROL_SHARED_DEASSERTED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -711,7 +823,26 @@ devm_reset_control_bulk_get_shared(struct device *dev, int num_rstcs,</div><div class='ctx'> static inline struct reset_control *devm_reset_control_get_optional_exclusive(</div><div class='ctx'> 					struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_get(dev, id, 0, false, true, true);</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_OPTIONAL_EXCLUSIVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_reset_control_get_optional_exclusive_deasserted - resource managed</div><div class='add'>+ *                                                        reset_control_get_optional_exclusive() +</div><div class='add'>+ *                                                        reset_control_deassert()</div><div class='add'>+ * @dev: device to be reset by the controller</div><div class='add'>+ * @id: reset line name</div><div class='add'>+ *</div><div class='add'>+ * Managed reset_control_get_optional_exclusive() + reset_control_deassert().</div><div class='add'>+ * For reset controllers returned from this function, reset_control_assert() +</div><div class='add'>+ * reset_control_put() is called automatically on driver detach.</div><div class='add'>+ *</div><div class='add'>+ * See devm_reset_control_get_optional_exclusive() for more information.</div><div class='add'>+ */</div><div class='add'>+static inline struct reset_control *</div><div class='add'>+devm_reset_control_get_optional_exclusive_deasserted(struct device *dev, const char *id)</div><div class='add'>+{</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_OPTIONAL_EXCLUSIVE_DEASSERTED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -731,7 +862,8 @@ static inline int __must_check</div><div class='ctx'> devm_reset_control_bulk_get_optional_exclusive(struct device *dev, int num_rstcs,</div><div class='ctx'> 					       struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, false, true, true);</div><div class='add'>+	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs,</div><div class='add'>+					     RESET_CONTROL_OPTIONAL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -749,7 +881,26 @@ devm_reset_control_bulk_get_optional_exclusive(struct device *dev, int num_rstcs</div><div class='ctx'> static inline struct reset_control *devm_reset_control_get_optional_shared(</div><div class='ctx'> 					struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_get(dev, id, 0, true, true, false);</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_OPTIONAL_SHARED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * devm_reset_control_get_optional_shared_deasserted - resource managed</div><div class='add'>+ *                                                     reset_control_get_optional_shared() +</div><div class='add'>+ *                                                     reset_control_deassert()</div><div class='add'>+ * @dev: device to be reset by the controller</div><div class='add'>+ * @id: reset line name</div><div class='add'>+ *</div><div class='add'>+ * Managed reset_control_get_optional_shared() + reset_control_deassert(). For</div><div class='add'>+ * reset controllers returned from this function, reset_control_assert() +</div><div class='add'>+ * reset_control_put() is called automatically on driver detach.</div><div class='add'>+ *</div><div class='add'>+ * See devm_reset_control_get_optional_shared() for more information.</div><div class='add'>+ */</div><div class='add'>+static inline struct reset_control *</div><div class='add'>+devm_reset_control_get_optional_shared_deasserted(struct device *dev, const char *id)</div><div class='add'>+{</div><div class='add'>+	return __devm_reset_control_get(dev, id, 0, RESET_CONTROL_OPTIONAL_SHARED_DEASSERTED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -769,7 +920,7 @@ static inline int __must_check</div><div class='ctx'> devm_reset_control_bulk_get_optional_shared(struct device *dev, int num_rstcs,</div><div class='ctx'> 					    struct reset_control_bulk_data *rstcs)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, true, true, false);</div><div class='add'>+	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, RESET_CONTROL_OPTIONAL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -787,7 +938,7 @@ devm_reset_control_bulk_get_optional_shared(struct device *dev, int num_rstcs,</div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> devm_reset_control_get_exclusive_by_index(struct device *dev, int index)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_get(dev, NULL, index, false, false, true);</div><div class='add'>+	return __devm_reset_control_get(dev, NULL, index, RESET_CONTROL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -803,7 +954,7 @@ devm_reset_control_get_exclusive_by_index(struct device *dev, int index)</div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> devm_reset_control_get_shared_by_index(struct device *dev, int index)</div><div class='ctx'> {</div><div class='del'>-	return __devm_reset_control_get(dev, NULL, index, true, false, false);</div><div class='add'>+	return __devm_reset_control_get(dev, NULL, index, RESET_CONTROL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -851,54 +1002,60 @@ static inline struct reset_control *devm_reset_control_get_by_index(</div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> devm_reset_control_array_get_exclusive(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return devm_reset_control_array_get(dev, false, false);</div><div class='add'>+	return devm_reset_control_array_get(dev, RESET_CONTROL_EXCLUSIVE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct reset_control *</div><div class='add'>+devm_reset_control_array_get_exclusive_released(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return devm_reset_control_array_get(dev, RESET_CONTROL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> devm_reset_control_array_get_shared(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return devm_reset_control_array_get(dev, true, false);</div><div class='add'>+	return devm_reset_control_array_get(dev, RESET_CONTROL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> devm_reset_control_array_get_optional_exclusive(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return devm_reset_control_array_get(dev, false, true);</div><div class='add'>+	return devm_reset_control_array_get(dev, RESET_CONTROL_OPTIONAL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> devm_reset_control_array_get_optional_shared(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	return devm_reset_control_array_get(dev, true, true);</div><div class='add'>+	return devm_reset_control_array_get(dev, RESET_CONTROL_OPTIONAL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> of_reset_control_array_get_exclusive(struct device_node *node)</div><div class='ctx'> {</div><div class='del'>-	return of_reset_control_array_get(node, false, false, true);</div><div class='add'>+	return of_reset_control_array_get(node, RESET_CONTROL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> of_reset_control_array_get_exclusive_released(struct device_node *node)</div><div class='ctx'> {</div><div class='del'>-	return of_reset_control_array_get(node, false, false, false);</div><div class='add'>+	return of_reset_control_array_get(node, RESET_CONTROL_EXCLUSIVE_RELEASED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> of_reset_control_array_get_shared(struct device_node *node)</div><div class='ctx'> {</div><div class='del'>-	return of_reset_control_array_get(node, true, false, true);</div><div class='add'>+	return of_reset_control_array_get(node, RESET_CONTROL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> of_reset_control_array_get_optional_exclusive(struct device_node *node)</div><div class='ctx'> {</div><div class='del'>-	return of_reset_control_array_get(node, false, true, true);</div><div class='add'>+	return of_reset_control_array_get(node, RESET_CONTROL_OPTIONAL_EXCLUSIVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct reset_control *</div><div class='ctx'> of_reset_control_array_get_optional_shared(struct device_node *node)</div><div class='ctx'> {</div><div class='del'>-	return of_reset_control_array_get(node, true, true, true);</div><div class='add'>+	return of_reset_control_array_get(node, RESET_CONTROL_OPTIONAL_SHARED);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/restart_block.h b/include/linux/restart_block.h<br/>index 13f17676c5f4..36ddfa1ec301 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/restart_block.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/restart_block.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/restart_block.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/restart_block.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@ struct restart_block {</div><div class='ctx'> 	unsigned long arch_data;</div><div class='ctx'> 	long (*fn)(struct restart_block *);</div><div class='ctx'> 	union {</div><div class='del'>-		/* For futex_wait and futex_wait_requeue_pi */</div><div class='add'>+		/* For futex_wait() */</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u32 __user *uaddr;</div><div class='ctx'> 			u32 val;</div><div class='hunk'>@@ -43,7 +43,7 @@ struct restart_block {</div><div class='ctx'> 				struct __kernel_timespec __user *rmtp;</div><div class='ctx'> 				struct old_timespec32 __user *compat_rmtp;</div><div class='ctx'> 			};</div><div class='del'>-			u64 expires;</div><div class='add'>+			ktime_t expires;</div><div class='ctx'> 		} nanosleep;</div><div class='ctx'> 		/* For poll */</div><div class='ctx'> 		struct {</div><div class='head'>diff --git a/include/linux/resume_user_mode.h b/include/linux/resume_user_mode.h<br/>index e0135e0adae0..bf92227c78d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/resume_user_mode.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/resume_user_mode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/resume_user_mode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/resume_user_mode.h</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static inline void resume_user_mode_work(struct pt_regs *regs)</div><div class='ctx'> 	mem_cgroup_handle_over_high(GFP_KERNEL);</div><div class='ctx'> 	blkcg_maybe_throttle_current();</div><div class='ctx'> </div><div class='del'>-	rseq_handle_notify_resume(NULL, regs);</div><div class='add'>+	rseq_handle_slowpath(regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* LINUX_RESUME_USER_MODE_H */</div><div class='head'>diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h<br/>index 373003ace639..6816e4c5f3f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rfkill.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rfkill.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rfkill.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rfkill.h</a></div><div class='hunk'>@@ -147,7 +147,8 @@ void rfkill_destroy(struct rfkill *rfkill);</div><div class='ctx'>  * Prefer to use rfkill_set_hw_state if you don't need any special reason.</div><div class='ctx'>  */</div><div class='ctx'> bool rfkill_set_hw_state_reason(struct rfkill *rfkill,</div><div class='del'>-				bool blocked, unsigned long reason);</div><div class='add'>+				bool blocked,</div><div class='add'>+				enum rfkill_hard_block_reasons reason);</div><div class='ctx'> /**</div><div class='ctx'>  * rfkill_set_hw_state - Set the internal rfkill hardware block state</div><div class='ctx'>  * @rfkill: pointer to the rfkill class to modify.</div><div class='hunk'>@@ -240,7 +241,7 @@ bool rfkill_soft_blocked(struct rfkill *rfkill);</div><div class='ctx'>  * rfkill_find_type - Helper for finding rfkill type by name</div><div class='ctx'>  * @name: the name of the type</div><div class='ctx'>  *</div><div class='del'>- * Returns enum rfkill_type that corresponds to the name.</div><div class='add'>+ * Returns: enum rfkill_type that corresponds to the name.</div><div class='ctx'>  */</div><div class='ctx'> enum rfkill_type rfkill_find_type(const char *name);</div><div class='ctx'> </div><div class='hunk'>@@ -280,7 +281,7 @@ static inline void rfkill_destroy(struct rfkill *rfkill)</div><div class='ctx'> </div><div class='ctx'> static inline bool rfkill_set_hw_state_reason(struct rfkill *rfkill,</div><div class='ctx'> 					      bool blocked,</div><div class='del'>-					      unsigned long reason)</div><div class='add'>+					      enum rfkill_hard_block_reasons reason)</div><div class='ctx'> {</div><div class='ctx'> 	return blocked;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/rhashtable-types.h b/include/linux/rhashtable-types.h<br/>index b6f3797277ff..015c8298bebc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rhashtable-types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rhashtable-types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rhashtable-types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rhashtable-types.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #ifndef _LINUX_RHASHTABLE_TYPES_H</div><div class='ctx'> #define _LINUX_RHASHTABLE_TYPES_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/alloc_tag.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -88,6 +89,9 @@ struct rhashtable {</div><div class='ctx'> 	struct mutex                    mutex;</div><div class='ctx'> 	spinlock_t			lock;</div><div class='ctx'> 	atomic_t			nelems;</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING</div><div class='add'>+	struct alloc_tag		*alloc_tag;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -127,9 +131,12 @@ struct rhashtable_iter {</div><div class='ctx'> 	bool end_of_table;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int rhashtable_init(struct rhashtable *ht,</div><div class='add'>+int rhashtable_init_noprof(struct rhashtable *ht,</div><div class='ctx'> 		    const struct rhashtable_params *params);</div><div class='del'>-int rhltable_init(struct rhltable *hlt,</div><div class='add'>+#define rhashtable_init(...)	alloc_hooks(rhashtable_init_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+int rhltable_init_noprof(struct rhltable *hlt,</div><div class='ctx'> 		  const struct rhashtable_params *params);</div><div class='add'>+#define rhltable_init(...)	alloc_hooks(rhltable_init_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_RHASHTABLE_TYPES_H */</div><div class='head'>diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h<br/>index 5b5357c0bd8c..08e664b21f5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rhashtable.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rhashtable.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rhashtable.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rhashtable.h</a></div><div class='hunk'>@@ -122,7 +122,7 @@ static inline unsigned int rht_bucket_index(const struct bucket_table *tbl,</div><div class='ctx'> 	return hash &amp; (tbl-&gt;size - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int rht_key_get_hash(struct rhashtable *ht,</div><div class='add'>+static __always_inline unsigned int rht_key_get_hash(struct rhashtable *ht,</div><div class='ctx'> 	const void *key, const struct rhashtable_params params,</div><div class='ctx'> 	unsigned int hash_rnd)</div><div class='ctx'> {</div><div class='hunk'>@@ -152,7 +152,7 @@ static inline unsigned int rht_key_get_hash(struct rhashtable *ht,</div><div class='ctx'> 	return hash;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int rht_key_hashfn(</div><div class='add'>+static __always_inline unsigned int rht_key_hashfn(</div><div class='ctx'> 	struct rhashtable *ht, const struct bucket_table *tbl,</div><div class='ctx'> 	const void *key, const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -161,7 +161,7 @@ static inline unsigned int rht_key_hashfn(</div><div class='ctx'> 	return rht_bucket_index(tbl, hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int rht_head_hashfn(</div><div class='add'>+static __always_inline unsigned int rht_head_hashfn(</div><div class='ctx'> 	struct rhashtable *ht, const struct bucket_table *tbl,</div><div class='ctx'> 	const struct rhash_head *he, const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -272,13 +272,13 @@ struct rhash_lock_head __rcu **rht_bucket_nested_insert(</div><div class='ctx'> 	rcu_dereference_protected(p, lockdep_rht_mutex_is_held(ht))</div><div class='ctx'> </div><div class='ctx'> #define rht_dereference_rcu(p, ht) \</div><div class='del'>-	rcu_dereference_check(p, lockdep_rht_mutex_is_held(ht))</div><div class='add'>+	rcu_dereference_all_check(p, lockdep_rht_mutex_is_held(ht))</div><div class='ctx'> </div><div class='ctx'> #define rht_dereference_bucket(p, tbl, hash) \</div><div class='ctx'> 	rcu_dereference_protected(p, lockdep_rht_bucket_is_held(tbl, hash))</div><div class='ctx'> </div><div class='ctx'> #define rht_dereference_bucket_rcu(p, tbl, hash) \</div><div class='del'>-	rcu_dereference_check(p, lockdep_rht_bucket_is_held(tbl, hash))</div><div class='add'>+	rcu_dereference_all_check(p, lockdep_rht_bucket_is_held(tbl, hash))</div><div class='ctx'> </div><div class='ctx'> #define rht_entry(tpos, pos, member) \</div><div class='ctx'> 	({ tpos = container_of(pos, typeof(*tpos), member); 1; })</div><div class='hunk'>@@ -355,12 +355,25 @@ static inline void rht_unlock(struct bucket_table *tbl,</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct rhash_head *__rht_ptr(</div><div class='del'>-	struct rhash_lock_head *p, struct rhash_lock_head __rcu *const *bkt)</div><div class='add'>+enum rht_lookup_freq {</div><div class='add'>+	RHT_LOOKUP_NORMAL,</div><div class='add'>+	RHT_LOOKUP_LIKELY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __always_inline struct rhash_head *__rht_ptr(</div><div class='add'>+	struct rhash_lock_head *p, struct rhash_lock_head __rcu *const *bkt,</div><div class='add'>+	const enum rht_lookup_freq freq)</div><div class='ctx'> {</div><div class='del'>-	return (struct rhash_head *)</div><div class='del'>-		((unsigned long)p &amp; ~BIT(0) ?:</div><div class='del'>-		 (unsigned long)RHT_NULLS_MARKER(bkt));</div><div class='add'>+	unsigned long p_val = (unsigned long)p &amp; ~BIT(0);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(!__builtin_constant_p(freq));</div><div class='add'>+</div><div class='add'>+	if (freq == RHT_LOOKUP_LIKELY)</div><div class='add'>+		return (struct rhash_head *)</div><div class='add'>+			(likely(p_val) ? p_val : (unsigned long)RHT_NULLS_MARKER(bkt));</div><div class='add'>+	else</div><div class='add'>+		return (struct rhash_head *)</div><div class='add'>+			(p_val ?: (unsigned long)RHT_NULLS_MARKER(bkt));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -370,10 +383,17 @@ static inline struct rhash_head *__rht_ptr(</div><div class='ctx'>  *   rht_ptr_exclusive() dereferences in a context where exclusive</div><div class='ctx'>  *            access is guaranteed, such as when destroying the table.</div><div class='ctx'>  */</div><div class='add'>+static __always_inline struct rhash_head *__rht_ptr_rcu(</div><div class='add'>+	struct rhash_lock_head __rcu *const *bkt,</div><div class='add'>+	const enum rht_lookup_freq freq)</div><div class='add'>+{</div><div class='add'>+	return __rht_ptr(rcu_dereference_all(*bkt), bkt, freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct rhash_head *rht_ptr_rcu(</div><div class='ctx'> 	struct rhash_lock_head __rcu *const *bkt)</div><div class='ctx'> {</div><div class='del'>-	return __rht_ptr(rcu_dereference(*bkt), bkt);</div><div class='add'>+	return __rht_ptr_rcu(bkt, RHT_LOOKUP_NORMAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct rhash_head *rht_ptr(</div><div class='hunk'>@@ -381,13 +401,15 @@ static inline struct rhash_head *rht_ptr(</div><div class='ctx'> 	struct bucket_table *tbl,</div><div class='ctx'> 	unsigned int hash)</div><div class='ctx'> {</div><div class='del'>-	return __rht_ptr(rht_dereference_bucket(*bkt, tbl, hash), bkt);</div><div class='add'>+	return __rht_ptr(rht_dereference_bucket(*bkt, tbl, hash), bkt,</div><div class='add'>+			 RHT_LOOKUP_NORMAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct rhash_head *rht_ptr_exclusive(</div><div class='ctx'> 	struct rhash_lock_head __rcu *const *bkt)</div><div class='ctx'> {</div><div class='del'>-	return __rht_ptr(rcu_dereference_protected(*bkt, 1), bkt);</div><div class='add'>+	return __rht_ptr(rcu_dereference_protected(*bkt, 1), bkt,</div><div class='add'>+			 RHT_LOOKUP_NORMAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void rht_assign_locked(struct rhash_lock_head __rcu **bkt,</div><div class='hunk'>@@ -497,7 +519,7 @@ static inline void rht_assign_unlock(struct bucket_table *tbl,</div><div class='ctx'> 	for (({barrier(); }),						\</div><div class='ctx'> 	     pos = head;						\</div><div class='ctx'> 	     !rht_is_a_nulls(pos);					\</div><div class='del'>-	     pos = rcu_dereference_raw(pos-&gt;next))</div><div class='add'>+	     pos = rcu_dereference_all(pos-&gt;next))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * rht_for_each_rcu - iterate over rcu hash chain</div><div class='hunk'>@@ -513,7 +535,7 @@ static inline void rht_assign_unlock(struct bucket_table *tbl,</div><div class='ctx'> 	for (({barrier(); }),					\</div><div class='ctx'> 	     pos = rht_ptr_rcu(rht_bucket(tbl, hash));		\</div><div class='ctx'> 	     !rht_is_a_nulls(pos);				\</div><div class='del'>-	     pos = rcu_dereference_raw(pos-&gt;next))</div><div class='add'>+	     pos = rcu_dereference_all(pos-&gt;next))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * rht_for_each_entry_rcu_from - iterated over rcu hash chain from given head</div><div class='hunk'>@@ -560,7 +582,7 @@ static inline void rht_assign_unlock(struct bucket_table *tbl,</div><div class='ctx'>  * list returned by rhltable_lookup.</div><div class='ctx'>  */</div><div class='ctx'> #define rhl_for_each_rcu(pos, list)					\</div><div class='del'>-	for (pos = list; pos; pos = rcu_dereference_raw(pos-&gt;next))</div><div class='add'>+	for (pos = list; pos; pos = rcu_dereference_all(pos-&gt;next))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * rhl_for_each_entry_rcu - iterate over rcu hash table list of given type</div><div class='hunk'>@@ -574,7 +596,7 @@ static inline void rht_assign_unlock(struct bucket_table *tbl,</div><div class='ctx'>  */</div><div class='ctx'> #define rhl_for_each_entry_rcu(tpos, pos, list, member)			\</div><div class='ctx'> 	for (pos = list; pos &amp;&amp; rht_entry(tpos, pos, member);		\</div><div class='del'>-	     pos = rcu_dereference_raw(pos-&gt;next))</div><div class='add'>+	     pos = rcu_dereference_all(pos-&gt;next))</div><div class='ctx'> </div><div class='ctx'> static inline int rhashtable_compare(struct rhashtable_compare_arg *arg,</div><div class='ctx'> 				     const void *obj)</div><div class='hunk'>@@ -586,9 +608,10 @@ static inline int rhashtable_compare(struct rhashtable_compare_arg *arg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Internal function, do not use. */</div><div class='del'>-static inline struct rhash_head *__rhashtable_lookup(</div><div class='add'>+static __always_inline struct rhash_head *__rhashtable_lookup(</div><div class='ctx'> 	struct rhashtable *ht, const void *key,</div><div class='del'>-	const struct rhashtable_params params)</div><div class='add'>+	const struct rhashtable_params params,</div><div class='add'>+	const enum rht_lookup_freq freq)</div><div class='ctx'> {</div><div class='ctx'> 	struct rhashtable_compare_arg arg = {</div><div class='ctx'> 		.ht = ht,</div><div class='hunk'>@@ -599,12 +622,13 @@ static inline struct rhash_head *__rhashtable_lookup(</div><div class='ctx'> 	struct rhash_head *he;</div><div class='ctx'> 	unsigned int hash;</div><div class='ctx'> </div><div class='add'>+	BUILD_BUG_ON(!__builtin_constant_p(freq));</div><div class='ctx'> 	tbl = rht_dereference_rcu(ht-&gt;tbl, ht);</div><div class='ctx'> restart:</div><div class='ctx'> 	hash = rht_key_hashfn(ht, tbl, key, params);</div><div class='ctx'> 	bkt = rht_bucket(tbl, hash);</div><div class='ctx'> 	do {</div><div class='del'>-		rht_for_each_rcu_from(he, rht_ptr_rcu(bkt), tbl, hash) {</div><div class='add'>+		rht_for_each_rcu_from(he, __rht_ptr_rcu(bkt, freq), tbl, hash) {</div><div class='ctx'> 			if (params.obj_cmpfn ?</div><div class='ctx'> 			    params.obj_cmpfn(&amp;arg, rht_obj(ht, he)) :</div><div class='ctx'> 			    rhashtable_compare(&amp;arg, rht_obj(ht, he)))</div><div class='hunk'>@@ -633,21 +657,32 @@ restart:</div><div class='ctx'>  * @params:	hash table parameters</div><div class='ctx'>  *</div><div class='ctx'>  * Computes the hash value for the key and traverses the bucket chain looking</div><div class='del'>- * for a entry with an identical key. The first matching entry is returned.</div><div class='add'>+ * for an entry with an identical key. The first matching entry is returned.</div><div class='ctx'>  *</div><div class='ctx'>  * This must only be called under the RCU read lock.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the first entry on which the compare function returned true.</div><div class='ctx'>  */</div><div class='del'>-static inline void *rhashtable_lookup(</div><div class='add'>+static __always_inline void *rhashtable_lookup(</div><div class='ctx'> 	struct rhashtable *ht, const void *key,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='del'>-	struct rhash_head *he = __rhashtable_lookup(ht, key, params);</div><div class='add'>+	struct rhash_head *he = __rhashtable_lookup(ht, key, params,</div><div class='add'>+						    RHT_LOOKUP_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	return he ? rht_obj(ht, he) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline void *rhashtable_lookup_likely(</div><div class='add'>+	struct rhashtable *ht, const void *key,</div><div class='add'>+	const struct rhashtable_params params)</div><div class='add'>+{</div><div class='add'>+	struct rhash_head *he = __rhashtable_lookup(ht, key, params,</div><div class='add'>+						    RHT_LOOKUP_LIKELY);</div><div class='add'>+</div><div class='add'>+	return likely(he) ? rht_obj(ht, he) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * rhashtable_lookup_fast - search hash table, without RCU read lock</div><div class='ctx'>  * @ht:		hash table</div><div class='hunk'>@@ -655,14 +690,14 @@ static inline void *rhashtable_lookup(</div><div class='ctx'>  * @params:	hash table parameters</div><div class='ctx'>  *</div><div class='ctx'>  * Computes the hash value for the key and traverses the bucket chain looking</div><div class='del'>- * for a entry with an identical key. The first matching entry is returned.</div><div class='add'>+ * for an entry with an identical key. The first matching entry is returned.</div><div class='ctx'>  *</div><div class='ctx'>  * Only use this function when you have other mechanisms guaranteeing</div><div class='ctx'>  * that the object won't go away after the RCU read lock is released.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the first entry on which the compare function returned true.</div><div class='ctx'>  */</div><div class='del'>-static inline void *rhashtable_lookup_fast(</div><div class='add'>+static __always_inline void *rhashtable_lookup_fast(</div><div class='ctx'> 	struct rhashtable *ht, const void *key,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -682,27 +717,38 @@ static inline void *rhashtable_lookup_fast(</div><div class='ctx'>  * @params:	hash table parameters</div><div class='ctx'>  *</div><div class='ctx'>  * Computes the hash value for the key and traverses the bucket chain looking</div><div class='del'>- * for a entry with an identical key.  All matching entries are returned</div><div class='add'>+ * for an entry with an identical key.  All matching entries are returned</div><div class='ctx'>  * in a list.</div><div class='ctx'>  *</div><div class='ctx'>  * This must only be called under the RCU read lock.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the list of entries that match the given key.</div><div class='ctx'>  */</div><div class='del'>-static inline struct rhlist_head *rhltable_lookup(</div><div class='add'>+static __always_inline struct rhlist_head *rhltable_lookup(</div><div class='ctx'> 	struct rhltable *hlt, const void *key,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='del'>-	struct rhash_head *he = __rhashtable_lookup(&amp;hlt-&gt;ht, key, params);</div><div class='add'>+	struct rhash_head *he = __rhashtable_lookup(&amp;hlt-&gt;ht, key, params,</div><div class='add'>+						    RHT_LOOKUP_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	return he ? container_of(he, struct rhlist_head, rhead) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline struct rhlist_head *rhltable_lookup_likely(</div><div class='add'>+	struct rhltable *hlt, const void *key,</div><div class='add'>+	const struct rhashtable_params params)</div><div class='add'>+{</div><div class='add'>+	struct rhash_head *he = __rhashtable_lookup(&amp;hlt-&gt;ht, key, params,</div><div class='add'>+						    RHT_LOOKUP_LIKELY);</div><div class='add'>+</div><div class='add'>+	return likely(he) ? container_of(he, struct rhlist_head, rhead) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Internal function, please use rhashtable_insert_fast() instead. This</div><div class='del'>- * function returns the existing element already in hashes in there is a clash,</div><div class='add'>+ * function returns the existing element already in hashes if there is a clash,</div><div class='ctx'>  * otherwise it returns an error via ERR_PTR().</div><div class='ctx'>  */</div><div class='del'>-static inline void *__rhashtable_insert_fast(</div><div class='add'>+static __always_inline void *__rhashtable_insert_fast(</div><div class='ctx'> 	struct rhashtable *ht, const void *key, struct rhash_head *obj,</div><div class='ctx'> 	const struct rhashtable_params params, bool rhlist)</div><div class='ctx'> {</div><div class='hunk'>@@ -825,7 +871,7 @@ out_unlock:</div><div class='ctx'>  * Will trigger an automatic deferred table resizing if residency in the</div><div class='ctx'>  * table grows beyond 70%.</div><div class='ctx'>  */</div><div class='del'>-static inline int rhashtable_insert_fast(</div><div class='add'>+static __always_inline int rhashtable_insert_fast(</div><div class='ctx'> 	struct rhashtable *ht, struct rhash_head *obj,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -854,7 +900,7 @@ static inline int rhashtable_insert_fast(</div><div class='ctx'>  * Will trigger an automatic deferred table resizing if residency in the</div><div class='ctx'>  * table grows beyond 70%.</div><div class='ctx'>  */</div><div class='del'>-static inline int rhltable_insert_key(</div><div class='add'>+static __always_inline int rhltable_insert_key(</div><div class='ctx'> 	struct rhltable *hlt, const void *key, struct rhlist_head *list,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -877,7 +923,7 @@ static inline int rhltable_insert_key(</div><div class='ctx'>  * Will trigger an automatic deferred table resizing if residency in the</div><div class='ctx'>  * table grows beyond 70%.</div><div class='ctx'>  */</div><div class='del'>-static inline int rhltable_insert(</div><div class='add'>+static __always_inline int rhltable_insert(</div><div class='ctx'> 	struct rhltable *hlt, struct rhlist_head *list,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -902,7 +948,7 @@ static inline int rhltable_insert(</div><div class='ctx'>  * Will trigger an automatic deferred table resizing if residency in the</div><div class='ctx'>  * table grows beyond 70%.</div><div class='ctx'>  */</div><div class='del'>-static inline int rhashtable_lookup_insert_fast(</div><div class='add'>+static __always_inline int rhashtable_lookup_insert_fast(</div><div class='ctx'> 	struct rhashtable *ht, struct rhash_head *obj,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -929,7 +975,7 @@ static inline int rhashtable_lookup_insert_fast(</div><div class='ctx'>  * object if it exists, NULL if it did not and the insertion was successful,</div><div class='ctx'>  * and an ERR_PTR otherwise.</div><div class='ctx'>  */</div><div class='del'>-static inline void *rhashtable_lookup_get_insert_fast(</div><div class='add'>+static __always_inline void *rhashtable_lookup_get_insert_fast(</div><div class='ctx'> 	struct rhashtable *ht, struct rhash_head *obj,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -956,7 +1002,7 @@ static inline void *rhashtable_lookup_get_insert_fast(</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success.</div><div class='ctx'>  */</div><div class='del'>-static inline int rhashtable_lookup_insert_key(</div><div class='add'>+static __always_inline int rhashtable_lookup_insert_key(</div><div class='ctx'> 	struct rhashtable *ht, const void *key, struct rhash_head *obj,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -982,7 +1028,7 @@ static inline int rhashtable_lookup_insert_key(</div><div class='ctx'>  * object if it exists, NULL if it does not and the insertion was successful,</div><div class='ctx'>  * and an ERR_PTR otherwise.</div><div class='ctx'>  */</div><div class='del'>-static inline void *rhashtable_lookup_get_insert_key(</div><div class='add'>+static __always_inline void *rhashtable_lookup_get_insert_key(</div><div class='ctx'> 	struct rhashtable *ht, const void *key, struct rhash_head *obj,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -992,7 +1038,7 @@ static inline void *rhashtable_lookup_get_insert_key(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Internal function, please use rhashtable_remove_fast() instead */</div><div class='del'>-static inline int __rhashtable_remove_fast_one(</div><div class='add'>+static __always_inline int __rhashtable_remove_fast_one(</div><div class='ctx'> 	struct rhashtable *ht, struct bucket_table *tbl,</div><div class='ctx'> 	struct rhash_head *obj, const struct rhashtable_params params,</div><div class='ctx'> 	bool rhlist)</div><div class='hunk'>@@ -1074,7 +1120,7 @@ unlocked:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Internal function, please use rhashtable_remove_fast() instead */</div><div class='del'>-static inline int __rhashtable_remove_fast(</div><div class='add'>+static __always_inline int __rhashtable_remove_fast(</div><div class='ctx'> 	struct rhashtable *ht, struct rhash_head *obj,</div><div class='ctx'> 	const struct rhashtable_params params, bool rhlist)</div><div class='ctx'> {</div><div class='hunk'>@@ -1115,7 +1161,7 @@ static inline int __rhashtable_remove_fast(</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success, -ENOENT if the entry could not be found.</div><div class='ctx'>  */</div><div class='del'>-static inline int rhashtable_remove_fast(</div><div class='add'>+static __always_inline int rhashtable_remove_fast(</div><div class='ctx'> 	struct rhashtable *ht, struct rhash_head *obj,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -1130,14 +1176,14 @@ static inline int rhashtable_remove_fast(</div><div class='ctx'>  *</div><div class='ctx'>  * Since the hash chain is single linked, the removal operation needs to</div><div class='ctx'>  * walk the bucket chain upon removal. The removal operation is thus</div><div class='del'>- * considerable slow if the hash table is not correctly sized.</div><div class='add'>+ * considerably slower if the hash table is not correctly sized.</div><div class='ctx'>  *</div><div class='ctx'>  * Will automatically shrink the table if permitted when residency drops</div><div class='ctx'>  * below 30%</div><div class='ctx'>  *</div><div class='ctx'>  * Returns zero on success, -ENOENT if the entry could not be found.</div><div class='ctx'>  */</div><div class='del'>-static inline int rhltable_remove(</div><div class='add'>+static __always_inline int rhltable_remove(</div><div class='ctx'> 	struct rhltable *hlt, struct rhlist_head *list,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='ctx'> {</div><div class='hunk'>@@ -1145,7 +1191,7 @@ static inline int rhltable_remove(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Internal function, please use rhashtable_replace_fast() instead */</div><div class='del'>-static inline int __rhashtable_replace_fast(</div><div class='add'>+static __always_inline int __rhashtable_replace_fast(</div><div class='ctx'> 	struct rhashtable *ht, struct bucket_table *tbl,</div><div class='ctx'> 	struct rhash_head *obj_old, struct rhash_head *obj_new,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='hunk'>@@ -1208,7 +1254,7 @@ unlocked:</div><div class='ctx'>  * Returns zero on success, -ENOENT if the entry could not be found,</div><div class='ctx'>  * -EINVAL if hash is not the same for the old and new objects.</div><div class='ctx'>  */</div><div class='del'>-static inline int rhashtable_replace_fast(</div><div class='add'>+static __always_inline int rhashtable_replace_fast(</div><div class='ctx'> 	struct rhashtable *ht, struct rhash_head *obj_old,</div><div class='ctx'> 	struct rhash_head *obj_new,</div><div class='ctx'> 	const struct rhashtable_params params)</div><div class='hunk'>@@ -1259,7 +1305,7 @@ static inline int rhashtable_replace_fast(</div><div class='ctx'> static inline void rhltable_walk_enter(struct rhltable *hlt,</div><div class='ctx'> 				       struct rhashtable_iter *iter)</div><div class='ctx'> {</div><div class='del'>-	return rhashtable_walk_enter(&amp;hlt-&gt;ht, iter);</div><div class='add'>+	rhashtable_walk_enter(&amp;hlt-&gt;ht, iter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1275,12 +1321,12 @@ static inline void rhltable_free_and_destroy(struct rhltable *hlt,</div><div class='ctx'> 							     void *arg),</div><div class='ctx'> 					     void *arg)</div><div class='ctx'> {</div><div class='del'>-	return rhashtable_free_and_destroy(&amp;hlt-&gt;ht, free_fn, arg);</div><div class='add'>+	rhashtable_free_and_destroy(&amp;hlt-&gt;ht, free_fn, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void rhltable_destroy(struct rhltable *hlt)</div><div class='ctx'> {</div><div class='del'>-	return rhltable_free_and_destroy(hlt, NULL, NULL);</div><div class='add'>+	rhltable_free_and_destroy(hlt, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_RHASHTABLE_H */</div><div class='head'>diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h<br/>index fa802db216f9..876358cfe1b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ring_buffer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ring_buffer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ring_buffer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ring_buffer.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;uapi/linux/trace_mmap.h&gt;</div><div class='add'>+</div><div class='ctx'> struct trace_buffer;</div><div class='ctx'> struct ring_buffer_iter;</div><div class='ctx'> </div><div class='hunk'>@@ -87,6 +89,14 @@ void ring_buffer_discard_commit(struct trace_buffer *buffer,</div><div class='ctx'> struct trace_buffer *</div><div class='ctx'> __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *key);</div><div class='ctx'> </div><div class='add'>+struct trace_buffer *__ring_buffer_alloc_range(unsigned long size, unsigned flags,</div><div class='add'>+					       int order, unsigned long start,</div><div class='add'>+					       unsigned long range_size,</div><div class='add'>+					       unsigned long scratch_size,</div><div class='add'>+					       struct lock_class_key *key);</div><div class='add'>+</div><div class='add'>+void *ring_buffer_meta_scratch(struct trace_buffer *buffer, unsigned int *size);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Because the ring buffer is generic, if other users of the ring buffer get</div><div class='ctx'>  * traced by ftrace, it can produce lockdep warnings. We need to keep each</div><div class='hunk'>@@ -98,7 +108,21 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k</div><div class='ctx'> 	__ring_buffer_alloc((size), (flags), &amp;__key);	\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full);</div><div class='add'>+/*</div><div class='add'>+ * Because the ring buffer is generic, if other users of the ring buffer get</div><div class='add'>+ * traced by ftrace, it can produce lockdep warnings. We need to keep each</div><div class='add'>+ * ring buffer's lock class separate.</div><div class='add'>+ */</div><div class='add'>+#define ring_buffer_alloc_range(size, flags, order, start, range_size, s_size)	\</div><div class='add'>+({									\</div><div class='add'>+	static struct lock_class_key __key;				\</div><div class='add'>+	__ring_buffer_alloc_range((size), (flags), (order), (start),	\</div><div class='add'>+				  (range_size), (s_size), &amp;__key);	\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+typedef bool (*ring_buffer_cond_fn)(void *data);</div><div class='add'>+int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full,</div><div class='add'>+		     ring_buffer_cond_fn cond, void *data);</div><div class='ctx'> __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu,</div><div class='ctx'> 			  struct file *filp, poll_table *poll_table, int full);</div><div class='ctx'> void ring_buffer_wake_waiters(struct trace_buffer *buffer, int cpu);</div><div class='hunk'>@@ -120,6 +144,9 @@ int ring_buffer_write(struct trace_buffer *buffer,</div><div class='ctx'> void ring_buffer_nest_start(struct trace_buffer *buffer);</div><div class='ctx'> void ring_buffer_nest_end(struct trace_buffer *buffer);</div><div class='ctx'> </div><div class='add'>+DEFINE_GUARD(ring_buffer_nest, struct trace_buffer *,</div><div class='add'>+	     ring_buffer_nest_start(_T), ring_buffer_nest_end(_T))</div><div class='add'>+</div><div class='ctx'> struct ring_buffer_event *</div><div class='ctx'> ring_buffer_peek(struct trace_buffer *buffer, int cpu, u64 *ts,</div><div class='ctx'> 		 unsigned long *lost_events);</div><div class='hunk'>@@ -128,9 +155,7 @@ ring_buffer_consume(struct trace_buffer *buffer, int cpu, u64 *ts,</div><div class='ctx'> 		    unsigned long *lost_events);</div><div class='ctx'> </div><div class='ctx'> struct ring_buffer_iter *</div><div class='del'>-ring_buffer_read_prepare(struct trace_buffer *buffer, int cpu, gfp_t flags);</div><div class='del'>-void ring_buffer_read_prepare_sync(void);</div><div class='del'>-void ring_buffer_read_start(struct ring_buffer_iter *iter);</div><div class='add'>+ring_buffer_read_start(struct trace_buffer *buffer, int cpu, gfp_t flags);</div><div class='ctx'> void ring_buffer_read_finish(struct ring_buffer_iter *iter);</div><div class='ctx'> </div><div class='ctx'> struct ring_buffer_event *</div><div class='hunk'>@@ -168,6 +193,7 @@ void ring_buffer_record_off(struct trace_buffer *buffer);</div><div class='ctx'> void ring_buffer_record_on(struct trace_buffer *buffer);</div><div class='ctx'> bool ring_buffer_record_is_on(struct trace_buffer *buffer);</div><div class='ctx'> bool ring_buffer_record_is_set_on(struct trace_buffer *buffer);</div><div class='add'>+bool ring_buffer_record_is_on_cpu(struct trace_buffer *buffer, int cpu);</div><div class='ctx'> void ring_buffer_record_disable_cpu(struct trace_buffer *buffer, int cpu);</div><div class='ctx'> void ring_buffer_record_enable_cpu(struct trace_buffer *buffer, int cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +215,6 @@ void ring_buffer_set_clock(struct trace_buffer *buffer,</div><div class='ctx'> void ring_buffer_set_time_stamp_abs(struct trace_buffer *buffer, bool abs);</div><div class='ctx'> bool ring_buffer_time_stamp_abs(struct trace_buffer *buffer);</div><div class='ctx'> </div><div class='del'>-size_t ring_buffer_nr_pages(struct trace_buffer *buffer, int cpu);</div><div class='ctx'> size_t ring_buffer_nr_dirty_pages(struct trace_buffer *buffer, int cpu);</div><div class='ctx'> </div><div class='ctx'> struct buffer_data_read_page;</div><div class='hunk'>@@ -221,4 +246,8 @@ int trace_rb_cpu_prepare(unsigned int cpu, struct hlist_node *node);</div><div class='ctx'> #define trace_rb_cpu_prepare	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int ring_buffer_map(struct trace_buffer *buffer, int cpu,</div><div class='add'>+		    struct vm_area_struct *vma);</div><div class='add'>+int ring_buffer_unmap(struct trace_buffer *buffer, int cpu);</div><div class='add'>+int ring_buffer_map_get_reader(struct trace_buffer *buffer, int cpu);</div><div class='ctx'> #endif /* _LINUX_RING_BUFFER_H */</div><div class='head'>diff --git a/include/linux/rio.h b/include/linux/rio.h<br/>index 2cd637268b4f..2c29f21ba9e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rio.h</a></div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'> #define RIO_CTAG_RESRVD	0xfffe0000 /* Reserved */</div><div class='ctx'> #define RIO_CTAG_UDEVID	0x0001ffff /* Unique device identifier */</div><div class='ctx'> </div><div class='del'>-extern struct bus_type rio_bus_type;</div><div class='add'>+extern const struct bus_type rio_bus_type;</div><div class='ctx'> extern struct class rio_mport_class;</div><div class='ctx'> </div><div class='ctx'> struct rio_mport;</div><div class='hunk'>@@ -465,7 +465,7 @@ struct rio_driver {</div><div class='ctx'> 	struct device_driver driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define	to_rio_driver(drv) container_of(drv,struct rio_driver, driver)</div><div class='add'>+#define	to_rio_driver(drv) container_of_const(drv,struct rio_driver, driver)</div><div class='ctx'> </div><div class='ctx'> union rio_pw_msg {</div><div class='ctx'> 	struct {</div><div class='head'>diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h<br/>index e49c32b0f394..dd8afe511242 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rio_drv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rio_drv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rio_drv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rio_drv.h</a></div><div class='hunk'>@@ -391,13 +391,8 @@ struct rio_dev *rio_dev_get(struct rio_dev *);</div><div class='ctx'> void rio_dev_put(struct rio_dev *);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RAPIDIO_DMA_ENGINE</div><div class='del'>-extern struct dma_chan *rio_request_dma(struct rio_dev *rdev);</div><div class='ctx'> extern struct dma_chan *rio_request_mport_dma(struct rio_mport *mport);</div><div class='ctx'> extern void rio_release_dma(struct dma_chan *dchan);</div><div class='del'>-extern struct dma_async_tx_descriptor *rio_dma_prep_slave_sg(</div><div class='del'>-		struct rio_dev *rdev, struct dma_chan *dchan,</div><div class='del'>-		struct rio_dma_data *data,</div><div class='del'>-		enum dma_transfer_direction direction, unsigned long flags);</div><div class='ctx'> extern struct dma_async_tx_descriptor *rio_dma_prep_xfer(</div><div class='ctx'> 		struct dma_chan *dchan,	u16 destid,</div><div class='ctx'> 		struct rio_dma_data *data,</div><div class='head'>diff --git a/include/linux/rmap.h b/include/linux/rmap.h<br/>index b7944a833668..daa92a58585d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rmap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rmap.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/memremap.h&gt;</div><div class='add'>+#include &lt;linux/bit_spinlock.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The anon_vma heads a list of private "related" vmas, to scan if</div><div class='hunk'>@@ -171,7 +172,215 @@ static inline void anon_vma_merge(struct vm_area_struct *vma,</div><div class='ctx'> 	unlink_anon_vmas(next);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct anon_vma *folio_get_anon_vma(struct folio *folio);</div><div class='add'>+struct anon_vma *folio_get_anon_vma(const struct folio *folio);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MM_ID</div><div class='add'>+static __always_inline void folio_lock_large_mapcount(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	bit_spin_lock(FOLIO_MM_IDS_LOCK_BITNUM, &amp;folio-&gt;_mm_ids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void folio_unlock_large_mapcount(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	__bit_spin_unlock(FOLIO_MM_IDS_LOCK_BITNUM, &amp;folio-&gt;_mm_ids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int folio_mm_id(const struct folio *folio, int idx)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE(idx != 0 &amp;&amp; idx != 1);</div><div class='add'>+	return folio-&gt;_mm_id[idx] &amp; MM_ID_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void folio_set_mm_id(struct folio *folio, int idx, mm_id_t id)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE(idx != 0 &amp;&amp; idx != 1);</div><div class='add'>+	folio-&gt;_mm_id[idx] &amp;= ~MM_ID_MASK;</div><div class='add'>+	folio-&gt;_mm_id[idx] |= id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __folio_large_mapcount_sanity_checks(const struct folio *folio,</div><div class='add'>+		int diff, mm_id_t mm_id)</div><div class='add'>+{</div><div class='add'>+	VM_WARN_ON_ONCE(!folio_test_large(folio) || folio_test_hugetlb(folio));</div><div class='add'>+	VM_WARN_ON_ONCE(diff &lt;= 0);</div><div class='add'>+	VM_WARN_ON_ONCE(mm_id &lt; MM_ID_MIN || mm_id &gt; MM_ID_MAX);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure we can detect at least one complete PTE mapping of the</div><div class='add'>+	 * folio in a single MM as "exclusively mapped". This is primarily</div><div class='add'>+	 * a check on 32bit, where we currently reduce the size of the per-MM</div><div class='add'>+	 * mapcount to a short.</div><div class='add'>+	 */</div><div class='add'>+	VM_WARN_ON_ONCE(diff &gt; folio_large_nr_pages(folio));</div><div class='add'>+	VM_WARN_ON_ONCE(folio_large_nr_pages(folio) - 1 &gt; MM_ID_MAPCOUNT_MAX);</div><div class='add'>+</div><div class='add'>+	VM_WARN_ON_ONCE(folio_mm_id(folio, 0) == MM_ID_DUMMY &amp;&amp;</div><div class='add'>+			folio-&gt;_mm_id_mapcount[0] != -1);</div><div class='add'>+	VM_WARN_ON_ONCE(folio_mm_id(folio, 0) != MM_ID_DUMMY &amp;&amp;</div><div class='add'>+			folio-&gt;_mm_id_mapcount[0] &lt; 0);</div><div class='add'>+	VM_WARN_ON_ONCE(folio_mm_id(folio, 1) == MM_ID_DUMMY &amp;&amp;</div><div class='add'>+			folio-&gt;_mm_id_mapcount[1] != -1);</div><div class='add'>+	VM_WARN_ON_ONCE(folio_mm_id(folio, 1) != MM_ID_DUMMY &amp;&amp;</div><div class='add'>+			folio-&gt;_mm_id_mapcount[1] &lt; 0);</div><div class='add'>+	VM_WARN_ON_ONCE(!folio_mapped(folio) &amp;&amp;</div><div class='add'>+			test_bit(FOLIO_MM_IDS_SHARED_BITNUM, &amp;folio-&gt;_mm_ids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void folio_set_large_mapcount(struct folio *folio,</div><div class='add'>+		int mapcount, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	__folio_large_mapcount_sanity_checks(folio, mapcount, vma-&gt;vm_mm-&gt;mm_id);</div><div class='add'>+</div><div class='add'>+	VM_WARN_ON_ONCE(folio_mm_id(folio, 0) != MM_ID_DUMMY);</div><div class='add'>+	VM_WARN_ON_ONCE(folio_mm_id(folio, 1) != MM_ID_DUMMY);</div><div class='add'>+</div><div class='add'>+	/* Note: mapcounts start at -1. */</div><div class='add'>+	atomic_set(&amp;folio-&gt;_large_mapcount, mapcount - 1);</div><div class='add'>+	folio-&gt;_mm_id_mapcount[0] = mapcount - 1;</div><div class='add'>+	folio_set_mm_id(folio, 0, vma-&gt;vm_mm-&gt;mm_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline int folio_add_return_large_mapcount(struct folio *folio,</div><div class='add'>+		int diff, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	const mm_id_t mm_id = vma-&gt;vm_mm-&gt;mm_id;</div><div class='add'>+	int new_mapcount_val;</div><div class='add'>+</div><div class='add'>+	folio_lock_large_mapcount(folio);</div><div class='add'>+	__folio_large_mapcount_sanity_checks(folio, diff, mm_id);</div><div class='add'>+</div><div class='add'>+	new_mapcount_val = atomic_read(&amp;folio-&gt;_large_mapcount) + diff;</div><div class='add'>+	atomic_set(&amp;folio-&gt;_large_mapcount, new_mapcount_val);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If a folio is mapped more than once into an MM on 32bit, we</div><div class='add'>+	 * can in theory overflow the per-MM mapcount (although only for</div><div class='add'>+	 * fairly large folios), turning it negative. In that case, just</div><div class='add'>+	 * free up the slot and mark the folio "mapped shared", otherwise</div><div class='add'>+	 * we might be in trouble when unmapping pages later.</div><div class='add'>+	 */</div><div class='add'>+	if (folio_mm_id(folio, 0) == mm_id) {</div><div class='add'>+		folio-&gt;_mm_id_mapcount[0] += diff;</div><div class='add'>+		if (!IS_ENABLED(CONFIG_64BIT) &amp;&amp; unlikely(folio-&gt;_mm_id_mapcount[0] &lt; 0)) {</div><div class='add'>+			folio-&gt;_mm_id_mapcount[0] = -1;</div><div class='add'>+			folio_set_mm_id(folio, 0, MM_ID_DUMMY);</div><div class='add'>+			folio-&gt;_mm_ids |= FOLIO_MM_IDS_SHARED_BIT;</div><div class='add'>+		}</div><div class='add'>+	} else if (folio_mm_id(folio, 1) == mm_id) {</div><div class='add'>+		folio-&gt;_mm_id_mapcount[1] += diff;</div><div class='add'>+		if (!IS_ENABLED(CONFIG_64BIT) &amp;&amp; unlikely(folio-&gt;_mm_id_mapcount[1] &lt; 0)) {</div><div class='add'>+			folio-&gt;_mm_id_mapcount[1] = -1;</div><div class='add'>+			folio_set_mm_id(folio, 1, MM_ID_DUMMY);</div><div class='add'>+			folio-&gt;_mm_ids |= FOLIO_MM_IDS_SHARED_BIT;</div><div class='add'>+		}</div><div class='add'>+	} else if (folio_mm_id(folio, 0) == MM_ID_DUMMY) {</div><div class='add'>+		folio_set_mm_id(folio, 0, mm_id);</div><div class='add'>+		folio-&gt;_mm_id_mapcount[0] = diff - 1;</div><div class='add'>+		/* We might have other mappings already. */</div><div class='add'>+		if (new_mapcount_val != diff - 1)</div><div class='add'>+			folio-&gt;_mm_ids |= FOLIO_MM_IDS_SHARED_BIT;</div><div class='add'>+	} else if (folio_mm_id(folio, 1) == MM_ID_DUMMY) {</div><div class='add'>+		folio_set_mm_id(folio, 1, mm_id);</div><div class='add'>+		folio-&gt;_mm_id_mapcount[1] = diff - 1;</div><div class='add'>+		/* Slot 0 certainly has mappings as well. */</div><div class='add'>+		folio-&gt;_mm_ids |= FOLIO_MM_IDS_SHARED_BIT;</div><div class='add'>+	}</div><div class='add'>+	folio_unlock_large_mapcount(folio);</div><div class='add'>+	return new_mapcount_val + 1;</div><div class='add'>+}</div><div class='add'>+#define folio_add_large_mapcount folio_add_return_large_mapcount</div><div class='add'>+</div><div class='add'>+static __always_inline int folio_sub_return_large_mapcount(struct folio *folio,</div><div class='add'>+		int diff, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	const mm_id_t mm_id = vma-&gt;vm_mm-&gt;mm_id;</div><div class='add'>+	int new_mapcount_val;</div><div class='add'>+</div><div class='add'>+	folio_lock_large_mapcount(folio);</div><div class='add'>+	__folio_large_mapcount_sanity_checks(folio, diff, mm_id);</div><div class='add'>+</div><div class='add'>+	new_mapcount_val = atomic_read(&amp;folio-&gt;_large_mapcount) - diff;</div><div class='add'>+	atomic_set(&amp;folio-&gt;_large_mapcount, new_mapcount_val);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * There are valid corner cases where we might underflow a per-MM</div><div class='add'>+	 * mapcount (some mappings added when no slot was free, some mappings</div><div class='add'>+	 * added once a slot was free), so we always set it to -1 once we go</div><div class='add'>+	 * negative.</div><div class='add'>+	 */</div><div class='add'>+	if (folio_mm_id(folio, 0) == mm_id) {</div><div class='add'>+		folio-&gt;_mm_id_mapcount[0] -= diff;</div><div class='add'>+		if (folio-&gt;_mm_id_mapcount[0] &gt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		folio-&gt;_mm_id_mapcount[0] = -1;</div><div class='add'>+		folio_set_mm_id(folio, 0, MM_ID_DUMMY);</div><div class='add'>+	} else if (folio_mm_id(folio, 1) == mm_id) {</div><div class='add'>+		folio-&gt;_mm_id_mapcount[1] -= diff;</div><div class='add'>+		if (folio-&gt;_mm_id_mapcount[1] &gt;= 0)</div><div class='add'>+			goto out;</div><div class='add'>+		folio-&gt;_mm_id_mapcount[1] = -1;</div><div class='add'>+		folio_set_mm_id(folio, 1, MM_ID_DUMMY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If one MM slot owns all mappings, the folio is mapped exclusively.</div><div class='add'>+	 * Note that if the folio is now unmapped (new_mapcount_val == -1), both</div><div class='add'>+	 * slots must be free (mapcount == -1), and we'll also mark it as</div><div class='add'>+	 * exclusive.</div><div class='add'>+	 */</div><div class='add'>+	if (folio-&gt;_mm_id_mapcount[0] == new_mapcount_val ||</div><div class='add'>+	    folio-&gt;_mm_id_mapcount[1] == new_mapcount_val)</div><div class='add'>+		folio-&gt;_mm_ids &amp;= ~FOLIO_MM_IDS_SHARED_BIT;</div><div class='add'>+out:</div><div class='add'>+	folio_unlock_large_mapcount(folio);</div><div class='add'>+	return new_mapcount_val + 1;</div><div class='add'>+}</div><div class='add'>+#define folio_sub_large_mapcount folio_sub_return_large_mapcount</div><div class='add'>+#else /* !CONFIG_MM_ID */</div><div class='add'>+/*</div><div class='add'>+ * See __folio_rmap_sanity_checks(), we might map large folios even without</div><div class='add'>+ * CONFIG_TRANSPARENT_HUGEPAGE. We'll keep that working for now.</div><div class='add'>+ */</div><div class='add'>+static inline void folio_set_large_mapcount(struct folio *folio, int mapcount,</div><div class='add'>+		struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	/* Note: mapcounts start at -1. */</div><div class='add'>+	atomic_set(&amp;folio-&gt;_large_mapcount, mapcount - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void folio_add_large_mapcount(struct folio *folio,</div><div class='add'>+		int diff, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	atomic_add(diff, &amp;folio-&gt;_large_mapcount);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int folio_add_return_large_mapcount(struct folio *folio,</div><div class='add'>+		int diff, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void folio_sub_large_mapcount(struct folio *folio,</div><div class='add'>+		int diff, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	atomic_sub(diff, &amp;folio-&gt;_large_mapcount);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int folio_sub_return_large_mapcount(struct folio *folio,</div><div class='add'>+		int diff, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG();</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MM_ID */</div><div class='add'>+</div><div class='add'>+#define folio_inc_large_mapcount(folio, vma) \</div><div class='add'>+	folio_add_large_mapcount(folio, 1, vma)</div><div class='add'>+#define folio_inc_return_large_mapcount(folio, vma) \</div><div class='add'>+	folio_add_return_large_mapcount(folio, 1, vma)</div><div class='add'>+#define folio_dec_large_mapcount(folio, vma) \</div><div class='add'>+	folio_sub_large_mapcount(folio, 1, vma)</div><div class='add'>+#define folio_dec_return_large_mapcount(folio, vma) \</div><div class='add'>+	folio_sub_return_large_mapcount(folio, 1, vma)</div><div class='ctx'> </div><div class='ctx'> /* RMAP flags, currently only relevant for some anon rmap operations. */</div><div class='ctx'> typedef int __bitwise rmap_t;</div><div class='hunk'>@@ -185,21 +394,15 @@ typedef int __bitwise rmap_t;</div><div class='ctx'> /* The anonymous (sub)page is exclusive to a single process. */</div><div class='ctx'> #define RMAP_EXCLUSIVE		((__force rmap_t)BIT(0))</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Internally, we're using an enum to specify the granularity. We make the</div><div class='del'>- * compiler emit specialized code for each granularity.</div><div class='del'>- */</div><div class='del'>-enum rmap_level {</div><div class='del'>-	RMAP_LEVEL_PTE = 0,</div><div class='del'>-	RMAP_LEVEL_PMD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void __folio_rmap_sanity_checks(struct folio *folio,</div><div class='del'>-		struct page *page, int nr_pages, enum rmap_level level)</div><div class='add'>+static __always_inline void __folio_rmap_sanity_checks(const struct folio *folio,</div><div class='add'>+		const struct page *page, int nr_pages, enum pgtable_level level)</div><div class='ctx'> {</div><div class='ctx'> 	/* hugetlb folios are handled separately. */</div><div class='ctx'> 	VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio);</div><div class='ctx'> </div><div class='add'>+	/* When (un)mapping zeropages, we should never touch ref+mapcount. */</div><div class='add'>+	VM_WARN_ON_FOLIO(is_zero_folio(folio), folio);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TODO: we get driver-allocated folios that have nothing to do with</div><div class='ctx'> 	 * the rmap using vm_insert_page(); therefore, we cannot assume that</div><div class='hunk'>@@ -214,19 +417,49 @@ static inline void __folio_rmap_sanity_checks(struct folio *folio,</div><div class='ctx'> 	VM_WARN_ON_FOLIO(page_folio(page + nr_pages - 1) != folio, folio);</div><div class='ctx'> </div><div class='ctx'> 	switch (level) {</div><div class='del'>-	case RMAP_LEVEL_PTE:</div><div class='add'>+	case PGTABLE_LEVEL_PTE:</div><div class='ctx'> 		break;</div><div class='del'>-	case RMAP_LEVEL_PMD:</div><div class='add'>+	case PGTABLE_LEVEL_PMD:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't support folios larger than a single PMD yet. So</div><div class='del'>-		 * when RMAP_LEVEL_PMD is set, we assume that we are creating</div><div class='add'>+		 * when PGTABLE_LEVEL_PMD is set, we assume that we are creating</div><div class='ctx'> 		 * a single "entire" mapping of the folio.</div><div class='ctx'> 		 */</div><div class='ctx'> 		VM_WARN_ON_FOLIO(folio_nr_pages(folio) != HPAGE_PMD_NR, folio);</div><div class='ctx'> 		VM_WARN_ON_FOLIO(nr_pages != HPAGE_PMD_NR, folio);</div><div class='ctx'> 		break;</div><div class='add'>+	case PGTABLE_LEVEL_PUD:</div><div class='add'>+		/*</div><div class='add'>+		 * Assume that we are creating a single "entire" mapping of the</div><div class='add'>+		 * folio.</div><div class='add'>+		 */</div><div class='add'>+		VM_WARN_ON_FOLIO(folio_nr_pages(folio) != HPAGE_PUD_NR, folio);</div><div class='add'>+		VM_WARN_ON_FOLIO(nr_pages != HPAGE_PUD_NR, folio);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		VM_WARN_ON_ONCE(true);</div><div class='add'>+		BUILD_BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Anon folios must have an associated live anon_vma as long as they're</div><div class='add'>+	 * mapped into userspace.</div><div class='add'>+	 * Note that the atomic_read() mainly does two things:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. In KASAN builds with CONFIG_SLUB_RCU_DEBUG, it causes KASAN to</div><div class='add'>+	 *    check that the associated anon_vma has not yet been freed (subject</div><div class='add'>+	 *    to KASAN's usual limitations). This check will pass if the</div><div class='add'>+	 *    anon_vma's refcount has already dropped to 0 but an RCU grace</div><div class='add'>+	 *    period hasn't passed since then.</div><div class='add'>+	 * 2. If the anon_vma has not yet been freed, it checks that the</div><div class='add'>+	 *    anon_vma still has a nonzero refcount (as opposed to being in the</div><div class='add'>+	 *    middle of an RCU delay for getting freed).</div><div class='add'>+	 */</div><div class='add'>+	if (folio_test_anon(folio) &amp;&amp; !folio_test_ksm(folio)) {</div><div class='add'>+		unsigned long mapping = (unsigned long)folio-&gt;mapping;</div><div class='add'>+		struct anon_vma *anon_vma;</div><div class='add'>+</div><div class='add'>+		anon_vma = (void *)(mapping - FOLIO_MAPPING_ANON);</div><div class='add'>+		VM_WARN_ON_FOLIO(atomic_read(&amp;anon_vma-&gt;refcount) == 0, folio);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -241,19 +474,23 @@ void folio_add_anon_rmap_ptes(struct folio *, struct page *, int nr_pages,</div><div class='ctx'> void folio_add_anon_rmap_pmd(struct folio *, struct page *,</div><div class='ctx'> 		struct vm_area_struct *, unsigned long address, rmap_t flags);</div><div class='ctx'> void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *,</div><div class='del'>-		unsigned long address);</div><div class='add'>+		unsigned long address, rmap_t flags);</div><div class='ctx'> void folio_add_file_rmap_ptes(struct folio *, struct page *, int nr_pages,</div><div class='ctx'> 		struct vm_area_struct *);</div><div class='ctx'> #define folio_add_file_rmap_pte(folio, page, vma) \</div><div class='ctx'> 	folio_add_file_rmap_ptes(folio, page, 1, vma)</div><div class='ctx'> void folio_add_file_rmap_pmd(struct folio *, struct page *,</div><div class='ctx'> 		struct vm_area_struct *);</div><div class='add'>+void folio_add_file_rmap_pud(struct folio *, struct page *,</div><div class='add'>+		struct vm_area_struct *);</div><div class='ctx'> void folio_remove_rmap_ptes(struct folio *, struct page *, int nr_pages,</div><div class='ctx'> 		struct vm_area_struct *);</div><div class='ctx'> #define folio_remove_rmap_pte(folio, page, vma) \</div><div class='ctx'> 	folio_remove_rmap_ptes(folio, page, 1, vma)</div><div class='ctx'> void folio_remove_rmap_pmd(struct folio *, struct page *,</div><div class='ctx'> 		struct vm_area_struct *);</div><div class='add'>+void folio_remove_rmap_pud(struct folio *, struct page *,</div><div class='add'>+		struct vm_area_struct *);</div><div class='ctx'> </div><div class='ctx'> void hugetlb_add_anon_rmap(struct folio *, struct vm_area_struct *,</div><div class='ctx'> 		unsigned long address, rmap_t flags);</div><div class='hunk'>@@ -273,6 +510,7 @@ static inline int hugetlb_try_dup_anon_rmap(struct folio *folio,</div><div class='ctx'> 		ClearPageAnonExclusive(&amp;folio-&gt;page);</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_inc(&amp;folio-&gt;_entire_mapcount);</div><div class='add'>+	atomic_inc(&amp;folio-&gt;_large_mapcount);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +522,7 @@ static inline int hugetlb_try_share_anon_rmap(struct folio *folio)</div><div class='ctx'> 	VM_WARN_ON_FOLIO(!PageAnonExclusive(&amp;folio-&gt;page), folio);</div><div class='ctx'> </div><div class='ctx'> 	/* Paired with the memory barrier in try_grab_folio(). */</div><div class='del'>-	if (IS_ENABLED(CONFIG_HAVE_FAST_GUP))</div><div class='add'>+	if (IS_ENABLED(CONFIG_HAVE_GUP_FAST))</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(folio_maybe_dma_pinned(folio)))</div><div class='hunk'>@@ -295,7 +533,7 @@ static inline int hugetlb_try_share_anon_rmap(struct folio *folio)</div><div class='ctx'> 	 * This is conceptually a smp_wmb() paired with the smp_rmb() in</div><div class='ctx'> 	 * gup_must_unshare().</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_ENABLED(CONFIG_HAVE_FAST_GUP))</div><div class='add'>+	if (IS_ENABLED(CONFIG_HAVE_GUP_FAST))</div><div class='ctx'> 		smp_mb__after_atomic();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -306,6 +544,7 @@ static inline void hugetlb_add_file_rmap(struct folio *folio)</div><div class='ctx'> 	VM_WARN_ON_FOLIO(folio_test_anon(folio), folio);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;folio-&gt;_entire_mapcount);</div><div class='add'>+	atomic_inc(&amp;folio-&gt;_large_mapcount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void hugetlb_remove_rmap(struct folio *folio)</div><div class='hunk'>@@ -313,22 +552,38 @@ static inline void hugetlb_remove_rmap(struct folio *folio)</div><div class='ctx'> 	VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio);</div><div class='ctx'> </div><div class='ctx'> 	atomic_dec(&amp;folio-&gt;_entire_mapcount);</div><div class='add'>+	atomic_dec(&amp;folio-&gt;_large_mapcount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline void __folio_dup_file_rmap(struct folio *folio,</div><div class='del'>-		struct page *page, int nr_pages, enum rmap_level level)</div><div class='add'>+		struct page *page, int nr_pages, struct vm_area_struct *dst_vma,</div><div class='add'>+		enum pgtable_level level)</div><div class='ctx'> {</div><div class='add'>+	const int orig_nr_pages = nr_pages;</div><div class='add'>+</div><div class='ctx'> 	__folio_rmap_sanity_checks(folio, page, nr_pages, level);</div><div class='ctx'> </div><div class='ctx'> 	switch (level) {</div><div class='del'>-	case RMAP_LEVEL_PTE:</div><div class='del'>-		do {</div><div class='del'>-			atomic_inc(&amp;page-&gt;_mapcount);</div><div class='del'>-		} while (page++, --nr_pages &gt; 0);</div><div class='add'>+	case PGTABLE_LEVEL_PTE:</div><div class='add'>+		if (!folio_test_large(folio)) {</div><div class='add'>+			atomic_inc(&amp;folio-&gt;_mapcount);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT)) {</div><div class='add'>+			do {</div><div class='add'>+				atomic_inc(&amp;page-&gt;_mapcount);</div><div class='add'>+			} while (page++, --nr_pages &gt; 0);</div><div class='add'>+		}</div><div class='add'>+		folio_add_large_mapcount(folio, orig_nr_pages, dst_vma);</div><div class='ctx'> 		break;</div><div class='del'>-	case RMAP_LEVEL_PMD:</div><div class='add'>+	case PGTABLE_LEVEL_PMD:</div><div class='add'>+	case PGTABLE_LEVEL_PUD:</div><div class='ctx'> 		atomic_inc(&amp;folio-&gt;_entire_mapcount);</div><div class='add'>+		folio_inc_large_mapcount(folio, dst_vma);</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		BUILD_BUG();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -337,42 +592,49 @@ static __always_inline void __folio_dup_file_rmap(struct folio *folio,</div><div class='ctx'>  * @folio:	The folio to duplicate the mappings of</div><div class='ctx'>  * @page:	The first page to duplicate the mappings of</div><div class='ctx'>  * @nr_pages:	The number of pages of which the mapping will be duplicated</div><div class='add'>+ * @dst_vma:	The destination vm area</div><div class='ctx'>  *</div><div class='ctx'>  * The page range of the folio is defined by [page, page + nr_pages)</div><div class='ctx'>  *</div><div class='ctx'>  * The caller needs to hold the page table lock.</div><div class='ctx'>  */</div><div class='ctx'> static inline void folio_dup_file_rmap_ptes(struct folio *folio,</div><div class='del'>-		struct page *page, int nr_pages)</div><div class='add'>+		struct page *page, int nr_pages, struct vm_area_struct *dst_vma)</div><div class='add'>+{</div><div class='add'>+	__folio_dup_file_rmap(folio, page, nr_pages, dst_vma, PGTABLE_LEVEL_PTE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void folio_dup_file_rmap_pte(struct folio *folio,</div><div class='add'>+		struct page *page, struct vm_area_struct *dst_vma)</div><div class='ctx'> {</div><div class='del'>-	__folio_dup_file_rmap(folio, page, nr_pages, RMAP_LEVEL_PTE);</div><div class='add'>+	__folio_dup_file_rmap(folio, page, 1, dst_vma, PGTABLE_LEVEL_PTE);</div><div class='ctx'> }</div><div class='del'>-#define folio_dup_file_rmap_pte(folio, page) \</div><div class='del'>-	folio_dup_file_rmap_ptes(folio, page, 1)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * folio_dup_file_rmap_pmd - duplicate a PMD mapping of a page range of a folio</div><div class='ctx'>  * @folio:	The folio to duplicate the mapping of</div><div class='ctx'>  * @page:	The first page to duplicate the mapping of</div><div class='add'>+ * @dst_vma:	The destination vm area</div><div class='ctx'>  *</div><div class='ctx'>  * The page range of the folio is defined by [page, page + HPAGE_PMD_NR)</div><div class='ctx'>  *</div><div class='ctx'>  * The caller needs to hold the page table lock.</div><div class='ctx'>  */</div><div class='ctx'> static inline void folio_dup_file_rmap_pmd(struct folio *folio,</div><div class='del'>-		struct page *page)</div><div class='add'>+		struct page *page, struct vm_area_struct *dst_vma)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='del'>-	__folio_dup_file_rmap(folio, page, HPAGE_PMD_NR, RMAP_LEVEL_PTE);</div><div class='add'>+	__folio_dup_file_rmap(folio, page, HPAGE_PMD_NR, dst_vma, PGTABLE_LEVEL_PTE);</div><div class='ctx'> #else</div><div class='ctx'> 	WARN_ON_ONCE(true);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio,</div><div class='del'>-		struct page *page, int nr_pages, struct vm_area_struct *src_vma,</div><div class='del'>-		enum rmap_level level)</div><div class='add'>+		struct page *page, int nr_pages, struct vm_area_struct *dst_vma,</div><div class='add'>+		struct vm_area_struct *src_vma, enum pgtable_level level)</div><div class='ctx'> {</div><div class='add'>+	const int orig_nr_pages = nr_pages;</div><div class='ctx'> 	bool maybe_pinned;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -395,26 +657,40 @@ static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio,</div><div class='ctx'> 	 * copying if the folio maybe pinned.</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (level) {</div><div class='del'>-	case RMAP_LEVEL_PTE:</div><div class='add'>+	case PGTABLE_LEVEL_PTE:</div><div class='ctx'> 		if (unlikely(maybe_pinned)) {</div><div class='ctx'> 			for (i = 0; i &lt; nr_pages; i++)</div><div class='ctx'> 				if (PageAnonExclusive(page + i))</div><div class='ctx'> 					return -EBUSY;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (!folio_test_large(folio)) {</div><div class='add'>+			if (PageAnonExclusive(page))</div><div class='add'>+				ClearPageAnonExclusive(page);</div><div class='add'>+			atomic_inc(&amp;folio-&gt;_mapcount);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		do {</div><div class='ctx'> 			if (PageAnonExclusive(page))</div><div class='ctx'> 				ClearPageAnonExclusive(page);</div><div class='del'>-			atomic_inc(&amp;page-&gt;_mapcount);</div><div class='add'>+			if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT))</div><div class='add'>+				atomic_inc(&amp;page-&gt;_mapcount);</div><div class='ctx'> 		} while (page++, --nr_pages &gt; 0);</div><div class='add'>+		folio_add_large_mapcount(folio, orig_nr_pages, dst_vma);</div><div class='ctx'> 		break;</div><div class='del'>-	case RMAP_LEVEL_PMD:</div><div class='add'>+	case PGTABLE_LEVEL_PMD:</div><div class='add'>+	case PGTABLE_LEVEL_PUD:</div><div class='ctx'> 		if (PageAnonExclusive(page)) {</div><div class='ctx'> 			if (unlikely(maybe_pinned))</div><div class='ctx'> 				return -EBUSY;</div><div class='ctx'> 			ClearPageAnonExclusive(page);</div><div class='ctx'> 		}</div><div class='ctx'> 		atomic_inc(&amp;folio-&gt;_entire_mapcount);</div><div class='add'>+		folio_inc_large_mapcount(folio, dst_vma);</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		BUILD_BUG();</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -425,6 +701,7 @@ static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio,</div><div class='ctx'>  * @folio:	The folio to duplicate the mappings of</div><div class='ctx'>  * @page:	The first page to duplicate the mappings of</div><div class='ctx'>  * @nr_pages:	The number of pages of which the mapping will be duplicated</div><div class='add'>+ * @dst_vma:	The destination vm area</div><div class='ctx'>  * @src_vma:	The vm area from which the mappings are duplicated</div><div class='ctx'>  *</div><div class='ctx'>  * The page range of the folio is defined by [page, page + nr_pages)</div><div class='hunk'>@@ -443,19 +720,27 @@ static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio,</div><div class='ctx'>  * Returns 0 if duplicating the mappings succeeded. Returns -EBUSY otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline int folio_try_dup_anon_rmap_ptes(struct folio *folio,</div><div class='del'>-		struct page *page, int nr_pages, struct vm_area_struct *src_vma)</div><div class='add'>+		struct page *page, int nr_pages, struct vm_area_struct *dst_vma,</div><div class='add'>+		struct vm_area_struct *src_vma)</div><div class='ctx'> {</div><div class='del'>-	return __folio_try_dup_anon_rmap(folio, page, nr_pages, src_vma,</div><div class='del'>-					 RMAP_LEVEL_PTE);</div><div class='add'>+	return __folio_try_dup_anon_rmap(folio, page, nr_pages, dst_vma,</div><div class='add'>+					 src_vma, PGTABLE_LEVEL_PTE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline int folio_try_dup_anon_rmap_pte(struct folio *folio,</div><div class='add'>+		struct page *page, struct vm_area_struct *dst_vma,</div><div class='add'>+		struct vm_area_struct *src_vma)</div><div class='add'>+{</div><div class='add'>+	return __folio_try_dup_anon_rmap(folio, page, 1, dst_vma, src_vma,</div><div class='add'>+					 PGTABLE_LEVEL_PTE);</div><div class='ctx'> }</div><div class='del'>-#define folio_try_dup_anon_rmap_pte(folio, page, vma) \</div><div class='del'>-	folio_try_dup_anon_rmap_ptes(folio, page, 1, vma)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * folio_try_dup_anon_rmap_pmd - try duplicating a PMD mapping of a page range</div><div class='ctx'>  *				 of a folio</div><div class='ctx'>  * @folio:	The folio to duplicate the mapping of</div><div class='ctx'>  * @page:	The first page to duplicate the mapping of</div><div class='add'>+ * @dst_vma:	The destination vm area</div><div class='ctx'>  * @src_vma:	The vm area from which the mapping is duplicated</div><div class='ctx'>  *</div><div class='ctx'>  * The page range of the folio is defined by [page, page + HPAGE_PMD_NR)</div><div class='hunk'>@@ -474,11 +759,12 @@ static inline int folio_try_dup_anon_rmap_ptes(struct folio *folio,</div><div class='ctx'>  * Returns 0 if duplicating the mapping succeeded. Returns -EBUSY otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline int folio_try_dup_anon_rmap_pmd(struct folio *folio,</div><div class='del'>-		struct page *page, struct vm_area_struct *src_vma)</div><div class='add'>+		struct page *page, struct vm_area_struct *dst_vma,</div><div class='add'>+		struct vm_area_struct *src_vma)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='del'>-	return __folio_try_dup_anon_rmap(folio, page, HPAGE_PMD_NR, src_vma,</div><div class='del'>-					 RMAP_LEVEL_PMD);</div><div class='add'>+	return __folio_try_dup_anon_rmap(folio, page, HPAGE_PMD_NR, dst_vma,</div><div class='add'>+					 src_vma, PGTABLE_LEVEL_PMD);</div><div class='ctx'> #else</div><div class='ctx'> 	WARN_ON_ONCE(true);</div><div class='ctx'> 	return -EBUSY;</div><div class='hunk'>@@ -486,7 +772,7 @@ static inline int folio_try_dup_anon_rmap_pmd(struct folio *folio,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline int __folio_try_share_anon_rmap(struct folio *folio,</div><div class='del'>-		struct page *page, int nr_pages, enum rmap_level level)</div><div class='add'>+		struct page *page, int nr_pages, enum pgtable_level level)</div><div class='ctx'> {</div><div class='ctx'> 	VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio);</div><div class='ctx'> 	VM_WARN_ON_FOLIO(!PageAnonExclusive(page), folio);</div><div class='hunk'>@@ -541,7 +827,7 @@ static __always_inline int __folio_try_share_anon_rmap(struct folio *folio,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* Paired with the memory barrier in try_grab_folio(). */</div><div class='del'>-	if (IS_ENABLED(CONFIG_HAVE_FAST_GUP))</div><div class='add'>+	if (IS_ENABLED(CONFIG_HAVE_GUP_FAST))</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(folio_maybe_dma_pinned(folio)))</div><div class='hunk'>@@ -552,7 +838,7 @@ static __always_inline int __folio_try_share_anon_rmap(struct folio *folio,</div><div class='ctx'> 	 * This is conceptually a smp_wmb() paired with the smp_rmb() in</div><div class='ctx'> 	 * gup_must_unshare().</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_ENABLED(CONFIG_HAVE_FAST_GUP))</div><div class='add'>+	if (IS_ENABLED(CONFIG_HAVE_GUP_FAST))</div><div class='ctx'> 		smp_mb__after_atomic();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -581,7 +867,7 @@ static __always_inline int __folio_try_share_anon_rmap(struct folio *folio,</div><div class='ctx'> static inline int folio_try_share_anon_rmap_pte(struct folio *folio,</div><div class='ctx'> 		struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return __folio_try_share_anon_rmap(folio, page, 1, RMAP_LEVEL_PTE);</div><div class='add'>+	return __folio_try_share_anon_rmap(folio, page, 1, PGTABLE_LEVEL_PTE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -612,7 +898,7 @@ static inline int folio_try_share_anon_rmap_pmd(struct folio *folio,</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='ctx'> 	return __folio_try_share_anon_rmap(folio, page, HPAGE_PMD_NR,</div><div class='del'>-					   RMAP_LEVEL_PMD);</div><div class='add'>+					   PGTABLE_LEVEL_PMD);</div><div class='ctx'> #else</div><div class='ctx'> 	WARN_ON_ONCE(true);</div><div class='ctx'> 	return -EBUSY;</div><div class='hunk'>@@ -623,20 +909,24 @@ static inline int folio_try_share_anon_rmap_pmd(struct folio *folio,</div><div class='ctx'>  * Called from mm/vmscan.c to handle paging out</div><div class='ctx'>  */</div><div class='ctx'> int folio_referenced(struct folio *, int is_locked,</div><div class='del'>-			struct mem_cgroup *memcg, unsigned long *vm_flags);</div><div class='add'>+			struct mem_cgroup *memcg, vm_flags_t *vm_flags);</div><div class='ctx'> </div><div class='ctx'> void try_to_migrate(struct folio *folio, enum ttu_flags flags);</div><div class='ctx'> void try_to_unmap(struct folio *, enum ttu_flags flags);</div><div class='ctx'> </div><div class='del'>-int make_device_exclusive_range(struct mm_struct *mm, unsigned long start,</div><div class='del'>-				unsigned long end, struct page **pages,</div><div class='del'>-				void *arg);</div><div class='add'>+struct page *make_device_exclusive(struct mm_struct *mm, unsigned long addr,</div><div class='add'>+		void *owner, struct folio **foliop);</div><div class='ctx'> </div><div class='ctx'> /* Avoid racy checks */</div><div class='ctx'> #define PVMW_SYNC		(1 &lt;&lt; 0)</div><div class='ctx'> /* Look for migration entries rather than present PTEs */</div><div class='ctx'> #define PVMW_MIGRATION		(1 &lt;&lt; 1)</div><div class='ctx'> </div><div class='add'>+/* Result flags */</div><div class='add'>+</div><div class='add'>+/* The page is mapped across page table boundary */</div><div class='add'>+#define PVMW_PGTABLE_CROSSED	(1 &lt;&lt; 16)</div><div class='add'>+</div><div class='ctx'> struct page_vma_mapped_walk {</div><div class='ctx'> 	unsigned long pfn;</div><div class='ctx'> 	unsigned long nr_pages;</div><div class='hunk'>@@ -649,16 +939,6 @@ struct page_vma_mapped_walk {</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DEFINE_PAGE_VMA_WALK(name, _page, _vma, _address, _flags)	\</div><div class='del'>-	struct page_vma_mapped_walk name = {				\</div><div class='del'>-		.pfn = page_to_pfn(_page),				\</div><div class='del'>-		.nr_pages = compound_nr(_page),				\</div><div class='del'>-		.pgoff = page_to_pgoff(_page),				\</div><div class='del'>-		.vma = _vma,						\</div><div class='del'>-		.address = _address,					\</div><div class='del'>-		.flags = _flags,					\</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #define DEFINE_FOLIO_VMA_WALK(name, _folio, _vma, _address, _flags)	\</div><div class='ctx'> 	struct page_vma_mapped_walk name = {				\</div><div class='ctx'> 		.pfn = folio_pfn(_folio),				\</div><div class='hunk'>@@ -678,12 +958,33 @@ static inline void page_vma_mapped_walk_done(struct page_vma_mapped_walk *pvmw)</div><div class='ctx'> 		spin_unlock(pvmw-&gt;ptl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Used by swapoff to help locate where page is expected in vma.</div><div class='add'>+/**</div><div class='add'>+ * page_vma_mapped_walk_restart - Restart the page table walk.</div><div class='add'>+ * @pvmw: Pointer to struct page_vma_mapped_walk.</div><div class='add'>+ *</div><div class='add'>+ * It restarts the page table walk when changes occur in the page</div><div class='add'>+ * table, such as splitting a PMD. Ensures that the PTL held during</div><div class='add'>+ * the previous walk is released and resets the state to allow for</div><div class='add'>+ * a new walk starting at the current address stored in pvmw-&gt;address.</div><div class='ctx'>  */</div><div class='del'>-unsigned long page_address_in_vma(struct page *, struct vm_area_struct *);</div><div class='add'>+static inline void</div><div class='add'>+page_vma_mapped_walk_restart(struct page_vma_mapped_walk *pvmw)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!pvmw-&gt;pmd &amp;&amp; !pvmw-&gt;pte);</div><div class='add'>+</div><div class='add'>+	if (likely(pvmw-&gt;ptl))</div><div class='add'>+		spin_unlock(pvmw-&gt;ptl);</div><div class='add'>+	else</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+</div><div class='add'>+	pvmw-&gt;ptl = NULL;</div><div class='add'>+	pvmw-&gt;pmd = NULL;</div><div class='add'>+	pvmw-&gt;pte = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw);</div><div class='add'>+unsigned long page_address_in_vma(const struct folio *folio,</div><div class='add'>+		const struct page *, const struct vm_area_struct *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Cleans the PTEs of shared mappings.</div><div class='hunk'>@@ -693,12 +994,18 @@ unsigned long page_address_in_vma(struct page *, struct vm_area_struct *);</div><div class='ctx'>  */</div><div class='ctx'> int folio_mkclean(struct folio *);</div><div class='ctx'> </div><div class='add'>+int mapping_wrprotect_range(struct address_space *mapping, pgoff_t pgoff,</div><div class='add'>+		unsigned long pfn, unsigned long nr_pages);</div><div class='add'>+</div><div class='ctx'> int pfn_mkclean_range(unsigned long pfn, unsigned long nr_pages, pgoff_t pgoff,</div><div class='ctx'> 		      struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='del'>-void remove_migration_ptes(struct folio *src, struct folio *dst, bool locked);</div><div class='add'>+enum rmp_flags {</div><div class='add'>+	RMP_LOCKED		= 1 &lt;&lt; 0,</div><div class='add'>+	RMP_USE_SHARED_ZEROPAGE	= 1 &lt;&lt; 1,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma);</div><div class='add'>+void remove_migration_ptes(struct folio *src, struct folio *dst, int flags);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * rmap_walk_control: To control rmap traversing for specific needs</div><div class='hunk'>@@ -722,14 +1029,14 @@ struct rmap_walk_control {</div><div class='ctx'> 	bool (*rmap_one)(struct folio *folio, struct vm_area_struct *vma,</div><div class='ctx'> 					unsigned long addr, void *arg);</div><div class='ctx'> 	int (*done)(struct folio *folio);</div><div class='del'>-	struct anon_vma *(*anon_lock)(struct folio *folio,</div><div class='add'>+	struct anon_vma *(*anon_lock)(const struct folio *folio,</div><div class='ctx'> 				      struct rmap_walk_control *rwc);</div><div class='ctx'> 	bool (*invalid_vma)(struct vm_area_struct *vma, void *arg);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void rmap_walk(struct folio *folio, struct rmap_walk_control *rwc);</div><div class='ctx'> void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc);</div><div class='del'>-struct anon_vma *folio_lock_anon_vma_read(struct folio *folio,</div><div class='add'>+struct anon_vma *folio_lock_anon_vma_read(const struct folio *folio,</div><div class='ctx'> 					  struct rmap_walk_control *rwc);</div><div class='ctx'> </div><div class='ctx'> #else	/* !CONFIG_MMU */</div><div class='hunk'>@@ -739,7 +1046,7 @@ struct anon_vma *folio_lock_anon_vma_read(struct folio *folio,</div><div class='ctx'> </div><div class='ctx'> static inline int folio_referenced(struct folio *folio, int is_locked,</div><div class='ctx'> 				  struct mem_cgroup *memcg,</div><div class='del'>-				  unsigned long *vm_flags)</div><div class='add'>+				  vm_flags_t *vm_flags)</div><div class='ctx'> {</div><div class='ctx'> 	*vm_flags = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -755,8 +1062,4 @@ static inline int folio_mkclean(struct folio *folio)</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_MMU */</div><div class='ctx'> </div><div class='del'>-static inline int page_mkclean(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return folio_mkclean(page_folio(page));</div><div class='del'>-}</div><div class='ctx'> #endif	/* _LINUX_RMAP_H */</div><div class='head'>diff --git a/include/linux/rolling_buffer.h b/include/linux/rolling_buffer.h<br/>new file mode 100644<br/>index 000000000000..ac15b1ffdd83<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rolling_buffer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rolling_buffer.h</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* Rolling buffer of folios</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Written by David Howells (dhowells@redhat.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ROLLING_BUFFER_H</div><div class='add'>+#define _ROLLING_BUFFER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/folio_queue.h&gt;</div><div class='add'>+#include &lt;linux/uio.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rolling buffer.  Whilst the buffer is live and in use, folios and folio</div><div class='add'>+ * queue segments can be added to one end by one thread and removed from the</div><div class='add'>+ * other end by another thread.  The buffer isn't allowed to be empty; it must</div><div class='add'>+ * always have at least one folio_queue in it so that neither side has to</div><div class='add'>+ * modify both queue pointers.</div><div class='add'>+ *</div><div class='add'>+ * The iterator in the buffer is extended as buffers are inserted.  It can be</div><div class='add'>+ * snapshotted to use a segment of the buffer.</div><div class='add'>+ */</div><div class='add'>+struct rolling_buffer {</div><div class='add'>+	struct folio_queue	*head;		/* Producer's insertion point */</div><div class='add'>+	struct folio_queue	*tail;		/* Consumer's removal point */</div><div class='add'>+	struct iov_iter		iter;		/* Iterator tracking what's left in the buffer */</div><div class='add'>+	u8			next_head_slot;	/* Next slot in -&gt;head */</div><div class='add'>+	u8			first_tail_slot; /* First slot in -&gt;tail */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Snapshot of a rolling buffer.</div><div class='add'>+ */</div><div class='add'>+struct rolling_buffer_snapshot {</div><div class='add'>+	struct folio_queue	*curr_folioq;	/* Queue segment in which current folio resides */</div><div class='add'>+	unsigned char		curr_slot;	/* Folio currently being read */</div><div class='add'>+	unsigned char		curr_order;	/* Order of folio */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Marks to store per-folio in the internal folio_queue structs. */</div><div class='add'>+#define ROLLBUF_MARK_1	BIT(0)</div><div class='add'>+#define ROLLBUF_MARK_2	BIT(1)</div><div class='add'>+</div><div class='add'>+int rolling_buffer_init(struct rolling_buffer *roll, unsigned int rreq_id,</div><div class='add'>+			unsigned int direction);</div><div class='add'>+int rolling_buffer_make_space(struct rolling_buffer *roll);</div><div class='add'>+ssize_t rolling_buffer_load_from_ra(struct rolling_buffer *roll,</div><div class='add'>+				    struct readahead_control *ractl,</div><div class='add'>+				    struct folio_batch *put_batch);</div><div class='add'>+ssize_t rolling_buffer_append(struct rolling_buffer *roll, struct folio *folio,</div><div class='add'>+			      unsigned int flags);</div><div class='add'>+struct folio_queue *rolling_buffer_delete_spent(struct rolling_buffer *roll);</div><div class='add'>+void rolling_buffer_clear(struct rolling_buffer *roll);</div><div class='add'>+</div><div class='add'>+static inline void rolling_buffer_advance(struct rolling_buffer *roll, size_t amount)</div><div class='add'>+{</div><div class='add'>+	iov_iter_advance(&amp;roll-&gt;iter, amount);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _ROLLING_BUFFER_H */</div><div class='head'>diff --git a/include/linux/rpmb.h b/include/linux/rpmb.h<br/>new file mode 100644<br/>index 000000000000..ed3f8e431eff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rpmb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rpmb.h</a></div><div class='hunk'>@@ -0,0 +1,167 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2015-2019 Intel Corp. All rights reserved</div><div class='add'>+ * Copyright (C) 2021-2022 Linaro Ltd</div><div class='add'>+ */</div><div class='add'>+#ifndef __RPMB_H__</div><div class='add'>+#define __RPMB_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum rpmb_type - type of underlying storage technology</div><div class='add'>+ *</div><div class='add'>+ * @RPMB_TYPE_EMMC  : emmc (JESD84-B50.1)</div><div class='add'>+ * @RPMB_TYPE_UFS   : UFS (JESD220)</div><div class='add'>+ * @RPMB_TYPE_NVME  : NVM Express</div><div class='add'>+ */</div><div class='add'>+enum rpmb_type {</div><div class='add'>+	RPMB_TYPE_EMMC,</div><div class='add'>+	RPMB_TYPE_UFS,</div><div class='add'>+	RPMB_TYPE_NVME,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rpmb_descr - RPMB description provided by the underlying block device</div><div class='add'>+ *</div><div class='add'>+ * @type             : block device type</div><div class='add'>+ * @route_frames     : routes frames to and from the RPMB device</div><div class='add'>+ * @dev_id           : unique device identifier read from the hardware</div><div class='add'>+ * @dev_id_len       : length of unique device identifier</div><div class='add'>+ * @reliable_wr_count: number of sectors that can be written in one access</div><div class='add'>+ * @capacity         : capacity of the device in units of 128K</div><div class='add'>+ *</div><div class='add'>+ * @dev_id is intended to be used as input when deriving the authenticaion key.</div><div class='add'>+ */</div><div class='add'>+struct rpmb_descr {</div><div class='add'>+	enum rpmb_type type;</div><div class='add'>+	int (*route_frames)(struct device *dev, u8 *req, unsigned int req_len,</div><div class='add'>+			    u8 *resp, unsigned int resp_len);</div><div class='add'>+	u8 *dev_id;</div><div class='add'>+	size_t dev_id_len;</div><div class='add'>+	u16 reliable_wr_count;</div><div class='add'>+	u16 capacity;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rpmb_dev - device which can support RPMB partition</div><div class='add'>+ *</div><div class='add'>+ * @dev              : device</div><div class='add'>+ * @id               : device_id</div><div class='add'>+ * @list_node        : linked list node</div><div class='add'>+ * @descr            : RPMB description</div><div class='add'>+ */</div><div class='add'>+struct rpmb_dev {</div><div class='add'>+	struct device dev;</div><div class='add'>+	int id;</div><div class='add'>+	struct list_head list_node;</div><div class='add'>+	struct rpmb_descr descr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_rpmb_dev(x)		container_of((x), struct rpmb_dev, dev)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rpmb_frame - RPMB frame structure for authenticated access</div><div class='add'>+ *</div><div class='add'>+ * @stuff        : stuff bytes, a padding/reserved area of 196 bytes at the</div><div class='add'>+ *                 beginning of the RPMB frame. They don’t carry meaningful</div><div class='add'>+ *                 data but are required to make the frame exactly 512 bytes.</div><div class='add'>+ * @key_mac      : The authentication key or the message authentication</div><div class='add'>+ *                 code (MAC) depending on the request/response type.</div><div class='add'>+ *                 The MAC will be delivered in the last (or the only)</div><div class='add'>+ *                 block of data.</div><div class='add'>+ * @data         : Data to be written or read by signed access.</div><div class='add'>+ * @nonce        : Random number generated by the host for the requests</div><div class='add'>+ *                 and copied to the response by the RPMB engine.</div><div class='add'>+ * @write_counter: Counter value for the total amount of the successful</div><div class='add'>+ *                 authenticated data write requests made by the host.</div><div class='add'>+ * @addr         : Address of the data to be programmed to or read</div><div class='add'>+ *                 from the RPMB. Address is the serial number of</div><div class='add'>+ *                 the accessed block (half sector 256B).</div><div class='add'>+ * @block_count  : Number of blocks (half sectors, 256B) requested to be</div><div class='add'>+ *                 read/programmed.</div><div class='add'>+ * @result       : Includes information about the status of the write counter</div><div class='add'>+ *                 (valid, expired) and result of the access made to the RPMB.</div><div class='add'>+ * @req_resp     : Defines the type of request and response to/from the memory.</div><div class='add'>+ *</div><div class='add'>+ * The stuff bytes and big-endian properties are modeled to fit to the spec.</div><div class='add'>+ */</div><div class='add'>+struct rpmb_frame {</div><div class='add'>+	u8     stuff[196];</div><div class='add'>+	u8     key_mac[32];</div><div class='add'>+	u8     data[256];</div><div class='add'>+	u8     nonce[16];</div><div class='add'>+	__be32 write_counter;</div><div class='add'>+	__be16 addr;</div><div class='add'>+	__be16 block_count;</div><div class='add'>+	__be16 result;</div><div class='add'>+	__be16 req_resp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RPMB_PROGRAM_KEY       0x1    /* Program RPMB Authentication Key */</div><div class='add'>+#define RPMB_GET_WRITE_COUNTER 0x2    /* Read RPMB write counter */</div><div class='add'>+#define RPMB_WRITE_DATA        0x3    /* Write data to RPMB partition */</div><div class='add'>+#define RPMB_READ_DATA         0x4    /* Read data from RPMB partition */</div><div class='add'>+#define RPMB_RESULT_READ       0x5    /* Read result request  (Internal) */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_RPMB)</div><div class='add'>+struct rpmb_dev *rpmb_dev_get(struct rpmb_dev *rdev);</div><div class='add'>+void rpmb_dev_put(struct rpmb_dev *rdev);</div><div class='add'>+struct rpmb_dev *rpmb_dev_find_device(const void *data,</div><div class='add'>+				      const struct rpmb_dev *start,</div><div class='add'>+				      int (*match)(struct device *dev,</div><div class='add'>+						   const void *data));</div><div class='add'>+int rpmb_interface_register(struct class_interface *intf);</div><div class='add'>+void rpmb_interface_unregister(struct class_interface *intf);</div><div class='add'>+struct rpmb_dev *rpmb_dev_register(struct device *dev,</div><div class='add'>+				   struct rpmb_descr *descr);</div><div class='add'>+int rpmb_dev_unregister(struct rpmb_dev *rdev);</div><div class='add'>+</div><div class='add'>+int rpmb_route_frames(struct rpmb_dev *rdev, u8 *req,</div><div class='add'>+		      unsigned int req_len, u8 *resp, unsigned int resp_len);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline struct rpmb_dev *rpmb_dev_get(struct rpmb_dev *rdev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rpmb_dev_put(struct rpmb_dev *rdev) { }</div><div class='add'>+</div><div class='add'>+static inline struct rpmb_dev *</div><div class='add'>+rpmb_dev_find_device(const void *data, const struct rpmb_dev *start,</div><div class='add'>+		     int (*match)(struct device *dev, const void *data))</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rpmb_interface_register(struct class_interface *intf)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rpmb_interface_unregister(struct class_interface *intf)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct rpmb_dev *</div><div class='add'>+rpmb_dev_register(struct device *dev, struct rpmb_descr *descr)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rpmb_dev_unregister(struct rpmb_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rpmb_route_frames(struct rpmb_dev *rdev, u8 *req,</div><div class='add'>+				    unsigned int req_len, u8 *resp,</div><div class='add'>+				    unsigned int resp_len)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_RPMB */</div><div class='add'>+</div><div class='add'>+#endif /* __RPMB_H__ */</div><div class='head'>diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h<br/>index 90d8e4475f80..fb7ab9165645 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rpmsg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rpmsg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rpmsg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rpmsg.h</a></div><div class='hunk'>@@ -184,13 +184,9 @@ struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_device *,</div><div class='ctx'> </div><div class='ctx'> int rpmsg_send(struct rpmsg_endpoint *ept, void *data, int len);</div><div class='ctx'> int rpmsg_sendto(struct rpmsg_endpoint *ept, void *data, int len, u32 dst);</div><div class='del'>-int rpmsg_send_offchannel(struct rpmsg_endpoint *ept, u32 src, u32 dst,</div><div class='del'>-			  void *data, int len);</div><div class='ctx'> </div><div class='ctx'> int rpmsg_trysend(struct rpmsg_endpoint *ept, void *data, int len);</div><div class='ctx'> int rpmsg_trysendto(struct rpmsg_endpoint *ept, void *data, int len, u32 dst);</div><div class='del'>-int rpmsg_trysend_offchannel(struct rpmsg_endpoint *ept, u32 src, u32 dst,</div><div class='del'>-			     void *data, int len);</div><div class='ctx'> </div><div class='ctx'> __poll_t rpmsg_poll(struct rpmsg_endpoint *ept, struct file *filp,</div><div class='ctx'> 			poll_table *wait);</div><div class='hunk'>@@ -271,15 +267,6 @@ static inline int rpmsg_sendto(struct rpmsg_endpoint *ept, void *data, int len,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int rpmsg_send_offchannel(struct rpmsg_endpoint *ept, u32 src,</div><div class='del'>-					u32 dst, void *data, int len)</div><div class='del'>-{</div><div class='del'>-	/* This shouldn't be possible */</div><div class='del'>-	WARN_ON(1);</div><div class='del'>-</div><div class='del'>-	return -ENXIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int rpmsg_trysend(struct rpmsg_endpoint *ept, void *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	/* This shouldn't be possible */</div><div class='hunk'>@@ -297,15 +284,6 @@ static inline int rpmsg_trysendto(struct rpmsg_endpoint *ept, void *data,</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int rpmsg_trysend_offchannel(struct rpmsg_endpoint *ept, u32 src,</div><div class='del'>-					   u32 dst, void *data, int len)</div><div class='del'>-{</div><div class='del'>-	/* This shouldn't be possible */</div><div class='del'>-	WARN_ON(1);</div><div class='del'>-</div><div class='del'>-	return -ENXIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline __poll_t rpmsg_poll(struct rpmsg_endpoint *ept,</div><div class='ctx'> 				      struct file *filp, poll_table *wait)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/rseq.h b/include/linux/rseq.h<br/>index bc8af3eb5598..2266f4dc77b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rseq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rseq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rseq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rseq.h</a></div><div class='hunk'>@@ -3,129 +3,164 @@</div><div class='ctx'> #define _LINUX_RSEQ_H</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RSEQ</div><div class='del'>-</div><div class='del'>-#include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Map the event mask on the user-space ABI enum rseq_cs_flags</div><div class='del'>- * for direct mask checks.</div><div class='del'>- */</div><div class='del'>-enum rseq_event_mask_bits {</div><div class='del'>-	RSEQ_EVENT_PREEMPT_BIT	= RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT,</div><div class='del'>-	RSEQ_EVENT_SIGNAL_BIT	= RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT,</div><div class='del'>-	RSEQ_EVENT_MIGRATE_BIT	= RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum rseq_event_mask {</div><div class='del'>-	RSEQ_EVENT_PREEMPT	= (1U &lt;&lt; RSEQ_EVENT_PREEMPT_BIT),</div><div class='del'>-	RSEQ_EVENT_SIGNAL	= (1U &lt;&lt; RSEQ_EVENT_SIGNAL_BIT),</div><div class='del'>-	RSEQ_EVENT_MIGRATE	= (1U &lt;&lt; RSEQ_EVENT_MIGRATE_BIT),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void rseq_set_notify_resume(struct task_struct *t)</div><div class='del'>-{</div><div class='del'>-	if (t-&gt;rseq)</div><div class='del'>-		set_tsk_thread_flag(t, TIF_NOTIFY_RESUME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __rseq_handle_notify_resume(struct ksignal *sig, struct pt_regs *regs);</div><div class='add'>+#include &lt;uapi/linux/rseq.h&gt;</div><div class='ctx'> </div><div class='del'>-static inline void rseq_handle_notify_resume(struct ksignal *ksig,</div><div class='del'>-					     struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	if (current-&gt;rseq)</div><div class='del'>-		__rseq_handle_notify_resume(ksig, regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void rseq_signal_deliver(struct ksignal *ksig,</div><div class='del'>-				       struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	preempt_disable();</div><div class='del'>-	__set_bit(RSEQ_EVENT_SIGNAL_BIT, &amp;current-&gt;rseq_event_mask);</div><div class='del'>-	preempt_enable();</div><div class='del'>-	rseq_handle_notify_resume(ksig, regs);</div><div class='del'>-}</div><div class='add'>+void __rseq_handle_slowpath(struct pt_regs *regs);</div><div class='ctx'> </div><div class='del'>-/* rseq_preempt() requires preemption to be disabled. */</div><div class='del'>-static inline void rseq_preempt(struct task_struct *t)</div><div class='add'>+/* Invoked from resume_user_mode_work() */</div><div class='add'>+static inline void rseq_handle_slowpath(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	__set_bit(RSEQ_EVENT_PREEMPT_BIT, &amp;t-&gt;rseq_event_mask);</div><div class='del'>-	rseq_set_notify_resume(t);</div><div class='add'>+	if (IS_ENABLED(CONFIG_GENERIC_ENTRY)) {</div><div class='add'>+		if (current-&gt;rseq.event.slowpath)</div><div class='add'>+			__rseq_handle_slowpath(regs);</div><div class='add'>+	} else {</div><div class='add'>+		/* '&amp;' is intentional to spare one conditional branch */</div><div class='add'>+		if (current-&gt;rseq.event.sched_switch &amp; current-&gt;rseq.event.has_rseq)</div><div class='add'>+			__rseq_handle_slowpath(regs);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* rseq_migrate() requires preemption to be disabled. */</div><div class='del'>-static inline void rseq_migrate(struct task_struct *t)</div><div class='del'>-{</div><div class='del'>-	__set_bit(RSEQ_EVENT_MIGRATE_BIT, &amp;t-&gt;rseq_event_mask);</div><div class='del'>-	rseq_set_notify_resume(t);</div><div class='del'>-}</div><div class='add'>+void __rseq_signal_deliver(int sig, struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * If parent process has a registered restartable sequences area, the</div><div class='del'>- * child inherits. Unregister rseq for a clone with CLONE_VM set.</div><div class='add'>+ * Invoked from signal delivery to fixup based on the register context before</div><div class='add'>+ * switching to the signal delivery context.</div><div class='ctx'>  */</div><div class='del'>-static inline void rseq_fork(struct task_struct *t, unsigned long clone_flags)</div><div class='add'>+static inline void rseq_signal_deliver(struct ksignal *ksig, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (clone_flags &amp; CLONE_VM) {</div><div class='del'>-		t-&gt;rseq = NULL;</div><div class='del'>-		t-&gt;rseq_len = 0;</div><div class='del'>-		t-&gt;rseq_sig = 0;</div><div class='del'>-		t-&gt;rseq_event_mask = 0;</div><div class='add'>+	if (IS_ENABLED(CONFIG_GENERIC_IRQ_ENTRY)) {</div><div class='add'>+		/* '&amp;' is intentional to spare one conditional branch */</div><div class='add'>+		if (current-&gt;rseq.event.has_rseq &amp; current-&gt;rseq.event.user_irq)</div><div class='add'>+			__rseq_signal_deliver(ksig-&gt;sig, regs);</div><div class='ctx'> 	} else {</div><div class='del'>-		t-&gt;rseq = current-&gt;rseq;</div><div class='del'>-		t-&gt;rseq_len = current-&gt;rseq_len;</div><div class='del'>-		t-&gt;rseq_sig = current-&gt;rseq_sig;</div><div class='del'>-		t-&gt;rseq_event_mask = current-&gt;rseq_event_mask;</div><div class='add'>+		if (current-&gt;rseq.event.has_rseq)</div><div class='add'>+			__rseq_signal_deliver(ksig-&gt;sig, regs);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void rseq_execve(struct task_struct *t)</div><div class='add'>+static inline void rseq_raise_notify_resume(struct task_struct *t)</div><div class='ctx'> {</div><div class='del'>-	t-&gt;rseq = NULL;</div><div class='del'>-	t-&gt;rseq_len = 0;</div><div class='del'>-	t-&gt;rseq_sig = 0;</div><div class='del'>-	t-&gt;rseq_event_mask = 0;</div><div class='add'>+	set_tsk_thread_flag(t, TIF_RSEQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void rseq_set_notify_resume(struct task_struct *t)</div><div class='add'>+/* Invoked from context switch to force evaluation on exit to user */</div><div class='add'>+static __always_inline void rseq_sched_switch_event(struct task_struct *t)</div><div class='ctx'> {</div><div class='add'>+	struct rseq_event *ev = &amp;t-&gt;rseq.event;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_GENERIC_IRQ_ENTRY)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Avoid a boat load of conditionals by using simple logic</div><div class='add'>+		 * to determine whether NOTIFY_RESUME needs to be raised.</div><div class='add'>+		 *</div><div class='add'>+		 * It's required when the CPU or MM CID has changed or</div><div class='add'>+		 * the entry was from user space.</div><div class='add'>+		 */</div><div class='add'>+		bool raise = (ev-&gt;user_irq | ev-&gt;ids_changed) &amp; ev-&gt;has_rseq;</div><div class='add'>+</div><div class='add'>+		if (raise) {</div><div class='add'>+			ev-&gt;sched_switch = true;</div><div class='add'>+			rseq_raise_notify_resume(t);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (ev-&gt;has_rseq) {</div><div class='add'>+			t-&gt;rseq.event.sched_switch = true;</div><div class='add'>+			rseq_raise_notify_resume(t);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-static inline void rseq_handle_notify_resume(struct ksignal *ksig,</div><div class='del'>-					     struct pt_regs *regs)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Invoked from __set_task_cpu() when a task migrates or from</div><div class='add'>+ * mm_cid_schedin() when the CID changes to enforce an IDs update.</div><div class='add'>+ *</div><div class='add'>+ * This does not raise TIF_NOTIFY_RESUME as that happens in</div><div class='add'>+ * rseq_sched_switch_event().</div><div class='add'>+ */</div><div class='add'>+static __always_inline void rseq_sched_set_ids_changed(struct task_struct *t)</div><div class='ctx'> {</div><div class='add'>+	t-&gt;rseq.event.ids_changed = true;</div><div class='ctx'> }</div><div class='del'>-static inline void rseq_signal_deliver(struct ksignal *ksig,</div><div class='del'>-				       struct pt_regs *regs)</div><div class='add'>+</div><div class='add'>+/* Enforce a full update after RSEQ registration and when execve() failed */</div><div class='add'>+static inline void rseq_force_update(void)</div><div class='ctx'> {</div><div class='add'>+	if (current-&gt;rseq.event.has_rseq) {</div><div class='add'>+		current-&gt;rseq.event.ids_changed = true;</div><div class='add'>+		current-&gt;rseq.event.sched_switch = true;</div><div class='add'>+		rseq_raise_notify_resume(current);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-static inline void rseq_preempt(struct task_struct *t)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * KVM/HYPERV invoke resume_user_mode_work() before entering guest mode,</div><div class='add'>+ * which clears TIF_NOTIFY_RESUME on architectures that don't use the</div><div class='add'>+ * generic TIF bits and therefore can't provide a separate TIF_RSEQ flag.</div><div class='add'>+ *</div><div class='add'>+ * To avoid updating user space RSEQ in that case just to do it eventually</div><div class='add'>+ * again before returning to user space, because __rseq_handle_slowpath()</div><div class='add'>+ * does nothing when invoked with NULL register state.</div><div class='add'>+ *</div><div class='add'>+ * After returning from guest mode, before exiting to userspace, hypervisors</div><div class='add'>+ * must invoke this function to re-raise TIF_NOTIFY_RESUME if necessary.</div><div class='add'>+ */</div><div class='add'>+static inline void rseq_virt_userspace_exit(void)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * The generic optimization for deferring RSEQ updates until the next</div><div class='add'>+	 * exit relies on having a dedicated TIF_RSEQ.</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_ENABLED(CONFIG_HAVE_GENERIC_TIF_BITS) &amp;&amp;</div><div class='add'>+	    current-&gt;rseq.event.sched_switch)</div><div class='add'>+		rseq_raise_notify_resume(current);</div><div class='ctx'> }</div><div class='del'>-static inline void rseq_migrate(struct task_struct *t)</div><div class='add'>+</div><div class='add'>+static inline void rseq_reset(struct task_struct *t)</div><div class='ctx'> {</div><div class='add'>+	memset(&amp;t-&gt;rseq, 0, sizeof(t-&gt;rseq));</div><div class='add'>+	t-&gt;rseq.ids.cpu_id = RSEQ_CPU_ID_UNINITIALIZED;</div><div class='ctx'> }</div><div class='del'>-static inline void rseq_fork(struct task_struct *t, unsigned long clone_flags)</div><div class='add'>+</div><div class='add'>+static inline void rseq_execve(struct task_struct *t)</div><div class='ctx'> {</div><div class='add'>+	rseq_reset(t);</div><div class='ctx'> }</div><div class='del'>-static inline void rseq_execve(struct task_struct *t)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If parent process has a registered restartable sequences area, the</div><div class='add'>+ * child inherits. Unregister rseq for a clone with CLONE_VM set.</div><div class='add'>+ *</div><div class='add'>+ * On fork, keep the IDs (CPU, MMCID) of the parent, which avoids a fault</div><div class='add'>+ * on the COW page on exit to user space, when the child stays on the same</div><div class='add'>+ * CPU as the parent. That's obviously not guaranteed, but in overcommit</div><div class='add'>+ * scenarios it is more likely and optimizes for the fork/exec case without</div><div class='add'>+ * taking the fault.</div><div class='add'>+ */</div><div class='add'>+static inline void rseq_fork(struct task_struct *t, u64 clone_flags)</div><div class='ctx'> {</div><div class='add'>+	if (clone_flags &amp; CLONE_VM)</div><div class='add'>+		rseq_reset(t);</div><div class='add'>+	else</div><div class='add'>+		t-&gt;rseq = current-&gt;rseq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#else /* CONFIG_RSEQ */</div><div class='add'>+static inline void rseq_handle_slowpath(struct pt_regs *regs) { }</div><div class='add'>+static inline void rseq_signal_deliver(struct ksignal *ksig, struct pt_regs *regs) { }</div><div class='add'>+static inline void rseq_sched_switch_event(struct task_struct *t) { }</div><div class='add'>+static inline void rseq_sched_set_ids_changed(struct task_struct *t) { }</div><div class='add'>+static inline void rseq_force_update(void) { }</div><div class='add'>+static inline void rseq_virt_userspace_exit(void) { }</div><div class='add'>+static inline void rseq_fork(struct task_struct *t, u64 clone_flags) { }</div><div class='add'>+static inline void rseq_execve(struct task_struct *t) { }</div><div class='add'>+#endif  /* !CONFIG_RSEQ */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_RSEQ</div><div class='del'>-</div><div class='ctx'> void rseq_syscall(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void rseq_syscall(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+#else /* CONFIG_DEBUG_RSEQ */</div><div class='add'>+static inline void rseq_syscall(struct pt_regs *regs) { }</div><div class='add'>+#endif /* !CONFIG_DEBUG_RSEQ */</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_RSEQ_H */</div><div class='head'>diff --git a/include/linux/rseq_entry.h b/include/linux/rseq_entry.h<br/>new file mode 100644<br/>index 000000000000..c92167ff8a7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rseq_entry.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rseq_entry.h</a></div><div class='hunk'>@@ -0,0 +1,616 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_RSEQ_ENTRY_H</div><div class='add'>+#define _LINUX_RSEQ_ENTRY_H</div><div class='add'>+</div><div class='add'>+/* Must be outside the CONFIG_RSEQ guard to resolve the stubs */</div><div class='add'>+#ifdef CONFIG_RSEQ_STATS</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='add'>+</div><div class='add'>+struct rseq_stats {</div><div class='add'>+	unsigned long	exit;</div><div class='add'>+	unsigned long	signal;</div><div class='add'>+	unsigned long	slowpath;</div><div class='add'>+	unsigned long	fastpath;</div><div class='add'>+	unsigned long	ids;</div><div class='add'>+	unsigned long	cs;</div><div class='add'>+	unsigned long	clear;</div><div class='add'>+	unsigned long	fixup;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+DECLARE_PER_CPU(struct rseq_stats, rseq_stats);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Slow path has interrupts and preemption enabled, but the fast path</div><div class='add'>+ * runs with interrupts disabled so there is no point in having the</div><div class='add'>+ * preemption checks implied in __this_cpu_inc() for every operation.</div><div class='add'>+ */</div><div class='add'>+#ifdef RSEQ_BUILD_SLOW_PATH</div><div class='add'>+#define rseq_stat_inc(which)	this_cpu_inc((which))</div><div class='add'>+#else</div><div class='add'>+#define rseq_stat_inc(which)	raw_cpu_inc((which))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_RSEQ_STATS */</div><div class='add'>+#define rseq_stat_inc(x)	do { } while (0)</div><div class='add'>+#endif /* !CONFIG_RSEQ_STATS */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RSEQ</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='add'>+#include &lt;linux/rseq.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint-defs.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TRACEPOINTS</div><div class='add'>+DECLARE_TRACEPOINT(rseq_update);</div><div class='add'>+DECLARE_TRACEPOINT(rseq_ip_fixup);</div><div class='add'>+void __rseq_trace_update(struct task_struct *t);</div><div class='add'>+void __rseq_trace_ip_fixup(unsigned long ip, unsigned long start_ip,</div><div class='add'>+			   unsigned long offset, unsigned long abort_ip);</div><div class='add'>+</div><div class='add'>+static inline void rseq_trace_update(struct task_struct *t, struct rseq_ids *ids)</div><div class='add'>+{</div><div class='add'>+	if (tracepoint_enabled(rseq_update) &amp;&amp; ids)</div><div class='add'>+		__rseq_trace_update(t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rseq_trace_ip_fixup(unsigned long ip, unsigned long start_ip,</div><div class='add'>+				       unsigned long offset, unsigned long abort_ip)</div><div class='add'>+{</div><div class='add'>+	if (tracepoint_enabled(rseq_ip_fixup))</div><div class='add'>+		__rseq_trace_ip_fixup(ip, start_ip, offset, abort_ip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_TRACEPOINT */</div><div class='add'>+static inline void rseq_trace_update(struct task_struct *t, struct rseq_ids *ids) { }</div><div class='add'>+static inline void rseq_trace_ip_fixup(unsigned long ip, unsigned long start_ip,</div><div class='add'>+				       unsigned long offset, unsigned long abort_ip) { }</div><div class='add'>+#endif /* !CONFIG_TRACEPOINT */</div><div class='add'>+</div><div class='add'>+DECLARE_STATIC_KEY_MAYBE(CONFIG_RSEQ_DEBUG_DEFAULT_ENABLE, rseq_debug_enabled);</div><div class='add'>+</div><div class='add'>+#ifdef RSEQ_BUILD_SLOW_PATH</div><div class='add'>+#define rseq_inline</div><div class='add'>+#else</div><div class='add'>+#define rseq_inline __always_inline</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+bool rseq_debug_update_user_cs(struct task_struct *t, struct pt_regs *regs, unsigned long csaddr);</div><div class='add'>+bool rseq_debug_validate_ids(struct task_struct *t);</div><div class='add'>+</div><div class='add'>+static __always_inline void rseq_note_user_irq_entry(void)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_GENERIC_IRQ_ENTRY))</div><div class='add'>+		current-&gt;rseq.event.user_irq = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check whether there is a valid critical section and whether the</div><div class='add'>+ * instruction pointer in @regs is inside the critical section.</div><div class='add'>+ *</div><div class='add'>+ *  - If the critical section is invalid, terminate the task.</div><div class='add'>+ *</div><div class='add'>+ *  - If valid and the instruction pointer is inside, set it to the abort IP.</div><div class='add'>+ *</div><div class='add'>+ *  - If valid and the instruction pointer is outside, clear the critical</div><div class='add'>+ *    section address.</div><div class='add'>+ *</div><div class='add'>+ * Returns true, if the section was valid and either fixup or clear was</div><div class='add'>+ * done, false otherwise.</div><div class='add'>+ *</div><div class='add'>+ * In the failure case task::rseq_event::fatal is set when a invalid</div><div class='add'>+ * section was found. It's clear when the failure was an unresolved page</div><div class='add'>+ * fault.</div><div class='add'>+ *</div><div class='add'>+ * If inlined into the exit to user path with interrupts disabled, the</div><div class='add'>+ * caller has to protect against page faults with pagefault_disable().</div><div class='add'>+ *</div><div class='add'>+ * In preemptible task context this would be counterproductive as the page</div><div class='add'>+ * faults could not be fully resolved. As a consequence unresolved page</div><div class='add'>+ * faults in task context are fatal too.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef RSEQ_BUILD_SLOW_PATH</div><div class='add'>+/*</div><div class='add'>+ * The debug version is put out of line, but kept here so the code stays</div><div class='add'>+ * together.</div><div class='add'>+ *</div><div class='add'>+ * @csaddr has already been checked by the caller to be in user space</div><div class='add'>+ */</div><div class='add'>+bool rseq_debug_update_user_cs(struct task_struct *t, struct pt_regs *regs,</div><div class='add'>+			       unsigned long csaddr)</div><div class='add'>+{</div><div class='add'>+	struct rseq_cs __user *ucs = (struct rseq_cs __user *)(unsigned long)csaddr;</div><div class='add'>+	u64 start_ip, abort_ip, offset, cs_end, head, tasksize = TASK_SIZE;</div><div class='add'>+	unsigned long ip = instruction_pointer(regs);</div><div class='add'>+	u64 __user *uc_head = (u64 __user *) ucs;</div><div class='add'>+	u32 usig, __user *uc_sig;</div><div class='add'>+</div><div class='add'>+	scoped_user_rw_access(ucs, efault) {</div><div class='add'>+		/*</div><div class='add'>+		 * Evaluate the user pile and exit if one of the conditions</div><div class='add'>+		 * is not fulfilled.</div><div class='add'>+		 */</div><div class='add'>+		unsafe_get_user(start_ip, &amp;ucs-&gt;start_ip, efault);</div><div class='add'>+		if (unlikely(start_ip &gt;= tasksize))</div><div class='add'>+			goto die;</div><div class='add'>+		/* If outside, just clear the critical section. */</div><div class='add'>+		if (ip &lt; start_ip)</div><div class='add'>+			goto clear;</div><div class='add'>+</div><div class='add'>+		unsafe_get_user(offset, &amp;ucs-&gt;post_commit_offset, efault);</div><div class='add'>+		cs_end = start_ip + offset;</div><div class='add'>+		/* Check for overflow and wraparound */</div><div class='add'>+		if (unlikely(cs_end &gt;= tasksize || cs_end &lt; start_ip))</div><div class='add'>+			goto die;</div><div class='add'>+</div><div class='add'>+		/* If not inside, clear it. */</div><div class='add'>+		if (ip &gt;= cs_end)</div><div class='add'>+			goto clear;</div><div class='add'>+</div><div class='add'>+		unsafe_get_user(abort_ip, &amp;ucs-&gt;abort_ip, efault);</div><div class='add'>+		/* Ensure it's "valid" */</div><div class='add'>+		if (unlikely(abort_ip &gt;= tasksize || abort_ip &lt; sizeof(*uc_sig)))</div><div class='add'>+			goto die;</div><div class='add'>+		/* Validate that the abort IP is not in the critical section */</div><div class='add'>+		if (unlikely(abort_ip - start_ip &lt; offset))</div><div class='add'>+			goto die;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Check version and flags for 0. No point in emitting</div><div class='add'>+		 * deprecated warnings before dying. That could be done in</div><div class='add'>+		 * the slow path eventually, but *shrug*.</div><div class='add'>+		 */</div><div class='add'>+		unsafe_get_user(head, uc_head, efault);</div><div class='add'>+		if (unlikely(head))</div><div class='add'>+			goto die;</div><div class='add'>+</div><div class='add'>+		/* abort_ip - 4 is &gt;= 0. See abort_ip check above */</div><div class='add'>+		uc_sig = (u32 __user *)(unsigned long)(abort_ip - sizeof(*uc_sig));</div><div class='add'>+		unsafe_get_user(usig, uc_sig, efault);</div><div class='add'>+		if (unlikely(usig != t-&gt;rseq.sig))</div><div class='add'>+			goto die;</div><div class='add'>+</div><div class='add'>+		/* rseq_event.user_irq is only valid if CONFIG_GENERIC_IRQ_ENTRY=y */</div><div class='add'>+		if (IS_ENABLED(CONFIG_GENERIC_IRQ_ENTRY)) {</div><div class='add'>+			/* If not in interrupt from user context, let it die */</div><div class='add'>+			if (unlikely(!t-&gt;rseq.event.user_irq))</div><div class='add'>+				goto die;</div><div class='add'>+		}</div><div class='add'>+		unsafe_put_user(0ULL, &amp;t-&gt;rseq.usrptr-&gt;rseq_cs, efault);</div><div class='add'>+		instruction_pointer_set(regs, (unsigned long)abort_ip);</div><div class='add'>+		rseq_stat_inc(rseq_stats.fixup);</div><div class='add'>+		break;</div><div class='add'>+	clear:</div><div class='add'>+		unsafe_put_user(0ULL, &amp;t-&gt;rseq.usrptr-&gt;rseq_cs, efault);</div><div class='add'>+		rseq_stat_inc(rseq_stats.clear);</div><div class='add'>+		abort_ip = 0ULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(abort_ip))</div><div class='add'>+		rseq_trace_ip_fixup(ip, start_ip, offset, abort_ip);</div><div class='add'>+	return true;</div><div class='add'>+die:</div><div class='add'>+	t-&gt;rseq.event.fatal = true;</div><div class='add'>+efault:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On debug kernels validate that user space did not mess with it if the</div><div class='add'>+ * debug branch is enabled.</div><div class='add'>+ */</div><div class='add'>+bool rseq_debug_validate_ids(struct task_struct *t)</div><div class='add'>+{</div><div class='add'>+	struct rseq __user *rseq = t-&gt;rseq.usrptr;</div><div class='add'>+	u32 cpu_id, uval, node_id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On the first exit after registering the rseq region CPU ID is</div><div class='add'>+	 * RSEQ_CPU_ID_UNINITIALIZED and node_id in user space is 0!</div><div class='add'>+	 */</div><div class='add'>+	node_id = t-&gt;rseq.ids.cpu_id != RSEQ_CPU_ID_UNINITIALIZED ?</div><div class='add'>+		  cpu_to_node(t-&gt;rseq.ids.cpu_id) : 0;</div><div class='add'>+</div><div class='add'>+	scoped_user_read_access(rseq, efault) {</div><div class='add'>+		unsafe_get_user(cpu_id, &amp;rseq-&gt;cpu_id_start, efault);</div><div class='add'>+		if (cpu_id != t-&gt;rseq.ids.cpu_id)</div><div class='add'>+			goto die;</div><div class='add'>+		unsafe_get_user(uval, &amp;rseq-&gt;cpu_id, efault);</div><div class='add'>+		if (uval != cpu_id)</div><div class='add'>+			goto die;</div><div class='add'>+		unsafe_get_user(uval, &amp;rseq-&gt;node_id, efault);</div><div class='add'>+		if (uval != node_id)</div><div class='add'>+			goto die;</div><div class='add'>+		unsafe_get_user(uval, &amp;rseq-&gt;mm_cid, efault);</div><div class='add'>+		if (uval != t-&gt;rseq.ids.mm_cid)</div><div class='add'>+			goto die;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+die:</div><div class='add'>+	t-&gt;rseq.event.fatal = true;</div><div class='add'>+efault:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* RSEQ_BUILD_SLOW_PATH */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This only ensures that abort_ip is in the user address space and</div><div class='add'>+ * validates that it is preceded by the signature.</div><div class='add'>+ *</div><div class='add'>+ * No other sanity checks are done here, that's what the debug code is for.</div><div class='add'>+ */</div><div class='add'>+static rseq_inline bool</div><div class='add'>+rseq_update_user_cs(struct task_struct *t, struct pt_regs *regs, unsigned long csaddr)</div><div class='add'>+{</div><div class='add'>+	struct rseq_cs __user *ucs = (struct rseq_cs __user *)(unsigned long)csaddr;</div><div class='add'>+	unsigned long ip = instruction_pointer(regs);</div><div class='add'>+	unsigned long tasksize = TASK_SIZE;</div><div class='add'>+	u64 start_ip, abort_ip, offset;</div><div class='add'>+	u32 usig, __user *uc_sig;</div><div class='add'>+</div><div class='add'>+	rseq_stat_inc(rseq_stats.cs);</div><div class='add'>+</div><div class='add'>+	if (unlikely(csaddr &gt;= tasksize)) {</div><div class='add'>+		t-&gt;rseq.event.fatal = true;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;rseq_debug_enabled))</div><div class='add'>+		return rseq_debug_update_user_cs(t, regs, csaddr);</div><div class='add'>+</div><div class='add'>+	scoped_user_rw_access(ucs, efault) {</div><div class='add'>+		unsafe_get_user(start_ip, &amp;ucs-&gt;start_ip, efault);</div><div class='add'>+		unsafe_get_user(offset, &amp;ucs-&gt;post_commit_offset, efault);</div><div class='add'>+		unsafe_get_user(abort_ip, &amp;ucs-&gt;abort_ip, efault);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * No sanity checks. If user space screwed it up, it can</div><div class='add'>+		 * keep the pieces. That's what debug code is for.</div><div class='add'>+		 *</div><div class='add'>+		 * If outside, just clear the critical section.</div><div class='add'>+		 */</div><div class='add'>+		if (ip - start_ip &gt;= offset)</div><div class='add'>+			goto clear;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Two requirements for @abort_ip:</div><div class='add'>+		 *   - Must be in user space as x86 IRET would happily return to</div><div class='add'>+		 *     the kernel.</div><div class='add'>+		 *   - The four bytes preceding the instruction at @abort_ip must</div><div class='add'>+		 *     contain the signature.</div><div class='add'>+		 *</div><div class='add'>+		 * The latter protects against the following attack vector:</div><div class='add'>+		 *</div><div class='add'>+		 * An attacker with limited abilities to write, creates a critical</div><div class='add'>+		 * section descriptor, sets the abort IP to a library function or</div><div class='add'>+		 * some other ROP gadget and stores the address of the descriptor</div><div class='add'>+		 * in TLS::rseq::rseq_cs. An RSEQ abort would then evade ROP</div><div class='add'>+		 * protection.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(abort_ip &gt;= tasksize || abort_ip &lt; sizeof(*uc_sig)))</div><div class='add'>+			goto die;</div><div class='add'>+</div><div class='add'>+		/* The address is guaranteed to be &gt;= 0 and &lt; TASK_SIZE */</div><div class='add'>+		uc_sig = (u32 __user *)(unsigned long)(abort_ip - sizeof(*uc_sig));</div><div class='add'>+		unsafe_get_user(usig, uc_sig, efault);</div><div class='add'>+		if (unlikely(usig != t-&gt;rseq.sig))</div><div class='add'>+			goto die;</div><div class='add'>+</div><div class='add'>+		/* Invalidate the critical section */</div><div class='add'>+		unsafe_put_user(0ULL, &amp;t-&gt;rseq.usrptr-&gt;rseq_cs, efault);</div><div class='add'>+		/* Update the instruction pointer */</div><div class='add'>+		instruction_pointer_set(regs, (unsigned long)abort_ip);</div><div class='add'>+		rseq_stat_inc(rseq_stats.fixup);</div><div class='add'>+		break;</div><div class='add'>+	clear:</div><div class='add'>+		unsafe_put_user(0ULL, &amp;t-&gt;rseq.usrptr-&gt;rseq_cs, efault);</div><div class='add'>+		rseq_stat_inc(rseq_stats.clear);</div><div class='add'>+		abort_ip = 0ULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(abort_ip))</div><div class='add'>+		rseq_trace_ip_fixup(ip, start_ip, offset, abort_ip);</div><div class='add'>+	return true;</div><div class='add'>+die:</div><div class='add'>+	t-&gt;rseq.event.fatal = true;</div><div class='add'>+efault:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Updates CPU ID, Node ID and MM CID and reads the critical section</div><div class='add'>+ * address, when @csaddr != NULL. This allows to put the ID update and the</div><div class='add'>+ * read under the same uaccess region to spare a separate begin/end.</div><div class='add'>+ *</div><div class='add'>+ * As this is either invoked from a C wrapper with @csaddr = NULL or from</div><div class='add'>+ * the fast path code with a valid pointer, a clever compiler should be</div><div class='add'>+ * able to optimize the read out. Spares a duplicate implementation.</div><div class='add'>+ *</div><div class='add'>+ * Returns true, if the operation was successful, false otherwise.</div><div class='add'>+ *</div><div class='add'>+ * In the failure case task::rseq_event::fatal is set when invalid data</div><div class='add'>+ * was found on debug kernels. It's clear when the failure was an unresolved page</div><div class='add'>+ * fault.</div><div class='add'>+ *</div><div class='add'>+ * If inlined into the exit to user path with interrupts disabled, the</div><div class='add'>+ * caller has to protect against page faults with pagefault_disable().</div><div class='add'>+ *</div><div class='add'>+ * In preemptible task context this would be counterproductive as the page</div><div class='add'>+ * faults could not be fully resolved. As a consequence unresolved page</div><div class='add'>+ * faults in task context are fatal too.</div><div class='add'>+ */</div><div class='add'>+static rseq_inline</div><div class='add'>+bool rseq_set_ids_get_csaddr(struct task_struct *t, struct rseq_ids *ids,</div><div class='add'>+			     u32 node_id, u64 *csaddr)</div><div class='add'>+{</div><div class='add'>+	struct rseq __user *rseq = t-&gt;rseq.usrptr;</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;rseq_debug_enabled)) {</div><div class='add'>+		if (!rseq_debug_validate_ids(t))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_user_rw_access(rseq, efault) {</div><div class='add'>+		unsafe_put_user(ids-&gt;cpu_id, &amp;rseq-&gt;cpu_id_start, efault);</div><div class='add'>+		unsafe_put_user(ids-&gt;cpu_id, &amp;rseq-&gt;cpu_id, efault);</div><div class='add'>+		unsafe_put_user(node_id, &amp;rseq-&gt;node_id, efault);</div><div class='add'>+		unsafe_put_user(ids-&gt;mm_cid, &amp;rseq-&gt;mm_cid, efault);</div><div class='add'>+		if (csaddr)</div><div class='add'>+			unsafe_get_user(*csaddr, &amp;rseq-&gt;rseq_cs, efault);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cache the new values */</div><div class='add'>+	t-&gt;rseq.ids.cpu_cid = ids-&gt;cpu_cid;</div><div class='add'>+	rseq_stat_inc(rseq_stats.ids);</div><div class='add'>+	rseq_trace_update(t, ids);</div><div class='add'>+	return true;</div><div class='add'>+efault:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update user space with new IDs and conditionally check whether the task</div><div class='add'>+ * is in a critical section.</div><div class='add'>+ */</div><div class='add'>+static rseq_inline bool rseq_update_usr(struct task_struct *t, struct pt_regs *regs,</div><div class='add'>+					struct rseq_ids *ids, u32 node_id)</div><div class='add'>+{</div><div class='add'>+	u64 csaddr;</div><div class='add'>+</div><div class='add'>+	if (!rseq_set_ids_get_csaddr(t, ids, node_id, &amp;csaddr))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On architectures which utilize the generic entry code this</div><div class='add'>+	 * allows to skip the critical section when the entry was not from</div><div class='add'>+	 * a user space interrupt, unless debug mode is enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ENABLED(CONFIG_GENERIC_IRQ_ENTRY)) {</div><div class='add'>+		if (!static_branch_unlikely(&amp;rseq_debug_enabled)) {</div><div class='add'>+			if (likely(!t-&gt;rseq.event.user_irq))</div><div class='add'>+				return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (likely(!csaddr))</div><div class='add'>+		return true;</div><div class='add'>+	/* Sigh, this really needs to do work */</div><div class='add'>+	return rseq_update_user_cs(t, regs, csaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If you want to use this then convert your architecture to the generic</div><div class='add'>+ * entry code. I'm tired of building workarounds for people who can't be</div><div class='add'>+ * bothered to make the maintenance of generic infrastructure less</div><div class='add'>+ * burdensome. Just sucking everything into the architecture code and</div><div class='add'>+ * thereby making others chase the horrible hacks and keep them working is</div><div class='add'>+ * neither acceptable nor sustainable.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_GENERIC_ENTRY</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is inlined into the exit path because:</div><div class='add'>+ *</div><div class='add'>+ * 1) It's a one time comparison in the fast path when there is no event to</div><div class='add'>+ *    handle</div><div class='add'>+ *</div><div class='add'>+ * 2) The access to the user space rseq memory (TLS) is unlikely to fault</div><div class='add'>+ *    so the straight inline operation is:</div><div class='add'>+ *</div><div class='add'>+ *	- Four 32-bit stores only if CPU ID/ MM CID need to be updated</div><div class='add'>+ *	- One 64-bit load to retrieve the critical section address</div><div class='add'>+ *</div><div class='add'>+ * 3) In the unlikely case that the critical section address is != NULL:</div><div class='add'>+ *</div><div class='add'>+ *     - One 64-bit load to retrieve the start IP</div><div class='add'>+ *     - One 64-bit load to retrieve the offset for calculating the end</div><div class='add'>+ *     - One 64-bit load to retrieve the abort IP</div><div class='add'>+ *     - One 64-bit load to retrieve the signature</div><div class='add'>+ *     - One store to clear the critical section address</div><div class='add'>+ *</div><div class='add'>+ * The non-debug case implements only the minimal required checking. It</div><div class='add'>+ * provides protection against a rogue abort IP in kernel space, which</div><div class='add'>+ * would be exploitable at least on x86, and also against a rogue CS</div><div class='add'>+ * descriptor by checking the signature at the abort IP. Any fallout from</div><div class='add'>+ * invalid critical section descriptors is a user space problem. The debug</div><div class='add'>+ * case provides the full set of checks and terminates the task if a</div><div class='add'>+ * condition is not met.</div><div class='add'>+ *</div><div class='add'>+ * In case of a fault or an invalid value, this sets TIF_NOTIFY_RESUME and</div><div class='add'>+ * tells the caller to loop back into exit_to_user_mode_loop(). The rseq</div><div class='add'>+ * slow path there will handle the failure.</div><div class='add'>+ */</div><div class='add'>+static __always_inline bool rseq_exit_user_update(struct pt_regs *regs, struct task_struct *t)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Page faults need to be disabled as this is called with</div><div class='add'>+	 * interrupts disabled</div><div class='add'>+	 */</div><div class='add'>+	guard(pagefault)();</div><div class='add'>+	if (likely(!t-&gt;rseq.event.ids_changed)) {</div><div class='add'>+		struct rseq __user *rseq = t-&gt;rseq.usrptr;</div><div class='add'>+		/*</div><div class='add'>+		 * If IDs have not changed rseq_event::user_irq must be true</div><div class='add'>+		 * See rseq_sched_switch_event().</div><div class='add'>+		 */</div><div class='add'>+		u64 csaddr;</div><div class='add'>+</div><div class='add'>+		if (unlikely(get_user_inline(csaddr, &amp;rseq-&gt;rseq_cs)))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		if (static_branch_unlikely(&amp;rseq_debug_enabled) || unlikely(csaddr)) {</div><div class='add'>+			if (unlikely(!rseq_update_user_cs(t, regs, csaddr)))</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	struct rseq_ids ids = {</div><div class='add'>+		.cpu_id = task_cpu(t),</div><div class='add'>+		.mm_cid = task_mm_cid(t),</div><div class='add'>+	};</div><div class='add'>+	u32 node_id = cpu_to_node(ids.cpu_id);</div><div class='add'>+</div><div class='add'>+	return rseq_update_usr(t, regs, &amp;ids, node_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline bool __rseq_exit_to_user_mode_restart(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *t = current;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the task did not go through schedule or got the flag enforced</div><div class='add'>+	 * by the rseq syscall or execve, then nothing to do here.</div><div class='add'>+	 *</div><div class='add'>+	 * CPU ID and MM CID can only change when going through a context</div><div class='add'>+	 * switch.</div><div class='add'>+	 *</div><div class='add'>+	 * rseq_sched_switch_event() sets the rseq_event::sched_switch bit</div><div class='add'>+	 * only when rseq_event::has_rseq is true. That conditional is</div><div class='add'>+	 * required to avoid setting the TIF bit if RSEQ is not registered</div><div class='add'>+	 * for a task. rseq_event::sched_switch is cleared when RSEQ is</div><div class='add'>+	 * unregistered by a task so it's sufficient to check for the</div><div class='add'>+	 * sched_switch bit alone.</div><div class='add'>+	 *</div><div class='add'>+	 * A sane compiler requires three instructions for the nothing to do</div><div class='add'>+	 * case including clearing the events, but your mileage might vary.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely((t-&gt;rseq.event.sched_switch))) {</div><div class='add'>+		rseq_stat_inc(rseq_stats.fastpath);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!rseq_exit_user_update(regs, t)))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	/* Clear state so next entry starts from a clean slate */</div><div class='add'>+	t-&gt;rseq.event.events = 0;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Required to allow conversion to GENERIC_ENTRY w/o GENERIC_TIF_BITS */</div><div class='add'>+#ifdef CONFIG_HAVE_GENERIC_TIF_BITS</div><div class='add'>+static __always_inline bool test_tif_rseq(unsigned long ti_work)</div><div class='add'>+{</div><div class='add'>+	return ti_work &amp; _TIF_RSEQ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void clear_tif_rseq(void)</div><div class='add'>+{</div><div class='add'>+	static_assert(TIF_RSEQ != TIF_NOTIFY_RESUME);</div><div class='add'>+	clear_thread_flag(TIF_RSEQ);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static __always_inline bool test_tif_rseq(unsigned long ti_work) { return true; }</div><div class='add'>+static __always_inline void clear_tif_rseq(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __always_inline bool</div><div class='add'>+rseq_exit_to_user_mode_restart(struct pt_regs *regs, unsigned long ti_work)</div><div class='add'>+{</div><div class='add'>+	if (likely(!test_tif_rseq(ti_work)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (unlikely(__rseq_exit_to_user_mode_restart(regs))) {</div><div class='add'>+		current-&gt;rseq.event.slowpath = true;</div><div class='add'>+		set_tsk_thread_flag(current, TIF_NOTIFY_RESUME);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_tif_rseq();</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_GENERIC_ENTRY */</div><div class='add'>+static inline bool rseq_exit_to_user_mode_restart(struct pt_regs *regs, unsigned long ti_work)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_GENERIC_ENTRY */</div><div class='add'>+</div><div class='add'>+static __always_inline void rseq_syscall_exit_to_user_mode(void)</div><div class='add'>+{</div><div class='add'>+	struct rseq_event *ev = &amp;current-&gt;rseq.event;</div><div class='add'>+</div><div class='add'>+	rseq_stat_inc(rseq_stats.exit);</div><div class='add'>+</div><div class='add'>+	/* Needed to remove the store for the !lockdep case */</div><div class='add'>+	if (IS_ENABLED(CONFIG_LOCKDEP)) {</div><div class='add'>+		WARN_ON_ONCE(ev-&gt;sched_switch);</div><div class='add'>+		ev-&gt;events = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void rseq_irqentry_exit_to_user_mode(void)</div><div class='add'>+{</div><div class='add'>+	struct rseq_event *ev = &amp;current-&gt;rseq.event;</div><div class='add'>+</div><div class='add'>+	rseq_stat_inc(rseq_stats.exit);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_once(!ev-&gt;sched_switch);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that event (especially user_irq) is cleared when the</div><div class='add'>+	 * interrupt did not result in a schedule and therefore the</div><div class='add'>+	 * rseq processing could not clear it.</div><div class='add'>+	 */</div><div class='add'>+	ev-&gt;events = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Required to keep ARM64 working */</div><div class='add'>+static __always_inline void rseq_exit_to_user_mode_legacy(void)</div><div class='add'>+{</div><div class='add'>+	struct rseq_event *ev = &amp;current-&gt;rseq.event;</div><div class='add'>+</div><div class='add'>+	rseq_stat_inc(rseq_stats.exit);</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;rseq_debug_enabled))</div><div class='add'>+		WARN_ON_ONCE(ev-&gt;sched_switch);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that event (especially user_irq) is cleared when the</div><div class='add'>+	 * interrupt did not result in a schedule and therefore the</div><div class='add'>+	 * rseq processing did not clear it.</div><div class='add'>+	 */</div><div class='add'>+	ev-&gt;events = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __rseq_debug_syscall_return(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+static inline void rseq_debug_syscall_return(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_unlikely(&amp;rseq_debug_enabled))</div><div class='add'>+		__rseq_debug_syscall_return(regs);</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_RSEQ */</div><div class='add'>+static inline void rseq_note_user_irq_entry(void) { }</div><div class='add'>+static inline bool rseq_exit_to_user_mode_restart(struct pt_regs *regs, unsigned long ti_work)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+static inline void rseq_syscall_exit_to_user_mode(void) { }</div><div class='add'>+static inline void rseq_irqentry_exit_to_user_mode(void) { }</div><div class='add'>+static inline void rseq_exit_to_user_mode_legacy(void) { }</div><div class='add'>+static inline void rseq_debug_syscall_return(struct pt_regs *regs) { }</div><div class='add'>+#endif /* !CONFIG_RSEQ */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_RSEQ_ENTRY_H */</div><div class='head'>diff --git a/include/linux/rseq_types.h b/include/linux/rseq_types.h<br/>new file mode 100644<br/>index 000000000000..332dc14b81c9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rseq_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rseq_types.h</a></div><div class='hunk'>@@ -0,0 +1,164 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_RSEQ_TYPES_H</div><div class='add'>+#define _LINUX_RSEQ_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/irq_work_types.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/workqueue_types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RSEQ</div><div class='add'>+struct rseq;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rseq_event - Storage for rseq related event management</div><div class='add'>+ * @all:		Compound to initialize and clear the data efficiently</div><div class='add'>+ * @events:		Compound to access events with a single load/store</div><div class='add'>+ * @sched_switch:	True if the task was scheduled and needs update on</div><div class='add'>+ *			exit to user</div><div class='add'>+ * @ids_changed:	Indicator that IDs need to be updated</div><div class='add'>+ * @user_irq:		True on interrupt entry from user mode</div><div class='add'>+ * @has_rseq:		True if the task has a rseq pointer installed</div><div class='add'>+ * @error:		Compound error code for the slow path to analyze</div><div class='add'>+ * @fatal:		User space data corrupted or invalid</div><div class='add'>+ * @slowpath:		Indicator that slow path processing via TIF_NOTIFY_RESUME</div><div class='add'>+ *			is required</div><div class='add'>+ *</div><div class='add'>+ * @sched_switch and @ids_changed must be adjacent and the combo must be</div><div class='add'>+ * 16bit aligned to allow a single store, when both are set at the same</div><div class='add'>+ * time in the scheduler.</div><div class='add'>+ */</div><div class='add'>+struct rseq_event {</div><div class='add'>+	union {</div><div class='add'>+		u64				all;</div><div class='add'>+		struct {</div><div class='add'>+			union {</div><div class='add'>+				u32		events;</div><div class='add'>+				struct {</div><div class='add'>+					u8	sched_switch;</div><div class='add'>+					u8	ids_changed;</div><div class='add'>+					u8	user_irq;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			u8			has_rseq;</div><div class='add'>+			u8			__pad;</div><div class='add'>+			union {</div><div class='add'>+				u16		error;</div><div class='add'>+				struct {</div><div class='add'>+					u8	fatal;</div><div class='add'>+					u8	slowpath;</div><div class='add'>+				};</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rseq_ids - Cache for ids, which need to be updated</div><div class='add'>+ * @cpu_cid:	Compound of @cpu_id and @mm_cid to make the</div><div class='add'>+ *		compiler emit a single compare on 64-bit</div><div class='add'>+ * @cpu_id:	The CPU ID which was written last to user space</div><div class='add'>+ * @mm_cid:	The MM CID which was written last to user space</div><div class='add'>+ *</div><div class='add'>+ * @cpu_id and @mm_cid are updated when the data is written to user space.</div><div class='add'>+ */</div><div class='add'>+struct rseq_ids {</div><div class='add'>+	union {</div><div class='add'>+		u64		cpu_cid;</div><div class='add'>+		struct {</div><div class='add'>+			u32	cpu_id;</div><div class='add'>+			u32	mm_cid;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rseq_data - Storage for all rseq related data</div><div class='add'>+ * @usrptr:	Pointer to the registered user space RSEQ memory</div><div class='add'>+ * @len:	Length of the RSEQ region</div><div class='add'>+ * @sig:	Signature of critial section abort IPs</div><div class='add'>+ * @event:	Storage for event management</div><div class='add'>+ * @ids:	Storage for cached CPU ID and MM CID</div><div class='add'>+ */</div><div class='add'>+struct rseq_data {</div><div class='add'>+	struct rseq __user		*usrptr;</div><div class='add'>+	u32				len;</div><div class='add'>+	u32				sig;</div><div class='add'>+	struct rseq_event		event;</div><div class='add'>+	struct rseq_ids			ids;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_RSEQ */</div><div class='add'>+struct rseq_data { };</div><div class='add'>+#endif /* !CONFIG_RSEQ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SCHED_MM_CID</div><div class='add'>+</div><div class='add'>+#define MM_CID_UNSET	BIT(31)</div><div class='add'>+#define MM_CID_ONCPU	BIT(30)</div><div class='add'>+#define MM_CID_TRANSIT	BIT(29)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sched_mm_cid - Storage for per task MM CID data</div><div class='add'>+ * @active:	MM CID is active for the task</div><div class='add'>+ * @cid:	The CID associated to the task either permanently or</div><div class='add'>+ *		borrowed from the CPU</div><div class='add'>+ */</div><div class='add'>+struct sched_mm_cid {</div><div class='add'>+	unsigned int		active;</div><div class='add'>+	unsigned int		cid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mm_cid_pcpu - Storage for per CPU MM_CID data</div><div class='add'>+ * @cid:	The CID associated to the CPU either permanently or</div><div class='add'>+ *		while a task with a CID is running</div><div class='add'>+ */</div><div class='add'>+struct mm_cid_pcpu {</div><div class='add'>+	unsigned int	cid;</div><div class='add'>+}____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mm_mm_cid - Storage for per MM CID data</div><div class='add'>+ * @pcpu:		Per CPU storage for CIDs associated to a CPU</div><div class='add'>+ * @percpu:		Set, when CIDs are in per CPU mode</div><div class='add'>+ * @transit:		Set to MM_CID_TRANSIT during a mode change transition phase</div><div class='add'>+ * @max_cids:		The exclusive maximum CID value for allocation and convergence</div><div class='add'>+ * @irq_work:		irq_work to handle the affinity mode change case</div><div class='add'>+ * @work:		Regular work to handle the affinity mode change case</div><div class='add'>+ * @lock:		Spinlock to protect against affinity setting which can't take @mutex</div><div class='add'>+ * @mutex:		Mutex to serialize forks and exits related to this mm</div><div class='add'>+ * @nr_cpus_allowed:	The number of CPUs in the per MM allowed CPUs map. The map</div><div class='add'>+ *			is growth only.</div><div class='add'>+ * @users:		The number of tasks sharing this MM. Separate from mm::mm_users</div><div class='add'>+ *			as that is modified by mmget()/mm_put() by other entities which</div><div class='add'>+ *			do not actually share the MM.</div><div class='add'>+ * @pcpu_thrs:		Threshold for switching back from per CPU mode</div><div class='add'>+ * @update_deferred:	A deferred switch back to per task mode is pending.</div><div class='add'>+ */</div><div class='add'>+struct mm_mm_cid {</div><div class='add'>+	/* Hotpath read mostly members */</div><div class='add'>+	struct mm_cid_pcpu	__percpu *pcpu;</div><div class='add'>+	unsigned int		percpu;</div><div class='add'>+	unsigned int		transit;</div><div class='add'>+	unsigned int		max_cids;</div><div class='add'>+</div><div class='add'>+	/* Rarely used. Moves @lock and @mutex into the second cacheline */</div><div class='add'>+	struct irq_work		irq_work;</div><div class='add'>+	struct work_struct	work;</div><div class='add'>+</div><div class='add'>+	raw_spinlock_t		lock;</div><div class='add'>+	struct mutex		mutex;</div><div class='add'>+</div><div class='add'>+	/* Low frequency modified */</div><div class='add'>+	unsigned int		nr_cpus_allowed;</div><div class='add'>+	unsigned int		users;</div><div class='add'>+	unsigned int		pcpu_thrs;</div><div class='add'>+	unsigned int		update_deferred;</div><div class='add'>+}____cacheline_aligned_in_smp;</div><div class='add'>+#else /* CONFIG_SCHED_MM_CID */</div><div class='add'>+struct mm_mm_cid { };</div><div class='add'>+struct sched_mm_cid { };</div><div class='add'>+#endif /* !CONFIG_SCHED_MM_CID */</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/rtc.h b/include/linux/rtc.h<br/>index 5f8e438a0312..95da051fb155 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rtc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rtc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rtc.h</a></div><div class='hunk'>@@ -42,7 +42,7 @@ static inline time64_t rtc_tm_sub(struct rtc_time *lhs, struct rtc_time *rhs)</div><div class='ctx'> #include &lt;linux/timerqueue.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='del'>-extern struct class *rtc_class;</div><div class='add'>+extern const struct class rtc_class;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * For these RTC methods the device parameter is the physical device</div><div class='hunk'>@@ -170,6 +170,7 @@ struct rtc_device {</div><div class='ctx'> /* useful timestamps */</div><div class='ctx'> #define RTC_TIMESTAMP_BEGIN_0000	-62167219200ULL /* 0000-01-01 00:00:00 */</div><div class='ctx'> #define RTC_TIMESTAMP_BEGIN_1900	-2208988800LL /* 1900-01-01 00:00:00 */</div><div class='add'>+#define RTC_TIMESTAMP_EPOCH_GPS		315964800LL /* 1980-01-06 00:00:00 */</div><div class='ctx'> #define RTC_TIMESTAMP_BEGIN_2000	946684800LL /* 2000-01-01 00:00:00 */</div><div class='ctx'> #define RTC_TIMESTAMP_END_2063		2966371199LL /* 2063-12-31 23:59:59 */</div><div class='ctx'> #define RTC_TIMESTAMP_END_2079		3471292799LL /* 2079-12-31 23:59:59 */</div><div class='head'>diff --git a/include/linux/rtc/ds1685.h b/include/linux/rtc/ds1685.h<br/>index 5a41c3bbcbe3..01da4582db6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rtc/ds1685.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtc/ds1685.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rtc/ds1685.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rtc/ds1685.h</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * include larger, battery-backed NV-SRAM, burst-mode access, and an RTC</div><div class='ctx'>  * write counter.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2011-2014 Joshua Kinard &lt;kumba@gentoo.org&gt;.</div><div class='add'>+ * Copyright (C) 2011-2014 Joshua Kinard &lt;linux@kumba.dev&gt;.</div><div class='ctx'>  * Copyright (C) 2009 Matthias Fuchs &lt;matthias.fuchs@esd-electronics.com&gt;.</div><div class='ctx'>  *</div><div class='ctx'>  * References:</div><div class='head'>diff --git a/include/linux/rtc/m48t59.h b/include/linux/rtc/m48t59.h<br/>index 9465d5405fe2..373ba77071c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rtc/m48t59.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtc/m48t59.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rtc/m48t59.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rtc/m48t59.h</a></div><div class='hunk'>@@ -56,6 +56,9 @@ struct m48t59_plat_data {</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='ctx'> 	/* offset to RTC registers, automatically set according to the type */</div><div class='ctx'> 	unsigned int offset;</div><div class='add'>+</div><div class='add'>+	/* YY digits (in RTC) are offset, i.e. year is 1900 + yy_offset + YY */</div><div class='add'>+	int yy_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_RTC_M48T59_H_ */</div><div class='head'>diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h<br/>index 7d049883a08a..ede4c6bf6f22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rtmutex.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtmutex.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rtmutex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rtmutex.h</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/rbtree_types.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock_types_raw.h&gt;</div><div class='ctx'> </div><div class='del'>-extern int max_lock_depth; /* for sysctl */</div><div class='add'>+extern int max_lock_depth;</div><div class='ctx'> </div><div class='ctx'> struct rt_mutex_base {</div><div class='ctx'> 	raw_spinlock_t		wait_lock;</div><div class='hunk'>@@ -44,6 +44,16 @@ static inline bool rt_mutex_base_is_locked(struct rt_mutex_base *lock)</div><div class='ctx'> 	return READ_ONCE(lock-&gt;owner) != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RT_MUTEXES</div><div class='add'>+#define RT_MUTEX_HAS_WAITERS	1UL</div><div class='add'>+</div><div class='add'>+static inline struct task_struct *rt_mutex_owner(struct rt_mutex_base *lock)</div><div class='add'>+{</div><div class='add'>+	unsigned long owner = (unsigned long) READ_ONCE(lock-&gt;owner);</div><div class='add'>+</div><div class='add'>+	return (struct task_struct *) (owner &amp; ~RT_MUTEX_HAS_WAITERS);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> extern void rt_mutex_base_init(struct rt_mutex_base *rtb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h<br/>index cdfc897f1e3c..ea39dd23a197 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rtnetlink.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtnetlink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rtnetlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rtnetlink.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@ extern void rtnl_lock(void);</div><div class='ctx'> extern void rtnl_unlock(void);</div><div class='ctx'> extern int rtnl_trylock(void);</div><div class='ctx'> extern int rtnl_is_locked(void);</div><div class='add'>+extern int rtnl_lock_interruptible(void);</div><div class='ctx'> extern int rtnl_lock_killable(void);</div><div class='ctx'> extern bool refcount_dec_and_rtnl_lock(refcount_t *r);</div><div class='ctx'> </div><div class='hunk'>@@ -51,6 +52,10 @@ extern atomic_t dev_unreg_count;</div><div class='ctx'> extern struct rw_semaphore pernet_ops_rwsem;</div><div class='ctx'> extern struct rw_semaphore net_rwsem;</div><div class='ctx'> </div><div class='add'>+#define ASSERT_RTNL() \</div><div class='add'>+	WARN_ONCE(!rtnl_is_locked(), \</div><div class='add'>+		  "RTNL: assertion failed at %s (%d)\n", __FILE__,  __LINE__)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PROVE_LOCKING</div><div class='ctx'> extern bool lockdep_rtnl_is_held(void);</div><div class='ctx'> #else</div><div class='hunk'>@@ -74,7 +79,7 @@ static inline bool lockdep_rtnl_is_held(void)</div><div class='ctx'>  * rtnl_dereference - fetch RCU pointer when updates are prevented by RTNL</div><div class='ctx'>  * @p: The pointer to read, prior to dereferencing</div><div class='ctx'>  *</div><div class='del'>- * Return the value of the specified RCU-protected pointer, but omit</div><div class='add'>+ * Return: the value of the specified RCU-protected pointer, but omit</div><div class='ctx'>  * the READ_ONCE(), because caller holds RTNL.</div><div class='ctx'>  */</div><div class='ctx'> #define rtnl_dereference(p)					\</div><div class='hunk'>@@ -92,6 +97,67 @@ static inline bool lockdep_rtnl_is_held(void)</div><div class='ctx'> #define rcu_replace_pointer_rtnl(rp, p)			\</div><div class='ctx'> 	rcu_replace_pointer(rp, p, lockdep_rtnl_is_held())</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_NET_SMALL_RTNL</div><div class='add'>+void __rtnl_net_lock(struct net *net);</div><div class='add'>+void __rtnl_net_unlock(struct net *net);</div><div class='add'>+void rtnl_net_lock(struct net *net);</div><div class='add'>+void rtnl_net_unlock(struct net *net);</div><div class='add'>+int rtnl_net_trylock(struct net *net);</div><div class='add'>+int rtnl_net_lock_killable(struct net *net);</div><div class='add'>+int rtnl_net_lock_cmp_fn(const struct lockdep_map *a, const struct lockdep_map *b);</div><div class='add'>+</div><div class='add'>+bool rtnl_net_is_locked(struct net *net);</div><div class='add'>+</div><div class='add'>+#define ASSERT_RTNL_NET(net)						\</div><div class='add'>+	WARN_ONCE(!rtnl_net_is_locked(net),				\</div><div class='add'>+		  "RTNL_NET: assertion failed at %s (%d)\n",		\</div><div class='add'>+		  __FILE__,  __LINE__)</div><div class='add'>+</div><div class='add'>+bool lockdep_rtnl_net_is_held(struct net *net);</div><div class='add'>+</div><div class='add'>+#define rcu_dereference_rtnl_net(net, p)				\</div><div class='add'>+	rcu_dereference_check(p, lockdep_rtnl_net_is_held(net))</div><div class='add'>+#define rtnl_net_dereference(net, p)					\</div><div class='add'>+	rcu_dereference_protected(p, lockdep_rtnl_net_is_held(net))</div><div class='add'>+#define rcu_replace_pointer_rtnl_net(net, rp, p)			\</div><div class='add'>+	rcu_replace_pointer(rp, p, lockdep_rtnl_net_is_held(net))</div><div class='add'>+#else</div><div class='add'>+static inline void __rtnl_net_lock(struct net *net) {}</div><div class='add'>+static inline void __rtnl_net_unlock(struct net *net) {}</div><div class='add'>+</div><div class='add'>+static inline void rtnl_net_lock(struct net *net)</div><div class='add'>+{</div><div class='add'>+	rtnl_lock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rtnl_net_unlock(struct net *net)</div><div class='add'>+{</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rtnl_net_trylock(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return rtnl_trylock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int rtnl_net_lock_killable(struct net *net)</div><div class='add'>+{</div><div class='add'>+	return rtnl_lock_killable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ASSERT_RTNL_NET(struct net *net)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define rcu_dereference_rtnl_net(net, p)		\</div><div class='add'>+	rcu_dereference_rtnl(p)</div><div class='add'>+#define rtnl_net_dereference(net, p)			\</div><div class='add'>+	rtnl_dereference(p)</div><div class='add'>+#define rcu_replace_pointer_rtnl_net(net, rp, p)	\</div><div class='add'>+	rcu_replace_pointer_rtnl(rp, p)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline struct netdev_queue *dev_ingress_queue(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return rtnl_dereference(dev-&gt;ingress_queue);</div><div class='hunk'>@@ -119,9 +185,11 @@ void rtnetlink_init(void);</div><div class='ctx'> void __rtnl_unlock(void);</div><div class='ctx'> void rtnl_kfree_skbs(struct sk_buff *head, struct sk_buff *tail);</div><div class='ctx'> </div><div class='del'>-#define ASSERT_RTNL() \</div><div class='del'>-	WARN_ONCE(!rtnl_is_locked(), \</div><div class='del'>-		  "RTNL: assertion failed at %s (%d)\n", __FILE__,  __LINE__)</div><div class='add'>+/* Shared by rtnl_fdb_dump() and various ndo_fdb_dump() helpers. */</div><div class='add'>+struct ndo_fdb_dump_context {</div><div class='add'>+	unsigned long ifindex;</div><div class='add'>+	unsigned long fdb_idx;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> extern int ndo_dflt_fdb_dump(struct sk_buff *skb,</div><div class='ctx'> 			     struct netlink_callback *cb,</div><div class='hunk'>@@ -172,6 +240,6 @@ rtnl_notify_needed(const struct net *net, u16 nlflags, u32 group)</div><div class='ctx'> 	return (nlflags &amp; NLM_F_ECHO) || rtnl_has_listeners(net, group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void netdev_set_operstate(struct net_device *dev, int newstate);</div><div class='add'>+void netif_set_operstate(struct net_device *dev, int newstate);</div><div class='ctx'> </div><div class='ctx'> #endif	/* __LINUX_RTNETLINK_H */</div><div class='head'>diff --git a/include/linux/rtsx_common.h b/include/linux/rtsx_common.h<br/>index bf290ad14c57..da9c8c6b5d50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rtsx_common.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtsx_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rtsx_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rtsx_common.h</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME_RTSX_PCI		"rtsx_pci"</div><div class='ctx'> #define DRV_NAME_RTSX_PCI_SDMMC		"rtsx_pci_sdmmc"</div><div class='del'>-#define DRV_NAME_RTSX_PCI_MS		"rtsx_pci_ms"</div><div class='ctx'> </div><div class='ctx'> #define RTSX_REG_PAIR(addr, val)	(((u32)(addr) &lt;&lt; 16) | (u8)(val))</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h<br/>index 4612ef09a0c7..3c5689356004 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rtsx_pci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtsx_pci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rtsx_pci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rtsx_pci.h</a></div><div class='hunk'>@@ -1160,6 +1160,8 @@ struct rtsx_cr_option {</div><div class='ctx'> 	bool ocp_en;</div><div class='ctx'> 	u8 sd_400mA_ocp_thd;</div><div class='ctx'> 	u8 sd_800mA_ocp_thd;</div><div class='add'>+	u8 sd_cd_reverse_en;</div><div class='add'>+	u8 sd_wp_reverse_en;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1312,8 +1314,6 @@ void rtsx_pci_add_cmd(struct rtsx_pcr *pcr,</div><div class='ctx'> 		u8 cmd_type, u16 reg_addr, u8 mask, u8 data);</div><div class='ctx'> void rtsx_pci_send_cmd_no_wait(struct rtsx_pcr *pcr);</div><div class='ctx'> int rtsx_pci_send_cmd(struct rtsx_pcr *pcr, int timeout);</div><div class='del'>-int rtsx_pci_transfer_data(struct rtsx_pcr *pcr, struct scatterlist *sglist,</div><div class='del'>-		int num_sg, bool read, int timeout);</div><div class='ctx'> int rtsx_pci_dma_map_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,</div><div class='ctx'> 		int num_sg, bool read);</div><div class='ctx'> void rtsx_pci_dma_unmap_sg(struct rtsx_pcr *pcr, struct scatterlist *sglist,</div><div class='head'>diff --git a/include/linux/rtsx_usb.h b/include/linux/rtsx_usb.h<br/>index 3247ed8e9ff0..276b509c03e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rtsx_usb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rtsx_usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rtsx_usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rtsx_usb.h</a></div><div class='hunk'>@@ -12,6 +12,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DRV_NAME_RTSX_USB		"rtsx_usb"</div><div class='add'>+#define DRV_NAME_RTSX_USB_SDMMC		"rtsx_usb_sdmmc"</div><div class='add'>+#define DRV_NAME_RTSX_USB_MS		"rtsx_usb_ms"</div><div class='add'>+</div><div class='ctx'> /* related module names */</div><div class='ctx'> #define RTSX_USB_SD_CARD	0</div><div class='ctx'> #define RTSX_USB_MS_CARD	1</div><div class='hunk'>@@ -95,6 +99,17 @@ extern int rtsx_usb_card_exclusive_check(struct rtsx_ucr *ucr, int card);</div><div class='ctx'> #define CD_MASK		(SD_CD | MS_CD | XD_CD)</div><div class='ctx'> #define SD_WP		0x08</div><div class='ctx'> </div><div class='add'>+/* OCPCTL */</div><div class='add'>+#define MS_OCP_DETECT_EN		0x08</div><div class='add'>+#define	MS_OCP_INT_EN			0x04</div><div class='add'>+#define	MS_OCP_INT_CLR			0x02</div><div class='add'>+#define	MS_OCP_CLEAR			0x01</div><div class='add'>+</div><div class='add'>+/* OCPSTAT */</div><div class='add'>+#define MS_OCP_DETECT			0x80</div><div class='add'>+#define MS_OCP_NOW			0x02</div><div class='add'>+#define MS_OCP_EVER			0x01</div><div class='add'>+</div><div class='ctx'> /* reader command field offset &amp; parameters */</div><div class='ctx'> #define READ_REG_CMD		0</div><div class='ctx'> #define WRITE_REG_CMD		1</div><div class='head'>diff --git a/include/linux/rv.h b/include/linux/rv.h<br/>index 8883b41d88ec..92fd467547e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rv.h</a></div><div class='hunk'>@@ -7,9 +7,15 @@</div><div class='ctx'> #ifndef _LINUX_RV_H</div><div class='ctx'> #define _LINUX_RV_H</div><div class='ctx'> </div><div class='del'>-#define MAX_DA_NAME_LEN	24</div><div class='add'>+#define MAX_DA_NAME_LEN			32</div><div class='add'>+#define MAX_DA_RETRY_RACING_EVENTS	3</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RV</div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Deterministic automaton per-object variables.</div><div class='ctx'>  */</div><div class='hunk'>@@ -18,27 +24,72 @@ struct da_monitor {</div><div class='ctx'> 	unsigned int	curr_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RV_LTL_MONITOR</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Per-task RV monitors count. Nowadays fixed in RV_PER_TASK_MONITORS.</div><div class='del'>- * If we find justification for more monitors, we can think about</div><div class='del'>- * adding more or developing a dynamic method. So far, none of</div><div class='del'>- * these are justified.</div><div class='add'>+ * In the future, if the number of atomic propositions or the size of Buchi</div><div class='add'>+ * automaton is larger, we can switch to dynamic allocation. For now, the code</div><div class='add'>+ * is simpler this way.</div><div class='ctx'>  */</div><div class='del'>-#define RV_PER_TASK_MONITORS		1</div><div class='del'>-#define RV_PER_TASK_MONITOR_INIT	(RV_PER_TASK_MONITORS)</div><div class='add'>+#define RV_MAX_LTL_ATOM 32</div><div class='add'>+#define RV_MAX_BA_STATES 32</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Futher monitor types are expected, so make this a union.</div><div class='add'>+/**</div><div class='add'>+ * struct ltl_monitor - A linear temporal logic runtime verification monitor</div><div class='add'>+ * @states:	States in the Buchi automaton. As Buchi automaton is a</div><div class='add'>+ *		non-deterministic state machine, the monitor can be in multiple</div><div class='add'>+ *		states simultaneously. This is a bitmask of all possible states.</div><div class='add'>+ *		If this is zero, that means either:</div><div class='add'>+ *		    - The monitor has not started yet (e.g. because not all</div><div class='add'>+ *		      atomic propositions are known).</div><div class='add'>+ *		    - There is no possible state to be in. In other words, a</div><div class='add'>+ *		      violation of the LTL property is detected.</div><div class='add'>+ * @atoms:	The values of atomic propositions.</div><div class='add'>+ * @unknown_atoms: Atomic propositions which are still unknown.</div><div class='ctx'>  */</div><div class='add'>+struct ltl_monitor {</div><div class='add'>+	DECLARE_BITMAP(states, RV_MAX_BA_STATES);</div><div class='add'>+	DECLARE_BITMAP(atoms, RV_MAX_LTL_ATOM);</div><div class='add'>+	DECLARE_BITMAP(unknown_atoms, RV_MAX_LTL_ATOM);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool rv_ltl_valid_state(struct ltl_monitor *mon)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(mon-&gt;states); ++i) {</div><div class='add'>+		if (mon-&gt;states[i])</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool rv_ltl_all_atoms_known(struct ltl_monitor *mon)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(mon-&gt;unknown_atoms); ++i) {</div><div class='add'>+		if (mon-&gt;unknown_atoms[i])</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+struct ltl_monitor {};</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_RV_LTL_MONITOR */</div><div class='add'>+</div><div class='add'>+#define RV_PER_TASK_MONITOR_INIT	(CONFIG_RV_PER_TASK_MONITORS)</div><div class='add'>+</div><div class='ctx'> union rv_task_monitor {</div><div class='del'>-	struct da_monitor da_mon;</div><div class='add'>+	struct da_monitor	da_mon;</div><div class='add'>+	struct ltl_monitor	ltl_mon;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RV_REACTORS</div><div class='ctx'> struct rv_reactor {</div><div class='ctx'> 	const char		*name;</div><div class='ctx'> 	const char		*description;</div><div class='del'>-	void			(*react)(char *msg);</div><div class='add'>+	__printf(1, 0) void	(*react)(const char *msg, va_list args);</div><div class='add'>+	struct list_head	list;</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -50,20 +101,30 @@ struct rv_monitor {</div><div class='ctx'> 	void			(*disable)(void);</div><div class='ctx'> 	void			(*reset)(void);</div><div class='ctx'> #ifdef CONFIG_RV_REACTORS</div><div class='del'>-	void			(*react)(char *msg);</div><div class='add'>+	struct rv_reactor	*reactor;</div><div class='add'>+	__printf(1, 0) void	(*react)(const char *msg, va_list args);</div><div class='ctx'> #endif</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	struct rv_monitor	*parent;</div><div class='add'>+	struct dentry		*root_d;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> bool rv_monitoring_on(void);</div><div class='ctx'> int rv_unregister_monitor(struct rv_monitor *monitor);</div><div class='del'>-int rv_register_monitor(struct rv_monitor *monitor);</div><div class='add'>+int rv_register_monitor(struct rv_monitor *monitor, struct rv_monitor *parent);</div><div class='ctx'> int rv_get_task_monitor_slot(void);</div><div class='ctx'> void rv_put_task_monitor_slot(int slot);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RV_REACTORS</div><div class='del'>-bool rv_reacting_on(void);</div><div class='ctx'> int rv_unregister_reactor(struct rv_reactor *reactor);</div><div class='ctx'> int rv_register_reactor(struct rv_reactor *reactor);</div><div class='add'>+__printf(2, 3)</div><div class='add'>+void rv_react(struct rv_monitor *monitor, const char *msg, ...);</div><div class='add'>+#else</div><div class='add'>+__printf(2, 3)</div><div class='add'>+static inline void rv_react(struct rv_monitor *monitor, const char *msg, ...)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_RV_REACTORS */</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_RV */</div><div class='head'>diff --git a/include/linux/rw_hint.h b/include/linux/rw_hint.h<br/>index 309ca72f2dfb..adcc43042c90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rw_hint.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rw_hint.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rw_hint.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rw_hint.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@ enum rw_hint {</div><div class='ctx'> 	WRITE_LIFE_MEDIUM	= RWH_WRITE_LIFE_MEDIUM,</div><div class='ctx'> 	WRITE_LIFE_LONG		= RWH_WRITE_LIFE_LONG,</div><div class='ctx'> 	WRITE_LIFE_EXTREME	= RWH_WRITE_LIFE_EXTREME,</div><div class='add'>+	WRITE_LIFE_HINT_NR,</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> /* Sparse ignores __packed annotations on enums, hence the #ifndef below. */</div><div class='head'>diff --git a/include/linux/rwbase_rt.h b/include/linux/rwbase_rt.h<br/>index 1d264dd08625..f2394a409c9d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rwbase_rt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwbase_rt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rwbase_rt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rwbase_rt.h</a></div><div class='hunk'>@@ -26,12 +26,17 @@ struct rwbase_rt {</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static __always_inline bool rw_base_is_locked(struct rwbase_rt *rwb)</div><div class='add'>+static __always_inline bool rw_base_is_locked(const struct rwbase_rt *rwb)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic_read(&amp;rwb-&gt;readers) != READER_BIAS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __always_inline bool rw_base_is_contended(struct rwbase_rt *rwb)</div><div class='add'>+static __always_inline bool rw_base_is_write_locked(const struct rwbase_rt *rwb)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;rwb-&gt;readers) == WRITER_BIAS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline bool rw_base_is_contended(const struct rwbase_rt *rwb)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic_read(&amp;rwb-&gt;readers) &gt; 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/rwlock.h b/include/linux/rwlock.h<br/>index c0ef596f340b..5b87c6f4a243 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rwlock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwlock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rwlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rwlock.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define __LINUX_RWLOCK_H</div><div class='ctx'> </div><div class='ctx'> #ifndef __LINUX_INSIDE_SPINLOCK_H</div><div class='del'>-# error "please don't include this file directly"</div><div class='add'>+# error "Please do not include this file directly."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/rwlock_api_smp.h b/include/linux/rwlock_api_smp.h<br/>index dceb0a59b692..31d3d1116323 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rwlock_api_smp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwlock_api_smp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rwlock_api_smp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rwlock_api_smp.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define __LINUX_RWLOCK_API_SMP_H</div><div class='ctx'> </div><div class='ctx'> #ifndef __LINUX_SPINLOCK_API_SMP_H</div><div class='del'>-# error "please don't include this file directly"</div><div class='add'>+# error "Please do not include this file directly."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/rwlock_rt.h b/include/linux/rwlock_rt.h<br/>index 8544ff05e594..7d81fc6918ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rwlock_rt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwlock_rt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rwlock_rt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rwlock_rt.h</a></div><div class='hunk'>@@ -24,13 +24,13 @@ do {							\</div><div class='ctx'> 	__rt_rwlock_init(rwl, #rwl, &amp;__key);		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-extern void rt_read_lock(rwlock_t *rwlock);</div><div class='add'>+extern void rt_read_lock(rwlock_t *rwlock)	__acquires(rwlock);</div><div class='ctx'> extern int rt_read_trylock(rwlock_t *rwlock);</div><div class='del'>-extern void rt_read_unlock(rwlock_t *rwlock);</div><div class='del'>-extern void rt_write_lock(rwlock_t *rwlock);</div><div class='del'>-extern void rt_write_lock_nested(rwlock_t *rwlock, int subclass);</div><div class='add'>+extern void rt_read_unlock(rwlock_t *rwlock)	__releases(rwlock);</div><div class='add'>+extern void rt_write_lock(rwlock_t *rwlock)	__acquires(rwlock);</div><div class='add'>+extern void rt_write_lock_nested(rwlock_t *rwlock, int subclass)	__acquires(rwlock);</div><div class='ctx'> extern int rt_write_trylock(rwlock_t *rwlock);</div><div class='del'>-extern void rt_write_unlock(rwlock_t *rwlock);</div><div class='add'>+extern void rt_write_unlock(rwlock_t *rwlock)	__releases(rwlock);</div><div class='ctx'> </div><div class='ctx'> static __always_inline void read_lock(rwlock_t *rwlock)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h<br/>index 9c29689ff505..f1aaf676a874 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/rwsem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/rwsem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/rwsem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/rwsem.h</a></div><div class='hunk'>@@ -66,14 +66,24 @@ struct rw_semaphore {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* In all implementations count != 0 means locked */</div><div class='add'>+#define RWSEM_UNLOCKED_VALUE		0UL</div><div class='add'>+#define RWSEM_WRITER_LOCKED		(1UL &lt;&lt; 0)</div><div class='add'>+#define __RWSEM_COUNT_INIT(name)	.count = ATOMIC_LONG_INIT(RWSEM_UNLOCKED_VALUE)</div><div class='add'>+</div><div class='ctx'> static inline int rwsem_is_locked(struct rw_semaphore *sem)</div><div class='ctx'> {</div><div class='del'>-	return atomic_long_read(&amp;sem-&gt;count) != 0;</div><div class='add'>+	return atomic_long_read(&amp;sem-&gt;count) != RWSEM_UNLOCKED_VALUE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define RWSEM_UNLOCKED_VALUE		0L</div><div class='del'>-#define __RWSEM_COUNT_INIT(name)	.count = ATOMIC_LONG_INIT(RWSEM_UNLOCKED_VALUE)</div><div class='add'>+static inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(atomic_long_read(&amp;sem-&gt;count) == RWSEM_UNLOCKED_VALUE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *sem)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!(atomic_long_read(&amp;sem-&gt;count) &amp; RWSEM_WRITER_LOCKED));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Common initializer macros and functions */</div><div class='ctx'> </div><div class='hunk'>@@ -122,6 +132,18 @@ static inline int rwsem_is_contended(struct rw_semaphore *sem)</div><div class='ctx'> 	return !list_empty(&amp;sem-&gt;wait_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_DEBUG_RWSEMS) || defined(CONFIG_DETECT_HUNG_TASK_BLOCKER)</div><div class='add'>+/*</div><div class='add'>+ * Return just the real task structure pointer of the owner</div><div class='add'>+ */</div><div class='add'>+extern struct task_struct *rwsem_owner(struct rw_semaphore *sem);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return true if the rwsem is owned by a reader.</div><div class='add'>+ */</div><div class='add'>+extern bool is_rwsem_reader_owned(struct rw_semaphore *sem);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_PREEMPT_RT */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/rwbase_rt.h&gt;</div><div class='hunk'>@@ -152,11 +174,21 @@ do {								\</div><div class='ctx'> 	__init_rwsem((sem), #sem, &amp;__key);			\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-static __always_inline int rwsem_is_locked(struct rw_semaphore *sem)</div><div class='add'>+static __always_inline int rwsem_is_locked(const struct rw_semaphore *sem)</div><div class='ctx'> {</div><div class='ctx'> 	return rw_base_is_locked(&amp;sem-&gt;rwbase);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!rwsem_is_locked(sem));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *sem)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!rw_base_is_write_locked(&amp;sem-&gt;rwbase));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __always_inline int rwsem_is_contended(struct rw_semaphore *sem)</div><div class='ctx'> {</div><div class='ctx'> 	return rw_base_is_contended(&amp;sem-&gt;rwbase);</div><div class='hunk'>@@ -169,6 +201,22 @@ static __always_inline int rwsem_is_contended(struct rw_semaphore *sem)</div><div class='ctx'>  * the RT specific variant.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static inline void rwsem_assert_held(const struct rw_semaphore *sem)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_LOCKDEP))</div><div class='add'>+		lockdep_assert_held(sem);</div><div class='add'>+	else</div><div class='add'>+		rwsem_assert_held_nolockdep(sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rwsem_assert_held_write(const struct rw_semaphore *sem)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_LOCKDEP))</div><div class='add'>+		lockdep_assert_held_write(sem);</div><div class='add'>+	else</div><div class='add'>+		rwsem_assert_held_write_nolockdep(sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * lock for reading</div><div class='ctx'>  */</div><div class='hunk'>@@ -204,10 +252,11 @@ extern void up_write(struct rw_semaphore *sem);</div><div class='ctx'> </div><div class='ctx'> DEFINE_GUARD(rwsem_read, struct rw_semaphore *, down_read(_T), up_read(_T))</div><div class='ctx'> DEFINE_GUARD_COND(rwsem_read, _try, down_read_trylock(_T))</div><div class='del'>-DEFINE_GUARD_COND(rwsem_read, _intr, down_read_interruptible(_T) == 0)</div><div class='add'>+DEFINE_GUARD_COND(rwsem_read, _intr, down_read_interruptible(_T), _RET == 0)</div><div class='ctx'> </div><div class='ctx'> DEFINE_GUARD(rwsem_write, struct rw_semaphore *, down_write(_T), up_write(_T))</div><div class='ctx'> DEFINE_GUARD_COND(rwsem_write, _try, down_write_trylock(_T))</div><div class='add'>+DEFINE_GUARD_COND(rwsem_write, _kill, down_write_killable(_T), _RET == 0)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * downgrade write lock to read lock</div><div class='head'>diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h<br/>index d662cf136021..cc7ad189caa5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sbitmap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sbitmap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sbitmap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sbitmap.h</a></div><div class='hunk'>@@ -36,6 +36,11 @@ struct sbitmap_word {</div><div class='ctx'> 	 * @cleared: word holding cleared bits</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long cleared ____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @swap_lock: serializes simultaneous updates of -&gt;word and -&gt;cleared</div><div class='add'>+	 */</div><div class='add'>+	raw_spinlock_t swap_lock;</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -70,7 +75,7 @@ struct sbitmap {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct sbitmap_word *map;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='add'>+	/**</div><div class='ctx'> 	 * @alloc_hint: Cache of last successfully allocated or freed bit.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This is per-cpu, which allows multiple users to stick to different</div><div class='hunk'>@@ -123,7 +128,7 @@ struct sbitmap_queue {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct sbq_wait_state *ws;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='add'>+	/**</div><div class='ctx'> 	 * @ws_active: count of currently active ws waitqueues</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_t ws_active;</div><div class='hunk'>@@ -205,23 +210,6 @@ void sbitmap_resize(struct sbitmap *sb, unsigned int depth);</div><div class='ctx'> int sbitmap_get(struct sbitmap *sb);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sbitmap_get_shallow() - Try to allocate a free bit from a &amp;struct sbitmap,</div><div class='del'>- * limiting the depth used from each word.</div><div class='del'>- * @sb: Bitmap to allocate from.</div><div class='del'>- * @shallow_depth: The maximum number of bits to allocate from a single word.</div><div class='del'>- *</div><div class='del'>- * This rather specific operation allows for having multiple users with</div><div class='del'>- * different allocation limits. E.g., there can be a high-priority class that</div><div class='del'>- * uses sbitmap_get() and a low-priority class that uses sbitmap_get_shallow()</div><div class='del'>- * with a @shallow_depth of (1 &lt;&lt; (@sb-&gt;shift - 1)). Then, the low-priority</div><div class='del'>- * class can only allocate half of the total bits in the bitmap, preventing it</div><div class='del'>- * from starving out the high-priority class.</div><div class='del'>- *</div><div class='del'>- * Return: Non-negative allocated bit number if successful, -1 otherwise.</div><div class='del'>- */</div><div class='del'>-int sbitmap_get_shallow(struct sbitmap *sb, unsigned long shallow_depth);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * sbitmap_any_bit_set() - Check for a set bit in a &amp;struct sbitmap.</div><div class='ctx'>  * @sb: Bitmap to check.</div><div class='ctx'>  *</div><div class='hunk'>@@ -473,7 +461,7 @@ unsigned long __sbitmap_queue_get_batch(struct sbitmap_queue *sbq, int nr_tags,</div><div class='ctx'>  * sbitmap_queue, limiting the depth used from each word, with preemption</div><div class='ctx'>  * already disabled.</div><div class='ctx'>  * @sbq: Bitmap queue to allocate from.</div><div class='del'>- * @shallow_depth: The maximum number of bits to allocate from a single word.</div><div class='add'>+ * @shallow_depth: The maximum number of bits to allocate from the queue.</div><div class='ctx'>  * See sbitmap_get_shallow().</div><div class='ctx'>  *</div><div class='ctx'>  * If you call this, make sure to call sbitmap_queue_min_shallow_depth() after</div><div class='hunk'>@@ -559,6 +547,8 @@ static inline void sbq_index_atomic_inc(atomic_t *index)</div><div class='ctx'>  * sbitmap_queue.</div><div class='ctx'>  * @sbq: Bitmap queue to wait on.</div><div class='ctx'>  * @wait_index: A counter per "user" of @sbq.</div><div class='add'>+ *</div><div class='add'>+ * Return: Next wait queue to be used</div><div class='ctx'>  */</div><div class='ctx'> static inline struct sbq_wait_state *sbq_wait_ptr(struct sbitmap_queue *sbq,</div><div class='ctx'> 						  atomic_t *wait_index)</div><div class='head'>diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h<br/>index 77df3d7b18a6..29f6ceb98d74 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/scatterlist.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/scatterlist.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/scatterlist.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/scatterlist.h</a></div><div class='hunk'>@@ -95,6 +95,28 @@ static inline bool sg_is_last(struct scatterlist *sg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * sg_next - return the next scatterlist entry in a list</div><div class='add'>+ * @sg:		The current sg entry</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *   Usually the next entry will be @sg + 1, but if this sg element is part</div><div class='add'>+ *   of a chained scatterlist, it could jump to the start of a new</div><div class='add'>+ *   scatterlist array.</div><div class='add'>+ *</div><div class='add'>+ **/</div><div class='add'>+static inline struct scatterlist *sg_next(struct scatterlist *sg)</div><div class='add'>+{</div><div class='add'>+	if (sg_is_last(sg))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sg++;</div><div class='add'>+	if (unlikely(sg_is_chain(sg)))</div><div class='add'>+		sg = sg_chain_ptr(sg);</div><div class='add'>+</div><div class='add'>+	return sg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * sg_assign_page - Assign a given page to an SG entry</div><div class='ctx'>  * @sg:		    SG entry</div><div class='ctx'>  * @page:	    The page</div><div class='hunk'>@@ -136,6 +158,7 @@ static inline void sg_assign_page(struct scatterlist *sg, struct page *page)</div><div class='ctx'> static inline void sg_set_page(struct scatterlist *sg, struct page *page,</div><div class='ctx'> 			       unsigned int len, unsigned int offset)</div><div class='ctx'> {</div><div class='add'>+	VM_WARN_ON_ONCE(!page_range_contiguous(page, ALIGN(len + offset, PAGE_SIZE) / PAGE_SIZE));</div><div class='ctx'> 	sg_assign_page(sg, page);</div><div class='ctx'> 	sg-&gt;offset = offset;</div><div class='ctx'> 	sg-&gt;length = len;</div><div class='hunk'>@@ -232,7 +255,7 @@ static inline void __sg_chain(struct scatterlist *chain_sg,</div><div class='ctx'>  * @sgl:	Second scatterlist</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- *   Links @prv@ and @sgl@ together, to form a longer scatterlist.</div><div class='add'>+ *   Links @prv and @sgl together, to form a longer scatterlist.</div><div class='ctx'>  *</div><div class='ctx'>  **/</div><div class='ctx'> static inline void sg_chain(struct scatterlist *prv, unsigned int prv_nents,</div><div class='hunk'>@@ -273,7 +296,7 @@ static inline void sg_unmark_end(struct scatterlist *sg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * One 64-bit architectures there is a 4-byte padding in struct scatterlist</div><div class='add'>+ * On 64-bit architectures there is a 4-byte padding in struct scatterlist</div><div class='ctx'>  * (assuming also CONFIG_NEED_SG_DMA_LENGTH is set). Use this padding for DMA</div><div class='ctx'>  * flags bits to indicate when a specific dma address is a bus address or the</div><div class='ctx'>  * buffer may have been bounced via SWIOTLB.</div><div class='hunk'>@@ -313,7 +336,7 @@ static inline void sg_dma_mark_bus_address(struct scatterlist *sg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * sg_unmark_bus_address - Unmark the scatterlist entry as a bus address</div><div class='add'>+ * sg_dma_unmark_bus_address - Unmark the scatterlist entry as a bus address</div><div class='ctx'>  * @sg:		 SG entry</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='hunk'>@@ -332,7 +355,7 @@ static inline void sg_dma_unmark_bus_address(struct scatterlist *sg)</div><div class='ctx'>  * Description:</div><div class='ctx'>  *   Returns true if the scatterlist was marked for SWIOTLB bouncing. Not all</div><div class='ctx'>  *   elements may have been bounced, so the caller would have to check</div><div class='del'>- *   individual SG entries with is_swiotlb_buffer().</div><div class='add'>+ *   individual SG entries with swiotlb_find_pool().</div><div class='ctx'>  */</div><div class='ctx'> static inline bool sg_dma_is_swiotlb(struct scatterlist *sg)</div><div class='ctx'> {</div><div class='hunk'>@@ -418,7 +441,6 @@ static inline void sg_init_marker(struct scatterlist *sgl,</div><div class='ctx'> </div><div class='ctx'> int sg_nents(struct scatterlist *sg);</div><div class='ctx'> int sg_nents_for_len(struct scatterlist *sg, u64 len);</div><div class='del'>-struct scatterlist *sg_next(struct scatterlist *);</div><div class='ctx'> struct scatterlist *sg_last(struct scatterlist *s, unsigned int);</div><div class='ctx'> void sg_init_table(struct scatterlist *, unsigned int);</div><div class='ctx'> void sg_init_one(struct scatterlist *, const void *, unsigned int);</div><div class='hunk'>@@ -579,7 +601,7 @@ void __sg_page_iter_start(struct sg_page_iter *piter,</div><div class='ctx'>  */</div><div class='ctx'> static inline struct page *sg_page_iter_page(struct sg_page_iter *piter)</div><div class='ctx'> {</div><div class='del'>-	return nth_page(sg_page(piter-&gt;sg), piter-&gt;sg_pgoffset);</div><div class='add'>+	return sg_page(piter-&gt;sg) + piter-&gt;sg_pgoffset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -671,6 +693,7 @@ sg_page_iter_dma_address(struct sg_dma_page_iter *dma_iter)</div><div class='ctx'> #define SG_MITER_ATOMIC		(1 &lt;&lt; 0)	 /* use kmap_atomic */</div><div class='ctx'> #define SG_MITER_TO_SG		(1 &lt;&lt; 1)	/* flush back to phys on unmap */</div><div class='ctx'> #define SG_MITER_FROM_SG	(1 &lt;&lt; 2)	/* nop */</div><div class='add'>+#define SG_MITER_LOCAL		(1 &lt;&lt; 3)	 /* use kmap_local */</div><div class='ctx'> </div><div class='ctx'> struct sg_mapping_iter {</div><div class='ctx'> 	/* the following three fields can be accessed directly */</div><div class='head'>diff --git a/include/linux/sched.h b/include/linux/sched.h<br/>index 17cb0761ff65..d395f2810fac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/irqflags_types.h&gt;</div><div class='hunk'>@@ -34,18 +34,24 @@</div><div class='ctx'> #include &lt;linux/sched/prio.h&gt;</div><div class='ctx'> #include &lt;linux/sched/types.h&gt;</div><div class='ctx'> #include &lt;linux/signal_types.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/syscall_user_dispatch_types.h&gt;</div><div class='ctx'> #include &lt;linux/mm_types_task.h&gt;</div><div class='add'>+#include &lt;linux/netdevice_xmit.h&gt;</div><div class='ctx'> #include &lt;linux/task_io_accounting.h&gt;</div><div class='ctx'> #include &lt;linux/posix-timers_types.h&gt;</div><div class='ctx'> #include &lt;linux/restart_block.h&gt;</div><div class='del'>-#include &lt;uapi/linux/rseq.h&gt;</div><div class='add'>+#include &lt;linux/rseq_types.h&gt;</div><div class='ctx'> #include &lt;linux/seqlock_types.h&gt;</div><div class='ctx'> #include &lt;linux/kcsan.h&gt;</div><div class='ctx'> #include &lt;linux/rv.h&gt;</div><div class='del'>-#include &lt;linux/livepatch_sched.h&gt;</div><div class='ctx'> #include &lt;linux/uidgid_types.h&gt;</div><div class='add'>+#include &lt;linux/tracepoint-defs.h&gt;</div><div class='add'>+#include &lt;linux/unwind_deferred_types.h&gt;</div><div class='ctx'> #include &lt;asm/kmap_size.h&gt;</div><div class='add'>+#ifndef COMPILE_OFFSETS</div><div class='add'>+#include &lt;generated/rq-offsets.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* task_struct member predeclarations (sorted alphabetically): */</div><div class='ctx'> struct audit_context;</div><div class='hunk'>@@ -53,6 +59,7 @@ struct bio_list;</div><div class='ctx'> struct blk_plug;</div><div class='ctx'> struct bpf_local_storage;</div><div class='ctx'> struct bpf_run_ctx;</div><div class='add'>+struct bpf_net_context;</div><div class='ctx'> struct capture_control;</div><div class='ctx'> struct cfs_rq;</div><div class='ctx'> struct fs_struct;</div><div class='hunk'>@@ -63,6 +70,7 @@ struct mempolicy;</div><div class='ctx'> struct nameidata;</div><div class='ctx'> struct nsproxy;</div><div class='ctx'> struct perf_event_context;</div><div class='add'>+struct perf_ctx_data;</div><div class='ctx'> struct pid_namespace;</div><div class='ctx'> struct pipe_inode_info;</div><div class='ctx'> struct rcu_node;</div><div class='hunk'>@@ -80,6 +88,8 @@ struct task_group;</div><div class='ctx'> struct task_struct;</div><div class='ctx'> struct user_event_mm;</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/sched/ext.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Task state bitmask. NOTE! These bits are also</div><div class='ctx'>  * encoded in fs/proc/array.c: get_task_state().</div><div class='hunk'>@@ -147,8 +157,9 @@ struct user_event_mm;</div><div class='ctx'>  * Special states are those that do not use the normal wait-loop pattern. See</div><div class='ctx'>  * the comment with set_special_state().</div><div class='ctx'>  */</div><div class='del'>-#define is_special_task_state(state)				\</div><div class='del'>-	((state) &amp; (__TASK_STOPPED | __TASK_TRACED | TASK_PARKED | TASK_DEAD))</div><div class='add'>+#define is_special_task_state(state)					\</div><div class='add'>+	((state) &amp; (__TASK_STOPPED | __TASK_TRACED | TASK_PARKED |	\</div><div class='add'>+		    TASK_DEAD | TASK_FROZEN))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_ATOMIC_SLEEP</div><div class='ctx'> # define debug_normal_state_change(state_value)				\</div><div class='hunk'>@@ -181,6 +192,12 @@ struct user_event_mm;</div><div class='ctx'> # define debug_rtlock_wait_restore_state()	do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define trace_set_current_state(state_value)                     \</div><div class='add'>+	do {                                                     \</div><div class='add'>+		if (tracepoint_enabled(sched_set_state_tp))      \</div><div class='add'>+			__trace_set_current_state(state_value); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * set_current_state() includes a barrier so that the write of current-&gt;__state</div><div class='ctx'>  * is correctly serialised wrt the caller's subsequent test of whether to</div><div class='hunk'>@@ -221,12 +238,14 @@ struct user_event_mm;</div><div class='ctx'> #define __set_current_state(state_value)				\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		debug_normal_state_change((state_value));		\</div><div class='add'>+		trace_set_current_state(state_value);			\</div><div class='ctx'> 		WRITE_ONCE(current-&gt;__state, (state_value));		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #define set_current_state(state_value)					\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		debug_normal_state_change((state_value));		\</div><div class='add'>+		trace_set_current_state(state_value);			\</div><div class='ctx'> 		smp_store_mb(current-&gt;__state, (state_value));		\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -242,6 +261,7 @@ struct user_event_mm;</div><div class='ctx'> 									\</div><div class='ctx'> 		raw_spin_lock_irqsave(&amp;current-&gt;pi_lock, flags);	\</div><div class='ctx'> 		debug_special_state_change((state_value));		\</div><div class='add'>+		trace_set_current_state(state_value);			\</div><div class='ctx'> 		WRITE_ONCE(current-&gt;__state, (state_value));		\</div><div class='ctx'> 		raw_spin_unlock_irqrestore(&amp;current-&gt;pi_lock, flags);	\</div><div class='ctx'> 	} while (0)</div><div class='hunk'>@@ -277,6 +297,7 @@ struct user_event_mm;</div><div class='ctx'> 		raw_spin_lock(&amp;current-&gt;pi_lock);			\</div><div class='ctx'> 		current-&gt;saved_state = current-&gt;__state;		\</div><div class='ctx'> 		debug_rtlock_wait_set_state();				\</div><div class='add'>+		trace_set_current_state(TASK_RTLOCK_WAIT);		\</div><div class='ctx'> 		WRITE_ONCE(current-&gt;__state, TASK_RTLOCK_WAIT);		\</div><div class='ctx'> 		raw_spin_unlock(&amp;current-&gt;pi_lock);			\</div><div class='ctx'> 	} while (0);</div><div class='hunk'>@@ -286,6 +307,7 @@ struct user_event_mm;</div><div class='ctx'> 		lockdep_assert_irqs_disabled();				\</div><div class='ctx'> 		raw_spin_lock(&amp;current-&gt;pi_lock);			\</div><div class='ctx'> 		debug_rtlock_wait_restore_state();			\</div><div class='add'>+		trace_set_current_state(current-&gt;saved_state);		\</div><div class='ctx'> 		WRITE_ONCE(current-&gt;__state, current-&gt;saved_state);	\</div><div class='ctx'> 		current-&gt;saved_state = TASK_RUNNING;			\</div><div class='ctx'> 		raw_spin_unlock(&amp;current-&gt;pi_lock);			\</div><div class='hunk'>@@ -301,7 +323,7 @@ enum {</div><div class='ctx'> 	TASK_COMM_LEN = 16,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void scheduler_tick(void);</div><div class='add'>+extern void sched_tick(void);</div><div class='ctx'> </div><div class='ctx'> #define	MAX_SCHEDULE_TIMEOUT		LONG_MAX</div><div class='ctx'> </div><div class='hunk'>@@ -322,6 +344,12 @@ extern void io_schedule_finish(int token);</div><div class='ctx'> extern long io_schedule_timeout(long timeout);</div><div class='ctx'> extern void io_schedule(void);</div><div class='ctx'> </div><div class='add'>+/* wrapper functions to trace from this header file */</div><div class='add'>+DECLARE_TRACEPOINT(sched_set_state_tp);</div><div class='add'>+extern void __trace_set_current_state(int state_value);</div><div class='add'>+DECLARE_TRACEPOINT(sched_set_need_resched_tp);</div><div class='add'>+extern void __trace_set_need_resched(struct task_struct *curr, int tif);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct prev_cputime - snapshot of system and user cputime</div><div class='ctx'>  * @utime: time spent in user mode</div><div class='hunk'>@@ -374,10 +402,10 @@ enum uclamp_id {</div><div class='ctx'> 	UCLAMP_CNT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> extern struct root_domain def_root_domain;</div><div class='ctx'> extern struct mutex sched_domains_mutex;</div><div class='del'>-#endif</div><div class='add'>+extern void sched_domains_mutex_lock(void);</div><div class='add'>+extern void sched_domains_mutex_unlock(void);</div><div class='ctx'> </div><div class='ctx'> struct sched_param {</div><div class='ctx'> 	int sched_priority;</div><div class='hunk'>@@ -393,6 +421,12 @@ struct sched_info {</div><div class='ctx'> 	/* Time spent waiting on a runqueue: */</div><div class='ctx'> 	unsigned long long		run_delay;</div><div class='ctx'> </div><div class='add'>+	/* Max time spent waiting on a runqueue: */</div><div class='add'>+	unsigned long long		max_run_delay;</div><div class='add'>+</div><div class='add'>+	/* Min time spent waiting on a runqueue: */</div><div class='add'>+	unsigned long long		min_run_delay;</div><div class='add'>+</div><div class='ctx'> 	/* Timestamps: */</div><div class='ctx'> </div><div class='ctx'> 	/* When did we last run on a CPU? */</div><div class='hunk'>@@ -539,15 +573,28 @@ struct sched_entity {</div><div class='ctx'> 	struct rb_node			run_node;</div><div class='ctx'> 	u64				deadline;</div><div class='ctx'> 	u64				min_vruntime;</div><div class='add'>+	u64				min_slice;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head		group_node;</div><div class='del'>-	unsigned int			on_rq;</div><div class='add'>+	unsigned char			on_rq;</div><div class='add'>+	unsigned char			sched_delayed;</div><div class='add'>+	unsigned char			rel_deadline;</div><div class='add'>+	unsigned char			custom_slice;</div><div class='add'>+					/* hole */</div><div class='ctx'> </div><div class='ctx'> 	u64				exec_start;</div><div class='ctx'> 	u64				sum_exec_runtime;</div><div class='ctx'> 	u64				prev_sum_exec_runtime;</div><div class='ctx'> 	u64				vruntime;</div><div class='del'>-	s64				vlag;</div><div class='add'>+	union {</div><div class='add'>+		/*</div><div class='add'>+		 * When !@on_rq this field is vlag.</div><div class='add'>+		 * When cfs_rq-&gt;curr == se (which implies @on_rq)</div><div class='add'>+		 * this field is vprot. See protect_slice().</div><div class='add'>+		 */</div><div class='add'>+		s64                     vlag;</div><div class='add'>+		u64                     vprot;</div><div class='add'>+	};</div><div class='ctx'> 	u64				slice;</div><div class='ctx'> </div><div class='ctx'> 	u64				nr_migrations;</div><div class='hunk'>@@ -563,7 +610,6 @@ struct sched_entity {</div><div class='ctx'> 	unsigned long			runnable_weight;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Per entity load average tracking.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -571,7 +617,6 @@ struct sched_entity {</div><div class='ctx'> 	 * collide with read-mostly values above.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct sched_avg		avg;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sched_rt_entity {</div><div class='hunk'>@@ -592,8 +637,8 @@ struct sched_rt_entity {</div><div class='ctx'> #endif</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='del'>-typedef bool (*dl_server_has_tasks_f)(struct sched_dl_entity *);</div><div class='del'>-typedef struct task_struct *(*dl_server_pick_f)(struct sched_dl_entity *);</div><div class='add'>+struct rq_flags;</div><div class='add'>+typedef struct task_struct *(*dl_server_pick_f)(struct sched_dl_entity *, struct rq_flags *rf);</div><div class='ctx'> </div><div class='ctx'> struct sched_dl_entity {</div><div class='ctx'> 	struct rb_node			rb_node;</div><div class='hunk'>@@ -637,12 +682,36 @@ struct sched_dl_entity {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * @dl_overrun tells if the task asked to be informed about runtime</div><div class='ctx'> 	 * overruns.</div><div class='add'>+	 *</div><div class='add'>+	 * @dl_server tells if this is a server entity.</div><div class='add'>+	 *</div><div class='add'>+	 * @dl_server_active tells if the dlserver is active(started).</div><div class='add'>+	 * dlserver is started on first cfs enqueue on an idle runqueue</div><div class='add'>+	 * and is stopped when a dequeue results in 0 cfs tasks on the</div><div class='add'>+	 * runqueue. In other words, dlserver is active only when cpu's</div><div class='add'>+	 * runqueue has atleast one cfs task.</div><div class='add'>+	 *</div><div class='add'>+	 * @dl_defer tells if this is a deferred or regular server. For</div><div class='add'>+	 * now only defer server exists.</div><div class='add'>+	 *</div><div class='add'>+	 * @dl_defer_armed tells if the deferrable server is waiting</div><div class='add'>+	 * for the replenishment timer to activate it.</div><div class='add'>+	 *</div><div class='add'>+	 * @dl_defer_running tells if the deferrable server is actually</div><div class='add'>+	 * running, skipping the defer phase.</div><div class='add'>+	 *</div><div class='add'>+	 * @dl_defer_idle tracks idle state</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned int			dl_throttled      : 1;</div><div class='ctx'> 	unsigned int			dl_yielded        : 1;</div><div class='ctx'> 	unsigned int			dl_non_contending : 1;</div><div class='ctx'> 	unsigned int			dl_overrun	  : 1;</div><div class='ctx'> 	unsigned int			dl_server         : 1;</div><div class='add'>+	unsigned int			dl_server_active  : 1;</div><div class='add'>+	unsigned int			dl_defer	  : 1;</div><div class='add'>+	unsigned int			dl_defer_armed	  : 1;</div><div class='add'>+	unsigned int			dl_defer_running  : 1;</div><div class='add'>+	unsigned int			dl_defer_idle     : 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Bandwidth enforcement timer. Each -deadline task has its</div><div class='hunk'>@@ -664,13 +733,9 @@ struct sched_dl_entity {</div><div class='ctx'> 	 * dl_server_update().</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * @rq the runqueue this server is for</div><div class='del'>-	 *</div><div class='del'>-	 * @server_has_tasks() returns true if @server_pick return a</div><div class='del'>-	 * runnable task.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct rq			*rq;</div><div class='del'>-	dl_server_has_tasks_f		server_has_tasks;</div><div class='del'>-	dl_server_pick_f		server_pick;</div><div class='add'>+	dl_server_pick_f		server_pick_task;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RT_MUTEXES</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -734,6 +799,12 @@ enum perf_event_task_context {</div><div class='ctx'> 	perf_nr_task_contexts,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Number of contexts where an event can trigger:</div><div class='add'>+ *      task, softirq, hardirq, nmi.</div><div class='add'>+ */</div><div class='add'>+#define PERF_NR_CONTEXTS	4</div><div class='add'>+</div><div class='ctx'> struct wake_q_node {</div><div class='ctx'> 	struct wake_q_node *next;</div><div class='ctx'> };</div><div class='hunk'>@@ -770,7 +841,10 @@ struct task_struct {</div><div class='ctx'> 	unsigned int			flags;</div><div class='ctx'> 	unsigned int			ptrace;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING</div><div class='add'>+	struct alloc_tag		*alloc_tag;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	int				on_cpu;</div><div class='ctx'> 	struct __call_single_node	wake_entry;</div><div class='ctx'> 	unsigned int			wakee_flips;</div><div class='hunk'>@@ -786,7 +860,6 @@ struct task_struct {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int				recent_used_cpu;</div><div class='ctx'> 	int				wake_cpu;</div><div class='del'>-#endif</div><div class='ctx'> 	int				on_rq;</div><div class='ctx'> </div><div class='ctx'> 	int				prio;</div><div class='hunk'>@@ -798,6 +871,9 @@ struct task_struct {</div><div class='ctx'> 	struct sched_rt_entity		rt;</div><div class='ctx'> 	struct sched_dl_entity		dl;</div><div class='ctx'> 	struct sched_dl_entity		*dl_server;</div><div class='add'>+#ifdef CONFIG_SCHED_CLASS_EXT</div><div class='add'>+	struct sched_ext_entity		scx;</div><div class='add'>+#endif</div><div class='ctx'> 	const struct sched_class	*sched_class;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCHED_CORE</div><div class='hunk'>@@ -808,8 +884,14 @@ struct task_struct {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CGROUP_SCHED</div><div class='ctx'> 	struct task_group		*sched_task_group;</div><div class='add'>+#ifdef CONFIG_CFS_BANDWIDTH</div><div class='add'>+	struct callback_head		sched_throttle_work;</div><div class='add'>+	struct list_head		throttle_node;</div><div class='add'>+	bool				throttled;</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_UCLAMP_TASK</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clamp values requested for a scheduling entity.</div><div class='hunk'>@@ -835,14 +917,13 @@ struct task_struct {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	unsigned int			policy;</div><div class='add'>+	unsigned long			max_allowed_capacity;</div><div class='ctx'> 	int				nr_cpus_allowed;</div><div class='ctx'> 	const cpumask_t			*cpus_ptr;</div><div class='ctx'> 	cpumask_t			*user_cpus_ptr;</div><div class='ctx'> 	cpumask_t			cpus_mask;</div><div class='ctx'> 	void				*migration_pending;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	unsigned short			migration_disabled;</div><div class='del'>-#endif</div><div class='ctx'> 	unsigned short			migration_flags;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PREEMPT_RCU</div><div class='hunk'>@@ -874,10 +955,8 @@ struct task_struct {</div><div class='ctx'> 	struct sched_info		sched_info;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head		tasks;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	struct plist_node		pushable_tasks;</div><div class='ctx'> 	struct rb_node			pushable_dl_tasks;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	struct mm_struct		*mm;</div><div class='ctx'> 	struct mm_struct		*active_mm;</div><div class='hunk'>@@ -898,6 +977,7 @@ struct task_struct {</div><div class='ctx'> 	unsigned			sched_reset_on_fork:1;</div><div class='ctx'> 	unsigned			sched_contributes_to_load:1;</div><div class='ctx'> 	unsigned			sched_migrated:1;</div><div class='add'>+	unsigned			sched_task_hot:1;</div><div class='ctx'> </div><div class='ctx'> 	/* Force alignment to the next boundary: */</div><div class='ctx'> 	unsigned			:0;</div><div class='hunk'>@@ -928,7 +1008,7 @@ struct task_struct {</div><div class='ctx'> #ifndef TIF_RESTORE_SIGMASK</div><div class='ctx'> 	unsigned			restore_sigmask:1;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_MEMCG</div><div class='add'>+#ifdef CONFIG_MEMCG_V1</div><div class='ctx'> 	unsigned			in_user_fault:1;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_LRU_GEN</div><div class='hunk'>@@ -962,14 +1042,17 @@ struct task_struct {</div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_CPU_PASID</div><div class='ctx'> 	unsigned			pasid_activated:1;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef	CONFIG_CPU_SUP_INTEL</div><div class='add'>+#ifdef CONFIG_X86_BUS_LOCK_DETECT</div><div class='ctx'> 	unsigned			reported_split_lock:1;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_TASK_DELAY_ACCT</div><div class='ctx'> 	/* delay due to memory thrashing */</div><div class='ctx'> 	unsigned                        in_thrashing:1;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='add'>+	unsigned			in_nf_duplicate:1;</div><div class='add'>+#ifdef CONFIG_PREEMPT_RT</div><div class='add'>+	struct netdev_xmit		net_xmit;</div><div class='add'>+#endif</div><div class='ctx'> 	unsigned long			atomic_flags; /* Flags requiring atomic access. */</div><div class='ctx'> </div><div class='ctx'> 	struct restart_block		restart_block;</div><div class='hunk'>@@ -1080,9 +1163,12 @@ struct task_struct {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * executable name, excluding path.</div><div class='ctx'> 	 *</div><div class='del'>-	 * - normally initialized setup_new_exec()</div><div class='del'>-	 * - access it with [gs]et_task_comm()</div><div class='del'>-	 * - lock it with task_lock()</div><div class='add'>+	 * - normally initialized begin_new_exec()</div><div class='add'>+	 * - set it with set_task_comm()</div><div class='add'>+	 *   - strscpy_pad() to ensure it is always NUL-terminated and</div><div class='add'>+	 *     zero-padded</div><div class='add'>+	 *   - task_lock() to ensure the operation is atomic and the name is</div><div class='add'>+	 *     fully updated.</div><div class='ctx'> 	 */</div><div class='ctx'> 	char				comm[TASK_COMM_LEN];</div><div class='ctx'> </div><div class='hunk'>@@ -1154,9 +1240,14 @@ struct task_struct {</div><div class='ctx'> 	struct rt_mutex_waiter		*pi_blocked_on;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_MUTEXES</div><div class='del'>-	/* Mutex deadlock detection: */</div><div class='del'>-	struct mutex_waiter		*blocked_on;</div><div class='add'>+	struct mutex			*blocked_on;	/* lock we're blocked on */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER</div><div class='add'>+	/*</div><div class='add'>+	 * Encoded lock address causing task block (lower 2 bits = type from</div><div class='add'>+	 * &lt;linux/hung_task.h&gt;). Accessed via hung_task_*() helpers.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long			blocker;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_ATOMIC_SLEEP</div><div class='hunk'>@@ -1227,14 +1318,16 @@ struct task_struct {</div><div class='ctx'> 	/* Sequence number to catch updates: */</div><div class='ctx'> 	seqcount_spinlock_t		mems_allowed_seq;</div><div class='ctx'> 	int				cpuset_mem_spread_rotor;</div><div class='del'>-	int				cpuset_slab_spread_rotor;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_CGROUPS</div><div class='ctx'> 	/* Control Group info protected by css_set_lock: */</div><div class='ctx'> 	struct css_set __rcu		*cgroups;</div><div class='ctx'> 	/* cg_list protected by css_set_lock and tsk-&gt;alloc_lock: */</div><div class='ctx'> 	struct list_head		cg_list;</div><div class='del'>-#endif</div><div class='add'>+#ifdef CONFIG_PREEMPT_RT</div><div class='add'>+	struct llist_node		cg_dead_lnode;</div><div class='add'>+#endif	/* CONFIG_PREEMPT_RT */</div><div class='add'>+#endif	/* CONFIG_CGROUPS */</div><div class='ctx'> #ifdef CONFIG_X86_CPU_RESCTRL</div><div class='ctx'> 	u32				closid;</div><div class='ctx'> 	u32				rmid;</div><div class='hunk'>@@ -1250,9 +1343,11 @@ struct task_struct {</div><div class='ctx'> 	unsigned int			futex_state;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_PERF_EVENTS</div><div class='add'>+	u8				perf_recursion[PERF_NR_CONTEXTS];</div><div class='ctx'> 	struct perf_event_context	*perf_event_ctxp;</div><div class='ctx'> 	struct mutex			perf_event_mutex;</div><div class='ctx'> 	struct list_head		perf_event_list;</div><div class='add'>+	struct perf_ctx_data __rcu	*perf_ctx_data;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_DEBUG_PREEMPT</div><div class='ctx'> 	unsigned long			preempt_disable_ip;</div><div class='hunk'>@@ -1261,6 +1356,7 @@ struct task_struct {</div><div class='ctx'> 	/* Protected by alloc_lock: */</div><div class='ctx'> 	struct mempolicy		*mempolicy;</div><div class='ctx'> 	short				il_prev;</div><div class='add'>+	u8				il_weight;</div><div class='ctx'> 	short				pref_node_fork;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_NUMA_BALANCING</div><div class='hunk'>@@ -1313,24 +1409,8 @@ struct task_struct {</div><div class='ctx'> 	unsigned long			numa_pages_migrated;</div><div class='ctx'> #endif /* CONFIG_NUMA_BALANCING */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RSEQ</div><div class='del'>-	struct rseq __user *rseq;</div><div class='del'>-	u32 rseq_len;</div><div class='del'>-	u32 rseq_sig;</div><div class='del'>-	/*</div><div class='del'>-	 * RmW on rseq_event_mask must be performed atomically</div><div class='del'>-	 * with respect to preemption.</div><div class='del'>-	 */</div><div class='del'>-	unsigned long rseq_event_mask;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SCHED_MM_CID</div><div class='del'>-	int				mm_cid;		/* Current cid in mm */</div><div class='del'>-	int				last_mm_cid;	/* Most recent cid in mm */</div><div class='del'>-	int				migrate_from_cpu;</div><div class='del'>-	int				mm_cid_active;	/* Whether cid bitmap is active */</div><div class='del'>-	struct callback_head		cid_work;</div><div class='del'>-#endif</div><div class='add'>+	struct rseq_data		rseq;</div><div class='add'>+	struct sched_mm_cid		mm_cid;</div><div class='ctx'> </div><div class='ctx'> 	struct tlbflush_unmap_batch	tlb_ubc;</div><div class='ctx'> </div><div class='hunk'>@@ -1395,10 +1475,11 @@ struct task_struct {</div><div class='ctx'> 	int				curr_ret_depth;</div><div class='ctx'> </div><div class='ctx'> 	/* Stack of return addresses for return function tracing: */</div><div class='del'>-	struct ftrace_ret_stack		*ret_stack;</div><div class='add'>+	unsigned long			*ret_stack;</div><div class='ctx'> </div><div class='ctx'> 	/* Timestamp for last schedule: */</div><div class='ctx'> 	unsigned long long		ftrace_timestamp;</div><div class='add'>+	unsigned long long		ftrace_sleeptime;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Number of functions that haven't been traced</div><div class='hunk'>@@ -1440,19 +1521,18 @@ struct task_struct {</div><div class='ctx'> 	unsigned int			kcov_softirq;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MEMCG</div><div class='add'>+#ifdef CONFIG_MEMCG_V1</div><div class='ctx'> 	struct mem_cgroup		*memcg_in_oom;</div><div class='del'>-	gfp_t				memcg_oom_gfp_mask;</div><div class='del'>-	int				memcg_oom_order;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> 	/* Number of pages to reclaim on returning to userland: */</div><div class='ctx'> 	unsigned int			memcg_nr_pages_over_high;</div><div class='ctx'> </div><div class='ctx'> 	/* Used by memcontrol for targeted memcg charge: */</div><div class='ctx'> 	struct mem_cgroup		*active_memcg;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+	/* Cache for current-&gt;cgroups-&gt;memcg-&gt;objcg lookups: */</div><div class='ctx'> 	struct obj_cgroup		*objcg;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1501,9 +1581,13 @@ struct task_struct {</div><div class='ctx'> 	/* Used for BPF run context */</div><div class='ctx'> 	struct bpf_run_ctx		*bpf_ctx;</div><div class='ctx'> #endif</div><div class='add'>+	/* Used by BPF for per-TASK xdp storage */</div><div class='add'>+	struct bpf_net_context		*bpf_net_context;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_GCC_PLUGIN_STACKLEAK</div><div class='add'>+#ifdef CONFIG_KSTACK_ERASE</div><div class='ctx'> 	unsigned long			lowest_stack;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_KSTACK_ERASE_METRICS</div><div class='ctx'> 	unsigned long			prev_lowest_stack;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1537,34 +1621,42 @@ struct task_struct {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RV</div><div class='ctx'> 	/*</div><div class='del'>-	 * Per-task RV monitor. Nowadays fixed in RV_PER_TASK_MONITORS.</div><div class='del'>-	 * If we find justification for more monitors, we can think</div><div class='del'>-	 * about adding more or developing a dynamic method. So far,</div><div class='del'>-	 * none of these are justified.</div><div class='add'>+	 * Per-task RV monitor, fixed in CONFIG_RV_PER_TASK_MONITORS.</div><div class='add'>+	 * If memory becomes a concern, we can think about a dynamic method.</div><div class='ctx'> 	 */</div><div class='del'>-	union rv_task_monitor		rv[RV_PER_TASK_MONITORS];</div><div class='add'>+	union rv_task_monitor		rv[CONFIG_RV_PER_TASK_MONITORS];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_USER_EVENTS</div><div class='ctx'> 	struct user_event_mm		*user_event_mm;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * New fields for task_struct should be added above here, so that</div><div class='del'>-	 * they are included in the randomized portion of task_struct.</div><div class='del'>-	 */</div><div class='del'>-	randomized_struct_fields_end</div><div class='add'>+#ifdef CONFIG_UNWIND_USER</div><div class='add'>+	struct unwind_task_info		unwind_info;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* CPU-specific state of this task: */</div><div class='ctx'> 	struct thread_struct		thread;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * WARNING: on x86, 'thread_struct' contains a variable-sized</div><div class='del'>-	 * structure.  It *MUST* be at the end of 'task_struct'.</div><div class='del'>-	 *</div><div class='del'>-	 * Do not put anything below here!</div><div class='add'>+	 * New fields for task_struct should be added above here, so that</div><div class='add'>+	 * they are included in the randomized portion of task_struct.</div><div class='ctx'> 	 */</div><div class='del'>-};</div><div class='add'>+	randomized_struct_fields_end</div><div class='add'>+} __attribute__ ((aligned (64)));</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SCHED_PROXY_EXEC</div><div class='add'>+DECLARE_STATIC_KEY_TRUE(__sched_proxy_exec);</div><div class='add'>+static inline bool sched_proxy_exec(void)</div><div class='add'>+{</div><div class='add'>+	return static_branch_likely(&amp;__sched_proxy_exec);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool sched_proxy_exec(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define TASK_REPORT_IDLE	(TASK_REPORT + 1)</div><div class='ctx'> #define TASK_REPORT_MAX		(TASK_REPORT_IDLE &lt;&lt; 1)</div><div class='hunk'>@@ -1583,8 +1675,9 @@ static inline unsigned int __task_state_index(unsigned int tsk_state,</div><div class='ctx'> 	 * We're lying here, but rather than expose a completely new task state</div><div class='ctx'> 	 * to userspace, we can make this appear as if the task has gone through</div><div class='ctx'> 	 * a regular rt_mutex_lock() call.</div><div class='add'>+	 * Report frozen tasks as uninterruptible.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tsk_state &amp; TASK_RTLOCK_WAIT)</div><div class='add'>+	if ((tsk_state &amp; TASK_RTLOCK_WAIT) || (tsk_state &amp; TASK_FROZEN))</div><div class='ctx'> 		state = TASK_UNINTERRUPTIBLE;</div><div class='ctx'> </div><div class='ctx'> 	return fls(state);</div><div class='hunk'>@@ -1599,7 +1692,7 @@ static inline char task_index_to_char(unsigned int state)</div><div class='ctx'> {</div><div class='ctx'> 	static const char state_char[] = "RSDTtXZPI";</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(1 + ilog2(TASK_REPORT_MAX) != sizeof(state_char) - 1);</div><div class='add'>+	BUILD_BUG_ON(TASK_REPORT_MAX * 2 != 1 &lt;&lt; (sizeof(state_char) - 1));</div><div class='ctx'> </div><div class='ctx'> 	return state_char[state];</div><div class='ctx'> }</div><div class='hunk'>@@ -1625,15 +1718,15 @@ extern struct pid *cad_pid;</div><div class='ctx'> #define PF_SUPERPRIV		0x00000100	/* Used super-user privileges */</div><div class='ctx'> #define PF_DUMPCORE		0x00000200	/* Dumped core */</div><div class='ctx'> #define PF_SIGNALED		0x00000400	/* Killed by a signal */</div><div class='del'>-#define PF_MEMALLOC		0x00000800	/* Allocating memory */</div><div class='add'>+#define PF_MEMALLOC		0x00000800	/* Allocating memory to free memory. See memalloc_noreclaim_save() */</div><div class='ctx'> #define PF_NPROC_EXCEEDED	0x00001000	/* set_user() noticed that RLIMIT_NPROC was exceeded */</div><div class='ctx'> #define PF_USED_MATH		0x00002000	/* If unset the fpu must be initialized before use */</div><div class='ctx'> #define PF_USER_WORKER		0x00004000	/* Kernel thread cloned from userspace thread */</div><div class='ctx'> #define PF_NOFREEZE		0x00008000	/* This thread should not be frozen */</div><div class='del'>-#define PF__HOLE__00010000	0x00010000</div><div class='add'>+#define PF_KCOMPACTD		0x00010000	/* I am kcompactd */</div><div class='ctx'> #define PF_KSWAPD		0x00020000	/* I am kswapd */</div><div class='del'>-#define PF_MEMALLOC_NOFS	0x00040000	/* All allocation requests will inherit GFP_NOFS */</div><div class='del'>-#define PF_MEMALLOC_NOIO	0x00080000	/* All allocation requests will inherit GFP_NOIO */</div><div class='add'>+#define PF_MEMALLOC_NOFS	0x00040000	/* All allocations inherit GFP_NOFS. See memalloc_nfs_save() */</div><div class='add'>+#define PF_MEMALLOC_NOIO	0x00080000	/* All allocations inherit GFP_NOIO. See memalloc_noio_save() */</div><div class='ctx'> #define PF_LOCAL_THROTTLE	0x00100000	/* Throttle writes only against the bdi I write to,</div><div class='ctx'> 						 * I am cleaning dirty pages from some other bdi. */</div><div class='ctx'> #define PF_KTHREAD		0x00200000	/* I am a kernel thread */</div><div class='hunk'>@@ -1643,7 +1736,8 @@ extern struct pid *cad_pid;</div><div class='ctx'> #define PF__HOLE__02000000	0x02000000</div><div class='ctx'> #define PF_NO_SETAFFINITY	0x04000000	/* Userland is not allowed to meddle with cpus_mask */</div><div class='ctx'> #define PF_MCE_EARLY		0x08000000      /* Early kill for mce process policy */</div><div class='del'>-#define PF_MEMALLOC_PIN		0x10000000	/* Allocation context constrained to zones which allow long term pinning. */</div><div class='add'>+#define PF_MEMALLOC_PIN		0x10000000	/* Allocations constrained to zones which allow long term pinning.</div><div class='add'>+						 * See memalloc_pin_save() */</div><div class='ctx'> #define PF_BLOCK_TS		0x20000000	/* plug has ts that needs updating */</div><div class='ctx'> #define PF__HOLE__40000000	0x40000000</div><div class='ctx'> #define PF_SUSPEND_TASK		0x80000000      /* This thread called freeze_processes() and should not be frozen */</div><div class='hunk'>@@ -1678,12 +1772,8 @@ extern struct pid *cad_pid;</div><div class='ctx'> </div><div class='ctx'> static __always_inline bool is_percpu_thread(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> 	return (current-&gt;flags &amp; PF_NO_SETAFFINITY) &amp;&amp;</div><div class='ctx'> 		(current-&gt;nr_cpus_allowed  == 1);</div><div class='del'>-#else</div><div class='del'>-	return true;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Per-process atomic flags. */</div><div class='hunk'>@@ -1748,10 +1838,9 @@ extern int cpuset_cpumask_can_shrink(const struct cpumask *cur, const struct cpu</div><div class='ctx'> extern int task_can_attach(struct task_struct *p);</div><div class='ctx'> extern int dl_bw_alloc(int cpu, u64 dl_bw);</div><div class='ctx'> extern void dl_bw_free(int cpu, u64 dl_bw);</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='del'>-/* do_set_cpus_allowed() - consider using set_cpus_allowed_ptr() instead */</div><div class='del'>-extern void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask);</div><div class='add'>+/* set_cpus_allowed_force() - consider using set_cpus_allowed_ptr() instead */</div><div class='add'>+extern void set_cpus_allowed_force(struct task_struct *p, const struct cpumask *new_mask);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * set_cpus_allowed_ptr - set CPU affinity mask of a task</div><div class='hunk'>@@ -1766,32 +1855,6 @@ extern void release_user_cpus_ptr(struct task_struct *p);</div><div class='ctx'> extern int dl_task_check_affinity(struct task_struct *p, const struct cpumask *mask);</div><div class='ctx'> extern void force_compatible_cpus_allowed_ptr(struct task_struct *p);</div><div class='ctx'> extern void relax_compatible_cpus_allowed_ptr(struct task_struct *p);</div><div class='del'>-#else</div><div class='del'>-static inline void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static inline int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask)</div><div class='del'>-{</div><div class='del'>-	if (!cpumask_test_cpu(0, new_mask))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline int dup_user_cpus_ptr(struct task_struct *dst, struct task_struct *src, int node)</div><div class='del'>-{</div><div class='del'>-	if (src-&gt;user_cpus_ptr)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline void release_user_cpus_ptr(struct task_struct *p)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(p-&gt;user_cpus_ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int dl_task_check_affinity(struct task_struct *p, const struct cpumask *mask)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> extern int yield_to(struct task_struct *p, bool preempt);</div><div class='ctx'> extern void set_user_nice(struct task_struct *p, long nice);</div><div class='hunk'>@@ -1816,6 +1879,7 @@ extern int sched_setscheduler(struct task_struct *, int, const struct sched_para</div><div class='ctx'> extern int sched_setscheduler_nocheck(struct task_struct *, int, const struct sched_param *);</div><div class='ctx'> extern void sched_set_fifo(struct task_struct *p);</div><div class='ctx'> extern void sched_set_fifo_low(struct task_struct *p);</div><div class='add'>+extern void sched_set_fifo_secondary(struct task_struct *p);</div><div class='ctx'> extern void sched_set_normal(struct task_struct *p, int nice);</div><div class='ctx'> extern int sched_setattr(struct task_struct *, const struct sched_attr *);</div><div class='ctx'> extern int sched_setattr_nocheck(struct task_struct *, const struct sched_attr *);</div><div class='hunk'>@@ -1853,7 +1917,7 @@ extern unsigned long init_stack[THREAD_SIZE / sizeof(unsigned long)];</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_THREAD_INFO_IN_TASK</div><div class='ctx'> # define task_thread_info(task)	(&amp;(task)-&gt;thread_info)</div><div class='del'>-#elif !defined(__HAVE_THREAD_FUNCTIONS)</div><div class='add'>+#else</div><div class='ctx'> # define task_thread_info(task)	((struct thread_info *)(task)-&gt;stack)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1880,26 +1944,33 @@ extern int wake_up_state(struct task_struct *tsk, unsigned int state);</div><div class='ctx'> extern int wake_up_process(struct task_struct *tsk);</div><div class='ctx'> extern void wake_up_new_task(struct task_struct *tsk);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> extern void kick_process(struct task_struct *tsk);</div><div class='del'>-#else</div><div class='del'>-static inline void kick_process(struct task_struct *tsk) { }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> extern void __set_task_comm(struct task_struct *tsk, const char *from, bool exec);</div><div class='add'>+#define set_task_comm(tsk, from) ({			\</div><div class='add'>+	BUILD_BUG_ON(sizeof(from) != TASK_COMM_LEN);	\</div><div class='add'>+	__set_task_comm(tsk, from, false);		\</div><div class='add'>+})</div><div class='ctx'> </div><div class='del'>-static inline void set_task_comm(struct task_struct *tsk, const char *from)</div><div class='del'>-{</div><div class='del'>-	__set_task_comm(tsk, from, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern char *__get_task_comm(char *to, size_t len, struct task_struct *tsk);</div><div class='add'>+/*</div><div class='add'>+ * - Why not use task_lock()?</div><div class='add'>+ *   User space can randomly change their names anyway, so locking for readers</div><div class='add'>+ *   doesn't make sense. For writers, locking is probably necessary, as a race</div><div class='add'>+ *   condition could lead to long-term mixed results.</div><div class='add'>+ *   The strscpy_pad() in __set_task_comm() can ensure that the task comm is</div><div class='add'>+ *   always NUL-terminated and zero-padded. Therefore the race condition between</div><div class='add'>+ *   reader and writer is not an issue.</div><div class='add'>+ *</div><div class='add'>+ * - BUILD_BUG_ON() can help prevent the buf from being truncated.</div><div class='add'>+ *   Since the callers don't perform any return value checks, this safeguard is</div><div class='add'>+ *   necessary.</div><div class='add'>+ */</div><div class='ctx'> #define get_task_comm(buf, tsk) ({			\</div><div class='del'>-	BUILD_BUG_ON(sizeof(buf) != TASK_COMM_LEN);	\</div><div class='del'>-	__get_task_comm(buf, sizeof(buf), tsk);		\</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf) &lt; TASK_COMM_LEN);	\</div><div class='add'>+	strscpy_pad(buf, (tsk)-&gt;comm);			\</div><div class='add'>+	buf;						\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> static __always_inline void scheduler_ipi(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1909,9 +1980,6 @@ static __always_inline void scheduler_ipi(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	preempt_fold_need_resched();</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static inline void scheduler_ipi(void) { }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> extern unsigned long wait_task_inactive(struct task_struct *, unsigned int match_state);</div><div class='ctx'> </div><div class='hunk'>@@ -1952,12 +2020,16 @@ static inline int test_tsk_thread_flag(struct task_struct *tsk, int flag)</div><div class='ctx'> </div><div class='ctx'> static inline void set_tsk_need_resched(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='add'>+	if (tracepoint_enabled(sched_set_need_resched_tp) &amp;&amp;</div><div class='add'>+	    !test_tsk_thread_flag(tsk, TIF_NEED_RESCHED))</div><div class='add'>+		__trace_set_need_resched(tsk, TIF_NEED_RESCHED);</div><div class='ctx'> 	set_tsk_thread_flag(tsk,TIF_NEED_RESCHED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void clear_tsk_need_resched(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='del'>-	clear_tsk_thread_flag(tsk,TIF_NEED_RESCHED);</div><div class='add'>+	atomic_long_andnot(_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY,</div><div class='add'>+			   (atomic_long_t *)&amp;task_thread_info(tsk)-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int test_tsk_need_resched(struct task_struct *tsk)</div><div class='hunk'>@@ -1965,6 +2037,13 @@ static inline int test_tsk_need_resched(struct task_struct *tsk)</div><div class='ctx'> 	return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void set_need_resched_current(void)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_irqs_disabled();</div><div class='add'>+	set_tsk_need_resched(current);</div><div class='add'>+	set_preempt_need_resched();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * cond_resched() and cond_resched_lock(): latency reduction via</div><div class='ctx'>  * explicit rescheduling in places that are safe. The return</div><div class='hunk'>@@ -1976,9 +2055,6 @@ extern int __cond_resched(void);</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PREEMPT_DYNAMIC) &amp;&amp; defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL)</div><div class='ctx'> </div><div class='del'>-void sched_dynamic_klp_enable(void);</div><div class='del'>-void sched_dynamic_klp_disable(void);</div><div class='del'>-</div><div class='ctx'> DECLARE_STATIC_CALL(cond_resched, __cond_resched);</div><div class='ctx'> </div><div class='ctx'> static __always_inline int _cond_resched(void)</div><div class='hunk'>@@ -1999,7 +2075,6 @@ static __always_inline int _cond_resched(void)</div><div class='ctx'> </div><div class='ctx'> static inline int _cond_resched(void)</div><div class='ctx'> {</div><div class='del'>-	klp_sched_try_switch();</div><div class='ctx'> 	return __cond_resched();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2009,7 +2084,6 @@ static inline int _cond_resched(void)</div><div class='ctx'> </div><div class='ctx'> static inline int _cond_resched(void)</div><div class='ctx'> {</div><div class='del'>-	klp_sched_try_switch();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2058,46 +2132,71 @@ extern int __cond_resched_rwlock_write(rwlock_t *lock);</div><div class='ctx'> 	__cond_resched_rwlock_write(lock);					\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PREEMPT_DYNAMIC</div><div class='del'>-</div><div class='del'>-extern bool preempt_model_none(void);</div><div class='del'>-extern bool preempt_model_voluntary(void);</div><div class='del'>-extern bool preempt_model_full(void);</div><div class='add'>+#ifndef CONFIG_PREEMPT_RT</div><div class='add'>+static inline struct mutex *__get_task_blocked_on(struct task_struct *p)</div><div class='add'>+{</div><div class='add'>+	struct mutex *m = p-&gt;blocked_on;</div><div class='ctx'> </div><div class='del'>-#else</div><div class='add'>+	if (m)</div><div class='add'>+		lockdep_assert_held_once(&amp;m-&gt;wait_lock);</div><div class='add'>+	return m;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static inline bool preempt_model_none(void)</div><div class='add'>+static inline void __set_task_blocked_on(struct task_struct *p, struct mutex *m)</div><div class='ctx'> {</div><div class='del'>-	return IS_ENABLED(CONFIG_PREEMPT_NONE);</div><div class='add'>+	struct mutex *blocked_on = READ_ONCE(p-&gt;blocked_on);</div><div class='add'>+</div><div class='add'>+	WARN_ON_ONCE(!m);</div><div class='add'>+	/* The task should only be setting itself as blocked */</div><div class='add'>+	WARN_ON_ONCE(p != current);</div><div class='add'>+	/* Currently we serialize blocked_on under the mutex::wait_lock */</div><div class='add'>+	lockdep_assert_held_once(&amp;m-&gt;wait_lock);</div><div class='add'>+	/*</div><div class='add'>+	 * Check ensure we don't overwrite existing mutex value</div><div class='add'>+	 * with a different mutex. Note, setting it to the same</div><div class='add'>+	 * lock repeatedly is ok.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON_ONCE(blocked_on &amp;&amp; blocked_on != m);</div><div class='add'>+	WRITE_ONCE(p-&gt;blocked_on, m);</div><div class='ctx'> }</div><div class='del'>-static inline bool preempt_model_voluntary(void)</div><div class='add'>+</div><div class='add'>+static inline void set_task_blocked_on(struct task_struct *p, struct mutex *m)</div><div class='ctx'> {</div><div class='del'>-	return IS_ENABLED(CONFIG_PREEMPT_VOLUNTARY);</div><div class='add'>+	guard(raw_spinlock_irqsave)(&amp;m-&gt;wait_lock);</div><div class='add'>+	__set_task_blocked_on(p, m);</div><div class='ctx'> }</div><div class='del'>-static inline bool preempt_model_full(void)</div><div class='add'>+</div><div class='add'>+static inline void __clear_task_blocked_on(struct task_struct *p, struct mutex *m)</div><div class='ctx'> {</div><div class='del'>-	return IS_ENABLED(CONFIG_PREEMPT);</div><div class='add'>+	if (m) {</div><div class='add'>+		struct mutex *blocked_on = READ_ONCE(p-&gt;blocked_on);</div><div class='add'>+</div><div class='add'>+		/* Currently we serialize blocked_on under the mutex::wait_lock */</div><div class='add'>+		lockdep_assert_held_once(&amp;m-&gt;wait_lock);</div><div class='add'>+		/*</div><div class='add'>+		 * There may be cases where we re-clear already cleared</div><div class='add'>+		 * blocked_on relationships, but make sure we are not</div><div class='add'>+		 * clearing the relationship with a different lock.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON_ONCE(blocked_on &amp;&amp; blocked_on != m);</div><div class='add'>+	}</div><div class='add'>+	WRITE_ONCE(p-&gt;blocked_on, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline bool preempt_model_rt(void)</div><div class='add'>+static inline void clear_task_blocked_on(struct task_struct *p, struct mutex *m)</div><div class='add'>+{</div><div class='add'>+	guard(raw_spinlock_irqsave)(&amp;m-&gt;wait_lock);</div><div class='add'>+	__clear_task_blocked_on(p, m);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void __clear_task_blocked_on(struct task_struct *p, struct rt_mutex *m)</div><div class='ctx'> {</div><div class='del'>-	return IS_ENABLED(CONFIG_PREEMPT_RT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Does the preemption model allow non-cooperative preemption?</div><div class='del'>- *</div><div class='del'>- * For !CONFIG_PREEMPT_DYNAMIC kernels this is an exact match with</div><div class='del'>- * CONFIG_PREEMPTION; for CONFIG_PREEMPT_DYNAMIC this doesn't work as the</div><div class='del'>- * kernel is *built* with CONFIG_PREEMPTION=y but may run with e.g. the</div><div class='del'>- * PREEMPT_NONE model.</div><div class='del'>- */</div><div class='del'>-static inline bool preempt_model_preemptible(void)</div><div class='add'>+static inline void clear_task_blocked_on(struct task_struct *p, struct rt_mutex *m)</div><div class='ctx'> {</div><div class='del'>-	return preempt_model_full() || preempt_model_rt();</div><div class='ctx'> }</div><div class='add'>+#endif /* !CONFIG_PREEMPT_RT */</div><div class='ctx'> </div><div class='ctx'> static __always_inline bool need_resched(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -2129,12 +2228,15 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='add'>+static inline bool task_is_runnable(struct task_struct *p)</div><div class='add'>+{</div><div class='add'>+	return p-&gt;on_rq &amp;&amp; !p-&gt;se.sched_delayed;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern bool sched_task_on_rq(struct task_struct *p);</div><div class='ctx'> extern unsigned long get_wchan(struct task_struct *p);</div><div class='ctx'> extern struct task_struct *cpu_curr_snapshot(int cpu);</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * In order to reduce various lock holder preemption latencies provide an</div><div class='ctx'>  * interface to see if a vCPU is currently running or not.</div><div class='hunk'>@@ -2157,7 +2259,6 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask);</div><div class='ctx'> #define TASK_SIZE_OF(tsk)	TASK_SIZE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> static inline bool owner_on_cpu(struct task_struct *owner)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2169,7 +2270,6 @@ static inline bool owner_on_cpu(struct task_struct *owner)</div><div class='ctx'> </div><div class='ctx'> /* Returns effective CPU energy utilization, as seen by the scheduler */</div><div class='ctx'> unsigned long sched_cpu_util(int cpu);</div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCHED_CORE</div><div class='ctx'> extern void sched_core_free(struct task_struct *tsk);</div><div class='hunk'>@@ -2185,4 +2285,159 @@ static inline int sched_core_idle_cpu(int cpu) { return idle_cpu(cpu); }</div><div class='ctx'> </div><div class='ctx'> extern void sched_set_stop_task(int cpu, struct task_struct *stop);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING</div><div class='add'>+static __always_inline struct alloc_tag *alloc_tag_save(struct alloc_tag *tag)</div><div class='add'>+{</div><div class='add'>+	swap(current-&gt;alloc_tag, tag);</div><div class='add'>+	return tag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void alloc_tag_restore(struct alloc_tag *tag, struct alloc_tag *old)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_MEM_ALLOC_PROFILING_DEBUG</div><div class='add'>+	WARN(current-&gt;alloc_tag != tag, "current-&gt;alloc_tag was changed:\n");</div><div class='add'>+#endif</div><div class='add'>+	current-&gt;alloc_tag = old;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define alloc_tag_save(_tag)			NULL</div><div class='add'>+#define alloc_tag_restore(_tag, _old)		do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Avoids recursive inclusion hell */</div><div class='add'>+#ifdef CONFIG_SCHED_MM_CID</div><div class='add'>+void sched_mm_cid_before_execve(struct task_struct *t);</div><div class='add'>+void sched_mm_cid_after_execve(struct task_struct *t);</div><div class='add'>+void sched_mm_cid_fork(struct task_struct *t);</div><div class='add'>+void sched_mm_cid_exit(struct task_struct *t);</div><div class='add'>+static __always_inline int task_mm_cid(struct task_struct *t)</div><div class='add'>+{</div><div class='add'>+	return t-&gt;mm_cid.cid &amp; ~(MM_CID_ONCPU | MM_CID_TRANSIT);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void sched_mm_cid_before_execve(struct task_struct *t) { }</div><div class='add'>+static inline void sched_mm_cid_after_execve(struct task_struct *t) { }</div><div class='add'>+static inline void sched_mm_cid_fork(struct task_struct *t) { }</div><div class='add'>+static inline void sched_mm_cid_exit(struct task_struct *t) { }</div><div class='add'>+static __always_inline int task_mm_cid(struct task_struct *t)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Use the processor id as a fall-back when the mm cid feature is</div><div class='add'>+	 * disabled. This provides functional per-cpu data structure accesses</div><div class='add'>+	 * in user-space, althrough it won't provide the memory usage benefits.</div><div class='add'>+	 */</div><div class='add'>+	return task_cpu(t);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MODULE</div><div class='add'>+#ifndef COMPILE_OFFSETS</div><div class='add'>+</div><div class='add'>+extern void ___migrate_enable(void);</div><div class='add'>+</div><div class='add'>+struct rq;</div><div class='add'>+DECLARE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The "struct rq" is not available here, so we can't access the</div><div class='add'>+ * "runqueues" with this_cpu_ptr(), as the compilation will fail in</div><div class='add'>+ * this_cpu_ptr() -&gt; raw_cpu_ptr() -&gt; __verify_pcpu_ptr():</div><div class='add'>+ *   typeof((ptr) + 0)</div><div class='add'>+ *</div><div class='add'>+ * So use arch_raw_cpu_ptr()/PERCPU_PTR() directly here.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+#define this_rq_raw() arch_raw_cpu_ptr(&amp;runqueues)</div><div class='add'>+#else</div><div class='add'>+#define this_rq_raw() PERCPU_PTR(&amp;runqueues)</div><div class='add'>+#endif</div><div class='add'>+#define this_rq_pinned() (*(unsigned int *)((void *)this_rq_raw() + RQ_nr_pinned))</div><div class='add'>+</div><div class='add'>+static inline void __migrate_enable(void)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p = current;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_PREEMPT</div><div class='add'>+	/*</div><div class='add'>+	 * Check both overflow from migrate_disable() and superfluous</div><div class='add'>+	 * migrate_enable().</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON_ONCE((s16)p-&gt;migration_disabled &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (p-&gt;migration_disabled &gt; 1) {</div><div class='add'>+		p-&gt;migration_disabled--;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure stop_task runs either before or after this, and that</div><div class='add'>+	 * __set_cpus_allowed_ptr(SCA_MIGRATE_ENABLE) doesn't schedule().</div><div class='add'>+	 */</div><div class='add'>+	guard(preempt)();</div><div class='add'>+	if (unlikely(p-&gt;cpus_ptr != &amp;p-&gt;cpus_mask))</div><div class='add'>+		___migrate_enable();</div><div class='add'>+	/*</div><div class='add'>+	 * Mustn't clear migration_disabled() until cpus_ptr points back at the</div><div class='add'>+	 * regular cpus_mask, otherwise things that race (eg.</div><div class='add'>+	 * select_fallback_rq) get confused.</div><div class='add'>+	 */</div><div class='add'>+	barrier();</div><div class='add'>+	p-&gt;migration_disabled = 0;</div><div class='add'>+	this_rq_pinned()--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __migrate_disable(void)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p = current;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;migration_disabled) {</div><div class='add'>+#ifdef CONFIG_DEBUG_PREEMPT</div><div class='add'>+		/*</div><div class='add'>+		 *Warn about overflow half-way through the range.</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON_ONCE((s16)p-&gt;migration_disabled &lt; 0);</div><div class='add'>+#endif</div><div class='add'>+		p-&gt;migration_disabled++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(preempt)();</div><div class='add'>+	this_rq_pinned()++;</div><div class='add'>+	p-&gt;migration_disabled = 1;</div><div class='add'>+}</div><div class='add'>+#else /* !COMPILE_OFFSETS */</div><div class='add'>+static inline void __migrate_disable(void) { }</div><div class='add'>+static inline void __migrate_enable(void) { }</div><div class='add'>+#endif /* !COMPILE_OFFSETS */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * So that it is possible to not export the runqueues variable, define and</div><div class='add'>+ * export migrate_enable/migrate_disable in kernel/sched/core.c too, and use</div><div class='add'>+ * them for the modules. The macro "INSTANTIATE_EXPORTED_MIGRATE_DISABLE" will</div><div class='add'>+ * be defined in kernel/sched/core.c.</div><div class='add'>+ */</div><div class='add'>+#ifndef INSTANTIATE_EXPORTED_MIGRATE_DISABLE</div><div class='add'>+static __always_inline void migrate_disable(void)</div><div class='add'>+{</div><div class='add'>+	__migrate_disable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void migrate_enable(void)</div><div class='add'>+{</div><div class='add'>+	__migrate_enable();</div><div class='add'>+}</div><div class='add'>+#else /* INSTANTIATE_EXPORTED_MIGRATE_DISABLE */</div><div class='add'>+extern void migrate_disable(void);</div><div class='add'>+extern void migrate_enable(void);</div><div class='add'>+#endif /* INSTANTIATE_EXPORTED_MIGRATE_DISABLE */</div><div class='add'>+</div><div class='add'>+#else /* MODULE */</div><div class='add'>+extern void migrate_disable(void);</div><div class='add'>+extern void migrate_enable(void);</div><div class='add'>+#endif /* MODULE */</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_0(migrate, migrate_disable(), migrate_enable())</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/sched/coredump.h b/include/linux/sched/coredump.h<br/>index 02f5090ffea2..624fda17a785 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/coredump.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/coredump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/coredump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/coredump.h</a></div><div class='hunk'>@@ -8,11 +8,19 @@</div><div class='ctx'> #define SUID_DUMP_USER		1	/* Dump as user of process */</div><div class='ctx'> #define SUID_DUMP_ROOT		2	/* Dump as root */</div><div class='ctx'> </div><div class='del'>-/* mm flags */</div><div class='add'>+static inline unsigned long __mm_flags_get_dumpable(const struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * By convention, dumpable bits are contained in first 32 bits of the</div><div class='add'>+	 * bitmap, so we can simply access this first unsigned long directly.</div><div class='add'>+	 */</div><div class='add'>+	return __mm_flags_get_word(mm);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-/* for SUID_DUMP_* above */</div><div class='del'>-#define MMF_DUMPABLE_BITS 2</div><div class='del'>-#define MMF_DUMPABLE_MASK ((1 &lt;&lt; MMF_DUMPABLE_BITS) - 1)</div><div class='add'>+static inline void __mm_flags_set_mask_dumpable(struct mm_struct *mm, int value)</div><div class='add'>+{</div><div class='add'>+	__mm_flags_set_mask_bits_word(mm, MMF_DUMPABLE_MASK, value);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> extern void set_dumpable(struct mm_struct *mm, int value);</div><div class='ctx'> /*</div><div class='hunk'>@@ -28,80 +36,9 @@ static inline int __get_dumpable(unsigned long mm_flags)</div><div class='ctx'> </div><div class='ctx'> static inline int get_dumpable(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='del'>-	return __get_dumpable(mm-&gt;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* coredump filter bits */</div><div class='del'>-#define MMF_DUMP_ANON_PRIVATE	2</div><div class='del'>-#define MMF_DUMP_ANON_SHARED	3</div><div class='del'>-#define MMF_DUMP_MAPPED_PRIVATE	4</div><div class='del'>-#define MMF_DUMP_MAPPED_SHARED	5</div><div class='del'>-#define MMF_DUMP_ELF_HEADERS	6</div><div class='del'>-#define MMF_DUMP_HUGETLB_PRIVATE 7</div><div class='del'>-#define MMF_DUMP_HUGETLB_SHARED  8</div><div class='del'>-#define MMF_DUMP_DAX_PRIVATE	9</div><div class='del'>-#define MMF_DUMP_DAX_SHARED	10</div><div class='del'>-</div><div class='del'>-#define MMF_DUMP_FILTER_SHIFT	MMF_DUMPABLE_BITS</div><div class='del'>-#define MMF_DUMP_FILTER_BITS	9</div><div class='del'>-#define MMF_DUMP_FILTER_MASK \</div><div class='del'>-	(((1 &lt;&lt; MMF_DUMP_FILTER_BITS) - 1) &lt;&lt; MMF_DUMP_FILTER_SHIFT)</div><div class='del'>-#define MMF_DUMP_FILTER_DEFAULT \</div><div class='del'>-	((1 &lt;&lt; MMF_DUMP_ANON_PRIVATE) |	(1 &lt;&lt; MMF_DUMP_ANON_SHARED) |\</div><div class='del'>-	 (1 &lt;&lt; MMF_DUMP_HUGETLB_PRIVATE) | MMF_DUMP_MASK_DEFAULT_ELF)</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS</div><div class='del'>-# define MMF_DUMP_MASK_DEFAULT_ELF	(1 &lt;&lt; MMF_DUMP_ELF_HEADERS)</div><div class='del'>-#else</div><div class='del'>-# define MMF_DUMP_MASK_DEFAULT_ELF	0</div><div class='del'>-#endif</div><div class='del'>-					/* leave room for more dump flags */</div><div class='del'>-#define MMF_VM_MERGEABLE	16	/* KSM may merge identical pages */</div><div class='del'>-#define MMF_VM_HUGEPAGE		17	/* set when mm is available for</div><div class='del'>-					   khugepaged */</div><div class='del'>-/*</div><div class='del'>- * This one-shot flag is dropped due to necessity of changing exe once again</div><div class='del'>- * on NFS restore</div><div class='del'>- */</div><div class='del'>-//#define MMF_EXE_FILE_CHANGED	18	/* see prctl_set_mm_exe_file() */</div><div class='add'>+	unsigned long flags = __mm_flags_get_dumpable(mm);</div><div class='ctx'> </div><div class='del'>-#define MMF_HAS_UPROBES		19	/* has uprobes */</div><div class='del'>-#define MMF_RECALC_UPROBES	20	/* MMF_HAS_UPROBES can be wrong */</div><div class='del'>-#define MMF_OOM_SKIP		21	/* mm is of no interest for the OOM killer */</div><div class='del'>-#define MMF_UNSTABLE		22	/* mm is unstable for copy_from_user */</div><div class='del'>-#define MMF_HUGE_ZERO_PAGE	23      /* mm has ever used the global huge zero page */</div><div class='del'>-#define MMF_DISABLE_THP		24	/* disable THP for all VMAs */</div><div class='del'>-#define MMF_DISABLE_THP_MASK	(1 &lt;&lt; MMF_DISABLE_THP)</div><div class='del'>-#define MMF_OOM_REAP_QUEUED	25	/* mm was queued for oom_reaper */</div><div class='del'>-#define MMF_MULTIPROCESS	26	/* mm is shared between processes */</div><div class='del'>-/*</div><div class='del'>- * MMF_HAS_PINNED: Whether this mm has pinned any pages.  This can be either</div><div class='del'>- * replaced in the future by mm.pinned_vm when it becomes stable, or grow into</div><div class='del'>- * a counter on its own. We're aggresive on this bit for now: even if the</div><div class='del'>- * pinned pages were unpinned later on, we'll still keep this bit set for the</div><div class='del'>- * lifecycle of this mm, just for simplicity.</div><div class='del'>- */</div><div class='del'>-#define MMF_HAS_PINNED		27	/* FOLL_PIN has run, never cleared */</div><div class='del'>-</div><div class='del'>-#define MMF_HAS_MDWE		28</div><div class='del'>-#define MMF_HAS_MDWE_MASK	(1 &lt;&lt; MMF_HAS_MDWE)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define MMF_HAS_MDWE_NO_INHERIT	29</div><div class='del'>-</div><div class='del'>-#define MMF_VM_MERGE_ANY	30</div><div class='del'>-#define MMF_VM_MERGE_ANY_MASK	(1 &lt;&lt; MMF_VM_MERGE_ANY)</div><div class='del'>-</div><div class='del'>-#define MMF_INIT_MASK		(MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\</div><div class='del'>-				 MMF_DISABLE_THP_MASK | MMF_HAS_MDWE_MASK |\</div><div class='del'>-				 MMF_VM_MERGE_ANY_MASK)</div><div class='del'>-</div><div class='del'>-static inline unsigned long mmf_init_flags(unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	if (flags &amp; (1UL &lt;&lt; MMF_HAS_MDWE_NO_INHERIT))</div><div class='del'>-		flags &amp;= ~((1UL &lt;&lt; MMF_HAS_MDWE) |</div><div class='del'>-			   (1UL &lt;&lt; MMF_HAS_MDWE_NO_INHERIT));</div><div class='del'>-	return flags &amp; MMF_INIT_MASK;</div><div class='add'>+	return __get_dumpable(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_SCHED_COREDUMP_H */</div><div class='head'>diff --git a/include/linux/sched/deadline.h b/include/linux/sched/deadline.h<br/>index df3aca89d4f5..c40115d4e34d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/deadline.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/deadline.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/deadline.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/deadline.h</a></div><div class='hunk'>@@ -10,16 +10,16 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#define MAX_DL_PRIO		0</div><div class='del'>-</div><div class='del'>-static inline int dl_prio(int prio)</div><div class='add'>+static inline bool dl_prio(int prio)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(prio &lt; MAX_DL_PRIO))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+	return unlikely(prio &lt; MAX_DL_PRIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dl_task(struct task_struct *p)</div><div class='add'>+/*</div><div class='add'>+ * Returns true if a task has a priority that belongs to DL class. PI-boosted</div><div class='add'>+ * tasks will return true. Use dl_policy() to ignore PI-boosted tasks.</div><div class='add'>+ */</div><div class='add'>+static inline bool dl_task(struct task_struct *p)</div><div class='ctx'> {</div><div class='ctx'> 	return dl_prio(p-&gt;prio);</div><div class='ctx'> }</div><div class='hunk'>@@ -29,12 +29,12 @@ static inline bool dl_time_before(u64 a, u64 b)</div><div class='ctx'> 	return (s64)(a - b) &lt; 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-</div><div class='ctx'> struct root_domain;</div><div class='ctx'> extern void dl_add_task_root_domain(struct task_struct *p);</div><div class='ctx'> extern void dl_clear_root_domain(struct root_domain *rd);</div><div class='add'>+extern void dl_clear_root_domain_cpu(int cpu);</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='add'>+extern u64 dl_cookie;</div><div class='add'>+extern bool dl_bw_visited(int cpu, u64 cookie);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_SCHED_DEADLINE_H */</div><div class='head'>diff --git a/include/linux/sched/debug.h b/include/linux/sched/debug.h<br/>index b5035afa2396..35ed4577a6cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/debug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/debug.h</a></div><div class='hunk'>@@ -35,12 +35,10 @@ extern void show_stack(struct task_struct *task, unsigned long *sp,</div><div class='ctx'> </div><div class='ctx'> extern void sched_show_task(struct task_struct *p);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='ctx'> struct seq_file;</div><div class='ctx'> extern void proc_sched_show_task(struct task_struct *p,</div><div class='ctx'> 				 struct pid_namespace *ns, struct seq_file *m);</div><div class='ctx'> extern void proc_sched_set_task(struct task_struct *p);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* Attach to any functions which should be ignored in wchan output. */</div><div class='ctx'> #define __sched		__section(".sched.text")</div><div class='head'>diff --git a/include/linux/sched/ext.h b/include/linux/sched/ext.h<br/>new file mode 100644<br/>index 000000000000..bcb962d5ee7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/ext.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/ext.h</a></div><div class='hunk'>@@ -0,0 +1,257 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * BPF extensible scheduler class: Documentation/scheduler/sched-ext.rst</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2022 Meta Platforms, Inc. and affiliates.</div><div class='add'>+ * Copyright (c) 2022 Tejun Heo &lt;tj@kernel.org&gt;</div><div class='add'>+ * Copyright (c) 2022 David Vernet &lt;dvernet@meta.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _LINUX_SCHED_EXT_H</div><div class='add'>+#define _LINUX_SCHED_EXT_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SCHED_CLASS_EXT</div><div class='add'>+</div><div class='add'>+#include &lt;linux/llist.h&gt;</div><div class='add'>+#include &lt;linux/rhashtable-types.h&gt;</div><div class='add'>+</div><div class='add'>+enum scx_public_consts {</div><div class='add'>+	SCX_OPS_NAME_LEN	= 128,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * %SCX_SLICE_DFL is used to refill slices when the BPF scheduler misses</div><div class='add'>+	 * to set the slice for a task that is selected for execution.</div><div class='add'>+	 * %SCX_EV_REFILL_SLICE_DFL counts the number of times the default slice</div><div class='add'>+	 * refill has been triggered.</div><div class='add'>+	 *</div><div class='add'>+	 * %SCX_SLICE_BYPASS is used as the slice for all tasks in the bypass</div><div class='add'>+	 * mode. As making forward progress for all tasks is the main goal of</div><div class='add'>+	 * the bypass mode, a shorter slice is used.</div><div class='add'>+	 */</div><div class='add'>+	SCX_SLICE_DFL		= 20 * 1000000,	/* 20ms */</div><div class='add'>+	SCX_SLICE_BYPASS	=  5 * 1000000, /*  5ms */</div><div class='add'>+	SCX_SLICE_INF		= U64_MAX,	/* infinite, implies nohz */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DSQ (dispatch queue) IDs are 64bit of the format:</div><div class='add'>+ *</div><div class='add'>+ *   Bits: [63] [62 ..  0]</div><div class='add'>+ *         [ B] [   ID   ]</div><div class='add'>+ *</div><div class='add'>+ *    B: 1 for IDs for built-in DSQs, 0 for ops-created user DSQs</div><div class='add'>+ *   ID: 63 bit ID</div><div class='add'>+ *</div><div class='add'>+ * Built-in IDs:</div><div class='add'>+ *</div><div class='add'>+ *   Bits: [63] [62] [61..32] [31 ..  0]</div><div class='add'>+ *         [ 1] [ L] [   R  ] [    V   ]</div><div class='add'>+ *</div><div class='add'>+ *    1: 1 for built-in DSQs.</div><div class='add'>+ *    L: 1 for LOCAL_ON DSQ IDs, 0 for others</div><div class='add'>+ *    V: For LOCAL_ON DSQ IDs, a CPU number. For others, a pre-defined value.</div><div class='add'>+ */</div><div class='add'>+enum scx_dsq_id_flags {</div><div class='add'>+	SCX_DSQ_FLAG_BUILTIN	= 1LLU &lt;&lt; 63,</div><div class='add'>+	SCX_DSQ_FLAG_LOCAL_ON	= 1LLU &lt;&lt; 62,</div><div class='add'>+</div><div class='add'>+	SCX_DSQ_INVALID		= SCX_DSQ_FLAG_BUILTIN | 0,</div><div class='add'>+	SCX_DSQ_GLOBAL		= SCX_DSQ_FLAG_BUILTIN | 1,</div><div class='add'>+	SCX_DSQ_LOCAL		= SCX_DSQ_FLAG_BUILTIN | 2,</div><div class='add'>+	SCX_DSQ_BYPASS		= SCX_DSQ_FLAG_BUILTIN | 3,</div><div class='add'>+	SCX_DSQ_LOCAL_ON	= SCX_DSQ_FLAG_BUILTIN | SCX_DSQ_FLAG_LOCAL_ON,</div><div class='add'>+	SCX_DSQ_LOCAL_CPU_MASK	= 0xffffffffLLU,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A dispatch queue (DSQ) can be either a FIFO or p-&gt;scx.dsq_vtime ordered</div><div class='add'>+ * queue. A built-in DSQ is always a FIFO. The built-in local DSQs are used to</div><div class='add'>+ * buffer between the scheduler core and the BPF scheduler. See the</div><div class='add'>+ * documentation for more details.</div><div class='add'>+ */</div><div class='add'>+struct scx_dispatch_q {</div><div class='add'>+	raw_spinlock_t		lock;</div><div class='add'>+	struct task_struct __rcu *first_task; /* lockless peek at head */</div><div class='add'>+	struct list_head	list;	/* tasks in dispatch order */</div><div class='add'>+	struct rb_root		priq;	/* used to order by p-&gt;scx.dsq_vtime */</div><div class='add'>+	u32			nr;</div><div class='add'>+	u32			seq;	/* used by BPF iter */</div><div class='add'>+	u64			id;</div><div class='add'>+	struct rhash_head	hash_node;</div><div class='add'>+	struct llist_node	free_node;</div><div class='add'>+	struct rcu_head		rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* scx_entity.flags */</div><div class='add'>+enum scx_ent_flags {</div><div class='add'>+	SCX_TASK_QUEUED		= 1 &lt;&lt; 0, /* on ext runqueue */</div><div class='add'>+	SCX_TASK_RESET_RUNNABLE_AT = 1 &lt;&lt; 2, /* runnable_at should be reset */</div><div class='add'>+	SCX_TASK_DEQD_FOR_SLEEP	= 1 &lt;&lt; 3, /* last dequeue was for SLEEP */</div><div class='add'>+</div><div class='add'>+	SCX_TASK_STATE_SHIFT	= 8,	  /* bit 8 and 9 are used to carry scx_task_state */</div><div class='add'>+	SCX_TASK_STATE_BITS	= 2,</div><div class='add'>+	SCX_TASK_STATE_MASK	= ((1 &lt;&lt; SCX_TASK_STATE_BITS) - 1) &lt;&lt; SCX_TASK_STATE_SHIFT,</div><div class='add'>+</div><div class='add'>+	SCX_TASK_CURSOR		= 1 &lt;&lt; 31, /* iteration cursor, not a task */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* scx_entity.flags &amp; SCX_TASK_STATE_MASK */</div><div class='add'>+enum scx_task_state {</div><div class='add'>+	SCX_TASK_NONE,		/* ops.init_task() not called yet */</div><div class='add'>+	SCX_TASK_INIT,		/* ops.init_task() succeeded, but task can be cancelled */</div><div class='add'>+	SCX_TASK_READY,		/* fully initialized, but not in sched_ext */</div><div class='add'>+	SCX_TASK_ENABLED,	/* fully initialized and in sched_ext */</div><div class='add'>+</div><div class='add'>+	SCX_TASK_NR_STATES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* scx_entity.dsq_flags */</div><div class='add'>+enum scx_ent_dsq_flags {</div><div class='add'>+	SCX_TASK_DSQ_ON_PRIQ	= 1 &lt;&lt; 0, /* task is queued on the priority queue of a dsq */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mask bits for scx_entity.kf_mask. Not all kfuncs can be called from</div><div class='add'>+ * everywhere and the following bits track which kfunc sets are currently</div><div class='add'>+ * allowed for %current. This simple per-task tracking works because SCX ops</div><div class='add'>+ * nest in a limited way. BPF will likely implement a way to allow and disallow</div><div class='add'>+ * kfuncs depending on the calling context which will replace this manual</div><div class='add'>+ * mechanism. See scx_kf_allow().</div><div class='add'>+ */</div><div class='add'>+enum scx_kf_mask {</div><div class='add'>+	SCX_KF_UNLOCKED		= 0,	  /* sleepable and not rq locked */</div><div class='add'>+	/* ENQUEUE and DISPATCH may be nested inside CPU_RELEASE */</div><div class='add'>+	SCX_KF_CPU_RELEASE	= 1 &lt;&lt; 0, /* ops.cpu_release() */</div><div class='add'>+	/*</div><div class='add'>+	 * ops.dispatch() may release rq lock temporarily and thus ENQUEUE and</div><div class='add'>+	 * SELECT_CPU may be nested inside. ops.dequeue (in REST) may also be</div><div class='add'>+	 * nested inside DISPATCH.</div><div class='add'>+	 */</div><div class='add'>+	SCX_KF_DISPATCH		= 1 &lt;&lt; 1, /* ops.dispatch() */</div><div class='add'>+	SCX_KF_ENQUEUE		= 1 &lt;&lt; 2, /* ops.enqueue() and ops.select_cpu() */</div><div class='add'>+	SCX_KF_SELECT_CPU	= 1 &lt;&lt; 3, /* ops.select_cpu() */</div><div class='add'>+	SCX_KF_REST		= 1 &lt;&lt; 4, /* other rq-locked operations */</div><div class='add'>+</div><div class='add'>+	__SCX_KF_RQ_LOCKED	= SCX_KF_CPU_RELEASE | SCX_KF_DISPATCH |</div><div class='add'>+				  SCX_KF_ENQUEUE | SCX_KF_SELECT_CPU | SCX_KF_REST,</div><div class='add'>+	__SCX_KF_TERMINAL	= SCX_KF_ENQUEUE | SCX_KF_SELECT_CPU | SCX_KF_REST,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum scx_dsq_lnode_flags {</div><div class='add'>+	SCX_DSQ_LNODE_ITER_CURSOR = 1 &lt;&lt; 0,</div><div class='add'>+</div><div class='add'>+	/* high 16 bits can be for iter cursor flags */</div><div class='add'>+	__SCX_DSQ_LNODE_PRIV_SHIFT = 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scx_dsq_list_node {</div><div class='add'>+	struct list_head	node;</div><div class='add'>+	u32			flags;</div><div class='add'>+	u32			priv;		/* can be used by iter cursor */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define INIT_DSQ_LIST_CURSOR(__node, __flags, __priv)				\</div><div class='add'>+	(struct scx_dsq_list_node) {						\</div><div class='add'>+		.node = LIST_HEAD_INIT((__node).node),				\</div><div class='add'>+		.flags = SCX_DSQ_LNODE_ITER_CURSOR | (__flags),			\</div><div class='add'>+		.priv = (__priv),						\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following is embedded in task_struct and contains all fields necessary</div><div class='add'>+ * for a task to be scheduled by SCX.</div><div class='add'>+ */</div><div class='add'>+struct sched_ext_entity {</div><div class='add'>+	struct scx_dispatch_q	*dsq;</div><div class='add'>+	struct scx_dsq_list_node dsq_list;	/* dispatch order */</div><div class='add'>+	struct rb_node		dsq_priq;	/* p-&gt;scx.dsq_vtime order */</div><div class='add'>+	u32			dsq_seq;</div><div class='add'>+	u32			dsq_flags;	/* protected by DSQ lock */</div><div class='add'>+	u32			flags;		/* protected by rq lock */</div><div class='add'>+	u32			weight;</div><div class='add'>+	s32			sticky_cpu;</div><div class='add'>+	s32			holding_cpu;</div><div class='add'>+	s32			selected_cpu;</div><div class='add'>+	u32			kf_mask;	/* see scx_kf_mask above */</div><div class='add'>+	struct task_struct	*kf_tasks[2];	/* see SCX_CALL_OP_TASK() */</div><div class='add'>+	atomic_long_t		ops_state;</div><div class='add'>+</div><div class='add'>+	struct list_head	runnable_node;	/* rq-&gt;scx.runnable_list */</div><div class='add'>+	unsigned long		runnable_at;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SCHED_CORE</div><div class='add'>+	u64			core_sched_at;	/* see scx_prio_less() */</div><div class='add'>+#endif</div><div class='add'>+	u64			ddsp_dsq_id;</div><div class='add'>+	u64			ddsp_enq_flags;</div><div class='add'>+</div><div class='add'>+	/* BPF scheduler modifiable fields */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Runtime budget in nsecs. This is usually set through</div><div class='add'>+	 * scx_bpf_dsq_insert() but can also be modified directly by the BPF</div><div class='add'>+	 * scheduler. Automatically decreased by SCX as the task executes. On</div><div class='add'>+	 * depletion, a scheduling event is triggered.</div><div class='add'>+	 *</div><div class='add'>+	 * This value is cleared to zero if the task is preempted by</div><div class='add'>+	 * %SCX_KICK_PREEMPT and shouldn't be used to determine how long the</div><div class='add'>+	 * task ran. Use p-&gt;se.sum_exec_runtime instead.</div><div class='add'>+	 */</div><div class='add'>+	u64			slice;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Used to order tasks when dispatching to the vtime-ordered priority</div><div class='add'>+	 * queue of a dsq. This is usually set through</div><div class='add'>+	 * scx_bpf_dsq_insert_vtime() but can also be modified directly by the</div><div class='add'>+	 * BPF scheduler. Modifying it while a task is queued on a dsq may</div><div class='add'>+	 * mangle the ordering and is not recommended.</div><div class='add'>+	 */</div><div class='add'>+	u64			dsq_vtime;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If set, reject future sched_setscheduler(2) calls updating the policy</div><div class='add'>+	 * to %SCHED_EXT with -%EACCES.</div><div class='add'>+	 *</div><div class='add'>+	 * Can be set from ops.init_task() while the BPF scheduler is being</div><div class='add'>+	 * loaded (!scx_init_task_args-&gt;fork). If set and the task's policy is</div><div class='add'>+	 * already %SCHED_EXT, the task's policy is rejected and forcefully</div><div class='add'>+	 * reverted to %SCHED_NORMAL. The number of such events are reported</div><div class='add'>+	 * through /sys/kernel/debug/sched_ext::nr_rejected. Setting this flag</div><div class='add'>+	 * during fork is not allowed.</div><div class='add'>+	 */</div><div class='add'>+	bool			disallow;	/* reject switching into SCX */</div><div class='add'>+</div><div class='add'>+	/* cold fields */</div><div class='add'>+#ifdef CONFIG_EXT_GROUP_SCHED</div><div class='add'>+	struct cgroup		*cgrp_moving_from;</div><div class='add'>+#endif</div><div class='add'>+	struct list_head	tasks_node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void sched_ext_dead(struct task_struct *p);</div><div class='add'>+void print_scx_info(const char *log_lvl, struct task_struct *p);</div><div class='add'>+void scx_softlockup(u32 dur_s);</div><div class='add'>+bool scx_hardlockup(int cpu);</div><div class='add'>+bool scx_rcu_cpu_stall(void);</div><div class='add'>+</div><div class='add'>+#else	/* !CONFIG_SCHED_CLASS_EXT */</div><div class='add'>+</div><div class='add'>+static inline void sched_ext_dead(struct task_struct *p) {}</div><div class='add'>+static inline void print_scx_info(const char *log_lvl, struct task_struct *p) {}</div><div class='add'>+static inline void scx_softlockup(u32 dur_s) {}</div><div class='add'>+static inline bool scx_hardlockup(int cpu) { return false; }</div><div class='add'>+static inline bool scx_rcu_cpu_stall(void) { return false; }</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG_SCHED_CLASS_EXT */</div><div class='add'>+</div><div class='add'>+struct scx_task_group {</div><div class='add'>+#ifdef CONFIG_EXT_GROUP_SCHED</div><div class='add'>+	u32			flags;		/* SCX_TG_* */</div><div class='add'>+	u32			weight;</div><div class='add'>+	u64			bw_period_us;</div><div class='add'>+	u64			bw_quota_us;</div><div class='add'>+	u64			bw_burst_us;</div><div class='add'>+	bool			idle;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif	/* _LINUX_SCHED_EXT_H */</div><div class='head'>diff --git a/include/linux/sched/hotplug.h b/include/linux/sched/hotplug.h<br/>index 412cdaba33eb..17e04859b9a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/hotplug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/hotplug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/hotplug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/hotplug.h</a></div><div class='hunk'>@@ -18,10 +18,6 @@ extern int sched_cpu_dying(unsigned int cpu);</div><div class='ctx'> # define sched_cpu_dying	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-extern void idle_task_exit(void);</div><div class='del'>-#else</div><div class='ctx'> static inline void idle_task_exit(void) {}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_SCHED_HOTPLUG_H */</div><div class='head'>diff --git a/include/linux/sched/idle.h b/include/linux/sched/idle.h<br/>index 478084f9105e..8465ff1f20d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/idle.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/idle.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/idle.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/idle.h</a></div><div class='hunk'>@@ -5,17 +5,13 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum cpu_idle_type {</div><div class='add'>+	__CPU_NOT_IDLE = 0,</div><div class='ctx'> 	CPU_IDLE,</div><div class='del'>-	CPU_NOT_IDLE,</div><div class='ctx'> 	CPU_NEWLY_IDLE,</div><div class='ctx'> 	CPU_MAX_IDLE_TYPES</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> extern void wake_up_if_idle(int cpu);</div><div class='del'>-#else</div><div class='del'>-static inline void wake_up_if_idle(int cpu) { }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Idle thread specific functions to determine the need_resched</div><div class='hunk'>@@ -79,6 +75,21 @@ static __always_inline bool __must_check current_clr_polling_and_test(void)</div><div class='ctx'> 	return unlikely(tif_need_resched());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __always_inline void current_clr_polling(void)</div><div class='add'>+{</div><div class='add'>+	__current_clr_polling();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure we check TIF_NEED_RESCHED after we clear the polling bit.</div><div class='add'>+	 * Once the bit is cleared, we'll get IPIs with every new</div><div class='add'>+	 * TIF_NEED_RESCHED and the IPI handler, scheduler_ipi(), will also</div><div class='add'>+	 * fold.</div><div class='add'>+	 */</div><div class='add'>+	smp_mb__after_atomic(); /* paired with resched_curr() */</div><div class='add'>+</div><div class='add'>+	preempt_fold_need_resched();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> static inline void __current_set_polling(void) { }</div><div class='ctx'> static inline void __current_clr_polling(void) { }</div><div class='hunk'>@@ -91,21 +102,15 @@ static inline bool __must_check current_clr_polling_and_test(void)</div><div class='ctx'> {</div><div class='ctx'> 	return unlikely(tif_need_resched());</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static __always_inline void current_clr_polling(void)</div><div class='ctx'> {</div><div class='ctx'> 	__current_clr_polling();</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Ensure we check TIF_NEED_RESCHED after we clear the polling bit.</div><div class='del'>-	 * Once the bit is cleared, we'll get IPIs with every new</div><div class='del'>-	 * TIF_NEED_RESCHED and the IPI handler, scheduler_ipi(), will also</div><div class='del'>-	 * fold.</div><div class='del'>-	 */</div><div class='ctx'> 	smp_mb(); /* paired with resched_curr() */</div><div class='ctx'> </div><div class='ctx'> 	preempt_fold_need_resched();</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_SCHED_IDLE_H */</div><div class='head'>diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h<br/>index 2b461129d1fa..d8501f4709b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/isolation.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/isolation.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/isolation.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/isolation.h</a></div><div class='hunk'>@@ -7,16 +7,21 @@</div><div class='ctx'> #include &lt;linux/tick.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum hk_type {</div><div class='del'>-	HK_TYPE_TIMER,</div><div class='del'>-	HK_TYPE_RCU,</div><div class='del'>-	HK_TYPE_MISC,</div><div class='del'>-	HK_TYPE_SCHED,</div><div class='del'>-	HK_TYPE_TICK,</div><div class='ctx'> 	HK_TYPE_DOMAIN,</div><div class='del'>-	HK_TYPE_WQ,</div><div class='ctx'> 	HK_TYPE_MANAGED_IRQ,</div><div class='del'>-	HK_TYPE_KTHREAD,</div><div class='del'>-	HK_TYPE_MAX</div><div class='add'>+	HK_TYPE_KERNEL_NOISE,</div><div class='add'>+	HK_TYPE_MAX,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The following housekeeping types are only set by the nohz_full</div><div class='add'>+	 * boot commandline option. So they can share the same value.</div><div class='add'>+	 */</div><div class='add'>+	HK_TYPE_TICK    = HK_TYPE_KERNEL_NOISE,</div><div class='add'>+	HK_TYPE_TIMER   = HK_TYPE_KERNEL_NOISE,</div><div class='add'>+	HK_TYPE_RCU     = HK_TYPE_KERNEL_NOISE,</div><div class='add'>+	HK_TYPE_MISC    = HK_TYPE_KERNEL_NOISE,</div><div class='add'>+	HK_TYPE_WQ      = HK_TYPE_KERNEL_NOISE,</div><div class='add'>+	HK_TYPE_KTHREAD = HK_TYPE_KERNEL_NOISE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_ISOLATION</div><div class='head'>diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h<br/>index 9a19f1b42f64..0e1d73955fa5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/mm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/mm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/mm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/mm.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/sync_core.h&gt;</div><div class='add'>+#include &lt;linux/sched/coredump.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Routines for handling mm_structs</div><div class='hunk'>@@ -139,7 +140,7 @@ static inline bool mmget_not_zero(struct mm_struct *mm)</div><div class='ctx'> </div><div class='ctx'> /* mmput gets rid of the mappings and all user-space */</div><div class='ctx'> extern void mmput(struct mm_struct *);</div><div class='del'>-#ifdef CONFIG_MMU</div><div class='add'>+#if defined(CONFIG_MMU) || defined(CONFIG_FUTEX_PRIVATE_HASH)</div><div class='ctx'> /* same as above but performs the slow path from the async context. Can</div><div class='ctx'>  * be called from the atomic context as well</div><div class='ctx'>  */</div><div class='hunk'>@@ -177,26 +178,39 @@ static inline void mm_update_next_owner(struct mm_struct *mm)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern void arch_pick_mmap_layout(struct mm_struct *mm,</div><div class='del'>-				  struct rlimit *rlim_stack);</div><div class='del'>-extern unsigned long</div><div class='del'>-arch_get_unmapped_area(struct file *, unsigned long, unsigned long,</div><div class='del'>-		       unsigned long, unsigned long);</div><div class='del'>-extern unsigned long</div><div class='add'>+				  const struct rlimit *rlim_stack);</div><div class='add'>+</div><div class='add'>+unsigned long</div><div class='add'>+arch_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='add'>+		       unsigned long len, unsigned long pgoff,</div><div class='add'>+		       unsigned long flags, vm_flags_t vm_flags);</div><div class='add'>+unsigned long</div><div class='ctx'> arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,</div><div class='del'>-			  unsigned long len, unsigned long pgoff,</div><div class='del'>-			  unsigned long flags);</div><div class='add'>+			       unsigned long len, unsigned long pgoff,</div><div class='add'>+			       unsigned long flags, vm_flags_t);</div><div class='add'>+</div><div class='add'>+unsigned long mm_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='add'>+				   unsigned long len, unsigned long pgoff,</div><div class='add'>+				   unsigned long flags);</div><div class='add'>+</div><div class='add'>+unsigned long mm_get_unmapped_area_vmflags(struct file *filp,</div><div class='add'>+					   unsigned long addr,</div><div class='add'>+					   unsigned long len,</div><div class='add'>+					   unsigned long pgoff,</div><div class='add'>+					   unsigned long flags,</div><div class='add'>+					   vm_flags_t vm_flags);</div><div class='ctx'> </div><div class='ctx'> unsigned long</div><div class='ctx'> generic_get_unmapped_area(struct file *filp, unsigned long addr,</div><div class='ctx'> 			  unsigned long len, unsigned long pgoff,</div><div class='del'>-			  unsigned long flags);</div><div class='add'>+			  unsigned long flags, vm_flags_t vm_flags);</div><div class='ctx'> unsigned long</div><div class='ctx'> generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr,</div><div class='ctx'> 				  unsigned long len, unsigned long pgoff,</div><div class='del'>-				  unsigned long flags);</div><div class='add'>+				  unsigned long flags, vm_flags_t vm_flags);</div><div class='ctx'> #else</div><div class='ctx'> static inline void arch_pick_mmap_layout(struct mm_struct *mm,</div><div class='del'>-					 struct rlimit *rlim_stack) {}</div><div class='add'>+					 const struct rlimit *rlim_stack) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static inline bool in_vfork(struct task_struct *tsk)</div><div class='hunk'>@@ -303,10 +317,31 @@ static inline void might_alloc(gfp_t gfp_mask)</div><div class='ctx'> 	fs_reclaim_acquire(gfp_mask);</div><div class='ctx'> 	fs_reclaim_release(gfp_mask);</div><div class='ctx'> </div><div class='add'>+	if (current-&gt;flags &amp; PF_MEMALLOC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	might_sleep_if(gfpflags_allow_blocking(gfp_mask));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * memalloc_flags_save - Add a PF_* flag to current-&gt;flags, save old value</div><div class='add'>+ *</div><div class='add'>+ * This allows PF_* flags to be conveniently added, irrespective of current</div><div class='add'>+ * value, and then the old version restored with memalloc_flags_restore().</div><div class='add'>+ */</div><div class='add'>+static inline unsigned memalloc_flags_save(unsigned flags)</div><div class='add'>+{</div><div class='add'>+	unsigned oldflags = ~current-&gt;flags &amp; flags;</div><div class='add'>+	current-&gt;flags |= flags;</div><div class='add'>+	return oldflags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void memalloc_flags_restore(unsigned flags)</div><div class='add'>+{</div><div class='add'>+	current-&gt;flags &amp;= ~flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * memalloc_noio_save - Marks implicit GFP_NOIO allocation scope.</div><div class='ctx'>  *</div><div class='ctx'>  * This functions marks the beginning of the GFP_NOIO allocation scope.</div><div class='hunk'>@@ -315,13 +350,12 @@ static inline void might_alloc(gfp_t gfp_mask)</div><div class='ctx'>  * point of view. Use memalloc_noio_restore to end the scope with flags</div><div class='ctx'>  * returned by this function.</div><div class='ctx'>  *</div><div class='del'>- * This function is safe to be used from any context.</div><div class='add'>+ * Context: This function is safe to be used from any context.</div><div class='add'>+ * Return: The saved flags to be passed to memalloc_noio_restore.</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned int memalloc_noio_save(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int flags = current-&gt;flags &amp; PF_MEMALLOC_NOIO;</div><div class='del'>-	current-&gt;flags |= PF_MEMALLOC_NOIO;</div><div class='del'>-	return flags;</div><div class='add'>+	return memalloc_flags_save(PF_MEMALLOC_NOIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -334,7 +368,7 @@ static inline unsigned int memalloc_noio_save(void)</div><div class='ctx'>  */</div><div class='ctx'> static inline void memalloc_noio_restore(unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	current-&gt;flags = (current-&gt;flags &amp; ~PF_MEMALLOC_NOIO) | flags;</div><div class='add'>+	memalloc_flags_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -346,13 +380,12 @@ static inline void memalloc_noio_restore(unsigned int flags)</div><div class='ctx'>  * point of view. Use memalloc_nofs_restore to end the scope with flags</div><div class='ctx'>  * returned by this function.</div><div class='ctx'>  *</div><div class='del'>- * This function is safe to be used from any context.</div><div class='add'>+ * Context: This function is safe to be used from any context.</div><div class='add'>+ * Return: The saved flags to be passed to memalloc_nofs_restore.</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned int memalloc_nofs_save(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int flags = current-&gt;flags &amp; PF_MEMALLOC_NOFS;</div><div class='del'>-	current-&gt;flags |= PF_MEMALLOC_NOFS;</div><div class='del'>-	return flags;</div><div class='add'>+	return memalloc_flags_save(PF_MEMALLOC_NOFS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -365,32 +398,76 @@ static inline unsigned int memalloc_nofs_save(void)</div><div class='ctx'>  */</div><div class='ctx'> static inline void memalloc_nofs_restore(unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	current-&gt;flags = (current-&gt;flags &amp; ~PF_MEMALLOC_NOFS) | flags;</div><div class='add'>+	memalloc_flags_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memalloc_noreclaim_save - Marks implicit __GFP_MEMALLOC scope.</div><div class='add'>+ *</div><div class='add'>+ * This function marks the beginning of the __GFP_MEMALLOC allocation scope.</div><div class='add'>+ * All further allocations will implicitly add the __GFP_MEMALLOC flag, which</div><div class='add'>+ * prevents entering reclaim and allows access to all memory reserves. This</div><div class='add'>+ * should only be used when the caller guarantees the allocation will allow more</div><div class='add'>+ * memory to be freed very shortly, i.e. it needs to allocate some memory in</div><div class='add'>+ * the process of freeing memory, and cannot reclaim due to potential recursion.</div><div class='add'>+ *</div><div class='add'>+ * Users of this scope have to be extremely careful to not deplete the reserves</div><div class='add'>+ * completely and implement a throttling mechanism which controls the</div><div class='add'>+ * consumption of the reserve based on the amount of freed memory. Usage of a</div><div class='add'>+ * pre-allocated pool (e.g. mempool) should be always considered before using</div><div class='add'>+ * this scope.</div><div class='add'>+ *</div><div class='add'>+ * Individual allocations under the scope can opt out using __GFP_NOMEMALLOC</div><div class='add'>+ *</div><div class='add'>+ * Context: This function should not be used in an interrupt context as that one</div><div class='add'>+ *          does not give PF_MEMALLOC access to reserves.</div><div class='add'>+ *          See __gfp_pfmemalloc_flags().</div><div class='add'>+ * Return: The saved flags to be passed to memalloc_noreclaim_restore.</div><div class='add'>+ */</div><div class='ctx'> static inline unsigned int memalloc_noreclaim_save(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int flags = current-&gt;flags &amp; PF_MEMALLOC;</div><div class='del'>-	current-&gt;flags |= PF_MEMALLOC;</div><div class='del'>-	return flags;</div><div class='add'>+	return memalloc_flags_save(PF_MEMALLOC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memalloc_noreclaim_restore - Ends the implicit __GFP_MEMALLOC scope.</div><div class='add'>+ * @flags: Flags to restore.</div><div class='add'>+ *</div><div class='add'>+ * Ends the implicit __GFP_MEMALLOC scope started by memalloc_noreclaim_save</div><div class='add'>+ * function. Always make sure that the given flags is the return value from the</div><div class='add'>+ * pairing memalloc_noreclaim_save call.</div><div class='add'>+ */</div><div class='ctx'> static inline void memalloc_noreclaim_restore(unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	current-&gt;flags = (current-&gt;flags &amp; ~PF_MEMALLOC) | flags;</div><div class='add'>+	memalloc_flags_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memalloc_pin_save - Marks implicit ~__GFP_MOVABLE scope.</div><div class='add'>+ *</div><div class='add'>+ * This function marks the beginning of the ~__GFP_MOVABLE allocation scope.</div><div class='add'>+ * All further allocations will implicitly remove the __GFP_MOVABLE flag, which</div><div class='add'>+ * will constraint the allocations to zones that allow long term pinning, i.e.</div><div class='add'>+ * not ZONE_MOVABLE zones.</div><div class='add'>+ *</div><div class='add'>+ * Return: The saved flags to be passed to memalloc_pin_restore.</div><div class='add'>+ */</div><div class='ctx'> static inline unsigned int memalloc_pin_save(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int flags = current-&gt;flags &amp; PF_MEMALLOC_PIN;</div><div class='del'>-</div><div class='del'>-	current-&gt;flags |= PF_MEMALLOC_PIN;</div><div class='del'>-	return flags;</div><div class='add'>+	return memalloc_flags_save(PF_MEMALLOC_PIN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * memalloc_pin_restore - Ends the implicit ~__GFP_MOVABLE scope.</div><div class='add'>+ * @flags: Flags to restore.</div><div class='add'>+ *</div><div class='add'>+ * Ends the implicit ~__GFP_MOVABLE scope started by memalloc_pin_save function.</div><div class='add'>+ * Always make sure that the given flags is the return value from the pairing</div><div class='add'>+ * memalloc_pin_save call.</div><div class='add'>+ */</div><div class='ctx'> static inline void memalloc_pin_restore(unsigned int flags)</div><div class='ctx'> {</div><div class='del'>-	current-&gt;flags = (current-&gt;flags &amp; ~PF_MEMALLOC_PIN) | flags;</div><div class='add'>+	memalloc_flags_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMCG</div><div class='hunk'>@@ -456,6 +533,13 @@ enum {</div><div class='ctx'> </div><div class='ctx'> static inline void membarrier_mm_sync_core_before_usermode(struct mm_struct *mm)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * The atomic_read() below prevents CSE. The following should</div><div class='add'>+	 * help the compiler generate more efficient code on architectures</div><div class='add'>+	 * where sync_core_before_usermode() is a no-op.</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_ENABLED(CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE))</div><div class='add'>+		return;</div><div class='ctx'> 	if (current-&gt;mm != mm)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (likely(!(atomic_read(&amp;mm-&gt;membarrier_state) &amp;</div><div class='head'>diff --git a/include/linux/sched/nohz.h b/include/linux/sched/nohz.h<br/>index 6d67e9a5af6b..0db7f67935fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/nohz.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/nohz.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/nohz.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/nohz.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * This is the interface between the scheduler and nohz/dynticks:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_NO_HZ_COMMON)</div><div class='add'>+#ifdef CONFIG_NO_HZ_COMMON</div><div class='ctx'> extern void nohz_balance_enter_idle(int cpu);</div><div class='ctx'> extern int get_nohz_timer_target(void);</div><div class='ctx'> #else</div><div class='hunk'>@@ -23,7 +23,7 @@ static inline void calc_load_nohz_remote(struct rq *rq) { }</div><div class='ctx'> static inline void calc_load_nohz_stop(void) { }</div><div class='ctx'> #endif /* CONFIG_NO_HZ_COMMON */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_NO_HZ_COMMON) &amp;&amp; defined(CONFIG_SMP)</div><div class='add'>+#ifdef CONFIG_NO_HZ_COMMON</div><div class='ctx'> extern void wake_up_nohz_cpu(int cpu);</div><div class='ctx'> #else</div><div class='ctx'> static inline void wake_up_nohz_cpu(int cpu) { }</div><div class='head'>diff --git a/include/linux/sched/prio.h b/include/linux/sched/prio.h<br/>index ab83d85e1183..6ab43b4f72f9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/prio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/prio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/prio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/prio.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define MAX_RT_PRIO		100</div><div class='add'>+#define MAX_DL_PRIO		0</div><div class='ctx'> </div><div class='ctx'> #define MAX_PRIO		(MAX_RT_PRIO + NICE_WIDTH)</div><div class='ctx'> #define DEFAULT_PRIO		(MAX_RT_PRIO + NICE_WIDTH / 2)</div><div class='head'>diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h<br/>index b2b9e6eb9683..4e3338103654 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/rt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/rt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/rt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/rt.h</a></div><div class='hunk'>@@ -6,19 +6,40 @@</div><div class='ctx'> </div><div class='ctx'> struct task_struct;</div><div class='ctx'> </div><div class='del'>-static inline int rt_prio(int prio)</div><div class='add'>+static inline bool rt_prio(int prio)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(prio &lt; MAX_RT_PRIO))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+	return unlikely(prio &lt; MAX_RT_PRIO &amp;&amp; prio &gt;= MAX_DL_PRIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int rt_task(struct task_struct *p)</div><div class='add'>+static inline bool rt_or_dl_prio(int prio)</div><div class='add'>+{</div><div class='add'>+	return unlikely(prio &lt; MAX_RT_PRIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if a task has a priority that belongs to RT class. PI-boosted</div><div class='add'>+ * tasks will return true. Use rt_policy() to ignore PI-boosted tasks.</div><div class='add'>+ */</div><div class='add'>+static inline bool rt_task(struct task_struct *p)</div><div class='ctx'> {</div><div class='ctx'> 	return rt_prio(p-&gt;prio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool task_is_realtime(struct task_struct *tsk)</div><div class='add'>+/*</div><div class='add'>+ * Returns true if a task has a priority that belongs to RT or DL classes.</div><div class='add'>+ * PI-boosted tasks will return true. Use rt_or_dl_task_policy() to ignore</div><div class='add'>+ * PI-boosted tasks.</div><div class='add'>+ */</div><div class='add'>+static inline bool rt_or_dl_task(struct task_struct *p)</div><div class='add'>+{</div><div class='add'>+	return rt_or_dl_prio(p-&gt;prio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if a task has a policy that belongs to RT or DL classes.</div><div class='add'>+ * PI-boosted tasks will return false.</div><div class='add'>+ */</div><div class='add'>+static inline bool rt_or_dl_task_policy(struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	int policy = tsk-&gt;policy;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/sched/sd_flags.h b/include/linux/sched/sd_flags.h<br/>index b04a5d04dee9..42839cfa2778 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/sd_flags.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/sd_flags.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/sd_flags.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/sd_flags.h</a></div><div class='hunk'>@@ -154,14 +154,6 @@ SD_FLAG(SD_ASYM_PACKING, SDF_NEEDS_GROUPS)</div><div class='ctx'> SD_FLAG(SD_PREFER_SIBLING, SDF_NEEDS_GROUPS)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * sched_groups of this level overlap</div><div class='del'>- *</div><div class='del'>- * SHARED_PARENT: Set for all NUMA levels above NODE.</div><div class='del'>- * NEEDS_GROUPS: Overlaps can only exist with more than one group.</div><div class='del'>- */</div><div class='del'>-SD_FLAG(SD_OVERLAP, SDF_SHARED_PARENT | SDF_NEEDS_GROUPS)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Cross-node balancing</div><div class='ctx'>  *</div><div class='ctx'>  * SHARED_PARENT: Set for all NUMA levels above NODE.</div><div class='head'>diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h<br/>index 0a0e23c45406..7d6449982822 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/signal.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/signal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/signal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/signal.h</a></div><div class='hunk'>@@ -136,8 +136,10 @@ struct signal_struct {</div><div class='ctx'> #ifdef CONFIG_POSIX_TIMERS</div><div class='ctx'> </div><div class='ctx'> 	/* POSIX.1b Interval Timers */</div><div class='del'>-	unsigned int		next_posix_timer_id;</div><div class='del'>-	struct list_head	posix_timers;</div><div class='add'>+	unsigned int		timer_create_restore_ids:1;</div><div class='add'>+	atomic_t		next_posix_timer_id;</div><div class='add'>+	struct hlist_head	posix_timers;</div><div class='add'>+	struct hlist_head	ignored_posix_timers;</div><div class='ctx'> </div><div class='ctx'> 	/* ITIMER_REAL timer for the process */</div><div class='ctx'> 	struct hrtimer real_timer;</div><div class='hunk'>@@ -224,6 +226,10 @@ struct signal_struct {</div><div class='ctx'> 	struct tty_audit_buf *tty_audit_buf;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CGROUPS</div><div class='add'>+	struct rw_semaphore cgroup_threadgroup_rwsem;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Thread is the potential origin of an oom condition; kill first on</div><div class='ctx'> 	 * oom</div><div class='hunk'>@@ -276,8 +282,7 @@ static inline void signal_set_stop_flags(struct signal_struct *sig,</div><div class='ctx'> extern void flush_signals(struct task_struct *);</div><div class='ctx'> extern void ignore_signals(struct task_struct *);</div><div class='ctx'> extern void flush_signal_handlers(struct task_struct *, int force_default);</div><div class='del'>-extern int dequeue_signal(struct task_struct *task, sigset_t *mask,</div><div class='del'>-			  kernel_siginfo_t *info, enum pid_type *type);</div><div class='add'>+extern int dequeue_signal(sigset_t *mask, kernel_siginfo_t *info, enum pid_type *type);</div><div class='ctx'> </div><div class='ctx'> static inline int kernel_dequeue_signal(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -287,7 +292,7 @@ static inline int kernel_dequeue_signal(void)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;task-&gt;sighand-&gt;siglock);</div><div class='del'>-	ret = dequeue_signal(task, &amp;task-&gt;blocked, &amp;__info, &amp;__type);</div><div class='add'>+	ret = dequeue_signal(&amp;task-&gt;blocked, &amp;__info, &amp;__type);</div><div class='ctx'> 	spin_unlock_irq(&amp;task-&gt;sighand-&gt;siglock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -339,9 +344,6 @@ extern void force_fatal_sig(int);</div><div class='ctx'> extern void force_exit_sig(int);</div><div class='ctx'> extern int send_sig(int, struct task_struct *, int);</div><div class='ctx'> extern int zap_other_threads(struct task_struct *p);</div><div class='del'>-extern struct sigqueue *sigqueue_alloc(void);</div><div class='del'>-extern void sigqueue_free(struct sigqueue *);</div><div class='del'>-extern int send_sigqueue(struct sigqueue *, struct pid *, enum pid_type);</div><div class='ctx'> extern int do_sigaction(int, struct k_sigaction *, struct k_sigaction *);</div><div class='ctx'> </div><div class='ctx'> static inline void clear_notify_signal(void)</div><div class='head'>diff --git a/include/linux/sched/smt.h b/include/linux/sched/smt.h<br/>index fb1e295e7e63..166b19af956f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/smt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/smt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/smt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/smt.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@ static __always_inline bool sched_smt_active(void)</div><div class='ctx'> 	return static_branch_likely(&amp;sched_smt_present);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline bool sched_smt_active(void) { return false; }</div><div class='add'>+static __always_inline bool sched_smt_active(void) { return false; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void arch_smt_update(void);</div><div class='head'>diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h<br/>index d362aacf9f89..525aa2a632b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/task.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/task.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/task.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/task.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@ struct kernel_clone_args {</div><div class='ctx'> 	void *fn_arg;</div><div class='ctx'> 	struct cgroup *cgrp;</div><div class='ctx'> 	struct css_set *cset;</div><div class='add'>+	unsigned int kill_seq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -62,8 +63,9 @@ extern int lockdep_tasklist_lock_is_held(void);</div><div class='ctx'> extern asmlinkage void schedule_tail(struct task_struct *prev);</div><div class='ctx'> extern void init_idle(struct task_struct *idle, int cpu);</div><div class='ctx'> </div><div class='del'>-extern int sched_fork(unsigned long clone_flags, struct task_struct *p);</div><div class='del'>-extern void sched_cgroup_fork(struct task_struct *p, struct kernel_clone_args *kargs);</div><div class='add'>+extern int sched_fork(u64 clone_flags, struct task_struct *p);</div><div class='add'>+extern int sched_cgroup_fork(struct task_struct *p, struct kernel_clone_args *kargs);</div><div class='add'>+extern void sched_cancel_fork(struct task_struct *p);</div><div class='ctx'> extern void sched_post_fork(struct task_struct *p);</div><div class='ctx'> extern void sched_dead(struct task_struct *p);</div><div class='ctx'> </div><div class='hunk'>@@ -107,11 +109,7 @@ int kernel_wait(pid_t pid, int *stat);</div><div class='ctx'> extern void free_task(struct task_struct *tsk);</div><div class='ctx'> </div><div class='ctx'> /* sched_exec is called by processes performing an exec */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> extern void sched_exec(void);</div><div class='del'>-#else</div><div class='del'>-#define sched_exec()   {}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static inline struct task_struct *get_task_struct(struct task_struct *t)</div><div class='ctx'> {</div><div class='hunk'>@@ -119,6 +117,11 @@ static inline struct task_struct *get_task_struct(struct task_struct *t)</div><div class='ctx'> 	return t;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct task_struct *tryget_task_struct(struct task_struct *t)</div><div class='add'>+{</div><div class='add'>+	return refcount_inc_not_zero(&amp;t-&gt;usage) ? t : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void __put_task_struct(struct task_struct *t);</div><div class='ctx'> extern void __put_task_struct_rcu_cb(struct rcu_head *rhp);</div><div class='ctx'> </div><div class='hunk'>@@ -128,24 +131,17 @@ static inline void put_task_struct(struct task_struct *t)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * In !RT, it is always safe to call __put_task_struct().</div><div class='del'>-	 * Under RT, we can only call it in preemptible context.</div><div class='del'>-	 */</div><div class='del'>-	if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible()) {</div><div class='del'>-		static DEFINE_WAIT_OVERRIDE_MAP(put_task_map, LD_WAIT_SLEEP);</div><div class='del'>-</div><div class='del'>-		lock_map_acquire_try(&amp;put_task_map);</div><div class='del'>-		__put_task_struct(t);</div><div class='del'>-		lock_map_release(&amp;put_task_map);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * under PREEMPT_RT, we can't call put_task_struct</div><div class='add'>+	 * Under PREEMPT_RT, we can't call __put_task_struct</div><div class='ctx'> 	 * in atomic context because it will indirectly</div><div class='del'>-	 * acquire sleeping locks.</div><div class='add'>+	 * acquire sleeping locks. The same is true if the</div><div class='add'>+	 * current process has a mutex enqueued (blocked on</div><div class='add'>+	 * a PI chain).</div><div class='add'>+	 *</div><div class='add'>+	 * In !RT, it is always safe to call __put_task_struct().</div><div class='add'>+	 * Though, in order to simplify the code, resort to the</div><div class='add'>+	 * deferred call too.</div><div class='ctx'> 	 *</div><div class='del'>-	 * call_rcu() will schedule delayed_put_task_struct_rcu()</div><div class='add'>+	 * call_rcu() will schedule __put_task_struct_rcu_cb()</div><div class='ctx'> 	 * to be called in process context.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * __put_task_struct() is called when</div><div class='hunk'>@@ -158,7 +154,7 @@ static inline void put_task_struct(struct task_struct *t)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * delayed_free_task() also uses -&gt;rcu, but it is only called</div><div class='ctx'> 	 * when it fails to fork a process. Therefore, there is no</div><div class='del'>-	 * way it can conflict with put_task_struct().</div><div class='add'>+	 * way it can conflict with __put_task_struct().</div><div class='ctx'> 	 */</div><div class='ctx'> 	call_rcu(&amp;t-&gt;rcu, __put_task_struct_rcu_cb);</div><div class='ctx'> }</div><div class='hunk'>@@ -214,9 +210,8 @@ static inline struct vm_struct *task_stack_vm_area(const struct task_struct *t)</div><div class='ctx'>  * pins the final release of task.io_context.  Also protects -&gt;cpuset and</div><div class='ctx'>  * -&gt;cgroup.subsys[]. And -&gt;vfork_done. And -&gt;sysvshm.shm_clist.</div><div class='ctx'>  *</div><div class='del'>- * Nests both inside and outside of read_lock(&amp;tasklist_lock).</div><div class='del'>- * It must not be nested with write_lock_irq(&amp;tasklist_lock),</div><div class='del'>- * neither inside nor outside.</div><div class='add'>+ * Nests inside of read_lock(&amp;tasklist_lock). It must not be nested with</div><div class='add'>+ * write_lock_irq(&amp;tasklist_lock), neither inside nor outside.</div><div class='ctx'>  */</div><div class='ctx'> static inline void task_lock(struct task_struct *p)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/sched/task_stack.h b/include/linux/sched/task_stack.h<br/>index ccd72b978e1f..1fab7e9043a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/task_stack.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/task_stack.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/task_stack.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/task_stack.h</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/magic.h&gt;</div><div class='ctx'> #include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;linux/kasan.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_THREAD_INFO_IN_TASK</div><div class='ctx'> </div><div class='hunk'>@@ -33,7 +34,7 @@ static __always_inline unsigned long *end_of_stack(const struct task_struct *tas</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#elif !defined(__HAVE_THREAD_FUNCTIONS)</div><div class='add'>+#else</div><div class='ctx'> </div><div class='ctx'> #define task_stack_page(task)	((void *)(task)-&gt;stack)</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +53,7 @@ static inline void setup_thread_stack(struct task_struct *p, struct task_struct</div><div class='ctx'>  * When the stack grows up, this is the highest address.</div><div class='ctx'>  * Beyond that position, we corrupt data on the next page.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long *end_of_stack(struct task_struct *p)</div><div class='add'>+static inline unsigned long *end_of_stack(const struct task_struct *p)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_STACK_GROWSUP</div><div class='ctx'> 	return (unsigned long *)((unsigned long)task_thread_info(p) + THREAD_SIZE) - 1;</div><div class='hunk'>@@ -89,34 +90,22 @@ static inline int object_is_on_stack(const void *obj)</div><div class='ctx'> {</div><div class='ctx'> 	void *stack = task_stack_page(current);</div><div class='ctx'> </div><div class='add'>+	obj = kasan_reset_tag(obj);</div><div class='ctx'> 	return (obj &gt;= stack) &amp;&amp; (obj &lt; (stack + THREAD_SIZE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void thread_stack_cache_init(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_STACK_USAGE</div><div class='add'>+unsigned long stack_not_used(struct task_struct *p);</div><div class='add'>+#else</div><div class='ctx'> static inline unsigned long stack_not_used(struct task_struct *p)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *n = end_of_stack(p);</div><div class='del'>-</div><div class='del'>-	do { 	/* Skip over canary */</div><div class='del'>-# ifdef CONFIG_STACK_GROWSUP</div><div class='del'>-		n--;</div><div class='del'>-# else</div><div class='del'>-		n++;</div><div class='del'>-# endif</div><div class='del'>-	} while (!*n);</div><div class='del'>-</div><div class='del'>-# ifdef CONFIG_STACK_GROWSUP</div><div class='del'>-	return (unsigned long)end_of_stack(p) - (unsigned long)n;</div><div class='del'>-# else</div><div class='del'>-	return (unsigned long)n - (unsigned long)end_of_stack(p);</div><div class='del'>-# endif</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> extern void set_task_stack_end_magic(struct task_struct *tsk);</div><div class='ctx'> </div><div class='del'>-#ifndef __HAVE_ARCH_KSTACK_END</div><div class='ctx'> static inline int kstack_end(void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	/* Reliable end of stack detection:</div><div class='hunk'>@@ -124,6 +113,5 @@ static inline int kstack_end(void *addr)</div><div class='ctx'> 	 */</div><div class='ctx'> 	return !(((unsigned long)addr+sizeof(void*)-1) &amp; (THREAD_SIZE-sizeof(void*)));</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_SCHED_TASK_STACK_H */</div><div class='head'>diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h<br/>index 18572c9ea724..45c0022b91ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/topology.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/topology.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/topology.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/topology.h</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * sched-domains (multiprocessor balancing) declarations:</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='ctx'> /* Generate SD flag indexes */</div><div class='ctx'> #define SD_FLAG(name, mflags) __##name,</div><div class='hunk'>@@ -25,43 +24,30 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> #undef SD_FLAG</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='del'>-</div><div class='ctx'> struct sd_flag_debug {</div><div class='ctx'> 	unsigned int meta_flags;</div><div class='ctx'> 	char *name;</div><div class='ctx'> };</div><div class='ctx'> extern const struct sd_flag_debug sd_flag_debug[];</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+struct sched_domain_topology_level;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCHED_SMT</div><div class='del'>-static inline int cpu_smt_flags(void)</div><div class='del'>-{</div><div class='del'>-	return SD_SHARE_CPUCAPACITY | SD_SHARE_LLC;</div><div class='del'>-}</div><div class='add'>+extern int cpu_smt_flags(void);</div><div class='add'>+extern const struct cpumask *tl_smt_mask(struct sched_domain_topology_level *tl, int cpu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCHED_CLUSTER</div><div class='del'>-static inline int cpu_cluster_flags(void)</div><div class='del'>-{</div><div class='del'>-	return SD_CLUSTER | SD_SHARE_LLC;</div><div class='del'>-}</div><div class='add'>+extern int cpu_cluster_flags(void);</div><div class='add'>+extern const struct cpumask *tl_cls_mask(struct sched_domain_topology_level *tl, int cpu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCHED_MC</div><div class='del'>-static inline int cpu_core_flags(void)</div><div class='del'>-{</div><div class='del'>-	return SD_SHARE_LLC;</div><div class='del'>-}</div><div class='add'>+extern int cpu_core_flags(void);</div><div class='add'>+extern const struct cpumask *tl_mc_mask(struct sched_domain_topology_level *tl, int cpu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-static inline int cpu_numa_flags(void)</div><div class='del'>-{</div><div class='del'>-	return SD_NUMA;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+extern const struct cpumask *tl_pkg_mask(struct sched_domain_topology_level *tl, int cpu);</div><div class='ctx'> </div><div class='ctx'> extern int arch_asym_cpu_priority(int cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -106,15 +92,21 @@ struct sched_domain {</div><div class='ctx'> 	unsigned int nr_balance_failed; /* initialise to 0 */</div><div class='ctx'> </div><div class='ctx'> 	/* idle_balance() stats */</div><div class='add'>+	unsigned int newidle_call;</div><div class='add'>+	unsigned int newidle_success;</div><div class='add'>+	unsigned int newidle_ratio;</div><div class='ctx'> 	u64 max_newidle_lb_cost;</div><div class='ctx'> 	unsigned long last_decay_max_lb_cost;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCHEDSTATS</div><div class='del'>-	/* load_balance() stats */</div><div class='add'>+	/* sched_balance_rq() stats */</div><div class='ctx'> 	unsigned int lb_count[CPU_MAX_IDLE_TYPES];</div><div class='ctx'> 	unsigned int lb_failed[CPU_MAX_IDLE_TYPES];</div><div class='ctx'> 	unsigned int lb_balanced[CPU_MAX_IDLE_TYPES];</div><div class='del'>-	unsigned int lb_imbalance[CPU_MAX_IDLE_TYPES];</div><div class='add'>+	unsigned int lb_imbalance_load[CPU_MAX_IDLE_TYPES];</div><div class='add'>+	unsigned int lb_imbalance_util[CPU_MAX_IDLE_TYPES];</div><div class='add'>+	unsigned int lb_imbalance_task[CPU_MAX_IDLE_TYPES];</div><div class='add'>+	unsigned int lb_imbalance_misfit[CPU_MAX_IDLE_TYPES];</div><div class='ctx'> 	unsigned int lb_gained[CPU_MAX_IDLE_TYPES];</div><div class='ctx'> 	unsigned int lb_hot_gained[CPU_MAX_IDLE_TYPES];</div><div class='ctx'> 	unsigned int lb_nobusyg[CPU_MAX_IDLE_TYPES];</div><div class='hunk'>@@ -140,9 +132,7 @@ struct sched_domain {</div><div class='ctx'> 	unsigned int ttwu_move_affine;</div><div class='ctx'> 	unsigned int ttwu_move_balance;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='ctx'> 	char *name;</div><div class='del'>-#endif</div><div class='ctx'> 	union {</div><div class='ctx'> 		void *private;		/* used during construction */</div><div class='ctx'> 		struct rcu_head rcu;	/* used during destruction */</div><div class='hunk'>@@ -165,10 +155,6 @@ static inline struct cpumask *sched_domain_span(struct sched_domain *sd)</div><div class='ctx'> 	return to_cpumask(sd-&gt;span);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void partition_sched_domains_locked(int ndoms_new,</div><div class='del'>-					   cpumask_var_t doms_new[],</div><div class='del'>-					   struct sched_domain_attr *dattr_new);</div><div class='del'>-</div><div class='ctx'> extern void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],</div><div class='ctx'> 				    struct sched_domain_attr *dattr_new);</div><div class='ctx'> </div><div class='hunk'>@@ -180,11 +166,9 @@ bool cpus_equal_capacity(int this_cpu, int that_cpu);</div><div class='ctx'> bool cpus_share_cache(int this_cpu, int that_cpu);</div><div class='ctx'> bool cpus_share_resources(int this_cpu, int that_cpu);</div><div class='ctx'> </div><div class='del'>-typedef const struct cpumask *(*sched_domain_mask_f)(int cpu);</div><div class='add'>+typedef const struct cpumask *(*sched_domain_mask_f)(struct sched_domain_topology_level *tl, int cpu);</div><div class='ctx'> typedef int (*sched_domain_flags_f)(void);</div><div class='ctx'> </div><div class='del'>-#define SDTL_OVERLAP	0x01</div><div class='del'>-</div><div class='ctx'> struct sd_data {</div><div class='ctx'> 	struct sched_domain *__percpu *sd;</div><div class='ctx'> 	struct sched_domain_shared *__percpu *sds;</div><div class='hunk'>@@ -195,54 +179,16 @@ struct sd_data {</div><div class='ctx'> struct sched_domain_topology_level {</div><div class='ctx'> 	sched_domain_mask_f mask;</div><div class='ctx'> 	sched_domain_flags_f sd_flags;</div><div class='del'>-	int		    flags;</div><div class='ctx'> 	int		    numa_level;</div><div class='ctx'> 	struct sd_data      data;</div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='ctx'> 	char                *name;</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern void __init set_sched_topology(struct sched_domain_topology_level *tl);</div><div class='add'>+extern void sched_update_asym_prefer_cpu(int cpu, int old_prio, int new_prio);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SCHED_DEBUG</div><div class='del'>-# define SD_INIT_NAME(type)		.name = #type</div><div class='del'>-#else</div><div class='del'>-# define SD_INIT_NAME(type)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_SMP */</div><div class='del'>-</div><div class='del'>-struct sched_domain_attr;</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-partition_sched_domains_locked(int ndoms_new, cpumask_var_t doms_new[],</div><div class='del'>-			       struct sched_domain_attr *dattr_new)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],</div><div class='del'>-			struct sched_domain_attr *dattr_new)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool cpus_equal_capacity(int this_cpu, int that_cpu)</div><div class='del'>-{</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool cpus_share_cache(int this_cpu, int that_cpu)</div><div class='del'>-{</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool cpus_share_resources(int this_cpu, int that_cpu)</div><div class='del'>-{</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif	/* !CONFIG_SMP */</div><div class='add'>+#define SDTL_INIT(maskfn, flagsfn, dname) ((struct sched_domain_topology_level) \</div><div class='add'>+	    { .mask = maskfn, .sd_flags = flagsfn, .name = #dname })</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ENERGY_MODEL) &amp;&amp; defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL)</div><div class='ctx'> extern void rebuild_sched_domains_energy(void);</div><div class='hunk'>@@ -270,17 +216,17 @@ unsigned long arch_scale_cpu_capacity(int cpu)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef arch_scale_thermal_pressure</div><div class='add'>+#ifndef arch_scale_hw_pressure</div><div class='ctx'> static __always_inline</div><div class='del'>-unsigned long arch_scale_thermal_pressure(int cpu)</div><div class='add'>+unsigned long arch_scale_hw_pressure(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef arch_update_thermal_pressure</div><div class='add'>+#ifndef arch_update_hw_pressure</div><div class='ctx'> static __always_inline</div><div class='del'>-void arch_update_thermal_pressure(const struct cpumask *cpus,</div><div class='add'>+void arch_update_hw_pressure(const struct cpumask *cpus,</div><div class='ctx'> 				  unsigned long capped_frequency)</div><div class='ctx'> { }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/sched/vhost_task.h b/include/linux/sched/vhost_task.h<br/>index bc60243d43b3..25446c5d3508 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/vhost_task.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/vhost_task.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/vhost_task.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/vhost_task.h</a></div><div class='hunk'>@@ -4,7 +4,8 @@</div><div class='ctx'> </div><div class='ctx'> struct vhost_task;</div><div class='ctx'> </div><div class='del'>-struct vhost_task *vhost_task_create(bool (*fn)(void *), void *arg,</div><div class='add'>+struct vhost_task *vhost_task_create(bool (*fn)(void *),</div><div class='add'>+				     void (*handle_kill)(void *), void *arg,</div><div class='ctx'> 				     const char *name);</div><div class='ctx'> void vhost_task_start(struct vhost_task *vtsk);</div><div class='ctx'> void vhost_task_stop(struct vhost_task *vtsk);</div><div class='head'>diff --git a/include/linux/sched/wake_q.h b/include/linux/sched/wake_q.h<br/>index 06cd8fb2f409..0f28b4623ad4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sched/wake_q.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sched/wake_q.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sched/wake_q.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sched/wake_q.h</a></div><div class='hunk'>@@ -63,4 +63,38 @@ extern void wake_q_add(struct wake_q_head *head, struct task_struct *task);</div><div class='ctx'> extern void wake_q_add_safe(struct wake_q_head *head, struct task_struct *task);</div><div class='ctx'> extern void wake_up_q(struct wake_q_head *head);</div><div class='ctx'> </div><div class='add'>+/* Spin unlock helpers to unlock and call wake_up_q with preempt disabled */</div><div class='add'>+static inline</div><div class='add'>+void raw_spin_unlock_wake(raw_spinlock_t *lock, struct wake_q_head *wake_q)</div><div class='add'>+{</div><div class='add'>+	guard(preempt)();</div><div class='add'>+	raw_spin_unlock(lock);</div><div class='add'>+	if (wake_q) {</div><div class='add'>+		wake_up_q(wake_q);</div><div class='add'>+		wake_q_init(wake_q);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void raw_spin_unlock_irq_wake(raw_spinlock_t *lock, struct wake_q_head *wake_q)</div><div class='add'>+{</div><div class='add'>+	guard(preempt)();</div><div class='add'>+	raw_spin_unlock_irq(lock);</div><div class='add'>+	if (wake_q) {</div><div class='add'>+		wake_up_q(wake_q);</div><div class='add'>+		wake_q_init(wake_q);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void raw_spin_unlock_irqrestore_wake(raw_spinlock_t *lock, unsigned long flags,</div><div class='add'>+				     struct wake_q_head *wake_q)</div><div class='add'>+{</div><div class='add'>+	guard(preempt)();</div><div class='add'>+	raw_spin_unlock_irqrestore(lock, flags);</div><div class='add'>+	if (wake_q) {</div><div class='add'>+		wake_up_q(wake_q);</div><div class='add'>+		wake_q_init(wake_q);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> #endif /* _LINUX_SCHED_WAKE_Q_H */</div><div class='head'>diff --git a/include/linux/scmi_imx_protocol.h b/include/linux/scmi_imx_protocol.h<br/>new file mode 100644<br/>index 000000000000..27bd372cbfb1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/scmi_imx_protocol.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/scmi_imx_protocol.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * SCMI Message Protocol driver NXP extension header</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2024 NXP.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_SCMI_NXP_PROTOCOL_H</div><div class='add'>+#define _LINUX_SCMI_NXP_PROTOCOL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/scmi_protocol.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define SCMI_PROTOCOL_IMX_LMM	0x80</div><div class='add'>+#define	SCMI_PROTOCOL_IMX_BBM	0x81</div><div class='add'>+#define SCMI_PROTOCOL_IMX_CPU	0x82</div><div class='add'>+#define	SCMI_PROTOCOL_IMX_MISC	0x84</div><div class='add'>+</div><div class='add'>+#define SCMI_IMX_VENDOR		"NXP"</div><div class='add'>+#define SCMI_IMX_SUBVENDOR	"IMX"</div><div class='add'>+</div><div class='add'>+struct scmi_imx_bbm_proto_ops {</div><div class='add'>+	int (*rtc_time_set)(const struct scmi_protocol_handle *ph, u32 id,</div><div class='add'>+			    uint64_t sec);</div><div class='add'>+	int (*rtc_time_get)(const struct scmi_protocol_handle *ph, u32 id,</div><div class='add'>+			    u64 *val);</div><div class='add'>+	int (*rtc_alarm_set)(const struct scmi_protocol_handle *ph, u32 id,</div><div class='add'>+			     bool enable, u64 sec);</div><div class='add'>+	int (*button_get)(const struct scmi_protocol_handle *ph, u32 *state);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum scmi_nxp_notification_events {</div><div class='add'>+	SCMI_EVENT_IMX_BBM_RTC = 0x0,</div><div class='add'>+	SCMI_EVENT_IMX_BBM_BUTTON = 0x1,</div><div class='add'>+	SCMI_EVENT_IMX_MISC_CONTROL = 0x0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scmi_imx_bbm_notif_report {</div><div class='add'>+	bool			is_rtc;</div><div class='add'>+	bool			is_button;</div><div class='add'>+	ktime_t			timestamp;</div><div class='add'>+	unsigned int		rtc_id;</div><div class='add'>+	unsigned int		rtc_evt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scmi_imx_misc_ctrl_notify_report {</div><div class='add'>+	ktime_t			timestamp;</div><div class='add'>+	unsigned int		ctrl_id;</div><div class='add'>+	unsigned int		flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scmi_imx_misc_proto_ops {</div><div class='add'>+	int (*misc_ctrl_set)(const struct scmi_protocol_handle *ph, u32 id,</div><div class='add'>+			     u32 num, u32 *val);</div><div class='add'>+	int (*misc_ctrl_get)(const struct scmi_protocol_handle *ph, u32 id,</div><div class='add'>+			     u32 *num, u32 *val);</div><div class='add'>+	int (*misc_ctrl_req_notify)(const struct scmi_protocol_handle *ph,</div><div class='add'>+				    u32 ctrl_id, u32 evt_id, u32 flags);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* See LMM_ATTRIBUTES in imx95.rst */</div><div class='add'>+#define	LMM_ID_DISCOVER	0xFFFFFFFFU</div><div class='add'>+#define	LMM_MAX_NAME	16</div><div class='add'>+</div><div class='add'>+enum scmi_imx_lmm_state {</div><div class='add'>+	LMM_STATE_LM_OFF,</div><div class='add'>+	LMM_STATE_LM_ON,</div><div class='add'>+	LMM_STATE_LM_SUSPEND,</div><div class='add'>+	LMM_STATE_LM_POWERED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scmi_imx_lmm_info {</div><div class='add'>+	u32 lmid;</div><div class='add'>+	enum scmi_imx_lmm_state state;</div><div class='add'>+	u32 errstatus;</div><div class='add'>+	u8 name[LMM_MAX_NAME];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scmi_imx_lmm_proto_ops {</div><div class='add'>+	int (*lmm_power_boot)(const struct scmi_protocol_handle *ph, u32 lmid,</div><div class='add'>+			      bool boot);</div><div class='add'>+	int (*lmm_info)(const struct scmi_protocol_handle *ph, u32 lmid,</div><div class='add'>+			struct scmi_imx_lmm_info *info);</div><div class='add'>+	int (*lmm_reset_vector_set)(const struct scmi_protocol_handle *ph,</div><div class='add'>+				    u32 lmid, u32 cpuid, u32 flags, u64 vector);</div><div class='add'>+	int (*lmm_shutdown)(const struct scmi_protocol_handle *ph, u32 lmid,</div><div class='add'>+			    u32 flags);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct scmi_imx_cpu_proto_ops {</div><div class='add'>+	int (*cpu_reset_vector_set)(const struct scmi_protocol_handle *ph,</div><div class='add'>+				    u32 cpuid, u64 vector, bool start,</div><div class='add'>+				    bool boot, bool resume);</div><div class='add'>+	int (*cpu_start)(const struct scmi_protocol_handle *ph, u32 cpuid,</div><div class='add'>+			 bool start);</div><div class='add'>+	int (*cpu_started)(const struct scmi_protocol_handle *ph, u32 cpuid,</div><div class='add'>+			   bool *started);</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h<br/>index b807141acc14..aafaac1496b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/scmi_protocol.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/scmi_protocol.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/scmi_protocol.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/scmi_protocol.h</a></div><div class='hunk'>@@ -153,7 +153,7 @@ struct scmi_perf_domain_info {</div><div class='ctx'>  *	for a given device</div><div class='ctx'>  * @fast_switch_rate_limit: gets the minimum time (us) required between</div><div class='ctx'>  *	successive fast_switching requests</div><div class='del'>- * @power_scale_mw_get: indicates if the power values provided are in milliWatts</div><div class='add'>+ * @power_scale_get: indicates if the power values provided are in milliWatts</div><div class='ctx'>  *	or in some other (abstract) scale</div><div class='ctx'>  */</div><div class='ctx'> struct scmi_perf_proto_ops {</div><div class='hunk'>@@ -737,6 +737,89 @@ struct scmi_powercap_proto_ops {</div><div class='ctx'> 					  u32 *power_thresh_high);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum scmi_pinctrl_selector_type {</div><div class='add'>+	PIN_TYPE = 0,</div><div class='add'>+	GROUP_TYPE,</div><div class='add'>+	FUNCTION_TYPE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum scmi_pinctrl_conf_type {</div><div class='add'>+	SCMI_PIN_DEFAULT = 0,</div><div class='add'>+	SCMI_PIN_BIAS_BUS_HOLD = 1,</div><div class='add'>+	SCMI_PIN_BIAS_DISABLE = 2,</div><div class='add'>+	SCMI_PIN_BIAS_HIGH_IMPEDANCE = 3,</div><div class='add'>+	SCMI_PIN_BIAS_PULL_UP = 4,</div><div class='add'>+	SCMI_PIN_BIAS_PULL_DEFAULT = 5,</div><div class='add'>+	SCMI_PIN_BIAS_PULL_DOWN = 6,</div><div class='add'>+	SCMI_PIN_DRIVE_OPEN_DRAIN = 7,</div><div class='add'>+	SCMI_PIN_DRIVE_OPEN_SOURCE = 8,</div><div class='add'>+	SCMI_PIN_DRIVE_PUSH_PULL = 9,</div><div class='add'>+	SCMI_PIN_DRIVE_STRENGTH = 10,</div><div class='add'>+	SCMI_PIN_INPUT_DEBOUNCE = 11,</div><div class='add'>+	SCMI_PIN_INPUT_MODE = 12,</div><div class='add'>+	SCMI_PIN_PULL_MODE = 13,</div><div class='add'>+	SCMI_PIN_INPUT_VALUE = 14,</div><div class='add'>+	SCMI_PIN_INPUT_SCHMITT = 15,</div><div class='add'>+	SCMI_PIN_LOW_POWER_MODE = 16,</div><div class='add'>+	SCMI_PIN_OUTPUT_MODE = 17,</div><div class='add'>+	SCMI_PIN_OUTPUT_VALUE = 18,</div><div class='add'>+	SCMI_PIN_POWER_SOURCE = 19,</div><div class='add'>+	SCMI_PIN_SLEW_RATE = 20,</div><div class='add'>+	SCMI_PIN_OEM_START = 192,</div><div class='add'>+	SCMI_PIN_OEM_END = 255,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct scmi_pinctrl_proto_ops - represents the various operations provided</div><div class='add'>+ * by SCMI Pinctrl Protocol</div><div class='add'>+ *</div><div class='add'>+ * @count_get: returns count of the registered elements in given type</div><div class='add'>+ * @name_get: returns name by index of given type</div><div class='add'>+ * @group_pins_get: returns the set of pins, assigned to the specified group</div><div class='add'>+ * @function_groups_get: returns the set of groups, assigned to the specified</div><div class='add'>+ *	function</div><div class='add'>+ * @mux_set: set muxing function for groups of pins</div><div class='add'>+ * @settings_get_one: returns one configuration parameter for pin or group</div><div class='add'>+ *	specified by config_type</div><div class='add'>+ * @settings_get_all: returns all configuration parameters for pin or group</div><div class='add'>+ * @settings_conf: sets the configuration parameter for pin or group</div><div class='add'>+ * @pin_request: aquire pin before selecting mux setting</div><div class='add'>+ * @pin_free: frees pin, acquired by request_pin call</div><div class='add'>+ */</div><div class='add'>+struct scmi_pinctrl_proto_ops {</div><div class='add'>+	int (*count_get)(const struct scmi_protocol_handle *ph,</div><div class='add'>+			 enum scmi_pinctrl_selector_type type);</div><div class='add'>+	int (*name_get)(const struct scmi_protocol_handle *ph, u32 selector,</div><div class='add'>+			enum scmi_pinctrl_selector_type type,</div><div class='add'>+			const char **name);</div><div class='add'>+	int (*group_pins_get)(const struct scmi_protocol_handle *ph,</div><div class='add'>+			      u32 selector, const unsigned int **pins,</div><div class='add'>+			      unsigned int *nr_pins);</div><div class='add'>+	int (*function_groups_get)(const struct scmi_protocol_handle *ph,</div><div class='add'>+				   u32 selector, unsigned int *nr_groups,</div><div class='add'>+				   const unsigned int **groups);</div><div class='add'>+	int (*mux_set)(const struct scmi_protocol_handle *ph, u32 selector,</div><div class='add'>+		       u32 group);</div><div class='add'>+	int (*settings_get_one)(const struct scmi_protocol_handle *ph,</div><div class='add'>+				u32 selector,</div><div class='add'>+				enum scmi_pinctrl_selector_type type,</div><div class='add'>+				enum scmi_pinctrl_conf_type config_type,</div><div class='add'>+				u32 *config_value);</div><div class='add'>+	int (*settings_get_all)(const struct scmi_protocol_handle *ph,</div><div class='add'>+				u32 selector,</div><div class='add'>+				enum scmi_pinctrl_selector_type type,</div><div class='add'>+				unsigned int *nr_configs,</div><div class='add'>+				enum scmi_pinctrl_conf_type *config_types,</div><div class='add'>+				u32 *config_values);</div><div class='add'>+	int (*settings_conf)(const struct scmi_protocol_handle *ph,</div><div class='add'>+			     u32 selector, enum scmi_pinctrl_selector_type type,</div><div class='add'>+			     unsigned int nr_configs,</div><div class='add'>+			     enum scmi_pinctrl_conf_type *config_type,</div><div class='add'>+			     u32 *config_value);</div><div class='add'>+	int (*pin_request)(const struct scmi_protocol_handle *ph, u32 pin);</div><div class='add'>+	int (*pin_free)(const struct scmi_protocol_handle *ph, u32 pin);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct scmi_notify_ops  - represents notifications' operations provided by</div><div class='ctx'>  * SCMI core</div><div class='hunk'>@@ -783,8 +866,6 @@ struct scmi_notify_ops {</div><div class='ctx'> 					    const u32 *src_id,</div><div class='ctx'> 					    struct notifier_block *nb);</div><div class='ctx'> 	int (*devm_event_notifier_unregister)(struct scmi_device *sdev,</div><div class='del'>-					      u8 proto_id, u8 evt_id,</div><div class='del'>-					      const u32 *src_id,</div><div class='ctx'> 					      struct notifier_block *nb);</div><div class='ctx'> 	int (*event_notifier_register)(const struct scmi_handle *handle,</div><div class='ctx'> 				       u8 proto_id, u8 evt_id,</div><div class='hunk'>@@ -844,6 +925,7 @@ enum scmi_std_protocol {</div><div class='ctx'> 	SCMI_PROTOCOL_RESET = 0x16,</div><div class='ctx'> 	SCMI_PROTOCOL_VOLTAGE = 0x17,</div><div class='ctx'> 	SCMI_PROTOCOL_POWERCAP = 0x18,</div><div class='add'>+	SCMI_PROTOCOL_PINCTRL = 0x19,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum scmi_system_events {</div><div class='hunk'>@@ -863,7 +945,7 @@ struct scmi_device {</div><div class='ctx'> 	struct scmi_handle *handle;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_scmi_dev(d) container_of(d, struct scmi_device, dev)</div><div class='add'>+#define to_scmi_dev(d) container_of_const(d, struct scmi_device, dev)</div><div class='ctx'> </div><div class='ctx'> struct scmi_device_id {</div><div class='ctx'> 	u8 protocol_id;</div><div class='head'>diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h<br/>index eab7081392d5..1690706206e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/screen_info.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/screen_info.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/screen_info.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/screen_info.h</a></div><div class='hunk'>@@ -4,6 +4,153 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;uapi/linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * SCREEN_INFO_MAX_RESOURCES - maximum number of resources per screen_info</div><div class='add'>+ */</div><div class='add'>+#define SCREEN_INFO_MAX_RESOURCES	3</div><div class='add'>+</div><div class='add'>+struct pci_dev;</div><div class='add'>+struct pixel_format;</div><div class='add'>+struct resource;</div><div class='add'>+</div><div class='add'>+static inline bool __screen_info_has_lfb(unsigned int type)</div><div class='add'>+{</div><div class='add'>+	return (type == VIDEO_TYPE_VLFB) || (type == VIDEO_TYPE_EFI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 __screen_info_lfb_base(const struct screen_info *si)</div><div class='add'>+{</div><div class='add'>+	u64 lfb_base = si-&gt;lfb_base;</div><div class='add'>+</div><div class='add'>+	if (si-&gt;capabilities &amp; VIDEO_CAPABILITY_64BIT_BASE)</div><div class='add'>+		lfb_base |= (u64)si-&gt;ext_lfb_base &lt;&lt; 32;</div><div class='add'>+</div><div class='add'>+	return lfb_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __screen_info_set_lfb_base(struct screen_info *si, u64 lfb_base)</div><div class='add'>+{</div><div class='add'>+	si-&gt;lfb_base = lfb_base &amp; GENMASK_ULL(31, 0);</div><div class='add'>+	si-&gt;ext_lfb_base = (lfb_base &amp; GENMASK_ULL(63, 32)) &gt;&gt; 32;</div><div class='add'>+</div><div class='add'>+	if (si-&gt;ext_lfb_base)</div><div class='add'>+		si-&gt;capabilities |= VIDEO_CAPABILITY_64BIT_BASE;</div><div class='add'>+	else</div><div class='add'>+		si-&gt;capabilities &amp;= ~VIDEO_CAPABILITY_64BIT_BASE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 __screen_info_lfb_size(const struct screen_info *si, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	u64 lfb_size = si-&gt;lfb_size;</div><div class='add'>+</div><div class='add'>+	if (type == VIDEO_TYPE_VLFB)</div><div class='add'>+		lfb_size &lt;&lt;= 16;</div><div class='add'>+	return lfb_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool __screen_info_vbe_mode_nonvga(const struct screen_info *si)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * VESA modes typically run on VGA hardware. Set bit 5 signals that this</div><div class='add'>+	 * is not the case. Drivers can then not make use of VGA resources. See</div><div class='add'>+	 * Sec 4.4 of the VBE 2.0 spec.</div><div class='add'>+	 */</div><div class='add'>+	return si-&gt;vesa_attributes &amp; BIT(5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int __screen_info_video_type(unsigned int type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case VIDEO_TYPE_MDA:</div><div class='add'>+	case VIDEO_TYPE_CGA:</div><div class='add'>+	case VIDEO_TYPE_EGAM:</div><div class='add'>+	case VIDEO_TYPE_EGAC:</div><div class='add'>+	case VIDEO_TYPE_VGAC:</div><div class='add'>+	case VIDEO_TYPE_VLFB:</div><div class='add'>+	case VIDEO_TYPE_PICA_S3:</div><div class='add'>+	case VIDEO_TYPE_MIPS_G364:</div><div class='add'>+	case VIDEO_TYPE_SGI:</div><div class='add'>+	case VIDEO_TYPE_TGAC:</div><div class='add'>+	case VIDEO_TYPE_SUN:</div><div class='add'>+	case VIDEO_TYPE_SUNPCI:</div><div class='add'>+	case VIDEO_TYPE_PMAC:</div><div class='add'>+	case VIDEO_TYPE_EFI:</div><div class='add'>+		return type;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * screen_info_video_type() - Decodes the video type from struct screen_info</div><div class='add'>+ * @si: an instance of struct screen_info</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * A VIDEO_TYPE_ constant representing si's type of video display, or 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int screen_info_video_type(const struct screen_info *si)</div><div class='add'>+{</div><div class='add'>+	unsigned int type;</div><div class='add'>+</div><div class='add'>+	// check if display output is on</div><div class='add'>+	if (!si-&gt;orig_video_isVGA)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	// check for a known VIDEO_TYPE_ constant</div><div class='add'>+	type = __screen_info_video_type(si-&gt;orig_video_isVGA);</div><div class='add'>+	if (type)</div><div class='add'>+		return si-&gt;orig_video_isVGA;</div><div class='add'>+</div><div class='add'>+	// check if text mode has been initialized</div><div class='add'>+	if (!si-&gt;orig_video_lines || !si-&gt;orig_video_cols)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	// 80x25 text, mono</div><div class='add'>+	if (si-&gt;orig_video_mode == 0x07) {</div><div class='add'>+		if ((si-&gt;orig_video_ega_bx &amp; 0xff) != 0x10)</div><div class='add'>+			return VIDEO_TYPE_EGAM;</div><div class='add'>+		else</div><div class='add'>+			return VIDEO_TYPE_MDA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// EGA/VGA, 16 colors</div><div class='add'>+	if ((si-&gt;orig_video_ega_bx &amp; 0xff) != 0x10) {</div><div class='add'>+		if (si-&gt;orig_video_isVGA)</div><div class='add'>+			return VIDEO_TYPE_VGAC;</div><div class='add'>+		else</div><div class='add'>+			return VIDEO_TYPE_EGAC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// the rest...</div><div class='add'>+	return VIDEO_TYPE_CGA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 __screen_info_vesapm_info_base(const struct screen_info *si)</div><div class='add'>+{</div><div class='add'>+	if (si-&gt;vesapm_seg &lt; 0xc000)</div><div class='add'>+		return 0;</div><div class='add'>+	return (si-&gt;vesapm_seg &lt;&lt; 4) + si-&gt;vesapm_off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t screen_info_resources(const struct screen_info *si, struct resource *r, size_t num);</div><div class='add'>+</div><div class='add'>+u32 __screen_info_lfb_bits_per_pixel(const struct screen_info *si);</div><div class='add'>+int screen_info_pixel_format(const struct screen_info *si, struct pixel_format *f);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PCI)</div><div class='add'>+void screen_info_apply_fixups(void);</div><div class='add'>+struct pci_dev *screen_info_pci_dev(const struct screen_info *si);</div><div class='add'>+#else</div><div class='add'>+static inline void screen_info_apply_fixups(void)</div><div class='add'>+{ }</div><div class='add'>+static inline struct pci_dev *screen_info_pci_dev(const struct screen_info *si)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> extern struct screen_info screen_info;</div><div class='ctx'> </div><div class='ctx'> #endif /* _SCREEN_INFO_H */</div><div class='head'>diff --git a/include/linux/sctp.h b/include/linux/sctp.h<br/>index 836a7e200f39..6719949135c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sctp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sctp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sctp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sctp.h</a></div><div class='hunk'>@@ -222,7 +222,6 @@ struct sctp_datahdr {</div><div class='ctx'> 	__be16 stream;</div><div class='ctx'> 	__be16 ssn;</div><div class='ctx'> 	__u32 ppid;</div><div class='del'>-	/* __u8  payload[]; */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sctp_data_chunk {</div><div class='hunk'>@@ -239,7 +238,6 @@ struct sctp_idatahdr {</div><div class='ctx'> 		__u32 ppid;</div><div class='ctx'> 		__be32 fsn;</div><div class='ctx'> 	};</div><div class='del'>-	__u8 payload[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sctp_idata_chunk {</div><div class='head'>diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h<br/>index 709ad84809e1..9b959972bf4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/seccomp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/seccomp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/seccomp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/seccomp.h</a></div><div class='hunk'>@@ -22,12 +22,13 @@</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/seccomp.h&gt;</div><div class='ctx'> </div><div class='add'>+extern int __secure_computing(void);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER</div><div class='del'>-extern int __secure_computing(const struct seccomp_data *sd);</div><div class='ctx'> static inline int secure_computing(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(test_syscall_work(SECCOMP)))</div><div class='del'>-		return  __secure_computing(NULL);</div><div class='add'>+		return  __secure_computing();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -50,10 +51,10 @@ struct seccomp_data;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER</div><div class='ctx'> static inline int secure_computing(void) { return 0; }</div><div class='del'>-static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }</div><div class='ctx'> #else</div><div class='ctx'> static inline void secure_computing_strict(int this_syscall) { return; }</div><div class='ctx'> #endif</div><div class='add'>+static inline int __secure_computing(void) { return 0; }</div><div class='ctx'> </div><div class='ctx'> static inline long prctl_get_seccomp(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/secretmem.h b/include/linux/secretmem.h<br/>index 35f3a4a8ceb1..e918f96881f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/secretmem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/secretmem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/secretmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/secretmem.h</a></div><div class='hunk'>@@ -6,25 +6,8 @@</div><div class='ctx'> </div><div class='ctx'> extern const struct address_space_operations secretmem_aops;</div><div class='ctx'> </div><div class='del'>-static inline bool folio_is_secretmem(struct folio *folio)</div><div class='add'>+static inline bool secretmem_mapping(struct address_space *mapping)</div><div class='ctx'> {</div><div class='del'>-	struct address_space *mapping;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Using folio_mapping() is quite slow because of the actual call</div><div class='del'>-	 * instruction.</div><div class='del'>-	 * We know that secretmem pages are not compound and LRU so we can</div><div class='del'>-	 * save a couple of cycles here.</div><div class='del'>-	 */</div><div class='del'>-	if (folio_test_large(folio) || !folio_test_lru(folio))</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	mapping = (struct address_space *)</div><div class='del'>-		((unsigned long)folio-&gt;mapping &amp; ~PAGE_MAPPING_FLAGS);</div><div class='del'>-</div><div class='del'>-	if (!mapping || mapping != folio-&gt;mapping)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='ctx'> 	return mapping-&gt;a_ops == &amp;secretmem_aops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +21,7 @@ static inline bool vma_is_secretmem(struct vm_area_struct *vma)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool folio_is_secretmem(struct folio *folio)</div><div class='add'>+static inline bool secretmem_mapping(struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/security.h b/include/linux/security.h<br/>index f249f5b9a9d7..83a646d72f6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/security.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/security.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/security.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/security.h</a></div><div class='hunk'>@@ -34,6 +34,10 @@</div><div class='ctx'> #include &lt;linux/sockptr.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/lsm.h&gt;</div><div class='add'>+#include &lt;linux/lsm/selinux.h&gt;</div><div class='add'>+#include &lt;linux/lsm/smack.h&gt;</div><div class='add'>+#include &lt;linux/lsm/apparmor.h&gt;</div><div class='add'>+#include &lt;linux/lsm/bpf.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct linux_binprm;</div><div class='ctx'> struct cred;</div><div class='hunk'>@@ -81,6 +85,19 @@ struct timezone;</div><div class='ctx'> </div><div class='ctx'> enum lsm_event {</div><div class='ctx'> 	LSM_POLICY_CHANGE,</div><div class='add'>+	LSM_STARTED_ALL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dm_verity_digest {</div><div class='add'>+	const char *alg;</div><div class='add'>+	const u8 *digest;</div><div class='add'>+	size_t digest_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum lsm_integrity_type {</div><div class='add'>+	LSM_INT_DMVERITY_SIG_VALID,</div><div class='add'>+	LSM_INT_DMVERITY_ROOTHASH,</div><div class='add'>+	LSM_INT_FSVERITY_BUILTINSIG_VALID,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -140,9 +157,17 @@ enum lockdown_reason {</div><div class='ctx'> 	LOCKDOWN_CONFIDENTIALITY_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Data exported by the security modules</div><div class='add'>+ */</div><div class='add'>+struct lsm_prop {</div><div class='add'>+	struct lsm_prop_selinux selinux;</div><div class='add'>+	struct lsm_prop_smack smack;</div><div class='add'>+	struct lsm_prop_apparmor apparmor;</div><div class='add'>+	struct lsm_prop_bpf bpf;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern const char *const lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1];</div><div class='del'>-extern u32 lsm_active_cnt;</div><div class='del'>-extern const struct lsm_id *lsm_idlist[];</div><div class='ctx'> </div><div class='ctx'> /* These functions are in security/commoncap.c */</div><div class='ctx'> extern int cap_capable(const struct cred *cred, struct user_namespace *ns,</div><div class='hunk'>@@ -167,8 +192,6 @@ int cap_inode_getsecurity(struct mnt_idmap *idmap,</div><div class='ctx'> 			  struct inode *inode, const char *name, void **buffer,</div><div class='ctx'> 			  bool alloc);</div><div class='ctx'> extern int cap_mmap_addr(unsigned long addr);</div><div class='del'>-extern int cap_mmap_file(struct file *file, unsigned long reqprot,</div><div class='del'>-			 unsigned long prot, unsigned long flags);</div><div class='ctx'> extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);</div><div class='ctx'> extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,</div><div class='ctx'> 			  unsigned long arg4, unsigned long arg5);</div><div class='hunk'>@@ -200,6 +223,18 @@ extern unsigned long dac_mmap_min_addr;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * A "security context" is the text representation of</div><div class='add'>+ * the information used by LSMs.</div><div class='add'>+ * This structure contains the string, its length, and which LSM</div><div class='add'>+ * it is useful for.</div><div class='add'>+ */</div><div class='add'>+struct lsm_context {</div><div class='add'>+	char	*context;	/* Provided by the module */</div><div class='add'>+	u32	len;</div><div class='add'>+	int	id;		/* Identifies the module */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Values used in the task_security_ops calls</div><div class='ctx'>  */</div><div class='ctx'> /* setuid or setgid, id0 == uid or gid */</div><div class='hunk'>@@ -228,7 +263,7 @@ struct request_sock;</div><div class='ctx'> #define LSM_UNSAFE_NO_NEW_PRIVS	4</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-extern int mmap_min_addr_handler(struct ctl_table *table, int write,</div><div class='add'>+extern int mmap_min_addr_handler(const struct ctl_table *table, int write,</div><div class='ctx'> 				 void *buffer, size_t *lenp, loff_t *ppos);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -257,8 +292,32 @@ static inline const char *kernel_load_data_id_str(enum kernel_load_data_id id)</div><div class='ctx'> 	return kernel_load_data_str[id];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lsmprop_init - initialize a lsm_prop structure</div><div class='add'>+ * @prop: Pointer to the data to initialize</div><div class='add'>+ *</div><div class='add'>+ * Set all secid for all modules to the specified value.</div><div class='add'>+ */</div><div class='add'>+static inline void lsmprop_init(struct lsm_prop *prop)</div><div class='add'>+{</div><div class='add'>+	memset(prop, 0, sizeof(*prop));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SECURITY</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lsmprop_is_set - report if there is a value in the lsm_prop</div><div class='add'>+ * @prop: Pointer to the exported LSM data</div><div class='add'>+ *</div><div class='add'>+ * Returns true if there is a value set, false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool lsmprop_is_set(struct lsm_prop *prop)</div><div class='add'>+{</div><div class='add'>+	const struct lsm_prop empty = {};</div><div class='add'>+</div><div class='add'>+	return !!memcmp(prop, &amp;empty, sizeof(*prop));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int call_blocking_lsm_notifier(enum lsm_event event, void *data);</div><div class='ctx'> int register_blocking_lsm_notifier(struct notifier_block *nb);</div><div class='ctx'> int unregister_blocking_lsm_notifier(struct notifier_block *nb);</div><div class='hunk'>@@ -328,15 +387,15 @@ int security_sb_clone_mnt_opts(const struct super_block *oldsb,</div><div class='ctx'> int security_move_mount(const struct path *from_path, const struct path *to_path);</div><div class='ctx'> int security_dentry_init_security(struct dentry *dentry, int mode,</div><div class='ctx'> 				  const struct qstr *name,</div><div class='del'>-				  const char **xattr_name, void **ctx,</div><div class='del'>-				  u32 *ctxlen);</div><div class='add'>+				  const char **xattr_name,</div><div class='add'>+				  struct lsm_context *lsmcxt);</div><div class='ctx'> int security_dentry_create_files_as(struct dentry *dentry, int mode,</div><div class='del'>-					struct qstr *name,</div><div class='add'>+					const struct qstr *name,</div><div class='ctx'> 					const struct cred *old,</div><div class='ctx'> 					struct cred *new);</div><div class='ctx'> int security_path_notify(const struct path *path, u64 mask,</div><div class='ctx'> 					unsigned int obj_type);</div><div class='del'>-int security_inode_alloc(struct inode *inode);</div><div class='add'>+int security_inode_alloc(struct inode *inode, gfp_t gfp);</div><div class='ctx'> void security_inode_free(struct inode *inode);</div><div class='ctx'> int security_inode_init_security(struct inode *inode, struct inode *dir,</div><div class='ctx'> 				 const struct qstr *qstr,</div><div class='hunk'>@@ -389,6 +448,10 @@ int security_inode_listxattr(struct dentry *dentry);</div><div class='ctx'> int security_inode_removexattr(struct mnt_idmap *idmap,</div><div class='ctx'> 			       struct dentry *dentry, const char *name);</div><div class='ctx'> void security_inode_post_removexattr(struct dentry *dentry, const char *name);</div><div class='add'>+int security_inode_file_setattr(struct dentry *dentry,</div><div class='add'>+			      struct file_kattr *fa);</div><div class='add'>+int security_inode_file_getattr(struct dentry *dentry,</div><div class='add'>+			      struct file_kattr *fa);</div><div class='ctx'> int security_inode_need_killpriv(struct dentry *dentry);</div><div class='ctx'> int security_inode_killpriv(struct mnt_idmap *idmap, struct dentry *dentry);</div><div class='ctx'> int security_inode_getsecurity(struct mnt_idmap *idmap,</div><div class='hunk'>@@ -396,9 +459,12 @@ int security_inode_getsecurity(struct mnt_idmap *idmap,</div><div class='ctx'> 			       void **buffer, bool alloc);</div><div class='ctx'> int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags);</div><div class='ctx'> int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size);</div><div class='del'>-void security_inode_getsecid(struct inode *inode, u32 *secid);</div><div class='add'>+void security_inode_getlsmprop(struct inode *inode, struct lsm_prop *prop);</div><div class='ctx'> int security_inode_copy_up(struct dentry *src, struct cred **new);</div><div class='del'>-int security_inode_copy_up_xattr(const char *name);</div><div class='add'>+int security_inode_copy_up_xattr(struct dentry *src, const char *name);</div><div class='add'>+int security_inode_setintegrity(const struct inode *inode,</div><div class='add'>+				enum lsm_integrity_type type, const void *value,</div><div class='add'>+				size_t size);</div><div class='ctx'> int security_kernfs_init_security(struct kernfs_node *kn_dir,</div><div class='ctx'> 				  struct kernfs_node *kn);</div><div class='ctx'> int security_file_permission(struct file *file, int mask);</div><div class='hunk'>@@ -422,13 +488,14 @@ int security_file_receive(struct file *file);</div><div class='ctx'> int security_file_open(struct file *file);</div><div class='ctx'> int security_file_post_open(struct file *file, int mask);</div><div class='ctx'> int security_file_truncate(struct file *file);</div><div class='del'>-int security_task_alloc(struct task_struct *task, unsigned long clone_flags);</div><div class='add'>+int security_task_alloc(struct task_struct *task, u64 clone_flags);</div><div class='ctx'> void security_task_free(struct task_struct *task);</div><div class='ctx'> int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);</div><div class='ctx'> void security_cred_free(struct cred *cred);</div><div class='ctx'> int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp);</div><div class='ctx'> void security_transfer_creds(struct cred *new, const struct cred *old);</div><div class='ctx'> void security_cred_getsecid(const struct cred *c, u32 *secid);</div><div class='add'>+void security_cred_getlsmprop(const struct cred *c, struct lsm_prop *prop);</div><div class='ctx'> int security_kernel_act_as(struct cred *new, u32 secid);</div><div class='ctx'> int security_kernel_create_files_as(struct cred *new, struct inode *inode);</div><div class='ctx'> int security_kernel_module_request(char *kmod_name);</div><div class='hunk'>@@ -448,8 +515,8 @@ int security_task_fix_setgroups(struct cred *new, const struct cred *old);</div><div class='ctx'> int security_task_setpgid(struct task_struct *p, pid_t pgid);</div><div class='ctx'> int security_task_getpgid(struct task_struct *p);</div><div class='ctx'> int security_task_getsid(struct task_struct *p);</div><div class='del'>-void security_current_getsecid_subj(u32 *secid);</div><div class='del'>-void security_task_getsecid_obj(struct task_struct *p, u32 *secid);</div><div class='add'>+void security_current_getlsmprop_subj(struct lsm_prop *prop);</div><div class='add'>+void security_task_getlsmprop_obj(struct task_struct *p, struct lsm_prop *prop);</div><div class='ctx'> int security_task_setnice(struct task_struct *p, int nice);</div><div class='ctx'> int security_task_setioprio(struct task_struct *p, int ioprio);</div><div class='ctx'> int security_task_getioprio(struct task_struct *p);</div><div class='hunk'>@@ -467,7 +534,7 @@ int security_task_prctl(int option, unsigned long arg2, unsigned long arg3,</div><div class='ctx'> void security_task_to_inode(struct task_struct *p, struct inode *inode);</div><div class='ctx'> int security_create_user_ns(const struct cred *cred);</div><div class='ctx'> int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag);</div><div class='del'>-void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid);</div><div class='add'>+void security_ipc_getlsmprop(struct kern_ipc_perm *ipcp, struct lsm_prop *prop);</div><div class='ctx'> int security_msg_msg_alloc(struct msg_msg *msg);</div><div class='ctx'> void security_msg_msg_free(struct msg_msg *msg);</div><div class='ctx'> int security_msg_queue_alloc(struct kern_ipc_perm *msq);</div><div class='hunk'>@@ -491,26 +558,43 @@ int security_sem_semop(struct kern_ipc_perm *sma, struct sembuf *sops,</div><div class='ctx'> 			unsigned nsops, int alter);</div><div class='ctx'> void security_d_instantiate(struct dentry *dentry, struct inode *inode);</div><div class='ctx'> int security_getselfattr(unsigned int attr, struct lsm_ctx __user *ctx,</div><div class='del'>-			 size_t __user *size, u32 flags);</div><div class='add'>+			 u32 __user *size, u32 flags);</div><div class='ctx'> int security_setselfattr(unsigned int attr, struct lsm_ctx __user *ctx,</div><div class='del'>-			 size_t size, u32 flags);</div><div class='add'>+			 u32 size, u32 flags);</div><div class='ctx'> int security_getprocattr(struct task_struct *p, int lsmid, const char *name,</div><div class='ctx'> 			 char **value);</div><div class='ctx'> int security_setprocattr(int lsmid, const char *name, void *value, size_t size);</div><div class='del'>-int security_netlink_send(struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> int security_ismaclabel(const char *name);</div><div class='del'>-int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen);</div><div class='add'>+int security_secid_to_secctx(u32 secid, struct lsm_context *cp);</div><div class='add'>+int security_lsmprop_to_secctx(struct lsm_prop *prop, struct lsm_context *cp,</div><div class='add'>+			       int lsmid);</div><div class='ctx'> int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid);</div><div class='del'>-void security_release_secctx(char *secdata, u32 seclen);</div><div class='add'>+void security_release_secctx(struct lsm_context *cp);</div><div class='ctx'> void security_inode_invalidate_secctx(struct inode *inode);</div><div class='ctx'> int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);</div><div class='ctx'> int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);</div><div class='del'>-int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);</div><div class='add'>+int security_inode_getsecctx(struct inode *inode, struct lsm_context *cp);</div><div class='ctx'> int security_locked_down(enum lockdown_reason what);</div><div class='del'>-int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, size_t *uctx_len,</div><div class='add'>+int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len,</div><div class='ctx'> 		      void *val, size_t val_len, u64 id, u64 flags);</div><div class='add'>+int security_bdev_alloc(struct block_device *bdev);</div><div class='add'>+void security_bdev_free(struct block_device *bdev);</div><div class='add'>+int security_bdev_setintegrity(struct block_device *bdev,</div><div class='add'>+			       enum lsm_integrity_type type, const void *value,</div><div class='add'>+			       size_t size);</div><div class='ctx'> #else /* CONFIG_SECURITY */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * lsmprop_is_set - report if there is a value in the lsm_prop</div><div class='add'>+ * @prop: Pointer to the exported LSM data</div><div class='add'>+ *</div><div class='add'>+ * Returns true if there is a value set, false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool lsmprop_is_set(struct lsm_prop *prop)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -634,7 +718,7 @@ static inline int security_settime64(const struct timespec64 *ts,</div><div class='ctx'> </div><div class='ctx'> static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)</div><div class='ctx'> {</div><div class='del'>-	return __vm_enough_memory(mm, pages, cap_vm_enough_memory(mm, pages));</div><div class='add'>+	return __vm_enough_memory(mm, pages, !cap_vm_enough_memory(mm, pages));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int security_bprm_creds_for_exec(struct linux_binprm *bprm)</div><div class='hunk'>@@ -769,7 +853,7 @@ static inline int security_path_notify(const struct path *path, u64 mask,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int security_inode_alloc(struct inode *inode)</div><div class='add'>+static inline int security_inode_alloc(struct inode *inode, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -781,14 +865,13 @@ static inline int security_dentry_init_security(struct dentry *dentry,</div><div class='ctx'> 						 int mode,</div><div class='ctx'> 						 const struct qstr *name,</div><div class='ctx'> 						 const char **xattr_name,</div><div class='del'>-						 void **ctx,</div><div class='del'>-						 u32 *ctxlen)</div><div class='add'>+						 struct lsm_context *lsmcxt)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int security_dentry_create_files_as(struct dentry *dentry,</div><div class='del'>-						  int mode, struct qstr *name,</div><div class='add'>+						  int mode, const struct qstr *name,</div><div class='ctx'> 						  const struct cred *old,</div><div class='ctx'> 						  struct cred *new)</div><div class='ctx'> {</div><div class='hunk'>@@ -971,6 +1054,18 @@ static inline void security_inode_post_removexattr(struct dentry *dentry,</div><div class='ctx'> 						   const char *name)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='add'>+static inline int security_inode_file_setattr(struct dentry *dentry,</div><div class='add'>+					      struct file_kattr *fa)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int security_inode_file_getattr(struct dentry *dentry,</div><div class='add'>+					      struct file_kattr *fa)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int security_inode_need_killpriv(struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	return cap_inode_need_killpriv(dentry);</div><div class='hunk'>@@ -1000,9 +1095,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void security_inode_getsecid(struct inode *inode, u32 *secid)</div><div class='add'>+static inline void security_inode_getlsmprop(struct inode *inode,</div><div class='add'>+					     struct lsm_prop *prop)</div><div class='ctx'> {</div><div class='del'>-	*secid = 0;</div><div class='add'>+	lsmprop_init(prop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int security_inode_copy_up(struct dentry *src, struct cred **new)</div><div class='hunk'>@@ -1010,13 +1106,20 @@ static inline int security_inode_copy_up(struct dentry *src, struct cred **new)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int security_inode_setintegrity(const struct inode *inode,</div><div class='add'>+					      enum lsm_integrity_type type,</div><div class='add'>+					      const void *value, size_t size)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int security_kernfs_init_security(struct kernfs_node *kn_dir,</div><div class='ctx'> 						struct kernfs_node *kn)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int security_inode_copy_up_xattr(const char *name)</div><div class='add'>+static inline int security_inode_copy_up_xattr(struct dentry *src, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -1112,7 +1215,7 @@ static inline int security_file_truncate(struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int security_task_alloc(struct task_struct *task,</div><div class='del'>-				      unsigned long clone_flags)</div><div class='add'>+				      u64 clone_flags)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1145,6 +1248,10 @@ static inline void security_cred_getsecid(const struct cred *c, u32 *secid)</div><div class='ctx'> 	*secid = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void security_cred_getlsmprop(const struct cred *c,</div><div class='add'>+					    struct lsm_prop *prop)</div><div class='add'>+{ }</div><div class='add'>+</div><div class='ctx'> static inline int security_kernel_act_as(struct cred *cred, u32 secid)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1222,14 +1329,15 @@ static inline int security_task_getsid(struct task_struct *p)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void security_current_getsecid_subj(u32 *secid)</div><div class='add'>+static inline void security_current_getlsmprop_subj(struct lsm_prop *prop)</div><div class='ctx'> {</div><div class='del'>-	*secid = 0;</div><div class='add'>+	lsmprop_init(prop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void security_task_getsecid_obj(struct task_struct *p, u32 *secid)</div><div class='add'>+static inline void security_task_getlsmprop_obj(struct task_struct *p,</div><div class='add'>+						struct lsm_prop *prop)</div><div class='ctx'> {</div><div class='del'>-	*secid = 0;</div><div class='add'>+	lsmprop_init(prop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int security_task_setnice(struct task_struct *p, int nice)</div><div class='hunk'>@@ -1305,9 +1413,10 @@ static inline int security_ipc_permission(struct kern_ipc_perm *ipcp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)</div><div class='add'>+static inline void security_ipc_getlsmprop(struct kern_ipc_perm *ipcp,</div><div class='add'>+					   struct lsm_prop *prop)</div><div class='ctx'> {</div><div class='del'>-	*secid = 0;</div><div class='add'>+	lsmprop_init(prop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int security_msg_msg_alloc(struct msg_msg *msg)</div><div class='hunk'>@@ -1431,17 +1540,19 @@ static inline int security_setprocattr(int lsmid, char *name, void *value,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int security_netlink_send(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+static inline int security_ismaclabel(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int security_ismaclabel(const char *name)</div><div class='add'>+static inline int security_secid_to_secctx(u32 secid, struct lsm_context *cp)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)</div><div class='add'>+static inline int security_lsmprop_to_secctx(struct lsm_prop *prop,</div><div class='add'>+					     struct lsm_context *cp,</div><div class='add'>+					     int lsmid)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -1453,7 +1564,7 @@ static inline int security_secctx_to_secid(const char *secdata,</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void security_release_secctx(char *secdata, u32 seclen)</div><div class='add'>+static inline void security_release_secctx(struct lsm_context *cp)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1469,7 +1580,8 @@ static inline int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-static inline int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)</div><div class='add'>+static inline int security_inode_getsecctx(struct inode *inode,</div><div class='add'>+					   struct lsm_context *cp)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -1478,11 +1590,28 @@ static inline int security_locked_down(enum lockdown_reason what)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx,</div><div class='del'>-				    size_t *uctx_len, void *val, size_t val_len,</div><div class='add'>+				    u32 *uctx_len, void *val, size_t val_len,</div><div class='ctx'> 				    u64 id, u64 flags)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int security_bdev_alloc(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void security_bdev_free(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int security_bdev_setintegrity(struct block_device *bdev,</div><div class='add'>+					     enum lsm_integrity_type type,</div><div class='add'>+					     const void *value, size_t size)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* CONFIG_SECURITY */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SECURITY) &amp;&amp; defined(CONFIG_WATCH_QUEUE)</div><div class='hunk'>@@ -1509,6 +1638,7 @@ static inline int security_watch_key(struct key *key)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SECURITY_NETWORK</div><div class='ctx'> </div><div class='add'>+int security_netlink_send(struct sock *sk, struct sk_buff *skb);</div><div class='ctx'> int security_unix_stream_connect(struct sock *sock, struct sock *other, struct sock *newsk);</div><div class='ctx'> int security_unix_may_send(struct socket *sock,  struct socket *other);</div><div class='ctx'> int security_socket_create(int family, int type, int protocol, int kern);</div><div class='hunk'>@@ -1564,6 +1694,11 @@ int security_sctp_assoc_established(struct sctp_association *asoc,</div><div class='ctx'> int security_mptcp_add_subflow(struct sock *sk, struct sock *ssk);</div><div class='ctx'> </div><div class='ctx'> #else	/* CONFIG_SECURITY_NETWORK */</div><div class='add'>+static inline int security_netlink_send(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int security_unix_stream_connect(struct sock *sock,</div><div class='ctx'> 					       struct sock *other,</div><div class='ctx'> 					       struct sock *newsk)</div><div class='hunk'>@@ -2048,15 +2183,17 @@ static inline void security_key_post_create_or_update(struct key *keyring,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AUDIT</div><div class='ctx'> #ifdef CONFIG_SECURITY</div><div class='del'>-int security_audit_rule_init(u32 field, u32 op, char *rulestr, void **lsmrule);</div><div class='add'>+int security_audit_rule_init(u32 field, u32 op, char *rulestr, void **lsmrule,</div><div class='add'>+			     gfp_t gfp);</div><div class='ctx'> int security_audit_rule_known(struct audit_krule *krule);</div><div class='del'>-int security_audit_rule_match(u32 secid, u32 field, u32 op, void *lsmrule);</div><div class='add'>+int security_audit_rule_match(struct lsm_prop *prop, u32 field, u32 op,</div><div class='add'>+			      void *lsmrule);</div><div class='ctx'> void security_audit_rule_free(void *lsmrule);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline int security_audit_rule_init(u32 field, u32 op, char *rulestr,</div><div class='del'>-					   void **lsmrule)</div><div class='add'>+					   void **lsmrule, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2066,8 +2203,8 @@ static inline int security_audit_rule_known(struct audit_krule *krule)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int security_audit_rule_match(u32 secid, u32 field, u32 op,</div><div class='del'>-					    void *lsmrule)</div><div class='add'>+static inline int security_audit_rule_match(struct lsm_prop *prop, u32 field,</div><div class='add'>+					    u32 op, void *lsmrule)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2126,23 +2263,23 @@ struct bpf_map;</div><div class='ctx'> struct bpf_prog;</div><div class='ctx'> struct bpf_token;</div><div class='ctx'> #ifdef CONFIG_SECURITY</div><div class='del'>-extern int security_bpf(int cmd, union bpf_attr *attr, unsigned int size);</div><div class='add'>+extern int security_bpf(int cmd, union bpf_attr *attr, unsigned int size, bool kernel);</div><div class='ctx'> extern int security_bpf_map(struct bpf_map *map, fmode_t fmode);</div><div class='ctx'> extern int security_bpf_prog(struct bpf_prog *prog);</div><div class='ctx'> extern int security_bpf_map_create(struct bpf_map *map, union bpf_attr *attr,</div><div class='del'>-				   struct bpf_token *token);</div><div class='add'>+				   struct bpf_token *token, bool kernel);</div><div class='ctx'> extern void security_bpf_map_free(struct bpf_map *map);</div><div class='ctx'> extern int security_bpf_prog_load(struct bpf_prog *prog, union bpf_attr *attr,</div><div class='del'>-				  struct bpf_token *token);</div><div class='add'>+				  struct bpf_token *token, bool kernel);</div><div class='ctx'> extern void security_bpf_prog_free(struct bpf_prog *prog);</div><div class='ctx'> extern int security_bpf_token_create(struct bpf_token *token, union bpf_attr *attr,</div><div class='del'>-				     struct path *path);</div><div class='add'>+				     const struct path *path);</div><div class='ctx'> extern void security_bpf_token_free(struct bpf_token *token);</div><div class='ctx'> extern int security_bpf_token_cmd(const struct bpf_token *token, enum bpf_cmd cmd);</div><div class='ctx'> extern int security_bpf_token_capable(const struct bpf_token *token, int cap);</div><div class='ctx'> #else</div><div class='ctx'> static inline int security_bpf(int cmd, union bpf_attr *attr,</div><div class='del'>-					     unsigned int size)</div><div class='add'>+			       unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2158,7 +2295,7 @@ static inline int security_bpf_prog(struct bpf_prog *prog)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int security_bpf_map_create(struct bpf_map *map, union bpf_attr *attr,</div><div class='del'>-					  struct bpf_token *token)</div><div class='add'>+					  struct bpf_token *token, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2167,7 +2304,7 @@ static inline void security_bpf_map_free(struct bpf_map *map)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='ctx'> static inline int security_bpf_prog_load(struct bpf_prog *prog, union bpf_attr *attr,</div><div class='del'>-					 struct bpf_token *token)</div><div class='add'>+					 struct bpf_token *token, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2176,7 +2313,7 @@ static inline void security_bpf_prog_free(struct bpf_prog *prog)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='ctx'> static inline int security_bpf_token_create(struct bpf_token *token, union bpf_attr *attr,</div><div class='del'>-				     struct path *path)</div><div class='add'>+					    const struct path *path)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2201,14 +2338,13 @@ struct perf_event_attr;</div><div class='ctx'> struct perf_event;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SECURITY</div><div class='del'>-extern int security_perf_event_open(struct perf_event_attr *attr, int type);</div><div class='add'>+extern int security_perf_event_open(int type);</div><div class='ctx'> extern int security_perf_event_alloc(struct perf_event *event);</div><div class='ctx'> extern void security_perf_event_free(struct perf_event *event);</div><div class='ctx'> extern int security_perf_event_read(struct perf_event *event);</div><div class='ctx'> extern int security_perf_event_write(struct perf_event *event);</div><div class='ctx'> #else</div><div class='del'>-static inline int security_perf_event_open(struct perf_event_attr *attr,</div><div class='del'>-					   int type)</div><div class='add'>+static inline int security_perf_event_open(int type)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2239,6 +2375,7 @@ static inline int security_perf_event_write(struct perf_event *event)</div><div class='ctx'> extern int security_uring_override_creds(const struct cred *new);</div><div class='ctx'> extern int security_uring_sqpoll(void);</div><div class='ctx'> extern int security_uring_cmd(struct io_uring_cmd *ioucmd);</div><div class='add'>+extern int security_uring_allowed(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline int security_uring_override_creds(const struct cred *new)</div><div class='ctx'> {</div><div class='hunk'>@@ -2252,7 +2389,19 @@ static inline int security_uring_cmd(struct io_uring_cmd *ioucmd)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline int security_uring_allowed(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_SECURITY */</div><div class='ctx'> #endif /* CONFIG_IO_URING */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SECURITY</div><div class='add'>+extern void security_initramfs_populated(void);</div><div class='add'>+#else</div><div class='add'>+static inline void security_initramfs_populated(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SECURITY */</div><div class='add'>+</div><div class='ctx'> #endif /* ! __LINUX_SECURITY_H */</div><div class='head'>diff --git a/include/linux/sed-opal.h b/include/linux/sed-opal.h<br/>index 2ac50822554e..80f33a93f944 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sed-opal.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sed-opal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sed-opal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sed-opal.h</a></div><div class='hunk'>@@ -52,6 +52,7 @@ static inline bool is_sed_ioctl(unsigned int cmd)</div><div class='ctx'> 	case IOC_OPAL_GET_GEOMETRY:</div><div class='ctx'> 	case IOC_OPAL_DISCOVERY:</div><div class='ctx'> 	case IOC_OPAL_REVERT_LSP:</div><div class='add'>+	case IOC_OPAL_SET_SID_PW:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='head'>diff --git a/include/linux/selection.h b/include/linux/selection.h<br/>index 170ef28ff26b..bab7d30d3446 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/selection.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/selection.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/selection.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/selection.h</a></div><div class='hunk'>@@ -14,17 +14,16 @@</div><div class='ctx'> struct tty_struct;</div><div class='ctx'> struct vc_data;</div><div class='ctx'> </div><div class='del'>-extern void clear_selection(void);</div><div class='del'>-extern int set_selection_user(const struct tiocl_selection __user *sel,</div><div class='del'>-			      struct tty_struct *tty);</div><div class='del'>-extern int set_selection_kernel(struct tiocl_selection *v,</div><div class='del'>-				struct tty_struct *tty);</div><div class='del'>-extern int paste_selection(struct tty_struct *tty);</div><div class='del'>-extern int sel_loadlut(char __user *p);</div><div class='del'>-extern int mouse_reporting(void);</div><div class='del'>-extern void mouse_report(struct tty_struct * tty, int butt, int mrx, int mry);</div><div class='del'>-</div><div class='del'>-bool vc_is_sel(struct vc_data *vc);</div><div class='add'>+void clear_selection(void);</div><div class='add'>+int set_selection_user(const struct tiocl_selection __user *sel,</div><div class='add'>+		       struct tty_struct *tty);</div><div class='add'>+int set_selection_kernel(struct tiocl_selection *v, struct tty_struct *tty);</div><div class='add'>+int paste_selection(struct tty_struct *tty);</div><div class='add'>+int sel_loadlut(u32 __user *lut);</div><div class='add'>+int mouse_reporting(void);</div><div class='add'>+void mouse_report(struct tty_struct *tty, int butt, int mrx, int mry);</div><div class='add'>+</div><div class='add'>+bool vc_is_sel(const struct vc_data *vc);</div><div class='ctx'> </div><div class='ctx'> extern int console_blanked;</div><div class='ctx'> </div><div class='hunk'>@@ -33,24 +32,21 @@ extern unsigned char default_red[];</div><div class='ctx'> extern unsigned char default_grn[];</div><div class='ctx'> extern unsigned char default_blu[];</div><div class='ctx'> </div><div class='del'>-extern unsigned short *screen_pos(const struct vc_data *vc, int w_offset,</div><div class='del'>-		bool viewed);</div><div class='del'>-extern u16 screen_glyph(const struct vc_data *vc, int offset);</div><div class='del'>-extern u32 screen_glyph_unicode(const struct vc_data *vc, int offset);</div><div class='del'>-extern void complement_pos(struct vc_data *vc, int offset);</div><div class='del'>-extern void invert_screen(struct vc_data *vc, int offset, int count, bool viewed);</div><div class='del'>-</div><div class='del'>-extern void getconsxy(const struct vc_data *vc, unsigned char xy[static 2]);</div><div class='del'>-extern void putconsxy(struct vc_data *vc, unsigned char xy[static const 2]);</div><div class='del'>-</div><div class='del'>-extern u16 vcs_scr_readw(const struct vc_data *vc, const u16 *org);</div><div class='del'>-extern void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org);</div><div class='del'>-extern void vcs_scr_updated(struct vc_data *vc);</div><div class='del'>-</div><div class='del'>-extern int vc_uniscr_check(struct vc_data *vc);</div><div class='del'>-extern void vc_uniscr_copy_line(const struct vc_data *vc, void *dest,</div><div class='del'>-				bool viewed,</div><div class='del'>-				unsigned int row, unsigned int col,</div><div class='del'>-				unsigned int nr);</div><div class='add'>+unsigned short *screen_pos(const struct vc_data *vc, int w_offset, bool viewed);</div><div class='add'>+u16 screen_glyph(const struct vc_data *vc, int offset);</div><div class='add'>+u32 screen_glyph_unicode(const struct vc_data *vc, int offset);</div><div class='add'>+void complement_pos(struct vc_data *vc, int offset);</div><div class='add'>+void invert_screen(struct vc_data *vc, int offset, int count, bool viewed);</div><div class='add'>+</div><div class='add'>+void getconsxy(const struct vc_data *vc, unsigned char xy[static 2]);</div><div class='add'>+void putconsxy(struct vc_data *vc, unsigned char xy[static const 2]);</div><div class='add'>+</div><div class='add'>+u16 vcs_scr_readw(const struct vc_data *vc, const u16 *org);</div><div class='add'>+void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org);</div><div class='add'>+void vcs_scr_updated(struct vc_data *vc);</div><div class='add'>+</div><div class='add'>+int vc_uniscr_check(struct vc_data *vc);</div><div class='add'>+void vc_uniscr_copy_line(const struct vc_data *vc, void *dest, bool viewed,</div><div class='add'>+			 unsigned int row, unsigned int col, unsigned int nr);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/sem.h b/include/linux/sem.h<br/>index c4deefe42aeb..275269ce2ec8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sem.h</a></div><div class='hunk'>@@ -9,12 +9,12 @@ struct task_struct;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSVIPC</div><div class='ctx'> </div><div class='del'>-extern int copy_semundo(unsigned long clone_flags, struct task_struct *tsk);</div><div class='add'>+extern int copy_semundo(u64 clone_flags, struct task_struct *tsk);</div><div class='ctx'> extern void exit_sem(struct task_struct *tsk);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static inline int copy_semundo(unsigned long clone_flags, struct task_struct *tsk)</div><div class='add'>+static inline int copy_semundo(u64 clone_flags, struct task_struct *tsk)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h<br/>index 04655faadc2d..89706157e622 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/semaphore.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/semaphore.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/semaphore.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/semaphore.h</a></div><div class='hunk'>@@ -16,13 +16,25 @@ struct semaphore {</div><div class='ctx'> 	raw_spinlock_t		lock;</div><div class='ctx'> 	unsigned int		count;</div><div class='ctx'> 	struct list_head	wait_list;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER</div><div class='add'>+	unsigned long		last_holder;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER</div><div class='add'>+#define __LAST_HOLDER_SEMAPHORE_INITIALIZER				\</div><div class='add'>+	, .last_holder = 0UL</div><div class='add'>+#else</div><div class='add'>+#define __LAST_HOLDER_SEMAPHORE_INITIALIZER</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define __SEMAPHORE_INITIALIZER(name, n)				\</div><div class='ctx'> {									\</div><div class='ctx'> 	.lock		= __RAW_SPIN_LOCK_UNLOCKED((name).lock),	\</div><div class='ctx'> 	.count		= n,						\</div><div class='del'>-	.wait_list	= LIST_HEAD_INIT((name).wait_list),		\</div><div class='add'>+	.wait_list	= LIST_HEAD_INIT((name).wait_list)		\</div><div class='add'>+	__LAST_HOLDER_SEMAPHORE_INITIALIZER				\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -47,5 +59,6 @@ extern int __must_check down_killable(struct semaphore *sem);</div><div class='ctx'> extern int __must_check down_trylock(struct semaphore *sem);</div><div class='ctx'> extern int __must_check down_timeout(struct semaphore *sem, long jiffies);</div><div class='ctx'> extern void up(struct semaphore *sem);</div><div class='add'>+extern unsigned long sem_last_holder(struct semaphore *sem);</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_SEMAPHORE_H */</div><div class='head'>diff --git a/include/linux/seq_buf.h b/include/linux/seq_buf.h<br/>index fe41da005970..9f2839e73f8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/seq_buf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/seq_buf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/seq_buf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/seq_buf.h</a></div><div class='hunk'>@@ -149,6 +149,23 @@ static inline void seq_buf_commit(struct seq_buf *s, int num)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * seq_buf_pop - pop off the last written character</div><div class='add'>+ * @s: the seq_buf handle</div><div class='add'>+ *</div><div class='add'>+ * Removes the last written character to the seq_buf @s.</div><div class='add'>+ *</div><div class='add'>+ * Returns the last character or -1 if it is empty.</div><div class='add'>+ */</div><div class='add'>+static inline int seq_buf_pop(struct seq_buf *s)</div><div class='add'>+{</div><div class='add'>+	if (!s-&gt;len)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	s-&gt;len--;</div><div class='add'>+	return (unsigned int)s-&gt;buffer[s-&gt;len];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern __printf(2, 3)</div><div class='ctx'> int seq_buf_printf(struct seq_buf *s, const char *fmt, ...);</div><div class='ctx'> extern __printf(2, 0)</div><div class='hunk'>@@ -167,8 +184,8 @@ extern int seq_buf_hex_dump(struct seq_buf *s, const char *prefix_str,</div><div class='ctx'> 			    const void *buf, size_t len, bool ascii);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BINARY_PRINTF</div><div class='del'>-extern int</div><div class='del'>-seq_buf_bprintf(struct seq_buf *s, const char *fmt, const u32 *binary);</div><div class='add'>+__printf(2, 0)</div><div class='add'>+int seq_buf_bprintf(struct seq_buf *s, const char *fmt, const u32 *binary);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void seq_buf_do_printk(struct seq_buf *s, const char *lvl);</div><div class='head'>diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h<br/>index 234bcdb1fba4..d6ebf0596510 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/seq_file.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/seq_file.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/seq_file.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/seq_file.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/string_helpers.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='hunk'>@@ -118,7 +117,18 @@ void seq_vprintf(struct seq_file *m, const char *fmt, va_list args);</div><div class='ctx'> __printf(2, 3)</div><div class='ctx'> void seq_printf(struct seq_file *m, const char *fmt, ...);</div><div class='ctx'> void seq_putc(struct seq_file *m, char c);</div><div class='del'>-void seq_puts(struct seq_file *m, const char *s);</div><div class='add'>+void __seq_puts(struct seq_file *m, const char *s);</div><div class='add'>+</div><div class='add'>+static __always_inline void seq_puts(struct seq_file *m, const char *s)</div><div class='add'>+{</div><div class='add'>+	if (!__builtin_constant_p(*s))</div><div class='add'>+		__seq_puts(m, s);</div><div class='add'>+	else if (s[0] &amp;&amp; !s[1])</div><div class='add'>+		seq_putc(m, s[0]);</div><div class='add'>+	else</div><div class='add'>+		seq_write(m, s, __builtin_strlen(s));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void seq_put_decimal_ull_width(struct seq_file *m, const char *delimiter,</div><div class='ctx'> 			       unsigned long long num, unsigned int width);</div><div class='ctx'> void seq_put_decimal_ull(struct seq_file *m, const char *delimiter,</div><div class='hunk'>@@ -171,6 +181,7 @@ int seq_open_private(struct file *, const struct seq_operations *, int);</div><div class='ctx'> int seq_release_private(struct inode *, struct file *);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BINARY_PRINTF</div><div class='add'>+__printf(2, 0)</div><div class='ctx'> void seq_bprintf(struct seq_file *m, const char *f, const u32 *binary);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h<br/>index d90d8ee29d81..221123660e71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/seqlock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/seqlock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/seqlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/seqlock.h</a></div><div class='hunk'>@@ -157,7 +157,7 @@ __seqprop_##lockname##_const_ptr(const seqcount_##lockname##_t *s)	\</div><div class='ctx'> static __always_inline unsigned						\</div><div class='ctx'> __seqprop_##lockname##_sequence(const seqcount_##lockname##_t *s)	\</div><div class='ctx'> {									\</div><div class='del'>-	unsigned seq = READ_ONCE(s-&gt;seqcount.sequence);			\</div><div class='add'>+	unsigned seq = smp_load_acquire(&amp;s-&gt;seqcount.sequence);		\</div><div class='ctx'> 									\</div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_PREEMPT_RT))				\</div><div class='ctx'> 		return seq;						\</div><div class='hunk'>@@ -170,7 +170,7 @@ __seqprop_##lockname##_sequence(const seqcount_##lockname##_t *s)	\</div><div class='ctx'> 		 * Re-read the sequence counter since the (possibly	\</div><div class='ctx'> 		 * preempted) writer made progress.			\</div><div class='ctx'> 		 */							\</div><div class='del'>-		seq = READ_ONCE(s-&gt;seqcount.sequence);			\</div><div class='add'>+		seq = smp_load_acquire(&amp;s-&gt;seqcount.sequence);		\</div><div class='ctx'> 	}								\</div><div class='ctx'> 									\</div><div class='ctx'> 	return seq;							\</div><div class='hunk'>@@ -208,7 +208,7 @@ static inline const seqcount_t *__seqprop_const_ptr(const seqcount_t *s)</div><div class='ctx'> </div><div class='ctx'> static inline unsigned __seqprop_sequence(const seqcount_t *s)</div><div class='ctx'> {</div><div class='del'>-	return READ_ONCE(s-&gt;sequence);</div><div class='add'>+	return smp_load_acquire(&amp;s-&gt;sequence);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool __seqprop_preemptible(const seqcount_t *s)</div><div class='hunk'>@@ -263,24 +263,16 @@ SEQCOUNT_LOCKNAME(mutex,        struct mutex,    true,     mutex)</div><div class='ctx'> #define seqprop_assert(s)		__seqprop(s, assert)(s)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __read_seqcount_begin() - begin a seqcount_t read section w/o barrier</div><div class='add'>+ * __read_seqcount_begin() - begin a seqcount_t read section</div><div class='ctx'>  * @s: Pointer to seqcount_t or any of the seqcount_LOCKNAME_t variants</div><div class='ctx'>  *</div><div class='del'>- * __read_seqcount_begin is like read_seqcount_begin, but has no smp_rmb()</div><div class='del'>- * barrier. Callers should ensure that smp_rmb() or equivalent ordering is</div><div class='del'>- * provided before actually loading any of the variables that are to be</div><div class='del'>- * protected in this critical section.</div><div class='del'>- *</div><div class='del'>- * Use carefully, only in critical code, and comment how the barrier is</div><div class='del'>- * provided.</div><div class='del'>- *</div><div class='ctx'>  * Return: count to be passed to read_seqcount_retry()</div><div class='ctx'>  */</div><div class='ctx'> #define __read_seqcount_begin(s)					\</div><div class='ctx'> ({									\</div><div class='ctx'> 	unsigned __seq;							\</div><div class='ctx'> 									\</div><div class='del'>-	while ((__seq = seqprop_sequence(s)) &amp; 1)			\</div><div class='add'>+	while (unlikely((__seq = seqprop_sequence(s)) &amp; 1))		\</div><div class='ctx'> 		cpu_relax();						\</div><div class='ctx'> 									\</div><div class='ctx'> 	kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX);			\</div><div class='hunk'>@@ -293,13 +285,7 @@ SEQCOUNT_LOCKNAME(mutex,        struct mutex,    true,     mutex)</div><div class='ctx'>  *</div><div class='ctx'>  * Return: count to be passed to read_seqcount_retry()</div><div class='ctx'>  */</div><div class='del'>-#define raw_read_seqcount_begin(s)					\</div><div class='del'>-({									\</div><div class='del'>-	unsigned _seq = __read_seqcount_begin(s);			\</div><div class='del'>-									\</div><div class='del'>-	smp_rmb();							\</div><div class='del'>-	_seq;								\</div><div class='del'>-})</div><div class='add'>+#define raw_read_seqcount_begin(s) __read_seqcount_begin(s)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * read_seqcount_begin() - begin a seqcount_t read critical section</div><div class='hunk'>@@ -328,12 +314,34 @@ SEQCOUNT_LOCKNAME(mutex,        struct mutex,    true,     mutex)</div><div class='ctx'> ({									\</div><div class='ctx'> 	unsigned __seq = seqprop_sequence(s);				\</div><div class='ctx'> 									\</div><div class='del'>-	smp_rmb();							\</div><div class='ctx'> 	kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX);			\</div><div class='ctx'> 	__seq;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * raw_seqcount_try_begin() - begin a seqcount_t read critical section</div><div class='add'>+ *                            w/o lockdep and w/o counter stabilization</div><div class='add'>+ * @s: Pointer to seqcount_t or any of the seqcount_LOCKNAME_t variants</div><div class='add'>+ * @start: count to be passed to read_seqcount_retry()</div><div class='add'>+ *</div><div class='add'>+ * Similar to raw_seqcount_begin(), except it enables eliding the critical</div><div class='add'>+ * section entirely if odd, instead of doing the speculation knowing it will</div><div class='add'>+ * fail.</div><div class='add'>+ *</div><div class='add'>+ * Useful when counter stabilization is more or less equivalent to taking</div><div class='add'>+ * the lock and there is a slowpath that does that.</div><div class='add'>+ *</div><div class='add'>+ * If true, start will be set to the (even) sequence count read.</div><div class='add'>+ *</div><div class='add'>+ * Return: true when a read critical section is started.</div><div class='add'>+ */</div><div class='add'>+#define raw_seqcount_try_begin(s, start)				\</div><div class='add'>+({									\</div><div class='add'>+	start = raw_read_seqcount(s);					\</div><div class='add'>+	!(start &amp; 1);							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * raw_seqcount_begin() - begin a seqcount_t read critical section w/o</div><div class='ctx'>  *                        lockdep and w/o counter stabilization</div><div class='ctx'>  * @s: Pointer to seqcount_t or any of the seqcount_LOCKNAME_t variants</div><div class='hunk'>@@ -637,6 +645,23 @@ static __always_inline unsigned raw_read_seqcount_latch(const seqcount_latch_t *</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * read_seqcount_latch() - pick even/odd latch data copy</div><div class='add'>+ * @s: Pointer to seqcount_latch_t</div><div class='add'>+ *</div><div class='add'>+ * See write_seqcount_latch() for details and a full reader/writer usage</div><div class='add'>+ * example.</div><div class='add'>+ *</div><div class='add'>+ * Return: sequence counter raw value. Use the lowest bit as an index for</div><div class='add'>+ * picking which data copy to read. The full counter must then be checked</div><div class='add'>+ * with read_seqcount_latch_retry().</div><div class='add'>+ */</div><div class='add'>+static __always_inline unsigned read_seqcount_latch(const seqcount_latch_t *s)</div><div class='add'>+{</div><div class='add'>+	kcsan_atomic_next(KCSAN_SEQLOCK_REGION_MAX);</div><div class='add'>+	return raw_read_seqcount_latch(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * raw_read_seqcount_latch_retry() - end a seqcount_latch_t read section</div><div class='ctx'>  * @s:		Pointer to seqcount_latch_t</div><div class='ctx'>  * @start:	count, from raw_read_seqcount_latch()</div><div class='hunk'>@@ -651,8 +676,33 @@ raw_read_seqcount_latch_retry(const seqcount_latch_t *s, unsigned start)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * read_seqcount_latch_retry() - end a seqcount_latch_t read section</div><div class='add'>+ * @s:		Pointer to seqcount_latch_t</div><div class='add'>+ * @start:	count, from read_seqcount_latch()</div><div class='add'>+ *</div><div class='add'>+ * Return: true if a read section retry is required, else false</div><div class='add'>+ */</div><div class='add'>+static __always_inline int</div><div class='add'>+read_seqcount_latch_retry(const seqcount_latch_t *s, unsigned start)</div><div class='add'>+{</div><div class='add'>+	kcsan_atomic_next(0);</div><div class='add'>+	return raw_read_seqcount_latch_retry(s, start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * raw_write_seqcount_latch() - redirect latch readers to even/odd copy</div><div class='ctx'>  * @s: Pointer to seqcount_latch_t</div><div class='add'>+ */</div><div class='add'>+static __always_inline void raw_write_seqcount_latch(seqcount_latch_t *s)</div><div class='add'>+{</div><div class='add'>+	smp_wmb();	/* prior stores before incrementing "sequence" */</div><div class='add'>+	s-&gt;seqcount.sequence++;</div><div class='add'>+	smp_wmb();      /* increment "sequence" before following stores */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * write_seqcount_latch_begin() - redirect latch readers to odd copy</div><div class='add'>+ * @s: Pointer to seqcount_latch_t</div><div class='ctx'>  *</div><div class='ctx'>  * The latch technique is a multiversion concurrency control method that allows</div><div class='ctx'>  * queries during non-atomic modifications. If you can guarantee queries never</div><div class='hunk'>@@ -680,17 +730,11 @@ raw_read_seqcount_latch_retry(const seqcount_latch_t *s, unsigned start)</div><div class='ctx'>  *</div><div class='ctx'>  *	void latch_modify(struct latch_struct *latch, ...)</div><div class='ctx'>  *	{</div><div class='del'>- *		smp_wmb();	// Ensure that the last data[1] update is visible</div><div class='del'>- *		latch-&gt;seq.sequence++;</div><div class='del'>- *		smp_wmb();	// Ensure that the seqcount update is visible</div><div class='del'>- *</div><div class='add'>+ *		write_seqcount_latch_begin(&amp;latch-&gt;seq);</div><div class='ctx'>  *		modify(latch-&gt;data[0], ...);</div><div class='del'>- *</div><div class='del'>- *		smp_wmb();	// Ensure that the data[0] update is visible</div><div class='del'>- *		latch-&gt;seq.sequence++;</div><div class='del'>- *		smp_wmb();	// Ensure that the seqcount update is visible</div><div class='del'>- *</div><div class='add'>+ *		write_seqcount_latch(&amp;latch-&gt;seq);</div><div class='ctx'>  *		modify(latch-&gt;data[1], ...);</div><div class='add'>+ *		write_seqcount_latch_end(&amp;latch-&gt;seq);</div><div class='ctx'>  *	}</div><div class='ctx'>  *</div><div class='ctx'>  * The query will have a form like::</div><div class='hunk'>@@ -701,13 +745,13 @@ raw_read_seqcount_latch_retry(const seqcount_latch_t *s, unsigned start)</div><div class='ctx'>  *		unsigned seq, idx;</div><div class='ctx'>  *</div><div class='ctx'>  *		do {</div><div class='del'>- *			seq = raw_read_seqcount_latch(&amp;latch-&gt;seq);</div><div class='add'>+ *			seq = read_seqcount_latch(&amp;latch-&gt;seq);</div><div class='ctx'>  *</div><div class='ctx'>  *			idx = seq &amp; 0x01;</div><div class='ctx'>  *			entry = data_query(latch-&gt;data[idx], ...);</div><div class='ctx'>  *</div><div class='ctx'>  *		// This includes needed smp_rmb()</div><div class='del'>- *		} while (raw_read_seqcount_latch_retry(&amp;latch-&gt;seq, seq));</div><div class='add'>+ *		} while (read_seqcount_latch_retry(&amp;latch-&gt;seq, seq));</div><div class='ctx'>  *</div><div class='ctx'>  *		return entry;</div><div class='ctx'>  *	}</div><div class='hunk'>@@ -731,11 +775,31 @@ raw_read_seqcount_latch_retry(const seqcount_latch_t *s, unsigned start)</div><div class='ctx'>  *	When data is a dynamic data structure; one should use regular RCU</div><div class='ctx'>  *	patterns to manage the lifetimes of the objects within.</div><div class='ctx'>  */</div><div class='del'>-static inline void raw_write_seqcount_latch(seqcount_latch_t *s)</div><div class='add'>+static __always_inline void write_seqcount_latch_begin(seqcount_latch_t *s)</div><div class='ctx'> {</div><div class='del'>-	smp_wmb();	/* prior stores before incrementing "sequence" */</div><div class='del'>-	s-&gt;seqcount.sequence++;</div><div class='del'>-	smp_wmb();      /* increment "sequence" before following stores */</div><div class='add'>+	kcsan_nestable_atomic_begin();</div><div class='add'>+	raw_write_seqcount_latch(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * write_seqcount_latch() - redirect latch readers to even copy</div><div class='add'>+ * @s: Pointer to seqcount_latch_t</div><div class='add'>+ */</div><div class='add'>+static __always_inline void write_seqcount_latch(seqcount_latch_t *s)</div><div class='add'>+{</div><div class='add'>+	raw_write_seqcount_latch(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * write_seqcount_latch_end() - end a seqcount_latch_t write section</div><div class='add'>+ * @s:		Pointer to seqcount_latch_t</div><div class='add'>+ *</div><div class='add'>+ * Marks the end of a seqcount_latch_t writer section, after all copies of the</div><div class='add'>+ * latch-protected data have been updated.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void write_seqcount_latch_end(seqcount_latch_t *s)</div><div class='add'>+{</div><div class='add'>+	kcsan_nestable_atomic_end();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define __SEQLOCK_UNLOCKED(lockname)					\</div><div class='hunk'>@@ -769,11 +833,7 @@ static inline void raw_write_seqcount_latch(seqcount_latch_t *s)</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned read_seqbegin(const seqlock_t *sl)</div><div class='ctx'> {</div><div class='del'>-	unsigned ret = read_seqcount_begin(&amp;sl-&gt;seqcount);</div><div class='del'>-</div><div class='del'>-	kcsan_atomic_next(0);  /* non-raw usage, assume closing read_seqretry() */</div><div class='del'>-	kcsan_flat_atomic_begin();</div><div class='del'>-	return ret;</div><div class='add'>+	return read_seqcount_begin(&amp;sl-&gt;seqcount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -789,12 +849,6 @@ static inline unsigned read_seqbegin(const seqlock_t *sl)</div><div class='ctx'>  */</div><div class='ctx'> static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Assume not nested: read_seqretry() may be called multiple times when</div><div class='del'>-	 * completing read critical section.</div><div class='del'>-	 */</div><div class='del'>-	kcsan_flat_atomic_end();</div><div class='del'>-</div><div class='ctx'> 	return read_seqcount_retry(&amp;sl-&gt;seqcount, start);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1155,4 +1209,118 @@ done_seqretry_irqrestore(seqlock_t *lock, int seq, unsigned long flags)</div><div class='ctx'> 	if (seq &amp; 1)</div><div class='ctx'> 		read_sequnlock_excl_irqrestore(lock, flags);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+enum ss_state {</div><div class='add'>+	ss_done = 0,</div><div class='add'>+	ss_lock,</div><div class='add'>+	ss_lock_irqsave,</div><div class='add'>+	ss_lockless,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ss_tmp {</div><div class='add'>+	enum ss_state	state;</div><div class='add'>+	unsigned long	data;</div><div class='add'>+	spinlock_t	*lock;</div><div class='add'>+	spinlock_t	*lock_irqsave;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __always_inline void __scoped_seqlock_cleanup(struct ss_tmp *sst)</div><div class='add'>+{</div><div class='add'>+	if (sst-&gt;lock)</div><div class='add'>+		spin_unlock(sst-&gt;lock);</div><div class='add'>+	if (sst-&gt;lock_irqsave)</div><div class='add'>+		spin_unlock_irqrestore(sst-&gt;lock_irqsave, sst-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern void __scoped_seqlock_invalid_target(void);</div><div class='add'>+</div><div class='add'>+#if (defined(CONFIG_CC_IS_GCC) &amp;&amp; CONFIG_GCC_VERSION &lt; 90000) || defined(CONFIG_KASAN)</div><div class='add'>+/*</div><div class='add'>+ * For some reason some GCC-8 architectures (nios2, alpha) have trouble</div><div class='add'>+ * determining that the ss_done state is impossible in __scoped_seqlock_next()</div><div class='add'>+ * below.</div><div class='add'>+ *</div><div class='add'>+ * Similarly KASAN is known to confuse compilers enough to break this. But we</div><div class='add'>+ * don't care about code quality for KASAN builds anyway.</div><div class='add'>+ */</div><div class='add'>+static inline void __scoped_seqlock_bug(void) { }</div><div class='add'>+#else</div><div class='add'>+/*</div><div class='add'>+ * Canary for compiler optimization -- if the compiler doesn't realize this is</div><div class='add'>+ * an impossible state, it very likely generates sub-optimal code here.</div><div class='add'>+ */</div><div class='add'>+extern void __scoped_seqlock_bug(void);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __always_inline void</div><div class='add'>+__scoped_seqlock_next(struct ss_tmp *sst, seqlock_t *lock, enum ss_state target)</div><div class='add'>+{</div><div class='add'>+	switch (sst-&gt;state) {</div><div class='add'>+	case ss_done:</div><div class='add'>+		__scoped_seqlock_bug();</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case ss_lock:</div><div class='add'>+	case ss_lock_irqsave:</div><div class='add'>+		sst-&gt;state = ss_done;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case ss_lockless:</div><div class='add'>+		if (!read_seqretry(lock, sst-&gt;data)) {</div><div class='add'>+			sst-&gt;state = ss_done;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (target) {</div><div class='add'>+	case ss_done:</div><div class='add'>+		__scoped_seqlock_invalid_target();</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case ss_lock:</div><div class='add'>+		sst-&gt;lock = &amp;lock-&gt;lock;</div><div class='add'>+		spin_lock(sst-&gt;lock);</div><div class='add'>+		sst-&gt;state = ss_lock;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case ss_lock_irqsave:</div><div class='add'>+		sst-&gt;lock_irqsave = &amp;lock-&gt;lock;</div><div class='add'>+		spin_lock_irqsave(sst-&gt;lock_irqsave, sst-&gt;data);</div><div class='add'>+		sst-&gt;state = ss_lock_irqsave;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case ss_lockless:</div><div class='add'>+		sst-&gt;data = read_seqbegin(lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __scoped_seqlock_read(_seqlock, _target, _s)			\</div><div class='add'>+	for (struct ss_tmp _s __cleanup(__scoped_seqlock_cleanup) =	\</div><div class='add'>+	     { .state = ss_lockless, .data = read_seqbegin(_seqlock) };	\</div><div class='add'>+	     _s.state != ss_done;					\</div><div class='add'>+	     __scoped_seqlock_next(&amp;_s, _seqlock, _target))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scoped_seqlock_read (lock, ss_state) - execute the read side critical</div><div class='add'>+ *                                        section without manual sequence</div><div class='add'>+ *                                        counter handling or calls to other</div><div class='add'>+ *                                        helpers</div><div class='add'>+ * @lock: pointer to seqlock_t protecting the data</div><div class='add'>+ * @ss_state: one of {ss_lock, ss_lock_irqsave, ss_lockless} indicating</div><div class='add'>+ *            the type of critical read section</div><div class='add'>+ *</div><div class='add'>+ * Example:</div><div class='add'>+ *</div><div class='add'>+ *     scoped_seqlock_read (&amp;lock, ss_lock) {</div><div class='add'>+ *         // read-side critical section</div><div class='add'>+ *     }</div><div class='add'>+ *</div><div class='add'>+ * Starts with a lockess pass first. If it fails, restarts the critical</div><div class='add'>+ * section with the lock held.</div><div class='add'>+ */</div><div class='add'>+#define scoped_seqlock_read(_seqlock, _target)				\</div><div class='add'>+	__scoped_seqlock_read(_seqlock, _target, __UNIQUE_ID(seqlock))</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_SEQLOCK_H */</div><div class='head'>diff --git a/include/linux/serdev.h b/include/linux/serdev.h<br/>index 3fab88ba265e..34562eb99931 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/serdev.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serdev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/serdev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/serdev.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@ struct serdev_device;</div><div class='ctx'>  *			not sleep.</div><div class='ctx'>  */</div><div class='ctx'> struct serdev_device_ops {</div><div class='del'>-	ssize_t (*receive_buf)(struct serdev_device *, const u8 *, size_t);</div><div class='add'>+	size_t (*receive_buf)(struct serdev_device *, const u8 *, size_t);</div><div class='ctx'> 	void (*write_wakeup)(struct serdev_device *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +84,6 @@ enum serdev_parity {</div><div class='ctx'> struct serdev_controller_ops {</div><div class='ctx'> 	ssize_t (*write_buf)(struct serdev_controller *, const u8 *, size_t);</div><div class='ctx'> 	void (*write_flush)(struct serdev_controller *);</div><div class='del'>-	int (*write_room)(struct serdev_controller *);</div><div class='ctx'> 	int (*open)(struct serdev_controller *);</div><div class='ctx'> 	void (*close)(struct serdev_controller *);</div><div class='ctx'> 	void (*set_flow_control)(struct serdev_controller *, bool);</div><div class='hunk'>@@ -185,9 +184,9 @@ static inline void serdev_controller_write_wakeup(struct serdev_controller *ctrl</div><div class='ctx'> 	serdev-&gt;ops-&gt;write_wakeup(serdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline ssize_t serdev_controller_receive_buf(struct serdev_controller *ctrl,</div><div class='del'>-						    const u8 *data,</div><div class='del'>-						    size_t count)</div><div class='add'>+static inline size_t serdev_controller_receive_buf(struct serdev_controller *ctrl,</div><div class='add'>+						   const u8 *data,</div><div class='add'>+						   size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct serdev_device *serdev = ctrl-&gt;serdev;</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +211,6 @@ int serdev_device_break_ctl(struct serdev_device *serdev, int break_state);</div><div class='ctx'> void serdev_device_write_wakeup(struct serdev_device *);</div><div class='ctx'> ssize_t serdev_device_write(struct serdev_device *, const u8 *, size_t, long);</div><div class='ctx'> void serdev_device_write_flush(struct serdev_device *);</div><div class='del'>-int serdev_device_write_room(struct serdev_device *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * serdev device driver functions</div><div class='hunk'>@@ -273,10 +271,6 @@ static inline ssize_t serdev_device_write(struct serdev_device *sdev,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> static inline void serdev_device_write_flush(struct serdev_device *sdev) {}</div><div class='del'>-static inline int serdev_device_write_room(struct serdev_device *sdev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #define serdev_device_driver_register(x)</div><div class='ctx'> #define serdev_device_driver_unregister(x)</div><div class='head'>diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h<br/>index be65de65fe61..01efdce0fda0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/serial_8250.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_8250.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/serial_8250.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/serial_8250.h</a></div><div class='hunk'>@@ -46,8 +46,8 @@ struct plat_serial8250_port {</div><div class='ctx'> 	unsigned int	type;		/* If UPF_FIXED_TYPE */</div><div class='ctx'> 	upf_t		flags;		/* UPF_* flags */</div><div class='ctx'> 	u16		bugs;		/* port bugs */</div><div class='del'>-	unsigned int	(*serial_in)(struct uart_port *, int);</div><div class='del'>-	void		(*serial_out)(struct uart_port *, int, int);</div><div class='add'>+	u32		(*serial_in)(struct uart_port *, unsigned int offset);</div><div class='add'>+	void		(*serial_out)(struct uart_port *, unsigned int offset, u32 val);</div><div class='ctx'> 	u32		(*dl_read)(struct uart_8250_port *up);</div><div class='ctx'> 	void		(*dl_write)(struct uart_8250_port *up, u32 value);</div><div class='ctx'> 	void		(*set_termios)(struct uart_port *,</div><div class='hunk'>@@ -161,8 +161,8 @@ struct uart_8250_port {</div><div class='ctx'> 	void			(*dl_write)(struct uart_8250_port *up, u32 value);</div><div class='ctx'> </div><div class='ctx'> 	struct uart_8250_em485 *em485;</div><div class='del'>-	void			(*rs485_start_tx)(struct uart_8250_port *);</div><div class='del'>-	void			(*rs485_stop_tx)(struct uart_8250_port *);</div><div class='add'>+	void			(*rs485_start_tx)(struct uart_8250_port *up, bool toggle_ier);</div><div class='add'>+	void			(*rs485_stop_tx)(struct uart_8250_port *up, bool toggle_ier);</div><div class='ctx'> </div><div class='ctx'> 	/* Serial port overrun backoff */</div><div class='ctx'> 	struct delayed_work overrun_backoff;</div><div class='hunk'>@@ -193,7 +193,7 @@ void serial8250_do_pm(struct uart_port *port, unsigned int state,</div><div class='ctx'> 		      unsigned int oldstate);</div><div class='ctx'> void serial8250_do_set_mctrl(struct uart_port *port, unsigned int mctrl);</div><div class='ctx'> void serial8250_do_set_divisor(struct uart_port *port, unsigned int baud,</div><div class='del'>-			       unsigned int quot, unsigned int quot_frac);</div><div class='add'>+			       unsigned int quot);</div><div class='ctx'> int fsl8250_handle_irq(struct uart_port *port);</div><div class='ctx'> int serial8250_handle_irq(struct uart_port *port, unsigned int iir);</div><div class='ctx'> u16 serial8250_rx_chars(struct uart_8250_port *up, u16 lsr);</div><div class='hunk'>@@ -210,6 +210,12 @@ int serial8250_console_exit(struct uart_port *port);</div><div class='ctx'> void serial8250_set_isa_configurator(void (*v)(int port, struct uart_port *up,</div><div class='ctx'> 					       u32 *capabilities));</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SERIAL_8250_CONSOLE</div><div class='add'>+extern int hp300_setup_serial_console(void) __init;</div><div class='add'>+#else</div><div class='add'>+static inline int hp300_setup_serial_console(void) { return 0; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SERIAL_8250_RT288X</div><div class='ctx'> int rt288x_setup(struct uart_port *p);</div><div class='ctx'> int au_platform_setup(struct plat_serial8250_port *p);</div><div class='head'>diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h<br/>index 55b1f3ba48ac..666430b47899 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/serial_core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/serial_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/serial_core.h</a></div><div class='hunk'>@@ -11,7 +11,8 @@</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/circ_buf.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/printk.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='hunk'>@@ -426,12 +427,24 @@ struct uart_icount {</div><div class='ctx'> typedef u64 __bitwise upf_t;</div><div class='ctx'> typedef unsigned int __bitwise upstat_t;</div><div class='ctx'> </div><div class='add'>+enum uart_iotype {</div><div class='add'>+	UPIO_UNKNOWN	= -1,</div><div class='add'>+	UPIO_PORT	= SERIAL_IO_PORT,	/* 8b I/O port access */</div><div class='add'>+	UPIO_HUB6	= SERIAL_IO_HUB6,	/* Hub6 ISA card */</div><div class='add'>+	UPIO_MEM	= SERIAL_IO_MEM,	/* driver-specific */</div><div class='add'>+	UPIO_MEM32	= SERIAL_IO_MEM32,	/* 32b little endian */</div><div class='add'>+	UPIO_AU		= SERIAL_IO_AU,		/* Au1x00 and RT288x type IO */</div><div class='add'>+	UPIO_TSI	= SERIAL_IO_TSI,	/* Tsi108/109 type IO */</div><div class='add'>+	UPIO_MEM32BE	= SERIAL_IO_MEM32BE,	/* 32b big endian */</div><div class='add'>+	UPIO_MEM16	= SERIAL_IO_MEM16,	/* 16b little endian */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct uart_port {</div><div class='ctx'> 	spinlock_t		lock;			/* port lock */</div><div class='ctx'> 	unsigned long		iobase;			/* in/out[bwl] */</div><div class='ctx'> 	unsigned char __iomem	*membase;		/* read/write[bwl] */</div><div class='del'>-	unsigned int		(*serial_in)(struct uart_port *, int);</div><div class='del'>-	void			(*serial_out)(struct uart_port *, int, int);</div><div class='add'>+	u32			(*serial_in)(struct uart_port *, unsigned int offset);</div><div class='add'>+	void			(*serial_out)(struct uart_port *, unsigned int offset, u32 val);</div><div class='ctx'> 	void			(*set_termios)(struct uart_port *,</div><div class='ctx'> 				               struct ktermios *new,</div><div class='ctx'> 				               const struct ktermios *old);</div><div class='hunk'>@@ -467,21 +480,14 @@ struct uart_port {</div><div class='ctx'> 	unsigned int		fifosize;		/* tx fifo size */</div><div class='ctx'> 	unsigned char		x_char;			/* xon/xoff char */</div><div class='ctx'> 	unsigned char		regshift;		/* reg offset shift */</div><div class='del'>-	unsigned char		iotype;			/* io access style */</div><div class='del'>-	unsigned char		quirks;			/* internal quirks */</div><div class='ctx'> </div><div class='del'>-#define UPIO_PORT		(SERIAL_IO_PORT)	/* 8b I/O port access */</div><div class='del'>-#define UPIO_HUB6		(SERIAL_IO_HUB6)	/* Hub6 ISA card */</div><div class='del'>-#define UPIO_MEM		(SERIAL_IO_MEM)		/* driver-specific */</div><div class='del'>-#define UPIO_MEM32		(SERIAL_IO_MEM32)	/* 32b little endian */</div><div class='del'>-#define UPIO_AU			(SERIAL_IO_AU)		/* Au1x00 and RT288x type IO */</div><div class='del'>-#define UPIO_TSI		(SERIAL_IO_TSI)		/* Tsi108/109 type IO */</div><div class='del'>-#define UPIO_MEM32BE		(SERIAL_IO_MEM32BE)	/* 32b big endian */</div><div class='del'>-#define UPIO_MEM16		(SERIAL_IO_MEM16)	/* 16b little endian */</div><div class='add'>+	unsigned char		quirks;			/* internal quirks */</div><div class='ctx'> </div><div class='del'>-	/* quirks must be updated while holding port mutex */</div><div class='add'>+	/* internal quirks must be updated while holding port mutex */</div><div class='ctx'> #define UPQ_NO_TXEN_TEST	BIT(0)</div><div class='ctx'> </div><div class='add'>+	enum uart_iotype	iotype;			/* io access style */</div><div class='add'>+</div><div class='ctx'> 	unsigned int		read_status_mask;	/* driver specific */</div><div class='ctx'> 	unsigned int		ignore_status_mask;	/* driver specific */</div><div class='ctx'> 	struct uart_state	*state;			/* pointer to parent state */</div><div class='hunk'>@@ -501,7 +507,11 @@ struct uart_port {</div><div class='ctx'> 	 * The remaining bits are serial-core specific and not modifiable by</div><div class='ctx'> 	 * userspace.</div><div class='ctx'> 	 */</div><div class='add'>+#ifdef CONFIG_HAS_IOPORT</div><div class='ctx'> #define UPF_FOURPORT		((__force upf_t) ASYNC_FOURPORT       /* 1  */ )</div><div class='add'>+#else</div><div class='add'>+#define UPF_FOURPORT		0</div><div class='add'>+#endif</div><div class='ctx'> #define UPF_SAK			((__force upf_t) ASYNC_SAK            /* 2  */ )</div><div class='ctx'> #define UPF_SPD_HI		((__force upf_t) ASYNC_SPD_HI         /* 4  */ )</div><div class='ctx'> #define UPF_SPD_VHI		((__force upf_t) ASYNC_SPD_VHI        /* 5  */ )</div><div class='hunk'>@@ -588,6 +598,95 @@ struct uart_port {</div><div class='ctx'> 	void			*private_data;		/* generic platform data pointer */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Only for console-&gt;device_lock()/_unlock() callbacks and internal</div><div class='add'>+ * port lock wrapper synchronization.</div><div class='add'>+ */</div><div class='add'>+static inline void __uart_port_lock_irqsave(struct uart_port *up, unsigned long *flags)</div><div class='add'>+{</div><div class='add'>+	spin_lock_irqsave(&amp;up-&gt;lock, *flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Only for console-&gt;device_lock()/_unlock() callbacks and internal</div><div class='add'>+ * port lock wrapper synchronization.</div><div class='add'>+ */</div><div class='add'>+static inline void __uart_port_unlock_irqrestore(struct uart_port *up, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	spin_unlock_irqrestore(&amp;up-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * uart_port_set_cons - Safely set the @cons field for a uart</div><div class='add'>+ * @up:		The uart port to set</div><div class='add'>+ * @con:	The new console to set to</div><div class='add'>+ *</div><div class='add'>+ * This function must be used to set @up-&gt;cons. It uses the port lock to</div><div class='add'>+ * synchronize with the port lock wrappers in order to ensure that the console</div><div class='add'>+ * cannot change or disappear while another context is holding the port lock.</div><div class='add'>+ */</div><div class='add'>+static inline void uart_port_set_cons(struct uart_port *up, struct console *con)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	__uart_port_lock_irqsave(up, &amp;flags);</div><div class='add'>+	up-&gt;cons = con;</div><div class='add'>+	__uart_port_unlock_irqrestore(up, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Only for internal port lock wrapper usage. */</div><div class='add'>+static inline bool __uart_port_using_nbcon(struct uart_port *up)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held_once(&amp;up-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (likely(!uart_console(up)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * @up-&gt;cons is only modified under the port lock. Therefore it is</div><div class='add'>+	 * certain that it cannot disappear here.</div><div class='add'>+	 *</div><div class='add'>+	 * @up-&gt;cons-&gt;node is added/removed from the console list under the</div><div class='add'>+	 * port lock. Therefore it is certain that the registration status</div><div class='add'>+	 * cannot change here, thus @up-&gt;cons-&gt;flags can be read directly.</div><div class='add'>+	 */</div><div class='add'>+	if (hlist_unhashed_lockless(&amp;up-&gt;cons-&gt;node) ||</div><div class='add'>+	    !(up-&gt;cons-&gt;flags &amp; CON_NBCON) ||</div><div class='add'>+	    !up-&gt;cons-&gt;write_atomic) {</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Only for internal port lock wrapper usage. */</div><div class='add'>+static inline bool __uart_port_nbcon_try_acquire(struct uart_port *up)</div><div class='add'>+{</div><div class='add'>+	if (!__uart_port_using_nbcon(up))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return nbcon_device_try_acquire(up-&gt;cons);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Only for internal port lock wrapper usage. */</div><div class='add'>+static inline void __uart_port_nbcon_acquire(struct uart_port *up)</div><div class='add'>+{</div><div class='add'>+	if (!__uart_port_using_nbcon(up))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (!nbcon_device_try_acquire(up-&gt;cons))</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Only for internal port lock wrapper usage. */</div><div class='add'>+static inline void __uart_port_nbcon_release(struct uart_port *up)</div><div class='add'>+{</div><div class='add'>+	if (!__uart_port_using_nbcon(up))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nbcon_device_release(up-&gt;cons);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * uart_port_lock - Lock the UART port</div><div class='ctx'>  * @up:		Pointer to UART port structure</div><div class='hunk'>@@ -595,6 +694,7 @@ struct uart_port {</div><div class='ctx'> static inline void uart_port_lock(struct uart_port *up)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;up-&gt;lock);</div><div class='add'>+	__uart_port_nbcon_acquire(up);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -604,6 +704,7 @@ static inline void uart_port_lock(struct uart_port *up)</div><div class='ctx'> static inline void uart_port_lock_irq(struct uart_port *up)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_irq(&amp;up-&gt;lock);</div><div class='add'>+	__uart_port_nbcon_acquire(up);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -614,6 +715,7 @@ static inline void uart_port_lock_irq(struct uart_port *up)</div><div class='ctx'> static inline void uart_port_lock_irqsave(struct uart_port *up, unsigned long *flags)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_irqsave(&amp;up-&gt;lock, *flags);</div><div class='add'>+	__uart_port_nbcon_acquire(up);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -624,7 +726,15 @@ static inline void uart_port_lock_irqsave(struct uart_port *up, unsigned long *f</div><div class='ctx'>  */</div><div class='ctx'> static inline bool uart_port_trylock(struct uart_port *up)</div><div class='ctx'> {</div><div class='del'>-	return spin_trylock(&amp;up-&gt;lock);</div><div class='add'>+	if (!spin_trylock(&amp;up-&gt;lock))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!__uart_port_nbcon_try_acquire(up)) {</div><div class='add'>+		spin_unlock(&amp;up-&gt;lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -636,7 +746,15 @@ static inline bool uart_port_trylock(struct uart_port *up)</div><div class='ctx'>  */</div><div class='ctx'> static inline bool uart_port_trylock_irqsave(struct uart_port *up, unsigned long *flags)</div><div class='ctx'> {</div><div class='del'>-	return spin_trylock_irqsave(&amp;up-&gt;lock, *flags);</div><div class='add'>+	if (!spin_trylock_irqsave(&amp;up-&gt;lock, *flags))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!__uart_port_nbcon_try_acquire(up)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;up-&gt;lock, *flags);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -645,6 +763,7 @@ static inline bool uart_port_trylock_irqsave(struct uart_port *up, unsigned long</div><div class='ctx'>  */</div><div class='ctx'> static inline void uart_port_unlock(struct uart_port *up)</div><div class='ctx'> {</div><div class='add'>+	__uart_port_nbcon_release(up);</div><div class='ctx'> 	spin_unlock(&amp;up-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -654,6 +773,7 @@ static inline void uart_port_unlock(struct uart_port *up)</div><div class='ctx'>  */</div><div class='ctx'> static inline void uart_port_unlock_irq(struct uart_port *up)</div><div class='ctx'> {</div><div class='add'>+	__uart_port_nbcon_release(up);</div><div class='ctx'> 	spin_unlock_irq(&amp;up-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -664,9 +784,23 @@ static inline void uart_port_unlock_irq(struct uart_port *up)</div><div class='ctx'>  */</div><div class='ctx'> static inline void uart_port_unlock_irqrestore(struct uart_port *up, unsigned long flags)</div><div class='ctx'> {</div><div class='add'>+	__uart_port_nbcon_release(up);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;up-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_GUARD(uart_port_lock, struct uart_port *, uart_port_lock(_T), uart_port_unlock(_T));</div><div class='add'>+DEFINE_GUARD_COND(uart_port_lock, _try, uart_port_trylock(_T));</div><div class='add'>+</div><div class='add'>+DEFINE_GUARD(uart_port_lock_irq, struct uart_port *, uart_port_lock_irq(_T),</div><div class='add'>+	     uart_port_unlock_irq(_T));</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_1(uart_port_lock_irqsave, struct uart_port,</div><div class='add'>+                    uart_port_lock_irqsave(_T-&gt;lock, &amp;_T-&gt;flags),</div><div class='add'>+                    uart_port_unlock_irqrestore(_T-&gt;lock, _T-&gt;flags),</div><div class='add'>+                    unsigned long flags);</div><div class='add'>+DEFINE_LOCK_GUARD_1_COND(uart_port_lock_irqsave, _try,</div><div class='add'>+			 uart_port_trylock_irqsave(_T-&gt;lock, &amp;_T-&gt;flags));</div><div class='add'>+</div><div class='ctx'> static inline int serial_port_in(struct uart_port *up, int offset)</div><div class='ctx'> {</div><div class='ctx'> 	return up-&gt;serial_in(up, offset);</div><div class='hunk'>@@ -696,7 +830,6 @@ struct uart_state {</div><div class='ctx'> 	struct tty_port		port;</div><div class='ctx'> </div><div class='ctx'> 	enum uart_pm_state	pm_state;</div><div class='del'>-	struct circ_buf		xmit;</div><div class='ctx'> </div><div class='ctx'> 	atomic_t		refcount;</div><div class='ctx'> 	wait_queue_head_t	remove_wait;</div><div class='hunk'>@@ -720,10 +853,33 @@ struct uart_state {</div><div class='ctx'>  */</div><div class='ctx'> static inline void uart_xmit_advance(struct uart_port *up, unsigned int chars)</div><div class='ctx'> {</div><div class='del'>-	struct circ_buf *xmit = &amp;up-&gt;state-&gt;xmit;</div><div class='add'>+	struct tty_port *tport = &amp;up-&gt;state-&gt;port;</div><div class='add'>+</div><div class='add'>+	kfifo_skip_count(&amp;tport-&gt;xmit_fifo, chars);</div><div class='add'>+	up-&gt;icount.tx += chars;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int uart_fifo_out(struct uart_port *up,</div><div class='add'>+		unsigned char *buf, unsigned int chars)</div><div class='add'>+{</div><div class='add'>+	struct tty_port *tport = &amp;up-&gt;state-&gt;port;</div><div class='add'>+</div><div class='add'>+	chars = kfifo_out(&amp;tport-&gt;xmit_fifo, buf, chars);</div><div class='add'>+	up-&gt;icount.tx += chars;</div><div class='add'>+</div><div class='add'>+	return chars;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int uart_fifo_get(struct uart_port *up,</div><div class='add'>+		unsigned char *ch)</div><div class='add'>+{</div><div class='add'>+	struct tty_port *tport = &amp;up-&gt;state-&gt;port;</div><div class='add'>+	unsigned int chars;</div><div class='ctx'> </div><div class='del'>-	xmit-&gt;tail = (xmit-&gt;tail + chars) &amp; (UART_XMIT_SIZE - 1);</div><div class='add'>+	chars = kfifo_get(&amp;tport-&gt;xmit_fifo, ch);</div><div class='ctx'> 	up-&gt;icount.tx += chars;</div><div class='add'>+</div><div class='add'>+	return chars;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct module;</div><div class='hunk'>@@ -761,7 +917,7 @@ enum UART_TX_FLAGS {</div><div class='ctx'> 		       for_test, for_post)				      \</div><div class='ctx'> ({									      \</div><div class='ctx'> 	struct uart_port *__port = (uport);				      \</div><div class='del'>-	struct circ_buf *xmit = &amp;__port-&gt;state-&gt;xmit;			      \</div><div class='add'>+	struct tty_port *__tport = &amp;__port-&gt;state-&gt;port;		      \</div><div class='ctx'> 	unsigned int pending;						      \</div><div class='ctx'> 									      \</div><div class='ctx'> 	for (; (for_test) &amp;&amp; (tx_ready); (for_post), __port-&gt;icount.tx++) {   \</div><div class='hunk'>@@ -772,17 +928,18 @@ enum UART_TX_FLAGS {</div><div class='ctx'> 			continue;					      \</div><div class='ctx'> 		}							      \</div><div class='ctx'> 									      \</div><div class='del'>-		if (uart_circ_empty(xmit) || uart_tx_stopped(__port))	      \</div><div class='add'>+		if (uart_tx_stopped(__port))				      \</div><div class='add'>+			break;						      \</div><div class='add'>+									      \</div><div class='add'>+		if (!kfifo_get(&amp;__tport-&gt;xmit_fifo, &amp;(ch)))		      \</div><div class='ctx'> 			break;						      \</div><div class='ctx'> 									      \</div><div class='del'>-		(ch) = xmit-&gt;buf[xmit-&gt;tail];				      \</div><div class='ctx'> 		(put_char);						      \</div><div class='del'>-		xmit-&gt;tail = (xmit-&gt;tail + 1) % UART_XMIT_SIZE;		      \</div><div class='ctx'> 	}								      \</div><div class='ctx'> 									      \</div><div class='ctx'> 	(tx_done);							      \</div><div class='ctx'> 									      \</div><div class='del'>-	pending = uart_circ_chars_pending(xmit);			      \</div><div class='add'>+	pending = kfifo_len(&amp;__tport-&gt;xmit_fifo);			      \</div><div class='ctx'> 	if (pending &lt; WAKEUP_CHARS) {					      \</div><div class='ctx'> 		uart_write_wakeup(__port);				      \</div><div class='ctx'> 									      \</div><div class='hunk'>@@ -826,6 +983,24 @@ enum UART_TX_FLAGS {</div><div class='ctx'> })</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * uart_port_tx_limited_flags -- transmit helper for uart_port with count limiting with flags</div><div class='add'>+ * @port: uart port</div><div class='add'>+ * @ch: variable to store a character to be written to the HW</div><div class='add'>+ * @flags: %UART_TX_NOSTOP or similar</div><div class='add'>+ * @count: a limit of characters to send</div><div class='add'>+ * @tx_ready: can HW accept more data function</div><div class='add'>+ * @put_char: function to write a character</div><div class='add'>+ * @tx_done: function to call after the loop is done</div><div class='add'>+ *</div><div class='add'>+ * See uart_port_tx_limited() for more details.</div><div class='add'>+ */</div><div class='add'>+#define uart_port_tx_limited_flags(port, ch, flags, count, tx_ready, put_char, tx_done) ({ \</div><div class='add'>+	unsigned int __count = (count);							   \</div><div class='add'>+	__uart_port_tx(port, ch, flags, tx_ready, put_char, tx_done, __count,		   \</div><div class='add'>+			__count--);							   \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * uart_port_tx -- transmit helper for uart_port</div><div class='ctx'>  * @port: uart port</div><div class='ctx'>  * @ch: variable to store a character to be written to the HW</div><div class='hunk'>@@ -939,10 +1114,8 @@ static inline bool uart_console_registered(struct uart_port *port)</div><div class='ctx'> 	return uart_console(port) &amp;&amp; console_is_registered(port-&gt;cons);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct uart_port *uart_get_console(struct uart_port *ports, int nr,</div><div class='del'>-				   struct console *c);</div><div class='del'>-int uart_parse_earlycon(char *p, unsigned char *iotype, resource_size_t *addr,</div><div class='del'>-			char **options);</div><div class='add'>+int uart_parse_earlycon(char *p, enum uart_iotype *iotype,</div><div class='add'>+			resource_size_t *addr, char **options);</div><div class='ctx'> void uart_parse_options(const char *options, int *baud, int *parity, int *bits,</div><div class='ctx'> 			int *flow);</div><div class='ctx'> int uart_set_options(struct uart_port *port, struct console *co, int baud,</div><div class='hunk'>@@ -959,6 +1132,8 @@ int uart_register_driver(struct uart_driver *uart);</div><div class='ctx'> void uart_unregister_driver(struct uart_driver *uart);</div><div class='ctx'> int uart_add_one_port(struct uart_driver *reg, struct uart_port *port);</div><div class='ctx'> void uart_remove_one_port(struct uart_driver *reg, struct uart_port *port);</div><div class='add'>+int uart_read_port_properties(struct uart_port *port);</div><div class='add'>+int uart_read_and_validate_port_properties(struct uart_port *port);</div><div class='ctx'> bool uart_match_port(const struct uart_port *port1,</div><div class='ctx'> 		const struct uart_port *port2);</div><div class='ctx'> </div><div class='hunk'>@@ -968,15 +1143,6 @@ bool uart_match_port(const struct uart_port *port1,</div><div class='ctx'> int uart_suspend_port(struct uart_driver *reg, struct uart_port *port);</div><div class='ctx'> int uart_resume_port(struct uart_driver *reg, struct uart_port *port);</div><div class='ctx'> </div><div class='del'>-#define uart_circ_empty(circ)		((circ)-&gt;head == (circ)-&gt;tail)</div><div class='del'>-#define uart_circ_clear(circ)		((circ)-&gt;head = (circ)-&gt;tail = 0)</div><div class='del'>-</div><div class='del'>-#define uart_circ_chars_pending(circ)	\</div><div class='del'>-	(CIRC_CNT((circ)-&gt;head, (circ)-&gt;tail, UART_XMIT_SIZE))</div><div class='del'>-</div><div class='del'>-#define uart_circ_chars_free(circ)	\</div><div class='del'>-	(CIRC_SPACE((circ)-&gt;head, (circ)-&gt;tail, UART_XMIT_SIZE))</div><div class='del'>-</div><div class='ctx'> static inline int uart_tx_stopped(struct uart_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *tty = port-&gt;state-&gt;port.tty;</div><div class='head'>diff --git a/include/linux/serial_max3100.h b/include/linux/serial_max3100.h<br/>deleted file mode 100644<br/>index befd55c08a7c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/serial_max3100.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_max3100.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2007 Christian Pellegrin</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_SERIAL_MAX3100_H</div><div class='del'>-#define _LINUX_SERIAL_MAX3100_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct plat_max3100 - MAX3100 SPI UART platform data</div><div class='del'>- * @loopback:            force MAX3100 in loopback</div><div class='del'>- * @crystal:             1 for 3.6864 Mhz, 0 for 1.8432</div><div class='del'>- * @max3100_hw_suspend:  MAX3100 has a shutdown pin. This is a hook</div><div class='del'>- *                       called on suspend and resume to activate it.</div><div class='del'>- * @poll_time:           poll time for CTS signal in ms, 0 disables (so no hw</div><div class='del'>- *                       flow ctrl is possible but you have less CPU usage)</div><div class='del'>- *</div><div class='del'>- * You should use this structure in your machine description to specify</div><div class='del'>- * how the MAX3100 is connected. Example:</div><div class='del'>- *</div><div class='del'>- * static struct plat_max3100 max3100_plat_data = {</div><div class='del'>- *  .loopback = 0,</div><div class='del'>- *  .crystal = 0,</div><div class='del'>- *  .poll_time = 100,</div><div class='del'>- * };</div><div class='del'>- *</div><div class='del'>- * static struct spi_board_info spi_board_info[] = {</div><div class='del'>- * {</div><div class='del'>- *  .modalias	= "max3100",</div><div class='del'>- *  .platform_data	= &amp;max3100_plat_data,</div><div class='del'>- *  .irq		= IRQ_EINT12,</div><div class='del'>- *  .max_speed_hz	= 5*1000*1000,</div><div class='del'>- *  .chip_select	= 0,</div><div class='del'>- * },</div><div class='del'>- * };</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-struct plat_max3100 {</div><div class='del'>-	int loopback;</div><div class='del'>-	int crystal;</div><div class='del'>-	void (*max3100_hw_suspend) (int suspend);</div><div class='del'>-	int poll_time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h<br/>index 1672cf0810ef..102aa33d956c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/serial_s3c.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_s3c.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/serial_s3c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/serial_s3c.h</a></div><div class='hunk'>@@ -246,24 +246,28 @@</div><div class='ctx'> 				 S5PV210_UFCON_TXTRIG4 |	\</div><div class='ctx'> 				 S5PV210_UFCON_RXTRIG4)</div><div class='ctx'> </div><div class='del'>-#define APPLE_S5L_UCON_RXTO_ENA		9</div><div class='del'>-#define APPLE_S5L_UCON_RXTHRESH_ENA	12</div><div class='del'>-#define APPLE_S5L_UCON_TXTHRESH_ENA	13</div><div class='del'>-#define APPLE_S5L_UCON_RXTO_ENA_MSK	(1 &lt;&lt; APPLE_S5L_UCON_RXTO_ENA)</div><div class='del'>-#define APPLE_S5L_UCON_RXTHRESH_ENA_MSK	(1 &lt;&lt; APPLE_S5L_UCON_RXTHRESH_ENA)</div><div class='del'>-#define APPLE_S5L_UCON_TXTHRESH_ENA_MSK	(1 &lt;&lt; APPLE_S5L_UCON_TXTHRESH_ENA)</div><div class='add'>+#define APPLE_S5L_UCON_RXTO_ENA			9</div><div class='add'>+#define APPLE_S5L_UCON_RXTO_LEGACY_ENA		11</div><div class='add'>+#define APPLE_S5L_UCON_RXTHRESH_ENA		12</div><div class='add'>+#define APPLE_S5L_UCON_TXTHRESH_ENA		13</div><div class='add'>+#define APPLE_S5L_UCON_RXTO_ENA_MSK		BIT(APPLE_S5L_UCON_RXTO_ENA)</div><div class='add'>+#define APPLE_S5L_UCON_RXTO_LEGACY_ENA_MSK	BIT(APPLE_S5L_UCON_RXTO_LEGACY_ENA)</div><div class='add'>+#define APPLE_S5L_UCON_RXTHRESH_ENA_MSK		BIT(APPLE_S5L_UCON_RXTHRESH_ENA)</div><div class='add'>+#define APPLE_S5L_UCON_TXTHRESH_ENA_MSK		BIT(APPLE_S5L_UCON_TXTHRESH_ENA)</div><div class='ctx'> </div><div class='ctx'> #define APPLE_S5L_UCON_DEFAULT		(S3C2410_UCON_TXIRQMODE | \</div><div class='ctx'> 					 S3C2410_UCON_RXIRQMODE | \</div><div class='ctx'> 					 S3C2410_UCON_RXFIFO_TOI)</div><div class='ctx'> #define APPLE_S5L_UCON_MASK		(APPLE_S5L_UCON_RXTO_ENA_MSK | \</div><div class='add'>+					 APPLE_S5L_UCON_RXTO_LEGACY_ENA_MSK | \</div><div class='ctx'> 					 APPLE_S5L_UCON_RXTHRESH_ENA_MSK | \</div><div class='ctx'> 					 APPLE_S5L_UCON_TXTHRESH_ENA_MSK)</div><div class='ctx'> </div><div class='del'>-#define APPLE_S5L_UTRSTAT_RXTHRESH	(1&lt;&lt;4)</div><div class='del'>-#define APPLE_S5L_UTRSTAT_TXTHRESH	(1&lt;&lt;5)</div><div class='del'>-#define APPLE_S5L_UTRSTAT_RXTO		(1&lt;&lt;9)</div><div class='del'>-#define APPLE_S5L_UTRSTAT_ALL_FLAGS	(0x3f0)</div><div class='add'>+#define APPLE_S5L_UTRSTAT_RXTO_LEGACY	BIT(3)</div><div class='add'>+#define APPLE_S5L_UTRSTAT_RXTHRESH	BIT(4)</div><div class='add'>+#define APPLE_S5L_UTRSTAT_TXTHRESH	BIT(5)</div><div class='add'>+#define APPLE_S5L_UTRSTAT_RXTO		BIT(9)</div><div class='add'>+#define APPLE_S5L_UTRSTAT_ALL_FLAGS	GENMASK(9, 3)</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h<br/>index 1c89611e0e06..0f2f50b8d28e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/serial_sci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serial_sci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/serial_sci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/serial_sci.h</a></div><div class='hunk'>@@ -37,6 +37,7 @@ enum {</div><div class='ctx'> 	SCIx_SH7705_SCIF_REGTYPE,</div><div class='ctx'> 	SCIx_HSCIF_REGTYPE,</div><div class='ctx'> 	SCIx_RZ_SCIFA_REGTYPE,</div><div class='add'>+	SCIx_RZV2H_SCIF_REGTYPE,</div><div class='ctx'> </div><div class='ctx'> 	SCIx_NR_REGTYPES,</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/serio.h b/include/linux/serio.h<br/>index 6c27d413da92..69a47674af65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/serio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/serio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/serio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/serio.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #define _SERIO_H</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -15,7 +16,7 @@</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/serio.h&gt;</div><div class='ctx'> </div><div class='del'>-extern struct bus_type serio_bus;</div><div class='add'>+extern const struct bus_type serio_bus;</div><div class='ctx'> </div><div class='ctx'> struct serio {</div><div class='ctx'> 	void *port_data;</div><div class='hunk'>@@ -80,7 +81,7 @@ struct serio_driver {</div><div class='ctx'> </div><div class='ctx'> 	struct device_driver driver;</div><div class='ctx'> };</div><div class='del'>-#define to_serio_driver(d)	container_of(d, struct serio_driver, driver)</div><div class='add'>+#define to_serio_driver(d)	container_of_const(d, struct serio_driver, driver)</div><div class='ctx'> </div><div class='ctx'> int serio_open(struct serio *serio, struct serio_driver *drv);</div><div class='ctx'> void serio_close(struct serio *serio);</div><div class='hunk'>@@ -161,4 +162,6 @@ static inline void serio_continue_rx(struct serio *serio)</div><div class='ctx'> 	spin_unlock_irq(&amp;serio-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DEFINE_GUARD(serio_pause_rx, struct serio *, serio_pause_rx(_T), serio_continue_rx(_T))</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h<br/>index 95ac8398ee72..3030d9245f5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/set_memory.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/set_memory.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/set_memory.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/set_memory.h</a></div><div class='hunk'>@@ -8,10 +8,10 @@</div><div class='ctx'> #ifdef CONFIG_ARCH_HAS_SET_MEMORY</div><div class='ctx'> #include &lt;asm/set_memory.h&gt;</div><div class='ctx'> #else</div><div class='del'>-static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }</div><div class='del'>-static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }</div><div class='del'>-static inline int set_memory_x(unsigned long addr,  int numpages) { return 0; }</div><div class='del'>-static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }</div><div class='add'>+static inline int __must_check set_memory_ro(unsigned long addr, int numpages) { return 0; }</div><div class='add'>+static inline int __must_check set_memory_rw(unsigned long addr, int numpages) { return 0; }</div><div class='add'>+static inline int __must_check set_memory_x(unsigned long addr,  int numpages) { return 0; }</div><div class='add'>+static inline int __must_check set_memory_nx(unsigned long addr, int numpages) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef set_memory_rox</div><div class='hunk'>@@ -34,6 +34,12 @@ static inline int set_direct_map_default_noflush(struct page *page)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int set_direct_map_valid_noflush(struct page *page,</div><div class='add'>+					       unsigned nr, bool valid)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool kernel_page_present(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	return true;</div><div class='head'>diff --git a/include/linux/sfp.h b/include/linux/sfp.h<br/>index 9346cd44814d..5c71945a5e4d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sfp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sfp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sfp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sfp.h</a></div><div class='hunk'>@@ -284,6 +284,12 @@ enum {</div><div class='ctx'> 	SFF8024_ID_QSFP_8438		= 0x0c,</div><div class='ctx'> 	SFF8024_ID_QSFP_8436_8636	= 0x0d,</div><div class='ctx'> 	SFF8024_ID_QSFP28_8636		= 0x11,</div><div class='add'>+	SFF8024_ID_QSFP_DD		= 0x18,</div><div class='add'>+	SFF8024_ID_OSFP			= 0x19,</div><div class='add'>+	SFF8024_ID_DSFP			= 0x1B,</div><div class='add'>+	SFF8024_ID_QSFP_PLUS_CMIS	= 0x1E,</div><div class='add'>+	SFF8024_ID_SFP_DD_CMIS		= 0x1F,</div><div class='add'>+	SFF8024_ID_SFP_PLUS_CMIS	= 0x20,</div><div class='ctx'> </div><div class='ctx'> 	SFF8024_ENCODING_UNSPEC		= 0x00,</div><div class='ctx'> 	SFF8024_ENCODING_8B10B		= 0x01,</div><div class='hunk'>@@ -516,6 +522,28 @@ struct ethtool_modinfo;</div><div class='ctx'> struct sfp_bus;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct sfp_module_caps - sfp module capabilities</div><div class='add'>+ * @interfaces: bitmap of interfaces that the module may support</div><div class='add'>+ * @link_modes: bitmap of ethtool link modes that the module may support</div><div class='add'>+ */</div><div class='add'>+struct sfp_module_caps {</div><div class='add'>+	DECLARE_PHY_INTERFACE_MASK(interfaces);</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(link_modes);</div><div class='add'>+	/**</div><div class='add'>+	 * @may_have_phy: indicate whether the module may have an ethernet PHY</div><div class='add'>+	 * There is no way to be sure that a module has a PHY as the EEPROM</div><div class='add'>+	 * doesn't contain this information. When set, this does not mean that</div><div class='add'>+	 * the module definitely has a PHY.</div><div class='add'>+	 */</div><div class='add'>+	bool may_have_phy;</div><div class='add'>+	/**</div><div class='add'>+	 * @port: one of ethtool %PORT_* definitions, parsed from the module</div><div class='add'>+	 * EEPROM, or %PORT_OTHER if the port type is not known.</div><div class='add'>+	 */</div><div class='add'>+	u8 port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct sfp_upstream_ops - upstream operations structure</div><div class='ctx'>  * @attach: called when the sfp socket driver is bound to the upstream</div><div class='ctx'>  *   (mandatory).</div><div class='hunk'>@@ -544,17 +572,13 @@ struct sfp_upstream_ops {</div><div class='ctx'> 	void (*link_down)(void *priv);</div><div class='ctx'> 	void (*link_up)(void *priv);</div><div class='ctx'> 	int (*connect_phy)(void *priv, struct phy_device *);</div><div class='del'>-	void (*disconnect_phy)(void *priv);</div><div class='add'>+	void (*disconnect_phy)(void *priv, struct phy_device *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_SFP)</div><div class='del'>-int sfp_parse_port(struct sfp_bus *bus, const struct sfp_eeprom_id *id,</div><div class='del'>-		   unsigned long *support);</div><div class='del'>-bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id);</div><div class='del'>-void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,</div><div class='del'>-		       unsigned long *support, unsigned long *interfaces);</div><div class='add'>+const struct sfp_module_caps *sfp_get_module_caps(struct sfp_bus *bus);</div><div class='ctx'> phy_interface_t sfp_select_interface(struct sfp_bus *bus,</div><div class='del'>-				     unsigned long *link_modes);</div><div class='add'>+				     const unsigned long *link_modes);</div><div class='ctx'> </div><div class='ctx'> int sfp_get_module_info(struct sfp_bus *bus, struct ethtool_modinfo *modinfo);</div><div class='ctx'> int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee,</div><div class='hunk'>@@ -570,29 +594,16 @@ struct sfp_bus *sfp_bus_find_fwnode(const struct fwnode_handle *fwnode);</div><div class='ctx'> int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,</div><div class='ctx'> 			 const struct sfp_upstream_ops *ops);</div><div class='ctx'> void sfp_bus_del_upstream(struct sfp_bus *bus);</div><div class='add'>+const char *sfp_get_name(struct sfp_bus *bus);</div><div class='ctx'> #else</div><div class='del'>-static inline int sfp_parse_port(struct sfp_bus *bus,</div><div class='del'>-				 const struct sfp_eeprom_id *id,</div><div class='del'>-				 unsigned long *support)</div><div class='del'>-{</div><div class='del'>-	return PORT_OTHER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool sfp_may_have_phy(struct sfp_bus *bus,</div><div class='del'>-				    const struct sfp_eeprom_id *id)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sfp_parse_support(struct sfp_bus *bus,</div><div class='del'>-				     const struct sfp_eeprom_id *id,</div><div class='del'>-				     unsigned long *support,</div><div class='del'>-				     unsigned long *interfaces)</div><div class='add'>+static inline const struct sfp_module_caps *</div><div class='add'>+sfp_get_module_caps(struct sfp_bus *bus)</div><div class='ctx'> {</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline phy_interface_t sfp_select_interface(struct sfp_bus *bus,</div><div class='del'>-						   unsigned long *link_modes)</div><div class='add'>+						const unsigned long *link_modes)</div><div class='ctx'> {</div><div class='ctx'> 	return PHY_INTERFACE_MODE_NA;</div><div class='ctx'> }</div><div class='hunk'>@@ -648,6 +659,11 @@ static inline int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,</div><div class='ctx'> static inline void sfp_bus_del_upstream(struct sfp_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline const char *sfp_get_name(struct sfp_bus *bus)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h<br/>index 6dfd05ef5c2d..03ba4dab2ef7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/shdma-base.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/shdma-base.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/shdma-base.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/shdma-base.h</a></div><div class='hunk'>@@ -96,7 +96,7 @@ struct shdma_ops {</div><div class='ctx'> 	int (*desc_setup)(struct shdma_chan *, struct shdma_desc *,</div><div class='ctx'> 			  dma_addr_t, dma_addr_t, size_t *);</div><div class='ctx'> 	int (*set_slave)(struct shdma_chan *, int, dma_addr_t, bool);</div><div class='del'>-	void (*setup_xfer)(struct shdma_chan *, int);</div><div class='add'>+	int (*setup_xfer)(struct shdma_chan *, int);</div><div class='ctx'> 	void (*start_xfer)(struct shdma_chan *, struct shdma_desc *);</div><div class='ctx'> 	struct shdma_desc *(*embedded_desc)(void *, int);</div><div class='ctx'> 	bool (*chan_irq)(struct shdma_chan *, int);</div><div class='head'>diff --git a/include/linux/shm.h b/include/linux/shm.h<br/>index c55bef0538e5..1d3d3ae958fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/shm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/shm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/shm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/shm.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@ struct sysv_shm {</div><div class='ctx'> </div><div class='ctx'> long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr,</div><div class='ctx'> 	      unsigned long shmlba);</div><div class='del'>-bool is_file_shm_hugepages(struct file *file);</div><div class='ctx'> void exit_shm(struct task_struct *task);</div><div class='ctx'> #define shm_init_task(task) INIT_LIST_HEAD(&amp;(task)-&gt;sysvshm.shm_clist)</div><div class='ctx'> #else</div><div class='hunk'>@@ -30,10 +29,6 @@ static inline long do_shmat(int shmid, char __user *shmaddr,</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='del'>-static inline bool is_file_shm_hugepages(struct file *file)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='ctx'> static inline void exit_shm(struct task_struct *task)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h<br/>index 2caa6b86106a..e2069b3179c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/shmem_fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/shmem_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/shmem_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/shmem_fs.h</a></div><div class='hunk'>@@ -10,6 +10,9 @@</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='ctx'> #include &lt;linux/fs_parser.h&gt;</div><div class='ctx'> #include &lt;linux/userfaultfd_k.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+struct swap_iocb;</div><div class='ctx'> </div><div class='ctx'> /* inode in-kernel data */</div><div class='ctx'> </div><div class='hunk'>@@ -17,6 +20,19 @@</div><div class='ctx'> #define SHMEM_MAXQUOTAS 2</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Suppress pre-accounting of the entire object size. */</div><div class='add'>+#define SHMEM_F_NORESERVE	BIT(0)</div><div class='add'>+/* Disallow swapping. */</div><div class='add'>+#define SHMEM_F_LOCKED		BIT(1)</div><div class='add'>+/*</div><div class='add'>+ * Disallow growing, shrinking, or hole punching in the inode. Combined with</div><div class='add'>+ * folio pinning, makes sure the inode's mapping stays fixed.</div><div class='add'>+ *</div><div class='add'>+ * In some ways similar to F_SEAL_GROW | F_SEAL_SHRINK, but can be removed and</div><div class='add'>+ * isn't directly visible to userspace.</div><div class='add'>+ */</div><div class='add'>+#define SHMEM_F_MAPPING_FROZEN	BIT(2)</div><div class='add'>+</div><div class='ctx'> struct shmem_inode_info {</div><div class='ctx'> 	spinlock_t		lock;</div><div class='ctx'> 	unsigned int		seals;		/* shmem seals */</div><div class='hunk'>@@ -37,15 +53,15 @@ struct shmem_inode_info {</div><div class='ctx'> 	unsigned int		fsflags;	/* for FS_IOC_[SG]ETFLAGS */</div><div class='ctx'> 	atomic_t		stop_eviction;	/* hold when working on inode */</div><div class='ctx'> #ifdef CONFIG_TMPFS_QUOTA</div><div class='del'>-	struct dquot		*i_dquot[MAXQUOTAS];</div><div class='add'>+	struct dquot __rcu	*i_dquot[MAXQUOTAS];</div><div class='ctx'> #endif</div><div class='ctx'> 	struct inode		vfs_inode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SHMEM_FL_USER_VISIBLE		FS_FL_USER_VISIBLE</div><div class='add'>+#define SHMEM_FL_USER_VISIBLE		(FS_FL_USER_VISIBLE | FS_CASEFOLD_FL)</div><div class='ctx'> #define SHMEM_FL_USER_MODIFIABLE \</div><div class='del'>-	(FS_IMMUTABLE_FL | FS_APPEND_FL | FS_NODUMP_FL | FS_NOATIME_FL)</div><div class='del'>-#define SHMEM_FL_INHERITED		(FS_NODUMP_FL | FS_NOATIME_FL)</div><div class='add'>+	(FS_IMMUTABLE_FL | FS_APPEND_FL | FS_NODUMP_FL | FS_NOATIME_FL | FS_CASEFOLD_FL)</div><div class='add'>+#define SHMEM_FL_INHERITED		(FS_NODUMP_FL | FS_NOATIME_FL | FS_CASEFOLD_FL)</div><div class='ctx'> </div><div class='ctx'> struct shmem_quota_limits {</div><div class='ctx'> 	qsize_t usrquota_bhardlimit; /* Default user quota block hard limit */</div><div class='hunk'>@@ -92,37 +108,58 @@ extern struct file *shmem_kernel_file_setup(const char *name, loff_t size,</div><div class='ctx'> 					    unsigned long flags);</div><div class='ctx'> extern struct file *shmem_file_setup_with_mnt(struct vfsmount *mnt,</div><div class='ctx'> 		const char *name, loff_t size, unsigned long flags);</div><div class='del'>-extern int shmem_zero_setup(struct vm_area_struct *);</div><div class='add'>+int shmem_zero_setup(struct vm_area_struct *vma);</div><div class='add'>+int shmem_zero_setup_desc(struct vm_area_desc *desc);</div><div class='ctx'> extern unsigned long shmem_get_unmapped_area(struct file *, unsigned long addr,</div><div class='ctx'> 		unsigned long len, unsigned long pgoff, unsigned long flags);</div><div class='ctx'> extern int shmem_lock(struct file *file, int lock, struct ucounts *ucounts);</div><div class='ctx'> #ifdef CONFIG_SHMEM</div><div class='del'>-extern const struct address_space_operations shmem_aops;</div><div class='del'>-static inline bool shmem_mapping(struct address_space *mapping)</div><div class='del'>-{</div><div class='del'>-	return mapping-&gt;a_ops == &amp;shmem_aops;</div><div class='del'>-}</div><div class='add'>+bool shmem_mapping(const struct address_space *mapping);</div><div class='ctx'> #else</div><div class='del'>-static inline bool shmem_mapping(struct address_space *mapping)</div><div class='add'>+static inline bool shmem_mapping(const struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SHMEM */</div><div class='del'>-extern void shmem_unlock_mapping(struct address_space *mapping);</div><div class='del'>-extern struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,</div><div class='add'>+void shmem_unlock_mapping(struct address_space *mapping);</div><div class='add'>+struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,</div><div class='ctx'> 					pgoff_t index, gfp_t gfp_mask);</div><div class='del'>-extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end);</div><div class='add'>+int shmem_writeout(struct folio *folio, struct swap_iocb **plug,</div><div class='add'>+		struct list_head *folio_list);</div><div class='add'>+void shmem_truncate_range(struct inode *inode, loff_t start, uoff_t end);</div><div class='ctx'> int shmem_unuse(unsigned int type);</div><div class='ctx'> </div><div class='del'>-extern bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force,</div><div class='del'>-			  struct mm_struct *mm, unsigned long vm_flags);</div><div class='add'>+#ifdef CONFIG_TRANSPARENT_HUGEPAGE</div><div class='add'>+unsigned long shmem_allowable_huge_orders(struct inode *inode,</div><div class='add'>+				struct vm_area_struct *vma, pgoff_t index,</div><div class='add'>+				loff_t write_end, bool shmem_huge_force);</div><div class='add'>+bool shmem_hpage_pmd_enabled(void);</div><div class='add'>+#else</div><div class='add'>+static inline unsigned long shmem_allowable_huge_orders(struct inode *inode,</div><div class='add'>+				struct vm_area_struct *vma, pgoff_t index,</div><div class='add'>+				loff_t write_end, bool shmem_huge_force)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool shmem_hpage_pmd_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SHMEM</div><div class='ctx'> extern unsigned long shmem_swap_usage(struct vm_area_struct *vma);</div><div class='add'>+extern void shmem_uncharge(struct inode *inode, long pages);</div><div class='ctx'> #else</div><div class='ctx'> static inline unsigned long shmem_swap_usage(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void shmem_uncharge(struct inode *inode, long pages)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> extern unsigned long shmem_partial_swap_usage(struct address_space *mapping,</div><div class='ctx'> 						pgoff_t start, pgoff_t end);</div><div class='hunk'>@@ -136,8 +173,8 @@ enum sgp_type {</div><div class='ctx'> 	SGP_FALLOC,	/* like SGP_WRITE, but make existing page Uptodate */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop,</div><div class='del'>-		enum sgp_type sgp);</div><div class='add'>+int shmem_get_folio(struct inode *inode, pgoff_t index, loff_t write_end,</div><div class='add'>+		struct folio **foliop, enum sgp_type sgp);</div><div class='ctx'> struct folio *shmem_read_folio_gfp(struct address_space *mapping,</div><div class='ctx'> 		pgoff_t index, gfp_t gfp);</div><div class='ctx'> </div><div class='hunk'>@@ -163,6 +200,15 @@ static inline bool shmem_file(struct file *file)</div><div class='ctx'> 	return shmem_mapping(file-&gt;f_mapping);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Must be called with inode lock taken exclusive. */</div><div class='add'>+static inline void shmem_freeze(struct inode *inode, bool freeze)</div><div class='add'>+{</div><div class='add'>+	if (freeze)</div><div class='add'>+		SHMEM_I(inode)-&gt;flags |= SHMEM_F_MAPPING_FROZEN;</div><div class='add'>+	else</div><div class='add'>+		SHMEM_I(inode)-&gt;flags &amp;= ~SHMEM_F_MAPPING_FROZEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * If fallocate(FALLOC_FL_KEEP_SIZE) has been used, there may be pages</div><div class='ctx'>  * beyond i_size's notion of EOF, which fallocate has committed to reserving:</div><div class='hunk'>@@ -176,7 +222,6 @@ static inline pgoff_t shmem_fallocend(struct inode *inode, pgoff_t eof)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern bool shmem_charge(struct inode *inode, long pages);</div><div class='del'>-extern void shmem_uncharge(struct inode *inode, long pages);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_USERFAULTFD</div><div class='ctx'> #ifdef CONFIG_SHMEM</div><div class='head'>diff --git a/include/linux/sizes.h b/include/linux/sizes.h<br/>index c3a00b967d18..f1f1a055b047 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sizes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sizes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sizes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sizes.h</a></div><div class='hunk'>@@ -23,17 +23,25 @@</div><div class='ctx'> #define SZ_4K				0x00001000</div><div class='ctx'> #define SZ_8K				0x00002000</div><div class='ctx'> #define SZ_16K				0x00004000</div><div class='add'>+#define SZ_24K				0x00006000</div><div class='ctx'> #define SZ_32K				0x00008000</div><div class='ctx'> #define SZ_64K				0x00010000</div><div class='ctx'> #define SZ_128K				0x00020000</div><div class='add'>+#define SZ_192K				0x00030000</div><div class='ctx'> #define SZ_256K				0x00040000</div><div class='add'>+#define SZ_384K				0x00060000</div><div class='ctx'> #define SZ_512K				0x00080000</div><div class='ctx'> </div><div class='ctx'> #define SZ_1M				0x00100000</div><div class='ctx'> #define SZ_2M				0x00200000</div><div class='add'>+#define SZ_3M				0x00300000</div><div class='ctx'> #define SZ_4M				0x00400000</div><div class='add'>+#define SZ_6M				0x00600000</div><div class='ctx'> #define SZ_8M				0x00800000</div><div class='add'>+#define SZ_12M				0x00c00000</div><div class='ctx'> #define SZ_16M				0x01000000</div><div class='add'>+#define SZ_18M				0x01200000</div><div class='add'>+#define SZ_24M				0x01800000</div><div class='ctx'> #define SZ_32M				0x02000000</div><div class='ctx'> #define SZ_64M				0x04000000</div><div class='ctx'> #define SZ_128M				0x08000000</div><div class='hunk'>@@ -59,5 +67,6 @@</div><div class='ctx'> #define SZ_16T				_AC(0x100000000000, ULL)</div><div class='ctx'> #define SZ_32T				_AC(0x200000000000, ULL)</div><div class='ctx'> #define SZ_64T				_AC(0x400000000000, ULL)</div><div class='add'>+#define SZ_128T				_AC(0x800000000000, ULL)</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_SIZES_H__ */</div><div class='head'>diff --git a/include/linux/skb_array.h b/include/linux/skb_array.h<br/>index e2d45b7cb619..bf178238a308 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/skb_array.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/skb_array.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/skb_array.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/skb_array.h</a></div><div class='hunk'>@@ -177,10 +177,11 @@ static inline int skb_array_peek_len_any(struct skb_array *a)</div><div class='ctx'> 	return PTR_RING_PEEK_CALL_ANY(&amp;a-&gt;ring, __skb_array_len_with_tag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int skb_array_init(struct skb_array *a, int size, gfp_t gfp)</div><div class='add'>+static inline int skb_array_init_noprof(struct skb_array *a, int size, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	return ptr_ring_init(&amp;a-&gt;ring, size, gfp);</div><div class='add'>+	return ptr_ring_init_noprof(&amp;a-&gt;ring, size, gfp);</div><div class='ctx'> }</div><div class='add'>+#define skb_array_init(...)	alloc_hooks(skb_array_init_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> static void __skb_array_destroy_skb(void *ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -198,15 +199,18 @@ static inline int skb_array_resize(struct skb_array *a, int size, gfp_t gfp)</div><div class='ctx'> 	return ptr_ring_resize(&amp;a-&gt;ring, size, gfp, __skb_array_destroy_skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int skb_array_resize_multiple(struct skb_array **rings,</div><div class='del'>-					    int nrings, unsigned int size,</div><div class='del'>-					    gfp_t gfp)</div><div class='add'>+static inline int skb_array_resize_multiple_bh_noprof(struct skb_array **rings,</div><div class='add'>+						      int nrings,</div><div class='add'>+						      unsigned int size,</div><div class='add'>+						      gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	BUILD_BUG_ON(offsetof(struct skb_array, ring));</div><div class='del'>-	return ptr_ring_resize_multiple((struct ptr_ring **)rings,</div><div class='del'>-					nrings, size, gfp,</div><div class='del'>-					__skb_array_destroy_skb);</div><div class='add'>+	return ptr_ring_resize_multiple_bh_noprof((struct ptr_ring **)rings,</div><div class='add'>+					          nrings, size, gfp,</div><div class='add'>+					          __skb_array_destroy_skb);</div><div class='ctx'> }</div><div class='add'>+#define skb_array_resize_multiple_bh(...)	\</div><div class='add'>+		alloc_hooks(skb_array_resize_multiple_bh_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> static inline void skb_array_cleanup(struct skb_array *a)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h<br/>index 3023bc2be6a1..86737076101d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/skbuff.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/skbuff.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/skbuff.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/skbuff.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/if_packet.h&gt;</div><div class='ctx'> #include &lt;linux/llist.h&gt;</div><div class='add'>+#include &lt;linux/page_frag_cache.h&gt;</div><div class='ctx'> #include &lt;net/flow.h&gt;</div><div class='ctx'> #if IS_ENABLED(CONFIG_NF_CONNTRACK)</div><div class='ctx'> #include &lt;linux/netfilter/nf_conntrack_common.h&gt;</div><div class='hunk'>@@ -273,7 +274,6 @@</div><div class='ctx'> 			 SKB_DATA_ALIGN(sizeof(struct sk_buff)) +	\</div><div class='ctx'> 			 SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))</div><div class='ctx'> </div><div class='del'>-struct ahash_request;</div><div class='ctx'> struct net_device;</div><div class='ctx'> struct scatterlist;</div><div class='ctx'> struct pipe_inode_info;</div><div class='hunk'>@@ -353,8 +353,6 @@ struct sk_buff;</div><div class='ctx'> </div><div class='ctx'> #define MAX_SKB_FRAGS CONFIG_MAX_SKB_FRAGS</div><div class='ctx'> </div><div class='del'>-extern int sysctl_max_skb_frags;</div><div class='del'>-</div><div class='ctx'> /* Set skb_shinfo(skb)-&gt;gso_size to this in case you want skb_segment to</div><div class='ctx'>  * segment using its current segmentation instead.</div><div class='ctx'>  */</div><div class='hunk'>@@ -471,7 +469,7 @@ struct skb_shared_hwtstamps {</div><div class='ctx'> /* Definitions for tx_flags in struct skb_shared_info */</div><div class='ctx'> enum {</div><div class='ctx'> 	/* generate hardware time stamp */</div><div class='del'>-	SKBTX_HW_TSTAMP = 1 &lt;&lt; 0,</div><div class='add'>+	SKBTX_HW_TSTAMP_NOBPF = 1 &lt;&lt; 0,</div><div class='ctx'> </div><div class='ctx'> 	/* generate software time stamp when queueing packet to NIC */</div><div class='ctx'> 	SKBTX_SW_TSTAMP = 1 &lt;&lt; 1,</div><div class='hunk'>@@ -479,23 +477,26 @@ enum {</div><div class='ctx'> 	/* device driver is going to provide hardware time stamp */</div><div class='ctx'> 	SKBTX_IN_PROGRESS = 1 &lt;&lt; 2,</div><div class='ctx'> </div><div class='del'>-	/* generate hardware time stamp based on cycles if supported */</div><div class='del'>-	SKBTX_HW_TSTAMP_USE_CYCLES = 1 &lt;&lt; 3,</div><div class='del'>-</div><div class='del'>-	/* generate wifi status information (where possible) */</div><div class='del'>-	SKBTX_WIFI_STATUS = 1 &lt;&lt; 4,</div><div class='add'>+	/* generate software time stamp on packet tx completion */</div><div class='add'>+	SKBTX_COMPLETION_TSTAMP = 1 &lt;&lt; 3,</div><div class='ctx'> </div><div class='ctx'> 	/* determine hardware time stamp based on time or cycles */</div><div class='ctx'> 	SKBTX_HW_TSTAMP_NETDEV = 1 &lt;&lt; 5,</div><div class='ctx'> </div><div class='ctx'> 	/* generate software time stamp when entering packet scheduling */</div><div class='ctx'> 	SKBTX_SCHED_TSTAMP = 1 &lt;&lt; 6,</div><div class='add'>+</div><div class='add'>+	/* used for bpf extension when a bpf program is loaded */</div><div class='add'>+	SKBTX_BPF = 1 &lt;&lt; 7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SKBTX_HW_TSTAMP		(SKBTX_HW_TSTAMP_NOBPF | SKBTX_BPF)</div><div class='add'>+</div><div class='ctx'> #define SKBTX_ANY_SW_TSTAMP	(SKBTX_SW_TSTAMP    | \</div><div class='del'>-				 SKBTX_SCHED_TSTAMP)</div><div class='add'>+				 SKBTX_SCHED_TSTAMP | \</div><div class='add'>+				 SKBTX_BPF          | \</div><div class='add'>+				 SKBTX_COMPLETION_TSTAMP)</div><div class='ctx'> #define SKBTX_ANY_TSTAMP	(SKBTX_HW_TSTAMP | \</div><div class='del'>-				 SKBTX_HW_TSTAMP_USE_CYCLES | \</div><div class='ctx'> 				 SKBTX_ANY_SW_TSTAMP)</div><div class='ctx'> </div><div class='ctx'> /* Definitions for flags in struct skb_shared_info */</div><div class='hunk'>@@ -527,6 +528,13 @@ enum {</div><div class='ctx'> #define SKBFL_ALL_ZEROCOPY	(SKBFL_ZEROCOPY_FRAG | SKBFL_PURE_ZEROCOPY | \</div><div class='ctx'> 				 SKBFL_DONT_ORPHAN | SKBFL_MANAGED_FRAG_REFS)</div><div class='ctx'> </div><div class='add'>+struct ubuf_info_ops {</div><div class='add'>+	void (*complete)(struct sk_buff *, struct ubuf_info *,</div><div class='add'>+			 bool zerocopy_success);</div><div class='add'>+	/* has to be compatible with skb_zcopy_set() */</div><div class='add'>+	int (*link_skb)(struct sk_buff *skb, struct ubuf_info *uarg);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The callback notifies userspace to release buffers when skb DMA is done in</div><div class='ctx'>  * lower device, the skb last reference should be 0 when calling this.</div><div class='hunk'>@@ -536,8 +544,7 @@ enum {</div><div class='ctx'>  * The desc field is used to track userspace buffer index.</div><div class='ctx'>  */</div><div class='ctx'> struct ubuf_info {</div><div class='del'>-	void (*callback)(struct sk_buff *, struct ubuf_info *,</div><div class='del'>-			 bool zerocopy_success);</div><div class='add'>+	const struct ubuf_info_ops *ops;</div><div class='ctx'> 	refcount_t refcnt;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> };</div><div class='hunk'>@@ -603,11 +610,19 @@ struct skb_shared_info {</div><div class='ctx'> 	 * Warning : all fields before dataref are cleared in __alloc_skb()</div><div class='ctx'> 	 */</div><div class='ctx'> 	atomic_t	dataref;</div><div class='del'>-	unsigned int	xdp_frags_size;</div><div class='ctx'> </div><div class='del'>-	/* Intermediate layers must ensure that destructor_arg</div><div class='del'>-	 * remains valid until skb destructor */</div><div class='del'>-	void *		destructor_arg;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32		xdp_frags_size;</div><div class='add'>+			u32		xdp_frags_truesize;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Intermediate layers must ensure that destructor_arg</div><div class='add'>+		 * remains valid until skb destructor.</div><div class='add'>+		 */</div><div class='add'>+		void		*destructor_arg;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/* must be last field, see pskb_expand_head() */</div><div class='ctx'> 	skb_frag_t	frags[MAX_SKB_FRAGS];</div><div class='hunk'>@@ -659,7 +674,7 @@ enum {</div><div class='ctx'> 	/* This indicates the tcp segment has CWR set. */</div><div class='ctx'> 	SKB_GSO_TCP_ECN = 1 &lt;&lt; 2,</div><div class='ctx'> </div><div class='del'>-	SKB_GSO_TCP_FIXEDID = 1 &lt;&lt; 3,</div><div class='add'>+	__SKB_GSO_TCP_FIXEDID = 1 &lt;&lt; 3,</div><div class='ctx'> </div><div class='ctx'> 	SKB_GSO_TCPV6 = 1 &lt;&lt; 4,</div><div class='ctx'> </div><div class='hunk'>@@ -690,6 +705,14 @@ enum {</div><div class='ctx'> 	SKB_GSO_UDP_L4 = 1 &lt;&lt; 17,</div><div class='ctx'> </div><div class='ctx'> 	SKB_GSO_FRAGLIST = 1 &lt;&lt; 18,</div><div class='add'>+</div><div class='add'>+	SKB_GSO_TCP_ACCECN = 1 &lt;&lt; 19,</div><div class='add'>+</div><div class='add'>+	/* These indirectly map onto the same netdev feature.</div><div class='add'>+	 * If NETIF_F_TSO_MANGLEID is set it may mangle both inner and outer IDs.</div><div class='add'>+	 */</div><div class='add'>+	SKB_GSO_TCP_FIXEDID = 1 &lt;&lt; 30,</div><div class='add'>+	SKB_GSO_TCP_FIXEDID_INNER = 1 &lt;&lt; 31,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if BITS_PER_LONG &gt; 32</div><div class='hunk'>@@ -702,6 +725,13 @@ typedef unsigned int sk_buff_data_t;</div><div class='ctx'> typedef unsigned char *sk_buff_data_t;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+enum skb_tstamp_type {</div><div class='add'>+	SKB_CLOCK_REALTIME,</div><div class='add'>+	SKB_CLOCK_MONOTONIC,</div><div class='add'>+	SKB_CLOCK_TAI,</div><div class='add'>+	__SKB_CLOCK_MAX = SKB_CLOCK_TAI,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * DOC: Basic sk_buff geometry</div><div class='ctx'>  *</div><div class='hunk'>@@ -753,8 +783,6 @@ typedef unsigned char *sk_buff_data_t;</div><div class='ctx'>  *	@list: queue head</div><div class='ctx'>  *	@ll_node: anchor in an llist (eg socket defer_list)</div><div class='ctx'>  *	@sk: Socket we are owned by</div><div class='del'>- *	@ip_defrag_offset: (aka @sk) alternate use of @sk, used in</div><div class='del'>- *		fragmentation management</div><div class='ctx'>  *	@dev: Device we arrived on/are leaving by</div><div class='ctx'>  *	@dev_scratch: (aka @dev) alternate use of @dev when @dev would be %NULL</div><div class='ctx'>  *	@cb: Control buffer. Free for use by every layer. Put private vars here</div><div class='hunk'>@@ -818,13 +846,13 @@ typedef unsigned char *sk_buff_data_t;</div><div class='ctx'>  *	@csum_level: indicates the number of consecutive checksums found in</div><div class='ctx'>  *		the packet minus one that have been verified as</div><div class='ctx'>  *		CHECKSUM_UNNECESSARY (max 3)</div><div class='add'>+ *	@unreadable: indicates that at least 1 of the fragments in this skb is</div><div class='add'>+ *		unreadable.</div><div class='ctx'>  *	@dst_pending_confirm: need to confirm neighbour</div><div class='ctx'>  *	@decrypted: Decrypted SKB</div><div class='ctx'>  *	@slow_gro: state present at GRO time, slower prepare step required</div><div class='del'>- *	@mono_delivery_time: When set, skb-&gt;tstamp has the</div><div class='del'>- *		delivery_time in mono clock base (i.e., EDT) or a clock base chosen</div><div class='del'>- *		by SO_TXTIME. If zero, skb-&gt;tstamp has the (rcv) timestamp at</div><div class='del'>- *		ingress.</div><div class='add'>+ *	@tstamp_type: When set, skb-&gt;tstamp has the</div><div class='add'>+ *		delivery_time clock base of skb-&gt;tstamp.</div><div class='ctx'>  *	@napi_id: id of the NAPI struct this skb came from</div><div class='ctx'>  *	@sender_cpu: (aka @napi_id) source CPU in XPS</div><div class='ctx'>  *	@alloc_cpu: CPU which did the skb allocation.</div><div class='hunk'>@@ -875,10 +903,7 @@ struct sk_buff {</div><div class='ctx'> 		struct llist_node	ll_node;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	union {</div><div class='del'>-		struct sock		*sk;</div><div class='del'>-		int			ip_defrag_offset;</div><div class='del'>-	};</div><div class='add'>+	struct sock		*sk;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		ktime_t		tstamp;</div><div class='hunk'>@@ -955,7 +980,7 @@ struct sk_buff {</div><div class='ctx'> 	/* private: */</div><div class='ctx'> 	__u8			__mono_tc_offset[0];</div><div class='ctx'> 	/* public: */</div><div class='del'>-	__u8			mono_delivery_time:1;	/* See SKB_MONO_DELIVERY_TIME_MASK */</div><div class='add'>+	__u8			tstamp_type:2;	/* See skb_tstamp_type */</div><div class='ctx'> #ifdef CONFIG_NET_XGRESS</div><div class='ctx'> 	__u8			tc_at_ingress:1;	/* See TC_AT_INGRESS_MASK */</div><div class='ctx'> 	__u8			tc_skip_classify:1;</div><div class='hunk'>@@ -997,14 +1022,14 @@ struct sk_buff {</div><div class='ctx'> #ifdef CONFIG_NETFILTER_SKIP_EGRESS</div><div class='ctx'> 	__u8			nf_skip_egress:1;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_TLS_DEVICE</div><div class='add'>+#ifdef CONFIG_SKB_DECRYPTED</div><div class='ctx'> 	__u8			decrypted:1;</div><div class='ctx'> #endif</div><div class='ctx'> 	__u8			slow_gro:1;</div><div class='ctx'> #if IS_ENABLED(CONFIG_IP_SCTP)</div><div class='ctx'> 	__u8			csum_not_inet:1;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='add'>+	__u8			unreadable:1;</div><div class='ctx'> #if defined(CONFIG_NET_SCHED) || defined(CONFIG_NET_XGRESS)</div><div class='ctx'> 	__u16			tc_index;	/* traffic control index */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1085,15 +1110,16 @@ struct sk_buff {</div><div class='ctx'> #endif</div><div class='ctx'> #define PKT_TYPE_OFFSET		offsetof(struct sk_buff, __pkt_type_offset)</div><div class='ctx'> </div><div class='del'>-/* if you move tc_at_ingress or mono_delivery_time</div><div class='add'>+/* if you move tc_at_ingress or tstamp_type</div><div class='ctx'>  * around, you also must adapt these constants.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef __BIG_ENDIAN_BITFIELD</div><div class='del'>-#define SKB_MONO_DELIVERY_TIME_MASK	(1 &lt;&lt; 7)</div><div class='del'>-#define TC_AT_INGRESS_MASK		(1 &lt;&lt; 6)</div><div class='add'>+#define SKB_TSTAMP_TYPE_MASK		(3 &lt;&lt; 6)</div><div class='add'>+#define SKB_TSTAMP_TYPE_RSHIFT		(6)</div><div class='add'>+#define TC_AT_INGRESS_MASK		(1 &lt;&lt; 5)</div><div class='ctx'> #else</div><div class='del'>-#define SKB_MONO_DELIVERY_TIME_MASK	(1 &lt;&lt; 0)</div><div class='del'>-#define TC_AT_INGRESS_MASK		(1 &lt;&lt; 1)</div><div class='add'>+#define SKB_TSTAMP_TYPE_MASK		(3)</div><div class='add'>+#define TC_AT_INGRESS_MASK		(1 &lt;&lt; 2)</div><div class='ctx'> #endif</div><div class='ctx'> #define SKB_BF_MONO_TC_OFFSET		offsetof(struct sk_buff, __mono_tc_offset)</div><div class='ctx'> </div><div class='hunk'>@@ -1126,7 +1152,7 @@ static inline bool skb_pfmemalloc(const struct sk_buff *skb)</div><div class='ctx'>  * skb_dst - returns skb dst_entry</div><div class='ctx'>  * @skb: buffer</div><div class='ctx'>  *</div><div class='del'>- * Returns skb dst_entry, regardless of reference taken or not.</div><div class='add'>+ * Returns: skb dst_entry, regardless of reference taken or not.</div><div class='ctx'>  */</div><div class='ctx'> static inline struct dst_entry *skb_dst(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -1139,6 +1165,45 @@ static inline struct dst_entry *skb_dst(const struct sk_buff *skb)</div><div class='ctx'> 	return (struct dst_entry *)(skb-&gt;_skb_refdst &amp; SKB_DST_PTRMASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void skb_dst_check_unset(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE((skb-&gt;_skb_refdst &amp; SKB_DST_PTRMASK) &amp;&amp;</div><div class='add'>+			       !(skb-&gt;_skb_refdst &amp; SKB_DST_NOREF));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_dstref_steal() - return current dst_entry value and clear it</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ *</div><div class='add'>+ * Resets skb dst_entry without adjusting its reference count. Useful in</div><div class='add'>+ * cases where dst_entry needs to be temporarily reset and restored.</div><div class='add'>+ * Note that the returned value cannot be used directly because it</div><div class='add'>+ * might contain SKB_DST_NOREF bit.</div><div class='add'>+ *</div><div class='add'>+ * When in doubt, prefer skb_dst_drop() over skb_dstref_steal() to correctly</div><div class='add'>+ * handle dst_entry reference counting.</div><div class='add'>+ *</div><div class='add'>+ * Returns: original skb dst_entry.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long skb_dstref_steal(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned long refdst = skb-&gt;_skb_refdst;</div><div class='add'>+</div><div class='add'>+	skb-&gt;_skb_refdst = 0;</div><div class='add'>+	return refdst;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_dstref_restore() - restore skb dst_entry removed via skb_dstref_steal()</div><div class='add'>+ * @skb: buffer</div><div class='add'>+ * @refdst: dst entry from a call to skb_dstref_steal()</div><div class='add'>+ */</div><div class='add'>+static inline void skb_dstref_restore(struct sk_buff *skb, unsigned long refdst)</div><div class='add'>+{</div><div class='add'>+	skb_dst_check_unset(skb);</div><div class='add'>+	skb-&gt;_skb_refdst = refdst;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * skb_dst_set - sets skb dst</div><div class='ctx'>  * @skb: buffer</div><div class='hunk'>@@ -1149,6 +1214,7 @@ static inline struct dst_entry *skb_dst(const struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> static inline void skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)</div><div class='ctx'> {</div><div class='add'>+	skb_dst_check_unset(skb);</div><div class='ctx'> 	skb-&gt;slow_gro |= !!dst;</div><div class='ctx'> 	skb-&gt;_skb_refdst = (unsigned long)dst;</div><div class='ctx'> }</div><div class='hunk'>@@ -1165,6 +1231,7 @@ static inline void skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)</div><div class='ctx'>  */</div><div class='ctx'> static inline void skb_dst_set_noref(struct sk_buff *skb, struct dst_entry *dst)</div><div class='ctx'> {</div><div class='add'>+	skb_dst_check_unset(skb);</div><div class='ctx'> 	WARN_ON(!rcu_read_lock_held() &amp;&amp; !rcu_read_lock_bh_held());</div><div class='ctx'> 	skb-&gt;slow_gro |= !!dst;</div><div class='ctx'> 	skb-&gt;_skb_refdst = (unsigned long)dst | SKB_DST_NOREF;</div><div class='hunk'>@@ -1179,15 +1246,6 @@ static inline bool skb_dst_is_noref(const struct sk_buff *skb)</div><div class='ctx'> 	return (skb-&gt;_skb_refdst &amp; SKB_DST_NOREF) &amp;&amp; skb_dst(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * skb_rtable - Returns the skb &amp;rtable</div><div class='del'>- * @skb: buffer</div><div class='del'>- */</div><div class='del'>-static inline struct rtable *skb_rtable(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return (struct rtable *)skb_dst(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* For mangling skb-&gt;pkt_type from user space side from applications</div><div class='ctx'>  * such as nft, tc, etc, we only allow a conservative subset of</div><div class='ctx'>  * possible pkt_types to be set.</div><div class='hunk'>@@ -1223,13 +1281,13 @@ static inline bool skb_wifi_acked_valid(const struct sk_buff *skb)</div><div class='ctx'>  * skb_unref - decrement the skb's reference count</div><div class='ctx'>  * @skb: buffer</div><div class='ctx'>  *</div><div class='del'>- * Returns true if we can free the skb.</div><div class='add'>+ * Returns: true if we can free the skb.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool skb_unref(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='ctx'> 		return false;</div><div class='del'>-	if (likely(refcount_read(&amp;skb-&gt;users) == 1))</div><div class='add'>+	if (!IS_ENABLED(CONFIG_DEBUG_NET) &amp;&amp; likely(refcount_read(&amp;skb-&gt;users) == 1))</div><div class='ctx'> 		smp_rmb();</div><div class='ctx'> 	else if (likely(!refcount_dec_and_test(&amp;skb-&gt;users)))</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -1255,8 +1313,14 @@ static inline bool skb_data_unref(const struct sk_buff *skb,</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __fix_address</div><div class='del'>-kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason);</div><div class='add'>+void __fix_address sk_skb_reason_drop(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				      enum skb_drop_reason reason);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason)</div><div class='add'>+{</div><div class='add'>+	sk_skb_reason_drop(NULL, skb, reason);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	kfree_skb - free an sk_buff with 'NOT_SPECIFIED' reason</div><div class='hunk'>@@ -1302,6 +1366,7 @@ struct sk_buff *build_skb_around(struct sk_buff *skb,</div><div class='ctx'> 				 void *data, unsigned int frag_size);</div><div class='ctx'> void skb_attempt_defer_free(struct sk_buff *skb);</div><div class='ctx'> </div><div class='add'>+u32 napi_skb_cache_get_bulk(void **skbs, u32 n);</div><div class='ctx'> struct sk_buff *napi_build_skb(void *data, unsigned int frag_size);</div><div class='ctx'> struct sk_buff *slab_build_skb(void *data);</div><div class='ctx'> </div><div class='hunk'>@@ -1339,7 +1404,7 @@ struct sk_buff_fclones {</div><div class='ctx'>  *	@sk: socket</div><div class='ctx'>  *	@skb: buffer</div><div class='ctx'>  *</div><div class='del'>- * Returns true if skb is a fast clone, and its clone is not freed.</div><div class='add'>+ * Returns: true if skb is a fast clone, and its clone is not freed.</div><div class='ctx'>  * Some drivers call skb_orphan() in their ndo_start_xmit(),</div><div class='ctx'>  * so we also check that didn't happen.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1431,6 +1496,7 @@ void skb_prepare_seq_read(struct sk_buff *skb, unsigned int from,</div><div class='ctx'> unsigned int skb_seq_read(unsigned int consumed, const u8 **data,</div><div class='ctx'> 			  struct skb_seq_state *st);</div><div class='ctx'> void skb_abort_seq_read(struct skb_seq_state *st);</div><div class='add'>+int skb_copy_seq_read(struct skb_seq_state *st, int offset, void *to, int len);</div><div class='ctx'> </div><div class='ctx'> unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,</div><div class='ctx'> 			   unsigned int to, struct ts_config *config);</div><div class='hunk'>@@ -1502,20 +1568,20 @@ __skb_set_sw_hash(struct sk_buff *skb, __u32 hash, bool is_l4)</div><div class='ctx'> 	__skb_set_hash(skb, hash, true, is_l4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __skb_get_hash(struct sk_buff *skb);</div><div class='del'>-u32 __skb_get_hash_symmetric(const struct sk_buff *skb);</div><div class='del'>-u32 skb_get_poff(const struct sk_buff *skb);</div><div class='del'>-u32 __skb_get_poff(const struct sk_buff *skb, const void *data,</div><div class='del'>-		   const struct flow_keys_basic *keys, int hlen);</div><div class='del'>-__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,</div><div class='del'>-			    const void *data, int hlen_proto);</div><div class='add'>+u32 __skb_get_hash_symmetric_net(const struct net *net, const struct sk_buff *skb);</div><div class='ctx'> </div><div class='del'>-static inline __be32 skb_flow_get_ports(const struct sk_buff *skb,</div><div class='del'>-					int thoff, u8 ip_proto)</div><div class='add'>+static inline u32 __skb_get_hash_symmetric(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return __skb_flow_get_ports(skb, thoff, ip_proto, NULL, 0);</div><div class='add'>+	return __skb_get_hash_symmetric_net(NULL, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __skb_get_hash_net(const struct net *net, struct sk_buff *skb);</div><div class='add'>+u32 skb_get_poff(const struct sk_buff *skb);</div><div class='add'>+u32 __skb_get_poff(const struct sk_buff *skb, const void *data,</div><div class='add'>+		   const struct flow_keys_basic *keys, int hlen);</div><div class='add'>+__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,</div><div class='add'>+			  const void *data, int hlen_proto);</div><div class='add'>+</div><div class='ctx'> void skb_flow_dissector_init(struct flow_dissector *flow_dissector,</div><div class='ctx'> 			     const struct flow_dissector_key *key,</div><div class='ctx'> 			     unsigned int key_count);</div><div class='hunk'>@@ -1582,10 +1648,18 @@ void skb_flow_dissect_hash(const struct sk_buff *skb,</div><div class='ctx'> 			   struct flow_dissector *flow_dissector,</div><div class='ctx'> 			   void *target_container);</div><div class='ctx'> </div><div class='add'>+static inline __u32 skb_get_hash_net(const struct net *net, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!skb-&gt;l4_hash &amp;&amp; !skb-&gt;sw_hash)</div><div class='add'>+		__skb_get_hash_net(net, skb);</div><div class='add'>+</div><div class='add'>+	return skb-&gt;hash;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline __u32 skb_get_hash(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (!skb-&gt;l4_hash &amp;&amp; !skb-&gt;sw_hash)</div><div class='del'>-		__skb_get_hash(skb);</div><div class='add'>+		__skb_get_hash_net(NULL, skb);</div><div class='ctx'> </div><div class='ctx'> 	return skb-&gt;hash;</div><div class='ctx'> }</div><div class='hunk'>@@ -1620,17 +1694,26 @@ static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)</div><div class='ctx'> static inline int skb_cmp_decrypted(const struct sk_buff *skb1,</div><div class='ctx'> 				    const struct sk_buff *skb2)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_TLS_DEVICE</div><div class='add'>+#ifdef CONFIG_SKB_DECRYPTED</div><div class='ctx'> 	return skb2-&gt;decrypted - skb1-&gt;decrypted;</div><div class='ctx'> #else</div><div class='ctx'> 	return 0;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool skb_is_decrypted(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SKB_DECRYPTED</div><div class='add'>+	return skb-&gt;decrypted;</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void skb_copy_decrypted(struct sk_buff *to,</div><div class='ctx'> 				      const struct sk_buff *from)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_TLS_DEVICE</div><div class='add'>+#ifdef CONFIG_SKB_DECRYPTED</div><div class='ctx'> 	to-&gt;decrypted = from-&gt;decrypted;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -1667,27 +1750,34 @@ static inline void skb_set_end_offset(struct sk_buff *skb, unsigned int offset)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern const struct ubuf_info_ops msg_zerocopy_ubuf_ops;</div><div class='add'>+</div><div class='ctx'> struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size,</div><div class='del'>-				       struct ubuf_info *uarg);</div><div class='add'>+				       struct ubuf_info *uarg, bool devmem);</div><div class='ctx'> </div><div class='ctx'> void msg_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref);</div><div class='ctx'> </div><div class='del'>-void msg_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *uarg,</div><div class='del'>-			   bool success);</div><div class='add'>+struct net_devmem_dmabuf_binding;</div><div class='ctx'> </div><div class='ctx'> int __zerocopy_sg_from_iter(struct msghdr *msg, struct sock *sk,</div><div class='ctx'> 			    struct sk_buff *skb, struct iov_iter *from,</div><div class='del'>-			    size_t length);</div><div class='add'>+			    size_t length,</div><div class='add'>+			    struct net_devmem_dmabuf_binding *binding);</div><div class='add'>+</div><div class='add'>+int zerocopy_fill_skb_from_iter(struct sk_buff *skb,</div><div class='add'>+				struct iov_iter *from, size_t length);</div><div class='ctx'> </div><div class='ctx'> static inline int skb_zerocopy_iter_dgram(struct sk_buff *skb,</div><div class='ctx'> 					  struct msghdr *msg, int len)</div><div class='ctx'> {</div><div class='del'>-	return __zerocopy_sg_from_iter(msg, skb-&gt;sk, skb, &amp;msg-&gt;msg_iter, len);</div><div class='add'>+	return __zerocopy_sg_from_iter(msg, skb-&gt;sk, skb, &amp;msg-&gt;msg_iter, len,</div><div class='add'>+				       NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int skb_zerocopy_iter_stream(struct sock *sk, struct sk_buff *skb,</div><div class='ctx'> 			     struct msghdr *msg, int len,</div><div class='del'>-			     struct ubuf_info *uarg);</div><div class='add'>+			     struct ubuf_info *uarg,</div><div class='add'>+			     struct net_devmem_dmabuf_binding *binding);</div><div class='ctx'> </div><div class='ctx'> /* Internal */</div><div class='ctx'> #define skb_shinfo(SKB)	((struct skb_shared_info *)(skb_end_pointer(SKB)))</div><div class='hunk'>@@ -1762,13 +1852,13 @@ static inline void *skb_zcopy_get_nouarg(struct sk_buff *skb)</div><div class='ctx'> static inline void net_zcopy_put(struct ubuf_info *uarg)</div><div class='ctx'> {</div><div class='ctx'> 	if (uarg)</div><div class='del'>-		uarg-&gt;callback(NULL, uarg, true);</div><div class='add'>+		uarg-&gt;ops-&gt;complete(NULL, uarg, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void net_zcopy_put_abort(struct ubuf_info *uarg, bool have_uref)</div><div class='ctx'> {</div><div class='ctx'> 	if (uarg) {</div><div class='del'>-		if (uarg-&gt;callback == msg_zerocopy_callback)</div><div class='add'>+		if (uarg-&gt;ops == &amp;msg_zerocopy_ubuf_ops)</div><div class='ctx'> 			msg_zerocopy_put_abort(uarg, have_uref);</div><div class='ctx'> 		else if (have_uref)</div><div class='ctx'> 			net_zcopy_put(uarg);</div><div class='hunk'>@@ -1782,7 +1872,7 @@ static inline void skb_zcopy_clear(struct sk_buff *skb, bool zerocopy_success)</div><div class='ctx'> </div><div class='ctx'> 	if (uarg) {</div><div class='ctx'> 		if (!skb_zcopy_is_nouarg(skb))</div><div class='del'>-			uarg-&gt;callback(skb, uarg, zerocopy_success);</div><div class='add'>+			uarg-&gt;ops-&gt;complete(skb, uarg, zerocopy_success);</div><div class='ctx'> </div><div class='ctx'> 		skb_shinfo(skb)-&gt;flags &amp;= ~SKBFL_ALL_ZEROCOPY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1796,6 +1886,12 @@ static inline void skb_zcopy_downgrade_managed(struct sk_buff *skb)</div><div class='ctx'> 		__skb_zcopy_downgrade_managed(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Return true if frags in this skb are readable by the host. */</div><div class='add'>+static inline bool skb_frags_readable(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return !skb-&gt;unreadable;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void skb_mark_not_on_list(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;next = NULL;</div><div class='hunk'>@@ -2512,10 +2608,17 @@ static inline void skb_len_add(struct sk_buff *skb, int delta)</div><div class='ctx'> static inline void __skb_fill_netmem_desc(struct sk_buff *skb, int i,</div><div class='ctx'> 					  netmem_ref netmem, int off, int size)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = netmem_to_page(netmem);</div><div class='add'>+	struct page *page;</div><div class='ctx'> </div><div class='ctx'> 	__skb_fill_netmem_desc_noacc(skb_shinfo(skb), i, netmem, off, size);</div><div class='ctx'> </div><div class='add'>+	if (netmem_is_net_iov(netmem)) {</div><div class='add'>+		skb-&gt;unreadable = true;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page = netmem_to_page(netmem);</div><div class='add'>+</div><div class='ctx'> 	/* Propagate page pfmemalloc to the skb if we can. The problem is</div><div class='ctx'> 	 * that not all callers have unique ownership of the page but rely</div><div class='ctx'> 	 * on page_is_pfmemalloc doing the right thing(tm).</div><div class='hunk'>@@ -2638,6 +2741,12 @@ static inline void skb_assert_len(struct sk_buff *skb)</div><div class='ctx'> #endif /* CONFIG_DEBUG_NET */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_FAIL_SKB_REALLOC)</div><div class='add'>+void skb_might_realloc(struct sk_buff *skb);</div><div class='add'>+#else</div><div class='add'>+static inline void skb_might_realloc(struct sk_buff *skb) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	Add data to an sk_buff</div><div class='ctx'>  */</div><div class='hunk'>@@ -2738,6 +2847,7 @@ static inline enum skb_drop_reason</div><div class='ctx'> pskb_may_pull_reason(struct sk_buff *skb, unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	DEBUG_NET_WARN_ON_ONCE(len &gt; INT_MAX);</div><div class='add'>+	skb_might_realloc(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(len &lt;= skb_headlen(skb)))</div><div class='ctx'> 		return SKB_NOT_DROPPED_YET;</div><div class='hunk'>@@ -2866,9 +2976,19 @@ static inline void skb_reset_inner_headers(struct sk_buff *skb)</div><div class='ctx'> 	skb-&gt;inner_transport_header = skb-&gt;transport_header;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int skb_mac_header_was_set(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return skb-&gt;mac_header != (typeof(skb-&gt;mac_header))~0U;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void skb_reset_mac_len(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;mac_len = skb-&gt;network_header - skb-&gt;mac_header;</div><div class='add'>+	if (!skb_mac_header_was_set(skb)) {</div><div class='add'>+		DEBUG_NET_WARN_ON_ONCE(1);</div><div class='add'>+		skb-&gt;mac_len = 0;</div><div class='add'>+	} else {</div><div class='add'>+		skb-&gt;mac_len = skb-&gt;network_header - skb-&gt;mac_header;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned char *skb_inner_transport_header(const struct sk_buff</div><div class='hunk'>@@ -2884,7 +3004,10 @@ static inline int skb_inner_transport_offset(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline void skb_reset_inner_transport_header(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;inner_transport_header = skb-&gt;data - skb-&gt;head;</div><div class='add'>+	long offset = skb-&gt;data - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(offset != (typeof(skb-&gt;inner_transport_header))offset);</div><div class='add'>+	skb-&gt;inner_transport_header = offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void skb_set_inner_transport_header(struct sk_buff *skb,</div><div class='hunk'>@@ -2901,7 +3024,10 @@ static inline unsigned char *skb_inner_network_header(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline void skb_reset_inner_network_header(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;inner_network_header = skb-&gt;data - skb-&gt;head;</div><div class='add'>+	long offset = skb-&gt;data - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(offset != (typeof(skb-&gt;inner_network_header))offset);</div><div class='add'>+	skb-&gt;inner_network_header = offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void skb_set_inner_network_header(struct sk_buff *skb,</div><div class='hunk'>@@ -2923,7 +3049,10 @@ static inline unsigned char *skb_inner_mac_header(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline void skb_reset_inner_mac_header(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;inner_mac_header = skb-&gt;data - skb-&gt;head;</div><div class='add'>+	long offset = skb-&gt;data - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(offset != (typeof(skb-&gt;inner_mac_header))offset);</div><div class='add'>+	skb-&gt;inner_mac_header = offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void skb_set_inner_mac_header(struct sk_buff *skb,</div><div class='hunk'>@@ -2945,7 +3074,33 @@ static inline unsigned char *skb_transport_header(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline void skb_reset_transport_header(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;transport_header = skb-&gt;data - skb-&gt;head;</div><div class='add'>+	long offset = skb-&gt;data - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(offset != (typeof(skb-&gt;transport_header))offset);</div><div class='add'>+	skb-&gt;transport_header = offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_reset_transport_header_careful - conditionally reset transport header</div><div class='add'>+ * @skb: buffer to alter</div><div class='add'>+ *</div><div class='add'>+ * Hardened version of skb_reset_transport_header().</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the operation was a success.</div><div class='add'>+ */</div><div class='add'>+static inline bool __must_check</div><div class='add'>+skb_reset_transport_header_careful(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	long offset = skb-&gt;data - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	if (unlikely(offset != (typeof(skb-&gt;transport_header))offset))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (unlikely(offset == (typeof(skb-&gt;transport_header))~0U))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	skb-&gt;transport_header = offset;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void skb_set_transport_header(struct sk_buff *skb,</div><div class='hunk'>@@ -2962,7 +3117,10 @@ static inline unsigned char *skb_network_header(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline void skb_reset_network_header(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;network_header = skb-&gt;data - skb-&gt;head;</div><div class='add'>+	long offset = skb-&gt;data - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(offset != (typeof(skb-&gt;network_header))offset);</div><div class='add'>+	skb-&gt;network_header = offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void skb_set_network_header(struct sk_buff *skb, const int offset)</div><div class='hunk'>@@ -2971,11 +3129,6 @@ static inline void skb_set_network_header(struct sk_buff *skb, const int offset)</div><div class='ctx'> 	skb-&gt;network_header += offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int skb_mac_header_was_set(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return skb-&gt;mac_header != (typeof(skb-&gt;mac_header))~0U;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned char *skb_mac_header(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	DEBUG_NET_WARN_ON_ONCE(!skb_mac_header_was_set(skb));</div><div class='hunk'>@@ -3000,7 +3153,10 @@ static inline void skb_unset_mac_header(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline void skb_reset_mac_header(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	skb-&gt;mac_header = skb-&gt;data - skb-&gt;head;</div><div class='add'>+	long offset = skb-&gt;data - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(offset != (typeof(skb-&gt;mac_header))offset);</div><div class='add'>+	skb-&gt;mac_header = offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)</div><div class='hunk'>@@ -3036,6 +3192,21 @@ static inline void skb_mac_header_rebuild(struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Move the full mac header up to current network_header.</div><div class='add'>+ * Leaves skb-&gt;data pointing at offset skb-&gt;mac_len into the mac_header.</div><div class='add'>+ * Must be provided the complete mac header length.</div><div class='add'>+ */</div><div class='add'>+static inline void skb_mac_header_rebuild_full(struct sk_buff *skb, u32 full_mac_len)</div><div class='add'>+{</div><div class='add'>+	if (skb_mac_header_was_set(skb)) {</div><div class='add'>+		const unsigned char *old_mac = skb_mac_header(skb);</div><div class='add'>+</div><div class='add'>+		skb_set_mac_header(skb, -full_mac_len);</div><div class='add'>+		memmove(skb_mac_header(skb), old_mac, full_mac_len);</div><div class='add'>+		__skb_push(skb, full_mac_len - skb-&gt;mac_len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int skb_checksum_start_offset(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return skb-&gt;csum_start - skb_headroom(skb);</div><div class='hunk'>@@ -3072,9 +3243,15 @@ static inline int skb_inner_network_offset(const struct sk_buff *skb)</div><div class='ctx'> 	return skb_inner_network_header(skb) - skb-&gt;data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline enum skb_drop_reason</div><div class='add'>+pskb_network_may_pull_reason(struct sk_buff *skb, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return pskb_may_pull_reason(skb, skb_network_offset(skb) + len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	return pskb_may_pull(skb, skb_network_offset(skb) + len);</div><div class='add'>+	return pskb_network_may_pull_reason(skb, len) == SKB_NOT_DROPPED_YET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3152,6 +3329,7 @@ static inline int __pskb_trim(struct sk_buff *skb, unsigned int len)</div><div class='ctx'> </div><div class='ctx'> static inline int pskb_trim(struct sk_buff *skb, unsigned int len)</div><div class='ctx'> {</div><div class='add'>+	skb_might_realloc(skb);</div><div class='ctx'> 	return (len &lt; skb-&gt;len) ? __pskb_trim(skb, len) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3355,13 +3533,7 @@ static inline void *napi_alloc_frag_align(unsigned int fragsz,</div><div class='ctx'> 	return __napi_alloc_frag_align(fragsz, -align);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct sk_buff *__napi_alloc_skb(struct napi_struct *napi,</div><div class='del'>-				 unsigned int length, gfp_t gfp_mask);</div><div class='del'>-static inline struct sk_buff *napi_alloc_skb(struct napi_struct *napi,</div><div class='del'>-					     unsigned int length)</div><div class='del'>-{</div><div class='del'>-	return __napi_alloc_skb(napi, length, GFP_ATOMIC);</div><div class='del'>-}</div><div class='add'>+struct sk_buff *napi_alloc_skb(struct napi_struct *napi, unsigned int length);</div><div class='ctx'> void napi_consume_skb(struct sk_buff *skb, int budget);</div><div class='ctx'> </div><div class='ctx'> void napi_skb_free_stolen_head(struct sk_buff *skb);</div><div class='hunk'>@@ -3376,7 +3548,7 @@ void __napi_kfree_skb(struct sk_buff *skb, enum skb_drop_reason reason);</div><div class='ctx'>  *</div><div class='ctx'>  * %NULL is returned if there is no free memory.</div><div class='ctx'> */</div><div class='del'>-static inline struct page *__dev_alloc_pages(gfp_t gfp_mask,</div><div class='add'>+static inline struct page *__dev_alloc_pages_noprof(gfp_t gfp_mask,</div><div class='ctx'> 					     unsigned int order)</div><div class='ctx'> {</div><div class='ctx'> 	/* This piece of code contains several assumptions.</div><div class='hunk'>@@ -3389,13 +3561,15 @@ static inline struct page *__dev_alloc_pages(gfp_t gfp_mask,</div><div class='ctx'> 	 */</div><div class='ctx'> 	gfp_mask |= __GFP_COMP | __GFP_MEMALLOC;</div><div class='ctx'> </div><div class='del'>-	return alloc_pages_node(NUMA_NO_NODE, gfp_mask, order);</div><div class='add'>+	return alloc_pages_node_noprof(NUMA_NO_NODE, gfp_mask, order);</div><div class='ctx'> }</div><div class='add'>+#define __dev_alloc_pages(...)	alloc_hooks(__dev_alloc_pages_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-static inline struct page *dev_alloc_pages(unsigned int order)</div><div class='del'>-{</div><div class='del'>-	return __dev_alloc_pages(GFP_ATOMIC | __GFP_NOWARN, order);</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * This specialized allocator has to be a macro for its allocations to be</div><div class='add'>+ * accounted separately (to have a separate alloc_tag).</div><div class='add'>+ */</div><div class='add'>+#define dev_alloc_pages(_order) __dev_alloc_pages(GFP_ATOMIC | __GFP_NOWARN, _order)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __dev_alloc_page - allocate a page for network Rx</div><div class='hunk'>@@ -3405,15 +3579,17 @@ static inline struct page *dev_alloc_pages(unsigned int order)</div><div class='ctx'>  *</div><div class='ctx'>  * %NULL is returned if there is no free memory.</div><div class='ctx'>  */</div><div class='del'>-static inline struct page *__dev_alloc_page(gfp_t gfp_mask)</div><div class='add'>+static inline struct page *__dev_alloc_page_noprof(gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='del'>-	return __dev_alloc_pages(gfp_mask, 0);</div><div class='add'>+	return __dev_alloc_pages_noprof(gfp_mask, 0);</div><div class='ctx'> }</div><div class='add'>+#define __dev_alloc_page(...)	alloc_hooks(__dev_alloc_page_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-static inline struct page *dev_alloc_page(void)</div><div class='del'>-{</div><div class='del'>-	return dev_alloc_pages(0);</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * This specialized allocator has to be a macro for its allocations to be</div><div class='add'>+ * accounted separately (to have a separate alloc_tag).</div><div class='add'>+ */</div><div class='add'>+#define dev_alloc_page()	dev_alloc_pages(0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * dev_page_is_reusable - check whether a page can be reused for network Rx</div><div class='hunk'>@@ -3422,7 +3598,7 @@ static inline struct page *dev_alloc_page(void)</div><div class='ctx'>  * A page shouldn't be considered for reusing/recycling if it was allocated</div><div class='ctx'>  * under memory pressure or at a distant memory node.</div><div class='ctx'>  *</div><div class='del'>- * Returns false if this page should be returned to page allocator, true</div><div class='add'>+ * Returns: false if this page should be returned to page allocator, true</div><div class='ctx'>  * otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline bool dev_page_is_reusable(const struct page *page)</div><div class='hunk'>@@ -3483,95 +3659,70 @@ static inline void skb_frag_off_copy(skb_frag_t *fragto,</div><div class='ctx'> 	fragto-&gt;offset = fragfrom-&gt;offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * skb_frag_page - retrieve the page referred to by a paged fragment</div><div class='del'>- * @frag: the paged fragment</div><div class='del'>- *</div><div class='del'>- * Returns the &amp;struct page associated with @frag.</div><div class='del'>- */</div><div class='del'>-static inline struct page *skb_frag_page(const skb_frag_t *frag)</div><div class='add'>+/* Return: true if the skb_frag contains a net_iov. */</div><div class='add'>+static inline bool skb_frag_is_net_iov(const skb_frag_t *frag)</div><div class='ctx'> {</div><div class='del'>-	return netmem_to_page(frag-&gt;netmem);</div><div class='add'>+	return netmem_is_net_iov(frag-&gt;netmem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __skb_frag_ref - take an addition reference on a paged fragment.</div><div class='del'>- * @frag: the paged fragment</div><div class='add'>+ * skb_frag_net_iov - retrieve the net_iov referred to by fragment</div><div class='add'>+ * @frag: the fragment</div><div class='ctx'>  *</div><div class='del'>- * Takes an additional reference on the paged fragment @frag.</div><div class='add'>+ * Return: the &amp;struct net_iov associated with @frag. Returns NULL if this</div><div class='add'>+ * frag has no associated net_iov.</div><div class='ctx'>  */</div><div class='del'>-static inline void __skb_frag_ref(skb_frag_t *frag)</div><div class='del'>-{</div><div class='del'>-	get_page(skb_frag_page(frag));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * skb_frag_ref - take an addition reference on a paged fragment of an skb.</div><div class='del'>- * @skb: the buffer</div><div class='del'>- * @f: the fragment offset.</div><div class='del'>- *</div><div class='del'>- * Takes an additional reference on the @f'th paged fragment of @skb.</div><div class='del'>- */</div><div class='del'>-static inline void skb_frag_ref(struct sk_buff *skb, int f)</div><div class='del'>-{</div><div class='del'>-	__skb_frag_ref(&amp;skb_shinfo(skb)-&gt;frags[f]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb,</div><div class='del'>-		    unsigned int headroom);</div><div class='del'>-int skb_cow_data_for_xdp(struct page_pool *pool, struct sk_buff **pskb,</div><div class='del'>-			 struct bpf_prog *prog);</div><div class='del'>-bool napi_pp_put_page(struct page *page, bool napi_safe);</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-napi_frag_unref(skb_frag_t *frag, bool recycle, bool napi_safe)</div><div class='add'>+static inline struct net_iov *skb_frag_net_iov(const skb_frag_t *frag)</div><div class='ctx'> {</div><div class='del'>-	struct page *page = skb_frag_page(frag);</div><div class='add'>+	if (!skb_frag_is_net_iov(frag))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PAGE_POOL</div><div class='del'>-	if (recycle &amp;&amp; napi_pp_put_page(page, napi_safe))</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-	put_page(page);</div><div class='add'>+	return netmem_to_net_iov(frag-&gt;netmem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __skb_frag_unref - release a reference on a paged fragment.</div><div class='add'>+ * skb_frag_page - retrieve the page referred to by a paged fragment</div><div class='ctx'>  * @frag: the paged fragment</div><div class='del'>- * @recycle: recycle the page if allocated via page_pool</div><div class='ctx'>  *</div><div class='del'>- * Releases a reference on the paged fragment @frag</div><div class='del'>- * or recycles the page via the page_pool API.</div><div class='add'>+ * Return: the &amp;struct page associated with @frag. Returns NULL if this frag</div><div class='add'>+ * has no associated page.</div><div class='ctx'>  */</div><div class='del'>-static inline void __skb_frag_unref(skb_frag_t *frag, bool recycle)</div><div class='add'>+static inline struct page *skb_frag_page(const skb_frag_t *frag)</div><div class='ctx'> {</div><div class='del'>-	napi_frag_unref(frag, recycle, false);</div><div class='add'>+	if (skb_frag_is_net_iov(frag))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return netmem_to_page(frag-&gt;netmem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * skb_frag_unref - release a reference on a paged fragment of an skb.</div><div class='del'>- * @skb: the buffer</div><div class='del'>- * @f: the fragment offset</div><div class='add'>+ * skb_frag_netmem - retrieve the netmem referred to by a fragment</div><div class='add'>+ * @frag: the fragment</div><div class='ctx'>  *</div><div class='del'>- * Releases a reference on the @f'th paged fragment of @skb.</div><div class='add'>+ * Return: the &amp;netmem_ref associated with @frag.</div><div class='ctx'>  */</div><div class='del'>-static inline void skb_frag_unref(struct sk_buff *skb, int f)</div><div class='add'>+static inline netmem_ref skb_frag_netmem(const skb_frag_t *frag)</div><div class='ctx'> {</div><div class='del'>-	struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='del'>-</div><div class='del'>-	if (!skb_zcopy_managed(skb))</div><div class='del'>-		__skb_frag_unref(&amp;shinfo-&gt;frags[f], skb-&gt;pp_recycle);</div><div class='add'>+	return frag-&gt;netmem;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb,</div><div class='add'>+		    unsigned int headroom);</div><div class='add'>+int skb_cow_data_for_xdp(struct page_pool *pool, struct sk_buff **pskb,</div><div class='add'>+			 const struct bpf_prog *prog);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * skb_frag_address - gets the address of the data contained in a paged fragment</div><div class='ctx'>  * @frag: the paged fragment buffer</div><div class='ctx'>  *</div><div class='del'>- * Returns the address of the data within @frag. The page must already</div><div class='add'>+ * Returns: the address of the data within @frag. The page must already</div><div class='ctx'>  * be mapped.</div><div class='ctx'>  */</div><div class='ctx'> static inline void *skb_frag_address(const skb_frag_t *frag)</div><div class='ctx'> {</div><div class='add'>+	if (!skb_frag_page(frag))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	return page_address(skb_frag_page(frag)) + skb_frag_off(frag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3579,12 +3730,18 @@ static inline void *skb_frag_address(const skb_frag_t *frag)</div><div class='ctx'>  * skb_frag_address_safe - gets the address of the data contained in a paged fragment</div><div class='ctx'>  * @frag: the paged fragment buffer</div><div class='ctx'>  *</div><div class='del'>- * Returns the address of the data within @frag. Checks that the page</div><div class='add'>+ * Returns: the address of the data within @frag. Checks that the page</div><div class='ctx'>  * is mapped and returns %NULL otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline void *skb_frag_address_safe(const skb_frag_t *frag)</div><div class='ctx'> {</div><div class='del'>-	void *ptr = page_address(skb_frag_page(frag));</div><div class='add'>+	struct page *page = skb_frag_page(frag);</div><div class='add'>+	void *ptr;</div><div class='add'>+</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ptr = page_address(page);</div><div class='ctx'> 	if (unlikely(!ptr))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -3605,7 +3762,7 @@ static inline void skb_frag_page_copy(skb_frag_t *fragto,</div><div class='ctx'> bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * skb_frag_dma_map - maps a paged fragment via the DMA API</div><div class='add'>+ * __skb_frag_dma_map - maps a paged fragment via the DMA API</div><div class='ctx'>  * @dev: the device to map the fragment to</div><div class='ctx'>  * @frag: the paged fragment to map</div><div class='ctx'>  * @offset: the offset within the fragment (starting at the</div><div class='hunk'>@@ -3615,15 +3772,40 @@ bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio);</div><div class='ctx'>  *</div><div class='ctx'>  * Maps the page associated with @frag to @device.</div><div class='ctx'>  */</div><div class='del'>-static inline dma_addr_t skb_frag_dma_map(struct device *dev,</div><div class='del'>-					  const skb_frag_t *frag,</div><div class='del'>-					  size_t offset, size_t size,</div><div class='del'>-					  enum dma_data_direction dir)</div><div class='add'>+static inline dma_addr_t __skb_frag_dma_map(struct device *dev,</div><div class='add'>+					    const skb_frag_t *frag,</div><div class='add'>+					    size_t offset, size_t size,</div><div class='add'>+					    enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='add'>+	if (skb_frag_is_net_iov(frag)) {</div><div class='add'>+		return netmem_to_net_iov(frag-&gt;netmem)-&gt;desc.dma_addr +</div><div class='add'>+		       offset + frag-&gt;offset;</div><div class='add'>+	}</div><div class='ctx'> 	return dma_map_page(dev, skb_frag_page(frag),</div><div class='ctx'> 			    skb_frag_off(frag) + offset, size, dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define skb_frag_dma_map(dev, frag, ...)				\</div><div class='add'>+	CONCATENATE(_skb_frag_dma_map,					\</div><div class='add'>+		    COUNT_ARGS(__VA_ARGS__))(dev, frag, ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define __skb_frag_dma_map1(dev, frag, offset, uf, uo) ({		\</div><div class='add'>+	const skb_frag_t *uf = (frag);					\</div><div class='add'>+	size_t uo = (offset);						\</div><div class='add'>+									\</div><div class='add'>+	__skb_frag_dma_map(dev, uf, uo, skb_frag_size(uf) - uo,		\</div><div class='add'>+			   DMA_TO_DEVICE);				\</div><div class='add'>+})</div><div class='add'>+#define _skb_frag_dma_map1(dev, frag, offset)				\</div><div class='add'>+	__skb_frag_dma_map1(dev, frag, offset, __UNIQUE_ID(frag_),	\</div><div class='add'>+			    __UNIQUE_ID(offset_))</div><div class='add'>+#define _skb_frag_dma_map0(dev, frag)					\</div><div class='add'>+	_skb_frag_dma_map1(dev, frag, 0)</div><div class='add'>+#define _skb_frag_dma_map2(dev, frag, offset, size)			\</div><div class='add'>+	__skb_frag_dma_map(dev, frag, offset, size, DMA_TO_DEVICE)</div><div class='add'>+#define _skb_frag_dma_map3(dev, frag, offset, size, dir)		\</div><div class='add'>+	__skb_frag_dma_map(dev, frag, offset, size, dir)</div><div class='add'>+</div><div class='ctx'> static inline struct sk_buff *pskb_copy(struct sk_buff *skb,</div><div class='ctx'> 					gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -3767,39 +3949,26 @@ static inline int __must_check skb_put_padto(struct sk_buff *skb, unsigned int l</div><div class='ctx'> bool csum_and_copy_from_iter_full(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i)</div><div class='ctx'> 	__must_check;</div><div class='ctx'> </div><div class='del'>-static inline int skb_add_data(struct sk_buff *skb,</div><div class='del'>-			       struct iov_iter *from, int copy)</div><div class='del'>-{</div><div class='del'>-	const int off = skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;ip_summed == CHECKSUM_NONE) {</div><div class='del'>-		__wsum csum = 0;</div><div class='del'>-		if (csum_and_copy_from_iter_full(skb_put(skb, copy), copy,</div><div class='del'>-					         &amp;csum, from)) {</div><div class='del'>-			skb-&gt;csum = csum_block_add(skb-&gt;csum, csum, off);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else if (copy_from_iter_full(skb_put(skb, copy), copy, from))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	__skb_trim(skb, off);</div><div class='del'>-	return -EFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool skb_can_coalesce(struct sk_buff *skb, int i,</div><div class='del'>-				    const struct page *page, int off)</div><div class='add'>+static inline bool skb_can_coalesce_netmem(struct sk_buff *skb, int i,</div><div class='add'>+					   netmem_ref netmem, int off)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb_zcopy(skb))</div><div class='ctx'> 		return false;</div><div class='ctx'> 	if (i) {</div><div class='ctx'> 		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='ctx'> </div><div class='del'>-		return page == skb_frag_page(frag) &amp;&amp;</div><div class='add'>+		return netmem == skb_frag_netmem(frag) &amp;&amp;</div><div class='ctx'> 		       off == skb_frag_off(frag) + skb_frag_size(frag);</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool skb_can_coalesce(struct sk_buff *skb, int i,</div><div class='add'>+				    const struct page *page, int off)</div><div class='add'>+{</div><div class='add'>+	return skb_can_coalesce_netmem(skb, i, page_to_netmem(page), off);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int __skb_linearize(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	return __pskb_pull_tail(skb, skb-&gt;data_len) ? 0 : -ENOMEM;</div><div class='hunk'>@@ -3821,7 +3990,7 @@ static inline int skb_linearize(struct sk_buff *skb)</div><div class='ctx'>  * skb_has_shared_frag - can any frag be overwritten</div><div class='ctx'>  * @skb: buffer to test</div><div class='ctx'>  *</div><div class='del'>- * Return true if the skb has at least one frag that might be modified</div><div class='add'>+ * Return: true if the skb has at least one frag that might be modified</div><div class='ctx'>  * by an external entity (as in vmsplice()/sendfile())</div><div class='ctx'>  */</div><div class='ctx'> static inline bool skb_has_shared_frag(const struct sk_buff *skb)</div><div class='hunk'>@@ -3933,6 +4102,7 @@ int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len);</div><div class='ctx'> </div><div class='ctx'> static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)</div><div class='ctx'> {</div><div class='add'>+	skb_might_realloc(skb);</div><div class='ctx'> 	if (likely(len &gt;= skb-&gt;len))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return pskb_trim_rcsum_slow(skb, len);</div><div class='hunk'>@@ -4022,8 +4192,7 @@ static inline void skb_frag_list_init(struct sk_buff *skb)</div><div class='ctx'> int __skb_wait_for_more_packets(struct sock *sk, struct sk_buff_head *queue,</div><div class='ctx'> 				int *err, long *timeo_p,</div><div class='ctx'> 				const struct sk_buff *skb);</div><div class='del'>-struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,</div><div class='del'>-					  struct sk_buff_head *queue,</div><div class='add'>+struct sk_buff *__skb_try_recv_from_queue(struct sk_buff_head *queue,</div><div class='ctx'> 					  unsigned int flags,</div><div class='ctx'> 					  int *off, int *err,</div><div class='ctx'> 					  struct sk_buff **last);</div><div class='hunk'>@@ -4035,6 +4204,9 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk,</div><div class='ctx'> 				    struct sk_buff_head *sk_queue,</div><div class='ctx'> 				    unsigned int flags, int *off, int *err);</div><div class='ctx'> struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned int flags, int *err);</div><div class='add'>+__poll_t datagram_poll_queue(struct file *file, struct socket *sock,</div><div class='add'>+			     struct poll_table_struct *wait,</div><div class='add'>+			     struct sk_buff_head *rcv_queue);</div><div class='ctx'> __poll_t datagram_poll(struct file *file, struct socket *sock,</div><div class='ctx'> 			   struct poll_table_struct *wait);</div><div class='ctx'> int skb_copy_datagram_iter(const struct sk_buff *from, int offset,</div><div class='hunk'>@@ -4046,19 +4218,14 @@ static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,</div><div class='ctx'> }</div><div class='ctx'> int skb_copy_and_csum_datagram_msg(struct sk_buff *skb, int hlen,</div><div class='ctx'> 				   struct msghdr *msg);</div><div class='del'>-int skb_copy_and_hash_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='del'>-			   struct iov_iter *to, int len,</div><div class='del'>-			   struct ahash_request *hash);</div><div class='add'>+int skb_copy_and_crc32c_datagram_iter(const struct sk_buff *skb, int offset,</div><div class='add'>+				      struct iov_iter *to, int len, u32 *crcp);</div><div class='ctx'> int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,</div><div class='ctx'> 				 struct iov_iter *from, int len);</div><div class='add'>+int skb_copy_datagram_from_iter_full(struct sk_buff *skb, int offset,</div><div class='add'>+				     struct iov_iter *from, int len);</div><div class='ctx'> int zerocopy_sg_from_iter(struct sk_buff *skb, struct iov_iter *frm);</div><div class='ctx'> void skb_free_datagram(struct sock *sk, struct sk_buff *skb);</div><div class='del'>-void __skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb, int len);</div><div class='del'>-static inline void skb_free_datagram_locked(struct sock *sk,</div><div class='del'>-					    struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	__skb_free_datagram_locked(sk, skb, 0);</div><div class='del'>-}</div><div class='ctx'> int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags);</div><div class='ctx'> int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len);</div><div class='ctx'> int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len);</div><div class='hunk'>@@ -4069,6 +4236,8 @@ int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset,</div><div class='ctx'> 		    unsigned int flags);</div><div class='ctx'> int skb_send_sock_locked(struct sock *sk, struct sk_buff *skb, int offset,</div><div class='ctx'> 			 int len);</div><div class='add'>+int skb_send_sock_locked_with_flags(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				    int offset, int len, int flags);</div><div class='ctx'> int skb_send_sock(struct sock *sk, struct sk_buff *skb, int offset, int len);</div><div class='ctx'> void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to);</div><div class='ctx'> unsigned int skb_zerocopy_headlen(const struct sk_buff *from);</div><div class='hunk'>@@ -4108,17 +4277,9 @@ static inline int memcpy_to_msg(struct msghdr *msg, void *data, int len)</div><div class='ctx'> 	return copy_to_iter(data, len, &amp;msg-&gt;msg_iter) == len ? 0 : -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct skb_checksum_ops {</div><div class='del'>-	__wsum (*update)(const void *mem, int len, __wsum wsum);</div><div class='del'>-	__wsum (*combine)(__wsum csum, __wsum csum2, int offset, int len);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern const struct skb_checksum_ops *crc32c_csum_stub __read_mostly;</div><div class='del'>-</div><div class='del'>-__wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,</div><div class='del'>-		      __wsum csum, const struct skb_checksum_ops *ops);</div><div class='ctx'> __wsum skb_checksum(const struct sk_buff *skb, int offset, int len,</div><div class='ctx'> 		    __wsum csum);</div><div class='add'>+u32 skb_crc32c(const struct sk_buff *skb, int offset, int len, u32 crc);</div><div class='ctx'> </div><div class='ctx'> static inline void * __must_check</div><div class='ctx'> __skb_header_pointer(const struct sk_buff *skb, int offset, int len,</div><div class='hunk'>@@ -4247,7 +4408,7 @@ static inline void skb_get_new_timestampns(const struct sk_buff *skb,</div><div class='ctx'> static inline void __net_timestamp(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;tstamp = ktime_get_real();</div><div class='del'>-	skb-&gt;mono_delivery_time = 0;</div><div class='add'>+	skb-&gt;tstamp_type = SKB_CLOCK_REALTIME;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline ktime_t net_timedelta(ktime_t t)</div><div class='hunk'>@@ -4256,10 +4417,36 @@ static inline ktime_t net_timedelta(ktime_t t)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void skb_set_delivery_time(struct sk_buff *skb, ktime_t kt,</div><div class='del'>-					 bool mono)</div><div class='add'>+					 u8 tstamp_type)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;tstamp = kt;</div><div class='del'>-	skb-&gt;mono_delivery_time = kt &amp;&amp; mono;</div><div class='add'>+</div><div class='add'>+	if (kt)</div><div class='add'>+		skb-&gt;tstamp_type = tstamp_type;</div><div class='add'>+	else</div><div class='add'>+		skb-&gt;tstamp_type = SKB_CLOCK_REALTIME;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void skb_set_delivery_type_by_clockid(struct sk_buff *skb,</div><div class='add'>+						    ktime_t kt, clockid_t clockid)</div><div class='add'>+{</div><div class='add'>+	u8 tstamp_type = SKB_CLOCK_REALTIME;</div><div class='add'>+</div><div class='add'>+	switch (clockid) {</div><div class='add'>+	case CLOCK_REALTIME:</div><div class='add'>+		break;</div><div class='add'>+	case CLOCK_MONOTONIC:</div><div class='add'>+		tstamp_type = SKB_CLOCK_MONOTONIC;</div><div class='add'>+		break;</div><div class='add'>+	case CLOCK_TAI:</div><div class='add'>+		tstamp_type = SKB_CLOCK_TAI;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		kt = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_set_delivery_time(skb, kt, tstamp_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> DECLARE_STATIC_KEY_FALSE(netstamp_needed_key);</div><div class='hunk'>@@ -4269,8 +4456,8 @@ DECLARE_STATIC_KEY_FALSE(netstamp_needed_key);</div><div class='ctx'>  */</div><div class='ctx'> static inline void skb_clear_delivery_time(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (skb-&gt;mono_delivery_time) {</div><div class='del'>-		skb-&gt;mono_delivery_time = 0;</div><div class='add'>+	if (skb-&gt;tstamp_type) {</div><div class='add'>+		skb-&gt;tstamp_type = SKB_CLOCK_REALTIME;</div><div class='ctx'> 		if (static_branch_unlikely(&amp;netstamp_needed_key))</div><div class='ctx'> 			skb-&gt;tstamp = ktime_get_real();</div><div class='ctx'> 		else</div><div class='hunk'>@@ -4280,7 +4467,7 @@ static inline void skb_clear_delivery_time(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline void skb_clear_tstamp(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (skb-&gt;mono_delivery_time)</div><div class='add'>+	if (skb-&gt;tstamp_type)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;tstamp = 0;</div><div class='hunk'>@@ -4288,7 +4475,7 @@ static inline void skb_clear_tstamp(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline ktime_t skb_tstamp(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	if (skb-&gt;mono_delivery_time)</div><div class='add'>+	if (skb-&gt;tstamp_type)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return skb-&gt;tstamp;</div><div class='hunk'>@@ -4296,7 +4483,7 @@ static inline ktime_t skb_tstamp(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static inline ktime_t skb_tstamp_cond(const struct sk_buff *skb, bool cond)</div><div class='ctx'> {</div><div class='del'>-	if (!skb-&gt;mono_delivery_time &amp;&amp; skb-&gt;tstamp)</div><div class='add'>+	if (skb-&gt;tstamp_type != SKB_CLOCK_MONOTONIC &amp;&amp; skb-&gt;tstamp)</div><div class='ctx'> 		return skb-&gt;tstamp;</div><div class='ctx'> </div><div class='ctx'> 	if (static_branch_unlikely(&amp;netstamp_needed_key) || cond)</div><div class='hunk'>@@ -4377,6 +4564,81 @@ static inline void skb_metadata_clear(struct sk_buff *skb)</div><div class='ctx'> 	skb_metadata_set(skb, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * skb_data_move - Move packet data and metadata after skb_push() or skb_pull().</div><div class='add'>+ * @skb: packet to operate on</div><div class='add'>+ * @len: number of bytes pushed or pulled from &amp;sk_buff-&gt;data</div><div class='add'>+ * @n: number of bytes to memmove() from pre-push/pull &amp;sk_buff-&gt;data</div><div class='add'>+ *</div><div class='add'>+ * Moves @n bytes of packet data, can be zero, and all bytes of skb metadata.</div><div class='add'>+ *</div><div class='add'>+ * Assumes metadata is located immediately before &amp;sk_buff-&gt;data prior to the</div><div class='add'>+ * push/pull, and that sufficient headroom exists to hold it after an</div><div class='add'>+ * skb_push(). Otherwise, metadata is cleared and a one-time warning is issued.</div><div class='add'>+ *</div><div class='add'>+ * Prefer skb_postpull_data_move() or skb_postpush_data_move() to calling this</div><div class='add'>+ * helper directly.</div><div class='add'>+ */</div><div class='add'>+static inline void skb_data_move(struct sk_buff *skb, const int len,</div><div class='add'>+				 const unsigned int n)</div><div class='add'>+{</div><div class='add'>+	const u8 meta_len = skb_metadata_len(skb);</div><div class='add'>+	u8 *meta, *meta_end;</div><div class='add'>+</div><div class='add'>+	if (!len || (!n &amp;&amp; !meta_len))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!meta_len)</div><div class='add'>+		goto no_metadata;</div><div class='add'>+</div><div class='add'>+	meta_end = skb_metadata_end(skb);</div><div class='add'>+	meta = meta_end - meta_len;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(meta_end + len != skb-&gt;data ||</div><div class='add'>+			 meta_len &gt; skb_headroom(skb))) {</div><div class='add'>+		skb_metadata_clear(skb);</div><div class='add'>+		goto no_metadata;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memmove(meta + len, meta, meta_len + n);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+no_metadata:</div><div class='add'>+	memmove(skb-&gt;data, skb-&gt;data - len, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_postpull_data_move - Move packet data and metadata after skb_pull().</div><div class='add'>+ * @skb: packet to operate on</div><div class='add'>+ * @len: number of bytes pulled from &amp;sk_buff-&gt;data</div><div class='add'>+ * @n: number of bytes to memmove() from pre-pull &amp;sk_buff-&gt;data</div><div class='add'>+ *</div><div class='add'>+ * See skb_data_move() for details.</div><div class='add'>+ */</div><div class='add'>+static inline void skb_postpull_data_move(struct sk_buff *skb,</div><div class='add'>+					  const unsigned int len,</div><div class='add'>+					  const unsigned int n)</div><div class='add'>+{</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(len &gt; INT_MAX);</div><div class='add'>+	skb_data_move(skb, len, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_postpush_data_move - Move packet data and metadata after skb_push().</div><div class='add'>+ * @skb: packet to operate on</div><div class='add'>+ * @len: number of bytes pushed onto &amp;sk_buff-&gt;data</div><div class='add'>+ * @n: number of bytes to memmove() from pre-push &amp;sk_buff-&gt;data</div><div class='add'>+ *</div><div class='add'>+ * See skb_data_move() for details.</div><div class='add'>+ */</div><div class='add'>+static inline void skb_postpush_data_move(struct sk_buff *skb,</div><div class='add'>+					  const unsigned int len,</div><div class='add'>+					  const unsigned int n)</div><div class='add'>+{</div><div class='add'>+	DEBUG_NET_WARN_ON_ONCE(len &gt; INT_MAX);</div><div class='add'>+	skb_data_move(skb, -len, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct sk_buff *skb_clone_sk(struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NETWORK_PHY_TIMESTAMPING</div><div class='hunk'>@@ -4445,7 +4707,7 @@ void skb_tstamp_tx(struct sk_buff *orig_skb,</div><div class='ctx'> static inline void skb_tx_timestamp(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	skb_clone_tx_timestamp(skb);</div><div class='del'>-	if (skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_SW_TSTAMP)</div><div class='add'>+	if (skb_shinfo(skb)-&gt;tx_flags &amp; (SKBTX_SW_TSTAMP | SKBTX_BPF))</div><div class='ctx'> 		skb_tstamp_tx(skb, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4522,7 +4784,7 @@ static inline void __skb_reset_checksum_unnecessary(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> /* Check if we need to perform checksum complete validation.</div><div class='ctx'>  *</div><div class='del'>- * Returns true if checksum complete is needed, false otherwise</div><div class='add'>+ * Returns: true if checksum complete is needed, false otherwise</div><div class='ctx'>  * (either checksum is unnecessary or zero checksum is allowed).</div><div class='ctx'>  */</div><div class='ctx'> static inline bool __skb_checksum_validate_needed(struct sk_buff *skb,</div><div class='hunk'>@@ -4724,6 +4986,9 @@ enum skb_ext_id {</div><div class='ctx'> #if IS_ENABLED(CONFIG_MCTP_FLOWS)</div><div class='ctx'> 	SKB_EXT_MCTP,</div><div class='ctx'> #endif</div><div class='add'>+#if IS_ENABLED(CONFIG_INET_PSP)</div><div class='add'>+	SKB_EXT_PSP,</div><div class='add'>+#endif</div><div class='ctx'> 	SKB_EXT_NUM, /* must be last */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -5153,7 +5418,7 @@ static inline void skb_mark_for_recycle(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t skb_splice_from_iter(struct sk_buff *skb, struct iov_iter *iter,</div><div class='del'>-			     ssize_t maxsize, gfp_t gfp);</div><div class='add'>+			     ssize_t maxsize);</div><div class='ctx'> </div><div class='ctx'> #endif	/* __KERNEL__ */</div><div class='ctx'> #endif	/* _LINUX_SKBUFF_H */</div><div class='head'>diff --git a/include/linux/skbuff_ref.h b/include/linux/skbuff_ref.h<br/>new file mode 100644<br/>index 000000000000..9e49372ef1a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/skbuff_ref.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/skbuff_ref.h</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ *	Skb ref helpers.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_SKBUFF_REF_H</div><div class='add'>+#define _LINUX_SKBUFF_REF_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __skb_frag_ref - take an addition reference on a paged fragment.</div><div class='add'>+ * @frag: the paged fragment</div><div class='add'>+ *</div><div class='add'>+ * Takes an additional reference on the paged fragment @frag.</div><div class='add'>+ */</div><div class='add'>+static inline void __skb_frag_ref(skb_frag_t *frag)</div><div class='add'>+{</div><div class='add'>+	get_netmem(skb_frag_netmem(frag));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_frag_ref - take an addition reference on a paged fragment of an skb.</div><div class='add'>+ * @skb: the buffer</div><div class='add'>+ * @f: the fragment offset.</div><div class='add'>+ *</div><div class='add'>+ * Takes an additional reference on the @f'th paged fragment of @skb.</div><div class='add'>+ */</div><div class='add'>+static inline void skb_frag_ref(struct sk_buff *skb, int f)</div><div class='add'>+{</div><div class='add'>+	__skb_frag_ref(&amp;skb_shinfo(skb)-&gt;frags[f]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool napi_pp_put_page(netmem_ref netmem);</div><div class='add'>+</div><div class='add'>+static inline void skb_page_unref(netmem_ref netmem, bool recycle)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PAGE_POOL</div><div class='add'>+	if (recycle &amp;&amp; napi_pp_put_page(netmem))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+	put_netmem(netmem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __skb_frag_unref - release a reference on a paged fragment.</div><div class='add'>+ * @frag: the paged fragment</div><div class='add'>+ * @recycle: recycle the page if allocated via page_pool</div><div class='add'>+ *</div><div class='add'>+ * Releases a reference on the paged fragment @frag</div><div class='add'>+ * or recycles the page via the page_pool API.</div><div class='add'>+ */</div><div class='add'>+static inline void __skb_frag_unref(skb_frag_t *frag, bool recycle)</div><div class='add'>+{</div><div class='add'>+	skb_page_unref(skb_frag_netmem(frag), recycle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * skb_frag_unref - release a reference on a paged fragment of an skb.</div><div class='add'>+ * @skb: the buffer</div><div class='add'>+ * @f: the fragment offset</div><div class='add'>+ *</div><div class='add'>+ * Releases a reference on the @f'th paged fragment of @skb.</div><div class='add'>+ */</div><div class='add'>+static inline void skb_frag_unref(struct sk_buff *skb, int f)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo = skb_shinfo(skb);</div><div class='add'>+</div><div class='add'>+	if (!skb_zcopy_managed(skb))</div><div class='add'>+		__skb_frag_unref(&amp;shinfo-&gt;frags[f], skb-&gt;pp_recycle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif	/* _LINUX_SKBUFF_REF_H */</div><div class='head'>diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h<br/>index e65ec3fd2799..49847888c287 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/skmsg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/skmsg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/skmsg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/skmsg.h</a></div><div class='hunk'>@@ -58,6 +58,10 @@ struct sk_psock_progs {</div><div class='ctx'> 	struct bpf_prog			*stream_parser;</div><div class='ctx'> 	struct bpf_prog			*stream_verdict;</div><div class='ctx'> 	struct bpf_prog			*skb_verdict;</div><div class='add'>+	struct bpf_link			*msg_parser_link;</div><div class='add'>+	struct bpf_link			*stream_parser_link;</div><div class='add'>+	struct bpf_link			*stream_verdict_link;</div><div class='add'>+	struct bpf_link			*skb_verdict_link;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum sk_psock_state_bits {</div><div class='hunk'>@@ -87,6 +91,8 @@ struct sk_psock {</div><div class='ctx'> 	struct sk_psock_progs		progs;</div><div class='ctx'> #if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)</div><div class='ctx'> 	struct strparser		strp;</div><div class='add'>+	u32				copied_seq;</div><div class='add'>+	u32				ingress_bytes;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct sk_buff_head		ingress_skb;</div><div class='ctx'> 	struct list_head		ingress_msg;</div><div class='hunk'>@@ -309,21 +315,26 @@ static inline bool sk_psock_test_state(const struct sk_psock *psock,</div><div class='ctx'> </div><div class='ctx'> static inline void sock_drop(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	sk_drops_add(sk, skb);</div><div class='add'>+	sk_drops_skbadd(sk, skb);</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void sk_psock_queue_msg(struct sk_psock *psock,</div><div class='add'>+static inline bool sk_psock_queue_msg(struct sk_psock *psock,</div><div class='ctx'> 				      struct sk_msg *msg)</div><div class='ctx'> {</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;psock-&gt;ingress_lock);</div><div class='del'>-	if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))</div><div class='add'>+	if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) {</div><div class='ctx'> 		list_add_tail(&amp;msg-&gt;list, &amp;psock-&gt;ingress_msg);</div><div class='del'>-	else {</div><div class='add'>+		ret = true;</div><div class='add'>+	} else {</div><div class='ctx'> 		sk_msg_free(psock-&gt;sk, msg);</div><div class='ctx'> 		kfree(msg);</div><div class='add'>+		ret = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;psock-&gt;ingress_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct sk_msg *sk_psock_dequeue_msg(struct sk_psock *psock)</div><div class='hunk'>@@ -410,11 +421,14 @@ void sk_psock_stop_verdict(struct sock *sk, struct sk_psock *psock);</div><div class='ctx'> int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock,</div><div class='ctx'> 			 struct sk_msg *msg);</div><div class='ctx'> </div><div class='del'>-static inline struct sk_psock_link *sk_psock_init_link(void)</div><div class='del'>-{</div><div class='del'>-	return kzalloc(sizeof(struct sk_psock_link),</div><div class='del'>-		       GFP_ATOMIC | __GFP_NOWARN);</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * This specialized allocator has to be a macro for its allocations to be</div><div class='add'>+ * accounted separately (to have a separate alloc_tag). The typecast is</div><div class='add'>+ * intentional to enforce typesafety.</div><div class='add'>+ */</div><div class='add'>+#define sk_psock_init_link()	\</div><div class='add'>+		((struct sk_psock_link *)kzalloc(sizeof(struct sk_psock_link),	\</div><div class='add'>+						 GFP_ATOMIC | __GFP_NOWARN))</div><div class='ctx'> </div><div class='ctx'> static inline void sk_psock_free_link(struct sk_psock_link *link)</div><div class='ctx'> {</div><div class='hunk'>@@ -461,10 +475,12 @@ static inline void sk_psock_put(struct sock *sk, struct sk_psock *psock)</div><div class='ctx'> </div><div class='ctx'> static inline void sk_psock_data_ready(struct sock *sk, struct sk_psock *psock)</div><div class='ctx'> {</div><div class='add'>+	read_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> 	if (psock-&gt;saved_data_ready)</div><div class='ctx'> 		psock-&gt;saved_data_ready(sk);</div><div class='ctx'> 	else</div><div class='ctx'> 		sk-&gt;sk_data_ready(sk);</div><div class='add'>+	read_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void psock_set_prog(struct bpf_prog **pprog,</div><div class='head'>diff --git a/include/linux/slab.h b/include/linux/slab.h<br/>index e53cbfa18325..cf443f064a66 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/slab.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/slab.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/slab.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/slab.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/overflow.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/percpu-refcount.h&gt;</div><div class='ctx'> #include &lt;linux/cleanup.h&gt;</div><div class='hunk'>@@ -41,7 +42,7 @@ enum _slab_flag_bits {</div><div class='ctx'> #ifdef CONFIG_FAILSLAB</div><div class='ctx'> 	_SLAB_FAILSLAB,</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> 	_SLAB_ACCOUNT,</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_KASAN_GENERIC</div><div class='hunk'>@@ -56,6 +57,9 @@ enum _slab_flag_bits {</div><div class='ctx'> #endif</div><div class='ctx'> 	_SLAB_OBJECT_POISON,</div><div class='ctx'> 	_SLAB_CMPXCHG_DOUBLE,</div><div class='add'>+#ifdef CONFIG_SLAB_OBJ_EXT</div><div class='add'>+	_SLAB_NO_OBJ_EXT,</div><div class='add'>+#endif</div><div class='ctx'> 	_SLAB_FLAGS_LAST_BIT</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -74,7 +78,17 @@ enum _slab_flag_bits {</div><div class='ctx'> #define SLAB_POISON		__SLAB_FLAG_BIT(_SLAB_POISON)</div><div class='ctx'> /* Indicate a kmalloc slab */</div><div class='ctx'> #define SLAB_KMALLOC		__SLAB_FLAG_BIT(_SLAB_KMALLOC)</div><div class='del'>-/* Align objs on cache lines */</div><div class='add'>+/**</div><div class='add'>+ * define SLAB_HWCACHE_ALIGN - Align objects on cache line boundaries.</div><div class='add'>+ *</div><div class='add'>+ * Sufficiently large objects are aligned on cache line boundary. For object</div><div class='add'>+ * size smaller than a half of cache line size, the alignment is on the half of</div><div class='add'>+ * cache line size. In general, if object size is smaller than 1/2^n of cache</div><div class='add'>+ * line size, the alignment is adjusted to 1/2^n.</div><div class='add'>+ *</div><div class='add'>+ * If explicit alignment is also requested by the respective</div><div class='add'>+ * &amp;struct kmem_cache_args field, the greater of both is alignments is applied.</div><div class='add'>+ */</div><div class='ctx'> #define SLAB_HWCACHE_ALIGN	__SLAB_FLAG_BIT(_SLAB_HWCACHE_ALIGN)</div><div class='ctx'> /* Use GFP_DMA memory */</div><div class='ctx'> #define SLAB_CACHE_DMA		__SLAB_FLAG_BIT(_SLAB_CACHE_DMA)</div><div class='hunk'>@@ -84,8 +98,8 @@ enum _slab_flag_bits {</div><div class='ctx'> #define SLAB_STORE_USER		__SLAB_FLAG_BIT(_SLAB_STORE_USER)</div><div class='ctx'> /* Panic if kmem_cache_create() fails */</div><div class='ctx'> #define SLAB_PANIC		__SLAB_FLAG_BIT(_SLAB_PANIC)</div><div class='del'>-/*</div><div class='del'>- * SLAB_TYPESAFE_BY_RCU - **WARNING** READ THIS!</div><div class='add'>+/**</div><div class='add'>+ * define SLAB_TYPESAFE_BY_RCU - **WARNING** READ THIS!</div><div class='ctx'>  *</div><div class='ctx'>  * This delays freeing the SLAB page by a grace period, it does _NOT_</div><div class='ctx'>  * delay object freeing. This means that if you do kmem_cache_free()</div><div class='hunk'>@@ -96,20 +110,22 @@ enum _slab_flag_bits {</div><div class='ctx'>  * stays valid, the trick to using this is relying on an independent</div><div class='ctx'>  * object validation pass. Something like:</div><div class='ctx'>  *</div><div class='del'>- * begin:</div><div class='del'>- *  rcu_read_lock();</div><div class='del'>- *  obj = lockless_lookup(key);</div><div class='del'>- *  if (obj) {</div><div class='del'>- *    if (!try_get_ref(obj)) // might fail for free objects</div><div class='del'>- *      rcu_read_unlock();</div><div class='del'>- *      goto begin;</div><div class='del'>- *</div><div class='del'>- *    if (obj-&gt;key != key) { // not the object we expected</div><div class='del'>- *      put_ref(obj);</div><div class='del'>- *      rcu_read_unlock();</div><div class='del'>- *      goto begin;</div><div class='del'>- *    }</div><div class='del'>- *  }</div><div class='add'>+ * ::</div><div class='add'>+ *</div><div class='add'>+ *  begin:</div><div class='add'>+ *   rcu_read_lock();</div><div class='add'>+ *   obj = lockless_lookup(key);</div><div class='add'>+ *   if (obj) {</div><div class='add'>+ *     if (!try_get_ref(obj)) // might fail for free objects</div><div class='add'>+ *       rcu_read_unlock();</div><div class='add'>+ *       goto begin;</div><div class='add'>+ *</div><div class='add'>+ *     if (obj-&gt;key != key) { // not the object we expected</div><div class='add'>+ *       put_ref(obj);</div><div class='add'>+ *       rcu_read_unlock();</div><div class='add'>+ *       goto begin;</div><div class='add'>+ *     }</div><div class='add'>+ *   }</div><div class='ctx'>  *  rcu_read_unlock();</div><div class='ctx'>  *</div><div class='ctx'>  * This is useful if we need to approach a kernel structure obliquely,</div><div class='hunk'>@@ -121,6 +137,15 @@ enum _slab_flag_bits {</div><div class='ctx'>  * rcu_read_lock before reading the address, then rcu_read_unlock after</div><div class='ctx'>  * taking the spinlock within the structure expected at that address.</div><div class='ctx'>  *</div><div class='add'>+ * Note that object identity check has to be done *after* acquiring a</div><div class='add'>+ * reference, therefore user has to ensure proper ordering for loads.</div><div class='add'>+ * Similarly, when initializing objects allocated with SLAB_TYPESAFE_BY_RCU,</div><div class='add'>+ * the newly allocated object has to be fully initialized *before* its</div><div class='add'>+ * refcount gets initialized and proper ordering for stores is required.</div><div class='add'>+ * refcount_{add|inc}_not_zero_acquire() and refcount_set_release() are</div><div class='add'>+ * designed with the proper fences required for reference counting objects</div><div class='add'>+ * allocated with SLAB_TYPESAFE_BY_RCU.</div><div class='add'>+ *</div><div class='ctx'>  * Note that it is not possible to acquire a lock within a structure</div><div class='ctx'>  * allocated with SLAB_TYPESAFE_BY_RCU without first acquiring a reference</div><div class='ctx'>  * as described above.  The reason is that SLAB_TYPESAFE_BY_RCU pages</div><div class='hunk'>@@ -134,7 +159,6 @@ enum _slab_flag_bits {</div><div class='ctx'>  *</div><div class='ctx'>  * Note that SLAB_TYPESAFE_BY_RCU was originally named SLAB_DESTROY_BY_RCU.</div><div class='ctx'>  */</div><div class='del'>-/* Defer freeing slabs to RCU */</div><div class='ctx'> #define SLAB_TYPESAFE_BY_RCU	__SLAB_FLAG_BIT(_SLAB_TYPESAFE_BY_RCU)</div><div class='ctx'> /* Trace allocations and frees */</div><div class='ctx'> #define SLAB_TRACE		__SLAB_FLAG_BIT(_SLAB_TRACE)</div><div class='hunk'>@@ -167,8 +191,13 @@ enum _slab_flag_bits {</div><div class='ctx'> #else</div><div class='ctx'> # define SLAB_FAILSLAB		__SLAB_FLAG_UNUSED</div><div class='ctx'> #endif</div><div class='del'>-/* Account to memcg */</div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+/**</div><div class='add'>+ * define SLAB_ACCOUNT - Account allocations to memcg.</div><div class='add'>+ *</div><div class='add'>+ * All object allocations from this cache will be memcg accounted, regardless of</div><div class='add'>+ * __GFP_ACCOUNT being or not being passed to individual allocations.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> # define SLAB_ACCOUNT		__SLAB_FLAG_BIT(_SLAB_ACCOUNT)</div><div class='ctx'> #else</div><div class='ctx'> # define SLAB_ACCOUNT		__SLAB_FLAG_UNUSED</div><div class='hunk'>@@ -194,7 +223,13 @@ enum _slab_flag_bits {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* The following flags affect the page allocator grouping pages by mobility */</div><div class='del'>-/* Objects are reclaimable */</div><div class='add'>+/**</div><div class='add'>+ * define SLAB_RECLAIM_ACCOUNT - Objects are reclaimable.</div><div class='add'>+ *</div><div class='add'>+ * Use this flag for caches that have an associated shrinker. As a result, slab</div><div class='add'>+ * pages are allocated with __GFP_RECLAIMABLE, which affects grouping pages by</div><div class='add'>+ * mobility, and are accounted in SReclaimable counter in /proc/meminfo</div><div class='add'>+ */</div><div class='ctx'> #ifndef CONFIG_SLUB_TINY</div><div class='ctx'> #define SLAB_RECLAIM_ACCOUNT	__SLAB_FLAG_BIT(_SLAB_RECLAIM_ACCOUNT)</div><div class='ctx'> #else</div><div class='hunk'>@@ -202,6 +237,13 @@ enum _slab_flag_bits {</div><div class='ctx'> #endif</div><div class='ctx'> #define SLAB_TEMPORARY		SLAB_RECLAIM_ACCOUNT	/* Objects are short-lived */</div><div class='ctx'> </div><div class='add'>+/* Slab created using create_boot_cache */</div><div class='add'>+#ifdef CONFIG_SLAB_OBJ_EXT</div><div class='add'>+#define SLAB_NO_OBJ_EXT		__SLAB_FLAG_BIT(_SLAB_NO_OBJ_EXT)</div><div class='add'>+#else</div><div class='add'>+#define SLAB_NO_OBJ_EXT		__SLAB_FLAG_UNUSED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ZERO_SIZE_PTR will be returned for zero sized kmalloc requests.</div><div class='ctx'>  *</div><div class='hunk'>@@ -224,14 +266,204 @@ struct mem_cgroup;</div><div class='ctx'>  */</div><div class='ctx'> bool slab_is_available(void);</div><div class='ctx'> </div><div class='del'>-struct kmem_cache *kmem_cache_create(const char *name, unsigned int size,</div><div class='del'>-			unsigned int align, slab_flags_t flags,</div><div class='del'>-			void (*ctor)(void *));</div><div class='del'>-struct kmem_cache *kmem_cache_create_usercopy(const char *name,</div><div class='del'>-			unsigned int size, unsigned int align,</div><div class='del'>-			slab_flags_t flags,</div><div class='del'>-			unsigned int useroffset, unsigned int usersize,</div><div class='del'>-			void (*ctor)(void *));</div><div class='add'>+/**</div><div class='add'>+ * struct kmem_cache_args - Less common arguments for kmem_cache_create()</div><div class='add'>+ *</div><div class='add'>+ * Any uninitialized fields of the structure are interpreted as unused. The</div><div class='add'>+ * exception is @freeptr_offset where %0 is a valid value, so</div><div class='add'>+ * @use_freeptr_offset must be also set to %true in order to interpret the field</div><div class='add'>+ * as used. For @useroffset %0 is also valid, but only with non-%0</div><div class='add'>+ * @usersize.</div><div class='add'>+ *</div><div class='add'>+ * When %NULL args is passed to kmem_cache_create(), it is equivalent to all</div><div class='add'>+ * fields unused.</div><div class='add'>+ */</div><div class='add'>+struct kmem_cache_args {</div><div class='add'>+	/**</div><div class='add'>+	 * @align: The required alignment for the objects.</div><div class='add'>+	 *</div><div class='add'>+	 * %0 means no specific alignment is requested.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int align;</div><div class='add'>+	/**</div><div class='add'>+	 * @useroffset: Usercopy region offset.</div><div class='add'>+	 *</div><div class='add'>+	 * %0 is a valid offset, when @usersize is non-%0</div><div class='add'>+	 */</div><div class='add'>+	unsigned int useroffset;</div><div class='add'>+	/**</div><div class='add'>+	 * @usersize: Usercopy region size.</div><div class='add'>+	 *</div><div class='add'>+	 * %0 means no usercopy region is specified.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int usersize;</div><div class='add'>+	/**</div><div class='add'>+	 * @freeptr_offset: Custom offset for the free pointer</div><div class='add'>+	 * in &amp;SLAB_TYPESAFE_BY_RCU caches</div><div class='add'>+	 *</div><div class='add'>+	 * By default &amp;SLAB_TYPESAFE_BY_RCU caches place the free pointer</div><div class='add'>+	 * outside of the object. This might cause the object to grow in size.</div><div class='add'>+	 * Cache creators that have a reason to avoid this can specify a custom</div><div class='add'>+	 * free pointer offset in their struct where the free pointer will be</div><div class='add'>+	 * placed.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that placing the free pointer inside the object requires the</div><div class='add'>+	 * caller to ensure that no fields are invalidated that are required to</div><div class='add'>+	 * guard against object recycling (See &amp;SLAB_TYPESAFE_BY_RCU for</div><div class='add'>+	 * details).</div><div class='add'>+	 *</div><div class='add'>+	 * Using %0 as a value for @freeptr_offset is valid. If @freeptr_offset</div><div class='add'>+	 * is specified, %use_freeptr_offset must be set %true.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that @ctor currently isn't supported with custom free pointers</div><div class='add'>+	 * as a @ctor requires an external free pointer.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int freeptr_offset;</div><div class='add'>+	/**</div><div class='add'>+	 * @use_freeptr_offset: Whether a @freeptr_offset is used.</div><div class='add'>+	 */</div><div class='add'>+	bool use_freeptr_offset;</div><div class='add'>+	/**</div><div class='add'>+	 * @ctor: A constructor for the objects.</div><div class='add'>+	 *</div><div class='add'>+	 * The constructor is invoked for each object in a newly allocated slab</div><div class='add'>+	 * page. It is the cache user's responsibility to free object in the</div><div class='add'>+	 * same state as after calling the constructor, or deal appropriately</div><div class='add'>+	 * with any differences between a freshly constructed and a reallocated</div><div class='add'>+	 * object.</div><div class='add'>+	 *</div><div class='add'>+	 * %NULL means no constructor.</div><div class='add'>+	 */</div><div class='add'>+	void (*ctor)(void *);</div><div class='add'>+	/**</div><div class='add'>+	 * @sheaf_capacity: Enable sheaves of given capacity for the cache.</div><div class='add'>+	 *</div><div class='add'>+	 * With a non-zero value, allocations from the cache go through caching</div><div class='add'>+	 * arrays called sheaves. Each cpu has a main sheaf that's always</div><div class='add'>+	 * present, and a spare sheaf that may be not present. When both become</div><div class='add'>+	 * empty, there's an attempt to replace an empty sheaf with a full sheaf</div><div class='add'>+	 * from the per-node barn.</div><div class='add'>+	 *</div><div class='add'>+	 * When no full sheaf is available, and gfp flags allow blocking, a</div><div class='add'>+	 * sheaf is allocated and filled from slab(s) using bulk allocation.</div><div class='add'>+	 * Otherwise the allocation falls back to the normal operation</div><div class='add'>+	 * allocating a single object from a slab.</div><div class='add'>+	 *</div><div class='add'>+	 * Analogically when freeing and both percpu sheaves are full, the barn</div><div class='add'>+	 * may replace it with an empty sheaf, unless it's over capacity. In</div><div class='add'>+	 * that case a sheaf is bulk freed to slab pages.</div><div class='add'>+	 *</div><div class='add'>+	 * The sheaves do not enforce NUMA placement of objects, so allocations</div><div class='add'>+	 * via kmem_cache_alloc_node() with a node specified other than</div><div class='add'>+	 * NUMA_NO_NODE will bypass them.</div><div class='add'>+	 *</div><div class='add'>+	 * Bulk allocation and free operations also try to use the cpu sheaves</div><div class='add'>+	 * and barn, but fallback to using slab pages directly.</div><div class='add'>+	 *</div><div class='add'>+	 * When slub_debug is enabled for the cache, the sheaf_capacity argument</div><div class='add'>+	 * is ignored.</div><div class='add'>+	 *</div><div class='add'>+	 * %0 means no sheaves will be created.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int sheaf_capacity;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kmem_cache *__kmem_cache_create_args(const char *name,</div><div class='add'>+					    unsigned int object_size,</div><div class='add'>+					    struct kmem_cache_args *args,</div><div class='add'>+					    slab_flags_t flags);</div><div class='add'>+static inline struct kmem_cache *</div><div class='add'>+__kmem_cache_create(const char *name, unsigned int size, unsigned int align,</div><div class='add'>+		    slab_flags_t flags, void (*ctor)(void *))</div><div class='add'>+{</div><div class='add'>+	struct kmem_cache_args kmem_args = {</div><div class='add'>+		.align	= align,</div><div class='add'>+		.ctor	= ctor,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return __kmem_cache_create_args(name, size, &amp;kmem_args, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kmem_cache_create_usercopy - Create a kmem cache with a region suitable</div><div class='add'>+ * for copying to userspace.</div><div class='add'>+ * @name: A string which is used in /proc/slabinfo to identify this cache.</div><div class='add'>+ * @size: The size of objects to be created in this cache.</div><div class='add'>+ * @align: The required alignment for the objects.</div><div class='add'>+ * @flags: SLAB flags</div><div class='add'>+ * @useroffset: Usercopy region offset</div><div class='add'>+ * @usersize: Usercopy region size</div><div class='add'>+ * @ctor: A constructor for the objects, or %NULL.</div><div class='add'>+ *</div><div class='add'>+ * This is a legacy wrapper, new code should use either KMEM_CACHE_USERCOPY()</div><div class='add'>+ * if whitelisting a single field is sufficient, or kmem_cache_create() with</div><div class='add'>+ * the necessary parameters passed via the args parameter (see</div><div class='add'>+ * &amp;struct kmem_cache_args)</div><div class='add'>+ *</div><div class='add'>+ * Return: a pointer to the cache on success, NULL on failure.</div><div class='add'>+ */</div><div class='add'>+static inline struct kmem_cache *</div><div class='add'>+kmem_cache_create_usercopy(const char *name, unsigned int size,</div><div class='add'>+			   unsigned int align, slab_flags_t flags,</div><div class='add'>+			   unsigned int useroffset, unsigned int usersize,</div><div class='add'>+			   void (*ctor)(void *))</div><div class='add'>+{</div><div class='add'>+	struct kmem_cache_args kmem_args = {</div><div class='add'>+		.align		= align,</div><div class='add'>+		.ctor		= ctor,</div><div class='add'>+		.useroffset	= useroffset,</div><div class='add'>+		.usersize	= usersize,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return __kmem_cache_create_args(name, size, &amp;kmem_args, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If NULL is passed for @args, use this variant with default arguments. */</div><div class='add'>+static inline struct kmem_cache *</div><div class='add'>+__kmem_cache_default_args(const char *name, unsigned int size,</div><div class='add'>+			  struct kmem_cache_args *args,</div><div class='add'>+			  slab_flags_t flags)</div><div class='add'>+{</div><div class='add'>+	struct kmem_cache_args kmem_default_args = {};</div><div class='add'>+</div><div class='add'>+	/* Make sure we don't get passed garbage. */</div><div class='add'>+	if (WARN_ON_ONCE(args))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return __kmem_cache_create_args(name, size, &amp;kmem_default_args, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kmem_cache_create - Create a kmem cache.</div><div class='add'>+ * @__name: A string which is used in /proc/slabinfo to identify this cache.</div><div class='add'>+ * @__object_size: The size of objects to be created in this cache.</div><div class='add'>+ * @__args: Optional arguments, see &amp;struct kmem_cache_args. Passing %NULL</div><div class='add'>+ *	    means defaults will be used for all the arguments.</div><div class='add'>+ *</div><div class='add'>+ * This is currently implemented as a macro using ``_Generic()`` to call</div><div class='add'>+ * either the new variant of the function, or a legacy one.</div><div class='add'>+ *</div><div class='add'>+ * The new variant has 4 parameters:</div><div class='add'>+ * ``kmem_cache_create(name, object_size, args, flags)``</div><div class='add'>+ *</div><div class='add'>+ * See __kmem_cache_create_args() which implements this.</div><div class='add'>+ *</div><div class='add'>+ * The legacy variant has 5 parameters:</div><div class='add'>+ * ``kmem_cache_create(name, object_size, align, flags, ctor)``</div><div class='add'>+ *</div><div class='add'>+ * The align and ctor parameters map to the respective fields of</div><div class='add'>+ * &amp;struct kmem_cache_args</div><div class='add'>+ *</div><div class='add'>+ * Context: Cannot be called within a interrupt, but can be interrupted.</div><div class='add'>+ *</div><div class='add'>+ * Return: a pointer to the cache on success, NULL on failure.</div><div class='add'>+ */</div><div class='add'>+#define kmem_cache_create(__name, __object_size, __args, ...)           \</div><div class='add'>+	_Generic((__args),                                              \</div><div class='add'>+		struct kmem_cache_args *: __kmem_cache_create_args,	\</div><div class='add'>+		void *: __kmem_cache_default_args,			\</div><div class='add'>+		default: __kmem_cache_create)(__name, __object_size, __args, __VA_ARGS__)</div><div class='add'>+</div><div class='ctx'> void kmem_cache_destroy(struct kmem_cache *s);</div><div class='ctx'> int kmem_cache_shrink(struct kmem_cache *s);</div><div class='ctx'> </div><div class='hunk'>@@ -243,30 +475,42 @@ int kmem_cache_shrink(struct kmem_cache *s);</div><div class='ctx'>  * f.e. add ____cacheline_aligned_in_smp to the struct declaration</div><div class='ctx'>  * then the objects will be properly aligned in SMP configurations.</div><div class='ctx'>  */</div><div class='del'>-#define KMEM_CACHE(__struct, __flags)					\</div><div class='del'>-		kmem_cache_create(#__struct, sizeof(struct __struct),	\</div><div class='del'>-			__alignof__(struct __struct), (__flags), NULL)</div><div class='add'>+#define KMEM_CACHE(__struct, __flags)                                   \</div><div class='add'>+	__kmem_cache_create_args(#__struct, sizeof(struct __struct),    \</div><div class='add'>+			&amp;(struct kmem_cache_args) {			\</div><div class='add'>+				.align	= __alignof__(struct __struct), \</div><div class='add'>+			}, (__flags))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * To whitelist a single field for copying to/from usercopy, use this</div><div class='ctx'>  * macro instead for KMEM_CACHE() above.</div><div class='ctx'>  */</div><div class='del'>-#define KMEM_CACHE_USERCOPY(__struct, __flags, __field)			\</div><div class='del'>-		kmem_cache_create_usercopy(#__struct,			\</div><div class='del'>-			sizeof(struct __struct),			\</div><div class='del'>-			__alignof__(struct __struct), (__flags),	\</div><div class='del'>-			offsetof(struct __struct, __field),		\</div><div class='del'>-			sizeof_field(struct __struct, __field), NULL)</div><div class='add'>+#define KMEM_CACHE_USERCOPY(__struct, __flags, __field)						\</div><div class='add'>+	__kmem_cache_create_args(#__struct, sizeof(struct __struct),				\</div><div class='add'>+			&amp;(struct kmem_cache_args) {						\</div><div class='add'>+				.align		= __alignof__(struct __struct),			\</div><div class='add'>+				.useroffset	= offsetof(struct __struct, __field),		\</div><div class='add'>+				.usersize	= sizeof_field(struct __struct, __field),	\</div><div class='add'>+			}, (__flags))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Common kmalloc functions provided by all allocators</div><div class='ctx'>  */</div><div class='del'>-void * __must_check krealloc(const void *objp, size_t new_size, gfp_t flags) __realloc_size(2);</div><div class='add'>+void * __must_check krealloc_node_align_noprof(const void *objp, size_t new_size,</div><div class='add'>+					       unsigned long align,</div><div class='add'>+					       gfp_t flags, int nid) __realloc_size(2);</div><div class='add'>+#define krealloc_noprof(_o, _s, _f)	krealloc_node_align_noprof(_o, _s, 1, _f, NUMA_NO_NODE)</div><div class='add'>+#define krealloc_node_align(...)	alloc_hooks(krealloc_node_align_noprof(__VA_ARGS__))</div><div class='add'>+#define krealloc_node(_o, _s, _f, _n)	krealloc_node_align(_o, _s, 1, _f, _n)</div><div class='add'>+#define krealloc(...)			krealloc_node(__VA_ARGS__, NUMA_NO_NODE)</div><div class='add'>+</div><div class='ctx'> void kfree(const void *objp);</div><div class='add'>+void kfree_nolock(const void *objp);</div><div class='ctx'> void kfree_sensitive(const void *objp);</div><div class='ctx'> size_t __ksize(const void *objp);</div><div class='ctx'> </div><div class='del'>-DEFINE_FREE(kfree, void *, if (_T) kfree(_T))</div><div class='add'>+DEFINE_FREE(kfree, void *, if (!IS_ERR_OR_NULL(_T)) kfree(_T))</div><div class='add'>+DEFINE_FREE(kfree_sensitive, void *, if (_T) kfree_sensitive(_T))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ksize - Report actual allocation size of associated object</div><div class='hunk'>@@ -394,7 +638,7 @@ enum kmalloc_cache_type {</div><div class='ctx'> #ifndef CONFIG_ZONE_DMA</div><div class='ctx'> 	KMALLOC_DMA = KMALLOC_NORMAL,</div><div class='ctx'> #endif</div><div class='del'>-#ifndef CONFIG_MEMCG_KMEM</div><div class='add'>+#ifndef CONFIG_MEMCG</div><div class='ctx'> 	KMALLOC_CGROUP = KMALLOC_NORMAL,</div><div class='ctx'> #endif</div><div class='ctx'> 	KMALLOC_RANDOM_START = KMALLOC_NORMAL,</div><div class='hunk'>@@ -407,14 +651,15 @@ enum kmalloc_cache_type {</div><div class='ctx'> #ifdef CONFIG_ZONE_DMA</div><div class='ctx'> 	KMALLOC_DMA,</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_MEMCG_KMEM</div><div class='add'>+#ifdef CONFIG_MEMCG</div><div class='ctx'> 	KMALLOC_CGROUP,</div><div class='ctx'> #endif</div><div class='ctx'> 	NR_KMALLOC_TYPES</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct kmem_cache *</div><div class='del'>-kmalloc_caches[NR_KMALLOC_TYPES][KMALLOC_SHIFT_HIGH + 1];</div><div class='add'>+typedef struct kmem_cache * kmem_buckets[KMALLOC_SHIFT_HIGH + 1];</div><div class='add'>+</div><div class='add'>+extern kmem_buckets kmalloc_caches[NR_KMALLOC_TYPES];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define gfp bits that should not be set for KMALLOC_NORMAL.</div><div class='hunk'>@@ -422,7 +667,7 @@ kmalloc_caches[NR_KMALLOC_TYPES][KMALLOC_SHIFT_HIGH + 1];</div><div class='ctx'> #define KMALLOC_NOT_NORMAL_BITS					\</div><div class='ctx'> 	(__GFP_RECLAIMABLE |					\</div><div class='ctx'> 	(IS_ENABLED(CONFIG_ZONE_DMA)   ? __GFP_DMA : 0) |	\</div><div class='del'>-	(IS_ENABLED(CONFIG_MEMCG_KMEM) ? __GFP_ACCOUNT : 0))</div><div class='add'>+	(IS_ENABLED(CONFIG_MEMCG) ? __GFP_ACCOUNT : 0))</div><div class='ctx'> </div><div class='ctx'> extern unsigned long random_kmalloc_seed;</div><div class='ctx'> </div><div class='hunk'>@@ -450,7 +695,7 @@ static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags, unsigne</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (IS_ENABLED(CONFIG_ZONE_DMA) &amp;&amp; (flags &amp; __GFP_DMA))</div><div class='ctx'> 		return KMALLOC_DMA;</div><div class='del'>-	if (!IS_ENABLED(CONFIG_MEMCG_KMEM) || (flags &amp; __GFP_RECLAIMABLE))</div><div class='add'>+	if (!IS_ENABLED(CONFIG_MEMCG) || (flags &amp; __GFP_RECLAIMABLE))</div><div class='ctx'> 		return KMALLOC_RECLAIM;</div><div class='ctx'> 	else</div><div class='ctx'> 		return KMALLOC_CGROUP;</div><div class='hunk'>@@ -513,7 +758,7 @@ static __always_inline unsigned int __kmalloc_index(size_t size,</div><div class='ctx'> static_assert(PAGE_SHIFT &lt;= 20);</div><div class='ctx'> #define kmalloc_index(s) __kmalloc_index(s, true)</div><div class='ctx'> </div><div class='del'>-void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __alloc_size(1);</div><div class='add'>+#include &lt;linux/alloc_tag.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kmem_cache_alloc - Allocate an object</div><div class='hunk'>@@ -525,11 +770,49 @@ void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __alloc_siz</div><div class='ctx'>  *</div><div class='ctx'>  * Return: pointer to the new object or %NULL in case of error</div><div class='ctx'>  */</div><div class='del'>-void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags) __assume_slab_alignment __malloc;</div><div class='del'>-void *kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru,</div><div class='del'>-			   gfp_t gfpflags) __assume_slab_alignment __malloc;</div><div class='add'>+void *kmem_cache_alloc_noprof(struct kmem_cache *cachep,</div><div class='add'>+			      gfp_t flags) __assume_slab_alignment __malloc;</div><div class='add'>+#define kmem_cache_alloc(...)			alloc_hooks(kmem_cache_alloc_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+void *kmem_cache_alloc_lru_noprof(struct kmem_cache *s, struct list_lru *lru,</div><div class='add'>+			    gfp_t gfpflags) __assume_slab_alignment __malloc;</div><div class='add'>+#define kmem_cache_alloc_lru(...)	alloc_hooks(kmem_cache_alloc_lru_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * kmem_cache_charge - memcg charge an already allocated slab memory</div><div class='add'>+ * @objp: address of the slab object to memcg charge</div><div class='add'>+ * @gfpflags: describe the allocation context</div><div class='add'>+ *</div><div class='add'>+ * kmem_cache_charge allows charging a slab object to the current memcg,</div><div class='add'>+ * primarily in cases where charging at allocation time might not be possible</div><div class='add'>+ * because the target memcg is not known (i.e. softirq context)</div><div class='add'>+ *</div><div class='add'>+ * The objp should be pointer returned by the slab allocator functions like</div><div class='add'>+ * kmalloc (with __GFP_ACCOUNT in flags) or kmem_cache_alloc. The memcg charge</div><div class='add'>+ * behavior can be controlled through gfpflags parameter, which affects how the</div><div class='add'>+ * necessary internal metadata can be allocated. Including __GFP_NOFAIL denotes</div><div class='add'>+ * that overcharging is requested instead of failure, but is not applied for the</div><div class='add'>+ * internal metadata allocation.</div><div class='add'>+ *</div><div class='add'>+ * There are several cases where it will return true even if the charging was</div><div class='add'>+ * not done:</div><div class='add'>+ * More specifically:</div><div class='add'>+ *</div><div class='add'>+ * 1. For !CONFIG_MEMCG or cgroup_disable=memory systems.</div><div class='add'>+ * 2. Already charged slab objects.</div><div class='add'>+ * 3. For slab objects from KMALLOC_NORMAL caches - allocated by kmalloc()</div><div class='add'>+ *    without __GFP_ACCOUNT</div><div class='add'>+ * 4. Allocating internal metadata has failed</div><div class='add'>+ *</div><div class='add'>+ * Return: true if charge was successful otherwise false.</div><div class='add'>+ */</div><div class='add'>+bool kmem_cache_charge(void *objp, gfp_t gfpflags);</div><div class='ctx'> void kmem_cache_free(struct kmem_cache *s, void *objp);</div><div class='ctx'> </div><div class='add'>+kmem_buckets *kmem_buckets_create(const char *name, slab_flags_t flags,</div><div class='add'>+				  unsigned int useroffset, unsigned int usersize,</div><div class='add'>+				  void (*ctor)(void *));</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Bulk allocation and freeing operations. These are accelerated in an</div><div class='ctx'>  * allocator specific way to avoid taking locks repeatedly or building</div><div class='hunk'>@@ -538,29 +821,74 @@ void kmem_cache_free(struct kmem_cache *s, void *objp);</div><div class='ctx'>  * Note that interrupts must be enabled when calling these functions.</div><div class='ctx'>  */</div><div class='ctx'> void kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p);</div><div class='del'>-int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, void **p);</div><div class='add'>+</div><div class='add'>+int kmem_cache_alloc_bulk_noprof(struct kmem_cache *s, gfp_t flags, size_t size, void **p);</div><div class='add'>+#define kmem_cache_alloc_bulk(...)	alloc_hooks(kmem_cache_alloc_bulk_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> static __always_inline void kfree_bulk(size_t size, void **p)</div><div class='ctx'> {</div><div class='ctx'> 	kmem_cache_free_bulk(NULL, size, p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment</div><div class='del'>-							 __alloc_size(1);</div><div class='del'>-void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t flags, int node) __assume_slab_alignment</div><div class='del'>-									 __malloc;</div><div class='add'>+void *kmem_cache_alloc_node_noprof(struct kmem_cache *s, gfp_t flags,</div><div class='add'>+				   int node) __assume_slab_alignment __malloc;</div><div class='add'>+#define kmem_cache_alloc_node(...)	alloc_hooks(kmem_cache_alloc_node_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+struct slab_sheaf *</div><div class='add'>+kmem_cache_prefill_sheaf(struct kmem_cache *s, gfp_t gfp, unsigned int size);</div><div class='add'>+</div><div class='add'>+int kmem_cache_refill_sheaf(struct kmem_cache *s, gfp_t gfp,</div><div class='add'>+		struct slab_sheaf **sheafp, unsigned int size);</div><div class='add'>+</div><div class='add'>+void kmem_cache_return_sheaf(struct kmem_cache *s, gfp_t gfp,</div><div class='add'>+				       struct slab_sheaf *sheaf);</div><div class='add'>+</div><div class='add'>+void *kmem_cache_alloc_from_sheaf_noprof(struct kmem_cache *cachep, gfp_t gfp,</div><div class='add'>+			struct slab_sheaf *sheaf) __assume_slab_alignment __malloc;</div><div class='add'>+#define kmem_cache_alloc_from_sheaf(...)	\</div><div class='add'>+			alloc_hooks(kmem_cache_alloc_from_sheaf_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+unsigned int kmem_cache_sheaf_size(struct slab_sheaf *sheaf);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These macros allow declaring a kmem_buckets * parameter alongside size, which</div><div class='add'>+ * can be compiled out with CONFIG_SLAB_BUCKETS=n so that a large number of call</div><div class='add'>+ * sites don't have to pass NULL.</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_SLAB_BUCKETS</div><div class='add'>+#define DECL_BUCKET_PARAMS(_size, _b)	size_t (_size), kmem_buckets *(_b)</div><div class='add'>+#define PASS_BUCKET_PARAMS(_size, _b)	(_size), (_b)</div><div class='add'>+#define PASS_BUCKET_PARAM(_b)		(_b)</div><div class='add'>+#else</div><div class='add'>+#define DECL_BUCKET_PARAMS(_size, _b)	size_t (_size)</div><div class='add'>+#define PASS_BUCKET_PARAMS(_size, _b)	(_size)</div><div class='add'>+#define PASS_BUCKET_PARAM(_b)		NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following functions are not to be used directly and are intended only</div><div class='add'>+ * for internal use from kmalloc() and kmalloc_node()</div><div class='add'>+ * with the exception of kunit tests</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void *__kmalloc_noprof(size_t size, gfp_t flags)</div><div class='add'>+				__assume_kmalloc_alignment __alloc_size(1);</div><div class='add'>+</div><div class='add'>+void *__kmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node)</div><div class='add'>+				__assume_kmalloc_alignment __alloc_size(1);</div><div class='ctx'> </div><div class='del'>-void *kmalloc_trace(struct kmem_cache *s, gfp_t flags, size_t size)</div><div class='del'>-		    __assume_kmalloc_alignment __alloc_size(3);</div><div class='add'>+void *__kmalloc_cache_noprof(struct kmem_cache *s, gfp_t flags, size_t size)</div><div class='add'>+				__assume_kmalloc_alignment __alloc_size(3);</div><div class='ctx'> </div><div class='del'>-void *kmalloc_node_trace(struct kmem_cache *s, gfp_t gfpflags,</div><div class='del'>-			 int node, size_t size) __assume_kmalloc_alignment</div><div class='del'>-						__alloc_size(4);</div><div class='del'>-void *kmalloc_large(size_t size, gfp_t flags) __assume_page_alignment</div><div class='del'>-					      __alloc_size(1);</div><div class='add'>+void *__kmalloc_cache_node_noprof(struct kmem_cache *s, gfp_t gfpflags,</div><div class='add'>+				  int node, size_t size)</div><div class='add'>+				__assume_kmalloc_alignment __alloc_size(4);</div><div class='ctx'> </div><div class='del'>-void *kmalloc_large_node(size_t size, gfp_t flags, int node) __assume_page_alignment</div><div class='del'>-							     __alloc_size(1);</div><div class='add'>+void *__kmalloc_large_noprof(size_t size, gfp_t flags)</div><div class='add'>+				__assume_page_alignment __alloc_size(1);</div><div class='add'>+</div><div class='add'>+void *__kmalloc_large_node_noprof(size_t size, gfp_t flags, int node)</div><div class='add'>+				__assume_page_alignment __alloc_size(1);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kmalloc - allocate kernel memory</div><div class='hunk'>@@ -572,7 +900,8 @@ void *kmalloc_large_node(size_t size, gfp_t flags, int node) __assume_page_align</div><div class='ctx'>  *</div><div class='ctx'>  * The allocated object address is aligned to at least ARCH_KMALLOC_MINALIGN</div><div class='ctx'>  * bytes. For @size of power of two bytes, the alignment is also guaranteed</div><div class='del'>- * to be at least to the size.</div><div class='add'>+ * to be at least to the size. For other sizes, the alignment is guaranteed to</div><div class='add'>+ * be at least the largest power-of-two divisor of @size.</div><div class='ctx'>  *</div><div class='ctx'>  * The @flags argument may be one of the GFP flags defined at</div><div class='ctx'>  * include/linux/gfp_types.h and described at</div><div class='hunk'>@@ -616,37 +945,48 @@ void *kmalloc_large_node(size_t size, gfp_t flags, int node) __assume_page_align</div><div class='ctx'>  *	Try really hard to succeed the allocation but fail</div><div class='ctx'>  *	eventually.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline __alloc_size(1) void *kmalloc(size_t size, gfp_t flags)</div><div class='add'>+static __always_inline __alloc_size(1) void *kmalloc_noprof(size_t size, gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (__builtin_constant_p(size) &amp;&amp; size) {</div><div class='ctx'> 		unsigned int index;</div><div class='ctx'> </div><div class='ctx'> 		if (size &gt; KMALLOC_MAX_CACHE_SIZE)</div><div class='del'>-			return kmalloc_large(size, flags);</div><div class='add'>+			return __kmalloc_large_noprof(size, flags);</div><div class='ctx'> </div><div class='ctx'> 		index = kmalloc_index(size);</div><div class='del'>-		return kmalloc_trace(</div><div class='add'>+		return __kmalloc_cache_noprof(</div><div class='ctx'> 				kmalloc_caches[kmalloc_type(flags, _RET_IP_)][index],</div><div class='ctx'> 				flags, size);</div><div class='ctx'> 	}</div><div class='del'>-	return __kmalloc(size, flags);</div><div class='add'>+	return __kmalloc_noprof(size, flags);</div><div class='ctx'> }</div><div class='add'>+#define kmalloc(...)				alloc_hooks(kmalloc_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+void *kmalloc_nolock_noprof(size_t size, gfp_t gfp_flags, int node);</div><div class='add'>+#define kmalloc_nolock(...)			alloc_hooks(kmalloc_nolock_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)</div><div class='add'>+#define kmem_buckets_alloc(_b, _size, _flags)	\</div><div class='add'>+	alloc_hooks(__kmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, _b), _flags, NUMA_NO_NODE))</div><div class='add'>+</div><div class='add'>+#define kmem_buckets_alloc_track_caller(_b, _size, _flags)	\</div><div class='add'>+	alloc_hooks(__kmalloc_node_track_caller_noprof(PASS_BUCKET_PARAMS(_size, _b), _flags, NUMA_NO_NODE, _RET_IP_))</div><div class='add'>+</div><div class='add'>+static __always_inline __alloc_size(1) void *kmalloc_node_noprof(size_t size, gfp_t flags, int node)</div><div class='ctx'> {</div><div class='ctx'> 	if (__builtin_constant_p(size) &amp;&amp; size) {</div><div class='ctx'> 		unsigned int index;</div><div class='ctx'> </div><div class='ctx'> 		if (size &gt; KMALLOC_MAX_CACHE_SIZE)</div><div class='del'>-			return kmalloc_large_node(size, flags, node);</div><div class='add'>+			return __kmalloc_large_node_noprof(size, flags, node);</div><div class='ctx'> </div><div class='ctx'> 		index = kmalloc_index(size);</div><div class='del'>-		return kmalloc_node_trace(</div><div class='add'>+		return __kmalloc_cache_node_noprof(</div><div class='ctx'> 				kmalloc_caches[kmalloc_type(flags, _RET_IP_)][index],</div><div class='ctx'> 				flags, node, size);</div><div class='ctx'> 	}</div><div class='del'>-	return __kmalloc_node(size, flags, node);</div><div class='add'>+	return __kmalloc_node_noprof(PASS_BUCKET_PARAMS(size, NULL), flags, node);</div><div class='ctx'> }</div><div class='add'>+#define kmalloc_node(...)			alloc_hooks(kmalloc_node_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kmalloc_array - allocate memory for an array.</div><div class='hunk'>@@ -654,16 +994,15 @@ static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t fla</div><div class='ctx'>  * @size: element size.</div><div class='ctx'>  * @flags: the type of memory to allocate (see kmalloc).</div><div class='ctx'>  */</div><div class='del'>-static inline __alloc_size(1, 2) void *kmalloc_array(size_t n, size_t size, gfp_t flags)</div><div class='add'>+static inline __alloc_size(1, 2) void *kmalloc_array_noprof(size_t n, size_t size, gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	size_t bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(check_mul_overflow(n, size, &amp;bytes)))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (__builtin_constant_p(n) &amp;&amp; __builtin_constant_p(size))</div><div class='del'>-		return kmalloc(bytes, flags);</div><div class='del'>-	return __kmalloc(bytes, flags);</div><div class='add'>+	return kmalloc_noprof(bytes, flags);</div><div class='ctx'> }</div><div class='add'>+#define kmalloc_array(...)			alloc_hooks(kmalloc_array_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * krealloc_array - reallocate memory for an array.</div><div class='hunk'>@@ -671,19 +1010,30 @@ static inline __alloc_size(1, 2) void *kmalloc_array(size_t n, size_t size, gfp_</div><div class='ctx'>  * @new_n: new number of elements to alloc</div><div class='ctx'>  * @new_size: new size of a single member of the array</div><div class='ctx'>  * @flags: the type of memory to allocate (see kmalloc)</div><div class='add'>+ *</div><div class='add'>+ * If __GFP_ZERO logic is requested, callers must ensure that, starting with the</div><div class='add'>+ * initial memory allocation, every subsequent call to this API for the same</div><div class='add'>+ * memory allocation is flagged with __GFP_ZERO. Otherwise, it is possible that</div><div class='add'>+ * __GFP_ZERO is not fully honored by this API.</div><div class='add'>+ *</div><div class='add'>+ * See krealloc_noprof() for further details.</div><div class='add'>+ *</div><div class='add'>+ * In any case, the contents of the object pointed to are preserved up to the</div><div class='add'>+ * lesser of the new and old sizes.</div><div class='ctx'>  */</div><div class='del'>-static inline __realloc_size(2, 3) void * __must_check krealloc_array(void *p,</div><div class='del'>-								      size_t new_n,</div><div class='del'>-								      size_t new_size,</div><div class='del'>-								      gfp_t flags)</div><div class='add'>+static inline __realloc_size(2, 3) void * __must_check krealloc_array_noprof(void *p,</div><div class='add'>+								       size_t new_n,</div><div class='add'>+								       size_t new_size,</div><div class='add'>+								       gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	size_t bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(check_mul_overflow(new_n, new_size, &amp;bytes)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return krealloc(p, bytes, flags);</div><div class='add'>+	return krealloc_noprof(p, bytes, flags);</div><div class='ctx'> }</div><div class='add'>+#define krealloc_array(...)			alloc_hooks(krealloc_array_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kcalloc - allocate memory for an array. The memory is set to zero.</div><div class='hunk'>@@ -691,16 +1041,14 @@ static inline __realloc_size(2, 3) void * __must_check krealloc_array(void *p,</div><div class='ctx'>  * @size: element size.</div><div class='ctx'>  * @flags: the type of memory to allocate (see kmalloc).</div><div class='ctx'>  */</div><div class='del'>-static inline __alloc_size(1, 2) void *kcalloc(size_t n, size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return kmalloc_array(n, size, flags | __GFP_ZERO);</div><div class='del'>-}</div><div class='add'>+#define kcalloc(n, size, flags)		kmalloc_array(n, size, (flags) | __GFP_ZERO)</div><div class='ctx'> </div><div class='del'>-void *__kmalloc_node_track_caller(size_t size, gfp_t flags, int node,</div><div class='del'>-				  unsigned long caller) __alloc_size(1);</div><div class='del'>-#define kmalloc_node_track_caller(size, flags, node) \</div><div class='del'>-	__kmalloc_node_track_caller(size, flags, node, \</div><div class='del'>-				    _RET_IP_)</div><div class='add'>+void *__kmalloc_node_track_caller_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node,</div><div class='add'>+					 unsigned long caller) __alloc_size(1);</div><div class='add'>+#define kmalloc_node_track_caller_noprof(size, flags, node, caller) \</div><div class='add'>+	__kmalloc_node_track_caller_noprof(PASS_BUCKET_PARAMS(size, NULL), flags, node, caller)</div><div class='add'>+#define kmalloc_node_track_caller(...)		\</div><div class='add'>+	alloc_hooks(kmalloc_node_track_caller_noprof(__VA_ARGS__, _RET_IP_))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * kmalloc_track_caller is a special version of kmalloc that records the</div><div class='hunk'>@@ -710,11 +1058,12 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t flags, int node,</div><div class='ctx'>  * allocator where we care about the real place the memory allocation</div><div class='ctx'>  * request comes from.</div><div class='ctx'>  */</div><div class='del'>-#define kmalloc_track_caller(size, flags) \</div><div class='del'>-	__kmalloc_node_track_caller(size, flags, \</div><div class='del'>-				    NUMA_NO_NODE, _RET_IP_)</div><div class='add'>+#define kmalloc_track_caller(...)		kmalloc_node_track_caller(__VA_ARGS__, NUMA_NO_NODE)</div><div class='ctx'> </div><div class='del'>-static inline __alloc_size(1, 2) void *kmalloc_array_node(size_t n, size_t size, gfp_t flags,</div><div class='add'>+#define kmalloc_track_caller_noprof(...)	\</div><div class='add'>+		kmalloc_node_track_caller_noprof(__VA_ARGS__, NUMA_NO_NODE, _RET_IP_)</div><div class='add'>+</div><div class='add'>+static inline __alloc_size(1, 2) void *kmalloc_array_node_noprof(size_t n, size_t size, gfp_t flags,</div><div class='ctx'> 							  int node)</div><div class='ctx'> {</div><div class='ctx'> 	size_t bytes;</div><div class='hunk'>@@ -722,82 +1071,92 @@ static inline __alloc_size(1, 2) void *kmalloc_array_node(size_t n, size_t size,</div><div class='ctx'> 	if (unlikely(check_mul_overflow(n, size, &amp;bytes)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	if (__builtin_constant_p(n) &amp;&amp; __builtin_constant_p(size))</div><div class='del'>-		return kmalloc_node(bytes, flags, node);</div><div class='del'>-	return __kmalloc_node(bytes, flags, node);</div><div class='add'>+		return kmalloc_node_noprof(bytes, flags, node);</div><div class='add'>+	return __kmalloc_node_noprof(PASS_BUCKET_PARAMS(bytes, NULL), flags, node);</div><div class='ctx'> }</div><div class='add'>+#define kmalloc_array_node(...)			alloc_hooks(kmalloc_array_node_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-static inline __alloc_size(1, 2) void *kcalloc_node(size_t n, size_t size, gfp_t flags, int node)</div><div class='del'>-{</div><div class='del'>-	return kmalloc_array_node(n, size, flags | __GFP_ZERO, node);</div><div class='del'>-}</div><div class='add'>+#define kcalloc_node(_n, _size, _flags, _node)	\</div><div class='add'>+	kmalloc_array_node(_n, _size, (_flags) | __GFP_ZERO, _node)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Shortcuts</div><div class='ctx'>  */</div><div class='del'>-static inline void *kmem_cache_zalloc(struct kmem_cache *k, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return kmem_cache_alloc(k, flags | __GFP_ZERO);</div><div class='del'>-}</div><div class='add'>+#define kmem_cache_zalloc(_k, _flags)		kmem_cache_alloc(_k, (_flags)|__GFP_ZERO)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * kzalloc - allocate memory. The memory is set to zero.</div><div class='ctx'>  * @size: how many bytes of memory are required.</div><div class='ctx'>  * @flags: the type of memory to allocate (see kmalloc).</div><div class='ctx'>  */</div><div class='del'>-static inline __alloc_size(1) void *kzalloc(size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return kmalloc(size, flags | __GFP_ZERO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * kzalloc_node - allocate zeroed memory from a particular memory node.</div><div class='del'>- * @size: how many bytes of memory are required.</div><div class='del'>- * @flags: the type of memory to allocate (see kmalloc).</div><div class='del'>- * @node: memory node from which to allocate</div><div class='del'>- */</div><div class='del'>-static inline __alloc_size(1) void *kzalloc_node(size_t size, gfp_t flags, int node)</div><div class='add'>+static inline __alloc_size(1) void *kzalloc_noprof(size_t size, gfp_t flags)</div><div class='ctx'> {</div><div class='del'>-	return kmalloc_node(size, flags | __GFP_ZERO, node);</div><div class='add'>+	return kmalloc_noprof(size, flags | __GFP_ZERO);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-extern void *kvmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);</div><div class='del'>-static inline __alloc_size(1) void *kvmalloc(size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return kvmalloc_node(size, flags, NUMA_NO_NODE);</div><div class='del'>-}</div><div class='del'>-static inline __alloc_size(1) void *kvzalloc_node(size_t size, gfp_t flags, int node)</div><div class='del'>-{</div><div class='del'>-	return kvmalloc_node(size, flags | __GFP_ZERO, node);</div><div class='del'>-}</div><div class='del'>-static inline __alloc_size(1) void *kvzalloc(size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return kvmalloc(size, flags | __GFP_ZERO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __alloc_size(1, 2) void *kvmalloc_array(size_t n, size_t size, gfp_t flags)</div><div class='add'>+#define kzalloc(...)				alloc_hooks(kzalloc_noprof(__VA_ARGS__))</div><div class='add'>+#define kzalloc_node(_size, _flags, _node)	kmalloc_node(_size, (_flags)|__GFP_ZERO, _node)</div><div class='add'>+</div><div class='add'>+void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), unsigned long align,</div><div class='add'>+			     gfp_t flags, int node) __alloc_size(1);</div><div class='add'>+#define kvmalloc_node_align_noprof(_size, _align, _flags, _node)	\</div><div class='add'>+	__kvmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, NULL), _align, _flags, _node)</div><div class='add'>+#define kvmalloc_node_align(...)		\</div><div class='add'>+	alloc_hooks(kvmalloc_node_align_noprof(__VA_ARGS__))</div><div class='add'>+#define kvmalloc_node(_s, _f, _n)		kvmalloc_node_align(_s, 1, _f, _n)</div><div class='add'>+#define kvmalloc(...)				kvmalloc_node(__VA_ARGS__, NUMA_NO_NODE)</div><div class='add'>+#define kvzalloc(_size, _flags)			kvmalloc(_size, (_flags)|__GFP_ZERO)</div><div class='add'>+</div><div class='add'>+#define kvzalloc_node(_size, _flags, _node)	kvmalloc_node(_size, (_flags)|__GFP_ZERO, _node)</div><div class='add'>+</div><div class='add'>+#define kmem_buckets_valloc(_b, _size, _flags)	\</div><div class='add'>+	alloc_hooks(__kvmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, _b), 1, _flags, NUMA_NO_NODE))</div><div class='add'>+</div><div class='add'>+static inline __alloc_size(1, 2) void *</div><div class='add'>+kvmalloc_array_node_noprof(size_t n, size_t size, gfp_t flags, int node)</div><div class='ctx'> {</div><div class='ctx'> 	size_t bytes;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(check_mul_overflow(n, size, &amp;bytes)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	return kvmalloc(bytes, flags);</div><div class='add'>+	return kvmalloc_node_align_noprof(bytes, 1, flags, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline __alloc_size(1, 2) void *kvcalloc(size_t n, size_t size, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	return kvmalloc_array(n, size, flags | __GFP_ZERO);</div><div class='del'>-}</div><div class='add'>+#define kvmalloc_array_noprof(...)		kvmalloc_array_node_noprof(__VA_ARGS__, NUMA_NO_NODE)</div><div class='add'>+#define kvcalloc_node_noprof(_n,_s,_f,_node)	kvmalloc_array_node_noprof(_n,_s,(_f)|__GFP_ZERO,_node)</div><div class='add'>+#define kvcalloc_noprof(...)			kvcalloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE)</div><div class='add'>+</div><div class='add'>+#define kvmalloc_array(...)			alloc_hooks(kvmalloc_array_noprof(__VA_ARGS__))</div><div class='add'>+#define kvcalloc_node(...)			alloc_hooks(kvcalloc_node_noprof(__VA_ARGS__))</div><div class='add'>+#define kvcalloc(...)				alloc_hooks(kvcalloc_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+void *kvrealloc_node_align_noprof(const void *p, size_t size, unsigned long align,</div><div class='add'>+				  gfp_t flags, int nid) __realloc_size(2);</div><div class='add'>+#define kvrealloc_node_align(...)		\</div><div class='add'>+	alloc_hooks(kvrealloc_node_align_noprof(__VA_ARGS__))</div><div class='add'>+#define kvrealloc_node(_p, _s, _f, _n)		kvrealloc_node_align(_p, _s, 1, _f, _n)</div><div class='add'>+#define kvrealloc(...)				kvrealloc_node(__VA_ARGS__, NUMA_NO_NODE)</div><div class='ctx'> </div><div class='del'>-extern void *kvrealloc(const void *p, size_t oldsize, size_t newsize, gfp_t flags)</div><div class='del'>-		      __realloc_size(3);</div><div class='ctx'> extern void kvfree(const void *addr);</div><div class='del'>-DEFINE_FREE(kvfree, void *, if (_T) kvfree(_T))</div><div class='add'>+DEFINE_FREE(kvfree, void *, if (!IS_ERR_OR_NULL(_T)) kvfree(_T))</div><div class='ctx'> </div><div class='ctx'> extern void kvfree_sensitive(const void *addr, size_t len);</div><div class='ctx'> </div><div class='ctx'> unsigned int kmem_cache_size(struct kmem_cache *s);</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_KVFREE_RCU_BATCHED</div><div class='add'>+static inline void kvfree_rcu_barrier(void)</div><div class='add'>+{</div><div class='add'>+	rcu_barrier();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kfree_rcu_scheduler_running(void) { }</div><div class='add'>+#else</div><div class='add'>+void kvfree_rcu_barrier(void);</div><div class='add'>+</div><div class='add'>+void kfree_rcu_scheduler_running(void);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * kmalloc_size_roundup - Report allocation bucket size for the given size</div><div class='ctx'>  *</div><div class='hunk'>@@ -815,5 +1174,6 @@ unsigned int kmem_cache_size(struct kmem_cache *s);</div><div class='ctx'> size_t kmalloc_size_roundup(size_t size);</div><div class='ctx'> </div><div class='ctx'> void __init kmem_cache_init_late(void);</div><div class='add'>+void __init kvfree_rcu_init(void);</div><div class='ctx'> </div><div class='ctx'> #endif	/* _LINUX_SLAB_H */</div><div class='head'>diff --git a/include/linux/slimbus.h b/include/linux/slimbus.h<br/>index 12c9719b2a55..a4608d9a9684 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/slimbus.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/slimbus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/slimbus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/slimbus.h</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> </div><div class='del'>-extern struct bus_type slimbus_bus;</div><div class='add'>+extern const struct bus_type slimbus_bus;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct slim_eaddr - Enumeration address for a SLIMbus device</div><div class='hunk'>@@ -91,7 +91,7 @@ struct slim_driver {</div><div class='ctx'> 	struct device_driver		driver;</div><div class='ctx'> 	const struct slim_device_id	*id_table;</div><div class='ctx'> };</div><div class='del'>-#define to_slim_driver(d) container_of(d, struct slim_driver, driver)</div><div class='add'>+#define to_slim_driver(d) container_of_const(d, struct slim_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct slim_val_inf - Slimbus value or information element</div><div class='head'>diff --git a/include/linux/sm501.h b/include/linux/sm501.h<br/>index 2f3488b2875d..bcda27a46e7a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sm501.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sm501.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sm501.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sm501.h</a></div><div class='hunk'>@@ -12,9 +12,6 @@ extern int sm501_unit_power(struct device *dev,</div><div class='ctx'> extern unsigned long sm501_set_clock(struct device *dev,</div><div class='ctx'> 				     int clksrc, unsigned long freq);</div><div class='ctx'> </div><div class='del'>-extern unsigned long sm501_find_clock(struct device *dev,</div><div class='del'>-				      int clksrc, unsigned long req_freq);</div><div class='del'>-</div><div class='ctx'> /* sm501_misc_control</div><div class='ctx'>  *</div><div class='ctx'>  * Modify the SM501's MISC_CONTROL register</div><div class='head'>diff --git a/include/linux/smp.h b/include/linux/smp.h<br/>index fcd61dfe2af3..91d0ecf3b8d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/smp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/smp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/smp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/smp.h</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static inline void on_each_cpu_cond(smp_cond_func_t cond_func,</div><div class='ctx'>  * Architecture specific boot CPU setup.  Defined as empty weak function in</div><div class='ctx'>  * init/main.c. Architectures can override it.</div><div class='ctx'>  */</div><div class='del'>-void smp_prepare_boot_cpu(void);</div><div class='add'>+void __init smp_prepare_boot_cpu(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='hunk'>@@ -168,6 +168,7 @@ int smp_call_function_any(const struct cpumask *mask,</div><div class='ctx'> </div><div class='ctx'> void kick_all_cpus_sync(void);</div><div class='ctx'> void wake_up_all_idle_cpus(void);</div><div class='add'>+bool cpus_peek_for_pending_ipi(const struct cpumask *mask);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generic and arch helpers</div><div class='hunk'>@@ -216,12 +217,16 @@ smp_call_function_any(const struct cpumask *mask, smp_call_func_t func,</div><div class='ctx'> </div><div class='ctx'> static inline void kick_all_cpus_sync(void) {  }</div><div class='ctx'> static inline void wake_up_all_idle_cpus(void) {  }</div><div class='add'>+static inline bool cpus_peek_for_pending_ipi(const struct cpumask *mask)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define setup_max_cpus 0</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_UP_LATE_INIT</div><div class='ctx'> extern void __init up_late_init(void);</div><div class='del'>-static inline void smp_init(void) { up_late_init(); }</div><div class='add'>+static __always_inline void smp_init(void) { up_late_init(); }</div><div class='ctx'> #else</div><div class='ctx'> static inline void smp_init(void) { }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -234,7 +239,7 @@ static inline int get_boot_cpu_id(void)</div><div class='ctx'> #endif /* !SMP */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * raw_processor_id() - get the current (unstable) CPU id</div><div class='add'>+ * raw_smp_processor_id() - get the current (unstable) CPU id</div><div class='ctx'>  *</div><div class='ctx'>  * For then you know what you are doing and need an unstable</div><div class='ctx'>  * CPU id.</div><div class='hunk'>@@ -294,4 +299,10 @@ int smpcfd_prepare_cpu(unsigned int cpu);</div><div class='ctx'> int smpcfd_dead_cpu(unsigned int cpu);</div><div class='ctx'> int smpcfd_dying_cpu(unsigned int cpu);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CSD_LOCK_WAIT_DEBUG</div><div class='add'>+bool csd_lock_is_stuck(void);</div><div class='add'>+#else</div><div class='add'>+static inline bool csd_lock_is_stuck(void) { return false; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_SMP_H */</div><div class='head'>diff --git a/include/linux/soc/airoha/airoha_offload.h b/include/linux/soc/airoha/airoha_offload.h<br/>new file mode 100644<br/>index 000000000000..4d23cbb7d407<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/airoha/airoha_offload.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/airoha/airoha_offload.h</a></div><div class='hunk'>@@ -0,0 +1,317 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 AIROHA Inc</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef AIROHA_OFFLOAD_H</div><div class='add'>+#define AIROHA_OFFLOAD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED = 0x0f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_ppe_dev {</div><div class='add'>+	struct {</div><div class='add'>+		int (*setup_tc_block_cb)(struct airoha_ppe_dev *dev,</div><div class='add'>+					 void *type_data);</div><div class='add'>+		void (*check_skb)(struct airoha_ppe_dev *dev,</div><div class='add'>+				  struct sk_buff *skb, u16 hash,</div><div class='add'>+				  bool rx_wlan);</div><div class='add'>+	} ops;</div><div class='add'>+</div><div class='add'>+	void *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if (IS_BUILTIN(CONFIG_NET_AIROHA) || IS_MODULE(CONFIG_NET_AIROHA))</div><div class='add'>+struct airoha_ppe_dev *airoha_ppe_get_dev(struct device *dev);</div><div class='add'>+void airoha_ppe_put_dev(struct airoha_ppe_dev *dev);</div><div class='add'>+</div><div class='add'>+static inline int airoha_ppe_dev_setup_tc_block_cb(struct airoha_ppe_dev *dev,</div><div class='add'>+						   void *type_data)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;ops.setup_tc_block_cb(dev, type_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_ppe_dev_check_skb(struct airoha_ppe_dev *dev,</div><div class='add'>+					    struct sk_buff *skb,</div><div class='add'>+					    u16 hash, bool rx_wlan)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;ops.check_skb(dev, skb, hash, rx_wlan);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline struct airoha_ppe_dev *airoha_ppe_get_dev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_ppe_put_dev(struct airoha_ppe_dev *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int airoha_ppe_setup_tc_block_cb(struct airoha_ppe_dev *dev,</div><div class='add'>+					       void *type_data)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_ppe_dev_check_skb(struct airoha_ppe_dev *dev,</div><div class='add'>+					    struct sk_buff *skb, u16 hash,</div><div class='add'>+					    bool rx_wlan)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define NPU_NUM_CORES		8</div><div class='add'>+#define NPU_NUM_IRQ		6</div><div class='add'>+#define NPU_RX0_DESC_NUM	512</div><div class='add'>+#define NPU_RX1_DESC_NUM	512</div><div class='add'>+</div><div class='add'>+/* CTRL */</div><div class='add'>+#define NPU_RX_DMA_DESC_LAST_MASK	BIT(29)</div><div class='add'>+#define NPU_RX_DMA_DESC_LEN_MASK	GENMASK(28, 15)</div><div class='add'>+#define NPU_RX_DMA_DESC_CUR_LEN_MASK	GENMASK(14, 1)</div><div class='add'>+#define NPU_RX_DMA_DESC_DONE_MASK	BIT(0)</div><div class='add'>+/* INFO */</div><div class='add'>+#define NPU_RX_DMA_PKT_COUNT_MASK	GENMASK(31, 28)</div><div class='add'>+#define NPU_RX_DMA_PKT_ID_MASK		GENMASK(28, 26)</div><div class='add'>+#define NPU_RX_DMA_SRC_PORT_MASK	GENMASK(25, 21)</div><div class='add'>+#define NPU_RX_DMA_CRSN_MASK		GENMASK(20, 16)</div><div class='add'>+#define NPU_RX_DMA_FOE_ID_MASK		GENMASK(15, 0)</div><div class='add'>+/* DATA */</div><div class='add'>+#define NPU_RX_DMA_SID_MASK		GENMASK(31, 16)</div><div class='add'>+#define NPU_RX_DMA_FRAG_TYPE_MASK	GENMASK(15, 14)</div><div class='add'>+#define NPU_RX_DMA_PRIORITY_MASK	GENMASK(13, 10)</div><div class='add'>+#define NPU_RX_DMA_RADIO_ID_MASK	GENMASK(9, 6)</div><div class='add'>+#define NPU_RX_DMA_VAP_ID_MASK		GENMASK(5, 2)</div><div class='add'>+#define NPU_RX_DMA_FRAME_TYPE_MASK	GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+struct airoha_npu_rx_dma_desc {</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 info;</div><div class='add'>+	u32 data;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u64 rsv;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* CTRL */</div><div class='add'>+#define NPU_TX_DMA_DESC_SCHED_MASK	BIT(31)</div><div class='add'>+#define NPU_TX_DMA_DESC_LEN_MASK	GENMASK(30, 18)</div><div class='add'>+#define NPU_TX_DMA_DESC_VEND_LEN_MASK	GENMASK(17, 1)</div><div class='add'>+#define NPU_TX_DMA_DESC_DONE_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define NPU_TXWI_LEN	192</div><div class='add'>+</div><div class='add'>+struct airoha_npu_tx_dma_desc {</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u64 rsv;</div><div class='add'>+	u8 txwi[NPU_TXWI_LEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum airoha_npu_wlan_set_cmd {</div><div class='add'>+	WLAN_FUNC_SET_WAIT_PCIE_ADDR,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_DESC,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_NPU_INIT_DONE,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_TRAN_TO_CPU,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_BA_WIN_SIZE,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_DRIVER_MODEL,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_DEL_STA,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_DRAM_BA_NODE_ADDR,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_PKT_BUF_ADDR,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_IS_TEST_NOBA,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_FLUSHONE_TIMEOUT,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_FLUSHALL_TIMEOUT,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_IS_FORCE_TO_CPU,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_PCIE_STATE,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_PCIE_PORT_TYPE,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_ERROR_RETRY_TIMES,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_BAR_INFO,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_FAST_FLAG,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_NPU_BAND0_ONCPU,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_TX_RING_PCIE_ADDR,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_TX_DESC_HW_BASE,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_TX_BUF_SPACE_HW_BASE,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_RX_RING_FOR_TXDONE_HW_BASE,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_TX_PKT_BUF_ADDR,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_INODE_TXRX_REG_ADDR,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_INODE_DEBUG_FLAG,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_INODE_HW_CFG_INFO,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_INODE_STOP_ACTION,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_INODE_PCIE_SWAP,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_RATELIMIT_CTRL,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_HWNAT_INIT,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_ARHT_CHIP_INFO,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_TX_BUF_CHECK_ADDR,</div><div class='add'>+	WLAN_FUNC_SET_WAIT_TOKEN_ID_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum airoha_npu_wlan_get_cmd {</div><div class='add'>+	WLAN_FUNC_GET_WAIT_NPU_INFO,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_LAST_RATE,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_COUNTER,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_DBG_COUNTER,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_RXDESC_BASE,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_WCID_DBG_COUNTER,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_DMA_ADDR,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_RING_SIZE,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_NPU_SUPPORT_MAP,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_MDC_LOCK_ADDRESS,</div><div class='add'>+	WLAN_FUNC_GET_WAIT_NPU_VERSION,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_npu {</div><div class='add'>+#if (IS_BUILTIN(CONFIG_NET_AIROHA_NPU) || IS_MODULE(CONFIG_NET_AIROHA_NPU))</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+</div><div class='add'>+	struct airoha_npu_core {</div><div class='add'>+		struct airoha_npu *npu;</div><div class='add'>+		/* protect concurrent npu memory accesses */</div><div class='add'>+		spinlock_t lock;</div><div class='add'>+		struct work_struct wdt_work;</div><div class='add'>+	} cores[NPU_NUM_CORES];</div><div class='add'>+</div><div class='add'>+	int irqs[NPU_NUM_IRQ];</div><div class='add'>+</div><div class='add'>+	struct airoha_foe_stats __iomem *stats;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		int (*ppe_init)(struct airoha_npu *npu);</div><div class='add'>+		int (*ppe_deinit)(struct airoha_npu *npu);</div><div class='add'>+		int (*ppe_init_stats)(struct airoha_npu *npu,</div><div class='add'>+				      dma_addr_t addr, u32 num_stats_entries);</div><div class='add'>+		int (*ppe_flush_sram_entries)(struct airoha_npu *npu,</div><div class='add'>+					      dma_addr_t foe_addr,</div><div class='add'>+					      int sram_num_entries);</div><div class='add'>+		int (*ppe_foe_commit_entry)(struct airoha_npu *npu,</div><div class='add'>+					    dma_addr_t foe_addr,</div><div class='add'>+					    u32 entry_size, u32 hash,</div><div class='add'>+					    bool ppe2);</div><div class='add'>+		int (*wlan_init_reserved_memory)(struct airoha_npu *npu);</div><div class='add'>+		int (*wlan_send_msg)(struct airoha_npu *npu, int ifindex,</div><div class='add'>+				     enum airoha_npu_wlan_set_cmd func_id,</div><div class='add'>+				     void *data, int data_len, gfp_t gfp);</div><div class='add'>+		int (*wlan_get_msg)(struct airoha_npu *npu, int ifindex,</div><div class='add'>+				    enum airoha_npu_wlan_get_cmd func_id,</div><div class='add'>+				    void *data, int data_len, gfp_t gfp);</div><div class='add'>+		u32 (*wlan_get_queue_addr)(struct airoha_npu *npu, int qid,</div><div class='add'>+					   bool xmit);</div><div class='add'>+		void (*wlan_set_irq_status)(struct airoha_npu *npu, u32 val);</div><div class='add'>+		u32 (*wlan_get_irq_status)(struct airoha_npu *npu, int q);</div><div class='add'>+		void (*wlan_enable_irq)(struct airoha_npu *npu, int q);</div><div class='add'>+		void (*wlan_disable_irq)(struct airoha_npu *npu, int q);</div><div class='add'>+	} ops;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if (IS_BUILTIN(CONFIG_NET_AIROHA_NPU) || IS_MODULE(CONFIG_NET_AIROHA_NPU))</div><div class='add'>+struct airoha_npu *airoha_npu_get(struct device *dev);</div><div class='add'>+void airoha_npu_put(struct airoha_npu *npu);</div><div class='add'>+</div><div class='add'>+static inline int airoha_npu_wlan_init_reserved_memory(struct airoha_npu *npu)</div><div class='add'>+{</div><div class='add'>+	return npu-&gt;ops.wlan_init_reserved_memory(npu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int airoha_npu_wlan_send_msg(struct airoha_npu *npu,</div><div class='add'>+					   int ifindex,</div><div class='add'>+					   enum airoha_npu_wlan_set_cmd cmd,</div><div class='add'>+					   void *data, int data_len, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return npu-&gt;ops.wlan_send_msg(npu, ifindex, cmd, data, data_len, gfp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int airoha_npu_wlan_get_msg(struct airoha_npu *npu, int ifindex,</div><div class='add'>+					  enum airoha_npu_wlan_get_cmd cmd,</div><div class='add'>+					  void *data, int data_len, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return npu-&gt;ops.wlan_get_msg(npu, ifindex, cmd, data, data_len, gfp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 airoha_npu_wlan_get_queue_addr(struct airoha_npu *npu,</div><div class='add'>+						 int qid, bool xmit)</div><div class='add'>+{</div><div class='add'>+	return npu-&gt;ops.wlan_get_queue_addr(npu, qid, xmit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_npu_wlan_set_irq_status(struct airoha_npu *npu,</div><div class='add'>+						  u32 val)</div><div class='add'>+{</div><div class='add'>+	npu-&gt;ops.wlan_set_irq_status(npu, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 airoha_npu_wlan_get_irq_status(struct airoha_npu *npu, int q)</div><div class='add'>+{</div><div class='add'>+	return npu-&gt;ops.wlan_get_irq_status(npu, q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_npu_wlan_enable_irq(struct airoha_npu *npu, int q)</div><div class='add'>+{</div><div class='add'>+	npu-&gt;ops.wlan_enable_irq(npu, q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_npu_wlan_disable_irq(struct airoha_npu *npu, int q)</div><div class='add'>+{</div><div class='add'>+	npu-&gt;ops.wlan_disable_irq(npu, q);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline struct airoha_npu *airoha_npu_get(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_npu_put(struct airoha_npu *npu)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int airoha_npu_wlan_init_reserved_memory(struct airoha_npu *npu)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int airoha_npu_wlan_send_msg(struct airoha_npu *npu,</div><div class='add'>+					   int ifindex,</div><div class='add'>+					   enum airoha_npu_wlan_set_cmd cmd,</div><div class='add'>+					   void *data, int data_len, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int airoha_npu_wlan_get_msg(struct airoha_npu *npu, int ifindex,</div><div class='add'>+					  enum airoha_npu_wlan_get_cmd cmd,</div><div class='add'>+					  void *data, int data_len, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 airoha_npu_wlan_get_queue_addr(struct airoha_npu *npu,</div><div class='add'>+						 int qid, bool xmit)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_npu_wlan_set_irq_status(struct airoha_npu *npu,</div><div class='add'>+						  u32 val)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 airoha_npu_wlan_get_irq_status(struct airoha_npu *npu,</div><div class='add'>+						 int q)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_npu_wlan_enable_irq(struct airoha_npu *npu, int q)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void airoha_npu_wlan_disable_irq(struct airoha_npu *npu, int q)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* AIROHA_OFFLOAD_H */</div><div class='head'>diff --git a/include/linux/soc/amd/isp4_misc.h b/include/linux/soc/amd/isp4_misc.h<br/>new file mode 100644<br/>index 000000000000..6738796986a7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/amd/isp4_misc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/amd/isp4_misc.h</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Advanced Micro Devices, Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SOC_ISP4_MISC_H</div><div class='add'>+#define __SOC_ISP4_MISC_H</div><div class='add'>+</div><div class='add'>+#define AMDISP_I2C_ADAP_NAME "AMDISP DesignWare I2C adapter"</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/soc/apple/rtkit.h b/include/linux/soc/apple/rtkit.h<br/>index 8c9ca857ccf6..736f53018017 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/apple/rtkit.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/apple/rtkit.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/apple/rtkit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/apple/rtkit.h</a></div><div class='hunk'>@@ -56,7 +56,7 @@ struct apple_rtkit_shmem {</div><div class='ctx'>  *                 context.</div><div class='ctx'>  */</div><div class='ctx'> struct apple_rtkit_ops {</div><div class='del'>-	void (*crashed)(void *cookie);</div><div class='add'>+	void (*crashed)(void *cookie, const void *crashlog, size_t crashlog_size);</div><div class='ctx'> 	void (*recv_message)(void *cookie, u8 endpoint, u64 message);</div><div class='ctx'> 	bool (*recv_message_early)(void *cookie, u8 endpoint, u64 message);</div><div class='ctx'> 	int (*shmem_setup)(void *cookie, struct apple_rtkit_shmem *bfr);</div><div class='hunk'>@@ -69,7 +69,7 @@ struct apple_rtkit;</div><div class='ctx'>  * Initializes the internal state required to handle RTKit. This</div><div class='ctx'>  * should usually be called within _probe.</div><div class='ctx'>  *</div><div class='del'>- * @dev:         Pointer to the device node this coprocessor is assocated with</div><div class='add'>+ * @dev:         Pointer to the device node this coprocessor is associated with</div><div class='ctx'>  * @cookie:      opaque cookie passed to all functions defined in rtkit_ops</div><div class='ctx'>  * @mbox_name:   mailbox name used to communicate with the co-processor</div><div class='ctx'>  * @mbox_idx:    mailbox index to be used if mbox_name is NULL</div><div class='hunk'>@@ -83,7 +83,7 @@ struct apple_rtkit *devm_apple_rtkit_init(struct device *dev, void *cookie,</div><div class='ctx'>  * Non-devm version of devm_apple_rtkit_init. Must be freed with</div><div class='ctx'>  * apple_rtkit_free.</div><div class='ctx'>  *</div><div class='del'>- * @dev:         Pointer to the device node this coprocessor is assocated with</div><div class='add'>+ * @dev:         Pointer to the device node this coprocessor is associated with</div><div class='ctx'>  * @cookie:      opaque cookie passed to all functions defined in rtkit_ops</div><div class='ctx'>  * @mbox_name:   mailbox name used to communicate with the co-processor</div><div class='ctx'>  * @mbox_idx:    mailbox index to be used if mbox_name is NULL</div><div class='head'>diff --git a/include/linux/soc/cirrus/ep93xx.h b/include/linux/soc/cirrus/ep93xx.h<br/>index 56fbe2dc59b1..3e6cf2b25a97 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/cirrus/ep93xx.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/cirrus/ep93xx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/cirrus/ep93xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/cirrus/ep93xx.h</a></div><div class='hunk'>@@ -2,7 +2,18 @@</div><div class='ctx'> #ifndef _SOC_EP93XX_H</div><div class='ctx'> #define _SOC_EP93XX_H</div><div class='ctx'> </div><div class='del'>-struct platform_device;</div><div class='add'>+struct regmap;</div><div class='add'>+struct spinlock_t;</div><div class='add'>+</div><div class='add'>+enum ep93xx_soc_model {</div><div class='add'>+	EP93XX_9301_SOC,</div><div class='add'>+	EP93XX_9307_SOC,</div><div class='add'>+	EP93XX_9312_SOC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+#include &lt;linux/compiler_types.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define EP93XX_CHIP_REV_D0	3</div><div class='ctx'> #define EP93XX_CHIP_REV_D1	4</div><div class='hunk'>@@ -10,28 +21,18 @@ struct platform_device;</div><div class='ctx'> #define EP93XX_CHIP_REV_E1	6</div><div class='ctx'> #define EP93XX_CHIP_REV_E2	7</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_EP93XX</div><div class='del'>-int ep93xx_pwm_acquire_gpio(struct platform_device *pdev);</div><div class='del'>-void ep93xx_pwm_release_gpio(struct platform_device *pdev);</div><div class='del'>-int ep93xx_ide_acquire_gpio(struct platform_device *pdev);</div><div class='del'>-void ep93xx_ide_release_gpio(struct platform_device *pdev);</div><div class='del'>-int ep93xx_keypad_acquire_gpio(struct platform_device *pdev);</div><div class='del'>-void ep93xx_keypad_release_gpio(struct platform_device *pdev);</div><div class='del'>-int ep93xx_i2s_acquire(void);</div><div class='del'>-void ep93xx_i2s_release(void);</div><div class='del'>-unsigned int ep93xx_chip_revision(void);</div><div class='add'>+struct ep93xx_regmap_adev {</div><div class='add'>+	struct auxiliary_device adev;</div><div class='add'>+	struct regmap *map;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	spinlock_t *lock;</div><div class='add'>+	void (*write)(struct regmap *map, spinlock_t *lock, unsigned int reg,</div><div class='add'>+		      unsigned int val);</div><div class='add'>+	void (*update_bits)(struct regmap *map, spinlock_t *lock,</div><div class='add'>+			    unsigned int reg, unsigned int mask, unsigned int val);</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-static inline int ep93xx_pwm_acquire_gpio(struct platform_device *pdev) { return 0; }</div><div class='del'>-static inline void ep93xx_pwm_release_gpio(struct platform_device *pdev) {}</div><div class='del'>-static inline int ep93xx_ide_acquire_gpio(struct platform_device *pdev) { return 0; }</div><div class='del'>-static inline void ep93xx_ide_release_gpio(struct platform_device *pdev) {}</div><div class='del'>-static inline int ep93xx_keypad_acquire_gpio(struct platform_device *pdev) { return 0; }</div><div class='del'>-static inline void ep93xx_keypad_release_gpio(struct platform_device *pdev) {}</div><div class='del'>-static inline int ep93xx_i2s_acquire(void) { return 0; }</div><div class='del'>-static inline void ep93xx_i2s_release(void) {}</div><div class='del'>-static inline unsigned int ep93xx_chip_revision(void) { return 0; }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+#define to_ep93xx_regmap_adev(_adev) \</div><div class='add'>+	container_of((_adev), struct ep93xx_regmap_adev, adev)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/soc/marvell/silicons.h b/include/linux/soc/marvell/silicons.h<br/>new file mode 100644<br/>index 000000000000..66bb9bfaf17d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/marvell/silicons.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/marvell/silicons.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+ * Copyright (C) 2024 Marvell.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SOC_SILICON_H</div><div class='add'>+#define __SOC_SILICON_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARM64)</div><div class='add'>+</div><div class='add'>+#define CN20K_CHIPID	0x20</div><div class='add'>+/*</div><div class='add'>+ * Silicon check for CN20K family</div><div class='add'>+ */</div><div class='add'>+static inline bool is_cn20k(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	return (pdev-&gt;subsystem_device &amp; 0xFF) == CN20K_CHIPID;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define is_cn20k(pdev)		((void)(pdev), 0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __SOC_SILICON_H */</div><div class='head'>diff --git a/include/linux/soc/mediatek/dvfsrc.h b/include/linux/soc/mediatek/dvfsrc.h<br/>new file mode 100644<br/>index 000000000000..1498b3ed396b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/dvfsrc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/mediatek/dvfsrc.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2021 MediaTek Inc.</div><div class='add'>+ * Copyright (c) 2024 Collabora Ltd.</div><div class='add'>+ *                    AngeloGioacchino Del Regno &lt;angelogioacchino.delregno@collabora.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MEDIATEK_DVFSRC_H</div><div class='add'>+#define __MEDIATEK_DVFSRC_H</div><div class='add'>+</div><div class='add'>+enum mtk_dvfsrc_cmd {</div><div class='add'>+	MTK_DVFSRC_CMD_BW,</div><div class='add'>+	MTK_DVFSRC_CMD_HRT_BW,</div><div class='add'>+	MTK_DVFSRC_CMD_PEAK_BW,</div><div class='add'>+	MTK_DVFSRC_CMD_OPP,</div><div class='add'>+	MTK_DVFSRC_CMD_VCORE_LEVEL,</div><div class='add'>+	MTK_DVFSRC_CMD_VSCP_LEVEL,</div><div class='add'>+	MTK_DVFSRC_CMD_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_MTK_DVFSRC)</div><div class='add'>+</div><div class='add'>+int mtk_dvfsrc_send_request(const struct device *dev, u32 cmd, u64 data);</div><div class='add'>+int mtk_dvfsrc_query_info(const struct device *dev, u32 cmd, int *data);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int mtk_dvfsrc_send_request(const struct device *dev, u32 cmd, u64 data)</div><div class='add'>+{ return -ENODEV; }</div><div class='add'>+</div><div class='add'>+static inline int mtk_dvfsrc_query_info(const struct device *dev, u32 cmd, int *data)</div><div class='add'>+{ return -ENODEV; }</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_MTK_DVFSRC */</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/soc/mediatek/infracfg.h b/include/linux/soc/mediatek/infracfg.h<br/>index 6c6cccc848f4..9956e18c5ffa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/infracfg.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/infracfg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/infracfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/mediatek/infracfg.h</a></div><div class='hunk'>@@ -434,6 +434,11 @@</div><div class='ctx'> #define MT7622_TOP_AXI_PROT_EN_WB		(BIT(2) | BIT(6) | \</div><div class='ctx'> 						 BIT(7) | BIT(8))</div><div class='ctx'> </div><div class='add'>+#define MT6735_TOP_AXI_PROT_EN_CONN		(BIT(2) | BIT(8))</div><div class='add'>+#define MT6735_TOP_AXI_PROT_EN_MD1		(BIT(24) | BIT(25) | \</div><div class='add'>+						 BIT(26) | BIT(27) | \</div><div class='add'>+						 BIT(28))</div><div class='add'>+</div><div class='ctx'> #define INFRA_TOPAXI_PROTECTEN			0x0220</div><div class='ctx'> #define INFRA_TOPAXI_PROTECTSTA1		0x0228</div><div class='ctx'> #define INFRA_TOPAXI_PROTECTEN_SET		0x0260</div><div class='head'>diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h<br/>index 649955d2cf5c..0c3906e8ad19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/mtk-cmdq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/mtk-cmdq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/mtk-cmdq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/mediatek/mtk-cmdq.h</a></div><div class='hunk'>@@ -14,8 +14,42 @@</div><div class='ctx'> #define CMDQ_ADDR_HIGH(addr)	((u32)(((addr) &gt;&gt; 16) &amp; GENMASK(31, 0)))</div><div class='ctx'> #define CMDQ_ADDR_LOW(addr)	((u16)(addr) | BIT(1))</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Every cmdq thread has its own SPRs (Specific Purpose Registers),</div><div class='add'>+ * so there are 4 * N (threads) SPRs in GCE that shares the same indexes below.</div><div class='add'>+ */</div><div class='add'>+#define CMDQ_THR_SPR_IDX0	(0)</div><div class='add'>+#define CMDQ_THR_SPR_IDX1	(1)</div><div class='add'>+#define CMDQ_THR_SPR_IDX2	(2)</div><div class='add'>+#define CMDQ_THR_SPR_IDX3	(3)</div><div class='add'>+</div><div class='ctx'> struct cmdq_pkt;</div><div class='ctx'> </div><div class='add'>+enum cmdq_logic_op {</div><div class='add'>+	CMDQ_LOGIC_ASSIGN = 0,</div><div class='add'>+	CMDQ_LOGIC_ADD = 1,</div><div class='add'>+	CMDQ_LOGIC_SUBTRACT = 2,</div><div class='add'>+	CMDQ_LOGIC_MULTIPLY = 3,</div><div class='add'>+	CMDQ_LOGIC_XOR = 8,</div><div class='add'>+	CMDQ_LOGIC_NOT = 9,</div><div class='add'>+	CMDQ_LOGIC_OR = 10,</div><div class='add'>+	CMDQ_LOGIC_AND = 11,</div><div class='add'>+	CMDQ_LOGIC_LEFT_SHIFT = 12,</div><div class='add'>+	CMDQ_LOGIC_RIGHT_SHIFT = 13,</div><div class='add'>+	CMDQ_LOGIC_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmdq_operand {</div><div class='add'>+	/* register type */</div><div class='add'>+	bool reg;</div><div class='add'>+	union {</div><div class='add'>+		/* index */</div><div class='add'>+		u16 idx;</div><div class='add'>+		/* value */</div><div class='add'>+		u16 value;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct cmdq_client_reg {</div><div class='ctx'> 	u8 subsys;</div><div class='ctx'> 	u16 offset;</div><div class='hunk'>@@ -62,17 +96,19 @@ void cmdq_mbox_destroy(struct cmdq_client *client);</div><div class='ctx'> /**</div><div class='ctx'>  * cmdq_pkt_create() - create a CMDQ packet</div><div class='ctx'>  * @client:	the CMDQ mailbox client</div><div class='add'>+ * @pkt:	the CMDQ packet</div><div class='ctx'>  * @size:	required CMDQ buffer size</div><div class='ctx'>  *</div><div class='del'>- * Return: CMDQ packet pointer</div><div class='add'>+ * Return: 0 for success; else the error code is returned</div><div class='ctx'>  */</div><div class='del'>-struct cmdq_pkt *cmdq_pkt_create(struct cmdq_client *client, size_t size);</div><div class='add'>+int cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *pkt, size_t size);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cmdq_pkt_destroy() - destroy the CMDQ packet</div><div class='add'>+ * @client:	the CMDQ mailbox client</div><div class='ctx'>  * @pkt:	the CMDQ packet</div><div class='ctx'>  */</div><div class='del'>-void cmdq_pkt_destroy(struct cmdq_pkt *pkt);</div><div class='add'>+void cmdq_pkt_destroy(struct cmdq_client *client, struct cmdq_pkt *pkt);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cmdq_pkt_write() - append write command to the CMDQ packet</div><div class='hunk'>@@ -174,6 +210,18 @@ int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx,</div><div class='ctx'> 				u16 addr_low, u32 value, u32 mask);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * cmdq_pkt_mem_move() - append memory move command to the CMDQ packet</div><div class='add'>+ * @pkt:	the CMDQ packet</div><div class='add'>+ * @src_addr:	source address</div><div class='add'>+ * @dst_addr:	destination address</div><div class='add'>+ *</div><div class='add'>+ * Appends a CMDQ command to copy the value found in `src_addr` to `dst_addr`.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success; else the error code is returned</div><div class='add'>+ */</div><div class='add'>+int cmdq_pkt_mem_move(struct cmdq_pkt *pkt, dma_addr_t src_addr, dma_addr_t dst_addr);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * cmdq_pkt_wfe() - append wait for event command to the CMDQ packet</div><div class='ctx'>  * @pkt:	the CMDQ packet</div><div class='ctx'>  * @event:	the desired event type to wait</div><div class='hunk'>@@ -184,6 +232,21 @@ int cmdq_pkt_write_s_mask_value(struct cmdq_pkt *pkt, u8 high_addr_reg_idx,</div><div class='ctx'> int cmdq_pkt_wfe(struct cmdq_pkt *pkt, u16 event, bool clear);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * cmdq_pkt_acquire_event() - append acquire event command to the CMDQ packet</div><div class='add'>+ * @pkt:	the CMDQ packet</div><div class='add'>+ * @event:	the desired event to be acquired</div><div class='add'>+ *</div><div class='add'>+ * User can use cmdq_pkt_acquire_event() as `mutex_lock` and cmdq_pkt_clear_event()</div><div class='add'>+ * as `mutex_unlock` to protect some `critical section` instructions between them.</div><div class='add'>+ * cmdq_pkt_acquire_event() would wait for event to be cleared.</div><div class='add'>+ * After event is cleared by cmdq_pkt_clear_event in other GCE threads,</div><div class='add'>+ * cmdq_pkt_acquire_event() would set event and keep executing next instruction.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success; else the error code is returned</div><div class='add'>+ */</div><div class='add'>+int cmdq_pkt_acquire_event(struct cmdq_pkt *pkt, u16 event);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * cmdq_pkt_clear_event() - append clear event command to the CMDQ packet</div><div class='ctx'>  * @pkt:	the CMDQ packet</div><div class='ctx'>  * @event:	the desired event to be cleared</div><div class='hunk'>@@ -235,6 +298,23 @@ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys,</div><div class='ctx'> 		       u16 offset, u32 value, u32 mask);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * cmdq_pkt_logic_command() - Append logic command to the CMDQ packet, ask GCE to</div><div class='add'>+ *		          execute an instruction that store the result of logic operation</div><div class='add'>+ *		          with left and right operand into result_reg_idx.</div><div class='add'>+ * @pkt:		the CMDQ packet</div><div class='add'>+ * @result_reg_idx:	SPR index that store operation result of left_operand and right_operand</div><div class='add'>+ * @left_operand:	left operand</div><div class='add'>+ * @s_op:		the logic operator enum</div><div class='add'>+ * @right_operand:	right operand</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success; else the error code is returned</div><div class='add'>+ */</div><div class='add'>+int cmdq_pkt_logic_command(struct cmdq_pkt *pkt, u16 result_reg_idx,</div><div class='add'>+			   struct cmdq_operand *left_operand,</div><div class='add'>+			   enum cmdq_logic_op s_op,</div><div class='add'>+			   struct cmdq_operand *right_operand);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * cmdq_pkt_assign() - Append logic assign command to the CMDQ packet, ask GCE</div><div class='ctx'>  *		       to execute an instruction that set a constant value into</div><div class='ctx'>  *		       internal register and use as value, mask or address in</div><div class='hunk'>@@ -248,36 +328,68 @@ int cmdq_pkt_poll_mask(struct cmdq_pkt *pkt, u8 subsys,</div><div class='ctx'> int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cmdq_pkt_jump() - Append jump command to the CMDQ packet, ask GCE</div><div class='del'>- *		     to execute an instruction that change current thread PC to</div><div class='del'>- *		     a physical address which should contains more instruction.</div><div class='add'>+ * cmdq_pkt_poll_addr() - Append blocking POLL command to CMDQ packet</div><div class='add'>+ * @pkt:	the CMDQ packet</div><div class='add'>+ * @addr:	the hardware register address</div><div class='add'>+ * @value:	the specified target register value</div><div class='add'>+ * @mask:	the specified target register mask</div><div class='add'>+ *</div><div class='add'>+ * Appends a polling (POLL) command to the CMDQ packet and asks the GCE</div><div class='add'>+ * to execute an instruction that checks for the specified `value` (with</div><div class='add'>+ * or without `mask`) to appear in the specified hardware register `addr`.</div><div class='add'>+ * All GCE threads will be blocked by this instruction.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success or negative error code</div><div class='add'>+ */</div><div class='add'>+int cmdq_pkt_poll_addr(struct cmdq_pkt *pkt, dma_addr_t addr, u32 value, u32 mask);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cmdq_pkt_jump_abs() - Append jump command to the CMDQ packet, ask GCE</div><div class='add'>+ *			 to execute an instruction that change current thread</div><div class='add'>+ *			 PC to a absolute physical address which should</div><div class='add'>+ *			 contains more instruction.</div><div class='ctx'>  * @pkt:        the CMDQ packet</div><div class='del'>- * @addr:       physical address of target instruction buffer</div><div class='add'>+ * @addr:       absolute physical address of target instruction buffer</div><div class='add'>+ * @shift_pa:	shift bits of physical address in CMDQ instruction. This value</div><div class='add'>+ *		is got by cmdq_get_shift_pa().</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 for success; else the error code is returned</div><div class='ctx'>  */</div><div class='del'>-int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr);</div><div class='add'>+int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa);</div><div class='add'>+</div><div class='add'>+/* This wrapper has to be removed after all users migrated to jump_abs */</div><div class='add'>+static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa)</div><div class='add'>+{</div><div class='add'>+	return cmdq_pkt_jump_abs(pkt, addr, shift_pa);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cmdq_pkt_finalize() - Append EOC and jump command to pkt.</div><div class='add'>+ * cmdq_pkt_jump_rel() - Append jump command to the CMDQ packet, ask GCE</div><div class='add'>+ *			 to execute an instruction that change current thread</div><div class='add'>+ *			 PC to a physical address with relative offset. The</div><div class='add'>+ *			 target address should contains more instruction.</div><div class='ctx'>  * @pkt:	the CMDQ packet</div><div class='add'>+ * @offset:	relative offset of target instruction buffer from current PC.</div><div class='add'>+ * @shift_pa:	shift bits of physical address in CMDQ instruction. This value</div><div class='add'>+ *		is got by cmdq_get_shift_pa().</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 for success; else the error code is returned</div><div class='ctx'>  */</div><div class='del'>-int cmdq_pkt_finalize(struct cmdq_pkt *pkt);</div><div class='add'>+int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset, u8 shift_pa);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cmdq_pkt_flush_async() - trigger CMDQ to asynchronously execute the CMDQ</div><div class='del'>- *                          packet and call back at the end of done packet</div><div class='del'>- * @pkt:	the CMDQ packet</div><div class='add'>+ * cmdq_pkt_eoc() - Append EOC and ask GCE to generate an IRQ at end of execution</div><div class='add'>+ * @pkt:	The CMDQ packet</div><div class='ctx'>  *</div><div class='del'>- * Return: 0 for success; else the error code is returned</div><div class='add'>+ * Appends an End Of Code (EOC) command to the CMDQ packet and asks the GCE</div><div class='add'>+ * to generate an interrupt at the end of the execution of all commands in</div><div class='add'>+ * the pipeline.</div><div class='add'>+ * The EOC command is usually appended to the end of the pipeline to notify</div><div class='add'>+ * that all commands are done.</div><div class='ctx'>  *</div><div class='del'>- * Trigger CMDQ to asynchronously execute the CMDQ packet and call back</div><div class='del'>- * at the end of done packet. Note that this is an ASYNC function. When the</div><div class='del'>- * function returned, it may or may not be finished.</div><div class='add'>+ * Return: 0 for success or negative error number</div><div class='ctx'>  */</div><div class='del'>-int cmdq_pkt_flush_async(struct cmdq_pkt *pkt);</div><div class='add'>+int cmdq_pkt_eoc(struct cmdq_pkt *pkt);</div><div class='ctx'> </div><div class='ctx'> #else /* IS_ENABLED(CONFIG_MTK_CMDQ) */</div><div class='ctx'> </div><div class='hunk'>@@ -294,12 +406,12 @@ static inline struct cmdq_client *cmdq_mbox_create(struct device *dev, int index</div><div class='ctx'> </div><div class='ctx'> static inline void cmdq_mbox_destroy(struct cmdq_client *client) { }</div><div class='ctx'> </div><div class='del'>-static inline  struct cmdq_pkt *cmdq_pkt_create(struct cmdq_client *client, size_t size)</div><div class='add'>+static inline int cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *pkt, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return ERR_PTR(-EINVAL);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void cmdq_pkt_destroy(struct cmdq_pkt *pkt) { }</div><div class='add'>+static inline void cmdq_pkt_destroy(struct cmdq_client *client, struct cmdq_pkt *pkt) { }</div><div class='ctx'> </div><div class='ctx'> static inline int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value)</div><div class='ctx'> {</div><div class='hunk'>@@ -374,17 +486,27 @@ static inline int cmdq_pkt_assign(struct cmdq_pkt *pkt, u16 reg_idx, u32 value)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr)</div><div class='add'>+static inline int cmdq_pkt_poll_addr(struct cmdq_pkt *pkt, dma_addr_t addr, u32 value, u32 mask)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr, u8 shift_pa)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int cmdq_pkt_finalize(struct cmdq_pkt *pkt)</div><div class='add'>+static inline int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset, u8 shift_pa)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int cmdq_pkt_flush_async(struct cmdq_pkt *pkt)</div><div class='add'>+static inline int cmdq_pkt_eoc(struct cmdq_pkt *pkt)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/soc/mediatek/mtk_sip_svc.h b/include/linux/soc/mediatek/mtk_sip_svc.h<br/>index 0761128b4354..abe24a73ee19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/mtk_sip_svc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/mtk_sip_svc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/mtk_sip_svc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/mediatek/mtk_sip_svc.h</a></div><div class='hunk'>@@ -22,6 +22,9 @@</div><div class='ctx'> 	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, MTK_SIP_SMC_CONVENTION, \</div><div class='ctx'> 			   ARM_SMCCC_OWNER_SIP, fn_id)</div><div class='ctx'> </div><div class='add'>+/* DVFSRC SMC calls */</div><div class='add'>+#define MTK_SIP_DVFSRC_VCOREFS_CONTROL	MTK_SIP_SMC_CMD(0x506)</div><div class='add'>+</div><div class='ctx'> /* IOMMU related SMC call */</div><div class='ctx'> #define MTK_SIP_KERNEL_IOMMU_CONTROL	MTK_SIP_SMC_CMD(0x514)</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/soc/mediatek/mtk_wed.h b/include/linux/soc/mediatek/mtk_wed.h<br/>index a476648858a6..3fa93bd65004 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/mtk_wed.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/mediatek/mtk_wed.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/mediatek/mtk_wed.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/mediatek/mtk_wed.h</a></div><div class='hunk'>@@ -147,13 +147,14 @@ struct mtk_wed_device {</div><div class='ctx'> 		u32 wpdma_tx;</div><div class='ctx'> 		u32 wpdma_txfree;</div><div class='ctx'> 		u32 wpdma_rx_glo;</div><div class='del'>-		u32 wpdma_rx;</div><div class='add'>+		u32 wpdma_rx[MTK_WED_RX_QUEUES];</div><div class='ctx'> 		u32 wpdma_rx_rro[MTK_WED_RX_QUEUES];</div><div class='ctx'> 		u32 wpdma_rx_pg;</div><div class='ctx'> </div><div class='ctx'> 		bool wcid_512;</div><div class='ctx'> 		bool hw_rro;</div><div class='ctx'> 		bool msi;</div><div class='add'>+		bool hif2;</div><div class='ctx'> </div><div class='ctx'> 		u16 token_start;</div><div class='ctx'> 		unsigned int nbuf;</div><div class='hunk'>@@ -192,7 +193,7 @@ struct mtk_wed_device {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mtk_wed_ops {</div><div class='del'>-	int (*attach)(struct mtk_wed_device *dev);</div><div class='add'>+	int (*attach)(struct mtk_wed_device *dev) __releases(RCU);</div><div class='ctx'> 	int (*tx_ring_setup)(struct mtk_wed_device *dev, int ring,</div><div class='ctx'> 			     void __iomem *regs, bool reset);</div><div class='ctx'> 	int (*rx_ring_setup)(struct mtk_wed_device *dev, int ring,</div><div class='head'>diff --git a/include/linux/soc/qcom/apr.h b/include/linux/soc/qcom/apr.h<br/>index 7161a3183eda..a532d1e4b1f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/apr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/apr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/apr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/apr.h</a></div><div class='hunk'>@@ -162,7 +162,7 @@ struct apr_driver {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef struct apr_driver gpr_driver_t;</div><div class='del'>-#define to_apr_driver(d) container_of(d, struct apr_driver, driver)</div><div class='add'>+#define to_apr_driver(d) container_of_const(d, struct apr_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * use a macro to avoid include chaining to get THIS_MODULE</div><div class='head'>diff --git a/include/linux/soc/qcom/geni-se.h b/include/linux/soc/qcom/geni-se.h<br/>index 29e06905bc1f..0a984e2579fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/geni-se.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/geni-se.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/geni-se.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/geni-se.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _LINUX_QCOM_GENI_SE</div><div class='hunk'>@@ -36,6 +37,7 @@ enum geni_se_protocol_type {</div><div class='ctx'> 	GENI_SE_I2C,</div><div class='ctx'> 	GENI_SE_I3C,</div><div class='ctx'> 	GENI_SE_SPI_SLAVE,</div><div class='add'>+	GENI_SE_INVALID_PROTO = 255,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct geni_wrapper;</div><div class='hunk'>@@ -88,11 +90,15 @@ struct geni_se {</div><div class='ctx'> #define SE_GENI_M_IRQ_STATUS		0x610</div><div class='ctx'> #define SE_GENI_M_IRQ_EN		0x614</div><div class='ctx'> #define SE_GENI_M_IRQ_CLEAR		0x618</div><div class='add'>+#define SE_GENI_M_IRQ_EN_SET		0x61c</div><div class='add'>+#define SE_GENI_M_IRQ_EN_CLEAR		0x620</div><div class='ctx'> #define SE_GENI_S_CMD0			0x630</div><div class='ctx'> #define SE_GENI_S_CMD_CTRL_REG		0x634</div><div class='ctx'> #define SE_GENI_S_IRQ_STATUS		0x640</div><div class='ctx'> #define SE_GENI_S_IRQ_EN		0x644</div><div class='ctx'> #define SE_GENI_S_IRQ_CLEAR		0x648</div><div class='add'>+#define SE_GENI_S_IRQ_EN_SET		0x64c</div><div class='add'>+#define SE_GENI_S_IRQ_EN_CLEAR		0x650</div><div class='ctx'> #define SE_GENI_TX_FIFOn		0x700</div><div class='ctx'> #define SE_GENI_RX_FIFOn		0x780</div><div class='ctx'> #define SE_GENI_TX_FIFO_STATUS		0x800</div><div class='hunk'>@@ -101,6 +107,8 @@ struct geni_se {</div><div class='ctx'> #define SE_GENI_RX_WATERMARK_REG	0x810</div><div class='ctx'> #define SE_GENI_RX_RFR_WATERMARK_REG	0x814</div><div class='ctx'> #define SE_GENI_IOS			0x908</div><div class='add'>+#define SE_GENI_M_GP_LENGTH		0x910</div><div class='add'>+#define SE_GENI_S_GP_LENGTH		0x914</div><div class='ctx'> #define SE_DMA_TX_IRQ_STAT		0xc40</div><div class='ctx'> #define SE_DMA_TX_IRQ_CLR		0xc44</div><div class='ctx'> #define SE_DMA_TX_FSM_RST		0xc58</div><div class='hunk'>@@ -178,6 +186,7 @@ struct geni_se {</div><div class='ctx'> #define M_GP_IRQ_3_EN			BIT(12)</div><div class='ctx'> #define M_GP_IRQ_4_EN			BIT(13)</div><div class='ctx'> #define M_GP_IRQ_5_EN			BIT(14)</div><div class='add'>+#define M_TX_FIFO_NOT_EMPTY_EN		BIT(21)</div><div class='ctx'> #define M_IO_DATA_DEASSERT_EN		BIT(22)</div><div class='ctx'> #define M_IO_DATA_ASSERT_EN		BIT(23)</div><div class='ctx'> #define M_RX_FIFO_RD_ERR_EN		BIT(24)</div><div class='hunk'>@@ -233,6 +242,9 @@ struct geni_se {</div><div class='ctx'> #define IO2_DATA_IN			BIT(1)</div><div class='ctx'> #define RX_DATA_IN			BIT(0)</div><div class='ctx'> </div><div class='add'>+/* SE_GENI_M_GP_LENGTH and SE_GENI_S_GP_LENGTH fields */</div><div class='add'>+#define GP_LENGTH			GENMASK(31, 0)</div><div class='add'>+</div><div class='ctx'> /* SE_DMA_TX_IRQ_STAT Register fields */</div><div class='ctx'> #define TX_DMA_DONE			BIT(0)</div><div class='ctx'> #define TX_EOT				BIT(1)</div><div class='hunk'>@@ -248,8 +260,8 @@ struct geni_se {</div><div class='ctx'> #define RX_DMA_PARITY_ERR		BIT(5)</div><div class='ctx'> #define RX_DMA_BREAK			GENMASK(8, 7)</div><div class='ctx'> #define RX_GENI_GP_IRQ			GENMASK(10, 5)</div><div class='del'>-#define RX_GENI_CANCEL_IRQ		BIT(11)</div><div class='ctx'> #define RX_GENI_GP_IRQ_EXT		GENMASK(13, 12)</div><div class='add'>+#define RX_GENI_CANCEL_IRQ		BIT(14)</div><div class='ctx'> </div><div class='ctx'> /* SE_HW_PARAM_0 fields */</div><div class='ctx'> #define TX_FIFO_WIDTH_MSK		GENMASK(29, 24)</div><div class='hunk'>@@ -521,5 +533,7 @@ void geni_icc_set_tag(struct geni_se *se, u32 tag);</div><div class='ctx'> int geni_icc_enable(struct geni_se *se);</div><div class='ctx'> </div><div class='ctx'> int geni_icc_disable(struct geni_se *se);</div><div class='add'>+</div><div class='add'>+int geni_load_se_firmware(struct geni_se *se, enum geni_se_protocol_type protocol);</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/soc/qcom/llcc-qcom.h b/include/linux/soc/qcom/llcc-qcom.h<br/>index 1a886666bbb6..0287f9182c4d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/llcc-qcom.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/llcc-qcom.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/llcc-qcom.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/llcc-qcom.h</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #define LLCC_CMPTDMA     15</div><div class='ctx'> #define LLCC_DISP        16</div><div class='ctx'> #define LLCC_VIDFW       17</div><div class='add'>+#define LLCC_CAMFW       18</div><div class='ctx'> #define LLCC_MDMHPFX     20</div><div class='ctx'> #define LLCC_MDMPNG      21</div><div class='ctx'> #define LLCC_AUDHW       22</div><div class='hunk'>@@ -54,7 +55,33 @@</div><div class='ctx'> #define LLCC_CAMEXP4	 52</div><div class='ctx'> #define LLCC_DISP_WB	 53</div><div class='ctx'> #define LLCC_DISP_1	 54</div><div class='add'>+#define LLCC_VIEYE	 57</div><div class='add'>+#define LLCC_VIDPTH	 58</div><div class='add'>+#define LLCC_GPUMV	 59</div><div class='add'>+#define LLCC_EVA_LEFT	 60</div><div class='add'>+#define LLCC_EVA_RIGHT	 61</div><div class='add'>+#define LLCC_EVAGAIN	 62</div><div class='add'>+#define LLCC_VIPTH	 63</div><div class='ctx'> #define LLCC_VIDVSP	 64</div><div class='add'>+#define LLCC_DISP_LEFT	 65</div><div class='add'>+#define LLCC_DISP_RIGHT	 66</div><div class='add'>+#define LLCC_EVCS_LEFT	 67</div><div class='add'>+#define LLCC_EVCS_RIGHT	 68</div><div class='add'>+#define LLCC_SPAD	 69</div><div class='add'>+#define LLCC_VIDDEC	 70</div><div class='add'>+#define LLCC_CAMOFE	 71</div><div class='add'>+#define LLCC_CAMRTIP	 72</div><div class='add'>+#define LLCC_CAMSRTIP	 73</div><div class='add'>+#define LLCC_CAMRTRF	 74</div><div class='add'>+#define LLCC_CAMSRTRF	 75</div><div class='add'>+#define LLCC_VIDEO_APV	 83</div><div class='add'>+#define LLCC_COMPUTE1	 87</div><div class='add'>+#define LLCC_CPUSS_OPP	 88</div><div class='add'>+#define LLCC_CPUSSMPAM	 89</div><div class='add'>+#define LLCC_CAM_IPE_STROV	 92</div><div class='add'>+#define LLCC_CAM_OFE_STROV	 93</div><div class='add'>+#define LLCC_CPUSS_HEU	 94</div><div class='add'>+#define LLCC_MDM_PNG_FIXED	 100</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct llcc_slice_desc - Cache slice descriptor</div><div class='hunk'>@@ -115,7 +142,8 @@ struct llcc_edac_reg_offset {</div><div class='ctx'> /**</div><div class='ctx'>  * struct llcc_drv_data - Data associated with the llcc driver</div><div class='ctx'>  * @regmaps: regmaps associated with the llcc device</div><div class='del'>- * @bcast_regmap: regmap associated with llcc broadcast offset</div><div class='add'>+ * @bcast_regmap: regmap associated with llcc broadcast OR offset</div><div class='add'>+ * @bcast_and_regmap: regmap associated with llcc broadcast AND offset</div><div class='ctx'>  * @cfg: pointer to the data structure for slice configuration</div><div class='ctx'>  * @edac_reg_offset: Offset of the LLCC EDAC registers</div><div class='ctx'>  * @lock: mutex associated with each slice</div><div class='hunk'>@@ -124,11 +152,13 @@ struct llcc_edac_reg_offset {</div><div class='ctx'>  * @num_banks: Number of llcc banks</div><div class='ctx'>  * @bitmap: Bit map to track the active slice ids</div><div class='ctx'>  * @ecc_irq: interrupt for llcc cache error detection and reporting</div><div class='add'>+ * @ecc_irq_configured: 'True' if firmware has already configured the irq propagation</div><div class='ctx'>  * @version: Indicates the LLCC version</div><div class='ctx'>  */</div><div class='ctx'> struct llcc_drv_data {</div><div class='ctx'> 	struct regmap **regmaps;</div><div class='ctx'> 	struct regmap *bcast_regmap;</div><div class='add'>+	struct regmap *bcast_and_regmap;</div><div class='ctx'> 	const struct llcc_slice_config *cfg;</div><div class='ctx'> 	const struct llcc_edac_reg_offset *edac_reg_offset;</div><div class='ctx'> 	struct mutex lock;</div><div class='hunk'>@@ -137,6 +167,7 @@ struct llcc_drv_data {</div><div class='ctx'> 	u32 num_banks;</div><div class='ctx'> 	unsigned long *bitmap;</div><div class='ctx'> 	int ecc_irq;</div><div class='add'>+	bool ecc_irq_configured;</div><div class='ctx'> 	u32 version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/soc/qcom/mdt_loader.h b/include/linux/soc/qcom/mdt_loader.h<br/>index 9e8e60421192..8ea8230579a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/mdt_loader.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/mdt_loader.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/mdt_loader.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/mdt_loader.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,</div><div class='ctx'> 		  phys_addr_t *reloc_base);</div><div class='ctx'> </div><div class='ctx'> int qcom_mdt_load_no_init(struct device *dev, const struct firmware *fw,</div><div class='del'>-			  const char *fw_name, int pas_id, void *mem_region,</div><div class='add'>+			  const char *fw_name, void *mem_region,</div><div class='ctx'> 			  phys_addr_t mem_phys, size_t mem_size,</div><div class='ctx'> 			  phys_addr_t *reloc_base);</div><div class='ctx'> void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len,</div><div class='hunk'>@@ -54,9 +54,8 @@ static inline int qcom_mdt_load(struct device *dev, const struct firmware *fw,</div><div class='ctx'> </div><div class='ctx'> static inline int qcom_mdt_load_no_init(struct device *dev,</div><div class='ctx'> 					const struct firmware *fw,</div><div class='del'>-					const char *fw_name, int pas_id,</div><div class='del'>-					void *mem_region, phys_addr_t mem_phys,</div><div class='del'>-					size_t mem_size,</div><div class='add'>+					const char *fw_name, void *mem_region,</div><div class='add'>+					phys_addr_t mem_phys, size_t mem_size,</div><div class='ctx'> 					phys_addr_t *reloc_base)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='head'>diff --git a/include/linux/soc/qcom/pmic_glink.h b/include/linux/soc/qcom/pmic_glink.h<br/>index fd124aa18c81..7cddf1027752 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/pmic_glink.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/pmic_glink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/pmic_glink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/pmic_glink.h</a></div><div class='hunk'>@@ -23,10 +23,11 @@ struct pmic_glink_hdr {</div><div class='ctx'> </div><div class='ctx'> int pmic_glink_send(struct pmic_glink_client *client, void *data, size_t len);</div><div class='ctx'> </div><div class='del'>-struct pmic_glink_client *devm_pmic_glink_register_client(struct device *dev,</div><div class='del'>-							  unsigned int id,</div><div class='del'>-							  void (*cb)(const void *, size_t, void *),</div><div class='del'>-							  void (*pdr)(void *, int),</div><div class='del'>-							  void *priv);</div><div class='add'>+struct pmic_glink_client *devm_pmic_glink_client_alloc(struct device *dev,</div><div class='add'>+						       unsigned int id,</div><div class='add'>+						       void (*cb)(const void *, size_t, void *),</div><div class='add'>+						       void (*pdr)(void *, int),</div><div class='add'>+						       void *priv);</div><div class='add'>+void pmic_glink_client_register(struct pmic_glink_client *client);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/soc/qcom/qmi.h b/include/linux/soc/qcom/qmi.h<br/>index 469e02d2aa0d..291cdc7ef49c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/qmi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/qmi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/qmi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/qmi.h</a></div><div class='hunk'>@@ -24,9 +24,9 @@ struct socket;</div><div class='ctx'>  */</div><div class='ctx'> struct qmi_header {</div><div class='ctx'> 	u8 type;</div><div class='del'>-	u16 txn_id;</div><div class='del'>-	u16 msg_id;</div><div class='del'>-	u16 msg_len;</div><div class='add'>+	__le16 txn_id;</div><div class='add'>+	__le16 msg_id;</div><div class='add'>+	__le16 msg_len;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define QMI_REQUEST	0</div><div class='head'>diff --git a/include/linux/soc/qcom/smem.h b/include/linux/soc/qcom/smem.h<br/>index a36a3b9d4929..f946e3beca21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/smem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/smem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/smem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/smem.h</a></div><div class='hunk'>@@ -13,5 +13,8 @@ int qcom_smem_get_free_space(unsigned host);</div><div class='ctx'> phys_addr_t qcom_smem_virt_to_phys(void *p);</div><div class='ctx'> </div><div class='ctx'> int qcom_smem_get_soc_id(u32 *id);</div><div class='add'>+int qcom_smem_get_feature_code(u32 *code);</div><div class='add'>+</div><div class='add'>+int qcom_smem_bust_hwspin_lock_by_host(unsigned int host);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/soc/qcom/socinfo.h b/include/linux/soc/qcom/socinfo.h<br/>index e78777bb0f4a..ba823a0013c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/socinfo.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/qcom/socinfo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/socinfo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/socinfo.h</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'> #ifndef __QCOM_SOCINFO_H__</div><div class='ctx'> #define __QCOM_SOCINFO_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * SMEM item id, used to acquire handles to respective</div><div class='ctx'>  * SMEM region.</div><div class='hunk'>@@ -12,6 +14,14 @@</div><div class='ctx'> #define SMEM_SOCINFO_BUILD_ID_LENGTH	32</div><div class='ctx'> #define SMEM_SOCINFO_CHIP_ID_LENGTH	32</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * SoC version type with major number in the upper 16 bits and minor</div><div class='add'>+ * number in the lower 16 bits.</div><div class='add'>+ */</div><div class='add'>+#define SOCINFO_MAJOR(ver) (((ver) &gt;&gt; 16) &amp; 0xffff)</div><div class='add'>+#define SOCINFO_MINOR(ver) ((ver) &amp; 0xffff)</div><div class='add'>+#define SOCINFO_VERSION(maj, min)  ((((maj) &amp; 0xffff) &lt;&lt; 16)|((min) &amp; 0xffff))</div><div class='add'>+</div><div class='ctx'> /* Socinfo SMEM item structure */</div><div class='ctx'> struct socinfo {</div><div class='ctx'> 	__le32 fmt;</div><div class='hunk'>@@ -72,6 +82,34 @@ struct socinfo {</div><div class='ctx'> 	__le32 num_func_clusters;</div><div class='ctx'> 	__le32 boot_cluster;</div><div class='ctx'> 	__le32 boot_core;</div><div class='add'>+	/* Version 20 */</div><div class='add'>+	__le32 raw_package_type;</div><div class='add'>+	/* Version 21, 22, 23 */</div><div class='add'>+	__le32 reserve1[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Internal feature codes */</div><div class='add'>+enum qcom_socinfo_feature_code {</div><div class='add'>+	/* External feature codes */</div><div class='add'>+	SOCINFO_FC_UNKNOWN = 0x0,</div><div class='add'>+	SOCINFO_FC_AA,</div><div class='add'>+	SOCINFO_FC_AB,</div><div class='add'>+	SOCINFO_FC_AC,</div><div class='add'>+	SOCINFO_FC_AD,</div><div class='add'>+	SOCINFO_FC_AE,</div><div class='add'>+	SOCINFO_FC_AF,</div><div class='add'>+	SOCINFO_FC_AG,</div><div class='add'>+	SOCINFO_FC_AH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Internal feature codes */</div><div class='add'>+/* Valid values: 0 &lt;= n &lt;= 0xf */</div><div class='add'>+#define SOCINFO_FC_Yn(n)		(0xf1 + (n))</div><div class='add'>+#define SOCINFO_FC_INT_MAX		SOCINFO_FC_Yn(0xf)</div><div class='add'>+</div><div class='add'>+/* Product codes */</div><div class='add'>+#define SOCINFO_PC_UNKNOWN		0</div><div class='add'>+#define SOCINFO_PCn(n)			((n) + 1)</div><div class='add'>+#define SOCINFO_PC_RESERVE		(BIT(31) - 1)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h<br/>new file mode 100644<br/>index 000000000000..0a4edfe3d96d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/qcom/ubwc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/qcom/ubwc.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018, The Linux Foundation</div><div class='add'>+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __QCOM_UBWC_H__</div><div class='add'>+#define __QCOM_UBWC_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct qcom_ubwc_cfg_data {</div><div class='add'>+	u32 ubwc_enc_version;</div><div class='add'>+	/* Can be read from MDSS_BASE + 0x58 */</div><div class='add'>+	u32 ubwc_dec_version;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @ubwc_swizzle: Whether to enable level 1, 2 &amp; 3 bank swizzling.</div><div class='add'>+	 *</div><div class='add'>+	 * UBWC 1.0 always enables all three levels.</div><div class='add'>+	 * UBWC 2.0 removes level 1 bank swizzling, leaving levels 2 &amp; 3.</div><div class='add'>+	 * UBWC 4.0 adds the optional ability to disable levels 2 &amp; 3.</div><div class='add'>+	 */</div><div class='add'>+	u32 ubwc_swizzle;</div><div class='add'>+#define UBWC_SWIZZLE_ENABLE_LVL1	BIT(0)</div><div class='add'>+#define UBWC_SWIZZLE_ENABLE_LVL2	BIT(1)</div><div class='add'>+#define UBWC_SWIZZLE_ENABLE_LVL3	BIT(2)</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @highest_bank_bit: Highest Bank Bit</div><div class='add'>+	 *</div><div class='add'>+	 * The Highest Bank Bit value represents the bit of the highest</div><div class='add'>+	 * DDR bank.  This should ideally use DRAM type detection.</div><div class='add'>+	 */</div><div class='add'>+	int highest_bank_bit;</div><div class='add'>+	bool ubwc_bank_spread;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @macrotile_mode: Macrotile Mode</div><div class='add'>+	 *</div><div class='add'>+	 * Whether to use 4-channel macrotiling mode or the newer</div><div class='add'>+	 * 8-channel macrotiling mode introduced in UBWC 3.1. 0 is</div><div class='add'>+	 * 4-channel and 1 is 8-channel.</div><div class='add'>+	 */</div><div class='add'>+	bool macrotile_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define UBWC_1_0 0x10000000</div><div class='add'>+#define UBWC_2_0 0x20000000</div><div class='add'>+#define UBWC_3_0 0x30000000</div><div class='add'>+#define UBWC_4_0 0x40000000</div><div class='add'>+#define UBWC_4_3 0x40030000</div><div class='add'>+#define UBWC_5_0 0x50000000</div><div class='add'>+#define UBWC_6_0 0x60000000</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_QCOM_UBWC_CONFIG)</div><div class='add'>+const struct qcom_ubwc_cfg_data *qcom_ubwc_config_get_data(void);</div><div class='add'>+#else</div><div class='add'>+static inline const struct qcom_ubwc_cfg_data *qcom_ubwc_config_get_data(void)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline bool qcom_ubwc_get_ubwc_mode(const struct qcom_ubwc_cfg_data *cfg)</div><div class='add'>+{</div><div class='add'>+	bool ret = cfg-&gt;ubwc_enc_version == UBWC_1_0;</div><div class='add'>+</div><div class='add'>+	if (ret &amp;&amp; !(cfg-&gt;ubwc_swizzle &amp; UBWC_SWIZZLE_ENABLE_LVL1))</div><div class='add'>+		pr_err("UBWC config discrepancy - level 1 swizzling disabled on UBWC 1.0\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __QCOM_UBWC_H__ */</div><div class='head'>diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h b/include/linux/soc/samsung/exynos-regs-pmu.h<br/>index aa840ed043e1..532c6c2d1195 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/samsung/exynos-regs-pmu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/samsung/exynos-regs-pmu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/samsung/exynos-regs-pmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/samsung/exynos-regs-pmu.h</a></div><div class='hunk'>@@ -55,6 +55,8 @@</div><div class='ctx'> #define EXYNOS4_MIPI_PHY_SRESETN		(1 &lt;&lt; 1)</div><div class='ctx'> #define EXYNOS4_MIPI_PHY_MRESETN		(1 &lt;&lt; 2)</div><div class='ctx'> #define EXYNOS4_MIPI_PHY_RESET_MASK		(3 &lt;&lt; 1)</div><div class='add'>+/* USB PHY enable bit, valid for Exynos7870 */</div><div class='add'>+#define EXYNOS7870_USB2PHY_ENABLE		(1 &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> #define S5P_INFORM0				0x0800</div><div class='ctx'> #define S5P_INFORM1				0x0804</div><div class='hunk'>@@ -185,6 +187,9 @@</div><div class='ctx'> /* Only for S5Pv210 */</div><div class='ctx'> #define S5PV210_EINT_WAKEUP_MASK	0xC004</div><div class='ctx'> </div><div class='add'>+/* Only for Exynos2200 */</div><div class='add'>+#define EXYNOS2200_PHY_CTRL_USB20	0x72C</div><div class='add'>+</div><div class='ctx'> /* Only for Exynos4210 */</div><div class='ctx'> #define S5P_CMU_CLKSTOP_LCD1_LOWPWR	0x1154</div><div class='ctx'> #define S5P_CMU_RESET_LCD1_LOWPWR	0x1174</div><div class='hunk'>@@ -657,4 +662,357 @@</div><div class='ctx'> #define EXYNOS5433_PAD_RETENTION_UFS_OPTION			(0x3268)</div><div class='ctx'> #define EXYNOS5433_PAD_RETENTION_FSYSGENIO_OPTION		(0x32A8)</div><div class='ctx'> </div><div class='add'>+/* For Exynos990 */</div><div class='add'>+#define EXYNOS990_PHY_CTRL_USB20				(0x72C)</div><div class='add'>+</div><div class='add'>+/* For Exynos7870 */</div><div class='add'>+#define EXYNOS7870_MIPI_PHY_CONTROL0				(0x070c)</div><div class='add'>+#define EXYNOS7870_MIPI_PHY_CONTROL1				(0x0714)</div><div class='add'>+#define EXYNOS7870_MIPI_PHY_CONTROL2				(0x0734)</div><div class='add'>+</div><div class='add'>+/* For Tensor GS101 */</div><div class='add'>+/* PMU ALIVE */</div><div class='add'>+#define GS101_OM_STAT                           0x0000</div><div class='add'>+#define GS101_VERSION                           0x0004</div><div class='add'>+#define GS101_PORESET_CHECK                     0x0008</div><div class='add'>+#define GS101_OTP_STATUS                        0x000c</div><div class='add'>+#define GS101_SYSTEM_INFO                       0x0010</div><div class='add'>+#define GS101_IDLE_IP(n)                        (0x03e0 + ((n) &amp; 3) * 4)</div><div class='add'>+#define GS101_IDLE_IP_MASK(n)                   (0x03f0 + ((n) &amp; 3) * 4)</div><div class='add'>+#define GS101_SLC_CH_OFFSET(ch)                 (0x0400 + ((ch) &amp; 3) * 0x10)</div><div class='add'>+#define GS101_DATARAM_STATE_SLC_CH(ch)          (GS101_SLC_CH_OFFSET(ch) + 0x00)</div><div class='add'>+#define GS101_TAGRAM_STATE_SLC_CH(ch)           (GS101_SLC_CH_OFFSET(ch) + 0x04)</div><div class='add'>+#define GS101_LRURAM_STATE_SLC_CH(ch)           (GS101_SLC_CH_OFFSET(ch) + 0x08)</div><div class='add'>+#define GS101_PPMPURAM_STATE_SLC_CH(ch)         (GS101_SLC_CH_OFFSET(ch) + 0x0c)</div><div class='add'>+#define GS101_DATARAM_INFORM_SCL_CH(ch)         (GS101_SLC_CH_OFFSET(ch) + 0x40)</div><div class='add'>+#define GS101_TAGRAM_INFORM_SCL_CH(ch)          (GS101_SLC_CH_OFFSET(ch) + 0x44)</div><div class='add'>+#define GS101_LRURAM_INFORM_SCL_CH(ch)          (GS101_SLC_CH_OFFSET(ch) + 0x48)</div><div class='add'>+#define GS101_PPMPURAM_INFORM_SCL_CH(ch)        (GS101_SLC_CH_OFFSET(ch) + 0x4c)</div><div class='add'>+#define GS101_INFORM0                           0x0800</div><div class='add'>+#define GS101_INFORM1                           0x0804</div><div class='add'>+#define GS101_INFORM2                           0x0808</div><div class='add'>+#define GS101_INFORM3                           0x080c</div><div class='add'>+#define GS101_SYSIP_DAT(n)                      (0x0810 + ((n) &amp; 3) * 4)</div><div class='add'>+#define GS101_PWR_HOLD_HW_TRIP                  0x0820</div><div class='add'>+#define GS101_PWR_HOLD_SW_TRIP                  0x0824</div><div class='add'>+#define GS101_GSA_INFORM(n)                     (0x0830 + ((n) &amp; 1) * 4)</div><div class='add'>+#define GS101_INFORM4                           0x0840</div><div class='add'>+#define GS101_INFORM5                           0x0844</div><div class='add'>+#define GS101_INFORM6                           0x0848</div><div class='add'>+#define GS101_INFORM7                           0x084c</div><div class='add'>+#define GS101_INFORM8                           0x0850</div><div class='add'>+#define GS101_INFORM9                           0x0854</div><div class='add'>+#define GS101_INFORM10                          0x0858</div><div class='add'>+#define GS101_INFORM11                          0x085c</div><div class='add'>+#define GS101_CPU_INFORM(cpu)                   (0x0860 + ((cpu) &amp; 7) * 4)</div><div class='add'>+#define GS101_IROM_INFORM                       0x0880</div><div class='add'>+#define GS101_IROM_CPU_INFORM(cpu)              (0x0890 + ((cpu) &amp; 7) * 4)</div><div class='add'>+#define GS101_PMU_SPARE(n)                      (0x0900 + ((n) &amp; 3) * 4)</div><div class='add'>+#define GS101_IROM_DATA_REG(n)                  (0x0980 + ((n) &amp; 3) * 4)</div><div class='add'>+#define GS101_IROM_PWRMODE                      0x0990</div><div class='add'>+#define GS101_DREX_CALIBRATION(n)               (0x09a0 + ((n) &amp; 7) * 4)</div><div class='add'>+</div><div class='add'>+#define GS101_CLUSTER0_OFFSET                   0x1000</div><div class='add'>+#define GS101_CLUSTER1_OFFSET                   0x1300</div><div class='add'>+#define GS101_CLUSTER2_OFFSET                   0x1500</div><div class='add'>+#define GS101_CLUSTER_CPU_OFFSET(cl, cpu)       ((cl) + ((cpu) * 0x80))</div><div class='add'>+#define GS101_CLUSTER_CPU_CONFIGURATION(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x00)</div><div class='add'>+#define GS101_CLUSTER_CPU_STATUS(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x04)</div><div class='add'>+#define GS101_CLUSTER_CPU_STATES(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x08)</div><div class='add'>+#define GS101_CLUSTER_CPU_OPTION(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x0c)</div><div class='add'>+#define GS101_CLUSTER_CPU_OUT(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x20)</div><div class='add'>+#define GS101_CLUSTER_CPU_IN(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x24)</div><div class='add'>+#define GS101_CLUSTER_CPU_INT_IN(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x40)</div><div class='add'>+#define GS101_CLUSTER_CPU_INT_EN(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x44)</div><div class='add'>+#define GS101_CLUSTER_CPU_INT_TYPE(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x48)</div><div class='add'>+#define GS101_CLUSTER_CPU_INT_DIR(cl, cpu) \</div><div class='add'>+			(GS101_CLUSTER_CPU_OFFSET(cl, cpu) + 0x4c)</div><div class='add'>+</div><div class='add'>+#define GS101_CLUSTER_NONCPU_OFFSET(cl)         (0x1200 + ((cl) * 0x200))</div><div class='add'>+#define GS101_CLUSTER_NONCPU_CONFIGURATION(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x00)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_STATUS(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x04)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_STATES(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x08)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_OPTION(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x0c)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_OUT(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x20)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_IN(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x24)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_INT_IN(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x40)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_INT_EN(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x44)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_INT_TYPE(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x48)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_INT_DIR(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x4c)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_DUALRAIL_CTRL_OUT(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x60)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_DUALRAIL_POS_OUT(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x64)</div><div class='add'>+#define GS101_CLUSTER_NONCPU_DUALRAIL_CTRL_IN(cl) \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(cl) + 0x6c)</div><div class='add'>+#define GS101_CLUSTER0_NONCPU_DSU_PCH \</div><div class='add'>+			(GS101_CLUSTER_NONCPU_OFFSET(0) + 0x80)</div><div class='add'>+</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_ALIVE              0x1800</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_AOC                0x1880</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_APM                0x1900</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_CMU                0x1980</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_BUS0               0x1a00</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_BUS1               0x1a80</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_BUS2               0x1b00</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_CORE               0x1b80</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_EH                 0x1c00</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_CPUCL0             0x1c80</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_CPUCL1             0x1d00</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_CPUCL2             0x1d80</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_G3D                0x1e00</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_EMBEDDED_CPUCL0    0x1e80</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_EMBEDDED_G3D       0x2000</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_HSI0               0x2080</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_HSI1               0x2100</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_HSI2               0x2180</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_DPU                0x2200</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_DISP               0x2280</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_G2D                0x2300</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_MFC                0x2380</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_CSIS               0x2400</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_PDP                0x2480</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_DNS                0x2500</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_G3AA               0x2580</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_IPP                0x2600</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_ITP                0x2680</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_MCSC               0x2700</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_GDC                0x2780</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_TNR                0x2800</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_BO                 0x2880</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_TPU                0x2900</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_MIF0               0x2980</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_MIF1               0x2a00</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_MIF2               0x2a80</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_MIF3               0x2b00</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_MISC               0x2b80</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_PERIC0             0x2c00</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_PERIC1             0x2c80</div><div class='add'>+#define GS101_SUBBBLK_OFFSET_S2D                0x2d00</div><div class='add'>+#define GS101_SUBBLK_CONFIGURATION(blk)         ((blk) + 0x00)</div><div class='add'>+#define GS101_SUBBLK_STATUS(blk)                ((blk) + 0x04)</div><div class='add'>+#define GS101_SUBBLK_STATES(blk)                ((blk) + 0x08)</div><div class='add'>+#define GS101_SUBBLK_OPTION(blk)                ((blk) + 0x0c)</div><div class='add'>+#define GS101_SUBBLK_CTRL(blk)                  ((blk) + 0x10)</div><div class='add'>+#define GS101_SUBBLK_OUT(blk)                   ((blk) + 0x20)</div><div class='add'>+#define GS101_SUBBLK_IN(blk)                    ((blk) + 0x24)</div><div class='add'>+#define GS101_SUBBLK_INT_IN(blk)                ((blk) + 0x40)</div><div class='add'>+#define GS101_SUBBLK_INT_EN(blk)                ((blk) + 0x44)</div><div class='add'>+#define GS101_SUBBLK_INT_TYPE(blk)              ((blk) + 0x48)</div><div class='add'>+#define GS101_SUBBLK_INT_DIR(blk)               ((blk) + 0x4c)</div><div class='add'>+#define GS101_SUBBLK_MEMORY_OUT(blk)            ((blk) + 0x60)</div><div class='add'>+#define GS101_SUBBLK_MEMORY_IN(blk)             ((blk) + 0x64)</div><div class='add'>+</div><div class='add'>+#define GS101_SUBBBLK_CPU_OFFSET_APM            0x3000</div><div class='add'>+#define GS101_SUBBBLK_CPU_OFFSET_DBGCORE        0x3080</div><div class='add'>+#define GS101_SUBBBLK_CPU_OFFSET_SSS            0x3100</div><div class='add'>+#define GS101_SUBBLK_CPU_CONFIGURATION(blk)     ((blk) + 0x00)</div><div class='add'>+#define GS101_SUBBLK_CPU_STATUS(blk)            ((blk) + 0x04)</div><div class='add'>+#define GS101_SUBBLK_CPU_STATES(blk)            ((blk) + 0x08)</div><div class='add'>+#define GS101_SUBBLK_CPU_OPTION(blk)            ((blk) + 0x0c)</div><div class='add'>+#define GS101_SUBBLK_CPU_OUT(blk)               ((blk) + 0x20)</div><div class='add'>+#define GS101_SUBBLK_CPU_IN(blk)                ((blk) + 0x24)</div><div class='add'>+#define GS101_SUBBLK_CPU_INT_IN(blk)            ((blk) + 0x40)</div><div class='add'>+#define GS101_SUBBLK_CPU_INT_EN(blk)            ((blk) + 0x44)</div><div class='add'>+#define GS101_SUBBLK_CPU_INT_TYPE(blk)          ((blk) + 0x48)</div><div class='add'>+#define GS101_SUBBLK_CPU_INT_DIR(blk)           ((blk) + 0x4c)</div><div class='add'>+</div><div class='add'>+#define GS101_MIF_CONFIGURATION                 0x3800</div><div class='add'>+#define GS101_MIF_STATUS                        0x3804</div><div class='add'>+#define GS101_MIF_STATES                        0x3808</div><div class='add'>+#define GS101_MIF_OPTION                        0x380c</div><div class='add'>+#define GS101_MIF_CTRL                          0x3810</div><div class='add'>+#define GS101_MIF_OUT                           0x3820</div><div class='add'>+#define GS101_MIF_IN                            0x3824</div><div class='add'>+#define GS101_MIF_INT_IN                        0x3840</div><div class='add'>+#define GS101_MIF_INT_EN                        0x3844</div><div class='add'>+#define GS101_MIF_INT_TYPE                      0x3848</div><div class='add'>+#define GS101_MIF_INT_DIR                       0x384c</div><div class='add'>+#define GS101_TOP_CONFIGURATION                 0x3900</div><div class='add'>+#define GS101_TOP_STATUS                        0x3904</div><div class='add'>+#define GS101_TOP_STATES                        0x3908</div><div class='add'>+#define GS101_TOP_OPTION                        0x390c</div><div class='add'>+#define GS101_TOP_OUT                           0x3920</div><div class='add'>+#define GS101_TOP_IN                            0x3924</div><div class='add'>+#define GS101_TOP_INT_IN                        0x3940</div><div class='add'>+#define GS101_TOP_INT_EN                        0x3944</div><div class='add'>+#define GS101_TOP_INT_TYPE                      0x3948</div><div class='add'>+#define GS101_TOP_INT_DIR                       0x394c</div><div class='add'>+#define GS101_WAKEUP_STAT                       0x3950</div><div class='add'>+#define GS101_WAKEUP2_STAT                      0x3954</div><div class='add'>+#define GS101_WAKEUP2_INT_IN                    0x3960</div><div class='add'>+#define GS101_WAKEUP2_INT_EN                    0x3964</div><div class='add'>+#define GS101_WAKEUP2_INT_TYPE                  0x3968</div><div class='add'>+#define GS101_WAKEUP2_INT_DIR                   0x396c</div><div class='add'>+#define GS101_SYSTEM_CONFIGURATION              0x3a00</div><div class='add'>+#define GS101_SYSTEM_STATUS                     0x3a04</div><div class='add'>+#define GS101_SYSTEM_STATES                     0x3a08</div><div class='add'>+#define GS101_SYSTEM_OPTION                     0x3a0c</div><div class='add'>+#define GS101_SYSTEM_CTRL                       0x3a10</div><div class='add'>+#define GS101_SPARE_CTRL                        0x3a14</div><div class='add'>+#define GS101_USER_DEFINED_OUT                  0x3a18</div><div class='add'>+#define GS101_SYSTEM_OUT                        0x3a20</div><div class='add'>+#define GS101_SYSTEM_IN                         0x3a24</div><div class='add'>+#define GS101_SYSTEM_INT_IN                     0x3a40</div><div class='add'>+#define GS101_SYSTEM_INT_EN                     0x3a44</div><div class='add'>+#define GS101_SYSTEM_INT_TYPE                   0x3a48</div><div class='add'>+#define GS101_SYSTEM_INT_DIR                    0x3a4c</div><div class='add'>+#define GS101_EINT_INT_IN                       0x3a50</div><div class='add'>+#define GS101_EINT_INT_EN                       0x3a54</div><div class='add'>+#define GS101_EINT_INT_TYPE                     0x3a58</div><div class='add'>+#define GS101_EINT_INT_DIR                      0x3a5c</div><div class='add'>+#define GS101_EINT2_INT_IN                      0x3a60</div><div class='add'>+#define GS101_EINT2_INT_EN                      0x3a64</div><div class='add'>+#define GS101_EINT2_INT_TYPE                    0x3a68</div><div class='add'>+#define GS101_EINT2_INT_DIR                     0x3a6c</div><div class='add'>+#define GS101_EINT3_INT_IN                      0x3a70</div><div class='add'>+#define GS101_EINT3_INT_EN                      0x3a74</div><div class='add'>+#define GS101_EINT3_INT_TYPE                    0x3a78</div><div class='add'>+#define GS101_EINT3_INT_DIR                     0x3a7c</div><div class='add'>+#define GS101_EINT_WAKEUP_MASK                  0x3a80</div><div class='add'>+#define GS101_EINT_WAKEUP_MASK2                 0x3a84</div><div class='add'>+#define GS101_EINT_WAKEUP_MASK3                 0x3a88</div><div class='add'>+#define GS101_USER_DEFINED_INT_IN               0x3a90</div><div class='add'>+#define GS101_USER_DEFINED_INT_EN               0x3a94</div><div class='add'>+#define GS101_USER_DEFINED_INT_TYPE             0x3a98</div><div class='add'>+#define GS101_USER_DEFINED_INT_DIR              0x3a9c</div><div class='add'>+#define GS101_SCAN2DRAM_INT_IN                  0x3aa0</div><div class='add'>+#define GS101_SCAN2DRAM_INT_EN                  0x3aa4</div><div class='add'>+#define GS101_SCAN2DRAM_INT_TYPE                0x3aa8</div><div class='add'>+#define GS101_SCAN2DRAM_INT_DIR                 0x3aac</div><div class='add'>+#define GS101_HCU_START                         0x3ab0</div><div class='add'>+#define GS101_CUSTOM_OUT                        0x3ac0</div><div class='add'>+#define GS101_CUSTOM_IN                         0x3ac4</div><div class='add'>+#define GS101_CUSTOM_INT_IN                     0x3ad0</div><div class='add'>+#define GS101_CUSTOM_INT_EN                     0x3ad4</div><div class='add'>+#define GS101_CUSTOM_INT_TYPE                   0x3ad8</div><div class='add'>+#define GS101_CUSTOM_INT_DIR                    0x3adc</div><div class='add'>+#define GS101_ACK_LAST_CPU                      0x3afc</div><div class='add'>+#define GS101_HCU_R(n)                          (0x3b00 + ((n) &amp; 3) * 4)</div><div class='add'>+#define GS101_HCU_SP                            0x3b14</div><div class='add'>+#define GS101_HCU_PC                            0x3b18</div><div class='add'>+#define GS101_PMU_RAM_CTRL                      0x3b20</div><div class='add'>+#define GS101_APM_HCU_CTRL                      0x3b24</div><div class='add'>+#define GS101_APM_NMI_ENABLE                    0x3b30</div><div class='add'>+#define GS101_DBGCORE_NMI_ENABLE                0x3b34</div><div class='add'>+#define GS101_HCU_NMI_ENABLE                    0x3b38</div><div class='add'>+#define GS101_PWR_HOLD_WDT_ENABLE               0x3b3c</div><div class='add'>+#define GS101_NMI_SRC_IN                        0x3b40</div><div class='add'>+#define GS101_RST_STAT                          0x3b44</div><div class='add'>+#define GS101_RST_STAT_PMU                      0x3b48</div><div class='add'>+#define GS101_HPM_INT_IN                        0x3b60</div><div class='add'>+#define GS101_HPM_INT_EN                        0x3b64</div><div class='add'>+#define GS101_HPM_INT_TYPE                      0x3b68</div><div class='add'>+#define GS101_HPM_INT_DIR                       0x3b6c</div><div class='add'>+#define GS101_S2D_AUTH                          0x3b70</div><div class='add'>+#define GS101_BOOT_STAT                         0x3b74</div><div class='add'>+#define GS101_PMLINK_OUT                        0x3c00</div><div class='add'>+#define GS101_PMLINK_AOC_OUT                    0x3c04</div><div class='add'>+#define GS101_PMLINK_AOC_CTRL                   0x3c08</div><div class='add'>+#define GS101_TCXO_BUF_CTRL                     0x3c10</div><div class='add'>+#define GS101_ADD_CTRL                          0x3c14</div><div class='add'>+#define GS101_HCU_TIMEOUT_RESET                 0x3c20</div><div class='add'>+#define GS101_HCU_TIMEOUT_SCAN2DRAM             0x3c24</div><div class='add'>+#define GS101_TIMER(n)                          (0x3c80 + ((n) &amp; 3) * 4)</div><div class='add'>+#define GS101_PPC_MIF(n)                        (0x3c90 + ((n) &amp; 3) * 4)</div><div class='add'>+#define GS101_PPC_CORE                          0x3ca0</div><div class='add'>+#define GS101_PPC_EH                            0x3ca4</div><div class='add'>+#define GS101_PPC_CPUCL1_0                      0x3ca8</div><div class='add'>+#define GS101_PPC_CPUCL1_1                      0x3cac</div><div class='add'>+#define GS101_EXT_REGULATOR_MIF_DURATION        0x3cb0</div><div class='add'>+#define GS101_EXT_REGULATOR_TOP_DURATION        0x3cb4</div><div class='add'>+#define GS101_EXT_REGULATOR_CPUCL2_DURATION     0x3cb8</div><div class='add'>+#define GS101_EXT_REGULATOR_CPUCL1_DURATION     0x3cbc</div><div class='add'>+#define GS101_EXT_REGULATOR_G3D_DURATION        0x3cc0</div><div class='add'>+#define GS101_EXT_REGULATOR_TPU_DURATION        0x3cc4</div><div class='add'>+#define GS101_TCXO_DURATION                     0x3cc8</div><div class='add'>+#define GS101_BURNIN_CTRL                       0x3cd0</div><div class='add'>+#define GS101_JTAG_DBG_DET                      0x3cd4</div><div class='add'>+#define GS101_MMC_CONWKUP_CTRL                  0x3cd8</div><div class='add'>+#define GS101_USBDPPHY0_USBDP_WAKEUP            0x3cdc</div><div class='add'>+#define GS101_TMU_TOP_TRIP                      0x3ce0</div><div class='add'>+#define GS101_TMU_SUB_TRIP                      0x3ce4</div><div class='add'>+#define GS101_MEMORY_CEN                        0x3d00</div><div class='add'>+#define GS101_MEMORY_PGEN                       0x3d04</div><div class='add'>+#define GS101_MEMORY_RET                        0x3d08</div><div class='add'>+#define GS101_MEMORY_PGEN_FEEDBACK              0x3d0c</div><div class='add'>+#define GS101_MEMORY_SMX                        0x3d10</div><div class='add'>+#define GS101_MEMORY_SMX_FEEDBACK               0x3d14</div><div class='add'>+#define GS101_SLC_PCH_CHANNEL                   0x3d20</div><div class='add'>+#define GS101_SLC_PCH_CB                        0x3d24</div><div class='add'>+#define GS101_FORCE_NOMC                        0x3d3c</div><div class='add'>+#define GS101_FORCE_BOOST                       0x3d4c</div><div class='add'>+#define GS101_PMLINK_SLC_REQ                    0x3d50</div><div class='add'>+#define GS101_PMLINK_SLC_ACK                    0x3d54</div><div class='add'>+#define GS101_PMLINK_SLC_BUSY                   0x3d58</div><div class='add'>+#define GS101_BOOTSYNC_OUT                      0x3d80</div><div class='add'>+#define GS101_BOOTSYNC_IN                       0x3d84</div><div class='add'>+#define GS101_SCAN_READY_OUT                    0x3d88</div><div class='add'>+#define GS101_SCAN_READY_IN                     0x3d8c</div><div class='add'>+#define GS101_GSA_RESTORE                       0x3d90</div><div class='add'>+#define GS101_ALIVE_OTP_LATCH                   0x3d94</div><div class='add'>+#define GS101_DEBUG_OVERRIDE                    0x3d98</div><div class='add'>+#define GS101_WDT_OPTION                        0x3d9c</div><div class='add'>+#define GS101_AOC_WDT_CFG                       0x3da0</div><div class='add'>+#define GS101_CTRL_SECJTAG_ALIVE                0x3da4</div><div class='add'>+#define GS101_CTRL_DIV_PLL_ALV_DIVLOW           0x3e00</div><div class='add'>+#define GS101_CTRL_MUX_CLK_APM_REFSRC_AUTORESTORE 0x3e04</div><div class='add'>+#define GS101_CTRL_MUX_CLK_APM_REFSRC           0x3e08</div><div class='add'>+#define GS101_CTRL_MUX_CLK_APM_REF              0x3e0c</div><div class='add'>+#define GS101_CTRL_MUX_PLL_ALV_DIV4             0x3e10</div><div class='add'>+#define GS101_CTRL_PLL_ALV_DIV4                 0x3e14</div><div class='add'>+#define GS101_CTRL_OSCCLK_APMGSA                0x3e18</div><div class='add'>+#define GS101_CTRL_BLK_AOC_CLKS                 0x3e1c</div><div class='add'>+#define GS101_CTRL_PLL_ALV_LOCK                 0x3e20</div><div class='add'>+#define GS101_CTRL_CLKDIV__CLKRTC               0x3e24</div><div class='add'>+#define GS101_CTRL_SOC32K                       0x3e30</div><div class='add'>+#define GS101_CTRL_STM_PMU                      0x3e34</div><div class='add'>+#define GS101_CTRL_PMU_DEBUG                    0x3e38</div><div class='add'>+#define GS101_CTRL_DEBUG_UART                   0x3e3c</div><div class='add'>+#define GS101_CTRL_TCK                          0x3e40</div><div class='add'>+#define GS101_CTRL_SBU_SW_EN                    0x3e44</div><div class='add'>+#define GS101_PAD_CTRL_CLKOUT0                  0x3e80</div><div class='add'>+#define GS101_PAD_CTRL_CLKOUT1                  0x3e84</div><div class='add'>+#define GS101_PAD_CTRL_APM_24MOUT_0             0x3e88</div><div class='add'>+#define GS101_PAD_CTRL_APM_24MOUT_1             0x3e8c</div><div class='add'>+#define GS101_PAD_CTRL_IO_FORCE_RETENTION       0x3e90</div><div class='add'>+#define GS101_PAD_CTRL_APACTIVE_n               0x3e94</div><div class='add'>+#define GS101_PAD_CTRL_TCXO_ON                  0x3e98</div><div class='add'>+#define GS101_PAD_CTRL_PWR_HOLD                 0x3e9c</div><div class='add'>+#define GS101_PAD_CTRL_RESETO_n                 0x3ea0</div><div class='add'>+#define GS101_PAD_CTRL_WRESETO_n                0x3ea4</div><div class='add'>+#define GS101_PHY_CTRL_USB20                    0x3eb0</div><div class='add'>+#define GS101_PHY_CTRL_USBDP                    0x3eb4</div><div class='add'>+#define GS101_PHY_CTRL_MIPI_DCPHY_M4M4          0x3eb8</div><div class='add'>+#define GS101_PHY_CTRL_MIPI_DCPHY_S4S4S4S4      0x3ebc</div><div class='add'>+#define GS101_PHY_CTRL_PCIE_GEN4_0              0x3ec0</div><div class='add'>+#define GS101_PHY_CTRL_PCIE_GEN4_1              0x3ec4</div><div class='add'>+#define GS101_PHY_CTRL_UFS                      0x3ec8</div><div class='add'>+</div><div class='add'>+/* PMU INTR GEN */</div><div class='add'>+#define GS101_GRP1_INTR_BID_UPEND				(0x0108)</div><div class='add'>+#define GS101_GRP1_INTR_BID_CLEAR				(0x010c)</div><div class='add'>+#define GS101_GRP2_INTR_BID_ENABLE				(0x0200)</div><div class='add'>+#define GS101_GRP2_INTR_BID_UPEND				(0x0208)</div><div class='add'>+#define GS101_GRP2_INTR_BID_CLEAR				(0x020c)</div><div class='add'>+</div><div class='ctx'> #endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */</div><div class='head'>diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h<br/>index bd0d11af76c5..fd104b666836 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soc/ti/ti_sci_protocol.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soc/ti/ti_sci_protocol.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soc/ti/ti_sci_protocol.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soc/ti/ti_sci_protocol.h</a></div><div class='hunk'>@@ -195,6 +195,35 @@ struct ti_sci_clk_ops {</div><div class='ctx'> 			u64 *current_freq);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* TISCI LPM IO isolation control values */</div><div class='add'>+#define TISCI_MSG_VALUE_IO_ENABLE			1</div><div class='add'>+#define TISCI_MSG_VALUE_IO_DISABLE			0</div><div class='add'>+</div><div class='add'>+/* TISCI LPM constraint state values */</div><div class='add'>+#define TISCI_MSG_CONSTRAINT_SET			1</div><div class='add'>+#define TISCI_MSG_CONSTRAINT_CLR			0</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ti_sci_pm_ops - Low Power Mode (LPM) control operations</div><div class='add'>+ * @lpm_wake_reason: Get the wake up source that woke the SoC from LPM</div><div class='add'>+ *		- source: The wake up source that woke soc from LPM.</div><div class='add'>+ *		- timestamp: Timestamp at which soc woke.</div><div class='add'>+ * @set_device_constraint: Set LPM constraint on behalf of a device</div><div class='add'>+ *		- id: Device Identifier</div><div class='add'>+ *		- state: The desired state of device constraint: set or clear.</div><div class='add'>+ * @set_latency_constraint: Set LPM resume latency constraint</div><div class='add'>+ *		- latency: maximum acceptable latency to wake up from low power mode</div><div class='add'>+ *		- state: The desired state of latency constraint: set or clear.</div><div class='add'>+ */</div><div class='add'>+struct ti_sci_pm_ops {</div><div class='add'>+	int (*lpm_wake_reason)(const struct ti_sci_handle *handle,</div><div class='add'>+			       u32 *source, u64 *timestamp, u8 *pin, u8 *mode);</div><div class='add'>+	int (*set_device_constraint)(const struct ti_sci_handle *handle,</div><div class='add'>+				     u32 id, u8 state);</div><div class='add'>+	int (*set_latency_constraint)(const struct ti_sci_handle *handle,</div><div class='add'>+				      u16 latency, u8 state);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct ti_sci_resource_desc - Description of TI SCI resource instance range.</div><div class='ctx'>  * @start:	Start index of the first resource range.</div><div class='hunk'>@@ -539,6 +568,7 @@ struct ti_sci_ops {</div><div class='ctx'> 	struct ti_sci_core_ops core_ops;</div><div class='ctx'> 	struct ti_sci_dev_ops dev_ops;</div><div class='ctx'> 	struct ti_sci_clk_ops clk_ops;</div><div class='add'>+	struct ti_sci_pm_ops pm_ops;</div><div class='ctx'> 	struct ti_sci_rm_core_ops rm_core_ops;</div><div class='ctx'> 	struct ti_sci_rm_irq_ops rm_irq_ops;</div><div class='ctx'> 	struct ti_sci_rm_ringacc_ops rm_ring_ops;</div><div class='head'>diff --git a/include/linux/socket.h b/include/linux/socket.h<br/>index cfcb7e2c3813..ec715ad4bf25 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/socket.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/socket.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/socket.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/socket.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@ struct cred;</div><div class='ctx'> struct socket;</div><div class='ctx'> struct sock;</div><div class='ctx'> struct sk_buff;</div><div class='add'>+struct proto_accept_arg;</div><div class='ctx'> </div><div class='ctx'> #define __sockaddr_check_size(size)	\</div><div class='ctx'> 	BUILD_BUG_ON(((size) &gt; sizeof(struct __kernel_sockaddr_storage)))</div><div class='hunk'>@@ -31,12 +32,27 @@ typedef __kernel_sa_family_t	sa_family_t;</div><div class='ctx'>  *	1003.1g requires sa_family_t and that sa_data is char.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/* Deprecated for in-kernel use. Use struct sockaddr_unsized instead. */</div><div class='ctx'> struct sockaddr {</div><div class='ctx'> 	sa_family_t	sa_family;	/* address family, AF_xxx	*/</div><div class='del'>-	union {</div><div class='del'>-		char sa_data_min[14];		/* Minimum 14 bytes of protocol address	*/</div><div class='del'>-		DECLARE_FLEX_ARRAY(char, sa_data);</div><div class='del'>-	};</div><div class='add'>+	char		sa_data[14];	/* 14 bytes of protocol address	*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sockaddr_unsized - Unspecified size sockaddr for callbacks</div><div class='add'>+ * @sa_family: Address family (AF_UNIX, AF_INET, AF_INET6, etc.)</div><div class='add'>+ * @sa_data: Flexible array for address data</div><div class='add'>+ *</div><div class='add'>+ * This structure is designed for callback interfaces where the</div><div class='add'>+ * total size is known via the sockaddr_len parameter. Unlike struct</div><div class='add'>+ * sockaddr which has a fixed 14-byte sa_data limit or struct</div><div class='add'>+ * sockaddr_storage which has a fixed 128-byte sa_data limit, this</div><div class='add'>+ * structure can accommodate addresses of any size, but must be used</div><div class='add'>+ * carefully.</div><div class='add'>+ */</div><div class='add'>+struct sockaddr_unsized {</div><div class='add'>+	__kernel_sa_family_t	sa_family;	/* address family, AF_xxx */</div><div class='add'>+	char			sa_data[];	/* flexible address data */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct linger {</div><div class='hunk'>@@ -75,7 +91,7 @@ struct msghdr {</div><div class='ctx'> 	__kernel_size_t	msg_controllen;	/* ancillary data buffer length */</div><div class='ctx'> 	struct kiocb	*msg_iocb;	/* ptr to iocb for async requests */</div><div class='ctx'> 	struct ubuf_info *msg_ubuf;</div><div class='del'>-	int (*sg_from_iter)(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+	int (*sg_from_iter)(struct sk_buff *skb,</div><div class='ctx'> 			    struct iov_iter *from, size_t length);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +183,7 @@ static inline struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr</div><div class='ctx'> 	return __cmsg_nxthdr(__msg-&gt;msg_control, __msg-&gt;msg_controllen, __cmsg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline size_t msg_data_left(struct msghdr *msg)</div><div class='add'>+static inline size_t msg_data_left(const struct msghdr *msg)</div><div class='ctx'> {</div><div class='ctx'> 	return iov_iter_count(&amp;msg-&gt;msg_iter);</div><div class='ctx'> }</div><div class='hunk'>@@ -326,6 +342,7 @@ struct ucred {</div><div class='ctx'> 					  * plain text and require encryption</div><div class='ctx'> 					  */</div><div class='ctx'> </div><div class='add'>+#define MSG_SOCK_DEVMEM 0x2000000	/* Receive devmem skbs as cmsg */</div><div class='ctx'> #define MSG_ZEROCOPY	0x4000000	/* Use user data in kernel path */</div><div class='ctx'> #define MSG_SPLICE_PAGES 0x8000000	/* Splice the pages from the iterator in sendmsg() */</div><div class='ctx'> #define MSG_FASTOPEN	0x20000000	/* Send data in TCP SYN */</div><div class='hunk'>@@ -390,6 +407,8 @@ struct ucred {</div><div class='ctx'> </div><div class='ctx'> extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr);</div><div class='ctx'> extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);</div><div class='add'>+extern int put_cmsg_notrunc(struct msghdr *msg, int level, int type, int len,</div><div class='add'>+			    void *data);</div><div class='ctx'> </div><div class='ctx'> struct timespec64;</div><div class='ctx'> struct __kernel_timespec;</div><div class='hunk'>@@ -422,13 +441,6 @@ extern long __sys_recvmsg_sock(struct socket *sock, struct msghdr *msg,</div><div class='ctx'> 			       struct user_msghdr __user *umsg,</div><div class='ctx'> 			       struct sockaddr __user *uaddr,</div><div class='ctx'> 			       unsigned int flags);</div><div class='del'>-extern int sendmsg_copy_msghdr(struct msghdr *msg,</div><div class='del'>-			       struct user_msghdr __user *umsg, unsigned flags,</div><div class='del'>-			       struct iovec **iov);</div><div class='del'>-extern int recvmsg_copy_msghdr(struct msghdr *msg,</div><div class='del'>-			       struct user_msghdr __user *umsg, unsigned flags,</div><div class='del'>-			       struct sockaddr __user **uaddr,</div><div class='del'>-			       struct iovec **iov);</div><div class='ctx'> extern int __copy_msghdr(struct msghdr *kmsg,</div><div class='ctx'> 			 struct user_msghdr *umsg,</div><div class='ctx'> 			 struct sockaddr __user **save_addr);</div><div class='hunk'>@@ -440,7 +452,7 @@ extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size,</div><div class='ctx'> extern int __sys_sendto(int fd, void __user *buff, size_t len,</div><div class='ctx'> 			unsigned int flags, struct sockaddr __user *addr,</div><div class='ctx'> 			int addr_len);</div><div class='del'>-extern struct file *do_accept(struct file *file, unsigned file_flags,</div><div class='add'>+extern struct file *do_accept(struct file *file, struct proto_accept_arg *arg,</div><div class='ctx'> 			      struct sockaddr __user *upeer_sockaddr,</div><div class='ctx'> 			      int __user *upeer_addrlen, int flags);</div><div class='ctx'> extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,</div><div class='hunk'>@@ -448,15 +460,18 @@ extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,</div><div class='ctx'> extern int __sys_socket(int family, int type, int protocol);</div><div class='ctx'> extern struct file *__sys_socket_file(int family, int type, int protocol);</div><div class='ctx'> extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);</div><div class='add'>+extern int __sys_bind_socket(struct socket *sock, struct sockaddr_storage *address,</div><div class='add'>+			     int addrlen);</div><div class='ctx'> extern int __sys_connect_file(struct file *file, struct sockaddr_storage *addr,</div><div class='ctx'> 			      int addrlen, int file_flags);</div><div class='ctx'> extern int __sys_connect(int fd, struct sockaddr __user *uservaddr,</div><div class='ctx'> 			 int addrlen);</div><div class='ctx'> extern int __sys_listen(int fd, int backlog);</div><div class='add'>+extern int __sys_listen_socket(struct socket *sock, int backlog);</div><div class='add'>+extern int do_getsockname(struct socket *sock, int peer,</div><div class='add'>+			  struct sockaddr __user *usockaddr, int __user *usockaddr_len);</div><div class='ctx'> extern int __sys_getsockname(int fd, struct sockaddr __user *usockaddr,</div><div class='del'>-			     int __user *usockaddr_len);</div><div class='del'>-extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr,</div><div class='del'>-			     int __user *usockaddr_len);</div><div class='add'>+			     int __user *usockaddr_len, int peer);</div><div class='ctx'> extern int __sys_socketpair(int family, int type, int protocol,</div><div class='ctx'> 			    int __user *usockvec);</div><div class='ctx'> extern int __sys_shutdown_sock(struct socket *sock, int how);</div><div class='head'>diff --git a/include/linux/sockptr.h b/include/linux/sockptr.h<br/>index 307961b41541..3e6c8e9d67ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sockptr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sockptr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sockptr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sockptr.h</a></div><div class='hunk'>@@ -50,11 +50,40 @@ static inline int copy_from_sockptr_offset(void *dst, sockptr_t src,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Deprecated.</div><div class='add'>+ * This is unsafe, unless caller checked user provided optlen.</div><div class='add'>+ * Prefer copy_safe_from_sockptr() instead.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 for success, or number of bytes not copied on error.</div><div class='add'>+ */</div><div class='ctx'> static inline int copy_from_sockptr(void *dst, sockptr_t src, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	return copy_from_sockptr_offset(dst, src, 0, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * copy_safe_from_sockptr: copy a struct from sockptr</div><div class='add'>+ * @dst:   Destination address, in kernel space. This buffer must be @ksize</div><div class='add'>+ *         bytes long.</div><div class='add'>+ * @ksize: Size of @dst struct.</div><div class='add'>+ * @optval: Source address. (in user or kernel space)</div><div class='add'>+ * @optlen: Size of @optval data.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *  * -EINVAL: @optlen &lt; @ksize</div><div class='add'>+ *  * -EFAULT: access to userspace failed.</div><div class='add'>+ *  * 0 : @ksize bytes were copied</div><div class='add'>+ */</div><div class='add'>+static inline int copy_safe_from_sockptr(void *dst, size_t ksize,</div><div class='add'>+					 sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	if (optlen &lt; ksize)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_sockptr(dst, optval, ksize))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int copy_struct_from_sockptr(void *dst, size_t ksize,</div><div class='ctx'> 		sockptr_t src, size_t usize)</div><div class='ctx'> {</div><div class='hunk'>@@ -92,9 +121,9 @@ static inline int copy_to_sockptr(sockptr_t dst, const void *src, size_t size)</div><div class='ctx'> 	return copy_to_sockptr_offset(dst, 0, src, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *memdup_sockptr(sockptr_t src, size_t len)</div><div class='add'>+static inline void *memdup_sockptr_noprof(sockptr_t src, size_t len)</div><div class='ctx'> {</div><div class='del'>-	void *p = kmalloc_track_caller(len, GFP_USER | __GFP_NOWARN);</div><div class='add'>+	void *p = kmalloc_track_caller_noprof(len, GFP_USER | __GFP_NOWARN);</div><div class='ctx'> </div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -104,10 +133,11 @@ static inline void *memdup_sockptr(sockptr_t src, size_t len)</div><div class='ctx'> 	}</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='add'>+#define memdup_sockptr(...)	alloc_hooks(memdup_sockptr_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='del'>-static inline void *memdup_sockptr_nul(sockptr_t src, size_t len)</div><div class='add'>+static inline void *memdup_sockptr_nul_noprof(sockptr_t src, size_t len)</div><div class='ctx'> {</div><div class='del'>-	char *p = kmalloc_track_caller(len + 1, GFP_KERNEL);</div><div class='add'>+	char *p = kmalloc_track_caller_noprof(len + 1, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!p)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -118,6 +148,7 @@ static inline void *memdup_sockptr_nul(sockptr_t src, size_t len)</div><div class='ctx'> 	p[len] = '\0';</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='add'>+#define memdup_sockptr_nul(...)	alloc_hooks(memdup_sockptr_nul_noprof(__VA_ARGS__))</div><div class='ctx'> </div><div class='ctx'> static inline long strncpy_from_sockptr(char *dst, sockptr_t src, size_t count)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/sony-laptop.h b/include/linux/sony-laptop.h<br/>deleted file mode 100644<br/>index 1e3c92feea6e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sony-laptop.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sony-laptop.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _SONYLAPTOP_H_</div><div class='del'>-#define _SONYLAPTOP_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-/* used only for communication between v4l and sony-laptop */</div><div class='del'>-</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERA		 1	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_SETCAMERA		 2</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERABRIGHTNESS	 3	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_SETCAMERABRIGHTNESS	 4</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERACONTRAST	 5	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_SETCAMERACONTRAST	 6</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERAHUE		 7	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_SETCAMERAHUE		 8</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERACOLOR		 9	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_SETCAMERACOLOR		10</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERASHARPNESS	11	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_SETCAMERASHARPNESS	12</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERAPICTURE	13	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_SETCAMERAPICTURE	14</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERAAGC		15	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_SETCAMERAAGC		16</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERADIRECTION	17	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERAROMVERSION	18	/* obsolete */</div><div class='del'>-#define SONY_PIC_COMMAND_GETCAMERAREVISION	19	/* obsolete */</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_SONY_LAPTOP)</div><div class='del'>-int sony_pic_camera_command(int command, u8 value);</div><div class='del'>-#else</div><div class='del'>-static inline int sony_pic_camera_command(int command, u8 value) { return 0; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif	/* __KERNEL__ */</div><div class='del'>-</div><div class='del'>-#endif /* _SONYLAPTOP_H_ */</div><div class='head'>diff --git a/include/linux/sort.h b/include/linux/sort.h<br/>index e163287ac6c1..c01ef804a0eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sort.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sort.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sort.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sort.h</a></div><div class='hunk'>@@ -4,6 +4,16 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * cmp_int - perform a three-way comparison of the arguments</div><div class='add'>+ * @l: the left argument</div><div class='add'>+ * @r: the right argument</div><div class='add'>+ *</div><div class='add'>+ * Return: 1 if the left argument is greater than the right one; 0 if the</div><div class='add'>+ * arguments are equal; -1 if the left argument is less than the right one.</div><div class='add'>+ */</div><div class='add'>+#define cmp_int(l, r) (((l) &gt; (r)) - ((l) &lt; (r)))</div><div class='add'>+</div><div class='ctx'> void sort_r(void *base, size_t num, size_t size,</div><div class='ctx'> 	    cmp_r_func_t cmp_func,</div><div class='ctx'> 	    swap_r_func_t swap_func,</div><div class='hunk'>@@ -13,4 +23,15 @@ void sort(void *base, size_t num, size_t size,</div><div class='ctx'> 	  cmp_func_t cmp_func,</div><div class='ctx'> 	  swap_func_t swap_func);</div><div class='ctx'> </div><div class='add'>+/* Versions that periodically call cond_resched(): */</div><div class='add'>+</div><div class='add'>+void sort_r_nonatomic(void *base, size_t num, size_t size,</div><div class='add'>+		      cmp_r_func_t cmp_func,</div><div class='add'>+		      swap_r_func_t swap_func,</div><div class='add'>+		      const void *priv);</div><div class='add'>+</div><div class='add'>+void sort_nonatomic(void *base, size_t num, size_t size,</div><div class='add'>+		    cmp_func_t cmp_func,</div><div class='add'>+		    swap_func_t swap_func);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h<br/>index 66f814b63a43..e6a3476bcef1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soundwire/sdw.h</a></div><div class='hunk'>@@ -4,12 +4,22 @@</div><div class='ctx'> #ifndef __SOUNDWIRE_H</div><div class='ctx'> #define __SOUNDWIRE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='del'>-#include &lt;linux/lockdep_types.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/lockdep_types.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='del'>-#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;sound/sdca.h&gt;</div><div class='add'>+</div><div class='add'>+struct dentry;</div><div class='add'>+struct fwnode_handle;</div><div class='add'>+struct device_node;</div><div class='ctx'> </div><div class='ctx'> struct sdw_bus;</div><div class='ctx'> struct sdw_slave;</div><div class='hunk'>@@ -42,10 +52,13 @@ struct sdw_slave;</div><div class='ctx'> </div><div class='ctx'> #define SDW_FRAME_CTRL_BITS		48</div><div class='ctx'> #define SDW_MAX_DEVICES			11</div><div class='add'>+#define SDW_FW_MAX_DEVICES		16</div><div class='ctx'> </div><div class='ctx'> #define SDW_MAX_PORTS			15</div><div class='ctx'> #define SDW_VALID_PORT_RANGE(n)		((n) &lt; SDW_MAX_PORTS &amp;&amp; (n) &gt;= 1)</div><div class='ctx'> </div><div class='add'>+#define SDW_MAX_LANES		8</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	SDW_PORT_DIRN_SINK = 0,</div><div class='ctx'> 	SDW_PORT_DIRN_SOURCE,</div><div class='hunk'>@@ -140,12 +153,14 @@ enum sdw_dpn_pkg_mode {</div><div class='ctx'>  *</div><div class='ctx'>  * @SDW_STREAM_PCM: PCM data stream</div><div class='ctx'>  * @SDW_STREAM_PDM: PDM data stream</div><div class='add'>+ * @SDW_STREAM_BPT: BPT data stream</div><div class='ctx'>  *</div><div class='ctx'>  * spec doesn't define this, but is used in implementation</div><div class='ctx'>  */</div><div class='ctx'> enum sdw_stream_type {</div><div class='ctx'> 	SDW_STREAM_PCM = 0,</div><div class='ctx'> 	SDW_STREAM_PDM = 1,</div><div class='add'>+	SDW_STREAM_BPT = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -226,62 +241,36 @@ enum sdw_clk_stop_mode {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct sdw_dp0_prop - DP0 properties</div><div class='add'>+ * @words: wordlengths supported</div><div class='ctx'>  * @max_word: Maximum number of bits in a Payload Channel Sample, 1 to 64</div><div class='ctx'>  * (inclusive)</div><div class='ctx'>  * @min_word: Minimum number of bits in a Payload Channel Sample, 1 to 64</div><div class='ctx'>  * (inclusive)</div><div class='ctx'>  * @num_words: number of wordlengths supported</div><div class='del'>- * @words: wordlengths supported</div><div class='add'>+ * @ch_prep_timeout: Port-specific timeout value, in milliseconds</div><div class='ctx'>  * @BRA_flow_controlled: Slave implementation results in an OK_NotReady</div><div class='ctx'>  * response</div><div class='ctx'>  * @simple_ch_prep_sm: If channel prepare sequence is required</div><div class='ctx'>  * @imp_def_interrupts: If set, each bit corresponds to support for</div><div class='ctx'>  * implementation-defined interrupts</div><div class='add'>+ * @num_lanes: array size of @lane_list</div><div class='add'>+ * @lane_list: indicates which Lanes can be used by DP0</div><div class='ctx'>  *</div><div class='ctx'>  * The wordlengths are specified by Spec as max, min AND number of</div><div class='ctx'>  * discrete values, implementation can define based on the wordlengths they</div><div class='ctx'>  * support</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_dp0_prop {</div><div class='add'>+	u32 *words;</div><div class='ctx'> 	u32 max_word;</div><div class='ctx'> 	u32 min_word;</div><div class='ctx'> 	u32 num_words;</div><div class='del'>-	u32 *words;</div><div class='add'>+	u32 ch_prep_timeout;</div><div class='ctx'> 	bool BRA_flow_controlled;</div><div class='ctx'> 	bool simple_ch_prep_sm;</div><div class='ctx'> 	bool imp_def_interrupts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct sdw_dpn_audio_mode - Audio mode properties for DPn</div><div class='del'>- * @bus_min_freq: Minimum bus frequency, in Hz</div><div class='del'>- * @bus_max_freq: Maximum bus frequency, in Hz</div><div class='del'>- * @bus_num_freq: Number of discrete frequencies supported</div><div class='del'>- * @bus_freq: Discrete bus frequencies, in Hz</div><div class='del'>- * @min_freq: Minimum sampling frequency, in Hz</div><div class='del'>- * @max_freq: Maximum sampling bus frequency, in Hz</div><div class='del'>- * @num_freq: Number of discrete sampling frequency supported</div><div class='del'>- * @freq: Discrete sampling frequencies, in Hz</div><div class='del'>- * @prep_ch_behave: Specifies the dependencies between Channel Prepare</div><div class='del'>- * sequence and bus clock configuration</div><div class='del'>- * If 0, Channel Prepare can happen at any Bus clock rate</div><div class='del'>- * If 1, Channel Prepare sequence shall happen only after Bus clock is</div><div class='del'>- * changed to a frequency supported by this mode or compatible modes</div><div class='del'>- * described by the next field</div><div class='del'>- * @glitchless: Bitmap describing possible glitchless transitions from this</div><div class='del'>- * Audio Mode to other Audio Modes</div><div class='del'>- */</div><div class='del'>-struct sdw_dpn_audio_mode {</div><div class='del'>-	u32 bus_min_freq;</div><div class='del'>-	u32 bus_max_freq;</div><div class='del'>-	u32 bus_num_freq;</div><div class='del'>-	u32 *bus_freq;</div><div class='del'>-	u32 max_freq;</div><div class='del'>-	u32 min_freq;</div><div class='del'>-	u32 num_freq;</div><div class='del'>-	u32 *freq;</div><div class='del'>-	u32 prep_ch_behave;</div><div class='del'>-	u32 glitchless;</div><div class='add'>+	int num_lanes;</div><div class='add'>+	u32 *lane_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -296,24 +285,25 @@ struct sdw_dpn_audio_mode {</div><div class='ctx'>  * @type: Data port type. Full, Simplified or Reduced</div><div class='ctx'>  * @max_grouping: Maximum number of samples that can be grouped together for</div><div class='ctx'>  * a full data port</div><div class='del'>- * @simple_ch_prep_sm: If the port supports simplified channel prepare state</div><div class='del'>- * machine</div><div class='ctx'>  * @ch_prep_timeout: Port-specific timeout value, in milliseconds</div><div class='ctx'>  * @imp_def_interrupts: If set, each bit corresponds to support for</div><div class='ctx'>  * implementation-defined interrupts</div><div class='ctx'>  * @max_ch: Maximum channels supported</div><div class='ctx'>  * @min_ch: Minimum channels supported</div><div class='ctx'>  * @num_channels: Number of discrete channels supported</div><div class='del'>- * @channels: Discrete channels supported</div><div class='ctx'>  * @num_ch_combinations: Number of channel combinations supported</div><div class='add'>+ * @channels: Discrete channels supported</div><div class='ctx'>  * @ch_combinations: Channel combinations supported</div><div class='add'>+ * @lane_list: indicates which Lanes can be used by DPn</div><div class='add'>+ * @num_lanes: array size of @lane_list</div><div class='ctx'>  * @modes: SDW mode supported</div><div class='ctx'>  * @max_async_buffer: Number of samples that this port can buffer in</div><div class='ctx'>  * asynchronous modes</div><div class='add'>+ * @port_encoding: Payload Channel Sample encoding schemes supported</div><div class='ctx'>  * @block_pack_mode: Type of block port mode supported</div><div class='ctx'>  * @read_only_wordlength: Read Only wordlength field in DPN_BlockCtrl1 register</div><div class='del'>- * @port_encoding: Payload Channel Sample encoding schemes supported</div><div class='del'>- * @audio_modes: Audio modes supported</div><div class='add'>+ * @simple_ch_prep_sm: If the port supports simplified channel prepare state</div><div class='add'>+ * machine</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_dpn_prop {</div><div class='ctx'> 	u32 num;</div><div class='hunk'>@@ -323,25 +313,29 @@ struct sdw_dpn_prop {</div><div class='ctx'> 	u32 *words;</div><div class='ctx'> 	enum sdw_dpn_type type;</div><div class='ctx'> 	u32 max_grouping;</div><div class='del'>-	bool simple_ch_prep_sm;</div><div class='ctx'> 	u32 ch_prep_timeout;</div><div class='ctx'> 	u32 imp_def_interrupts;</div><div class='ctx'> 	u32 max_ch;</div><div class='ctx'> 	u32 min_ch;</div><div class='ctx'> 	u32 num_channels;</div><div class='del'>-	u32 *channels;</div><div class='ctx'> 	u32 num_ch_combinations;</div><div class='add'>+	u32 *channels;</div><div class='ctx'> 	u32 *ch_combinations;</div><div class='add'>+	u32 *lane_list;</div><div class='add'>+	int num_lanes;</div><div class='ctx'> 	u32 modes;</div><div class='ctx'> 	u32 max_async_buffer;</div><div class='add'>+	u32 port_encoding;</div><div class='ctx'> 	bool block_pack_mode;</div><div class='ctx'> 	bool read_only_wordlength;</div><div class='del'>-	u32 port_encoding;</div><div class='del'>-	struct sdw_dpn_audio_mode *audio_modes;</div><div class='add'>+	bool simple_ch_prep_sm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct sdw_slave_prop - SoundWire Slave properties</div><div class='add'>+ * @dp0_prop: Data Port 0 properties</div><div class='add'>+ * @src_dpn_prop: Source Data Port N properties</div><div class='add'>+ * @sink_dpn_prop: Sink Data Port N properties</div><div class='ctx'>  * @mipi_revision: Spec version of the implementation</div><div class='ctx'>  * @wake_capable: Wake-up events are supported</div><div class='ctx'>  * @test_mode_capable: If test mode is supported</div><div class='hunk'>@@ -358,23 +352,27 @@ struct sdw_dpn_prop {</div><div class='ctx'>  * SCP_AddrPage2</div><div class='ctx'>  * @bank_delay_support: Slave implements bank delay/bridge support registers</div><div class='ctx'>  * SCP_BankDelay and SCP_NextFrame</div><div class='add'>+ * @lane_control_support: Slave supports lane control</div><div class='ctx'>  * @p15_behave: Slave behavior when the Master attempts a read to the Port15</div><div class='ctx'>  * alias</div><div class='del'>- * @lane_control_support: Slave supports lane control</div><div class='ctx'>  * @master_count: Number of Masters present on this Slave</div><div class='ctx'>  * @source_ports: Bitmap identifying source ports</div><div class='ctx'>  * @sink_ports: Bitmap identifying sink ports</div><div class='del'>- * @dp0_prop: Data Port 0 properties</div><div class='del'>- * @src_dpn_prop: Source Data Port N properties</div><div class='del'>- * @sink_dpn_prop: Sink Data Port N properties</div><div class='del'>- * @scp_int1_mask: SCP_INT1_MASK desired settings</div><div class='ctx'>  * @quirks: bitmask identifying deltas from the MIPI specification</div><div class='add'>+ * @sdca_interrupt_register_list: indicates which sets of SDCA interrupt status</div><div class='add'>+ * and masks are supported</div><div class='add'>+ * @commit_register_supported: is PCP_Commit register supported</div><div class='add'>+ * @scp_int1_mask: SCP_INT1_MASK desired settings</div><div class='add'>+ * @lane_maps: Lane mapping for the slave, only valid if lane_control_support is set</div><div class='ctx'>  * @clock_reg_supported: the Peripheral implements the clock base and scale</div><div class='ctx'>  * registers introduced with the SoundWire 1.2 specification. SDCA devices</div><div class='ctx'>  * do not need to set this boolean property as the registers are required.</div><div class='ctx'>  * @use_domain_irq: call actual IRQ handler on slave, as well as callback</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_slave_prop {</div><div class='add'>+	struct sdw_dp0_prop *dp0_prop;</div><div class='add'>+	struct sdw_dpn_prop *src_dpn_prop;</div><div class='add'>+	struct sdw_dpn_prop *sink_dpn_prop;</div><div class='ctx'> 	u32 mipi_revision;</div><div class='ctx'> 	bool wake_capable;</div><div class='ctx'> 	bool test_mode_capable;</div><div class='hunk'>@@ -386,16 +384,16 @@ struct sdw_slave_prop {</div><div class='ctx'> 	bool high_PHY_capable;</div><div class='ctx'> 	bool paging_support;</div><div class='ctx'> 	bool bank_delay_support;</div><div class='del'>-	enum sdw_p15_behave p15_behave;</div><div class='ctx'> 	bool lane_control_support;</div><div class='add'>+	enum sdw_p15_behave p15_behave;</div><div class='ctx'> 	u32 master_count;</div><div class='ctx'> 	u32 source_ports;</div><div class='ctx'> 	u32 sink_ports;</div><div class='del'>-	struct sdw_dp0_prop *dp0_prop;</div><div class='del'>-	struct sdw_dpn_prop *src_dpn_prop;</div><div class='del'>-	struct sdw_dpn_prop *sink_dpn_prop;</div><div class='del'>-	u8 scp_int1_mask;</div><div class='ctx'> 	u32 quirks;</div><div class='add'>+	u32 sdca_interrupt_register_list;</div><div class='add'>+	u8 commit_register_supported;</div><div class='add'>+	u8 scp_int1_mask;</div><div class='add'>+	u8 lane_maps[SDW_MAX_LANES];</div><div class='ctx'> 	bool clock_reg_supported;</div><div class='ctx'> 	bool use_domain_irq;</div><div class='ctx'> };</div><div class='hunk'>@@ -404,13 +402,14 @@ struct sdw_slave_prop {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct sdw_master_prop - Master properties</div><div class='add'>+ * @clk_gears: Clock gears supported</div><div class='add'>+ * @clk_freq: Clock frequencies supported, in Hz</div><div class='add'>+ * @quirks: bitmask identifying optional behavior beyond the scope of the MIPI specification</div><div class='ctx'>  * @revision: MIPI spec version of the implementation</div><div class='ctx'>  * @clk_stop_modes: Bitmap, bit N set when clock-stop-modeN supported</div><div class='ctx'>  * @max_clk_freq: Maximum Bus clock frequency, in Hz</div><div class='ctx'>  * @num_clk_gears: Number of clock gears supported</div><div class='del'>- * @clk_gears: Clock gears supported</div><div class='ctx'>  * @num_clk_freq: Number of clock frequencies supported, in Hz</div><div class='del'>- * @clk_freq: Clock frequencies supported, in Hz</div><div class='ctx'>  * @default_frame_rate: Controller default Frame rate, in Hz</div><div class='ctx'>  * @default_row: Number of rows</div><div class='ctx'>  * @default_col: Number of columns</div><div class='hunk'>@@ -419,24 +418,23 @@ struct sdw_slave_prop {</div><div class='ctx'>  * command</div><div class='ctx'>  * @mclk_freq: clock reference passed to SoundWire Master, in Hz.</div><div class='ctx'>  * @hw_disabled: if true, the Master is not functional, typically due to pin-mux</div><div class='del'>- * @quirks: bitmask identifying optional behavior beyond the scope of the MIPI specification</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_master_prop {</div><div class='add'>+	u32 *clk_gears;</div><div class='add'>+	u32 *clk_freq;</div><div class='add'>+	u64 quirks;</div><div class='ctx'> 	u32 revision;</div><div class='ctx'> 	u32 clk_stop_modes;</div><div class='ctx'> 	u32 max_clk_freq;</div><div class='ctx'> 	u32 num_clk_gears;</div><div class='del'>-	u32 *clk_gears;</div><div class='ctx'> 	u32 num_clk_freq;</div><div class='del'>-	u32 *clk_freq;</div><div class='ctx'> 	u32 default_frame_rate;</div><div class='ctx'> 	u32 default_row;</div><div class='ctx'> 	u32 default_col;</div><div class='del'>-	bool dynamic_frame;</div><div class='ctx'> 	u32 err_threshold;</div><div class='ctx'> 	u32 mclk_freq;</div><div class='add'>+	bool dynamic_frame;</div><div class='ctx'> 	bool hw_disabled;</div><div class='del'>-	u64 quirks;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Definitions for Master quirks */</div><div class='hunk'>@@ -461,6 +459,7 @@ struct sdw_master_prop {</div><div class='ctx'> </div><div class='ctx'> int sdw_master_read_prop(struct sdw_bus *bus);</div><div class='ctx'> int sdw_slave_read_prop(struct sdw_slave *slave);</div><div class='add'>+int sdw_slave_read_lane_mapping(struct sdw_slave *slave);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SDW Slave Structures and APIs</div><div class='hunk'>@@ -486,9 +485,9 @@ struct sdw_slave_id {</div><div class='ctx'> 	__u8 sdw_version:4;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sdw_extended_slave_id {</div><div class='del'>-	int link_id;</div><div class='del'>-	struct sdw_slave_id id;</div><div class='add'>+struct sdw_peripherals {</div><div class='add'>+	int num_peripherals;</div><div class='add'>+	struct sdw_slave *array[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -543,21 +542,6 @@ enum sdw_reg_bank {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct sdw_bus_conf: Bus configuration</div><div class='del'>- *</div><div class='del'>- * @clk_freq: Clock frequency, in Hz</div><div class='del'>- * @num_rows: Number of rows in frame</div><div class='del'>- * @num_cols: Number of columns in frame</div><div class='del'>- * @bank: Next register bank</div><div class='del'>- */</div><div class='del'>-struct sdw_bus_conf {</div><div class='del'>-	unsigned int clk_freq;</div><div class='del'>-	unsigned int num_rows;</div><div class='del'>-	unsigned int num_cols;</div><div class='del'>-	unsigned int bank;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * struct sdw_prepare_ch: Prepare/De-prepare Data Port channel</div><div class='ctx'>  *</div><div class='ctx'>  * @num: Port number</div><div class='hunk'>@@ -643,13 +627,13 @@ struct sdw_slave_ops {</div><div class='ctx'> 	int (*clk_stop)(struct sdw_slave *slave,</div><div class='ctx'> 			enum sdw_clk_stop_mode mode,</div><div class='ctx'> 			enum sdw_clk_stop_type type);</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct sdw_slave - SoundWire Slave</div><div class='ctx'>  * @id: MIPI device ID</div><div class='ctx'>  * @dev: Linux device</div><div class='add'>+ * @index: internal ID for this slave</div><div class='ctx'>  * @irq: IRQ number</div><div class='ctx'>  * @status: Status reported by the Slave</div><div class='ctx'>  * @bus: Bus handle</div><div class='hunk'>@@ -676,10 +660,12 @@ struct sdw_slave_ops {</div><div class='ctx'>  * @is_mockup_device: status flag used to squelch errors in the command/control</div><div class='ctx'>  * protocol for SoundWire mockup devices</div><div class='ctx'>  * @sdw_dev_lock: mutex used to protect callbacks/remove races</div><div class='add'>+ * @sdca_data: structure containing all device data for SDCA helpers</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_slave {</div><div class='ctx'> 	struct sdw_slave_id id;</div><div class='ctx'> 	struct device dev;</div><div class='add'>+	int index;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	enum sdw_slave_status status;</div><div class='ctx'> 	struct sdw_bus *bus;</div><div class='hunk'>@@ -699,6 +685,7 @@ struct sdw_slave {</div><div class='ctx'> 	bool first_interrupt_done;</div><div class='ctx'> 	bool is_mockup_device;</div><div class='ctx'> 	struct mutex sdw_dev_lock; /* protect callbacks/remove races */</div><div class='add'>+	struct sdca_device_data sdca_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define dev_to_sdw_dev(_dev) container_of(_dev, struct sdw_slave, dev)</div><div class='hunk'>@@ -717,10 +704,7 @@ struct sdw_master_device {</div><div class='ctx'> 	container_of(d, struct sdw_master_device, dev)</div><div class='ctx'> </div><div class='ctx'> struct sdw_driver {</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	int (*probe)(struct sdw_slave *sdw,</div><div class='del'>-			const struct sdw_device_id *id);</div><div class='add'>+	int (*probe)(struct sdw_slave *sdw, const struct sdw_device_id *id);</div><div class='ctx'> 	int (*remove)(struct sdw_slave *sdw);</div><div class='ctx'> 	void (*shutdown)(struct sdw_slave *sdw);</div><div class='ctx'> </div><div class='hunk'>@@ -739,7 +723,7 @@ struct sdw_driver {</div><div class='ctx'> 	SDW_SLAVE_ENTRY_EXT((_mfg_id), (_part_id), 0, 0, (_drv_data))</div><div class='ctx'> </div><div class='ctx'> int sdw_handle_slave_status(struct sdw_bus *bus,</div><div class='del'>-			enum sdw_slave_status status[]);</div><div class='add'>+			    enum sdw_slave_status status[]);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SDW master structures and APIs</div><div class='hunk'>@@ -821,31 +805,39 @@ struct sdw_enable_ch {</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_master_port_ops {</div><div class='ctx'> 	int (*dpn_set_port_params)(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_port_params *port_params,</div><div class='del'>-			unsigned int bank);</div><div class='add'>+				   struct sdw_port_params *port_params,</div><div class='add'>+				   unsigned int bank);</div><div class='ctx'> 	int (*dpn_set_port_transport_params)(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_transport_params *transport_params,</div><div class='del'>-			enum sdw_reg_bank bank);</div><div class='del'>-	int (*dpn_port_prep)(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_prepare_ch *prepare_ch);</div><div class='add'>+					     struct sdw_transport_params *transport_params,</div><div class='add'>+					     enum sdw_reg_bank bank);</div><div class='add'>+	int (*dpn_port_prep)(struct sdw_bus *bus, struct sdw_prepare_ch *prepare_ch);</div><div class='ctx'> 	int (*dpn_port_enable_ch)(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_enable_ch *enable_ch, unsigned int bank);</div><div class='add'>+				  struct sdw_enable_ch *enable_ch, unsigned int bank);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sdw_msg;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct sdw_defer - SDW deffered message</div><div class='del'>- * @length: message length</div><div class='add'>+ * struct sdw_defer - SDW deferred message</div><div class='ctx'>  * @complete: message completion</div><div class='ctx'>  * @msg: SDW message</div><div class='add'>+ * @length: message length</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_defer {</div><div class='add'>+	struct sdw_msg *msg;</div><div class='ctx'> 	int length;</div><div class='ctx'> 	struct completion complete;</div><div class='del'>-	struct sdw_msg *msg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Add a practical limit to BPT transfer sizes. BPT is typically used</div><div class='add'>+ * to transfer firmware, and larger firmware transfers will increase</div><div class='add'>+ * the cold latency beyond typical OS or user requirements.</div><div class='add'>+ */</div><div class='add'>+#define SDW_BPT_MSG_MAX_BYTES  (1024 * 1024)</div><div class='add'>+</div><div class='add'>+struct sdw_bpt_msg;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct sdw_master_ops - Master driver ops</div><div class='ctx'>  * @read_prop: Read Master properties</div><div class='hunk'>@@ -861,17 +853,18 @@ struct sdw_defer {</div><div class='ctx'>  * @get_device_num: Callback for vendor-specific device_number allocation</div><div class='ctx'>  * @put_device_num: Callback for vendor-specific device_number release</div><div class='ctx'>  * @new_peripheral_assigned: Callback to handle enumeration of new peripheral.</div><div class='add'>+ * @bpt_send_async: reserve resources for BPT stream and send message</div><div class='add'>+ * using BTP protocol</div><div class='add'>+ * @bpt_wait: wait for message completion using BTP protocol</div><div class='add'>+ * and release resources</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_master_ops {</div><div class='ctx'> 	int (*read_prop)(struct sdw_bus *bus);</div><div class='del'>-	u64 (*override_adr)</div><div class='del'>-			(struct sdw_bus *bus, u64 addr);</div><div class='del'>-	enum sdw_command_response (*xfer_msg)</div><div class='del'>-			(struct sdw_bus *bus, struct sdw_msg *msg);</div><div class='del'>-	enum sdw_command_response (*xfer_msg_defer)</div><div class='del'>-			(struct sdw_bus *bus);</div><div class='add'>+	u64 (*override_adr)(struct sdw_bus *bus, u64 addr);</div><div class='add'>+	enum sdw_command_response (*xfer_msg)(struct sdw_bus *bus, struct sdw_msg *msg);</div><div class='add'>+	enum sdw_command_response (*xfer_msg_defer)(struct sdw_bus *bus);</div><div class='ctx'> 	int (*set_bus_conf)(struct sdw_bus *bus,</div><div class='del'>-			struct sdw_bus_params *params);</div><div class='add'>+			    struct sdw_bus_params *params);</div><div class='ctx'> 	int (*pre_bank_switch)(struct sdw_bus *bus);</div><div class='ctx'> 	int (*post_bank_switch)(struct sdw_bus *bus);</div><div class='ctx'> 	u32 (*read_ping_status)(struct sdw_bus *bus);</div><div class='hunk'>@@ -880,70 +873,9 @@ struct sdw_master_ops {</div><div class='ctx'> 	void (*new_peripheral_assigned)(struct sdw_bus *bus,</div><div class='ctx'> 					struct sdw_slave *slave,</div><div class='ctx'> 					int dev_num);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct sdw_bus - SoundWire bus</div><div class='del'>- * @dev: Shortcut to &amp;bus-&gt;md-&gt;dev to avoid changing the entire code.</div><div class='del'>- * @md: Master device</div><div class='del'>- * @controller_id: system-unique controller ID. If set to -1, the bus @id will be used.</div><div class='del'>- * @link_id: Link id number, can be 0 to N, unique for each Controller</div><div class='del'>- * @id: bus system-wide unique id</div><div class='del'>- * @slaves: list of Slaves on this bus</div><div class='del'>- * @assigned: Bitmap for Slave device numbers.</div><div class='del'>- * Bit set implies used number, bit clear implies unused number.</div><div class='del'>- * @bus_lock: bus lock</div><div class='del'>- * @msg_lock: message lock</div><div class='del'>- * @compute_params: points to Bus resource management implementation</div><div class='del'>- * @ops: Master callback ops</div><div class='del'>- * @port_ops: Master port callback ops</div><div class='del'>- * @params: Current bus parameters</div><div class='del'>- * @prop: Master properties</div><div class='del'>- * @m_rt_list: List of Master instance of all stream(s) running on Bus. This</div><div class='del'>- * is used to compute and program bus bandwidth, clock, frame shape,</div><div class='del'>- * transport and port parameters</div><div class='del'>- * @debugfs: Bus debugfs</div><div class='del'>- * @domain: IRQ domain</div><div class='del'>- * @defer_msg: Defer message</div><div class='del'>- * @clk_stop_timeout: Clock stop timeout computed</div><div class='del'>- * @bank_switch_timeout: Bank switch timeout computed</div><div class='del'>- * @multi_link: Store bus property that indicates if multi links</div><div class='del'>- * are supported. This flag is populated by drivers after reading</div><div class='del'>- * appropriate firmware (ACPI/DT).</div><div class='del'>- * @hw_sync_min_links: Number of links used by a stream above which</div><div class='del'>- * hardware-based synchronization is required. This value is only</div><div class='del'>- * meaningful if multi_link is set. If set to 1, hardware-based</div><div class='del'>- * synchronization will be used even if a stream only uses a single</div><div class='del'>- * SoundWire segment.</div><div class='del'>- */</div><div class='del'>-struct sdw_bus {</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct sdw_master_device *md;</div><div class='del'>-	int controller_id;</div><div class='del'>-	unsigned int link_id;</div><div class='del'>-	int id;</div><div class='del'>-	struct list_head slaves;</div><div class='del'>-	DECLARE_BITMAP(assigned, SDW_MAX_DEVICES);</div><div class='del'>-	struct mutex bus_lock;</div><div class='del'>-	struct lock_class_key bus_lock_key;</div><div class='del'>-	struct mutex msg_lock;</div><div class='del'>-	struct lock_class_key msg_lock_key;</div><div class='del'>-	int (*compute_params)(struct sdw_bus *bus);</div><div class='del'>-	const struct sdw_master_ops *ops;</div><div class='del'>-	const struct sdw_master_port_ops *port_ops;</div><div class='del'>-	struct sdw_bus_params params;</div><div class='del'>-	struct sdw_master_prop prop;</div><div class='del'>-	struct list_head m_rt_list;</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-	struct dentry *debugfs;</div><div class='del'>-#endif</div><div class='del'>-	struct irq_chip irq_chip;</div><div class='del'>-	struct irq_domain *domain;</div><div class='del'>-	struct sdw_defer defer_msg;</div><div class='del'>-	unsigned int clk_stop_timeout;</div><div class='del'>-	u32 bank_switch_timeout;</div><div class='del'>-	bool multi_link;</div><div class='del'>-	int hw_sync_min_links;</div><div class='add'>+	int (*bpt_send_async)(struct sdw_bus *bus, struct sdw_slave *slave,</div><div class='add'>+			      struct sdw_bpt_msg *msg);</div><div class='add'>+	int (*bpt_wait)(struct sdw_bus *bus, struct sdw_slave *slave, struct sdw_bpt_msg *msg);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,</div><div class='hunk'>@@ -970,7 +902,7 @@ struct sdw_port_config {</div><div class='ctx'>  * @ch_count: Channel count of the stream</div><div class='ctx'>  * @bps: Number of bits per audio sample</div><div class='ctx'>  * @direction: Data direction</div><div class='del'>- * @type: Stream type PCM or PDM</div><div class='add'>+ * @type: Stream type PCM, PDM or BPT</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_stream_config {</div><div class='ctx'> 	unsigned int frame_rate;</div><div class='hunk'>@@ -1020,33 +952,113 @@ struct sdw_stream_params {</div><div class='ctx'>  * @name: SoundWire stream name</div><div class='ctx'>  * @params: Stream parameters</div><div class='ctx'>  * @state: Current state of the stream</div><div class='del'>- * @type: Stream type PCM or PDM</div><div class='add'>+ * @type: Stream type PCM, PDM or BPT</div><div class='add'>+ * @m_rt_count: Count of Master runtime(s) in this stream</div><div class='ctx'>  * @master_list: List of Master runtime(s) in this stream.</div><div class='ctx'>  * master_list can contain only one m_rt per Master instance</div><div class='ctx'>  * for a stream</div><div class='del'>- * @m_rt_count: Count of Master runtime(s) in this stream</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_stream_runtime {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	struct sdw_stream_params params;</div><div class='ctx'> 	enum sdw_stream_state state;</div><div class='ctx'> 	enum sdw_stream_type type;</div><div class='del'>-	struct list_head master_list;</div><div class='ctx'> 	int m_rt_count;</div><div class='add'>+	struct list_head master_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name);</div><div class='add'>+/**</div><div class='add'>+ * struct sdw_bus - SoundWire bus</div><div class='add'>+ * @dev: Shortcut to &amp;bus-&gt;md-&gt;dev to avoid changing the entire code.</div><div class='add'>+ * @md: Master device</div><div class='add'>+ * @bus_lock_key: bus lock key associated to @bus_lock</div><div class='add'>+ * @bus_lock: bus lock</div><div class='add'>+ * @slave_ida: IDA for allocating internal slave IDs</div><div class='add'>+ * @slaves: list of Slaves on this bus</div><div class='add'>+ * @msg_lock_key: message lock key associated to @msg_lock</div><div class='add'>+ * @msg_lock: message lock</div><div class='add'>+ * @m_rt_list: List of Master instance of all stream(s) running on Bus. This</div><div class='add'>+ * is used to compute and program bus bandwidth, clock, frame shape,</div><div class='add'>+ * transport and port parameters</div><div class='add'>+ * @defer_msg: Defer message</div><div class='add'>+ * @params: Current bus parameters</div><div class='add'>+ * @stream_refcount: number of streams currently using this bus</div><div class='add'>+ * @btp_stream_refcount: number of BTP streams currently using this bus (should</div><div class='add'>+ * be zero or one, multiple streams per link is not supported).</div><div class='add'>+ * @bpt_stream: pointer stored to handle BTP streams.</div><div class='add'>+ * @ops: Master callback ops</div><div class='add'>+ * @port_ops: Master port callback ops</div><div class='add'>+ * @prop: Master properties</div><div class='add'>+ * @vendor_specific_prop: pointer to non-standard properties</div><div class='add'>+ * @hw_sync_min_links: Number of links used by a stream above which</div><div class='add'>+ * hardware-based synchronization is required. This value is only</div><div class='add'>+ * meaningful if multi_link is set. If set to 1, hardware-based</div><div class='add'>+ * synchronization will be used even if a stream only uses a single</div><div class='add'>+ * SoundWire segment.</div><div class='add'>+ * @controller_id: system-unique controller ID. If set to -1, the bus @id will be used.</div><div class='add'>+ * @link_id: Link id number, can be 0 to N, unique for each Controller</div><div class='add'>+ * @id: bus system-wide unique id</div><div class='add'>+ * @compute_params: points to Bus resource management implementation</div><div class='add'>+ * @assigned: Bitmap for Slave device numbers.</div><div class='add'>+ * Bit set implies used number, bit clear implies unused number.</div><div class='add'>+ * @clk_stop_timeout: Clock stop timeout computed</div><div class='add'>+ * @bank_switch_timeout: Bank switch timeout computed</div><div class='add'>+ * @domain: IRQ domain</div><div class='add'>+ * @irq_chip: IRQ chip</div><div class='add'>+ * @debugfs: Bus debugfs (optional)</div><div class='add'>+ * @multi_link: Store bus property that indicates if multi links</div><div class='add'>+ * are supported. This flag is populated by drivers after reading</div><div class='add'>+ * appropriate firmware (ACPI/DT).</div><div class='add'>+ * @lane_used_bandwidth: how much bandwidth in bits per second is used by each lane</div><div class='add'>+ */</div><div class='add'>+struct sdw_bus {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct sdw_master_device *md;</div><div class='add'>+	struct lock_class_key bus_lock_key;</div><div class='add'>+	struct mutex bus_lock;</div><div class='add'>+	struct ida slave_ida;</div><div class='add'>+	struct list_head slaves;</div><div class='add'>+	struct lock_class_key msg_lock_key;</div><div class='add'>+	struct mutex msg_lock;</div><div class='add'>+	struct list_head m_rt_list;</div><div class='add'>+	struct sdw_defer defer_msg;</div><div class='add'>+	struct sdw_bus_params params;</div><div class='add'>+	int stream_refcount;</div><div class='add'>+	int bpt_stream_refcount;</div><div class='add'>+	struct sdw_stream_runtime *bpt_stream;</div><div class='add'>+	const struct sdw_master_ops *ops;</div><div class='add'>+	const struct sdw_master_port_ops *port_ops;</div><div class='add'>+	struct sdw_master_prop prop;</div><div class='add'>+	void *vendor_specific_prop;</div><div class='add'>+	int hw_sync_min_links;</div><div class='add'>+	int controller_id;</div><div class='add'>+	unsigned int link_id;</div><div class='add'>+	int id;</div><div class='add'>+	int (*compute_params)(struct sdw_bus *bus, struct sdw_stream_runtime *stream);</div><div class='add'>+	DECLARE_BITMAP(assigned, SDW_MAX_DEVICES);</div><div class='add'>+	unsigned int clk_stop_timeout;</div><div class='add'>+	u32 bank_switch_timeout;</div><div class='add'>+	struct irq_chip irq_chip;</div><div class='add'>+	struct irq_domain *domain;</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+	struct dentry *debugfs;</div><div class='add'>+#endif</div><div class='add'>+	bool multi_link;</div><div class='add'>+	unsigned int lane_used_bandwidth[SDW_MAX_LANES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name, enum sdw_stream_type type);</div><div class='ctx'> void sdw_release_stream(struct sdw_stream_runtime *stream);</div><div class='ctx'> </div><div class='del'>-int sdw_compute_params(struct sdw_bus *bus);</div><div class='add'>+int sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream);</div><div class='ctx'> </div><div class='ctx'> int sdw_stream_add_master(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_stream_config *stream_config,</div><div class='del'>-		const struct sdw_port_config *port_config,</div><div class='del'>-		unsigned int num_ports,</div><div class='del'>-		struct sdw_stream_runtime *stream);</div><div class='add'>+			  struct sdw_stream_config *stream_config,</div><div class='add'>+			  const struct sdw_port_config *port_config,</div><div class='add'>+			  unsigned int num_ports,</div><div class='add'>+			  struct sdw_stream_runtime *stream);</div><div class='ctx'> int sdw_stream_remove_master(struct sdw_bus *bus,</div><div class='del'>-		struct sdw_stream_runtime *stream);</div><div class='add'>+			     struct sdw_stream_runtime *stream);</div><div class='ctx'> int sdw_startup_stream(void *sdw_substream);</div><div class='ctx'> int sdw_prepare_stream(struct sdw_stream_runtime *stream);</div><div class='ctx'> int sdw_enable_stream(struct sdw_stream_runtime *stream);</div><div class='hunk'>@@ -1059,6 +1071,11 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus);</div><div class='ctx'> </div><div class='ctx'> int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id);</div><div class='ctx'> void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id);</div><div class='add'>+bool is_clock_scaling_supported_by_slave(struct sdw_slave *slave);</div><div class='add'>+</div><div class='add'>+int sdw_bpt_send_async(struct sdw_bus *bus, struct sdw_slave *slave, struct sdw_bpt_msg *msg);</div><div class='add'>+int sdw_bpt_wait(struct sdw_bus *bus, struct sdw_slave *slave, struct sdw_bpt_msg *msg);</div><div class='add'>+int sdw_bpt_send_sync(struct sdw_bus *bus, struct sdw_slave *slave, struct sdw_bpt_msg *msg);</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_SOUNDWIRE)</div><div class='ctx'> </div><div class='hunk'>@@ -1070,6 +1087,12 @@ int sdw_stream_add_slave(struct sdw_slave *slave,</div><div class='ctx'> int sdw_stream_remove_slave(struct sdw_slave *slave,</div><div class='ctx'> 			    struct sdw_stream_runtime *stream);</div><div class='ctx'> </div><div class='add'>+struct device *of_sdw_find_device_by_node(struct device_node *np);</div><div class='add'>+</div><div class='add'>+int sdw_slave_get_current_bank(struct sdw_slave *sdev);</div><div class='add'>+</div><div class='add'>+int sdw_slave_get_scale_index(struct sdw_slave *slave, u8 *base);</div><div class='add'>+</div><div class='ctx'> /* messaging and data APIs */</div><div class='ctx'> int sdw_read(struct sdw_slave *slave, u32 addr);</div><div class='ctx'> int sdw_write(struct sdw_slave *slave, u32 addr, u8 value);</div><div class='hunk'>@@ -1101,6 +1124,18 @@ static inline int sdw_stream_remove_slave(struct sdw_slave *slave,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct device *of_sdw_find_device_by_node(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	WARN_ONCE(1, "SoundWire API is disabled");</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sdw_slave_get_current_bank(struct sdw_slave *sdev)</div><div class='add'>+{</div><div class='add'>+	WARN_ONCE(1, "SoundWire API is disabled");</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* messaging and data APIs */</div><div class='ctx'> static inline int sdw_read(struct sdw_slave *slave, u32 addr)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/soundwire/sdw_amd.h b/include/linux/soundwire/sdw_amd.h<br/>index ceecad74aef9..fe31773d5210 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw_amd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw_amd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw_amd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soundwire/sdw_amd.h</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.</div><div class='add'>+ * Copyright (C) 2023-24 Advanced Micro Devices, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SDW_AMD_H</div><div class='ctx'> #define __SDW_AMD_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/soundwire/sdw.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* AMD pm_runtime quirk definitions */</div><div class='hunk'>@@ -25,19 +26,19 @@</div><div class='ctx'> #define AMD_SDW_POWER_OFF_MODE		2</div><div class='ctx'> #define ACP_SDW0	0</div><div class='ctx'> #define ACP_SDW1	1</div><div class='add'>+#define AMD_SDW_MAX_MANAGER_COUNT	2</div><div class='add'>+#define ACP63_PCI_REV_ID		0x63</div><div class='add'>+#define ACP70_PCI_REV_ID		0x70</div><div class='add'>+#define ACP71_PCI_REV_ID		0x71</div><div class='add'>+#define ACP72_PCI_REV_ID		0x72</div><div class='ctx'> </div><div class='ctx'> struct acp_sdw_pdata {</div><div class='ctx'> 	u16 instance;</div><div class='add'>+	u32 acp_rev;</div><div class='ctx'> 	/* mutex to protect acp common register access */</div><div class='ctx'> 	struct mutex *acp_sdw_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sdw_manager_reg_mask {</div><div class='del'>-	u32 sw_pad_enable_mask;</div><div class='del'>-	u32 sw_pad_pulldown_mask;</div><div class='del'>-	u32 acp_sdw_intr_mask;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct sdw_amd_dai_runtime: AMD sdw dai runtime  data</div><div class='ctx'>  *</div><div class='hunk'>@@ -59,10 +60,8 @@ struct sdw_amd_dai_runtime {</div><div class='ctx'>  * @dev: linux device</div><div class='ctx'>  * @mmio: SoundWire registers mmio base</div><div class='ctx'>  * @acp_mmio: acp registers mmio base</div><div class='del'>- * @reg_mask: register mask structure per manager instance</div><div class='ctx'>  * @amd_sdw_irq_thread: SoundWire manager irq workqueue</div><div class='ctx'>  * @amd_sdw_work: peripheral status work queue</div><div class='del'>- * @probe_work: SoundWire manager probe workqueue</div><div class='ctx'>  * @acp_sdw_lock: mutex to protect acp share register access</div><div class='ctx'>  * @status: peripheral devices status array</div><div class='ctx'>  * @num_din_ports: number of input ports</div><div class='hunk'>@@ -72,6 +71,7 @@ struct sdw_amd_dai_runtime {</div><div class='ctx'>  * @instance: SoundWire manager instance</div><div class='ctx'>  * @quirks: SoundWire manager quirks</div><div class='ctx'>  * @wake_en_mask: wake enable mask per SoundWire manager</div><div class='add'>+ * @acp_rev: acp pci device revision id</div><div class='ctx'>  * @clk_stopped: flag set to true when clock is stopped</div><div class='ctx'>  * @power_mode_mask: flag interprets amd SoundWire manager power mode</div><div class='ctx'>  * @dai_runtime_array: dai runtime array</div><div class='hunk'>@@ -83,10 +83,8 @@ struct amd_sdw_manager {</div><div class='ctx'> 	void __iomem *mmio;</div><div class='ctx'> 	void __iomem *acp_mmio;</div><div class='ctx'> </div><div class='del'>-	struct sdw_manager_reg_mask *reg_mask;</div><div class='ctx'> 	struct work_struct amd_sdw_irq_thread;</div><div class='ctx'> 	struct work_struct amd_sdw_work;</div><div class='del'>-	struct work_struct probe_work;</div><div class='ctx'> 	/* mutex to protect acp common register access */</div><div class='ctx'> 	struct mutex *acp_sdw_lock;</div><div class='ctx'> </div><div class='hunk'>@@ -102,8 +100,75 @@ struct amd_sdw_manager {</div><div class='ctx'> 	u32 quirks;</div><div class='ctx'> 	u32 wake_en_mask;</div><div class='ctx'> 	u32 power_mode_mask;</div><div class='add'>+	u32 acp_rev;</div><div class='ctx'> 	bool clk_stopped;</div><div class='ctx'> </div><div class='ctx'> 	struct sdw_amd_dai_runtime **dai_runtime_array;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sdw_amd_acpi_info - Soundwire AMD information found in ACPI tables</div><div class='add'>+ * @handle: ACPI controller handle</div><div class='add'>+ * @count: maximum no of soundwire manager links supported on AMD platform.</div><div class='add'>+ * @link_mask: bit-wise mask listing links enabled by BIOS menu</div><div class='add'>+ */</div><div class='add'>+struct sdw_amd_acpi_info {</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	int count;</div><div class='add'>+	u32 link_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sdw_amd_ctx - context allocated by the controller driver probe</div><div class='add'>+ *</div><div class='add'>+ * @count: link count</div><div class='add'>+ * @link_mask: bit-wise mask listing SoundWire links reported by the</div><div class='add'>+ * Controller</div><div class='add'>+ * @pdev: platform device structure</div><div class='add'>+ * @peripherals: array representing Peripherals exposed across all enabled links</div><div class='add'>+ */</div><div class='add'>+struct sdw_amd_ctx {</div><div class='add'>+	int count;</div><div class='add'>+	u32 link_mask;</div><div class='add'>+	struct platform_device *pdev[AMD_SDW_MAX_MANAGER_COUNT];</div><div class='add'>+	struct sdw_peripherals *peripherals;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct sdw_amd_res - Soundwire AMD global resource structure,</div><div class='add'>+ * typically populated by the DSP driver/Legacy driver</div><div class='add'>+ *</div><div class='add'>+ * @acp_rev: acp pci device revision id</div><div class='add'>+ * @addr: acp pci device resource start address</div><div class='add'>+ * @reg_range: ACP register range</div><div class='add'>+ * @link_mask: bit-wise mask listing links selected by the DSP driver/</div><div class='add'>+ * legacy driver</div><div class='add'>+ * @count: link count</div><div class='add'>+ * @mmio_base: mmio base of SoundWire registers</div><div class='add'>+ * @handle: ACPI parent handle</div><div class='add'>+ * @parent: parent device</div><div class='add'>+ * @dev: device implementing hwparams and free callbacks</div><div class='add'>+ * @acp_lock: mutex protecting acp common registers access</div><div class='add'>+ */</div><div class='add'>+struct sdw_amd_res {</div><div class='add'>+	u32 acp_rev;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 reg_range;</div><div class='add'>+	u32 link_mask;</div><div class='add'>+	int count;</div><div class='add'>+	void __iomem *mmio_base;</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	struct device *parent;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	/* use to protect acp common registers access */</div><div class='add'>+	struct mutex *acp_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sdw_amd_probe(struct sdw_amd_res *res, struct sdw_amd_ctx **ctx);</div><div class='add'>+</div><div class='add'>+void sdw_amd_exit(struct sdw_amd_ctx *ctx);</div><div class='add'>+</div><div class='add'>+int sdw_amd_get_slave_info(struct sdw_amd_ctx *ctx);</div><div class='add'>+</div><div class='add'>+int amd_sdw_scan_controller(struct sdw_amd_acpi_info *info);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/sdw_intel.h<br/>index 00bb22d96ae5..9c9435009537 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw_intel.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw_intel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw_intel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soundwire/sdw_intel.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #ifndef __SDW_INTEL_H</div><div class='ctx'> #define __SDW_INTEL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/irqreturn.h&gt;</div><div class='ctx'> #include &lt;linux/soundwire/sdw.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -22,6 +23,7 @@</div><div class='ctx'> /* LCAP */</div><div class='ctx'> #define SDW_SHIM_LCAP			0x0</div><div class='ctx'> #define SDW_SHIM_LCAP_LCOUNT_MASK	GENMASK(2, 0)</div><div class='add'>+#define SDW_SHIM_LCAP_MLCS_MASK		BIT(8)</div><div class='ctx'> </div><div class='ctx'> /* LCTL */</div><div class='ctx'> #define SDW_SHIM_LCTL			0x4</div><div class='hunk'>@@ -30,12 +32,18 @@</div><div class='ctx'> #define SDW_SHIM_LCTL_SPA_MASK		GENMASK(3, 0)</div><div class='ctx'> #define SDW_SHIM_LCTL_CPA		BIT(8)</div><div class='ctx'> #define SDW_SHIM_LCTL_CPA_MASK		GENMASK(11, 8)</div><div class='add'>+#define SDW_SHIM_LCTL_MLCS_MASK		GENMASK(29, 27)</div><div class='add'>+#define SDW_SHIM_MLCS_XTAL_CLK		0x0</div><div class='add'>+#define SDW_SHIM_MLCS_CARDINAL_CLK	0x1</div><div class='add'>+#define SDW_SHIM_MLCS_AUDIO_PLL_CLK	0x2</div><div class='ctx'> </div><div class='ctx'> /* SYNC */</div><div class='ctx'> #define SDW_SHIM_SYNC			0xC</div><div class='ctx'> </div><div class='del'>-#define SDW_SHIM_SYNC_SYNCPRD_VAL_24	(24000 / SDW_CADENCE_GSYNC_KHZ - 1)</div><div class='del'>-#define SDW_SHIM_SYNC_SYNCPRD_VAL_38_4	(38400 / SDW_CADENCE_GSYNC_KHZ - 1)</div><div class='add'>+#define SDW_SHIM_SYNC_SYNCPRD_VAL_24		(24000 / SDW_CADENCE_GSYNC_KHZ - 1)</div><div class='add'>+#define SDW_SHIM_SYNC_SYNCPRD_VAL_24_576	(24576 / SDW_CADENCE_GSYNC_KHZ - 1)</div><div class='add'>+#define SDW_SHIM_SYNC_SYNCPRD_VAL_38_4		(38400 / SDW_CADENCE_GSYNC_KHZ - 1)</div><div class='add'>+#define SDW_SHIM_SYNC_SYNCPRD_VAL_96		(96000 / SDW_CADENCE_GSYNC_KHZ - 1)</div><div class='ctx'> #define SDW_SHIM_SYNC_SYNCPRD		GENMASK(14, 0)</div><div class='ctx'> #define SDW_SHIM_SYNC_SYNCCPU		BIT(15)</div><div class='ctx'> #define SDW_SHIM_SYNC_CMDSYNC_MASK	GENMASK(19, 16)</div><div class='hunk'>@@ -175,6 +183,14 @@</div><div class='ctx'> #define SDW_SHIM2_INTEL_VS_ACTMCTL_DODSE	BIT(2)</div><div class='ctx'> #define SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS	GENMASK(4, 3)</div><div class='ctx'> #define SDW_SHIM2_INTEL_VS_ACTMCTL_DOAISE	BIT(5)</div><div class='add'>+#define SDW_SHIM3_INTEL_VS_ACTMCTL_CLSS		BIT(6)</div><div class='add'>+#define SDW_SHIM3_INTEL_VS_ACTMCTL_CLDS		GENMASK(11, 7)</div><div class='add'>+#define SDW_SHIM3_INTEL_VS_ACTMCTL_DODSE2	GENMASK(13, 12)</div><div class='add'>+#define SDW_SHIM3_INTEL_VS_ACTMCTL_DOAISE2	BIT(14)</div><div class='add'>+#define SDW_SHIM3_INTEL_VS_ACTMCTL_CLDE		BIT(15)</div><div class='add'>+</div><div class='add'>+/* ACE3+ Mic privacy control and status register */</div><div class='add'>+#define SDW_SHIM2_INTEL_VS_PVCCS		0x10</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct sdw_intel_stream_params_data: configuration passed during</div><div class='hunk'>@@ -215,7 +231,7 @@ struct sdw_intel_ops {</div><div class='ctx'> /**</div><div class='ctx'>  * struct sdw_intel_acpi_info - Soundwire Intel information found in ACPI tables</div><div class='ctx'>  * @handle: ACPI controller handle</div><div class='del'>- * @count: link count found with "sdw-master-count" property</div><div class='add'>+ * @count: link count found with "sdw-master-count" or "sdw-manager-list" property</div><div class='ctx'>  * @link_mask: bit-wise mask listing links enabled by BIOS menu</div><div class='ctx'>  *</div><div class='ctx'>  * this structure could be expanded to e.g. provide all the _ADR</div><div class='hunk'>@@ -274,31 +290,28 @@ struct hdac_bus;</div><div class='ctx'>  * hardware capabilities after all power dependencies are settled.</div><div class='ctx'>  * @link_mask: bit-wise mask listing SoundWire links reported by the</div><div class='ctx'>  * Controller</div><div class='del'>- * @num_slaves: total number of devices exposed across all enabled links</div><div class='ctx'>  * @handle: ACPI parent handle</div><div class='ctx'>  * @ldev: information for each link (controller-specific and kept</div><div class='ctx'>  * opaque here)</div><div class='del'>- * @ids: array of slave_id, representing Slaves exposed across all enabled</div><div class='del'>- * links</div><div class='ctx'>  * @link_list: list to handle interrupts across all links</div><div class='ctx'>  * @shim_lock: mutex to handle concurrent rmw access to shared SHIM registers.</div><div class='ctx'>  * @shim_mask: flags to track initialization of SHIM shared registers</div><div class='ctx'>  * @shim_base: sdw shim base.</div><div class='ctx'>  * @alh_base: sdw alh base.</div><div class='add'>+ * @peripherals: array representing Peripherals exposed across all enabled links</div><div class='ctx'>  */</div><div class='ctx'> struct sdw_intel_ctx {</div><div class='ctx'> 	int count;</div><div class='ctx'> 	void __iomem *mmio_base;</div><div class='ctx'> 	u32 link_mask;</div><div class='del'>-	int num_slaves;</div><div class='ctx'> 	acpi_handle handle;</div><div class='ctx'> 	struct sdw_intel_link_dev **ldev;</div><div class='del'>-	struct sdw_extended_slave_id *ids;</div><div class='ctx'> 	struct list_head link_list;</div><div class='ctx'> 	struct mutex shim_lock; /* lock for access to shared SHIM registers */</div><div class='ctx'> 	u32 shim_mask;</div><div class='ctx'> 	u32 shim_base;</div><div class='ctx'> 	u32 alh_base;</div><div class='add'>+	struct sdw_peripherals *peripherals;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -321,6 +334,7 @@ struct sdw_intel_ctx {</div><div class='ctx'>  * @shim_base: sdw shim base.</div><div class='ctx'>  * @alh_base: sdw alh base.</div><div class='ctx'>  * @ext: extended HDaudio link support</div><div class='add'>+ * @mic_privacy: ACE version supports microphone privacy</div><div class='ctx'>  * @hbus: hdac_bus pointer, needed for power management</div><div class='ctx'>  * @eml_lock: mutex protecting shared registers in the HDaudio multi-link</div><div class='ctx'>  * space</div><div class='hunk'>@@ -339,6 +353,7 @@ struct sdw_intel_res {</div><div class='ctx'> 	u32 shim_base;</div><div class='ctx'> 	u32 alh_base;</div><div class='ctx'> 	bool ext;</div><div class='add'>+	bool mic_privacy;</div><div class='ctx'> 	struct hdac_bus *hbus;</div><div class='ctx'> 	struct mutex *eml_lock;</div><div class='ctx'> };</div><div class='hunk'>@@ -355,7 +370,7 @@ struct sdw_intel_res {</div><div class='ctx'>  * on e.g. which machine driver to select (I2S mode, HDaudio or</div><div class='ctx'>  * SoundWire).</div><div class='ctx'>  */</div><div class='del'>-int sdw_intel_acpi_scan(acpi_handle *parent_handle,</div><div class='add'>+int sdw_intel_acpi_scan(acpi_handle parent_handle,</div><div class='ctx'> 			struct sdw_intel_acpi_info *info);</div><div class='ctx'> </div><div class='ctx'> void sdw_intel_process_wakeen_event(struct sdw_intel_ctx *ctx);</div><div class='hunk'>@@ -376,6 +391,7 @@ struct sdw_intel;</div><div class='ctx'> /* struct intel_sdw_hw_ops - SoundWire ops for Intel platforms.</div><div class='ctx'>  * @debugfs_init: initialize all debugfs capabilities</div><div class='ctx'>  * @debugfs_exit: close and cleanup debugfs capabilities</div><div class='add'>+ * @get_link_count: fetch link count from hardware registers</div><div class='ctx'>  * @register_dai: read all PDI information and register DAIs</div><div class='ctx'>  * @check_clock_stop: throw error message if clock is not stopped.</div><div class='ctx'>  * @start_bus: normal start</div><div class='hunk'>@@ -400,6 +416,8 @@ struct sdw_intel_hw_ops {</div><div class='ctx'> 	void (*debugfs_init)(struct sdw_intel *sdw);</div><div class='ctx'> 	void (*debugfs_exit)(struct sdw_intel *sdw);</div><div class='ctx'> </div><div class='add'>+	int (*get_link_count)(struct sdw_intel *sdw);</div><div class='add'>+</div><div class='ctx'> 	int (*register_dai)(struct sdw_intel *sdw);</div><div class='ctx'> </div><div class='ctx'> 	void (*check_clock_stop)(struct sdw_intel *sdw);</div><div class='hunk'>@@ -423,6 +441,10 @@ struct sdw_intel_hw_ops {</div><div class='ctx'> 	bool (*sync_check_cmdsync_unlocked)(struct sdw_intel *sdw);</div><div class='ctx'> </div><div class='ctx'> 	void (*program_sdi)(struct sdw_intel *sdw, int dev_num);</div><div class='add'>+</div><div class='add'>+	int (*bpt_send_async)(struct sdw_intel *sdw, struct sdw_slave *slave,</div><div class='add'>+			      struct sdw_bpt_msg *msg);</div><div class='add'>+	int (*bpt_wait)(struct sdw_intel *sdw, struct sdw_slave *slave, struct sdw_bpt_msg *msg);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct sdw_intel_hw_ops sdw_intel_cnl_hw_ops;</div><div class='hunk'>@@ -435,4 +457,9 @@ extern const struct sdw_intel_hw_ops sdw_intel_lnl_hw_ops;</div><div class='ctx'> </div><div class='ctx'> #define SDW_INTEL_DEV_NUM_IDA_MIN           6</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Max number of links supported in hardware</div><div class='add'>+ */</div><div class='add'>+#define SDW_INTEL_MAX_LINKS                5</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/soundwire/sdw_registers.h b/include/linux/soundwire/sdw_registers.h<br/>index 138bec908c40..cae8a0a5a9b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw_registers.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw_registers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw_registers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soundwire/sdw_registers.h</a></div><div class='hunk'>@@ -4,6 +4,9 @@</div><div class='ctx'> #ifndef __SDW_REGISTERS_H</div><div class='ctx'> #define __SDW_REGISTERS_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * SDW registers as defined by MIPI 1.2 Spec</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,7 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SDW_REG_NO_PAGE				0x00008000</div><div class='ctx'> #define SDW_REG_OPTIONAL_PAGE			0x00010000</div><div class='del'>-#define SDW_REG_MAX				0x80000000</div><div class='add'>+#define SDW_REG_MAX				0x48000000</div><div class='ctx'> </div><div class='ctx'> #define SDW_DPN_SIZE				0x100</div><div class='ctx'> #define SDW_BANK1_OFFSET			0x10</div><div class='hunk'>@@ -329,16 +332,29 @@</div><div class='ctx'>  *	2:0		Control Number[2:0]</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define SDW_SDCA_CTL(fun, ent, ctl, ch)		(BIT(30) |			\</div><div class='del'>-						 (((fun) &amp; 0x7) &lt;&lt; 22) |	\</div><div class='del'>-						 (((ent) &amp; 0x40) &lt;&lt; 15) |	\</div><div class='del'>-						 (((ent) &amp; 0x3f) &lt;&lt; 7) |	\</div><div class='del'>-						 (((ctl) &amp; 0x30) &lt;&lt; 15) |	\</div><div class='del'>-						 (((ctl) &amp; 0x0f) &lt;&lt; 3) |	\</div><div class='del'>-						 (((ch) &amp; 0x38) &lt;&lt; 12) |	\</div><div class='del'>-						 ((ch) &amp; 0x07))</div><div class='add'>+#define SDW_SDCA_CTL(fun, ent, ctl, ch)		(BIT(30) |				\</div><div class='add'>+						 (((fun) &amp; GENMASK(2, 0)) &lt;&lt; 22) |	\</div><div class='add'>+						 (((ent) &amp; BIT(6)) &lt;&lt; 15) |		\</div><div class='add'>+						 (((ent) &amp; GENMASK(5, 0)) &lt;&lt; 7) |	\</div><div class='add'>+						 (((ctl) &amp; GENMASK(5, 4)) &lt;&lt; 15) |	\</div><div class='add'>+						 (((ctl) &amp; GENMASK(3, 0)) &lt;&lt; 3) |	\</div><div class='add'>+						 (((ch) &amp; GENMASK(5, 3)) &lt;&lt; 12) |	\</div><div class='add'>+						 ((ch) &amp; GENMASK(2, 0)))</div><div class='add'>+</div><div class='add'>+#define SDW_SDCA_CTL_FUNC(reg) FIELD_GET(GENMASK(24, 22), (reg))</div><div class='add'>+#define SDW_SDCA_CTL_ENT(reg) ((FIELD_GET(BIT(21), (reg)) &lt;&lt; 6) | \</div><div class='add'>+				FIELD_GET(GENMASK(12, 7), (reg)))</div><div class='add'>+#define SDW_SDCA_CTL_CSEL(reg) ((FIELD_GET(GENMASK(20, 19), (reg)) &lt;&lt; 4) | \</div><div class='add'>+				 FIELD_GET(GENMASK(6, 3), (reg)))</div><div class='add'>+#define SDW_SDCA_CTL_CNUM(reg) ((FIELD_GET(GENMASK(17, 15), (reg)) &lt;&lt; 3) | \</div><div class='add'>+				 FIELD_GET(GENMASK(2, 0), (reg)))</div><div class='ctx'> </div><div class='ctx'> #define SDW_SDCA_MBQ_CTL(reg)			((reg) | BIT(13))</div><div class='ctx'> #define SDW_SDCA_NEXT_CTL(reg)			((reg) | BIT(14))</div><div class='ctx'> </div><div class='add'>+/* Check the reserved and fixed bits in address */</div><div class='add'>+#define SDW_SDCA_VALID_CTL(reg) (((reg) &amp; (GENMASK(31, 25) | BIT(18) | BIT(13))) == BIT(30))</div><div class='add'>+</div><div class='add'>+#define SDW_SDCA_MAX_REGISTER			0x47FFFFFF</div><div class='add'>+</div><div class='ctx'> #endif /* __SDW_REGISTERS_H */</div><div class='head'>diff --git a/include/linux/soundwire/sdw_type.h b/include/linux/soundwire/sdw_type.h<br/>index d8c27f1e5559..d405935a45fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw_type.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/soundwire/sdw_type.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/soundwire/sdw_type.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/soundwire/sdw_type.h</a></div><div class='hunk'>@@ -4,16 +4,16 @@</div><div class='ctx'> #ifndef __SOUNDWIRE_TYPES_H</div><div class='ctx'> #define __SOUNDWIRE_TYPES_H</div><div class='ctx'> </div><div class='del'>-extern struct bus_type sdw_bus_type;</div><div class='del'>-extern struct device_type sdw_slave_type;</div><div class='del'>-extern struct device_type sdw_master_type;</div><div class='add'>+extern const struct bus_type sdw_bus_type;</div><div class='add'>+extern const struct device_type sdw_slave_type;</div><div class='add'>+extern const struct device_type sdw_master_type;</div><div class='ctx'> </div><div class='ctx'> static inline int is_sdw_slave(const struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dev-&gt;type == &amp;sdw_slave_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define drv_to_sdw_driver(_drv) container_of(_drv, struct sdw_driver, driver)</div><div class='add'>+#define drv_to_sdw_driver(_drv) container_of_const(_drv, struct sdw_driver, driver)</div><div class='ctx'> </div><div class='ctx'> #define sdw_register_driver(drv) \</div><div class='ctx'> 	__sdw_register_driver(drv, THIS_MODULE)</div><div class='head'>diff --git a/include/linux/spi/offload/consumer.h b/include/linux/spi/offload/consumer.h<br/>new file mode 100644<br/>index 000000000000..cd7d5daa21e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spi/offload/consumer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spi/offload/consumer.h</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Analog Devices Inc.</div><div class='add'>+ * Copyright (C) 2024 BayLibre, SAS</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_SPI_OFFLOAD_CONSUMER_H</div><div class='add'>+#define __LINUX_SPI_OFFLOAD_CONSUMER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/spi/offload/types.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("SPI_OFFLOAD");</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct spi_device;</div><div class='add'>+</div><div class='add'>+struct spi_offload *devm_spi_offload_get(struct device *dev, struct spi_device *spi,</div><div class='add'>+					 const struct spi_offload_config *config);</div><div class='add'>+</div><div class='add'>+struct spi_offload_trigger</div><div class='add'>+*devm_spi_offload_trigger_get(struct device *dev,</div><div class='add'>+			      struct spi_offload *offload,</div><div class='add'>+			      enum spi_offload_trigger_type type);</div><div class='add'>+int spi_offload_trigger_validate(struct spi_offload_trigger *trigger,</div><div class='add'>+				 struct spi_offload_trigger_config *config);</div><div class='add'>+int spi_offload_trigger_enable(struct spi_offload *offload,</div><div class='add'>+			       struct spi_offload_trigger *trigger,</div><div class='add'>+			       struct spi_offload_trigger_config *config);</div><div class='add'>+void spi_offload_trigger_disable(struct spi_offload *offload,</div><div class='add'>+				 struct spi_offload_trigger *trigger);</div><div class='add'>+</div><div class='add'>+struct dma_chan *devm_spi_offload_tx_stream_request_dma_chan(struct device *dev,</div><div class='add'>+							     struct spi_offload *offload);</div><div class='add'>+struct dma_chan *devm_spi_offload_rx_stream_request_dma_chan(struct device *dev,</div><div class='add'>+							     struct spi_offload *offload);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_SPI_OFFLOAD_CONSUMER_H */</div><div class='head'>diff --git a/include/linux/spi/offload/provider.h b/include/linux/spi/offload/provider.h<br/>new file mode 100644<br/>index 000000000000..76c7cf651092<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spi/offload/provider.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spi/offload/provider.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Analog Devices Inc.</div><div class='add'>+ * Copyright (C) 2024 BayLibre, SAS</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_SPI_OFFLOAD_PROVIDER_H</div><div class='add'>+#define __LINUX_SPI_OFFLOAD_PROVIDER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/spi/offload/types.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("SPI_OFFLOAD");</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+struct spi_offload_trigger;</div><div class='add'>+</div><div class='add'>+struct spi_offload *devm_spi_offload_alloc(struct device *dev, size_t priv_size);</div><div class='add'>+</div><div class='add'>+struct spi_offload_trigger_ops {</div><div class='add'>+	bool (*match)(struct spi_offload_trigger *trigger,</div><div class='add'>+		      enum spi_offload_trigger_type type, u64 *args, u32 nargs);</div><div class='add'>+	int (*request)(struct spi_offload_trigger *trigger,</div><div class='add'>+		       enum spi_offload_trigger_type type, u64 *args, u32 nargs);</div><div class='add'>+	void (*release)(struct spi_offload_trigger *trigger);</div><div class='add'>+	int (*validate)(struct spi_offload_trigger *trigger,</div><div class='add'>+			struct spi_offload_trigger_config *config);</div><div class='add'>+	int (*enable)(struct spi_offload_trigger *trigger,</div><div class='add'>+		      struct spi_offload_trigger_config *config);</div><div class='add'>+	void (*disable)(struct spi_offload_trigger *trigger);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct spi_offload_trigger_info {</div><div class='add'>+	/** @fwnode: Provider fwnode, used to match to consumer. */</div><div class='add'>+	struct fwnode_handle *fwnode;</div><div class='add'>+	/** @ops: Provider-specific callbacks. */</div><div class='add'>+	const struct spi_offload_trigger_ops *ops;</div><div class='add'>+	/** Provider-specific state to be used in callbacks. */</div><div class='add'>+	void *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int devm_spi_offload_trigger_register(struct device *dev,</div><div class='add'>+				      struct spi_offload_trigger_info *info);</div><div class='add'>+void *spi_offload_trigger_get_priv(struct spi_offload_trigger *trigger);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_SPI_OFFLOAD_PROVIDER_H */</div><div class='head'>diff --git a/include/linux/spi/offload/types.h b/include/linux/spi/offload/types.h<br/>new file mode 100644<br/>index 000000000000..cd61f8adb7a5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spi/offload/types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spi/offload/types.h</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Analog Devices Inc.</div><div class='add'>+ * Copyright (C) 2024 BayLibre, SAS</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_SPI_OFFLOAD_TYPES_H</div><div class='add'>+#define __LINUX_SPI_OFFLOAD_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+/* This is write xfer but TX uses external data stream rather than tx_buf. */</div><div class='add'>+#define SPI_OFFLOAD_XFER_TX_STREAM	BIT(0)</div><div class='add'>+/* This is read xfer but RX uses external data stream rather than rx_buf. */</div><div class='add'>+#define SPI_OFFLOAD_XFER_RX_STREAM	BIT(1)</div><div class='add'>+</div><div class='add'>+/* Offload can be triggered by external hardware event. */</div><div class='add'>+#define SPI_OFFLOAD_CAP_TRIGGER			BIT(0)</div><div class='add'>+/* Offload can record and then play back TX data when triggered. */</div><div class='add'>+#define SPI_OFFLOAD_CAP_TX_STATIC_DATA		BIT(1)</div><div class='add'>+/* Offload can get TX data from an external stream source. */</div><div class='add'>+#define SPI_OFFLOAD_CAP_TX_STREAM_DMA		BIT(2)</div><div class='add'>+/* Offload can send RX data to an external stream sink. */</div><div class='add'>+#define SPI_OFFLOAD_CAP_RX_STREAM_DMA		BIT(3)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct spi_offload_config - offload configuration</div><div class='add'>+ *</div><div class='add'>+ * This is used to request an offload with specific configuration.</div><div class='add'>+ */</div><div class='add'>+struct spi_offload_config {</div><div class='add'>+	/** @capability_flags: required capabilities. See %SPI_OFFLOAD_CAP_* */</div><div class='add'>+	u32 capability_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct spi_offload - offload instance</div><div class='add'>+ */</div><div class='add'>+struct spi_offload {</div><div class='add'>+	/** @provider_dev: for get/put reference counting */</div><div class='add'>+	struct device *provider_dev;</div><div class='add'>+	/** @priv: provider driver private data */</div><div class='add'>+	void *priv;</div><div class='add'>+	/** @ops: callbacks for offload support */</div><div class='add'>+	const struct spi_offload_ops *ops;</div><div class='add'>+	/** @xfer_flags: %SPI_OFFLOAD_XFER_* flags supported by provider */</div><div class='add'>+	u32 xfer_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum spi_offload_trigger_type {</div><div class='add'>+	/* Indication from SPI peripheral that data is read to read. */</div><div class='add'>+	SPI_OFFLOAD_TRIGGER_DATA_READY,</div><div class='add'>+	/* Trigger comes from a periodic source such as a clock. */</div><div class='add'>+	SPI_OFFLOAD_TRIGGER_PERIODIC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * spi_offload_trigger_periodic - configuration parameters for periodic triggers</div><div class='add'>+ * @frequency_hz: The rate that the trigger should fire in Hz.</div><div class='add'>+ * @offset_ns: A delay in nanoseconds between when this trigger fires</div><div class='add'>+ *	       compared to another trigger. This requires specialized hardware</div><div class='add'>+ *	       that supports such synchronization with a delay between two or</div><div class='add'>+ *	       more triggers. Set to 0 when not needed.</div><div class='add'>+ */</div><div class='add'>+struct spi_offload_trigger_periodic {</div><div class='add'>+	u64 frequency_hz;</div><div class='add'>+	u64 offset_ns;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct spi_offload_trigger_config {</div><div class='add'>+	/** @type: type discriminator for union */</div><div class='add'>+	enum spi_offload_trigger_type type;</div><div class='add'>+	union {</div><div class='add'>+		struct spi_offload_trigger_periodic periodic;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct spi_offload_ops - callbacks implemented by offload providers</div><div class='add'>+ */</div><div class='add'>+struct spi_offload_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * @trigger_enable: Optional callback to enable the trigger for the</div><div class='add'>+	 * given offload instance.</div><div class='add'>+	 */</div><div class='add'>+	int (*trigger_enable)(struct spi_offload *offload);</div><div class='add'>+	/**</div><div class='add'>+	 * @trigger_disable: Optional callback to disable the trigger for the</div><div class='add'>+	 * given offload instance.</div><div class='add'>+	 */</div><div class='add'>+	void (*trigger_disable)(struct spi_offload *offload);</div><div class='add'>+	/**</div><div class='add'>+	 * @tx_stream_request_dma_chan: Optional callback for controllers that</div><div class='add'>+	 * have an offload where the TX data stream is connected directly to a</div><div class='add'>+	 * DMA channel.</div><div class='add'>+	 */</div><div class='add'>+	struct dma_chan *(*tx_stream_request_dma_chan)(struct spi_offload *offload);</div><div class='add'>+	/**</div><div class='add'>+	 * @rx_stream_request_dma_chan: Optional callback for controllers that</div><div class='add'>+	 * have an offload where the RX data stream is connected directly to a</div><div class='add'>+	 * DMA channel.</div><div class='add'>+	 */</div><div class='add'>+	struct dma_chan *(*rx_stream_request_dma_chan)(struct spi_offload *offload);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_SPI_OFFLOAD_TYPES_H */</div><div class='head'>diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h<br/>deleted file mode 100644<br/>index ca2cd4e30ead..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spi/pxa2xx_spi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/pxa2xx_spi.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2005 Stephen Street / StreetFire Sound Labs</div><div class='del'>- */</div><div class='del'>-#ifndef __LINUX_SPI_PXA2XX_SPI_H</div><div class='del'>-#define __LINUX_SPI_PXA2XX_SPI_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/dmaengine.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/pxa2xx_ssp.h&gt;</div><div class='del'>-</div><div class='del'>-struct dma_chan;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The platform data for SSP controller devices</div><div class='del'>- * (resides in device.platform_data).</div><div class='del'>- */</div><div class='del'>-struct pxa2xx_spi_controller {</div><div class='del'>-	u16 num_chipselect;</div><div class='del'>-	u8 enable_dma;</div><div class='del'>-	u8 dma_burst_size;</div><div class='del'>-	bool is_target;</div><div class='del'>-</div><div class='del'>-	/* DMA engine specific config */</div><div class='del'>-	dma_filter_fn dma_filter;</div><div class='del'>-	void *tx_param;</div><div class='del'>-	void *rx_param;</div><div class='del'>-</div><div class='del'>-	/* For non-PXA arches */</div><div class='del'>-	struct ssp_device ssp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The controller specific data for SPI target devices</div><div class='del'>- * (resides in spi_board_info.controller_data),</div><div class='del'>- * copied to spi_device.platform_data ... mostly for</div><div class='del'>- * DMA tuning.</div><div class='del'>- */</div><div class='del'>-struct pxa2xx_spi_chip {</div><div class='del'>-	u8 tx_threshold;</div><div class='del'>-	u8 tx_hi_threshold;</div><div class='del'>-	u8 rx_threshold;</div><div class='del'>-	u8 dma_burst_size;</div><div class='del'>-	u32 timeout;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)</div><div class='del'>-</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-</div><div class='del'>-extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_controller *info);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif	/* __LINUX_SPI_PXA2XX_SPI_H */</div><div class='head'>diff --git a/include/linux/spi/rspi.h b/include/linux/spi/rspi.h<br/>deleted file mode 100644<br/>index dbdfcc7a3db2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spi/rspi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/rspi.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Renesas SPI driver</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2012  Renesas Solutions Corp.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_SPI_RENESAS_SPI_H__</div><div class='del'>-#define __LINUX_SPI_RENESAS_SPI_H__</div><div class='del'>-</div><div class='del'>-struct rspi_plat_data {</div><div class='del'>-	unsigned int dma_tx_id;</div><div class='del'>-	unsigned int dma_rx_id;</div><div class='del'>-</div><div class='del'>-	u16 num_chipselect;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/spi/sh_msiof.h b/include/linux/spi/sh_msiof.h<br/>index f950d280461b..9fbef3fd4056 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spi/sh_msiof.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/sh_msiof.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spi/sh_msiof.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spi/sh_msiof.h</a></div><div class='hunk'>@@ -2,6 +2,131 @@</div><div class='ctx'> #ifndef __SPI_SH_MSIOF_H__</div><div class='ctx'> #define __SPI_SH_MSIOF_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+#define SITMDR1	0x00	/* Transmit Mode Register 1 */</div><div class='add'>+#define SITMDR2	0x04	/* Transmit Mode Register 2 */</div><div class='add'>+#define SITMDR3	0x08	/* Transmit Mode Register 3 */</div><div class='add'>+#define SIRMDR1	0x10	/* Receive Mode Register 1 */</div><div class='add'>+#define SIRMDR2	0x14	/* Receive Mode Register 2 */</div><div class='add'>+#define SIRMDR3	0x18	/* Receive Mode Register 3 */</div><div class='add'>+#define SITSCR	0x20	/* Transmit Clock Select Register */</div><div class='add'>+#define SIRSCR	0x22	/* Receive Clock Select Register (SH, A1, APE6) */</div><div class='add'>+#define SICTR	0x28	/* Control Register */</div><div class='add'>+#define SIFCTR	0x30	/* FIFO Control Register */</div><div class='add'>+#define SISTR	0x40	/* Status Register */</div><div class='add'>+#define SIIER	0x44	/* Interrupt Enable Register */</div><div class='add'>+#define SITDR1	0x48	/* Transmit Control Data Register 1 (SH, A1) */</div><div class='add'>+#define SITDR2	0x4c	/* Transmit Control Data Register 2 (SH, A1) */</div><div class='add'>+#define SITFDR	0x50	/* Transmit FIFO Data Register */</div><div class='add'>+#define SIRDR1	0x58	/* Receive Control Data Register 1 (SH, A1) */</div><div class='add'>+#define SIRDR2	0x5c	/* Receive Control Data Register 2 (SH, A1) */</div><div class='add'>+#define SIRFDR	0x60	/* Receive FIFO Data Register */</div><div class='add'>+</div><div class='add'>+/* SITMDR1 and SIRMDR1 */</div><div class='add'>+#define SIMDR1_TRMD		BIT(31)		/* Transfer Mode (1 = Master mode) */</div><div class='add'>+#define SIMDR1_SYNCMD		GENMASK(29, 28)	/* SYNC Mode */</div><div class='add'>+#define SIMDR1_SYNCMD_PULSE	0U		/*   Frame start sync pulse */</div><div class='add'>+#define SIMDR1_SYNCMD_SPI	2U		/*   Level mode/SPI */</div><div class='add'>+#define SIMDR1_SYNCMD_LR	3U		/*   L/R mode */</div><div class='add'>+#define SIMDR1_SYNCAC		BIT(25)		/* Sync Polarity (1 = Active-low) */</div><div class='add'>+#define SIMDR1_BITLSB		BIT(24)		/* MSB/LSB First (1 = LSB first) */</div><div class='add'>+#define SIMDR1_DTDL		GENMASK(22, 20)	/* Data Pin Bit Delay for MSIOF_SYNC */</div><div class='add'>+#define SIMDR1_SYNCDL		GENMASK(18, 16)	/* Frame Sync Signal Timing Delay */</div><div class='add'>+#define SIMDR1_FLD		GENMASK(3, 2)	/* Frame Sync Signal Interval (0-3) */</div><div class='add'>+#define SIMDR1_XXSTP		BIT(0)		/* Transmission/Reception Stop on FIFO */</div><div class='add'>+/* SITMDR1 */</div><div class='add'>+#define SITMDR1_PCON		BIT(30)		/* Transfer Signal Connection */</div><div class='add'>+#define SITMDR1_SYNCCH		GENMASK(27, 26)	/* Sync Signal Channel Select */</div><div class='add'>+						/* 0=MSIOF_SYNC, 1=MSIOF_SS1, 2=MSIOF_SS2 */</div><div class='add'>+</div><div class='add'>+/* SITMDR2 and SIRMDR2 */</div><div class='add'>+#define SIMDR2_GRP		GENMASK(31, 30)	/* Group Count */</div><div class='add'>+#define SIMDR2_BITLEN1		GENMASK(28, 24)	/* Data Size (8-32 bits) */</div><div class='add'>+#define SIMDR2_WDLEN1		GENMASK(23, 16)	/* Word Count (1-64/256 (SH, A1))) */</div><div class='add'>+#define SIMDR2_GRPMASK		GENMASK(3, 0)	/* Group Output Mask 1-4 (SH, A1) */</div><div class='add'>+</div><div class='add'>+/* SITMDR3 and SIRMDR3 */</div><div class='add'>+#define SIMDR3_BITLEN2		GENMASK(28, 24)	/* Data Size (8-32 bits) */</div><div class='add'>+#define SIMDR3_WDLEN2		GENMASK(23, 16)	/* Word Count (1-64/256 (SH, A1))) */</div><div class='add'>+</div><div class='add'>+/* SITSCR and SIRSCR */</div><div class='add'>+#define SISCR_BRPS		GENMASK(12, 8)	/* Prescaler Setting (1-32) */</div><div class='add'>+#define SISCR_BRDV		GENMASK(2, 0)	/* Baud Rate Generator's Division Ratio */</div><div class='add'>+</div><div class='add'>+/* SICTR */</div><div class='add'>+#define SICTR_TSCKIZ		GENMASK(31, 30)	/* Transmit Clock I/O Polarity Select */</div><div class='add'>+#define SICTR_TSCKIZ_SCK	BIT(31)		/*   Disable SCK when TX disabled */</div><div class='add'>+#define SICTR_TSCKIZ_POL	BIT(30)		/*   Transmit Clock Polarity */</div><div class='add'>+#define SICTR_RSCKIZ		GENMASK(29, 28) /* Receive Clock Polarity Select */</div><div class='add'>+#define SICTR_RSCKIZ_SCK	BIT(29)		/*   Must match CTR_TSCKIZ_SCK */</div><div class='add'>+#define SICTR_RSCKIZ_POL	BIT(28)		/*   Receive Clock Polarity */</div><div class='add'>+#define SICTR_TEDG		BIT(27)		/* Transmit Timing (1 = falling edge) */</div><div class='add'>+#define SICTR_REDG		BIT(26)		/* Receive Timing (1 = falling edge) */</div><div class='add'>+#define SICTR_TXDIZ		GENMASK(23, 22)	/* Pin Output When TX is Disabled */</div><div class='add'>+#define SICTR_TXDIZ_LOW		0U		/*   0 */</div><div class='add'>+#define SICTR_TXDIZ_HIGH	1U		/*   1 */</div><div class='add'>+#define SICTR_TXDIZ_HIZ		2U		/*   High-impedance */</div><div class='add'>+#define SICTR_TSCKE		BIT(15)		/* Transmit Serial Clock Output Enable */</div><div class='add'>+#define SICTR_TFSE		BIT(14)		/* Transmit Frame Sync Signal Output Enable */</div><div class='add'>+#define SICTR_TXE		BIT(9)		/* Transmit Enable */</div><div class='add'>+#define SICTR_RXE		BIT(8)		/* Receive Enable */</div><div class='add'>+#define SICTR_TXRST		BIT(1)		/* Transmit Reset */</div><div class='add'>+#define SICTR_RXRST		BIT(0)		/* Receive Reset */</div><div class='add'>+</div><div class='add'>+/* SIFCTR */</div><div class='add'>+#define SIFCTR_TFWM		GENMASK(31, 29)	/* Transmit FIFO Watermark */</div><div class='add'>+#define SIFCTR_TFWM_64		0U		/*  Transfer Request when 64 empty stages */</div><div class='add'>+#define SIFCTR_TFWM_32		1U		/*  Transfer Request when 32 empty stages */</div><div class='add'>+#define SIFCTR_TFWM_24		2U		/*  Transfer Request when 24 empty stages */</div><div class='add'>+#define SIFCTR_TFWM_16		3U		/*  Transfer Request when 16 empty stages */</div><div class='add'>+#define SIFCTR_TFWM_12		4U		/*  Transfer Request when 12 empty stages */</div><div class='add'>+#define SIFCTR_TFWM_8		5U		/*  Transfer Request when 8 empty stages */</div><div class='add'>+#define SIFCTR_TFWM_4		6U		/*  Transfer Request when 4 empty stages */</div><div class='add'>+#define SIFCTR_TFWM_1		7U		/*  Transfer Request when 1 empty stage */</div><div class='add'>+#define SIFCTR_TFUA		GENMASK(28, 20) /* Transmit FIFO Usable Area */</div><div class='add'>+#define SIFCTR_RFWM		GENMASK(15, 13)	/* Receive FIFO Watermark */</div><div class='add'>+#define SIFCTR_RFWM_1		0U		/*  Transfer Request when 1 valid stages */</div><div class='add'>+#define SIFCTR_RFWM_4		1U		/*  Transfer Request when 4 valid stages */</div><div class='add'>+#define SIFCTR_RFWM_8		2U		/*  Transfer Request when 8 valid stages */</div><div class='add'>+#define SIFCTR_RFWM_16		3U		/*  Transfer Request when 16 valid stages */</div><div class='add'>+#define SIFCTR_RFWM_32		4U		/*  Transfer Request when 32 valid stages */</div><div class='add'>+#define SIFCTR_RFWM_64		5U		/*  Transfer Request when 64 valid stages */</div><div class='add'>+#define SIFCTR_RFWM_128		6U		/*  Transfer Request when 128 valid stages */</div><div class='add'>+#define SIFCTR_RFWM_256		7U		/*  Transfer Request when 256 valid stages */</div><div class='add'>+#define SIFCTR_RFUA		GENMASK(12, 4)	/* Receive FIFO Usable Area (0x40 = full) */</div><div class='add'>+</div><div class='add'>+/* SISTR */</div><div class='add'>+#define SISTR_TFEMP		BIT(29) /* Transmit FIFO Empty */</div><div class='add'>+#define SISTR_TDREQ		BIT(28) /* Transmit Data Transfer Request */</div><div class='add'>+#define SISTR_TEOF		BIT(23) /* Frame Transmission End */</div><div class='add'>+#define SISTR_TFSERR		BIT(21) /* Transmit Frame Synchronization Error */</div><div class='add'>+#define SISTR_TFOVF		BIT(20) /* Transmit FIFO Overflow */</div><div class='add'>+#define SISTR_TFUDF		BIT(19) /* Transmit FIFO Underflow */</div><div class='add'>+#define SISTR_RFFUL		BIT(13) /* Receive FIFO Full */</div><div class='add'>+#define SISTR_RDREQ		BIT(12) /* Receive Data Transfer Request */</div><div class='add'>+#define SISTR_REOF		BIT(7)  /* Frame Reception End */</div><div class='add'>+#define SISTR_RFSERR		BIT(5)  /* Receive Frame Synchronization Error */</div><div class='add'>+#define SISTR_RFUDF		BIT(4)  /* Receive FIFO Underflow */</div><div class='add'>+#define SISTR_RFOVF		BIT(3)  /* Receive FIFO Overflow */</div><div class='add'>+</div><div class='add'>+/* SIIER */</div><div class='add'>+#define SIIER_TDMAE		BIT(31) /* Transmit Data DMA Transfer Req. Enable */</div><div class='add'>+#define SIIER_TFEMPE		BIT(29) /* Transmit FIFO Empty Enable */</div><div class='add'>+#define SIIER_TDREQE		BIT(28) /* Transmit Data Transfer Request Enable */</div><div class='add'>+#define SIIER_TEOFE		BIT(23) /* Frame Transmission End Enable */</div><div class='add'>+#define SIIER_TFSERRE		BIT(21) /* Transmit Frame Sync Error Enable */</div><div class='add'>+#define SIIER_TFOVFE		BIT(20) /* Transmit FIFO Overflow Enable */</div><div class='add'>+#define SIIER_TFUDFE		BIT(19) /* Transmit FIFO Underflow Enable */</div><div class='add'>+#define SIIER_RDMAE		BIT(15) /* Receive Data DMA Transfer Req. Enable */</div><div class='add'>+#define SIIER_RFFULE		BIT(13) /* Receive FIFO Full Enable */</div><div class='add'>+#define SIIER_RDREQE		BIT(12) /* Receive Data Transfer Request Enable */</div><div class='add'>+#define SIIER_REOFE		BIT(7)  /* Frame Reception End Enable */</div><div class='add'>+#define SIIER_RFSERRE		BIT(5)  /* Receive Frame Sync Error Enable */</div><div class='add'>+#define SIIER_RFUDFE		BIT(4)  /* Receive FIFO Underflow Enable */</div><div class='add'>+#define SIIER_RFOVFE		BIT(3)  /* Receive FIFO Overflow Enable */</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MSIOF_SPI_HOST,</div><div class='ctx'> 	MSIOF_SPI_TARGET,</div><div class='head'>diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h<br/>index f866d5c8ed32..82390712794c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spi/spi-mem.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/spi-mem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spi/spi-mem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spi/spi-mem.h</a></div><div class='hunk'>@@ -15,16 +15,32 @@</div><div class='ctx'> </div><div class='ctx'> #define SPI_MEM_OP_CMD(__opcode, __buswidth)			\</div><div class='ctx'> 	{							\</div><div class='add'>+		.nbytes = 1,					\</div><div class='ctx'> 		.buswidth = __buswidth,				\</div><div class='ctx'> 		.opcode = __opcode,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define SPI_MEM_DTR_OP_CMD(__opcode, __buswidth)		\</div><div class='add'>+	{							\</div><div class='ctx'> 		.nbytes = 1,					\</div><div class='add'>+		.opcode = __opcode,				\</div><div class='add'>+		.buswidth = __buswidth,				\</div><div class='add'>+		.dtr = true,					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define SPI_MEM_OP_ADDR(__nbytes, __val, __buswidth)		\</div><div class='ctx'> 	{							\</div><div class='ctx'> 		.nbytes = __nbytes,				\</div><div class='add'>+		.buswidth = __buswidth,				\</div><div class='add'>+		.val = __val,					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define SPI_MEM_DTR_OP_ADDR(__nbytes, __val, __buswidth)	\</div><div class='add'>+	{							\</div><div class='add'>+		.nbytes = __nbytes,				\</div><div class='ctx'> 		.val = __val,					\</div><div class='ctx'> 		.buswidth = __buswidth,				\</div><div class='add'>+		.dtr = true,					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define SPI_MEM_OP_NO_ADDR	{ }</div><div class='hunk'>@@ -35,22 +51,47 @@</div><div class='ctx'> 		.buswidth = __buswidth,				\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define SPI_MEM_DTR_OP_DUMMY(__nbytes, __buswidth)		\</div><div class='add'>+	{							\</div><div class='add'>+		.nbytes = __nbytes,				\</div><div class='add'>+		.buswidth = __buswidth,				\</div><div class='add'>+		.dtr = true,					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #define SPI_MEM_OP_NO_DUMMY	{ }</div><div class='ctx'> </div><div class='ctx'> #define SPI_MEM_OP_DATA_IN(__nbytes, __buf, __buswidth)		\</div><div class='ctx'> 	{							\</div><div class='add'>+		.buswidth = __buswidth,				\</div><div class='add'>+		.dir = SPI_MEM_DATA_IN,				\</div><div class='add'>+		.nbytes = __nbytes,				\</div><div class='add'>+		.buf.in = __buf,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define SPI_MEM_DTR_OP_DATA_IN(__nbytes, __buf, __buswidth)	\</div><div class='add'>+	{							\</div><div class='ctx'> 		.dir = SPI_MEM_DATA_IN,				\</div><div class='ctx'> 		.nbytes = __nbytes,				\</div><div class='ctx'> 		.buf.in = __buf,				\</div><div class='ctx'> 		.buswidth = __buswidth,				\</div><div class='add'>+		.dtr = true,					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define SPI_MEM_OP_DATA_OUT(__nbytes, __buf, __buswidth)	\</div><div class='ctx'> 	{							\</div><div class='add'>+		.buswidth = __buswidth,				\</div><div class='add'>+		.dir = SPI_MEM_DATA_OUT,			\</div><div class='add'>+		.nbytes = __nbytes,				\</div><div class='add'>+		.buf.out = __buf,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define SPI_MEM_DTR_OP_DATA_OUT(__nbytes, __buf, __buswidth)	\</div><div class='add'>+	{							\</div><div class='ctx'> 		.dir = SPI_MEM_DATA_OUT,			\</div><div class='ctx'> 		.nbytes = __nbytes,				\</div><div class='ctx'> 		.buf.out = __buf,				\</div><div class='ctx'> 		.buswidth = __buswidth,				\</div><div class='add'>+		.dtr = true,					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define SPI_MEM_OP_NO_DATA	{ }</div><div class='hunk'>@@ -68,6 +109,9 @@ enum spi_mem_data_dir {</div><div class='ctx'> 	SPI_MEM_DATA_OUT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SPI_MEM_OP_MAX_FREQ(__freq)				\</div><div class='add'>+	.max_freq = __freq</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct spi_mem_op - describes a SPI memory operation</div><div class='ctx'>  * @cmd.nbytes: number of opcode bytes (only 1 or 2 are valid). The opcode is</div><div class='hunk'>@@ -90,11 +134,16 @@ enum spi_mem_data_dir {</div><div class='ctx'>  * @data.buswidth: number of IO lanes used to send/receive the data</div><div class='ctx'>  * @data.dtr: whether the data should be sent in DTR mode or not</div><div class='ctx'>  * @data.ecc: whether error correction is required or not</div><div class='add'>+ * @data.swap16: whether the byte order of 16-bit words is swapped when read</div><div class='add'>+ *		 or written in Octal DTR mode compared to STR mode.</div><div class='ctx'>  * @data.dir: direction of the transfer</div><div class='ctx'>  * @data.nbytes: number of data bytes to send/receive. Can be zero if the</div><div class='ctx'>  *		 operation does not involve transferring data</div><div class='ctx'>  * @data.buf.in: input buffer (must be DMA-able)</div><div class='ctx'>  * @data.buf.out: output buffer (must be DMA-able)</div><div class='add'>+ * @max_freq: frequency limitation wrt this operation. 0 means there is no</div><div class='add'>+ *	      specific constraint and the highest achievable frequency can be</div><div class='add'>+ *	      attempted.</div><div class='ctx'>  */</div><div class='ctx'> struct spi_mem_op {</div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -124,7 +173,8 @@ struct spi_mem_op {</div><div class='ctx'> 		u8 buswidth;</div><div class='ctx'> 		u8 dtr : 1;</div><div class='ctx'> 		u8 ecc : 1;</div><div class='del'>-		u8 __pad : 6;</div><div class='add'>+		u8 swap16 : 1;</div><div class='add'>+		u8 __pad : 5;</div><div class='ctx'> 		enum spi_mem_data_dir dir;</div><div class='ctx'> 		unsigned int nbytes;</div><div class='ctx'> 		union {</div><div class='hunk'>@@ -132,14 +182,17 @@ struct spi_mem_op {</div><div class='ctx'> 			const void *out;</div><div class='ctx'> 		} buf;</div><div class='ctx'> 	} data;</div><div class='add'>+</div><div class='add'>+	unsigned int max_freq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SPI_MEM_OP(__cmd, __addr, __dummy, __data)		\</div><div class='add'>+#define SPI_MEM_OP(__cmd, __addr, __dummy, __data, ...)		\</div><div class='ctx'> 	{							\</div><div class='ctx'> 		.cmd = __cmd,					\</div><div class='ctx'> 		.addr = __addr,					\</div><div class='ctx'> 		.dummy = __dummy,				\</div><div class='ctx'> 		.data = __data,					\</div><div class='add'>+		__VA_ARGS__					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -297,10 +350,15 @@ struct spi_controller_mem_ops {</div><div class='ctx'>  * struct spi_controller_mem_caps - SPI memory controller capabilities</div><div class='ctx'>  * @dtr: Supports DTR operations</div><div class='ctx'>  * @ecc: Supports operations with error correction</div><div class='add'>+ * @swap16: Supports swapping bytes on a 16 bit boundary when configured in</div><div class='add'>+ *	    Octal DTR</div><div class='add'>+ * @per_op_freq: Supports per operation frequency switching</div><div class='ctx'>  */</div><div class='ctx'> struct spi_controller_mem_caps {</div><div class='ctx'> 	bool dtr;</div><div class='ctx'> 	bool ecc;</div><div class='add'>+	bool swap16;</div><div class='add'>+	bool per_op_freq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define spi_mem_controller_is_capable(ctlr, cap)	\</div><div class='hunk'>@@ -365,6 +423,8 @@ bool spi_mem_default_supports_op(struct spi_mem *mem,</div><div class='ctx'> #endif /* CONFIG_SPI_MEM */</div><div class='ctx'> </div><div class='ctx'> int spi_mem_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op);</div><div class='add'>+void spi_mem_adjust_op_freq(struct spi_mem *mem, struct spi_mem_op *op);</div><div class='add'>+u64 spi_mem_calc_op_duration(struct spi_mem *mem, struct spi_mem_op *op);</div><div class='ctx'> </div><div class='ctx'> bool spi_mem_supports_op(struct spi_mem *mem,</div><div class='ctx'> 			 const struct spi_mem_op *op);</div><div class='head'>diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h<br/>index b05d5a87c313..cb2c2df31089 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spi/spi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/spi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spi/spi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spi/spi.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;uapi/linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Max no. of CS supported per spi device */</div><div class='del'>-#define SPI_CS_CNT_MAX 16</div><div class='add'>+#define SPI_DEVICE_CS_CNT_MAX 4</div><div class='ctx'> </div><div class='ctx'> struct dma_chan;</div><div class='ctx'> struct software_node;</div><div class='hunk'>@@ -31,9 +31,11 @@ struct spi_transfer;</div><div class='ctx'> struct spi_controller_mem_ops;</div><div class='ctx'> struct spi_controller_mem_caps;</div><div class='ctx'> struct spi_message;</div><div class='add'>+struct spi_offload;</div><div class='add'>+struct spi_offload_config;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * INTERFACES between SPI master-side drivers and SPI slave protocol handlers,</div><div class='add'>+ * INTERFACES between SPI controller-side drivers and SPI target protocol handlers,</div><div class='ctx'>  * and SPI infrastructure.</div><div class='ctx'>  */</div><div class='ctx'> extern const struct bus_type spi_bus_type;</div><div class='hunk'>@@ -128,19 +130,12 @@ extern void spi_transfer_cs_change_delay_exec(struct spi_message *msg,</div><div class='ctx'> 						  struct spi_transfer *xfer);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct spi_device - Controller side proxy for an SPI slave device</div><div class='add'>+ * struct spi_device - Controller side proxy for an SPI target device</div><div class='ctx'>  * @dev: Driver model representation of the device.</div><div class='ctx'>  * @controller: SPI controller used with the device.</div><div class='ctx'>  * @max_speed_hz: Maximum clock rate to be used with this chip</div><div class='ctx'>  *	(on this board); may be changed by the device's driver.</div><div class='ctx'>  *	The spi_transfer.speed_hz can override this for each transfer.</div><div class='del'>- * @chip_select: Array of physical chipselect, spi-&gt;chipselect[i] gives</div><div class='del'>- *	the corresponding physical CS for logical CS i.</div><div class='del'>- * @mode: The spi mode defines how data is clocked out and in.</div><div class='del'>- *	This may be changed by the device's driver.</div><div class='del'>- *	The "active low" default for chipselect mode can be overridden</div><div class='del'>- *	(by specifying SPI_CS_HIGH) as can the "MSB first" default for</div><div class='del'>- *	each word in a transfer (by specifying SPI_LSB_FIRST).</div><div class='ctx'>  * @bits_per_word: Data transfers involve one or more words; word sizes</div><div class='ctx'>  *	like eight or 12 bits are common.  In-memory wordsizes are</div><div class='ctx'>  *	powers of two bytes (e.g. 20 bit samples use 32 bits).</div><div class='hunk'>@@ -148,6 +143,11 @@ extern void spi_transfer_cs_change_delay_exec(struct spi_message *msg,</div><div class='ctx'>  *	default (0) indicating protocol words are eight bit bytes.</div><div class='ctx'>  *	The spi_transfer.bits_per_word can override this for each transfer.</div><div class='ctx'>  * @rt: Make the pump thread real time priority.</div><div class='add'>+ * @mode: The spi mode defines how data is clocked out and in.</div><div class='add'>+ *	This may be changed by the device's driver.</div><div class='add'>+ *	The "active low" default for chipselect mode can be overridden</div><div class='add'>+ *	(by specifying SPI_CS_HIGH) as can the "MSB first" default for</div><div class='add'>+ *	each word in a transfer (by specifying SPI_LSB_FIRST).</div><div class='ctx'>  * @irq: Negative, or the number passed to request_irq() to receive</div><div class='ctx'>  *	interrupts from this device.</div><div class='ctx'>  * @controller_state: Controller's runtime state</div><div class='hunk'>@@ -160,8 +160,7 @@ extern void spi_transfer_cs_change_delay_exec(struct spi_message *msg,</div><div class='ctx'>  *	the device will bind to the named driver and only the named driver.</div><div class='ctx'>  *	Do not set directly, because core frees it; use driver_set_override() to</div><div class='ctx'>  *	set or clear it.</div><div class='del'>- * @cs_gpiod: Array of GPIO descriptors of the corresponding chipselect lines</div><div class='del'>- *	(optional, NULL when not using a GPIO line)</div><div class='add'>+ * @pcpu_statistics: statistics for the spi_device</div><div class='ctx'>  * @word_delay: delay to be inserted between consecutive</div><div class='ctx'>  *	words of a transfer</div><div class='ctx'>  * @cs_setup: delay to be introduced by the controller after CS is asserted</div><div class='hunk'>@@ -169,10 +168,14 @@ extern void spi_transfer_cs_change_delay_exec(struct spi_message *msg,</div><div class='ctx'>  * @cs_inactive: delay to be introduced by the controller after CS is</div><div class='ctx'>  *	deasserted. If @cs_change_delay is used from @spi_transfer, then the</div><div class='ctx'>  *	two delays will be added up.</div><div class='del'>- * @pcpu_statistics: statistics for the spi_device</div><div class='add'>+ * @chip_select: Array of physical chipselect, spi-&gt;chipselect[i] gives</div><div class='add'>+ *	the corresponding physical CS for logical CS i.</div><div class='add'>+ * @num_chipselect: Number of physical chipselects used.</div><div class='ctx'>  * @cs_index_mask: Bit mask of the active chipselect(s) in the chipselect array</div><div class='add'>+ * @cs_gpiod: Array of GPIO descriptors of the corresponding chipselect lines</div><div class='add'>+ *	(optional, NULL when not using a GPIO line)</div><div class='ctx'>  *</div><div class='del'>- * A @spi_device is used to interchange data between an SPI slave</div><div class='add'>+ * A @spi_device is used to interchange data between an SPI target device</div><div class='ctx'>  * (usually a discrete chip) and CPU memory.</div><div class='ctx'>  *</div><div class='ctx'>  * In @dev, the platform_data is used to hold information about this</div><div class='hunk'>@@ -185,7 +188,6 @@ struct spi_device {</div><div class='ctx'> 	struct device		dev;</div><div class='ctx'> 	struct spi_controller	*controller;</div><div class='ctx'> 	u32			max_speed_hz;</div><div class='del'>-	u8			chip_select[SPI_CS_CNT_MAX];</div><div class='ctx'> 	u8			bits_per_word;</div><div class='ctx'> 	bool			rt;</div><div class='ctx'> #define SPI_NO_TX		BIT(31)		/* No transmit wire */</div><div class='hunk'>@@ -216,22 +218,29 @@ struct spi_device {</div><div class='ctx'> 	void			*controller_data;</div><div class='ctx'> 	char			modalias[SPI_NAME_SIZE];</div><div class='ctx'> 	const char		*driver_override;</div><div class='del'>-	struct gpio_desc	*cs_gpiod[SPI_CS_CNT_MAX];	/* Chip select gpio desc */</div><div class='add'>+</div><div class='add'>+	/* The statistics */</div><div class='add'>+	struct spi_statistics __percpu	*pcpu_statistics;</div><div class='add'>+</div><div class='ctx'> 	struct spi_delay	word_delay; /* Inter-word delay */</div><div class='add'>+</div><div class='ctx'> 	/* CS delays */</div><div class='ctx'> 	struct spi_delay	cs_setup;</div><div class='ctx'> 	struct spi_delay	cs_hold;</div><div class='ctx'> 	struct spi_delay	cs_inactive;</div><div class='ctx'> </div><div class='del'>-	/* The statistics */</div><div class='del'>-	struct spi_statistics __percpu	*pcpu_statistics;</div><div class='add'>+	u8			chip_select[SPI_DEVICE_CS_CNT_MAX];</div><div class='add'>+	u8			num_chipselect;</div><div class='ctx'> </div><div class='del'>-	/* Bit mask of the chipselect(s) that the driver need to use from</div><div class='del'>-	 * the chipselect array.When the controller is capable to handle</div><div class='add'>+	/*</div><div class='add'>+	 * Bit mask of the chipselect(s) that the driver need to use from</div><div class='add'>+	 * the chipselect array. When the controller is capable to handle</div><div class='ctx'> 	 * multiple chip selects &amp; memories are connected in parallel</div><div class='ctx'> 	 * then more than one bit need to be set in cs_index_mask.</div><div class='ctx'> 	 */</div><div class='del'>-	u32			cs_index_mask : SPI_CS_CNT_MAX;</div><div class='add'>+	u32			cs_index_mask : SPI_DEVICE_CS_CNT_MAX;</div><div class='add'>+</div><div class='add'>+	struct gpio_desc	*cs_gpiod[SPI_DEVICE_CS_CNT_MAX];	/* Chip select gpio desc */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Likely need more hooks for more protocol options affecting how</div><div class='hunk'>@@ -247,10 +256,7 @@ struct spi_device {</div><div class='ctx'> static_assert((SPI_MODE_KERNEL_MASK &amp; SPI_MODE_USER_MASK) == 0,</div><div class='ctx'> 	      "SPI_MODE_USER_MASK &amp; SPI_MODE_KERNEL_MASK must not overlap");</div><div class='ctx'> </div><div class='del'>-static inline struct spi_device *to_spi_device(const struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return dev ? container_of(dev, struct spi_device, dev) : NULL;</div><div class='del'>-}</div><div class='add'>+#define to_spi_device(__dev)	container_of_const(__dev, struct spi_device, dev)</div><div class='ctx'> </div><div class='ctx'> /* Most drivers won't need to care about device refcounting */</div><div class='ctx'> static inline struct spi_device *spi_dev_get(struct spi_device *spi)</div><div class='hunk'>@@ -311,7 +317,7 @@ static inline bool spi_is_csgpiod(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	u8 idx;</div><div class='ctx'> </div><div class='del'>-	for (idx = 0; idx &lt; SPI_CS_CNT_MAX; idx++) {</div><div class='add'>+	for (idx = 0; idx &lt; spi-&gt;num_chipselect; idx++) {</div><div class='ctx'> 		if (spi_get_csgpiod(spi, idx))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -351,10 +357,8 @@ struct spi_driver {</div><div class='ctx'> 	struct device_driver	driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct spi_driver *to_spi_driver(struct device_driver *drv)</div><div class='del'>-{</div><div class='del'>-	return drv ? container_of(drv, struct spi_driver, driver) : NULL;</div><div class='del'>-}</div><div class='add'>+#define to_spi_driver(__drv)   \</div><div class='add'>+	( __drv ? container_of_const(__drv, struct spi_driver, driver) : NULL )</div><div class='ctx'> </div><div class='ctx'> extern int __spi_register_driver(struct module *owner, struct spi_driver *sdrv);</div><div class='ctx'> </div><div class='hunk'>@@ -388,15 +392,15 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch</div><div class='ctx'> 			spi_unregister_driver)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct spi_controller - interface to SPI master or slave controller</div><div class='add'>+ * struct spi_controller - interface to SPI host or target controller</div><div class='ctx'>  * @dev: device interface to this driver</div><div class='ctx'>  * @list: link with the global spi_controller list</div><div class='ctx'>  * @bus_num: board-specific (and often SOC-specific) identifier for a</div><div class='ctx'>  *	given SPI controller.</div><div class='ctx'>  * @num_chipselect: chipselects are used to distinguish individual</div><div class='del'>- *	SPI slaves, and are numbered from zero to num_chipselects.</div><div class='del'>- *	each slave has a chipselect signal, but it's common that not</div><div class='del'>- *	every chipselect is connected to a slave.</div><div class='add'>+ *	SPI targets, and are numbered from zero to num_chipselects.</div><div class='add'>+ *	each target has a chipselect signal, but it's common that not</div><div class='add'>+ *	every chipselect is connected to a target.</div><div class='ctx'>  * @dma_alignment: SPI controller constraint on DMA buffers alignment.</div><div class='ctx'>  * @mode_bits: flags understood by this controller driver</div><div class='ctx'>  * @buswidth_override_bits: flags to override for this controller driver</div><div class='hunk'>@@ -420,16 +424,14 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch</div><div class='ctx'>  * @bus_lock_spinlock: spinlock for SPI bus locking</div><div class='ctx'>  * @bus_lock_mutex: mutex for exclusion of multiple callers</div><div class='ctx'>  * @bus_lock_flag: indicates that the SPI bus is locked for exclusive use</div><div class='del'>- * @multi_cs_cap: indicates that the SPI Controller can assert/de-assert</div><div class='del'>- *	more than one chip select at once.</div><div class='ctx'>  * @setup: updates the device mode and clocking records used by a</div><div class='ctx'>  *	device's SPI controller; protocol code may call this.  This</div><div class='ctx'>  *	must fail if an unrecognized or unsupported mode is requested.</div><div class='ctx'>  *	It's always safe to call this unless transfers are pending on</div><div class='ctx'>  *	the device whose settings are being modified.</div><div class='del'>- * @set_cs_timing: optional hook for SPI devices to request SPI master</div><div class='add'>+ * @set_cs_timing: optional hook for SPI devices to request SPI</div><div class='ctx'>  * controller for configuring specific CS setup time, hold time and inactive</div><div class='del'>- * delay interms of clock counts</div><div class='add'>+ * delay in terms of clock counts</div><div class='ctx'>  * @transfer: adds a message to the controller's transfer queue.</div><div class='ctx'>  * @cleanup: frees controller-specific state</div><div class='ctx'>  * @can_dma: determine whether this controller supports DMA</div><div class='hunk'>@@ -449,12 +451,12 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch</div><div class='ctx'>  * @cur_msg_need_completion: Flag used internally to opportunistically skip</div><div class='ctx'>  *	the @cur_msg_completion. This flag is used to signal the context that</div><div class='ctx'>  *	is running spi_finalize_current_message() that it needs to complete()</div><div class='del'>- * @cur_msg_mapped: message has been mapped for DMA</div><div class='ctx'>  * @fallback: fallback to PIO if DMA transfer return failure with</div><div class='ctx'>  *	SPI_TRANS_FAIL_NO_START.</div><div class='ctx'>  * @last_cs_mode_high: was (mode &amp; SPI_CS_HIGH) true on the last call to set_cs.</div><div class='ctx'>  * @last_cs: the last chip_select that is recorded by set_cs, -1 on non chip</div><div class='ctx'>  *           selected</div><div class='add'>+ * @last_cs_index_mask: bit mask the last chip selects that were used</div><div class='ctx'>  * @xfer_completion: used by core transfer_one_message()</div><div class='ctx'>  * @busy: message pump is busy</div><div class='ctx'>  * @running: message pump is running</div><div class='hunk'>@@ -500,9 +502,14 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch</div><div class='ctx'>  * @mem_ops: optimized/dedicated operations for interactions with SPI memory.</div><div class='ctx'>  *	     This field is optional and should only be implemented if the</div><div class='ctx'>  *	     controller has native support for memory like operations.</div><div class='add'>+ * @get_offload: callback for controllers with offload support to get matching</div><div class='add'>+ *	offload instance. Implementations should return -ENODEV if no match is</div><div class='add'>+ *	found.</div><div class='add'>+ * @put_offload: release the offload instance acquired by @get_offload.</div><div class='ctx'>  * @mem_caps: controller capabilities for the handling of memory operations.</div><div class='add'>+ * @dtr_caps: true if controller has dtr(single/dual transfer rate) capability.</div><div class='add'>+ *	QSPI based controller should fill this based on controller's capability.</div><div class='ctx'>  * @unprepare_message: undo any work done by prepare_message().</div><div class='del'>- * @slave_abort: abort the ongoing transfer request on an SPI slave controller</div><div class='ctx'>  * @target_abort: abort the ongoing transfer request on an SPI target controller</div><div class='ctx'>  * @cs_gpiods: Array of GPIO descriptors to use as chip select lines; one per CS</div><div class='ctx'>  *	number. Any individual value may be NULL for CS lines that</div><div class='hunk'>@@ -534,6 +541,9 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch</div><div class='ctx'>  * @queue_empty: signal green light for opportunistically skipping the queue</div><div class='ctx'>  *	for spi_sync transfers.</div><div class='ctx'>  * @must_async: disable all fast paths in the core</div><div class='add'>+ * @defer_optimize_message: set to true if controller cannot pre-optimize messages</div><div class='add'>+ *	and needs to defer the optimization step until the message is actually</div><div class='add'>+ *	being transferred</div><div class='ctx'>  *</div><div class='ctx'>  * Each SPI controller can communicate with one or more @spi_device</div><div class='ctx'>  * children.  These make a small bus, sharing MOSI, MISO and SCK signals</div><div class='hunk'>@@ -543,7 +553,7 @@ extern struct spi_device *spi_new_ancillary_device(struct spi_device *spi, u8 ch</div><div class='ctx'>  *</div><div class='ctx'>  * The driver for an SPI controller manages access to those devices through</div><div class='ctx'>  * a queue of spi_message transactions, copying data between CPU memory and</div><div class='del'>- * an SPI slave device.  For each such message it queues, it calls the</div><div class='add'>+ * an SPI target device.  For each such message it queues, it calls the</div><div class='ctx'>  * message's completion function when the transaction completes.</div><div class='ctx'>  */</div><div class='ctx'> struct spi_controller {</div><div class='hunk'>@@ -593,7 +603,7 @@ struct spi_controller {</div><div class='ctx'> #define SPI_CONTROLLER_NO_TX		BIT(2)	/* Can't do buffer write */</div><div class='ctx'> #define SPI_CONTROLLER_MUST_RX		BIT(3)	/* Requires rx */</div><div class='ctx'> #define SPI_CONTROLLER_MUST_TX		BIT(4)	/* Requires tx */</div><div class='del'>-#define SPI_CONTROLLER_GPIO_SS		BIT(5)	/* GPIO CS must select slave */</div><div class='add'>+#define SPI_CONTROLLER_GPIO_SS		BIT(5)	/* GPIO CS must select target device */</div><div class='ctx'> #define SPI_CONTROLLER_SUSPENDED	BIT(6)	/* Currently suspended */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The spi-controller has multi chip select capability and can</div><div class='hunk'>@@ -660,7 +670,7 @@ struct spi_controller {</div><div class='ctx'> 	 * + To a given spi_device, message queueing is pure FIFO</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * + The controller's main job is to process its message queue,</div><div class='del'>-	 *   selecting a chip (for masters), then transferring data</div><div class='add'>+	 *   selecting a chip (for controllers), then transferring data</div><div class='ctx'> 	 * + If there are multiple spi_device children, the i/o queue</div><div class='ctx'> 	 *   arbitration algorithm is unspecified (round robin, FIFO,</div><div class='ctx'> 	 *   priority, reservations, preemption, etc)</div><div class='hunk'>@@ -709,11 +719,10 @@ struct spi_controller {</div><div class='ctx'> 	bool				running;</div><div class='ctx'> 	bool				rt;</div><div class='ctx'> 	bool				auto_runtime_pm;</div><div class='del'>-	bool				cur_msg_mapped;</div><div class='ctx'> 	bool                            fallback;</div><div class='ctx'> 	bool				last_cs_mode_high;</div><div class='del'>-	s8				last_cs[SPI_CS_CNT_MAX];</div><div class='del'>-	u32				last_cs_index_mask : SPI_CS_CNT_MAX;</div><div class='add'>+	s8				last_cs[SPI_DEVICE_CS_CNT_MAX];</div><div class='add'>+	u32				last_cs_index_mask : SPI_DEVICE_CS_CNT_MAX;</div><div class='ctx'> 	struct completion               xfer_completion;</div><div class='ctx'> 	size_t				max_dma_len;</div><div class='ctx'> </div><div class='hunk'>@@ -727,10 +736,7 @@ struct spi_controller {</div><div class='ctx'> 			       struct spi_message *message);</div><div class='ctx'> 	int (*unprepare_message)(struct spi_controller *ctlr,</div><div class='ctx'> 				 struct spi_message *message);</div><div class='del'>-	union {</div><div class='del'>-		int (*slave_abort)(struct spi_controller *ctlr);</div><div class='del'>-		int (*target_abort)(struct spi_controller *ctlr);</div><div class='del'>-	};</div><div class='add'>+	int (*target_abort)(struct spi_controller *ctlr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * These hooks are for drivers that use a generic implementation</div><div class='hunk'>@@ -746,6 +752,13 @@ struct spi_controller {</div><div class='ctx'> 	const struct spi_controller_mem_ops *mem_ops;</div><div class='ctx'> 	const struct spi_controller_mem_caps *mem_caps;</div><div class='ctx'> </div><div class='add'>+	/* SPI or QSPI controller can set to true if supports SDR/DDR transfer rate */</div><div class='add'>+	bool			dtr_caps;</div><div class='add'>+</div><div class='add'>+	struct spi_offload *(*get_offload)(struct spi_device *spi,</div><div class='add'>+					   const struct spi_offload_config *config);</div><div class='add'>+	void (*put_offload)(struct spi_offload *offload);</div><div class='add'>+</div><div class='ctx'> 	/* GPIO chip select */</div><div class='ctx'> 	struct gpio_desc	**cs_gpiods;</div><div class='ctx'> 	bool			use_gpio_descriptors;</div><div class='hunk'>@@ -777,6 +790,7 @@ struct spi_controller {</div><div class='ctx'> 	/* Flag for enabling opportunistic skipping of the queue in spi_sync */</div><div class='ctx'> 	bool			queue_empty;</div><div class='ctx'> 	bool			must_async;</div><div class='add'>+	bool			defer_optimize_message;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void *spi_controller_get_devdata(struct spi_controller *ctlr)</div><div class='hunk'>@@ -803,11 +817,6 @@ static inline void spi_controller_put(struct spi_controller *ctlr)</div><div class='ctx'> 		put_device(&amp;ctlr-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool spi_controller_is_slave(struct spi_controller *ctlr)</div><div class='del'>-{</div><div class='del'>-	return IS_ENABLED(CONFIG_SPI_SLAVE) &amp;&amp; ctlr-&gt;slave;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline bool spi_controller_is_target(struct spi_controller *ctlr)</div><div class='ctx'> {</div><div class='ctx'> 	return IS_ENABLED(CONFIG_SPI_SLAVE) &amp;&amp; ctlr-&gt;target;</div><div class='hunk'>@@ -832,22 +841,7 @@ void spi_take_timestamp_post(struct spi_controller *ctlr,</div><div class='ctx'> </div><div class='ctx'> /* The SPI driver core manages memory for the spi_controller classdev */</div><div class='ctx'> extern struct spi_controller *__spi_alloc_controller(struct device *host,</div><div class='del'>-						unsigned int size, bool slave);</div><div class='del'>-</div><div class='del'>-static inline struct spi_controller *spi_alloc_master(struct device *host,</div><div class='del'>-						      unsigned int size)</div><div class='del'>-{</div><div class='del'>-	return __spi_alloc_controller(host, size, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct spi_controller *spi_alloc_slave(struct device *host,</div><div class='del'>-						     unsigned int size)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ENABLED(CONFIG_SPI_SLAVE))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return __spi_alloc_controller(host, size, true);</div><div class='del'>-}</div><div class='add'>+						unsigned int size, bool target);</div><div class='ctx'> </div><div class='ctx'> static inline struct spi_controller *spi_alloc_host(struct device *dev,</div><div class='ctx'> 						    unsigned int size)</div><div class='hunk'>@@ -866,22 +860,7 @@ static inline struct spi_controller *spi_alloc_target(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> struct spi_controller *__devm_spi_alloc_controller(struct device *dev,</div><div class='ctx'> 						   unsigned int size,</div><div class='del'>-						   bool slave);</div><div class='del'>-</div><div class='del'>-static inline struct spi_controller *devm_spi_alloc_master(struct device *dev,</div><div class='del'>-							   unsigned int size)</div><div class='del'>-{</div><div class='del'>-	return __devm_spi_alloc_controller(dev, size, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct spi_controller *devm_spi_alloc_slave(struct device *dev,</div><div class='del'>-							  unsigned int size)</div><div class='del'>-{</div><div class='del'>-	if (!IS_ENABLED(CONFIG_SPI_SLAVE))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return __devm_spi_alloc_controller(dev, size, true);</div><div class='del'>-}</div><div class='add'>+						   bool target);</div><div class='ctx'> </div><div class='ctx'> static inline struct spi_controller *devm_spi_alloc_host(struct device *dev,</div><div class='ctx'> 							 unsigned int size)</div><div class='hunk'>@@ -903,12 +882,29 @@ extern int devm_spi_register_controller(struct device *dev,</div><div class='ctx'> 					struct spi_controller *ctlr);</div><div class='ctx'> extern void spi_unregister_controller(struct spi_controller *ctlr);</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_ACPI)</div><div class='add'>+#if IS_ENABLED(CONFIG_ACPI) &amp;&amp; IS_ENABLED(CONFIG_SPI_MASTER)</div><div class='ctx'> extern struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev);</div><div class='ctx'> extern struct spi_device *acpi_spi_device_alloc(struct spi_controller *ctlr,</div><div class='ctx'> 						struct acpi_device *adev,</div><div class='ctx'> 						int index);</div><div class='ctx'> int acpi_spi_count_resources(struct acpi_device *adev);</div><div class='add'>+#else</div><div class='add'>+static inline struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct spi_device *acpi_spi_device_alloc(struct spi_controller *ctlr,</div><div class='add'>+						       struct acpi_device *adev,</div><div class='add'>+						       int index)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int acpi_spi_count_resources(struct acpi_device *adev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -957,8 +953,8 @@ struct spi_res {</div><div class='ctx'>  * struct spi_transfer - a read/write buffer pair</div><div class='ctx'>  * @tx_buf: data to be written (DMA-safe memory), or NULL</div><div class='ctx'>  * @rx_buf: data to be read (DMA-safe memory), or NULL</div><div class='del'>- * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped</div><div class='del'>- * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped</div><div class='add'>+ * @tx_dma: DMA address of tx_buf, currently not for client use</div><div class='add'>+ * @rx_dma: DMA address of rx_buf, currently not for client use</div><div class='ctx'>  * @tx_nbits: number of bits used for writing. If 0 the default</div><div class='ctx'>  *      (SPI_NBITS_SINGLE) is used.</div><div class='ctx'>  * @rx_nbits: number of bits used for reading. If 0 the default</div><div class='hunk'>@@ -982,8 +978,12 @@ struct spi_res {</div><div class='ctx'>  *      transfer this transfer. Set to 0 if the SPI bus driver does</div><div class='ctx'>  *      not support it.</div><div class='ctx'>  * @transfer_list: transfers are sequenced through @spi_message.transfers</div><div class='add'>+ * @tx_sg_mapped: If true, the @tx_sg is mapped for DMA</div><div class='add'>+ * @rx_sg_mapped: If true, the @rx_sg is mapped for DMA</div><div class='ctx'>  * @tx_sg: Scatterlist for transmit, currently not for client use</div><div class='ctx'>  * @rx_sg: Scatterlist for receive, currently not for client use</div><div class='add'>+ * @offload_flags: Flags that are only applicable to specialized SPI offload</div><div class='add'>+ *	transfers. See %SPI_OFFLOAD_XFER_* in spi-offload.h.</div><div class='ctx'>  * @ptp_sts_word_pre: The word (subject to bits_per_word semantics) offset</div><div class='ctx'>  *	within @tx_buf for which the SPI device is requesting that the time</div><div class='ctx'>  *	snapshot for this transfer begins. Upon completing the SPI transfer,</div><div class='hunk'>@@ -998,15 +998,16 @@ struct spi_res {</div><div class='ctx'>  *	purposefully (instead of setting to spi_transfer-&gt;len - 1) to denote</div><div class='ctx'>  *	that a transfer-level snapshot taken from within the driver may still</div><div class='ctx'>  *	be of higher quality.</div><div class='del'>- * @ptp_sts: Pointer to a memory location held by the SPI slave device where a</div><div class='add'>+ * @ptp_sts: Pointer to a memory location held by the SPI target device where a</div><div class='ctx'>  *	PTP system timestamp structure may lie. If drivers use PIO or their</div><div class='ctx'>  *	hardware has some sort of assist for retrieving exact transfer timing,</div><div class='ctx'>  *	they can (and should) assert @ptp_sts_supported and populate this</div><div class='ctx'>  *	structure using the ptp_read_system_*ts helper functions.</div><div class='del'>- *	The timestamp must represent the time at which the SPI slave device has</div><div class='add'>+ *	The timestamp must represent the time at which the SPI target device has</div><div class='ctx'>  *	processed the word, i.e. the "pre" timestamp should be taken before</div><div class='ctx'>  *	transmitting the "pre" word, and the "post" timestamp after receiving</div><div class='ctx'>  *	transmit confirmation from the controller for the "post" word.</div><div class='add'>+ * @dtr_mode: true if supports double transfer rate.</div><div class='ctx'>  * @timestamped: true if the transfer has been timestamped</div><div class='ctx'>  * @error: Error status logged by SPI controller driver.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1058,6 +1059,9 @@ struct spi_res {</div><div class='ctx'>  * two should both be set. User can set transfer mode with SPI_NBITS_SINGLE(1x)</div><div class='ctx'>  * SPI_NBITS_DUAL(2x) and SPI_NBITS_QUAD(4x) to support these three transfer.</div><div class='ctx'>  *</div><div class='add'>+ * User may also set dtr_mode to true to use dual transfer mode if desired. if</div><div class='add'>+ * not, default considered as single transfer mode.</div><div class='add'>+ *</div><div class='ctx'>  * The code that submits an spi_message (and its spi_transfers)</div><div class='ctx'>  * to the lower layers is responsible for managing its memory.</div><div class='ctx'>  * Zero-initialize every field you don't set up explicitly, to</div><div class='hunk'>@@ -1068,8 +1072,7 @@ struct spi_transfer {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It's okay if tx_buf == rx_buf (right?).</div><div class='ctx'> 	 * For MicroWire, one buffer must be NULL.</div><div class='del'>-	 * Buffers must work with dma_*map_single() calls, unless</div><div class='del'>-	 * spi_message.is_dma_mapped reports a pre-existing mapping.</div><div class='add'>+	 * Buffers must work with dma_*map_single() calls.</div><div class='ctx'> 	 */</div><div class='ctx'> 	const void	*tx_buf;</div><div class='ctx'> 	void		*rx_buf;</div><div class='hunk'>@@ -1079,20 +1082,25 @@ struct spi_transfer {</div><div class='ctx'> #define SPI_TRANS_FAIL_IO	BIT(1)</div><div class='ctx'> 	u16		error;</div><div class='ctx'> </div><div class='del'>-	dma_addr_t	tx_dma;</div><div class='del'>-	dma_addr_t	rx_dma;</div><div class='add'>+	bool		tx_sg_mapped;</div><div class='add'>+	bool		rx_sg_mapped;</div><div class='add'>+</div><div class='ctx'> 	struct sg_table tx_sg;</div><div class='ctx'> 	struct sg_table rx_sg;</div><div class='add'>+	dma_addr_t	tx_dma;</div><div class='add'>+	dma_addr_t	rx_dma;</div><div class='ctx'> </div><div class='ctx'> 	unsigned	dummy_data:1;</div><div class='ctx'> 	unsigned	cs_off:1;</div><div class='ctx'> 	unsigned	cs_change:1;</div><div class='del'>-	unsigned	tx_nbits:3;</div><div class='del'>-	unsigned	rx_nbits:3;</div><div class='add'>+	unsigned	tx_nbits:4;</div><div class='add'>+	unsigned	rx_nbits:4;</div><div class='ctx'> 	unsigned	timestamped:1;</div><div class='add'>+	bool		dtr_mode;</div><div class='ctx'> #define	SPI_NBITS_SINGLE	0x01 /* 1-bit transfer */</div><div class='ctx'> #define	SPI_NBITS_DUAL		0x02 /* 2-bit transfer */</div><div class='ctx'> #define	SPI_NBITS_QUAD		0x04 /* 4-bit transfer */</div><div class='add'>+#define	SPI_NBITS_OCTAL	0x08 /* 8-bit transfer */</div><div class='ctx'> 	u8		bits_per_word;</div><div class='ctx'> 	struct spi_delay	delay;</div><div class='ctx'> 	struct spi_delay	cs_change_delay;</div><div class='hunk'>@@ -1101,6 +1109,9 @@ struct spi_transfer {</div><div class='ctx'> </div><div class='ctx'> 	u32		effective_speed_hz;</div><div class='ctx'> </div><div class='add'>+	/* Use %SPI_OFFLOAD_XFER_* from spi-offload.h */</div><div class='add'>+	unsigned int	offload_flags;</div><div class='add'>+</div><div class='ctx'> 	unsigned int	ptp_sts_word_pre;</div><div class='ctx'> 	unsigned int	ptp_sts_word_post;</div><div class='ctx'> </div><div class='hunk'>@@ -1113,8 +1124,6 @@ struct spi_transfer {</div><div class='ctx'>  * struct spi_message - one multi-segment SPI transaction</div><div class='ctx'>  * @transfers: list of transfer segments in this transaction</div><div class='ctx'>  * @spi: SPI device to which the transaction is queued</div><div class='del'>- * @is_dma_mapped: if true, the caller provided both DMA and CPU virtual</div><div class='del'>- *	addresses for each transfer buffer</div><div class='ctx'>  * @pre_optimized: peripheral driver pre-optimized the message</div><div class='ctx'>  * @optimized: the message is in the optimized state</div><div class='ctx'>  * @prepared: spi_prepare_message was called for the this message</div><div class='hunk'>@@ -1128,6 +1137,7 @@ struct spi_transfer {</div><div class='ctx'>  * @state: for use by whichever driver currently owns the message</div><div class='ctx'>  * @opt_state: for use by whichever driver currently owns the message</div><div class='ctx'>  * @resources: for resource management when the SPI message is processed</div><div class='add'>+ * @offload: (optional) offload instance used by this message</div><div class='ctx'>  *</div><div class='ctx'>  * A @spi_message is used to execute an atomic sequence of data transfers,</div><div class='ctx'>  * each represented by a struct spi_transfer.  The sequence is "atomic"</div><div class='hunk'>@@ -1148,8 +1158,6 @@ struct spi_message {</div><div class='ctx'> </div><div class='ctx'> 	struct spi_device	*spi;</div><div class='ctx'> </div><div class='del'>-	unsigned		is_dma_mapped:1;</div><div class='del'>-</div><div class='ctx'> 	/* spi_optimize_message() was called for this message */</div><div class='ctx'> 	bool			pre_optimized;</div><div class='ctx'> 	/* __spi_optimize_message() was called for this message */</div><div class='hunk'>@@ -1190,6 +1198,12 @@ struct spi_message {</div><div class='ctx'> 	 */</div><div class='ctx'> 	void			*opt_state;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Optional offload instance used by this message. This must be set</div><div class='add'>+	 * by the peripheral driver before calling spi_optimize_message().</div><div class='add'>+	 */</div><div class='add'>+	struct spi_offload	*offload;</div><div class='add'>+</div><div class='ctx'> 	/* List of spi_res resources when the SPI message is processed */</div><div class='ctx'> 	struct list_head        resources;</div><div class='ctx'> };</div><div class='hunk'>@@ -1274,10 +1288,11 @@ static inline void spi_message_free(struct spi_message *m)</div><div class='ctx'> </div><div class='ctx'> extern int spi_optimize_message(struct spi_device *spi, struct spi_message *msg);</div><div class='ctx'> extern void spi_unoptimize_message(struct spi_message *msg);</div><div class='add'>+extern int devm_spi_optimize_message(struct device *dev, struct spi_device *spi,</div><div class='add'>+				     struct spi_message *msg);</div><div class='ctx'> </div><div class='ctx'> extern int spi_setup(struct spi_device *spi);</div><div class='ctx'> extern int spi_async(struct spi_device *spi, struct spi_message *message);</div><div class='del'>-extern int spi_slave_abort(struct spi_device *spi);</div><div class='ctx'> extern int spi_target_abort(struct spi_device *spi);</div><div class='ctx'> </div><div class='ctx'> static inline size_t</div><div class='hunk'>@@ -1325,6 +1340,32 @@ static inline bool spi_is_bpw_supported(struct spi_device *spi, u32 bpw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * spi_bpw_to_bytes - Covert bits per word to bytes</div><div class='add'>+ * @bpw: Bits per word</div><div class='add'>+ *</div><div class='add'>+ * This function converts the given @bpw to bytes. The result is always</div><div class='add'>+ * power-of-two, e.g.,</div><div class='add'>+ *</div><div class='add'>+ *  ===============    =================</div><div class='add'>+ *  Input (in bits)    Output (in bytes)</div><div class='add'>+ *  ===============    =================</div><div class='add'>+ *          5                   1</div><div class='add'>+ *          9                   2</div><div class='add'>+ *          21                  4</div><div class='add'>+ *          37                  8</div><div class='add'>+ *  ===============    =================</div><div class='add'>+ *</div><div class='add'>+ * It will return 0 for the 0 input.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * Bytes for the given @bpw.</div><div class='add'>+ */</div><div class='add'>+static inline u32 spi_bpw_to_bytes(u32 bpw)</div><div class='add'>+{</div><div class='add'>+	return roundup_pow_of_two(BITS_TO_BYTES(bpw));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * spi_controller_xfer_timeout - Compute a suitable timeout value</div><div class='ctx'>  * @ctlr: SPI device</div><div class='ctx'>  * @xfer: Transfer descriptor</div><div class='hunk'>@@ -1621,7 +1662,7 @@ struct spi_board_info {</div><div class='ctx'> 	 * bus_num is board specific and matches the bus_num of some</div><div class='ctx'> 	 * spi_controller that will probably be registered later.</div><div class='ctx'> 	 *</div><div class='del'>-	 * chip_select reflects how this chip is wired to that master;</div><div class='add'>+	 * chip_select reflects how this chip is wired to that controller;</div><div class='ctx'> 	 * it's less than num_chipselect.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16		bus_num;</div><div class='head'>diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h<br/>index b930eca2ef7b..c92cd43a47f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spi/spi_bitbang.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/spi_bitbang.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spi/spi_bitbang.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spi/spi_bitbang.h</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='add'>+typedef u32 (*spi_bb_txrx_word_fn)(struct spi_device *, unsigned int, u32, u8, unsigned int);</div><div class='add'>+</div><div class='ctx'> struct spi_bitbang {</div><div class='ctx'> 	struct mutex		lock;</div><div class='ctx'> 	u8			busy;</div><div class='hunk'>@@ -22,15 +24,15 @@ struct spi_bitbang {</div><div class='ctx'> #define	BITBANG_CS_ACTIVE	1	/* normally nCS, active low */</div><div class='ctx'> #define	BITBANG_CS_INACTIVE	0</div><div class='ctx'> </div><div class='add'>+	void	(*set_mosi_idle)(struct spi_device *spi);</div><div class='ctx'> 	/* txrx_bufs() may handle dma mapping for transfers that don't</div><div class='ctx'> 	 * already have one (transfer.{tx,rx}_dma is zero), or use PIO</div><div class='ctx'> 	 */</div><div class='ctx'> 	int	(*txrx_bufs)(struct spi_device *spi, struct spi_transfer *t);</div><div class='ctx'> </div><div class='ctx'> 	/* txrx_word[SPI_MODE_*]() just looks like a shift register */</div><div class='del'>-	u32	(*txrx_word[4])(struct spi_device *spi,</div><div class='del'>-			unsigned nsecs,</div><div class='del'>-			u32 word, u8 bits, unsigned flags);</div><div class='add'>+	spi_bb_txrx_word_fn txrx_word[SPI_MODE_X_MASK + 1];</div><div class='add'>+</div><div class='ctx'> 	int	(*set_line_direction)(struct spi_device *spi, bool output);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/spi/xilinx_spi.h b/include/linux/spi/xilinx_spi.h<br/>index 3934ce789d87..1b8d984668b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spi/xilinx_spi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spi/xilinx_spi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spi/xilinx_spi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spi/xilinx_spi.h</a></div><div class='hunk'>@@ -2,19 +2,23 @@</div><div class='ctx'> #ifndef __LINUX_SPI_XILINX_SPI_H</div><div class='ctx'> #define __LINUX_SPI_XILINX_SPI_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct spi_board_info;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct xspi_platform_data - Platform data of the Xilinx SPI driver</div><div class='del'>- * @num_chipselect:	Number of chip select by the IP.</div><div class='del'>- * @little_endian:	If registers should be accessed little endian or not.</div><div class='del'>- * @bits_per_word:	Number of bits per word.</div><div class='ctx'>  * @devices:		Devices to add when the driver is probed.</div><div class='ctx'>  * @num_devices:	Number of devices in the devices array.</div><div class='add'>+ * @num_chipselect:	Number of chip select by the IP.</div><div class='add'>+ * @bits_per_word:	Number of bits per word.</div><div class='add'>+ * @force_irq:		If set, forces QSPI transaction requirements.</div><div class='ctx'>  */</div><div class='ctx'> struct xspi_platform_data {</div><div class='del'>-	u16 num_chipselect;</div><div class='del'>-	u8 bits_per_word;</div><div class='ctx'> 	struct spi_board_info *devices;</div><div class='ctx'> 	u8 num_devices;</div><div class='add'>+	u8 num_chipselect;</div><div class='add'>+	u8 bits_per_word;</div><div class='ctx'> 	bool force_irq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h<br/>index 3fcd20de6ca8..d3561c4a080e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spinlock.h</a></div><div class='hunk'>@@ -462,11 +462,10 @@ static __always_inline int spin_is_contended(spinlock_t *lock)</div><div class='ctx'>  */</div><div class='ctx'> static inline int spin_needbreak(spinlock_t *lock)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PREEMPTION</div><div class='add'>+	if (!preempt_model_preemptible())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return spin_is_contended(lock);</div><div class='del'>-#else</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -479,11 +478,10 @@ static inline int spin_needbreak(spinlock_t *lock)</div><div class='ctx'>  */</div><div class='ctx'> static inline int rwlock_needbreak(rwlock_t *lock)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PREEMPTION</div><div class='add'>+	if (!preempt_model_preemptible())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return rwlock_is_contended(lock);</div><div class='del'>-#else</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -550,6 +548,12 @@ DEFINE_LOCK_GUARD_1(raw_spinlock_irq, raw_spinlock_t,</div><div class='ctx'> </div><div class='ctx'> DEFINE_LOCK_GUARD_1_COND(raw_spinlock_irq, _try, raw_spin_trylock_irq(_T-&gt;lock))</div><div class='ctx'> </div><div class='add'>+DEFINE_LOCK_GUARD_1(raw_spinlock_bh, raw_spinlock_t,</div><div class='add'>+		    raw_spin_lock_bh(_T-&gt;lock),</div><div class='add'>+		    raw_spin_unlock_bh(_T-&gt;lock))</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_1_COND(raw_spinlock_bh, _try, raw_spin_trylock_bh(_T-&gt;lock))</div><div class='add'>+</div><div class='ctx'> DEFINE_LOCK_GUARD_1(raw_spinlock_irqsave, raw_spinlock_t,</div><div class='ctx'> 		    raw_spin_lock_irqsave(_T-&gt;lock, _T-&gt;flags),</div><div class='ctx'> 		    raw_spin_unlock_irqrestore(_T-&gt;lock, _T-&gt;flags),</div><div class='hunk'>@@ -571,6 +575,13 @@ DEFINE_LOCK_GUARD_1(spinlock_irq, spinlock_t,</div><div class='ctx'> DEFINE_LOCK_GUARD_1_COND(spinlock_irq, _try,</div><div class='ctx'> 			 spin_trylock_irq(_T-&gt;lock))</div><div class='ctx'> </div><div class='add'>+DEFINE_LOCK_GUARD_1(spinlock_bh, spinlock_t,</div><div class='add'>+		    spin_lock_bh(_T-&gt;lock),</div><div class='add'>+		    spin_unlock_bh(_T-&gt;lock))</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_1_COND(spinlock_bh, _try,</div><div class='add'>+			 spin_trylock_bh(_T-&gt;lock))</div><div class='add'>+</div><div class='ctx'> DEFINE_LOCK_GUARD_1(spinlock_irqsave, spinlock_t,</div><div class='ctx'> 		    spin_lock_irqsave(_T-&gt;lock, _T-&gt;flags),</div><div class='ctx'> 		    spin_unlock_irqrestore(_T-&gt;lock, _T-&gt;flags),</div><div class='head'>diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h<br/>index 89eb6f4c659c..9ecb0ab504e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock_api_smp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock_api_smp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock_api_smp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spinlock_api_smp.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define __LINUX_SPINLOCK_API_SMP_H</div><div class='ctx'> </div><div class='ctx'> #ifndef __LINUX_INSIDE_SPINLOCK_H</div><div class='del'>-# error "please don't include this file directly"</div><div class='add'>+# error "Please do not include this file directly."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/spinlock_rt.h b/include/linux/spinlock_rt.h<br/>index 61c49b16f69a..f6499c37157d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock_rt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock_rt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock_rt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spinlock_rt.h</a></div><div class='hunk'>@@ -16,26 +16,25 @@ static inline void __rt_spin_lock_init(spinlock_t *lock, const char *name,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define spin_lock_init(slock)					\</div><div class='add'>+#define __spin_lock_init(slock, name, key, percpu)		\</div><div class='ctx'> do {								\</div><div class='del'>-	static struct lock_class_key __key;			\</div><div class='del'>-								\</div><div class='ctx'> 	rt_mutex_base_init(&amp;(slock)-&gt;lock);			\</div><div class='del'>-	__rt_spin_lock_init(slock, #slock, &amp;__key, false);	\</div><div class='add'>+	__rt_spin_lock_init(slock, name, key, percpu);		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define local_spin_lock_init(slock)				\</div><div class='add'>+#define _spin_lock_init(slock, percpu)				\</div><div class='ctx'> do {								\</div><div class='ctx'> 	static struct lock_class_key __key;			\</div><div class='del'>-								\</div><div class='del'>-	rt_mutex_base_init(&amp;(slock)-&gt;lock);			\</div><div class='del'>-	__rt_spin_lock_init(slock, #slock, &amp;__key, true);	\</div><div class='add'>+	__spin_lock_init(slock, #slock, &amp;__key, percpu);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-extern void rt_spin_lock(spinlock_t *lock);</div><div class='del'>-extern void rt_spin_lock_nested(spinlock_t *lock, int subclass);</div><div class='del'>-extern void rt_spin_lock_nest_lock(spinlock_t *lock, struct lockdep_map *nest_lock);</div><div class='del'>-extern void rt_spin_unlock(spinlock_t *lock);</div><div class='add'>+#define spin_lock_init(slock)		_spin_lock_init(slock, false)</div><div class='add'>+#define local_spin_lock_init(slock)	_spin_lock_init(slock, true)</div><div class='add'>+</div><div class='add'>+extern void rt_spin_lock(spinlock_t *lock) __acquires(lock);</div><div class='add'>+extern void rt_spin_lock_nested(spinlock_t *lock, int subclass)	__acquires(lock);</div><div class='add'>+extern void rt_spin_lock_nest_lock(spinlock_t *lock, struct lockdep_map *nest_lock) __acquires(lock);</div><div class='add'>+extern void rt_spin_unlock(spinlock_t *lock)	__releases(lock);</div><div class='ctx'> extern void rt_spin_lock_unlock(spinlock_t *lock);</div><div class='ctx'> extern int rt_spin_trylock_bh(spinlock_t *lock);</div><div class='ctx'> extern int rt_spin_trylock(spinlock_t *lock);</div><div class='hunk'>@@ -132,7 +131,7 @@ static __always_inline void spin_unlock_irqrestore(spinlock_t *lock,</div><div class='ctx'> #define spin_trylock_irq(lock)				\</div><div class='ctx'> 	__cond_lock(lock, rt_spin_trylock(lock))</div><div class='ctx'> </div><div class='del'>-#define __spin_trylock_irqsave(lock, flags)		\</div><div class='add'>+#define spin_trylock_irqsave(lock, flags)		\</div><div class='ctx'> ({							\</div><div class='ctx'> 	int __locked;					\</div><div class='ctx'> 							\</div><div class='hunk'>@@ -142,9 +141,6 @@ static __always_inline void spin_unlock_irqrestore(spinlock_t *lock,</div><div class='ctx'> 	__locked;					\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#define spin_trylock_irqsave(lock, flags)		\</div><div class='del'>-	__cond_lock(lock, __spin_trylock_irqsave(lock, flags))</div><div class='del'>-</div><div class='ctx'> #define spin_is_contended(lock)		(((void)(lock), 0))</div><div class='ctx'> </div><div class='ctx'> static inline int spin_is_locked(spinlock_t *lock)</div><div class='head'>diff --git a/include/linux/spinlock_types_up.h b/include/linux/spinlock_types_up.h<br/>index 7f86a2016ac5..fc4e2d017c20 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock_types_up.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock_types_up.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock_types_up.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spinlock_types_up.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define __LINUX_SPINLOCK_TYPES_UP_H</div><div class='ctx'> </div><div class='ctx'> #ifndef __LINUX_SPINLOCK_TYPES_RAW_H</div><div class='del'>-# error "please don't include this file directly"</div><div class='add'>+# error "Please do not include this file directly."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/spinlock_up.h b/include/linux/spinlock_up.h<br/>index c87204247592..1e84e71ca495 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock_up.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/spinlock_up.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/spinlock_up.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/spinlock_up.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #define __LINUX_SPINLOCK_UP_H</div><div class='ctx'> </div><div class='ctx'> #ifndef __LINUX_INSIDE_SPINLOCK_H</div><div class='del'>-# error "please don't include this file directly"</div><div class='add'>+# error "Please do not include this file directly."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;	/* for cpu_relax() */</div><div class='head'>diff --git a/include/linux/sprintf.h b/include/linux/sprintf.h<br/>index 33dcbec71925..f06f7b785091 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sprintf.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sprintf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sprintf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sprintf.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler_attributes.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/stdarg.h&gt;</div><div class='ctx'> </div><div class='ctx'> int num_to_str(char *buf, int size, unsigned long long num, unsigned int width);</div><div class='ctx'> </div><div class='hunk'>@@ -22,6 +23,9 @@ __scanf(2, 0) int vsscanf(const char *, const char *, va_list);</div><div class='ctx'> </div><div class='ctx'> /* These are for specific cases, do not use without real need */</div><div class='ctx'> extern bool no_hash_pointers;</div><div class='del'>-int no_hash_pointers_enable(char *str);</div><div class='add'>+void hash_pointers_finalize(bool slub_debug);</div><div class='add'>+</div><div class='add'>+/* Used for Rust formatting ('%pA') */</div><div class='add'>+char *rust_fmt_argument(char *buf, char *end, const void *ptr);</div><div class='ctx'> </div><div class='ctx'> #endif	/* _LINUX_KERNEL_SPRINTF_H */</div><div class='head'>diff --git a/include/linux/srcu.h b/include/linux/srcu.h<br/>index 236610e4a8fa..344ad51c8f6c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/srcu.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/srcu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/srcu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/srcu.h</a></div><div class='hunk'>@@ -25,8 +25,12 @@ struct srcu_struct;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_LOCK_ALLOC</div><div class='ctx'> </div><div class='del'>-int __init_srcu_struct(struct srcu_struct *ssp, const char *name,</div><div class='del'>-		       struct lock_class_key *key);</div><div class='add'>+int __init_srcu_struct(struct srcu_struct *ssp, const char *name, struct lock_class_key *key);</div><div class='add'>+#ifndef CONFIG_TINY_SRCU</div><div class='add'>+int __init_srcu_struct_fast(struct srcu_struct *ssp, const char *name, struct lock_class_key *key);</div><div class='add'>+int __init_srcu_struct_fast_updown(struct srcu_struct *ssp, const char *name,</div><div class='add'>+				   struct lock_class_key *key);</div><div class='add'>+#endif // #ifndef CONFIG_TINY_SRCU</div><div class='ctx'> </div><div class='ctx'> #define init_srcu_struct(ssp) \</div><div class='ctx'> ({ \</div><div class='hunk'>@@ -35,14 +39,46 @@ int __init_srcu_struct(struct srcu_struct *ssp, const char *name,</div><div class='ctx'> 	__init_srcu_struct((ssp), #ssp, &amp;__srcu_key); \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+#define init_srcu_struct_fast(ssp) \</div><div class='add'>+({ \</div><div class='add'>+	static struct lock_class_key __srcu_key; \</div><div class='add'>+	\</div><div class='add'>+	__init_srcu_struct_fast((ssp), #ssp, &amp;__srcu_key); \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define init_srcu_struct_fast_updown(ssp) \</div><div class='add'>+({ \</div><div class='add'>+	static struct lock_class_key __srcu_key; \</div><div class='add'>+	\</div><div class='add'>+	__init_srcu_struct_fast_updown((ssp), #ssp, &amp;__srcu_key); \</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> #define __SRCU_DEP_MAP_INIT(srcu_name)	.dep_map = { .name = #srcu_name },</div><div class='ctx'> #else /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */</div><div class='ctx'> </div><div class='ctx'> int init_srcu_struct(struct srcu_struct *ssp);</div><div class='add'>+#ifndef CONFIG_TINY_SRCU</div><div class='add'>+int init_srcu_struct_fast(struct srcu_struct *ssp);</div><div class='add'>+int init_srcu_struct_fast_updown(struct srcu_struct *ssp);</div><div class='add'>+#endif // #ifndef CONFIG_TINY_SRCU</div><div class='ctx'> </div><div class='ctx'> #define __SRCU_DEP_MAP_INIT(srcu_name)</div><div class='ctx'> #endif /* #else #ifdef CONFIG_DEBUG_LOCK_ALLOC */</div><div class='ctx'> </div><div class='add'>+/* Values for SRCU Tree srcu_data -&gt;srcu_reader_flavor, but also used by rcutorture. */</div><div class='add'>+#define SRCU_READ_FLAVOR_NORMAL		0x1		// srcu_read_lock().</div><div class='add'>+#define SRCU_READ_FLAVOR_NMI		0x2		// srcu_read_lock_nmisafe().</div><div class='add'>+//					0x4		// SRCU-lite is no longer with us.</div><div class='add'>+#define SRCU_READ_FLAVOR_FAST		0x4		// srcu_read_lock_fast().</div><div class='add'>+#define SRCU_READ_FLAVOR_FAST_UPDOWN	0x8		// srcu_read_lock_fast().</div><div class='add'>+#define SRCU_READ_FLAVOR_ALL		(SRCU_READ_FLAVOR_NORMAL | SRCU_READ_FLAVOR_NMI | \</div><div class='add'>+					 SRCU_READ_FLAVOR_FAST | SRCU_READ_FLAVOR_FAST_UPDOWN)</div><div class='add'>+						// All of the above.</div><div class='add'>+#define SRCU_READ_FLAVOR_SLOWGP		(SRCU_READ_FLAVOR_FAST | SRCU_READ_FLAVOR_FAST_UPDOWN)</div><div class='add'>+						// Flavors requiring synchronize_rcu()</div><div class='add'>+						// instead of smp_mb().</div><div class='add'>+void __srcu_read_unlock(struct srcu_struct *ssp, int idx) __releases(ssp);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_TINY_SRCU</div><div class='ctx'> #include &lt;linux/srcutiny.h&gt;</div><div class='ctx'> #elif defined(CONFIG_TREE_SRCU)</div><div class='hunk'>@@ -54,13 +90,46 @@ int init_srcu_struct(struct srcu_struct *ssp);</div><div class='ctx'> void call_srcu(struct srcu_struct *ssp, struct rcu_head *head,</div><div class='ctx'> 		void (*func)(struct rcu_head *head));</div><div class='ctx'> void cleanup_srcu_struct(struct srcu_struct *ssp);</div><div class='del'>-int __srcu_read_lock(struct srcu_struct *ssp) __acquires(ssp);</div><div class='del'>-void __srcu_read_unlock(struct srcu_struct *ssp, int idx) __releases(ssp);</div><div class='ctx'> void synchronize_srcu(struct srcu_struct *ssp);</div><div class='add'>+</div><div class='add'>+#define SRCU_GET_STATE_COMPLETED 0x1</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * get_completed_synchronize_srcu - Return a pre-completed polled state cookie</div><div class='add'>+ *</div><div class='add'>+ * Returns a value that poll_state_synchronize_srcu() will always treat</div><div class='add'>+ * as a cookie whose grace period has already completed.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long get_completed_synchronize_srcu(void)</div><div class='add'>+{</div><div class='add'>+	return SRCU_GET_STATE_COMPLETED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned long get_state_synchronize_srcu(struct srcu_struct *ssp);</div><div class='ctx'> unsigned long start_poll_synchronize_srcu(struct srcu_struct *ssp);</div><div class='ctx'> bool poll_state_synchronize_srcu(struct srcu_struct *ssp, unsigned long cookie);</div><div class='ctx'> </div><div class='add'>+// Maximum number of unsigned long values corresponding to</div><div class='add'>+// not-yet-completed SRCU grace periods.</div><div class='add'>+#define NUM_ACTIVE_SRCU_POLL_OLDSTATE 2</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * same_state_synchronize_srcu - Are two old-state values identical?</div><div class='add'>+ * @oldstate1: First old-state value.</div><div class='add'>+ * @oldstate2: Second old-state value.</div><div class='add'>+ *</div><div class='add'>+ * The two old-state values must have been obtained from either</div><div class='add'>+ * get_state_synchronize_srcu(), start_poll_synchronize_srcu(), or</div><div class='add'>+ * get_completed_synchronize_srcu().  Returns @true if the two values are</div><div class='add'>+ * identical and @false otherwise.  This allows structures whose lifetimes</div><div class='add'>+ * are tracked by old-state values to push these values to a list header,</div><div class='add'>+ * allowing those structures to be slightly smaller.</div><div class='add'>+ */</div><div class='add'>+static inline bool same_state_synchronize_srcu(unsigned long oldstate1, unsigned long oldstate2)</div><div class='add'>+{</div><div class='add'>+	return oldstate1 == oldstate2;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NEED_SRCU_NMI_SAFE</div><div class='ctx'> int __srcu_read_lock_nmisafe(struct srcu_struct *ssp) __acquires(ssp);</div><div class='ctx'> void __srcu_read_unlock_nmisafe(struct srcu_struct *ssp, int idx) __releases(ssp);</div><div class='hunk'>@@ -141,17 +210,6 @@ static inline int srcu_read_lock_held(const struct srcu_struct *ssp)</div><div class='ctx'> </div><div class='ctx'> #endif /* #else #ifdef CONFIG_DEBUG_LOCK_ALLOC */</div><div class='ctx'> </div><div class='del'>-#define SRCU_NMI_UNKNOWN	0x0</div><div class='del'>-#define SRCU_NMI_UNSAFE		0x1</div><div class='del'>-#define SRCU_NMI_SAFE		0x2</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PROVE_RCU) &amp;&amp; defined(CONFIG_TREE_SRCU)</div><div class='del'>-void srcu_check_nmi_safety(struct srcu_struct *ssp, bool nmi_safe);</div><div class='del'>-#else</div><div class='del'>-static inline void srcu_check_nmi_safety(struct srcu_struct *ssp,</div><div class='del'>-					 bool nmi_safe) { }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * srcu_dereference_check - fetch SRCU-protected pointer for later dereferencing</div><div class='hunk'>@@ -201,33 +259,152 @@ static inline void srcu_check_nmi_safety(struct srcu_struct *ssp,</div><div class='ctx'>  * a mutex that is held elsewhere while calling synchronize_srcu() or</div><div class='ctx'>  * synchronize_srcu_expedited().</div><div class='ctx'>  *</div><div class='del'>- * Note that srcu_read_lock() and the matching srcu_read_unlock() must</div><div class='del'>- * occur in the same context, for example, it is illegal to invoke</div><div class='del'>- * srcu_read_unlock() in an irq handler if the matching srcu_read_lock()</div><div class='del'>- * was invoked in process context.</div><div class='add'>+ * The return value from srcu_read_lock() is guaranteed to be</div><div class='add'>+ * non-negative.  This value must be passed unaltered to the matching</div><div class='add'>+ * srcu_read_unlock().  Note that srcu_read_lock() and the matching</div><div class='add'>+ * srcu_read_unlock() must occur in the same context, for example, it is</div><div class='add'>+ * illegal to invoke srcu_read_unlock() in an irq handler if the matching</div><div class='add'>+ * srcu_read_lock() was invoked in process context.  Or, for that matter to</div><div class='add'>+ * invoke srcu_read_unlock() from one task and the matching srcu_read_lock()</div><div class='add'>+ * from another.</div><div class='ctx'>  */</div><div class='ctx'> static inline int srcu_read_lock(struct srcu_struct *ssp) __acquires(ssp)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	srcu_check_nmi_safety(ssp, false);</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_NORMAL);</div><div class='ctx'> 	retval = __srcu_read_lock(ssp);</div><div class='ctx'> 	srcu_lock_acquire(&amp;ssp-&gt;dep_map);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * srcu_read_lock_fast - register a new reader for an SRCU-protected structure.</div><div class='add'>+ * @ssp: srcu_struct in which to register the new reader.</div><div class='add'>+ *</div><div class='add'>+ * Enter an SRCU read-side critical section, but for a light-weight</div><div class='add'>+ * smp_mb()-free reader.  See srcu_read_lock() for more information.  This</div><div class='add'>+ * function is NMI-safe, in a manner similar to srcu_read_lock_nmisafe().</div><div class='add'>+ *</div><div class='add'>+ * For srcu_read_lock_fast() to be used on an srcu_struct structure,</div><div class='add'>+ * that structure must have been defined using either DEFINE_SRCU_FAST()</div><div class='add'>+ * or DEFINE_STATIC_SRCU_FAST() on the one hand or initialized with</div><div class='add'>+ * init_srcu_struct_fast() on the other.  Such an srcu_struct structure</div><div class='add'>+ * cannot be passed to any non-fast variant of srcu_read_{,un}lock() or</div><div class='add'>+ * srcu_{down,up}_read().  In kernels built with CONFIG_PROVE_RCU=y,</div><div class='add'>+ * __srcu_check_read_flavor() will complain bitterly if you ignore this</div><div class='add'>+ * restriction.</div><div class='add'>+ *</div><div class='add'>+ * Grace-period auto-expediting is disabled for SRCU-fast srcu_struct</div><div class='add'>+ * structures because SRCU-fast expedited grace periods invoke</div><div class='add'>+ * synchronize_rcu_expedited(), IPIs and all.  If you need expedited</div><div class='add'>+ * SRCU-fast grace periods, use synchronize_srcu_expedited().</div><div class='add'>+ *</div><div class='add'>+ * The srcu_read_lock_fast() function can be invoked only from those</div><div class='add'>+ * contexts where RCU is watching, that is, from contexts where it would</div><div class='add'>+ * be legal to invoke rcu_read_lock().  Otherwise, lockdep will complain.</div><div class='add'>+ */</div><div class='add'>+static inline struct srcu_ctr __percpu *srcu_read_lock_fast(struct srcu_struct *ssp) __acquires(ssp)</div><div class='add'>+{</div><div class='add'>+	struct srcu_ctr __percpu *retval;</div><div class='add'>+</div><div class='add'>+	RCU_LOCKDEP_WARN(!rcu_is_watching(), "RCU must be watching srcu_read_lock_fast().");</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST);</div><div class='add'>+	retval = __srcu_read_lock_fast(ssp);</div><div class='add'>+	rcu_try_lock_acquire(&amp;ssp-&gt;dep_map);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srcu_read_lock_fast_updown - register a new reader for an SRCU-fast-updown structure.</div><div class='add'>+ * @ssp: srcu_struct in which to register the new reader.</div><div class='add'>+ *</div><div class='add'>+ * Enter an SRCU read-side critical section, but for a light-weight</div><div class='add'>+ * smp_mb()-free reader.  See srcu_read_lock() for more information.</div><div class='add'>+ * This function is compatible with srcu_down_read_fast(), but is not</div><div class='add'>+ * NMI-safe.</div><div class='add'>+ *</div><div class='add'>+ * For srcu_read_lock_fast_updown() to be used on an srcu_struct</div><div class='add'>+ * structure, that structure must have been defined using either</div><div class='add'>+ * DEFINE_SRCU_FAST_UPDOWN() or DEFINE_STATIC_SRCU_FAST_UPDOWN() on the one</div><div class='add'>+ * hand or initialized with init_srcu_struct_fast_updown() on the other.</div><div class='add'>+ * Such an srcu_struct structure cannot be passed to any non-fast-updown</div><div class='add'>+ * variant of srcu_read_{,un}lock() or srcu_{down,up}_read().  In kernels</div><div class='add'>+ * built with CONFIG_PROVE_RCU=y, __srcu_check_read_flavor() will complain</div><div class='add'>+ * bitterly if you ignore this * restriction.</div><div class='add'>+ *</div><div class='add'>+ * Grace-period auto-expediting is disabled for SRCU-fast-updown</div><div class='add'>+ * srcu_struct structures because SRCU-fast-updown expedited grace periods</div><div class='add'>+ * invoke synchronize_rcu_expedited(), IPIs and all.  If you need expedited</div><div class='add'>+ * SRCU-fast-updown grace periods, use synchronize_srcu_expedited().</div><div class='add'>+ *</div><div class='add'>+ * The srcu_read_lock_fast_updown() function can be invoked only from</div><div class='add'>+ * those contexts where RCU is watching, that is, from contexts where</div><div class='add'>+ * it would be legal to invoke rcu_read_lock().  Otherwise, lockdep will</div><div class='add'>+ * complain.</div><div class='add'>+ */</div><div class='add'>+static inline struct srcu_ctr __percpu *srcu_read_lock_fast_updown(struct srcu_struct *ssp)</div><div class='add'>+__acquires(ssp)</div><div class='add'>+{</div><div class='add'>+	struct srcu_ctr __percpu *retval;</div><div class='add'>+</div><div class='add'>+	RCU_LOCKDEP_WARN(!rcu_is_watching(), "RCU must be watching srcu_read_lock_fast_updown().");</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST_UPDOWN);</div><div class='add'>+	retval = __srcu_read_lock_fast_updown(ssp);</div><div class='add'>+	rcu_try_lock_acquire(&amp;ssp-&gt;dep_map);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Used by tracing, cannot be traced and cannot call lockdep.</div><div class='add'>+ * See srcu_read_lock_fast() for more information.</div><div class='add'>+ */</div><div class='add'>+static inline struct srcu_ctr __percpu *srcu_read_lock_fast_notrace(struct srcu_struct *ssp)</div><div class='add'>+	__acquires(ssp)</div><div class='add'>+{</div><div class='add'>+	struct srcu_ctr __percpu *retval;</div><div class='add'>+</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST);</div><div class='add'>+	retval = __srcu_read_lock_fast(ssp);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srcu_down_read_fast - register a new reader for an SRCU-protected structure.</div><div class='add'>+ * @ssp: srcu_struct in which to register the new reader.</div><div class='add'>+ *</div><div class='add'>+ * Enter a semaphore-like SRCU read-side critical section, but for</div><div class='add'>+ * a light-weight smp_mb()-free reader.  See srcu_read_lock_fast() and</div><div class='add'>+ * srcu_down_read() for more information.</div><div class='add'>+ *</div><div class='add'>+ * The same srcu_struct may be used concurrently by srcu_down_read_fast()</div><div class='add'>+ * and srcu_read_lock_fast().  However, the same definition/initialization</div><div class='add'>+ * requirements called out for srcu_read_lock_safe() apply.</div><div class='add'>+ */</div><div class='add'>+static inline struct srcu_ctr __percpu *srcu_down_read_fast(struct srcu_struct *ssp) __acquires(ssp)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(IS_ENABLED(CONFIG_PROVE_RCU) &amp;&amp; in_nmi());</div><div class='add'>+	RCU_LOCKDEP_WARN(!rcu_is_watching(), "RCU must be watching srcu_down_read_fast().");</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST_UPDOWN);</div><div class='add'>+	return __srcu_read_lock_fast_updown(ssp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * srcu_read_lock_nmisafe - register a new reader for an SRCU-protected structure.</div><div class='ctx'>  * @ssp: srcu_struct in which to register the new reader.</div><div class='ctx'>  *</div><div class='ctx'>  * Enter an SRCU read-side critical section, but in an NMI-safe manner.</div><div class='ctx'>  * See srcu_read_lock() for more information.</div><div class='add'>+ *</div><div class='add'>+ * If srcu_read_lock_nmisafe() is ever used on an srcu_struct structure,</div><div class='add'>+ * then none of the other flavors may be used, whether before, during,</div><div class='add'>+ * or after.</div><div class='ctx'>  */</div><div class='ctx'> static inline int srcu_read_lock_nmisafe(struct srcu_struct *ssp) __acquires(ssp)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	srcu_check_nmi_safety(ssp, true);</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_NMI);</div><div class='ctx'> 	retval = __srcu_read_lock_nmisafe(ssp);</div><div class='ctx'> 	rcu_try_lock_acquire(&amp;ssp-&gt;dep_map);</div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -239,7 +416,7 @@ srcu_read_lock_notrace(struct srcu_struct *ssp) __acquires(ssp)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	srcu_check_nmi_safety(ssp, false);</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_NORMAL);</div><div class='ctx'> 	retval = __srcu_read_lock(ssp);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -263,12 +440,13 @@ srcu_read_lock_notrace(struct srcu_struct *ssp) __acquires(ssp)</div><div class='ctx'>  * srcu_down_read() nor srcu_up_read() may be invoked from an NMI handler.</div><div class='ctx'>  *</div><div class='ctx'>  * Calls to srcu_down_read() may be nested, similar to the manner in</div><div class='del'>- * which calls to down_read() may be nested.</div><div class='add'>+ * which calls to down_read() may be nested.  The same srcu_struct may be</div><div class='add'>+ * used concurrently by srcu_down_read() and srcu_read_lock().</div><div class='ctx'>  */</div><div class='ctx'> static inline int srcu_down_read(struct srcu_struct *ssp) __acquires(ssp)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(in_nmi());</div><div class='del'>-	srcu_check_nmi_safety(ssp, false);</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_NORMAL);</div><div class='ctx'> 	return __srcu_read_lock(ssp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -283,15 +461,76 @@ static inline void srcu_read_unlock(struct srcu_struct *ssp, int idx)</div><div class='ctx'> 	__releases(ssp)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(idx &amp; ~0x1);</div><div class='del'>-	srcu_check_nmi_safety(ssp, false);</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_NORMAL);</div><div class='ctx'> 	srcu_lock_release(&amp;ssp-&gt;dep_map);</div><div class='ctx'> 	__srcu_read_unlock(ssp, idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * srcu_read_unlock_fast - unregister a old reader from an SRCU-protected structure.</div><div class='add'>+ * @ssp: srcu_struct in which to unregister the old reader.</div><div class='add'>+ * @scp: return value from corresponding srcu_read_lock_fast().</div><div class='add'>+ *</div><div class='add'>+ * Exit a light-weight SRCU read-side critical section.</div><div class='add'>+ */</div><div class='add'>+static inline void srcu_read_unlock_fast(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp)</div><div class='add'>+	__releases(ssp)</div><div class='add'>+{</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST);</div><div class='add'>+	srcu_lock_release(&amp;ssp-&gt;dep_map);</div><div class='add'>+	__srcu_read_unlock_fast(ssp, scp);</div><div class='add'>+	RCU_LOCKDEP_WARN(!rcu_is_watching(), "RCU must be watching srcu_read_unlock_fast().");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srcu_read_unlock_fast_updown - unregister a old reader from an SRCU-fast-updown structure.</div><div class='add'>+ * @ssp: srcu_struct in which to unregister the old reader.</div><div class='add'>+ * @scp: return value from corresponding srcu_read_lock_fast_updown().</div><div class='add'>+ *</div><div class='add'>+ * Exit an SRCU-fast-updown read-side critical section.</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+srcu_read_unlock_fast_updown(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp) __releases(ssp)</div><div class='add'>+{</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST_UPDOWN);</div><div class='add'>+	srcu_lock_release(&amp;ssp-&gt;dep_map);</div><div class='add'>+	__srcu_read_unlock_fast_updown(ssp, scp);</div><div class='add'>+	RCU_LOCKDEP_WARN(!rcu_is_watching(),</div><div class='add'>+			 "RCU must be watching srcu_read_unlock_fast_updown().");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Used by tracing, cannot be traced and cannot call lockdep.</div><div class='add'>+ * See srcu_read_unlock_fast() for more information.</div><div class='add'>+ */</div><div class='add'>+static inline void srcu_read_unlock_fast_notrace(struct srcu_struct *ssp,</div><div class='add'>+						 struct srcu_ctr __percpu *scp) __releases(ssp)</div><div class='add'>+{</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST);</div><div class='add'>+	__srcu_read_unlock_fast(ssp, scp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * srcu_up_read_fast - unregister a old reader from an SRCU-protected structure.</div><div class='add'>+ * @ssp: srcu_struct in which to unregister the old reader.</div><div class='add'>+ * @scp: return value from corresponding srcu_read_lock_fast().</div><div class='add'>+ *</div><div class='add'>+ * Exit an SRCU read-side critical section, but not necessarily from</div><div class='add'>+ * the same context as the maching srcu_down_read_fast().</div><div class='add'>+ */</div><div class='add'>+static inline void srcu_up_read_fast(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp)</div><div class='add'>+	__releases(ssp)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(IS_ENABLED(CONFIG_PROVE_RCU) &amp;&amp; in_nmi());</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST_UPDOWN);</div><div class='add'>+	__srcu_read_unlock_fast_updown(ssp, scp);</div><div class='add'>+	RCU_LOCKDEP_WARN(!rcu_is_watching(), "RCU must be watching srcu_up_read_fast_updown().");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * srcu_read_unlock_nmisafe - unregister a old reader from an SRCU-protected structure.</div><div class='ctx'>  * @ssp: srcu_struct in which to unregister the old reader.</div><div class='del'>- * @idx: return value from corresponding srcu_read_lock().</div><div class='add'>+ * @idx: return value from corresponding srcu_read_lock_nmisafe().</div><div class='ctx'>  *</div><div class='ctx'>  * Exit an SRCU read-side critical section, but in an NMI-safe manner.</div><div class='ctx'>  */</div><div class='hunk'>@@ -299,7 +538,7 @@ static inline void srcu_read_unlock_nmisafe(struct srcu_struct *ssp, int idx)</div><div class='ctx'> 	__releases(ssp)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(idx &amp; ~0x1);</div><div class='del'>-	srcu_check_nmi_safety(ssp, true);</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_NMI);</div><div class='ctx'> 	rcu_lock_release(&amp;ssp-&gt;dep_map);</div><div class='ctx'> 	__srcu_read_unlock_nmisafe(ssp, idx);</div><div class='ctx'> }</div><div class='hunk'>@@ -308,7 +547,7 @@ static inline void srcu_read_unlock_nmisafe(struct srcu_struct *ssp, int idx)</div><div class='ctx'> static inline notrace void</div><div class='ctx'> srcu_read_unlock_notrace(struct srcu_struct *ssp, int idx) __releases(ssp)</div><div class='ctx'> {</div><div class='del'>-	srcu_check_nmi_safety(ssp, false);</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_NORMAL);</div><div class='ctx'> 	__srcu_read_unlock(ssp, idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -325,7 +564,7 @@ static inline void srcu_up_read(struct srcu_struct *ssp, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	WARN_ON_ONCE(idx &amp; ~0x1);</div><div class='ctx'> 	WARN_ON_ONCE(in_nmi());</div><div class='del'>-	srcu_check_nmi_safety(ssp, false);</div><div class='add'>+	srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_NORMAL);</div><div class='ctx'> 	__srcu_read_unlock(ssp, idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -343,9 +582,33 @@ static inline void smp_mb__after_srcu_read_unlock(void)</div><div class='ctx'> 	/* __srcu_read_unlock has smp_mb() internally so nothing to do here. */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * smp_mb__after_srcu_read_lock - ensure full ordering after srcu_read_lock</div><div class='add'>+ *</div><div class='add'>+ * Converts the preceding srcu_read_lock into a two-way memory barrier.</div><div class='add'>+ *</div><div class='add'>+ * Call this after srcu_read_lock, to guarantee that all memory operations</div><div class='add'>+ * that occur after smp_mb__after_srcu_read_lock will appear to happen after</div><div class='add'>+ * the preceding srcu_read_lock.</div><div class='add'>+ */</div><div class='add'>+static inline void smp_mb__after_srcu_read_lock(void)</div><div class='add'>+{</div><div class='add'>+	/* __srcu_read_lock has smp_mb() internally so nothing to do here. */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> DEFINE_LOCK_GUARD_1(srcu, struct srcu_struct,</div><div class='ctx'> 		    _T-&gt;idx = srcu_read_lock(_T-&gt;lock),</div><div class='ctx'> 		    srcu_read_unlock(_T-&gt;lock, _T-&gt;idx),</div><div class='ctx'> 		    int idx)</div><div class='ctx'> </div><div class='add'>+DEFINE_LOCK_GUARD_1(srcu_fast, struct srcu_struct,</div><div class='add'>+		    _T-&gt;scp = srcu_read_lock_fast(_T-&gt;lock),</div><div class='add'>+		    srcu_read_unlock_fast(_T-&gt;lock, _T-&gt;scp),</div><div class='add'>+		    struct srcu_ctr __percpu *scp)</div><div class='add'>+</div><div class='add'>+DEFINE_LOCK_GUARD_1(srcu_fast_notrace, struct srcu_struct,</div><div class='add'>+		    _T-&gt;scp = srcu_read_lock_fast_notrace(_T-&gt;lock),</div><div class='add'>+		    srcu_read_unlock_fast_notrace(_T-&gt;lock, _T-&gt;scp),</div><div class='add'>+		    struct srcu_ctr __percpu *scp)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/srcutiny.h b/include/linux/srcutiny.h<br/>index 447133171d95..e0698024667a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/srcutiny.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/srcutiny.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/srcutiny.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/srcutiny.h</a></div><div class='hunk'>@@ -31,7 +31,7 @@ struct srcu_struct {</div><div class='ctx'> </div><div class='ctx'> void srcu_drive_gp(struct work_struct *wp);</div><div class='ctx'> </div><div class='del'>-#define __SRCU_STRUCT_INIT(name, __ignored, ___ignored)			\</div><div class='add'>+#define __SRCU_STRUCT_INIT(name, __ignored, ___ignored, ____ignored)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	.srcu_wq = __SWAIT_QUEUE_HEAD_INITIALIZER(name.srcu_wq),	\</div><div class='ctx'> 	.srcu_cb_tail = &amp;name.srcu_cb_head,				\</div><div class='hunk'>@@ -44,13 +44,25 @@ void srcu_drive_gp(struct work_struct *wp);</div><div class='ctx'>  * Tree SRCU, which needs some per-CPU data.</div><div class='ctx'>  */</div><div class='ctx'> #define DEFINE_SRCU(name) \</div><div class='del'>-	struct srcu_struct name = __SRCU_STRUCT_INIT(name, name, name)</div><div class='add'>+	struct srcu_struct name = __SRCU_STRUCT_INIT(name, name, name, name)</div><div class='ctx'> #define DEFINE_STATIC_SRCU(name) \</div><div class='del'>-	static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name, name)</div><div class='add'>+	static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name, name, name)</div><div class='add'>+#define DEFINE_SRCU_FAST(name) DEFINE_SRCU(name)</div><div class='add'>+#define DEFINE_STATIC_SRCU_FAST(name) \</div><div class='add'>+	static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name, name, name)</div><div class='add'>+#define DEFINE_SRCU_FAST_UPDOWN(name) DEFINE_SRCU(name)</div><div class='add'>+#define DEFINE_STATIC_SRCU_FAST_UPDOWN(name) \</div><div class='add'>+	static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name, name, name)</div><div class='ctx'> </div><div class='ctx'> // Dummy structure for srcu_notifier_head.</div><div class='ctx'> struct srcu_usage { };</div><div class='ctx'> #define __SRCU_USAGE_INIT(name) { }</div><div class='add'>+#define __init_srcu_struct_fast __init_srcu_struct</div><div class='add'>+#define __init_srcu_struct_fast_updown __init_srcu_struct</div><div class='add'>+#ifndef CONFIG_DEBUG_LOCK_ALLOC</div><div class='add'>+#define init_srcu_struct_fast init_srcu_struct</div><div class='add'>+#define init_srcu_struct_fast_updown init_srcu_struct</div><div class='add'>+#endif // #ifndef CONFIG_DEBUG_LOCK_ALLOC</div><div class='ctx'> </div><div class='ctx'> void synchronize_srcu(struct srcu_struct *ssp);</div><div class='ctx'> </div><div class='hunk'>@@ -64,11 +76,46 @@ static inline int __srcu_read_lock(struct srcu_struct *ssp)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='add'>+	preempt_disable();  // Needed for PREEMPT_LAZY</div><div class='ctx'> 	idx = ((READ_ONCE(ssp-&gt;srcu_idx) + 1) &amp; 0x2) &gt;&gt; 1;</div><div class='ctx'> 	WRITE_ONCE(ssp-&gt;srcu_lock_nesting[idx], READ_ONCE(ssp-&gt;srcu_lock_nesting[idx]) + 1);</div><div class='add'>+	preempt_enable();</div><div class='ctx'> 	return idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct srcu_ctr;</div><div class='add'>+</div><div class='add'>+static inline bool __srcu_ptr_to_ctr(struct srcu_struct *ssp, struct srcu_ctr __percpu *scpp)</div><div class='add'>+{</div><div class='add'>+	return (int)(intptr_t)(struct srcu_ctr __force __kernel *)scpp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct srcu_ctr __percpu *__srcu_ctr_to_ptr(struct srcu_struct *ssp, int idx)</div><div class='add'>+{</div><div class='add'>+	return (struct srcu_ctr __percpu *)(intptr_t)idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct srcu_ctr __percpu *__srcu_read_lock_fast(struct srcu_struct *ssp)</div><div class='add'>+{</div><div class='add'>+	return __srcu_ctr_to_ptr(ssp, __srcu_read_lock(ssp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __srcu_read_unlock_fast(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp)</div><div class='add'>+{</div><div class='add'>+	__srcu_read_unlock(ssp, __srcu_ptr_to_ctr(ssp, scp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct srcu_ctr __percpu *__srcu_read_lock_fast_updown(struct srcu_struct *ssp)</div><div class='add'>+{</div><div class='add'>+	return __srcu_ctr_to_ptr(ssp, __srcu_read_lock(ssp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void __srcu_read_unlock_fast_updown(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp)</div><div class='add'>+{</div><div class='add'>+	__srcu_read_unlock(ssp, __srcu_ptr_to_ctr(ssp, scp));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void synchronize_srcu_expedited(struct srcu_struct *ssp)</div><div class='ctx'> {</div><div class='ctx'> 	synchronize_srcu(ssp);</div><div class='hunk'>@@ -79,6 +126,9 @@ static inline void srcu_barrier(struct srcu_struct *ssp)</div><div class='ctx'> 	synchronize_srcu(ssp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void srcu_expedite_current(struct srcu_struct *ssp) { }</div><div class='add'>+#define srcu_check_read_flavor(ssp, read_flavor) do { } while (0)</div><div class='add'>+</div><div class='ctx'> /* Defined here to avoid size increase for non-torture kernels. */</div><div class='ctx'> static inline void srcu_torture_stats_print(struct srcu_struct *ssp,</div><div class='ctx'> 					    char *tt, char *tf)</div><div class='head'>diff --git a/include/linux/srcutree.h b/include/linux/srcutree.h<br/>index 8f3f72480e78..d6f978b50472 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/srcutree.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/srcutree.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/srcutree.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/srcutree.h</a></div><div class='hunk'>@@ -17,15 +17,21 @@</div><div class='ctx'> struct srcu_node;</div><div class='ctx'> struct srcu_struct;</div><div class='ctx'> </div><div class='add'>+/* One element of the srcu_data srcu_ctrs array. */</div><div class='add'>+struct srcu_ctr {</div><div class='add'>+	atomic_long_t srcu_locks;	/* Locks per CPU. */</div><div class='add'>+	atomic_long_t srcu_unlocks;	/* Unlocks per CPU. */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Per-CPU structure feeding into leaf srcu_node, similar in function</div><div class='ctx'>  * to rcu_node.</div><div class='ctx'>  */</div><div class='ctx'> struct srcu_data {</div><div class='ctx'> 	/* Read-side state. */</div><div class='del'>-	atomic_long_t srcu_lock_count[2];	/* Locks per CPU. */</div><div class='del'>-	atomic_long_t srcu_unlock_count[2];	/* Unlocks per CPU. */</div><div class='del'>-	int srcu_nmi_safety;			/* NMI-safe srcu_struct structure? */</div><div class='add'>+	struct srcu_ctr srcu_ctrs[2];		/* Locks and unlocks per CPU. */</div><div class='add'>+	int srcu_reader_flavor;			/* Reader flavor for srcu_struct structure? */</div><div class='add'>+						/* Values: SRCU_READ_FLAVOR_.*  */</div><div class='ctx'> </div><div class='ctx'> 	/* Update-side state. */</div><div class='ctx'> 	spinlock_t __private lock ____cacheline_internodealigned_in_smp;</div><div class='hunk'>@@ -36,6 +42,8 @@ struct srcu_data {</div><div class='ctx'> 	struct timer_list delay_work;		/* Delay for CB invoking */</div><div class='ctx'> 	struct work_struct work;		/* Context for CB invoking. */</div><div class='ctx'> 	struct rcu_head srcu_barrier_head;	/* For srcu_barrier() use. */</div><div class='add'>+	struct rcu_head srcu_ec_head;		/* For srcu_expedite_current() use. */</div><div class='add'>+	int srcu_ec_state;			/*  State for srcu_expedite_current(). */</div><div class='ctx'> 	struct srcu_node *mynode;		/* Leaf srcu_node. */</div><div class='ctx'> 	unsigned long grpmask;			/* Mask for leaf srcu_node */</div><div class='ctx'> 						/*  -&gt;srcu_data_have_cbs[]. */</div><div class='hunk'>@@ -94,8 +102,9 @@ struct srcu_usage {</div><div class='ctx'>  * Per-SRCU-domain structure, similar in function to rcu_state.</div><div class='ctx'>  */</div><div class='ctx'> struct srcu_struct {</div><div class='del'>-	unsigned int srcu_idx;			/* Current rdr array element. */</div><div class='add'>+	struct srcu_ctr __percpu *srcu_ctrp;</div><div class='ctx'> 	struct srcu_data __percpu *sda;		/* Per-CPU srcu_data array. */</div><div class='add'>+	u8 srcu_reader_flavor;</div><div class='ctx'> 	struct lockdep_map dep_map;</div><div class='ctx'> 	struct srcu_usage *srcu_sup;		/* Update-side data. */</div><div class='ctx'> };</div><div class='hunk'>@@ -129,26 +138,46 @@ struct srcu_struct {</div><div class='ctx'> #define SRCU_STATE_SCAN1	1</div><div class='ctx'> #define SRCU_STATE_SCAN2	2</div><div class='ctx'> </div><div class='add'>+/* Values for srcu_expedite_current() state (-&gt;srcu_ec_state). */</div><div class='add'>+#define SRCU_EC_IDLE		0</div><div class='add'>+#define SRCU_EC_PENDING		1</div><div class='add'>+#define SRCU_EC_REPOST		2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Values for initializing gp sequence fields. Higher values allow wrap arounds to</div><div class='add'>+ * occur earlier.</div><div class='add'>+ * The second value with state is useful in the case of static initialization of</div><div class='add'>+ * srcu_usage where srcu_gp_seq_needed is expected to have some state value in its</div><div class='add'>+ * lower bits (or else it will appear to be already initialized within</div><div class='add'>+ * the call check_init_srcu_struct()).</div><div class='add'>+ */</div><div class='add'>+#define SRCU_GP_SEQ_INITIAL_VAL ((0UL - 100UL) &lt;&lt; RCU_SEQ_CTR_SHIFT)</div><div class='add'>+#define SRCU_GP_SEQ_INITIAL_VAL_WITH_STATE (SRCU_GP_SEQ_INITIAL_VAL - 1)</div><div class='add'>+</div><div class='ctx'> #define __SRCU_USAGE_INIT(name)									\</div><div class='ctx'> {												\</div><div class='ctx'> 	.lock = __SPIN_LOCK_UNLOCKED(name.lock),						\</div><div class='del'>-	.srcu_gp_seq_needed = -1UL,								\</div><div class='add'>+	.srcu_gp_seq = SRCU_GP_SEQ_INITIAL_VAL,							\</div><div class='add'>+	.srcu_gp_seq_needed = SRCU_GP_SEQ_INITIAL_VAL_WITH_STATE,				\</div><div class='add'>+	.srcu_gp_seq_needed_exp = SRCU_GP_SEQ_INITIAL_VAL,					\</div><div class='ctx'> 	.work = __DELAYED_WORK_INITIALIZER(name.work, NULL, 0),					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define __SRCU_STRUCT_INIT_COMMON(name, usage_name)						\</div><div class='add'>+#define __SRCU_STRUCT_INIT_COMMON(name, usage_name, fast)					\</div><div class='ctx'> 	.srcu_sup = &amp;usage_name,								\</div><div class='add'>+	.srcu_reader_flavor = fast,								\</div><div class='ctx'> 	__SRCU_DEP_MAP_INIT(name)</div><div class='ctx'> </div><div class='del'>-#define __SRCU_STRUCT_INIT_MODULE(name, usage_name)						\</div><div class='add'>+#define __SRCU_STRUCT_INIT_MODULE(name, usage_name, fast)					\</div><div class='ctx'> {												\</div><div class='del'>-	__SRCU_STRUCT_INIT_COMMON(name, usage_name)						\</div><div class='add'>+	__SRCU_STRUCT_INIT_COMMON(name, usage_name, fast)					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define __SRCU_STRUCT_INIT(name, usage_name, pcpu_name)						\</div><div class='add'>+#define __SRCU_STRUCT_INIT(name, usage_name, pcpu_name, fast)					\</div><div class='ctx'> {												\</div><div class='ctx'> 	.sda = &amp;pcpu_name,									\</div><div class='del'>-	__SRCU_STRUCT_INIT_COMMON(name, usage_name)						\</div><div class='add'>+	.srcu_ctrp = &amp;pcpu_name.srcu_ctrs[0],							\</div><div class='add'>+	__SRCU_STRUCT_INIT_COMMON(name, usage_name, fast)						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -169,26 +198,171 @@ struct srcu_struct {</div><div class='ctx'>  *	init_srcu_struct(&amp;my_srcu);</div><div class='ctx'>  *</div><div class='ctx'>  * See include/linux/percpu-defs.h for the rules on per-CPU variables.</div><div class='add'>+ *</div><div class='add'>+ * DEFINE_SRCU_FAST() and DEFINE_STATIC_SRCU_FAST create an srcu_struct</div><div class='add'>+ * and associated structures whose readers must be of the SRCU-fast variety.</div><div class='add'>+ * DEFINE_SRCU_FAST_UPDOWN() and DEFINE_STATIC_SRCU_FAST_UPDOWN() create</div><div class='add'>+ * an srcu_struct and associated structures whose readers must be of the</div><div class='add'>+ * SRCU-fast-updown variety.  The key point (aside from error checking) with</div><div class='add'>+ * both varieties is that the grace periods must use synchronize_rcu()</div><div class='add'>+ * instead of smp_mb(), and given that the first (for example)</div><div class='add'>+ * srcu_read_lock_fast() might race with the first synchronize_srcu(),</div><div class='add'>+ * this different must be specified at initialization time.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-# define __DEFINE_SRCU(name, is_static)								\</div><div class='add'>+# define __DEFINE_SRCU(name, fast, is_static)							\</div><div class='ctx'> 	static struct srcu_usage name##_srcu_usage = __SRCU_USAGE_INIT(name##_srcu_usage);	\</div><div class='del'>-	is_static struct srcu_struct name = __SRCU_STRUCT_INIT_MODULE(name, name##_srcu_usage);	\</div><div class='add'>+	is_static struct srcu_struct name = __SRCU_STRUCT_INIT_MODULE(name, name##_srcu_usage,	\</div><div class='add'>+								      fast);			\</div><div class='ctx'> 	extern struct srcu_struct * const __srcu_struct_##name;					\</div><div class='ctx'> 	struct srcu_struct * const __srcu_struct_##name						\</div><div class='ctx'> 		__section("___srcu_struct_ptrs") = &amp;name</div><div class='ctx'> #else</div><div class='del'>-# define __DEFINE_SRCU(name, is_static)								\</div><div class='add'>+# define __DEFINE_SRCU(name, fast, is_static)							\</div><div class='ctx'> 	static DEFINE_PER_CPU(struct srcu_data, name##_srcu_data);				\</div><div class='ctx'> 	static struct srcu_usage name##_srcu_usage = __SRCU_USAGE_INIT(name##_srcu_usage);	\</div><div class='ctx'> 	is_static struct srcu_struct name =							\</div><div class='del'>-		__SRCU_STRUCT_INIT(name, name##_srcu_usage, name##_srcu_data)</div><div class='add'>+		__SRCU_STRUCT_INIT(name, name##_srcu_usage, name##_srcu_data, fast)</div><div class='ctx'> #endif</div><div class='del'>-#define DEFINE_SRCU(name)		__DEFINE_SRCU(name, /* not static */)</div><div class='del'>-#define DEFINE_STATIC_SRCU(name)	__DEFINE_SRCU(name, static)</div><div class='add'>+#define DEFINE_SRCU(name)		__DEFINE_SRCU(name, 0, /* not static */)</div><div class='add'>+#define DEFINE_STATIC_SRCU(name)	__DEFINE_SRCU(name, 0, static)</div><div class='add'>+#define DEFINE_SRCU_FAST(name)		__DEFINE_SRCU(name, SRCU_READ_FLAVOR_FAST, /* not static */)</div><div class='add'>+#define DEFINE_STATIC_SRCU_FAST(name)	__DEFINE_SRCU(name, SRCU_READ_FLAVOR_FAST, static)</div><div class='add'>+#define DEFINE_SRCU_FAST_UPDOWN(name)	__DEFINE_SRCU(name, SRCU_READ_FLAVOR_FAST_UPDOWN, \</div><div class='add'>+						      /* not static */)</div><div class='add'>+#define DEFINE_STATIC_SRCU_FAST_UPDOWN(name) \</div><div class='add'>+					__DEFINE_SRCU(name, SRCU_READ_FLAVOR_FAST_UPDOWN, static)</div><div class='ctx'> </div><div class='add'>+int __srcu_read_lock(struct srcu_struct *ssp) __acquires(ssp);</div><div class='ctx'> void synchronize_srcu_expedited(struct srcu_struct *ssp);</div><div class='ctx'> void srcu_barrier(struct srcu_struct *ssp);</div><div class='add'>+void srcu_expedite_current(struct srcu_struct *ssp);</div><div class='ctx'> void srcu_torture_stats_print(struct srcu_struct *ssp, char *tt, char *tf);</div><div class='ctx'> </div><div class='add'>+// Converts a per-CPU pointer to an -&gt;srcu_ctrs[] array element to that</div><div class='add'>+// element's index.</div><div class='add'>+static inline bool __srcu_ptr_to_ctr(struct srcu_struct *ssp, struct srcu_ctr __percpu *scpp)</div><div class='add'>+{</div><div class='add'>+	return scpp - &amp;ssp-&gt;sda-&gt;srcu_ctrs[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Converts an integer to a per-CPU pointer to the corresponding</div><div class='add'>+// -&gt;srcu_ctrs[] array element.</div><div class='add'>+static inline struct srcu_ctr __percpu *__srcu_ctr_to_ptr(struct srcu_struct *ssp, int idx)</div><div class='add'>+{</div><div class='add'>+	return &amp;ssp-&gt;sda-&gt;srcu_ctrs[idx];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Counts the new reader in the appropriate per-CPU element of the</div><div class='add'>+ * srcu_struct.  Returns a pointer that must be passed to the matching</div><div class='add'>+ * srcu_read_unlock_fast().</div><div class='add'>+ *</div><div class='add'>+ * Note that both this_cpu_inc() and atomic_long_inc() are RCU read-side</div><div class='add'>+ * critical sections either because they disables interrupts, because</div><div class='add'>+ * they are a single instruction, or because they are read-modify-write</div><div class='add'>+ * atomic operations, depending on the whims of the architecture.</div><div class='add'>+ * This matters because the SRCU-fast grace-period mechanism uses either</div><div class='add'>+ * synchronize_rcu() or synchronize_rcu_expedited(), that is, RCU,</div><div class='add'>+ * *not* SRCU, in order to eliminate the need for the read-side smp_mb()</div><div class='add'>+ * invocations that are used by srcu_read_lock() and srcu_read_unlock().</div><div class='add'>+ * The __srcu_read_unlock_fast() function also relies on this same RCU</div><div class='add'>+ * (again, *not* SRCU) trick to eliminate the need for smp_mb().</div><div class='add'>+ *</div><div class='add'>+ * The key point behind this RCU trick is that if any part of a given</div><div class='add'>+ * RCU reader precedes the beginning of a given RCU grace period, then</div><div class='add'>+ * the entirety of that RCU reader and everything preceding it happens</div><div class='add'>+ * before the end of that same RCU grace period.  Similarly, if any part</div><div class='add'>+ * of a given RCU reader follows the end of a given RCU grace period,</div><div class='add'>+ * then the entirety of that RCU reader and everything following it</div><div class='add'>+ * happens after the beginning of that same RCU grace period.  Therefore,</div><div class='add'>+ * the operations labeled Y in __srcu_read_lock_fast() and those labeled Z</div><div class='add'>+ * in __srcu_read_unlock_fast() are ordered against the corresponding SRCU</div><div class='add'>+ * read-side critical section from the viewpoint of the SRCU grace period.</div><div class='add'>+ * This is all the ordering that is required, hence no calls to smp_mb().</div><div class='add'>+ *</div><div class='add'>+ * This means that __srcu_read_lock_fast() is not all that fast</div><div class='add'>+ * on architectures that support NMIs but do not supply NMI-safe</div><div class='add'>+ * implementations of this_cpu_inc().</div><div class='add'>+ */</div><div class='add'>+static inline struct srcu_ctr __percpu notrace *__srcu_read_lock_fast(struct srcu_struct *ssp)</div><div class='add'>+{</div><div class='add'>+	struct srcu_ctr __percpu *scp = READ_ONCE(ssp-&gt;srcu_ctrp);</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NEED_SRCU_NMI_SAFE))</div><div class='add'>+		this_cpu_inc(scp-&gt;srcu_locks.counter); // Y, and implicit RCU reader.</div><div class='add'>+	else</div><div class='add'>+		atomic_long_inc(raw_cpu_ptr(&amp;scp-&gt;srcu_locks));  // Y, and implicit RCU reader.</div><div class='add'>+	barrier(); /* Avoid leaking the critical section. */</div><div class='add'>+	return scp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Removes the count for the old reader from the appropriate</div><div class='add'>+ * per-CPU element of the srcu_struct.  Note that this may well be a</div><div class='add'>+ * different CPU than that which was incremented by the corresponding</div><div class='add'>+ * srcu_read_lock_fast(), but it must be within the same task.</div><div class='add'>+ *</div><div class='add'>+ * Please see the __srcu_read_lock_fast() function's header comment for</div><div class='add'>+ * information on implicit RCU readers and NMI safety.</div><div class='add'>+ */</div><div class='add'>+static inline void notrace</div><div class='add'>+__srcu_read_unlock_fast(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp)</div><div class='add'>+{</div><div class='add'>+	barrier();  /* Avoid leaking the critical section. */</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NEED_SRCU_NMI_SAFE))</div><div class='add'>+		this_cpu_inc(scp-&gt;srcu_unlocks.counter);  // Z, and implicit RCU reader.</div><div class='add'>+	else</div><div class='add'>+		atomic_long_inc(raw_cpu_ptr(&amp;scp-&gt;srcu_unlocks));  // Z, and implicit RCU reader.</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Counts the new reader in the appropriate per-CPU element of the</div><div class='add'>+ * srcu_struct.  Returns a pointer that must be passed to the matching</div><div class='add'>+ * srcu_read_unlock_fast_updown().  This type of reader is compatible</div><div class='add'>+ * with srcu_down_read_fast() and srcu_up_read_fast().</div><div class='add'>+ *</div><div class='add'>+ * See the __srcu_read_lock_fast() comment for more details.</div><div class='add'>+ */</div><div class='add'>+static inline</div><div class='add'>+struct srcu_ctr __percpu notrace *__srcu_read_lock_fast_updown(struct srcu_struct *ssp)</div><div class='add'>+{</div><div class='add'>+	struct srcu_ctr __percpu *scp = READ_ONCE(ssp-&gt;srcu_ctrp);</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NEED_SRCU_NMI_SAFE))</div><div class='add'>+		this_cpu_inc(scp-&gt;srcu_locks.counter); // Y, and implicit RCU reader.</div><div class='add'>+	else</div><div class='add'>+		atomic_long_inc(raw_cpu_ptr(&amp;scp-&gt;srcu_locks));  // Y, and implicit RCU reader.</div><div class='add'>+	barrier(); /* Avoid leaking the critical section. */</div><div class='add'>+	return scp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Removes the count for the old reader from the appropriate</div><div class='add'>+ * per-CPU element of the srcu_struct.  Note that this may well be a</div><div class='add'>+ * different CPU than that which was incremented by the corresponding</div><div class='add'>+ * srcu_read_lock_fast(), but it must be within the same task.</div><div class='add'>+ *</div><div class='add'>+ * Please see the __srcu_read_lock_fast() function's header comment for</div><div class='add'>+ * information on implicit RCU readers and NMI safety.</div><div class='add'>+ */</div><div class='add'>+static inline void notrace</div><div class='add'>+__srcu_read_unlock_fast_updown(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp)</div><div class='add'>+{</div><div class='add'>+	barrier();  /* Avoid leaking the critical section. */</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NEED_SRCU_NMI_SAFE))</div><div class='add'>+		this_cpu_inc(scp-&gt;srcu_unlocks.counter);  // Z, and implicit RCU reader.</div><div class='add'>+	else</div><div class='add'>+		atomic_long_inc(raw_cpu_ptr(&amp;scp-&gt;srcu_unlocks));  // Z, and implicit RCU reader.</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __srcu_check_read_flavor(struct srcu_struct *ssp, int read_flavor);</div><div class='add'>+</div><div class='add'>+// Record SRCU-reader usage type only for CONFIG_PROVE_RCU=y kernels.</div><div class='add'>+static inline void srcu_check_read_flavor(struct srcu_struct *ssp, int read_flavor)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_PROVE_RCU))</div><div class='add'>+		__srcu_check_read_flavor(ssp, read_flavor);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h<br/>index 1f326da289d3..e1fb11e0f12c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ssb/ssb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ssb/ssb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ssb/ssb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ssb/ssb.h</a></div><div class='hunk'>@@ -325,7 +325,7 @@ struct ssb_driver {</div><div class='ctx'> </div><div class='ctx'> 	struct device_driver drv;</div><div class='ctx'> };</div><div class='del'>-#define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)</div><div class='add'>+#define drv_to_ssb_drv(_drv) container_of_const(_drv, struct ssb_driver, drv)</div><div class='ctx'> </div><div class='ctx'> extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);</div><div class='ctx'> #define ssb_driver_register(drv) \</div><div class='hunk'>@@ -621,14 +621,6 @@ extern u32 ssb_dma_translation(struct ssb_device *dev);</div><div class='ctx'> #define SSB_DMA_TRANSLATION_MASK	0xC0000000</div><div class='ctx'> #define SSB_DMA_TRANSLATION_SHIFT	30</div><div class='ctx'> </div><div class='del'>-static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SSB_DEBUG</div><div class='del'>-	printk(KERN_ERR "SSB: BUG! Calling DMA API for "</div><div class='del'>-	       "unsupported bustype %d\n", dev-&gt;bus-&gt;bustype);</div><div class='del'>-#endif /* DEBUG */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SSB_PCIHOST</div><div class='ctx'> /* PCI-host wrapper driver */</div><div class='ctx'> extern int ssb_pcihost_register(struct pci_driver *driver);</div><div class='head'>diff --git a/include/linux/stackdepot.h b/include/linux/stackdepot.h<br/>index adcbb8f23600..2cc21ffcdaf9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/stackdepot.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stackdepot.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/stackdepot.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/stackdepot.h</a></div><div class='hunk'>@@ -30,6 +30,52 @@ typedef u32 depot_stack_handle_t;</div><div class='ctx'>  */</div><div class='ctx'> #define STACK_DEPOT_EXTRA_BITS 5</div><div class='ctx'> </div><div class='add'>+#define DEPOT_HANDLE_BITS (sizeof(depot_stack_handle_t) * 8)</div><div class='add'>+</div><div class='add'>+#define DEPOT_POOL_ORDER 2 /* Pool size order, 4 pages */</div><div class='add'>+#define DEPOT_POOL_SIZE (1LL &lt;&lt; (PAGE_SHIFT + DEPOT_POOL_ORDER))</div><div class='add'>+#define DEPOT_STACK_ALIGN 4</div><div class='add'>+#define DEPOT_OFFSET_BITS (DEPOT_POOL_ORDER + PAGE_SHIFT - DEPOT_STACK_ALIGN)</div><div class='add'>+#define DEPOT_POOL_INDEX_BITS (DEPOT_HANDLE_BITS - DEPOT_OFFSET_BITS - \</div><div class='add'>+			       STACK_DEPOT_EXTRA_BITS)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_STACKDEPOT</div><div class='add'>+/* Compact structure that stores a reference to a stack. */</div><div class='add'>+union handle_parts {</div><div class='add'>+	depot_stack_handle_t handle;</div><div class='add'>+	struct {</div><div class='add'>+		u32 pool_index_plus_1	: DEPOT_POOL_INDEX_BITS;</div><div class='add'>+		u32 offset		: DEPOT_OFFSET_BITS;</div><div class='add'>+		u32 extra		: STACK_DEPOT_EXTRA_BITS;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct stack_record {</div><div class='add'>+	struct list_head hash_list;	/* Links in the hash table */</div><div class='add'>+	u32 hash;			/* Hash in hash table */</div><div class='add'>+	u32 size;			/* Number of stored frames */</div><div class='add'>+	union handle_parts handle;	/* Constant after initialization */</div><div class='add'>+	refcount_t count;</div><div class='add'>+	union {</div><div class='add'>+		unsigned long entries[CONFIG_STACKDEPOT_MAX_FRAMES];	/* Frames */</div><div class='add'>+		struct {</div><div class='add'>+			/*</div><div class='add'>+			 * An important invariant of the implementation is to</div><div class='add'>+			 * only place a stack record onto the freelist iff its</div><div class='add'>+			 * refcount is zero. Because stack records with a zero</div><div class='add'>+			 * refcount are never considered as valid, it is safe to</div><div class='add'>+			 * union @entries and freelist management state below.</div><div class='add'>+			 * Conversely, as soon as an entry is off the freelist</div><div class='add'>+			 * and its refcount becomes non-zero, the below must not</div><div class='add'>+			 * be accessed until being placed back on the freelist.</div><div class='add'>+			 */</div><div class='add'>+			struct list_head free_list;	/* Links in the freelist */</div><div class='add'>+			unsigned long rcu_state;	/* RCU cookie */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> typedef u32 depot_flags_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -101,7 +147,7 @@ static inline int stack_depot_early_init(void)	{ return 0; }</div><div class='ctx'>  * If the provided stack trace comes from the interrupt context, only the part</div><div class='ctx'>  * up to the interrupt entry is saved.</div><div class='ctx'>  *</div><div class='del'>- * Context: Any context, but setting STACK_DEPOT_FLAG_CAN_ALLOC is required if</div><div class='add'>+ * Context: Any context, but unsetting STACK_DEPOT_FLAG_CAN_ALLOC is required if</div><div class='ctx'>  *          alloc_pages() cannot be used from the current context. Currently</div><div class='ctx'>  *          this is the case for contexts where neither %GFP_ATOMIC nor</div><div class='ctx'>  *          %GFP_NOWAIT can be used (NMI, raw_spin_lock).</div><div class='hunk'>@@ -110,7 +156,7 @@ static inline int stack_depot_early_init(void)	{ return 0; }</div><div class='ctx'>  */</div><div class='ctx'> depot_stack_handle_t stack_depot_save_flags(unsigned long *entries,</div><div class='ctx'> 					    unsigned int nr_entries,</div><div class='del'>-					    gfp_t gfp_flags,</div><div class='add'>+					    gfp_t alloc_flags,</div><div class='ctx'> 					    depot_flags_t depot_flags);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -129,7 +175,18 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries,</div><div class='ctx'>  * Return: Handle of the stack trace stored in depot, 0 on failure</div><div class='ctx'>  */</div><div class='ctx'> depot_stack_handle_t stack_depot_save(unsigned long *entries,</div><div class='del'>-				      unsigned int nr_entries, gfp_t gfp_flags);</div><div class='add'>+				      unsigned int nr_entries, gfp_t alloc_flags);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __stack_depot_get_stack_record - Get a pointer to a stack_record struct</div><div class='add'>+ *</div><div class='add'>+ * @handle: Stack depot handle</div><div class='add'>+ *</div><div class='add'>+ * This function is only for internal purposes.</div><div class='add'>+ *</div><div class='add'>+ * Return: Returns a pointer to a stack_record struct</div><div class='add'>+ */</div><div class='add'>+struct stack_record *__stack_depot_get_stack_record(depot_stack_handle_t handle);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * stack_depot_fetch - Fetch a stack trace from stack depot</div><div class='head'>diff --git a/include/linux/start_kernel.h b/include/linux/start_kernel.h<br/>index a9806a44a605..09f994ac87df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/start_kernel.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/start_kernel.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/start_kernel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/start_kernel.h</a></div><div class='hunk'>@@ -9,7 +9,5 @@</div><div class='ctx'>    up something else. */</div><div class='ctx'> </div><div class='ctx'> extern asmlinkage void __init __noreturn start_kernel(void);</div><div class='del'>-extern void __init __noreturn arch_call_rest_init(void);</div><div class='del'>-extern void __ref __noreturn rest_init(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_START_KERNEL_H */</div><div class='head'>diff --git a/include/linux/stat.h b/include/linux/stat.h<br/>index 52150570d37a..e3d00e7bb26d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/stat.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stat.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/stat.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/stat.h</a></div><div class='hunk'>@@ -50,9 +50,15 @@ struct kstat {</div><div class='ctx'> 	struct timespec64 btime;			/* File creation time */</div><div class='ctx'> 	u64		blocks;</div><div class='ctx'> 	u64		mnt_id;</div><div class='add'>+	u64		change_cookie;</div><div class='add'>+	u64		subvol;</div><div class='ctx'> 	u32		dio_mem_align;</div><div class='ctx'> 	u32		dio_offset_align;</div><div class='del'>-	u64		change_cookie;</div><div class='add'>+	u32		dio_read_offset_align;</div><div class='add'>+	u32		atomic_write_unit_min;</div><div class='add'>+	u32		atomic_write_unit_max;</div><div class='add'>+	u32		atomic_write_unit_max_opt;</div><div class='add'>+	u32		atomic_write_segments_max;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* These definitions are internal to the kernel for now. Mainly used by nfsd. */</div><div class='head'>diff --git a/include/linux/static_call.h b/include/linux/static_call.h<br/>index 141e6b176a1b..78a77a4ae0ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/static_call.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/static_call.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/static_call.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/static_call.h</a></div><div class='hunk'>@@ -160,6 +160,8 @@ extern void arch_static_call_transform(void *site, void *tramp, void *func, bool</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_STATIC_CALL_INLINE</div><div class='ctx'> </div><div class='add'>+extern int static_call_initialized;</div><div class='add'>+</div><div class='ctx'> extern int __init static_call_init(void);</div><div class='ctx'> </div><div class='ctx'> extern void static_call_force_reinit(void);</div><div class='hunk'>@@ -225,6 +227,8 @@ extern long __static_call_return0(void);</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_HAVE_STATIC_CALL)</div><div class='ctx'> </div><div class='add'>+#define static_call_initialized 0</div><div class='add'>+</div><div class='ctx'> static inline int static_call_init(void) { return 0; }</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_STATIC_CALL(name, _func)					\</div><div class='hunk'>@@ -281,6 +285,8 @@ extern long __static_call_return0(void);</div><div class='ctx'> </div><div class='ctx'> #else /* Generic implementation */</div><div class='ctx'> </div><div class='add'>+#define static_call_initialized 0</div><div class='add'>+</div><div class='ctx'> static inline int static_call_init(void) { return 0; }</div><div class='ctx'> </div><div class='ctx'> static inline long __static_call_return0(void)</div><div class='head'>diff --git a/include/linux/static_call_types.h b/include/linux/static_call_types.h<br/>index 5a00b8b2cf9f..cfb6ddeb292b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/static_call_types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/static_call_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/static_call_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/static_call_types.h</a></div><div class='hunk'>@@ -25,6 +25,8 @@</div><div class='ctx'> #define STATIC_CALL_SITE_INIT 2UL	/* init section */</div><div class='ctx'> #define STATIC_CALL_SITE_FLAGS 3UL</div><div class='ctx'> </div><div class='add'>+#ifndef __ASSEMBLY__</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The static call site table needs to be created by external tooling (objtool</div><div class='ctx'>  * or a compiler plugin).</div><div class='hunk'>@@ -100,4 +102,6 @@ struct static_call_key {</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_HAVE_STATIC_CALL */</div><div class='ctx'> </div><div class='add'>+#endif /* __ASSEMBLY__ */</div><div class='add'>+</div><div class='ctx'> #endif /* _STATIC_CALL_TYPES_H */</div><div class='head'>diff --git a/include/linux/stddef.h b/include/linux/stddef.h<br/>index 929d67710cc5..80b6bfb944f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/stddef.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stddef.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/stddef.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/stddef.h</a></div><div class='hunk'>@@ -93,4 +93,40 @@ enum {</div><div class='ctx'> #define DECLARE_FLEX_ARRAY(TYPE, NAME) \</div><div class='ctx'> 	__DECLARE_FLEX_ARRAY(TYPE, NAME)</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * __TRAILING_OVERLAP() - Overlap a flexible-array member with trailing</div><div class='add'>+ *			  members.</div><div class='add'>+ *</div><div class='add'>+ * Creates a union between a flexible-array member (FAM) in a struct and a set</div><div class='add'>+ * of additional members that would otherwise follow it.</div><div class='add'>+ *</div><div class='add'>+ * @TYPE: Flexible structure type name, including "struct" keyword.</div><div class='add'>+ * @NAME: Name for a variable to define.</div><div class='add'>+ * @FAM: The flexible-array member within @TYPE</div><div class='add'>+ * @ATTRS: Any struct attributes (usually empty)</div><div class='add'>+ * @MEMBERS: Trailing overlapping members.</div><div class='add'>+ */</div><div class='add'>+#define __TRAILING_OVERLAP(TYPE, NAME, FAM, ATTRS, MEMBERS)			\</div><div class='add'>+	union {									\</div><div class='add'>+		TYPE NAME;							\</div><div class='add'>+		struct {							\</div><div class='add'>+			unsigned char __offset_to_FAM[offsetof(TYPE, FAM)];	\</div><div class='add'>+			MEMBERS							\</div><div class='add'>+		} ATTRS;							\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TRAILING_OVERLAP() - Overlap a flexible-array member with trailing members.</div><div class='add'>+ *</div><div class='add'>+ * Creates a union between a flexible-array member (FAM) in a struct and a set</div><div class='add'>+ * of additional members that would otherwise follow it.</div><div class='add'>+ *</div><div class='add'>+ * @TYPE: Flexible structure type name, including "struct" keyword.</div><div class='add'>+ * @NAME: Name for a variable to define.</div><div class='add'>+ * @FAM: The flexible-array member within @TYPE</div><div class='add'>+ * @MEMBERS: Trailing overlapping members.</div><div class='add'>+ */</div><div class='add'>+#define TRAILING_OVERLAP(TYPE, NAME, FAM, MEMBERS)				\</div><div class='add'>+	__TRAILING_OVERLAP(TYPE, NAME, FAM, /* no attrs */, MEMBERS)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/stm.h b/include/linux/stm.h<br/>index 3b22689512be..2fcbef9608f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/stm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/stm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/stm.h</a></div><div class='hunk'>@@ -30,6 +30,16 @@ enum stp_packet_flags {</div><div class='ctx'> 	STP_PACKET_TIMESTAMPED	= 0x2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * enum stm_source_type - STM source driver</div><div class='add'>+ * @STM_USER: any STM trace source</div><div class='add'>+ * @STM_FTRACE: ftrace STM source</div><div class='add'>+ */</div><div class='add'>+enum stm_source_type {</div><div class='add'>+	STM_USER,</div><div class='add'>+	STM_FTRACE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct stp_policy;</div><div class='ctx'> </div><div class='ctx'> struct stm_device;</div><div class='hunk'>@@ -106,6 +116,7 @@ struct stm_source_device;</div><div class='ctx'>  * @name:	device name, will be used for policy lookup</div><div class='ctx'>  * @src:	internal structure, only used by stm class code</div><div class='ctx'>  * @nr_chans:	number of channels to allocate</div><div class='add'>+ * @type:	type of STM source driver represented by stm_source_type</div><div class='ctx'>  * @link:	called when this source gets linked to an STM device</div><div class='ctx'>  * @unlink:	called when this source is about to get unlinked from its STM</div><div class='ctx'>  *</div><div class='hunk'>@@ -117,6 +128,7 @@ struct stm_source_data {</div><div class='ctx'> 	struct stm_source_device *src;</div><div class='ctx'> 	unsigned int		percpu;</div><div class='ctx'> 	unsigned int		nr_chans;</div><div class='add'>+	unsigned int		type;</div><div class='ctx'> 	int			(*link)(struct stm_source_data *data);</div><div class='ctx'> 	void			(*unlink)(struct stm_source_data *data);</div><div class='ctx'> };</div><div class='head'>diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h<br/>index dfa1828cd756..f1054b9c2d8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/stmmac.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stmmac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/stmmac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/stmmac.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #define __STMMAC_PLATFORM_DATA</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MTL_MAX_RX_QUEUES	8</div><div class='ctx'> #define MTL_MAX_TX_QUEUES	8</div><div class='hunk'>@@ -33,7 +33,9 @@</div><div class='ctx'> #define	STMMAC_CSR_20_35M	0x2	/* MDC = clk_scr_i/16 */</div><div class='ctx'> #define	STMMAC_CSR_35_60M	0x3	/* MDC = clk_scr_i/26 */</div><div class='ctx'> #define	STMMAC_CSR_150_250M	0x4	/* MDC = clk_scr_i/102 */</div><div class='del'>-#define	STMMAC_CSR_250_300M	0x5	/* MDC = clk_scr_i/122 */</div><div class='add'>+#define	STMMAC_CSR_250_300M	0x5	/* MDC = clk_scr_i/124 */</div><div class='add'>+#define	STMMAC_CSR_300_500M	0x6	/* MDC = clk_scr_i/204 */</div><div class='add'>+#define	STMMAC_CSR_500_800M	0x7	/* MDC = clk_scr_i/324 */</div><div class='ctx'> </div><div class='ctx'> /* MTL algorithms identifiers */</div><div class='ctx'> #define MTL_TX_ALGORITHM_WRR	0x0</div><div class='hunk'>@@ -76,14 +78,15 @@</div><div class='ctx'> 			| DMA_AXI_BLEN_32 | DMA_AXI_BLEN_64 \</div><div class='ctx'> 			| DMA_AXI_BLEN_128 | DMA_AXI_BLEN_256)</div><div class='ctx'> </div><div class='add'>+struct clk;</div><div class='ctx'> struct stmmac_priv;</div><div class='ctx'> </div><div class='ctx'> /* Platfrom data for platform device structure's platform_data field */</div><div class='ctx'> </div><div class='ctx'> struct stmmac_mdio_bus_data {</div><div class='ctx'> 	unsigned int phy_mask;</div><div class='del'>-	unsigned int has_xpcs;</div><div class='del'>-	unsigned int xpcs_an_inband;</div><div class='add'>+	unsigned int pcs_mask;</div><div class='add'>+	unsigned int default_an_inband;</div><div class='ctx'> 	int *irqs;</div><div class='ctx'> 	int probed_phy_irq;</div><div class='ctx'> 	bool needs_reset;</div><div class='hunk'>@@ -100,6 +103,7 @@ struct stmmac_dma_cfg {</div><div class='ctx'> 	bool eame;</div><div class='ctx'> 	bool multi_msi_en;</div><div class='ctx'> 	bool dche;</div><div class='add'>+	bool atds;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AXI_BLEN	7</div><div class='hunk'>@@ -109,27 +113,12 @@ struct stmmac_axi {</div><div class='ctx'> 	u32 axi_wr_osr_lmt;</div><div class='ctx'> 	u32 axi_rd_osr_lmt;</div><div class='ctx'> 	bool axi_kbbe;</div><div class='del'>-	u32 axi_blen[AXI_BLEN];</div><div class='add'>+	u32 axi_blen_regval;</div><div class='ctx'> 	bool axi_fb;</div><div class='ctx'> 	bool axi_mb;</div><div class='ctx'> 	bool axi_rb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define EST_GCL		1024</div><div class='del'>-struct stmmac_est {</div><div class='del'>-	struct mutex lock;</div><div class='del'>-	int enable;</div><div class='del'>-	u32 btr_reserve[2];</div><div class='del'>-	u32 btr_offset[2];</div><div class='del'>-	u32 btr[2];</div><div class='del'>-	u32 ctr[2];</div><div class='del'>-	u32 ter;</div><div class='del'>-	u32 gcl_unaligned[EST_GCL];</div><div class='del'>-	u32 gcl[EST_GCL];</div><div class='del'>-	u32 gcl_size;</div><div class='del'>-	u32 max_sdu[MTL_MAX_TX_QUEUES];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct stmmac_rxq_cfg {</div><div class='ctx'> 	u8 mode_to_use;</div><div class='ctx'> 	u32 chan;</div><div class='hunk'>@@ -152,33 +141,6 @@ struct stmmac_txq_cfg {</div><div class='ctx'> 	int tbs_en;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* FPE link state */</div><div class='del'>-enum stmmac_fpe_state {</div><div class='del'>-	FPE_STATE_OFF = 0,</div><div class='del'>-	FPE_STATE_CAPABLE = 1,</div><div class='del'>-	FPE_STATE_ENTERING_ON = 2,</div><div class='del'>-	FPE_STATE_ON = 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* FPE link-partner hand-shaking mPacket type */</div><div class='del'>-enum stmmac_mpacket_type {</div><div class='del'>-	MPACKET_VERIFY = 0,</div><div class='del'>-	MPACKET_RESPONSE = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum stmmac_fpe_task_state_t {</div><div class='del'>-	__FPE_REMOVING,</div><div class='del'>-	__FPE_TASK_SCHED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct stmmac_fpe_cfg {</div><div class='del'>-	bool enable;				/* FPE enable */</div><div class='del'>-	bool hs_enable;				/* FPE handshake enable */</div><div class='del'>-	enum stmmac_fpe_state lp_fpe_state;	/* Link Partner FPE state */</div><div class='del'>-	enum stmmac_fpe_state lo_fpe_state;	/* Local station FPE state */</div><div class='del'>-	u32 fpe_csr;				/* MAC_FPE_CTRL_STS reg cache */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct stmmac_safety_feature_cfg {</div><div class='ctx'> 	u32 tsoee;</div><div class='ctx'> 	u32 mrxpee;</div><div class='hunk'>@@ -209,7 +171,13 @@ struct dwmac4_addrs {</div><div class='ctx'> 	u32 mtl_low_cred_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define STMMAC_FLAG_HAS_INTEGRATED_PCS		BIT(0)</div><div class='add'>+enum dwmac_core_type {</div><div class='add'>+	DWMAC_CORE_MAC100,</div><div class='add'>+	DWMAC_CORE_GMAC,</div><div class='add'>+	DWMAC_CORE_GMAC4,</div><div class='add'>+	DWMAC_CORE_XGMAC,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define STMMAC_FLAG_SPH_DISABLE			BIT(1)</div><div class='ctx'> #define STMMAC_FLAG_USE_PHY_WOL			BIT(2)</div><div class='ctx'> #define STMMAC_FLAG_HAS_SUN8I			BIT(3)</div><div class='hunk'>@@ -221,24 +189,37 @@ struct dwmac4_addrs {</div><div class='ctx'> #define STMMAC_FLAG_INT_SNAPSHOT_EN		BIT(9)</div><div class='ctx'> #define STMMAC_FLAG_RX_CLK_RUNS_IN_LPI		BIT(10)</div><div class='ctx'> #define STMMAC_FLAG_EN_TX_LPI_CLOCKGATING	BIT(11)</div><div class='del'>-#define STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY	BIT(12)</div><div class='add'>+#define STMMAC_FLAG_EN_TX_LPI_CLK_PHY_CAP	BIT(12)</div><div class='add'>+#define STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY	BIT(13)</div><div class='add'>+</div><div class='add'>+struct mac_device_info;</div><div class='ctx'> </div><div class='ctx'> struct plat_stmmacenet_data {</div><div class='add'>+	enum dwmac_core_type core_type;</div><div class='ctx'> 	int bus_id;</div><div class='ctx'> 	int phy_addr;</div><div class='ctx'> 	/* MAC ----- optional PCS ----- SerDes ----- optional PHY ----- Media</div><div class='del'>-	 *       ^                               ^</div><div class='del'>-	 * mac_interface                   phy_interface</div><div class='add'>+	 *                                       ^</div><div class='add'>+	 *                                  phy_interface</div><div class='ctx'> 	 *</div><div class='del'>-	 * mac_interface is the MAC-side interface, which may be the same</div><div class='del'>-	 * as phy_interface if there is no intervening PCS. If there is a</div><div class='del'>-	 * PCS, then mac_interface describes the interface mode between the</div><div class='del'>-	 * MAC and PCS, and phy_interface describes the interface mode</div><div class='del'>-	 * between the PCS and PHY.</div><div class='del'>-	 */</div><div class='del'>-	phy_interface_t mac_interface;</div><div class='del'>-	/* phy_interface is the PHY-side interface - the interface used by</div><div class='del'>-	 * an attached PHY.</div><div class='add'>+	 * The Synopsys dwmac core only covers the MAC and an optional</div><div class='add'>+	 * integrated PCS. Where the integrated PCS is used with a SerDes,</div><div class='add'>+	 * e.g. for 1000base-X or Cisco SGMII, the connection between the</div><div class='add'>+	 * PCS and SerDes will be TBI.</div><div class='add'>+	 *</div><div class='add'>+	 * Where the Synopsys dwmac core has been instantiated with multiple</div><div class='add'>+	 * interface modes, these are selected via core-external configuration</div><div class='add'>+	 * which is sampled when the dwmac core is reset. How this is done is</div><div class='add'>+	 * platform glue specific, but this defines the interface used from</div><div class='add'>+	 * the Synopsys dwmac core to the rest of the SoC.</div><div class='add'>+	 *</div><div class='add'>+	 * Where PCS other than the optional integrated Synopsys dwmac PCS</div><div class='add'>+	 * is used, this counts as "the rest of the SoC" in the above</div><div class='add'>+	 * paragraph.</div><div class='add'>+	 *</div><div class='add'>+	 * phy_interface is the PHY-side interface - the interface used by</div><div class='add'>+	 * an attached PHY or SFP etc. This is equivalent to the interface</div><div class='add'>+	 * that phylink uses.</div><div class='ctx'> 	 */</div><div class='ctx'> 	phy_interface_t phy_interface;</div><div class='ctx'> 	struct stmmac_mdio_bus_data *mdio_bus_data;</div><div class='hunk'>@@ -246,11 +227,8 @@ struct plat_stmmacenet_data {</div><div class='ctx'> 	struct fwnode_handle *port_node;</div><div class='ctx'> 	struct device_node *mdio_node;</div><div class='ctx'> 	struct stmmac_dma_cfg *dma_cfg;</div><div class='del'>-	struct stmmac_est *est;</div><div class='del'>-	struct stmmac_fpe_cfg *fpe_cfg;</div><div class='ctx'> 	struct stmmac_safety_feature_cfg *safety_feat_cfg;</div><div class='ctx'> 	int clk_csr;</div><div class='del'>-	int has_gmac;</div><div class='ctx'> 	int enh_desc;</div><div class='ctx'> 	int tx_coe;</div><div class='ctx'> 	int rx_coe;</div><div class='hunk'>@@ -272,37 +250,51 @@ struct plat_stmmacenet_data {</div><div class='ctx'> 	u8 tx_sched_algorithm;</div><div class='ctx'> 	struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];</div><div class='ctx'> 	struct stmmac_txq_cfg tx_queues_cfg[MTL_MAX_TX_QUEUES];</div><div class='del'>-	void (*fix_mac_speed)(void *priv, unsigned int speed, unsigned int mode);</div><div class='del'>-	int (*fix_soc_reset)(void *priv, void __iomem *ioaddr);</div><div class='add'>+	void (*get_interfaces)(struct stmmac_priv *priv, void *bsp_priv,</div><div class='add'>+			       unsigned long *interfaces);</div><div class='add'>+	int (*set_phy_intf_sel)(void *priv, u8 phy_intf_sel);</div><div class='add'>+	int (*set_clk_tx_rate)(void *priv, struct clk *clk_tx_i,</div><div class='add'>+			       phy_interface_t interface, int speed);</div><div class='add'>+	void (*fix_mac_speed)(void *priv, int speed, unsigned int mode);</div><div class='add'>+	int (*fix_soc_reset)(struct stmmac_priv *priv, void __iomem *ioaddr);</div><div class='ctx'> 	int (*serdes_powerup)(struct net_device *ndev, void *priv);</div><div class='ctx'> 	void (*serdes_powerdown)(struct net_device *ndev, void *priv);</div><div class='del'>-	void (*speed_mode_2500)(struct net_device *ndev, void *priv);</div><div class='add'>+	int (*mac_finish)(struct net_device *ndev,</div><div class='add'>+			  void *priv,</div><div class='add'>+			  unsigned int mode,</div><div class='add'>+			  phy_interface_t interface);</div><div class='ctx'> 	void (*ptp_clk_freq_config)(struct stmmac_priv *priv);</div><div class='del'>-	int (*init)(struct platform_device *pdev, void *priv);</div><div class='del'>-	void (*exit)(struct platform_device *pdev, void *priv);</div><div class='del'>-	struct mac_device_info *(*setup)(void *priv);</div><div class='add'>+	int (*init)(struct device *dev, void *priv);</div><div class='add'>+	void (*exit)(struct device *dev, void *priv);</div><div class='add'>+	int (*suspend)(struct device *dev, void *priv);</div><div class='add'>+	int (*resume)(struct device *dev, void *priv);</div><div class='add'>+	int (*mac_setup)(void *priv, struct mac_device_info *mac);</div><div class='ctx'> 	int (*clks_config)(void *priv, bool enabled);</div><div class='ctx'> 	int (*crosststamp)(ktime_t *device, struct system_counterval_t *system,</div><div class='ctx'> 			   void *ctx);</div><div class='ctx'> 	void (*dump_debug_regs)(void *priv);</div><div class='add'>+	int (*pcs_init)(struct stmmac_priv *priv);</div><div class='add'>+	void (*pcs_exit)(struct stmmac_priv *priv);</div><div class='add'>+	struct phylink_pcs *(*select_pcs)(struct stmmac_priv *priv,</div><div class='add'>+					  phy_interface_t interface);</div><div class='ctx'> 	void *bsp_priv;</div><div class='ctx'> 	struct clk *stmmac_clk;</div><div class='ctx'> 	struct clk *pclk;</div><div class='ctx'> 	struct clk *clk_ptp_ref;</div><div class='del'>-	unsigned int clk_ptp_rate;</div><div class='del'>-	unsigned int clk_ref_rate;</div><div class='add'>+	struct clk *clk_tx_i;		/* clk_tx_i to MAC core */</div><div class='add'>+	unsigned long clk_ptp_rate;</div><div class='add'>+	unsigned long clk_ref_rate;</div><div class='add'>+	struct clk_bulk_data *clks;</div><div class='add'>+	int num_clks;</div><div class='ctx'> 	unsigned int mult_fact_100ns;</div><div class='ctx'> 	s32 ptp_max_adj;</div><div class='ctx'> 	u32 cdc_error_adj;</div><div class='ctx'> 	struct reset_control *stmmac_rst;</div><div class='ctx'> 	struct reset_control *stmmac_ahb_rst;</div><div class='ctx'> 	struct stmmac_axi *axi;</div><div class='del'>-	int has_gmac4;</div><div class='ctx'> 	int rss_en;</div><div class='ctx'> 	int mac_port_sel_speed;</div><div class='del'>-	int has_xgmac;</div><div class='ctx'> 	u8 vlan_fail_q;</div><div class='del'>-	unsigned int eee_usecs_rate;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	int int_snapshot_num;</div><div class='ctx'> 	int msi_mac_vec;</div><div class='head'>diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h<br/>index ea7a74ea7389..72820503514c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/stop_machine.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/stop_machine.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/stop_machine.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/stop_machine.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #define _LINUX_STOP_MACHINE</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -88,55 +88,73 @@ static inline void print_stop_info(const char *log_lvl, struct task_struct *task</div><div class='ctx'> #endif	/* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * stop_machine "Bogolock": stop the entire machine, disable</div><div class='del'>- * interrupts.  This is a very heavy lock, which is equivalent to</div><div class='del'>- * grabbing every spinlock (and more).  So the "read" side to such a</div><div class='del'>- * lock is anything which disables preemption.</div><div class='add'>+ * stop_machine "Bogolock": stop the entire machine, disable interrupts.</div><div class='add'>+ * This is a very heavy lock, which is equivalent to grabbing every raw</div><div class='add'>+ * spinlock (and more).  So the "read" side to such a lock is anything</div><div class='add'>+ * which disables preemption.</div><div class='ctx'>  */</div><div class='ctx'> #if defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * stop_machine: freeze the machine on all CPUs and run this function</div><div class='ctx'>  * @fn: the function to run</div><div class='del'>- * @data: the data ptr for the @fn()</div><div class='del'>- * @cpus: the cpus to run the @fn() on (NULL = any online cpu)</div><div class='add'>+ * @data: the data ptr to pass to @fn()</div><div class='add'>+ * @cpus: the cpus to run @fn() on (NULL = run on each online CPU)</div><div class='ctx'>  *</div><div class='del'>- * Description: This causes a thread to be scheduled on every cpu,</div><div class='del'>- * each of which disables interrupts.  The result is that no one is</div><div class='del'>- * holding a spinlock or inside any other preempt-disabled region when</div><div class='del'>- * @fn() runs.</div><div class='add'>+ * Description: This causes a thread to be scheduled on every CPU, which</div><div class='add'>+ * will run with interrupts disabled.  Each CPU specified by @cpus will</div><div class='add'>+ * run @fn.  While @fn is executing, there will no other CPUs holding</div><div class='add'>+ * a raw spinlock or running within any other type of preempt-disabled</div><div class='add'>+ * region of code.</div><div class='ctx'>  *</div><div class='del'>- * This can be thought of as a very heavy write lock, equivalent to</div><div class='del'>- * grabbing every spinlock in the kernel.</div><div class='add'>+ * When @cpus specifies only a single CPU, this can be thought of as</div><div class='add'>+ * a reader-writer lock where readers disable preemption (for example,</div><div class='add'>+ * by holding a raw spinlock) and where the insanely heavy writers run</div><div class='add'>+ * @fn while also preventing any other CPU from doing any useful work.</div><div class='add'>+ * These writers can also be thought of as having implicitly grabbed every</div><div class='add'>+ * raw spinlock in the kernel.</div><div class='ctx'>  *</div><div class='del'>- * Protects against CPU hotplug.</div><div class='add'>+ * When @fn is a no-op, this can be thought of as an RCU implementation</div><div class='add'>+ * where readers again disable preemption and writers use stop_machine()</div><div class='add'>+ * in place of synchronize_rcu(), albeit with orders of magnitude more</div><div class='add'>+ * disruption than even that of synchronize_rcu_expedited().</div><div class='add'>+ *</div><div class='add'>+ * Although only one stop_machine() operation can proceed at a time,</div><div class='add'>+ * the possibility of blocking in cpus_read_lock() means that the caller</div><div class='add'>+ * cannot usefully rely on this serialization.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if all invocations of @fn return zero.  Otherwise, the</div><div class='add'>+ * value returned by an arbitrarily chosen member of the set of calls to</div><div class='add'>+ * @fn that returned non-zero.</div><div class='ctx'>  */</div><div class='ctx'> int stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * stop_machine_cpuslocked: freeze the machine on all CPUs and run this function</div><div class='ctx'>  * @fn: the function to run</div><div class='del'>- * @data: the data ptr for the @fn()</div><div class='del'>- * @cpus: the cpus to run the @fn() on (NULL = any online cpu)</div><div class='add'>+ * @data: the data ptr to pass to @fn()</div><div class='add'>+ * @cpus: the cpus to run @fn() on (NULL = run on each online CPU)</div><div class='add'>+ *</div><div class='add'>+ * Same as above.  Avoids nested calls to cpus_read_lock().</div><div class='ctx'>  *</div><div class='del'>- * Same as above. Must be called from with in a cpus_read_lock() protected</div><div class='del'>- * region. Avoids nested calls to cpus_read_lock().</div><div class='add'>+ * Context: Must be called from within a cpus_read_lock() protected region.</div><div class='ctx'>  */</div><div class='ctx'> int stop_machine_cpuslocked(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * stop_core_cpuslocked: - stop all threads on just one core</div><div class='ctx'>  * @cpu: any cpu in the targeted core</div><div class='del'>- * @fn: the function to run</div><div class='del'>- * @data: the data ptr for @fn()</div><div class='add'>+ * @fn: the function to run on each CPU in the core containing @cpu</div><div class='add'>+ * @data: the data ptr to pass to @fn()</div><div class='ctx'>  *</div><div class='del'>- * Same as above, but instead of every CPU, only the logical CPUs of a</div><div class='del'>- * single core are affected.</div><div class='add'>+ * Same as above, but instead of every CPU, only the logical CPUs of the</div><div class='add'>+ * single core containing @cpu are affected.</div><div class='ctx'>  *</div><div class='ctx'>  * Context: Must be called from within a cpus_read_lock() protected region.</div><div class='ctx'>  *</div><div class='del'>- * Return: 0 if all executions of @fn returned 0, any non zero return</div><div class='del'>- * value if any returned non zero.</div><div class='add'>+ * Return: 0 if all invocations of @fn return zero.  Otherwise, the</div><div class='add'>+ * value returned by an arbitrarily chosen member of the set of calls to</div><div class='add'>+ * @fn that returned non-zero.</div><div class='ctx'>  */</div><div class='ctx'> int stop_core_cpuslocked(unsigned int cpu, cpu_stop_fn_t fn, void *data);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/string.h b/include/linux/string.h<br/>index 9ba8b4597009..1b564c36d721 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/string.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/string.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/string.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/string.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/args.h&gt;</div><div class='ctx'> #include &lt;linux/array_size.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;	/* for DEFINE_FREE() */</div><div class='ctx'> #include &lt;linux/compiler.h&gt;	/* for inline */</div><div class='ctx'> #include &lt;linux/types.h&gt;	/* for size_t */</div><div class='ctx'> #include &lt;linux/stddef.h&gt;	/* for NULL */</div><div class='hunk'>@@ -14,8 +15,8 @@</div><div class='ctx'> #include &lt;uapi/linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern char *strndup_user(const char __user *, long);</div><div class='del'>-extern void *memdup_user(const void __user *, size_t);</div><div class='del'>-extern void *vmemdup_user(const void __user *, size_t);</div><div class='add'>+extern void *memdup_user(const void __user *, size_t) __realloc_size(2);</div><div class='add'>+extern void *vmemdup_user(const void __user *, size_t) __realloc_size(2);</div><div class='ctx'> extern void *memdup_user_nul(const void __user *, size_t);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -27,7 +28,8 @@ extern void *memdup_user_nul(const void __user *, size_t);</div><div class='ctx'>  * Return: an ERR_PTR() on failure. Result is physically</div><div class='ctx'>  * contiguous, to be freed by kfree().</div><div class='ctx'>  */</div><div class='del'>-static inline void *memdup_array_user(const void __user *src, size_t n, size_t size)</div><div class='add'>+static inline __realloc_size(2, 3)</div><div class='add'>+void *memdup_array_user(const void __user *src, size_t n, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	size_t nbytes;</div><div class='ctx'> </div><div class='hunk'>@@ -46,7 +48,8 @@ static inline void *memdup_array_user(const void __user *src, size_t n, size_t s</div><div class='ctx'>  * Return: an ERR_PTR() on failure. Result may be not</div><div class='ctx'>  * physically contiguous. Use kvfree() to free.</div><div class='ctx'>  */</div><div class='del'>-static inline void *vmemdup_array_user(const void __user *src, size_t n, size_t size)</div><div class='add'>+static inline __realloc_size(2, 3)</div><div class='add'>+void *vmemdup_array_user(const void __user *src, size_t n, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	size_t nbytes;</div><div class='ctx'> </div><div class='hunk'>@@ -74,12 +77,16 @@ ssize_t sized_strscpy(char *, const char *, size_t);</div><div class='ctx'>  * known size.</div><div class='ctx'>  */</div><div class='ctx'> #define __strscpy0(dst, src, ...)	\</div><div class='del'>-	sized_strscpy(dst, src, sizeof(dst) + __must_be_array(dst))</div><div class='del'>-#define __strscpy1(dst, src, size)	sized_strscpy(dst, src, size)</div><div class='add'>+	sized_strscpy(dst, src, sizeof(dst) + __must_be_array(dst) +	\</div><div class='add'>+				__must_be_cstr(dst) + __must_be_cstr(src))</div><div class='add'>+#define __strscpy1(dst, src, size)	\</div><div class='add'>+	sized_strscpy(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))</div><div class='ctx'> </div><div class='ctx'> #define __strscpy_pad0(dst, src, ...)	\</div><div class='del'>-	sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst))</div><div class='del'>-#define __strscpy_pad1(dst, src, size)	sized_strscpy_pad(dst, src, size)</div><div class='add'>+	sized_strscpy_pad(dst, src, sizeof(dst) + __must_be_array(dst) +	\</div><div class='add'>+				    __must_be_cstr(dst) + __must_be_cstr(src))</div><div class='add'>+#define __strscpy_pad1(dst, src, size)	\</div><div class='add'>+	sized_strscpy_pad(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * strscpy - Copy a C-string into a sized buffer</div><div class='hunk'>@@ -277,20 +284,37 @@ static inline void memcpy_flushcache(void *dst, const void *src, size_t cnt)</div><div class='ctx'> void *memchr_inv(const void *s, int c, size_t n);</div><div class='ctx'> char *strreplace(char *str, char old, char new);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * mem_is_zero - Check if an area of memory is all 0's.</div><div class='add'>+ * @s: The memory area</div><div class='add'>+ * @n: The size of the area</div><div class='add'>+ *</div><div class='add'>+ * Return: True if the area of memory is all 0's.</div><div class='add'>+ */</div><div class='add'>+static inline bool mem_is_zero(const void *s, size_t n)</div><div class='add'>+{</div><div class='add'>+	return !memchr_inv(s, 0, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void kfree_const(const void *x);</div><div class='ctx'> </div><div class='ctx'> extern char *kstrdup(const char *s, gfp_t gfp) __malloc;</div><div class='ctx'> extern const char *kstrdup_const(const char *s, gfp_t gfp);</div><div class='ctx'> extern char *kstrndup(const char *s, size_t len, gfp_t gfp);</div><div class='del'>-extern void *kmemdup(const void *src, size_t len, gfp_t gfp) __realloc_size(2);</div><div class='add'>+extern void *kmemdup_noprof(const void *src, size_t len, gfp_t gfp) __realloc_size(2);</div><div class='add'>+#define kmemdup(...)	alloc_hooks(kmemdup_noprof(__VA_ARGS__))</div><div class='add'>+</div><div class='ctx'> extern void *kvmemdup(const void *src, size_t len, gfp_t gfp) __realloc_size(2);</div><div class='ctx'> extern char *kmemdup_nul(const char *s, size_t len, gfp_t gfp);</div><div class='del'>-extern void *kmemdup_array(const void *src, size_t element_size, size_t count, gfp_t gfp);</div><div class='add'>+extern void *kmemdup_array(const void *src, size_t count, size_t element_size, gfp_t gfp)</div><div class='add'>+		__realloc_size(2, 3);</div><div class='ctx'> </div><div class='ctx'> /* lib/argv_split.c */</div><div class='ctx'> extern char **argv_split(gfp_t gfp, const char *str, int *argcp);</div><div class='ctx'> extern void argv_free(char **argv);</div><div class='ctx'> </div><div class='add'>+DEFINE_FREE(argv_free, char **, if (!IS_ERR_OR_NULL(_T)) argv_free(_T))</div><div class='add'>+</div><div class='ctx'> /* lib/cmdline.c */</div><div class='ctx'> extern int get_option(char **str, int *pint);</div><div class='ctx'> extern char *get_options(const char *str, int nints, int *ints);</div><div class='hunk'>@@ -312,9 +336,8 @@ int __sysfs_match_string(const char * const *array, size_t n, const char *s);</div><div class='ctx'> #define sysfs_match_string(_a, _s) __sysfs_match_string(_a, ARRAY_SIZE(_a), _s)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BINARY_PRINTF</div><div class='del'>-int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);</div><div class='del'>-int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);</div><div class='del'>-int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...) __printf(3, 4);</div><div class='add'>+__printf(3, 0) int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);</div><div class='add'>+__printf(3, 0) int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,</div><div class='hunk'>@@ -322,16 +345,6 @@ extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,</div><div class='ctx'> </div><div class='ctx'> int ptr_to_hashval(const void *ptr, unsigned long *hashval_out);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * strstarts - does @str start with @prefix?</div><div class='del'>- * @str: string to examine</div><div class='del'>- * @prefix: prefix to look for.</div><div class='del'>- */</div><div class='del'>-static inline bool strstarts(const char *str, const char *prefix)</div><div class='del'>-{</div><div class='del'>-	return strncmp(str, prefix, strlen(prefix)) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> size_t memweight(const void *ptr, size_t bytes);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -358,6 +371,10 @@ static inline void memzero_explicit(void *s, size_t count)</div><div class='ctx'>  * kbasename - return the last part of a pathname.</div><div class='ctx'>  *</div><div class='ctx'>  * @path: path to extract the filename from.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * Pointer to the filename portion inside @path. If no '/' exists,</div><div class='add'>+ * returns @path unchanged.</div><div class='ctx'>  */</div><div class='ctx'> static inline const char *kbasename(const char *path)</div><div class='ctx'> {</div><div class='hunk'>@@ -391,8 +408,11 @@ void memcpy_and_pad(void *dest, size_t dest_len, const void *src, size_t count,</div><div class='ctx'>  * must be discoverable by the compiler.</div><div class='ctx'>  */</div><div class='ctx'> #define strtomem_pad(dest, src, pad)	do {				\</div><div class='del'>-	const size_t _dest_len = __builtin_object_size(dest, 1);	\</div><div class='del'>-	const size_t _src_len = __builtin_object_size(src, 1);		\</div><div class='add'>+	const size_t _dest_len = __must_be_byte_array(dest) +		\</div><div class='add'>+				 __must_be_noncstr(dest) +		\</div><div class='add'>+				 ARRAY_SIZE(dest);			\</div><div class='add'>+	const size_t _src_len = __must_be_cstr(src) +			\</div><div class='add'>+				__builtin_object_size(src, 1);		\</div><div class='ctx'> 									\</div><div class='ctx'> 	BUILD_BUG_ON(!__builtin_constant_p(_dest_len) ||		\</div><div class='ctx'> 		     _dest_len == (size_t)-1);				\</div><div class='hunk'>@@ -414,8 +434,11 @@ void memcpy_and_pad(void *dest, size_t dest_len, const void *src, size_t count,</div><div class='ctx'>  * must be discoverable by the compiler.</div><div class='ctx'>  */</div><div class='ctx'> #define strtomem(dest, src)	do {					\</div><div class='del'>-	const size_t _dest_len = __builtin_object_size(dest, 1);	\</div><div class='del'>-	const size_t _src_len = __builtin_object_size(src, 1);		\</div><div class='add'>+	const size_t _dest_len = __must_be_byte_array(dest) +		\</div><div class='add'>+				 __must_be_noncstr(dest) +		\</div><div class='add'>+				 ARRAY_SIZE(dest);			\</div><div class='add'>+	const size_t _src_len = __must_be_cstr(src) +			\</div><div class='add'>+				__builtin_object_size(src, 1);		\</div><div class='ctx'> 									\</div><div class='ctx'> 	BUILD_BUG_ON(!__builtin_constant_p(_dest_len) ||		\</div><div class='ctx'> 		     _dest_len == (size_t)-1);				\</div><div class='hunk'>@@ -423,6 +446,61 @@ void memcpy_and_pad(void *dest, size_t dest_len, const void *src, size_t count,</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * memtostr - Copy a possibly non-NUL-term string to a NUL-term string</div><div class='add'>+ * @dest: Pointer to destination NUL-terminates string</div><div class='add'>+ * @src: Pointer to character array (likely marked as __nonstring)</div><div class='add'>+ *</div><div class='add'>+ * This is a replacement for strncpy() uses where the source is not</div><div class='add'>+ * a NUL-terminated string.</div><div class='add'>+ *</div><div class='add'>+ * Note that sizes of @dest and @src must be known at compile-time.</div><div class='add'>+ */</div><div class='add'>+#define memtostr(dest, src)	do {					\</div><div class='add'>+	const size_t _dest_len = __must_be_byte_array(dest) +		\</div><div class='add'>+				 __must_be_cstr(dest) +			\</div><div class='add'>+				 ARRAY_SIZE(dest);			\</div><div class='add'>+	const size_t _src_len = __must_be_noncstr(src) +		\</div><div class='add'>+				__builtin_object_size(src, 1);		\</div><div class='add'>+	const size_t _src_chars = strnlen(src, _src_len);		\</div><div class='add'>+	const size_t _copy_len = min(_dest_len - 1, _src_chars);	\</div><div class='add'>+									\</div><div class='add'>+	BUILD_BUG_ON(!__builtin_constant_p(_dest_len) ||		\</div><div class='add'>+		     !__builtin_constant_p(_src_len) ||			\</div><div class='add'>+		     _dest_len == 0 || _dest_len == (size_t)-1 ||	\</div><div class='add'>+		     _src_len == 0 || _src_len == (size_t)-1);		\</div><div class='add'>+	memcpy(dest, src, _copy_len);					\</div><div class='add'>+	dest[_copy_len] = '\0';						\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * memtostr_pad - Copy a possibly non-NUL-term string to a NUL-term string</div><div class='add'>+ *                with NUL padding in the destination</div><div class='add'>+ * @dest: Pointer to destination NUL-terminates string</div><div class='add'>+ * @src: Pointer to character array (likely marked as __nonstring)</div><div class='add'>+ *</div><div class='add'>+ * This is a replacement for strncpy() uses where the source is not</div><div class='add'>+ * a NUL-terminated string.</div><div class='add'>+ *</div><div class='add'>+ * Note that sizes of @dest and @src must be known at compile-time.</div><div class='add'>+ */</div><div class='add'>+#define memtostr_pad(dest, src)		do {				\</div><div class='add'>+	const size_t _dest_len = __must_be_byte_array(dest) +		\</div><div class='add'>+				 __must_be_cstr(dest) +			\</div><div class='add'>+				 ARRAY_SIZE(dest);			\</div><div class='add'>+	const size_t _src_len = __must_be_noncstr(src) +		\</div><div class='add'>+				__builtin_object_size(src, 1);		\</div><div class='add'>+	const size_t _src_chars = strnlen(src, _src_len);		\</div><div class='add'>+	const size_t _copy_len = min(_dest_len - 1, _src_chars);	\</div><div class='add'>+									\</div><div class='add'>+	BUILD_BUG_ON(!__builtin_constant_p(_dest_len) ||		\</div><div class='add'>+		     !__builtin_constant_p(_src_len) ||			\</div><div class='add'>+		     _dest_len == 0 || _dest_len == (size_t)-1 ||	\</div><div class='add'>+		     _src_len == 0 || _src_len == (size_t)-1);		\</div><div class='add'>+	memcpy(dest, src, _copy_len);					\</div><div class='add'>+	memset(&amp;dest[_copy_len], 0, _dest_len - _copy_len);		\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * memset_after - Set a value after a struct member to the end of a struct</div><div class='ctx'>  *</div><div class='ctx'>  * @obj: Address of target struct instance</div><div class='hunk'>@@ -478,4 +556,36 @@ static __always_inline size_t str_has_prefix(const char *str, const char *prefix</div><div class='ctx'> 	return strncmp(str, prefix, len) == 0 ? len : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * strstarts - does @str start with @prefix?</div><div class='add'>+ * @str: string to examine</div><div class='add'>+ * @prefix: prefix to look for.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * True if @str begins with @prefix. False in all other cases.</div><div class='add'>+ */</div><div class='add'>+static inline bool strstarts(const char *str, const char *prefix)</div><div class='add'>+{</div><div class='add'>+	return strncmp(str, prefix, strlen(prefix)) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * strends - Check if a string ends with another string.</div><div class='add'>+ * @str: NULL-terminated string to check against @suffix</div><div class='add'>+ * @suffix: NULL-terminated string defining the suffix to look for in @str</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ * True if @str ends with @suffix. False in all other cases.</div><div class='add'>+ */</div><div class='add'>+static inline bool __attribute__((nonnull(1, 2)))</div><div class='add'>+strends(const char *str, const char *suffix)</div><div class='add'>+{</div><div class='add'>+	unsigned int str_len = strlen(str), suffix_len = strlen(suffix);</div><div class='add'>+</div><div class='add'>+	if (str_len &lt; suffix_len)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return !(strcmp(str + str_len - suffix_len, suffix));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_STRING_H_ */</div><div class='head'>diff --git a/include/linux/string_choices.h b/include/linux/string_choices.h<br/>index d9ebe20229f8..ee84087d4b26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/string_choices.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/string_choices.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/string_choices.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/string_choices.h</a></div><div class='hunk'>@@ -2,17 +2,38 @@</div><div class='ctx'> #ifndef _LINUX_STRING_CHOICES_H_</div><div class='ctx'> #define _LINUX_STRING_CHOICES_H_</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Here provide a series of helpers in the str_$TRUE_$FALSE format (you can</div><div class='add'>+ * also expand some helpers as needed), where $TRUE and $FALSE are their</div><div class='add'>+ * corresponding literal strings. These helpers can be used in the printing</div><div class='add'>+ * and also in other places where constant strings are required. Using these</div><div class='add'>+ * helpers offers the following benefits:</div><div class='add'>+ *  1) Reducing the hardcoding of strings, which makes the code more elegant</div><div class='add'>+ *     through these simple literal-meaning helpers.</div><div class='add'>+ *  2) Unifying the output, which prevents the same string from being printed</div><div class='add'>+ *     in various forms, such as enable/disable, enabled/disabled, en/dis.</div><div class='add'>+ *  3) Deduping by the linker, which results in a smaller binary file.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='add'>+static inline const char *str_assert_deassert(bool v)</div><div class='add'>+{</div><div class='add'>+	return v ? "assert" : "deassert";</div><div class='add'>+}</div><div class='add'>+#define str_deassert_assert(v)		str_assert_deassert(!(v))</div><div class='add'>+</div><div class='ctx'> static inline const char *str_enable_disable(bool v)</div><div class='ctx'> {</div><div class='ctx'> 	return v ? "enable" : "disable";</div><div class='ctx'> }</div><div class='add'>+#define str_disable_enable(v)		str_enable_disable(!(v))</div><div class='ctx'> </div><div class='ctx'> static inline const char *str_enabled_disabled(bool v)</div><div class='ctx'> {</div><div class='ctx'> 	return v ? "enabled" : "disabled";</div><div class='ctx'> }</div><div class='add'>+#define str_disabled_enabled(v)		str_enabled_disabled(!(v))</div><div class='ctx'> </div><div class='ctx'> static inline const char *str_hi_lo(bool v)</div><div class='ctx'> {</div><div class='hunk'>@@ -26,21 +47,41 @@ static inline const char *str_high_low(bool v)</div><div class='ctx'> }</div><div class='ctx'> #define str_low_high(v)		str_high_low(!(v))</div><div class='ctx'> </div><div class='add'>+static inline const char *str_input_output(bool v)</div><div class='add'>+{</div><div class='add'>+	return v ? "input" : "output";</div><div class='add'>+}</div><div class='add'>+#define str_output_input(v)	str_input_output(!(v))</div><div class='add'>+</div><div class='add'>+static inline const char *str_on_off(bool v)</div><div class='add'>+{</div><div class='add'>+	return v ? "on" : "off";</div><div class='add'>+}</div><div class='add'>+#define str_off_on(v)		str_on_off(!(v))</div><div class='add'>+</div><div class='ctx'> static inline const char *str_read_write(bool v)</div><div class='ctx'> {</div><div class='ctx'> 	return v ? "read" : "write";</div><div class='ctx'> }</div><div class='ctx'> #define str_write_read(v)		str_read_write(!(v))</div><div class='ctx'> </div><div class='del'>-static inline const char *str_on_off(bool v)</div><div class='add'>+static inline const char *str_true_false(bool v)</div><div class='ctx'> {</div><div class='del'>-	return v ? "on" : "off";</div><div class='add'>+	return v ? "true" : "false";</div><div class='add'>+}</div><div class='add'>+#define str_false_true(v)		str_true_false(!(v))</div><div class='add'>+</div><div class='add'>+static inline const char *str_up_down(bool v)</div><div class='add'>+{</div><div class='add'>+	return v ? "up" : "down";</div><div class='ctx'> }</div><div class='add'>+#define str_down_up(v)		str_up_down(!(v))</div><div class='ctx'> </div><div class='ctx'> static inline const char *str_yes_no(bool v)</div><div class='ctx'> {</div><div class='ctx'> 	return v ? "yes" : "no";</div><div class='ctx'> }</div><div class='add'>+#define str_no_yes(v)		str_yes_no(!(v))</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * str_plural - Return the simple pluralization based on English counts</div><div class='head'>diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h<br/>index e93fbb5b0c01..3fb88a1e9898 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/string_helpers.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/string_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/string_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/string_helpers.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@ enum string_size_units {</div><div class='ctx'> int string_get_size(u64 size, u64 blk_size, const enum string_size_units units,</div><div class='ctx'> 		    char *buf, int len);</div><div class='ctx'> </div><div class='add'>+int parse_int_array(const char *buf, size_t count, int **array);</div><div class='ctx'> int parse_int_array_user(const char __user *from, size_t count, int **array);</div><div class='ctx'> </div><div class='ctx'> #define UNESCAPE_SPACE		BIT(0)</div><div class='head'>diff --git a/include/linux/sungem_phy.h b/include/linux/sungem_phy.h<br/>index c505f30e8b68..eecc7eb63bfb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sungem_phy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sungem_phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sungem_phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sungem_phy.h</a></div><div class='hunk'>@@ -40,7 +40,7 @@ enum {</div><div class='ctx'> /* An instance of a PHY, partially borrowed from mii_if_info */</div><div class='ctx'> struct mii_phy</div><div class='ctx'> {</div><div class='del'>-	struct mii_phy_def*	def;</div><div class='add'>+	const struct mii_phy_def *def;</div><div class='ctx'> 	u32			advertising;</div><div class='ctx'> 	int			mii_id;</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h<br/>index 35766963dd14..e783132e481f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/cache.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/cache.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/cache.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/cache.h</a></div><div class='hunk'>@@ -222,6 +222,8 @@ static inline bool cache_is_expired(struct cache_detail *detail, struct cache_he</div><div class='ctx'> 	return detail-&gt;flush_time &gt;= h-&gt;last_refresh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern int cache_check_rcu(struct cache_detail *detail,</div><div class='add'>+		       struct cache_head *h, struct cache_req *rqstp);</div><div class='ctx'> extern int cache_check(struct cache_detail *detail,</div><div class='ctx'> 		       struct cache_head *h, struct cache_req *rqstp);</div><div class='ctx'> extern void cache_flush(void);</div><div class='head'>diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h<br/>index 5e9d1469c6fa..f8b406b0a1af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/clnt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/clnt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/clnt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/clnt.h</a></div><div class='hunk'>@@ -64,7 +64,9 @@ struct rpc_clnt {</div><div class='ctx'> 				cl_noretranstimeo: 1,/* No retransmit timeouts */</div><div class='ctx'> 				cl_autobind : 1,/* use getport() */</div><div class='ctx'> 				cl_chatty   : 1,/* be verbose */</div><div class='del'>-				cl_shutdown : 1;/* rpc immediate -EIO */</div><div class='add'>+				cl_shutdown : 1,/* rpc immediate -EIO */</div><div class='add'>+				cl_netunreach_fatal : 1;</div><div class='add'>+						/* Treat ENETUNREACH errors as fatal */</div><div class='ctx'> 	struct xprtsec_parms	cl_xprtsec;	/* transport security policy */</div><div class='ctx'> </div><div class='ctx'> 	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */</div><div class='hunk'>@@ -93,6 +95,7 @@ struct rpc_clnt {</div><div class='ctx'> 	const struct cred	*cl_cred;</div><div class='ctx'> 	unsigned int		cl_max_connect; /* max number of transports not to the same IP */</div><div class='ctx'> 	struct super_block *pipefs_sb;</div><div class='add'>+	atomic_t		cl_task_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -139,6 +142,7 @@ struct rpc_create_args {</div><div class='ctx'> 	const char		*servername;</div><div class='ctx'> 	const char		*nodename;</div><div class='ctx'> 	const struct rpc_program *program;</div><div class='add'>+	struct rpc_stat		*stats;</div><div class='ctx'> 	u32			prognumber;	/* overrides program-&gt;number */</div><div class='ctx'> 	u32			version;</div><div class='ctx'> 	rpc_authflavor_t	authflavor;</div><div class='hunk'>@@ -173,6 +177,7 @@ struct rpc_add_xprt_test {</div><div class='ctx'> #define RPC_CLNT_CREATE_SOFTERR		(1UL &lt;&lt; 10)</div><div class='ctx'> #define RPC_CLNT_CREATE_REUSEPORT	(1UL &lt;&lt; 11)</div><div class='ctx'> #define RPC_CLNT_CREATE_CONNECTED	(1UL &lt;&lt; 12)</div><div class='add'>+#define RPC_CLNT_CREATE_NETUNREACH_FATAL	(1UL &lt;&lt; 13)</div><div class='ctx'> </div><div class='ctx'> struct rpc_clnt *rpc_create(struct rpc_create_args *args);</div><div class='ctx'> struct rpc_clnt	*rpc_bind_new_program(struct rpc_clnt *,</div><div class='head'>diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h<br/>index f6aeed07fe04..891f6173c951 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/debug.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/debug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/debug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/debug.h</a></div><div class='hunk'>@@ -23,43 +23,30 @@ extern unsigned int		nlm_debug;</div><div class='ctx'> </div><div class='ctx'> #define dprintk(fmt, ...)						\</div><div class='ctx'> 	dfprintk(FACILITY, fmt, ##__VA_ARGS__)</div><div class='del'>-#define dprintk_cont(fmt, ...)						\</div><div class='del'>-	dfprintk_cont(FACILITY, fmt, ##__VA_ARGS__)</div><div class='ctx'> #define dprintk_rcu(fmt, ...)						\</div><div class='ctx'> 	dfprintk_rcu(FACILITY, fmt, ##__VA_ARGS__)</div><div class='del'>-#define dprintk_rcu_cont(fmt, ...)					\</div><div class='del'>-	dfprintk_rcu_cont(FACILITY, fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='ctx'> #undef ifdebug</div><div class='ctx'> #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)</div><div class='ctx'> # define ifdebug(fac)		if (unlikely(rpc_debug &amp; RPCDBG_##fac))</div><div class='ctx'> </div><div class='del'>-# define dfprintk(fac, fmt, ...)					\</div><div class='del'>-do {									\</div><div class='del'>-	ifdebug(fac)							\</div><div class='del'>-		printk(KERN_DEFAULT fmt, ##__VA_ARGS__);		\</div><div class='del'>-} while (0)</div><div class='add'>+# if IS_ENABLED(CONFIG_SUNRPC_DEBUG_TRACE)</div><div class='add'>+#  define __sunrpc_printk(fmt, ...)	trace_printk(fmt, ##__VA_ARGS__)</div><div class='add'>+# else</div><div class='add'>+#  define __sunrpc_printk(fmt, ...)	printk(KERN_DEFAULT fmt, ##__VA_ARGS__)</div><div class='add'>+# endif</div><div class='ctx'> </div><div class='del'>-# define dfprintk_cont(fac, fmt, ...)					\</div><div class='add'>+# define dfprintk(fac, fmt, ...)					\</div><div class='ctx'> do {									\</div><div class='ctx'> 	ifdebug(fac)							\</div><div class='del'>-		printk(KERN_CONT fmt, ##__VA_ARGS__);			\</div><div class='add'>+		__sunrpc_printk(fmt, ##__VA_ARGS__);			\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> # define dfprintk_rcu(fac, fmt, ...)					\</div><div class='ctx'> do {									\</div><div class='ctx'> 	ifdebug(fac) {							\</div><div class='ctx'> 		rcu_read_lock();					\</div><div class='del'>-		printk(KERN_DEFAULT fmt, ##__VA_ARGS__);		\</div><div class='del'>-		rcu_read_unlock();					\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-# define dfprintk_rcu_cont(fac, fmt, ...)				\</div><div class='del'>-do {									\</div><div class='del'>-	ifdebug(fac) {							\</div><div class='del'>-		rcu_read_lock();					\</div><div class='del'>-		printk(KERN_CONT fmt, ##__VA_ARGS__);			\</div><div class='add'>+		__sunrpc_printk(fmt, ##__VA_ARGS__);			\</div><div class='ctx'> 		rcu_read_unlock();					\</div><div class='ctx'> 	}								\</div><div class='ctx'> } while (0)</div><div class='hunk'>@@ -68,7 +55,6 @@ do {									\</div><div class='ctx'> #else</div><div class='ctx'> # define ifdebug(fac)		if (0)</div><div class='ctx'> # define dfprintk(fac, fmt, ...)	do {} while (0)</div><div class='del'>-# define dfprintk_cont(fac, fmt, ...)	do {} while (0)</div><div class='ctx'> # define dfprintk_rcu(fac, fmt, ...)	do {} while (0)</div><div class='ctx'> # define RPC_IFDEBUG(x)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/sunrpc/gss_asn1.h b/include/linux/sunrpc/gss_asn1.h<br/>deleted file mode 100644<br/>index 3ccecd0ad229..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/gss_asn1.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/gss_asn1.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/include/linux/sunrpc/gss_asn1.h</div><div class='del'>- *</div><div class='del'>- *  minimal asn1 for generic encoding/decoding of gss tokens</div><div class='del'>- *</div><div class='del'>- *  Adapted from MIT Kerberos 5-1.2.1 lib/include/krb5.h,</div><div class='del'>- *  lib/gssapi/krb5/gssapiP_krb5.h, and others</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2000 The Regents of the University of Michigan.</div><div class='del'>- *  All rights reserved.</div><div class='del'>- *</div><div class='del'>- *  Andy Adamson   &lt;andros@umich.edu&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copyright 1995 by the Massachusetts Institute of Technology.</div><div class='del'>- * All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * Export of this software from the United States of America may</div><div class='del'>- *   require a specific license from the United States Government.</div><div class='del'>- *   It is the responsibility of any person or organization contemplating</div><div class='del'>- *   export to obtain such a license before exporting.</div><div class='del'>- *</div><div class='del'>- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and</div><div class='del'>- * distribute this software and its documentation for any purpose and</div><div class='del'>- * without fee is hereby granted, provided that the above copyright</div><div class='del'>- * notice appear in all copies and that both that copyright notice and</div><div class='del'>- * this permission notice appear in supporting documentation, and that</div><div class='del'>- * the name of M.I.T. not be used in advertising or publicity pertaining</div><div class='del'>- * to distribution of the software without specific, written prior</div><div class='del'>- * permission.  Furthermore if you modify this software you must label</div><div class='del'>- * your software as modified software and not distribute it in such a</div><div class='del'>- * fashion that it might be confused with the original M.I.T. software.</div><div class='del'>- * M.I.T. makes no representations about the suitability of</div><div class='del'>- * this software for any purpose.  It is provided "as is" without express</div><div class='del'>- * or implied warranty.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sunrpc/gss_api.h&gt;</div><div class='del'>-</div><div class='del'>-#define SIZEOF_INT 4</div><div class='del'>-</div><div class='del'>-/* from gssapi_err_generic.h */</div><div class='del'>-#define G_BAD_SERVICE_NAME                       (-2045022976L)</div><div class='del'>-#define G_BAD_STRING_UID                         (-2045022975L)</div><div class='del'>-#define G_NOUSER                                 (-2045022974L)</div><div class='del'>-#define G_VALIDATE_FAILED                        (-2045022973L)</div><div class='del'>-#define G_BUFFER_ALLOC                           (-2045022972L)</div><div class='del'>-#define G_BAD_MSG_CTX                            (-2045022971L)</div><div class='del'>-#define G_WRONG_SIZE                             (-2045022970L)</div><div class='del'>-#define G_BAD_USAGE                              (-2045022969L)</div><div class='del'>-#define G_UNKNOWN_QOP                            (-2045022968L)</div><div class='del'>-#define G_NO_HOSTNAME                            (-2045022967L)</div><div class='del'>-#define G_BAD_HOSTNAME                           (-2045022966L)</div><div class='del'>-#define G_WRONG_MECH                             (-2045022965L)</div><div class='del'>-#define G_BAD_TOK_HEADER                         (-2045022964L)</div><div class='del'>-#define G_BAD_DIRECTION                          (-2045022963L)</div><div class='del'>-#define G_TOK_TRUNC                              (-2045022962L)</div><div class='del'>-#define G_REFLECT                                (-2045022961L)</div><div class='del'>-#define G_WRONG_TOKID                            (-2045022960L)</div><div class='del'>-</div><div class='del'>-#define g_OID_equal(o1,o2) \</div><div class='del'>-   (((o1)-&gt;len == (o2)-&gt;len) &amp;&amp; \</div><div class='del'>-    (memcmp((o1)-&gt;data,(o2)-&gt;data,(int) (o1)-&gt;len) == 0))</div><div class='del'>-</div><div class='del'>-u32 g_verify_token_header(</div><div class='del'>-     struct xdr_netobj *mech,</div><div class='del'>-     int *body_size,</div><div class='del'>-     unsigned char **buf_in,</div><div class='del'>-     int toksize);</div><div class='del'>-</div><div class='del'>-int g_token_size(</div><div class='del'>-     struct xdr_netobj *mech,</div><div class='del'>-     unsigned int body_size);</div><div class='del'>-</div><div class='del'>-void g_make_token_header(</div><div class='del'>-     struct xdr_netobj *mech,</div><div class='del'>-     int body_size,</div><div class='del'>-     unsigned char **buf);</div><div class='head'>diff --git a/include/linux/sunrpc/gss_krb5.h b/include/linux/sunrpc/gss_krb5.h<br/>index 78a80bf3fdcb..43950b5237c8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/gss_krb5.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/gss_krb5.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/gss_krb5.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/gss_krb5.h</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> #include &lt;crypto/skcipher.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/auth_gss.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/gss_err.h&gt;</div><div class='del'>-#include &lt;linux/sunrpc/gss_asn1.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Length of constant used in key derivation */</div><div class='ctx'> #define GSS_KRB5_K5CLENGTH (5)</div><div class='head'>diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_prot.h<br/>index c4b0eb2b2f04..ada17b57ca44 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/msg_prot.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/msg_prot.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/msg_prot.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/msg_prot.h</a></div><div class='hunk'>@@ -69,15 +69,17 @@ enum rpc_reject_stat {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum rpc_auth_stat {</div><div class='del'>-	RPC_AUTH_OK = 0,</div><div class='del'>-	RPC_AUTH_BADCRED = 1,</div><div class='del'>-	RPC_AUTH_REJECTEDCRED = 2,</div><div class='del'>-	RPC_AUTH_BADVERF = 3,</div><div class='del'>-	RPC_AUTH_REJECTEDVERF = 4,</div><div class='del'>-	RPC_AUTH_TOOWEAK = 5,</div><div class='add'>+	RPC_AUTH_OK = 0,		/* success */</div><div class='add'>+	RPC_AUTH_BADCRED = 1,		/* bad credential (seal broken) */</div><div class='add'>+	RPC_AUTH_REJECTEDCRED = 2,	/* client must begin new session */</div><div class='add'>+	RPC_AUTH_BADVERF = 3,		/* bad verifier (seal broken) */</div><div class='add'>+	RPC_AUTH_REJECTEDVERF = 4,	/* verifier expired or replayed */</div><div class='add'>+	RPC_AUTH_TOOWEAK = 5,		/* rejected for security reasons */</div><div class='add'>+	RPC_AUTH_INVALIDRESP = 6,	/* bogus response verifier */</div><div class='add'>+	RPC_AUTH_FAILED = 7,		/* reason unknown */</div><div class='ctx'> 	/* RPCSEC_GSS errors */</div><div class='del'>-	RPCSEC_GSS_CREDPROBLEM = 13,</div><div class='del'>-	RPCSEC_GSS_CTXPROBLEM = 14</div><div class='add'>+	RPCSEC_GSS_CREDPROBLEM = 13,	/* no credentials for user */</div><div class='add'>+	RPCSEC_GSS_CTXPROBLEM = 14	/* problem with context */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define RPC_MAXNETNAMELEN	256</div><div class='head'>diff --git a/include/linux/sunrpc/rdma_rn.h b/include/linux/sunrpc/rdma_rn.h<br/>new file mode 100644<br/>index 000000000000..7d032ca057af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/rdma_rn.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/rdma_rn.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * * Copyright (c) 2024, Oracle and/or its affiliates.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_SUNRPC_RDMA_RN_H</div><div class='add'>+#define _LINUX_SUNRPC_RDMA_RN_H</div><div class='add'>+</div><div class='add'>+#include &lt;rdma/ib_verbs.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rpcrdma_notification - request removal notification</div><div class='add'>+ */</div><div class='add'>+struct rpcrdma_notification {</div><div class='add'>+	void			(*rn_done)(struct rpcrdma_notification *rn);</div><div class='add'>+	u32			rn_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int rpcrdma_rn_register(struct ib_device *device,</div><div class='add'>+			struct rpcrdma_notification *rn,</div><div class='add'>+			void (*done)(struct rpcrdma_notification *rn));</div><div class='add'>+void rpcrdma_rn_unregister(struct ib_device *device,</div><div class='add'>+			   struct rpcrdma_notification *rn);</div><div class='add'>+int rpcrdma_ib_client_register(void);</div><div class='add'>+void rpcrdma_ib_client_unregister(void);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_SUNRPC_RDMA_RN_H */</div><div class='head'>diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h<br/>index 3b35b6f6533a..2cb406f8ff4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/rpc_pipe_fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/rpc_pipe_fs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/rpc_pipe_fs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/rpc_pipe_fs.h</a></div><div class='hunk'>@@ -98,7 +98,7 @@ static inline bool rpc_msg_is_inflight(const struct rpc_pipe_msg *msg) {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct rpc_clnt;</div><div class='del'>-extern struct dentry *rpc_create_client_dir(struct dentry *, const char *, struct rpc_clnt *);</div><div class='add'>+extern int rpc_create_client_dir(struct dentry *, const char *, struct rpc_clnt *);</div><div class='ctx'> extern int rpc_remove_client_dir(struct rpc_clnt *);</div><div class='ctx'> </div><div class='ctx'> extern void rpc_init_pipe_dir_head(struct rpc_pipe_dir_head *pdh);</div><div class='hunk'>@@ -127,9 +127,9 @@ extern void rpc_remove_cache_dir(struct dentry *);</div><div class='ctx'> </div><div class='ctx'> struct rpc_pipe *rpc_mkpipe_data(const struct rpc_pipe_ops *ops, int flags);</div><div class='ctx'> void rpc_destroy_pipe_data(struct rpc_pipe *pipe);</div><div class='del'>-extern struct dentry *rpc_mkpipe_dentry(struct dentry *, const char *, void *,</div><div class='add'>+extern int rpc_mkpipe_dentry(struct dentry *, const char *, void *,</div><div class='ctx'> 					struct rpc_pipe *);</div><div class='del'>-extern int rpc_unlink(struct dentry *);</div><div class='add'>+extern void rpc_unlink(struct rpc_pipe *);</div><div class='ctx'> extern int register_rpc_pipefs(void);</div><div class='ctx'> extern void unregister_rpc_pipefs(void);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h<br/>index 2d61987b3545..ccba79ebf893 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/sched.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/sched.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/sched.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/sched.h</a></div><div class='hunk'>@@ -134,6 +134,7 @@ struct rpc_task_setup {</div><div class='ctx'> #define RPC_TASK_MOVEABLE	0x0004		/* nfs4.1+ rpc tasks */</div><div class='ctx'> #define RPC_TASK_NULLCREDS	0x0010		/* Use AUTH_NULL credential */</div><div class='ctx'> #define RPC_CALL_MAJORSEEN	0x0020		/* major timeout seen */</div><div class='add'>+#define RPC_TASK_NETUNREACH_FATAL 0x0040	/* ENETUNREACH is fatal */</div><div class='ctx'> #define RPC_TASK_DYNAMIC	0x0080		/* task was kmalloc'ed */</div><div class='ctx'> #define	RPC_TASK_NO_ROUND_ROBIN	0x0100		/* send requests on "main" xprt */</div><div class='ctx'> #define RPC_TASK_SOFT		0x0200		/* Use soft timeouts */</div><div class='hunk'>@@ -151,13 +152,14 @@ struct rpc_task_setup {</div><div class='ctx'> #define RPC_WAS_SENT(t)		((t)-&gt;tk_flags &amp; RPC_TASK_SENT)</div><div class='ctx'> #define RPC_IS_MOVEABLE(t)	((t)-&gt;tk_flags &amp; RPC_TASK_MOVEABLE)</div><div class='ctx'> </div><div class='del'>-#define RPC_TASK_RUNNING	0</div><div class='del'>-#define RPC_TASK_QUEUED		1</div><div class='del'>-#define RPC_TASK_ACTIVE		2</div><div class='del'>-#define RPC_TASK_NEED_XMIT	3</div><div class='del'>-#define RPC_TASK_NEED_RECV	4</div><div class='del'>-#define RPC_TASK_MSG_PIN_WAIT	5</div><div class='del'>-#define RPC_TASK_SIGNALLED	6</div><div class='add'>+enum {</div><div class='add'>+	RPC_TASK_RUNNING,</div><div class='add'>+	RPC_TASK_QUEUED,</div><div class='add'>+	RPC_TASK_ACTIVE,</div><div class='add'>+	RPC_TASK_NEED_XMIT,</div><div class='add'>+	RPC_TASK_NEED_RECV,</div><div class='add'>+	RPC_TASK_MSG_PIN_WAIT,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define rpc_test_and_set_running(t) \</div><div class='ctx'> 				test_and_set_bit(RPC_TASK_RUNNING, &amp;(t)-&gt;tk_runstate)</div><div class='hunk'>@@ -169,7 +171,7 @@ struct rpc_task_setup {</div><div class='ctx'> </div><div class='ctx'> #define RPC_IS_ACTIVATED(t)	test_bit(RPC_TASK_ACTIVE, &amp;(t)-&gt;tk_runstate)</div><div class='ctx'> </div><div class='del'>-#define RPC_SIGNALLED(t)	test_bit(RPC_TASK_SIGNALLED, &amp;(t)-&gt;tk_runstate)</div><div class='add'>+#define RPC_SIGNALLED(t)	(READ_ONCE(task-&gt;tk_rpc_status) == -ERESTARTSYS)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Task priorities.</div><div class='hunk'>@@ -197,7 +199,7 @@ struct rpc_wait_queue {</div><div class='ctx'> 	unsigned char		maxpriority;		/* maximum priority (0 if queue is not a priority queue) */</div><div class='ctx'> 	unsigned char		priority;		/* current priority */</div><div class='ctx'> 	unsigned char		nr;			/* # tasks remaining for cookie */</div><div class='del'>-	unsigned short		qlen;			/* total # tasks waiting in queue */</div><div class='add'>+	unsigned int		qlen;			/* total # tasks waiting in queue */</div><div class='ctx'> 	struct rpc_timer	timer_list;</div><div class='ctx'> #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || IS_ENABLED(CONFIG_TRACEPOINTS)</div><div class='ctx'> 	const char *		name;</div><div class='head'>diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h<br/>index 23617da0e565..5506d20857c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/svc.h</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pagevec.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *</div><div class='hunk'>@@ -33,9 +34,9 @@</div><div class='ctx'>  * node traffic on multi-node NUMA NFS servers.</div><div class='ctx'>  */</div><div class='ctx'> struct svc_pool {</div><div class='del'>-	unsigned int		sp_id;	    	/* pool id; also node id on NUMA */</div><div class='add'>+	unsigned int		sp_id;		/* pool id; also node id on NUMA */</div><div class='ctx'> 	struct lwq		sp_xprts;	/* pending transports */</div><div class='del'>-	atomic_t		sp_nrthreads;	/* # of threads in pool */</div><div class='add'>+	unsigned int		sp_nrthreads;	/* # of threads in pool */</div><div class='ctx'> 	struct list_head	sp_all_threads;	/* all server threads */</div><div class='ctx'> 	struct llist_head	sp_idle_threads; /* idle server threads */</div><div class='ctx'> </div><div class='hunk'>@@ -66,25 +67,23 @@ enum {</div><div class='ctx'>  * We currently do not support more than one RPC program per daemon.</div><div class='ctx'>  */</div><div class='ctx'> struct svc_serv {</div><div class='del'>-	struct svc_program *	sv_program;	/* RPC program */</div><div class='add'>+	struct svc_program *	sv_programs;	/* RPC programs */</div><div class='ctx'> 	struct svc_stat *	sv_stats;	/* RPC statistics */</div><div class='ctx'> 	spinlock_t		sv_lock;</div><div class='add'>+	unsigned int		sv_nprogs;	/* Number of sv_programs */</div><div class='ctx'> 	unsigned int		sv_nrthreads;	/* # of server threads */</div><div class='del'>-	unsigned int		sv_maxconn;	/* max connections allowed or</div><div class='del'>-						 * '0' causing max to be based</div><div class='del'>-						 * on number of threads. */</div><div class='del'>-</div><div class='ctx'> 	unsigned int		sv_max_payload;	/* datagram payload size */</div><div class='ctx'> 	unsigned int		sv_max_mesg;	/* max_payload + 1 page for overheads */</div><div class='ctx'> 	unsigned int		sv_xdrsize;	/* XDR buffer size */</div><div class='ctx'> 	struct list_head	sv_permsocks;	/* all permanent sockets */</div><div class='ctx'> 	struct list_head	sv_tempsocks;	/* all temporary sockets */</div><div class='del'>-	int			sv_tmpcnt;	/* count of temporary sockets */</div><div class='add'>+	int			sv_tmpcnt;	/* count of temporary "valid" sockets */</div><div class='ctx'> 	struct timer_list	sv_temptimer;	/* timer for aging temporary sockets */</div><div class='ctx'> </div><div class='ctx'> 	char *			sv_name;	/* service name */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		sv_nrpools;	/* number of thread pools */</div><div class='add'>+	bool			sv_is_pooled;	/* is this a pooled service? */</div><div class='ctx'> 	struct svc_pool *	sv_pools;	/* array of thread pools */</div><div class='ctx'> 	int			(*sv_threadfn)(void *data);</div><div class='ctx'> </div><div class='hunk'>@@ -120,14 +119,14 @@ void svc_destroy(struct svc_serv **svcp);</div><div class='ctx'>  * Linux limit; someone who cares more about NFS/UDP performance</div><div class='ctx'>  * can test a larger number.</div><div class='ctx'>  *</div><div class='del'>- * For TCP transports we have more freedom.  A size of 1MB is</div><div class='del'>- * chosen to match the client limit.  Other OSes are known to</div><div class='del'>- * have larger limits, but those numbers are probably beyond</div><div class='del'>- * the point of diminishing returns.</div><div class='add'>+ * For non-UDP transports we have more freedom.  A size of 4MB is</div><div class='add'>+ * chosen to accommodate clients that support larger I/O sizes.</div><div class='ctx'>  */</div><div class='del'>-#define RPCSVC_MAXPAYLOAD	(1*1024*1024u)</div><div class='del'>-#define RPCSVC_MAXPAYLOAD_TCP	RPCSVC_MAXPAYLOAD</div><div class='del'>-#define RPCSVC_MAXPAYLOAD_UDP	(32*1024u)</div><div class='add'>+enum {</div><div class='add'>+	RPCSVC_MAXPAYLOAD	= 4 * 1024 * 1024,</div><div class='add'>+	RPCSVC_MAXPAYLOAD_TCP	= RPCSVC_MAXPAYLOAD,</div><div class='add'>+	RPCSVC_MAXPAYLOAD_UDP	= 32 * 1024,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> extern u32 svc_max_payload(const struct svc_rqst *rqstp);</div><div class='ctx'> </div><div class='hunk'>@@ -151,14 +150,24 @@ extern u32 svc_max_payload(const struct svc_rqst *rqstp);</div><div class='ctx'>  * list.  xdr_buf.tail points to the end of the first page.</div><div class='ctx'>  * This assumes that the non-page part of an rpc reply will fit</div><div class='ctx'>  * in a page - NFSd ensures this.  lockd also has no trouble.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * svc_serv_maxpages - maximum count of pages needed for one RPC message</div><div class='add'>+ * @serv: RPC service context</div><div class='ctx'>  *</div><div class='del'>- * Each request/reply pair can have at most one "payload", plus two pages,</div><div class='del'>- * one for the request, and one for the reply.</div><div class='del'>- * We using -&gt;sendfile to return read data, we might need one extra page</div><div class='del'>- * if the request is not page-aligned.  So add another '1'.</div><div class='add'>+ * Returns a count of pages or vectors that can hold the maximum</div><div class='add'>+ * size RPC message for @serv.</div><div class='add'>+ *</div><div class='add'>+ * Each request/reply pair can have at most one "payload", plus two</div><div class='add'>+ * pages, one for the request, and one for the reply.</div><div class='add'>+ * nfsd_splice_actor() might need an extra page when a READ payload</div><div class='add'>+ * is not page-aligned.</div><div class='ctx'>  */</div><div class='del'>-#define RPCSVC_MAXPAGES		((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE \</div><div class='del'>-				+ 2 + 1)</div><div class='add'>+static inline unsigned long svc_serv_maxpages(const struct svc_serv *serv)</div><div class='add'>+{</div><div class='add'>+	return DIV_ROUND_UP(serv-&gt;sv_max_mesg, PAGE_SIZE) + 2 + 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The context of a single thread, including the request currently being</div><div class='hunk'>@@ -187,16 +196,16 @@ struct svc_rqst {</div><div class='ctx'> 	struct xdr_buf		rq_arg;</div><div class='ctx'> 	struct xdr_stream	rq_arg_stream;</div><div class='ctx'> 	struct xdr_stream	rq_res_stream;</div><div class='del'>-	struct page		*rq_scratch_page;</div><div class='add'>+	struct folio		*rq_scratch_folio;</div><div class='ctx'> 	struct xdr_buf		rq_res;</div><div class='del'>-	struct page		*rq_pages[RPCSVC_MAXPAGES + 1];</div><div class='add'>+	unsigned long		rq_maxpages;	/* num of entries in rq_pages */</div><div class='add'>+	struct page *		*rq_pages;</div><div class='ctx'> 	struct page *		*rq_respages;	/* points into rq_pages */</div><div class='ctx'> 	struct page *		*rq_next_page; /* next reply page to use */</div><div class='ctx'> 	struct page *		*rq_page_end;  /* one past the last page */</div><div class='ctx'> </div><div class='ctx'> 	struct folio_batch	rq_fbatch;</div><div class='del'>-	struct kvec		rq_vec[RPCSVC_MAXPAGES]; /* generally useful.. */</div><div class='del'>-	struct bio_vec		rq_bvec[RPCSVC_MAXPAGES];</div><div class='add'>+	struct bio_vec		*rq_bvec;</div><div class='ctx'> </div><div class='ctx'> 	__be32			rq_xid;		/* transmission id */</div><div class='ctx'> 	u32			rq_prog;	/* program number */</div><div class='hunk'>@@ -231,10 +240,15 @@ struct svc_rqst {</div><div class='ctx'> 	struct net		*rq_bc_net;	/* pointer to backchannel's</div><div class='ctx'> 						 * net namespace</div><div class='ctx'> 						 */</div><div class='del'>-	unsigned long	bc_to_initval;</div><div class='del'>-	unsigned int	bc_to_retries;</div><div class='del'>-	void **			rq_lease_breaker; /* The v4 client breaking a lease */</div><div class='add'>+</div><div class='add'>+	int			rq_err;		/* Thread sets this to inidicate</div><div class='add'>+						 * initialisation success.</div><div class='add'>+						 */</div><div class='add'>+</div><div class='add'>+	unsigned long		bc_to_initval;</div><div class='add'>+	unsigned int		bc_to_retries;</div><div class='ctx'> 	unsigned int		rq_status_counter; /* RPC processing counter */</div><div class='add'>+	void			**rq_lease_breaker; /* The v4 client breaking a lease */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* bits for rq_flags */</div><div class='hunk'>@@ -304,6 +318,26 @@ static inline bool svc_thread_should_stop(struct svc_rqst *rqstp)</div><div class='ctx'> 	return test_bit(RQ_VICTIM, &amp;rqstp-&gt;rq_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * svc_thread_init_status - report whether thread has initialised successfully</div><div class='add'>+ * @rqstp: the thread in question</div><div class='add'>+ * @err: errno code</div><div class='add'>+ *</div><div class='add'>+ * After performing any initialisation that could fail, and before starting</div><div class='add'>+ * normal work, each sunrpc svc_thread must call svc_thread_init_status()</div><div class='add'>+ * with an appropriate error, or zero.</div><div class='add'>+ *</div><div class='add'>+ * If zero is passed, the thread is ready and must continue until</div><div class='add'>+ * svc_thread_should_stop() returns true.  If a non-zero error is passed</div><div class='add'>+ * the call will not return - the thread will exit.</div><div class='add'>+ */</div><div class='add'>+static inline void svc_thread_init_status(struct svc_rqst *rqstp, int err)</div><div class='add'>+{</div><div class='add'>+	store_release_wake_up(&amp;rqstp-&gt;rq_err, err);</div><div class='add'>+	if (err)</div><div class='add'>+		kthread_exit(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct svc_deferred_req {</div><div class='ctx'> 	u32			prot;	/* protocol (UDP or TCP) */</div><div class='ctx'> 	struct svc_xprt		*xprt;</div><div class='hunk'>@@ -328,10 +362,9 @@ struct svc_process_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * List of RPC programs on the same transport endpoint</div><div class='add'>+ * RPC program - an array of these can use the same transport endpoint</div><div class='ctx'>  */</div><div class='ctx'> struct svc_program {</div><div class='del'>-	struct svc_program *	pg_next;	/* other programs (same xprt) */</div><div class='ctx'> 	u32			pg_prog;	/* program number */</div><div class='ctx'> 	unsigned int		pg_lovers;	/* lowest version */</div><div class='ctx'> 	unsigned int		pg_hivers;	/* highest version */</div><div class='hunk'>@@ -398,19 +431,18 @@ struct svc_procedure {</div><div class='ctx'> /*</div><div class='ctx'>  * Function prototypes.</div><div class='ctx'>  */</div><div class='del'>-int svc_rpcb_setup(struct svc_serv *serv, struct net *net);</div><div class='add'>+int sunrpc_set_pool_mode(const char *val);</div><div class='add'>+int sunrpc_get_pool_mode(char *val, size_t size);</div><div class='ctx'> void svc_rpcb_cleanup(struct svc_serv *serv, struct net *net);</div><div class='ctx'> int svc_bind(struct svc_serv *serv, struct net *net);</div><div class='ctx'> struct svc_serv *svc_create(struct svc_program *, unsigned int,</div><div class='ctx'> 			    int (*threadfn)(void *data));</div><div class='del'>-struct svc_rqst *svc_rqst_alloc(struct svc_serv *serv,</div><div class='del'>-					struct svc_pool *pool, int node);</div><div class='ctx'> bool		   svc_rqst_replace_page(struct svc_rqst *rqstp,</div><div class='ctx'> 					 struct page *page);</div><div class='ctx'> void		   svc_rqst_release_pages(struct svc_rqst *rqstp);</div><div class='del'>-void		   svc_rqst_free(struct svc_rqst *);</div><div class='ctx'> void		   svc_exit_thread(struct svc_rqst *);</div><div class='ctx'> struct svc_serv *  svc_create_pooled(struct svc_program *prog,</div><div class='add'>+				     unsigned int nprog,</div><div class='ctx'> 				     struct svc_stat *stats,</div><div class='ctx'> 				     unsigned int bufsize,</div><div class='ctx'> 				     int (*threadfn)(void *data));</div><div class='hunk'>@@ -430,8 +462,6 @@ const char *	   svc_proc_name(const struct svc_rqst *rqstp);</div><div class='ctx'> int		   svc_encode_result_payload(struct svc_rqst *rqstp,</div><div class='ctx'> 					     unsigned int offset,</div><div class='ctx'> 					     unsigned int length);</div><div class='del'>-unsigned int	   svc_fill_write_vector(struct svc_rqst *rqstp,</div><div class='del'>-					 struct xdr_buf *payload);</div><div class='ctx'> char		  *svc_fill_symlink_pathname(struct svc_rqst *rqstp,</div><div class='ctx'> 					     struct kvec *first, void *p,</div><div class='ctx'> 					     size_t total);</div><div class='hunk'>@@ -443,11 +473,6 @@ int		   svc_generic_rpcbind_set(struct net *net,</div><div class='ctx'> 					   u32 version, int family,</div><div class='ctx'> 					   unsigned short proto,</div><div class='ctx'> 					   unsigned short port);</div><div class='del'>-int		   svc_rpcbind_set_version(struct net *net,</div><div class='del'>-					   const struct svc_program *progp,</div><div class='del'>-					   u32 version, int family,</div><div class='del'>-					   unsigned short proto,</div><div class='del'>-					   unsigned short port);</div><div class='ctx'> </div><div class='ctx'> #define	RPC_MAX_ADDRBUFLEN	(63U)</div><div class='ctx'> </div><div class='hunk'>@@ -478,7 +503,7 @@ static inline void svcxdr_init_decode(struct svc_rqst *rqstp)</div><div class='ctx'> 	buf-&gt;len = buf-&gt;head-&gt;iov_len + buf-&gt;page_len + buf-&gt;tail-&gt;iov_len;</div><div class='ctx'> </div><div class='ctx'> 	xdr_init_decode(xdr, buf, argv-&gt;iov_base, NULL);</div><div class='del'>-	xdr_set_scratch_page(xdr, rqstp-&gt;rq_scratch_page);</div><div class='add'>+	xdr_set_scratch_folio(xdr, rqstp-&gt;rq_scratch_folio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h<br/>index 24cd199dd6f3..57f4fd94166a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svc_rdma.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svc_rdma.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svc_rdma.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/svc_rdma.h</a></div><div class='hunk'>@@ -48,6 +48,7 @@</div><div class='ctx'> #include &lt;linux/sunrpc/rpc_rdma.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/rpc_rdma_cid.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/svc_rdma_pcl.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/rdma_rn.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/percpu_counter.h&gt;</div><div class='ctx'> #include &lt;rdma/ib_verbs.h&gt;</div><div class='hunk'>@@ -76,6 +77,7 @@ struct svcxprt_rdma {</div><div class='ctx'> 	struct svc_xprt      sc_xprt;		/* SVC transport structure */</div><div class='ctx'> 	struct rdma_cm_id    *sc_cm_id;		/* RDMA connection id */</div><div class='ctx'> 	struct list_head     sc_accept_q;	/* Conn. waiting accept */</div><div class='add'>+	struct rpcrdma_notification sc_rn;	/* removal notification */</div><div class='ctx'> 	int		     sc_ord;		/* RDMA read limit */</div><div class='ctx'> 	int                  sc_max_send_sges;</div><div class='ctx'> 	bool		     sc_snd_w_inv;	/* OK to use Send With Invalidate */</div><div class='hunk'>@@ -129,7 +131,7 @@ static inline struct svcxprt_rdma *svc_rdma_rqst_rdma(struct svc_rqst *rqstp)</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='ctx'> 	RPCRDMA_LISTEN_BACKLOG	= 10,</div><div class='del'>-	RPCRDMA_MAX_REQUESTS	= 64,</div><div class='add'>+	RPCRDMA_MAX_REQUESTS	= 128,</div><div class='ctx'> 	RPCRDMA_MAX_BC_REQUESTS	= 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -200,7 +202,8 @@ struct svc_rdma_recv_ctxt {</div><div class='ctx'> 	struct svc_rdma_pcl	rc_reply_pcl;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		rc_page_count;</div><div class='del'>-	struct page		*rc_pages[RPCSVC_MAXPAGES];</div><div class='add'>+	unsigned long		rc_maxpages;</div><div class='add'>+	struct page		*rc_pages[] __counted_by(rc_maxpages);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -210,7 +213,6 @@ struct svc_rdma_recv_ctxt {</div><div class='ctx'>  */</div><div class='ctx'> struct svc_rdma_write_info {</div><div class='ctx'> 	struct svcxprt_rdma	*wi_rdma;</div><div class='del'>-	struct list_head	wi_list;</div><div class='ctx'> </div><div class='ctx'> 	const struct svc_rdma_chunk	*wi_chunk;</div><div class='ctx'> </div><div class='hunk'>@@ -239,14 +241,12 @@ struct svc_rdma_send_ctxt {</div><div class='ctx'> 	struct ib_cqe		sc_cqe;</div><div class='ctx'> 	struct xdr_buf		sc_hdrbuf;</div><div class='ctx'> 	struct xdr_stream	sc_stream;</div><div class='del'>-</div><div class='del'>-	struct list_head	sc_write_info_list;</div><div class='ctx'> 	struct svc_rdma_write_info sc_reply_info;</div><div class='del'>-</div><div class='ctx'> 	void			*sc_xprt_buf;</div><div class='ctx'> 	int			sc_page_count;</div><div class='ctx'> 	int			sc_cur_sge_no;</div><div class='del'>-	struct page		*sc_pages[RPCSVC_MAXPAGES];</div><div class='add'>+	unsigned long		sc_maxpages;</div><div class='add'>+	struct page		**sc_pages;</div><div class='ctx'> 	struct ib_sge		sc_sges[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -274,14 +274,11 @@ extern void svc_rdma_cc_init(struct svcxprt_rdma *rdma,</div><div class='ctx'> extern void svc_rdma_cc_release(struct svcxprt_rdma *rdma,</div><div class='ctx'> 				struct svc_rdma_chunk_ctxt *cc,</div><div class='ctx'> 				enum dma_data_direction dir);</div><div class='del'>-extern void svc_rdma_write_chunk_release(struct svcxprt_rdma *rdma,</div><div class='del'>-					 struct svc_rdma_send_ctxt *ctxt);</div><div class='ctx'> extern void svc_rdma_reply_chunk_release(struct svcxprt_rdma *rdma,</div><div class='ctx'> 					 struct svc_rdma_send_ctxt *ctxt);</div><div class='del'>-extern int svc_rdma_prepare_write_list(struct svcxprt_rdma *rdma,</div><div class='del'>-				       const struct svc_rdma_pcl *write_pcl,</div><div class='del'>-				       struct svc_rdma_send_ctxt *sctxt,</div><div class='del'>-				       const struct xdr_buf *xdr);</div><div class='add'>+extern int svc_rdma_send_write_list(struct svcxprt_rdma *rdma,</div><div class='add'>+				    const struct svc_rdma_recv_ctxt *rctxt,</div><div class='add'>+				    const struct xdr_buf *xdr);</div><div class='ctx'> extern int svc_rdma_prepare_reply_chunk(struct svcxprt_rdma *rdma,</div><div class='ctx'> 					const struct svc_rdma_pcl *write_pcl,</div><div class='ctx'> 					const struct svc_rdma_pcl *reply_pcl,</div><div class='head'>diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h<br/>index 8e20cd60e2e7..da2a2531e110 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svc_xprt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svc_xprt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svc_xprt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/svc_xprt.h</a></div><div class='hunk'>@@ -53,6 +53,7 @@ struct svc_xprt {</div><div class='ctx'> 	struct svc_xprt_class	*xpt_class;</div><div class='ctx'> 	const struct svc_xprt_ops *xpt_ops;</div><div class='ctx'> 	struct kref		xpt_ref;</div><div class='add'>+	ktime_t			xpt_qtime;</div><div class='ctx'> 	struct list_head	xpt_list;</div><div class='ctx'> 	struct lwq_node		xpt_ready;</div><div class='ctx'> 	unsigned long		xpt_flags;</div><div class='hunk'>@@ -99,8 +100,33 @@ enum {</div><div class='ctx'> 	XPT_HANDSHAKE,		/* xprt requests a handshake */</div><div class='ctx'> 	XPT_TLS_SESSION,	/* transport-layer security established */</div><div class='ctx'> 	XPT_PEER_AUTH,		/* peer has been authenticated */</div><div class='add'>+	XPT_PEER_VALID,		/* peer has presented a filehandle that</div><div class='add'>+				 * it has access to.  It is NOT counted</div><div class='add'>+				 * in -&gt;sv_tmpcnt.</div><div class='add'>+				 */</div><div class='add'>+	XPT_RPCB_UNREG,		/* transport that needs unregistering</div><div class='add'>+				 * with rpcbind (TCP, UDP) on destroy</div><div class='add'>+				 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Maximum number of "tmp" connections - those without XPT_PEER_VALID -</div><div class='add'>+ * permitted on any service.</div><div class='add'>+ */</div><div class='add'>+#define XPT_MAX_TMP_CONN	64</div><div class='add'>+</div><div class='add'>+static inline void svc_xprt_set_valid(struct svc_xprt *xpt)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(XPT_TEMP, &amp;xpt-&gt;xpt_flags) &amp;&amp;</div><div class='add'>+	    !test_and_set_bit(XPT_PEER_VALID, &amp;xpt-&gt;xpt_flags)) {</div><div class='add'>+		struct svc_serv *serv = xpt-&gt;xpt_server;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;serv-&gt;sv_lock);</div><div class='add'>+		serv-&gt;sv_tmpcnt -= 1;</div><div class='add'>+		spin_unlock(&amp;serv-&gt;sv_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void unregister_xpt_user(struct svc_xprt *xpt, struct svc_xpt_user *u)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;xpt-&gt;xpt_lock);</div><div class='hunk'>@@ -135,11 +161,15 @@ int	svc_reg_xprt_class(struct svc_xprt_class *);</div><div class='ctx'> void	svc_unreg_xprt_class(struct svc_xprt_class *);</div><div class='ctx'> void	svc_xprt_init(struct net *, struct svc_xprt_class *, struct svc_xprt *,</div><div class='ctx'> 		      struct svc_serv *);</div><div class='add'>+int	svc_xprt_create_from_sa(struct svc_serv *serv, const char *xprt_name,</div><div class='add'>+				struct net *net, struct sockaddr *sap,</div><div class='add'>+				int flags, const struct cred *cred);</div><div class='ctx'> int	svc_xprt_create(struct svc_serv *serv, const char *xprt_name,</div><div class='ctx'> 			struct net *net, const int family,</div><div class='ctx'> 			const unsigned short port, int flags,</div><div class='ctx'> 			const struct cred *cred);</div><div class='del'>-void	svc_xprt_destroy_all(struct svc_serv *serv, struct net *net);</div><div class='add'>+void	svc_xprt_destroy_all(struct svc_serv *serv, struct net *net,</div><div class='add'>+			     bool unregister);</div><div class='ctx'> void	svc_xprt_received(struct svc_xprt *xprt);</div><div class='ctx'> void	svc_xprt_enqueue(struct svc_xprt *xprt);</div><div class='ctx'> void	svc_xprt_put(struct svc_xprt *xprt);</div><div class='hunk'>@@ -147,6 +177,8 @@ void	svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt);</div><div class='ctx'> void	svc_xprt_close(struct svc_xprt *xprt);</div><div class='ctx'> int	svc_port_is_privileged(struct sockaddr *sin);</div><div class='ctx'> int	svc_print_xprts(char *buf, int maxlen);</div><div class='add'>+struct svc_xprt *svc_find_listener(struct svc_serv *serv, const char *xcl_name,</div><div class='add'>+				   struct net *net, const struct sockaddr *sa);</div><div class='ctx'> struct	svc_xprt *svc_find_xprt(struct svc_serv *serv, const char *xcl_name,</div><div class='ctx'> 			struct net *net, const sa_family_t af,</div><div class='ctx'> 			const unsigned short port);</div><div class='head'>diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h<br/>index 61c455f1e1f5..4b92fec23a49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svcauth.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svcauth.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svcauth.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/svcauth.h</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/sunrpc/msg_prot.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/cache.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/gss_api.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/clnt.h&gt;</div><div class='ctx'> #include &lt;linux/hash.h&gt;</div><div class='ctx'> #include &lt;linux/stringhash.h&gt;</div><div class='ctx'> #include &lt;linux/cred.h&gt;</div><div class='hunk'>@@ -85,7 +86,6 @@ struct auth_domain {</div><div class='ctx'> </div><div class='ctx'> enum svc_auth_status {</div><div class='ctx'> 	SVC_GARBAGE = 1,</div><div class='del'>-	SVC_SYSERR,</div><div class='ctx'> 	SVC_VALID,</div><div class='ctx'> 	SVC_NEGATIVE,</div><div class='ctx'> 	SVC_OK,</div><div class='hunk'>@@ -151,13 +151,16 @@ struct auth_ops {</div><div class='ctx'> </div><div class='ctx'> struct svc_xprt;</div><div class='ctx'> </div><div class='del'>-extern enum svc_auth_status svc_authenticate(struct svc_rqst *rqstp);</div><div class='ctx'> extern rpc_authflavor_t svc_auth_flavor(struct svc_rqst *rqstp);</div><div class='ctx'> extern int	svc_authorise(struct svc_rqst *rqstp);</div><div class='ctx'> extern enum svc_auth_status svc_set_client(struct svc_rqst *rqstp);</div><div class='ctx'> extern int	svc_auth_register(rpc_authflavor_t flavor, struct auth_ops *aops);</div><div class='ctx'> extern void	svc_auth_unregister(rpc_authflavor_t flavor);</div><div class='ctx'> </div><div class='add'>+extern void	svcauth_map_clnt_to_svc_cred_local(struct rpc_clnt *clnt,</div><div class='add'>+						   const struct cred *,</div><div class='add'>+						   struct svc_cred *);</div><div class='add'>+</div><div class='ctx'> extern struct auth_domain *unix_domain_find(char *name);</div><div class='ctx'> extern void auth_domain_put(struct auth_domain *item);</div><div class='ctx'> extern struct auth_domain *auth_domain_lookup(char *name, struct auth_domain *new);</div><div class='head'>diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h<br/>index 7c78ec6356b9..de37069aba90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svcsock.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/svcsock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/svcsock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/svcsock.h</a></div><div class='hunk'>@@ -26,6 +26,9 @@ struct svc_sock {</div><div class='ctx'> 	void			(*sk_odata)(struct sock *);</div><div class='ctx'> 	void			(*sk_owspace)(struct sock *);</div><div class='ctx'> </div><div class='add'>+	/* For sends (protected by xpt_mutex) */</div><div class='add'>+	struct bio_vec		*sk_bvec;</div><div class='add'>+</div><div class='ctx'> 	/* private TCP part */</div><div class='ctx'> 	/* On-the-wire fragment header: */</div><div class='ctx'> 	__be32			sk_marker;</div><div class='hunk'>@@ -40,7 +43,9 @@ struct svc_sock {</div><div class='ctx'> </div><div class='ctx'> 	struct completion	sk_handshake_done;</div><div class='ctx'> </div><div class='del'>-	struct page *		sk_pages[RPCSVC_MAXPAGES];	/* received data */</div><div class='add'>+	/* received data */</div><div class='add'>+	unsigned long		sk_maxpages;</div><div class='add'>+	struct page *		sk_pages[] __counted_by(sk_maxpages);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline u32 svc_sock_reclen(struct svc_sock *svsk)</div><div class='hunk'>@@ -58,8 +63,6 @@ static inline u32 svc_sock_final_rec(struct svc_sock *svsk)</div><div class='ctx'>  */</div><div class='ctx'> void		svc_recv(struct svc_rqst *rqstp);</div><div class='ctx'> void		svc_send(struct svc_rqst *rqstp);</div><div class='del'>-void		svc_drop(struct svc_rqst *);</div><div class='del'>-void		svc_sock_update_bufs(struct svc_serv *serv);</div><div class='ctx'> int		svc_addsock(struct svc_serv *serv, struct net *net,</div><div class='ctx'> 			    const int fd, char *name_return, const size_t len,</div><div class='ctx'> 			    const struct cred *cred);</div><div class='head'>diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h<br/>index 2f8dc47f1eb0..152597750f55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xdr.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xdr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xdr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/xdr.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/scatterlist.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct bio_vec;</div><div class='hunk'>@@ -119,6 +119,8 @@ xdr_buf_init(struct xdr_buf *buf, void *start, size_t len)</div><div class='ctx'> #define	rpc_autherr_badverf	cpu_to_be32(RPC_AUTH_BADVERF)</div><div class='ctx'> #define	rpc_autherr_rejectedverf cpu_to_be32(RPC_AUTH_REJECTEDVERF)</div><div class='ctx'> #define	rpc_autherr_tooweak	cpu_to_be32(RPC_AUTH_TOOWEAK)</div><div class='add'>+#define	rpc_autherr_invalidresp	cpu_to_be32(RPC_AUTH_INVALIDRESP)</div><div class='add'>+#define	rpc_autherr_failed	cpu_to_be32(RPC_AUTH_FAILED)</div><div class='ctx'> #define	rpcsec_gsserr_credproblem	cpu_to_be32(RPCSEC_GSS_CREDPROBLEM)</div><div class='ctx'> #define	rpcsec_gsserr_ctxproblem	cpu_to_be32(RPCSEC_GSS_CTXPROBLEM)</div><div class='ctx'> </div><div class='hunk'>@@ -128,10 +130,7 @@ xdr_buf_init(struct xdr_buf *buf, void *start, size_t len)</div><div class='ctx'> __be32 *xdr_encode_opaque_fixed(__be32 *p, const void *ptr, unsigned int len);</div><div class='ctx'> __be32 *xdr_encode_opaque(__be32 *p, const void *ptr, unsigned int len);</div><div class='ctx'> __be32 *xdr_encode_string(__be32 *p, const char *s);</div><div class='del'>-__be32 *xdr_decode_string_inplace(__be32 *p, char **sp, unsigned int *lenp,</div><div class='del'>-			unsigned int maxlen);</div><div class='ctx'> __be32 *xdr_encode_netobj(__be32 *p, const struct xdr_netobj *);</div><div class='del'>-__be32 *xdr_decode_netobj(__be32 *p, struct xdr_netobj *);</div><div class='ctx'> </div><div class='ctx'> void	xdr_inline_pages(struct xdr_buf *, unsigned int,</div><div class='ctx'> 			 struct page **, unsigned int, unsigned int);</div><div class='hunk'>@@ -242,8 +241,7 @@ typedef int	(*kxdrdproc_t)(struct rpc_rqst *rqstp, struct xdr_stream *xdr,</div><div class='ctx'> </div><div class='ctx'> extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf,</div><div class='ctx'> 			    __be32 *p, struct rpc_rqst *rqst);</div><div class='del'>-extern void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf,</div><div class='del'>-			   struct page **pages, struct rpc_rqst *rqst);</div><div class='add'>+void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf);</div><div class='ctx'> extern __be32 *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);</div><div class='ctx'> extern int xdr_reserve_space_vec(struct xdr_stream *xdr, size_t nbytes);</div><div class='ctx'> extern void __xdr_commit_encode(struct xdr_stream *xdr);</div><div class='hunk'>@@ -290,16 +288,16 @@ xdr_set_scratch_buffer(struct xdr_stream *xdr, void *buf, size_t buflen)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * xdr_set_scratch_page - Attach a scratch buffer for decoding data</div><div class='add'>+ * xdr_set_scratch_folio - Attach a scratch buffer for decoding data</div><div class='ctx'>  * @xdr: pointer to xdr_stream struct</div><div class='del'>- * @page: an anonymous page</div><div class='add'>+ * @page: an anonymous folio</div><div class='ctx'>  *</div><div class='ctx'>  * See xdr_set_scratch_buffer().</div><div class='ctx'>  */</div><div class='ctx'> static inline void</div><div class='del'>-xdr_set_scratch_page(struct xdr_stream *xdr, struct page *page)</div><div class='add'>+xdr_set_scratch_folio(struct xdr_stream *xdr, struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	xdr_set_scratch_buffer(xdr, page_address(page), PAGE_SIZE);</div><div class='add'>+	xdr_set_scratch_buffer(xdr, folio_address(folio), folio_size(folio));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -341,12 +339,6 @@ xdr_stream_remaining(const struct xdr_stream *xdr)</div><div class='ctx'> 	return xdr-&gt;nwords &lt;&lt; 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-ssize_t xdr_stream_decode_opaque(struct xdr_stream *xdr, void *ptr,</div><div class='del'>-		size_t size);</div><div class='del'>-ssize_t xdr_stream_decode_opaque_dup(struct xdr_stream *xdr, void **ptr,</div><div class='del'>-		size_t maxlen, gfp_t gfp_flags);</div><div class='del'>-ssize_t xdr_stream_decode_string(struct xdr_stream *xdr, char *str,</div><div class='del'>-		size_t size);</div><div class='ctx'> ssize_t xdr_stream_decode_string_dup(struct xdr_stream *xdr, char **str,</div><div class='ctx'> 		size_t maxlen, gfp_t gfp_flags);</div><div class='ctx'> ssize_t xdr_stream_decode_opaque_auth(struct xdr_stream *xdr, u32 *flavor,</div><div class='hunk'>@@ -681,6 +673,27 @@ xdr_stream_decode_u32(struct xdr_stream *xdr, __u32 *ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * xdr_stream_decode_be32 - Decode a big-endian 32-bit integer</div><div class='add'>+ * @xdr: pointer to xdr_stream</div><div class='add'>+ * @ptr: location to store integer</div><div class='add'>+ *</div><div class='add'>+ * Return values:</div><div class='add'>+ *   %0 on success</div><div class='add'>+ *   %-EBADMSG on XDR buffer overflow</div><div class='add'>+ */</div><div class='add'>+static inline ssize_t</div><div class='add'>+xdr_stream_decode_be32(struct xdr_stream *xdr, __be32 *ptr)</div><div class='add'>+{</div><div class='add'>+	const size_t count = sizeof(*ptr);</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, count);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	*ptr = *p;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * xdr_stream_decode_u64 - Decode a 64-bit integer</div><div class='ctx'>  * @xdr: pointer to xdr_stream</div><div class='ctx'>  * @ptr: location to store 64-bit integer</div><div class='hunk'>@@ -708,7 +721,7 @@ xdr_stream_decode_u64(struct xdr_stream *xdr, __u64 *ptr)</div><div class='ctx'>  * @len: size of buffer pointed to by @ptr</div><div class='ctx'>  *</div><div class='ctx'>  * Return values:</div><div class='del'>- *   On success, returns size of object stored in @ptr</div><div class='add'>+ *   %0 on success</div><div class='ctx'>  *   %-EBADMSG on XDR buffer overflow</div><div class='ctx'>  */</div><div class='ctx'> static inline ssize_t</div><div class='hunk'>@@ -719,7 +732,7 @@ xdr_stream_decode_opaque_fixed(struct xdr_stream *xdr, void *ptr, size_t len)</div><div class='ctx'> 	if (unlikely(!p))</div><div class='ctx'> 		return -EBADMSG;</div><div class='ctx'> 	xdr_decode_opaque_fixed(p, ptr, len);</div><div class='del'>-	return len;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/include/linux/sunrpc/xdrgen/_builtins.h b/include/linux/sunrpc/xdrgen/_builtins.h<br/>new file mode 100644<br/>index 000000000000..66ca3ece951a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xdrgen/_builtins.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/xdrgen/_builtins.h</a></div><div class='hunk'>@@ -0,0 +1,243 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Oracle and/or its affiliates.</div><div class='add'>+ *</div><div class='add'>+ * This header defines XDR data type primitives specified in</div><div class='add'>+ * Section 4 of RFC 4506, used by RPC programs implemented</div><div class='add'>+ * in the Linux kernel.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _SUNRPC_XDRGEN__BUILTINS_H_</div><div class='add'>+#define _SUNRPC_XDRGEN__BUILTINS_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sunrpc/xdr.h&gt;</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_void(struct xdr_stream *xdr)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_void(struct xdr_stream *xdr)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_bool(struct xdr_stream *xdr, bool *ptr)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = (*p != xdr_zero);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_bool(struct xdr_stream *xdr, bool val)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*p = val ? xdr_one : xdr_zero;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_int(struct xdr_stream *xdr, s32 *ptr)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = be32_to_cpup(p);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_int(struct xdr_stream *xdr, s32 val)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*p = cpu_to_be32(val);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_unsigned_int(struct xdr_stream *xdr, u32 *ptr)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = be32_to_cpup(p);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_unsigned_int(struct xdr_stream *xdr, u32 val)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*p = cpu_to_be32(val);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_long(struct xdr_stream *xdr, s32 *ptr)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = be32_to_cpup(p);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_long(struct xdr_stream *xdr, s32 val)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*p = cpu_to_be32(val);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_unsigned_long(struct xdr_stream *xdr, u32 *ptr)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = be32_to_cpup(p);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_unsigned_long(struct xdr_stream *xdr, u32 val)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*p = cpu_to_be32(val);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_hyper(struct xdr_stream *xdr, s64 *ptr)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, XDR_UNIT * 2);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = get_unaligned_be64(p);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_hyper(struct xdr_stream *xdr, s64 val)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT * 2);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	put_unaligned_be64(val, p);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_unsigned_hyper(struct xdr_stream *xdr, u64 *ptr)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_inline_decode(xdr, XDR_UNIT * 2);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	*ptr = get_unaligned_be64(p);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_unsigned_hyper(struct xdr_stream *xdr, u64 val)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT * 2);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	put_unaligned_be64(val, p);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_string(struct xdr_stream *xdr, string *ptr, u32 maxlen)</div><div class='add'>+{</div><div class='add'>+	__be32 *p;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	if (unlikely(xdr_stream_decode_u32(xdr, &amp;len) &lt; 0))</div><div class='add'>+		return false;</div><div class='add'>+	if (unlikely(maxlen &amp;&amp; len &gt; maxlen))</div><div class='add'>+		return false;</div><div class='add'>+	if (len != 0) {</div><div class='add'>+		p = xdr_inline_decode(xdr, len);</div><div class='add'>+		if (unlikely(!p))</div><div class='add'>+			return false;</div><div class='add'>+		ptr-&gt;data = (unsigned char *)p;</div><div class='add'>+	}</div><div class='add'>+	ptr-&gt;len = len;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_string(struct xdr_stream *xdr, string val, u32 maxlen)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT + xdr_align_size(val.len));</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	xdr_encode_opaque(p, val.data, val.len);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_decode_opaque(struct xdr_stream *xdr, opaque *ptr, u32 maxlen)</div><div class='add'>+{</div><div class='add'>+	__be32 *p;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	if (unlikely(xdr_stream_decode_u32(xdr, &amp;len) &lt; 0))</div><div class='add'>+		return false;</div><div class='add'>+	if (unlikely(maxlen &amp;&amp; len &gt; maxlen))</div><div class='add'>+		return false;</div><div class='add'>+	if (len != 0) {</div><div class='add'>+		p = xdr_inline_decode(xdr, len);</div><div class='add'>+		if (unlikely(!p))</div><div class='add'>+			return false;</div><div class='add'>+		ptr-&gt;data = (u8 *)p;</div><div class='add'>+	}</div><div class='add'>+	ptr-&gt;len = len;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+xdrgen_encode_opaque(struct xdr_stream *xdr, opaque val)</div><div class='add'>+{</div><div class='add'>+	__be32 *p = xdr_reserve_space(xdr, XDR_UNIT + xdr_align_size(val.len));</div><div class='add'>+</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return false;</div><div class='add'>+	xdr_encode_opaque(p, val.data, val.len);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _SUNRPC_XDRGEN__BUILTINS_H_ */</div><div class='head'>diff --git a/include/linux/sunrpc/xdrgen/_defs.h b/include/linux/sunrpc/xdrgen/_defs.h<br/>new file mode 100644<br/>index 000000000000..20c7270aa64d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xdrgen/_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/xdrgen/_defs.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Oracle and/or its affiliates.</div><div class='add'>+ *</div><div class='add'>+ * This header defines XDR data type primitives specified in</div><div class='add'>+ * Section 4 of RFC 4506, used by RPC programs implemented</div><div class='add'>+ * in the Linux kernel.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _SUNRPC_XDRGEN__DEFS_H_</div><div class='add'>+#define _SUNRPC_XDRGEN__DEFS_H_</div><div class='add'>+</div><div class='add'>+#define TRUE	(true)</div><div class='add'>+#define FALSE	(false)</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	u32 len;</div><div class='add'>+	unsigned char *data;</div><div class='add'>+} string;</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	u32 len;</div><div class='add'>+	u8 *data;</div><div class='add'>+} opaque;</div><div class='add'>+</div><div class='add'>+#define XDR_void		(0)</div><div class='add'>+#define XDR_bool		(1)</div><div class='add'>+#define XDR_int			(1)</div><div class='add'>+#define XDR_unsigned_int	(1)</div><div class='add'>+#define XDR_long		(1)</div><div class='add'>+#define XDR_unsigned_long	(1)</div><div class='add'>+#define XDR_hyper		(2)</div><div class='add'>+#define XDR_unsigned_hyper	(2)</div><div class='add'>+</div><div class='add'>+#endif /* _SUNRPC_XDRGEN__DEFS_H_ */</div><div class='head'>diff --git a/include/linux/sunrpc/xdrgen/nfs4_1.h b/include/linux/sunrpc/xdrgen/nfs4_1.h<br/>new file mode 100644<br/>index 000000000000..cf21a14aa885<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xdrgen/nfs4_1.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/xdrgen/nfs4_1.h</a></div><div class='hunk'>@@ -0,0 +1,153 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Generated by xdrgen. Manual edits will be lost. */</div><div class='add'>+/* XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x */</div><div class='add'>+/* XDR specification modification time: Mon Oct 14 09:10:13 2024 */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_XDRGEN_NFS4_1_DEF_H</div><div class='add'>+#define _LINUX_XDRGEN_NFS4_1_DEF_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/xdrgen/_defs.h&gt;</div><div class='add'>+</div><div class='add'>+typedef s64 int64_t;</div><div class='add'>+</div><div class='add'>+typedef u32 uint32_t;</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	u32 count;</div><div class='add'>+	uint32_t *element;</div><div class='add'>+} bitmap4;</div><div class='add'>+</div><div class='add'>+struct nfstime4 {</div><div class='add'>+	int64_t seconds;</div><div class='add'>+	uint32_t nseconds;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef bool fattr4_offline;</div><div class='add'>+</div><div class='add'>+enum { FATTR4_OFFLINE = 83 };</div><div class='add'>+</div><div class='add'>+struct open_arguments4 {</div><div class='add'>+	bitmap4 oa_share_access;</div><div class='add'>+	bitmap4 oa_share_deny;</div><div class='add'>+	bitmap4 oa_share_access_want;</div><div class='add'>+	bitmap4 oa_open_claim;</div><div class='add'>+	bitmap4 oa_create_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum open_args_share_access4 {</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_READ = 1,</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_WRITE = 2,</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_BOTH = 3,</div><div class='add'>+};</div><div class='add'>+typedef enum open_args_share_access4 open_args_share_access4;</div><div class='add'>+</div><div class='add'>+enum open_args_share_deny4 {</div><div class='add'>+	OPEN_ARGS_SHARE_DENY_NONE = 0,</div><div class='add'>+	OPEN_ARGS_SHARE_DENY_READ = 1,</div><div class='add'>+	OPEN_ARGS_SHARE_DENY_WRITE = 2,</div><div class='add'>+	OPEN_ARGS_SHARE_DENY_BOTH = 3,</div><div class='add'>+};</div><div class='add'>+typedef enum open_args_share_deny4 open_args_share_deny4;</div><div class='add'>+</div><div class='add'>+enum open_args_share_access_want4 {</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_WANT_ANY_DELEG = 3,</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_WANT_NO_DELEG = 4,</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_WANT_CANCEL = 5,</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL = 17,</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED = 18,</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_WANT_DELEG_TIMESTAMPS = 20,</div><div class='add'>+	OPEN_ARGS_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION = 21,</div><div class='add'>+};</div><div class='add'>+typedef enum open_args_share_access_want4 open_args_share_access_want4;</div><div class='add'>+</div><div class='add'>+enum open_args_open_claim4 {</div><div class='add'>+	OPEN_ARGS_OPEN_CLAIM_NULL = 0,</div><div class='add'>+	OPEN_ARGS_OPEN_CLAIM_PREVIOUS = 1,</div><div class='add'>+	OPEN_ARGS_OPEN_CLAIM_DELEGATE_CUR = 2,</div><div class='add'>+	OPEN_ARGS_OPEN_CLAIM_DELEGATE_PREV = 3,</div><div class='add'>+	OPEN_ARGS_OPEN_CLAIM_FH = 4,</div><div class='add'>+	OPEN_ARGS_OPEN_CLAIM_DELEG_CUR_FH = 5,</div><div class='add'>+	OPEN_ARGS_OPEN_CLAIM_DELEG_PREV_FH = 6,</div><div class='add'>+};</div><div class='add'>+typedef enum open_args_open_claim4 open_args_open_claim4;</div><div class='add'>+</div><div class='add'>+enum open_args_createmode4 {</div><div class='add'>+	OPEN_ARGS_CREATEMODE_UNCHECKED4 = 0,</div><div class='add'>+	OPEN_ARGS_CREATE_MODE_GUARDED = 1,</div><div class='add'>+	OPEN_ARGS_CREATEMODE_EXCLUSIVE4 = 2,</div><div class='add'>+	OPEN_ARGS_CREATE_MODE_EXCLUSIVE4_1 = 3,</div><div class='add'>+};</div><div class='add'>+typedef enum open_args_createmode4 open_args_createmode4;</div><div class='add'>+</div><div class='add'>+typedef struct open_arguments4 fattr4_open_arguments;</div><div class='add'>+</div><div class='add'>+enum { FATTR4_OPEN_ARGUMENTS = 86 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_RESULT_NO_OPEN_STATEID = 0x00000010 };</div><div class='add'>+</div><div class='add'>+typedef struct nfstime4 fattr4_time_deleg_access;</div><div class='add'>+</div><div class='add'>+typedef struct nfstime4 fattr4_time_deleg_modify;</div><div class='add'>+</div><div class='add'>+enum { FATTR4_TIME_DELEG_ACCESS = 84 };</div><div class='add'>+</div><div class='add'>+enum { FATTR4_TIME_DELEG_MODIFY = 85 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_DELEG_MASK = 0xFF00 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE = 0x0000 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_READ_DELEG = 0x0100 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG = 0x0200 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_ANY_DELEG = 0x0300 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_NO_DELEG = 0x0400 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_CANCEL = 0x0500 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL = 0x10000 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED = 0x20000 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_DELEG_TIMESTAMPS = 0x100000 };</div><div class='add'>+</div><div class='add'>+enum { OPEN4_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION = 0x200000 };</div><div class='add'>+</div><div class='add'>+enum open_delegation_type4 {</div><div class='add'>+	OPEN_DELEGATE_NONE = 0,</div><div class='add'>+	OPEN_DELEGATE_READ = 1,</div><div class='add'>+	OPEN_DELEGATE_WRITE = 2,</div><div class='add'>+	OPEN_DELEGATE_NONE_EXT = 3,</div><div class='add'>+	OPEN_DELEGATE_READ_ATTRS_DELEG = 4,</div><div class='add'>+	OPEN_DELEGATE_WRITE_ATTRS_DELEG = 5,</div><div class='add'>+};</div><div class='add'>+typedef enum open_delegation_type4 open_delegation_type4;</div><div class='add'>+</div><div class='add'>+#define NFS4_int64_t_sz                 \</div><div class='add'>+	(XDR_hyper)</div><div class='add'>+#define NFS4_uint32_t_sz                \</div><div class='add'>+	(XDR_unsigned_int)</div><div class='add'>+#define NFS4_bitmap4_sz                 (XDR_unsigned_int)</div><div class='add'>+#define NFS4_nfstime4_sz                \</div><div class='add'>+	(NFS4_int64_t_sz + NFS4_uint32_t_sz)</div><div class='add'>+#define NFS4_fattr4_offline_sz          \</div><div class='add'>+	(XDR_bool)</div><div class='add'>+#define NFS4_open_arguments4_sz         \</div><div class='add'>+	(NFS4_bitmap4_sz + NFS4_bitmap4_sz + NFS4_bitmap4_sz + NFS4_bitmap4_sz + NFS4_bitmap4_sz)</div><div class='add'>+#define NFS4_open_args_share_access4_sz (XDR_int)</div><div class='add'>+#define NFS4_open_args_share_deny4_sz   (XDR_int)</div><div class='add'>+#define NFS4_open_args_share_access_want4_sz (XDR_int)</div><div class='add'>+#define NFS4_open_args_open_claim4_sz   (XDR_int)</div><div class='add'>+#define NFS4_open_args_createmode4_sz   (XDR_int)</div><div class='add'>+#define NFS4_fattr4_open_arguments_sz   \</div><div class='add'>+	(NFS4_open_arguments4_sz)</div><div class='add'>+#define NFS4_fattr4_time_deleg_access_sz \</div><div class='add'>+	(NFS4_nfstime4_sz)</div><div class='add'>+#define NFS4_fattr4_time_deleg_modify_sz \</div><div class='add'>+	(NFS4_nfstime4_sz)</div><div class='add'>+#define NFS4_open_delegation_type4_sz   (XDR_int)</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_XDRGEN_NFS4_1_DEF_H */</div><div class='head'>diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h<br/>index 464f6a9492ab..f46d1fb8f71a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xprt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xprt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xprt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/xprt.h</a></div><div class='hunk'>@@ -30,6 +30,8 @@</div><div class='ctx'> #define RPC_MAXCWND(xprt)	((xprt)-&gt;max_reqs &lt;&lt; RPC_CWNDSHIFT)</div><div class='ctx'> #define RPCXPRT_CONGESTED(xprt) ((xprt)-&gt;cong &gt;= (xprt)-&gt;cwnd)</div><div class='ctx'> </div><div class='add'>+#define RPC_GSS_SEQNO_ARRAY_SIZE 3U</div><div class='add'>+</div><div class='ctx'> enum rpc_display_format_t {</div><div class='ctx'> 	RPC_DISPLAY_ADDR = 0,</div><div class='ctx'> 	RPC_DISPLAY_PORT,</div><div class='hunk'>@@ -66,7 +68,8 @@ struct rpc_rqst {</div><div class='ctx'> 	struct rpc_cred *	rq_cred;	/* Bound cred */</div><div class='ctx'> 	__be32			rq_xid;		/* request XID */</div><div class='ctx'> 	int			rq_cong;	/* has incremented xprt-&gt;cong */</div><div class='del'>-	u32			rq_seqno;	/* gss seq no. used on req. */</div><div class='add'>+	u32			rq_seqnos[RPC_GSS_SEQNO_ARRAY_SIZE];	/* past gss req seq nos. */</div><div class='add'>+	unsigned int		rq_seqno_count;	/* number of entries in rq_seqnos */</div><div class='ctx'> 	int			rq_enc_pages_num;</div><div class='ctx'> 	struct page		**rq_enc_pages;	/* scratch pages for use by</div><div class='ctx'> 						   gss privacy code */</div><div class='hunk'>@@ -119,6 +122,18 @@ struct rpc_rqst {</div><div class='ctx'> #define rq_svec			rq_snd_buf.head</div><div class='ctx'> #define rq_slen			rq_snd_buf.len</div><div class='ctx'> </div><div class='add'>+static inline int xprt_rqst_add_seqno(struct rpc_rqst *req, u32 seqno)</div><div class='add'>+{</div><div class='add'>+	if (likely(req-&gt;rq_seqno_count &lt; RPC_GSS_SEQNO_ARRAY_SIZE))</div><div class='add'>+		req-&gt;rq_seqno_count++;</div><div class='add'>+</div><div class='add'>+	/* Shift array to make room for the newest element at the beginning */</div><div class='add'>+	memmove(&amp;req-&gt;rq_seqnos[1], &amp;req-&gt;rq_seqnos[0],</div><div class='add'>+		(RPC_GSS_SEQNO_ARRAY_SIZE - 1) * sizeof(req-&gt;rq_seqnos[0]));</div><div class='add'>+	req-&gt;rq_seqnos[0] = seqno;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* RPC transport layer security policies */</div><div class='ctx'> enum xprtsec_policies {</div><div class='ctx'> 	RPC_XPRTSEC_NONE = 0,</div><div class='hunk'>@@ -152,6 +167,7 @@ struct rpc_xprt_ops {</div><div class='ctx'> 	int		(*prepare_request)(struct rpc_rqst *req,</div><div class='ctx'> 					   struct xdr_buf *buf);</div><div class='ctx'> 	int		(*send_request)(struct rpc_rqst *req);</div><div class='add'>+	void		(*abort_send_request)(struct rpc_rqst *req);</div><div class='ctx'> 	void		(*wait_for_reply_request)(struct rpc_task *task);</div><div class='ctx'> 	void		(*timer)(struct rpc_xprt *xprt, struct rpc_task *task);</div><div class='ctx'> 	void		(*release_request)(struct rpc_task *task);</div><div class='head'>diff --git a/include/linux/sunrpc/xprtmultipath.h b/include/linux/sunrpc/xprtmultipath.h<br/>index c0514c684b2c..e4db5022fe92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xprtmultipath.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sunrpc/xprtmultipath.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sunrpc/xprtmultipath.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sunrpc/xprtmultipath.h</a></div><div class='hunk'>@@ -56,6 +56,7 @@ extern void rpc_xprt_switch_add_xprt(struct rpc_xprt_switch *xps,</div><div class='ctx'> 		struct rpc_xprt *xprt);</div><div class='ctx'> extern void rpc_xprt_switch_remove_xprt(struct rpc_xprt_switch *xps,</div><div class='ctx'> 		struct rpc_xprt *xprt, bool offline);</div><div class='add'>+extern struct rpc_xprt *rpc_xprt_switch_get_main_xprt(struct rpc_xprt_switch *xps);</div><div class='ctx'> </div><div class='ctx'> extern void xprt_iter_init(struct rpc_xprt_iter *xpi,</div><div class='ctx'> 		struct rpc_xprt_switch *xps);</div><div class='hunk'>@@ -75,7 +76,6 @@ extern struct rpc_xprt_switch *xprt_iter_xchg_switch(</div><div class='ctx'> 		struct rpc_xprt_switch *newswitch);</div><div class='ctx'> </div><div class='ctx'> extern struct rpc_xprt *xprt_iter_xprt(struct rpc_xprt_iter *xpi);</div><div class='del'>-extern struct rpc_xprt *xprt_iter_get_xprt(struct rpc_xprt_iter *xpi);</div><div class='ctx'> extern struct rpc_xprt *xprt_iter_get_next(struct rpc_xprt_iter *xpi);</div><div class='ctx'> </div><div class='ctx'> extern bool rpc_xprt_switch_has_addr(struct rpc_xprt_switch *xps,</div><div class='head'>diff --git a/include/linux/suspend.h b/include/linux/suspend.h<br/>index da6ebca3ff77..b02876f1ae38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/suspend.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/suspend.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/suspend.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/suspend.h</a></div><div class='hunk'>@@ -298,6 +298,11 @@ static inline void s2idle_set_ops(const struct platform_s2idle_ops *ops) {}</div><div class='ctx'> static inline void s2idle_wake(void) {}</div><div class='ctx'> #endif /* !CONFIG_SUSPEND */</div><div class='ctx'> </div><div class='add'>+static inline bool pm_suspend_in_progress(void)</div><div class='add'>+{</div><div class='add'>+	return pm_suspend_target_state != PM_SUSPEND_ON;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* struct pbe is used for creating lists of pages that should be restored</div><div class='ctx'>  * atomically during the resume from disk, because the page frames they have</div><div class='ctx'>  * occupied before the suspend are in use.</div><div class='hunk'>@@ -413,6 +418,12 @@ static inline int hibernate_quiet_exec(int (*func)(void *data), void *data) {</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_HIBERNATION */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_HIBERNATION) &amp;&amp; defined(CONFIG_SUSPEND)</div><div class='add'>+bool pm_hibernation_mode_is_suspend(void);</div><div class='add'>+#else</div><div class='add'>+static inline bool pm_hibernation_mode_is_suspend(void) { return false; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int arch_resume_nosmt(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HIBERNATION_SNAPSHOT_DEV</div><div class='hunk'>@@ -441,6 +452,8 @@ extern int unregister_pm_notifier(struct notifier_block *nb);</div><div class='ctx'> extern void ksys_sync_helper(void);</div><div class='ctx'> extern void pm_report_hw_sleep_time(u64 t);</div><div class='ctx'> extern void pm_report_max_hw_sleep(u64 t);</div><div class='add'>+void pm_restrict_gfp_mask(void);</div><div class='add'>+void pm_restore_gfp_mask(void);</div><div class='ctx'> </div><div class='ctx'> #define pm_notifier(fn, pri) {				\</div><div class='ctx'> 	static struct notifier_block fn##_nb =			\</div><div class='hunk'>@@ -470,6 +483,9 @@ extern void pm_print_active_wakeup_sources(void);</div><div class='ctx'> extern unsigned int lock_system_sleep(void);</div><div class='ctx'> extern void unlock_system_sleep(unsigned int);</div><div class='ctx'> </div><div class='add'>+extern bool pm_sleep_transition_in_progress(void);</div><div class='add'>+bool pm_hibernate_is_recovering(void);</div><div class='add'>+</div><div class='ctx'> #else /* !CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> static inline int register_pm_notifier(struct notifier_block *nb)</div><div class='hunk'>@@ -485,6 +501,9 @@ static inline int unregister_pm_notifier(struct notifier_block *nb)</div><div class='ctx'> static inline void pm_report_hw_sleep_time(u64 t) {};</div><div class='ctx'> static inline void pm_report_max_hw_sleep(u64 t) {};</div><div class='ctx'> </div><div class='add'>+static inline void pm_restrict_gfp_mask(void) {}</div><div class='add'>+static inline void pm_restore_gfp_mask(void) {}</div><div class='add'>+</div><div class='ctx'> static inline void ksys_sync_helper(void) {}</div><div class='ctx'> </div><div class='ctx'> #define pm_notifier(fn, pri)	do { (void)(fn); } while (0)</div><div class='hunk'>@@ -498,6 +517,9 @@ static inline void pm_system_irq_wakeup(unsigned int irq_number) {}</div><div class='ctx'> static inline unsigned int lock_system_sleep(void) { return 0; }</div><div class='ctx'> static inline void unlock_system_sleep(unsigned int flags) {}</div><div class='ctx'> </div><div class='add'>+static inline bool pm_sleep_transition_in_progress(void) { return false; }</div><div class='add'>+static inline bool pm_hibernate_is_recovering(void) { return false; }</div><div class='add'>+</div><div class='ctx'> #endif /* !CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP_DEBUG</div><div class='head'>diff --git a/include/linux/swap.h b/include/linux/swap.h<br/>index 378ab1cd23bd..38ca3df68716 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/swap.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/swap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/swap.h</a></div><div class='hunk'>@@ -24,7 +24,6 @@ struct pagevec;</div><div class='ctx'> </div><div class='ctx'> #define SWAP_FLAG_PREFER	0x8000	/* set if swap priority specified */</div><div class='ctx'> #define SWAP_FLAG_PRIO_MASK	0x7fff</div><div class='del'>-#define SWAP_FLAG_PRIO_SHIFT	0</div><div class='ctx'> #define SWAP_FLAG_DISCARD	0x10000 /* enable discard for swap */</div><div class='ctx'> #define SWAP_FLAG_DISCARD_ONCE	0x20000 /* discard swap area at swapon-time */</div><div class='ctx'> #define SWAP_FLAG_DISCARD_PAGES 0x40000 /* discard page-clusters after use */</div><div class='hunk'>@@ -74,14 +73,13 @@ static inline int current_is_kswapd(void)</div><div class='ctx'>  * to a special SWP_DEVICE_{READ|WRITE} entry.</div><div class='ctx'>  *</div><div class='ctx'>  * When a page is mapped by the device for exclusive access we set the CPU page</div><div class='del'>- * table entries to special SWP_DEVICE_EXCLUSIVE_* entries.</div><div class='add'>+ * table entries to a special SWP_DEVICE_EXCLUSIVE entry.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_DEVICE_PRIVATE</div><div class='del'>-#define SWP_DEVICE_NUM 4</div><div class='add'>+#define SWP_DEVICE_NUM 3</div><div class='ctx'> #define SWP_DEVICE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM)</div><div class='ctx'> #define SWP_DEVICE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+1)</div><div class='del'>-#define SWP_DEVICE_EXCLUSIVE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+2)</div><div class='del'>-#define SWP_DEVICE_EXCLUSIVE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+3)</div><div class='add'>+#define SWP_DEVICE_EXCLUSIVE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+2)</div><div class='ctx'> #else</div><div class='ctx'> #define SWP_DEVICE_NUM 0</div><div class='ctx'> #endif</div><div class='hunk'>@@ -219,10 +217,10 @@ enum {</div><div class='ctx'> 	SWP_STABLE_WRITES = (1 &lt;&lt; 11),	/* no overwrite PG_writeback pages */</div><div class='ctx'> 	SWP_SYNCHRONOUS_IO = (1 &lt;&lt; 12),	/* synchronous IO is efficient */</div><div class='ctx'> 					/* add others here before... */</div><div class='del'>-	SWP_SCANNING	= (1 &lt;&lt; 14),	/* refcount in scan_swap_map */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define SWAP_CLUSTER_MAX 32UL</div><div class='add'>+#define SWAP_CLUSTER_MAX_SKIPPED (SWAP_CLUSTER_MAX &lt;&lt; 10)</div><div class='ctx'> #define COMPACT_CLUSTER_MAX SWAP_CLUSTER_MAX</div><div class='ctx'> </div><div class='ctx'> /* Bit flag in swap_map */</div><div class='hunk'>@@ -238,42 +236,25 @@ enum {</div><div class='ctx'> #define SWAP_CONT_MAX	0x7f	/* Max count */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * We use this to track usage of a cluster. A cluster is a block of swap disk</div><div class='del'>- * space with SWAPFILE_CLUSTER pages long and naturally aligns in disk. All</div><div class='del'>- * free clusters are organized into a list. We fetch an entry from the list to</div><div class='del'>- * get a free cluster.</div><div class='del'>- *</div><div class='del'>- * The data field stores next cluster if the cluster is free or cluster usage</div><div class='del'>- * counter otherwise. The flags field determines if a cluster is free. This is</div><div class='del'>- * protected by swap_info_struct.lock.</div><div class='add'>+ * The first page in the swap file is the swap header, which is always marked</div><div class='add'>+ * bad to prevent it from being allocated as an entry. This also prevents the</div><div class='add'>+ * cluster to which it belongs being marked free. Therefore 0 is safe to use as</div><div class='add'>+ * a sentinel to indicate an entry is not valid.</div><div class='ctx'>  */</div><div class='del'>-struct swap_cluster_info {</div><div class='del'>-	spinlock_t lock;	/*</div><div class='del'>-				 * Protect swap_cluster_info fields</div><div class='del'>-				 * and swap_info_struct-&gt;swap_map</div><div class='del'>-				 * elements correspond to the swap</div><div class='del'>-				 * cluster</div><div class='del'>-				 */</div><div class='del'>-	unsigned int data:24;</div><div class='del'>-	unsigned int flags:8;</div><div class='del'>-};</div><div class='del'>-#define CLUSTER_FLAG_FREE 1 /* This cluster is free */</div><div class='del'>-#define CLUSTER_FLAG_NEXT_NULL 2 /* This cluster has no next cluster */</div><div class='del'>-#define CLUSTER_FLAG_HUGE 4 /* This cluster is backing a transparent huge page */</div><div class='add'>+#define SWAP_ENTRY_INVALID	0</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_THP_SWAP</div><div class='add'>+#define SWAP_NR_ORDERS		(PMD_ORDER + 1)</div><div class='add'>+#else</div><div class='add'>+#define SWAP_NR_ORDERS		1</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * We assign a cluster to each CPU, so each CPU can allocate swap entry from</div><div class='del'>- * its own cluster and swapout sequentially. The purpose is to optimize swapout</div><div class='del'>- * throughput.</div><div class='add'>+ * We keep using same cluster for rotational device so IO will be sequential.</div><div class='add'>+ * The purpose is to optimize SWAP throughput on these device.</div><div class='ctx'>  */</div><div class='del'>-struct percpu_cluster {</div><div class='del'>-	struct swap_cluster_info index; /* Current cluster index */</div><div class='del'>-	unsigned int next; /* Likely next allocation offset */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct swap_cluster_list {</div><div class='del'>-	struct swap_cluster_info head;</div><div class='del'>-	struct swap_cluster_info tail;</div><div class='add'>+struct swap_sequential_cluster {</div><div class='add'>+	unsigned int next[SWAP_NR_ORDERS]; /* Likely next allocation offset */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -287,29 +268,26 @@ struct swap_info_struct {</div><div class='ctx'> 	signed char	type;		/* strange name for an index */</div><div class='ctx'> 	unsigned int	max;		/* extent of the swap_map */</div><div class='ctx'> 	unsigned char *swap_map;	/* vmalloc'ed array of usage counts */</div><div class='add'>+	unsigned long *zeromap;		/* kvmalloc'ed bitmap to track zero pages */</div><div class='ctx'> 	struct swap_cluster_info *cluster_info; /* cluster info. Only for SSD */</div><div class='del'>-	struct swap_cluster_list free_clusters; /* free clusters list */</div><div class='del'>-	unsigned int lowest_bit;	/* index of first free in swap_map */</div><div class='del'>-	unsigned int highest_bit;	/* index of last free in swap_map */</div><div class='add'>+	struct list_head free_clusters; /* free clusters list */</div><div class='add'>+	struct list_head full_clusters; /* full clusters list */</div><div class='add'>+	struct list_head nonfull_clusters[SWAP_NR_ORDERS];</div><div class='add'>+					/* list of cluster that contains at least one free slot */</div><div class='add'>+	struct list_head frag_clusters[SWAP_NR_ORDERS];</div><div class='add'>+					/* list of cluster that are fragmented or contented */</div><div class='ctx'> 	unsigned int pages;		/* total of usable pages of swap */</div><div class='del'>-	unsigned int inuse_pages;	/* number of those currently in use */</div><div class='del'>-	unsigned int cluster_next;	/* likely index for next allocation */</div><div class='del'>-	unsigned int cluster_nr;	/* countdown to next cluster search */</div><div class='del'>-	unsigned int __percpu *cluster_next_cpu; /*percpu index for next allocation */</div><div class='del'>-	struct percpu_cluster __percpu *percpu_cluster; /* per cpu's swap location */</div><div class='add'>+	atomic_long_t inuse_pages;	/* number of those currently in use */</div><div class='add'>+	struct swap_sequential_cluster *global_cluster; /* Use one global cluster for rotating device */</div><div class='add'>+	spinlock_t global_cluster_lock;	/* Serialize usage of global cluster */</div><div class='ctx'> 	struct rb_root swap_extent_root;/* root of the swap extent rbtree */</div><div class='del'>-	struct file *bdev_file;		/* open handle of the bdev */</div><div class='ctx'> 	struct block_device *bdev;	/* swap device or bdev of swap file */</div><div class='ctx'> 	struct file *swap_file;		/* seldom referenced */</div><div class='del'>-	unsigned int old_block_size;	/* seldom referenced */</div><div class='ctx'> 	struct completion comp;		/* seldom referenced */</div><div class='ctx'> 	spinlock_t lock;		/*</div><div class='ctx'> 					 * protect map scan related fields like</div><div class='del'>-					 * swap_map, lowest_bit, highest_bit,</div><div class='del'>-					 * inuse_pages, cluster_next,</div><div class='del'>-					 * cluster_nr, lowest_alloc,</div><div class='del'>-					 * highest_alloc, free/discard cluster</div><div class='del'>-					 * list. other fields are only changed</div><div class='add'>+					 * swap_map, inuse_pages and all cluster</div><div class='add'>+					 * lists. other fields are only changed</div><div class='ctx'> 					 * at swapon/swapoff, so are protected</div><div class='ctx'> 					 * by swap_lock. changing flags need</div><div class='ctx'> 					 * hold this lock and swap_lock. If</div><div class='hunk'>@@ -321,17 +299,9 @@ struct swap_info_struct {</div><div class='ctx'> 					 * list.</div><div class='ctx'> 					 */</div><div class='ctx'> 	struct work_struct discard_work; /* discard worker */</div><div class='del'>-	struct swap_cluster_list discard_clusters; /* discard clusters list */</div><div class='del'>-	struct plist_node avail_lists[]; /*</div><div class='del'>-					   * entries in swap_avail_heads, one</div><div class='del'>-					   * entry per node.</div><div class='del'>-					   * Must be last as the number of the</div><div class='del'>-					   * array is nr_node_ids, which is not</div><div class='del'>-					   * a fixed value so have to allocate</div><div class='del'>-					   * dynamically.</div><div class='del'>-					   * And it has to be an array so that</div><div class='del'>-					   * plist_for_each_* can work.</div><div class='del'>-					   */</div><div class='add'>+	struct work_struct reclaim_work; /* reclaim worker */</div><div class='add'>+	struct list_head discard_clusters; /* discard clusters list */</div><div class='add'>+	struct plist_node avail_list;   /* entry in swap_avail_head */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline swp_entry_t page_swap_entry(struct page *page)</div><div class='hunk'>@@ -344,22 +314,13 @@ static inline swp_entry_t page_swap_entry(struct page *page)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* linux/mm/workingset.c */</div><div class='del'>-bool workingset_test_recent(void *shadow, bool file, bool *workingset);</div><div class='add'>+bool workingset_test_recent(void *shadow, bool file, bool *workingset,</div><div class='add'>+				bool flush);</div><div class='ctx'> void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_pages);</div><div class='ctx'> void *workingset_eviction(struct folio *folio, struct mem_cgroup *target_memcg);</div><div class='ctx'> void workingset_refault(struct folio *folio, void *shadow);</div><div class='ctx'> void workingset_activation(struct folio *folio);</div><div class='ctx'> </div><div class='del'>-/* Only track the nodes of mappings with shadow entries */</div><div class='del'>-void workingset_update_node(struct xa_node *node);</div><div class='del'>-extern struct list_lru shadow_nodes;</div><div class='del'>-#define mapping_set_update(xas, mapping) do {				\</div><div class='del'>-	if (!dax_mapping(mapping) &amp;&amp; !shmem_mapping(mapping)) {		\</div><div class='del'>-		xas_set_update(xas, workingset_update_node);		\</div><div class='del'>-		xas_set_lru(xas, &amp;shadow_nodes);			\</div><div class='del'>-	}								\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> /* linux/mm/page_alloc.c */</div><div class='ctx'> extern unsigned long totalreserve_pages;</div><div class='ctx'> </div><div class='hunk'>@@ -368,14 +329,25 @@ extern unsigned long totalreserve_pages;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* linux/mm/swap.c */</div><div class='del'>-void lru_note_cost(struct lruvec *lruvec, bool file,</div><div class='del'>-		   unsigned int nr_io, unsigned int nr_rotated);</div><div class='add'>+void lru_note_cost_unlock_irq(struct lruvec *lruvec, bool file,</div><div class='add'>+		unsigned int nr_io, unsigned int nr_rotated)</div><div class='add'>+		__releases(lruvec-&gt;lru_lock);</div><div class='ctx'> void lru_note_cost_refault(struct folio *);</div><div class='ctx'> void folio_add_lru(struct folio *);</div><div class='ctx'> void folio_add_lru_vma(struct folio *, struct vm_area_struct *);</div><div class='ctx'> void mark_page_accessed(struct page *);</div><div class='ctx'> void folio_mark_accessed(struct folio *);</div><div class='ctx'> </div><div class='add'>+static inline bool folio_may_be_lru_cached(struct folio *folio)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Holding PMD-sized folios in per-CPU LRU cache unbalances accounting.</div><div class='add'>+	 * Holding small numbers of low-order mTHP folios in per-CPU LRU cache</div><div class='add'>+	 * will be sensible, but nobody has implemented and tested that yet.</div><div class='add'>+	 */</div><div class='add'>+	return !folio_test_large(folio);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern atomic_t lru_disable_count;</div><div class='ctx'> </div><div class='ctx'> static inline bool lru_cache_disabled(void)</div><div class='hunk'>@@ -404,10 +376,17 @@ extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order,</div><div class='ctx'> </div><div class='ctx'> #define MEMCG_RECLAIM_MAY_SWAP (1 &lt;&lt; 1)</div><div class='ctx'> #define MEMCG_RECLAIM_PROACTIVE (1 &lt;&lt; 2)</div><div class='add'>+#define MIN_SWAPPINESS 0</div><div class='add'>+#define MAX_SWAPPINESS 200</div><div class='add'>+</div><div class='add'>+/* Just reclaim from anon folios in proactive memory reclaim */</div><div class='add'>+#define SWAPPINESS_ANON_ONLY (MAX_SWAPPINESS + 1)</div><div class='add'>+</div><div class='ctx'> extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,</div><div class='ctx'> 						  unsigned long nr_pages,</div><div class='ctx'> 						  gfp_t gfp_mask,</div><div class='del'>-						  unsigned int reclaim_options);</div><div class='add'>+						  unsigned int reclaim_options,</div><div class='add'>+						  int *swappiness);</div><div class='ctx'> extern unsigned long mem_cgroup_shrink_node(struct mem_cgroup *mem,</div><div class='ctx'> 						gfp_t gfp_mask, bool noswap,</div><div class='ctx'> 						pg_data_t *pgdat,</div><div class='hunk'>@@ -416,19 +395,26 @@ extern unsigned long shrink_all_memory(unsigned long nr_pages);</div><div class='ctx'> extern int vm_swappiness;</div><div class='ctx'> long remove_mapping(struct address_space *mapping, struct folio *folio);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-extern int node_reclaim_mode;</div><div class='del'>-extern int sysctl_min_unmapped_ratio;</div><div class='del'>-extern int sysctl_min_slab_ratio;</div><div class='add'>+#if defined(CONFIG_SYSFS) &amp;&amp; defined(CONFIG_NUMA)</div><div class='add'>+extern int reclaim_register_node(struct node *node);</div><div class='add'>+extern void reclaim_unregister_node(struct node *node);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='del'>-#define node_reclaim_mode 0</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static inline bool node_reclaim_enabled(void)</div><div class='add'>+static inline int reclaim_register_node(struct node *node)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void reclaim_unregister_node(struct node *node)</div><div class='ctx'> {</div><div class='del'>-	/* Is any node_reclaim_mode bit set? */</div><div class='del'>-	return node_reclaim_mode &amp; (RECLAIM_ZONE|RECLAIM_WRITE|RECLAIM_UNMAP);</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_SYSFS &amp;&amp; CONFIG_NUMA */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+extern int sysctl_min_unmapped_ratio;</div><div class='add'>+extern int sysctl_min_slab_ratio;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void check_move_unevictable_folios(struct folio_batch *fbatch);</div><div class='ctx'> </div><div class='hunk'>@@ -447,14 +433,13 @@ static inline unsigned long total_swapcache_pages(void)</div><div class='ctx'> 	return global_node_page_state(NR_SWAPCACHE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void free_swap_cache(struct page *page);</div><div class='del'>-extern void free_page_and_swap_cache(struct page *);</div><div class='del'>-extern void free_pages_and_swap_cache(struct encoded_page **, int);</div><div class='add'>+void free_swap_cache(struct folio *folio);</div><div class='add'>+void free_folio_and_swap_cache(struct folio *folio);</div><div class='add'>+void free_pages_and_swap_cache(struct encoded_page **, int);</div><div class='ctx'> /* linux/mm/swapfile.c */</div><div class='ctx'> extern atomic_long_t nr_swap_pages;</div><div class='ctx'> extern long total_swap_pages;</div><div class='ctx'> extern atomic_t nr_rotate_swap;</div><div class='del'>-extern bool has_usable_swap(void);</div><div class='ctx'> </div><div class='ctx'> /* Swap 50% full? Release swapcache more aggressively.. */</div><div class='ctx'> static inline bool vm_swap_full(void)</div><div class='hunk'>@@ -468,29 +453,24 @@ static inline long get_nr_swap_pages(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void si_swapinfo(struct sysinfo *);</div><div class='del'>-swp_entry_t folio_alloc_swap(struct folio *folio);</div><div class='add'>+int folio_alloc_swap(struct folio *folio);</div><div class='ctx'> bool folio_free_swap(struct folio *folio);</div><div class='ctx'> void put_swap_folio(struct folio *folio, swp_entry_t entry);</div><div class='ctx'> extern swp_entry_t get_swap_page_of_type(int);</div><div class='del'>-extern int get_swap_pages(int n, swp_entry_t swp_entries[], int entry_size);</div><div class='ctx'> extern int add_swap_count_continuation(swp_entry_t, gfp_t);</div><div class='del'>-extern void swap_shmem_alloc(swp_entry_t);</div><div class='add'>+extern void swap_shmem_alloc(swp_entry_t, int);</div><div class='ctx'> extern int swap_duplicate(swp_entry_t);</div><div class='del'>-extern int swapcache_prepare(swp_entry_t);</div><div class='del'>-extern void swap_free(swp_entry_t);</div><div class='del'>-extern void swapcache_free_entries(swp_entry_t *entries, int n);</div><div class='del'>-extern int free_swap_and_cache(swp_entry_t);</div><div class='add'>+extern int swapcache_prepare(swp_entry_t entry, int nr);</div><div class='add'>+extern void swap_free_nr(swp_entry_t entry, int nr_pages);</div><div class='add'>+extern void free_swap_and_cache_nr(swp_entry_t entry, int nr);</div><div class='ctx'> int swap_type_of(dev_t device, sector_t offset);</div><div class='ctx'> int find_first_swap(dev_t *device);</div><div class='ctx'> extern unsigned int count_swap_pages(int, int);</div><div class='ctx'> extern sector_t swapdev_block(int, pgoff_t);</div><div class='ctx'> extern int __swap_count(swp_entry_t entry);</div><div class='del'>-extern int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry);</div><div class='add'>+extern bool swap_entry_swapped(struct swap_info_struct *si, swp_entry_t entry);</div><div class='ctx'> extern int swp_swapcount(swp_entry_t entry);</div><div class='del'>-struct swap_info_struct *swp_swap_info(swp_entry_t entry);</div><div class='ctx'> struct backing_dev_info;</div><div class='del'>-extern int init_swap_address_space(unsigned int type, unsigned long nr_pages);</div><div class='del'>-extern void exit_swap_address_space(unsigned int type);</div><div class='ctx'> extern struct swap_info_struct *get_swap_device(swp_entry_t entry);</div><div class='ctx'> sector_t swap_folio_sector(struct folio *folio);</div><div class='ctx'> </div><div class='hunk'>@@ -500,11 +480,6 @@ static inline void put_swap_device(struct swap_info_struct *si)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_SWAP */</div><div class='del'>-static inline struct swap_info_struct *swp_swap_info(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct swap_info_struct *get_swap_device(swp_entry_t entry)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -521,17 +496,16 @@ static inline void put_swap_device(struct swap_info_struct *si)</div><div class='ctx'> </div><div class='ctx'> #define si_swapinfo(val) \</div><div class='ctx'> 	do { (val)-&gt;freeswap = (val)-&gt;totalswap = 0; } while (0)</div><div class='del'>-/* only sparc can not include linux/pagemap.h in this file</div><div class='del'>- * so leave put_page and release_pages undeclared... */</div><div class='del'>-#define free_page_and_swap_cache(page) \</div><div class='del'>-	put_page(page)</div><div class='add'>+#define free_folio_and_swap_cache(folio) \</div><div class='add'>+	folio_put(folio)</div><div class='ctx'> #define free_pages_and_swap_cache(pages, nr) \</div><div class='ctx'> 	release_pages((pages), (nr));</div><div class='ctx'> </div><div class='del'>-/* used to sanity check ptes in zap_pte_range when CONFIG_SWAP=0 */</div><div class='del'>-#define free_swap_and_cache(e) is_pfn_swap_entry(e)</div><div class='add'>+static inline void free_swap_and_cache_nr(swp_entry_t entry, int nr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static inline void free_swap_cache(struct page *page)</div><div class='add'>+static inline void free_swap_cache(struct folio *folio)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -540,7 +514,7 @@ static inline int add_swap_count_continuation(swp_entry_t swp, gfp_t gfp_mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void swap_shmem_alloc(swp_entry_t swp)</div><div class='add'>+static inline void swap_shmem_alloc(swp_entry_t swp, int nr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -549,12 +523,12 @@ static inline int swap_duplicate(swp_entry_t swp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int swapcache_prepare(swp_entry_t swp)</div><div class='add'>+static inline int swapcache_prepare(swp_entry_t swp, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void swap_free(swp_entry_t swp)</div><div class='add'>+static inline void swap_free_nr(swp_entry_t entry, int nr_pages)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -567,9 +541,9 @@ static inline int __swap_count(swp_entry_t entry)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry)</div><div class='add'>+static inline bool swap_entry_swapped(struct swap_info_struct *si, swp_entry_t entry)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int swp_swapcount(swp_entry_t entry)</div><div class='hunk'>@@ -577,11 +551,9 @@ static inline int swp_swapcount(swp_entry_t entry)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline swp_entry_t folio_alloc_swap(struct folio *folio)</div><div class='add'>+static inline int folio_alloc_swap(struct folio *folio)</div><div class='ctx'> {</div><div class='del'>-	swp_entry_t entry;</div><div class='del'>-	entry.val = 0;</div><div class='del'>-	return entry;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool folio_free_swap(struct folio *folio)</div><div class='hunk'>@@ -597,14 +569,15 @@ static inline int add_swap_extent(struct swap_info_struct *sis,</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SWAP */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_THP_SWAP</div><div class='del'>-extern int split_swap_cluster(swp_entry_t entry);</div><div class='del'>-#else</div><div class='del'>-static inline int split_swap_cluster(swp_entry_t entry)</div><div class='add'>+static inline void free_swap_and_cache(swp_entry_t entry)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	free_swap_and_cache_nr(entry, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void swap_free(swp_entry_t entry)</div><div class='add'>+{</div><div class='add'>+	swap_free_nr(entry, 1);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MEMCG</div><div class='ctx'> static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg)</div><div class='hunk'>@@ -641,7 +614,6 @@ static inline void folio_throttle_swaprate(struct folio *folio, gfp_t gfp)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MEMCG) &amp;&amp; defined(CONFIG_SWAP)</div><div class='del'>-void mem_cgroup_swapout(struct folio *folio, swp_entry_t entry);</div><div class='ctx'> int __mem_cgroup_try_charge_swap(struct folio *folio, swp_entry_t entry);</div><div class='ctx'> static inline int mem_cgroup_try_charge_swap(struct folio *folio,</div><div class='ctx'> 		swp_entry_t entry)</div><div class='hunk'>@@ -662,10 +634,6 @@ static inline void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_p</div><div class='ctx'> extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg);</div><div class='ctx'> extern bool mem_cgroup_swap_full(struct folio *folio);</div><div class='ctx'> #else</div><div class='del'>-static inline void mem_cgroup_swapout(struct folio *folio, swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int mem_cgroup_try_charge_swap(struct folio *folio,</div><div class='ctx'> 					     swp_entry_t entry)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/swap_cgroup.h b/include/linux/swap_cgroup.h<br/>index ae73a87775b3..91cdf12190a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/swap_cgroup.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swap_cgroup.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/swap_cgroup.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/swap_cgroup.h</a></div><div class='hunk'>@@ -6,10 +6,8 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MEMCG) &amp;&amp; defined(CONFIG_SWAP)</div><div class='ctx'> </div><div class='del'>-extern unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,</div><div class='del'>-					unsigned short old, unsigned short new);</div><div class='del'>-extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id,</div><div class='del'>-					 unsigned int nr_ents);</div><div class='add'>+extern void swap_cgroup_record(struct folio *folio, unsigned short id, swp_entry_t ent);</div><div class='add'>+extern unsigned short swap_cgroup_clear(swp_entry_t ent, unsigned int nr_ents);</div><div class='ctx'> extern unsigned short lookup_swap_cgroup_id(swp_entry_t ent);</div><div class='ctx'> extern int swap_cgroup_swapon(int type, unsigned long max_pages);</div><div class='ctx'> extern void swap_cgroup_swapoff(int type);</div><div class='hunk'>@@ -17,8 +15,12 @@ extern void swap_cgroup_swapoff(int type);</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='del'>-unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id,</div><div class='del'>-				  unsigned int nr_ents)</div><div class='add'>+void swap_cgroup_record(struct folio *folio, unsigned short id, swp_entry_t ent)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+unsigned short swap_cgroup_clear(swp_entry_t ent, unsigned int nr_ents)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/swap_slots.h b/include/linux/swap_slots.h<br/>deleted file mode 100644<br/>index 15adfb8c813a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/swap_slots.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swap_slots.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_SWAP_SLOTS_H</div><div class='del'>-#define _LINUX_SWAP_SLOTS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/swap.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-#define SWAP_SLOTS_CACHE_SIZE			SWAP_BATCH</div><div class='del'>-#define THRESHOLD_ACTIVATE_SWAP_SLOTS_CACHE	(5*SWAP_SLOTS_CACHE_SIZE)</div><div class='del'>-#define THRESHOLD_DEACTIVATE_SWAP_SLOTS_CACHE	(2*SWAP_SLOTS_CACHE_SIZE)</div><div class='del'>-</div><div class='del'>-struct swap_slots_cache {</div><div class='del'>-	bool		lock_initialized;</div><div class='del'>-	struct mutex	alloc_lock; /* protects slots, nr, cur */</div><div class='del'>-	swp_entry_t	*slots;</div><div class='del'>-	int		nr;</div><div class='del'>-	int		cur;</div><div class='del'>-	spinlock_t	free_lock;  /* protects slots_ret, n_ret */</div><div class='del'>-	swp_entry_t	*slots_ret;</div><div class='del'>-	int		n_ret;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void disable_swap_slots_cache_lock(void);</div><div class='del'>-void reenable_swap_slots_cache_unlock(void);</div><div class='del'>-void enable_swap_slots_cache(void);</div><div class='del'>-void free_swap_slot(swp_entry_t entry);</div><div class='del'>-</div><div class='del'>-extern bool swap_slot_cache_enabled;</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_SWAP_SLOTS_H */</div><div class='head'>diff --git a/include/linux/swapops.h b/include/linux/swapops.h<br/>index bff1e8d97de0..8cfc966eae48 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/swapops.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swapops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/swapops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/swapops.h</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> #define SWP_OFFSET_MASK	((1UL &lt;&lt; SWP_TYPE_SHIFT) - 1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Definitions only for PFN swap entries (see is_pfn_swap_entry()).  To</div><div class='add'>+ * Definitions only for PFN swap entries (see leafeant_has_pfn()).  To</div><div class='ctx'>  * store PFN, we only need SWP_PFN_BITS bits.  Each of the pfn swap entries</div><div class='ctx'>  * can use the extra bits to store other information besides PFN.</div><div class='ctx'>  */</div><div class='hunk'>@@ -66,8 +66,6 @@</div><div class='ctx'> #define SWP_MIG_YOUNG			BIT(SWP_MIG_YOUNG_BIT)</div><div class='ctx'> #define SWP_MIG_DIRTY			BIT(SWP_MIG_DIRTY_BIT)</div><div class='ctx'> </div><div class='del'>-static inline bool is_pfn_swap_entry(swp_entry_t entry);</div><div class='del'>-</div><div class='ctx'> /* Clear all flags but only keep swp_entry_t related information */</div><div class='ctx'> static inline pte_t pte_swp_clear_flags(pte_t pte)</div><div class='ctx'> {</div><div class='hunk'>@@ -110,36 +108,6 @@ static inline pgoff_t swp_offset(swp_entry_t entry)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This should only be called upon a pfn swap entry to get the PFN stored</div><div class='del'>- * in the swap entry.  Please refers to is_pfn_swap_entry() for definition</div><div class='del'>- * of pfn swap entry.</div><div class='del'>- */</div><div class='del'>-static inline unsigned long swp_offset_pfn(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	VM_BUG_ON(!is_pfn_swap_entry(entry));</div><div class='del'>-	return swp_offset(entry) &amp; SWP_PFN_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check whether a pte points to a swap entry */</div><div class='del'>-static inline int is_swap_pte(pte_t pte)</div><div class='del'>-{</div><div class='del'>-	return !pte_none(pte) &amp;&amp; !pte_present(pte);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert the arch-dependent pte representation of a swp_entry_t into an</div><div class='del'>- * arch-independent swp_entry_t.</div><div class='del'>- */</div><div class='del'>-static inline swp_entry_t pte_to_swp_entry(pte_t pte)</div><div class='del'>-{</div><div class='del'>-	swp_entry_t arch_entry;</div><div class='del'>-</div><div class='del'>-	pte = pte_swp_clear_flags(pte);</div><div class='del'>-	arch_entry = __pte_to_swp_entry(pte);</div><div class='del'>-	return swp_entry(__swp_type(arch_entry), __swp_offset(arch_entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Convert the arch-independent representation of a swp_entry_t into the</div><div class='ctx'>  * arch-dependent pte representation.</div><div class='ctx'>  */</div><div class='hunk'>@@ -175,37 +143,11 @@ static inline swp_entry_t make_writable_device_private_entry(pgoff_t offset)</div><div class='ctx'> 	return swp_entry(SWP_DEVICE_WRITE, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_device_private_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	int type = swp_type(entry);</div><div class='del'>-	return type == SWP_DEVICE_READ || type == SWP_DEVICE_WRITE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool is_writable_device_private_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return unlikely(swp_type(entry) == SWP_DEVICE_WRITE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline swp_entry_t make_readable_device_exclusive_entry(pgoff_t offset)</div><div class='del'>-{</div><div class='del'>-	return swp_entry(SWP_DEVICE_EXCLUSIVE_READ, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline swp_entry_t make_writable_device_exclusive_entry(pgoff_t offset)</div><div class='del'>-{</div><div class='del'>-	return swp_entry(SWP_DEVICE_EXCLUSIVE_WRITE, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool is_device_exclusive_entry(swp_entry_t entry)</div><div class='add'>+static inline swp_entry_t make_device_exclusive_entry(pgoff_t offset)</div><div class='ctx'> {</div><div class='del'>-	return swp_type(entry) == SWP_DEVICE_EXCLUSIVE_READ ||</div><div class='del'>-		swp_type(entry) == SWP_DEVICE_EXCLUSIVE_WRITE;</div><div class='add'>+	return swp_entry(SWP_DEVICE_EXCLUSIVE, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_writable_device_exclusive_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return unlikely(swp_type(entry) == SWP_DEVICE_EXCLUSIVE_WRITE);</div><div class='del'>-}</div><div class='ctx'> #else /* CONFIG_DEVICE_PRIVATE */</div><div class='ctx'> static inline swp_entry_t make_readable_device_private_entry(pgoff_t offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -217,59 +159,14 @@ static inline swp_entry_t make_writable_device_private_entry(pgoff_t offset)</div><div class='ctx'> 	return swp_entry(0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_device_private_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool is_writable_device_private_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline swp_entry_t make_readable_device_exclusive_entry(pgoff_t offset)</div><div class='add'>+static inline swp_entry_t make_device_exclusive_entry(pgoff_t offset)</div><div class='ctx'> {</div><div class='ctx'> 	return swp_entry(0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline swp_entry_t make_writable_device_exclusive_entry(pgoff_t offset)</div><div class='del'>-{</div><div class='del'>-	return swp_entry(0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool is_device_exclusive_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool is_writable_device_exclusive_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='ctx'> #endif /* CONFIG_DEVICE_PRIVATE */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MIGRATION</div><div class='del'>-static inline int is_migration_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return unlikely(swp_type(entry) == SWP_MIGRATION_READ ||</div><div class='del'>-			swp_type(entry) == SWP_MIGRATION_READ_EXCLUSIVE ||</div><div class='del'>-			swp_type(entry) == SWP_MIGRATION_WRITE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_writable_migration_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return unlikely(swp_type(entry) == SWP_MIGRATION_WRITE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_readable_migration_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return unlikely(swp_type(entry) == SWP_MIGRATION_READ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_readable_exclusive_migration_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return unlikely(swp_type(entry) == SWP_MIGRATION_READ_EXCLUSIVE);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static inline swp_entry_t make_readable_migration_entry(pgoff_t offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -308,14 +205,6 @@ static inline swp_entry_t make_migration_entry_young(swp_entry_t entry)</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_migration_entry_young(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	if (migration_entry_supports_ad())</div><div class='del'>-		return swp_offset(entry) &amp; SWP_MIG_YOUNG;</div><div class='del'>-	/* Keep the old behavior of aging page after migration */</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline swp_entry_t make_migration_entry_dirty(swp_entry_t entry)</div><div class='ctx'> {</div><div class='ctx'> 	if (migration_entry_supports_ad())</div><div class='hunk'>@@ -324,17 +213,9 @@ static inline swp_entry_t make_migration_entry_dirty(swp_entry_t entry)</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_migration_entry_dirty(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	if (migration_entry_supports_ad())</div><div class='del'>-		return swp_offset(entry) &amp; SWP_MIG_DIRTY;</div><div class='del'>-	/* Keep the old behavior of clean page after migration */</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd,</div><div class='ctx'> 					unsigned long address);</div><div class='del'>-extern void migration_entry_wait_huge(struct vm_area_struct *vma, pte_t *pte);</div><div class='add'>+extern void migration_entry_wait_huge(struct vm_area_struct *vma, unsigned long addr, pte_t *pte);</div><div class='ctx'> #else  /* CONFIG_MIGRATION */</div><div class='ctx'> static inline swp_entry_t make_readable_migration_entry(pgoff_t offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -351,44 +232,51 @@ static inline swp_entry_t make_writable_migration_entry(pgoff_t offset)</div><div class='ctx'> 	return swp_entry(0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int is_migration_entry(swp_entry_t swp)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd,</div><div class='ctx'> 					unsigned long address) { }</div><div class='ctx'> static inline void migration_entry_wait_huge(struct vm_area_struct *vma,</div><div class='del'>-					pte_t *pte) { }</div><div class='del'>-static inline int is_writable_migration_entry(swp_entry_t entry)</div><div class='add'>+					     unsigned long addr, pte_t *pte) { }</div><div class='add'>+</div><div class='add'>+static inline swp_entry_t make_migration_entry_young(swp_entry_t entry)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return entry;</div><div class='ctx'> }</div><div class='del'>-static inline int is_readable_migration_entry(swp_entry_t entry)</div><div class='add'>+</div><div class='add'>+static inline swp_entry_t make_migration_entry_dirty(swp_entry_t entry)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline swp_entry_t make_migration_entry_young(swp_entry_t entry)</div><div class='add'>+#endif	/* CONFIG_MIGRATION */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MEMORY_FAILURE</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Support for hardware poisoned pages</div><div class='add'>+ */</div><div class='add'>+static inline swp_entry_t make_hwpoison_entry(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return entry;</div><div class='add'>+	BUG_ON(!PageLocked(page));</div><div class='add'>+	return swp_entry(SWP_HWPOISON, page_to_pfn(page));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_migration_entry_young(swp_entry_t entry)</div><div class='add'>+static inline int is_hwpoison_entry(swp_entry_t entry)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='add'>+	return swp_type(entry) == SWP_HWPOISON;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline swp_entry_t make_migration_entry_dirty(swp_entry_t entry)</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline swp_entry_t make_hwpoison_entry(struct page *page)</div><div class='ctx'> {</div><div class='del'>-	return entry;</div><div class='add'>+	return swp_entry(0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_migration_entry_dirty(swp_entry_t entry)</div><div class='add'>+static inline int is_hwpoison_entry(swp_entry_t swp)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif	/* CONFIG_MIGRATION */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> typedef unsigned long pte_marker;</div><div class='ctx'> </div><div class='hunk'>@@ -397,30 +285,25 @@ typedef unsigned long pte_marker;</div><div class='ctx'>  * "Poisoned" here is meant in the very general sense of "future accesses are</div><div class='ctx'>  * invalid", instead of referring very specifically to hardware memory errors.</div><div class='ctx'>  * This marker is meant to represent any of various different causes of this.</div><div class='add'>+ *</div><div class='add'>+ * Note that, when encountered by the faulting logic, PTEs with this marker will</div><div class='add'>+ * result in VM_FAULT_HWPOISON and thus regardless trigger hardware memory error</div><div class='add'>+ * logic.</div><div class='ctx'>  */</div><div class='ctx'> #define  PTE_MARKER_POISONED			BIT(1)</div><div class='del'>-#define  PTE_MARKER_MASK			(BIT(2) - 1)</div><div class='add'>+/*</div><div class='add'>+ * Indicates that, on fault, this PTE will case a SIGSEGV signal to be</div><div class='add'>+ * sent. This means guard markers behave in effect as if the region were mapped</div><div class='add'>+ * PROT_NONE, rather than if they were a memory hole or equivalent.</div><div class='add'>+ */</div><div class='add'>+#define  PTE_MARKER_GUARD			BIT(2)</div><div class='add'>+#define  PTE_MARKER_MASK			(BIT(3) - 1)</div><div class='ctx'> </div><div class='ctx'> static inline swp_entry_t make_pte_marker_entry(pte_marker marker)</div><div class='ctx'> {</div><div class='ctx'> 	return swp_entry(SWP_PTE_MARKER, marker);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_pte_marker_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return swp_type(entry) == SWP_PTE_MARKER;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline pte_marker pte_marker_get(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return swp_offset(entry) &amp; PTE_MARKER_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool is_pte_marker(pte_t pte)</div><div class='del'>-{</div><div class='del'>-	return is_swap_pte(pte) &amp;&amp; is_pte_marker_entry(pte_to_swp_entry(pte));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline pte_t make_pte_marker(pte_marker marker)</div><div class='ctx'> {</div><div class='ctx'> 	return swp_entry_to_pte(make_pte_marker_entry(marker));</div><div class='hunk'>@@ -431,55 +314,9 @@ static inline swp_entry_t make_poisoned_swp_entry(void)</div><div class='ctx'> 	return make_pte_marker_entry(PTE_MARKER_POISONED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int is_poisoned_swp_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return is_pte_marker_entry(entry) &amp;&amp;</div><div class='del'>-	    (pte_marker_get(entry) &amp; PTE_MARKER_POISONED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is a special version to check pte_none() just to cover the case when</div><div class='del'>- * the pte is a pte marker.  It existed because in many cases the pte marker</div><div class='del'>- * should be seen as a none pte; it's just that we have stored some information</div><div class='del'>- * onto the none pte so it becomes not-none any more.</div><div class='del'>- *</div><div class='del'>- * It should be used when the pte is file-backed, ram-based and backing</div><div class='del'>- * userspace pages, like shmem.  It is not needed upon pgtables that do not</div><div class='del'>- * support pte markers at all.  For example, it's not needed on anonymous</div><div class='del'>- * memory, kernel-only memory (including when the system is during-boot),</div><div class='del'>- * non-ram based generic file-system.  It's fine to be used even there, but the</div><div class='del'>- * extra pte marker check will be pure overhead.</div><div class='del'>- */</div><div class='del'>-static inline int pte_none_mostly(pte_t pte)</div><div class='add'>+static inline swp_entry_t make_guard_swp_entry(void)</div><div class='ctx'> {</div><div class='del'>-	return pte_none(pte) || is_pte_marker(pte);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct page *pfn_swap_entry_to_page(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	struct page *p = pfn_to_page(swp_offset_pfn(entry));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Any use of migration entries may only occur while the</div><div class='del'>-	 * corresponding page is locked</div><div class='del'>-	 */</div><div class='del'>-	BUG_ON(is_migration_entry(entry) &amp;&amp; !PageLocked(p));</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A pfn swap entry is a special type of swap entry that always has a pfn stored</div><div class='del'>- * in the swap offset. They are used to represent unaddressable device memory</div><div class='del'>- * and to restrict access to a page undergoing migration.</div><div class='del'>- */</div><div class='del'>-static inline bool is_pfn_swap_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	/* Make sure the swp offset can always store the needed fields */</div><div class='del'>-	BUILD_BUG_ON(SWP_TYPE_SHIFT &lt; SWP_PFN_BITS);</div><div class='del'>-</div><div class='del'>-	return is_migration_entry(entry) || is_device_private_entry(entry) ||</div><div class='del'>-	       is_device_exclusive_entry(entry);</div><div class='add'>+	return make_pte_marker_entry(PTE_MARKER_GUARD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct page_vma_mapped_walk;</div><div class='hunk'>@@ -493,18 +330,6 @@ extern void remove_migration_pmd(struct page_vma_mapped_walk *pvmw,</div><div class='ctx'> </div><div class='ctx'> extern void pmd_migration_entry_wait(struct mm_struct *mm, pmd_t *pmd);</div><div class='ctx'> </div><div class='del'>-static inline swp_entry_t pmd_to_swp_entry(pmd_t pmd)</div><div class='del'>-{</div><div class='del'>-	swp_entry_t arch_entry;</div><div class='del'>-</div><div class='del'>-	if (pmd_swp_soft_dirty(pmd))</div><div class='del'>-		pmd = pmd_swp_clear_soft_dirty(pmd);</div><div class='del'>-	if (pmd_swp_uffd_wp(pmd))</div><div class='del'>-		pmd = pmd_swp_clear_uffd_wp(pmd);</div><div class='del'>-	arch_entry = __pmd_to_swp_entry(pmd);</div><div class='del'>-	return swp_entry(__swp_type(arch_entry), __swp_offset(arch_entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline pmd_t swp_entry_to_pmd(swp_entry_t entry)</div><div class='ctx'> {</div><div class='ctx'> 	swp_entry_t arch_entry;</div><div class='hunk'>@@ -513,10 +338,6 @@ static inline pmd_t swp_entry_to_pmd(swp_entry_t entry)</div><div class='ctx'> 	return __swp_entry_to_pmd(arch_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int is_pmd_migration_entry(pmd_t pmd)</div><div class='del'>-{</div><div class='del'>-	return is_swap_pmd(pmd) &amp;&amp; is_migration_entry(pmd_to_swp_entry(pmd));</div><div class='del'>-}</div><div class='ctx'> #else  /* CONFIG_ARCH_ENABLE_THP_MIGRATION */</div><div class='ctx'> static inline int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw,</div><div class='ctx'> 		struct page *page)</div><div class='hunk'>@@ -532,55 +353,12 @@ static inline void remove_migration_pmd(struct page_vma_mapped_walk *pvmw,</div><div class='ctx'> </div><div class='ctx'> static inline void pmd_migration_entry_wait(struct mm_struct *m, pmd_t *p) { }</div><div class='ctx'> </div><div class='del'>-static inline swp_entry_t pmd_to_swp_entry(pmd_t pmd)</div><div class='del'>-{</div><div class='del'>-	return swp_entry(0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline pmd_t swp_entry_to_pmd(swp_entry_t entry)</div><div class='ctx'> {</div><div class='ctx'> 	return __pmd(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int is_pmd_migration_entry(pmd_t pmd)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> #endif  /* CONFIG_ARCH_ENABLE_THP_MIGRATION */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MEMORY_FAILURE</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Support for hardware poisoned pages</div><div class='del'>- */</div><div class='del'>-static inline swp_entry_t make_hwpoison_entry(struct page *page)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(!PageLocked(page));</div><div class='del'>-	return swp_entry(SWP_HWPOISON, page_to_pfn(page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_hwpoison_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return swp_type(entry) == SWP_HWPOISON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline swp_entry_t make_hwpoison_entry(struct page *page)</div><div class='del'>-{</div><div class='del'>-	return swp_entry(0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int is_hwpoison_entry(swp_entry_t swp)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int non_swap_entry(swp_entry_t entry)</div><div class='del'>-{</div><div class='del'>-	return swp_type(entry) &gt;= MAX_SWAPFILES;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* CONFIG_MMU */</div><div class='ctx'> #endif /* _LINUX_SWAPOPS_H */</div><div class='head'>diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h<br/>index ea23097e351f..3dae0f592063 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/swiotlb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/swiotlb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/swiotlb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/swiotlb.h</a></div><div class='hunk'>@@ -42,24 +42,6 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask,</div><div class='ctx'> 	int (*remap)(void *tlb, unsigned long nslabs));</div><div class='ctx'> extern void __init swiotlb_update_mem_attributes(void);</div><div class='ctx'> </div><div class='del'>-phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t phys,</div><div class='del'>-		size_t mapping_size, size_t alloc_size,</div><div class='del'>-		unsigned int alloc_aligned_mask, enum dma_data_direction dir,</div><div class='del'>-		unsigned long attrs);</div><div class='del'>-</div><div class='del'>-extern void swiotlb_tbl_unmap_single(struct device *hwdev,</div><div class='del'>-				     phys_addr_t tlb_addr,</div><div class='del'>-				     size_t mapping_size,</div><div class='del'>-				     enum dma_data_direction dir,</div><div class='del'>-				     unsigned long attrs);</div><div class='del'>-</div><div class='del'>-void swiotlb_sync_single_for_device(struct device *dev, phys_addr_t tlb_addr,</div><div class='del'>-		size_t size, enum dma_data_direction dir);</div><div class='del'>-void swiotlb_sync_single_for_cpu(struct device *dev, phys_addr_t tlb_addr,</div><div class='del'>-		size_t size, enum dma_data_direction dir);</div><div class='del'>-dma_addr_t swiotlb_map(struct device *dev, phys_addr_t phys,</div><div class='del'>-		size_t size, enum dma_data_direction dir, unsigned long attrs);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SWIOTLB</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -143,37 +125,27 @@ struct io_tlb_mem {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SWIOTLB_DYNAMIC</div><div class='del'>-</div><div class='del'>-struct io_tlb_pool *swiotlb_find_pool(struct device *dev, phys_addr_t paddr);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline struct io_tlb_pool *swiotlb_find_pool(struct device *dev,</div><div class='del'>-						    phys_addr_t paddr)</div><div class='del'>-{</div><div class='del'>-	return &amp;dev-&gt;dma_io_tlb_mem-&gt;defpool;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+struct io_tlb_pool *__swiotlb_find_pool(struct device *dev, phys_addr_t paddr);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * is_swiotlb_buffer() - check if a physical address belongs to a swiotlb</div><div class='add'>+ * swiotlb_find_pool() - find swiotlb pool to which a physical address belongs</div><div class='ctx'>  * @dev:        Device which has mapped the buffer.</div><div class='ctx'>  * @paddr:      Physical address within the DMA buffer.</div><div class='ctx'>  *</div><div class='del'>- * Check if @paddr points into a bounce buffer.</div><div class='add'>+ * Find the swiotlb pool that @paddr points into.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='del'>- * * %true if @paddr points into a bounce buffer</div><div class='del'>- * * %false otherwise</div><div class='add'>+ * * pool address if @paddr points into a bounce buffer</div><div class='add'>+ * * NULL if @paddr does not point into a bounce buffer. As such, this function</div><div class='add'>+ *   can be used to determine if @paddr denotes a swiotlb bounce buffer.</div><div class='ctx'>  */</div><div class='del'>-static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)</div><div class='add'>+static inline struct io_tlb_pool *swiotlb_find_pool(struct device *dev,</div><div class='add'>+		phys_addr_t paddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct io_tlb_mem *mem = dev-&gt;dma_io_tlb_mem;</div><div class='ctx'> </div><div class='ctx'> 	if (!mem)</div><div class='del'>-		return false;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SWIOTLB_DYNAMIC</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -182,16 +154,19 @@ static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)</div><div class='ctx'> 	 * If a SWIOTLB address is checked on another CPU, then it was</div><div class='ctx'> 	 * presumably loaded by the device driver from an unspecified private</div><div class='ctx'> 	 * data structure. Make sure that this load is ordered before reading</div><div class='del'>-	 * dev-&gt;dma_uses_io_tlb here and mem-&gt;pools in swiotlb_find_pool().</div><div class='add'>+	 * dev-&gt;dma_uses_io_tlb here and mem-&gt;pools in __swiotlb_find_pool().</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This barrier pairs with smp_mb() in swiotlb_find_slots().</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_rmb();</div><div class='del'>-	return READ_ONCE(dev-&gt;dma_uses_io_tlb) &amp;&amp;</div><div class='del'>-		swiotlb_find_pool(dev, paddr);</div><div class='add'>+	if (READ_ONCE(dev-&gt;dma_uses_io_tlb))</div><div class='add'>+		return __swiotlb_find_pool(dev, paddr);</div><div class='ctx'> #else</div><div class='del'>-	return paddr &gt;= mem-&gt;defpool.start &amp;&amp; paddr &lt; mem-&gt;defpool.end;</div><div class='add'>+	if (paddr &gt;= mem-&gt;defpool.start &amp;&amp; paddr &lt; mem-&gt;defpool.end)</div><div class='add'>+		return &amp;mem-&gt;defpool;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool is_swiotlb_force_bounce(struct device *dev)</div><div class='hunk'>@@ -219,9 +194,10 @@ static inline void swiotlb_dev_init(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)</div><div class='add'>+static inline struct io_tlb_pool *swiotlb_find_pool(struct device *dev,</div><div class='add'>+		phys_addr_t paddr)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> static inline bool is_swiotlb_force_bounce(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -260,6 +236,49 @@ static inline phys_addr_t default_swiotlb_limit(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SWIOTLB */</div><div class='ctx'> </div><div class='add'>+phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t phys,</div><div class='add'>+		size_t mapping_size, unsigned int alloc_aligned_mask,</div><div class='add'>+		enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+dma_addr_t swiotlb_map(struct device *dev, phys_addr_t phys,</div><div class='add'>+		size_t size, enum dma_data_direction dir, unsigned long attrs);</div><div class='add'>+</div><div class='add'>+void __swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,</div><div class='add'>+		size_t mapping_size, enum dma_data_direction dir,</div><div class='add'>+		unsigned long attrs, struct io_tlb_pool *pool);</div><div class='add'>+static inline void swiotlb_tbl_unmap_single(struct device *dev,</div><div class='add'>+		phys_addr_t addr, size_t size, enum dma_data_direction dir,</div><div class='add'>+		unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	struct io_tlb_pool *pool = swiotlb_find_pool(dev, addr);</div><div class='add'>+</div><div class='add'>+	if (unlikely(pool))</div><div class='add'>+		__swiotlb_tbl_unmap_single(dev, addr, size, dir, attrs, pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __swiotlb_sync_single_for_device(struct device *dev, phys_addr_t tlb_addr,</div><div class='add'>+		size_t size, enum dma_data_direction dir,</div><div class='add'>+		struct io_tlb_pool *pool);</div><div class='add'>+static inline void swiotlb_sync_single_for_device(struct device *dev,</div><div class='add'>+		phys_addr_t addr, size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct io_tlb_pool *pool = swiotlb_find_pool(dev, addr);</div><div class='add'>+</div><div class='add'>+	if (unlikely(pool))</div><div class='add'>+		__swiotlb_sync_single_for_device(dev, addr, size, dir, pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __swiotlb_sync_single_for_cpu(struct device *dev, phys_addr_t tlb_addr,</div><div class='add'>+		size_t size, enum dma_data_direction dir,</div><div class='add'>+		struct io_tlb_pool *pool);</div><div class='add'>+static inline void swiotlb_sync_single_for_cpu(struct device *dev,</div><div class='add'>+		phys_addr_t addr, size_t size, enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	struct io_tlb_pool *pool = swiotlb_find_pool(dev, addr);</div><div class='add'>+</div><div class='add'>+	if (unlikely(pool))</div><div class='add'>+		__swiotlb_sync_single_for_cpu(dev, addr, size, dir, pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> extern void swiotlb_print_info(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DMA_RESTRICTED_POOL</div><div class='head'>diff --git a/include/linux/switchtec.h b/include/linux/switchtec.h<br/>index 8d8fac1626bd..cdb58d61c152 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/switchtec.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/switchtec.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/switchtec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/switchtec.h</a></div><div class='hunk'>@@ -521,6 +521,6 @@ static inline struct switchtec_dev *to_stdev(struct device *dev)</div><div class='ctx'> 	return container_of(dev, struct switchtec_dev, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern struct class *switchtec_class;</div><div class='add'>+extern const struct class switchtec_class;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/sync_core.h b/include/linux/sync_core.h<br/>index 013da4b8b327..67bb9794b875 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sync_core.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sync_core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sync_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sync_core.h</a></div><div class='hunk'>@@ -17,5 +17,19 @@ static inline void sync_core_before_usermode(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#endif /* _LINUX_SYNC_CORE_H */</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_PREPARE_SYNC_CORE_CMD</div><div class='add'>+#include &lt;asm/sync_core.h&gt;</div><div class='add'>+#else</div><div class='add'>+/*</div><div class='add'>+ * This is a dummy prepare_sync_core_cmd() implementation that can be used on</div><div class='add'>+ * all architectures which provide unconditional core serializing instructions</div><div class='add'>+ * in switch_mm().</div><div class='add'>+ * If your architecture doesn't provide such core serializing instructions in</div><div class='add'>+ * switch_mm(), you may need to write your own functions.</div><div class='add'>+ */</div><div class='add'>+static inline void prepare_sync_core_cmd(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#endif /* _LINUX_SYNC_CORE_H */</div><div class='head'>diff --git a/include/linux/sys_info.h b/include/linux/sys_info.h<br/>new file mode 100644<br/>index 000000000000..a5bc3ea3d44b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sys_info.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sys_info.h</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_SYS_INFO_H</div><div class='add'>+#define _LINUX_SYS_INFO_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sysctl.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SYS_INFO_PANIC_CONSOLE_REPLAY is for panic case only, as it needs special</div><div class='add'>+ * handling which only fits panic case.</div><div class='add'>+ */</div><div class='add'>+#define SYS_INFO_TASKS			0x00000001</div><div class='add'>+#define SYS_INFO_MEM			0x00000002</div><div class='add'>+#define SYS_INFO_TIMERS			0x00000004</div><div class='add'>+#define SYS_INFO_LOCKS			0x00000008</div><div class='add'>+#define SYS_INFO_FTRACE			0x00000010</div><div class='add'>+#define SYS_INFO_PANIC_CONSOLE_REPLAY	0x00000020</div><div class='add'>+#define SYS_INFO_ALL_BT			0x00000040</div><div class='add'>+#define SYS_INFO_BLOCKED_TASKS		0x00000080</div><div class='add'>+</div><div class='add'>+void sys_info(unsigned long si_mask);</div><div class='add'>+unsigned long sys_info_parse_param(char *str);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SYSCTL</div><div class='add'>+int sysctl_sys_info_handler(const struct ctl_table *ro_table, int write,</div><div class='add'>+					  void *buffer, size_t *lenp,</div><div class='add'>+					  loff_t *ppos);</div><div class='add'>+#endif</div><div class='add'>+#endif	/* _LINUX_SYS_INFO_H */</div><div class='head'>diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h<br/>index 77eb9b0e7685..cf84d98964b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/syscalls.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/syscalls.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/syscalls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/syscalls.h</a></div><div class='hunk'>@@ -77,6 +77,9 @@ struct cachestat_range;</div><div class='ctx'> struct cachestat;</div><div class='ctx'> struct statmount;</div><div class='ctx'> struct mnt_id_req;</div><div class='add'>+struct ns_id_req;</div><div class='add'>+struct xattr_args;</div><div class='add'>+struct file_attr;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/aio_abi.h&gt;</div><div class='hunk'>@@ -322,13 +325,13 @@ asmlinkage long sys_io_pgetevents(aio_context_t ctx_id,</div><div class='ctx'> 				long nr,</div><div class='ctx'> 				struct io_event __user *events,</div><div class='ctx'> 				struct __kernel_timespec __user *timeout,</div><div class='del'>-				const struct __aio_sigset *sig);</div><div class='add'>+				const struct __aio_sigset __user *sig);</div><div class='ctx'> asmlinkage long sys_io_pgetevents_time32(aio_context_t ctx_id,</div><div class='ctx'> 				long min_nr,</div><div class='ctx'> 				long nr,</div><div class='ctx'> 				struct io_event __user *events,</div><div class='ctx'> 				struct old_timespec32 __user *timeout,</div><div class='del'>-				const struct __aio_sigset *sig);</div><div class='add'>+				const struct __aio_sigset __user *sig);</div><div class='ctx'> asmlinkage long sys_io_uring_setup(u32 entries,</div><div class='ctx'> 				struct io_uring_params __user *p);</div><div class='ctx'> asmlinkage long sys_io_uring_enter(unsigned int fd, u32 to_submit,</div><div class='hunk'>@@ -338,26 +341,44 @@ asmlinkage long sys_io_uring_register(unsigned int fd, unsigned int op,</div><div class='ctx'> 				void __user *arg, unsigned int nr_args);</div><div class='ctx'> asmlinkage long sys_setxattr(const char __user *path, const char __user *name,</div><div class='ctx'> 			     const void __user *value, size_t size, int flags);</div><div class='add'>+asmlinkage long sys_setxattrat(int dfd, const char __user *path, unsigned int at_flags,</div><div class='add'>+			       const char __user *name,</div><div class='add'>+			       const struct xattr_args __user *args, size_t size);</div><div class='ctx'> asmlinkage long sys_lsetxattr(const char __user *path, const char __user *name,</div><div class='ctx'> 			      const void __user *value, size_t size, int flags);</div><div class='ctx'> asmlinkage long sys_fsetxattr(int fd, const char __user *name,</div><div class='ctx'> 			      const void __user *value, size_t size, int flags);</div><div class='ctx'> asmlinkage long sys_getxattr(const char __user *path, const char __user *name,</div><div class='ctx'> 			     void __user *value, size_t size);</div><div class='add'>+asmlinkage long sys_getxattrat(int dfd, const char __user *path, unsigned int at_flags,</div><div class='add'>+			       const char __user *name,</div><div class='add'>+			       struct xattr_args __user *args, size_t size);</div><div class='ctx'> asmlinkage long sys_lgetxattr(const char __user *path, const char __user *name,</div><div class='ctx'> 			      void __user *value, size_t size);</div><div class='ctx'> asmlinkage long sys_fgetxattr(int fd, const char __user *name,</div><div class='ctx'> 			      void __user *value, size_t size);</div><div class='ctx'> asmlinkage long sys_listxattr(const char __user *path, char __user *list,</div><div class='ctx'> 			      size_t size);</div><div class='add'>+asmlinkage long sys_listxattrat(int dfd, const char __user *path,</div><div class='add'>+				unsigned int at_flags,</div><div class='add'>+				char __user *list, size_t size);</div><div class='ctx'> asmlinkage long sys_llistxattr(const char __user *path, char __user *list,</div><div class='ctx'> 			       size_t size);</div><div class='ctx'> asmlinkage long sys_flistxattr(int fd, char __user *list, size_t size);</div><div class='ctx'> asmlinkage long sys_removexattr(const char __user *path,</div><div class='ctx'> 				const char __user *name);</div><div class='add'>+asmlinkage long sys_removexattrat(int dfd, const char __user *path,</div><div class='add'>+				  unsigned int at_flags,</div><div class='add'>+				  const char __user *name);</div><div class='ctx'> asmlinkage long sys_lremovexattr(const char __user *path,</div><div class='ctx'> 				 const char __user *name);</div><div class='ctx'> asmlinkage long sys_fremovexattr(int fd, const char __user *name);</div><div class='add'>+asmlinkage long sys_file_getattr(int dfd, const char __user *filename,</div><div class='add'>+				 struct file_attr __user *attr, size_t usize,</div><div class='add'>+				 unsigned int at_flags);</div><div class='add'>+asmlinkage long sys_file_setattr(int dfd, const char __user *filename,</div><div class='add'>+				 struct file_attr __user *attr, size_t usize,</div><div class='add'>+				 unsigned int at_flags);</div><div class='ctx'> asmlinkage long sys_getcwd(char __user *buf, unsigned long size);</div><div class='ctx'> asmlinkage long sys_eventfd2(unsigned int count, int flags);</div><div class='ctx'> asmlinkage long sys_epoll_create1(int flags);</div><div class='hunk'>@@ -417,8 +438,11 @@ asmlinkage long sys_statmount(const struct mnt_id_req __user *req,</div><div class='ctx'> asmlinkage long sys_listmount(const struct mnt_id_req __user *req,</div><div class='ctx'> 			      u64 __user *mnt_ids, size_t nr_mnt_ids,</div><div class='ctx'> 			      unsigned int flags);</div><div class='add'>+asmlinkage long sys_listns(const struct ns_id_req __user *req,</div><div class='add'>+			   u64 __user *ns_ids, size_t nr_ns_ids,</div><div class='add'>+			   unsigned int flags);</div><div class='ctx'> asmlinkage long sys_truncate(const char __user *path, long length);</div><div class='del'>-asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);</div><div class='add'>+asmlinkage long sys_ftruncate(unsigned int fd, off_t length);</div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='ctx'> asmlinkage long sys_truncate64(const char __user *path, loff_t length);</div><div class='ctx'> asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length);</div><div class='hunk'>@@ -441,7 +465,7 @@ asmlinkage long sys_fchown(unsigned int fd, uid_t user, gid_t group);</div><div class='ctx'> asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,</div><div class='ctx'> 			   umode_t mode);</div><div class='ctx'> asmlinkage long sys_openat2(int dfd, const char __user *filename,</div><div class='del'>-			    struct open_how *how, size_t size);</div><div class='add'>+			    struct open_how __user *how, size_t size);</div><div class='ctx'> asmlinkage long sys_close(unsigned int fd);</div><div class='ctx'> asmlinkage long sys_close_range(unsigned int fd, unsigned int max_fd,</div><div class='ctx'> 				unsigned int flags);</div><div class='hunk'>@@ -555,7 +579,7 @@ asmlinkage long sys_get_robust_list(int pid,</div><div class='ctx'> asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,</div><div class='ctx'> 				    size_t len);</div><div class='ctx'> </div><div class='del'>-asmlinkage long sys_futex_waitv(struct futex_waitv *waiters,</div><div class='add'>+asmlinkage long sys_futex_waitv(struct futex_waitv __user *waiters,</div><div class='ctx'> 				unsigned int nr_futexes, unsigned int flags,</div><div class='ctx'> 				struct __kernel_timespec __user *timeout, clockid_t clockid);</div><div class='ctx'> </div><div class='hunk'>@@ -821,6 +845,7 @@ asmlinkage long sys_process_mrelease(int pidfd, unsigned int flags);</div><div class='ctx'> asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,</div><div class='ctx'> 			unsigned long prot, unsigned long pgoff,</div><div class='ctx'> 			unsigned long flags);</div><div class='add'>+asmlinkage long sys_mseal(unsigned long start, size_t len, unsigned long flags);</div><div class='ctx'> asmlinkage long sys_mbind(unsigned long start, unsigned long len,</div><div class='ctx'> 				unsigned long mode,</div><div class='ctx'> 				const unsigned long __user *nmask,</div><div class='hunk'>@@ -858,12 +883,18 @@ asmlinkage long sys_prlimit64(pid_t pid, unsigned int resource,</div><div class='ctx'> 				const struct rlimit64 __user *new_rlim,</div><div class='ctx'> 				struct rlimit64 __user *old_rlim);</div><div class='ctx'> asmlinkage long sys_fanotify_init(unsigned int flags, unsigned int event_f_flags);</div><div class='add'>+#if defined(CONFIG_ARCH_SPLIT_ARG64)</div><div class='add'>+asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags,</div><div class='add'>+                                unsigned int mask_1, unsigned int mask_2,</div><div class='add'>+				int dfd, const char  __user * pathname);</div><div class='add'>+#else</div><div class='ctx'> asmlinkage long sys_fanotify_mark(int fanotify_fd, unsigned int flags,</div><div class='ctx'> 				  u64 mask, int fd,</div><div class='ctx'> 				  const char  __user *pathname);</div><div class='add'>+#endif</div><div class='ctx'> asmlinkage long sys_name_to_handle_at(int dfd, const char __user *name,</div><div class='ctx'> 				      struct file_handle __user *handle,</div><div class='del'>-				      int __user *mnt_id, int flag);</div><div class='add'>+				      void __user *mnt_id, int flag);</div><div class='ctx'> asmlinkage long sys_open_by_handle_at(int mountdirfd,</div><div class='ctx'> 				      struct file_handle __user *handle,</div><div class='ctx'> 				      int flags);</div><div class='hunk'>@@ -906,7 +937,7 @@ asmlinkage long sys_seccomp(unsigned int op, unsigned int flags,</div><div class='ctx'> asmlinkage long sys_getrandom(char __user *buf, size_t count,</div><div class='ctx'> 			      unsigned int flags);</div><div class='ctx'> asmlinkage long sys_memfd_create(const char __user *uname_ptr, unsigned int flags);</div><div class='del'>-asmlinkage long sys_bpf(int cmd, union bpf_attr *attr, unsigned int size);</div><div class='add'>+asmlinkage long sys_bpf(int cmd, union bpf_attr __user *attr, unsigned int size);</div><div class='ctx'> asmlinkage long sys_execveat(int dfd, const char __user *filename,</div><div class='ctx'> 			const char __user *const __user *argv,</div><div class='ctx'> 			const char __user *const __user *envp, int flags);</div><div class='hunk'>@@ -931,6 +962,10 @@ asmlinkage long sys_statx(int dfd, const char __user *path, unsigned flags,</div><div class='ctx'> asmlinkage long sys_rseq(struct rseq __user *rseq, uint32_t rseq_len,</div><div class='ctx'> 			 int flags, uint32_t sig);</div><div class='ctx'> asmlinkage long sys_open_tree(int dfd, const char __user *path, unsigned flags);</div><div class='add'>+asmlinkage long sys_open_tree_attr(int dfd, const char __user *path,</div><div class='add'>+				   unsigned flags,</div><div class='add'>+				   struct mount_attr __user *uattr,</div><div class='add'>+				   size_t usize);</div><div class='ctx'> asmlinkage long sys_move_mount(int from_dfd, const char __user *from_path,</div><div class='ctx'> 			       int to_dfd, const char __user *to_path,</div><div class='ctx'> 			       unsigned int ms_flags);</div><div class='hunk'>@@ -959,11 +994,11 @@ asmlinkage long sys_cachestat(unsigned int fd,</div><div class='ctx'> 		struct cachestat_range __user *cstat_range,</div><div class='ctx'> 		struct cachestat __user *cstat, unsigned int flags);</div><div class='ctx'> asmlinkage long sys_map_shadow_stack(unsigned long addr, unsigned long size, unsigned int flags);</div><div class='del'>-asmlinkage long sys_lsm_get_self_attr(unsigned int attr, struct lsm_ctx *ctx,</div><div class='del'>-				      size_t *size, __u32 flags);</div><div class='del'>-asmlinkage long sys_lsm_set_self_attr(unsigned int attr, struct lsm_ctx *ctx,</div><div class='del'>-				      size_t size, __u32 flags);</div><div class='del'>-asmlinkage long sys_lsm_list_modules(u64 *ids, size_t *size, u32 flags);</div><div class='add'>+asmlinkage long sys_lsm_get_self_attr(unsigned int attr, struct lsm_ctx __user *ctx,</div><div class='add'>+				      u32 __user *size, u32 flags);</div><div class='add'>+asmlinkage long sys_lsm_set_self_attr(unsigned int attr, struct lsm_ctx __user *ctx,</div><div class='add'>+				      u32 size, u32 flags);</div><div class='add'>+asmlinkage long sys_lsm_list_modules(u64 __user *ids, u32 __user *size, u32 flags);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Architecture-specific system calls</div><div class='hunk'>@@ -972,6 +1007,10 @@ asmlinkage long sys_lsm_list_modules(u64 *ids, size_t *size, u32 flags);</div><div class='ctx'> /* x86 */</div><div class='ctx'> asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);</div><div class='ctx'> </div><div class='add'>+asmlinkage long sys_uretprobe(void);</div><div class='add'>+</div><div class='add'>+asmlinkage long sys_uprobe(void);</div><div class='add'>+</div><div class='ctx'> /* pciconfig: alpha, arm, arm64, ia64, sparc */</div><div class='ctx'> asmlinkage long sys_pciconfig_read(unsigned long bus, unsigned long dfn,</div><div class='ctx'> 				unsigned long off, unsigned long len,</div><div class='hunk'>@@ -1244,14 +1283,14 @@ static inline long ksys_lchown(const char __user *filename, uid_t user,</div><div class='ctx'> 			     AT_SYMLINK_NOFOLLOW);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern long do_sys_ftruncate(unsigned int fd, loff_t length, int small);</div><div class='add'>+int do_sys_ftruncate(unsigned int fd, loff_t length, int small);</div><div class='ctx'> </div><div class='ctx'> static inline long ksys_ftruncate(unsigned int fd, loff_t length)</div><div class='ctx'> {</div><div class='ctx'> 	return do_sys_ftruncate(fd, length, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern long do_sys_truncate(const char __user *pathname, loff_t length);</div><div class='add'>+int do_sys_truncate(const char __user *pathname, loff_t length);</div><div class='ctx'> </div><div class='ctx'> static inline long ksys_truncate(const char __user *pathname, loff_t length)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h<br/>index ae4d48e4c970..ac6d71be5c38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/syscore_ops.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/syscore_ops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/syscore_ops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/syscore_ops.h</a></div><div class='hunk'>@@ -11,14 +11,19 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct syscore_ops {</div><div class='add'>+	int (*suspend)(void *data);</div><div class='add'>+	void (*resume)(void *data);</div><div class='add'>+	void (*shutdown)(void *data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct syscore {</div><div class='ctx'> 	struct list_head node;</div><div class='del'>-	int (*suspend)(void);</div><div class='del'>-	void (*resume)(void);</div><div class='del'>-	void (*shutdown)(void);</div><div class='add'>+	const struct syscore_ops *ops;</div><div class='add'>+	void *data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void register_syscore_ops(struct syscore_ops *ops);</div><div class='del'>-extern void unregister_syscore_ops(struct syscore_ops *ops);</div><div class='add'>+extern void register_syscore(struct syscore *syscore);</div><div class='add'>+extern void unregister_syscore(struct syscore *syscore);</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> extern int syscore_suspend(void);</div><div class='ctx'> extern void syscore_resume(void);</div><div class='head'>diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h<br/>index ee7d33b89e9e..288fe0055cd5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sysctl.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sysctl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sysctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sysctl.h</a></div><div class='hunk'>@@ -59,40 +59,158 @@ extern const int sysctl_vals[];</div><div class='ctx'> #define SYSCTL_LONG_ONE		((void *)&amp;sysctl_long_vals[1])</div><div class='ctx'> #define SYSCTL_LONG_MAX		((void *)&amp;sysctl_long_vals[2])</div><div class='ctx'> </div><div class='add'>+#define SYSCTL_CONV_IDENTITY(val) (val)</div><div class='add'>+/**</div><div class='add'>+ *</div><div class='add'>+ * "dir" originates from read_iter (dir = 0) or write_iter (dir = 1)</div><div class='add'>+ * in the file_operations struct at proc/proc_sysctl.c. Its value means</div><div class='add'>+ * one of two things for sysctl:</div><div class='add'>+ * 1. SYSCTL_USER_TO_KERN(dir) Writing to an internal kernel variable from user</div><div class='add'>+ *                             space (dir &gt; 0)</div><div class='add'>+ * 2. SYSCTL_KERN_TO_USER(dir) Writing to a user space buffer from a kernel</div><div class='add'>+ *                             variable (dir == 0).</div><div class='add'>+ */</div><div class='add'>+#define SYSCTL_USER_TO_KERN(dir) (!!(dir))</div><div class='add'>+#define SYSCTL_KERN_TO_USER(dir) (!dir)</div><div class='add'>+</div><div class='add'>+#define SYSCTL_USER_TO_KERN_INT_CONV(name, u_ptr_op)		\</div><div class='add'>+int sysctl_user_to_kern_int_conv##name(const bool *negp,	\</div><div class='add'>+				       const unsigned long *u_ptr,\</div><div class='add'>+				       int *k_ptr)		\</div><div class='add'>+{								\</div><div class='add'>+	unsigned long u = u_ptr_op(*u_ptr);			\</div><div class='add'>+	if (*negp) {						\</div><div class='add'>+		if (u &gt; (unsigned long) INT_MAX + 1)		\</div><div class='add'>+			return -EINVAL;				\</div><div class='add'>+		WRITE_ONCE(*k_ptr, -u);				\</div><div class='add'>+	} else {						\</div><div class='add'>+		if (u &gt; (unsigned long) INT_MAX)		\</div><div class='add'>+			return -EINVAL;				\</div><div class='add'>+		WRITE_ONCE(*k_ptr, u);				\</div><div class='add'>+	}							\</div><div class='add'>+	return 0;						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SYSCTL_KERN_TO_USER_INT_CONV(name, k_ptr_op)		\</div><div class='add'>+int sysctl_kern_to_user_int_conv##name(bool *negp,		\</div><div class='add'>+				       unsigned long *u_ptr,	\</div><div class='add'>+				       const int *k_ptr)	\</div><div class='add'>+{								\</div><div class='add'>+	int val = READ_ONCE(*k_ptr);				\</div><div class='add'>+	if (val &lt; 0) {						\</div><div class='add'>+		*negp = true;					\</div><div class='add'>+		*u_ptr = -k_ptr_op((unsigned long)val);		\</div><div class='add'>+	} else {						\</div><div class='add'>+		*negp = false;					\</div><div class='add'>+		*u_ptr = k_ptr_op((unsigned long)val);		\</div><div class='add'>+	}							\</div><div class='add'>+	return 0;						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * To range check on a converted value, use a temp k_ptr</div><div class='add'>+ * When checking range, value should be within (tbl-&gt;extra1, tbl-&gt;extra2)</div><div class='add'>+ */</div><div class='add'>+#define SYSCTL_INT_CONV_CUSTOM(name, user_to_kern, kern_to_user,	\</div><div class='add'>+			       k_ptr_range_check)			\</div><div class='add'>+int do_proc_int_conv##name(bool *negp, unsigned long *u_ptr, int *k_ptr,\</div><div class='add'>+			   int dir, const struct ctl_table *tbl)	\</div><div class='add'>+{									\</div><div class='add'>+	if (SYSCTL_KERN_TO_USER(dir))					\</div><div class='add'>+		return kern_to_user(negp, u_ptr, k_ptr);		\</div><div class='add'>+									\</div><div class='add'>+	if (k_ptr_range_check) {					\</div><div class='add'>+		int tmp_k, ret;						\</div><div class='add'>+		if (!tbl)						\</div><div class='add'>+			return -EINVAL;					\</div><div class='add'>+		ret = user_to_kern(negp, u_ptr, &amp;tmp_k);		\</div><div class='add'>+		if (ret)						\</div><div class='add'>+			return ret;					\</div><div class='add'>+		if ((tbl-&gt;extra1 &amp;&amp; *(int *)tbl-&gt;extra1 &gt; tmp_k) ||	\</div><div class='add'>+		    (tbl-&gt;extra2 &amp;&amp; *(int *)tbl-&gt;extra2 &lt; tmp_k))	\</div><div class='add'>+			return -EINVAL;					\</div><div class='add'>+		WRITE_ONCE(*k_ptr, tmp_k);				\</div><div class='add'>+	} else								\</div><div class='add'>+		return user_to_kern(negp, u_ptr, k_ptr);		\</div><div class='add'>+	return 0;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SYSCTL_USER_TO_KERN_UINT_CONV(name, u_ptr_op)		\</div><div class='add'>+int sysctl_user_to_kern_uint_conv##name(const unsigned long *u_ptr,\</div><div class='add'>+					unsigned int *k_ptr)	\</div><div class='add'>+{								\</div><div class='add'>+	unsigned long u = u_ptr_op(*u_ptr);			\</div><div class='add'>+	if (u &gt; UINT_MAX)					\</div><div class='add'>+		return -EINVAL;					\</div><div class='add'>+	WRITE_ONCE(*k_ptr, u);					\</div><div class='add'>+	return 0;						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SYSCTL_UINT_CONV_CUSTOM(name, user_to_kern, kern_to_user,	\</div><div class='add'>+				k_ptr_range_check)			\</div><div class='add'>+int do_proc_uint_conv##name(unsigned long *u_ptr, unsigned int *k_ptr,	\</div><div class='add'>+			   int dir, const struct ctl_table *tbl)	\</div><div class='add'>+{									\</div><div class='add'>+	if (SYSCTL_KERN_TO_USER(dir))					\</div><div class='add'>+		return kern_to_user(u_ptr, k_ptr);			\</div><div class='add'>+									\</div><div class='add'>+	if (k_ptr_range_check) {					\</div><div class='add'>+		unsigned int tmp_k;					\</div><div class='add'>+		int ret;						\</div><div class='add'>+		if (!tbl)						\</div><div class='add'>+			return -EINVAL;					\</div><div class='add'>+		ret = user_to_kern(u_ptr, &amp;tmp_k);			\</div><div class='add'>+		if (ret)						\</div><div class='add'>+			return ret;					\</div><div class='add'>+		if ((tbl-&gt;extra1 &amp;&amp;					\</div><div class='add'>+		     *(unsigned int *)tbl-&gt;extra1 &gt; tmp_k) ||		\</div><div class='add'>+		    (tbl-&gt;extra2 &amp;&amp;					\</div><div class='add'>+		     *(unsigned int *)tbl-&gt;extra2 &lt; tmp_k))		\</div><div class='add'>+			return -ERANGE;					\</div><div class='add'>+		WRITE_ONCE(*k_ptr, tmp_k);				\</div><div class='add'>+	} else								\</div><div class='add'>+		return user_to_kern(u_ptr, k_ptr);			\</div><div class='add'>+	return 0;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> extern const unsigned long sysctl_long_vals[];</div><div class='ctx'> </div><div class='del'>-typedef int proc_handler(struct ctl_table *ctl, int write, void *buffer,</div><div class='add'>+typedef int proc_handler(const struct ctl_table *ctl, int write, void *buffer,</div><div class='ctx'> 		size_t *lenp, loff_t *ppos);</div><div class='ctx'> </div><div class='del'>-int proc_dostring(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-int proc_dobool(struct ctl_table *table, int write, void *buffer,</div><div class='add'>+int proc_dostring(const struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='add'>+int proc_dobool(const struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 		size_t *lenp, loff_t *ppos);</div><div class='del'>-int proc_dointvec(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-int proc_douintvec(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-int proc_dointvec_minmax(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-int proc_douintvec_minmax(struct ctl_table *table, int write, void *buffer,</div><div class='add'>+int proc_dointvec(const struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='add'>+int proc_dointvec_minmax(const struct ctl_table *table, int dir, void *buffer,</div><div class='add'>+			 size_t *lenp, loff_t *ppos);</div><div class='add'>+int proc_dointvec_conv(const struct ctl_table *table, int dir, void *buffer,</div><div class='add'>+		       size_t *lenp, loff_t *ppos,</div><div class='add'>+		       int (*conv)(bool *negp, unsigned long *u_ptr, int *k_ptr,</div><div class='add'>+				   int dir, const struct ctl_table *table));</div><div class='add'>+int proc_douintvec(const struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='add'>+int proc_douintvec_minmax(const struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 		size_t *lenp, loff_t *ppos);</div><div class='del'>-int proc_dou8vec_minmax(struct ctl_table *table, int write, void *buffer,</div><div class='add'>+int proc_douintvec_conv(const struct ctl_table *table, int write, void *buffer,</div><div class='add'>+			size_t *lenp, loff_t *ppos,</div><div class='add'>+			int (*conv)(unsigned long *lvalp, unsigned int *valp,</div><div class='add'>+				    int write, const struct ctl_table *table));</div><div class='add'>+</div><div class='add'>+int proc_dou8vec_minmax(const struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 			size_t *lenp, loff_t *ppos);</div><div class='del'>-int proc_dointvec_jiffies(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-int proc_dointvec_ms_jiffies_minmax(struct ctl_table *table, int write,</div><div class='del'>-		void *buffer, size_t *lenp, loff_t *ppos);</div><div class='del'>-int proc_dointvec_userhz_jiffies(struct ctl_table *, int, void *, size_t *,</div><div class='del'>-		loff_t *);</div><div class='del'>-int proc_dointvec_ms_jiffies(struct ctl_table *, int, void *, size_t *,</div><div class='del'>-		loff_t *);</div><div class='del'>-int proc_doulongvec_minmax(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int, void *,</div><div class='del'>-		size_t *, loff_t *);</div><div class='del'>-int proc_do_large_bitmap(struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='del'>-int proc_do_static_key(struct ctl_table *table, int write, void *buffer,</div><div class='add'>+int proc_doulongvec_minmax(const struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='add'>+int proc_doulongvec_minmax_conv(const struct ctl_table *table, int dir,</div><div class='add'>+				void *buffer, size_t *lenp, loff_t *ppos,</div><div class='add'>+				unsigned long convmul, unsigned long convdiv);</div><div class='add'>+int proc_do_large_bitmap(const struct ctl_table *, int, void *, size_t *, loff_t *);</div><div class='add'>+int proc_do_static_key(const struct ctl_table *table, int write, void *buffer,</div><div class='ctx'> 		size_t *lenp, loff_t *ppos);</div><div class='add'>+int sysctl_kern_to_user_uint_conv(unsigned long *u_ptr, const unsigned int *k_ptr);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Register a set of sysctl names by calling register_sysctl</div><div class='del'>- * with an initialised array of struct ctl_table's.  An entry with </div><div class='del'>- * NULL procname terminates the table.  table-&gt;de will be</div><div class='del'>- * set up by the registration and need not be initialised in advance.</div><div class='add'>+ * with an initialised array of struct ctl_table's.</div><div class='ctx'>  *</div><div class='ctx'>  * sysctl names can be mirrored automatically under /proc/sys.  The</div><div class='ctx'>  * procname supplied controls /proc naming.</div><div class='hunk'>@@ -133,21 +251,10 @@ static inline void *proc_sys_poll_event(struct ctl_table_poll *poll)</div><div class='ctx'> </div><div class='ctx'> /* A sysctl table is an array of struct ctl_table: */</div><div class='ctx'> struct ctl_table {</div><div class='del'>-	const char *procname;		/* Text ID for /proc/sys, or zero */</div><div class='add'>+	const char *procname;		/* Text ID for /proc/sys */</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	int maxlen;</div><div class='ctx'> 	umode_t mode;</div><div class='del'>-	/**</div><div class='del'>-	 * enum type - Enumeration to differentiate between ctl target types</div><div class='del'>-	 * @SYSCTL_TABLE_TYPE_DEFAULT: ctl target with no special considerations</div><div class='del'>-	 * @SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY: Used to identify a permanently</div><div class='del'>-	 *                                       empty directory target to serve</div><div class='del'>-	 *                                       as mount point.</div><div class='del'>-	 */</div><div class='del'>-	enum {</div><div class='del'>-		SYSCTL_TABLE_TYPE_DEFAULT,</div><div class='del'>-		SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY</div><div class='del'>-	} type;</div><div class='ctx'> 	proc_handler *proc_handler;	/* Callback for text formatting */</div><div class='ctx'> 	struct ctl_table_poll *poll;</div><div class='ctx'> 	void *extra1;</div><div class='hunk'>@@ -169,11 +276,15 @@ struct ctl_node {</div><div class='ctx'>  * @nreg: When nreg drops to 0 the ctl_table_header will be unregistered.</div><div class='ctx'>  * @rcu: Delays the freeing of the inode. Introduced with "unfuck proc_sysctl -&gt;d_compare()"</div><div class='ctx'>  *</div><div class='add'>+ * @type: Enumeration to differentiate between ctl target types</div><div class='add'>+ * @type.SYSCTL_TABLE_TYPE_DEFAULT: ctl target with no special considerations</div><div class='add'>+ * @type.SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY: Identifies a permanently empty dir</div><div class='add'>+ *                                            target to serve as a mount point</div><div class='ctx'>  */</div><div class='ctx'> struct ctl_table_header {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='del'>-			struct ctl_table *ctl_table;</div><div class='add'>+			const struct ctl_table *ctl_table;</div><div class='ctx'> 			int ctl_table_size;</div><div class='ctx'> 			int used;</div><div class='ctx'> 			int count;</div><div class='hunk'>@@ -182,12 +293,16 @@ struct ctl_table_header {</div><div class='ctx'> 		struct rcu_head rcu;</div><div class='ctx'> 	};</div><div class='ctx'> 	struct completion *unregistering;</div><div class='del'>-	struct ctl_table *ctl_table_arg;</div><div class='add'>+	const struct ctl_table *ctl_table_arg;</div><div class='ctx'> 	struct ctl_table_root *root;</div><div class='ctx'> 	struct ctl_table_set *set;</div><div class='ctx'> 	struct ctl_dir *parent;</div><div class='ctx'> 	struct ctl_node *node;</div><div class='ctx'> 	struct hlist_head inodes; /* head for proc_inode-&gt;sysctl_inodes */</div><div class='add'>+	enum {</div><div class='add'>+		SYSCTL_TABLE_TYPE_DEFAULT,</div><div class='add'>+		SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY,</div><div class='add'>+	} type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ctl_dir {</div><div class='hunk'>@@ -205,9 +320,8 @@ struct ctl_table_root {</div><div class='ctx'> 	struct ctl_table_set default_set;</div><div class='ctx'> 	struct ctl_table_set *(*lookup)(struct ctl_table_root *root);</div><div class='ctx'> 	void (*set_ownership)(struct ctl_table_header *head,</div><div class='del'>-			      struct ctl_table *table,</div><div class='ctx'> 			      kuid_t *uid, kgid_t *gid);</div><div class='del'>-	int (*permissions)(struct ctl_table_header *head, struct ctl_table *table);</div><div class='add'>+	int (*permissions)(struct ctl_table_header *head, const struct ctl_table *table);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define register_sysctl(path, table)	\</div><div class='hunk'>@@ -224,13 +338,13 @@ extern void retire_sysctl_set(struct ctl_table_set *set);</div><div class='ctx'> </div><div class='ctx'> struct ctl_table_header *__register_sysctl_table(</div><div class='ctx'> 	struct ctl_table_set *set,</div><div class='del'>-	const char *path, struct ctl_table *table, size_t table_size);</div><div class='del'>-struct ctl_table_header *register_sysctl_sz(const char *path, struct ctl_table *table,</div><div class='add'>+	const char *path, const struct ctl_table *table, size_t table_size);</div><div class='add'>+struct ctl_table_header *register_sysctl_sz(const char *path, const struct ctl_table *table,</div><div class='ctx'> 					    size_t table_size);</div><div class='ctx'> void unregister_sysctl_table(struct ctl_table_header * table);</div><div class='ctx'> </div><div class='ctx'> extern int sysctl_init_bases(void);</div><div class='del'>-extern void __register_sysctl_init(const char *path, struct ctl_table *table,</div><div class='add'>+extern void __register_sysctl_init(const char *path, const struct ctl_table *table,</div><div class='ctx'> 				 const char *table_name, size_t table_size);</div><div class='ctx'> #define register_sysctl_init(path, table)	\</div><div class='ctx'> 	__register_sysctl_init(path, table, #table, ARRAY_SIZE(table))</div><div class='hunk'>@@ -238,21 +352,13 @@ extern struct ctl_table_header *register_sysctl_mount_point(const char *path);</div><div class='ctx'> </div><div class='ctx'> void do_sysctl_args(void);</div><div class='ctx'> bool sysctl_is_alias(char *param);</div><div class='del'>-int do_proc_douintvec(struct ctl_table *table, int write,</div><div class='del'>-		      void *buffer, size_t *lenp, loff_t *ppos,</div><div class='del'>-		      int (*conv)(unsigned long *lvalp,</div><div class='del'>-				  unsigned int *valp,</div><div class='del'>-				  int write, void *data),</div><div class='del'>-		      void *data);</div><div class='del'>-</div><div class='del'>-extern int pwrsw_enabled;</div><div class='add'>+</div><div class='ctx'> extern int unaligned_enabled;</div><div class='del'>-extern int unaligned_dump_stack;</div><div class='ctx'> extern int no_unaligned_warning;</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_SYSCTL */</div><div class='ctx'> </div><div class='del'>-static inline void register_sysctl_init(const char *path, struct ctl_table *table)</div><div class='add'>+static inline void register_sysctl_init(const char *path, const struct ctl_table *table)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -262,7 +368,7 @@ static inline struct ctl_table_header *register_sysctl_mount_point(const char *p</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct ctl_table_header *register_sysctl_sz(const char *path,</div><div class='del'>-							  struct ctl_table *table,</div><div class='add'>+							  const struct ctl_table *table,</div><div class='ctx'> 							  size_t table_size)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -288,7 +394,4 @@ static inline bool sysctl_is_alias(char *param)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SYSCTL */</div><div class='ctx'> </div><div class='del'>-int sysctl_max_threads(struct ctl_table *table, int write, void *buffer,</div><div class='del'>-		size_t *lenp, loff_t *ppos);</div><div class='del'>-</div><div class='ctx'> #endif /* _LINUX_SYSCTL_H */</div><div class='head'>diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h<br/>index 19cb803dd5ec..b449665c686a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sysfb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sysfb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sysfb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sysfb.h</a></div><div class='hunk'>@@ -7,9 +7,13 @@</div><div class='ctx'>  * Copyright (c) 2012-2013 David Herrmann &lt;dh.herrmann@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/platform_data/simplefb.h&gt;</div><div class='ctx'> </div><div class='add'>+struct device;</div><div class='add'>+struct platform_device;</div><div class='ctx'> struct screen_info;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -58,12 +62,19 @@ struct efifb_dmi_info {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSFB</div><div class='ctx'> </div><div class='del'>-void sysfb_disable(void);</div><div class='add'>+void sysfb_disable(struct device *dev);</div><div class='add'>+</div><div class='add'>+bool sysfb_handles_screen_info(void);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_SYSFB */</div><div class='ctx'> </div><div class='del'>-static inline void sysfb_disable(void)</div><div class='add'>+static inline void sysfb_disable(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool sysfb_handles_screen_info(void)</div><div class='ctx'> {</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SYSFB */</div><div class='hunk'>@@ -91,7 +102,8 @@ static inline void sysfb_set_efifb_fwnode(struct platform_device *pd)</div><div class='ctx'> bool sysfb_parse_mode(const struct screen_info *si,</div><div class='ctx'> 		      struct simplefb_platform_data *mode);</div><div class='ctx'> struct platform_device *sysfb_create_simplefb(const struct screen_info *si,</div><div class='del'>-					      const struct simplefb_platform_data *mode);</div><div class='add'>+					      const struct simplefb_platform_data *mode,</div><div class='add'>+					      struct device *parent);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_SYSFB_SIMPLE */</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +114,8 @@ static inline bool sysfb_parse_mode(const struct screen_info *si,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct platform_device *sysfb_create_simplefb(const struct screen_info *si,</div><div class='del'>-							    const struct simplefb_platform_data *mode)</div><div class='add'>+							    const struct simplefb_platform_data *mode,</div><div class='add'>+							    struct device *parent)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-EINVAL);</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h<br/>index b717a70219f6..c33a96b7391a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sysfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sysfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/sysfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/sysfs.h</a></div><div class='hunk'>@@ -58,46 +58,185 @@ do {							\</div><div class='ctx'> #define sysfs_attr_init(attr) do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CFI</div><div class='add'>+#define __SYSFS_FUNCTION_ALTERNATIVE(MEMBERS...) struct { MEMBERS }</div><div class='add'>+#else</div><div class='add'>+#define __SYSFS_FUNCTION_ALTERNATIVE(MEMBERS...) union { MEMBERS }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct attribute_group - data structure used to declare an attribute group.</div><div class='ctx'>  * @name:	Optional: Attribute group name</div><div class='del'>- *		If specified, the attribute group will be created in</div><div class='del'>- *		a new subdirectory with this name.</div><div class='add'>+ *		If specified, the attribute group will be created in a</div><div class='add'>+ *		new subdirectory with this name. Additionally when a</div><div class='add'>+ *		group is named, @is_visible and @is_bin_visible may</div><div class='add'>+ *		return SYSFS_GROUP_INVISIBLE to control visibility of</div><div class='add'>+ *		the directory itself.</div><div class='ctx'>  * @is_visible:	Optional: Function to return permissions associated with an</div><div class='del'>- *		attribute of the group. Will be called repeatedly for each</div><div class='del'>- *		non-binary attribute in the group. Only read/write</div><div class='add'>+ *		attribute of the group. Will be called repeatedly for</div><div class='add'>+ *		each non-binary attribute in the group. Only read/write</div><div class='ctx'>  *		permissions as well as SYSFS_PREALLOC are accepted. Must</div><div class='del'>- *		return 0 if an attribute is not visible. The returned value</div><div class='del'>- *		will replace static permissions defined in struct attribute.</div><div class='add'>+ *		return 0 if an attribute is not visible. The returned</div><div class='add'>+ *		value will replace static permissions defined in struct</div><div class='add'>+ *		attribute. Use SYSFS_GROUP_VISIBLE() when assigning this</div><div class='add'>+ *		callback to specify separate _group_visible() and</div><div class='add'>+ *		_attr_visible() handlers.</div><div class='ctx'>  * @is_bin_visible:</div><div class='ctx'>  *		Optional: Function to return permissions associated with a</div><div class='ctx'>  *		binary attribute of the group. Will be called repeatedly</div><div class='ctx'>  *		for each binary attribute in the group. Only read/write</div><div class='del'>- *		permissions as well as SYSFS_PREALLOC are accepted. Must</div><div class='del'>- *		return 0 if a binary attribute is not visible. The returned</div><div class='del'>- *		value will replace static permissions defined in</div><div class='del'>- *		struct bin_attribute.</div><div class='add'>+ *		permissions as well as SYSFS_PREALLOC (and the</div><div class='add'>+ *		visibility flags for named groups) are accepted. Must</div><div class='add'>+ *		return 0 if a binary attribute is not visible. The</div><div class='add'>+ *		returned value will replace static permissions defined</div><div class='add'>+ *		in struct bin_attribute. If @is_visible is not set, Use</div><div class='add'>+ *		SYSFS_GROUP_VISIBLE() when assigning this callback to</div><div class='add'>+ *		specify separate _group_visible() and _attr_visible()</div><div class='add'>+ *		handlers.</div><div class='add'>+ * @bin_size:</div><div class='add'>+ *		Optional: Function to return the size of a binary attribute</div><div class='add'>+ *		of the group. Will be called repeatedly for each binary</div><div class='add'>+ *		attribute in the group. Overwrites the size field embedded</div><div class='add'>+ *		inside the attribute itself.</div><div class='ctx'>  * @attrs:	Pointer to NULL terminated list of attributes.</div><div class='ctx'>  * @bin_attrs:	Pointer to NULL terminated list of binary attributes.</div><div class='ctx'>  *		Either attrs or bin_attrs or both must be provided.</div><div class='ctx'>  */</div><div class='ctx'> struct attribute_group {</div><div class='ctx'> 	const char		*name;</div><div class='del'>-	umode_t			(*is_visible)(struct kobject *,</div><div class='del'>-					      struct attribute *, int);</div><div class='add'>+	__SYSFS_FUNCTION_ALTERNATIVE(</div><div class='add'>+		umode_t			(*is_visible)(struct kobject *,</div><div class='add'>+						      struct attribute *, int);</div><div class='add'>+		umode_t			(*is_visible_const)(struct kobject *,</div><div class='add'>+							    const struct attribute *, int);</div><div class='add'>+	);</div><div class='ctx'> 	umode_t			(*is_bin_visible)(struct kobject *,</div><div class='del'>-						  struct bin_attribute *, int);</div><div class='del'>-	struct attribute	**attrs;</div><div class='del'>-	struct bin_attribute	**bin_attrs;</div><div class='add'>+						  const struct bin_attribute *, int);</div><div class='add'>+	size_t			(*bin_size)(struct kobject *,</div><div class='add'>+					    const struct bin_attribute *,</div><div class='add'>+					    int);</div><div class='add'>+	union {</div><div class='add'>+		struct attribute	**attrs;</div><div class='add'>+		const struct attribute	*const *attrs_const;</div><div class='add'>+	};</div><div class='add'>+	const struct bin_attribute	*const *bin_attrs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SYSFS_PREALLOC		010000</div><div class='add'>+#define SYSFS_GROUP_INVISIBLE	020000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DEFINE_SYSFS_GROUP_VISIBLE(name):</div><div class='add'>+ *	A helper macro to pair with the assignment of ".is_visible =</div><div class='add'>+ *	SYSFS_GROUP_VISIBLE(name)", that arranges for the directory</div><div class='add'>+ *	associated with a named attribute_group to optionally be hidden.</div><div class='add'>+ *	This allows for static declaration of attribute_groups, and the</div><div class='add'>+ *	simplification of attribute visibility lifetime that implies,</div><div class='add'>+ *	without polluting sysfs with empty attribute directories.</div><div class='add'>+ * Ex.</div><div class='add'>+ *</div><div class='add'>+ * static umode_t example_attr_visible(struct kobject *kobj,</div><div class='add'>+ *                                   struct attribute *attr, int n)</div><div class='add'>+ * {</div><div class='add'>+ *       if (example_attr_condition)</div><div class='add'>+ *               return 0;</div><div class='add'>+ *       else if (ro_attr_condition)</div><div class='add'>+ *               return 0444;</div><div class='add'>+ *       return a-&gt;mode;</div><div class='add'>+ * }</div><div class='add'>+ *</div><div class='add'>+ * static bool example_group_visible(struct kobject *kobj)</div><div class='add'>+ * {</div><div class='add'>+ *       if (example_group_condition)</div><div class='add'>+ *               return false;</div><div class='add'>+ *       return true;</div><div class='add'>+ * }</div><div class='add'>+ *</div><div class='add'>+ * DEFINE_SYSFS_GROUP_VISIBLE(example);</div><div class='add'>+ *</div><div class='add'>+ * static struct attribute_group example_group = {</div><div class='add'>+ *       .name = "example",</div><div class='add'>+ *       .is_visible = SYSFS_GROUP_VISIBLE(example),</div><div class='add'>+ *       .attrs = &amp;example_attrs,</div><div class='add'>+ * };</div><div class='add'>+ *</div><div class='add'>+ * Note that it expects &lt;name&gt;_attr_visible and &lt;name&gt;_group_visible to</div><div class='add'>+ * be defined. For cases where individual attributes do not need</div><div class='add'>+ * separate visibility consideration, only entire group visibility at</div><div class='add'>+ * once, see DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE().</div><div class='add'>+ */</div><div class='add'>+#define DEFINE_SYSFS_GROUP_VISIBLE(name)                             \</div><div class='add'>+	static inline umode_t sysfs_group_visible_##name(            \</div><div class='add'>+		struct kobject *kobj, struct attribute *attr, int n) \</div><div class='add'>+	{                                                            \</div><div class='add'>+		if (n == 0 &amp;&amp; !name##_group_visible(kobj))           \</div><div class='add'>+			return SYSFS_GROUP_INVISIBLE;                \</div><div class='add'>+		return name##_attr_visible(kobj, attr, n);           \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE(name):</div><div class='add'>+ *	A helper macro to pair with SYSFS_GROUP_VISIBLE() that like</div><div class='add'>+ *	DEFINE_SYSFS_GROUP_VISIBLE() controls group visibility, but does</div><div class='add'>+ *	not require the implementation of a per-attribute visibility</div><div class='add'>+ *	callback.</div><div class='add'>+ * Ex.</div><div class='add'>+ *</div><div class='add'>+ * static bool example_group_visible(struct kobject *kobj)</div><div class='add'>+ * {</div><div class='add'>+ *       if (example_group_condition)</div><div class='add'>+ *               return false;</div><div class='add'>+ *       return true;</div><div class='add'>+ * }</div><div class='add'>+ *</div><div class='add'>+ * DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE(example);</div><div class='add'>+ *</div><div class='add'>+ * static struct attribute_group example_group = {</div><div class='add'>+ *       .name = "example",</div><div class='add'>+ *       .is_visible = SYSFS_GROUP_VISIBLE(example),</div><div class='add'>+ *       .attrs = &amp;example_attrs,</div><div class='add'>+ * };</div><div class='add'>+ */</div><div class='add'>+#define DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE(name)                   \</div><div class='add'>+	static inline umode_t sysfs_group_visible_##name(         \</div><div class='add'>+		struct kobject *kobj, struct attribute *a, int n) \</div><div class='add'>+	{                                                         \</div><div class='add'>+		if (n == 0 &amp;&amp; !name##_group_visible(kobj))        \</div><div class='add'>+			return SYSFS_GROUP_INVISIBLE;             \</div><div class='add'>+		return a-&gt;mode;                                   \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Same as DEFINE_SYSFS_GROUP_VISIBLE, but for groups with only binary</div><div class='add'>+ * attributes. If an attribute_group defines both text and binary</div><div class='add'>+ * attributes, the group visibility is determined by the function</div><div class='add'>+ * specified to is_visible() not is_bin_visible()</div><div class='add'>+ */</div><div class='add'>+#define DEFINE_SYSFS_BIN_GROUP_VISIBLE(name)                                   \</div><div class='add'>+	static inline umode_t sysfs_group_visible_##name(                      \</div><div class='add'>+		struct kobject *kobj, const struct bin_attribute *attr, int n) \</div><div class='add'>+	{                                                                      \</div><div class='add'>+		if (n == 0 &amp;&amp; !name##_group_visible(kobj))                     \</div><div class='add'>+			return SYSFS_GROUP_INVISIBLE;                          \</div><div class='add'>+		return name##_attr_visible(kobj, attr, n);                     \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define DEFINE_SIMPLE_SYSFS_BIN_GROUP_VISIBLE(name)                         \</div><div class='add'>+	static inline umode_t sysfs_group_visible_##name(                   \</div><div class='add'>+		struct kobject *kobj, const struct bin_attribute *a, int n) \</div><div class='add'>+	{                                                                   \</div><div class='add'>+		if (n == 0 &amp;&amp; !name##_group_visible(kobj))                  \</div><div class='add'>+			return SYSFS_GROUP_INVISIBLE;                       \</div><div class='add'>+		return a-&gt;mode;                                             \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define SYSFS_GROUP_VISIBLE(fn) sysfs_group_visible_##fn</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Use these macros to make defining attributes easier.</div><div class='ctx'>  * See include/linux/device.h for examples..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define SYSFS_PREALLOC 010000</div><div class='del'>-</div><div class='ctx'> #define __ATTR(_name, _mode, _show, _store) {				\</div><div class='ctx'> 	.attr = {.name = __stringify(_name),				\</div><div class='ctx'> 		 .mode = VERIFY_OCTAL_PERMISSIONS(_mode) },		\</div><div class='hunk'>@@ -112,28 +251,20 @@ struct attribute_group {</div><div class='ctx'> 	.store	= _store,						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define __ATTR_RO(_name) {						\</div><div class='del'>-	.attr	= { .name = __stringify(_name), .mode = 0444 },		\</div><div class='del'>-	.show	= _name##_show,						\</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define __ATTR_RO_MODE(_name, _mode) {					\</div><div class='ctx'> 	.attr	= { .name = __stringify(_name),				\</div><div class='ctx'> 		    .mode = VERIFY_OCTAL_PERMISSIONS(_mode) },		\</div><div class='ctx'> 	.show	= _name##_show,						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define __ATTR_RW_MODE(_name, _mode) {					\</div><div class='del'>-	.attr	= { .name = __stringify(_name),				\</div><div class='del'>-		    .mode = VERIFY_OCTAL_PERMISSIONS(_mode) },		\</div><div class='del'>-	.show	= _name##_show,						\</div><div class='del'>-	.store	= _name##_store,					\</div><div class='del'>-}</div><div class='add'>+#define __ATTR_RO(_name)						\</div><div class='add'>+	__ATTR_RO_MODE(_name, 0444)</div><div class='ctx'> </div><div class='del'>-#define __ATTR_WO(_name) {						\</div><div class='del'>-	.attr	= { .name = __stringify(_name), .mode = 0200 },		\</div><div class='del'>-	.store	= _name##_store,					\</div><div class='del'>-}</div><div class='add'>+#define __ATTR_RW_MODE(_name, _mode)					\</div><div class='add'>+	__ATTR(_name, _mode, _name##_show, _name##_store)</div><div class='add'>+</div><div class='add'>+#define __ATTR_WO(_name)						\</div><div class='add'>+	__ATTR(_name, 0200, NULL, _name##_store)</div><div class='ctx'> </div><div class='ctx'> #define __ATTR_RW(_name) __ATTR(_name, 0644, _name##_show, _name##_store)</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +289,12 @@ static const struct attribute_group *_name##_groups[] = {	\</div><div class='ctx'> </div><div class='ctx'> #define ATTRIBUTE_GROUPS(_name)					\</div><div class='ctx'> static const struct attribute_group _name##_group = {		\</div><div class='del'>-	.attrs = _name##_attrs,					\</div><div class='add'>+	.attrs = _Generic(_name##_attrs,			\</div><div class='add'>+			  struct attribute **:			\</div><div class='add'>+				_name##_attrs,			\</div><div class='add'>+			  const struct attribute *const *:	\</div><div class='add'>+				(void *)_name##_attrs		\</div><div class='add'>+	),							\</div><div class='ctx'> };								\</div><div class='ctx'> __ATTRIBUTE_GROUPS(_name)</div><div class='ctx'> </div><div class='hunk'>@@ -177,13 +313,13 @@ struct bin_attribute {</div><div class='ctx'> 	size_t			size;</div><div class='ctx'> 	void			*private;</div><div class='ctx'> 	struct address_space *(*f_mapping)(void);</div><div class='del'>-	ssize_t (*read)(struct file *, struct kobject *, struct bin_attribute *,</div><div class='add'>+	ssize_t (*read)(struct file *, struct kobject *, const struct bin_attribute *,</div><div class='ctx'> 			char *, loff_t, size_t);</div><div class='del'>-	ssize_t (*write)(struct file *, struct kobject *, struct bin_attribute *,</div><div class='add'>+	ssize_t (*write)(struct file *, struct kobject *, const struct bin_attribute *,</div><div class='ctx'> 			 char *, loff_t, size_t);</div><div class='del'>-	loff_t (*llseek)(struct file *, struct kobject *, struct bin_attribute *,</div><div class='add'>+	loff_t (*llseek)(struct file *, struct kobject *, const struct bin_attribute *,</div><div class='ctx'> 			 loff_t, int);</div><div class='del'>-	int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,</div><div class='add'>+	int (*mmap)(struct file *, struct kobject *, const struct bin_attribute *attr,</div><div class='ctx'> 		    struct vm_area_struct *vma);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -202,22 +338,16 @@ struct bin_attribute {</div><div class='ctx'> /* macros to create static binary attributes easier */</div><div class='ctx'> #define __BIN_ATTR(_name, _mode, _read, _write, _size) {		\</div><div class='ctx'> 	.attr = { .name = __stringify(_name), .mode = _mode },		\</div><div class='del'>-	.read	= _read,						\</div><div class='del'>-	.write	= _write,						\</div><div class='add'>+	.read = _read,							\</div><div class='add'>+	.write = _write,						\</div><div class='ctx'> 	.size	= _size,						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define __BIN_ATTR_RO(_name, _size) {					\</div><div class='del'>-	.attr	= { .name = __stringify(_name), .mode = 0444 },		\</div><div class='del'>-	.read	= _name##_read,						\</div><div class='del'>-	.size	= _size,						\</div><div class='del'>-}</div><div class='add'>+#define __BIN_ATTR_RO(_name, _size)					\</div><div class='add'>+	__BIN_ATTR(_name, 0444, _name##_read, NULL, _size)</div><div class='ctx'> </div><div class='del'>-#define __BIN_ATTR_WO(_name, _size) {					\</div><div class='del'>-	.attr	= { .name = __stringify(_name), .mode = 0200 },		\</div><div class='del'>-	.write	= _name##_write,					\</div><div class='del'>-	.size	= _size,						\</div><div class='del'>-}</div><div class='add'>+#define __BIN_ATTR_WO(_name, _size)					\</div><div class='add'>+	__BIN_ATTR(_name, 0200, NULL, _name##_write, _size)</div><div class='ctx'> </div><div class='ctx'> #define __BIN_ATTR_RW(_name, _size)					\</div><div class='ctx'> 	__BIN_ATTR(_name, 0644, _name##_read, _name##_write, _size)</div><div class='hunk'>@@ -238,11 +368,8 @@ struct bin_attribute bin_attr_##_name = __BIN_ATTR_WO(_name, _size)</div><div class='ctx'> struct bin_attribute bin_attr_##_name = __BIN_ATTR_RW(_name, _size)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define __BIN_ATTR_ADMIN_RO(_name, _size) {					\</div><div class='del'>-	.attr	= { .name = __stringify(_name), .mode = 0400 },		\</div><div class='del'>-	.read	= _name##_read,						\</div><div class='del'>-	.size	= _size,						\</div><div class='del'>-}</div><div class='add'>+#define __BIN_ATTR_ADMIN_RO(_name, _size)				\</div><div class='add'>+	__BIN_ATTR(_name, 0400, _name##_read, NULL, _size)</div><div class='ctx'> </div><div class='ctx'> #define __BIN_ATTR_ADMIN_RW(_name, _size)					\</div><div class='ctx'> 	__BIN_ATTR(_name, 0600, _name##_read, _name##_write, _size)</div><div class='hunk'>@@ -253,6 +380,15 @@ struct bin_attribute bin_attr_##_name = __BIN_ATTR_ADMIN_RO(_name, _size)</div><div class='ctx'> #define BIN_ATTR_ADMIN_RW(_name, _size)					\</div><div class='ctx'> struct bin_attribute bin_attr_##_name = __BIN_ATTR_ADMIN_RW(_name, _size)</div><div class='ctx'> </div><div class='add'>+#define __BIN_ATTR_SIMPLE_RO(_name, _mode)				\</div><div class='add'>+	__BIN_ATTR(_name, _mode, sysfs_bin_attr_simple_read, NULL, 0)</div><div class='add'>+</div><div class='add'>+#define BIN_ATTR_SIMPLE_RO(_name)					\</div><div class='add'>+struct bin_attribute bin_attr_##_name = __BIN_ATTR_SIMPLE_RO(_name, 0444)</div><div class='add'>+</div><div class='add'>+#define BIN_ATTR_SIMPLE_ADMIN_RO(_name)					\</div><div class='add'>+struct bin_attribute bin_attr_##_name = __BIN_ATTR_SIMPLE_RO(_name, 0400)</div><div class='add'>+</div><div class='ctx'> struct sysfs_ops {</div><div class='ctx'> 	ssize_t	(*show)(struct kobject *, struct attribute *, char *);</div><div class='ctx'> 	ssize_t	(*store)(struct kobject *, struct attribute *, const char *, size_t);</div><div class='hunk'>@@ -360,6 +496,10 @@ int sysfs_emit(char *buf, const char *fmt, ...);</div><div class='ctx'> __printf(3, 4)</div><div class='ctx'> int sysfs_emit_at(char *buf, int at, const char *fmt, ...);</div><div class='ctx'> </div><div class='add'>+ssize_t sysfs_bin_attr_simple_read(struct file *file, struct kobject *kobj,</div><div class='add'>+				   const struct bin_attribute *attr, char *buf,</div><div class='add'>+				   loff_t off, size_t count);</div><div class='add'>+</div><div class='ctx'> #else /* CONFIG_SYSFS */</div><div class='ctx'> </div><div class='ctx'> static inline int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)</div><div class='hunk'>@@ -617,6 +757,15 @@ static inline int sysfs_emit_at(char *buf, int at, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline ssize_t sysfs_bin_attr_simple_read(struct file *file,</div><div class='add'>+						 struct kobject *kobj,</div><div class='add'>+						 const struct bin_attribute *attr,</div><div class='add'>+						 char *buf, loff_t off,</div><div class='add'>+						 size_t count)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_SYSFS */</div><div class='ctx'> </div><div class='ctx'> static inline int __must_check sysfs_create_file(struct kobject *kobj,</div><div class='head'>diff --git a/include/linux/sysv_fs.h b/include/linux/sysv_fs.h<br/>deleted file mode 100644<br/>index 5cf77dbb8d86..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/sysv_fs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/sysv_fs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,214 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _LINUX_SYSV_FS_H</div><div class='del'>-#define _LINUX_SYSV_FS_H</div><div class='del'>-</div><div class='del'>-#define __packed2__	__attribute__((packed, aligned(2)))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef __KERNEL__</div><div class='del'>-typedef u16 __fs16;</div><div class='del'>-typedef u32 __fs16;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* inode numbers are 16 bit */</div><div class='del'>-typedef __fs16 sysv_ino_t;</div><div class='del'>-</div><div class='del'>-/* Block numbers are 24 bit, sometimes stored in 32 bit.</div><div class='del'>-   On Coherent FS, they are always stored in PDP-11 manner: the least</div><div class='del'>-   significant 16 bits come last. */</div><div class='del'>-typedef __fs32 sysv_zone_t;</div><div class='del'>-</div><div class='del'>-/* 0 is non-existent */</div><div class='del'>-#define SYSV_BADBL_INO	1	/* inode of bad blocks file */</div><div class='del'>-#define SYSV_ROOT_INO	2	/* inode of root directory */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Xenix super-block data on disk */</div><div class='del'>-#define XENIX_NICINOD	100	/* number of inode cache entries */</div><div class='del'>-#define XENIX_NICFREE	100	/* number of free block list chunk entries */</div><div class='del'>-struct xenix_super_block {</div><div class='del'>-	__fs16		s_isize; /* index of first data zone */</div><div class='del'>-	__fs32		s_fsize __packed2__; /* total number of zones of this fs */</div><div class='del'>-	/* the start of the free block list: */</div><div class='del'>-	__fs16		s_nfree;	/* number of free blocks in s_free, &lt;= XENIX_NICFREE */</div><div class='del'>-	sysv_zone_t	s_free[XENIX_NICFREE]; /* first free block list chunk */</div><div class='del'>-	/* the cache of free inodes: */</div><div class='del'>-	__fs16		s_ninode; /* number of free inodes in s_inode, &lt;= XENIX_NICINOD */</div><div class='del'>-	sysv_ino_t	s_inode[XENIX_NICINOD]; /* some free inodes */</div><div class='del'>-	/* locks, not used by Linux: */</div><div class='del'>-	char		s_flock;	/* lock during free block list manipulation */</div><div class='del'>-	char		s_ilock;	/* lock during inode cache manipulation */</div><div class='del'>-	char		s_fmod;		/* super-block modified flag */</div><div class='del'>-	char		s_ronly;	/* flag whether fs is mounted read-only */</div><div class='del'>-	__fs32		s_time __packed2__; /* time of last super block update */</div><div class='del'>-	__fs32		s_tfree __packed2__; /* total number of free zones */</div><div class='del'>-	__fs16		s_tinode;	/* total number of free inodes */</div><div class='del'>-	__fs16		s_dinfo[4];	/* device information ?? */</div><div class='del'>-	char		s_fname[6];	/* file system volume name */</div><div class='del'>-	char		s_fpack[6];	/* file system pack name */</div><div class='del'>-	char		s_clean;	/* set to 0x46 when filesystem is properly unmounted */</div><div class='del'>-	char		s_fill[371];</div><div class='del'>-	s32		s_magic;	/* version of file system */</div><div class='del'>-	__fs32		s_type;		/* type of file system: 1 for 512 byte blocks</div><div class='del'>-								2 for 1024 byte blocks</div><div class='del'>-								3 for 2048 byte blocks */</div><div class='del'>-								</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SystemV FS comes in two variants:</div><div class='del'>- * sysv2: System V Release 2 (e.g. Microport), structure elements aligned(2).</div><div class='del'>- * sysv4: System V Release 4 (e.g. Consensys), structure elements aligned(4).</div><div class='del'>- */</div><div class='del'>-#define SYSV_NICINOD	100	/* number of inode cache entries */</div><div class='del'>-#define SYSV_NICFREE	50	/* number of free block list chunk entries */</div><div class='del'>-</div><div class='del'>-/* SystemV4 super-block data on disk */</div><div class='del'>-struct sysv4_super_block {</div><div class='del'>-	__fs16	s_isize;	/* index of first data zone */</div><div class='del'>-	u16	s_pad0;</div><div class='del'>-	__fs32	s_fsize;	/* total number of zones of this fs */</div><div class='del'>-	/* the start of the free block list: */</div><div class='del'>-	__fs16	s_nfree;	/* number of free blocks in s_free, &lt;= SYSV_NICFREE */</div><div class='del'>-	u16	s_pad1;</div><div class='del'>-	sysv_zone_t	s_free[SYSV_NICFREE]; /* first free block list chunk */</div><div class='del'>-	/* the cache of free inodes: */</div><div class='del'>-	__fs16	s_ninode;	/* number of free inodes in s_inode, &lt;= SYSV_NICINOD */</div><div class='del'>-	u16	s_pad2;</div><div class='del'>-	sysv_ino_t     s_inode[SYSV_NICINOD]; /* some free inodes */</div><div class='del'>-	/* locks, not used by Linux: */</div><div class='del'>-	char	s_flock;	/* lock during free block list manipulation */</div><div class='del'>-	char	s_ilock;	/* lock during inode cache manipulation */</div><div class='del'>-	char	s_fmod;		/* super-block modified flag */</div><div class='del'>-	char	s_ronly;	/* flag whether fs is mounted read-only */</div><div class='del'>-	__fs32	s_time;		/* time of last super block update */</div><div class='del'>-	__fs16	s_dinfo[4];	/* device information ?? */</div><div class='del'>-	__fs32	s_tfree;	/* total number of free zones */</div><div class='del'>-	__fs16	s_tinode;	/* total number of free inodes */</div><div class='del'>-	u16	s_pad3;</div><div class='del'>-	char	s_fname[6];	/* file system volume name */</div><div class='del'>-	char	s_fpack[6];	/* file system pack name */</div><div class='del'>-	s32	s_fill[12];</div><div class='del'>-	__fs32	s_state;	/* file system state: 0x7c269d38-s_time means clean */</div><div class='del'>-	s32	s_magic;	/* version of file system */</div><div class='del'>-	__fs32	s_type;		/* type of file system: 1 for 512 byte blocks</div><div class='del'>-								2 for 1024 byte blocks */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SystemV2 super-block data on disk */</div><div class='del'>-struct sysv2_super_block {</div><div class='del'>-	__fs16	s_isize; 		/* index of first data zone */</div><div class='del'>-	__fs32	s_fsize __packed2__;	/* total number of zones of this fs */</div><div class='del'>-	/* the start of the free block list: */</div><div class='del'>-	__fs16	s_nfree;		/* number of free blocks in s_free, &lt;= SYSV_NICFREE */</div><div class='del'>-	sysv_zone_t s_free[SYSV_NICFREE];	/* first free block list chunk */</div><div class='del'>-	/* the cache of free inodes: */</div><div class='del'>-	__fs16	s_ninode;		/* number of free inodes in s_inode, &lt;= SYSV_NICINOD */</div><div class='del'>-	sysv_ino_t     s_inode[SYSV_NICINOD]; /* some free inodes */</div><div class='del'>-	/* locks, not used by Linux: */</div><div class='del'>-	char	s_flock;		/* lock during free block list manipulation */</div><div class='del'>-	char	s_ilock;		/* lock during inode cache manipulation */</div><div class='del'>-	char	s_fmod;			/* super-block modified flag */</div><div class='del'>-	char	s_ronly;		/* flag whether fs is mounted read-only */</div><div class='del'>-	__fs32	s_time __packed2__;	/* time of last super block update */</div><div class='del'>-	__fs16	s_dinfo[4];		/* device information ?? */</div><div class='del'>-	__fs32	s_tfree __packed2__;	/* total number of free zones */</div><div class='del'>-	__fs16	s_tinode;		/* total number of free inodes */</div><div class='del'>-	char	s_fname[6];		/* file system volume name */</div><div class='del'>-	char	s_fpack[6];		/* file system pack name */</div><div class='del'>-	s32	s_fill[14];</div><div class='del'>-	__fs32	s_state;		/* file system state: 0xcb096f43 means clean */</div><div class='del'>-	s32	s_magic;		/* version of file system */</div><div class='del'>-	__fs32	s_type;			/* type of file system: 1 for 512 byte blocks</div><div class='del'>-								2 for 1024 byte blocks */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* V7 super-block data on disk */</div><div class='del'>-#define V7_NICINOD     100     /* number of inode cache entries */</div><div class='del'>-#define V7_NICFREE     50      /* number of free block list chunk entries */</div><div class='del'>-struct v7_super_block {</div><div class='del'>-	__fs16 s_isize;        /* index of first data zone */</div><div class='del'>-	__fs32 s_fsize __packed2__; /* total number of zones of this fs */</div><div class='del'>-	/* the start of the free block list: */</div><div class='del'>-	__fs16 s_nfree;        /* number of free blocks in s_free, &lt;= V7_NICFREE */</div><div class='del'>-	sysv_zone_t s_free[V7_NICFREE]; /* first free block list chunk */</div><div class='del'>-	/* the cache of free inodes: */</div><div class='del'>-	__fs16 s_ninode;       /* number of free inodes in s_inode, &lt;= V7_NICINOD */</div><div class='del'>-	sysv_ino_t      s_inode[V7_NICINOD]; /* some free inodes */</div><div class='del'>-	/* locks, not used by Linux or V7: */</div><div class='del'>-	char    s_flock;        /* lock during free block list manipulation */</div><div class='del'>-	char    s_ilock;        /* lock during inode cache manipulation */</div><div class='del'>-	char    s_fmod;         /* super-block modified flag */</div><div class='del'>-	char    s_ronly;        /* flag whether fs is mounted read-only */</div><div class='del'>-	__fs32  s_time __packed2__; /* time of last super block update */</div><div class='del'>-	/* the following fields are not maintained by V7: */</div><div class='del'>-	__fs32  s_tfree __packed2__; /* total number of free zones */</div><div class='del'>-	__fs16  s_tinode;       /* total number of free inodes */</div><div class='del'>-	__fs16  s_m;            /* interleave factor */</div><div class='del'>-	__fs16  s_n;            /* interleave factor */</div><div class='del'>-	char    s_fname[6];     /* file system name */</div><div class='del'>-	char    s_fpack[6];     /* file system pack name */</div><div class='del'>-};</div><div class='del'>-/* Constants to aid sanity checking */</div><div class='del'>-/* This is not a hard limit, nor enforced by v7 kernel. It's actually just</div><div class='del'>- * the limit used by Seventh Edition's ls, though is high enough to assume</div><div class='del'>- * that no reasonable file system would have that much entries in root</div><div class='del'>- * directory. Thus, if we see anything higher, we just probably got the</div><div class='del'>- * endiannes wrong. */</div><div class='del'>-#define V7_NFILES	1024</div><div class='del'>-/* The disk addresses are three-byte (despite direct block addresses being</div><div class='del'>- * aligned word-wise in inode). If the most significant byte is non-zero,</div><div class='del'>- * something is most likely wrong (not a filesystem, bad bytesex). */</div><div class='del'>-#define V7_MAXSIZE	0x00ffffff</div><div class='del'>-</div><div class='del'>-/* Coherent super-block data on disk */</div><div class='del'>-#define COH_NICINOD	100	/* number of inode cache entries */</div><div class='del'>-#define COH_NICFREE	64	/* number of free block list chunk entries */</div><div class='del'>-struct coh_super_block {</div><div class='del'>-	__fs16		s_isize;	/* index of first data zone */</div><div class='del'>-	__fs32		s_fsize __packed2__; /* total number of zones of this fs */</div><div class='del'>-	/* the start of the free block list: */</div><div class='del'>-	__fs16 s_nfree;	/* number of free blocks in s_free, &lt;= COH_NICFREE */</div><div class='del'>-	sysv_zone_t	s_free[COH_NICFREE] __packed2__; /* first free block list chunk */</div><div class='del'>-	/* the cache of free inodes: */</div><div class='del'>-	__fs16		s_ninode;	/* number of free inodes in s_inode, &lt;= COH_NICINOD */</div><div class='del'>-	sysv_ino_t	s_inode[COH_NICINOD]; /* some free inodes */</div><div class='del'>-	/* locks, not used by Linux: */</div><div class='del'>-	char		s_flock;	/* lock during free block list manipulation */</div><div class='del'>-	char		s_ilock;	/* lock during inode cache manipulation */</div><div class='del'>-	char		s_fmod;		/* super-block modified flag */</div><div class='del'>-	char		s_ronly;	/* flag whether fs is mounted read-only */</div><div class='del'>-	__fs32		s_time __packed2__; /* time of last super block update */</div><div class='del'>-	__fs32		s_tfree __packed2__; /* total number of free zones */</div><div class='del'>-	__fs16		s_tinode;	/* total number of free inodes */</div><div class='del'>-	__fs16		s_interleave_m;	/* interleave factor */</div><div class='del'>-	__fs16		s_interleave_n;</div><div class='del'>-	char		s_fname[6];	/* file system volume name */</div><div class='del'>-	char		s_fpack[6];	/* file system pack name */</div><div class='del'>-	__fs32		s_unique;	/* zero, not used */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SystemV/Coherent inode data on disk */</div><div class='del'>-struct sysv_inode {</div><div class='del'>-	__fs16 i_mode;</div><div class='del'>-	__fs16 i_nlink;</div><div class='del'>-	__fs16 i_uid;</div><div class='del'>-	__fs16 i_gid;</div><div class='del'>-	__fs32 i_size;</div><div class='del'>-	u8  i_data[3*(10+1+1+1)];</div><div class='del'>-	u8  i_gen;</div><div class='del'>-	__fs32 i_atime;	/* time of last access */</div><div class='del'>-	__fs32 i_mtime;	/* time of last modification */</div><div class='del'>-	__fs32 i_ctime;	/* time of creation */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SystemV/Coherent directory entry on disk */</div><div class='del'>-#define SYSV_NAMELEN	14	/* max size of name in struct sysv_dir_entry */</div><div class='del'>-struct sysv_dir_entry {</div><div class='del'>-	sysv_ino_t inode;</div><div class='del'>-	char name[SYSV_NAMELEN]; /* up to 14 characters, the rest are zeroes */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SYSV_DIRSIZE	sizeof(struct sysv_dir_entry)	/* size of every directory entry */</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_SYSV_FS_H */</div><div class='head'>diff --git a/include/linux/t10-pi.h b/include/linux/t10-pi.h<br/>index 248f4ac95642..2c59fe3efcd4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/t10-pi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/t10-pi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/t10-pi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/t10-pi.h</a></div><div class='hunk'>@@ -41,18 +41,12 @@ static inline u32 t10_pi_ref_tag(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int shift = ilog2(queue_logical_block_size(rq-&gt;q));</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_INTEGRITY</div><div class='del'>-	if (rq-&gt;q-&gt;integrity.interval_exp)</div><div class='del'>-		shift = rq-&gt;q-&gt;integrity.interval_exp;</div><div class='del'>-#endif</div><div class='add'>+	if (IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY) &amp;&amp;</div><div class='add'>+	    rq-&gt;q-&gt;limits.integrity.interval_exp)</div><div class='add'>+		shift = rq-&gt;q-&gt;limits.integrity.interval_exp;</div><div class='ctx'> 	return blk_rq_pos(rq) &gt;&gt; (shift - SECTOR_SHIFT) &amp; 0xffffffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern const struct blk_integrity_profile t10_pi_type1_crc;</div><div class='del'>-extern const struct blk_integrity_profile t10_pi_type1_ip;</div><div class='del'>-extern const struct blk_integrity_profile t10_pi_type3_crc;</div><div class='del'>-extern const struct blk_integrity_profile t10_pi_type3_ip;</div><div class='del'>-</div><div class='ctx'> struct crc64_pi_tuple {</div><div class='ctx'> 	__be64 guard_tag;</div><div class='ctx'> 	__be16 app_tag;</div><div class='hunk'>@@ -72,14 +66,10 @@ static inline u64 ext_pi_ref_tag(struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int shift = ilog2(queue_logical_block_size(rq-&gt;q));</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_INTEGRITY</div><div class='del'>-	if (rq-&gt;q-&gt;integrity.interval_exp)</div><div class='del'>-		shift = rq-&gt;q-&gt;integrity.interval_exp;</div><div class='del'>-#endif</div><div class='add'>+	if (IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY) &amp;&amp;</div><div class='add'>+	    rq-&gt;q-&gt;limits.integrity.interval_exp)</div><div class='add'>+		shift = rq-&gt;q-&gt;limits.integrity.interval_exp;</div><div class='ctx'> 	return lower_48_bits(blk_rq_pos(rq) &gt;&gt; (shift - SECTOR_SHIFT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern const struct blk_integrity_profile ext_pi_type1_crc64;</div><div class='del'>-extern const struct blk_integrity_profile ext_pi_type3_crc64;</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/task_work.h b/include/linux/task_work.h<br/>index 795ef5a68429..0646804860ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/task_work.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/task_work.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/task_work.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/task_work.h</a></div><div class='hunk'>@@ -14,10 +14,11 @@ init_task_work(struct callback_head *twork, task_work_func_t func)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum task_work_notify_mode {</div><div class='del'>-	TWA_NONE,</div><div class='add'>+	TWA_NONE = 0,</div><div class='ctx'> 	TWA_RESUME,</div><div class='ctx'> 	TWA_SIGNAL,</div><div class='ctx'> 	TWA_SIGNAL_NO_IPI,</div><div class='add'>+	TWA_NMI_CURRENT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool task_work_pending(struct task_struct *task)</div><div class='hunk'>@@ -30,7 +31,8 @@ int task_work_add(struct task_struct *task, struct callback_head *twork,</div><div class='ctx'> </div><div class='ctx'> struct callback_head *task_work_cancel_match(struct task_struct *task,</div><div class='ctx'> 	bool (*match)(struct callback_head *, void *data), void *data);</div><div class='del'>-struct callback_head *task_work_cancel(struct task_struct *, task_work_func_t);</div><div class='add'>+struct callback_head *task_work_cancel_func(struct task_struct *, task_work_func_t);</div><div class='add'>+bool task_work_cancel(struct task_struct *task, struct callback_head *cb);</div><div class='ctx'> void task_work_run(void);</div><div class='ctx'> </div><div class='ctx'> static inline void exit_task_work(struct task_struct *task)</div><div class='head'>diff --git a/include/linux/tc.h b/include/linux/tc.h<br/>index a60639f37963..8416bae9b126 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tc.h</a></div><div class='hunk'>@@ -108,7 +108,7 @@ struct tc_driver {</div><div class='ctx'> 	struct device_driver driver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_tc_driver(drv) container_of(drv, struct tc_driver, driver)</div><div class='add'>+#define to_tc_driver(drv) container_of_const(drv, struct tc_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return TURBOchannel clock frequency in Hz.</div><div class='hunk'>@@ -120,7 +120,7 @@ static inline unsigned long tc_get_speed(struct tc_bus *tbus)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TC</div><div class='ctx'> </div><div class='del'>-extern struct bus_type tc_bus_type;</div><div class='add'>+extern const struct bus_type tc_bus_type;</div><div class='ctx'> </div><div class='ctx'> extern int tc_register_driver(struct tc_driver *tdrv);</div><div class='ctx'> extern void tc_unregister_driver(struct tc_driver *tdrv);</div><div class='head'>diff --git a/include/linux/tca6416_keypad.h b/include/linux/tca6416_keypad.h<br/>deleted file mode 100644<br/>index 5cf6f6f82aa7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tca6416_keypad.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tca6416_keypad.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * tca6416 keypad platform support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Texas Instruments</div><div class='del'>- *</div><div class='del'>- * Author: Sriramakrishnan &lt;srk@ti.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _TCA6416_KEYS_H</div><div class='del'>-#define _TCA6416_KEYS_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-struct tca6416_button {</div><div class='del'>-	/* Configuration parameters */</div><div class='del'>-	int code;		/* input event code (KEY_*, SW_*) */</div><div class='del'>-	int active_low;</div><div class='del'>-	int type;		/* input event type (EV_KEY, EV_SW) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tca6416_keys_platform_data {</div><div class='del'>-	struct tca6416_button *buttons;</div><div class='del'>-	int nbuttons;</div><div class='del'>-	unsigned int rep:1;	/* enable input subsystem auto repeat */</div><div class='del'>-	uint16_t pinmask;</div><div class='del'>-	uint16_t invert;</div><div class='del'>-	int use_polling;	/* use polling if Interrupt is not connected*/</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='head'>diff --git a/include/linux/tcp.h b/include/linux/tcp.h<br/>index 55399ee2a57e..20b8c6e21fef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tcp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tcp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tcp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tcp.h</a></div><div class='hunk'>@@ -122,8 +122,9 @@ struct tcp_options_received {</div><div class='ctx'> 		smc_ok : 1,	/* SMC seen on SYN packet		*/</div><div class='ctx'> 		snd_wscale : 4,	/* Window scaling received from sender	*/</div><div class='ctx'> 		rcv_wscale : 4;	/* Window scaling to send to receiver	*/</div><div class='del'>-	u8	saw_unknown:1,	/* Received unknown option		*/</div><div class='del'>-		unused:7;</div><div class='add'>+	u8	accecn:6,	/* AccECN index in header, 0=no options	*/</div><div class='add'>+		saw_unknown:1,	/* Received unknown option		*/</div><div class='add'>+		unused:1;</div><div class='ctx'> 	u8	num_sacks;	/* Number of SACK blocks		*/</div><div class='ctx'> 	u16	user_mss;	/* mss requested by user in ioctl	*/</div><div class='ctx'> 	u16	mss_clamp;	/* Maximal mss, negotiated at connection setup */</div><div class='hunk'>@@ -160,12 +161,19 @@ struct tcp_request_sock {</div><div class='ctx'> 	u32				rcv_isn;</div><div class='ctx'> 	u32				snt_isn;</div><div class='ctx'> 	u32				ts_off;</div><div class='add'>+	u32				snt_tsval_first;</div><div class='add'>+	u32				snt_tsval_last;</div><div class='ctx'> 	u32				last_oow_ack_time; /* last SYNACK */</div><div class='ctx'> 	u32				rcv_nxt; /* the ack # by SYNACK. For</div><div class='ctx'> 						  * FastOpen it's the seq#</div><div class='ctx'> 						  * after data-in-SYN.</div><div class='ctx'> 						  */</div><div class='ctx'> 	u8				syn_tos;</div><div class='add'>+	bool				accecn_ok;</div><div class='add'>+	u8				syn_ect_snt: 2,</div><div class='add'>+					syn_ect_rcv: 2,</div><div class='add'>+					accecn_fail_mode:4;</div><div class='add'>+	u8				saw_accecn_opt  :2;</div><div class='ctx'> #ifdef CONFIG_TCP_AO</div><div class='ctx'> 	u8				ao_keyid;</div><div class='ctx'> 	u8				ao_rcv_next;</div><div class='hunk'>@@ -200,15 +208,16 @@ struct tcp_sock {</div><div class='ctx'> </div><div class='ctx'> 	/* TX read-mostly hotpath cache lines */</div><div class='ctx'> 	__cacheline_group_begin(tcp_sock_read_tx);</div><div class='del'>-	/* timestamp of last sent data packet (for restart window) */</div><div class='ctx'> 	u32	max_window;	/* Maximal window ever seen from peer	*/</div><div class='ctx'> 	u32	rcv_ssthresh;	/* Current window clamp			*/</div><div class='ctx'> 	u32	reordering;	/* Packet reordering metric.		*/</div><div class='ctx'> 	u32	notsent_lowat;	/* TCP_NOTSENT_LOWAT */</div><div class='ctx'> 	u16	gso_segs;	/* Max number of segs per GSO packet	*/</div><div class='ctx'> 	/* from STCP, retrans queue hinting */</div><div class='del'>-	struct sk_buff *lost_skb_hint;</div><div class='ctx'> 	struct sk_buff *retransmit_skb_hint;</div><div class='add'>+#if defined(CONFIG_TLS_DEVICE)</div><div class='add'>+	void (*tcp_clean_acked)(struct sock *sk, u32 acked_seq);</div><div class='add'>+#endif</div><div class='ctx'> 	__cacheline_group_end(tcp_sock_read_tx);</div><div class='ctx'> </div><div class='ctx'> 	/* TXRX read-mostly hotpath cache lines */</div><div class='hunk'>@@ -226,13 +235,13 @@ struct tcp_sock {</div><div class='ctx'> 		repair      : 1,</div><div class='ctx'> 		tcp_usec_ts : 1, /* TSval values in usec */</div><div class='ctx'> 		is_sack_reneg:1,    /* in recovery from loss with SACK reneg? */</div><div class='del'>-		is_cwnd_limited:1;/* forward progress limited by snd_cwnd? */</div><div class='add'>+		is_cwnd_limited:1,/* forward progress limited by snd_cwnd? */</div><div class='add'>+		recvmsg_inq : 1;/* Indicate # of bytes in queue upon recvmsg */</div><div class='ctx'> 	__cacheline_group_end(tcp_sock_read_txrx);</div><div class='ctx'> </div><div class='ctx'> 	/* RX read-mostly hotpath cache lines */</div><div class='ctx'> 	__cacheline_group_begin(tcp_sock_read_rx);</div><div class='ctx'> 	u32	copied_seq;	/* Head of yet unread data */</div><div class='del'>-	u32	rcv_tstamp;	/* timestamp of last received ACK (for keepalives) */</div><div class='ctx'> 	u32	snd_wl1;	/* Sequence for window update		*/</div><div class='ctx'> 	u32	tlp_high_seq;	/* snd_nxt at the time of TLP */</div><div class='ctx'> 	u32	rttvar_us;	/* smoothed mdev_max			*/</div><div class='hunk'>@@ -240,10 +249,10 @@ struct tcp_sock {</div><div class='ctx'> 	u16	advmss;		/* Advertised MSS			*/</div><div class='ctx'> 	u16	urg_data;	/* Saved octet of OOB data and control flags */</div><div class='ctx'> 	u32	lost;		/* Total data packets lost incl. rexmits */</div><div class='add'>+	u32	snd_ssthresh;	/* Slow start size threshold		*/</div><div class='ctx'> 	struct  minmax rtt_min;</div><div class='ctx'> 	/* OOO segments go in this rbtree. Socket lock must be held. */</div><div class='ctx'> 	struct rb_root	out_of_order_queue;</div><div class='del'>-	u32	snd_ssthresh;	/* Slow start size threshold		*/</div><div class='ctx'> 	__cacheline_group_end(tcp_sock_read_rx);</div><div class='ctx'> </div><div class='ctx'> 	/* TX read-write hotpath cache lines */</div><div class='hunk'>@@ -262,12 +271,11 @@ struct tcp_sock {</div><div class='ctx'> 	u32	chrono_stat[3];	/* Time in jiffies for chrono_stat stats */</div><div class='ctx'> 	u32	write_seq;	/* Tail(+1) of data held in tcp send buffer */</div><div class='ctx'> 	u32	pushed_seq;	/* Last pushed seq, required to talk to windows */</div><div class='del'>-	u32	lsndtime;</div><div class='add'>+	u32	lsndtime;	/* timestamp of last sent data packet (for restart window) */</div><div class='ctx'> 	u32	mdev_us;	/* medium deviation			*/</div><div class='ctx'> 	u32	rtt_seq;	/* sequence number to update rttvar	*/</div><div class='ctx'> 	u64	tcp_wstamp_ns;	/* departure time for next sent data packet */</div><div class='del'>-	u64	tcp_clock_cache; /* cache last tcp_clock_ns() (see tcp_mstamp_refresh()) */</div><div class='del'>-	u64	tcp_mstamp;	/* most recent packet received/sent */</div><div class='add'>+	u64	accecn_opt_tstamp;	/* Last AccECN option sent timestamp */</div><div class='ctx'> 	struct list_head tsorted_sent_queue; /* time-sorted sent but un-SACKed skbs */</div><div class='ctx'> 	struct sk_buff *highest_sack;   /* skb just after the highest</div><div class='ctx'> 					 * skb with SACKed bit set</div><div class='hunk'>@@ -283,7 +291,17 @@ struct tcp_sock {</div><div class='ctx'>  *	Header prediction flags</div><div class='ctx'>  *	0x5?10 &lt;&lt; 16 + snd_wnd in net byte order</div><div class='ctx'>  */</div><div class='add'>+	u8	nonagle     : 4,/* Disable Nagle algorithm?             */</div><div class='add'>+		rate_app_limited:1;  /* rate_{delivered,interval_us} limited? */</div><div class='add'>+	u8	received_ce_pending:4, /* Not yet transmit cnt of received_ce */</div><div class='add'>+		unused2:4;</div><div class='add'>+	u8	accecn_minlen:2,/* Minimum length of AccECN option sent */</div><div class='add'>+		est_ecnfield:2,/* ECN field for AccECN delivered estimates */</div><div class='add'>+		accecn_opt_demand:2,/* Demand AccECN option for n next ACKs */</div><div class='add'>+		prev_ecnfield:2; /* ECN bits from the previous segment */</div><div class='ctx'> 	__be32	pred_flags;</div><div class='add'>+	u64	tcp_clock_cache; /* cache last tcp_clock_ns() (see tcp_mstamp_refresh()) */</div><div class='add'>+	u64	tcp_mstamp;	/* most recent packet received/sent */</div><div class='ctx'> 	u32	rcv_nxt;	/* What we want to receive next		*/</div><div class='ctx'> 	u32	snd_nxt;	/* Next sequence we send		*/</div><div class='ctx'> 	u32	snd_una;	/* First byte we want an ack for	*/</div><div class='hunk'>@@ -293,14 +311,18 @@ struct tcp_sock {</div><div class='ctx'> 	u32	snd_up;		/* Urgent pointer		*/</div><div class='ctx'> 	u32	delivered;	/* Total data packets delivered incl. rexmits */</div><div class='ctx'> 	u32	delivered_ce;	/* Like the above but only ECE marked packets */</div><div class='add'>+	u32	received_ce;	/* Like the above but for rcvd CE marked pkts */</div><div class='add'>+	u32	received_ecn_bytes[3]; /* received byte counters for three ECN</div><div class='add'>+					* types: INET_ECN_ECT_1, INET_ECN_ECT_0,</div><div class='add'>+					* and INET_ECN_CE</div><div class='add'>+					*/</div><div class='ctx'> 	u32	app_limited;	/* limited until "delivered" reaches this val */</div><div class='ctx'> 	u32	rcv_wnd;	/* Current receiver window		*/</div><div class='add'>+	u32	rcv_tstamp;	/* timestamp of last received ACK (for keepalives) */</div><div class='ctx'> /*</div><div class='ctx'>  *      Options received (usually on last packet, some only on SYN packets).</div><div class='ctx'>  */</div><div class='ctx'> 	struct tcp_options_received rx_opt;</div><div class='del'>-	u8	nonagle     : 4,/* Disable Nagle algorithm?             */</div><div class='del'>-		rate_app_limited:1;  /* rate_{delivered,interval_us} limited? */</div><div class='ctx'> 	__cacheline_group_end(tcp_sock_write_txrx);</div><div class='ctx'> </div><div class='ctx'> 	/* RX read-write hotpath cache lines */</div><div class='hunk'>@@ -322,6 +344,7 @@ struct tcp_sock {</div><div class='ctx'> 	u32	rate_delivered;    /* saved rate sample: packets delivered */</div><div class='ctx'> 	u32	rate_interval_us;  /* saved rate sample: time elapsed */</div><div class='ctx'> 	u32	rcv_rtt_last_tsecr;</div><div class='add'>+	u32	delivered_ecn_bytes[3];</div><div class='ctx'> 	u64	first_tx_mstamp;  /* start of window send phase */</div><div class='ctx'> 	u64	delivered_mstamp; /* time we reached "delivered" */</div><div class='ctx'> 	u64	bytes_acked;	/* RFC4898 tcpEStatsAppHCThruOctetsAcked</div><div class='hunk'>@@ -335,7 +358,7 @@ struct tcp_sock {</div><div class='ctx'> 	} rcv_rtt_est;</div><div class='ctx'> /* Receiver queue space */</div><div class='ctx'> 	struct {</div><div class='del'>-		u32	space;</div><div class='add'>+		int	space;</div><div class='ctx'> 		u32	seq;</div><div class='ctx'> 		u64	time;</div><div class='ctx'> 	} rcvq_space;</div><div class='hunk'>@@ -368,9 +391,9 @@ struct tcp_sock {</div><div class='ctx'> 	u8	compressed_ack;</div><div class='ctx'> 	u8	dup_ack_counter:2,</div><div class='ctx'> 		tlp_retrans:1,	/* TLP is a retransmission */</div><div class='del'>-		unused:5;</div><div class='add'>+		syn_ect_snt:2,	/* AccECN ECT memory, only */</div><div class='add'>+		syn_ect_rcv:2;	/* ... needed during 3WHS + first seqno */</div><div class='ctx'> 	u8	thin_lto    : 1,/* Use linear timeouts for thin streams */</div><div class='del'>-		recvmsg_inq : 1,/* Indicate # of bytes in queue upon recvmsg */</div><div class='ctx'> 		fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */</div><div class='ctx'> 		fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */</div><div class='ctx'> 		fastopen_client_fail:2, /* reason why fastopen failed */</div><div class='hunk'>@@ -381,9 +404,12 @@ struct tcp_sock {</div><div class='ctx'> 		syn_fastopen:1,	/* SYN includes Fast Open option */</div><div class='ctx'> 		syn_fastopen_exp:1,/* SYN includes Fast Open exp. option */</div><div class='ctx'> 		syn_fastopen_ch:1, /* Active TFO re-enabling probe */</div><div class='del'>-		syn_data_acked:1;/* data in SYN is acked by SYN-ACK */</div><div class='add'>+		syn_data_acked:1,/* data in SYN is acked by SYN-ACK */</div><div class='add'>+		syn_fastopen_child:1; /* created TFO passive child socket */</div><div class='ctx'> </div><div class='ctx'> 	u8	keepalive_probes; /* num of allowed keep alive probes	*/</div><div class='add'>+	u8	accecn_fail_mode:4,	/* AccECN failure handling */</div><div class='add'>+		saw_accecn_opt:2;	/* An AccECN option was seen */</div><div class='ctx'> 	u32	tcp_tx_delay;	/* delay (in usec) added to TX packets */</div><div class='ctx'> </div><div class='ctx'> /* RTT measurement */</div><div class='hunk'>@@ -414,8 +440,6 @@ struct tcp_sock {</div><div class='ctx'> </div><div class='ctx'> 	struct tcp_sack_block recv_sack_cache[4];</div><div class='ctx'> </div><div class='del'>-	int     lost_cnt_hint;</div><div class='del'>-</div><div class='ctx'> 	u32	prior_ssthresh; /* ssthresh saved at recovery start	*/</div><div class='ctx'> 	u32	high_seq;	/* snd_nxt at onset of congestion	*/</div><div class='ctx'> </div><div class='hunk'>@@ -424,6 +448,9 @@ struct tcp_sock {</div><div class='ctx'> 				 * the first SYN. */</div><div class='ctx'> 	u32	undo_marker;	/* snd_una upon a new recovery episode. */</div><div class='ctx'> 	int	undo_retrans;	/* number of undoable retransmissions. */</div><div class='add'>+	u32	mtu_info; /* We received an ICMP_FRAG_NEEDED / ICMPV6_PKT_TOOBIG</div><div class='add'>+			   * while socket was owned by user.</div><div class='add'>+			   */</div><div class='ctx'> 	u64	bytes_retrans;	/* RFC4898 tcpEStatsPerfOctetsRetrans</div><div class='ctx'> 				 * Total data bytes retransmitted</div><div class='ctx'> 				 */</div><div class='hunk'>@@ -470,9 +497,6 @@ struct tcp_sock {</div><div class='ctx'> 		u32		  probe_seq_end;</div><div class='ctx'> 	} mtu_probe;</div><div class='ctx'> 	u32     plb_rehash;     /* PLB-triggered rehash attempts */</div><div class='del'>-	u32	mtu_info; /* We received an ICMP_FRAG_NEEDED / ICMPV6_PKT_TOOBIG</div><div class='del'>-			   * while socket was owned by user.</div><div class='del'>-			   */</div><div class='ctx'> #if IS_ENABLED(CONFIG_MPTCP)</div><div class='ctx'> 	bool	is_mptcp;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -619,6 +643,7 @@ void tcp_sock_set_nodelay(struct sock *sk);</div><div class='ctx'> void tcp_sock_set_quickack(struct sock *sk, int val);</div><div class='ctx'> int tcp_sock_set_syncnt(struct sock *sk, int val);</div><div class='ctx'> int tcp_sock_set_user_timeout(struct sock *sk, int val);</div><div class='add'>+int tcp_sock_set_maxseg(struct sock *sk, int val);</div><div class='ctx'> </div><div class='ctx'> static inline bool dst_tcp_usec_ts(const struct dst_entry *dst)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/tee_core.h b/include/linux/tee_core.h<br/>new file mode 100644<br/>index 000000000000..1f3e5dad6d0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tee_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tee_core.h</a></div><div class='hunk'>@@ -0,0 +1,427 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 Linaro Limited</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __TEE_CORE_H</div><div class='add'>+#define __TEE_CORE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/dma-buf.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/tee.h&gt;</div><div class='add'>+#include &lt;linux/tee_drv.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The file describes the API provided by the generic TEE driver to the</div><div class='add'>+ * specific TEE driver.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define TEE_SHM_DYNAMIC		BIT(0)  /* Dynamic shared memory registered */</div><div class='add'>+					/* in secure world */</div><div class='add'>+#define TEE_SHM_USER_MAPPED	BIT(1)  /* Memory mapped in user space */</div><div class='add'>+#define TEE_SHM_POOL		BIT(2)  /* Memory allocated from pool */</div><div class='add'>+#define TEE_SHM_PRIV		BIT(3)  /* Memory private to TEE driver */</div><div class='add'>+#define TEE_SHM_DMA_BUF		BIT(4)	/* Memory with dma-buf handle */</div><div class='add'>+#define TEE_SHM_DMA_MEM		BIT(5)	/* Memory allocated with */</div><div class='add'>+					/* dma_alloc_pages() */</div><div class='add'>+</div><div class='add'>+#define TEE_DEVICE_FLAG_REGISTERED	0x1</div><div class='add'>+#define TEE_MAX_DEV_NAME_LEN		32</div><div class='add'>+</div><div class='add'>+enum tee_dma_heap_id {</div><div class='add'>+	TEE_DMA_HEAP_SECURE_VIDEO_PLAY = 1,</div><div class='add'>+	TEE_DMA_HEAP_TRUSTED_UI,</div><div class='add'>+	TEE_DMA_HEAP_SECURE_VIDEO_RECORD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tee_device - TEE Device representation</div><div class='add'>+ * @name:	name of device</div><div class='add'>+ * @desc:	description of device</div><div class='add'>+ * @id:		unique id of device</div><div class='add'>+ * @flags:	represented by TEE_DEVICE_FLAG_REGISTERED above</div><div class='add'>+ * @dev:	embedded basic device structure</div><div class='add'>+ * @cdev:	embedded cdev</div><div class='add'>+ * @num_users:	number of active users of this device</div><div class='add'>+ * @c_no_user:	completion used when unregistering the device</div><div class='add'>+ * @mutex:	mutex protecting @num_users and @idr</div><div class='add'>+ * @idr:	register of user space shared memory objects allocated or</div><div class='add'>+ *		registered on this device</div><div class='add'>+ * @pool:	shared memory pool</div><div class='add'>+ */</div><div class='add'>+struct tee_device {</div><div class='add'>+	char name[TEE_MAX_DEV_NAME_LEN];</div><div class='add'>+	const struct tee_desc *desc;</div><div class='add'>+	int id;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+</div><div class='add'>+	struct device dev;</div><div class='add'>+	struct cdev cdev;</div><div class='add'>+</div><div class='add'>+	size_t num_users;</div><div class='add'>+	struct completion c_no_users;</div><div class='add'>+	struct mutex mutex;	/* protects num_users and idr */</div><div class='add'>+</div><div class='add'>+	struct idr idr;</div><div class='add'>+	struct tee_shm_pool *pool;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tee_driver_ops - driver operations vtable</div><div class='add'>+ * @get_version:	returns version of driver</div><div class='add'>+ * @open:		called for a context when the device file is opened</div><div class='add'>+ * @close_context:	called when the device file is closed</div><div class='add'>+ * @release:		called to release the context</div><div class='add'>+ * @open_session:	open a new session</div><div class='add'>+ * @close_session:	close a session</div><div class='add'>+ * @system_session:	declare session as a system session</div><div class='add'>+ * @invoke_func:	invoke a trusted function</div><div class='add'>+ * @object_invoke_func:	invoke a TEE object</div><div class='add'>+ * @cancel_req:		request cancel of an ongoing invoke or open</div><div class='add'>+ * @supp_recv:		called for supplicant to get a command</div><div class='add'>+ * @supp_send:		called for supplicant to send a response</div><div class='add'>+ * @shm_register:	register shared memory buffer in TEE</div><div class='add'>+ * @shm_unregister:	unregister shared memory buffer in TEE</div><div class='add'>+ *</div><div class='add'>+ * The context given to @open might last longer than the device file if it is</div><div class='add'>+ * tied to other resources in the TEE driver. @close_context is called when the</div><div class='add'>+ * client closes the device file, even if there are existing references to the</div><div class='add'>+ * context. The TEE driver can use @close_context to start cleaning up.</div><div class='add'>+ */</div><div class='add'>+struct tee_driver_ops {</div><div class='add'>+	void (*get_version)(struct tee_device *teedev,</div><div class='add'>+			    struct tee_ioctl_version_data *vers);</div><div class='add'>+	int (*open)(struct tee_context *ctx);</div><div class='add'>+	void (*close_context)(struct tee_context *ctx);</div><div class='add'>+	void (*release)(struct tee_context *ctx);</div><div class='add'>+	int (*open_session)(struct tee_context *ctx,</div><div class='add'>+			    struct tee_ioctl_open_session_arg *arg,</div><div class='add'>+			    struct tee_param *param);</div><div class='add'>+	int (*close_session)(struct tee_context *ctx, u32 session);</div><div class='add'>+	int (*system_session)(struct tee_context *ctx, u32 session);</div><div class='add'>+	int (*invoke_func)(struct tee_context *ctx,</div><div class='add'>+			   struct tee_ioctl_invoke_arg *arg,</div><div class='add'>+			   struct tee_param *param);</div><div class='add'>+	int (*object_invoke_func)(struct tee_context *ctx,</div><div class='add'>+				  struct tee_ioctl_object_invoke_arg *arg,</div><div class='add'>+				  struct tee_param *param);</div><div class='add'>+	int (*cancel_req)(struct tee_context *ctx, u32 cancel_id, u32 session);</div><div class='add'>+	int (*supp_recv)(struct tee_context *ctx, u32 *func, u32 *num_params,</div><div class='add'>+			 struct tee_param *param);</div><div class='add'>+	int (*supp_send)(struct tee_context *ctx, u32 ret, u32 num_params,</div><div class='add'>+			 struct tee_param *param);</div><div class='add'>+	int (*shm_register)(struct tee_context *ctx, struct tee_shm *shm,</div><div class='add'>+			    struct page **pages, size_t num_pages,</div><div class='add'>+			    unsigned long start);</div><div class='add'>+	int (*shm_unregister)(struct tee_context *ctx, struct tee_shm *shm);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tee_desc - Describes the TEE driver to the subsystem</div><div class='add'>+ * @name:	name of driver</div><div class='add'>+ * @ops:	driver operations vtable</div><div class='add'>+ * @owner:	module providing the driver</div><div class='add'>+ * @flags:	Extra properties of driver, defined by TEE_DESC_* below</div><div class='add'>+ */</div><div class='add'>+#define TEE_DESC_PRIVILEGED	0x1</div><div class='add'>+struct tee_desc {</div><div class='add'>+	const char *name;</div><div class='add'>+	const struct tee_driver_ops *ops;</div><div class='add'>+	struct module *owner;</div><div class='add'>+	u32 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tee_protmem_pool - protected memory pool</div><div class='add'>+ * @ops:		operations</div><div class='add'>+ *</div><div class='add'>+ * This is an abstract interface where this struct is expected to be</div><div class='add'>+ * embedded in another struct specific to the implementation.</div><div class='add'>+ */</div><div class='add'>+struct tee_protmem_pool {</div><div class='add'>+	const struct tee_protmem_pool_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tee_protmem_pool_ops - protected memory pool operations</div><div class='add'>+ * @alloc:		called when allocating protected memory</div><div class='add'>+ * @free:		called when freeing protected memory</div><div class='add'>+ * @update_shm:		called when registering a dma-buf to update the @shm</div><div class='add'>+ *			with physical address of the buffer or to return the</div><div class='add'>+ *			@parent_shm of the memory pool</div><div class='add'>+ * @destroy_pool:	called when destroying the pool</div><div class='add'>+ */</div><div class='add'>+struct tee_protmem_pool_ops {</div><div class='add'>+	int (*alloc)(struct tee_protmem_pool *pool, struct sg_table *sgt,</div><div class='add'>+		     size_t size, size_t *offs);</div><div class='add'>+	void (*free)(struct tee_protmem_pool *pool, struct sg_table *sgt);</div><div class='add'>+	int (*update_shm)(struct tee_protmem_pool *pool, struct sg_table *sgt,</div><div class='add'>+			  size_t offs, struct tee_shm *shm,</div><div class='add'>+			  struct tee_shm **parent_shm);</div><div class='add'>+	void (*destroy_pool)(struct tee_protmem_pool *pool);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_device_alloc() - Allocate a new struct tee_device instance</div><div class='add'>+ * @teedesc:	Descriptor for this driver</div><div class='add'>+ * @dev:	Parent device for this device</div><div class='add'>+ * @pool:	Shared memory pool, NULL if not used</div><div class='add'>+ * @driver_data: Private driver data for this device</div><div class='add'>+ *</div><div class='add'>+ * Allocates a new struct tee_device instance. The device is</div><div class='add'>+ * removed by tee_device_unregister().</div><div class='add'>+ *</div><div class='add'>+ * @returns a pointer to a 'struct tee_device' or an ERR_PTR on failure</div><div class='add'>+ */</div><div class='add'>+struct tee_device *tee_device_alloc(const struct tee_desc *teedesc,</div><div class='add'>+				    struct device *dev,</div><div class='add'>+				    struct tee_shm_pool *pool,</div><div class='add'>+				    void *driver_data);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_device_register() - Registers a TEE device</div><div class='add'>+ * @teedev:	Device to register</div><div class='add'>+ *</div><div class='add'>+ * tee_device_unregister() need to be called to remove the @teedev if</div><div class='add'>+ * this function fails.</div><div class='add'>+ *</div><div class='add'>+ * @returns &lt; 0 on failure</div><div class='add'>+ */</div><div class='add'>+int tee_device_register(struct tee_device *teedev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_device_unregister() - Removes a TEE device</div><div class='add'>+ * @teedev:	Device to unregister</div><div class='add'>+ *</div><div class='add'>+ * This function should be called to remove the @teedev even if</div><div class='add'>+ * tee_device_register() hasn't been called yet. Does nothing if</div><div class='add'>+ * @teedev is NULL.</div><div class='add'>+ */</div><div class='add'>+void tee_device_unregister(struct tee_device *teedev);</div><div class='add'>+</div><div class='add'>+int tee_device_register_dma_heap(struct tee_device *teedev,</div><div class='add'>+				 enum tee_dma_heap_id id,</div><div class='add'>+				 struct tee_protmem_pool *pool);</div><div class='add'>+void tee_device_put_all_dma_heaps(struct tee_device *teedev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_device_get() - Increment the user count for a tee_device</div><div class='add'>+ * @teedev: Pointer to the tee_device</div><div class='add'>+ *</div><div class='add'>+ * If tee_device_unregister() has been called and the final user of @teedev</div><div class='add'>+ * has already released the device, this function will fail to prevent new users</div><div class='add'>+ * from accessing the device during the unregistration process.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if @teedev remains valid, otherwise false</div><div class='add'>+ */</div><div class='add'>+bool tee_device_get(struct tee_device *teedev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_device_put() - Decrease the user count for a tee_device</div><div class='add'>+ * @teedev: pointer to the tee_device</div><div class='add'>+ */</div><div class='add'>+void tee_device_put(struct tee_device *teedev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_device_set_dev_groups() - Set device attribute groups</div><div class='add'>+ * @teedev:	Device to register</div><div class='add'>+ * @dev_groups: Attribute groups</div><div class='add'>+ *</div><div class='add'>+ * Assigns the provided @dev_groups to the @teedev to be registered later</div><div class='add'>+ * with tee_device_register(). Calling this function is optional, but if</div><div class='add'>+ * it's called it must be called before tee_device_register().</div><div class='add'>+ */</div><div class='add'>+void tee_device_set_dev_groups(struct tee_device *teedev,</div><div class='add'>+			       const struct attribute_group **dev_groups);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_session_calc_client_uuid() - Calculates client UUID for session</div><div class='add'>+ * @uuid:		Resulting UUID</div><div class='add'>+ * @connection_method:	Connection method for session (TEE_IOCTL_LOGIN_*)</div><div class='add'>+ * @connectuon_data:	Connection data for opening session</div><div class='add'>+ *</div><div class='add'>+ * Based on connection method calculates UUIDv5 based client UUID.</div><div class='add'>+ *</div><div class='add'>+ * For group based logins verifies that calling process has specified</div><div class='add'>+ * credentials.</div><div class='add'>+ *</div><div class='add'>+ * @return &lt; 0 on failure</div><div class='add'>+ */</div><div class='add'>+int tee_session_calc_client_uuid(uuid_t *uuid, u32 connection_method,</div><div class='add'>+				 const u8 connection_data[TEE_IOCTL_UUID_LEN]);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tee_shm_pool - shared memory pool</div><div class='add'>+ * @ops:		operations</div><div class='add'>+ * @private_data:	private data for the shared memory manager</div><div class='add'>+ */</div><div class='add'>+struct tee_shm_pool {</div><div class='add'>+	const struct tee_shm_pool_ops *ops;</div><div class='add'>+	void *private_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tee_shm_pool_ops - shared memory pool operations</div><div class='add'>+ * @alloc:		called when allocating shared memory</div><div class='add'>+ * @free:		called when freeing shared memory</div><div class='add'>+ * @destroy_pool:	called when destroying the pool</div><div class='add'>+ */</div><div class='add'>+struct tee_shm_pool_ops {</div><div class='add'>+	int (*alloc)(struct tee_shm_pool *pool, struct tee_shm *shm,</div><div class='add'>+		     size_t size, size_t align);</div><div class='add'>+	void (*free)(struct tee_shm_pool *pool, struct tee_shm *shm);</div><div class='add'>+	void (*destroy_pool)(struct tee_shm_pool *pool);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * tee_shm_pool_alloc_res_mem() - Create a shm manager for reserved memory</div><div class='add'>+ * @vaddr:	Virtual address of start of pool</div><div class='add'>+ * @paddr:	Physical address of start of pool</div><div class='add'>+ * @size:	Size in bytes of the pool</div><div class='add'>+ *</div><div class='add'>+ * @returns pointer to a 'struct tee_shm_pool' or an ERR_PTR on failure.</div><div class='add'>+ */</div><div class='add'>+struct tee_shm_pool *tee_shm_pool_alloc_res_mem(unsigned long vaddr,</div><div class='add'>+						phys_addr_t paddr, size_t size,</div><div class='add'>+						int min_alloc_order);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_shm_pool_free() - Free a shared memory pool</div><div class='add'>+ * @pool:	The shared memory pool to free</div><div class='add'>+ *</div><div class='add'>+ * The must be no remaining shared memory allocated from this pool when</div><div class='add'>+ * this function is called.</div><div class='add'>+ */</div><div class='add'>+static inline void tee_shm_pool_free(struct tee_shm_pool *pool)</div><div class='add'>+{</div><div class='add'>+	pool-&gt;ops-&gt;destroy_pool(pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_protmem_static_pool_alloc() - Create a protected memory manager</div><div class='add'>+ * @paddr:	Physical address of start of pool</div><div class='add'>+ * @size:	Size in bytes of the pool</div><div class='add'>+ *</div><div class='add'>+ * @returns pointer to a 'struct tee_protmem_pool' or an ERR_PTR on failure.</div><div class='add'>+ */</div><div class='add'>+struct tee_protmem_pool *tee_protmem_static_pool_alloc(phys_addr_t paddr,</div><div class='add'>+						       size_t size);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_get_drvdata() - Return driver_data pointer</div><div class='add'>+ * @returns the driver_data pointer supplied to tee_register().</div><div class='add'>+ */</div><div class='add'>+void *tee_get_drvdata(struct tee_device *teedev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_shm_alloc_priv_buf() - Allocate shared memory for private use by specific</div><div class='add'>+ *                            TEE driver</div><div class='add'>+ * @ctx:	The TEE context for shared memory allocation</div><div class='add'>+ * @size:	Shared memory allocation size</div><div class='add'>+ * @returns a pointer to 'struct tee_shm' on success or an ERR_PTR on failure</div><div class='add'>+ */</div><div class='add'>+struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size);</div><div class='add'>+</div><div class='add'>+struct tee_shm *tee_shm_alloc_dma_mem(struct tee_context *ctx,</div><div class='add'>+				      size_t page_count);</div><div class='add'>+</div><div class='add'>+int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,</div><div class='add'>+			     int (*shm_register)(struct tee_context *ctx,</div><div class='add'>+						 struct tee_shm *shm,</div><div class='add'>+						 struct page **pages,</div><div class='add'>+						 size_t num_pages,</div><div class='add'>+						 unsigned long start));</div><div class='add'>+void tee_dyn_shm_free_helper(struct tee_shm *shm,</div><div class='add'>+			     int (*shm_unregister)(struct tee_context *ctx,</div><div class='add'>+						   struct tee_shm *shm));</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_shm_is_dynamic() - Check if shared memory object is of the dynamic kind</div><div class='add'>+ * @shm:	Shared memory handle</div><div class='add'>+ * @returns true if object is dynamic shared memory</div><div class='add'>+ */</div><div class='add'>+static inline bool tee_shm_is_dynamic(struct tee_shm *shm)</div><div class='add'>+{</div><div class='add'>+	return shm &amp;&amp; (shm-&gt;flags &amp; TEE_SHM_DYNAMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_shm_put() - Decrease reference count on a shared memory handle</div><div class='add'>+ * @shm:	Shared memory handle</div><div class='add'>+ */</div><div class='add'>+void tee_shm_put(struct tee_shm *shm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_shm_get_id() - Get id of a shared memory object</div><div class='add'>+ * @shm:	Shared memory handle</div><div class='add'>+ * @returns id</div><div class='add'>+ */</div><div class='add'>+static inline int tee_shm_get_id(struct tee_shm *shm)</div><div class='add'>+{</div><div class='add'>+	return shm-&gt;id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tee_shm_get_from_id() - Find shared memory object and increase reference</div><div class='add'>+ * count</div><div class='add'>+ * @ctx:	Context owning the shared memory</div><div class='add'>+ * @id:		Id of shared memory object</div><div class='add'>+ * @returns a pointer to 'struct tee_shm' on success or an ERR_PTR on failure</div><div class='add'>+ */</div><div class='add'>+struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id);</div><div class='add'>+</div><div class='add'>+static inline bool tee_param_is_memref(struct tee_param *param)</div><div class='add'>+{</div><div class='add'>+	switch (param-&gt;attr &amp; TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {</div><div class='add'>+	case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:</div><div class='add'>+	case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:</div><div class='add'>+	case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * teedev_open() - Open a struct tee_device</div><div class='add'>+ * @teedev:	Device to open</div><div class='add'>+ *</div><div class='add'>+ * @return a pointer to struct tee_context on success or an ERR_PTR on failure.</div><div class='add'>+ */</div><div class='add'>+struct tee_context *teedev_open(struct tee_device *teedev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * teedev_close_context() - closes a struct tee_context</div><div class='add'>+ * @ctx:	The struct tee_context to close</div><div class='add'>+ */</div><div class='add'>+void teedev_close_context(struct tee_context *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * teedev_ctx_get() - Increment the reference count of a context</div><div class='add'>+ * @ctx: Pointer to the context</div><div class='add'>+ *</div><div class='add'>+ * This function increases the refcount of the context, which is tied to</div><div class='add'>+ * resources shared by the same tee_device. During the unregistration process,</div><div class='add'>+ * the context may remain valid even after tee_device_unregister() has returned.</div><div class='add'>+ *</div><div class='add'>+ * Users should ensure that the context's refcount is properly decreased before</div><div class='add'>+ * calling tee_device_put(), typically within the context's release() function.</div><div class='add'>+ * Alternatively, users can call tee_device_get() and teedev_ctx_get() together</div><div class='add'>+ * and release them simultaneously (see shm_alloc_helper()).</div><div class='add'>+ */</div><div class='add'>+void teedev_ctx_get(struct tee_context *ctx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * teedev_ctx_put() - Decrease reference count on a context</div><div class='add'>+ * @ctx: pointer to the context</div><div class='add'>+ */</div><div class='add'>+void teedev_ctx_put(struct tee_context *ctx);</div><div class='add'>+</div><div class='add'>+#endif /*__TEE_CORE_H*/</div><div class='head'>diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h<br/>index 71632e3c5f18..88a6f9697c89 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tee_drv.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tee_drv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tee_drv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tee_drv.h</a></div><div class='hunk'>@@ -1,40 +1,28 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2015-2022 Linaro Limited</div><div class='add'>+ * Copyright (c) 2015-2024 Linaro Limited</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __TEE_DRV_H</div><div class='ctx'> #define __TEE_DRV_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;linux/tee.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/uuid.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The file describes the API provided by the generic TEE driver to the</div><div class='del'>- * specific TEE driver.</div><div class='add'>+ * The file describes the API provided by the TEE subsystem to the</div><div class='add'>+ * TEE client drivers.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define TEE_SHM_DYNAMIC		BIT(0)  /* Dynamic shared memory registered */</div><div class='del'>-					/* in secure world */</div><div class='del'>-#define TEE_SHM_USER_MAPPED	BIT(1)  /* Memory mapped in user space */</div><div class='del'>-#define TEE_SHM_POOL		BIT(2)  /* Memory allocated from pool */</div><div class='del'>-#define TEE_SHM_PRIV		BIT(3)  /* Memory private to TEE driver */</div><div class='del'>-</div><div class='del'>-struct device;</div><div class='ctx'> struct tee_device;</div><div class='del'>-struct tee_shm;</div><div class='del'>-struct tee_shm_pool;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct tee_context - driver specific context on file pointer data</div><div class='ctx'>  * @teedev:	pointer to this drivers struct tee_device</div><div class='del'>- * @list_shm:	List of shared memory object owned by this context</div><div class='ctx'>  * @data:	driver specific context data, managed by the driver</div><div class='ctx'>  * @refcount:	reference counter for this structure</div><div class='ctx'>  * @releasing:  flag that indicates if context is being released right now.</div><div class='hunk'>@@ -57,134 +45,6 @@ struct tee_context {</div><div class='ctx'> 	bool cap_memref_null;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct tee_param_memref {</div><div class='del'>-	size_t shm_offs;</div><div class='del'>-	size_t size;</div><div class='del'>-	struct tee_shm *shm;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tee_param_value {</div><div class='del'>-	u64 a;</div><div class='del'>-	u64 b;</div><div class='del'>-	u64 c;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tee_param {</div><div class='del'>-	u64 attr;</div><div class='del'>-	union {</div><div class='del'>-		struct tee_param_memref memref;</div><div class='del'>-		struct tee_param_value value;</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct tee_driver_ops - driver operations vtable</div><div class='del'>- * @get_version:	returns version of driver</div><div class='del'>- * @open:		called when the device file is opened</div><div class='del'>- * @release:		release this open file</div><div class='del'>- * @open_session:	open a new session</div><div class='del'>- * @close_session:	close a session</div><div class='del'>- * @system_session:	declare session as a system session</div><div class='del'>- * @invoke_func:	invoke a trusted function</div><div class='del'>- * @cancel_req:		request cancel of an ongoing invoke or open</div><div class='del'>- * @supp_recv:		called for supplicant to get a command</div><div class='del'>- * @supp_send:		called for supplicant to send a response</div><div class='del'>- * @shm_register:	register shared memory buffer in TEE</div><div class='del'>- * @shm_unregister:	unregister shared memory buffer in TEE</div><div class='del'>- */</div><div class='del'>-struct tee_driver_ops {</div><div class='del'>-	void (*get_version)(struct tee_device *teedev,</div><div class='del'>-			    struct tee_ioctl_version_data *vers);</div><div class='del'>-	int (*open)(struct tee_context *ctx);</div><div class='del'>-	void (*release)(struct tee_context *ctx);</div><div class='del'>-	int (*open_session)(struct tee_context *ctx,</div><div class='del'>-			    struct tee_ioctl_open_session_arg *arg,</div><div class='del'>-			    struct tee_param *param);</div><div class='del'>-	int (*close_session)(struct tee_context *ctx, u32 session);</div><div class='del'>-	int (*system_session)(struct tee_context *ctx, u32 session);</div><div class='del'>-	int (*invoke_func)(struct tee_context *ctx,</div><div class='del'>-			   struct tee_ioctl_invoke_arg *arg,</div><div class='del'>-			   struct tee_param *param);</div><div class='del'>-	int (*cancel_req)(struct tee_context *ctx, u32 cancel_id, u32 session);</div><div class='del'>-	int (*supp_recv)(struct tee_context *ctx, u32 *func, u32 *num_params,</div><div class='del'>-			 struct tee_param *param);</div><div class='del'>-	int (*supp_send)(struct tee_context *ctx, u32 ret, u32 num_params,</div><div class='del'>-			 struct tee_param *param);</div><div class='del'>-	int (*shm_register)(struct tee_context *ctx, struct tee_shm *shm,</div><div class='del'>-			    struct page **pages, size_t num_pages,</div><div class='del'>-			    unsigned long start);</div><div class='del'>-	int (*shm_unregister)(struct tee_context *ctx, struct tee_shm *shm);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct tee_desc - Describes the TEE driver to the subsystem</div><div class='del'>- * @name:	name of driver</div><div class='del'>- * @ops:	driver operations vtable</div><div class='del'>- * @owner:	module providing the driver</div><div class='del'>- * @flags:	Extra properties of driver, defined by TEE_DESC_* below</div><div class='del'>- */</div><div class='del'>-#define TEE_DESC_PRIVILEGED	0x1</div><div class='del'>-struct tee_desc {</div><div class='del'>-	const char *name;</div><div class='del'>-	const struct tee_driver_ops *ops;</div><div class='del'>-	struct module *owner;</div><div class='del'>-	u32 flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tee_device_alloc() - Allocate a new struct tee_device instance</div><div class='del'>- * @teedesc:	Descriptor for this driver</div><div class='del'>- * @dev:	Parent device for this device</div><div class='del'>- * @pool:	Shared memory pool, NULL if not used</div><div class='del'>- * @driver_data: Private driver data for this device</div><div class='del'>- *</div><div class='del'>- * Allocates a new struct tee_device instance. The device is</div><div class='del'>- * removed by tee_device_unregister().</div><div class='del'>- *</div><div class='del'>- * @returns a pointer to a 'struct tee_device' or an ERR_PTR on failure</div><div class='del'>- */</div><div class='del'>-struct tee_device *tee_device_alloc(const struct tee_desc *teedesc,</div><div class='del'>-				    struct device *dev,</div><div class='del'>-				    struct tee_shm_pool *pool,</div><div class='del'>-				    void *driver_data);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tee_device_register() - Registers a TEE device</div><div class='del'>- * @teedev:	Device to register</div><div class='del'>- *</div><div class='del'>- * tee_device_unregister() need to be called to remove the @teedev if</div><div class='del'>- * this function fails.</div><div class='del'>- *</div><div class='del'>- * @returns &lt; 0 on failure</div><div class='del'>- */</div><div class='del'>-int tee_device_register(struct tee_device *teedev);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tee_device_unregister() - Removes a TEE device</div><div class='del'>- * @teedev:	Device to unregister</div><div class='del'>- *</div><div class='del'>- * This function should be called to remove the @teedev even if</div><div class='del'>- * tee_device_register() hasn't been called yet. Does nothing if</div><div class='del'>- * @teedev is NULL.</div><div class='del'>- */</div><div class='del'>-void tee_device_unregister(struct tee_device *teedev);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tee_session_calc_client_uuid() - Calculates client UUID for session</div><div class='del'>- * @uuid:		Resulting UUID</div><div class='del'>- * @connection_method:	Connection method for session (TEE_IOCTL_LOGIN_*)</div><div class='del'>- * @connectuon_data:	Connection data for opening session</div><div class='del'>- *</div><div class='del'>- * Based on connection method calculates UUIDv5 based client UUID.</div><div class='del'>- *</div><div class='del'>- * For group based logins verifies that calling process has specified</div><div class='del'>- * credentials.</div><div class='del'>- *</div><div class='del'>- * @return &lt; 0 on failure</div><div class='del'>- */</div><div class='del'>-int tee_session_calc_client_uuid(uuid_t *uuid, u32 connection_method,</div><div class='del'>-				 const u8 connection_data[TEE_IOCTL_UUID_LEN]);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * struct tee_shm - shared memory object</div><div class='ctx'>  * @ctx:	context using the object</div><div class='hunk'>@@ -195,15 +55,12 @@ int tee_session_calc_client_uuid(uuid_t *uuid, u32 connection_method,</div><div class='ctx'>  * @pages:	locked pages from userspace</div><div class='ctx'>  * @num_pages:	number of locked pages</div><div class='ctx'>  * @refcount:	reference counter</div><div class='del'>- * @flags:	defined by TEE_SHM_* in tee_drv.h</div><div class='add'>+ * @flags:	defined by TEE_SHM_* in tee_core.h</div><div class='ctx'>  * @id:		unique id of a shared memory object on this device, shared</div><div class='ctx'>  *		with user space</div><div class='ctx'>  * @sec_world_id:</div><div class='ctx'>  *		secure world assigned id of this shared memory object, not</div><div class='ctx'>  *		used by all drivers</div><div class='del'>- *</div><div class='del'>- * This pool is only supposed to be accessed directly from the TEE</div><div class='del'>- * subsystem and from drivers that implements their own shm pool manager.</div><div class='ctx'>  */</div><div class='ctx'> struct tee_shm {</div><div class='ctx'> 	struct tee_context *ctx;</div><div class='hunk'>@@ -219,74 +76,67 @@ struct tee_shm {</div><div class='ctx'> 	u64 sec_world_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct tee_shm_pool - shared memory pool</div><div class='del'>- * @ops:		operations</div><div class='del'>- * @private_data:	private data for the shared memory manager</div><div class='del'>- */</div><div class='del'>-struct tee_shm_pool {</div><div class='del'>-	const struct tee_shm_pool_ops *ops;</div><div class='del'>-	void *private_data;</div><div class='add'>+struct tee_param_memref {</div><div class='add'>+	size_t shm_offs;</div><div class='add'>+	size_t size;</div><div class='add'>+	struct tee_shm *shm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct tee_shm_pool_ops - shared memory pool operations</div><div class='del'>- * @alloc:		called when allocating shared memory</div><div class='del'>- * @free:		called when freeing shared memory</div><div class='del'>- * @destroy_pool:	called when destroying the pool</div><div class='del'>- */</div><div class='del'>-struct tee_shm_pool_ops {</div><div class='del'>-	int (*alloc)(struct tee_shm_pool *pool, struct tee_shm *shm,</div><div class='del'>-		     size_t size, size_t align);</div><div class='del'>-	void (*free)(struct tee_shm_pool *pool, struct tee_shm *shm);</div><div class='del'>-	void (*destroy_pool)(struct tee_shm_pool *pool);</div><div class='add'>+struct tee_param_ubuf {</div><div class='add'>+	void __user *uaddr;</div><div class='add'>+	size_t size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * tee_shm_pool_alloc_res_mem() - Create a shm manager for reserved memory</div><div class='del'>- * @vaddr:	Virtual address of start of pool</div><div class='del'>- * @paddr:	Physical address of start of pool</div><div class='del'>- * @size:	Size in bytes of the pool</div><div class='del'>- *</div><div class='del'>- * @returns pointer to a 'struct tee_shm_pool' or an ERR_PTR on failure.</div><div class='del'>- */</div><div class='del'>-struct tee_shm_pool *tee_shm_pool_alloc_res_mem(unsigned long vaddr,</div><div class='del'>-						phys_addr_t paddr, size_t size,</div><div class='del'>-						int min_alloc_order);</div><div class='add'>+struct tee_param_objref {</div><div class='add'>+	u64 id;</div><div class='add'>+	u64 flags;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * tee_shm_pool_free() - Free a shared memory pool</div><div class='del'>- * @pool:	The shared memory pool to free</div><div class='del'>- *</div><div class='del'>- * The must be no remaining shared memory allocated from this pool when</div><div class='del'>- * this function is called.</div><div class='del'>- */</div><div class='del'>-static inline void tee_shm_pool_free(struct tee_shm_pool *pool)</div><div class='del'>-{</div><div class='del'>-	pool-&gt;ops-&gt;destroy_pool(pool);</div><div class='del'>-}</div><div class='add'>+struct tee_param_value {</div><div class='add'>+	u64 a;</div><div class='add'>+	u64 b;</div><div class='add'>+	u64 c;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tee_param {</div><div class='add'>+	u64 attr;</div><div class='add'>+	union {</div><div class='add'>+		struct tee_param_memref memref;</div><div class='add'>+		struct tee_param_objref objref;</div><div class='add'>+		struct tee_param_ubuf ubuf;</div><div class='add'>+		struct tee_param_value value;</div><div class='add'>+	} u;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * tee_get_drvdata() - Return driver_data pointer</div><div class='del'>- * @returns the driver_data pointer supplied to tee_register().</div><div class='add'>+ * tee_shm_alloc_kernel_buf() - Allocate kernel shared memory for a</div><div class='add'>+ *                              particular TEE client driver</div><div class='add'>+ * @ctx:	The TEE context for shared memory allocation</div><div class='add'>+ * @size:	Shared memory allocation size</div><div class='add'>+ * @returns a pointer to 'struct tee_shm' on success or an ERR_PTR on failure</div><div class='ctx'>  */</div><div class='del'>-void *tee_get_drvdata(struct tee_device *teedev);</div><div class='del'>-</div><div class='del'>-struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t size);</div><div class='ctx'> struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * tee_shm_register_kernel_buf() - Register kernel shared memory for a</div><div class='add'>+ *                                 particular TEE client driver</div><div class='add'>+ * @ctx:	The TEE context for shared memory registration</div><div class='add'>+ * @addr:	Kernel buffer address</div><div class='add'>+ * @length:	Kernel buffer length</div><div class='add'>+ * @returns a pointer to 'struct tee_shm' on success or an ERR_PTR on failure</div><div class='add'>+ */</div><div class='ctx'> struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx,</div><div class='ctx'> 					    void *addr, size_t length);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * tee_shm_is_dynamic() - Check if shared memory object is of the dynamic kind</div><div class='del'>- * @shm:	Shared memory handle</div><div class='del'>- * @returns true if object is dynamic shared memory</div><div class='add'>+ * tee_shm_register_fd() - Register shared memory from file descriptor</div><div class='add'>+ *</div><div class='add'>+ * @ctx:	Context that allocates the shared memory</div><div class='add'>+ * @fd:		Shared memory file descriptor reference</div><div class='add'>+ *</div><div class='add'>+ * @returns a pointer to 'struct tee_shm' on success, and ERR_PTR on failure</div><div class='ctx'>  */</div><div class='del'>-static inline bool tee_shm_is_dynamic(struct tee_shm *shm)</div><div class='del'>-{</div><div class='del'>-	return shm &amp;&amp; (shm-&gt;flags &amp; TEE_SHM_DYNAMIC);</div><div class='del'>-}</div><div class='add'>+struct tee_shm *tee_shm_register_fd(struct tee_context *ctx, int fd);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * tee_shm_free() - Free shared memory</div><div class='hunk'>@@ -295,12 +145,6 @@ static inline bool tee_shm_is_dynamic(struct tee_shm *shm)</div><div class='ctx'> void tee_shm_free(struct tee_shm *shm);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * tee_shm_put() - Decrease reference count on a shared memory handle</div><div class='del'>- * @shm:	Shared memory handle</div><div class='del'>- */</div><div class='del'>-void tee_shm_put(struct tee_shm *shm);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * tee_shm_get_va() - Get virtual address of a shared memory plus an offset</div><div class='ctx'>  * @shm:	Shared memory handle</div><div class='ctx'>  * @offs:	Offset from start of this shared memory</div><div class='hunk'>@@ -353,25 +197,6 @@ static inline size_t tee_shm_get_page_offset(struct tee_shm *shm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * tee_shm_get_id() - Get id of a shared memory object</div><div class='del'>- * @shm:	Shared memory handle</div><div class='del'>- * @returns id</div><div class='del'>- */</div><div class='del'>-static inline int tee_shm_get_id(struct tee_shm *shm)</div><div class='del'>-{</div><div class='del'>-	return shm-&gt;id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tee_shm_get_from_id() - Find shared memory object and increase reference</div><div class='del'>- * count</div><div class='del'>- * @ctx:	Context owning the shared memory</div><div class='del'>- * @id:		Id of shared memory object</div><div class='del'>- * @returns a pointer to 'struct tee_shm' on success or an ERR_PTR on failure</div><div class='del'>- */</div><div class='del'>-struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id);</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * tee_client_open_context() - Open a TEE context</div><div class='ctx'>  * @start:	if not NULL, continue search after this context</div><div class='ctx'>  * @match:	function to check TEE device</div><div class='hunk'>@@ -470,18 +295,6 @@ int tee_client_invoke_func(struct tee_context *ctx,</div><div class='ctx'> int tee_client_cancel_req(struct tee_context *ctx,</div><div class='ctx'> 			  struct tee_ioctl_cancel_arg *arg);</div><div class='ctx'> </div><div class='del'>-static inline bool tee_param_is_memref(struct tee_param *param)</div><div class='del'>-{</div><div class='del'>-	switch (param-&gt;attr &amp; TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {</div><div class='del'>-	case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:</div><div class='del'>-	case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:</div><div class='del'>-	case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern const struct bus_type tee_bus_type;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -507,20 +320,6 @@ struct tee_client_driver {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_tee_client_driver(d) \</div><div class='del'>-		container_of(d, struct tee_client_driver, driver)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * teedev_open() - Open a struct tee_device</div><div class='del'>- * @teedev:	Device to open</div><div class='del'>- *</div><div class='del'>- * @return a pointer to struct tee_context on success or an ERR_PTR on failure.</div><div class='del'>- */</div><div class='del'>-struct tee_context *teedev_open(struct tee_device *teedev);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * teedev_close_context() - closes a struct tee_context</div><div class='del'>- * @ctx:	The struct tee_context to close</div><div class='del'>- */</div><div class='del'>-void teedev_close_context(struct tee_context *ctx);</div><div class='add'>+		container_of_const(d, struct tee_client_driver, driver)</div><div class='ctx'> </div><div class='ctx'> #endif /*__TEE_DRV_H*/</div><div class='head'>diff --git a/include/linux/text-patching.h b/include/linux/text-patching.h<br/>new file mode 100644<br/>index 000000000000..ad5877ab0855<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/text-patching.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/text-patching.h</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_TEXT_PATCHING_H</div><div class='add'>+#define _LINUX_TEXT_PATCHING_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/text-patching.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef text_poke_copy</div><div class='add'>+static inline void *text_poke_copy(void *dst, const void *src, size_t len)</div><div class='add'>+{</div><div class='add'>+	return memcpy(dst, src, len);</div><div class='add'>+}</div><div class='add'>+#define text_poke_copy text_poke_copy</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_TEXT_PATCHING_H */</div><div class='head'>diff --git a/include/linux/tfrc.h b/include/linux/tfrc.h<br/>deleted file mode 100644<br/>index a5acc768085d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tfrc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tfrc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-#ifndef _LINUX_TFRC_H_</div><div class='del'>-#define _LINUX_TFRC_H_</div><div class='del'>-/*</div><div class='del'>- *  TFRC - Data Structures for the TCP-Friendly Rate Control congestion</div><div class='del'>- *         control mechanism as specified in RFC 3448.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand.</div><div class='del'>- *  Copyright (c) 2005 Ian McDonald &lt;iam4@cs.waikato.ac.nz&gt;</div><div class='del'>- *  Copyright (c) 2005 Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *  Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/** 	tfrc_rx_info    -    TFRC Receiver Data Structure</div><div class='del'>- *</div><div class='del'>- * 	@tfrcrx_x_recv:	receiver estimate of sending rate (3.2.2)</div><div class='del'>- * 	@tfrcrx_rtt:	round-trip-time (communicated by sender)</div><div class='del'>- * 	@tfrcrx_p:	current estimate of loss event rate (3.2.2)</div><div class='del'>- */</div><div class='del'>-struct tfrc_rx_info {</div><div class='del'>-  	__u32 tfrcrx_x_recv;</div><div class='del'>-	__u32 tfrcrx_rtt;</div><div class='del'>-  	__u32 tfrcrx_p;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/** 	tfrc_tx_info    -    TFRC Sender Data Structure</div><div class='del'>- *</div><div class='del'>- * 	@tfrctx_x:	computed transmit rate (4.3 (4))</div><div class='del'>- * 	@tfrctx_x_recv: receiver estimate of send rate (4.3)</div><div class='del'>- * 	@tfrctx_x_calc:	return value of throughput equation (3.1)</div><div class='del'>- * 	@tfrctx_rtt:	(moving average) estimate of RTT (4.3)</div><div class='del'>- * 	@tfrctx_p:	current loss event rate (5.4)</div><div class='del'>- * 	@tfrctx_rto:	estimate of RTO, equals 4*RTT (4.3)</div><div class='del'>- * 	@tfrctx_ipi:	inter-packet interval (4.6)</div><div class='del'>- *</div><div class='del'>- *  Note: X and X_recv are both maintained in units of 64 * bytes/second. This</div><div class='del'>- *        enables a finer resolution of sending rates and avoids problems with</div><div class='del'>- *        integer arithmetic; u32 is not sufficient as scaling consumes 6 bits.</div><div class='del'>- */</div><div class='del'>-struct tfrc_tx_info {</div><div class='del'>-	__u64 tfrctx_x;</div><div class='del'>-	__u64 tfrctx_x_recv;</div><div class='del'>-	__u32 tfrctx_x_calc;</div><div class='del'>-	__u32 tfrctx_rtt;</div><div class='del'>-	__u32 tfrctx_p;</div><div class='del'>-	__u32 tfrctx_rto;</div><div class='del'>-	__u32 tfrctx_ipi;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _LINUX_TFRC_H_ */</div><div class='head'>diff --git a/include/linux/thermal.h b/include/linux/thermal.h<br/>index c33f50177f51..0b5ed6821080 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/thermal.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/thermal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/thermal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/thermal.h</a></div><div class='hunk'>@@ -55,13 +55,16 @@ enum thermal_notify_event {</div><div class='ctx'> 	THERMAL_TZ_BIND_CDEV, /* Cooling dev is bind to the thermal zone */</div><div class='ctx'> 	THERMAL_TZ_UNBIND_CDEV, /* Cooling dev is unbind from the thermal zone */</div><div class='ctx'> 	THERMAL_INSTANCE_WEIGHT_CHANGED, /* Thermal instance weight changed */</div><div class='add'>+	THERMAL_TZ_RESUME, /* Thermal zone is resuming after system sleep */</div><div class='add'>+	THERMAL_TZ_ADD_THRESHOLD, /* Threshold added */</div><div class='add'>+	THERMAL_TZ_DEL_THRESHOLD, /* Threshold deleted */</div><div class='add'>+	THERMAL_TZ_FLUSH_THRESHOLDS, /* All thresholds deleted */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct thermal_trip - representation of a point in temperature domain</div><div class='ctx'>  * @temperature: temperature value in miliCelsius</div><div class='ctx'>  * @hysteresis: relative hysteresis in miliCelsius</div><div class='del'>- * @threshold: trip crossing notification threshold miliCelsius</div><div class='ctx'>  * @type: trip point type</div><div class='ctx'>  * @priv: pointer to driver data associated with this trip</div><div class='ctx'>  * @flags: flags representing binary properties of the trip</div><div class='hunk'>@@ -69,7 +72,6 @@ enum thermal_notify_event {</div><div class='ctx'> struct thermal_trip {</div><div class='ctx'> 	int temperature;</div><div class='ctx'> 	int hysteresis;</div><div class='del'>-	int threshold;</div><div class='ctx'> 	enum thermal_trip_type type;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	void *priv;</div><div class='hunk'>@@ -81,16 +83,26 @@ struct thermal_trip {</div><div class='ctx'> #define THERMAL_TRIP_FLAG_RW	(THERMAL_TRIP_FLAG_RW_TEMP | \</div><div class='ctx'> 				 THERMAL_TRIP_FLAG_RW_HYST)</div><div class='ctx'> </div><div class='add'>+#define THERMAL_TRIP_PRIV_TO_INT(_val_)	(uintptr_t)(_val_)</div><div class='add'>+#define THERMAL_INT_TO_TRIP_PRIV(_val_)	(void *)(uintptr_t)(_val_)</div><div class='add'>+</div><div class='add'>+struct cooling_spec {</div><div class='add'>+	unsigned long upper;	/* Highest cooling state  */</div><div class='add'>+	unsigned long lower;	/* Lowest cooling state  */</div><div class='add'>+	unsigned int weight;	/* Cooling device weight */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct thermal_zone_device_ops {</div><div class='del'>-	int (*bind) (struct thermal_zone_device *,</div><div class='del'>-		     struct thermal_cooling_device *);</div><div class='del'>-	int (*unbind) (struct thermal_zone_device *,</div><div class='del'>-		       struct thermal_cooling_device *);</div><div class='add'>+	bool (*should_bind) (struct thermal_zone_device *,</div><div class='add'>+			     const struct thermal_trip *,</div><div class='add'>+			     struct thermal_cooling_device *,</div><div class='add'>+			     struct cooling_spec *);</div><div class='ctx'> 	int (*get_temp) (struct thermal_zone_device *, int *);</div><div class='ctx'> 	int (*set_trips) (struct thermal_zone_device *, int, int);</div><div class='ctx'> 	int (*change_mode) (struct thermal_zone_device *,</div><div class='ctx'> 		enum thermal_device_mode);</div><div class='del'>-	int (*set_trip_temp) (struct thermal_zone_device *, int, int);</div><div class='add'>+	int (*set_trip_temp) (struct thermal_zone_device *,</div><div class='add'>+			      const struct thermal_trip *, int);</div><div class='ctx'> 	int (*get_crit_temp) (struct thermal_zone_device *, int *);</div><div class='ctx'> 	int (*set_emul_temp) (struct thermal_zone_device *, int);</div><div class='ctx'> 	int (*get_trend) (struct thermal_zone_device *,</div><div class='hunk'>@@ -126,110 +138,8 @@ struct thermal_cooling_device {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * struct thermal_zone_device - structure for a thermal zone</div><div class='del'>- * @id:		unique id number for each thermal zone</div><div class='del'>- * @type:	the thermal zone device type</div><div class='del'>- * @device:	&amp;struct device for this thermal zone</div><div class='del'>- * @removal:	removal completion</div><div class='del'>- * @trip_temp_attrs:	attributes for trip points for sysfs: trip temperature</div><div class='del'>- * @trip_type_attrs:	attributes for trip points for sysfs: trip type</div><div class='del'>- * @trip_hyst_attrs:	attributes for trip points for sysfs: trip hysteresis</div><div class='del'>- * @mode:		current mode of this thermal zone</div><div class='del'>- * @devdata:	private pointer for device private data</div><div class='del'>- * @num_trips:	number of trip points the thermal zone supports</div><div class='del'>- * @passive_delay_jiffies: number of jiffies to wait between polls when</div><div class='del'>- *			performing passive cooling.</div><div class='del'>- * @polling_delay_jiffies: number of jiffies to wait between polls when</div><div class='del'>- *			checking whether trip points have been crossed (0 for</div><div class='del'>- *			interrupt driven systems)</div><div class='del'>- * @temperature:	current temperature.  This is only for core code,</div><div class='del'>- *			drivers should use thermal_zone_get_temp() to get the</div><div class='del'>- *			current temperature</div><div class='del'>- * @last_temperature:	previous temperature read</div><div class='del'>- * @emul_temperature:	emulated temperature when using CONFIG_THERMAL_EMULATION</div><div class='del'>- * @passive:		1 if you've crossed a passive trip point, 0 otherwise.</div><div class='del'>- * @prev_low_trip:	the low current temperature if you've crossed a passive</div><div class='del'>-			trip point.</div><div class='del'>- * @prev_high_trip:	the above current temperature if you've crossed a</div><div class='del'>-			passive trip point.</div><div class='del'>- * @need_update:	if equals 1, thermal_zone_device_update needs to be invoked.</div><div class='del'>- * @ops:	operations this &amp;thermal_zone_device supports</div><div class='del'>- * @tzp:	thermal zone parameters</div><div class='del'>- * @governor:	pointer to the governor for this thermal zone</div><div class='del'>- * @governor_data:	private pointer for governor data</div><div class='del'>- * @thermal_instances:	list of &amp;struct thermal_instance of this thermal zone</div><div class='del'>- * @ida:	&amp;struct ida to generate unique id for this zone's cooling</div><div class='del'>- *		devices</div><div class='del'>- * @lock:	lock to protect thermal_instances list</div><div class='del'>- * @node:	node in thermal_tz_list (in thermal_core.c)</div><div class='del'>- * @poll_queue:	delayed work for polling</div><div class='del'>- * @notify_event: Last notification event</div><div class='del'>- * @suspended: thermal zone suspend indicator</div><div class='del'>- * @trips:	array of struct thermal_trip objects</div><div class='del'>- */</div><div class='del'>-struct thermal_zone_device {</div><div class='del'>-	int id;</div><div class='del'>-	char type[THERMAL_NAME_LENGTH];</div><div class='del'>-	struct device device;</div><div class='del'>-	struct completion removal;</div><div class='del'>-	struct attribute_group trips_attribute_group;</div><div class='del'>-	struct thermal_attr *trip_temp_attrs;</div><div class='del'>-	struct thermal_attr *trip_type_attrs;</div><div class='del'>-	struct thermal_attr *trip_hyst_attrs;</div><div class='del'>-	enum thermal_device_mode mode;</div><div class='del'>-	void *devdata;</div><div class='del'>-	int num_trips;</div><div class='del'>-	unsigned long passive_delay_jiffies;</div><div class='del'>-	unsigned long polling_delay_jiffies;</div><div class='del'>-	int temperature;</div><div class='del'>-	int last_temperature;</div><div class='del'>-	int emul_temperature;</div><div class='del'>-	int passive;</div><div class='del'>-	int prev_low_trip;</div><div class='del'>-	int prev_high_trip;</div><div class='del'>-	atomic_t need_update;</div><div class='del'>-	struct thermal_zone_device_ops ops;</div><div class='del'>-	struct thermal_zone_params *tzp;</div><div class='del'>-	struct thermal_governor *governor;</div><div class='del'>-	void *governor_data;</div><div class='del'>-	struct list_head thermal_instances;</div><div class='del'>-	struct ida ida;</div><div class='del'>-	struct mutex lock;</div><div class='del'>-	struct list_head node;</div><div class='del'>-	struct delayed_work poll_queue;</div><div class='del'>-	enum thermal_notify_event notify_event;</div><div class='del'>-	bool suspended;</div><div class='del'>-#ifdef CONFIG_THERMAL_DEBUGFS</div><div class='del'>-	struct thermal_debugfs *debugfs;</div><div class='del'>-#endif</div><div class='del'>-	struct thermal_trip trips[] __counted_by(num_trips);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct thermal_governor - structure that holds thermal governor information</div><div class='del'>- * @name:	name of the governor</div><div class='del'>- * @bind_to_tz: callback called when binding to a thermal zone.  If it</div><div class='del'>- *		returns 0, the governor is bound to the thermal zone,</div><div class='del'>- *		otherwise it fails.</div><div class='del'>- * @unbind_from_tz:	callback called when a governor is unbound from a</div><div class='del'>- *			thermal zone.</div><div class='del'>- * @throttle:	callback called for every trip point even if temperature is</div><div class='del'>- *		below the trip point temperature</div><div class='del'>- * @update_tz:	callback called when thermal zone internals have changed, e.g.</div><div class='del'>- *		thermal cooling instance was added/removed</div><div class='del'>- * @governor_list:	node in thermal_governor_list (in thermal_core.c)</div><div class='del'>- */</div><div class='del'>-struct thermal_governor {</div><div class='del'>-	const char *name;</div><div class='del'>-	int (*bind_to_tz)(struct thermal_zone_device *tz);</div><div class='del'>-	void (*unbind_from_tz)(struct thermal_zone_device *tz);</div><div class='del'>-	int (*throttle)(struct thermal_zone_device *tz,</div><div class='del'>-			const struct thermal_trip *trip);</div><div class='del'>-	void (*update_tz)(struct thermal_zone_device *tz,</div><div class='del'>-			  enum thermal_notify_event reason);</div><div class='del'>-	struct list_head	governor_list;</div><div class='del'>-};</div><div class='add'>+DEFINE_GUARD(cooling_dev, struct thermal_cooling_device *, mutex_lock(&amp;_T-&gt;lock),</div><div class='add'>+	     mutex_unlock(&amp;_T-&gt;lock))</div><div class='ctx'> </div><div class='ctx'> /* Structure to define Thermal Zone parameters */</div><div class='ctx'> struct thermal_zone_params {</div><div class='hunk'>@@ -303,17 +213,12 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,</div><div class='del'>-			    struct thermal_trip *trip);</div><div class='del'>-int thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,</div><div class='del'>-			  struct thermal_trip *trip);</div><div class='ctx'> int for_each_thermal_trip(struct thermal_zone_device *tz,</div><div class='ctx'> 			  int (*cb)(struct thermal_trip *, void *),</div><div class='ctx'> 			  void *data);</div><div class='ctx'> int thermal_zone_for_each_trip(struct thermal_zone_device *tz,</div><div class='ctx'> 			       int (*cb)(struct thermal_trip *, void *),</div><div class='ctx'> 			       void *data);</div><div class='del'>-int thermal_zone_get_num_trips(struct thermal_zone_device *tz);</div><div class='ctx'> void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,</div><div class='ctx'> 				struct thermal_trip *trip, int temp);</div><div class='ctx'> </div><div class='hunk'>@@ -326,7 +231,8 @@ struct thermal_zone_device *thermal_zone_device_register_with_trips(</div><div class='ctx'> 					int num_trips, void *devdata,</div><div class='ctx'> 					const struct thermal_zone_device_ops *ops,</div><div class='ctx'> 					const struct thermal_zone_params *tzp,</div><div class='del'>-					int passive_delay, int polling_delay);</div><div class='add'>+					unsigned int passive_delay,</div><div class='add'>+					unsigned int polling_delay);</div><div class='ctx'> </div><div class='ctx'> struct thermal_zone_device *thermal_tripless_zone_device_register(</div><div class='ctx'> 					const char *type,</div><div class='hunk'>@@ -341,20 +247,6 @@ const char *thermal_zone_device_type(struct thermal_zone_device *tzd);</div><div class='ctx'> int thermal_zone_device_id(struct thermal_zone_device *tzd);</div><div class='ctx'> struct device *thermal_zone_device(struct thermal_zone_device *tzd);</div><div class='ctx'> </div><div class='del'>-int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,</div><div class='del'>-			      const struct thermal_trip *trip,</div><div class='del'>-			      struct thermal_cooling_device *cdev,</div><div class='del'>-			      unsigned long upper, unsigned long lower,</div><div class='del'>-			      unsigned int weight);</div><div class='del'>-int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,</div><div class='del'>-				     struct thermal_cooling_device *,</div><div class='del'>-				     unsigned long, unsigned long,</div><div class='del'>-				     unsigned int);</div><div class='del'>-int thermal_unbind_cdev_from_trip(struct thermal_zone_device *tz,</div><div class='del'>-				  const struct thermal_trip *trip,</div><div class='del'>-				  struct thermal_cooling_device *cdev);</div><div class='del'>-int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,</div><div class='del'>-				       struct thermal_cooling_device *);</div><div class='ctx'> void thermal_zone_device_update(struct thermal_zone_device *,</div><div class='ctx'> 				enum thermal_notify_event);</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +258,7 @@ thermal_of_cooling_device_register(struct device_node *np, const char *, void *,</div><div class='ctx'> struct thermal_cooling_device *</div><div class='ctx'> devm_thermal_of_cooling_device_register(struct device *dev,</div><div class='ctx'> 				struct device_node *np,</div><div class='del'>-				char *type, void *devdata,</div><div class='add'>+				const char *type, void *devdata,</div><div class='ctx'> 				const struct thermal_cooling_device_ops *ops);</div><div class='ctx'> void thermal_cooling_device_update(struct thermal_cooling_device *);</div><div class='ctx'> void thermal_cooling_device_unregister(struct thermal_cooling_device *);</div><div class='hunk'>@@ -374,6 +266,9 @@ struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name);</div><div class='ctx'> int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);</div><div class='ctx'> int thermal_zone_get_slope(struct thermal_zone_device *tz);</div><div class='ctx'> int thermal_zone_get_offset(struct thermal_zone_device *tz);</div><div class='add'>+bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz,</div><div class='add'>+				   const struct thermal_trip *trip,</div><div class='add'>+				   struct thermal_cooling_device *cdev);</div><div class='ctx'> </div><div class='ctx'> int thermal_zone_device_enable(struct thermal_zone_device *tz);</div><div class='ctx'> int thermal_zone_device_disable(struct thermal_zone_device *tz);</div><div class='hunk'>@@ -398,6 +293,10 @@ static inline struct thermal_zone_device *thermal_tripless_zone_device_register(</div><div class='ctx'> static inline void thermal_zone_device_unregister(struct thermal_zone_device *tz)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='add'>+static inline void thermal_zone_device_update(struct thermal_zone_device *tz,</div><div class='add'>+					      enum thermal_notify_event event)</div><div class='add'>+{ }</div><div class='add'>+</div><div class='ctx'> static inline struct thermal_cooling_device *</div><div class='ctx'> thermal_cooling_device_register(const char *type, void *devdata,</div><div class='ctx'> 	const struct thermal_cooling_device_ops *ops)</div><div class='hunk'>@@ -410,7 +309,7 @@ thermal_of_cooling_device_register(struct device_node *np,</div><div class='ctx'> static inline struct thermal_cooling_device *</div><div class='ctx'> devm_thermal_of_cooling_device_register(struct device *dev,</div><div class='ctx'> 				struct device_node *np,</div><div class='del'>-				char *type, void *devdata,</div><div class='add'>+				const char *type, void *devdata,</div><div class='ctx'> 				const struct thermal_cooling_device_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	return ERR_PTR(-ENODEV);</div><div class='head'>diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h<br/>index 9ea0b28068f4..b40de9bab4b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/thread_info.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/thread_info.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/thread_info.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/thread_info.h</a></div><div class='hunk'>@@ -59,6 +59,19 @@ enum syscall_work_bit {</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifndef TIF_NEED_RESCHED_LAZY</div><div class='add'>+#ifdef CONFIG_ARCH_HAS_PREEMPT_LAZY</div><div class='add'>+#error Inconsistent PREEMPT_LAZY</div><div class='add'>+#endif</div><div class='add'>+#define TIF_NEED_RESCHED_LAZY TIF_NEED_RESCHED</div><div class='add'>+#define _TIF_NEED_RESCHED_LAZY _TIF_NEED_RESCHED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef TIF_RSEQ</div><div class='add'>+# define TIF_RSEQ	TIF_NOTIFY_RESUME</div><div class='add'>+# define _TIF_RSEQ	_TIF_NOTIFY_RESUME</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> #ifndef arch_set_restart_data</div><div class='hunk'>@@ -179,22 +192,27 @@ static __always_inline unsigned long read_ti_thread_flags(struct thread_info *ti</div><div class='ctx'> </div><div class='ctx'> #ifdef _ASM_GENERIC_BITOPS_INSTRUMENTED_NON_ATOMIC_H</div><div class='ctx'> </div><div class='del'>-static __always_inline bool tif_need_resched(void)</div><div class='add'>+static __always_inline bool tif_test_bit(int bit)</div><div class='ctx'> {</div><div class='del'>-	return arch_test_bit(TIF_NEED_RESCHED,</div><div class='add'>+	return arch_test_bit(bit,</div><div class='ctx'> 			     (unsigned long *)(&amp;current_thread_info()-&gt;flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static __always_inline bool tif_need_resched(void)</div><div class='add'>+static __always_inline bool tif_test_bit(int bit)</div><div class='ctx'> {</div><div class='del'>-	return test_bit(TIF_NEED_RESCHED,</div><div class='add'>+	return test_bit(bit,</div><div class='ctx'> 			(unsigned long *)(&amp;current_thread_info()-&gt;flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* _ASM_GENERIC_BITOPS_INSTRUMENTED_NON_ATOMIC_H */</div><div class='ctx'> </div><div class='add'>+static __always_inline bool tif_need_resched(void)</div><div class='add'>+{</div><div class='add'>+	return tif_test_bit(TIF_NEED_RESCHED);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES</div><div class='ctx'> static inline int arch_within_stack_frames(const void * const stack,</div><div class='ctx'> 					   const void * const stackend,</div><div class='hunk'>@@ -204,54 +222,6 @@ static inline int arch_within_stack_frames(const void * const stack,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HARDENED_USERCOPY</div><div class='del'>-extern void __check_object_size(const void *ptr, unsigned long n,</div><div class='del'>-					bool to_user);</div><div class='del'>-</div><div class='del'>-static __always_inline void check_object_size(const void *ptr, unsigned long n,</div><div class='del'>-					      bool to_user)</div><div class='del'>-{</div><div class='del'>-	if (!__builtin_constant_p(n))</div><div class='del'>-		__check_object_size(ptr, n, to_user);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void check_object_size(const void *ptr, unsigned long n,</div><div class='del'>-				     bool to_user)</div><div class='del'>-{ }</div><div class='del'>-#endif /* CONFIG_HARDENED_USERCOPY */</div><div class='del'>-</div><div class='del'>-extern void __compiletime_error("copy source size is too small")</div><div class='del'>-__bad_copy_from(void);</div><div class='del'>-extern void __compiletime_error("copy destination size is too small")</div><div class='del'>-__bad_copy_to(void);</div><div class='del'>-</div><div class='del'>-void __copy_overflow(int size, unsigned long count);</div><div class='del'>-</div><div class='del'>-static inline void copy_overflow(int size, unsigned long count)</div><div class='del'>-{</div><div class='del'>-	if (IS_ENABLED(CONFIG_BUG))</div><div class='del'>-		__copy_overflow(size, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __always_inline __must_check bool</div><div class='del'>-check_copy_size(const void *addr, size_t bytes, bool is_source)</div><div class='del'>-{</div><div class='del'>-	int sz = __builtin_object_size(addr, 0);</div><div class='del'>-	if (unlikely(sz &gt;= 0 &amp;&amp; sz &lt; bytes)) {</div><div class='del'>-		if (!__builtin_constant_p(bytes))</div><div class='del'>-			copy_overflow(sz, bytes);</div><div class='del'>-		else if (is_source)</div><div class='del'>-			__bad_copy_from();</div><div class='del'>-		else</div><div class='del'>-			__bad_copy_to();</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	if (WARN_ON_ONCE(bytes &gt; INT_MAX))</div><div class='del'>-		return false;</div><div class='del'>-	check_object_size(addr, bytes, is_source);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifndef arch_setup_new_exec</div><div class='ctx'> static inline void arch_setup_new_exec(void) { }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/threads.h b/include/linux/threads.h<br/>index c34173e6c5f1..1674a471b0b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/threads.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/threads.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/threads.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/threads.h</a></div><div class='hunk'>@@ -25,13 +25,13 @@</div><div class='ctx'> /*</div><div class='ctx'>  * This controls the default maximum pid allocated to a process</div><div class='ctx'>  */</div><div class='del'>-#define PID_MAX_DEFAULT (CONFIG_BASE_SMALL ? 0x1000 : 0x8000)</div><div class='add'>+#define PID_MAX_DEFAULT (IS_ENABLED(CONFIG_BASE_SMALL) ? 0x1000 : 0x8000)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A maximum of 4 million PIDs should be enough for a while.</div><div class='ctx'>  * [NOTE: PID/TIDs are limited to 2^30 ~= 1 billion, see FUTEX_TID_MASK.]</div><div class='ctx'>  */</div><div class='del'>-#define PID_MAX_LIMIT (CONFIG_BASE_SMALL ? PAGE_SIZE * 8 : \</div><div class='add'>+#define PID_MAX_LIMIT (IS_ENABLED(CONFIG_BASE_SMALL) ? PAGE_SIZE * 8 : \</div><div class='ctx'> 	(sizeof(long) &gt; 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h<br/>index 2c835e5c41f6..0ba112175bb3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/thunderbolt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/thunderbolt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/thunderbolt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/thunderbolt.h</a></div><div class='hunk'>@@ -11,6 +11,13 @@</div><div class='ctx'> #ifndef THUNDERBOLT_H_</div><div class='ctx'> #define THUNDERBOLT_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct fwnode_handle;</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+#if IS_REACHABLE(CONFIG_USB4)</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -33,7 +40,6 @@ enum tb_cfg_pkg_type {</div><div class='ctx'> 	TB_CFG_PKG_ICM_EVENT = 10,</div><div class='ctx'> 	TB_CFG_PKG_ICM_CMD = 11,</div><div class='ctx'> 	TB_CFG_PKG_ICM_RESP = 12,</div><div class='del'>-	TB_CFG_PKG_PREPARE_TO_SLEEP = 13,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -87,8 +93,8 @@ struct tb {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct bus_type tb_bus_type;</div><div class='del'>-extern struct device_type tb_service_type;</div><div class='del'>-extern struct device_type tb_xdomain_type;</div><div class='add'>+extern const struct device_type tb_service_type;</div><div class='add'>+extern const struct device_type tb_xdomain_type;</div><div class='ctx'> </div><div class='ctx'> #define TB_LINKS_PER_PHY_PORT	2</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +213,7 @@ enum tb_link_width {</div><div class='ctx'>  *		queried first</div><div class='ctx'>  * @service_ids: Used to generate IDs for the services</div><div class='ctx'>  * @in_hopids: Input HopIDs for DMA tunneling</div><div class='del'>- * @out_hopids; Output HopIDs for DMA tunneling</div><div class='add'>+ * @out_hopids: Output HopIDs for DMA tunneling</div><div class='ctx'>  * @local_property_block: Local block of properties</div><div class='ctx'>  * @local_property_block_gen: Generation of @local_property_block</div><div class='ctx'>  * @local_property_block_len: Length of the @local_property_block in dwords</div><div class='hunk'>@@ -350,7 +356,7 @@ int tb_xdomain_request(struct tb_xdomain *xd, const void *request,</div><div class='ctx'> 		       unsigned int timeout_msec);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * tb_protocol_handler - Protocol specific handler</div><div class='add'>+ * struct tb_protocol_handler - Protocol specific handler</div><div class='ctx'>  * @uuid: XDomain messages with this UUID are dispatched to this handler</div><div class='ctx'>  * @callback: Callback called with the XDomain message. Returning %1</div><div class='ctx'>  *	      here tells the XDomain core that the message was handled</div><div class='hunk'>@@ -431,7 +437,7 @@ static inline struct tb_service *tb_to_service(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * tb_service_driver - Thunderbolt service driver</div><div class='add'>+ * struct tb_service_driver - Thunderbolt service driver</div><div class='ctx'>  * @driver: Driver structure</div><div class='ctx'>  * @probe: Called when the driver is probed</div><div class='ctx'>  * @remove: Called when the driver is removed (optional)</div><div class='hunk'>@@ -513,6 +519,7 @@ struct tb_nhi {</div><div class='ctx'>  * @head: Head of the ring (write next descriptor here)</div><div class='ctx'>  * @tail: Tail of the ring (complete next descriptor here)</div><div class='ctx'>  * @descriptors: Allocated descriptors for this ring</div><div class='add'>+ * @descriptors_dma: DMA address of descriptors for this ring</div><div class='ctx'>  * @queue: Queue holding frames to be transferred over this ring</div><div class='ctx'>  * @in_flight: Queue holding frames that are currently in flight</div><div class='ctx'>  * @work: Interrupt work structure</div><div class='hunk'>@@ -565,12 +572,12 @@ typedef void (*ring_cb)(struct tb_ring *, struct ring_frame *, bool canceled);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enum ring_desc_flags - Flags for DMA ring descriptor</div><div class='del'>- * %RING_DESC_ISOCH: Enable isonchronous DMA (Tx only)</div><div class='del'>- * %RING_DESC_CRC_ERROR: In frame mode CRC check failed for the frame (Rx only)</div><div class='del'>- * %RING_DESC_COMPLETED: Descriptor completed (set by NHI)</div><div class='del'>- * %RING_DESC_POSTED: Always set this</div><div class='del'>- * %RING_DESC_BUFFER_OVERRUN: RX buffer overrun</div><div class='del'>- * %RING_DESC_INTERRUPT: Request an interrupt on completion</div><div class='add'>+ * @RING_DESC_ISOCH: Enable isonchronous DMA (Tx only)</div><div class='add'>+ * @RING_DESC_CRC_ERROR: In frame mode CRC check failed for the frame (Rx only)</div><div class='add'>+ * @RING_DESC_COMPLETED: Descriptor completed (set by NHI)</div><div class='add'>+ * @RING_DESC_POSTED: Always set this</div><div class='add'>+ * @RING_DESC_BUFFER_OVERRUN: RX buffer overrun</div><div class='add'>+ * @RING_DESC_INTERRUPT: Request an interrupt on completion</div><div class='ctx'>  */</div><div class='ctx'> enum ring_desc_flags {</div><div class='ctx'> 	RING_DESC_ISOCH = 0x1,</div><div class='hunk'>@@ -630,7 +637,7 @@ int __tb_ring_enqueue(struct tb_ring *ring, struct ring_frame *frame);</div><div class='ctx'>  * If ring_stop() is called after the packet has been enqueued</div><div class='ctx'>  * @frame-&gt;callback will be called with canceled set to true.</div><div class='ctx'>  *</div><div class='del'>- * Return: Returns %-ESHUTDOWN if ring_stop has been called. Zero otherwise.</div><div class='add'>+ * Return: %-ESHUTDOWN if ring_stop() has been called, %0 otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline int tb_ring_rx(struct tb_ring *ring, struct ring_frame *frame)</div><div class='ctx'> {</div><div class='hunk'>@@ -651,7 +658,7 @@ static inline int tb_ring_rx(struct tb_ring *ring, struct ring_frame *frame)</div><div class='ctx'>  * If ring_stop() is called after the packet has been enqueued @frame-&gt;callback</div><div class='ctx'>  * will be called with canceled set to true.</div><div class='ctx'>  *</div><div class='del'>- * Return: Returns %-ESHUTDOWN if ring_stop has been called. Zero otherwise.</div><div class='add'>+ * Return: %-ESHUTDOWN if ring_stop has been called, %0 otherwise.</div><div class='ctx'>  */</div><div class='ctx'> static inline int tb_ring_tx(struct tb_ring *ring, struct ring_frame *frame)</div><div class='ctx'> {</div><div class='hunk'>@@ -669,10 +676,23 @@ void tb_ring_poll_complete(struct tb_ring *ring);</div><div class='ctx'>  *</div><div class='ctx'>  * Use this function when you are mapping DMA for buffers that are</div><div class='ctx'>  * passed to the ring for sending/receiving.</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to device used for DMA mapping.</div><div class='ctx'>  */</div><div class='ctx'> static inline struct device *tb_ring_dma_device(struct tb_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	return &amp;ring-&gt;nhi-&gt;pdev-&gt;dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool usb4_usb3_port_match(struct device *usb4_port_dev,</div><div class='add'>+			  const struct fwnode_handle *usb3_port_fwnode);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_USB4 */</div><div class='add'>+static inline bool usb4_usb3_port_match(struct device *usb4_port_dev,</div><div class='add'>+					const struct fwnode_handle *usb3_port_fwnode)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_USB4 */</div><div class='add'>+</div><div class='ctx'> #endif /* THUNDERBOLT_H_ */</div><div class='head'>diff --git a/include/linux/tick.h b/include/linux/tick.h<br/>index 4924a33700b7..ac76ae9fa36d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tick.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tick.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tick.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tick.h</a></div><div class='hunk'>@@ -20,12 +20,10 @@ extern void __init tick_init(void);</div><div class='ctx'> extern void tick_suspend_local(void);</div><div class='ctx'> /* Should be core only, but XEN resume magic and ARM BL switcher require it */</div><div class='ctx'> extern void tick_resume_local(void);</div><div class='del'>-extern void tick_cleanup_dead_cpu(int cpu);</div><div class='ctx'> #else /* CONFIG_GENERIC_CLOCKEVENTS */</div><div class='ctx'> static inline void tick_init(void) { }</div><div class='ctx'> static inline void tick_suspend_local(void) { }</div><div class='ctx'> static inline void tick_resume_local(void) { }</div><div class='del'>-static inline void tick_cleanup_dead_cpu(int cpu) { }</div><div class='ctx'> #endif /* !CONFIG_GENERIC_CLOCKEVENTS */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_GENERIC_CLOCKEVENTS) &amp;&amp; defined(CONFIG_HOTPLUG_CPU)</div><div class='hunk'>@@ -139,7 +137,6 @@ extern void tick_nohz_irq_exit(void);</div><div class='ctx'> extern bool tick_nohz_idle_got_tick(void);</div><div class='ctx'> extern ktime_t tick_nohz_get_next_hrtimer(void);</div><div class='ctx'> extern ktime_t tick_nohz_get_sleep_length(ktime_t *delta_next);</div><div class='del'>-extern unsigned long tick_nohz_get_idle_calls(void);</div><div class='ctx'> extern unsigned long tick_nohz_get_idle_calls_cpu(int cpu);</div><div class='ctx'> extern u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time);</div><div class='ctx'> extern u64 get_cpu_iowait_time_us(int cpu, u64 *last_update_time);</div><div class='hunk'>@@ -198,12 +195,6 @@ static inline bool tick_nohz_full_enabled(void)</div><div class='ctx'> 	__ret;								\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-static inline void tick_nohz_full_add_cpus_to(struct cpumask *mask)</div><div class='del'>-{</div><div class='del'>-	if (tick_nohz_full_enabled())</div><div class='del'>-		cpumask_or(mask, mask, tick_nohz_full_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> extern void tick_nohz_dep_set(enum tick_dep_bits bit);</div><div class='ctx'> extern void tick_nohz_dep_clear(enum tick_dep_bits bit);</div><div class='ctx'> extern void tick_nohz_dep_set_cpu(int cpu, enum tick_dep_bits bit);</div><div class='hunk'>@@ -252,12 +243,19 @@ static inline void tick_dep_set_task(struct task_struct *tsk,</div><div class='ctx'> 	if (tick_nohz_full_enabled())</div><div class='ctx'> 		tick_nohz_dep_set_task(tsk, bit);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static inline void tick_dep_clear_task(struct task_struct *tsk,</div><div class='ctx'> 				       enum tick_dep_bits bit)</div><div class='ctx'> {</div><div class='ctx'> 	if (tick_nohz_full_enabled())</div><div class='ctx'> 		tick_nohz_dep_clear_task(tsk, bit);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void tick_dep_init_task(struct task_struct *tsk)</div><div class='add'>+{</div><div class='add'>+	atomic_set(&amp;tsk-&gt;tick_dep_mask, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void tick_dep_set_signal(struct task_struct *tsk,</div><div class='ctx'> 				       enum tick_dep_bits bit)</div><div class='ctx'> {</div><div class='hunk'>@@ -277,7 +275,6 @@ extern void __init tick_nohz_full_setup(cpumask_var_t cpumask);</div><div class='ctx'> #else</div><div class='ctx'> static inline bool tick_nohz_full_enabled(void) { return false; }</div><div class='ctx'> static inline bool tick_nohz_full_cpu(int cpu) { return false; }</div><div class='del'>-static inline void tick_nohz_full_add_cpus_to(struct cpumask *mask) { }</div><div class='ctx'> </div><div class='ctx'> static inline void tick_nohz_dep_set_cpu(int cpu, enum tick_dep_bits bit) { }</div><div class='ctx'> static inline void tick_nohz_dep_clear_cpu(int cpu, enum tick_dep_bits bit) { }</div><div class='hunk'>@@ -291,6 +288,7 @@ static inline void tick_dep_set_task(struct task_struct *tsk,</div><div class='ctx'> 				     enum tick_dep_bits bit) { }</div><div class='ctx'> static inline void tick_dep_clear_task(struct task_struct *tsk,</div><div class='ctx'> 				       enum tick_dep_bits bit) { }</div><div class='add'>+static inline void tick_dep_init_task(struct task_struct *tsk) { }</div><div class='ctx'> static inline void tick_dep_set_signal(struct task_struct *tsk,</div><div class='ctx'> 				       enum tick_dep_bits bit) { }</div><div class='ctx'> static inline void tick_dep_clear_signal(struct signal_struct *signal,</div><div class='head'>diff --git a/include/linux/time64.h b/include/linux/time64.h<br/>index f1bcea8c124a..9934331c7b86 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/time64.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/time64.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/time64.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/time64.h</a></div><div class='hunk'>@@ -49,6 +49,11 @@ static inline int timespec64_equal(const struct timespec64 *a,</div><div class='ctx'> 	return (a-&gt;tv_sec == b-&gt;tv_sec) &amp;&amp; (a-&gt;tv_nsec == b-&gt;tv_nsec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool timespec64_is_epoch(const struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	return ts-&gt;tv_sec == 0 &amp;&amp; ts-&gt;tv_nsec == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * lhs &lt; rhs:  return &lt;0</div><div class='ctx'>  * lhs == rhs: return 0</div><div class='head'>diff --git a/include/linux/time_namespace.h b/include/linux/time_namespace.h<br/>index 876e31b4461d..c514d0e5a45c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/time_namespace.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/time_namespace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/time_namespace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/time_namespace.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> struct user_namespace;</div><div class='ctx'> extern struct user_namespace init_user_ns;</div><div class='ctx'> </div><div class='add'>+struct seq_file;</div><div class='ctx'> struct vm_area_struct;</div><div class='ctx'> </div><div class='ctx'> struct timens_offsets {</div><div class='hunk'>@@ -32,17 +33,22 @@ struct time_namespace {</div><div class='ctx'> extern struct time_namespace init_time_ns;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TIME_NS</div><div class='add'>+static inline struct time_namespace *to_time_ns(struct ns_common *ns)</div><div class='add'>+{</div><div class='add'>+	return container_of(ns, struct time_namespace, ns);</div><div class='add'>+}</div><div class='add'>+void __init time_ns_init(void);</div><div class='ctx'> extern int vdso_join_timens(struct task_struct *task,</div><div class='ctx'> 			    struct time_namespace *ns);</div><div class='ctx'> extern void timens_commit(struct task_struct *tsk, struct time_namespace *ns);</div><div class='ctx'> </div><div class='ctx'> static inline struct time_namespace *get_time_ns(struct time_namespace *ns)</div><div class='ctx'> {</div><div class='del'>-	refcount_inc(&amp;ns-&gt;ns.count);</div><div class='add'>+	ns_ref_inc(ns);</div><div class='ctx'> 	return ns;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct time_namespace *copy_time_ns(unsigned long flags,</div><div class='add'>+struct time_namespace *copy_time_ns(u64 flags,</div><div class='ctx'> 				    struct user_namespace *user_ns,</div><div class='ctx'> 				    struct time_namespace *old_ns);</div><div class='ctx'> void free_time_ns(struct time_namespace *ns);</div><div class='hunk'>@@ -51,7 +57,7 @@ struct page *find_timens_vvar_page(struct vm_area_struct *vma);</div><div class='ctx'> </div><div class='ctx'> static inline void put_time_ns(struct time_namespace *ns)</div><div class='ctx'> {</div><div class='del'>-	if (refcount_dec_and_test(&amp;ns-&gt;ns.count))</div><div class='add'>+	if (ns_ref_put(ns))</div><div class='ctx'> 		free_time_ns(ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +113,10 @@ static inline ktime_t timens_ktime_to_host(clockid_t clockid, ktime_t tim)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='add'>+static inline void __init time_ns_init(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int vdso_join_timens(struct task_struct *task,</div><div class='ctx'> 				   struct time_namespace *ns)</div><div class='ctx'> {</div><div class='hunk'>@@ -128,7 +138,7 @@ static inline void put_time_ns(struct time_namespace *ns)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='del'>-struct time_namespace *copy_time_ns(unsigned long flags,</div><div class='add'>+struct time_namespace *copy_time_ns(u64 flags,</div><div class='ctx'> 				    struct user_namespace *user_ns,</div><div class='ctx'> 				    struct time_namespace *old_ns)</div><div class='ctx'> {</div><div class='hunk'>@@ -165,6 +175,4 @@ static inline ktime_t timens_ktime_to_host(clockid_t clockid, ktime_t tim)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct vdso_data *arch_get_vdso_data(void *vvar_page);</div><div class='del'>-</div><div class='ctx'> #endif /* _LINUX_TIMENS_H */</div><div class='head'>diff --git a/include/linux/timecounter.h b/include/linux/timecounter.h<br/>index c6540ceea143..dce03a5cafb7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/timecounter.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timecounter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/timecounter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/timecounter.h</a></div><div class='hunk'>@@ -22,20 +22,20 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @read:		returns the current cycle value</div><div class='ctx'>  * @mask:		bitmask for two's complement</div><div class='del'>- *			subtraction of non 64 bit counters,</div><div class='add'>+ *			subtraction of non-64-bit counters,</div><div class='ctx'>  *			see CYCLECOUNTER_MASK() helper macro</div><div class='ctx'>  * @mult:		cycle to nanosecond multiplier</div><div class='ctx'>  * @shift:		cycle to nanosecond divisor (power of two)</div><div class='ctx'>  */</div><div class='ctx'> struct cyclecounter {</div><div class='del'>-	u64 (*read)(const struct cyclecounter *cc);</div><div class='add'>+	u64 (*read)(struct cyclecounter *cc);</div><div class='ctx'> 	u64 mask;</div><div class='ctx'> 	u32 mult;</div><div class='ctx'> 	u32 shift;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct timecounter - layer above a %struct cyclecounter which counts nanoseconds</div><div class='add'>+ * struct timecounter - layer above a &amp;struct cyclecounter which counts nanoseconds</div><div class='ctx'>  *	Contains the state needed by timecounter_read() to detect</div><div class='ctx'>  *	cycle counter wrap around. Initialize with</div><div class='ctx'>  *	timecounter_init(). Also used to convert cycle counts into the</div><div class='hunk'>@@ -53,7 +53,7 @@ struct cyclecounter {</div><div class='ctx'>  * @frac:		accumulated fractional nanoseconds</div><div class='ctx'>  */</div><div class='ctx'> struct timecounter {</div><div class='del'>-	const struct cyclecounter *cc;</div><div class='add'>+	struct cyclecounter *cc;</div><div class='ctx'> 	u64 cycle_last;</div><div class='ctx'> 	u64 nsec;</div><div class='ctx'> 	u64 mask;</div><div class='hunk'>@@ -66,6 +66,8 @@ struct timecounter {</div><div class='ctx'>  * @cycles:	Cycles</div><div class='ctx'>  * @mask:	bit mask for maintaining the 'frac' field</div><div class='ctx'>  * @frac:	pointer to storage for the fractional nanoseconds.</div><div class='add'>+ *</div><div class='add'>+ * Returns: cycle counter cycles converted to nanoseconds</div><div class='ctx'>  */</div><div class='ctx'> static inline u64 cyclecounter_cyc2ns(const struct cyclecounter *cc,</div><div class='ctx'> 				      u64 cycles, u64 mask, u64 *frac)</div><div class='hunk'>@@ -79,6 +81,7 @@ static inline u64 cyclecounter_cyc2ns(const struct cyclecounter *cc,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * timecounter_adjtime - Shifts the time of the clock.</div><div class='add'>+ * @tc:		The &amp;struct timecounter to adjust</div><div class='ctx'>  * @delta:	Desired change in nanoseconds.</div><div class='ctx'>  */</div><div class='ctx'> static inline void timecounter_adjtime(struct timecounter *tc, s64 delta)</div><div class='hunk'>@@ -97,7 +100,7 @@ static inline void timecounter_adjtime(struct timecounter *tc, s64 delta)</div><div class='ctx'>  * the time stamp counter by the number of elapsed nanoseconds.</div><div class='ctx'>  */</div><div class='ctx'> extern void timecounter_init(struct timecounter *tc,</div><div class='del'>-			     const struct cyclecounter *cc,</div><div class='add'>+			     struct cyclecounter *cc,</div><div class='ctx'> 			     u64 start_tstamp);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -107,6 +110,8 @@ extern void timecounter_init(struct timecounter *tc,</div><div class='ctx'>  *</div><div class='ctx'>  * In other words, keeps track of time since the same epoch as</div><div class='ctx'>  * the function which generated the initial time stamp.</div><div class='add'>+ *</div><div class='add'>+ * Returns: nanoseconds since the initial time stamp</div><div class='ctx'>  */</div><div class='ctx'> extern u64 timecounter_read(struct timecounter *tc);</div><div class='ctx'> </div><div class='hunk'>@@ -123,6 +128,8 @@ extern u64 timecounter_read(struct timecounter *tc);</div><div class='ctx'>  *</div><div class='ctx'>  * This allows conversion of cycle counter values which were generated</div><div class='ctx'>  * in the past.</div><div class='add'>+ *</div><div class='add'>+ * Returns: cycle counter converted to nanoseconds since the initial time stamp</div><div class='ctx'>  */</div><div class='ctx'> extern u64 timecounter_cyc2time(const struct timecounter *tc,</div><div class='ctx'> 				u64 cycle_tstamp);</div><div class='head'>diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h<br/>index 84ff2844df2a..b8ae89ea28ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/timekeeper_internal.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timekeeper_internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/timekeeper_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/timekeeper_internal.h</a></div><div class='hunk'>@@ -12,6 +12,22 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * timekeeper_ids - IDs for various time keepers in the kernel</div><div class='add'>+ * @TIMEKEEPER_CORE:		The central core timekeeper managing system time</div><div class='add'>+ * @TIMEKEEPER_AUX_FIRST:	The first AUX timekeeper</div><div class='add'>+ * @TIMEKEEPER_AUX_LAST:	The last AUX timekeeper</div><div class='add'>+ * @TIMEKEEPERS_MAX:		The maximum number of timekeepers managed</div><div class='add'>+ */</div><div class='add'>+enum timekeeper_ids {</div><div class='add'>+	TIMEKEEPER_CORE,</div><div class='add'>+#ifdef CONFIG_POSIX_AUX_CLOCKS</div><div class='add'>+	TIMEKEEPER_AUX_FIRST,</div><div class='add'>+	TIMEKEEPER_AUX_LAST = TIMEKEEPER_AUX_FIRST + MAX_AUX_CLOCKS - 1,</div><div class='add'>+#endif</div><div class='add'>+	TIMEKEEPERS_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct tk_read_base - base structure for timekeeping readout</div><div class='ctx'>  * @clock:	Current clocksource used for timekeeping.</div><div class='ctx'>  * @mask:	Bitmask for two's complement subtraction of non 64bit clocks</div><div class='hunk'>@@ -26,7 +42,7 @@</div><div class='ctx'>  * occupies a single 64byte cache line.</div><div class='ctx'>  *</div><div class='ctx'>  * The struct is separate from struct timekeeper as it is also used</div><div class='del'>- * for a fast NMI safe accessors.</div><div class='add'>+ * for the fast NMI safe accessors.</div><div class='ctx'>  *</div><div class='ctx'>  * @base_real is for the fast NMI safe accessor to allow reading clock</div><div class='ctx'>  * realtime from any context.</div><div class='hunk'>@@ -44,36 +60,46 @@ struct tk_read_base {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct timekeeper - Structure holding internal timekeeping values.</div><div class='del'>- * @tkr_mono:		The readout base structure for CLOCK_MONOTONIC</div><div class='del'>- * @tkr_raw:		The readout base structure for CLOCK_MONOTONIC_RAW</div><div class='del'>- * @xtime_sec:		Current CLOCK_REALTIME time in seconds</div><div class='del'>- * @ktime_sec:		Current CLOCK_MONOTONIC time in seconds</div><div class='del'>- * @wall_to_monotonic:	CLOCK_REALTIME to CLOCK_MONOTONIC offset</div><div class='del'>- * @offs_real:		Offset clock monotonic -&gt; clock realtime</div><div class='del'>- * @offs_boot:		Offset clock monotonic -&gt; clock boottime</div><div class='del'>- * @offs_tai:		Offset clock monotonic -&gt; clock tai</div><div class='del'>- * @tai_offset:		The current UTC to TAI offset in seconds</div><div class='del'>- * @clock_was_set_seq:	The sequence number of clock was set events</div><div class='del'>- * @cs_was_changed_seq:	The sequence number of clocksource change events</div><div class='del'>- * @next_leap_ktime:	CLOCK_MONOTONIC time value of a pending leap-second</div><div class='del'>- * @raw_sec:		CLOCK_MONOTONIC_RAW  time in seconds</div><div class='del'>- * @monotonic_to_boot:	CLOCK_MONOTONIC to CLOCK_BOOTTIME offset</div><div class='del'>- * @cycle_interval:	Number of clock cycles in one NTP interval</div><div class='del'>- * @xtime_interval:	Number of clock shifted nano seconds in one NTP</div><div class='del'>- *			interval.</div><div class='del'>- * @xtime_remainder:	Shifted nano seconds left over when rounding</div><div class='del'>- *			@cycle_interval</div><div class='del'>- * @raw_interval:	Shifted raw nano seconds accumulated per NTP interval.</div><div class='del'>- * @ntp_error:		Difference between accumulated time and NTP time in ntp</div><div class='del'>- *			shifted nano seconds.</div><div class='del'>- * @ntp_error_shift:	Shift conversion between clock shifted nano seconds and</div><div class='del'>- *			ntp shifted nano seconds.</div><div class='del'>- * @last_warning:	Warning ratelimiter (DEBUG_TIMEKEEPING)</div><div class='del'>- * @underflow_seen:	Underflow warning flag (DEBUG_TIMEKEEPING)</div><div class='del'>- * @overflow_seen:	Overflow warning flag (DEBUG_TIMEKEEPING)</div><div class='add'>+ * @tkr_mono:			The readout base structure for CLOCK_MONOTONIC</div><div class='add'>+ * @xtime_sec:			Current CLOCK_REALTIME time in seconds</div><div class='add'>+ * @ktime_sec:			Current CLOCK_MONOTONIC time in seconds</div><div class='add'>+ * @wall_to_monotonic:		CLOCK_REALTIME to CLOCK_MONOTONIC offset</div><div class='add'>+ * @offs_real:			Offset clock monotonic -&gt; clock realtime</div><div class='add'>+ * @offs_boot:			Offset clock monotonic -&gt; clock boottime</div><div class='add'>+ * @offs_tai:			Offset clock monotonic -&gt; clock tai</div><div class='add'>+ * @offs_aux:			Offset clock monotonic -&gt; clock AUX</div><div class='add'>+ * @coarse_nsec:		The nanoseconds part for coarse time getters</div><div class='add'>+ * @id:				The timekeeper ID</div><div class='add'>+ * @tkr_raw:			The readout base structure for CLOCK_MONOTONIC_RAW</div><div class='add'>+ * @raw_sec:			CLOCK_MONOTONIC_RAW  time in seconds</div><div class='add'>+ * @clock_was_set_seq:		The sequence number of clock was set events</div><div class='add'>+ * @cs_was_changed_seq:		The sequence number of clocksource change events</div><div class='add'>+ * @clock_valid:		Indicator for valid clock</div><div class='add'>+ * @monotonic_to_boot:		CLOCK_MONOTONIC to CLOCK_BOOTTIME offset</div><div class='add'>+ * @monotonic_to_aux:		CLOCK_MONOTONIC to CLOCK_AUX offset</div><div class='add'>+ * @cycle_interval:		Number of clock cycles in one NTP interval</div><div class='add'>+ * @xtime_interval:		Number of clock shifted nano seconds in one NTP</div><div class='add'>+ *				interval.</div><div class='add'>+ * @xtime_remainder:		Shifted nano seconds left over when rounding</div><div class='add'>+ *				@cycle_interval</div><div class='add'>+ * @raw_interval:		Shifted raw nano seconds accumulated per NTP interval.</div><div class='add'>+ * @next_leap_ktime:		CLOCK_MONOTONIC time value of a pending leap-second</div><div class='add'>+ * @ntp_tick:			The ntp_tick_length() value currently being</div><div class='add'>+ *				used. This cached copy ensures we consistently</div><div class='add'>+ *				apply the tick length for an entire tick, as</div><div class='add'>+ *				ntp_tick_length may change mid-tick, and we don't</div><div class='add'>+ *				want to apply that new value to the tick in</div><div class='add'>+ *				progress.</div><div class='add'>+ * @ntp_error:			Difference between accumulated time and NTP time in ntp</div><div class='add'>+ *				shifted nano seconds.</div><div class='add'>+ * @ntp_error_shift:		Shift conversion between clock shifted nano seconds and</div><div class='add'>+ *				ntp shifted nano seconds.</div><div class='add'>+ * @ntp_err_mult:		Multiplication factor for scaled math conversion</div><div class='add'>+ * @skip_second_overflow:	Flag used to avoid updating NTP twice with same second</div><div class='add'>+ * @tai_offset:			The current UTC to TAI offset in seconds</div><div class='ctx'>  *</div><div class='ctx'>  * Note: For timespec(64) based interfaces wall_to_monotonic is what</div><div class='del'>- * we need to add to xtime (or xtime corrected for sub jiffie times)</div><div class='add'>+ * we need to add to xtime (or xtime corrected for sub jiffy times)</div><div class='ctx'>  * to get to monotonic time.  Monotonic is pegged at zero at system</div><div class='ctx'>  * boot time, so wall_to_monotonic will be negative, however, we will</div><div class='ctx'>  * ALWAYS keep the tv_nsec part positive so we can use the usual</div><div class='hunk'>@@ -88,54 +114,72 @@ struct tk_read_base {</div><div class='ctx'>  *</div><div class='ctx'>  * @monotonic_to_boottime is a timespec64 representation of @offs_boot to</div><div class='ctx'>  * accelerate the VDSO update for CLOCK_BOOTTIME.</div><div class='add'>+ *</div><div class='add'>+ * @offs_aux is used by the auxiliary timekeepers which do not utilize any</div><div class='add'>+ * of the regular timekeeper offset fields.</div><div class='add'>+ *</div><div class='add'>+ * @monotonic_to_aux is a timespec64 representation of @offs_aux to</div><div class='add'>+ * accelerate the VDSO update for CLOCK_AUX.</div><div class='add'>+ *</div><div class='add'>+ * The cacheline ordering of the structure is optimized for in kernel usage of</div><div class='add'>+ * the ktime_get() and ktime_get_ts64() family of time accessors. Struct</div><div class='add'>+ * timekeeper is prepended in the core timekeeping code with a sequence count,</div><div class='add'>+ * which results in the following cacheline layout:</div><div class='add'>+ *</div><div class='add'>+ * 0:	seqcount, tkr_mono</div><div class='add'>+ * 1:	xtime_sec ... id</div><div class='add'>+ * 2:	tkr_raw, raw_sec</div><div class='add'>+ * 3,4: Internal variables</div><div class='add'>+ *</div><div class='add'>+ * Cacheline 0,1 contain the data which is used for accessing</div><div class='add'>+ * CLOCK_MONOTONIC/REALTIME/BOOTTIME/TAI, while cacheline 2 contains the</div><div class='add'>+ * data for accessing CLOCK_MONOTONIC_RAW.  Cacheline 3,4 are internal</div><div class='add'>+ * variables which are only accessed during timekeeper updates once per</div><div class='add'>+ * tick.</div><div class='ctx'>  */</div><div class='ctx'> struct timekeeper {</div><div class='add'>+	/* Cacheline 0 (together with prepended seqcount of timekeeper core): */</div><div class='ctx'> 	struct tk_read_base	tkr_mono;</div><div class='del'>-	struct tk_read_base	tkr_raw;</div><div class='add'>+</div><div class='add'>+	/* Cacheline 1: */</div><div class='ctx'> 	u64			xtime_sec;</div><div class='ctx'> 	unsigned long		ktime_sec;</div><div class='ctx'> 	struct timespec64	wall_to_monotonic;</div><div class='ctx'> 	ktime_t			offs_real;</div><div class='ctx'> 	ktime_t			offs_boot;</div><div class='del'>-	ktime_t			offs_tai;</div><div class='del'>-	s32			tai_offset;</div><div class='add'>+	union {</div><div class='add'>+		ktime_t		offs_tai;</div><div class='add'>+		ktime_t		offs_aux;</div><div class='add'>+	};</div><div class='add'>+	u32			coarse_nsec;</div><div class='add'>+	enum timekeeper_ids	id;</div><div class='add'>+</div><div class='add'>+	/* Cacheline 2: */</div><div class='add'>+	struct tk_read_base	tkr_raw;</div><div class='add'>+	u64			raw_sec;</div><div class='add'>+</div><div class='add'>+	/* Cachline 3 and 4 (timekeeping internal variables): */</div><div class='ctx'> 	unsigned int		clock_was_set_seq;</div><div class='ctx'> 	u8			cs_was_changed_seq;</div><div class='del'>-	ktime_t			next_leap_ktime;</div><div class='del'>-	u64			raw_sec;</div><div class='del'>-	struct timespec64	monotonic_to_boot;</div><div class='add'>+	u8			clock_valid;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct timespec64	monotonic_to_boot;</div><div class='add'>+		struct timespec64	monotonic_to_aux;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	/* The following members are for timekeeping internal use */</div><div class='ctx'> 	u64			cycle_interval;</div><div class='ctx'> 	u64			xtime_interval;</div><div class='ctx'> 	s64			xtime_remainder;</div><div class='ctx'> 	u64			raw_interval;</div><div class='del'>-	/* The ntp_tick_length() value currently being used.</div><div class='del'>-	 * This cached copy ensures we consistently apply the tick</div><div class='del'>-	 * length for an entire tick, as ntp_tick_length may change</div><div class='del'>-	 * mid-tick, and we don't want to apply that new value to</div><div class='del'>-	 * the tick in progress.</div><div class='del'>-	 */</div><div class='add'>+</div><div class='add'>+	ktime_t			next_leap_ktime;</div><div class='ctx'> 	u64			ntp_tick;</div><div class='del'>-	/* Difference between accumulated time and NTP time in ntp</div><div class='del'>-	 * shifted nano seconds. */</div><div class='ctx'> 	s64			ntp_error;</div><div class='ctx'> 	u32			ntp_error_shift;</div><div class='ctx'> 	u32			ntp_err_mult;</div><div class='del'>-	/* Flag used to avoid updating NTP twice with same second */</div><div class='ctx'> 	u32			skip_second_overflow;</div><div class='del'>-#ifdef CONFIG_DEBUG_TIMEKEEPING</div><div class='del'>-	long			last_warning;</div><div class='del'>-	/*</div><div class='del'>-	 * These simple flag variables are managed</div><div class='del'>-	 * without locks, which is racy, but they are</div><div class='del'>-	 * ok since we don't really care about being</div><div class='del'>-	 * super precise about how many events were</div><div class='del'>-	 * seen, just that a problem was observed.</div><div class='del'>-	 */</div><div class='del'>-	int			underflow_seen;</div><div class='del'>-	int			overflow_seen;</div><div class='del'>-#endif</div><div class='add'>+	s32			tai_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_GENERIC_TIME_VSYSCALL</div><div class='hunk'>@@ -153,4 +197,10 @@ static inline void update_vsyscall_tz(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_GENERIC_GETTIMEOFDAY) &amp;&amp; defined(CONFIG_POSIX_AUX_CLOCKS)</div><div class='add'>+extern void vdso_time_update_aux(struct timekeeper *tk);</div><div class='add'>+#else</div><div class='add'>+static inline void vdso_time_update_aux(struct timekeeper *tk) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_TIMEKEEPER_INTERNAL_H */</div><div class='head'>diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h<br/>index 7e50cbd97f86..aee2c1a46e47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/timekeeping.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timekeeping.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/timekeeping.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/timekeeping.h</a></div><div class='hunk'>@@ -22,14 +22,14 @@ extern int do_sys_settimeofday64(const struct timespec64 *tv,</div><div class='ctx'> 				 const struct timezone *tz);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ktime_get() family: read the current time in a multitude of ways,</div><div class='add'>+ * ktime_get() family - read the current time in a multitude of ways.</div><div class='ctx'>  *</div><div class='ctx'>  * The default time reference is CLOCK_MONOTONIC, starting at</div><div class='ctx'>  * boot time but not counting the time spent in suspend.</div><div class='ctx'>  * For other references, use the functions with "real", "clocktai",</div><div class='ctx'>  * "boottime" and "raw" suffixes.</div><div class='ctx'>  *</div><div class='del'>- * To get the time in a different format, use the ones wit</div><div class='add'>+ * To get the time in a different format, use the ones with</div><div class='ctx'>  * "ns", "ts64" and "seconds" suffix.</div><div class='ctx'>  *</div><div class='ctx'>  * See Documentation/core-api/timekeeping.rst for more details.</div><div class='hunk'>@@ -44,6 +44,12 @@ extern void ktime_get_ts64(struct timespec64 *ts);</div><div class='ctx'> extern void ktime_get_real_ts64(struct timespec64 *tv);</div><div class='ctx'> extern void ktime_get_coarse_ts64(struct timespec64 *ts);</div><div class='ctx'> extern void ktime_get_coarse_real_ts64(struct timespec64 *ts);</div><div class='add'>+extern void ktime_get_clock_ts64(clockid_t id, struct timespec64 *ts);</div><div class='add'>+</div><div class='add'>+/* Multigrain timestamp interfaces */</div><div class='add'>+extern void ktime_get_coarse_real_ts64_mg(struct timespec64 *ts);</div><div class='add'>+extern void ktime_get_real_ts64_mg(struct timespec64 *ts);</div><div class='add'>+extern unsigned long timekeeping_get_mg_floor_swaps(void);</div><div class='ctx'> </div><div class='ctx'> void getboottime64(struct timespec64 *ts);</div><div class='ctx'> </div><div class='hunk'>@@ -74,6 +80,8 @@ extern u32 ktime_get_resolution_ns(void);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ktime_get_real - get the real (wall-) time in ktime_t format</div><div class='add'>+ *</div><div class='add'>+ * Returns: real (wall) time in ktime_t format</div><div class='ctx'>  */</div><div class='ctx'> static inline ktime_t ktime_get_real(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -86,10 +94,12 @@ static inline ktime_t ktime_get_coarse_real(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ktime_get_boottime - Returns monotonic time since boot in ktime_t format</div><div class='add'>+ * ktime_get_boottime - Get monotonic time since boot in ktime_t format</div><div class='ctx'>  *</div><div class='ctx'>  * This is similar to CLOCK_MONTONIC/ktime_get, but also includes the</div><div class='ctx'>  * time spent in suspend.</div><div class='add'>+ *</div><div class='add'>+ * Returns: monotonic time since boot in ktime_t format</div><div class='ctx'>  */</div><div class='ctx'> static inline ktime_t ktime_get_boottime(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -102,7 +112,9 @@ static inline ktime_t ktime_get_coarse_boottime(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ktime_get_clocktai - Returns the TAI time of day in ktime_t format</div><div class='add'>+ * ktime_get_clocktai - Get the TAI time of day in ktime_t format</div><div class='add'>+ *</div><div class='add'>+ * Returns: the TAI time of day in ktime_t format</div><div class='ctx'>  */</div><div class='ctx'> static inline ktime_t ktime_get_clocktai(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -144,32 +156,60 @@ static inline u64 ktime_get_coarse_clocktai_ns(void)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ktime_mono_to_real - Convert monotonic time to clock realtime</div><div class='add'>+ * @mono: monotonic time to convert</div><div class='add'>+ *</div><div class='add'>+ * Returns: time converted to realtime clock</div><div class='ctx'>  */</div><div class='ctx'> static inline ktime_t ktime_mono_to_real(ktime_t mono)</div><div class='ctx'> {</div><div class='ctx'> 	return ktime_mono_to_any(mono, TK_OFFS_REAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ktime_get_ns - Get the current time in nanoseconds</div><div class='add'>+ *</div><div class='add'>+ * Returns: current time converted to nanoseconds</div><div class='add'>+ */</div><div class='ctx'> static inline u64 ktime_get_ns(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ktime_to_ns(ktime_get());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ktime_get_real_ns - Get the current real/wall time in nanoseconds</div><div class='add'>+ *</div><div class='add'>+ * Returns: current real time converted to nanoseconds</div><div class='add'>+ */</div><div class='ctx'> static inline u64 ktime_get_real_ns(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ktime_to_ns(ktime_get_real());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ktime_get_boottime_ns - Get the monotonic time since boot in nanoseconds</div><div class='add'>+ *</div><div class='add'>+ * Returns: current boottime converted to nanoseconds</div><div class='add'>+ */</div><div class='ctx'> static inline u64 ktime_get_boottime_ns(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ktime_to_ns(ktime_get_boottime());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ktime_get_clocktai_ns - Get the current TAI time of day in nanoseconds</div><div class='add'>+ *</div><div class='add'>+ * Returns: current TAI time converted to nanoseconds</div><div class='add'>+ */</div><div class='ctx'> static inline u64 ktime_get_clocktai_ns(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ktime_to_ns(ktime_get_clocktai());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * ktime_get_raw_ns - Get the raw monotonic time in nanoseconds</div><div class='add'>+ *</div><div class='add'>+ * Returns: current raw monotonic time converted to nanoseconds</div><div class='add'>+ */</div><div class='ctx'> static inline u64 ktime_get_raw_ns(void)</div><div class='ctx'> {</div><div class='ctx'> 	return ktime_to_ns(ktime_get_raw());</div><div class='hunk'>@@ -225,29 +265,31 @@ extern bool timekeeping_rtc_skipresume(void);</div><div class='ctx'> extern void timekeeping_inject_sleeptime64(const struct timespec64 *delta);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * struct ktime_timestanps - Simultaneous mono/boot/real timestamps</div><div class='del'>- * @mono:	Monotonic timestamp</div><div class='del'>- * @boot:	Boottime timestamp</div><div class='del'>- * @real:	Realtime timestamp</div><div class='add'>+ * Auxiliary clock interfaces</div><div class='ctx'>  */</div><div class='del'>-struct ktime_timestamps {</div><div class='del'>-	u64		mono;</div><div class='del'>-	u64		boot;</div><div class='del'>-	u64		real;</div><div class='del'>-};</div><div class='add'>+#ifdef CONFIG_POSIX_AUX_CLOCKS</div><div class='add'>+extern bool ktime_get_aux(clockid_t id, ktime_t *kt);</div><div class='add'>+extern bool ktime_get_aux_ts64(clockid_t id, struct timespec64 *kt);</div><div class='add'>+#else</div><div class='add'>+static inline bool ktime_get_aux(clockid_t id, ktime_t *kt) { return false; }</div><div class='add'>+static inline bool ktime_get_aux_ts64(clockid_t id, struct timespec64 *kt) { return false; }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct system_time_snapshot - simultaneous raw/real time capture with</div><div class='ctx'>  *				 counter value</div><div class='ctx'>  * @cycles:	Clocksource counter value to produce the system times</div><div class='ctx'>  * @real:	Realtime system time</div><div class='add'>+ * @boot:	Boot time</div><div class='ctx'>  * @raw:	Monotonic raw system time</div><div class='del'>- * @clock_was_set_seq:	The sequence number of clock was set events</div><div class='add'>+ * @cs_id:	Clocksource ID</div><div class='add'>+ * @clock_was_set_seq:	The sequence number of clock-was-set events</div><div class='ctx'>  * @cs_was_changed_seq:	The sequence number of clocksource change events</div><div class='ctx'>  */</div><div class='ctx'> struct system_time_snapshot {</div><div class='ctx'> 	u64			cycles;</div><div class='ctx'> 	ktime_t			real;</div><div class='add'>+	ktime_t			boot;</div><div class='ctx'> 	ktime_t			raw;</div><div class='ctx'> 	enum clocksource_ids	cs_id;</div><div class='ctx'> 	unsigned int		clock_was_set_seq;</div><div class='hunk'>@@ -275,12 +317,18 @@ struct system_device_crosststamp {</div><div class='ctx'>  *		timekeeping code to verify comparability of two cycle values.</div><div class='ctx'>  *		The default ID, CSID_GENERIC, does not identify a specific</div><div class='ctx'>  *		clocksource.</div><div class='add'>+ * @use_nsecs:	@cycles is in nanoseconds.</div><div class='ctx'>  */</div><div class='ctx'> struct system_counterval_t {</div><div class='ctx'> 	u64			cycles;</div><div class='ctx'> 	enum clocksource_ids	cs_id;</div><div class='add'>+	bool			use_nsecs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+extern bool ktime_real_to_base_clock(ktime_t treal,</div><div class='add'>+				     enum clocksource_ids base_id, u64 *cycles);</div><div class='add'>+extern bool timekeeping_clocksource_has_base(enum clocksource_ids id);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Get cross timestamp between system clock and device clock</div><div class='ctx'>  */</div><div class='hunk'>@@ -297,9 +345,6 @@ extern int get_device_system_crosststamp(</div><div class='ctx'>  */</div><div class='ctx'> extern void ktime_get_snapshot(struct system_time_snapshot *systime_snapshot);</div><div class='ctx'> </div><div class='del'>-/* NMI safe mono/boot/realtime timestamps */</div><div class='del'>-extern void ktime_get_fast_timestamps(struct ktime_timestamps *snap);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Persistent clock related interfaces</div><div class='ctx'>  */</div><div class='head'>diff --git a/include/linux/timer.h b/include/linux/timer.h<br/>index 14a633ba61d6..62e1cea71125 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/timer.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/timer.h</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> #define __TIMER_LOCKDEP_MAP_INITIALIZER(_kn)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * @TIMER_DEFERRABLE: A deferrable timer will work normally when the</div><div class='ctx'>  * system is busy, but will not cause a CPU to come out of idle just</div><div class='ctx'>  * to service it; instead, the timer will be serviced when the CPU</div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @TIMER_IRQSAFE: An irqsafe timer is executed with IRQ disabled and</div><div class='ctx'>  * it's safe to wait for the completion of the running instance from</div><div class='del'>- * IRQ handlers, for example, by calling del_timer_sync().</div><div class='add'>+ * IRQ handlers, for example, by calling timer_delete_sync().</div><div class='ctx'>  *</div><div class='ctx'>  * Note: The irq disabled callback execution is a special case for</div><div class='ctx'>  * workqueue locking issues. It's not meant for executing random crap</div><div class='hunk'>@@ -67,44 +67,44 @@</div><div class='ctx'> /*</div><div class='ctx'>  * LOCKDEP and DEBUG timer interfaces.</div><div class='ctx'>  */</div><div class='del'>-void init_timer_key(struct timer_list *timer,</div><div class='add'>+void timer_init_key(struct timer_list *timer,</div><div class='ctx'> 		    void (*func)(struct timer_list *), unsigned int flags,</div><div class='ctx'> 		    const char *name, struct lock_class_key *key);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_OBJECTS_TIMERS</div><div class='del'>-extern void init_timer_on_stack_key(struct timer_list *timer,</div><div class='add'>+extern void timer_init_key_on_stack(struct timer_list *timer,</div><div class='ctx'> 				    void (*func)(struct timer_list *),</div><div class='ctx'> 				    unsigned int flags, const char *name,</div><div class='ctx'> 				    struct lock_class_key *key);</div><div class='ctx'> #else</div><div class='del'>-static inline void init_timer_on_stack_key(struct timer_list *timer,</div><div class='add'>+static inline void timer_init_key_on_stack(struct timer_list *timer,</div><div class='ctx'> 					   void (*func)(struct timer_list *),</div><div class='ctx'> 					   unsigned int flags,</div><div class='ctx'> 					   const char *name,</div><div class='ctx'> 					   struct lock_class_key *key)</div><div class='ctx'> {</div><div class='del'>-	init_timer_key(timer, func, flags, name, key);</div><div class='add'>+	timer_init_key(timer, func, flags, name, key);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LOCKDEP</div><div class='del'>-#define __init_timer(_timer, _fn, _flags)				\</div><div class='add'>+#define __timer_init(_timer, _fn, _flags)				\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		static struct lock_class_key __key;			\</div><div class='del'>-		init_timer_key((_timer), (_fn), (_flags), #_timer, &amp;__key);\</div><div class='add'>+		timer_init_key((_timer), (_fn), (_flags), #_timer, &amp;__key);\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define __init_timer_on_stack(_timer, _fn, _flags)			\</div><div class='add'>+#define __timer_init_on_stack(_timer, _fn, _flags)			\</div><div class='ctx'> 	do {								\</div><div class='ctx'> 		static struct lock_class_key __key;			\</div><div class='del'>-		init_timer_on_stack_key((_timer), (_fn), (_flags),	\</div><div class='add'>+		timer_init_key_on_stack((_timer), (_fn), (_flags),	\</div><div class='ctx'> 					#_timer, &amp;__key);		 \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define __init_timer(_timer, _fn, _flags)				\</div><div class='del'>-	init_timer_key((_timer), (_fn), (_flags), NULL, NULL)</div><div class='del'>-#define __init_timer_on_stack(_timer, _fn, _flags)			\</div><div class='del'>-	init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL)</div><div class='add'>+#define __timer_init(_timer, _fn, _flags)				\</div><div class='add'>+	timer_init_key((_timer), (_fn), (_flags), NULL, NULL)</div><div class='add'>+#define __timer_init_on_stack(_timer, _fn, _flags)			\</div><div class='add'>+	timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -115,21 +115,21 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,</div><div class='ctx'>  *</div><div class='ctx'>  * Regular timer initialization should use either DEFINE_TIMER() above,</div><div class='ctx'>  * or timer_setup(). For timers on the stack, timer_setup_on_stack() must</div><div class='del'>- * be used and must be balanced with a call to destroy_timer_on_stack().</div><div class='add'>+ * be used and must be balanced with a call to timer_destroy_on_stack().</div><div class='ctx'>  */</div><div class='ctx'> #define timer_setup(timer, callback, flags)			\</div><div class='del'>-	__init_timer((timer), (callback), (flags))</div><div class='add'>+	__timer_init((timer), (callback), (flags))</div><div class='ctx'> </div><div class='ctx'> #define timer_setup_on_stack(timer, callback, flags)		\</div><div class='del'>-	__init_timer_on_stack((timer), (callback), (flags))</div><div class='add'>+	__timer_init_on_stack((timer), (callback), (flags))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_OBJECTS_TIMERS</div><div class='del'>-extern void destroy_timer_on_stack(struct timer_list *timer);</div><div class='add'>+extern void timer_destroy_on_stack(struct timer_list *timer);</div><div class='ctx'> #else</div><div class='del'>-static inline void destroy_timer_on_stack(struct timer_list *timer) { }</div><div class='add'>+static inline void timer_destroy_on_stack(struct timer_list *timer) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define from_timer(var, callback_timer, timer_fieldname) \</div><div class='add'>+#define timer_container_of(var, callback_timer, timer_fieldname)	\</div><div class='ctx'> 	container_of(callback_timer, typeof(*var), timer_fieldname)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -140,7 +140,7 @@ static inline void destroy_timer_on_stack(struct timer_list *timer) { }</div><div class='ctx'>  * or not. Callers must ensure serialization wrt. other operations done</div><div class='ctx'>  * to this timer, eg. interrupt contexts, or other CPUs on SMP.</div><div class='ctx'>  *</div><div class='del'>- * return value: 1 if the timer is pending, 0 if not.</div><div class='add'>+ * Returns: 1 if the timer is pending, 0 if not.</div><div class='ctx'>  */</div><div class='ctx'> static inline int timer_pending(const struct timer_list * timer)</div><div class='ctx'> {</div><div class='hunk'>@@ -156,54 +156,26 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);</div><div class='ctx'>  * The jiffies value which is added to now, when there is no timer</div><div class='ctx'>  * in the timer wheel:</div><div class='ctx'>  */</div><div class='del'>-#define NEXT_TIMER_MAX_DELTA	((1UL &lt;&lt; 30) - 1)</div><div class='add'>+#define TIMER_NEXT_MAX_DELTA	((1UL &lt;&lt; 30) - 1)</div><div class='ctx'> </div><div class='ctx'> extern void add_timer(struct timer_list *timer);</div><div class='ctx'> extern void add_timer_local(struct timer_list *timer);</div><div class='ctx'> extern void add_timer_global(struct timer_list *timer);</div><div class='ctx'> </div><div class='del'>-extern int try_to_del_timer_sync(struct timer_list *timer);</div><div class='add'>+extern int timer_delete_sync_try(struct timer_list *timer);</div><div class='ctx'> extern int timer_delete_sync(struct timer_list *timer);</div><div class='ctx'> extern int timer_delete(struct timer_list *timer);</div><div class='ctx'> extern int timer_shutdown_sync(struct timer_list *timer);</div><div class='ctx'> extern int timer_shutdown(struct timer_list *timer);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * del_timer_sync - Delete a pending timer and wait for a running callback</div><div class='del'>- * @timer:	The timer to be deleted</div><div class='del'>- *</div><div class='del'>- * See timer_delete_sync() for detailed explanation.</div><div class='del'>- *</div><div class='del'>- * Do not use in new code. Use timer_delete_sync() instead.</div><div class='del'>- */</div><div class='del'>-static inline int del_timer_sync(struct timer_list *timer)</div><div class='del'>-{</div><div class='del'>-	return timer_delete_sync(timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * del_timer - Delete a pending timer</div><div class='del'>- * @timer:	The timer to be deleted</div><div class='del'>- *</div><div class='del'>- * See timer_delete() for detailed explanation.</div><div class='del'>- *</div><div class='del'>- * Do not use in new code. Use timer_delete() instead.</div><div class='del'>- */</div><div class='del'>-static inline int del_timer(struct timer_list *timer)</div><div class='del'>-{</div><div class='del'>-	return timer_delete(timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void init_timers(void);</div><div class='add'>+extern void timers_init(void);</div><div class='ctx'> struct hrtimer;</div><div class='ctx'> extern enum hrtimer_restart it_real_fn(struct hrtimer *);</div><div class='ctx'> </div><div class='del'>-unsigned long __round_jiffies(unsigned long j, int cpu);</div><div class='ctx'> unsigned long __round_jiffies_relative(unsigned long j, int cpu);</div><div class='ctx'> unsigned long round_jiffies(unsigned long j);</div><div class='ctx'> unsigned long round_jiffies_relative(unsigned long j);</div><div class='ctx'> </div><div class='del'>-unsigned long __round_jiffies_up(unsigned long j, int cpu);</div><div class='ctx'> unsigned long __round_jiffies_up_relative(unsigned long j, int cpu);</div><div class='ctx'> unsigned long round_jiffies_up(unsigned long j);</div><div class='ctx'> unsigned long round_jiffies_up_relative(unsigned long j);</div><div class='hunk'>@@ -216,4 +188,13 @@ int timers_dead_cpu(unsigned int cpu);</div><div class='ctx'> #define timers_dead_cpu		NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_NO_HZ_COMMON)</div><div class='add'>+extern int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_cpumask);</div><div class='add'>+#else</div><div class='add'>+static inline int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_cpumask)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h<br/>index 62973f7d4610..d306d9dd2207 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/timerqueue.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timerqueue.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/timerqueue.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/timerqueue.h</a></div><div class='hunk'>@@ -37,11 +37,6 @@ static inline bool timerqueue_node_queued(struct timerqueue_node *node)</div><div class='ctx'> 	return !RB_EMPTY_NODE(&amp;node-&gt;node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool timerqueue_node_expires(struct timerqueue_node *node)</div><div class='del'>-{</div><div class='del'>-	return node-&gt;expires;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void timerqueue_init_head(struct timerqueue_head *head)</div><div class='ctx'> {</div><div class='ctx'> 	head-&gt;rb_root = RB_ROOT_CACHED;</div><div class='head'>diff --git a/include/linux/timex.h b/include/linux/timex.h<br/>index 3871b06bd302..4ee32eff3f22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/timex.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/timex.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/timex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/timex.h</a></div><div class='hunk'>@@ -139,14 +139,6 @@ unsigned long random_get_entropy_fallback(void);</div><div class='ctx'> #define MAXSEC 2048		/* max interval between updates (s) */</div><div class='ctx'> #define NTP_PHASE_LIMIT ((MAXPHASE / NSEC_PER_USEC) &lt;&lt; 5) /* beyond max. dispersion */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * kernel variables</div><div class='del'>- * Note: maximum error = NTP sync distance = dispersion + delay / 2;</div><div class='del'>- * estimated error = NTP dispersion.</div><div class='del'>- */</div><div class='del'>-extern unsigned long tick_usec;		/* USER_HZ period (usec) */</div><div class='del'>-extern unsigned long tick_nsec;		/* SHIFTED_HZ period (nsec) */</div><div class='del'>-</div><div class='ctx'> /* Required to safely shift negative values */</div><div class='ctx'> #define shift_right(x, s) ({	\</div><div class='ctx'> 	__typeof__(x) __x = (x);	\</div><div class='head'>diff --git a/include/linux/tnum.h b/include/linux/tnum.h<br/>index 3c13240077b8..c52b862dad45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tnum.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tnum.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tnum.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tnum.h</a></div><div class='hunk'>@@ -40,6 +40,8 @@ struct tnum tnum_arshift(struct tnum a, u8 min_shift, u8 insn_bitness);</div><div class='ctx'> struct tnum tnum_add(struct tnum a, struct tnum b);</div><div class='ctx'> /* Subtract two tnums, return @a - @b */</div><div class='ctx'> struct tnum tnum_sub(struct tnum a, struct tnum b);</div><div class='add'>+/* Neg of a tnum, return  0 - @a */</div><div class='add'>+struct tnum tnum_neg(struct tnum a);</div><div class='ctx'> /* Bitwise-AND, return @a &amp; @b */</div><div class='ctx'> struct tnum tnum_and(struct tnum a, struct tnum b);</div><div class='ctx'> /* Bitwise-OR, return @a | @b */</div><div class='hunk'>@@ -49,9 +51,15 @@ struct tnum tnum_xor(struct tnum a, struct tnum b);</div><div class='ctx'> /* Multiply two tnums, return @a * @b */</div><div class='ctx'> struct tnum tnum_mul(struct tnum a, struct tnum b);</div><div class='ctx'> </div><div class='add'>+/* Return true if the known bits of both tnums have the same value */</div><div class='add'>+bool tnum_overlap(struct tnum a, struct tnum b);</div><div class='add'>+</div><div class='ctx'> /* Return a tnum representing numbers satisfying both @a and @b */</div><div class='ctx'> struct tnum tnum_intersect(struct tnum a, struct tnum b);</div><div class='ctx'> </div><div class='add'>+/* Returns a tnum representing numbers satisfying either @a or @b */</div><div class='add'>+struct tnum tnum_union(struct tnum t1, struct tnum t2);</div><div class='add'>+</div><div class='ctx'> /* Return @a with all but the lowest @size bytes cleared */</div><div class='ctx'> struct tnum tnum_cast(struct tnum a, u8 size);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/topology.h b/include/linux/topology.h<br/>index 52f5850730b3..6575af39fd10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/topology.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/topology.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/topology.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/topology.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/arch_topology.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -39,10 +40,6 @@</div><div class='ctx'> #define nr_cpus_node(node) cpumask_weight(cpumask_of_node(node))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define for_each_node_with_cpus(node)			\</div><div class='del'>-	for_each_online_node(node)			\</div><div class='del'>-		if (nr_cpus_node(node))</div><div class='del'>-</div><div class='ctx'> int arch_update_cpu_topology(void);</div><div class='ctx'> </div><div class='ctx'> /* Conform to ACPI 2.0 SLIT distance definitions */</div><div class='hunk'>@@ -240,7 +237,30 @@ static inline const struct cpumask *cpu_smt_mask(int cpu)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline const struct cpumask *cpu_cpu_mask(int cpu)</div><div class='add'>+#ifndef topology_is_primary_thread</div><div class='add'>+</div><div class='add'>+static inline bool topology_is_primary_thread(unsigned int cpu)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * When disabling SMT, the primary thread of the SMT will remain</div><div class='add'>+	 * enabled/active. Architectures that have a special primary thread</div><div class='add'>+	 * (e.g. x86) need to override this function. Otherwise the first</div><div class='add'>+	 * thread in the SMT can be made the primary thread.</div><div class='add'>+	 *</div><div class='add'>+	 * The sibling cpumask of an offline CPU always contains the CPU</div><div class='add'>+	 * itself on architectures using the implementation of</div><div class='add'>+	 * CONFIG_GENERIC_ARCH_TOPOLOGY for building their topology.</div><div class='add'>+	 * Other architectures not using CONFIG_GENERIC_ARCH_TOPOLOGY for</div><div class='add'>+	 * building their topology have to check whether to use this default</div><div class='add'>+	 * implementation or to override it.</div><div class='add'>+	 */</div><div class='add'>+	return cpu == cpumask_first(topology_sibling_cpumask(cpu));</div><div class='add'>+}</div><div class='add'>+#define topology_is_primary_thread topology_is_primary_thread</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline const struct cpumask *cpu_node_mask(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return cpumask_of_node(cpu_to_node(cpu));</div><div class='ctx'> }</div><div class='hunk'>@@ -262,6 +282,36 @@ sched_numa_hop_mask(unsigned int node, unsigned int hops)</div><div class='ctx'> #endif	/* CONFIG_NUMA */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * for_each_node_numadist() - iterate over nodes in increasing distance</div><div class='add'>+ *			      order, starting from a given node</div><div class='add'>+ * @node: the iteration variable and the starting node.</div><div class='add'>+ * @unvisited: a nodemask to keep track of the unvisited nodes.</div><div class='add'>+ *</div><div class='add'>+ * This macro iterates over NUMA node IDs in increasing distance from the</div><div class='add'>+ * starting @node and yields MAX_NUMNODES when all the nodes have been</div><div class='add'>+ * visited.</div><div class='add'>+ *</div><div class='add'>+ * Note that by the time the loop completes, the @unvisited nodemask will</div><div class='add'>+ * be fully cleared, unless the loop exits early.</div><div class='add'>+ *</div><div class='add'>+ * The difference between for_each_node() and for_each_node_numadist() is</div><div class='add'>+ * that the former allows to iterate over nodes in numerical order, whereas</div><div class='add'>+ * the latter iterates over nodes in increasing order of distance.</div><div class='add'>+ *</div><div class='add'>+ * This complexity of this iterator is O(N^2), where N represents the</div><div class='add'>+ * number of nodes, as each iteration involves scanning all nodes to</div><div class='add'>+ * find the one with the shortest distance.</div><div class='add'>+ *</div><div class='add'>+ * Requires rcu_lock to be held.</div><div class='add'>+ */</div><div class='add'>+#define for_each_node_numadist(node, unvisited)					\</div><div class='add'>+	for (int __start = (node),						\</div><div class='add'>+	     (node) = nearest_node_nodemask((__start), &amp;(unvisited));		\</div><div class='add'>+	     (node) &lt; MAX_NUMNODES;						\</div><div class='add'>+	     node_clear((node), (unvisited)),					\</div><div class='add'>+	     (node) = nearest_node_nodemask((__start), &amp;(unvisited)))</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * for_each_numa_hop_mask - iterate over cpumasks of increasing NUMA distance</div><div class='ctx'>  *                          from a given node.</div><div class='ctx'>  * @mask: the iteration variable.</div><div class='hunk'>@@ -279,4 +329,13 @@ sched_numa_hop_mask(unsigned int node, unsigned int hops)</div><div class='ctx'> 	     !IS_ERR_OR_NULL(mask);					       \</div><div class='ctx'> 	     __hops++)</div><div class='ctx'> </div><div class='add'>+DECLARE_PER_CPU(unsigned long, cpu_scale);</div><div class='add'>+</div><div class='add'>+static inline unsigned long topology_get_cpu_scale(int cpu)</div><div class='add'>+{</div><div class='add'>+	return per_cpu(cpu_scale, cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity);</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_TOPOLOGY_H */</div><div class='head'>diff --git a/include/linux/torture.h b/include/linux/torture.h<br/>index 1541454da03e..1b59056c3b18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/torture.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/torture.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/torture.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/torture.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;linux/cpumask_types.h&gt;</div><div class='ctx'> #include &lt;linux/seqlock.h&gt;</div><div class='ctx'> #include &lt;linux/lockdep.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='hunk'>@@ -104,6 +104,7 @@ int torture_stutter_init(int s, int sgap);</div><div class='ctx'> /* Initialization and cleanup. */</div><div class='ctx'> bool torture_init_begin(char *ttype, int v);</div><div class='ctx'> void torture_init_end(void);</div><div class='add'>+unsigned long get_torture_init_jiffies(void);</div><div class='ctx'> bool torture_cleanup_begin(void);</div><div class='ctx'> void torture_cleanup_end(void);</div><div class='ctx'> bool torture_must_stop(void);</div><div class='hunk'>@@ -130,7 +131,7 @@ void _torture_stop_kthread(char *m, struct task_struct **tp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST) || IS_ENABLED(CONFIG_LOCK_TORTURE_TEST) || IS_MODULE(CONFIG_LOCK_TORTURE_TEST)</div><div class='del'>-long torture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask);</div><div class='add'>+long torture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask, bool dowarn);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* __LINUX_TORTURE_H */</div><div class='head'>diff --git a/include/linux/tpm.h b/include/linux/tpm.h<br/>index 4ee9d13749ad..202da079d500 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tpm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tpm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tpm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tpm.h</a></div><div class='hunk'>@@ -23,24 +23,38 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;crypto/hash_info.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TPM_DIGEST_SIZE 20	/* Max TPM v1.2 PCR size */</div><div class='del'>-#define TPM_MAX_DIGEST_SIZE SHA512_DIGEST_SIZE</div><div class='add'>+</div><div class='add'>+#define TPM2_MAX_DIGEST_SIZE	SHA512_DIGEST_SIZE</div><div class='add'>+#define TPM2_MAX_PCR_BANKS	8</div><div class='ctx'> </div><div class='ctx'> struct tpm_chip;</div><div class='ctx'> struct trusted_key_payload;</div><div class='ctx'> struct trusted_key_options;</div><div class='add'>+/* opaque structure, holds auth session parameters like the session key */</div><div class='add'>+struct tpm2_auth;</div><div class='add'>+</div><div class='add'>+enum tpm2_session_types {</div><div class='add'>+	TPM2_SE_HMAC	= 0x00,</div><div class='add'>+	TPM2_SE_POLICY	= 0x01,</div><div class='add'>+	TPM2_SE_TRIAL	= 0x02,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* if you add a new hash to this, increment TPM_MAX_HASHES below */</div><div class='ctx'> enum tpm_algorithms {</div><div class='ctx'> 	TPM_ALG_ERROR		= 0x0000,</div><div class='ctx'> 	TPM_ALG_SHA1		= 0x0004,</div><div class='add'>+	TPM_ALG_AES		= 0x0006,</div><div class='ctx'> 	TPM_ALG_KEYEDHASH	= 0x0008,</div><div class='ctx'> 	TPM_ALG_SHA256		= 0x000B,</div><div class='ctx'> 	TPM_ALG_SHA384		= 0x000C,</div><div class='ctx'> 	TPM_ALG_SHA512		= 0x000D,</div><div class='ctx'> 	TPM_ALG_NULL		= 0x0010,</div><div class='ctx'> 	TPM_ALG_SM3_256		= 0x0012,</div><div class='add'>+	TPM_ALG_ECC		= 0x0023,</div><div class='add'>+	TPM_ALG_CFB		= 0x0043,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -49,9 +63,14 @@ enum tpm_algorithms {</div><div class='ctx'>  */</div><div class='ctx'> #define TPM_MAX_HASHES	5</div><div class='ctx'> </div><div class='add'>+enum tpm2_curves {</div><div class='add'>+	TPM2_ECC_NONE		= 0x0000,</div><div class='add'>+	TPM2_ECC_NIST_P256	= 0x0003,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct tpm_digest {</div><div class='ctx'> 	u16 alg_id;</div><div class='del'>-	u8 digest[TPM_MAX_DIGEST_SIZE];</div><div class='add'>+	u8 digest[TPM2_MAX_DIGEST_SIZE];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct tpm_bank_info {</div><div class='hunk'>@@ -70,7 +89,8 @@ struct tpm_class_ops {</div><div class='ctx'> 	const u8 req_complete_val;</div><div class='ctx'> 	bool (*req_canceled)(struct tpm_chip *chip, u8 status);</div><div class='ctx'> 	int (*recv) (struct tpm_chip *chip, u8 *buf, size_t len);</div><div class='del'>-	int (*send) (struct tpm_chip *chip, u8 *buf, size_t len);</div><div class='add'>+	int (*send)(struct tpm_chip *chip, u8 *buf, size_t bufsiz,</div><div class='add'>+		    size_t cmd_len);</div><div class='ctx'> 	void (*cancel) (struct tpm_chip *chip);</div><div class='ctx'> 	u8 (*status) (struct tpm_chip *chip);</div><div class='ctx'> 	void (*update_timeouts)(struct tpm_chip *chip,</div><div class='hunk'>@@ -116,6 +136,20 @@ struct tpm_chip_seqops {</div><div class='ctx'> 	const struct seq_operations *seqops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* fixed define for the curve we use which is NIST_P256 */</div><div class='add'>+#define EC_PT_SZ	32</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fixed define for the size of a name.  This is actually HASHALG size</div><div class='add'>+ * plus 2, so 32 for SHA256</div><div class='add'>+ */</div><div class='add'>+#define TPM2_NAME_SIZE	34</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The maximum size for an object context</div><div class='add'>+ */</div><div class='add'>+#define TPM2_MAX_CONTEXT_SIZE 4096</div><div class='add'>+</div><div class='ctx'> struct tpm_chip {</div><div class='ctx'> 	struct device dev;</div><div class='ctx'> 	struct device devs;</div><div class='hunk'>@@ -151,13 +185,13 @@ struct tpm_chip {</div><div class='ctx'> 	unsigned long duration[TPM_NUM_DURATIONS]; /* jiffies */</div><div class='ctx'> 	bool duration_adjusted;</div><div class='ctx'> </div><div class='del'>-	struct dentry *bios_dir[TPM_NUM_EVENT_LOG_FILES];</div><div class='add'>+	struct dentry *bios_dir;</div><div class='ctx'> </div><div class='ctx'> 	const struct attribute_group *groups[3 + TPM_MAX_HASHES];</div><div class='ctx'> 	unsigned int groups_cnt;</div><div class='ctx'> </div><div class='ctx'> 	u32 nr_allocated_banks;</div><div class='del'>-	struct tpm_bank_info *allocated_banks;</div><div class='add'>+	struct tpm_bank_info allocated_banks[TPM2_MAX_PCR_BANKS];</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> 	acpi_handle acpi_dev_handle;</div><div class='ctx'> 	char ppi_version[TPM_PPI_VERSION_LEN + 1];</div><div class='hunk'>@@ -170,6 +204,18 @@ struct tpm_chip {</div><div class='ctx'> </div><div class='ctx'> 	/* active locality */</div><div class='ctx'> 	int locality;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TCG_TPM2_HMAC</div><div class='add'>+	/* details for communication security via sessions */</div><div class='add'>+</div><div class='add'>+	/* saved context for NULL seed */</div><div class='add'>+	u8 null_key_context[TPM2_MAX_CONTEXT_SIZE];</div><div class='add'>+	 /* name of NULL seed */</div><div class='add'>+	u8 null_key_name[TPM2_NAME_SIZE];</div><div class='add'>+	u8 null_ec_key_x[EC_PT_SZ];</div><div class='add'>+	u8 null_ec_key_y[EC_PT_SZ];</div><div class='add'>+	struct tpm2_auth *auth;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TPM_HEADER_SIZE		10</div><div class='hunk'>@@ -181,19 +227,21 @@ enum tpm2_const {</div><div class='ctx'> </div><div class='ctx'> enum tpm2_timeouts {</div><div class='ctx'> 	TPM2_TIMEOUT_A          =    750,</div><div class='del'>-	TPM2_TIMEOUT_B          =   2000,</div><div class='add'>+	TPM2_TIMEOUT_B          =   4000,</div><div class='ctx'> 	TPM2_TIMEOUT_C          =    200,</div><div class='ctx'> 	TPM2_TIMEOUT_D          =     30,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tpm2_durations {</div><div class='ctx'> 	TPM2_DURATION_SHORT     =     20,</div><div class='del'>-	TPM2_DURATION_MEDIUM    =    750,</div><div class='ctx'> 	TPM2_DURATION_LONG      =   2000,</div><div class='del'>-	TPM2_DURATION_LONG_LONG = 300000,</div><div class='ctx'> 	TPM2_DURATION_DEFAULT   = 120000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm2_structures {</div><div class='ctx'> 	TPM2_ST_NO_SESSIONS	= 0x8001,</div><div class='ctx'> 	TPM2_ST_SESSIONS	= 0x8002,</div><div class='add'>+	TPM2_ST_CREATION	= 0x8021,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Indicates from what layer of the software stack the error comes from */</div><div class='hunk'>@@ -204,6 +252,7 @@ enum tpm2_return_codes {</div><div class='ctx'> 	TPM2_RC_SUCCESS		= 0x0000,</div><div class='ctx'> 	TPM2_RC_HASH		= 0x0083, /* RC_FMT1 */</div><div class='ctx'> 	TPM2_RC_HANDLE		= 0x008B,</div><div class='add'>+	TPM2_RC_INTEGRITY	= 0x009F,</div><div class='ctx'> 	TPM2_RC_INITIALIZE	= 0x0100, /* RC_VER1 */</div><div class='ctx'> 	TPM2_RC_FAILURE		= 0x0101,</div><div class='ctx'> 	TPM2_RC_DISABLED	= 0x0120,</div><div class='hunk'>@@ -212,6 +261,7 @@ enum tpm2_return_codes {</div><div class='ctx'> 	TPM2_RC_TESTING		= 0x090A, /* RC_WARN */</div><div class='ctx'> 	TPM2_RC_REFERENCE_H0	= 0x0910,</div><div class='ctx'> 	TPM2_RC_RETRY		= 0x0922,</div><div class='add'>+	TPM2_RC_SESSION_MEMORY	= 0x0903,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm2_command_codes {</div><div class='hunk'>@@ -231,6 +281,8 @@ enum tpm2_command_codes {</div><div class='ctx'> 	TPM2_CC_CONTEXT_LOAD	        = 0x0161,</div><div class='ctx'> 	TPM2_CC_CONTEXT_SAVE	        = 0x0162,</div><div class='ctx'> 	TPM2_CC_FLUSH_CONTEXT	        = 0x0165,</div><div class='add'>+	TPM2_CC_READ_PUBLIC		= 0x0173,</div><div class='add'>+	TPM2_CC_START_AUTH_SESS		= 0x0176,</div><div class='ctx'> 	TPM2_CC_VERIFY_SIGNATURE        = 0x0177,</div><div class='ctx'> 	TPM2_CC_GET_CAPABILITY	        = 0x017A,</div><div class='ctx'> 	TPM2_CC_GET_RANDOM	        = 0x017B,</div><div class='hunk'>@@ -243,9 +295,25 @@ enum tpm2_command_codes {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm2_permanent_handles {</div><div class='add'>+	TPM2_RH_NULL		= 0x40000007,</div><div class='ctx'> 	TPM2_RS_PW		= 0x40000009,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Most Significant Octet for key types  */</div><div class='add'>+enum tpm2_mso_type {</div><div class='add'>+	TPM2_MSO_NVRAM		= 0x01,</div><div class='add'>+	TPM2_MSO_SESSION	= 0x02,</div><div class='add'>+	TPM2_MSO_POLICY		= 0x03,</div><div class='add'>+	TPM2_MSO_PERMANENT	= 0x40,</div><div class='add'>+	TPM2_MSO_VOLATILE	= 0x80,</div><div class='add'>+	TPM2_MSO_PERSISTENT	= 0x81,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline enum tpm2_mso_type tpm2_handle_mso(u32 handle)</div><div class='add'>+{</div><div class='add'>+	return handle &gt;&gt; 24;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum tpm2_capabilities {</div><div class='ctx'> 	TPM2_CAP_HANDLES	= 1,</div><div class='ctx'> 	TPM2_CAP_COMMANDS	= 2,</div><div class='hunk'>@@ -272,6 +340,7 @@ enum tpm2_cc_attrs {</div><div class='ctx'> #define TPM_VID_WINBOND  0x1050</div><div class='ctx'> #define TPM_VID_STM      0x104A</div><div class='ctx'> #define TPM_VID_ATML     0x1114</div><div class='add'>+#define TPM_VID_IFX      0x15D1</div><div class='ctx'> </div><div class='ctx'> enum tpm_chip_flags {</div><div class='ctx'> 	TPM_CHIP_FLAG_BOOTSTRAPPED		= BIT(0),</div><div class='hunk'>@@ -284,6 +353,8 @@ enum tpm_chip_flags {</div><div class='ctx'> 	TPM_CHIP_FLAG_FIRMWARE_UPGRADE		= BIT(7),</div><div class='ctx'> 	TPM_CHIP_FLAG_SUSPENDED			= BIT(8),</div><div class='ctx'> 	TPM_CHIP_FLAG_HWRNG_DISABLED		= BIT(9),</div><div class='add'>+	TPM_CHIP_FLAG_DISABLE			= BIT(10),</div><div class='add'>+	TPM_CHIP_FLAG_SYNC			= BIT(11),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev)</div><div class='hunk'>@@ -297,28 +368,46 @@ struct tpm_header {</div><div class='ctx'> 	};</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-/* A string buffer type for constructing TPM commands. This is based on the</div><div class='del'>- * ideas of string buffer code in security/keys/trusted.h but is heap based</div><div class='del'>- * in order to keep the stack usage minimal.</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> enum tpm_buf_flags {</div><div class='add'>+	/* the capacity exceeded: */</div><div class='ctx'> 	TPM_BUF_OVERFLOW	= BIT(0),</div><div class='add'>+	/* TPM2B format: */</div><div class='add'>+	TPM_BUF_TPM2B		= BIT(1),</div><div class='add'>+	/* read out of boundary: */</div><div class='add'>+	TPM_BUF_BOUNDARY_ERROR	= BIT(2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * A string buffer type for constructing TPM commands.</div><div class='add'>+ */</div><div class='ctx'> struct tpm_buf {</div><div class='del'>-	unsigned int flags;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 length;</div><div class='ctx'> 	u8 *data;</div><div class='add'>+	u8 handles;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm2_object_attributes {</div><div class='ctx'> 	TPM2_OA_FIXED_TPM		= BIT(1),</div><div class='add'>+	TPM2_OA_ST_CLEAR		= BIT(2),</div><div class='ctx'> 	TPM2_OA_FIXED_PARENT		= BIT(4),</div><div class='add'>+	TPM2_OA_SENSITIVE_DATA_ORIGIN	= BIT(5),</div><div class='ctx'> 	TPM2_OA_USER_WITH_AUTH		= BIT(6),</div><div class='add'>+	TPM2_OA_ADMIN_WITH_POLICY	= BIT(7),</div><div class='add'>+	TPM2_OA_NO_DA			= BIT(10),</div><div class='add'>+	TPM2_OA_ENCRYPTED_DUPLICATION	= BIT(11),</div><div class='add'>+	TPM2_OA_RESTRICTED		= BIT(16),</div><div class='add'>+	TPM2_OA_DECRYPT			= BIT(17),</div><div class='add'>+	TPM2_OA_SIGN			= BIT(18),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum tpm2_session_attributes {</div><div class='ctx'> 	TPM2_SA_CONTINUE_SESSION	= BIT(0),</div><div class='add'>+	TPM2_SA_AUDIT_EXCLUSIVE		= BIT(1),</div><div class='add'>+	TPM2_SA_AUDIT_RESET		= BIT(3),</div><div class='add'>+	TPM2_SA_DECRYPT			= BIT(5),</div><div class='add'>+	TPM2_SA_ENCRYPT			= BIT(6),</div><div class='add'>+	TPM2_SA_AUDIT			= BIT(7),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tpm2_hash {</div><div class='hunk'>@@ -326,84 +415,20 @@ struct tpm2_hash {</div><div class='ctx'> 	unsigned int tpm_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void tpm_buf_reset(struct tpm_buf *buf, u16 tag, u32 ordinal)</div><div class='del'>-{</div><div class='del'>-	struct tpm_header *head = (struct tpm_header *)buf-&gt;data;</div><div class='del'>-</div><div class='del'>-	head-&gt;tag = cpu_to_be16(tag);</div><div class='del'>-	head-&gt;length = cpu_to_be32(sizeof(*head));</div><div class='del'>-	head-&gt;ordinal = cpu_to_be32(ordinal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int tpm_buf_init(struct tpm_buf *buf, u16 tag, u32 ordinal)</div><div class='del'>-{</div><div class='del'>-	buf-&gt;data = (u8 *)__get_free_page(GFP_KERNEL);</div><div class='del'>-	if (!buf-&gt;data)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	buf-&gt;flags = 0;</div><div class='del'>-	tpm_buf_reset(buf, tag, ordinal);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tpm_buf_destroy(struct tpm_buf *buf)</div><div class='del'>-{</div><div class='del'>-	free_page((unsigned long)buf-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 tpm_buf_length(struct tpm_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct tpm_header *head = (struct tpm_header *)buf-&gt;data;</div><div class='del'>-</div><div class='del'>-	return be32_to_cpu(head-&gt;length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 tpm_buf_tag(struct tpm_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct tpm_header *head = (struct tpm_header *)buf-&gt;data;</div><div class='del'>-</div><div class='del'>-	return be16_to_cpu(head-&gt;tag);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tpm_buf_append(struct tpm_buf *buf,</div><div class='del'>-				  const unsigned char *new_data,</div><div class='del'>-				  unsigned int new_len)</div><div class='del'>-{</div><div class='del'>-	struct tpm_header *head = (struct tpm_header *)buf-&gt;data;</div><div class='del'>-	u32 len = tpm_buf_length(buf);</div><div class='del'>-</div><div class='del'>-	/* Return silently if overflow has already happened. */</div><div class='del'>-	if (buf-&gt;flags &amp; TPM_BUF_OVERFLOW)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if ((len + new_len) &gt; PAGE_SIZE) {</div><div class='del'>-		WARN(1, "tpm_buf: overflow\n");</div><div class='del'>-		buf-&gt;flags |= TPM_BUF_OVERFLOW;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;buf-&gt;data[len], new_data, new_len);</div><div class='del'>-	head-&gt;length = cpu_to_be32(len + new_len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tpm_buf_append_u8(struct tpm_buf *buf, const u8 value)</div><div class='del'>-{</div><div class='del'>-	tpm_buf_append(buf, &amp;value, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tpm_buf_append_u16(struct tpm_buf *buf, const u16 value)</div><div class='del'>-{</div><div class='del'>-	__be16 value2 = cpu_to_be16(value);</div><div class='del'>-</div><div class='del'>-	tpm_buf_append(buf, (u8 *) &amp;value2, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void tpm_buf_append_u32(struct tpm_buf *buf, const u32 value)</div><div class='del'>-{</div><div class='del'>-	__be32 value2 = cpu_to_be32(value);</div><div class='del'>-</div><div class='del'>-	tpm_buf_append(buf, (u8 *) &amp;value2, 4);</div><div class='del'>-}</div><div class='add'>+int tpm_buf_init(struct tpm_buf *buf, u16 tag, u32 ordinal);</div><div class='add'>+void tpm_buf_reset(struct tpm_buf *buf, u16 tag, u32 ordinal);</div><div class='add'>+int tpm_buf_init_sized(struct tpm_buf *buf);</div><div class='add'>+void tpm_buf_reset_sized(struct tpm_buf *buf);</div><div class='add'>+void tpm_buf_destroy(struct tpm_buf *buf);</div><div class='add'>+u32 tpm_buf_length(struct tpm_buf *buf);</div><div class='add'>+void tpm_buf_append(struct tpm_buf *buf, const u8 *new_data, u16 new_length);</div><div class='add'>+void tpm_buf_append_u8(struct tpm_buf *buf, const u8 value);</div><div class='add'>+void tpm_buf_append_u16(struct tpm_buf *buf, const u16 value);</div><div class='add'>+void tpm_buf_append_u32(struct tpm_buf *buf, const u32 value);</div><div class='add'>+u8 tpm_buf_read_u8(struct tpm_buf *buf, off_t *offset);</div><div class='add'>+u16 tpm_buf_read_u16(struct tpm_buf *buf, off_t *offset);</div><div class='add'>+u32 tpm_buf_read_u32(struct tpm_buf *buf, off_t *offset);</div><div class='add'>+void tpm_buf_append_handle(struct tpm_chip *chip, struct tpm_buf *buf, u32 handle);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Check if TPM device is in the firmware upgrade mode.</div><div class='hunk'>@@ -415,7 +440,27 @@ static inline bool tpm_is_firmware_upgrade(struct tpm_chip *chip)</div><div class='ctx'> </div><div class='ctx'> static inline u32 tpm2_rc_value(u32 rc)</div><div class='ctx'> {</div><div class='del'>-	return (rc &amp; BIT(7)) ? rc &amp; 0xff : rc;</div><div class='add'>+	return (rc &amp; BIT(7)) ? rc &amp; 0xbf : rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a return value from tpm_transmit_cmd() to POSIX error code.</div><div class='add'>+ */</div><div class='add'>+static inline ssize_t tpm_ret_to_err(ssize_t ret)</div><div class='add'>+{</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	switch (tpm2_rc_value(ret)) {</div><div class='add'>+	case TPM2_RC_SUCCESS:</div><div class='add'>+		return 0;</div><div class='add'>+	case TPM2_RC_SESSION_MEMORY:</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	case TPM2_RC_HASH:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	default:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE)</div><div class='hunk'>@@ -429,10 +474,20 @@ extern int tpm_pcr_read(struct tpm_chip *chip, u32 pcr_idx,</div><div class='ctx'> 			struct tpm_digest *digest);</div><div class='ctx'> extern int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,</div><div class='ctx'> 			  struct tpm_digest *digests);</div><div class='del'>-extern int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen);</div><div class='ctx'> extern int tpm_get_random(struct tpm_chip *chip, u8 *data, size_t max);</div><div class='ctx'> extern struct tpm_chip *tpm_default_chip(void);</div><div class='ctx'> void tpm2_flush_context(struct tpm_chip *chip, u32 handle);</div><div class='add'>+int tpm2_find_hash_alg(unsigned int crypto_id);</div><div class='add'>+</div><div class='add'>+static inline void tpm_buf_append_empty_auth(struct tpm_buf *buf, u32 handle)</div><div class='add'>+{</div><div class='add'>+	/* simple authorization for empty auth */</div><div class='add'>+	tpm_buf_append_u32(buf, 9);		/* total length of auth */</div><div class='add'>+	tpm_buf_append_u32(buf, handle);</div><div class='add'>+	tpm_buf_append_u16(buf, 0);		/* nonce len */</div><div class='add'>+	tpm_buf_append_u8(buf, 0);		/* attributes */</div><div class='add'>+	tpm_buf_append_u16(buf, 0);		/* hmac len */</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline int tpm_is_tpm2(struct tpm_chip *chip)</div><div class='ctx'> {</div><div class='hunk'>@@ -450,10 +505,6 @@ static inline int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)</div><div class='del'>-{</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='ctx'> static inline int tpm_get_random(struct tpm_chip *chip, u8 *data, size_t max)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='hunk'>@@ -463,5 +514,59 @@ static inline struct tpm_chip *tpm_default_chip(void)</div><div class='ctx'> {</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline void tpm_buf_append_empty_auth(struct tpm_buf *buf, u32 handle)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+static inline struct tpm2_auth *tpm2_chip_auth(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TCG_TPM2_HMAC</div><div class='add'>+	return chip-&gt;auth;</div><div class='add'>+#else</div><div class='add'>+	return NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tpm_buf_append_name(struct tpm_chip *chip, struct tpm_buf *buf,</div><div class='add'>+			u32 handle, u8 *name);</div><div class='add'>+void tpm_buf_append_hmac_session(struct tpm_chip *chip, struct tpm_buf *buf,</div><div class='add'>+				 u8 attributes, u8 *passphrase,</div><div class='add'>+				 int passphraselen);</div><div class='add'>+void tpm_buf_append_auth(struct tpm_chip *chip, struct tpm_buf *buf,</div><div class='add'>+			 u8 *passphrase, int passphraselen);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TCG_TPM2_HMAC</div><div class='add'>+</div><div class='add'>+int tpm2_start_auth_session(struct tpm_chip *chip);</div><div class='add'>+int tpm_buf_fill_hmac_session(struct tpm_chip *chip, struct tpm_buf *buf);</div><div class='add'>+int tpm_buf_check_hmac_response(struct tpm_chip *chip, struct tpm_buf *buf,</div><div class='add'>+				int rc);</div><div class='add'>+void tpm2_end_auth_session(struct tpm_chip *chip);</div><div class='add'>+#else</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int tpm2_start_auth_session(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void tpm2_end_auth_session(struct tpm_chip *chip)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int tpm_buf_fill_hmac_session(struct tpm_chip *chip,</div><div class='add'>+					    struct tpm_buf *buf)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int tpm_buf_check_hmac_response(struct tpm_chip *chip,</div><div class='add'>+					      struct tpm_buf *buf,</div><div class='add'>+					      int rc)</div><div class='add'>+{</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_TCG_TPM2_HMAC */</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/tpm_eventlog.h b/include/linux/tpm_eventlog.h<br/>index 7d68a5cc5881..891368e82558 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tpm_eventlog.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tpm_eventlog.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tpm_eventlog.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tpm_eventlog.h</a></div><div class='hunk'>@@ -157,7 +157,7 @@ struct tcg_algorithm_info {</div><div class='ctx'>  * Return: size of the event on success, 0 on failure</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static __always_inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event,</div><div class='add'>+static __always_inline u32 __calc_tpm2_event_size(struct tcg_pcr_event2_head *event,</div><div class='ctx'> 					 struct tcg_pcr_event *event_header,</div><div class='ctx'> 					 bool do_mapping)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/tpm_svsm.h b/include/linux/tpm_svsm.h<br/>new file mode 100644<br/>index 000000000000..38e341f9761a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tpm_svsm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tpm_svsm.h</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 James.Bottomley@HansenPartnership.com</div><div class='add'>+ * Copyright (C) 2025 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * Helpers for the SVSM_VTPM_CMD calls used by the vTPM protocol defined by the</div><div class='add'>+ * AMD SVSM spec [1].</div><div class='add'>+ *</div><div class='add'>+ * The vTPM protocol follows the Official TPM 2.0 Reference Implementation</div><div class='add'>+ * (originally by Microsoft, now part of the TCG) simulator protocol.</div><div class='add'>+ *</div><div class='add'>+ * [1] "Secure VM Service Module for SEV-SNP Guests"</div><div class='add'>+ *     Publication # 58019 Revision: 1.00</div><div class='add'>+ */</div><div class='add'>+#ifndef _TPM_SVSM_H_</div><div class='add'>+#define _TPM_SVSM_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define SVSM_VTPM_MAX_BUFFER		4096 /* max req/resp buffer size */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct svsm_vtpm_request - Generic request for single word command</div><div class='add'>+ * @cmd:	The command to send</div><div class='add'>+ *</div><div class='add'>+ * Defined by AMD SVSM spec [1] in section "8.2 SVSM_VTPM_CMD Call" -</div><div class='add'>+ * Table 15: vTPM Common Request/Response Structure</div><div class='add'>+ *     Byte      Size       In/Out    Description</div><div class='add'>+ *     Offset    (Bytes)</div><div class='add'>+ *     0x000     4          In        Platform command</div><div class='add'>+ *                          Out       Platform command response size</div><div class='add'>+ */</div><div class='add'>+struct svsm_vtpm_request {</div><div class='add'>+	u32 cmd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct svsm_vtpm_response - Generic response</div><div class='add'>+ * @size:	The response size (zero if nothing follows)</div><div class='add'>+ *</div><div class='add'>+ * Defined by AMD SVSM spec [1] in section "8.2 SVSM_VTPM_CMD Call" -</div><div class='add'>+ * Table 15: vTPM Common Request/Response Structure</div><div class='add'>+ *     Byte      Size       In/Out    Description</div><div class='add'>+ *     Offset    (Bytes)</div><div class='add'>+ *     0x000     4          In        Platform command</div><div class='add'>+ *                          Out       Platform command response size</div><div class='add'>+ *</div><div class='add'>+ * Note: most TCG Simulator commands simply return zero here with no indication</div><div class='add'>+ * of success or failure.</div><div class='add'>+ */</div><div class='add'>+struct svsm_vtpm_response {</div><div class='add'>+	u32 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct svsm_vtpm_cmd_request - Structure for a TPM_SEND_COMMAND request</div><div class='add'>+ * @cmd:	The command to send (must be TPM_SEND_COMMAND)</div><div class='add'>+ * @locality:	The locality</div><div class='add'>+ * @buf_size:	The size of the input buffer following</div><div class='add'>+ * @buf:	A buffer of size buf_size</div><div class='add'>+ *</div><div class='add'>+ * Defined by AMD SVSM spec [1] in section "8.2 SVSM_VTPM_CMD Call" -</div><div class='add'>+ * Table 16: TPM_SEND_COMMAND Request Structure</div><div class='add'>+ *     Byte      Size       Meaning</div><div class='add'>+ *     Offset    (Bytes)</div><div class='add'>+ *     0x000     4          Platform command (8)</div><div class='add'>+ *     0x004     1          Locality (must-be-0)</div><div class='add'>+ *     0x005     4          TPM Command size (in bytes)</div><div class='add'>+ *     0x009     Variable   TPM Command</div><div class='add'>+ *</div><div class='add'>+ * Note: the TCG Simulator expects @buf_size to be equal to the size of the</div><div class='add'>+ * specific TPM command, otherwise an TPM_RC_COMMAND_SIZE error is returned.</div><div class='add'>+ */</div><div class='add'>+struct svsm_vtpm_cmd_request {</div><div class='add'>+	u32 cmd;</div><div class='add'>+	u8 locality;</div><div class='add'>+	u32 buf_size;</div><div class='add'>+	u8 buf[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct svsm_vtpm_cmd_response - Structure for a TPM_SEND_COMMAND response</div><div class='add'>+ * @buf_size:	The size of the output buffer following</div><div class='add'>+ * @buf:	A buffer of size buf_size</div><div class='add'>+ *</div><div class='add'>+ * Defined by AMD SVSM spec [1] in section "8.2 SVSM_VTPM_CMD Call" -</div><div class='add'>+ * Table 17: TPM_SEND_COMMAND Response Structure</div><div class='add'>+ *     Byte      Size       Meaning</div><div class='add'>+ *     Offset    (Bytes)</div><div class='add'>+ *     0x000     4          Response size (in bytes)</div><div class='add'>+ *     0x004     Variable   Response</div><div class='add'>+ */</div><div class='add'>+struct svsm_vtpm_cmd_response {</div><div class='add'>+	u32 buf_size;</div><div class='add'>+	u8 buf[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * svsm_vtpm_cmd_request_fill() - Fill a TPM_SEND_COMMAND request to be sent to SVSM</div><div class='add'>+ * @req: The struct svsm_vtpm_cmd_request to fill</div><div class='add'>+ * @locality: The locality</div><div class='add'>+ * @buf: The buffer from where to copy the payload of the command</div><div class='add'>+ * @len: The size of the buffer</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+svsm_vtpm_cmd_request_fill(struct svsm_vtpm_cmd_request *req, u8 locality,</div><div class='add'>+			   const u8 *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	if (len &gt; SVSM_VTPM_MAX_BUFFER - sizeof(*req))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	req-&gt;cmd = 8; /* TPM_SEND_COMMAND */</div><div class='add'>+	req-&gt;locality = locality;</div><div class='add'>+	req-&gt;buf_size = len;</div><div class='add'>+</div><div class='add'>+	memcpy(req-&gt;buf, buf, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * svsm_vtpm_cmd_response_parse() - Parse a TPM_SEND_COMMAND response received from SVSM</div><div class='add'>+ * @resp: The struct svsm_vtpm_cmd_response to parse</div><div class='add'>+ * @buf: The buffer where to copy the response</div><div class='add'>+ * @len: The size of the buffer</div><div class='add'>+ *</div><div class='add'>+ * Return: buffer size filled with the response on success, negative error</div><div class='add'>+ * code on failure.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+svsm_vtpm_cmd_response_parse(const struct svsm_vtpm_cmd_response *resp, u8 *buf,</div><div class='add'>+			     size_t len)</div><div class='add'>+{</div><div class='add'>+	if (len &lt; resp-&gt;buf_size)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;buf_size &gt; SVSM_VTPM_MAX_BUFFER - sizeof(*resp))</div><div class='add'>+		return -EINVAL;  // Invalid response from the platform TPM</div><div class='add'>+</div><div class='add'>+	memcpy(buf, resp-&gt;buf, resp-&gt;buf_size);</div><div class='add'>+</div><div class='add'>+	return resp-&gt;buf_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _TPM_SVSM_H_ */</div><div class='head'>diff --git a/include/linux/trace.h b/include/linux/trace.h<br/>index fdcd76b7be83..7eaad857dee0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/trace.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/trace.h</a></div><div class='hunk'>@@ -72,8 +72,8 @@ static inline int unregister_ftrace_export(struct trace_export *export)</div><div class='ctx'> static inline void trace_printk_init_buffers(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline int trace_array_printk(struct trace_array *tr, unsigned long ip,</div><div class='del'>-				     const char *fmt, ...)</div><div class='add'>+static inline __printf(3, 4)</div><div class='add'>+int trace_array_printk(struct trace_array *tr, unsigned long ip, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h<br/>index d68ff9b1247f..3690221ba3d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/trace_events.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/trace_events.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/trace_events.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/trace_events.h</a></div><div class='hunk'>@@ -17,6 +17,9 @@ struct dentry;</div><div class='ctx'> struct bpf_prog;</div><div class='ctx'> union bpf_attr;</div><div class='ctx'> </div><div class='add'>+/* Used for event string fields when they are NULL */</div><div class='add'>+#define EVENT_NULL_STR		"(null)"</div><div class='add'>+</div><div class='ctx'> const char *trace_print_flags_seq(struct trace_seq *p, const char *delim,</div><div class='ctx'> 				  unsigned long flags,</div><div class='ctx'> 				  const struct trace_print_flags *flag_array);</div><div class='hunk'>@@ -103,13 +106,16 @@ struct trace_iterator {</div><div class='ctx'> 	unsigned int		temp_size;</div><div class='ctx'> 	char			*fmt;	/* modified format holder */</div><div class='ctx'> 	unsigned int		fmt_size;</div><div class='del'>-	long			wait_index;</div><div class='add'>+	atomic_t		wait_index;</div><div class='ctx'> </div><div class='ctx'> 	/* trace_seq for __print_flags() and __print_symbolic() etc. */</div><div class='ctx'> 	struct trace_seq	tmp_seq;</div><div class='ctx'> </div><div class='ctx'> 	cpumask_var_t		started;</div><div class='ctx'> </div><div class='add'>+	/* Set when the file is closed to prevent new waiters */</div><div class='add'>+	bool			closed;</div><div class='add'>+</div><div class='ctx'> 	/* it's true when current open file is snapshot */</div><div class='ctx'> 	bool			snapshot;</div><div class='ctx'> </div><div class='hunk'>@@ -132,6 +138,7 @@ enum trace_iter_flags {</div><div class='ctx'> 	TRACE_FILE_LAT_FMT	= 1,</div><div class='ctx'> 	TRACE_FILE_ANNOTATE	= 2,</div><div class='ctx'> 	TRACE_FILE_TIME_IN_NS	= 4,</div><div class='add'>+	TRACE_FILE_PAUSE	= 8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -178,7 +185,7 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status);</div><div class='ctx'> </div><div class='ctx'> enum trace_flag_type {</div><div class='ctx'> 	TRACE_FLAG_IRQS_OFF		= 0x01,</div><div class='del'>-	TRACE_FLAG_IRQS_NOSUPPORT	= 0x02,</div><div class='add'>+	TRACE_FLAG_NEED_RESCHED_LAZY	= 0x02,</div><div class='ctx'> 	TRACE_FLAG_NEED_RESCHED		= 0x04,</div><div class='ctx'> 	TRACE_FLAG_HARDIRQ		= 0x08,</div><div class='ctx'> 	TRACE_FLAG_SOFTIRQ		= 0x10,</div><div class='hunk'>@@ -187,7 +194,6 @@ enum trace_flag_type {</div><div class='ctx'> 	TRACE_FLAG_BH_OFF		= 0x80,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT</div><div class='ctx'> static inline unsigned int tracing_gen_ctx_flags(unsigned long irqflags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq_status = irqs_disabled_flags(irqflags) ?</div><div class='hunk'>@@ -201,17 +207,6 @@ static inline unsigned int tracing_gen_ctx(void)</div><div class='ctx'> 	local_save_flags(irqflags);</div><div class='ctx'> 	return tracing_gen_ctx_flags(irqflags);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline unsigned int tracing_gen_ctx_flags(unsigned long irqflags)</div><div class='del'>-{</div><div class='del'>-	return tracing_gen_ctx_irq_test(TRACE_FLAG_IRQS_NOSUPPORT);</div><div class='del'>-}</div><div class='del'>-static inline unsigned int tracing_gen_ctx(void)</div><div class='del'>-{</div><div class='del'>-	return tracing_gen_ctx_irq_test(TRACE_FLAG_IRQS_NOSUPPORT);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int tracing_gen_ctx_dec(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -279,7 +274,8 @@ struct trace_event_fields {</div><div class='ctx'> 			const char *name;</div><div class='ctx'> 			const int  size;</div><div class='ctx'> 			const int  align;</div><div class='del'>-			const int  is_signed;</div><div class='add'>+			const unsigned int is_signed:1;</div><div class='add'>+			unsigned int needs_test:1;</div><div class='ctx'> 			const int  filter_type;</div><div class='ctx'> 			const int  len;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -320,7 +316,6 @@ void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer,</div><div class='ctx'> void trace_event_buffer_commit(struct trace_event_buffer *fbuffer);</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	TRACE_EVENT_FL_FILTERED_BIT,</div><div class='ctx'> 	TRACE_EVENT_FL_CAP_ANY_BIT,</div><div class='ctx'> 	TRACE_EVENT_FL_NO_SET_FILTER_BIT,</div><div class='ctx'> 	TRACE_EVENT_FL_IGNORE_ENABLE_BIT,</div><div class='hunk'>@@ -331,11 +326,11 @@ enum {</div><div class='ctx'> 	TRACE_EVENT_FL_EPROBE_BIT,</div><div class='ctx'> 	TRACE_EVENT_FL_FPROBE_BIT,</div><div class='ctx'> 	TRACE_EVENT_FL_CUSTOM_BIT,</div><div class='add'>+	TRACE_EVENT_FL_TEST_STR_BIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Event flags:</div><div class='del'>- *  FILTERED	  - The event has a filter attached</div><div class='ctx'>  *  CAP_ANY	  - Any user can enable for perf</div><div class='ctx'>  *  NO_SET_FILTER - Set when filter has error and is to be ignored</div><div class='ctx'>  *  IGNORE_ENABLE - For trace internal events, do not enable with debugfs file</div><div class='hunk'>@@ -348,9 +343,9 @@ enum {</div><div class='ctx'>  *  CUSTOM        - Event is a custom event (to be attached to an exsiting tracepoint)</div><div class='ctx'>  *                   This is set when the custom event has not been attached</div><div class='ctx'>  *                   to a tracepoint yet, then it is cleared when it is.</div><div class='add'>+ *  TEST_STR      - The event has a "%s" that points to a string outside the event</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='del'>-	TRACE_EVENT_FL_FILTERED		= (1 &lt;&lt; TRACE_EVENT_FL_FILTERED_BIT),</div><div class='ctx'> 	TRACE_EVENT_FL_CAP_ANY		= (1 &lt;&lt; TRACE_EVENT_FL_CAP_ANY_BIT),</div><div class='ctx'> 	TRACE_EVENT_FL_NO_SET_FILTER	= (1 &lt;&lt; TRACE_EVENT_FL_NO_SET_FILTER_BIT),</div><div class='ctx'> 	TRACE_EVENT_FL_IGNORE_ENABLE	= (1 &lt;&lt; TRACE_EVENT_FL_IGNORE_ENABLE_BIT),</div><div class='hunk'>@@ -361,6 +356,7 @@ enum {</div><div class='ctx'> 	TRACE_EVENT_FL_EPROBE		= (1 &lt;&lt; TRACE_EVENT_FL_EPROBE_BIT),</div><div class='ctx'> 	TRACE_EVENT_FL_FPROBE		= (1 &lt;&lt; TRACE_EVENT_FL_FPROBE_BIT),</div><div class='ctx'> 	TRACE_EVENT_FL_CUSTOM		= (1 &lt;&lt; TRACE_EVENT_FL_CUSTOM_BIT),</div><div class='add'>+	TRACE_EVENT_FL_TEST_STR		= (1 &lt;&lt; TRACE_EVENT_FL_TEST_STR_BIT),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TRACE_EVENT_FL_UKPROBE (TRACE_EVENT_FL_KPROBE | TRACE_EVENT_FL_UPROBE)</div><div class='hunk'>@@ -369,13 +365,12 @@ struct trace_event_call {</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> 	struct trace_event_class *class;</div><div class='ctx'> 	union {</div><div class='del'>-		char			*name;</div><div class='add'>+		const char		*name;</div><div class='ctx'> 		/* Set TRACE_EVENT_FL_TRACEPOINT flag when using "tp" */</div><div class='ctx'> 		struct tracepoint	*tp;</div><div class='ctx'> 	};</div><div class='ctx'> 	struct trace_event	event;</div><div class='ctx'> 	char			*print_fmt;</div><div class='del'>-	struct event_filter	*filter;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Static events can disappear with modules,</div><div class='ctx'> 	 * where as dynamic ones need their own ref count.</div><div class='hunk'>@@ -486,7 +481,6 @@ enum {</div><div class='ctx'> 	EVENT_FILE_FL_RECORDED_TGID_BIT,</div><div class='ctx'> 	EVENT_FILE_FL_FILTERED_BIT,</div><div class='ctx'> 	EVENT_FILE_FL_NO_SET_FILTER_BIT,</div><div class='del'>-	EVENT_FILE_FL_SOFT_MODE_BIT,</div><div class='ctx'> 	EVENT_FILE_FL_SOFT_DISABLED_BIT,</div><div class='ctx'> 	EVENT_FILE_FL_TRIGGER_MODE_BIT,</div><div class='ctx'> 	EVENT_FILE_FL_TRIGGER_COND_BIT,</div><div class='hunk'>@@ -624,7 +618,6 @@ extern int __kprobe_event_add_fields(struct dynevent_cmd *cmd, ...);</div><div class='ctx'>  *  RECORDED_TGID - The tgids should be recorded at sched_switch</div><div class='ctx'>  *  FILTERED	  - The event has a filter attached</div><div class='ctx'>  *  NO_SET_FILTER - Set when filter has error and is to be ignored</div><div class='del'>- *  SOFT_MODE     - The event is enabled/disabled by SOFT_DISABLED</div><div class='ctx'>  *  SOFT_DISABLED - When set, do not trace the event (even though its</div><div class='ctx'>  *                   tracepoint may be enabled)</div><div class='ctx'>  *  TRIGGER_MODE  - When set, invoke the triggers associated with the event</div><div class='hunk'>@@ -639,7 +632,6 @@ enum {</div><div class='ctx'> 	EVENT_FILE_FL_RECORDED_TGID	= (1 &lt;&lt; EVENT_FILE_FL_RECORDED_TGID_BIT),</div><div class='ctx'> 	EVENT_FILE_FL_FILTERED		= (1 &lt;&lt; EVENT_FILE_FL_FILTERED_BIT),</div><div class='ctx'> 	EVENT_FILE_FL_NO_SET_FILTER	= (1 &lt;&lt; EVENT_FILE_FL_NO_SET_FILTER_BIT),</div><div class='del'>-	EVENT_FILE_FL_SOFT_MODE		= (1 &lt;&lt; EVENT_FILE_FL_SOFT_MODE_BIT),</div><div class='ctx'> 	EVENT_FILE_FL_SOFT_DISABLED	= (1 &lt;&lt; EVENT_FILE_FL_SOFT_DISABLED_BIT),</div><div class='ctx'> 	EVENT_FILE_FL_TRIGGER_MODE	= (1 &lt;&lt; EVENT_FILE_FL_TRIGGER_MODE_BIT),</div><div class='ctx'> 	EVENT_FILE_FL_TRIGGER_COND	= (1 &lt;&lt; EVENT_FILE_FL_TRIGGER_COND_BIT),</div><div class='hunk'>@@ -674,11 +666,25 @@ struct trace_event_file {</div><div class='ctx'> 	 * caching and such. Which is mostly OK ;-)</div><div class='ctx'> 	 */</div><div class='ctx'> 	unsigned long		flags;</div><div class='del'>-	atomic_t		ref;	/* ref count for opened files */</div><div class='add'>+	refcount_t		ref;	/* ref count for opened files */</div><div class='ctx'> 	atomic_t		sm_ref;	/* soft-mode reference counter */</div><div class='ctx'> 	atomic_t		tm_ref;	/* trigger-mode reference counter */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HIST_TRIGGERS</div><div class='add'>+extern struct irq_work hist_poll_work;</div><div class='add'>+extern wait_queue_head_t hist_poll_wq;</div><div class='add'>+</div><div class='add'>+static inline void hist_poll_wakeup(void)</div><div class='add'>+{</div><div class='add'>+	if (wq_has_sleeper(&amp;hist_poll_wq))</div><div class='add'>+		irq_work_queue(&amp;hist_poll_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define hist_poll_wait(file, wait)	\</div><div class='add'>+	poll_wait(file, &amp;hist_poll_wq, wait)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define __TRACE_EVENT_FLAGS(name, value)				\</div><div class='ctx'> 	static int __init trace_init_flags_##name(void)			\</div><div class='ctx'> 	{								\</div><div class='hunk'>@@ -759,8 +765,11 @@ unsigned int trace_call_bpf(struct trace_event_call *call, void *ctx);</div><div class='ctx'> int perf_event_attach_bpf_prog(struct perf_event *event, struct bpf_prog *prog, u64 bpf_cookie);</div><div class='ctx'> void perf_event_detach_bpf_prog(struct perf_event *event);</div><div class='ctx'> int perf_event_query_prog_array(struct perf_event *event, void __user *info);</div><div class='del'>-int bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_prog *prog);</div><div class='del'>-int bpf_probe_unregister(struct bpf_raw_event_map *btp, struct bpf_prog *prog);</div><div class='add'>+</div><div class='add'>+struct bpf_raw_tp_link;</div><div class='add'>+int bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_raw_tp_link *link);</div><div class='add'>+int bpf_probe_unregister(struct bpf_raw_event_map *btp, struct bpf_raw_tp_link *link);</div><div class='add'>+</div><div class='ctx'> struct bpf_raw_event_map *bpf_get_raw_tracepoint(const char *name);</div><div class='ctx'> void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp);</div><div class='ctx'> int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id,</div><div class='hunk'>@@ -788,11 +797,12 @@ perf_event_query_prog_array(struct perf_event *event, void __user *info)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-static inline int bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_prog *p)</div><div class='add'>+struct bpf_raw_tp_link;</div><div class='add'>+static inline int bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_raw_tp_link *link)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-static inline int bpf_probe_unregister(struct bpf_raw_event_map *btp, struct bpf_prog *p)</div><div class='add'>+static inline int bpf_probe_unregister(struct bpf_raw_event_map *btp, struct bpf_raw_tp_link *link)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -847,30 +857,11 @@ int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set);</div><div class='ctx'> int trace_set_clr_event(const char *system, const char *event, int set);</div><div class='ctx'> int trace_array_set_clr_event(struct trace_array *tr, const char *system,</div><div class='ctx'> 		const char *event, bool enable);</div><div class='del'>-/*</div><div class='del'>- * The double __builtin_constant_p is because gcc will give us an error</div><div class='del'>- * if we try to allocate the static variable to fmt if it is not a</div><div class='del'>- * constant. Even with the outer if statement optimizing out.</div><div class='del'>- */</div><div class='del'>-#define event_trace_printk(ip, fmt, args...)				\</div><div class='del'>-do {									\</div><div class='del'>-	__trace_printk_check_format(fmt, ##args);			\</div><div class='del'>-	tracing_record_cmdline(current);				\</div><div class='del'>-	if (__builtin_constant_p(fmt)) {				\</div><div class='del'>-		static const char *trace_printk_fmt			\</div><div class='del'>-		  __section("__trace_printk_fmt") =			\</div><div class='del'>-			__builtin_constant_p(fmt) ? fmt : NULL;		\</div><div class='del'>-									\</div><div class='del'>-		__trace_bprintk(ip, trace_printk_fmt, ##args);		\</div><div class='del'>-	} else								\</div><div class='del'>-		__trace_printk(ip, fmt, ##args);			\</div><div class='del'>-} while (0)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PERF_EVENTS</div><div class='ctx'> struct perf_event;</div><div class='ctx'> </div><div class='ctx'> DECLARE_PER_CPU(struct pt_regs, perf_trace_regs);</div><div class='del'>-DECLARE_PER_CPU(int, bpf_kprobe_override);</div><div class='ctx'> </div><div class='ctx'> extern int  perf_trace_init(struct perf_event *event);</div><div class='ctx'> extern void perf_trace_destroy(struct perf_event *event);</div><div class='hunk'>@@ -903,31 +894,31 @@ void *perf_trace_buf_alloc(int size, struct pt_regs **regs, int *rctxp);</div><div class='ctx'> int perf_event_set_bpf_prog(struct perf_event *event, struct bpf_prog *prog, u64 bpf_cookie);</div><div class='ctx'> void perf_event_free_bpf_prog(struct perf_event *event);</div><div class='ctx'> </div><div class='del'>-void bpf_trace_run1(struct bpf_prog *prog, u64 arg1);</div><div class='del'>-void bpf_trace_run2(struct bpf_prog *prog, u64 arg1, u64 arg2);</div><div class='del'>-void bpf_trace_run3(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run1(struct bpf_raw_tp_link *link, u64 arg1);</div><div class='add'>+void bpf_trace_run2(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2);</div><div class='add'>+void bpf_trace_run3(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		    u64 arg3);</div><div class='del'>-void bpf_trace_run4(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run4(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		    u64 arg3, u64 arg4);</div><div class='del'>-void bpf_trace_run5(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run5(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		    u64 arg3, u64 arg4, u64 arg5);</div><div class='del'>-void bpf_trace_run6(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run6(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		    u64 arg3, u64 arg4, u64 arg5, u64 arg6);</div><div class='del'>-void bpf_trace_run7(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run7(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		    u64 arg3, u64 arg4, u64 arg5, u64 arg6, u64 arg7);</div><div class='del'>-void bpf_trace_run8(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run8(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		    u64 arg3, u64 arg4, u64 arg5, u64 arg6, u64 arg7,</div><div class='ctx'> 		    u64 arg8);</div><div class='del'>-void bpf_trace_run9(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run9(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		    u64 arg3, u64 arg4, u64 arg5, u64 arg6, u64 arg7,</div><div class='ctx'> 		    u64 arg8, u64 arg9);</div><div class='del'>-void bpf_trace_run10(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run10(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		     u64 arg3, u64 arg4, u64 arg5, u64 arg6, u64 arg7,</div><div class='ctx'> 		     u64 arg8, u64 arg9, u64 arg10);</div><div class='del'>-void bpf_trace_run11(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run11(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		     u64 arg3, u64 arg4, u64 arg5, u64 arg6, u64 arg7,</div><div class='ctx'> 		     u64 arg8, u64 arg9, u64 arg10, u64 arg11);</div><div class='del'>-void bpf_trace_run12(struct bpf_prog *prog, u64 arg1, u64 arg2,</div><div class='add'>+void bpf_trace_run12(struct bpf_raw_tp_link *link, u64 arg1, u64 arg2,</div><div class='ctx'> 		     u64 arg3, u64 arg4, u64 arg5, u64 arg6, u64 arg7,</div><div class='ctx'> 		     u64 arg8, u64 arg9, u64 arg10, u64 arg11, u64 arg12);</div><div class='ctx'> void perf_trace_run_bpf_submit(void *raw_data, int size, int rctx,</div><div class='head'>diff --git a/include/linux/trace_recursion.h b/include/linux/trace_recursion.h<br/>index d48cd92d2364..ae04054a1be3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/trace_recursion.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/trace_recursion.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/trace_recursion.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/trace_recursion.h</a></div><div class='hunk'>@@ -44,35 +44,6 @@ enum {</div><div class='ctx'>  */</div><div class='ctx'> 	TRACE_IRQ_BIT,</div><div class='ctx'> </div><div class='del'>-	/* Set if the function is in the set_graph_function file */</div><div class='del'>-	TRACE_GRAPH_BIT,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In the very unlikely case that an interrupt came in</div><div class='del'>-	 * at a start of graph tracing, and we want to trace</div><div class='del'>-	 * the function in that interrupt, the depth can be greater</div><div class='del'>-	 * than zero, because of the preempted start of a previous</div><div class='del'>-	 * trace. In an even more unlikely case, depth could be 2</div><div class='del'>-	 * if a softirq interrupted the start of graph tracing,</div><div class='del'>-	 * followed by an interrupt preempting a start of graph</div><div class='del'>-	 * tracing in the softirq, and depth can even be 3</div><div class='del'>-	 * if an NMI came in at the start of an interrupt function</div><div class='del'>-	 * that preempted a softirq start of a function that</div><div class='del'>-	 * preempted normal context!!!! Luckily, it can't be</div><div class='del'>-	 * greater than 3, so the next two bits are a mask</div><div class='del'>-	 * of what the depth is when we set TRACE_GRAPH_BIT</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	TRACE_GRAPH_DEPTH_START_BIT,</div><div class='del'>-	TRACE_GRAPH_DEPTH_END_BIT,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To implement set_graph_notrace, if this bit is set, we ignore</div><div class='del'>-	 * function graph tracing of called functions, until the return</div><div class='del'>-	 * function is called to clear it.</div><div class='del'>-	 */</div><div class='del'>-	TRACE_GRAPH_NOTRACE_BIT,</div><div class='del'>-</div><div class='ctx'> 	/* Used to prevent recursion recording from recursing. */</div><div class='ctx'> 	TRACE_RECORD_RECURSION_BIT,</div><div class='ctx'> };</div><div class='hunk'>@@ -81,16 +52,6 @@ enum {</div><div class='ctx'> #define trace_recursion_clear(bit)	do { (current)-&gt;trace_recursion &amp;= ~(1&lt;&lt;(bit)); } while (0)</div><div class='ctx'> #define trace_recursion_test(bit)	((current)-&gt;trace_recursion &amp; (1&lt;&lt;(bit)))</div><div class='ctx'> </div><div class='del'>-#define trace_recursion_depth() \</div><div class='del'>-	(((current)-&gt;trace_recursion &gt;&gt; TRACE_GRAPH_DEPTH_START_BIT) &amp; 3)</div><div class='del'>-#define trace_recursion_set_depth(depth) \</div><div class='del'>-	do {								\</div><div class='del'>-		current-&gt;trace_recursion &amp;=				\</div><div class='del'>-			~(3 &lt;&lt; TRACE_GRAPH_DEPTH_START_BIT);		\</div><div class='del'>-		current-&gt;trace_recursion |=				\</div><div class='del'>-			((depth) &amp; 3) &lt;&lt; TRACE_GRAPH_DEPTH_START_BIT;	\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='ctx'> #define TRACE_CONTEXT_BITS	4</div><div class='ctx'> </div><div class='ctx'> #define TRACE_FTRACE_START	TRACE_FTRACE_BIT</div><div class='hunk'>@@ -135,7 +96,7 @@ extern void ftrace_record_recursion(unsigned long ip, unsigned long parent_ip);</div><div class='ctx'> # define do_ftrace_record_recursion(ip, pip)	do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_WANTS_NO_INSTR</div><div class='add'>+#ifdef CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING</div><div class='ctx'> # define trace_warn_on_no_rcu(ip)					\</div><div class='ctx'> 	({								\</div><div class='ctx'> 		bool __ret = !rcu_is_watching();			\</div><div class='head'>diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h<br/>index 1ef95c0287f0..4a0b8c172d27 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/trace_seq.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/trace_seq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/trace_seq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/trace_seq.h</a></div><div class='hunk'>@@ -21,10 +21,10 @@</div><div class='ctx'> 	(sizeof(struct seq_buf) + sizeof(size_t) + sizeof(int)))</div><div class='ctx'> </div><div class='ctx'> struct trace_seq {</div><div class='del'>-	char			buffer[TRACE_SEQ_BUFFER_SIZE];</div><div class='ctx'> 	struct seq_buf		seq;</div><div class='ctx'> 	size_t			readpos;</div><div class='ctx'> 	int			full;</div><div class='add'>+	char                    buffer[TRACE_SEQ_BUFFER_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='hunk'>@@ -80,6 +80,19 @@ static inline bool trace_seq_has_overflowed(struct trace_seq *s)</div><div class='ctx'> 	return s-&gt;full || seq_buf_has_overflowed(&amp;s-&gt;seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * trace_seq_pop - pop off the last written character</div><div class='add'>+ * @s: trace sequence descriptor</div><div class='add'>+ *</div><div class='add'>+ * Removes the last written character to the trace_seq @s.</div><div class='add'>+ *</div><div class='add'>+ * Returns the last character or -1 if it is empty.</div><div class='add'>+ */</div><div class='add'>+static inline int trace_seq_pop(struct trace_seq *s)</div><div class='add'>+{</div><div class='add'>+	return seq_buf_pop(&amp;s-&gt;seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Currently only defined when tracing is enabled.</div><div class='ctx'>  */</div><div class='hunk'>@@ -88,8 +101,8 @@ extern __printf(2, 3)</div><div class='ctx'> void trace_seq_printf(struct trace_seq *s, const char *fmt, ...);</div><div class='ctx'> extern __printf(2, 0)</div><div class='ctx'> void trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args);</div><div class='del'>-extern void</div><div class='del'>-trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary);</div><div class='add'>+extern __printf(2, 0)</div><div class='add'>+void trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary);</div><div class='ctx'> extern int trace_print_seq(struct seq_file *m, struct trace_seq *s);</div><div class='ctx'> extern int trace_seq_to_user(struct trace_seq *s, char __user *ubuf,</div><div class='ctx'> 			     int cnt);</div><div class='hunk'>@@ -113,8 +126,8 @@ static inline __printf(2, 3)</div><div class='ctx'> void trace_seq_printf(struct trace_seq *s, const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline void</div><div class='del'>-trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary)</div><div class='add'>+static inline __printf(2, 0)</div><div class='add'>+void trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/tracefs.h b/include/linux/tracefs.h<br/>index 7a5fe17b6bf9..d03f74658716 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tracefs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tracefs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tracefs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tracefs.h</a></div><div class='hunk'>@@ -62,6 +62,8 @@ struct eventfs_file;</div><div class='ctx'> typedef int (*eventfs_callback)(const char *name, umode_t *mode, void **data,</div><div class='ctx'> 				const struct file_operations **fops);</div><div class='ctx'> </div><div class='add'>+typedef void (*eventfs_release)(const char *name, void *data);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct eventfs_entry - dynamically created eventfs file call back handler</div><div class='ctx'>  * @name:	Then name of the dynamic file in an eventfs directory</div><div class='hunk'>@@ -72,6 +74,7 @@ typedef int (*eventfs_callback)(const char *name, umode_t *mode, void **data,</div><div class='ctx'> struct eventfs_entry {</div><div class='ctx'> 	const char			*name;</div><div class='ctx'> 	eventfs_callback		callback;</div><div class='add'>+	eventfs_release			release;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct eventfs_inode;</div><div class='head'>diff --git a/include/linux/tracepoint-defs.h b/include/linux/tracepoint-defs.h<br/>index 4dc4955f0fbf..aebf0571c736 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tracepoint-defs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tracepoint-defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tracepoint-defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tracepoint-defs.h</a></div><div class='hunk'>@@ -29,16 +29,22 @@ struct tracepoint_func {</div><div class='ctx'> 	int prio;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct tracepoint_ext {</div><div class='add'>+	int (*regfunc)(void);</div><div class='add'>+	void (*unregfunc)(void);</div><div class='add'>+	/* Flags. */</div><div class='add'>+	unsigned int faultable:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct tracepoint {</div><div class='ctx'> 	const char *name;		/* Tracepoint name */</div><div class='del'>-	struct static_key key;</div><div class='add'>+	struct static_key_false key;</div><div class='ctx'> 	struct static_call_key *static_call_key;</div><div class='ctx'> 	void *static_call_tramp;</div><div class='ctx'> 	void *iterator;</div><div class='ctx'> 	void *probestub;</div><div class='del'>-	int (*regfunc)(void);</div><div class='del'>-	void (*unregfunc)(void);</div><div class='ctx'> 	struct tracepoint_func __rcu *funcs;</div><div class='add'>+	struct tracepoint_ext *ext;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS</div><div class='hunk'>@@ -83,7 +89,7 @@ struct bpf_raw_event_map {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TRACEPOINTS</div><div class='ctx'> # define tracepoint_enabled(tp) \</div><div class='del'>-	static_key_false(&amp;(__tracepoint_##tp).key)</div><div class='add'>+	static_branch_unlikely(&amp;(__tracepoint_##tp).key)</div><div class='ctx'> #else</div><div class='ctx'> # define tracepoint_enabled(tracepoint) false</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h<br/>index 88c0ba623ee6..8a56f3278b1b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tracepoint.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tracepoint.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tracepoint.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tracepoint.h</a></div><div class='hunk'>@@ -16,8 +16,8 @@</div><div class='ctx'> #include &lt;linux/srcu.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate_trace.h&gt;</div><div class='ctx'> #include &lt;linux/tracepoint-defs.h&gt;</div><div class='ctx'> #include &lt;linux/static_call.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -33,8 +33,6 @@ struct trace_eval_map {</div><div class='ctx'> </div><div class='ctx'> #define TRACEPOINT_DEFAULT_PRIO	10</div><div class='ctx'> </div><div class='del'>-extern struct srcu_struct tracepoint_srcu;</div><div class='del'>-</div><div class='ctx'> extern int</div><div class='ctx'> tracepoint_probe_register(struct tracepoint *tp, void *probe, void *data);</div><div class='ctx'> extern int</div><div class='hunk'>@@ -65,6 +63,13 @@ struct tp_module {</div><div class='ctx'> bool trace_module_has_bad_taint(struct module *mod);</div><div class='ctx'> extern int register_tracepoint_module_notifier(struct notifier_block *nb);</div><div class='ctx'> extern int unregister_tracepoint_module_notifier(struct notifier_block *nb);</div><div class='add'>+void for_each_module_tracepoint(void (*fct)(struct tracepoint *,</div><div class='add'>+					struct module *, void *),</div><div class='add'>+				void *priv);</div><div class='add'>+void for_each_tracepoint_in_module(struct module *,</div><div class='add'>+				   void (*fct)(struct tracepoint *,</div><div class='add'>+					struct module *, void *),</div><div class='add'>+				   void *priv);</div><div class='ctx'> #else</div><div class='ctx'> static inline bool trace_module_has_bad_taint(struct module *mod)</div><div class='ctx'> {</div><div class='hunk'>@@ -80,22 +85,49 @@ int unregister_tracepoint_module_notifier(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline</div><div class='add'>+void for_each_module_tracepoint(void (*fct)(struct tracepoint *,</div><div class='add'>+					struct module *, void *),</div><div class='add'>+				void *priv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+void for_each_tracepoint_in_module(struct module *mod,</div><div class='add'>+				   void (*fct)(struct tracepoint *,</div><div class='add'>+					struct module *, void *),</div><div class='add'>+				   void *priv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_MODULES */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * tracepoint_synchronize_unregister must be called between the last tracepoint</div><div class='ctx'>  * probe unregistration and the end of module exit to make sure there is no</div><div class='ctx'>  * caller executing a probe when it is freed.</div><div class='add'>+ *</div><div class='add'>+ * An alternative is to use the following for batch reclaim associated</div><div class='add'>+ * with a given tracepoint:</div><div class='add'>+ *</div><div class='add'>+ * - tracepoint_is_faultable() == false: call_rcu()</div><div class='add'>+ * - tracepoint_is_faultable() == true:  call_rcu_tasks_trace()</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_TRACEPOINTS</div><div class='ctx'> static inline void tracepoint_synchronize_unregister(void)</div><div class='ctx'> {</div><div class='del'>-	synchronize_srcu(&amp;tracepoint_srcu);</div><div class='add'>+	synchronize_rcu_tasks_trace();</div><div class='ctx'> 	synchronize_rcu();</div><div class='ctx'> }</div><div class='add'>+static inline bool tracepoint_is_faultable(struct tracepoint *tp)</div><div class='add'>+{</div><div class='add'>+	return tp-&gt;ext &amp;&amp; tp-&gt;ext-&gt;faultable;</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> static inline void tracepoint_synchronize_unregister(void)</div><div class='ctx'> { }</div><div class='add'>+static inline bool tracepoint_is_faultable(struct tracepoint *tp)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS</div><div class='hunk'>@@ -178,64 +210,25 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)</div><div class='ctx'> #endif /* CONFIG_HAVE_STATIC_CALL */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ARCH_WANTS_NO_INSTR archs are expected to have sanitized entry and idle</div><div class='del'>- * code that disallow any/all tracing/instrumentation when RCU isn't watching.</div><div class='add'>+ * Declare an exported function that Rust code can call to trigger this</div><div class='add'>+ * tracepoint. This function does not include the static branch; that is done</div><div class='add'>+ * in Rust to avoid a function call when the tracepoint is disabled.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_ARCH_WANTS_NO_INSTR</div><div class='del'>-#define RCUIDLE_COND(rcuidle)	(rcuidle)</div><div class='del'>-#else</div><div class='del'>-/* srcu can't be used from NMI */</div><div class='del'>-#define RCUIDLE_COND(rcuidle)	(rcuidle &amp;&amp; in_nmi())</div><div class='del'>-#endif</div><div class='add'>+#define DEFINE_RUST_DO_TRACE(name, proto, args)</div><div class='add'>+#define __DEFINE_RUST_DO_TRACE(name, proto, args)			\</div><div class='add'>+	notrace void rust_do_trace_##name(proto)			\</div><div class='add'>+	{								\</div><div class='add'>+		__do_trace_##name(args);				\</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * it_func[0] is never NULL because there is at least one element in the array</div><div class='del'>- * when the array itself is non NULL.</div><div class='add'>+ * When a tracepoint is used, it's name is added to the __tracepoint_check</div><div class='add'>+ * section. This section is only used at build time to make sure all</div><div class='add'>+ * defined tracepoints are used. It is discarded after the build.</div><div class='ctx'>  */</div><div class='del'>-#define __DO_TRACE(name, args, cond, rcuidle)				\</div><div class='del'>-	do {								\</div><div class='del'>-		int __maybe_unused __idx = 0;				\</div><div class='del'>-									\</div><div class='del'>-		if (!(cond))						\</div><div class='del'>-			return;						\</div><div class='del'>-									\</div><div class='del'>-		if (WARN_ON_ONCE(RCUIDLE_COND(rcuidle)))		\</div><div class='del'>-			return;						\</div><div class='del'>-									\</div><div class='del'>-		/* keep srcu and sched-rcu usage consistent */		\</div><div class='del'>-		preempt_disable_notrace();				\</div><div class='del'>-									\</div><div class='del'>-		/*							\</div><div class='del'>-		 * For rcuidle callers, use srcu since sched-rcu	\</div><div class='del'>-		 * doesn't work from the idle path.			\</div><div class='del'>-		 */							\</div><div class='del'>-		if (rcuidle) {						\</div><div class='del'>-			__idx = srcu_read_lock_notrace(&amp;tracepoint_srcu);\</div><div class='del'>-			ct_irq_enter_irqson();				\</div><div class='del'>-		}							\</div><div class='del'>-									\</div><div class='del'>-		__DO_TRACE_CALL(name, TP_ARGS(args));			\</div><div class='del'>-									\</div><div class='del'>-		if (rcuidle) {						\</div><div class='del'>-			ct_irq_exit_irqson();				\</div><div class='del'>-			srcu_read_unlock_notrace(&amp;tracepoint_srcu, __idx);\</div><div class='del'>-		}							\</div><div class='del'>-									\</div><div class='del'>-		preempt_enable_notrace();				\</div><div class='del'>-	} while (0)</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-#define __DECLARE_TRACE_RCU(name, proto, args, cond)			\</div><div class='del'>-	static inline void trace_##name##_rcuidle(proto)		\</div><div class='del'>-	{								\</div><div class='del'>-		if (static_key_false(&amp;__tracepoint_##name.key))		\</div><div class='del'>-			__DO_TRACE(name,				\</div><div class='del'>-				TP_ARGS(args),				\</div><div class='del'>-				TP_CONDITION(cond), 1);			\</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-#define __DECLARE_TRACE_RCU(name, proto, args, cond)</div><div class='del'>-#endif</div><div class='add'>+# define TRACEPOINT_CHECK(name)						\</div><div class='add'>+	static const char __used __section("__tracepoint_check")	\</div><div class='add'>+	__trace_check_##name[] = #name;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Make sure the alignment of the structure in the __tracepoints section will</div><div class='hunk'>@@ -248,22 +241,11 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)</div><div class='ctx'>  * site if it is not watching, as it will need to be active when the</div><div class='ctx'>  * tracepoint is enabled.</div><div class='ctx'>  */</div><div class='del'>-#define __DECLARE_TRACE(name, proto, args, cond, data_proto)		\</div><div class='add'>+#define __DECLARE_TRACE_COMMON(name, proto, args, data_proto)		\</div><div class='ctx'> 	extern int __traceiter_##name(data_proto);			\</div><div class='ctx'> 	DECLARE_STATIC_CALL(tp_func_##name, __traceiter_##name);	\</div><div class='ctx'> 	extern struct tracepoint __tracepoint_##name;			\</div><div class='del'>-	static inline void trace_##name(proto)				\</div><div class='del'>-	{								\</div><div class='del'>-		if (static_key_false(&amp;__tracepoint_##name.key))		\</div><div class='del'>-			__DO_TRACE(name,				\</div><div class='del'>-				TP_ARGS(args),				\</div><div class='del'>-				TP_CONDITION(cond), 0);			\</div><div class='del'>-		if (IS_ENABLED(CONFIG_LOCKDEP) &amp;&amp; (cond)) {		\</div><div class='del'>-			WARN_ON_ONCE(!rcu_is_watching());		\</div><div class='del'>-		}							\</div><div class='del'>-	}								\</div><div class='del'>-	__DECLARE_TRACE_RCU(name, PARAMS(proto), PARAMS(args),		\</div><div class='del'>-			    PARAMS(cond))				\</div><div class='add'>+	extern void rust_do_trace_##name(proto);			\</div><div class='ctx'> 	static inline int						\</div><div class='ctx'> 	register_trace_##name(void (*probe)(data_proto), void *data)	\</div><div class='ctx'> 	{								\</div><div class='hunk'>@@ -290,15 +272,57 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)</div><div class='ctx'> 	static inline bool						\</div><div class='ctx'> 	trace_##name##_enabled(void)					\</div><div class='ctx'> 	{								\</div><div class='del'>-		return static_key_false(&amp;__tracepoint_##name.key);	\</div><div class='add'>+		return static_branch_unlikely(&amp;__tracepoint_##name.key);\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define __DECLARE_TRACE(name, proto, args, cond, data_proto)		\</div><div class='add'>+	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto)) \</div><div class='add'>+	static inline void __do_trace_##name(proto)			\</div><div class='add'>+	{								\</div><div class='add'>+		TRACEPOINT_CHECK(name)					\</div><div class='add'>+		if (cond) {						\</div><div class='add'>+			guard(preempt_notrace)();			\</div><div class='add'>+			__DO_TRACE_CALL(name, TP_ARGS(args));		\</div><div class='add'>+		}							\</div><div class='add'>+	}								\</div><div class='add'>+	static inline void trace_##name(proto)				\</div><div class='add'>+	{								\</div><div class='add'>+		if (static_branch_unlikely(&amp;__tracepoint_##name.key))	\</div><div class='add'>+			__do_trace_##name(args);			\</div><div class='add'>+		if (IS_ENABLED(CONFIG_LOCKDEP) &amp;&amp; (cond)) {		\</div><div class='add'>+			WARN_ONCE(!rcu_is_watching(),			\</div><div class='add'>+				  "RCU not watching for tracepoint");	\</div><div class='add'>+		}							\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define __DECLARE_TRACE_SYSCALL(name, proto, args, data_proto)		\</div><div class='add'>+	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto)) \</div><div class='add'>+	static inline void __do_trace_##name(proto)			\</div><div class='add'>+	{								\</div><div class='add'>+		TRACEPOINT_CHECK(name)					\</div><div class='add'>+		guard(rcu_tasks_trace)();				\</div><div class='add'>+		__DO_TRACE_CALL(name, TP_ARGS(args));			\</div><div class='add'>+	}								\</div><div class='add'>+	static inline void trace_##name(proto)				\</div><div class='add'>+	{								\</div><div class='add'>+		might_fault();						\</div><div class='add'>+		if (static_branch_unlikely(&amp;__tracepoint_##name.key))	\</div><div class='add'>+			__do_trace_##name(args);			\</div><div class='add'>+		if (IS_ENABLED(CONFIG_LOCKDEP)) {			\</div><div class='add'>+			WARN_ONCE(!rcu_is_watching(),			\</div><div class='add'>+				  "RCU not watching for tracepoint");	\</div><div class='add'>+		}							\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We have no guarantee that gcc and the linker won't up-align the tracepoint</div><div class='ctx'>  * structures, so we create an array of pointers that will be used for iteration</div><div class='ctx'>  * on the tracepoints.</div><div class='add'>+ *</div><div class='add'>+ * it_func[0] is never NULL because there is at least one element in the array</div><div class='add'>+ * when the array itself is non NULL.</div><div class='ctx'>  */</div><div class='del'>-#define DEFINE_TRACE_FN(_name, _reg, _unreg, proto, args)		\</div><div class='add'>+#define __DEFINE_TRACE_EXT(_name, _ext, proto, args)			\</div><div class='ctx'> 	static const char __tpstrtab_##_name[]				\</div><div class='ctx'> 	__section("__tracepoints_strings") = #_name;			\</div><div class='ctx'> 	extern struct static_call_key STATIC_CALL_KEY(tp_func_##_name);	\</div><div class='hunk'>@@ -307,14 +331,14 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)</div><div class='ctx'> 	struct tracepoint __tracepoint_##_name	__used			\</div><div class='ctx'> 	__section("__tracepoints") = {					\</div><div class='ctx'> 		.name = __tpstrtab_##_name,				\</div><div class='del'>-		.key = STATIC_KEY_INIT_FALSE,				\</div><div class='add'>+		.key = STATIC_KEY_FALSE_INIT,				\</div><div class='ctx'> 		.static_call_key = &amp;STATIC_CALL_KEY(tp_func_##_name),	\</div><div class='ctx'> 		.static_call_tramp = STATIC_CALL_TRAMP_ADDR(tp_func_##_name), \</div><div class='ctx'> 		.iterator = &amp;__traceiter_##_name,			\</div><div class='ctx'> 		.probestub = &amp;__probestub_##_name,			\</div><div class='del'>-		.regfunc = _reg,					\</div><div class='del'>-		.unregfunc = _unreg,					\</div><div class='del'>-		.funcs = NULL };					\</div><div class='add'>+		.funcs = NULL,						\</div><div class='add'>+		.ext = _ext,						\</div><div class='add'>+	};								\</div><div class='ctx'> 	__TRACEPOINT_ENTRY(_name);					\</div><div class='ctx'> 	int __traceiter_##_name(void *__data, proto)			\</div><div class='ctx'> 	{								\</div><div class='hunk'>@@ -335,27 +359,44 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)</div><div class='ctx'> 	void __probestub_##_name(void *__data, proto)			\</div><div class='ctx'> 	{								\</div><div class='ctx'> 	}								\</div><div class='del'>-	DEFINE_STATIC_CALL(tp_func_##_name, __traceiter_##_name);</div><div class='add'>+	DEFINE_STATIC_CALL(tp_func_##_name, __traceiter_##_name);	\</div><div class='add'>+	DEFINE_RUST_DO_TRACE(_name, TP_PROTO(proto), TP_ARGS(args))</div><div class='ctx'> </div><div class='del'>-#define DEFINE_TRACE(name, proto, args)		\</div><div class='del'>-	DEFINE_TRACE_FN(name, NULL, NULL, PARAMS(proto), PARAMS(args));</div><div class='add'>+#define DEFINE_TRACE_FN(_name, _reg, _unreg, _proto, _args)		\</div><div class='add'>+	static struct tracepoint_ext __tracepoint_ext_##_name = {	\</div><div class='add'>+		.regfunc = _reg,					\</div><div class='add'>+		.unregfunc = _unreg,					\</div><div class='add'>+		.faultable = false,					\</div><div class='add'>+	};								\</div><div class='add'>+	__DEFINE_TRACE_EXT(_name, &amp;__tracepoint_ext_##_name, PARAMS(_proto), PARAMS(_args));</div><div class='add'>+</div><div class='add'>+#define DEFINE_TRACE_SYSCALL(_name, _reg, _unreg, _proto, _args)	\</div><div class='add'>+	static struct tracepoint_ext __tracepoint_ext_##_name = {	\</div><div class='add'>+		.regfunc = _reg,					\</div><div class='add'>+		.unregfunc = _unreg,					\</div><div class='add'>+		.faultable = true,					\</div><div class='add'>+	};								\</div><div class='add'>+	__DEFINE_TRACE_EXT(_name, &amp;__tracepoint_ext_##_name, PARAMS(_proto), PARAMS(_args));</div><div class='add'>+</div><div class='add'>+#define DEFINE_TRACE(_name, _proto, _args)				\</div><div class='add'>+	__DEFINE_TRACE_EXT(_name, NULL, PARAMS(_proto), PARAMS(_args));</div><div class='ctx'> </div><div class='ctx'> #define EXPORT_TRACEPOINT_SYMBOL_GPL(name)				\</div><div class='add'>+	TRACEPOINT_CHECK(name)						\</div><div class='ctx'> 	EXPORT_SYMBOL_GPL(__tracepoint_##name);				\</div><div class='ctx'> 	EXPORT_SYMBOL_GPL(__traceiter_##name);				\</div><div class='ctx'> 	EXPORT_STATIC_CALL_GPL(tp_func_##name)</div><div class='ctx'> #define EXPORT_TRACEPOINT_SYMBOL(name)					\</div><div class='add'>+	TRACEPOINT_CHECK(name)						\</div><div class='ctx'> 	EXPORT_SYMBOL(__tracepoint_##name);				\</div><div class='ctx'> 	EXPORT_SYMBOL(__traceiter_##name);				\</div><div class='ctx'> 	EXPORT_STATIC_CALL(tp_func_##name)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #else /* !TRACEPOINTS_ENABLED */</div><div class='del'>-#define __DECLARE_TRACE(name, proto, args, cond, data_proto)		\</div><div class='add'>+#define __DECLARE_TRACE_COMMON(name, proto, args, data_proto)		\</div><div class='ctx'> 	static inline void trace_##name(proto)				\</div><div class='ctx'> 	{ }								\</div><div class='del'>-	static inline void trace_##name##_rcuidle(proto)		\</div><div class='del'>-	{ }								\</div><div class='ctx'> 	static inline int						\</div><div class='ctx'> 	register_trace_##name(void (*probe)(data_proto),		\</div><div class='ctx'> 			      void *data)				\</div><div class='hunk'>@@ -377,7 +418,14 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)</div><div class='ctx'> 		return false;						\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#define __DECLARE_TRACE(name, proto, args, cond, data_proto)		\</div><div class='add'>+	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto))</div><div class='add'>+</div><div class='add'>+#define __DECLARE_TRACE_SYSCALL(name, proto, args, data_proto)		\</div><div class='add'>+	__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto))</div><div class='add'>+</div><div class='ctx'> #define DEFINE_TRACE_FN(name, reg, unreg, proto, args)</div><div class='add'>+#define DEFINE_TRACE_SYSCALL(name, reg, unreg, proto, args)</div><div class='ctx'> #define DEFINE_TRACE(name, proto, args)</div><div class='ctx'> #define EXPORT_TRACEPOINT_SYMBOL_GPL(name)</div><div class='ctx'> #define EXPORT_TRACEPOINT_SYMBOL(name)</div><div class='hunk'>@@ -429,15 +477,33 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define DECLARE_TRACE(name, proto, args)				\</div><div class='del'>-	__DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),		\</div><div class='add'>+	__DECLARE_TRACE(name##_tp, PARAMS(proto), PARAMS(args),		\</div><div class='ctx'> 			cpu_online(raw_smp_processor_id()),		\</div><div class='ctx'> 			PARAMS(void *__data, proto))</div><div class='ctx'> </div><div class='ctx'> #define DECLARE_TRACE_CONDITION(name, proto, args, cond)		\</div><div class='add'>+	__DECLARE_TRACE(name##_tp, PARAMS(proto), PARAMS(args),		\</div><div class='add'>+			cpu_online(raw_smp_processor_id()) &amp;&amp; (PARAMS(cond)), \</div><div class='add'>+			PARAMS(void *__data, proto))</div><div class='add'>+</div><div class='add'>+#define DECLARE_TRACE_SYSCALL(name, proto, args)			\</div><div class='add'>+	__DECLARE_TRACE_SYSCALL(name##_tp, PARAMS(proto), PARAMS(args),	\</div><div class='add'>+				PARAMS(void *__data, proto))</div><div class='add'>+</div><div class='add'>+#define DECLARE_TRACE_EVENT(name, proto, args)				\</div><div class='add'>+	__DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),		\</div><div class='add'>+			cpu_online(raw_smp_processor_id()),		\</div><div class='add'>+			PARAMS(void *__data, proto))</div><div class='add'>+</div><div class='add'>+#define DECLARE_TRACE_EVENT_CONDITION(name, proto, args, cond)		\</div><div class='ctx'> 	__DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),		\</div><div class='ctx'> 			cpu_online(raw_smp_processor_id()) &amp;&amp; (PARAMS(cond)), \</div><div class='ctx'> 			PARAMS(void *__data, proto))</div><div class='ctx'> </div><div class='add'>+#define DECLARE_TRACE_EVENT_SYSCALL(name, proto, args)			\</div><div class='add'>+	__DECLARE_TRACE_SYSCALL(name, PARAMS(proto), PARAMS(args),	\</div><div class='add'>+				PARAMS(void *__data, proto))</div><div class='add'>+</div><div class='ctx'> #define TRACE_EVENT_FLAGS(event, flag)</div><div class='ctx'> </div><div class='ctx'> #define TRACE_EVENT_PERF_PERM(event, expr...)</div><div class='hunk'>@@ -552,29 +618,32 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)</div><div class='ctx'> </div><div class='ctx'> #define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)</div><div class='ctx'> #define DEFINE_EVENT(template, name, proto, args)		\</div><div class='del'>-	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))</div><div class='add'>+	DECLARE_TRACE_EVENT(name, PARAMS(proto), PARAMS(args))</div><div class='ctx'> #define DEFINE_EVENT_FN(template, name, proto, args, reg, unreg)\</div><div class='del'>-	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))</div><div class='add'>+	DECLARE_TRACE_EVENT(name, PARAMS(proto), PARAMS(args))</div><div class='ctx'> #define DEFINE_EVENT_PRINT(template, name, proto, args, print)	\</div><div class='del'>-	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))</div><div class='add'>+	DECLARE_TRACE_EVENT(name, PARAMS(proto), PARAMS(args))</div><div class='ctx'> #define DEFINE_EVENT_CONDITION(template, name, proto,		\</div><div class='ctx'> 			       args, cond)			\</div><div class='del'>-	DECLARE_TRACE_CONDITION(name, PARAMS(proto),		\</div><div class='add'>+	DECLARE_TRACE_EVENT_CONDITION(name, PARAMS(proto),	\</div><div class='ctx'> 				PARAMS(args), PARAMS(cond))</div><div class='ctx'> </div><div class='ctx'> #define TRACE_EVENT(name, proto, args, struct, assign, print)	\</div><div class='del'>-	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))</div><div class='add'>+	DECLARE_TRACE_EVENT(name, PARAMS(proto), PARAMS(args))</div><div class='ctx'> #define TRACE_EVENT_FN(name, proto, args, struct,		\</div><div class='ctx'> 		assign, print, reg, unreg)			\</div><div class='del'>-	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))</div><div class='del'>-#define TRACE_EVENT_FN_COND(name, proto, args, cond, struct,		\</div><div class='add'>+	DECLARE_TRACE_EVENT(name, PARAMS(proto), PARAMS(args))</div><div class='add'>+#define TRACE_EVENT_FN_COND(name, proto, args, cond, struct,	\</div><div class='ctx'> 		assign, print, reg, unreg)			\</div><div class='del'>-	DECLARE_TRACE_CONDITION(name, PARAMS(proto),	\</div><div class='add'>+	DECLARE_TRACE_EVENT_CONDITION(name, PARAMS(proto),	\</div><div class='ctx'> 			PARAMS(args), PARAMS(cond))</div><div class='ctx'> #define TRACE_EVENT_CONDITION(name, proto, args, cond,		\</div><div class='ctx'> 			      struct, assign, print)		\</div><div class='del'>-	DECLARE_TRACE_CONDITION(name, PARAMS(proto),		\</div><div class='add'>+	DECLARE_TRACE_EVENT_CONDITION(name, PARAMS(proto),	\</div><div class='ctx'> 				PARAMS(args), PARAMS(cond))</div><div class='add'>+#define TRACE_EVENT_SYSCALL(name, proto, args, struct, assign,	\</div><div class='add'>+			    print, reg, unreg)			\</div><div class='add'>+	DECLARE_TRACE_EVENT_SYSCALL(name, PARAMS(proto), PARAMS(args))</div><div class='ctx'> </div><div class='ctx'> #define TRACE_EVENT_FLAGS(event, flag)</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/tsm-mr.h b/include/linux/tsm-mr.h<br/>new file mode 100644<br/>index 000000000000..50a521f4ac97<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tsm-mr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tsm-mr.h</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef __TSM_MR_H</div><div class='add'>+#define __TSM_MR_H</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/hash_info.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tsm_measurement_register - describes an architectural measurement</div><div class='add'>+ * register (MR)</div><div class='add'>+ * @mr_name: name of the MR</div><div class='add'>+ * @mr_value: buffer containing the current value of the MR</div><div class='add'>+ * @mr_size: size of the MR - typically the digest size of @mr_hash</div><div class='add'>+ * @mr_flags: bitwise OR of one or more flags, detailed below</div><div class='add'>+ * @mr_hash: optional hash identifier defined in include/uapi/linux/hash_info.h.</div><div class='add'>+ *</div><div class='add'>+ * A CC guest driver encloses an array of this structure in struct</div><div class='add'>+ * tsm_measurements to detail the measurement facility supported by the</div><div class='add'>+ * underlying CC hardware.</div><div class='add'>+ *</div><div class='add'>+ * @mr_name and @mr_value must stay valid until this structure is no longer in</div><div class='add'>+ * use.</div><div class='add'>+ *</div><div class='add'>+ * @mr_flags is the bitwise-OR of zero or more of the flags below.</div><div class='add'>+ *</div><div class='add'>+ * * %TSM_MR_F_READABLE - the sysfs attribute corresponding to this MR is readable.</div><div class='add'>+ * * %TSM_MR_F_WRITABLE - the sysfs attribute corresponding to this MR is writable.</div><div class='add'>+ *   The semantics is typically to extend the MR but could vary depending on the</div><div class='add'>+ *   architecture and the MR.</div><div class='add'>+ * * %TSM_MR_F_LIVE - this MR's value may differ from the last value written, so</div><div class='add'>+ *   must be read back from the underlying CC hardware/firmware.</div><div class='add'>+ * * %TSM_MR_F_RTMR - bitwise-OR of %TSM_MR_F_LIVE and %TSM_MR_F_WRITABLE.</div><div class='add'>+ * * %TSM_MR_F_NOHASH - this MR does NOT have an associated hash algorithm.</div><div class='add'>+ *   @mr_hash will be ignored when this flag is set.</div><div class='add'>+ */</div><div class='add'>+struct tsm_measurement_register {</div><div class='add'>+	const char *mr_name;</div><div class='add'>+	void *mr_value;</div><div class='add'>+	u32 mr_size;</div><div class='add'>+	u32 mr_flags;</div><div class='add'>+	enum hash_algo mr_hash;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSM_MR_F_NOHASH 1</div><div class='add'>+#define TSM_MR_F_WRITABLE 2</div><div class='add'>+#define TSM_MR_F_READABLE 4</div><div class='add'>+#define TSM_MR_F_LIVE 8</div><div class='add'>+#define TSM_MR_F_RTMR (TSM_MR_F_LIVE | TSM_MR_F_WRITABLE)</div><div class='add'>+</div><div class='add'>+#define TSM_MR_(mr, hash)                              \</div><div class='add'>+	.mr_name = #mr, .mr_size = hash##_DIGEST_SIZE, \</div><div class='add'>+	.mr_hash = HASH_ALGO_##hash, .mr_flags = TSM_MR_F_READABLE</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tsm_measurements - defines the CC architecture specific measurement</div><div class='add'>+ * facility and methods for updating measurement registers (MRs)</div><div class='add'>+ * @mrs: Array of MR definitions.</div><div class='add'>+ * @nr_mrs: Number of elements in @mrs.</div><div class='add'>+ * @refresh: Callback function to load/sync all MRs from TVM hardware/firmware</div><div class='add'>+ *           into the kernel cache.</div><div class='add'>+ * @write: Callback function to write to the MR specified by the parameter @mr.</div><div class='add'>+ *         Typically, writing to an MR extends the input buffer to that MR.</div><div class='add'>+ *</div><div class='add'>+ * The @refresh callback is invoked when an MR with %TSM_MR_F_LIVE set is being</div><div class='add'>+ * read and the cache is stale. It must reload all MRs with %TSM_MR_F_LIVE set.</div><div class='add'>+ * The function parameter @tm is a pointer pointing back to this structure.</div><div class='add'>+ *</div><div class='add'>+ * The @write callback is invoked whenever an MR is being written. It takes two</div><div class='add'>+ * additional parameters besides @tm:</div><div class='add'>+ *</div><div class='add'>+ * * @mr - points to the MR (an element of @tm-&gt;mrs) being written.</div><div class='add'>+ * * @data - contains the bytes to write and whose size is @mr-&gt;mr_size.</div><div class='add'>+ *</div><div class='add'>+ * Both @refresh and @write should return 0 on success and an appropriate error</div><div class='add'>+ * code on failure.</div><div class='add'>+ */</div><div class='add'>+struct tsm_measurements {</div><div class='add'>+	const struct tsm_measurement_register *mrs;</div><div class='add'>+	size_t nr_mrs;</div><div class='add'>+	int (*refresh)(const struct tsm_measurements *tm);</div><div class='add'>+	int (*write)(const struct tsm_measurements *tm,</div><div class='add'>+		     const struct tsm_measurement_register *mr, const u8 *data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct attribute_group *</div><div class='add'>+tsm_mr_create_attribute_group(const struct tsm_measurements *tm);</div><div class='add'>+void tsm_mr_free_attribute_group(const struct attribute_group *attr_grp);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/include/linux/tsm.h b/include/linux/tsm.h<br/>index de8324a2223c..a3b7ab668eff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tsm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tsm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tsm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tsm.h</a></div><div class='hunk'>@@ -4,26 +4,34 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sizes.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/uuid.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='del'>-#define TSM_INBLOB_MAX 64</div><div class='del'>-#define TSM_OUTBLOB_MAX SZ_32K</div><div class='add'>+#define TSM_REPORT_INBLOB_MAX 64</div><div class='add'>+#define TSM_REPORT_OUTBLOB_MAX SZ_32K</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Privilege level is a nested permission concept to allow confidential</div><div class='ctx'>  * guests to partition address space, 4-levels are supported.</div><div class='ctx'>  */</div><div class='del'>-#define TSM_PRIVLEVEL_MAX 3</div><div class='add'>+#define TSM_REPORT_PRIVLEVEL_MAX 3</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct tsm_desc - option descriptor for generating tsm report blobs</div><div class='add'>+ * struct tsm_report_desc - option descriptor for generating tsm report blobs</div><div class='ctx'>  * @privlevel: optional privilege level to associate with @outblob</div><div class='ctx'>  * @inblob_len: sizeof @inblob</div><div class='ctx'>  * @inblob: arbitrary input data</div><div class='add'>+ * @service_provider: optional name of where to obtain the tsm report blob</div><div class='add'>+ * @service_guid: optional service-provider service guid to attest</div><div class='add'>+ * @service_manifest_version: optional service-provider service manifest version requested</div><div class='ctx'>  */</div><div class='del'>-struct tsm_desc {</div><div class='add'>+struct tsm_report_desc {</div><div class='ctx'> 	unsigned int privlevel;</div><div class='ctx'> 	size_t inblob_len;</div><div class='del'>-	u8 inblob[TSM_INBLOB_MAX];</div><div class='add'>+	u8 inblob[TSM_REPORT_INBLOB_MAX];</div><div class='add'>+	char *service_provider;</div><div class='add'>+	guid_t service_guid;</div><div class='add'>+	unsigned int service_manifest_version;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -33,37 +41,89 @@ struct tsm_desc {</div><div class='ctx'>  * @outblob: generated evidence to provider to the attestation agent</div><div class='ctx'>  * @auxblob_len: sizeof(@auxblob)</div><div class='ctx'>  * @auxblob: (optional) auxiliary data to the report (e.g. certificate data)</div><div class='add'>+ * @manifestblob_len: sizeof(@manifestblob)</div><div class='add'>+ * @manifestblob: (optional) manifest data associated with the report</div><div class='ctx'>  */</div><div class='ctx'> struct tsm_report {</div><div class='del'>-	struct tsm_desc desc;</div><div class='add'>+	struct tsm_report_desc desc;</div><div class='ctx'> 	size_t outblob_len;</div><div class='ctx'> 	u8 *outblob;</div><div class='ctx'> 	size_t auxblob_len;</div><div class='ctx'> 	u8 *auxblob;</div><div class='add'>+	size_t manifestblob_len;</div><div class='add'>+	u8 *manifestblob;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct tsm_ops - attributes and operations for tsm instances</div><div class='add'>+ * enum tsm_attr_index - index used to reference report attributes</div><div class='add'>+ * @TSM_REPORT_GENERATION: index of the report generation number attribute</div><div class='add'>+ * @TSM_REPORT_PROVIDER: index of the provider name attribute</div><div class='add'>+ * @TSM_REPORT_PRIVLEVEL: index of the desired privilege level attribute</div><div class='add'>+ * @TSM_REPORT_PRIVLEVEL_FLOOR: index of the minimum allowed privileg level attribute</div><div class='add'>+ * @TSM_REPORT_SERVICE_PROVIDER: index of the service provider identifier attribute</div><div class='add'>+ * @TSM_REPORT_SERVICE_GUID: index of the service GUID attribute</div><div class='add'>+ * @TSM_REPORT_SERVICE_MANIFEST_VER: index of the service manifest version attribute</div><div class='add'>+ */</div><div class='add'>+enum tsm_attr_index {</div><div class='add'>+	TSM_REPORT_GENERATION,</div><div class='add'>+	TSM_REPORT_PROVIDER,</div><div class='add'>+	TSM_REPORT_PRIVLEVEL,</div><div class='add'>+	TSM_REPORT_PRIVLEVEL_FLOOR,</div><div class='add'>+	TSM_REPORT_SERVICE_PROVIDER,</div><div class='add'>+	TSM_REPORT_SERVICE_GUID,</div><div class='add'>+	TSM_REPORT_SERVICE_MANIFEST_VER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum tsm_bin_attr_index - index used to reference binary report attributes</div><div class='add'>+ * @TSM_REPORT_INBLOB: index of the binary report input attribute</div><div class='add'>+ * @TSM_REPORT_OUTBLOB: index of the binary report output attribute</div><div class='add'>+ * @TSM_REPORT_AUXBLOB: index of the binary auxiliary data attribute</div><div class='add'>+ * @TSM_REPORT_MANIFESTBLOB: index of the binary manifest data attribute</div><div class='add'>+ */</div><div class='add'>+enum tsm_bin_attr_index {</div><div class='add'>+	TSM_REPORT_INBLOB,</div><div class='add'>+	TSM_REPORT_OUTBLOB,</div><div class='add'>+	TSM_REPORT_AUXBLOB,</div><div class='add'>+	TSM_REPORT_MANIFESTBLOB,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct tsm_report_ops - attributes and operations for tsm_report instances</div><div class='ctx'>  * @name: tsm id reflected in /sys/kernel/config/tsm/report/$report/provider</div><div class='ctx'>  * @privlevel_floor: convey base privlevel for nested scenarios</div><div class='ctx'>  * @report_new: Populate @report with the report blob and auxblob</div><div class='ctx'>  * (optional), return 0 on successful population, or -errno otherwise</div><div class='add'>+ * @report_attr_visible: show or hide a report attribute entry</div><div class='add'>+ * @report_bin_attr_visible: show or hide a report binary attribute entry</div><div class='ctx'>  *</div><div class='ctx'>  * Implementation specific ops, only one is expected to be registered at</div><div class='ctx'>  * a time i.e. only one of "sev-guest", "tdx-guest", etc.</div><div class='ctx'>  */</div><div class='del'>-struct tsm_ops {</div><div class='add'>+struct tsm_report_ops {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	const unsigned int privlevel_floor;</div><div class='add'>+	unsigned int privlevel_floor;</div><div class='ctx'> 	int (*report_new)(struct tsm_report *report, void *data);</div><div class='add'>+	bool (*report_attr_visible)(int n);</div><div class='add'>+	bool (*report_bin_attr_visible)(int n);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern const struct config_item_type tsm_report_default_type;</div><div class='add'>+struct pci_tsm_ops;</div><div class='add'>+struct tsm_dev {</div><div class='add'>+	struct device dev;</div><div class='add'>+	int id;</div><div class='add'>+	const struct pci_tsm_ops *pci_ops;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* publish @privlevel, @privlevel_floor, and @auxblob attributes */</div><div class='del'>-extern const struct config_item_type tsm_report_extra_type;</div><div class='add'>+DEFINE_FREE(put_tsm_dev, struct tsm_dev *,</div><div class='add'>+	    if (!IS_ERR_OR_NULL(_T)) put_device(&amp;_T-&gt;dev))</div><div class='ctx'> </div><div class='del'>-int tsm_register(const struct tsm_ops *ops, void *priv,</div><div class='del'>-		 const struct config_item_type *type);</div><div class='del'>-int tsm_unregister(const struct tsm_ops *ops);</div><div class='add'>+int tsm_report_register(const struct tsm_report_ops *ops, void *priv);</div><div class='add'>+int tsm_report_unregister(const struct tsm_report_ops *ops);</div><div class='add'>+struct tsm_dev *tsm_register(struct device *parent, struct pci_tsm_ops *ops);</div><div class='add'>+void tsm_unregister(struct tsm_dev *tsm_dev);</div><div class='add'>+struct tsm_dev *find_tsm_dev(int id);</div><div class='add'>+struct pci_ide;</div><div class='add'>+int tsm_ide_stream_register(struct pci_ide *ide);</div><div class='add'>+void tsm_ide_stream_unregister(struct pci_ide *ide);</div><div class='ctx'> #endif /* __TSM_H */</div><div class='head'>diff --git a/include/linux/tty.h b/include/linux/tty.h<br/>index 8c76fd97d4ad..0a46e4054dec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tty.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tty.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tty.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tty.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/termios.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/tty_buffer.h&gt;</div><div class='ctx'> #include &lt;linux/tty_driver.h&gt;</div><div class='ctx'> #include &lt;linux/tty_ldisc.h&gt;</div><div class='ctx'> #include &lt;linux/tty_port.h&gt;</div><div class='hunk'>@@ -146,15 +145,12 @@ struct tty_operations;</div><div class='ctx'>  * @count: count of open processes, reaching zero cancels all the work for</div><div class='ctx'>  *	   this tty and drops a @kref too (but does not free this tty)</div><div class='ctx'>  * @winsize: size of the terminal "window" (cf. @winsize_mutex)</div><div class='del'>- * @flow: flow settings grouped together, see also @flow.unused</div><div class='add'>+ * @flow: flow settings grouped together</div><div class='ctx'>  * @flow.lock: lock for @flow members</div><div class='ctx'>  * @flow.stopped: tty stopped/started by stop_tty()/start_tty()</div><div class='ctx'>  * @flow.tco_stopped: tty stopped/started by %TCOOFF/%TCOON ioctls (it has</div><div class='ctx'>  *		      precedence over @flow.stopped)</div><div class='del'>- * @flow.unused: alignment for Alpha, so that no members other than @flow.* are</div><div class='del'>- *		 modified by the same 64b word store. The @flow's __aligned is</div><div class='del'>- *		 there for the very same reason.</div><div class='del'>- * @ctrl: control settings grouped together, see also @ctrl.unused</div><div class='add'>+ * @ctrl: control settings grouped together</div><div class='ctx'>  * @ctrl.lock: lock for @ctrl members</div><div class='ctx'>  * @ctrl.pgrp: process group of this tty (setpgrp(2))</div><div class='ctx'>  * @ctrl.session: session of this tty (setsid(2)). Writes are protected by both</div><div class='hunk'>@@ -162,7 +158,6 @@ struct tty_operations;</div><div class='ctx'>  *		  them.</div><div class='ctx'>  * @ctrl.pktstatus: packet mode status (bitwise OR of %TIOCPKT_ constants)</div><div class='ctx'>  * @ctrl.packet: packet mode enabled</div><div class='del'>- * @ctrl.unused: alignment for Alpha, see @flow.unused for explanation</div><div class='ctx'>  * @hw_stopped: not controlled by the tty layer, under @driver's control for CTS</div><div class='ctx'>  *		handling</div><div class='ctx'>  * @receive_room: bytes permitted to feed to @ldisc without any being lost</div><div class='hunk'>@@ -217,8 +212,7 @@ struct tty_struct {</div><div class='ctx'> 		spinlock_t lock;</div><div class='ctx'> 		bool stopped;</div><div class='ctx'> 		bool tco_stopped;</div><div class='del'>-		unsigned long unused[0];</div><div class='del'>-	} __aligned(sizeof(unsigned long)) flow;</div><div class='add'>+	} flow;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct pid *pgrp;</div><div class='hunk'>@@ -226,8 +220,7 @@ struct tty_struct {</div><div class='ctx'> 		spinlock_t lock;</div><div class='ctx'> 		unsigned char pktstatus;</div><div class='ctx'> 		bool packet;</div><div class='del'>-		unsigned long unused[0];</div><div class='del'>-	} __aligned(sizeof(unsigned long)) ctrl;</div><div class='add'>+	} ctrl;</div><div class='ctx'> </div><div class='ctx'> 	bool hw_stopped;</div><div class='ctx'> 	bool closing;</div><div class='hunk'>@@ -246,7 +239,6 @@ struct tty_struct {</div><div class='ctx'> </div><div class='ctx'> 	struct list_head tty_files;</div><div class='ctx'> </div><div class='del'>-#define N_TTY_BUF_SIZE 4096</div><div class='ctx'> 	struct work_struct SAK_work;</div><div class='ctx'> } __randomize_layout;</div><div class='ctx'> </div><div class='hunk'>@@ -258,7 +250,7 @@ struct tty_file_private {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * DOC: TTY Struct Flags</div><div class='add'>+ * enum tty_struct_flags - TTY Struct Flags</div><div class='ctx'>  *</div><div class='ctx'>  * These bits are used in the :c:member:`tty_struct.flags` field.</div><div class='ctx'>  *</div><div class='hunk'>@@ -267,62 +259,64 @@ struct tty_file_private {</div><div class='ctx'>  * tty-&gt;write.  Thus, you must use the inline functions set_bit() and</div><div class='ctx'>  * clear_bit() to make things atomic.</div><div class='ctx'>  *</div><div class='del'>- * TTY_THROTTLED</div><div class='add'>+ * @TTY_THROTTLED:</div><div class='ctx'>  *	Driver input is throttled. The ldisc should call</div><div class='ctx'>  *	:c:member:`tty_driver.unthrottle()` in order to resume reception when</div><div class='ctx'>  *	it is ready to process more data (at threshold min).</div><div class='ctx'>  *</div><div class='del'>- * TTY_IO_ERROR</div><div class='add'>+ * @TTY_IO_ERROR:</div><div class='ctx'>  *	If set, causes all subsequent userspace read/write calls on the tty to</div><div class='ctx'>  *	fail, returning -%EIO. (May be no ldisc too.)</div><div class='ctx'>  *</div><div class='del'>- * TTY_OTHER_CLOSED</div><div class='add'>+ * @TTY_OTHER_CLOSED:</div><div class='ctx'>  *	Device is a pty and the other side has closed.</div><div class='ctx'>  *</div><div class='del'>- * TTY_EXCLUSIVE</div><div class='add'>+ * @TTY_EXCLUSIVE:</div><div class='ctx'>  *	Exclusive open mode (a single opener).</div><div class='ctx'>  *</div><div class='del'>- * TTY_DO_WRITE_WAKEUP</div><div class='add'>+ * @TTY_DO_WRITE_WAKEUP:</div><div class='ctx'>  *	If set, causes the driver to call the</div><div class='ctx'>  *	:c:member:`tty_ldisc_ops.write_wakeup()` method in order to resume</div><div class='ctx'>  *	transmission when it can accept more data to transmit.</div><div class='ctx'>  *</div><div class='del'>- * TTY_LDISC_OPEN</div><div class='add'>+ * @TTY_LDISC_OPEN:</div><div class='ctx'>  *	Indicates that a line discipline is open. For debugging purposes only.</div><div class='ctx'>  *</div><div class='del'>- * TTY_PTY_LOCK</div><div class='add'>+ * @TTY_PTY_LOCK:</div><div class='ctx'>  *	A flag private to pty code to implement %TIOCSPTLCK/%TIOCGPTLCK logic.</div><div class='ctx'>  *</div><div class='del'>- * TTY_NO_WRITE_SPLIT</div><div class='add'>+ * @TTY_NO_WRITE_SPLIT:</div><div class='ctx'>  *	Prevent driver from splitting up writes into smaller chunks (preserve</div><div class='ctx'>  *	write boundaries to driver).</div><div class='ctx'>  *</div><div class='del'>- * TTY_HUPPED</div><div class='add'>+ * @TTY_HUPPED:</div><div class='ctx'>  *	The TTY was hung up. This is set post :c:member:`tty_driver.hangup()`.</div><div class='ctx'>  *</div><div class='del'>- * TTY_HUPPING</div><div class='add'>+ * @TTY_HUPPING:</div><div class='ctx'>  *	The TTY is in the process of hanging up to abort potential readers.</div><div class='ctx'>  *</div><div class='del'>- * TTY_LDISC_CHANGING</div><div class='add'>+ * @TTY_LDISC_CHANGING:</div><div class='ctx'>  *	Line discipline for this TTY is being changed. I/O should not block</div><div class='ctx'>  *	when this is set. Use tty_io_nonblock() to check.</div><div class='ctx'>  *</div><div class='del'>- * TTY_LDISC_HALTED</div><div class='add'>+ * @TTY_LDISC_HALTED:</div><div class='ctx'>  *	Line discipline for this TTY was stopped. No work should be queued to</div><div class='ctx'>  *	this ldisc.</div><div class='ctx'>  */</div><div class='del'>-#define TTY_THROTTLED		0</div><div class='del'>-#define TTY_IO_ERROR		1</div><div class='del'>-#define TTY_OTHER_CLOSED	2</div><div class='del'>-#define TTY_EXCLUSIVE		3</div><div class='del'>-#define TTY_DO_WRITE_WAKEUP	5</div><div class='del'>-#define TTY_LDISC_OPEN		11</div><div class='del'>-#define TTY_PTY_LOCK		16</div><div class='del'>-#define TTY_NO_WRITE_SPLIT	17</div><div class='del'>-#define TTY_HUPPED		18</div><div class='del'>-#define TTY_HUPPING		19</div><div class='del'>-#define TTY_LDISC_CHANGING	20</div><div class='del'>-#define TTY_LDISC_HALTED	22</div><div class='add'>+enum tty_struct_flags {</div><div class='add'>+	TTY_THROTTLED,</div><div class='add'>+	TTY_IO_ERROR,</div><div class='add'>+	TTY_OTHER_CLOSED,</div><div class='add'>+	TTY_EXCLUSIVE,</div><div class='add'>+	TTY_DO_WRITE_WAKEUP,</div><div class='add'>+	TTY_LDISC_OPEN,</div><div class='add'>+	TTY_PTY_LOCK,</div><div class='add'>+	TTY_NO_WRITE_SPLIT,</div><div class='add'>+	TTY_HUPPED,</div><div class='add'>+	TTY_HUPPING,</div><div class='add'>+	TTY_LDISC_CHANGING,</div><div class='add'>+	TTY_LDISC_HALTED,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static inline bool tty_io_nonblock(struct tty_struct *tty, struct file *file)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h<br/>index 7372124fbf90..188ee9b768eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tty_driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tty_driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tty_driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tty_driver.h</a></div><div class='hunk'>@@ -17,6 +17,92 @@ struct serial_icounter_struct;</div><div class='ctx'> struct serial_struct;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * enum tty_driver_flag -- TTY Driver Flags</div><div class='add'>+ *</div><div class='add'>+ * These are flags passed to tty_alloc_driver().</div><div class='add'>+ *</div><div class='add'>+ * @TTY_DRIVER_INSTALLED:</div><div class='add'>+ *	Whether this driver was succesfully installed. This is a tty internal</div><div class='add'>+ *	flag. Do not touch.</div><div class='add'>+ *</div><div class='add'>+ * @TTY_DRIVER_RESET_TERMIOS:</div><div class='add'>+ *	Requests the tty layer to reset the termios setting when the last</div><div class='add'>+ *	process has closed the device. Used for PTYs, in particular.</div><div class='add'>+ *</div><div class='add'>+ * @TTY_DRIVER_REAL_RAW:</div><div class='add'>+ *	Indicates that the driver will guarantee not to set any special</div><div class='add'>+ *	character handling flags if this is set for the tty:</div><div class='add'>+ *</div><div class='add'>+ *	``(IGNBRK || (!BRKINT &amp;&amp; !PARMRK)) &amp;&amp; (IGNPAR || !INPCK)``</div><div class='add'>+ *</div><div class='add'>+ *	That is, if there is no reason for the driver to</div><div class='add'>+ *	send notifications of parity and break characters up to the line</div><div class='add'>+ *	driver, it won't do so.  This allows the line driver to optimize for</div><div class='add'>+ *	this case if this flag is set.  (Note that there is also a promise, if</div><div class='add'>+ *	the above case is true, not to signal overruns, either.)</div><div class='add'>+ *</div><div class='add'>+ * @TTY_DRIVER_DYNAMIC_DEV:</div><div class='add'>+ *	The individual tty devices need to be registered with a call to</div><div class='add'>+ *	tty_register_device() when the device is found in the system and</div><div class='add'>+ *	unregistered with a call to tty_unregister_device() so the devices will</div><div class='add'>+ *	be show up properly in sysfs.  If not set, all &amp;tty_driver.num entries</div><div class='add'>+ *	will be created by the tty core in sysfs when tty_register_driver() is</div><div class='add'>+ *	called.  This is to be used by drivers that have tty devices that can</div><div class='add'>+ *	appear and disappear while the main tty driver is registered with the</div><div class='add'>+ *	tty core.</div><div class='add'>+ *</div><div class='add'>+ * @TTY_DRIVER_DEVPTS_MEM:</div><div class='add'>+ *	Don't use the standard arrays (&amp;tty_driver.ttys and</div><div class='add'>+ *	&amp;tty_driver.termios), instead use dynamic memory keyed through the</div><div class='add'>+ *	devpts filesystem. This is only applicable to the PTY driver.</div><div class='add'>+ *</div><div class='add'>+ * @TTY_DRIVER_HARDWARE_BREAK:</div><div class='add'>+ *	Hardware handles break signals. Pass the requested timeout to the</div><div class='add'>+ *	&amp;tty_operations.break_ctl instead of using a simple on/off interface.</div><div class='add'>+ *</div><div class='add'>+ * @TTY_DRIVER_DYNAMIC_ALLOC:</div><div class='add'>+ *	Do not allocate structures which are needed per line for this driver</div><div class='add'>+ *	(&amp;tty_driver.ports) as it would waste memory. The driver will take</div><div class='add'>+ *	care. This is only applicable to the PTY driver.</div><div class='add'>+ *</div><div class='add'>+ * @TTY_DRIVER_UNNUMBERED_NODE:</div><div class='add'>+ *	Do not create numbered ``/dev`` nodes. For example, create</div><div class='add'>+ *	``/dev/ttyprintk`` and not ``/dev/ttyprintk0``. Applicable only when a</div><div class='add'>+ *	driver for a single tty device is being allocated.</div><div class='add'>+ */</div><div class='add'>+enum tty_driver_flag {</div><div class='add'>+	TTY_DRIVER_INSTALLED		= BIT(0),</div><div class='add'>+	TTY_DRIVER_RESET_TERMIOS	= BIT(1),</div><div class='add'>+	TTY_DRIVER_REAL_RAW		= BIT(2),</div><div class='add'>+	TTY_DRIVER_DYNAMIC_DEV		= BIT(3),</div><div class='add'>+	TTY_DRIVER_DEVPTS_MEM		= BIT(4),</div><div class='add'>+	TTY_DRIVER_HARDWARE_BREAK	= BIT(5),</div><div class='add'>+	TTY_DRIVER_DYNAMIC_ALLOC	= BIT(6),</div><div class='add'>+	TTY_DRIVER_UNNUMBERED_NODE	= BIT(7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tty_driver_type {</div><div class='add'>+	TTY_DRIVER_TYPE_SYSTEM,</div><div class='add'>+	TTY_DRIVER_TYPE_CONSOLE,</div><div class='add'>+	TTY_DRIVER_TYPE_SERIAL,</div><div class='add'>+	TTY_DRIVER_TYPE_PTY,</div><div class='add'>+	TTY_DRIVER_TYPE_SCC,</div><div class='add'>+	TTY_DRIVER_TYPE_SYSCONS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tty_driver_subtype {</div><div class='add'>+	SYSTEM_TYPE_TTY = 1,</div><div class='add'>+	SYSTEM_TYPE_CONSOLE,</div><div class='add'>+	SYSTEM_TYPE_SYSCONS,</div><div class='add'>+	SYSTEM_TYPE_SYSPTMX,</div><div class='add'>+</div><div class='add'>+	PTY_TYPE_MASTER = 1,</div><div class='add'>+	PTY_TYPE_SLAVE,</div><div class='add'>+</div><div class='add'>+	SERIAL_TYPE_NORMAL = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct tty_operations -- interface between driver and tty</div><div class='ctx'>  *</div><div class='ctx'>  * @lookup: ``struct tty_struct *()(struct tty_driver *self, struct file *,</div><div class='hunk'>@@ -154,6 +240,13 @@ struct serial_struct;</div><div class='ctx'>  *</div><div class='ctx'>  *	Optional. Called under the @tty-&gt;termios_rwsem. May sleep.</div><div class='ctx'>  *</div><div class='add'>+ * @ldisc_ok: ``int ()(struct tty_struct *tty, int ldisc)``</div><div class='add'>+ *</div><div class='add'>+ *	This routine allows the @tty driver to decide if it can deal</div><div class='add'>+ *	with a particular @ldisc.</div><div class='add'>+ *</div><div class='add'>+ *	Optional. Called under the @tty-&gt;ldisc_sem and @tty-&gt;termios_rwsem.</div><div class='add'>+ *</div><div class='ctx'>  * @set_ldisc: ``void ()(struct tty_struct *tty)``</div><div class='ctx'>  *</div><div class='ctx'>  *	This routine allows the @tty driver to be notified when the device's</div><div class='hunk'>@@ -313,7 +406,7 @@ struct serial_struct;</div><div class='ctx'>  *</div><div class='ctx'>  * @poll_init: ``int ()(struct tty_driver *driver, int line, char *options)``</div><div class='ctx'>  *</div><div class='del'>- *	kgdboc support (Documentation/dev-tools/kgdb.rst). This routine is</div><div class='add'>+ *	kgdboc support (Documentation/process/debugging/kgdb.rst). This routine is</div><div class='ctx'>  *	called to initialize the HW for later use by calling @poll_get_char or</div><div class='ctx'>  *	@poll_put_char.</div><div class='ctx'>  *</div><div class='hunk'>@@ -372,6 +465,7 @@ struct tty_operations {</div><div class='ctx'> 	void (*hangup)(struct tty_struct *tty);</div><div class='ctx'> 	int (*break_ctl)(struct tty_struct *tty, int state);</div><div class='ctx'> 	void (*flush_buffer)(struct tty_struct *tty);</div><div class='add'>+	int (*ldisc_ok)(struct tty_struct *tty, int ldisc);</div><div class='ctx'> 	void (*set_ldisc)(struct tty_struct *tty);</div><div class='ctx'> 	void (*wait_until_sent)(struct tty_struct *tty, int timeout);</div><div class='ctx'> 	void (*send_xchar)(struct tty_struct *tty, u8 ch);</div><div class='hunk'>@@ -406,8 +500,8 @@ struct tty_operations {</div><div class='ctx'>  * @major: major /dev device number (zero for autoassignment)</div><div class='ctx'>  * @minor_start: the first minor /dev device number</div><div class='ctx'>  * @num: number of devices allocated</div><div class='del'>- * @type: type of tty driver (%TTY_DRIVER_TYPE_)</div><div class='del'>- * @subtype: subtype of tty driver (%SYSTEM_TYPE_, %PTY_TYPE_, %SERIAL_TYPE_)</div><div class='add'>+ * @type: type of tty driver (enum tty_driver_type)</div><div class='add'>+ * @subtype: subtype of tty driver (enum tty_driver_subtype)</div><div class='ctx'>  * @init_termios: termios to set to each tty initially (e.g. %tty_std_termios)</div><div class='ctx'>  * @flags: tty driver flags (%TTY_DRIVER_)</div><div class='ctx'>  * @proc_entry: proc fs entry, used internally</div><div class='hunk'>@@ -439,8 +533,8 @@ struct tty_driver {</div><div class='ctx'> 	int	major;</div><div class='ctx'> 	int	minor_start;</div><div class='ctx'> 	unsigned int	num;</div><div class='del'>-	short	type;</div><div class='del'>-	short	subtype;</div><div class='add'>+	enum tty_driver_type type;</div><div class='add'>+	enum tty_driver_subtype subtype;</div><div class='ctx'> 	struct ktermios init_termios;</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> 	struct proc_dir_entry *proc_entry;</div><div class='hunk'>@@ -470,7 +564,13 @@ struct tty_driver *tty_find_polling_driver(char *name, int *line);</div><div class='ctx'> </div><div class='ctx'> void tty_driver_kref_put(struct tty_driver *driver);</div><div class='ctx'> </div><div class='del'>-/* Use TTY_DRIVER_* flags below */</div><div class='add'>+/**</div><div class='add'>+ * tty_alloc_driver - allocate tty driver</div><div class='add'>+ * @lines: count of lines this driver can handle at most</div><div class='add'>+ * @flags: some of enum tty_driver_flag, will be set in driver-&gt;flags</div><div class='add'>+ *</div><div class='add'>+ * Returns: struct tty_driver or a PTR-encoded error (use IS_ERR() and friends).</div><div class='add'>+ */</div><div class='ctx'> #define tty_alloc_driver(lines, flags) \</div><div class='ctx'> 		__tty_alloc_driver(lines, THIS_MODULE, flags)</div><div class='ctx'> </div><div class='hunk'>@@ -486,84 +586,6 @@ static inline void tty_set_operations(struct tty_driver *driver,</div><div class='ctx'> 	driver-&gt;ops = op;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * DOC: TTY Driver Flags</div><div class='del'>- *</div><div class='del'>- * TTY_DRIVER_RESET_TERMIOS</div><div class='del'>- *	Requests the tty layer to reset the termios setting when the last</div><div class='del'>- *	process has closed the device. Used for PTYs, in particular.</div><div class='del'>- *</div><div class='del'>- * TTY_DRIVER_REAL_RAW</div><div class='del'>- *	Indicates that the driver will guarantee not to set any special</div><div class='del'>- *	character handling flags if this is set for the tty:</div><div class='del'>- *</div><div class='del'>- *	``(IGNBRK || (!BRKINT &amp;&amp; !PARMRK)) &amp;&amp; (IGNPAR || !INPCK)``</div><div class='del'>- *</div><div class='del'>- *	That is, if there is no reason for the driver to</div><div class='del'>- *	send notifications of parity and break characters up to the line</div><div class='del'>- *	driver, it won't do so.  This allows the line driver to optimize for</div><div class='del'>- *	this case if this flag is set.  (Note that there is also a promise, if</div><div class='del'>- *	the above case is true, not to signal overruns, either.)</div><div class='del'>- *</div><div class='del'>- * TTY_DRIVER_DYNAMIC_DEV</div><div class='del'>- *	The individual tty devices need to be registered with a call to</div><div class='del'>- *	tty_register_device() when the device is found in the system and</div><div class='del'>- *	unregistered with a call to tty_unregister_device() so the devices will</div><div class='del'>- *	be show up properly in sysfs.  If not set, all &amp;tty_driver.num entries</div><div class='del'>- *	will be created by the tty core in sysfs when tty_register_driver() is</div><div class='del'>- *	called.  This is to be used by drivers that have tty devices that can</div><div class='del'>- *	appear and disappear while the main tty driver is registered with the</div><div class='del'>- *	tty core.</div><div class='del'>- *</div><div class='del'>- * TTY_DRIVER_DEVPTS_MEM</div><div class='del'>- *	Don't use the standard arrays (&amp;tty_driver.ttys and</div><div class='del'>- *	&amp;tty_driver.termios), instead use dynamic memory keyed through the</div><div class='del'>- *	devpts filesystem. This is only applicable to the PTY driver.</div><div class='del'>- *</div><div class='del'>- * TTY_DRIVER_HARDWARE_BREAK</div><div class='del'>- *	Hardware handles break signals. Pass the requested timeout to the</div><div class='del'>- *	&amp;tty_operations.break_ctl instead of using a simple on/off interface.</div><div class='del'>- *</div><div class='del'>- * TTY_DRIVER_DYNAMIC_ALLOC</div><div class='del'>- *	Do not allocate structures which are needed per line for this driver</div><div class='del'>- *	(&amp;tty_driver.ports) as it would waste memory. The driver will take</div><div class='del'>- *	care. This is only applicable to the PTY driver.</div><div class='del'>- *</div><div class='del'>- * TTY_DRIVER_UNNUMBERED_NODE</div><div class='del'>- *	Do not create numbered ``/dev`` nodes. For example, create</div><div class='del'>- *	``/dev/ttyprintk`` and not ``/dev/ttyprintk0``. Applicable only when a</div><div class='del'>- *	driver for a single tty device is being allocated.</div><div class='del'>- */</div><div class='del'>-#define TTY_DRIVER_INSTALLED		0x0001</div><div class='del'>-#define TTY_DRIVER_RESET_TERMIOS	0x0002</div><div class='del'>-#define TTY_DRIVER_REAL_RAW		0x0004</div><div class='del'>-#define TTY_DRIVER_DYNAMIC_DEV		0x0008</div><div class='del'>-#define TTY_DRIVER_DEVPTS_MEM		0x0010</div><div class='del'>-#define TTY_DRIVER_HARDWARE_BREAK	0x0020</div><div class='del'>-#define TTY_DRIVER_DYNAMIC_ALLOC	0x0040</div><div class='del'>-#define TTY_DRIVER_UNNUMBERED_NODE	0x0080</div><div class='del'>-</div><div class='del'>-/* tty driver types */</div><div class='del'>-#define TTY_DRIVER_TYPE_SYSTEM		0x0001</div><div class='del'>-#define TTY_DRIVER_TYPE_CONSOLE		0x0002</div><div class='del'>-#define TTY_DRIVER_TYPE_SERIAL		0x0003</div><div class='del'>-#define TTY_DRIVER_TYPE_PTY		0x0004</div><div class='del'>-#define TTY_DRIVER_TYPE_SCC		0x0005	/* scc driver */</div><div class='del'>-#define TTY_DRIVER_TYPE_SYSCONS		0x0006</div><div class='del'>-</div><div class='del'>-/* system subtypes (magic, used by tty_io.c) */</div><div class='del'>-#define SYSTEM_TYPE_TTY			0x0001</div><div class='del'>-#define SYSTEM_TYPE_CONSOLE		0x0002</div><div class='del'>-#define SYSTEM_TYPE_SYSCONS		0x0003</div><div class='del'>-#define SYSTEM_TYPE_SYSPTMX		0x0004</div><div class='del'>-</div><div class='del'>-/* pty subtypes (magic, used by tty_io.c) */</div><div class='del'>-#define PTY_TYPE_MASTER			0x0001</div><div class='del'>-#define PTY_TYPE_SLAVE			0x0002</div><div class='del'>-</div><div class='del'>-/* serial subtype definitions */</div><div class='del'>-#define SERIAL_TYPE_NORMAL	1</div><div class='del'>-</div><div class='ctx'> int tty_register_driver(struct tty_driver *driver);</div><div class='ctx'> void tty_unregister_driver(struct tty_driver *driver);</div><div class='ctx'> struct device *tty_register_device(struct tty_driver *driver, unsigned index,</div><div class='head'>diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h<br/>index af01e89074b2..c5cccc3fc1e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tty_ldisc.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tty_ldisc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tty_ldisc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tty_ldisc.h</a></div><div class='hunk'>@@ -39,7 +39,6 @@ do {								\</div><div class='ctx'> int ldsem_down_read(struct ld_semaphore *sem, long timeout);</div><div class='ctx'> int ldsem_down_read_trylock(struct ld_semaphore *sem);</div><div class='ctx'> int ldsem_down_write(struct ld_semaphore *sem, long timeout);</div><div class='del'>-int ldsem_down_write_trylock(struct ld_semaphore *sem);</div><div class='ctx'> void ldsem_up_read(struct ld_semaphore *sem);</div><div class='ctx'> void ldsem_up_write(struct ld_semaphore *sem);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/tty_port.h b/include/linux/tty_port.h<br/>index 1b861f2100b6..660c254f1efe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/tty_port.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/tty_port.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/tty_port.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/tty_port.h</a></div><div class='hunk'>@@ -147,9 +147,6 @@ struct device *tty_port_register_device_attr(struct tty_port *port,</div><div class='ctx'> 		struct tty_driver *driver, unsigned index,</div><div class='ctx'> 		struct device *device, void *drvdata,</div><div class='ctx'> 		const struct attribute_group **attr_grp);</div><div class='del'>-struct device *tty_port_register_device_serdev(struct tty_port *port,</div><div class='del'>-		struct tty_driver *driver, unsigned index,</div><div class='del'>-		struct device *host, struct device *parent);</div><div class='ctx'> struct device *tty_port_register_device_attr_serdev(struct tty_port *port,</div><div class='ctx'> 		struct tty_driver *driver, unsigned index,</div><div class='ctx'> 		struct device *host, struct device *parent, void *drvdata,</div><div class='hunk'>@@ -235,7 +232,7 @@ bool tty_port_carrier_raised(struct tty_port *port);</div><div class='ctx'> void tty_port_raise_dtr_rts(struct tty_port *port);</div><div class='ctx'> void tty_port_lower_dtr_rts(struct tty_port *port);</div><div class='ctx'> void tty_port_hangup(struct tty_port *port);</div><div class='del'>-void tty_port_tty_hangup(struct tty_port *port, bool check_clocal);</div><div class='add'>+void __tty_port_tty_hangup(struct tty_port *port, bool check_clocal, bool async);</div><div class='ctx'> void tty_port_tty_wakeup(struct tty_port *port);</div><div class='ctx'> int tty_port_block_til_ready(struct tty_port *port, struct tty_struct *tty,</div><div class='ctx'> 		struct file *filp);</div><div class='hunk'>@@ -254,4 +251,37 @@ static inline int tty_port_users(struct tty_port *port)</div><div class='ctx'> 	return port-&gt;count + port-&gt;blocked_open;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * tty_port_tty_hangup - helper to hang up a tty asynchronously</div><div class='add'>+ * @port: tty port</div><div class='add'>+ * @check_clocal: hang only ttys with %CLOCAL unset?</div><div class='add'>+ */</div><div class='add'>+static inline void tty_port_tty_hangup(struct tty_port *port, bool check_clocal)</div><div class='add'>+{</div><div class='add'>+	__tty_port_tty_hangup(port, check_clocal, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tty_port_tty_vhangup - helper to hang up a tty synchronously</div><div class='add'>+ * @port: tty port</div><div class='add'>+ */</div><div class='add'>+static inline void tty_port_tty_vhangup(struct tty_port *port)</div><div class='add'>+{</div><div class='add'>+	__tty_port_tty_hangup(port, false, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TTY</div><div class='add'>+void tty_kref_put(struct tty_struct *tty);</div><div class='add'>+__DEFINE_CLASS_IS_CONDITIONAL(tty_port_tty, true);</div><div class='add'>+__DEFINE_UNLOCK_GUARD(tty_port_tty, struct tty_struct, tty_kref_put(_T-&gt;lock));</div><div class='add'>+static inline class_tty_port_tty_t class_tty_port_tty_constructor(struct tty_port *tport)</div><div class='add'>+{</div><div class='add'>+	class_tty_port_tty_t _t = {</div><div class='add'>+		.lock = tty_port_tty_get(tport),</div><div class='add'>+	};</div><div class='add'>+	return _t;</div><div class='add'>+}</div><div class='add'>+#define scoped_tty()	((struct tty_struct *)(__guard_ptr(tty_port_tty)(&amp;scope)))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/turris-omnia-mcu-interface.h b/include/linux/turris-omnia-mcu-interface.h<br/>new file mode 100644<br/>index 000000000000..38b45ab00053<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/turris-omnia-mcu-interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/turris-omnia-mcu-interface.h</a></div><div class='hunk'>@@ -0,0 +1,397 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * CZ.NIC's Turris Omnia MCU I2C interface commands definitions</div><div class='add'>+ *</div><div class='add'>+ * 2024 by Marek Behún &lt;kabel@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __TURRIS_OMNIA_MCU_INTERFACE_H</div><div class='add'>+#define __TURRIS_OMNIA_MCU_INTERFACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+enum omnia_commands_e {</div><div class='add'>+	OMNIA_CMD_GET_STATUS_WORD		= 0x01, /* slave sends status word back */</div><div class='add'>+	OMNIA_CMD_GENERAL_CONTROL		= 0x02,</div><div class='add'>+	OMNIA_CMD_LED_MODE			= 0x03, /* default/user */</div><div class='add'>+	OMNIA_CMD_LED_STATE			= 0x04, /* LED on/off */</div><div class='add'>+	OMNIA_CMD_LED_COLOR			= 0x05, /* LED number + RED + GREEN + BLUE */</div><div class='add'>+	OMNIA_CMD_USER_VOLTAGE			= 0x06,</div><div class='add'>+	OMNIA_CMD_SET_BRIGHTNESS		= 0x07,</div><div class='add'>+	OMNIA_CMD_GET_BRIGHTNESS		= 0x08,</div><div class='add'>+	OMNIA_CMD_GET_RESET			= 0x09,</div><div class='add'>+	OMNIA_CMD_GET_FW_VERSION_APP		= 0x0A, /* 20B git hash number */</div><div class='add'>+	OMNIA_CMD_SET_WATCHDOG_STATE		= 0x0B, /* 0 - disable</div><div class='add'>+							 * 1 - enable / ping</div><div class='add'>+							 * after boot watchdog is started</div><div class='add'>+							 * with 2 minutes timeout</div><div class='add'>+							 */</div><div class='add'>+</div><div class='add'>+	/* OMNIA_CMD_WATCHDOG_STATUS		= 0x0C, not implemented anymore */</div><div class='add'>+</div><div class='add'>+	OMNIA_CMD_GET_WATCHDOG_STATE		= 0x0D,</div><div class='add'>+	OMNIA_CMD_GET_FW_VERSION_BOOT		= 0x0E, /* 20B Git hash number */</div><div class='add'>+	OMNIA_CMD_GET_FW_CHECKSUM		= 0x0F, /* 4B length, 4B checksum */</div><div class='add'>+</div><div class='add'>+	/* available if FEATURES_SUPPORTED bit set in status word */</div><div class='add'>+	OMNIA_CMD_GET_FEATURES			= 0x10,</div><div class='add'>+</div><div class='add'>+	/* available if EXT_CMD bit set in features */</div><div class='add'>+	OMNIA_CMD_GET_EXT_STATUS_DWORD		= 0x11,</div><div class='add'>+	OMNIA_CMD_EXT_CONTROL			= 0x12,</div><div class='add'>+	OMNIA_CMD_GET_EXT_CONTROL_STATUS	= 0x13,</div><div class='add'>+</div><div class='add'>+	/* available if NEW_INT_API bit set in features */</div><div class='add'>+	OMNIA_CMD_GET_INT_AND_CLEAR		= 0x14,</div><div class='add'>+	OMNIA_CMD_GET_INT_MASK			= 0x15,</div><div class='add'>+	OMNIA_CMD_SET_INT_MASK			= 0x16,</div><div class='add'>+</div><div class='add'>+	/* available if FLASHING bit set in features */</div><div class='add'>+	OMNIA_CMD_FLASH				= 0x19,</div><div class='add'>+</div><div class='add'>+	/* available if WDT_PING bit set in features */</div><div class='add'>+	OMNIA_CMD_SET_WDT_TIMEOUT		= 0x20,</div><div class='add'>+	OMNIA_CMD_GET_WDT_TIMELEFT		= 0x21,</div><div class='add'>+</div><div class='add'>+	/* available if POWEROFF_WAKEUP bit set in features */</div><div class='add'>+	OMNIA_CMD_SET_WAKEUP			= 0x22,</div><div class='add'>+	OMNIA_CMD_GET_UPTIME_AND_WAKEUP		= 0x23,</div><div class='add'>+	OMNIA_CMD_POWER_OFF			= 0x24,</div><div class='add'>+</div><div class='add'>+	/* available if USB_OVC_PROT_SETTING bit set in features */</div><div class='add'>+	OMNIA_CMD_SET_USB_OVC_PROT		= 0x25,</div><div class='add'>+	OMNIA_CMD_GET_USB_OVC_PROT		= 0x26,</div><div class='add'>+</div><div class='add'>+	/* available if TRNG bit set in features */</div><div class='add'>+	OMNIA_CMD_TRNG_COLLECT_ENTROPY		= 0x28,</div><div class='add'>+</div><div class='add'>+	/* available if CRYPTO bit set in features */</div><div class='add'>+	OMNIA_CMD_CRYPTO_GET_PUBLIC_KEY		= 0x29,</div><div class='add'>+	OMNIA_CMD_CRYPTO_SIGN_MESSAGE		= 0x2A,</div><div class='add'>+	OMNIA_CMD_CRYPTO_COLLECT_SIGNATURE	= 0x2B,</div><div class='add'>+</div><div class='add'>+	/* available if BOARD_INFO it set in features */</div><div class='add'>+	OMNIA_CMD_BOARD_INFO_GET		= 0x2C,</div><div class='add'>+	OMNIA_CMD_BOARD_INFO_BURN		= 0x2D,</div><div class='add'>+</div><div class='add'>+	/* available only at address 0x2b (LED-controller) */</div><div class='add'>+	/* available only if LED_GAMMA_CORRECTION bit set in features */</div><div class='add'>+	OMNIA_CMD_SET_GAMMA_CORRECTION		= 0x30,</div><div class='add'>+	OMNIA_CMD_GET_GAMMA_CORRECTION		= 0x31,</div><div class='add'>+</div><div class='add'>+	/* available only at address 0x2b (LED-controller) */</div><div class='add'>+	/* available only if PER_LED_CORRECTION bit set in features */</div><div class='add'>+	/* available only if FROM_BIT_16_INVALID bit NOT set in features */</div><div class='add'>+	OMNIA_CMD_SET_LED_CORRECTIONS		= 0x32,</div><div class='add'>+	OMNIA_CMD_GET_LED_CORRECTIONS		= 0x33,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_flashing_commands_e {</div><div class='add'>+	OMNIA_FLASH_CMD_UNLOCK		= 0x01,</div><div class='add'>+	OMNIA_FLASH_CMD_SIZE_AND_CSUM	= 0x02,</div><div class='add'>+	OMNIA_FLASH_CMD_PROGRAM		= 0x03,</div><div class='add'>+	OMNIA_FLASH_CMD_RESET		= 0x04,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_sts_word_e {</div><div class='add'>+	OMNIA_STS_MCU_TYPE_MASK			= GENMASK(1, 0),</div><div class='add'>+	OMNIA_STS_MCU_TYPE_STM32		= FIELD_PREP_CONST(OMNIA_STS_MCU_TYPE_MASK, 0),</div><div class='add'>+	OMNIA_STS_MCU_TYPE_GD32			= FIELD_PREP_CONST(OMNIA_STS_MCU_TYPE_MASK, 1),</div><div class='add'>+	OMNIA_STS_MCU_TYPE_MKL			= FIELD_PREP_CONST(OMNIA_STS_MCU_TYPE_MASK, 2),</div><div class='add'>+	OMNIA_STS_FEATURES_SUPPORTED		= BIT(2),</div><div class='add'>+	OMNIA_STS_USER_REGULATOR_NOT_SUPPORTED	= BIT(3),</div><div class='add'>+	OMNIA_STS_CARD_DET			= BIT(4),</div><div class='add'>+	OMNIA_STS_MSATA_IND			= BIT(5),</div><div class='add'>+	OMNIA_STS_USB30_OVC			= BIT(6),</div><div class='add'>+	OMNIA_STS_USB31_OVC			= BIT(7),</div><div class='add'>+	OMNIA_STS_USB30_PWRON			= BIT(8),</div><div class='add'>+	OMNIA_STS_USB31_PWRON			= BIT(9),</div><div class='add'>+	OMNIA_STS_ENABLE_4V5			= BIT(10),</div><div class='add'>+	OMNIA_STS_BUTTON_MODE			= BIT(11),</div><div class='add'>+	OMNIA_STS_BUTTON_PRESSED		= BIT(12),</div><div class='add'>+	OMNIA_STS_BUTTON_COUNTER_MASK		= GENMASK(15, 13),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_ctl_byte_e {</div><div class='add'>+	OMNIA_CTL_LIGHT_RST	= BIT(0),</div><div class='add'>+	OMNIA_CTL_HARD_RST	= BIT(1),</div><div class='add'>+	/* BIT(2) is currently reserved */</div><div class='add'>+	OMNIA_CTL_USB30_PWRON	= BIT(3),</div><div class='add'>+	OMNIA_CTL_USB31_PWRON	= BIT(4),</div><div class='add'>+	OMNIA_CTL_ENABLE_4V5	= BIT(5),</div><div class='add'>+	OMNIA_CTL_BUTTON_MODE	= BIT(6),</div><div class='add'>+	OMNIA_CTL_BOOTLOADER	= BIT(7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_features_e {</div><div class='add'>+	OMNIA_FEAT_PERIPH_MCU		= BIT(0),</div><div class='add'>+	OMNIA_FEAT_EXT_CMDS		= BIT(1),</div><div class='add'>+	OMNIA_FEAT_WDT_PING		= BIT(2),</div><div class='add'>+	OMNIA_FEAT_LED_STATE_EXT_MASK	= GENMASK(4, 3),</div><div class='add'>+	OMNIA_FEAT_LED_STATE_EXT	= FIELD_PREP_CONST(OMNIA_FEAT_LED_STATE_EXT_MASK, 1),</div><div class='add'>+	OMNIA_FEAT_LED_STATE_EXT_V32	= FIELD_PREP_CONST(OMNIA_FEAT_LED_STATE_EXT_MASK, 2),</div><div class='add'>+	OMNIA_FEAT_LED_GAMMA_CORRECTION	= BIT(5),</div><div class='add'>+	OMNIA_FEAT_NEW_INT_API		= BIT(6),</div><div class='add'>+	OMNIA_FEAT_BOOTLOADER		= BIT(7),</div><div class='add'>+	OMNIA_FEAT_FLASHING		= BIT(8),</div><div class='add'>+	OMNIA_FEAT_NEW_MESSAGE_API	= BIT(9),</div><div class='add'>+	OMNIA_FEAT_BRIGHTNESS_INT	= BIT(10),</div><div class='add'>+	OMNIA_FEAT_POWEROFF_WAKEUP	= BIT(11),</div><div class='add'>+	OMNIA_FEAT_CAN_OLD_MESSAGE_API	= BIT(12),</div><div class='add'>+	OMNIA_FEAT_TRNG			= BIT(13),</div><div class='add'>+	OMNIA_FEAT_CRYPTO		= BIT(14),</div><div class='add'>+	OMNIA_FEAT_BOARD_INFO		= BIT(15),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Orginally the features command replied only 16 bits. If more were</div><div class='add'>+	 * read, either the I2C transaction failed or 0xff bytes were sent.</div><div class='add'>+	 * Therefore to consider bits 16 - 31 valid, one bit (20) was reserved</div><div class='add'>+	 * to be zero.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Bits 16 - 19 correspond to bits 0 - 3 of status word */</div><div class='add'>+	OMNIA_FEAT_MCU_TYPE_MASK		= GENMASK(17, 16),</div><div class='add'>+	OMNIA_FEAT_MCU_TYPE_STM32		= FIELD_PREP_CONST(OMNIA_FEAT_MCU_TYPE_MASK, 0),</div><div class='add'>+	OMNIA_FEAT_MCU_TYPE_GD32		= FIELD_PREP_CONST(OMNIA_FEAT_MCU_TYPE_MASK, 1),</div><div class='add'>+	OMNIA_FEAT_MCU_TYPE_MKL			= FIELD_PREP_CONST(OMNIA_FEAT_MCU_TYPE_MASK, 2),</div><div class='add'>+	OMNIA_FEAT_FEATURES_SUPPORTED		= BIT(18),</div><div class='add'>+	OMNIA_FEAT_USER_REGULATOR_NOT_SUPPORTED	= BIT(19),</div><div class='add'>+</div><div class='add'>+	/* must not be set */</div><div class='add'>+	OMNIA_FEAT_FROM_BIT_16_INVALID	= BIT(20),</div><div class='add'>+</div><div class='add'>+	OMNIA_FEAT_PER_LED_CORRECTION	= BIT(21),</div><div class='add'>+	OMNIA_FEAT_USB_OVC_PROT_SETTING	= BIT(22),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_ext_sts_dword_e {</div><div class='add'>+	OMNIA_EXT_STS_SFP_nDET		= BIT(0),</div><div class='add'>+	OMNIA_EXT_STS_LED_STATES_MASK	= GENMASK(31, 12),</div><div class='add'>+	OMNIA_EXT_STS_WLAN0_MSATA_LED	= BIT(12),</div><div class='add'>+	OMNIA_EXT_STS_WLAN1_LED		= BIT(13),</div><div class='add'>+	OMNIA_EXT_STS_WLAN2_LED		= BIT(14),</div><div class='add'>+	OMNIA_EXT_STS_WPAN0_LED		= BIT(15),</div><div class='add'>+	OMNIA_EXT_STS_WPAN1_LED		= BIT(16),</div><div class='add'>+	OMNIA_EXT_STS_WPAN2_LED		= BIT(17),</div><div class='add'>+	OMNIA_EXT_STS_WAN_LED0		= BIT(18),</div><div class='add'>+	OMNIA_EXT_STS_WAN_LED1		= BIT(19),</div><div class='add'>+	OMNIA_EXT_STS_LAN0_LED0		= BIT(20),</div><div class='add'>+	OMNIA_EXT_STS_LAN0_LED1		= BIT(21),</div><div class='add'>+	OMNIA_EXT_STS_LAN1_LED0		= BIT(22),</div><div class='add'>+	OMNIA_EXT_STS_LAN1_LED1		= BIT(23),</div><div class='add'>+	OMNIA_EXT_STS_LAN2_LED0		= BIT(24),</div><div class='add'>+	OMNIA_EXT_STS_LAN2_LED1		= BIT(25),</div><div class='add'>+	OMNIA_EXT_STS_LAN3_LED0		= BIT(26),</div><div class='add'>+	OMNIA_EXT_STS_LAN3_LED1		= BIT(27),</div><div class='add'>+	OMNIA_EXT_STS_LAN4_LED0		= BIT(28),</div><div class='add'>+	OMNIA_EXT_STS_LAN4_LED1		= BIT(29),</div><div class='add'>+	OMNIA_EXT_STS_LAN5_LED0		= BIT(30),</div><div class='add'>+	OMNIA_EXT_STS_LAN5_LED1		= BIT(31),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_ext_ctl_e {</div><div class='add'>+	OMNIA_EXT_CTL_nRES_MMC		= BIT(0),</div><div class='add'>+	OMNIA_EXT_CTL_nRES_LAN		= BIT(1),</div><div class='add'>+	OMNIA_EXT_CTL_nRES_PHY		= BIT(2),</div><div class='add'>+	OMNIA_EXT_CTL_nPERST0		= BIT(3),</div><div class='add'>+	OMNIA_EXT_CTL_nPERST1		= BIT(4),</div><div class='add'>+	OMNIA_EXT_CTL_nPERST2		= BIT(5),</div><div class='add'>+	OMNIA_EXT_CTL_PHY_SFP		= BIT(6),</div><div class='add'>+	OMNIA_EXT_CTL_PHY_SFP_AUTO	= BIT(7),</div><div class='add'>+	OMNIA_EXT_CTL_nVHV_CTRL		= BIT(8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_int_e {</div><div class='add'>+	OMNIA_INT_CARD_DET		= BIT(0),</div><div class='add'>+	OMNIA_INT_MSATA_IND		= BIT(1),</div><div class='add'>+	OMNIA_INT_USB30_OVC		= BIT(2),</div><div class='add'>+	OMNIA_INT_USB31_OVC		= BIT(3),</div><div class='add'>+	OMNIA_INT_BUTTON_PRESSED	= BIT(4),</div><div class='add'>+	OMNIA_INT_SFP_nDET		= BIT(5),</div><div class='add'>+	OMNIA_INT_BRIGHTNESS_CHANGED	= BIT(6),</div><div class='add'>+	OMNIA_INT_TRNG			= BIT(7),</div><div class='add'>+	OMNIA_INT_MESSAGE_SIGNED	= BIT(8),</div><div class='add'>+</div><div class='add'>+	OMNIA_INT_LED_STATES_MASK	= GENMASK(31, 12),</div><div class='add'>+	OMNIA_INT_WLAN0_MSATA_LED	= BIT(12),</div><div class='add'>+	OMNIA_INT_WLAN1_LED		= BIT(13),</div><div class='add'>+	OMNIA_INT_WLAN2_LED		= BIT(14),</div><div class='add'>+	OMNIA_INT_WPAN0_LED		= BIT(15),</div><div class='add'>+	OMNIA_INT_WPAN1_LED		= BIT(16),</div><div class='add'>+	OMNIA_INT_WPAN2_LED		= BIT(17),</div><div class='add'>+	OMNIA_INT_WAN_LED0		= BIT(18),</div><div class='add'>+	OMNIA_INT_WAN_LED1		= BIT(19),</div><div class='add'>+	OMNIA_INT_LAN0_LED0		= BIT(20),</div><div class='add'>+	OMNIA_INT_LAN0_LED1		= BIT(21),</div><div class='add'>+	OMNIA_INT_LAN1_LED0		= BIT(22),</div><div class='add'>+	OMNIA_INT_LAN1_LED1		= BIT(23),</div><div class='add'>+	OMNIA_INT_LAN2_LED0		= BIT(24),</div><div class='add'>+	OMNIA_INT_LAN2_LED1		= BIT(25),</div><div class='add'>+	OMNIA_INT_LAN3_LED0		= BIT(26),</div><div class='add'>+	OMNIA_INT_LAN3_LED1		= BIT(27),</div><div class='add'>+	OMNIA_INT_LAN4_LED0		= BIT(28),</div><div class='add'>+	OMNIA_INT_LAN4_LED1		= BIT(29),</div><div class='add'>+	OMNIA_INT_LAN5_LED0		= BIT(30),</div><div class='add'>+	OMNIA_INT_LAN5_LED1		= BIT(31),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_cmd_led_mode_e {</div><div class='add'>+	OMNIA_CMD_LED_MODE_LED_MASK	= GENMASK(3, 0),</div><div class='add'>+	OMNIA_CMD_LED_MODE_USER		= BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OMNIA_CMD_LED_MODE_LED(_l)	FIELD_PREP(OMNIA_CMD_LED_MODE_LED_MASK, _l)</div><div class='add'>+</div><div class='add'>+enum omnia_cmd_led_state_e {</div><div class='add'>+	OMNIA_CMD_LED_STATE_LED_MASK	= GENMASK(3, 0),</div><div class='add'>+	OMNIA_CMD_LED_STATE_ON		= BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OMNIA_CMD_LED_STATE_LED(_l)	FIELD_PREP(OMNIA_CMD_LED_STATE_LED_MASK, _l)</div><div class='add'>+</div><div class='add'>+enum omnia_cmd_poweroff_e {</div><div class='add'>+	OMNIA_CMD_POWER_OFF_POWERON_BUTTON	= BIT(0),</div><div class='add'>+	OMNIA_CMD_POWER_OFF_MAGIC		= 0xdead,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum omnia_cmd_usb_ovc_prot_e {</div><div class='add'>+	OMNIA_CMD_xET_USB_OVC_PROT_PORT_MASK	= GENMASK(3, 0),</div><div class='add'>+	OMNIA_CMD_xET_USB_OVC_PROT_ENABLE	= BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Command execution functions */</div><div class='add'>+</div><div class='add'>+struct i2c_client;</div><div class='add'>+</div><div class='add'>+int omnia_cmd_write_read(const struct i2c_client *client,</div><div class='add'>+			 void *cmd, unsigned int cmd_len,</div><div class='add'>+			 void *reply, unsigned int reply_len);</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_write(const struct i2c_client *client, void *cmd,</div><div class='add'>+				  unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return omnia_cmd_write_read(client, cmd, len, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_write_u8(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				     u8 val)</div><div class='add'>+{</div><div class='add'>+	u8 buf[2] = { cmd, val };</div><div class='add'>+</div><div class='add'>+	return omnia_cmd_write(client, buf, sizeof(buf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_write_u16(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				      u16 val)</div><div class='add'>+{</div><div class='add'>+	u8 buf[3];</div><div class='add'>+</div><div class='add'>+	buf[0] = cmd;</div><div class='add'>+	put_unaligned_le16(val, &amp;buf[1]);</div><div class='add'>+</div><div class='add'>+	return omnia_cmd_write(client, buf, sizeof(buf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_write_u32(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				      u32 val)</div><div class='add'>+{</div><div class='add'>+	u8 buf[5];</div><div class='add'>+</div><div class='add'>+	buf[0] = cmd;</div><div class='add'>+	put_unaligned_le32(val, &amp;buf[1]);</div><div class='add'>+</div><div class='add'>+	return omnia_cmd_write(client, buf, sizeof(buf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_read(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				 void *reply, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return omnia_cmd_write_read(client, &amp;cmd, 1, reply, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+omnia_compute_reply_length(unsigned long mask, bool interleaved,</div><div class='add'>+			   unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	if (!mask)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ((__fls(mask) &gt;&gt; 3) &lt;&lt; interleaved) + 1 + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns 0 on success */</div><div class='add'>+static inline int omnia_cmd_read_bits(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				      unsigned long bits, unsigned long *dst)</div><div class='add'>+{</div><div class='add'>+	__le32 reply;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!bits) {</div><div class='add'>+		*dst = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = omnia_cmd_read(client, cmd, &amp;reply,</div><div class='add'>+			     omnia_compute_reply_length(bits, false, 0));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*dst = le32_to_cpu(reply) &amp; bits;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_read_bit(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				     unsigned long bit)</div><div class='add'>+{</div><div class='add'>+	unsigned long reply;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = omnia_cmd_read_bits(client, cmd, bit, &amp;reply);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return !!reply;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_read_u32(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				     u32 *dst)</div><div class='add'>+{</div><div class='add'>+	__le32 reply;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = omnia_cmd_read(client, cmd, &amp;reply, sizeof(reply));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*dst = le32_to_cpu(reply);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_read_u16(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				     u16 *dst)</div><div class='add'>+{</div><div class='add'>+	__le16 reply;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = omnia_cmd_read(client, cmd, &amp;reply, sizeof(reply));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*dst = le16_to_cpu(reply);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int omnia_cmd_read_u8(const struct i2c_client *client, u8 cmd,</div><div class='add'>+				    u8 *reply)</div><div class='add'>+{</div><div class='add'>+	return omnia_cmd_read(client, cmd, reply, sizeof(*reply));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __TURRIS_OMNIA_MCU_INTERFACE_H */</div><div class='head'>diff --git a/include/linux/turris-signing-key.h b/include/linux/turris-signing-key.h<br/>new file mode 100644<br/>index 000000000000..8a435b73c3a9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/turris-signing-key.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/turris-signing-key.h</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * 2025 by Marek Behún &lt;kabel@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __TURRIS_SIGNING_KEY_H</div><div class='add'>+#define __TURRIS_SIGNING_KEY_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/key.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct device;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KEYS</div><div class='add'>+struct turris_signing_key_subtype {</div><div class='add'>+	u16 key_size;</div><div class='add'>+	u8 data_size;</div><div class='add'>+	u8 sig_size;</div><div class='add'>+	u8 public_key_size;</div><div class='add'>+	const char *hash_algo;</div><div class='add'>+	const void *(*get_public_key)(const struct key *key);</div><div class='add'>+	int (*sign)(const struct key *key, const void *msg, void *signature);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct device *turris_signing_key_get_dev(const struct key *key)</div><div class='add'>+{</div><div class='add'>+	return key-&gt;payload.data[1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+devm_turris_signing_key_create(struct device *dev, const struct turris_signing_key_subtype *subtype,</div><div class='add'>+			       const char *desc);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __TURRIS_SIGNING_KEY_H */</div><div class='head'>diff --git a/include/linux/types.h b/include/linux/types.h<br/>index 2bc8766ba20c..d4437e9c452c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/types.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/types.h</a></div><div class='hunk'>@@ -43,13 +43,14 @@ typedef unsigned long		uintptr_t;</div><div class='ctx'> typedef long			intptr_t;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_UID16</div><div class='del'>-/* This is defined by include/asm-{arch}/posix_types.h */</div><div class='add'>+/* This is defined by arch/{arch}/include/asm/posix_types.h */</div><div class='ctx'> typedef __kernel_old_uid_t	old_uid_t;</div><div class='ctx'> typedef __kernel_old_gid_t	old_gid_t;</div><div class='ctx'> #endif /* CONFIG_UID16 */</div><div class='ctx'> </div><div class='ctx'> #if defined(__GNUC__)</div><div class='ctx'> typedef __kernel_loff_t		loff_t;</div><div class='add'>+typedef __kernel_uoff_t		uoff_t;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -92,6 +93,7 @@ typedef unsigned char		unchar;</div><div class='ctx'> typedef unsigned short		ushort;</div><div class='ctx'> typedef unsigned int		uint;</div><div class='ctx'> typedef unsigned long		ulong;</div><div class='add'>+typedef unsigned long long	ullong;</div><div class='ctx'> </div><div class='ctx'> #ifndef __BIT_TYPES_DEFINED__</div><div class='ctx'> #define __BIT_TYPES_DEFINED__</div><div class='hunk'>@@ -115,8 +117,9 @@ typedef u64			u_int64_t;</div><div class='ctx'> typedef s64			int64_t;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* this is a special 64bit data type that is 8-byte aligned */</div><div class='add'>+/* These are the special 64-bit data types that are 8-byte aligned */</div><div class='ctx'> #define aligned_u64		__aligned_u64</div><div class='add'>+#define aligned_s64		__aligned_s64</div><div class='ctx'> #define aligned_be64		__aligned_be64</div><div class='ctx'> #define aligned_le64		__aligned_le64</div><div class='ctx'> </div><div class='hunk'>@@ -134,6 +137,10 @@ typedef s64	ktime_t;</div><div class='ctx'> typedef u64 sector_t;</div><div class='ctx'> typedef u64 blkcnt_t;</div><div class='ctx'> </div><div class='add'>+/* generic data direction definitions */</div><div class='add'>+#define READ			0</div><div class='add'>+#define WRITE			1</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The type of an index into the pagecache.</div><div class='ctx'>  */</div><div class='hunk'>@@ -247,5 +254,17 @@ typedef void (*swap_func_t)(void *a, void *b, int size);</div><div class='ctx'> typedef int (*cmp_r_func_t)(const void *a, const void *b, const void *priv);</div><div class='ctx'> typedef int (*cmp_func_t)(const void *a, const void *b);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * rcuwait provides a way of blocking and waking up a single</div><div class='add'>+ * task in an rcu-safe manner.</div><div class='add'>+ *</div><div class='add'>+ * The only time @task is non-nil is when a user is blocked (or</div><div class='add'>+ * checking if it needs to) on a condition, and reset as soon as we</div><div class='add'>+ * know that the condition has succeeded and are awoken.</div><div class='add'>+ */</div><div class='add'>+struct rcuwait {</div><div class='add'>+	struct task_struct __rcu *task;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /*  __ASSEMBLY__ */</div><div class='ctx'> #endif /* _LINUX_TYPES_H */</div><div class='head'>diff --git a/include/linux/u64_stats_sync.h b/include/linux/u64_stats_sync.h<br/>index ffe48e69b3f3..457879938fc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/u64_stats_sync.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/u64_stats_sync.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/u64_stats_sync.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/u64_stats_sync.h</a></div><div class='hunk'>@@ -135,10 +135,11 @@ static inline void u64_stats_inc(u64_stats_t *p)</div><div class='ctx'> 	p-&gt;v++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void u64_stats_init(struct u64_stats_sync *syncp)</div><div class='del'>-{</div><div class='del'>-	seqcount_init(&amp;syncp-&gt;seq);</div><div class='del'>-}</div><div class='add'>+#define u64_stats_init(syncp)				\</div><div class='add'>+	do {						\</div><div class='add'>+		struct u64_stats_sync *__s = (syncp);	\</div><div class='add'>+		seqcount_init(&amp;__s-&gt;seq);		\</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> static inline void __u64_stats_update_begin(struct u64_stats_sync *syncp)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h<br/>index 3064314f4832..1f3804245c06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/uaccess.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uaccess.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/uaccess.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/uaccess.h</a></div><div class='hunk'>@@ -2,11 +2,13 @@</div><div class='ctx'> #ifndef __LINUX_UACCESS_H__</div><div class='ctx'> #define __LINUX_UACCESS_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/fault-inject-usercopy.h&gt;</div><div class='ctx'> #include &lt;linux/instrumented.h&gt;</div><div class='ctx'> #include &lt;linux/minmax.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/thread_info.h&gt;</div><div class='add'>+#include &lt;linux/ucopysize.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +34,22 @@</div><div class='ctx'> })</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef masked_user_access_begin</div><div class='add'>+ #define can_do_masked_user_access() 1</div><div class='add'>+# ifndef masked_user_write_access_begin</div><div class='add'>+#  define masked_user_write_access_begin masked_user_access_begin</div><div class='add'>+# endif</div><div class='add'>+# ifndef masked_user_read_access_begin</div><div class='add'>+#  define masked_user_read_access_begin masked_user_access_begin</div><div class='add'>+#endif</div><div class='add'>+#else</div><div class='add'>+ #define can_do_masked_user_access() 0</div><div class='add'>+ #define masked_user_access_begin(src) NULL</div><div class='add'>+ #define masked_user_read_access_begin(src) NULL</div><div class='add'>+ #define masked_user_write_access_begin(src) NULL</div><div class='add'>+ #define mask_user_address(src) (src)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Architectures should provide two primitives (raw_copy_{to,from}_user())</div><div class='ctx'>  * and get rid of their private instances of copy_{to,from}_user() and</div><div class='hunk'>@@ -138,29 +156,47 @@ __copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='ctx'> 	return raw_copy_to_user(to, from, n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef INLINE_COPY_FROM_USER</div><div class='add'>+/*</div><div class='add'>+ * Architectures that #define INLINE_COPY_TO_USER use this function</div><div class='add'>+ * directly in the normal copy_to/from_user(), the other ones go</div><div class='add'>+ * through an extern _copy_to/from_user(), which expands the same code</div><div class='add'>+ * here.</div><div class='add'>+ */</div><div class='ctx'> static inline __must_check unsigned long</div><div class='del'>-_copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='add'>+_inline_copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long res = n;</div><div class='ctx'> 	might_fault();</div><div class='del'>-	if (!should_fail_usercopy() &amp;&amp; likely(access_ok(from, n))) {</div><div class='del'>-		instrument_copy_from_user_before(to, from, n);</div><div class='del'>-		res = raw_copy_from_user(to, from, n);</div><div class='del'>-		instrument_copy_from_user_after(to, from, n, res);</div><div class='add'>+	if (should_fail_usercopy())</div><div class='add'>+		goto fail;</div><div class='add'>+	if (can_do_masked_user_access())</div><div class='add'>+		from = mask_user_address(from);</div><div class='add'>+	else {</div><div class='add'>+		if (!access_ok(from, n))</div><div class='add'>+			goto fail;</div><div class='add'>+		/*</div><div class='add'>+		 * Ensure that bad access_ok() speculation will not</div><div class='add'>+		 * lead to nasty side effects *after* the copy is</div><div class='add'>+		 * finished:</div><div class='add'>+		 */</div><div class='add'>+		barrier_nospec();</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(res))</div><div class='del'>-		memset(to + (n - res), 0, res);</div><div class='add'>+	instrument_copy_from_user_before(to, from, n);</div><div class='add'>+	res = raw_copy_from_user(to, from, n);</div><div class='add'>+	instrument_copy_from_user_after(to, from, n, res);</div><div class='add'>+	if (likely(!res))</div><div class='add'>+		return 0;</div><div class='add'>+fail:</div><div class='add'>+	memset(to + (n - res), 0, res);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='add'>+#ifndef INLINE_COPY_FROM_USER</div><div class='ctx'> extern __must_check unsigned long</div><div class='ctx'> _copy_from_user(void *, const void __user *, unsigned long);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef INLINE_COPY_TO_USER</div><div class='ctx'> static inline __must_check unsigned long</div><div class='del'>-_copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='add'>+_inline_copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	might_fault();</div><div class='ctx'> 	if (should_fail_usercopy())</div><div class='hunk'>@@ -171,7 +207,7 @@ _copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='ctx'> 	}</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='add'>+#ifndef INLINE_COPY_TO_USER</div><div class='ctx'> extern __must_check unsigned long</div><div class='ctx'> _copy_to_user(void __user *, const void *, unsigned long);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -179,17 +215,26 @@ _copy_to_user(void __user *, const void *, unsigned long);</div><div class='ctx'> static __always_inline unsigned long __must_check</div><div class='ctx'> copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> {</div><div class='del'>-	if (check_copy_size(to, n, false))</div><div class='del'>-		n = _copy_from_user(to, from, n);</div><div class='del'>-	return n;</div><div class='add'>+	if (!check_copy_size(to, n, false))</div><div class='add'>+		return n;</div><div class='add'>+#ifdef INLINE_COPY_FROM_USER</div><div class='add'>+	return _inline_copy_from_user(to, from, n);</div><div class='add'>+#else</div><div class='add'>+	return _copy_from_user(to, from, n);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline unsigned long __must_check</div><div class='ctx'> copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='ctx'> {</div><div class='del'>-	if (check_copy_size(from, n, true))</div><div class='del'>-		n = _copy_to_user(to, from, n);</div><div class='del'>-	return n;</div><div class='add'>+	if (!check_copy_size(from, n, true))</div><div class='add'>+		return n;</div><div class='add'>+</div><div class='add'>+#ifdef INLINE_COPY_TO_USER</div><div class='add'>+	return _inline_copy_to_user(to, from, n);</div><div class='add'>+#else</div><div class='add'>+	return _copy_to_user(to, from, n);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef copy_mc_to_kernel</div><div class='hunk'>@@ -262,6 +307,8 @@ static inline bool pagefault_disabled(void)</div><div class='ctx'>  */</div><div class='ctx'> #define faulthandler_disabled() (pagefault_disabled() || in_atomic())</div><div class='ctx'> </div><div class='add'>+DEFINE_LOCK_GUARD_0(pagefault, pagefault_disable(), pagefault_enable())</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_ARCH_HAS_SUBPAGE_FAULTS</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -369,6 +416,103 @@ copy_struct_from_user(void *dst, size_t ksize, const void __user *src,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * copy_struct_to_user: copy a struct to userspace</div><div class='add'>+ * @dst:   Destination address, in userspace. This buffer must be @ksize</div><div class='add'>+ *         bytes long.</div><div class='add'>+ * @usize: (Alleged) size of @dst struct.</div><div class='add'>+ * @src:   Source address, in kernel space.</div><div class='add'>+ * @ksize: Size of @src struct.</div><div class='add'>+ * @ignored_trailing: Set to %true if there was a non-zero byte in @src that</div><div class='add'>+ * userspace cannot see because they are using an smaller struct.</div><div class='add'>+ *</div><div class='add'>+ * Copies a struct from kernel space to userspace, in a way that guarantees</div><div class='add'>+ * backwards-compatibility for struct syscall arguments (as long as future</div><div class='add'>+ * struct extensions are made such that all new fields are *appended* to the</div><div class='add'>+ * old struct, and zeroed-out new fields have the same meaning as the old</div><div class='add'>+ * struct).</div><div class='add'>+ *</div><div class='add'>+ * Some syscalls may wish to make sure that userspace knows about everything in</div><div class='add'>+ * the struct, and if there is a non-zero value that userspce doesn't know</div><div class='add'>+ * about, they want to return an error (such as -EMSGSIZE) or have some other</div><div class='add'>+ * fallback (such as adding a "you're missing some information" flag). If</div><div class='add'>+ * @ignored_trailing is non-%NULL, it will be set to %true if there was a</div><div class='add'>+ * non-zero byte that could not be copied to userspace (ie. was past @usize).</div><div class='add'>+ *</div><div class='add'>+ * While unconditionally returning an error in this case is the simplest</div><div class='add'>+ * solution, for maximum backward compatibility you should try to only return</div><div class='add'>+ * -EMSGSIZE if the user explicitly requested the data that couldn't be copied.</div><div class='add'>+ * Note that structure sizes can change due to header changes and simple</div><div class='add'>+ * recompilations without code changes(!), so if you care about</div><div class='add'>+ * @ignored_trailing you probably want to make sure that any new field data is</div><div class='add'>+ * associated with a flag. Otherwise you might assume that a program knows</div><div class='add'>+ * about data it does not.</div><div class='add'>+ *</div><div class='add'>+ * @ksize is just sizeof(*src), and @usize should've been passed by userspace.</div><div class='add'>+ * The recommended usage is something like the following:</div><div class='add'>+ *</div><div class='add'>+ *   SYSCALL_DEFINE2(foobar, struct foo __user *, uarg, size_t, usize)</div><div class='add'>+ *   {</div><div class='add'>+ *      int err;</div><div class='add'>+ *      bool ignored_trailing;</div><div class='add'>+ *      struct foo karg = {};</div><div class='add'>+ *</div><div class='add'>+ *      if (usize &gt; PAGE_SIZE)</div><div class='add'>+ *		return -E2BIG;</div><div class='add'>+ *      if (usize &lt; FOO_SIZE_VER0)</div><div class='add'>+ *		return -EINVAL;</div><div class='add'>+ *</div><div class='add'>+ *      // ... modify karg somehow ...</div><div class='add'>+ *</div><div class='add'>+ *      err = copy_struct_to_user(uarg, usize, &amp;karg, sizeof(karg),</div><div class='add'>+ *				  &amp;ignored_trailing);</div><div class='add'>+ *      if (err)</div><div class='add'>+ *		return err;</div><div class='add'>+ *      if (ignored_trailing)</div><div class='add'>+ *		return -EMSGSIZE:</div><div class='add'>+ *</div><div class='add'>+ *      // ...</div><div class='add'>+ *   }</div><div class='add'>+ *</div><div class='add'>+ * There are three cases to consider:</div><div class='add'>+ *  * If @usize == @ksize, then it's copied verbatim.</div><div class='add'>+ *  * If @usize &lt; @ksize, then the kernel is trying to pass userspace a newer</div><div class='add'>+ *    struct than it supports. Thus we only copy the interoperable portions</div><div class='add'>+ *    (@usize) and ignore the rest (but @ignored_trailing is set to %true if</div><div class='add'>+ *    any of the trailing (@ksize - @usize) bytes are non-zero).</div><div class='add'>+ *  * If @usize &gt; @ksize, then the kernel is trying to pass userspace an older</div><div class='add'>+ *    struct than userspace supports. In order to make sure the</div><div class='add'>+ *    unknown-to-the-kernel fields don't contain garbage values, we zero the</div><div class='add'>+ *    trailing (@usize - @ksize) bytes.</div><div class='add'>+ *</div><div class='add'>+ * Returns (in all cases, some data may have been copied):</div><div class='add'>+ *  * -EFAULT: access to userspace failed.</div><div class='add'>+ */</div><div class='add'>+static __always_inline __must_check int</div><div class='add'>+copy_struct_to_user(void __user *dst, size_t usize, const void *src,</div><div class='add'>+		    size_t ksize, bool *ignored_trailing)</div><div class='add'>+{</div><div class='add'>+	size_t size = min(ksize, usize);</div><div class='add'>+	size_t rest = max(ksize, usize) - size;</div><div class='add'>+</div><div class='add'>+	/* Double check if ksize is larger than a known object size. */</div><div class='add'>+	if (WARN_ON_ONCE(ksize &gt; __builtin_object_size(src, 1)))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	/* Deal with trailing bytes. */</div><div class='add'>+	if (usize &gt; ksize) {</div><div class='add'>+		if (clear_user(dst + size, rest))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	if (ignored_trailing)</div><div class='add'>+		*ignored_trailing = ksize &lt; usize &amp;&amp;</div><div class='add'>+			memchr_inv(src + size, 0, rest) != NULL;</div><div class='add'>+	/* Copy the interoperable parts of the struct. */</div><div class='add'>+	if (copy_to_user(dst, src, size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size);</div><div class='ctx'> </div><div class='ctx'> long copy_from_kernel_nofault(void *dst, const void *src, size_t size);</div><div class='hunk'>@@ -385,7 +529,34 @@ long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr,</div><div class='ctx'> 		long count);</div><div class='ctx'> long strnlen_user_nofault(const void __user *unsafe_addr, long count);</div><div class='ctx'> </div><div class='del'>-#ifndef __get_kernel_nofault</div><div class='add'>+#ifdef arch_get_kernel_nofault</div><div class='add'>+/*</div><div class='add'>+ * Wrap the architecture implementation so that @label can be outside of a</div><div class='add'>+ * cleanup() scope. A regular C goto works correctly, but ASM goto does</div><div class='add'>+ * not. Clang rejects such an attempt, but GCC silently emits buggy code.</div><div class='add'>+ */</div><div class='add'>+#define __get_kernel_nofault(dst, src, type, label)		\</div><div class='add'>+do {								\</div><div class='add'>+	__label__ local_label;					\</div><div class='add'>+	arch_get_kernel_nofault(dst, src, type, local_label);	\</div><div class='add'>+	if (0) {						\</div><div class='add'>+	local_label:						\</div><div class='add'>+		goto label;					\</div><div class='add'>+	}							\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define __put_kernel_nofault(dst, src, type, label)		\</div><div class='add'>+do {								\</div><div class='add'>+	__label__ local_label;					\</div><div class='add'>+	arch_put_kernel_nofault(dst, src, type, local_label);	\</div><div class='add'>+	if (0) {						\</div><div class='add'>+	local_label:						\</div><div class='add'>+		goto label;					\</div><div class='add'>+	}							\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#elif !defined(__get_kernel_nofault) /* arch_get_kernel_nofault */</div><div class='add'>+</div><div class='ctx'> #define __get_kernel_nofault(dst, src, type, label)	\</div><div class='ctx'> do {							\</div><div class='ctx'> 	type __user *p = (type __force __user *)(src);	\</div><div class='hunk'>@@ -402,7 +573,8 @@ do {							\</div><div class='ctx'> 	if (__put_user(data, p))			\</div><div class='ctx'> 		goto label;				\</div><div class='ctx'> } while (0)</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#endif  /* !__get_kernel_nofault */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * get_kernel_nofault(): safely attempt to read from a location</div><div class='hunk'>@@ -416,7 +588,42 @@ do {							\</div><div class='ctx'> 	copy_from_kernel_nofault(&amp;(val), __gk_ptr, sizeof(val));\</div><div class='ctx'> })</div><div class='ctx'> </div><div class='del'>-#ifndef user_access_begin</div><div class='add'>+#ifdef user_access_begin</div><div class='add'>+</div><div class='add'>+#ifdef arch_unsafe_get_user</div><div class='add'>+/*</div><div class='add'>+ * Wrap the architecture implementation so that @label can be outside of a</div><div class='add'>+ * cleanup() scope. A regular C goto works correctly, but ASM goto does</div><div class='add'>+ * not. Clang rejects such an attempt, but GCC silently emits buggy code.</div><div class='add'>+ *</div><div class='add'>+ * Some architectures use internal local labels already, but this extra</div><div class='add'>+ * indirection here is harmless because the compiler optimizes it out</div><div class='add'>+ * completely in any case. This construct just ensures that the ASM GOTO</div><div class='add'>+ * target is always in the local scope. The C goto 'label' works correctly</div><div class='add'>+ * when leaving a cleanup() scope.</div><div class='add'>+ */</div><div class='add'>+#define unsafe_get_user(x, ptr, label)			\</div><div class='add'>+do {							\</div><div class='add'>+	__label__ local_label;				\</div><div class='add'>+	arch_unsafe_get_user(x, ptr, local_label);	\</div><div class='add'>+	if (0) {					\</div><div class='add'>+	local_label:					\</div><div class='add'>+		goto label;				\</div><div class='add'>+	}						\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define unsafe_put_user(x, ptr, label)			\</div><div class='add'>+do {							\</div><div class='add'>+	__label__ local_label;				\</div><div class='add'>+	arch_unsafe_put_user(x, ptr, local_label);	\</div><div class='add'>+	if (0) {					\</div><div class='add'>+	local_label:					\</div><div class='add'>+		goto label;				\</div><div class='add'>+	}						\</div><div class='add'>+} while (0)</div><div class='add'>+#endif /* arch_unsafe_get_user */</div><div class='add'>+</div><div class='add'>+#else /* user_access_begin */</div><div class='ctx'> #define user_access_begin(ptr,len) access_ok(ptr, len)</div><div class='ctx'> #define user_access_end() do { } while (0)</div><div class='ctx'> #define unsafe_op_wrap(op, err) do { if (unlikely(op)) goto err; } while (0)</div><div class='hunk'>@@ -426,7 +633,8 @@ do {							\</div><div class='ctx'> #define unsafe_copy_from_user(d,s,l,e) unsafe_op_wrap(__copy_from_user(d,s,l),e)</div><div class='ctx'> static inline unsigned long user_access_save(void) { return 0UL; }</div><div class='ctx'> static inline void user_access_restore(unsigned long flags) { }</div><div class='del'>-#endif</div><div class='add'>+#endif /* !user_access_begin */</div><div class='add'>+</div><div class='ctx'> #ifndef user_write_access_begin</div><div class='ctx'> #define user_write_access_begin user_access_begin</div><div class='ctx'> #define user_write_access_end user_access_end</div><div class='hunk'>@@ -436,6 +644,239 @@ static inline void user_access_restore(unsigned long flags) { }</div><div class='ctx'> #define user_read_access_end user_access_end</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Define RW variant so the below _mode macro expansion works */</div><div class='add'>+#define masked_user_rw_access_begin(u)	masked_user_access_begin(u)</div><div class='add'>+#define user_rw_access_begin(u, s)	user_access_begin(u, s)</div><div class='add'>+#define user_rw_access_end()		user_access_end()</div><div class='add'>+</div><div class='add'>+/* Scoped user access */</div><div class='add'>+#define USER_ACCESS_GUARD(_mode)				\</div><div class='add'>+static __always_inline void __user *				\</div><div class='add'>+class_user_##_mode##_begin(void __user *ptr)			\</div><div class='add'>+{								\</div><div class='add'>+	return ptr;						\</div><div class='add'>+}								\</div><div class='add'>+								\</div><div class='add'>+static __always_inline void					\</div><div class='add'>+class_user_##_mode##_end(void __user *ptr)			\</div><div class='add'>+{								\</div><div class='add'>+	user_##_mode##_access_end();				\</div><div class='add'>+}								\</div><div class='add'>+								\</div><div class='add'>+DEFINE_CLASS(user_ ##_mode## _access, void __user *,		\</div><div class='add'>+	     class_user_##_mode##_end(_T),			\</div><div class='add'>+	     class_user_##_mode##_begin(ptr), void __user *ptr)	\</div><div class='add'>+								\</div><div class='add'>+static __always_inline class_user_##_mode##_access_t		\</div><div class='add'>+class_user_##_mode##_access_ptr(void __user *scope)		\</div><div class='add'>+{								\</div><div class='add'>+	return scope;						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+USER_ACCESS_GUARD(read)</div><div class='add'>+USER_ACCESS_GUARD(write)</div><div class='add'>+USER_ACCESS_GUARD(rw)</div><div class='add'>+#undef USER_ACCESS_GUARD</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __scoped_user_access_begin - Start a scoped user access</div><div class='add'>+ * @mode:	The mode of the access class (read, write, rw)</div><div class='add'>+ * @uptr:	The pointer to access user space memory</div><div class='add'>+ * @size:	Size of the access</div><div class='add'>+ * @elbl:	Error label to goto when the access region is rejected</div><div class='add'>+ *</div><div class='add'>+ * Internal helper for __scoped_user_access(). Don't use directly.</div><div class='add'>+ */</div><div class='add'>+#define __scoped_user_access_begin(mode, uptr, size, elbl)		\</div><div class='add'>+({									\</div><div class='add'>+	typeof(uptr) __retptr;						\</div><div class='add'>+									\</div><div class='add'>+	if (can_do_masked_user_access()) {				\</div><div class='add'>+		__retptr = masked_user_##mode##_access_begin(uptr);	\</div><div class='add'>+	} else {							\</div><div class='add'>+		__retptr = uptr;					\</div><div class='add'>+		if (!user_##mode##_access_begin(uptr, size))		\</div><div class='add'>+			goto elbl;					\</div><div class='add'>+	}								\</div><div class='add'>+	__retptr;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __scoped_user_access - Open a scope for user access</div><div class='add'>+ * @mode:	The mode of the access class (read, write, rw)</div><div class='add'>+ * @uptr:	The pointer to access user space memory</div><div class='add'>+ * @size:	Size of the access</div><div class='add'>+ * @elbl:	Error label to goto when the access region is rejected. It</div><div class='add'>+ *		must be placed outside the scope</div><div class='add'>+ *</div><div class='add'>+ * If the user access function inside the scope requires a fault label, it</div><div class='add'>+ * can use @elbl or a different label outside the scope, which requires</div><div class='add'>+ * that user access which is implemented with ASM GOTO has been properly</div><div class='add'>+ * wrapped. See unsafe_get_user() for reference.</div><div class='add'>+ *</div><div class='add'>+ *	scoped_user_rw_access(ptr, efault) {</div><div class='add'>+ *		unsafe_get_user(rval, &amp;ptr-&gt;rval, efault);</div><div class='add'>+ *		unsafe_put_user(wval, &amp;ptr-&gt;wval, efault);</div><div class='add'>+ *	}</div><div class='add'>+ *	return 0;</div><div class='add'>+ *  efault:</div><div class='add'>+ *	return -EFAULT;</div><div class='add'>+ *</div><div class='add'>+ * The scope is internally implemented as a autoterminating nested for()</div><div class='add'>+ * loop, which can be left with 'return', 'break' and 'goto' at any</div><div class='add'>+ * point.</div><div class='add'>+ *</div><div class='add'>+ * When the scope is left user_##@_mode##_access_end() is automatically</div><div class='add'>+ * invoked.</div><div class='add'>+ *</div><div class='add'>+ * When the architecture supports masked user access and the access region</div><div class='add'>+ * which is determined by @uptr and @size is not a valid user space</div><div class='add'>+ * address, i.e. &lt; TASK_SIZE, the scope sets the pointer to a faulting user</div><div class='add'>+ * space address and does not terminate early. This optimizes for the good</div><div class='add'>+ * case and lets the performance uncritical bad case go through the fault.</div><div class='add'>+ *</div><div class='add'>+ * The eventual modification of the pointer is limited to the scope.</div><div class='add'>+ * Outside of the scope the original pointer value is unmodified, so that</div><div class='add'>+ * the original pointer value is available for diagnostic purposes in an</div><div class='add'>+ * out of scope fault path.</div><div class='add'>+ *</div><div class='add'>+ * Nesting scoped user access into a user access scope is invalid and fails</div><div class='add'>+ * the build. Nesting into other guards, e.g. pagefault is safe.</div><div class='add'>+ *</div><div class='add'>+ * The masked variant does not check the size of the access and relies on a</div><div class='add'>+ * mapping hole (e.g. guard page) to catch an out of range pointer, the</div><div class='add'>+ * first access to user memory inside the scope has to be within</div><div class='add'>+ * @uptr ... @uptr + PAGE_SIZE - 1</div><div class='add'>+ *</div><div class='add'>+ * Don't use directly. Use scoped_masked_user_$MODE_access() instead.</div><div class='add'>+ */</div><div class='add'>+#define __scoped_user_access(mode, uptr, size, elbl)					\</div><div class='add'>+for (bool done = false; !done; done = true)						\</div><div class='add'>+	for (void __user *_tmpptr = __scoped_user_access_begin(mode, uptr, size, elbl); \</div><div class='add'>+	     !done; done = true)							\</div><div class='add'>+		for (CLASS(user_##mode##_access, scope)(_tmpptr); !done; done = true)	\</div><div class='add'>+			/* Force modified pointer usage within the scope */		\</div><div class='add'>+			for (const typeof(uptr) uptr = _tmpptr; !done; done = true)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scoped_user_read_access_size - Start a scoped user read access with given size</div><div class='add'>+ * @usrc:	Pointer to the user space address to read from</div><div class='add'>+ * @size:	Size of the access starting from @usrc</div><div class='add'>+ * @elbl:	Error label to goto when the access region is rejected</div><div class='add'>+ *</div><div class='add'>+ * For further information see __scoped_user_access() above.</div><div class='add'>+ */</div><div class='add'>+#define scoped_user_read_access_size(usrc, size, elbl)		\</div><div class='add'>+	__scoped_user_access(read, usrc, size, elbl)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scoped_user_read_access - Start a scoped user read access</div><div class='add'>+ * @usrc:	Pointer to the user space address to read from</div><div class='add'>+ * @elbl:	Error label to goto when the access region is rejected</div><div class='add'>+ *</div><div class='add'>+ * The size of the access starting from @usrc is determined via sizeof(*@usrc)).</div><div class='add'>+ *</div><div class='add'>+ * For further information see __scoped_user_access() above.</div><div class='add'>+ */</div><div class='add'>+#define scoped_user_read_access(usrc, elbl)				\</div><div class='add'>+	scoped_user_read_access_size(usrc, sizeof(*(usrc)), elbl)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scoped_user_write_access_size - Start a scoped user write access with given size</div><div class='add'>+ * @udst:	Pointer to the user space address to write to</div><div class='add'>+ * @size:	Size of the access starting from @udst</div><div class='add'>+ * @elbl:	Error label to goto when the access region is rejected</div><div class='add'>+ *</div><div class='add'>+ * For further information see __scoped_user_access() above.</div><div class='add'>+ */</div><div class='add'>+#define scoped_user_write_access_size(udst, size, elbl)			\</div><div class='add'>+	__scoped_user_access(write, udst, size, elbl)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scoped_user_write_access - Start a scoped user write access</div><div class='add'>+ * @udst:	Pointer to the user space address to write to</div><div class='add'>+ * @elbl:	Error label to goto when the access region is rejected</div><div class='add'>+ *</div><div class='add'>+ * The size of the access starting from @udst is determined via sizeof(*@udst)).</div><div class='add'>+ *</div><div class='add'>+ * For further information see __scoped_user_access() above.</div><div class='add'>+ */</div><div class='add'>+#define scoped_user_write_access(udst, elbl)				\</div><div class='add'>+	scoped_user_write_access_size(udst, sizeof(*(udst)), elbl)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scoped_user_rw_access_size - Start a scoped user read/write access with given size</div><div class='add'>+ * @uptr	Pointer to the user space address to read from and write to</div><div class='add'>+ * @size:	Size of the access starting from @uptr</div><div class='add'>+ * @elbl:	Error label to goto when the access region is rejected</div><div class='add'>+ *</div><div class='add'>+ * For further information see __scoped_user_access() above.</div><div class='add'>+ */</div><div class='add'>+#define scoped_user_rw_access_size(uptr, size, elbl)			\</div><div class='add'>+	__scoped_user_access(rw, uptr, size, elbl)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scoped_user_rw_access - Start a scoped user read/write access</div><div class='add'>+ * @uptr	Pointer to the user space address to read from and write to</div><div class='add'>+ * @elbl:	Error label to goto when the access region is rejected</div><div class='add'>+ *</div><div class='add'>+ * The size of the access starting from @uptr is determined via sizeof(*@uptr)).</div><div class='add'>+ *</div><div class='add'>+ * For further information see __scoped_user_access() above.</div><div class='add'>+ */</div><div class='add'>+#define scoped_user_rw_access(uptr, elbl)				\</div><div class='add'>+	scoped_user_rw_access_size(uptr, sizeof(*(uptr)), elbl)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * get_user_inline - Read user data inlined</div><div class='add'>+ * @val:	The variable to store the value read from user memory</div><div class='add'>+ * @usrc:	Pointer to the user space memory to read from</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful, -EFAULT when faulted</div><div class='add'>+ *</div><div class='add'>+ * Inlined variant of get_user(). Only use when there is a demonstrable</div><div class='add'>+ * performance reason.</div><div class='add'>+ */</div><div class='add'>+#define get_user_inline(val, usrc)				\</div><div class='add'>+({								\</div><div class='add'>+	__label__ efault;					\</div><div class='add'>+	typeof(usrc) _tmpsrc = usrc;				\</div><div class='add'>+	int _ret = 0;						\</div><div class='add'>+								\</div><div class='add'>+	scoped_user_read_access(_tmpsrc, efault)		\</div><div class='add'>+		unsafe_get_user(val, _tmpsrc, efault);		\</div><div class='add'>+	if (0) {						\</div><div class='add'>+	efault:							\</div><div class='add'>+		_ret = -EFAULT;					\</div><div class='add'>+	}							\</div><div class='add'>+	_ret;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * put_user_inline - Write to user memory inlined</div><div class='add'>+ * @val:	The value to write</div><div class='add'>+ * @udst:	Pointer to the user space memory to write to</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful, -EFAULT when faulted</div><div class='add'>+ *</div><div class='add'>+ * Inlined variant of put_user(). Only use when there is a demonstrable</div><div class='add'>+ * performance reason.</div><div class='add'>+ */</div><div class='add'>+#define put_user_inline(val, udst)				\</div><div class='add'>+({								\</div><div class='add'>+	__label__ efault;					\</div><div class='add'>+	typeof(udst) _tmpdst = udst;				\</div><div class='add'>+	int _ret = 0;						\</div><div class='add'>+								\</div><div class='add'>+	scoped_user_write_access(_tmpdst, efault)		\</div><div class='add'>+		unsafe_put_user(val, _tmpdst, efault);		\</div><div class='add'>+	if (0) {						\</div><div class='add'>+	efault:							\</div><div class='add'>+		_ret = -EFAULT;					\</div><div class='add'>+	}							\</div><div class='add'>+	_ret;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HARDENED_USERCOPY</div><div class='ctx'> void __noreturn usercopy_abort(const char *name, const char *detail,</div><div class='ctx'> 			       bool to_user, unsigned long offset,</div><div class='head'>diff --git a/include/linux/ubsan.h b/include/linux/ubsan.h<br/>index bff7445498de..3ab8d38aedb8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/ubsan.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/ubsan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ubsan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ubsan.h</a></div><div class='hunk'>@@ -2,8 +2,13 @@</div><div class='ctx'> #ifndef _LINUX_UBSAN_H</div><div class='ctx'> #define _LINUX_UBSAN_H</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_UBSAN_TRAP</div><div class='del'>-const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type);</div><div class='add'>+#if defined(CONFIG_UBSAN_TRAP) || defined(CONFIG_UBSAN_KVM_EL2)</div><div class='add'>+const char *report_ubsan_failure(u32 check_type);</div><div class='add'>+#else</div><div class='add'>+static inline const char *report_ubsan_failure(u32 check_type)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/ucopysize.h b/include/linux/ucopysize.h<br/>new file mode 100644<br/>index 000000000000..41c2d9720466<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/ucopysize.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/ucopysize.h</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Perform sanity checking for object sizes for uaccess.h and uio.h. */</div><div class='add'>+#ifndef __LINUX_UCOPYSIZE_H__</div><div class='add'>+#define __LINUX_UCOPYSIZE_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bug.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HARDENED_USERCOPY</div><div class='add'>+#include &lt;linux/jump_label.h&gt;</div><div class='add'>+extern void __check_object_size(const void *ptr, unsigned long n,</div><div class='add'>+					bool to_user);</div><div class='add'>+</div><div class='add'>+DECLARE_STATIC_KEY_MAYBE(CONFIG_HARDENED_USERCOPY_DEFAULT_ON,</div><div class='add'>+			   validate_usercopy_range);</div><div class='add'>+</div><div class='add'>+static __always_inline void check_object_size(const void *ptr, unsigned long n,</div><div class='add'>+					      bool to_user)</div><div class='add'>+{</div><div class='add'>+	if (!__builtin_constant_p(n) &amp;&amp;</div><div class='add'>+	    static_branch_maybe(CONFIG_HARDENED_USERCOPY_DEFAULT_ON,</div><div class='add'>+				&amp;validate_usercopy_range)) {</div><div class='add'>+		__check_object_size(ptr, n, to_user);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void check_object_size(const void *ptr, unsigned long n,</div><div class='add'>+				     bool to_user)</div><div class='add'>+{ }</div><div class='add'>+#endif /* CONFIG_HARDENED_USERCOPY */</div><div class='add'>+</div><div class='add'>+extern void __compiletime_error("copy source size is too small")</div><div class='add'>+__bad_copy_from(void);</div><div class='add'>+extern void __compiletime_error("copy destination size is too small")</div><div class='add'>+__bad_copy_to(void);</div><div class='add'>+</div><div class='add'>+void __copy_overflow(int size, unsigned long count);</div><div class='add'>+</div><div class='add'>+static inline void copy_overflow(int size, unsigned long count)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_BUG))</div><div class='add'>+		__copy_overflow(size, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline __must_check bool</div><div class='add'>+check_copy_size(const void *addr, size_t bytes, bool is_source)</div><div class='add'>+{</div><div class='add'>+	int sz = __builtin_object_size(addr, 0);</div><div class='add'>+	if (unlikely(sz &gt;= 0 &amp;&amp; sz &lt; bytes)) {</div><div class='add'>+		if (!__builtin_constant_p(bytes))</div><div class='add'>+			copy_overflow(sz, bytes);</div><div class='add'>+		else if (is_source)</div><div class='add'>+			__bad_copy_from();</div><div class='add'>+		else</div><div class='add'>+			__bad_copy_to();</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (WARN_ON_ONCE(bytes &gt; INT_MAX))</div><div class='add'>+		return false;</div><div class='add'>+	check_object_size(addr, bytes, is_source);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_UCOPYSIZE_H__ */</div><div class='head'>diff --git a/include/linux/udp.h b/include/linux/udp.h<br/>index 3748e82b627b..58795688a186 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/udp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/udp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/udp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/udp.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@ static inline struct udphdr *udp_hdr(const struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define UDP_HTABLE_SIZE_MIN_PERNET	128</div><div class='del'>-#define UDP_HTABLE_SIZE_MIN		(CONFIG_BASE_SMALL ? 128 : 256)</div><div class='add'>+#define UDP_HTABLE_SIZE_MIN		(IS_ENABLED(CONFIG_BASE_SMALL) ? 128 : 256)</div><div class='ctx'> #define UDP_HTABLE_SIZE_MAX		65536</div><div class='ctx'> </div><div class='ctx'> static inline u32 udp_hashfn(const struct net *net, u32 num, u32 mask)</div><div class='hunk'>@@ -44,6 +44,12 @@ enum {</div><div class='ctx'> 	UDP_FLAGS_UDPLITE_RECV_CC, /* set via udplite setsockopt */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* per NUMA structure for lockless producer usage. */</div><div class='add'>+struct udp_prod_queue {</div><div class='add'>+	struct llist_head	ll_root ____cacheline_aligned_in_smp;</div><div class='add'>+	atomic_t		rmem_alloc;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct udp_sock {</div><div class='ctx'> 	/* inet_sock has to be the first member */</div><div class='ctx'> 	struct inet_sock inet;</div><div class='hunk'>@@ -56,6 +62,12 @@ struct udp_sock {</div><div class='ctx'> 	int		 pending;	/* Any pending frames ? */</div><div class='ctx'> 	__u8		 encap_type;	/* Is this an Encapsulation socket? */</div><div class='ctx'> </div><div class='add'>+#if !IS_ENABLED(CONFIG_BASE_SMALL)</div><div class='add'>+	/* For UDP 4-tuple hash */</div><div class='add'>+	__u16 udp_lrpa_hash;</div><div class='add'>+	struct hlist_nulls_node udp_lrpa_node;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Following member retains the information to create a UDP header</div><div class='ctx'> 	 * when the socket is uncorked.</div><div class='hunk'>@@ -84,6 +96,8 @@ struct udp_sock {</div><div class='ctx'> 						struct sk_buff *skb,</div><div class='ctx'> 						int nhoff);</div><div class='ctx'> </div><div class='add'>+	struct udp_prod_queue *udp_prod_queue;</div><div class='add'>+</div><div class='ctx'> 	/* udp_recvmsg try to use this before splicing sk_receive_queue */</div><div class='ctx'> 	struct sk_buff_head	reader_queue ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='hunk'>@@ -95,6 +109,14 @@ struct udp_sock {</div><div class='ctx'> </div><div class='ctx'> 	/* Cache friendly copy of sk-&gt;sk_peek_off &gt;= 0 */</div><div class='ctx'> 	bool		peeking_with_offset;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Accounting for the tunnel GRO fastpath.</div><div class='add'>+	 * Unprotected by compilers guard, as it uses space available in</div><div class='add'>+	 * the last UDP socket cacheline.</div><div class='add'>+	 */</div><div class='add'>+	struct hlist_node	tunnel_list;</div><div class='add'>+	struct numa_drop_counters drop_counters;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define udp_test_bit(nr, sk)			\</div><div class='hunk'>@@ -108,7 +130,7 @@ struct udp_sock {</div><div class='ctx'> #define udp_assign_bit(nr, sk, val)		\</div><div class='ctx'> 	assign_bit(UDP_FLAGS_##nr, &amp;udp_sk(sk)-&gt;udp_flags, val)</div><div class='ctx'> </div><div class='del'>-#define UDP_MAX_SEGMENTS	(1 &lt;&lt; 6UL)</div><div class='add'>+#define UDP_MAX_SEGMENTS	(1 &lt;&lt; 7UL)</div><div class='ctx'> </div><div class='ctx'> #define udp_sk(ptr) container_of_const(ptr, struct udp_sock, inet.sk)</div><div class='ctx'> </div><div class='hunk'>@@ -150,6 +172,24 @@ static inline void udp_cmsg_recv(struct msghdr *msg, struct sock *sk,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+DECLARE_STATIC_KEY_FALSE(udp_encap_needed_key);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+DECLARE_STATIC_KEY_FALSE(udpv6_encap_needed_key);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline bool udp_encap_needed(void)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_unlikely(&amp;udp_encap_needed_key))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (static_branch_unlikely(&amp;udpv6_encap_needed_key))</div><div class='add'>+		return true;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool udp_unexpected_gso(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (!skb_is_gso(skb))</div><div class='hunk'>@@ -163,6 +203,16 @@ static inline bool udp_unexpected_gso(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 	    !udp_test_bit(ACCEPT_FRAGLIST, sk))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='add'>+	/* GSO packets lacking the SKB_GSO_UDP_TUNNEL/_CSUM bits might still</div><div class='add'>+	 * land in a tunnel as the socket check in udp_gro_receive cannot be</div><div class='add'>+	 * foolproof.</div><div class='add'>+	 */</div><div class='add'>+	if (udp_encap_needed() &amp;&amp;</div><div class='add'>+	    READ_ONCE(udp_sk(sk)-&gt;encap_rcv) &amp;&amp;</div><div class='add'>+	    !(skb_shinfo(skb)-&gt;gso_type &amp;</div><div class='add'>+	      (SKB_GSO_UDP_TUNNEL | SKB_GSO_UDP_TUNNEL_CSUM)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -175,9 +225,26 @@ static inline void udp_allow_gso(struct sock *sk)</div><div class='ctx'> #define udp_portaddr_for_each_entry(__sk, list) \</div><div class='ctx'> 	hlist_for_each_entry(__sk, list, __sk_common.skc_portaddr_node)</div><div class='ctx'> </div><div class='add'>+#define udp_portaddr_for_each_entry_from(__sk) \</div><div class='add'>+	hlist_for_each_entry_from(__sk, __sk_common.skc_portaddr_node)</div><div class='add'>+</div><div class='ctx'> #define udp_portaddr_for_each_entry_rcu(__sk, list) \</div><div class='ctx'> 	hlist_for_each_entry_rcu(__sk, list, __sk_common.skc_portaddr_node)</div><div class='ctx'> </div><div class='add'>+#if !IS_ENABLED(CONFIG_BASE_SMALL)</div><div class='add'>+#define udp_lrpa_for_each_entry_rcu(__up, node, list) \</div><div class='add'>+	hlist_nulls_for_each_entry_rcu(__up, node, list, udp_lrpa_node)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define IS_UDPLITE(__sk) (__sk-&gt;sk_protocol == IPPROTO_UDPLITE)</div><div class='ctx'> </div><div class='add'>+static inline struct sock *udp_tunnel_sk(const struct net *net, bool is_ipv6)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL)</div><div class='add'>+	return rcu_dereference(net-&gt;ipv4.udp_tunnel_gro[is_ipv6].sk);</div><div class='add'>+#else</div><div class='add'>+	return NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* _LINUX_UDP_H */</div><div class='head'>diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h<br/>index f85ec5613721..2dc767e08f54 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/uidgid.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uidgid.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/uidgid.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/uidgid.h</a></div><div class='hunk'>@@ -132,6 +132,7 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)</div><div class='ctx'> </div><div class='ctx'> u32 map_id_down(struct uid_gid_map *map, u32 id);</div><div class='ctx'> u32 map_id_up(struct uid_gid_map *map, u32 id);</div><div class='add'>+u32 map_id_range_up(struct uid_gid_map *map, u32 id, u32 count);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='hunk'>@@ -186,6 +187,11 @@ static inline u32 map_id_down(struct uid_gid_map *map, u32 id)</div><div class='ctx'> 	return id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u32 map_id_range_up(struct uid_gid_map *map, u32 id, u32 count)</div><div class='add'>+{</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 map_id_up(struct uid_gid_map *map, u32 id)</div><div class='ctx'> {</div><div class='ctx'> 	return id;</div><div class='head'>diff --git a/include/linux/uio.h b/include/linux/uio.h<br/>index 00cebe2b70de..5b127043a151 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/uio.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/uio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/uio.h</a></div><div class='hunk'>@@ -6,11 +6,12 @@</div><div class='ctx'> #define __LINUX_UIO_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/thread_info.h&gt;</div><div class='ctx'> #include &lt;linux/mm_types.h&gt;</div><div class='add'>+#include &lt;linux/ucopysize.h&gt;</div><div class='ctx'> #include &lt;uapi/linux/uio.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct page;</div><div class='add'>+struct folio_queue;</div><div class='ctx'> </div><div class='ctx'> typedef unsigned int __bitwise iov_iter_extraction_t;</div><div class='ctx'> </div><div class='hunk'>@@ -25,6 +26,7 @@ enum iter_type {</div><div class='ctx'> 	ITER_IOVEC,</div><div class='ctx'> 	ITER_BVEC,</div><div class='ctx'> 	ITER_KVEC,</div><div class='add'>+	ITER_FOLIOQ,</div><div class='ctx'> 	ITER_XARRAY,</div><div class='ctx'> 	ITER_DISCARD,</div><div class='ctx'> };</div><div class='hunk'>@@ -66,6 +68,7 @@ struct iov_iter {</div><div class='ctx'> 				const struct iovec *__iov;</div><div class='ctx'> 				const struct kvec *kvec;</div><div class='ctx'> 				const struct bio_vec *bvec;</div><div class='add'>+				const struct folio_queue *folioq;</div><div class='ctx'> 				struct xarray *xarray;</div><div class='ctx'> 				void __user *ubuf;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -74,10 +77,20 @@ struct iov_iter {</div><div class='ctx'> 	};</div><div class='ctx'> 	union {</div><div class='ctx'> 		unsigned long nr_segs;</div><div class='add'>+		u8 folioq_slot;</div><div class='ctx'> 		loff_t xarray_start;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+typedef __u16 uio_meta_flags_t;</div><div class='add'>+</div><div class='add'>+struct uio_meta {</div><div class='add'>+	uio_meta_flags_t	flags;</div><div class='add'>+	u16			app_tag;</div><div class='add'>+	u64			seed;</div><div class='add'>+	struct iov_iter		iter;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline const struct iovec *iter_iov(const struct iov_iter *iter)</div><div class='ctx'> {</div><div class='ctx'> 	if (iter-&gt;iter_type == ITER_UBUF)</div><div class='hunk'>@@ -86,7 +99,13 @@ static inline const struct iovec *iter_iov(const struct iov_iter *iter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define iter_iov_addr(iter)	(iter_iov(iter)-&gt;iov_base + (iter)-&gt;iov_offset)</div><div class='del'>-#define iter_iov_len(iter)	(iter_iov(iter)-&gt;iov_len - (iter)-&gt;iov_offset)</div><div class='add'>+</div><div class='add'>+static inline size_t iter_iov_len(const struct iov_iter *i)</div><div class='add'>+{</div><div class='add'>+	if (i-&gt;iter_type == ITER_UBUF)</div><div class='add'>+		return i-&gt;count;</div><div class='add'>+	return iter_iov(i)-&gt;iov_len - i-&gt;iov_offset;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline enum iter_type iov_iter_type(const struct iov_iter *i)</div><div class='ctx'> {</div><div class='hunk'>@@ -126,6 +145,11 @@ static inline bool iov_iter_is_discard(const struct iov_iter *i)</div><div class='ctx'> 	return iov_iter_type(i) == ITER_DISCARD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool iov_iter_is_folioq(const struct iov_iter *i)</div><div class='add'>+{</div><div class='add'>+	return iov_iter_type(i) == ITER_FOLIOQ;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool iov_iter_is_xarray(const struct iov_iter *i)</div><div class='ctx'> {</div><div class='ctx'> 	return iov_iter_type(i) == ITER_XARRAY;</div><div class='hunk'>@@ -158,8 +182,6 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-size_t copy_page_from_iter_atomic(struct page *page, size_t offset,</div><div class='del'>-				  size_t bytes, struct iov_iter *i);</div><div class='ctx'> void iov_iter_advance(struct iov_iter *i, size_t bytes);</div><div class='ctx'> void iov_iter_revert(struct iov_iter *i, size_t bytes);</div><div class='ctx'> size_t fault_in_iov_iter_readable(const struct iov_iter *i, size_t bytes);</div><div class='hunk'>@@ -169,6 +191,8 @@ size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,</div><div class='ctx'> 			 struct iov_iter *i);</div><div class='ctx'> size_t copy_page_from_iter(struct page *page, size_t offset, size_t bytes,</div><div class='ctx'> 			 struct iov_iter *i);</div><div class='add'>+size_t copy_folio_from_iter_atomic(struct folio *folio, size_t offset,</div><div class='add'>+		size_t bytes, struct iov_iter *i);</div><div class='ctx'> </div><div class='ctx'> size_t _copy_to_iter(const void *addr, size_t bytes, struct iov_iter *i);</div><div class='ctx'> size_t _copy_from_iter(void *addr, size_t bytes, struct iov_iter *i);</div><div class='hunk'>@@ -180,10 +204,10 @@ static inline size_t copy_folio_to_iter(struct folio *folio, size_t offset,</div><div class='ctx'> 	return copy_page_to_iter(&amp;folio-&gt;page, offset, bytes, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline size_t copy_folio_from_iter_atomic(struct folio *folio,</div><div class='del'>-		size_t offset, size_t bytes, struct iov_iter *i)</div><div class='add'>+static inline size_t copy_folio_from_iter(struct folio *folio, size_t offset,</div><div class='add'>+					  size_t bytes, struct iov_iter *i)</div><div class='ctx'> {</div><div class='del'>-	return copy_page_from_iter_atomic(&amp;folio-&gt;page, offset, bytes, i);</div><div class='add'>+	return copy_page_from_iter(&amp;folio-&gt;page, offset, bytes, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> size_t copy_page_to_iter_nofault(struct page *page, unsigned offset,</div><div class='hunk'>@@ -206,6 +230,16 @@ size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __always_inline __must_check</div><div class='add'>+bool copy_to_iter_full(const void *addr, size_t bytes, struct iov_iter *i)</div><div class='add'>+{</div><div class='add'>+	size_t copied = copy_to_iter(addr, bytes, i);</div><div class='add'>+	if (likely(copied == bytes))</div><div class='add'>+		return true;</div><div class='add'>+	iov_iter_revert(i, copied);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline __must_check</div><div class='ctx'> bool copy_from_iter_full(void *addr, size_t bytes, struct iov_iter *i)</div><div class='ctx'> {</div><div class='ctx'> 	size_t copied = copy_from_iter(addr, bytes, i);</div><div class='hunk'>@@ -252,8 +286,6 @@ size_t _copy_mc_to_iter(const void *addr, size_t bytes, struct iov_iter *i);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> size_t iov_iter_zero(size_t bytes, struct iov_iter *);</div><div class='del'>-bool iov_iter_is_aligned(const struct iov_iter *i, unsigned addr_mask,</div><div class='del'>-			unsigned len_mask);</div><div class='ctx'> unsigned long iov_iter_alignment(const struct iov_iter *i);</div><div class='ctx'> unsigned long iov_iter_gap_alignment(const struct iov_iter *i);</div><div class='ctx'> void iov_iter_init(struct iov_iter *i, unsigned int direction, const struct iovec *iov,</div><div class='hunk'>@@ -263,6 +295,9 @@ void iov_iter_kvec(struct iov_iter *i, unsigned int direction, const struct kvec</div><div class='ctx'> void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struct bio_vec *bvec,</div><div class='ctx'> 			unsigned long nr_segs, size_t count);</div><div class='ctx'> void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count);</div><div class='add'>+void iov_iter_folio_queue(struct iov_iter *i, unsigned int direction,</div><div class='add'>+			  const struct folio_queue *folioq,</div><div class='add'>+			  unsigned int first_slot, unsigned int offset, size_t count);</div><div class='ctx'> void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray *xarray,</div><div class='ctx'> 		     loff_t start, size_t count);</div><div class='ctx'> ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages,</div><div class='head'>diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h<br/>index 47c5962b876b..18238dc8bfd3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/uio_driver.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uio_driver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/uio_driver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/uio_driver.h</a></div><div class='hunk'>@@ -28,19 +28,26 @@ struct uio_map;</div><div class='ctx'>  *			logical, virtual, or physical &amp; phys_addr_t</div><div class='ctx'>  *			should always be large enough to handle any of</div><div class='ctx'>  *			the address types)</div><div class='add'>+ * @dma_addr:		DMA handle set by dma_alloc_coherent, used with</div><div class='add'>+ *			UIO_MEM_DMA_COHERENT only (@addr should be the</div><div class='add'>+ *			void * returned from the same dma_alloc_coherent call)</div><div class='ctx'>  * @offs:               offset of device memory within the page</div><div class='ctx'>  * @size:		size of IO (multiple of page size)</div><div class='ctx'>  * @memtype:		type of memory addr points to</div><div class='ctx'>  * @internal_addr:	ioremap-ped version of addr, for driver internal use</div><div class='add'>+ * @dma_device:		device struct that was passed to dma_alloc_coherent,</div><div class='add'>+ *			used with UIO_MEM_DMA_COHERENT only</div><div class='ctx'>  * @map:		for use by the UIO core only.</div><div class='ctx'>  */</div><div class='ctx'> struct uio_mem {</div><div class='ctx'> 	const char		*name;</div><div class='ctx'> 	phys_addr_t		addr;</div><div class='add'>+	dma_addr_t		dma_addr;</div><div class='ctx'> 	unsigned long		offs;</div><div class='ctx'> 	resource_size_t		size;</div><div class='ctx'> 	int			memtype;</div><div class='ctx'> 	void __iomem		*internal_addr;</div><div class='add'>+	struct device		*dma_device;</div><div class='ctx'> 	struct uio_map		*map;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -158,6 +165,12 @@ extern int __must_check</div><div class='ctx'> #define UIO_MEM_LOGICAL	2</div><div class='ctx'> #define UIO_MEM_VIRTUAL 3</div><div class='ctx'> #define UIO_MEM_IOVA	4</div><div class='add'>+/*</div><div class='add'>+ * UIO_MEM_DMA_COHERENT exists for legacy drivers that had been getting by with</div><div class='add'>+ * improperly mapping DMA coherent allocations through the other modes.</div><div class='add'>+ * Do not use in new drivers.</div><div class='add'>+ */</div><div class='add'>+#define UIO_MEM_DMA_COHERENT	5</div><div class='ctx'> </div><div class='ctx'> /* defines for uio_port-&gt;porttype */</div><div class='ctx'> #define UIO_PORT_NONE	0</div><div class='head'>diff --git a/include/asm-generic/unaligned.h b/include/linux/unaligned.h<br/>index a84c64e5f11e..4a9651017e3c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/asm-generic/unaligned.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/asm-generic/unaligned.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/unaligned.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/unaligned.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __ASM_GENERIC_UNALIGNED_H</div><div class='del'>-#define __ASM_GENERIC_UNALIGNED_H</div><div class='add'>+#ifndef __LINUX_UNALIGNED_H</div><div class='add'>+#define __LINUX_UNALIGNED_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is the most generic implementation of unaligned accesses</div><div class='hunk'>@@ -8,16 +8,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/unaligned/packed_struct.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-</div><div class='del'>-#define __get_unaligned_t(type, ptr) ({						\</div><div class='del'>-	const struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr);	\</div><div class='del'>-	__pptr-&gt;x;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define __put_unaligned_t(type, val, ptr) do {					\</div><div class='del'>-	struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr);		\</div><div class='del'>-	__pptr-&gt;x = (val);							\</div><div class='del'>-} while (0)</div><div class='add'>+#include &lt;vdso/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define get_unaligned(ptr)	__get_unaligned_t(typeof(*(ptr)), (ptr))</div><div class='ctx'> #define put_unaligned(val, ptr) __put_unaligned_t(typeof(*(ptr)), (val), (ptr))</div><div class='hunk'>@@ -152,4 +143,4 @@ static inline u64 get_unaligned_be48(const void *p)</div><div class='ctx'> 	return __get_unaligned_be48(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* __ASM_GENERIC_UNALIGNED_H */</div><div class='add'>+#endif /* __LINUX_UNALIGNED_H */</div><div class='head'>diff --git a/include/linux/unicode.h b/include/linux/unicode.h<br/>index 4d39e6e11a95..5e6b212a2aed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/unicode.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/unicode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/unicode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/unicode.h</a></div><div class='hunk'>@@ -16,6 +16,8 @@ struct utf8data_table;</div><div class='ctx'> 	 ((unsigned int)(MIN) &lt;&lt; UNICODE_MIN_SHIFT) |	\</div><div class='ctx'> 	 ((unsigned int)(REV)))</div><div class='ctx'> </div><div class='add'>+#define UTF8_LATEST        UNICODE_AGE(12, 1, 0)</div><div class='add'>+</div><div class='ctx'> static inline u8 unicode_major(unsigned int age)</div><div class='ctx'> {</div><div class='ctx'> 	return (age &gt;&gt; UNICODE_MAJ_SHIFT) &amp; 0xff;</div><div class='hunk'>@@ -76,4 +78,6 @@ int utf8_casefold_hash(const struct unicode_map *um, const void *salt,</div><div class='ctx'> struct unicode_map *utf8_load(unsigned int version);</div><div class='ctx'> void utf8_unload(struct unicode_map *um);</div><div class='ctx'> </div><div class='add'>+int utf8_parse_version(char *version);</div><div class='add'>+</div><div class='ctx'> #endif /* _LINUX_UNICODE_H */</div><div class='head'>diff --git a/include/linux/union_find.h b/include/linux/union_find.h<br/>new file mode 100644<br/>index 000000000000..cfd49263c138<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/union_find.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/union_find.h</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __LINUX_UNION_FIND_H</div><div class='add'>+#define __LINUX_UNION_FIND_H</div><div class='add'>+/**</div><div class='add'>+ * union_find.h - union-find data structure implementation</div><div class='add'>+ *</div><div class='add'>+ * This header provides functions and structures to implement the union-find</div><div class='add'>+ * data structure. The union-find data structure is used to manage disjoint</div><div class='add'>+ * sets and supports efficient union and find operations.</div><div class='add'>+ *</div><div class='add'>+ * See Documentation/core-api/union_find.rst for documentation and samples.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct uf_node {</div><div class='add'>+	struct uf_node *parent;</div><div class='add'>+	unsigned int rank;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This macro is used for static initialization of a union-find node. */</div><div class='add'>+#define UF_INIT_NODE(node)	{.parent = &amp;node, .rank = 0}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * uf_node_init - Initialize a union-find node</div><div class='add'>+ * @node: pointer to the union-find node to be initialized</div><div class='add'>+ *</div><div class='add'>+ * This function sets the parent of the node to itself and</div><div class='add'>+ * initializes its rank to 0.</div><div class='add'>+ */</div><div class='add'>+static inline void uf_node_init(struct uf_node *node)</div><div class='add'>+{</div><div class='add'>+	node-&gt;parent = node;</div><div class='add'>+	node-&gt;rank = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* find the root of a node */</div><div class='add'>+struct uf_node *uf_find(struct uf_node *node);</div><div class='add'>+</div><div class='add'>+/* Merge two intersecting nodes */</div><div class='add'>+void uf_union(struct uf_node *node1, struct uf_node *node2);</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_UNION_FIND_H */</div><div class='head'>diff --git a/include/linux/unroll.h b/include/linux/unroll.h<br/>new file mode 100644<br/>index 000000000000..186b71de740f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/unroll.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/unroll.h</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2023 Google LLC.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __UNROLL_H</div><div class='add'>+#define __UNROLL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/args.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CC_IS_CLANG</div><div class='add'>+#define __pick_unrolled(x, y)		_Pragma(#x)</div><div class='add'>+#else</div><div class='add'>+#define __pick_unrolled(x, y)		_Pragma(#y)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * unrolled - loop attributes to ask the compiler to unroll it</div><div class='add'>+ *</div><div class='add'>+ * Usage:</div><div class='add'>+ *</div><div class='add'>+ * #define BATCH 8</div><div class='add'>+ *</div><div class='add'>+ *	unrolled_count(BATCH)</div><div class='add'>+ *	for (u32 i = 0; i &lt; BATCH; i++)</div><div class='add'>+ *		// loop body without cross-iteration dependencies</div><div class='add'>+ *</div><div class='add'>+ * This is only a hint and the compiler is free to disable unrolling if it</div><div class='add'>+ * thinks the count is suboptimal and may hurt performance and/or hugely</div><div class='add'>+ * increase object code size.</div><div class='add'>+ * Not having any cross-iteration dependencies (i.e. when iter x + 1 depends</div><div class='add'>+ * on what iter x will do with variables) is not a strict requirement, but</div><div class='add'>+ * provides best performance and object code size.</div><div class='add'>+ * Available only on Clang and GCC 8.x onwards.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Ask the compiler to pick an optimal unroll count, Clang only */</div><div class='add'>+#define unrolled							\</div><div class='add'>+	__pick_unrolled(clang loop unroll(enable), /* nothing */)</div><div class='add'>+</div><div class='add'>+/* Unroll each @n iterations of the loop */</div><div class='add'>+#define unrolled_count(n)						\</div><div class='add'>+	__pick_unrolled(clang loop unroll_count(n), GCC unroll n)</div><div class='add'>+</div><div class='add'>+/* Unroll the whole loop */</div><div class='add'>+#define unrolled_full							\</div><div class='add'>+	__pick_unrolled(clang loop unroll(full), GCC unroll 65534)</div><div class='add'>+</div><div class='add'>+/* Never unroll the loop */</div><div class='add'>+#define unrolled_none							\</div><div class='add'>+	__pick_unrolled(clang loop unroll(disable), GCC unroll 1)</div><div class='add'>+</div><div class='add'>+#define UNROLL(N, MACRO, args...) CONCATENATE(__UNROLL_, N)(MACRO, args)</div><div class='add'>+</div><div class='add'>+#define __UNROLL_0(MACRO, args...)</div><div class='add'>+#define __UNROLL_1(MACRO, args...)  __UNROLL_0(MACRO, args)  MACRO(0, args)</div><div class='add'>+#define __UNROLL_2(MACRO, args...)  __UNROLL_1(MACRO, args)  MACRO(1, args)</div><div class='add'>+#define __UNROLL_3(MACRO, args...)  __UNROLL_2(MACRO, args)  MACRO(2, args)</div><div class='add'>+#define __UNROLL_4(MACRO, args...)  __UNROLL_3(MACRO, args)  MACRO(3, args)</div><div class='add'>+#define __UNROLL_5(MACRO, args...)  __UNROLL_4(MACRO, args)  MACRO(4, args)</div><div class='add'>+#define __UNROLL_6(MACRO, args...)  __UNROLL_5(MACRO, args)  MACRO(5, args)</div><div class='add'>+#define __UNROLL_7(MACRO, args...)  __UNROLL_6(MACRO, args)  MACRO(6, args)</div><div class='add'>+#define __UNROLL_8(MACRO, args...)  __UNROLL_7(MACRO, args)  MACRO(7, args)</div><div class='add'>+#define __UNROLL_9(MACRO, args...)  __UNROLL_8(MACRO, args)  MACRO(8, args)</div><div class='add'>+#define __UNROLL_10(MACRO, args...) __UNROLL_9(MACRO, args)  MACRO(9, args)</div><div class='add'>+#define __UNROLL_11(MACRO, args...) __UNROLL_10(MACRO, args) MACRO(10, args)</div><div class='add'>+#define __UNROLL_12(MACRO, args...) __UNROLL_11(MACRO, args) MACRO(11, args)</div><div class='add'>+#define __UNROLL_13(MACRO, args...) __UNROLL_12(MACRO, args) MACRO(12, args)</div><div class='add'>+#define __UNROLL_14(MACRO, args...) __UNROLL_13(MACRO, args) MACRO(13, args)</div><div class='add'>+#define __UNROLL_15(MACRO, args...) __UNROLL_14(MACRO, args) MACRO(14, args)</div><div class='add'>+#define __UNROLL_16(MACRO, args...) __UNROLL_15(MACRO, args) MACRO(15, args)</div><div class='add'>+#define __UNROLL_17(MACRO, args...) __UNROLL_16(MACRO, args) MACRO(16, args)</div><div class='add'>+#define __UNROLL_18(MACRO, args...) __UNROLL_17(MACRO, args) MACRO(17, args)</div><div class='add'>+#define __UNROLL_19(MACRO, args...) __UNROLL_18(MACRO, args) MACRO(18, args)</div><div class='add'>+#define __UNROLL_20(MACRO, args...) __UNROLL_19(MACRO, args) MACRO(19, args)</div><div class='add'>+</div><div class='add'>+#endif /* __UNROLL_H */</div><div class='head'>diff --git a/include/linux/unwind_deferred.h b/include/linux/unwind_deferred.h<br/>new file mode 100644<br/>index 000000000000..bc7ae7d21900<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/unwind_deferred.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/unwind_deferred.h</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_UNWIND_USER_DEFERRED_H</div><div class='add'>+#define _LINUX_UNWIND_USER_DEFERRED_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/task_work.h&gt;</div><div class='add'>+#include &lt;linux/unwind_user.h&gt;</div><div class='add'>+#include &lt;linux/unwind_deferred_types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_UNWIND_USER</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNWIND_PENDING_BIT = 0,</div><div class='add'>+	UNWIND_USED_BIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	UNWIND_PENDING		= BIT(UNWIND_PENDING_BIT),</div><div class='add'>+</div><div class='add'>+	/* Set if the unwinding was used (directly or deferred) */</div><div class='add'>+	UNWIND_USED		= BIT(UNWIND_USED_BIT)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void unwind_task_init(struct task_struct *task);</div><div class='add'>+void unwind_task_free(struct task_struct *task);</div><div class='add'>+</div><div class='add'>+int unwind_user_faultable(struct unwind_stacktrace *trace);</div><div class='add'>+</div><div class='add'>+int unwind_deferred_init(struct unwind_work *work, unwind_callback_t func);</div><div class='add'>+int unwind_deferred_request(struct unwind_work *work, u64 *cookie);</div><div class='add'>+void unwind_deferred_cancel(struct unwind_work *work);</div><div class='add'>+</div><div class='add'>+void unwind_deferred_task_exit(struct task_struct *task);</div><div class='add'>+</div><div class='add'>+static __always_inline void unwind_reset_info(void)</div><div class='add'>+{</div><div class='add'>+	struct unwind_task_info *info = &amp;current-&gt;unwind_info;</div><div class='add'>+	unsigned long bits = atomic_long_read(&amp;info-&gt;unwind_mask);</div><div class='add'>+</div><div class='add'>+	/* Was there any unwinding? */</div><div class='add'>+	if (likely(!bits))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		/* Is a task_work going to run again before going back */</div><div class='add'>+		if (bits &amp; UNWIND_PENDING)</div><div class='add'>+			return;</div><div class='add'>+	} while (!atomic_long_try_cmpxchg(&amp;info-&gt;unwind_mask, &amp;bits, 0UL));</div><div class='add'>+	current-&gt;unwind_info.id.id = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(info-&gt;cache)) {</div><div class='add'>+		info-&gt;cache-&gt;nr_entries = 0;</div><div class='add'>+		info-&gt;cache-&gt;unwind_completed = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !CONFIG_UNWIND_USER */</div><div class='add'>+</div><div class='add'>+static inline void unwind_task_init(struct task_struct *task) {}</div><div class='add'>+static inline void unwind_task_free(struct task_struct *task) {}</div><div class='add'>+</div><div class='add'>+static inline int unwind_user_faultable(struct unwind_stacktrace *trace)</div><div class='add'>+{ return -ENOSYS; }</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+unwind_deferred_init(struct unwind_work *work, unwind_callback_t func)</div><div class='add'>+{ return -ENOSYS; }</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+unwind_deferred_request(struct unwind_work *work, u64 *timestamp)</div><div class='add'>+{ return -ENOSYS; }</div><div class='add'>+</div><div class='add'>+static inline void unwind_deferred_cancel(struct unwind_work *work) {}</div><div class='add'>+</div><div class='add'>+static inline void unwind_deferred_task_exit(struct task_struct *task) {}</div><div class='add'>+static inline void unwind_reset_info(void) {}</div><div class='add'>+</div><div class='add'>+#endif /* !CONFIG_UNWIND_USER */</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_UNWIND_USER_DEFERRED_H */</div><div class='head'>diff --git a/include/linux/unwind_deferred_types.h b/include/linux/unwind_deferred_types.h<br/>new file mode 100644<br/>index 000000000000..18fa3932f61c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/unwind_deferred_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/unwind_deferred_types.h</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_UNWIND_USER_DEFERRED_TYPES_H</div><div class='add'>+#define _LINUX_UNWIND_USER_DEFERRED_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+</div><div class='add'>+struct unwind_cache {</div><div class='add'>+	unsigned long		unwind_completed;</div><div class='add'>+	unsigned int		nr_entries;</div><div class='add'>+	unsigned long		entries[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The unwind_task_id is a unique identifier that maps to a user space</div><div class='add'>+ * stacktrace. It is generated the first time a deferred user space</div><div class='add'>+ * stacktrace is requested after a task has entered the kerenl and</div><div class='add'>+ * is cleared to zero when it exits. The mapped id will be a non-zero</div><div class='add'>+ * number.</div><div class='add'>+ *</div><div class='add'>+ * To simplify the generation of the 64 bit number, 32 bits will be</div><div class='add'>+ * the CPU it was generated on, and the other 32 bits will be a per</div><div class='add'>+ * cpu counter that gets incremented by two every time a new identifier</div><div class='add'>+ * is generated. The LSB will always be set to keep the value</div><div class='add'>+ * from being zero.</div><div class='add'>+ */</div><div class='add'>+union unwind_task_id {</div><div class='add'>+	struct {</div><div class='add'>+		u32		cpu;</div><div class='add'>+		u32		cnt;</div><div class='add'>+	};</div><div class='add'>+	u64			id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct unwind_task_info {</div><div class='add'>+	atomic_long_t		unwind_mask;</div><div class='add'>+	struct unwind_cache	*cache;</div><div class='add'>+	struct callback_head	work;</div><div class='add'>+	union unwind_task_id	id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct unwind_work;</div><div class='add'>+struct unwind_stacktrace;</div><div class='add'>+</div><div class='add'>+typedef void (*unwind_callback_t)(struct unwind_work *work,</div><div class='add'>+				  struct unwind_stacktrace *trace,</div><div class='add'>+				  u64 cookie);</div><div class='add'>+</div><div class='add'>+struct unwind_work {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	unwind_callback_t		func;</div><div class='add'>+	int				bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_UNWIND_USER_DEFERRED_TYPES_H */</div><div class='head'>diff --git a/include/linux/unwind_user.h b/include/linux/unwind_user.h<br/>new file mode 100644<br/>index 000000000000..7f7282516bf5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/unwind_user.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/unwind_user.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_UNWIND_USER_H</div><div class='add'>+#define _LINUX_UNWIND_USER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unwind_user_types.h&gt;</div><div class='add'>+#include &lt;asm/unwind_user.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef ARCH_INIT_USER_FP_FRAME</div><div class='add'>+ #define ARCH_INIT_USER_FP_FRAME</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int unwind_user(struct unwind_stacktrace *trace, unsigned int max_entries);</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_UNWIND_USER_H */</div><div class='head'>diff --git a/include/linux/unwind_user_types.h b/include/linux/unwind_user_types.h<br/>new file mode 100644<br/>index 000000000000..412729a269bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/unwind_user_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/unwind_user_types.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _LINUX_UNWIND_USER_TYPES_H</div><div class='add'>+#define _LINUX_UNWIND_USER_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unwind types, listed in priority order: lower numbers are attempted first if</div><div class='add'>+ * available.</div><div class='add'>+ */</div><div class='add'>+enum unwind_user_type_bits {</div><div class='add'>+	UNWIND_USER_TYPE_FP_BIT =		0,</div><div class='add'>+</div><div class='add'>+	NR_UNWIND_USER_TYPE_BITS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum unwind_user_type {</div><div class='add'>+	/* Type "none" for the start of stack walk iteration. */</div><div class='add'>+	UNWIND_USER_TYPE_NONE =			0,</div><div class='add'>+	UNWIND_USER_TYPE_FP =			BIT(UNWIND_USER_TYPE_FP_BIT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct unwind_stacktrace {</div><div class='add'>+	unsigned int	nr;</div><div class='add'>+	unsigned long	*entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct unwind_user_frame {</div><div class='add'>+	s32 cfa_off;</div><div class='add'>+	s32 ra_off;</div><div class='add'>+	s32 fp_off;</div><div class='add'>+	bool use_fp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct unwind_user_state {</div><div class='add'>+	unsigned long				ip;</div><div class='add'>+	unsigned long				sp;</div><div class='add'>+	unsigned long				fp;</div><div class='add'>+	unsigned int				ws;</div><div class='add'>+	enum unwind_user_type			current_type;</div><div class='add'>+	unsigned int				available_types;</div><div class='add'>+	bool					topmost;</div><div class='add'>+	bool					done;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _LINUX_UNWIND_USER_TYPES_H */</div><div class='head'>diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h<br/>index f46e0ca0169c..ee3d36eda45d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/uprobes.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/uprobes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/uprobes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/uprobes.h</a></div><div class='hunk'>@@ -15,34 +15,51 @@</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/seqlock.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='add'>+struct uprobe;</div><div class='ctx'> struct vm_area_struct;</div><div class='ctx'> struct mm_struct;</div><div class='ctx'> struct inode;</div><div class='ctx'> struct notifier_block;</div><div class='ctx'> struct page;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Allowed return values from uprobe consumer's handler callback</div><div class='add'>+ * with following meaning:</div><div class='add'>+ *</div><div class='add'>+ * UPROBE_HANDLER_REMOVE</div><div class='add'>+ * - Remove the uprobe breakpoint from current-&gt;mm.</div><div class='add'>+ * UPROBE_HANDLER_IGNORE</div><div class='add'>+ * - Ignore ret_handler callback for this consumer.</div><div class='add'>+ */</div><div class='ctx'> #define UPROBE_HANDLER_REMOVE		1</div><div class='del'>-#define UPROBE_HANDLER_MASK		1</div><div class='add'>+#define UPROBE_HANDLER_IGNORE		2</div><div class='ctx'> </div><div class='ctx'> #define MAX_URETPROBE_DEPTH		64</div><div class='ctx'> </div><div class='del'>-enum uprobe_filter_ctx {</div><div class='del'>-	UPROBE_FILTER_REGISTER,</div><div class='del'>-	UPROBE_FILTER_UNREGISTER,</div><div class='del'>-	UPROBE_FILTER_MMAP,</div><div class='del'>-};</div><div class='add'>+#define UPROBE_NO_TRAMPOLINE_VADDR	(~0UL)</div><div class='ctx'> </div><div class='ctx'> struct uprobe_consumer {</div><div class='del'>-	int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);</div><div class='add'>+	/*</div><div class='add'>+	 * handler() can return UPROBE_HANDLER_REMOVE to signal the need to</div><div class='add'>+	 * unregister uprobe for current process. If UPROBE_HANDLER_REMOVE is</div><div class='add'>+	 * returned, filter() callback has to be implemented as well and it</div><div class='add'>+	 * should return false to "confirm" the decision to uninstall uprobe</div><div class='add'>+	 * for the current process. If filter() is omitted or returns true,</div><div class='add'>+	 * UPROBE_HANDLER_REMOVE is effectively ignored.</div><div class='add'>+	 */</div><div class='add'>+	int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs, __u64 *data);</div><div class='ctx'> 	int (*ret_handler)(struct uprobe_consumer *self,</div><div class='ctx'> 				unsigned long func,</div><div class='del'>-				struct pt_regs *regs);</div><div class='del'>-	bool (*filter)(struct uprobe_consumer *self,</div><div class='del'>-				enum uprobe_filter_ctx ctx,</div><div class='del'>-				struct mm_struct *mm);</div><div class='add'>+				struct pt_regs *regs, __u64 *data);</div><div class='add'>+	bool (*filter)(struct uprobe_consumer *self, struct mm_struct *mm);</div><div class='add'>+</div><div class='add'>+	struct list_head cons_node;</div><div class='ctx'> </div><div class='del'>-	struct uprobe_consumer *next;</div><div class='add'>+	__u64 id;	/* set when uprobe_consumer is registered */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_UPROBES</div><div class='hunk'>@@ -55,12 +72,66 @@ enum uprobe_task_state {</div><div class='ctx'> 	UTASK_SSTEP_TRAPPED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* The state of hybrid-lifetime uprobe inside struct return_instance */</div><div class='add'>+enum hprobe_state {</div><div class='add'>+	HPROBE_LEASED,		/* uretprobes_srcu-protected uprobe */</div><div class='add'>+	HPROBE_STABLE,		/* refcounted uprobe */</div><div class='add'>+	HPROBE_GONE,		/* NULL uprobe, SRCU expired, refcount failed */</div><div class='add'>+	HPROBE_CONSUMED,	/* uprobe "consumed" by uretprobe handler */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Hybrid lifetime uprobe. Represents a uprobe instance that could be either</div><div class='add'>+ * SRCU protected (with SRCU protection eventually potentially timing out),</div><div class='add'>+ * refcounted using uprobe-&gt;ref, or there could be no valid uprobe (NULL).</div><div class='add'>+ *</div><div class='add'>+ * hprobe's internal state is setup such that background timer thread can</div><div class='add'>+ * atomically "downgrade" temporarily RCU-protected uprobe into refcounted one</div><div class='add'>+ * (or no uprobe, if refcounting failed).</div><div class='add'>+ *</div><div class='add'>+ * *stable* pointer always point to the uprobe (or could be NULL if there is</div><div class='add'>+ * was no valid underlying uprobe to begin with).</div><div class='add'>+ *</div><div class='add'>+ * *leased* pointer is the key to achieving race-free atomic lifetime state</div><div class='add'>+ * transition and can have three possible states:</div><div class='add'>+ *   - either the same non-NULL value as *stable*, in which case uprobe is</div><div class='add'>+ *     SRCU-protected;</div><div class='add'>+ *   - NULL, in which case uprobe (if there is any) is refcounted;</div><div class='add'>+ *   - special __UPROBE_DEAD value, which represents an uprobe that was SRCU</div><div class='add'>+ *     protected initially, but SRCU period timed out and we attempted to</div><div class='add'>+ *     convert it to refcounted, but refcount_inc_not_zero() failed, because</div><div class='add'>+ *     uprobe effectively went away (the last consumer unsubscribed). In this</div><div class='add'>+ *     case it's important to know that *stable* pointer (which still has</div><div class='add'>+ *     non-NULL uprobe pointer) shouldn't be used, because lifetime of</div><div class='add'>+ *     underlying uprobe is not guaranteed anymore. __UPROBE_DEAD is just an</div><div class='add'>+ *     internal marker and is handled transparently by hprobe_fetch() helper.</div><div class='add'>+ *</div><div class='add'>+ * When uprobe is SRCU-protected, we also record srcu_idx value, necessary for</div><div class='add'>+ * SRCU unlocking.</div><div class='add'>+ *</div><div class='add'>+ * See hprobe_expire() and hprobe_fetch() for details of race-free uprobe</div><div class='add'>+ * state transitioning details. It all hinges on atomic xchg() over *leaded*</div><div class='add'>+ * pointer. *stable* pointer, once initially set, is not modified concurrently.</div><div class='add'>+ */</div><div class='add'>+struct hprobe {</div><div class='add'>+	enum hprobe_state state;</div><div class='add'>+	int srcu_idx;</div><div class='add'>+	struct uprobe *uprobe;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * uprobe_task: Metadata of a task while it singlesteps.</div><div class='ctx'>  */</div><div class='ctx'> struct uprobe_task {</div><div class='ctx'> 	enum uprobe_task_state		state;</div><div class='ctx'> </div><div class='add'>+	unsigned int			depth;</div><div class='add'>+	struct return_instance		*return_instances;</div><div class='add'>+</div><div class='add'>+	struct return_instance		*ri_pool;</div><div class='add'>+	struct timer_list		ri_timer;</div><div class='add'>+	seqcount_t			ri_seqcount;</div><div class='add'>+</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct arch_uprobe_task	autask;</div><div class='hunk'>@@ -75,20 +146,35 @@ struct uprobe_task {</div><div class='ctx'> </div><div class='ctx'> 	struct uprobe			*active_uprobe;</div><div class='ctx'> 	unsigned long			xol_vaddr;</div><div class='add'>+	bool				signal_denied;</div><div class='ctx'> </div><div class='del'>-	struct return_instance		*return_instances;</div><div class='del'>-	unsigned int			depth;</div><div class='add'>+	struct arch_uprobe              *auprobe;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct return_consumer {</div><div class='add'>+	__u64	cookie;</div><div class='add'>+	__u64	id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct return_instance {</div><div class='del'>-	struct uprobe		*uprobe;</div><div class='add'>+	struct hprobe		hprobe;</div><div class='ctx'> 	unsigned long		func;</div><div class='ctx'> 	unsigned long		stack;		/* stack pointer */</div><div class='ctx'> 	unsigned long		orig_ret_vaddr; /* original return address */</div><div class='ctx'> 	bool			chained;	/* true, if instance is nested */</div><div class='add'>+	int			cons_cnt;	/* total number of session consumers */</div><div class='ctx'> </div><div class='ctx'> 	struct return_instance	*next;		/* keep as stack */</div><div class='del'>-};</div><div class='add'>+	struct rcu_head		rcu;</div><div class='add'>+</div><div class='add'>+	/* singular pre-allocated return_consumer instance for common case */</div><div class='add'>+	struct return_consumer	consumer;</div><div class='add'>+	/*</div><div class='add'>+	 * extra return_consumer instances for rare cases of multiple session consumers,</div><div class='add'>+	 * contains (cons_cnt - 1) elements</div><div class='add'>+	 */</div><div class='add'>+	struct return_consumer	*extra_consumers;</div><div class='add'>+} ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> enum rp_check {</div><div class='ctx'> 	RP_CHECK_CALL,</div><div class='hunk'>@@ -100,27 +186,37 @@ struct xol_area;</div><div class='ctx'> </div><div class='ctx'> struct uprobes_state {</div><div class='ctx'> 	struct xol_area		*xol_area;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+	struct hlist_head	head_tramps;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+typedef int (*uprobe_write_verify_t)(struct page *page, unsigned long vaddr,</div><div class='add'>+				     uprobe_opcode_t *insn, int nbytes, void *data);</div><div class='add'>+</div><div class='ctx'> extern void __init uprobes_init(void);</div><div class='del'>-extern int set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);</div><div class='del'>-extern int set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);</div><div class='add'>+extern int set_swbp(struct arch_uprobe *aup, struct vm_area_struct *vma, unsigned long vaddr);</div><div class='add'>+extern int set_orig_insn(struct arch_uprobe *aup, struct vm_area_struct *vma, unsigned long vaddr);</div><div class='ctx'> extern bool is_swbp_insn(uprobe_opcode_t *insn);</div><div class='ctx'> extern bool is_trap_insn(uprobe_opcode_t *insn);</div><div class='ctx'> extern unsigned long uprobe_get_swbp_addr(struct pt_regs *regs);</div><div class='ctx'> extern unsigned long uprobe_get_trap_addr(struct pt_regs *regs);</div><div class='del'>-extern int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_t);</div><div class='del'>-extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);</div><div class='del'>-extern int uprobe_register_refctr(struct inode *inode, loff_t offset, loff_t ref_ctr_offset, struct uprobe_consumer *uc);</div><div class='del'>-extern int uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool);</div><div class='del'>-extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);</div><div class='add'>+extern int uprobe_write_opcode(struct arch_uprobe *auprobe, struct vm_area_struct *vma, unsigned long vaddr, uprobe_opcode_t,</div><div class='add'>+			       bool is_register);</div><div class='add'>+extern int uprobe_write(struct arch_uprobe *auprobe, struct vm_area_struct *vma, const unsigned long opcode_vaddr,</div><div class='add'>+			uprobe_opcode_t *insn, int nbytes, uprobe_write_verify_t verify, bool is_register, bool do_update_ref_ctr,</div><div class='add'>+			void *data);</div><div class='add'>+extern struct uprobe *uprobe_register(struct inode *inode, loff_t offset, loff_t ref_ctr_offset, struct uprobe_consumer *uc);</div><div class='add'>+extern int uprobe_apply(struct uprobe *uprobe, struct uprobe_consumer *uc, bool);</div><div class='add'>+extern void uprobe_unregister_nosync(struct uprobe *uprobe, struct uprobe_consumer *uc);</div><div class='add'>+extern void uprobe_unregister_sync(void);</div><div class='ctx'> extern int uprobe_mmap(struct vm_area_struct *vma);</div><div class='ctx'> extern void uprobe_munmap(struct vm_area_struct *vma, unsigned long start, unsigned long end);</div><div class='ctx'> extern void uprobe_start_dup_mmap(void);</div><div class='ctx'> extern void uprobe_end_dup_mmap(void);</div><div class='ctx'> extern void uprobe_dup_mmap(struct mm_struct *oldmm, struct mm_struct *newmm);</div><div class='ctx'> extern void uprobe_free_utask(struct task_struct *t);</div><div class='del'>-extern void uprobe_copy_process(struct task_struct *t, unsigned long flags);</div><div class='add'>+extern void uprobe_copy_process(struct task_struct *t, u64 flags);</div><div class='ctx'> extern int uprobe_post_sstep_notifier(struct pt_regs *regs);</div><div class='ctx'> extern int uprobe_pre_sstep_notifier(struct pt_regs *regs);</div><div class='ctx'> extern void uprobe_notify_resume(struct pt_regs *regs);</div><div class='hunk'>@@ -138,6 +234,14 @@ extern bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check c</div><div class='ctx'> extern bool arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs *regs);</div><div class='ctx'> extern void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,</div><div class='ctx'> 					 void *src, unsigned long len);</div><div class='add'>+extern void uprobe_handle_trampoline(struct pt_regs *regs);</div><div class='add'>+extern void *arch_uretprobe_trampoline(unsigned long *psize);</div><div class='add'>+extern unsigned long uprobe_get_trampoline_vaddr(void);</div><div class='add'>+extern void uprobe_copy_from_page(struct page *page, unsigned long vaddr, void *dst, int len);</div><div class='add'>+extern void arch_uprobe_clear_state(struct mm_struct *mm);</div><div class='add'>+extern void arch_uprobe_init_state(struct mm_struct *mm);</div><div class='add'>+extern void handle_syscall_uprobe(struct pt_regs *regs, unsigned long bp_vaddr);</div><div class='add'>+extern void arch_uprobe_optimize(struct arch_uprobe *auprobe, unsigned long vaddr);</div><div class='ctx'> #else /* !CONFIG_UPROBES */</div><div class='ctx'> struct uprobes_state {</div><div class='ctx'> };</div><div class='hunk'>@@ -148,22 +252,21 @@ static inline void uprobes_init(void)</div><div class='ctx'> </div><div class='ctx'> #define uprobe_get_trap_addr(regs)	instruction_pointer(regs)</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)</div><div class='del'>-{</div><div class='del'>-	return -ENOSYS;</div><div class='del'>-}</div><div class='del'>-static inline int uprobe_register_refctr(struct inode *inode, loff_t offset, loff_t ref_ctr_offset, struct uprobe_consumer *uc)</div><div class='add'>+static inline struct uprobe *</div><div class='add'>+uprobe_register(struct inode *inode, loff_t offset, loff_t ref_ctr_offset, struct uprobe_consumer *uc)</div><div class='ctx'> {</div><div class='del'>-	return -ENOSYS;</div><div class='add'>+	return ERR_PTR(-ENOSYS);</div><div class='ctx'> }</div><div class='ctx'> static inline int</div><div class='del'>-uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool add)</div><div class='add'>+uprobe_apply(struct uprobe* uprobe, struct uprobe_consumer *uc, bool add)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> static inline void</div><div class='del'>-uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)</div><div class='add'>+uprobe_unregister_nosync(struct uprobe *uprobe, struct uprobe_consumer *uc)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void uprobe_unregister_sync(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline int uprobe_mmap(struct vm_area_struct *vma)</div><div class='hunk'>@@ -194,7 +297,7 @@ static inline bool uprobe_deny_signal(void)</div><div class='ctx'> static inline void uprobe_free_utask(struct task_struct *t)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-static inline void uprobe_copy_process(struct task_struct *t, unsigned long flags)</div><div class='add'>+static inline void uprobe_copy_process(struct task_struct *t, u64 flags)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static inline void uprobe_clear_state(struct mm_struct *mm)</div><div class='head'>diff --git a/include/linux/usb.h b/include/linux/usb.h<br/>index 9e52179872a5..e85105939af8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb.h</a></div><div class='hunk'>@@ -51,6 +51,7 @@ struct ep_device;</div><div class='ctx'>  * @desc: descriptor for this endpoint, wMaxPacketSize in native byteorder</div><div class='ctx'>  * @ss_ep_comp: SuperSpeed companion descriptor for this endpoint</div><div class='ctx'>  * @ssp_isoc_ep_comp: SuperSpeedPlus isoc companion descriptor for this endpoint</div><div class='add'>+ * @eusb2_isoc_ep_comp: eUSB2 isoc companion descriptor for this endpoint</div><div class='ctx'>  * @urb_list: urbs queued to this endpoint; maintained by usbcore</div><div class='ctx'>  * @hcpriv: for use by HCD; typically holds hardware dma queue head (QH)</div><div class='ctx'>  *	with one or more transfer descriptors (TDs) per urb</div><div class='hunk'>@@ -64,9 +65,10 @@ struct ep_device;</div><div class='ctx'>  * descriptor within an active interface in a given USB configuration.</div><div class='ctx'>  */</div><div class='ctx'> struct usb_host_endpoint {</div><div class='del'>-	struct usb_endpoint_descriptor		desc;</div><div class='del'>-	struct usb_ss_ep_comp_descriptor	ss_ep_comp;</div><div class='del'>-	struct usb_ssp_isoc_ep_comp_descriptor	ssp_isoc_ep_comp;</div><div class='add'>+	struct usb_endpoint_descriptor			desc;</div><div class='add'>+	struct usb_ss_ep_comp_descriptor		ss_ep_comp;</div><div class='add'>+	struct usb_ssp_isoc_ep_comp_descriptor		ssp_isoc_ep_comp;</div><div class='add'>+	struct usb_eusb2_isoc_ep_comp_descriptor	eusb2_isoc_ep_comp;</div><div class='ctx'> 	struct list_head		urb_list;</div><div class='ctx'> 	void				*hcpriv;</div><div class='ctx'> 	struct ep_device		*ep_dev;	/* For sysfs info */</div><div class='hunk'>@@ -440,11 +442,6 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/* USB device number allocation bitmap */</div><div class='del'>-struct usb_devmap {</div><div class='del'>-	unsigned long devicemap[128 / (8*sizeof(unsigned long))];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocated per bus (tree of devices) we have:</div><div class='ctx'>  */</div><div class='hunk'>@@ -472,7 +469,7 @@ struct usb_bus {</div><div class='ctx'> 					 * round-robin allocation */</div><div class='ctx'> 	struct mutex devnum_next_mutex; /* devnum_next mutex */</div><div class='ctx'> </div><div class='del'>-	struct usb_devmap devmap;	/* device address allocation map */</div><div class='add'>+	DECLARE_BITMAP(devmap, 128);	/* USB device number allocation bitmap */</div><div class='ctx'> 	struct usb_device *root_hub;	/* Root hub */</div><div class='ctx'> 	struct usb_bus *hs_companion;	/* Companion EHCI bus, if any */</div><div class='ctx'> </div><div class='hunk'>@@ -500,6 +497,12 @@ struct usb_dev_state;</div><div class='ctx'> </div><div class='ctx'> struct usb_tt;</div><div class='ctx'> </div><div class='add'>+enum usb_link_tunnel_mode {</div><div class='add'>+	USB_LINK_UNKNOWN = 0,</div><div class='add'>+	USB_LINK_NATIVE,</div><div class='add'>+	USB_LINK_TUNNELED,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum usb_port_connect_type {</div><div class='ctx'> 	USB_PORT_CONNECT_TYPE_UNKNOWN = 0,</div><div class='ctx'> 	USB_PORT_CONNECT_TYPE_HOT_PLUG,</div><div class='hunk'>@@ -610,6 +613,8 @@ struct usb3_lpm_parameters {</div><div class='ctx'>  *	WUSB devices are not, until we authorize them from user space.</div><div class='ctx'>  *	FIXME -- complete doc</div><div class='ctx'>  * @authenticated: Crypto authentication passed</div><div class='add'>+ * @tunnel_mode: Connection native or tunneled over USB4</div><div class='add'>+ * @usb4_link: device link to the USB4 host interface</div><div class='ctx'>  * @lpm_capable: device supports LPM</div><div class='ctx'>  * @lpm_devinit_allow: Allow USB3 device initiated LPM, exit latency is in range</div><div class='ctx'>  * @usb2_hw_lpm_capable: device can perform USB2 hardware LPM</div><div class='hunk'>@@ -631,6 +636,8 @@ struct usb3_lpm_parameters {</div><div class='ctx'>  * @do_remote_wakeup:  remote wakeup should be enabled</div><div class='ctx'>  * @reset_resume: needs reset instead of resume</div><div class='ctx'>  * @port_is_suspended: the upstream port is suspended (L2 or U3)</div><div class='add'>+ * @offload_at_suspend: offload activities during suspend is enabled.</div><div class='add'>+ * @offload_usage: number of offload activities happening on this usb device.</div><div class='ctx'>  * @slot_id: Slot ID assigned by xHCI</div><div class='ctx'>  * @l1_params: best effor service latency for USB2 L1 LPM state, and L1 timeout.</div><div class='ctx'>  * @u1_params: exit latencies for USB3 U1 LPM state, and hub-initiated timeout.</div><div class='hunk'>@@ -719,6 +726,10 @@ struct usb_device {</div><div class='ctx'> 	unsigned do_remote_wakeup:1;</div><div class='ctx'> 	unsigned reset_resume:1;</div><div class='ctx'> 	unsigned port_is_suspended:1;</div><div class='add'>+	unsigned offload_at_suspend:1;</div><div class='add'>+	int offload_usage;</div><div class='add'>+	enum usb_link_tunnel_mode tunnel_mode;</div><div class='add'>+	struct device_link *usb4_link;</div><div class='ctx'> </div><div class='ctx'> 	int slot_id;</div><div class='ctx'> 	struct usb2_lpm_parameters l1_params;</div><div class='hunk'>@@ -810,10 +821,10 @@ static inline void usb_mark_last_busy(struct usb_device *udev)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='del'>-static inline int usb_enable_autosuspend(struct usb_device *udev)</div><div class='del'>-{ return 0; }</div><div class='del'>-static inline int usb_disable_autosuspend(struct usb_device *udev)</div><div class='del'>-{ return 0; }</div><div class='add'>+static inline void usb_enable_autosuspend(struct usb_device *udev)</div><div class='add'>+{ }</div><div class='add'>+static inline void usb_disable_autosuspend(struct usb_device *udev)</div><div class='add'>+{ }</div><div class='ctx'> </div><div class='ctx'> static inline int usb_autopm_get_interface(struct usb_interface *intf)</div><div class='ctx'> { return 0; }</div><div class='hunk'>@@ -834,6 +845,20 @@ static inline void usb_mark_last_busy(struct usb_device *udev)</div><div class='ctx'> { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_USB_XHCI_SIDEBAND)</div><div class='add'>+int usb_offload_get(struct usb_device *udev);</div><div class='add'>+int usb_offload_put(struct usb_device *udev);</div><div class='add'>+bool usb_offload_check(struct usb_device *udev);</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int usb_offload_get(struct usb_device *udev)</div><div class='add'>+{ return 0; }</div><div class='add'>+static inline int usb_offload_put(struct usb_device *udev)</div><div class='add'>+{ return 0; }</div><div class='add'>+static inline bool usb_offload_check(struct usb_device *udev)</div><div class='add'>+{ return false; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> extern int usb_disable_lpm(struct usb_device *udev);</div><div class='ctx'> extern void usb_enable_lpm(struct usb_device *udev);</div><div class='ctx'> /* Same as above, but these functions lock/unlock the bandwidth_mutex. */</div><div class='hunk'>@@ -1126,8 +1151,8 @@ static inline int usb_make_path(struct usb_device *dev, char *buf, size_t size)</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> /* Stuff for dynamic usb ids */</div><div class='add'>+extern struct mutex usb_dynids_lock;</div><div class='ctx'> struct usb_dynids {</div><div class='del'>-	spinlock_t lock;</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1176,6 +1201,7 @@ extern ssize_t usb_show_dynids(struct usb_dynids *dynids, char *buf);</div><div class='ctx'>  *	post_reset method is called.</div><div class='ctx'>  * @post_reset: Called by usb_reset_device() after the device</div><div class='ctx'>  *	has been reset</div><div class='add'>+ * @shutdown: Called at shut-down time to quiesce the device.</div><div class='ctx'>  * @id_table: USB drivers use ID table to support hotplugging.</div><div class='ctx'>  *	Export this with MODULE_DEVICE_TABLE(usb,...).  This must be set</div><div class='ctx'>  *	or your driver's probe function will never get called.</div><div class='hunk'>@@ -1227,6 +1253,8 @@ struct usb_driver {</div><div class='ctx'> 	int (*pre_reset)(struct usb_interface *intf);</div><div class='ctx'> 	int (*post_reset)(struct usb_interface *intf);</div><div class='ctx'> </div><div class='add'>+	void (*shutdown)(struct usb_interface *intf);</div><div class='add'>+</div><div class='ctx'> 	const struct usb_device_id *id_table;</div><div class='ctx'> 	const struct attribute_group **dev_groups;</div><div class='ctx'> </div><div class='hunk'>@@ -1237,7 +1265,7 @@ struct usb_driver {</div><div class='ctx'> 	unsigned int disable_hub_initiated_lpm:1;</div><div class='ctx'> 	unsigned int soft_unbind:1;</div><div class='ctx'> };</div><div class='del'>-#define	to_usb_driver(d) container_of(d, struct usb_driver, driver)</div><div class='add'>+#define	to_usb_driver(d) container_of_const(d, struct usb_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct usb_device_driver - identifies USB device driver to usbcore</div><div class='hunk'>@@ -1288,8 +1316,7 @@ struct usb_device_driver {</div><div class='ctx'> 	unsigned int supports_autosuspend:1;</div><div class='ctx'> 	unsigned int generic_subclass:1;</div><div class='ctx'> };</div><div class='del'>-#define	to_usb_device_driver(d) container_of(d, struct usb_device_driver, \</div><div class='del'>-		driver)</div><div class='add'>+#define	to_usb_device_driver(d) container_of_const(d, struct usb_device_driver, driver)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct usb_class_driver - identifies a USB driver that wants to use the USB major number</div><div class='hunk'>@@ -1446,6 +1473,10 @@ typedef void (*usb_complete_t)(struct urb *);</div><div class='ctx'>  * @sg: scatter gather buffer list, the buffer size of each element in</div><div class='ctx'>  * 	the list (except the last) must be divisible by the endpoint's</div><div class='ctx'>  * 	max packet size if no_sg_constraint isn't set in 'struct usb_bus'</div><div class='add'>+ * @sgt: used to hold a scatter gather table returned by usb_alloc_noncoherent(),</div><div class='add'>+ *      which describes the allocated non-coherent and possibly non-contiguous</div><div class='add'>+ *      memory and is guaranteed to have 1 single DMA mapped segment. The</div><div class='add'>+ *      allocated memory needs to be freed by usb_free_noncoherent().</div><div class='ctx'>  * @num_mapped_sgs: (internal) number of mapped sg entries</div><div class='ctx'>  * @num_sgs: number of entries in the sg list</div><div class='ctx'>  * @transfer_buffer_length: How big is transfer_buffer.  The transfer may</div><div class='hunk'>@@ -1612,6 +1643,7 @@ struct urb {</div><div class='ctx'> 	void *transfer_buffer;		/* (in) associated data buffer */</div><div class='ctx'> 	dma_addr_t transfer_dma;	/* (in) dma addr for transfer_buffer */</div><div class='ctx'> 	struct scatterlist *sg;		/* (in) scatter gather buffer list */</div><div class='add'>+	struct sg_table *sgt;		/* (in) scatter gather table for noncoherent buffer */</div><div class='ctx'> 	int num_mapped_sgs;		/* (internal) mapped sg entries */</div><div class='ctx'> 	int num_sgs;			/* (in) number of entries in the sg list */</div><div class='ctx'> 	u32 transfer_buffer_length;	/* (in) data buffer length */</div><div class='hunk'>@@ -1773,7 +1805,6 @@ extern void usb_block_urb(struct urb *urb);</div><div class='ctx'> extern void usb_kill_anchored_urbs(struct usb_anchor *anchor);</div><div class='ctx'> extern void usb_poison_anchored_urbs(struct usb_anchor *anchor);</div><div class='ctx'> extern void usb_unpoison_anchored_urbs(struct usb_anchor *anchor);</div><div class='del'>-extern void usb_unlink_anchored_urbs(struct usb_anchor *anchor);</div><div class='ctx'> extern void usb_anchor_suspend_wakeups(struct usb_anchor *anchor);</div><div class='ctx'> extern void usb_anchor_resume_wakeups(struct usb_anchor *anchor);</div><div class='ctx'> extern void usb_anchor_urb(struct urb *urb, struct usb_anchor *anchor);</div><div class='hunk'>@@ -1818,6 +1849,16 @@ void *usb_alloc_coherent(struct usb_device *dev, size_t size,</div><div class='ctx'> void usb_free_coherent(struct usb_device *dev, size_t size,</div><div class='ctx'> 	void *addr, dma_addr_t dma);</div><div class='ctx'> </div><div class='add'>+enum dma_data_direction;</div><div class='add'>+</div><div class='add'>+void *usb_alloc_noncoherent(struct usb_device *dev, size_t size,</div><div class='add'>+			    gfp_t mem_flags, dma_addr_t *dma,</div><div class='add'>+			    enum dma_data_direction dir,</div><div class='add'>+			    struct sg_table **table);</div><div class='add'>+void usb_free_noncoherent(struct usb_device *dev, size_t size,</div><div class='add'>+			  void *addr, enum dma_data_direction dir,</div><div class='add'>+			  struct sg_table *table);</div><div class='add'>+</div><div class='ctx'> /*-------------------------------------------------------------------*</div><div class='ctx'>  *                         SYNCHRONOUS CALL SUPPORT                  *</div><div class='ctx'>  *-------------------------------------------------------------------*/</div><div class='hunk'>@@ -2016,6 +2057,12 @@ static inline u16 usb_maxpacket(struct usb_device *udev, int pipe)</div><div class='ctx'> 	return usb_endpoint_maxp(&amp;ep-&gt;desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 usb_endpoint_max_periodic_payload(struct usb_device *udev,</div><div class='add'>+				      const struct usb_host_endpoint *ep);</div><div class='add'>+</div><div class='add'>+bool usb_endpoint_is_hs_isoc_double(struct usb_device *udev,</div><div class='add'>+				    const struct usb_host_endpoint *ep);</div><div class='add'>+</div><div class='ctx'> /* translate USB error codes to codes user space understands */</div><div class='ctx'> static inline int usb_translate_errors(int error_code)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h<br/>index ca796dc1a984..6e5555610010 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/audio-v2.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/audio-v2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/audio-v2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/audio-v2.h</a></div><div class='hunk'>@@ -82,7 +82,7 @@ struct uac_clock_source_descriptor {</div><div class='ctx'> #define UAC_CLOCK_SOURCE_TYPE_INT_PROG	0x3</div><div class='ctx'> #define UAC_CLOCK_SOURCE_SYNCED_TO_SOF	(1 &lt;&lt; 2)</div><div class='ctx'> </div><div class='del'>-/* 4.7.2.2 Clock Source Descriptor */</div><div class='add'>+/* 4.7.2.2 Clock Selector Descriptor */</div><div class='ctx'> </div><div class='ctx'> struct uac_clock_selector_descriptor {</div><div class='ctx'> 	__u8 bLength;</div><div class='hunk'>@@ -91,7 +91,7 @@ struct uac_clock_selector_descriptor {</div><div class='ctx'> 	__u8 bClockID;</div><div class='ctx'> 	__u8 bNrInPins;</div><div class='ctx'> 	__u8 baCSourceID[];</div><div class='del'>-	/* bmControls and iClockSource omitted */</div><div class='add'>+	/* bmControls and iClockSelector omitted */</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> /* 4.7.2.3 Clock Multiplier Descriptor */</div><div class='head'>diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h<br/>index 2d207cb4837d..4ac082a63173 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/cdc_ncm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/cdc_ncm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/cdc_ncm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/cdc_ncm.h</a></div><div class='hunk'>@@ -119,6 +119,7 @@ struct cdc_ncm_ctx {</div><div class='ctx'> 	u32 timer_interval;</div><div class='ctx'> 	u32 max_ndp_size;</div><div class='ctx'> 	u8 is_ndp16;</div><div class='add'>+	u8 filtering_supported;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct usb_cdc_ncm_ndp16 *delayed_ndp16;</div><div class='ctx'> 		struct usb_cdc_ncm_ndp32 *delayed_ndp32;</div><div class='head'>diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h<br/>index 5a7f96684ea2..c6451191d2de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/chipidea.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/chipidea.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/chipidea.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/chipidea.h</a></div><div class='hunk'>@@ -65,12 +65,15 @@ struct ci_hdrc_platform_data {</div><div class='ctx'> #define CI_HDRC_PHY_VBUS_CONTROL	BIT(16)</div><div class='ctx'> #define CI_HDRC_HAS_PORTSC_PEC_MISSED	BIT(17)</div><div class='ctx'> #define CI_HDRC_FORCE_VBUS_ACTIVE_ALWAYS	BIT(18)</div><div class='add'>+#define	CI_HDRC_HAS_SHORT_PKT_LIMIT	BIT(19)</div><div class='add'>+#define	CI_HDRC_OUT_BAND_WAKEUP		BIT(20)</div><div class='ctx'> 	enum usb_dr_mode	dr_mode;</div><div class='ctx'> #define CI_HDRC_CONTROLLER_RESET_EVENT		0</div><div class='ctx'> #define CI_HDRC_CONTROLLER_STOPPED_EVENT	1</div><div class='ctx'> #define CI_HDRC_IMX_HSIC_ACTIVE_EVENT		2</div><div class='ctx'> #define CI_HDRC_IMX_HSIC_SUSPEND_EVENT		3</div><div class='ctx'> #define CI_HDRC_CONTROLLER_VBUS_EVENT		4</div><div class='add'>+#define CI_HDRC_CONTROLLER_PULLUP_EVENT		5</div><div class='ctx'> 	int	(*notify_event) (struct ci_hdrc *ci, unsigned event);</div><div class='ctx'> 	struct regulator	*reg_vbus;</div><div class='ctx'> 	struct usb_otg_caps	ci_otg_caps;</div><div class='head'>diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h<br/>index af3cd2aae4bc..c18041fafa52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/composite.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/composite.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/composite.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/composite.h</a></div><div class='hunk'>@@ -237,7 +237,7 @@ struct usb_function {</div><div class='ctx'> 	/* internals */</div><div class='ctx'> 	struct list_head		list;</div><div class='ctx'> 	DECLARE_BITMAP(endpoints, 32);</div><div class='del'>-	const struct usb_function_instance *fi;</div><div class='add'>+	struct usb_function_instance *fi;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		bind_deactivated:1;</div><div class='ctx'> };</div><div class='hunk'>@@ -256,7 +256,7 @@ int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f,</div><div class='ctx'> 			struct usb_ep *_ep);</div><div class='ctx'> int usb_func_wakeup(struct usb_function *func);</div><div class='ctx'> </div><div class='del'>-#define	MAX_CONFIG_INTERFACES		16	/* arbitrary; max 255 */</div><div class='add'>+#define	MAX_CONFIG_INTERFACES		32</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct usb_configuration - represents one gadget configuration</div><div class='hunk'>@@ -339,9 +339,6 @@ int usb_add_config(struct usb_composite_dev *,</div><div class='ctx'> 		struct usb_configuration *,</div><div class='ctx'> 		int (*)(struct usb_configuration *));</div><div class='ctx'> </div><div class='del'>-void usb_remove_config(struct usb_composite_dev *,</div><div class='del'>-		struct usb_configuration *);</div><div class='del'>-</div><div class='ctx'> /* predefined index for usb_composite_driver */</div><div class='ctx'> enum {</div><div class='ctx'> 	USB_GADGET_MANUFACTURER_IDX	= 0,</div><div class='head'>diff --git a/include/linux/usb/func_utils.h b/include/linux/usb/func_utils.h<br/>new file mode 100644<br/>index 000000000000..c8795c965109<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/func_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/func_utils.h</a></div><div class='hunk'>@@ -0,0 +1,86 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * func_utils.h</div><div class='add'>+ *</div><div class='add'>+ * Utility definitions for USB functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.</div><div class='add'>+ *		http://www.samsung.com</div><div class='add'>+ *</div><div class='add'>+ * Author: Andrzej Pietrasiewicz &lt;andrzejtp2010@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _FUNC_UTILS_H_</div><div class='add'>+#define _FUNC_UTILS_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/usb/gadget.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='add'>+</div><div class='add'>+/* Variable Length Array Macros **********************************************/</div><div class='add'>+#define vla_group(groupname) size_t groupname##__next = 0</div><div class='add'>+#define vla_group_size(groupname) groupname##__next</div><div class='add'>+</div><div class='add'>+#define vla_item(groupname, type, name, n) \</div><div class='add'>+	size_t groupname##_##name##__offset = ({			       \</div><div class='add'>+		size_t offset = 0;					       \</div><div class='add'>+		if (groupname##__next != SIZE_MAX) {			       \</div><div class='add'>+			size_t align_mask = __alignof__(type) - 1;	       \</div><div class='add'>+			size_t size = array_size(n, sizeof(type));	       \</div><div class='add'>+			offset = (groupname##__next + align_mask) &amp;	       \</div><div class='add'>+				  ~align_mask;				       \</div><div class='add'>+			if (check_add_overflow(offset, size,		       \</div><div class='add'>+					       &amp;groupname##__next)) {          \</div><div class='add'>+				groupname##__next = SIZE_MAX;		       \</div><div class='add'>+				offset = 0;				       \</div><div class='add'>+			}						       \</div><div class='add'>+		}							       \</div><div class='add'>+		offset;							       \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define vla_item_with_sz(groupname, type, name, n) \</div><div class='add'>+	size_t groupname##_##name##__sz = array_size(n, sizeof(type));	        \</div><div class='add'>+	size_t groupname##_##name##__offset = ({			        \</div><div class='add'>+		size_t offset = 0;						\</div><div class='add'>+		if (groupname##__next != SIZE_MAX) {				\</div><div class='add'>+			size_t align_mask = __alignof__(type) - 1;		\</div><div class='add'>+			offset = (groupname##__next + align_mask) &amp;		\</div><div class='add'>+				  ~align_mask;					\</div><div class='add'>+			if (check_add_overflow(offset, groupname##_##name##__sz,\</div><div class='add'>+							&amp;groupname##__next)) {	\</div><div class='add'>+				groupname##__next = SIZE_MAX;			\</div><div class='add'>+				offset = 0;					\</div><div class='add'>+			}							\</div><div class='add'>+		}								\</div><div class='add'>+		offset;								\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define vla_ptr(ptr, groupname, name) \</div><div class='add'>+	((void *) ((char *)ptr + groupname##_##name##__offset))</div><div class='add'>+</div><div class='add'>+struct usb_ep;</div><div class='add'>+struct usb_request;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * alloc_ep_req - returns a usb_request allocated by the gadget driver and</div><div class='add'>+ * allocates the request's buffer.</div><div class='add'>+ *</div><div class='add'>+ * @ep: the endpoint to allocate a usb_request</div><div class='add'>+ * @len: usb_requests's buffer suggested size</div><div class='add'>+ *</div><div class='add'>+ * In case @ep direction is OUT, the @len will be aligned to ep's</div><div class='add'>+ * wMaxPacketSize. In order to avoid memory leaks or drops, *always* use</div><div class='add'>+ * usb_requests's length (req-&gt;length) to refer to the allocated buffer size.</div><div class='add'>+ * Requests allocated via alloc_ep_req() *must* be freed by free_ep_req().</div><div class='add'>+ */</div><div class='add'>+struct usb_request *alloc_ep_req(struct usb_ep *ep, size_t len);</div><div class='add'>+</div><div class='add'>+/* Frees a usb_request previously allocated by alloc_ep_req() */</div><div class='add'>+static inline void free_ep_req(struct usb_ep *ep, struct usb_request *req)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(req-&gt;buf == NULL);</div><div class='add'>+	kfree(req-&gt;buf);</div><div class='add'>+	req-&gt;buf = NULL;</div><div class='add'>+	usb_ep_free_request(ep, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _FUNC_UTILS_H_ */</div><div class='head'>diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h<br/>index 6532beb587b1..8285b19a25e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/gadget.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/gadget.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/gadget.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/gadget.h</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #ifndef __LINUX_USB_GADGET_H</div><div class='ctx'> #define __LINUX_USB_GADGET_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='ctx'> #include &lt;linux/configfs.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -32,6 +33,7 @@ struct usb_ep;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct usb_request - describes one i/o request</div><div class='add'>+ * @ep: The associated endpoint set by usb_ep_alloc_request().</div><div class='ctx'>  * @buf: Buffer used for data.  Always provide this; some controllers</div><div class='ctx'>  *	only use PIO, or don't use DMA for some endpoints.</div><div class='ctx'>  * @dma: DMA address corresponding to 'buf'.  If you don't set this</div><div class='hunk'>@@ -52,6 +54,7 @@ struct usb_ep;</div><div class='ctx'>  * @short_not_ok: When reading data, makes short packets be</div><div class='ctx'>  *     treated as errors (queue stops advancing till cleanup).</div><div class='ctx'>  * @dma_mapped: Indicates if request has been mapped to DMA (internal)</div><div class='add'>+ * @sg_was_mapped: Set if the scatterlist has been mapped before the request</div><div class='ctx'>  * @complete: Function called when request completes, so this request and</div><div class='ctx'>  *	its buffer may be re-used.  The function will always be called with</div><div class='ctx'>  *	interrupts disabled, and it must not sleep.</div><div class='hunk'>@@ -97,6 +100,7 @@ struct usb_ep;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct usb_request {</div><div class='add'>+	struct usb_ep		*ep;</div><div class='ctx'> 	void			*buf;</div><div class='ctx'> 	unsigned		length;</div><div class='ctx'> 	dma_addr_t		dma;</div><div class='hunk'>@@ -111,6 +115,7 @@ struct usb_request {</div><div class='ctx'> 	unsigned		zero:1;</div><div class='ctx'> 	unsigned		short_not_ok:1;</div><div class='ctx'> 	unsigned		dma_mapped:1;</div><div class='add'>+	unsigned		sg_was_mapped:1;</div><div class='ctx'> </div><div class='ctx'> 	void			(*complete)(struct usb_ep *ep,</div><div class='ctx'> 					struct usb_request *req);</div><div class='hunk'>@@ -227,18 +232,18 @@ struct usb_ep {</div><div class='ctx'> </div><div class='ctx'> 	const char		*name;</div><div class='ctx'> 	const struct usb_ep_ops	*ops;</div><div class='add'>+	const struct usb_endpoint_descriptor	*desc;</div><div class='add'>+	const struct usb_ss_ep_comp_descriptor	*comp_desc;</div><div class='ctx'> 	struct list_head	ep_list;</div><div class='ctx'> 	struct usb_ep_caps	caps;</div><div class='ctx'> 	bool			claimed;</div><div class='ctx'> 	bool			enabled;</div><div class='del'>-	unsigned		maxpacket:16;</div><div class='del'>-	unsigned		maxpacket_limit:16;</div><div class='del'>-	unsigned		max_streams:16;</div><div class='ctx'> 	unsigned		mult:2;</div><div class='ctx'> 	unsigned		maxburst:5;</div><div class='ctx'> 	u8			address;</div><div class='del'>-	const struct usb_endpoint_descriptor	*desc;</div><div class='del'>-	const struct usb_ss_ep_comp_descriptor	*comp_desc;</div><div class='add'>+	u16			maxpacket;</div><div class='add'>+	u16			maxpacket_limit;</div><div class='add'>+	u16			max_streams;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -289,6 +294,28 @@ static inline void usb_ep_fifo_flush(struct usb_ep *ep)</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * free_usb_request - frees a usb_request object and its buffer</div><div class='add'>+ * @req: the request being freed</div><div class='add'>+ *</div><div class='add'>+ * This helper function frees both the request's buffer and the request object</div><div class='add'>+ * itself by calling usb_ep_free_request(). Its signature is designed to be used</div><div class='add'>+ * with DEFINE_FREE() to enable automatic, scope-based cleanup for usb_request</div><div class='add'>+ * pointers.</div><div class='add'>+ */</div><div class='add'>+static inline void free_usb_request(struct usb_request *req)</div><div class='add'>+{</div><div class='add'>+	if (!req)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	kfree(req-&gt;buf);</div><div class='add'>+	usb_ep_free_request(req-&gt;ep, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(free_usb_request, struct usb_request *, free_usb_request(_T))</div><div class='add'>+</div><div class='add'>+/*-------------------------------------------------------------------------*/</div><div class='add'>+</div><div class='ctx'> struct usb_dcd_config_params {</div><div class='ctx'> 	__u8  bU1devExitLat;	/* U1 Device exit Latency */</div><div class='ctx'> #define USB_DEFAULT_U1_DEV_EXIT_LAT	0x01	/* Less then 1 microsec */</div><div class='hunk'>@@ -349,6 +376,9 @@ struct usb_gadget_ops {</div><div class='ctx'>  *	can handle. The UDC must support this and all slower speeds and lower</div><div class='ctx'>  *	number of lanes.</div><div class='ctx'>  * @state: the state we are now (attached, suspended, configured, etc)</div><div class='add'>+ * @state_lock: Spinlock protecting the `state` and `teardown` members.</div><div class='add'>+ * @teardown: True if the device is undergoing teardown, used to prevent</div><div class='add'>+ *	new work from being scheduled during cleanup.</div><div class='ctx'>  * @name: Identifies the controller hardware type.  Used in diagnostics</div><div class='ctx'>  *	and sometimes configuration.</div><div class='ctx'>  * @dev: Driver model state for this abstract device.</div><div class='hunk'>@@ -424,6 +454,8 @@ struct usb_gadget {</div><div class='ctx'> 	enum usb_ssp_rate		max_ssp_rate;</div><div class='ctx'> </div><div class='ctx'> 	enum usb_device_state		state;</div><div class='add'>+	spinlock_t			state_lock;</div><div class='add'>+	bool				teardown;</div><div class='ctx'> 	const char			*name;</div><div class='ctx'> 	struct device			dev;</div><div class='ctx'> 	unsigned			isoch_delay;</div><div class='hunk'>@@ -858,10 +890,6 @@ container_of(str_item, struct gadget_string, item)</div><div class='ctx'> int usb_descriptor_fillbuf(void *, unsigned,</div><div class='ctx'> 		const struct usb_descriptor_header **);</div><div class='ctx'> </div><div class='del'>-/* build config descriptor from single descriptor vector */</div><div class='del'>-int usb_gadget_config_buf(const struct usb_config_descriptor *config,</div><div class='del'>-	void *buf, unsigned buflen, const struct usb_descriptor_header **desc);</div><div class='del'>-</div><div class='ctx'> /* copy a NULL-terminated vector of descriptors */</div><div class='ctx'> struct usb_descriptor_header **usb_copy_descriptors(</div><div class='ctx'> 		struct usb_descriptor_header **);</div><div class='head'>diff --git a/include/linux/usb/gadget_configfs.h b/include/linux/usb/gadget_configfs.h<br/>index d61aebd68128..6b5d6838f865 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/gadget_configfs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/gadget_configfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/gadget_configfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/gadget_configfs.h</a></div><div class='hunk'>@@ -4,9 +4,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/configfs.h&gt;</div><div class='ctx'> </div><div class='del'>-int check_user_usb_string(const char *name,</div><div class='del'>-		struct usb_gadget_strings *stringtab_dev);</div><div class='del'>-</div><div class='ctx'> #define GS_STRINGS_W(__struct, __name)	\</div><div class='ctx'> static ssize_t __struct##_##__name##_store(struct config_item *item, \</div><div class='ctx'> 		const char *page, size_t len)		\</div><div class='hunk'>@@ -37,7 +34,7 @@ static struct configfs_item_operations struct_in##_langid_item_ops = {	\</div><div class='ctx'> 	.release                = struct_in##_attr_release,		\</div><div class='ctx'> };									\</div><div class='ctx'> 									\</div><div class='del'>-static struct config_item_type struct_in##_langid_type = {		\</div><div class='add'>+static const struct config_item_type struct_in##_langid_type = {	\</div><div class='ctx'> 	.ct_item_ops	= &amp;struct_in##_langid_item_ops,			\</div><div class='ctx'> 	.ct_attrs	= struct_in##_langid_attrs,			\</div><div class='ctx'> 	.ct_owner	= THIS_MODULE,					\</div><div class='hunk'>@@ -94,7 +91,7 @@ static struct configfs_group_operations struct_in##_strings_ops = {	\</div><div class='ctx'> 	.drop_item      = &amp;struct_in##_strings_drop,			\</div><div class='ctx'> };									\</div><div class='ctx'> 									\</div><div class='del'>-static struct config_item_type struct_in##_strings_type = {		\</div><div class='add'>+static const struct config_item_type struct_in##_strings_type = {	\</div><div class='ctx'> 	.ct_group_ops   = &amp;struct_in##_strings_ops,			\</div><div class='ctx'> 	.ct_owner       = THIS_MODULE,					\</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/usb/mctp-usb.h b/include/linux/usb/mctp-usb.h<br/>new file mode 100644<br/>index 000000000000..a2f6f1e04efb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/mctp-usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/mctp-usb.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * mctp-usb.h - MCTP USB transport binding: common definitions,</div><div class='add'>+ * based on DMTF0283 specification:</div><div class='add'>+ * https://www.dmtf.org/sites/default/files/standards/documents/DSP0283_1.0.1.pdf</div><div class='add'>+ *</div><div class='add'>+ * These are protocol-level definitions, that may be shared between host</div><div class='add'>+ * and gadget drivers.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2024-2025 Code Construct Pty Ltd</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_USB_MCTP_USB_H</div><div class='add'>+#define __LINUX_USB_MCTP_USB_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct mctp_usb_hdr {</div><div class='add'>+	__be16	id;</div><div class='add'>+	u8	rsvd;</div><div class='add'>+	u8	len;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define MCTP_USB_XFER_SIZE	512</div><div class='add'>+#define MCTP_USB_BTU		68</div><div class='add'>+#define MCTP_USB_MTU_MIN	MCTP_USB_BTU</div><div class='add'>+#define MCTP_USB_MTU_MAX	(U8_MAX - sizeof(struct mctp_usb_hdr))</div><div class='add'>+#define MCTP_USB_DMTF_ID	0x1ab4</div><div class='add'>+</div><div class='add'>+#endif /*  __LINUX_USB_MCTP_USB_H */</div><div class='head'>diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h<br/>index 3963e55e88a3..fbdef950f06c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/musb.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/musb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/musb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/musb.h</a></div><div class='hunk'>@@ -61,7 +61,7 @@ struct musb_hdrc_eps_bits {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct musb_hdrc_config {</div><div class='del'>-	struct musb_fifo_cfg	*fifo_cfg;	/* board fifo configuration */</div><div class='add'>+	const struct musb_fifo_cfg	*fifo_cfg;	/* board fifo configuration */</div><div class='ctx'> 	unsigned		fifo_cfg_size;	/* size of the fifo configuration */</div><div class='ctx'> </div><div class='ctx'> 	/* MUSB configuration-specific details */</div><div class='head'>diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h<br/>index 98487fd7ab11..de42f14bd280 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/of.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/of.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/of.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/of.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #ifndef __LINUX_USB_OF_H</div><div class='ctx'> #define __LINUX_USB_OF_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/usb/ch9.h&gt;</div><div class='ctx'> #include &lt;linux/usb/otg.h&gt;</div><div class='ctx'> #include &lt;linux/usb/phy.h&gt;</div><div class='hunk'>@@ -17,6 +18,7 @@ enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *np, int arg0);</div><div class='ctx'> bool of_usb_host_tpl_support(struct device_node *np);</div><div class='ctx'> int of_usb_update_otg_caps(struct device_node *np,</div><div class='ctx'> 			struct usb_otg_caps *otg_caps);</div><div class='add'>+enum usb_port_connect_type usb_of_get_connect_type(struct usb_device *hub, int port1);</div><div class='ctx'> struct device_node *usb_of_get_device_node(struct usb_device *hub, int port1);</div><div class='ctx'> bool usb_of_has_combined_node(struct usb_device *udev);</div><div class='ctx'> struct device_node *usb_of_get_interface_node(struct usb_device *udev,</div><div class='hunk'>@@ -37,6 +39,11 @@ static inline int of_usb_update_otg_caps(struct device_node *np,</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+static inline enum usb_port_connect_type</div><div class='add'>+usb_of_get_connect_type(const struct usb_device *hub, int port1)</div><div class='add'>+{</div><div class='add'>+	return USB_PORT_CONNECT_TYPE_UNKNOWN;</div><div class='add'>+}</div><div class='ctx'> static inline struct device_node *</div><div class='ctx'> usb_of_get_device_node(struct usb_device *hub, int port1)</div><div class='ctx'> {</div><div class='head'>diff --git a/include/linux/usb/onboard_dev.h b/include/linux/usb/onboard_dev.h<br/>new file mode 100644<br/>index 000000000000..b79db6d193c8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/onboard_dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/onboard_dev.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef __LINUX_USB_ONBOARD_DEV_H</div><div class='add'>+#define __LINUX_USB_ONBOARD_DEV_H</div><div class='add'>+</div><div class='add'>+struct usb_device;</div><div class='add'>+struct list_head;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_USB_ONBOARD_DEV)</div><div class='add'>+void onboard_dev_create_pdevs(struct usb_device *parent_dev, struct list_head *pdev_list);</div><div class='add'>+void onboard_dev_destroy_pdevs(struct list_head *pdev_list);</div><div class='add'>+#else</div><div class='add'>+static inline void onboard_dev_create_pdevs(struct usb_device *parent_dev,</div><div class='add'>+					    struct list_head *pdev_list) {}</div><div class='add'>+static inline void onboard_dev_destroy_pdevs(struct list_head *pdev_list) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __LINUX_USB_ONBOARD_DEV_H */</div><div class='head'>diff --git a/include/linux/usb/onboard_hub.h b/include/linux/usb/onboard_hub.h<br/>deleted file mode 100644<br/>index d9373230556e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/onboard_hub.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/onboard_hub.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_USB_ONBOARD_HUB_H</div><div class='del'>-#define __LINUX_USB_ONBOARD_HUB_H</div><div class='del'>-</div><div class='del'>-struct usb_device;</div><div class='del'>-struct list_head;</div><div class='del'>-</div><div class='del'>-#if IS_ENABLED(CONFIG_USB_ONBOARD_HUB)</div><div class='del'>-void onboard_hub_create_pdevs(struct usb_device *parent_hub, struct list_head *pdev_list);</div><div class='del'>-void onboard_hub_destroy_pdevs(struct list_head *pdev_list);</div><div class='del'>-#else</div><div class='del'>-static inline void onboard_hub_create_pdevs(struct usb_device *parent_hub,</div><div class='del'>-					    struct list_head *pdev_list) {}</div><div class='del'>-static inline void onboard_hub_destroy_pdevs(struct list_head *pdev_list) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* __LINUX_USB_ONBOARD_HUB_H */</div><div class='head'>diff --git a/include/linux/usb/pd.h b/include/linux/usb/pd.h<br/>index eb626af0e4e7..6ccd1b2af993 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/pd.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/pd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/pd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/pd.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #ifndef __LINUX_USB_PD_H</div><div class='ctx'> #define __LINUX_USB_PD_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/usb/typec.h&gt;</div><div class='hunk'>@@ -33,7 +34,9 @@ enum pd_ctrl_msg_type {</div><div class='ctx'> 	PD_CTRL_FR_SWAP = 19,</div><div class='ctx'> 	PD_CTRL_GET_PPS_STATUS = 20,</div><div class='ctx'> 	PD_CTRL_GET_COUNTRY_CODES = 21,</div><div class='del'>-	/* 22-31 Reserved */</div><div class='add'>+	/* 22-23 Reserved */</div><div class='add'>+	PD_CTRL_GET_REVISION = 24,</div><div class='add'>+	/* 25-31 Reserved */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum pd_data_msg_type {</div><div class='hunk'>@@ -46,7 +49,9 @@ enum pd_data_msg_type {</div><div class='ctx'> 	PD_DATA_ALERT = 6,</div><div class='ctx'> 	PD_DATA_GET_COUNTRY_INFO = 7,</div><div class='ctx'> 	PD_DATA_ENTER_USB = 8,</div><div class='del'>-	/* 9-14 Reserved */</div><div class='add'>+	/* 9-11 Reserved */</div><div class='add'>+	PD_DATA_REVISION = 12,</div><div class='add'>+	/* 13-14 Reserved */</div><div class='ctx'> 	PD_DATA_VENDOR_DEF = 15,</div><div class='ctx'> 	/* 16-31 Reserved */</div><div class='ctx'> };</div><div class='hunk'>@@ -267,9 +272,11 @@ enum pd_pdo_type {</div><div class='ctx'> </div><div class='ctx'> enum pd_apdo_type {</div><div class='ctx'> 	APDO_TYPE_PPS = 0,</div><div class='add'>+	APDO_TYPE_EPR_AVS = 1,</div><div class='add'>+	APDO_TYPE_SPR_AVS = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define PDO_APDO_TYPE_SHIFT	28	/* Only valid value currently is 0x0 - PPS */</div><div class='add'>+#define PDO_APDO_TYPE_SHIFT	28</div><div class='ctx'> #define PDO_APDO_TYPE_MASK	0x3</div><div class='ctx'> </div><div class='ctx'> #define PDO_APDO_TYPE(t)	((t) &lt;&lt; PDO_APDO_TYPE_SHIFT)</div><div class='hunk'>@@ -293,6 +300,35 @@ enum pd_apdo_type {</div><div class='ctx'> 	PDO_PPS_APDO_MIN_VOLT(min_mv) | PDO_PPS_APDO_MAX_VOLT(max_mv) |	\</div><div class='ctx'> 	PDO_PPS_APDO_MAX_CURR(max_ma))</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Applicable only to EPR AVS APDO source cap as per</div><div class='add'>+ * Table 6.15 EPR Adjustable Voltage Supply APDO – Source</div><div class='add'>+ */</div><div class='add'>+#define PDO_EPR_AVS_APDO_PEAK_CURRENT	GENMASK(27, 26)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Applicable to both EPR AVS APDO source and sink cap as per</div><div class='add'>+ * Table 6.15 EPR Adjustable Voltage Supply APDO – Source</div><div class='add'>+ * Table 6.22 EPR Adjustable Voltage Supply APDO – Sink</div><div class='add'>+ */</div><div class='add'>+#define PDO_EPR_AVS_APDO_MAX_VOLT	GENMASK(25, 17)	/* 100mV unit */</div><div class='add'>+#define PDO_EPR_AVS_APDO_MIN_VOLT	GENMASK(15, 8)	/* 100mV unit */</div><div class='add'>+#define PDO_EPR_AVS_APDO_PDP		GENMASK(7, 0) /* 1W unit */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Applicable only SPR AVS APDO source cap as per</div><div class='add'>+ * Table 6.14 SPR Adjustable Voltage Supply APDO – Source</div><div class='add'>+ */</div><div class='add'>+#define PDO_SPR_AVS_APDO_PEAK_CURRENT		GENMASK(27, 26)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Applicable to both SPR AVS APDO source and sink cap as per</div><div class='add'>+ * Table 6.14 SPR Adjustable Voltage Supply APDO – Source</div><div class='add'>+ * Table 6.21 SPR Adjustable Voltage Supply APDO – Sink</div><div class='add'>+ */</div><div class='add'>+#define PDO_SPR_AVS_APDO_9V_TO_15V_MAX_CURR	GENMASK(19, 10)	/* 10mA unit */</div><div class='add'>+#define PDO_SPR_AVS_APDO_15V_TO_20V_MAX_CURR	GENMASK(9, 0)	/* 10mA unit */</div><div class='add'>+</div><div class='ctx'> static inline enum pd_pdo_type pdo_type(u32 pdo)</div><div class='ctx'> {</div><div class='ctx'> 	return (pdo &gt;&gt; PDO_TYPE_SHIFT) &amp; PDO_TYPE_MASK;</div><div class='hunk'>@@ -346,6 +382,41 @@ static inline unsigned int pdo_pps_apdo_max_current(u32 pdo)</div><div class='ctx'> 		PDO_PPS_APDO_CURR_MASK) * 50;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int pdo_epr_avs_apdo_src_peak_current(u32 pdo)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(PDO_EPR_AVS_APDO_PEAK_CURRENT, pdo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int pdo_epr_avs_apdo_min_voltage_mv(u32 pdo)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(PDO_EPR_AVS_APDO_MIN_VOLT, pdo) * 100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int pdo_epr_avs_apdo_max_voltage_mv(u32 pdo)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(PDO_EPR_AVS_APDO_MIN_VOLT, pdo) * 100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int pdo_epr_avs_apdo_pdp_w(u32 pdo)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(PDO_EPR_AVS_APDO_PDP, pdo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int pdo_spr_avs_apdo_src_peak_current(u32 pdo)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(PDO_SPR_AVS_APDO_PEAK_CURRENT, pdo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int pdo_spr_avs_apdo_9v_to_15v_max_current_ma(u32 pdo)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(PDO_SPR_AVS_APDO_9V_TO_15V_MAX_CURR, pdo) * 10;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int pdo_spr_avs_apdo_15v_to_20v_max_current_ma(u32 pdo)</div><div class='add'>+{</div><div class='add'>+	return FIELD_GET(PDO_SPR_AVS_APDO_15V_TO_20V_MAX_CURR, pdo) * 10;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* RDO: Request Data Object */</div><div class='ctx'> #define RDO_OBJ_POS_SHIFT	28</div><div class='ctx'> #define RDO_OBJ_POS_MASK	0x7</div><div class='hunk'>@@ -453,6 +524,20 @@ static inline unsigned int rdo_max_power(u32 rdo)</div><div class='ctx'> #define EUDO_TBT_SUPPORT		BIT(14)</div><div class='ctx'> #define EUDO_HOST_PRESENT		BIT(13)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Request Message Data Object (PD Revision 3.1+ only)</div><div class='add'>+ * --------</div><div class='add'>+ * &lt;31:28&gt; :: Revision Major</div><div class='add'>+ * &lt;27:24&gt; :: Revision Minor</div><div class='add'>+ * &lt;23:20&gt; :: Version Major</div><div class='add'>+ * &lt;19:16&gt; :: Version Minor</div><div class='add'>+ * &lt;15:0&gt;  :: Reserved, Shall be set to zero</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define RMDO(rev_maj, rev_min, ver_maj, ver_min)			\</div><div class='add'>+	(((rev_maj) &amp; 0xf) &lt;&lt; 28 | ((rev_min) &amp; 0xf) &lt;&lt; 24 |		\</div><div class='add'>+	 ((ver_maj) &amp; 0xf) &lt;&lt; 20 | ((ver_min) &amp; 0xf) &lt;&lt; 16)</div><div class='add'>+</div><div class='ctx'> /* USB PD timers and counters */</div><div class='ctx'> #define PD_T_NO_RESPONSE	5000	/* 4.5 - 5.5 seconds */</div><div class='ctx'> #define PD_T_DB_DETECT		10000	/* 10 - 15 seconds */</div><div class='hunk'>@@ -483,6 +568,7 @@ static inline unsigned int rdo_max_power(u32 rdo)</div><div class='ctx'> #define PD_T_BIST_CONT_MODE	50	/* 30 - 60 ms */</div><div class='ctx'> #define PD_T_SINK_TX		16	/* 16 - 20 ms */</div><div class='ctx'> #define PD_T_CHUNK_NOT_SUPP	42	/* 40 - 50 ms */</div><div class='add'>+#define PD_T_VCONN_STABLE	50</div><div class='ctx'> </div><div class='ctx'> #define PD_T_DRP_TRY		100	/* 75 - 150 ms */</div><div class='ctx'> #define PD_T_DRP_TRYWAIT	600	/* 400 - 800 ms */</div><div class='head'>diff --git a/include/linux/usb/pd_vdo.h b/include/linux/usb/pd_vdo.h<br/>index 3a747938cdab..5c48e8a81403 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/pd_vdo.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/pd_vdo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/pd_vdo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/pd_vdo.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #define __LINUX_USB_PD_VDO_H</div><div class='ctx'> </div><div class='ctx'> #include "pd.h"</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * VDO : Vendor Defined Message Object</div><div class='hunk'>@@ -86,12 +87,15 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Request is simply properly formatted SVDM header</div><div class='ctx'>  *</div><div class='del'>- * Response is 4 data objects:</div><div class='add'>+ * Response is 4 data objects for Power Delivery 2.0 and Passive Cables for</div><div class='add'>+ * Power Delivery 3.0. Active Cables in Power Delivery 3.0 have 5 data objects.</div><div class='ctx'>  * [0] :: SVDM header</div><div class='ctx'>  * [1] :: Identitiy header</div><div class='ctx'>  * [2] :: Cert Stat VDO</div><div class='ctx'>  * [3] :: (Product | Cable) VDO</div><div class='add'>+ * [4] :: Cable VDO 1</div><div class='ctx'>  * [4] :: AMA VDO</div><div class='add'>+ * [5] :: Cable VDO 2</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #define VDO_INDEX_HDR		0</div><div class='hunk'>@@ -100,6 +104,8 @@</div><div class='ctx'> #define VDO_INDEX_CABLE		3</div><div class='ctx'> #define VDO_INDEX_PRODUCT	3</div><div class='ctx'> #define VDO_INDEX_AMA		4</div><div class='add'>+#define VDO_INDEX_CABLE_1	4</div><div class='add'>+#define VDO_INDEX_CABLE_2	5</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SVDM Identity Header</div><div class='hunk'>@@ -150,6 +156,7 @@</div><div class='ctx'> #define PD_IDH_MODAL_SUPP(vdo)	((vdo) &amp; (1 &lt;&lt; 26))</div><div class='ctx'> #define PD_IDH_DFP_PTYPE(vdo)	(((vdo) &gt;&gt; 23) &amp; 0x7)</div><div class='ctx'> #define PD_IDH_CONN_TYPE(vdo)	(((vdo) &gt;&gt; 21) &amp; 0x3)</div><div class='add'>+#define PD_IDH_HOST_SUPP(vdo)  ((vdo) &amp; (1 &lt;&lt; 31))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Cert Stat VDO</div><div class='hunk'>@@ -182,7 +189,7 @@</div><div class='ctx'>  * &lt;5:3&gt;   :: Alternate modes</div><div class='ctx'>  * &lt;2:0&gt;   :: USB highest speed</div><div class='ctx'>  */</div><div class='del'>-#define PD_VDO_UFP_DEVCAP(vdo)	(((vdo) &amp; GENMASK(27, 24)) &gt;&gt; 24)</div><div class='add'>+#define PD_VDO_UFP_DEVCAP(vdo)	FIELD_GET(GENMASK(27, 24), vdo)</div><div class='ctx'> </div><div class='ctx'> /* UFP VDO Version */</div><div class='ctx'> #define UFP_VDO_VER1_2		2</div><div class='hunk'>@@ -241,7 +248,7 @@</div><div class='ctx'>  * &lt;21:5&gt;  :: Reserved</div><div class='ctx'>  * &lt;4:0&gt;   :: Port number</div><div class='ctx'>  */</div><div class='del'>-#define PD_VDO_DFP_HOSTCAP(vdo)	(((vdo) &amp; GENMASK(26, 24)) &gt;&gt; 24)</div><div class='add'>+#define PD_VDO_DFP_HOSTCAP(vdo)	FIELD_GET(GENMASK(26, 24), vdo)</div><div class='ctx'> </div><div class='ctx'> #define DFP_VDO_VER1_1		1</div><div class='ctx'> #define HOST_USB2_CAPABLE	BIT(0)</div><div class='head'>diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h<br/>index e4de6bc1f69b..0fa9885a1038 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/phy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/phy.h</a></div><div class='hunk'>@@ -223,7 +223,6 @@ extern struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,</div><div class='ctx'> extern struct usb_phy *devm_usb_get_phy_by_node(struct device *dev,</div><div class='ctx'> 	struct device_node *node, struct notifier_block *nb);</div><div class='ctx'> extern void usb_put_phy(struct usb_phy *);</div><div class='del'>-extern void devm_usb_put_phy(struct device *dev, struct usb_phy *x);</div><div class='ctx'> extern void usb_phy_set_event(struct usb_phy *x, unsigned long event);</div><div class='ctx'> extern void usb_phy_set_charger_current(struct usb_phy *usb_phy,</div><div class='ctx'> 					unsigned int mA);</div><div class='hunk'>@@ -259,10 +258,6 @@ static inline void usb_put_phy(struct usb_phy *x)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void devm_usb_put_phy(struct device *dev, struct usb_phy *x)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void usb_phy_set_event(struct usb_phy *x, unsigned long event)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='head'>diff --git a/include/linux/usb/r8152.h b/include/linux/usb/r8152.h<br/>index 33a4c146dc19..2ca60828f28b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/r8152.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/r8152.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/r8152.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/r8152.h</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #define VENDOR_ID_NVIDIA		0x0955</div><div class='ctx'> #define VENDOR_ID_TPLINK		0x2357</div><div class='ctx'> #define VENDOR_ID_DLINK			0x2001</div><div class='add'>+#define VENDOR_ID_DELL			0x413c</div><div class='ctx'> #define VENDOR_ID_ASUS			0x0b05</div><div class='ctx'> </div><div class='ctx'> #if IS_REACHABLE(CONFIG_USB_RTL8152)</div><div class='head'>diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h<br/>index 372898d9eeb0..67bfcda6c7d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/renesas_usbhs.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/renesas_usbhs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/renesas_usbhs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/renesas_usbhs.h</a></div><div class='hunk'>@@ -194,9 +194,4 @@ struct renesas_usbhs_platform_info {</div><div class='ctx'> 	struct renesas_usbhs_driver_param	driver_param;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * macro for platform</div><div class='del'>- */</div><div class='del'>-#define renesas_usbhs_get_info(pdev)\</div><div class='del'>-	((struct renesas_usbhs_platform_info *)(pdev)-&gt;dev.platform_data)</div><div class='ctx'> #endif /* RENESAS_USB_H */</div><div class='head'>diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h<br/>index 1a0a4dc87980..75b2b763f1ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/serial.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/serial.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/serial.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/serial.h</a></div><div class='hunk'>@@ -311,8 +311,11 @@ struct usb_serial_driver {</div><div class='ctx'> #define to_usb_serial_driver(d) \</div><div class='ctx'> 	container_of(d, struct usb_serial_driver, driver)</div><div class='ctx'> </div><div class='del'>-int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[],</div><div class='del'>-		const char *name, const struct usb_device_id *id_table);</div><div class='add'>+#define usb_serial_register_drivers(serial_drivers, name, id_table) \</div><div class='add'>+	__usb_serial_register_drivers(serial_drivers, THIS_MODULE, name, id_table)</div><div class='add'>+int __usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[],</div><div class='add'>+				  struct module *owner, const char *name,</div><div class='add'>+				  const struct usb_device_id *id_table);</div><div class='ctx'> void usb_serial_deregister_drivers(struct usb_serial_driver *const serial_drivers[]);</div><div class='ctx'> void usb_serial_port_softint(struct usb_serial_port *port);</div><div class='ctx'> </div><div class='head'>diff --git a/include/linux/usb/storage.h b/include/linux/usb/storage.h<br/>index 2827ce72e502..51be3bb8fccb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/storage.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/storage.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/storage.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/storage.h</a></div><div class='hunk'>@@ -53,7 +53,7 @@ struct bulk_cb_wrap {</div><div class='ctx'> 	__le32	Signature;		/* contains 'USBC' */</div><div class='ctx'> 	__u32	Tag;			/* unique per command id */</div><div class='ctx'> 	__le32	DataTransferLength;	/* size of data */</div><div class='del'>-	__u8	Flags;			/* direction in bit 0 */</div><div class='add'>+	__u8	Flags;			/* direction in bit 7 */</div><div class='ctx'> 	__u8	Lun;			/* LUN normally 0 */</div><div class='ctx'> 	__u8	Length;			/* length of the CDB */</div><div class='ctx'> 	__u8	CDB[16];		/* max command */</div><div class='hunk'>@@ -82,4 +82,12 @@ struct bulk_cs_wrap {</div><div class='ctx'> #define US_BULK_RESET_REQUEST   0xff</div><div class='ctx'> #define US_BULK_GET_MAX_LUN     0xfe</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If 4 LUNs are supported then the LUNs would be</div><div class='add'>+ * numbered from 0 to 3, and the return value for</div><div class='add'>+ * US_BULK_GET_MAX_LUN request would be 3. The valid</div><div class='add'>+ * LUN field is 4 bits wide, the upper limit is 0x0f.</div><div class='add'>+ */</div><div class='add'>+#define US_BULK_MAX_LUN_LIMIT   0x0f</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h<br/>index 467e8045e9f8..f7f5cfbdef12 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/tcpci.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/tcpci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/tcpci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/tcpci.h</a></div><div class='hunk'>@@ -47,6 +47,9 @@</div><div class='ctx'> #define TCPC_SINK_FAST_ROLE_SWAP	BIT(0)</div><div class='ctx'> </div><div class='ctx'> #define TCPC_CONFIG_STD_OUTPUT		0x18</div><div class='add'>+#define TCPC_CONFIG_STD_OUTPUT_ORIENTATION_MASK		BIT(0)</div><div class='add'>+#define TCPC_CONFIG_STD_OUTPUT_ORIENTATION_NORMAL	0</div><div class='add'>+#define TCPC_CONFIG_STD_OUTPUT_ORIENTATION_FLIPPED	1</div><div class='ctx'> </div><div class='ctx'> #define TCPC_TCPC_CTRL			0x19</div><div class='ctx'> #define TCPC_TCPC_CTRL_ORIENTATION	BIT(0)</div><div class='hunk'>@@ -60,15 +63,12 @@</div><div class='ctx'> </div><div class='ctx'> #define TCPC_ROLE_CTRL			0x1a</div><div class='ctx'> #define TCPC_ROLE_CTRL_DRP		BIT(6)</div><div class='del'>-#define TCPC_ROLE_CTRL_RP_VAL_SHIFT	4</div><div class='del'>-#define TCPC_ROLE_CTRL_RP_VAL_MASK	0x3</div><div class='add'>+#define TCPC_ROLE_CTRL_RP_VAL		GENMASK(5, 4)</div><div class='ctx'> #define TCPC_ROLE_CTRL_RP_VAL_DEF	0x0</div><div class='ctx'> #define TCPC_ROLE_CTRL_RP_VAL_1_5	0x1</div><div class='ctx'> #define TCPC_ROLE_CTRL_RP_VAL_3_0	0x2</div><div class='del'>-#define TCPC_ROLE_CTRL_CC2_SHIFT	2</div><div class='del'>-#define TCPC_ROLE_CTRL_CC2_MASK		0x3</div><div class='del'>-#define TCPC_ROLE_CTRL_CC1_SHIFT	0</div><div class='del'>-#define TCPC_ROLE_CTRL_CC1_MASK		0x3</div><div class='add'>+#define TCPC_ROLE_CTRL_CC2		GENMASK(3, 2)</div><div class='add'>+#define TCPC_ROLE_CTRL_CC1		GENMASK(1, 0)</div><div class='ctx'> #define TCPC_ROLE_CTRL_CC_RA		0x0</div><div class='ctx'> #define TCPC_ROLE_CTRL_CC_RP		0x1</div><div class='ctx'> #define TCPC_ROLE_CTRL_CC_RD		0x2</div><div class='hunk'>@@ -89,11 +89,9 @@</div><div class='ctx'> #define TCPC_CC_STATUS_TERM		BIT(4)</div><div class='ctx'> #define TCPC_CC_STATUS_TERM_RP		0</div><div class='ctx'> #define TCPC_CC_STATUS_TERM_RD		1</div><div class='add'>+#define TCPC_CC_STATUS_CC2		GENMASK(3, 2)</div><div class='add'>+#define TCPC_CC_STATUS_CC1		GENMASK(1, 0)</div><div class='ctx'> #define TCPC_CC_STATE_SRC_OPEN		0</div><div class='del'>-#define TCPC_CC_STATUS_CC2_SHIFT	2</div><div class='del'>-#define TCPC_CC_STATUS_CC2_MASK		0x3</div><div class='del'>-#define TCPC_CC_STATUS_CC1_SHIFT	0</div><div class='del'>-#define TCPC_CC_STATUS_CC1_MASK		0x3</div><div class='ctx'> </div><div class='ctx'> #define TCPC_POWER_STATUS		0x1e</div><div class='ctx'> #define TCPC_POWER_STATUS_DBG_ACC_CON	BIT(7)</div><div class='hunk'>@@ -127,12 +125,12 @@</div><div class='ctx'> #define TCPC_DEV_CAP_2			0x26</div><div class='ctx'> #define TCPC_STD_INPUT_CAP		0x28</div><div class='ctx'> #define TCPC_STD_OUTPUT_CAP		0x29</div><div class='add'>+#define TCPC_STD_OUTPUT_CAP_ORIENTATION	BIT(0)</div><div class='ctx'> </div><div class='ctx'> #define TCPC_MSG_HDR_INFO		0x2e</div><div class='ctx'> #define TCPC_MSG_HDR_INFO_DATA_ROLE	BIT(3)</div><div class='add'>+#define TCPC_MSG_HDR_INFO_REV		GENMASK(2, 1)</div><div class='ctx'> #define TCPC_MSG_HDR_INFO_PWR_ROLE	BIT(0)</div><div class='del'>-#define TCPC_MSG_HDR_INFO_REV_SHIFT	1</div><div class='del'>-#define TCPC_MSG_HDR_INFO_REV_MASK	0x3</div><div class='ctx'> </div><div class='ctx'> #define TCPC_RX_DETECT			0x2f</div><div class='ctx'> #define TCPC_RX_DETECT_HARD_RESET	BIT(5)</div><div class='hunk'>@@ -145,14 +143,13 @@</div><div class='ctx'> #define TCPC_RX_BYTE_CNT		0x30</div><div class='ctx'> #define TCPC_RX_BUF_FRAME_TYPE		0x31</div><div class='ctx'> #define TCPC_RX_BUF_FRAME_TYPE_SOP	0</div><div class='add'>+#define TCPC_RX_BUF_FRAME_TYPE_SOP1	1</div><div class='ctx'> #define TCPC_RX_HDR			0x32</div><div class='ctx'> #define TCPC_RX_DATA			0x34 /* through 0x4f */</div><div class='ctx'> </div><div class='ctx'> #define TCPC_TRANSMIT			0x50</div><div class='del'>-#define TCPC_TRANSMIT_RETRY_SHIFT	4</div><div class='del'>-#define TCPC_TRANSMIT_RETRY_MASK	0x3</div><div class='del'>-#define TCPC_TRANSMIT_TYPE_SHIFT	0</div><div class='del'>-#define TCPC_TRANSMIT_TYPE_MASK		0x7</div><div class='add'>+#define TCPC_TRANSMIT_RETRY		GENMASK(5, 4)</div><div class='add'>+#define TCPC_TRANSMIT_TYPE		GENMASK(2, 0)</div><div class='ctx'> </div><div class='ctx'> #define TCPC_TX_BYTE_CNT		0x51</div><div class='ctx'> #define TCPC_TX_HDR			0x52</div><div class='hunk'>@@ -173,8 +170,7 @@</div><div class='ctx'> </div><div class='ctx'> #define tcpc_presenting_rd(reg, cc) \</div><div class='ctx'> 	(!(TCPC_ROLE_CTRL_DRP &amp; (reg)) &amp;&amp; \</div><div class='del'>-	 (((reg) &amp; (TCPC_ROLE_CTRL_## cc ##_MASK &lt;&lt; TCPC_ROLE_CTRL_## cc ##_SHIFT)) == \</div><div class='del'>-	  (TCPC_ROLE_CTRL_CC_RD &lt;&lt; TCPC_ROLE_CTRL_## cc ##_SHIFT)))</div><div class='add'>+	 FIELD_GET(TCPC_ROLE_CTRL_## cc, reg) == TCPC_ROLE_CTRL_CC_RD)</div><div class='ctx'> </div><div class='ctx'> struct tcpci;</div><div class='ctx'> </div><div class='hunk'>@@ -185,7 +181,7 @@ struct tcpci;</div><div class='ctx'>  *		Optional; Callback to perform chip specific operations when FRS</div><div class='ctx'>  *		is sourcing vbus.</div><div class='ctx'>  * @auto_discharge_disconnect:</div><div class='del'>- *		Optional; Enables TCPC to autonously discharge vbus on disconnect.</div><div class='add'>+ *		Optional; Enables TCPC to autonomously discharge vbus on disconnect.</div><div class='ctx'>  * @vbus_vsafe0v:</div><div class='ctx'>  *		optional; Set when TCPC can detect whether vbus is at VSAFE0V.</div><div class='ctx'>  * @set_partner_usb_comm_capable:</div><div class='hunk'>@@ -198,12 +194,27 @@ struct tcpci;</div><div class='ctx'>  *		Chip level drivers are expected to check for contaminant and call</div><div class='ctx'>  *		tcpm_clean_port when the port is clean to put the port back into</div><div class='ctx'>  *		toggling state.</div><div class='add'>+ * @cable_comm_capable</div><div class='add'>+ *		optional; Set when TCPC can communicate with cable plugs over SOP'</div><div class='add'>+ * @attempt_vconn_swap_discovery:</div><div class='add'>+ *		Optional; The callback is called by the TCPM when the result of</div><div class='add'>+ *		a Discover Identity request indicates that the port partner is</div><div class='add'>+ *		a receptacle capable of modal operation. Chip level TCPCI drivers</div><div class='add'>+ *		can implement their own policy to determine if and when a Vconn</div><div class='add'>+ *		swap following Discover Identity on SOP' occurs.</div><div class='add'>+ *		Return true when the TCPM is allowed to request a Vconn swap</div><div class='add'>+ *		after Discovery Identity on SOP.</div><div class='add'>+ * @set_orientation:</div><div class='add'>+ *		Optional; Enable setting the connector orientation</div><div class='add'>+ *		CONFIG_STANDARD_OUTPUT (0x18) bit0.</div><div class='ctx'>  */</div><div class='ctx'> struct tcpci_data {</div><div class='ctx'> 	struct regmap *regmap;</div><div class='ctx'> 	unsigned char TX_BUF_BYTE_x_hidden:1;</div><div class='ctx'> 	unsigned char auto_discharge_disconnect:1;</div><div class='ctx'> 	unsigned char vbus_vsafe0v:1;</div><div class='add'>+	unsigned char cable_comm_capable:1;</div><div class='add'>+	unsigned char set_orientation:1;</div><div class='ctx'> </div><div class='ctx'> 	int (*init)(struct tcpci *tcpci, struct tcpci_data *data);</div><div class='ctx'> 	int (*set_vconn)(struct tcpci *tcpci, struct tcpci_data *data,</div><div class='hunk'>@@ -215,6 +226,7 @@ struct tcpci_data {</div><div class='ctx'> 	void (*set_partner_usb_comm_capable)(struct tcpci *tcpci, struct tcpci_data *data,</div><div class='ctx'> 					     bool capable);</div><div class='ctx'> 	void (*check_contaminant)(struct tcpci *tcpci, struct tcpci_data *data);</div><div class='add'>+	bool (*attempt_vconn_swap_discovery)(struct tcpci *tcpci, struct tcpci_data *data);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data);</div><div class='hunk'>@@ -235,7 +247,7 @@ static inline enum typec_cc_status tcpci_to_typec_cc(unsigned int cc, bool sink)</div><div class='ctx'> 		if (sink)</div><div class='ctx'> 			return TYPEC_CC_RP_3_0;</div><div class='ctx'> 		fallthrough;</div><div class='del'>-	case 0x0:</div><div class='add'>+	case TCPC_CC_STATE_SRC_OPEN:</div><div class='ctx'> 	default:</div><div class='ctx'> 		return TYPEC_CC_OPEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h<br/>index 65fac5e1f317..b22e659f81ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/tcpm.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/tcpm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/tcpm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/tcpm.h</a></div><div class='hunk'>@@ -119,6 +119,17 @@ enum tcpm_transmit_type {</div><div class='ctx'>  *		at the end of the deboumce period or when the port is still</div><div class='ctx'>  *		toggling. Chip level drivers are expected to check for contaminant</div><div class='ctx'>  *		and call tcpm_clean_port when the port is clean.</div><div class='add'>+ * @cable_comm_capable</div><div class='add'>+ *		Optional; Returns whether cable communication over SOP' is supported</div><div class='add'>+ *		by the tcpc</div><div class='add'>+ * @attempt_vconn_swap_discovery:</div><div class='add'>+ *		Optional; The callback is called by the TCPM when the result of</div><div class='add'>+ *		a Discover Identity request indicates that the port partner is</div><div class='add'>+ *		a receptacle capable of modal operation. Chip level TCPCI drivers</div><div class='add'>+ *		can implement their own policy to determine if and when a Vconn</div><div class='add'>+ *		swap following Discover Identity on SOP' occurs.</div><div class='add'>+ *		Return true when the TCPM is allowed to request a Vconn swap</div><div class='add'>+ *		after Discovery Identity on SOP.</div><div class='ctx'>  */</div><div class='ctx'> struct tcpc_dev {</div><div class='ctx'> 	struct fwnode_handle *fwnode;</div><div class='hunk'>@@ -133,6 +144,8 @@ struct tcpc_dev {</div><div class='ctx'> 		      enum typec_cc_status *cc2);</div><div class='ctx'> 	int (*set_polarity)(struct tcpc_dev *dev,</div><div class='ctx'> 			    enum typec_cc_polarity polarity);</div><div class='add'>+	int (*set_orientation)(struct tcpc_dev *dev,</div><div class='add'>+			       enum typec_orientation orientation);</div><div class='ctx'> 	int (*set_vconn)(struct tcpc_dev *dev, bool on);</div><div class='ctx'> 	int (*set_vbus)(struct tcpc_dev *dev, bool on, bool charge);</div><div class='ctx'> 	int (*set_current_limit)(struct tcpc_dev *dev, u32 max_ma, u32 mv);</div><div class='hunk'>@@ -150,10 +163,13 @@ struct tcpc_dev {</div><div class='ctx'> 	void (*frs_sourcing_vbus)(struct tcpc_dev *dev);</div><div class='ctx'> 	int (*enable_auto_vbus_discharge)(struct tcpc_dev *dev, bool enable);</div><div class='ctx'> 	int (*set_auto_vbus_discharge_threshold)(struct tcpc_dev *dev, enum typec_pwr_opmode mode,</div><div class='del'>-						 bool pps_active, u32 requested_vbus_voltage);</div><div class='add'>+						 bool pps_active, u32 requested_vbus_voltage,</div><div class='add'>+						 u32 pps_apdo_min_voltage);</div><div class='ctx'> 	bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev);</div><div class='ctx'> 	void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable);</div><div class='ctx'> 	void (*check_contaminant)(struct tcpc_dev *dev);</div><div class='add'>+	bool (*cable_comm_capable)(struct tcpc_dev *dev);</div><div class='add'>+	bool (*attempt_vconn_swap_discovery)(struct tcpc_dev *dev);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tcpm_port;</div><div class='hunk'>@@ -166,7 +182,8 @@ void tcpm_cc_change(struct tcpm_port *port);</div><div class='ctx'> void tcpm_sink_frs(struct tcpm_port *port);</div><div class='ctx'> void tcpm_sourcing_vbus(struct tcpm_port *port);</div><div class='ctx'> void tcpm_pd_receive(struct tcpm_port *port,</div><div class='del'>-		     const struct pd_message *msg);</div><div class='add'>+		     const struct pd_message *msg,</div><div class='add'>+		     enum tcpm_transmit_type rx_sop_type);</div><div class='ctx'> void tcpm_pd_transmit_complete(struct tcpm_port *port,</div><div class='ctx'> 			       enum tcpm_transmit_status status);</div><div class='ctx'> void tcpm_pd_hard_reset(struct tcpm_port *port);</div><div class='head'>diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h<br/>index 46e73584b6e6..40afcee8b4f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/tegra_usb_phy.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/tegra_usb_phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/tegra_usb_phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/tegra_usb_phy.h</a></div><div class='hunk'>@@ -7,11 +7,12 @@</div><div class='ctx'> #define __TEGRA_USB_PHY_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/reset.h&gt;</div><div class='ctx'> #include &lt;linux/usb/otg.h&gt;</div><div class='ctx'> </div><div class='add'>+struct gpio_desc;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * utmi_pll_config_in_car_module: true if the UTMI PLL configuration registers</div><div class='ctx'>  *     should be set up by clk-tegra, false if by the PHY code</div><div class='hunk'>@@ -79,13 +80,4 @@ struct tegra_usb_phy {</div><div class='ctx'> 	bool powered_on;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void tegra_usb_phy_preresume(struct usb_phy *phy);</div><div class='del'>-</div><div class='del'>-void tegra_usb_phy_postresume(struct usb_phy *phy);</div><div class='del'>-</div><div class='del'>-void tegra_ehci_phy_restore_start(struct usb_phy *phy,</div><div class='del'>-				 enum tegra_usb_phy_port_speed port_speed);</div><div class='del'>-</div><div class='del'>-void tegra_ehci_phy_restore_end(struct usb_phy *phy);</div><div class='del'>-</div><div class='ctx'> #endif /* __TEGRA_USB_PHY_H */</div><div class='head'>diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h<br/>index a05d6f6f2536..309251572e2e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/typec.h</a></div><div class='hunk'>@@ -18,6 +18,7 @@ struct typec_cable;</div><div class='ctx'> struct typec_plug;</div><div class='ctx'> struct typec_port;</div><div class='ctx'> struct typec_altmode_ops;</div><div class='add'>+struct typec_cable_ops;</div><div class='ctx'> </div><div class='ctx'> struct fwnode_handle;</div><div class='ctx'> struct device;</div><div class='hunk'>@@ -86,6 +87,17 @@ enum typec_orientation {</div><div class='ctx'> 	TYPEC_ORIENTATION_REVERSE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum usb_mode {</div><div class='add'>+	USB_MODE_NONE,</div><div class='add'>+	USB_MODE_USB2,</div><div class='add'>+	USB_MODE_USB3,</div><div class='add'>+	USB_MODE_USB4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define USB_CAPABILITY_USB2	BIT(0)</div><div class='add'>+#define USB_CAPABILITY_USB3	BIT(1)</div><div class='add'>+#define USB_CAPABILITY_USB4	BIT(2)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * struct enter_usb_data - Enter_USB Message details</div><div class='ctx'>  * @eudo: Enter_USB Data Object</div><div class='hunk'>@@ -128,6 +140,7 @@ int typec_cable_set_identity(struct typec_cable *cable);</div><div class='ctx'>  * @mode: Index of the Mode</div><div class='ctx'>  * @vdo: VDO returned by Discover Modes USB PD command</div><div class='ctx'>  * @roles: Only for ports. DRP if the mode is available in both roles</div><div class='add'>+ * @inactive: Only for ports. Make this port inactive (default is active).</div><div class='ctx'>  *</div><div class='ctx'>  * Description of an Alternate Mode which a connector, cable plug or partner</div><div class='ctx'>  * supports.</div><div class='hunk'>@@ -138,6 +151,7 @@ struct typec_altmode_desc {</div><div class='ctx'> 	u32			vdo;</div><div class='ctx'> 	/* Only used with ports */</div><div class='ctx'> 	enum typec_port_data	roles;</div><div class='add'>+	bool			inactive;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void typec_partner_set_pd_revision(struct typec_partner *partner, u16 pd_revision);</div><div class='hunk'>@@ -157,12 +171,18 @@ void typec_port_register_altmodes(struct typec_port *port,</div><div class='ctx'> 	const struct typec_altmode_ops *ops, void *drvdata,</div><div class='ctx'> 	struct typec_altmode **altmodes, size_t n);</div><div class='ctx'> </div><div class='add'>+void typec_port_register_cable_ops(struct typec_altmode **altmodes, int max_altmodes,</div><div class='add'>+				   const struct typec_cable_ops *ops);</div><div class='add'>+</div><div class='ctx'> void typec_unregister_altmode(struct typec_altmode *altmode);</div><div class='ctx'> </div><div class='ctx'> struct typec_port *typec_altmode2port(struct typec_altmode *alt);</div><div class='ctx'> </div><div class='ctx'> void typec_altmode_update_active(struct typec_altmode *alt, bool active);</div><div class='ctx'> </div><div class='add'>+void typec_altmode_set_ops(struct typec_altmode *alt,</div><div class='add'>+			   const struct typec_altmode_ops *ops);</div><div class='add'>+</div><div class='ctx'> enum typec_plug_index {</div><div class='ctx'> 	TYPEC_PLUG_SOP_P,</div><div class='ctx'> 	TYPEC_PLUG_SOP_PP,</div><div class='hunk'>@@ -202,6 +222,7 @@ struct typec_cable_desc {</div><div class='ctx'>  * @accessory: Audio, Debug or none.</div><div class='ctx'>  * @identity: Discover Identity command data</div><div class='ctx'>  * @pd_revision: USB Power Delivery Specification Revision if supported</div><div class='add'>+ * @usb_capability: Supported USB Modes</div><div class='ctx'>  * @attach: Notification about attached USB device</div><div class='ctx'>  * @deattach: Notification about removed USB device</div><div class='ctx'>  *</div><div class='hunk'>@@ -219,6 +240,7 @@ struct typec_partner_desc {</div><div class='ctx'> 	enum typec_accessory	accessory;</div><div class='ctx'> 	struct usb_pd_identity	*identity;</div><div class='ctx'> 	u16			pd_revision; /* 0300H = "3.0" */</div><div class='add'>+	u8			usb_capability;</div><div class='ctx'> </div><div class='ctx'> 	void (*attach)(struct typec_partner *partner, struct device *dev);</div><div class='ctx'> 	void (*deattach)(struct typec_partner *partner, struct device *dev);</div><div class='hunk'>@@ -233,6 +255,8 @@ struct typec_partner_desc {</div><div class='ctx'>  * @port_type_set: Set port type</div><div class='ctx'>  * @pd_get: Get available USB Power Delivery Capabilities.</div><div class='ctx'>  * @pd_set: Set USB Power Delivery Capabilities.</div><div class='add'>+ * @default_usb_mode_set: USB Mode to be used by default with Enter_USB Message</div><div class='add'>+ * @enter_usb_mode: Change the active USB Mode</div><div class='ctx'>  */</div><div class='ctx'> struct typec_operations {</div><div class='ctx'> 	int (*try_role)(struct typec_port *port, int role);</div><div class='hunk'>@@ -243,6 +267,8 @@ struct typec_operations {</div><div class='ctx'> 			     enum typec_port_type type);</div><div class='ctx'> 	struct usb_power_delivery **(*pd_get)(struct typec_port *port);</div><div class='ctx'> 	int (*pd_set)(struct typec_port *port, struct usb_power_delivery *pd);</div><div class='add'>+	int (*default_usb_mode_set)(struct typec_port *port, enum usb_mode mode);</div><div class='add'>+	int (*enter_usb_mode)(struct typec_port *port, enum usb_mode mode);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum usb_pd_svdm_ver {</div><div class='hunk'>@@ -260,6 +286,7 @@ enum usb_pd_svdm_ver {</div><div class='ctx'>  * @svdm_version: USB PD Structured VDM version if supported</div><div class='ctx'>  * @prefer_role: Initial role preference (DRP ports).</div><div class='ctx'>  * @accessory: Supported Accessory Modes</div><div class='add'>+ * @usb_capability: Supported USB Modes</div><div class='ctx'>  * @fwnode: Optional fwnode of the port</div><div class='ctx'>  * @driver_data: Private pointer for driver specific info</div><div class='ctx'>  * @pd: Optional USB Power Delivery Support</div><div class='hunk'>@@ -276,6 +303,7 @@ struct typec_capability {</div><div class='ctx'> 	int			prefer_role;</div><div class='ctx'> 	enum typec_accessory	accessory[TYPEC_MAX_ACCESSORY];</div><div class='ctx'> 	unsigned int		orientation_aware:1;</div><div class='add'>+	u8			usb_capability;</div><div class='ctx'> </div><div class='ctx'> 	struct fwnode_handle	*fwnode;</div><div class='ctx'> 	void			*driver_data;</div><div class='hunk'>@@ -309,6 +337,7 @@ struct typec_plug *typec_register_plug(struct typec_cable *cable,</div><div class='ctx'> void typec_unregister_plug(struct typec_plug *plug);</div><div class='ctx'> </div><div class='ctx'> void typec_set_data_role(struct typec_port *port, enum typec_data_role role);</div><div class='add'>+enum typec_data_role typec_get_data_role(struct typec_port *port);</div><div class='ctx'> void typec_set_pwr_role(struct typec_port *port, enum typec_role role);</div><div class='ctx'> void typec_set_vconn_role(struct typec_port *port, enum typec_role role);</div><div class='ctx'> void typec_set_pwr_opmode(struct typec_port *port, enum typec_pwr_opmode mode);</div><div class='hunk'>@@ -333,6 +362,9 @@ void typec_partner_set_svdm_version(struct typec_partner *partner,</div><div class='ctx'> 				    enum usb_pd_svdm_ver svdm_version);</div><div class='ctx'> int typec_get_negotiated_svdm_version(struct typec_port *port);</div><div class='ctx'> </div><div class='add'>+int typec_get_cable_svdm_version(struct typec_port *port);</div><div class='add'>+void typec_cable_set_svdm_version(struct typec_cable *cable, enum usb_pd_svdm_ver svdm_version);</div><div class='add'>+</div><div class='ctx'> struct usb_power_delivery *typec_partner_usb_power_delivery_register(struct typec_partner *partner,</div><div class='ctx'> 							struct usb_power_delivery_desc *desc);</div><div class='ctx'> </div><div class='hunk'>@@ -340,6 +372,9 @@ int typec_port_set_usb_power_delivery(struct typec_port *port, struct usb_power_</div><div class='ctx'> int typec_partner_set_usb_power_delivery(struct typec_partner *partner,</div><div class='ctx'> 					 struct usb_power_delivery *pd);</div><div class='ctx'> </div><div class='add'>+void typec_partner_set_usb_mode(struct typec_partner *partner, enum usb_mode usb_mode);</div><div class='add'>+void typec_port_set_usb_mode(struct typec_port *port, enum usb_mode mode);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct typec_connector - Representation of Type-C port for external drivers</div><div class='ctx'>  * @attach: notification about device removal</div><div class='head'>diff --git a/include/linux/usb/typec_altmode.h b/include/linux/usb/typec_altmode.h<br/>index 28aeef8f9e7b..f7db3bd4c90e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec_altmode.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec_altmode.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec_altmode.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/typec_altmode.h</a></div><div class='hunk'>@@ -20,6 +20,7 @@ struct typec_altmode_ops;</div><div class='ctx'>  * @active: Tells has the mode been entered or not</div><div class='ctx'>  * @desc: Optional human readable description of the mode</div><div class='ctx'>  * @ops: Operations vector from the driver</div><div class='add'>+ * @cable_ops: Cable operations vector from the driver.</div><div class='ctx'>  */</div><div class='ctx'> struct typec_altmode {</div><div class='ctx'> 	struct device			dev;</div><div class='hunk'>@@ -30,6 +31,7 @@ struct typec_altmode {</div><div class='ctx'> </div><div class='ctx'> 	char				*desc;</div><div class='ctx'> 	const struct typec_altmode_ops	*ops;</div><div class='add'>+	const struct typec_cable_ops	*cable_ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_typec_altmode(d) container_of(d, struct typec_altmode, dev)</div><div class='hunk'>@@ -75,6 +77,34 @@ int typec_altmode_notify(struct typec_altmode *altmode, unsigned long conf,</div><div class='ctx'> const struct typec_altmode *</div><div class='ctx'> typec_altmode_get_partner(struct typec_altmode *altmode);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct typec_cable_ops - Cable alternate mode operations vector</div><div class='add'>+ * @enter: Operations to be executed with Enter Mode Command</div><div class='add'>+ * @exit: Operations to be executed with Exit Mode Command</div><div class='add'>+ * @vdm: Callback for SVID specific commands</div><div class='add'>+ */</div><div class='add'>+struct typec_cable_ops {</div><div class='add'>+	int (*enter)(struct typec_altmode *altmode, enum typec_plug_index sop, u32 *vdo);</div><div class='add'>+	int (*exit)(struct typec_altmode *altmode, enum typec_plug_index sop);</div><div class='add'>+	int (*vdm)(struct typec_altmode *altmode, enum typec_plug_index sop,</div><div class='add'>+		   const u32 hdr, const u32 *vdo, int cnt);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int typec_cable_altmode_enter(struct typec_altmode *altmode, enum typec_plug_index sop, u32 *vdo);</div><div class='add'>+int typec_cable_altmode_exit(struct typec_altmode *altmode, enum typec_plug_index sop);</div><div class='add'>+int typec_cable_altmode_vdm(struct typec_altmode *altmode, enum typec_plug_index sop,</div><div class='add'>+			    const u32 header, const u32 *vdo, int count);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * typec_altmode_get_cable_svdm_version - Get negotiated SVDM version for cable plug</div><div class='add'>+ * @altmode: Handle to the alternate mode</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+typec_altmode_get_cable_svdm_version(struct typec_altmode *altmode)</div><div class='add'>+{</div><div class='add'>+	return typec_get_cable_svdm_version(typec_altmode2port(altmode));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * These are the connector states (USB, Safe and Alt Mode) defined in USB Type-C</div><div class='ctx'>  * Specification. SVID specific connector states are expected to follow and</div><div class='hunk'>@@ -143,6 +173,19 @@ typec_altmode_get_svdm_version(struct typec_altmode *altmode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * typec_altmode_get_data_role - Get port data role</div><div class='add'>+ * @altmode: Handle to the alternate mode</div><div class='add'>+ *</div><div class='add'>+ * Alt Mode drivers should only issue Enter Mode through the port if they are</div><div class='add'>+ * the DFP.</div><div class='add'>+ */</div><div class='add'>+static inline enum typec_data_role</div><div class='add'>+typec_altmode_get_data_role(struct typec_altmode *altmode)</div><div class='add'>+{</div><div class='add'>+	return typec_get_data_role(typec_altmode2port(altmode));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct typec_altmode_driver - USB Type-C alternate mode device driver</div><div class='ctx'>  * @id_table: Null terminated array of SVIDs</div><div class='ctx'>  * @probe: Callback for device binding</div><div class='head'>diff --git a/include/linux/usb/typec_dp.h b/include/linux/usb/typec_dp.h<br/>index 1f358098522d..acb0ad03bdac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec_dp.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec_dp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec_dp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/typec_dp.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #define __USB_TYPEC_DP_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb/typec_altmode.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define USB_TYPEC_DP_SID	0xff01</div><div class='ctx'> /* USB IF has not assigned a Standard ID (SID) for VirtualLink,</div><div class='hunk'>@@ -56,6 +57,7 @@ enum {</div><div class='ctx'> 	DP_PIN_ASSIGN_D,</div><div class='ctx'> 	DP_PIN_ASSIGN_E,</div><div class='ctx'> 	DP_PIN_ASSIGN_F, /* Not supported after v1.0b */</div><div class='add'>+	DP_PIN_ASSIGN_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* DisplayPort alt mode specific commands */</div><div class='hunk'>@@ -67,21 +69,21 @@ enum {</div><div class='ctx'> #define   DP_CAP_UFP_D			1</div><div class='ctx'> #define   DP_CAP_DFP_D			2</div><div class='ctx'> #define   DP_CAP_DFP_D_AND_UFP_D	3</div><div class='del'>-#define DP_CAP_DP_SIGNALLING(_cap_)	(((_cap_) &amp; GENMASK(5, 2)) &gt;&gt; 2)</div><div class='add'>+#define DP_CAP_DP_SIGNALLING(_cap_)	FIELD_GET(GENMASK(5, 2), _cap_)</div><div class='ctx'> #define   DP_CAP_SIGNALLING_HBR3	1</div><div class='ctx'> #define   DP_CAP_SIGNALLING_UHBR10	2</div><div class='ctx'> #define   DP_CAP_SIGNALLING_UHBR20	3</div><div class='ctx'> #define DP_CAP_RECEPTACLE		BIT(6)</div><div class='ctx'> #define DP_CAP_USB			BIT(7)</div><div class='del'>-#define DP_CAP_DFP_D_PIN_ASSIGN(_cap_)	(((_cap_) &amp; GENMASK(15, 8)) &gt;&gt; 8)</div><div class='del'>-#define DP_CAP_UFP_D_PIN_ASSIGN(_cap_)	(((_cap_) &amp; GENMASK(23, 16)) &gt;&gt; 16)</div><div class='add'>+#define DP_CAP_DFP_D_PIN_ASSIGN(_cap_)	FIELD_GET(GENMASK(15, 8), _cap_)</div><div class='add'>+#define DP_CAP_UFP_D_PIN_ASSIGN(_cap_)	FIELD_GET(GENMASK(23, 16), _cap_)</div><div class='ctx'> /* Get pin assignment taking plug &amp; receptacle into consideration */</div><div class='ctx'> #define DP_CAP_PIN_ASSIGN_UFP_D(_cap_) ((_cap_ &amp; DP_CAP_RECEPTACLE) ? \</div><div class='ctx'> 			DP_CAP_UFP_D_PIN_ASSIGN(_cap_) : DP_CAP_DFP_D_PIN_ASSIGN(_cap_))</div><div class='ctx'> #define DP_CAP_PIN_ASSIGN_DFP_D(_cap_) ((_cap_ &amp; DP_CAP_RECEPTACLE) ? \</div><div class='ctx'> 			DP_CAP_DFP_D_PIN_ASSIGN(_cap_) : DP_CAP_UFP_D_PIN_ASSIGN(_cap_))</div><div class='ctx'> #define DP_CAP_UHBR_13_5_SUPPORT	BIT(26)</div><div class='del'>-#define DP_CAP_CABLE_TYPE(_cap_)	(((_cap_) &amp; GENMASK(29, 28)) &gt;&gt; 28)</div><div class='add'>+#define DP_CAP_CABLE_TYPE(_cap_)	FIELD_GET(GENMASK(29, 28), _cap_)</div><div class='ctx'> #define   DP_CAP_CABLE_TYPE_PASSIVE	0</div><div class='ctx'> #define   DP_CAP_CABLE_TYPE_RE_TIMER	1</div><div class='ctx'> #define   DP_CAP_CABLE_TYPE_RE_DRIVER	2</div><div class='hunk'>@@ -116,7 +118,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> /* Helper for setting/getting the pin assignment value to the configuration */</div><div class='ctx'> #define DP_CONF_SET_PIN_ASSIGN(_a_)	((_a_) &lt;&lt; 8)</div><div class='del'>-#define DP_CONF_GET_PIN_ASSIGN(_conf_)	(((_conf_) &amp; GENMASK(15, 8)) &gt;&gt; 8)</div><div class='add'>+#define DP_CONF_GET_PIN_ASSIGN(_conf_)	FIELD_GET(GENMASK(15, 8), _conf_)</div><div class='ctx'> #define DP_CONF_UHBR13_5_SUPPORT	BIT(26)</div><div class='ctx'> #define DP_CONF_CABLE_TYPE_MASK		GENMASK(29, 28)</div><div class='ctx'> #define DP_CONF_CABLE_TYPE_SHIFT	28</div><div class='head'>diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h<br/>index 2489a7857d8e..aa9ebb7e2fe0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec_mux.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec_mux.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec_mux.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/typec_mux.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #ifndef __USB_TYPEC_MUX</div><div class='ctx'> #define __USB_TYPEC_MUX</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/usb/typec.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -24,16 +25,13 @@ struct typec_switch_desc {</div><div class='ctx'> 	void *drvdata;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_TYPEC)</div><div class='add'>+</div><div class='ctx'> struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode);</div><div class='ctx'> void typec_switch_put(struct typec_switch *sw);</div><div class='ctx'> int typec_switch_set(struct typec_switch *sw,</div><div class='ctx'> 		     enum typec_orientation orientation);</div><div class='ctx'> </div><div class='del'>-static inline struct typec_switch *typec_switch_get(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	return fwnode_typec_switch_get(dev_fwnode(dev));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct typec_switch_dev *</div><div class='ctx'> typec_switch_register(struct device *parent,</div><div class='ctx'> 		      const struct typec_switch_desc *desc);</div><div class='hunk'>@@ -42,6 +40,44 @@ void typec_switch_unregister(struct typec_switch_dev *sw);</div><div class='ctx'> void typec_switch_set_drvdata(struct typec_switch_dev *sw, void *data);</div><div class='ctx'> void *typec_switch_get_drvdata(struct typec_switch_dev *sw);</div><div class='ctx'> </div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline struct typec_switch *</div><div class='add'>+fwnode_typec_switch_get(struct fwnode_handle *fwnode)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void typec_switch_put(struct typec_switch *sw) {}</div><div class='add'>+</div><div class='add'>+static inline int typec_switch_set(struct typec_switch *sw,</div><div class='add'>+				   enum typec_orientation orientation)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct typec_switch_dev *</div><div class='add'>+typec_switch_register(struct device *parent,</div><div class='add'>+		      const struct typec_switch_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void typec_switch_unregister(struct typec_switch_dev *sw) {}</div><div class='add'>+</div><div class='add'>+static inline void typec_switch_set_drvdata(struct typec_switch_dev *sw, void *data) {}</div><div class='add'>+static inline void *typec_switch_get_drvdata(struct typec_switch_dev *sw)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_TYPEC */</div><div class='add'>+</div><div class='add'>+static inline struct typec_switch *typec_switch_get(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return fwnode_typec_switch_get(dev_fwnode(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct typec_mux_state {</div><div class='ctx'> 	struct typec_altmode *alt;</div><div class='ctx'> 	unsigned long mode;</div><div class='head'>diff --git a/include/linux/usb/typec_tbt.h b/include/linux/usb/typec_tbt.h<br/>index c7a2153bd6f5..0b570f1b8bc8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec_tbt.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/typec_tbt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/typec_tbt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/typec_tbt.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #define __USB_TYPEC_TBT_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb/typec_altmode.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define USB_TYPEC_VENDOR_INTEL		0x8087</div><div class='ctx'> /* Alias for convenience */</div><div class='hunk'>@@ -25,7 +26,7 @@ struct typec_thunderbolt_data {</div><div class='ctx'> </div><div class='ctx'> /* TBT3 Device Discover Mode VDO bits */</div><div class='ctx'> #define TBT_MODE			BIT(0)</div><div class='del'>-#define TBT_ADAPTER(_vdo_)		(((_vdo_) &amp; BIT(16)) &gt;&gt; 16)</div><div class='add'>+#define TBT_ADAPTER(_vdo_)		FIELD_GET(BIT(16), _vdo_)</div><div class='ctx'> #define   TBT_ADAPTER_LEGACY		0</div><div class='ctx'> #define   TBT_ADAPTER_TBT3		1</div><div class='ctx'> #define TBT_INTEL_SPECIFIC_B0		BIT(26)</div><div class='hunk'>@@ -35,14 +36,15 @@ struct typec_thunderbolt_data {</div><div class='ctx'> #define TBT_SET_ADAPTER(a)		(((a) &amp; 1) &lt;&lt; 16)</div><div class='ctx'> </div><div class='ctx'> /* TBT3 Cable Discover Mode VDO bits */</div><div class='del'>-#define TBT_CABLE_SPEED(_vdo_)		(((_vdo_) &amp; GENMASK(18, 16)) &gt;&gt; 16)</div><div class='add'>+#define TBT_CABLE_SPEED(_vdo_)		FIELD_GET(GENMASK(18, 16), _vdo_)</div><div class='ctx'> #define   TBT_CABLE_USB3_GEN1		1</div><div class='ctx'> #define   TBT_CABLE_USB3_PASSIVE	2</div><div class='ctx'> #define   TBT_CABLE_10_AND_20GBPS	3</div><div class='del'>-#define TBT_CABLE_ROUNDED_SUPPORT(_vdo_) \</div><div class='del'>-					(((_vdo_) &amp; GENMASK(20, 19)) &gt;&gt; 19)</div><div class='add'>+#define TBT_CABLE_ROUNDED_SUPPORT(_vdo_) FIELD_GET(GENMASK(20, 19), _vdo_)</div><div class='add'>+</div><div class='ctx'> #define   TBT_GEN3_NON_ROUNDED                 0</div><div class='ctx'> #define   TBT_GEN3_GEN4_ROUNDED_NON_ROUNDED    1</div><div class='add'>+#define TBT_CABLE_ROUNDED		BIT(19)</div><div class='ctx'> #define TBT_CABLE_OPTICAL		BIT(21)</div><div class='ctx'> #define TBT_CABLE_RETIMER		BIT(22)</div><div class='ctx'> #define TBT_CABLE_LINK_TRAINING		BIT(23)</div><div class='hunk'>@@ -53,6 +55,7 @@ struct typec_thunderbolt_data {</div><div class='ctx'> </div><div class='ctx'> /* TBT3 Device Enter Mode VDO bits */</div><div class='ctx'> #define TBT_ENTER_MODE_CABLE_SPEED(s)	TBT_SET_CABLE_SPEED(s)</div><div class='add'>+#define TBT_ENTER_MODE_UNI_DIR_LSRX	BIT(23)</div><div class='ctx'> #define TBT_ENTER_MODE_ACTIVE_CABLE	BIT(24)</div><div class='ctx'> </div><div class='ctx'> #endif /* __USB_TYPEC_TBT_H */</div><div class='head'>diff --git a/include/linux/usb/ulpi.h b/include/linux/usb/ulpi.h<br/>index 5050f502c1ed..4b651065738a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/include/linux/usb/ulpi.h?id=70ef654469b371d0a71bcf967fa3dcbca05d4b25'>include/linux/usb/ulpi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/ulpi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/ulpi.h</a></div><div class='hunk'>@@ -49,19 +49,10 @@</div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_USB_ULPI)</div><div class='del'>-struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops,</div><div class='del'>-					unsigned int flags);</div><div class='del'>-</div><div class='ctx'> struct usb_phy *devm_otg_ulpi_create(struct device *dev,</div><div class='ctx'> 				     struct usb_phy_io_ops *ops,</div><div class='ctx'> 				     unsigned int flags);</div><div class='ctx'> #else</div><div class='del'>-static inline struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops,</div><div class='del'>-					      unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct usb_phy *devm_otg_ulpi_create(struct device *dev,</div><div class='ctx'> 						   struct usb_phy_io_ops *ops,</div><div class='ctx'> 						   unsigned int flags)</div><div class='head'>diff --git a/include/linux/usb/usbio.h b/include/linux/usb/usbio.h<br/>new file mode 100644<br/>index 000000000000..6c4e7c246d58<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/include/linux/usb/usbio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>include/linux/usb/usbio.h</a></div><div class='hunk'>@@ -0,0 +1,177 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 Intel Corporation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LINUX_USBIO_H_</div><div class='add'>+#define _LINUX_USBIO_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+#include &lt;linux/byteorder/generic.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/***********************</div><div class='add'>+ * USBIO Clients Names *</div><div class='add'>+ ***********************/</div><div class='add'>+#define USBIO_GPIO_CLIENT		"usbio-gpio"</div><div class='add'>+#define USBIO_I2C_CLIENT		"usbio-i2c"</div><div class='add'>+</div><div class='add'>+/****************</div><div class='add'>+ * USBIO quirks *</div><div class='add'>+ ****************/</div><div class='add'>+#define USBIO_QUIRK_BULK_MAXP_63	BIT(0)  /* Force bulk endpoint maxp to 63 */</div><div class='add'>+#define USBIO_QUIRK_I2C_NO_INIT_ACK	BIT(8)  /* Do not ask for ack on I2C init */</div><div class='add'>+#define USBIO_QUIRK_I2C_MAX_RW_LEN_52	BIT(9)  /* Set i2c-adapter max r/w len to 52 */</div><div class='add'>+#define USBIO_QUIRK_I2C_USE_CHUNK_LEN	BIT(10) /* Send chunk-len for split xfers */</div><div class='add'>+#define USBIO_QUIRK_I2C_ALLOW_400KHZ	BIT(11) /* Override desc, allowing 400 KHz */</div><div class='add'>+</div><div class='add'>+/**************************</div><div class='add'>+ * USBIO Type Definitions *</div><div class='add'>+ **************************/</div><div class='add'>+</div><div class='add'>+/* USBIO Packet Type */</div><div class='add'>+#define USBIO_PKTTYPE_CTRL		1</div><div class='add'>+#define USBIO_PKTTYPE_DBG		2</div><div class='add'>+#define USBIO_PKTTYPE_GPIO		3</div><div class='add'>+#define USBIO_PKTTYPE_I2C		4</div><div class='add'>+</div><div class='add'>+/* USBIO Packet Header */</div><div class='add'>+struct usbio_packet_header {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 flags;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* USBIO Control Transfer Packet */</div><div class='add'>+struct usbio_ctrl_packet {</div><div class='add'>+	struct usbio_packet_header header;</div><div class='add'>+	u8 len;</div><div class='add'>+	u8 data[] __counted_by(len);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* USBIO Bulk Transfer Packet */</div><div class='add'>+struct usbio_bulk_packet {</div><div class='add'>+	struct usbio_packet_header header;</div><div class='add'>+	__le16 len;</div><div class='add'>+	u8 data[] __counted_by(len);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* USBIO GPIO commands */</div><div class='add'>+enum usbio_gpio_cmd {</div><div class='add'>+	USBIO_GPIOCMD_DEINIT,</div><div class='add'>+	USBIO_GPIOCMD_INIT,</div><div class='add'>+	USBIO_GPIOCMD_READ,</div><div class='add'>+	USBIO_GPIOCMD_WRITE,</div><div class='add'>+	USBIO_GPIOCMD_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* USBIO GPIO config */</div><div class='add'>+enum usbio_gpio_pincfg {</div><div class='add'>+	USBIO_GPIO_PINCFG_DEFAULT,</div><div class='add'>+	USBIO_GPIO_PINCFG_PULLUP,</div><div class='add'>+	USBIO_GPIO_PINCFG_PULLDOWN,</div><div class='add'>+	USBIO_GPIO_PINCFG_PUSHPULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define USBIO_GPIO_PINCFG_SHIFT		2</div><div class='add'>+#define USBIO_GPIO_PINCFG_MASK		(0x3 &lt;&lt; USBIO_GPIO_PINCFG_SHIFT)</div><div class='add'>+#define USBIO_GPIO_SET_PINCFG(pincfg) \</div><div class='add'>+	(((pincfg) &lt;&lt; USBIO_GPIO_PINCFG_SHIFT) &amp; USBIO_GPIO_PINCFG_MASK)</div><div class='add'>+</div><div class='add'>+enum usbio_gpio_pinmode {</div><div class='add'>+	USBIO_GPIO_PINMOD_INVAL,</div><div class='add'>+	USBIO_GPIO_PINMOD_INPUT,</div><div class='add'>+	USBIO_GPIO_PINMOD_OUTPUT,</div><div class='add'>+	USBIO_GPIO_PINMOD_MAXVAL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define USBIO_GPIO_PINMOD_MASK		0x3</div><div class='add'>+#define USBIO_GPIO_SET_PINMOD(pin)	(pin &amp; USBIO_GPIO_PINMOD_MASK)</div><div class='add'>+</div><div class='add'>+/*************************</div><div class='add'>+ * USBIO GPIO Controller *</div><div class='add'>+ *************************/</div><div class='add'>+</div><div class='add'>+#define USBIO_MAX_GPIOBANKS		5</div><div class='add'>+#define USBIO_GPIOSPERBANK		32</div><div class='add'>+</div><div class='add'>+struct usbio_gpio_bank_desc {</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 pins;</div><div class='add'>+	__le32 bmap;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct usbio_gpio_init {</div><div class='add'>+	u8 bankid;</div><div class='add'>+	u8 config;</div><div class='add'>+	u8 pincount;</div><div class='add'>+	u8 pin;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct usbio_gpio_rw {</div><div class='add'>+	u8 bankid;</div><div class='add'>+	u8 pincount;</div><div class='add'>+	u8 pin;</div><div class='add'>+	__le32 value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* USBIO I2C commands */</div><div class='add'>+enum usbio_i2c_cmd {</div><div class='add'>+	USBIO_I2CCMD_UNINIT,</div><div class='add'>+	USBIO_I2CCMD_INIT,</div><div class='add'>+	USBIO_I2CCMD_READ,</div><div class='add'>+	USBIO_I2CCMD_WRITE,</div><div class='add'>+	USBIO_I2CCMD_END</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/************************</div><div class='add'>+ * USBIO I2C Controller *</div><div class='add'>+ ************************/</div><div class='add'>+</div><div class='add'>+#define USBIO_MAX_I2CBUSES 5</div><div class='add'>+</div><div class='add'>+#define USBIO_I2C_BUS_ADDR_CAP_10B	BIT(3) /* 10bit address support */</div><div class='add'>+#define USBIO_I2C_BUS_MODE_CAP_MASK	0x3</div><div class='add'>+#define USBIO_I2C_BUS_MODE_CAP_SM	0 /* Standard Mode */</div><div class='add'>+#define USBIO_I2C_BUS_MODE_CAP_FM	1 /* Fast Mode */</div><div class='add'>+#define USBIO_I2C_BUS_MODE_CAP_FMP	2 /* Fast Mode+ */</div><div class='add'>+#define USBIO_I2C_BUS_MODE_CAP_HSM	3 /* High-Speed Mode */</div><div class='add'>+</div><div class='add'>+struct usbio_i2c_bus_desc {</div><div class='add'>+	u8 id;</div><div class='add'>+	u8 caps;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct usbio_i2c_uninit {</div><div class='add'>+	u8 busid;</div><div class='add'>+	__le16 config;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct usbio_i2c_init {</div><div class='add'>+	u8 busid;</div><div class='add'>+	__le16 config;</div><div class='add'>+	__le32 speed;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct usbio_i2c_rw {</div><div class='add'>+	u8 busid;</div><div class='add'>+	__le16 config;</div><div class='add'>+	__le16 size;</div><div class='add'>+	u8 data[] __counted_by(size);</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+int usbio_control_msg(struct auxiliary_device *adev, u8 type, u8 cmd,</div><div class='add'>+		      const void *obuf, u16 obuf_len, void *ibuf, u16 ibuf_len);</div><div class='add'>+</div><div class='add'>+int usbio_bulk_msg(struct auxiliary_device *adev, u8 type, u8 cmd, bool last,